diff -uNr --exclude .git --exclude .bzr dpkg/ABOUT-NLS /home/vorlon/devel/multiarch/dpkg-debian/ABOUT-NLS
--- dpkg/ABOUT-NLS	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/ABOUT-NLS	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,1327 @@
+1 Notes on the Free Translation Project
+***************************************
+
+Free software is going international!  The Free Translation Project is
+a way to get maintainers of free software, translators, and users all
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do _not_
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work on translations can contact the appropriate team.
+
+   When reporting bugs in the `intl/' directory or bugs which may be
+related to internationalization, you should tell about the version of
+`gettext' which is used.  The information can be found in the
+`intl/VERSION' file, in internationalized packages.
+
+1.1 Quick configuration advice
+==============================
+
+If you want to exploit the full power of internationalization, you
+should configure it using
+
+     ./configure --with-included-gettext
+
+to force usage of internationalizing routines provided within this
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias, message inheritance, automatic
+charset conversion or plural form handling) as the implementation here.
+It is also not possible to offer this additional functionality on top
+of a `catgets' implementation.  Future versions of GNU `gettext' will
+very likely convey even more functionality.  So it might be a good idea
+to change to GNU `gettext' as soon as possible.
+
+   So you need _not_ provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
+
+1.2 INSTALL Matters
+===================
+
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system already
+provides the GNU `gettext' functions.  If not, the included GNU
+`gettext' library will be used.  This library is wholly contained
+within this package, usually in the `intl/' subdirectory, so prior
+installation of the GNU `gettext' package is _not_ required.
+Installers may use special options at configuration time for changing
+the default behaviour.  The commands:
+
+     ./configure --with-included-gettext
+     ./configure --disable-nls
+
+will, respectively, bypass any pre-existing `gettext' to use the
+internationalizing routines provided within this package, or else,
+_totally_ disable translation of messages.
+
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl.a' file and
+will decide to use this.  This might not be desirable.  You should use
+the more recent version of the GNU `gettext' library.  I.e. if the file
+`intl/VERSION' shows that the library which comes with this package is
+more recent, you should use
+
+     ./configure --with-included-gettext
+
+to prevent auto-detection.
+
+   The configuration process will not test for the `catgets' function
+and therefore it will not be used.  The reason is that even an
+emulation of `gettext' on top of `catgets' could not provide all the
+extensions of the GNU `gettext' library.
+
+   Internationalized packages usually have many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+1.3 Using This Package
+======================
+
+As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+`LL_CC' combination.  If you happen to have the `LC_ALL' or some other
+`LC_xxx' environment variables set, you should unset them before
+setting `LANG', otherwise the setting of `LANG' will not have the
+desired effect.  Here `LL' is an ISO 639 two-letter language code, and
+`CC' is an ISO 3166 two-letter country code.  For example, let's
+suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
+
+   You might think that the country code specification is redundant.
+But in fact, some languages have dialects in different countries.  For
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
+country code serves to distinguish the dialects.
+
+   The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc.  On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
+locales supported by your system for your language by running the
+command `locale -a | grep '^LL''.
+
+   Not all programs have translations for all languages.  By default, an
+English message is shown in place of a nonexistent translation.  If you
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
+set to the primary language; this is required by other parts of the
+system libraries.  For example, some Swedish users who would rather
+read translations in German than English for when Swedish is not
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
+
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
+   In the `LANGUAGE' environment variable, but not in the `LANG'
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect.  For example, `de' is equivalent
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
+(Portuguese as spoken in Portugal) in this context.
+
+1.4 Translating Teams
+=====================
+
+For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list.  The up-to-date list of
+teams can be found at the Free Translation Project's homepage,
+`http://translationproject.org/', in the "Teams" area.
+
+   If you'd like to volunteer to _work_ at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is _not_ the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+_actively_ in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `coordinator@translationproject.org' to
+reach the coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skills are praised more than
+programming skills, here.
+
+1.5 Available Packages
+======================
+
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of May 2010.
+The matrix shows, in regard of each package, for which languages PO
+files have been submitted to translation coordination, with a
+translation percentage of at least 50%.
+
+     Ready PO files       af am ar as ast az be be@latin bg bn_IN bs ca crh
+                        +---------------------------------------------------+
+     a2ps               |                    []                      []     |
+     aegis              |                                                   |
+     ant-phone          |                                                   |
+     anubis             |                                                   |
+     aspell             |             []                             []     |
+     bash               |                                                   |
+     bfd                |                                                   |
+     bibshelf           |             []                                    |
+     binutils           |                                                   |
+     bison              |                                                   |
+     bison-runtime      |             []                                    |
+     bluez-pin          | []          []                                    |
+     bombono-dvd        |                                                   |
+     buzztard           |                                                   |
+     cflow              |                                                   |
+     clisp              |                                                   |
+     coreutils          |                                []          []     |
+     cpio               |                                                   |
+     cppi               |                                                   |
+     cpplib             |                                            []     |
+     cryptsetup         |                                                   |
+     dfarc              |                                                   |
+     dialog             |                          []                []     |
+     dico               |                                                   |
+     diffutils          |                                            []     |
+     dink               |                                                   |
+     doodle             |                                                   |
+     e2fsprogs          |                                            []     |
+     enscript           |                                            []     |
+     exif               |                                                   |
+     fetchmail          |                                            []     |
+     findutils          |                                []                 |
+     flex               |                                            []     |
+     freedink           |                                                   |
+     gas                |                                                   |
+     gawk               |             []                             []     |
+     gcal               |                                            []     |
+     gcc                |                                                   |
+     gettext-examples   | []          []                 []          []     |
+     gettext-runtime    |                    []          []          []     |
+     gettext-tools      |                                []          []     |
+     gip                |                                []                 |
+     gjay               |                                                   |
+     gliv               |                                []                 |
+     glunarclock        |             []                 []                 |
+     gnubiff            |                                                   |
+     gnucash            |                                            []     |
+     gnuedu             |                                                   |
+     gnulib             |                                                   |
+     gnunet             |                                                   |
+     gnunet-gtk         |                                                   |
+     gnutls             |                                                   |
+     gold               |                                                   |
+     gpe-aerial         |                                                   |
+     gpe-beam           |                                                   |
+     gpe-bluetooth      |                                                   |
+     gpe-calendar       |                                                   |
+     gpe-clock          |             []                                    |
+     gpe-conf           |                                                   |
+     gpe-contacts       |                                                   |
+     gpe-edit           |                                                   |
+     gpe-filemanager    |                                                   |
+     gpe-go             |                                                   |
+     gpe-login          |                                                   |
+     gpe-ownerinfo      |             []                                    |
+     gpe-package        |                                                   |
+     gpe-sketchbook     |                                                   |
+     gpe-su             |             []                                    |
+     gpe-taskmanager    |             []                                    |
+     gpe-timesheet      |             []                                    |
+     gpe-today          |             []                                    |
+     gpe-todo           |                                                   |
+     gphoto2            |                                                   |
+     gprof              |                                []                 |
+     gpsdrive           |                                                   |
+     gramadoir          |                                                   |
+     grep               |                                                   |
+     grub               |             []                             []     |
+     gsasl              |                                                   |
+     gss                |                                                   |
+     gst-plugins-bad    |                                []                 |
+     gst-plugins-base   |                                []                 |
+     gst-plugins-good   |                                []                 |
+     gst-plugins-ugly   |                                []                 |
+     gstreamer          | []                             []          []     |
+     gtick              |                                                   |
+     gtkam              |                    []                             |
+     gtkorphan          |                                []                 |
+     gtkspell           | []          []     []                             |
+     gutenprint         |                                                   |
+     hello              |                                []                 |
+     help2man           |                                                   |
+     hylafax            |                                                   |
+     idutils            |                                                   |
+     indent             |                                []          []     |
+     iso_15924          |                                                   |
+     iso_3166           | []       []        []          []  []   [] [] []  |
+     iso_3166_2         |                                                   |
+     iso_4217           |                                                   |
+     iso_639            |          [] []     []              []         []  |
+     iso_639_3          |                                               []  |
+     jwhois             |                                                   |
+     kbd                |                                                   |
+     keytouch           |                                            []     |
+     keytouch-editor    |                                                   |
+     keytouch-keyboa... |                                            []     |
+     klavaro            |       []                                          |
+     latrine            |                                                   |
+     ld                 |                                []                 |
+     leafpad            |                                []          []     |
+     libc               |                                []          []     |
+     libexif            |                    ()                             |
+     libextractor       |                                                   |
+     libgnutls          |                                                   |
+     libgpewidget       |                                                   |
+     libgpg-error       |                                                   |
+     libgphoto2         |                                                   |
+     libgphoto2_port    |                                                   |
+     libgsasl           |                                                   |
+     libiconv           |                                []                 |
+     libidn             |                                                   |
+     lifelines          |                                                   |
+     liferea            |                          []                []     |
+     lilypond           |                                                   |
+     linkdr             |       []                                          |
+     lordsawar          |                                                   |
+     lprng              |                                                   |
+     lynx               |                                            []     |
+     m4                 |                                                   |
+     mailfromd          |                                                   |
+     mailutils          |                                                   |
+     make               |                                                   |
+     man-db             |                                                   |
+     man-db-manpages    |                                                   |
+     minicom            |                                                   |
+     mkisofs            |                                                   |
+     myserver           |                                                   |
+     nano               |                                []          []     |
+     opcodes            |                                                   |
+     parted             |                                                   |
+     pies               |                                                   |
+     popt               |                                                   |
+     psmisc             |                                                   |
+     pspp               |                                            []     |
+     pwdutils           |                                                   |
+     radius             |                                            []     |
+     recode             |                    []                      []     |
+     rosegarden         |                                                   |
+     rpm                |                                                   |
+     rush               |                                                   |
+     sarg               |                                                   |
+     screem             |                                                   |
+     scrollkeeper       |                 [] []                      []     |
+     sed                |             []                             []     |
+     sharutils          |                                []          []     |
+     shishi             |                                                   |
+     skencil            |                                                   |
+     solfege            |                                                   |
+     solfege-manual     |                                                   |
+     soundtracker       |                                                   |
+     sp                 |                                                   |
+     sysstat            |                                                   |
+     tar                |                                []                 |
+     texinfo            |                                                   |
+     tin                |                                                   |
+     unicode-han-tra... |                                                   |
+     unicode-transla... |                                                   |
+     util-linux-ng      |                                            []     |
+     vice               |                                                   |
+     vmm                |                                                   |
+     vorbis-tools       |                                                   |
+     wastesedge         |                                                   |
+     wdiff              |                                                   |
+     wget               |                    []                      []     |
+     wyslij-po          |                                                   |
+     xchat              |             []     []          []          []     |
+     xdg-user-dirs      | []       [] []     []    []    []  []      [] []  |
+     xkeyboard-config   |                                []          [] []  |
+                        +---------------------------------------------------+
+                          af am ar as ast az be be@latin bg bn_IN bs ca crh
+                           6  0  2  3 19   1 11     3    28   3    1 38  5
+
+                          cs da  de  el en en_GB en_ZA eo es et eu fa fi
+                        +-------------------------------------------------+
+     a2ps               | [] []  []  []     []            [] []       []  |
+     aegis              |    []  []                       []              |
+     ant-phone          |    []  ()                                       |
+     anubis             |    []  []                                   []  |
+     aspell             | [] []  []         []            []              |
+     bash               | []                           [] []          []  |
+     bfd                |                                 []          []  |
+     bibshelf           |    []  []                       []          []  |
+     binutils           |                                 []          []  |
+     bison              |        []  []                               []  |
+     bison-runtime      |    []  []  []                      []       []  |
+     bluez-pin          | [] []  []  []                [] []          []  |
+     bombono-dvd        |    []                                       []  |
+     buzztard           | [] []  []                                       |
+     cflow              |    []  []                                   []  |
+     clisp              |    []  []     []                []              |
+     coreutils          | [] []  []                          []           |
+     cpio               |                                             []  |
+     cppi               |                                             []  |
+     cpplib             |    []  []                       []              |
+     cryptsetup         |        []                                       |
+     dfarc              |    []  []                       []          []  |
+     dialog             |    []  []                    [] []    []        |
+     dico               |                                                 |
+     diffutils          | [] []  []  []                [] []          []  |
+     dink               |    []  []                       []              |
+     doodle             |        []                                       |
+     e2fsprogs          | []     []                       []              |
+     enscript           |    []  []         []                            |
+     exif               | () []  []                                   []  |
+     fetchmail          | [] []  ()  []     []            []              |
+     findutils          | [] []  []                                   []  |
+     flex               |        []                       []          []  |
+     freedink           |    []  []                       []          []  |
+     gas                |                                 []              |
+     gawk               |    []  []                       []              |
+     gcal               |                                 []              |
+     gcc                |        []                       []              |
+     gettext-examples   |        []  []                [] []          []  |
+     gettext-runtime    |    []  []                    [] []          []  |
+     gettext-tools      |        []                       []    []        |
+     gip                |    []  []                       []    []    []  |
+     gjay               |        []                                   []  |
+     gliv               | [] []  []                                   []  |
+     glunarclock        |    []  []                                   []  |
+     gnubiff            |        ()                                       |
+     gnucash            | []     ()  ()     ()            ()          ()  |
+     gnuedu             |    []                           []              |
+     gnulib             |        []                       []          []  |
+     gnunet             |                                                 |
+     gnunet-gtk         |    []                                           |
+     gnutls             | []     []                                       |
+     gold               |                                 []          []  |
+     gpe-aerial         | [] []  []                       []          []  |
+     gpe-beam           | [] []  []                       []          []  |
+     gpe-bluetooth      |    []  []                                   []  |
+     gpe-calendar       |    []                                       []  |
+     gpe-clock          | [] []  []                       []          []  |
+     gpe-conf           | [] []  []                                   []  |
+     gpe-contacts       |    []  []                       []          []  |
+     gpe-edit           |    []  []                                   []  |
+     gpe-filemanager    |    []  []                       []          []  |
+     gpe-go             | [] []  []                       []          []  |
+     gpe-login          |    []  []                                   []  |
+     gpe-ownerinfo      | [] []  []                       []          []  |
+     gpe-package        |    []  []                       []          []  |
+     gpe-sketchbook     | [] []  []                       []          []  |
+     gpe-su             | [] []  []                       []          []  |
+     gpe-taskmanager    | [] []  []                       []          []  |
+     gpe-timesheet      | [] []  []                       []          []  |
+     gpe-today          | [] []  []                       []          []  |
+     gpe-todo           |    []  []                       []          []  |
+     gphoto2            | [] []  ()         []            []    []    []  |
+     gprof              |    []  []                       []          []  |
+     gpsdrive           |    []                           [] []           |
+     gramadoir          |    []  []                    []                 |
+     grep               | []                                          []  |
+     grub               |    []  []                                   []  |
+     gsasl              |        []                                   []  |
+     gss                |                                             []  |
+     gst-plugins-bad    | [] []  []                       []    []    []  |
+     gst-plugins-base   | [] []  []                       []    []    []  |
+     gst-plugins-good   | [] []  []  []                   []    []    []  |
+     gst-plugins-ugly   | [] []  []  []                   []    []    []  |
+     gstreamer          | [] []  []                       []    []    []  |
+     gtick              |    []  ()                    []             []  |
+     gtkam              | [] []  ()                    [] []              |
+     gtkorphan          | [] []  []                    []                 |
+     gtkspell           | [] []  []  []                [] []    []    []  |
+     gutenprint         |    []  []         []                        []  |
+     hello              |    []  []                    [] []          []  |
+     help2man           |        []                                   []  |
+     hylafax            |        []                       []              |
+     idutils            |    []  []                                   []  |
+     indent             | [] []  []                    [] [] [] []    []  |
+     iso_15924          |    []      ()                [] []          []  |
+     iso_3166           | [] []  []  ()                [] [] [] ()    []  |
+     iso_3166_2         |            ()                                   |
+     iso_4217           | [] []  []  ()                   [] []       []  |
+     iso_639            | [] []  []  ()                [] []          []  |
+     iso_639_3          |                                                 |
+     jwhois             |                                 []          []  |
+     kbd                | [] []  []  []                   []              |
+     keytouch           |    []  []                                   []  |
+     keytouch-editor    |    []  []                                   []  |
+     keytouch-keyboa... |    []                                       []  |
+     klavaro            | [] []  []                    []                 |
+     latrine            |    []  ()                                   []  |
+     ld                 |    []                           []          []  |
+     leafpad            | [] []  []  []                   []    []    []  |
+     libc               | [] []  []                       []          []  |
+     libexif            |    []  []         ()                            |
+     libextractor       |                                                 |
+     libgnutls          | []                                              |
+     libgpewidget       |    []  []                                   []  |
+     libgpg-error       | []     []                                       |
+     libgphoto2         |    []  ()                                       |
+     libgphoto2_port    |    []  ()                             []        |
+     libgsasl           |                                             []  |
+     libiconv           | [] []  []                    []    []       []  |
+     libidn             | []     []                    []             []  |
+     lifelines          |    []  ()                                       |
+     liferea            | []     []  []                   []    []        |
+     lilypond           | []     []                       []          []  |
+     linkdr             |    []  []                       []          []  |
+     lordsawar          |    []                                           |
+     lprng              |                                                 |
+     lynx               | [] []  []                          []           |
+     m4                 | [] []  []  []                               []  |
+     mailfromd          |                                                 |
+     mailutils          |                                 []              |
+     make               |    []  []                       []          []  |
+     man-db             |                                                 |
+     man-db-manpages    |                                                 |
+     minicom            | [] []  []                       []          []  |
+     mkisofs            |                                             []  |
+     myserver           |                                                 |
+     nano               |        []                       []    []    []  |
+     opcodes            |        []                       []          []  |
+     parted             | []     []                                       |
+     pies               |                                                 |
+     popt               | [] []  []                    [] []          []  |
+     psmisc             | []     []                             []    []  |
+     pspp               |                                 []              |
+     pwdutils           |    []                                           |
+     radius             |                                 []              |
+     recode             | [] []  []  []                [] []          []  |
+     rosegarden         | ()     ()                       ()          ()  |
+     rpm                |    []  []                       []              |
+     rush               |                                                 |
+     sarg               |                                                 |
+     screem             |                                                 |
+     scrollkeeper       | [] []  []         []            []          []  |
+     sed                | []     []  []                [] [] []       []  |
+     sharutils          |    []  []                       [] []       []  |
+     shishi             |                                                 |
+     skencil            |    []  ()                       []              |
+     solfege            |        []                    []    []       []  |
+     solfege-manual     |                              []    []           |
+     soundtracker       |    []  []                       []              |
+     sp                 |        []                                       |
+     sysstat            |    []  []                             []    []  |
+     tar                | []     []                          [] []    []  |
+     texinfo            |        []                    [] []              |
+     tin                |        []                          []           |
+     unicode-han-tra... |                                                 |
+     unicode-transla... |                                                 |
+     util-linux-ng      | [] []  []                       []          []  |
+     vice               |    ()  ()                                       |
+     vmm                |        []                                       |
+     vorbis-tools       | []                           []                 |
+     wastesedge         |    []                                           |
+     wdiff              |        []                       []          []  |
+     wget               | []     []                          []       []  |
+     wyslij-po          |                                             []  |
+     xchat              | []     []  []                   [] []       []  |
+     xdg-user-dirs      | [] []  []  []                [] [] [] []    []  |
+     xkeyboard-config   | [] []  []                    [] []          []  |
+                        +-------------------------------------------------+
+                          cs da  de  el en en_GB en_ZA eo es et eu fa fi
+                          64 105 117 18  1   8     0   28 89 18 19  0 104
+
+                          fr  ga gl gu he hi hr hu hy id  is it ja ka kn
+                        +------------------------------------------------+
+     a2ps               | []                          []        []       |
+     aegis              | []                                 []          |
+     ant-phone          | []                                 []          |
+     anubis             | []                          []     []          |
+     aspell             | []  []                      []     []          |
+     bash               | []                          []        []       |
+     bfd                | []                          []                 |
+     bibshelf           | []  []                      []     []          |
+     binutils           | []                          []                 |
+     bison              | []  []                      []                 |
+     bison-runtime      | []  []                      []     [] []       |
+     bluez-pin          | []  []                [] [] []  []    []       |
+     bombono-dvd        |                                                |
+     buzztard           |                             []                 |
+     cflow              |     []                      []                 |
+     clisp              | []                                             |
+     coreutils          | []  []                []    []     []          |
+     cpio               | []  []                      []                 |
+     cppi               | []                                             |
+     cpplib             | []                          []                 |
+     cryptsetup         | []                          []     []          |
+     dfarc              | []                                 []          |
+     dialog             | []  [] []                   []  [] [] []       |
+     dico               |                                                |
+     diffutils          | []  [] []    []       []    []     [] []       |
+     dink               | []                                             |
+     doodle             |     []                             []          |
+     e2fsprogs          | []                          []                 |
+     enscript           | []  []             []       []                 |
+     exif               | []                          []  [] [] []       |
+     fetchmail          | []                          []     [] []       |
+     findutils          | []  []                []    []     []          |
+     flex               | []  []                                         |
+     freedink           | []                          []                 |
+     gas                | []                          []                 |
+     gawk               | []  []       []             []     () []       |
+     gcal               | []                                             |
+     gcc                |                             []                 |
+     gettext-examples   | []  []                []    []     [] []       |
+     gettext-runtime    | []  []                      []     [] []       |
+     gettext-tools      | []                          []     [] []       |
+     gip                | []  [] []                   []        []       |
+     gjay               |                                                |
+     gliv               | ()                                             |
+     glunarclock        |     []                []    []                 |
+     gnubiff            | ()                          []     ()          |
+     gnucash            | ()           ()       ()           () []       |
+     gnuedu             | []                                 []          |
+     gnulib             | []  []                []           [] []       |
+     gnunet             |                                                |
+     gnunet-gtk         | []                                             |
+     gnutls             | []                                 []          |
+     gold               |                             []                 |
+     gpe-aerial         | []                          []                 |
+     gpe-beam           | []                          []        []       |
+     gpe-bluetooth      |                             []     [] []       |
+     gpe-calendar       |                                       []       |
+     gpe-clock          | []                    []    []        []       |
+     gpe-conf           | []                          []        []       |
+     gpe-contacts       | []                          []        []       |
+     gpe-edit           |                             []        []       |
+     gpe-filemanager    |                       []    []        []       |
+     gpe-go             | []                    []    []        []       |
+     gpe-login          |                             []        []       |
+     gpe-ownerinfo      | []                    []    []        []       |
+     gpe-package        |                             []        []       |
+     gpe-sketchbook     | []                          []        []       |
+     gpe-su             | []     []             []    []        []       |
+     gpe-taskmanager    | []                    []    []        []       |
+     gpe-timesheet      | []  []                      []        []       |
+     gpe-today          | []  [] []             []    []        []       |
+     gpe-todo           |                             []        []       |
+     gphoto2            | []                    []    []     [] []       |
+     gprof              | []  []                      []                 |
+     gpsdrive           |        []                   []     []          |
+     gramadoir          | []  []                      []                 |
+     grep               |                                    []          |
+     grub               |                       []    []     []          |
+     gsasl              | []  []                      []     []          |
+     gss                | []  []                      []     []          |
+     gst-plugins-bad    | []                    []    []     []          |
+     gst-plugins-base   | []                    []    []     [] []       |
+     gst-plugins-good   | []                    []    []     [] []       |
+     gst-plugins-ugly   | []                    []    []     [] []       |
+     gstreamer          | []                    []    []     []          |
+     gtick              | []  []                      []     []          |
+     gtkam              | []                    []    []     [] []       |
+     gtkorphan          | []                          []     []          |
+     gtkspell           | []  [] []             [] [] []     [] []       |
+     gutenprint         | []                    []           []          |
+     hello              |     []                      []                 |
+     help2man           | []                                             |
+     hylafax            |                             []                 |
+     idutils            | []  []                []    []     []          |
+     indent             | []  [] []             []    []     [] []       |
+     iso_15924          | ()                          []     []          |
+     iso_3166           | ()  [] [] [] [] [] [] []    []     [] []       |
+     iso_3166_2         | ()                    []    []     []          |
+     iso_4217           | ()                    []    []     [] []       |
+     iso_639            | ()  []    []          []    []     [] []    [] |
+     iso_639_3          | ()                                 []       [] |
+     jwhois             | []                    []    []     []          |
+     kbd                | []                          []                 |
+     keytouch           | []  []                []    []     []          |
+     keytouch-editor    |     []                []    []     []          |
+     keytouch-keyboa... |     []                []    []     []          |
+     klavaro            |        []             []                       |
+     latrine            |                             []     []          |
+     ld                 | []  []                      []                 |
+     leafpad            | []  []       []       []    []     [] ()       |
+     libc               | []     []                   []        []       |
+     libexif            |                                                |
+     libextractor       |                                                |
+     libgnutls          | []                                 []          |
+     libgpewidget       |     []                      []        []       |
+     libgpg-error       | []                                 []          |
+     libgphoto2         | []                                 [] []       |
+     libgphoto2_port    | []                                 [] []       |
+     libgsasl           | []  []                      []     []          |
+     libiconv           | []  []                      []     [] []       |
+     libidn             | []                          []     []          |
+     lifelines          | ()                                             |
+     liferea            | []                    []           [] []       |
+     lilypond           | []                                             |
+     linkdr             |              []    [] []           []          |
+     lordsawar          |                                                |
+     lprng              |                             []                 |
+     lynx               | []                    []    []     [] []       |
+     m4                 | []  [] []                   []        []       |
+     mailfromd          |                                                |
+     mailutils          | []                          []                 |
+     make               | []  [] []    []    []       []     [] []       |
+     man-db             |                             []     []          |
+     man-db-manpages    |                             []                 |
+     minicom            | []                    []    []        []       |
+     mkisofs            | []                          []     []          |
+     myserver           |                                                |
+     nano               | []  [] []             []           []          |
+     opcodes            | []  []                      []                 |
+     parted             | []                          []     [] []       |
+     pies               |                                                |
+     popt               | []  [] []             []    []  [] [] []       |
+     psmisc             | []                          []                 |
+     pspp               |                                                |
+     pwdutils           | []                          []                 |
+     radius             | []                          []                 |
+     recode             | []  [] []    []       []    []     []          |
+     rosegarden         | ()                          ()     () ()       |
+     rpm                |                             []        []       |
+     rush               |                                                |
+     sarg               | []                                             |
+     screem             |                                    [] []       |
+     scrollkeeper       |                       []    []     []          |
+     sed                | []  [] []             []    []     [] []       |
+     sharutils          | []  []                []    []     [] []       |
+     shishi             | []                                             |
+     skencil            | []                                             |
+     solfege            | []     []                          []          |
+     solfege-manual     | []     []                                      |
+     soundtracker       | []                                 []          |
+     sp                 | []                                    ()       |
+     sysstat            | []                          []     [] []       |
+     tar                | []  []                []    []     [] []       |
+     texinfo            | []                          []     [] []       |
+     tin                | []                                             |
+     unicode-han-tra... |                                                |
+     unicode-transla... | []  []                                         |
+     util-linux-ng      | []                    []    []     [] []       |
+     vice               | ()                    ()           ()          |
+     vmm                | []                                             |
+     vorbis-tools       |                             []                 |
+     wastesedge         | ()                                 ()          |
+     wdiff              |                                                |
+     wget               | []  []             [] []    []     [] []       |
+     wyslij-po          | []                          []                 |
+     xchat              | []        []    []    []    []     [] []    [] |
+     xdg-user-dirs      | []  [] [] [] []       []    []  [] [] []    [] |
+     xkeyboard-config   | []                    []    []     []          |
+                        +------------------------------------------------+
+                          fr  ga gl gu he hi hr hu hy id  is it ja ka kn
+                          121 53 20  4  8  2  5 53  2 120  5 83 66  0  4
+
+                          ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
+                        +-----------------------------------------------+
+     a2ps               |                               []              |
+     aegis              |                                               |
+     ant-phone          |                                               |
+     anubis             |                               []    []        |
+     aspell             |                         []                    |
+     bash               |                                               |
+     bfd                |                                               |
+     bibshelf           |                []             []              |
+     binutils           |                                               |
+     bison              |                               []              |
+     bison-runtime      |       []    [] []             []    []        |
+     bluez-pin          |    [] []    [] []             []              |
+     bombono-dvd        |                                               |
+     buzztard           |                                               |
+     cflow              |                                               |
+     clisp              |                                               |
+     coreutils          |          []                                   |
+     cpio               |                                               |
+     cppi               |                                               |
+     cpplib             |                                               |
+     cryptsetup         |                                               |
+     dfarc              |                   []                          |
+     dialog             |    []       [] []             []    []        |
+     dico               |                                               |
+     diffutils          |                []             []              |
+     dink               |                                               |
+     doodle             |                                               |
+     e2fsprogs          |                                               |
+     enscript           |                                               |
+     exif               |                []                             |
+     fetchmail          |                                               |
+     findutils          |                                               |
+     flex               |                                               |
+     freedink           |                                     []        |
+     gas                |                                               |
+     gawk               |                                               |
+     gcal               |                                               |
+     gcc                |                                               |
+     gettext-examples   |       []       []             [] []           |
+     gettext-runtime    | []                                            |
+     gettext-tools      | []                                            |
+     gip                |                []             []              |
+     gjay               |                                               |
+     gliv               |                                               |
+     glunarclock        |                []                             |
+     gnubiff            |                                               |
+     gnucash            | ()          ()                      ()     () |
+     gnuedu             |                                               |
+     gnulib             |                                               |
+     gnunet             |                                               |
+     gnunet-gtk         |                                               |
+     gnutls             |                               []              |
+     gold               |                                               |
+     gpe-aerial         |                []                             |
+     gpe-beam           |                []                             |
+     gpe-bluetooth      |                []                []           |
+     gpe-calendar       |                []                             |
+     gpe-clock          | []    []       []             [] []           |
+     gpe-conf           | []             []                             |
+     gpe-contacts       | []             []                             |
+     gpe-edit           |                []                             |
+     gpe-filemanager    | []             []                             |
+     gpe-go             | []             []                []           |
+     gpe-login          |                []                             |
+     gpe-ownerinfo      |                []             []              |
+     gpe-package        | []             []                             |
+     gpe-sketchbook     | []             []                             |
+     gpe-su             | []    []       []             [] [] []        |
+     gpe-taskmanager    | [] [] []       []             [] []           |
+     gpe-timesheet      |                []             []              |
+     gpe-today          |       []       []             [] []           |
+     gpe-todo           |                []                   []        |
+     gphoto2            |                                               |
+     gprof              |                               []              |
+     gpsdrive           |                                               |
+     gramadoir          |                                               |
+     grep               |                                               |
+     grub               |                                               |
+     gsasl              |                                               |
+     gss                |                                               |
+     gst-plugins-bad    |                []                []           |
+     gst-plugins-base   |             [] []                             |
+     gst-plugins-good   |                []                []           |
+     gst-plugins-ugly   |             [] []             [] [] []        |
+     gstreamer          |                                               |
+     gtick              |                                               |
+     gtkam              |                                     []        |
+     gtkorphan          |                []                      []     |
+     gtkspell           |       []    [] []       []    []    [] []     |
+     gutenprint         |                                               |
+     hello              | []             []             []              |
+     help2man           |                                               |
+     hylafax            |                                               |
+     idutils            |                                               |
+     indent             |                                               |
+     iso_15924          |             [] []                             |
+     iso_3166           | [] []       () [] [] []    []       []        |
+     iso_3166_2         |                                               |
+     iso_4217           |             []                      []        |
+     iso_639            |                      []    []                 |
+     iso_639_3          |                            []                 |
+     jwhois             |                []                             |
+     kbd                |                                               |
+     keytouch           |                []                             |
+     keytouch-editor    |                []                             |
+     keytouch-keyboa... |                []                             |
+     klavaro            |                                     []        |
+     latrine            |                []                             |
+     ld                 |                                               |
+     leafpad            | []          [] []                             |
+     libc               | []                                            |
+     libexif            |                                               |
+     libextractor       |                                               |
+     libgnutls          |                               []              |
+     libgpewidget       |                []             []              |
+     libgpg-error       |                                               |
+     libgphoto2         |                                               |
+     libgphoto2_port    |                                               |
+     libgsasl           |                                               |
+     libiconv           |                                               |
+     libidn             |                                               |
+     lifelines          |                                               |
+     liferea            |                                               |
+     lilypond           |                                               |
+     linkdr             |                                               |
+     lordsawar          |                                               |
+     lprng              |                                               |
+     lynx               |                                               |
+     m4                 |                                               |
+     mailfromd          |                                               |
+     mailutils          |                                               |
+     make               | []                                            |
+     man-db             |                                               |
+     man-db-manpages    |                                               |
+     minicom            |                                     []        |
+     mkisofs            |                                               |
+     myserver           |                                               |
+     nano               |                               []    []        |
+     opcodes            |                                               |
+     parted             |                                               |
+     pies               |                                               |
+     popt               | []             []                   []        |
+     psmisc             |                                               |
+     pspp               |                                               |
+     pwdutils           |                                               |
+     radius             |                                               |
+     recode             |                                               |
+     rosegarden         |                                               |
+     rpm                |                                               |
+     rush               |                                               |
+     sarg               |                                               |
+     screem             |                                               |
+     scrollkeeper       |                                     []     [] |
+     sed                |                                               |
+     sharutils          |                                               |
+     shishi             |                                               |
+     skencil            |                                               |
+     solfege            |                                     []        |
+     solfege-manual     |                                               |
+     soundtracker       |                                               |
+     sp                 |                                               |
+     sysstat            |                []                             |
+     tar                |       []                                      |
+     texinfo            |                                     []        |
+     tin                |                                               |
+     unicode-han-tra... |                                               |
+     unicode-transla... |                                               |
+     util-linux-ng      |                                               |
+     vice               |                                               |
+     vmm                |                                               |
+     vorbis-tools       |                                               |
+     wastesedge         |                                               |
+     wdiff              |                                               |
+     wget               |             []                                |
+     wyslij-po          |                                               |
+     xchat              | []             [] []                          |
+     xdg-user-dirs      | [] []       [] [] []       []       [] []     |
+     xkeyboard-config   | []    []    []                                |
+                        +-----------------------------------------------+
+                          ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
+                          20  5 10  1 12 48  4  2  2  4 24 10 19  3   1
+
+                          nl  nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr
+                        +---------------------------------------------------+
+     a2ps               | []           []     []  []   [] []       []    [] |
+     aegis              | []                      []      []                |
+     ant-phone          |                         []   []                   |
+     anubis             | []           []                 []                |
+     aspell             | []                           [] []    [] []       |
+     bash               | []                                    []          |
+     bfd                |                                 []                |
+     bibshelf           | []  []                                            |
+     binutils           |                                 []    []          |
+     bison              | []           []                 []                |
+     bison-runtime      | []           []     []  []   [] []       []       |
+     bluez-pin          | []           []         []   [] []    [] []    [] |
+     bombono-dvd        |     []                          ()                |
+     buzztard           | []  []                                            |
+     cflow              |              []                                   |
+     clisp              | []                              []                |
+     coreutils          | []           []     []  []      []       []       |
+     cpio               | []           []                 []                |
+     cppi               |              []                                   |
+     cpplib             | []                                                |
+     cryptsetup         | []                                                |
+     dfarc              |              []                                   |
+     dialog             | []           []         []      []                |
+     dico               |              []                                   |
+     diffutils          | []           []         []   [] []             [] |
+     dink               | ()                                                |
+     doodle             | []                                          []    |
+     e2fsprogs          | []           []                                   |
+     enscript           | []                      []   [] []       []       |
+     exif               | []           []              [] ()    []          |
+     fetchmail          | []           []                 []          []    |
+     findutils          | []           []     []          []       []       |
+     flex               | []           []         []   [] []                |
+     freedink           | []           []                                   |
+     gas                |                                                   |
+     gawk               | []           []         []   []                   |
+     gcal               |                                                   |
+     gcc                |                                                [] |
+     gettext-examples   | []           []     []       [] []    [] []    [] |
+     gettext-runtime    | []  []       []     []       [] []    [] []    [] |
+     gettext-tools      |              []              [] []    [] []    [] |
+     gip                | []           []                 []    []       [] |
+     gjay               |                                                   |
+     gliv               | []           []         []   [] []    []          |
+     glunarclock        | []                      []   []       []       [] |
+     gnubiff            | []                           ()                   |
+     gnucash            | []           ()         ()      ()                |
+     gnuedu             | []                                                |
+     gnulib             | []           []                 []       []       |
+     gnunet             |                                                   |
+     gnunet-gtk         |                                                   |
+     gnutls             | []           []                                   |
+     gold               |                                                   |
+     gpe-aerial         | []                  []  []   [] []       []    [] |
+     gpe-beam           | []                  []  []   [] []       []    [] |
+     gpe-bluetooth      | []                      []                        |
+     gpe-calendar       |                         []      []       []    [] |
+     gpe-clock          | []                  []  []   [] []    [] []    [] |
+     gpe-conf           | []                  []  []   [] []    [] []       |
+     gpe-contacts       |                         []   [] []       []    [] |
+     gpe-edit           | []           []                          []       |
+     gpe-filemanager    | []                              []       []       |
+     gpe-go             | []           []         []   [] []    [] []    [] |
+     gpe-login          | []                      []                        |
+     gpe-ownerinfo      | []                  []  []   [] []    [] []    [] |
+     gpe-package        | []                                       []       |
+     gpe-sketchbook     | []                  []  []   [] []       []    [] |
+     gpe-su             | []                  []  []   [] []    [] []    [] |
+     gpe-taskmanager    | []                  []  []   [] []    [] []    [] |
+     gpe-timesheet      | []                  []  []   [] []    [] []    [] |
+     gpe-today          | []                  []  []   [] []    [] []    [] |
+     gpe-todo           | []                      []      []       []    [] |
+     gphoto2            | []        [] []         []   [] []    []       [] |
+     gprof              | []                      []   []                   |
+     gpsdrive           | []                              []                |
+     gramadoir          | []                                    []          |
+     grep               | []           []                 []    []          |
+     grub               | []           []                 []                |
+     gsasl              | []           []                       []       [] |
+     gss                |              []              []       []          |
+     gst-plugins-bad    | []           []         []      []    []          |
+     gst-plugins-base   | []           []         []      []    []          |
+     gst-plugins-good   | []           []         []      []    []          |
+     gst-plugins-ugly   | []           []         []      []    [] []       |
+     gstreamer          | []           []         []      []    []          |
+     gtick              | []                              []    []          |
+     gtkam              | []        [] []         []      []    []          |
+     gtkorphan          | []                                                |
+     gtkspell           | []           []     []  []   [] []    [] [] [] [] |
+     gutenprint         | []                              []                |
+     hello              | []           []                       [] []       |
+     help2man           |              []                 []                |
+     hylafax            | []                                                |
+     idutils            | []           []         []   [] []                |
+     indent             | []           []         []   [] []    []       [] |
+     iso_15924          | []           []                 []       []       |
+     iso_3166           | []  [] [] [] []     ()  []   [] [] [] [] [] [] [] |
+     iso_3166_2         | []           []                          []       |
+     iso_4217           | []  []       []     []          [] []    []    [] |
+     iso_639            | []     [] [] []                 [] [] [] []    [] |
+     iso_639_3          |        [] []                                      |
+     jwhois             | []           []         []   []                   |
+     kbd                | []           []              []                   |
+     keytouch           | []           []                       []          |
+     keytouch-editor    | []           []                       []          |
+     keytouch-keyboa... | []           []                       []          |
+     klavaro            | []                      []                        |
+     latrine            |              []                 []                |
+     ld                 |                                                   |
+     leafpad            | []  []       []     []  []      []    [] []    [] |
+     libc               | []           []                 []    []          |
+     libexif            | []           []         ()            []          |
+     libextractor       |                                                   |
+     libgnutls          | []           []                                   |
+     libgpewidget       | []           []                          []       |
+     libgpg-error       |              []              []                   |
+     libgphoto2         | []           []                                   |
+     libgphoto2_port    | []           []                 []    []          |
+     libgsasl           | []           []              []       []       [] |
+     libiconv           | []           []                       [] []    [] |
+     libidn             | []           []                                   |
+     lifelines          | []           []                                   |
+     liferea            | []           []     []  []   [] ()    ()    []    |
+     lilypond           | []                                                |
+     linkdr             | []                  []          []                |
+     lordsawar          |                                                   |
+     lprng              |              []                                   |
+     lynx               | []                      []      []                |
+     m4                 | []           []         []   [] []                |
+     mailfromd          |              []                                   |
+     mailutils          |              []                                   |
+     make               | []           []         []      []                |
+     man-db             | []           []                 []                |
+     man-db-manpages    | []           []                 []                |
+     minicom            |              []         []   [] []                |
+     mkisofs            | []           []                 []                |
+     myserver           |                                                   |
+     nano               | []           []         []      []                |
+     opcodes            | []                           []                   |
+     parted             | []           []                 []    []          |
+     pies               |              []                                   |
+     popt               | []           []     []          []                |
+     psmisc             | []           []                 []                |
+     pspp               | []                      []                        |
+     pwdutils           |              []                                   |
+     radius             | []           []                 []                |
+     recode             | []           []     []  []   [] []    [] []       |
+     rosegarden         |              ()                 ()                |
+     rpm                | []           []     []                            |
+     rush               | []           []                                   |
+     sarg               |                                                   |
+     screem             |                                                   |
+     scrollkeeper       | []  []       []              [] []    []    [] [] |
+     sed                | []           []     []  []   [] []    [] []    [] |
+     sharutils          | []           []                 []             [] |
+     shishi             |              []                                   |
+     skencil            |                     []  []                        |
+     solfege            | []           []         []      []                |
+     solfege-manual     | []           []         []                        |
+     soundtracker       |                                       []          |
+     sp                 |                                                   |
+     sysstat            | []           []         []      []                |
+     tar                | []           []                 []       []       |
+     texinfo            | []           []              [] []                |
+     tin                |                                 []                |
+     unicode-han-tra... |                                                   |
+     unicode-transla... |                                                   |
+     util-linux-ng      | []           []         []      []       []       |
+     vice               | []                                                |
+     vmm                | []                                                |
+     vorbis-tools       | []           []                                   |
+     wastesedge         | []                                                |
+     wdiff              | []           []                                   |
+     wget               | []           []     []  []      []    [] []       |
+     wyslij-po          | []  []       []                                   |
+     xchat              | []        [] []     []          []    [] [] [] [] |
+     xdg-user-dirs      | []  [] [] [] []  [] []  []   [] []    [] [] [] [] |
+     xkeyboard-config   | []           []                 []    [] []       |
+                        +---------------------------------------------------+
+                          nl  nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr
+                          135 10  4  7 105  1 29  61   47 91  3 55 47  8 37
+
+                          sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
+                        +---------------------------------------------------+
+     a2ps               | []              [] [] [] []                       | 27
+     aegis              |                          []                       |  9
+     ant-phone          | []                 []    []      []               |  9
+     anubis             | []                 [] [] []                       | 15
+     aspell             |                       [] []  []                   | 20
+     bash               | []                       []                       | 11
+     bfd                |                          []                       |  6
+     bibshelf           | []                       []      []               | 16
+     binutils           |                       [] []                       |  8
+     bison              | []                       []                       | 12
+     bison-runtime      | []              []    [] []      []          []   | 29
+     bluez-pin          | []              [] [] [] []  []  []          []   | 37
+     bombono-dvd        |                          []                       |  4
+     buzztard           |                          []                       |  7
+     cflow              |                       [] []      []               |  9
+     clisp              |                                                   | 10
+     coreutils          | []                    [] []      []               | 22
+     cpio               | []                 [] [] []      []          []   | 13
+     cppi               |                       [] []                       |  5
+     cpplib             | []                 [] [] []      []          []   | 13
+     cryptsetup         | []                       []                       |  7
+     dfarc              |                          []                       |  9
+     dialog             | []  []          []       []  []  []          []   | 30
+     dico               |                       []                          |  2
+     diffutils          | []                 [] [] []      []          []   | 30
+     dink               |                                                   |  4
+     doodle             | []                       []                       |  7
+     e2fsprogs          | []                 []    []                       | 11
+     enscript           | []                 [] [] []                       | 17
+     exif               | []                       []      []               | 16
+     fetchmail          |                    []    []      []               | 17
+     findutils          | []                 [] [] []      []               | 20
+     flex               | []                 []    []                  []   | 15
+     freedink           |                          []                       | 10
+     gas                |                    []                             |  4
+     gawk               | []                 []    []      []               | 18
+     gcal               | []                 []                             |  5
+     gcc                | []                 []            []               |  7
+     gettext-examples   | []                 [] [] []      []    []    []   | 34
+     gettext-runtime    | []                 [] [] []      []    []    []   | 30
+     gettext-tools      | []                 [] [] []      []          []   | 22
+     gip                | []                       []      []          []   | 22
+     gjay               |                          []                       |  3
+     gliv               | []                 []    []                       | 14
+     glunarclock        | []                       []  []  []          []   | 19
+     gnubiff            | []                       []                       |  4
+     gnucash            |                    () [] ()                  ()   |  9
+     gnuedu             |                          []                  []   |  7
+     gnulib             | []                    [] []      []               | 16
+     gnunet             |                          []                       |  1
+     gnunet-gtk         | []                 []    []                       |  5
+     gnutls             | []                       []      []               | 10
+     gold               |                          []                       |  4
+     gpe-aerial         | []                       []      []               | 18
+     gpe-beam           | []                       []      []               | 19
+     gpe-bluetooth      | []                       []      []               | 13
+     gpe-calendar       | []                       []  []  []               | 12
+     gpe-clock          | []                 []    []  []  []               | 28
+     gpe-conf           | []                       []  []  []               | 20
+     gpe-contacts       | []                       []      []               | 17
+     gpe-edit           | []                       []      []               | 12
+     gpe-filemanager    | []                       []  []  []               | 16
+     gpe-go             | []                 []    []  []  []               | 25
+     gpe-login          | []                       []      []               | 11
+     gpe-ownerinfo      | []                 []    []      []          []   | 25
+     gpe-package        | []                       []      []               | 13
+     gpe-sketchbook     | []                       []      []               | 20
+     gpe-su             | []                 []    []  []  []               | 30
+     gpe-taskmanager    | []                 []    []  []  []               | 29
+     gpe-timesheet      | []                 []    []      []          []   | 25
+     gpe-today          | []                 []    []  []  []          []   | 30
+     gpe-todo           | []                       []  []  []               | 17
+     gphoto2            | []                    [] []      []          []   | 24
+     gprof              | []                 []    []                       | 15
+     gpsdrive           | []                       []      []               | 11
+     gramadoir          | []                       []      []               | 11
+     grep               |                 []       []      []               | 10
+     grub               | []                       []      []               | 14
+     gsasl              | []                       []      []          []   | 14
+     gss                | []                       []      []               | 11
+     gst-plugins-bad    | []                 []    []      []               | 22
+     gst-plugins-base   | []                 [] [] []      []               | 24
+     gst-plugins-good   | []                 [] [] []      []               | 25
+     gst-plugins-ugly   | []                 [] [] []      []               | 29
+     gstreamer          | []                    [] []      []               | 22
+     gtick              |                       [] []      []               | 13
+     gtkam              | []                       []      []               | 20
+     gtkorphan          | []                       []      []               | 14
+     gtkspell           | []              [] [] [] []  []  []    []    []   | 45
+     gutenprint         | []                                                | 10
+     hello              | []              [] []    []      []          []   | 21
+     help2man           | []                       []                       |  7
+     hylafax            |                          []                       |  5
+     idutils            | []                 []    []      []               | 17
+     indent             | []                 [] [] []      []          []   | 30
+     iso_15924          |                 ()    [] ()      []          []   | 16
+     iso_3166           | []        []    () [] [] ()  []  []    []    ()   | 53
+     iso_3166_2         |                 ()    [] ()      []               |  9
+     iso_4217           | []              () [] [] ()      []    []         | 26
+     iso_639            | []     [] []    ()    [] ()  []  []    []    []   | 38
+     iso_639_3          |        []                ()                       |  8
+     jwhois             | []                 []    []      []          []   | 16
+     kbd                | []                 [] [] []      []               | 15
+     keytouch           | []                       []      []               | 16
+     keytouch-editor    | []                       []      []               | 14
+     keytouch-keyboa... | []                       []      []               | 14
+     klavaro            |                          []                       | 11
+     latrine            |                    []    []      []               | 10
+     ld                 | []                 []    []                  []   | 11
+     leafpad            | []                 [] [] []      []          []   | 33
+     libc               | []                 []    []      []          []   | 21
+     libexif            |                          []      ()               |  6
+     libextractor       |                          []                       |  1
+     libgnutls          | []                       []      []               |  9
+     libgpewidget       | []                       []      []               | 14
+     libgpg-error       | []                       []      []               |  9
+     libgphoto2         |                       [] []                       |  8
+     libgphoto2_port    | []                    [] []                  []   | 13
+     libgsasl           | []                       []      []               | 13
+     libiconv           | []                       []  []  []               | 21
+     libidn             | ()                       []      []               | 11
+     lifelines          | []                                                |  4
+     liferea            | []                 []            []               | 21
+     lilypond           |                          []                       |  7
+     linkdr             | []                 []    []      []          []   | 17
+     lordsawar          |                                                   |  1
+     lprng              |                          []                       |  3
+     lynx               | []                 [] [] []                       | 17
+     m4                 | []                       []      []          []   | 19
+     mailfromd          |                       [] []                       |  3
+     mailutils          |                          []                       |  5
+     make               | []                 []    []      []               | 21
+     man-db             | []                       []      []               |  8
+     man-db-manpages    |                                                   |  4
+     minicom            | []                       []                       | 16
+     mkisofs            |                          []      []               |  9
+     myserver           |                                                   |  0
+     nano               | []                       []      []          []   | 21
+     opcodes            | []                 []    []                       | 11
+     parted             | []                 [] [] []                  []   | 15
+     pies               |                       [] []                       |  3
+     popt               | []              [] []    []      []          []   | 27
+     psmisc             | []                       []                       | 11
+     pspp               |                                                   |  4
+     pwdutils           | []                       []                       |  6
+     radius             |                       [] []                       |  9
+     recode             | []                 []    []      []               | 28
+     rosegarden         | ()                                                |  0
+     rpm                | []                       []                  []   | 11
+     rush               |                       [] []                       |  4
+     sarg               |                                                   |  1
+     screem             |                          []                       |  3
+     scrollkeeper       | []                 [] [] []                  []   | 27
+     sed                | []                 []    []      []          []   | 30
+     sharutils          | []                 []    []      []          []   | 22
+     shishi             |                          []                       |  3
+     skencil            | []                       []                       |  7
+     solfege            | []                 []    []      []               | 16
+     solfege-manual     |                    []                             |  8
+     soundtracker       | []                 []    []                       |  9
+     sp                 |                    []                             |  3
+     sysstat            |                          []      []               | 15
+     tar                | []                 [] [] []      []          []   | 23
+     texinfo            | []                 []    []      []               | 16
+     tin                |                                                   |  4
+     unicode-han-tra... |                                                   |  0
+     unicode-transla... |                                                   |  2
+     util-linux-ng      | []                 [] [] []                       | 20
+     vice               | ()                 ()                             |  1
+     vmm                |                          []                       |  4
+     vorbis-tools       |                          []                       |  6
+     wastesedge         |                                                   |  2
+     wdiff              | []                       []                       |  7
+     wget               | []                 []    []      []          []   | 26
+     wyslij-po          |                       [] []                       |  8
+     xchat              | []              []    [] []      []          []   | 36
+     xdg-user-dirs      | []     []       [] [] [] []      []    []    []   | 60
+     xkeyboard-config   | []                 [] [] []                       | 25
+                        +---------------------------------------------------+
+       84 teams           sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
+      178 domains         119  1  3  2  0 10 66 50 155 17  97     7    41    2610
+
+   Some counters in the preceding matrix are higher than the number of
+visible blocks let us expect.  This is because a few extra PO files are
+used for implementing regional variants of languages, or language
+dialects.
+
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+distribution.
+
+   If May 2010 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
+matrix with full percentage details can be found at
+`http://translationproject.org/extra/matrix.html'.
+
+1.6 Using `gettext' in new packages
+===================================
+
+If you are writing a freely available program and want to
+internationalize it you are welcome to use GNU `gettext' in your
+package.  Of course you have to respect the GNU Library General Public
+License which covers the use of the GNU `gettext' library.  This means
+in particular that even non-free programs can use `libintl' as a shared
+library, whereas only free software can use `libintl' as a static
+library or use modified versions of `libintl'.
+
+   Once the sources are changed appropriately and the setup can handle
+the use of `gettext' the only thing missing are the translations.  The
+Free Translation Project is also available for packages which are not
+developed inside the GNU project.  Therefore the information given above
+applies also for every other Free Software Project.  Contact
+`coordinator@translationproject.org' to make the `.pot' files available
+to the translation teams.
+
diff -uNr --exclude .git --exclude .bzr dpkg/aclocal.m4 /home/vorlon/devel/multiarch/dpkg-debian/aclocal.m4
--- dpkg/aclocal.m4	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/aclocal.m4	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,1157 @@
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.11.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 9
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 10
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+#serial 5
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 16
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.62])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
+
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST(install_sh)])
+
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 6
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# Copyright (C) 2009  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 1
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# (`yes' being less verbose, `no' or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules],
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([m4/dpkg-arch.m4])
+m4_include([m4/dpkg-build.m4])
+m4_include([m4/dpkg-compiler.m4])
+m4_include([m4/dpkg-coverage.m4])
+m4_include([m4/dpkg-funcs.m4])
+m4_include([m4/dpkg-libs.m4])
+m4_include([m4/dpkg-linker.m4])
+m4_include([m4/dpkg-progs.m4])
+m4_include([m4/dpkg-types.m4])
+m4_include([m4/dpkg-unicode.m4])
+m4_include([m4/gettext.m4])
+m4_include([m4/iconv.m4])
+m4_include([m4/intlmacosx.m4])
+m4_include([m4/lib-ld.m4])
+m4_include([m4/lib-link.m4])
+m4_include([m4/lib-prefix.m4])
+m4_include([m4/nls.m4])
+m4_include([m4/po.m4])
+m4_include([m4/progtest.m4])
diff -uNr --exclude .git --exclude .bzr dpkg/build-aux/config.guess /home/vorlon/devel/multiarch/dpkg-debian/build-aux/config.guess
--- dpkg/build-aux/config.guess	2012-03-30 13:31:00.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/build-aux/config.guess	2012-06-07 10:11:09.426073000 -0700
@@ -2,9 +2,9 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2011-05-11'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,7 +17,9 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -55,8 +57,8 @@
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -143,7 +145,7 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -790,12 +792,13 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -804,9 +807,6 @@
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
     i*:windows32*:*)
 	# uname -m includes "-pc" on this system.
 	echo ${UNAME_MACHINE}-mingw32
@@ -861,13 +861,6 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -902,16 +895,13 @@
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo cris-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo frv-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -953,7 +943,7 @@
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo or32-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -988,13 +978,13 @@
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -1325,9 +1315,6 @@
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff -uNr --exclude .git --exclude .bzr dpkg/build-aux/config.sub /home/vorlon/devel/multiarch/dpkg-debian/build-aux/config.sub
--- dpkg/build-aux/config.sub	2012-03-30 13:31:00.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/build-aux/config.sub	2012-06-07 10:11:09.426073000 -0700
@@ -2,9 +2,9 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2011-03-23'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,7 +21,9 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -74,8 +76,8 @@
 GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -130,10 +132,6 @@
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -249,22 +247,17 @@
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
-	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
@@ -298,7 +291,7 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rl78 | rx \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -307,7 +300,7 @@
 	| spu \
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -322,7 +315,8 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -335,10 +329,7 @@
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
+
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
@@ -361,13 +352,11 @@
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
-	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
-	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -376,10 +365,8 @@
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -413,7 +400,7 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -421,11 +408,10 @@
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
+	| tile-* | tilegx-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
+	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -725,6 +711,7 @@
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -821,18 +808,10 @@
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
-	msys)
-		basic_machine=i386-pc
-		os=-msys
-		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -1141,8 +1120,13 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
+	# This must be matched before tile*.
+	tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
+		;;
 	tile*)
-		basic_machine=$basic_machine-unknown
+		basic_machine=tile-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1352,7 +1336,7 @@
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1564,6 +1548,9 @@
 		;;
 	m68000-sun)
 		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
diff -uNr --exclude .git --exclude .bzr dpkg/build-aux/depcomp /home/vorlon/devel/multiarch/dpkg-debian/build-aux/depcomp
--- dpkg/build-aux/depcomp	2012-04-02 10:37:09.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/build-aux/depcomp	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-12-04.11; # UTC
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+# Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
   object      Object file output by `PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputting dependencies.
+  tmpdepfile  Temporary file to use when outputing dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -90,18 +90,10 @@
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
+   cygpath_u="sed s,\\\\\\\\,/,g"
    depmode=msvisualcpp
 fi
 
-if test "$depmode" = msvc7msys; then
-   # This is just like msvc7 but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvc7
-fi
-
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -166,12 +158,10 @@
 ' < "$tmpdepfile" |
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.  hp depmode also adds that space, but also prefixes the VPATH
-## to the object.  Take care to not repeat it in the output.
+## well.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-      | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -415,52 +405,6 @@
    rm -f "$tmpdepfile"
    ;;
 
-msvc7)
-  if test "$libtool" = yes; then
-    showIncludes=-Wc,-showIncludes
-  else
-    showIncludes=-showIncludes
-  fi
-  "$@" $showIncludes > "$tmpdepfile"
-  stat=$?
-  grep -v '^Note: including file: ' "$tmpdepfile"
-  if test "$stat" = 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The first sed program below extracts the file names and escapes
-  # backslashes for cygpath.  The second sed program outputs the file
-  # name when reading, but also accumulates all include files in the
-  # hold buffer in order to output them again at the end.  This only
-  # works with sed implementations that can handle large buffers.
-  sed < "$tmpdepfile" -n '
-/^Note: including file:  *\(.*\)/ {
-  s//\1/
-  s/\\/\\\\/g
-  p
-}' | $cygpath_u | sort -u | sed -n '
-s/ /\\ /g
-s/\(.*\)/	\1 \\/p
-s/.\(.*\) \\/\1:/
-H
-$ {
-  s/.*/	/
-  G
-  p
-}' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvc7msys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
   # dependency tracking mechanisms from slower ones.
@@ -559,9 +503,7 @@
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  # makedepend may prepend the VPATH from the source file name to the object.
-  # No need to regex-escape $object, excess matching of '.' is harmless.
-  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
   sed '1,2d' "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
diff -uNr --exclude .git --exclude .bzr dpkg/build-aux/install-sh /home/vorlon/devel/multiarch/dpkg-debian/build-aux/install-sh
--- dpkg/build-aux/install-sh	2012-04-02 10:37:09.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/build-aux/install-sh	2012-06-07 10:11:09.426073000 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,10 +156,6 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
-	# Protect names problematic for `test' and other utilities.
-	case $dst_arg in
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -190,10 +186,6 @@
     fi
     shift # arg
     dst_arg=$arg
-    # Protect names problematic for `test' and other utilities.
-    case $dst_arg in
-      -* | [=\(\)!]) dst_arg=./$dst_arg;;
-    esac
   done
 fi
 
@@ -208,11 +200,7 @@
 fi
 
 if test -z "$dir_arg"; then
-  do_exit='(exit $ret); exit $ret'
-  trap "ret=129; $do_exit" 1
-  trap "ret=130; $do_exit" 2
-  trap "ret=141; $do_exit" 13
-  trap "ret=143; $do_exit" 15
+  trap '(exit $?); exit' 1 2 13 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -240,9 +228,9 @@
 
 for src
 do
-  # Protect names problematic for `test' and other utilities.
+  # Protect names starting with `-'.
   case $src in
-    -* | [=\(\)!]) src=./$src;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -264,7 +252,12 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
+
     dst=$dst_arg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst;;
+    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -392,7 +385,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	[-=\(\)!]*) prefix='./';;
+	-*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -410,7 +403,7 @@
 
       for d
       do
-	test X"$d" = X && continue
+	test -z "$d" && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
diff -uNr --exclude .git --exclude .bzr dpkg/build-aux/missing /home/vorlon/devel/multiarch/dpkg-debian/build-aux/missing
--- dpkg/build-aux/missing	2012-04-02 10:37:09.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/build-aux/missing	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2009-04-28.21; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2008, 2009 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,6 +84,7 @@
   help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -121,6 +122,15 @@
     # Not GNU programs, they don't have --version.
     ;;
 
+  tar*)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -216,7 +226,7 @@
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG=\${$#}
+        eval LASTARG="\${$#}"
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -246,7 +256,7 @@
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG=\${$#}
+        eval LASTARG="\${$#}"
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -308,6 +318,41 @@
     touch $file
     ;;
 
+  tar*)
+    shift
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case $firstarg in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case $firstarg in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.
diff -uNr --exclude .git --exclude .bzr dpkg/build-aux/ylwrap /home/vorlon/devel/multiarch/dpkg-debian/build-aux/ylwrap
--- dpkg/build-aux/ylwrap	2012-04-02 10:37:09.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/build-aux/ylwrap	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2011-08-25.18; # UTC
+scriptversion=2009-04-28.21; # UTC
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+# 2007, 2009 Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
@@ -99,11 +99,7 @@
 # FIXME: add hostname here for parallel makes that run commands on
 # other machines.  But that might take us over the 14-char limit.
 dirname=ylwrap$$
-do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret'
-trap "ret=129; $do_exit" 1
-trap "ret=130; $do_exit" 2
-trap "ret=141; $do_exit" 13
-trap "ret=143; $do_exit" 15
+trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
 mkdir $dirname || exit 1
 
 cd $dirname
@@ -137,19 +133,19 @@
     # Handle y_tab.c and y_tab.h output by DOS
     if test $y_tab_nodot = "yes"; then
       if test $from = "y.tab.c"; then
-        from="y_tab.c"
+    	from="y_tab.c"
       else
-        if test $from = "y.tab.h"; then
-          from="y_tab.h"
-        fi
+    	if test $from = "y.tab.h"; then
+    	  from="y_tab.h"
+    	fi
       fi
     fi
     if test -f "$from"; then
       # If $2 is an absolute path name, then just use that,
       # otherwise prepend `../'.
       case "$2" in
-        [\\/]* | ?:[\\/]*) target="$2";;
-        *) target="../$2";;
+    	[\\/]* | ?:[\\/]*) target="$2";;
+    	*) target="../$2";;
       esac
 
       # We do not want to overwrite a header file if it hasn't
@@ -159,8 +155,8 @@
       # Makefile.  Divert the output of all other files to a temporary
       # file so we can compare them to existing versions.
       if test $first = no; then
-        realtarget="$target"
-        target="tmp-`echo $target | sed s/.*[\\/]//g`"
+	realtarget="$target"
+	target="tmp-`echo $target | sed s/.*[\\/]//g`"
       fi
       # Edit out `#line' or `#' directives.
       #
@@ -184,10 +180,10 @@
 
       # Check whether header files must be updated.
       if test $first = no; then
-        if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
-          echo "$2" is unchanged
-          rm -f "$target"
-        else
+	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+	  echo "$2" is unchanged
+	  rm -f "$target"
+	else
           echo updating "$2"
           mv -f "$target" "$realtarget"
         fi
diff -uNr --exclude .git --exclude .bzr dpkg/.bzr-builddeb/default.conf /home/vorlon/devel/multiarch/dpkg-debian/.bzr-builddeb/default.conf
--- dpkg/.bzr-builddeb/default.conf	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/.bzr-builddeb/default.conf	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,2 @@
+[BUILDDEB]
+native = True
diff -uNr --exclude .git --exclude .bzr dpkg/ChangeLog /home/vorlon/devel/multiarch/dpkg-debian/ChangeLog
--- dpkg/ChangeLog	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/ChangeLog	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,35719 @@
+commit 0d03dd4a12e4f860baf36b46f0dc890a4079d26a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Nov 25 11:20:03 2011 +0100
+
+    Release 1.16.1.2
+
+ debian/changelog |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 274f81385cecbca04826308d52e19438b62a4467
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Fri Oct 21 01:26:12 2011 -0500
+
+    dpkg-buildflags(1): -D_FORTIFY_SOURCE=2 goes in CPPFLAGS
+    
+    In 1.16.1.1~8 (2011-10-02), dpkg-buildflags learned to set
+    -D_FORTIFY_SOURCE=2 in CPPFLAGS instead of CFLAGS and CXXFLAGS but the
+    documentation wasn't updated to match.
+    
+    Reported-by: James Vega <jamessan@debian.org>
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Closes: #646073
+
+ debian/changelog      |    6 ++++++
+ man/dpkg-buildflags.1 |    2 +-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 9cc83ca6ff8de35c114d83f7307f1f7cbcd3704f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Oct 15 10:53:38 2011 +0200
+
+    scripts/mk: fix typo to correctly set DEB_*_ARCH_BITS in architecture.mk
+
+ debian/changelog           |    6 ++++++
+ scripts/mk/architecture.mk |    4 ++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+commit 9babd2d62709dd694c74fd716543c5561e169038
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Oct 14 07:08:40 2011 +0200
+
+    Release 1.16.1.1
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 343c4935b8b7f57281564659aa6ff0d3c925d5ab
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Oct 13 10:28:58 2011 +0200
+
+    dpkg-buildflags: Disable bindnow if relro is not used
+    
+    There is no point in enabling full relro (aka bindnow) if relro is
+    not enabled. It just brings its disadvantages and none of its possible
+    advantages.
+
+ debian/changelog              |    1 +
+ scripts/Dpkg/Vendor/Debian.pm |    3 +++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 44aa764eb17a7665c291b424ddc3a4b6ef5a0754
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Oct 10 10:50:02 2011 +0200
+
+    scripts/mk: fix buildflags.mk to make use of the DEB_*_MAINT_* variables
+    
+    Make does not export its own variables (even those which have been
+    exported explicitly) to sub-shells executed with $(shell …). Since
+    dpkg-buildflags is called that way, we have to modify the command
+    line to embed variable initializations to ensure that we forward the
+    variables that have been set by the maintainer in debian/rules.
+    
+    Since this code required to loop over all possible flags, I took
+    the opportunity to also set the output variables within a loop construct
+    using a single template (avoids copy&paste mistakes).
+    
+    Reported-by: Pierre Chifflier <pollux@debian.org>
+
+ debian/changelog         |    2 ++
+ scripts/mk/buildflags.mk |   24 ++++++++++++++++++------
+ 2 files changed, 20 insertions(+), 6 deletions(-)
+
+commit ceb939d278689634037115a728fd7c083d0e4a39
+Author: Thorsten Glaser <tg@mirbsd.org>
+Date:   Sat Oct 8 17:25:08 2011 +0000
+
+    scripts/mk: Fix typo by setting DEB_*_ARCH_BITS instead of DEB_*_ARCH
+    
+    Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog           |    2 ++
+ scripts/mk/architecture.mk |    4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit f18c197931e280ff3594dd06585ad1a15e24bc28
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 6 16:54:57 2011 +0200
+
+    dpkg-source: ignore changes on debian/patches/.dpkg-source-applied
+    
+    With 2.0 source packages, dpkg-source records as a comment in
+    debian/patches/.dpkg-source-applied whether the patches have
+    been applied at build time or at unpack time.
+    
+    This can lead to differences between the file in the build tree
+    and the file in the reference tree used to check for changes.
+    Thus we need to ignore that file in the diff process or the build
+    might fail considering this difference as a local change that
+    has not been recorded in a patch.
+    
+    Reported-by: Jakub Wilk <jwilk@debian.org>
+
+ debian/changelog                  |    2 ++
+ scripts/Dpkg/Source/Package/V2.pm |    3 ++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 2cece5eb5d61df91e7e774511c19785afe26f596
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 6 16:17:02 2011 +0200
+
+    Updade changelog to include some missing bug closures
+
+ debian/changelog |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 667bae316a302c0f62e5e38a6c791a62785af4b2
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 6 15:32:36 2011 +0200
+
+    dpkg: fix trigger setup code to not reset the status of unconfigured packages
+    
+    The change in commit a36cadba41b19d5908bdfcb658cf01af07c1436a was wrongly
+    assuming that all packages would be in one of the states
+    triggers-awaited, triggers-pending or installed when
+    trig_transitional_activate kicks in.
+    
+    That is not the case and the status reset should hence only be done when
+    the current status is already such that the trigger information are
+    meaningful. transitional_interest_callback_ro() is already taking care
+    to not add anything in the Triggers-Pending field when the status
+    is such that it would not make sense.
+    
+    Reported-by: Hector Oron <hector.oron@gmail.com>
+
+ debian/changelog |    3 +++
+ src/trigproc.c   |    2 ++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 128ece24446b5e7a701f94d9bdcc4c6a3c8410e3
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 2 09:44:14 2011 +0200
+
+    dpkg-buildpackage: no longer output the build flags
+    
+    Because dpkg-buildpackage is no longer setting the corresponding
+    environment variables, and because it confuses maintainers
+    who are overriding them via debian/rules and who are not seeing
+    the expected values in their build log.
+
+ debian/changelog             |    3 +++
+ scripts/dpkg-buildpackage.pl |    8 --------
+ 2 files changed, 3 insertions(+), 8 deletions(-)
+
+commit feac1f983ce3fb45266283ba07483e029095b022
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 2 09:06:53 2011 +0200
+
+    dpkg-buildflags: Set preprocessor option -D_FORTIFY_SOURCE=2 in CPPFLAGS
+    
+    Instead of setting it in the CFLAGS and CXXFLAGS variables.
+    
+    Closes: #642521, #643632
+
+ debian/changelog              |    5 +++++
+ scripts/Dpkg/Vendor/Debian.pm |    3 +--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 570886809efd1b551072fe52ccfd4e50a4175375
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Sep 29 14:23:24 2011 +0200
+
+    dpkg-buildflags(1): drop the quotes when setting DEB_BUILD_MAINT_OPTIONS
+    
+    DEB_BUILD_MAINT_OPTIONS is usually set in a Makefile and make puts the
+    quotes in the variable value (i.e. it doesn't use them to delimit the
+    value). This is obviously not wanted so let's fix the examples.
+
+ debian/changelog      |    2 ++
+ man/dpkg-buildflags.1 |    4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit dd483ad8e4484e466f98e3d2deccaaa75cae099f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Sep 29 14:13:47 2011 +0200
+
+    dpkg-buildflags: fix --dump to return 0 as exit code
+    
+    Reported-by: Yves-Alexis Perez <corsac@debian.org>
+
+ debian/changelog           |    1 +
+ scripts/dpkg-buildflags.pl |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit bd4c055562a3cbfa1c74b55348e545b2fcdd3393
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Sep 27 09:01:52 2011 +0200
+
+    dpkg-source: let --commit create debian/patches when required
+    
+    Reported-by: Jakub Wilk <jwilk@debian.org>
+
+ debian/changelog                  |    1 +
+ scripts/Dpkg/Source/Package/V2.pm |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 669e0ff496e6870c06de82da111ba069263a0456
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Sep 27 08:44:12 2011 +0200
+
+    dpkg-source: do not ignore the automatic patch when checking for unrecorded changes
+    
+    The former behaviour to always generate the automatic patch required to
+    not apply it on the tree used as a basis for the patch generation. That
+    way it could be updated at each build.
+    
+    With the new behaviour to fail on any new change, we should no longer
+    ignore it. It must be applied on the reference tree except when
+    --auto-commit is on.
+    
+    This should fix 227 (source package) build failures in Debian unstable.
+
+ debian/changelog                  |    7 +++++++
+ scripts/Dpkg/Source/Package/V2.pm |   18 +++++++++++-------
+ 2 files changed, 18 insertions(+), 7 deletions(-)
+
+commit 437f8b53910c0b59df6182fc23a1485f8638c745
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 23 06:00:18 2011 +0200
+
+    Release 1.16.1
+
+ debian/changelog |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit e64ab34cd022b2d4381c85643ef29a0f0df42394
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 23 05:59:26 2011 +0200
+
+    Add debian/changelog entry for .deb large file support (LFS) fixes
+
+ debian/changelog |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 75909e0cb643ee165929f405cca6c82eb6242b04
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 23 03:49:53 2011 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |    2 +-
+ dselect/po/ca.po        |    2 +-
+ dselect/po/cs.po        |    2 +-
+ dselect/po/da.po        |    2 +-
+ dselect/po/de.po        |    2 +-
+ dselect/po/dselect.pot  |    4 +-
+ dselect/po/el.po        |    2 +-
+ dselect/po/es.po        |    2 +-
+ dselect/po/et.po        |    2 +-
+ dselect/po/eu.po        |    2 +-
+ dselect/po/fr.po        |    2 +-
+ dselect/po/gl.po        |    2 +-
+ dselect/po/hu.po        |    2 +-
+ dselect/po/id.po        |    2 +-
+ dselect/po/it.po        |    2 +-
+ dselect/po/ja.po        |    2 +-
+ dselect/po/ko.po        |    2 +-
+ dselect/po/nb.po        |    2 +-
+ dselect/po/nl.po        |    2 +-
+ dselect/po/nn.po        |    2 +-
+ dselect/po/pl.po        |    2 +-
+ dselect/po/pt.po        |    2 +-
+ dselect/po/pt_BR.po     |    2 +-
+ dselect/po/ro.po        |    2 +-
+ dselect/po/ru.po        |    2 +-
+ dselect/po/sk.po        |    2 +-
+ dselect/po/sv.po        |    2 +-
+ dselect/po/tl.po        |    2 +-
+ dselect/po/vi.po        |    2 +-
+ dselect/po/zh_CN.po     |    2 +-
+ dselect/po/zh_TW.po     |    2 +-
+ man/po/de.po            |   22 +-
+ man/po/dpkg-man.pot     |  454 ++++++++++++++-------
+ man/po/es.po            |  447 +++++++++++++++-----
+ man/po/fr.po            |  479 +++++++++++++++++-----
+ man/po/hu.po            |  398 +++++++++++++-----
+ man/po/ja.po            |  405 ++++++++++++++-----
+ man/po/pl.po            |  445 +++++++++++++++------
+ man/po/pt_BR.po         |  395 +++++++++++++-----
+ man/po/ru.po            |  401 +++++++++++++-----
+ man/po/sv.po            |  114 +-----
+ po/ast.po               | 1021 ++++++++++++++++++++++++----------------------
+ po/bs.po                |  976 ++++++++++++++++++++++----------------------
+ po/ca.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/cs.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/da.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/de.po                |  412 ++++++++++---------
+ po/dpkg.pot             |  978 ++++++++++++++++++++++----------------------
+ po/dz.po                | 1013 +++++++++++++++++++++++----------------------
+ po/el.po                | 1015 +++++++++++++++++++++++----------------------
+ po/eo.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/es.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/et.po                | 1009 +++++++++++++++++++++++----------------------
+ po/eu.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/fr.po                | 1043 ++++++++++++++++++++++++----------------------
+ po/gl.po                | 1015 +++++++++++++++++++++++----------------------
+ po/hu.po                | 1015 +++++++++++++++++++++++----------------------
+ po/id.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/it.po                | 1045 ++++++++++++++++++++++++----------------------
+ po/ja.po                | 1042 ++++++++++++++++++++++++----------------------
+ po/km.po                | 1013 +++++++++++++++++++++++----------------------
+ po/ko.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/ku.po                |  978 ++++++++++++++++++++++----------------------
+ po/lt.po                | 1001 +++++++++++++++++++++++----------------------
+ po/mr.po                | 1001 +++++++++++++++++++++++----------------------
+ po/nb.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/ne.po                | 1013 +++++++++++++++++++++++----------------------
+ po/nl.po                | 1015 +++++++++++++++++++++++----------------------
+ po/nn.po                |  995 +++++++++++++++++++++++----------------------
+ po/pa.po                | 1014 +++++++++++++++++++++++----------------------
+ po/pl.po                | 1021 ++++++++++++++++++++++++----------------------
+ po/pt.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/pt_BR.po             | 1015 +++++++++++++++++++++++----------------------
+ po/ro.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/ru.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/sk.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/sv.po                |  443 ++++++++++-----------
+ po/th.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/tl.po                |  995 +++++++++++++++++++++++----------------------
+ po/vi.po                | 1038 ++++++++++++++++++++++++----------------------
+ po/zh_CN.po             | 1038 ++++++++++++++++++++++++----------------------
+ po/zh_TW.po             | 1013 +++++++++++++++++++++++----------------------
+ scripts/po/ca.po        |  111 +++---
+ scripts/po/de.po        |    5 +-
+ scripts/po/dpkg-dev.pot |  111 +++---
+ scripts/po/es.po        |  117 +++---
+ scripts/po/fr.po        |  124 ++++---
+ scripts/po/pl.po        |  116 +++---
+ scripts/po/ru.po        |  117 +++---
+ scripts/po/sv.po        |    5 +-
+ 90 files changed, 23917 insertions(+), 21122 deletions(-)
+
+commit e70decaabe0eb0ecec595a56ec4b06318454f478
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 21 21:13:47 2011 +0200
+
+    Add project documentation to the top level README
+    
+    This will help people getting the source from git, or downstream
+    packagers on how to build from source or interact with the
+    maintainers.
+
+ README |  113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 110 insertions(+), 3 deletions(-)
+
+commit 7af8fb2f01df10ffd65b733772fd3ef88f808cc3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 13 08:47:58 2011 +0200
+
+    dpkg-buildflags: Disable bind now by default
+    
+    This option has a startup performance hit on slow systems, particularly
+    due to slow I/O, the effects of which cannot be reverted except for a
+    rebuild. It might make sense for long running processes where the
+    startup time is not that important, and the security improvements do
+    actually matter. Another option is to set the environment variable
+    LD_BIND_NOW=1 for the long running process, so that the sysadmin can
+    disable it if desired.
+
+ man/dpkg-buildflags.1         |    4 ++--
+ scripts/Dpkg/Vendor/Debian.pm |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 7cdaeb8a1cf5d69dafca107ab30dfad3ece1ee16
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 22 04:18:05 2011 +0200
+
+    scripts/mk: Simplify sed expression for DEB_DISTRIBUTION
+
+ scripts/mk/pkg-info.mk |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit cfba9b80fea680d561671713b78044c365a14924
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Sep 21 22:44:00 2011 +0200
+
+    scripts/mk/pkg-info.mk: DEB_DISTRIBUTION returns all listed distributions
+    
+    Update DEB_DISTRIBUTION to return all distributions listed in the current
+    changelog entry instead of only the first one.
+
+ scripts/mk/pkg-info.mk |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c10517e66a9d62b4a2be9b08f7d3f42378c46ff9
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Sep 21 08:48:37 2011 +0200
+
+    scripts/mk/pkg-info.mk: adjust variable names
+    
+    Rename DEB_VERSION_NOREV and DEB_VERSION_NOEPOCH to
+    DEB_VERSION_EPOCH_UPSTREAM and DEB_VERSION_UPSTREAM_REVISION to define
+    them by inclusion rather than by exclusion.
+    
+    Rename DEB_SOURCE_PACKAGE into the less verbose DEB_SOURCE.
+    
+    Suggested-by: Guillem Jover <guillem@debian.org>
+
+ scripts/mk/pkg-info.mk |   16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+commit 966a4f6bd2ef733aba463e1c89a6a5aebfc3499e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Sep 19 17:40:04 2011 +0200
+
+    build: Pack [type:man] entries in po4a.cfg
+    
+    There's a huge amount of blank lines which mostly distract from the
+    actual content, remove them and fold the lines referring to the man
+    page into a single line and leave the addendum line on its own.
+
+ man/po/po4a.cfg |  165 ++++++++++++++-----------------------------------------
+ 1 files changed, 41 insertions(+), 124 deletions(-)
+
+commit 0ed90da7f4ec6828d85dc78a98b3c8d32f55151b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Sep 19 17:12:56 2011 +0200
+
+    build: Merge PO4A_COMMON_OPTS and PO4A_BUILD_OPTS into PO4A_OPTS
+
+ man/Makefile.am |    7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+commit 822ea85c7c16d45f932f9c86f5ac0a04a8c304c2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Sep 19 17:01:23 2011 +0200
+
+    build: Use po4a --srcdir and --builddir
+    
+    This avoids the absolute paths in the po4a Discard output messages,
+    and simplifies the build infrastructure by not needing the change
+    directory gymnastics and builddir po4a variable in the po4a.cfg file.
+    
+    It's been enough time now since #538136 was filed precisely for dpkg
+    needs, to rely on these “new” options.
+
+ debian/changelog |    2 +
+ debian/control   |    2 +-
+ man/Makefile.am  |    8 ++---
+ man/po/po4a.cfg  |   82 +++++++++++++++++++++++++++---------------------------
+ 4 files changed, 47 insertions(+), 47 deletions(-)
+
+commit 572caf52457bc4158f6443aa455414e1d5e861dd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Sep 19 16:48:51 2011 +0200
+
+    build: Use rm instead of po4a on make clean to not change the .pot file
+    
+    There's no way to invoke po4a for the clean target w/o it possibly
+    modifying the .pot file, which makes the distcheck target fail in
+    that case.
+
+ man/Makefile.am |    8 +-------
+ 1 files changed, 1 insertions(+), 7 deletions(-)
+
+commit 3081af870546d7920d56a44611b7bc185286bda8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Sep 19 16:34:14 2011 +0200
+
+    build: Place all man rules at the end of the Makefile.am
+
+ man/Makefile.am |  146 ++++++++++++++++++++++++++++---------------------------
+ 1 files changed, 74 insertions(+), 72 deletions(-)
+
+commit 5fc9084fd7c439bbc73a3628b513e028c984ac29
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 18 19:22:59 2011 +0200
+
+    dpkg: Destroy the dpkg_error variables on warnings
+    
+    The leak on cmpversions() does not pose any issue on normal operation as
+    the program will exit immediately and the memory will be freed by the
+    system, but once --command-fd is enabled, it could actually be a problem
+    due to a long running dpkg process leaking repeatedly.
+    
+    The leak on parse_db_version() is actually problematic as it can act
+    repeatedly if there's tons of warnings when parsing.
+    
+    Regression introduced in commit ccc26399f2f0e295da1206c5ce81fe81a5dc0e21.
+    
+    Reported-by: Niels Thykier <niels@thykier.net>
+
+ lib/dpkg/parsehelp.c |    2 ++
+ src/enquiry.c        |    2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit e2f95d8abee9978f480c8e1e4a31ed420900509c
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Sep 18 09:42:48 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2064t.
+
+ man/po/de.po |   46 +++++++++++++++++++++++-----------------------
+ 1 files changed, 23 insertions(+), 23 deletions(-)
+
+commit 96f21bd6d8cac9ce75726ba2626fbac86933bf9f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 16 23:39:09 2011 +0200
+
+    build: Ignore perl test programs for coverage report
+
+ scripts/Makefile.am |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit c24e8eba3b4fa687e77259822e9ae91735ac1941
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 16 22:17:09 2011 +0200
+
+    s-s-d(8): Document the optional “:group|gid” argument for --chuid
+
+ debian/changelog        |    1 +
+ man/start-stop-daemon.8 |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 49ad180074dd59337622c568391770936cf912c4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 16 19:41:31 2011 +0200
+
+    s-s-d: Reset the user and group names from the password entry on --chuid
+    
+    This guarantees the initgroups() call will not fail when the user
+    specified the user to change to as a uid instead of a username.
+    
+    Closes: #641834
+    
+    Reported-by: Andreas Pretzsch <apr@cn-eng.de>
+
+ debian/changelog          |    2 ++
+ utils/start-stop-daemon.c |    2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit f82c23a76d028c3b7d4df41d51a8eaacb5162b88
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 15 04:41:30 2011 +0200
+
+    s-s-d: Fix do_procinit() on OSHurd, OShpux and HAVE_KVM_H
+    
+    The function on those systems did not have their return code updated
+    for the status code.
+
+ utils/start-stop-daemon.c |   24 +++++++++++++++++++-----
+ 1 files changed, 19 insertions(+), 5 deletions(-)
+
+commit 9805ef20ebf7141c419376af68e7476b5c0dd5c0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 14 23:32:43 2011 +0200
+
+    s-s-d: Cast proc_stat_owner_uid() to uid_t to fix a warning
+
+ utils/start-stop-daemon.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8e5585ff0c70be2070190defa6c2d04039c3fcb4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 13 08:50:03 2011 +0200
+
+    dpkg-buildflags(1): Fix ld option name from -z,bindnow to -z,now
+
+ man/dpkg-buildflags.1 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 82f4497f3bbe41d52fe697868d53732bb355da81
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 13 05:19:50 2011 +0200
+
+    u-a: Free struct alternative_map variables
+    
+    Take references when adding duplicate entries of the same alternative
+    on load, and add a new alternative_map_free() function to free an
+    alternative_map variable.
+
+ utils/update-alternatives.c |   23 +++++++++++++++++++++++
+ 1 files changed, 23 insertions(+), 0 deletions(-)
+
+commit 3b2b9aea518f3e3a562a57a9d7caa2623b4876ff
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 13 05:17:34 2011 +0200
+
+    u-a: Add ref counting support to struct alternative
+    
+    This will allow to properly free an alternative map which contains
+    duplicated references to the same alternative struct.
+
+ utils/update-alternatives.c |   17 +++++++++++++++++
+ 1 files changed, 17 insertions(+), 0 deletions(-)
+
+commit d918d025f1ef1c15b76eb2fcc14d5830514937a9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 18 07:11:48 2011 +0200
+
+    dpkg: Do not fail on version parsing warnings in --compare-versions
+    
+    The bogus versions might get fed into «dpkg --compare-versions» by
+    way of maintainer scripts, which would get the bogus versions from
+    the database, somewhere dpkg still allows those to exist.
+
+ debian/changelog |    3 +++
+ src/enquiry.c    |   16 ++++++++++++----
+ 2 files changed, 15 insertions(+), 4 deletions(-)
+
+commit ccc26399f2f0e295da1206c5ce81fe81a5dc0e21
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 14 04:18:47 2011 +0200
+
+    libdpkg: Switch parseversion() to use dpkg_error
+    
+    This allows to merge back the parseversion_lax() and
+    version_strict_check() functions into a single parseversion(), which
+    performs all the validation, but issues different types of dpkg_error
+    messages on error. Which simplifies parse_db_version() and will allow
+    for callers to distinguish the error conditions and handle them as
+    they see fit.
+
+ lib/dpkg/dpkg-db.h        |    5 ++-
+ lib/dpkg/parsehelp.c      |  100 ++++++++++++++++++---------------------------
+ lib/dpkg/test/t-version.c |   69 ++++++++++++++++++++-----------
+ src/enquiry.c             |   12 ++---
+ 4 files changed, 94 insertions(+), 92 deletions(-)
+
+commit b03f212d3a29bef2be2f269f0656e482bb9e56ad
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 10 19:50:15 2011 +0200
+
+    libdpkg: Add new error module
+    
+    This new module provides error reporting infrastructure, which will
+    be used to report back error information from inner functions that
+    are not supposed to ohshit() directly, the caller should be
+    responsible for the outcome, including just forwarding the error
+    to its own caller.
+
+ lib/dpkg/Makefile.am |    2 +
+ lib/dpkg/error.c     |   93 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/error.h     |   49 ++++++++++++++++++++++++++
+ 3 files changed, 144 insertions(+), 0 deletions(-)
+
+commit 07a8f6d882c019ed039442237c53d8333dc9c4a5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 16 17:23:53 2011 +0200
+
+    libdpkg: Add more test cases for version parsing failures
+
+ lib/dpkg/test/t-version.c |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 11bb86fe8aa208de4453589da31cf5c62649f091
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 14 05:07:19 2011 +0200
+
+    libdpkg: Rename err variables to z_errnum and bz_errnum
+    
+    Make the variables more specific and clear about their intended purpose.
+
+ lib/dpkg/compress.c |   38 +++++++++++++++++++-------------------
+ 1 files changed, 19 insertions(+), 19 deletions(-)
+
+commit 39a535646fe17f4f9d9db88295e406443d1bc40a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 10 10:14:40 2011 +0200
+
+    libdpkg: Move ohshite calls into the buffer_copy loop
+
+ lib/dpkg/buffer.c |    8 ++------
+ 1 files changed, 2 insertions(+), 6 deletions(-)
+
+commit 49a0022b72df33589fc416c30dc33a82f5f58ea6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 17 15:58:51 2011 +0200
+
+    libdpkg: Refactor path basename code into new path_basename function
+    
+    This function is an equivalent of the GNU basename, but this one will
+    work consistently on any system regardless of libc used.
+
+ dpkg-split/split.c     |    8 +++-----
+ lib/dpkg/command.c     |   11 +++++------
+ lib/dpkg/path.c        |   21 ++++++++++++++++++++-
+ lib/dpkg/path.h        |    3 ++-
+ lib/dpkg/progname.c    |   10 ++--------
+ lib/dpkg/test/t-path.c |   13 +++++++++++++
+ src/configure.c        |    5 ++---
+ 7 files changed, 47 insertions(+), 24 deletions(-)
+
+commit b6b23a82594019d08dcdaf4f8b2a238dce78c945
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 17 05:09:56 2011 +0200
+
+    libdpkg: Add new mod-db, progname and subproc modules test cases
+
+ lib/dpkg/test/.gitignore   |    3 +
+ lib/dpkg/test/Makefile.am  |    6 ++-
+ lib/dpkg/test/t-mod-db.c   |   56 +++++++++++++++++++++++++++
+ lib/dpkg/test/t-progname.c |   46 ++++++++++++++++++++++
+ lib/dpkg/test/t-subproc.c  |   91 ++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 201 insertions(+), 1 deletions(-)
+
+commit 7e26acd008d38f6d56c26e6a595430636ea40211
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 17 05:07:13 2011 +0200
+
+    libdpkg: Add missing test cases for the command and varbuf modules
+
+ lib/dpkg/test/t-command.c |   22 +++++++++++++++++++++-
+ lib/dpkg/test/t-varbuf.c  |   24 ++++++++++++++++++++++++
+ 2 files changed, 45 insertions(+), 1 deletions(-)
+
+commit 02b48efd59416b79a51e9a08ef576df6110f4f8a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 16 19:46:37 2011 +0200
+
+    libdpkg: Unify test_varbuf_add function naming
+
+ lib/dpkg/test/t-varbuf.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 4aadfe74c5cce5a6acc45e1527d64583ee1b4d45
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 11 05:14:30 2011 +0200
+
+    dpkg-split: Do not include trailing slash in PARTSDIR
+
+ dpkg-split/dpkg-split.h |    2 +-
+ dpkg-split/main.c       |   10 ----------
+ dpkg-split/queue.c      |    9 ++++-----
+ 3 files changed, 5 insertions(+), 16 deletions(-)
+
+commit 172b6bcca0e5a757e0e0bd132c319abe447f3e01
+Author: Peter Krefting <peterk@debian.org>
+Date:   Wed Sep 14 07:39:51 2011 +0100
+
+    Fixed typo in Swedish man page translation.
+
+ man/po/sv.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 9261a6b4f085c8e2cf87f64d363283f6d84e5b29
+Author: Peter Krefting <peterk@debian.org>
+Date:   Tue Sep 13 08:30:14 2011 +0100
+
+    Update Swedish translation.
+    
+    man/po/sv.po: 2064t0f0u.
+
+ man/po/sv.po |   87 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
+ 1 files changed, 76 insertions(+), 11 deletions(-)
+
+commit 3609b52cca240eea58735907d9810486f560e5fe
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Sep 12 10:57:38 2011 +0200
+
+    update-alternatives: properly handle stat()/lstat() failures
+    
+    Fix update-alternatives to always fail when lstat() or stat() fails
+    with something else than ENOENT. There were many places testing
+    the existence of files with “stat() == 0” and “stat() == -1 && errno ==
+    ENOENT” wrongly assuming that the only failure cause is ENOENT.
+
+ utils/update-alternatives.c |   34 +++++++++++++++++++++++++---------
+ 1 files changed, 25 insertions(+), 9 deletions(-)
+
+commit bf9cefeb7abd4bb0445b3a39a74d5594e247cd8e
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Sep 12 10:20:05 2011 +0200
+
+    update-alternatives: use alternative_path_classify() more extensively
+    
+    Constructs like “lstat(foo, &st) == 0 && S_ISLNK(st.st_mode)” do not
+    fail when lstat() fails and they should really fail except when
+    the failure is due to a missing foo (ENOENT).
+    
+    Using alternative_path_classify() achieves this.
+
+ utils/update-alternatives.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 9dcb50a59414e1fe0e6a8a4c8ee9f59d10706396
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Sep 12 09:42:11 2011 +0200
+
+    update-alternatives: new non-regression test
+    
+    This one catches the regression introduced in
+    6c481e19a532080643e3cf5c76760df8009ea2c7 and fixed in
+    9dceac005a0331ceb840f9c8273c7fd195413516.
+    
+    It should also catch the former problem of passing NULL to stat() (via
+    new_file). But this did not trigger any segfault, merely a failure
+    with EFAULT.
+
+ utils/t/100_update_alternatives.t |   10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+commit 9dceac005a0331ceb840f9c8273c7fd195413516
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Sep 12 09:18:06 2011 +0200
+
+    Revert "u-a: Use xreadlink() instead of areadlink() in alternative_evolve()"
+    
+    This reverts commit 6c481e19a532080643e3cf5c76760df8009ea2c7 and
+    changes the surrounding code to deal correctly with the case where
+    areadlink() returns NULL.
+    
+    This part of the code really had to cope with a non-existing
+    /etc/alternatives/slave.
+    
+    Reported-by: Sven Joachim <svenjoac@gmx.de>
+
+ utils/update-alternatives.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 4d5d022c8b1b4182482f47c6dc9cafdfdea18c66
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Sep 11 15:19:35 2011 +0200
+
+    Sort language names properly
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e84161fccee033d365688017c7006970ccd6941b
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Sep 11 15:18:26 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2064t.
+
+ man/po/de.po |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 53 insertions(+), 2 deletions(-)
+
+commit 9e3e62ba287c02bc2ddce7734456244be2ab7356
+Author: Peter Krefting <peterk@debian.org>
+Date:   Sun Sep 11 10:03:11 2011 +0100
+
+    Update Swedish translation:
+    
+    po/sv.po: 1023t0f0u.
+    scripts/po/sv.po: 525t0f0u.
+    man/po/sv.po: 2043t2f19u (hardening section not translated).
+
+ man/po/sv.po     |  792 ++++++++++++++++++++++++++------------------
+ po/sv.po         |  967 +++++++++++++++++++++++++++---------------------------
+ scripts/po/sv.po |  165 ++++------
+ 3 files changed, 1020 insertions(+), 904 deletions(-)
+
+commit 25e7f50e87bf901a8cd22c39ce0f57c96661a8ba
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Sep 10 20:11:55 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2056t0f8u.
+
+ man/po/de.po |  250 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 241 insertions(+), 9 deletions(-)
+
+commit fa50333bd0f9e33912e04e30b0a677aaf7460c46
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Sep 10 19:11:44 2011 +0200
+
+    Update German scripts translation
+    
+    Update to 525t.
+
+ scripts/po/de.po |  109 ++++++++++++++++++++++++++++-------------------------
+ 1 files changed, 58 insertions(+), 51 deletions(-)
+
+commit 3d146e437681323d05ae5c8345d85579a3cffffe
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 10 18:32:30 2011 +0200
+
+    Fix bug closure for “dpkg-deb: Do not warn on strange timestamps”
+    
+    Spotted-by: Carl Fürstenberg <azatoth@gmail.com>
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2266fdc6df762fa9d2371411de3e0c7adfbc0fd2
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Fri Sep 9 11:35:18 2011 +0200
+
+    German dpkg translation update
+    
+    Update to 1022t.
+
+ po/de.po |  630 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 317 insertions(+), 313 deletions(-)
+
+commit 2ccd37bcadf4ab95a815b0952f933d3e73555366
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 9 09:02:27 2011 +0200
+
+    build: Ship debian/dpkg.prerm in the dist tarball
+    
+    Regression introduced in commit cf6b98d3738d1fe8b3119b71fd8321c12feb618c.
+
+ Makefile.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 972095bea5f6bcf3a14f3b3151ca3ca56eff6744
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 9 06:24:19 2011 +0200
+
+    dpkg-buildflags(1): Escape minus sign
+
+ man/dpkg-buildflags.1 |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 1e5cdccd104a1fe819b501ae0c3ff63170617f70
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 9 05:55:37 2011 +0200
+
+    libdpkg: Do not generate the unused infodir in modstatdb_init()
+
+ lib/dpkg/dbmodify.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 25f368cb9756f4fe238aff9f0f7ee3b15e2e86a4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 7 06:38:41 2011 +0200
+
+    dpkg: Refactor control directory creation on unpack
+
+ src/processarc.c |   74 +++++++++++++++++++++++++++++++----------------------
+ 1 files changed, 43 insertions(+), 31 deletions(-)
+
+commit 0e63ea3ee1a247e581eef0fdee453d09f7a358f7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 7 06:20:43 2011 +0200
+
+    Do not include trailing slash for directory string literals
+    
+    This makes it more natural to manage the directory names, and avoids
+    some doubled slashes.
+
+ lib/dpkg/dpkg.h         |    6 +++---
+ lib/dpkg/trigdeferred.l |    1 +
+ lib/dpkg/triglib.c      |    1 +
+ src/filesdb.c           |    1 +
+ src/infodb.c            |    1 +
+ src/processarc.c        |    8 +++-----
+ 6 files changed, 10 insertions(+), 8 deletions(-)
+
+commit af4a5dd8bb2e88c0d97646b697f60f9e9d265fdf
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Sep 5 16:08:51 2011 +0200
+
+    libdpkg: Move trigger note support to a new trignote module
+    
+    This detangles the trigger note support from triglib and avoids code
+    using parsedb() to end up pulling the triglib and dbmodify modules.
+    This reduces the dpkg-deb binary size.
+
+ debian/changelog     |    2 +
+ lib/dpkg/Makefile.am |    1 +
+ lib/dpkg/triglib.c   |   99 --------------------------------------
+ lib/dpkg/trignote.c  |  128 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 131 insertions(+), 99 deletions(-)
+
+commit a4298e6ff245505a5a963a08fe2d40ecad9c595e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 6 05:59:13 2011 +0200
+
+    libdpkg: Refactor trig_awaited_pend_head processing into new functions
+    
+    This will allow accessing trig_awaited_pend_head from a different
+    module, w/o needing to pull in triglib.
+
+ lib/dpkg/triglib.c |   28 ++++++++++++++++++++--------
+ lib/dpkg/triglib.h |    5 +++++
+ 2 files changed, 25 insertions(+), 8 deletions(-)
+
+commit f3dcf914203a42c9080f128d7e8263e8a0fb7ffa
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 6 05:54:36 2011 +0200
+
+    libdpkg: Rename trig_enqueue_awaited_pend to trig_awaited_pend_enqueue
+
+ lib/dpkg/fields.c  |    2 +-
+ lib/dpkg/triglib.c |    2 +-
+ lib/dpkg/triglib.h |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 2e9a20901a16a1b3f2b392ad14c321712073b3f1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Sep 5 16:03:21 2011 +0200
+
+    libdpkg: Move trig_name_is_illegal to a new trigname module
+    
+    This detangles the function from the triglib module, avoiding
+    dpkg-trigger to pull it, and reducing its size.
+
+ debian/changelog     |    2 ++
+ lib/dpkg/Makefile.am |    1 +
+ lib/dpkg/triglib.c   |   16 ----------------
+ lib/dpkg/trigname.c  |   42 ++++++++++++++++++++++++++++++++++++++++++
+ po/POTFILES.in       |    1 +
+ 5 files changed, 46 insertions(+), 16 deletions(-)
+
+commit 8ed2e04c2b1bfa247e34da01c0e84612ce7dc84b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 4 16:07:29 2011 +0200
+
+    dpkg-deb: Do not warn on strange timestamps
+    
+    The external extractor is only used on dpkg-deb -x (and friends), which
+    is only used by dpkg when extracting the control member. The internal
+    dpkg tar extractor never warns on timestamps, and there's no point for
+    dpkg to induce those warnings on the control extraction either.
+    
+    Closes: #640298
+
+ debian/changelog   |    2 ++
+ dpkg-deb/extract.c |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 920596da263ed1342668a9fe5b59f8bbb52445dd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 1 15:17:35 2011 +0200
+
+    dpkg: Fix double “error:” string in missing PATH error output
+    
+    Closes: #639997
+
+ debian/changelog |    2 ++
+ src/help.c       |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 05ce02f897fbe2a455cacb064fd5bc5a6bf182d9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 19 18:07:13 2011 +0200
+
+    u-a: Update alternative links only if they change
+    
+    There's no point in changing the links to the same target. This also
+    helps when systems might have a read-only file system mounted, but a
+    writable database.
+    
+    Closes: #636700
+    
+    Based-on-patch-by: Salvatore Bonaccorso <carnil@debian.org>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog            |    3 +++
+ utils/update-alternatives.c |   32 +++++++++++++++++++++++++++++---
+ 2 files changed, 32 insertions(+), 3 deletions(-)
+
+commit 3518e4d159412c31c2de413b7bc358870b6c5c02
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 8 10:19:28 2011 +0200
+
+    u-a: Refactor alternative_path_classify from alternative_can_replace_path
+
+ utils/update-alternatives.c |   32 +++++++++++++++++++++++---------
+ 1 files changed, 23 insertions(+), 9 deletions(-)
+
+commit c922a8f681dc27135947ebdaff68fc3158614807
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 8 19:12:20 2011 +0200
+
+    u-a: Do not try to readlink() a non-symlink
+    
+    Return early in case the path is not a symlink, there's no point in
+    calling readlink() if we know it's going to fail.
+
+ utils/update-alternatives.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 6c481e19a532080643e3cf5c76760df8009ea2c7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 8 10:10:06 2011 +0200
+
+    u-a: Use xreadlink() instead of areadlink() in alternative_evolve()
+    
+    The function does not expect the readlink call to fail.
+
+ utils/update-alternatives.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c7c7522dd3e29af582eddda7b10b521337a7b21c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 6 04:19:03 2011 +0200
+
+    u-a: Split xreadlink() allocation code into areadlink()
+    
+    Using a bool as an argument for a function already taking several
+    arguments is almost never a good interface, it's not clear from
+    the call sites what it refers to and as such prone to confusion.
+    
+    Split the main xreadlink() code into a function that allocates but
+    can return NULL, and make xreadlink() use the common semantics of
+    never failing.
+
+ utils/update-alternatives.c |   42 ++++++++++++++++++++++++++----------------
+ 1 files changed, 26 insertions(+), 16 deletions(-)
+
+commit 5f40ae0644cf266f533d63cdc8643164f4d6b3c3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Aug 25 20:40:42 2011 +0200
+
+    dpkg: Print a message instead of asserting on readlink/stat size discrepancy
+    
+    This will help the user diagnose which file was affected and in
+    correcting the situation, which in most cases is due to file system
+    breakage, or non POSIX compliance.
+    
+    Closes: #639229
+
+ debian/changelog |    2 ++
+ src/archives.c   |    4 +++-
+ src/configure.c  |    6 +++++-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+commit a23c74e708972c7e566ea8255728184393963825
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Aug 25 20:40:02 2011 +0200
+
+    dpkg: Change type of variable r from int to ssize_t in conffderef()
+
+ src/configure.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 2b824afa6bb06b7cb757423b248f6907e9919e86
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon May 2 21:51:47 2011 +0200
+
+    libdpkg: Detangle buffer filter logic from write logic
+
+ lib/dpkg/buffer.c |   51 +++++++++++++++++++++++++++++++++++++++------------
+ lib/dpkg/buffer.h |   31 +++++++++++++++++++++----------
+ 2 files changed, 60 insertions(+), 22 deletions(-)
+
+commit 2cd316401fa2451e266562cf689bdfc7b4c501e8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon May 2 21:51:47 2011 +0200
+
+    libdpkg: Add new BUFFER_FILTER_NULL filter action
+
+ lib/dpkg/buffer.c |    5 +++++
+ lib/dpkg/buffer.h |    2 ++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 3c83f54bfe1f7d17c878c0897f9762ea8adc64dc
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 17 14:11:43 2011 +0200
+
+    libdpkg: Rename BUFFER_WRITE_MD5 to BUFFER_FILTER_MD5
+
+ lib/dpkg/buffer.c |    6 +++---
+ lib/dpkg/buffer.h |    6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 7585faa92009f15b06e346cddaa5e4ce92df7079
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon May 2 10:25:38 2011 +0200
+
+    libdpkg: Namespace buffer init and done functions with buffer_filter_
+    
+    This makes it clear these functions are not to initialize normal
+    buffer operations, but just for when a filter is in place.
+
+ lib/dpkg/buffer.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 3650a669fb01737444656916a6a7a09e82800679
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 3 10:55:45 2011 +0200
+
+    libdpkg: Rename fd_null_copy() to fd_skip()
+
+ dpkg-deb/extract.c |   12 ++++++------
+ dpkg-split/join.c  |    2 +-
+ lib/dpkg/buffer.h  |    2 +-
+ src/archives.c     |    6 +++---
+ src/processarc.c   |    2 +-
+ 5 files changed, 12 insertions(+), 12 deletions(-)
+
+commit 3416f1d5c7a78e49a52f079b1e2a8576025650cb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 9 07:19:27 2011 +0200
+
+    libdpkg: Add a test case for fd_md5()
+
+ lib/dpkg/test/t-buffer.c |   42 +++++++++++++++++++++++++++++++++++++-----
+ 1 files changed, 37 insertions(+), 5 deletions(-)
+
+commit d1abb6e80d72acffabecd352290dc10121f2c085
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 7 04:53:25 2011 +0200
+
+    Convert translation files to UTF-8
+    
+    Consolidating the charset used for all files in the repository makes
+    diff actually useful, otherwise when showing a patch involving distinct
+    charsets it's not possible to display them correctly due to the mixture.
+
+ dselect/po/da.po |  458 ++++++++++++------------
+ man/po/fr.add    |    4 +-
+ man/po/hu.add    |    2 +-
+ man/po/pl.add    |    4 +-
+ man/po/po4a.cfg  |   12 +-
+ man/po/pt_BR.po  | 1084 +++++++++++++++++++++++++++---------------------------
+ man/po/ru.add    |    8 +-
+ man/po/sv.add    |    2 +-
+ 8 files changed, 787 insertions(+), 787 deletions(-)
+
+commit 9288e573b0d1069f4a56caa95838f0157f1a23e7
+Author: Kees Cook <kees@debian.org>
+Date:   Mon Sep 5 23:34:49 2011 -0700
+
+    dpkg-buildflags(1): add initial hardening documentation
+    
+    Document the various hardening options that can be enabled/disabled
+    via DEB_BUILD_MAINT_OPTIONS.
+    
+    Improved-by: Raphaël Hertzog <hertzog@debian.org>
+    Signed-off-by: Kees Cook <kees@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ man/dpkg-buildflags.1 |  109 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 108 insertions(+), 1 deletions(-)
+
+commit f3bb7d4939ae95cf44c89e8f599e7ed5da431e57
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Jul 27 22:10:49 2011 +0200
+
+    dpkg-buildflags: emit hardening build flags by default
+    
+    All the hardening build flags supported by hardening-includes
+    are supported except that PIE is not enabled by default (just like
+    the corresponding gcc patch doesn't enable it by default).
+    
+    Inspired by the work of Kees Cook <kees@debian.org>.
+
+ debian/changelog              |    3 +
+ scripts/Dpkg/BuildFlags.pm    |    1 +
+ scripts/Dpkg/Vendor/Debian.pm |   88 ++++++++++++++++++++++++++++++++++++++++-
+ scripts/Dpkg/Vendor/Ubuntu.pm |    4 ++
+ 4 files changed, 95 insertions(+), 1 deletions(-)
+
+commit ed84a9339452b934f4e740e389820e852a8bcd31
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Aug 2 14:15:17 2011 +0200
+
+    Dpkg::BuildOptions: enable usage of alternative variable names
+
+ scripts/Dpkg/BuildOptions.pm      |   26 ++++++++++++++++++--------
+ scripts/t/300_Dpkg_BuildOptions.t |    6 +++++-
+ 2 files changed, 23 insertions(+), 9 deletions(-)
+
+commit 08808c28500e7e027e58d32e434a3dc082e43e7d
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu Sep 8 17:53:13 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2038t.
+
+ man/po/de.po |   74 ++++++++++++++++++---------------------------------------
+ 1 files changed, 24 insertions(+), 50 deletions(-)
+
+commit bcd5c89ab1621264e09e525826b2132490f35e07
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Sep 3 14:34:31 2011 +0200
+
+    dpkg-source(1): add example of extend-diff-ignore's usage
+    
+    Suggested-by: Christoph Berg <myon@debian.org>
+    Closes: #640198
+
+ debian/changelog  |    2 ++
+ man/dpkg-source.1 |    2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit cb0fa9cdbc8d081edb2d4044dbf1cfe4e88dba0f
+Author: Peter Krefting <peterk@debian.org>
+Date:   Sun Sep 4 18:57:23 2011 +0100
+
+    Update Swedish translation.
+    
+    man/po/sv.po: 2044t0f0u.
+
+ man/po/sv.po |  269 +++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 125 insertions(+), 144 deletions(-)
+
+commit ea50f9a4027deb105a6067cdd7063289cb89967b
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Aug 24 19:35:38 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2038t.
+
+ man/po/de.po |   18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+commit f3418186f6b093162d9e6b47e73d01d795c2ef98
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Aug 23 05:24:39 2011 +0200
+
+    dpkg-source: Make single-debian-patch not abort on upstream changes
+    
+    The single-debian-patch option usage in Dpkg::Source::Package::V2
+    was typoed as single_debian_patch, and thus not avoiding aborting
+    on upstream changes. Instead of fixing the typo, let's just not
+    expose single-debian-patch in Dpkg::Source::Package::V2, as it's
+    Dpkg::Source::Package::V3::quilt specific and as such a layer
+    violation, the code will just set auto_commit when single-debian-patch
+    is specified, which is the actual intended behaviour. Reflect this
+    explicitly in the man page.
+    
+    Regression introduced in commit 46b688e4824f00842568b517b119eec34a5f7286.
+    
+    Reported-by: Bernhard R. Link <brlink@debian.org>
+
+ man/dpkg-source.1                       |    2 +-
+ scripts/Dpkg/Source/Package/V2.pm       |    3 +--
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    2 ++
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+commit d97161c298625c8475b0b3d2d9e89e60ae56a5ff
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Aug 23 03:55:27 2011 +0200
+
+    Dpkg::Source::Package: Use “-z” instead of “not -s”
+
+ scripts/Dpkg/Source/Package/V2.pm       |    2 +-
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit a596ab8ef36ade2743dbd442d660b36146574624
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Aug 22 20:57:14 2011 +0200
+
+    Update German scripts translation
+    
+    Update to 523t.
+
+ scripts/po/de.po |   70 ++++++++++++++++++++++++++---------------------------
+ 1 files changed, 34 insertions(+), 36 deletions(-)
+
+commit 513ad320a9677766f50aa2741d23987bce5b92a5
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Aug 22 20:33:18 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2038t.
+
+ man/po/de.po |  203 ++++++++++++++++++++++++++--------------------------------
+ 1 files changed, 90 insertions(+), 113 deletions(-)
+
+commit 277e572facf30001d59bdadfe3e3c9e4db37ae1b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Aug 21 11:11:02 2011 +0200
+
+    dpkg: correctly handle a hardlink pointing to a conffile
+    
+    Normal files tagged as a conffile are not tagged with
+    fnnf_deferred_rename and due to this the hardlinking code
+    was assuming that the target is in its final location
+    already. This is obviously not the case for a conffile.
+    
+    Fix the code so that the hardlinking logic takes into account
+    the fact that conffiles are unpacked in .dpkg-new and stay
+    there until the configuration phase.
+    
+    Reported-by: Igor Pashev <pashev.igor@gmail.com>
+
+ debian/changelog |    1 +
+ src/archives.c   |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit c6400108e297b3fac8e887551b6a31edb51408f2
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Sun Aug 21 18:37:50 2011 +0200
+
+    German dpkg translation update
+    
+    Update to 1022t.
+
+ po/de.po |  479 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 241 insertions(+), 238 deletions(-)
+
+commit 3710f92e5c32bbcb766151df41e5a99ed3de2211
+Author: Peter Krefting <peterk@debian.org>
+Date:   Sat Aug 20 22:08:09 2011 +0100
+
+    Update Swedish translation.
+    
+    man/po/sv.po: 1978t50f16u (WIP).
+
+ man/po/sv.po | 1184 +++++++++++++++++++---------------------------------------
+ 1 files changed, 384 insertions(+), 800 deletions(-)
+
+commit 89973c5bb9eed790242a7d1d35564fd954edf554
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 20 15:36:00 2011 +0200
+
+    u-a: Do not build strings from parts in alternative_check_install_args
+    
+    This makes the work of translators harder.
+
+ utils/update-alternatives.c |   14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 52507504e69d6621262de82096987fdfb821bf8d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 20 12:55:33 2011 +0200
+
+    u-a: Refactor alternative argument checks into new function
+
+ utils/update-alternatives.c |   41 +++++++++++++++++++----------------------
+ 1 files changed, 19 insertions(+), 22 deletions(-)
+
+commit 46aadad359a9e4204cfe707f47e3cfceef47e709
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 19 22:59:53 2011 +0200
+
+    u-a: Refactor --install argument checking into a new function
+
+ utils/update-alternatives.c |  204 ++++++++++++++++++++++---------------------
+ 1 files changed, 104 insertions(+), 100 deletions(-)
+
+commit abda47fbe81e53da7d0a46237895bd225373d022
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 19 22:32:19 2011 +0200
+
+    u-a: Move alternative map loading to the actions that make use of them
+    
+    This will reduce start up time, by not doing unneeded operations.
+
+ utils/update-alternatives.c |   25 +++++++++++++++----------
+ 1 files changed, 15 insertions(+), 10 deletions(-)
+
+commit 774e918754bc7d801e802ea6ccbd9b5673799d8c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 19 18:38:10 2011 +0200
+
+    u-a: Split alternative map loading into two functions
+    
+    This will allow only loading them when needed, instead of doing it
+    for any action.
+
+ utils/update-alternatives.c |   69 ++++++++++++++++++++++++++++++------------
+ 1 files changed, 49 insertions(+), 20 deletions(-)
+
+commit ca9a2b79f85a8ed72308b5a2877ca8cfbda0b243
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 20 12:21:22 2011 +0200
+
+    u-a: Refactor scandir() namelist free into new altdb_free_namelist()
+
+ utils/update-alternatives.c |   16 ++++++++++------
+ 1 files changed, 10 insertions(+), 6 deletions(-)
+
+commit 31242e1aaabe7750b2b68ee96306e2cbdfd767bb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 20 12:30:35 2011 +0200
+
+    u-a: Rename get_all_alternatives() to altdb_get_namelist()
+    
+    This makes it clear we are referring to the filenames in the database
+    directory.
+
+ utils/update-alternatives.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 81412e6445bf231521fdfb5b8760988605149181
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 19 17:50:25 2011 +0200
+
+    u-a: Do not check if linknames can be updated if --force is in use
+    
+    The action is going to proceed in any case, no point wasting resources
+    doing the checks. Also this removes a possible point of non-overridable
+    failure.
+
+ utils/update-alternatives.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 36954c36abe3ce8e42b3c231579ef9e497f0da6d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 19 12:59:35 2011 +0200
+
+    Dpkg::Compression: Change default values depending on the compressor used
+    
+    This makes dpkg-source use more appropriate default compression values
+    depending on the compressor used.
+    
+    Prompted-by: Timo Juhani Lindfors <timo.lindfors@iki.fi>
+
+ debian/changelog                 |    3 +++
+ man/dpkg-source.1                |    2 +-
+ scripts/Dpkg/Compression.pm      |   25 +++++++++++++++++--------
+ scripts/t/850_Dpkg_Compression.t |   12 +++++++++++-
+ 4 files changed, 32 insertions(+), 10 deletions(-)
+
+commit a27a8e1989b0937e9eee18c2153524c755aba058
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 20 09:51:13 2011 +0200
+
+    Do not use possessive «'s» after ‘s’ or ‘x’
+
+ debian/changelog          |    4 ++--
+ man/dpkg-shlibdeps.1      |    4 ++--
+ utils/start-stop-daemon.c |    4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+commit dbe742b7db83d108e1ea143f2688ca5444007ba9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 17 16:44:18 2011 +0200
+
+    Fix spelling errors
+    
+    Found by codespell.
+
+ ChangeLog.old                       |   66 +++++++++++++++++-----------------
+ TODO                                |    2 +-
+ debian/changelog                    |   32 ++++++++--------
+ doc/Doxyfile.in                     |    2 +-
+ doc/README.feature-removal-schedule |    2 +-
+ doc/coding-style.txt                |    2 +-
+ doc/triggers.txt                    |    6 ++--
+ dselect/methods/ftp/install         |    2 +-
+ dselect/po/it.po                    |    2 +-
+ lib/dpkg/file.c                     |    2 +-
+ lib/dpkg/progname.c                 |    2 +-
+ man/dpkg-source.1                   |    2 +-
+ man/po/de.po                        |    2 +-
+ man/po/dpkg-man.pot                 |    2 +-
+ man/po/es.po                        |    2 +-
+ man/po/fr.po                        |    2 +-
+ man/po/hu.po                        |    2 +-
+ man/po/ja.po                        |    2 +-
+ man/po/pl.po                        |    2 +-
+ man/po/pt_BR.po                     |    2 +-
+ man/po/ru.po                        |    2 +-
+ man/po/sv.po                        |    2 +-
+ po/ChangeLog.old                    |    4 +-
+ scripts/Dpkg/Changelog.pm           |    2 +-
+ scripts/changelog/debian.pl         |    4 +-
+ scripts/po/ca.po                    |    4 +-
+ scripts/po/de.po                    |    4 +-
+ scripts/po/dpkg-dev.pot             |    4 +-
+ scripts/po/es.po                    |    4 +-
+ scripts/po/fr.po                    |    4 +-
+ scripts/po/pl.po                    |    4 +-
+ scripts/po/ru.po                    |    4 +-
+ scripts/po/sv.po                    |    4 +-
+ scripts/t/190_Dpkg_Shlibs_Cppfilt.t |    2 +-
+ scripts/t/200_Dpkg_Shlibs.t         |    2 +-
+ scripts/t/600_Dpkg_Changelog/shadow |   20 +++++-----
+ src/filesdb.h                       |    2 +-
+ utils/start-stop-daemon.c           |    4 +-
+ utils/t/100_update_alternatives.t   |    2 +-
+ 39 files changed, 108 insertions(+), 108 deletions(-)
+
+commit 312253830448926152020c8ce0f7834b8452a5d9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Aug 15 00:03:00 2011 +0200
+
+    dpkg: Clarify --update-avail usage error message
+    
+    Unify the reference to the Packages-file to match the one used on the
+    man pages and on the --help output.
+    
+    Closes: #628055
+
+ debian/changelog |    1 +
+ src/update.c     |    3 ++-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 4fdbd69d7b8ca2fff39798a6e6fc5fa3e229c66b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Aug 15 00:01:53 2011 +0200
+
+    dpkg-parsechangelog: Remove duplicate program name from usage error output
+
+ scripts/dpkg-parsechangelog.pl |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 62449a0a27ab1231ed81267f7ee5421b9f7fcb0c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Aug 14 23:45:36 2011 +0200
+
+    Expand numeric literals and word abbreviation in usage error output
+    
+    This avoids unneeded abbreviations, uses correct english, and should
+    help translators.
+
+ scripts/dpkg-scanpackages.pl |    2 +-
+ scripts/dpkg-scansources.pl  |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 5c6be96b1c88c40d002a25295891ec81d8764f90
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Aug 14 23:28:07 2011 +0200
+
+    dpkg-deb(1): Clarify the default compression-levels
+
+ debian/changelog |    1 +
+ man/dpkg-deb.1   |    4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit ffc6888c5721e5e4451d8135827936fca761b157
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Aug 14 22:45:20 2011 +0200
+
+    deb-src-control(5): Use linux-any in example control stanza
+    
+    Instead of using the negated list of not supported architectures, just
+    use the positive form, which should be considered current best practice.
+
+ man/deb-src-control.5 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 187025628d46bd737bd22242b857ae91e6922103
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Aug 14 22:43:05 2011 +0200
+
+    dselect(1): Correct configuration directory reference
+    
+    Use /etc/dpkg/dselect.cfg.d/ instead of /etc/dpkg/dpkg.cfg.d/.
+
+ debian/changelog |    2 ++
+ man/dselect.1    |    4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit ed3ec669d253ac9d69f134a93f570251ed687d98
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Aug 14 22:41:16 2011 +0200
+
+    man: Use minus signs and hyphens consistently
+    
+    Any string that can be copy & pasted into control files or into a
+    terminal, for example, needs to correctly use minus signs (escaped
+    dashes), instead of the default hyphen.
+
+ debian/changelog              |    1 +
+ man/deb-control.5             |    6 ++--
+ man/deb-old.5                 |    6 ++--
+ man/deb-override.5            |    4 +-
+ man/deb-src-control.5         |   36 +++++++++---------
+ man/deb-symbols.5             |   10 +++---
+ man/deb-triggers.5            |   16 ++++----
+ man/deb-version.5             |    6 ++--
+ man/deb.5                     |   12 +++---
+ man/dpkg-architecture.1       |   26 +++++++-------
+ man/dpkg-buildflags.1         |    8 ++--
+ man/dpkg-buildpackage.1       |   34 +++++++++---------
+ man/dpkg-deb.1                |    4 +-
+ man/dpkg-divert.8             |   10 +++---
+ man/dpkg-genchanges.1         |    4 +-
+ man/dpkg-gencontrol.1         |    8 ++--
+ man/dpkg-gensymbols.1         |   20 +++++-----
+ man/dpkg-maintscript-helper.1 |    8 ++--
+ man/dpkg-mergechangelogs.1    |   14 ++++----
+ man/dpkg-name.1               |    6 ++--
+ man/dpkg-parsechangelog.1     |    4 +-
+ man/dpkg-query.1              |    6 ++--
+ man/dpkg-scanpackages.1       |    8 ++--
+ man/dpkg-scansources.1        |    6 ++--
+ man/dpkg-shlibdeps.1          |   32 ++++++++--------
+ man/dpkg-source.1             |   78 ++++++++++++++++++++--------------------
+ man/dpkg-trigger.1            |    7 ++--
+ man/dpkg.1                    |    4 +-
+ man/update-alternatives.8     |    8 ++--
+ 29 files changed, 197 insertions(+), 195 deletions(-)
+
+commit 8fba51d4f327a99c994068e58bc76de770247a7f
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Aug 20 08:31:37 2011 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ man/po/es.po    |  144 +++++++++++++++++++++-------------
+ man/po/fr.po    |  144 +++++++++++++++++++++-------------
+ man/po/hu.po    |  134 +++++++++++++++++++-------------
+ man/po/ja.po    |  139 +++++++++++++++++++-------------
+ man/po/pl.po    |  142 ++++++++++++++++++++-------------
+ man/po/pt_BR.po |  129 ++++++++++++++++++-------------
+ man/po/ru.po    |  129 ++++++++++++++++++-------------
+ man/po/sv.po    |  235 ++++++++++++++++++++-----------------------------------
+ 8 files changed, 662 insertions(+), 534 deletions(-)
+
+commit f412c67b55d45ff4f595e8c50b35d8f172540a40
+Author: Peter Krefting <peterk@debian.org>
+Date:   Wed Aug 17 20:59:37 2011 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: 1023t0f0u.
+    man/po/sv.po: 1824t180f40u (WIP).
+    scripts/po/sv.po: 524t0f0u
+
+ debian/changelog |    1 +
+ man/po/sv.po     |  356 +++++++++++++++++++++++++++++++++---------------------
+ po/sv.po         |   61 +++++-----
+ scripts/po/sv.po |   87 +++++++-------
+ 4 files changed, 291 insertions(+), 214 deletions(-)
+
+commit efcf279a50aba3369b24d062017d581006d47d9b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 13 03:19:24 2011 +0200
+
+    dpkg: Defer hardlink renames to avoid breakage on unpack
+    
+    This fixes two issues related to making the new file contents available
+    through an alternative but final path before
+    
+    1) the one "carrying" the content has been fsync()ed, to avoid getting
+    garbage on system failure.
+    
+    2) the deferred fsync() on the main path has been performed, avoiding
+    a possible error when reopening the file for writing if it's currently
+    under execution.
+    
+    Deferring the hardlink is safe as they are always after the tar entry
+    containing the actual file data.
+    
+    Regression introduced in commit 9cd41fdda1c27169c52d73b3b3ce71991d724994.
+    
+    Closes: #635683
+    
+    Reported-by: Niko Tyni <ntyni@debian.org>
+    Based-on-patch-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog |    5 +++++
+ src/archives.c   |    3 ++-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 5c1da3f8c2806490f9a7bed32c0a5b3a24d06d55
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Aug 12 22:35:46 2011 +0200
+
+    Dpkg::Deps: fix simplification logic of union dependencies
+    
+    The code merging dependencies was wrongly updating the dependency that's
+    not integrated in the resulting field.
+    
+    Reported-by: Andreas Metzler <ametzler@downhill.at.eu.org>
+
+ debian/changelog          |    1 +
+ scripts/Dpkg/Deps.pm      |    6 +++---
+ scripts/t/400_Dpkg_Deps.t |    6 +++++-
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+commit e84c47aa298e9bd501f2ea353b4483f02c249eb8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Aug 9 07:19:09 2011 +0200
+
+    libdpkg: Use a generic pointer to pass the parsed object data around
+    
+    This will allow code not parsing binary package control files to be
+    able to easily reuse the parser, by supplying their own object
+    structure.
+    
+    Unfortunately this sacrifices the type-safety of the parse_stanza()
+    and parse_field() functions, but that only affects one variable,
+    which should be an acceptable tradeoff given the gain in code reuse.
+
+ lib/dpkg/parse.c     |   29 ++++++++++++++++++++++-------
+ lib/dpkg/parsedump.h |    5 ++---
+ 2 files changed, 24 insertions(+), 10 deletions(-)
+
+commit 85dcf82c6ed722d9cfb664a87a41315791cbb3b4
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Mon Aug 8 20:29:13 2011 +0200
+
+    Changelog for French translation update
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c22b83466766bfc146179fb93884f1f9374b0453
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Mon Aug 8 20:27:40 2011 +0200
+
+    Fix Sylvestre's translation
+
+ scripts/po/fr.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bffbef38affe5dbae3f15e07a4f19d686e1c0bd6
+Author: Sylvestre Ledru <sylvestre.ledru@scilab.org>
+Date:   Mon Aug 8 15:44:01 2011 +0200
+
+    Update of the french localization
+
+ scripts/po/fr.po |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 98f5f6ad2a9cff2684271b399ec51d4841f91f59
+Author: Sylvestre Ledru <sylvestre.ledru@scilab.org>
+Date:   Mon Aug 8 15:42:56 2011 +0200
+
+    Fix a french typo
+
+ scripts/po/fr.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fb18783ce260a07d3f3a5f5a3a81640a45a9d089
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 5 06:23:59 2011 +0200
+
+    libdpkg: Initialize ps->pkg and ps->pkgbin to NULL in parse_open()
+    
+    This guarantees the parsedb_state variable is in a sane state after
+    the parse_open() call.
+
+ lib/dpkg/parse.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 6ee5e8af9dbcd2ef161e1174827ea4e48da09870
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 5 05:21:01 2011 +0200
+
+    libdpkg: Refactor parse_open() and parse_close() from parsedb()
+    
+    This will allow code using parse_stanza() to avoid having to reimplement
+    the opening and closing logic.
+
+ lib/dpkg/parse.c     |  110 ++++++++++++++++++++++++++++++-------------------
+ lib/dpkg/parsedump.h |    5 ++
+ 2 files changed, 72 insertions(+), 43 deletions(-)
+
+commit 250af430bc5cec09c2e4eb223f935891e0d96f45
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 5 06:03:02 2011 +0200
+
+    libdpkg: Close the file descriptor just after slurping it in parsedb()
+
+ lib/dpkg/parse.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 2dee4700ac94ffedb27366e650cd2fed383e40e1
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Aug 4 21:33:23 2011 +0200
+
+    dpkg-source: simplify message pointing to dpkg-source --commit
+    
+    The supplementary arguments suggested are awkward and are generally not
+    needed unless your package is huge and takes a long time to uncompress
+    and diff.
+    
+    The best advice is thus “dpkg-source --commit” without any parameter.
+    Maintainers of big packages will read the manual package and learn
+    by themselves how to reuse the generated patch.
+
+ scripts/Dpkg/Source/Package/V2.pm |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 45c83175b6544a54ad79dc671a77a59bf79f7690
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Aug 3 22:02:33 2011 +0200
+
+    dpkg-source: don't always print "local changes have been recorded in a new patch"
+    
+    The message should only be printed if such a patch has really
+    been created.
+    
+    Reported-by: Sven Joachim
+
+ scripts/Dpkg/Source/Package/V2.pm |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 173cbe71eb800dbef52a6d894a1dffd64997610a
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Aug 3 21:19:38 2011 +0200
+
+    Fix typo
+
+ man/po/de.po |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+commit b964dbe5995fa136042b338ea944655f9b263172
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Aug 3 21:14:41 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2047t.
+
+ man/po/de.po |   91 ++++++++++++++++++++++++---------------------------------
+ 1 files changed, 38 insertions(+), 53 deletions(-)
+
+commit af788d3abf42a35b24aad19c7393e4cf9ccb6238
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue Aug 2 21:55:50 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2037t7f3u.
+
+ man/po/de.po |  255 ++++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 132 insertions(+), 123 deletions(-)
+
+commit 9cb4bd4fcf251212534f4010d59ff77a9ee4cdd6
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue Aug 2 19:32:57 2011 +0200
+
+    Update German scripts translation
+    
+    Update to 524t.
+
+ scripts/po/de.po |   79 +++++++++++++++++-------------------------------------
+ 1 files changed, 25 insertions(+), 54 deletions(-)
+
+commit c5678434b485284c352a1de3a2862726ba85393c
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Tue Aug 2 11:57:17 2011 +0200
+
+    German dpkg translation update
+    
+    Update to 1023t.
+
+ po/de.po |  188 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 97 insertions(+), 91 deletions(-)
+
+commit 7c2df89844617b70883ab76b1c239a2f088cc232
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Aug 2 11:20:54 2011 +0200
+
+    dpkg-source: clean up temporary file in case of interruption
+    
+    Navite packages (both "1.0" and "3.0 (native)") failed to remove
+    the temporary tarball if the process is interrupted during its
+    generation.
+    
+    Reported-by: Cyril Brulebois <kibi@debian.org>
+
+ debian/changelog                         |    2 ++
+ scripts/Dpkg/Source/Package/V3/native.pm |    3 +++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 3cd49fcd391466370d9d7f476f7f8acf0267d29e
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Aug 2 11:06:11 2011 +0200
+
+    Move changelog entry to attribute it correctly to me
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f3a8ea5245608e23c93600ff33f05d2af205cb64
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Aug 2 05:05:30 2011 +0200
+
+    libdpkg: Remove obsolete variable references in parsedb() comment
+    
+    The warnto and warncount variables were removed in commits
+    ba908783e306ba38457a84fd6d975ca69e351e56 and
+    8451065cf85cb8a17dcd17e0cd2ca1fdef7cb749 respectively.
+
+ lib/dpkg/parse.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 98aea15132c085be3901956986afaa46bf0456b1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Aug 2 04:54:42 2011 +0200
+
+    libdpkg: Make parse_stanza() a public function
+    
+    Make public also the required parse helper macros and structures. At
+    least parse_EOF() will be needed for other callers to get out of the
+    loop when parsing multi-stanza files.
+
+ lib/dpkg/parse.c     |   18 +-----------------
+ lib/dpkg/parsedump.h |   20 ++++++++++++++++++++
+ 2 files changed, 21 insertions(+), 17 deletions(-)
+
+commit ef18ac88b029b0dba4272d3b2daa9130146d2697
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Aug 2 04:50:09 2011 +0200
+
+    libdpkg: Detangle fieldinfos from struct field_state
+    
+    Define the fieldencountered array in the stack, and switch the array
+    in struct field_state to be a pointer to that array. This way we do not
+    pull the fieldinfos symbol (specific to the parsedb() function) to the
+    now generic struct field_state.
+
+ lib/dpkg/parse.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 725675ddc107907ea68db5acef868896cf3915d2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Aug 2 04:24:10 2011 +0200
+
+    libdpkg: Rename parse helper *_mmap functions to parse_*
+    
+    This abstracts the method used to load the file contents, and it also
+    namespaces it for the parser.
+
+ lib/dpkg/parse.c |   44 ++++++++++++++++++++++----------------------
+ 1 files changed, 22 insertions(+), 22 deletions(-)
+
+commit 7d06ea566bafe5d2914adbfa4820342f35829a37
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 14 17:21:55 2011 +0200
+
+    libdpkg: Refactor RFC-822 stanza parsing into new parse_stanza()
+    
+    This generalizes the stanza parsing so that it can be used by other
+    parts of the code.
+
+ lib/dpkg/parse.c |  214 +++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 123 insertions(+), 91 deletions(-)
+
+commit 3d8951fdf5cc2fe3209540bc43c489208db8c306
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 14 04:37:31 2011 +0200
+
+    libdpkg: Move dataptr and endptr from parsedb() to struct parsedb_state
+
+ lib/dpkg/parse.c     |   75 ++++++++++++++++++++++++++++----------------------
+ lib/dpkg/parsedump.h |    2 +
+ 2 files changed, 44 insertions(+), 33 deletions(-)
+
+commit 926a204c1609d35de3a6500f8e96c9db0c315de4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 14 03:58:45 2011 +0200
+
+    libdpkg: Add pkg and pkgbin to struct parsedb_state
+    
+    We are passing these variables as arguments most of the time for
+    parse_error() and parse_warn() calls which are not run-time frequent,
+    this also unties somewhat the code from the package structures.
+
+ lib/dpkg/fields.c    |   93 ++++++++++++++++++++++++-------------------------
+ lib/dpkg/parse.c     |   49 ++++++++++++++------------
+ lib/dpkg/parsedump.h |   16 ++++----
+ lib/dpkg/parsehelp.c |   37 ++++++++------------
+ 4 files changed, 95 insertions(+), 100 deletions(-)
+
+commit 842e66ae6790805d87b51129b560d1a6b0e526b3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Aug 2 04:56:00 2011 +0200
+
+    libdpkg: Remove trailing semicolons from getc_mmap and ungetc_mmap
+    
+    Those are unnecessary as these are function macros which need to be
+    followed by semicolons on the call sites.
+
+ lib/dpkg/parse.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 02c28c63a34e252d75f893cb0869f9480f603822
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Apr 26 07:35:16 2011 +0200
+
+    dpkg-deb: Add --raw-extract option combining --control and --extract
+    
+    This allows to extract the control and file system members of a .deb
+    into a single directory using the same layout dpkg-deb -b expects for
+    building a package.
+    
+    Closes: #552123
+
+ debian/changelog    |    2 ++
+ dpkg-deb/dpkg-deb.h |    1 +
+ dpkg-deb/extract.c  |   32 ++++++++++++++++++++++++++++++++
+ dpkg-deb/main.c     |    3 +++
+ man/dpkg-deb.1      |    7 +++++++
+ 5 files changed, 45 insertions(+), 0 deletions(-)
+
+commit 8561eeb48292a0495d13335d7f088fe66e8ea167
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jun 20 19:11:20 2011 +0200
+
+    dpkg-deb: Add new -v, --verbose option
+    
+    Change --extract to honour --verbose and behave as --vextract.
+    
+    Closes: #293280
+
+ debian/changelog    |    2 ++
+ dpkg-deb/dpkg-deb.h |    1 +
+ dpkg-deb/extract.c  |    9 +++++++--
+ dpkg-deb/main.c     |    3 +++
+ man/dpkg-deb.1      |    8 +++++++-
+ 5 files changed, 20 insertions(+), 3 deletions(-)
+
+commit cd3492245d81c9766c9ff09dc66f5822751cf71c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Aug 1 22:27:08 2011 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |  108 +-
+ dselect/po/ca.po        |  108 +-
+ dselect/po/cs.po        |  108 +-
+ dselect/po/da.po        |  108 +-
+ dselect/po/de.po        |  108 +-
+ dselect/po/dselect.pot  |  110 +-
+ dselect/po/el.po        |  108 +-
+ dselect/po/es.po        |  108 +-
+ dselect/po/et.po        |  108 +-
+ dselect/po/eu.po        |  108 +-
+ dselect/po/fr.po        |  108 +-
+ dselect/po/gl.po        |  108 +-
+ dselect/po/hu.po        |  108 +-
+ dselect/po/id.po        |  108 +-
+ dselect/po/it.po        |  108 +-
+ dselect/po/ja.po        |  108 +-
+ dselect/po/ko.po        |  108 +-
+ dselect/po/nb.po        |  108 +-
+ dselect/po/nl.po        |  108 +-
+ dselect/po/nn.po        |  108 +-
+ dselect/po/pl.po        |  108 +-
+ dselect/po/pt.po        |  108 +-
+ dselect/po/pt_BR.po     |  108 +-
+ dselect/po/ro.po        |  108 +-
+ dselect/po/ru.po        |  108 +-
+ dselect/po/sk.po        |  108 +-
+ dselect/po/sv.po        |  108 +-
+ dselect/po/tl.po        |  108 +-
+ dselect/po/vi.po        |  108 +-
+ dselect/po/zh_CN.po     |  108 +-
+ dselect/po/zh_TW.po     |  108 +-
+ man/po/de.po            | 1055 ++++++++------
+ man/po/dpkg-man.pot     | 3913 +++++++++++++++++++++++++----------------------
+ man/po/es.po            |  979 +++++++-----
+ man/po/fr.po            | 1506 +++++++++----------
+ man/po/hu.po            |  930 ++++++-----
+ man/po/ja.po            |  922 ++++++-----
+ man/po/pl.po            |  944 +++++++-----
+ man/po/pt_BR.po         |  921 ++++++-----
+ man/po/ru.po            |  922 ++++++-----
+ man/po/sv.po            |  980 +++++++-----
+ po/ast.po               | 1606 ++++++++++----------
+ po/bs.po                | 1528 ++++++++++---------
+ po/ca.po                | 1597 ++++++++++----------
+ po/cs.po                | 1597 ++++++++++----------
+ po/da.po                | 1597 ++++++++++----------
+ po/de.po                |   84 +-
+ po/dpkg.pot             | 1523 +++++++++---------
+ po/dz.po                | 1598 ++++++++++----------
+ po/el.po                | 1600 ++++++++++----------
+ po/eo.po                | 1597 ++++++++++----------
+ po/es.po                | 1604 ++++++++++----------
+ po/et.po                | 1586 ++++++++++----------
+ po/eu.po                | 1597 ++++++++++----------
+ po/fr.po                | 1826 +++++++++++------------
+ po/gl.po                | 1604 ++++++++++----------
+ po/hu.po                | 1598 ++++++++++----------
+ po/id.po                | 1597 ++++++++++----------
+ po/it.po                | 1599 ++++++++++----------
+ po/ja.po                | 1597 ++++++++++----------
+ po/km.po                | 1598 ++++++++++----------
+ po/ko.po                | 1597 ++++++++++----------
+ po/ku.po                | 1541 ++++++++++---------
+ po/lt.po                | 1577 ++++++++++----------
+ po/mr.po                | 1586 ++++++++++----------
+ po/nb.po                | 1597 ++++++++++----------
+ po/ne.po                | 1598 ++++++++++----------
+ po/nl.po                | 1598 ++++++++++----------
+ po/nn.po                | 1577 ++++++++++---------
+ po/pa.po                | 1561 ++++++++++---------
+ po/pl.po                | 1610 ++++++++++----------
+ po/pt.po                | 1599 ++++++++++----------
+ po/pt_BR.po             | 1601 ++++++++++----------
+ po/ro.po                | 1597 ++++++++++----------
+ po/ru.po                | 1597 ++++++++++----------
+ po/sk.po                | 1597 ++++++++++----------
+ po/sv.po                | 1783 ++++++++++------------
+ po/th.po                | 1597 ++++++++++----------
+ po/tl.po                | 1577 ++++++++++---------
+ po/vi.po                | 1601 ++++++++++----------
+ po/zh_CN.po             | 1595 ++++++++++---------
+ po/zh_TW.po             | 1600 ++++++++++----------
+ scripts/po/ca.po        |  557 ++++---
+ scripts/po/de.po        |  429 +++---
+ scripts/po/dpkg-dev.pot |  524 ++++---
+ scripts/po/es.po        |  605 +++++---
+ scripts/po/fr.po        |  616 +++++---
+ scripts/po/pl.po        |  549 ++++---
+ scripts/po/ru.po        |  603 +++++---
+ scripts/po/sv.po        |  616 +++++---
+ 90 files changed, 44366 insertions(+), 40674 deletions(-)
+
+commit 9f2c48ff8d3c113d627e799650e97b6f734e6f93
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Aug 1 22:01:20 2011 +0200
+
+    Revert "dpkg-buildpackage: support for Build-Features: build-arch"
+    
+    This reverts commit 14d48ef9abc2ce2d394e9ae4d69d4ba68b551620. Given
+    that Guillem does not want this field and that the technical committee
+    has not yet decided on the proper approach to enable
+    build-arch/build-indep, it's safer to revert this change for now and allow
+    us to proceed with a release.
+    
+    Conflicts:
+    
+    	man/deb-src-control.5
+
+ debian/changelog               |    6 ---
+ man/deb-src-control.5          |    7 ---
+ man/dpkg-buildpackage.1        |   13 ++----
+ scripts/Dpkg/BuildFeatures.pm  |   84 ----------------------------------------
+ scripts/Dpkg/Control/Fields.pm |    3 -
+ scripts/Makefile.am            |    1 -
+ scripts/dpkg-buildpackage.pl   |   10 +----
+ scripts/po/POTFILES.in         |    1 -
+ 8 files changed, 6 insertions(+), 119 deletions(-)
+
+commit 9f2420aa6fee848acb30e88b127cb6e9a17d7c13
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Jul 27 23:20:00 2011 +0200
+
+    debian/rules: use the in-tree dpkg-buildflags to inject build flags
+    
+    Note that $(shell ...) does not receive variables defined
+    within make with "export VAR=foo" so that we have to include
+    DEB_CFLAGS_MAINT_APPEND in the command-line.
+
+ debian/rules |   15 +++------------
+ 1 files changed, 3 insertions(+), 12 deletions(-)
+
+commit 48468397afd51404ee3efcc9673e531155e999a2
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Jul 27 19:18:04 2011 +0200
+
+    dpkg-buildflags: support a "strip" operation
+    
+    The strip operation is useful to drop some options from the
+    returned build flags.
+
+ debian/changelog           |    3 ++-
+ man/dpkg-buildflags.1      |   10 ++++++++++
+ scripts/Dpkg/BuildFlags.pm |   30 +++++++++++++++++++++++++++++-
+ 3 files changed, 41 insertions(+), 2 deletions(-)
+
+commit a174a9ed4bea6da2098454bcf18d01dd438bf16a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Jul 27 18:49:46 2011 +0200
+
+    dpkg-buildflags: implement support of DEB_<flag>_MAINT_<op> env variables
+    
+    Those variables are meant to be used by the package maintainer within
+    debian/rules to alter the resulting build flags if needed.
+
+ debian/changelog           |    3 +-
+ man/dpkg-buildflags.1      |   21 +++++++++++++++---
+ scripts/Dpkg/BuildFlags.pm |   47 ++++++++++++++++++++++++++++++++++++-------
+ 3 files changed, 58 insertions(+), 13 deletions(-)
+
+commit 250f99b073b471b9dcd82d61ff4d61dd594a8dfe
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Jul 27 17:45:40 2011 +0200
+
+    dpkg-buildflags: implement --export=configure
+    
+    The goal is to make it easy to set compilation flags on a ./configure
+    command line for example like this:
+    ./configure $(shell dpkg-buildflags --export=configure)
+    
+    The output thus looks like this:
+    CFLAGS="-g -O2" CPPFLAGS="" CXXFLAGS="-g -O2" FFLAGS="-g -O2" LDFLAGS=""
+
+ debian/changelog           |    3 +++
+ man/dpkg-buildflags.1      |    4 +++-
+ scripts/dpkg-buildflags.pl |   10 +++++++---
+ 3 files changed, 13 insertions(+), 4 deletions(-)
+
+commit 7f4fb8576e9c9e8a2c959b3824fe61a95411f697
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Jul 27 13:21:53 2011 +0200
+
+    Revert "dpkg-buildflags: support debian/buildflags"
+    
+    This reverts commit 316df0a76f2ef91badbccb6fef0bfa7ae23fac59.
+    A recent discussion concluded that it was not a proper interface
+    for maintainers to override/extend build flags.
+    
+    See http://lists.debian.org/debian-dpkg/2011/07/msg00033.html
+    
+    Conflicts:
+    
+    	scripts/Dpkg/BuildFlags.pm
+
+ debian/changelog           |    3 ---
+ man/dpkg-buildflags.1      |    9 ---------
+ scripts/Dpkg/BuildFlags.pm |   37 ++++++++-----------------------------
+ 3 files changed, 8 insertions(+), 41 deletions(-)
+
+commit 9e03e21bf438f8513a2993c0be4ea4e22681af72
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jul 29 16:18:52 2011 +0200
+
+    Provide a new makefile snippet exporting basic package information
+
+ debian/changelog       |    4 ++--
+ scripts/mk/Makefile.am |    1 +
+ scripts/mk/default.mk  |    1 +
+ scripts/mk/pkg-info.mk |   17 +++++++++++++++++
+ 4 files changed, 21 insertions(+), 2 deletions(-)
+
+commit 46b688e4824f00842568b517b119eec34a5f7286
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 14 20:31:33 2011 +0200
+
+    dpkg-source: implement --commit and fail with unrecorded changes
+    
+    Formats "2.0" and "3.0 (quilt)" now fail by default in presence of
+    changes to upstream files that are not managed by their respective patch
+    system. The user is invited to run dpkg-source --commit if he
+    wants to keep the changes.
+    
+    This will avoid that maintainers upload packages with unexpected changes.
+    The old behaviour can be kept with the option --auto-commit. The option
+    --abort-on-upstream-changes is now useless with formats "2.0" and "3.0
+    (quilt)" except to cancel the effect of a former --auto-commit.
+    
+    See http://lists.debian.org/20110529085303.GA17707@rivendell.home.ouaza.com
+    for the discussion that enterined this change.
+
+ debian/changelog                  |    6 +++
+ man/dpkg-source.1                 |   32 ++++++++++++++++--
+ scripts/Dpkg/Source/Package.pm    |    8 ++++-
+ scripts/Dpkg/Source/Package/V2.pm |   68 ++++++++++++++++++++++++++++++++-----
+ scripts/dpkg-source.pl            |   22 +++++++++---
+ 5 files changed, 117 insertions(+), 19 deletions(-)
+
+commit 99cd8758402cc7f790f562c522d81f40c460233a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 28 17:14:55 2011 +0200
+
+    Dpkg::Source::Package::V2: cleanup generate_patch()
+    
+    Drop all references to $autopatch which has nothing to do with
+    generating a patch. Move the message explaining where the
+    changes have been recorded outside of the function.
+    
+    Drop unused parameter to get_patch_header().
+    
+    Drop intermediary variables which are only used once.
+
+ scripts/Dpkg/Source/Package/V2.pm |   15 ++++++---------
+ 1 files changed, 6 insertions(+), 9 deletions(-)
+
+commit 3b7f497c4e9766a8aa60317cf43406de2b816e4b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 28 16:26:51 2011 +0200
+
+    Dpkg::Source::Package::V2: move logic to create patches in a separate function
+    
+    This commit extracts the logic to create automatic patches in a new
+    generate_patch() method. It's expected that this function will be
+    reused to implement dpkg-source --commit.
+    
+    The code is mainly moved around as-is to simplify reviews. All
+    desired changes have been left for further commits.
+
+ scripts/Dpkg/Source/Package/V2.pm |   91 ++++++++++++++++++++++---------------
+ 1 files changed, 55 insertions(+), 36 deletions(-)
+
+commit b8407b1dbd152c179039e38e9c0492ea05f406b5
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 28 15:10:43 2011 +0200
+
+    Dpkg::Source::Package: replace register_autopatch() with register_patch()
+    
+    While register_autopatch() is only able to register a patch as the
+    automatic patch, register_patch() can register a patch under any
+    desired patch name.
+    
+    Also it doesn't not drop the input patch file, leaving that responsibility
+    to whoever called it. However if the input patch file is empty, it will
+    remove the target patch from the debian source package.
+
+ scripts/Dpkg/Source/Package/V2.pm       |   40 ++++++++++++++----------------
+ scripts/Dpkg/Source/Package/V3/quilt.pm |   36 +++++++++++++++++----------
+ 2 files changed, 42 insertions(+), 34 deletions(-)
+
+commit be128c8f7960f05d3be727478c8078af1c1bfd72
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 14 19:02:49 2011 +0200
+
+    dpkg-source: uniform handling of the patch header
+    
+    Formats "2.0" and "3.0 (quilt)" now generate the patch header
+    with the same code. Drop some useless duplication.
+
+ scripts/Dpkg/Source/Package/V2.pm       |   39 +++++++++++++++++++---
+ scripts/Dpkg/Source/Package/V3/quilt.pm |   52 +-----------------------------
+ 2 files changed, 35 insertions(+), 56 deletions(-)
+
+commit a7f16be86689ee46f4b2e445e5f08a63f447cdeb
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 14 18:56:30 2011 +0200
+
+    dpkg-source: accept "." as the directory parameter
+    
+    dpkg-source should never be called from within the unpacked source
+    tree, the result is usually not what one would expect. Fix this
+    by automatically converting the directory name and by changing the
+    current directory to the parent one.
+    
+    This is particularly interesting for the upcoming --record-changes
+    option.
+
+ scripts/dpkg-source.pl |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+commit dcc1a02343a45edbe209c0c07f09790418608723
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Aug 1 22:26:56 2011 +0200
+
+    Fix markup in French translation
+
+ man/po/fr.po |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit de998911d4af4effc8be60cab78a244f5951bfe2
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Mon Aug 1 09:32:48 2011 +0200
+
+    Updated french translation of manpages
+    
+    Updated to 1840t159f32u
+
+ debian/changelog |    1 +
+ man/po/fr.po     |  677 ++++++++++++++++++++++++++++++++++++------------------
+ 2 files changed, 460 insertions(+), 218 deletions(-)
+
+commit 773e6dcc0e8fcbd0f185f95d27184e9979a2411e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 30 18:35:03 2011 +0200
+
+    build: Error out if the host dpkg architecture cannot be determined
+    
+    Continuing will only produce a buggy dpkg.
+
+ m4/dpkg-arch.m4 |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 99b890c2eb6bfe955d85aedd40841366826c2f73
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 30 18:27:39 2011 +0200
+
+    build: Use the detected perl to invoke dpkg-architecture.pl
+    
+    This will help building dpkg on systems where perl is not at
+    /usr/bin/perl, which we were already taking into consideration for the
+    resulting scripts but not during build.
+
+ debian/changelog |    2 ++
+ m4/dpkg-arch.m4  |    3 ++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit c90b620cd8c2836a3f5058dfa1527f9d7b5cf46e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 30 18:14:27 2011 +0200
+
+    build: Move DPKG_ARCHITECTURE macro call to the end
+    
+    This puts together all build machinery checks, and will allow
+    DPKG_ARCHITECTURE to use the detected perl interpreter w/o needing
+    to call DPKG_PROG_PERL really early in the configure script.
+
+ configure.ac |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit e03a8325caf1b02dca6908cde96f3fcff50d001a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jul 29 11:38:55 2011 +0200
+
+    dpkg-mergechangelogs: fix test-suite
+    
+    In commit 5c233019cc770fb59671090d4a9462adb149921f I forgot to
+    update the test-suite to match for the change of conflict markers.
+    Doing this with this commit.
+
+ scripts/t/910_merge_changelogs/ch-merged          |   18 ++++----
+ scripts/t/910_merge_changelogs/ch-merged-basic    |   30 +++++++-------
+ scripts/t/910_merge_changelogs/ch-merged-pr       |   24 ++++++------
+ scripts/t/910_merge_changelogs/ch-merged-pr-basic |   42 ++++++++++----------
+ 4 files changed, 57 insertions(+), 57 deletions(-)
+
+commit 5c233019cc770fb59671090d4a9462adb149921f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jul 29 00:53:30 2011 +0200
+
+    dpkg-mergechangelogs: use 7 characters for conflict markers
+    
+    Reported-by: Andrew Bennetts <andrew.bennetts@canonical.com>
+
+ debian/changelog                |    2 ++
+ scripts/dpkg-mergechangelogs.pl |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit a372b6a165de8876434828d2f7884b6e8840349b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Jul 27 20:10:24 2011 +0200
+
+    debian/rules: introduce a maintainer build mode
+    
+    Adding "maintainer-build" to DEB_BUILD_OPTS changes some compilation
+    settings to make the build more useful for maintainers. For instance
+    it enables the silent rules so that it's easier to spot the warnings.
+    
+    It would be nice to also enable -Werror but that requires further
+    investigation since enabling this option results in ./configure not
+    working any more due to warnings generated by several of the
+    test programs compiled by ./configure itself.
+
+ debian/rules |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 84f3154aee09f649e78e78f0f0affe160d73296e
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Wed Jul 27 17:05:27 2011 +0200
+
+    German dpkg translation update
+    
+    Update to 1023t.
+
+ po/de.po |    9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+commit 7e17d3bfc489c01412f6a7edc92c0a46befc85ee
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Jul 27 13:08:59 2011 +0200
+
+    dpkg-divert: fix the test-suite to also skip tests that would fail if run as root
+
+ debian/changelog        |    2 ++
+ src/t/100_dpkg_divert.t |    6 +++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 6f14223bd4a27d9cf40bd830c69187e3c6406982
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Jul 26 11:10:24 2011 +0200
+
+    Update changelog to close a bug reporting a problem already fixed
+
+ debian/changelog |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 5b9ecc1b953c78614b2aee49687bec216de748f7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jul 25 05:12:35 2011 +0200
+
+    Add build-indep and build-arch targets as aliases for build
+    
+    The current build target is responsible for the generation of
+    architecture dependent and independent files. The architecture
+    independent files are just sed'ed and as such they take insignificant
+    build time, so splitting that from the general build process does not
+    seem worth the trouble or complexity. Renaming the current build
+    target to build-arch though would be incorrect.
+
+ debian/changelog |    2 ++
+ debian/rules     |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 9b22745f0a7127b7a171308f73e3079c535923f7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 7 19:18:04 2011 +0200
+
+    dpkg-deb: Construct control components paths with printf variants
+    
+    The output of dpkg-deb -I, -f and -W is not performance critical, and
+    code simplicity trumps over the tiny performance improvements that using
+    the explicit string functions or keeping the extracted control directory
+    in the varbuf might imply in these cases.
+
+ dpkg-deb/info.c |   43 +++++++++++++++----------------------------
+ 1 files changed, 15 insertions(+), 28 deletions(-)
+
+commit dac802bce2e7fa909dac09d87f6fadb6074b9097
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 7 19:08:18 2011 +0200
+
+    dpkg-deb: Use CONTROLFILE instead of a literal string
+
+ dpkg-deb/info.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 04bcffc1565417a77a545adc643d86b82559b4a1
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Jul 23 10:37:01 2011 +0200
+
+    Update German scripts translation
+    
+    Update to 517t
+
+ scripts/po/de.po |   64 +++++++++++++++++++++++++++--------------------------
+ 1 files changed, 33 insertions(+), 31 deletions(-)
+
+commit b858e07bddec28c5b86c39d425a02f08d9bd205a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jul 11 10:37:41 2011 +0200
+
+    dpkg-dev: add some common makefile snippets for use in rules files
+    
+    data/architecture.mk: variables related to dpkg-architecture
+    data/buildflags.mk: variables related to dpkg-builflags
+    data/vendor.mk: variables related to dpkg-vendor
+    data/default.mk: all of the above
+
+ configure.ac               |    1 +
+ debian/changelog           |    3 +++
+ debian/dpkg-dev.install    |    1 +
+ debian/dpkg.install        |    2 +-
+ scripts/Makefile.am        |    2 +-
+ scripts/mk/Makefile.am     |   16 ++++++++++++++++
+ scripts/mk/architecture.mk |   25 +++++++++++++++++++++++++
+ scripts/mk/buildflags.mk   |   25 +++++++++++++++++++++++++
+ scripts/mk/default.mk      |    7 +++++++
+ scripts/mk/vendor.mk       |   18 ++++++++++++++++++
+ 10 files changed, 98 insertions(+), 2 deletions(-)
+
+commit e135afdb35d0ac179657def901965a448115a981
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Jul 20 08:29:05 2011 +0200
+
+    dpkg: fix possible segfault in findbreakcycle().
+    
+    The circumstances are not entirely clear because clear_istobes() is
+    called earlier in the code and should already ensure that clientdata
+    is allocated for all packages in the database but the stack trace
+    reported leaves no room for any other interpretation. We must protect
+    the access to tpkg->clientdata in findbreakcycle() with
+    ensure_package_clientdata(tpkg).
+    
+    Probably that some other parts of the code might create new packages in the
+    in-memory database depending on some specific conditions. It might be that
+    those conditions only hold for a multiarch-enabled dpkg for example if
+    the code looks up a package entry for an alternative architecture and
+    would thus create the package on the fly.
+    
+    This is pure speculation because I did not push the investigations that
+    far. It might be something entirely different but it doesn't matter much
+    because the proposed fix is the same and just ensures that we respect
+    our API by protecting the access to clientdata.
+    
+    See https://bugs.launchpad.net/ubuntu/+source/dpkg/+bug/733414 for
+    details.
+
+ debian/changelog |    1 +
+ src/depcon.c     |    2 ++
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+commit e6b7685a540c24da1f6357fe8869602d84444aee
+Merge: d5aedf7 7627d80
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Tue Jul 19 09:49:06 2011 +0200
+
+    Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
+
+commit 7627d8027482b28a40c88599be9808ce85e58a04
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Jul 19 08:16:25 2011 +0200
+
+    dpkg-source: improve the error message "no orig.tar file found"
+    
+    Now we include the template corresponding to files that we try to look
+    for.
+
+ debian/changelog                  |    2 ++
+ scripts/Dpkg/Source/Package/V2.pm |   15 +++++++++++++--
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+commit d5aedf7fdff4dfeb8d329aa45486464d4596ec7a
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Mon Jul 18 19:42:01 2011 +0200
+
+    French translation of scripts completed
+    
+    514t
+
+ debian/changelog |    1 +
+ scripts/po/fr.po |   27 +++++++++++++--------------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+commit 189eaa27d4d3e7c7bbbb1933dfcdbdc597a58476
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Mon Jul 18 19:38:40 2011 +0200
+
+    Updated French translation of programs
+    
+    1022t
+
+ debian/changelog |    1 +
+ po/fr.po         |  500 ++++++++++++++++++++++++++++--------------------------
+ 2 files changed, 257 insertions(+), 244 deletions(-)
+
+commit bdcde2bb369531569c014bea8c0c6f6df5d38a2e
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Sun Jul 17 15:26:06 2011 +0200
+
+    Minor fixes
+
+ scripts/po/de.po |   10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 8449925b99926ba55651f94d21c174822a6af631
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Sun Jul 17 13:47:31 2011 +0200
+
+    German dpkg translation update
+    
+    Update to 1022t1f.
+
+ po/de.po | 1209 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 621 insertions(+), 588 deletions(-)
+
+commit 1605ee665e643613597e5d9100838fe6b3cdc2a1
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Jul 17 10:01:35 2011 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ man/po/es.po    | 4977 ++++++++++++++++++++++++++++++++----------------------
+ man/po/fr.po    | 4985 +++++++++++++++++++++++++++++++++----------------------
+ man/po/hu.po    | 4169 ++++++++++++++++++++++++----------------------
+ man/po/ja.po    | 4361 ++++++++++++++++++++++++++----------------------
+ man/po/pl.po    | 4869 +++++++++++++++++++++++++++++++-----------------------
+ man/po/pt_BR.po | 4222 +++++++++++++++++++++++++----------------------
+ man/po/ru.po    | 4207 +++++++++++++++++++++++++----------------------
+ man/po/sv.po    | 4976 ++++++++++++++++++++++++++++++++----------------------
+ 8 files changed, 20746 insertions(+), 16020 deletions(-)
+
+commit a0affbc4e347f00992f91e9d62f888541977d3d7
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Jul 17 09:58:49 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2028t3f.
+    Remove outdate "# type" (without dot) comments
+
+ man/po/de.po |  141 +++++-----------------------------------------------------
+ 1 files changed, 12 insertions(+), 129 deletions(-)
+
+commit 4e4d2e3908ab132e840a71508e5a379895507fac
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Jul 16 20:53:49 2011 +0200
+
+    update-alternatives: can_replace_link() → can_replace_path()
+    
+    alternative_can_replace_path() is clearer than
+    alternative_can_replace_link() since the function can also allow replacing
+    files which aren't links.
+
+ utils/update-alternatives.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 244ebc212261030e3da6c289108d4b5ed71aa867
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Jul 16 20:48:33 2011 +0200
+
+    update-alternatives: clarify role of --force concerning removal of links
+    
+    Modify update-alternatives --remove-all to remove files installed in
+    place of links if --force is used. Add the corresponding non-regression
+    test.
+
+ man/update-alternatives.8         |    4 ++--
+ utils/t/100_update_alternatives.t |   16 ++++++++++++----
+ utils/update-alternatives.c       |    5 ++---
+ 3 files changed, 16 insertions(+), 9 deletions(-)
+
+commit 91db161013479ad03ef95e7f0ca2f413c5e57925
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jul 15 22:06:38 2011 +0200
+
+    update-alternatives: fix regression when dropping slave alternatives
+    
+    When the alternative is changed, it might have to drop a slave alternative
+    that's no longer provide by the new choice. This must only remove the slave
+    link if it's actually a link. If it's a file, it must be kept except if
+    --force is given.
+    
+    The non-regression tests have been contributed by Andreas Beckmann.
+    
+    Reported-by: Andreas Beckmann <debian@abeckmann.de>
+
+ debian/changelog                  |    3 ++
+ utils/t/100_update_alternatives.t |   47 ++++++++++++++++++++++++++++++++++--
+ utils/update-alternatives.c       |   36 +++++++++++++++++++---------
+ 3 files changed, 71 insertions(+), 15 deletions(-)
+
+commit ed0eb757b659b8a7e4728e230b9d0db813294f15
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Jul 11 19:20:16 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2028t3f.
+
+ man/po/de.po |  432 +++++++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 262 insertions(+), 170 deletions(-)
+
+commit e3c5e26a45f751fa42a4b96369cbce2b12c292bd
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Jul 11 18:55:28 2011 +0200
+
+    Update German scripts translation
+    
+    Update to 517t
+
+ scripts/po/de.po |  100 +++++++++++++++++++++++++++--------------------------
+ 1 files changed, 51 insertions(+), 49 deletions(-)
+
+commit 006e0f93a2af1673a7153c822ce74b69fd8b2d26
+Author: Niels Thykier <niels@thykier.net>
+Date:   Mon Jul 11 13:59:10 2011 +0200
+
+    dpkg-dev: fail when closing an output handle fails
+    
+    This patch makes dpkg-gencontrol and dpkg-shlibdeps fail if their
+    call to close (on output handles) suggests an issue.  This prevents
+    them from silently producing incomplete files and may provide a
+    better error than the following rename failing.
+    
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog           |    1 +
+ scripts/dpkg-gencontrol.pl |    2 +-
+ scripts/dpkg-shlibdeps.pl  |    2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 64dc71b84f8a4403028631f8f42e413f378e7d77
+Author: Niels Thykier <niels@thykier.net>
+Date:   Mon Jul 11 13:27:44 2011 +0200
+
+    dpkg-mergechangelogs: fail if it cannot close the output file
+    
+    Made dpkg-mergechangelogs check the return value of close and fail
+    if it was not successful.  Previously dpkg-mergechangelogs would
+    silently fail to write a file if (e.g.) the device was full.
+    
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog                |    2 ++
+ scripts/dpkg-mergechangelogs.pl |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit d415c388d31e9c4b7eff8b77711a4c15b3b85208
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jul 11 09:20:20 2011 +0200
+
+    dpkg-buildflags: new --dump action, make it the default
+    
+    The --export command is useful to retrieve the compilation flags
+    in a shell script or in a makefile, and to export them in the environment,
+    but it's not well suited for parsing by another script (or even by a
+    human).
+    
+    The new --dump option becomes the default action and prints
+    the flags and their values following a documented template: "flag=value".
+
+ debian/changelog           |    2 ++
+ man/dpkg-buildflags.1      |    7 ++++++-
+ scripts/dpkg-buildflags.pl |   16 +++++++++++++---
+ 3 files changed, 21 insertions(+), 4 deletions(-)
+
+commit 8904196d5bc313d80917b4b25f77f52e0227f698
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 7 12:26:12 2011 +0200
+
+    dpkg-buildflags: supports a prepend command
+    
+    This command is particularly useful for package maintainers who don't want
+    their supplementary flags to take precedence over user submitted flags.
+
+ debian/changelog           |    4 ++++
+ man/dpkg-buildflags.1      |   10 +++++++++-
+ scripts/Dpkg/BuildFlags.pm |   29 ++++++++++++++++++++++++++++-
+ 3 files changed, 41 insertions(+), 2 deletions(-)
+
+commit 316df0a76f2ef91badbccb6fef0bfa7ae23fac59
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 7 11:45:37 2011 +0200
+
+    dpkg-buildflags: support debian/buildflags
+    
+    This file is for use by package maintainers. Since the call to
+    dpkg-buildflags might be hidden by packaging helpers, it's a good
+    idea to offer a simple way for package maintainers to extend
+    the set of flags returned. Otherwise each package helper must provide
+    its own way to extend the compilation flags.
+
+ debian/changelog           |    3 ++
+ man/dpkg-buildflags.1      |   13 ++++++++++-
+ scripts/Dpkg/BuildFlags.pm |   45 ++++++++++++++++++++++++++++++++++---------
+ 3 files changed, 49 insertions(+), 12 deletions(-)
+
+commit eb4bb268ab954748d015626a216f46f632f2371a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 7 11:15:40 2011 +0200
+
+    Dpkg::Path: new find_build_file() function
+    
+    Useful to allow architecture-specific variants of a file and pick the
+    right one based on the current host architecture.
+
+ scripts/Dpkg/Path.pm |   45 ++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 44 insertions(+), 1 deletions(-)
+
+commit 14f134d403c022046d38a6abb8be0fee7fb63355
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 7 10:30:20 2011 +0200
+
+    dpkg-buildpackage: no longer exports the compiler flags
+    
+    Packages must directly call dpkg-buildflags to retrieve them.
+    
+    dpkg-buildpackage still prints the flags that are returned by
+    dpkg-buildflags because it's useful for debugging purpose and for
+    identifying an unclean build environment.
+
+ debian/changelog             |    2 ++
+ man/dpkg-buildpackage.1      |   13 +++++++------
+ scripts/dpkg-buildpackage.pl |    5 ++---
+ 3 files changed, 11 insertions(+), 9 deletions(-)
+
+commit c70908ffc751a6a84bffcecfa7fa752aadd42481
+Author: Flo <sensorflo@gmail.com>
+Date:   Sat Jul 9 11:10:39 2011 +0200
+
+    Improve description of package states in man page
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d9661c223e1ac8c9892de6a45a0daa3fe3715936
+Author: Flo <sensorflo@gmail.com>
+Date:   Sat Jul 9 11:08:11 2011 +0200
+
+    Improve description of package states in man page
+
+ man/po/de.po |    7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+commit faa0fa50f1d9f85c1c9765961248701c11ad7abf
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Jul 9 11:00:14 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2017t3f.
+
+ man/po/de.po |   39 ++++++++++++++++++++++-----------------
+ 1 files changed, 22 insertions(+), 17 deletions(-)
+
+commit cd5c4b5bd6b50399af78dd42bda0408554ac6689
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Jul 8 16:54:49 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2012t5f3u.
+
+ man/po/de.po |  927 ++++++++++++++--------------------------------------------
+ 1 files changed, 224 insertions(+), 703 deletions(-)
+
+commit 3762f5bf39f9af0a937f49112b5aa982c49f3e2c
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu Jul 7 23:08:11 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1877t140f3u.
+
+ man/po/de.po | 3410 +++++++++++++++++++++++++++++++++-------------------------
+ 1 files changed, 1961 insertions(+), 1449 deletions(-)
+
+commit 01f081f28e88bc52a6609cd53ff1776c95a91c6d
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu Jul 7 22:42:03 2011 +0200
+
+    Update German scripts translation
+    
+    Update to 518t
+
+ scripts/po/de.po |  154 ++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 85 insertions(+), 69 deletions(-)
+
+commit 9c39b853fe4354476714f34a2ea52f030500bbc6
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Thu Jul 7 20:11:50 2011 +0200
+
+    build: Update po/POTFILES.in for renamed source file
+    
+    Commit cf22cf6118035ab8ee5cc25e5298a987073c8dc8 broke 'make update-po'.
+
+ po/POTFILES.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2d233269cbf8cc1529e0c49a8c03a8b2227d49ff
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 7 16:49:32 2011 +0200
+
+    dpkg-source(1): improve the description of --before-build & --after-build
+
+ debian/changelog  |    2 ++
+ man/dpkg-source.1 |   23 ++++++++++++-----------
+ 2 files changed, 14 insertions(+), 11 deletions(-)
+
+commit e0ce9b4ac351a921de12bf0302cfa97f1c7251e2
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 7 16:09:33 2011 +0200
+
+    dpkg-source(1): fix a small typo
+    
+    Replace ", under as" with "under". Add missing dot at the end of the
+    sentence.
+    
+    Reported-by: "Barak A. Pearlmutter" <bap@debian.org>
+
+ debian/changelog    |    1 +
+ man/dpkg-source.1   |    4 ++--
+ man/po/de.po        |    4 ++--
+ man/po/dpkg-man.pot |    4 ++--
+ man/po/es.po        |    4 ++--
+ man/po/fr.po        |    4 ++--
+ man/po/hu.po        |    4 ++--
+ man/po/ja.po        |    4 ++--
+ man/po/pl.po        |    4 ++--
+ man/po/pt_BR.po     |    4 ++--
+ man/po/ru.po        |    4 ++--
+ man/po/sv.po        |    4 ++--
+ 12 files changed, 23 insertions(+), 22 deletions(-)
+
+commit 2533ebc755dc0e197d51e7d50beaac2ec3a70e22
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 7 15:18:31 2011 +0200
+
+    dpkg-deb: adjust code now that extracthalf() no longer chdir() as a side-effect
+    
+    dpkg-deb -I, -f, -W were no longer working because they relied on the fact
+    that extracthalf() changed the current directory to the extracted
+    one.
+    
+    Regression introduced in commit 87809163331a320f9562d75591fcc6c954b9f80c.
+
+ dpkg-deb/info.c |   42 +++++++++++++++++++++++++++++++++++-------
+ 1 files changed, 35 insertions(+), 7 deletions(-)
+
+commit c819a400aa596e513ca8b28710ab9e2c62fcacd2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 7 06:24:37 2011 +0200
+
+    dpkg-maintscript-helper: Unify somewhat --help output with other commands
+
+ debian/changelog                   |    1 +
+ scripts/dpkg-maintscript-helper.sh |   18 ++++++------------
+ 2 files changed, 7 insertions(+), 12 deletions(-)
+
+commit 2825370120d3adf3c1ef0c1b16d09bb2637ff358
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 7 06:15:57 2011 +0200
+
+    man: Correctly format text with bold and italics
+
+ debian/changelog              |    1 +
+ man/deb-control.5             |   25 +++++++++++++------------
+ man/deb-shlibs.5              |    2 +-
+ man/deb-split.5               |    8 ++++----
+ man/deb-src-control.5         |   24 +++++++++++++-----------
+ man/deb-symbols.5             |    2 +-
+ man/deb-version.5             |    2 +-
+ man/dpkg-architecture.1       |    2 +-
+ man/dpkg-checkbuilddeps.1     |    2 +-
+ man/dpkg-divert.8             |    2 +-
+ man/dpkg-maintscript-helper.1 |    6 +++---
+ man/dpkg-name.1               |    3 +--
+ man/dpkg-shlibdeps.1          |    2 +-
+ man/dpkg-split.1              |    4 ++--
+ man/dpkg-trigger.1            |    8 ++++----
+ man/dpkg-vendor.1             |    8 ++++----
+ man/update-alternatives.8     |   16 ++++++++--------
+ 17 files changed, 60 insertions(+), 57 deletions(-)
+
+commit 9c757bf4c00f777f089e0ab6f83f10edd5892679
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 6 17:19:38 2011 +0200
+
+    man: Use italics or bold instead of surrounding the text with <>
+    
+    Using <> to delimit parts of text is necessary when using plain text
+    output, but not when we have some formatting available around, which
+    is the case with the man pages, but not with the program output.
+
+ TODO                          |    1 -
+ debian/changelog              |    1 +
+ man/deb-control.5             |   59 ++++++++++++++++---------------
+ man/deb-src-control.5         |   78 ++++++++++++++++++++--------------------
+ man/deb-symbols.5             |   18 +++++-----
+ man/dpkg-divert.8             |    4 +-
+ man/dpkg-maintscript-helper.1 |    4 +-
+ man/dpkg-name.1               |   18 +++++----
+ man/dpkg-parsechangelog.1     |   16 ++++----
+ man/dpkg.1                    |   24 ++++++------
+ man/dselect.1                 |    6 ++--
+ man/update-alternatives.8     |   14 ++++----
+ 12 files changed, 123 insertions(+), 120 deletions(-)
+
+commit 5190ed2c6b5c3d9e4f21db2cbdfddeca6ace2d46
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jul 4 19:06:38 2011 +0200
+
+    man: Use [option...] instead of [options] and friends
+
+ TODO                          |    1 -
+ debian/changelog              |    1 +
+ man/dpkg-architecture.1       |    5 ++---
+ man/dpkg-buildpackage.1       |    4 ++--
+ man/dpkg-checkbuilddeps.1     |    4 ++--
+ man/dpkg-deb.1                |    5 ++---
+ man/dpkg-distaddfile.1        |    4 ++--
+ man/dpkg-divert.8             |    4 ++--
+ man/dpkg-genchanges.1         |    4 ++--
+ man/dpkg-gencontrol.1         |    4 ++--
+ man/dpkg-gensymbols.1         |    4 ++--
+ man/dpkg-maintscript-helper.1 |    4 ++--
+ man/dpkg-name.1               |    6 +++---
+ man/dpkg-parsechangelog.1     |    4 ++--
+ man/dpkg-scanpackages.1       |    5 ++---
+ man/dpkg-scansources.1        |    5 ++---
+ man/dpkg-shlibdeps.1          |    6 ++----
+ man/dpkg-source.1             |    5 ++---
+ man/dpkg-split.1              |    5 ++---
+ man/dpkg-statoverride.8       |    5 ++---
+ man/dpkg.1                    |    2 +-
+ man/dselect.1                 |   12 ++----------
+ man/start-stop-daemon.8       |    5 ++---
+ man/update-alternatives.8     |    5 ++---
+ 24 files changed, 45 insertions(+), 64 deletions(-)
+
+commit 9e53fcc54bddbbab53e964f3339bd712e41806e5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jul 4 18:55:03 2011 +0200
+
+    Refer to Sources and Packages files as part of a repository
+    
+    Instead of as being of exclusive use or owned by APT, which has never
+    been the case. Those files existed long before APT even existed.
+
+ debian/changelog              |    2 ++
+ man/dpkg-query.1              |    4 ++--
+ scripts/Dpkg/Control.pm       |    8 ++++----
+ scripts/Dpkg/Control/Types.pm |    4 ++--
+ 4 files changed, 10 insertions(+), 8 deletions(-)
+
+commit 868cccc78684cd098e4ca6f879492842e24eb9a6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 6 16:46:54 2011 +0200
+
+    dpkg-query(1): Clarify that several fields are not dselect specific
+    
+    These apply to most dpkg front-ends not just dselect.
+
+ debian/changelog |    2 ++
+ man/dpkg-query.1 |    8 ++++----
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 7f3892f184d9accd250600dfc54173a6436a5d3a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 6 16:46:26 2011 +0200
+
+    dpkg-shlibdeps(1): Add missing “with”
+
+ man/dpkg-shlibdeps.1 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0a9586213086723c5962bbfa6659df240c77433c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 7 06:19:02 2011 +0200
+
+    man: Use dashes instead of underscores for variable text
+    
+    This makes the text more clear by avoiding the clashes when italics
+    are rendered as underlined text.
+
+ debian/changelog      |    1 +
+ man/deb-control.5     |    2 +-
+ man/deb-src-control.5 |    2 +-
+ man/deb-version.5     |   36 ++++++++++++++++++------------------
+ man/dpkg-deb.1        |    4 ++--
+ man/dpkg-gensymbols.1 |    4 ++--
+ man/dpkg-name.1       |    4 ++--
+ man/dpkg.1            |   14 +++++++-------
+ 8 files changed, 34 insertions(+), 33 deletions(-)
+
+commit 7dcd875e084213fa65c09cd23a3e45edfbfcb94b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 7 06:17:19 2011 +0200
+
+    deb-control(5): Add missing escaping to field dashes
+
+ debian/changelog  |    1 +
+ man/deb-control.5 |    4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 971e0bd2005b06ab718a90e77067f7c6ff01c0b3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 6 16:45:26 2011 +0200
+
+    dselect(1): Add missing built-in methods
+
+ debian/changelog |    1 +
+ man/dselect.1    |    8 ++++----
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+commit 37b01269a3735a3213d5fe5fce377d5360f55ff7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 7 05:41:06 2011 +0200
+
+    dselect(1): Rename USAGE section to ACTIONS
+    
+    Document the ways actions can be performed, either interactively or from
+    the command line.
+
+ debian/changelog |    3 +++
+ man/dselect.1    |    7 ++++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+commit e342a8fc3bc777971f76aff0f89b8b121876a532
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 3 21:29:43 2011 +0200
+
+    Use “command line” instead of commandline or command-line
+
+ TODO              |    1 -
+ debian/usertags   |    4 ++--
+ doc/README.api    |    2 +-
+ doc/triggers.txt  |    2 +-
+ man/dpkg-source.1 |    4 ++--
+ man/dselect.1     |    8 ++++----
+ man/dselect.cfg.5 |    4 ++--
+ 7 files changed, 12 insertions(+), 13 deletions(-)
+
+commit 23cd39aae01f1b3b1aee834befa02201e8824819
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 7 09:04:32 2011 +0200
+
+    libdpkg: Rename catch_signals to signo_ignores in subproc module
+
+ lib/dpkg/subproc.c |   16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+commit 668ab0d8ab99dcc7a63d58bc1d859d857e3e939e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jul 4 04:10:32 2011 +0200
+
+    libdpkg: Rename sigaction variables in subproc module to sa and sa_save
+
+ lib/dpkg/subproc.c |   17 +++++++++--------
+ 1 files changed, 9 insertions(+), 8 deletions(-)
+
+commit b81ec0a39b7ccba925fb0fb8f0664a0671dbc2dc
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jul 4 03:19:04 2011 +0200
+
+    libdpkg: Rename variable r to pid in subproc_fork()
+
+ lib/dpkg/subproc.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit cf22cf6118035ab8ee5cc25e5298a987073c8dc8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 3 03:23:11 2011 +0200
+
+    libdpkg: Rename myopt module to options
+
+ dpkg-deb/build.c                |    2 +-
+ dpkg-deb/extract.c              |    2 +-
+ dpkg-deb/info.c                 |    2 +-
+ dpkg-deb/main.c                 |    2 +-
+ dpkg-split/info.c               |    2 +-
+ dpkg-split/join.c               |    2 +-
+ dpkg-split/main.c               |    2 +-
+ dpkg-split/queue.c              |    2 +-
+ dpkg-split/split.c              |    2 +-
+ dselect/main.cc                 |    2 +-
+ lib/dpkg/Makefile.am            |    4 ++--
+ lib/dpkg/{myopt.c => options.c} |    4 ++--
+ lib/dpkg/{myopt.h => options.h} |    8 ++++----
+ src/archives.c                  |    2 +-
+ src/cleanup.c                   |    2 +-
+ src/divertcmd.c                 |    2 +-
+ src/enquiry.c                   |    2 +-
+ src/errors.c                    |    2 +-
+ src/main.c                      |    2 +-
+ src/packages.c                  |    2 +-
+ src/processarc.c                |    2 +-
+ src/querycmd.c                  |    2 +-
+ src/remove.c                    |    2 +-
+ src/select.c                    |    2 +-
+ src/statcmd.c                   |    2 +-
+ src/trigcmd.c                   |    2 +-
+ src/update.c                    |    2 +-
+ 27 files changed, 32 insertions(+), 32 deletions(-)
+
+commit 16354a961ce86778a3e0ca56f2fa5314855ccf3c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 3 03:12:40 2011 +0200
+
+    Fix printforhelp string in dpkg-divert and dpkg-statoverride
+
+ src/divertcmd.c |    2 +-
+ src/statcmd.c   |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 01d9ba9dfa1695ab12bd4a09f9f35a6e18c09788
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 2 02:23:27 2011 +0200
+
+    Fix comment header lines describing the subproject
+
+ dselect/bindings.h       |    2 +-
+ dselect/dselect-curses.h |    2 +-
+ dselect/dselect.h        |    2 +-
+ dselect/pkglist.h        |    2 +-
+ lib/dpkg/dbmodify.c      |    2 +-
+ lib/dpkg/fdio.c          |    2 +-
+ lib/dpkg/fdio.h          |    2 +-
+ lib/dpkg/glob.c          |    2 +-
+ lib/dpkg/glob.h          |    2 +-
+ lib/dpkg/log.c           |    2 +-
+ lib/dpkg/pkg-array.c     |    2 +-
+ lib/dpkg/pkg-array.h     |    2 +-
+ lib/dpkg/pkg-list.c      |    2 +-
+ lib/dpkg/pkg-list.h      |    2 +-
+ lib/dpkg/pkg-queue.c     |    2 +-
+ lib/dpkg/pkg-queue.h     |    2 +-
+ lib/dpkg/pkg-show.c      |    2 +-
+ lib/dpkg/pkg-show.h      |    2 +-
+ lib/dpkg/pkg.c           |    2 +-
+ lib/dpkg/pkg.h           |    2 +-
+ lib/dpkg/progress.c      |    2 +-
+ lib/dpkg/progress.h      |    2 +-
+ lib/dpkg/trigdeferred.l  |    2 +-
+ 23 files changed, 23 insertions(+), 23 deletions(-)
+
+commit 9fe0a1b16d3045534f7863aed2e35f5177156a15
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 2 02:00:51 2011 +0200
+
+    Use new dpkg_set_progname and dpkg_get_progname instead of thisname
+    
+    The current implementation demanded libdpkg users to define thisname
+    themselves, which is not really a nice interface to offer to programs.
+    
+    Closes: #631757
+
+ debian/changelog          |    3 +++
+ dpkg-deb/main.c           |    2 +-
+ dpkg-split/main.c         |    2 +-
+ dselect/main.cc           |    3 ++-
+ lib/dpkg/dpkg.h           |    1 +
+ lib/dpkg/ehandle.c        |   16 +++++++++-------
+ lib/dpkg/ehandle.h        |    3 ---
+ lib/dpkg/libdpkg.Versions |    1 -
+ lib/dpkg/subproc.c        |    2 +-
+ lib/dpkg/test.h           |    2 --
+ src/divertcmd.c           |    7 ++++---
+ src/errors.c              |    6 +++---
+ src/main.c                |    2 +-
+ src/querycmd.c            |    6 +++---
+ src/statcmd.c             |    7 ++++---
+ src/trigcmd.c             |   11 +++++------
+ src/trigproc.c            |    2 +-
+ 17 files changed, 39 insertions(+), 37 deletions(-)
+
+commit ec206bf34be3733a665840432f70faf149f2c008
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 2 01:58:33 2011 +0200
+
+    libdpkg: Add new progname module handling functions
+
+ configure.ac              |    3 +-
+ lib/dpkg/Makefile.am      |    2 +
+ lib/dpkg/libdpkg.Versions |    4 ++
+ lib/dpkg/progname.c       |   83 +++++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/progname.h       |   33 ++++++++++++++++++
+ m4/dpkg-funcs.m4          |   23 ++++++++++++
+ 6 files changed, 147 insertions(+), 1 deletions(-)
+
+commit cd92cc77e5103b31ce15b746bd71095b859ac08b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 2 02:04:28 2011 +0200
+
+    libdpkg: Add missing macros for program names
+    
+    Specifically for dpkg-divert, dpkg-statoverride and dpkg-trigger.
+
+ lib/dpkg/dpkg.h |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 0fc0d6d598c045c77d056b40446208448b9ec6e2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 1 04:22:51 2011 +0200
+
+    libdpkg: Do not require programs to define printforhelp
+    
+    Instead define it in myopt.c and initialize it through a new argument to
+    myopt().
+
+ dpkg-deb/main.c           |    4 ++--
+ dpkg-split/main.c         |    4 ++--
+ dselect/main.cc           |    4 ++--
+ lib/dpkg/libdpkg.Versions |    1 -
+ lib/dpkg/myopt.c          |    9 ++++++++-
+ lib/dpkg/myopt.h          |    5 ++---
+ src/divertcmd.c           |    5 +++--
+ src/main.c                |    6 +++---
+ src/querycmd.c            |    5 +++--
+ src/statcmd.c             |    5 +++--
+ src/trigcmd.c             |    4 ++--
+ 11 files changed, 30 insertions(+), 22 deletions(-)
+
+commit 4da4c894719c7d33a3e44645630f63172cfd4c99
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 4 02:02:57 2011 +0200
+
+    libdpkg: Add missing symbols to the version script
+
+ lib/dpkg/libdpkg.Versions |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 87809163331a320f9562d75591fcc6c954b9f80c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 17 17:00:30 2011 +0200
+
+    dpkg-deb: Always chdir(2) in the childs to not change the global state
+    
+    To not disturb the global program state we should always chdir(2) in the
+    childs that actually need it. This will allow in the future to switch
+    this code to be part of a library.
+
+ dpkg-deb/extract.c |   25 ++++++++++++-------------
+ dpkg-deb/info.c    |    4 ++--
+ 2 files changed, 14 insertions(+), 15 deletions(-)
+
+commit 6ab502b6a7a3718b697e7c1020fcd5d7f9fd2d67
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 7 07:11:06 2011 +0200
+
+    dpkg: Use braces on ‘if’ to avoid ambiguous ‘else’
+    
+    Warning introduced in commit fc625d161382abc41b984ca9ee1e32ad4f295c67.
+
+ src/archives.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 1ea0da5ac9079a38aae50ccbe78cec003e7ae95a
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Tue Jul 5 09:44:49 2011 +0200
+
+    dpkg: Mark error message for translation
+    
+    Missed in commit fc625d161382abc41b984ca9ee1e32ad4f295c67.
+
+ src/archives.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a9345899bd3ad76e6081beaefbb1a5ce0758ebad
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jun 30 14:08:44 2011 +0200
+
+    dpkg-source: improve the logic to identify ignored files
+    
+    The list of ignored files was only generated by expanding the patterns
+    relative to the current directory (which usually is the directory above
+    the source package). Instead what we want is to expand them at the
+    top-level directory of the source package and at the directory being
+    inspected.
+    
+    Reported-by: Joachim Breitner <nomeata@debian.org>
+
+ debian/changelog                  |    1 +
+ scripts/Dpkg/Source/Package/V2.pm |   12 +++++++++---
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+commit fc625d161382abc41b984ca9ee1e32ad4f295c67
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Jun 28 09:39:46 2011 +0200
+
+    dpkg: add the missing ohshite() on a failed syscall
+
+ src/archives.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit b6ca9bcdb5887e30fe65ecd2105da9dcd55a351c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jun 29 04:11:32 2011 +0200
+
+    dpkg: Unpack missing shared directories when the package is replaced
+    
+    When unpacking a directory missing in the file system with that path
+    shared by at least one other package, from a package that is Replaced
+    by other packages, assume the missing path is a shared directory and
+    avoid setting ‘keepexisting’ and as such returning prematurely from
+    tarobject(), because in that case we need to recreate the lost
+    directory. As a side effect this also prevents printing the message
+    “Replaced by files in installed package” which is bogus in this case,
+    as directories are always shared.
+    
+    Regression introduced in commit 00e5640a99be03aba40c9e08a663b90d8f8aa797.
+    
+    Closes: #631808
+
+ debian/changelog |    2 ++
+ src/archives.c   |   26 ++++++++++++++++----------
+ 2 files changed, 18 insertions(+), 10 deletions(-)
+
+commit 638e259f69c1f3c0e1000979274562f8ffad4df9
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Jun 28 09:34:52 2011 +0200
+
+    update-alternatives: do not allow to reuse a slave link in another slave alternative
+    
+    update-alternatives erroneously allowed to reuse a link in another slave
+    alternative. Given the parsing code already catched this error, it would
+    immediately result in update-alternatives being unusable to manipulate the
+    broken alternative.
+    
+    Reported-by: Andreas Beckmann <debian@abeckmann.de>
+
+ debian/changelog                  |    2 ++
+ utils/t/100_update_alternatives.t |    7 ++++++-
+ utils/update-alternatives.c       |   11 +++++++++++
+ 3 files changed, 19 insertions(+), 1 deletions(-)
+
+commit 8ee722234e35e8fca0fd60aac35f9263d62f3f95
+Author: Peter Krefting <peterk@debian.org>
+Date:   Mon Jun 27 19:24:45 2011 +0100
+
+    Fix some damage introduced by gtranslator.
+
+ po/sv.po         |    6 +++---
+ scripts/po/sv.po |    6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 46dde50846c6698b28e255c8f1f060e1ec7a7179
+Author: Peter Krefting <peterk@debian.org>
+Date:   Mon Jun 27 19:22:11 2011 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: 1022t0f0u.
+    scripts/po/sv.po: 514t0f0u.
+
+ debian/changelog |    2 +
+ po/sv.po         |  512 ++++++++++++++++++++++++++----------------------------
+ scripts/po/sv.po |   37 ++--
+ 3 files changed, 269 insertions(+), 282 deletions(-)
+
+commit 86f689c13be910797eb22f7c2a63f2d49298641d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jun 27 09:36:59 2011 +0200
+
+    dpkg-buildflags(1): DEB_*_(SET|APPEND) are meant for users
+    
+    Make it clear that the possibility to override the compilation flags
+    with environment variables DEB_*_SET and DEB_*_APPEND is restricted
+    to users and that packages should not set those variables.
+
+ debian/changelog      |    2 ++
+ man/dpkg-buildflags.1 |    5 ++++-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit f64a8d66c0c3b3a44927a6eb4d5bd57ef8d60594
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Feb 21 16:32:57 2011 +0100
+
+    Fix bad indentation in various parts of the code
+
+ lib/dpkg/dbmodify.c |    6 +++---
+ src/archives.c      |    6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+commit e2d910ee0805a56f87416aab355ca68a264e077b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Jun 26 10:21:28 2011 +0200
+
+    Add missing changelog entry for new trigger directives
+
+ debian/changelog |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit cf6b98d3738d1fe8b3119b71fd8321c12feb618c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun May 15 01:39:31 2011 +0200
+
+    dpkg: implement "interest-noawait" and "activate-noawait" trigger commands
+    
+    Those variants do not put triggering packages in triggers-awaited status
+    and thus do not record the package with the corresponding pending triggers
+    in the Triggers-Awaited field.
+    
+    This should be used for triggers which do not provide essential
+    functionality when we can safely consider that the triggering packages
+    are able to satisfy dependencies even if the trigger processing
+    has not yet happened.
+
+ debian/dpkg.prerm  |   81 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ doc/triggers.txt   |    3 +-
+ lib/dpkg/triglib.c |   78 +++++++++++++++++++++++++++++++++++---------------
+ lib/dpkg/triglib.h |   15 +++++++--
+ man/deb-triggers.5 |   20 ++++++++++++-
+ src/trigproc.c     |   10 ++++--
+ 6 files changed, 174 insertions(+), 33 deletions(-)
+
+commit 9d3ec0f5a727d439c3cbc8885bcbc78f7a34dd0b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Jun 18 21:36:40 2011 +0200
+
+    dpkg: do not fallback to "new-prerm failed-upgrade" for downgrades
+    
+    If "installed-prerm upgrade" fails, dpkg tries to run "new-prerm
+    failed-upgrade" so that newer versions of packages can work-around
+    a bug in the prerm of the installed package.
+    
+    In the case of downgrade this logic doesn't make any sense since
+    the oldest version can't be aware of the bug in the newest version
+    (that did not exist when the prerm of the oldest version was
+    written).
+    
+    Thus we're disabling the fallback in case of a downgrade or a
+    reinstallation of the same version.
+
+ debian/changelog |    3 +++
+ src/processarc.c |   10 ++++++++--
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+commit bbe54d836c52533c923484f3eaf216011551337a
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Mon Jun 13 23:23:09 2011 +0200
+
+    dpkg-gensymbols: cope with empty lines
+    
+    Empty lines are quite useful as (visual) delimiters between sections in
+    symbols files, for example when libfoo0 contains libfoo-bar.so.0 and
+    libfoo-baz.so.0. Consider them like comments: ignore them. This gets us
+    rid of such warnings (which by the way are missing line numbers):
+    | dpkg-gensymbols: warning: Failed to parse a line in debian/libfoo0.symbols:
+    | dpkg-gensymbols: warning: Failed to parse a line in debian/libfoo0.symbols:
+    
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog                  |    2 ++
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 2be618a80de2de006428c1f92bfafa90bb963adf
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Jun 25 10:17:53 2011 +0200
+
+    dpkg-gensymbols(1): document syntax of comments
+    
+    Reported-by: Sven Joachim <svenjoac@gmx.de>
+
+ debian/changelog      |    1 +
+ man/dpkg-gensymbols.1 |    5 +++++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 1c1653ef4d7a6d461d4c2168d8a078a8a11596db
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Jun 25 10:08:03 2011 +0200
+
+    dpkg-source: add some supplementary checks of debian/control
+    
+    We're now ensuring that debian/control contains a source entry
+    and at least one entry for a binary package. And we also ensure
+    that the Architecture field is present. This a new restriction
+    but it's really in-line with the change made in dpkg where we
+    complain of the lack of this field.
+    
+    Reported-by: Niels Thykier <niels@thykier.net>
+
+ debian/changelog                     |    2 ++
+ scripts/Dpkg/Control/Info.pm         |    6 +++++-
+ scripts/dpkg-source.pl               |    5 +++++
+ scripts/t/700_Dpkg_Control.t         |    4 ++++
+ scripts/t/700_Dpkg_Control/control-1 |    3 +++
+ 5 files changed, 19 insertions(+), 1 deletions(-)
+
+commit 8eed1ffef9b85ccf71190cb7f36788f2994222ed
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Jun 25 09:53:02 2011 +0200
+
+    Dpkg::ErrorHandling::syntaxerr(): handle supplementary parameters like report()
+    
+    That is consider that the string is a format string that needs to be
+    processed with sprintf().
+
+ scripts/Dpkg/ErrorHandling.pm |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 02e045f9b2f6a75711a7a9f29766a835e971be3a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Jun 25 08:59:24 2011 +0200
+
+    dpkg-source(1): wording improvement
+    
+    Use "special" instead of "particular" to qualify the "3.0 (custom)"
+    format.
+    
+    Reported-by: Ben Pfaff <blp@nicira.com>
+
+ debian/changelog  |    2 ++
+ man/dpkg-source.1 |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 3c3dce24847d0040547aa2a2bd9da5dcca2df0c7
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jun 17 23:53:32 2011 +0200
+
+    dpkg: ensure that post_postinst_tasks() doesn't introduce bad data
+    
+    The pending triggers were removed because the postinst has just been
+    run, unfortunately in some cases it would restore the status to
+    pending-triggers. This is notably the case when a package is
+    removed while being in triggers-pending and when the prerm fails.
+    
+    In fact it was not correct to remove the pending triggers in this
+    function because only "postinst configure" should clear the pending
+    triggers. Thus move the removal of the pending triggers to
+    deferred_configure() in src/configure.c and reset the status
+    to its "normal" value when the target status is one of triggers-awaited,
+    triggers-pending or installed.
+    
+    With this change, it's no longer possible to have a status of
+    triggers-pending without any pending trigger in trigpend_head.
+    
+    Note that despite this change, the pending triggers are lost
+    during a failed removal because dpkg switches the package to
+    halfconfigured before running "prerm remove" and modstatdb_note()
+    drops the pending triggers in that situation.
+
+ debian/changelog |    4 ++--
+ src/configure.c  |    1 +
+ src/help.c       |    7 +++++--
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+
+commit a36cadba41b19d5908bdfcb658cf01af07c1436a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jun 17 23:22:55 2011 +0200
+
+    dpkg: ensure that trig_transitional_activate() doesn't introduce bad data
+    
+    trig_transitional_activate() is emptying Triggers-Pending without
+    ensuring that the status is set back to something which is not
+    triggers-pending. In theory it's ok because the trig_parse_ci()
+    call is supposed to reactivate all the triggers. But if there's no
+    triggers file any more then we're effectively introducing a skew
+    which is going to be fatal the next time we try to write down
+    the status file.
+    
+    The disparition of the triggers file can happen with file system problems,
+    bad user manipulation or even an old dpkg bug that kept triggers alive
+    when in fact the trigger was dropped from the package. Or the triggers
+    file has effectively been removed in the package but the user has restored
+    an old status file with a triggers-pending status that the current package
+    should no longer be able to generate.
+    
+    In other words, properly resetting the status in
+    trig_transitional_activate() makes dpkg more robust.
+
+ debian/changelog |    2 ++
+ src/trigproc.c   |    7 +++++++
+ 2 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 1165f6821681075eeed66ca9cf1e889a057f636c
+Author: Ludovic Brenta <ludovic@ludovic-brenta.org>
+Date:   Wed Jun 15 06:48:10 2011 +0200
+
+    dpkg-gencontrol: Run du with --apparent-size for the Installed-Size field
+    
+    This will give consistent results independent of build system.
+    
+    Even though this will keep not providing accurate enough information
+    for the field's purpose and as such some times the size reported will
+    be less than the space eventually used, having the value changing
+    depending on the build system is just bogus.
+    
+    Closes: #630533
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog           |    3 +++
+ scripts/dpkg-gencontrol.pl |    3 ++-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit f7205f491c1f68a36f63d650eb780436f1fc7fe7
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Jun 12 14:25:50 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2029t1f0u.
+
+ man/po/de.po |  319 +++++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 160 insertions(+), 159 deletions(-)
+
+commit 8a92e91b6be8c5ef0d3aee8e340d18b82b8a40c5
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Jun 12 14:05:03 2011 +0200
+
+    Update German scripts translation
+    
+    Update to 516t
+
+ scripts/po/de.po |  320 +++++++++++++++++++++++++++---------------------------
+ 1 files changed, 159 insertions(+), 161 deletions(-)
+
+commit 9c590651dc6a4d641f4abdb1200da71c21f5bd72
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Jun 12 11:41:23 2011 +0200
+
+    dpkg-source: unapplied patches do not warrant a warning
+    
+    There are perfectly legitimate cases where the patches are not applied
+    and there's no need to output a long warning about this. A brief message
+    is more than enough.
+
+ scripts/Dpkg/Source/Package/V2.pm       |    2 +-
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+commit e60718be567458e84f6d3f650a4f2b13dd21f1d6
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Jun 12 11:27:28 2011 +0200
+
+    dpkg-source: --after-build unapplies patches applied during --before-build
+    
+    Implement this logic for the "2.0" and "3.0 (quilt)" source formats.
+
+ debian/changelog                        |    2 ++
+ man/dpkg-source.1                       |   31 ++++++++++++-------------------
+ scripts/Dpkg/Source/Package/V2.pm       |   13 ++++++++++++-
+ scripts/Dpkg/Source/Package/V3/quilt.pm |   18 ++++++++++++++++++
+ 4 files changed, 44 insertions(+), 20 deletions(-)
+
+commit e215edebf89cb342718b0d9a1fada68e414e1798
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Jun 12 09:57:18 2011 +0200
+
+    Fix typo in French translation of dpkg-source(1).
+
+ man/po/fr.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 46d6192d4070b0324b837105e9959a501e65433d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Jun 11 22:49:53 2011 +0200
+
+    dpkg-source: support debian/source/local-patch-header
+    
+    Useful to use in combination with a --single-debian-patch option
+    in debian/source/local-options.
+    
+    The commit also changes the place where the local-options file is ignored.
+    Instead of using the default diff_ignore regexp, it's hardcoded in the
+    initialization function in case the default regexp is not used.
+    
+    Suggested-by: Russ Allbery <rra@debian.org>
+
+ debian/changelog                        |    3 +++
+ man/dpkg-source.1                       |   11 +++++++----
+ scripts/Dpkg/Source/Package.pm          |    6 +++---
+ scripts/Dpkg/Source/Package/V1.pm       |    7 ++++---
+ scripts/Dpkg/Source/Package/V2.pm       |    5 ++++-
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    5 ++++-
+ 6 files changed, 25 insertions(+), 12 deletions(-)
+
+commit 4e246f9e3e3155447f3aaa8bab7d079ee0064c5b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Jun 11 19:05:26 2011 +0200
+
+    Dpkg::BuildFlags: avoid a Perl warning when HOME is not set
+
+ debian/changelog           |    1 +
+ scripts/Dpkg/BuildFlags.pm |    7 +++++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit cbf13f86a99b7ed2d3c89a9c99996dfa2625782e
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Jun 11 12:02:33 2011 +0200
+
+    Dpkg::Vendor: add the module the supported Perl API
+    
+    Bump its version to 1.00.
+    
+    Lintian would like to use it when dpkg-dev is absent to provide some
+    vendor specific behaviour.
+
+ debian/changelog       |    2 ++
+ scripts/Dpkg/Vendor.pm |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit b5c339c155b21cc393cc7ec7e4c5579dc5f03f6f
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue Jun 7 11:46:08 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2028t1f0u.
+
+ man/po/de.po |  350 +++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 190 insertions(+), 160 deletions(-)
+
+commit dc927a0183f925646a06b1198f831e270fed75d3
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jun 6 15:00:35 2011 +0200
+
+    Fix typo in debian/changelog spotted by lintian
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 14d48ef9abc2ce2d394e9ae4d69d4ba68b551620
+Author: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr>
+Date:   Sun Sep 6 13:18:50 2009 +0200
+
+    dpkg-buildpackage: support for Build-Features: build-arch
+    
+    With this flag set in debian/control, dpkg-buildpackage will use
+    "debian/rules build-arch" or "debian/rules build-indep" when
+    appropriate.
+    
+    Improved-by: Raphaël Hertzog <hertzog@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog               |    6 +++
+ man/deb-src-control.5          |    7 +++
+ man/dpkg-buildpackage.1        |   13 ++++--
+ scripts/Dpkg/BuildFeatures.pm  |   84 ++++++++++++++++++++++++++++++++++++++++
+ scripts/Dpkg/Control/Fields.pm |    3 +
+ scripts/Makefile.am            |    1 +
+ scripts/dpkg-buildpackage.pl   |   10 ++++-
+ scripts/po/POTFILES.in         |    1 +
+ 8 files changed, 119 insertions(+), 6 deletions(-)
+
+commit b3d0bb4a4cb8a994d3841912dccd116224498f32
+Author: Niels Thykier <niels@thykier.net>
+Date:   Sun Jun 5 00:31:49 2011 +0200
+
+    dpkg-vendor: fail on missing parameters for required arguments
+    
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog       |    2 ++
+ scripts/dpkg-vendor.pl |    2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 53af7e486a194fb005beb24873e5fb276e84b42c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun May 29 09:43:22 2011 +0200
+
+    Dpkg::Source::Package: add extraction functions to the supported API
+    
+    Add the extraction part of Dpkg::Source::Package to the supported API.
+    It's useful to extract source packages without having to depend on
+    dpkg-source (and hence dpkg-dev).
+    
+    Suggested-by: Niels Thykier
+
+ debian/changelog               |    3 +
+ scripts/Dpkg/Source/Package.pm |  107 +++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 109 insertions(+), 1 deletions(-)
+
+commit 3aad657574c14c0ec13338d13cb4d6eea94b3926
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat May 28 15:22:23 2011 +0200
+
+    Update German scripts translation
+    
+    Update to 516t
+
+ scripts/po/de.po |   98 ++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 51 insertions(+), 47 deletions(-)
+
+commit 8bbd76cc98360c20ff8ca660ab1d53234608ff92
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat May 28 15:12:58 2011 +0200
+
+    dpkg-source: reenable the Package-List field
+    
+    But drop the Architecture column since we have no clear use case yet. It
+    can always be added later on. Parsers should treat the field as an
+    extendable one. They shall ignore supplementary columns that they do
+    not know.
+    
+    Also drop the source line, it's not needed since the dsc file describes
+    the source package already (source section and priority are not currently
+    exported in dedicated fields but they can be added later if we start
+    having a need for this information).
+
+ debian/changelog       |    4 ++++
+ scripts/dpkg-source.pl |   10 ++--------
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+commit 587a1e17ff424ee87d5011795c518da238189e9f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat May 28 14:56:49 2011 +0200
+
+    dpkg-gensymbols: warn when the generated symbols files is empty
+    
+    It indirectly avoids a perl warning in dpkg-gensymbols when no symbols
+    file has been generated (because it would have been empty).
+    
+    Reported-by: Niels Thykier <niels@thykier.net>
+
+ debian/changelog           |    2 ++
+ scripts/dpkg-gensymbols.pl |    4 +++-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 0d55f02275c0439622bb58f3b3c6658aef51fb11
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 25 08:51:50 2011 +0200
+
+    libdpkg: Fix fd_fd_filter to execute the filter on the child
+    
+    There was a logic error in the pid check, and the filter code was being
+    executed in the parent instead of the child.
+    
+    Regression introduced in commit 269bbee973c46e1be0aaef82cb7e19bbc9a95aa7.
+    
+    Reported-by: Sven Joachim <svenjoac@gmx.de>
+
+ lib/dpkg/compress.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2ed0a42cb3863e2ce0199e13242fa3b769ca773d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 24 06:19:28 2011 +0200
+
+    libdpkg: Do not warn on missing Architecture in config-files state
+    
+    dpkg before commit 2ef42b027e4267432a41343e28f102b1dae668d2 (versions
+    older than 1.10.19) did not keep the Architecture field in the status
+    file, and as such removed (but not purged) packages might still be
+    around in live systems lacking the Architecture field. Let's shut up
+    the warning for now.
+    
+    Closes: #604241
+    
+    Analysis-by: Raphael Hertzog <hertzog@debian.org>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog |    2 ++
+ lib/dpkg/parse.c |    8 ++++++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+commit e4cb12a710457b103a7544c4de5e9fc1b2bd24d8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat May 21 10:38:32 2011 +0200
+
+    libdpkg: Do not allow blank lines in field values
+    
+    Blank lines in this case mean, lines containing only spaces and tabs.
+    This ensure the Perl and C parsers match, and it follows RFC-2822 style
+    format, and Debian policy.
+    
+    Closes: #308082
+
+ debian/changelog |    1 +
+ lib/dpkg/parse.c |   18 ++++++++++++++++--
+ 2 files changed, 17 insertions(+), 2 deletions(-)
+
+commit 588077fdbc350d0733ce5cb8a298d317cfda1926
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat May 21 06:59:44 2011 +0200
+
+    Dpkg::Source::Package: Add ‘.hgsigs’ to the default ignore lists
+    
+    Closes: #627462
+    
+    Based-on-patch-by: Jakub Wilk <jwilk@debian.org>
+
+ debian/changelog               |    2 ++
+ scripts/Dpkg/Source/Package.pm |    3 ++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit b8038ef4721d53bb037583b9355a1f00dbcdc740
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 22 16:11:40 2011 +0200
+
+    libdpkg: Properly reset filetriggers_edited in trig_file_interests_save
+    
+    The function was not resetting filetriggers_edited when no triggers were
+    left, and duplicated part of the existing functionality.
+    
+    Refactor into trig_file_interests_remove() and
+    trig_file_interests_update() to make them use the same main code path.
+    
+    Regression introduced in commit 83b591340ec92cf0e9814e8403da7711cbbc6b46.
+
+ lib/dpkg/triglib.c |   34 +++++++++++++++++++++-------------
+ 1 files changed, 21 insertions(+), 13 deletions(-)
+
+commit 104882f7fef02d53e1b868e746b8e9ff313eb1f5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 24 06:55:34 2011 +0200
+
+    libdpkg: Do not fail on current file removal in trk_explicit_interest_change
+    
+    In case the new trigger interest file is empty and as such not needed
+    any longer, do not fail if the current file is not present.
+    
+    Regression introduced in commit 83b591340ec92cf0e9814e8403da7711cbbc6b46.
+
+ lib/dpkg/triglib.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5c32f0c0e4c537fc00bf3ccace8799fe27a522aa
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 22 16:07:49 2011 +0200
+
+    libdpkg: Properly pop the cleanup handler in trk_explicit_interest_change
+    
+    In case of error all cleanup handlers will get called but the nf FILE
+    variable might have been already closed, which would cause the
+    subsequent fclose() to fail, this will not be fatal as the return
+    value for fclose() in the cleanup handler is not checked, but it's
+    still not correct.
+    
+    Refactor trk_explicit_interest_change() into
+    trk_explicit_interest_remove(), trk_explicit_interest_flush() and
+    trk_explicit_interest_commit() to reflow the function and make it
+    clearer by sharing the main code path.
+    
+    Regression introduced in commit 83b591340ec92cf0e9814e8403da7711cbbc6b46.
+
+ lib/dpkg/triglib.c |   59 ++++++++++++++++++++++++++++++++-------------------
+ 1 files changed, 37 insertions(+), 22 deletions(-)
+
+commit 83b591340ec92cf0e9814e8403da7711cbbc6b46
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed May 18 10:10:04 2011 +0200
+
+    dpkg: properly remove triggers information during package removal
+    
+    Before this change, a package removal would not remove the triggers
+    information from the internal files. When you reinstalled the same
+    package without any trigger, dpkg would improperly believe that
+    the package implemented some triggers.
+    
+    However the triggers were correctly unregistered during a package
+    upgrade that dropped the triggers.
+    
+    With this commit, we also remove triggers interest file that are empty and
+    thus no longer needed.
+
+ debian/changelog   |    2 ++
+ lib/dpkg/triglib.c |   25 ++++++++++++++++++++++++-
+ src/remove.c       |    4 ++++
+ 3 files changed, 30 insertions(+), 1 deletions(-)
+
+commit 799d38599c1326c2e4c0b9360b19721c05f8c55f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri May 6 06:08:30 2011 +0200
+
+    dpkg: Keep parent directories of directories kept during removal
+    
+    When a directory is kept during removal to be later dealt with during
+    purge, due to the directory containing conffiles from the same package,
+    it not being empty, etc, we should keep all its parent to make sure
+    when the subsequent trial is performed they are properly cleaned up.
+    
+    Closes: #454694
+    
+    Based-on-patch-by: Ondřej Surý <ondrej@debian.org>
+
+ debian/changelog |    3 +++
+ src/help.c       |   31 +++++++++++++++++++++++++++++++
+ src/main.h       |    2 ++
+ src/remove.c     |    8 ++++++++
+ 4 files changed, 44 insertions(+), 0 deletions(-)
+
+commit e67e071e5836c7bd79bb5a1561ecda760f09a01f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 15 17:38:18 2011 +0200
+
+    dpkg: On purge remove the conffiles from the file list file
+    
+    This makes sure the files list is correct after the conffiles have been
+    removed from disk and the status db has been updated.
+
+ src/remove.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit ad07629757599f8f27ec63864b0c34fd7515882c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 15 17:33:14 2011 +0200
+
+    dpkg: Do not preserve and check for conffiles on leftover dir removal
+    
+    The function removal_bulk_remove_leftover_dirs() was supposed to be
+    called only w/ left over dirs, but removal_bulk_remove_configfiles()
+    does not remove them from the file list when unlinking.
+    
+    Do not check if the directory needs to be preserved if the package has
+    conffiles inside, because it should have none, although it would match
+    given that the file list still contains conffiles.
+    
+    Do not preserve any lingering conffiles in the file list as they are
+    no longer on disk anyway.
+
+ src/remove.c |    9 ++++-----
+ 1 files changed, 4 insertions(+), 5 deletions(-)
+
+commit 0582645c283f39a602201dc0cf0fc8a6e986fe76
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 15 17:07:53 2011 +0200
+
+    dpkg: Change write_filelist_except() to take a mask intead of a bool
+    
+    This generalizes the function to exclude any desired file namenode
+    flag and not just fnnf_elide_other_lists. It also gets rid of the
+    bool variable which is generally a bad interface to change function
+    behaviour when it should really be a named flag or a mask.
+
+ src/filesdb.c    |    8 ++++----
+ src/filesdb.h    |    2 +-
+ src/processarc.c |    3 ++-
+ 3 files changed, 7 insertions(+), 6 deletions(-)
+
+commit f65316a5ec488a52cb7d5fa98824c21629de26b6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 15 03:39:35 2011 +0200
+
+    libdpkg: Use new writedb flags instead of independent bool variables
+    
+    Using bool to pass flags to a function already taking several arguments
+    is generally a bad interface, as it's not clear from the call sites what
+    each of them refer to. Switch to a proper enum with named flags instead.
+
+ lib/dpkg/dbmodify.c |    6 +++---
+ lib/dpkg/dpkg-db.h  |    9 ++++++++-
+ lib/dpkg/dump.c     |   10 +++++-----
+ src/update.c        |    2 +-
+ 4 files changed, 17 insertions(+), 10 deletions(-)
+
+commit d6f176b4b8ad5fdf77f05704ee4c1abb3fa23ab4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 15 03:33:53 2011 +0200
+
+    dpkg: Make fd variable passed to cu_closefd static
+    
+    The push_cleanup() call takes a pointer to the fd variable which resides
+    in the stack. In case of error and stack unwinding due to longjmp, the
+    value of fd might get overwritten by subsequent stack usage. Thus this
+    kind of variables need to be static so that their value cannot change
+    on stack rollback.
+
+ src/filesdb.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 7337447704d69a553cf44f462ad7c22e4026646c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 15 03:32:32 2011 +0200
+
+    libdpkg: Rename cu_closefile to cu_closestream
+    
+    This should make it clear we are referring to a stdio stream, and not
+    the future planned ‘struct file’.
+
+ lib/dpkg/cleanup.c |    2 +-
+ lib/dpkg/dpkg.h    |    2 +-
+ lib/dpkg/triglib.c |    8 ++++----
+ src/filesdb.c      |    2 +-
+ src/processarc.c   |    2 +-
+ 5 files changed, 8 insertions(+), 8 deletions(-)
+
+commit 216b7a30bab31817dca09ba2c7c629883cee1efa
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 12 02:57:30 2011 +0200
+
+    dpkg: On purge correctly remove a symlink pointing to a directory
+    
+    The code was treating symlinks to directories as directories, but then
+    it was trying to rmdir(2) them, which failed. In such case just verify
+    it's a symlink and unlink(2) them instead.
+
+ debian/changelog |    2 ++
+ src/remove.c     |    9 +++++++++
+ 2 files changed, 11 insertions(+), 0 deletions(-)
+
+commit ea81b2b144f70de7a0652b654de4d2fe765ff327
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 12 02:52:17 2011 +0200
+
+    dpkg: Add debug output on match in dir_is_used_by_others()
+    
+    The debug output was not balanced, and was only printing when no match
+    happened, making the output confusing.
+
+ src/help.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 8074459cfa13502a424545542dc85808e7ec1dc0
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun May 15 10:57:19 2011 +0200
+
+    Fix copyright year in header
+
+ scripts/po/de.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 47126733bb08ea5e9cbdf88e865a0cf759d7449b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun May 15 09:49:09 2011 +0200
+
+    dpkg-source: ensure "any" doesn't hide "all" in the Architecture field
+    
+    "any" doesn't imply "all" so we should keep both values in the field. This
+    is important so that wanna-build can know what needs to be scheduled for
+    the buildd that deals with Architecture: all packages.
+
+ debian/changelog       |    1 +
+ scripts/dpkg-source.pl |    9 +++++++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+commit fddb1643bc221f20f6e607776c1b8234dbebe328
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat May 14 23:02:22 2011 +0200
+
+    libdpkg: keep Config-Version in triggers-awaited state
+    
+    A package is really fully configured and can thus satisfy dependencies
+    only when no triggers are awaited. Thus we should not drop Config-Version
+    while a package is still in triggers-awaited.
+
+ lib/dpkg/dump.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit a946894f7a0b6ce9d779b99257246c7003718269
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat May 14 10:38:59 2011 +0200
+
+    dpkg: improve pre-dependency check on unpack
+    
+    When a pre-dependency is not satisfied due to a package in
+    triggers-awaited state, immediately run the trigger processing
+    and continue without errors.
+    
+    This make it possible to blindly use --no-triggers and not break
+    when you're not fully configuring a pre-dependency.
+    
+    See test case t-predepends-no-triggers.
+
+ debian/changelog |    2 ++
+ src/processarc.c |   20 +++++++++++++-------
+ 2 files changed, 15 insertions(+), 7 deletions(-)
+
+commit 2b8cfa50709558709d5e24d7a3fa27b925bce74d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat May 14 10:26:23 2011 +0200
+
+    dpkg: depisok() can now suggest to process awaited triggers for a package
+    
+    Package in triggers-awaited state do not satisfy dependencies but they
+    could easily if their awaited triggers were processed. So we enhance the
+    function to return such a hint when possible.
+    
+    All the callers pass NULL to the new parameter so that this commit
+    should not change the current behaviour.
+
+ src/archives.c   |    8 ++++----
+ src/depcon.c     |   18 ++++++++++++++++--
+ src/enquiry.c    |    4 ++--
+ src/main.h       |    3 ++-
+ src/processarc.c |    6 +++---
+ 5 files changed, 27 insertions(+), 12 deletions(-)
+
+commit f95177fdacdd58e1c25fa722213477bd7f57df26
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat May 14 22:10:42 2011 +0200
+
+    dpkg: use the correct version in "pkg-foo is unpacked, but is version <v>"
+    
+    The error message used while analyzing pre-dependencies did improperly
+    use the available version instead of the installed version.
+
+ src/depcon.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5f48b4cfe18848fb11ef96a34ef5826a1f3757b2
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat May 14 21:35:03 2011 +0200
+
+    dpkg: small bugfix in the dependency checking code for virtual packages
+    
+    A dependency on a virtual package provided by a package in
+    triggers-pending status is now correctly considered as satisfied.
+
+ debian/changelog |    2 ++
+ src/depcon.c     |    3 ++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 0e0f59a882ce329de880d4a75f30787e261e2cb3
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Sat May 7 11:33:42 2011 +0200
+
+    libdpkg: Use new DPKG_BUFFER_SIZE macro instead of hard-coded literal
+    
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ lib/dpkg/buffer.h   |    2 ++
+ lib/dpkg/compress.c |    8 ++++----
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+commit e8c1a5863572eac719e36b2e409002871e6eee4a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 1 08:06:53 2011 +0200
+
+    libdpkg: Add new buffer_skip_Int() and switch fd_null_copy() to it
+    
+    Add a new buffer_skip() function and the externally visible
+    buffer_skip_Int(), this way we hide the implementation details
+    of fd_null_copy().
+
+ lib/dpkg/buffer.c |   43 +++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/buffer.h |   12 +++---------
+ 2 files changed, 46 insertions(+), 9 deletions(-)
+
+commit 751c399e50a087fb5c6367cbfd5a551e3ac676c9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon May 9 19:59:21 2011 +0200
+
+    libdpkg: Remove unneeded checks on buffer_copy loop termination
+    
+    The while loop checks unnecessarily for bytesread and byteswritten
+    being >= 0, but that's always going to be true, as in case of read or
+    write error the code breaks out of the loop.
+
+ lib/dpkg/buffer.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fbc930968e396694b293ee35177c9305f407cf30
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon May 2 21:53:35 2011 +0200
+
+    libdpkg: Rename struct buffer_write_md5ctx to buffer_md5_ctx
+
+ lib/dpkg/buffer.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 7e7236f7e19f1b4e238359d887756e7044328891
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 3 10:28:26 2011 +0200
+
+    libdpkg: Expand buffer_copy_TYPE macro instances
+    
+    This makes the code easier to debug, as it will be able to track
+    correct code lines, it also allows to more easily see the code
+    duplication explicitly, and makes the code slightly more clear as
+    it's using the real structure member and type names.
+
+ lib/dpkg/buffer.c |   64 ++++++++++++++++++++++++++++++++++-------------------
+ 1 files changed, 41 insertions(+), 23 deletions(-)
+
+commit 269bbee973c46e1be0aaef82cb7e19bbc9a95aa7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat May 7 11:27:06 2011 +0200
+
+    libdpkg: Switch the compression filter functions to always return
+    
+    This makes the compression and decompression functions be closer to the
+    buffer api, which always return. For non-blocking I/O, the caller has to
+    setup a child process.
+    
+    When using external binaries, we make the filter functions setup that
+    child process transparently so that the API is uniform.
+
+ dpkg-deb/build.c    |    2 +
+ dpkg-deb/extract.c  |    1 +
+ lib/dpkg/compress.c |   78 +++++++++++++++++++++++----------------------------
+ lib/dpkg/compress.h |   10 ++----
+ 4 files changed, 42 insertions(+), 49 deletions(-)
+
+commit ec5615cdd134654d0e7049cdd5925aa9a83034ba
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat May 7 11:16:08 2011 +0200
+
+    dpkg-deb: Pass the real file descriptors to compression functions
+    
+    Instead of duping them to the stdin and stdout file descriptors, pass
+    them directly. If the compression functions need the file descriptors
+    on stdin and stdout, then they will take care of setting them up. This
+    is only the case when using the external compression binaries.
+
+ dpkg-deb/build.c   |   22 ++++++++++++----------
+ dpkg-deb/extract.c |   15 ++++++++++-----
+ 2 files changed, 22 insertions(+), 15 deletions(-)
+
+commit 2f003686fdd46eb524a08715c8a8988c6d13cea3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat May 7 12:27:27 2011 +0200
+
+    Group Build-Depends lines by purpose
+    
+    Build tools, i18n tools, compression, security and UI libraries, and
+    perl packages for the test suite.
+
+ debian/control |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 23f38bc5e67816576971e21aac0b1f8d21342ea2
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri May 6 20:25:45 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2027t.
+
+ man/po/de.po |   26 +++++++++++++-------------
+ 1 files changed, 13 insertions(+), 13 deletions(-)
+
+commit 7665f7d8aedc99c740c530162a914f9e0ae5d3fa
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri May 6 09:11:33 2011 +0200
+
+    dpkg-source: fix behaviour of --extend-diff-ignore if used after --diff-ignore
+    
+    Up to now --extend-diff-ignore was only extending the default diff-ignore.
+    This is usually enough as this option is usually put in
+    debian/source/options and interpreted early enough before any other -i
+    option (that activates the usage of the default diff-ignore regexp).
+    
+    Should --extend-diff-ignore appear after -i, it should still extend
+    the regexp that we're going to use.
+
+ debian/changelog       |    2 ++
+ man/dpkg-source.1      |   10 +++++-----
+ scripts/dpkg-source.pl |    3 +++
+ 3 files changed, 10 insertions(+), 5 deletions(-)
+
+commit ff6e32d3588cf11258a7d0a2311461971abe51f3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri May 6 05:06:54 2011 +0200
+
+    dpkg: Rename isdirectoryinuse() to dir_is_used_by_others()
+    
+    This clarifies the action performed by the function, which could be
+    easily confused as being used by the given package, instead of by other
+    packages.
+
+ src/help.c       |    8 ++++----
+ src/main.h       |    2 +-
+ src/processarc.c |    3 ++-
+ src/remove.c     |    6 ++++--
+ 4 files changed, 11 insertions(+), 8 deletions(-)
+
+commit fda21f829bebed12e1a4ec0dccac7434a643c6b5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri May 6 05:05:51 2011 +0200
+
+    dpkg: Rename hasdirectoryconffiles() to dir_has_conffiles()
+
+ src/help.c   |    6 +++---
+ src/main.h   |    2 +-
+ src/remove.c |    4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 2c9a342dc4e1ad3e9e58ac89957b9068664d1930
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 5 14:49:49 2011 +0200
+
+    dpkg: Fix wrong matching for check on directory containing conffiles
+    
+    On package removal, keep only directories actually containing conffiles,
+    and not directories just matching the substring in the conffile or the
+    directory itself. The directory itself is not matched either as strictly
+    speaking it is not contained in itself, and it should already be in the
+    leftover lists.
+    
+    Previously when checking for directory ‘/foo’ the following conffiles
+    would match:
+    
+      /foo
+      /foobar
+      /foo/bar
+    
+    Now only the following will match:
+    
+      /foo/bar
+    
+    Spotted-by: Ondřej Surý <ondrej@debian.org>
+
+ debian/changelog |    3 +++
+ src/help.c       |    3 ++-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit cbde7fa861fa6851cdbc56ae70b73332ab9db935
+Merge: 140527f bd1d6cd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 4 11:00:11 2011 +0200
+
+    Merge branch 'sid' (through tag '1.16.0.3')
+    
+    Conflicts:
+    	debian/changelog
+
+commit bd1d6cd247f8e5eb7f2465c0d686cba363c64a57
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 4 10:01:44 2011 +0200
+
+    Release 1.16.0.3
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit d84b36a81088721b340e52664aa2c3379fea2a9a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 4 09:41:37 2011 +0200
+
+    libdpkg: Allow again unknown Priority field values
+    
+    The code was not properly advancing the end of the value string when
+    reaching the fallback case (on values not known for the Priority field),
+    and the validation for junk after the first word was failing on the
+    actual first word.
+    
+    This change reverts to the previous behaviour of blindly accepting the
+    whole value string for a field, regardless of it being multiword, when
+    it's the fallback case.
+    
+    Regression introduced in commit b3f669039f128d715ac7ac71abaeac86f0954112.
+    
+    Analysis-by: Raphaël Hertzog <hertzog@debian.org>
+    Analysis-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog  |    7 +++++++
+ lib/dpkg/fields.c |   13 +++++++++----
+ 2 files changed, 16 insertions(+), 4 deletions(-)
+
+commit 140527fc6129f0e4f2a7c64f28d8d19fe5e60b3f
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Mon May 2 12:14:22 2011 +0200
+
+    German dpkg translation update
+    
+    Update to 1016t.
+    Change translation of downgrade messages (Closes: #620312).
+
+ debian/changelog |    3 +
+ po/de.po         |  830 +++++++++++++++++++++++++++---------------------------
+ 2 files changed, 420 insertions(+), 413 deletions(-)
+
+commit 9b2cc7aa3187091bf2cbbb734fb77a7c52bec969
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Apr 30 21:03:16 2011 +0200
+
+    dselect: Mark ‘y’ variables as unused for getyx() and getmaxyx()
+    
+    The ncurses library does not provide a way to only retrieve the ‘x’
+    variable, so we have to pass a dummy ‘y’ which we are not going to
+    use, for which the compiler emits a warning.
+
+ dselect/basecmds.cc   |    4 +++-
+ dselect/baselist.cc   |    3 ++-
+ dselect/main.cc       |    4 ++--
+ dselect/pkgdisplay.cc |    2 +-
+ 4 files changed, 8 insertions(+), 5 deletions(-)
+
+commit 2ecaea9677e9d4307aabfbecc00a77e99a05457b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Apr 30 21:01:27 2011 +0200
+
+    s-s-d: Return status_unknown on error reading from the pid file
+    
+    Otherwise the variable was uninitialized.
+
+ utils/start-stop-daemon.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit cfe2f1ee1fcbb16d461dbd027cc6e9a9fab628be
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Apr 30 13:56:29 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2027t.
+
+ man/po/de.po |  167 ++++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 87 insertions(+), 80 deletions(-)
+
+commit ab776cbd87880f3712a8f44aa1f2bb630960d0b5
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Apr 29 22:15:17 2011 +0200
+
+    deb-src-control(5), start-stop-daemon(8): small improvements
+    
+    - Clarify that the Architecture field can contain architecture wildcards.
+    - Clarify when start-stop-daemon can exit 0 when --oknodo is used.
+    - Drop a sentence that was repeating something already said earlier.
+    
+    Reported-by: Helge Kreutzmann <debian@helgefjell.de>
+
+ man/deb-src-control.5   |   11 +++++++----
+ man/start-stop-daemon.8 |    7 ++++---
+ 2 files changed, 11 insertions(+), 7 deletions(-)
+
+commit c102e7ff81bba84f7e18efae06262dee08d44de0
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Apr 29 19:35:54 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2026t0f1u.
+
+ man/po/de.po | 1101 ++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 602 insertions(+), 499 deletions(-)
+
+commit fa406fa856d9ec898d171e51a6e6c5e5c9677d00
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 29 09:31:39 2011 +0200
+
+    dpkg: Move <dpkg/tarfn.h> inclusion from cleanup.c to archives.h
+    
+    The former is not using any declarations from tarfn.h, but the latter
+    is.
+
+ src/archives.h |    2 ++
+ src/cleanup.c  |    1 -
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 222996f8c64e6263384ae35331ed0d04cce3cbcc
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 29 07:19:29 2011 +0200
+
+    libdpkg: Move informativeversion() to the version module
+
+ lib/dpkg/dpkg-db.h   |    2 --
+ lib/dpkg/parsehelp.c |    8 --------
+ lib/dpkg/version.c   |    8 ++++++++
+ lib/dpkg/version.h   |    3 +++
+ 4 files changed, 11 insertions(+), 10 deletions(-)
+
+commit d14c72ffee3ffd98b8ecb0b189f197b404b56a9e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 29 07:20:53 2011 +0200
+
+    libdpkg: Move version module declarations to a new version.h
+
+ lib/dpkg/Makefile.am              |    3 ++-
+ lib/dpkg/dpkg-db.h                |    8 +-------
+ lib/dpkg/version.c                |    2 +-
+ lib/dpkg/{version.c => version.h} |   30 ++++++++++++++++++------------
+ 4 files changed, 22 insertions(+), 21 deletions(-)
+
+commit 6de064f083117ed6944d629baf7b543818edcf30
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Apr 28 09:44:20 2011 +0200
+
+    s-s-d: Add process name kernel limits for several systems
+    
+    Specifically: Solaris, NetBSD, OpenBSD, FreeBSD and Darwin.
+
+ debian/changelog          |    2 ++
+ utils/start-stop-daemon.c |   10 ++++++++++
+ 2 files changed, 12 insertions(+), 0 deletions(-)
+
+commit 5bced9fc3bc757ba5e4642d11422596667625dce
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Apr 28 09:11:28 2011 +0200
+
+    s-s-d: Add LSB --status command to check for process status
+    
+    The new command follows the LSB Init Script status action specification,
+    and returns exit codes accordingly.
+
+ debian/changelog          |    2 +
+ man/start-stop-daemon.8   |   19 +++++++++
+ utils/start-stop-daemon.c |   98 +++++++++++++++++++++++++++++++++-----------
+ 3 files changed, 94 insertions(+), 25 deletions(-)
+
+commit ad188eee157ac71a7e2a9be31eb6c61af7adae94
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Apr 28 08:23:12 2011 +0200
+
+    man: Clarify “EXIT STATUS” sections by using bold and a table
+    
+    Change the status codes to bold and list them with a table to makes
+    it easier to visually distinguish them.
+
+ debian/changelog          |    1 +
+ man/dpkg-query.1          |    8 +++++---
+ man/dpkg-split.1          |   17 ++++++++++-------
+ man/start-stop-daemon.8   |   22 ++++++++++++++++------
+ man/update-alternatives.8 |    8 +++++---
+ 5 files changed, 37 insertions(+), 19 deletions(-)
+
+commit a41fb4e3364eae47d3379a69e3e041843f064f78
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Apr 28 07:25:59 2011 +0200
+
+    Clarify exit status in dpkg-split and start-stop-daemon --help output
+
+ debian/changelog          |    1 +
+ dpkg-split/main.c         |   11 ++++++++---
+ utils/start-stop-daemon.c |    7 +++++--
+ 3 files changed, 14 insertions(+), 5 deletions(-)
+
+commit ac41b5fef42683b4640b0bb746889100fb8a9a20
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Apr 28 04:22:28 2011 +0200
+
+    s-s-d: Use a single action variable to track the command line actions
+    
+    This makes it easier to add new commands w/o having to check for the
+    setting of any of the other action variables against each other.
+
+ utils/start-stop-daemon.c |   36 ++++++++++++++++++++++++++----------
+ 1 files changed, 26 insertions(+), 10 deletions(-)
+
+commit 8b9315219d7a4dbb8520427ceccd00cdfac55a77
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Apr 28 03:38:10 2011 +0200
+
+    dpkg: Use “unselected” as an adjective instead of “deselected”
+    
+    When being used as an adjective “unselected” is the correct word to use.
+    
+    Closes: #231089
+
+ debian/changelog |    2 ++
+ lib/dpkg/parse.c |    2 +-
+ src/archives.c   |    4 ++--
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+commit bb19d944502d30b966dc5ec1664a19a0872800f2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Apr 28 03:22:38 2011 +0200
+
+    Fix typos in Vietnamese translation (deselect → dselect)
+
+ po/vi.po |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 65eceb8eabc3e1547148af1072d695044ece97aa
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Apr 27 08:10:23 2011 +0200
+
+    dpkg(1): Clarify the current dpkg behaviour when running the back-ends
+    
+    When running the dpkg-deb and dpkg-query back-ends, dpkg does not pass
+    through back-end specific options.
+    
+    Closes: #610940
+
+ debian/changelog |    3 +++
+ man/dpkg.1       |   23 +++++++----------------
+ 2 files changed, 10 insertions(+), 16 deletions(-)
+
+commit 487a7a85a44e75d3bcd40e4e736e093eb74e0612
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Apr 27 07:56:11 2011 +0200
+
+    dpkg(1): Remove reference to --nocheck dpkg-deb option
+    
+    dpkg does not pass this option when running dpkg-deb.
+
+ debian/changelog |    2 ++
+ man/dpkg.1       |    4 ----
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+commit 14340213c8df6215708f6b1dd01d7dea4e58fd14
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Apr 27 07:50:59 2011 +0200
+
+    dpkg: Remove --new and --old dpkg-deb option handling
+    
+    These have been non-functional for a long time, and were being treated
+    as dpkg commands which would conflict with the dpkg-deb commands.
+
+ debian/changelog |    2 ++
+ man/dpkg.1       |    4 ----
+ src/main.c       |    2 --
+ 3 files changed, 2 insertions(+), 6 deletions(-)
+
+commit 531c81097d7aa5799f0a95d0353b1f1b334a6042
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Apr 18 06:34:06 2011 +0200
+
+    dpkg: Refactor force flags to parsedb flags into parsedb_force_flags()
+    
+    This will make it easier to convert new flags in the future.
+
+ src/processarc.c |   13 ++++++++++++-
+ 1 files changed, 12 insertions(+), 1 deletions(-)
+
+commit 1c4771a44299c3fb528f0dae920089f67fd2820d
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue Apr 26 19:14:11 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2020t.
+
+ man/po/de.po |  467 ++++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 241 insertions(+), 226 deletions(-)
+
+commit dd467371b69ff327592f35c22ce5256f70408689
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Apr 26 06:23:05 2011 +0200
+
+    dpkg-deb(1): --fsys-tarfile will always process the archive sequentially
+    
+    Closes: #616609
+
+ debian/changelog |    2 ++
+ man/dpkg-deb.1   |    3 ++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit e897fdba4ebb67902ad28c63bafaea8dfeb385ab
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Apr 26 06:00:32 2011 +0200
+
+    dpkg: Do not fail when unpacking a diverted hardlink
+    
+    Closes: #245322
+    
+    Based-on-patch-by: Christopher Baines <cbaines8@gmail.com>
+
+ debian/changelog |    2 ++
+ src/archives.c   |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 6d50a5ac6ae54f4374070e5849070530a6d57a49
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Apr 18 06:34:06 2011 +0200
+
+    Add --force-bad-version to allow installing packages with bogus versions
+    
+    This allows to install old packages with such versions, to ease
+    debugging, testing, etc.
+
+ debian/changelog |    2 ++
+ man/dpkg.1       |    3 +++
+ src/main.c       |    3 +++
+ src/main.h       |    1 +
+ src/processarc.c |    4 ++--
+ 5 files changed, 11 insertions(+), 2 deletions(-)
+
+commit f9fac280b7805165819ece32980841b7f6a39333
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 15 11:06:09 2011 +0200
+
+    libdpkg: Rename and alias pdb_lax_parser to pdb_lax_version_parser
+    
+    This way we get a more fine-grained and accurate control over what we
+    want to relax while parsing.
+
+ lib/dpkg/dpkg-db.h |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 980da6d9b5f7f7057fbcc67d09a128393e1d5d66
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 15 08:09:41 2011 +0200
+
+    Support conffiles with spaces when diffing them
+    
+    Closes: #147583
+
+ debian/changelog |    1 +
+ src/configure.c  |    3 ++-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 8578e79d0307f7a3408f7e00f4565286babda61a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 15 08:09:41 2011 +0200
+
+    libdpkg: Add new str_quote_meta() function
+
+ lib/dpkg/string.c        |   30 ++++++++++++++++++++++++++++++
+ lib/dpkg/string.h        |    1 +
+ lib/dpkg/test/t-string.c |   20 ++++++++++++++++++++
+ 3 files changed, 51 insertions(+), 0 deletions(-)
+
+commit b15765a5b60fd6cd67f4ffa28034fdae62ae8252
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Apr 18 05:22:59 2011 +0200
+
+    s-s-d: Change do_stop() to always obey global quietmode
+    
+    The only behaviour change was affecting the new do_stop_summary(), which
+    is not always called now after do_stop(), to catter for the forced quiet
+    mode when sending signal 0. The other verbose statement which before
+    commit 5fef90a2960053e9b24304e2a2663fb1ed7dafb1 was not being printed in
+    some cases, actually makes sense to print always.
+
+ utils/start-stop-daemon.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 8dba2f80642e17b78c2c556781f4204d2c435b5f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Apr 18 05:22:59 2011 +0200
+
+    s-s-d: Refactor do_stop_summary() out from do_stop()
+
+ utils/start-stop-daemon.c |   36 +++++++++++++++++++++++-------------
+ 1 files changed, 23 insertions(+), 13 deletions(-)
+
+commit e71ae2eac5422eae4e89d1c09e302935ef17c01f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 15 07:45:05 2011 +0200
+
+    dpkg-split: Generate filenames following current conventions on --join
+    
+    Keep the architecture in the debian-split member of the part file so
+    that we can reuse it when putting back together the joined binary
+    package. Use underscores to separate each filename part.
+
+ debian/changelog        |    3 +++
+ dpkg-split/dpkg-split.h |    1 +
+ dpkg-split/info.c       |    9 +++++++++
+ dpkg-split/join.c       |    4 +++-
+ dpkg-split/main.c       |    3 ++-
+ dpkg-split/queue.c      |    1 +
+ dpkg-split/split.c      |    8 +++++---
+ man/deb-split.5         |    4 +++-
+ man/dpkg-split.1        |   12 ++----------
+ 9 files changed, 29 insertions(+), 16 deletions(-)
+
+commit 9ccc9615187a8c7c5111c82d6061b29ec3fbae62
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Apr 23 07:38:57 2011 +0200
+
+    u-a: Flush the alternatives database file stream before fsync()ing it
+    
+    For stream I/O the buffers have to be flushed before they are fsync()ed
+    to guarantee the data has been written, and as such fsync() can do its
+    job.
+    
+    Missed in commit 0e0e26cb8e9e3b8e3a60c329d8ea0c6e5445742c.
+
+ utils/update-alternatives.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit bf13ae4c68bb2becc591b23995853358b7e423c4
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Apr 22 19:16:50 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2019t.
+
+ man/po/de.po |  242 ++++++++++++++++++++++++++++++++++++++--------------------
+ 1 files changed, 160 insertions(+), 82 deletions(-)
+
+commit 124fefbc8e082aeb94f549273915b5c61b0a729b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Apr 22 17:01:22 2011 +0200
+
+    dpkg-source: tighten the regexp used to ignore the .pc directory of quilt
+    
+    The "." was not escaped and the regex incorrectly matched an "ipc"
+    directory for example.
+    
+    Reported-by: Mike Hommey <glandium@debian.org>
+
+ debian/changelog                        |    2 ++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 0e0e26cb8e9e3b8e3a60c329d8ea0c6e5445742c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Apr 22 11:56:43 2011 +0200
+
+    update-alternatives: fsync the administrative files before installation
+    
+    This is for filesystems that do not put an implicit write barrier
+    when renaming files. That way we ensure that we'll never
+    have empty files.
+
+ debian/changelog            |    3 +++
+ utils/update-alternatives.c |    2 ++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit c28eadb19f134cd652d74da6670f3586b3938ccc
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Apr 22 11:50:15 2011 +0200
+
+    update-alternatives: new syserr() function
+    
+    This function is to be used when a syscall failed and when we want
+    to print strerror(errno) after the error message.
+    
+    Update all the code to use this function. This allows to reduce the
+    number of strings to translate as we're now reusing the same strings
+    than those passed to oshite() in dpkg.
+
+ utils/update-alternatives.c |   58 ++++++++++++++++++++++++------------------
+ 1 files changed, 33 insertions(+), 25 deletions(-)
+
+commit 57ca795e68c988843a8421a8e86cc8fc4fbd258b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 15 08:15:12 2011 +0200
+
+    Bump Standards-Version to 3.9.2 (no changes needed)
+
+ debian/changelog |    1 +
+ debian/control   |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit a91709c404dee118a7f4fc6295b034ba9621adb0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 15 08:04:35 2011 +0200
+
+    Use dh_prep instead of deprecated “dh_clean -k”
+
+ debian/changelog |    1 +
+ debian/rules     |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 1b7feb3240bc7f1e7f14903153891e289561bce4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 15 08:01:28 2011 +0200
+
+    Switch to debhelper compatibility level 7
+
+ debian/changelog |    1 +
+ debian/compat    |    2 +-
+ debian/control   |    2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 8bc7ba68ff8bd0acd6f6e6f9f7145746671edff6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 15 05:01:59 2011 +0200
+
+    man: Change debian-split member internal description to a list
+    
+    This makes it easier to see what each line contains.
+
+ debian/changelog |    2 ++
+ man/deb-split.5  |   26 ++++++++++++++++++--------
+ 2 files changed, 20 insertions(+), 8 deletions(-)
+
+commit d2ee3fdccf4f0d892c3ed77a9cabaadbfa105d81
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Apr 19 08:31:14 2011 +0200
+
+    libdpkg: Move nicknames table from parsehelp.c to parse.c
+    
+    This table is only ever going to be used at parse time when normalizing
+    the input.
+
+ lib/dpkg/parse.c     |   12 +++++++++++-
+ lib/dpkg/parsedump.h |    1 -
+ lib/dpkg/parsehelp.c |   10 ----------
+ 3 files changed, 11 insertions(+), 12 deletions(-)
+
+commit cf715ae93a6dcfb31838abc577ce3300c03edaad
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Apr 12 05:30:34 2011 +0200
+
+    u-a: Remove unused new_choice assignment
+
+ utils/update-alternatives.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d48dd2616055af01ef84a0c3f12845d9d45990f6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Apr 6 03:27:07 2011 +0200
+
+    dpkg: Remove unused force_conff_new() and force_conff_miss() declarations
+
+ src/main.h |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit e654cb5b6d2eb7f80255fc976a6ccbb8d694bd43
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Sun Apr 10 04:06:56 2011 -0500
+
+    libdpkg: Use execvp(3) unconditionally in command_exec()
+    
+    execvp(3) already checks if its file argument contains a '/'; simplify
+    by not checking again for the same thing.
+    
+    The real motivation is to avoid confusing behavior in an edge case:
+    when execve(2) fails with ENOEXEC, execvp will run the script using the
+    system shell but execv will error out.
+    
+    Closes: #622094
+    
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog   |    4 ++++
+ lib/dpkg/command.c |    5 +----
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+commit 3712f6a4ddc75c69fccd2b3dfb1961ff07771825
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 15 08:02:07 2011 +0200
+
+    Changelog police
+    
+    Remove spurious spaces.
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ce9d96bcf33500b3f5db51d70772062560fba234
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Apr 21 00:08:00 2011 +0200
+
+    dpkg-query(1): document empty lines as separator for --status and --print-avail too
+
+ debian/changelog |    3 ++-
+ man/dpkg-query.1 |   15 ++++++++++-----
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+commit e6b6ff0887e328f379f1ff15484d3bffc9b645b4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Apr 20 23:41:22 2011 +0200
+
+    man: On dpkg-query -L each list of files per package is separated by blank lines
+
+ debian/changelog |    2 ++
+ man/dpkg-query.1 |    5 +++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 398a6016718aac2c97b757b2364a9aebca800052
+Merge: b00ef3a 0bfd81b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Apr 20 23:38:31 2011 +0200
+
+    Merge commit '1.16.0.2'
+
+commit 0bfd81b977ed0a3d4fca1c21e9f4e65c92c3fe9e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Apr 16 00:17:10 2011 +0200
+
+    Release 1.16.0.2
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 58c6486cdf485d03f843b27d1f60e37eed6b77e5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 15 23:33:35 2011 +0200
+
+    libdpkg: Include <locale.h> from <i18n.h> to fix unoptimized builds
+    
+    The pgettext() macros in gettext.h make use of LC_MESSAGES, which get
+    normally pulled from <locale.h> through <libintl.h>, but that only
+    happens on optimized builds. As this is an implementation detail,
+    pgettext() users (through the local C_() macro) should not need to
+    know they have to include <locale.h>. Arguably this is a deficiency
+    in gettext.h which we are working around here.
+    
+    Reported-by: Steve Langasek <steve.langasek@ubuntu.com>
+
+ debian/changelog |    2 ++
+ lib/dpkg/i18n.h  |    6 +++++-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 438e5813caa759a1c6dbfa282e68ab451b425e75
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 15 07:09:14 2011 +0200
+
+    dpkg-split: Correctly set the last part split size
+    
+    The partsize for each part should be the same, the code was wrongly
+    setting the partsize to the real size of the data being written.
+    
+    Regression introduced in commit 506dd27b56a570e019e90974ea285fe4fd2f8bf8.
+
+ debian/changelog   |    1 +
+ dpkg-split/split.c |   10 ++++++----
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+commit 99380668590b3734fc105504ef2569d026c63209
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 15 07:04:44 2011 +0200
+
+    dpkg-split: Fix --auto to not fail when opening the new depot file
+    
+    The code was wrongly checking for non-zero file descriptors returned
+    from creat(2), which was making it always fail.
+    
+    Regression introduced in commit 102aef24e438b7aba9cf90ab9fc75d3c13c6c7cf.
+
+ debian/changelog   |    6 ++++++
+ dpkg-split/queue.c |    2 +-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit b00ef3aa35e76e72fe814727c5e5ae28a6a68639
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Apr 9 01:55:34 2011 +0200
+
+    dpkg-deb: fix error message output by read_fail()
+    
+    read_fail() should only assume a system error if rc < 0. Any positive
+    value means that we did not manage to read as much data as we wanted
+    and should result in the "unexpected end of file" message.
+
+ dpkg-deb/extract.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 27b872fb0a26b92fa908fd691dbe6abe2605ed89
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu Apr 7 21:38:35 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2010t.
+
+ debian/changelog |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 9023da1533184439d753bcba6b89b4aa4edc91f0
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu Apr 7 21:37:36 2011 +0200
+
+    Update German translation of manual pages
+    
+    Update to 2010t.
+
+ man/po/de.po |   19 ++++++++++---------
+ 1 files changed, 10 insertions(+), 9 deletions(-)
+
+commit 9dc6ea29b59050af1fd06c6c348afacc428de8f4
+Author: Lars Buitinck <larsmans@gmail.com>
+Date:   Wed Apr 6 14:09:00 2011 +0200
+
+    dpkg-query(1): improve description of --search
+
+ debian/changelog |    2 ++
+ man/dpkg-query.1 |    8 ++++----
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 66810a5ef36dfa8c576dc4125afc3b98369f8538
+Merge: 2393193 fe69ae4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Apr 5 07:41:33 2011 +0200
+
+    Merge branch 'sid' (through tag '1.16.0.1')
+    
+    Conflicts:
+    	debian/changelog
+
+commit fe69ae4874919314c7f0757bb155bae38e7f211b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Apr 5 07:29:24 2011 +0200
+
+    Release 1.16.0.1
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 2393193c27eb806ea81d54c8a8f066417f4e4dfd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Apr 3 17:32:25 2011 +0200
+
+    dpkg: Rename set_selinux_path_context() to tarobject_set_se_context()
+    
+    This puts it in line with the rest of tarobject filesystem metadata
+    setters.
+
+ src/archives.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 888a5bbbd916d4a2f3a519c1c45519e8614d1782
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Apr 3 15:27:21 2011 +0200
+
+    dpkg: don't ohshite if lutimes() fails with ENOSYS
+    
+    Glibc implements lutimes() on top of utimensat() which is only provided
+    by Linux >= 2.6.22. With older kernels it returns ENOSYS.
+    
+    This regression was introduced by commit
+    b3eb59cf43c286bb6c906c00ef1cdc0ec21f474d which implemented support for
+    setting timestamps of symlinks.
+    
+    Reported-by: Michael Prokop <mika@debian.org>
+
+ debian/changelog |    2 ++
+ src/archives.c   |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit fddba30d74856e2d5c3f287343569fc259729bc0
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Apr 3 14:58:06 2011 +0200
+
+    dpkg: fix regression when using -R option
+    
+    The regression was introduced in commit
+    280ac914cc52ee5de079c0833bb1df5005c1e7ab. The variable used for the loop
+    got incremented twice for each iteration, the net result is that the list
+    of filenames contains random data on half of the entries.
+    
+    Reported-by: Craig Sanders <cas@taz.net.au>
+
+ debian/changelog |    7 +++++++
+ src/archives.c   |    2 +-
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
+commit b7e4c4c2d7d4e9eb744c4efdab343f5478e00479
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Apr 3 12:22:24 2011 +0200
+
+    Update German scripts translation
+    
+    Update to 515t
+
+ debian/changelog |    3 +++
+ scripts/po/de.po |   48 ++++++++++++++++++++++++++----------------------
+ 2 files changed, 29 insertions(+), 22 deletions(-)
+
+commit 0cacb0c3a1d1f837c957f3917a040ace6d60f9e7
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Apr 3 09:52:33 2011 +0200
+
+    Dpkg::Version: update version_check to forbid versions starting with non digits
+    
+    Adapted the code to rely on the parsing done by the constructor to split
+    the version number properly instead of redoing similar regexes in
+    version_check().
+    
+    Updated the test suite accordingly.
+
+ scripts/Dpkg/Version.pm      |   25 ++++++++++++++++---------
+ scripts/t/100_Dpkg_Version.t |    6 +++++-
+ 2 files changed, 21 insertions(+), 10 deletions(-)
+
+commit fa98524b587fd1d8c376c00cbd51eeee75d1c197
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Apr 3 09:45:20 2011 +0200
+
+    libdpkg: add non-regression test for version number starting with non-digit
+    
+    And update the non-regression test for invalid characters to put
+    the invalid character as the second character and not the first (which
+    would be caught by the more strict non-digit check).
+
+ lib/dpkg/test/t-version.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 106c21fc6ca503da92addb9b87db094a557de922
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Apr 2 16:55:40 2011 +0200
+
+    Dpkg::Source::Package: Add ‘.gitmodules’ to the default ignore lists
+    
+    Closes: #620490
+
+ debian/changelog               |    1 +
+ scripts/Dpkg/Source/Package.pm |    4 +++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 88206aeb51d713bcfc6a0a4dd1dad6b013f51482
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Apr 2 16:43:14 2011 +0200
+
+    Install deb-src-control(5) man pages in dpkg-dev
+    
+    Closes: #620520
+
+ debian/changelog        |    3 +++
+ debian/dpkg-dev.install |    1 +
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 12f2cab45b69c242b58adac220830dfc36fc79a2
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Apr 2 10:02:33 2011 +0200
+
+    Dpkg::Deps: some typo and consistency fixes in the POD documentation
+
+ scripts/Dpkg/Deps.pm |   35 ++++++++++++++++++-----------------
+ 1 files changed, 18 insertions(+), 17 deletions(-)
+
+commit 09bc62ca9dc79df376bdae44da7920996e6777c6
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Apr 2 09:46:49 2011 +0200
+
+    Dpkg::Deps: Implement new "reset" method
+    
+    Bump module version to 1.01 due to this.
+
+ debian/changelog     |    4 ++-
+ scripts/Dpkg/Deps.pm |   52 +++++++++++++++++++++++++++++++++----------------
+ 2 files changed, 38 insertions(+), 18 deletions(-)
+
+commit 57d958bb3798bb9a9a727a9700ae0bfd05f23c72
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Apr 2 09:22:01 2011 +0200
+
+    Add new changelog entry for 1.16.1
+
+ debian/changelog |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit d3686b5552f28a357d678b453a869b9d10f1ac4f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 1 23:57:06 2011 +0200
+
+    Release 1.16.0
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit eb48da7aae9793ac29daa7197d28c830fa6f3235
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 1 19:26:51 2011 +0200
+
+    Correct and clarify changelog entries
+
+ debian/changelog |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 0fd41e2bb9696ef91e5f18aa07b2acc78563c355
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 1 22:13:55 2011 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |  116 ++--
+ dselect/po/ca.po        |  116 ++--
+ dselect/po/cs.po        |  116 ++--
+ dselect/po/da.po        |  116 ++--
+ dselect/po/de.po        |  116 ++--
+ dselect/po/dselect.pot  |  118 ++--
+ dselect/po/el.po        |  116 ++--
+ dselect/po/es.po        |  116 ++--
+ dselect/po/et.po        |  116 ++--
+ dselect/po/eu.po        |  116 ++--
+ dselect/po/fr.po        |  116 ++--
+ dselect/po/gl.po        |  116 ++--
+ dselect/po/hu.po        |  116 ++--
+ dselect/po/id.po        |  116 ++--
+ dselect/po/it.po        |  116 ++--
+ dselect/po/ja.po        |  116 ++--
+ dselect/po/ko.po        |  116 ++--
+ dselect/po/nb.po        |  116 ++--
+ dselect/po/nl.po        |  116 ++--
+ dselect/po/nn.po        |  116 ++--
+ dselect/po/pl.po        |  116 ++--
+ dselect/po/pt.po        |  116 ++--
+ dselect/po/pt_BR.po     |  116 ++--
+ dselect/po/ro.po        |  116 ++--
+ dselect/po/ru.po        |  116 ++--
+ dselect/po/sk.po        |  116 ++--
+ dselect/po/sv.po        |  116 ++--
+ dselect/po/tl.po        |  116 ++--
+ dselect/po/vi.po        |  116 ++--
+ dselect/po/zh_CN.po     |  116 ++--
+ dselect/po/zh_TW.po     |  116 ++--
+ man/po/dpkg-man.pot     |  190 ++++---
+ man/po/es.po            |  199 ++++---
+ man/po/fr.po            |  199 ++++---
+ man/po/hu.po            |  193 ++++---
+ man/po/ja.po            |  193 ++++---
+ man/po/pl.po            |  199 ++++---
+ man/po/pt_BR.po         |  192 ++++---
+ man/po/ru.po            |  193 ++++---
+ man/po/sv.po            |  199 ++++---
+ po/ast.po               | 1512 ++++++++++++++++++++++++----------------------
+ po/bs.po                | 1434 +++++++++++++++++++++++---------------------
+ po/ca.po                | 1531 +++++++++++++++++++++++++----------------------
+ po/cs.po                | 1515 ++++++++++++++++++++++++----------------------
+ po/da.po                | 1505 ++++++++++++++++++++++++----------------------
+ po/de.po                |  502 ++++++++--------
+ po/dpkg.pot             | 1431 +++++++++++++++++++++++---------------------
+ po/dz.po                | 1514 ++++++++++++++++++++++++----------------------
+ po/el.po                | 1514 ++++++++++++++++++++++++----------------------
+ po/eo.po                | 1502 ++++++++++++++++++++++++----------------------
+ po/es.po                | 1516 ++++++++++++++++++++++++----------------------
+ po/et.po                | 1489 ++++++++++++++++++++++++----------------------
+ po/eu.po                | 1502 ++++++++++++++++++++++++----------------------
+ po/fr.po                | 1517 ++++++++++++++++++++++++----------------------
+ po/gl.po                | 1514 ++++++++++++++++++++++++----------------------
+ po/hu.po                | 1508 ++++++++++++++++++++++++----------------------
+ po/id.po                | 1502 ++++++++++++++++++++++++----------------------
+ po/it.po                | 1504 ++++++++++++++++++++++++----------------------
+ po/ja.po                | 1502 ++++++++++++++++++++++++----------------------
+ po/km.po                | 1514 ++++++++++++++++++++++++----------------------
+ po/ko.po                | 1502 ++++++++++++++++++++++++----------------------
+ po/ku.po                | 1463 +++++++++++++++++++++++----------------------
+ po/lt.po                | 1480 +++++++++++++++++++++++----------------------
+ po/mr.po                | 1496 ++++++++++++++++++++++++----------------------
+ po/nb.po                | 1515 ++++++++++++++++++++++++----------------------
+ po/ne.po                | 1514 ++++++++++++++++++++++++----------------------
+ po/nl.po                | 1516 ++++++++++++++++++++++++----------------------
+ po/nn.po                | 1512 ++++++++++++++++++++++++----------------------
+ po/pa.po                | 1493 ++++++++++++++++++++++++----------------------
+ po/pl.po                | 1497 ++++++++++++++++++++++++----------------------
+ po/pt.po                | 1515 ++++++++++++++++++++++++----------------------
+ po/pt_BR.po             | 1516 ++++++++++++++++++++++++----------------------
+ po/ro.po                | 1502 ++++++++++++++++++++++++----------------------
+ po/ru.po                | 1502 ++++++++++++++++++++++++----------------------
+ po/sk.po                | 1502 ++++++++++++++++++++++++----------------------
+ po/sv.po                | 1515 ++++++++++++++++++++++++----------------------
+ po/th.po                | 1515 ++++++++++++++++++++++++----------------------
+ po/tl.po                | 1512 ++++++++++++++++++++++++----------------------
+ po/vi.po                | 1502 ++++++++++++++++++++++++----------------------
+ po/zh_CN.po             | 1502 ++++++++++++++++++++++++----------------------
+ po/zh_TW.po             | 1514 ++++++++++++++++++++++++----------------------
+ scripts/po/ca.po        |  122 ++--
+ scripts/po/de.po        |  122 ++--
+ scripts/po/dpkg-dev.pot |  124 ++--
+ scripts/po/es.po        |  122 ++--
+ scripts/po/fr.po        |  122 ++--
+ scripts/po/pl.po        |  122 ++--
+ scripts/po/ru.po        |  122 ++--
+ scripts/po/sv.po        |  122 ++--
+ 89 files changed, 35046 insertions(+), 31900 deletions(-)
+
+commit 922093b5fb715554456ef44bb4ce70e89dc4e337
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 1 23:49:24 2011 +0200
+
+    dpkg-divert: Unlink the source file when moving across filesystems
+    
+    Otherwise we might leave cruft behind.
+    
+    Regression introduced in commit 02b12d75f1eff7c184fafb5a663a0421e9a645ea.
+
+ debian/changelog |    2 ++
+ src/divertcmd.c  |    4 ++++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 1624466c3d3c882b551f0b5deae8db4016332e5a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 1 23:38:20 2011 +0200
+
+    dpkg-divert: Inline rename_mv() into file_rename()
+
+ src/divertcmd.c |   17 +++++------------
+ 1 files changed, 5 insertions(+), 12 deletions(-)
+
+commit 1cfa991dac363c3494edbb8a914b369cbf374d04
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 1 23:33:15 2011 +0200
+
+    dpkg-divert: Move atomic rename logic from rename_mv() to file_copy()
+    
+    This makes file_copy() safe to use by itself, and will allow to pull it
+    out and use it in other places in the future.
+
+ src/divertcmd.c |   20 +++++++++-----------
+ 1 files changed, 9 insertions(+), 11 deletions(-)
+
+commit d1ad33f057d0aa76d66434f40dedf67473095918
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 1 23:18:05 2011 +0200
+
+    dpkg-divert: Change file_copy() and rename_mv() to ohshite() on error
+    
+    This has several consequences, the code will not trigger leak detectors
+    like cppcheck due to ohshite() being marked non-returning, and the error
+    messages are going to be more descriptive.
+    
+    Closes: #620380
+
+ debian/changelog |    3 +++
+ src/divertcmd.c  |   27 ++++++++++-----------------
+ 2 files changed, 13 insertions(+), 17 deletions(-)
+
+commit 0489d13cb0469ad64d4b345acc2c0372a5588bd0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 1 22:53:21 2011 +0200
+
+    Revert "dpkg-divert: fix minor file descriptor leak found by cppcheck"
+    
+    This reverts commit bdcee319a90eee494af70e6725fed8b4e8f16584.
+
+ debian/changelog |    1 -
+ src/divertcmd.c  |    4 +---
+ 2 files changed, 1 insertions(+), 4 deletions(-)
+
+commit 9a5103c7bd96d32d685ac9f5bb38b0b4f0a9d030
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 24 03:21:13 2011 +0100
+
+    dpkg-genchanges: Do not warn when adding files w/o matching architecture
+    
+    Fix undefined value useage when adding files w/o a matching architecture,
+    because they are not present in debian/control, this is most commonly the
+    case due to dpkg-distaddfile.
+
+ debian/changelog           |    3 +++
+ scripts/dpkg-genchanges.pl |    6 ++++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit d571f9eeffad01ac1e281c83ac3eae47946cfc7b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Apr 1 01:27:30 2011 +0200
+
+    libdpkg: Make buffer_init() and buffer_done() take only one argument
+    
+    These functions only handle the output buffer_data and thus the
+    read_data argument will never get used.
+
+ lib/dpkg/buffer.c |   20 ++++++++++----------
+ 1 files changed, 10 insertions(+), 10 deletions(-)
+
+commit b3eb59cf43c286bb6c906c00ef1cdc0ec21f474d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 31 20:13:55 2011 +0200
+
+    dpkg: Set the modification time for unpacked symlinks if possible
+    
+    Use lutimes() conditionally as it might not be widely available.
+
+ configure.ac     |    2 +-
+ debian/changelog |    1 +
+ src/archives.c   |   14 +++++++++-----
+ 3 files changed, 11 insertions(+), 6 deletions(-)
+
+commit e49efcbbb93d18138da31cdcc114ca1baa67d56c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 31 20:11:54 2011 +0200
+
+    dpkg: Move lchown() call from tarobject() to tarobject_set_perms()
+    
+    This unifies a bit more the tarobject permission handling into a single
+    place.
+
+ src/archives.c |   18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+commit 632048a0a1cd3815a737f4d0bf5fddcf6bdcefd6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 21 18:31:55 2011 +0200
+
+    libdpkg: Move mtime from file_stat back to tar_info
+    
+    There's never a reason to override the mtime, no point in carrying and
+    copying it around in file_stat for now.
+
+ lib/dpkg/file.h  |    1 -
+ lib/dpkg/tarfn.c |    2 +-
+ lib/dpkg/tarfn.h |    1 +
+ src/archives.c   |   12 +++++-------
+ 4 files changed, 7 insertions(+), 9 deletions(-)
+
+commit b5e4c93f82a4a915f58df0335ffecba9f98f675b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 31 19:48:25 2011 +0200
+
+    dpkg: Use utimes(2) instead of obsolete utime(2)
+    
+    POSIX.1-2008 marked utime(2) as obsolete. Ideally we'd switch to use
+    utimensat(2), which would simplify quite a bit the code, but it's not
+    yet widely available, and using it would imply having to support
+    fallback code at compilation and run-time. This can be done later on
+    once we up the POSIX baseline.
+
+ src/archives.c |   13 ++++++++-----
+ 1 files changed, 8 insertions(+), 5 deletions(-)
+
+commit 36a3883ee15e6c39ab54750b1365d217aa48bf75
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 31 19:37:14 2011 +0200
+
+    dpkg: Move conditionals to tarobject_set_*() functions
+    
+    This will allow to handle the different cases transparently. Pass a
+    tar_entry to each of the functions.
+
+ src/archives.c |   20 ++++++++++++++------
+ 1 files changed, 14 insertions(+), 6 deletions(-)
+
+commit f281bc0fd64c563e452050145c0a5c2b6294105d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 31 15:17:10 2011 +0200
+
+    dpkg: Rename newtarobject_allmodes() to tarobject_set_perms()
+
+ src/archives.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 37d86f2b772d6aaf8d25972e32e19f38a29e676f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 31 15:16:48 2011 +0200
+
+    dpkg: Rename newtarobject_utime() to tarobject_set_mtime()
+
+ src/archives.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 5e50a926b217ed01da35b6eccd656ba7ec47d1e9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 31 15:05:11 2011 +0200
+
+    dpkg: Factor out newtarobject_allmodes() call
+
+ src/archives.c |    7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
+
+commit b1ef911615c9fec1163ce2b9d6fdb9cb46b43377
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 21 18:30:40 2011 +0200
+
+    dpkg: Move newtarobject_utime() call out of newtarobject_allmodes()
+    
+    Always call newtarobject_utime() for all tar object types, except
+    symlinks.
+
+ src/archives.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 07bbb73fcd8ee0a911535d6dbe53b07e8ff99f3b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 31 14:01:32 2011 +0200
+
+    dpkg: Fix typo in comment ‘cheched’ → ‘checked’
+
+ src/archives.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5b03e1e990f2260e0e852e50986fe492fc5e8f70
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 21 18:11:32 2011 +0200
+
+    libdpkg: Update MD5 implementation with the one from OpenBSD
+    
+    Add <config.h> and <compat.h> includes. Change <md5.h> include to
+    "md5.h". Change BYTE_ORDER check to WORDS_BIGENDIAN. Remove __bounded__
+    gcc attributes on function declarations. Remove file helper
+    declarations.
+
+ lib/dpkg/md5.c |  307 +++++++++++++++++++++++++++++---------------------------
+ lib/dpkg/md5.h |   51 ++++------
+ 2 files changed, 178 insertions(+), 180 deletions(-)
+
+commit bfb43e8aaec95b69184bffaceb099819ad97721d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 16 14:33:09 2011 +0100
+
+    Rename struct cmdinfo member arg_func to action and call it directly
+    
+    This avoids a temporary variable, given that now the function is
+    strongly prototyped.
+
+ dpkg-deb/main.c   |    5 ++---
+ dpkg-split/main.c |    5 ++---
+ lib/dpkg/myopt.h  |    3 ++-
+ src/divertcmd.c   |    5 +----
+ src/main.c        |    9 ++-------
+ src/querycmd.c    |    5 +----
+ src/statcmd.c     |    4 +---
+ 7 files changed, 11 insertions(+), 25 deletions(-)
+
+commit 12d1e5a1a42ee085b79d1a3bb3a94a9b0165afff
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 16 14:22:36 2011 +0100
+
+    Use new action_func typedef instead of ad-hoc function casts
+
+ dpkg-deb/dpkg-deb.h     |   13 +++++++++----
+ dpkg-deb/main.c         |    4 ++--
+ dpkg-split/dpkg-split.h |    9 ++++++---
+ dpkg-split/main.c       |    4 ++--
+ lib/dpkg/myopt.h        |    6 +++---
+ src/divertcmd.c         |    4 ++--
+ src/main.c              |   10 +++++-----
+ src/querycmd.c          |    4 ++--
+ src/statcmd.c           |    4 ++--
+ 9 files changed, 33 insertions(+), 25 deletions(-)
+
+commit ba372a8c554dfe6fa4f0e12961efab6b10aaf6bd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 16 14:22:34 2011 +0100
+
+    Make all command line action functions return int
+    
+    This will allow using type-safe function pointers instead of casting
+    them around. Replace all exit(3) calls with return statements. Remove
+    DPKG_ATTR_NORET from function declarations, all functions are expected
+    to return now.
+
+ dpkg-deb/build.c        |    6 ++-
+ dpkg-deb/dpkg-deb.h     |    4 +-
+ dpkg-deb/extract.c      |   35 +++++++++++++++----
+ dpkg-deb/info.c         |   25 ++++++++++---
+ dpkg-deb/main.c         |    7 +++-
+ dpkg-split/dpkg-split.h |    4 +-
+ dpkg-split/info.c       |    6 +++-
+ dpkg-split/join.c       |    6 +++-
+ dpkg-split/main.c       |    6 ++-
+ dpkg-split/queue.c      |   20 ++++++++--
+ dpkg-split/split.c      |    4 +-
+ src/archives.c          |    6 +++-
+ src/enquiry.c           |   89 ++++++++++++++++++++++++++++++++--------------
+ src/main.c              |   30 ++++++++++------
+ src/main.h              |   34 +++++++++---------
+ src/packages.c          |    4 ++-
+ src/select.c            |   17 +++++++--
+ src/statcmd.c           |    4 +-
+ src/update.c            |   12 +++++-
+ 19 files changed, 225 insertions(+), 94 deletions(-)
+
+commit f6600ffa162e6f2f04f6a10d9622bee3bc8781a1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 24 03:57:44 2011 +0100
+
+    dpkg: Pass default return value to reportbroken_retexitstatus()
+    
+    This will allow to pass arbitrary values from the command actions when
+    there's not been any reported error.
+
+ src/errors.c |    6 ++++--
+ src/main.c   |    2 +-
+ src/main.h   |    2 +-
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 1059a9f6ed8568032ae64aba72ef18c289d42dae
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Apr 1 21:26:02 2011 +0200
+
+    dpkg-source: temporarily drop Package-List field generation
+    
+    That way we can discuss it further until there's consensus on its design
+    and upload 1.16.0 immediately.
+
+ debian/changelog       |    3 ---
+ scripts/dpkg-source.pl |    1 +
+ 2 files changed, 1 insertions(+), 3 deletions(-)
+
+commit bdcee319a90eee494af70e6725fed8b4e8f16584
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Apr 1 20:45:46 2011 +0200
+
+    dpkg-divert: fix minor file descriptor leak found by cppcheck
+    
+    Reported-by: Niels Thykier <niels@thykier.net>
+
+ debian/changelog |    1 +
+ src/divertcmd.c  |    4 +++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit e3a9083fcadcb1cff64a2b3980b2679e7396fb99
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Mar 26 09:24:58 2011 +0100
+
+    dpkg-source: extend the Package-List field based on the feedback received
+    
+    Integrate the architecture field with spaces replaced by commas. It will
+    be used by the wanna-build team to see if the source package builds
+    Architecture: all packages. The reprepro maintainer also had a similar
+    use case for this information.
+    
+    Put the type of the package in a dedicated field rather than a prefix of
+    the package name. Suggested by Bastian Blank.
+    
+    See feedback at
+    http://lists.debian.org/debian-policy/2011/03/threads.html#00155
+
+ debian/changelog       |    2 +-
+ scripts/dpkg-source.pl |   12 +++++++-----
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+commit 7ea2064c46b77398a63d7f7a543ebcf08f7c74d2
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Mar 24 23:53:37 2011 +0100
+
+    Dpkg::Source::Patch: don't choke on empty patches
+    
+    Commit 255e73e11d1365fbb1e8d78287fad751a8ebc6e5 introduced a regression
+    with empty patches by assuming that a patch analysis would always give
+    back at least one filename.
+    
+    Reported-by: Niels Thykier <niels@thykier.net>
+
+ debian/changelog             |    2 ++
+ scripts/Dpkg/Source/Patch.pm |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 893a04ba94f21ea068aa18a7b715769275b98892
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Mar 24 16:04:30 2011 +0100
+
+    Dpkg::Changelog::Debian::Entry: ignore whitespaces after options in header
+
+ debian/changelog                       |    2 ++
+ scripts/Dpkg/Changelog/Entry/Debian.pm |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 84e9322448b3b9b227d80b667ef1274452d6fb3e
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Mar 24 15:45:22 2011 +0100
+
+    dpkg-source: strip spaces around newlines in Uploaders
+
+ debian/changelog       |    2 ++
+ scripts/dpkg-source.pl |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit c52cb59d6bc99dc02a0a63fd2c80fe544bf6d691
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Mar 24 15:29:54 2011 +0100
+
+    dpkg(1): remove a duplicate word in the german translation
+    
+    Concerns the explanation of --get-selections.
+
+ debian/changelog |    1 +
+ man/po/de.po     |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 7504022cd8922bf7a69572106b1b4a7a1c052675
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Mar 24 15:26:04 2011 +0100
+
+    Fix two typos in changelog
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 014672432452a6f6a18c44e733fece7938685370
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Mar 24 14:39:56 2011 +0100
+
+    dpkg-source: add new Package-List field to .dsc files
+    
+    This field has been requested by ftpmasters so that they can install
+    overrides for all binary packages as soon as they have approved
+    the source package. It contains a the list of packages that the source
+    can build along with their sections and priorities.
+    
+    It looks like this:
+    
+      Package-List:
+       src:foo admin optional
+       foo admin optional
+       foo-common admin optional
+       udeb:foo-udeb debian-installer extra
+
+ debian/changelog               |    3 +++
+ scripts/Dpkg/Control/Fields.pm |    6 +++++-
+ scripts/dpkg-source.pl         |   12 ++++++++++++
+ 3 files changed, 20 insertions(+), 1 deletions(-)
+
+commit d291a98bce9ecf04ae7f35262453b038dc17cf04
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Mar 24 12:18:50 2011 +0100
+
+    Dpkg::Control::Fields: define the place of the Built-Using field
+    
+    Commit a8cb927edb7dbd67c7a6084685998818b811caec forgot to add the
+    Built-Using field in %FIELD_ORDER.
+
+ scripts/Dpkg/Control/Fields.pm |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit cd4237cc8828a609be6260d3379f60d9c4694393
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Mar 23 19:43:34 2011 +0100
+
+    Update German translation of manual pages
+    
+    Update to 2010t.
+
+ man/po/de.po |   51 +++++++++++++++++++++++++++++++++++++++------------
+ 1 files changed, 39 insertions(+), 12 deletions(-)
+
+commit a8cb927edb7dbd67c7a6084685998818b811caec
+Author: Mark Hymers <mhy@debian.org>
+Date:   Tue Mar 22 15:50:16 2011 +0000
+
+    dpkg-gencontrol: add support for Built-Using field
+    
+    And teach dpkg-deb to not complain about it.
+    
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog               |    3 +++
+ dpkg-deb/build.c               |    1 +
+ man/deb-control.5              |   11 +++++++++++
+ man/deb-src-control.5          |    3 +++
+ scripts/Dpkg/Control/Fields.pm |    5 +++++
+ 5 files changed, 23 insertions(+), 0 deletions(-)
+
+commit 6a7a20c72325a57762e34f5dbb9f79ba73b5d496
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Mar 21 08:23:49 2011 +0100
+
+    dpkg: use the correct mtime when installing a file with statoverrides
+    
+    Regression introduced by commit ceb07b08dad4d5eead630064f45c7e7ded00a341.
+    
+    Reported-by: Marc A. Donges
+
+ debian/changelog |    2 ++
+ src/archives.c   |    6 ++++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit b5a79629f849faf27bf20f088af1487fa5e2bc14
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Thu Mar 17 16:21:13 2011 +0100
+
+    Fix minor error in German dpkg translation
+
+ po/de.po |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 083f2ed8a6d125ea7b88e58fed034742aefb021e
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Mar 17 14:35:53 2011 +0100
+
+    dpkg-divert: fix return value of rename_mv
+    
+    This is a regression introduced by the C rewrite of dpkg-divert
+    (commit 02b12d75f1eff7c184fafb5a663a0421e9a645ea) that made it unable to
+    rename files when that rename implies a copy on another file system.
+    
+    The code has provision to do a copy when a simple rename is not enough
+    but the associated function erroneously returned a failure value when
+    that operation was performed.
+    
+    Reported-by: Durk Strooisma
+
+ debian/changelog |    3 +++
+ src/divertcmd.c  |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit b100b81bfda369bd13cffddc99b79ae3a9663c05
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Mar 16 08:00:44 2011 +0100
+
+    pkg_parse_copy(): fix references to variables in a comment
+    
+    The comment still used the old names of variables from before the code had
+    been factored in a separate function (in commit
+    58df02f9d39c1e7b1c7f49026a649f125b87140d).
+
+ lib/dpkg/parse.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit f3ac02357276ffe2ed29b350a98f0e14e162463a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 16 00:54:13 2011 +0100
+
+    libdpkg: Do not lose reverse dependencies when parsing control data
+    
+    Regression introduced in commit 58df02f9d39c1e7b1c7f49026a649f125b87140d.
+
+ lib/dpkg/parse.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6093adaf447e98496dc4413277f474a379fdc912
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue Mar 15 17:00:27 2011 +0100
+
+    Update German translation of manual pages
+    
+    Update to 2008t0f0u.
+
+ man/po/de.po |  162 ++++++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 96 insertions(+), 66 deletions(-)
+
+commit 88b0c3043a651a422cd0c43c38ab6d553e2214ea
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Mar 15 01:24:28 2011 +0100
+
+    Add armhf support to ostable and triplettable
+    
+    Closes: #594179
+
+ debian/changelog |    1 +
+ ostable          |    1 +
+ triplettable     |    1 +
+ 3 files changed, 3 insertions(+), 0 deletions(-)
+
+commit d9130f2deff8a78c8813bb1d6d2504d3773a6a6e
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Mar 14 14:49:26 2011 +0100
+
+    dpkg-split: fix a gcc warning
+    
+    The refactoring made in commit 86cbf575b13d049504402f72d221fa1538c2e53b
+    was supposed to add the cast for the argument matching
+    the %jx specifier (and not %s).
+
+ dpkg-split/queue.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 20c568dccae1d1a8b108eabb6e9df57d82d3834c
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Mon Mar 14 13:09:18 2011 +0100
+
+    German dpkg translation update
+    
+    Update to 1020t.
+
+ po/de.po | 1317 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 667 insertions(+), 650 deletions(-)
+
+commit 3bfb2e8845b277f4cecd720c3aef0a1d6604d895
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Mon Mar 14 13:08:45 2011 +0100
+
+    build: Update po/POTFILES.in for new/renamed source files
+    
+    lib/dpkg/dir.c (commit 20fdb395cc721a5060c5623eda956d73ea840a21)
+    src/infodb.c (commit 9f7f2a958321d41725c0ae7f46c434fe4cbf3c6a)
+    
+    lib/dpkg/database.c → lib/dpkg/pkg-db.c (commit
+    ced5ec027285de3f207c0bb7a26e3455503e7e29)
+
+ po/POTFILES.in |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit b8d8d02e4afd7b377bad3d81afdcc48d5c6f3938
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Mon Mar 14 13:08:21 2011 +0100
+
+    dpkg-split: Fix typo
+
+ dpkg-split/queue.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 86cbf575b13d049504402f72d221fa1538c2e53b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 14 02:15:38 2011 +0100
+
+    Use off_t and %jd or %jx to handle file sizes and offsets
+    
+    This allows to support large files on 32-bit systems were a ‘long int’
+    type might not be of at least 64-bits. For printing %jd or %jx is used,
+    and the value is cast to intmax_t.
+
+ dpkg-deb/build.c        |    5 +++--
+ dpkg-deb/extract.c      |   18 ++++++++++--------
+ dpkg-deb/info.c         |    5 +++--
+ dpkg-split/dpkg-split.h |   12 ++++++------
+ dpkg-split/info.c       |   20 ++++++++++----------
+ dpkg-split/main.c       |    4 ++--
+ dpkg-split/queue.c      |    9 +++++----
+ dpkg-split/split.c      |   10 ++++++----
+ lib/dpkg/ar.c           |    7 ++++---
+ lib/dpkg/ar.h           |    2 +-
+ lib/dpkg/buffer.c       |    2 +-
+ lib/dpkg/tarfn.c        |    2 +-
+ lib/dpkg/tarfn.h        |    2 +-
+ src/archives.c          |    5 +++--
+ src/processarc.c        |    3 ++-
+ 15 files changed, 58 insertions(+), 48 deletions(-)
+
+commit 74dc50b34d45e906ecdf664634ad491f2ffac43e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 14 03:01:43 2011 +0100
+
+    Use size_t and %zu to handle memory sizes and offsets
+
+ dselect/methparse.cc        |    6 +++---
+ lib/dpkg/mlib.c             |    6 ++++--
+ lib/dpkg/pkg-format.c       |    2 +-
+ utils/update-alternatives.c |    2 +-
+ 4 files changed, 9 insertions(+), 7 deletions(-)
+
+commit 07eee0db56472a5932249c04b940b9c8fe01bb5f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 14 02:58:28 2011 +0100
+
+    libdpkg: Replace OtoL() with OtoM() converting to intmax_t
+    
+    This allows storing at least 64-bit integers on 32-bit systems, and thus
+    large file support.
+
+ lib/dpkg/tarfn.c |   25 +++++++++++++------------
+ 1 files changed, 13 insertions(+), 12 deletions(-)
+
+commit f9aaae4396a0465dce0f8c05e9e1608bd9425e81
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 14 05:21:49 2011 +0100
+
+    dpkg-split: Make decompose_filename() and setpartsize() use strtoimax()
+    
+    This will allow parsing large numbers, required for large file support.
+
+ dpkg-split/main.c  |    3 ++-
+ dpkg-split/queue.c |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 75d6bcf73ba88e443c2fd1a65018bb7f40d76ff1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 14 02:12:57 2011 +0100
+
+    dpkg-split: Replace unsignedlong() with parse_intmax()
+
+ configure.ac      |    2 +-
+ dpkg-split/info.c |   20 ++++++++++++--------
+ 2 files changed, 13 insertions(+), 9 deletions(-)
+
+commit 766de19997417fc673c0b07e9fef2cffb25d5b25
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 14 01:55:50 2011 +0100
+
+    build: Check for %j and %z format modifiers support
+    
+    We use those to create binary output, so we require them to be working.
+
+ m4/dpkg-compiler.m4 |   12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+commit df6a6091b3e420b12286dbde56ef86cf0230c2b4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 23:32:30 2011 +0100
+
+    dpkg-split: Use a constant expression to declare an array
+    
+    Although usually the compiler should replace strlen(literal) with a
+    built-in, it might not, and it's more predictable to use a constant
+    expression using sizeof() instead to avoid making it a variable
+    length array. This fixes a warning with latest gcc and -Wvla.
+
+ dpkg-split/info.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 79a67e901e0ce82944d33f13d0830fe256f9a39c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 14 07:16:31 2011 +0100
+
+    Inline rerr() into its only current call site
+
+ dpkg-split/dpkg-split.h |    1 -
+ dpkg-split/info.c       |    5 ++++-
+ dpkg-split/main.c       |    4 ----
+ 3 files changed, 4 insertions(+), 6 deletions(-)
+
+commit 26998971c3e84e33a4602e3d97a6a8c9a058fa16
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 23:30:19 2011 +0100
+
+    Inline werr() into its only current call site
+
+ dpkg-deb/build.c          |    2 +-
+ lib/dpkg/ehandle.c        |    4 ----
+ lib/dpkg/ehandle.h        |    2 --
+ lib/dpkg/libdpkg.Versions |    1 -
+ 4 files changed, 1 insertions(+), 8 deletions(-)
+
+commit fdc401aa7d35d879ad0fb9090049691f2638af41
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 23:10:28 2011 +0100
+
+    dpkg-deb: Use fdio instead of stdio
+    
+    Prefer fdio for binary data.
+
+ dpkg-deb/build.c |   34 ++++++++++++++++++----------------
+ 1 files changed, 18 insertions(+), 16 deletions(-)
+
+commit 102aef24e438b7aba9cf90ab9fc75d3c13c6c7cf
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 23:05:54 2011 +0100
+
+    dpkg-split: Do not slurp into memory the whole package parts
+    
+    Use buffered I/O when reassembling split packages. This will make
+    possible to handle parts > 2 GiB on 32 bit systems.
+
+ dpkg-split/join.c  |   45 +++++++++++++++++----------------------------
+ dpkg-split/queue.c |   36 +++++++++++++++++-------------------
+ 2 files changed, 34 insertions(+), 47 deletions(-)
+
+commit 9980e450861b782093572ecc23bfbdc8ee326087
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 22:38:38 2011 +0100
+
+    libdpkg: Add missing <errno.h> needed by fd_null_copy()
+
+ lib/dpkg/buffer.h |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 65d2ed5c215657e0e0f60500148b47bd8436e282
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 21:56:42 2011 +0100
+
+    u-a: Do not unneedingly initialize variables to NULL
+    
+    Those get initialized unconditionally later on in the code.
+    
+    This was spotted by a run with the clang static analyzer.
+
+ utils/update-alternatives.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit aab72be3be19811105baf7c22e3ac370423f9636
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 21:51:21 2011 +0100
+
+    dpkg-query: Return a valid width even if opening /dev/tty failed
+    
+    This was spotted by a run with the clang static analyzer.
+
+ src/querycmd.c |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+commit 9acbadfc967d74c7930912bf89e508b14ff509d9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 21:41:01 2011 +0100
+
+    build: Add -Wformat-security and -Wpointer-arith to default warnings
+
+ m4/dpkg-compiler.m4 |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 4c3faede9746f1e85f544b319d07b2a2c12f67d4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 21:41:38 2011 +0100
+
+    dselect: Use a format string in printf() instead of only a variable
+    
+    This fixes a warning with -Wformat-security.
+
+ dselect/main.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a468c10801bb7cee20e15d04e502e67aa95a0f7e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 18:38:21 2011 +0100
+
+    dpkg: Add comment about why writeback code ignores return values
+    
+    Suggested-by: Sven Mueller <sven@debian.org>
+
+ src/archives.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 557765dbed656c3718c65352f1cb995fcc8b87b9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 18:27:56 2011 +0100
+
+    Move pkgadmindir() and pkgadminfile() to the filesdb module
+    
+    These functions are not really part of the modstatdb module, and by
+    moving them out they get detangled and will make it possible to extend
+    them w/o pulling additional code into binaries not using the functions.
+
+ lib/dpkg/dbmodify.c       |   16 ----------------
+ lib/dpkg/dpkg-db.h        |    3 ---
+ lib/dpkg/libdpkg.Versions |    2 --
+ src/filesdb.c             |   40 ++++++++++++++++++++++++++++++++++++++++
+ src/filesdb.h             |    3 +++
+ src/infodb.c              |    1 +
+ 6 files changed, 44 insertions(+), 21 deletions(-)
+
+commit dcac09fadeaea420267c85d430ed7668f3e37ba7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 19:56:01 2011 +0100
+
+    Make admindir file local everywhere
+    
+    The interface to get and set the database directory is dpkg_db_get_dir()
+    and dpkg_db_set_dir().
+
+ dselect/dselect.h |    1 -
+ dselect/main.cc   |    3 ++-
+ dselect/method.cc |   10 +++++-----
+ src/divertcmd.c   |    2 +-
+ src/help.c        |    1 +
+ src/main.c        |    2 +-
+ src/main.h        |    1 -
+ src/processarc.c  |    2 ++
+ src/querycmd.c    |    2 +-
+ src/statcmd.c     |    4 ++--
+ src/update.c      |    2 +-
+ 11 files changed, 16 insertions(+), 14 deletions(-)
+
+commit e0ae796d8cde360c5bf9b46b49998f6efa3b8c82
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 08:45:25 2011 +0100
+
+    Do not pass admindir to database initialization functions
+    
+    Use dpkg_db_get_dir() and dpkg_db_get_path() to globally retrieve the
+    database directory instead of passing it around.
+
+ dselect/main.cc         |    6 +++---
+ lib/dpkg/dbmodify.c     |   10 +++++-----
+ lib/dpkg/dpkg-db.h      |    4 ++--
+ lib/dpkg/trigdeferred.h |    3 +--
+ lib/dpkg/trigdeferred.l |    2 +-
+ lib/dpkg/triglib.c      |    6 +++---
+ lib/dpkg/triglib.h      |    2 +-
+ src/archives.c          |    3 +--
+ src/enquiry.c           |    8 ++++----
+ src/help.c              |    4 ++--
+ src/packages.c          |    3 +--
+ src/querycmd.c          |   16 ++++++++--------
+ src/select.c            |    6 +++---
+ src/trigcmd.c           |    4 ++--
+ src/update.c            |    2 +-
+ 15 files changed, 38 insertions(+), 41 deletions(-)
+
+commit 06cd58eed3c3c9b6d5764773428b2dd31d5233a3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 22:13:04 2011 +0100
+
+    libdpkg: Use dpkg_db_get_path() instead of trig_get_triggersdir()
+    
+    Remove now unused trig_get_triggersdir().
+
+ lib/dpkg/trigdeferred.l |    2 +-
+ lib/dpkg/triglib.c      |   12 +-----------
+ lib/dpkg/triglib.h      |    2 --
+ 3 files changed, 2 insertions(+), 14 deletions(-)
+
+commit f67665e8f5eb46b3a0b90d2a90001b3d33f94ef9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 19:17:55 2011 +0100
+
+    Use dpkg_db_set_dir() instead of pkgadmindir_init()
+    
+    Remove now unused pkgadmindir_init().
+
+ dselect/main.cc     |    2 ++
+ lib/dpkg/dbmodify.c |   12 ------------
+ lib/dpkg/dpkg-db.h  |    1 -
+ src/divertcmd.c     |    4 ++--
+ src/main.c          |    2 ++
+ src/querycmd.c      |    4 ++--
+ src/statcmd.c       |    4 ++--
+ src/trigcmd.c       |    4 ++--
+ 8 files changed, 12 insertions(+), 21 deletions(-)
+
+commit addcf0717e7a6076f40a57d8aa9a0164868d46ba
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 19:53:28 2011 +0100
+
+    Use dpkg_db_get_path() instead of using m_asprintf() and admindir
+
+ dselect/method.cc    |    2 +-
+ dselect/methparse.cc |    2 +-
+ lib/dpkg/dbmodify.c  |    2 +-
+ src/divertcmd.c      |    2 +-
+ src/processarc.c     |    2 +-
+ src/statcmd.c        |    2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 8ecd3414ebcf0a81a4f23b671c134729dc600a3a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 19:51:55 2011 +0100
+
+    Use dpkg_db_get_path() instead of ad-hoc building the string with varbuf
+
+ src/divertdb.c |   20 +++++++++-----------
+ src/statdb.c   |   16 +++++++---------
+ src/update.c   |   12 ++++++------
+ 3 files changed, 22 insertions(+), 26 deletions(-)
+
+commit 18d1daa7bfffdb00af4903ad895151fe60e77ebf
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 08:45:25 2011 +0100
+
+    libdpkg: Add new dbdir module
+
+ lib/dpkg/Makefile.am |    2 +
+ lib/dpkg/dbdir.c     |   92 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/dpkg-db.h   |    6 +++
+ 3 files changed, 100 insertions(+), 0 deletions(-)
+
+commit ad2f2b8ca2abf2e21e55ab7425f19dd27cad96d8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 07:41:30 2011 +0100
+
+    dselect: Use modstatdb_can_lock() in refreshmenu() instead of ad-hoc code
+
+ dselect/main.cc |   11 +++--------
+ 1 files changed, 3 insertions(+), 8 deletions(-)
+
+commit 62b91d46785dae5d7eab796f0ceb43295f1c54b8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 07:40:09 2011 +0100
+
+    libdpkg: Refactor modstatdb_can_lock() out from modstatdb_lock()
+
+ lib/dpkg/dbmodify.c       |   25 ++++++++++++++++++-------
+ lib/dpkg/dpkg-db.h        |    1 +
+ lib/dpkg/libdpkg.Versions |    1 +
+ 3 files changed, 20 insertions(+), 7 deletions(-)
+
+commit 2ed67cedac6e5b8dfae90c56f96c8a44accc9302
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 22:02:01 2011 +0100
+
+    libdpkg: Handle EACCES as a permission error in modstatdb_lock()
+    
+    The current code only considers EPERM, but EACCES is also a valid error
+    concerning permission issues from open(2).
+
+ lib/dpkg/dbmodify.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8619e6d31486b874f8f2f2cdb34e66704d26a6a0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 07:38:03 2011 +0100
+
+    libdpkg: Reset dblockfd on modstatdb_unlock()
+    
+    This will allow locking again the database after having previously
+    unlocked it.
+
+ lib/dpkg/dbmodify.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 6c9093777f6121dc8c2ee3be44d2937402f3c028
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 06:48:27 2011 +0100
+
+    Make modstatdb locking functions not take an admindir argument
+    
+    Initialize the lockfile on modstatdb_init() via the fnis array. Make
+    sure we call modstatdb_init() and modstatdb_done() in case we are not
+    calling modstatdb_open() and modstatdb_shutdown().
+
+ lib/dpkg/dbmodify.c |   23 +++++++----------------
+ lib/dpkg/dpkg-db.h  |    4 ++--
+ src/enquiry.c       |    2 +-
+ src/update.c        |    6 +++++-
+ 4 files changed, 15 insertions(+), 20 deletions(-)
+
+commit be596facc45b0b921322abd0d885bead822639f4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 06:29:08 2011 +0100
+
+    libdpkg: Refactor modstatdb init/done sequence into new functions
+    
+    Move variable path initialization and destruction code to the new
+    modstatdb_init() and modstatdb_done(). Add a boolean variable to protect
+    the funtions from reiterated calls.
+
+ lib/dpkg/dbmodify.c       |   59 ++++++++++++++++++++++++++++++++-------------
+ lib/dpkg/dpkg-db.h        |    2 +
+ lib/dpkg/libdpkg.Versions |    1 +
+ 3 files changed, 45 insertions(+), 17 deletions(-)
+
+commit 7a14fd7d6604d5b8de58e0e33ddd8ee8026bff62
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 06:29:08 2011 +0100
+
+    libdpkg: Rename modstatdb_init() to modstatdb_open()
+    
+    We'll need to reuse the modstatdb_init() function name for further
+    refactoring.
+
+ dselect/main.cc           |    2 +-
+ lib/dpkg/dbmodify.c       |    2 +-
+ lib/dpkg/dpkg-db.h        |    2 +-
+ lib/dpkg/libdpkg.Versions |    1 +
+ src/archives.c            |    2 +-
+ src/enquiry.c             |    8 ++++----
+ src/packages.c            |    2 +-
+ src/querycmd.c            |   16 ++++++++--------
+ src/select.c              |    6 +++---
+ 9 files changed, 21 insertions(+), 20 deletions(-)
+
+commit ced5ec027285de3f207c0bb7a26e3455503e7e29
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 06:09:10 2011 +0100
+
+    libdpkg: Rename database module to pkg-db
+    
+    This matches the namespace for the provided functions, and disambiguates
+    what kind of database it's refering to.
+
+ lib/dpkg/Makefile.am              |    2 +-
+ lib/dpkg/{database.c => pkg-db.c} |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 1a8c2f8400324dc04e1fa664239c3bbc6399e6b0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 06:06:33 2011 +0100
+
+    libdpkg: Rename hashreport() to pkg_db_report()
+
+ lib/dpkg/database.c |    4 +++-
+ lib/dpkg/dpkg-db.h  |    2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 69a2c708c05d7a81041e0b2fbdf7941c40ad3113
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 06:01:39 2011 +0100
+
+    libdpkg: Move non pkg_db related functions to the pkg module
+    
+    The pkgbin_blank, pkg_blank and pkg_is_informative are not strictly
+    part of the pkg_db module, and can be used w/o the latter.
+
+ lib/dpkg/database.c |   65 -------------------------------------------
+ lib/dpkg/pkg.c      |   77 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 77 insertions(+), 65 deletions(-)
+
+commit 190a0f88ef7258b6a35a346ff1a3c21c68c3f6e4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 05:53:37 2011 +0100
+
+    libdpkg: Move blankversion() to new version module
+
+ lib/dpkg/Makefile.am |    3 ++-
+ lib/dpkg/database.c  |    5 -----
+ lib/dpkg/version.c   |   32 ++++++++++++++++++++++++++++++++
+ 3 files changed, 34 insertions(+), 6 deletions(-)
+
+commit 943de6c0e09760af1f8ad8c1e364fc4bcfbb1418
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 05:40:43 2011 +0100
+
+    libdpkg: Change file_unlock() to act directly on its new arguments
+    
+    This switches the function from unlocking the file via the popped
+    cleanup to do the action itself.
+
+ lib/dpkg/dbmodify.c |    3 ++-
+ lib/dpkg/file.c     |   21 +++++++++++----------
+ lib/dpkg/file.h     |    2 +-
+ 3 files changed, 14 insertions(+), 12 deletions(-)
+
+commit 55f9704e40f07a95a409e1fba38bb21d70041872
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 05:04:11 2011 +0100
+
+    libdpkg: Do not leak triggersdir
+
+ lib/dpkg/trigdeferred.l |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit c0f00ddf9a3258d28aa3ad306adabc3eb34476d9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 13 04:25:02 2011 +0100
+
+    dselect: Use m_asprintf() instead of ad-hoc string construction
+
+ dselect/method.cc    |   10 +++-------
+ dselect/methparse.cc |    9 ++-------
+ 2 files changed, 5 insertions(+), 14 deletions(-)
+
+commit 6761f32a6b9476cd63f874e8fbbb9346068049c3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 10 05:49:46 2011 +0100
+
+    Make modstatdb available file options explicit
+    
+    The options were either explicit or dependent on the main status
+    options, now they are always explicit. This detangles the actions
+    on the available file from the ones on the status file. Rename the
+    enum flags accordingly.
+
+ lib/dpkg/dbmodify.c |   12 +++++++-----
+ lib/dpkg/dpkg-db.h  |    6 +++---
+ src/archives.c      |    4 ++--
+ src/enquiry.c       |    2 +-
+ src/querycmd.c      |    6 +++---
+ 5 files changed, 16 insertions(+), 14 deletions(-)
+
+commit af3153d09aa3ed5597d6d415e5ab7cc3ba972e7c
+Author: Steve Langasek <steve.langasek@linaro.org>
+Date:   Wed Mar 9 11:43:05 2011 -0800
+
+    Add new variables, DEB_HOST_MULTIARCH and DEB_BUILD_MULTIARCH
+    
+    Add new variables that return the "ideal" GNU triplet for each architecture
+    which should be used as the path component for library installation.
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog             |    6 ++++++
+ man/dpkg-architecture.1      |    6 ++++++
+ scripts/Dpkg/Arch.pm         |   22 +++++++++++++++++++++-
+ scripts/dpkg-architecture.pl |   10 ++++++++--
+ 4 files changed, 41 insertions(+), 3 deletions(-)
+
+commit 8a910bc7aadd0525fe24b14c8d6249f77bba15b7
+Author: Ivan Gagis <igagis@gmail.com>
+Date:   Wed Mar 9 05:18:09 2011 +0100
+
+    dpkg-name: Fix typo in --overwrite argument parsing
+    
+    This fixes the option so that it actually works at all.
+    
+    LP: #728708
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog     |    2 ++
+ scripts/dpkg-name.pl |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 7221d533e93de0d73716e4f69f1f01d73cce8f95
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Mar 8 14:15:19 2011 +0100
+
+    u-a: Fix memory leaks due to scandir() return value
+
+ utils/update-alternatives.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 9c01b373009ac462afbdb9375abd2c7b9abc19d5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Mar 5 05:22:10 2011 +0100
+
+    Do not write the available file unnecessarily
+    
+    Some times we need to write back the status file, but not the available
+    file. Add a new flag to handle those cases.
+    
+    Based-on-patch-by: Michel Lespinasse <walken@zoy.org>
+
+ debian/changelog    |    2 +-
+ dselect/main.cc     |    2 +-
+ lib/dpkg/dbmodify.c |    2 +-
+ lib/dpkg/dpkg-db.h  |    1 +
+ src/select.c        |    2 +-
+ 5 files changed, 5 insertions(+), 4 deletions(-)
+
+commit fb49e131ef32039277c538f759ab19c1ff22e8fd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Mar 4 16:15:51 2011 +0100
+
+    Do not read the available file unnecessarily
+    
+    For commands that only make use of information from the status file,
+    there's no need to make them read and parse the available file. This
+    change does not alter the current behaviour, and commands that were
+    previously updating the available file will continue doing so.
+    
+    Removing further access to it is pending a decision on how to treat
+    globally the available file, which needs interaction with the package
+    manager frontend developers.
+    
+    Closes: #397121
+    
+    Based-on-patch-by: Michel Lespinasse <walken@zoy.org>
+
+ debian/changelog    |    2 ++
+ lib/dpkg/dbmodify.c |    3 ++-
+ src/archives.c      |    4 ++--
+ src/enquiry.c       |    2 +-
+ src/packages.c      |    6 +++---
+ src/querycmd.c      |   16 +++++++++++-----
+ src/select.c        |    4 ++--
+ 7 files changed, 23 insertions(+), 14 deletions(-)
+
+commit 8e57f4f4224fc4f6f03a3aeef898e25f3ff881d5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Mar 5 04:55:41 2011 +0100
+
+    Switch the logic from msdbrw_noavail to msdbrw_available
+
+ dselect/main.cc     |    3 ++-
+ lib/dpkg/dbmodify.c |    2 +-
+ lib/dpkg/dpkg-db.h  |    2 +-
+ src/archives.c      |    9 +++++----
+ src/enquiry.c       |    8 ++++----
+ src/packages.c      |    6 +++---
+ src/querycmd.c      |   12 ++++++------
+ src/select.c        |    6 +++---
+ 8 files changed, 25 insertions(+), 23 deletions(-)
+
+commit 898936120e987d9faf27002e2d01844edbfbb538
+Author: Roger Leigh <rleigh@debian.org>
+Date:   Sat Mar 12 16:04:31 2011 +0000
+
+    Dpkg::Control::Hash: accept PGP signature as end of block
+    
+    Improved-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog             |    3 +++
+ scripts/Dpkg/Control/Hash.pm |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 2bfd5102b413d3a0b97aa93e50467f41b2448ecf
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Mar 7 11:29:21 2011 +0100
+
+    Update German scripts translation
+    
+    Update to 514t
+
+ scripts/po/de.po |    7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+commit df8062d202016114b6c167cd0cf23e895587059c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Mar 7 09:32:14 2011 +0100
+
+    dpkg-source: be a bit less strict when parsing patches
+    
+    It will now accept seeing the same file twice
+    
+    Reported-by: Bastian Blank <waldi@debian.org>
+    
+    It will no longer match on the English text "No newline at end of file" as
+    it might be translated in some cases. It will only consider the intial
+    "\ ".
+    
+    Reported-by: Jan-Marek Glogowski <glogow@fbihome.de>
+
+ debian/changelog             |    4 ++++
+ scripts/Dpkg/Source/Patch.pm |   14 ++++++++------
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+commit 43f5433769a0f8eecc3c1cc7a208d6e14171ad60
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Mar 6 10:46:28 2011 +0100
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |  325 ++---
+ dselect/po/ca.po        |  340 +++---
+ dselect/po/cs.po        |  340 +++---
+ dselect/po/da.po        |  340 +++---
+ dselect/po/de.po        |  340 +++---
+ dselect/po/dselect.pot  |  327 ++---
+ dselect/po/el.po        |  340 +++---
+ dselect/po/es.po        |  340 +++---
+ dselect/po/et.po        |  334 +++---
+ dselect/po/eu.po        |  340 +++---
+ dselect/po/fr.po        |  340 +++---
+ dselect/po/gl.po        |  340 +++---
+ dselect/po/hu.po        |  334 +++---
+ dselect/po/id.po        |  340 +++---
+ dselect/po/it.po        |  340 +++---
+ dselect/po/ja.po        |  340 +++---
+ dselect/po/ko.po        |  340 +++---
+ dselect/po/nb.po        |  340 +++---
+ dselect/po/nl.po        |  340 +++---
+ dselect/po/nn.po        |  340 +++---
+ dselect/po/pl.po        |  340 +++---
+ dselect/po/pt.po        |  340 +++---
+ dselect/po/pt_BR.po     |  340 +++---
+ dselect/po/ro.po        |  340 +++---
+ dselect/po/ru.po        |  342 +++---
+ dselect/po/sk.po        |  340 +++---
+ dselect/po/sv.po        |  340 +++---
+ dselect/po/tl.po        |  340 +++---
+ dselect/po/vi.po        |  340 +++---
+ dselect/po/zh_CN.po     |  340 +++---
+ dselect/po/zh_TW.po     |  340 +++---
+ man/po/dpkg-man.pot     |  938 ++++++++++---
+ man/po/es.po            | 1234 +++++++++++++----
+ man/po/fr.po            | 1238 +++++++++++++----
+ man/po/hu.po            | 1125 ++++++++++++----
+ man/po/ja.po            | 1136 ++++++++++++----
+ man/po/pl.po            | 1234 +++++++++++++----
+ man/po/pt_BR.po         | 1058 +++++++++++----
+ man/po/ru.po            | 1126 ++++++++++++----
+ man/po/sv.po            | 1236 +++++++++++++----
+ po/ast.po               | 3435 ++++++++++++++++++++++++++--------------------
+ po/bs.po                | 2750 +++++++++++++++++++------------------
+ po/ca.po                | 3461 ++++++++++++++++++++++++++--------------------
+ po/cs.po                | 3412 ++++++++++++++++++++++++++-------------------
+ po/da.po                | 3498 ++++++++++++++++++++++++++--------------------
+ po/de.po                |  644 +++++-----
+ po/dpkg.pot             | 2742 +++++++++++++++++++------------------
+ po/dz.po                | 3262 ++++++++++++++++++++++++-------------------
+ po/el.po                | 3385 +++++++++++++++++++++++++--------------------
+ po/eo.po                | 3420 ++++++++++++++++++++++++++-------------------
+ po/es.po                | 3519 +++++++++++++++++++++++++++--------------------
+ po/et.po                | 2894 +++++++++++++++++++++------------------
+ po/eu.po                | 3428 ++++++++++++++++++++++++++-------------------
+ po/fr.po                | 3494 ++++++++++++++++++++++++++--------------------
+ po/gl.po                | 3374 +++++++++++++++++++++++++--------------------
+ po/hu.po                | 3208 ++++++++++++++++++++++++-------------------
+ po/id.po                | 3416 ++++++++++++++++++++++++++-------------------
+ po/it.po                | 3489 ++++++++++++++++++++++++++--------------------
+ po/ja.po                | 3427 ++++++++++++++++++++++++++--------------------
+ po/km.po                | 3212 ++++++++++++++++++++++++-------------------
+ po/ko.po                | 3479 ++++++++++++++++++++++++++--------------------
+ po/ku.po                | 2810 ++++++++++++++++++++------------------
+ po/lt.po                | 3041 ++++++++++++++++++++++------------------
+ po/mr.po                | 3216 ++++++++++++++++++++++++-------------------
+ po/nb.po                | 3413 ++++++++++++++++++++++++++-------------------
+ po/ne.po                | 3221 ++++++++++++++++++++++++-------------------
+ po/nl.po                | 3367 +++++++++++++++++++++++++--------------------
+ po/nn.po                | 3169 +++++++++++++++++++++++-------------------
+ po/pa.po                | 3021 ++++++++++++++++++++++-------------------
+ po/pl.po                | 3369 +++++++++++++++++++++++++--------------------
+ po/pt.po                | 3461 ++++++++++++++++++++++++++--------------------
+ po/pt_BR.po             | 3378 +++++++++++++++++++++++++--------------------
+ po/ro.po                | 3540 +++++++++++++++++++++++++++--------------------
+ po/ru.po                | 3437 ++++++++++++++++++++++++++--------------------
+ po/sk.po                | 3432 ++++++++++++++++++++++++++--------------------
+ po/sv.po                | 3433 ++++++++++++++++++++++++++--------------------
+ po/th.po                | 3389 ++++++++++++++++++++++++++-------------------
+ po/tl.po                | 3210 ++++++++++++++++++++++++-------------------
+ po/vi.po                | 3497 ++++++++++++++++++++++++++--------------------
+ po/zh_CN.po             | 3380 ++++++++++++++++++++++++++-------------------
+ po/zh_TW.po             | 3303 ++++++++++++++++++++++++-------------------
+ scripts/po/ca.po        |  445 +++---
+ scripts/po/de.po        |  323 +++---
+ scripts/po/dpkg-dev.pot |  433 +++---
+ scripts/po/es.po        |  479 ++++---
+ scripts/po/fr.po        |  483 ++++---
+ scripts/po/pl.po        |  476 ++++---
+ scripts/po/ru.po        |  470 ++++---
+ scripts/po/sv.po        |  471 ++++---
+ 89 files changed, 89660 insertions(+), 67783 deletions(-)
+
+commit d5c5d8f8651eb2ccdb61847e2bd018f80fcd84cb
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Mar 6 10:44:22 2011 +0100
+
+    dpkg-source: remove quilt's .pc directory when --unapply-patches is in use
+
+ debian/changelog                        |    2 ++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 34d922eef1ecf03fbccc3b022fdbe58a81792be6
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Mar 6 10:08:43 2011 +0100
+
+    Do not print warnings resulting from the autopatch analysis
+    
+    Colin's change in 40dcf24632684ec726210dd4437fdedbdbe6134e meant that the
+    autopatch is parsed while it's already applied and this can trigger some
+    undue warnings.
+    
+    This patch silences them. And also deals with similar cases that were
+    unnoticed up to now.
+
+ scripts/Dpkg/Source/Package/V2.pm       |    4 ++--
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    4 +++-
+ scripts/Dpkg/Source/Patch.pm            |   15 ++++++++++-----
+ 3 files changed, 15 insertions(+), 8 deletions(-)
+
+commit 255e73e11d1365fbb1e8d78287fad751a8ebc6e5
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Mon Feb 14 06:39:03 2011 -0600
+
+    dpkg-source: use server-side clock for patched file timestamp on NFS
+    
+    Since 1.13.14~20 (2006-02-10), dpkg-source touches the files it
+    patches when unpacking, with a single date.  This way, the order of
+    mtimes does not depend on the order in which the files were patched,
+    which is convenient when e.g. configure.in and configure are patched.
+    
+    More precisely, dpkg-source does something like the following:
+    
+    	my $now = time();
+    	foreach my $fn (@patched_files) {
+    		utime($now, $now, $fn);
+    	}
+    
+    Unfortunately when the filesystem is NFS, "touch" and normal
+    modification set mtime and atime to the current time on the server
+    side, while time() returns the current time on the client side.
+    The two clocks can disagree, producing breakage.
+    
+    So unless a timestamp has been passed explicitly, use utime(undef,
+    undef, $fn) to set mtime for the first file to the server side time
+    and copy it (rounded down to a number of seconds) to all patched
+    files.
+    
+    Reported-by: Stéphane Glondu <glondu@debian.org>
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Improved-by: Raphaël Hertzog <hertzog@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog                        |    5 +++++
+ scripts/Dpkg/Source/Functions.pm        |   26 +++++++++++++++++++++++++-
+ scripts/Dpkg/Source/Package/V1.pm       |    3 +--
+ scripts/Dpkg/Source/Package/V2.pm       |    6 +++---
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    8 ++++----
+ scripts/Dpkg/Source/Patch.pm            |    7 +++++--
+ 6 files changed, 43 insertions(+), 12 deletions(-)
+
+commit 40dcf24632684ec726210dd4437fdedbdbe6134e
+Author: Colin Watson <cjwatson@ubuntu.com>
+Date:   Mon Dec 6 09:42:17 2010 +0000
+
+    dpkg-source: keep file order stable when regenerating autopatches.
+    
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog                  |    3 +
+ scripts/Dpkg/Source/Package/V2.pm |    3 +-
+ scripts/Dpkg/Source/Patch.pm      |   82 +++++++++++++++++++++++++-----------
+ 3 files changed, 62 insertions(+), 26 deletions(-)
+
+commit 4225da67179cae2be44a76d3c37c6c859c8659c5
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Mar 5 09:52:49 2011 +0100
+
+    Fix english mistake catched by lintian
+
+ man/dpkg-gensymbols.1 |    2 +-
+ man/po/de.po          |    2 +-
+ man/po/es.po          |    2 +-
+ man/po/fr.po          |    2 +-
+ man/po/hu.po          |    2 +-
+ man/po/ja.po          |    2 +-
+ man/po/pl.po          |    2 +-
+ man/po/pt_BR.po       |    2 +-
+ man/po/ru.po          |    2 +-
+ man/po/sv.po          |    2 +-
+ 10 files changed, 10 insertions(+), 10 deletions(-)
+
+commit 94bf966f04a6c4b262544f4cf6f8442379c821d1
+Author: Martin Dorey <mdorey@bluearc.com>
+Date:   Sat Mar 5 09:44:00 2011 +0100
+
+    Fix OtoL() to accumulate data in a long instead of an int
+    
+    On 64-bit architectures where the long is bigger than the int, it makes
+    it possible to have files bigger than 2GB.
+    
+    Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog |    2 ++
+ lib/dpkg/tarfn.c |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 908fda0b103f7843992b7ec8609447d1efdd11b9
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Mar 4 13:30:00 2011 +0100
+
+    Update German translation of manual pages
+    
+    Update to 2004t0f0u.
+
+ man/po/de.po |   68 ++++++++++++++++++++++++++++++---------------------------
+ 1 files changed, 36 insertions(+), 32 deletions(-)
+
+commit 5aac6553a7f40c73da046301bf96175b998f9221
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Mar 4 03:37:05 2011 +0100
+
+    dpkg: Call gettext() on force option description printing
+    
+    Regression introduced in commit 97205c1bab2d5fd18e9dd33f5329db209b866634.
+
+ src/main.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 7fbb6b98a73c8b5fbbbd9a275bf6685625ae487c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Mar 4 02:52:38 2011 +0100
+
+    man: Add missing quotes and escaping
+
+ man/dpkg-shlibdeps.1      |   10 +++++-----
+ man/dpkg-source.1         |    4 ++--
+ man/start-stop-daemon.8   |    6 +++---
+ man/update-alternatives.8 |    4 ++--
+ 4 files changed, 12 insertions(+), 12 deletions(-)
+
+commit 7a86e4231750a73b37f7afa8d1c8944574d9c7fc
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 3 18:41:58 2011 +0100
+
+    dpkg-query: Document that --list and --show arguments are optional
+    
+    Do that in the --help output and in the man page.
+
+ debian/changelog |    2 ++
+ man/dpkg-query.1 |    4 ++--
+ src/querycmd.c   |    2 +-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 47a7d338c77b36c92fbfdeb6dcd7d275ded94f56
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu Mar 3 17:56:31 2011 +0100
+
+    Update German translation of manual pages
+    
+    Update to 2006t0f0u.
+
+ man/po/de.po |   50 +++++++++++++++++++++++++-------------------------
+ 1 files changed, 25 insertions(+), 25 deletions(-)
+
+commit bd8ddb2fcad52236b5844531583e7a3d1b169259
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Mar 2 12:32:38 2011 +0100
+
+    dpkg-shlibdeps: improve parsing of output of dpkg --search
+    
+    The returned package names can include ":" with foreign packages.
+    Modify the regex to allow this but also tighten it to match only
+    characters allowed in package names (plus ", " used as separator).
+    
+    And anchor the match on the filename with the initial "/" as
+    a safety measure.
+    
+    Sponsored-by: Linaro Limited
+
+ debian/changelog          |    1 +
+ scripts/dpkg-shlibdeps.pl |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 305d8090caf90e16a963cfb962ea78fa185b5849
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Mar 2 12:18:32 2011 +0100
+
+    dpkg-shlibdeps: use get_control_path()
+    
+    Do not hardcode the location of shlibs/symbols files. They are under the
+    control of dpkg. By using dpkg-query --control-path we ensure that we
+    always use the correct location.
+    
+    Sponsored-by: Linaro Limited
+
+ debian/changelog          |    2 ++
+ man/dpkg-shlibdeps.1      |    8 ++++----
+ scripts/dpkg-shlibdeps.pl |   11 +++++++----
+ 3 files changed, 13 insertions(+), 8 deletions(-)
+
+commit 00ae46fa208194feb36bdced907ec8b7a8d62f3f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Mar 2 12:13:38 2011 +0100
+
+    Dpkg::Path::get_control_path(): wrapper around dpkg-query --control-path
+    
+    Sponsored-by: Linaro Limited
+
+ debian/changelog     |    2 ++
+ scripts/Dpkg/Path.pm |   36 +++++++++++++++++++++++++++++++++---
+ 2 files changed, 35 insertions(+), 3 deletions(-)
+
+commit 873c0d7d717ae97ea3cc4309c1df6993137b3e21
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 2 06:06:33 2011 +0100
+
+    dpkg: Pass correct DPKG_ADMINDIR to maintainer scripts with --root
+    
+    When passing the DPKG_ADMINDIR environment variable to the maintainer
+    scripts we need to trim the installation directory name from admindir,
+    otherwise the directory won't be found.
+    
+    Regression introduced in commit e63e1fa4a4afdf98847f13f2506a0aeea68c33c7.
+    
+    Based-on-patch-by: Steve Langasek <steve.langasek@linaro.org>
+    Improved-by: Jonathan Nieder <jrnieder@gmail.com>
+
+ src/help.c |   11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 8fc97bc94c08f4da2f18c3f4aa43db148bd8f6e2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 2 01:37:28 2011 +0100
+
+    dpkg-divert: Honour --local when DPKG_MAINTSCRIPT_PACKAGE is present
+    
+    Regression introduced in commit dc98261980767f258046f8a4c2e020fcdc92c8b6-
+    
+    Reported-by: Martin Pitt <martin.pitt@ubuntu.com>
+    Suggested-by: Colin Watson <cjwatson@ubuntu.com>
+
+ src/divertcmd.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 598d605202413affb749a96bab8a39d60e6902ff
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Feb 27 09:19:20 2011 +0100
+
+    dpkg: Refactor infodb update on unpack into new pkg_infodb_update()
+
+ src/processarc.c |  164 +++++++++++++++++++++++++++++------------------------
+ 1 files changed, 90 insertions(+), 74 deletions(-)
+
+commit a2acd17d3c5a6980cf4516f6f5c5f93e67832882
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 26 17:12:08 2011 +0100
+
+    dpkg: Refactor infodb directory traversal into new pkg_infodb_foreach()
+    
+    Move the common code into a new function which will call an action
+    pointer function on matched files to perform the specific logic.
+
+ src/Makefile.am  |    1 +
+ src/infodb.c     |   56 +++++++++++++++++++++++++++++++++++++++++++++++++
+ src/infodb.h     |    4 +++
+ src/processarc.c |   61 ++++-------------------------------------------------
+ src/querycmd.c   |   52 +--------------------------------------------
+ src/remove.c     |   29 +------------------------
+ 6 files changed, 69 insertions(+), 134 deletions(-)
+
+commit fc8b6ecf05e6d4bc66e036f275daa304ada6696e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 26 18:02:05 2011 +0100
+
+    dpkg: Refactor specific infodb traversal logic into their own functions
+    
+    This will allow further refactoring now that the infodb traversal code
+    is the same eveyrwhere.
+
+ src/processarc.c |   55 +++++++++++++++++++++++++++++++++++++++--------------
+ src/querycmd.c   |   35 ++++++++++++++++-----------------
+ src/remove.c     |   28 ++++++++++++++++++--------
+ 3 files changed, 76 insertions(+), 42 deletions(-)
+
+commit ecd886da6390f9c10b8a36d27323f0bc570e97f3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 2 06:33:06 2011 +0100
+
+    dpkg: Refactor match_node allocation into new match_node_new()
+
+ src/processarc.c |   19 ++++++++++++++-----
+ 1 files changed, 14 insertions(+), 5 deletions(-)
+
+commit 7a79f5a1fafa0043e555cad4f2d0ed6d5c3098d4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 26 17:58:07 2011 +0100
+
+    dpkg: Refactor match_node deallocation into new match_node_free()
+
+ src/processarc.c |   12 +++++++++---
+ 1 files changed, 9 insertions(+), 3 deletions(-)
+
+commit 070dc94cfca122aba5b682db90292a6525119272
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 26 17:09:18 2011 +0100
+
+    dpkg: Switch the rename_list logic to match_node
+    
+    Instead of directly preparing the arguments on traversal, store the
+    information of the matched files, which we'll be acting on later in
+    the code. This will allow for further refactoring.
+
+ src/processarc.c |   51 +++++++++++++++++++++++++++------------------------
+ 1 files changed, 27 insertions(+), 24 deletions(-)
+
+commit 9f7f2a958321d41725c0ae7f46c434fe4cbf3c6a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 25 00:21:46 2011 +0100
+
+    dpkg: Refactor infodb file existence check into new pkg_infodb_has_file()
+
+ src/Makefile.am |    1 +
+ src/depcon.c    |   10 +++-------
+ src/infodb.c    |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/infodb.h    |   30 ++++++++++++++++++++++++++++++
+ src/remove.c    |   18 ++----------------
+ 5 files changed, 86 insertions(+), 23 deletions(-)
+
+commit ae3500585ce59833e7b3094e1615fa273d7b8527
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 26 17:47:00 2011 +0100
+
+    libdpkg: Make dir_sync() private
+
+ lib/dpkg/dir.c            |    2 +-
+ lib/dpkg/dir.h            |    1 -
+ lib/dpkg/libdpkg.Versions |    1 -
+ 3 files changed, 1 insertions(+), 3 deletions(-)
+
+commit ed250955ff45778f083091d3bf78cf172c3a35ad
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 26 17:45:41 2011 +0100
+
+    dpkg: Sync and print the correct info database directory
+    
+    On unpack sync the info database directory instead of the temporary
+    control information directory, and print the correct pathname on
+    error instead of the last file acted on that directory.
+
+ debian/changelog |    3 +++
+ src/processarc.c |   12 ++++--------
+ src/remove.c     |    6 ++----
+ 3 files changed, 9 insertions(+), 12 deletions(-)
+
+commit d72022b1d3bbfe9871dab28d2db6ded7a268132e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 26 17:52:47 2011 +0100
+
+    s-s-d: Do not unneedingly fsync() the pid file
+    
+    The pid file is a run-time resource, which will not be valid on reboot
+    anyway. There's no need to guarantee its durability. But now that we are
+    not checking for errors from flushing the stream, check them instead
+    when closing it, which we should have been doing anyway.
+
+ utils/start-stop-daemon.c |    7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
+
+commit bf7b7023d4e67a82c71806cc65a5d83b0a2541f0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 24 01:28:24 2011 +0100
+
+    Fix dpkg maintainer scripts to honour DPKG_ADMINDIR if present
+    
+    This will allow the maintainer scripts to work properly if --admindir
+    has been passed to dpkg. Fallback to using the default admindir in case
+    we are being called from an old dpkg not setting the environment
+    variable.
+
+ debian/dpkg.lintian-overrides |    6 +++---
+ debian/dpkg.postinst          |    2 +-
+ debian/dpkg.preinst           |    3 ++-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 0787286c1d4bc1d11e7670647e60c7eec0675fac
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 24 08:51:58 2011 +0100
+
+    libdpkg: Rename string variables to str_start and str_end in parse_nv_next
+
+ lib/dpkg/fields.c |   16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+commit 01b03062de7945b1345115f4d31e51a4d18ccfa0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 24 08:49:01 2011 +0100
+
+    Rename namevalue variables to nv and nv_head
+
+ lib/dpkg/fields.c |   12 ++++++------
+ src/select.c      |    8 ++++----
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+commit 4f36d67a83687a7ecd10293c9e0d919050672d43
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Feb 20 05:19:41 2011 +0100
+
+    libdpkg: Refactor convert_string into parse_nv_next and parse_nv_last
+    
+    This clarifies the function name and its usage from the call sites, also
+    avoids passing unneeded arguments.
+
+ lib/dpkg/fields.c |   55 +++++++++++++++++++++++++++++++---------------------
+ 1 files changed, 33 insertions(+), 22 deletions(-)
+
+commit b3f669039f128d715ac7ac71abaeac86f0954112
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Feb 20 01:46:59 2011 +0100
+
+    libdpkg: Switch pri_other to be a fallback namevalue
+
+ lib/dpkg/fields.c    |   16 +++++++---------
+ lib/dpkg/parsehelp.c |    2 +-
+ 2 files changed, 8 insertions(+), 10 deletions(-)
+
+commit 902cc15dc86797966ea09f66b26a433c7c85c64f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Feb 20 01:45:22 2011 +0100
+
+    libdpkg: Add support for fallback namevalues
+    
+    This will allow to designate a namevalue entry as the fallback return
+    value in case none of the rest did match.
+
+ lib/dpkg/namevalue.c |   13 +++++++++----
+ lib/dpkg/namevalue.h |    4 +++-
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+commit 21e9a2d3ce24bee668d1d108752c8d2fd6dc8f8b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 19 19:34:56 2011 +0100
+
+    libdpkg: Use format precision instead of strnlen() in convert_string()
+
+ lib/dpkg/fields.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit f1bccd4763343d0897db3361022fec8ab5411a34
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 24 10:15:47 2011 +0100
+
+    Use varbuf_end_str() instead of ad-hoc varbuf_add_char() calls
+    
+    This allows the strings to be terminated, thus printable or accessed
+    through the standard C string functions, and at the same time
+    appendable.
+
+ dpkg-deb/info.c         |    2 +-
+ dpkg-split/split.c      |    2 +-
+ lib/dpkg/dbmodify.c     |    2 +-
+ lib/dpkg/dump.c         |    4 ++--
+ lib/dpkg/fields.c       |    6 +++---
+ lib/dpkg/parse.c        |    2 +-
+ lib/dpkg/parsehelp.c    |    2 +-
+ lib/dpkg/pkg-format.c   |    4 ++--
+ lib/dpkg/trigdeferred.l |    2 +-
+ lib/dpkg/triglib.c      |    2 +-
+ lib/dpkg/varbuf.h       |    3 +--
+ src/archives.c          |   20 ++++++++++----------
+ src/configure.c         |   18 +++++++++---------
+ src/depcon.c            |    4 ++--
+ src/divertdb.c          |    2 +-
+ src/enquiry.c           |    2 +-
+ src/filesdb.c           |    2 +-
+ src/help.c              |    4 ++--
+ src/main.c              |    4 ++--
+ src/packages.c          |    4 ++--
+ src/processarc.c        |   20 ++++++++++----------
+ src/querycmd.c          |    8 ++++----
+ src/remove.c            |   22 +++++++++++-----------
+ src/select.c            |    4 ++--
+ src/statdb.c            |    2 +-
+ src/trigproc.c          |    2 +-
+ src/update.c            |    2 +-
+ 27 files changed, 75 insertions(+), 76 deletions(-)
+
+commit 3ae09f975d9138de3c51359ef9ba0d7776a4cc86
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 19 09:28:55 2011 +0100
+
+    libdpkg: Add new varbuf_end_str()
+
+ lib/dpkg/libdpkg.Versions |    1 +
+ lib/dpkg/varbuf.c         |    9 ++++++++-
+ lib/dpkg/varbuf.h         |    3 ++-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+commit 280ac914cc52ee5de079c0833bb1df5005c1e7ab
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 19 09:26:13 2011 +0100
+
+    dpkg: Only copy already counted output lines from find
+    
+    Instead of appending two NUL characters to be able to track the end of
+    the NUL terminated lines from find's output. Just handle the number of
+    lines we have already counted previously.
+
+ src/archives.c |    9 +++------
+ 1 files changed, 3 insertions(+), 6 deletions(-)
+
+commit de314a54d0214d0aa733aba18797ee4eed006e7e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 19 09:24:26 2011 +0100
+
+    dpkg: Reduce local variable scope in archivefiles()
+
+ src/archives.c |   13 +++++++------
+ 1 files changed, 7 insertions(+), 6 deletions(-)
+
+commit 173a6cb53258403f339ae090507cbb100b742604
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 19 06:12:15 2011 +0100
+
+    libdpkg: Do not add a NUL char after varbuf_printf() calls
+    
+    The varbuf_printf() and varbuf_vprintf() already NUL terminate the
+    string via the vsnprintf() calls. No need to do that again.
+
+ lib/dpkg/log.c           |    1 -
+ lib/dpkg/test/t-varbuf.c |    9 ++++-----
+ lib/dpkg/triglib.c       |    1 -
+ 3 files changed, 4 insertions(+), 7 deletions(-)
+
+commit 2449dcaa610b86221d914140a7e747728f5cc409
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 19 06:08:13 2011 +0100
+
+    dpkg: Move varbuf related calls close together in setselections()
+    
+    It's easier to read if the varbuf calls affecting the same variable are
+    close together, rather than dispersed around in the code.
+
+ src/select.c |   12 ++++++++----
+ 1 files changed, 8 insertions(+), 4 deletions(-)
+
+commit 18b52757ea38d896e57334ca83bf3c62e21795ed
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 19 05:17:52 2011 +0100
+
+    Revert "libdpkg: Refactor varbuf_pkgadminfile() out from pkgadminfile()"
+    
+    This reverts commit bad18329473a306d59a9c35823e85fc964bbf724.
+    
+    The varbuf_pkgadminfile() function is not being used anymore.
+
+ lib/dpkg/dbmodify.c       |   20 ++++++--------------
+ lib/dpkg/dpkg-db.h        |    2 --
+ lib/dpkg/libdpkg.Versions |    1 -
+ 3 files changed, 6 insertions(+), 17 deletions(-)
+
+commit 869564af64bb745501ee4a22e2609b18ad60d34b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 19 05:13:59 2011 +0100
+
+    dpkg: Use pkgadminfile() instead of varbuf_pkgadminfile()
+    
+    This simplifies the API, and unifies the different call sites, the
+    extremely small performance penalty is irrelevant in these cases.
+
+ src/filesdb.c |    9 +++++----
+ src/remove.c  |   20 ++++++++++++--------
+ 2 files changed, 17 insertions(+), 12 deletions(-)
+
+commit 7e31262a6fa961d81cbe67138cb875c81e195711
+Author: Andrea Gelmini <andrea.gelmini@gelma.net>
+Date:   Sun Feb 20 22:28:44 2011 +0100
+
+    libdpkg: Remove duplicate <stdio.h> include
+    
+    Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ lib/dpkg/path.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit f92a24f349082d51b702cd72f59edae005798c79
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Sep 13 18:24:12 2010 +0200
+
+    dpkg-architecture: Set DEB_HOST_ARCH and DEB_HOST_GNU_TYPE only once
+    
+    The variables are set initially once, and then possibly overriden by the
+    user supplied arguments. Rearrange the code to set these only once.
+
+ scripts/dpkg-architecture.pl |   15 ++++++++++-----
+ 1 files changed, 10 insertions(+), 5 deletions(-)
+
+commit cc7ee6f7c0c2fd603c976391cba5fb42ddfe49c1
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Mon Feb 28 18:53:13 2011 -0600
+
+    dpkg-maintscript-helper(1): dpkg only has to be unpacked for it to be usable
+    
+    Some packages use a pre-dependency to ensure a version of dpkg with
+    dpkg-maintscript-helper is available by the time preinst is run.
+    Clarify that "available" here means "unpacked", not configured, for
+    some added peace of mind.
+    
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog              |    2 ++
+ man/dpkg-maintscript-helper.1 |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit e02f4f5bba696d270b3b82158794f5859a09f507
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Mar 1 09:16:05 2011 +0100
+
+    Add missing changelog entry
+    
+    This entry was meant to be integrated in commit
+    c824c49b3fbbd61626031eeb10ae37782a994154.
+
+ debian/changelog |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit c824c49b3fbbd61626031eeb10ae37782a994154
+Author: Colin Watson <cjwatson@ubuntu.com>
+Date:   Tue Mar 1 09:10:35 2011 +0100
+
+    dpkg-buildflags: use CFLAGS="-g -O3" for building ppc64 packages on Ubuntu
+    
+    We're considering bringing up a ppc64 port of the Ubuntu server, and it
+    appears to be best to build it with -O3 rather than -O2.  (I realise
+    that this would be unusual in Debian and that there are more obstacles
+    to this than just dpkg-buildflags, and I'd like to do this differently
+    eventually, but this is where we are at the moment.)
+
+ scripts/Dpkg/Vendor/Ubuntu.pm |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 4d5189f9746bbb7e4a37af95cb351c890ac90d38
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Wed Feb 16 19:42:36 2011 +0100
+
+    German dpkg translation update
+    
+    Update to 1017t.
+
+ debian/changelog |    1 +
+ po/de.po         | 3164 ++++++++++++++++++++++++++++++------------------------
+ 2 files changed, 1767 insertions(+), 1398 deletions(-)
+
+commit 385b464c99919eb403b5ef3a6cab6f34343f8f88
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Feb 12 18:26:23 2011 +0100
+
+    Update German translation of manual pages
+    
+    Update to 2007t0f0u.
+
+ man/po/de.po |   15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
+
+commit 8889c01480269ccbe4e888ae830c5d24b12716db
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Feb 12 09:51:58 2011 +0100
+
+    Update German translation of manual pages
+    
+    Update to 2006t0f1u.
+
+ man/po/de.po |   98 +++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 50 insertions(+), 48 deletions(-)
+
+commit 0ff1ba98ce2dd4d8268e4154b7173fab49657045
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 11 05:21:36 2011 +0100
+
+    libdpkg: Rename cmdinfo arg members
+    
+    The current names are not descriptive enough, so rename parg to arg_ptr,
+    farg to arg_func, and finally arg to arg_int (which disambiguates what
+    kind of data it's holding).
+
+ dpkg-deb/main.c   |    2 +-
+ dpkg-split/main.c |    2 +-
+ lib/dpkg/myopt.c  |    9 ++++++---
+ lib/dpkg/myopt.h  |    7 ++++---
+ src/archives.c    |    6 +++---
+ src/cleanup.c     |    2 +-
+ src/divertcmd.c   |    2 +-
+ src/main.c        |   22 +++++++++++-----------
+ src/packages.c    |   16 ++++++++--------
+ src/processarc.c  |    5 +++--
+ src/querycmd.c    |    8 ++++----
+ src/remove.c      |    4 ++--
+ src/statcmd.c     |    2 +-
+ src/update.c      |   14 +++++++-------
+ 14 files changed, 53 insertions(+), 48 deletions(-)
+
+commit 2718f03bc2bb26de0e18b7bbcb20ac02b24c0719
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 11 05:11:39 2011 +0100
+
+    libdpkg: Rename function type from tar_func to tar_make_func
+    
+    This disambiguates the purpose of the function type.
+
+ lib/dpkg/tarfn.h |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 97205c1bab2d5fd18e9dd33f5329db209b866634
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 5 10:24:45 2011 +0100
+
+    dpkg: Automate force help output printing
+    
+    Move the force type (normal, default, dangerous) and force description
+    to struct forceinfo, so that its printing can be automated.
+    
+    This has multiple purposes (similar to the debuginfo output automation);
+    there's one less place to modify when adding a new force flag, the ouput
+    is easier to modify w/o fuzzying the translated strings, it's easier for
+    the translators to deal with new force flag additions.
+
+ src/main.c |  128 +++++++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 76 insertions(+), 52 deletions(-)
+
+commit 10960fcbe949640779ed5afaaaa5eb4e72897ff8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 5 10:24:45 2011 +0100
+
+    dpkg: Reduce the scope of a if/else in setforce()
+
+ src/main.c |   17 +++++++++--------
+ 1 files changed, 9 insertions(+), 8 deletions(-)
+
+commit aa18c17889d55b09e71f402afb986b7c35390212
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 5 10:24:45 2011 +0100
+
+    dpkg: Handle --force-all as any other force option
+    
+    Add an entry for "all" to forceinfos, so that the code paths are more
+    clear on what each is doing. This will also make further refactoring
+    easier.
+
+ src/main.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 1a3d55e03561d4c53dd654026c7e64ce97c68219
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 5 05:44:59 2011 +0100
+
+    dpkg: Fix typo in debug help output
+
+ src/main.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fcfbce668169aecc332ffd0be9127dc8b9e0bd4e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 5 05:24:43 2011 +0100
+
+    dpkg: Capitalize debug help output table titles
+
+ man/dpkg.1 |    4 ++--
+ src/main.c |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 166015ca54a3a5cfdbb49eaaee558be6fec329e8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 5 05:18:33 2011 +0100
+
+    dpkg: Automate debug help output printing
+    
+    Add a new array of struct debuginfo to hold debug flag information, so
+    that it can be handled automatically.
+    
+    This has multiple purposes; it will guarantee the output value always
+    matches the one defined in the code, there's one less place to modify
+    when adding a new debug flag, the ouput is easier to modify w/o fuzzying
+    the translated strings, it's easier for the translators to deal with new
+    debug flag additions, it will not allow for the source reference name to
+    be translated thus avoiding errors.
+
+ src/main.c |   48 ++++++++++++++++++++++++++++++++----------------
+ 1 files changed, 32 insertions(+), 16 deletions(-)
+
+commit 0d6e7bc21e645a49a85bd20ca73cdb08f12a9e4f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 4 20:15:17 2011 +0100
+
+    dpkg: Refactor conflictor addition to a new push_conflictor() function
+    
+    Move the conflictor and cflict_index variables to processarc.c and
+    make them static. And create a new push_conflictor() function to hide
+    the implementation details. This fixes a warning on variable shadowing.
+
+ src/archives.c   |   11 +----------
+ src/archives.h   |    3 +--
+ src/processarc.c |   14 ++++++++++++++
+ 3 files changed, 16 insertions(+), 12 deletions(-)
+
+commit efa6e49193f7948de103bada19de40720a7774fb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 4 19:45:01 2011 +0100
+
+    dpkg: Use m_realloc() instead of free()+m_malloc() on process_archive()
+
+ src/processarc.c |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+commit f1891335a4686a8859e4f77be1cd5d8061e0b56e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 4 19:40:33 2011 +0100
+
+    dpkg: Remove useless cidirbuf variable in process_archive()
+    
+    Remove cidirbuf and make cidir a static function scope variable.
+
+ src/processarc.c |   17 ++++++++---------
+ 1 files changed, 8 insertions(+), 9 deletions(-)
+
+commit 194dce1ca37ab0047c0e0606c7e9ba80196d3d2c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 4 19:22:05 2011 +0100
+
+    dpkg: Remove temporary variable admindirlen in process_archive()
+    
+    Inline the strlen() call instead of using the intermediate variable.
+
+ src/processarc.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 1baad8809039eb52113f2e647800cccf77168349
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 4 05:50:43 2011 +0100
+
+    dselect: Switch to use libdpkg debug support
+
+ dselect/basecmds.cc   |    2 +-
+ dselect/baselist.cc   |   39 +++++++---------
+ dselect/dselect.h     |    3 +-
+ dselect/main.cc       |   13 ++++--
+ dselect/methlist.cc   |   30 ++++++-------
+ dselect/methparse.cc  |   50 ++++++++++----------
+ dselect/pkgcmds.cc    |    4 +-
+ dselect/pkgdepcon.cc  |  117 +++++++++++++++++++++++--------------------------
+ dselect/pkgdisplay.cc |    2 +-
+ dselect/pkginfo.cc    |   17 +++----
+ dselect/pkglist.cc    |  109 ++++++++++++++++++++++------------------------
+ dselect/pkgsublist.cc |   44 +++++++++---------
+ 12 files changed, 208 insertions(+), 222 deletions(-)
+
+commit 5e7235bf69f016a1ade715c4a6be3a40d2cde4b5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 4 04:26:37 2011 +0100
+
+    Move and generalize debug API from dpkg to libdpkg
+
+ lib/dpkg/Makefile.am      |    2 +
+ lib/dpkg/debug.c          |   84 +++++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/debug.h          |   54 +++++++++++++++++++++++++++++
+ lib/dpkg/libdpkg.Versions |    5 +++
+ src/depcon.c              |    2 +-
+ src/help.c                |   13 +------
+ src/main.c                |    6 ++-
+ src/main.h                |   19 +----------
+ 8 files changed, 152 insertions(+), 33 deletions(-)
+
+commit 469c5fa91e12fdded4e4c6f7131a965e889d5b18
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 4 00:41:26 2011 +0100
+
+    dpkg: Always call pkg_has_postrm_script() in removal_bulk()
+    
+    Instead of letting removal_bulk_remove_files() tell the caller it has
+    found a postrm script in its branch and calling pkg_has_postrm_script()
+    on the other, just unconditionally call it always.
+    
+    This removes the need to pass back the value via out_foundpostrm, which
+    makes further refactoring slightly more convoluted.
+
+ src/remove.c |   17 ++++++-----------
+ 1 files changed, 6 insertions(+), 11 deletions(-)
+
+commit 355d2c2aa6a2fb906e915bcfee77108c2ab0c163
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 4 00:40:20 2011 +0100
+
+    dpkg: Refactor out pkg_has_postrm_script() from removal_bulk()
+
+ src/remove.c |   26 ++++++++++++++++----------
+ 1 files changed, 16 insertions(+), 10 deletions(-)
+
+commit 2fe2563ee3f2f63b05b6e76c658ea989bc4925fd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 3 17:37:31 2011 +0100
+
+    dpkg: Use varbuf_pkgadminfile() instead of manually building the path
+
+ src/filesdb.c |    6 +-----
+ src/remove.c  |   13 ++-----------
+ 2 files changed, 3 insertions(+), 16 deletions(-)
+
+commit bad18329473a306d59a9c35823e85fc964bbf724
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 3 17:37:31 2011 +0100
+
+    libdpkg: Refactor varbuf_pkgadminfile() out from pkgadminfile()
+
+ lib/dpkg/dbmodify.c       |   20 ++++++++++++++------
+ lib/dpkg/dpkg-db.h        |    2 ++
+ lib/dpkg/libdpkg.Versions |    1 +
+ 3 files changed, 17 insertions(+), 6 deletions(-)
+
+commit 9c152b641835b3d5c074215dffd2d47f4e4340cd
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue Feb 8 17:03:53 2011 +0100
+
+    Update German translation of manual pages
+    
+    Update to 2006t0f1u.
+
+ man/po/de.po |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 53 insertions(+), 1 deletions(-)
+
+commit aacb1f1ec9aab9378fab10fb832a4337fb7852c4
+Author: Colin Watson <cjwatson@ubuntu.com>
+Date:   Mon Feb 7 06:33:28 2011 +0100
+
+    On install for Ubuntu adjust the i386 GNU cpu name in cputable
+    
+    Ubuntu builds their i386 architecture for i686 instead of i486 like
+    Debian does. This change helps them use an unmodified upstream source.
+    
+    This should be considered a temporary measure until a better, more
+    generic implementation comes up, or is required for other derivatives,
+    but for now this will do.
+    
+    Closes: #611741
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog |    2 ++
+ debian/rules     |    7 +++++++
+ 2 files changed, 9 insertions(+), 0 deletions(-)
+
+commit d09ad2efd0b93bb69eb6dd74f643717f6fe35242
+Author: Robert Millan <rmh@debian.org>
+Date:   Sun Feb 6 21:31:52 2011 +0100
+
+    libcompat: Add missing semicolon to vsnprintf() declaration
+    
+    This makes the build fail on systems where vsnprintf() is missing or
+    not compliant enough, and thus the fallback is being used.
+    
+    Closes: #612203
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog    |    2 ++
+ lib/compat/compat.h |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit da5fceca72b4c67be8acdb0734dbf7c241519dff
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 4 18:59:00 2011 +0100
+
+    dpkg: Do not segfault on “dpkg -i --no-act”
+    
+    mkdtemp() takes the string allocated by path_make_temp_template() and
+    modifies it, but there's not enough allocated room for the subsequent
+    string appends done starting from cidirrest, for the control files.
+    
+    Regression introduced in commit ffccc65580189420a0a64736bba0fb661de56dcb.
+
+ debian/changelog |    1 +
+ src/processarc.c |   11 +++++++++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+commit b83cc7d551c9aeed7bada926e2e3b3d9fc5c9140
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 3 00:05:23 2011 +0100
+
+    libcompat: Define gettext context functions when NLS is disabled
+    
+    When the package is configured with NLS disabled (--disable-nls),
+    the build will fail due to undefined references to LC_MESSAGES, the
+    gettext.h header file does not correctly handle the gettext context
+    related function declarations on disabled NLS support, which is known
+    to be used by downstreams. This adds all missing macros corresponding
+    to their NLS enabled counterparts.
+
+ debian/changelog     |    1 +
+ lib/compat/gettext.h |   32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 33 insertions(+), 0 deletions(-)
+
+commit 61a3cb189063139c8562b2fddc65de0c9996fd8f
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Feb 2 23:02:20 2011 +0100
+
+    Update German translation of manual pages
+    
+    Update to 1996t0f11u.
+
+ man/po/de.add |    2 +-
+ man/po/de.po  | 1155 ++++++++++++++++++++++++++++++++++++++++++++-------------
+ 2 files changed, 899 insertions(+), 258 deletions(-)
+
+commit 18ac5167655f3db8a0c2c8a9a8fd338d6b5daa81
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Feb 1 05:03:59 2011 +0100
+
+    dpkg: Document packages w/o Architecture field need --force-architecture
+    
+    The commit 58e7276b69be105735eccb3c18c2b28d3a2ec2e5 didn't explicitly
+    document this behavioural change, do so now.
+
+ debian/changelog |    2 ++
+ man/dpkg.1       |    2 +-
+ src/main.c       |    2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 3ce597a4c62157f6955101d16db198db4afd4259
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Feb 1 04:45:24 2011 +0100
+
+    Revert "Fix installation of packages without architecture field"
+    
+    This reverts commit 13637ddfaf473fa5fd67264da9f38841eeed7401.
+    
+    The changes in commit 58e7276b69be105735eccb3c18c2b28d3a2ec2e5 were
+    intentional, supported here meant (although the commit did not
+    document this properly) that the non-compliant package can still be
+    installed, although --force-architecture is now required.
+
+ src/processarc.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit f3496dc24f98cea0e1da3c812e8c728c45875f48
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 31 19:17:35 2011 +0100
+
+    libdpkg: Do not print bogus warnings when parsing status files
+    
+    This is the equivalent fix in spirit as the one in commit
+    672b0664cbb8fd7fd5eea7ab10af1bbf6871833f, but applied to the
+    Architecture field instead.
+    
+    Reported-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog |    3 ++-
+ lib/dpkg/parse.c |    9 +++++----
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+commit 13637ddfaf473fa5fd67264da9f38841eeed7401
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jan 31 15:06:14 2011 +0100
+
+    Fix installation of packages without architecture field
+    
+    Refactoring done in commit 58e7276b69be105735eccb3c18c2b28d3a2ec2e5
+    introduced a regression: a package without an architecture field
+    can no longer be installed without --force-architecture.
+
+ src/processarc.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 58e7276b69be105735eccb3c18c2b28d3a2ec2e5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 31 10:11:56 2011 +0100
+
+    libdpkg: Ensure parsed packages have a usable arch member
+    
+    In case the package didn't have an Architecture field, warn and
+    initialize it to an empty string, so that it can be safely used for
+    string comparisons, printing, etc.
+    
+    This fixes a potential segfault when setting the environment variable
+    DPKG_MAINTSCRIPT_ARCH from a package w/o an Architecture field, which
+    are a thing from the distant past, but still should be supported.
+
+ debian/changelog |    2 ++
+ dpkg-deb/build.c |    6 +++---
+ lib/dpkg/parse.c |    6 ++++--
+ src/processarc.c |    3 +--
+ 4 files changed, 10 insertions(+), 7 deletions(-)
+
+commit c48475458415335c8969a11cea22ba87045c2cf3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 31 07:24:50 2011 +0100
+
+    dpkg: Rename arch variable to native_arch
+    
+    This disambiguates the usage and avoids unneeded shadowing.
+
+ src/enquiry.c    |    2 +-
+ src/main.c       |    2 +-
+ src/main.h       |    2 +-
+ src/processarc.c |    4 ++--
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 1466cd10e8c551fcb670f8785ef39abafc66d996
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 31 07:36:56 2011 +0100
+
+    libdpkg: Add type documentation to struct pkginfo
+
+ lib/dpkg/dpkg-db.h |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 694b4b5aded077b43abd4e0cf5a81c7040899a24
+Merge: eedb20c 5f52c08
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 31 06:33:01 2011 +0100
+
+    Merge branch 'squeeze' (through tag '1.15.8.10')
+    
+    Conflicts:
+    	debian/changelog
+
+commit eedb20c17071efd92112edf60f74f9f637b4aaed
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 29 06:19:28 2011 +0100
+
+    libdpkg: Change new_pkg to be a pointer in parsedb()
+    
+    This way all variables are handled the same.
+
+ lib/dpkg/parse.c |   34 ++++++++++++++++++----------------
+ 1 files changed, 18 insertions(+), 16 deletions(-)
+
+commit da34b9f70ed071f12efdf48a0579aea3e14cc0b2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 29 06:16:28 2011 +0100
+
+    libdpkg: Rename newpig/newpifp to new_pkg/new_pkgbin in parsedb()
+    
+    The names better match reality, and describe this is the new package
+    information being parsed. The previous usage was slightly confusing.
+
+ lib/dpkg/parse.c |   38 +++++++++++++++++++++-----------------
+ 1 files changed, 21 insertions(+), 17 deletions(-)
+
+commit 6b7ea85f6c109b241febc5ff3c2bdcad55f9fb4e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 29 06:10:22 2011 +0100
+
+    libdpkg: Rename pigp/pifp to db_pkg/db_pkgbin in parsedb()
+    
+    The names better match reality, and describe this is package information
+    coming from the database. The previous usage was slightly confusing.
+
+ lib/dpkg/parse.c |   18 +++++++++++-------
+ 1 files changed, 11 insertions(+), 7 deletions(-)
+
+commit df219a607282614168b6d19423d57bb902021f34
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 29 05:59:09 2011 +0100
+
+    Rename architecture variables to arch
+    
+    The “arch” name is unambiguous in this context, and as we are going to
+    be using it more often, let's avoid unnecessary typing.
+
+ dpkg-deb/build.c    |    2 +-
+ lib/dpkg/database.c |    2 +-
+ lib/dpkg/dpkg-db.h  |    2 +-
+ lib/dpkg/parse.c    |    4 ++--
+ src/enquiry.c       |    2 +-
+ src/help.c          |    2 +-
+ src/main.c          |    2 +-
+ src/main.h          |    2 +-
+ src/processarc.c    |   10 +++++-----
+ 9 files changed, 14 insertions(+), 14 deletions(-)
+
+commit 44e022a801e0b5720a6e8d6887788ebf15b9995f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jan 20 18:41:09 2011 +0100
+
+    Use pid instead of c1 for variable name
+
+ dpkg-deb/extract.c |    8 ++++----
+ dpkg-deb/info.c    |    8 ++++----
+ dselect/method.cc  |    8 ++++----
+ src/archives.c     |    9 +++++----
+ src/help.c         |   17 +++++++++--------
+ src/processarc.c   |   15 ++++++++-------
+ 6 files changed, 34 insertions(+), 31 deletions(-)
+
+commit ad95ee210312c38c12c6054e13dd45c1a8ff1c6c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jan 20 18:26:26 2011 +0100
+
+    dselect: Use subproc_check in falliblesubprocess instead of ad-hoc code
+
+ dselect/method.cc |   20 +++-----------------
+ 1 files changed, 3 insertions(+), 17 deletions(-)
+
+commit ef339f3715418ddaabb7923a7d5157f522687954
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 29 05:52:30 2011 +0100
+
+    libdpkg: Improve subprocess signal handling in subproc_check()
+    
+    Explicitly handle user interruption, which should be slightly more
+    helpful for the user and will allow to use subproc_check() in dselect's
+    falliblesubprocess(). Improve too the output strings.
+
+ lib/dpkg/subproc.c |    8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 88e1cf242fbaf9c347099656d34ae50750e5e2a1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jan 20 18:23:02 2011 +0100
+
+    libdpkg: Warn too on unknown status in subproc_check() if PROCWARN
+    
+    We were erroring out even if the caller specified PROCWARN, so handle
+    this error case too.
+
+ lib/dpkg/subproc.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e61824e3e7d37d0b4fcf1e2128b709292a0867cb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jan 20 18:21:38 2011 +0100
+
+    libdpkg: Refactor error output into a function variable in subproc_check()
+    
+    This deduplicates two sets of identical strings.
+
+ lib/dpkg/subproc.c |   25 +++++++++++--------------
+ 1 files changed, 11 insertions(+), 14 deletions(-)
+
+commit 5f2e95ef39658991aade7b2357978c713bad7cae
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jan 20 18:16:56 2011 +0100
+
+    Update usertags
+
+ debian/usertags |   81 +++++++++++++++++++++++++++++++++---------------------
+ 1 files changed, 49 insertions(+), 32 deletions(-)
+
+commit 5f52c08852c672e48ca67ccddb17c83c8d1f9fe8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 30 20:29:05 2011 +0100
+
+    Release 1.15.8.10
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 19a571d40fdb3cdbff8ea3910aaafdcf706a1892
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 30 19:14:37 2011 +0100
+
+    u-a: Fix segfault in --auto on link groups with only dangling symlinks
+    
+    All the invalid alternative entries will get removed so it might happen
+    that the link group ends up empty. Handle that explicitly on --auto.
+    
+    Closes: #611545
+
+ debian/changelog            |    7 +++++++
+ utils/update-alternatives.c |    6 +++++-
+ 2 files changed, 12 insertions(+), 1 deletions(-)
+
+commit 3a6f1b5c30c88bf90e191f891c9aa015a8235cac
+Merge: ec2ebca 6bdf65b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 28 08:49:55 2011 +0100
+
+    Merge commit '1.15.8.9'
+
+commit 6bdf65bafdc6b25ffd1cae27b6860d84e56823a1
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 28 08:21:19 2011 +0100
+
+    Release 1.15.8.9
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit be8b9f2dd6bc959ec605bf01e372c8089079aad9
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 28 08:18:30 2011 +0100
+
+    Drop install-info related Breaks for emacs and jed related packages
+    
+    For jed, the breaks has been rendered useless as the maintainers dropped
+    the install-info dependencies anyway.
+    
+    For emacs, Sven Joachim reported similar problems as with Konqueror.
+
+ debian/changelog |    3 +++
+ debian/control   |    6 +-----
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+commit 38b959b27a115363307afa1980ad691ab5768986
+Author: Stan Ioan-Eugen <stan.ieugen@gmail.com>
+Date:   Tue Jan 25 14:14:53 2011 +0100
+
+    Update Romanian dpkg translation
+
+ debian/changelog |    1 +
+ po/ro.po         |   21 +++++++++++++--------
+ 2 files changed, 14 insertions(+), 8 deletions(-)
+
+commit f589a03c6fcd9360d00cb4b084d55704c3c8746f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jan 24 20:43:13 2011 +0100
+
+    debian/control: drop Breaks on konqueror
+    
+    With this Breaks, "apt-get install udev" that is recommended at the start
+    of a lenny->squeeze upgrade might remove the kde metapackage. This is
+    due to udev needing a new util-linux that itself needs a newer dpkg (due
+    to the install-info transition).
+    
+    In contrast, the lack of the Breaks has very minimal consequences: partial
+    upgrades might not install install-info and in that case konqueror might
+    show an outdated list of info pages.
+
+ debian/changelog |    5 +++++
+ debian/control   |    2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit f80dec4bf15c6349d09cb0773ab22e309af853e7
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jan 24 20:25:52 2011 +0100
+
+    Start new changelog entry
+    
+    Integrate changelog entry that got added to the previous changelog entry
+    for an already released version.
+
+ debian/changelog |   10 +++++++---
+ 1 files changed, 7 insertions(+), 3 deletions(-)
+
+commit fd7a65e7aa5a4f489138127c99b830b17adb4b02
+Author: Jordi Mallach <jordi@debian.org>
+Date:   Sat Jan 22 14:04:50 2011 +0100
+
+    Remove space before "…" in several Catalan strings (Jordi  Mallach).
+
+ debian/changelog |    3 +++
+ po/ca.po         |   44 ++++++++++++++++++++++----------------------
+ 2 files changed, 25 insertions(+), 22 deletions(-)
+
+commit ec2ebca2e2b35589b60a04980e464134c3b85f5c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 21 13:33:33 2011 +0100
+
+    Update triggers documentation to match reality
+    
+    - The list of triggers is in the second parameter and not in the third.
+    - The --verbose and --query options for dpkg-trigger have never been
+      implemented.
+
+ doc/triggers.txt |    8 ++------
+ 1 files changed, 2 insertions(+), 6 deletions(-)
+
+commit 7b561513784490d08c0f890ba58a1a2aa63cf62b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 16 07:23:41 2011 +0100
+
+    dpkg-query: Use ohshit() for not installed package in --control-path
+    
+    The use of badusage() here is not appropriate.
+
+ src/querycmd.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 626560b31133376bfb5593770b2ee1fc83931c29
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 16 07:21:17 2011 +0100
+
+    dpkg: Do not fail when trying to remove the root directory
+    
+    This will happen when removing the last package from an installation,
+    which does never happen on normal conditions on Debian-based systems.
+    But it can happen either on other distributions where dpkg is a foreign
+    package manager, or on test databases.
+
+ debian/changelog |    3 +++
+ src/remove.c     |   10 ++++++++++
+ 2 files changed, 13 insertions(+), 0 deletions(-)
+
+commit e63e1fa4a4afdf98847f13f2506a0aeea68c33c7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 16 06:59:55 2011 +0100
+
+    Propagate --admindir to programs run from maintainer scripts
+    
+    Always set DPKG_ADMINDIR from dpkg so that all subprocesses inherit
+    the variable and there's no possible security risk from a user process
+    setting the variable to write onto a user controlled area.
+    
+    As usual, the order in which the admindir value is overridden is the
+    following: built-in default, environment variable and command line
+    option.
+    
+    Closes: #97076
+    
+    Suggested-by: Brendan O'Dea <bod@debian.org>
+
+ TODO                        |    2 --
+ debian/changelog            |    2 ++
+ lib/dpkg/dbmodify.c         |   12 ++++++++++++
+ lib/dpkg/dpkg-db.h          |    1 +
+ man/dpkg-divert.8           |    4 ++++
+ man/dpkg-query.1            |    4 ++++
+ man/dpkg-statoverride.8     |    6 ++++++
+ man/dpkg-trigger.1          |    6 ++++++
+ man/update-alternatives.8   |    6 ++++++
+ src/divertcmd.c             |    4 +++-
+ src/main.c                  |   13 ++++---------
+ src/querycmd.c              |    4 +++-
+ src/statcmd.c               |    4 +++-
+ src/trigcmd.c               |    4 +++-
+ utils/update-alternatives.c |   21 ++++++++++++++++++++-
+ 15 files changed, 77 insertions(+), 16 deletions(-)
+
+commit 76ed5f9ff43b1c803098ffd15843b9acc721608e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 16 06:31:08 2011 +0100
+
+    Use string literals instead of macros for environment variable names
+    
+    The environment variable names are part of the exposed API, and as such
+    would need a transition plan in case of name change. Inline the macro
+    values to ease code reading.
+
+ lib/dpkg/command.c |    2 +-
+ lib/dpkg/dpkg.h    |    7 -------
+ src/configure.c    |    2 +-
+ src/divertcmd.c    |    2 +-
+ src/help.c         |    8 ++++----
+ src/trigcmd.c      |    2 +-
+ 6 files changed, 8 insertions(+), 15 deletions(-)
+
+commit 7dc8ca8a270b5970f6571b4d357a1208d7b98bbf
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 16 06:23:36 2011 +0100
+
+    build: Do not set MKSPLITSCRIPT CPP macro
+    
+    Not needed anymore since the rewrite in C of mksplit.
+    
+    Missed in commit f2115151c19ff37b305296c23225807b0832086b.
+
+ dpkg-split/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f528030583d6059fa60ae02da187e39be1fd974c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 15 16:57:37 2011 +0100
+
+    dpkg: Change wanttoinstall() return type from int to bool
+
+ src/archives.c |   24 ++++++++++++------------
+ src/main.h     |    2 +-
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+commit f114b567ddcd92f9fad094b9f3ca1280affc31a9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 15 16:53:32 2011 +0100
+
+    dpkg: Fix wanttoinstall() to use the new version from pkg->available
+    
+    The code was mixing usages of the argument ver, with printing from
+    pkg->available.version, which is rather confusing. Just use the
+    available and installed pkg members instead.
+    
+    This also will guarantee we'll never get a NULL version.
+
+ src/archives.c   |   12 +++++-------
+ src/main.h       |    2 +-
+ src/processarc.c |    2 +-
+ 3 files changed, 7 insertions(+), 9 deletions(-)
+
+commit 3133aae67ee9e4f693a121b9578bffc0e0fa8469
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 15 16:42:39 2011 +0100
+
+    dpkg: Always say why in wanttoinstall()
+    
+    There's just one caller and it always requests to say why we are
+    installing. So remove this unneeded logic.
+
+ src/archives.c   |   46 +++++++++++++++++++---------------------------
+ src/main.h       |    3 +--
+ src/processarc.c |    2 +-
+ 3 files changed, 21 insertions(+), 30 deletions(-)
+
+commit acb03dc669957b3e4f4412bc53bd201a1bfe528b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 15 07:00:26 2011 +0100
+
+    Add spelling fix for jfs@debian.org to .mailmap
+
+ .mailmap |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit f938e6fd12238e43cfb02540794739097c9e1530
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 14 18:03:52 2011 +0100
+
+    libdpkg: Use a varbuf for the field_state value
+    
+    This should reduce the amount of m_realloc() calls done when parsing,
+    as the varbuf keeps track of the memory allocated and does not alternate
+    reducing and growing the buffer unnecessarily.
+    
+    It might allow in the future to avoid copying around the field value
+    string just to be able to append a NUL character.
+
+ lib/dpkg/parse.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 5f2b4a46326738154bdd47df91b3e110c55ebd28
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 14 18:00:57 2011 +0100
+
+    libdpkg: Move field matching into for (;;) bodies in pkg_parse_field()
+    
+    The current code is performing the field matching in the for (;;)
+    conditional, which implies and empty for (;;) body and needs inverted
+    logic to work. Move the matching into the body as that's the more
+    natural place for it to be and easier to read.
+
+ lib/dpkg/parse.c |   13 +++++++------
+ 1 files changed, 7 insertions(+), 6 deletions(-)
+
+commit 36d762414b7f244a4846443644e4d2e64c71a58a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 14 07:43:04 2011 +0100
+
+    libdpkg: Refactor pkg_parse_field() out from parsedb()
+
+ lib/dpkg/parse.c |  144 +++++++++++++++++++++++++++++++----------------------
+ 1 files changed, 84 insertions(+), 60 deletions(-)
+
+commit 58df02f9d39c1e7b1c7f49026a649f125b87140d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 14 07:12:51 2011 +0100
+
+    libdpkg: Refactor pkg_parse_copy() out from parsedb()
+
+ lib/dpkg/parse.c |  100 ++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 57 insertions(+), 43 deletions(-)
+
+commit 055ca895b3de26c117bd619785cf05580c9dcc55
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 14 06:56:12 2011 +0100
+
+    libdpkg: Reduce variable scope in parsedb()
+
+ lib/dpkg/parse.c |   10 +++++++---
+ 1 files changed, 7 insertions(+), 3 deletions(-)
+
+commit 280f4a55b649035ae72093c80edc91289594e111
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 14 06:49:33 2011 +0100
+
+    libdpkg: Refactor pkg_parse_verify() out from parsedb()
+
+ lib/dpkg/parse.c |  167 ++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 87 insertions(+), 80 deletions(-)
+
+commit ca8a4bace2c59618aa78a488dbd0b3096009850d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 14 06:02:26 2011 +0100
+
+    Update TODO list
+
+ TODO |    6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+commit de553e274645c58b1b45197d962da15e72c1e24c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 14 01:10:00 2011 +0100
+
+    Rename struct pkginfoperfile to struct pkgbin
+
+ dselect/pkgdepcon.cc      |   13 +++--
+ dselect/pkglist.cc        |    2 +-
+ dselect/pkglist.h         |    2 +-
+ dselect/pkgtop.cc         |    2 +-
+ lib/dpkg/database.c       |    8 ++--
+ lib/dpkg/dpkg-db.h        |   25 ++++++----
+ lib/dpkg/dump.c           |  114 ++++++++++++++++++++++++++++-----------------
+ lib/dpkg/fields.c         |   94 +++++++++++++++++++++++--------------
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/parse.c          |    8 ++--
+ lib/dpkg/parsedump.h      |    6 +-
+ lib/dpkg/pkg-format.c     |    2 +-
+ lib/dpkg/pkg-format.h     |    2 +-
+ lib/dpkg/vercmp.c         |    2 +-
+ src/archives.c            |    4 +-
+ src/cleanup.c             |    2 +-
+ src/help.c                |    2 +-
+ src/processarc.c          |    2 +-
+ src/remove.c              |    2 +-
+ 19 files changed, 177 insertions(+), 117 deletions(-)
+
+commit 2276c6a59c80a0d2558b349203310bb833bdd909
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 14 01:04:32 2011 +0100
+
+    dselect: Remove i2info() declaration w/o matching definition
+
+ dselect/pkglist.h |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 21306c4f9e47c1e77c23ae81ce42eb1cf8d2b962
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 13 03:58:15 2009 +0100
+
+    dpkg: Refactor package authentication into deb_verify()
+
+ src/processarc.c |   59 ++++++++++++++++++++++++++++++++----------------------
+ 1 files changed, 35 insertions(+), 24 deletions(-)
+
+commit a6d7d484b5fc140aa4471535690e734900d1e4a6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 13 03:56:53 2009 +0100
+
+    dpkg: Refactor reassembling a split package into deb_reassemble()
+
+ src/processarc.c |   81 ++++++++++++++++++++++++++++++++----------------------
+ 1 files changed, 48 insertions(+), 33 deletions(-)
+
+commit f4b0dd0456af74edea2f117423e4b2a9959e8e59
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jan 12 01:24:58 2011 +0100
+
+    Use m_asprintf() instead varbuf_printf() for one-off strings
+    
+    When the string is only created once, used several times and then
+    freed, there's no much point in using a varbuf instead of the simpler
+    m_asprintf(). The former needs more state and makes using the string
+    slightly more cumbersome. Using m_asprintf() should be slightly faster
+    too, but not significantly enough to justify this change by itself.
+
+ dpkg-deb/build.c    |   20 ++++++++--------
+ dpkg-split/split.c  |   11 ++++-----
+ lib/dpkg/dbmodify.c |   12 +++++-----
+ lib/dpkg/dir.c      |   15 ++++++-------
+ lib/dpkg/path.c     |    8 +++---
+ lib/dpkg/triglib.c  |   12 +++++-----
+ src/divertcmd.c     |   58 ++++++++++++++++++++++++--------------------------
+ 7 files changed, 66 insertions(+), 70 deletions(-)
+
+commit 881d62b236b52c35a367c49c3737c2b4dfdb7ede
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jan 12 01:20:08 2011 +0100
+
+    Use m_asprintf() instead of building the strings piece by piece
+    
+    This is way more compact, the strings are for temporary values, and the
+    minimal possible performance difference does not matter here.
+
+ src/statcmd.c |   38 ++++++++++++++------------------------
+ 1 files changed, 14 insertions(+), 24 deletions(-)
+
+commit 76a6ebe12c5fe1d8199ca4072915118197e6b98a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jan 12 00:28:55 2011 +0100
+
+    Use m_asprintf() instead of nfmalloc() and string operations
+    
+    This avoid the need to know the resulting string length beforehand, and
+    makes sure it's always going to get the right size. It also makes the
+    code way clearer.
+    
+    Usage of nfmalloc() here was not appropriate anyway, as the variables
+    are only of temporary use, so switching to normal allocation gives
+    a side-effect “bug” fix.
+
+ dpkg-split/queue.c |   11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 6185545a7936478f8b2cce7153d7e880b3b5df5b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jan 12 00:27:11 2011 +0100
+
+    Use m_asprintf() instead of m_malloc() and string operations
+    
+    This avoid the need to know the resulting string length beforehand, and
+    makes sure it's always going to get the right size. It also makes the
+    code way clearer.
+
+ lib/dpkg/dbmodify.c |    9 ++-------
+ lib/dpkg/dump.c     |    6 ++----
+ lib/dpkg/myopt.c    |   23 +++++++----------------
+ lib/dpkg/tarfn.c    |    6 ++----
+ src/archives.c      |    5 ++---
+ src/main.c          |   10 +++-------
+ src/processarc.c    |    7 ++-----
+ 7 files changed, 20 insertions(+), 46 deletions(-)
+
+commit d9be477d0f0b17b61c8dbc40457d1b500c90035f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jan 11 22:26:33 2011 +0100
+
+    libdpkg: Call va_end() just after vsnprintf() in parse_db_version()
+    
+    No need to leak in case of recoverable error.
+
+ lib/dpkg/parsehelp.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 38a86e06fd459cb94f75dd0370cac3e04cdff685
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jan 11 22:04:31 2011 +0100
+
+    libdpkg: Add new m_asprintf() function
+
+ lib/dpkg/dpkg.h           |    1 +
+ lib/dpkg/libdpkg.Versions |    1 +
+ lib/dpkg/mlib.c           |   18 ++++++++++++++++++
+ 3 files changed, 20 insertions(+), 0 deletions(-)
+
+commit 795d07d2f773bd05d23d5f25bf1334bd0f3d4fb5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 10 20:51:13 2011 +0100
+
+    libdpkg: Rename varbufvprintf() to varbuf_vprintf()
+    
+    Make the varbuf API a bit more consistent.
+
+ lib/dpkg/buffer.c         |    2 +-
+ lib/dpkg/compress.c       |    4 ++--
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/log.c            |    4 ++--
+ lib/dpkg/varbuf.c         |    4 ++--
+ lib/dpkg/varbuf.h         |    2 +-
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+commit af47d0660e1c1771999e64e4b54e97031c345053
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 10 20:46:18 2011 +0100
+
+    libdpkg: Rename varbufprintf() to varbuf_printf()
+    
+    Make the varbuf API a bit more consistent.
+
+ dpkg-deb/build.c          |   16 +++++-----
+ dpkg-split/split.c        |   20 ++++++------
+ lib/dpkg/dbmodify.c       |    2 +-
+ lib/dpkg/dir.c            |    2 +-
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/parsehelp.c      |    2 +-
+ lib/dpkg/path.c           |    2 +-
+ lib/dpkg/pkg-format.c     |    6 ++--
+ lib/dpkg/test/t-varbuf.c  |    6 ++--
+ lib/dpkg/triglib.c        |    6 ++--
+ lib/dpkg/varbuf.c         |    4 ++-
+ lib/dpkg/varbuf.h         |    2 +-
+ src/depcon.c              |    2 +-
+ src/divertcmd.c           |   32 ++++++++++----------
+ src/packages.c            |   71 +++++++++++++++++++++-----------------------
+ 15 files changed, 87 insertions(+), 88 deletions(-)
+
+commit 66b316d08a64b8f5e64f53d71e267024fb2f6884
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 10 17:06:25 2011 +0100
+
+    libdpkg: Rename varbufaddbuf() to varbuf_add_buf()
+    
+    Make the varbuf API a bit more consistent.
+
+ lib/dpkg/buffer.c         |    2 +-
+ lib/dpkg/fields.c         |    6 +++---
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/pkg-format.c     |    2 +-
+ lib/dpkg/test/t-varbuf.c  |   12 ++++++------
+ lib/dpkg/varbuf.c         |    2 +-
+ lib/dpkg/varbuf.h         |    4 ++--
+ src/archives.c            |    2 +-
+ src/configure.c           |    2 +-
+ src/help.c                |    2 +-
+ 10 files changed, 18 insertions(+), 18 deletions(-)
+
+commit 91c3515c2444483633e0bb52ae575775c3765230
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 10 15:40:34 2011 +0100
+
+    libdpkg: Rename varbufaddstr() to varbuf_add_str()
+    
+    Make the varbuf API a bit more consistent.
+
+ dpkg-deb/info.c         |    4 +-
+ lib/dpkg/dbmodify.c     |    6 ++--
+ lib/dpkg/dump.c         |   93 ++++++++++++++++++++++++++---------------------
+ lib/dpkg/parsehelp.c    |    5 ++-
+ lib/dpkg/trigdeferred.l |    4 +-
+ lib/dpkg/triglib.c      |    4 +-
+ lib/dpkg/varbuf.h       |    4 +-
+ src/archives.c          |   26 +++++++-------
+ src/configure.c         |   10 +++---
+ src/depcon.c            |   18 +++++-----
+ src/divertdb.c          |    4 +-
+ src/filesdb.c           |   10 +++---
+ src/help.c              |    4 +-
+ src/packages.c          |   12 +++---
+ src/processarc.c        |   18 +++++-----
+ src/querycmd.c          |    8 ++--
+ src/remove.c            |   28 +++++++-------
+ src/statcmd.c           |   12 +++---
+ src/statdb.c            |    4 +-
+ src/trigproc.c          |    2 +-
+ src/update.c            |    4 +-
+ 21 files changed, 146 insertions(+), 134 deletions(-)
+
+commit 064d5f21ab0a97538b9a3d85056dd0c77e46ffba
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 10 15:28:46 2011 +0100
+
+    libdpkg: Rename varbufaddc() to varbuf_add_char()
+    
+    Make the varbuf API a bit more consistent.
+
+ dpkg-deb/info.c           |    4 +-
+ dpkg-split/split.c        |    2 +-
+ lib/dpkg/dbmodify.c       |    4 +-
+ lib/dpkg/dump.c           |   60 +++++++++++++++++++++++++-------------------
+ lib/dpkg/fields.c         |    6 ++--
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/log.c            |    4 +-
+ lib/dpkg/parsehelp.c      |    4 +-
+ lib/dpkg/pkg-format.c     |    4 +-
+ lib/dpkg/test/t-varbuf.c  |   12 ++++----
+ lib/dpkg/trigdeferred.l   |    2 +-
+ lib/dpkg/triglib.c        |    4 +-
+ lib/dpkg/varbuf.c         |    2 +-
+ lib/dpkg/varbuf.h         |    6 ++--
+ src/archives.c            |   38 +++++++++++++++------------
+ src/configure.c           |   16 ++++++------
+ src/depcon.c              |    8 +++---
+ src/divertdb.c            |    2 +-
+ src/enquiry.c             |    2 +-
+ src/filesdb.c             |    4 +-
+ src/help.c                |    8 +++---
+ src/main.c                |    4 +-
+ src/packages.c            |    4 +-
+ src/processarc.c          |   22 ++++++++--------
+ src/querycmd.c            |   12 ++++----
+ src/remove.c              |   27 ++++++++++---------
+ src/select.c              |    8 +++---
+ src/statcmd.c             |    6 ++--
+ src/statdb.c              |    2 +-
+ src/trigproc.c            |    4 +-
+ src/update.c              |    2 +-
+ 31 files changed, 149 insertions(+), 136 deletions(-)
+
+commit 559d66ec3f4a649e65cc87dc6bea708c9289c1ff
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 10 15:12:42 2011 +0100
+
+    libdpkg: Rename varbufdupc() to varbuf_dup_char()
+    
+    Make the varbuf API a bit more consistent.
+
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/test/t-varbuf.c  |    8 ++++----
+ lib/dpkg/varbuf.c         |    2 +-
+ lib/dpkg/varbuf.h         |    2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+commit d5c59894cca3f776c68e499aaea1d697d2d1afd2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 10 15:07:46 2011 +0100
+
+    libdpkg: Rename varbufsubstc() to varbuf_map_char()
+    
+    Make the varbuf API a bit more consistent.
+
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/log.c            |    2 +-
+ lib/dpkg/test/t-varbuf.c  |    6 +++---
+ lib/dpkg/varbuf.c         |    2 +-
+ lib/dpkg/varbuf.h         |    2 +-
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 4ea08bff42040d7e1c623c393d00946ddd943557
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 10 14:56:56 2011 +0100
+
+    libdpkg: Rename varbufreset() to varbuf_reset()
+    
+    Make the varbuf API a bit more consistent.
+
+ dpkg-deb/build.c          |    6 +++---
+ dpkg-deb/info.c           |    2 +-
+ dpkg-split/split.c        |    8 ++++----
+ lib/dpkg/dbmodify.c       |    4 ++--
+ lib/dpkg/dump.c           |    2 +-
+ lib/dpkg/fields.c         |    6 +++---
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/log.c            |    4 ++--
+ lib/dpkg/parsehelp.c      |    2 +-
+ lib/dpkg/pkg-format.c     |    4 ++--
+ lib/dpkg/test/t-varbuf.c  |    4 ++--
+ lib/dpkg/trigdeferred.l   |    2 +-
+ lib/dpkg/triglib.c        |    4 ++--
+ lib/dpkg/varbuf.c         |    4 +++-
+ lib/dpkg/varbuf.h         |    2 +-
+ src/archives.c            |   14 +++++++-------
+ src/configure.c           |    8 ++++----
+ src/depcon.c              |    2 +-
+ src/divertcmd.c           |    4 ++--
+ src/divertdb.c            |    2 +-
+ src/enquiry.c             |    2 +-
+ src/filesdb.c             |    4 ++--
+ src/help.c                |    2 +-
+ src/main.c                |    2 +-
+ src/packages.c            |    2 +-
+ src/processarc.c          |    6 +++---
+ src/querycmd.c            |    4 ++--
+ src/remove.c              |   12 ++++++------
+ src/select.c              |    4 ++--
+ src/statdb.c              |    2 +-
+ src/trigproc.c            |    2 +-
+ 31 files changed, 65 insertions(+), 63 deletions(-)
+
+commit 496dc81c1fadbb57092cfd5e2b42ddb9201020ce
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 10 14:50:54 2011 +0100
+
+    libdpkg: Rename varbufinit() to varbuf_init()
+    
+    Make the varbuf API a bit more consistent.
+
+ lib/dpkg/dbmodify.c       |    2 +-
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/test/t-varbuf.c  |   22 +++++++++++-----------
+ lib/dpkg/varbuf.c         |    2 +-
+ lib/dpkg/varbuf.h         |   14 +++++++-------
+ src/querycmd.c            |    2 +-
+ 6 files changed, 22 insertions(+), 22 deletions(-)
+
+commit fdce08c3b923d3abb83768af2554743682486392
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Sat Jan 8 22:41:48 2011 +0100
+
+    Remove --enable-sync-sync codepath
+    
+    Using sync() on unpack causes _all_ filesystems to be sync'd, which is
+    not so great when one of those is a thumb drive, mounted over a network,
+    or otherwise slow. Remove the sync-instead-of-fsync codepath due to
+    those side-effects and to simplify maintenance.
+    
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ configure.ac     |    1 -
+ debian/changelog |    4 ++++
+ m4/dpkg-funcs.m4 |   28 ----------------------------
+ src/archives.c   |    8 --------
+ 4 files changed, 4 insertions(+), 37 deletions(-)
+
+commit dff89f3f2339b9ee4ac015004ae0dd7e573079f7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 8 22:16:17 2011 +0100
+
+    libdpkg: Add missing command_shell to version script
+
+ lib/dpkg/libdpkg.Versions |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 2561f28501fe5a497e05784c0237e797cd74666e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Aug 12 04:31:31 2010 +0200
+
+    dpkg: Fix -GEO options on multiple versions of the same package
+    
+    The options were not taking effect as they were only being applied to
+    installed packages, while the first stage usually implies unpacking
+    and then configuring in a later stage. Which implies having those
+    packages going from installed to unpacked, and then skipping any of
+    the checks requested by the user on subsequently processed packages.
+    
+    Closes: #31141
+
+ debian/changelog |    2 ++
+ src/archives.c   |    6 +++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 0c770cb2f1b823d6a0f29bfd52326ed7fcb07bd2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 8 15:34:43 2011 +0100
+
+    u-a: Removed unused ret variable from altdb_parse_error()
+
+ utils/update-alternatives.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 818f6647be26a8f339ab2682c8364fb447e5bc60
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 7 21:32:49 2011 +0100
+
+    build: Fail configure if curses is needed but no headers are present
+    
+    Reported-by: Raphael Geissert <geissert@debian.org>
+    Tested-by: Raphael Geissert <geissert@debian.org>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ m4/dpkg-libs.m4 |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+commit f568ae3f5ce9f2fc41abd372a828bb4026c6d0e3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jan 4 04:18:45 2011 +0100
+
+    dpkg-split: Reduce scope of variables
+
+ dpkg-split/join.c  |   12 +++++++-----
+ dpkg-split/queue.c |   28 +++++++++++++++++-----------
+ 2 files changed, 24 insertions(+), 16 deletions(-)
+
+commit 460284e19e1556ab312528fdf34be97ce575cf0d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jan 4 04:13:22 2011 +0100
+
+    dpkg-deb: Fix corrupt archive header magic error string
+    
+    The string was referring to the first header when the string refers to
+    any header parsed.
+
+ dpkg-deb/extract.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 942be7d09ffcdf2bbc5b5b8e391880704da86f7f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 3 20:43:47 2011 +0100
+
+    Remove unneeded <errno.h> include
+
+ dpkg-deb/main.c    |    1 -
+ dpkg-split/split.c |    1 -
+ lib/dpkg/buffer.c  |    1 -
+ lib/dpkg/mlib.c    |    1 -
+ 4 files changed, 0 insertions(+), 4 deletions(-)
+
+commit 7ee10fceb19acbea67a587800c9e972dbe87aab3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 3 15:44:11 2011 +0100
+
+    dpkg-deb: Refactor out pkg_get_pathname() from do_build()
+
+ dpkg-deb/build.c |   31 +++++++++++++++++++++----------
+ 1 files changed, 21 insertions(+), 10 deletions(-)
+
+commit 0d5ba1a79ee26dc74cd964f255ef62920f7f6e35
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 3 03:07:52 2011 +0100
+
+    dpkg-deb: Refactor check_new_pkg() out from do_build()
+
+ dpkg-deb/build.c |   79 +++++++++++++++++++++++++++++++----------------------
+ 1 files changed, 46 insertions(+), 33 deletions(-)
+
+commit f849410277803fb37e153d3fdaa1dd44da9c632b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 3 03:06:03 2011 +0100
+
+    dpkg-deb: Handle missing arch in varbufprintf() call inside do_build()
+
+ dpkg-deb/build.c |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+commit 8451065cf85cb8a17dcd17e0cd2ca1fdef7cb749
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 3 01:49:13 2011 +0100
+
+    Centralize warn counting in warningv()
+    
+    Add an accessor function to be able to replace the old warn counters
+    in the rest of the code.
+
+ dpkg-deb/build.c          |   19 +++++--------------
+ dpkg-deb/info.c           |    2 +-
+ lib/dpkg/dbmodify.c       |    6 +++---
+ lib/dpkg/dpkg-db.h        |    3 +--
+ lib/dpkg/ehandle.c        |    9 +++++++++
+ lib/dpkg/ehandle.h        |    1 +
+ lib/dpkg/libdpkg.Versions |    1 +
+ lib/dpkg/parse.c          |    6 +-----
+ lib/dpkg/parsedump.h      |    1 -
+ lib/dpkg/parsehelp.c      |    1 -
+ src/processarc.c          |    2 +-
+ src/update.c              |    4 ++--
+ 12 files changed, 25 insertions(+), 30 deletions(-)
+
+commit a63d8a8d16b4b3c1cb34f635dd15346ed2728444
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 2 18:53:09 2011 +0100
+
+    dpkg-deb: Use varbuf in file_info_get() instead of ad-hoc code
+
+ dpkg-deb/build.c |   37 +++++++++++++++----------------------
+ 1 files changed, 15 insertions(+), 22 deletions(-)
+
+commit 00fa8d0e6ffb777dea52f7e20a24bd9a7702e5f8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 2 14:30:23 2011 +0100
+
+    Use fdio functions instead of raw read()/write() calls
+    
+    This makes the call sites safe against interrupted I/O.
+
+ dpkg-deb/build.c    |    4 ++--
+ dpkg-deb/extract.c  |    7 ++++---
+ lib/dpkg/ar.c       |   11 ++++++-----
+ lib/dpkg/compress.c |    9 +++++----
+ 4 files changed, 17 insertions(+), 14 deletions(-)
+
+commit 5d74139fda1e4850c436765131b949232b54cc80
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 2 14:27:06 2011 +0100
+
+    Use fdio instead of ad-hoc code to handle interrupted I/O
+
+ dpkg-deb/build.c  |   10 ++++------
+ lib/dpkg/buffer.c |   36 ++++++++++++++----------------------
+ lib/dpkg/log.c    |   13 ++++---------
+ src/archives.c    |   29 ++++++-----------------------
+ 4 files changed, 28 insertions(+), 60 deletions(-)
+
+commit 44b4d950ba4beb443d4f718467e7baec14885bc0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 2 13:47:29 2011 +0100
+
+    libdpkg: Remove unused fd_buf_copy()
+    
+    This function is not really needed once we have fd_read(), it also
+    performs some slight unneeded work.
+
+ lib/dpkg/buffer.c |    4 ----
+ lib/dpkg/buffer.h |    4 ----
+ 2 files changed, 0 insertions(+), 8 deletions(-)
+
+commit 12f71d6df332c212fa86b7b2c11dbd43b19e37f1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 2 13:38:37 2011 +0100
+
+    Use fd_read() instead of fd_buf_copy()
+    
+    The latter is doing unneeded work. Switch to use a simpler but equally
+    functional variant.
+
+ lib/dpkg/parse.c |    5 +++--
+ src/filesdb.c    |    5 +++--
+ src/statdb.c     |    6 +++---
+ 3 files changed, 9 insertions(+), 7 deletions(-)
+
+commit 0053d6ef57593f98d92d0e37bb2b81c042669b67
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 2 04:56:51 2010 +0100
+
+    libdpkg: Add new fdio API
+
+ lib/dpkg/Makefile.am      |    2 +
+ lib/dpkg/fdio.c           |   77 +++++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/fdio.h           |   35 ++++++++++++++++++++
+ lib/dpkg/libdpkg.Versions |    2 +
+ 4 files changed, 116 insertions(+), 0 deletions(-)
+
+commit 5cb9ffc5f9b53691d23ca8e8347eccfa8f130071
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 2 01:39:16 2011 +0100
+
+    libdpkg: Merge errmsgbuf and errmsg
+    
+    There's no need anymore for the two distinct variables since ohshitvb
+    got removed in commit 7d1245eff85d74d872b6ee89f55c8466321e560c.
+
+ lib/dpkg/ehandle.c |   14 ++++----------
+ 1 files changed, 4 insertions(+), 10 deletions(-)
+
+commit 3c25a7b0a50fc25dbeea7a512459a01bb0672f32
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 1 03:58:58 2011 +0100
+
+    libdpkg: Initialize buffer_data variables on declaration in buffer_copy_TYPE
+
+ lib/dpkg/buffer.c |    8 ++------
+ 1 files changed, 2 insertions(+), 6 deletions(-)
+
+commit ee595ed38daa7b3ffba452296b7b070e82d8c939
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 1 03:51:40 2011 +0100
+
+    libdpkg: Call buffer_init() and buffer_done() from buffer_copy()
+
+ lib/dpkg/buffer.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 4e51e727e7d06eeda8ba7a8fc0fc4252d9bc875d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 1 03:47:05 2011 +0100
+
+    libdpkg: Remove buffer_copy_PtrPtr and buffer_copy_PtrInt functions
+    
+    Those were instantiated from the buffer_copy_TYPE macro, but not used
+    anymore.
+
+ lib/dpkg/buffer.c |    2 --
+ lib/dpkg/buffer.h |    6 ------
+ 2 files changed, 0 insertions(+), 8 deletions(-)
+
+commit 7b4de87652e11609c0797a334a0c43aac08d940e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 1 03:43:25 2011 +0100
+
+    libdpkg: Make all internal buffer functions static
+
+ lib/dpkg/buffer.c         |   12 ++++++------
+ lib/dpkg/buffer.h         |   12 +-----------
+ lib/dpkg/libdpkg.Versions |    5 -----
+ 3 files changed, 7 insertions(+), 22 deletions(-)
+
+commit 4e65a84d1e529541c686230086f56de4e2b2122c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 1 03:54:01 2011 +0100
+
+    libdpkg: Move buffer_copy_TYPE() and instantiations after buffer_copy()
+
+ lib/dpkg/buffer.c |   68 ++++++++++++++++++++++++++--------------------------
+ 1 files changed, 34 insertions(+), 34 deletions(-)
+
+commit 25fb807882427fa70afd2494ec844a96ba63337c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 16 05:09:35 2010 +0100
+
+    libdpkg: Add new DPKG_GCC_VERSION macro and use it
+    
+    Instead of doing several checks on the different GCC macros with the
+    version parts, merge them into this new macro and use simple integer
+    arithmetic to compare the versions.
+
+ lib/dpkg/macros.h |   13 +++++++++----
+ 1 files changed, 9 insertions(+), 4 deletions(-)
+
+commit 0ba66256fb3abbf208179952ec9f1282f76bbcae
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Dec 13 08:15:56 2010 +0100
+
+    build: Refactor common linker objects into LDADD
+
+ lib/dpkg/test/Makefile.am |   16 +---------------
+ src/Makefile.am           |   28 +++++-----------------------
+ 2 files changed, 6 insertions(+), 38 deletions(-)
+
+commit 581ce084ea6b26816de53b9580600beae05ce16c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 2 21:09:13 2010 +0100
+
+    dpkg: Do not check for presence of update-rc.d
+    
+    It's not really needed for dpkg correct operation.
+
+ debian/changelog |    2 ++
+ src/help.c       |    1 -
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 506dd27b56a570e019e90974ea285fe4fd2f8bf8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Dec 31 21:26:43 2010 +0100
+
+    dpkg-split: Do not slurp the entire part into memory when splitting
+    
+    The current code is slurping the entire part into memory, which works
+    fine when the partsize is small but might be unbearable when the
+    partsize is too big. Use fd_fd_copy() via dpkg_ar_member_put_file()
+    instead, which will guarantee small constant memory usage.
+
+ dpkg-split/split.c |   21 +++++++++------------
+ 1 files changed, 9 insertions(+), 12 deletions(-)
+
+commit d2b1ba546eda19271ada6daf1d0bcfee6b0dd9c9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Dec 31 20:43:44 2010 +0100
+
+    libdpkg: Use bool values for copy_dependency_links() call
+
+ lib/dpkg/parse.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1d779cecab2016047a433a5175764c0e2951ba9d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Dec 31 17:24:44 2010 +0100
+
+    dpkg-split: Do not pass partsize to mksplit() and compute it internally
+
+ dpkg-split/split.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 6bb0ab0608fdd2509a8d2b84cd75ae01fa5e64c5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Dec 31 20:43:09 2010 +0100
+
+    dpkg-split: Mark strings for translation
+    
+    Use plural support for one of them.
+
+ dpkg-split/split.c |   10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 97f0c0baee8fbb393781bc7024d80b8c08a87d25
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Dec 31 13:57:47 2010 +0100
+
+    libdpkg: Change dpkg_ar_member_put_file() to accept a size limit
+
+ dpkg-deb/build.c |    4 ++--
+ lib/dpkg/ar.c    |   17 ++++++++++-------
+ lib/dpkg/ar.h    |    2 +-
+ 3 files changed, 13 insertions(+), 10 deletions(-)
+
+commit 150be4c45af785a6374e2c7ecc90b0fdab054787
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Dec 31 12:43:21 2010 +0100
+
+    dpkg-split: Use number of parts to track split process
+    
+    Use the currently available variables instead of the additional useless
+    startat.
+
+ dpkg-split/split.c |    6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+commit 6a790ffc469be94173db8dc0f0ebee7e9c95e707
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Dec 31 12:42:31 2010 +0100
+
+    dpkg-split: Reduce variable scope in do_split()
+
+ dpkg-split/split.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 027c6e35be5cfb31cab3c3a286e2b4bc0763d161
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Dec 1 03:20:07 2010 +0100
+
+    Use dpkg_ar_member_get_size() instead of duplicated code
+
+ dpkg-deb/extract.c |   25 +------------------------
+ dpkg-split/info.c  |   20 ++------------------
+ 2 files changed, 3 insertions(+), 42 deletions(-)
+
+commit e36ca74003e44e44faacbb9c32d596d80a9387f9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Dec 1 03:19:31 2010 +0100
+
+    libdpkg: Add new dpkg_ar_member_get_size()
+
+ lib/dpkg/ar.c             |   25 +++++++++++++++++++++++++
+ lib/dpkg/ar.h             |    3 +++
+ lib/dpkg/libdpkg.Versions |    1 +
+ 3 files changed, 29 insertions(+), 0 deletions(-)
+
+commit 3be2cf607868adb9a2c0e5af06f20168a072eeb6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 29 13:29:17 2010 +0100
+
+    libdpkg: Refactor common code into parse_error_msg()
+    
+    This moves all the buffer size knowledge to the same function, and
+    easily allows to fix possible buffer overflows in case fmt is longer
+    than the destination buffer. It also nicely reduces slightly the
+    duplicated code.
+
+ lib/dpkg/parsehelp.c |   33 +++++++++++++++------------------
+ 1 files changed, 15 insertions(+), 18 deletions(-)
+
+commit ec97f0a8ff3bf88418dc452e5df8425b86957f9a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 29 11:41:06 2010 +0100
+
+    libdpkg: Use warningv() in parse_warn() instead of open coding it
+    
+    Generalize and unify parse_error_msg() error message and stop passing
+    the type of error to it. Now that ohshit() will print "error" we don't
+    need to print it again here.
+
+ lib/dpkg/parsehelp.c |   18 ++++++++----------
+ 1 files changed, 8 insertions(+), 10 deletions(-)
+
+commit f428f6f616de9ff659730dc646aada51b7bd1f8c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 29 09:39:13 2010 +0100
+
+    libdpkg: Always prefix "error" to fatal error message output
+
+ debian/changelog   |    1 +
+ lib/dpkg/ehandle.c |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 6857c9064b75e7ef2aabdb45b4e55a8b2f2de91a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 27 12:35:46 2010 +0100
+
+    Changelog police
+    
+    Typo fixes.
+
+ debian/changelog |   67 ++++++++++++++++++++++++++---------------------------
+ 1 files changed, 33 insertions(+), 34 deletions(-)
+
+commit cf316979dec20696ee57d5a6f8a469a12758f54d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 27 12:32:36 2010 +0100
+
+    man: Quote dashes for correct output
+
+ man/deb-control.5     |   26 ++++++++--------
+ man/deb-src-control.5 |   78 ++++++++++++++++++++++++------------------------
+ 2 files changed, 52 insertions(+), 52 deletions(-)
+
+commit 95bb77ebc2c420a6788a147983010560c6606303
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 27 11:57:23 2010 +0100
+
+    Clarify and simplify strings to help translators
+    
+    Closes: #604914
+    
+    Suggested-by: Andrei Popescu <andreimpopescu@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog     |    1 +
+ lib/dpkg/ehandle.c   |    2 +-
+ lib/dpkg/parsehelp.c |    3 ++-
+ src/help.c           |   11 +++++------
+ 4 files changed, 9 insertions(+), 8 deletions(-)
+
+commit 3fa386596dcdf3711e79fc2aedd124691bc69e45
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 27 11:56:17 2010 +0100
+
+    libdpkg: Unmark debug message for translation
+    
+    Reported-by: Andrei Popescu <andreimpopescu@gmail.com>
+
+ lib/dpkg/database.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 7ab4b0ce3912e34620760f02242ebf80bc0dafff
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 27 09:56:19 2010 +0100
+
+    Make short strings unique by using gettext context support
+    
+    Reported-by: Andrei Popescu <andreimpopescu@gmail.com>
+
+ lib/dpkg/parsehelp.c |    3 ++-
+ src/enquiry.c        |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 63e047b9c2f652290f6e697ac31266a8488491e7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 27 08:42:56 2010 +0100
+
+    Add gettext context infrastructure support
+
+ lib/dpkg/i18n.h |    1 +
+ po/Makevars     |    3 ++-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit f5d6106db5c8110f6e0b0a736099e705b3c43eee
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 26 07:51:43 2010 +0100
+
+    dpkg-deb: Move setcompresstype() before cmdinfos
+    
+    This unifies the style with the rest of the code base, and avoids the
+    need for a declaration of a static function.
+
+ dpkg-deb/main.c |   16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+commit 0cabc7648dca136fd4ee19c1157d89e7670dfbc3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 26 07:47:00 2010 +0100
+
+    dpkg-deb: Move known_arbitrary_field() closer to do_build()
+
+ dpkg-deb/build.c |   56 +++++++++++++++++++++++++++---------------------------
+ 1 files changed, 28 insertions(+), 28 deletions(-)
+
+commit bebb0f3a0ac4fd4990585363c4af2bceafcf1ebd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 2 20:44:36 2011 +0100
+
+    dpkg-deb: Use varbuf to generate package file name in do_build()
+
+ dpkg-deb/build.c |   10 ++++------
+ 1 files changed, 4 insertions(+), 6 deletions(-)
+
+commit 5ed471f8bc8aaf8faee6b04e4177451fa2d3cd52
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 2 20:11:34 2011 +0100
+
+    dpkg-deb: Count one missing warning() for the total amount reported
+
+ debian/changelog |    1 +
+ dpkg-deb/build.c |    5 +++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 167fc193f41e65f4cac84432e7114ea2b66a5ccb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 26 07:30:32 2010 +0100
+
+    dpkg-deb: Rename getfi() into file_info_get()
+
+ dpkg-deb/build.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 26a90f1d068bc30af5ddcd1ab265d7090c6c9509
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 26 07:29:01 2010 +0100
+
+    dpkg-deb: Rename free_filist() to file_info_list_free()
+
+ dpkg-deb/build.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit a0c16300d391f3ee91d6bc37b3031f562338f998
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 26 07:29:01 2010 +0100
+
+    dpkg-deb: Rename add_to_filist() to file_info_list_append()
+
+ dpkg-deb/build.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 2998b32eaf8d560cafdc45a66a183f3697bfeaf6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 26 07:27:50 2010 +0100
+
+    dpkg-deb: Rename add_to_filist() arguments to head/tail
+    
+    This normalized them with the rest of the codebase.
+
+ dpkg-deb/build.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 291c19900153dbae4417b67d4077d7f7b1b25435
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 26 07:16:43 2010 +0100
+
+    dpkg-deb: Remove redundant debar check and reduce code scope
+
+ dpkg-deb/build.c |   17 ++++++++---------
+ 1 files changed, 8 insertions(+), 9 deletions(-)
+
+commit f17d95da9d3b23362bf0d97b9ff40f5d5ec3971e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 26 06:50:37 2010 +0100
+
+    dpkg-deb: Refactor check_conffiles() out from do_build()
+
+ dpkg-deb/build.c |  136 +++++++++++++++++++++++++++++++----------------------
+ 1 files changed, 79 insertions(+), 57 deletions(-)
+
+commit 855bdfb4fe44e851ad036627f2d8702e3e0dcb0c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 26 06:35:19 2010 +0100
+
+    dpkg-deb: Refactor check_file_perms() out from do_build()
+
+ dpkg-deb/build.c |   82 +++++++++++++++++++++++++++++++++---------------------
+ 1 files changed, 50 insertions(+), 32 deletions(-)
+
+commit af34a9cc062756207f275dbbb5ec16896ba311b7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 26 07:45:06 2010 +0100
+
+    dpkg-deb: Rename checkedinfo to pkg in do_build()
+
+ dpkg-deb/build.c |   27 ++++++++++++++-------------
+ 1 files changed, 14 insertions(+), 13 deletions(-)
+
+commit 0dd72f1b7a6a0835bc0212d019c2a01761e041fb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 2 19:19:10 2011 +0100
+
+    dpkg-deb: Use a varbuf instead of a fixed size buffer in do_build()
+    
+    The allocated buffer has a fixes size, which could pose problems if for
+    whatever reason some of the components increase size.
+
+ dpkg-deb/build.c |   43 ++++++++++++++++++-------------------------
+ 1 files changed, 18 insertions(+), 25 deletions(-)
+
+commit 06f0675ffa2f84a2661a312194feefdeb3841ec0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jan 5 09:44:37 2011 +0100
+
+    Rename directory variables to just dir
+    
+    The shorter form is unambiguous and takes less screen size.
+
+ dpkg-deb/build.c    |   33 ++++++++++++++-----------
+ dpkg-deb/dpkg-deb.h |    2 +-
+ dpkg-deb/extract.c  |   26 ++++++++++++-------
+ dpkg-deb/info.c     |   66 +++++++++++++++++++++++++++-----------------------
+ src/archives.c      |   14 +++++-----
+ 5 files changed, 78 insertions(+), 63 deletions(-)
+
+commit 0b67f8d1d540e3cd52d7849b767ed1a9bae02368
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 26 06:24:49 2010 +0100
+
+    dpkg-deb: Reduce scope of variables in do_build()
+
+ dpkg-deb/build.c |   43 ++++++++++++++++++++++++++++++-------------
+ 1 files changed, 30 insertions(+), 13 deletions(-)
+
+commit 797115468511551b08b8fd79a9d787dc17fba9fe
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 25 23:18:58 2010 +0100
+
+    libdpkg: Install header file ehandle.h
+    
+    Missed in commit 6e5d5c1f05edbe0ce2213a6658b438668fe48cba.
+
+ lib/dpkg/Makefile.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit f9ed41c4f61d2b037a0faca08a40581c1bc385b1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 25 01:23:07 2010 +0100
+
+    dpkg-query: Refactor --list header printing into list_format_print_header()
+
+ src/querycmd.c |   75 +++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 42 insertions(+), 33 deletions(-)
+
+commit dba35578a11b7fd887fda28d22083e61047ac1d2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 25 00:36:27 2010 +0100
+
+    dpkg-query: Refactor --list format creation into new list_format_init()
+
+ src/querycmd.c |  120 +++++++++++++++++++++++++++++++++----------------------
+ 1 files changed, 72 insertions(+), 48 deletions(-)
+
+commit 49f8bd789eca3a3b7c8d57974070d4e4d055b42d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Nov 24 03:06:53 2010 +0100
+
+    s-s-d: Rename do_help() to usage()
+
+ utils/start-stop-daemon.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit df7dabd95adfee2e07e70b6bc60c216ccba0d272
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 23 23:15:47 2010 +0100
+
+    s-s-d: Rename clear() to pid_list_free()
+
+ utils/start-stop-daemon.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit db56c2bba99f22c879bbbffb4b020f418f508f8f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 23 23:15:33 2010 +0100
+
+    s-s-d: Rename push() to pid_list_push()
+
+ utils/start-stop-daemon.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 8a2f4f6866790b5ae9e8931dccb19c10b274397e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 23 23:05:04 2010 +0100
+
+    s-s-d: Rename check() to pid_check()
+
+ utils/start-stop-daemon.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 886d2911bdb2253a5a331d109f15fd8bd9d4027a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 23 22:38:16 2010 +0100
+
+    s-s-d: Remove static function declarations
+
+ utils/start-stop-daemon.c |   14 --------------
+ 1 files changed, 0 insertions(+), 14 deletions(-)
+
+commit f53151c5c738b0902815ad3cdeae35005797f099
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 23 22:31:01 2010 +0100
+
+    s-s-d: Make only sched_goto use goto instead of the other enum values
+    
+    This makes sched_goto usage more obvious, makes the for more natural,
+    and removes one instance of goto usage.
+
+ utils/start-stop-daemon.c |   12 +++++-------
+ 1 files changed, 5 insertions(+), 7 deletions(-)
+
+commit e611924c3e2ca6e13e6c50fab6e01da24045c129
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 23 04:21:03 2010 +0100
+
+    s-s-d: Refactor finish code into new finish_stop_schedule()
+    
+    This removes an unneeded and ugly goto, and replaces with a proper
+    funciton.
+
+ utils/start-stop-daemon.c |   27 +++++++++++++++------------
+ 1 files changed, 15 insertions(+), 12 deletions(-)
+
+commit 6b04265c74633e42addd63bcf30763545b643ecf
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Jan 7 21:55:59 2011 +0100
+
+    Update German scripts translation
+    
+    Update to 513t
+
+ scripts/po/de.po |  283 ++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 146 insertions(+), 137 deletions(-)
+
+commit 2df6e3351f79c96c80f5869499a5cb4d59f2943f
+Merge: 930bb77 1d872bf
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jan 6 21:59:44 2011 +0100
+
+    Merge commit '1.15.8.8'
+
+commit 1d872bf8ed2a7976c901aff20bf2bd6c20660f65
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jan 6 21:04:53 2011 +0100
+
+    Release 1.15.8.8
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 00aa1a86493e4160ac98d65b32ff7d0b64ff6e37
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jan 3 10:01:37 2011 +0100
+
+    Fix multiple security issues with dpkg-source (CVE-2010-1679)
+    
+    - Enhance checks to catch maliciously crafted patches which could modify
+      files outside of the unpacked source package.
+    - Do not consider a top-level symlink like a directory when
+      extracting a tarball.
+    - Exclude .pc while extracting the upstream tarball in 3.0 (quilt)
+      as patch blindly writes in that directory during unpack (and would
+      follow any existing symlink).
+
+ debian/changelog                  |   12 ++++-
+ scripts/Dpkg/Source/Archive.pm    |    2 +-
+ scripts/Dpkg/Source/Package/V2.pm |    7 ++-
+ scripts/Dpkg/Source/Patch.pm      |   98 ++++++++++++++++++++++++-------------
+ 4 files changed, 81 insertions(+), 38 deletions(-)
+
+commit e70589e47f27d179dc01412e37bd8e0b9e76227d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 3 21:25:18 2011 +0100
+
+    dpkg-split: Truncate the output file when splitting a package
+    
+    Use creat() instead of open() with the missing O_TRUNC.
+    
+    Regression introduced in f2115151c19ff37b305296c23225807b0832086b.
+
+ debian/changelog   |    4 ++++
+ dpkg-split/split.c |    2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 930bb774c5aeb2a2a083deb7b92432a7b7ab9a35
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jan 3 10:33:28 2011 +0100
+
+    Dpkg::Source::Package::V1.pm: correctly detect debian files
+    
+    The code was erroneously assuming that $newdirectory was always
+    a simple filename, but it can be a complete path.
+
+ debian/changelog                  |    3 +++
+ scripts/Dpkg/Source/Package/V1.pm |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit a66c05098e9f05d008e225c7cbc3479d37b0f91f
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Mon Dec 20 07:13:28 2010 +0100
+
+    Fix two typos in French manpages translation
+
+ debian/changelog |    8 ++++++++
+ man/po/fr.po     |    4 ++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+commit 85fce47c813230e0d9b51826adb479f1f519df6c
+Merge: 300c089 8edabd2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Dec 20 03:30:55 2010 +0100
+
+    Merge branch 'sid' (through tag '1.15.8.7')
+    
+    Conflicts:
+    	debian/changelog
+    	dselect/po/es.po
+    	po/es.po
+    	po/pt.po
+    	scripts/po/es.po
+    	src/archives.c
+
+commit 8edabd23157612c5b9dab88983b34166ea6fb902
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Dec 20 02:26:36 2010 +0100
+
+    Release 1.15.8.7
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 050765e9968cfedbf90b9c5660b2ca812a77b55d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Dec 20 02:31:20 2010 +0100
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |    2 +-
+ dselect/po/ca.po        |    2 +-
+ dselect/po/cs.po        |    2 +-
+ dselect/po/da.po        |    2 +-
+ dselect/po/de.po        |    2 +-
+ dselect/po/dselect.pot  |    4 +-
+ dselect/po/el.po        |    2 +-
+ dselect/po/es.po        |    2 +-
+ dselect/po/et.po        |    2 +-
+ dselect/po/eu.po        |    2 +-
+ dselect/po/fr.po        |    2 +-
+ dselect/po/gl.po        |    2 +-
+ dselect/po/hu.po        |    2 +-
+ dselect/po/id.po        |    2 +-
+ dselect/po/it.po        |    2 +-
+ dselect/po/ja.po        |    2 +-
+ dselect/po/ko.po        |    2 +-
+ dselect/po/nb.po        |    2 +-
+ dselect/po/nl.po        |    2 +-
+ dselect/po/nn.po        |    2 +-
+ dselect/po/pl.po        |    2 +-
+ dselect/po/pt.po        |    2 +-
+ dselect/po/pt_BR.po     |    2 +-
+ dselect/po/ro.po        |    2 +-
+ dselect/po/ru.po        |    2 +-
+ dselect/po/sk.po        |    2 +-
+ dselect/po/sv.po        |    2 +-
+ dselect/po/tl.po        |    2 +-
+ dselect/po/vi.po        |    2 +-
+ dselect/po/zh_CN.po     |    2 +-
+ dselect/po/zh_TW.po     |    2 +-
+ man/po/dpkg-man.pot     |    2 +-
+ man/po/fr.po            |  240 +++++++++++++++++---------
+ man/po/sv.po            |   25 ++--
+ po/ast.po               |  142 ++++++++--------
+ po/bs.po                |  142 ++++++++--------
+ po/ca.po                |  145 ++++++++--------
+ po/cs.po                |  142 ++++++++--------
+ po/da.po                |  142 ++++++++--------
+ po/de.po                |  142 ++++++++--------
+ po/dpkg.pot             |  144 ++++++++--------
+ po/dz.po                |  142 ++++++++--------
+ po/el.po                |  142 ++++++++--------
+ po/eo.po                |    2 +-
+ po/es.po                |  446 ++++++++++++++++++++++++++++++-----------------
+ po/et.po                |  142 ++++++++--------
+ po/eu.po                |  280 +++++++++++++++++------------
+ po/fr.po                |  185 ++++++++------------
+ po/gl.po                |  142 ++++++++--------
+ po/hu.po                |  142 ++++++++--------
+ po/id.po                |  142 ++++++++--------
+ po/it.po                |  142 ++++++++--------
+ po/ja.po                |  157 +++++++++--------
+ po/km.po                |  142 ++++++++--------
+ po/ko.po                |  142 ++++++++--------
+ po/ku.po                |  142 ++++++++--------
+ po/lt.po                |  142 ++++++++--------
+ po/mr.po                |  142 ++++++++--------
+ po/nb.po                |  142 ++++++++--------
+ po/ne.po                |  142 ++++++++--------
+ po/nl.po                |  142 ++++++++--------
+ po/nn.po                |  142 ++++++++--------
+ po/pa.po                |  142 ++++++++--------
+ po/pl.po                |  142 ++++++++--------
+ po/pt.po                |  142 ++++++++--------
+ po/pt_BR.po             |  142 ++++++++--------
+ po/ro.po                |  142 ++++++++--------
+ po/ru.po                |  150 ++++++++--------
+ po/sk.po                |  142 ++++++++--------
+ po/sv.po                |  142 ++++++++--------
+ po/th.po                |  142 ++++++++--------
+ po/tl.po                |  142 ++++++++--------
+ po/vi.po                |  142 ++++++++--------
+ po/zh_CN.po             |  142 ++++++++--------
+ po/zh_TW.po             |  142 ++++++++--------
+ scripts/po/ca.po        |    2 +-
+ scripts/po/de.po        |    4 +-
+ scripts/po/dpkg-dev.pot |    4 +-
+ scripts/po/es.po        |   11 +-
+ scripts/po/fr.po        |    2 +-
+ scripts/po/pl.po        |    2 +-
+ scripts/po/ru.po        |    2 +-
+ scripts/po/sv.po        |    2 +-
+ 83 files changed, 3384 insertions(+), 3171 deletions(-)
+
+commit a196b9489fcecb75c3cc7add9f1273966697b419
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Dec 20 02:22:51 2010 +0100
+
+    Fix Spanish scripts translation
+    
+    Split two accidentally merged lines.
+
+ scripts/po/es.po |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit d744e244588451c75fe24e2f784601901f459d6d
+Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
+Date:   Mon Dec 20 01:56:57 2010 +0100
+
+    Update Thai dpkg translation
+    
+    Closes: #607501
+
+ debian/changelog |    1 +
+ po/th.po         |  111 +++++++++---------------------------------------------
+ 2 files changed, 19 insertions(+), 93 deletions(-)
+
+commit 39c27014d0537ca667d6a83b10c4236e7878d840
+Author: Felipe E. F. de Castro <fefcas@gmail.com>
+Date:   Mon Dec 20 01:52:13 2010 +0100
+
+    Update Esperanto dpkg translation
+    
+    Closes: #607437
+
+ debian/changelog |    1 +
+ po/eo.po         |  277 +++++++++++++++++++++++-------------------------------
+ 2 files changed, 119 insertions(+), 159 deletions(-)
+
+commit 660fc389c566623a1ff5de37c1d91e7832048d10
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Dec 18 18:15:16 2010 +0100
+
+    Improve fix after disussion with Sven Joachim (now more consistent even)
+
+ scripts/po/de.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ffdc8c88d7006170ac67fd44ee3ca2222dd2fb69
+Author: Aron Xu <happyaron.xu@gmail.com>
+Date:   Sat Dec 18 02:30:31 2010 +0100
+
+    Update Simplified Chinese dpkg translation
+
+ debian/changelog |    1 +
+ po/zh_CN.po      | 3358 +++++++-----------------------------------------------
+ 2 files changed, 412 insertions(+), 2947 deletions(-)
+
+commit 6a3da3db1a15a771229951bec5e7389ade5e2098
+Author: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>
+Date:   Sat Dec 18 00:06:08 2010 +0100
+
+    Update Norwegian Bokmål dpkg translation
+
+ debian/changelog |    1 +
+ po/nb.po         |   56 ++++++-----------------------------------------------
+ 2 files changed, 8 insertions(+), 49 deletions(-)
+
+commit f70ae2a8116d1e1657ba08e34508d4dff6020d18
+Author: Milo Casagrande <milo@ubuntu.com>
+Date:   Fri Dec 17 00:05:14 2010 +0100
+
+    Update Italian dpkg translation
+    
+    Closes: #607306
+
+ debian/changelog |    1 +
+ po/it.po         |   50 +++++---------------------------------------------
+ 2 files changed, 6 insertions(+), 45 deletions(-)
+
+commit b6be0c4f0dac7fdb8b138026a13527e11afd8e4d
+Author: Ivan Masár <helix84@centrum.sk>
+Date:   Thu Dec 16 22:25:50 2010 +0100
+
+    Update Slovak dpkg translation
+    
+    Closes: #607302
+
+ debian/changelog |    1 +
+ po/sk.po         |   48 +++---------------------------------------------
+ 2 files changed, 4 insertions(+), 45 deletions(-)
+
+commit 097d36dc6ca36dbf1ce2ee62fde1d9c353fce5cf
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 16 22:22:28 2010 +0100
+
+    Fix encoding of X-POFile-SpellExtra field in Spanish translations
+
+ dselect/po/es.po |    2 +-
+ po/es.po         |   12 ++++++------
+ scripts/po/es.po |    2 +-
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+commit 878dab712fafd8f050b24c5085dd6ad6d561c017
+Author: Yuri Kozlov <yuray@komyakino.ru>
+Date:   Thu Dec 16 20:55:49 2010 +0100
+
+    Update Russian dpkg translation
+    
+    Closes: #607292
+
+ debian/changelog |    1 +
+ po/ru.po         |   72 ++++++++++++-----------------------------------------
+ 2 files changed, 18 insertions(+), 55 deletions(-)
+
+commit 6719cdfa47de6fefc5d412c5b1dbdaaf0a4f4e14
+Author: Kenshi Muto <kmuto@debian.org>
+Date:   Thu Dec 16 19:30:08 2010 +0100
+
+    Update Japanese dpkg translation
+    
+    Closes: #607259
+
+ debian/changelog |    1 +
+ po/ja.po         |   67 ++++++++---------------------------------------------
+ 2 files changed, 11 insertions(+), 57 deletions(-)
+
+commit 24e0c98cc2f1668cd685a1101e1dda2bc89b21bd
+Author: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>
+Date:   Thu Dec 16 19:25:50 2010 +0100
+
+    Update Basque dpkg translation
+    
+    Closes: #607253
+
+ debian/changelog |    1 +
+ po/eu.po         |  192 +++++++++++++++---------------------------------------
+ 2 files changed, 53 insertions(+), 140 deletions(-)
+
+commit 7fe7bce38ac93977a0069402ff51af0276dc3f70
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Wed Dec 15 20:26:42 2010 +0100
+
+    Fix a translation error in the German scripts translation
+
+ debian/changelog |    1 +
+ scripts/po/de.po |    4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 57dae739dafc03dd63e546188bb106deeb799780
+Author: Omar Campagne <ocampagne@gmail.com>
+Date:   Wed Dec 15 20:20:15 2010 +0100
+
+    Update Spanish translation of manual pages
+    
+    Update to 1940t.
+
+ debian/changelog |    1 +
+ man/po/es.po     |   24 +++++++++++++++++++-----
+ 2 files changed, 20 insertions(+), 5 deletions(-)
+
+commit 61e2d9af2c4ad15a3b13e1bf2f93a9a90a076dc1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Dec 10 13:11:31 2010 +0100
+
+    Changelog police
+
+ debian/changelog |   16 +++++++---------
+ 1 files changed, 7 insertions(+), 9 deletions(-)
+
+commit 888c346186673b6e637f34ee47b9a0137d64b812
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Dec 10 01:21:02 2010 +0100
+
+    dpkg-query: Fix stanza delimiting on -L, -s and -p output
+    
+    The code was only printing a delimiting new line on the second to last
+    stanza. Invert the logic and do it always except on the last one.
+    
+    Closes: #606315
+
+ debian/changelog |    2 ++
+ src/querycmd.c   |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 8e7f545a9d42a02cea521399da52932774926231
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Dec 10 01:59:55 2010 +0100
+
+    dpkg: On non-Linux use fadvise(FADV_DONTNEED) to initiate writeback
+    
+    Use the posix_fadvise(POSIX_FADV_DONTNEED) hint to notify the kernel
+    dpkg does not need the unpacked files any longer and as such it can
+    start writeback asynchronously.
+    
+    Although POSIX does not explicitly say so, and this is merely a hint,
+    this is the only sensible thing to do for the kernel. On Linux at least
+    it also evicts the pages if they are not currently under writeback,
+    locked or dirty, which might be undesired if a maintainer script has
+    to use the data, but unlikely as the writeback will still be ongoing
+    if it started at all.
+    
+    In addition it could be argued the Linux implementation is not optimal
+    as the standard talks about the application not needing the data any
+    longer, not the system. So it seems the NetBSD implementation which
+    just marks the pages as not active would be more correct.
+
+ debian/changelog |    3 +++
+ src/archives.c   |    2 ++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 2921e80c2f7645f66a197c5265cdadae58142672
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Dec 8 06:44:00 2010 +0100
+
+    dpkg: On Linux finish writeback before fsync
+    
+    The second sync_file_range() call, with the operation
+    SYNC_FILE_RANGE_WAIT_BEFORE, will block until the previously
+    initiated writeback has completed.
+    
+    We finish the writeback for all files before calling fsync. This
+    basically ensures that the delayed allocation has been resolved;
+    that is, the data blocks have been allocated and written, and the
+    inode updated (in memory), but not necessarily pushed out to disk.
+    So that later fsync can become no-ops, minimizing the number of
+    (costly) jbd2 commits.
+    
+    Suggested-by: Ted Ts'o <tytso@mit.edu>
+    Based-on-patch-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ src/archives.c |   36 ++++++++++++++++++++++++++++++++++++
+ 1 files changed, 36 insertions(+), 0 deletions(-)
+
+commit 203c99b0dda40159d824944e407a2f720f1088ed
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Dec 8 06:29:07 2010 +0100
+
+    dpkg: On Linux initiate writeback of unpacked files ASAP
+    
+    To avoid performance degradation on filesystems with "allocate on
+    flush" semantics (like xfs, ubifs, hfs+, and ext4 without nodelalloc),
+    start writing back each file once it has finished being extracted.
+    This doesn't actually wait for the write to finish; it just starts
+    the writeback.
+    
+    The sync_file_range() call has been available since Linux 2.6.17.
+    On non-Linux systems we can skip it.
+    
+    Closes: #605009
+    
+    Suggested-by: Ted Ts'o <tytso@mit.edu>
+    Based-on-patch-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog |    3 +++
+ src/archives.c   |   11 +++++++++++
+ 2 files changed, 14 insertions(+), 0 deletions(-)
+
+commit a766f501f6da46aca070c315e6429e163d188202
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Dec 1 04:28:45 2010 +0100
+
+    dpkg: Defer symlink renames to avoid ending up with broken symlinks
+    
+    The broken symlinks are particularly pernicious as they imply a shared
+    library SONAME path might point to nowhere and thus applications will
+    fail to get dynamically linked.
+    
+    Deferring symlinks is safe as they are always at the end of the tar
+    archive, and they are processed last on deferred renames as they are
+    appended at the end of the new list files.
+    
+    Closes: #605536
+
+ debian/changelog |    5 +++++
+ src/archives.c   |    2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 2e764078cc3bc75dc7426678377bb1c12ea00ba1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Dec 1 04:37:32 2010 +0100
+
+    Update Catalan program translation
+
+ debian/changelog |    1 +
+ po/ca.po         |   46 ++--------------------------------------------
+ 2 files changed, 3 insertions(+), 44 deletions(-)
+
+commit 725933d6f73d7d749c46778cff1cbb7416431a4b
+Author: Javier Fernandez-Sanguino <jfs@debian.org>
+Date:   Fri Dec 10 01:34:43 2010 +0100
+
+    Updated all Spanish translations to sync with master.
+    
+    Translations are now at 100%
+
+ debian/changelog |    6 +
+ dselect/po/es.po |  548 +++++++++++++++++++++++++++++-------------------------
+ scripts/po/es.po |   44 ++++-
+ 3 files changed, 332 insertions(+), 266 deletions(-)
+
+commit 7c27d584603d6cda82d668f0da1fb64201e456d7
+Author: Javier Fernandez-Sanguino <jfs@debian.org>
+Date:   Fri Dec 10 01:27:36 2010 +0100
+
+    Updated Spanish translation
+    
+    Uptated to 985t from master branch with typo fixes included.
+
+ debian/changelog |    1 +
+ po/es.po         | 1643 +++++++++++++++++++++++-------------------------------
+ 2 files changed, 690 insertions(+), 954 deletions(-)
+
+commit 300c089c3e178420915c9805ae73d2b99e25cfcc
+Author: Javier Fernandez-Sanguino <jfs@debian.org>
+Date:   Fri Dec 10 01:26:46 2010 +0100
+
+    Fix typos in PO file
+
+ po/es.po |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 5e702366cba8c98a456740dbb97238b511eec26d
+Merge: 0e238b8 f3fa58a
+Author: Javier Fernandez-Sanguino <jfs@debian.org>
+Date:   Fri Dec 10 01:20:59 2010 +0100
+
+    Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
+
+commit 0e238b8e0281270a3d12bec69450f728af6f3dbf
+Author: Javier Fernandez-Sanguino <jfs@debian.org>
+Date:   Fri Dec 10 01:20:32 2010 +0100
+
+    Fix typo
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2ba06ea3e29c913ac4f9649b9561cfb1a692a35c
+Author: Javier Fernandez-Sanguino <jfs@debian.org>
+Date:   Fri Dec 10 01:19:17 2010 +0100
+
+    Fix typos in translation format strings
+
+ po/es.po |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit f3fa58a3317e3456bcfb490aae66fa4371949fae
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Dec 9 16:13:42 2010 +0100
+
+    dpkg-shlibdeps: print the error note about missing libraries only once
+    
+    With the previous change, dpkg-shlibdeps can now print the error about
+    missing library multiple times. It makes no sense to print the associated
+    note multiple times. Instead it should be printed once at the end.
+
+ scripts/dpkg-shlibdeps.pl |   11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 4105379e2532d68579cfb1d95eb49205414507db
+Author: Chris Baines <cbaines8@gmail.com>
+Date:   Thu Dec 9 15:58:48 2010 +0100
+
+    dpkg-shlibdeps: do not fail immediatly when a library is not found
+    
+    Instead continue and fail after all problems have been reported.
+
+ debian/changelog          |    3 +++
+ scripts/dpkg-shlibdeps.pl |   13 ++++++++++++-
+ 2 files changed, 15 insertions(+), 1 deletions(-)
+
+commit b67f29d946683dfdbddf1fffb1aef550a3260fb8
+Author: Javier Fernandez-Sanguino <jfs@debian.org>
+Date:   Thu Dec 9 02:50:14 2010 +0100
+
+    Typo fix
+
+ po/es.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 76385c55207bb6a0ddb4e8ff3727a0e8e0cddbcd
+Author: Javier Fernandez-Sanguino <jfs@debian.org>
+Date:   Thu Dec 9 02:35:56 2010 +0100
+
+    Review translation and fix some typos. Also added PO4spell check headers.
+
+ scripts/po/es.po |   44 +++++++++++++++++++++++++++++++++-----------
+ 1 files changed, 33 insertions(+), 11 deletions(-)
+
+commit c58875d365ab10cefe6cf83de9e792a19c1201e2
+Author: Javier Fernandez-Sanguino <jfs@debian.org>
+Date:   Thu Dec 9 02:26:38 2010 +0100
+
+    Updated Spanish translation for dselect
+    
+    Update to 227t, convert to UTF-8, spell check headers and typos fixed.
+
+ debian/changelog |    4 +
+ dselect/po/es.po |  548 +++++++++++++++++++++++++++++-------------------------
+ 2 files changed, 297 insertions(+), 255 deletions(-)
+
+commit 48a74f34f5aa54f2506795e8a30fe6a9c50354fd
+Author: Javier Fernandez-Sanguino <jfs@debian.org>
+Date:   Thu Dec 9 02:17:17 2010 +0100
+
+    Include changes introduced to Spanish translation
+
+ debian/changelog |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 553549620ee08e704f8488d6dd4af947f812b093
+Author: Javier Fernandez-Sanguino Pen~a <jfs@javifsp.no-ip.org>
+Date:   Thu Dec 9 02:12:42 2010 +0100
+
+    Updated Spanish translation
+
+ po/es.po | 1638 ++++++++++++++++++++++++++------------------------------------
+ 1 files changed, 686 insertions(+), 952 deletions(-)
+
+commit 89d63574bd3455efe14f1388f3c1532e6c6130d1
+Author: Miguel Figueiredo <elmig@debianpt.org>
+Date:   Wed Dec 1 07:03:03 2010 +0100
+
+    Portuguese translation update. 985t
+
+ debian/changelog |    1 +
+ po/pt.po         |   56 ++++++-----------------------------------------------
+ 2 files changed, 8 insertions(+), 49 deletions(-)
+
+commit 252f5e0561120d8b6d7bb55a9fc30a004d45a566
+Author: Miguel Figueiredo <elmig@eeepc.debian>
+Date:   Tue Nov 30 20:14:42 2010 +0000
+
+    Update Portuguese translation of program
+    
+    Update to 985t
+
+ debian/changelog |    1 +
+ po/pt.po         |   17 ++++++++---------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+commit c627cec00d90d14289ca523308455ce6607d57bc
+Author: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>
+Date:   Sun Nov 28 15:25:08 2010 +0100
+
+    Updated Indonesian translation. 985t
+
+ debian/changelog |    1 +
+ po/id.po         |   68 ++++++++++-------------------------------------------
+ 2 files changed, 14 insertions(+), 55 deletions(-)
+
+commit b3d062225c0144d28747a48bd82a5108ada1439a
+Author: Miroslav Kure <kurem@upcase.inf.upol.cz>
+Date:   Sat Nov 27 16:42:49 2010 +0100
+
+    Czech translation update. 985t
+
+ debian/changelog |    1 +
+ po/cs.po         | 1082 +++++++++++++++++++++---------------------------------
+ 2 files changed, 429 insertions(+), 654 deletions(-)
+
+commit 53165b3620a915d2c16748ba4ce30af31581d6da
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Fri Nov 26 07:16:59 2010 +0100
+
+    French translation update for programs: 985t
+    French translation update for manpages: 1940t
+
+ debian/changelog |    4 +
+ man/po/fr.po     |  228 +++++++++++++++++++-----------------------------------
+ po/fr.po         |    6 +-
+ 3 files changed, 88 insertions(+), 150 deletions(-)
+
+commit 3dee8477d93c831ecef5b92f3dd96d189bdda988
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Nov 26 21:46:53 2010 +0100
+
+    Update German translation of manual pages
+    
+    Update to 1940t.
+
+ debian/changelog |    3 +++
+ man/po/de.po     |   21 +++++++++++++++++----
+ 2 files changed, 20 insertions(+), 4 deletions(-)
+
+commit 953a14800e0e6489b35864115dabf09a52fa1962
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Thu Nov 25 16:42:57 2010 +0100
+
+    German dpkg translation update
+    
+    Update to 985t.
+
+ debian/changelog |    7 +++++++
+ po/de.po         |   52 ++++++----------------------------------------------
+ 2 files changed, 13 insertions(+), 46 deletions(-)
+
+commit a4c8f5eff9dede8638b325c49093d1df33574749
+Author: Peter Krefting <peterk@debian.org>
+Date:   Thu Nov 25 10:43:37 2010 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: 985t0f0u.
+    man/po/sv.po: 1940t0fou.
+
+ man/po/sv.po |   19 ++++++++++++++++---
+ po/sv.po     |   48 +++---------------------------------------------
+ 2 files changed, 19 insertions(+), 48 deletions(-)
+
+commit 7e8695bdb8fb3a1dd4cf2ba4a48586e068fe3058
+Merge: 93bba14 81aacd4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 25 07:57:09 2010 +0100
+
+    Merge branch 'sid' (through tag '1.15.8.6')
+    
+    Conflicts:
+    	debian/changelog
+    	m4/dpkg-funcs.m4
+    	man/dpkg.1
+
+commit 81aacd4b0a84df492d0ba33110537efb6fef836d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 25 07:11:02 2010 +0100
+
+    Release 1.15.8.6
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 7fe25bef6e0379cb1a54ec5394164b7854f1868a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 25 07:23:34 2010 +0100
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |    2 +-
+ dselect/po/ca.po        |   47 ++-
+ dselect/po/cs.po        |    2 +-
+ dselect/po/da.po        |    2 +-
+ dselect/po/de.po        |    2 +-
+ dselect/po/dselect.pot  |    4 +-
+ dselect/po/el.po        |    2 +-
+ dselect/po/es.po        |    2 +-
+ dselect/po/et.po        |    2 +-
+ dselect/po/eu.po        |    2 +-
+ dselect/po/fr.po        |    2 +-
+ dselect/po/gl.po        |    2 +-
+ dselect/po/hu.po        |    2 +-
+ dselect/po/id.po        |    2 +-
+ dselect/po/it.po        |    2 +-
+ dselect/po/ja.po        |    2 +-
+ dselect/po/ko.po        |    2 +-
+ dselect/po/nb.po        |    2 +-
+ dselect/po/nl.po        |    2 +-
+ dselect/po/nn.po        |    2 +-
+ dselect/po/pl.po        |    2 +-
+ dselect/po/pt.po        |    2 +-
+ dselect/po/pt_BR.po     |    2 +-
+ dselect/po/ro.po        |    2 +-
+ dselect/po/ru.po        |    2 +-
+ dselect/po/sk.po        |    2 +-
+ dselect/po/sv.po        |    2 +-
+ dselect/po/tl.po        |    2 +-
+ dselect/po/vi.po        |    2 +-
+ dselect/po/zh_CN.po     |    2 +-
+ dselect/po/zh_TW.po     |    2 +-
+ man/po/de.po            |  299 ++++++-----
+ man/po/dpkg-man.pot     |  282 ++++++-----
+ man/po/es.po            |  285 ++++++-----
+ man/po/fr.po            | 1308 +++++++++++++++++++++++++++--------------------
+ man/po/hu.po            |  282 ++++++-----
+ man/po/ja.po            |  282 ++++++-----
+ man/po/pl.po            |  282 ++++++-----
+ man/po/pt_BR.po         |  282 ++++++-----
+ man/po/ru.po            |  282 ++++++-----
+ man/po/sv.po            |  285 ++++++-----
+ po/ast.po               |  143 +++---
+ po/bs.po                |  143 +++---
+ po/ca.po                |  355 +++++++++-----
+ po/cs.po                |  143 +++---
+ po/da.po                |  188 +++++---
+ po/de.po                |  188 +++++---
+ po/dpkg.pot             |  145 +++---
+ po/dz.po                |  143 +++---
+ po/el.po                |  143 +++---
+ po/eo.po                |  188 +++++---
+ po/es.po                |  143 +++---
+ po/et.po                |  143 +++---
+ po/eu.po                |  188 +++++---
+ po/fr.po                |  188 +++++---
+ po/gl.po                |  143 +++---
+ po/hu.po                |  143 +++---
+ po/id.po                |  188 +++++---
+ po/it.po                |  188 +++++---
+ po/ja.po                |  188 +++++---
+ po/km.po                |  143 +++---
+ po/ko.po                |  188 +++++---
+ po/ku.po                |  143 +++---
+ po/lt.po                |  143 +++---
+ po/mr.po                |  143 +++---
+ po/nb.po                |  188 +++++---
+ po/ne.po                |  143 +++---
+ po/nl.po                |  143 +++---
+ po/nn.po                |  143 +++---
+ po/pa.po                |  143 +++---
+ po/pl.po                |  143 +++---
+ po/pt.po                |  188 +++++---
+ po/pt_BR.po             |  143 +++---
+ po/ro.po                |  191 +++++---
+ po/ru.po                |  188 +++++---
+ po/sk.po                |  188 +++++---
+ po/sv.po                |  188 +++++---
+ po/th.po                |  188 +++++---
+ po/tl.po                |  143 +++---
+ po/vi.po                |  188 +++++---
+ po/zh_CN.po             |  188 +++++---
+ po/zh_TW.po             |  143 +++---
+ scripts/po/ca.po        |  114 +++--
+ scripts/po/de.po        |  106 ++--
+ scripts/po/dpkg-dev.pot |  108 ++--
+ scripts/po/es.po        |  106 ++--
+ scripts/po/fr.po        |  132 +++---
+ scripts/po/pl.po        |  106 ++--
+ scripts/po/ru.po        |  106 ++--
+ scripts/po/sv.po        |  106 ++--
+ 90 files changed, 6573 insertions(+), 5179 deletions(-)
+
+commit e0b4d276a74c74bfdfc0965eaa58c0749ea252b9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 25 07:09:14 2010 +0100
+
+    Changelog police
+    
+    Sort entries. Some rewording.
+
+ debian/changelog |   18 ++++++++----------
+ 1 files changed, 8 insertions(+), 10 deletions(-)
+
+commit 929a9c4808c79781469987585f78f07df7f1d484
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 29 08:59:09 2010 +0200
+
+    Add new --force-unsafe-io to disable safe I/O operations on unpack
+    
+    This allows to not perform file system syncs before file renames
+    to guarantee its atomicity, which is known to cause substantial
+    performance degradation on some file systems, unfortunately the ones
+    that require the safe I/O on the first place due to their unreliable
+    behaviour causing zero-length files on abrupt system crashes (sudden
+    reboot, bus locks, pulling the plug, etc).
+    
+    Using this option might improve performance at the cost of losing
+    data, and should thus be used with care, but that's ultimately
+    something for the user of the affected file systems to decide.
+    
+    Closes: #584254
+
+ debian/changelog |    2 ++
+ man/dpkg.1       |   19 ++++++++++++++++++-
+ src/archives.c   |    6 ++++--
+ src/main.c       |    3 +++
+ src/main.h       |    1 +
+ 5 files changed, 28 insertions(+), 3 deletions(-)
+
+commit 5ee4e4e0458088cde1625ddb5a3d736f31a335d3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 29 09:11:02 2010 +0200
+
+    build: Disable usage of synchronous sync(2) by default
+    
+    It causes undesired I/O on unrelated file systems. It also makes the
+    code behave differently on Linux systems.
+    
+    Allow the possibility to enable it again for the benefit of downstreams,
+    which might want to use it regardless of its problems. Although this
+    code path will most probably be removed in the near future.
+    
+    Closes: #588339, #595927, #600075
+
+ configure.ac     |    2 +-
+ debian/changelog |    4 ++++
+ m4/dpkg-funcs.m4 |   34 +++++++++++++++++++++++-----------
+ src/archives.c   |    4 ++--
+ 4 files changed, 30 insertions(+), 14 deletions(-)
+
+commit f99dc9af28a5f60dbc4cf7747b36509f0979b326
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 25 06:28:49 2010 +0100
+
+    Fix typo in French dpkg --debug=help output
+
+ po/fr.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 07dcccd8c498dc679ac36aa407cc595c568380c1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 25 06:25:49 2010 +0100
+
+    Fix status-fd man page translations
+    
+    Some of the words on those strings are literal output from dpkg, which
+    will not be translated, so use english there. Avoid using French spacing
+    too which will not happen on output either.
+
+ man/po/es.po |    8 ++++----
+ man/po/fr.po |    6 +++---
+ man/po/sv.po |    2 +-
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+commit c2442afe4b79603e56dee4285301d2f8d85d164b
+Author: Andrei Popescu <andreimpopescu@gmail.com>
+Date:   Thu Nov 25 06:21:39 2010 +0100
+
+    Update Romanian translation
+
+ po/ro.po | 2187 ++++++++++++++------------------------------------------------
+ 1 files changed, 479 insertions(+), 1708 deletions(-)
+
+commit 93bba14d3659578f19b5273dea2142d09a150a19
+Author: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
+Date:   Wed Nov 24 21:05:30 2010 +0100
+
+    New manual page deb-src-control(5) documenting debian/control
+
+ debian/changelog      |    6 +
+ man/Makefile.am       |    1 +
+ man/deb-control.5     |   26 ++++
+ man/deb-src-control.5 |  322 +++++++++++++++++++++++++++++++++++++++++++++++++
+ man/po/po4a.cfg       |    5 +
+ 5 files changed, 360 insertions(+), 0 deletions(-)
+
+commit dd7ef56c1d46e89092ac78a710c23fa693b52228
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Nov 24 20:59:09 2010 +0100
+
+    dpkg-buildflags: fix incorrect name in comment
+
+ scripts/dpkg-buildflags.pl |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6b403243270240fd01116532112c287c8cfb688e
+Author: Andrei POPESCU <andreimpopescu@gmail.com>
+Date:   Wed Nov 24 19:36:01 2010 +0100
+
+    Romanian translation update. Closes: #604769
+
+ debian/changelog |    1 +
+ po/ro.po         | 1555 +++++++++++++++++++++++-------------------------------
+ 2 files changed, 666 insertions(+), 890 deletions(-)
+
+commit 48875ddd6f6b295120e54b17b904a2fc9badcbf9
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Nov 22 21:39:42 2010 +0100
+
+    Patch by Sven Joachim <svenjoac@gmx.de> (and some further fixes noted)
+
+ scripts/po/de.po |  110 +++++++++++++++++++++++++++---------------------------
+ 1 files changed, 55 insertions(+), 55 deletions(-)
+
+commit f0266cd69c61fdab75691818ef40c64e66adbe26
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 8 08:02:30 2010 +0100
+
+    u-a: Add missing options to --help output
+    
+    Document --get-selections, --set-selections, --log and --force.
+    Split the huge string into smaller pieces to ease translators work.
+
+ debian/changelog            |    1 +
+ utils/update-alternatives.c |   18 ++++++++++++++----
+ 2 files changed, 15 insertions(+), 4 deletions(-)
+
+commit 1f75b16ea5c48bfb26ead6aa3248b717ab8aa5fc
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 8 08:00:16 2010 +0100
+
+    u-a: Unify similar strings
+
+ utils/update-alternatives.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 438df89ef1888c77d9bfc74720392ed9ef580332
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 7 23:20:25 2010 +0100
+
+    u-a: Use PROGNAME as format argument instead of concatenated to literals
+    
+    This reduced the amount of duplicated string literals in the output
+    object reducing slightly the binary image.
+
+ utils/update-alternatives.c |   29 +++++++++++++----------------
+ 1 files changed, 13 insertions(+), 16 deletions(-)
+
+commit 898ad6a9d5900b6a46dc2b7c742edb00fc116c3c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 7 23:11:03 2010 +0100
+
+    u-a: Add missing space in --set-selections output
+    
+    This was lost during the rewrite in C.
+
+ debian/changelog            |    1 +
+ utils/update-alternatives.c |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit f9c5414ea39c07cbd6a1b580a6a5df1381de39b4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 7 23:03:54 2010 +0100
+
+    u-a: Reduce scope of current pointer in main()
+
+ utils/update-alternatives.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 47a45689c3f395b4a1b86067fd795bbbcab29c6f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 7 09:16:44 2010 +0100
+
+    u-a: Avoid unneeded string allocations
+    
+    Instead of using temporaries with xasprintf(), just modify the original
+    string by merging the needed literal strings and pass the additional
+    arguments.
+
+ utils/update-alternatives.c |   31 ++++++++++---------------------
+ 1 files changed, 10 insertions(+), 21 deletions(-)
+
+commit befa6d21586273f86e911b97aa1c80bde8380f3c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 7 09:11:52 2010 +0100
+
+    u-a: Simplify an unify string in alternative_display_query()
+    
+    Unify the common string, and always call free() as it handles NULL just
+    fine.
+
+ utils/update-alternatives.c |    8 ++------
+ 1 files changed, 2 insertions(+), 6 deletions(-)
+
+commit 97c8020b42b8be6b62e35b785e0411d963eaeae7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 7 09:07:42 2010 +0100
+
+    u-a: Refactor duplicate code into new checked_rm_args()
+
+ utils/update-alternatives.c |   45 ++++++++++++++++++++++---------------------
+ 1 files changed, 23 insertions(+), 22 deletions(-)
+
+commit abcde2189e74065b2807b3984031ef33fe64742b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 7 09:05:36 2010 +0100
+
+    u-a: Create new xvasprintf() and use it instead of ad-hoc code
+
+ utils/update-alternatives.c |   20 ++++++++++++++------
+ 1 files changed, 14 insertions(+), 6 deletions(-)
+
+commit f7547316a11da5968a62094f789583428ce78ac3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 7 08:58:11 2010 +0100
+
+    u-a: Change alternative_save() to take care of atomic file write
+    
+    Instead of leaving the job of doing a proper atomic write, move the code
+    inside alternative_save() so that other possible callers will benefit.
+
+ utils/update-alternatives.c |   29 +++++++++++++++--------------
+ 1 files changed, 15 insertions(+), 14 deletions(-)
+
+commit 2819f4cc4639d59f7b6017f118e92dc5d9994299
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 5 06:56:06 2010 +0100
+
+    u-a: Refactor common code into new alternative_commit_operations_free
+
+ utils/update-alternatives.c |   25 ++++++++++++++-----------
+ 1 files changed, 14 insertions(+), 11 deletions(-)
+
+commit 73dab65273c589b7eed823adab30870e77171bb8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 4 20:46:23 2010 +0100
+
+    dpkg: Add new --status-logger option
+    
+    This option works in a similar way to --status-fd, the main difference
+    is that we invoke the provided command and pass the status information
+    to its standard input instead.
+    
+    Suggested-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog |    3 +++
+ man/dpkg.1       |    8 +++++++-
+ src/main.c       |   36 +++++++++++++++++++++++++++++++++++-
+ 3 files changed, 45 insertions(+), 2 deletions(-)
+
+commit a7df7bc856fd3add35ba44f7bd23901913a539d4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 4 19:13:59 2010 +0100
+
+    dpkg: Use command_shell() instead of ad-hoc code to execute shells
+
+ dpkg-deb/extract.c |    5 ++---
+ src/configure.c    |   21 +++------------------
+ 2 files changed, 5 insertions(+), 21 deletions(-)
+
+commit 7f9153a39ef306cb2181cd96c6e7a8f8513414b7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 4 19:10:23 2010 +0100
+
+    libdpkg: Add new command_shell() to execute a shell instance
+    
+    The function can invoke an interactive shell or a command through the
+    shell.
+
+ lib/dpkg/command.c |   26 ++++++++++++++++++++++++++
+ lib/dpkg/command.h |    2 ++
+ 2 files changed, 28 insertions(+), 0 deletions(-)
+
+commit 94e25a0380033654d2140ebf8149268b9bf446f8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 4 06:39:28 2010 +0100
+
+    Refactor setpipe() into statusfd_add() to stop exposing status_pipes
+
+ lib/dpkg/dpkg.h           |    8 +-------
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/log.c            |   20 +++++++++++++++++++-
+ src/main.c                |   11 ++---------
+ 4 files changed, 23 insertions(+), 18 deletions(-)
+
+commit 4e6da8c691773fbad5d6df4f0544361ea971dc14
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 4 06:25:00 2010 +0100
+
+    man: Remove comment about newlines in status-fd error entries
+    
+    This got fixed in commit db9645cff36a3fff3c597764fb8d49fbc819bad7.
+
+ debian/changelog |    2 ++
+ man/dpkg.1       |    8 +++-----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+commit d2abfdb8bc6137c4a2f87c5c6db22e030d3334c7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 4 03:38:06 2010 +0100
+
+    dpkg-deb: Use m_realloc instead of m_malloc when the pointer is NULL
+    
+    This removes a duplicate case which m_realloc will handle just fine.
+
+ dpkg-deb/build.c |    5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+commit 65969bfbccaf387c69df284215b6aefea7496f41
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Nov 3 10:46:28 2010 +0100
+
+    Use new enum for dependency found status
+    
+    Instead of cryptic literal integers use named enums.
+
+ src/packages.c |   70 ++++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 40 insertions(+), 30 deletions(-)
+
+commit e983b8522fc2be93c3b31e38ddd5ce94448739c1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Nov 3 10:45:08 2010 +0100
+
+    Use new enum for dependency check result values
+    
+    Instead of cryptic literal integers use named enums.
+
+ src/main.h     |   13 ++++++++++---
+ src/packages.c |   47 +++++++++++++++++++++++++++--------------------
+ 2 files changed, 37 insertions(+), 23 deletions(-)
+
+commit 0f1668f799780250503fca5df0a12531587c1eb8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Nov 3 10:08:18 2010 +0100
+
+    Use new enum for trigdef_update_start() return values
+    
+    Instead of cryptic literal integers use named enums.
+
+ lib/dpkg/trigdeferred.h |   11 ++++++++++-
+ lib/dpkg/trigdeferred.l |   12 ++++++------
+ lib/dpkg/triglib.c      |   14 +++++++-------
+ src/trigcmd.c           |   10 +++++-----
+ 4 files changed, 28 insertions(+), 19 deletions(-)
+
+commit b070e0ec0d33b585809dd420e0433a4f67ca12c0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Nov 3 09:41:29 2010 +0100
+
+    libdpkg: Rewrite get_prefix_name() to be more efficient
+    
+    Avoid temporary allocations from the heap and use sprintf to write the
+    string with delimited parts.
+
+ lib/dpkg/tarfn.c |   19 +++++--------------
+ 1 files changed, 5 insertions(+), 14 deletions(-)
+
+commit 04eaf265a0b219ed8689607196405fdff9a4a432
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Nov 3 08:24:54 2010 +0100
+
+    libdpkg: Disallow versions starting with non-digits
+    
+    Fail on strict parsing, and warn otherwise.
+
+ debian/changelog             |    2 ++
+ lib/dpkg/parsehelp.c         |    5 ++++-
+ lib/dpkg/test/t-version.c    |    4 ++--
+ scripts/t/100_Dpkg_Version.t |   40 ++++++++++++++++++++--------------------
+ 4 files changed, 28 insertions(+), 23 deletions(-)
+
+commit ac65897081f5f20fda853beed79c28559fe33aea
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Nov 3 07:36:16 2010 +0100
+
+    libdpkg: Fix version_strict_check() to not allow '-' in revision
+    
+    The revision cannot possibly have a '-' in it, so do not allow it. This
+    is innocuous in the current code as the parser makes sure the versions
+    are split on last '-', which implies the revision will never have one,
+    but it could happen that a manually constructed versionrevision could
+    contain one.
+
+ lib/dpkg/parsehelp.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit be7a2c7829014eaec48185add2e445f2d8570055
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Nov 3 07:33:08 2010 +0100
+
+    libdpkg: Improve version strict check unit test
+    
+    The current test was using a single version with lots of invalid
+    characters, but only the first invalid character would get checked
+    against. Create a version per each invalid character to be tested
+    instead.
+
+ lib/dpkg/test/t-version.c |   22 +++++++++++++++++++---
+ 1 files changed, 19 insertions(+), 3 deletions(-)
+
+commit d3de9d66d6c4e735e7f9d2821549b9fc8e235d7d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 2 08:06:52 2010 +0100
+
+    libdpkg: Slightly optimize order() checks
+    
+    Reorganize code to first do checks on most commonly expected character.
+    First digits, then alphabetical, then the tilde, followed by any non NUL
+    character and finally the NUL character.
+
+ lib/dpkg/vercmp.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 60c89bac73d5a9aea0da4c38cc5e963b0d760000
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 2 08:02:05 2010 +0100
+
+    libdpkg: Switch order macro into a function
+
+ lib/dpkg/vercmp.c |   25 ++++++++++++++++++-------
+ 1 files changed, 18 insertions(+), 7 deletions(-)
+
+commit 326d7b43ffd8b6c8e1bf4dcd5c5495ee5129631f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 1 21:41:46 2010 +0100
+
+    libdpkg: Refactor tar_gnu_long() out from tar_extractor()
+
+ lib/dpkg/tarfn.c |  102 +++++++++++++++++++++++++++---------------------------
+ 1 files changed, 51 insertions(+), 51 deletions(-)
+
+commit ebe392c61526b520bb7033fa49af8bd2faa39001
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 1 21:01:05 2010 +0100
+
+    libdpkg: Switch tar_header_decode() to take a struct tar_header
+    
+    Instead of passing it a 'char *' argument to be casted later on to a
+    tar_header, just pass the latter directly.
+
+ lib/dpkg/tarfn.c |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+commit 835741f632e884ccd973d87e128c9846dd3e1d4c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 1 20:50:58 2010 +0100
+
+    libdpkg: Move checksum_offset into tar_header_checksum()
+
+ lib/dpkg/tarfn.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit d30a087c4f7686ad237b15b413848a6a8fe87ed6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 1 20:44:41 2010 +0100
+
+    libdpkg: Refactor tar_header_checksum() out from tar_header_decode()
+
+ lib/dpkg/tarfn.c |   42 ++++++++++++++++++++++++++----------------
+ 1 files changed, 26 insertions(+), 16 deletions(-)
+
+commit 2d0ebab0474fc83f07ed4f648fdb85443b1bfd2b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 1 20:31:25 2010 +0100
+
+    libdpkg: Rename DecodeTarHeader to tar_header_decode
+
+ lib/dpkg/tarfn.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 58a9ff2596fa722f230eee97bfa65c5d6218f479
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 1 20:30:53 2010 +0100
+
+    libdpkg: Rename TarChecksumOffset to checksum_offset
+
+ lib/dpkg/tarfn.c |    7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+commit cd9b20b161549ea810750cccc28c92ea655d42fa
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 1 20:30:25 2010 +0100
+
+    libdpkg: Rename TarInfo to tar_header
+
+ lib/dpkg/tarfn.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 3b717d8231e3251fe7b2ac09db44481a40092c58
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 1 20:28:34 2010 +0100
+
+    libdpkg: Rename and lower-case TarHeader members
+
+ lib/dpkg/tarfn.c |   84 ++++++++++++++++++++++++++---------------------------
+ 1 files changed, 41 insertions(+), 43 deletions(-)
+
+commit a30303a4ea49c548673544d09f667802be7c9b26
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 1 20:19:37 2010 +0100
+
+    libdpkg: Rename nameLength to name_len in tar_extractor()
+
+ lib/dpkg/tarfn.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 7a0a0619fd3c926aecec59987597a40f7b2dcd3c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 1 08:31:48 2010 +0100
+
+    libdpkg: Rename path_rtrim_slash_slashdot to path_trim_slash_slashdot
+
+ dpkg-deb/build.c          |    2 +-
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/path.c           |    2 +-
+ lib/dpkg/path.h           |    2 +-
+ lib/dpkg/test/t-path.c    |    6 +++---
+ src/querycmd.c            |    2 +-
+ src/statcmd.c             |    2 +-
+ 7 files changed, 9 insertions(+), 9 deletions(-)
+
+commit c6ea15b9850f26ea3b5a13667396c89e00aa9890
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 1 08:18:28 2010 +0100
+
+    Cleanup white spaces
+    
+    Remove trailing spaces. Remove blank lines not separating different code
+    blocks. Remove blank lines at the end of the file.
+
+ ChangeLog.old                       |    1 -
+ README.translators                  |    1 -
+ TODO                                |    1 -
+ debian/usertags                     |    1 -
+ doc/README.feature-removal-schedule |    1 -
+ doc/triggers.txt                    |    2 -
+ dpkg-deb/Makefile.am                |    1 -
+ dpkg-deb/build.c                    |   15 +++++------
+ dpkg-deb/extract.c                  |   19 +++++--------
+ dpkg-deb/info.c                     |    6 ++--
+ dpkg-split/info.c                   |   14 +++++-----
+ dpkg-split/join.c                   |    9 +++---
+ dpkg-split/main.c                   |    2 +-
+ dpkg-split/queue.c                  |    2 +-
+ dselect/basecmds.cc                 |   14 +++++-----
+ dselect/baselist.cc                 |   26 +++++++++---------
+ dselect/bindings.cc                 |    8 +++---
+ dselect/bindings.h                  |   12 ++++----
+ dselect/dselect-curses.h            |    1 -
+ dselect/dselect.h                   |    4 +-
+ dselect/main.cc                     |    5 +--
+ dselect/methkeys.cc                 |   12 ++++----
+ dselect/methlist.cc                 |   10 +++---
+ dselect/method.cc                   |    6 ++--
+ dselect/method.h                    |    6 ++--
+ dselect/methods/disk/setup          |    2 -
+ dselect/methods/disk/update         |    1 -
+ dselect/methods/ftp/names           |    1 -
+ dselect/methparse.cc                |   12 ++++----
+ dselect/pkgcmds.cc                  |    4 +-
+ dselect/pkgdepcon.cc                |   34 ++++++++++++------------
+ dselect/pkgdisplay.cc               |   14 +++++-----
+ dselect/pkginfo.cc                  |    4 +-
+ dselect/pkgkeys.cc                  |   16 ++++++------
+ dselect/pkglist.cc                  |   44 +++++++++++++++----------------
+ dselect/pkglist.h                   |   12 ++++----
+ dselect/pkgsublist.cc               |   13 ++++-----
+ dselect/pkgtop.cc                   |   22 +++++-----------
+ dselect/po/ChangeLog.old            |    1 -
+ dselect/po/POTFILES.in              |    1 -
+ get-version                         |    1 -
+ lib/compat/Makefile.am              |    1 -
+ lib/compat/alphasort.c              |    1 -
+ lib/compat/compat.h                 |    1 -
+ lib/compat/scandir.c                |    1 -
+ lib/compat/snprintf.c               |    1 -
+ lib/compat/strerror.c               |    1 -
+ lib/compat/strsignal.c              |    1 -
+ lib/compat/unsetenv.c               |    1 -
+ lib/compat/vsnprintf.c              |    1 -
+ lib/dpkg/buffer.c                   |    1 -
+ lib/dpkg/cleanup.c                  |    1 -
+ lib/dpkg/command.c                  |    1 -
+ lib/dpkg/command.h                  |    1 -
+ lib/dpkg/database.c                 |    2 +-
+ lib/dpkg/dbmodify.c                 |   13 +++------
+ lib/dpkg/dpkg-db.h                  |    3 +-
+ lib/dpkg/dump.c                     |   10 +++---
+ lib/dpkg/ehandle.c                  |   12 +++-----
+ lib/dpkg/fields.c                   |   11 +++----
+ lib/dpkg/file.c                     |    1 -
+ lib/dpkg/file.h                     |    1 -
+ lib/dpkg/log.c                      |    1 -
+ lib/dpkg/macros.h                   |    1 -
+ lib/dpkg/mlib.c                     |    7 ++---
+ lib/dpkg/nfmalloc.c                 |    2 +-
+ lib/dpkg/parse.c                    |    7 +++-
+ lib/dpkg/parsehelp.c                |    7 ++---
+ lib/dpkg/path.c                     |    1 -
+ lib/dpkg/path.h                     |    1 -
+ lib/dpkg/pkg-array.c                |    1 -
+ lib/dpkg/pkg-format.c               |    1 -
+ lib/dpkg/pkg-list.c                 |    1 -
+ lib/dpkg/pkg-queue.c                |    1 -
+ lib/dpkg/pkg-show.c                 |    1 -
+ lib/dpkg/pkg.c                      |    1 -
+ lib/dpkg/progress.c                 |    1 -
+ lib/dpkg/progress.h                 |    1 -
+ lib/dpkg/string.c                   |    1 -
+ lib/dpkg/string.h                   |    1 -
+ lib/dpkg/subproc.c                  |    1 -
+ lib/dpkg/subproc.h                  |    1 -
+ lib/dpkg/tarfn.c                    |    1 -
+ lib/dpkg/test.h                     |    1 -
+ lib/dpkg/test/Makefile.am           |    1 -
+ lib/dpkg/test/t-buffer.c            |    1 -
+ lib/dpkg/test/t-command.c           |    1 -
+ lib/dpkg/test/t-macros.c            |    1 -
+ lib/dpkg/test/t-path.c              |    1 -
+ lib/dpkg/test/t-pkg-list.c          |    1 -
+ lib/dpkg/test/t-pkg-queue.c         |    1 -
+ lib/dpkg/test/t-pkginfo.c           |    1 -
+ lib/dpkg/test/t-string.c            |    1 -
+ lib/dpkg/test/t-test.c              |    1 -
+ lib/dpkg/test/t-varbuf.c            |    1 -
+ lib/dpkg/test/t-version.c           |    1 -
+ lib/dpkg/trigdeferred.l             |    1 -
+ lib/dpkg/triglib.c                  |    1 +
+ lib/dpkg/utils.c                    |    1 -
+ m4/dpkg-compiler.m4                 |    1 -
+ m4/dpkg-progs.m4                    |    1 -
+ man/po/ChangeLog.old                |    1 -
+ po/ChangeLog.old                    |    1 -
+ scripts/dpkg-distaddfile.pl         |    1 -
+ scripts/dpkg-genchanges.pl          |    1 -
+ scripts/dpkg-gencontrol.pl          |    1 -
+ scripts/dpkg-mergechangelogs.pl     |    1 -
+ scripts/dpkg-name.pl                |    1 -
+ scripts/dpkg-parsechangelog.pl      |    1 -
+ scripts/dpkg-scanpackages.pl        |    1 -
+ scripts/dpkg-shlibdeps.pl           |    1 -
+ scripts/dpkg-source.pl              |    1 -
+ scripts/po/ChangeLog.old            |    1 -
+ scripts/t/400_Dpkg_Deps.t           |    1 -
+ scripts/t/500_Dpkg_Path.t           |    1 -
+ scripts/t/700_Dpkg_Control.t        |    1 -
+ scripts/t/850_Dpkg_Compression.t    |    2 -
+ scripts/t/910_merge_changelogs.t    |    1 -
+ src/archives.c                      |   42 ++++++++++++++----------------
+ src/cleanup.c                       |    8 +++---
+ src/depcon.c                        |   35 ++++++++++++-------------
+ src/divertdb.c                      |    1 -
+ src/enquiry.c                       |    8 +++---
+ src/errors.c                        |    4 +-
+ src/filesdb.c                       |   14 +++++-----
+ src/filesdb.h                       |    2 +-
+ src/help.c                          |   18 ++++++------
+ src/main.c                          |    5 +--
+ src/main.h                          |    2 +-
+ src/packages.c                      |   10 +++---
+ src/processarc.c                    |   48 ++++++++++++++++++----------------
+ src/querycmd.c                      |   15 +++-------
+ src/remove.c                        |   38 +++++++++++++--------------
+ src/select.c                        |    2 +-
+ src/statcmd.c                       |    1 -
+ src/statdb.c                        |    1 -
+ src/trigcmd.c                       |    1 -
+ src/trigproc.c                      |    1 -
+ src/update.c                        |    4 +-
+ utils/start-stop-daemon.c           |    1 -
+ utils/t/100_update_alternatives.t   |    1 -
+ 141 files changed, 321 insertions(+), 444 deletions(-)
+
+commit 7ee4f4f2ef5ca3d9fa1426ac93f78ead2280bc36
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 1 07:02:21 2010 +0100
+
+    Add doxygen comments to several functions
+
+ lib/dpkg/dir.c       |   21 +++++++++++++++++++++
+ lib/dpkg/file.c      |    3 +++
+ lib/dpkg/parse.c     |    3 +++
+ lib/dpkg/path.c      |   16 ++++++++++++++++
+ lib/dpkg/pkg-list.c  |   19 +++++++++++++++++++
+ lib/dpkg/pkg-queue.c |   37 +++++++++++++++++++++++++++++++++++++
+ lib/dpkg/pkg-queue.h |    3 +++
+ lib/dpkg/string.c    |    9 +++++++++
+ 8 files changed, 111 insertions(+), 0 deletions(-)
+
+commit ec5d6813398a42b6cf6b3da7604e59bbb3343aa9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 1 06:13:38 2010 +0100
+
+    Cleanup and improve source code comments
+    
+    Global review, which includes the following changes to try to increase
+    consistency, update and improve the source code comments:
+    
+     - Spelling fixes.
+     - Use American English forms.
+     - Uppercase NULL, NUL and ASCII.
+     - Use “Note: ” instead of the slightly cryptic “NB: ” form.
+     - Write comments as proper sentences, including capitalizations and
+       ending dots.
+     - Move comments before the code, function or variable they refer to.
+     - Move general function comments outside the body.
+     - Convert function and variable description comments to doxygen.
+     - Use one space before dot, exclamation and question marks.
+     - Use ‘’ or “” instead of `' style quoting.
+     - Remove author names from comments, already visible from “git blame”.
+     - Mark strings for translators with “TRANSLATORS: ”.
+     - Remove useless or outdated comments.
+     - Fix comment indentation.
+     - Standardize comment format:
+    
+       /* Short text comment. */
+    
+       /* Long text,
+        * comment. */
+    
+       /*
+        * Section text.
+        */
+
+ dpkg-deb/build.c              |   74 +++++++--------
+ dpkg-deb/extract.c            |    8 +-
+ dpkg-split/dpkg-split.h       |   11 +-
+ dpkg-split/info.c             |   10 ++-
+ dpkg-split/queue.c            |   27 +++---
+ dselect/pkgdisplay.cc         |    9 +-
+ lib/dpkg/database.c           |   28 +++---
+ lib/dpkg/dbmodify.c           |   20 ++--
+ lib/dpkg/dpkg-db.h            |   56 +++++++----
+ lib/dpkg/dpkg.h               |    3 +-
+ lib/dpkg/dump.c               |    4 +-
+ lib/dpkg/ehandle.c            |   32 ++++---
+ lib/dpkg/ehandle.h            |    3 +-
+ lib/dpkg/fields.c             |   33 +++++--
+ lib/dpkg/file.c               |   17 +++-
+ lib/dpkg/file.h               |    3 -
+ lib/dpkg/mlib.c               |    2 +-
+ lib/dpkg/myopt.h              |    9 ++-
+ lib/dpkg/nfmalloc.c           |    2 +-
+ lib/dpkg/parse.c              |  111 +++++++++++-----------
+ lib/dpkg/parsedump.h          |    3 +-
+ lib/dpkg/parsehelp.c          |   16 ++--
+ lib/dpkg/path.c               |   30 +++----
+ lib/dpkg/string.c             |    8 ++-
+ lib/dpkg/tarfn.c              |   12 ++-
+ lib/dpkg/trigdeferred.h       |    8 --
+ lib/dpkg/trigdeferred.l       |   11 ++
+ lib/dpkg/triglib.c            |   87 ++++++++++-------
+ lib/dpkg/utils.c              |    5 +-
+ lib/dpkg/varbuf.h             |    2 +-
+ lib/dpkg/vercmp.c             |    4 +-
+ m4/dpkg-compiler.m4           |   12 +-
+ scripts/Dpkg/Shlibs/Symbol.pm |    2 +-
+ src/archives.c                |  196 +++++++++++++++++++++-----------------
+ src/cleanup.c                 |   51 ++++++-----
+ src/configure.c               |    8 +-
+ src/depcon.c                  |  129 +++++++++++++-------------
+ src/enquiry.c                 |   79 +++++++++-------
+ src/filesdb.c                 |   69 +++++++-------
+ src/filesdb.h                 |  110 ++++++++++++----------
+ src/help.c                    |   33 ++++---
+ src/main.c                    |   39 ++++----
+ src/main.h                    |   24 ++---
+ src/packages.c                |   52 ++++++-----
+ src/processarc.c              |  206 ++++++++++++++++++++---------------------
+ src/querycmd.c                |   49 +++++++---
+ src/remove.c                  |   48 +++++-----
+ src/trigproc.c                |   58 +++++++-----
+ src/update.c                  |    2 +-
+ utils/start-stop-daemon.c     |   21 +++--
+ utils/update-alternatives.c   |    6 +-
+ 51 files changed, 1015 insertions(+), 827 deletions(-)
+
+commit 9209010455812b6e51cd907aab3d50779ea8e35b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 31 21:30:49 2010 +0100
+
+    s-s-d: Refactor sched_timeout code out into new do_stop_timeout()
+
+ utils/start-stop-daemon.c |  132 ++++++++++++++++++++++++---------------------
+ 1 files changed, 71 insertions(+), 61 deletions(-)
+
+commit 141b8a46fae0a80313ca1968f55f45124ce70428
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 31 07:55:47 2010 +0100
+
+    libdpkg: Make str_escape_fmt buffer overflow safe
+    
+    Make sure we do not write more to the destination buffer than it can
+    hold.
+
+ lib/dpkg/parsehelp.c     |    4 ++--
+ lib/dpkg/string.c        |   12 ++++++++++--
+ lib/dpkg/string.h        |    2 +-
+ lib/dpkg/test/t-string.c |   19 +++++++++++++++----
+ 4 files changed, 28 insertions(+), 9 deletions(-)
+
+commit 295a6102cacb6be15bf2441549d2dcb505990138
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 31 06:28:58 2010 +0100
+
+    libdpkg: Refactor string termination in path_quote_filename
+    
+    Move all destination string termination to the end of the function.
+    Always check the size limit before writting to the desintation and bail
+    out if there's no enough space.
+
+ lib/dpkg/path.c |   47 +++++++++++++++++++++--------------------------
+ 1 files changed, 21 insertions(+), 26 deletions(-)
+
+commit 537a50764317c9a2ed37afe7a4acc3f1114f8c55
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 31 06:01:02 2010 +0100
+
+    libdpkg: Change switch into if/else in path_quote_filename
+    
+    This reduces the code depth, and will allow further code simplification.
+
+ lib/dpkg/path.c |   34 +++++++++++++++-------------------
+ 1 files changed, 15 insertions(+), 19 deletions(-)
+
+commit 180e2e0e477145df4ccf8a71220773c0b093091e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 31 04:09:59 2010 +0100
+
+    libdpkg: Add new warningv() function and make warning() use it
+
+ lib/dpkg/ehandle.c        |   14 ++++++++++----
+ lib/dpkg/ehandle.h        |    1 +
+ lib/dpkg/libdpkg.Versions |    1 +
+ 3 files changed, 12 insertions(+), 4 deletions(-)
+
+commit 7d4d1007c4f7ca8d40a5374f1305426b8c1e2e54
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 31 04:05:19 2010 +0100
+
+    libdpkg: Add PURE, MALLOC, NONNULL and REQRET compiler attributes
+
+ lib/dpkg/macros.h |   13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+commit 631338a5e54d5ecd861f26440deef37a891d1f30
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 31 03:40:04 2010 +0100
+
+    dselect: Remove shadowing variable definitions from pkgtop
+    
+    The variables i and p are always initialized before each different loop
+    use, and they are actually used for the same purpose, just in different
+    places in the code.
+
+ dselect/pkgtop.cc |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 2d8721c8417aaa8dd8fe1f393eee69e92e5b2294
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Nov 3 01:57:42 2010 +0100
+
+    build: Use AC_REQUIRE for AC_CANONICAL_HOST in DPKG_FUNC_ASYNC_SYNC
+
+ m4/dpkg-funcs.m4 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 79b0a98dff5e8aaf3ee94d301613278cf1bd5593
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 2 05:55:51 2010 +0100
+
+    build: Change the strictness from gnu to foreign
+    
+    This is not a GNU project and thus we don't abide by the GNU
+    conventions.
+
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bbf1c10064958da1ebb5a8d2da0bc170dd1c994a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 2 05:53:30 2010 +0100
+
+    build: Refactor --with/out options into DPKG_WITH_PROG and DPKG_WITH_DIR
+
+ configure.ac     |   74 ++++++++----------------------------------------------
+ m4/dpkg-build.m4 |   33 ++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+), 63 deletions(-)
+
+commit fcd428d0b05f84ee1dbc4910a011d75bf6d02171
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 31 03:27:29 2010 +0100
+
+    build: Unify and fix AC_ARG_ENABLE usage
+    
+    The current code was executing code in the action arguments, instead
+    of just setting boolean flags and processing them afterwards. This
+    poses several problems, it implies jugling code around in case the the
+    default changes, it might also duplicate code, and it might leave the
+    ACTION-IF-NOT-GIVEN argument empty which could turn into an empty
+    “then fi” shell block which is a syntax error on POSIX shell. Leaving
+    the ACTION-IF-GIVEN argument empty is fine as it's always used by
+    autoconf to set $enableval to the specific enable variable, and setting
+    that variable from $enableval is redundant and might be wrong depending
+    on the order they are set, which could empty it.
+    
+    Reported-by: Michael Schmidt <michael.schmidt.dangel@gmail.com>
+
+ m4/dpkg-compiler.m4 |   11 +++++++----
+ m4/dpkg-funcs.m4    |   13 +++++++------
+ m4/dpkg-linker.m4   |   13 ++++++++-----
+ 3 files changed, 22 insertions(+), 15 deletions(-)
+
+commit d20d82f99479fd50eda013bcb790ca06acb9a25b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 31 03:24:03 2010 +0100
+
+    build: Add missing m4 quotes around AM_CONDITIONAL argument
+
+ m4/dpkg-coverage.m4 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 495dfd0389fc48fe8723d424952340530577b8f3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 30 09:00:24 2010 +0200
+
+    build: Add missing m4 quotes to sed regex
+    
+    This was making the regex non-functional, as the square brackets
+    were being removed when generating the output file, thus making the
+    --disable-compiler-optimisations and --disable-linker-optimisations
+    non-functional.
+
+ m4/dpkg-compiler.m4 |    2 +-
+ m4/dpkg-linker.m4   |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e338748e9ff28ab7921a110fd71ec71882bbc3dd
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Sat Oct 23 10:00:46 2010 +0200
+
+    build: Break if ncurses is requested but unavailable
+    
+    If building dselect is requested (the default), ncurses is requested
+    through DPKG_LIB_CURSES, but if it isn't found, only AC_MSG_WARN is
+    used, leading to a successful configure and a failure to build
+    dselect/*. Use AC_MSG_ERROR instead to make configure bail out.
+    
+    Reported-by: Michael Schmidt <michael.schmidt.dangel@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ m4/dpkg-libs.m4 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4f81ba2457638473b2fcabaa5b314ba077df195a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Oct 26 19:05:49 2010 +0200
+
+    man: Use FHS mount point for /media/cdrom
+
+ man/dpkg.1 |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ba908783e306ba38457a84fd6d975ca69e351e56
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 24 04:35:07 2010 +0200
+
+    libdpkg: Always print parse warnings on stderr
+    
+    Remove now unused warnto from parsedb_stat struct.
+
+ dpkg-deb/build.c     |    2 +-
+ dpkg-deb/info.c      |    2 +-
+ lib/dpkg/dbmodify.c  |    7 +++----
+ lib/dpkg/dpkg-db.h   |    2 +-
+ lib/dpkg/parse.c     |    9 +++------
+ lib/dpkg/parsedump.h |    1 -
+ lib/dpkg/parsehelp.c |    8 +++-----
+ src/processarc.c     |    2 +-
+ src/update.c         |    4 ++--
+ 9 files changed, 15 insertions(+), 22 deletions(-)
+
+commit 4afc4d0239d7f4e60bc68a79a07aef576c8a3ebe
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 24 03:55:58 2010 +0200
+
+    libdpkg: Reorded convert_string arguments
+
+ lib/dpkg/fields.c |   30 ++++++++++++++++--------------
+ 1 files changed, 16 insertions(+), 14 deletions(-)
+
+commit 28007d02c3f60d762cdb943e8886267333f1c2a1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 24 03:49:47 2010 +0200
+
+    Use new namevalue_find_by_name function instead of ad-hoc code
+
+ lib/dpkg/fields.c |   12 ++++--------
+ src/select.c      |    6 ++++--
+ 2 files changed, 8 insertions(+), 10 deletions(-)
+
+commit e66836854ef51b5b5ce0b95a61adbf13f8dcd660
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 24 03:49:22 2010 +0200
+
+    libdpkg: Add new namevalue_find_by_name function
+
+ lib/dpkg/Makefile.am                  |    1 +
+ lib/dpkg/libdpkg.Versions             |    3 +++
+ lib/dpkg/{namevalue.h => namevalue.c} |   32 +++++++++++++++-----------------
+ lib/dpkg/namevalue.h                  |    5 ++++-
+ 4 files changed, 23 insertions(+), 18 deletions(-)
+
+commit 8c234c5698645a759f6153fd1be4d7b90059bb88
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 24 03:28:55 2010 +0200
+
+    libdpkg: Move namevalue declarations to its own header file
+
+ lib/dpkg/Makefile.am |    1 +
+ lib/dpkg/dpkg-db.h   |    5 +----
+ lib/dpkg/namevalue.h |   40 ++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/parsehelp.c |    3 ---
+ 4 files changed, 42 insertions(+), 7 deletions(-)
+
+commit b89373e169cf0d90c3143eeac0bded1a5d9e9c5c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 24 03:17:38 2010 +0200
+
+    libdpkg: Rename package blank functions to pkg_blank and pkg_perfile_blank
+
+ lib/dpkg/database.c         |   14 +++++++++-----
+ lib/dpkg/dpkg-db.h          |    4 ++--
+ lib/dpkg/libdpkg.Versions   |    4 ++--
+ lib/dpkg/parse.c            |    2 +-
+ lib/dpkg/test/t-pkg-queue.c |    2 +-
+ lib/dpkg/test/t-pkginfo.c   |    4 ++--
+ src/cleanup.c               |    2 +-
+ src/processarc.c            |    2 +-
+ src/remove.c                |    2 +-
+ 9 files changed, 20 insertions(+), 16 deletions(-)
+
+commit a3dd7c610183c6f5515d69178b8a848ea1d82b87
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 24 03:16:00 2010 +0200
+
+    libdpkg: Rename informative to pkg_is_informative
+
+ dselect/pkgdepcon.cc      |   12 +++++++-----
+ lib/dpkg/database.c       |    2 +-
+ lib/dpkg/dpkg-db.h        |    2 +-
+ lib/dpkg/dump.c           |    3 ++-
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/test/t-pkginfo.c |    6 +++---
+ src/querycmd.c            |    4 ++--
+ 7 files changed, 17 insertions(+), 14 deletions(-)
+
+commit f74dfc666ea193a85de5e5f26b079506b289843f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 24 03:13:58 2010 +0200
+
+    libdpkg: Rename illegal_packagename to pkg_name_is_illegal
+
+ lib/dpkg/dpkg-db.h        |    2 +-
+ lib/dpkg/fields.c         |    8 +++++---
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/parsehelp.c      |    4 +++-
+ lib/dpkg/triglib.c        |    9 ++++++---
+ src/main.c                |    2 +-
+ src/select.c              |    2 +-
+ src/trigcmd.c             |    2 +-
+ 8 files changed, 19 insertions(+), 12 deletions(-)
+
+commit a6066a13aa23b28036b692b570f280a70efcf971
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 24 02:55:55 2010 +0200
+
+    libdpkg: Rename illegal_triggername to trig_name_is_illegal
+
+ lib/dpkg/fields.c         |    2 +-
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/triglib.c        |    4 ++--
+ lib/dpkg/triglib.h        |    2 +-
+ src/trigcmd.c             |    3 ++-
+ 5 files changed, 7 insertions(+), 6 deletions(-)
+
+commit cc49169cdc596e33f036e9d9300e915a74e8baf0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 24 02:53:27 2010 +0200
+
+    dpkg-trigger: Remove duplicate command name from error messages
+
+ src/trigcmd.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 9db4a822bb62b739e71c0a59c5ba46a27d121e32
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 23 05:37:33 2010 +0200
+
+    libdpkg: Namespace package database functions with pkg_db_ prefix
+
+ TODO                      |    1 -
+ dselect/main.cc           |    2 +-
+ dselect/pkglist.cc        |    9 +++++----
+ lib/dpkg/database.c       |   24 ++++++++++++++++++------
+ lib/dpkg/dpkg-db.h        |   13 +++++++------
+ lib/dpkg/dump.c           |    6 +++---
+ lib/dpkg/fields.c         |   10 ++++------
+ lib/dpkg/libdpkg.Versions |   12 ++++++------
+ lib/dpkg/parse.c          |    4 ++--
+ lib/dpkg/pkg-array.c      |    8 ++++----
+ lib/dpkg/triglib.c        |    8 ++++----
+ src/depcon.c              |    6 +++---
+ src/divertcmd.c           |    4 ++--
+ src/divertdb.c            |    2 +-
+ src/enquiry.c             |   32 ++++++++++++++++----------------
+ src/filesdb.c             |    2 +-
+ src/help.c                |    6 +++---
+ src/main.c                |    2 +-
+ src/packages.c            |    8 ++++----
+ src/processarc.c          |    6 +++---
+ src/querycmd.c            |    4 ++--
+ src/select.c              |    8 ++++----
+ src/trigproc.c            |   14 +++++++-------
+ 23 files changed, 101 insertions(+), 90 deletions(-)
+
+commit 6ad315a1eeb8f3a597dee9a5d602013dd2d2b9d2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 23 05:19:43 2010 +0200
+
+    libdpkg: Use push_error_context_jump() instead of push_error_handler()
+    
+    Remove obsolete and now unused push_error_handler compatibility macro.
+
+ lib/dpkg/ehandle.h |    2 --
+ src/archives.c     |    3 ++-
+ src/packages.c     |    3 ++-
+ src/trigproc.c     |    3 ++-
+ 4 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 2a92bb81186b6098ec2a6b77242690d11402faad
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 23 05:16:46 2010 +0200
+
+    libdpkg: Rename error_unwind() to pop_error_context()
+
+ lib/dpkg/dpkg.h           |    2 +-
+ lib/dpkg/ehandle.c        |   13 +++++++++----
+ lib/dpkg/ehandle.h        |    2 +-
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/test.h           |    3 +--
+ src/archives.c            |    4 ++--
+ src/main.c                |    2 +-
+ src/packages.c            |    5 +++--
+ src/trigproc.c            |    4 ++--
+ 9 files changed, 21 insertions(+), 16 deletions(-)
+
+commit 051423d23c9d5580aaecf0a7c41c854566d40d76
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 17 05:57:45 2010 +0200
+
+    dselect: Use a function instead of a jump error handler
+
+ dselect/main.cc |   17 ++++++++++-------
+ 1 files changed, 10 insertions(+), 7 deletions(-)
+
+commit b94d25d09f8bf55a68e17379581fb2ba71ae26aa
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 17 05:50:02 2010 +0200
+
+    Use push_error_context() instead of ad-hoc code
+
+ TODO              |    1 -
+ dpkg-deb/main.c   |    3 +--
+ dpkg-split/main.c |    3 +--
+ lib/dpkg/dpkg.h   |    7 ++-----
+ lib/dpkg/test.h   |    8 +-------
+ src/divertcmd.c   |    3 +--
+ src/main.c        |   11 +++--------
+ src/querycmd.c    |    3 +--
+ src/statcmd.c     |    3 +--
+ src/trigcmd.c     |    3 +--
+ 10 files changed, 12 insertions(+), 33 deletions(-)
+
+commit 841f42173e5d0a97bbc9f184d781d2b2e6f9f974
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 17 05:47:34 2010 +0200
+
+    libdpkg: Add new push_error_context() function
+    
+    This new function pushes a default error context.
+
+ lib/dpkg/ehandle.c        |    6 ++++++
+ lib/dpkg/ehandle.h        |    1 +
+ lib/dpkg/libdpkg.Versions |    1 +
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+
+commit de42418d9c0a255cec4440b5f99e764654440159
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 16 20:59:07 2010 +0200
+
+    libdpkg: Remove set_error_display()
+    
+    If the code needs to set a different error printer then it should push
+    a new error context instead.
+
+ lib/dpkg/ehandle.c        |   10 ----------
+ lib/dpkg/ehandle.h        |    1 -
+ lib/dpkg/libdpkg.Versions |    1 -
+ 3 files changed, 0 insertions(+), 12 deletions(-)
+
+commit 29f4ab41c95abf9639b81918d9b7aa1ca8edbe81
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 16 19:16:50 2010 +0200
+
+    libdpkg: Create a new error context in subproc_fork
+    
+    Instead of changing the current error display handler and pushing a
+    cleanup handler that exits immediately to avoid calling previously
+    set cleanup handlers, just push a new error context which will work
+    as a cleanup barrier. This also is a more natural way of using the
+    current interface.
+
+ lib/dpkg/subproc.c |   13 +++----------
+ 1 files changed, 3 insertions(+), 10 deletions(-)
+
+commit 2272d4116924caad96816871040a8c1ae16f87e9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 16 19:10:42 2010 +0200
+
+    Move error context display handler reset to error_unwind()
+    
+    Never print an error message when doing normal cleanup, as this is
+    something we always want to do.
+
+ lib/dpkg/dpkg.h    |    1 -
+ lib/dpkg/ehandle.c |    4 ++++
+ lib/dpkg/test.h    |    1 -
+ src/archives.c     |    2 +-
+ src/main.c         |    2 +-
+ src/packages.c     |    2 +-
+ src/trigproc.c     |    1 -
+ 7 files changed, 7 insertions(+), 6 deletions(-)
+
+commit bf1455085899a5203373eff34741cd7ea3d64774
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 16 19:04:13 2010 +0200
+
+    libdpkg: Add error context function handler support
+    
+    This allows the code to use a function instead of a jump buffer to
+    handle the errors, which happen to be possible for the general case,
+    when it does not need to continue processing in an upper stack frame.
+    Thus reducing the preceived complexity of simple code, and avoids
+    exposing setjmp machinery to the casual user.
+
+ lib/dpkg/ehandle.c        |   53 +++++++++++++++++++++++++++++++++++++++-----
+ lib/dpkg/ehandle.h        |    9 ++++++-
+ lib/dpkg/libdpkg.Versions |    3 +-
+ 3 files changed, 56 insertions(+), 9 deletions(-)
+
+commit e07774f1b528754ec5161af245d801158f0d4dd2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 16 22:14:18 2010 +0100
+
+    dpkg-query: Fix --search not found string to be more meaningful
+
+ src/querycmd.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit fd84ba8969bf305d97c225b44858965e53a0cb66
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 16 07:35:27 2010 +0200
+
+    Use thisname variable instead of hard-coded 'dpkg' string
+    
+    This corrects the current program name printed by other tools.
+
+ lib/dpkg/ehandle.c |    3 ++-
+ src/errors.c       |    8 +++++---
+ src/querycmd.c     |    2 +-
+ src/trigproc.c     |    2 +-
+ 4 files changed, 9 insertions(+), 6 deletions(-)
+
+commit dc98261980767f258046f8a4c2e020fcdc92c8b6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Oct 12 21:16:33 2010 +0200
+
+    dpkg-divert: Use DPKG_MAINTSCRIPT_PACKAGE environment variable
+    
+    Use it as package name on when no --package or --local options have
+    been specified.
+
+ debian/changelog  |    2 ++
+ man/dpkg-divert.8 |    8 +++++++-
+ src/divertcmd.c   |    5 +++++
+ 3 files changed, 14 insertions(+), 1 deletions(-)
+
+commit efefc09d914ecedfdad02fd07d4eb5f1c2268542
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Oct 11 20:32:50 2010 +0200
+
+    Use setaction() instead of directly assigning to cipaction
+
+ src/divertcmd.c |    2 +-
+ src/main.c      |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 521f32450d91fabaa81725b1ad89f9fafb8c82e3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 16 06:03:12 2010 +0200
+
+    libdpkg: Use ohshite in error_context_new instead of ad-hoc code
+
+ lib/dpkg/ehandle.c |   11 ++---------
+ 1 files changed, 2 insertions(+), 9 deletions(-)
+
+commit 43789e59f08dae79b07feb004c0fa1b5d357b47d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 16 05:55:33 2010 +0200
+
+    libdpkg: Make run_error_handler cope with NULL econtext gracefully
+    
+    This could happen if the context has not been initialized, or if it has
+    been unwinded more than necessary.
+
+ lib/dpkg/ehandle.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit b571373cd2e62782c3bb2b8e0bef585c4215b967
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 16 20:47:20 2010 +0200
+
+    libdpkg: Refactor error display setter into a static function
+    
+    Create a new function that takes an error context argument and sets
+    the error printer function. This allows using the new setter for
+    other error_context than econtext.
+
+ lib/dpkg/ehandle.c |   21 +++++++++++++++------
+ 1 files changed, 15 insertions(+), 6 deletions(-)
+
+commit 5dd05803b51dc2a0aae9b8ad52cd58fff5e52c88
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Oct 11 20:27:53 2010 +0200
+
+    libdpkg: Refactor error_context creation into a new function
+
+ lib/dpkg/ehandle.c |   24 +++++++++++++++++-------
+ 1 files changed, 17 insertions(+), 7 deletions(-)
+
+commit adf5d4a1a23fc631525c7a31bec11773d57c95ef
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 16 06:54:52 2010 +0200
+
+    libdpkg: Rename struct errorcontext to error_context
+
+ lib/dpkg/ehandle.c |   19 +++++++++++--------
+ 1 files changed, 11 insertions(+), 8 deletions(-)
+
+commit 160be818013039931cc06443c523fc57a7779937
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 16 06:52:02 2010 +0200
+
+    libdpkg: Rename struct cleanupentry to cleanup_entry
+
+ lib/dpkg/ehandle.c |   25 ++++++++++++++-----------
+ 1 files changed, 14 insertions(+), 11 deletions(-)
+
+commit 7ae5af538e0d7b72f1b181922a1401bc16dc44be
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Oct 11 19:28:34 2010 +0200
+
+    libdpkg: Rename jmp_buf variables to jump
+
+ lib/dpkg/ehandle.c |   19 ++++++++++---------
+ 1 files changed, 10 insertions(+), 9 deletions(-)
+
+commit 8164af77ee71e29fdd5d90157e2d0c3e52841595
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 2 21:12:08 2010 +0100
+
+    libdpkg: Rename print_error_forked() to print_subproc_error()
+
+ lib/dpkg/subproc.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e1b2a73e7723126e0cf2109c9e44a793e39ac243
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 2 20:40:13 2010 +0100
+
+    libdpkg: Rename print_error_cleanup() to print_cleanup_error()
+
+ lib/dpkg/ehandle.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit ec53fd98f3d10274e2da5722c63fd7f6588b3eaf
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 2 20:39:08 2010 +0100
+
+    libdpkg: Rename print_error_fatal() to print_fatal_error()
+
+ dselect/main.cc           |    2 +-
+ lib/dpkg/dpkg.h           |    2 +-
+ lib/dpkg/ehandle.c        |    4 +++-
+ lib/dpkg/ehandle.h        |    2 +-
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/test.h           |    2 +-
+ src/main.c                |    2 +-
+ 7 files changed, 9 insertions(+), 7 deletions(-)
+
+commit c1f899c832f5c676a8f3b36366605da1599760f6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 10 12:04:20 2010 +0200
+
+    libdpkg: Refactor default error handler into new catch_fatal_error()
+
+ dselect/main.cc           |    2 +-
+ lib/dpkg/dpkg.h           |    2 +-
+ lib/dpkg/ehandle.c        |   13 +++++++++++++
+ lib/dpkg/ehandle.h        |    1 +
+ lib/dpkg/libdpkg.Versions |    1 +
+ lib/dpkg/test.h           |    3 +--
+ src/main.c                |    2 +-
+ 7 files changed, 19 insertions(+), 5 deletions(-)
+
+commit 90ef059f7155bfc7fb45505c21030e2cc9791ce3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Oct 8 11:48:36 2010 +0200
+
+    Add a comment for translators to 'dpkg-query -l' header string
+    
+    Reported-by: Ask Hjorth Larsen <asklarsen@gmail.com>
+
+ src/querycmd.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 9d6a9e43756d2256473935429d9c2f00ad20fb0e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Oct 7 10:16:16 2010 +0200
+
+    Do not make function typedefs pointers
+
+ lib/dpkg/myopt.h |    6 +++---
+ lib/dpkg/tarfn.h |   16 ++++++++--------
+ src/main.c       |    2 +-
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+commit 7129d9473993da5e27a6d4eb73a6e900960d337f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Oct 7 10:13:13 2010 +0200
+
+    libdpkg: Rename voidfnp to void_func
+
+ lib/dpkg/myopt.h |    6 +++---
+ src/main.c       |    2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit ca92c5d2bf45984c11cf2b5f355b5cad48bf7259
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Oct 7 09:58:18 2010 +0200
+
+    libdpkg: Rename function argument to func in ACTION macro
+
+ lib/dpkg/myopt.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c9b7af92e5de0cc9ea40fad53c0e5aa5c93690cd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Oct 7 09:49:26 2010 +0200
+
+    Move action and obsolete related functionality to the myopt module
+    
+    Reduce repeated code, and localize it where it belongs.
+
+ TODO                      |    1 -
+ dpkg-deb/dpkg-deb.h       |    1 -
+ dpkg-deb/main.c           |   12 ------------
+ dpkg-split/dpkg-split.h   |    1 -
+ dpkg-split/main.c         |   13 -------------
+ lib/dpkg/libdpkg.Versions |    3 +++
+ lib/dpkg/myopt.c          |   25 +++++++++++++++++++++++++
+ lib/dpkg/myopt.h          |   13 +++++++++++++
+ src/divertcmd.c           |   20 --------------------
+ src/main.c                |   16 ----------------
+ src/main.h                |    1 -
+ src/querycmd.c            |   14 --------------
+ src/statcmd.c             |   14 --------------
+ 13 files changed, 41 insertions(+), 93 deletions(-)
+
+commit a67107c05153db3fde51301450439761e1916a80
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Oct 6 20:10:47 2010 +0200
+
+    Use ACTION macros instead of ad-hoc action function handling
+    
+    This makes the code uniform with the rest of the code base, removes
+    the possibility of mismatched entries from cmdinfos and dofunctions
+    arrays, and reduces the scope of the action pointer to main().
+
+ dpkg-deb/dpkg-deb.h     |    1 -
+ dpkg-deb/main.c         |   40 ++++++++++++++--------------------------
+ dpkg-split/dpkg-split.h |    1 -
+ dpkg-split/main.c       |   31 +++++++++++--------------------
+ 4 files changed, 25 insertions(+), 48 deletions(-)
+
+commit e8079c0ee34d4b3309ffbbd500b16525e9ec1b22
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 2 08:16:56 2010 +0100
+
+    libdpkg: Switch test.h from including dpkg/dpkg.h to dpkg/ehandle.h
+    
+    This reduces the exposed declarations for each test program.
+
+ lib/dpkg/test.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6e5d5c1f05edbe0ce2213a6658b438668fe48cba
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Oct 6 11:53:36 2010 +0200
+
+    libdpkg: Move ehandle declarations to its own header file
+
+ lib/dpkg/dpkg.h    |   33 +----------------------
+ lib/dpkg/ehandle.c |    2 +-
+ lib/dpkg/ehandle.h |   73 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 75 insertions(+), 33 deletions(-)
+
+commit 7c03c1012aaf9cce798b650ac01ac1e561c0c2f9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 2 08:15:00 2010 +0100
+
+    libdpkg: Include dpkg/dpkg.h in t-buffer for MD5HASHLEN
+
+ lib/dpkg/test/t-buffer.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 4afef203d5ae2eb54d6c8f4bd5ff016a98bf7ffc
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Oct 6 11:36:04 2010 +0200
+
+    libdpkg: Do not use m_malloc in push_checkpoint
+    
+    This avoids a cyclic dependency between ehandle.c and m_lib.c.
+
+ lib/dpkg/ehandle.c |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 3ce8687ba6a738ac9b7195060948512fa7560ada
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Oct 6 11:30:14 2010 +0200
+
+    libdpkg: Properly restore errno in push_cleanup
+    
+    The code was saving errno for latter use, but stomping on the saved
+    value by assigning again errno to it. Invert the assignment so that
+    we restore errno instead of losing it.
+
+ lib/dpkg/ehandle.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 4546c3b92d4d7d57ee9f7580d87270b791441f97
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 4 00:53:35 2010 +0100
+
+    libdpkg: Remove stream I/O support from the buffer API
+
+ lib/dpkg/buffer.c |   15 ---------------
+ lib/dpkg/buffer.h |   13 -------------
+ 2 files changed, 0 insertions(+), 28 deletions(-)
+
+commit 2a71e444e863a4bf28b7dd39e621c44ab771db99
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 11 06:21:36 2010 +0200
+
+    dpkg-deb: Remove unused safe_fflush function
+    
+    This function was used to fix a problem with undefined behaviour on
+    input streams, which does not apply anymore as it's not used.
+
+ dpkg-deb/extract.c |   18 ------------------
+ 1 files changed, 0 insertions(+), 18 deletions(-)
+
+commit 2d420ee1d05033d237462a0075facfe406b08043
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 4 00:51:13 2010 +0100
+
+    dpkg-deb: Use fd instead of stream based buffered I/O
+    
+    Behaviour of fflush() on input streams is undefined per POSIX, avoid
+    mixing stream and file descriptor based I/O, and only use the latter
+    instead.
+
+ dpkg-deb/extract.c |   87 +++++++++++++++++++++++++++++++++++++---------------
+ 1 files changed, 62 insertions(+), 25 deletions(-)
+
+commit ceb07b08dad4d5eead630064f45c7e7ded00a341
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 16 19:52:41 2010 +0200
+
+    Refactor file_stat code
+    
+    Create a new file_stat struct, and use it instead of the
+    filestatoverride one.
+
+ lib/dpkg/file.h  |   11 ++++++++-
+ lib/dpkg/tarfn.c |   14 ++++++------
+ lib/dpkg/tarfn.h |    9 ++++---
+ src/archives.c   |   63 ++++++++++++++++++++++++-----------------------------
+ src/filesdb.h    |   24 +++++++++-----------
+ src/statcmd.c    |   14 ++++++------
+ src/statdb.c     |    5 ++-
+ 7 files changed, 72 insertions(+), 68 deletions(-)
+
+commit 0cb6f131d85f48f0dc8a90ca1329af84c6f6ebc1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 12 07:22:21 2010 +0200
+
+    libdpkg: Refactor file locking error message handling
+    
+    Pass only the description of the resource being locked, and move generic
+    error strings inside the file lock funtions. Instead of changing locking
+    behaviour depending on the error strings passed, pass an explicit enum to
+    select it.
+
+ lib/dpkg/dbmodify.c     |    4 +---
+ lib/dpkg/file.c         |   24 ++++++++++++++++--------
+ lib/dpkg/file.h         |    9 +++++++--
+ lib/dpkg/trigdeferred.l |    3 +--
+ 4 files changed, 25 insertions(+), 15 deletions(-)
+
+commit 4ff39dabad2cd8e384f26f3212a55b5adbeb71d9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 11 06:20:37 2010 +0200
+
+    Update TODO list
+
+ TODO |   25 +++++++++++++++++++++----
+ 1 files changed, 21 insertions(+), 4 deletions(-)
+
+commit 9d834b3f654f771ab5ae8790cfc83086288fca07
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Tue Nov 9 19:59:35 2010 +0100
+
+    Fix translation of "however" in Italian. Thanks to Pietro Battiston Closes: #602518
+
+ debian/changelog |    2 ++
+ po/it.po         |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 6a7e76a292d865e3abeff4fdd086780dda3f49d8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 11 06:19:17 2010 +0200
+
+    libdpkg: Remove unused stream_md5 macro
+
+ lib/dpkg/buffer.h |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+commit 6dc69c63307f28eb49a130b8635dbc6353eb4f4e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 2 07:44:05 2010 +0100
+
+    dpkg-deb: Coalesce similar strings
+    
+    Those include the ones involving control and data members, change of
+    directory and temporary directory creation.
+
+ dpkg-deb/build.c |   39 ++++++++++++++++++++++++---------------
+ dpkg-deb/info.c  |    4 ++--
+ 2 files changed, 26 insertions(+), 17 deletions(-)
+
+commit e547cbf6aaa2e34359d5a042298bf3b0db73a2fc
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 22 23:00:19 2010 +0100
+
+    Unify execution error strings
+
+ dpkg-deb/build.c               |    6 +++---
+ dpkg-deb/extract.c             |    7 ++++---
+ dpkg-deb/info.c                |    4 ++--
+ dpkg-split/split.c             |    7 ++++---
+ scripts/Dpkg/IPC.pm            |    2 +-
+ scripts/Dpkg/Shlibs/Cppfilt.pm |    3 ++-
+ scripts/dpkg-gencontrol.pl     |    2 +-
+ scripts/dpkg-shlibdeps.pl      |    2 +-
+ src/configure.c                |   10 ++++++----
+ src/help.c                     |    2 +-
+ src/processarc.c               |   12 ++++++++----
+ 11 files changed, 33 insertions(+), 24 deletions(-)
+
+commit ec5ad1fb6ead0e4a4833cc4b54efad92538d4757
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 11 06:12:49 2010 +0200
+
+    Clarify several archive member strings
+    
+    This will make translators and users life easier, as the new strings
+    are less ambiguous, and try to avoid second meanings.
+
+ dpkg-deb/extract.c |   27 ++++++++++++++++-----------
+ dpkg-split/info.c  |   25 +++++++++++++------------
+ 2 files changed, 29 insertions(+), 23 deletions(-)
+
+commit 1dddc6d46dbf6f3611cf0979e27547d06f9549c3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 8 03:57:10 2010 +0200
+
+    dpkg: Rename unlinkorrmdir() to secure_remove()
+    
+    Maps better to the system remove(2) function name.
+
+ src/archives.c |   11 +++++++----
+ src/archives.h |    3 ++-
+ src/cleanup.c  |    6 +++---
+ 3 files changed, 12 insertions(+), 8 deletions(-)
+
+commit fb82caee40a3b71d5a37735561398a086cc47fdf
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 31 11:09:37 2010 +0100
+
+    dpkg-source: fail properly when debian/source/format is empty
+    
+    Reported-by: Eduard Bloch <blade@debian.org>
+
+ debian/changelog       |    3 +++
+ scripts/dpkg-source.pl |    4 +++-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 4c90c631bdb176452152ecde5903802cad699317
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 31 10:35:55 2010 +0100
+
+    Dpkg::Compression: fix typo in documentation.
+
+ scripts/Dpkg/Compression.pm |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e12fa2ffc6c2df7446c7957a7875c13f79ff0dfa
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Sat Oct 30 23:14:27 2010 +0200
+
+    Some fixes to dpkg-gensymbols manpage, helped by Raphaël's eyes
+
+ man/po/fr.po |   37 +++++++++++++++++--------------------
+ 1 files changed, 17 insertions(+), 20 deletions(-)
+
+commit 25afe6a37eace19f85ad742ed6fdc65242e0f109
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Sat Oct 30 16:07:50 2010 +0200
+
+    French (Christian Perrier). Including a typo fix and a typographical change reported by Vincent Danjean Closes: #601852
+
+ debian/changelog |    4 +++-
+ man/po/fr.po     |    6 +++---
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 129c6000089f0ec204d26674e201207d1b3f6098
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Mon Oct 25 11:18:22 2010 +0200
+
+    Use impersonal language in German dselect translation
+
+ debian/changelog |    1 +
+ dselect/po/de.po |   79 +++++++++++++++++++++++------------------------------
+ 2 files changed, 35 insertions(+), 45 deletions(-)
+
+commit 8e2addc9b3995f2996d5b1552697e4eb27e6e06f
+Author: Jordi Mallach <jordi@debian.org>
+Date:   Sun Oct 24 18:13:58 2010 +0200
+
+    Catalan updates for dpkg-dev and dselect.
+
+ debian/changelog |    4 +
+ dselect/po/ca.po |  247 ++++++++---------
+ scripts/po/ca.po |  834 ++++++++++++++++++++++++++----------------------------
+ 3 files changed, 524 insertions(+), 561 deletions(-)
+
+commit 586140a367a8347c8636b95da37d78d1153f8a4b
+Author: Jordi Mallach <jordi@debian.org>
+Date:   Sun Oct 24 16:24:32 2010 +0200
+
+    Catalan (Jordi Mallach).
+
+ debian/changelog |    1 +
+ po/ca.po         | 1304 +++++++++++++++++++++--------------------------------
+ 2 files changed, 518 insertions(+), 787 deletions(-)
+
+commit b9b4607bba0b1eddc2d911e4341f6c867b3754d6
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Tue Oct 19 21:06:57 2010 +0200
+
+    Fix several clumsy wordings in German dpkg translation
+
+ po/de.po |   16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+commit a7d320a091c12ac25bc95e1230a96deca9699e8c
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Sat Oct 16 20:54:13 2010 +0200
+
+    Fix typo in German scripts translation
+
+ debian/changelog |    3 +++
+ scripts/po/de.po |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 1ed0e8019cc7837d6921537ba8f21e0ce5004b09
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Sat Oct 16 21:01:56 2010 +0200
+
+    Add Holger Wansing to THANKS
+    
+    He has contributed considerably to the German translation of both dpkg
+    and the scripts in dpkg-dev.
+
+ THANKS |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 4fb1422779fb3eddd12e74221387536538007f3b
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Fri Oct 15 13:57:45 2010 +0200
+
+    Use impersonal language in German dpkg translation
+    
+    Many thanks to Holger Wansing for his initial patch.
+
+ debian/changelog |    2 +-
+ po/de.po         |  829 ++++++++++++++++++++++++++----------------------------
+ 2 files changed, 394 insertions(+), 437 deletions(-)
+
+commit dd5c0b54eabfd0dc3037cb21628e8877f6981b4c
+Author: Ask Hjorth Larsen <asklarsen@gmail.com>
+Date:   Fri Oct 15 07:35:35 2010 +0200
+
+    Updated Danish translation
+
+ debian/changelog |    1 +
+ po/da.po         | 3267 ++++++++++++++++++++++-------------------------------
+ 2 files changed, 1357 insertions(+), 1911 deletions(-)
+
+commit 38ce2434797f726cfa28c53b12d64f3721749329
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Wed Oct 13 20:59:56 2010 +0200
+
+    Basque (Iñaki Larrañaga Murgoitio). Closes: #599923
+
+ debian/changelog |    1 +
+ po/eu.po         | 2923 ++++++++++++++++++++++--------------------------------
+ 2 files changed, 1169 insertions(+), 1755 deletions(-)
+
+commit 4070ac0e4e2c6d325f792f9e08d9199a0b0ab689
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Sun Oct 3 13:23:19 2010 +0200
+
+    Fix Clytie's name in debian/changelog
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 3 09:36:48 2010 +0200
+
+    dpkg-source: correctly create .pc/.quilt_series with alternate series files
+    
+    If you have debian/patches/ubuntu.series and you were unpacking the source
+    package on ubuntu, quilt was still directed to debian/patches/series
+    instead of debian/patches/ubuntu.series.
+
+ debian/changelog                        |    3 +++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    4 +++-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit b85cfa6a0481c3937219f8739a83954d034c35b0
+Author: James Vega <jamessan@debian.org>
+Date:   Tue Sep 21 15:58:11 2010 -0400
+
+    Add non-regression test for Dpkg::Version ensuring -0.6.5 << 0.9.1
+    
+    dpkg treats "-0.6.5" as a version with only a revision component, so it
+    compares less than any version with a version component > 0.
+    
+    Signed-off-by: James Vega <jamessan@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/t/100_Dpkg_Version.t |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit f97da90b79717f8382ab20183b304a9be3f56c9f
+Author: James Vega <jamessan@debian.org>
+Date:   Tue Sep 21 16:47:04 2010 -0400
+
+    Dpkg::Version: Handle versions without a version component like dpkg.
+    
+    Signed-off-by: James Vega <jamessan@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ THANKS                  |    1 +
+ debian/changelog        |    3 +++
+ scripts/Dpkg/Version.pm |    2 +-
+ 3 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 5e7cc75fd242351a4df7c6c8c56e1e9337cfdb35
+Author: Clytie Siddall <clytie@riverland.net.au>
+Date:   Wed Sep 29 21:57:03 2010 +0200
+
+    Vietnamese translation update
+
+ debian/changelog |    1 +
+ po/vi.po         | 2751 +++++++++++++++++-------------------------------------
+ 2 files changed, 870 insertions(+), 1882 deletions(-)
+
+commit b1beab8611fb617aca0066d1db8214710554bf8d
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Mon Sep 20 07:11:39 2010 +0200
+
+    Re-add originally omitted mention of version 2.0 as mentioning it is not a bug in the original version of manpages
+
+ man/po/fr.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit cb79fe7b831de839a85c435b1a282f1d6377a70b
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Wed Sep 29 12:24:58 2010 +0200
+
+    Fix two format strings in German dpkg translation
+
+ debian/changelog |    3 ++-
+ po/de.po         |    8 ++++----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 80939d833b4dc1d33f091a59bde82f5b78d86168
+Merge: 7dcf45e f3a8a02
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 19 18:24:49 2010 +0200
+
+    Merge commit '1.15.8.5'
+
+commit c63ef5f286ed3cbb456a099d12c056774e1af791
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 19 13:44:34 2010 +0200
+
+    Fix invalid markup in French man pages translation
+
+ man/po/fr.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 67462a968d2dc3a8fe75b47ce2875d28d05cf2a3
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 19 11:53:43 2010 +0200
+
+    dpkg-source: properly exclude debian/source/local-options in source format 1.0
+    
+    commit 2290a1248af081c6df98805295d921e919624356 introduced a regression
+    for V1 native packages since they were no longer excluding
+    debian/source/local-options.
+
+ scripts/Dpkg/Source/Package/V1.pm |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit f9710dd96182c6da2e7a310ac9293e7d8983cc30
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Sun Sep 19 13:01:18 2010 +0200
+
+    French translation completed (yesssss): 1937t
+
+ man/po/fr.po |  133 ++++++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 79 insertions(+), 54 deletions(-)
+
+commit c781df2c886c4ca40a47b0609aa8ad87ce2f98ef
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Sun Sep 19 12:48:24 2010 +0200
+
+    Replace jargonic 'diff' in French translation
+
+ scripts/po/fr.po |   24 ++++++++++++------------
+ 1 files changed, 12 insertions(+), 12 deletions(-)
+
+commit 2290a1248af081c6df98805295d921e919624356
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Sep 18 22:40:00 2010 +0200
+
+    dpkg-source: ensure debian/source/local-options is always excluded
+    
+    It should be excluded even if the user provides -I or -i options to
+    override the lists of files to ignore.
+    
+    Reported-by: Robert Luberda <robert@debian.org>
+
+ debian/changelog               |    5 +++++
+ scripts/Dpkg/Source/Package.pm |    2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit c30b08b89e0eee39147c5b10fb8c48ad37522115
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Sat Sep 18 15:27:02 2010 +0200
+
+    French translation update: 1894t15f28u
+
+ man/po/fr.po |  191 +++++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 96 insertions(+), 95 deletions(-)
+
+commit f363698d3be17cb9dca6441d2d28cf7d1a3e92a7
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Fri Sep 17 19:39:14 2010 +0200
+
+    French translation update: 1844t37f56u
+
+ man/po/fr.po |   51 +++++++++++++++++++++++++++++++++++----------------
+ 1 files changed, 35 insertions(+), 16 deletions(-)
+
+commit e4c8520a9170c3de82ba81da5ad55ed3bf6d69fc
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Wed Sep 15 20:00:53 2010 +0200
+
+    French translation update: 1827t43f67u
+
+ man/po/fr.po |   22 ++++++++++++++++++----
+ 1 files changed, 18 insertions(+), 4 deletions(-)
+
+commit a002efe31657717a3d494eb36720fc4ed37a3d64
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Sep 15 14:00:38 2010 +0200
+
+    Fix changelog entry for Spanish man page translation
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b944ba77a64bc6541469624cadbebb3771c81cdb
+Author: Omar Campagne <ocampagne@gmail.com>
+Date:   Tue Sep 14 20:30:06 2010 +0200
+
+    Spanish manpages translation: 1937t
+
+ debian/changelog |    1 +
+ man/po/es.po     |  142 +++++++++++++++++++++++++-----------------------------
+ 2 files changed, 67 insertions(+), 76 deletions(-)
+
+commit ebe90372984fa3327b5dec3532a17ce5f69db0d3
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Tue Sep 14 20:28:41 2010 +0200
+
+    Revert "Portuguese programs translation: 985t"
+    
+    This reverts commit 8c1d74494cf2572905d54dbd7dbc6357b2d53986.
+
+ debian/changelog |    1 -
+ man/po/es.po     |  142 +++++++++++++++++++++++++++++-------------------------
+ 2 files changed, 76 insertions(+), 67 deletions(-)
+
+commit 8c1d74494cf2572905d54dbd7dbc6357b2d53986
+Author: Omar Campagne <ocampagne@gmail.com>
+Date:   Tue Sep 14 20:28:14 2010 +0200
+
+    Portuguese programs translation: 985t
+
+ debian/changelog |    1 +
+ man/po/es.po     |  142 +++++++++++++++++++++++++-----------------------------
+ 2 files changed, 67 insertions(+), 76 deletions(-)
+
+commit 155b82af3826882f889575632c97f4f4e34c154a
+Author: Miguel Figueiredo <elmig@debianpt.org>
+Date:   Tue Sep 14 20:24:59 2010 +0200
+
+    Portuguese programs translation: 985t
+
+ debian/changelog |    1 +
+ po/pt.po         | 1597 ++++++++++++++++++++++++------------------------------
+ 2 files changed, 705 insertions(+), 893 deletions(-)
+
+commit 1e0ebe98db83e59cc67cdfe446d4b4d8bb94212d
+Author: Yuri Kozlov <yuray@komyakino.ru>
+Date:   Tue Sep 14 20:21:05 2010 +0200
+
+    russian programs translation: 985t
+
+ debian/changelog |    3 +
+ po/ru.po         | 1305 ++++++++++++++++++++++++------------------------------
+ 2 files changed, 588 insertions(+), 720 deletions(-)
+
+commit 0ca8a4c9edfa48ca2161548288ced374044bc51a
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Tue Sep 14 20:18:37 2010 +0200
+
+    Changelog for french translation update of manpages
+
+ debian/changelog |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit f4b87357b968b08d664c0c4e2356d5613a840394
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Tue Sep 14 20:17:37 2010 +0200
+
+    French manpages translation update. dpkg-gensymbols completed: 1819t43f75u
+
+ man/po/fr.po |  356 ++++++++++++++++++++++++++--------------------------------
+ 1 files changed, 160 insertions(+), 196 deletions(-)
+
+commit f3a8a022f1a2edc5ff8d0e92ffc3e48e84be8b39
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 14 01:26:55 2010 +0200
+
+    Release 1.15.8.5
+
+ debian/changelog |   27 ++++++++++++---------------
+ 1 files changed, 12 insertions(+), 15 deletions(-)
+
+commit 6e68e34aa82b89c646c787b33c886ded353fe2b0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 14 01:14:26 2010 +0200
+
+    Update .po files from .pot files
+
+ man/po/fr.po     |  861 +++++++++++++++++++++++++++++++++---------------------
+ po/fr.po         |   13 +-
+ po/sv.po         |    3 +-
+ scripts/po/de.po |    8 +-
+ scripts/po/fr.po |   30 +-
+ 5 files changed, 548 insertions(+), 367 deletions(-)
+
+commit 4e91f3b1f1ad036e0f1e4b9f09c0b2fb787865fd
+Author: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>
+Date:   Mon Sep 13 18:25:38 2010 +0200
+
+    Updated Indonesian translation:985t
+
+ debian/changelog |    1 +
+ po/id.po         | 3352 +++++++++++++++++++++---------------------------------
+ 2 files changed, 1301 insertions(+), 2052 deletions(-)
+
+commit ec2984de3e0df21bc13cf29427ac3f096f5baee9
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Mon Sep 13 07:54:12 2010 +0200
+
+    Updated French translation: 1765t57f115u and an aspirin
+
+ man/po/fr.po |   65 +++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 1 files changed, 56 insertions(+), 9 deletions(-)
+
+commit c6389ad4e1763e0a1d4fa6573f8b24480ac95f11
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Mon Sep 13 12:16:29 2010 +0200
+
+    Fix typo in French manpages translation
+    
+    It caused a build failure.
+
+ man/po/fr.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e5fc68ee96fe17bb7fbe5d2fe4742bb87843dacd
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Sun Sep 12 13:40:39 2010 +0200
+
+    Spanish translation for scripts
+
+ debian/changelog |    1 +
+ scripts/po/es.po |  168 ++++++++++++++++--------------------------------------
+ 2 files changed, 50 insertions(+), 119 deletions(-)
+
+commit 4d6c43090715ea4ed74b376bdc7bff73faaa569a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Sep 11 10:13:53 2010 +0200
+
+    Update dpkg's Breaks dependency to include dpkg-dev (<< 1.15.8)
+    
+    It ensures that older versions of dpkg-dev that did not depend on
+    libdpkg-perl must be upgraded together with dpkg.
+    
+    Reported-by: Lionel Elie Mamane <lionel@mamane.lu>
+
+ debian/changelog |    3 +++
+ debian/control   |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 0f3e3a0fba6d7d1613c88158daf9dec2545f58cd
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Fri Sep 10 18:29:45 2010 +0200
+
+    French translation update: 1742t58f137u
+
+ man/po/fr.po |   27 ++++++++++++++++++---------
+ 1 files changed, 18 insertions(+), 9 deletions(-)
+
+commit 2cd3908475ec426938f7bc2fe672cd4a585d8c20
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Fri Sep 10 18:09:08 2010 +0200
+
+    More occurrences of the same translation
+
+ scripts/po/fr.po |   28 ++++++++++++++--------------
+ 1 files changed, 14 insertions(+), 14 deletions(-)
+
+commit ac9c5cec1039cd3d4b9ba86d23e35faeaa3f963a
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Fri Sep 10 18:03:38 2010 +0200
+
+    Fix to French translation for #596333
+
+ debian/changelog |    3 ++-
+ scripts/po/fr.po |    4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 1028f4974031505522e122650cded3cefc2209d5
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Thu Sep 9 20:45:37 2010 +0200
+
+    French translation update of manpages: 1733t61f143u
+
+ man/po/fr.po |   59 +++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 1 files changed, 50 insertions(+), 9 deletions(-)
+
+commit 51c03b35f3471579d38af78b9ea7f6d5ba20114b
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Thu Sep 9 20:45:06 2010 +0200
+
+    French translation update of programs: 985t
+
+ po/fr.po |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 9334122903e67a6054423109ea9a5c7d73c2381c
+Author: Felipe E. F. de Castro <fefcas@gmail.com>
+Date:   Thu Sep 9 07:18:10 2010 +0200
+
+    Esperanto programs translation update (985t)
+
+ debian/changelog |    1 +
+ po/eo.po         | 1538 ++++++++++++++++--------------------------------------
+ 2 files changed, 462 insertions(+), 1077 deletions(-)
+
+commit afa06d045f42754eeb2e547653c6e0fefc692603
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Wed Sep 8 07:14:22 2010 +0200
+
+    French translation update: 985t
+
+ po/fr.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit bcb2da3d33f7bf8c036938b49e7dac9545650f20
+Author: Ivan Masár <helix84@centrum.sk>
+Date:   Wed Sep 8 07:12:51 2010 +0200
+
+    Slovak translation update: 985t
+
+ debian/changelog |    1 +
+ po/sk.po         | 1473 +++++++++++-------------------------------------------
+ 2 files changed, 285 insertions(+), 1189 deletions(-)
+
+commit da1e9ff3db86102756145763fc0a76cdc99df9bd
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Tue Sep 7 10:54:53 2010 +0200
+
+    Fix two singular forms in German dpkg translation
+
+ po/de.po |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit c827666cf066f9faf885e69130ffec71801f060e
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Mon Sep 6 20:49:41 2010 +0200
+
+    French manpages translation update: 1714t63f160u
+
+ man/po/fr.po |  233 +++++++++++++++++++++++++++------------------------------
+ 1 files changed, 110 insertions(+), 123 deletions(-)
+
+commit a9c7e8795faef90f8068edbaa286bfb622f19d67
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Mon Sep 6 07:48:50 2010 +0200
+
+    French translation update: 1633t104f200u
+
+ man/po/fr.po |   55 ++++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+commit 21f25047bfd3a95152e8607252f8b07fc2a339f6
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Sun Sep 5 19:45:43 2010 +0200
+
+    French manpages translation update: 1614t108f215u
+
+ man/po/fr.po |   57 +++++++++++++++++++++++++++------------------------------
+ 1 files changed, 27 insertions(+), 30 deletions(-)
+
+commit 84579a6c0dedfce3e27da411f7a05f920382ffc1
+Author: Milo Casagrande <milo@ubuntu.com>
+Date:   Sun Sep 5 15:18:23 2010 +0200
+
+    Updated Italian translation (985t)
+
+ debian/changelog |    1 +
+ po/it.po         |   60 ++++++++++++++++++++---------------------------------
+ 2 files changed, 24 insertions(+), 37 deletions(-)
+
+commit aeb5b66efd7a08b54f6e68092d2e2d7a4c54b840
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Sep 5 16:57:28 2010 +0200
+
+    Fix encoding of German addendum. Closes: #595643.
+
+ debian/changelog |    3 +++
+ man/po/po4a.cfg  |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 4d2b04f3e62d02a223e12eea1947fde1e3695334
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 5 09:43:32 2010 +0200
+
+    dpkg-source: drop -k parameter from the tar command line used to extract tarballs
+    
+    dpkg-source only extracts tarballs in directories that it has created
+    itself, there's no risk of overwriting any user files. Furthermore in
+    the few cases where we do extract a tarball on a non-empty directory,
+    we really want to be able to overwrite files already present. That's the
+    case with a debian.tar.gz file.
+    
+    Reported-by: James Westby <james.westby@linaro.org>
+
+ debian/changelog               |    4 ++++
+ scripts/Dpkg/Source/Archive.pm |    2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 5a8212b7b0862e26ec94cbeb78d73411831bde15
+Author: Changwoo Ryu <cwryu@debian.org>
+Date:   Sun Sep 5 08:00:03 2010 +0200
+
+    Korean translation update: 985t
+
+ debian/changelog |    1 +
+ po/ko.po         | 2287 ++++++++++++++++--------------------------------------
+ 2 files changed, 664 insertions(+), 1624 deletions(-)
+
+commit 91d6d911a81b5be64aa823c71efa0acaedb6bf9d
+Author: Kenshi Muto <kmuto@debian.org>
+Date:   Sun Sep 5 07:58:31 2010 +0200
+
+    Japanese translation update: 985t
+
+ debian/changelog |    1 +
+ po/ja.po         | 2326 ++++++++++++++++--------------------------------------
+ 2 files changed, 688 insertions(+), 1639 deletions(-)
+
+commit d15c4e1c1edfb3a5610680992a3beb134e62fe0b
+Author: Hans F. Nordhaug <Hans.F.Nordhaug@hiMolde.no>
+Date:   Fri Sep 3 08:38:30 2010 +0200
+
+    Norwegian Bokmål translation update for dselect: 277t
+
+ debian/changelog |    1 +
+ dselect/po/nb.po |   30 ++++++++++++++----------------
+ 2 files changed, 15 insertions(+), 16 deletions(-)
+
+commit 7dcf45e32f62859cbea8337c46ce7fc6b6349b56
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Sep 2 15:38:49 2010 +0200
+
+    Revert "Russian translation update of scripts: 511f2u"
+    
+    This reverts commit 2d7029e9e045e9ac3c740251ae52c98bddbf8b35.
+
+ debian/changelog |    1 -
+ scripts/po/ru.po |  385 ++++++++++++++++++++++++++++++++----------------------
+ 2 files changed, 226 insertions(+), 160 deletions(-)
+
+commit 34b3faea11302ad27f99f2136136b54af35e6f39
+Author: Hans F. Nordhaug <Hans.F.Nordhaug@hiMolde.no>
+Date:   Thu Sep 2 06:20:32 2010 +0200
+
+    Norwegian Bokmål translation update: 985
+
+ debian/changelog |    1 +
+ po/nb.po         | 1393 +++++++++++++++++++++++-------------------------------
+ 2 files changed, 593 insertions(+), 801 deletions(-)
+
+commit 0c657927fd0e2592f48559e3abc54b5ca6ef20fe
+Author: Yuri Kozlov <yuray@komyakino.ru>
+Date:   Thu Sep 2 06:18:58 2010 +0200
+
+    Russian translation update: 513t
+
+ debian/changelog |    1 +
+ scripts/po/ru.po |  391 +++++++++++++++++++++--------------------------------
+ 2 files changed, 156 insertions(+), 236 deletions(-)
+
+commit 2d7029e9e045e9ac3c740251ae52c98bddbf8b35
+Author: Yuri Kozlov <yuray@komyakino.ru>
+Date:   Wed Sep 1 22:10:39 2010 +0200
+
+    Russian translation update of scripts: 511f2u
+
+ debian/changelog |    1 +
+ scripts/po/ru.po |  385 ++++++++++++++++++++++--------------------------------
+ 2 files changed, 160 insertions(+), 226 deletions(-)
+
+commit d9eb4619108bf6f3006da189eebcf2846529915a
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Wed Sep 1 21:52:56 2010 +0200
+
+    French translation update: 118f219u
+
+ man/po/fr.po |  223 ++++++++++++++++++++-------------------------------------
+ 1 files changed, 78 insertions(+), 145 deletions(-)
+
+commit a272d4387c066ed347d6debb0e2ea3786b68bef5
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Wed Sep 1 07:53:30 2010 +0200
+
+    French translation update
+
+ scripts/po/fr.po |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 99128995b4b0973f0bfa8d971fa784ec8ebdfc4b
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Wed Sep 1 07:51:59 2010 +0200
+
+    French translation update
+
+ po/fr.po |   38 +++++++++++++++++++-------------------
+ 1 files changed, 19 insertions(+), 19 deletions(-)
+
+commit 0cfc1f07759be5597e2f4bcbc4cca9180929c7e8
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Sep 1 21:24:19 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 513t
+
+ scripts/po/de.po |   17 ++++++-----------
+ 1 files changed, 6 insertions(+), 11 deletions(-)
+
+commit 309d92878a7572032ea3f97f0bc3e1971f8db18d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 1 09:43:30 2010 +0200
+
+    libdpkg: Clarify fd_fd_copy error string in dpkg_ar_member_put_header
+    
+    This makes the error string clearer, and as a side effect removes a
+    bogus warning due to the non literal format string, which is perfectly
+    fine here as it's under complete control from the programmer.
+    
+    Reported-by: Sandro Cazzaniga <cazzaniga.sandro@gmail.com>
+
+ lib/dpkg/ar.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fd194e479228a39fe614eb771503d6f1abe9204a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 1 09:39:56 2010 +0200
+
+    Bump version to 1.16.0
+
+ TODO             |    5 +----
+ debian/changelog |    2 +-
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+commit 5a80ec6ce8e598aad378a71c29d699a27ea8691f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 29 20:26:53 2010 +0200
+
+    libcompat: On successful realloc assign the newlist to list
+
+ debian/changelog     |    3 +++
+ lib/compat/scandir.c |    1 +
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit fb0c2d9c5c285c2b1d74fb3ece60af5b76a7591d
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Wed Sep 1 09:09:27 2010 +0200
+
+    German dpkg translation update
+    
+    Update to 985t.
+
+ debian/changelog |    9 +++--
+ po/de.po         |   82 +++++++++++++++++++++--------------------------------
+ 2 files changed, 38 insertions(+), 53 deletions(-)
+
+commit dbbd15fe8d972b4f8f3a4d94934a99c507cf0596
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 1 08:15:38 2010 +0200
+
+    u-a: Fix possible segfault if master_file contains a format specifier
+    
+    The input does not get sanitized, and as such the user could end up
+    registering a file containing format string specifiers, which would
+    make the pr() call most probably segfault trying to access an invalid
+    pointer.
+    
+    Reported-by: Sandro Cazzaniga <cazzaniga.sandro@gmail.com>
+
+ debian/changelog            |    3 +++
+ utils/update-alternatives.c |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit bd4e6a31a2ee08eecaada32965bcc8391c3f8931
+Author: Peter Krefting <peterk@debian.org>
+Date:   Tue Aug 31 20:35:03 2010 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: 985t0f0u.
+    scripts/po/sv.po: 513t0f0u.
+
+ po/sv.po         |   56 ++++++++++++++++++-----------------------------------
+ scripts/po/sv.po |   19 ++++++-----------
+ 2 files changed, 26 insertions(+), 49 deletions(-)
+
+commit ecb1383297b204f19f58434656fa61a0079d3137
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Aug 31 21:12:56 2010 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |    2 +-
+ dselect/po/ca.po        |    2 +-
+ dselect/po/cs.po        |    2 +-
+ dselect/po/da.po        |    2 +-
+ dselect/po/de.po        |    2 +-
+ dselect/po/dselect.pot  |    4 +-
+ dselect/po/el.po        |    2 +-
+ dselect/po/es.po        |    2 +-
+ dselect/po/et.po        |    2 +-
+ dselect/po/eu.po        |    2 +-
+ dselect/po/fr.po        |    2 +-
+ dselect/po/gl.po        |    2 +-
+ dselect/po/hu.po        |    2 +-
+ dselect/po/id.po        |    2 +-
+ dselect/po/it.po        |    2 +-
+ dselect/po/ja.po        |    2 +-
+ dselect/po/ko.po        |    2 +-
+ dselect/po/nb.po        |    2 +-
+ dselect/po/nl.po        |    2 +-
+ dselect/po/nn.po        |    2 +-
+ dselect/po/pl.po        |    2 +-
+ dselect/po/pt.po        |    2 +-
+ dselect/po/pt_BR.po     |    2 +-
+ dselect/po/ro.po        |    2 +-
+ dselect/po/ru.po        |    2 +-
+ dselect/po/sk.po        |    2 +-
+ dselect/po/sv.po        |    2 +-
+ dselect/po/tl.po        |    2 +-
+ dselect/po/vi.po        |    2 +-
+ dselect/po/zh_CN.po     |    2 +-
+ dselect/po/zh_TW.po     |    2 +-
+ man/po/dpkg-man.pot     |    5 +-
+ man/po/fr.po            |  336 ++++++++++++++------------
+ man/po/sv.po            |   28 +--
+ po/ast.po               |  371 +++++++++++++++-------------
+ po/bs.po                |  350 ++++++++++++++-------------
+ po/ca.po                |  375 ++++++++++++++++-------------
+ po/cs.po                |  374 ++++++++++++++++--------------
+ po/da.po                |  367 +++++++++++++++-------------
+ po/de.po                |  384 ++++++++++++++++--------------
+ po/dpkg.pot             |  353 ++++++++++++++-------------
+ po/dz.po                |  367 +++++++++++++++-------------
+ po/el.po                |  368 +++++++++++++++-------------
+ po/eo.po                |  371 +++++++++++++++-------------
+ po/es.po                |  370 +++++++++++++++-------------
+ po/et.po                |  359 +++++++++++++++-------------
+ po/eu.po                |  371 +++++++++++++++-------------
+ po/fr.po                |  610 +++++++++++++++++------------------------------
+ po/gl.po                |  367 +++++++++++++++-------------
+ po/hu.po                |  357 ++++++++++++++-------------
+ po/id.po                |  357 ++++++++++++++-------------
+ po/it.po                |  383 ++++++++++++++++--------------
+ po/ja.po                |  368 +++++++++++++++-------------
+ po/km.po                |  367 +++++++++++++++-------------
+ po/ko.po                |  368 +++++++++++++++-------------
+ po/ku.po                |  353 ++++++++++++++-------------
+ po/lt.po                |  362 +++++++++++++++-------------
+ po/mr.po                |  369 +++++++++++++++-------------
+ po/nb.po                |  367 +++++++++++++++-------------
+ po/ne.po                |  367 +++++++++++++++-------------
+ po/nl.po                |  369 +++++++++++++++-------------
+ po/nn.po                |  367 +++++++++++++++-------------
+ po/pa.po                |  353 ++++++++++++++-------------
+ po/pl.po                |  385 ++++++++++++++++--------------
+ po/pt.po                |  369 +++++++++++++++-------------
+ po/pt_BR.po             |  368 +++++++++++++++-------------
+ po/ro.po                |  382 ++++++++++++++++-------------
+ po/ru.po                |  393 +++++++++++++++++--------------
+ po/sk.po                |  385 ++++++++++++++++--------------
+ po/sv.po                |  384 ++++++++++++++++--------------
+ po/th.po                |  403 ++++++++++++++++---------------
+ po/tl.po                |  369 +++++++++++++++-------------
+ po/vi.po                |  357 ++++++++++++++-------------
+ po/zh_CN.po             |  382 ++++++++++++++++--------------
+ po/zh_TW.po             |  367 +++++++++++++++-------------
+ scripts/po/ca.po        |   79 ++++---
+ scripts/po/de.po        |   94 +++++---
+ scripts/po/dpkg-dev.pot |   81 ++++---
+ scripts/po/es.po        |   92 +++++---
+ scripts/po/fr.po        |  172 +++++---------
+ scripts/po/pl.po        |  101 +++++---
+ scripts/po/ru.po        |   98 +++++---
+ scripts/po/sv.po        |   93 +++++---
+ 83 files changed, 8759 insertions(+), 7892 deletions(-)
+
+commit ceea74fa7d3545bdeeae30ac6e4ce592703675bd
+Author: Theppitak Karoonboonyanan <thep@debian.org>
+Date:   Tue Aug 31 21:09:47 2010 +0200
+
+    Update Thai program translation
+    
+    Closes: #594011
+
+ debian/changelog |    1 +
+ po/th.po         | 1383 +++++++++++++++++++++++-------------------------------
+ 2 files changed, 593 insertions(+), 791 deletions(-)
+
+commit 8292cbac06d3c335bcde52542db20384c8fedd5d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Aug 31 17:17:00 2010 +0200
+
+    Add missing bug closure.
+
+ debian/changelog |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 70c35e6a3a8dca72d34bfcfb3c9d7c31adbc2ed4
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Aug 29 14:51:25 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1937t.
+
+ man/po/de.po |   36 ++++++++++++++----------------------
+ 1 files changed, 14 insertions(+), 22 deletions(-)
+
+commit 7cdec6d35cf9f98b698ab486e66c2db9d0726404
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Aug 29 14:51:25 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1937t.
+
+ man/po/de.po |   36 ++++++++++++++----------------------
+ 1 files changed, 14 insertions(+), 22 deletions(-)
+
+commit fae8a2bd6e28818623f55e650825226a03a88961
+Author: Aron Xu <happyaron.xu@gmail.com>
+Date:   Sat Aug 28 14:33:14 2010 +0200
+
+    Simplified Chinese translation update
+
+ debian/changelog |    1 +
+ po/zh_CN.po      |  708 +++++++++++++++++++-----------------------------------
+ 2 files changed, 249 insertions(+), 460 deletions(-)
+
+commit cac9ac66948552462ffb94f106b9cb7550525de3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 25 08:15:40 2010 +0200
+
+    Add gettext messages for plural forms
+    
+    Some of the singular forms are not currently used, but we keep them for
+    consistency, and to avoid confusing translators.
+    
+    Closes: #594218
+
+ debian/changelog                  |    1 +
+ dpkg-deb/build.c                  |    5 ++++-
+ dpkg-deb/info.c                   |    7 +++----
+ dpkg-split/join.c                 |    4 +++-
+ scripts/Dpkg/Source/Package/V2.pm |    9 ++++++---
+ scripts/dpkg-shlibdeps.pl         |    6 ++++--
+ src/enquiry.c                     |    4 +++-
+ src/filesdb.c                     |    4 +++-
+ src/help.c                        |   11 +++++++----
+ src/update.c                      |    3 ++-
+ utils/update-alternatives.c       |    9 ++++++---
+ 11 files changed, 42 insertions(+), 21 deletions(-)
+
+commit 4509efdc143c85b77df68b7a3b0728e66580701d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 25 08:12:53 2010 +0200
+
+    Add gettext plurals infrastructure support
+
+ debian/changelog        |    1 +
+ lib/dpkg/i18n.h         |    3 ++-
+ po/Makevars             |    2 +-
+ scripts/Dpkg/Gettext.pm |    8 +++++++-
+ scripts/po/Makevars     |    2 +-
+ 5 files changed, 12 insertions(+), 4 deletions(-)
+
+commit 9226ef57a108f76c0f22f8c933d5902350c34858
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Aug 26 04:01:04 2010 +0200
+
+    build: Remove xgettext _g keyword for the dpkg domain
+    
+    The dpkg domain consists only of C sources, so there's no need anymore
+    for the Perl specific _g keyword.
+
+ po/Makevars |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e068a6b1b1821cc57582edaacf1e0ecda8e9291a
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Wed Aug 25 08:19:19 2010 +0200
+
+    Review by Florentin Duneau
+
+ scripts/po/fr.po |    7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+commit 62a7593aca5ad7e893ac5234b2e1cc5e7f72c048
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Tue Aug 24 18:26:22 2010 +0200
+
+    French scripts translation update
+
+ debian/changelog |    1 +
+ scripts/po/fr.po |   81 ++++++++++++++++++++++++++++-------------------------
+ 2 files changed, 44 insertions(+), 38 deletions(-)
+
+commit df30246836cfd1dd2bce018cb64d8ae040a11d4c
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Tue Aug 24 18:25:56 2010 +0200
+
+    French manpages translation update
+
+ debian/changelog |    1 +
+ man/po/fr.po     |  299 +++++++++++++++++++-----------------------------------
+ 2 files changed, 106 insertions(+), 194 deletions(-)
+
+commit 91837cdaa79e97de24491758aa6788de5bc2682c
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Tue Aug 24 18:25:21 2010 +0200
+
+    French programs translation update
+
+ debian/changelog |    1 +
+ po/fr.po         |  348 +++++++++++++++++++++++++++--------------------------
+ 2 files changed, 178 insertions(+), 171 deletions(-)
+
+commit f4750a695507330a1094ca8caa440f67c5b64f6d
+Author: Peter Krefting <peterk@debian.org>
+Date:   Sat Aug 21 22:19:43 2010 +0100
+
+    Update Swedish translation.
+    
+    man/po/sv.po: 1937t0f0u.
+
+ man/po/sv.po |   23 ++++++++++++++---------
+ 1 files changed, 14 insertions(+), 9 deletions(-)
+
+commit e3bb3c8c811ed403ae1b01be35421b15fa127ccd
+Author: Peter Krefting <peterk@debian.org>
+Date:   Sat Aug 21 22:11:04 2010 +0100
+
+    Add missing changelog entries for recent translation updates.
+
+ debian/changelog |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 1e1d6fcb2cd4cf163650891324d84572bb35b1eb
+Merge: e966388 9047649
+Author: Peter Krefting <peterk@debian.org>
+Date:   Sat Aug 21 22:05:55 2010 +0100
+
+    Merge branch 'cherry-pick-german' to avoid breakage when merging PO files.
+    
+    The German translation was updated on master, before it was announced that
+    they should be committed to the sid branch. To avoid further breakage when
+    merging the files, the changes from master has been cherry-picked over to
+    sid via a topic branch. This merges the same branch over to master to
+    make sure the branches agree to the file contents.
+
+commit 40e116717a654a9eacd797d9fd70b802d97103ee
+Merge: 5e625be 9047649
+Author: Peter Krefting <peterk@debian.org>
+Date:   Sat Aug 21 22:02:19 2010 +0100
+
+    Merge branch 'cherry-pick-german' into sid
+    
+    The German translation was updated on master, before it was announced that
+    they should be committed to the sid branch. To avoid further breakage when
+    merging the files, the changes from master has been cherry-picked over to
+    sid via a topic branch.
+
+commit 9047649a06f0fb599734986c5dd13990a0190fe4
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu Jul 29 19:29:03 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1936t.
+
+ man/po/de.po |   33 ++++++++++-----------------------
+ 1 files changed, 10 insertions(+), 23 deletions(-)
+
+commit 009788d301298cf6df95e83431c0e49e94259c3b
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu Jul 29 18:50:57 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 513t
+
+ scripts/po/de.po |   59 ++---------------------------------------------------
+ 1 files changed, 3 insertions(+), 56 deletions(-)
+
+commit 5c1181e0e4a8d4520408a9f70bba8b3a3403ac95
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Aug 21 20:19:15 2010 +0200
+
+    Regenerate .pot files and merge .po files with them
+    
+    Picked the de.po changes specifically to make it possible to cherry-pick the
+    German translation changes from master over to sid without causing
+    conflicts.
+
+ dselect/po/de.po |    2 +-
+ man/po/de.po     |  565 +++++++++++++++++++++++++++++-------------------------
+ po/de.po         |   18 +-
+ scripts/po/de.po |   66 ++++----
+ 4 files changed, 344 insertions(+), 307 deletions(-)
+
+commit 5e625be2fcc1cf92745d43ca333fc1997d31c217
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Aug 21 20:19:15 2010 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |    2 +-
+ dselect/po/ca.po        |    2 +-
+ dselect/po/cs.po        |    2 +-
+ dselect/po/da.po        |    2 +-
+ dselect/po/de.po        |    2 +-
+ dselect/po/dselect.pot  |    4 +-
+ dselect/po/el.po        |    2 +-
+ dselect/po/es.po        |    2 +-
+ dselect/po/et.po        |    2 +-
+ dselect/po/eu.po        |    2 +-
+ dselect/po/fr.po        |    2 +-
+ dselect/po/gl.po        |    2 +-
+ dselect/po/hu.po        |    2 +-
+ dselect/po/id.po        |    2 +-
+ dselect/po/it.po        |    2 +-
+ dselect/po/ja.po        |    2 +-
+ dselect/po/ko.po        |    2 +-
+ dselect/po/nb.po        |    2 +-
+ dselect/po/nl.po        |    2 +-
+ dselect/po/nn.po        |    2 +-
+ dselect/po/pl.po        |    2 +-
+ dselect/po/pt.po        |    2 +-
+ dselect/po/pt_BR.po     |    2 +-
+ dselect/po/ro.po        |    2 +-
+ dselect/po/ru.po        |    2 +-
+ dselect/po/sk.po        |    2 +-
+ dselect/po/sv.po        |    2 +-
+ dselect/po/tl.po        |    2 +-
+ dselect/po/vi.po        |    2 +-
+ dselect/po/zh_CN.po     |    2 +-
+ dselect/po/zh_TW.po     |    2 +-
+ man/po/de.po            |  565 ++++++++++++++++++++++-------------------
+ man/po/dpkg-man.pot     |  527 ++++++++++++++++++++-------------------
+ man/po/es.po            |  551 +++++++++++++++++++++-------------------
+ man/po/fr.po            |  551 +++++++++++++++++++++-------------------
+ man/po/hu.po            |  533 ++++++++++++++++++++-------------------
+ man/po/ja.po            |  537 ++++++++++++++++++++-------------------
+ man/po/pl.po            |  551 +++++++++++++++++++++-------------------
+ man/po/pt_BR.po         |  533 ++++++++++++++++++++-------------------
+ man/po/ru.po            |  537 ++++++++++++++++++++-------------------
+ man/po/sv.po            |  638 ++++++++++++++++++++++++-----------------------
+ po/ast.po               |   18 +-
+ po/bs.po                |   18 +-
+ po/ca.po                |   18 +-
+ po/cs.po                |   18 +-
+ po/da.po                |   18 +-
+ po/de.po                |   18 +-
+ po/dpkg.pot             |   20 +-
+ po/dz.po                |   18 +-
+ po/el.po                |   18 +-
+ po/eo.po                |   18 +-
+ po/es.po                |   18 +-
+ po/et.po                |   18 +-
+ po/eu.po                |   18 +-
+ po/fr.po                |   18 +-
+ po/gl.po                |   18 +-
+ po/hu.po                |   18 +-
+ po/id.po                |   18 +-
+ po/it.po                |   47 ++--
+ po/ja.po                |   18 +-
+ po/km.po                |   18 +-
+ po/ko.po                |   18 +-
+ po/ku.po                |   18 +-
+ po/lt.po                |   18 +-
+ po/mr.po                |   18 +-
+ po/nb.po                |   18 +-
+ po/ne.po                |   18 +-
+ po/nl.po                |   18 +-
+ po/nn.po                |   18 +-
+ po/pa.po                |   18 +-
+ po/pl.po                |   18 +-
+ po/pt.po                |   18 +-
+ po/pt_BR.po             |   18 +-
+ po/ro.po                |   18 +-
+ po/ru.po                |   18 +-
+ po/sk.po                |   18 +-
+ po/sv.po                |   23 +-
+ po/th.po                |   18 +-
+ po/tl.po                |   18 +-
+ po/vi.po                |   18 +-
+ po/zh_CN.po             |   18 +-
+ po/zh_TW.po             |   18 +-
+ scripts/po/ca.po        |   66 +++---
+ scripts/po/de.po        |   66 +++---
+ scripts/po/dpkg-dev.pot |   68 +++---
+ scripts/po/es.po        |   66 +++---
+ scripts/po/fr.po        |   66 +++---
+ scripts/po/pl.po        |   66 +++---
+ scripts/po/ru.po        |   66 +++---
+ scripts/po/sv.po        |  120 +++-------
+ 90 files changed, 3543 insertions(+), 3402 deletions(-)
+
+commit f42344b5fb3fda487eb1b7583bd1bd2ec84f2334
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Aug 21 16:28:03 2010 +0200
+
+    dpkg-genchanges: correctly truncate descriptions with multibyte characters
+    
+    Ensure the scalar used to truncate the description is character-based
+    and not byte-based. But switch it back to a byte-based scalar afterwards
+    to avoid bad-conversion to latin1 when output in a filehandle without
+    any explicit encodind.
+    
+    This should really be fixed in Dpkg::Control but that would be an invasive
+    change at this point of the squeeze release.
+    
+    Reported-by: Colin Watson <cjwatson@ubuntu.com>
+
+ debian/changelog           |    4 ++++
+ scripts/dpkg-genchanges.pl |    3 ++-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit bbc30fb513d891a6de77e15ef8d6ffb187c6bc5a
+Author: The Fungi <fungi@yuggoth.org>
+Date:   Thu Aug 19 17:42:07 2010 +0000
+
+    dpkg(1): Clarify effect of --purge on files in homedirs
+    
+    Closes: #593628
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog |    2 ++
+ man/dpkg.1       |    8 +++++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+commit 44650b3c8e96a69021510b8b40248c5b42e7de0b
+Author: Milo Casagrande <milo@ubuntu.com>
+Date:   Sat Aug 21 09:53:28 2010 +0200
+
+    Update Italian program translation
+    
+    Closes: #592953
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog |    4 +
+ po/it.po         |  962 ++++++++++++++++++------------------------------------
+ 2 files changed, 317 insertions(+), 649 deletions(-)
+
+commit 16e3b71283d53f56774e1aaceb567f898dc1389c
+Author: Joey Hess <joeyh@debian.org>
+Date:   Tue Aug 17 17:00:44 2010 -0400
+
+    dpkg-source(1): Improve git format documentation
+    
+    Based-on-patch-by: Tanguy Ortolo
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog  |    2 ++
+ man/dpkg-source.1 |   12 +++++++++---
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+commit 672b0664cbb8fd7fd5eea7ab10af1bbf6871833f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 21 08:12:37 2010 +0200
+
+    libdpkg: Do not print bogus warnings when parsing status files
+    
+    When reaching the half-installed state during the unpacking of a
+    package which was previously in not-installed state, the current code
+    was producing bogus warnings when parsing the status or status log
+    files on missing Description and Maintainer fields, given that those
+    are not yet in place.
+    
+    This bug was uncovered when enabling parser warnings for everything in
+    commit 30bd7ddbffe3ad4b5d5dc78c5dd1b0f5b07ccfd6.
+
+ debian/changelog |    8 ++++++++
+ lib/dpkg/parse.c |   13 +++++++++----
+ 2 files changed, 17 insertions(+), 4 deletions(-)
+
+commit e9663886652c8bee2dc032c260db4f9f4b40313d
+Merge: c338845 4e5abfd
+Author: Peter Krefting <peterk@debian.org>
+Date:   Wed Aug 18 08:14:36 2010 +0100
+
+    Merge branch 'sid' to avoid breakage when merging PO files.
+    
+    I updated the Swedish PO files on the master branch before reading that
+    I should update them on the sid branch. Merge the cherry-picked commit
+    from sid that contains the same changes I committed to master, to make
+    sure a future merge from sid does not cause conflicts here.
+    
+    Sorry for the noise.
+
+commit 4e5abfdc44d79e22bdc27c0a3432408683089923
+Author: Peter Krefting <peterk@debian.org>
+Date:   Tue Aug 17 19:54:56 2010 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: 986t0f0u.
+    man/po/sv.po: 1936t0f0u.
+    scripts/po/sv.po: 513t0f0u.
+
+ man/po/sv.po     |   85 ++++++++++++++++++++++++++++++++++-------------------
+ po/sv.po         |   22 +++++++-------
+ scripts/po/sv.po |    5 ++-
+ 3 files changed, 68 insertions(+), 44 deletions(-)
+
+commit c338845c05de19992b9f307d259923a94348a534
+Author: Peter Krefting <peterk@debian.org>
+Date:   Tue Aug 17 19:54:56 2010 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: 986t0f0u.
+    man/po/sv.po: 1936t0f0u.
+    scripts/po/sv.po: 513t0f0u.
+
+ debian/changelog |    5 +++
+ man/po/sv.po     |   85 ++++++++++++++++++++++++++++++++++-------------------
+ po/sv.po         |   22 +++++++-------
+ scripts/po/sv.po |    5 ++-
+ 4 files changed, 73 insertions(+), 44 deletions(-)
+
+commit b4513f1449ef7e28e254115b34f5d1ef8c3d94d0
+Merge: ae947e1 2499850
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 13 06:46:03 2010 +0200
+
+    Merge branch 'sid' (through tag '1.15.8.4')
+    
+    Conflicts:
+    	debian/changelog
+    	scripts/po/de.po
+
+commit 2499850fd03395b37ce77cc84976656767056674
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 13 05:21:31 2010 +0200
+
+    Release 1.15.8.4
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit f54bb4f2cbeb64c3fcddb2f70ad12eb4b3ef5608
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 13 06:16:29 2010 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |    2 +-
+ dselect/po/ca.po        |    2 +-
+ dselect/po/cs.po        |    2 +-
+ dselect/po/da.po        |    2 +-
+ dselect/po/de.po        |    2 +-
+ dselect/po/dselect.pot  |    4 +-
+ dselect/po/el.po        |    2 +-
+ dselect/po/es.po        |    2 +-
+ dselect/po/et.po        |    2 +-
+ dselect/po/eu.po        |    2 +-
+ dselect/po/fr.po        |    2 +-
+ dselect/po/gl.po        |    2 +-
+ dselect/po/hu.po        |    2 +-
+ dselect/po/id.po        |    2 +-
+ dselect/po/it.po        |    2 +-
+ dselect/po/ja.po        |    2 +-
+ dselect/po/ko.po        |    2 +-
+ dselect/po/nb.po        |    2 +-
+ dselect/po/nl.po        |    2 +-
+ dselect/po/nn.po        |    2 +-
+ dselect/po/pl.po        |    2 +-
+ dselect/po/pt.po        |    2 +-
+ dselect/po/pt_BR.po     |    2 +-
+ dselect/po/ro.po        |    2 +-
+ dselect/po/ru.po        |    2 +-
+ dselect/po/sk.po        |    2 +-
+ dselect/po/sv.po        |    2 +-
+ dselect/po/tl.po        |    2 +-
+ dselect/po/vi.po        |    2 +-
+ dselect/po/zh_CN.po     |    2 +-
+ dselect/po/zh_TW.po     |    2 +-
+ po/ast.po               |  435 ++++++++++++++++++++++++-----------------------
+ po/bs.po                |  422 +++++++++++++++++++++++----------------------
+ po/ca.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/cs.po                |  435 ++++++++++++++++++++++++-----------------------
+ po/da.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/de.po                |  435 ++++++++++++++++++++++++-----------------------
+ po/dpkg.pot             |  424 +++++++++++++++++++++++----------------------
+ po/dz.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/el.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/eo.po                |  435 ++++++++++++++++++++++++-----------------------
+ po/es.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/et.po                |  431 ++++++++++++++++++++++++----------------------
+ po/eu.po                |  435 ++++++++++++++++++++++++-----------------------
+ po/fr.po                |  435 ++++++++++++++++++++++++-----------------------
+ po/gl.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/hu.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/id.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/it.po                |  435 ++++++++++++++++++++++++-----------------------
+ po/ja.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/km.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/ko.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/ku.po                |  435 ++++++++++++++++++++++++-----------------------
+ po/lt.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/mr.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/nb.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/ne.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/nl.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/nn.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/pa.po                |  431 ++++++++++++++++++++++++-----------------------
+ po/pl.po                |  435 ++++++++++++++++++++++++-----------------------
+ po/pt.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/pt_BR.po             |  432 ++++++++++++++++++++++++-----------------------
+ po/ro.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/ru.po                |  435 ++++++++++++++++++++++++-----------------------
+ po/sk.po                |  435 ++++++++++++++++++++++++-----------------------
+ po/sv.po                |  435 ++++++++++++++++++++++++-----------------------
+ po/th.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/tl.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/vi.po                |  432 ++++++++++++++++++++++++-----------------------
+ po/zh_CN.po             |  435 ++++++++++++++++++++++++-----------------------
+ po/zh_TW.po             |  432 ++++++++++++++++++++++++-----------------------
+ scripts/po/ca.po        |   11 +-
+ scripts/po/de.po        |   11 +-
+ scripts/po/dpkg-dev.pot |   13 +-
+ scripts/po/es.po        |   11 +-
+ scripts/po/fr.po        |   11 +-
+ scripts/po/pl.po        |   11 +-
+ scripts/po/ru.po        |   11 +-
+ scripts/po/sv.po        |   11 +-
+ 80 files changed, 9225 insertions(+), 8660 deletions(-)
+
+commit 6598274e9b04ff7940c1d0201b66c87c79604f56
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Fri Aug 13 05:55:02 2010 +0200
+
+    Remove spurious leftover .dpkg-tmp files after unpacking failure
+    
+    Renaming the backup copy to the old name is a no-op if these are
+    hard links to the same file. So we need to remove the backup copy
+    afterwards to make sure it is gone.
+    
+    Closes: #591993
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog |    5 +++++
+ src/cleanup.c    |    4 ++++
+ 2 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 55ed7ef4ac47abec9055e78bf9b5ff8c1b6006ad
+Author: Fabian Groffen <grobian@gentoo.org>
+Date:   Fri Aug 13 04:43:03 2010 +0200
+
+    u-a: Include <limits.h> for _POSIX_MAX_PATH
+    
+    Needed on at least Solaris and Darwin, and as defined per POSIX.
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog            |    1 +
+ utils/update-alternatives.c |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit a9809fc49c633a80bb8e13485a1bfb1cbf62d522
+Author: Fabian Groffen <grobian@gentoo.org>
+Date:   Fri Aug 13 04:41:13 2010 +0200
+
+    build: Link u-a against libintl if libc does not have i18n support
+    
+    This happens on at least Solaris and Darwin.
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog  |    4 ++++
+ utils/Makefile.am |    1 +
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 50a9519397b6662dd5376faaaa495bf04bafc4f5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 11 16:12:30 2010 +0200
+
+    dpkg-statoverride: Fix typos
+
+ src/statcmd.c |    4 ++--
+ src/statdb.c  |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 357ab385750c1cb657ff95c0b34ad0a6bf6d2cdf
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 11 15:16:04 2010 +0200
+
+    libdpkg: When parsing database files only warn on bogus versions
+    
+    Those versions, although bogus, were previously accepted, so to avoid
+    breaking systems by making dpkg refuse to parse the status and available
+    files, we just make it warn for now, and will make it error out on
+    status file parsing later on.
+    
+    We keep producing errors on the rest of version parsing to avoid newly
+    introduced bogosity and so that packages get fixed, while not making the
+    system unusable anymore.
+    
+    Closes: #590885, #590896, #591692, #591885
+
+ debian/changelog     |    3 ++
+ lib/dpkg/dbmodify.c  |    8 +++--
+ lib/dpkg/dpkg-db.h   |    5 ++-
+ lib/dpkg/fields.c    |   27 +++++------------
+ lib/dpkg/parsedump.h |    4 ++
+ lib/dpkg/parsehelp.c |   78 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/update.c         |    3 +-
+ 7 files changed, 102 insertions(+), 26 deletions(-)
+
+commit 30bd7ddbffe3ad4b5d5dc78c5dd1b0f5b07ccfd6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 11 15:51:56 2010 +0200
+
+    libdpkg: Always print a massage on warning when parsing control files
+    
+    The warnings were only being issues on dpkg-deb parsing, which greatly
+    defeats their purpose, as using dpkg-deb is not truly needed to
+    generate '.deb' packages. So printing always will give them wider
+    exposure.
+    
+    The parse_warn() function is not using warning() though, which makes
+    the output miss the program name, but the changes needed for this are
+    too intrusive at this time, and it's only a cosmetic issue afterall, so
+    we'll leave this for later.
+
+ debian/changelog |    1 +
+ lib/dpkg/parse.c |    5 ++++-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit e27c50f24d959e0ddf3ac8b163f235c10cd56615
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 13 06:23:10 2010 +0200
+
+    build: Fix uninstall target in man/Makefile.am
+    
+    Missed in commit 4be28d99de2c8fe27c6c16bc9c114f7cef550f79.
+
+ man/Makefile.am |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit d9af5690390429e6c5bc9c8a2c46ba19cedf21bc
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Aug 11 22:17:39 2010 +0200
+
+    Dpkg::Shlibs::Objdump::get_format() fallback to host objdump if cross one failed
+    
+    In many cases the cross objdump is not able to analyze the binaries from
+    the build host and yet dpkg-shlibdeps need to be able to verify that
+    the various binaries use the same ELF format. To achieve this get_format()
+    is enhanced to fallback on the objdump command when the cross one failed.
+
+ debian/changelog               |    2 ++
+ scripts/Dpkg/Shlibs/Objdump.pm |   25 +++++++++++++++++++------
+ 2 files changed, 21 insertions(+), 6 deletions(-)
+
+commit 4be28d99de2c8fe27c6c16bc9c114f7cef550f79
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Aug 11 15:50:56 2010 +0200
+
+    Fix install target in man/Makefile.am
+    
+    Commit 39c6dab89bbea9fe336f869b65e33102ba238205 introduced a regression:
+    make install during a package build in a tree generated by make dist would
+    no longer install the manual page... because they are already built and
+    available in $(srcdir) while $(CURDIR) was ok for the case where the
+    manual pages are not pre-built.
+    
+    No we try both paths and pick the first one that exists.
+
+ debian/changelog |    5 +++++
+ man/Makefile.am  |    2 ++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 58c7cd30d692652b1d533a809c1aea397d35eacf
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Aug 5 18:29:39 2010 +0200
+
+    u-a: Add non-regression test for --remove-all
+
+ utils/t/100_update_alternatives.t |   16 ++++++++++++++--
+ 1 files changed, 14 insertions(+), 2 deletions(-)
+
+commit 9b494da45eb2883a1b397a42aac4adc1f7899b6b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Aug 5 17:48:45 2010 +0200
+
+    u-a: Fix use after free causing segfaults on --remove-all
+    
+    Refactor alternative_choices_free function and use it from
+    alternative_reset() and for --remove-all. This was causing segfaults
+    or bogus operation by not removing all choices.
+    
+    Closes: #591653, #591654
+
+ debian/changelog            |    7 +++++++
+ utils/update-alternatives.c |   27 +++++++++++++++++----------
+ 2 files changed, 24 insertions(+), 10 deletions(-)
+
+commit ae947e1d0380470924c99385951f86b936492bc7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Aug 3 03:17:48 2010 +0200
+
+    libdpkg: Add missing symbols to Versions script
+
+ lib/dpkg/libdpkg.Versions |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 499088b2a6e94991d516cb7ee851698ccea5192b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Aug 3 03:10:01 2010 +0200
+
+    Move glob module to libdpkg
+
+ lib/dpkg/Makefile.am      |    2 ++
+ {src => lib/dpkg}/glob.c  |    3 +--
+ {src => lib/dpkg}/glob.h  |    6 +++---
+ lib/dpkg/libdpkg.Versions |    3 +++
+ po/POTFILES.in            |    1 +
+ src/Makefile.am           |    2 --
+ src/divertcmd.c           |    2 +-
+ src/statcmd.c             |    2 +-
+ 8 files changed, 12 insertions(+), 9 deletions(-)
+
+commit f56c9fc6a07f609a122696c463c25caf4ebd36ff
+Merge: 03b4300 624aa0f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Aug 2 10:53:35 2010 +0200
+
+    Merge branch 'sid' (through tag '1.15.8.3')
+    
+    Conflicts:
+    	debian/changelog
+
+commit 624aa0fadb9daf2757563197fa376b8223d11f2d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Aug 2 10:38:28 2010 +0200
+
+    Release 1.15.8.3
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit f4e116b3a2afdbf2ee9fc2556782fa7cd773165c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Aug 2 10:21:06 2010 +0200
+
+    libdpkg: Fix buffer overflow in dpkg_ar_member_put_header
+    
+    It was causing it to write the header to fd 0 (instead of ar_fd)
+    depending on the stack layout, affecting armel which was generating
+    empty packages.
+    
+    Closes: #591312
+    
+    Reported-by: Philipp Kern <pkern@debian.org>
+    Based-on-patch-by: Reinhard Tartler <siretart@tauware.de>
+
+ debian/changelog |    7 +++++++
+ lib/dpkg/ar.c    |   11 +++++++----
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+commit 9036687a8cbd87ce319df56dd362bb2adae96fc4
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Sun Aug 1 08:59:47 2010 +0200
+
+    Fix dpkg-divert test suite to cope with + in the build directory name
+    
+    The directory name was not properly escaped in regular expressions
+    and lead to test failures when it contained + or other characters with
+    special meanings in regular expressions.
+    
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog        |    8 ++++++++
+ src/t/100_dpkg_divert.t |   10 +++++-----
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+commit 03b4300e51cec35e49e38aef14d72acb6adea6bb
+Merge: 7444c87 4aed1d7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 31 04:39:19 2010 +0200
+
+    Merge branch 'sid' (through tag '1.15.8.2')
+    
+    Conflicts:
+    	debian/changelog
+
+commit 4aed1d728958584769d469540e9ae6103e13d424
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 31 04:20:18 2010 +0200
+
+    Release 1.15.8.2
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c0f7fae149878000f75fa384fab4b9a600bb143a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 31 04:09:38 2010 +0200
+
+    dpkg-buildpackage: Allow specifying absolute and relative paths on -r
+    
+    Rregression introduced in 7106a2d148ace7ea1e786e41e11f84081b47fec8.
+    
+    Closes: #591010
+
+ debian/changelog     |    2 ++
+ scripts/Dpkg/Path.pm |   12 +++++++++---
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+commit 0e25e3a913000692c97fb50b34d3b11f0c92ea9f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 30 04:40:16 2010 +0200
+
+    Bump libdpkg-perl Depends on dpkg to 1.15.8
+    
+    It will break dpkg versions before that when installing and removing
+    libdpkg-perl, because older update-alternatives and dpkg-divert require
+    Dpkg.pm and Dpkg/Gettext.pm which will disappear due to the Replaces.
+    
+    Closes: #590867
+    
+    Analysis-by: Sven Joachim <svenjoac@gmx.de>
+
+ debian/changelog |   10 ++++++++++
+ debian/control   |    2 +-
+ 2 files changed, 11 insertions(+), 1 deletions(-)
+
+commit 7444c878aa6a0adabec28800f5015a33239e45a5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 29 21:38:54 2010 +0200
+
+    Add missing space in changelog
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9ba415de26ee6d92d84782de6843f4e8ea38570a
+Merge: 5a580e2 44c36ad
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 29 21:35:36 2010 +0200
+
+    Merge branch 'sid'
+
+commit 5a580e28ba68f1482291ad86d823b487f74bcd70
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 29 20:26:53 2010 +0200
+
+    libcompat: On successful realloc assign the newlist to list
+
+ debian/changelog     |    3 +++
+ lib/compat/scandir.c |    1 +
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 44c36ad22adc8234a15bbfcf68a7bedf959443e5
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 29 21:18:39 2010 +0200
+
+    Release 1.15.8.1
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 5174ba18f14b60b01749fc0c8a415acbf62254a6
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 29 21:07:18 2010 +0200
+
+    Add u-a non-regression test to ensure the sorting of choices/slaves is ok
+
+ utils/t/100_update_alternatives.t |   54 +++++++++++++++++++++++++++++++++++-
+ 1 files changed, 52 insertions(+), 2 deletions(-)
+
+commit 867edc4d1736e0052143d1cd28b7dda3fd71ba45
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 29 20:36:09 2010 +0200
+
+    update-alternatives: fix off-by-one errors
+    
+    alternative_sort_choices() and alternative_sort_slaves() were affected
+    by an off-by-one error that could result in linked lists looping over
+    themselves since the last element was not properly put back in the list.
+
+ debian/changelog            |    7 +++++++
+ utils/update-alternatives.c |    6 ++----
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+
+commit 1f2f5296c6a9437e71ad01ebe2f6ce5730de6558
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu Jul 29 19:29:03 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1936t.
+
+ debian/changelog |    5 ++++-
+ man/po/de.po     |   33 ++++++++++-----------------------
+ 2 files changed, 14 insertions(+), 24 deletions(-)
+
+commit 20332acd87e0417590dcd4d19916d6b1c6f93472
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu Jul 29 18:50:57 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 513t
+
+ debian/changelog |    3 +-
+ scripts/po/de.po |   61 +++--------------------------------------------------
+ 2 files changed, 6 insertions(+), 58 deletions(-)
+
+commit caba9f9cf57e74fc8560d05a5764d0bcf2034a0e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 29 11:00:28 2010 +0200
+
+    Bump version to 1.15.9
+
+ debian/changelog |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 189dcd07b4cd62159fb0a28db79249d86c91fb1b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 29 09:39:30 2010 +0200
+
+    Release 1.15.8
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 1c8aaa94ea11a5a88f348a6ea46197b3b1cf6d0d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 29 09:36:45 2010 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |    2 +-
+ dselect/po/ca.po        |    2 +-
+ dselect/po/cs.po        |    2 +-
+ dselect/po/da.po        |    2 +-
+ dselect/po/de.po        |    2 +-
+ dselect/po/dselect.pot  |    4 +-
+ dselect/po/el.po        |    2 +-
+ dselect/po/es.po        |    2 +-
+ dselect/po/et.po        |    2 +-
+ dselect/po/eu.po        |    2 +-
+ dselect/po/fr.po        |    2 +-
+ dselect/po/gl.po        |    2 +-
+ dselect/po/hu.po        |    2 +-
+ dselect/po/id.po        |    2 +-
+ dselect/po/it.po        |    2 +-
+ dselect/po/ja.po        |    2 +-
+ dselect/po/ko.po        |    2 +-
+ dselect/po/nb.po        |    2 +-
+ dselect/po/nl.po        |    2 +-
+ dselect/po/nn.po        |    2 +-
+ dselect/po/pl.po        |    2 +-
+ dselect/po/pt.po        |    2 +-
+ dselect/po/pt_BR.po     |    2 +-
+ dselect/po/ro.po        |    2 +-
+ dselect/po/ru.po        |    2 +-
+ dselect/po/sk.po        |    2 +-
+ dselect/po/sv.po        |    2 +-
+ dselect/po/tl.po        |    2 +-
+ dselect/po/vi.po        |    2 +-
+ dselect/po/zh_CN.po     |    2 +-
+ dselect/po/zh_TW.po     |    2 +-
+ man/po/de.po            |  254 ++++---
+ man/po/dpkg-man.pot     |  697 +++++++++++---------
+ man/po/es.po            |  797 +++++++++++++---------
+ man/po/fr.po            |  802 +++++++++++++---------
+ man/po/hu.po            |  739 ++++++++++++---------
+ man/po/ja.po            |  750 ++++++++++++---------
+ man/po/pl.po            |  801 +++++++++++++---------
+ man/po/pt_BR.po         |  734 +++++++++++---------
+ man/po/ru.po            |  750 ++++++++++++---------
+ man/po/sv.po            | 1080 +++++++++++++++---------------
+ po/ast.po               | 1698 +++++++++++++++++++++++++---------------------
+ po/bs.po                | 1480 ++++++++++++++++++++--------------------
+ po/ca.po                | 1676 ++++++++++++++++++++++++---------------------
+ po/cs.po                | 1697 +++++++++++++++++++++++++---------------------
+ po/da.po                | 1622 +++++++++++++++++++++++---------------------
+ po/de.po                |  278 ++++----
+ po/dpkg.pot             | 1470 ++++++++++++++++++++--------------------
+ po/dz.po                | 1623 +++++++++++++++++++++++---------------------
+ po/el.po                | 1674 ++++++++++++++++++++++++---------------------
+ po/eo.po                | 1693 +++++++++++++++++++++++++--------------------
+ po/es.po                | 1678 ++++++++++++++++++++++++---------------------
+ po/et.po                | 1533 +++++++++++++++++++++--------------------
+ po/eu.po                | 1699 +++++++++++++++++++++++++---------------------
+ po/fr.po                | 1749 ++++++++++++++++++++++++++---------------------
+ po/gl.po                | 1664 ++++++++++++++++++++++++--------------------
+ po/hu.po                | 1585 +++++++++++++++++++++++--------------------
+ po/id.po                | 1549 ++++++++++++++++++++++--------------------
+ po/it.po                | 1705 +++++++++++++++++++++++++---------------------
+ po/ja.po                | 1668 ++++++++++++++++++++++++---------------------
+ po/km.po                | 1617 +++++++++++++++++++++++--------------------
+ po/ko.po                | 1660 ++++++++++++++++++++++++--------------------
+ po/ku.po                | 1477 ++++++++++++++++++++--------------------
+ po/lt.po                | 1518 +++++++++++++++++++++--------------------
+ po/mr.po                | 1615 +++++++++++++++++++++++--------------------
+ po/nb.po                | 1665 ++++++++++++++++++++++++---------------------
+ po/ne.po                | 1618 +++++++++++++++++++++++---------------------
+ po/nl.po                | 1629 +++++++++++++++++++++++---------------------
+ po/nn.po                | 1548 ++++++++++++++++++++++--------------------
+ po/pa.po                | 1557 ++++++++++++++++++++++--------------------
+ po/pl.po                | 1699 +++++++++++++++++++++++++--------------------
+ po/pt.po                | 1671 ++++++++++++++++++++++++---------------------
+ po/pt_BR.po             | 1673 ++++++++++++++++++++++++---------------------
+ po/ro.po                | 1687 +++++++++++++++++++++++++---------------------
+ po/ru.po                | 1700 +++++++++++++++++++++++++--------------------
+ po/sk.po                | 1699 +++++++++++++++++++++++++---------------------
+ po/sv.po                |  261 ++++----
+ po/th.po                | 1658 ++++++++++++++++++++++++--------------------
+ po/tl.po                | 1558 ++++++++++++++++++++++--------------------
+ po/vi.po                | 1711 +++++++++++++++++++++++++---------------------
+ po/zh_CN.po             | 1691 +++++++++++++++++++++++++--------------------
+ po/zh_TW.po             | 1658 ++++++++++++++++++++++++--------------------
+ scripts/po/ca.po        |  215 +++---
+ scripts/po/de.po        |  142 +++--
+ scripts/po/dpkg-dev.pot |  216 +++---
+ scripts/po/es.po        |  323 ++++++---
+ scripts/po/fr.po        |  323 ++++++---
+ scripts/po/pl.po        |  254 ++++---
+ scripts/po/ru.po        |  323 ++++++---
+ scripts/po/sv.po        |  158 +++--
+ 90 files changed, 39952 insertions(+), 33781 deletions(-)
+
+commit 8b511ee6e78ed105558f5becfe117fe8cb887f9a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 29 06:13:37 2010 +0200
+
+    dpkg-buildflags(1): Fix typo
+
+ man/dpkg-buildflags.1 |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 6d181ade5c67db8328289c6cadfb6b96f3dc89d2
+Author: Osamu Aoki <osamu@debian.org>
+Date:   Thu Jul 29 06:07:11 2010 +0200
+
+    deb-control(5): Add missing mentions of the Breaks field
+    
+    Alongside the other fields sharing the same syntax.
+    
+    Closes: #590472
+
+ debian/changelog  |    3 +++
+ man/deb-control.5 |    8 ++++++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+commit 3b0d38c02236140b0422c4f45fdd0015b6240209
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 29 05:47:05 2010 +0200
+
+    dpkg-buildpackage: Add new -F option for full build
+    
+    This enables to explicitly specify a normal full build and combine it
+    with -nc.
+    
+    Closes: #547993
+
+ debian/changelog             |    2 ++
+ man/dpkg-buildpackage.1      |    6 +++++-
+ scripts/dpkg-buildpackage.pl |    7 ++++++-
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+commit 68a4a0b3ca958c0bd47abac27219666d2f7264e8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 29 05:02:09 2010 +0200
+
+    dpkg-buildpackage: Switch build option tracking to a bitmask variable
+
+ scripts/dpkg-buildpackage.pl |   50 +++++++++++++++++++++++++++++------------
+ 1 files changed, 35 insertions(+), 15 deletions(-)
+
+commit d25407536dbed4cad2943187b36fbb6c92a6b5ab
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 28 15:06:19 2010 +0200
+
+    dpkg: Assign correct SE Linux label to non-regular files
+    
+    The call to matchpathcon() was getting passed only the permission bits
+    of the mode argument, instead of the format type. Map the tar filetype
+    to the Unix mode and OR that information into the tar_entry mode member.
+    
+    Closes: #587949
+    
+    Based-on-patch-by: Russell Coker <russell@coker.com.au>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog |    2 ++
+ lib/dpkg/tarfn.c |   43 ++++++++++++++++++++++++++++++++++++++++++-
+ src/archives.c   |   10 ++++++----
+ 3 files changed, 50 insertions(+), 5 deletions(-)
+
+commit 6c370bda300fca1c0e4e7ff99c22052a8d440142
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 29 06:48:10 2010 +0200
+
+    libdpkg: Move code handling tar uid/gid together
+    
+    This avoids unneeded conversions and assignments when we have valid
+    username and groupname.
+
+ lib/dpkg/tarfn.c |   19 +++++++++++--------
+ 1 files changed, 11 insertions(+), 8 deletions(-)
+
+commit ccb9d03ffd24c0e7319872bf190ce99dbb37b18e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 28 20:11:58 2010 +0200
+
+    libdpkg: Rename TarInfo to tar_entry
+
+ lib/dpkg/tarfn.c |    8 ++++----
+ lib/dpkg/tarfn.h |    4 ++--
+ src/archives.c   |   17 +++++++++++------
+ src/archives.h   |    2 +-
+ src/filters.c    |    2 +-
+ src/filters.h    |    2 +-
+ 6 files changed, 20 insertions(+), 15 deletions(-)
+
+commit 15cf1342b886f548e8845dd042a72b028efc5d3d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 28 17:48:01 2010 +0200
+
+    libdpkg: Rename TarExtractor to tar_extractor
+
+ lib/dpkg/libdpkg.Versions |    2 +-
+ lib/dpkg/tarfn.c          |    2 +-
+ lib/dpkg/tarfn.h          |    2 +-
+ src/archives.c            |    2 +-
+ src/processarc.c          |    2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+commit f8a9cacf8ada2dc14dcf86f34969f2f5b678bdee
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 28 16:03:02 2010 +0200
+
+    libdpkg: Rename and lower-case TarInfo members
+
+ lib/dpkg/tarfn.c |   78 ++++++++++++++++----------------
+ lib/dpkg/tarfn.h |   20 ++++----
+ src/archives.c   |  132 +++++++++++++++++++++++++++++-------------------------
+ src/filters.c    |   18 ++++----
+ 4 files changed, 129 insertions(+), 119 deletions(-)
+
+commit 646892a232557410f8036b9d06a2babcbb44456d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 28 01:06:04 2010 +0200
+
+    libdpkg: Normalize tar_filetype_file0 to tar_filetype_file on decode
+
+ lib/dpkg/tarfn.c |    3 ++-
+ src/archives.c   |    7 ++-----
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+commit e6b62bd49fe7a089dc5f294090130051e7de54fe
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 28 01:00:59 2010 +0200
+
+    libdpkg: When decoding the tar header assign the TarInfo Type first
+
+ lib/dpkg/tarfn.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit d87b7d37ac9f6ce5b91599a09781d8d79ac00143
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 28 00:58:03 2010 +0200
+
+    libdpkg: Rename and namespace TarFileType to tar_filetype
+
+ lib/dpkg/tarfn.c |   27 ++++++++++++++-------------
+ lib/dpkg/tarfn.h |   24 ++++++++++++------------
+ src/archives.c   |   54 +++++++++++++++++++++++++++++-------------------------
+ src/filters.c    |    3 ++-
+ 4 files changed, 57 insertions(+), 51 deletions(-)
+
+commit 67d524ea0b9fe7b2a19c2f81c848a8523508a538
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 28 16:32:48 2010 +0200
+
+    Pass tar context pointer as an argument instead of a struct member
+    
+    The context does not have anything to do with the TarInfo struct,
+    so pass it as a function argument either as 'void *' or as
+    'struct tarcontext *' if the type is known.
+
+ lib/dpkg/tarfn.c |   17 ++++++++---------
+ lib/dpkg/tarfn.h |    7 +++----
+ src/archives.c   |   19 +++++++++----------
+ src/archives.h   |    2 +-
+ 4 files changed, 21 insertions(+), 24 deletions(-)
+
+commit c5dc9008a7dc26964f2925adc364597f7d4cb5d5
+Author: Peter Krefting <peterk@debian.org>
+Date:   Tue Jul 27 08:53:29 2010 +0100
+
+    Update Swedish translation:
+    
+    scripts/po/sv.po: 513t0f0u.
+
+ scripts/po/sv.po |  176 +++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 101 insertions(+), 75 deletions(-)
+
+commit 205ac41b166c9fd494cb61999dc3bfbc0315fea1
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Jul 26 18:45:48 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1935t.
+
+ man/po/de.po |  394 ++++++++++++++++++++++++++++++++++++---------------------
+ 1 files changed, 249 insertions(+), 145 deletions(-)
+
+commit f3ee10f101c6431d3827bf1e92fbd4ded3014723
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Jul 26 18:14:15 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 513t
+
+ scripts/po/de.po |  161 +++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 93 insertions(+), 68 deletions(-)
+
+commit 8f49b73704935989988e71c7bf5caad755931c2d
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Mon Jul 26 17:42:02 2010 +0200
+
+    German dpkg translation update
+    
+    Update to 984t.
+
+ po/de.po | 1491 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 778 insertions(+), 713 deletions(-)
+
+commit 1b9c0f6d82cd64a3aafcdc474a2aeeefd3bd41a3
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jul 26 08:57:50 2010 +0200
+
+    dpkg-source: drop upstream debian directory before copying the debian one in place
+    
+    In source formats "2.0" and "3.0 (quilt)", make sure to remove the
+    upstream-provided debian directory before copying the debian-provided
+    version of that directory in place. Closes: #590297
+
+ debian/changelog                  |    3 +++
+ scripts/Dpkg/Source/Package/V2.pm |    1 +
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 23a78ee22e185a709fed901a8743836cdd954ae1
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jul 26 08:35:50 2010 +0200
+
+    Bump Standards-Version to 3.9.1
+    
+    No change needed.
+
+ debian/changelog |    2 +-
+ debian/control   |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c54889184636f451950b927823f899a62843019e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jul 26 04:24:55 2010 +0200
+
+    libdpkg: Add additional branches to informative() test-case
+
+ lib/dpkg/test/t-pkginfo.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 4cb6ae5d9e239c42c123910aa8407fbfed266ebf
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 25 19:43:30 2010 +0200
+
+    libdpkg: Add test case for command_exec
+
+ lib/dpkg/test/t-command.c |   21 +++++++++++++++++++++
+ 1 files changed, 21 insertions(+), 0 deletions(-)
+
+commit c1615da1a2cc409bccbf89b4203b82c68041a6cb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 25 19:23:07 2010 +0200
+
+    libdpkg: Complete test cases for the path module
+
+ lib/dpkg/test/t-path.c |   92 ++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 90 insertions(+), 2 deletions(-)
+
+commit 10211292855ac5548ef4a56df7a9dd6d3081da41
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 25 18:50:18 2010 +0200
+
+    libdpkg: Fix buffer size limit handling in path_quote_filename
+    
+    Fix an off-by-one error on size limit NUL termination outside the loop,
+    and thus make sure then that size is always > 0 so that we don't write
+    outside the bounds. Check there's enough room when quoting '\\', and
+    terminate the string and return otherwise. Remove XXX comments now that
+    the code works fine.
+
+ lib/dpkg/path.c |   13 +++++++++++--
+ 1 files changed, 11 insertions(+), 2 deletions(-)
+
+commit 8e5c0399910509951c7a5cf9380fe41d3b3083a9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 25 17:07:33 2010 +0200
+
+    libdpkg: Fix bogus handling of '\\' in path_quote_filename
+    
+    When quoting backslash, the code was not advancing the source, so the
+    destination was getting repeated backslashes until the buffer was full.
+
+ lib/dpkg/path.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit e759410b2e9eb1c48bb344d2ad17bfc420ddf57a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 25 14:51:11 2010 +0200
+
+    libdpkg: Fix buffer overflow in path_quote_filename
+    
+    When the string was longer than the size limit, the loop would continue
+    as the unsigned size would wrap around 0 to SIZE_MAX, and subsequently
+    segfault on the out-of-bounds access. Use ssize_t for the size variable.
+    
+    Regression introduced in f35d66dbc228bc8ad2c5255dee1bf4ecf9ee6e06.
+
+ lib/dpkg/path.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit e62eaa93a1eb43c00aa5b9d58ca4ab975dcd53a5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 17 19:12:24 2010 +0200
+
+    Use varbuf_trunc instead of directly assigning to member 'used'
+
+ src/archives.c   |    9 +++++----
+ src/configure.c  |    4 ++--
+ src/processarc.c |    8 ++++----
+ src/querycmd.c   |    5 +++--
+ src/remove.c     |   14 ++++++++------
+ 5 files changed, 22 insertions(+), 18 deletions(-)
+
+commit 1433317d2fe83290ef02dbf54a6e4e650cb691d6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 17 19:12:01 2010 +0200
+
+    libdpkg: Add new varbuf_trunc() function
+
+ lib/dpkg/libdpkg.Versions |    1 +
+ lib/dpkg/test/t-varbuf.c  |   21 +++++++++++++++++++++
+ lib/dpkg/varbuf.c         |   10 ++++++++++
+ lib/dpkg/varbuf.h         |    1 +
+ 4 files changed, 33 insertions(+), 0 deletions(-)
+
+commit b3db5f47c08016aa36fd0733341a033d9600a0c7
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Sun Jul 25 23:34:03 2010 +0200
+
+    build: Fix “make distcheck” errors
+    
+    Ship the doc/lcov-{epi,pro}log files created in commit
+    0581dda824f26e9eec996ebf4de5f6474336bec2 in the distribution tarball,
+    as well as the dpkg-divert test that moved in commit
+    577ab5dd513beb641f1d635d8ead681065254233.
+
+ Makefile.am     |    2 ++
+ src/Makefile.am |    3 +++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit c4eadd0e0f2aca06aa477eab62cbcc3028dcf2e8
+Author: Joey Hess <joeyh@debian.org>
+Date:   Sun Jul 25 14:20:41 2010 -0400
+
+    dpkg-source: fix path to gitshallow file in source format "3.0 (git)"
+    
+    It was looking in the current directory, which works most of the time,
+    but not always.
+
+ scripts/Dpkg/Source/Package/V3/git.pm |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 80bf68bd3af6bf4b4bffe12ea26eb53cba296283
+Author: Joey Hess <joeyh@debian.org>
+Date:   Sun Jul 25 14:17:46 2010 -0400
+
+    dpkg-source(1): add missing paragraph break to man page
+
+ man/dpkg-source.1 |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 2d75127b6fce8ef37b0fa670ee6d660d91bf0c9f
+Author: Peter Krefting <peterk@debian.org>
+Date:   Sun Jul 25 18:53:19 2010 +0100
+
+    Correct typo in dpkg-maintscript-helper.1
+
+ man/dpkg-maintscript-helper.1 |    2 +-
+ man/po/de.po                  |    2 +-
+ man/po/dpkg-man.pot           |    2 +-
+ man/po/es.po                  |    2 +-
+ man/po/fr.po                  |    2 +-
+ man/po/hu.po                  |    2 +-
+ man/po/ja.po                  |    2 +-
+ man/po/pl.po                  |    2 +-
+ man/po/pt_BR.po               |    2 +-
+ man/po/ru.po                  |    2 +-
+ man/po/sv.po                  |    2 +-
+ 11 files changed, 11 insertions(+), 11 deletions(-)
+
+commit 14d7d133356f3ae951d24678450cbf479a72cd84
+Author: Peter Krefting <peterk@debian.org>
+Date:   Sun Jul 25 18:51:37 2010 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: 984t0f0u.
+    man/po/sv.po: 1925t0f0u.
+    scripts/po/sv.po: 511t0f0u.
+
+ man/po/sv.po     |  237 +++++---
+ po/sv.po         | 1671 +++++++++++++++++++++++++++---------------------------
+ scripts/po/sv.po |   55 +-
+ 3 files changed, 1004 insertions(+), 959 deletions(-)
+
+commit c9dc82a6789caf8c45cf494745dfd4d4fc882c5f
+Author: Peter Krefting <peterk@debian.org>
+Date:   Sun Jul 25 16:43:00 2010 +0100
+
+    Update POTFILES.in for changes in source files.
+    
+    pkg-show.c (92838b1a97e20b70c3a450578d2b4271143fd561)
+    querycmd.c (1dc3c58b4cad6338c8b02d106292b392e741f9e0)
+
+ po/POTFILES.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit daf14faa1e7dc44ef1bd8ac71c621f1b24ca7350
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Jul 25 18:15:29 2010 +0200
+
+    Add missing bug closure
+
+ debian/changelog |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit a2e3d77e982e343d09231921287bda89aff592b2
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Jul 25 17:25:56 2010 +0200
+
+    dpkg-source: replace tar ignore pattern *~ with */*~
+    
+    With this change, it can't match the top-level directory anymore
+    and the source package directory can again end with a tilde without
+    creating problems.
+
+ debian/changelog               |    2 ++
+ scripts/Dpkg/Source/Package.pm |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit eadd7d2376ef54b30cce26b336092c85ca406b3b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Jul 25 17:12:50 2010 +0200
+
+    Dpkg::Compression: add --no-name and --rsyncable options to the gzip call
+    
+    Pass --no-name option to gzip to avoid encoding the timestamp in the file
+    so that the result is more predictable. Also pass --rsyncable to make
+    source packages more rsync friendly.
+
+ debian/changelog            |    3 +++
+ scripts/Dpkg/Compression.pm |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 4f0baea1440ecb85a67b944ac0add2562682c207
+Author: Joey Hess <joey@kitenet.net>
+Date:   Tue Jun 1 16:01:35 2010 -0400
+
+    dpkg-source: modify source format "3.0 (git)" to use git bundle
+    
+    Much better than the old approach of a tarball of the .git repository,
+    the git bundle format is simple to understand and work with, and
+    doesn't need to be sanitized for security. Much code went away.
+    
+    Supports limiting history depth by creating a shallow clone.
+    
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog                      |    2 +
+ man/dpkg-source.1                     |   44 ++++-
+ scripts/Dpkg/Source/Package/V3/git.pm |  314 +++++++++++----------------------
+ 3 files changed, 149 insertions(+), 211 deletions(-)
+
+commit 408541a3980ee505e2064bb5c8ee844b4baf3a2b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Jul 25 16:19:40 2010 +0200
+
+    dpkg-buildflags: new --export command
+    
+    This action outputs shell code (or a makefile snippet) that exports all
+    the compilations flags in the environment.
+    
+    For instance, the following command can be used a shell script:
+     eval $(dpkg-buildflags --export=sh)
+
+ debian/changelog           |    1 +
+ man/dpkg-buildflags.1      |    8 ++++++++
+ scripts/dpkg-buildflags.pl |   33 +++++++++++++++++++++++++++------
+ 3 files changed, 36 insertions(+), 6 deletions(-)
+
+commit 37fe6b4a5ccf58ed553fe24ba19535b6d1bf92ba
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jul 23 08:06:36 2010 +0200
+
+    update-alternatives: avoid segfault when the only slave is disappearing
+    
+    When an alternative with a single slave is removed, and when the
+    remaining alternatives have no slaves, u-a was segfaulting while trying
+    to remove the slave alternative from the structure.
+    
+    Reported-by: Jonathan Nieder <jrnieder@gmail.com>
+    Reported-by: Cyril Brulebois <kibi@debian.org>
+
+ utils/update-alternatives.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 611e3235622c2b6940df5c961faf148e4528b4b1
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jul 22 22:19:31 2010 +0200
+
+    Check the stat structure only if it has been initialized
+    
+    For non-existing files the stat structure is not initialized and S_ISDIR would
+    randomly return true leading to the "Cannot divert directories" error
+    message.
+    
+    This fixes the test-suite on i386.
+
+ src/divertcmd.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit c24925105318dfa5a8ce19b54be80be69876094d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 22 18:27:16 2010 +0200
+
+    dpkg-deb: Parse control file into available structure
+    
+    This unconfuses the code to make it clear we are not dealing with
+    installed package information. It's also needed as part of the
+    infrastructure changes for multiarch support.
+
+ dpkg-deb/info.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 4e3e048dcef6714c295eae21f240ccd7ab634b8f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 22 18:25:48 2010 +0200
+
+    build: Set LC_ALL=C for check-local
+    
+    This guarantees a reproducible environment for the test-suite.
+
+ Makecheck.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit a58303f0294dfd9c93dfa4f49f572f1711f947cf
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 21 16:24:15 2010 +0200
+
+    build: Add missing TEST_ENV_VARS to check-local target
+    
+    Missed in commit 939778ab9b4147d42b7250fdb1be9c5fe79392b7.
+
+ Makecheck.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 1a6633e2d9b8d66eed60a45bfdd86552bf6107e4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 18 11:44:35 2010 +0200
+
+    dpkg: Stop exporting DPKG_LIBDIR to maintainer scripts
+    
+    Now that the maintainer scripts helper program is under PATH, there's
+    no need anymore to export the internal dpkg library directory.
+
+ debian/changelog |    1 +
+ lib/dpkg/dpkg.h  |    1 -
+ man/dpkg.1       |    4 ----
+ src/Makefile.am  |    1 -
+ src/help.c       |    1 -
+ 5 files changed, 1 insertions(+), 7 deletions(-)
+
+commit fad96a45552d4c0cca3ae141f385536048d9a75c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 17 18:30:41 2010 +0200
+
+    libdpkg: Make pkginfo argument const in pkg_summary()
+
+ lib/dpkg/pkg-show.c |    2 +-
+ lib/dpkg/pkg-show.h |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 0f1bf462adbe67938f2c05712b2f53dc82f0994f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 17 18:29:38 2010 +0200
+
+    Do not include two unused <assert.h>
+
+ dpkg-deb/build.c |    1 -
+ src/remove.c     |    1 -
+ 2 files changed, 0 insertions(+), 2 deletions(-)
+
+commit f4b2c176d93a8e66bbc56a59f210412b4b904123
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Jul 17 10:12:46 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 511t
+
+ scripts/po/de.po |   16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+commit 6b62761d7c3f0db09371a24e8d32a2600cc91c5a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 16 20:31:54 2010 +0200
+
+    Use earlier/later instead of smaller/bigger for comparison relationships
+    
+    Closes: #587641
+
+ debian/changelog              |    2 ++
+ lib/dpkg/pkg.c                |    4 ++--
+ scripts/Dpkg/Changelog.pm     |   16 ++++++++--------
+ scripts/Dpkg/Shlibs/Symbol.pm |    2 +-
+ scripts/Dpkg/Version.pm       |   12 ++++++------
+ scripts/dpkg-genchanges.pl    |    2 +-
+ 6 files changed, 20 insertions(+), 18 deletions(-)
+
+commit 4b3828ba87359a3a0171a95479834983224b2f73
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 16 17:06:23 2010 +0200
+
+    build: Add -Wshadow to default warnings
+
+ m4/dpkg-compiler.m4 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1dc3c58b4cad6338c8b02d106292b392e741f9e0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 16 16:51:36 2010 +0200
+
+    dpkg-query: Rename query.c to querycmd.c
+    
+    This makes it obvious the file contains the main() function for
+    dpkg-query in line with the rest of the tools.
+
+ src/Makefile.am             |    2 +-
+ src/{query.c => querycmd.c} |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e93fdb82239a07d52a377e5f4158e0ca0c58af7c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 16 16:49:38 2010 +0200
+
+    Fix file names in comment header
+
+ dselect/basecmds.cc  |    2 +-
+ dselect/basetop.cc   |    2 +-
+ lib/dpkg/parsedump.h |    2 +-
+ lib/dpkg/pkg.c       |    2 +-
+ lib/dpkg/progress.h  |    2 +-
+ src/errors.c         |    2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+commit bac27aba18dc8eff6124741f7554ccf75b09ceee
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 16 16:38:37 2010 +0200
+
+    dpkg-query: Do not incorrectly trim package summary on --list
+    
+    When computing the longest package description, the code was using
+    always the first package passed to list1package. Which made it trim to
+    an incorrect size.
+
+ debian/changelog |    2 ++
+ src/query.c      |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 4def4665267a8249ae2de2594422c18f7a84bc8b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 16 16:35:03 2010 +0200
+
+    dpkg-query: Use pkg_summary in list1package instead of ad-hoc code
+
+ src/query.c |    7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
+
+commit f45885e71425f23a707250a87e0672ec96d82cf7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 16 16:28:39 2010 +0200
+
+    libdpkg: Make pkg_summary() return the summary instead of void
+    
+    Change from returning through a pointer argument to returning it from
+    the function return value.
+
+ lib/dpkg/pkg-show.c |    7 ++++---
+ lib/dpkg/pkg-show.h |    2 +-
+ src/enquiry.c       |    2 +-
+ src/query.c         |    2 +-
+ 4 files changed, 7 insertions(+), 6 deletions(-)
+
+commit 92838b1a97e20b70c3a450578d2b4271143fd561
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 16 14:19:15 2010 +0200
+
+    Move pkg-show module to libdpkg
+
+ lib/dpkg/Makefile.am                  |    2 ++
+ {src => lib/dpkg}/pkg-show.c          |    5 ++---
+ src/pkg-show.c => lib/dpkg/pkg-show.h |   33 ++++++++-------------------------
+ src/Makefile.am                       |    2 --
+ src/enquiry.c                         |    1 +
+ src/main.h                            |    2 --
+ src/query.c                           |    1 +
+ 7 files changed, 14 insertions(+), 32 deletions(-)
+
+commit b4efb601b445580a3a46ce873eec3a80893dd08f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 16 14:03:41 2010 +0200
+
+    Convert limiteddescription() to pkg_summary()
+    
+    Move clamping of summary size to callers. This makes the function more
+    generic so that it can be reused in other contexts.
+
+ src/enquiry.c  |    5 ++++-
+ src/main.h     |    3 +--
+ src/pkg-show.c |   15 ++++++++-------
+ src/query.c    |    4 +++-
+ 4 files changed, 16 insertions(+), 11 deletions(-)
+
+commit c5309f8009d14dc6ce05a783ab89acf0c5e2a3ed
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 14 15:23:46 2010 +0200
+
+    Switch variables from int to bool where appropriate
+
+ dpkg-deb/build.c      |    7 ++++---
+ lib/dpkg/pkg-format.c |   10 +++++-----
+ src/errors.c          |    4 ++--
+ src/main.c            |   11 ++++++-----
+ src/packages.c        |   16 +++++++++-------
+ 5 files changed, 26 insertions(+), 22 deletions(-)
+
+commit 51be5fbb426c0d46aa38dcd1289852b60a252a6c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 11 19:57:07 2010 +0200
+
+    u-a: Rename variable a to a_new to not shadow outter scope variable
+
+ utils/update-alternatives.c |   18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+commit 0ffb2352819de51884f80c380819a33cce9333a7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 11 19:56:05 2010 +0200
+
+    u-a: Rename altlnk to sl_altlnk to not shadow altlnk from outter scope
+
+ utils/update-alternatives.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit fa610b5f505c38fad4c7c8d9b86262988a2d793d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 11 19:48:22 2010 +0200
+
+    u-a: Rename link variable to linkname to not shadow link(2)
+
+ utils/update-alternatives.c |   51 ++++++++++++++++++++++---------------------
+ 1 files changed, 26 insertions(+), 25 deletions(-)
+
+commit a9746761e3237e4cee5c5c7f5851b62b4de8ed37
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 11 19:00:56 2010 +0200
+
+    u-a: Rename variable index to idx to not shadow index(3)
+
+ utils/update-alternatives.c |   16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+commit f530505861321e8d8a9e70cf5fd86278778b58d1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 11 18:51:32 2010 +0200
+
+    u-a: Remove unneeded const from fileset_add_slave string arguments
+    
+    The arguments were later on cast to remove the constness, so just fix
+    the prototype of the function.
+
+ utils/update-alternatives.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 20a523e176f4c3c81cdade68ba71c45c421dfadc
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 11 19:42:02 2010 +0200
+
+    dpkg: Rename symlink variable to target to not shadow symlink(2)
+
+ src/configure.c |   21 +++++++++++----------
+ 1 files changed, 11 insertions(+), 10 deletions(-)
+
+commit 7562f4ce74a04167ef2e9927304b15ae4b8cb6e9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 11 15:50:29 2010 +0200
+
+    dpkg: Rename the remove variable to skip to not shadow remove(3)
+
+ src/filters.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit d647c878fb04db22dd0cfa7a57bee8f1d3caeac8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 11 15:49:27 2010 +0200
+
+    dpkg-split: Namespace global option variables to not shadow local ones
+
+ dpkg-split/dpkg-split.h |    9 ++++++---
+ dpkg-split/join.c       |    6 +++---
+ dpkg-split/main.c       |   29 ++++++++++++++++-------------
+ dpkg-split/queue.c      |   26 ++++++++++++++------------
+ dpkg-split/split.c      |    4 ++--
+ 5 files changed, 41 insertions(+), 33 deletions(-)
+
+commit 0581dda824f26e9eec996ebf4de5f6474336bec2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 11 11:44:41 2010 +0200
+
+    build: Add optional code coverage support
+    
+    Enable code coverage support with 'configure --enable-coverage'. Use
+    gcov and lcov for C code coverage, and Devel::Cover and cover for Perl
+    code coverage.
+
+ .gitignore          |    4 ++++
+ Makecheck.am        |    2 ++
+ Makefile.am         |   44 +++++++++++++++++++++++++++++++++++++++++++-
+ configure.ac        |    1 +
+ doc/.gitignore      |    1 +
+ doc/lcov-epilog     |    8 ++++++++
+ doc/lcov-prolog     |    8 ++++++++
+ m4/dpkg-coverage.m4 |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ scripts/.gitignore  |    1 +
+ scripts/Makefile.am |    9 ++++++++-
+ 10 files changed, 127 insertions(+), 2 deletions(-)
+
+commit 577ab5dd513beb641f1d635d8ead681065254233
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 10 13:54:28 2010 +0200
+
+    build: Move dpkg_divert test case from scripts to src
+
+ scripts/Makefile.am                                |    3 +--
+ src/.gitignore                                     |    1 +
+ src/Makefile.am                                    |   11 +++++++++++
+ .../t/950_dpkg_divert.t => src/t/100_dpkg_divert.t |    0
+ 4 files changed, 13 insertions(+), 2 deletions(-)
+
+commit 939778ab9b4147d42b7250fdb1be9c5fe79392b7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 10 13:21:02 2010 +0200
+
+    build: Refactor perl test-suite support into a new Makecheck.am file
+
+ Makecheck.am        |   21 +++++++++++++++++++++
+ scripts/Makefile.am |   22 ++++++++--------------
+ utils/Makefile.am   |   16 +++++-----------
+ 3 files changed, 34 insertions(+), 25 deletions(-)
+
+commit 81839b6215eebaef7eac25c9b3811a057c8f41a8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 10 10:07:05 2010 +0200
+
+    build: Fix 'make check' when libdpkg has not been built yet
+    
+    Force the subdirectory build order, so that lib/dpkg gets built before
+    lib/dpkg/test, making the former always available for the latter.
+
+ lib/dpkg/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 20f0d638fee7d1c383ee9e1a83e2a7ddabc065b5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 10 09:13:50 2010 +0200
+
+    build: Rename overriding check targets to check-local
+    
+    This allows to have the local targets and be able to use the native
+    automake targets in the future.
+
+ scripts/Makefile.am |    2 +-
+ utils/Makefile.am   |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 0535fac53f385a866946e978fd35a10185d162fc
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 10 09:12:39 2010 +0200
+
+    build: Skip all dpkg-divert tests if the binary is not available
+
+ scripts/t/950_dpkg_divert.t |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 1ccdb04d4b3d732c01e73607fc237aa0d46237e3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 11 11:26:20 2010 +0200
+
+    libdpkg: Fix command_add_argv doxygen comment to match param name
+
+ lib/dpkg/command.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fc6fef6d8369fa682f5980fece9f0e481f3c2e15
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 8 07:48:31 2010 +0200
+
+    dpkg-divert: Refactor writable directory check into a new function
+
+ src/divertcmd.c |   40 ++++++++++++++++++----------------------
+ 1 files changed, 18 insertions(+), 22 deletions(-)
+
+commit dcfb989852466575299e6f6ac505cab8c6476699
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 8 07:29:16 2010 +0200
+
+    dpkg-divert: Disable renaming of the source file does not exist
+    
+    This makes it consistent with the general dpkg behaviour of honouring
+    file removals by the administrator.
+    
+    Closes: #550252
+    
+    As a side effect, this avoids useless errors when the destination
+    directory is not existent or writable.
+    
+    Closes: #581544
+
+ debian/changelog |    4 ++++
+ src/divertcmd.c  |   13 ++++++-------
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+commit 5cc86959a4719f2426480ccdae2a2b9d72a754e3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jul 6 08:58:04 2010 +0200
+
+    dpkg-deb: Reduce scope of several variables in extracthalf()
+
+ dpkg-deb/extract.c |   12 +++++++-----
+ 1 files changed, 7 insertions(+), 5 deletions(-)
+
+commit bc68b3461b939c4104d790ec3246a976fe4d52b3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jul 6 08:49:09 2010 +0200
+
+    dpkg-deb: Remove redundant readfromfd variable
+    
+    This variable always gets assigned the same fd, so there's no point in
+    keeping it around.
+
+ dpkg-deb/extract.c |    7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+commit df863c9b8ddf377b6cb89ac9079770356bd69c65
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jul 6 08:42:13 2010 +0200
+
+    dpkg-deb: Do not use EOF on file descriptor calls
+    
+    The code was working because EOF is usually -1, but that's not
+    guaranteed by any standard. It's also conceptually wrong to mix this
+    definition from stream based I/O on file dscriptor based I/O.
+    
+    For the close() call, just check that the return value is not 0.
+    
+    Regression introduced in f4f4a1aa8dec678b6f34abcbcb8efd5b75966028.
+
+ dpkg-deb/extract.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 66c6a8b54f40cedbd754dd9865fd64a0275e7b72
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jul 6 08:30:13 2010 +0200
+
+    dpkg-deb: Do not special case old format control member
+    
+    Initialize memberlen and skip the control member if the filesystem
+    member was requested, so that the same generic code that feeds the
+    member to the decompressor can be used for all cases.
+
+ dpkg-deb/extract.c |   62 ++++++++++++++++------------------------------------
+ 1 files changed, 19 insertions(+), 43 deletions(-)
+
+commit ee512e837ea7a1753155fc6c5addb06ba0feefc7
+Author: Omar Campagne <ocampagne@gmail.com>
+Date:   Sat Jul 3 17:22:49 2010 +0200
+
+    Update Spanish translation of manual pages
+    
+    Update to 1925t and fix "typo" in debian/changelog.
+
+ debian/changelog |    2 +-
+ man/po/es.po     |   72 +++++++++++++++++++++++++++++++++++++++---------------
+ 2 files changed, 53 insertions(+), 21 deletions(-)
+
+commit 763aa476f71411f71b131e778ce4ab8b31f29041
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Jul 3 14:46:59 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1926t.
+
+ man/po/de.po |  283 ++++++++++++++++++++++++++++++---------------------------
+ 1 files changed, 149 insertions(+), 134 deletions(-)
+
+commit e142aa1f4cfd4332cdba7d78c23618be2e3dbfeb
+Author: Omar Campagne <ocampagne@gmail.com>
+Date:   Sat Jul 3 13:18:18 2010 +0200
+
+    Initial Spanish scripts translation
+
+ debian/changelog   |    3 +
+ scripts/po/LINGUAS |    3 +
+ scripts/po/es.po   | 3579 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 3585 insertions(+), 0 deletions(-)
+
+commit 3a544f8c59b3f9e46f9cfc624edbaaaa5b81d92a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jul 3 09:38:48 2010 +0200
+
+    man: Clarify --force-confask description
+    
+    Mention any of the other --force-conf options can be given, not just
+    one. And that --force-confmiss can also be used with --force-confask.
+
+ man/dpkg.1 |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit bd0ae9a42b06f09223383e67edb262041e2bd98d
+Author: Henning Makholm <henning@makholm.net>
+Date:   Sat Jul 3 04:30:04 2010 +0200
+
+    Add new dpkg --force-confask option
+    
+    The option forces a conffile prompt when the conffile from the new
+    package does not differ from the previous one version.
+    
+    Closes: #102609
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog |    3 +++
+ man/dpkg.1       |    7 +++++++
+ src/configure.c  |    7 ++++++-
+ src/main.c       |    3 +++
+ src/main.h       |    1 +
+ 5 files changed, 20 insertions(+), 1 deletions(-)
+
+commit c3d9eea8d03d93eed6e2d87a97acfca5562b2b32
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 2 13:13:01 2010 +0200
+
+    dpkg: Detect locked databases on --audit
+    
+    Detect when another process has locked the database, and mention that
+    problematic dpkg --audit results might be due to ongoing operations.
+    
+    Closes: #80252
+
+ debian/changelog    |    3 +++
+ lib/dpkg/dbmodify.c |   32 +++++++++++++++++++++++++++++++-
+ lib/dpkg/dpkg-db.h  |    1 +
+ lib/dpkg/file.c     |   22 ++++++++++++++++++++++
+ lib/dpkg/file.h     |    3 +++
+ src/enquiry.c       |    8 ++++++++
+ 6 files changed, 68 insertions(+), 1 deletions(-)
+
+commit 0238821c66112e5403dd8abbf6eca0962866d944
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 2 13:03:44 2010 +0200
+
+    libdpkg: Refactor file lock setup into file_lock_setup()
+
+ lib/dpkg/file.c |   22 ++++++++++++++--------
+ 1 files changed, 14 insertions(+), 8 deletions(-)
+
+commit 0309242811c39aedda81521019ece0b3ffa16cc7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 2 12:36:06 2010 +0200
+
+    Bump Standards-Version to 3.9.0
+
+ debian/changelog |    1 +
+ debian/control   |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 2a2c2ef9188d718c914000fc6ab48f33acc54ddb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 2 11:56:47 2010 +0200
+
+    Move Dpkg.pm and Dpkg/Gettext.pm from dpkg to libdpkg-perl
+
+ debian/changelog            |    1 +
+ debian/control              |    5 +++--
+ debian/dpkg.install         |    2 --
+ debian/libdpkg-perl.install |    2 +-
+ debian/rules                |    2 +-
+ scripts/Dpkg.pm             |    6 ------
+ 6 files changed, 6 insertions(+), 12 deletions(-)
+
+commit bd7a8ab1d03d2cfb7a7ad4ea21e26edaca53dd39
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 2 12:26:48 2010 +0200
+
+    Use Breaks instead of Conflicts in dpkg, dpkg-dev and libdpkg-perl
+    
+    All instances were due to files taken over, or functionality broken
+    due to interface changes.
+
+ debian/changelog |    2 ++
+ debian/control   |    8 ++++----
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 3b8074a91047c3308309f93f1bf344c339044e98
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 2 06:14:04 2010 +0200
+
+    Use linux-any wildcard for libselinux1-dev Build-Depends
+    
+    Instead of using a list of negated architectures. This will make the job
+    easier for new ports. And it's just more correct.
+
+ debian/changelog |    2 ++
+ debian/control   |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 02b12d75f1eff7c184fafb5a663a0421e9a645ea
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 19 05:57:29 2010 +0100
+
+    dpkg-divert: Rewrite in C
+
+ debian/changelog            |    1 +
+ po/POTFILES.in              |    3 +-
+ scripts/.gitignore          |    1 -
+ scripts/Makefile.am         |    2 -
+ scripts/dpkg-divert.pl      |  369 ---------------------
+ scripts/t/950_dpkg_divert.t |    2 +-
+ src/.gitignore              |    1 +
+ src/Makefile.am             |   12 +
+ src/divertcmd.c             |  757 +++++++++++++++++++++++++++++++++++++++++++
+ 9 files changed, 773 insertions(+), 375 deletions(-)
+
+commit b7b59ee6ff98188627346998829f1df51a9bbb12
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date:   Wed Oct 14 02:36:44 2009 +0700
+
+    dpkg-divert: Add new test-case
+    
+    Devel::Cover reports 97% coverage. Remaining branches are hard-to-test
+    without root privilege error handling.
+    
+    [guillem@debian.org:
+     - Add new test into test_cases.
+     - Run program from builddir.
+     - Do not check for usage output on badusage.
+     - Use note() instead of diag().
+     - Sort database and list output.
+     - Skip some tests when under fakeroot. ]
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ scripts/Makefile.am         |    3 +-
+ scripts/t/950_dpkg_divert.t |  555 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 557 insertions(+), 1 deletions(-)
+
+commit 1fc9a0364a1954389036d18385b9b4432374fc49
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jun 29 07:12:39 2010 +0200
+
+    dpkg-split: Fix indentation for the rest of split.c
+
+ dpkg-split/split.c |   56 ++++++++++++++++++++++++++-------------------------
+ 1 files changed, 29 insertions(+), 27 deletions(-)
+
+commit f2115151c19ff37b305296c23225807b0832086b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 2 06:15:26 2010 +0200
+
+    dpkg-split: Rewrite mksplit in C
+
+ debian/changelog       |    1 +
+ debian/dpkg.install    |    1 -
+ dpkg-split/.gitignore  |    1 -
+ dpkg-split/Makefile.am |   15 ---
+ dpkg-split/mksplit.pl  |   89 -------------------
+ dpkg-split/split.c     |  225 ++++++++++++++++++++++++++++++++++++++++++++----
+ 6 files changed, 210 insertions(+), 122 deletions(-)
+
+commit 28ca2d0e5c8d47abf2907b697a7711e6a7689293
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 2 06:07:41 2010 +0200
+
+    dpkg-deb: Use new dpkg_ar library functions instead of ad-hoc code
+
+ dpkg-deb/build.c |   52 +++++++++++++++-------------------------------------
+ 1 files changed, 15 insertions(+), 37 deletions(-)
+
+commit 9200eb93dfc61363336d7a29f6ba7a35bb2ac174
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 1 12:25:44 2010 +0200
+
+    libdpkg: Add new dpkg ar support functions
+
+ lib/dpkg/ar.c             |   63 +++++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/ar.h             |    8 +++++
+ lib/dpkg/libdpkg.Versions |    6 ++++
+ 3 files changed, 77 insertions(+), 0 deletions(-)
+
+commit c81a1475db83f6fbd33a104085434f71d9761c74
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 1 12:05:09 2010 +0200
+
+    Use new DPKG_AR_MAGIC macro instead of literal string
+
+ dpkg-deb/build.c   |    3 ++-
+ dpkg-deb/extract.c |    2 +-
+ dpkg-split/info.c  |   13 +++++++------
+ lib/dpkg/ar.h      |    2 ++
+ 4 files changed, 12 insertions(+), 8 deletions(-)
+
+commit 84182faf902d1b7ba0ed13554e42d5ca40763bd2
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Jun 28 21:38:06 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1925t.
+
+ man/po/de.po |   10 +++-------
+ 1 files changed, 3 insertions(+), 7 deletions(-)
+
+commit 2d7f7493c581f413a0586ba5a790f2306bcd655d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jun 28 08:45:01 2010 +0200
+
+    Dpkg::Changelog: fixed to cope properly with an entry of version "0"
+    
+    The change of the boolean evaluation of Dpkg::Version introduced in
+    5b9f353b2940de751df47036608afbe71992d622 broke Dpkg::Changelog's ability
+    to correctly export an entry with a version of "0".
+    
+    Add a non-regression test for this.
+
+ debian/changelog                         |    2 ++
+ scripts/Dpkg/Changelog.pm                |    6 ++++--
+ scripts/t/600_Dpkg_Changelog.t           |    5 +++++
+ scripts/t/600_Dpkg_Changelog/regressions |    3 ++-
+ 4 files changed, 13 insertions(+), 3 deletions(-)
+
+commit 8f576412d15d80e34859c254aa748d6acc606749
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Sun Jun 27 18:02:00 2010 +0200
+
+    German dpkg translation update
+    
+    Update to 984t.
+
+ po/de.po |   20 +++++++-------------
+ 1 files changed, 7 insertions(+), 13 deletions(-)
+
+commit ad9b46bf8194a68291224d8a7f93af30d74982c9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jun 27 10:48:03 2010 +0200
+
+    Update Catalan translation
+
+ debian/changelog |    1 +
+ po/ca.po         |    4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 5aadeeacaa4f5e072b42d032360c1d3406e70b40
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jun 27 10:41:56 2010 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |   58 +-
+ dselect/po/ca.po        |   58 +-
+ dselect/po/cs.po        |   58 +-
+ dselect/po/da.po        |   58 +-
+ dselect/po/de.po        |   58 +-
+ dselect/po/dselect.pot  |   60 +-
+ dselect/po/el.po        |   58 +-
+ dselect/po/es.po        |   58 +-
+ dselect/po/et.po        |   58 +-
+ dselect/po/eu.po        |   58 +-
+ dselect/po/fr.po        |   58 +-
+ dselect/po/gl.po        |   58 +-
+ dselect/po/hu.po        |   58 +-
+ dselect/po/id.po        |   58 +-
+ dselect/po/it.po        |   58 +-
+ dselect/po/ja.po        |   58 +-
+ dselect/po/ko.po        |   58 +-
+ dselect/po/nb.po        |   58 +-
+ dselect/po/nl.po        |   58 +-
+ dselect/po/nn.po        |   58 +-
+ dselect/po/pl.po        |   58 +-
+ dselect/po/pt.po        |   58 +-
+ dselect/po/pt_BR.po     |   58 +-
+ dselect/po/ro.po        |   58 +-
+ dselect/po/ru.po        |   58 +-
+ dselect/po/sk.po        |   58 +-
+ dselect/po/sv.po        |   58 +-
+ dselect/po/tl.po        |   58 +-
+ dselect/po/vi.po        |   58 +-
+ dselect/po/zh_CN.po     |   58 +-
+ dselect/po/zh_TW.po     |   58 +-
+ man/po/de.po            |   20 +-
+ man/po/dpkg-man.pot     |  489 +++++++----
+ man/po/es.po            | 1337 ++++++++++++++++-------------
+ man/po/fr.po            |  525 +++++++-----
+ man/po/hu.po            |  501 +++++++-----
+ man/po/ja.po            |  505 +++++++-----
+ man/po/pl.po            |  524 +++++++-----
+ man/po/pt_BR.po         |  502 +++++++-----
+ man/po/ru.po            |  503 +++++++-----
+ man/po/sv.po            |  514 +++++++-----
+ po/ast.po               | 2187 ++++++++++++++++++++++++----------------------
+ po/bs.po                | 1741 +++++++++++++++++++------------------
+ po/ca.po                | 2182 ++++++++++++++++++++++++----------------------
+ po/cs.po                | 2166 ++++++++++++++++++++++++----------------------
+ po/da.po                | 2056 +++++++++++++++++++++++---------------------
+ po/de.po                |  824 +++++++++---------
+ po/dpkg.pot             | 1733 +++++++++++++++++++------------------
+ po/dz.po                | 2066 +++++++++++++++++++++++---------------------
+ po/el.po                | 2187 ++++++++++++++++++++++++----------------------
+ po/eo.po                | 2053 +++++++++++++++++++++++---------------------
+ po/es.po                | 2195 ++++++++++++++++++++++++----------------------
+ po/et.po                | 1896 +++++++++++++++++++++--------------------
+ po/eu.po                | 2055 +++++++++++++++++++++++---------------------
+ po/fr.po                | 2177 ++++++++++++++++++++++++----------------------
+ po/gl.po                | 2159 ++++++++++++++++++++++++----------------------
+ po/hu.po                | 1960 ++++++++++++++++++++++--------------------
+ po/id.po                | 1895 +++++++++++++++++++++--------------------
+ po/it.po                | 2062 +++++++++++++++++++++++---------------------
+ po/ja.po                | 2171 ++++++++++++++++++++++++----------------------
+ po/km.po                | 2031 ++++++++++++++++++++++---------------------
+ po/ko.po                | 2159 ++++++++++++++++++++++++----------------------
+ po/ku.po                | 1781 ++++++++++++++++++++-------------------
+ po/lt.po                | 1811 ++++++++++++++++++++-------------------
+ po/mr.po                | 2027 ++++++++++++++++++++++---------------------
+ po/nb.po                | 2158 ++++++++++++++++++++++++----------------------
+ po/ne.po                | 2059 +++++++++++++++++++++++---------------------
+ po/nl.po                | 2067 +++++++++++++++++++++++---------------------
+ po/nn.po                | 1895 +++++++++++++++++++++--------------------
+ po/pa.po                | 1928 +++++++++++++++++++++--------------------
+ po/pl.po                | 2048 +++++++++++++++++++++++---------------------
+ po/pt.po                | 2178 ++++++++++++++++++++++++----------------------
+ po/pt_BR.po             | 2164 ++++++++++++++++++++++++----------------------
+ po/ro.po                | 2182 ++++++++++++++++++++++++----------------------
+ po/ru.po                | 2045 +++++++++++++++++++++++---------------------
+ po/sk.po                | 2175 ++++++++++++++++++++++++----------------------
+ po/sv.po                | 2157 ++++++++++++++++++++++++----------------------
+ po/th.po                | 2141 ++++++++++++++++++++++++----------------------
+ po/tl.po                | 1903 +++++++++++++++++++++--------------------
+ po/vi.po                | 2199 ++++++++++++++++++++++++-----------------------
+ po/zh_CN.po             | 2162 ++++++++++++++++++++++++----------------------
+ po/zh_TW.po             | 2141 ++++++++++++++++++++++++----------------------
+ scripts/po/ca.po        |  233 +++---
+ scripts/po/de.po        |    2 +-
+ scripts/po/dpkg-dev.pot |  234 +++---
+ scripts/po/fr.po        |  233 +++---
+ scripts/po/pl.po        |  233 +++---
+ scripts/po/ru.po        |  233 +++---
+ scripts/po/sv.po        |  233 +++---
+ 89 files changed, 48093 insertions(+), 43704 deletions(-)
+
+commit 1079ed11dcbf3d9b20e841fb22fd501740e746b0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jun 27 10:27:10 2010 +0200
+
+    build: Add a top-level update-po target
+    
+    This will ease maintainers and translators job when wanting to update
+    the po files.
+
+ Makefile.am |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+commit b8799d9f107b23d8640ae7db852499f399792083
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 26 13:16:17 2010 +0200
+
+    Use consistent naming for linked lists members
+    
+    Use next/prev instead of next/back (which would complement forward).
+    Also move next to the end of member names and seprate it with an
+    underscore, to simulate it being a sub struct member.
+
+ TODO                  |    1 -
+ dselect/method.h      |    2 +-
+ dselect/methparse.cc  |    5 +++--
+ dselect/pkgdepcon.cc  |   12 ++++++------
+ dselect/pkgsublist.cc |    2 +-
+ lib/dpkg/dlist.h      |   18 +++++++++---------
+ lib/dpkg/dpkg-db.h    |    6 +++---
+ lib/dpkg/fields.c     |   17 ++++++++++-------
+ lib/dpkg/parse.c      |   18 +++++++++---------
+ lib/dpkg/triglib.c    |    4 ++--
+ lib/dpkg/triglib.h    |    2 +-
+ src/archives.c        |    4 ++--
+ src/depcon.c          |   20 ++++++++++----------
+ src/packages.c        |    4 ++--
+ src/processarc.c      |   10 +++++-----
+ src/remove.c          |    2 +-
+ 16 files changed, 65 insertions(+), 62 deletions(-)
+
+commit c69901cdda6500450f026d02b439b941e7cb147a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 26 12:38:27 2010 +0200
+
+    Remove 'vsnprintf return value check' item from TODO after code review
+    
+    The few places where the vsnprintf callers are not checking the return
+    value, are about to ohshit anyway so there's no real damage by not
+    doing the check, the rest are harmless.
+
+ TODO |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit c838e48663200b40ad13eec3ac5a40d3b12bff2c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 26 12:23:09 2010 +0200
+
+    libdpkg: Check in test-case that : is an illegal character in revision
+
+ lib/dpkg/test/t-version.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 662d97913fe8d9f4aa784ca7595c415c65202148
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 26 12:17:20 2010 +0200
+
+    libdpkg: Check version syntax when parsing
+    
+    Remove the incomplete checkversion() from dpkg-deb as it's now unneeded.
+    Enable test-cases for invalid characters in version and revision parts.
+    
+    Closes: #574704
+
+ debian/changelog          |    2 ++
+ dpkg-deb/build.c          |   22 ++--------------------
+ lib/dpkg/parsehelp.c      |   13 ++++++++++++-
+ lib/dpkg/test/t-version.c |    3 ---
+ 4 files changed, 16 insertions(+), 24 deletions(-)
+
+commit 0a85d64a50ebb3bb2d5f06f368e68b6f902533fa
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 26 07:26:25 2010 +0200
+
+    dpkg: Place deferred extract rename debug message closer to the action
+
+ src/archives.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 2b87ec98e266e6dcab59eacc4ea2b2e227960133
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 26 04:42:31 2010 +0200
+
+    dpkg-query: Change actionfunction to return int instead of void
+    
+    This avoids a global exit code variable.
+
+ src/query.c |   36 +++++++++++++++++++++++++-----------
+ 1 files changed, 25 insertions(+), 11 deletions(-)
+
+commit edd58fd64fb2f60ab5a2b933c7a9875db0725378
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 26 03:10:38 2010 +0200
+
+    libdpkg: Add missing word in comment to make it grammatical
+
+ lib/dpkg/triglib.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 346e694287e999e23e6885e9511bd8503ede1b93
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 26 03:08:15 2010 +0200
+
+    libdpkg: Remove obsolete internal status aliases
+    
+    The strings are “postinst-failed” for stat_halfconfigured and
+    “removal-failed” for stat_halfinstalled.
+    
+    These were used for backward compatibility during upgrades from ancient
+    dpkg versions. As they should not appear in newer status files, it's
+    really safe to remove them now.
+
+ debian/changelog     |    2 ++
+ lib/dpkg/parsehelp.c |    5 -----
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+commit 254b3752d36376de47c2f04fbeb8cd439527c6a0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 25 19:16:52 2010 +0200
+
+    libdpkg: Remove unused nfields variable
+
+ lib/dpkg/parse.c     |    2 --
+ lib/dpkg/parsedump.h |    1 -
+ 2 files changed, 0 insertions(+), 3 deletions(-)
+
+commit c88029bab1e02b866848736bf85b1a08ec419d2a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 25 18:37:42 2010 +0200
+
+    dpkg: Do not use abbreviations for 'distributed'
+
+ src/configure.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 50391de87ac2b0269ef3e2f64fb41e913baff415
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 25 18:20:26 2010 +0200
+
+    libdpkg: Remove 'valid' member from struct pkginfoperfile
+    
+    The two struct pkginfoperfile inside struct pkginfo are always valid,
+    as blankpackage does a blankpackageperfile on each. So there's no
+    actual need for the boolean member, neither for validity checks all
+    over the place and possible subsequent redundant initializations.
+    
+    This is due to commit 5f100a01af636c14a600bf53b22e2ca3f2fcc546.
+
+ dpkg-deb/build.c      |    1 -
+ dselect/pkgdepcon.cc  |   82 ++++++++++++++++++++++--------------------------
+ dselect/pkglist.cc    |    3 --
+ dselect/pkgsublist.cc |    2 +-
+ lib/dpkg/database.c   |    5 ---
+ lib/dpkg/dpkg-db.h    |    1 -
+ lib/dpkg/dump.c       |   23 ++++++-------
+ lib/dpkg/parse.c      |    5 +--
+ lib/dpkg/pkg-format.c |    6 +---
+ src/enquiry.c         |    4 +-
+ src/packages.c        |   25 +++++++--------
+ src/pkg-show.c        |    2 +-
+ src/processarc.c      |   16 +++------
+ src/query.c           |    4 +-
+ src/remove.c          |    1 -
+ 15 files changed, 75 insertions(+), 105 deletions(-)
+
+commit acf7fe58c95c2ba4300ec4b60d614012483f4771
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 25 08:46:23 2010 +0200
+
+    dpkg: Mark hook command error string for translation
+
+ src/main.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 88b5c91de144e1faace4f9777aba1b5da27a7bcd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 25 08:12:01 2010 +0200
+
+    dpkg: Remove redundant trailing newlines from debug output
+    
+    debug() already prints a trailing newline, so there's no point in
+    including it in the string to be printed.
+
+ src/depcon.c     |    2 +-
+ src/processarc.c |    4 ++--
+ src/remove.c     |    4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 4eab697e64024d034220cc6366c80a5f090ff687
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jun 24 21:22:32 2010 +0200
+
+    libdpkg: Remove outdated comment with test dataset package names
+
+ lib/dpkg/database.c |   20 --------------------
+ 1 files changed, 0 insertions(+), 20 deletions(-)
+
+commit 45816c76839b9b4a50b048420d7ff4812eaf4277
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jun 24 04:05:09 2010 +0200
+
+    libdpkg: Add new version symbol script
+    
+    It's not used yet, but it's useful to keep track of the exported API,
+    and what needs to be removed, renamed, etc, in just one place.
+
+ lib/dpkg/Makefile.am      |    1 +
+ lib/dpkg/libdpkg.Versions |  228 +++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 229 insertions(+), 0 deletions(-)
+
+commit 1f6b854a2d8319f8b90cb3964117aaf95e10e0a8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jun 24 04:04:08 2010 +0200
+
+    libdpkg: Rename trigdef_yylex() to trigdef_parse()
+
+ lib/dpkg/trigdeferred.h |    2 +-
+ lib/dpkg/trigdeferred.l |    1 +
+ lib/dpkg/triglib.c      |    2 +-
+ src/trigcmd.c           |    2 +-
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 24bd7ac063a234b3c63df79ad599f39fed728ad5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jun 22 11:08:27 2010 +0200
+
+    dpkg-trigger: Mark do_check with DPKG_ATTR_NORET
+
+ src/trigcmd.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c43931e799d36275cf6d44be94c63512b94b1c9e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jun 22 10:57:47 2010 +0200
+
+    dpkg: Use iterators instead of exposing packageslump directly
+
+ TODO             |    1 -
+ src/archives.c   |  218 +++++++++++++++++++++++++++---------------------------
+ src/filesdb.c    |   56 ++++++++++++++
+ src/filesdb.h    |   13 +--
+ src/help.c       |   23 +++---
+ src/processarc.c |   88 +++++++++++-----------
+ src/query.c      |   22 +++---
+ 7 files changed, 238 insertions(+), 183 deletions(-)
+
+commit 632e855a51070ca42532341e9f8f0f0006f1a23d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jun 21 20:09:40 2010 +0200
+
+    man: Update u-a log file reference
+    
+    update-alternatives has now its independent log file, reflect that in
+    the man page.
+
+ man/update-alternatives.8 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 21bae07787b41706d5afbefb470b1ee84e3382b6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jun 21 19:57:51 2010 +0200
+
+    dpkg: Mark the summarize_filename() ellipsed string for translation
+    
+    Coallesce the ellipsed string with the format string so that it makes a
+    bit more sense for translators. This will allow translators to use for
+    example the UTF-8 ellipsis character.
+
+ src/processarc.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 3a517daa138719192aee819a6fa221231f252ffd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 19 06:38:04 2010 +0200
+
+    dpkg: Switch existingdirectory and keepexisting from int to bool
+
+ src/archives.c |   17 +++++++++--------
+ 1 files changed, 9 insertions(+), 8 deletions(-)
+
+commit ff008d67767538266655f524761bdd3a08769375
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 19 06:51:24 2010 +0200
+
+    dpkg: Remove filtered existing directories on upgrade
+    
+    Move the return point in tarobject() for the existing directories
+    check after the path filter one. This makes sure the latter takes
+    precedence over the former, and existing directories get properly
+    filtered and removed on upgrades.
+    
+    Reported-by: Martin Pitt <martin.pitt@ubuntu.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ src/archives.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 58b91fbb00fca2dd0bbb429b28887d6ebc04abea
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jun 15 20:08:54 2010 +0200
+
+    dpkg: Remove filtered files on upgrade
+    
+    Because the filtered file is left in the new file list, the code that
+    verifies if the old file is present (maybe with a different name) in
+    the new list matches the stat information. So we mark and treat filtered
+    files as if they were already not present on the file system.
+    
+    Reported-by: Martin Pitt <martin.pitt@ubuntu.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ src/archives.c   |    1 +
+ src/filesdb.h    |    1 +
+ src/processarc.c |    4 ++++
+ 3 files changed, 6 insertions(+), 0 deletions(-)
+
+commit e3668035f51081b8afbde6040a9f096bf9a4e941
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 18 20:57:15 2010 +0200
+
+    build: Remove redundant test_case assignment in utils/
+
+ utils/Makefile.am |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+commit 0e8a57c3af2d017b290af9b553c58300b464c96f
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Tue Jun 15 20:25:47 2010 +0200
+
+    German dpkg translation update
+    
+    Update to 984t.
+
+ debian/changelog |    1 +
+ po/de.po         | 1399 +++++++++++++++++++++++++++++-------------------------
+ 2 files changed, 741 insertions(+), 659 deletions(-)
+
+commit 6f398047c2fd6b04e4f1ff8dea5530a3bec4a2db
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Mon Jun 14 23:08:10 2010 +0200
+
+    Fix ”make distcheck“ errors
+    
+    Reflect the rewrite of update-alternatives in commit
+    cab5af04fadcd939a7becd5fcb25dcfb7bc121dd and the addition of
+    scripts/t/origin in commit 2d4fd627d4286dc42006fb486040209d4e021b9f.
+
+ po/POTFILES.in      |    2 +-
+ scripts/Makefile.am |    6 ++++--
+ utils/Makefile.am   |    7 +++++++
+ 3 files changed, 12 insertions(+), 3 deletions(-)
+
+commit f05cefbba005c10b1513cfd65efc024fdc895427
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Jun 11 19:06:34 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1925t.
+
+ man/po/de.po |  240 +++++++++++++++++++++++++++++++++-------------------------
+ 1 files changed, 136 insertions(+), 104 deletions(-)
+
+commit 0d59a745b72d98fb25c02dc80f1b7de116211f19
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Jun 11 17:28:01 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 511t
+
+ scripts/po/de.po |  164 +++++++++++++++++++++++++++--------------------------
+ 1 files changed, 84 insertions(+), 80 deletions(-)
+
+commit 17f00407a80f7da3eef6491dc7105d992fccf98c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jun 11 09:35:30 2010 +0200
+
+    Dpkg::Source::Patch: capture output of patch and print it on error
+    
+    patch is now run without its -s flag and thus outputs the usual messages
+    about which file it's patching and gives more verbose error messages.
+    Those messages are captured and only displayed to the user when the
+    patch application failed.
+
+ debian/changelog                        |    2 ++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    4 ++--
+ scripts/Dpkg/Source/Patch.pm            |   12 +++++++++++-
+ 3 files changed, 15 insertions(+), 3 deletions(-)
+
+commit f86ff41434db0a663179cce1703dd1bc2269d094
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jun 10 20:28:16 2010 +0200
+
+    dpkg-source: new option --abort-on-upstream-changes
+    
+    This option can be used with source formats 1.0, 2.0 and 3.0 (quilt). It
+    aborts every time that you try to build a source package which
+    contains (unmanaged) changes to the upstream source code.
+
+ debian/changelog                  |    4 ++++
+ man/dpkg-source.1                 |   14 ++++++++++++++
+ scripts/Dpkg/Source/Package/V1.pm |    6 ++++++
+ scripts/Dpkg/Source/Package/V2.pm |    8 ++++++++
+ scripts/dpkg-source.pl            |    2 +-
+ 5 files changed, 33 insertions(+), 1 deletions(-)
+
+commit 9eac8e3c4360c2f57f86336e2ec947e39d760ac1
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu Jun 10 20:29:39 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1922t.
+
+ man/po/de.po |  153 ++++++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 89 insertions(+), 64 deletions(-)
+
+commit 57c6b2d74b47c0d1f8907559383a307fb484f50e
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu Jun 10 20:08:46 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 510t
+
+ scripts/po/de.po |  142 ++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 74 insertions(+), 68 deletions(-)
+
+commit 2b204533b8a2a95ca0d3796978368f9fd3d82b9c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jun 10 16:20:41 2010 +0200
+
+    dpkg-source: new --unapply-patches option
+    
+    This option is used by source formats 2.0 and 3.0 (quilt) to unapply
+    patches after a successful build. It's useful for people who manage their
+    packages in a VCS repository and prefer to have patches unapplied, even
+    after a package build.
+    
+    Given that this option is a matter of personal taste, do not allow it
+    in debian/source/options so that the resulting source package cannot
+    have this behaviour by default and so that all source packages behave
+    in a consistent way: patches applied by default is a major feature
+    of the new formats.
+
+ debian/changelog                        |    4 ++++
+ man/dpkg-source.1                       |    9 +++++++++
+ scripts/Dpkg/Source/Package/V2.pm       |   27 +++++++++++++++++++++++++++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |   23 +++++++++++++++++++++++
+ scripts/dpkg-source.pl                  |   14 ++++++++++----
+ 5 files changed, 73 insertions(+), 4 deletions(-)
+
+commit 9278ba135233d63d7f0869cbd6ea8df0800987f3
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jun 10 17:08:38 2010 +0200
+
+    Dpkg::Conf: add new filter method
+    
+    This method can be used to select a subset of options either
+    by exclusion or by inclusion.
+
+ scripts/Dpkg/Conf.pm |   23 ++++++++++++++++++++++-
+ 1 files changed, 22 insertions(+), 1 deletions(-)
+
+commit cab5af04fadcd939a7becd5fcb25dcfb7bc121dd
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Feb 18 19:40:51 2010 +0100
+
+    update-alternatives: rewritten in C
+    
+    update-alternative has been rewritten as a mostly standalone C program.
+    It has thus been moved to utils/ instead of scripts/ together with its
+    README and its test suite.
+    
+    This rewrite is based on some initial conversion work done by Guillem
+    Jover <guillem@debian.org>.
+    
+    The program now logs to /var/log/alternatives.log instead of dpkg.log.
+    The logrotate file has been updated to deal with that file too.
+
+ debian/changelog                                   |    3 +
+ debian/dpkg.logrotate                              |    9 +
+ scripts/.gitignore                                 |    1 -
+ scripts/Makefile.am                                |   12 -
+ scripts/update-alternatives.pl                     | 1139 ---------
+ utils/.gitignore                                   |    2 +
+ utils/Makefile.am                                  |   40 +
+ {scripts => utils}/README.alternatives             |    0
+ .../t/100_update_alternatives.t                    |   39 +-
+ utils/update-alternatives.c                        | 2441 ++++++++++++++++++++
+ 10 files changed, 2521 insertions(+), 1165 deletions(-)
+
+commit a9bdb8f80f6c9aabfe63032940b523ec0513698d
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue Jun 8 18:55:12 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1920t.
+
+ man/po/de.po |  347 +++++++++++++++++++++++++++++++++++++---------------------
+ 1 files changed, 222 insertions(+), 125 deletions(-)
+
+commit fb39a80932a61736f0ee6e9416c38817817a3952
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jun 7 22:20:44 2010 +0200
+
+    dpkg-shlibdeps(1): fix typo libssl.so.9.8 -> libssl.so.0.9.8
+    
+    Also fix it in translations to avoid fuzzy strings.
+
+ man/dpkg-shlibdeps.1 |    2 +-
+ man/po/de.po         |    4 ++--
+ man/po/es.po         |    4 ++--
+ man/po/fr.po         |    4 ++--
+ man/po/hu.po         |    2 +-
+ man/po/ja.po         |    2 +-
+ man/po/pl.po         |    4 ++--
+ man/po/pt_BR.po      |    2 +-
+ man/po/ru.po         |    2 +-
+ man/po/sv.po         |    2 +-
+ 10 files changed, 14 insertions(+), 14 deletions(-)
+
+commit 4694cd64089bc72975d8ba6fbe51339023eb2e8c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 19 12:41:28 2010 +0200
+
+    dpkg: Add two new dpkg options --path-exclude and --path-include
+    
+    This provides support for filtering paths on package installation. This
+    allows embedded systems to skip /usr/share/doc, manpages, etc.
+    
+    dpkg does not lose track of excluded paths during filtering, and they
+    get checked for file conflicts as usual, so filters are not a way to
+    avoid file conflict situations.
+    
+    Closes: #68788, #68861, #497304, #525567, #583902
+    
+    Based-on-patch-by: Tollef Fog Heen <tfheen@err.no>
+    Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog |    4 ++
+ man/dpkg.1       |   37 +++++++++++++++-
+ src/Makefile.am  |    1 +
+ src/archives.c   |    8 +++
+ src/filters.c    |  128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/filters.h    |   37 ++++++++++++++++
+ src/main.c       |   15 ++++++-
+ 7 files changed, 228 insertions(+), 2 deletions(-)
+
+commit 0969a91ef9e645700556947b3a2afd2237e4a26a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jun 7 03:48:49 2010 +0200
+
+    libdpkg: Remove second va_copy in varbufvprintf
+    
+    We can directly use args in the second vsnprintf as we are about to
+    return.
+
+ lib/dpkg/varbuf.c |    5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+commit 97bc3081d2f0d1c82f7b783ced2cca42f4621984
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jun 7 03:45:36 2010 +0200
+
+    Unify naming of va_list variables to args or args_copy
+
+ lib/compat/snprintf.c  |    8 +++---
+ lib/compat/vsnprintf.c |    4 +-
+ lib/dpkg/buffer.c      |    8 +++---
+ lib/dpkg/command.c     |   20 +++++++++---------
+ lib/dpkg/command.h     |    2 +-
+ lib/dpkg/compress.c    |   24 ++++++++++----------
+ lib/dpkg/dpkg.h        |    3 +-
+ lib/dpkg/ehandle.c     |   53 ++++++++++++++++++++++++++---------------------
+ lib/dpkg/log.c         |   16 +++++++-------
+ lib/dpkg/myopt.c       |   16 +++++++-------
+ lib/dpkg/parsehelp.c   |   14 ++++++------
+ lib/dpkg/varbuf.c      |   26 ++++++++++++----------
+ m4/dpkg-funcs.m4       |    8 +++---
+ src/errors.c           |   11 +++++----
+ src/help.c             |   37 +++++++++++++++++----------------
+ 15 files changed, 130 insertions(+), 120 deletions(-)
+
+commit 36ed6fe6eb76110aceae51c4ef40c14df7027924
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jun 7 02:24:38 2010 +0200
+
+    build: Enable additional warnings by default
+    
+    The set of default warnings is quite safe, and should point out real
+    problems or stylistic ones. It's easy to forget, so let's enable them by
+    default. This will also not interfere with user settings as those will
+    override the defaults.
+
+ m4/dpkg-compiler.m4 |   14 ++++++++------
+ 1 files changed, 8 insertions(+), 6 deletions(-)
+
+commit a484f009a05f8a43a76e644e1ce97e1c2d1543b7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jun 7 01:31:45 2010 +0200
+
+    build: Allow changing default logdir
+
+ configure.ac |   11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+commit 9bc511c4a0ed86e63963616dc1f224e6d8fcb615
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jun 7 01:12:26 2010 +0200
+
+    build: Change default admindir to LOCALSTATEDIR/lib/dpkg
+    
+    The old LOCALSTATEDIR/dpkg admindir default forced to set localstatedir
+    to /var/lib, which is not correct. We can now set it to the correct /var.
+
+ configure.ac     |    4 ++--
+ debian/changelog |    2 ++
+ debian/rules     |    2 +-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+commit ab91f0385020700e65951516a835b14b7668ac9b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jun 6 21:08:20 2010 +0200
+
+    libcompat: Add declarations in compat.h for snprintf functions
+
+ lib/compat/compat.h |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 0dc899648b1e907a745dbeedc5be46b3ddaabf8d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jun 6 21:06:34 2010 +0200
+
+    libcompat: Add support for asprintf and vasprintf
+    
+    Provide compatibility code whenever the system does not.
+
+ configure.ac           |    2 +-
+ lib/compat/Makefile.am |    4 +++
+ lib/compat/asprintf.c  |   38 ++++++++++++++++++++++++++++++
+ lib/compat/compat.h    |    7 +++++
+ lib/compat/vasprintf.c |   59 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 109 insertions(+), 1 deletions(-)
+
+commit 85c60fecfe245b542ceea503994fef0347f2e51b
+Author: Omar Campagne <ocampagne@gmail.com>
+Date:   Sat Jun 5 17:50:12 2010 +0200
+
+    Fix quotes (grmpf)
+    
+    I noticed an Oops.
+    opt_es:"-L ISO-8859-1"    -A utf-8       \
+    it's outside quotes. Doesn't throw any error, just doesn't do its job.
+
+ man/po/po4a.cfg |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4a9722f5a066d4bffa58fd626470c21ddde7111c
+Author: Omar Campagne <ocampagne@gmail.com>
+Date:   Sat Jun 5 17:16:48 2010 +0200
+
+    Fix enconding of addendum
+    
+    There is a problem with the addendum output, which does show wrong
+    characters.  I don't know if that problem was there before (broken
+    addenda are usual). I set opt_es:"-L ISO-8859-1 -A utf-8" to make it
+    work. Sometimes I go crazy with encodings (the terminal, vim, etc)
+
+ man/po/po4a.cfg |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 40489dcdae74ee7cc18bea1010df40354690fe39
+Author: Omar Campagne <ocampagne@gmail.com>
+Date:   Sat Jun 5 17:13:04 2010 +0200
+
+    Revert 9434cb7d5e91718888489f8c08bfce7b768a7f1d
+    
+    No need for that and it messes stuff. That refers to the localized document
+    charset, not the po.
+
+ man/po/po4a.cfg |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9434cb7d5e91718888489f8c08bfce7b768a7f1d
+Author: Omar Campagne <ocampagne@gmail.com>
+Date:   Sat Jun 5 14:50:12 2010 +0200
+
+    Update Spanish translation of manual pages
+    
+    Update to 1910t.
+
+ debian/changelog |    1 +
+ man/po/es.add    |    4 +-
+ man/po/es.po     |10005 +++++++++++++++++++++++++++---------------------------
+ man/po/po4a.cfg  |    2 +-
+ 4 files changed, 5037 insertions(+), 4975 deletions(-)
+
+commit eef3b6eb7dbe749a747f2a609d16d4e90ff802be
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Jun 2 23:01:13 2010 +0200
+
+    dpkg-gensymbols: fix handling of tags
+    
+    A bad check resulted in some tags being considered different when they
+    were really equal.
+    
+    Reported-by: Michael Tautschnig <mt@debian.org>
+
+ debian/changelog              |    2 ++
+ scripts/Dpkg/Shlibs/Symbol.pm |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 7983e949f7a627db3951f3f1068bdf86c671f348
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jun 2 01:56:04 2010 +0200
+
+    dpkg: Refactor file list removal into new remove_file_from_list function
+    
+    This detangles the two independent actions, removing from the list and
+    skiping the file from the tarball.
+
+ src/archives.c |   23 +++++++++++++++--------
+ 1 files changed, 15 insertions(+), 8 deletions(-)
+
+commit c9fd580a2e32608172c8a86d00a8dfc7713f8178
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Feb 24 20:16:34 2010 +0100
+
+    Refactor glob functions into its own module
+
+ src/Makefile.am |    1 +
+ src/glob.c      |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/glob.h      |   38 ++++++++++++++++++++++++++++++++++++++
+ src/statcmd.c   |   29 +----------------------------
+ 4 files changed, 91 insertions(+), 28 deletions(-)
+
+commit 77daf2187b0a0c44cf40b93a3886ddcd00a8190d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jun 1 04:29:25 2010 +0200
+
+    build: Do not fallback to use chown instead of lchown if not available
+    
+    When creating symlinks on extraction, dpkg needs to set its owner, if
+    we fallback to use chown in place of lchown we might get to a situation
+    where the dereferenced symlink does not yet exist, which would cause an
+    unwanted error.
+    
+    On some older and buggy systems, chown does not actually dereference
+    symlinks, so it could be safely used although it would need to be
+    detected at runtime, as the kernel could be switched under our feet,
+    but given that lchown is already specified by UNIX98, there's not much
+    sense in not assuming it's present and working at this point in time.
+
+ configure.ac        |    2 +-
+ lib/compat/compat.h |    4 ----
+ 2 files changed, 1 insertions(+), 5 deletions(-)
+
+commit 20652a829be8e81bc8858fdeac262de7801ef141
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jun 1 03:40:01 2010 +0200
+
+    build: Use DPKG_CHECK_DECL instead of DPKG_CHECK_DEFINE for TIOCNOTTY
+    
+    DPKG_CHECK_DEFINE defines the HAVE_symbol to 1 if found, and to 0
+    otherwise. But the only current user is doing “#ifdef TIOCNOTTY”, which
+    defeats the test as it's always going to be true, regardless of the
+    value. Switch to the simplified DPKG_CHECK_DECL, which does not define
+    the symbol if not found, and remove now unused DPKG_CHECK_DEFINE.
+
+ configure.ac     |    2 +-
+ m4/dpkg-types.m4 |   16 ----------------
+ 2 files changed, 1 insertions(+), 17 deletions(-)
+
+commit 3706d6214a86593e72bc9514f08f3c4e0fd0a92c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jun 1 02:53:52 2010 +0200
+
+    s-s-d: Fix abort when opening /dev/tty with --background
+    
+    Commit 2e2cab1228a6efdee57d165c508c2e05c8520f43, introducing error
+    checks, revealed that the TIOCNOTTY ioctl() was being issued after
+    having called setsid(), which already detaches the current controlling
+    tty, making the subsequent detach fail, and s-s-d abort.
+    
+    TIOCNOTTY should only be used if setsid() is not available. In addition,
+    if open("/dev/tty") fails, that means there's no controlling tty, so we
+    should skip detaching it.
+    
+    This problem got introduced in 3d6f3a9e54c437d62c58eaab4eeb9f02eb9059e6,
+    when enabling setsid() as a replacement for setpgid(), but not disabling
+    TIOCNOTTY.
+    
+    Reported-by: Raphaël Hertzog <hertzog@debian.org>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ utils/start-stop-daemon.c |   37 +++++++++++++++++++++++--------------
+ 1 files changed, 23 insertions(+), 14 deletions(-)
+
+commit e844672595246c81f4a8e45ca842dc6aa3a4dbc8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 26 02:37:42 2010 +0200
+
+    build: Only use mmap in parser if explicitly requested
+    
+    The current mmap code is not reliable, as it does not handle SIGBUS,
+    which can happen on I/O errors (among others). Switch the code to
+    check for USE_MMAP instead of HAVE_MMAP so that it can be explicitly
+    enabled on build, to produce consistent results by making sure it does
+    not get reactivated accidentally. Disable it by default due to the
+    above, in addition to not having been used by released tarballs since
+    1.14.15.
+
+ configure.ac     |    2 ++
+ lib/dpkg/parse.c |    6 +++---
+ m4/dpkg-funcs.m4 |   16 ++++++++++++++++
+ 3 files changed, 21 insertions(+), 3 deletions(-)
+
+commit e1ce8e5e0027333a0f3071b9d8bd81b53cbb1011
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 20 04:16:55 2010 +0200
+
+    dpkg: Reduce scope of variables in audit()
+
+ src/enquiry.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 972aba5d253e3848d471f635bbb574fadf50b825
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue May 25 15:37:45 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1910t.
+
+ man/po/de.po |   91 ++++++++++++---------------------------------------------
+ 1 files changed, 19 insertions(+), 72 deletions(-)
+
+commit 85b61adabf75f11e519df869e7357ac9f11c8de2
+Author: Bill Allombert <ballombe@debian.org>
+Date:   Tue May 25 01:30:29 2010 +0200
+
+    libdpkg: in parsedb() finish the rename of stat -> st
+    
+    This was forgotten in commit 5cf023f2d5bf609b6aba20aa5b5e285a91fbbbce.
+
+ lib/dpkg/parse.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d6b4474a007188c4e3aa7da8029e780006600eff
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon May 24 21:05:00 2010 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |  153 ++--
+ dselect/po/ca.po        |  168 ++--
+ dselect/po/cs.po        |  153 ++--
+ dselect/po/da.po        |  153 ++--
+ dselect/po/de.po        |  166 ++--
+ dselect/po/dselect.pot  |  155 ++--
+ dselect/po/el.po        |  153 ++--
+ dselect/po/es.po        |  153 ++--
+ dselect/po/et.po        |  153 ++--
+ dselect/po/eu.po        |  153 ++--
+ dselect/po/fr.po        |  170 ++--
+ dselect/po/gl.po        |  153 ++--
+ dselect/po/hu.po        |  153 ++--
+ dselect/po/id.po        |  153 ++--
+ dselect/po/it.po        |  157 ++--
+ dselect/po/ja.po        |  153 ++--
+ dselect/po/ko.po        |  153 ++--
+ dselect/po/nb.po        |  175 ++--
+ dselect/po/nl.po        |  153 ++--
+ dselect/po/nn.po        |  163 ++--
+ dselect/po/pl.po        |  157 ++--
+ dselect/po/pt.po        |  153 ++--
+ dselect/po/pt_BR.po     |  153 ++--
+ dselect/po/ro.po        |  157 ++--
+ dselect/po/ru.po        |  157 ++--
+ dselect/po/sk.po        |  153 ++--
+ dselect/po/sv.po        |  153 ++--
+ dselect/po/tl.po        |  153 ++--
+ dselect/po/vi.po        |  156 ++--
+ dselect/po/zh_CN.po     |  153 ++--
+ dselect/po/zh_TW.po     |  153 ++--
+ man/po/de.po            |  160 +++-
+ man/po/dpkg-man.pot     | 1796 +++++++++++++++++++-----------------
+ man/po/es.po            | 1937 +++++++++++++++++++++------------------
+ man/po/fr.po            | 2198 ++++++++++++++++++++++++--------------------
+ man/po/hu.po            | 1916 ++++++++++++++++++++------------------
+ man/po/ja.po            | 1954 +++++++++++++++++++++------------------
+ man/po/pl.po            | 1992 ++++++++++++++++++++++------------------
+ man/po/pt_BR.po         | 1918 ++++++++++++++++++++------------------
+ man/po/ru.po            | 1916 ++++++++++++++++++++------------------
+ man/po/sv.po            | 2375 ++++++++++++++++++++++++++---------------------
+ po/ast.po               |  790 +++++++++-------
+ po/bs.po                |  624 +++++++------
+ po/ca.po                |  860 ++++++++++--------
+ po/cs.po                |  796 +++++++++-------
+ po/da.po                |  760 ++++++++-------
+ po/de.po                |  679 ++++++++------
+ po/dpkg.pot             |  626 +++++++------
+ po/dz.po                |  757 ++++++++-------
+ po/el.po                |  826 +++++++++--------
+ po/eo.po                |  637 ++++++++------
+ po/es.po                |  809 +++++++++-------
+ po/et.po                |  636 ++++++++------
+ po/eu.po                |  638 ++++++++------
+ po/fr.po                |  877 ++++++++++--------
+ po/gl.po                |  801 +++++++++-------
+ po/hu.po                |  644 ++++++++------
+ po/id.po                |  642 ++++++++------
+ po/it.po                |  661 ++++++++------
+ po/ja.po                |  791 +++++++++-------
+ po/km.po                |  734 ++++++++-------
+ po/ko.po                |  784 +++++++++-------
+ po/ku.po                |  624 +++++++------
+ po/lt.po                |  625 +++++++------
+ po/mr.po                |  750 ++++++++-------
+ po/nb.po                |  812 +++++++++-------
+ po/ne.po                |  746 ++++++++-------
+ po/nl.po                |  771 +++++++++-------
+ po/nn.po                |  675 ++++++++------
+ po/pa.po                |  750 ++++++++-------
+ po/pl.po                |  645 ++++++++------
+ po/pt.po                |  807 +++++++++-------
+ po/pt_BR.po             |  802 +++++++++-------
+ po/ro.po                |  834 +++++++++--------
+ po/ru.po                |  646 ++++++++------
+ po/sk.po                |  786 +++++++++-------
+ po/sv.po                |  785 +++++++++-------
+ po/th.po                |  776 +++++++++-------
+ po/tl.po                |  642 ++++++++------
+ po/vi.po                |  913 ++++++++++--------
+ po/zh_CN.po             |  788 +++++++++-------
+ po/zh_TW.po             |  774 +++++++++-------
+ scripts/po/ca.po        |  256 +++---
+ scripts/po/de.po        |   94 +-
+ scripts/po/dpkg-dev.pot |  260 +++---
+ scripts/po/fr.po        |  392 +++++----
+ scripts/po/pl.po        |  274 +++---
+ scripts/po/ru.po        |  283 +++---
+ scripts/po/sv.po        |  289 +++---
+ 89 files changed, 30360 insertions(+), 24814 deletions(-)
+
+commit a44861007be95639148689aab508b339356cc071
+Author: Omar Campagne <ocampagne@gmail.com>
+Date:   Mon May 24 20:56:32 2010 +0200
+
+    Fix typos in multiple manual pages
+
+ man/dpkg-gensymbols.1   |    2 +-
+ man/dpkg-scanpackages.1 |    4 ++--
+ man/dpkg.1              |    2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 174ea65d4c48c894662579465118b93fa7799271
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon May 24 19:00:16 2010 +0200
+
+    dpkg-maintscript-helper: make <lastversion> optional in rm_conffile and mv_conffile
+    
+    Enhance dpkg-maintscript-helper rm_conffile and mv_conffile to work
+    properly when <lastversion> is not given (or is empty). This should
+    try the operation on every upgrade but do something only when the file to
+    act upon really exists.
+    
+    Document this behaviour.
+
+ debian/changelog                   |    2 ++
+ man/dpkg-maintscript-helper.1      |   24 ++++++++++++++----------
+ scripts/dpkg-maintscript-helper.sh |   36 +++++++++++++++++++++++++-----------
+ 3 files changed, 41 insertions(+), 21 deletions(-)
+
+commit 9b027d8e4e9e6ba00f69c52180bfa643eaa61b67
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon May 24 17:15:15 2010 +0200
+
+    dpkg-maintscript-helper: fix function called by mv_conffile in postrm
+    
+    Simple copy-paste error, it worked despite the mistake due to the similarity of
+    abort_mv_conffile and abort_rm_conffile.
+
+ scripts/dpkg-maintscript-helper.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bdb1192d752a744e08624766f0fa55a22ff37e2b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon May 24 17:01:20 2010 +0200
+
+    dpkg-maintscript-helper: clarify meaning of lastversion for rm_conffile
+    
+    Clarify that dpkg-maintscript-helper rm_conffile needs the last version of
+    the package that did not remove the obsolete conffile if this was not
+    implemented at the time the file became obsolete.
+
+ debian/changelog              |    3 +++
+ man/dpkg-maintscript-helper.1 |    4 +++-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit a0b267ec591f1b00156b17f9ceb9a85a24ff5431
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon May 24 15:56:57 2010 +0200
+
+    dpkg-maintscript-helper: handle missing parameters properly
+
+ debian/changelog                   |    2 ++
+ scripts/dpkg-maintscript-helper.sh |   12 ++++++++++--
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+commit 7106a2d148ace7ea1e786e41e11f84081b47fec8
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri May 21 18:00:01 2010 +0200
+
+    dpkg-buildpackage: use Dpkg::Path::find_command instead of custom testcommand
+
+ scripts/dpkg-buildpackage.pl |   15 ++++-----------
+ 1 files changed, 4 insertions(+), 11 deletions(-)
+
+commit 452eb2fba819c22764ab12c850deeeb0d3ca8d9a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri May 21 16:30:51 2010 +0200
+
+    Dpkg::Shlibs::Objdump: use the cross objdump when cross compiling
+    
+    When <cross-prefix>-objdump is available and when we're cross-compiling
+    let's use the cross objdump in preference over the standard objdump.
+    
+    Based-on-patch-by: Loïc Minier <lool@debian.org>
+
+ debian/changelog               |    2 ++
+ scripts/Dpkg/Shlibs/Objdump.pm |   28 +++++++++++++++++++---------
+ 2 files changed, 21 insertions(+), 9 deletions(-)
+
+commit 12c8bc2c1db85fb6cf23200b66798e2fd80ce219
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri May 21 16:08:01 2010 +0200
+
+    Dpkg::Path: new function find_command() that finds a command on the PATH
+
+ scripts/Dpkg/Path.pm |   19 +++++++++++++++++--
+ 1 files changed, 17 insertions(+), 2 deletions(-)
+
+commit 0d8ca10504eadc3ed130645edfec67f9ab635e63
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri May 21 10:55:34 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1910t.
+
+ man/po/de.po |  523 +++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 284 insertions(+), 239 deletions(-)
+
+commit 912eeea3fc61ec15554e93651b897ba811a56bea
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri May 21 10:35:43 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 510t
+
+ scripts/po/de.po |   24 ++++++++++++++++--------
+ 1 files changed, 16 insertions(+), 8 deletions(-)
+
+commit db0b70bc26ec6f81242e4c34ae30cae81af8d3d1
+Author: Colin Watson <cjwatson@ubuntu.com>
+Date:   Thu May 20 15:38:41 2010 +0100
+
+    lib/dpkg/test/t-ar.c: fix buffer overflow in ar test
+    
+    t-ar overflows arh.ar_name by two bytes: one because the string it uses
+    is 17 bytes long rather than 16, and one because it uses strcpy which
+    writes a trailing \0.  When compiling with -D_FORTIFY_SOURCE=2, as
+    Ubuntu does by default, this crashes.  Fix the string length and stop
+    null-terminating it.
+
+ debian/changelog     |    3 +++
+ lib/dpkg/test/t-ar.c |    4 ++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit c298a638f9dab87d59a94e4397266c701457047c
+Author: Colin Watson <cjwatson@ubuntu.com>
+Date:   Thu May 20 16:39:12 2010 +0100
+
+    dpkg(1): clarify scope of --configure
+    
+    Robert Persson pointed out in
+    https://bugs.launchpad.net/ubuntu/+source/dpkg/+bug/77287 that
+    describing --configure as "Reconfigure an unpacked package" is simply
+    wrong.  This patch clarifies its behaviour, and adds a helpful pointer
+    to dpkg-reconfigure(8) (there's already one in the SEE ALSO section) for
+    those who really want that instead.
+
+ debian/changelog |    3 +++
+ man/dpkg.1       |   10 +++++++---
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+commit 395c8a0acc90c8df10eb2de0b7d6db13f64ffb8a
+Author: Ian Fleming <iflema@yahoo.com.au>
+Date:   Thu May 20 16:16:04 2010 +0100
+
+    dpkg-architecture(1): Fix typos
+    
+    DEB_HOST_ARCH_BITS was listed as DEB_BUILD_ARCH_BITS;
+    DEB_HOST_ARCH_ENDIAN was listed as DEB_BUILD_ARCH_ENDIAN.  In the
+    process, adjust the ordering to match dpkg-architecture's output.
+    Originally reported as
+    https://bugs.launchpad.net/ubuntu/+source/dpkg/+bug/564308.
+
+ debian/changelog        |    3 +++
+ man/dpkg-architecture.1 |   14 +++++++-------
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+commit ff75458da0141bb08a5e928037d3e78d3e3382d7
+Author: Colin Watson <cjwatson@ubuntu.com>
+Date:   Thu May 20 14:18:14 2010 +0100
+
+    Dpkg::Vendor::Ubuntu: Handle hardening in DEB_BUILD_OPTIONS
+    
+    Handle hardening-wrapper options via DEB_BUILD_OPTIONS.  Originally
+    contributed by Kees Cook.  This is Ubuntu-specific for now, pending
+    agreement on a better interface; see #489771 for background.
+
+ scripts/Dpkg/Vendor/Ubuntu.pm |   39 +++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 39 insertions(+), 0 deletions(-)
+
+commit a69db9e0fb18fe30b5c7910047cacee555345fde
+Author: Colin Watson <cjwatson@debian.org>
+Date:   Thu May 20 14:17:39 2010 +0100
+
+    dpkg-buildpackage: Export all build flags
+    
+    Export all flags set in Dpkg::BuildFlags to the environment, so that
+    vendors can usefully define additional variables.
+
+ scripts/dpkg-buildpackage.pl |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6ed8497c2e3833de826786fe1ab0e052f2a335b6
+Author: Colin Watson <cjwatson@debian.org>
+Date:   Thu May 20 14:17:19 2010 +0100
+
+    Dpkg::BuildFlags: simplify update-buildflags hook
+    
+    Pass the entire Dpkg::BuildFlags object to update-buildflags, so that
+    hooks can use its set() method rather than setting hash elements
+    directly.
+
+ scripts/Dpkg/BuildFlags.pm     |    2 +-
+ scripts/Dpkg/Vendor/Default.pm |    8 ++++----
+ scripts/Dpkg/Vendor/Ubuntu.pm  |    3 +--
+ 3 files changed, 6 insertions(+), 7 deletions(-)
+
+commit 2d4fd627d4286dc42006fb486040209d4e021b9f
+Author: Colin Watson <cjwatson@ubuntu.com>
+Date:   Thu May 20 13:49:06 2010 +0100
+
+    Add tests for Ubuntu changelog parsing
+    
+    Ubuntu's changelog parsing is nearly identical to Debian's, but may emit
+    an additional Launchpad-Bugs-Fixed header. Test that changelogs
+    matching the appropriate regex are parsed correctly both for Debian and
+    Ubuntu.
+    
+    To do this, we take copies of the standard origin files and add an
+    internal mechanism allowing Dpkg::Vendor to be pointed at them; and we
+    run 600_Dpkg_Changelog.t a second time with DEB_VENDOR set, to avoid
+    duplicating lots of code. See the discussion in #536066 for background.
+
+ debian/changelog                      |    2 ++
+ scripts/Dpkg/Vendor.pm                |    5 ++++-
+ scripts/Makefile.am                   |    2 ++
+ scripts/t/600_Dpkg_Changelog.t        |   18 +++++++++++++++---
+ scripts/t/600_Dpkg_Changelog/fields   |    2 ++
+ scripts/t/600_Dpkg_Changelog_Ubuntu.t |   21 +++++++++++++++++++++
+ scripts/t/origins/debian              |    3 +++
+ scripts/t/origins/default             |    1 +
+ scripts/t/origins/ubuntu              |    4 ++++
+ 9 files changed, 54 insertions(+), 4 deletions(-)
+
+commit d02ed9451e83309dcc795370661c910e0bd75e8e
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu May 20 12:05:44 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1901t0f6u.
+
+ man/po/de.po | 4860 ++++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 2478 insertions(+), 2382 deletions(-)
+
+commit baf331a73bfeb229f9717233c47a3cff6282f2d7
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu May 20 11:38:55 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 508t
+
+ scripts/po/de.po |  254 +++++++++++++++++++++++++++++-------------------------
+ 1 files changed, 136 insertions(+), 118 deletions(-)
+
+commit 5e9ddfc44109464cd0deefd69eb7375a66ed03d3
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Thu May 20 00:54:08 2010 -0500
+
+    dpkg-source: do not ensure prerequisites are met for --before-build/--after-build
+    
+    It is perfectly reasonable to use the before_build and after_build
+    hooks in situations where the source package is missing.
+    
+    Without this change, attempts to build a package of format 3.0 (quilt)
+    with the upstream tarball missing result in errors.
+    
+     $ dpkg-buildpackage -b
+     [...]
+      dpkg-source -I -i --before-build csound
+     dpkg-buildpackage: host architecture i386
+     dpkg-source: error: can't build with source format '3.0 (quilt)': no orig.tar file found
+    
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/dpkg-source.pl |   12 +++++-------
+ 1 files changed, 5 insertions(+), 7 deletions(-)
+
+commit e6f6bb08f15b507ba1ae34ad274e6db76f13614d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed May 19 22:12:20 2010 +0200
+
+    libdpkg: update w_booleandefno() to cope with the changed type of booleans
+    
+    Boolean fields are now stored in "bool" variables and no longer in integers.
+    The former is 1-byte long and doesn't match the length of an int, so the
+    cast done in PKGPFIELD was reading too much data after the offset where
+    the boolean field is stored.
+    
+    This update was missed in commit 7eb30624a0b7955924bafd9466d226f70e5cf48f.
+
+ lib/dpkg/dump.c |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 19014dddde0eb86721bc656c801600f612d5c7c2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 19 05:57:45 2010 +0200
+
+    dselect: Fix variable usage after delete when using --debug
+
+ debian/changelog      |    1 +
+ dselect/pkgsublist.cc |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 5abafe0fe645fc2fed5c7e36ebb5fdc2e059cdb4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 19 06:05:01 2010 +0200
+
+    dselect: Fix memory leak on inexistent method directory
+
+ dselect/methparse.cc |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 28caaffea717f5f827972c0d6d54f1750118bd82
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 19 06:04:12 2010 +0200
+
+    dpkg-deb, dpkg-split: Fix few resource leaks
+
+ dpkg-deb/extract.c |    4 ++++
+ dpkg-split/join.c  |    1 +
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 4815b6041d826f605275d81206195e20bc9ced80
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 19 05:26:39 2010 +0200
+
+    dpkg-deb: Reduce scope of infobuf variable in extracthalf
+
+ dpkg-deb/extract.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit e911889c9f4004d9d43032933a90500cb655fe9c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 19 05:24:31 2010 +0200
+
+    dpkg-deb: Fix leak on non-symlink paths when building the package
+    
+    If it's a symlink it gets inserted into to the symlist, which gets freed
+    at the end. If it's not we have to free ourselves, which was not being
+    done.
+
+ dpkg-deb/build.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit cb98e2038e195dd0ed29274738135da4b1709afb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 19 05:21:47 2010 +0200
+
+    dpkg-deb: Refactor file_info freeing into a new file_info_free function
+
+ dpkg-deb/build.c |   10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+commit 51e84d96dbec856301802952d937710ccc90b2f3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 19 05:59:09 2010 +0200
+
+    dpkg-deb: Check for error on lstat
+
+ dpkg-deb/build.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 2e2cab1228a6efdee57d165c508c2e05c8520f43
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 19 06:00:00 2010 +0200
+
+    s-s-d: Check for error on open an ioctl calls
+
+ utils/start-stop-daemon.c |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+commit b28bda38587833a486fb10566890f70269f5b48d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 18 23:14:03 2010 +0200
+
+    build: Pass --previous to msgmerge with the new MSGMERGE_OPTIONS variable
+    
+    This new options got introduced in gettext 0.18, and helps significantly
+    translators' work.
+
+ dselect/po/Makevars |    2 ++
+ po/Makevars         |    2 ++
+ scripts/po/Makevars |    2 ++
+ 3 files changed, 6 insertions(+), 0 deletions(-)
+
+commit bdc238da1b1e48b66c0f4003520c3231addc742c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 18 21:58:24 2010 +0200
+
+    build: Require gettext 0.18
+    
+    Remove embedded gettext files from the repository, now properly
+    installed by autopoint for all po/ directories. Add versioned
+    Build-Depends.
+
+ configure.ac                   |    2 +-
+ debian/changelog               |    6 +
+ debian/control                 |    3 +-
+ dselect/po/.gitignore          |    1 +
+ dselect/po/Makefile.in.in      |  403 ----------------------------------------
+ dselect/po/remove-potcdate.sin |   19 --
+ scripts/po/.gitignore          |    1 +
+ scripts/po/Makefile.in.in      |  403 ----------------------------------------
+ scripts/po/remove-potcdate.sin |   19 --
+ 9 files changed, 11 insertions(+), 846 deletions(-)
+
+commit 071188cbe9ede3bb7798fb12eb522fb9e5fd16d5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 18 21:45:04 2010 +0200
+
+    Ignore all foreign m4 files
+    
+    Now that the dpkg m4 files are namespaced, we can ignore all foreign
+    ones safely.
+
+ m4/.gitignore |   35 ++---------------------------------
+ 1 files changed, 2 insertions(+), 33 deletions(-)
+
+commit 7eb30624a0b7955924bafd9466d226f70e5cf48f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon May 17 15:04:49 2010 +0200
+
+    Use bool instead of int wherever appropriate
+
+ dpkg-deb/extract.c        |   12 +++++++-----
+ dpkg-deb/info.c           |   24 ++++++++++++++++++------
+ dpkg-split/queue.c        |   26 +++++++++++++++++++-------
+ dselect/basecmds.cc       |   16 ++++++++++------
+ dselect/bindings.cc       |   13 +++++++++----
+ dselect/bindings.h        |    5 +++--
+ dselect/dselect.h         |    4 ++--
+ dselect/pkgcmds.cc        |   15 +++++++++------
+ dselect/pkgdepcon.cc      |   26 ++++++++++++++++----------
+ dselect/pkglist.cc        |   28 +++++++++++++++++-----------
+ dselect/pkglist.h         |   14 +++++++-------
+ dselect/pkgsublist.cc     |   18 ++++++++++++------
+ lib/dpkg/database.c       |    8 ++++----
+ lib/dpkg/dpkg-db.h        |   14 +++++++-------
+ lib/dpkg/dump.c           |    4 +++-
+ lib/dpkg/fields.c         |    6 +++---
+ lib/dpkg/nfmalloc.c       |    6 +++---
+ lib/dpkg/parse.c          |    3 ++-
+ lib/dpkg/parsehelp.c      |    8 +++++---
+ lib/dpkg/pkg-format.c     |   10 +++++-----
+ lib/dpkg/progress.h       |    4 +++-
+ lib/dpkg/triglib.c        |   24 ++++++++++++------------
+ lib/dpkg/triglib.h        |    8 ++++----
+ src/archives.c            |   19 +++++++++++--------
+ src/depcon.c              |    6 +++---
+ src/enquiry.c             |   10 +++++-----
+ src/errors.c              |    2 +-
+ src/filesdb.c             |   22 +++++++++++++---------
+ src/filesdb.h             |    3 ++-
+ src/main.c                |    9 +++++----
+ src/main.h                |    9 +++++----
+ src/processarc.c          |   10 +++++-----
+ src/query.c               |    9 +++++----
+ src/remove.c              |   19 ++++++++++++-------
+ src/trigcmd.c             |    4 ++--
+ src/trigproc.c            |    6 +++---
+ utils/start-stop-daemon.c |    9 +++++----
+ 37 files changed, 257 insertions(+), 176 deletions(-)
+
+commit 07adb5686f5fec694e6bfea82b8b5ad2fcdf416c
+Merge: 510cad0 24f375f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 19 08:25:44 2010 +0200
+
+    Merge branch 'sid' (through tag '1.15.7.1')
+    
+    Conflicts:
+    	debian/changelog
+
+commit 24f375fd275e29209d94fcd3f2485443d71428e5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 19 06:31:31 2010 +0200
+
+    Release 1.15.7.2
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit dee300ba2de69bf10a5e828217e873e83db36a77
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 19 06:37:25 2010 +0200
+
+    Ignore files for all autopoint managed po directories
+    
+    Starting with autopoint 0.18, it's able to find all po directories, and
+    install missing templates. Ignore those newly appeared files.
+
+ dselect/po/.gitignore |    4 ++++
+ scripts/po/.gitignore |    4 ++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 0909b6369eb0bd37ca815a138ab0f957af92eb03
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed May 19 07:55:27 2010 +0200
+
+    Revert "Update Swedish translation by running msgmerge with master branch."
+    
+    This reverts commit e99605b5b21574e57be6e3138cba0da9034c626e.
+    
+    Translations should not be comitted to the sid branch, otherwise it
+    causes major conflicts when merging it into master, when the same change
+    has been committed there.
+
+ debian/changelog |    9 -
+ man/po/sv.po     |  464 ++++++++++++++++++++++--------------------------------
+ po/sv.po         |   18 +-
+ scripts/po/sv.po |   52 +++----
+ 4 files changed, 222 insertions(+), 321 deletions(-)
+
+commit e99605b5b21574e57be6e3138cba0da9034c626e
+Author: Peter Krefting <peter@softwolves.pp.se>
+Date:   Mon May 17 21:07:21 2010 +0100
+
+    Update Swedish translation by running msgmerge with master branch.
+    
+    man/po/sv.po: 1893t1f0u.
+    po/sv.po: 968t0f0u.
+    scripts/po/sv.po: 507t0f0u.
+
+ debian/changelog |    9 +
+ man/po/sv.po     |  464 ++++++++++++++++++++++++++++++++----------------------
+ po/sv.po         |   18 +-
+ scripts/po/sv.po |   52 ++++---
+ 4 files changed, 321 insertions(+), 222 deletions(-)
+
+commit 510cad04bfe5bbfe4c43d96ec1d431a3f28a0e39
+Author: Peter Krefting <peterk@debian.org>
+Date:   Mon May 17 20:58:47 2010 +0100
+
+    Update Swedish translation.
+    
+    man/po/sv.po: 1894t0f0u.
+    scripts/po/sv.po: 507t0f0u.
+
+ debian/changelog |    2 +
+ man/po/sv.po     |  394 +++++++++++++++++++++++++++++++++++++-----------------
+ scripts/po/sv.po |   52 ++++----
+ 3 files changed, 301 insertions(+), 147 deletions(-)
+
+commit dcccf15449feea2f71f45b363929342fa3f0f593
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon May 17 21:30:41 2010 +0200
+
+    Makefile.am: fix do_shell_subst to update a shell variable instead of a perl variable
+    
+    The copy & paste was too quick, I forgot to update the sed expression.
+
+ scripts/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0ff43ca667f05cf299364e5b9cff8abe4e05a903
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 11 09:38:04 2010 +0200
+
+    dpkg: On Linux use sync() instead of an fsync() per file
+    
+    Due to the performance degradation on ext4 file systems, as a
+    workaround on Linux, we use sync() which is synchronous, before
+    rename() to make sure it's truly atomic.
+    
+    Closes: #578635
+
+ configure.ac     |    1 +
+ debian/changelog |    2 ++
+ m4/dpkg-funcs.m4 |   16 ++++++++++++++++
+ src/archives.c   |    7 +++++++
+ 4 files changed, 26 insertions(+), 0 deletions(-)
+
+commit 60a060e6f58e3daab648df554b249d17aba80247
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon May 17 18:06:36 2010 +0200
+
+    dpkg-maintscript-helper: add "supports" command
+    
+    With this command a maintainer script can verify whether a given command
+    is supported by dpkg-maintscript-helper before calling it. Thanks to this
+    he can avoid a pre-dependency on dpkg.
+    
+    Also improve the error message output when the command is unknown to
+    suggest upgrading dpkg as a possible way to fix the problem encountered.
+
+ debian/changelog                   |    2 ++
+ man/dpkg-maintscript-helper.1      |   19 +++++++++++++++++++
+ scripts/dpkg-maintscript-helper.sh |   34 +++++++++++++++++++++++++++++++++-
+ 3 files changed, 54 insertions(+), 1 deletions(-)
+
+commit 4f069c7b992becf2316fb578b64161521275e739
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon May 17 18:35:49 2010 +0200
+
+    dpkg-maintscript-helper: add --version option
+
+ scripts/dpkg-maintscript-helper.sh |   14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+commit aa26f83c4b1a0f85d65dc0b6a5f642c3e609c42c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon May 17 16:46:08 2010 +0200
+
+    Rename /usr/lib/dpkg/maintscript-helper in /usr/bin/dpkg-maintscript-helper
+    
+    It is a public interface even if working around known limitations.
+
+ debian/changelog                                   |    3 ++
+ debian/dpkg.install                                |    4 +-
+ man/Makefile.am                                    |    4 +-
+ ...ntscript-helper.1 => dpkg-maintscript-helper.1} |   23 ++++++++-----------
+ man/po/po4a.cfg                                    |   10 ++++----
+ scripts/.gitignore                                 |    1 +
+ scripts/Makefile.am                                |   11 +++++++-
+ ...intscript-helper => dpkg-maintscript-helper.sh} |    2 +-
+ 8 files changed, 33 insertions(+), 25 deletions(-)
+
+commit 85a55d82432b8e035a7175f33b6e8c27366b9983
+Author: Gerfried Fuchs <rhonda@debian.at>
+Date:   Mon May 17 13:56:47 2010 +0200
+
+    dpkg-name: fix syntax error
+    
+    There was a missing closing bracket.
+    
+    Regression introduced in 716362c59e531883304a211afa61660608c214b3.
+    
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ debian/changelog     |    3 +++
+ scripts/dpkg-name.pl |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 294770c805f1491d722579958c133a8319c5f8a1
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri May 14 15:13:56 2010 +0200
+
+    dpkg-buildpackage(1): drop mention of PKG_CONFIG_LIBDIR
+    
+    The feature has been removed in dpkg 1.15.6.
+
+ debian/changelog        |    2 ++
+ man/dpkg-buildpackage.1 |    6 ------
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+commit c0effa5a17e7c5170864ee8f9a227d0d46d4eae6
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed May 12 21:15:19 2010 +0200
+
+    Add missing changelog entry for commit ce33efa7b93bc98635667f597c7487631af3459a
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ce33efa7b93bc98635667f597c7487631af3459a
+Author: Holger Wansing <linux@wansing-online.de>
+Date:   Tue May 11 20:55:27 2010 +0200
+
+    Use impersonal messages in German dpkg scripts translation
+
+ scripts/po/de.po |  883 +++++++++++++++++++++++++++---------------------------
+ 1 files changed, 440 insertions(+), 443 deletions(-)
+
+commit 67dc78b406c1b1e62a34bbef090b280b5c900b34
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon May 10 18:27:02 2010 +0200
+
+    dpkg: Fix --root by properly stripping root from maintainer script path
+    
+    The cmd->filename variable was getting the full path to the maintainer
+    script inside the chroot, and once dpkg had changed root, the path was
+    not valid anymore.
+    
+    Regression introduced in 5050748f1a6bb0c0728f8c07f9058d545c80d7e0.
+    
+    Closes: #580984
+
+ debian/changelog |    2 ++
+ src/help.c       |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit b010b55f0e4387c507b3c31ef470fe9485ce037c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon May 10 11:48:55 2010 +0200
+
+    Update coding-style.txt to also cover the Perl code
+
+ doc/coding-style.txt |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 51 insertions(+), 0 deletions(-)
+
+commit ad555da6f1f5d9b7294dd854c21b7631dce02a7f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat May 8 21:45:24 2010 +0200
+
+    dpkg-trigger(1), deb-triggers(5): update reference to triggers.txt.gz
+    
+    The file has been moved in dpkg-dev, fix the location.
+
+ debian/changelog   |    2 ++
+ man/deb-triggers.5 |    2 +-
+ man/dpkg-trigger.1 |    2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+commit ffb3249344264cc9275f806e210d6b0da17a3af6
+Author: Peter Krefting <peterk@debian.org>
+Date:   Thu May 6 12:57:30 2010 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: 968t0f0u.
+
+ debian/changelog |    1 +
+ po/sv.po         |   18 +++++++++---------
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+commit f8e3226252398df9a813b7be343246cb855c0224
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon May 3 22:16:26 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1898t.
+
+ man/po/de.po |  311 ++++++++++++++++++++++++++++++++++++++-------------------
+ 1 files changed, 207 insertions(+), 104 deletions(-)
+
+commit 74b6e85448941db4e643df887ae39607d6370109
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon May 3 21:43:27 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 508t
+
+ scripts/po/de.po |   67 +++++++++++++++++++++++++++++-------------------------
+ 1 files changed, 36 insertions(+), 31 deletions(-)
+
+commit 702f546b2c6d4229ad81a29024ae32fdd7c796b3
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun May 2 22:06:21 2010 +0200
+
+    deb-override(5): updated to match current situation
+    
+    Remove references to usage of sections to place the packages on the
+    mirrors (they are all in the pool nowadays and no longer in
+    dists/<codename>/<component>/binary-<arch>/<section>/). Indicate that the
+    Debian policy offers a list of allowed values for section and priority.
+
+ debian/changelog   |    4 ++++
+ man/deb-override.5 |   15 ++++++---------
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+commit 9bbdfecf723a3da416e671dcbf1af9cc4b37a541
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun May 2 21:34:35 2010 +0200
+
+    dpkg-buildpackage: add calls to dpkg-source --before-build and --after-build
+
+ debian/changelog             |    7 +++++++
+ man/dpkg-buildpackage.1      |   11 ++++++-----
+ scripts/dpkg-buildpackage.pl |    9 +++++++++
+ 3 files changed, 22 insertions(+), 5 deletions(-)
+
+commit 8c1fc347f7d50b64f3693ba1d7e064bf9ccbae8c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Apr 28 22:27:08 2010 +0200
+
+    dpkg-source: implement --before-build and --after-build command
+    
+    Those commands are really hooks that source formats can use and that
+    will be called by dpkg-buildpackage before and after the actual build.
+    
+    Source formats "2.0" and "3.0 (quilt)" use this hook to ensure patches
+    are applied before the build.
+
+ man/dpkg-source.1                 |   20 +++++++++++++++++++-
+ scripts/Dpkg/Source/Package.pm    |    8 ++++++++
+ scripts/Dpkg/Source/Package/V2.pm |    5 +++++
+ scripts/dpkg-source.pl            |   22 +++++++++++++++++-----
+ 4 files changed, 49 insertions(+), 6 deletions(-)
+
+commit 39c6dab89bbea9fe336f869b65e33102ba238205
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat May 1 17:44:28 2010 +0200
+
+    Fix build system to correctly install translated manual pages
+    
+    Up to now it was only working in a directory obtained by make dist and
+    not when building the debian package directly from the git repository.
+
+ man/Makefile.am |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit bc348c88cba668935253d213620bdda8bfd5dbd2
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat May 1 17:29:27 2010 +0200
+
+    dpkg-shlibdeps(1): avoid triggering a lintian warning on translations
+    
+    Translations of the manual pages end up with "\-" instead of "-" that
+    is in the original manual page and as such man is not allowed to break
+    the long path name there.
+    
+    Avoid all the problems by using a shorter path in the example so that the
+    path doesn't end up alone on its line without any possibility to adjust on
+    the right.
+    
+    Update the translations at the same time to avoid some fuzzy strings.
+
+ man/dpkg-shlibdeps.1 |    2 +-
+ man/po/de.po         |    4 ++--
+ man/po/dpkg-man.pot  |    2 +-
+ man/po/fr.po         |    4 ++--
+ man/po/pl.po         |    4 ++--
+ man/po/sv.po         |    6 +++---
+ 6 files changed, 11 insertions(+), 11 deletions(-)
+
+commit 564ea47f30cc129ae12109593744b4e9ff14cbdb
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat May 1 16:48:57 2010 +0200
+
+    dpkg-source: add Bug-Ubuntu field in DEP-3 template
+    
+    The DEP-3 template is provided in the automatic header of patches in 3.0
+    (quilt) source packages.
+
+ debian/changelog                        |    3 +++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    1 +
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit fea5c2d980758c60bb13a85f18738f7e64679d77
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Apr 30 21:03:06 2010 +0200
+
+    dpkg-buildflags: error out when a required parameter is missing
+
+ debian/changelog           |    2 ++
+ scripts/dpkg-buildflags.pl |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 5b9f353b2940de751df47036608afbe71992d622
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Apr 30 20:56:14 2010 +0200
+
+    Dpkg::Version: fix boolean evaluation of the object
+    
+    In a boolean context, the object evaluates like the version string if
+    the version is valid, otherwise it evaluates like undef. Document
+    this behaviour and add non-regression test to ensure it's kept.
+    
+    This implicitly fix dpkg-shlibdeps who relies on the boolean evaluation
+    of the object to decide whether or not a minimal version specification
+    is needed or not.
+
+ debian/changelog             |    5 +++++
+ scripts/Dpkg/Version.pm      |   14 +++++++++++---
+ scripts/t/100_Dpkg_Version.t |    9 ++++++++-
+ 3 files changed, 24 insertions(+), 4 deletions(-)
+
+commit feb5792cc9cbf482804c92db33741d0973821373
+Author: Kyle Moffett <Kyle.D.Moffett@boeing.com>
+Date:   Thu Apr 29 21:47:25 2010 -0400
+
+    Add powerpcspe to ostable and triplettable
+    
+    The 'powerpcspe' architecture is a binary-incompatible variant of
+    PowerPC/POWER designed and supported by FreeScale and IBM. It is also
+    known under the trade names "e500"/"MPC8500" and "e200"/"MPC5xx".
+    
+    Additional information can be found at:
+      http://en.wikipedia.org/wiki/PowerPC_e500
+      http://en.wikipedia.org/wiki/PowerPC_e200
+    
+    In particular, the 'powerpcspe' architecture lacks the classic FPU with
+    dedicated FPRs found on most other PowerPC systems. It is replaced with
+    a set of "SPE" instructions which perform floating-point operations on
+    the integer registers.
+    
+    In an unfortunate choice of architecture design, the instructions used
+    for the "SPE" operations overlap with those for the AltiVec unit on most
+    other modern PowerPC cores.
+    
+    The "e500v2"-series chips have 64-bit GPRs, where the high 32-bits are
+    accesible only via the special "SPE" instructions, allowing them to make
+    efficient use of the "double" datatype.
+    
+    The relative rare "e500v1"-series chips have only 32-bit GPRs, and
+    require software traps and emulation to support native "double".
+    
+    The "e200z3" and "e200z6" chips have no support for floating point at
+    all, but with software traps and emulation are binary-compatible with
+    the "e500"-series chips.
+    
+    The Debian port to this architecture specifically chooses to optimize
+    for the higher-end chips (e500v2), as most of the others are targeted
+    at automotive applications or no longer in production.
+    
+    The specific GNU triplet for this arch is "powerpc-linux-gnuspe". As a
+    result, we end up adding an extra "ostable" entry instead of one in
+    "cputable".
+    
+    Closes: #568123, #575158
+    
+    Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
+    Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog |    6 ++++++
+ ostable          |    1 +
+ triplettable     |    1 +
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 8958324905a2d8575d16c83969b291a0a4697176
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Apr 29 08:19:26 2010 +0200
+
+    deb-substvars(5): codify how variables containing multiple lines must be managed
+
+ debian/changelog    |    2 ++
+ man/deb-substvars.5 |   20 ++++++++++++++++++++
+ 2 files changed, 22 insertions(+), 0 deletions(-)
+
+commit 6a606c37571a2aa25dd7d4d46d4ed45206e4dbeb
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Wed Apr 28 22:27:08 2010 +0200
+
+    Russian translation updates
+
+ debian/changelog |    5 +
+ dselect/po/ru.po |   34 +--
+ po/ru.po         |  814 ++++++++++++++----------------------------------------
+ scripts/po/ru.po |  521 +++++++++++++---------------------
+ 4 files changed, 417 insertions(+), 957 deletions(-)
+
+commit 69e24133f78f34c34d690115551af5acb475a1e9
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Mon Apr 26 18:47:03 2010 +0200
+
+    French translation updated to 507t
+
+ scripts/po/fr.po |  141 ++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 73 insertions(+), 68 deletions(-)
+
+commit 1d84cfe8be512b8786d81a024d3a88007f11584d
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Sun Apr 25 18:49:51 2010 +0200
+
+    Update changelog
+
+ debian/changelog |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 84bb9c8f8fb00c0b775c2d207e8e1854ae7f6292
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Sun Apr 25 11:37:40 2010 +0200
+
+    A few more strings
+
+ scripts/po/fr.po |  109 ++++++++++++++++++++++++++----------------------------
+ 1 files changed, 52 insertions(+), 57 deletions(-)
+
+commit 5e716c4f179ac76ed821e8c2a60184940840455d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Apr 23 19:19:37 2010 +0200
+
+    dpkg-buildflags: respect $XDG_CONFIG_HOME and use $XDG_CONFIG_HOME/dpkg/buildflags.conf
+
+ debian/changelog           |    7 +++++++
+ man/dpkg-buildflags.1      |    5 +++--
+ scripts/Dpkg/BuildFlags.pm |    3 ++-
+ 3 files changed, 12 insertions(+), 3 deletions(-)
+
+commit e197a7d348447a80166d43324956b4525d6e0bd3
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Apr 23 18:46:55 2010 +0200
+
+    Switch German man page translation to utf-8
+
+ man/po/de.add |    8 +-
+ man/po/de.po  | 4246 ++++++++++++++++++++++++++++----------------------------
+ 2 files changed, 2127 insertions(+), 2127 deletions(-)
+
+commit a86c4f08b77fcc77a6da001ca29bbd28b972d601
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Apr 23 18:44:52 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 507t
+
+ debian/changelog |    3 +++
+ scripts/po/de.po |   19 ++++++++-----------
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+commit 1a1a6ad9301029ba88c258aee4b31a42acd75869
+Merge: b3c0a52 d97034a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Apr 22 08:17:36 2010 +0200
+
+    Merge commit '1.15.7.1'
+
+commit d97034aa68097c85cdf85895182614e82f24b97f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Apr 22 08:05:39 2010 +0200
+
+    Release 1.15.7.1
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 021de2418c134b3553befd51261d00276e826643
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Apr 22 08:03:01 2010 +0200
+
+    dpkg-mergechangelogs: add missing call to textdomain()
+
+ debian/changelog                |    2 ++
+ scripts/dpkg-mergechangelogs.pl |    2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 9eb5c777c584ad91b1dae636282f7572d12c2b36
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Apr 22 07:56:54 2010 +0200
+
+    dpkg-mergechangelogs: avoid using UTF-8 on translatable strings
+
+ scripts/dpkg-mergechangelogs.pl |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 28d116f4eadc4cf3a49b974d64df19458f6d34ac
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Apr 22 07:54:30 2010 +0200
+
+    dpkg-source: fix ignore regexp for source format 1.0 when -i is not used
+    
+    The variable is defined by default but empty and the check was wrong
+    leading all files to be ignored.
+
+ debian/changelog                  |    8 ++++++++
+ scripts/Dpkg/Source/Package/V1.pm |    2 +-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+commit b3c0a528fe8ae4fef6ebf610f96ea458e48a9d20
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Apr 21 21:26:51 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1894t.
+
+ debian/changelog |    3 ++-
+ man/po/de.po     |   37 ++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 38 insertions(+), 2 deletions(-)
+
+commit 2fd9d41f412a8299764852c4b5a0809118884490
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Apr 21 04:42:09 2010 +0200
+
+    Bump version to 1.15.8
+
+ debian/changelog |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit a3a9417a081f19773e9527698e3de73e187d0542
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Apr 21 04:06:35 2010 +0200
+
+    Release 1.15.7
+
+ debian/changelog |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 0a6b6eac552cd8777bda03fa8cb4339e509b9b80
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Apr 21 04:26:33 2010 +0200
+
+    build: Distribute maintscript-helper
+    
+    By default _SCRIPTS variables do not distribute the files.
+
+ scripts/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ce35feb718b5213ea9fb49065d262ef2c0bd1d95
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Apr 21 04:03:24 2010 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |   16 +-
+ dselect/po/ca.po        |   16 +-
+ dselect/po/cs.po        |   16 +-
+ dselect/po/da.po        |   16 +-
+ dselect/po/de.po        |   16 +-
+ dselect/po/dselect.pot  |   16 +-
+ dselect/po/el.po        |   16 +-
+ dselect/po/es.po        |   16 +-
+ dselect/po/et.po        |   16 +-
+ dselect/po/eu.po        |   16 +-
+ dselect/po/fr.po        |   19 +-
+ dselect/po/gl.po        |   16 +-
+ dselect/po/hu.po        |   16 +-
+ dselect/po/id.po        |   16 +-
+ dselect/po/it.po        |   16 +-
+ dselect/po/ja.po        |   16 +-
+ dselect/po/ko.po        |   16 +-
+ dselect/po/nb.po        |   16 +-
+ dselect/po/nl.po        |   16 +-
+ dselect/po/nn.po        |   16 +-
+ dselect/po/pl.po        |   16 +-
+ dselect/po/pt.po        |   16 +-
+ dselect/po/pt_BR.po     |   16 +-
+ dselect/po/ro.po        |   16 +-
+ dselect/po/ru.po        |   16 +-
+ dselect/po/sk.po        |   16 +-
+ dselect/po/sv.po        |   16 +-
+ dselect/po/tl.po        |   16 +-
+ dselect/po/vi.po        |   16 +-
+ dselect/po/zh_CN.po     |   16 +-
+ dselect/po/zh_TW.po     |   16 +-
+ man/po/de.po            |  702 +++++++++-----------
+ man/po/dpkg-man.pot     | 1416 ++++++++++++++++++++++++++++-----------
+ man/po/es.po            | 1552 ++++++++++++++++++++++++++++++------------
+ man/po/fr.po            | 1711 ++++++++++++++++++++++++++++++++++-------------
+ man/po/hu.po            | 1483 ++++++++++++++++++++++++++++++-----------
+ man/po/ja.po            | 1491 ++++++++++++++++++++++++++++++-----------
+ man/po/pl.po            | 1687 ++++++++++++++++++++++++++++++++++------------
+ man/po/pt_BR.po         | 1484 +++++++++++++++++++++++++++++-----------
+ man/po/ru.po            | 1487 ++++++++++++++++++++++++++++++-----------
+ man/po/sv.po            | 1708 ++++++++++++++++++++++++++++++++++------------
+ po/ast.po               |  316 +++++-----
+ po/bs.po                |  310 +++++-----
+ po/ca.po                |  314 +++++-----
+ po/cs.po                |  314 +++++-----
+ po/da.po                |  312 +++++-----
+ po/de.po                |  314 +++++-----
+ po/dpkg.pot             |  310 +++++-----
+ po/dz.po                |  314 +++++-----
+ po/el.po                |  314 +++++-----
+ po/eo.po                |  314 +++++-----
+ po/es.po                |  316 +++++-----
+ po/et.po                |  310 +++++-----
+ po/eu.po                |  312 +++++-----
+ po/fr.po                |  382 ++++++-----
+ po/gl.po                |  314 +++++-----
+ po/hu.po                |  310 +++++-----
+ po/id.po                |  314 +++++-----
+ po/it.po                |  314 +++++-----
+ po/ja.po                |  314 +++++-----
+ po/km.po                |  312 +++++-----
+ po/ko.po                |  310 +++++-----
+ po/ku.po                |  310 +++++-----
+ po/lt.po                |  312 +++++-----
+ po/mr.po                |  314 +++++-----
+ po/nb.po                |  312 +++++-----
+ po/ne.po                |  314 +++++-----
+ po/nl.po                |  314 +++++-----
+ po/nn.po                |  312 +++++-----
+ po/pa.po                |  310 +++++-----
+ po/pl.po                |  312 +++++-----
+ po/pt.po                |  314 +++++-----
+ po/pt_BR.po             |  314 +++++-----
+ po/ro.po                |  314 +++++-----
+ po/ru.po                |  314 +++++-----
+ po/sk.po                |  314 +++++-----
+ po/sv.po                |  314 +++++-----
+ po/th.po                |  310 +++++-----
+ po/tl.po                |  314 +++++-----
+ po/vi.po                |  314 +++++-----
+ po/zh_CN.po             |  312 +++++-----
+ po/zh_TW.po             |  310 +++++-----
+ scripts/po/ca.po        |  404 +++++++-----
+ scripts/po/de.po        | 1315 ++++++++++++++++++------------------
+ scripts/po/dpkg-dev.pot |  400 +++++++-----
+ scripts/po/fr.po        |  427 +++++++-----
+ scripts/po/pl.po        |  426 +++++++-----
+ scripts/po/ru.po        |  425 +++++++-----
+ scripts/po/sv.po        |  426 +++++++-----
+ 89 files changed, 19442 insertions(+), 12495 deletions(-)
+
+commit 0958a9f9b28fb818863092346bbecb584655d8aa
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Apr 21 02:36:58 2010 +0200
+
+    Fix installation of disappearing replaced packages in reverse order
+    
+    This happens when the we install first the replacing then the replaced
+    package, for which the replaced package is supposed to get disappeared.
+    And fixes it to disappear the correct package and not lose track of the
+    ownership of the replaced files, by marking the replaced file as not
+    being part of the unpacked archive.
+
+ debian/changelog |    4 ++++
+ src/archives.c   |    1 +
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 418e1fc01d25ff93f6577d783184da673817295e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Apr 21 01:00:31 2010 +0200
+
+    Fix versioned Replaces to not produce file overwrite errors on downgrades
+    
+    Change does_replace() to take an additional argument for the old
+    ‘struct pkginfoperfile’, instead of hardcoding oldpigp->installed.
+    Which we use by passing pkg->available when checking if the current
+    package has files replaced by files from an already installed package.
+    
+    Closes: #568566
+
+ debian/changelog |    2 ++
+ src/archives.c   |   16 +++++++++-------
+ 2 files changed, 11 insertions(+), 7 deletions(-)
+
+commit e4b16b5f5413a44622769ebfd7aafb62d86c4967
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Apr 15 21:10:41 2010 +0200
+
+    dpkg-gencontrol: Do not output the Package-Type field on udeb
+
+ debian/changelog           |    1 +
+ scripts/dpkg-gencontrol.pl |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit b0b59cccd2bc8ac1e0d8d157d32fd55f5cd1d04b
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue Apr 20 22:30:05 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1907t0f8u.
+
+ man/po/de.po |  224 +++++++++++++++++++++++++++++++++++++++++++++++-----------
+ 1 files changed, 182 insertions(+), 42 deletions(-)
+
+commit 9d8b4f21e1ba75d1e18e52767d1a095bbd997d53
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue Apr 20 22:17:55 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 508t0f1u
+    
+    The remaining string seems to require a conversion of the po file to
+    UTF-8...
+
+ scripts/po/de.po |   66 ++++++++++++++++++++++++++++++++++++++++--------------
+ 1 files changed, 49 insertions(+), 17 deletions(-)
+
+commit 70a1ad8cb672e6e9ef96c694d275ff040fe39ecc
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Apr 19 10:52:46 2010 +0200
+
+    dpkg-mergechangelogs: add non-regression tests
+
+ scripts/Makefile.am                               |   12 ++-
+ scripts/t/910_merge_changelogs.t                  |   58 +++++++++
+ scripts/t/910_merge_changelogs/ch-a               |   92 ++++++++++++++
+ scripts/t/910_merge_changelogs/ch-b               |   87 +++++++++++++
+ scripts/t/910_merge_changelogs/ch-merged          |  113 +++++++++++++++++
+ scripts/t/910_merge_changelogs/ch-merged-basic    |  136 ++++++++++++++++++++
+ scripts/t/910_merge_changelogs/ch-merged-pr       |  106 ++++++++++++++++
+ scripts/t/910_merge_changelogs/ch-merged-pr-basic |  138 +++++++++++++++++++++
+ scripts/t/910_merge_changelogs/ch-old             |   85 +++++++++++++
+ 9 files changed, 825 insertions(+), 2 deletions(-)
+
+commit 9b98847665d8bdd0bae3c57f289f0e549e9baac4
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Apr 18 12:08:06 2010 +0200
+
+    dpkg-mergechangelogs: new script doing 3-way merge of Debian changelogs
+
+ debian/changelog                |    3 +
+ debian/control                  |    2 +-
+ debian/dpkg-dev.install         |    2 +
+ man/Makefile.am                 |    1 +
+ man/dpkg-mergechangelogs.1      |   71 ++++++++++
+ man/po/po4a.cfg                 |    5 +
+ scripts/.gitignore              |    1 +
+ scripts/Makefile.am             |    2 +
+ scripts/dpkg-mergechangelogs.pl |  289 +++++++++++++++++++++++++++++++++++++++
+ scripts/po/POTFILES.in          |    1 +
+ 10 files changed, 376 insertions(+), 1 deletions(-)
+
+commit 6d70417edc8da934a14b8ada2eb3f3cffe69ae3b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Apr 18 12:23:09 2010 +0200
+
+    Move maintscript-helper from lib/ to scripts/
+    
+    The lib/ location was in order when the feature was proposed as a shell
+    library, now given it's a shell script it should be in scripts/ with
+    all the other scripts.
+
+ lib/Makefile.am                     |    2 --
+ scripts/Makefile.am                 |    2 ++
+ {lib => scripts}/maintscript-helper |    0
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+
+commit db987b8486f77489e4e78bdd4eb6f5e6283635e2
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Apr 18 10:42:29 2010 +0200
+
+    Fix typo: s/ugrade/upgrade/
+
+ man/maintscript-helper.1 |    2 +-
+ man/po/de.po             |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit c40de20e30792485002864fceac286ae122e6082
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Apr 18 10:39:33 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1898t.
+
+ man/po/de.po |   99 ++++++++++++++++++++++++++++++++++++++++++----------------
+ 1 files changed, 72 insertions(+), 27 deletions(-)
+
+commit 6a8c82075692eb8545dbac4aba0fcace41f4b3d9
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Apr 17 19:46:49 2010 +0200
+
+    dpkg-scansources: call the right function when -e is used
+
+ debian/changelog            |    2 ++
+ scripts/dpkg-scansources.pl |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 2aec40974de72158563d93c8a0146c7bad5a7387
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Apr 17 09:36:04 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1893t0f5u.
+
+ man/po/de.po |  120 +++++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 69 insertions(+), 51 deletions(-)
+
+commit 58d2dc4232d62173beba6b5ebcb5f912330ca989
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Apr 16 21:49:09 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1887t0f11u.
+
+ man/po/de.po |  360 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 files changed, 327 insertions(+), 33 deletions(-)
+
+commit 20f33fd89e06a214c861733c2cc28754eda58bfa
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Apr 12 12:32:18 2010 +0200
+
+    maintscript-helper: new program to simplify some maintainer scripts
+    
+    This program is designed to be run within maintainer scripts to achieve
+    some tasks that dpkg can't (yet) handle natively either because of design
+    decisions or due to current limitations.
+    
+    Many of those tasks require coordinated actions from several maintainer
+    scripts (preinst, postinst, prerm, postrm). To avoid mistakes the same
+    call simply needs to be put in all scripts and the program will automatically
+    adapt its behaviour based on the environment variable DPKG_MAINTSCRIPT_NAME
+    and on the maintainer scripts arguments that you have to forward after
+    a double dash.
+
+ debian/changelog         |    4 +
+ debian/dpkg.install      |    2 +
+ lib/Makefile.am          |    1 +
+ lib/maintscript-helper   |  256 ++++++++++++++++++++++++++++++++++++++++++++++
+ man/Makefile.am          |    3 +-
+ man/maintscript-helper.1 |  117 +++++++++++++++++++++
+ man/po/po4a.cfg          |    5 +
+ 7 files changed, 387 insertions(+), 1 deletions(-)
+
+commit d5b15f56fbc93983005cf2f9cc1117a3bbb3670c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Apr 16 11:56:17 2010 +0200
+
+    dpkg: export DPKG_LIBDIR to maintainer scripts
+    
+    It can be used to find out the location of some internal dpkg programs
+    that might be called from maintainer scripts. That way we can avoid
+    hardcoding /usr/lib/dpkg and maintainer scripts will still work when
+    called from a dpkg manually installed in /usr/local for example.
+
+ debian/changelog |    3 +++
+ lib/dpkg/dpkg.h  |    1 +
+ man/dpkg.1       |    4 ++++
+ src/Makefile.am  |    1 +
+ src/help.c       |    1 +
+ 5 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 246cf59f8cb555bdaddd36e01d4b57a5e5ac3c7f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Apr 12 12:06:01 2010 +0200
+
+    dpkg: export DPKG_MAINTSCRIPT_NAME to tell what kind of script we're running
+    
+    The idea is that specialized hooks can benefit from this information to
+    do the right thing. The same call would be put in the various maintainer
+    scripts but the actions taken would be different depending on the script
+    nevertheless.
+
+ debian/changelog |    3 +++
+ lib/dpkg/dpkg.h  |    1 +
+ man/dpkg.1       |    4 ++++
+ src/help.c       |    4 ++--
+ 4 files changed, 10 insertions(+), 2 deletions(-)
+
+commit 29fe363219625f2a411c85ce065ad47a67077797
+Author: Robert Luberda <robert@debian.org>
+Date:   Thu Apr 15 12:10:21 2010 +0200
+
+    dselect: treat unknown packages as known and marked for purge
+    
+    This is a temporary work-around so that dselect doesn't try to
+    reinstall packages of priority > standard that were removed or not
+    installed.
+    
+    The complete solution (tracked in #551638) will involve storing the
+    seen/not-seen information somewhere else than in the dpkg status database
+    and ideally in a new database shared by all frontends.
+
+ debian/changelog   |    4 ++++
+ dselect/pkglist.cc |   10 ++++++----
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+commit 8ccebf62ea2940b597e2d66433b1ac00801e1c6b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Apr 15 02:47:26 2010 +0200
+
+    dpkg: Fix hard link extraction for normal files due to deferred rename
+    
+    When creating hard links on extraction use the .dpkg-new filename
+    for source as the normal file is not yet in place due to the rename
+    deferral.
+    
+    We avoid doing this for hard links to special files (which do not
+    have the fnnf_deferred_rename flag) because they are already in
+    place. Although this should not always pose a problem because not
+    all tar creation implementations support hard links for non-normal
+    files, but at least FreeBSD libarchive based ones support them for
+    fifos, so better be safe than sorry.
+    
+    Based-on-patch-by: Colin Watson <cjwatson@ubuntu.com>
+
+ debian/changelog |    3 +++
+ src/archives.c   |    7 ++++++-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+commit 874877459eb23c11b08f82d9d8968b2ee6bbcd7c
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Apr 14 21:05:13 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 506t.
+
+ scripts/po/de.po |   21 +++++++++++++--------
+ 1 files changed, 13 insertions(+), 8 deletions(-)
+
+commit 0085bfd1959622b98083b9d128c007f3e157d500
+Author: Michael Vogt <michael.vogt@ubuntu.com>
+Date:   Wed Apr 14 13:19:25 2010 +0200
+
+    dpkg: Report deferred trigger errors on status-fd
+    
+    Report these errors directly through status-fd, instead of reporting
+    later on errors which are a consequence of those first errors, which
+    can be pretty confusing for a front-end.
+    
+    Closes: #574599
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog |    4 ++++
+ src/trigproc.c   |   11 +++++++++++
+ 2 files changed, 15 insertions(+), 0 deletions(-)
+
+commit 0de192cacb4aa17536a65ab0b0a6181a6b3d98e7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Apr 14 12:52:55 2010 +0200
+
+    Add dpkg-buildflags to .gitignore
+
+ scripts/.gitignore |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 96fee44416027be3b9e60d8ec58fd072c143f83a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Apr 14 13:39:56 2010 +0200
+
+    dpkg: Factor out extension into its own variable in enqueue_specified()
+
+ src/packages.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 9a830e9d5fcb8c48bb84bdebb3f606984ce2ca45
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Wed Apr 14 12:17:29 2010 +0200
+
+    dpkg: Factor out package-listing functions from packages()
+    
+    Split packages() into bite-sized pieces. No functional change
+    intended.
+    
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ src/packages.c |  112 ++++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 64 insertions(+), 48 deletions(-)
+
+commit 8467206b518be8d0ac13af2a75e1e42ca6f3da8c
+Author: Colin Watson <cjwatson@ubuntu.com>
+Date:   Wed Apr 14 11:58:23 2010 +0200
+
+    dpkg: fix deferred rename/fsync processing
+    
+    It was scanning the old list of files so it would never install
+    new files.
+
+ src/archives.c   |    4 ++--
+ src/archives.h   |    2 +-
+ src/processarc.c |    2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 7fc590339e07b0b8a782ce8cae4d3be001dce53f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Apr 14 11:39:06 2010 +0200
+
+    debian/control: cleanup old Conflicts/Replaces
+    
+    Actually most of the changes have already been commited by mistake by
+    Helge in f48f5839df913802f7d70e77d66d3348bd90ddb7.
+
+ debian/changelog |    1 +
+ debian/control   |    4 +---
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+commit 3927a9d6e64297330b61a38755bee20d45c7b166
+Author: Colin Watson <cjwatson@ubuntu.com>
+Date:   Wed Apr 14 10:00:18 2010 +0100
+
+    dpkg: fix rename deferral
+    
+    Modern tar files typically use NormalFile1 rather than NormalFile0 for
+    file objects.  A typo meant that the former never triggered rename
+    deferral.
+
+ debian/changelog |    5 +++++
+ src/archives.c   |    2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit f48f5839df913802f7d70e77d66d3348bd90ddb7
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue Apr 13 21:26:58 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1867t.
+
+ debian/control |    7 ++---
+ man/po/de.po   |   62 ++++++++++++++++++++++++++++++++++++-------------------
+ 2 files changed, 43 insertions(+), 26 deletions(-)
+
+commit 4a3e1d9b5af8be3aafbe747209ae637bc14c5095
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Apr 12 19:53:02 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1861t0f5u.
+
+ man/po/de.po |  428 +++++++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 files changed, 383 insertions(+), 45 deletions(-)
+
+commit 07460470d2cfae36d0940b433b8e37b7b125e9e7
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Apr 12 19:17:39 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 505t.
+
+ scripts/po/de.po |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 53 insertions(+), 1 deletions(-)
+
+commit 86adf8bd1e09e6f7000886165d5fa19e88c3a54a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Apr 11 21:20:12 2010 +0200
+
+    Dpkg::Vendor::Default: document the update-buildflags hook
+
+ scripts/Dpkg/Vendor/Default.pm |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit af650f7d42008e2f110d1a237c9a04c6dc1cfff9
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Apr 11 21:14:00 2010 +0200
+
+    Dpkg::BuildFlags: for Ubuntu set LDFLAGS to -Wl,-Bsymbolic-functions
+    
+    This is according to https://wiki.ubuntu.com/DistCompilerFlags and
+    the current patch that they are carrying anyway.
+
+ debian/changelog               |    1 +
+ scripts/Dpkg/Vendor/Default.pm |    2 ++
+ scripts/Dpkg/Vendor/Ubuntu.pm  |    6 ++++++
+ 3 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 850645ee948563eeebc6d369145554bc72da5416
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Apr 11 18:37:07 2010 +0200
+
+    dpkg-buildpackage: use Dpkg::BuildFlags to retrieve the compiler flags
+    
+    Document that debian/rules should not rely on environment variables
+    set by dpkg-buildpackage and should instead use
+    dpkg-buildflags/dpkg-architecture to retrieve the corresponding values.
+
+ man/dpkg-buildpackage.1      |   78 ++++-------------------------------------
+ scripts/dpkg-buildpackage.pl |   27 ++++-----------
+ 2 files changed, 15 insertions(+), 90 deletions(-)
+
+commit 9dc0466a5e300dde0cf23a77aaa609b05b628242
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Apr 9 17:46:15 2010 +0200
+
+    dpkg-buildflags: new script to retrieve compilation flags during package build
+    
+    Forcing the value of compilation flags through environment variables set
+    by dpkg-buildpackages has not been very successful up to now and suffered
+    from the fact that calling debian/rules directly could lead to a different
+    build than what dpkg-buildpackage would have done.
+    
+    This commit is the start of a new solution: dpkg-buildflags is a tool that
+    package maintainers are supposed to use in order to retrieve compilation
+    flags. It offers a way to control their default values at the distribution
+    level while still allowing customizations by users who recompile the
+    source packages.
+
+ debian/changelog           |    5 ++
+ debian/dpkg-dev.install    |    2 +
+ man/Makefile.am            |    1 +
+ man/dpkg-buildflags.1      |  116 ++++++++++++++++++++++++++++++++++++++++++++
+ man/po/po4a.cfg            |    5 ++
+ scripts/Makefile.am        |    2 +
+ scripts/dpkg-buildflags.pl |  105 +++++++++++++++++++++++++++++++++++++++
+ scripts/po/POTFILES.in     |    1 +
+ 8 files changed, 237 insertions(+), 0 deletions(-)
+
+commit 4c1743cb6ec8478fc099201a7811caa0d892ebaa
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Apr 11 17:14:34 2010 +0200
+
+    Dpkg::BuildFlags: new module to query/manage build flags
+
+ scripts/Dpkg/BuildFlags.pm |  266 ++++++++++++++++++++++++++++++++++++++++++++
+ scripts/Makefile.am        |    1 +
+ scripts/po/POTFILES.in     |    1 +
+ 3 files changed, 268 insertions(+), 0 deletions(-)
+
+commit 352ce52e945820fa9aa182397eb12e7b625c2438
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Apr 11 09:10:17 2010 +0200
+
+    Fix POD in several perl modules to avoid two consecutive lines starting with =item
+    
+    An empty line is required between the two or pod2man decides that the
+    second is the continuation of the former and includes "=item" in the
+    generated manual page.
+
+ scripts/Dpkg/Changelog/Entry.pm |    1 +
+ scripts/Dpkg/Control/Info.pm    |    1 +
+ scripts/Dpkg/Deps.pm            |    1 +
+ scripts/Dpkg/Index.pm           |    1 +
+ scripts/Dpkg/Version.pm         |    1 +
+ 5 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 443ed783f7903301827fed7b47b25db590104c7f
+Author: Ansgar Burchardt <ansgar@43-1.org>
+Date:   Sun Apr 11 08:59:37 2010 +0200
+
+    Dpkg::Version: fix POD to avoid two consecutive lines starting with =item
+
+ scripts/Dpkg/Version.pm |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ff03345b7a8d9dd0950dc581c5263373b2a0b406
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Apr 9 09:36:22 2010 +0200
+
+    dpkg-source: do not allow underscore in component name for supplementary tarballs
+    
+    According the documentation they were never meant to be allowed
+    but usage of perl's \w allowed them nevertheless. [\w-] has now been
+    replaced by [[:alnum:]-] everywhere so that the code fits the
+    documentation.
+
+ debian/changelog                  |    3 +++
+ scripts/Dpkg/Source/Package.pm    |    4 ++--
+ scripts/Dpkg/Source/Package/V2.pm |    4 ++--
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+commit 18b12083b5fee4e7e26e1382e50321e7956fcdb9
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Apr 9 08:35:47 2010 +0200
+
+    dpkg: fix metadata installation by not mixing rename() in a readdir() loop
+    
+    dpkg's process_archive() was doing the improper assumption that a
+    readdir() loop would not return the same filename twice even when the
+    scanned directory has files renamed into it (coming from tmp.ci).
+    
+    The net result of having the same filename returned twice is that the
+    the second time the updated file to install is no longer there and
+    thus dpkg removed the current metadata file believing that it was
+    obsolete. btrfs triggers this bug consistently.
+    
+    All other readdir() occurrences have been reviewed as well for similar
+    problems. But they are all safe, they mainly unlink() files rather
+    than adding new files into the scanned directory.
+    
+    Thanks to Carey Underwood and Chris Mason for their help in diagnosing
+    this problem.
+    
+    Acked-by: Guillem Jover <guillem@debian.org>
+
+ debian/changelog |    3 +++
+ src/processarc.c |   39 ++++++++++++++++++++++++++++++++-------
+ 2 files changed, 35 insertions(+), 7 deletions(-)
+
+commit dc8af12e61186e3549a1ed2a41f52054cb39fe7c
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Mon Apr 5 10:40:32 2010 +0200
+
+    Fix inconsistencies and typos in German dpkg translation
+    
+    Change “brauchen” → “benötigen” throughout. Change “hat” → “erhält” in
+    several places.  Reword a few formulations in “--help” output.  Fix
+    various typos.
+    
+    Based-on-patch-by: Holger Wansing <linux@wansing-online.de>
+
+ po/de.po |  243 ++++++++-----------------------------------------------------
+ 1 files changed, 32 insertions(+), 211 deletions(-)
+
+commit 6b5a7208581774ba23517431b4abc67d30527dd5
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Apr 4 16:51:44 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1814t.
+
+ man/po/de.po |   11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+commit e7b1392e467cee3b6d6052cf05710d36d05852ec
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Apr 2 09:16:49 2010 +0200
+
+    dpkg-source: fix initialization of diff-ignore in 1.0 format
+    
+    Commit 3378e8fa435abe79e9bd3cea07b02f562b906695 broke
+    "dpkg-source -i -b" on version 1.0 source packages. This restores it.
+
+ scripts/Dpkg/Source/Package/V1.pm |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit a6cd0c12f3fee71f26374c7f21f7a2e4d1ac9458
+Author: Jari Aalto <jari.aalto@cante.net>
+Date:   Fri Apr 2 09:15:09 2010 +0200
+
+    dpkg-parsechangelog(1): precise that --all overrides the other options
+
+ debian/changelog          |    2 ++
+ man/dpkg-parsechangelog.1 |    3 ++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit d620ead930238391f7b41fc15385cff36a382299
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Apr 2 07:50:49 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1814t.
+
+ man/po/de.po |   22 +++++++++++++++++++++-
+ 1 files changed, 21 insertions(+), 1 deletions(-)
+
+commit 3378e8fa435abe79e9bd3cea07b02f562b906695
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Apr 1 21:05:35 2010 +0200
+
+    dpkg-source: support debian/source/local-options
+    
+    It's like debian/source/options but it's not stored in the generated
+    source package. This is ensured by the way of being part of the default
+    ignore lists (-i and -I) and being explicitely excluded for the old
+    1.0 format that doesn't use the default ignore list.
+
+ debian/changelog                  |    2 ++
+ man/dpkg-source.1                 |    5 +++++
+ scripts/Dpkg/Source/Package.pm    |    3 +++
+ scripts/Dpkg/Source/Package/V1.pm |    1 +
+ scripts/dpkg-source.pl            |   25 ++++++++++++++-----------
+ 5 files changed, 25 insertions(+), 11 deletions(-)
+
+commit 6194f91cf8bd7b851d5b875e81b5e10da584d645
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Wed Mar 31 20:07:52 2010 +0200
+
+    German dpkg translation update
+    
+    Update to 968t.
+
+ debian/changelog |    3 ++
+ po/de.po         |   59 ++++++++++++++++++++++++++---------------------------
+ 2 files changed, 32 insertions(+), 30 deletions(-)
+
+commit 5f4aabaa53388043e021e8a6e23ba35f141fb619
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Wed Mar 31 19:01:03 2010 +0200
+
+    Fix typo in German dselect translation
+
+ debian/changelog |    3 +++
+ dselect/po/de.po |    6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+commit e9c695be22ff3c7d7f008a33033f02f969c97aba
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Mar 29 19:51:01 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1812t.
+
+ man/po/de.po |  181 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 180 insertions(+), 1 deletions(-)
+
+commit a676dbc324dbf266d440b8198ac936421126e449
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Mar 29 18:33:07 2010 +0200
+
+    Update German scripts translation
+    
+    Update to 499t.
+
+ debian/changelog |    3 +++
+ scripts/po/de.po |    7 ++++++-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+commit c5d44e22a98b09414619a06723a05e85c944ea12
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Mar 29 12:36:20 2010 +0200
+
+    Dpkg::Source::Package: do not overwrite debian/source/format if it already exists
+
+ scripts/Dpkg/Source/Package.pm |   10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 1cba260ee1e98cc9c160d7487d720ab795ce76c8
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Mar 28 18:11:33 2010 +0200
+
+    Add missing changelog entries.
+
+ debian/changelog |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 695a94799dc54f03b2f535b85bb1d60bb3f30f02
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Mar 28 18:04:17 2010 +0200
+
+    dpkg-source(1): document more error messages and warnings
+
+ man/dpkg-source.1 |   24 ++++++++++++++++++++++--
+ 1 files changed, 22 insertions(+), 2 deletions(-)
+
+commit ce14c941fa4a02388011a0c7c7e60a86e820aadd
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Mar 28 16:57:18 2010 +0200
+
+    dpkg-source: warn when debian/source/format doesn't exist
+    
+    Document in dpkg-source(1) the fact that the fallback to "1.0"
+    when debian/source/format doesn't exist is deprecated. Explain
+    the rationale.
+    
+    Document the long-term deprecation in README.feature-removal-schedule.
+
+ debian/changelog                    |   12 ++++++++++--
+ doc/README.feature-removal-schedule |    9 +++++++++
+ man/dpkg-source.1                   |   29 ++++++++++++++++++++++-------
+ scripts/dpkg-source.pl              |    2 ++
+ 4 files changed, 43 insertions(+), 9 deletions(-)
+
+commit 85c68a2de510262ff8e82f9f2948edef0bca8035
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Mar 28 17:38:04 2010 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1799t.
+
+ debian/changelog |    7 +++++++
+ man/po/de.po     |   15 ++++++++++-----
+ 2 files changed, 17 insertions(+), 5 deletions(-)
+
+commit 3779bbcd940e318f0d55ed0584b0ba332800e45c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Mar 28 16:01:19 2010 +0200
+
+    Dpkg::Source::Package: add .gitattributes to dpkg-source ignore lists
+
+ scripts/Dpkg/Source/Package.pm |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit a48c5d14bdc617c8323eddb794f320875cf479d1
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Mar 28 12:04:38 2010 +0200
+
+    deb-shlibs(5): use "type" rather than "tag" to be consistent with Debian Policy
+
+ man/deb-shlibs.5 |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 48fcb4cea268e2257b9bdd4a89072870f70239bd
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Fri Mar 26 07:25:28 2010 +0100
+
+    Updated French translation
+
+ debian/changelog |    1 +
+ po/fr.po         |  299 +++++++++++++++++++++++++-----------------------------
+ 2 files changed, 140 insertions(+), 160 deletions(-)
+
+commit 132372df042576ba92df8fe17db95a12b51c7097
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Fri Mar 12 07:17:27 2010 +0100
+
+    Update French dselect translation
+
+ debian/changelog |    1 +
+ dselect/po/fr.po |   16 ++++++----------
+ 2 files changed, 7 insertions(+), 10 deletions(-)
+
+commit a06c587571c1926a6af4176dac9f5066175db45c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 24 13:56:47 2010 +0100
+
+    Release 1.15.6.1
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 0925bc6e1dd675a53693f9549674b87da172e198
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 24 14:02:25 2010 +0100
+
+    Regenerate .pot files and merge .po files with them
+
+ po/ast.po               |  750 +++++++++++++++++++++++-----------------------
+ po/bs.po                |  727 ++++++++++++++++++++++-----------------------
+ po/ca.po                |  750 +++++++++++++++++++++++-----------------------
+ po/cs.po                |  750 +++++++++++++++++++++++-----------------------
+ po/da.po                |  750 +++++++++++++++++++++++-----------------------
+ po/de.po                |  750 +++++++++++++++++++++++-----------------------
+ po/dpkg.pot             |  727 ++++++++++++++++++++++-----------------------
+ po/dz.po                |  750 +++++++++++++++++++++++-----------------------
+ po/el.po                |  750 +++++++++++++++++++++++-----------------------
+ po/eo.po                |  750 +++++++++++++++++++++++-----------------------
+ po/es.po                |  750 +++++++++++++++++++++++-----------------------
+ po/et.po                |  750 +++++++++++++++++++++++-----------------------
+ po/eu.po                |  750 +++++++++++++++++++++++-----------------------
+ po/fr.po                |  750 +++++++++++++++++++++++-----------------------
+ po/gl.po                |  750 +++++++++++++++++++++++-----------------------
+ po/hu.po                |  744 +++++++++++++++++++++++-----------------------
+ po/id.po                |  750 +++++++++++++++++++++++-----------------------
+ po/it.po                |  750 +++++++++++++++++++++++-----------------------
+ po/ja.po                |  750 +++++++++++++++++++++++-----------------------
+ po/km.po                |  750 +++++++++++++++++++++++-----------------------
+ po/ko.po                |  750 +++++++++++++++++++++++-----------------------
+ po/ku.po                |  727 ++++++++++++++++++++++-----------------------
+ po/lt.po                |  750 +++++++++++++++++++++++-----------------------
+ po/mr.po                |  750 +++++++++++++++++++++++-----------------------
+ po/nb.po                |  750 +++++++++++++++++++++++-----------------------
+ po/ne.po                |  750 +++++++++++++++++++++++-----------------------
+ po/nl.po                |  750 +++++++++++++++++++++++-----------------------
+ po/nn.po                |  750 +++++++++++++++++++++++-----------------------
+ po/pa.po                |  734 ++++++++++++++++++++++-----------------------
+ po/pl.po                |  750 +++++++++++++++++++++++-----------------------
+ po/pt.po                |  750 +++++++++++++++++++++++-----------------------
+ po/pt_BR.po             |  750 +++++++++++++++++++++++-----------------------
+ po/ro.po                |  750 +++++++++++++++++++++++-----------------------
+ po/ru.po                |  754 +++++++++++++++++++++++-----------------------
+ po/sk.po                |  750 +++++++++++++++++++++++-----------------------
+ po/sv.po                |  750 +++++++++++++++++++++++-----------------------
+ po/th.po                |  750 +++++++++++++++++++++++-----------------------
+ po/tl.po                |  750 +++++++++++++++++++++++-----------------------
+ po/vi.po                |  755 ++++++++++++++++++++++++-----------------------
+ po/zh_CN.po             |  750 +++++++++++++++++++++++-----------------------
+ po/zh_TW.po             |  750 +++++++++++++++++++++++-----------------------
+ scripts/po/ca.po        |   32 +-
+ scripts/po/de.po        |   32 +-
+ scripts/po/dpkg-dev.pot |   32 +-
+ scripts/po/fr.po        |   32 +-
+ scripts/po/pl.po        |   32 +-
+ scripts/po/ru.po        |   32 +-
+ scripts/po/sv.po        |   32 +-
+ 48 files changed, 15412 insertions(+), 15480 deletions(-)
+
+commit 9cd41fdda1c27169c52d73b3b3ce71991d724994
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 21 09:23:09 2010 +0100
+
+    dpkg: Defer the fsync and rename for normal files in tar extraction
+    
+    This way it's done in one pass afterwards, to avoid massive I/O
+    degradation due to the serialization from each write + fsync. This
+    restores extraction times to numbers closer to the ones before the
+    fsync patch introduced in 1.15.6.
+
+ debian/changelog |    4 ++
+ src/archives.c   |   86 ++++++++++++++++++++++++++++++++++++++++++++++-------
+ src/archives.h   |    1 +
+ src/filesdb.h    |    2 +
+ src/processarc.c |    2 +
+ 5 files changed, 83 insertions(+), 12 deletions(-)
+
+commit 7e98241b11ce27e8d7fb87f1e64ecd03ec0ea0bf
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 24 12:50:06 2010 +0100
+
+    dselect: Show dependency/conflicts resolution screen again
+    
+    Fix by switching the C++ code to use STL's min() and max() instead of
+    preprocessor macros, to avoid multiple evaluation of arguments.
+    
+    Regression introduced in commit f426b031ac858fa30ace69959a43b61fb40f4be9.
+    
+    Closes: #574816
+    
+    Based-on-patch-by: Robert Luberda <robert@debian.org>
+
+ debian/changelog  |    4 ++++
+ dselect/dselect.h |    5 +++++
+ lib/dpkg/macros.h |    3 +++
+ 3 files changed, 12 insertions(+), 0 deletions(-)
+
+commit 0fb104820dca0437cfdc045454010aeb89371754
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 24 12:39:05 2010 +0100
+
+    dpkg-query: Make local functions static
+
+ src/main.h  |    4 ----
+ src/query.c |   16 ++++++++++++----
+ 2 files changed, 12 insertions(+), 8 deletions(-)
+
+commit 994dc30369b1bca2a846409e0aa743096f65671c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 15 09:09:54 2010 +0100
+
+    s-s-d: Fix and unify fatal error strings
+    
+    Do not use strerror on fatal() calls as it's already doing that
+    internally if errno is not 0. Remove redundant new line at end of
+    fatal() strings. Decapitalize first word. Clarify some strings to
+    make it obvious it's an error message.
+
+ utils/start-stop-daemon.c |   50 +++++++++++++++++++++-----------------------
+ 1 files changed, 24 insertions(+), 26 deletions(-)
+
+commit 4ecd0ef5d2e2a65402f9a6d45f9d5b96d12516d0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 15 06:20:14 2010 +0100
+
+    s-s-d: Do not allow a --retry schedule where forever is the last item
+    
+    The forever item needs something to repeat over, otherwise we just get
+    an infinite loop doing nothing.
+    
+    Closes: #570938
+
+ debian/changelog          |    2 ++
+ utils/start-stop-daemon.c |    3 +++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 4b13dfcdbea654859b7980ea1af33bec0f9a095b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 14 08:13:19 2010 +0100
+
+    dpkg-statoverride: Fix bogus arguments in ACTION macros
+    
+    Remove bogus short options and use more appropriate act_ values for each
+    action.
+
+ src/statcmd.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 230eecd402b7d7252cc958706db8d8350055e560
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 15 07:24:14 2010 +0100
+
+    libdpkg: Remove unused desc argument from buffer_read and buffer_write
+
+ lib/dpkg/buffer.c |   12 +++++-------
+ lib/dpkg/buffer.h |    6 ++----
+ 2 files changed, 7 insertions(+), 11 deletions(-)
+
+commit c1481ac891e430a8e24ebfba5bc9f54b5166b769
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 15 07:21:10 2010 +0100
+
+    libdpkg: Handle I/O errors in buffer_copy()
+    
+    Make buffer_read and buffer_write behave as normal read/write functions,
+    return -1 on error, and let the caller handle the error.
+    
+    Split the checks in buffer_copy for errors from buffer_read and
+    buffer_write to be able to give more accurate error messages.
+
+ lib/dpkg/buffer.c |   21 +++++++++------------
+ 1 files changed, 9 insertions(+), 12 deletions(-)
+
+commit c11588722ac0e195b1f31a4995a854536f331bde
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Mar 13 08:35:43 2010 +0100
+
+    libdpkg: Make statusfile and availablefile variables static
+
+ lib/dpkg/dbmodify.c |    3 +--
+ lib/dpkg/dpkg-db.h  |    3 ---
+ 2 files changed, 1 insertions(+), 5 deletions(-)
+
+commit 2650ab3024fd3c798e17c26d94d76766373a1a02
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Mar 13 08:26:37 2010 +0100
+
+    libdpkg: Move trigdeferred declarations to a new trigdeferred.h
+
+ lib/dpkg/Makefile.am    |    1 +
+ lib/dpkg/dpkg-db.h      |   31 ------------------------
+ lib/dpkg/trigdeferred.h |   61 +++++++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/trigdeferred.l |    1 +
+ lib/dpkg/triglib.c      |    1 +
+ src/trigcmd.c           |    1 +
+ 6 files changed, 65 insertions(+), 31 deletions(-)
+
+commit 58a93c17fc4246d8f0281b21cd36112562d2c4f4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Mar 13 08:20:02 2010 +0100
+
+    libdpkg: Move triglib declarations to a new triglib.h
+
+ lib/dpkg/Makefile.am    |    1 +
+ lib/dpkg/dbmodify.c     |    1 +
+ lib/dpkg/dpkg-db.h      |   70 ---------------------------------
+ lib/dpkg/fields.c       |    1 +
+ lib/dpkg/trigdeferred.l |    1 +
+ lib/dpkg/triglib.c      |    1 +
+ lib/dpkg/triglib.h      |   99 +++++++++++++++++++++++++++++++++++++++++++++++
+ src/archives.c          |    1 +
+ src/configure.c         |    1 +
+ src/help.c              |    1 +
+ src/processarc.c        |    1 +
+ src/remove.c            |    1 +
+ src/trigcmd.c           |    1 +
+ src/trigproc.c          |    1 +
+ 14 files changed, 111 insertions(+), 70 deletions(-)
+
+commit 3d2e2cbed0c72f423577dbf4cbefb3d72df3bbfa
+Author: Colin Watson <cjwatson@debian.org>
+Date:   Tue Mar 16 12:14:16 2010 +0100
+
+    dpkg-source: support unpacking old source packages lacking the Format field
+    
+    .dsc files haven't always had a Format field. It was introduced in dpkg
+    1.6.13, in May 2000. This means that it's still not entirely
+    implausible to run across source packages without Format, for example
+    when importing the history of a source package into revision control.
+    
+    Thus, dpkg-source should treat a missing Format field as 1.0, for
+    compatibility with these old packages.
+
+ debian/changelog               |    6 ++++++
+ scripts/Dpkg/Source/Package.pm |    4 +++-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+commit 94a7cf146144945759f608400dc9aa9c674bd1b3
+Author: Peter Krefting <peterk@debian.org>
+Date:   Mon Mar 15 12:26:51 2010 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: 971t0f0u.
+    scripts/po/sv.po: 498t0f0u.
+
+ debian/changelog |    6 ++++++
+ po/sv.po         |   13 ++++++-------
+ scripts/po/sv.po |    8 ++++----
+ 3 files changed, 16 insertions(+), 11 deletions(-)
+
+commit 28b0443163ac43515197dbef8ff441990be43866
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Mar 13 07:29:23 2010 +0100
+
+    libdpkg: Use __attribute__ keyword depending on compiler support
+    
+    Check for compiler support from preprocessor macros and selectively
+    enable specific __attribute__ specifications. We avoid exposing the
+    configure variable HAVE_C_ATTRIBUTE, which was never defined for the
+    installed headers. Remove the now unused DPKG_C_ATTRIBUTE autoconf
+    macro.
+
+ configure.ac        |    1 -
+ debian/changelog    |    2 ++
+ lib/dpkg/macros.h   |    8 ++++++--
+ m4/dpkg-compiler.m4 |   17 -----------------
+ 4 files changed, 8 insertions(+), 20 deletions(-)
+
+commit 6fdc75338295a91ceebfddebb1e672fe8f929012
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Mar 13 07:26:45 2010 +0100
+
+    libdpkg: Always use C99 variadic macros
+    
+    As the build requires them anyway, we avoid exposing the configure
+    variable HAVE_C99, which was never defined for the installed headers.
+
+ debian/changelog     |    2 ++
+ lib/dpkg/buffer.h    |   37 -------------------------------------
+ lib/dpkg/dpkg.h      |    4 ----
+ utils/install-info.c |    5 -----
+ 4 files changed, 2 insertions(+), 46 deletions(-)
+
+commit 7cde255c129784700ba3f08163287002cc58158c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Mar 13 05:28:30 2010 +0100
+
+    Revert "libdpkg: Use varbuf_detach instead of ad-hoc code"
+    
+    This reverts commit 77cae397a15baeca11c26aeb806b6be516e33d5f.
+    
+    This change introdcued two points for memory leaks, which could be
+    significant, depending on the amount of calls to the functions.
+
+ debian/changelog    |    2 +-
+ lib/dpkg/dbmodify.c |    2 +-
+ lib/dpkg/fields.c   |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit a6ab75a7802ef1596988b744381b242e82535f0e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Mar 13 05:27:20 2010 +0100
+
+    Bump version to 1.15.6.1
+
+ debian/changelog |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit cba7601879c20e23d2320dfdc7bd71b0a857d3e8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Mar 12 00:15:54 2010 +0100
+
+    Release 1.15.6
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 966458676627c4def8e5452a9ae5172ce8308871
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Mar 12 00:14:06 2010 +0100
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/es.po        |   10 -
+ man/po/dpkg-man.pot     |    2 +-
+ man/po/sv.po            |  698 +++++++++++++++++------------------------------
+ po/ast.po               |  506 +++++++++++++++++-----------------
+ po/bs.po                |  505 +++++++++++++++++-----------------
+ po/ca.po                |  502 +++++++++++++++++-----------------
+ po/cs.po                |  506 +++++++++++++++++-----------------
+ po/da.po                |  506 +++++++++++++++++-----------------
+ po/de.po                |  503 +++++++++++++++++-----------------
+ po/dpkg.pot             |  467 +++++++++++++++----------------
+ po/dz.po                |  504 +++++++++++++++++-----------------
+ po/el.po                |  508 +++++++++++++++++-----------------
+ po/eo.po                |  506 +++++++++++++++++-----------------
+ po/es.po                |  506 +++++++++++++++++-----------------
+ po/et.po                |  511 ++++++++++++++++++-----------------
+ po/eu.po                |  506 +++++++++++++++++-----------------
+ po/fr.po                |  503 +++++++++++++++++-----------------
+ po/gl.po                |  508 +++++++++++++++++-----------------
+ po/hu.po                |  506 +++++++++++++++++-----------------
+ po/id.po                |  510 +++++++++++++++++-----------------
+ po/it.po                |  497 +++++++++++++++++-----------------
+ po/ja.po                |  508 +++++++++++++++++-----------------
+ po/km.po                |  504 +++++++++++++++++-----------------
+ po/ko.po                |  504 +++++++++++++++++-----------------
+ po/ku.po                |  477 ++++++++++++++++----------------
+ po/lt.po                |  479 ++++++++++++++++----------------
+ po/mr.po                |  508 +++++++++++++++++-----------------
+ po/nb.po                |  506 +++++++++++++++++-----------------
+ po/ne.po                |  508 +++++++++++++++++-----------------
+ po/nl.po                |  504 +++++++++++++++++-----------------
+ po/nn.po                |  508 +++++++++++++++++-----------------
+ po/pa.po                |  467 +++++++++++++++----------------
+ po/pl.po                |  510 +++++++++++++++++-----------------
+ po/pt.po                |  504 +++++++++++++++++-----------------
+ po/pt_BR.po             |  510 ++++++++++++++++++-----------------
+ po/ro.po                |  504 +++++++++++++++++-----------------
+ po/ru.po                |  506 +++++++++++++++++-----------------
+ po/sk.po                |  503 +++++++++++++++++-----------------
+ po/sv.po                |  499 +++++++++++++++++-----------------
+ po/th.po                |  504 +++++++++++++++++-----------------
+ po/tl.po                |  510 +++++++++++++++++-----------------
+ po/vi.po                |  508 +++++++++++++++++-----------------
+ po/zh_CN.po             |  499 +++++++++++++++++-----------------
+ po/zh_TW.po             |  504 +++++++++++++++++-----------------
+ scripts/po/ca.po        |   91 ++++---
+ scripts/po/de.po        |   82 +++---
+ scripts/po/dpkg-dev.pot |   93 ++++---
+ scripts/po/fr.po        |   93 ++++---
+ scripts/po/pl.po        |   93 ++++---
+ scripts/po/ru.po        |   93 ++++---
+ scripts/po/sv.po        |   93 ++++---
+ 51 files changed, 10982 insertions(+), 10960 deletions(-)
+
+commit 17bd5d87d5ea4e352794c4f854809cf9822e885b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Mar 12 02:42:44 2010 +0100
+
+    Improve libdpkg-dev package short description
+    
+    Make it match with the reset of the short descriptions.
+
+ debian/control |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 7dd42b94cfb40f046a8da29142ef5a2a436ca391
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Mar 12 00:31:55 2010 +0100
+
+    build: Replace all / with :: on perl module man pages filenames
+    
+    The current sed expression was only replacing the first one, which
+    didn't take into account nested modules.
+
+ scripts/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2567c926666c9924c87f99d0e4b3389453c4ef25
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Mar 12 00:31:18 2010 +0100
+
+    build: Add missing libdpkg-perl debian packaging files to EXTRA_DIST
+
+ Makefile.am |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit c7dc2bf66393a546e1189e74a65292af336835cb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 11 23:43:17 2010 +0100
+
+    build: Allow disabling Unicode support
+    
+    This affects only dselect ncurses support for now.
+    
+    Based-on-patch-by: Yuri Vasilevski <yvasilev@gentoo.org>
+
+ debian/changelog   |    2 ++
+ m4/dpkg-libs.m4    |   31 +++++++++++++++++++++++--------
+ m4/dpkg-unicode.m4 |   21 +++++++++++++++++++++
+ 3 files changed, 46 insertions(+), 8 deletions(-)
+
+commit 4f4f2cbd86c5b8ee9ee4541ccb387215bece8df3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 11 22:09:29 2010 +0100
+
+    man: Honour LINGUAS environment variable when installing translations
+    
+    Users should be able to choose which locales to install by setting the
+    environment variable LINGUAS, or passing it as a make argument. Honour
+    the user setting and introduce a new LINGUAS_DIST to avoid undesired
+    behaviour on “make dist”.
+    
+    Reported-by: Yuri Vasilevski <yvasilev@gentoo.org>
+
+ debian/changelog |    1 +
+ man/Makefile.am  |    7 +++++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 20fdb395cc721a5060c5623eda956d73ea840a21
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 11 21:35:25 2010 +0100
+
+    Do an fsync on database directories
+    
+    After creating, renaming or unlinking database files sync its
+    containing directory, to guarantee the new file entry is correctly
+    listed in the directory.
+    
+    Closes: #567089
+    
+    Base-on-patch-by: Jean-Baptiste Lallement <jeanbaptiste.lallement@gmail.com>
+
+ debian/changelog        |    4 ++
+ dpkg-split/queue.c      |    2 +
+ lib/dpkg/Makefile.am    |    2 +
+ lib/dpkg/dbmodify.c     |    8 +++
+ lib/dpkg/dir.c          |  124 +++++++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/dir.h          |   37 ++++++++++++++
+ lib/dpkg/dump.c         |    5 ++
+ lib/dpkg/trigdeferred.l |    3 +
+ lib/dpkg/triglib.c      |    5 ++
+ src/filesdb.c           |    3 +
+ src/processarc.c        |   17 ++++++
+ src/remove.c            |    5 ++
+ src/statcmd.c           |    3 +
+ 13 files changed, 218 insertions(+), 0 deletions(-)
+
+commit ab9482eb45e27a0b0c058a2662b28b7d3642173d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 11 21:13:25 2010 +0100
+
+    libdpkg: Add a new updatesdir variable in dbmodify
+    
+    Use it to initialize updatefnbuf, instead of constructing it from
+    admindir and UPDATESDIR.
+
+ lib/dpkg/dbmodify.c |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit a9f8f235b90a586d99a9597fa5e7f2880ec91a98
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 11 21:08:40 2010 +0100
+
+    libdpkg: Remove unneeded static admindir in dbmodify
+    
+    Now that pkgadminfile does not use the file global admindir, we can just
+    switch the modstatdb_init() argument name from adir to admindir, use
+    that instead in the whole function, and remove the file global admindir.
+
+ lib/dpkg/dbmodify.c |   19 +++++++++----------
+ 1 files changed, 9 insertions(+), 10 deletions(-)
+
+commit 15daa22fa94d19cc059d2755e5164db1a3a62791
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 11 21:03:55 2010 +0100
+
+    libdpkg: Create new pkgadmindir() to hide admindir and INFODIR
+    
+    The callers should not be concerned about where the package info
+    directory is located, the new functions encapsulates the knowdlegde
+    in the dbmodify module.
+
+ lib/dpkg/dbmodify.c |   11 +++++++++--
+ lib/dpkg/dpkg-db.h  |    1 +
+ src/filesdb.c       |    3 +--
+ src/processarc.c    |    6 ++----
+ src/query.c         |    3 +--
+ src/remove.c        |    6 ++----
+ 6 files changed, 16 insertions(+), 14 deletions(-)
+
+commit 4f7898438d28cf3b1d6393a7e9b9135dcc1b1c0d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 11 19:41:35 2010 +0100
+
+    libdpkg: Simplify triggersdir file path generation
+    
+    Now that we have generated the triggersdir via trig_get_triggersdir,
+    we can reuse it to generate the files inside the triggersdir, instead
+    of redoing the same work again.
+
+ lib/dpkg/trigdeferred.l |   11 +++++------
+ 1 files changed, 5 insertions(+), 6 deletions(-)
+
+commit a35f0e37a46b2e3721149a25c36f3352c1cdf881
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 11 19:38:12 2010 +0100
+
+    libdpkg: Encapsulate triggersdir handling in triglib
+    
+    The only users of triggersdir and related files are the triglib and
+    trigdeferred modules, and dbmodify does not have any business in knowing
+    where the triggersdir is located (besides for conveninence when creating
+    the pathname). Create instead a new function trig_get_triggersdir() to
+    generate the triggersdir from an admindir, and use that on each module.
+
+ lib/dpkg/dbmodify.c     |    4 ----
+ lib/dpkg/dpkg-db.h      |    3 ++-
+ lib/dpkg/trigdeferred.l |    3 +++
+ lib/dpkg/triglib.c      |   32 ++++++++++++++++++++++++++++++++
+ 4 files changed, 37 insertions(+), 5 deletions(-)
+
+commit 9fd4358545c340f3cbdf42246f73305397264a22
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 11 07:49:58 2010 +0100
+
+    libdpkg: Add “subprocess” to strings to clarify
+    
+    This makes it more clear what the format argument refers to, and as a
+    side effect coalesces two almost identical strings together.
+
+ lib/dpkg/subproc.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 2dc87a2b34d8dd0312a9bfa95d5b6375a4ab39d1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 10 22:15:03 2010 +0100
+
+    libdpkg-perl: Demote some unstable modules to VERSION 0.01
+    
+    These modules might still need some cleanup work, so make it explicit
+    that the API will change by demoting the VERSION.
+
+ scripts/Dpkg/Arch.pm          |    2 +-
+ scripts/Dpkg/ErrorHandling.pm |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 27f6b9bd4e2faa41be6683896285cade125d6fb2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 11 08:40:10 2010 +0100
+
+    Update Catalan translations
+
+ debian/changelog |    3 +
+ dselect/po/ca.po |   36 +--
+ po/ca.po         |  696 ++++++++++++++++++++++++++----------------------------
+ scripts/po/ca.po |   21 +-
+ 4 files changed, 362 insertions(+), 394 deletions(-)
+
+commit eb4155377e4e41a4d420712dfc91c57578d5170f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 11 08:22:32 2010 +0100
+
+    Use License instead of Licence in strings
+    
+    This removes almost duplicate strings for translation.
+
+ debian/copyright               |    2 +-
+ dselect/po/cs.po               |    2 +-
+ dselect/po/el.po               |    2 +-
+ dselect/po/hu.po               |    2 +-
+ dselect/po/id.po               |    2 +-
+ dselect/po/it.po               |    2 +-
+ dselect/po/nb.po               |    2 +-
+ dselect/po/nl.po               |    2 +-
+ dselect/po/nn.po               |    2 +-
+ dselect/po/pt.po               |    2 +-
+ dselect/po/ro.po               |    2 +-
+ dselect/po/sk.po               |    2 +-
+ dselect/po/tl.po               |    2 +-
+ dselect/po/zh_TW.po            |    2 +-
+ scripts/changelog/debian.pl    |    2 +-
+ scripts/dpkg-architecture.pl   |    2 +-
+ scripts/dpkg-buildpackage.pl   |    2 +-
+ scripts/dpkg-distaddfile.pl    |    2 +-
+ scripts/dpkg-divert.pl         |    4 ++--
+ scripts/dpkg-genchanges.pl     |    2 +-
+ scripts/dpkg-gencontrol.pl     |    2 +-
+ scripts/dpkg-gensymbols.pl     |    2 +-
+ scripts/dpkg-parsechangelog.pl |    2 +-
+ scripts/dpkg-shlibdeps.pl      |    2 +-
+ scripts/dpkg-source.pl         |    2 +-
+ scripts/dpkg-vendor.pl         |    2 +-
+ scripts/po/ca.po               |    2 +-
+ scripts/po/de.po               |    4 ++--
+ scripts/po/dpkg-dev.pot        |    2 +-
+ scripts/po/fr.po               |    4 ++--
+ scripts/po/pl.po               |    2 +-
+ scripts/po/ru.po               |    2 +-
+ scripts/po/sv.po               |    2 +-
+ scripts/update-alternatives.pl |    4 ++--
+ src/statcmd.c                  |    2 +-
+ 35 files changed, 39 insertions(+), 39 deletions(-)
+
+commit 744f0bd2396bb345e4c975134dac50c1bd8c969c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Mar 11 08:25:30 2010 +0100
+
+    u-a: Mark strings for translation
+
+ scripts/update-alternatives.pl |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 5b7ce047b9376613fc6fe6a53890b9a4e0c9b732
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Thu Mar 11 23:00:49 2010 +0100
+
+    Spanish dselect translation
+
+ debian/changelog |    1 +
+ dselect/po/es.po |  138 +++++++++++++++++++++++++++---------------------------
+ 2 files changed, 70 insertions(+), 69 deletions(-)
+
+commit 3fe24e0475272eea6b72400571d6df5435d06a5b
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Mar 10 23:11:42 2010 +0100
+
+    Update German scripts translation
+    
+    Update to 498t.
+
+ scripts/po/de.po |   23 +++++++++++++++++------
+ 1 files changed, 17 insertions(+), 6 deletions(-)
+
+commit cd715df65ce8f35467197eecf8c63c9d15a272d6
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Mar 10 23:06:46 2010 +0100
+
+    Fix a build error
+
+ man/po/sv.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 1e84a1bd2c7b175cd15934345af61841a7435eda
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Mar 5 22:07:30 2010 +0100
+
+    Dpkg::Source::Package::V3::quilt: sanity check of series file
+    
+    A series file should only contain path pointing inside debian/patches/
+    and thus "../" are forbidden. Given that the path to patches appear
+    in the patch command-line with -B .pc/$path, a carefully crafted
+    path could lead patch to overwrite an arbitrary file outside of the
+    destination directory with a file provided in the source package.
+
+ debian/changelog                        |    3 +++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    1 +
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 2cb3d5d38fbe937280a8875b79a7247ac37a383d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Mar 5 18:19:33 2010 +0100
+
+    Dpkg::Source::Patch: add more sanity checks on patches
+    
+    patch will happily accept filenames like "../../../../stuff" and modify
+    files outside of the expected destination directory. To avoid problems
+    we error out when we detect a filename that contains "/../". Any leading
+    "../" is not a problem since patches are applied with -p1 and it's
+    stripped.
+    
+    We also verify that the file to be modified is not accessed through a
+    symlink as a compromised source package could also provide a symlink in
+    the orig.tar.gz that points outside of the destination directory.
+
+ debian/changelog             |    6 ++++++
+ scripts/Dpkg/Source/Patch.pm |   17 +++++++++++++++--
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+commit f2f4d4f671e9bbc911dfe81d2f22c31950811085
+Author: Peter Krefting <peterk@debian.org>
+Date:   Tue Mar 9 22:46:18 2010 +0100
+
+    Remove string debugging aid.
+
+ scripts/po/sv.po |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit b606edd00ebd78fb02fb0cf30b1b4346b2bb2d84
+Author: Peter Krefting <peterk@debian.org>
+Date:   Tue Mar 9 15:29:46 2010 +0100
+
+    Update Swedish translation.
+    
+    man/po/sv.po: 1799t0f0u.
+
+ man/po/sv.po |  633 +++++++++++++++++++++++++++++++++++++++++-----------------
+ 1 files changed, 452 insertions(+), 181 deletions(-)
+
+commit 149872cec4bdd7bb61325f0b716400743cc9f784
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Mar 8 21:39:00 2010 +0100
+
+    Update German translation of manual pages
+    
+    Update to 1799t.
+
+ man/po/de.po |   46 +++++++++++++++++++++++++++++++++++++---------
+ 1 files changed, 37 insertions(+), 9 deletions(-)
+
+commit c424454b64dc1cfd67f69045720d5d5e4f13f971
+Author: Peter Krefting <peterk@debian.org>
+Date:   Mon Mar 8 13:40:52 2010 +0100
+
+    Update Swedish translation.
+    
+    dselect/po/sv.po: 277t0f0u.
+    po/sv.po: 973t0f0u.
+    scripts/po/sv.po: 496t0f0u.
+
+ debian/changelog |    1 +
+ dselect/po/sv.po |   13 +++++--------
+ po/sv.po         |   30 +++++++++++++++---------------
+ scripts/po/sv.po |    6 +++---
+ 4 files changed, 24 insertions(+), 26 deletions(-)
+
+commit 245c885e128b78fcf068d3308f107868347953a2
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Mar 8 12:19:27 2010 +0100
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |  161 ++--
+ dselect/po/ca.po        |  171 ++--
+ dselect/po/cs.po        |  171 ++--
+ dselect/po/da.po        |  171 ++--
+ dselect/po/de.po        |   16 +-
+ dselect/po/dselect.pot  |  160 ++--
+ dselect/po/el.po        |  169 ++--
+ dselect/po/es.po        |  171 ++--
+ dselect/po/et.po        |  171 ++--
+ dselect/po/eu.po        |  171 ++--
+ dselect/po/fr.po        |  171 ++--
+ dselect/po/gl.po        |  171 ++--
+ dselect/po/hu.po        |  166 ++--
+ dselect/po/id.po        |  171 ++--
+ dselect/po/it.po        |  171 ++--
+ dselect/po/ja.po        |  171 ++--
+ dselect/po/ko.po        |  171 ++--
+ dselect/po/nb.po        |  171 ++--
+ dselect/po/nl.po        |  171 ++--
+ dselect/po/nn.po        |  169 ++--
+ dselect/po/pl.po        |  171 ++--
+ dselect/po/pt.po        |  171 ++--
+ dselect/po/pt_BR.po     |  171 ++--
+ dselect/po/ro.po        |  173 ++--
+ dselect/po/ru.po        |  171 ++--
+ dselect/po/sk.po        |  171 ++--
+ dselect/po/sv.po        |  171 ++--
+ dselect/po/tl.po        |  169 ++--
+ dselect/po/vi.po        |  171 ++--
+ dselect/po/zh_CN.po     |  171 ++--
+ dselect/po/zh_TW.po     |  169 ++--
+ man/po/dpkg-man.pot     | 1447 ++++++++++++++++++---------------
+ man/po/es.po            | 1650 ++++++++++++++++++++-----------------
+ man/po/fr.po            | 1717 ++++++++++++++++++++++----------------
+ man/po/hu.po            | 1593 ++++++++++++++++++++----------------
+ man/po/ja.po            | 1649 +++++++++++++++++++++----------------
+ man/po/pl.po            | 1715 ++++++++++++++++++++++----------------
+ man/po/pt_BR.po         | 1633 +++++++++++++++++++++----------------
+ man/po/ru.po            | 1627 ++++++++++++++++++++----------------
+ man/po/sv.po            | 1842 ++++++++++++++++++++++++------------------
+ po/ast.po               | 2034 ++++++++++++++++++++++++---------------------
+ po/bs.po                | 1857 +++++++++++++++++++++--------------------
+ po/ca.po                | 2028 ++++++++++++++++++++++++---------------------
+ po/cs.po                | 2023 ++++++++++++++++++++++++---------------------
+ po/da.po                | 2027 ++++++++++++++++++++++++---------------------
+ po/de.po                |  481 ++++++-----
+ po/dpkg.pot             | 1836 +++++++++++++++++++++--------------------
+ po/dz.po                | 2026 ++++++++++++++++++++++++---------------------
+ po/el.po                | 2039 ++++++++++++++++++++++++----------------------
+ po/eo.po                | 2020 ++++++++++++++++++++++++---------------------
+ po/es.po                | 2036 ++++++++++++++++++++++++---------------------
+ po/et.po                | 2006 +++++++++++++++++++++++---------------------
+ po/eu.po                | 2019 ++++++++++++++++++++++++---------------------
+ po/fr.po                | 2106 +++++++++++++++++++++++++----------------------
+ po/gl.po                | 2041 ++++++++++++++++++++++++----------------------
+ po/hu.po                | 2025 ++++++++++++++++++++++++---------------------
+ po/id.po                | 2017 ++++++++++++++++++++++++---------------------
+ po/it.po                | 2029 ++++++++++++++++++++++++---------------------
+ po/ja.po                | 2025 ++++++++++++++++++++++++---------------------
+ po/km.po                | 2021 ++++++++++++++++++++++++---------------------
+ po/ko.po                | 2025 ++++++++++++++++++++++++---------------------
+ po/ku.po                | 1917 ++++++++++++++++++++++---------------------
+ po/lt.po                | 1997 +++++++++++++++++++++++---------------------
+ po/mr.po                | 2020 ++++++++++++++++++++++++---------------------
+ po/nb.po                | 2028 ++++++++++++++++++++++++---------------------
+ po/ne.po                | 2027 ++++++++++++++++++++++++---------------------
+ po/nl.po                | 2025 ++++++++++++++++++++++++---------------------
+ po/nn.po                | 2022 ++++++++++++++++++++++++---------------------
+ po/pa.po                | 1932 ++++++++++++++++++++++---------------------
+ po/pl.po                | 2032 ++++++++++++++++++++++++---------------------
+ po/pt.po                | 2042 ++++++++++++++++++++++++----------------------
+ po/pt_BR.po             | 2043 ++++++++++++++++++++++++----------------------
+ po/ro.po                | 2040 ++++++++++++++++++++++++----------------------
+ po/ru.po                | 2029 ++++++++++++++++++++++++---------------------
+ po/sk.po                | 2035 ++++++++++++++++++++++++---------------------
+ po/sv.po                |  494 ++++++-----
+ po/th.po                | 2022 ++++++++++++++++++++++++---------------------
+ po/tl.po                | 2023 ++++++++++++++++++++++++---------------------
+ po/vi.po                | 2041 ++++++++++++++++++++++++----------------------
+ po/zh_CN.po             | 2022 ++++++++++++++++++++++++---------------------
+ po/zh_TW.po             | 2022 ++++++++++++++++++++++++---------------------
+ scripts/po/ca.po        | 1278 +++++++++++++++--------------
+ scripts/po/de.po        |    2 +-
+ scripts/po/dpkg-dev.pot | 1262 +++++++++++++++--------------
+ scripts/po/fr.po        | 1399 +++++++++++++++++--------------
+ scripts/po/pl.po        | 1343 ++++++++++++++++--------------
+ scripts/po/ru.po        | 1343 ++++++++++++++++--------------
+ scripts/po/sv.po        |   96 ++-
+ 88 files changed, 56461 insertions(+), 49783 deletions(-)
+
+commit c10ff1b95151394363767674faf7c8e400cc47ca
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Mar 8 08:11:59 2010 +0100
+
+    Dpkg::Deps::deps_compare(): fix a warning
+    
+    Commit 113533 broke it by using constants as keys: the name of the
+    constants were used as string literals due to "=>" when we wanted their
+    values to be used. Now we use the function notation of constants (since
+    that's how they are implemented) to avoid this.
+    
+    Reported-By: Jonathan Nieder <jrnieder@gmail.com>
+
+ scripts/Dpkg/Deps.pm |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 2cc0673bb09176d75016cd6a7db7dc6e97f4e6ad
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Mar 7 22:40:40 2010 +0100
+
+    Update German translation of manual pages
+    
+    Update to 1789t0f10u.
+
+ man/po/de.po | 2154 +++++++++++++++++++++++++++++++++++++---------------------
+ 1 files changed, 1367 insertions(+), 787 deletions(-)
+
+commit 5329030634fc3cb66f05b8d46f33047e7407a6fb
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Mar 7 22:31:08 2010 +0100
+
+    Correct a minor grammar issue
+
+ man/dpkg-gensymbols.1 |    2 +-
+ man/po/de.po          |    4 ++--
+ man/po/dpkg-man.pot   |    2 +-
+ man/po/es.po          |    4 ++--
+ man/po/fr.po          |    4 ++--
+ man/po/hu.po          |    4 ++--
+ man/po/ja.po          |    4 ++--
+ man/po/pl.po          |    4 ++--
+ man/po/pt_BR.po       |    4 ++--
+ man/po/ru.po          |    4 ++--
+ man/po/sv.po          |    4 ++--
+ 11 files changed, 20 insertions(+), 20 deletions(-)
+
+commit 50af2e7a7a3ad6f445df0f16337a546509d5157c
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Mar 7 22:04:47 2010 +0100
+
+    Update German scripts translation
+    
+    Update to 496t.
+
+ scripts/po/de.po | 1369 ++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 703 insertions(+), 666 deletions(-)
+
+commit 1b1c9e3decbe67ad7d2c49bde36c686d60dbf256
+Author: Peter Krefting <peterk@debian.org>
+Date:   Sun Mar 7 14:03:55 2010 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: 966t0f0u.
+    man/po/sv.po: 1671t42f66u.
+    scripts/po/sv.po: 496t0f0u.
+
+ man/po/sv.po     |  101 +++-
+ po/sv.po         | 1873 ++++++++++++++++++++++++++++--------------------------
+ scripts/po/sv.po | 1355 +++++++++++++++++++++------------------
+ 3 files changed, 1785 insertions(+), 1544 deletions(-)
+
+commit 690f099bf2d05bf2f02a5952cfc4dd4b6fe66d0a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 7 07:00:12 2010 +0100
+
+    man: Document “dpkg-query -l” abbreviated state information
+    
+    Closes: #383869
+    
+    Based-on-patch-by: Marc-Jano Knopp <pub_br_debian.org@marc-jano.de>
+
+ debian/changelog |    3 +++
+ man/dpkg-query.1 |   34 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 37 insertions(+), 0 deletions(-)
+
+commit 8e9ad1f1143db9dbbda74d45a4510d91ab039164
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 7 06:31:28 2010 +0100
+
+    man: Document the exit codes for dpkg-query
+    
+    Closes: #571798
+
+ debian/changelog |    1 +
+ man/dpkg-query.1 |    9 ++++++++-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+commit 1929eef9d7973dee574314349a648854762b1615
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 7 06:09:08 2010 +0100
+
+    man: Remove "VARIABLES" from "ENVIRONMENT" section name
+    
+    Unify with the rest of the man pages and use the most commonly used
+    section name.
+
+ man/dpkg-buildpackage.1 |    6 +++---
+ man/dpkg.1              |    2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 63b51af546ee55c9b0a1111c8f72a2c97bde45fb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Mar 7 06:06:20 2010 +0100
+
+    man: Document environment variables affecting dpkg-deb, dpkg and dselect
+    
+    The missing undocumented variables are TMPDIR for dpkg and dpkg-deb,
+    HOME for dselect and dpkg and PAGER for dpkg.
+    
+    Closes: #572836
+
+ debian/changelog |    2 ++
+ man/dpkg-deb.1   |    8 +++++++-
+ man/dpkg.1       |   13 ++++++++++++-
+ man/dselect.1    |    8 +++++++-
+ 4 files changed, 28 insertions(+), 3 deletions(-)
+
+commit 62668eb422853854976560949f95a5afcc6a8677
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 27 19:55:25 2010 +0100
+
+    Do an fsync on files written to disk
+    
+    This guarantees the file contents will be there in case of abrupt
+    program termination (due to crashes for example, or user intervention).
+    This also guarantees the atomicity of rename(2) calls.
+    
+    Closes: #430958
+    
+    Based-on-patch-by: Jean-Baptiste Lallement <jeanbaptiste.lallement@gmail.com>
+
+ debian/changelog          |    4 ++++
+ dpkg-deb/build.c          |    4 ++++
+ dpkg-split/join.c         |    5 +++++
+ dpkg-split/queue.c        |    4 ++++
+ lib/dpkg/triglib.c        |   12 ++++++++++++
+ src/archives.c            |    2 ++
+ src/statcmd.c             |    4 ++++
+ utils/start-stop-daemon.c |    4 ++++
+ 8 files changed, 39 insertions(+), 0 deletions(-)
+
+commit 9d81bf92ef791ad4644f36d3b5f7361e883134d6
+Author: Stefan Fritsch <sf@sfritsch.de>
+Date:   Sat Feb 27 06:31:47 2010 +0100
+
+    dpkg: Use posix_fadvise on non-Linux to speed up .list files loading
+    
+    When FIEMAP is not available try to use posix_fadvise() to request
+    the preloading of the .list files. A search with dpkg-query went
+    from 28 to 17 seconds, giving around 40% improvement.
+    
+    Closes: #557560
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ configure.ac     |    3 ++-
+ debian/changelog |    3 +++
+ src/filesdb.c    |   22 ++++++++++++++++++++++
+ 3 files changed, 27 insertions(+), 1 deletions(-)
+
+commit 8e31b0f0fb6b14e605407b824f4e2f1b0c12bab6
+Author: Morten Hustveit <morten@debian.org>
+Date:   Tue Nov 3 16:11:46 2009 +0100
+
+    dpkg: Use FIEMAP to sort .list files before scanning
+    
+    When running dpkg from a cold cache on a system where <admindir>/info/
+    lies on a hard disk, a lot of time is spent waiting for seeks between
+    (typically) thousands of files. This patch changes the behavior of
+    ensure_allinstfiles_available(), so that it accesses the packages in
+    the order of their .list files' physical locations on the hard disk,
+    greatly reducing drive head movements.
+    
+    The performance improvement is around 70% on my system: reinstalling
+    a simple package takes 8 seconds instead of 27 seconds. The caches were
+    dropped before each run, and 10 runs were done with consistent results.
+    The performance is identical to the previous patch using FIBMAP,
+    althought this one has the advantage of not needing root privileges.
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ configure.ac     |    2 +-
+ debian/changelog |    3 ++
+ src/filesdb.c    |   92 +++++++++++++++++++++++++++++++++++++++++++++++++++--
+ src/main.h       |    2 +
+ 4 files changed, 94 insertions(+), 5 deletions(-)
+
+commit b3ffabc01224d0317f774405722f679ee8bf3978
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 1 18:54:39 2010 +0100
+
+    dpkg: Switch SE Linux support to explicitly set path contexts
+    
+    The current code sets the default context and does not clean it on
+    conffile extraction or in case of unpack error, which causes the wrong
+    context to be applied to files under <admindir>.
+    
+    Switch the code to explicitly set the path context for newly extracted
+    and created files so that we don't need to care about unpack error
+    recovery or conffile extraction to restore the default context.
+    
+    Refactor the code into a new function and remove an unneeded setting of
+    the context just before the rename from <node>.dpkg-new to <node>.
+    
+    Closes: #498438
+
+ debian/changelog |    3 ++
+ src/archives.c   |  101 ++++++++++++++++++++++--------------------------------
+ 2 files changed, 44 insertions(+), 60 deletions(-)
+
+commit 9114e9d298a84dd7f1b1a27b4a377ddd4e7c2f8b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 23:38:51 2010 +0100
+
+    Use while () instead for () when using package iterators
+    
+    The code looks more balanced this way.
+
+ dselect/pkglist.cc |    6 +++---
+ src/depcon.c       |    3 ++-
+ src/enquiry.c      |    6 +++---
+ 3 files changed, 8 insertions(+), 7 deletions(-)
+
+commit 1d647dd23c14c0c340d36e44c687b2530c04ac97
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 23:34:11 2010 +0100
+
+    Release the package iterators when done
+    
+    This is a cause of memory leaks, but in these cases the program is about
+    to exit anyway, so we do it for correctness.
+
+ dselect/pkglist.cc |    2 ++
+ src/enquiry.c      |    2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 972d84487ace85a7f547c5b9d74be1a4253d1e79
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 26 00:01:28 2010 +0100
+
+    libdpkg: Move generic file locking from lock.c to file.c
+
+ lib/dpkg/Makefile.am    |    1 -
+ lib/dpkg/dbmodify.c     |    1 +
+ lib/dpkg/dpkg.h         |    6 ---
+ lib/dpkg/file.c         |   49 ++++++++++++++++++++++++++++-
+ lib/dpkg/file.h         |    4 ++
+ lib/dpkg/lock.c         |   81 -----------------------------------------------
+ lib/dpkg/trigdeferred.l |    1 +
+ po/POTFILES.in          |    1 -
+ 8 files changed, 54 insertions(+), 90 deletions(-)
+
+commit 2cede33e0736d48fd3a6bc85f59904a2825d7475
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 23:52:24 2010 +0100
+
+    libdpkg: Rename lock functions to have file_ as prefix
+    
+    Rename lock_file to file_lock, and unlock_file to file_unlock.
+
+ lib/dpkg/dbmodify.c     |    4 ++--
+ lib/dpkg/dpkg.h         |    4 ++--
+ lib/dpkg/lock.c         |   10 +++++-----
+ lib/dpkg/trigdeferred.l |    2 +-
+ 4 files changed, 10 insertions(+), 10 deletions(-)
+
+commit 8ff7219457b3c6e75006d18d4d1d39e2aa62205b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 27 23:13:45 2010 +0100
+
+    libdpkg: Add new trig_override_hooks to avoid exposing trigh
+    
+    Make trigh static and create an overrider function for it.
+
+ lib/dpkg/dpkg-db.h |    4 ++--
+ lib/dpkg/triglib.c |    9 ++++++++-
+ src/trigproc.c     |    2 +-
+ 3 files changed, 11 insertions(+), 4 deletions(-)
+
+commit 0f96ab4c3465785911cea9ec73c7c3fa9f4467b6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 27 21:48:24 2010 +0100
+
+    libdpkg: Add new trigdef_update_printf to avoid exposing trig_new_deferred
+    
+    Make trig_new_deferred static and create a printer function for it.
+
+ lib/dpkg/dpkg-db.h      |    3 +--
+ lib/dpkg/trigdeferred.l |   13 +++++++++++--
+ src/trigcmd.c           |    9 ++++-----
+ 3 files changed, 16 insertions(+), 9 deletions(-)
+
+commit 239b48d8a9a244061bc09d446b9ef0c3732342d6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 27 21:42:40 2010 +0100
+
+    libdpkg: Add new trigdef_set_methods to avoid exposing trigdef
+    
+    Make trigdef static and create a setter function for it.
+
+ lib/dpkg/dpkg-db.h      |    2 +-
+ lib/dpkg/trigdeferred.l |    9 ++++++++-
+ lib/dpkg/triglib.c      |    2 +-
+ src/trigcmd.c           |    3 ++-
+ 4 files changed, 12 insertions(+), 4 deletions(-)
+
+commit 76c8c559df929567c2ff9352617e4f116b761629
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 18:50:23 2010 +0100
+
+    libdpkg: Rename database lock functions to use modstatdb_ prefix
+    
+    Remove now redudant database suffix from the function names.
+
+ lib/dpkg/dbmodify.c |    8 ++++----
+ lib/dpkg/dpkg-db.h  |    7 ++-----
+ src/update.c        |    4 ++--
+ 3 files changed, 8 insertions(+), 11 deletions(-)
+
+commit 19f7a159d50b4f8ddadda1ede34c9fb9feed1526
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 18:46:13 2010 +0100
+
+    libdpkg: Move database lock functions to the modstatdb module
+
+ lib/dpkg/dbmodify.c |   35 +++++++++++++++++++++++++++++++++++
+ lib/dpkg/lock.c     |   30 ------------------------------
+ 2 files changed, 35 insertions(+), 30 deletions(-)
+
+commit 6ac32172670d15dba297f941c296576d2a3ca0a6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 18:39:14 2010 +0100
+
+    libdpkg: Remove unused showcopyright prototype
+    
+    This was forgotten in commit 06b64be7ba505c51f8673e7ba323629e9c60574d.
+
+ lib/dpkg/myopt.h |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+commit 3c32c3e2c71c21f6d7b0714986b58cb918856701
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 18:02:46 2010 +0100
+
+    libdpkg: Mark (de)compress_xz functions as not returning
+
+ lib/dpkg/compress.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit a727752bf9efeeaf0f06f78371c6d9f4085db4c3
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Mar 5 11:04:59 2010 +0100
+
+    dpkg-source: do not fallback to other source formats
+    
+    When the prerequesites of the current source format are not met,
+    simply error out instead of trying to fallback to other source formats.
+
+ debian/changelog       |    2 +
+ man/dpkg-source.1      |   12 ++++------
+ scripts/dpkg-source.pl |   49 +++++++++++++++++++++++------------------------
+ 3 files changed, 31 insertions(+), 32 deletions(-)
+
+commit e00c979a835e78b682c1cd1d55f14bbeb5566fdf
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Mar 1 08:34:10 2010 +0100
+
+    Add missing bug closure
+    
+    The rewrite of Dpkg::Checksums fixed a bug which has just been reported
+    as #572030. It was not able to deal with filenames with spaces.
+
+ debian/changelog |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 1ac633351d68c393128fb175ae7b03fd0a33cb5a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Feb 26 11:12:59 2010 +0100
+
+    Drop unused lintian override on dselect
+
+ debian/changelog                 |    2 ++
+ debian/dselect.lintian-overrides |    1 -
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit bd5c376383a09242f94ec29574072a2a4bc4dc89
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Feb 26 13:53:41 2010 +0100
+
+    Update Standards-Version to 3.8.4 (no changes needed).
+
+ debian/changelog |    1 +
+ debian/control   |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 7fd5e980f780c43e757432c7f0438e23c1e4d4cd
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Feb 26 13:50:42 2010 +0100
+
+    Introduce the libdpkg-perl package
+    
+    Clarify the status of the API in README.api.
+
+ debian/.gitignore                     |    1 +
+ debian/changelog                      |    1 +
+ debian/control                        |   39 ++++++++++++++++++++++++++++++--
+ debian/dpkg-dev.install               |    4 ---
+ debian/libdpkg-perl.docs              |    4 +++
+ debian/libdpkg-perl.install           |    4 +++
+ debian/libdpkg-perl.lintian-overrides |    2 +
+ doc/README.api                        |   18 +++++++++++----
+ 8 files changed, 61 insertions(+), 12 deletions(-)
+
+commit 0934601905ea4546a874a6558f7a2a2552cd62f1
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Feb 26 11:10:08 2010 +0100
+
+    Update POD documentation to indicate that it's using UTF-8 encoding
+    
+    Also fix many spelling errors spotted by lintian.
+
+ scripts/Dpkg/BuildOptions.pm           |    2 ++
+ scripts/Dpkg/Changelog.pm              |    2 ++
+ scripts/Dpkg/Changelog/Debian.pm       |    2 ++
+ scripts/Dpkg/Changelog/Entry.pm        |    2 ++
+ scripts/Dpkg/Changelog/Entry/Debian.pm |    2 ++
+ scripts/Dpkg/Changelog/Parse.pm        |    6 ++++--
+ scripts/Dpkg/Checksums.pm              |    2 ++
+ scripts/Dpkg/Compression.pm            |    2 ++
+ scripts/Dpkg/Compression/FileHandle.pm |    4 +++-
+ scripts/Dpkg/Compression/Process.pm    |    2 ++
+ scripts/Dpkg/Conf.pm                   |    2 ++
+ scripts/Dpkg/Control.pm                |    4 +++-
+ scripts/Dpkg/Control/Changelog.pm      |    2 ++
+ scripts/Dpkg/Control/Fields.pm         |    2 ++
+ scripts/Dpkg/Control/Hash.pm           |    6 ++++--
+ scripts/Dpkg/Control/Info.pm           |    2 ++
+ scripts/Dpkg/Control/Types.pm          |    2 ++
+ scripts/Dpkg/Deps.pm                   |    2 ++
+ scripts/Dpkg/IPC.pm                    |    4 +++-
+ scripts/Dpkg/Index.pm                  |    2 ++
+ scripts/Dpkg/Interface/Storable.pm     |    2 ++
+ scripts/Dpkg/Path.pm                   |    2 ++
+ scripts/Dpkg/Substvars.pm              |    2 ++
+ scripts/Dpkg/Vendor.pm                 |    2 ++
+ scripts/Dpkg/Vendor/Debian.pm          |    2 ++
+ scripts/Dpkg/Vendor/Default.pm         |    2 ++
+ scripts/Dpkg/Vendor/Ubuntu.pm          |    2 ++
+ scripts/Dpkg/Version.pm                |    2 ++
+ 28 files changed, 63 insertions(+), 7 deletions(-)
+
+commit 99d10e43d038693d59d455ec3402857fc57da034
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Feb 26 11:00:57 2010 +0100
+
+    Generate manual pages for perl modules with pod2man
+
+ configure.ac            |    1 +
+ debian/changelog        |    1 +
+ debian/dpkg-dev.install |    1 +
+ m4/dpkg-progs.m4        |    7 +++++++
+ scripts/Makefile.am     |   25 ++++++++++++++++++++++++-
+ 5 files changed, 34 insertions(+), 1 deletions(-)
+
+commit 4c933be6a53553a32722803f336ac37eded9fb9b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Feb 26 10:57:18 2010 +0100
+
+    Dpkg::BuildOptions: deal properly with undefined values in merge()
+
+ scripts/Dpkg/BuildOptions.pm |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit d66ba7eb665a471869a31789a80f40510f54ce30
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Feb 25 18:04:10 2010 +0100
+
+    dpkg-genchanges, dpkg-source: only split Binary field when it's too long
+    
+    Applying the substitution on short lines will split them too even though
+    they are not longer than 980 chars.
+
+ scripts/dpkg-genchanges.pl |    6 ++++--
+ scripts/dpkg-source.pl     |    6 ++++--
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+commit 08094e069d2ae05b50dc31ba64e3f3b865e4a8e0
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Feb 25 17:47:14 2010 +0100
+
+    Dpkg::Checksums: rewrite to provide an object-oriented API
+    
+    Many other modules and scripts are also updated to cope with the new API.
+    The API of the module should be stable from now on, hence increased
+    $VERSION to "1.00".
+
+ debian/changelog               |    1 +
+ scripts/Dpkg/Checksums.pm      |  384 +++++++++++++++++++++++++++++++++-------
+ scripts/Dpkg/Control/Fields.pm |    8 +-
+ scripts/Dpkg/Control/Hash.pm   |    4 +-
+ scripts/Dpkg/Source/Package.pm |   55 ++-----
+ scripts/dpkg-genchanges.pl     |   54 ++----
+ scripts/dpkg-scanpackages.pl   |   13 +-
+ scripts/dpkg-scansources.pl    |   28 +--
+ 8 files changed, 369 insertions(+), 178 deletions(-)
+
+commit af71e3484e0959d45dea24e254ab1d58010e8009
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Thu Feb 25 11:31:43 2010 +0100
+
+    German dselect translation update
+    
+    Update to 277t.
+
+ dselect/po/de.po |  161 ++++++++++++++++++++++++++----------------------------
+ 1 files changed, 77 insertions(+), 84 deletions(-)
+
+commit ac92038c7b29807cb81fd2cf7206117df2f00a3b
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Thu Feb 25 11:21:46 2010 +0100
+
+    German dpkg translation update
+    
+    Update to 966t.
+
+ po/de.po |  897 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 453 insertions(+), 444 deletions(-)
+
+commit 6d76c37aaa30f319b366e8b711558a9f8f2e7504
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Thu Feb 25 10:33:44 2010 +0100
+
+    Makefile.am: Fix EXTRA_DIST target
+    
+    Reflect rename of source.lintian-overrides in commit
+    d2b11fc77ab5e2d0208f7a60a21984726c481fe7.
+
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d2b11fc77ab5e2d0208f7a60a21984726c481fe7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 09:04:15 2010 +0100
+
+    Move source.lintian-overrides to debian/source/lintian-overrides
+
+ debian/changelog                                   |    1 +
+ .../lintian-overrides}                             |    0
+ 2 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 096167f3a0d86c11a04954ec14a05b91802cf7ab
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 09:02:59 2010 +0100
+
+    Reorganize the doc contents that goes into each package
+    
+    README.multicd only in dselect.
+    README.api only in development packages, dpkg-dev and libdpkg-dev.
+    triggers.txt only in dpkg-dev.
+
+ debian/changelog     |    4 ++++
+ debian/dpkg-dev.docs |    7 ++++++-
+ debian/dpkg.docs     |    3 ---
+ debian/dselect.docs  |    6 +++++-
+ 4 files changed, 15 insertions(+), 5 deletions(-)
+
+commit 9cdcabb0a7f7a38b8cd2292a48a98eb4eb5e458d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 07:04:53 2010 +0100
+
+    Add a new libdpkg-dev package with the headers and the static library
+    
+    The API should be considered volatile. Although this will help somewhat
+    people that are currently using the static library anyway, but have to
+    resort to building dpkg from source and using the headers and the static
+    library from the source tree.
+
+ Makefile.am                          |    3 +
+ configure.ac                         |    1 +
+ debian/.gitignore                    |    1 +
+ debian/changelog                     |    2 +
+ debian/control                       |   12 ++++++
+ debian/libdpkg-dev.docs              |    5 ++
+ debian/libdpkg-dev.install           |    3 +
+ debian/libdpkg-dev.lintian-overrides |    2 +
+ lib/dpkg/.gitignore                  |    1 +
+ lib/dpkg/Makefile.am                 |   69 +++++++++++++++++++++++-----------
+ lib/dpkg/libdpkg.pc.in               |   12 ++++++
+ 11 files changed, 89 insertions(+), 22 deletions(-)
+
+commit c406ca71c4fa7b8b49a240f33a36b69decfcc3c9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 30 20:57:00 2010 +0100
+
+    libdpkg: Require users to define LIBDPKG_VOLATILE_API
+    
+    The exposed API is not yet finished, make the users explicitly
+    acknowledge this fact by requiring them to define this preprocessor
+    symbol.
+
+ configure.ac      |    1 +
+ debian/changelog  |    2 ++
+ doc/README.api    |   11 +++++++++++
+ lib/dpkg/macros.h |    4 ++++
+ 4 files changed, 18 insertions(+), 0 deletions(-)
+
+commit fd8fb6f415a1fdf7ffff6f5ad26048be8ce28412
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 08:50:49 2010 +0100
+
+    libdpkg: Add missing DPKG_ATTR_VPRINTF when !HAVE_C_ATTRIBUTE
+
+ lib/dpkg/macros.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 8cf1ec6108d944eaecbdca7a9b52f92ee0db6a8b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 26 07:02:41 2009 +0200
+
+    Dynamically link against all external libraries
+    
+    This includes libbz2 and zlib for dpkg-deb and and libselinux for
+    dpkg on GNU/Linux.
+
+ debian/changelog              |    2 ++
+ debian/dpkg.lintian-overrides |    2 --
+ debian/rules                  |    6 +++---
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit fc39dea9ec2ed9528f39eb288e94932913f70bf8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 05:58:01 2010 +0100
+
+    dpkg-buildpackage: Do not set PKG_CONFIG_LIBDIR when cross-building
+    
+    The proper solution to this is to let the build system choose the
+    appropriate pkg-config binary for the build or host system in the
+    same way pkg.m4 is handling it now.
+    
+    Closes: #551118
+
+ debian/changelog             |    4 ++++
+ scripts/dpkg-buildpackage.pl |   11 -----------
+ 2 files changed, 4 insertions(+), 11 deletions(-)
+
+commit 54be54799fd73850a6e869e3a8e270b35a9f7384
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 05:09:25 2010 +0100
+
+    Use xz-utils instead of lzma for the lzma compression format
+    
+    We avoid unneeded dependencies on lzma in dpkg and dpk-dev.
+
+ debian/changelog            |    2 ++
+ debian/control              |    4 ++--
+ lib/dpkg/compress.c         |    4 ++--
+ lib/dpkg/compress.h         |    1 -
+ scripts/Dpkg/Compression.pm |    4 ++--
+ 5 files changed, 8 insertions(+), 7 deletions(-)
+
+commit 9bb208a8338253a1c9e1d0642cf1ef039a335951
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 1 05:16:33 2010 +0100
+
+    Add support for xz compressed data.tar member of binary packages
+    
+    Use the xz command from xz-utils to support xz-compressed binary
+    packages. Add xz-utils to dpkg's Pre-Depends.
+    
+    The xz format is very similar to the lzma format, but it fixes
+    some omissions in the latter, most notably a magic number for
+    identification by file(1).
+    
+    Closes: #542160
+    
+    Based-on-patch-by: Jonathan Nieder <jrnieder@gmail.com>
+
+ debian/changelog    |    3 +++
+ debian/control      |    2 +-
+ dpkg-deb/main.c     |    2 +-
+ lib/dpkg/compress.c |   28 ++++++++++++++++++++++++++++
+ lib/dpkg/compress.h |    2 ++
+ man/deb.5           |    1 +
+ man/dpkg-deb.1      |    4 ++--
+ 7 files changed, 38 insertions(+), 4 deletions(-)
+
+commit 8394c68c543ca4efc309f5c0917cc1d3998d5a79
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 04:35:48 2010 +0100
+
+    libdpkg: Change default lzma compression level from 9 to 6
+    
+    Set the default compression level low enough to produce packages
+    that require no more than 10 MiB of memory to decompress, by
+    lowering it to 6 from 9 (this matches xz internal default compression
+    level).
+    
+    Based-on-patch-by: Jonathan Nieder <jrnieder@gmail.com>
+
+ debian/changelog    |    2 ++
+ lib/dpkg/compress.c |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 6b5c4f96c0b1f1df0d4de71b13cf1a201fb52331
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 30 02:17:22 2010 +0100
+
+    libdpkg-perl: Make comp_prog and decomp_prog %COMP properties arrays
+    
+    This will allow storing arguments alongside the command names
+    themselves.
+
+ scripts/Dpkg/Compression.pm         |   16 ++++++++--------
+ scripts/Dpkg/Compression/Process.pm |    4 ++--
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+commit 7738fe5398d6610723c3def2ddc50eea1a73c327
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Feb 25 04:13:02 2010 +0100
+
+    Securely remove newly installed files when rolling-back a failed unpack
+    
+    When an error occurs during unpack the code is not securely removing
+    the newly installed files that might be still laying around, which
+    gives attackers a small window were they could hard link a file with
+    set id bits. This situation is pretty contrived as the attacked would
+    need to control the failing of the package during unpack.
+
+ debian/changelog |    1 +
+ src/archives.c   |    3 ++-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 716362c59e531883304a211afa61660608c214b3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Feb 23 09:49:12 2010 +0100
+
+    dpkg-name: Mark missing strings for translation
+
+ scripts/dpkg-name.pl |   23 +++++++++++++----------
+ 1 files changed, 13 insertions(+), 10 deletions(-)
+
+commit 06b64be7ba505c51f8673e7ba323629e9c60574d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Feb 23 00:08:12 2010 +0100
+
+    Remove --license and --licence options from tools
+    
+    The options are pretty useless and non-standard. The user can surely
+    cat a file from the installed package. In addition this option has not
+    worked ever on non-Debian systems as it's relying on the GPL-2 file
+    from the base-files Debian package. So remove it, and we get some code
+    reduction as a nice side-effect.
+
+ debian/changelog      |    1 +
+ dpkg-deb/main.c       |    8 +-------
+ dpkg-split/main.c     |    6 +-----
+ dselect/main.cc       |    6 +-----
+ lib/dpkg/Makefile.am  |    2 --
+ lib/dpkg/myopt-util.c |   44 --------------------------------------------
+ man/dpkg-deb.1        |    3 ---
+ man/dpkg-name.1       |    3 ---
+ man/dpkg-query.1      |    3 ---
+ man/dpkg-split.1      |    3 ---
+ man/dpkg-trigger.1    |    3 ---
+ man/dpkg.1            |    3 ---
+ man/dselect.1         |    7 +------
+ po/POTFILES.in        |    1 -
+ src/main.c            |    9 +--------
+ src/query.c           |   12 ++----------
+ src/statcmd.c         |    8 +-------
+ src/trigcmd.c         |    8 +-------
+ 18 files changed, 10 insertions(+), 120 deletions(-)
+
+commit 0b134aa7f39aebf07d94735d657b856089ab1074
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 22 19:09:51 2010 +0100
+
+    libdpkg: Do not include unused <sys/cdefs.h>
+
+ lib/dpkg/dpkg.h |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+commit 3516d105a427ad95c4d6bacb96030e4267c842fd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 22 19:07:50 2010 +0100
+
+    libdpkg: Always include <stddef.h>
+    
+    We need the definitions from the header, so conditionally including it
+    will only cause problems, we are also unconditionally including it in
+    other parts of the code, so it's safe to assume it's always available.
+
+ lib/dpkg/dpkg.h |    2 --
+ lib/dpkg/path.h |    2 --
+ 2 files changed, 0 insertions(+), 4 deletions(-)
+
+commit 5d1099ae03048739add513ceb52c1773bb9e0e7e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 22 19:03:38 2010 +0100
+
+    Header files should not include <config.h> and <compat.h>
+    
+    Those files are internal to the build, and should not be exposed, as
+    this will cause problems once we ship a libdpkg-dev, it also helps
+    having them explicitly in the .c and .cc files to avoid accidents like
+    the one fixed by commit 0043d020cf7aafe3e253c6d5c9afb93521971e60.
+
+ lib/dpkg/ar.h               |    3 ---
+ lib/dpkg/pkg-array.h        |    3 ---
+ lib/dpkg/pkg-list.h         |    3 ---
+ lib/dpkg/test.h             |    3 ---
+ lib/dpkg/test/t-ar.c        |    3 +++
+ lib/dpkg/test/t-buffer.c    |    3 +++
+ lib/dpkg/test/t-command.c   |    3 +++
+ lib/dpkg/test/t-macros.c    |    3 +++
+ lib/dpkg/test/t-path.c      |    3 +++
+ lib/dpkg/test/t-pkg-list.c  |    3 +++
+ lib/dpkg/test/t-pkg-queue.c |    3 +++
+ lib/dpkg/test/t-pkginfo.c   |    3 +++
+ lib/dpkg/test/t-string.c    |    3 +++
+ lib/dpkg/test/t-test.c      |    3 +++
+ lib/dpkg/test/t-varbuf.c    |    3 +++
+ lib/dpkg/test/t-version.c   |    3 +++
+ lib/dpkg/trigdeferred.l     |    1 +
+ utils/install-info.c        |    1 +
+ utils/start-stop-daemon.c   |    1 +
+ 19 files changed, 39 insertions(+), 12 deletions(-)
+
+commit c7ade13aa8ad04788efb9d8775f2f5ac6d484e98
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 22 05:11:29 2010 +0100
+
+    dpkg-deb: Change temporary directory suffix to dpkg-deb
+    
+    Makes it more obvious who created the directory.
+
+ dpkg-deb/build.c |    4 ++--
+ dpkg-deb/info.c  |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit bb6c5961bdf2b72b08bce367004dd1a65e71a725
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 22 05:09:47 2010 +0100
+
+    dpkg-deb: Make cu_info_prepare use ohshite instead of perror
+    
+    Make the other error paths call ohshite instead of just perror and
+    returning or exiting manually.
+
+ dpkg-deb/info.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 3f355904aa56fcb6c782d951d75bf136c3b8b81d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 22 05:08:00 2010 +0100
+
+    dpkg-deb: Use subproc functions instead of ad-hoc code
+    
+    This makes cu_info_prepare call ohshite in case of error, but that's
+    fine as the normal unwinding will happen in that case.
+
+ dpkg-deb/info.c |    7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+commit ffccc65580189420a0a64736bba0fb661de56dcb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 22 05:04:54 2010 +0100
+
+    Use mkdtemp and path_make_temp_template instead of tempnam and tmpnam
+    
+    Those two functions are deprecated, produce warnings at link time,
+    and should not be used as they are cause of possible race conditions.
+    
+    As a side effect we don't need to ensure the path is not existing as
+    mkdtemp has done that for us, which slightly simplifies the code.
+
+ debian/changelog |    3 +++
+ dpkg-deb/info.c  |   15 +++++----------
+ src/processarc.c |   24 +++++++++++++++---------
+ 3 files changed, 23 insertions(+), 19 deletions(-)
+
+commit 4c9d2d0eeed8b077a19da5bac5f2e8183e27e850
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 22 03:59:28 2010 +0100
+
+    libdpkg: Add new tempfile template generator function
+    
+    Use it instead of ad-hoc code in dpkg-deb.
+
+ dpkg-deb/build.c |   18 +++++-------------
+ lib/dpkg/path.c  |   31 ++++++++++++++++++++++++++++++-
+ lib/dpkg/path.h  |    4 +++-
+ 3 files changed, 38 insertions(+), 15 deletions(-)
+
+commit eb3cd7ba0b09fde59f8c0d0beca85293d4cc8617
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Feb 21 05:55:17 2010 +0100
+
+    dpkg: Switch code to use “struct pkg_queue” instead of “struct pkgqueue”
+    
+    The semantics of the pkq-queue module are more clear, so it makes the
+    code slightly easier to handle.
+
+ src/main.h     |   10 ----------
+ src/packages.c |   45 ++++++---------------------------------------
+ src/trigproc.c |   16 ++++++++--------
+ 3 files changed, 14 insertions(+), 57 deletions(-)
+
+commit 2e9ea71aeff38e53b56348b6b89b00a1fe0cb9e9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Feb 21 05:52:10 2010 +0100
+
+    libdpkg: Add a new pkg-queue module
+
+ lib/dpkg/Makefile.am        |    1 +
+ lib/dpkg/pkg-queue.c        |   90 +++++++++++++++++++++++++++++++++
+ lib/dpkg/pkg-queue.h        |   47 +++++++++++++++++
+ lib/dpkg/test/.gitignore    |    1 +
+ lib/dpkg/test/Makefile.am   |    4 +-
+ lib/dpkg/test/t-pkg-queue.c |  115 +++++++++++++++++++++++++++++++++++++++++++
+ po/POTFILES.in              |    1 +
+ 7 files changed, 258 insertions(+), 1 deletions(-)
+
+commit fcf328f4d1cbe613b6c9c57b33dabbffb28cbdf0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Feb 21 06:13:30 2010 +0100
+
+    libdpkg: Add unit test for pkg-list module
+
+ lib/dpkg/test/.gitignore   |    1 +
+ lib/dpkg/test/Makefile.am  |    4 ++-
+ lib/dpkg/test/t-pkg-list.c |   87 ++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 91 insertions(+), 1 deletions(-)
+
+commit 5d159b6b926c920026e29d010e40b5d5fa27d7b7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Feb 21 04:58:25 2010 +0100
+
+    libcompat: Update gettext.h from gettext 0.17
+    
+    This changes its license from LGPL2+ to GPL2+.
+
+ lib/compat/gettext.h |   26 ++++++++++++++++----------
+ 1 files changed, 16 insertions(+), 10 deletions(-)
+
+commit c3bafdbbd4cffd4569c000dbe2f35fe062d66b14
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Feb 24 21:07:47 2010 +0100
+
+    Use Debian instead of Debian GNU/Linux when referring to the distribution
+
+ debian/changelog                       |    2 ++
+ debian/copyright                       |    6 +++---
+ dselect/methods/ftp/README.mirrors.txt |    2 +-
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 14c7890f05e1d591050b80246ae6f296462c4fac
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Feb 21 00:53:44 2010 +0100
+
+    Update copyright statements
+    
+    Sort them by initial year. Add new holders, but for now only those which
+    do not need clarification, the rest will be added later.
+
+ debian/changelog |    1 +
+ debian/copyright |   25 +++++++++++++++----------
+ 2 files changed, 16 insertions(+), 10 deletions(-)
+
+commit 0a3fa9ced661545f7269f9061b8e24beeda5a0e8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Feb 21 00:32:49 2010 +0100
+
+    Add accent on Raphaël's name in several files
+
+ ChangeLog.old                          |  366 ++++++++++++++++----------------
+ THANKS                                 |    2 +-
+ debian/changelog                       |   66 +++---
+ debian/copyright                       |    2 +-
+ man/deb-symbols.5                      |    2 +-
+ man/dpkg-gensymbols.1                  |    2 +-
+ man/dpkg-source.1                      |    2 +-
+ man/po/ChangeLog.old                   |   12 +-
+ po/ChangeLog.old                       |    2 +-
+ scripts/Dpkg/Changelog.pm              |    2 +-
+ scripts/Dpkg/Changelog/Entry/Debian.pm |    2 +-
+ scripts/Dpkg/Control/Changelog.pm      |    2 +-
+ scripts/Dpkg/Control/Info.pm           |    2 +-
+ scripts/Dpkg/Path.pm                   |    2 +-
+ scripts/Dpkg/Substvars.pm              |    2 +-
+ scripts/po/ChangeLog.old               |    4 +-
+ scripts/t/600_Dpkg_Changelog.t         |    4 +-
+ scripts/t/600_Dpkg_Changelog/fields    |    4 +-
+ 18 files changed, 240 insertions(+), 240 deletions(-)
+
+commit ae4505efeccdb5bce465c4c9fa4aeabf0f22cf3c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 20 19:01:08 2010 +0100
+
+    build: Fix alignment of start-stop-daemon automake rules
+
+ utils/Makefile.am |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 2bae29f6c86c54eb3c91c524b995651313a3ca3c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 20 18:55:11 2010 +0100
+
+    build: Add new --without-install-info
+    
+    Other distributions already ship the GNU reimplementation of install-info
+    which is slated to completely replace the Debian one in the near future,
+    additionally the current install-info in dpkg is just a wrapper, so we
+    allow them to disable it at configure time.
+
+ configure.ac      |    9 +++++++++
+ debian/changelog  |    2 ++
+ utils/Makefile.am |    4 ++++
+ 3 files changed, 15 insertions(+), 0 deletions(-)
+
+commit 6985e4e0a8166a46804e2fd89021def7186b3a26
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 20 07:55:14 2010 +0100
+
+    build: Add new --without-update-alternatives
+    
+    Some distributions already ship their own reimplementation of
+    update-alternatives, so we allow them to disable our own.
+
+ configure.ac        |    9 +++++++++
+ debian/changelog    |    2 ++
+ man/Makefile.am     |    8 ++++++--
+ scripts/Makefile.am |    9 +++++++--
+ 4 files changed, 24 insertions(+), 4 deletions(-)
+
+commit 0e6bd5764027d36f1605f141ae306a1221a6c7dd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 20 19:11:24 2010 +0100
+
+    build: Move <sbindir>/install-info uninstallation to utils/
+    
+    Put it where install-info is being handled.
+
+ scripts/Makefile.am |    1 -
+ utils/Makefile.am   |    3 +++
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 7467cc776b0f9f402d9e73b69cc601f41332491a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 20 07:53:17 2010 +0100
+
+    build: Move <admindir>/alternatives directory creation to scripts/
+    
+    Put it close to the other alternatives file and directory handling.
+
+ scripts/Makefile.am |    1 +
+ src/Makefile.am     |    1 -
+ 2 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4da6f227798069945000aadf01c5eecc42f7f52e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 20 07:29:06 2010 +0100
+
+    dpkg: Set interesting environment variables on conffile shell spawn
+    
+    Set DPKG_SHELL_REASON, DPKG_CONFFILE_OLD and DPKG_CONFFILE_NEW
+    environment variables when spawning a shell for conffile
+    examination, so that the user can easily use them for scripting, or
+    as easy mnemonics.
+    
+    Suggested-by: Daniel Martin <Daniel.Martin@jhu.edu>
+    
+    Closes: #60329
+
+ debian/changelog |    3 +++
+ man/dpkg.1       |   12 ++++++++++++
+ src/configure.c  |   12 ++++++++++--
+ 3 files changed, 25 insertions(+), 2 deletions(-)
+
+commit 6f037003e8b96878b485efb7cbd1f846e3bf4e97
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 20 06:29:48 2010 +0100
+
+    dpkg: Always spawn a new shell on conffile prompt
+    
+    Stop supporting self backgrounding, remove DPKG_NO_TSTP environment
+    variable support, as we always spawn a shell now.
+    
+    This will allow setting useful environment variables for the user to use
+    with other tools. And is less confusing, as the action to go back to
+    dpkg does not depend on how dpkg was run.
+    
+    Closes: #38334
+
+ TODO                                |    2 -
+ debian/changelog                    |    3 ++
+ doc/README.feature-removal-schedule |    7 +++++
+ lib/dpkg/dpkg.h                     |    1 -
+ man/dpkg.1                          |    6 +---
+ src/configure.c                     |   50 +++++++++++++---------------------
+ 6 files changed, 30 insertions(+), 39 deletions(-)
+
+commit ecf0b87226f0db54551e2d34fca6fa45542f52a2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 20 06:16:11 2010 +0100
+
+    dselect: Use m_strdup instead of unchecked malloc + strcpy
+    
+    This would cause a segfault in an OOM situation.
+
+ dselect/main.cc |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 3e9f202bc125eeaf291c47613f5e42493077fd42
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 20 04:40:47 2010 +0100
+
+    libdpkg: Unify and namespace pkg-format functions and types
+    
+    Renames:
+    
+      struct lstitem → struct pkg_format_node
+      itemtype_t → enum pkg_format_type
+      alloclstitem() → pkg_format_node_new()
+      parseformat() → pkg_format_parse()
+      freeformat() → pkg_format_free()
+      show1package() → pkg_format_show()
+
+ dpkg-deb/info.c       |    4 ++--
+ lib/dpkg/pkg-format.c |   48 ++++++++++++++++++++++++------------------------
+ lib/dpkg/pkg-format.h |   10 +++++-----
+ src/query.c           |    8 ++++----
+ 4 files changed, 35 insertions(+), 35 deletions(-)
+
+commit 6ada98fe522ddfb197292e8d5fe8249eab320594
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 20 04:29:15 2010 +0100
+
+    libdpkg: Move package formatting support to a new pkg-format module
+    
+    Move declarations from dpkg-db.h to a new pkg-format.h, and rename
+    showpkg.c to pkg-format.c.
+
+ dpkg-deb/info.c                      |    1 +
+ lib/dpkg/Makefile.am                 |    2 +-
+ lib/dpkg/dpkg-db.h                   |    9 --------
+ lib/dpkg/{showpkg.c => pkg-format.c} |    3 +-
+ lib/dpkg/pkg-format.h                |   38 ++++++++++++++++++++++++++++++++++
+ po/POTFILES.in                       |    2 +-
+ src/query.c                          |    1 +
+ 7 files changed, 44 insertions(+), 12 deletions(-)
+
+commit 51323231082c34fe87771502593aae50e601ea04
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 19 19:20:11 2010 +0100
+
+    libdpkg: Revert license change to GPL2+
+    
+    The file lib/dpkg/showpkg.c used to be GPL-2+ with all commits with
+    copyright by Wichert Akkerman, until commit 6e1eb71ebffbbaca2e4bc when
+    it got changed to GPL-2 only.
+    
+    Changes afterwards by:
+    
+      Wichert Akkerman (trivial change):
+    
+        commit d5e656d9: Removal of an include.
+    
+      Adam Heath (trivial changes):
+    
+        commit dbcb7449: Reorder an include;
+        commit a1d9dc46: Add a missing “void”;
+                         Macroify the unused dumpchain to avoid a warning,
+                         code entirely removed in commit 07162068.
+    
+      Frank Lichtenheld (several changes)
+    
+      Pierre Habouzit (trivial change):
+    
+        commit 8ad47fe5: Add a 'z' to a format string.
+    
+      Guillem Jover (several changes)
+    
+    So with approval from Frank and myself, let's revert the license change
+    in 6e1eb71ebffbbaca2e4bc.
+    
+    Signed-off-by: Frank Lichtenheld <djpig@debian.org>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ lib/dpkg/showpkg.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 53171636dce1634f9dd3c96602e4fcafee025847
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 19 15:33:43 2010 +0100
+
+    libdpkg-perl: Fix Canonical copyright statement
+    
+    The work Colin did was under Canonical's time.
+    
+    Signed-off-by: Colin Watson <cjwatson@ubuntu.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ scripts/Dpkg/Vendor/Ubuntu.pm |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 18169a3ecac3c47d1c0cde2eaa93bce198d26421
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Feb 24 19:59:29 2010 +0100
+
+    dpkg-source, dpkg-genchanges: split Binary lines at less than 980 chars
+    
+    Splitting on the first space after 980 characters was not enough as
+    package names can be quite long and the real limit is not 1024 chars
+    but rather 992 chars for email exchange.
+    
+    Example of problematic changes:
+    http://lists.debian.org/debian-devel-changes/2010/02/msg01090.html
+    
+    We now split on the last space before the 980 chars limit.
+
+ scripts/dpkg-genchanges.pl |    2 +-
+ scripts/dpkg-source.pl     |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit d33fa8f197221c8422ee14dc36955e58febfa3d4
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Feb 24 17:26:36 2010 +0100
+
+    Dpkg::BuildOptions: provide an object oriented interface
+    
+    Also update the test-suite and dpkg-buildpackage to match the new API.
+    Increase $VERSION to 1.00 since it's supposed to be a stable API now.
+
+ debian/changelog                  |    1 +
+ scripts/Dpkg/BuildOptions.pm      |  179 ++++++++++++++++++++++++++++++------
+ scripts/dpkg-buildpackage.pl      |   10 +-
+ scripts/t/300_Dpkg_BuildOptions.t |   62 +++++++------
+ 4 files changed, 187 insertions(+), 65 deletions(-)
+
+commit 7fe00a9043f3f70c983c525d86007e36301cf08b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Feb 23 17:44:16 2010 +0100
+
+    Update Dpkg::Conf to use Dpkg::Interface::Storable
+    
+    And complete documentation. Fix dpkg-source to still display options
+    on a single line.
+
+ scripts/Dpkg/Conf.pm   |   69 ++++++++++++++++++++++++++++++++++++-----------
+ scripts/dpkg-source.pl |    2 +-
+ 2 files changed, 54 insertions(+), 17 deletions(-)
+
+commit bb70204c9816479ae56e3bb087f14d89bc05e466
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Feb 23 16:50:17 2010 +0100
+
+    dpkg-source: new options --extend-diff-ignore, --diff-ignore, --tar-ignore
+    
+    --extend-diff-ignore is a truly new option while the others are long names
+    for the existing -i and -I options.
+
+ debian/changelog       |    3 +++
+ man/dpkg-source.1      |   11 +++++++++--
+ scripts/dpkg-source.pl |    8 +++++---
+ 3 files changed, 17 insertions(+), 5 deletions(-)
+
+commit 07522de7d6957ba02ae195cf180141d93dccf60d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Feb 22 15:45:12 2010 +0100
+
+    Enhance dpkg's error message about programs missing from the PATH
+    
+    Triggered by https://bugs.maemo.org/show_bug.cgi?id=4103
+
+ src/help.c |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 302d1f1dcaa96fbfbfc8b5fe29babdd342a77f54
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Feb 21 22:54:43 2010 +0100
+
+    Update German scripts translation
+    
+    Update to 499t.
+
+ scripts/po/de.po |   10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+commit 61ab00f675dff4837c386075a0b835de263702fd
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Feb 21 11:58:40 2010 +0100
+
+    dpkg-source: new option --create-empty-orig in formats "2.0" and "3.0 (quilt)"
+    
+    With this option, dpkg-source will auto-create the main original tarball
+    when it's missing and when there are supplementary tarballs. This makes it
+    easier to bundle multiple software together.
+    
+    dpkg-source needs to be modified since the options have to be parsed
+    before can_build() is called.
+
+ debian/changelog                  |    4 ++++
+ man/dpkg-source.1                 |    6 ++++++
+ scripts/Dpkg/Source/Package.pm    |   15 ++++++++++-----
+ scripts/Dpkg/Source/Package/V2.pm |   21 ++++++++++++++++++---
+ scripts/dpkg-source.pl            |    7 +++----
+ 5 files changed, 41 insertions(+), 12 deletions(-)
+
+commit a17570383cdac5d13cff4c0e0469f22a8594ee23
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Feb 21 11:04:02 2010 +0100
+
+    dpkg-gencontrol, dpkg-genchanges, dpkg-source: support multiple -T options
+    
+    It allows to read substitution variables from multiple files.
+
+ debian/changelog           |    3 +++
+ man/dpkg-genchanges.1      |    4 +++-
+ man/dpkg-gencontrol.1      |    2 ++
+ man/dpkg-source.1          |    3 ++-
+ scripts/dpkg-genchanges.pl |    7 ++++---
+ scripts/dpkg-gencontrol.pl |    9 +++++----
+ scripts/dpkg-source.pl     |    4 +---
+ 7 files changed, 20 insertions(+), 12 deletions(-)
+
+commit 647dee469b94fac69cf98cc8bc36390df294137d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Feb 21 10:33:25 2010 +0100
+
+    dpkg-buildpackage: support passing arbitrary options to dpkg-source/dpkg-genchanges
+
+ debian/changelog             |    3 ++
+ man/dpkg-buildpackage.1      |    6 ++++
+ scripts/dpkg-buildpackage.pl |   65 +++++++++++++++++++----------------------
+ 3 files changed, 39 insertions(+), 35 deletions(-)
+
+commit 1ef2128855ddd6d454b0a122b6ebc602df2df433
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Feb 21 13:28:54 2010 +0100
+
+    Update German translation of manual pages
+    
+    Update to 1699t4f76u.
+
+ man/po/de.po |  118 ++++++++++++++++++++-------------------------------------
+ 1 files changed, 42 insertions(+), 76 deletions(-)
+
+commit 2c3a53b1ce74adddb713e9d6d4e5e6005ef2aba8
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Feb 21 13:18:17 2010 +0100
+
+    Add dpkg-gensymbols.1 to the translatable man page set
+    
+    and update all po files accordingly.
+
+ debian/changelog    |    3 +
+ man/po/de.po        | 2001 ++++++++++++++++++++++--------
+ man/po/dpkg-man.pot | 1688 ++++++++++++++++++++------
+ man/po/es.po        | 1828 ++++++++++++++++++++++------
+ man/po/fr.po        | 3400 +++++++++++++++++++++++++++++++++++----------------
+ man/po/hu.po        | 1839 ++++++++++++++++++++++------
+ man/po/ja.po        | 1842 ++++++++++++++++++++++------
+ man/po/pl.po        | 1911 +++++++++++++++++++++++------
+ man/po/po4a.cfg     |    5 +
+ man/po/pt_BR.po     | 1841 ++++++++++++++++++++++------
+ man/po/ru.po        | 1843 ++++++++++++++++++++++------
+ man/po/sv.po        | 1983 +++++++++++++++++++++++-------
+ 12 files changed, 15465 insertions(+), 4719 deletions(-)
+
+commit 164510479abf3dd0ccdee57adb647589a12733a9
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Feb 21 10:00:40 2010 +0100
+
+    Update German scripts translation
+    
+    Update to 499t.
+
+ scripts/po/de.po |   60 +++++++++++++++++++++++++++++++++++++++++++++--------
+ 1 files changed, 51 insertions(+), 9 deletions(-)
+
+commit c9ccd372fb9655493cd527c37e51a7bd035370cc
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Feb 21 02:39:44 2010 +0100
+
+    dpkg-gencontrol: now indicates which package is concerned by the substvars warnings
+    
+    Enhance Dpkg::Substvarst to be able to display a prefix before its
+    warnings and errors and make use of that facility in dpkg-gencontrol to be
+    explicit about where the substitution is done.
+
+ debian/changelog             |    2 ++
+ scripts/Dpkg/Control/Hash.pm |    4 ++--
+ scripts/Dpkg/Substvars.pm    |   28 +++++++++++++++++++++++-----
+ scripts/dpkg-gencontrol.pl   |    6 ++++--
+ 4 files changed, 31 insertions(+), 9 deletions(-)
+
+commit 51741049b5d8df648e6a08f663bf87c4b5f00529
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Feb 21 02:04:13 2010 +0100
+
+    dpkg-gencontrol: no longer warns if a substvar provided by -V is not used
+    
+    The warning is meant to catch unused substitutions coming from the file
+    and the file is package specific with debhelper.
+
+ debian/changelog           |    3 +++
+ scripts/dpkg-gencontrol.pl |    1 +
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 063f0565dcdf069b7f9624c237ed7fce10571887
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Feb 21 01:34:00 2010 +0100
+
+    dpkg-gencontrol: don't accept arch-specific dependencies in arch: all packages
+    
+    Since an architecture all package is shared on all architectures, its
+    dependency lines can't be simplified with the knowledge of the current host
+    architecture.
+
+ debian/changelog           |    2 ++
+ scripts/Dpkg/Deps.pm       |   25 +++++++++++++++++++++++++
+ scripts/dpkg-gencontrol.pl |   10 ++++++++--
+ 3 files changed, 35 insertions(+), 2 deletions(-)
+
+commit 278a12b941d8001edf66d61ea2fe7ee0eff9a4a8
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Feb 21 01:12:52 2010 +0100
+
+    Fix typo overriden -> overridden in multiple places
+
+ man/deb-extra-override.5 |    4 ++--
+ man/dpkg-architecture.1  |    2 +-
+ man/dpkg-buildpackage.1  |    4 ++--
+ man/po/de.po             |   10 +++++-----
+ man/po/dpkg-man.pot      |   10 +++++-----
+ man/po/es.po             |   10 +++++-----
+ man/po/fr.po             |   10 +++++-----
+ man/po/hu.po             |   10 +++++-----
+ man/po/ja.po             |   10 +++++-----
+ man/po/pl.po             |   10 +++++-----
+ man/po/pt_BR.po          |   10 +++++-----
+ man/po/ru.po             |   10 +++++-----
+ man/po/sv.po             |   10 +++++-----
+ 13 files changed, 55 insertions(+), 55 deletions(-)
+
+commit 0898ea0048fd94349f4bcf0068b22104d97217e3
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Feb 21 01:04:02 2010 +0100
+
+    Dpkg::Source: fix parsing of diff's output to be POSIX-compliant
+    
+    While parsing diff's output, accept any sentence that contains the word
+    differ (as specified by POSIX) to identify that binary files could
+    not be compared.
+
+ debian/changelog                 |    3 +++
+ scripts/Dpkg/Source/Functions.pm |    5 ++++-
+ scripts/Dpkg/Source/Patch.pm     |    2 +-
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+commit 1669e148b8568810b7dcfc2b3d94517c0aa6f4af
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 20 07:06:27 2010 +0100
+
+    po: Add missing files to POTFILES
+
+ po/POTFILES.in         |    1 +
+ scripts/po/POTFILES.in |    7 +++++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+commit b066610b394bfe06b8af5efb0a34c2b56c865705
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Feb 21 01:27:55 2010 +0100
+
+    dpkg-deb: Fix double free in --info
+    
+    Change the code to not increase cdlist, and instead index it, so that
+    we can free it at the end.
+    
+    Regression introduced in commit c264dd83d33250927fe165de5336145afdf99610.
+
+ dpkg-deb/info.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 1d22992583f0010007da14ce385e72ee13a9a84f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Feb 21 00:45:00 2010 +0100
+
+    Add $VERSION numbers to all perl modules
+    
+    Modules whose API should be stable have a version 1.00.
+    The modules with version 0.01 are expected to have further API
+    changes in the (near) future or are deemed to be useful mostly
+    for dpkg-dev's internal usage.
+
+ debian/changelog                         |    2 ++
+ scripts/Dpkg.pm                          |    2 ++
+ scripts/Dpkg/Arch.pm                     |    2 ++
+ scripts/Dpkg/BuildOptions.pm             |    2 ++
+ scripts/Dpkg/Changelog.pm                |    2 ++
+ scripts/Dpkg/Changelog/Debian.pm         |    2 ++
+ scripts/Dpkg/Changelog/Entry.pm          |    2 ++
+ scripts/Dpkg/Changelog/Entry/Debian.pm   |    2 ++
+ scripts/Dpkg/Changelog/Parse.pm          |    2 ++
+ scripts/Dpkg/Checksums.pm                |    2 ++
+ scripts/Dpkg/Compression.pm              |    3 +++
+ scripts/Dpkg/Compression/FileHandle.pm   |    2 ++
+ scripts/Dpkg/Compression/Process.pm      |    2 ++
+ scripts/Dpkg/Conf.pm                     |    2 ++
+ scripts/Dpkg/Control.pm                  |    2 ++
+ scripts/Dpkg/Control/Changelog.pm        |    2 ++
+ scripts/Dpkg/Control/Fields.pm           |    2 ++
+ scripts/Dpkg/Control/Hash.pm             |    2 ++
+ scripts/Dpkg/Control/Info.pm             |    2 ++
+ scripts/Dpkg/Deps.pm                     |    2 ++
+ scripts/Dpkg/ErrorHandling.pm            |    5 +++++
+ scripts/Dpkg/Exit.pm                     |    2 ++
+ scripts/Dpkg/Gettext.pm                  |    2 ++
+ scripts/Dpkg/IPC.pm                      |    2 ++
+ scripts/Dpkg/Index.pm                    |    2 ++
+ scripts/Dpkg/Interface/Storable.pm       |    2 ++
+ scripts/Dpkg/Path.pm                     |    2 ++
+ scripts/Dpkg/Shlibs.pm                   |    2 ++
+ scripts/Dpkg/Shlibs/Cppfilt.pm           |    3 +++
+ scripts/Dpkg/Shlibs/Objdump.pm           |    2 ++
+ scripts/Dpkg/Shlibs/Symbol.pm            |    3 +++
+ scripts/Dpkg/Shlibs/SymbolFile.pm        |    3 +++
+ scripts/Dpkg/Source/Archive.pm           |    2 ++
+ scripts/Dpkg/Source/Functions.pm         |    2 ++
+ scripts/Dpkg/Source/Package.pm           |    2 ++
+ scripts/Dpkg/Source/Package/V1.pm        |    2 ++
+ scripts/Dpkg/Source/Package/V2.pm        |    2 ++
+ scripts/Dpkg/Source/Package/V3/bzr.pm    |    2 ++
+ scripts/Dpkg/Source/Package/V3/custom.pm |    2 ++
+ scripts/Dpkg/Source/Package/V3/git.pm    |    2 ++
+ scripts/Dpkg/Source/Package/V3/native.pm |    2 ++
+ scripts/Dpkg/Source/Package/V3/quilt.pm  |    2 ++
+ scripts/Dpkg/Source/Patch.pm             |    2 ++
+ scripts/Dpkg/Substvars.pm                |    2 ++
+ scripts/Dpkg/Vars.pm                     |    2 ++
+ scripts/Dpkg/Vendor.pm                   |    2 ++
+ scripts/Dpkg/Vendor/Debian.pm            |    2 ++
+ scripts/Dpkg/Vendor/Default.pm           |    2 ++
+ scripts/Dpkg/Vendor/Ubuntu.pm            |    2 ++
+ scripts/Dpkg/Version.pm                  |    2 ++
+ 50 files changed, 107 insertions(+), 0 deletions(-)
+
+commit 5d1795408484778f7978062bb472c97b45a5cd10
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Feb 20 23:50:06 2010 +0100
+
+    Dpkg::Interface::Storable: load() and save() accept "-" for standard input/output
+    
+    Simplify code in Dpkg::Control::Info thanks to this.
+
+ scripts/Dpkg/Control/Info.pm       |    9 ++-----
+ scripts/Dpkg/Interface/Storable.pm |   37 ++++++++++++++++++++++++++---------
+ 2 files changed, 30 insertions(+), 16 deletions(-)
+
+commit 513baa2c1e20036528fd8fb986ef407d4aa8d415
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Feb 20 23:39:15 2010 +0100
+
+    Dpkg::Control::Info: provide an array representation of the object
+    
+    Add non-regression test for this interface.
+
+ scripts/Dpkg/Control/Info.pm |   16 +++++++++++++++-
+ scripts/t/700_Dpkg_Control.t |    4 +++-
+ 2 files changed, 18 insertions(+), 2 deletions(-)
+
+commit d13625a19aa5e49e71ea1c08317198c0094a0047
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Feb 20 22:39:33 2010 +0100
+
+    Add accent on my name in AUTHORS
+
+ AUTHORS |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 80c53458c34feb6db52fd1d11d53702b0a1e968f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Feb 20 22:37:08 2010 +0100
+
+    Add Jonathan Nieder and Modestas Vainius to THANKS
+
+ THANKS |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit cceb8fd624b534b9ed044f79976e86b0958608b4
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Feb 20 22:36:42 2010 +0100
+
+    Changelog entry for Dpkg::Interface::Storable introduction
+
+ debian/changelog |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit cdf4e5b5324b1196355542f30228c9ca26e5a7ad
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Feb 20 22:19:57 2010 +0100
+
+    Dpkg::Shlibs::*: rename parse() functions
+    
+    To avoid confusion with the parse() function expected by objects
+    inheriting from Dpkg::Interface::Storable (which is supposed to restore
+    the object from its serialized data), the various parse() functions
+    have been renamed into something more explicit like analyze() for
+    Dpkg::Shlibs::Objdump or parse_symbolspec() for Dpkg::Shlibs::Symbol.
+
+ scripts/Dpkg/Shlibs/Objdump.pm    |   10 +++++-----
+ scripts/Dpkg/Shlibs/Symbol.pm     |    2 +-
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    4 ++--
+ scripts/dpkg-gensymbols.pl        |    2 +-
+ scripts/t/200_Dpkg_Shlibs.t       |   16 ++++++++--------
+ 5 files changed, 17 insertions(+), 17 deletions(-)
+
+commit 1d70649516259db6bcfc468299c35f3113115fce
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Feb 20 21:53:15 2010 +0100
+
+    Update Dpkg::Shlibs::SymbolFile to use Dpkg::Interface::Storable
+    
+    In the process dump() is renamed output() and save() is dropped in favor
+    of the version provided by Dpkg::Interface::Storable. load() is
+    transformed in parse().
+
+ scripts/Dpkg/Shlibs/SymbolFile.pm |   45 +++++++++++++++---------------------
+ scripts/dpkg-gensymbols.pl        |   12 +++++-----
+ scripts/t/200_Dpkg_Shlibs.t       |    6 ++--
+ 3 files changed, 28 insertions(+), 35 deletions(-)
+
+commit aba76e6de21438ada3d6df542021d341fb499dcc
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Feb 19 19:45:40 2010 +0100
+
+    Update Dpkg::Substvars to use Dpkg::Interface::Storable
+    
+    The parse() function is replaced by load() for most users.
+
+ scripts/Dpkg/Substvars.pm      |   67 +++++++++++++++++++++++++++++-----------
+ scripts/dpkg-genchanges.pl     |    2 +-
+ scripts/dpkg-gencontrol.pl     |    2 +-
+ scripts/dpkg-source.pl         |    2 +-
+ scripts/t/750_Dpkg_Substvars.t |    2 +-
+ 5 files changed, 53 insertions(+), 22 deletions(-)
+
+commit 93f179a39dfd081e2a50dd258a322025004f6023
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Feb 19 19:32:33 2010 +0100
+
+    Dpkg::Compression::FileHandle: fix behaviour when the file is not open
+    
+    The syscall-like interface should not error out when the file has not been
+    opened, it must simply return failure codes.
+
+ scripts/Dpkg/Compression/FileHandle.pm |   21 +++++++++++++++------
+ 1 files changed, 15 insertions(+), 6 deletions(-)
+
+commit 6c8369aee32b5c99f45e60f62e6e07d26b2b42b8
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Feb 18 23:57:01 2010 +0100
+
+    Update Dpkg::Control::* to use Dpkg::Interface::Storable
+    
+    This implies renaming parse_fh() into parse() and parse() into load().
+    Update all scripts and modules using those methods.
+
+ scripts/Dpkg/Changelog/Parse.pm |    2 +-
+ scripts/Dpkg/Control/Hash.pm    |   27 ++++++++++-------------
+ scripts/Dpkg/Control/Info.pm    |   43 +++++++++++++++++---------------------
+ scripts/Dpkg/Index.pm           |    2 +-
+ scripts/Dpkg/Source/Package.pm  |    4 +--
+ scripts/Dpkg/Vendor.pm          |    4 +--
+ scripts/dpkg-genchanges.pl      |    4 +--
+ scripts/dpkg-name.pl            |    2 +-
+ scripts/dpkg-scanpackages.pl    |    2 +-
+ scripts/dpkg-scansources.pl     |    2 +-
+ scripts/t/700_Dpkg_Control.t    |    2 +-
+ 11 files changed, 40 insertions(+), 54 deletions(-)
+
+commit 9e7dfecce74f4d58de5be46b387b899489869876
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Feb 18 23:32:25 2010 +0100
+
+    Update Dpkg::Deps to make use of Dpkg::Interface::Storable
+    
+    Parsing part is only partially supported currently.
+
+ scripts/Dpkg/Deps.pm |   15 +++++++++++----
+ 1 files changed, 11 insertions(+), 4 deletions(-)
+
+commit 69e9305c848fb5f8d10a65be412cab26b9ed47ee
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Feb 18 23:19:41 2010 +0100
+
+    Update Dpkg::Changelog and Dpkg::Index to use Dpkg::Interface::Storable
+
+ scripts/Dpkg/Changelog.pm |   15 ++++++---------
+ scripts/Dpkg/Index.pm     |   22 ++--------------------
+ 2 files changed, 8 insertions(+), 29 deletions(-)
+
+commit 88b0ac732e075f487e7cfa0999326d2105f2ecbc
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Feb 18 22:26:32 2010 +0100
+
+    Dpkg::Interface::Storable: common convenience methods for serialization of objects
+
+ scripts/Dpkg/Interface/Storable.pm |  124 ++++++++++++++++++++++++++++++++++++
+ scripts/Makefile.am                |    1 +
+ scripts/po/POTFILES.in             |    1 +
+ 3 files changed, 126 insertions(+), 0 deletions(-)
+
+commit dc0c710c11fd13de98d8a0226a24f6ac8410c852
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Sat Feb 20 18:30:41 2010 +0100
+
+    German dpkg translation update
+    
+    Update to 969t.
+
+ po/de.po |  405 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 203 insertions(+), 202 deletions(-)
+
+commit d391f1d219dd2f521c7dc9b4fe92be1cbca5b1c6
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Feb 19 18:13:19 2010 +0100
+
+    Update German scripts translation
+    
+    Update to 492t.
+
+ scripts/po/de.po |   73 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 72 insertions(+), 1 deletions(-)
+
+commit 59c1513f8d83446e57dfc5e047840778601a8c60
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Feb 19 11:11:18 2010 +0100
+
+    Dpkg::Shlibs::Symbol::equals(): be explicit about default values of options
+
+ scripts/Dpkg/Shlibs/Symbol.pm |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit ee7dc84822d1bb2d84f8bfebafd233f62a8ee4f2
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Tue Feb 16 01:09:02 2010 +0200
+
+    Add -q option to dpkg-gensymbols, -c0 never fails AND shows a diff.
+    
+    The rationale behind this change that there should be a way to prevent
+    dpkg-gensymbols from failing if there are lost symbols but still show a diff at
+    the same time (which -c0 would not without this patch).
+    
+    Imagine a source package which builds multiple library binary packages that are
+    prone to arch-specific failures (quite typical for C++). Then dh_makeshlibs would
+    stop at the first dpkg-gensymbols failure giving only one diff. So it should be
+    possible to get diffs for all libraries in the single buildd run regardless of
+    check failures (using -c0). The fact that dpkg-gensymbols will never fail is
+    not that important if maintainer is pretty sure that symbols might be lost only
+    due to e.g. unmarked optional symbols or different mangling on other arches.
+    When updating to a new upstream, maintainer can set
+    DPKG_GENSYMBOLS_CHECK_LEVEL=1 in the environment to temporary restore checks.
+
+ debian/changelog           |    3 +++
+ man/dpkg-gensymbols.1      |   19 ++++++++++++-------
+ scripts/dpkg-gensymbols.pl |   37 ++++++++++++++++++++++++-------------
+ 3 files changed, 39 insertions(+), 20 deletions(-)
+
+commit 8bec4de4df57cf814169ece1ab555ac2b44ab983
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Wed Feb 3 04:36:03 2010 +0200
+
+    Dpkg::Shlibs:* add more abstract methods and clean up API.
+    
+    * Make SymbolFile::lookup_*(), SymbolFile::find_matching_pattern() accept both
+      symbol/pattern objects AND names.
+    * Make SymbolFile::lookup_*(), SymbolFile::find_matching_pattern() accept both
+      single soname and an array of sonames.
+    * Make SymbolFile::lookup_*(), SymbolFile::find_matching_pattern() detect
+      context and return either a hash of ( soname => .., symbol => .. ) or just a
+      scalar symbol reference. In either case, do NOT clone symbols.
+    * SymbolFile::get_{new,lost}_symbols() returns an array of { soname =>
+      .., symbol => .. } hashes where 'symbol' is a real reference, not a clone.
+    * Add new abstract methods and use them everywhere:
+      - SymbolFile::get_arch() - architecture the file is processed under/for.
+      - SymbolFile::get_sonames() - names of all sonames.
+      - SymbolFile::get_object() - soname object reference by name or object
+        reference.
+      - SymbolFile::get_symbols($soname) - if $soname is undef, returns ALL
+        symbol file symbols.
+      - SymbolFile::get_patterns($soname) - if $soname is undef, returns ALL
+        symbol file patterns.
+      - SymbolFile::get_symbol_object(Ssym, $soname) - a convenience method
+        combining both SymbolFile::lookup_{symbol,pattern} methods.
+    * Make SymbolFile::create_symbol() more flexible. Now it can parse a dummy spec
+      without minver.
+    * Remove Symbol::sclone() as no longer used and needed. Rename Symbol::dclone()
+      back to Symbol::clone().
+
+ scripts/Dpkg/Shlibs/Symbol.pm     |   20 +--
+ scripts/Dpkg/Shlibs/SymbolFile.pm |  264 ++++++++++++++++++++++---------------
+ scripts/dpkg-gensymbols.pl        |    2 +-
+ scripts/dpkg-shlibdeps.pl         |   23 ++--
+ scripts/t/200_Dpkg_Shlibs.t       |  114 +++++++---------
+ 5 files changed, 224 insertions(+), 199 deletions(-)
+
+commit 7c02a2ed867b18fba61bffaa4402dd2db230c9bc
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Tue Feb 2 23:58:24 2010 +0200
+
+    Dpkg::Shlibs::SymbolFile::add_symbol() reverse $sym, $soname argument order.
+    
+    This makes order consistent with lookup_{symbol,pattern}.
+
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    7 +++----
+ scripts/t/200_Dpkg_Shlibs.t       |    2 +-
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+commit d6778cf96d27b6bde6c76c8bda8f722e665fbcef
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Sat Jan 30 00:51:05 2010 +0200
+
+    Dpkg::Shlibs::Cppfilt: add and export cppfilt_demangle_cpp().
+    
+    This function is needed to unify how demangling of C++ symbols is done in
+    dpkg-dev. Passing 'auto' to cppfilt_demangle() each time is not very obvious
+    and error prone.
+
+ scripts/Dpkg/Shlibs/Cppfilt.pm      |    8 +++++++-
+ scripts/Dpkg/Shlibs/Symbol.pm       |    2 +-
+ scripts/t/190_Dpkg_Shlibs_Cppfilt.t |   14 +++++---------
+ 3 files changed, 13 insertions(+), 11 deletions(-)
+
+commit 6395b7668bdb469efbdb4a54be18f289543779d7
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Sat Jan 30 00:39:14 2010 +0200
+
+    Dpkg::Shlibs::Cppfilt: do not pass --no-verbose to c++filt(1).
+    
+    --no-verbose gives some unexpected results, e.g. C++ substitution in
+    _ZNSs9_M_mutateEmmm is not expanded according to the spec (i.e.
+    std::basic_string<> gets simplified and replaced by std::string).
+
+ scripts/Dpkg/Shlibs/Cppfilt.pm |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+commit 16e2ac799a696b0027627048f2cd4a05376c4224
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Fri Jan 29 20:06:16 2010 +0200
+
+    Dpkg::Shlibs::SymbolFile: refactor {patterns}{aliases}.
+    
+    * Get rid of "converter" field, it is hard to manage. Just use the first alias
+    instead.
+    * Avoid implicit creation of alias type hash in a couple of places.
+
+ scripts/Dpkg/Shlibs/SymbolFile.pm |   24 +++++++++++-------------
+ 1 files changed, 11 insertions(+), 13 deletions(-)
+
+commit 4a9c97d4d75e045ca3c1dbc5f3b4ce0ea0605cf0
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Fri Jan 29 19:29:17 2010 +0200
+
+    Dpkg::Shlibs::Symbol::equals(): improve, make more general.
+    
+    Now the function accepts named options and allows to optionally skip
+    comparision of versioning info (minver/dep_id) and tags. However,
+    by default, it compares all non-internal symbol properties.
+
+ scripts/Dpkg/Shlibs/Symbol.pm     |   33 +++++++++++++++++++++------------
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    2 +-
+ 2 files changed, 22 insertions(+), 13 deletions(-)
+
+commit 8ee083c253f510fea4dda7999e0792ee82ab128f
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Fri Jan 29 19:27:32 2010 +0200
+
+    Dpkg::Shlibs::Symbol: improve set_symbolname().
+    
+    Now it allows to set symbol template and autodetects if quotes are needed.
+
+ scripts/Dpkg/Shlibs/Symbol.pm |   15 +++++++++++----
+ 1 files changed, 11 insertions(+), 4 deletions(-)
+
+commit 2294cc63c0cae9fa95a2908b455c770d9c3feb40
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Sat Jan 23 18:55:54 2010 +0200
+
+    Dpkg::Shlibs::SymbolFile::get_new_symbols(): add option to return optional symbols.
+    
+    Also includes a bit of refactoring for relevant Dpkg::Shlibs::Symbol bits.
+    is_eligible_as_new() was renamed to is_legitimate() and its usage in
+    get_new_symbols() was expanded.
+
+ scripts/Dpkg/Shlibs/Symbol.pm     |    7 +++----
+ scripts/Dpkg/Shlibs/SymbolFile.pm |   28 +++++++++++++++-------------
+ 2 files changed, 18 insertions(+), 17 deletions(-)
+
+commit a87a15ad096884025195698fc76a9ab41a4ac425
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Sat Jan 23 18:52:55 2010 +0200
+
+    dpkg-gensymbols: add -a<arch> option.
+    
+    Use this option to generate a symbol file or diff for any architecture provided
+    its binaries are already available.
+
+ debian/changelog           |    1 +
+ man/dpkg-gensymbols.1      |    5 +++++
+ scripts/dpkg-gensymbols.pl |    4 ++++
+ 3 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 30e6d305a32cba540efa80dbdb8838a21333e0ed
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Sat Jan 23 18:27:21 2010 +0200
+
+    dpkg-gensymbols: add source version to the diff label.
+    
+    Source version is also useful to have in the output. Also format the string
+    according to dpkg-name rules.
+
+ debian/changelog           |    2 ++
+ scripts/dpkg-gensymbols.pl |    4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 64bd8420e602d12009dd045eb980d6ba7324b3e6
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Sat Jan 23 18:21:49 2010 +0200
+
+    Dpkg::Shlibs::SymbolFile::new(): do not allow undefined arch option.
+
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 23cbbfb41d2e13bd602f51274253195fee2a31ac
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Sat Jan 23 18:18:40 2010 +0200
+
+    Dpkg::Shlibs::Symbol::parse_tagspec(): allow extra spaces before symbol tag specification.
+    
+    Make it possible to reparse a symbol specification generated with
+    Dpkg::Shlibs::Symbol:get_symbolspec(1).
+
+ scripts/Dpkg/Shlibs/Symbol.pm |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 88aa36dc999ce6397dc9dfa2fc4100a113399d38
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 19 07:20:07 2010 +0100
+
+    Fix dpkg-query and dpkg-trigger to actually print a version on --version
+
+ debian/changelog |    1 +
+ src/query.c      |    3 ++-
+ src/trigcmd.c    |    3 ++-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+commit a7ab968e9e5e30103bdc9439374eb6df794578fd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 19 07:07:04 2010 +0100
+
+    dpkg-deb: Unify “failed read” strings by making control an argument
+
+ dpkg-deb/info.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 5e03628e920b726a1fc37df9f37b3dcfb6b3be71
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Fri Feb 19 07:03:58 2010 +0100
+
+    dpkg-deb: Fix resource leak in --info
+    
+    “dpkg-deb -I foo.deb” leaks the file handle for the package’s
+    control file. Check for read errors and close the file before
+    it falls out of scope.
+    
+    Found by cppcheck.
+    
+    Reported-by: Raphael Geissert <atomo64@gmail.com>
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+
+ debian/changelog |    4 ++++
+ dpkg-deb/info.c  |    4 ++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+commit fdedcf5168ab8ddb402fbfcb43891897d4adacfd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 19 06:58:31 2010 +0100
+
+    Remove done TODO items
+
+ TODO |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+commit c264dd83d33250927fe165de5336145afdf99610
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 19 06:56:59 2010 +0100
+
+    Fix small memory leaks related to scandir()
+    
+    The array of pointers returned by scandir and the pointers in it were
+    not being freed.
+
+ debian/changelog |    1 +
+ dpkg-deb/info.c  |    3 +++
+ lib/dpkg/myopt.c |    1 +
+ 3 files changed, 5 insertions(+), 0 deletions(-)
+
+commit f0496f91b55081c7990abb88d78299e9cb925ece
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 19 06:54:21 2010 +0100
+
+    dpkg: Fix unaligned bullet point on a comment
+    
+    This was making it confusing related to the parent bullets.
+
+ src/processarc.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e20fb748d3307a58e60ed5ea94d954151232c53d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jan 28 21:09:41 2010 +0100
+
+    Change dpkg-dev to Depend on perl instead of perl5 and perl-modules
+
+ debian/changelog |    1 +
+ debian/control   |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 167be722b2f01607a498104ad954d1d2d02a70f2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 03:18:44 2010 +0100
+
+    scripts: Unify fork error string
+
+ scripts/Dpkg/Changelog/Parse.pm |    2 +-
+ scripts/Dpkg/IPC.pm             |    2 +-
+ scripts/dpkg-gencontrol.pl      |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 45dc465f075075f481be7c3dfac38bf041fc9c0e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 03:17:50 2010 +0100
+
+    libdpkg-perl: Rename Dpkg::IPC::fork_and_exec() to Dpkg::IPC::spawn()
+
+ debian/changelog                    |    1 +
+ scripts/Dpkg/Compression/Process.pm |    8 ++++----
+ scripts/Dpkg/IPC.pm                 |   12 ++++++------
+ scripts/Dpkg/Shlibs/Cppfilt.pm      |   10 +++++-----
+ scripts/Dpkg/Source/Archive.pm      |   34 +++++++++++++++++-----------------
+ scripts/Dpkg/Source/Functions.pm    |    2 +-
+ scripts/Dpkg/Source/Package.pm      |    6 +++---
+ scripts/Dpkg/Source/Patch.pm        |    6 +++---
+ scripts/dpkg-scanpackages.pl        |    4 ++--
+ scripts/t/800_Dpkg_IPC.t            |   28 ++++++++++++++--------------
+ scripts/t/900_update_alternatives.t |    4 ++--
+ 11 files changed, 58 insertions(+), 57 deletions(-)
+
+commit bf4c40bc0cebcf937854aa259c6729da9c975768
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 14:56:39 2010 +0100
+
+    scripts/t: Add missing function prototypes
+
+ scripts/t/200_Dpkg_Shlibs/basictags.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 2b6d9bdd3fe969401470bc26f6b30982ac798ec3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 14:54:45 2010 +0100
+
+    scripts/t: Use void in function arguments to denote no arguments
+    
+    Fixes warnings due to old style function definition.
+
+ scripts/t/200_Dpkg_Shlibs/basictags.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit e9c9de59b76cbb62aa18d2aad4323d50afb9b6e4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 14:52:36 2010 +0100
+
+    scripts/t: Make symbol22_i386 function return void instead of void *
+
+ scripts/t/200_Dpkg_Shlibs/basictags.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8d8de3f2b90b5701d5d48dce50f6c344261ab680
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Feb 10 02:21:38 2010 +0100
+
+    dselect: Do not shadow display member in packagelist::deselect_one_of
+
+ dselect/pkgdepcon.cc |    8 +++++---
+ dselect/pkglist.h    |    2 +-
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+commit d6e92c09b52028007cbdf46177df0c41426a4348
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Feb 10 02:20:24 2010 +0100
+
+    dselect: Remove bogus falliblesubprocess prototype and make it static
+
+ dselect/dselect.h |    3 ---
+ dselect/method.cc |    2 +-
+ 2 files changed, 1 insertions(+), 4 deletions(-)
+
+commit f426b031ac858fa30ace69959a43b61fb40f4be9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Feb 10 02:13:30 2010 +0100
+
+    dselect: Use max/min instead of lesserint/greaterint
+
+ TODO                 |    1 -
+ dselect/basecmds.cc  |    2 +-
+ dselect/baselist.cc  |    6 +++---
+ dselect/basetop.cc   |   10 ++++------
+ dselect/dselect.h    |    3 ---
+ dselect/methlist.cc  |    2 +-
+ dselect/pkgcmds.cc   |    4 ++--
+ dselect/pkgdepcon.cc |    8 ++++----
+ dselect/pkgtop.cc    |   10 +++++-----
+ 9 files changed, 20 insertions(+), 26 deletions(-)
+
+commit 078c24defe2304d7f7a8012c2960b3f06ad0c3b0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 14:48:49 2010 +0100
+
+    dselect: Do not self shadow bind member
+
+ dselect/bindings.cc |   20 ++++++++++----------
+ 1 files changed, 10 insertions(+), 10 deletions(-)
+
+commit 86c90d927b55ca203dc8f666d45d0f941f5f9c90
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 14:47:00 2010 +0100
+
+    dselect: Do not shadow global thisname variable
+
+ dselect/basecmds.cc |   11 ++++++-----
+ dselect/pkglist.cc  |    9 +++++----
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+commit 5fef90a2960053e9b24304e2a2663fb1ed7dafb1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 14:57:31 2010 +0100
+
+    s-s-d: Do not shadow global variables
+
+ utils/start-stop-daemon.c |   19 +++++++++----------
+ 1 files changed, 9 insertions(+), 10 deletions(-)
+
+commit b61d3f48bb1d991da4da596c33d8b8b3454401d1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 15:26:00 2010 +0100
+
+    libdpkg: Do not shadow global compressor variable
+    
+    Rename compressor to compressor_array, as a side effect it makes the
+    variable name more clear.
+
+ lib/dpkg/compress.c |   14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+commit c1d7debca62261e31286bb656048dfb6be11ead5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 12:20:49 2010 +0100
+
+    libdpkg: Do not lose const qualifier on a cast in path_quote_filename
+
+ lib/dpkg/path.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ccd65150bbb0701eb32b27a6e262806c7b393d12
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 12:23:16 2010 +0100
+
+    libdpkg: Remove variable l shadowing a previous definition
+
+ lib/dpkg/myopt.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 5cf023f2d5bf609b6aba20aa5b5e285a91fbbbce
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 01:55:22 2010 +0100
+
+    libdpkg: Rename stat variable to st to avoid shadowing stat(2)
+
+ lib/dpkg/parse.c |   15 ++++++++-------
+ 1 files changed, 8 insertions(+), 7 deletions(-)
+
+commit 044386ffa7fb0c382eafff1a38470bfa549d00d0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 03:37:55 2010 +0100
+
+    dpkg-deb: Rename compressor to decompressor to avoid shadowing
+
+ dpkg-deb/extract.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit c58fa9fa3353bb9a1807c06898e8f55b98f0a8a1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 03:20:41 2010 +0100
+
+    dpkg: Reduce scope of status variable to avoid shadowing another one
+
+ src/processarc.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 7b40a7ecfc92fe325d01647c9137e8bd8263ae5c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 03:20:03 2010 +0100
+
+    dpkg: Include main.h to get the limiteddescription prototype
+
+ src/pkg-show.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 91976e8282ec31c132fa612676a4c85559ffa0ae
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 03:19:31 2010 +0100
+
+    dpkg: Make pkg_files_add_file() static
+
+ src/filesdb.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 77cae397a15baeca11c26aeb806b6be516e33d5f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 03:05:28 2010 +0100
+
+    libdpkg: Use varbuf_detach instead of ad-hoc code
+
+ lib/dpkg/dbmodify.c |    2 +-
+ lib/dpkg/fields.c   |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 70b29e3e9e2def64145c908bce4cb2922ddc8f19
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Feb 6 22:07:20 2010 +0100
+
+    dpkg: Do not print unambiguous epoch on dpkg file overwrite error
+
+ debian/changelog |    1 +
+ src/archives.c   |    4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit d756afcce4fa361871d36a469fe9f28f3cb1b10b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 5 20:08:28 2010 +0100
+
+    libdpkg: Use %zu instead of %d in varbuf_grow's internerr call
+
+ lib/dpkg/varbuf.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 812115a0f521f971c6f7ca77a8a8646f4b931435
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Feb 5 19:58:26 2010 +0100
+
+    libdpkg: Add and use new DPKG_ATTR_VPRINTF
+    
+    This new attribute marks a function that uses format strings with a
+    va_list argument.
+
+ lib/dpkg/dpkg.h   |    2 +-
+ lib/dpkg/macros.h |    1 +
+ lib/dpkg/varbuf.h |    3 ++-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+commit ab5ba0aba8e7b840b69d4e25ab51616352d659f8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 20:33:55 2010 +0100
+
+    Mark several functions with DPKG_ATTR_PRINTF
+
+ lib/dpkg/dpkg.h           |    3 ++-
+ utils/start-stop-daemon.c |    2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 496a321cd9db4113087bf32da3c0c098a6e0735c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 20:33:30 2010 +0100
+
+    Mark several functions with DPKG_ATTR_NORET
+
+ dpkg-deb/main.c      |    4 ++--
+ dpkg-split/main.c    |    4 ++--
+ dselect/main.cc      |    4 ++--
+ lib/dpkg/compress.c  |   26 +++++++++++++-------------
+ lib/dpkg/compress.h  |    6 ++++--
+ lib/dpkg/myopt.c     |    2 +-
+ lib/dpkg/parsedump.h |    2 +-
+ lib/dpkg/triglib.c   |    2 +-
+ src/main.c           |    4 ++--
+ src/query.c          |    4 ++--
+ src/statcmd.c        |    4 ++--
+ src/trigcmd.c        |    4 ++--
+ 12 files changed, 34 insertions(+), 32 deletions(-)
+
+commit 88e63fbdaa6d85b698eac06cfa209fa7908c7796
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 19:04:39 2010 +0100
+
+    Move DPKG_ATTR annotations from static declaration to the definition
+
+ dpkg-deb/extract.c        |    5 +++--
+ dselect/methparse.cc      |    9 +++++----
+ lib/dpkg/compress.c       |    5 +----
+ lib/dpkg/ehandle.c        |    4 +---
+ lib/dpkg/myopt.c          |    5 +----
+ lib/dpkg/subproc.c        |    4 +---
+ utils/start-stop-daemon.c |    9 ++-------
+ 7 files changed, 14 insertions(+), 27 deletions(-)
+
+commit b4284af48ce78dbfa34b20004b9e1ab268063188
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Feb 8 18:45:12 2010 +0100
+
+    build: Add more warnings to --enable-compiler-warnings
+
+ m4/dpkg-compiler.m4 |   12 +++++++++---
+ 1 files changed, 9 insertions(+), 3 deletions(-)
+
+commit 2e2f13d83ff3058ba31614148b2ce437cd1a44be
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Feb 16 13:51:54 2010 +0100
+
+    Move Frank to former maintainers
+
+ AUTHORS |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 58a94c85e41edf97e8ae8a93effca19639bc007b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Feb 16 13:48:07 2010 +0100
+
+    Ship deb-split man page in dpkg-dev package
+
+ debian/dpkg-dev.install |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 5332e0f654fc5e4c5608cb64b4a2af314371f010
+Author: Brian Murray <brian@ubuntu.com>
+Date:   Sat Feb 13 09:42:35 2010 +0100
+
+    Dpkg::Vendor::Ubuntu::find_launchpad_closes(): don't return duplicate bug numbers
+    
+    Ensure we don't return the same bug multiple times even if
+    it's closed multiple times.
+
+ debian/changelog              |    3 +++
+ scripts/Dpkg/Vendor/Ubuntu.pm |    6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+commit c1da9a4635aa1328d8a348fa8e0de24d36b8f5ef
+Author: Peter Krefting <peterk@debian.org>
+Date:   Sun Jan 31 20:05:22 2010 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: 965t0f0u.
+    man/po/sv.po: 1656t0f0u.
+    scripts/po/sv.po: 485t0f0u.
+
+ debian/changelog |    1 +
+ man/po/sv.po     |    9 ++++-----
+ po/sv.po         |   10 +++++-----
+ scripts/po/sv.po |   12 ++++++------
+ 4 files changed, 16 insertions(+), 16 deletions(-)
+
+commit 0494f95b4798fb1bc43d295a5b58321c46145a2b
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Sat Jan 30 10:36:29 2010 +0100
+
+    German dpkg translation update
+    
+    Update to 970t.
+
+ po/de.po | 1150 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 601 insertions(+), 549 deletions(-)
+
+commit 688155550152f585dc11a1e2f2ae5d82bf4127f4
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Sat Jan 30 10:34:11 2010 +0100
+
+    po/Makevars: Add ”--from-code=UTF-8“ to XGETTEXT_OPTIONS
+    
+    Otherwise xgettext will fail when it stumbles upon non-ASCII
+    characters in update-alternatives.pl, even if those are only
+    used in comments.
+
+ po/Makevars |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 3101899ce2ae65a60d212ba74eeb8cb5a6a76a69
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Sat Jan 30 09:57:54 2010 +0100
+
+    Fix po/POTFILES.in
+    
+    Reflect rename of compression.c to compress.c in commit
+    b645c397239cd637883122af4106f6d7de4c9729.
+
+ po/POTFILES.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6978d2e1d798e78a2d94e2b11b60c3c2210ae529
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Sat Jan 30 09:14:01 2010 +0100
+
+    French  manpages translation update
+
+ man/po/fr.po |  316 ++++++++++++++++++++++++----------------------------------
+ 1 files changed, 131 insertions(+), 185 deletions(-)
+
+commit b2e8423c9ebf500a16b2f86fc11e4ac1571a1fa0
+Author: Milo Casagrande <milo@ubuntu.com>
+Date:   Sat Jan 30 08:22:46 2010 +0100
+
+    Italian translation update
+
+ debian/changelog |    1 +
+ po/it.po         |   92 +++---------------------------------------------------
+ 2 files changed, 6 insertions(+), 87 deletions(-)
+
+commit cca8a30648658e43a4dab95e6643032e388a5372
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu Jan 28 21:51:36 2010 +0100
+
+    Update German translation of manual pages
+    
+    Update to 1682t.
+
+ man/po/de.po |   15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
+
+commit 94917bfa77ac0295089f4f6c8437a83dec4f6c1c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jan 27 20:04:14 2010 +0100
+
+    dpkg-deb: Close file descriptors in info_spew()
+
+ dpkg-deb/info.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 20493d176dd177ae97ad5985e3b9d7ba10e197af
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jan 27 17:30:21 2010 +0100
+
+    dpkg-deb: Use fd_fd_copy instead of stream_fd_copy
+    
+    Avoid a usage of stdio based buffer I/O, to try to get rid of it at some
+    point in the future.
+
+ dpkg-deb/info.c |    9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+commit f291751922c0457b936fc693ba1b5ea4d737737d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jan 27 19:35:49 2010 +0100
+
+    libdpkg: Let backends decide default compression level
+    
+    When compressing packages with gzip or bzip2, the tradeoff is
+    clear: a better compression ratio for a distributed package is
+    generally worth spending some extra time at build time. Since
+    better compressed packages are not much more inconvenient to
+    decompress at all, dpkg defaults to the maximum compression level
+    and developers rarely need to override that default.
+    
+    On the other hand, LZ77-based decompressors use more memory at
+    decompression time for more tightly compressed packages, so the
+    maximum compression level of ‘9’ (which uses more than 32 MiB
+    of memory to decompress) can be too high.
+    
+    With this patch, instead of defaulting to ‘9’, the compress_filter()
+    function sets the level to the backend default stored in the compressor
+    structure if the level is ‘-1’. All backends currently default to ‘9’
+    for now; no change in behavior is intended.
+    
+    Based-on-patch-by: Jonathan Nieder <jrnieder@gmail.com>
+
+ lib/dpkg/compress.c |    6 +++++-
+ lib/dpkg/compress.h |    1 +
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 95b61194f3e3b737c67d91083d1d51bd421a42e8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jan 27 18:59:22 2010 +0100
+
+    libdpkg: Centralize compressor knowledge into the compress module
+    
+    Create a new structure to hold the name, extension, and compress and
+    decompress methods for each compressor. Add new functions to find
+    the correct compressor by name and extension. This way we have the
+    information localized in a single place.
+
+ dpkg-deb/build.c    |   25 +++---------
+ dpkg-deb/dpkg-deb.h |    5 +--
+ dpkg-deb/extract.c  |   27 +++++--------
+ dpkg-deb/main.c     |   13 +-----
+ lib/dpkg/compress.c |  103 +++++++++++++++++++++++++++++++++++++--------------
+ lib/dpkg/compress.h |   22 +++++++---
+ 6 files changed, 110 insertions(+), 85 deletions(-)
+
+commit 6a52f13b5ad0b3058eeb46383aeecee38ebc664f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jan 28 17:10:12 2010 +0100
+
+    Add changelog entry for compression code rework
+
+ debian/changelog |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 8b75347a0a86edf105fd0f0ba61cc56639879601
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 22 22:25:53 2010 +0100
+
+    libdpkg: Check for errors from compression opening functions
+    
+    Those functions might fail mostly due to insufficient memory, let's
+    catch those and bail out, instead of segfaulting on the NULL streams.
+
+ lib/dpkg/compress.c |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit fe783c5410d9e63957a796ad1e0d923e9969f2db
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 22 18:53:15 2010 +0100
+
+    libdpkg: Check for output errors when closing files on (de)compression
+    
+    A gzclose call has the same potential for errors as a write,
+    since the compressor needs to flush its buffers before closing
+    its output file. The same applies to BZ2_bzclose, but
+    unfortunately libbz2's gzio-style API does not expose the error
+    code, but we can use the native-style close function which does
+    return the error code.
+    
+    Similarly, explicitly closing a file descriptor can reveal errors
+    writing out buffered data.
+    
+    Closing input handles, on the other hand, would be a waste of
+    time: all it would accomplish is to free some resources held by a
+    process that is about to exit anyway.
+    
+    Based-on-patch-by: Jonathan Nieder <jrnieder@gmail.com>
+
+ lib/dpkg/compress.c |   38 ++++++++++++++++++++++++++++++++++----
+ 1 files changed, 34 insertions(+), 4 deletions(-)
+
+commit a49c77b5f90c440d62df0865689ac211a4afb410
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 22 13:58:42 2010 +0100
+
+    libdpkg: Give compress description variables more meaningful names
+    
+    Rename desc to desc_fmt and v to desc.
+
+ lib/dpkg/compress.c |   32 ++++++++++++++++----------------
+ 1 files changed, 16 insertions(+), 16 deletions(-)
+
+commit c423af068b17a2025ec1333f62928d27e2f75b8b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 22 13:52:58 2010 +0100
+
+    libdpkg: Fix indentation in compress.c
+
+ lib/dpkg/compress.c |  102 +++++++++++++++++++++++++-------------------------
+ 1 files changed, 51 insertions(+), 51 deletions(-)
+
+commit 5175e3882d2608781adaba833b5adbb932a230b2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jan 21 16:41:24 2010 +0100
+
+    libdpkg: Refactor (de)compression code into individual functions
+    
+    Move compress and decompress code from compress_cat and decompress_cat
+    to new functions for each compressor. And define them to use either the
+    command or the library (if available) to hide the implementation from
+    the callers and to make the code easier to read.
+    
+    Based-on-patch-by: Jonathan Nieder <jrnieder@gmail.com>
+
+ lib/dpkg/compress.c |  354 ++++++++++++++++++++++++++++++++-------------------
+ 1 files changed, 222 insertions(+), 132 deletions(-)
+
+commit feb248df15c99f09bc208f1c9adace0e84dbcb06
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jan 27 18:26:47 2010 +0100
+
+    libdpkg: Handle compression level as an integer
+    
+    Change compress_filter() to take an int for compress_level, and add
+    a new function in dpkg-deb to parse and validate the argument option
+    to not accept bogus values.
+
+ debian/changelog    |    1 +
+ dpkg-deb/build.c    |    4 ++--
+ dpkg-deb/dpkg-deb.h |    2 +-
+ dpkg-deb/main.c     |   20 ++++++++++++++++++--
+ lib/dpkg/compress.c |   17 +++++++++--------
+ lib/dpkg/compress.h |    2 +-
+ 6 files changed, 32 insertions(+), 14 deletions(-)
+
+commit 4d89c0703ac4295fcd3a134a529d87a1960685d5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 24 23:14:21 2010 +0100
+
+    libdpkg: Rename (de)compress_cat funtions to (de)compress_filter
+
+ dpkg-deb/build.c    |    4 ++--
+ dpkg-deb/extract.c  |    2 +-
+ lib/dpkg/compress.c |    8 ++++----
+ lib/dpkg/compress.h |   11 ++++++-----
+ 4 files changed, 13 insertions(+), 12 deletions(-)
+
+commit ad010e125f0d6bf963075add53571c38851152bc
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 24 23:14:04 2010 +0100
+
+    libdpkg: Rename compress_type_cat to compress_type_none
+
+ dpkg-deb/build.c    |    2 +-
+ dpkg-deb/extract.c  |    2 +-
+ dpkg-deb/main.c     |    2 +-
+ lib/dpkg/compress.c |    6 +++---
+ lib/dpkg/compress.h |    2 +-
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 3ad109046c075d0878902d472215b4ac55401e15
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 24 23:12:25 2010 +0100
+
+    dpkg-deb: Rename DATAMEMBER_CAT to DATAMEMBER
+
+ dpkg-deb/build.c    |    2 +-
+ dpkg-deb/dpkg-deb.h |    2 +-
+ dpkg-deb/extract.c  |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit c2b6dbb013c836a70fa62ce85bd0e862b24a2944
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 22 13:18:41 2010 +0100
+
+    libdpkg: Use snprintf to generate the compression argument
+
+ lib/dpkg/compress.c |   17 +++++++----------
+ 1 files changed, 7 insertions(+), 10 deletions(-)
+
+commit 24b728b32e69d9398ec03ed8a62512912aa65a75
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 22 01:10:17 2010 +0100
+
+    libdpkg: Switch fd_fd_filter() to use the command module
+    
+    This allows the code to pass arbitrary arguments, and makes it easier to
+    extend in the future.
+
+ lib/dpkg/compress.c |   34 +++++++++++++++++++++++-----------
+ 1 files changed, 23 insertions(+), 11 deletions(-)
+
+commit 5050748f1a6bb0c0728f8c07f9058d545c80d7e0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 8 18:02:09 2010 +0100
+
+    Use new command module instead of ad-hoc code
+
+ dselect/method.cc |   67 ++++++++++++++-------------
+ lib/dpkg/dpkg.h   |    1 -
+ src/archives.c    |   33 ++++++--------
+ src/help.c        |  128 ++++++++++++++++++++++++----------------------------
+ src/main.c        |   52 ++++++---------------
+ 5 files changed, 123 insertions(+), 158 deletions(-)
+
+commit 08c0dd25295038894d74f9a0ce52fe06727c1332
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 8 16:48:17 2010 +0100
+
+    libdpkg: New command module
+    
+    This should ease refactoring some of the duplicate code dealing with
+    command execution. It will also make the code clearer.
+
+ lib/dpkg/Makefile.am      |    1 +
+ lib/dpkg/command.c        |  184 +++++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/command.h        |   54 +++++++++++++
+ lib/dpkg/test/.gitignore  |    1 +
+ lib/dpkg/test/Makefile.am |    2 +
+ lib/dpkg/test/t-command.c |  140 ++++++++++++++++++++++++++++++++++
+ po/POTFILES.in            |    1 +
+ 7 files changed, 383 insertions(+), 0 deletions(-)
+
+commit 2dca970eab6f6a1761f4a3dc2de7e016a75e33f8
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Thu Jan 7 00:47:28 2010 +0100
+
+    libdpkg: Reorder fd_fd_filter() function arguments
+    
+    Put the compression options string last so it can be replaced with
+    variable arguments for the command to execute.
+    
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ lib/dpkg/compress.c |   17 ++++++++---------
+ 1 files changed, 8 insertions(+), 9 deletions(-)
+
+commit 13f718edd32d454127786efdaf512a4ccfdf0c58
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jan 28 16:30:12 2010 +0100
+
+    dpkg: Use a literal string for the archive file pattern
+    
+    Remove now unused macro.
+
+ lib/dpkg/dpkg.h |    2 --
+ src/archives.c  |    2 +-
+ 2 files changed, 1 insertions(+), 3 deletions(-)
+
+commit f096d6220a4ee006e605e706bc4cdd73724b96df
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 8 17:58:52 2010 +0100
+
+    dpkg: Remove scriptname argument from do_script()
+
+ src/help.c |   13 +++++--------
+ 1 files changed, 5 insertions(+), 8 deletions(-)
+
+commit 04b8371625cee9f6bd2ae5fef1a5f51dd6845c17
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jan 7 22:54:16 2010 +0100
+
+    dpkg: Move exec error string from do_script argument to ohshite call
+
+ src/help.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit c482ae4999b24202cc1efac9dce4ada8716586c0
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Wed Jan 6 14:21:32 2010 +0100
+
+    libdpkg: Check for write errors during decompression
+    
+    An unnoticed write error is unlikely to cause major problems,
+    since the process on the other end still has a chance to notice
+    the mangled stream. But it is worth fixing, especially because
+    the writing end can give a better error message.
+    
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ lib/dpkg/compress.c |   12 ++++++++----
+ 1 files changed, 8 insertions(+), 4 deletions(-)
+
+commit c9d8174c1b78db5ada2d77e85212736034a20768
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Wed Jan 6 14:05:34 2010 +0100
+
+    libdpkg: Do not handle EINTR in compression code
+    
+    The current callers for the compression code do not install signal
+    handlers, so there is no occasion to test the EINTR handling.
+    Perhaps for this reason, since commit 7bf6e0 (add support for using
+    libz, 2000-12-09) when the current compression/decompression code
+    was introduced, the EINTR handling has been broken in a number of
+    ways:
+    
+     * Interrupted reads were treated as end of file until very recently.
+     * Interrupted writes during decompression cause portions of the
+       output to be discarded.
+     * Interrupted writes during compression are treated as errors,
+       unless the interruption happens before any data from the output
+       buffer can be consumed.
+    
+    Since zlib at least cannot recover from an interrupted write anyway,
+    it seems better to always treat EINTR like any other error. For now
+    callers should specify the SA_RESTART flag when installing signal
+    handlers for correct behavior on System V style operating systems
+    (such as Solaris).
+    
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ lib/dpkg/compress.c |   28 +++++++++-------------------
+ 1 files changed, 9 insertions(+), 19 deletions(-)
+
+commit 5e682abe5e9cb1added43d34a0865c000b5701aa
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jan 20 16:57:06 2010 +0100
+
+    libdpkg: Move read calls inside (de)compression loops
+
+ lib/dpkg/compress.c |   40 ++++++++++++++++++++++++++++++++--------
+ 1 files changed, 32 insertions(+), 8 deletions(-)
+
+commit 5169de76c4a78b3fe694ea452b3f34a19ea5b637
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Sun Jan 17 16:32:56 2010 +0100
+
+    libdpkg: Properly handle read errors on (de)compression
+    
+    Instead of using the error handling code, failed reads are being
+    treated as end of file. This applies only when using zlib and libbz2.
+    In practice it probably has not caused problems because I/O errors
+    are rare, and often the program at the other end of the pipe can
+    notice the pipe unexpectedly closing.
+    
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ lib/dpkg/compress.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit fcf68d7115580a4af7087c24a0963d72f81a3c22
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Tue Jan 5 16:49:39 2010 +0100
+
+    libdpkg: Fix redundant compression error messages
+    
+    Avoid ohshite() except where errno is useful. This should avoid
+    confusing error messages like:
+    
+            data: internal gzip error: read: stream error: Success
+    
+    While we're at it, drop the number of bytes read and written from
+    the read() != write() error message and output the error message
+    from the compression library instead.
+    
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ lib/dpkg/compress.c |   20 ++++++++------------
+ 1 files changed, 8 insertions(+), 12 deletions(-)
+
+commit ade1c27e5c618ca72c6168d79c8da1a78fd0859c
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Sun Jan 3 18:56:51 2010 +0100
+
+    libdpkg: Fix compress_cat to read/write to arbitrary fds
+    
+    The compress_cat() code had a hidden assumption that fd_in is 0
+    and fd_out is 1. This is a bug waiting to happen. But luckily
+    all callers do use those values, so it is harmless.
+    
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ lib/dpkg/compress.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit e5c584abd37b59ba4d7cda44f7bad7c98dbd075b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 24 01:44:27 2010 +0100
+
+    Normalize ar member names when reading
+    
+    This removes all trailing spaces and the optional trailing slash on
+    GNU-style ar format, making it easier to parse and avoiding having to
+    compare against the compat strings.
+
+ debian/changelog        |    2 ++
+ dpkg-deb/dpkg-deb.h     |   17 ++++++-----------
+ dpkg-deb/extract.c      |   27 ++++++++++++++-------------
+ dpkg-split/dpkg-split.h |    2 +-
+ dpkg-split/info.c       |    9 ++++++++-
+ man/deb-split.5         |    3 ++-
+ 6 files changed, 33 insertions(+), 27 deletions(-)
+
+commit 889375f0857697c362c2ec924a3f9b6f5110747d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 24 01:07:24 2010 +0100
+
+    libdpkg: Add a new ar module
+    
+    For now include a dpkg_ar_normalize_name() function to fix up the
+    ar_name member in an ar_hdr structure.
+
+ lib/dpkg/Makefile.am      |    1 +
+ lib/dpkg/ar.c             |   39 +++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/ar.h             |   37 +++++++++++++++++++++++++++++++++++++
+ lib/dpkg/test/.gitignore  |    1 +
+ lib/dpkg/test/Makefile.am |    2 ++
+ lib/dpkg/test/t-ar.c      |   42 ++++++++++++++++++++++++++++++++++++++++++
+ po/POTFILES.in            |    1 +
+ 7 files changed, 123 insertions(+), 0 deletions(-)
+
+commit 3fe6efee7d7e385ed6e30223a4f93fadca1ca095
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 24 01:40:27 2010 +0100
+
+    dpkg-deb: Force the ar member name to 16 space padded chars wide
+    
+    This makes the code resilient to changes to the member name strings
+    and guarantees it will always have the valid length, also makes it
+    easier to refactor later on.
+
+ dpkg-deb/build.c |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+commit da7c012828b95d3f275afc553f7927b7dfd04ed6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 24 01:33:34 2010 +0100
+
+    dpkg-deb: Use DEBMAGIC instead of string literals
+
+ dpkg-deb/build.c   |    2 +-
+ dpkg-deb/extract.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 4088b785d8b8df9a6f87fb2dbd6680198e7fb46b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 23 17:00:36 2010 +0100
+
+    Do not include the ar magic in the deb and deb-split magic macros
+    
+    This allows the code to parse the ar header normally w/o needing to
+    seek back.
+
+ dpkg-deb/dpkg-deb.h     |    2 +-
+ dpkg-split/dpkg-split.h |    2 +-
+ dpkg-split/info.c       |   11 ++++++-----
+ 3 files changed, 8 insertions(+), 7 deletions(-)
+
+commit 675f12250ede89f5c4fbbae26f5eb48a28bfb491
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 18 14:22:34 2010 +0100
+
+    libdpkg: Rename sizeof_array to array_count
+    
+    The new name makes more sense, as the former might seem to imply the
+    total size of the array and not the amount of elements in it.
+
+ dpkg-deb/main.c           |    2 +-
+ dpkg-split/main.c         |    2 +-
+ lib/dpkg/ehandle.c        |    2 +-
+ lib/dpkg/macros.h         |    4 ++--
+ lib/dpkg/parse.c          |    4 ++--
+ lib/dpkg/subproc.c        |    6 +++---
+ utils/start-stop-daemon.c |    2 +-
+ 7 files changed, 11 insertions(+), 11 deletions(-)
+
+commit 37732b75526fe95f4bbeb0f344942b55ae7a3485
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 22 18:51:33 2010 +0100
+
+    libdpkg: Mark config_error and statusfd_send with DPKG_ATTR_PRINTF
+
+ lib/dpkg/dpkg.h  |    2 +-
+ lib/dpkg/myopt.c |    3 +++
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 803474755148c97ee16919c2373e605763fea739
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 22 18:50:01 2010 +0100
+
+    libdpkg: Add and use new DPKG_ATTR_SENTINEL
+
+ lib/dpkg/macros.h |    2 ++
+ src/main.h        |    7 ++++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+commit e10b57f16269e731c7309a9df4797089f83522c8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jan 24 22:11:25 2010 +0100
+
+    libdpkg: Rename varbuffree to varbuf_destroy
+    
+    The convention is for functions named free to deallocate the contents
+    and the given pointer, while this one only deallocates the contents, so
+    we rename it to make this distinction clear.
+
+ dpkg-deb/info.c          |    2 +-
+ dselect/pkglist.cc       |    2 +-
+ lib/dpkg/buffer.c        |    2 +-
+ lib/dpkg/dbmodify.c      |    2 +-
+ lib/dpkg/dump.c          |    4 ++--
+ lib/dpkg/showpkg.c       |    6 +++---
+ lib/dpkg/test/t-varbuf.c |   18 +++++++++---------
+ lib/dpkg/varbuf.c        |    4 +++-
+ lib/dpkg/varbuf.h        |   14 +++++++-------
+ src/archives.c           |   12 ++++++------
+ src/configure.c          |   10 +++++-----
+ src/depcon.c             |    4 ++--
+ src/help.c               |    4 ++--
+ src/packages.c           |    4 ++--
+ src/processarc.c         |    2 +-
+ src/query.c              |    4 ++--
+ src/remove.c             |    4 ++--
+ src/select.c             |    4 ++--
+ src/statcmd.c            |    6 +++---
+ 19 files changed, 55 insertions(+), 53 deletions(-)
+
+commit c6520d670008b8af1e79726e690ec35435e8672c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 23 22:51:47 2010 +0100
+
+    libdpkg: Rename pkg_array_free to pkg_array_destroy
+    
+    The convention is for functions named _free to deallocate the contents
+    and the given pointer, while this one only deallocates the contents, so
+    we rename it to make this distinction clear.
+
+ lib/dpkg/pkg-array.c |    8 +++++---
+ lib/dpkg/pkg-array.h |    2 +-
+ src/query.c          |    4 ++--
+ src/select.c         |    2 +-
+ 4 files changed, 9 insertions(+), 7 deletions(-)
+
+commit 4952b8c30cb7564bbf509a2dd8f8bde052ccc144
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jan 28 03:42:02 2010 +0100
+
+    dpkg-deb: Do not include unneeded <zlib.h>
+    
+    The zlib functionality is already abstracted throught the libdpkg
+    compress module.
+
+ dpkg-deb/build.c   |    3 ---
+ dpkg-deb/extract.c |    3 ---
+ 2 files changed, 0 insertions(+), 6 deletions(-)
+
+commit 9ddef90d43712debf3c64ab8662de2bc1174666e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jan 4 19:07:53 2010 +0100
+
+    Do not include unneeded <signal.h>
+
+ dpkg-deb/build.c    |    1 -
+ dpkg-deb/extract.c  |    1 -
+ dpkg-deb/info.c     |    1 -
+ dpkg-deb/main.c     |    1 -
+ lib/dpkg/dbmodify.c |    1 -
+ lib/dpkg/mlib.c     |    1 -
+ src/configure.c     |    1 -
+ src/errors.c        |    1 -
+ src/main.c          |    1 -
+ src/statcmd.c       |    1 -
+ 10 files changed, 0 insertions(+), 10 deletions(-)
+
+commit ccd01db5cc410896ed6b8f1d78ff458a4cde2a23
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Jan 27 17:17:53 2010 +0100
+
+    Dpkg::Source::Patch: fix output of patch with an header
+    
+    The line was misparsed. Use the print method to avoid any ambiguity.
+
+ scripts/Dpkg/Source/Patch.pm |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9b369060cb86bdcd62f0a790436d58ef2edc9aea
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Jan 24 22:13:38 2010 +0100
+
+    update-alternatives: deal with unknown alternatives when fixing a broken link group
+    
+    Instead of trying to reinstall an alternative that doesn't exist in the
+    database, select a new choice and install that one.
+
+ debian/changelog               |    3 +++
+ scripts/update-alternatives.pl |    8 ++++++++
+ 2 files changed, 11 insertions(+), 0 deletions(-)
+
+commit bf8ff0cd3dd88a06c2a3cfca8d6439df5fa217cb
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Jan 23 23:25:45 2010 +0100
+
+    dpkg-source: unpacking a 3.0 (quilt) source package configures quilt accordingly
+    
+    The files .pc/.quilt_patches and .pc/.quilt_series are always created so
+    that any quilt invocation will know where to look for (or where to store)
+    patches. This will only work with quilt >= 0.48-5.
+
+ debian/changelog                        |    3 +++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |   26 ++++++++++++++++++++++----
+ 2 files changed, 25 insertions(+), 4 deletions(-)
+
+commit 8e00bfcbc75213c00a6b782ffed332ba5b772aef
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Jan 23 09:55:58 2010 +0100
+
+    Update German scripts translation
+    
+    Update to 491t.
+
+ scripts/po/de.po |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit fddb4645a3bc838ba489cc0e66df830d79f71058
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 22 17:58:49 2010 +0100
+
+    Add changelog entry for Dpkg::Compression related changes
+
+ debian/changelog |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 21d29e600d7295b3fd4f79f7cf697493df4b9e7c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 22 17:48:34 2010 +0100
+
+    Dpkg::Compression::Process: add POD documentation
+
+ scripts/Dpkg/Compression/Process.pm |   96 +++++++++++++++++++++++++++++++++--
+ 1 files changed, 92 insertions(+), 4 deletions(-)
+
+commit d392c99d95a3576180efb651a7f86127a5eaf4e4
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 22 16:38:46 2010 +0100
+
+    Rename Dpkg::Compression::CompressedFile and Dpkg::Compression::Compressor
+    
+    Dpkg::Compression::CompressedFile -> Dpkg::Compression::FileHandle
+    Dpkg::Compression::Compressor     -> Dpkg::Compression::Process
+    
+    The new names are more expressive and avoid repeating "Compress".
+    
+    Update all scripts and modules to use the new name.
+
+ .../{CompressedFile.pm => FileHandle.pm}           |   42 ++++++++++----------
+ .../Dpkg/Compression/{Compressor.pm => Process.pm} |    6 +-
+ scripts/Dpkg/Index.pm                              |    6 +-
+ scripts/Dpkg/Source/Archive.pm                     |    2 +-
+ scripts/Dpkg/Source/Patch.pm                       |    4 +-
+ scripts/Makefile.am                                |    4 +-
+ scripts/dpkg-scanpackages.pl                       |    6 +-
+ scripts/dpkg-scansources.pl                        |    8 ++--
+ scripts/po/POTFILES.in                             |    4 +-
+ scripts/t/850_Dpkg_Compression.t                   |   10 ++--
+ 10 files changed, 45 insertions(+), 47 deletions(-)
+
+commit 57063245562d895f14fc2da47a6cb03be9677d06
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 22 16:09:04 2010 +0100
+
+    Move handling of default compression method/level to Dpkg::Compression
+    
+    Dpkg::Compression now provides new functions to get/set the default
+    compression method and the default compression level. There was no
+    good reason to have it in Dpkg::Compression::Compressor in the first
+    place.
+    
+    Factorize some code to verify validity of what should be a compression
+    level in new function compression_is_valid_level($level).
+    
+    dpkg-source has been updated to cope with the changes.
+
+ scripts/Dpkg/Compression.pm            |   71 +++++++++++++++++++++++++++++++-
+ scripts/Dpkg/Compression/Compressor.pm |   24 +---------
+ scripts/dpkg-source.pl                 |   17 ++++----
+ 3 files changed, 81 insertions(+), 31 deletions(-)
+
+commit efd281e8723f9e80e65cbdcefb304483c35ad963
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 22 01:46:40 2010 +0100
+
+    Dpkg::Compression: new API based on public functions
+    
+    This API change requires lots of adjustements through the source code.
+
+ scripts/Dpkg/Compression.pm                |  133 ++++++++++++++++++++++++----
+ scripts/Dpkg/Compression/CompressedFile.pm |    7 +-
+ scripts/Dpkg/Compression/Compressor.pm     |    8 +-
+ scripts/Dpkg/Source/Package.pm             |    5 +-
+ scripts/Dpkg/Source/Package/V1.pm          |    2 +-
+ scripts/Dpkg/Source/Package/V2.pm          |   15 ++--
+ scripts/Dpkg/Source/Package/V3/bzr.pm      |    4 +-
+ scripts/Dpkg/Source/Package/V3/git.pm      |    4 +-
+ scripts/Dpkg/Source/Package/V3/native.pm   |    4 +-
+ scripts/dpkg-buildpackage.pl               |    9 +-
+ scripts/dpkg-genchanges.pl                 |    7 +-
+ scripts/dpkg-scansources.pl                |    5 +-
+ scripts/dpkg-source.pl                     |    9 +-
+ 13 files changed, 160 insertions(+), 52 deletions(-)
+
+commit c5fea0a576586e993ad8af3c6b2d0897297cd9f7
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jan 21 22:34:44 2010 +0100
+
+    Add non-regression tests for Dpkg::Compression::CompressedFile
+
+ scripts/Makefile.am              |    1 +
+ scripts/t/850_Dpkg_Compression.t |   99 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 100 insertions(+), 0 deletions(-)
+
+commit 11a793f29a1b13065dc146ae203a8184a4bce780
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jan 21 21:08:31 2010 +0100
+
+    Dpkg::Compression::CompressedFile: update API
+    
+    Change the Dpkg::Compression::CompressedFile API to make it behave like
+    a normal filehandle.
+    
+    Update all users of the object to use the new API.
+
+ scripts/Dpkg/Compression/CompressedFile.pm |  357 +++++++++++++++++++++++++---
+ scripts/Dpkg/Index.pm                      |   12 +-
+ scripts/Dpkg/Source/Archive.pm             |   45 ++--
+ scripts/Dpkg/Source/Patch.pm               |   61 ++---
+ scripts/dpkg-scanpackages.pl               |   12 +-
+ scripts/dpkg-scansources.pl                |   18 +-
+ 6 files changed, 384 insertions(+), 121 deletions(-)
+
+commit 31bde76e009e2a18c8813fe61816ee9719f2228d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Nov 1 18:56:08 2009 +0100
+
+    Rename Dpkg::Source::CompressedFile into Dpkg::Compression::CompressedFile
+
+ .../Dpkg/{Source => Compression}/CompressedFile.pm |    2 +-
+ scripts/Dpkg/Index.pm                              |    6 +++---
+ scripts/Dpkg/Source/Archive.pm                     |    2 +-
+ scripts/Dpkg/Source/Patch.pm                       |    4 ++--
+ scripts/Makefile.am                                |    2 +-
+ scripts/dpkg-scanpackages.pl                       |    6 +++---
+ scripts/dpkg-scansources.pl                        |    8 ++++----
+ scripts/po/POTFILES.in                             |    2 +-
+ 8 files changed, 16 insertions(+), 16 deletions(-)
+
+commit 42a195698c55c7382f9b1e07378ad7c8cc00c7d9
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Nov 1 18:47:05 2009 +0100
+
+    Rename Dpkg::Source::Compressor into Dpkg::Compression::Compressor
+
+ scripts/Dpkg/{Source => Compression}/Compressor.pm |    4 ++--
+ scripts/Dpkg/Source/CompressedFile.pm              |    4 ++--
+ scripts/Dpkg/Source/Patch.pm                       |    2 +-
+ scripts/Makefile.am                                |    2 +-
+ scripts/dpkg-source.pl                             |   16 ++++++++--------
+ scripts/po/POTFILES.in                             |    3 ++-
+ 6 files changed, 16 insertions(+), 15 deletions(-)
+
+commit 49d9121542f8c3dfa5a84f6ddbca5115c13fa7ad
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jan 21 21:11:44 2010 +0100
+
+    Dpkg::IPC: allow IO::Handle objects in *_pipe parameters
+
+ scripts/Dpkg/IPC.pm |   22 ++++++++++++++--------
+ 1 files changed, 14 insertions(+), 8 deletions(-)
+
+commit 4616b554a747a3b3b524ff49a1a077930ba36ab2
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jan 18 11:37:01 2010 +0100
+
+    Dpkg::Shlibs::Objdump: accept filenames with spaces and colons
+
+ debian/changelog               |    3 +++
+ scripts/Dpkg/Shlibs/Objdump.pm |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 01a4b244f36239bb6df336e201f51c185b2dd2d2
+Author: Nicolas François <nicolas.francois@centraliens.net>
+Date:   Thu Jan 14 11:45:45 2010 +0100
+
+    Fix typos in the French manpages.
+    
+    Fix typo \\<nbsp> should be <nbsp>.
+    Also change \\<space> to <nbsp> for consistency.
+
+ man/po/fr.po | 1146 +++++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 573 insertions(+), 573 deletions(-)
+
+commit 3fd9443c00fa404c85d93ab39ed3bdf5b8d5d86d
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Jan 13 16:17:57 2010 +0100
+
+    Update German scripts translation
+    
+    Update to 490t.
+
+ scripts/po/de.po |   16 ++++++++++++++--
+ 1 files changed, 14 insertions(+), 2 deletions(-)
+
+commit a925797c3deca1d56ce17bc988ded48e6aa8a0dc
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Jan 12 12:19:32 2010 +0100
+
+    Add changelog entry for symbol patterns support in dpkg-gensymbols
+
+ debian/changelog |   22 ++++++++++++++++++++++
+ 1 files changed, 22 insertions(+), 0 deletions(-)
+
+commit ca05db4046b13d56e23187ff6c5a8e18221a8952
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jan 11 19:39:30 2010 +0100
+
+    dpkg-gensymbols(1): document the new -V option
+
+ man/dpkg-gensymbols.1 |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit e0fa13513797ee2e90a27fdf23e51693a7ef2449
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jan 11 18:45:00 2010 +0100
+
+    Dpkg::Shlibs::Symbol.pm: change handling of old-style wildcards
+    
+    Really treat "*@version" like "(symver|optional)version" and don't care
+    if the diff output might not apply in that specific case. The difference
+    are minor anyway when you use that feature to maintain your symbols file.
+
+ scripts/Dpkg/Shlibs/Symbol.pm              |   26 ++++++++++++--------------
+ scripts/t/200_Dpkg_Shlibs.t                |   14 ++++++++++----
+ scripts/t/200_Dpkg_Shlibs/patterns.symbols |    2 +-
+ 3 files changed, 23 insertions(+), 19 deletions(-)
+
+commit 3f593b5be3ea692d8e41c76d6768cb77c06eb3f3
+Author: Modestas Vainius <modax@debian.org>
+Date:   Sun Jan 10 11:46:09 2010 +0200
+
+    Dpkg::Shlibs::Symbol/SymbolFile: introduce symver pattern, deprecate wildcards
+    
+    Wildcards are still recognized. Their functionality is like of
+    (symver|optional). Also underline notations of all basic pattern names
+    in the man page.
+    
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ man/dpkg-gensymbols.1                      |   58 ++++++++++++----------
+ scripts/Dpkg/Shlibs/Symbol.pm              |   76 ++++++++++++++++------------
+ scripts/Dpkg/Shlibs/SymbolFile.pm          |    6 +--
+ scripts/t/200_Dpkg_Shlibs.t                |   46 +++++++++++++----
+ scripts/t/200_Dpkg_Shlibs/patterns.cpp     |   27 +++++++---
+ scripts/t/200_Dpkg_Shlibs/patterns.map     |    9 +++-
+ scripts/t/200_Dpkg_Shlibs/patterns.symbols |   10 ++--
+ 7 files changed, 143 insertions(+), 89 deletions(-)
+
+commit 22bf0c7e950e104f4ca7392bd4a5fabe834cc688
+Author: Modestas Vainius <modax@debian.org>
+Date:   Sun Jan 10 02:36:04 2010 +0200
+
+    Dpkg::Shlibs::Symbol: use 'auto' c++filt format for demangling C++ symbols
+    
+    'auto' will try to select appropriate C++ demangling type automatically. Please
+    note that 'auto' format is limited to C++ symbols as of binutils 2.20.
+    
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Dpkg/Shlibs/Symbol.pm       |    2 +-
+ scripts/t/190_Dpkg_Shlibs_Cppfilt.t |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 210b816279ff3935aebf469f547f6699501a93af
+Author: Modestas Vainius <modax@debian.org>
+Date:   Sun Jan 10 02:26:15 2010 +0200
+
+    Dpkg::Shlibs::*: style adjustments.
+    
+    Use "my ($foo, $bar) = @_" rather than multiple shift()s.
+    
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Dpkg/Shlibs/Cppfilt.pm    |   11 +++++------
+ scripts/Dpkg/Shlibs/Symbol.pm     |   13 +++++--------
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    5 ++---
+ scripts/t/200_Dpkg_Shlibs.t       |    5 ++---
+ 4 files changed, 14 insertions(+), 20 deletions(-)
+
+commit 1580211ef2bfbfe74314c7472f517b5da935dea2
+Author: Modestas Vainius <modax@debian.org>
+Date:   Tue Jan 5 02:03:28 2010 +0200
+
+    Update copyright notices of Modestas Vainius
+    
+    * Include 2010 in copyright years.
+    * Use modax@debian.org email address.
+    
+    Signed-off-by: Modestas Vainius <modax@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Dpkg/Shlibs/Symbol.pm     |    2 +-
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 81f26dad1dca289bd49351abfdda9eac411a000c
+Author: Modestas Vainius <modax@debian.org>
+Date:   Mon Jan 11 16:22:05 2010 +0100
+
+    dpkg-gensymbols(1): document patterns in the manual page
+    
+    And small fixups of other parts of the manual page.
+    
+    Signed-off-by: Modestas Vainius <modax@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ man/dpkg-gensymbols.1 |  166 +++++++++++++++++++++++++++++++++++++++++--------
+ 1 files changed, 139 insertions(+), 27 deletions(-)
+
+commit da19cee896d19264a1c733a93646a37ffb4d1fd0
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jan 11 14:46:03 2010 +0100
+
+    scripts/t/200_Dpkg_Shlibs.t: extend test suite to cover symbol patterns functionality
+    
+    Signed-off-by: Modestas Vainius <modax@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Makefile.am                        |   14 +++-
+ scripts/t/200_Dpkg_Shlibs.t                |  146 +++++++++++++++++++++++++++-
+ scripts/t/200_Dpkg_Shlibs/patterns.cpp     |   98 +++++++++++++++++++
+ scripts/t/200_Dpkg_Shlibs/patterns.map     |    4 +
+ scripts/t/200_Dpkg_Shlibs/patterns.symbols |   45 +++++++++
+ 5 files changed, 304 insertions(+), 3 deletions(-)
+
+commit fa6739b81239f053243014dbbba18c2328cd388c
+Author: Modestas Vainius <modax@debian.org>
+Date:   Tue Jan 5 02:03:28 2010 +0200
+
+    scripts/t/200_Dpkg_Shlibs.t: cleanup and fix non-regression test
+    
+    * Rename previous tag tests to 'basictags'. Change the name everywhere and use
+      it consistenly throughout the testsuite. No new tests added.
+    * Fix 'wildcard symbol' test. It started failing due to changes in the symbol
+      data structure.
+    * Add a sub for save_load test.
+    
+    Signed-off-by: Modestas Vainius <modax@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Makefile.am                                |   14 ++--
+ scripts/t/200_Dpkg_Shlibs.t                        |  102 ++++++++++---------
+ scripts/t/200_Dpkg_Shlibs/basictags.c              |   27 +++++
+ .../{symbols.tags.in => basictags.symbols}         |    4 +-
+ scripts/t/200_Dpkg_Shlibs/symbols.include-3        |    4 +-
+ scripts/t/200_Dpkg_Shlibs/symboltags.c             |   27 -----
+ 6 files changed, 92 insertions(+), 86 deletions(-)
+
+commit b22337ebf92b5bd68beed3500b7a5c41d8caa51a
+Author: Modestas Vainius <modax@debian.org>
+Date:   Mon Jan 11 16:14:14 2010 +0100
+
+    Dpkg::Shlibs::SymbolFile::create_symbol(): new function
+    
+    This new function will be used in non-regression tests, it avoids
+    duplicating parse+initialize multiple times.
+    
+    Signed-off-by: Modestas Vainius <modax@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Dpkg/Shlibs/Symbol.pm     |    2 +-
+ scripts/Dpkg/Shlibs/SymbolFile.pm |   16 ++++++++++++++--
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+
+commit dfacfbd93e00007033f5e500af0459ca4553f70d
+Author: Modestas Vainius <modax@debian.org>
+Date:   Tue Jan 5 02:03:28 2010 +0200
+
+    dpkg-gensymbols: improve output and add a "verbose output" option
+    
+    * Current version of SymbolFile is capable of printing and detecting missing
+      patterns. Therefore, drop special handling of wildcards from dpkg-gensymbols.
+      This renders some old wildcard related subroutines in SymbolFile obsolete.
+      Drop them as well.
+    * Add verbose output (-V) option which in template mode allows to dump symbols
+      above the pattern they match (dump() option 'with_pattern_matches').
+    
+    Signed-off-by: Modestas Vainius <modax@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Dpkg/Shlibs/SymbolFile.pm |   18 -------
+ scripts/dpkg-gensymbols.pl        |   90 ++++++++++++++++---------------------
+ 2 files changed, 39 insertions(+), 69 deletions(-)
+
+commit 6dcf3df8208bea8eb3f23280bae938dc997cb5fb
+Author: Modestas Vainius <modax@debian.org>
+Date:   Tue Jan 5 02:03:28 2010 +0200
+
+    Dpkg::Shlibs::SymbolFile::dump(): improve output
+    
+    * In template mode, dump patterns. Then, matching symbols might be
+      optionally dumped as comments.
+    * In non-template mode, dump raw symbols without patterns.
+    
+    Signed-off-by: Modestas Vainius <modax@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Dpkg/Shlibs/SymbolFile.pm |   25 +++++++++++++++++++++----
+ 1 files changed, 21 insertions(+), 4 deletions(-)
+
+commit 428ab764e06fc997ca028e74c0e7899c53fe1186
+Author: Modestas Vainius <modax@debian.org>
+Date:   Tue Jan 5 02:03:28 2010 +0200
+
+    Dpkg::Shlibs::SymbolFile::dump(): fix indentation style
+    
+    Signed-off-by: Modestas Vainius <modax@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Dpkg/Shlibs/SymbolFile.pm |   22 +++++++++++-----------
+ 1 files changed, 11 insertions(+), 11 deletions(-)
+
+commit 4d65f96219e45cb80083be47c66085ff85dcca61
+Author: Modestas Vainius <modax@debian.org>
+Date:   Tue Jan 5 02:03:28 2010 +0200
+
+    Dpkg::Shlibs::Symbol/SymbolFile: implement pattern matching
+    
+    Implement pattern matching in SymbolFile::merge_symbols(),
+    SymbolFile::get_new_symbols() and other functions which deal with tracking of
+    old symbols and discovery of new ones.
+    
+    Signed-off-by: Modestas Vainius <modax@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Dpkg/Shlibs/Symbol.pm     |   47 ++++++++++-
+ scripts/Dpkg/Shlibs/SymbolFile.pm |  164 ++++++++++++++++++++++++++++++++-----
+ 2 files changed, 187 insertions(+), 24 deletions(-)
+
+commit 2425566eb66ad35a24e7cbf8515a3a2e2fad2357
+Author: Modestas Vainius <modax@debian.org>
+Date:   Tue Jan 5 02:03:28 2010 +0200
+
+    Dpkg::Shlibs::SymbolFile::get_new_symbols(): simplify and shorten code
+    
+    Reduce the code in get_new_symbols() by enumerating symbols, rather than their
+    names. Also split off some code to Symbol::is_eligible_as_new() function.
+    
+    Patch is supposed to result in no behavioral changes.
+    
+    Signed-off-by: Modestas Vainius <modax@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Dpkg/Shlibs/Symbol.pm     |    9 +++++++++
+ scripts/Dpkg/Shlibs/SymbolFile.pm |   15 +++++++--------
+ 2 files changed, 16 insertions(+), 8 deletions(-)
+
+commit 8ad712068d4b33339fc9e88c0e05f75c3c6bc72d
+Author: Modestas Vainius <modax@debian.org>
+Date:   Tue Jan 5 02:03:28 2010 +0200
+
+    Dpkg::Shlibs::SymbolFile::merge_symbols(): factorize some code
+    
+    Split off some code from SymbolFile::merge_symbols() to
+    Symbol::mark_found_in_library() and Symbol::mark_not_found_in_library()
+    methods. Methods do sanitizing of the Symbol object when the symbol is / isn't
+    found in the library respectively. This simplifies readability of
+    merge_symbols() and allows reusability of the code blocks (for the future).
+    
+    Signed-off-by: Modestas Vainius <modax@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Dpkg/Shlibs/Symbol.pm     |   42 +++++++++++++++++++++++++++++++++++++
+ scripts/Dpkg/Shlibs/SymbolFile.pm |   32 ++-------------------------
+ 2 files changed, 45 insertions(+), 29 deletions(-)
+
+commit 90dff312c582f1a3ead410769a334b2271ecb72a
+Author: Modestas Vainius <modax@debian.org>
+Date:   Tue Jan 5 02:03:28 2010 +0200
+
+    Dpkg::Shlibs::Symbol/SymbolFile: recognize patterns and initialize them properly
+    
+    Add code for symbol-pattern recognition and initialization. Two groups of
+    patterns are supported:
+    
+    * aliases (wildcards, c++ demangled names). They can be matched by converting
+      a raw symbol to the alias and mapping the result to the alias pattern
+      specified in symbol file template;
+    
+    * generic patterns (regular expressions). They must be matched against each
+      raw symbol in a sequential order. Therefore, they are rather expensive
+      performance-wise.
+    
+    Rename Symbol::process_tags() to Symbol::initialize() in the process. New name
+    suites the purpose of the sub better.
+    
+    Failure of 'wildcarded symbol' test is expected at this point.
+    
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Dpkg/Shlibs/Symbol.pm     |   51 ++++++++++++++++++++++++++++++++++--
+ scripts/Dpkg/Shlibs/SymbolFile.pm |   31 ++++++++++++++++++----
+ 2 files changed, 73 insertions(+), 9 deletions(-)
+
+commit aff221782ed7f1c6ba68ae0642ccf5db85aa414e
+Author: Modestas Vainius <modax@debian.org>
+Date:   Tue Jan 5 02:03:28 2010 +0200
+
+    Dpkg::Shlibs::Symbol: add pattern related functions
+    
+    The new functions define a public interface for accessing pattern specific
+    data in Symbol objects.
+    
+    Signed-off-by: Modestas Vainius <modax@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Dpkg/Shlibs/Symbol.pm |   95 +++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 95 insertions(+), 0 deletions(-)
+
+commit f49ec7762728390cda14a32a1910b60b05ee53ac
+Author: Modestas Vainius <modax@debian.org>
+Date:   Tue Jan 5 02:03:27 2010 +0200
+
+    Dpkg::Shlibs::Symbol::clone(): replaced by dclone() and sclone().
+    
+    dclone() - deep cloning of the symbol.
+    sclone() - shallow copying of the symbol.
+    
+    Signed-off-by: Modestas Vainius <modax@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Dpkg/Shlibs/Symbol.pm     |   20 ++++++++++++++++----
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    8 ++++----
+ scripts/t/200_Dpkg_Shlibs.t       |   12 +++++++++++-
+ 3 files changed, 31 insertions(+), 9 deletions(-)
+
+commit 3a4c2b071c845bc6cc539826781c493baca0efa3
+Author: Modestas Vainius <modax@debian.org>
+Date:   Tue Jan 5 02:03:27 2010 +0200
+
+    Dpkg::Shlibs::Cppfilt: new interface to the c++filt utility.
+    
+    This new module can be used to do symbol demangling with the c++filt
+    utility. For performance reasons, the c++filt program is run
+    in the background and used as a daemon: for each line written
+    it immediately outputs the demangled line.
+    
+    The module also takes care of the c++filt process management
+    (forking and termination).
+    
+    Signed-off-by: Modestas Vainius <modax@debian.org>
+    Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
+
+ scripts/Dpkg/Shlibs/Cppfilt.pm      |  106 +++++++++++++++++++++++++++++++++++
+ scripts/Makefile.am                 |    2 +
+ scripts/t/190_Dpkg_Shlibs_Cppfilt.t |   89 +++++++++++++++++++++++++++++
+ 3 files changed, 197 insertions(+), 0 deletions(-)
+
+commit b432975b209ed2888441dbe40aa3b18669836356
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Jan 11 16:58:06 2010 +0100
+
+    debian/control: drop debian-maintainers from Suggests
+    
+    The keyring of interest is available in the debian-keyring package.
+
+ debian/changelog |    2 ++
+ debian/control   |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit b3ce85b43fca4b75549c2191eed563246dfa191b
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Jan 10 12:05:13 2010 +0100
+
+    Update German translation of manual pages
+    
+    Update to 1680t.
+
+ man/po/de.po |   16 +++++++++++++++-
+ 1 files changed, 15 insertions(+), 1 deletions(-)
+
+commit b1acb6690d759fe523bfbed14dd5d1653eaee282
+Merge: a9d4a03 d55c5d3
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 8 19:23:22 2010 +0100
+
+    Merge branch 'sid'
+
+commit d55c5d39b684c9f08f8f612f5553de5ea409b625
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 8 17:58:11 2010 +0100
+
+    Release 1.15.5.6
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 6dff550cf68846d0bc3a4189d7779d08feed5703
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 8 18:59:59 2010 +0100
+
+    dpkg-shlibdeps(1): fix typo "informations" -> "information"
+
+ man/dpkg-shlibdeps.1 |    2 +-
+ man/po/de.po         |    2 +-
+ man/po/es.po         |    2 +-
+ man/po/fr.po         |    2 +-
+ man/po/hu.po         |    2 +-
+ man/po/ja.po         |    2 +-
+ man/po/pl.po         |    2 +-
+ man/po/pt_BR.po      |    2 +-
+ man/po/ru.po         |    2 +-
+ man/po/sv.po         |    2 +-
+ 10 files changed, 10 insertions(+), 10 deletions(-)
+
+commit a30eab85df6d1c7c7dd07d406c7951c231ccf920
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 8 18:56:14 2010 +0100
+
+    debian/control: add ${misc:Depends} everywhere
+
+ debian/changelog |    1 +
+ debian/control   |    6 ++++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit b50008f973c0856dfa241129f761d6cc312648c8
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 8 17:55:30 2010 +0100
+
+    dpkg-source: better explain how --print-format works
+    
+    In the manual page, mentions that any upstream tarball must be available
+    in the current directory and make it obvious when a format is discarded
+    (for example due to lack of an upstream tarball) by displaying a message
+    on STDERR.
+
+ debian/changelog       |    2 ++
+ man/dpkg-source.1      |    3 ++-
+ scripts/dpkg-source.pl |    4 ++--
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+
+commit 5e4c14712a795b1b2da6d0bdb7c130c8a99c1906
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 8 17:17:30 2010 +0100
+
+    dpkg-buildpackage: fix value of "parallel" exported in DEB_BUILD_OPTIONS
+    
+    When "-j" is given, it used to export "parallel=-1" instead of the more
+    logical "parallel=" that gives the desired result with the sample make
+    invocation shown in the Debian policy:
+      NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+      MAKEFLAGS += -j$(NUMJOBS)
+
+ debian/changelog             |    2 ++
+ scripts/dpkg-buildpackage.pl |   10 +++-------
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+
+commit cfdeb7e01ff702427abadfa14bd2e066b4eec940
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Jan 8 18:46:14 2010 +0100
+
+    Dpkg::BuildOptions: change API so that an empty value can be properly supported
+    
+    No value results in a hash item with undef value while an empty value
+    results in a hash ite with an empty value.
+    
+    Update the non-regression tests accordingly. Also update dpkg-buildpackage
+    that was using defined instead of exists to test the existence of an
+    option.
+
+ scripts/Dpkg/BuildOptions.pm      |   13 +++++++------
+ scripts/dpkg-buildpackage.pl      |    4 ++--
+ scripts/t/300_Dpkg_BuildOptions.t |   17 +++++++++--------
+ 3 files changed, 18 insertions(+), 16 deletions(-)
+
+commit a77468fa21f5807d89b9813e52cd8a7cefe4efe6
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Jan 7 21:21:15 2010 +0100
+
+    Add missing bug closure
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a9d4a03cfb15bac0084821d63a9a01e916c2f81b
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Jan 3 16:52:15 2010 +0100
+
+    Carry over fix for misspelling from ad3a4ff9fd8ae6ddda77dfb143cc250d65295cd1
+
+ man/po/de.po |    6 +++---
+ man/po/fr.po |    6 +++---
+ man/po/pl.po |    6 +++---
+ man/po/sv.po |    6 +++---
+ 4 files changed, 12 insertions(+), 12 deletions(-)
+
+commit 6782e76a993db059c32c8e45b2b2dcc254e27b96
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Jan 3 16:43:59 2010 +0100
+
+    Carry over fix for misspelling from ad3a4ff9fd8ae6ddda77dfb143cc250d65295cd1
+
+ scripts/po/ca.po |    4 ++--
+ scripts/po/fr.po |    4 ++--
+ scripts/po/pl.po |    4 ++--
+ scripts/po/ru.po |    4 ++--
+ scripts/po/sv.po |    4 ++--
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+
+commit bc40cd5494e254f768df5e6779a1c53efc314ef7
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Jan 3 16:38:18 2010 +0100
+
+    Update German scripts translation
+    
+    Update to 489t.
+
+ scripts/po/de.po |  200 +++++++++++++++++++++++++++---------------------------
+ 1 files changed, 100 insertions(+), 100 deletions(-)
+
+commit ad3a4ff9fd8ae6ddda77dfb143cc250d65295cd1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jan 2 20:46:38 2010 +0100
+
+    Fix misspellings of “explicitly” all over the place
+
+ ChangeLog.old              |    4 ++--
+ debian/changelog           |    5 +++--
+ man/dpkg-buildpackage.1    |    2 +-
+ man/dpkg-trigger.1         |    2 +-
+ scripts/dpkg-gensymbols.pl |    4 ++--
+ scripts/dpkg-shlibdeps.pl  |    2 +-
+ 6 files changed, 10 insertions(+), 9 deletions(-)
+
+commit ff159b0d801a89d6d077c663dd82f0bff839320e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 1 22:05:14 2010 +0100
+
+    libdpkg: Rename struct TarFunctions and members
+    
+    Use lower case names, and name members closer to the Unix functions
+    doing the same actions.
+
+ lib/dpkg/tarfn.c |   16 ++++++++--------
+ lib/dpkg/tarfn.h |   20 ++++++++++----------
+ src/processarc.c |   14 +++++++-------
+ 3 files changed, 25 insertions(+), 25 deletions(-)
+
+commit 3cf8ba3ba62b55e0abe68dd11909e8b20b8a092e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 1 18:20:09 2010 +0100
+
+    libdpkg: Do not use typedefs for structs and enums
+
+ lib/dpkg/tarfn.c |   25 ++++++++++++-------------
+ lib/dpkg/tarfn.h |    9 +++------
+ 2 files changed, 15 insertions(+), 19 deletions(-)
+
+commit 68094d5e8c2370bf061a59805dd407e113eedc24
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 1 18:14:29 2010 +0100
+
+    libdpkg: Unconfuse TarExtractor symlink handling
+    
+    The code was using confusing variable names to handle the symlink lists.
+
+ lib/dpkg/tarfn.c |   36 +++++++++++++++++++-----------------
+ 1 files changed, 19 insertions(+), 17 deletions(-)
+
+commit 97df772d2c076f20cbf625dd14cac2e17cefbc0e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 1 18:02:10 2010 +0100
+
+    libdpkg: Use TARBLKSZ instead of integer literal
+
+ lib/dpkg/tarfn.c |   17 +++++++++--------
+ 1 files changed, 9 insertions(+), 8 deletions(-)
+
+commit 572a8d1dfbe26cd7b71b5d87a0f41fe068053e06
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 1 18:01:51 2010 +0100
+
+    libdpkg: Move TARBLKSZ macro definition to tarfn.h
+
+ lib/dpkg/dpkg.h  |    2 --
+ lib/dpkg/tarfn.h |    2 ++
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 21f43b49c95a6041dafa0b1790b1129cc52a234e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 1 17:37:19 2010 +0100
+
+    libdpkg: Rename TarExtractor functions argument to ops
+
+ lib/dpkg/tarfn.c |   16 ++++++++--------
+ lib/dpkg/tarfn.h |    2 +-
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+commit ce11ba170440da612e6efbf595c611fbf4f3623d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 1 16:28:52 2010 +0100
+
+    Use pid_t instead of int
+
+ src/configure.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 5e252222c5cb220e71cff40365ea72d64294cbfd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 1 14:08:34 2010 +0100
+
+    libdpkg: Move compression declarations to a new compress.h
+
+ dpkg-deb/build.c     |    1 +
+ dpkg-deb/extract.c   |    1 +
+ dpkg-deb/main.c      |    1 +
+ lib/dpkg/Makefile.am |    2 +-
+ lib/dpkg/compress.c  |    1 +
+ lib/dpkg/compress.h  |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/dpkg.h      |   18 ------------------
+ 7 files changed, 53 insertions(+), 19 deletions(-)
+
+commit b645c397239cd637883122af4106f6d7de4c9729
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 1 14:06:04 2010 +0100
+
+    libdpkg: Rename compression.c to compress.c
+
+ lib/dpkg/Makefile.am                   |    2 +-
+ lib/dpkg/{compression.c => compress.c} |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 6ffd055cf06817d940d5620c0f66ec70fba44bca
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 1 13:31:58 2010 +0100
+
+    dpkg: Give meaningful names to variables taking environment values
+
+ src/configure.c |   39 +++++++++++++++++++++------------------
+ 1 files changed, 21 insertions(+), 18 deletions(-)
+
+commit 68d5e05ccfe421bf4d68132f63bd061b63cfb8a4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jan 1 15:24:37 2010 +0100
+
+    Add missing copyright statements
+
+ lib/dpkg/compression.c         |    4 ++++
+ m4/dpkg-arch.m4                |    3 +++
+ m4/dpkg-compiler.m4            |    3 ++-
+ m4/dpkg-funcs.m4               |    1 +
+ m4/dpkg-libs.m4                |    4 ++++
+ m4/dpkg-progs.m4               |    4 ++++
+ m4/dpkg-types.m4               |    1 +
+ scripts/Dpkg/Exit.pm           |    2 ++
+ scripts/dpkg-source.pl         |   13 ++++++++++++-
+ scripts/update-alternatives.pl |    6 ++++++
+ 10 files changed, 39 insertions(+), 2 deletions(-)
+
+commit 4409119eaa1fdc7a1b102202396f6395d7de4646
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Jan 1 17:50:06 2010 +0100
+
+    Update German translation of manual pages
+    
+    Update to 1679t, update copyright year and minor fix.
+
+ man/po/de.add |    2 +-
+ man/po/de.po  |  103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
+ 2 files changed, 99 insertions(+), 6 deletions(-)
+
+commit c53fdb8552888696abbd4bc2c19faca84daa8fc0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 31 19:45:43 2009 +0100
+
+    libdpkg: Change subproc_fork return type to pid_t
+
+ lib/dpkg/subproc.c |    2 +-
+ lib/dpkg/subproc.h |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 0383935a670885a297042152327911e3eab9774a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 31 19:43:06 2009 +0100
+
+    libdpkg: Rename m_fork to subproc_fork
+    
+    Also namespace cleanup function to subproc_fork_cleanup.
+
+ dpkg-deb/build.c   |   15 ++++++++++-----
+ dpkg-deb/extract.c |   15 ++++++++++-----
+ dpkg-deb/info.c    |    3 ++-
+ dselect/method.cc  |    3 ++-
+ lib/dpkg/subproc.c |    8 ++++----
+ lib/dpkg/subproc.h |    2 +-
+ src/archives.c     |    3 ++-
+ src/configure.c    |    4 ++--
+ src/help.c         |    4 ++--
+ src/processarc.c   |    8 ++++----
+ 10 files changed, 39 insertions(+), 26 deletions(-)
+
+commit 692d67e4d03f1ca7716c90ac3196da6276e485cb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 31 18:08:45 2009 +0100
+
+    libdpkg: Move m_fork and helpers to the subproc module
+
+ lib/dpkg/dpkg.h    |    1 -
+ lib/dpkg/mlib.c    |   22 ----------------------
+ lib/dpkg/subproc.c |   37 +++++++++++++++++++++++++++++++++++++
+ lib/dpkg/subproc.h |    1 +
+ 4 files changed, 38 insertions(+), 23 deletions(-)
+
+commit 04d8d5f7f50182f610fbaa4686f878bd0aa69244
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 13 05:44:01 2009 +0100
+
+    build: Refactor compression library check m4 macro
+
+ m4/dpkg-libs.m4 |   87 +++++++++++++++++++++++-------------------------------
+ 1 files changed, 37 insertions(+), 50 deletions(-)
+
+commit a8755804fd225093a3a9360596c074c8e9a9dfae
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 13 05:30:06 2009 +0100
+
+    man: Add new deb-split.5 manual page
+
+ debian/changelog |    1 +
+ man/Makefile.am  |    1 +
+ man/deb-split.5  |   38 ++++++++++++++++++++++++++++++++++++++
+ man/po/po4a.cfg  |    5 +++++
+ 4 files changed, 45 insertions(+), 0 deletions(-)
+
+commit 1b6f6b3141d4b87a1eb3a044ed84f081738792fe
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Dec 27 00:04:54 2009 +0100
+
+    Use a for instead of a while loop in checkpath path splitting
+
+ src/help.c |    6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+commit 491b70bd377f3a552910a0c7253bc04b59263f76
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Dec 27 00:01:52 2009 +0100
+
+    libcompat: Define lchown as chown if the former is not available
+    
+    Instead of duplicating the code with chown calls when lchown is not
+    available, just map it with a macros.
+
+ lib/compat/compat.h |    4 ++++
+ src/archives.c      |   12 ------------
+ 2 files changed, 4 insertions(+), 12 deletions(-)
+
+commit 07d3faf8c7bc338717fa7e1fed3698d316dc5454
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Dec 26 22:05:20 2009 +0100
+
+    install-info: Do not use access() to check for exec permission
+    
+    Just try to execute the file and deal with the error if any.
+
+ utils/install-info.c |    5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+commit dde9a226d5f831c773539ee8c58f861148fd7c5e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Dec 26 21:04:23 2009 +0100
+
+    Use stat instead of access to check for file existence
+
+ src/statcmd.c             |    4 +++-
+ utils/start-stop-daemon.c |    3 ++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 863943468eb0c3e1431c7223325a469e223dcd72
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Dec 26 15:56:08 2009 +0100
+
+    libdpkg: Add new varbuf_detach function
+
+ lib/dpkg/test/t-varbuf.c |   23 +++++++++++++++++++++++
+ lib/dpkg/varbuf.c        |   12 ++++++++++++
+ lib/dpkg/varbuf.h        |    1 +
+ 3 files changed, 36 insertions(+), 0 deletions(-)
+
+commit 185613856ef85fb7f66941f9072ea69951b1a233
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 31 20:46:58 2009 +0100
+
+    libdpkg: Do not include unneeded <dpkg/dpkg-db.h>
+
+ lib/dpkg/ehandle.c |    1 -
+ lib/dpkg/mlib.c    |    1 -
+ 2 files changed, 0 insertions(+), 2 deletions(-)
+
+commit ec7fae0c2462c8cdc51ae441e192020381a4799c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Dec 26 15:43:38 2009 +0100
+
+    libdpkg: Include <dpkg/varbuf.h> instead of <dpkg/dpkg-db.h>
+
+ lib/dpkg/compression.c   |    2 +-
+ lib/dpkg/test/t-varbuf.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e964abe1e43e730d46bd0f4aad084cee2d78b944
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 13 05:28:08 2009 +0100
+
+    Remove unneeded static modifier from function variables
+    
+    The cleanup functions do not need a static variable when it's a pointer
+    and we pass its value to it.
+
+ dpkg-deb/info.c |    2 +-
+ src/main.c      |    4 ++--
+ src/query.c     |    2 +-
+ src/statcmd.c   |    2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 6731fb6c13fe2470d3420bea5b5d9b2c1d657baa
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 26 07:01:25 2009 +0200
+
+    Remove linkage against unused libraries
+    
+    Do not link against selinux on dpkg-deb, and do not link against the
+    compression libraries on dpkg.
+
+ dpkg-deb/Makefile.am |    3 +--
+ src/Makefile.am      |    2 --
+ 2 files changed, 1 insertions(+), 4 deletions(-)
+
+commit 75315f6baab0607ff03c578089bf1ca1ad8d6922
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Wed Dec 30 15:25:50 2009 +0100
+
+    Updated scripts French translation
+
+ debian/changelog |    1 +
+ scripts/po/fr.po |  213 ++++++++++++++++++++++++++----------------------------
+ 2 files changed, 102 insertions(+), 112 deletions(-)
+
+commit da24059eaffbd1084ac94a27da5f64692b2e4771
+Author: Christian PERRIER <bubulle@debian.org>
+Date:   Wed Dec 30 14:47:11 2009 +0100
+
+    Updated dpkg French translation
+
+ debian/changelog |    9 +++----
+ po/fr.po         |   63 ++++++++++++++++++-----------------------------------
+ 2 files changed, 26 insertions(+), 46 deletions(-)
+
+commit 312c68b1423bc008ef577a8a1bfb018448a44950
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Dec 23 17:12:56 2009 +0100
+
+    dpkg-source: ensure quilt's .pc directory is created before writing .pc/applied-patches
+    
+    The quilt .pc directory was not created when a new automatic patch
+    was registered and when no other patches were managed by quilt.
+    
+    Based-on-patch-by: Tommi Vainikainen <thv+debian@iki.fi>
+
+ debian/changelog                        |    9 +++++++++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    1 +
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 630dc73ddbbdff81fb3a68befd9680894dbfd031
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Dec 18 14:02:24 2009 +0100
+
+    Make show1package() take a struct pkginfoperfile
+    
+    Instead of hardcoding the usage of the pkginfo installed member,
+    pass it as an argument of a pointer to a struct pkginfoperfile, so
+    that we can choose what to show.
+
+ dpkg-deb/info.c    |    2 +-
+ lib/dpkg/dpkg-db.h |    3 ++-
+ lib/dpkg/showpkg.c |   13 +++++++------
+ src/query.c        |    4 ++--
+ 4 files changed, 12 insertions(+), 10 deletions(-)
+
+commit be33d6deea574d4b42ac97954192097376083915
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Dec 14 18:54:37 2009 +0100
+
+    Move color member from struct pkginfo to struct perpackagestate
+    
+    The only user of this field is in the dependency cycle detection,
+    only found under src/. So move it there where it belongs.
+
+ lib/dpkg/database.c |    1 -
+ lib/dpkg/dpkg-db.h  |    1 -
+ src/depcon.c        |    8 ++++----
+ src/filesdb.c       |    1 +
+ src/main.h          |    7 +++++++
+ 5 files changed, 12 insertions(+), 6 deletions(-)
+
+commit 5f5ef320041be2ab0e32768825b899629c59b2f9
+Merge: 253fcf6 57636ef
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Dec 22 16:56:11 2009 +0100
+
+    Merge branch 'sid' (through tag '1.15.5.5')
+    
+    Conflicts:
+    	debian/changelog
+
+commit 57636efa71bef220006d8d51f56fb83d5b590f27
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Dec 22 09:50:12 2009 +0100
+
+    Release 1.15.5.5
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit d4641b248e41a74976018ff7f638063c3196ef56
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Dec 22 09:39:35 2009 +0100
+
+    Allow back new lines in substvars and maintainer arguments
+    
+    Regression introdocued in commit d570dcf56c502a36b4747665938025609d5ffe47.
+
+ debian/changelog           |    7 +++++++
+ scripts/dpkg-genchanges.pl |    8 ++++----
+ scripts/dpkg-source.pl     |    4 ++--
+ 3 files changed, 13 insertions(+), 6 deletions(-)
+
+commit 253fcf6e0c3afd3a1712efc96948bfb11552bd02
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Tue Dec 15 20:23:55 2009 +0100
+
+    Simplified Chinese translation completed
+
+ po/zh_CN.po |  679 +++++++++++++++++++++++++++--------------------------------
+ 1 files changed, 311 insertions(+), 368 deletions(-)
+
+commit e9e8b10c3de872ba3c4a1c4453ec8cd62e1c2003
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Fri Dec 11 08:36:07 2009 +0100
+
+    German dselect translation update
+    
+    Update to 278t.
+
+ debian/changelog |    3 +++
+ dselect/po/de.po |   13 ++++++++-----
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+
+commit 61333aa9da36e6280a9377ad72d1c27fb517aedd
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Fri Dec 11 08:26:22 2009 +0100
+
+    German dpkg translation update
+    
+    Update to 965t.
+
+ debian/changelog |    3 +
+ po/de.po         |  470 +++++++++++++++++++++++++++--------------------------
+ 2 files changed, 242 insertions(+), 231 deletions(-)
+
+commit 0fbb038805b9975dd58e56f5507c2894faf20603
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 10 12:56:02 2009 +0100
+
+    libdpkg: Swap memset arguments in string test case
+
+ lib/dpkg/test/t-string.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 12416df9a16c70bbbe74f8767b58e7a6028050eb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 10 12:52:30 2009 +0100
+
+    libdpkg: Blank the whole MD5 context not just the size of a pointer
+    
+    The memset was using the size of the context pointer and not the actual
+    size of the struct.
+    
+    Spotted-by: Jochen Voss <voss@seehuhn.de> (on util-linux-ng)
+
+ lib/dpkg/md5.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4a6590edfb2e3e827165011594fae1ac6fdb9e78
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 10 12:49:45 2009 +0100
+
+    dpkg-query: Do not allow more than two arguments for --control-path
+    
+    The last increment to argv was not being used, but instead the
+    increment, make it useful by checking if there's any additional
+    argument after the second, and bail out in that case.
+    
+    This was spotted by a run with the clang static analyzer.
+
+ src/query.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 683d18a89197cfd824aaf291c008aebd9c6bd0c5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 10 12:32:30 2009 +0100
+
+    libdpkg: Properly increment seen fields in a stanza
+    
+    The current code was not incrementing the contents of the pointed area,
+    but the pointer itself, which was making the check for already seen
+    (duplicate) fields a no-op, and thus non-fatal, contrary to what was
+    intended originally.
+    
+    This should not be a problem in general as the tools in charge of
+    generating binary packages error out in case of duplicate fields, so
+    there should not be many broken packages on the wild.
+    
+    This was spotted by a run with the clang static analyzer.
+
+ debian/changelog |    4 ++++
+ lib/dpkg/parse.c |    2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 892a742c40eaa6d456eb6c47546d44dd3c0202dd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 10 12:30:10 2009 +0100
+
+    libdpkg: Preserve error status while reading GNU long tar names
+    
+    The code was unconditionally setting the status to 0, as that's what the
+    rest of the code expects, but it was not preserving the negative value
+    that gets set on error.
+    
+    This was spotted by a run with the clang static analyzer.
+
+ lib/dpkg/tarfn.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 8378ff9e956bb6e4659bb32b1f93a0a69b1351df
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 10 12:07:34 2009 +0100
+
+    dpkg: Check safe_read return code
+    
+    The safe_read function protects against interruptions and partial reads,
+    but not against other types of errors, for which we need to check the
+    return value.
+    
+    This was spotted by a run with the clang static analyzer.
+
+ src/archives.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+commit e33cc724cfd190dfe3e93f94f9330c52de99f11c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 10 07:51:45 2009 +0100
+
+    libdpkg: Forward declare trigkindinfo variables after defining the type
+    
+    This was spotted by a run with the clang static analyzer.
+
+ lib/dpkg/triglib.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 5862fd919d675fa4d85be312c598b3f03e737005
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 10 00:36:01 2009 +0100
+
+    dpkg: Remove duplicate oldargs variable
+    
+    Initialize newargs to NULL now that oldargs is not there for the initial
+    value.
+    
+    This was spotted by a run with the clang static analyzer.
+
+ src/main.c |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+commit 49453ca0565126dfa0f663f3771d746bedcd1bbe
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 10 00:22:09 2009 +0100
+
+    dselect: Do not forward declare ‘enum quitaction’
+    
+    Standard C++ does not allow declaring an incomplete enum type. And the
+    enum is already declared in «dselect/dselect.h» which gets included
+    first.
+    
+    This was spotted by a run with the clang static analyzer.
+
+ dselect/bindings.h |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit a29c9c8700532ae7090cee699487177ed65d9332
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 10 00:21:22 2009 +0100
+
+    Do not increment variables when the value is not going to be used
+    
+    This was spotted by a run with the clang static analyzer.
+
+ dpkg-deb/info.c |    4 ++--
+ src/archives.c  |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 80647e33d17c4ad298019102a8d28a5b44ed4ef2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 10 00:17:35 2009 +0100
+
+    Do not assign to variables when they subsequently get overwritten
+    
+    This was spotted by a run with the clang static analyzer.
+
+ dpkg-deb/info.c   |    5 ++---
+ lib/dpkg/buffer.c |    4 ++--
+ lib/dpkg/tarfn.c  |    1 -
+ src/archives.c    |    2 +-
+ src/main.c        |    2 +-
+ 5 files changed, 6 insertions(+), 8 deletions(-)
+
+commit 39b0cc3c85a63b7d17636b4d94598a954304e748
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Dec 10 00:10:37 2009 +0100
+
+    dselect: Change keybindings forward declaration to a struct
+    
+    This matches the type of the declaration in «dselect/bindings.h».
+    
+    This was spotted by a run with the clang static analyzer.
+
+ dselect/dselect.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fb2bfb6bc294c547995264b91ccdfca7d5fe6442
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Dec 9 14:41:24 2009 +0100
+
+    Fix bug closure
+    
+    Thinko in commit a3c68a75e0c9ad861666197bca55b900bf75b9e4.
+    
+    Closes: #560010
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 39c49a58f2594946638542169cc2d9c32d190beb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Dec 9 14:10:21 2009 +0100
+
+    dpkg-divert: Do not allow diverting a file to itself
+    
+    This was causing the file to get removed.
+    
+    Closes: #312206
+
+ debian/changelog       |    2 ++
+ scripts/dpkg-divert.pl |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+commit a3c68a75e0c9ad861666197bca55b900bf75b9e4
+Author: Aurelien Jarno <aurel32@debian.org>
+Date:   Wed Dec 9 13:45:30 2009 +0100
+
+    Add sparc64 to cputable
+    
+    Closes: #523456
+
+ cputable         |    1 +
+ debian/changelog |    2 ++
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+commit ae8b98bc75905042ac36db8c52d2454ea35e06b2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Dec 8 00:44:31 2009 +0100
+
+    libdpkg: Do not mark database names in writedb for translation
+    
+    This actually makes life harder for translators, and it collides with
+    similar strings from updated-alternatives.
+    
+    Suggested-by: Sven Joachim <svenjoac@gmx.de>
+
+ lib/dpkg/dump.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 39179db3df57708f49446e9e6821cc343695cb7f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Dec 2 20:11:41 2009 +0100
+
+    build: Make the Doxyfile a dependency of the doc target
+
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8bfcbaaa78a75dd10a2e85d39ef70561012348b2
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Dec 7 21:21:59 2009 +0100
+
+    Order translation by alphabet
+
+ debian/changelog |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 47ac9d08f17f88ea22538a14436b2a57ca1f25d7
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Dec 7 21:20:42 2009 +0100
+
+    Update German translation of manual pages
+    
+    Update to 1668t.
+
+ man/po/de.po |  148 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 147 insertions(+), 1 deletions(-)
+
+commit 300731b7420d51fe42299f595d77cda5ec6554a0
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Dec 7 18:43:17 2009 +0100
+
+    Update German scripts translation
+    
+    Update to 490t.
+
+ scripts/po/de.po |   13 ++++++++++++-
+ 1 files changed, 12 insertions(+), 1 deletions(-)
+
+commit a978569f205b0e6ac510e7e108ebd53e75f290ac
+Merge: a1ff6b1 f948144
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Dec 7 09:41:26 2009 +0100
+
+    Merge branch 'sid'
+
+commit f9481448433dbe0e9866586f87bc8bc21e435427
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Dec 7 09:25:21 2009 +0100
+
+    Release 1.15.5.4
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit a1ff6b1c8314048f7707d86e63ffaa9c317cebb7
+Author: Ivan Masár <helix84@centrum.sk>
+Date:   Thu Dec 3 22:17:28 2009 +0100
+
+    Slovak translation update
+
+ debian/changelog |    1 +
+ po/sk.po         |  159 ++++++++++++++++++++++++++----------------------------
+ 2 files changed, 78 insertions(+), 82 deletions(-)
+
+commit e89348732c1052625fcc39842dce851bde844c01
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Dec 3 12:17:39 2009 +0100
+
+    Dpkg::Changelog::Debian: call $entry->check_trailer() for trailer line
+    
+    The header line was checked twice, the second check was meant to
+    check the trailer line. So change it accordingly.
+
+ debian/changelog                 |    1 +
+ scripts/Dpkg/Changelog/Debian.pm |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 59931a5c45326e418354361b4535e98207028ea2
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Nov 29 18:03:10 2009 +0100
+
+    dpkg-source: verify version of the quilt metadata before build
+    
+    Since format "3.0 (quilt)" can now modify the content of the .pc
+    directory, ensure it still uses the supported format (currently version
+    2). Add an option --allow-version-of-quilt-db=<ver> to be able
+    to force creation of a source package despite the unexpected version.
+
+ man/dpkg-source.1                       |    8 ++++++++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |   28 ++++++++++++++++++++++++++++
+ 2 files changed, 36 insertions(+), 0 deletions(-)
+
+commit 8e64138221bb620ad79ed1e3738f55445271d569
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Nov 29 17:30:30 2009 +0100
+
+    dpkg-source: support debian/source/patch-header
+    
+    The content of this file is used as header of the automatic patch
+    generated in formats "2.0" and "3.0 (quilt)".
+
+ debian/changelog                        |    2 ++
+ man/dpkg-source.1                       |   12 +++++++++---
+ scripts/Dpkg/Source/Package/V2.pm       |    8 ++++++++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |   10 +++++++++-
+ 4 files changed, 28 insertions(+), 4 deletions(-)
+
+commit 38dd2a45e49e183e5bdbb64faa7353b60faa08c6
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Nov 29 16:43:47 2009 +0100
+
+    dpkg-source: support --single-debian-patch for "3.0 (quilt)"
+    
+    With this option, the automatic patch is named
+    debian/patches/debian-changes instead of
+    debian/patches/debian-changes-<ver>. With this option, the new format
+    is closer to 1.0 with its single diff that is always updated.
+
+ debian/changelog                        |    4 ++++
+ man/dpkg-source.1                       |   22 ++++++++++++++++++----
+ scripts/Dpkg/Source/Package/V3/quilt.pm |   15 ++++++++++++++-
+ 3 files changed, 36 insertions(+), 5 deletions(-)
+
+commit d881cdca55e41e1b17d84b935c9a612e08f80f98
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Nov 29 15:27:15 2009 +0100
+
+    Dpkg::Source::Package::V3::quilt: create and use .pc directory
+    
+    Instead of calling quilt to apply patches, we always apply them
+    by hand and we create the .pc directory used by quilt (version 2 in
+    .pc/.version). That way we are fully compatible with quilt and we can't
+    have differing behaviour whether quilt is installed or not.
+    
+    Update the documentation accordingly. The option --without-quilt is gone
+    as is debian/patches/.dpkg-source-applied (replaced by
+    .pc/applied-patches).
+
+ debian/changelog                        |    5 +
+ man/dpkg-source.1                       |   17 +--
+ scripts/Dpkg/Source/Package/V2.pm       |   21 ++-
+ scripts/Dpkg/Source/Package/V3/quilt.pm |  282 ++++++++++++++-----------------
+ 4 files changed, 145 insertions(+), 180 deletions(-)
+
+commit f23c4acb75a9d21092a69e9780bdf3b5d5e1d02c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Dec 2 21:50:26 2009 +0100
+
+    scripts/t/200_Dpkg_Shlibs.t: fix path of ld.so.conf file to load
+
+ scripts/t/200_Dpkg_Shlibs.t |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 113533916b1bcd300db897575b23c5bb7a14f3c0
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Dec 2 21:28:19 2009 +0100
+
+    Dpkg::Deps: cleanup API
+    
+    Rename public functions with deps_ prefix. Export them by default.
+    
+    Update all scripts using Dpkg::Deps accordingly, including the test-suite.
+
+ debian/changelog               |    2 +
+ scripts/Dpkg/Deps.pm           |  121 ++++++++++++++++++++--------------------
+ scripts/dpkg-checkbuilddeps.pl |    7 +-
+ scripts/dpkg-gencontrol.pl     |   11 ++--
+ scripts/dpkg-shlibdeps.pl      |    8 +-
+ scripts/dpkg-source.pl         |    2 +-
+ scripts/t/400_Dpkg_Deps.t      |   28 +++++-----
+ 7 files changed, 90 insertions(+), 89 deletions(-)
+
+commit b24d1fecdd58637d4bb63799c0c4b719fe9dd4ce
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Nov 30 22:38:05 2009 +0100
+
+    Dpkg::Deps: use "use base" instead of @ISA
+
+ scripts/Dpkg/Deps.pm |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit c090a59a04b20b41093757658c9c73f4d7603e94
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Nov 30 22:34:12 2009 +0100
+
+    Dpkg::Deps: replace dump() method with output([$fh])
+    
+    Update test suite accordingly as well as all scripts using Dpkg::Deps.
+    Also use overload to provide a string representation corresponding to
+    what's returned by output().
+
+ debian/changelog               |    3 ++
+ scripts/Dpkg/Deps.pm           |   60 +++++++++++++++++++++++++++------------
+ scripts/dpkg-checkbuilddeps.pl |    4 +-
+ scripts/dpkg-gencontrol.pl     |    2 +-
+ scripts/dpkg-shlibdeps.pl      |    2 +-
+ scripts/dpkg-source.pl         |    2 +-
+ scripts/t/400_Dpkg_Deps.t      |   21 +++++++------
+ 7 files changed, 60 insertions(+), 34 deletions(-)
+
+commit 8d3f6904f30cf6f38c0357195c93cfacf1191a12
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Tue Dec 1 09:07:20 2009 +0100
+
+    Correct encoding
+
+ po/zh_CN.po | 4383 ++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 2048 insertions(+), 2335 deletions(-)
+
+commit 61dc4b2344c48a80efb38ef856007833b402ffc2
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Tue Dec 1 07:28:10 2009 +0100
+
+    Updated Simplified Chinese translation
+
+ debian/changelog |    3 +
+ po/zh_CN.po      | 4454 +++++++++++++++++++++++++++++-------------------------
+ 2 files changed, 2393 insertions(+), 2064 deletions(-)
+
+commit d6b7de040f117613704642cb04e01b5f7aeaee15
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Nov 30 18:32:20 2009 +0100
+
+    Update German scripts translation
+    
+    Update to 488t.
+
+ scripts/po/de.po |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 6f3d7cec57e1f55fc25f9822b3e0344b88734024
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Nov 30 18:28:40 2009 +0100
+
+    Update German translation of manual pages
+    
+    Update to 1656t.
+
+ man/po/de.po |   15 ++++-----------
+ 1 files changed, 4 insertions(+), 11 deletions(-)
+
+commit c0129f02141676402101caaa966c2b1d18fd8dc7
+Author: Roderich Schupp <roderich.schupp@googlemail.com>
+Date:   Sun Nov 29 18:19:27 2009 +0100
+
+    Dpkg::Index: fix get() and remove() methods
+    
+    They were using non-existing get_by_keys() method instead of get_keys().
+
+ debian/changelog      |    7 +++++++
+ scripts/Dpkg/Index.pm |    4 ++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+commit 0fc211581b9bfbc2b1575d4bd79fa06fc30d6083
+Merge: abf3787 b6a2926
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Nov 29 17:02:08 2009 +0100
+
+    Merge sid branch through commit '1.15.5.3'
+    
+    Conflicts:
+    	man/po/de.po
+    	man/po/sv.po
+    	scripts/dpkg-scanpackages.pl
+    	scripts/po/de.po
+    	scripts/po/sv.po
+
+commit abf378780102adedb7d13f4d36a1641d8856499e
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sun Nov 29 07:45:26 2009 +0100
+
+    Make the translation of "original" consistent
+
+ debian/changelog |    2 ++
+ man/po/fr.po     |   52 ++++++++++++++++++++++++++--------------------------
+ 2 files changed, 28 insertions(+), 26 deletions(-)
+
+commit b6a2926a1670d28583ad38c43981fb2f425057de
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 27 19:23:48 2009 +0100
+
+    Release 1.15.5.3
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 3488b014fd8d62f6beb6da60f8427599ac02958b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 27 18:52:25 2009 +0100
+
+    Regenerate .pot files and merge .po files with them
+
+ man/po/de.po            |  289 ++++++++++++++++++++++++-----------------------
+ man/po/dpkg-man.pot     |  282 +++++++++++++++++++++++-----------------------
+ man/po/es.po            |  282 +++++++++++++++++++++++-----------------------
+ man/po/fr.po            |  282 +++++++++++++++++++++++-----------------------
+ man/po/hu.po            |  282 +++++++++++++++++++++++-----------------------
+ man/po/ja.po            |  282 +++++++++++++++++++++++-----------------------
+ man/po/pl.po            |  289 ++++++++++++++++++++++++-----------------------
+ man/po/pt_BR.po         |  282 +++++++++++++++++++++++-----------------------
+ man/po/ru.po            |  282 +++++++++++++++++++++++-----------------------
+ man/po/sv.po            |  289 ++++++++++++++++++++++++-----------------------
+ po/ast.po               |  111 ++++++++++---------
+ po/bs.po                |  111 ++++++++++---------
+ po/ca.po                |  111 ++++++++++---------
+ po/cs.po                |  111 ++++++++++---------
+ po/da.po                |  111 ++++++++++---------
+ po/de.po                |  111 ++++++++++---------
+ po/dpkg.pot             |  111 ++++++++++---------
+ po/dz.po                |  111 ++++++++++---------
+ po/el.po                |  111 ++++++++++---------
+ po/eo.po                |  111 ++++++++++---------
+ po/es.po                |  111 ++++++++++---------
+ po/et.po                |  111 ++++++++++---------
+ po/eu.po                |  111 ++++++++++---------
+ po/fr.po                |  111 ++++++++++---------
+ po/gl.po                |  111 ++++++++++---------
+ po/hu.po                |  111 ++++++++++---------
+ po/id.po                |  111 ++++++++++---------
+ po/it.po                |  111 ++++++++++---------
+ po/ja.po                |  111 ++++++++++---------
+ po/km.po                |  111 ++++++++++---------
+ po/ko.po                |  111 ++++++++++---------
+ po/ku.po                |  111 ++++++++++---------
+ po/lt.po                |  111 ++++++++++---------
+ po/mr.po                |  111 ++++++++++---------
+ po/nb.po                |  111 ++++++++++---------
+ po/ne.po                |  111 ++++++++++---------
+ po/nl.po                |  111 ++++++++++---------
+ po/nn.po                |  111 ++++++++++---------
+ po/pa.po                |  111 ++++++++++---------
+ po/pl.po                |  111 ++++++++++---------
+ po/pt.po                |  111 ++++++++++---------
+ po/pt_BR.po             |  111 ++++++++++---------
+ po/ro.po                |  111 ++++++++++---------
+ po/ru.po                |  111 ++++++++++---------
+ po/sk.po                |  111 ++++++++++---------
+ po/sv.po                |  111 ++++++++++---------
+ po/th.po                |  111 ++++++++++---------
+ po/tl.po                |  111 ++++++++++---------
+ po/vi.po                |  111 ++++++++++---------
+ po/zh_CN.po             |  111 ++++++++++---------
+ po/zh_TW.po             |  111 ++++++++++---------
+ scripts/po/ca.po        |  190 ++++++++++++++++---------------
+ scripts/po/de.po        |  191 +++++++++++++++++---------------
+ scripts/po/dpkg-dev.pot |  186 ++++++++++++++++--------------
+ scripts/po/fr.po        |  193 +++++++++++++++++---------------
+ scripts/po/pl.po        |  193 +++++++++++++++++---------------
+ scripts/po/ru.po        |  193 +++++++++++++++++---------------
+ scripts/po/sv.po        |  191 +++++++++++++++++---------------
+ 58 files changed, 4520 insertions(+), 4209 deletions(-)
+
+commit 327232c0c5ab933ec9ae981550f16f2d3218cdaa
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Nov 27 14:12:24 2009 +0100
+
+    Add missing bug closure
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 7169f0d3cf463be84b7b5609859c98e6cbd8ba2c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Nov 26 14:21:13 2009 +0100
+
+    Dpkg::IPC::fork_and_exec(): put modified environment variables in error messages
+    
+    The descriptive command-line given to wait_child() now also includes the
+    environment variables that have been set since they may affect the
+    behaviour of the executed command and are likely needed to reproduce the
+    problem.
+    
+    With this change, the quilt failures within dpkg-source are better
+    identified: QUILT_PATCHES can be checked to know if it was working
+    on the main tree or the temporary one and QUILT_PATCH_OPTS is
+    seen by users who can then independently reproduce the failure (and not
+    wonder why they can't reproduce it).
+
+ debian/changelog    |    3 +++
+ scripts/Dpkg/IPC.pm |    8 +++++++-
+ 2 files changed, 10 insertions(+), 1 deletions(-)
+
+commit 2b907c90590d417d6590fcc28a6cf5218c2cc986
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 24 22:24:56 2009 +0100
+
+    dpkg-statoverride: Fail on chown or chmod errors when using --update
+    
+    Fail if it cannot update the mode and owner of the file. This would fail
+    later on when dpkg itself applies the overrides, so better to signal
+    this as earlier as possible.
+
+ debian/changelog |    3 +++
+ src/statcmd.c    |    4 ++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit b2361bd91847134984f8ee418d7112530dc55dfe
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 24 18:57:28 2009 +0100
+
+    dpkg-statoverride: Make --quiet actually do something
+    
+    Quiesce most of the inoquous warning messages.
+    
+    Closes: #403211
+
+ debian/changelog |    2 ++
+ src/statcmd.c    |    9 +++++----
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+commit e7a7e91200af8c57ed803009fd668536358ac6ed
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 24 18:36:06 2009 +0100
+
+    dpkg-statoverride: Move access check outside of statdb_node_apply
+    
+    Command line options should only be known by the statoverride_*
+    functions.
+
+ src/statcmd.c |   23 +++++++++++------------
+ 1 files changed, 11 insertions(+), 12 deletions(-)
+
+commit 977648880d79f18cfa5fff0201f739622ffe17b7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 24 18:27:15 2009 +0100
+
+    Use named initializers in structures
+
+ lib/dpkg/buffer.c    |    2 +-
+ lib/dpkg/parsehelp.c |   12 ++++++------
+ lib/dpkg/triglib.c   |    6 +++---
+ src/enquiry.c        |   38 +++++++++++++++++++++++++-------------
+ 4 files changed, 35 insertions(+), 23 deletions(-)
+
+commit 12b6f988ff2210c7028a9bb782caadf00151035c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 23 04:35:32 2009 +0100
+
+    Use designated initializers for namevalue array elements
+    
+    This way we ensure the order in the array by the value itself, and make
+    the code resilient to possible changes in the sequence of the enums.
+
+ lib/dpkg/parsehelp.c |   75 ++++++++++++++++++++++++++------------------------
+ src/help.c           |   16 +++++-----
+ 2 files changed, 47 insertions(+), 44 deletions(-)
+
+commit 31edd4e2a3e1adf723a1f9caf738be7d73605c83
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 24 03:24:07 2009 +0100
+
+    dpkg: Rename ‘struct badstatinfo’ member val to value
+
+ src/enquiry.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e1b5e94395d10bf533015268beafb6604197632f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Nov 24 01:39:43 2009 +0100
+
+    Dpkg::Source::Package::V3::quilt: check debian/patches{,series} before build
+    
+    Before accepting to build a 3.0 (quilt) source packages, ensure that
+    debian/patches is a directory (or non-existing) and that
+    debian/patches/series is a file (or non-existing).
+
+ debian/changelog                        |    3 +++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |   18 ++++++++++++++++++
+ 2 files changed, 21 insertions(+), 0 deletions(-)
+
+commit 6dbf501ff1c09aa3ef2ea09259b23322fa5bea02
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Nov 24 00:51:59 2009 +0100
+
+    Dpkg::Source::Package::V3::quilt: set QUILT_PATCH_OPTS to mimick D::S::Patch
+    
+    When building "3.0 (quilt)" source packages, use QUILT_PATCH_OPTS="-t -F 0
+    -N -u -V never -g0" so that quilt is as strict as dpkg-source's internal
+    implementation of quilt that relies on Dpkg::Source::Patch::apply().
+
+ debian/changelog                        |    3 +++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    6 ++++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit 15afc8e967d5083ca3060caa10405dad82f701b8
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Nov 23 22:02:33 2009 +0100
+
+    Dpkg::Changelog::Entry::Debian: add missing "use Dpkg::Gettext"
+
+ debian/changelog                       |    2 ++
+ scripts/Dpkg/Changelog/Entry/Debian.pm |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 9120ae92acf363f60aaca258154e77a87e767fc8
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Nov 23 19:34:59 2009 +0100
+
+    Update German translation of manual pages
+    
+    Update to 1657t.
+
+ man/po/de.po |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+commit bae71de35acce65b7980442a5e6c023610490291
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Nov 23 19:32:16 2009 +0100
+
+    Update German scripts translation
+    
+    Update to 486t.
+
+ scripts/po/de.po |  108 +++++++++++++++++++++++++++++------------------------
+ 1 files changed, 59 insertions(+), 49 deletions(-)
+
+commit 77b078af402eb41027227117c7ef223a3941b457
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Nov 23 08:58:29 2009 +0100
+
+    Dpkg::Control::Hash: document how leading/trailing spaces are treated
+
+ scripts/Dpkg/Control/Hash.pm |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit b8c2b200c3dd0678988593c5839be3cd2aecf84a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 22 22:23:59 2009 +0100
+
+    Dpkg::Control::Hash: Strip leading spaces in the first line of a field's value
+    
+    The fields in a compliant control-style file are allowed to have values
+    starting with any number of spaces. But that only applies to the first
+    line on multi-line field values, so do not do the same on subsequent
+    lines as those are handled differently.
+    
+    Regression introduced in commit 7d8d193332478de82e20ed5b49053378801d160f.
+    
+    Closes: #557547
+
+ debian/changelog             |    2 ++
+ scripts/Dpkg/Control/Hash.pm |    2 +-
+ scripts/t/700_Dpkg_Control.t |    2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 6d784ebcd108cdb0aff3ecb3a6934e03067cdd72
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 22 20:48:34 2009 +0100
+
+    Refer to “half configured” instead of “failed config”
+    
+    Use it in «dpkg-query -l» header and dselect package status printing for
+    consistency with the rest of the ouput. This seems to have been a source
+    of confusion in the past, so we'll try to use this nomenclature to refer
+    to this package status.
+
+ debian/changelog      |    2 ++
+ dselect/pkgdisplay.cc |    2 +-
+ src/query.c           |    2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+commit a796023222610f59b127e7b04d9800c12694e1d7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 22 19:24:35 2009 +0100
+
+    u-a: Improve --display output
+    
+    Use two leading spaces for current link and slave information. Use
+    single quotes for both “best” and the alternative it's pointing to.
+    
+    Closes: #549167
+
+ debian/changelog               |    3 +++
+ scripts/update-alternatives.pl |    8 ++++----
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+commit 9d782cd3bfa542ad5c0536270e972539a5a61198
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 22 17:47:46 2009 +0100
+
+    Small changelog police raid
+    
+    Remove an annoying space that was making dch misbehave.
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit b909dc419ec668d98365d8392fe114dd19f26dfa
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 22 17:45:30 2009 +0100
+
+    libdpkg: Improve and mark more messages for translation in writedb()
+    
+    This should make translators lifes easier.
+    
+    Closes: #408525
+
+ debian/changelog |    2 ++
+ lib/dpkg/dump.c  |   22 ++++++++++++----------
+ 2 files changed, 14 insertions(+), 10 deletions(-)
+
+commit 7f64bc6544061ba534541a66ae4dab8c88a96a14
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Nov 22 16:34:11 2009 +0100
+
+    dpkg-source: fail if several orig.tar files are available
+    
+    This concerns formats 2.0 and 3.0 (quilt) where the upstream tarball can
+    be available with different compression schemes. We need precisely one
+    file otherwise it doesn't know which one should be used and might pick the
+    wrong one.
+
+ debian/changelog                  |    3 +++
+ scripts/Dpkg/Source/Package/V2.pm |    4 ++++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit d3cc0605237b615e294c5060b911bf6b1b883731
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Nov 22 15:02:59 2009 +0100
+
+    dpkg-source: add "3.0 (quilt)" in the (fallback) list of formats to try
+
+ debian/changelog       |    2 ++
+ man/dpkg-source.1      |    5 +++--
+ scripts/dpkg-source.pl |    2 +-
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+
+commit 4b0a933f75887563d1c1bc278359d091a809e525
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 22 04:23:23 2009 +0100
+
+    u-a: Verify that the alternative used in --set has been registered
+    
+    Give a proper error message instead of failing with an undefined
+    value when calling the slave method. Additionally verify the alternative
+    before switching to manual mode, avoiding this way unneeded log messages
+    in case of error.
+    
+    Closes: #554136
+
+ debian/changelog               |    6 ++++++
+ scripts/update-alternatives.pl |    7 ++++++-
+ 2 files changed, 12 insertions(+), 1 deletions(-)
+
+commit 0991804eb36d3ced309c5d542833365dec18e934
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Nov 21 15:00:30 2009 +0100
+
+    dpkg-scanpackages: avoid IO::String usage
+    
+    Instead we use Dpkg::IPC to get a pipe file descriptor where we can
+    read the output of dpkg-deb -I.
+
+ debian/changelog             |    7 +++++++
+ scripts/dpkg-scanpackages.pl |   20 ++++++++------------
+ 2 files changed, 15 insertions(+), 12 deletions(-)
+
+commit 49eac2815606caa3d6e48280c144025477234e88
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Nov 21 12:08:29 2009 +0100
+
+    Update German translation of manual pages
+    
+    Update to 1656t.
+
+ debian/changelog |    3 +-
+ man/po/de.po     |  101 ++++++++++++++++++++---------------------------------
+ 2 files changed, 40 insertions(+), 64 deletions(-)
+
+commit 37638f2c6535c6c6eac1a88368f79ae35628fd65
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Nov 21 11:55:07 2009 +0100
+
+    Update German scripts translation
+    
+    Update to 483t.
+
+ debian/changelog |    3 ++-
+ scripts/po/de.po |   10 +++++-----
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+commit a7fda5ead5e00f5a5b5fee4b2d6796d78931d002
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 21 05:03:00 2009 +0100
+
+    dpkg-checkbuilddeps: Split usage string in several translatable strings
+
+ scripts/dpkg-checkbuilddeps.pl |   13 +++++++------
+ 1 files changed, 7 insertions(+), 6 deletions(-)
+
+commit 467bfa7c2efef3ea3d3f75060b2d867dd94a6fab
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 21 04:41:08 2009 +0100
+
+    dpkg-checkbuilddeps: Use an anonymous subroutine for --help
+
+ scripts/dpkg-checkbuilddeps.pl |    7 +------
+ 1 files changed, 1 insertions(+), 6 deletions(-)
+
+commit 24d7f791352c262bae83592657c53dcc96a7c3c4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 21 04:38:47 2009 +0100
+
+    dpkg-checkbuilddeps: Add a --version option
+
+ debian/changelog               |    1 +
+ man/dpkg-checkbuilddeps.1      |    3 +++
+ scripts/dpkg-checkbuilddeps.pl |    8 ++++++++
+ 3 files changed, 12 insertions(+), 0 deletions(-)
+
+commit c1fc5612e49913163ed942926828f829133ac4c1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 21 04:30:57 2009 +0100
+
+    dpkg-checkbuilddeps: Recognize --help in addition to -h
+
+ debian/changelog               |    1 +
+ man/dpkg-checkbuilddeps.1      |    4 ++--
+ scripts/dpkg-checkbuilddeps.pl |    4 ++--
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+commit c8b3cd642ffdeb241c1c0961506b18d5e1f8c48c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 21 04:27:26 2009 +0100
+
+    dpkg-checkbuilddeps: Remove unneeded dashes in GetOptions arguments
+
+ scripts/dpkg-checkbuilddeps.pl |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit c7d2323b66476720c0cee26905b4642593d8f008
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 21 04:26:11 2009 +0100
+
+    Handle argument parsing consistently in all tools
+
+ debian/changelog               |    4 ++++
+ scripts/dpkg-checkbuilddeps.pl |    3 ++-
+ scripts/dpkg-scanpackages.pl   |    4 ++--
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+commit 6456236bc31c762bf043cafa86b991cee465c734
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 21 04:08:28 2009 +0100
+
+    dpkg-scansources: Update Getopt::Long setup code
+    
+    Configure it at use time. Use posix_default instead of defining
+    POSIXLY_CORRECT in the environment and setting the options that
+    would be enabled by default on POSIX. Call GetOptions in main
+    instead of calling init.
+
+ scripts/dpkg-scansources.pl |   32 +++-----------------------------
+ 1 files changed, 3 insertions(+), 29 deletions(-)
+
+commit 6f721c1d064c335307d4e56098e4c81cb56db85b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 21 03:18:10 2009 +0100
+
+    dpkg-scansources: Update comments
+    
+    Remove an obsolete one. And move another one closer to the relevant
+    code.
+
+ scripts/dpkg-scansources.pl |    9 ++-------
+ 1 files changed, 2 insertions(+), 7 deletions(-)
+
+commit 92303f6cba1ad180d7026a60bab9596b8c058fd7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 21 03:14:23 2009 +0100
+
+    Use angle brackets to mark i/o from descriptors
+    
+    In this case use “<standard output>” and “<standard input>”, to make
+    it clear that it's not a file with such name, in the same way we do in
+    the reset of the code base.
+
+ scripts/Dpkg/Control/Info.pm |    2 +-
+ scripts/changelog/debian.pl  |    2 +-
+ scripts/dpkg-gensymbols.pl   |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit a99017c55cfd69135110b48fb77203f413077228
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 20 03:14:29 2009 +0100
+
+    build: Do not ship objdump.tags-<arch> files in the repo
+    
+    This was causing diff problems as the file was changing depending on the
+    build system. Now it should be stable as it's always generated at check
+    time.
+
+ scripts/Makefile.am                          |   11 ++--
+ scripts/t/200_Dpkg_Shlibs.t                  |    7 ++-
+ scripts/t/200_Dpkg_Shlibs/objdump.tags-amd64 |   72 -------------------------
+ scripts/t/200_Dpkg_Shlibs/objdump.tags-i386  |   73 --------------------------
+ 4 files changed, 11 insertions(+), 152 deletions(-)
+
+commit 791ec2860288979ed1e34d7b963c198b61973a33
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 20 04:14:34 2009 +0100
+
+    Namespace temporary directories for test cases
+    
+    We avoid any name clashes during the test suite run. And the hierarchy
+    gets more clear when debugging in case any problem arises.
+
+ scripts/t/500_Dpkg_Path.t           |    3 ++-
+ scripts/t/900_update_alternatives.t |    2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit bc498b8ad1e6f1aa5320c3181f2aa59d3be53e54
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 20 04:03:36 2009 +0100
+
+    Refactor temporary test cases path to a tmpdir variable
+    
+    This allows to change it in a single place.
+
+ scripts/Makefile.am                 |    6 ++-
+ scripts/t/500_Dpkg_Path.t           |   60 ++++++++++++++++++-----------------
+ scripts/t/900_update_alternatives.t |    9 +++--
+ 3 files changed, 40 insertions(+), 35 deletions(-)
+
+commit fd6d1dd81f117c2bd220d72d383e90c3a7ddd243
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 19 21:42:40 2009 +0100
+
+    build: Split test_cases and test_data from EXTRA_DIST
+    
+    Avoid duplicated lists of files. Also this way we have proper
+    depdendencies in the check target for test_data files.
+
+ scripts/Makefile.am |   88 +++++++++++++++++++++++++++-----------------------
+ 1 files changed, 47 insertions(+), 41 deletions(-)
+
+commit 2d6593e7b496888b5b367cff8bf7936c5a8d77dd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 19 05:51:38 2009 +0100
+
+    build: Clean up perl test suite invokation
+    
+    Wrap it into several lines. Remove unneeded quotes around some
+    arguments. Regroup environment variables settings.
+
+ scripts/Makefile.am |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 6d7c80bafad5f090c1da8e8ce0e5731d99dc13b5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 19 05:46:47 2009 +0100
+
+    build: Do not copy 200_Dpkg_Shlibs data files to t.tmp
+    
+    The copy was done to make the relative paths inside the ld.so.conf
+    fragments work even in out of tree builds. We now switch the current
+    directory to $srcdir in 200_Dpkg_Shlibs.t when loading the fragments
+    and then go back.
+
+ scripts/Makefile.am                                |    3 ---
+ scripts/t/200_Dpkg_Shlibs.t                        |    9 ++++++++-
+ scripts/t/200_Dpkg_Shlibs/ld.so.conf               |    2 +-
+ .../200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf  |    2 +-
+ .../t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf  |    2 +-
+ 5 files changed, 11 insertions(+), 7 deletions(-)
+
+commit 48a5ef95febedf411e67a68788de5048b9dcf8f2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 19 05:41:55 2009 +0100
+
+    build: Merge the mkdir_t_tmp target into the check target
+
+ scripts/Makefile.am |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+commit 02f3d0bb686d384a2ebe878084cac94008fa516f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 19 05:13:25 2009 +0100
+
+    Use new datadir variable instead of redefining srcdir
+
+ scripts/t/200_Dpkg_Shlibs.t    |   52 ++++++++++++++++++++--------------------
+ scripts/t/600_Dpkg_Changelog.t |   12 ++++----
+ scripts/t/700_Dpkg_Control.t   |    8 +++---
+ scripts/t/750_Dpkg_Substvars.t |    4 +-
+ 4 files changed, 38 insertions(+), 38 deletions(-)
+
+commit 5eeb687e02e9b389e7b2d1d52904bb22d6b680d4
+Merge: fd4024d a71228d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Nov 18 13:23:51 2009 +0100
+
+    Merge commit '1.15.5.2'
+
+commit fd4024d0443164611fe2f0d7ef48ba652eb99464
+Author: Peter Krefting <peterk@debian.org>
+Date:   Wed Nov 18 13:02:55 2009 +0100
+
+    Update changelog for previous commit.
+
+ debian/changelog |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit a1bbd0eb248c69212feb861024fa93d5b177f99f
+Author: Peter Krefting <peterk@debian.org>
+Date:   Wed Nov 18 12:57:37 2009 +0100
+
+    Update Swedish translation.
+    
+    man/po/sv.po: 1656t0f0u.
+    scripts/po/sv.po: 483t0f0u.
+
+ man/po/sv.po     |   72 +++++++++++++++++++++++++++--------------------------
+ scripts/po/sv.po |   10 +++---
+ 2 files changed, 42 insertions(+), 40 deletions(-)
+
+commit a71228d1f682566ba4dfbfd59f92bb5d3f2dd10d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Nov 18 11:55:52 2009 +0100
+
+    Release 1.15.5.2
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit a7abd18299bdeb6e632774b3df7636a8c4aaeb58
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Nov 18 11:20:58 2009 +0100
+
+    Dpkg::Control::Fields, Dpkg::Version: avoid the "_" prototype
+    
+    Keep compatibility with perl 5.8 by avoiding the "_" prototype which
+    has been introduced in perl 5.10.
+
+ debian/changelog               |    1 +
+ scripts/Dpkg/Control/Fields.pm |    3 ++-
+ scripts/Dpkg/Version.pm        |    6 +++---
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 2d74173f41909fd43061fb7d81a3795a6fefc59d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Nov 18 10:58:07 2009 +0100
+
+    dpkg-shlibdeps: always use Dpkg::Version
+    
+    Instead of mixing usual scalars with Dpkg::Version objects, always use
+    Dpkg::Version objects when storing a version.
+
+ debian/changelog          |    2 ++
+ scripts/dpkg-shlibdeps.pl |    7 ++++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+commit 002807af80090b60bf54c19c4dc6cd1eadf2a0d6
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Nov 18 10:38:11 2009 +0100
+
+    Dpkg::Version: accept invalid versions by default
+    
+    Accepting invalid version is the right default behaviour because
+    you often have to mix empty strings and versions and it's nice
+    to not have to special case too much.
+    
+    In particular, we should be able to do "$vobj eq ''" without encountering
+    an error. Ensure this behaviour is kept by adding proper non-regression
+    tests.
+    
+    Also enable fallback behaviour for all operators which have not been
+    explicitely implemented. The boolean operator returns true if the
+    version is valid, false otherwise.
+    
+    Update the rest of the code that was doing "Dpkg::Version->new($v) || $v"
+    precisely to be able to store a version even if it's invalid.
+
+ debian/changelog                       |    8 +++++++
+ scripts/Dpkg/Changelog/Entry/Debian.pm |    2 +-
+ scripts/Dpkg/Deps.pm                   |    2 +-
+ scripts/Dpkg/Version.pm                |   36 ++++++++++++++++++++++++-------
+ scripts/t/100_Dpkg_Version.t           |   19 ++++++++++++++--
+ 5 files changed, 54 insertions(+), 13 deletions(-)
+
+commit 41630a6688a182fea92b37d536cf743658d6ec07
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Nov 17 17:26:30 2009 +0100
+
+    debian/control: add the accent on my first name
+
+ debian/changelog |    7 +++++++
+ debian/control   |    2 +-
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
+commit dc57a7701902cfb488e5b2d8b856c0f73f01753d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 17 16:42:11 2009 +0100
+
+    Release 1.15.5.1
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 0043d020cf7aafe3e253c6d5c9afb93521971e60
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 17 16:29:33 2009 +0100
+
+    libdpkg: Include <dpkg/test.h> first on test cases
+    
+    The <dpkg/test.h> header includes <config.h> which takes care of
+    properly defining the system properties including the correct off_t
+    type. As it was not being included first, there was type missmatches
+    between libdpkg and some of the unit tests.
+    
+    Suggested-by: Pierre Habouzit <madcoder@debian.org>
+    Suggested-by: Julien Cristau <jcristau@debian.org>
+
+ debian/changelog         |    8 ++++++++
+ lib/dpkg/test/t-buffer.c |    4 ++--
+ lib/dpkg/test/t-path.c   |    4 ++--
+ lib/dpkg/test/t-string.c |    4 ++--
+ 4 files changed, 14 insertions(+), 6 deletions(-)
+
+commit a0e6a6d395b0e152c28a11407ed0f24991cbe5f2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 17 10:18:08 2009 +0100
+
+    Release 1.15.5
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit dce857c0d2015359def604a989cbab37358916f3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 17 10:17:26 2009 +0100
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |   16 +-
+ dselect/po/ca.po        |   16 +-
+ dselect/po/cs.po        |   16 +-
+ dselect/po/da.po        |   16 +-
+ dselect/po/de.po        |   16 +-
+ dselect/po/dselect.pot  |   16 +-
+ dselect/po/el.po        |   16 +-
+ dselect/po/es.po        |   16 +-
+ dselect/po/et.po        |   16 +-
+ dselect/po/eu.po        |   16 +-
+ dselect/po/fr.po        |   16 +-
+ dselect/po/gl.po        |   16 +-
+ dselect/po/hu.po        |   16 +-
+ dselect/po/id.po        |   16 +-
+ dselect/po/it.po        |   16 +-
+ dselect/po/ja.po        |   16 +-
+ dselect/po/ko.po        |   16 +-
+ dselect/po/nb.po        |   16 +-
+ dselect/po/nl.po        |   16 +-
+ dselect/po/nn.po        |   16 +-
+ dselect/po/pl.po        |   16 +-
+ dselect/po/pt.po        |   16 +-
+ dselect/po/pt_BR.po     |   16 +-
+ dselect/po/ro.po        |   16 +-
+ dselect/po/ru.po        |   16 +-
+ dselect/po/sk.po        |   16 +-
+ dselect/po/sv.po        |   16 +-
+ dselect/po/tl.po        |   16 +-
+ dselect/po/vi.po        |   16 +-
+ dselect/po/zh_CN.po     |   16 +-
+ dselect/po/zh_TW.po     |   16 +-
+ man/po/de.po            |  224 +++++++++++++------
+ man/po/dpkg-man.pot     |  132 +++++++----
+ man/po/es.po            |  156 ++++++++-----
+ man/po/fr.po            |  582 +++++++++++++++++++++++++----------------------
+ man/po/hu.po            |  172 ++++++++++-----
+ man/po/ja.po            |  176 ++++++++++-----
+ man/po/pl.po            |  203 +++++++++++------
+ man/po/pt_BR.po         |  172 ++++++++++-----
+ man/po/ru.po            |  172 ++++++++++-----
+ man/po/sv.po            |  318 +++++++++++++++-----------
+ po/fr.po                |   36 ++-
+ scripts/po/ca.po        |   75 ++++---
+ scripts/po/de.po        |   77 ++++---
+ scripts/po/dpkg-dev.pot |   75 ++++---
+ scripts/po/fr.po        |   77 ++++---
+ scripts/po/pl.po        |   77 ++++---
+ scripts/po/ru.po        |   77 ++++---
+ scripts/po/sv.po        |   86 ++++----
+ 49 files changed, 2020 insertions(+), 1363 deletions(-)
+
+commit 1fbe29f19be4a6bb7415859d6c4f8fa6e61f26d8
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Nov 17 09:49:17 2009 +0100
+
+    debian/source/options: use long option name as per new syntax
+
+ debian/source/options |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 062878ba0266c2be36f498f6f10e1ce153bd75f0
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Nov 17 09:57:34 2009 +0100
+
+    Dpkg::Conf: fix parsing of options with values
+
+ scripts/Dpkg/Conf.pm |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 362bc31aa683cc142871e256d3d4c610c2e93a58
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Nov 17 09:43:17 2009 +0100
+
+    dpkg-source: parse only long options from debian/source/options
+    
+    debian/source/options can now only contain long options. The
+    following lines would result in "--option1 --option1=value"
+    passed to dpkg-source -b:
+     option1
+     option2 = value
+    
+    Dpkg::Conf has been modified to refuse short options by default.
+
+ debian/changelog       |    2 +-
+ man/dpkg-source.1      |   24 +++++++++++++++++-------
+ scripts/Dpkg/Conf.pm   |    5 +++++
+ scripts/dpkg-source.pl |    4 ++--
+ 4 files changed, 25 insertions(+), 10 deletions(-)
+
+commit 4d5c2991d36fab0e7423cac76e0bd0b55ea763a1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 17 08:29:32 2009 +0100
+
+    scripts: Update objdump.tags files
+
+ scripts/t/200_Dpkg_Shlibs/objdump.tags-amd64 |   64 +++++++++++++------------
+ scripts/t/200_Dpkg_Shlibs/objdump.tags-i386  |   66 +++++++++++++------------
+ 2 files changed, 67 insertions(+), 63 deletions(-)
+
+commit 2549c18438a95df50e20a12b6137cec40d1a95d2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 17 08:13:49 2009 +0100
+
+    build: Add debian/source/ files to EXTRA_DIST
+
+ Makefile.am |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit ffd7cb61949febf5727d12524c7fcdd50282248e
+Author: Milo Casagrande <milo@ubuntu.com>
+Date:   Tue Nov 17 07:43:17 2009 +0100
+
+    Italian translation update
+    
+    Updated to 964t.
+
+ po/it.po |   87 +++++++++++++++++++++++++++-----------------------------------
+ 1 files changed, 38 insertions(+), 49 deletions(-)
+
+commit 286447632afdf7d7fddba008f577c7b0e6958900
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 17 07:34:27 2009 +0100
+
+    The changelog police is back
+    
+    Add newsworthy items. Sort entries following the law!
+
+ debian/changelog |   13 ++++++++-----
+ 1 files changed, 8 insertions(+), 5 deletions(-)
+
+commit 63ccb3ce6df8730b9ca8ae8ee0b043cd15f9d5a9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 17 07:07:16 2009 +0100
+
+    man: Update modification dates
+
+ man/deb-substvars.5       |    2 +-
+ man/deb-triggers.5        |    2 +-
+ man/dpkg-architecture.1   |    2 +-
+ man/dpkg-buildpackage.1   |    2 +-
+ man/dpkg-gensymbols.1     |    2 +-
+ man/dpkg-parsechangelog.1 |    2 +-
+ man/dpkg-scanpackages.1   |    2 +-
+ man/dpkg-scansources.1    |    2 +-
+ man/dpkg-shlibdeps.1      |    2 +-
+ man/dpkg-source.1         |    2 +-
+ man/dpkg-split.1          |    2 +-
+ man/dpkg-trigger.1        |    2 +-
+ man/dpkg.1                |    2 +-
+ man/start-stop-daemon.8   |    2 +-
+ man/update-alternatives.8 |    2 +-
+ 15 files changed, 15 insertions(+), 15 deletions(-)
+
+commit 162b4055bd77ff455b0013be20b95d3c31d44051
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 17 06:54:26 2009 +0100
+
+    dpkg-source: Check if the opmode option is defined before use
+    
+    This was producing an unitialized value usage perl warning when using
+    --help or --version.
+
+ scripts/dpkg-source.pl |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit f68aa9619e1e777fad5ff578ad258f768d45f250
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 17 05:07:53 2009 +0100
+
+    dpkg-buildpackage: Do not list supported compressors in --help output
+    
+    The xz compressor was missing from the --help output for -Z, instead of
+    adding it, let dpkg-source have the list of supported ones, so that we
+    don't have to worry about out-of-dateness in the future.
+
+ scripts/dpkg-buildpackage.pl |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2d57b4f715409cbe8cd3dc7a1cc2380ec9fd50de
+Merge: aff8de1 3700faf
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Nov 17 08:01:18 2009 +0100
+
+    Merge branch sid (through commit '1.15.4.1')
+    
+    Conflicts:
+    	configure.ac
+    	debian/changelog
+
+commit aff8de143b8c2f559c2aa6042587603cc22c489f
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sun Nov 15 12:50:44 2009 +0100
+
+    Merge changelog entries
+
+ debian/changelog |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 7ea23faf9e49941430ca55c6cab72611560fcdc9
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sun Nov 15 12:45:43 2009 +0100
+
+    Remerge with HEAD
+
+ debian/changelog |    1 +
+ po/it.po         |  239 +++---------------------------------------------------
+ 2 files changed, 11 insertions(+), 229 deletions(-)
+
+commit ef8cb06bf386fd752ef860c19084a9dd0cac9be6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 14 17:37:39 2009 +0100
+
+    dpkg-statoverride: Add missing angle bracket in string
+    
+    Spotted-by: Christian Perrier <bubulle@debian.org>
+
+ po/ast.po     |   18 +++++++-----------
+ po/bs.po      |   18 +++++++-----------
+ po/ca.po      |   18 +++++++-----------
+ po/cs.po      |   19 +++++++------------
+ po/da.po      |   16 ++++++----------
+ po/de.po      |   18 +++++++-----------
+ po/dpkg.pot   |   16 ++++++----------
+ po/dz.po      |   16 ++++++----------
+ po/el.po      |   16 ++++++----------
+ po/eo.po      |   16 ++++++----------
+ po/es.po      |   16 ++++++----------
+ po/et.po      |   16 ++++++----------
+ po/eu.po      |   16 ++++++----------
+ po/fr.po      |   18 +++++++-----------
+ po/gl.po      |   16 ++++++----------
+ po/hu.po      |   16 ++++++----------
+ po/id.po      |   16 ++++++----------
+ po/it.po      |   19 +++++++------------
+ po/ja.po      |   16 ++++++----------
+ po/km.po      |   16 ++++++----------
+ po/ko.po      |   16 ++++++----------
+ po/ku.po      |   16 ++++++----------
+ po/lt.po      |   16 ++++++----------
+ po/mr.po      |   16 ++++++----------
+ po/nb.po      |   16 ++++++----------
+ po/ne.po      |   16 ++++++----------
+ po/nl.po      |   16 ++++++----------
+ po/nn.po      |   16 ++++++----------
+ po/pa.po      |   16 ++++++----------
+ po/pl.po      |   19 +++++++------------
+ po/pt.po      |   16 ++++++----------
+ po/pt_BR.po   |   16 ++++++----------
+ po/ro.po      |   16 ++++++----------
+ po/ru.po      |   16 ++++++----------
+ po/sk.po      |   16 ++++++----------
+ po/sv.po      |   18 +++++++-----------
+ po/th.po      |   16 ++++++----------
+ po/tl.po      |   16 ++++++----------
+ po/vi.po      |   16 ++++++----------
+ po/zh_CN.po   |   19 +++++++------------
+ po/zh_TW.po   |   16 ++++++----------
+ src/statcmd.c |    2 +-
+ 42 files changed, 257 insertions(+), 425 deletions(-)
+
+commit 8dd0d01bf6ce89005eedcd338397ced07c25f734
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Nov 14 17:00:09 2009 +0100
+
+    dpkg-deb: fix typo unkown -> unknown
+    
+    Spotted by lintian spelling-error-in-binary.
+
+ dpkg-deb/build.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0adc33bf4d416af55cc641a97fb57e8ece1eab8d
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sat Nov 14 13:47:03 2009 +0100
+
+    fix errors spotted by Raphaël
+
+ man/po/fr.po |  346 +++++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 173 insertions(+), 173 deletions(-)
+
+commit 6623bfbb29dbef593d9c0defd35f8c67cfc83c89
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sat Nov 14 08:43:38 2009 +0100
+
+    French manpages translation update and typographical fixes (non-breakable spaces)
+
+ man/po/fr.po |  937 ++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 458 insertions(+), 479 deletions(-)
+
+commit ae106d5b5cb0fba516032d9735e236b9c004e011
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sat Nov 14 08:27:36 2009 +0100
+
+    French translation update
+
+ po/fr.po |  215 ++++++++++++++++++++++++++++----------------------------------
+ 1 files changed, 97 insertions(+), 118 deletions(-)
+
+commit 43c95e7b98576a1309cef40b23a94d6d743e84e4
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Nov 13 21:11:08 2009 +0100
+
+    Update German translation of manual pages
+    
+    Update to 1650t.
+
+ man/po/de.po |   10 ++--------
+ 1 files changed, 2 insertions(+), 8 deletions(-)
+
+commit d383a9bcd36b200243f6495e8d135f449530f6bb
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Fri Nov 13 14:01:17 2009 +0100
+
+    German dpkg translation update
+    
+    Update to 961t4f.
+
+ po/de.po |   26 +++++++++++++-------------
+ 1 files changed, 13 insertions(+), 13 deletions(-)
+
+commit 1acb47df2948a23efcc2bfc4034d609f0f975069
+Author: Peter Krefting <peterk@debian.org>
+Date:   Fri Nov 13 13:40:41 2009 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: Update to 965t0f0u.
+    man/po/sv.po: Update to 1650t0f0u.
+    scripts/po/sv.po: Update to 482t0f0u.
+
+ man/po/sv.po     |   61 ++++++++++++++++----------
+ po/sv.po         |   14 +++---
+ scripts/po/sv.po |  128 +++++++++++++++++++++++++----------------------------
+ 3 files changed, 105 insertions(+), 98 deletions(-)
+
+commit 09e28fb8fe6685e6331bb2407b8134ae522c3ca4
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Nov 13 12:18:55 2009 +0100
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |  554 ++++++------
+ dselect/po/ca.po        |  560 ++++++------
+ dselect/po/cs.po        |  560 ++++++------
+ dselect/po/da.po        |  560 ++++++------
+ dselect/po/de.po        |  562 ++++++------
+ dselect/po/dselect.pot  |  554 ++++++------
+ dselect/po/el.po        |  562 ++++++------
+ dselect/po/es.po        |  562 ++++++------
+ dselect/po/et.po        |  557 ++++++------
+ dselect/po/eu.po        |  561 ++++++------
+ dselect/po/fr.po        |  563 ++++++------
+ dselect/po/gl.po        |  560 ++++++------
+ dselect/po/hu.po        |  554 ++++++------
+ dselect/po/id.po        |  560 ++++++------
+ dselect/po/it.po        |  563 ++++++------
+ dselect/po/ja.po        |  560 ++++++------
+ dselect/po/ko.po        |  560 ++++++------
+ dselect/po/nb.po        |  560 ++++++------
+ dselect/po/nl.po        |  560 ++++++------
+ dselect/po/nn.po        |  560 ++++++------
+ dselect/po/pl.po        |  563 ++++++------
+ dselect/po/pt.po        |  560 ++++++------
+ dselect/po/pt_BR.po     |  560 ++++++------
+ dselect/po/ro.po        |  563 ++++++------
+ dselect/po/ru.po        |  560 ++++++------
+ dselect/po/sk.po        |  560 ++++++------
+ dselect/po/sv.po        |  560 ++++++------
+ dselect/po/tl.po        |  560 ++++++------
+ dselect/po/vi.po        |  561 ++++++------
+ dselect/po/zh_CN.po     |  560 ++++++------
+ dselect/po/zh_TW.po     |  560 ++++++------
+ man/po/de.po            |  629 +++++++-------
+ man/po/dpkg-man.pot     |  477 ++++++-----
+ man/po/es.po            |  506 ++++++-----
+ man/po/fr.po            |  764 ++++++++++------
+ man/po/hu.po            |  506 ++++++-----
+ man/po/ja.po            |  506 ++++++-----
+ man/po/pl.po            |  550 +++++++-----
+ man/po/pt_BR.po         |  506 ++++++-----
+ man/po/ru.po            |  506 ++++++-----
+ man/po/sv.po            |  704 ++++++++-------
+ po/ast.po               | 2218 +++++++++++++++++++++++----------------------
+ po/bs.po                | 2066 +++++++++++++++++++++---------------------
+ po/ca.po                | 2229 +++++++++++++++++++++++-----------------------
+ po/cs.po                | 2223 +++++++++++++++++++++++----------------------
+ po/da.po                | 2219 +++++++++++++++++++++++----------------------
+ po/de.po                | 1690 +++++++++++++++++-----------------
+ po/dpkg.pot             | 2050 ++++++++++++++++++++---------------------
+ po/dz.po                | 2215 +++++++++++++++++++++++----------------------
+ po/el.po                | 2222 +++++++++++++++++++++++----------------------
+ po/eo.po                | 2209 +++++++++++++++++++++++----------------------
+ po/es.po                | 2227 +++++++++++++++++++++++-----------------------
+ po/et.po                | 2151 ++++++++++++++++++++++----------------------
+ po/eu.po                | 2208 +++++++++++++++++++++++----------------------
+ po/fr.po                | 2315 ++++++++++++++++++++++++-----------------------
+ po/gl.po                | 2221 +++++++++++++++++++++++----------------------
+ po/hu.po                | 2207 ++++++++++++++++++++++----------------------
+ po/id.po                | 2144 ++++++++++++++++++++++----------------------
+ po/it.po                | 2232 +++++++++++++++++++++++----------------------
+ po/ja.po                | 2211 +++++++++++++++++++++++----------------------
+ po/km.po                | 2210 +++++++++++++++++++++++----------------------
+ po/ko.po                | 2214 +++++++++++++++++++++++----------------------
+ po/ku.po                | 2101 +++++++++++++++++++++----------------------
+ po/lt.po                | 2128 +++++++++++++++++++++----------------------
+ po/mr.po                | 2215 +++++++++++++++++++++++----------------------
+ po/nb.po                | 2216 +++++++++++++++++++++++----------------------
+ po/ne.po                | 2211 +++++++++++++++++++++++----------------------
+ po/nl.po                | 2220 +++++++++++++++++++++++----------------------
+ po/nn.po                | 2146 ++++++++++++++++++++++----------------------
+ po/pa.po                | 2157 ++++++++++++++++++++++----------------------
+ po/pl.po                | 2211 +++++++++++++++++++++++----------------------
+ po/pt.po                | 2229 +++++++++++++++++++++++-----------------------
+ po/pt_BR.po             | 2230 +++++++++++++++++++++++-----------------------
+ po/ro.po                | 2237 +++++++++++++++++++++++-----------------------
+ po/ru.po                | 2210 +++++++++++++++++++++++----------------------
+ po/sk.po                | 2223 +++++++++++++++++++++++----------------------
+ po/sv.po                | 1668 +++++++++++++++++-----------------
+ po/th.po                | 2218 +++++++++++++++++++++++----------------------
+ po/tl.po                | 2144 ++++++++++++++++++++++----------------------
+ po/vi.po                | 2237 +++++++++++++++++++++++-----------------------
+ po/zh_CN.po             | 2217 +++++++++++++++++++++++----------------------
+ po/zh_TW.po             | 2206 +++++++++++++++++++++++----------------------
+ scripts/po/ca.po        | 1430 ++++++++++++++++--------------
+ scripts/po/de.po        |    6 +-
+ scripts/po/dpkg-dev.pot | 1361 +++++++++++++++-------------
+ scripts/po/fr.po        | 1500 ++++++++++++++++--------------
+ scripts/po/pl.po        | 1500 ++++++++++++++++--------------
+ scripts/po/ru.po        | 1494 ++++++++++++++++--------------
+ scripts/po/sv.po        | 1332 ++++++++++++++-------------
+ 89 files changed, 60997 insertions(+), 59744 deletions(-)
+
+commit 9465dc221630938fb24034ddbb34f29fae09ea42
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 13 04:07:01 2009 +0100
+
+    dpkg: Pass struct pkginfo instead of the package name to log_action
+    
+    Thinko from commit 85b9b00518419b23c209bb6567566b99f004241f.
+
+ src/processarc.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 85b9b00518419b23c209bb6567566b99f004241f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Aug 10 18:05:55 2009 +0200
+
+    Add new status-fd action when disappearing a package
+    
+    This will help front-ends like APT to keep better track of the actions
+    done during a dpkg run.
+    
+    Closes: #537338
+
+ debian/changelog |    1 +
+ man/dpkg.1       |    2 +-
+ src/processarc.c |    1 +
+ 3 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 6ad383f47121cc20958eead2c3e7a1e9047515d1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 12 21:17:49 2009 +0100
+
+    dpkg: Fix checkpath() to use varbuf instead of m_malloc
+    
+    This solves a potential problem in case any of the programs in
+    prog_list is longer than "start-stop-daemon", which is the size being
+    choosed as the longest one. By using a varbuf we let the code resize
+    it dynamically if needed.
+
+ src/help.c |   19 +++++++++++--------
+ 1 files changed, 11 insertions(+), 8 deletions(-)
+
+commit 7979a88648eb12d0100691585688481f2d9359c5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Nov 11 05:53:49 2009 +0100
+
+    dpkg: Remove redundant ferror check in ensure_diversions()
+    
+    The check is done already in fgets_checked.
+
+ src/divertdb.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 662f5bf7024ffa6a54b7b1cd125104bc657daae5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Nov 11 05:18:09 2009 +0100
+
+    dpkg: Remove unused variable in ensure_diversions()
+
+ src/divertdb.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit bd907201ef5f4577344f6662485497fc318741bd
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Nov 11 20:40:21 2009 +0100
+
+    Update German translation of manual pages
+    
+    Update to 1656t.
+
+ man/po/de.po |   62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 61 insertions(+), 1 deletions(-)
+
+commit fb4c4bc4b09883489e30af2a0b0c06bd54f72a5a
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Nov 11 19:56:44 2009 +0100
+
+    Update German scripts translation
+    
+    Update to 482t.
+
+ scripts/po/de.po |  205 +++++++++++++++++++++++++++++------------------------
+ 1 files changed, 112 insertions(+), 93 deletions(-)
+
+commit 8e669bb45a74317ada0bcd72375e53f09b22c713
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Nov 11 16:03:38 2009 +0100
+
+    Use source format "3.0 (native)" with bzip2 compression for dpkg itself
+
+ debian/changelog      |    1 +
+ debian/source/format  |    1 +
+ debian/source/options |    2 ++
+ 3 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 36a5420adb2ef7b29927c9011d140c1effd7941f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Nov 11 15:54:47 2009 +0100
+
+    dpkg-source: add a DEP-3 compliant header to automatic patches
+    
+    In "3.0 (quilt)" format, dpkg-source can automatically create patches with
+    the upstream changes applied to the source package. Those patches will now
+    contain an informative header respecting the DEP-3 proposal where the
+    Description contains a copy of the last changelog entry, the last uploader
+    is mentionned in the Author field. Supplementary fields can be added
+    by a vendor hook "extend-patch-header". The Debian implementation of this
+    hook automatically adds Bug-Debian and Bug-Ubuntu entries.
+    
+    Dpkg::Source::Patch has been modified to be able to output a preliminary
+    header.
+
+ debian/changelog                        |    2 +
+ scripts/Dpkg/Source/Package/V2.pm       |   13 +++++++++-
+ scripts/Dpkg/Source/Package/V3/quilt.pm |   36 ++++++++++++++++++++++++++++++-
+ scripts/Dpkg/Source/Patch.pm            |   11 +++++++++
+ scripts/Dpkg/Vendor/Debian.pm           |   13 +++++++++++
+ scripts/Dpkg/Vendor/Default.pm          |    2 +
+ 6 files changed, 74 insertions(+), 3 deletions(-)
+
+commit 4625bf8b455f579259f7ac6ed36c3875a58157e7
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Nov 11 11:36:54 2009 +0100
+
+    dpkg-source(1): indicate the recommended source formats
+    
+    Until dpkg-source really produces new formats by default, it's
+    good to recommend using those formats and to inform our users
+    of the plan to switch.
+    
+    This paragraph can be removed when dpkg-source produces new formats by
+    default.
+
+ man/dpkg-source.1 |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 74f2648e4b8647fa30c881bf1524be9959aa75a1
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Nov 11 11:18:35 2009 +0100
+
+    dpkg-source: list upstream files modified by the diff during build
+    
+    This only applies to "1.0" source packages using orig.tar.gz + diff.gz.
+    
+    In that case, it also recommends usage of the new format 3.0 (quilt)
+    to keep changes separate and documented.
+
+ debian/changelog                  |    4 +++-
+ scripts/Dpkg/Source/Package/V1.pm |   12 +++++++++++-
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+commit 1b61b829a76ccbd7534aca962f442a0c80fb12f8
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Nov 11 10:46:28 2009 +0100
+
+    dpkg-source: list upstream files modified by the diff during extraction
+    
+    This only applies to "1.0" source packages using orig.tar.gz + diff.gz.
+    
+    Dpkg::Source::Patch::apply() is modified to return the hashref containing
+    information about the patch applied so that we can extract the list of
+    files in Dpkg::Source::Package::V1::do_extract()
+
+ debian/changelog                  |    2 ++
+ scripts/Dpkg/Source/Package/V1.pm |    8 ++++++--
+ scripts/Dpkg/Source/Patch.pm      |    1 +
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+
+commit ce2d6d777aa90be07c5da587bc1847ca7f465e26
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue Nov 10 21:57:24 2009 +0100
+
+    Update German scripts translation
+    
+    Update to 479t.
+
+ scripts/po/de.po | 1322 ++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 684 insertions(+), 638 deletions(-)
+
+commit 1a72094cb7a1d822b4716586de9ffc987cea4016
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Nov 9 23:54:50 2009 +0100
+
+    dpkg-source: read sticky options from <dir>/debian/source/options
+    
+    Modify dpkg-source -b/--print-format to use default build options from
+    debian/source/options. Thus it's now possible to have sticky options, for
+    example for the choice of a compression method (-Z<comp>).
+    
+    The options read from that file are printed in the log to better diagnose
+    errors that might appear from its usage.
+
+ debian/changelog       |    3 +++
+ man/dpkg-source.1      |    9 +++++++++
+ scripts/dpkg-source.pl |   43 ++++++++++++++++++++++++++++++++++---------
+ 3 files changed, 46 insertions(+), 9 deletions(-)
+
+commit e1fb5e5c6be00244636d0dfd7c92b88673c7d839
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Nov 9 22:39:25 2009 +0100
+
+    Dpkg::Conf: new module to parse options from a configuration file
+
+ scripts/Dpkg/Conf.pm   |  117 ++++++++++++++++++++++++++++++++++++++++++++++++
+ scripts/Makefile.am    |    1 +
+ scripts/po/POTFILES.in |    1 +
+ 3 files changed, 119 insertions(+), 0 deletions(-)
+
+commit 5ad592f7eff684e44149aff8efa4190d2e81f6f8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 9 21:16:07 2009 +0100
+
+    libcompat: Do not preallocate list before the loop in scandir
+    
+    Let the realloc in the loop take care of it once it's needed, this way
+    we get rid of an additional point of failure.
+
+ lib/compat/scandir.c |   13 ++++++-------
+ 1 files changed, 6 insertions(+), 7 deletions(-)
+
+commit 365611d9f86e1da98007e5b3b3a14dfea2d5acda
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 9 19:06:18 2009 +0100
+
+    libcompat: Fix resource leaks on error conditions in scandir
+
+ TODO                 |    1 -
+ lib/compat/scandir.c |   54 ++++++++++++++++++++++++++++++++++++-------------
+ 2 files changed, 39 insertions(+), 16 deletions(-)
+
+commit 3c9e99bee2a5acf7060175ae8f424edc69d36f7d
+Author: Raphael Geissert <atomo64@gmail.com>
+Date:   Tue Nov 3 16:37:54 2009 -0600
+
+    dpkg-split: Fix a directory stream leak
+
+ dpkg-split/queue.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 75216988e32f19ad4a4dd178dd256e3276cb96d6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Nov 9 17:22:10 2009 +0100
+
+    dpkg-deb: Fix a file descriptor leak
+    
+    Reported-by: Raphael Geissert <atomo64@gmail.com>
+
+ dpkg-deb/info.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 686d2bd8ecd8f43afa211167aabecc62f9542230
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 8 17:34:06 2009 +0100
+
+    dpkg: Refactor filename summarizing into a new function
+
+ src/processarc.c |   37 +++++++++++++++++++++++++------------
+ 1 files changed, 25 insertions(+), 12 deletions(-)
+
+commit 477814111f820357992b8d5341a9a568d3e15c41
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Nov 9 21:18:52 2009 +0100
+
+    dpkg-source: split usage string in several translatable strings
+    
+    Also replace non-breaking spaces by normal spaces.
+
+ scripts/dpkg-source.pl |   32 ++++++++++++++++----------------
+ 1 files changed, 16 insertions(+), 16 deletions(-)
+
+commit f22c0f006ffd9d9ba39c56b0072ddcb6af96d0ad
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Nov 9 20:50:55 2009 +0100
+
+    dpkg-source: add new --print-format command
+    
+    This new command prints the source format that would be used to build the
+    source package if "dpkg-source -b directory" was called (in the same
+    conditions and with the same options).
+
+ debian/changelog       |    2 ++
+ man/dpkg-source.1      |    6 ++++++
+ scripts/dpkg-source.pl |   26 +++++++++++++++++---------
+ 3 files changed, 25 insertions(+), 9 deletions(-)
+
+commit 4f7ad348619205472c2952ab55152ef255e38aef
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 25 17:43:27 2009 +0100
+
+    Clean up perl shebang line
+    
+    Use “use warnings” instead of passing “-w”. Remove “--” parameters.
+    Remove shebangs from perl modules. Remove spaces after “#!”.
+
+ dselect/methods/ftp/install           |    4 +++-
+ dselect/methods/ftp/setup             |    4 +++-
+ dselect/methods/ftp/update            |    4 +++-
+ dselect/mkcurkeys.pl                  |    2 +-
+ scripts/Dpkg/Gettext.pm               |    1 -
+ scripts/Dpkg/Source/Package/V3/bzr.pm |    1 -
+ scripts/Dpkg/Source/Package/V3/git.pm |    1 -
+ scripts/dpkg-architecture.pl          |    2 +-
+ scripts/dpkg-divert.pl                |    2 +-
+ scripts/dpkg-shlibdeps.pl             |    2 +-
+ scripts/update-alternatives.pl        |    2 +-
+ 11 files changed, 14 insertions(+), 11 deletions(-)
+
+commit 368c47b7376334efacdf0347f01860c42dc9a002
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 25 17:50:18 2009 +0100
+
+    Expand text in license header for unversioned GPL
+
+ lib/dpkg/tarfn.c               |   19 ++++++++++++++++---
+ lib/dpkg/tarfn.h               |   19 ++++++++++++++++---
+ scripts/dpkg-checkbuilddeps.pl |   18 +++++++++++++++++-
+ 3 files changed, 49 insertions(+), 7 deletions(-)
+
+commit bee98c7ea734849e74ea78f20b1167884d59a9b4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 7 22:17:47 2009 +0100
+
+    Add missing license headers
+
+ lib/dpkg/compression.c              |   18 ++++++++++++++++++
+ scripts/Dpkg.pm                     |   13 +++++++++++++
+ scripts/Dpkg/Arch.pm                |   13 +++++++++++++
+ scripts/Dpkg/BuildOptions.pm        |   13 +++++++++++++
+ scripts/Dpkg/Checksums.pm           |   13 +++++++++++++
+ scripts/Dpkg/Compression.pm         |   13 +++++++++++++
+ scripts/Dpkg/Control/Types.pm       |   13 +++++++++++++
+ scripts/Dpkg/ErrorHandling.pm       |   13 +++++++++++++
+ scripts/Dpkg/Exit.pm                |   13 +++++++++++++
+ scripts/Dpkg/Gettext.pm             |   21 +++++++++++++++++++++
+ scripts/Dpkg/Source/Functions.pm    |   13 +++++++++++++
+ scripts/changelog/debian.pl         |   15 +++++++++++++++
+ scripts/dpkg-buildpackage.pl        |   15 +++++++++++++++
+ scripts/dpkg-distaddfile.pl         |   15 +++++++++++++++
+ scripts/dpkg-divert.pl              |   15 +++++++++++++++
+ scripts/dpkg-genchanges.pl          |   15 +++++++++++++++
+ scripts/dpkg-gencontrol.pl          |   15 +++++++++++++++
+ scripts/dpkg-gensymbols.pl          |   15 +++++++++++++++
+ scripts/dpkg-parsechangelog.pl      |   15 +++++++++++++++
+ scripts/dpkg-scanpackages.pl        |   15 +++++++++++++++
+ scripts/dpkg-shlibdeps.pl           |   15 +++++++++++++++
+ scripts/dpkg-source.pl              |   15 +++++++++++++++
+ scripts/t/000_pod.t                 |   13 +++++++++++++
+ scripts/t/100_Dpkg_Version.t        |   13 +++++++++++++
+ scripts/t/200_Dpkg_Shlibs.t         |   13 +++++++++++++
+ scripts/t/300_Dpkg_BuildOptions.t   |   13 +++++++++++++
+ scripts/t/400_Dpkg_Deps.t           |   13 +++++++++++++
+ scripts/t/500_Dpkg_Path.t           |   13 +++++++++++++
+ scripts/t/600_Dpkg_Changelog.t      |   13 +++++++++++++
+ scripts/t/700_Dpkg_Control.t        |   13 +++++++++++++
+ scripts/t/750_Dpkg_Substvars.t      |   13 +++++++++++++
+ scripts/t/800_Dpkg_IPC.t            |   13 +++++++++++++
+ scripts/t/900_update_alternatives.t |   13 +++++++++++++
+ scripts/update-alternatives.pl      |   15 +++++++++++++++
+ 34 files changed, 479 insertions(+), 0 deletions(-)
+
+commit 9447c1795135f9658c088da90fee12e42c469020
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 7 22:05:53 2009 +0100
+
+    Unify format in license headers
+    
+    Indent license text to one space after the '#'. Add '#' to blank lines
+    between paragraphs and remove trailing '#' after the license text.
+
+ dpkg-split/mksplit.pl                    |   20 ++++++++++----------
+ dselect/methods/ftp/install              |    2 +-
+ dselect/methods/ftp/setup                |    2 +-
+ dselect/methods/ftp/update               |    2 +-
+ dselect/methods/multicd/install          |    2 +-
+ dselect/methods/multicd/setup            |    2 +-
+ dselect/methods/multicd/update           |    2 +-
+ scripts/Dpkg/Changelog.pm                |   21 ++++++++++-----------
+ scripts/Dpkg/Changelog/Debian.pm         |   21 ++++++++++-----------
+ scripts/Dpkg/Control/Info.pm             |    6 +++---
+ scripts/Dpkg/IPC.pm                      |    6 +++---
+ scripts/Dpkg/Path.pm                     |    6 +++---
+ scripts/Dpkg/Shlibs.pm                   |    6 +++---
+ scripts/Dpkg/Shlibs/Objdump.pm           |    6 +++---
+ scripts/Dpkg/Shlibs/Symbol.pm            |    6 +++---
+ scripts/Dpkg/Shlibs/SymbolFile.pm        |    6 +++---
+ scripts/Dpkg/Source/Archive.pm           |    6 +++---
+ scripts/Dpkg/Source/CompressedFile.pm    |    6 +++---
+ scripts/Dpkg/Source/Compressor.pm        |    6 +++---
+ scripts/Dpkg/Source/Package.pm           |    6 +++---
+ scripts/Dpkg/Source/Package/V1.pm        |    6 +++---
+ scripts/Dpkg/Source/Package/V2.pm        |    6 +++---
+ scripts/Dpkg/Source/Package/V3/bzr.pm    |    1 +
+ scripts/Dpkg/Source/Package/V3/custom.pm |    6 +++---
+ scripts/Dpkg/Source/Package/V3/git.pm    |    1 +
+ scripts/Dpkg/Source/Package/V3/native.pm |    6 +++---
+ scripts/Dpkg/Source/Package/V3/quilt.pm  |    6 +++---
+ scripts/Dpkg/Source/Patch.pm             |    6 +++---
+ scripts/Dpkg/Substvars.pm                |    6 +++---
+ scripts/Dpkg/Vars.pm                     |    6 +++---
+ scripts/Dpkg/Vendor.pm                   |    6 +++---
+ scripts/Dpkg/Vendor/Debian.pm            |    6 +++---
+ scripts/Dpkg/Vendor/Default.pm           |    6 +++---
+ scripts/Dpkg/Vendor/Ubuntu.pm            |    6 +++---
+ scripts/Dpkg/Version.pm                  |    6 +++---
+ scripts/dpkg-name.pl                     |    1 -
+ 36 files changed, 110 insertions(+), 111 deletions(-)
+
+commit 485e041e2672970a56a61cec1331f3149e76ef0b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 24 14:23:31 2009 +0200
+
+    Fix copyright statements
+    
+    Use UTF-8 copyright symbol instead of “(C)”. Add missing “Copyright ©”
+    to copyright statements instead of relying on the first occurance.
+    Use properly spelled names.
+
+ dpkg-split/mksplit.pl             |    2 +-
+ dselect/keyoverride               |    2 +-
+ dselect/methods/ftp/install       |    6 +++---
+ dselect/methods/ftp/setup         |    6 +++---
+ dselect/methods/ftp/update        |    6 +++---
+ dselect/methods/multicd/install   |    4 ++--
+ dselect/methods/multicd/setup     |    4 ++--
+ dselect/methods/multicd/update    |    4 ++--
+ man/deb-shlibs.5                  |    4 ++--
+ man/dpkg-scanpackages.1           |    2 +-
+ scripts/Dpkg/Deps.pm              |    2 +-
+ scripts/Dpkg/Shlibs.pm            |    2 +-
+ scripts/Dpkg/Shlibs/Objdump.pm    |    2 +-
+ scripts/Dpkg/Shlibs/Symbol.pm     |    4 ++--
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    4 ++--
+ scripts/Dpkg/Vendor/Ubuntu.pm     |    5 +++--
+ 16 files changed, 30 insertions(+), 29 deletions(-)
+
+commit 7ba3f71c0c8239902648b05b108a4e8397b78144
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 7 21:49:12 2009 +0100
+
+    Unify text in license headers
+    
+    Add a missing “of the License” after “version 2”. Move “but” and “GNU”
+    at the end of line to the next line. This matches more closely the
+    paragraph found in the license text for the GPL version 2.
+
+ debian/copyright            |    8 ++++----
+ dpkg-deb/build.c            |   10 +++++-----
+ dpkg-deb/dpkg-deb.h         |   10 +++++-----
+ dpkg-deb/extract.c          |   10 +++++-----
+ dpkg-deb/info.c             |   10 +++++-----
+ dpkg-deb/main.c             |   10 +++++-----
+ dpkg-split/dpkg-split.h     |   10 +++++-----
+ dpkg-split/info.c           |   10 +++++-----
+ dpkg-split/join.c           |   10 +++++-----
+ dpkg-split/main.c           |   10 +++++-----
+ dpkg-split/mksplit.pl       |   10 +++++-----
+ dpkg-split/queue.c          |   10 +++++-----
+ dpkg-split/split.c          |   10 +++++-----
+ dselect/basecmds.cc         |   10 +++++-----
+ dselect/baselist.cc         |   10 +++++-----
+ dselect/basetop.cc          |   10 +++++-----
+ dselect/bindings.cc         |   10 +++++-----
+ dselect/bindings.h          |   10 +++++-----
+ dselect/curkeys.cc          |   10 +++++-----
+ dselect/dselect-curses.h    |   10 +++++-----
+ dselect/dselect.h           |   10 +++++-----
+ dselect/helpmsgs.cc         |   10 +++++-----
+ dselect/helpmsgs.h          |   10 +++++-----
+ dselect/keyoverride         |   10 +++++-----
+ dselect/main.cc             |   10 +++++-----
+ dselect/methkeys.cc         |   10 +++++-----
+ dselect/methlist.cc         |   10 +++++-----
+ dselect/method.cc           |   10 +++++-----
+ dselect/method.h            |   10 +++++-----
+ dselect/methparse.cc        |   10 +++++-----
+ dselect/mkcurkeys.pl        |   10 +++++-----
+ dselect/pkgcmds.cc          |   10 +++++-----
+ dselect/pkgdepcon.cc        |   10 +++++-----
+ dselect/pkgdisplay.cc       |   10 +++++-----
+ dselect/pkginfo.cc          |   10 +++++-----
+ dselect/pkgkeys.cc          |   10 +++++-----
+ dselect/pkglist.cc          |   10 +++++-----
+ dselect/pkglist.h           |   10 +++++-----
+ dselect/pkgsublist.cc       |   10 +++++-----
+ dselect/pkgtop.cc           |   10 +++++-----
+ lib/compat/alphasort.c      |   10 +++++-----
+ lib/compat/compat.h         |   10 +++++-----
+ lib/compat/scandir.c        |   10 +++++-----
+ lib/compat/snprintf.c       |   10 +++++-----
+ lib/compat/strerror.c       |   10 +++++-----
+ lib/compat/strsignal.c      |   10 +++++-----
+ lib/compat/unsetenv.c       |   10 +++++-----
+ lib/compat/vsnprintf.c      |   10 +++++-----
+ lib/dpkg/buffer.c           |   10 +++++-----
+ lib/dpkg/buffer.h           |   10 +++++-----
+ lib/dpkg/cleanup.c          |   10 +++++-----
+ lib/dpkg/database.c         |   10 +++++-----
+ lib/dpkg/dbmodify.c         |   10 +++++-----
+ lib/dpkg/dlist.h            |    4 ++--
+ lib/dpkg/dpkg-db.h          |   10 +++++-----
+ lib/dpkg/dpkg.h             |   10 +++++-----
+ lib/dpkg/dump.c             |   10 +++++-----
+ lib/dpkg/ehandle.c          |   10 +++++-----
+ lib/dpkg/fields.c           |   10 +++++-----
+ lib/dpkg/file.c             |   10 +++++-----
+ lib/dpkg/file.h             |   10 +++++-----
+ lib/dpkg/i18n.h             |   10 +++++-----
+ lib/dpkg/lock.c             |   10 +++++-----
+ lib/dpkg/log.c              |   10 +++++-----
+ lib/dpkg/macros.h           |   10 +++++-----
+ lib/dpkg/mlib.c             |   10 +++++-----
+ lib/dpkg/myopt-util.c       |   10 +++++-----
+ lib/dpkg/myopt.c            |   10 +++++-----
+ lib/dpkg/myopt.h            |   10 +++++-----
+ lib/dpkg/nfmalloc.c         |   10 +++++-----
+ lib/dpkg/parse.c            |   10 +++++-----
+ lib/dpkg/parsedump.h        |   10 +++++-----
+ lib/dpkg/parsehelp.c        |   10 +++++-----
+ lib/dpkg/path.c             |   10 +++++-----
+ lib/dpkg/path.h             |   10 +++++-----
+ lib/dpkg/pkg-array.c        |   10 +++++-----
+ lib/dpkg/pkg-array.h        |   10 +++++-----
+ lib/dpkg/pkg-list.c         |   10 +++++-----
+ lib/dpkg/pkg-list.h         |   10 +++++-----
+ lib/dpkg/pkg.c              |   10 +++++-----
+ lib/dpkg/pkg.h              |   10 +++++-----
+ lib/dpkg/progress.c         |   10 +++++-----
+ lib/dpkg/progress.h         |   10 +++++-----
+ lib/dpkg/showpkg.c          |    4 ++--
+ lib/dpkg/string.c           |   10 +++++-----
+ lib/dpkg/string.h           |   10 +++++-----
+ lib/dpkg/subproc.c          |   10 +++++-----
+ lib/dpkg/subproc.h          |   10 +++++-----
+ lib/dpkg/test.h             |   10 +++++-----
+ lib/dpkg/test/t-buffer.c    |   10 +++++-----
+ lib/dpkg/test/t-macros.c    |   10 +++++-----
+ lib/dpkg/test/t-path.c      |   10 +++++-----
+ lib/dpkg/test/t-pkginfo.c   |   10 +++++-----
+ lib/dpkg/test/t-string.c    |   10 +++++-----
+ lib/dpkg/test/t-test.c      |   10 +++++-----
+ lib/dpkg/test/t-varbuf.c    |   10 +++++-----
+ lib/dpkg/test/t-version.c   |   10 +++++-----
+ lib/dpkg/trigdeferred.l     |   10 +++++-----
+ lib/dpkg/triglib.c          |   10 +++++-----
+ lib/dpkg/utils.c            |    4 ++--
+ lib/dpkg/varbuf.c           |   10 +++++-----
+ lib/dpkg/varbuf.h           |   10 +++++-----
+ lib/dpkg/vercmp.c           |   10 +++++-----
+ man/deb-override.5          |   10 +++++-----
+ man/deb-shlibs.5            |   10 +++++-----
+ man/dpkg-scanpackages.1     |   10 +++++-----
+ scripts/Dpkg/Deps.pm        |   12 ++++++------
+ scripts/dpkg-scansources.pl |    4 ++--
+ src/archives.c              |   10 +++++-----
+ src/archives.h              |   10 +++++-----
+ src/cleanup.c               |   10 +++++-----
+ src/configure.c             |   10 +++++-----
+ src/depcon.c                |   10 +++++-----
+ src/divertdb.c              |   10 +++++-----
+ src/enquiry.c               |   10 +++++-----
+ src/errors.c                |   10 +++++-----
+ src/filesdb.c               |   10 +++++-----
+ src/filesdb.h               |   10 +++++-----
+ src/help.c                  |   10 +++++-----
+ src/main.c                  |   10 +++++-----
+ src/main.h                  |   10 +++++-----
+ src/packages.c              |   10 +++++-----
+ src/pkg-show.c              |   10 +++++-----
+ src/processarc.c            |   10 +++++-----
+ src/query.c                 |   10 +++++-----
+ src/remove.c                |   10 +++++-----
+ src/select.c                |   10 +++++-----
+ src/statcmd.c               |   10 +++++-----
+ src/statdb.c                |   10 +++++-----
+ src/trigcmd.c               |   10 +++++-----
+ src/trigproc.c              |   10 +++++-----
+ src/update.c                |   10 +++++-----
+ utils/install-info.c        |   10 +++++-----
+ 133 files changed, 653 insertions(+), 653 deletions(-)
+
+commit d99d361f1b8e07522ccbffc32493e1280b588183
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 7 19:47:41 2009 +0100
+
+    Replace FSF address by pointing to the gnu.org URL
+    
+    Use the <http://www.gnu.org/licenses/> URL, instead of in most cases
+    the outdated FSF address, which is way more stable, as the latter has
+    changed several times in the past.
+
+ debian/changelog                         |    2 ++
+ dpkg-deb/build.c                         |    5 ++---
+ dpkg-deb/dpkg-deb.h                      |    5 ++---
+ dpkg-deb/extract.c                       |    5 ++---
+ dpkg-deb/info.c                          |    5 ++---
+ dpkg-deb/main.c                          |    5 ++---
+ dpkg-split/dpkg-split.h                  |    5 ++---
+ dpkg-split/info.c                        |    5 ++---
+ dpkg-split/join.c                        |    5 ++---
+ dpkg-split/main.c                        |    5 ++---
+ dpkg-split/mksplit.pl                    |    5 ++---
+ dpkg-split/queue.c                       |    5 ++---
+ dpkg-split/split.c                       |    5 ++---
+ dselect/basecmds.cc                      |    5 ++---
+ dselect/baselist.cc                      |    5 ++---
+ dselect/basetop.cc                       |    5 ++---
+ dselect/bindings.cc                      |    5 ++---
+ dselect/bindings.h                       |    5 ++---
+ dselect/curkeys.cc                       |    5 ++---
+ dselect/dselect-curses.h                 |    5 ++---
+ dselect/dselect.h                        |    5 ++---
+ dselect/helpmsgs.cc                      |    5 ++---
+ dselect/helpmsgs.h                       |    5 ++---
+ dselect/keyoverride                      |    5 ++---
+ dselect/main.cc                          |    5 ++---
+ dselect/methkeys.cc                      |    5 ++---
+ dselect/methlist.cc                      |    5 ++---
+ dselect/method.cc                        |    5 ++---
+ dselect/method.h                         |    5 ++---
+ dselect/methods/multicd/install          |    3 +--
+ dselect/methods/multicd/setup            |    3 +--
+ dselect/methods/multicd/update           |    3 +--
+ dselect/methparse.cc                     |    5 ++---
+ dselect/mkcurkeys.pl                     |    5 ++---
+ dselect/pkgcmds.cc                       |    5 ++---
+ dselect/pkgdepcon.cc                     |    5 ++---
+ dselect/pkgdisplay.cc                    |    5 ++---
+ dselect/pkginfo.cc                       |    5 ++---
+ dselect/pkgkeys.cc                       |    5 ++---
+ dselect/pkglist.cc                       |    5 ++---
+ dselect/pkglist.h                        |    5 ++---
+ dselect/pkgsublist.cc                    |    5 ++---
+ dselect/pkgtop.cc                        |    5 ++---
+ get-version                              |    3 +--
+ lib/compat/alphasort.c                   |    5 ++---
+ lib/compat/compat.h                      |    5 ++---
+ lib/compat/scandir.c                     |    5 ++---
+ lib/compat/snprintf.c                    |    5 ++---
+ lib/compat/strerror.c                    |    5 ++---
+ lib/compat/strsignal.c                   |    5 ++---
+ lib/compat/unsetenv.c                    |    5 ++---
+ lib/compat/vsnprintf.c                   |    5 ++---
+ lib/dpkg/buffer.c                        |    5 ++---
+ lib/dpkg/buffer.h                        |    5 ++---
+ lib/dpkg/cleanup.c                       |    5 ++---
+ lib/dpkg/database.c                      |    5 ++---
+ lib/dpkg/dbmodify.c                      |    5 ++---
+ lib/dpkg/dlist.h                         |    3 +--
+ lib/dpkg/dpkg-db.h                       |    5 ++---
+ lib/dpkg/dpkg.h                          |    5 ++---
+ lib/dpkg/dump.c                          |    5 ++---
+ lib/dpkg/ehandle.c                       |    5 ++---
+ lib/dpkg/fields.c                        |    5 ++---
+ lib/dpkg/file.c                          |    5 ++---
+ lib/dpkg/file.h                          |    5 ++---
+ lib/dpkg/i18n.h                          |    5 ++---
+ lib/dpkg/lock.c                          |    5 ++---
+ lib/dpkg/log.c                           |    5 ++---
+ lib/dpkg/macros.h                        |    5 ++---
+ lib/dpkg/mlib.c                          |    5 ++---
+ lib/dpkg/myopt-util.c                    |    5 ++---
+ lib/dpkg/myopt.c                         |    5 ++---
+ lib/dpkg/myopt.h                         |    5 ++---
+ lib/dpkg/nfmalloc.c                      |    5 ++---
+ lib/dpkg/parse.c                         |    5 ++---
+ lib/dpkg/parsedump.h                     |    5 ++---
+ lib/dpkg/parsehelp.c                     |    5 ++---
+ lib/dpkg/path.c                          |    5 ++---
+ lib/dpkg/path.h                          |    5 ++---
+ lib/dpkg/pkg-array.c                     |    5 ++---
+ lib/dpkg/pkg-array.h                     |    5 ++---
+ lib/dpkg/pkg-list.c                      |    5 ++---
+ lib/dpkg/pkg-list.h                      |    5 ++---
+ lib/dpkg/pkg.c                           |    5 ++---
+ lib/dpkg/pkg.h                           |    5 ++---
+ lib/dpkg/progress.c                      |    5 ++---
+ lib/dpkg/progress.h                      |    5 ++---
+ lib/dpkg/showpkg.c                       |    5 ++---
+ lib/dpkg/string.c                        |    5 ++---
+ lib/dpkg/string.h                        |    5 ++---
+ lib/dpkg/subproc.c                       |    5 ++---
+ lib/dpkg/subproc.h                       |    5 ++---
+ lib/dpkg/test.h                          |    5 ++---
+ lib/dpkg/test/t-buffer.c                 |    5 ++---
+ lib/dpkg/test/t-macros.c                 |    5 ++---
+ lib/dpkg/test/t-path.c                   |    5 ++---
+ lib/dpkg/test/t-pkginfo.c                |    5 ++---
+ lib/dpkg/test/t-string.c                 |    5 ++---
+ lib/dpkg/test/t-test.c                   |    5 ++---
+ lib/dpkg/test/t-varbuf.c                 |    5 ++---
+ lib/dpkg/test/t-version.c                |    5 ++---
+ lib/dpkg/trigdeferred.l                  |    5 ++---
+ lib/dpkg/triglib.c                       |    5 ++---
+ lib/dpkg/utils.c                         |    5 ++---
+ lib/dpkg/varbuf.c                        |    5 ++---
+ lib/dpkg/varbuf.h                        |    5 ++---
+ lib/dpkg/vercmp.c                        |    5 ++---
+ man/deb-override.5                       |    5 ++---
+ man/deb-shlibs.5                         |    5 ++---
+ man/dpkg-scanpackages.1                  |    5 ++---
+ scripts/Dpkg/Changelog.pm                |    3 +--
+ scripts/Dpkg/Changelog/Debian.pm         |    3 +--
+ scripts/Dpkg/Changelog/Entry.pm          |    5 ++---
+ scripts/Dpkg/Changelog/Entry/Debian.pm   |    5 ++---
+ scripts/Dpkg/Changelog/Parse.pm          |    3 +--
+ scripts/Dpkg/Control.pm                  |    5 ++---
+ scripts/Dpkg/Control/Changelog.pm        |    5 ++---
+ scripts/Dpkg/Control/Fields.pm           |    5 ++---
+ scripts/Dpkg/Control/Hash.pm             |    5 ++---
+ scripts/Dpkg/Control/Info.pm             |    5 ++---
+ scripts/Dpkg/Deps.pm                     |    7 ++-----
+ scripts/Dpkg/IPC.pm                      |    5 ++---
+ scripts/Dpkg/Index.pm                    |    5 ++---
+ scripts/Dpkg/Path.pm                     |    5 ++---
+ scripts/Dpkg/Shlibs.pm                   |    5 ++---
+ scripts/Dpkg/Shlibs/Objdump.pm           |    5 ++---
+ scripts/Dpkg/Shlibs/Symbol.pm            |    5 ++---
+ scripts/Dpkg/Shlibs/SymbolFile.pm        |    5 ++---
+ scripts/Dpkg/Source/Archive.pm           |    5 ++---
+ scripts/Dpkg/Source/CompressedFile.pm    |    5 ++---
+ scripts/Dpkg/Source/Compressor.pm        |    5 ++---
+ scripts/Dpkg/Source/Package.pm           |    5 ++---
+ scripts/Dpkg/Source/Package/V1.pm        |    5 ++---
+ scripts/Dpkg/Source/Package/V2.pm        |    5 ++---
+ scripts/Dpkg/Source/Package/V3/bzr.pm    |    3 +--
+ scripts/Dpkg/Source/Package/V3/custom.pm |    5 ++---
+ scripts/Dpkg/Source/Package/V3/git.pm    |    3 +--
+ scripts/Dpkg/Source/Package/V3/native.pm |    5 ++---
+ scripts/Dpkg/Source/Package/V3/quilt.pm  |    5 ++---
+ scripts/Dpkg/Source/Patch.pm             |    5 ++---
+ scripts/Dpkg/Substvars.pm                |    5 ++---
+ scripts/Dpkg/Vars.pm                     |    5 ++---
+ scripts/Dpkg/Vendor.pm                   |    5 ++---
+ scripts/Dpkg/Vendor/Debian.pm            |    5 ++---
+ scripts/Dpkg/Vendor/Default.pm           |    5 ++---
+ scripts/Dpkg/Vendor/Ubuntu.pm            |    5 ++---
+ scripts/Dpkg/Version.pm                  |    5 ++---
+ scripts/dpkg-architecture.pl             |    3 +--
+ scripts/dpkg-name.pl                     |    3 +--
+ scripts/dpkg-scansources.pl              |    5 ++---
+ scripts/dpkg-vendor.pl                   |    3 +--
+ src/archives.c                           |    5 ++---
+ src/archives.h                           |    5 ++---
+ src/cleanup.c                            |    5 ++---
+ src/configure.c                          |    5 ++---
+ src/depcon.c                             |    5 ++---
+ src/divertdb.c                           |    5 ++---
+ src/enquiry.c                            |    5 ++---
+ src/errors.c                             |    5 ++---
+ src/filesdb.c                            |    5 ++---
+ src/filesdb.h                            |    5 ++---
+ src/help.c                               |    5 ++---
+ src/main.c                               |    5 ++---
+ src/main.h                               |    5 ++---
+ src/packages.c                           |    5 ++---
+ src/pkg-show.c                           |    5 ++---
+ src/processarc.c                         |    5 ++---
+ src/query.c                              |    5 ++---
+ src/remove.c                             |    5 ++---
+ src/select.c                             |    5 ++---
+ src/statcmd.c                            |    5 ++---
+ src/statdb.c                             |    5 ++---
+ src/trigcmd.c                            |    5 ++---
+ src/trigproc.c                           |    5 ++---
+ src/update.c                             |    5 ++---
+ utils/install-info.c                     |    5 ++---
+ 176 files changed, 339 insertions(+), 514 deletions(-)
+
+commit 0716206865109c3cdfc64c700adbf91a01f86364
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Nov 8 02:29:41 2009 +0100
+
+    libdpkg: Remove unused dumpchain macro
+    
+    Got converted to a macro just to avoid a compiler warning in
+    commit a1d9dc46c55fcc012854f8aa99058d5bb14c2a8a. The proper fix would
+    have been to either remove it or use it, which we are doing now.
+
+ lib/dpkg/showpkg.c |   13 -------------
+ 1 files changed, 0 insertions(+), 13 deletions(-)
+
+commit f789211ee930507e91c111b3326790ce10fdc100
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Nov 8 13:34:30 2009 +0100
+
+    Dpkg::Source::Patch::add_diff_directory(): small optimization
+    
+    The calls to File::Spec->abs2rel() are relatively expensive and can be
+    avoided given that we control the find() invocation and can only receive
+    filenames below the scanned directory. They are replaced with simple
+    string extraction with substr(), it gives another 25% speed benefit on big
+    source packages.
+    
+    Based-on-patch-by: Mike Hommey <mh@glandium.org>
+
+ scripts/Dpkg/Source/Patch.pm |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 7e10087ff285d78d4d1b5155f6127c21f27aecfd
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Nov 8 12:28:46 2009 +0100
+
+    update-alternatives: fix a french translation
+
+ po/fr.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c32c4bf1d9d6d4b84206315c97f47b68d6eb460c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 7 15:12:16 2009 +0100
+
+    dpkg: Call standard_shutdown after invoking the post hooks
+    
+    The error unwinding is part of the shutdown, and the invoke hooks
+    machinery might call ohshit, so it should be done at the end when
+    there's no more error handling in place.
+
+ src/main.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 19e33c332f2d072792c198aedc7932a6af3f7fd9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 7 15:05:35 2009 +0100
+
+    libdpkg: Make desc argument const in compress_cat and decompress_cat
+
+ lib/dpkg/compression.c |   10 ++++++++--
+ lib/dpkg/dpkg.h        |    4 ++--
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+commit 0814d1b1eb42c08809d31980d9a7f2b921c713e5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 7 14:04:41 2009 +0100
+
+    Use find with -L instead of deprecated -follow
+
+ dselect/methods/disk/install    |    5 +++--
+ dselect/methods/disk/setup      |    2 +-
+ dselect/methods/multicd/install |    4 ++--
+ dselect/methods/multicd/setup   |    2 +-
+ scripts/dpkg-scanpackages.pl    |    3 +--
+ scripts/dpkg-scansources.pl     |    2 +-
+ src/archives.c                  |    4 ++--
+ 7 files changed, 11 insertions(+), 11 deletions(-)
+
+commit 03b7c00daf4dbf20898dd6c214a4a399d4e2e002
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 7 00:55:39 2009 +0100
+
+    libdpkg: If PROCNOERR in subproc_check() return the status code
+    
+    If the caller asked for no errors, it does not make sense to lose the
+    status code on return. So we return it instead of -1.
+
+ lib/dpkg/subproc.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b4d4968715f3ca5498bba7b35b385a26d0c96151
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 7 13:23:50 2009 +0100
+
+    dpkg: Do not bogusly ignore find exit code 1
+    
+    Commit 68b56dc4edaaf90f5311f07b38871ddd61b84a48 introduced the
+    PROCNOERR to try to handle and be able to ignore find exit code 1,
+    which supposedly happened (not any longer) when using the -follow
+    option and a dangling symlink was found.
+    
+    But it only prevented the ohshit() inside checksubprocerr(), and the
+    return value was still -1, so it was not ignoring the exit code 1,
+    and still ohshit()ing in the caller.
+    
+    As find does currently exit with a 0 code even when finding broken
+    symlinks, let's remove this piece of broken logic.
+
+ src/archives.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a720b6aec5ab71211067cfd0250b57efa0aa18f9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 7 00:30:16 2009 +0100
+
+    Use subproc_wait instead of directly calling waitpid
+
+ dselect/method.cc |    7 ++-----
+ src/configure.c   |   22 +++-------------------
+ src/processarc.c  |    6 +++---
+ 3 files changed, 8 insertions(+), 27 deletions(-)
+
+commit d5388296797726e34abe13031dcbdd302319b908
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Nov 7 00:07:02 2009 +0100
+
+    libdpkg: Split process waiting from subproc_wait_check into subproc_wait
+
+ lib/dpkg/subproc.c |   12 +++++++++++-
+ lib/dpkg/subproc.h |    1 +
+ 2 files changed, 12 insertions(+), 1 deletions(-)
+
+commit 4d35b20c645479e850822b1508cfcdc5d471c890
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 6 23:56:22 2009 +0100
+
+    Rename process description function arguments to desc
+
+ lib/dpkg/subproc.c |   18 +++++++++---------
+ src/help.c         |   20 ++++++++++----------
+ src/main.h         |    6 +++---
+ 3 files changed, 22 insertions(+), 22 deletions(-)
+
+commit f5c904d58627ec1422173a596f2a2ef8584485c2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 6 23:03:01 2009 +0100
+
+    libdpkg: Rename and namespace subproc related functions
+
+ dpkg-deb/build.c   |   10 +++++-----
+ dpkg-deb/extract.c |    8 ++++----
+ dpkg-deb/info.c    |    2 +-
+ dselect/method.cc  |    4 ++--
+ lib/dpkg/subproc.c |   12 ++++++------
+ lib/dpkg/subproc.h |    8 ++++----
+ src/archives.c     |    2 +-
+ src/help.c         |    6 +++---
+ src/processarc.c   |    6 +++---
+ 9 files changed, 29 insertions(+), 29 deletions(-)
+
+commit 61e353f65b60cc5d58fc883ac150f90de244dfd2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 6 22:25:11 2009 +0100
+
+    libdpkg: Namespace include guards with LIBDPKG instead of DPKG
+
+ lib/dpkg/buffer.h    |    6 +++---
+ lib/dpkg/dpkg-db.h   |    6 +++---
+ lib/dpkg/dpkg.h      |    6 +++---
+ lib/dpkg/file.h      |    6 +++---
+ lib/dpkg/i18n.h      |    6 +++---
+ lib/dpkg/macros.h    |    6 +++---
+ lib/dpkg/parsedump.h |    6 +++---
+ lib/dpkg/path.h      |    6 +++---
+ lib/dpkg/pkg-array.h |    6 +++---
+ lib/dpkg/pkg-list.h  |    6 +++---
+ lib/dpkg/pkg.h       |    6 +++---
+ lib/dpkg/progress.h  |    4 ++--
+ lib/dpkg/string.h    |    6 +++---
+ lib/dpkg/subproc.h   |    6 +++---
+ lib/dpkg/tarfn.h     |    6 +++---
+ lib/dpkg/test.h      |    4 ++--
+ lib/dpkg/varbuf.h    |    6 +++---
+ 17 files changed, 49 insertions(+), 49 deletions(-)
+
+commit de470a7d71936b8a50d6089a7dfbbc3822ac6bb5
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Nov 6 20:05:21 2009 +0100
+
+    dpkg-source: optimize diffing phase of a source package build
+    
+    Optimize dpkg-source -b by avoiding many diff calls when not required.
+    
+    Based-on-patch-by: Mike Hommey <mh@glandium.org>
+
+ debian/changelog             |    2 ++
+ scripts/Dpkg/Source/Patch.pm |    3 +++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit d570dcf56c502a36b4747665938025609d5ffe47
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Nov 6 19:36:45 2009 +0100
+
+    Stop using the English perl module
+    
+    Using this module (and $' or $POSTMATCH) implies a performance penalty
+    that we want to avoid. Thus modifies the few regexes where it's used to
+    be explicit about the part of the data that we want to retrieve.
+
+ scripts/Dpkg/Substvars.pm  |   11 ++++----
+ scripts/dpkg-genchanges.pl |   57 +++++++++++++++++++++----------------------
+ scripts/dpkg-shlibdeps.pl  |    1 -
+ scripts/dpkg-source.pl     |   29 ++++++++++-----------
+ 4 files changed, 47 insertions(+), 51 deletions(-)
+
+commit 7d8d193332478de82e20ed5b49053378801d160f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Nov 6 18:08:23 2009 +0100
+
+    Dpkg::Control::Hash: handle arbitrary field values
+    
+    Checking the validity of new field values at run-time was very expensive.
+    In order to avoid this check, the design of the object has been changed to
+    accept arbitrary values, they are simply escaped as necessary during
+    output. The only data lost in a save()/load() cycle are the
+    trailing whitespaces on every line of all values.
+    
+    This API change implies fixes in all scripts/modules reading/creating
+    values for multiline fields.
+    
+    The non-regression test also had to be adjusted.
+
+ scripts/Dpkg/Changelog.pm            |    2 +-
+ scripts/Dpkg/Changelog/Entry.pm      |   12 +-----
+ scripts/Dpkg/Checksums.pm            |    2 +-
+ scripts/Dpkg/Control/Hash.pm         |   69 ++++++++++++++++++++-------------
+ scripts/Dpkg/Source/Package.pm       |    6 +-
+ scripts/dpkg-genchanges.pl           |   18 +++-----
+ scripts/dpkg-scanpackages.pl         |   13 ++----
+ scripts/dpkg-scansources.pl          |    4 +-
+ scripts/dpkg-source.pl               |    4 +-
+ scripts/t/700_Dpkg_Control.t         |   21 +++++++---
+ scripts/t/700_Dpkg_Control/control-1 |   11 +++--
+ 11 files changed, 84 insertions(+), 78 deletions(-)
+
+commit 0374e5565de9d42768ec8babdaabfb51cec4f6a6
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Nov 6 15:07:38 2009 +0100
+
+    Dpkg::Control::Hash: use lower-case internally for keys
+    
+    Only use field_capitalize() when exporting keys names outside of the
+    object. lc() is way faster than field_capitalize() and that makes
+    a difference in performance when you're reading/setting values many
+    times.
+
+ scripts/Dpkg/Control/Hash.pm |   16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+commit 0b1d71a6506ae053ca3c6ed06d2e4a0da0052da7
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Nov 6 00:07:36 2009 +0100
+
+    Dpkg::Source::Package::V3::git::do_build(): remove extra quotes
+    
+    Remove extra quoting that should not be there while passing an exclude
+    file to git ls-files during build of 3.0 (git) source package.
+    
+    Based-on-patch-by: Courtney Bane <debian-bugs-5265@cbane.org>
+
+ debian/changelog                      |    3 +++
+ scripts/Dpkg/Source/Package/V3/git.pm |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 32e999f9725589467249aabb9cf8043aaa9b9282
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Nov 5 23:58:47 2009 +0100
+
+    Add missing bug closure.
+
+ debian/changelog |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 1731ce5cc233cd01896298d7e4395bf0042959bf
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Nov 5 21:49:08 2009 +0100
+
+    Dpkg::Source::Package::V2::do_build(): improve matching of ignored files
+    
+    Modify logic to also match ignored files based on their relative path
+    inside the source package (and not only on their filename).
+
+ scripts/Dpkg/Source/Package/V2.pm |    9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+commit 6f6814491f0240a4de97f22e60661489bb36f914
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Nov 5 21:12:15 2009 +0100
+
+    Dpkg::Source::Package::V2:do_build(): fix binary file check
+    
+    The find() call that is supposed to look for binary files in the debian
+    sub-directory was missing the no_chdir option and due to this the
+    File::Spec->abs2rel() call (inside the wanted function) was returning an
+    invalid value when find() changed the current directory (since its second
+    parameter is only valid while being in the current directory).
+    
+    The parameter got lost by mistake in 3525f79792cff51757d99d45f51c96a15e6fa779
+    and it was present in lenny's version.
+
+ debian/changelog                  |    2 ++
+ scripts/Dpkg/Source/Package/V2.pm |    4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit c9e24e8e95f2354053e4a73592eafee7da240e8c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Nov 3 12:19:39 2009 +0100
+
+    Dpkg::Changelog::get_range(): fix return value when range is empty
+    
+    Also fix scripts/changelog/debian.pl to better deal with undef values
+    returned when the requested range matches an empty set of changelog
+    entries.
+
+ scripts/Dpkg/Changelog.pm   |   10 +++++++---
+ scripts/changelog/debian.pl |    6 ++++--
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+
+commit 3fb1f0d63cda6069ddac0bea53ca0cd1430d6fda
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Nov 2 13:50:01 2009 +0100
+
+    Add missing bug closure
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 714cfb8287c21b792c32d22ebb1eb724a8e693d1
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Oct 31 22:55:29 2009 +0100
+
+    Add changelog entry for Dpkg::Changelog changes
+
+ debian/changelog |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 394e14ffc28160feaa6ef55f4b7ac815a455d1de
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Oct 30 11:42:56 2009 +0100
+
+    Add supplementary non-regression tests for Dpkg::Changelog related modules
+
+ scripts/t/600_Dpkg_Changelog.t      |  102 ++++++++++++++++++++++++++--------
+ scripts/t/600_Dpkg_Changelog/fields |   19 ++++++-
+ 2 files changed, 95 insertions(+), 26 deletions(-)
+
+commit bb4611eb5cb1571af9886f33c61dc6305284c6cc
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 25 23:19:42 2009 +0100
+
+    Dpkg::Changelog: completely update the API
+    
+    The previous API was too different from the other modules inside dpkg-dev.
+    
+    Dpkg::Changelog now behaves as an array of Dpkg::Changelog::Entry
+    and the documentation explains how it can be derived to create a new
+    changelog parser.
+    
+    The non-regression tests as well as the official Debian
+    changelog parser script had to be updated to cope with the new API.
+
+ scripts/Dpkg/Changelog.pm        |  661 ++++++++++++++++----------------------
+ scripts/Dpkg/Changelog/Debian.pm |   90 ++----
+ scripts/Dpkg/Changelog/Entry.pm  |    4 +-
+ scripts/changelog/debian.pl      |   21 +-
+ scripts/t/600_Dpkg_Changelog.t   |   53 +---
+ 5 files changed, 331 insertions(+), 498 deletions(-)
+
+commit 1b10a64b592e140a9d6bd34e3d7d6f7cfe0faf38
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Oct 30 09:47:32 2009 +0100
+
+    Dpkg::Changelog::Entry: add get_dpkg_changes() method here
+    
+    This is the logical place for this function (as an object method).
+
+ scripts/Dpkg/Changelog/Entry.pm |   24 ++++++++++++++++++++++++
+ 1 files changed, 24 insertions(+), 0 deletions(-)
+
+commit 30421dbe46f769b4e2333af8baf7269698cbc050
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 25 23:18:45 2009 +0100
+
+    dpkg-parsechangelog: drop useless “use” statements
+    
+    Neither POSIX nor English are used by this small script.
+
+ scripts/dpkg-parsechangelog.pl |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+commit 1f67f4b22b2c8571a39ff38cf74d259871fdc84c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 25 19:08:45 2009 +0100
+
+    Move find_closes() into Dpkg::Changelog::Entry::Debian
+
+ scripts/Dpkg/Changelog.pm              |   24 ------------------------
+ scripts/Dpkg/Changelog/Entry/Debian.pm |   32 +++++++++++++++++++++++++++-----
+ 2 files changed, 27 insertions(+), 29 deletions(-)
+
+commit 8a140576f54188e6009e3398a2ec3da1c100be0d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 25 18:39:03 2009 +0100
+
+    Dpkg::Changelog::Debian: syntax/style cleanup
+    
+    Use standard unless blocks instead of multiple ORed checks with
+    “do” statements.
+    
+    Drop useless “use Dpkg”.
+
+ scripts/Dpkg/Changelog/Debian.pm |   62 +++++++++++++++----------------------
+ 1 files changed, 25 insertions(+), 37 deletions(-)
+
+commit 23d47fe8b736fb5772e38d0941f09717d1ea6756
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 25 18:25:57 2009 +0100
+
+    Dpkg::Changelog: don't use English
+    
+    Replace $NR with $. for this. Using English implies a performance penalty
+    in regex matching that we'd like to avoid.
+
+ scripts/Dpkg/Changelog.pm        |    6 ++----
+ scripts/Dpkg/Changelog/Debian.pm |   22 ++++++++++------------
+ 2 files changed, 12 insertions(+), 16 deletions(-)
+
+commit 9ac7b86ac2be3e50a883262ed21ccdc4f1b92ffd
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 25 18:20:37 2009 +0100
+
+    Dpkg::Changelog::Debian: drop improper documentation
+    
+    Together with a duplicate copyright notice and an unneeded
+    use statement. Add myself in the copyright notice.
+
+ scripts/Dpkg/Changelog/Debian.pm |   42 ++-----------------------------------
+ 1 files changed, 3 insertions(+), 39 deletions(-)
+
+commit 05f529d5455be4d116df6c91d1f9ac28e65ac6e7
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 25 18:20:11 2009 +0100
+
+    Dpkg::Changelog::Debian: use constants for parser states
+
+ scripts/Dpkg/Changelog/Debian.pm |   46 +++++++++++++++++++++----------------
+ 1 files changed, 26 insertions(+), 20 deletions(-)
+
+commit dc5d755b0fe118938f7bba438fcf2e44461b0f65
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 25 17:54:06 2009 +0100
+
+    Move header/trailer checks in Dpkg::Changelog::Entry::Debian
+
+ scripts/Dpkg/Changelog/Debian.pm       |   34 ++----------------
+ scripts/Dpkg/Changelog/Entry/Debian.pm |   59 ++++++++++++++++++++++++++++++++
+ 2 files changed, 63 insertions(+), 30 deletions(-)
+
+commit d0d812c1d96f53fdabbb356a50fc3a11cd7ce04d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 25 17:19:07 2009 +0100
+
+    Dpkg::Changelog::Entry::Debian: parse changes lines as set of items
+    
+    The function get_change_items() reintroduce the feature that parsed the
+    changes as a set of items describing individual changes. Furthermore it
+    parses attribution lines (“[ Name ]”) as separate items.
+
+ scripts/Dpkg/Changelog/Entry/Debian.pm |   37 ++++++++++++++++++++++++++++++++
+ 1 files changed, 37 insertions(+), 0 deletions(-)
+
+commit bb9af2d083538d4ffa2033b1e3380ec9d924d32b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Oct 24 18:04:47 2009 +0200
+
+    Drop compatibility with old changelog parsers (as planned)
+
+ doc/README.feature-removal-schedule |   24 ++++++++++++------------
+ scripts/Dpkg/Changelog/Parse.pm     |    7 -------
+ scripts/dpkg-genchanges.pl          |   16 +++-------------
+ 3 files changed, 15 insertions(+), 32 deletions(-)
+
+commit 99e3abcc33343dbfb65e585b496f451d433ed7fc
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Oct 24 17:54:31 2009 +0200
+
+    Move parse_changelog() to a separate module Dpkg::Changelog::Parse
+    
+    Despite its name, this function does not actuallay parse anything by
+    itself, it just calls external parsers and returns their result. This
+    interface is largely used by other tools and is not tied with any of the
+    other Dpkg::Changelog modules so it's best kept separate.
+    
+    Many scripts have to be updated to cope with the renaming.
+
+ scripts/Dpkg/Changelog.pm       |  126 -----------------------------
+ scripts/Dpkg/Changelog/Parse.pm |  167 +++++++++++++++++++++++++++++++++++++++
+ scripts/Makefile.am             |    1 +
+ scripts/dpkg-buildpackage.pl    |    4 +-
+ scripts/dpkg-genchanges.pl      |    6 +-
+ scripts/dpkg-gencontrol.pl      |    4 +-
+ scripts/dpkg-gensymbols.pl      |    4 +-
+ scripts/dpkg-parsechangelog.pl  |    4 +-
+ scripts/dpkg-source.pl          |    4 +-
+ scripts/po/POTFILES.in          |    1 +
+ 10 files changed, 182 insertions(+), 139 deletions(-)
+
+commit 825656afe3e9856dc846c225df8af73d2376fa3e
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 18 23:07:03 2009 +0200
+
+    Update Dpkg::Changelog to use new ::Entry modules
+    
+    Drop the Dpkg::Changelog::Entry embedded in Dpkg::Changelog.
+    Update Dpkg::Changelog and Dpkg::Changelog::Debian to use the
+    new modules.
+    
+    Some (undocumented) features have been removed with this rewrite.
+    The entries are not parsed item by item anymore. The Urgency field
+    will no longer receive the comment that can follow the urgency.
+    
+    The content of “Closes” is exported by Dpkg::Changelog::Entry::Debian
+    as an optional field.
+    
+    The test-suite also had to be updated to cope with the API changes
+    and the fact that bugs are no longer duplicated in the “Closes” field.
+
+ scripts/Dpkg/Changelog.pm        |  160 +++++++++++++++-----------------------
+ scripts/Dpkg/Changelog/Debian.pm |  122 +++++++----------------------
+ scripts/t/600_Dpkg_Changelog.t   |    8 +-
+ 3 files changed, 97 insertions(+), 193 deletions(-)
+
+commit 750c5b4d630aa7b8aa72b1b6d621b7eb5eb70093
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 18 22:36:20 2009 +0200
+
+    Dpkg::Changelog::Entry, Dpkg::Control::Changelog: new modules
+    
+    Dpkg::Changelog::Entry is a somewhat generic representation of a
+    changelog entry. It offers an interface exporting the basic information
+    that we need to extract for dpkg-parsechangelog.
+    
+    Dpkg::Changelog::Entry::Debian is the implementation of this
+    interface for the typical Debian changelog entry.
+    
+    Dpkg::Control::Changelog is the object representing the
+    information exported by dpkg-parsechangelog. It starts empty
+    as a simple Dpkg::Control of type CTRL_CHANGELOG.
+    
+    Those new modules are not yet used by the Dpkg::Changelog modules.
+
+ scripts/Dpkg/Changelog/Entry.pm        |  284 ++++++++++++++++++++++++++++++++
+ scripts/Dpkg/Changelog/Entry/Debian.pm |  156 +++++++++++++++++
+ scripts/Dpkg/Control/Changelog.pm      |   59 +++++++
+ scripts/Makefile.am                    |    3 +
+ scripts/po/POTFILES.in                 |    3 +
+ 5 files changed, 505 insertions(+), 0 deletions(-)
+
+commit f3352fe06a0491a5642acb72f9f5e3724f2e8a13
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 22 09:54:05 2009 +0200
+
+    Dpkg::Index: new module
+    
+    This module represents an ordered set of Dpkg::Control objects.
+    It ensures uniqueness for objects based on a customisable key.
+
+ scripts/Dpkg/Index.pm  |  371 ++++++++++++++++++++++++++++++++++++++++++++++++
+ scripts/Makefile.am    |    1 +
+ scripts/po/POTFILES.in |    1 +
+ 3 files changed, 373 insertions(+), 0 deletions(-)
+
+commit af52dbcb1e9bfb9cfc383f79bdfd825c2e69490f
+Author: Frank Lichtenheld <djpig@debian.org>
+Date:   Sat Oct 31 22:25:12 2009 +0100
+
+    Remove myself from Uploaders
+    
+    It's been a while since I did anything in dpkg, and I don't see
+    any chance of that changing in the near future.
+
+ debian/control |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 18e61369990f9969c7ef666d024a0766cc0feea9
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sat Oct 31 17:24:16 2009 +0100
+
+    Fix grammatical error
+
+ man/po/fr.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6b3d052813aec63375c4eec2670904ca634adca1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Oct 30 14:59:33 2009 +0100
+
+    Fix spelling errors in the Catalan translation
+    
+    Closes: #553328
+    
+    Reported-by: Robert Millan <rmh.iesmontserrat@gmail.com>
+
+ debian/changelog |    2 ++
+ po/ca.po         |   10 +++++-----
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+commit 76044b005784129b5c7faa51cd050c43e861deb6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Oct 30 14:38:47 2009 +0100
+
+    build: Use pkg-config m4 macros to detect selinux library
+    
+    Use PKG_PROG_PKG_CONFIG to detect and allow overriding the pkg-config
+    binary to use, for example in case of cross-compilation.
+    
+    Suggested-by: Tollef Fog Heen <tfheen@err.no>
+
+ debian/changelog |    2 ++
+ m4/dpkg-libs.m4  |   15 ++++++++-------
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+commit a888de4b1c2e1bc867fee487e04bd561f5aa2f7d
+Author: Felipe Contreras <felipe.contreras@gmail.com>
+Date:   Sun Oct 25 15:40:15 2009 +0200
+
+    build: If there's no libselinux.pc file fallback to hardcoded list
+    
+    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ m4/dpkg-libs.m4 |   14 +++++++++++---
+ 1 files changed, 11 insertions(+), 3 deletions(-)
+
+commit 438e93de387d313c6085eea63101a4c4e714a2d5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Oct 29 21:34:12 2009 +0100
+
+    Update TODO list
+    
+    Remove done items. Remove items moved to the RoadMap in the wiki, and
+    add a link to it. Move items around were they better fit. Separate old
+    TODOs with a straight line.
+
+ TODO |   58 ++++++++++++++++++----------------------------------------
+ 1 files changed, 18 insertions(+), 40 deletions(-)
+
+commit 9c3bcc6fb033fd5cf251c46024a3becc932354be
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Sat Oct 24 17:21:49 2009 -0500
+
+    man: Fix a small typo in dpkg.1
+    
+    Extra “be” in “can be also be”.
+    
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ man/dpkg.1      |    2 +-
+ man/po/de.po    |    4 ++--
+ man/po/es.po    |    4 ++--
+ man/po/fr.po    |    4 ++--
+ man/po/hu.po    |    4 ++--
+ man/po/ja.po    |    4 ++--
+ man/po/pl.po    |    4 ++--
+ man/po/pt_BR.po |    4 ++--
+ man/po/ru.po    |    4 ++--
+ man/po/sv.po    |    4 ++--
+ 10 files changed, 19 insertions(+), 19 deletions(-)
+
+commit 679d1d75780f7e1b2e32f158cd72357d9087a7a6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Oct 29 18:41:54 2009 +0100
+
+    build: Only use po4a if present and if NLS is enabled
+    
+    Use the po4a command found when doing the availability checks.
+    
+    Reported-by: Felipe Contreras <felipe.contreras@gmail.com>
+
+ configure.ac     |    1 +
+ m4/dpkg-progs.m4 |   14 ++++++++++++++
+ man/Makefile.am  |   14 +++++++-------
+ 3 files changed, 22 insertions(+), 7 deletions(-)
+
+commit 99e213787595fec1a7939ba1a0395dfdfd62c7ba
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Oct 29 18:01:17 2009 +0100
+
+    build: Rename and namespace dpkg m4 files
+    
+    This avoids possible future collisions and makes it easier to see
+    what's coming from dpkg and what each file is for.
+
+ m4/{arch.m4 => dpkg-arch.m4}         |    0
+ m4/{compiler.m4 => dpkg-compiler.m4} |    0
+ m4/{funcs.m4 => dpkg-funcs.m4}       |    0
+ m4/{libs.m4 => dpkg-libs.m4}         |    0
+ m4/{linker.m4 => dpkg-linker.m4}     |    0
+ m4/{perl.m4 => dpkg-progs.m4}        |    0
+ m4/{types.m4 => dpkg-types.m4}       |    0
+ 7 files changed, 0 insertions(+), 0 deletions(-)
+
+commit 3e5ce0a54a78790adf86fb8bdcdb288121a039c6
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Sat Oct 24 17:32:56 2009 -0500
+
+    libdpkg: fix misspelling of __attribute__((const))
+    
+    gcc does not recognize __attribute__((constant)).
+    
+    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ lib/dpkg/macros.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 7b849f7297e4582b3a13417db68d13a2464df89b
+Author: Sean Finney <seanius@debian.org>
+Date:   Wed Oct 14 21:23:05 2009 +0200
+
+    dpkg: Add JavaDoc comments for promptconfaction()
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ src/configure.c |   25 +++++++++++++++++++++++--
+ 1 files changed, 23 insertions(+), 2 deletions(-)
+
+commit fcd32924f34859ae9cab48d92e054b297a577bc5
+Author: Sean Finney <seanius@debian.org>
+Date:   Wed Oct 14 21:23:04 2009 +0200
+
+    dpkg: Pass a pkginfo structure to promptconfaction()
+    
+    In order to provide an interface into the conffiles DB API, it's required
+    to know the package name that owns the conffile. Since this is a static
+    function and the package structure is available in all places that the
+    function is used, this is a fairly easy fix.
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ src/configure.c |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit e000e4a109b95bc43e558e2f53bc85bc63d3177d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 11 16:33:21 2009 +0200
+
+    Document some of the code with JavaDoc
+
+ lib/dpkg/pkg-array.c |   16 ++++++++++++++++
+ lib/dpkg/pkg-array.h |    3 +++
+ lib/dpkg/pkg.c       |   11 +++++++++++
+ src/configure.c      |   37 ++++++++++++++++++++++++++++++-------
+ 4 files changed, 60 insertions(+), 7 deletions(-)
+
+commit 2ba520490b52db98282a4476d23d9fd8c5798270
+Author: Sean Finney <seanius@debian.org>
+Date:   Mon Oct 12 21:01:45 2009 +0200
+
+    doc: Tune some Doxygen settings
+
+ doc/Doxyfile.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 876b5126314291cafba31bd4c341b95f777cf9fa
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Oct 9 15:41:54 2009 +0200
+
+    doc: Add doxygen support
+    
+    The code should start getting switched to document using JavaDoc
+    style comments, at least for public declarations.
+
+ Makefile.am          |    8 +
+ configure.ac         |    3 +
+ debian/changelog     |    1 +
+ doc/.gitignore       |    2 +
+ doc/Doxyfile.in      | 1521 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ doc/coding-style.txt |    5 +
+ 6 files changed, 1540 insertions(+), 0 deletions(-)
+
+commit 971e675a180c59642e2406acbb0c6f7bc68961e6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 25 23:56:30 2009 +0100
+
+    Generate the autoconf version from git
+    
+    Use a new script to retrieve the version from a file shipped in the
+    released tarballs, or from the git repository using “git describe”
+    which will give an appropriate string in case of a snapshot, and add
+    a possible “-dirty” suffix if the working dir has uncommitted changes.
+
+ Makefile.am      |    2 ++
+ configure.ac     |    2 +-
+ debian/changelog |    2 ++
+ get-version      |   42 ++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 47 insertions(+), 1 deletions(-)
+
+commit 1c88ead04c95096f03b61a6032d443a327964926
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 17 02:38:03 2009 +0200
+
+    Sort order of header includes
+    
+    Place first <config.h> and <compat.h>, then all <sys/*.h> sorted by
+    complexity, followed by the rest of the system headers, then <dpkg/*.h>
+    and finally the local "*.h" ones.
+    
+    Move <dpkg/i18n.h> inclusion into libdpkg inclusion block, as the
+    <gettext.h> compatibility header already takes care of including
+    <locale.h> before <libintl.h> on environments were its probamatic.
+    
+    Removed duplicated inclusions.
+
+ dpkg-deb/build.c          |   24 ++++++++--------
+ dpkg-deb/extract.c        |   21 +++++++------
+ dpkg-deb/info.c           |   19 ++++++------
+ dpkg-deb/main.c           |   24 ++++++++--------
+ dpkg-split/info.c         |   13 ++++----
+ dpkg-split/join.c         |   10 +++---
+ dpkg-split/main.c         |   13 ++++----
+ dpkg-split/queue.c        |   15 +++++----
+ dpkg-split/split.c        |   13 ++++----
+ dselect/basecmds.cc       |    5 +--
+ dselect/baselist.cc       |   10 +++---
+ dselect/bindings.cc       |    5 +--
+ dselect/dselect.h         |    8 ++--
+ dselect/main.cc           |   23 +++++++--------
+ dselect/methlist.cc       |    7 ++--
+ dselect/method.cc         |   23 +++++++--------
+ dselect/methparse.cc      |   18 ++++++------
+ dselect/pkgcmds.cc        |    2 +-
+ dselect/pkgdepcon.cc      |    4 +-
+ dselect/pkgdisplay.cc     |    5 +--
+ dselect/pkginfo.cc        |    7 ++--
+ dselect/pkglist.cc        |    9 ++---
+ dselect/pkgsublist.cc     |    7 ++--
+ dselect/pkgtop.cc         |    7 ++--
+ lib/compat/alphasort.c    |    2 +-
+ lib/compat/scandir.c      |    3 +-
+ lib/compat/unsetenv.c     |    2 +-
+ lib/compat/vsnprintf.c    |    2 +-
+ lib/dpkg/buffer.c         |    6 ++--
+ lib/dpkg/cleanup.c        |    4 +-
+ lib/dpkg/compression.c    |    9 ++---
+ lib/dpkg/database.c       |    4 +-
+ lib/dpkg/dbmodify.c       |   19 ++++++------
+ lib/dpkg/dpkg-db.h        |    9 +++--
+ lib/dpkg/dpkg.h           |   17 +++++------
+ lib/dpkg/dump.c           |   16 +++++-----
+ lib/dpkg/ehandle.c        |   12 ++++----
+ lib/dpkg/fields.c         |    6 ++--
+ lib/dpkg/file.c           |    1 +
+ lib/dpkg/lock.c           |   14 ++++----
+ lib/dpkg/log.c            |    9 ++---
+ lib/dpkg/md5.c            |    3 +-
+ lib/dpkg/mlib.c           |   13 ++++----
+ lib/dpkg/myopt-util.c     |    8 ++--
+ lib/dpkg/myopt.c          |    6 ++--
+ lib/dpkg/nfmalloc.c       |    6 ++--
+ lib/dpkg/parse.c          |   28 ++++++++----------
+ lib/dpkg/parsehelp.c      |    8 ++--
+ lib/dpkg/path.c           |    2 +-
+ lib/dpkg/path.h           |    4 +-
+ lib/dpkg/progress.c       |    4 +-
+ lib/dpkg/showpkg.c        |    7 ++--
+ lib/dpkg/subproc.c        |    6 ++--
+ lib/dpkg/tarfn.c          |    8 ++--
+ lib/dpkg/tarfn.h          |    5 ++-
+ lib/dpkg/test.h           |    6 ++--
+ lib/dpkg/test/t-buffer.c  |    4 +-
+ lib/dpkg/test/t-path.c    |    4 +-
+ lib/dpkg/test/t-string.c  |    4 +-
+ lib/dpkg/trigdeferred.l   |    3 +-
+ lib/dpkg/triglib.c        |    9 ++---
+ lib/dpkg/utils.c          |    3 +-
+ lib/dpkg/varbuf.c         |    5 ++-
+ lib/dpkg/vercmp.c         |    1 +
+ m4/compiler.m4            |    5 +--
+ src/archives.c            |   20 ++++++------
+ src/cleanup.c             |   17 ++++++-----
+ src/configure.c           |   24 +++++++--------
+ src/depcon.c              |    9 +++--
+ src/divertdb.c            |   15 ++++-----
+ src/enquiry.c             |   18 ++++++------
+ src/errors.c              |   19 ++++++------
+ src/filesdb.c             |   16 +++++-----
+ src/help.c                |   17 ++++++-----
+ src/main.c                |   26 ++++++++--------
+ src/packages.c            |   17 +++++------
+ src/pkg-show.c            |    3 +-
+ src/processarc.c          |   23 ++++++++-------
+ src/query.c               |   18 ++++++------
+ src/remove.c              |   17 +++++------
+ src/select.c              |   10 +++---
+ src/statcmd.c             |   14 ++++----
+ src/statdb.c              |   15 ++++-----
+ src/trigcmd.c             |   15 ++++-----
+ src/trigproc.c            |    6 ++--
+ src/update.c              |    8 ++--
+ utils/install-info.c      |    4 +-
+ utils/start-stop-daemon.c |   68 ++++++++++++++++++++++-----------------------
+ 88 files changed, 482 insertions(+), 496 deletions(-)
+
+commit ff33aa430e6de845a089a6a023a9478dafa109cc
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 17 02:07:02 2009 +0200
+
+    Remove unused <fnmatch.h> include
+
+ src/enquiry.c |    1 -
+ src/trigcmd.c |    1 -
+ src/update.c  |    1 -
+ 3 files changed, 0 insertions(+), 3 deletions(-)
+
+commit cbf95b13500a3b2d3c2e6df02940479c645564fc
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 25 23:06:46 2009 +0100
+
+    Add .mailmap to EXTRA_DIST
+    
+    Missed in commit 722fa5660d52ac75db0b21a86004fc10f8f580bb.
+
+ Makefile.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit c9cf7b1d4178f8e293a02edfc7ca2252d41da81e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Oct 19 13:06:42 2009 +0200
+
+    libcompat: Always add an empty file to the libcompat static library
+    
+    Some ar implementations do not support creating empty archives, so we
+    add a dummy empty object to avoid any problem.
+
+ lib/compat/Makefile.am |    1 +
+ lib/compat/empty.c     |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 078364191dfc7856c3ff7f13087ed072d910b75e
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 25 23:31:17 2009 +0100
+
+    debian/rules: use “$(MAKE)” instead of “make”
+
+ debian/rules |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 04b2f8fc48005394a3d8ea6c96f6c7975867606c
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sat Oct 24 09:16:23 2009 +0200
+
+    French manpages translations
+
+ debian/changelog |    1 +
+ man/po/fr.po     |  220 +++++++++++++++++++-----------------------------------
+ 2 files changed, 77 insertions(+), 144 deletions(-)
+
+commit 902dc77ce8030dddae9f9db6b93d0a8764cf1944
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sat Oct 24 09:12:13 2009 +0200
+
+    Updated French translation of dselect
+
+ debian/changelog |    1 +
+ dselect/po/fr.po |   12 +++++-------
+ 2 files changed, 6 insertions(+), 7 deletions(-)
+
+commit 7f313195732f28ed8aa45b814ad33a6814f0fb38
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sat Oct 24 09:09:01 2009 +0200
+
+    Updated French translation
+
+ debian/changelog |    1 +
+ po/fr.po         |  137 +++++++++++++++++++++++-------------------------------
+ 2 files changed, 59 insertions(+), 79 deletions(-)
+
+commit 3700faf371edb7b6939cf21d144fefbaf9bbdd5b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Oct 19 15:16:52 2009 +0200
+
+    Release 1.15.4.1
+
+ configure.ac     |    2 +-
+ debian/changelog |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit d8603d75ba95ac1e1a3bf79e772416508b8f4f1b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Oct 19 15:14:39 2009 +0200
+
+    dselect: Do not mark any package as unseen
+    
+    This is a workaround until it learns how to store such information
+    again.
+    
+    Closes: #545366
+
+ debian/changelog   |    3 ++-
+ dselect/pkglist.cc |    4 ++++
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 6110392684c345388bb853d20c8504b687bb4189
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Oct 19 15:07:14 2009 +0200
+
+    Bump version to 1.15.4.1~
+
+ configure.ac     |    2 +-
+ debian/changelog |    6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit a8a51a4a53e923250ccc4bf0c2c040a211991c90
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 18 23:21:42 2009 +0200
+
+    Dpkg::Changelog::find_closes(): don't return duplicate bug numbers
+    
+    Ensure we don't return the same bug multiple times even if it's closed
+    multiple times.
+
+ scripts/Dpkg/Changelog.pm |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 43c42b3ea29daab2bf5d1f6ed4d741d33d50d4d8
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Oct 18 20:57:54 2009 +0200
+
+    Dpkg::Control::Fields: allow transfer of custom fields
+    
+    Custom fields can be copied when they do not target one of
+    the official file type who are explicitely managed by the
+    letter scheme (X[SBC]-).
+
+ scripts/Dpkg/Control/Fields.pm |   21 +++++++++++++++------
+ 1 files changed, 15 insertions(+), 6 deletions(-)
+
+commit 5cfb6a762227bf2842c1fdace97578078d7fd206
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Oct 18 13:13:21 2009 +0200
+
+    Fix typos
+
+ man/po/de.po |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit c2624cc99f361e64a09706d6a667c511aa803bea
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Oct 16 19:09:59 2009 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1650t.
+
+ man/po/de.po |   34 +++++++++++++++++++++++++++++++++-
+ 1 files changed, 33 insertions(+), 1 deletions(-)
+
+commit f8270519a63210a5b6eb02cfff1bdc24cbfe4ef8
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Oct 16 12:44:11 2009 +0200
+
+    Dpkg::Compression: add support for xz compression method
+    
+    Update the dpkg-source manual page accordingly.
+
+ debian/changelog            |    2 ++
+ debian/control              |    2 +-
+ man/dpkg-source.1           |    7 ++++---
+ scripts/Dpkg/Compression.pm |   12 +++++++-----
+ 4 files changed, 14 insertions(+), 9 deletions(-)
+
+commit ff035d943163d1b269aeaec334b8654aeb20ca7a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Oct 16 02:39:10 2009 +0200
+
+    man: Fix typo in Swedish translation making build to fail
+    
+    Introduced in commit af22e669c65db01eec9d9699d98841b08e7bbc5b.
+
+ man/po/sv.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 15440f3ed12e7087e67b6b6c497e22a126583be2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Oct 16 02:24:03 2009 +0200
+
+    dpkg: Remove unused variable current in pkg_files_add_file()
+    
+    Introduced on commit 4985c686c30b2d0682aab0885d32c36007a7998d by me
+    while manually merging the patch that didn't apply cleanly on master.
+    
+    Reported-by: Sean Finney <seanius@debian.org>
+
+ src/filesdb.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c057025d84371714e0ed21c79604ccf744203670
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Oct 14 18:50:47 2009 +0200
+
+    Fix typo
+
+ man/po/de.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit af22e669c65db01eec9d9699d98841b08e7bbc5b
+Author: Peter Krefting <peterk@debian.org>
+Date:   Wed Oct 14 09:24:47 2009 +0100
+
+    Update Swedish translation.
+    
+    dselect/po/sv.po: Update to 280t0f0u.
+    man/po/sv.po: Update to 1642t0f0u.
+    po/sv.po: Update to 967t0f0u.
+    scripts/po/sv.po: Update to 471t0f0u.
+
+ debian/changelog |   12 +-
+ dselect/po/sv.po |    7 +-
+ man/po/sv.po     |  159 ++++---
+ po/sv.po         | 1539 +++++++++++++++++++++++++++---------------------------
+ scripts/po/sv.po |  629 ++++++++++++-----------
+ 5 files changed, 1202 insertions(+), 1144 deletions(-)
+
+commit 37c754ec3d45a121aeffc9c03dba8b97b1780f40
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Oct 14 05:37:43 2009 +0200
+
+    libcompat: Handle 0 size case for C99 vsnprintf semantics
+    
+    Reporter-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+
+ lib/compat/vsnprintf.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 3898dc17925ab38b292b1accbf42eae953381e3c
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date:   Wed Oct 14 03:36:20 2009 +0700
+
+    libcompat: Add top_builddir to the include path
+    
+    Needed as the modules use <config.h>.
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ lib/compat/Makefile.am |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 537d0870881347865492b16898c0b366ff05add6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Oct 14 05:18:23 2009 +0200
+
+    dpkg: Remove unused head variable in getselections()
+
+ src/select.c |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+commit 280f25e9b199b91f031097bad5ec52630e10bf76
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 10 19:58:03 2009 +0200
+
+    libdpkg: Rename symlinkList variables in TarExtractor()
+    
+    Use the head, tail, node name convention.
+
+ lib/dpkg/tarfn.c |   34 +++++++++++++++++-----------------
+ 1 files changed, 17 insertions(+), 17 deletions(-)
+
+commit c644793d5ccaf02242d814ce79e45a4210481aa3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Oct 14 04:27:03 2009 +0200
+
+    dpkg-statoverride: Fallback to printing #<id> if db lookup fails
+    
+    This allows it to gracefully handle uid and gid not present on the
+    password databases, when storing on the overrides db, in a similar way
+    as the perl implementation was behaving.
+    
+    Spotted-by: Raphaël Hertzog <hertzog@debian.org>
+
+ src/statcmd.c |   16 ++++++++++------
+ 1 files changed, 10 insertions(+), 6 deletions(-)
+
+commit 1de3e1e0f306fc404958f01f38708f9fb3599924
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Oct 14 04:24:44 2009 +0200
+
+    dpkg-statoverride: Fix typo inverting the override exists check
+
+ src/statcmd.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 49049eff05efcfc6f655cab3379d0266cd689bff
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Oct 14 03:54:03 2009 +0200
+
+    dpkg-statoverride: Add missing values for option flags
+    
+    This was making the --force, --update and --quiet flags not do anything.
+
+ src/statcmd.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 51647b0793ca0f419cd9f7ea586e01fffe6574a8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Oct 14 03:52:22 2009 +0200
+
+    dpkg-statoverride: Add missing newline in --version output
+
+ src/statcmd.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f5824f65b2e837fe65657b79c5695d8ab6b206a2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Oct 12 21:25:22 2009 +0200
+
+    libdpkg: Expand TKI_DEFINE macro for each user
+    
+    It makes it obvious what's going on, browser and search the source
+    code.
+
+ lib/dpkg/triglib.c |   29 ++++++++++++++++++-----------
+ 1 files changed, 18 insertions(+), 11 deletions(-)
+
+commit 69e3c912bbec30399d23477817821c38d01c1415
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Oct 12 21:21:03 2009 +0200
+
+    Use named intializers in structures
+
+ lib/dpkg/triglib.c |   18 +++++++++---------
+ src/processarc.c   |    8 ++++++--
+ src/trigcmd.c      |    6 +++---
+ src/trigproc.c     |   10 +++++-----
+ 4 files changed, 23 insertions(+), 19 deletions(-)
+
+commit 5da3e92afcb6109feed5e9dac155eb3ca75010eb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 10 19:30:20 2009 +0200
+
+    Do not use C++ style comments in C code
+
+ dpkg-deb/build.c                       |    2 +-
+ scripts/t/200_Dpkg_Shlibs/symboltags.c |   14 +++++++++-----
+ src/configure.c                        |    2 +-
+ 3 files changed, 11 insertions(+), 7 deletions(-)
+
+commit 4985c686c30b2d0682aab0885d32c36007a7998d
+Author: David Benjamin <davidben@MIT.EDU>
+Date:   Sat Aug 29 19:59:20 2009 -0400
+
+    dpkg: Refactor file addition into package files to a new function
+    
+    Added private function pkg_files_add_file for inserting a file to a
+    package's entries. The function takes a file_tail to avoid an O(n^2)
+    loop when adding to the end of the list. (This is what the original code
+    does, so I have mirrored its behavior.)
+    
+    Signed-off-by: David Benjamin <davidben@mit.edu>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ src/filesdb.c |   77 +++++++++++++++++++++++++++++++++++++--------------------
+ 1 files changed, 50 insertions(+), 27 deletions(-)
+
+commit ed26065325918ba214faded3183ad77e93a1a531
+Author: David Benjamin <davidben@MIT.EDU>
+Date:   Sat Aug 29 19:57:24 2009 -0400
+
+    dpkg: Split off emptying a package's file info
+    
+    Put it into a separate function for reuse by other routines and to
+    simplify ensure_packagefiles_available.
+    
+    Signed-off-by: David Benjamin <davidben@mit.edu>
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ src/filesdb.c |   47 ++++++++++++++++++++++++++++++++++-------------
+ 1 files changed, 34 insertions(+), 13 deletions(-)
+
+commit 8fd258be9097fbd82c60859398b40e30f35c9a19
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Oct 9 18:20:40 2009 +0200
+
+    Minor fixes in the German man page translation
+
+ man/po/de.po |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 6e1998224f8a218257b9af8ed3e3e082698d1a8a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Oct 9 16:39:26 2009 +0200
+
+    Dpkg::Control: rename CTRL_APT_* to CTRL_INDEX_*
+    
+    The Packages and Sources files are not really specific to APT.
+    Those files are indexes that can be used by other programs.
+
+ scripts/Dpkg/Control.pm        |   12 ++++++------
+ scripts/Dpkg/Control/Fields.pm |   34 +++++++++++++++++-----------------
+ scripts/Dpkg/Control/Types.pm  |    8 ++++----
+ scripts/Dpkg/Vendor/Debian.pm  |    4 ++--
+ scripts/dpkg-scanpackages.pl   |    2 +-
+ scripts/dpkg-scansources.pl    |    2 +-
+ 6 files changed, 31 insertions(+), 31 deletions(-)
+
+commit 2a194c6cc6e534d090b9c99b6ef53b5b1a0e2ce1
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 8 21:05:38 2009 +0200
+
+    Dpkg::Changelog::Debian: preserve blank lines
+    
+    The blank lines separating the header, changes and trailer lines
+    were lost in the parsing. Now they are stored in three new attributes
+    of Dpkg::Changelog::Entry.
+
+ scripts/Dpkg/Changelog.pm        |    2 ++
+ scripts/Dpkg/Changelog/Debian.pm |   21 +++++++++++++++------
+ 2 files changed, 17 insertions(+), 6 deletions(-)
+
+commit c8fc6e93151a6f7bea92eb5b9d41d3aaab12aee3
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 8 19:01:39 2009 +0200
+
+    Dpkg::Changelog::Debian: keep blank lines and trailing whitespace unchanged
+    
+    In order to be able to output the very same changelog file, we want to
+    keep whitespaces while parsing and simply drop them in outputs where
+    they should not appear.
+    
+    This commit is a good start towards this goal.
+
+ scripts/Dpkg/Changelog.pm        |    4 +++-
+ scripts/Dpkg/Changelog/Debian.pm |   33 +++++++++++++++++++--------------
+ 2 files changed, 22 insertions(+), 15 deletions(-)
+
+commit 47b4a7646705e571cc29cb86ba2b4dd3e697681c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 8 15:42:03 2009 +0200
+
+    Dpkg::Changelog::Debian: store unmodified changes lines in an array
+    
+    And post-process them later for output as a proper Dpkg::Control
+    information block.
+
+ scripts/Dpkg/Changelog.pm        |   11 +++++++++--
+ scripts/Dpkg/Changelog/Debian.pm |   16 ++++++++--------
+ 2 files changed, 17 insertions(+), 10 deletions(-)
+
+commit 3b566810a1227cbfe46173dca05a303ffd922d1d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Oct 5 21:35:25 2009 +0200
+
+    Dpkg::Deps::version_implies(): fix to return undef with invalid versions
+    
+    The 0 value means that the implication is logically disproved. We wanted
+    to express that we don't know anything since the version parameter is
+    not a valid version and thus can't be compared.
+
+ scripts/Dpkg/Deps.pm |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 00a9e0039e41ae52d414a9605af5eca070175f28
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Oct 5 21:30:41 2009 +0200
+
+    Dpkg::Version: rename some functions and constants
+    
+    version_compare_op() becomes version_compare_relation().
+    version_normalize_cmp_op() becomes version_normalize_relation().
+    The CMP_OP_* constants become REL_*.
+    
+    Update all scripts and modules accordingly.
+
+ scripts/Dpkg/Changelog.pm    |    8 +++---
+ scripts/Dpkg/Deps.pm         |    5 ++-
+ scripts/Dpkg/Version.pm      |   60 +++++++++++++++++++++---------------------
+ scripts/dpkg-genchanges.pl   |    4 +-
+ scripts/dpkg-scanpackages.pl |    4 +-
+ scripts/dpkg-shlibdeps.pl    |   10 +++---
+ scripts/t/100_Dpkg_Version.t |    6 ++--
+ 7 files changed, 49 insertions(+), 48 deletions(-)
+
+commit e6d0f07f07bf61d230d8df78e7c6bbb8945c0ebf
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Oct 5 18:10:29 2009 +0200
+
+    Update German scripts translation
+    
+    Update to 471t.
+
+ scripts/po/de.po |  230 +++++++++++++++++++++++++++++-------------------------
+ 1 files changed, 122 insertions(+), 108 deletions(-)
+
+commit 4a256f2cd3f80203edc4ec6bb49ff7664a580dcd
+Author: Sean Finney <seanius@debian.org>
+Date:   Mon Sep 28 23:34:29 2009 +0200
+
+    libdpkg: Move copyfileperms to non-static file_copy_perms
+    
+    This functionality is also needed by the conffile handling code to
+    ensure that the merge output is stored in a file with the same
+    permissions as the original conffile, preventing the accidental
+    opportunity for unintended information disclosure.
+    
+    Therefore the function is moved into a new library module (file.{c,h}),
+    and given an appropriate prefix. Note that some of the translatable
+    error messages have been modified as they would otherwise be misleading.
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ lib/dpkg/Makefile.am |    1 +
+ lib/dpkg/file.c      |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/file.h      |   37 ++++++++++++++++++++++++++++++++++
+ src/configure.c      |   28 +------------------------
+ 4 files changed, 93 insertions(+), 26 deletions(-)
+
+commit f38ab16ec1b15b7326b7a52b39567fa18f806b54
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Oct 5 04:21:16 2009 +0200
+
+    libdpkg: Update path_quote_filename function comment
+
+ lib/dpkg/path.c |   28 ++++++++++++++--------------
+ 1 files changed, 14 insertions(+), 14 deletions(-)
+
+commit 3adb9397a0d82c0f42fd93455b69585693cf162a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Oct 5 04:12:07 2009 +0200
+
+    libdpkg: Change order and rename path_quote_filename arguments
+    
+    Place the size at the end, and rename buf to dst, and s to src.
+
+ lib/dpkg/path.c |   28 ++++++++++++++--------------
+ lib/dpkg/path.h |    2 +-
+ src/archives.c  |    4 ++--
+ 3 files changed, 17 insertions(+), 17 deletions(-)
+
+commit f35d66dbc228bc8ad2c5255dee1bf4ecf9ee6e06
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Oct 5 04:06:06 2009 +0200
+
+    libdpkg: Change path_quote_filename size argument type to size_t
+
+ lib/dpkg/path.c |    2 +-
+ lib/dpkg/path.h |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 44fed3cce6ca6d410d48dce55176c73c1cbbc960
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Oct 5 04:04:35 2009 +0200
+
+    libdpkg: Make path_quote_filename s argument const
+
+ lib/dpkg/path.c |    2 +-
+ lib/dpkg/path.h |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 37e32a9c2c3fa05c1bb7d16b1552c8cb63ad08e2
+Author: Sean Finney <seanius@seanius.net>
+Date:   Mon Sep 28 23:34:28 2009 +0200
+
+    libdpkg: Move quote_filename to the path module as path_quote_filename
+    
+    This function will be useful for other parts of dpkg, so the function
+    has been moved to a more sensible location, the static qualifier removed,
+    and its name appropriately prefixed.
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ lib/dpkg/path.c |   61 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/path.h |    1 +
+ src/archives.c  |   65 ++++--------------------------------------------------
+ 3 files changed, 67 insertions(+), 60 deletions(-)
+
+commit 5e435949d6379f7dc930f042db5241af1e2ffb46
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 1 19:28:40 2009 +0200
+
+    Ensure that the string representation of Dpkg::Version is unchanged
+    
+    The version string used at creation time should be returned
+    when you stringify a Dpkg::Version object. Ensure this by adding a
+    non-regression test.
+
+ scripts/t/100_Dpkg_Version.t |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit af5a5349f99df7c8f4698ee0d92cd2c6824c428e
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Sep 29 01:10:12 2009 +0200
+
+    Dpkg::Version: drop the old API and implementation
+    
+    Switch the non-regression tests to the new API.
+
+ scripts/Dpkg/Version.pm      |  173 ------------------------------------------
+ scripts/t/100_Dpkg_Version.t |    9 +-
+ 2 files changed, 5 insertions(+), 177 deletions(-)
+
+commit 10badb3c2de113f0129988529b1e9386ed5ab0a6
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Sep 29 01:06:50 2009 +0200
+
+    Update all Perl modules and scripts to use the new Dpkg::Version API
+
+ scripts/Dpkg/Changelog.pm         |   10 +++---
+ scripts/Dpkg/Deps.pm              |   65 +++++++++++++++++++-----------------
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    8 ++--
+ scripts/Dpkg/Source/Package.pm    |   11 +++---
+ scripts/dpkg-buildpackage.pl      |    5 ++-
+ scripts/dpkg-genchanges.pl        |   12 ++++---
+ scripts/dpkg-scanpackages.pl      |   14 ++------
+ scripts/dpkg-shlibdeps.pl         |   11 +++---
+ scripts/dpkg-source.pl            |    5 ++-
+ 9 files changed, 72 insertions(+), 69 deletions(-)
+
+commit 847231cd0f0a7e97361836f22753fd1bb2f1e9b1
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Sep 29 00:05:06 2009 +0200
+
+    Dpkg::Version: new implementation and new object interface
+    
+    The old implementation is still around in this commit so that
+    it's easy to checkout this commit and add supplementary test cases
+    in scripts/t/100_Dpkg_Version.t to verify that both implementations
+    have the same result. Some new test cases have been added during the
+    implementation.
+    
+    The new object interface overrides all the comparison operators
+    so that you can directly compare two Dpkg::Version objects. The
+    object can also be used within strings and it will generate the
+    same version string than the one given at creation time.
+
+ scripts/Dpkg/Version.pm      |  335 ++++++++++++++++++++++++++++++++++++++++--
+ scripts/t/100_Dpkg_Version.t |   26 +++-
+ 2 files changed, 349 insertions(+), 12 deletions(-)
+
+commit 55eb6f3163420dd14c5a9e5aadfa3b314378a187
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 4 03:40:10 2009 +0200
+
+    libcompat: Define offsetof only if the system does not have it
+    
+    Due to <compat.h> being included first, offsetof was being defined
+    always to the local version.
+
+ configure.ac        |    1 +
+ lib/compat/compat.h |    4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 430c20759f8127c6690b33dd4f877f3acc20d31e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 4 15:12:47 2009 +0200
+
+    build: Properly escape DPKG_CHECK_DECL and DPKG_CHECK_DEFINE arguments
+    
+    Use AS_TR_SH for shell variables and AS_TR_CPP for variables used in
+    headers or Makefiles.
+
+ m4/types.m4 |   17 +++++++++--------
+ 1 files changed, 9 insertions(+), 8 deletions(-)
+
+commit c2ee51d0da82e7fe82f418a554ea425b4a374e64
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 4 14:16:19 2009 +0200
+
+    build: Fix DPKG_CHECK_DEFINE to properly check for dpkg_cv_define_$1
+    
+    The macro was checking for the dpkg_cv_define variable, which implied
+    always doing an AC_DEFINE to 0.
+    
+    As a consequence now start-stop-deaemon will use TIOCNOTTY when
+    available.
+
+ debian/changelog |    1 +
+ m4/types.m4      |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 30a6d6d131a516c4bcd67705487a54e6ee2085bf
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 3 21:02:47 2009 +0200
+
+    libdpkg: Move pkg_sorter code to a new pkg module
+
+ lib/dpkg/Makefile.am            |    1 +
+ lib/dpkg/pkg-array.c            |    9 ---------
+ lib/dpkg/pkg-array.h            |    3 +--
+ lib/dpkg/{pkg-array.h => pkg.c} |   30 ++++++++++++------------------
+ lib/dpkg/{pkg-array.h => pkg.h} |   22 ++++++----------------
+ po/POTFILES.in                  |    1 +
+ src/main.h                      |    5 -----
+ 7 files changed, 21 insertions(+), 50 deletions(-)
+
+commit 2510971730a3a4c0f033884dc0bc5c6a82a9f5fb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 3 20:47:57 2009 +0200
+
+    libdpkg: Rename pkglistqsortcmp to pkg_sorter_by_name
+
+ lib/dpkg/pkg-array.c |    2 +-
+ src/main.h           |    2 +-
+ src/query.c          |    4 ++--
+ src/select.c         |    2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 2ddc61d4aac2d333b6e36a1f5488e9c611122653
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 4 02:56:02 2009 +0200
+
+    libdpkg: Mark and improve strings for translation
+
+ lib/dpkg/varbuf.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 6b92aa0adfb9a83ae862b7c1aa9854da7efacc2f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Oct 3 17:28:20 2009 +0200
+
+    dpkg-statoverride: Add missing angle brackets in string
+
+ src/statcmd.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f659276004f4b8aa9ba57d8e5b4e253720be5f09
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Oct 4 02:53:27 2009 +0200
+
+    Add all libdpkg .c files to POTFILES
+    
+    Regardless of them not currently containing marked strings for
+    translation, as it makes it more unlikely to forget adding the
+    files when a new marked string is added.
+
+ po/POTFILES.in |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 722fa5660d52ac75db0b21a86004fc10f8f580bb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 17 17:32:18 2009 +0200
+
+    Add a .mailmap file to fix up name and mail addresses
+
+ .mailmap |   19 +++++++++++++++++++
+ 1 files changed, 19 insertions(+), 0 deletions(-)
+
+commit af295ce06ec841e1aa005d98de37b437bd189995
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Oct 3 10:27:42 2009 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1648t.
+
+ man/po/de.po |   70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 69 insertions(+), 1 deletions(-)
+
+commit 8540a328c8d7b4a714b75b060c3d23e182974d0c
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Oct 3 09:49:55 2009 +0200
+
+    Update German scripts translation
+    
+    Update to 468t.
+
+ scripts/po/de.po |  121 ++++++++++++++++++++++++++----------------------------
+ 1 files changed, 58 insertions(+), 63 deletions(-)
+
+commit 0c21f1617933ab35a5b081fe314ca5a864a9962a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 1 23:48:40 2009 +0200
+
+    dselect-multicd: fix bashism in setup script
+    
+    Use printf instead of echo -e. Closes: #530070
+
+ debian/changelog              |    1 +
+ dselect/methods/multicd/setup |    6 +++---
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 65a0572e3fb08a218ca7120d530f9f64799bcaec
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 1 23:40:54 2009 +0200
+
+    dselect-multicd: replace/drop obsolete dpkg commands
+    
+    dpkg --print-installation-architecture is deprecated in favor
+    of dpkg --print-architecture. dpkg --forget-old-unavail is obsolete.
+
+ dselect/methods/multicd/install |    2 +-
+ dselect/methods/multicd/setup   |    2 +-
+ dselect/methods/multicd/update  |    4 +---
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+commit b2fd773fc9ca32fd907f4c35a30ec9138f9a1c43
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 1 23:38:23 2009 +0200
+
+    dselect-multicd: update README wrt the dpkg-scanpackages situation
+    
+    The required features have been merged in the official dpkg-scanpackages
+    so don't mention the diverted copy that doesn't exist anymore.
+
+ dselect/methods/multicd/README.multicd |   28 +++++++---------------------
+ 1 files changed, 7 insertions(+), 21 deletions(-)
+
+commit a4cabaa4af618451de48c262be7d374640a6fae7
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 1 23:28:38 2009 +0200
+
+    dselect-multicd: add missing copyright statements
+    
+    The copyright statements come from debian/copyright in the
+    dpkg-multicd source package (version 0.21).
+
+ dselect/methods/multicd/install |   16 ++++++++++++++++
+ dselect/methods/multicd/setup   |   23 +++++++++++++++++++++++
+ dselect/methods/multicd/update  |   16 ++++++++++++++++
+ 3 files changed, 55 insertions(+), 0 deletions(-)
+
+commit fed6ba7830400f0bdf182b477a700990001a6988
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 1 23:22:44 2009 +0200
+
+    Integrate dpkg-multicd into dselect
+    
+    The `multicd' package was initially written by Heiko Schlittermann
+    <heiko@lotte.sax.de> based on builtin access methods written by Ian
+    Jackson <ian@chiark.greenend.org.uk>.  The final packaging as well as
+    cleanups were made by Martin Schulze <joey@infodrom.north.de> who also
+    put this package together for the slink release (Debian GNU/Linux
+    2.1).
+    
+    This commit includes the raw files as provided in version 0.21 of dpkg-multicd
+    (except for a few whitespaces cleanups).
+    
+    The dpkg-scanpackages fork has been left out since the required features
+    have been merged in the official dpkg-scanpackages. Closes: #516631
+
+ debian/changelog                         |    2 +
+ debian/control                           |    4 +-
+ debian/copyright                         |    2 +
+ debian/dpkg.docs                         |    1 +
+ dselect/methods/Makefile.am              |   14 +-
+ dselect/methods/multicd/README.multicd   |  131 ++++++
+ dselect/methods/multicd/desc.multi_cd    |    3 +
+ dselect/methods/multicd/desc.multi_mount |   12 +
+ dselect/methods/multicd/desc.multi_nfs   |   12 +
+ dselect/methods/multicd/install          |  294 +++++++++++++
+ dselect/methods/multicd/names            |    3 +
+ dselect/methods/multicd/setup            |  663 ++++++++++++++++++++++++++++++
+ dselect/methods/multicd/update           |  116 ++++++
+ 13 files changed, 1253 insertions(+), 4 deletions(-)
+
+commit 5ed64b297e3f9ce9490372abc9b269126e2bd0a4
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 1 22:40:39 2009 +0200
+
+    dpkg-scanpackages: add new --medium option
+    
+    This feature is supported in the dpkg-scanpackages implementation provided
+    by dpkg-multicd. Unfortunately it was using the "-m" option which got
+    granted to --multiversion in the official dpkg-scanpackages.
+    
+    This option will only be useful for people wishing to create Packages.cd
+    files for use by the multicd dselect access method. Closes: #402527
+
+ debian/changelog             |    3 +++
+ man/dpkg-scanpackages.1      |    5 +++++
+ scripts/dpkg-scanpackages.pl |    6 +++++-
+ 3 files changed, 13 insertions(+), 1 deletions(-)
+
+commit 171610876f98768167ec1aec2dbc63cdaa19f1e6
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 1 21:23:15 2009 +0200
+
+    dpkg-scanpackages/dpkg-scansources: support compressed override files
+    
+    This feature is supported in the dpkg-scanpackages implementation provided
+    by dpkg-multicd.
+
+ debian/changelog             |    1 +
+ man/dpkg-scanpackages.1      |    5 +++--
+ man/dpkg-scansources.1       |   12 +++++++-----
+ scripts/dpkg-scanpackages.pl |   11 +++++++----
+ scripts/dpkg-scansources.pl  |   39 +++++++++++++++++++++++++--------------
+ 5 files changed, 43 insertions(+), 25 deletions(-)
+
+commit c6e64aafd1eeacfd94d705af72b617cfa1bc3466
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Oct 1 21:48:14 2009 +0200
+
+    Dpkg::Control::Fields: add Priority and Section fields to CTRL_APT_SRC
+    
+    Both fields are allowed in Sources files, they are generated by
+    dpkg-scansources or apt-ftparchive based on the override files.
+
+ scripts/Dpkg/Control/Fields.pm |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit abd59dcac70a0b010f950f96ccdaae2c7c7d0b34
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Thu Oct 1 14:10:26 2009 +0200
+
+    German dpkg translation update
+    
+    Update to 966t4f.
+
+ po/de.po | 1363 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 689 insertions(+), 674 deletions(-)
+
+commit 35efaf4edff7b0f4ddde38b8b3d7b7d9d317a6fb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 30 03:23:47 2009 +0200
+
+    libdpkg: Remove unused varbufextend
+    
+    The interface for this function was broken, and it's been replaced by
+    the saner varbuf_grow.
+
+ lib/dpkg/varbuf.c |   10 ----------
+ lib/dpkg/varbuf.h |    1 -
+ 2 files changed, 0 insertions(+), 11 deletions(-)
+
+commit dac03e12b418899430a6667a5596cd515b120295
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 30 03:21:06 2009 +0200
+
+    libdpkg: Use varbuf_grow instead of varbufextend
+
+ debian/changelog  |    2 ++
+ lib/dpkg/varbuf.c |   15 +++++----------
+ 2 files changed, 7 insertions(+), 10 deletions(-)
+
+commit 353b02acb33224bc2d7e3b0295538d592b9c8bad
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 30 03:10:27 2009 +0200
+
+    dpkg: Use stat size to varbuf_grow the buffer for readlink
+    
+    Do not expand the buffer indefinitely by trying several times until
+    the buffer is big enough. Pre-allocate just once using varbuf_grow
+    with the known size from stat.
+
+ debian/changelog |    3 +++
+ src/archives.c   |   10 +++++-----
+ src/configure.c  |   51 ++++++++++++++++++++++-----------------------------
+ 3 files changed, 30 insertions(+), 34 deletions(-)
+
+commit 1a8d12285d650fa4bb13406a515228030d4d9ca1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 30 03:06:55 2009 +0200
+
+    libdpkg: Fix varbufprintf to not grow indefinitely
+    
+    Use the C99 semantics for vsnprintf to get the final formatted string
+    size, and then call it again to do the actual work. Use varbuf_grow with
+    the know size, instead of always calling varbufextend, regardles of
+    needing to extend the buffer, which was making it grow indefinitely.
+    
+    This also should speed it up a bit by not requiring to call vsnprintf
+    several times depending on the length of the final string. Only two
+    calls are required now, always.
+
+ debian/changelog         |    3 +++
+ lib/dpkg/test/t-varbuf.c |   28 ++++++++++++++++++++++++++++
+ lib/dpkg/varbuf.c        |   32 +++++++++++++++++++-------------
+ 3 files changed, 50 insertions(+), 13 deletions(-)
+
+commit d8d0b3a06f8668a2c7e8c3db2debd60cf526e7f1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 30 20:55:16 2009 +0200
+
+    libdpkg: Use varbuf_grow instead of increasing member used
+    
+    The code assumes that the various varbuf functions will grow the
+    buffer if used > size, which is not going to be true once varbuf gets
+    internally switched to varbuf_grow from varbufextend.
+
+ src/configure.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 23e191ad73b870e2b29f59cb405b18ccaf35b00a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 29 19:41:58 2009 +0200
+
+    libdpkg: Add new varbuf_grow function
+
+ lib/dpkg/test/t-varbuf.c |   34 ++++++++++++++++++++++++++++++++++
+ lib/dpkg/varbuf.c        |   16 ++++++++++++++++
+ lib/dpkg/varbuf.h        |    1 +
+ 3 files changed, 51 insertions(+), 0 deletions(-)
+
+commit 12a61afc463c74a40ac65ccc0cb6f75dee532f16
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 3 02:21:43 2009 +0200
+
+    dpkg-statoverride: Rewrite in C
+
+ debian/changelog             |    1 +
+ po/POTFILES.in               |    2 +-
+ scripts/Makefile.am          |    2 -
+ scripts/dpkg-statoverride.pl |  247 ------------------------
+ src/.gitignore               |    1 +
+ src/Makefile.am              |   16 ++-
+ src/statcmd.c                |  437 ++++++++++++++++++++++++++++++++++++++++++
+ 7 files changed, 455 insertions(+), 251 deletions(-)
+
+commit d96bee65e139db050bd981a42e29c3763847ee77
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 26 14:30:12 2009 +0200
+
+    statdb: Do stricter parsing validation
+    
+    Match the validations done on input in dpkg-statoverride, so that we can
+    reuse this code when rewritting dpkg-statoverride in C.
+
+ debian/changelog |    2 ++
+ src/statdb.c     |   20 +++++++++++++-------
+ 2 files changed, 15 insertions(+), 7 deletions(-)
+
+commit aee5c7726729af8ac93ea7b768f555bc234fa932
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 29 14:28:11 2009 +0200
+
+    Add document describing the C coding style
+
+ Makefile.am          |    1 +
+ debian/changelog     |    1 +
+ doc/coding-style.txt |  159 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 161 insertions(+), 0 deletions(-)
+
+commit c61f48738fee364f2f1d32aaae5c073e30eecc52
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Sep 28 20:11:10 2009 +0200
+
+    dpkg: Reduce variable scope in checkpath
+    
+    Move them closer to their actual usage.
+
+ src/help.c |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 1afae1b4508d506450c0bd2d82325e31c41af6ed
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Sep 28 20:02:59 2009 +0200
+
+    dpkg: Use size_t instead of long for path_len in checkpath()
+
+ src/help.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit b407cde7c7acc7dcb21cba9d81e164b507b93912
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 27 17:26:58 2009 +0200
+
+    dpkg: Use more meaningful and clearer variable names in checkpath()
+    
+    Variable renames:
+      checklist → prog_list
+      clp → prog
+      path → path_list
+      s → path
+      p → path_end
+      l → path_len
+      buf → filename
+
+ src/help.c |   47 ++++++++++++++++++++++++++---------------------
+ 1 files changed, 26 insertions(+), 21 deletions(-)
+
+commit 95a4b0b31be033488de1786fa163bce7f79b111d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 29 14:23:10 2009 +0200
+
+    Switch to use stdbool were appropriate
+
+ dpkg-deb/build.c          |   11 +++--
+ lib/dpkg/database.c       |   14 ++++--
+ lib/dpkg/dpkg-db.h        |   15 ++++---
+ lib/dpkg/vercmp.c         |   23 +++++++----
+ src/archives.c            |   59 ++++++++++++++++-------------
+ src/archives.h            |    6 ++-
+ src/depcon.c              |   90 +++++++++++++++++++++++++++------------------
+ src/enquiry.c             |   26 ++++++++----
+ src/errors.c              |   11 +++--
+ src/help.c                |   48 ++++++++++++++++-------
+ src/main.c                |    7 ++-
+ src/main.h                |   24 ++++++------
+ utils/start-stop-daemon.c |   59 +++++++++++++++--------------
+ 13 files changed, 233 insertions(+), 160 deletions(-)
+
+commit 2496b63475f9c69f42b44c0673482fc57a616283
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 29 13:59:30 2009 +0200
+
+    build: Abort if there is no support for the required C99 extensions
+
+ debian/changelog |    1 +
+ m4/compiler.m4   |    3 ++-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit e74a1a27f90e07a47bb9a42bf8d769061b7b3707
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 29 13:54:24 2009 +0200
+
+    build: Add more options to try to get support for C99 extensions
+    
+    Taken from autoconf.
+
+ m4/compiler.m4 |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit b1f61777e76a083fe6f92f4751a695566f478c1c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 29 13:50:28 2009 +0200
+
+    build: Check for C99 snprintf family of functions
+    
+    We need the new semantics that allow passing NULL and 0 size to retrieve
+    the full size of the formatted string. Add a new DPKG_FUNC_C99_SNPRINTF
+    macro and remove the simple compat checks for snprintf and vsnprintf.
+
+ configure.ac           |    3 ++-
+ lib/compat/Makefile.am |    8 ++------
+ m4/funcs.m4            |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
+ 3 files changed, 50 insertions(+), 8 deletions(-)
+
+commit 7e8415be3f31884f3fb2c99ef9255344b67bec21
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 29 13:47:46 2009 +0200
+
+    build: Use memcpy instead of assignment to copy va_list
+    
+    It's more portable that way. Remove now unneeded check for working
+    assignment.
+
+ lib/compat/compat.h |    3 ++-
+ m4/funcs.m4         |   11 +----------
+ 2 files changed, 3 insertions(+), 11 deletions(-)
+
+commit a31d6e1c1b8438a0ec968c05c58a690eb9023f1d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 29 03:11:04 2009 +0200
+
+    build: Add an explicit return type to main in DPKG_FUNC_VA_COPY
+
+ m4/funcs.m4 |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit fbfda2821f4d511f975528047f09f26eaacb2993
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 27 17:24:06 2009 +0200
+
+    build: Do not test for C99 for-loop variable declaration support
+    
+    This extension is not going to be used in the code base anyway.
+
+ m4/compiler.m4 |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+commit 848980ebb14c1285cf3d81e596a215c95af2b274
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 27 17:22:52 2009 +0200
+
+    dpkg-query: Do not use C99 style for-loop variable declarations
+
+ src/query.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit e6baa48223e6a6dcdd8522c91d96d76a2a3a3f0e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 27 17:10:21 2009 +0200
+
+    build: Add test for 'trailing comma in enum' C99 support
+
+ m4/compiler.m4 |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 855fcc88a20f6cfa80276f76721acf1f041fa892
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 27 16:22:47 2009 +0200
+
+    build: Reorder subdirectory build sequence
+    
+    Build src after the low-level dpkg-deb and dpkg-split programs, and
+    dselect before scripts.
+
+ Makefile.am |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e18a89b3b19a75df7dce782c3a26c9f0172656e0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 27 16:46:25 2009 +0200
+
+    Remove helponly and versiononly functions
+    
+    Directly use printversion and usage functions, make them exit and change
+    their prototypes to fit cmdinfos.
+    
+    This solves the ugly situation of expecting helponly and versiononly
+    callers to respectively define printversion and usage themselves.
+
+ dpkg-deb/main.c       |   16 ++++++++++------
+ dpkg-split/main.c     |   16 ++++++++++------
+ dselect/main.cc       |   16 ++++++++++------
+ lib/dpkg/myopt-util.c |   14 --------------
+ lib/dpkg/myopt.h      |    6 ------
+ src/main.c            |   16 ++++++++++------
+ src/query.c           |   16 ++++++++++------
+ src/trigcmd.c         |   16 ++++++++++------
+ 8 files changed, 60 insertions(+), 56 deletions(-)
+
+commit 00c6f6094e4eac93805c695f8e7ddc30c001d05f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 27 12:58:33 2009 +0200
+
+    dpkg-trigger: Move functions and variables around
+    
+    Place cmdinfos just before main, and the variables and noawait function
+    definitions after usage.
+
+ src/trigcmd.c |   49 +++++++++++++++++++++++++------------------------
+ 1 files changed, 25 insertions(+), 24 deletions(-)
+
+commit cdc1ff8459094d48608dfdabbe5f43587eaa5c6a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 27 14:31:36 2009 +0200
+
+    dpkg-trigger: On --help print the default admindir
+    
+    Instead of the one passed on the command line.
+
+ debian/changelog |    2 ++
+ src/trigcmd.c    |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 83438860857adc4231912ca862829a6fa3e8eda7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 27 03:58:15 2009 +0200
+
+    Remove unused variables
+
+ src/main.c  |    2 --
+ src/query.c |    1 -
+ 2 files changed, 0 insertions(+), 3 deletions(-)
+
+commit 4b3960c245ca592f42d7e04290c6a586254f5c95
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date:   Mon Sep 28 16:40:42 2009 -0500
+
+    debian/copyright: Update path to MD5 code
+    
+    The lib/ directory was renamed to lib/dpkg/ in commit 01d0532
+    (Move libraries to subdirectories under lib/, 2009-07-15).
+    Update the copyright file accordingly.
+
+ debian/changelog |    2 ++
+ debian/copyright |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 48ec636faedc49894c7de423e94c9c7c7afaab81
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Sep 29 01:18:55 2009 +0200
+
+    Fix the polish translation.
+
+ man/po/pl.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4f9ea0dc5cb69b7b91bd1fb9a647d19bae624cce
+Author: Milo Casagrande <milo@ubuntu.com>
+Date:   Sun Sep 27 19:32:56 2009 +0200
+
+    Italian translation update
+    
+    Updated to 978t
+
+ debian/changelog |    1 +
+ po/it.po         |   72 ++++++++++++++++++++++++++++-------------------------
+ 2 files changed, 39 insertions(+), 34 deletions(-)
+
+commit bc97d12853e1a90abf971ee0a5a7d263381e8152
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sun Sep 27 14:51:50 2009 +0200
+
+    Merge conflicts
+
+ debian/changelog |    1 +
+ man/po/pl.po     | 1357 +++++++++++++++++++++++++++++-------------------------
+ 2 files changed, 732 insertions(+), 626 deletions(-)
+
+commit c2d0dfde09bc9d518435b841897d86db8d464317
+Author: Wiktor Wandachowicz <siryes@gmail.com>
+Date:   Sun Sep 27 08:40:34 2009 +0200
+
+    Update Polish translation of dselect
+    
+    Update to 230t
+
+ debian/changelog |    1 +
+ dselect/po/pl.po |   13 ++++++-------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 8df12c05d14ae1b4184bf3ca4ccf790e056f6b5f
+Author: Wiktor Wandachowicz <siryes@gmail.com>
+Date:   Sun Sep 27 08:36:50 2009 +0200
+
+    Update Polish translation of scripts
+    
+    Update to 467t
+
+ debian/changelog |    1 +
+ scripts/po/pl.po |  250 ++++++++++++++++++++++++++++-------------------------
+ 2 files changed, 133 insertions(+), 118 deletions(-)
+
+commit dff0e2ed64de23e429733d53bcfefc1db974bdd1
+Author: Wiktor Wandachowicz <siryes@gmail.com>
+Date:   Sun Sep 27 08:35:40 2009 +0200
+
+    Update polish programs translations
+    
+    Update to 474t
+
+ debian/changelog |    1 +
+ po/pl.po         | 1179 ++++++++++++++----------------------------------------
+ 2 files changed, 309 insertions(+), 871 deletions(-)
+
+commit a43b40604e099100c5813c4a72fc1c9becec926a
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Sep 27 05:48:35 2009 +0200
+
+    Fix typo in man page: s/invokation/invocation/
+
+ man/dpkg.1          |    2 +-
+ man/po/de.po        |    4 ++--
+ man/po/dpkg-man.pot |    2 +-
+ man/po/es.po        |    4 ++--
+ man/po/fr.po        |    4 ++--
+ man/po/hu.po        |    4 ++--
+ man/po/ja.po        |    4 ++--
+ man/po/pl.po        |    4 ++--
+ man/po/pt_BR.po     |    4 ++--
+ man/po/ru.po        |    4 ++--
+ man/po/sv.po        |    4 ++--
+ 11 files changed, 20 insertions(+), 20 deletions(-)
+
+commit e637fb89d03ea2936dd56ba259a025df7eb9540b
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Sep 27 05:45:24 2009 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1642t.
+
+ man/po/de.po |   11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+commit bb9d87468ff4e3710c854ffaa0b09110f8fdde64
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 26 20:53:55 2009 +0200
+
+    build: Fix build failure with automake < 1.11
+    
+    When there's no AM_SILENT_RULES support, set a AM_DEFAULT_VERBOSITY
+    variable to 1 (verbose), so that the verbosity variables under man/
+    become no-ops.
+
+ configure.ac |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 4f4f01eff03995c81543716e471d82bf7506f6ee
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Sep 26 17:46:00 2009 +0200
+
+    dselect-ftp: stop calling dpkg --forget-old-unavail as it's a no-op
+    
+    And it outputs an annoying warning nowadays.
+
+ dselect/methods/ftp/update |    5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+commit 4264e4fa35e0e9eb081fce0e63ea65e40b6535d7
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Sep 26 17:43:57 2009 +0200
+
+    dselect-ftp: don't use obsolete dpkg --print-installation-architecture
+
+ dselect/methods/ftp/setup  |    2 +-
+ dselect/methods/ftp/update |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit df6c06c4fb4570abd37fd6ec29a0201a496c4a81
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Sep 26 17:42:22 2009 +0200
+
+    dselect-ftp: Update my e-mail address and copyright
+
+ dselect/methods/ftp/install |    2 +-
+ dselect/methods/ftp/setup   |    2 +-
+ dselect/methods/ftp/update  |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 19bb276568af6bbbac700345953e1c9ec5a68d9d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Sep 22 18:53:19 2009 +0200
+
+    Integrate dpkg-ftp into dselect
+    
+    It requires perl to work but don't add it as a dependency
+    but only as a suggests and instead have a nice error
+    message to invite the user to install the perl package.
+    
+    Other minor changes include removal of latin1 characters,
+    moving the README.mirrors file inside the method directory
+    and renaming the Dpkg::Ftp module to Dselect::Ftp.
+
+ debian/changelog                       |    1 +
+ debian/control                         |    4 +-
+ debian/dselect.install                 |    1 +
+ dselect/methods/Debian/Dselect/Ftp.pm  |  362 ++++++++++++++++++
+ dselect/methods/Makefile.am            |   13 +-
+ dselect/methods/ftp/README.mirrors.txt |  259 +++++++++++++
+ dselect/methods/ftp/desc.ftp           |    2 +
+ dselect/methods/ftp/install            |  626 ++++++++++++++++++++++++++++++++
+ dselect/methods/ftp/names              |    2 +
+ dselect/methods/ftp/setup              |  174 +++++++++
+ dselect/methods/ftp/update             |  251 +++++++++++++
+ 11 files changed, 1692 insertions(+), 3 deletions(-)
+
+commit 6f5219bfd2f4f4eb40eb45da8e5336b3a8acacef
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Sep 26 19:22:29 2009 +0200
+
+    Update German scripts translation
+    
+    Update to 473t.
+
+ scripts/po/de.po |  464 ++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 242 insertions(+), 222 deletions(-)
+
+commit 934cdd967144e968e20b91571e8534060b6bcebe
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 26 14:08:56 2009 +0200
+
+    libdpkg: Enclose buffer_data union initialization with braces
+
+ lib/dpkg/buffer.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5243faaa0724e1ac43f19b98e8414d08f1d8c330
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 26 14:15:15 2009 +0200
+
+    build: Update compiler-warnings flags
+    
+    Do not use -Werror for now (at leasat until ncurses is fixed). And add
+    -Wextra -Wno-unused-parameter -Wno-missing-field-initializers.
+
+ m4/compiler.m4 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1d099a33185ef2cd8ce461175e93641a56462b43
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 26 14:14:22 2009 +0200
+
+    build: Refactor warning flags into a new WFLAGS variable
+
+ m4/compiler.m4 |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit c2bc3564b98cc19df8c936b6be2e170849bc514b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 26 14:20:07 2009 +0200
+
+    build: Wrap perl expression in PERL_LIBDIR assignment
+
+ m4/perl.m4 |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit a29c0e70037796f51d767367d33178726c1b5aa6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 26 14:03:07 2009 +0200
+
+    build: Properly escape $( inside perl regex
+    
+    Use one back slash instead of two, otherwise perl was replacing it
+    with the $( (aka $GID).
+    
+    Broken due to commit 02f1f8a50af58b9d1f61dd9258cf1d26fe2f0d21.
+
+ m4/perl.m4 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b7f2f91179844b21728aa0d31074f3b2caa9e776
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 25 15:33:44 2009 +0200
+
+    Do not print redundant dpkg prefix and new line on undefined PATH
+
+ src/help.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 5fe88c57eed84b77e469d2a1b788f338e049a00f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 25 15:31:08 2009 +0200
+
+    Use warning() instead of fprintf() in checkpath()
+
+ src/help.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 7623f78d39682076ffe4ea416df947fdab91b184
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 25 04:40:56 2009 +0200
+
+    Clean up coding style for half compliant files
+    
+    Fix spacing, indentation and alignment. Do not use backticks, on
+    comments use UTF-8 pretty quotes, on strings use single or double
+    quotes, but do not change strings marked for translation if no other
+    change was needed. Fix placement of braces and boolean operators. Fix
+    formatting of comments.
+
+ lib/dpkg/showpkg.c        |  229 ++++++++++++----------
+ lib/dpkg/subproc.c        |    6 +-
+ lib/dpkg/tarfn.c          |  257 +++++++++++++------------
+ src/configure.c           |  476 ++++++++++++++++++++++++---------------------
+ utils/start-stop-daemon.c |   73 ++++----
+ 5 files changed, 555 insertions(+), 486 deletions(-)
+
+commit 6d365230885ff9221a83efb9e262818cbe384b32
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 25 03:51:49 2009 +0200
+
+    s-s-d: Call warning instead of fatal on ioprio_set error
+    
+    This feature should be considered optional, as non-Linux architectures
+    do not support it, neither do older Linux kernels, and it seems some
+    virtualization Linux kernels like the OpenVZ patch do not allow it.
+
+ debian/changelog          |    2 ++
+ utils/start-stop-daemon.c |    3 ++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 58665e1eeac647b1e2555a6a62149666bf0a4745
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 25 03:43:12 2009 +0200
+
+    libdpkg: Use struct buffer_data instead of buffer_data_t
+    
+    Do not use typedefs for structs, it's bad form as it makes it more
+    difficult to know what kind of type we are dealing with. Only to be
+    used for fundamental types. Remove buffer_data_t.
+
+ lib/dpkg/buffer.c |   15 ++++++++-------
+ lib/dpkg/buffer.h |   15 ++++++++-------
+ 2 files changed, 16 insertions(+), 14 deletions(-)
+
+commit 78c3744c84ad7e494eae291432c55963f8f1ed81
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 25 00:20:19 2009 +0200
+
+    libdpkg: Add new buffer_hash and buffer_md5 functions
+
+ lib/dpkg/buffer.c         |   13 ++++++++++++
+ lib/dpkg/buffer.h         |    4 +++
+ lib/dpkg/test/.gitignore  |    1 +
+ lib/dpkg/test/Makefile.am |    2 +
+ lib/dpkg/test/t-buffer.c  |   46 +++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 66 insertions(+), 0 deletions(-)
+
+commit 8c84d22f662e61664b3619117c5c4eabd6b704d8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 25 00:25:02 2009 +0200
+
+    libdpkg: Make buffer_write buf argument const
+
+ lib/dpkg/buffer.c |    3 ++-
+ lib/dpkg/buffer.h |    2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit e135015ae2bf41321e75829aaac58fcecc57542b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 24 23:47:59 2009 +0200
+
+    libdpkg: Rename struct buffer_data data member to arg
+
+ lib/dpkg/buffer.c |   36 ++++++++++++++++++------------------
+ lib/dpkg/buffer.h |    2 +-
+ 2 files changed, 19 insertions(+), 19 deletions(-)
+
+commit 7f30800717987b50cb887eedd2cf2f0e841a64e1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 24 23:27:53 2009 +0200
+
+    libdpkg: Move buffer_arg declaration directly into buffer_data
+
+ lib/dpkg/buffer.h |   10 ++++------
+ 1 files changed, 4 insertions(+), 6 deletions(-)
+
+commit 1d9088b24a8a9b279d2b9928512aa3f060560135
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 24 20:45:21 2009 +0200
+
+    libdpkg: Use internerr for invalid buffer data types
+
+ lib/dpkg/buffer.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit e411455bf64cb62369a9503fa1b2c1ffb935e198
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 24 20:42:11 2009 +0200
+
+    libdpkg: Do not allocate memory for buffer md5 hash result
+    
+    Expect the caller to pass a suitable buffer to store the result.
+
+ lib/dpkg/buffer.c |    4 ++--
+ src/configure.c   |   23 ++++++++++++-----------
+ 2 files changed, 14 insertions(+), 13 deletions(-)
+
+commit 20cf6be8b5bf75dee5295efbf36188238ffee06b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 24 13:39:53 2009 +0200
+
+    dpkg-deb: Use void * instead of unsigned char * for read/write buffer
+
+ dpkg-deb/extract.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ed67130303e890aecb86ae41c76a9e674ee5b3a8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 24 13:35:37 2009 +0200
+
+    libdpkg: Use char instead of unsigned char for strings
+
+ lib/dpkg/buffer.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 668466a2175602325a7de69e39a76f3c5283a66c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 24 13:20:54 2009 +0200
+
+    dpkg-deb: Remove S_ISLNK compatibility definition
+    
+    The rest of the code uses it unconditionally, and no one has complained,
+    it's also present in all POSIX.1-2001 conforming systems.
+
+ dpkg-deb/build.c |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+commit 02f1f8a50af58b9d1f61dd9258cf1d26fe2f0d21
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 24 13:09:04 2009 +0200
+
+    build: Do not use backticks on m4 macros
+    
+    Use single quotes for strings, angle brackets for headers, and $()
+    for command subsitution. This should pacify syntax highlighters.
+
+ m4/arch.m4     |    4 ++--
+ m4/compiler.m4 |    4 ++--
+ m4/funcs.m4    |    2 +-
+ m4/libs.m4     |    4 ++--
+ m4/linker.m4   |    2 +-
+ m4/perl.m4     |    2 +-
+ m4/types.m4    |    6 +++---
+ 7 files changed, 12 insertions(+), 12 deletions(-)
+
+commit 689a87eff5be5602b21ad5a6fc6ea4a8e8200dda
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 24 13:07:37 2009 +0200
+
+    build: Do not use single quote on strings
+    
+    This should pacify syntax highlighters.
+
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 59168691c0d410f818350ab9d83515aafa4b4591
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 24 12:42:50 2009 +0200
+
+    libcompat: Define WCOREDUMP only if the system does not have it
+    
+    Due to <compat.h> being included first, WCOREDUMP was being defined
+    always to the dummy version.
+
+ configure.ac        |    1 +
+ lib/compat/compat.h |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit ef1c0d61cf894cfad4954267c89ffe910995b87f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 24 12:38:47 2009 +0200
+
+    build: Add new DPKG_CHECK_DECL m4 macro
+    
+    Used to check if something is declared in a header.
+
+ m4/types.m4 |   13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+commit 5c061906443d825a580538152b5b1aa732550038
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 23 15:08:04 2009 +0200
+
+    s-s-d: Remove wrong comment not matching with code
+
+ utils/start-stop-daemon.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 895059d2a3b7a7707f0a7f09dae4d3b5503cc68e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 23 03:27:16 2009 +0200
+
+    Rename autoconf auxiliary directory from config to build-aux
+    
+    Makes the directory name less confusing.
+
+ .gitignore   |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c14a29ae99a9b24a3d6e23d2a50b402d844b8583
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 23 03:21:16 2009 +0200
+
+    Move development documentation to doc/
+
+ Makefile.am                                        |    4 ++--
+ debian/dpkg.docs                                   |    4 ++--
+ README.api => doc/README.api                       |    0
+ .../README.feature-removal-schedule                |    0
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+commit b3a76130a9af6e68d03c6d9e7c5b0c6ac8bf0615
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 20 12:28:30 2009 +0200
+
+    dpkg-genchanges, Dpkg::Vendor::Default: drop hook before-changes-creation
+    
+    This hook is useless now that the Ubuntu vendor object uses
+    post-process-changelog-entry to add their Launchpad-Bugs-Fixed
+    field.
+
+ scripts/Dpkg/Vendor/Default.pm |    8 --------
+ scripts/dpkg-genchanges.pl     |    2 --
+ 2 files changed, 0 insertions(+), 10 deletions(-)
+
+commit 8c8f3aa28bb001c19a43960568ecdfd6936d3fc6
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 20 12:01:31 2009 +0200
+
+    Dpkg::Vendor::*: better handle unknown hooks
+    
+    Implement vendor objects in a way that the return value for unknown
+    hooks is better defined: empty list in list context or undef in scalar
+    context.
+
+ scripts/Dpkg/Vendor/Debian.pm  |    8 +++-----
+ scripts/Dpkg/Vendor/Default.pm |    3 +++
+ scripts/Dpkg/Vendor/Ubuntu.pm  |    6 +++---
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+commit f7a323fc945a1484fabd7a8e639b48b8b5b8124d
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 20 11:21:03 2009 +0200
+
+    Dpkg::Vendor::Default: recommend use base for child objects
+
+ scripts/Dpkg/Vendor/Default.pm |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 3df3fe4ce2ca36d679053a7b4f6415cfad25daed
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 20 11:13:10 2009 +0200
+
+    Dpkg::Vendor::Ubuntu: move Launchpad-Bugs-Fixed creation in another hook
+    
+    The creation of the Launchpad-Bugs-Fixed field is now done
+    in post-process-changelog-entry instead of before-changes-creation
+    so that it's also output by dpkg-parsechangelog and not only
+    in the .changes file. Closes: #536066
+
+ debian/changelog              |    2 ++
+ scripts/Dpkg/Vendor/Ubuntu.pm |   16 ++++++++++------
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+commit 6f721eaa8b2caa26ec1fc911474191d89c6f3cb2
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 20 10:02:06 2009 +0200
+
+    Dpkg::Vendor::Ubuntu: register custom field Launchpad-Bugs-Fixed
+
+ scripts/Dpkg/Vendor/Ubuntu.pm |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 88a0baff55e928679551ff6c68bdc8884d6fbf62
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 20 10:59:05 2009 +0200
+
+    Dpkg::Changelog: add new vendor hook post-process-changelog-entry
+    
+    This hook is mainly meant to extract more structured information
+    from the raw changes information.
+
+ scripts/Dpkg/Changelog.pm      |    4 ++++
+ scripts/Dpkg/Vendor/Default.pm |    9 +++++++++
+ 2 files changed, 13 insertions(+), 0 deletions(-)
+
+commit 63044da0c7f67179d6e0cb3436f987248a44152e
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 20 11:49:52 2009 +0200
+
+    Dpkg::Control::Fields: don't fail when vendor hook is not (well) implemented
+
+ scripts/Dpkg/Control/Fields.pm |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit d208849d8cacdfe93c494fc0eb3d41716d68ec3d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 20 03:26:13 2009 +0200
+
+    Split deferred_configure conffile handling into its own function
+
+ src/configure.c |  287 ++++++++++++++++++++++++++++---------------------------
+ 1 files changed, 148 insertions(+), 139 deletions(-)
+
+commit dac5e30555191203129e309dbed5e823c95620a6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 18 15:45:57 2009 +0200
+
+    Use varbuf instead of ad-hoc handling of growing strings
+
+ dpkg-deb/info.c   |   20 +++++++--------
+ lib/dpkg/fields.c |   67 ++++++++++++++++++++++------------------------------
+ 2 files changed, 37 insertions(+), 50 deletions(-)
+
+commit de230ab0730f00a4d1adefdb09232b46a83f52ac
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 17 17:49:23 2009 +0200
+
+    Fix small leak when parsing ‘--ignore-depends’ option values
+
+ debian/changelog |    1 +
+ src/main.c       |    2 ++
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 251008842a464261333381b2d92e2ae9891970e6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 16 13:35:39 2009 +0200
+
+    dpkg-query: Remove unused f_ and fc_ variables
+
+ src/query.c |    7 -------
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+commit 76fd765a0ee2abdd182db085a69f265ac03b3f65
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Sep 19 19:14:01 2009 +0200
+
+    debian/changelog: document recent changes in perl API
+
+ debian/changelog |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit a31b5e3ba2abcc9fd637ad93ed58587e868d33ae
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Sep 19 19:01:22 2009 +0200
+
+    dpkg-scansources: simplify by relying more on the Dpkg::Control object
+
+ scripts/dpkg-scansources.pl |   16 ++--------------
+ 1 files changed, 2 insertions(+), 14 deletions(-)
+
+commit beab30545253f39953156ad8dc62d58053e7d848
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Sep 19 18:50:29 2009 +0200
+
+    dpkg-scanpackages: simplify by using the Dpkg::Control object
+
+ scripts/dpkg-scanpackages.pl |   53 ++++++++++++------------------------------
+ 1 files changed, 15 insertions(+), 38 deletions(-)
+
+commit 7aa35855a72ea57497719715db6a5c8f93c467d5
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Sep 19 17:46:50 2009 +0200
+
+    Register field Dm-Upload-Allowed as Debian specific
+
+ scripts/Dpkg/Control/Fields.pm |    5 +----
+ scripts/Dpkg/Vendor/Debian.pm  |   12 +++++++++---
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+commit 78066765b69f068fd1dbec44e5a644d9c97b6431
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Sep 19 15:29:28 2009 +0200
+
+    Add vendor hook to register custom fields
+
+ scripts/Dpkg/Control/Fields.pm |   15 +++++++++++++++
+ scripts/Dpkg/Vendor.pm         |    4 ++--
+ scripts/Dpkg/Vendor/Default.pm |   13 +++++++++++++
+ 3 files changed, 30 insertions(+), 2 deletions(-)
+
+commit 47919c5e51f198646beb4d823d5d93a8b5aca972
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Sep 17 22:13:40 2009 +0200
+
+    Drop Dpkg::Fields and convert everything to Dpkg::Control::Fields
+
+ scripts/Dpkg/Fields.pm     |   46 --------------------------------------------
+ scripts/Makefile.am        |    1 -
+ scripts/dpkg-genchanges.pl |   26 ++++++------------------
+ scripts/dpkg-gencontrol.pl |   38 +++++++++++------------------------
+ scripts/dpkg-source.pl     |   27 ++++++-------------------
+ scripts/po/POTFILES.in     |    1 -
+ 6 files changed, 26 insertions(+), 113 deletions(-)
+
+commit 293c6541c334b422139fa48c4e12070f6f095868
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Sep 17 20:28:11 2009 +0200
+
+    dpkg-genchanges, dpkg-gencontrol: do not hardcode the field output order
+    
+    The right field output order is automatically set based on the type
+    of the Dpkg::Control object used.
+
+ scripts/dpkg-genchanges.pl |    6 ------
+ scripts/dpkg-gencontrol.pl |    8 +-------
+ 2 files changed, 1 insertions(+), 13 deletions(-)
+
+commit 1d87eba012dacd8c2d1441a8017028c18af5d43a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Sep 15 01:20:14 2009 +0200
+
+    Get rid of Dpkg::Deps @src_dep_fields @pkg_dep_fields and %dep_field_type
+    
+    Update all modules and scripts to not use those variables of Dpkg::Deps
+    but instead the two functions field_list_(pkg|src)_dep() of
+    Dpkg::Control::Fields.
+
+ scripts/Dpkg/Deps.pm           |   49 +--------------------------------------
+ scripts/Dpkg/Fields.pm         |    6 ++--
+ scripts/Dpkg/Source/Package.pm |   10 --------
+ scripts/dpkg-gencontrol.pl     |    7 +++--
+ scripts/dpkg-scanpackages.pl   |    4 +-
+ scripts/dpkg-scansources.pl    |    4 +-
+ scripts/dpkg-source.pl         |    4 +-
+ 7 files changed, 15 insertions(+), 69 deletions(-)
+
+commit 0d39e351ea97c5541252640f64d8d09ded6ec045
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Mon Sep 14 23:46:10 2009 +0200
+
+    Replace old capit() by field_capitalize() everywhere
+    
+    capit() is provided by Dpkg::Fields while field_capitalize() is part
+    of the new Dpkg::Control::Fields API.
+
+ scripts/Dpkg/Control.pm           |    1 -
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    4 ++--
+ scripts/dpkg-genchanges.pl        |    2 +-
+ scripts/dpkg-shlibdeps.pl         |    4 ++--
+ scripts/dpkg-source.pl            |    5 +++--
+ 5 files changed, 8 insertions(+), 8 deletions(-)
+
+commit ca39b57488e2b245311892bb38510c72d29f4dd0
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Sep 15 01:26:20 2009 +0200
+
+    Dpkg::Control: define the default output order based on the type
+
+ scripts/Dpkg/Control.pm |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 3c5b94836a86c8884a99b70cd98672244adb4c75
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Thu Sep 17 22:20:55 2009 +0200
+
+    Dpkg::Control::Fields: official list of control fields
+    
+    This new module provides an official list of control fields as
+    well as many functions to query that list and the meta-information
+    associated to each list.
+
+ scripts/Dpkg/Control/Fields.pm |  564 ++++++++++++++++++++++++++++++++++++++++
+ scripts/Makefile.am            |    1 +
+ scripts/po/POTFILES.in         |    1 +
+ 3 files changed, 566 insertions(+), 0 deletions(-)
+
+commit 22699815920b1cb8550e06dcf2ffe1442b0ee890
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 13 21:32:30 2009 +0200
+
+    Drop unused code that has been merged in Dpkg::Control
+
+ scripts/Dpkg/Control.pm |   81 +-----------------
+ scripts/Dpkg/Fields.pm  |  224 -----------------------------------------------
+ 2 files changed, 1 insertions(+), 304 deletions(-)
+
+commit 6ebc6bf02e1807ec55c1e7e1c52f7240acb3f1d2
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 13 21:30:19 2009 +0200
+
+    Use the new Dpkg::Control interface everywhere
+    
+    Update all scripts and module to use Dpkg::Control instead
+    of parsecdata and Dpkg::Fields::Object.
+
+ scripts/Dpkg/Changelog.pm        |   34 ++++++++++++++++------------------
+ scripts/Dpkg/Changelog/Debian.pm |   12 +++++++-----
+ scripts/Dpkg/Control/Info.pm     |   27 +++++++++++++--------------
+ scripts/Dpkg/Source/Package.pm   |   13 ++++++-------
+ scripts/Dpkg/Vendor.pm           |    5 +++--
+ scripts/Dpkg/Vendor/Default.pm   |    2 +-
+ scripts/dpkg-genchanges.pl       |   13 +++++++------
+ scripts/dpkg-gencontrol.pl       |   12 +++++++-----
+ scripts/dpkg-name.pl             |    4 ++--
+ scripts/dpkg-parsechangelog.pl   |    2 +-
+ scripts/dpkg-scansources.pl      |   13 ++++++-------
+ scripts/t/700_Dpkg_Control.t     |    2 +-
+ 12 files changed, 70 insertions(+), 69 deletions(-)
+
+commit a9e60393659780a6d60d5f673eacd3ca3c511536
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Sep 18 23:25:42 2009 +0200
+
+    Dpkg::Control: new object interface
+    
+    The new object interface combines the old Dpkg::Fields::Object
+    and the old parsecdata funtion.
+    
+    The new object can be used like a regular hash and yet it behaves
+    intelligently taking into account all the specifics of control
+    information. Fields are case-insensitive, the order in which they have
+    been read is kept for output stability.
+    
+    The object uses operator overloading and an internal tied hash so that
+    it just does what you mean.
+
+ scripts/Dpkg/Control.pm       |  167 ++++++++++++++-
+ scripts/Dpkg/Control/Hash.pm  |  469 +++++++++++++++++++++++++++++++++++++++++
+ scripts/Dpkg/Control/Types.pm |   42 ++++
+ scripts/Makefile.am           |    2 +
+ scripts/po/POTFILES.in        |    2 +
+ 5 files changed, 672 insertions(+), 10 deletions(-)
+
+commit b9c82a9db20dc3a9955982b7e5917699d5e52038
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 13 15:15:53 2009 +0200
+
+    Rename Dpkg::Cdata into Dpkg::Control
+    
+    Update all scripts and modules to use the new module names.
+
+ scripts/Dpkg/Changelog.pm             |    2 +-
+ scripts/Dpkg/{Cdata.pm => Control.pm} |    8 ++++----
+ scripts/Dpkg/Control/Info.pm          |    2 +-
+ scripts/Dpkg/Source/Package.pm        |    2 +-
+ scripts/Dpkg/Vendor.pm                |    2 +-
+ scripts/Makefile.am                   |    2 +-
+ scripts/dpkg-genchanges.pl            |    2 +-
+ scripts/dpkg-name.pl                  |    2 +-
+ scripts/dpkg-scansources.pl           |    2 +-
+ scripts/po/POTFILES.in                |    2 +-
+ 10 files changed, 13 insertions(+), 13 deletions(-)
+
+commit ed1828956a24d429a5a488d55e4bf77ef52ede5c
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 13 14:25:13 2009 +0200
+
+    Rename Dpkg::Control in Dpkg::Control::Info
+    
+    Update all scripts and modules to use the new module names.
+
+ scripts/Dpkg/{Control.pm => Control/Info.pm} |    8 ++++----
+ scripts/Makefile.am                          |    2 +-
+ scripts/dpkg-checkbuilddeps.pl               |    4 ++--
+ scripts/dpkg-genchanges.pl                   |    4 ++--
+ scripts/dpkg-gencontrol.pl                   |    4 ++--
+ scripts/dpkg-gensymbols.pl                   |    4 ++--
+ scripts/dpkg-shlibdeps.pl                    |    4 ++--
+ scripts/dpkg-source.pl                       |    4 ++--
+ scripts/po/POTFILES.in                       |    2 +-
+ scripts/t/700_Dpkg_Control.t                 |    4 ++--
+ 10 files changed, 20 insertions(+), 20 deletions(-)
+
+commit e628950c4affe51bf51e6af6f76827c465efc8e8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 15 19:16:38 2009 +0200
+
+    Make the build silent by default
+    
+    Make it verbose when building the Debian packages.
+
+ configure.ac           |    2 ++
+ debian/changelog       |    2 ++
+ debian/rules           |    1 +
+ dpkg-split/Makefile.am |    4 ++--
+ dselect/Makefile.am    |    2 +-
+ man/Makefile.am        |   18 +++++++++++++-----
+ scripts/Makefile.am    |    5 +++--
+ 7 files changed, 24 insertions(+), 10 deletions(-)
+
+commit 3ca41e2ae851f012a28914ebb79eb472834e2d72
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 15 14:13:54 2009 +0200
+
+    Move LISTFILE macro from libdpkg to dpkg
+    
+    This is a private macro, internal to the file database handling code,
+    currently in dpkg only.
+
+ lib/dpkg/dpkg.h |    1 -
+ src/filesdb.h   |    2 ++
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit c351f72244fb7a0f0f2764fcc38b873a7d99166a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 15 14:11:36 2009 +0200
+
+    Move PARTSDIR macro from libdpkg to dpkg-split
+    
+    This is a private macro, internal to dpkg-split.
+
+ dpkg-split/dpkg-split.h |    2 ++
+ lib/dpkg/dpkg.h         |    1 -
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 1a8cda208d2a515bc28e27085f54b6e1eabc3e32
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Sep 14 21:56:45 2009 +0200
+
+    Switch ad-hoc code to use struct pkg_list data type
+    
+    Free the trig_awaited_pend_head list now that it is a pkg_list and
+    it switched from being allocated with m_malloc instead of nfmalloc.
+
+ lib/dpkg/triglib.c |   14 ++++----------
+ src/help.c         |    2 +-
+ src/main.c         |   10 ++++------
+ src/main.h         |   17 +++++++----------
+ src/packages.c     |   16 ++++++++--------
+ src/trigproc.c     |    2 +-
+ 6 files changed, 25 insertions(+), 36 deletions(-)
+
+commit fed0b802b21f21408ae97ac3de1f31c9f7e6d01c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Sep 14 21:52:41 2009 +0200
+
+    libdpkg: Create a new pkg_list structure and functions
+    
+    A new functions to construct and free a list and prepend to a list.
+
+ lib/dpkg/Makefile.am |    1 +
+ lib/dpkg/pkg-list.c  |   61 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/pkg-list.h  |   43 +++++++++++++++++++++++++++++++++++
+ 3 files changed, 105 insertions(+), 0 deletions(-)
+
+commit 8b73de55151677444cfc4745e501b8dd0992374d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 5 05:26:58 2009 +0200
+
+    Move pkg-array to libdpkg
+
+ lib/dpkg/Makefile.am          |    1 +
+ {src => lib/dpkg}/pkg-array.c |    3 +--
+ {src => lib/dpkg}/pkg-array.h |    4 ++++
+ src/Makefile.am               |    2 --
+ src/query.c                   |    2 +-
+ src/select.c                  |    2 +-
+ 6 files changed, 8 insertions(+), 6 deletions(-)
+
+commit 6257d864d6bc1c4ec3bea247178a78679a36f365
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 11 14:49:24 2009 +0200
+
+    dpkg-deb: Check and warn on duplicate conffiles
+    
+    Closes: #131633
+
+ debian/changelog |    1 +
+ dpkg-deb/build.c |   27 +++++++++++++++++++++++++++
+ 2 files changed, 28 insertions(+), 0 deletions(-)
+
+commit 52557dc6333edfe1206d9dca3961e0509501bbfb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 11 14:47:36 2009 +0200
+
+    dpkg-deb: Refactor file info structure creation into a new function
+
+ dpkg-deb/build.c |   17 ++++++++++++++---
+ 1 files changed, 14 insertions(+), 3 deletions(-)
+
+commit df1b1ba7d16d4d8caa2733b1d5c1b968ccd8761a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 11 15:11:54 2009 +0200
+
+    dpkg-deb: Rename _finfo struct to file_info
+    
+    Do not use leading underscores in identifiers.
+
+ dpkg-deb/build.c |   39 ++++++++++++++++++++++++---------------
+ 1 files changed, 24 insertions(+), 15 deletions(-)
+
+commit ac2874075efbdb8d5516a044b3ea14993b712c0e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 15 18:51:37 2009 +0200
+
+    dpkg-deb: Pass last the node to add to add_to_filist
+
+ dpkg-deb/build.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit d5f096c4c708d6daa7ac23128caf78ca8509a2f4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 10 03:12:30 2009 +0200
+
+    dpkg: Update list of binaries to check on PATH
+    
+    Remove install-info which is now a wrapper and will disappear soonish.
+    Add programs used by dpkg itself: sh, rm, find, tar and dpkg-deb.
+
+ debian/changelog |    3 +++
+ src/help.c       |    9 +++++++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+commit 025191b0d76972e71e920b5747b202287470815d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Sep 10 03:27:36 2009 +0200
+
+    dpkg: Use secure_unlink instead of ad-hoc code
+
+ src/remove.c |   19 ++-----------------
+ 1 files changed, 2 insertions(+), 17 deletions(-)
+
+commit 9166393d328f2fe3e1961ca2275d5d39d8eed6b4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 15 17:21:47 2009 +0200
+
+    Improve secure_unlink comment and move it outside the function
+
+ src/help.c |   12 +++++++++---
+ 1 files changed, 9 insertions(+), 3 deletions(-)
+
+commit 4e841712e9ec4eff38008ef22747b3810012116d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 9 18:06:41 2009 +0200
+
+    Rename chmodsafe_unlink functions to secure_unlink
+
+ src/help.c       |    8 ++++----
+ src/main.h       |    4 ++--
+ src/processarc.c |    2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 109f215f03425682997b3210d9b587a79aca1f6a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Sep 9 17:50:14 2009 +0200
+
+    Only use errno for error reason when securely removing a file
+    
+    There's no point in setting an error string, it complicates the code
+    needlessly and the reason is in errno anyway.
+
+ src/help.c       |   32 +++++++++++++++-----------------
+ src/main.h       |    5 ++---
+ src/processarc.c |   11 ++++-------
+ 3 files changed, 21 insertions(+), 27 deletions(-)
+
+commit 378737d036faf23bfa7ddf025f478099906b38ad
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 15 12:57:02 2009 +0200
+
+    Use character arrays instead of pointers for constant strings
+
+ dpkg-deb/build.c     |    2 +-
+ lib/dpkg/parsehelp.c |    2 +-
+ src/configure.c      |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 6eac45a1fa095b3846a88231751381381bac2726
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 13 15:33:53 2009 +0200
+
+    Update Standards-Version to 3.8.3 (no changes needed).
+
+ debian/changelog |    1 +
+ debian/control   |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 8326835a53823046e72f1ac7c60e92a92ea0402a
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Sep 13 15:28:32 2009 +0200
+
+    Add deb-extra-override(5) to dpkg-dev
+    
+    Its addition has been forgotten in
+    22049e15c9b844f3ebef480dfebc588fbd5a301e.
+
+ debian/dpkg-dev.install |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 3cbb2561ba9865fe088410789db37d507669f507
+Author: Miroslav Kure <kurem@debian.cz>
+Date:   Fri Sep 11 21:28:53 2009 +0200
+
+    Czech translation update
+    
+    dpkg: 978t
+    dselect: 280t
+
+ debian/changelog |    2 +
+ dselect/po/cs.po |    7 ++---
+ po/cs.po         |   77 +++++++++++++++++++++++++++--------------------------
+ 3 files changed, 44 insertions(+), 42 deletions(-)
+
+commit 8727864b10c26b504bbff0b83aa3180ca73b2d7f
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Sep 9 10:34:01 2009 +0200
+
+    Fix bad bug number
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 42c7204f717bdd04441c03ed475c5522971d9322
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Wed Sep 9 09:23:48 2009 +0200
+
+    Add versioned dependency on base-files (>= 5.0.0) to dpkg-dev
+    
+    We want to ensure that /etc/dpkg/origins/default exists as it's used
+    by dpkg-source to know what keyrings should be used for the signature
+    check.
+
+ debian/changelog |    4 ++++
+ debian/control   |    2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit a9294a28de3ba8cc94639fbade797c83ac0646bb
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Tue Sep 8 07:14:26 2009 +0200
+
+    Fix error in French manpages translation
+
+ debian/changelog |    3 +++
+ man/po/fr.po     |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 3f876d0ee053c27aa50796de61d1ff303393aeba
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 8 08:16:44 2009 +0200
+
+    Add additional bug closures
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 368b3934bbf1d106e8448b8587657292c24da777
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Sep 8 07:19:59 2009 +0200
+
+    dpkg: Remove obsolete conffiles on purge
+    
+    Closes: #454628
+
+ debian/changelog |    3 +++
+ src/remove.c     |    1 -
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit d7c3d7ff819d010094ec665cb8852c9011e3036f
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Mon Sep 7 12:33:28 2009 +0200
+
+    German dpkg translation update
+    
+    Update to 971t7f.
+
+ debian/changelog |    3 ++
+ po/de.po         |   55 ++++++++++++++++++++++-------------------------------
+ 2 files changed, 26 insertions(+), 32 deletions(-)
+
+commit bbd0ffd5987502fa1afb2e9a5e294628c32e161f
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Mon Sep 7 11:00:24 2009 +0200
+
+    German dselect translation update
+    
+    Update to 280t.
+
+ debian/changelog |    5 ++++-
+ dselect/po/de.po |   21 ++++-----------------
+ 2 files changed, 8 insertions(+), 18 deletions(-)
+
+commit 478b00b3f5e320b80ec4f2185c370461b78b614b
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Sep 6 15:46:42 2009 +0200
+
+    Update German translation of manual pages
+    
+    Update to 1641t0f1u.
+
+ debian/changelog |    5 +++-
+ man/po/de.po     |   64 +++++++++++++++++++++--------------------------------
+ 2 files changed, 29 insertions(+), 40 deletions(-)
+
+commit 8e2429292128d69fe02ecb331fdcbac7c54e2f0f
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Sep 6 15:16:42 2009 +0200
+
+    Update German scripts translation
+    
+    Update to 467t.
+
+ debian/changelog |    3 ++-
+ scripts/po/de.po |    6 +++---
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+commit d6005df3c01bc27936e43d8f6785ca559524770c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 6 09:49:24 2009 +0200
+
+    Bump version to 1.15.5
+
+ configure.ac     |    2 +-
+ debian/changelog |    6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 9eb319a57bffa28f77ec6b7eef7ff5c68e2304e5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 6 09:18:39 2009 +0200
+
+    Release 1.15.4
+
+ configure.ac     |    2 +-
+ debian/changelog |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 878516d13527257ad372989749c3a7d8e41855df
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 6 09:08:54 2009 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |  144 +-
+ dselect/po/ca.po        |  145 +-
+ dselect/po/cs.po        |  145 +-
+ dselect/po/da.po        |  145 +-
+ dselect/po/de.po        |  145 +-
+ dselect/po/dselect.pot  |  144 +-
+ dselect/po/el.po        |  145 +-
+ dselect/po/es.po        |  145 +-
+ dselect/po/et.po        |  145 +-
+ dselect/po/eu.po        |  145 +-
+ dselect/po/fr.po        |  145 +-
+ dselect/po/gl.po        |  145 +-
+ dselect/po/hu.po        |  144 +-
+ dselect/po/id.po        |  145 +-
+ dselect/po/it.po        |  145 +-
+ dselect/po/ja.po        |  145 +-
+ dselect/po/ko.po        |  145 +-
+ dselect/po/nb.po        |  145 +-
+ dselect/po/nl.po        |  145 +-
+ dselect/po/nn.po        |  145 +-
+ dselect/po/pl.po        |  145 +-
+ dselect/po/pt.po        |  145 +-
+ dselect/po/pt_BR.po     |  145 +-
+ dselect/po/ro.po        |  145 +-
+ dselect/po/ru.po        |  145 +-
+ dselect/po/sk.po        |  145 +-
+ dselect/po/sv.po        |  145 +-
+ dselect/po/tl.po        |  145 +-
+ dselect/po/vi.po        |  145 +-
+ dselect/po/zh_CN.po     |  145 +-
+ dselect/po/zh_TW.po     |  145 +-
+ man/po/de.po            | 3889 ++++++++++++++++++++++----------------------
+ man/po/dpkg-man.pot     | 3483 +++++++++++++++++++++-------------------
+ man/po/es.po            | 3816 +++++++++++++++++++++++---------------------
+ man/po/fr.po            | 4102 +++++++++++++++++++++++++----------------------
+ man/po/hu.po            | 3817 +++++++++++++++++++++++---------------------
+ man/po/ja.po            | 3836 +++++++++++++++++++++++---------------------
+ man/po/pl.po            | 3886 +++++++++++++++++++++++---------------------
+ man/po/pt_BR.po         | 3810 +++++++++++++++++++++++---------------------
+ man/po/ru.po            | 3813 +++++++++++++++++++++++---------------------
+ man/po/sv.po            | 3907 ++++++++++++++++++++++++---------------------
+ po/ast.po               | 2166 +++++++++++++-------------
+ po/bs.po                | 1900 ++++++++++------------
+ po/ca.po                | 2209 +++++++++++++-------------
+ po/cs.po                | 2167 +++++++++++++-------------
+ po/da.po                | 2173 +++++++++++++-------------
+ po/de.po                | 1126 +++++++-------
+ po/dpkg.pot             | 1896 ++++++++++------------
+ po/dz.po                | 2173 +++++++++++++-------------
+ po/el.po                | 2191 +++++++++++++-------------
+ po/eo.po                | 2165 +++++++++++++-------------
+ po/es.po                | 2204 +++++++++++++-------------
+ po/et.po                | 2039 +++++++++++------------
+ po/eu.po                | 2164 +++++++++++++-------------
+ po/fr.po                | 2240 +++++++++++++-------------
+ po/gl.po                | 2172 +++++++++++++-------------
+ po/hu.po                | 2164 +++++++++++++-------------
+ po/id.po                | 2018 +++++++++++------------
+ po/it.po                | 2190 +++++++++++++-------------
+ po/ja.po                | 2175 +++++++++++++-------------
+ po/km.po                | 2152 ++++++++++++-------------
+ po/ko.po                | 2157 ++++++++++++-------------
+ po/ku.po                | 1907 ++++++++++------------
+ po/lt.po                | 1962 +++++++++++------------
+ po/mr.po                | 2162 +++++++++++++-------------
+ po/nb.po                | 2174 +++++++++++++-------------
+ po/ne.po                | 2161 +++++++++++++-------------
+ po/nl.po                | 2181 +++++++++++++-------------
+ po/nn.po                | 2017 +++++++++++------------
+ po/pa.po                | 2029 +++++++++++-------------
+ po/pl.po                | 2164 +++++++++++++-------------
+ po/pt.po                | 2187 +++++++++++++-------------
+ po/pt_BR.po             | 2181 +++++++++++++-------------
+ po/ro.po                | 2192 +++++++++++++-------------
+ po/ru.po                | 2169 +++++++++++++-------------
+ po/sk.po                | 2161 +++++++++++++-------------
+ po/sv.po                | 1128 +++++++-------
+ po/th.po                | 2153 ++++++++++++-------------
+ po/tl.po                | 2017 +++++++++++------------
+ po/vi.po                | 2197 +++++++++++++-------------
+ po/zh_CN.po             | 2162 +++++++++++++-------------
+ po/zh_TW.po             | 2153 ++++++++++++-------------
+ scripts/po/ca.po        |  342 ++---
+ scripts/po/de.po        |  103 +-
+ scripts/po/dpkg-dev.pot |  317 ++---
+ scripts/po/fr.po        |  385 +++---
+ scripts/po/pl.po        |  392 +++---
+ scripts/po/ru.po        |  385 +++---
+ scripts/po/sv.po        |   89 +-
+ 89 files changed, 65104 insertions(+), 65058 deletions(-)
+
+commit d0d808250ad40e19ee531e6997d3bf401b7889d5
+Author: Steve Langasek <vorlon@debian.org>
+Date:   Sun Aug 30 01:33:54 2009 -0700
+
+    Add Multi-Arch to the list of known binary package fields for dpkg-dev
+
+ debian/changelog           |    2 ++
+ scripts/Dpkg/Fields.pm     |    2 +-
+ scripts/dpkg-gencontrol.pl |    2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+commit cc9fc4d628664a69351f4a77b70baebb59c0a6e4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 6 08:35:29 2009 +0200
+
+    dpkg: Use ohshit on bad version syntax in --compare-versions
+
+ debian/changelog |    1 +
+ src/enquiry.c    |   14 ++++----------
+ 2 files changed, 5 insertions(+), 10 deletions(-)
+
+commit e8dc6b406eb25bd8025fdc756f2df7646a123843
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 6 08:30:05 2009 +0200
+
+    man: Document DPKG_RUNNING_VERSION environment variable
+
+ debian/changelog |    2 ++
+ man/dpkg.1       |    6 +++++-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 0680aef0b534cb219f36788e25520c667e9e7ba7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 6 08:14:00 2009 +0200
+
+    dpkg-query: Add installed package control path query support
+    
+    This new command is to be used in special cirmcumstances when the
+    maintainer scripts, or external programs need to know the paths to an
+    installed package control files, without needing to hardcode or assume
+    any file system layout for the dpkg database.
+
+ debian/changelog |    1 +
+ man/dpkg-query.1 |   10 ++++-
+ src/main.h       |    1 +
+ src/query.c      |  120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 131 insertions(+), 1 deletions(-)
+
+commit abc43d47aca5ce042e0f00bf06187bc0909ef048
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 6 07:11:10 2009 +0200
+
+    Unify and mark strings for translation
+
+ scripts/Dpkg/Arch.pm              |    6 +++---
+ scripts/Dpkg/Shlibs/Objdump.pm    |    4 ++--
+ scripts/Dpkg/Source/Package.pm    |    2 +-
+ scripts/Dpkg/Source/Package/V2.pm |    4 ++--
+ scripts/dpkg-gencontrol.pl        |    2 +-
+ scripts/dpkg-scansources.pl       |    2 +-
+ scripts/dpkg-shlibdeps.pl         |    2 +-
+ src/enquiry.c                     |    2 +-
+ src/query.c                       |    4 ++--
+ 9 files changed, 14 insertions(+), 14 deletions(-)
+
+commit 0a5a950910c39e1ec97b724f0470427ffaa7acf2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 6 07:04:41 2009 +0200
+
+    Use m_output instead of checking printing functions return code
+    
+    Cleans up the code. And as a side effect, we get rid of bogus checks
+    for EOF, which should have been checking for negative return values.
+
+ dpkg-deb/extract.c |   27 ++++++++++++-----------
+ dpkg-deb/info.c    |   23 ++++++++++---------
+ dpkg-deb/main.c    |   45 ++++++++++++++++++++------------------
+ dpkg-split/main.c  |   34 ++++++++++++++++------------
+ dselect/main.cc    |   34 ++++++++++++++++------------
+ src/enquiry.c      |    8 ++----
+ src/main.c         |   61 +++++++++++++++++++++++++++------------------------
+ src/query.c        |   35 ++++++++++++++++-------------
+ src/trigcmd.c      |   32 ++++++++++++--------------
+ 9 files changed, 157 insertions(+), 142 deletions(-)
+
+commit 90526758c5cfc9bbec8d7c7e214e9393892a1b67
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 6 06:45:39 2009 +0200
+
+    Use m_output instead of fflush, ferror and werr
+
+ dpkg-deb/build.c    |    2 +-
+ dpkg-deb/info.c     |    2 +-
+ dpkg-split/info.c   |    2 +-
+ dpkg-split/main.c   |    2 +-
+ dpkg-split/queue.c  |    6 +++---
+ dselect/method.cc   |    3 +--
+ lib/dpkg/database.c |    4 +++-
+ src/archives.c      |    4 ++--
+ src/enquiry.c       |   17 +++++++++--------
+ src/packages.c      |    4 ++--
+ src/query.c         |   17 +++++++++--------
+ src/select.c        |    5 +++--
+ 12 files changed, 36 insertions(+), 32 deletions(-)
+
+commit 7121152571589de8037f431bbfb0654733c5815b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 6 06:37:01 2009 +0200
+
+    libdpkg: New m_output function
+    
+    This function makes sure to output the information printed on the file
+    specified, and ohshites if there's any error.
+
+ lib/dpkg/dpkg.h |    1 +
+ lib/dpkg/mlib.c |    8 ++++++++
+ 2 files changed, 9 insertions(+), 0 deletions(-)
+
+commit b471b6bcd7c8d1513558fa3f0ef1411115df9a93
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 6 06:33:52 2009 +0200
+
+    dpkg-deb: Use warning() instead of ad-hoc printing
+
+ dpkg-deb/build.c |    6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+commit a83e83c156e9cf2d084b1cc8cf561cec4f021ac9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 6 06:30:08 2009 +0200
+
+    dpkg: Check stdout for errors instead of stderr in audit()
+
+ src/enquiry.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit d75c567c6140efb6b019825155a1a70402534d87
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Sep 6 02:34:35 2009 +0200
+
+    Do not check for fprintf return code when going to ohshit anyway
+
+ dpkg-deb/extract.c |    7 +++----
+ dpkg-deb/info.c    |    5 +++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 7c2f0550e53b4fee0af12f3f5e43e1ac168b1f34
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 5 20:48:12 2009 +0200
+
+    dpkg: Remove unused act_compareversions
+
+ src/main.h |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 05b6c8434d840ee484a6d8961030a8d2b7510a10
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 5 20:45:56 2009 +0200
+
+    dpkg: Sort and group ‘enum action’ values
+
+ src/main.h |   52 ++++++++++++++++++++++++++++++++++++++++++----------
+ 1 files changed, 42 insertions(+), 10 deletions(-)
+
+commit 9ce2c0102f81074c43850319206aab0c62c7ce50
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 28 19:55:46 2009 +0200
+
+    libdpkg: Remove _setup from buffer_copy_setup_TYPE function names
+
+ lib/dpkg/buffer.c |    6 +-
+ lib/dpkg/buffer.h |  112 +++++++++++++++++++++++------------------------------
+ 2 files changed, 51 insertions(+), 67 deletions(-)
+
+commit e87b2838b21f76394f0827ccd8709313c56c7a23
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 28 19:55:06 2009 +0200
+
+    libdpkg: Rename buffer_copy_setup_dual to buffer_copy_TYPE
+
+ lib/dpkg/buffer.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 912657f0b45bb17c111e2b08845382f28fe73798
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 28 19:39:27 2009 +0200
+
+    libdpkg: Fold buffer_copy_setup back into buffer_copy_setup_TYPE functions
+
+ lib/dpkg/buffer.c |   31 ++++++++++---------------------
+ lib/dpkg/buffer.h |    4 +---
+ 2 files changed, 11 insertions(+), 24 deletions(-)
+
+commit 0f7c88fe1c845fe0a8f8768cc36bca48ee71e31c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 28 19:32:13 2009 +0200
+
+    libdpkg: Remove unused proc member from buffer_data
+
+ lib/dpkg/buffer.c |   25 +++++---------
+ lib/dpkg/buffer.h |   96 +++++++++++++++++++++++++---------------------------
+ 2 files changed, 55 insertions(+), 66 deletions(-)
+
+commit be09bdbe35b2160341d38faf8ad0e0344bce0f6d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 28 13:16:39 2009 +0200
+
+    libdpkg: Refactor buffer initalizaion and destruction
+
+ lib/dpkg/buffer.c |   61 ++++++++++++++++++++--------------------------------
+ lib/dpkg/buffer.h |    7 +----
+ 2 files changed, 26 insertions(+), 42 deletions(-)
+
+commit 03144fe7d6b0e80682ff950fdedd8481eaeb0f07
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 28 13:10:22 2009 +0200
+
+    libdpkg: Refactor md5 buffer initialization and destruction
+    
+    Move into their own functions.
+
+ lib/dpkg/buffer.c |   56 ++++++++++++++++++++++++++++++----------------------
+ 1 files changed, 32 insertions(+), 24 deletions(-)
+
+commit 76f5201800ace04832c293e6f7a2aa50357ed50c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Aug 27 18:33:48 2009 +0200
+
+    libdpkg: Move buffer I/O declarations to buffer.h
+
+ dpkg-deb/build.c       |    1 +
+ dpkg-deb/extract.c     |    1 +
+ dpkg-deb/info.c        |    1 +
+ lib/dpkg/Makefile.am   |    1 +
+ lib/dpkg/buffer.c      |  278 ++++++++++++++++++++++++++++++++++++++++++++++++
+ lib/dpkg/buffer.h      |  177 ++++++++++++++++++++++++++++++
+ lib/dpkg/compression.c |    1 +
+ lib/dpkg/dpkg.h        |  126 ----------------------
+ lib/dpkg/mlib.c        |  194 ---------------------------------
+ lib/dpkg/myopt-util.c  |    1 +
+ lib/dpkg/parse.c       |    1 +
+ po/POTFILES.in         |    1 +
+ src/archives.c         |    1 +
+ src/configure.c        |    1 +
+ src/filesdb.c          |    1 +
+ src/processarc.c       |    1 +
+ src/statdb.c           |    1 +
+ 17 files changed, 468 insertions(+), 320 deletions(-)
+
+commit 9d81008a303b5510601063363a40c8961b769339
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 21 07:00:17 2009 +0200
+
+    dpkg: Add new invoke hooks support
+    
+    Call pre-invoke and post-invoke hooks before and after unpack,
+    configure, install, triggers-only, remove and purge actions.
+    Set the DPKG_HOOK_ACTION environment variable to the current dpkg
+    action.
+
+ debian/changelog |    1 +
+ man/dpkg.1       |   14 +++++++++++
+ src/main.c       |   66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/main.h       |    5 ++++
+ 4 files changed, 86 insertions(+), 0 deletions(-)
+
+commit 355dbdf36096cd3d1854bc3fd1f814e27796c493
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Sep 5 03:12:28 2009 +0200
+
+    libdpkg: Allow quoting values in configuration file options
+
+ debian/changelog  |    1 +
+ lib/dpkg/myopt.c  |    5 +++++
+ man/dpkg.cfg.5    |    6 +++---
+ man/dselect.cfg.5 |    6 +++---
+ 4 files changed, 12 insertions(+), 6 deletions(-)
+
+commit 5410b4904eeb830c858daaf30420523122ec4042
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 4 14:26:32 2009 +0200
+
+    libdpkg: Add new str_strip_quotes function
+
+ lib/dpkg/string.c        |   22 +++++++++++++++++++++-
+ lib/dpkg/string.h        |    3 ++-
+ lib/dpkg/test/t-string.c |   43 +++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 66 insertions(+), 2 deletions(-)
+
+commit dc43d2bb115cf5da809708ce6cfb3d78c9de503a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 4 20:50:04 2009 +0200
+
+    libdpkg: On configuration error print file name and line number
+
+ debian/changelog |    1 +
+ lib/dpkg/myopt.c |   13 ++++++++-----
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+
+commit 5e29cc4c725c26754e0e88917c7a0a18a58238b9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Sep 4 20:34:00 2009 +0200
+
+    libdpkg: Refactor config error printing into a new function
+
+ lib/dpkg/myopt.c |   20 +++++++++++++++++---
+ 1 files changed, 17 insertions(+), 3 deletions(-)
+
+commit 0bcb1b5d7cc20c05c3fe2cd5e3940cdb9403ee2d
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Sun Sep 6 08:46:50 2009 +0200
+
+    German dpkg translation update
+    
+    Update to 966t7f.
+
+ po/de.po | 1951 ++++++++++++++++++++++----------------------------------------
+ 1 files changed, 703 insertions(+), 1248 deletions(-)
+
+commit 02fb454c08270ee9c11f78ad2968fab84d8960c2
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Tue Sep 1 01:30:35 2009 +0200
+
+    Fix translation error in german manpage of dpkg-buildpackage
+    
+    Reported-by: Joachim Breitner <nomeata@debian.org>
+
+ debian/changelog |    2 ++
+ man/po/de.po     |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit aac9f4df22a9291a284fe1523aea8a0bd8ae086a
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Tue Sep 1 00:59:26 2009 +0200
+
+    Tightening the Breaks for the install-info transition
+    
+    The versions of info-browsers that dpkg breaks are a bit too
+    loose in some cases, namely when it "Breaks: foobar (<= x.y-z)", where
+    x.y-z is the Lenny version of info-browser foobar.  The problem is that
+    there might be an update of foobar in Lenny, say to x.y-zlenny1, which
+    dpkg also needs to break.
+
+ debian/control |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 1b5a009da6fdd38b2b51bd551c09880f890566f7
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Aug 29 15:36:07 2009 +0200
+
+    Update German translation of manual pages and fix French debian/changelog entry
+    
+    Update to 1632t.
+
+ debian/changelog |    4 ++--
+ man/po/de.po     |   17 ++++++++++++++++-
+ 2 files changed, 18 insertions(+), 3 deletions(-)
+
+commit 059d3fe50087676a00513c2063bf39d9ef7d43cc
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Aug 28 18:22:03 2009 +0200
+
+    dpkg-source(1): small improvement
+    
+    Give the section name listing source packages formats when we're
+    referring to it. Thanks to Jari Aalto for the idea.
+
+ debian/changelog  |    2 ++
+ man/dpkg-source.1 |    4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 5efc4dbeb2a53a9eb92c94997010890a191ed40f
+Author: Peter Krefting <peterk@debian.org>
+Date:   Thu Aug 27 12:11:18 2009 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: Update to 973t0f0u.
+    scripts/po/sv.po: Update to 476t0f0u.
+
+ po/sv.po         |  271 ++++++++++++++++++++++++++++--------------------------
+ scripts/po/sv.po |  183 +++++++++++++++++++-----------------
+ 2 files changed, 237 insertions(+), 217 deletions(-)
+
+commit df0845efa08dfb711699f175b4d97e3cc438cc17
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 26 17:17:39 2009 +0200
+
+    man: Use po4a “--previous” support when updating the man pages
+    
+    Suggested-by: Christian Perrier <bubulle@debian.org>
+
+ debian/changelog |    2 ++
+ man/Makefile.am  |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 3e95f425157141289f0780df0da6435b8931444a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 26 17:10:47 2009 +0200
+
+    man: Refactor common po4a options into common variables
+
+ man/Makefile.am |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+commit d9618be8ee1ab10dd174562be06e52bd38918571
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 26 16:56:47 2009 +0200
+
+    man: Always run po4a from source dir regardless of out or in-tree builds
+    
+    Switch to use builddir for the destination files instead of srcdir for
+    the source files, therefore avoiding unneeded changes in the paths in
+    po files regardless of where the object files get stored during build.
+
+ debian/changelog |    2 +
+ man/Makefile.am  |   14 ++--
+ man/po/po4a.cfg  |  212 +++++++++++++++++++++++++++---------------------------
+ 3 files changed, 115 insertions(+), 113 deletions(-)
+
+commit 75cd1fb8b0e6733fa6ccddf7de74fdfeeea5a634
+Author: Jiri Palecek <jpalecek@web.de>
+Date:   Wed Jul 15 13:53:03 2009 +0200
+
+    Dpkg::Shlibs::SymbolFile: cache the minimum version for a particular soname
+    
+    Afer profiling, I discovered that dpkg-shlibdeps spent a large part
+    of his time in the get_smallest_version() version. This patch improves
+    the performance by caching the resulting value.
+
+ debian/changelog                  |    3 +++
+ scripts/Dpkg/Shlibs/SymbolFile.pm |   16 +++++++++++++---
+ 2 files changed, 16 insertions(+), 3 deletions(-)
+
+commit 8cedeb37fa29e3b8ae8c42b0874c662c9385dbe6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 26 12:17:39 2009 +0200
+
+    Use double instead of single quotes to allow backticks to expand
+    
+    Missed in commit 5e83d054b1a790d49bc88e3dd0e8fbb872d51d8f.
+
+ scripts/Makefile.am |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 6fbfd91779aba1b2c3987d7e10da7debe404b6b6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 26 12:15:42 2009 +0200
+
+    libdpkg: Rename dpkg-test.h to test.h in libdpkg_a_SOURCES
+    
+    Missed in commit 4a7010fe5e3573cc919788d354fdbccdedce249d.
+
+ lib/dpkg/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4a95a69523f7260842a3bcc1b52c355f9bb28f3a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 26 12:14:15 2009 +0200
+
+    Add missing files in EXTRA_DIST
+    
+    Missed in commits a27d14c4423c44b400764c99b669824f4ba6e9a1 and
+    6c785595d189f65a59284796a9b1f60f16686e85.
+
+ Makefile.am         |    1 +
+ scripts/Makefile.am |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 51012b34dccedcd21fa6a28255486a2bca54cb64
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 26 11:39:22 2009 +0200
+
+    libdpkg: Move varbuf declarations to varbuf.h
+
+ lib/dpkg/Makefile.am |    2 +-
+ lib/dpkg/dpkg-db.h   |   51 +------------------
+ lib/dpkg/dpkg.h      |    1 -
+ lib/dpkg/varbuf.h    |  142 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 144 insertions(+), 52 deletions(-)
+
+commit d854ad08565b9286022add4d79e70a4d8c0c6d84
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 26 11:37:01 2009 +0200
+
+    Remove redundant extern storage class specifier in functions
+
+ dselect/method.h   |    6 +++---
+ lib/dpkg/dpkg-db.h |    2 +-
+ lib/dpkg/tarfn.h   |    2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 6da79ad047c910fec2209e7bdd8c6cfe3bcf8209
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 26 00:44:49 2009 +0200
+
+    Change dpkg specific m4 macros prefix from SJR_ to DPKG_
+
+ configure.ac   |    6 +++---
+ m4/compiler.m4 |    8 ++++----
+ m4/linker.m4   |    6 +++---
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+commit ae1c223bcfdc3fe613b46af53810447e974e96c1
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Aug 23 08:21:10 2009 +0200
+
+    Update german translation of manual pages
+    
+    Update to 1633t.
+
+ man/po/de.po |   36 +++++++++++++++++++++++++++++++++++-
+ 1 files changed, 35 insertions(+), 1 deletions(-)
+
+commit fb19987b470000badb3c55a674f66244e12d8f7a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 22 02:18:59 2009 +0200
+
+    man: Document DPKG_MAINTSCRIPT_PACKAGE environment variable
+
+ debian/changelog |    2 ++
+ man/dpkg.1       |    4 ++++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 06b7239212a27ea8f38599b6743d88d40b9cdd0e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 22 02:11:14 2009 +0200
+
+    Set DPKG_MAINTSCRIPT_ARCH env var with the .deb architecture
+    
+    This allows maintainer scripts to know which architecture the package
+    got built for.
+
+ debian/changelog |    2 ++
+ lib/dpkg/dpkg.h  |    1 +
+ man/dpkg.1       |    4 ++++
+ src/help.c       |    1 +
+ 4 files changed, 8 insertions(+), 0 deletions(-)
+
+commit ab95f0bb2f53452994f3d48a0802ab34622c8d67
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 22 01:43:57 2009 +0200
+
+    Pass ‘struct pkginfoperfile’ from maint script functions to do_script
+    
+    This allows us to retrieve package information from either the installed
+    package or the one being installed from the maintainer script invoking
+    functions.
+
+ src/help.c |   16 +++++++++-------
+ 1 files changed, 9 insertions(+), 7 deletions(-)
+
+commit dd1780342ab9fb7fecf4a81e8809504814f03787
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 22 01:41:14 2009 +0200
+
+    Pass ‘struct pkginfo’ instead of pkg name to maint script functions
+    
+    This allows us to retrieve package information from the maintainer
+    script invoking functions.
+
+ src/cleanup.c    |    6 +++---
+ src/help.c       |   25 ++++++++++++++++---------
+ src/main.h       |    2 +-
+ src/processarc.c |    6 +++---
+ 4 files changed, 23 insertions(+), 16 deletions(-)
+
+commit 4e646e10e1ec1fd7e686001fc6c26cca80f0afb1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 22 02:27:43 2009 +0200
+
+    Fix typo in German man page
+    
+    Introduced in commit b05b38151980f0d2f390bf5f91a7ceb206dbe9c8.
+    
+    Spotted-by: Steve Langasek <vorlon@debian.org>
+
+ man/po/de.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b05b38151980f0d2f390bf5f91a7ceb206dbe9c8
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Aug 21 17:40:46 2009 +0200
+
+    Update german translation of manual pages, including a fix from Felix Zielcke
+    
+    Update to 1635t.
+
+ man/po/de.po |   42 ++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 40 insertions(+), 2 deletions(-)
+
+commit bbf6bc906ca53d45a96b9860f541c6973edd4541
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 21 07:09:57 2009 +0200
+
+    Add support for config.d style directory fragment loading
+    
+    Open the system config.d directory before the system configuration file,
+    /etc/dpkg/dpkg.cfg.d for dpkg and /etc/dpkg/dselect.cfg.d for dselect,
+    and load fragments with filenames matching the run-parts standard Debian
+    constraints (^[a-zA-Z0-9_-]+$).
+    
+    This will allow external programs to drop configuration fragments on
+    those directories.
+
+ debian/changelog       |    2 +
+ debian/dpkg.install    |    1 +
+ debian/dselect.install |    1 +
+ dselect/Makefile.am    |    5 ++++
+ lib/dpkg/myopt.c       |   56 ++++++++++++++++++++++++++++++++++++++++++++++++
+ man/dpkg.1             |    5 ++-
+ man/dpkg.cfg.5         |    4 ++-
+ man/dselect.1          |    5 ++-
+ man/dselect.cfg.5      |    4 ++-
+ src/Makefile.am        |    3 ++
+ 10 files changed, 80 insertions(+), 6 deletions(-)
+
+commit cf6f6916131e87daa4506661011b11404dbd3adb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 21 00:04:24 2009 +0200
+
+    libdpkg: Use ohshit instead of ohshite on config parsing errors
+    
+    Parsing errors do not set errno, so it will either get a bogus value
+    from an old error, or Success, which is uninteresting.
+
+ lib/dpkg/myopt.c |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+commit 310cea12e94be5b7979ead4969df88cded749352
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Aug 19 18:54:29 2009 +0200
+
+    Update german translation of manual pages
+    
+    Update to 1631t.
+
+ man/po/de.po |   86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 85 insertions(+), 1 deletions(-)
+
+commit 267a2238b9ad28979cf3e6e3e25ed34642ffdfda
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Aug 19 18:37:00 2009 +0200
+
+    Update german scripts translation
+    
+    Update to 476t.
+
+ scripts/po/de.po |  169 ++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 88 insertions(+), 81 deletions(-)
+
+commit 1e93ee6fac346aecc0a0aa307931284a5d8f5395
+Merge: 66abf29 41d56b3
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Wed Aug 19 08:53:45 2009 +0200
+
+    Merged changes
+
+commit 66abf29395eea02e861ed41cd43092c6a29d6d45
+Author: Yuri Kozlov <yuray@komyakino.ru>
+Date:   Wed Aug 19 08:04:27 2009 +0200
+
+    Updated Russian translations
+
+ debian/changelog |    5 +-
+ dselect/po/ru.po |   61 +-------
+ po/ru.po         |   34 ++---
+ scripts/po/ru.po |  460 +++++++++++++++++++++++++-----------------------------
+ 4 files changed, 231 insertions(+), 329 deletions(-)
+
+commit 41d56b350b196aaca09d3901741aaada1138e862
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Aug 16 18:20:53 2009 +0200
+
+    dselect: Use top_builddir instead of top_srcdir to create curkeys.h
+    
+    The <config.h> file is generated in the top_builddir, and there's
+    nothing we need from the top_srcdir.
+
+ dselect/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 00b1d9dce71ff7b73ecba3b38d65c4a9ace7a9da
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Fri May 15 18:09:25 2009 +0200
+
+    dpkg-source/dpkg-genchanges: split long Binary: field values
+
+ debian/changelog           |    2 ++
+ scripts/dpkg-genchanges.pl |    2 ++
+ scripts/dpkg-source.pl     |    2 ++
+ 3 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 22049e15c9b844f3ebef480dfebc588fbd5a301e
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Aug 16 15:40:11 2009 +0200
+
+    deb-extra-override(5): new manual page
+    
+    Factorize description of the extra override file in a new manual page.
+    Refer to this manpage in dpkg-scanpackages(1) and dpkg-scansources(1).
+
+ debian/changelog         |    2 ++
+ man/Makefile.am          |    1 +
+ man/deb-extra-override.5 |   40 ++++++++++++++++++++++++++++++++++++++++
+ man/dpkg-scanpackages.1  |    6 ++++--
+ man/dpkg-scansources.1   |    6 ++++--
+ man/po/po4a.cfg          |    5 +++++
+ 6 files changed, 56 insertions(+), 4 deletions(-)
+
+commit b636de1a3e9b1e131c055c2c0e8bcd1097736925
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Aug 16 15:16:58 2009 +0200
+
+    dpkg-scansources: implement --extra-override
+
+ debian/changelog            |    1 +
+ man/dpkg-scansources.1      |    4 ++++
+ scripts/dpkg-scansources.pl |   31 +++++++++++++++++++++++++++++++
+ 3 files changed, 36 insertions(+), 0 deletions(-)
+
+commit d2d24e8b2f901ecd76ceb733b2cea963eb935b04
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sun Aug 16 13:47:58 2009 +0200
+
+    dpkg-scanpackages: rename --extraoverride into --extra-override
+    
+    Also fix the help output to be properly indented and fix
+    load_extra_override() to use its parameter.
+
+ man/dpkg-scanpackages.1      |    2 +-
+ man/po/de.po                 |    4 ++--
+ scripts/dpkg-scanpackages.pl |   14 ++++++++------
+ 3 files changed, 11 insertions(+), 9 deletions(-)
+
+commit 5e83d054b1a790d49bc88e3dd0e8fbb872d51d8f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Aug 16 15:06:08 2009 +0200
+
+    Use backticks instead of non-portable make $(shell ...) function
+    
+    The backticks are treated like text, until the shell expands them, thus
+    making this solution portable.
+
+ scripts/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fe29af206be39edabc5107330745b97da7cadbb7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Aug 16 15:00:51 2009 +0200
+
+    Cast field width function arguments to int
+
+ lib/dpkg/fields.c |    2 +-
+ src/main.c        |    3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 5b44e3de7a0cc640aefe1c5e5e42857f56f2e8d7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Aug 16 14:54:32 2009 +0200
+
+    Set action_todo as volatile to avoid possible clobbering on longjmp
+
+ src/packages.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 31843aafa7912c9fc591ddcd8e0fd2e79331e28a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Aug 16 14:53:02 2009 +0200
+
+    Use AC_*_IFELSE instead of obsolete AC_TRY_* macros
+
+ m4/compiler.m4 |   15 ++++++++-------
+ m4/funcs.m4    |   17 +++++++++--------
+ m4/types.m4    |    7 ++-----
+ 3 files changed, 19 insertions(+), 20 deletions(-)
+
+commit 0a8ed560cc38f47c08503857977ea5cb9753ca00
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Aug 16 09:28:37 2009 +0200
+
+    Update german translation of manual pages
+    
+    Update to 1619t.
+
+ man/po/de.po |   50 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 49 insertions(+), 1 deletions(-)
+
+commit 57aafd682b597c8d4a462502644e47bb75e46f5a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 15 22:32:26 2009 +0200
+
+    Do not match sparc architecture with sparc64-*-* triplet
+    
+    A sparc64 userland needs a different Debian architecture, as each
+    GNU triplet should maps 1:1 to a Debian architecture.
+
+ cputable         |    2 +-
+ debian/changelog |    1 +
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit efafe7724aab4484b3df424e8d3b7fc0272c9dcc
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 15 22:30:41 2009 +0200
+
+    Use AC_USE_SYSTEM_EXTENSIONS instead of deprecated AC_GNU_SOURCE
+    
+    Bump minimum required autoconf to 2.60.
+
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 93f043e69f1d44913a1ec265eece7099ae3db884
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 15 20:38:48 2009 +0200
+
+    Check for host system instead of target at build time
+    
+    Using AC_CANONICAL_TARGET is needed when wanting to support building
+    cross-compiling software. But there's too many assumptions in dpkg that
+    the host system in dpkg-dev is going to match the build system.
+
+ m4/arch.m4 |   18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+commit 934a97e6ef744501d48cfd39fa0a38e715b2bde1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 15 20:23:03 2009 +0200
+
+    Use AC_CANONICAL_TARGET instead of deprecated AC_CANONICAL_SYSTEM
+
+ m4/arch.m4 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit be6cd02aed8d86239a0f300f71dee91f89c7ab1a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 15 20:21:19 2009 +0200
+
+    Do not directly use AC_CANONICAL_SYSTEM from configure.ac
+    
+    The macro is only needed because of DPKG_ARCHITECTURE which it already
+    requires.
+
+ configure.ac |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 5921a827603dbc938f4b283f0008e6d8a88172bc
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Aug 15 20:15:47 2009 +0200
+
+    Use AM_CPPFLAGS instead of deprecated INCLUDES in Makefile.am files
+
+ dpkg-deb/Makefile.am      |    2 +-
+ dpkg-split/Makefile.am    |    2 +-
+ dselect/Makefile.am       |    2 +-
+ lib/compat/Makefile.am    |    2 +-
+ lib/dpkg/Makefile.am      |    2 +-
+ lib/dpkg/test/Makefile.am |    2 +-
+ src/Makefile.am           |    2 +-
+ utils/Makefile.am         |    2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
+commit ef51c154b0c4d37c7c6726ce5b4e903397b76c26
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Sat Aug 15 21:45:20 2009 +0200
+
+    dpkg-architecture: finish support of DEB_{HOST,BUILD}_ARCH_{BITS,ENDIAN}
+    
+    Enhanced cputable to describe the new columns.
+    
+    Let dpkg-dev depend on dpkg (>= 1.15.4) to ensure that we have an updated
+    cputable (and so that a versioned build-dependency on dpkg-dev is enough to use
+    this new feature).
+    
+    Document the new variables in the manual page dpkg-architecture(1).
+
+ cputable                     |    2 ++
+ debian/changelog             |    7 +++++++
+ debian/control               |    2 +-
+ man/dpkg-architecture.1      |   21 ++++++++++++++++-----
+ scripts/dpkg-architecture.pl |    8 ++++----
+ 5 files changed, 30 insertions(+), 10 deletions(-)
+
+commit 126fcaac1eff9b5ae52e9ab80c158fd3aaf214d6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jun 28 09:13:10 2009 +0200
+
+    dpkg-architecture: Add support for bits and endianness variables
+    
+    Add new DEB_(HOST|BUILD)_ARCH_(BITS|ENDIANNESS) variables to ease work
+    for porters.
+
+ cputable                     |   44 +++++++++++++++++++++---------------------
+ scripts/Dpkg/Arch.pm         |   18 ++++++++++++++++-
+ scripts/dpkg-architecture.pl |    6 +++++
+ 3 files changed, 45 insertions(+), 23 deletions(-)
+
+commit 86823d5792af8328107c3d86e486d2cf373da128
+Author: Ian Jackson <ian@davenant.greenend.org.uk>
+Date:   Sat Aug 15 12:42:03 2009 +0200
+
+    dpkg: change behaviour of --merge-avail
+    
+    With this change, dpkg --merge-avail does not update a package's
+    information if the version provided is older than the one already listed
+    in the available file.
+
+ debian/changelog   |    4 ++++
+ lib/dpkg/dpkg-db.h |    3 ++-
+ lib/dpkg/parse.c   |    5 +++++
+ src/update.c       |    3 ++-
+ 4 files changed, 13 insertions(+), 2 deletions(-)
+
+commit 333f41304e610a1b2a44b715c6359783632a73c1
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Aug 15 18:16:15 2009 +0200
+
+    Update german translation of manual pages
+    
+    Update to 1611t.
+
+ man/po/de.po |   30 ++++++++++++++++++++++++++----
+ 1 files changed, 26 insertions(+), 4 deletions(-)
+
+commit a04109f53bcff5e53ece983a7fc95c000b86ad6f
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Aug 15 17:53:18 2009 +0200
+
+    Sort language updates by alphabet.
+
+ debian/changelog |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit b6b67fa54b54364d2410ad653fd3b7708a4bd159
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Aug 15 17:51:58 2009 +0200
+
+    Update german scripts translation
+    
+    Update to 476t.
+
+ scripts/po/de.po |   60 +++++++++++++++++++++++++++--------------------------
+ 1 files changed, 31 insertions(+), 29 deletions(-)
+
+commit 34db30e1d20eb6953d822677e846fdf45fd3d361
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Aug 15 17:50:22 2009 +0200
+
+    Add missing full stop
+
+ scripts/dpkg-scanpackages.pl |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6c785595d189f65a59284796a9b1f60f16686e85
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Aug 14 21:41:44 2009 +0200
+
+    Add a dpkg cron.daily script to backup the status file
+    
+    Create /etc/cron.daily/dpkg to handle the backup of /var/lib/dpkg/status
+    in /var/backups. This is taken out of the cron package and need no
+    conflicts/breaks as the code does nothing if the current status file is
+    already backupped.
+    
+    Moving it out of the cron package makes it more visible for users
+    inspecting the content of the dpkg package.
+    
+    Based-on-patch-by: Leo 'costela' Antunes <costela@debian.org>
+
+ debian/changelog       |    5 +++++
+ debian/dpkg.cron.daily |   10 ++++++++++
+ debian/rules           |    3 ++-
+ man/dpkg.1             |    3 +++
+ 4 files changed, 20 insertions(+), 1 deletions(-)
+
+commit d31094b551ec0e7eea5e389f6791ff835eab6760
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Fri Aug 7 17:49:30 2009 +0200
+
+    dpkg-gensymbols(1): add kfreebsd-amd64 to the "64bit arches" symbol example
+    
+    This makes it less likely that this arch will be forgotten when
+    maintainers copy/paste from the example.
+
+ debian/changelog      |    2 ++
+ man/dpkg-gensymbols.1 |    6 +++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 8a28be4f25166624a455134171515b3a0fc36774
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Aug 14 19:27:31 2009 +0200
+
+    dpkg-scanpackages(1): correctly refer to the deb-overrides manual page
+
+ man/dpkg-scanpackages.1 |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 121197a1efdb4e19d8b09cdceaea69262f1dd46b
+Author: Raphaël Hertzog <hertzog@debian.org>
+Date:   Fri Aug 14 19:25:07 2009 +0200
+
+    dpkg-scanpackages: add support for extra override file
+    
+    Based-on-patch-by: Robert Millan <rmh@aybabtu.com>
+
+ debian/changelog             |    2 ++
+ man/dpkg-scanpackages.1      |    4 ++++
+ scripts/dpkg-scanpackages.pl |   29 +++++++++++++++++++++++++++--
+ 3 files changed, 33 insertions(+), 2 deletions(-)
+
+commit b97451856dece57d2fba7d3a7dda1a63297b7874
+Author: Steve Petruzzello <dlist@bluewin.ch>
+Date:   Fri Aug 14 17:21:21 2009 +0200
+
+    man: Fix typo, wrong space
+
+ man/po/fr.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 870db3e790f187464713a97c0a00b72b60747963
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Fri Aug 14 10:05:54 2009 +0200
+
+    update-alternatives: add a missing mark for translation
+
+ scripts/update-alternatives.pl |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d8432dde9f3901370e0ff72b5bef2dda6e18d78f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Aug 13 21:24:35 2009 +0200
+
+    Use MD5HASHLEN instead of literals
+
+ TODO               |    1 -
+ dpkg-split/info.c  |    4 ++--
+ dpkg-split/queue.c |   12 +++++++-----
+ lib/dpkg/mlib.c    |    2 +-
+ 4 files changed, 10 insertions(+), 9 deletions(-)
+
+commit 2e7cc3f958eefca81c68a74b896279fdd133d981
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Aug 13 21:09:49 2009 +0200
+
+    Remove double slash in database path creation
+    
+    Visible to the user in some error conditions.
+
+ debian/changelog |    2 ++
+ src/processarc.c |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 15cad2dc636e7efa871104e54de2c225d3676c5d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Aug 11 20:19:50 2009 +0200
+
+    Add forgotten bug closure
+    
+    Closes: #472208
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e3ef990f83a74130246b439b2e257e33c017758a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Aug 9 14:33:38 2009 +0200
+
+    dpkg: On file conflicts print the version of the conflicted package
+    
+    Makes it easier to report bugs, without needed to additionally check
+    the installed version of the conflicted package.
+    
+    Closes: #540019
+
+ debian/changelog |    2 ++
+ src/archives.c   |   16 +++++++++++-----
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+commit 9e40c4a19bc193d07c934ead1cc0454226688969
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Aug 7 13:57:56 2009 +0200
+
+    Fix typo in Swedish manual translation
+    
+    This was producing a build failure.
+    
+    Introduced in commit e27721cc8ae336dff1c3139bb6736f2b40597803.
+
+ man/po/sv.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 2cbe23e4295b76939e58a84547191161861d36ed
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Aug 5 16:40:47 2009 +0200
+
+    Bump install-info related versioned Breaks for konqueror
+    
+    Last version of konqueror before the fix is 4:4.2.96-1, thus change the
+    dependency accordingly.
+
+ debian/control |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e27721cc8ae336dff1c3139bb6736f2b40597803
+Author: Peter Krefting <peterk@debian.org>
+Date:   Mon Aug 3 20:30:22 2009 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: Updated to 971t0f0u.
+    man/po/sv.po: Update to 1608t0f0u.
+    scripts/po/sv.po: Update to 476t0f0u.
+
+ debian/changelog |    3 +
+ man/po/sv.po     |   45 +-
+ po/sv.po         | 1841 ++++++++++++++++++++++++++----------------------------
+ scripts/po/sv.po |  245 ++++----
+ 4 files changed, 1032 insertions(+), 1102 deletions(-)
+
+commit 28a8ec9ba082a6eeba9ed853d043bf17639d0399
+Author: Simon Richter <sjr@debian.org>
+Date:   Sun Aug 2 18:06:54 2009 +0200
+
+    Add uClinux support to ostable and triplettable
+
+ debian/changelog |    2 ++
+ ostable          |    2 ++
+ triplettable     |    2 ++
+ 3 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 9d015f4fb71cc13c9920c8d62f64f3c2f097389a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Aug 2 18:04:01 2009 +0200
+
+    Add uClibc Linux support to ostable and triplettable
+    
+    Closes: #455501
+
+ debian/changelog |    1 +
+ ostable          |    2 ++
+ triplettable     |    2 ++
+ 3 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 173652e75fad004c42906608fe0ff4556be29b19
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Thu Jul 30 18:38:57 2009 +0200
+
+    Fix errors in a paragraph in the German man page translation.
+
+ man/po/de.po |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 37a7407d040e5e6c33ebad6c029cc36d2a2768d5
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sat Jul 25 15:49:35 2009 +0200
+
+    update-alternatives: fix a warning message
+    
+    Mention the correct slave link that can't be installed due to a
+    conflicting file instead of quoting the master link.
+
+ debian/changelog               |    2 ++
+ scripts/update-alternatives.pl |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 74b5b92eaed9566565f522bd896187ed2920310c
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sat Jul 25 00:48:14 2009 +0200
+
+    Fix apply_patches() funtion of 3.0 (quilt) format to properly skip auto patch
+    
+    When quilt was used, it was applying the automatic patch even
+    when $skip_auto was set to 1. This bug was introduced while fixing
+    bug #518453 (commit ea1530fe45c8b1ad61d91c0791c53ecf363899bf).
+
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit cc6d3a6b1c5910fb89f85659bafba80816975859
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 22 18:11:39 2009 +0200
+
+    po: Change path for libdpkg files in POTFILES to lib/dpkg/
+    
+    Missed in commit 01d05324e0669e3f3585d6aacde696333e49f087, was
+    producing empty po files.
+
+ po/POTFILES.in |   48 ++++++++++++++++++++++++------------------------
+ 1 files changed, 24 insertions(+), 24 deletions(-)
+
+commit 4eb5386c09b26346b8e30604b070a6d34832d838
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 22 18:09:19 2009 +0200
+
+    man: Fix typo in French translation breaking the build
+    
+    Introduced in commit f96f650bffaeb949a96107fcb188f9927be42171.
+
+ man/po/fr.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 51029b602a3f75af00bcaf9b35ef3c2325d58460
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Wed Jul 22 10:39:43 2009 +0200
+
+    Update german scripts translation
+    
+    Update to 476t.
+
+ scripts/po/de.po |   58 +++++++++++++++++++++++++++++++----------------------
+ 1 files changed, 34 insertions(+), 24 deletions(-)
+
+commit c2d042c2fbba96839ac21e42b2724027e3642420
+Merge: 8ea582f 3fe3521
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Tue Jul 21 23:16:52 2009 +0200
+
+    Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
+
+commit 8ea582ffda28c90865c5a8951189b16b946d5edb
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Tue Jul 21 19:27:27 2009 +0200
+
+    Completed French translation for scripts
+
+ debian/changelog |    3 +-
+ scripts/po/fr.po |  169 ++++++++++++++++++++++++++++--------------------------
+ 2 files changed, 90 insertions(+), 82 deletions(-)
+
+commit fb757470ce13c38a41f325e5c428cae9d0aae4c6
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Tue Jul 21 19:02:12 2009 +0200
+
+    Recomplete French translation
+
+ man/po/fr.po |  202 ++++++++++++++++++++--------------------------------------
+ 1 files changed, 70 insertions(+), 132 deletions(-)
+
+commit d013b8b6163d064caabcf0fdd5fdc9e0371450a2
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Tue Jul 21 18:58:17 2009 +0200
+
+    Drop accidentally added file
+
+ man/po/fr2.po |15925 ---------------------------------------------------------
+ 1 files changed, 0 insertions(+), 15925 deletions(-)
+
+commit 7fb5b0e12692150f5ecd3507ef6005fef96ea3bd
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Tue Jul 21 18:57:43 2009 +0200
+
+    Regenerate POT file and resync PO files
+
+ man/po/de.po             | 5248 ++++++++++++++++++++++++++++---------------
+ man/po/dpkg-man.pot      | 5626 +++++++++++++++++-----------------------------
+ man/po/es.po             | 4141 ++++++++++++++++-------------------
+ man/po/fr.po             | 4825 +++++++++++++++++++--------------------
+ man/po/{fr.po => fr2.po} | 4825 +++++++++++++++++++--------------------
+ man/po/hu.po             | 4107 +++++++++++++++------------------
+ man/po/ja.po             | 4640 +++++++++++++++++++--------------------
+ man/po/pl.po             | 4653 +++++++++++++++++++--------------------
+ man/po/pt_BR.po          | 4126 +++++++++++++++-------------------
+ man/po/ru.po             | 4120 +++++++++++++++-------------------
+ man/po/sv.po             | 4624 +++++++++++++++++++-------------------
+ 11 files changed, 24549 insertions(+), 26386 deletions(-)
+
+commit f96f650bffaeb949a96107fcb188f9927be42171
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Tue Jul 21 18:54:33 2009 +0200
+
+    Updated French translation
+
+ debian/changelog |    1 +
+ man/po/fr.po     | 2011 ++++++++++++++++++++++++++++++------------------------
+ 2 files changed, 1114 insertions(+), 898 deletions(-)
+
+commit 3fe3521d247a524a41018486aa2496c7803abed2
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Tue Jul 21 10:14:00 2009 +0200
+
+    Dpkg::Changelog: fix heuristic to identify correct start entry
+    
+    The heuristic to identify the version number that is most approaching
+    was not working properly for the case where the version number was smaller
+    than the oldest version (for example "0"). Add a non-regression test for
+    this case.
+    
+    Also add supplementary warnings message so that people notice when
+    the parameters are discarded.
+
+ debian/changelog               |    2 ++
+ scripts/Dpkg/Changelog.pm      |   15 +++++++++++++--
+ scripts/t/600_Dpkg_Changelog.t |    7 ++++++-
+ 3 files changed, 21 insertions(+), 3 deletions(-)
+
+commit c2a3bc470b047c447d686b5d40a9d2b039ddcdd8
+Author: Ivan Masár <helix84@centrum.sk>
+Date:   Mon Jul 20 18:10:25 2009 +0200
+
+    Slovak translation update
+
+ debian/changelog |    1 +
+ po/sk.po         |   24 ++++++++++++------------
+ 2 files changed, 13 insertions(+), 12 deletions(-)
+
+commit 45af858b38518639fc8e5bc65d9e248d420f773e
+Author: Ivan Masár <helix84@centrum.sk>
+Date:   Mon Jul 20 18:08:07 2009 +0200
+
+    Slovak translation update
+
+ debian/changelog |    3 +
+ dselect/po/sk.po |  255 +++++++++++++++++++++++++++---------------------------
+ 2 files changed, 129 insertions(+), 129 deletions(-)
+
+commit b866c02dfc669dd170680c1bd13b8c0f9898bea5
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Jul 20 08:47:09 2009 +0200
+
+    Fix preinst to not fail on read on broken alternatives status files
+    
+    The internal structure of alternatives status file is line based.
+    Empty lines end each section. read call can fail if the file is truncated
+    at some unexpected point. Thus protect all read calls with "|| continue"
+    or "|| break" depending on the case.
+
+ debian/changelog    |    2 ++
+ debian/dpkg.preinst |    8 ++++----
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 3417f25ffe2c2ea36640952af0e2c1885edaaa5b
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Jul 19 09:38:27 2009 +0200
+
+    Update german translation of manual pages
+    
+    Update to 1608t.
+
+ man/po/de.po | 3105 +++++++++++++---------------------------------------------
+ 1 files changed, 698 insertions(+), 2407 deletions(-)
+
+commit 2ff362a3b623555657309df89482093a3d0d8c83
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 16 22:53:41 2009 +0200
+
+    dselect: Add builddir to the quoted include search path
+    
+    The curkeys.h file gets generated at build time, and if we use an out
+    of tree build directory, it cannot be found in the current search path.
+    But we don't want to add the builddir to the system include search path
+    as it will give file collisions when builddir is the same as srcdir.
+    Hence we only add it for quoted includes.
+
+ dselect/Makefile.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 952faba871d51799d52b267889a17d16381e6ddd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 15 23:06:05 2009 +0200
+
+    libdpkg: Move subproc related declarations to subproc.h
+
+ dpkg-deb/build.c   |    1 +
+ dpkg-deb/extract.c |    1 +
+ dpkg-deb/info.c    |    1 +
+ lib/dpkg/dpkg.h    |    6 ------
+ lib/dpkg/subproc.h |    9 +++++++++
+ src/archives.c     |    1 +
+ src/processarc.c   |    1 +
+ 7 files changed, 14 insertions(+), 6 deletions(-)
+
+commit 605162178fe6e6b5c0a675003391635512b0af33
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 15 16:34:59 2009 +0200
+
+    libdpkg: Split dpkg-priv.h into smaller pieces
+    
+    Make the dependencies on other modules explicit, and avoid clutter by
+    not including unneeded stuff.
+
+ dpkg-deb/build.c                    |    2 +-
+ dselect/method.cc                   |    2 +-
+ lib/dpkg/Makefile.am                |    7 +++----
+ lib/dpkg/fields.c                   |    2 +-
+ lib/dpkg/parsehelp.c                |    2 +-
+ lib/dpkg/path.c                     |    2 +-
+ lib/dpkg/{dpkg-priv.h => path.h}    |   21 +++++----------------
+ lib/dpkg/string.c                   |    2 +-
+ lib/dpkg/{string.c => string.h}     |   26 ++++++++------------------
+ lib/dpkg/subproc.c                  |    2 +-
+ lib/dpkg/{dpkg-priv.h => subproc.h} |   23 ++++-------------------
+ lib/dpkg/test/t-path.c              |    2 +-
+ lib/dpkg/test/t-string.c            |    2 +-
+ src/filesdb.c                       |    2 +-
+ src/help.c                          |    3 ++-
+ src/query.c                         |    2 +-
+ 16 files changed, 33 insertions(+), 69 deletions(-)
+
+commit 7fa96f351b61259f741bcd952beb9468f0c7516c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 15 15:42:48 2009 +0200
+
+    Disable default automake preprocessor include paths
+    
+    Tell automake not to add “-I.” to the preprocessor flags, to avoid
+    file collisions with system headers. Re-add the path where config.h
+    is located. Namespace and use bracketed file inclusions for libdpkg
+    headers, and use quoted inclusions for program headers.
+
+ configure.ac              |    2 +-
+ dpkg-deb/Makefile.am      |    2 +-
+ dpkg-deb/build.c          |    9 +++++----
+ dpkg-deb/extract.c        |    7 ++++---
+ dpkg-deb/info.c           |    7 ++++---
+ dpkg-deb/main.c           |    6 +++---
+ dpkg-split/Makefile.am    |    2 +-
+ dpkg-split/info.c         |    7 ++++---
+ dpkg-split/join.c         |    7 ++++---
+ dpkg-split/main.c         |    6 +++---
+ dpkg-split/queue.c        |    7 ++++---
+ dpkg-split/split.c        |    7 ++++---
+ dselect/Makefile.am       |    4 ++--
+ dselect/basecmds.cc       |    4 ++--
+ dselect/baselist.cc       |    4 ++--
+ dselect/basetop.cc        |    2 +-
+ dselect/bindings.cc       |    4 ++--
+ dselect/curkeys.cc        |    2 +-
+ dselect/dselect.h         |    3 ++-
+ dselect/main.cc           |    6 +++---
+ dselect/methkeys.cc       |    2 +-
+ dselect/methlist.cc       |    4 ++--
+ dselect/method.cc         |    6 +++---
+ dselect/methparse.cc      |    4 ++--
+ dselect/pkgcmds.cc        |    4 ++--
+ dselect/pkgdepcon.cc      |    4 ++--
+ dselect/pkgdisplay.cc     |    4 ++--
+ dselect/pkginfo.cc        |    4 ++--
+ dselect/pkgkeys.cc        |    2 +-
+ dselect/pkglist.cc        |    4 ++--
+ dselect/pkgsublist.cc     |    4 ++--
+ dselect/pkgtop.cc         |    4 ++--
+ lib/dpkg/Makefile.am      |    1 +
+ lib/dpkg/cleanup.c        |    3 ++-
+ lib/dpkg/compression.c    |    4 ++--
+ lib/dpkg/database.c       |    4 ++--
+ lib/dpkg/dbmodify.c       |    4 ++--
+ lib/dpkg/dump.c           |    6 +++---
+ lib/dpkg/ehandle.c        |    4 ++--
+ lib/dpkg/fields.c         |    8 ++++----
+ lib/dpkg/lock.c           |    4 ++--
+ lib/dpkg/log.c            |    4 ++--
+ lib/dpkg/mlib.c           |    6 +++---
+ lib/dpkg/myopt-util.c     |    4 ++--
+ lib/dpkg/myopt.c          |    4 ++--
+ lib/dpkg/nfmalloc.c       |    7 +++----
+ lib/dpkg/parse.c          |    6 +++---
+ lib/dpkg/parsehelp.c      |    9 ++++-----
+ lib/dpkg/path.c           |    3 ++-
+ lib/dpkg/showpkg.c        |    7 +++----
+ lib/dpkg/string.c         |    2 +-
+ lib/dpkg/subproc.c        |    4 ++--
+ lib/dpkg/tarfn.c          |    4 ++--
+ lib/dpkg/test.h           |    2 +-
+ lib/dpkg/test/Makefile.am |    2 +-
+ lib/dpkg/test/t-path.c    |    2 +-
+ lib/dpkg/test/t-pkginfo.c |    2 +-
+ lib/dpkg/test/t-string.c  |    2 +-
+ lib/dpkg/test/t-varbuf.c  |    2 +-
+ lib/dpkg/test/t-version.c |    2 +-
+ lib/dpkg/trigdeferred.l   |    4 ++--
+ lib/dpkg/triglib.c        |    6 +++---
+ lib/dpkg/utils.c          |    4 +++-
+ lib/dpkg/varbuf.c         |    4 ++--
+ lib/dpkg/vercmp.c         |    6 +++---
+ src/Makefile.am           |    2 +-
+ src/archives.c            |    8 ++++----
+ src/cleanup.c             |    8 ++++----
+ src/configure.c           |    4 ++--
+ src/depcon.c              |    4 ++--
+ src/divertdb.c            |    4 ++--
+ src/enquiry.c             |    6 +++---
+ src/errors.c              |    6 +++---
+ src/filesdb.c             |    8 ++++----
+ src/help.c                |    6 +++---
+ src/main.c                |    6 +++---
+ src/packages.c            |    6 +++---
+ src/pkg-array.c           |    4 ++--
+ src/pkg-array.h           |    2 +-
+ src/pkg-show.c            |    4 ++--
+ src/processarc.c          |    8 ++++----
+ src/query.c               |    8 ++++----
+ src/remove.c              |    6 +++---
+ src/select.c              |    6 +++---
+ src/statdb.c              |    4 ++--
+ src/trigcmd.c             |    6 +++---
+ src/trigproc.c            |    4 ++--
+ src/update.c              |    6 +++---
+ utils/Makefile.am         |    2 +-
+ 89 files changed, 209 insertions(+), 199 deletions(-)
+
+commit 4a7010fe5e3573cc919788d354fdbccdedce249d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 15 11:27:26 2009 +0200
+
+    libdpkg: Rename dpkg-test.h to test.h
+
+ lib/dpkg/{dpkg-test.h => test.h} |    2 +-
+ lib/dpkg/test/t-macros.c         |    2 +-
+ lib/dpkg/test/t-path.c           |    2 +-
+ lib/dpkg/test/t-pkginfo.c        |    2 +-
+ lib/dpkg/test/t-string.c         |    2 +-
+ lib/dpkg/test/t-test.c           |    2 +-
+ lib/dpkg/test/t-varbuf.c         |    2 +-
+ lib/dpkg/test/t-version.c        |    2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
+commit 289c2911844317dfdd0c4b8d9034820502da483e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 15 11:21:05 2009 +0200
+
+    libdpkg: Rename dpkg-i18n.h to i18n.h
+
+ dpkg-deb/build.c                 |    2 +-
+ dpkg-deb/extract.c               |    2 +-
+ dpkg-deb/info.c                  |    2 +-
+ dpkg-deb/main.c                  |    2 +-
+ dpkg-split/info.c                |    2 +-
+ dpkg-split/join.c                |    2 +-
+ dpkg-split/main.c                |    2 +-
+ dpkg-split/queue.c               |    2 +-
+ dpkg-split/split.c               |    2 +-
+ dselect/basecmds.cc              |    2 +-
+ dselect/baselist.cc              |    2 +-
+ dselect/bindings.cc              |    2 +-
+ dselect/helpmsgs.cc              |    2 +-
+ dselect/main.cc                  |    2 +-
+ dselect/methlist.cc              |    2 +-
+ dselect/method.cc                |    2 +-
+ dselect/methparse.cc             |    2 +-
+ dselect/pkgdisplay.cc            |    2 +-
+ dselect/pkginfo.cc               |    2 +-
+ dselect/pkglist.cc               |    2 +-
+ dselect/pkgsublist.cc            |    2 +-
+ dselect/pkgtop.cc                |    2 +-
+ lib/dpkg/Makefile.am             |    2 +-
+ lib/dpkg/compression.c           |    2 +-
+ lib/dpkg/database.c              |    2 +-
+ lib/dpkg/dbmodify.c              |    2 +-
+ lib/dpkg/dump.c                  |    2 +-
+ lib/dpkg/ehandle.c               |    2 +-
+ lib/dpkg/fields.c                |    2 +-
+ lib/dpkg/{dpkg-i18n.h => i18n.h} |    2 +-
+ lib/dpkg/lock.c                  |    2 +-
+ lib/dpkg/log.c                   |    2 +-
+ lib/dpkg/mlib.c                  |    2 +-
+ lib/dpkg/myopt-util.c            |    2 +-
+ lib/dpkg/myopt.c                 |    2 +-
+ lib/dpkg/nfmalloc.c              |    2 +-
+ lib/dpkg/parse.c                 |    2 +-
+ lib/dpkg/parsehelp.c             |    2 +-
+ lib/dpkg/progress.c              |    2 +-
+ lib/dpkg/showpkg.c               |    2 +-
+ lib/dpkg/subproc.c               |    2 +-
+ lib/dpkg/trigdeferred.l          |    2 +-
+ lib/dpkg/triglib.c               |    2 +-
+ lib/dpkg/utils.c                 |    2 +-
+ src/archives.c                   |    2 +-
+ src/cleanup.c                    |    2 +-
+ src/configure.c                  |    2 +-
+ src/depcon.c                     |    2 +-
+ src/divertdb.c                   |    2 +-
+ src/enquiry.c                    |    2 +-
+ src/errors.c                     |    2 +-
+ src/filesdb.c                    |    2 +-
+ src/help.c                       |    2 +-
+ src/main.c                       |    2 +-
+ src/packages.c                   |    2 +-
+ src/pkg-show.c                   |    2 +-
+ src/processarc.c                 |    2 +-
+ src/query.c                      |    2 +-
+ src/remove.c                     |    2 +-
+ src/select.c                     |    2 +-
+ src/statdb.c                     |    2 +-
+ src/trigcmd.c                    |    2 +-
+ src/trigproc.c                   |    2 +-
+ src/update.c                     |    2 +-
+ 64 files changed, 64 insertions(+), 64 deletions(-)
+
+commit 935c3d7bc6adbf721091c0a6e48e0967e9b61e00
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 15 11:11:07 2009 +0200
+
+    s-s-d: Use sizeof_array instead of ad-hoc calculation
+
+ utils/start-stop-daemon.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e37532e80f4db81dda48401513d5fee4c85d2083
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 15 15:43:52 2009 +0200
+
+    Remove unused dpkg-priv.h header includes
+
+ src/divertdb.c  |    1 -
+ src/enquiry.c   |    1 -
+ src/pkg-array.c |    1 -
+ src/statdb.c    |    1 -
+ 4 files changed, 0 insertions(+), 4 deletions(-)
+
+commit 105ba53cc13950a9fc9186ae8fab7ad4a7b05e01
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 15 12:14:39 2009 +0200
+
+    libdpkg: Move C language definition macros to macros.h
+
+ dpkg-deb/main.c                   |    2 +-
+ dpkg-split/main.c                 |    2 +-
+ lib/dpkg/Makefile.am              |    2 +-
+ lib/dpkg/dpkg-db.h                |    2 +-
+ lib/dpkg/dpkg-i18n.h              |    2 +-
+ lib/dpkg/dpkg-priv.h              |   16 +---------------
+ lib/dpkg/dpkg.h                   |    2 +-
+ lib/dpkg/ehandle.c                |    2 +-
+ lib/dpkg/{dpkg-def.h => macros.h} |   23 +++++++++++++++++++----
+ lib/dpkg/myopt.h                  |    2 +-
+ lib/dpkg/parse.c                  |    2 +-
+ lib/dpkg/progress.h               |    2 +-
+ lib/dpkg/tarfn.c                  |    3 ++-
+ lib/dpkg/test/t-macros.c          |    2 +-
+ src/configure.c                   |    2 +-
+ src/main.c                        |    2 +-
+ src/pkg-show.c                    |    2 +-
+ utils/start-stop-daemon.c         |    2 +-
+ 18 files changed, 37 insertions(+), 35 deletions(-)
+
+commit da17101a4aa8950d2927dd9e0d823fb36d5057b5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 15 01:36:06 2009 +0200
+
+    libdpkg: Rename and namespace compiler attributes
+    
+    Prefix them all with DPKG_ATTR_, and use shorter but still meaningful
+    names.
+
+ dpkg-deb/dpkg-deb.h       |    2 +-
+ dpkg-deb/extract.c        |    2 +-
+ dpkg-split/dpkg-split.h   |    6 +++---
+ dselect/methparse.cc      |    4 ++--
+ lib/dpkg/dpkg-db.h        |    2 +-
+ lib/dpkg/dpkg-def.h       |   16 ++++++++--------
+ lib/dpkg/dpkg.h           |   26 +++++++++++++-------------
+ lib/dpkg/ehandle.c        |    2 +-
+ lib/dpkg/mlib.c           |    2 +-
+ lib/dpkg/myopt.h          |    8 ++++----
+ lib/dpkg/parsedump.h      |    4 ++--
+ src/main.c                |    2 +-
+ src/main.h                |    6 +++---
+ utils/start-stop-daemon.c |    4 ++--
+ 14 files changed, 43 insertions(+), 43 deletions(-)
+
+commit 17432e273992d023fe17ab423aec051ea7727c6b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 15 01:41:49 2009 +0200
+
+    libdpkg: Change PRINTFFORMAT to take only one argument
+    
+    Always assume the variable arguments go just after the format string.
+
+ lib/dpkg/dpkg-db.h        |    2 +-
+ lib/dpkg/dpkg-def.h       |    4 ++--
+ lib/dpkg/dpkg.h           |   20 ++++++++++----------
+ lib/dpkg/myopt.h          |    2 +-
+ lib/dpkg/parsedump.h      |    4 ++--
+ src/main.h                |    4 ++--
+ utils/start-stop-daemon.c |    2 +-
+ 7 files changed, 19 insertions(+), 19 deletions(-)
+
+commit 01d05324e0669e3f3585d6aacde696333e49f087
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 15 12:14:29 2009 +0200
+
+    Move libraries to subdirectories under lib/
+    
+    This will allow to use the same include path than the future system
+    one, for example “#include <dpkg/dpkg.h>”. It also unclutters the source
+    topdir.
+
+ Makefile.am                           |    1 -
+ configure.ac                          |    7 ++--
+ dpkg-deb/Makefile.am                  |    7 ++--
+ dpkg-split/Makefile.am                |    7 ++--
+ dselect/Makefile.am                   |    7 ++--
+ lib/Makefile.am                       |   51 ++-------------------------------
+ {libcompat => lib/compat}/Makefile.am |    2 +-
+ {libcompat => lib/compat}/alphasort.c |    0
+ {libcompat => lib/compat}/compat.h    |    0
+ {libcompat => lib/compat}/getopt.c    |    0
+ {libcompat => lib/compat}/getopt.h    |    0
+ {libcompat => lib/compat}/getopt1.c   |    0
+ {libcompat => lib/compat}/gettext.h   |    0
+ {libcompat => lib/compat}/obstack.c   |    0
+ {libcompat => lib/compat}/obstack.h   |    0
+ {libcompat => lib/compat}/scandir.c   |    0
+ {libcompat => lib/compat}/snprintf.c  |    0
+ {libcompat => lib/compat}/strerror.c  |    0
+ {libcompat => lib/compat}/strnlen.c   |    0
+ {libcompat => lib/compat}/strnlen.h   |    0
+ {libcompat => lib/compat}/strsignal.c |    0
+ {libcompat => lib/compat}/unsetenv.c  |    0
+ {libcompat => lib/compat}/vsnprintf.c |    0
+ lib/{ => dpkg}/.gitignore             |    0
+ lib/{ => dpkg}/Makefile.am            |    3 +-
+ lib/{ => dpkg}/cleanup.c              |    0
+ lib/{ => dpkg}/compression.c          |    0
+ lib/{ => dpkg}/database.c             |    0
+ lib/{ => dpkg}/dbmodify.c             |    0
+ lib/{ => dpkg}/dlist.h                |    0
+ lib/{ => dpkg}/dpkg-db.h              |    0
+ lib/{ => dpkg}/dpkg-def.h             |    0
+ lib/{ => dpkg}/dpkg-i18n.h            |    0
+ lib/{ => dpkg}/dpkg-priv.h            |    0
+ lib/{ => dpkg}/dpkg-test.h            |    0
+ lib/{ => dpkg}/dpkg.h                 |    0
+ lib/{ => dpkg}/dump.c                 |    0
+ lib/{ => dpkg}/ehandle.c              |    0
+ lib/{ => dpkg}/fields.c               |    0
+ lib/{ => dpkg}/lock.c                 |    0
+ lib/{ => dpkg}/log.c                  |    0
+ lib/{ => dpkg}/md5.c                  |    0
+ lib/{ => dpkg}/md5.h                  |    0
+ lib/{ => dpkg}/mlib.c                 |    0
+ lib/{ => dpkg}/myopt-util.c           |    0
+ lib/{ => dpkg}/myopt.c                |    0
+ lib/{ => dpkg}/myopt.h                |    0
+ lib/{ => dpkg}/nfmalloc.c             |    0
+ lib/{ => dpkg}/parse.c                |    0
+ lib/{ => dpkg}/parsedump.h            |    0
+ lib/{ => dpkg}/parsehelp.c            |    0
+ lib/{ => dpkg}/path.c                 |    0
+ lib/{ => dpkg}/progress.c             |    0
+ lib/{ => dpkg}/progress.h             |    0
+ lib/{ => dpkg}/showpkg.c              |    0
+ lib/{ => dpkg}/string.c               |    0
+ lib/{ => dpkg}/subproc.c              |    0
+ lib/{ => dpkg}/tarfn.c                |    0
+ lib/{ => dpkg}/tarfn.h                |    0
+ lib/{ => dpkg}/test/.gitignore        |    0
+ lib/{ => dpkg}/test/Makefile.am       |    3 +-
+ lib/{ => dpkg}/test/t-macros.c        |    0
+ lib/{ => dpkg}/test/t-path.c          |    0
+ lib/{ => dpkg}/test/t-pkginfo.c       |    0
+ lib/{ => dpkg}/test/t-string.c        |    0
+ lib/{ => dpkg}/test/t-test.c          |    0
+ lib/{ => dpkg}/test/t-varbuf.c        |    0
+ lib/{ => dpkg}/test/t-version.c       |    0
+ lib/{ => dpkg}/trigdeferred.l         |    0
+ lib/{ => dpkg}/triglib.c              |    0
+ lib/{ => dpkg}/utils.c                |    0
+ lib/{ => dpkg}/varbuf.c               |    0
+ lib/{ => dpkg}/vercmp.c               |    0
+ src/Makefile.am                       |   15 +++++----
+ utils/Makefile.am                     |   10 ++++--
+ 75 files changed, 39 insertions(+), 74 deletions(-)
+
+commit 439f77d84e2d98bfc363fa5b21cae97225df2cef
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Wed Jul 15 21:03:49 2009 +0200
+
+    Dpkg::Shlibs::SymbolFile::load(): use a single object reference everywhere
+    
+    Instead of keeping two variables synchronized (one being the ref of the
+    other), use the reference everywhere. And simplify creation of the
+    initial reference.
+
+ scripts/Dpkg/Shlibs/SymbolFile.pm |   29 ++++++++++++++---------------
+ 1 files changed, 14 insertions(+), 15 deletions(-)
+
+commit e411b5732dd76a157a50778ce96c81115b49332a
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Wed Jul 15 19:38:45 2009 +0300
+
+    Replace local with my in SymbolFile::load() and use strict.
+    
+    Rather than creating an alias with local, manually do $current_object_ref
+    re-referencing. This allows to use 'my $object' and to enable 'use strict'.
+    
+    Signed-off-by: Modestas Vainius <modestas@vainius.eu>
+
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 77f7292128f315e0cd95177241184252604347ce
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Wed Jul 15 16:44:21 2009 +0200
+
+    deb-substvars(5): list fields where substvars do not work
+
+ debian/changelog    |    2 ++
+ man/deb-substvars.5 |    5 +++++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 8e70b9b2f9d16010c614496c0f8f7e9a0d6ced15
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Mon Jun 29 00:18:17 2009 +0300
+
+    dpkg-gensymbols: improve diff label again.
+    
+    Use "$source_file ($package $arch)".
+    
+    Signed-off-by: Modestas Vainius <modestas@vainius.eu>
+
+ debian/changelog           |    3 +++
+ scripts/dpkg-gensymbols.pl |    5 ++++-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit a27d14c4423c44b400764c99b669824f4ba6e9a1
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Wed Jul 15 15:59:03 2009 +0200
+
+    Add new test case for symbols file parsing
+    
+    Ensure that an #include can change the name of the currently parsed
+    library (ELF object).
+
+ scripts/t/200_Dpkg_Shlibs.t                 |    8 +++++++-
+ scripts/t/200_Dpkg_Shlibs/symbols.fake-3    |    5 +++++
+ scripts/t/200_Dpkg_Shlibs/symbols.include-1 |    2 ++
+ 3 files changed, 14 insertions(+), 1 deletions(-)
+
+commit 4bd14c490b63e58798108969ac3a5a1aa2fa04f3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jul 14 12:51:40 2009 +0200
+
+    dselect: Fix typo in package deselection condition
+    
+    The test was always false due to the typo.
+
+ debian/changelog     |    2 ++
+ dselect/pkgdepcon.cc |   10 +++++-----
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+commit e60e66ecf721c971f952a7ce095a545c9e7b718b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jul 14 12:37:58 2009 +0200
+
+    Remove TODO item
+
+ TODO |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 6b0af3e6fa73e9e30f67dc885164244e13ec5d6c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jul 14 12:35:51 2009 +0200
+
+    Add fakeroot to dpkg-dev Recommends
+    
+    Since version 1.14.7, dpkg-buildpackage uses fakeroot by default to
+    obtain (emulated) root privileges.
+    
+    Reported-by: Sven Joachim <svenjoac@gmx.de>
+    Closes: #536821
+
+ debian/changelog |    1 +
+ debian/control   |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 08463d3cafdad1c25b95d23daa16cb70e6bc84a3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jul 14 12:32:53 2009 +0200
+
+    Cleanup eflag value names
+    
+    Remove f and v from value names. Remove duplicated value for reinstreq.
+
+ dselect/pkgdepcon.cc |    7 +++++--
+ lib/database.c       |    4 ++--
+ lib/dpkg-db.h        |    5 ++---
+ lib/dump.c           |    2 +-
+ lib/parse.c          |    2 +-
+ lib/parsehelp.c      |    6 +++---
+ src/archives.c       |    2 +-
+ src/cleanup.c        |   12 ++++++------
+ src/configure.c      |    4 ++--
+ src/enquiry.c        |    5 +++--
+ src/processarc.c     |    8 ++++----
+ src/remove.c         |    4 ++--
+ 12 files changed, 32 insertions(+), 29 deletions(-)
+
+commit fb6c4a7a7a46b8ba7d6e6ff959bf6b23058690bb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jul 14 12:04:47 2009 +0200
+
+    Remove obsolete ‘hold’ and ‘hold-reinstreq’ internal status flags
+    
+    These flags have been obsolete for a long time, and the ‘hold’ part
+    has been converted to the ‘want_hold’ value on database parse. No
+    current system having been upgraded through several Debian releases
+    should have those values in their status database anymore.
+
+ debian/changelog      |    1 +
+ dselect/pkgdisplay.cc |    2 +-
+ lib/dpkg-db.h         |    5 +----
+ lib/dump.c            |    2 +-
+ lib/fields.c          |    4 ----
+ lib/parsehelp.c       |    2 --
+ src/query.c           |    4 ++--
+ 7 files changed, 6 insertions(+), 14 deletions(-)
+
+commit 5bd53bc1a8d179ff1891b0362ac1968b36d31faa
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jul 13 15:10:21 2009 +0200
+
+    Move filesdbinit declaration to filesdb.h
+
+ src/filesdb.h |    2 ++
+ src/main.c    |    1 +
+ src/main.h    |    4 ----
+ 3 files changed, 3 insertions(+), 4 deletions(-)
+
+commit 85a398c3d086424508bcc07abbb1bc678bb130fc
+Author: Branden Robinson <branden@debian.org>
+Date:   Thu Nov 20 07:00:02 2008 +0200
+
+    Fix typo in macro argument
+
+ src/main.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 7f10797af7cda2a8855f6e132ce0163b46c05ada
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Nov 20 07:02:50 2008 +0200
+
+    Fix typo in comment
+
+ src/processarc.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2efaf5ff4af2653bbb69d05568d8628d7cb0e97b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jul 13 14:32:34 2009 +0200
+
+    Inline CONFFOPTCELLS into conffoptcells definition
+    
+    The values in CONFFOPTCELLS are dpkg specific, and not to be found in
+    libdpkg so there's no much point in defining the macro there. Also this
+    makes for clearer code.
+
+ lib/dpkg.h      |    6 ------
+ src/configure.c |    6 +++++-
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+
+commit 1dbc6b9f37317966a956158bca3798328a4f525b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jul 13 14:29:31 2009 +0200
+
+    dpkg: Make conffoptcells static
+
+ src/configure.c |    2 +-
+ src/main.h      |    1 -
+ 2 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 9a979e68fa47c0288e77102e935fa0703821207e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jul 13 13:56:01 2009 +0200
+
+    dpkg: Remove unused cfom_main enum value
+
+ src/main.h |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 2a7cbd9bbad67021e447068521fd60d42e02cb46
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jul 13 02:44:48 2009 +0200
+
+    dpkg-split: Properly check error condition on open when splitting
+
+ dpkg-split/split.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit de24e8d710686a4e271caaccfe3f46a4619ecba1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jul 13 02:27:15 2009 +0200
+
+    dpkg-deb: Remove trailing ‘/’ and ‘/.’ from the directory name on -b
+    
+    When using “dpkg-deb -b” and specifiyng only the directory name to be
+    used as the base name for the package name, remove any trailing
+    characters that would make dpkg-deb create the destination file inside
+    the directory.
+    
+    Closes: #218018, #373602
+
+ debian/changelog |    2 ++
+ dpkg-deb/build.c |    5 ++++-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 9d8edc5884220596d612f7274ec77a3aba701545
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 12 23:55:05 2009 +0200
+
+    Remove unused assert.h includes
+
+ dpkg-split/split.c  |    1 -
+ dselect/basecmds.cc |    2 --
+ dselect/bindings.cc |    1 -
+ src/cleanup.c       |    1 -
+ src/divertdb.c      |    1 -
+ src/statdb.c        |    1 -
+ src/trigcmd.c       |    1 -
+ src/update.c        |    1 -
+ 8 files changed, 0 insertions(+), 9 deletions(-)
+
+commit 410a4e08a6eec83000c8c974d98f64523ee8a973
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 12 23:05:03 2009 +0200
+
+    man: Document “hold” as package selection state instead of flag
+
+ debian/changelog |    1 +
+ man/dpkg.1       |    8 ++++----
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+commit 7043dca96e2d568242558b457b79ac805c46113f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 12 22:45:49 2009 +0200
+
+    Update TODO list
+
+ TODO |   14 ++++++++++++--
+ 1 files changed, 12 insertions(+), 2 deletions(-)
+
+commit f09acc9d384bd85cd9b3f87ba8d57edbbf64661b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 12 22:19:45 2009 +0200
+
+    Reschedule roadmap and feature removals in relation to versions
+    
+    Use versions instead of Debian specific releases, although we map minor
+    versions to Debian releases.
+
+ README.feature-removal-schedule |   10 +++++-----
+ TODO                            |   24 +++++++++---------------
+ 2 files changed, 14 insertions(+), 20 deletions(-)
+
+commit a9761ebe6bd5b99bece2a156e717b2af94d0eab0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 12 21:38:16 2009 +0200
+
+    dpkg: Coalesce similar “takes no arguments” strings
+    
+    Move the option name to an argument to reuse existing translations.
+
+ src/trigcmd.c |    3 ++-
+ src/update.c  |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 224f0285abc304bec059e6144778177c2eed06ee
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 12 20:11:53 2009 +0200
+
+    Obsolete --forget-old-unavail
+    
+    On parse mark not-installed leftover packages for automatic removal from
+    the database on next dump. The states we consider for removal are
+    want_purge, want_deinstall and want_hold. The latter being the ancient
+    default for not-installed packages.
+    
+    This makes the --forget-old-unavail option not useful anymore, so switch
+    it to be a no-op, and target it for future removal as obsolescent.
+    
+    Closes: #33394, #429262
+
+ README.feature-removal-schedule |    9 +++++++++
+ debian/changelog                |    3 +++
+ dselect/methods/disk/update     |    2 --
+ lib/parse.c                     |   13 +++++++++++++
+ man/dpkg.1                      |    3 ++-
+ src/update.c                    |   31 ++-----------------------------
+ 6 files changed, 29 insertions(+), 32 deletions(-)
+
+commit 6c6ec4a438f889e90f4741fd7780eb6626e933e1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 12 20:02:56 2009 +0200
+
+    dpkg: Properly mark packages being purged for disappearance
+    
+    When a package has been purged, it should be marked as want_unknown
+    and the configversion blanked, otherwise dpkg considers it to still
+    be informative and keeps it around, which needs later on manual
+    intervention from the user to clean up the database.
+
+ debian/changelog |    3 +++
+ src/processarc.c |    3 ++-
+ src/remove.c     |    2 ++
+ 3 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 896b469211b21a01c847946240f2d003d3dfb71b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 10 21:50:56 2009 +0200
+
+    libdpkg: Use isblank instead of ad-hoc comparisons
+
+ lib/parsehelp.c |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+commit 66dff5a82489c9daf85876492fb1969041c181e9
+Author: Milo Casagrande <milo@ubuntu.com>
+Date:   Sat Jul 11 07:24:31 2009 +0200
+
+    Italian translation updated
+
+ debian/changelog |    1 +
+ po/it.po         | 3421 +++++++++++++++++++++++++-----------------------------
+ 2 files changed, 1553 insertions(+), 1869 deletions(-)
+
+commit f0525ce3409b3dc5422a5b0c5cc28197c55cb015
+Merge: 939b0c0 30f797c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jul 10 12:12:03 2009 +0200
+
+    Merge branch 'sid' (through tag '1.15.3.1')
+    
+    Conflicts:
+    	configure.ac
+    	debian/changelog
+
+commit 939b0c0f90d145dda2918beec6bfb48694528503
+Author: Holger Wansing <linux@wansing-online.de>
+Date:   Thu Jul 9 21:23:25 2009 +0200
+
+    Fix poor wording in German dpkg translation
+
+ po/de.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 30f797c7c1fa1bac2388e47d1c28302804a9c53b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 8 11:26:55 2009 +0200
+
+    Release 1.15.3.1
+
+ configure.ac     |    2 +-
+ debian/changelog |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit fd4d99862af837ccf12e83d13da73e8ffb24aa17
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Sun Jun 28 23:59:06 2009 +0300
+
+    Fix wildcard support in symbol files
+    
+    They were broken due to typo. Also add a test for wildcards.
+    
+    Signed-off-by: Modestas Vainius <modestas@vainius.eu>
+
+ debian/changelog                  |    3 ++-
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    2 +-
+ scripts/t/200_Dpkg_Shlibs.t       |   13 ++++++++++++-
+ 3 files changed, 15 insertions(+), 3 deletions(-)
+
+commit 9d0fe91f2291dc5b9ceed8f63a1fc006f20e36ed
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 8 11:13:54 2009 +0200
+
+    Bump version to 1.15.3.1~
+
+ configure.ac     |    2 +-
+ debian/changelog |    6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit fd2fd13cb3d63e6fbe55eab75a26f5ac217f55c7
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Jul 6 18:20:38 2009 +0200
+
+    Update german translation of manual pages
+    
+    Update to 1664t0u0f.
+
+ man/po/de.po |   11 +++++------
+ 1 files changed, 5 insertions(+), 6 deletions(-)
+
+commit 932d6ff120001545f0e39a89a77b294744274591
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Jul 5 08:35:28 2009 +0200
+
+    Update German scripts translation
+    
+    Update to 474t.
+
+ debian/changelog |    3 +
+ scripts/po/de.po |  181 ++++++++++++++++++++++++++----------------------------
+ 2 files changed, 90 insertions(+), 94 deletions(-)
+
+commit 30269085225c9b0a6bfd972cc2dda562cae7be0b
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Jul 4 15:24:37 2009 +0200
+
+    Fix minor translation error in scripts/po/de.po
+
+ scripts/po/de.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e48d19ed49520effe79af9ed5c9dc7e744cb1137
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Fri Jul 3 17:34:22 2009 +0200
+
+    Fix typo (unexecpted -> unexpected)
+
+ src/statdb.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit cdd6ef8d473bdae7a7c1166075c8355ddb6d0361
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Fri Jul 3 17:31:21 2009 +0200
+
+    German dpkg translation update
+    
+    Update to 1005t8f.
+
+ debian/changelog |    3 ++-
+ po/de.po         |   18 +++++++++---------
+ 2 files changed, 11 insertions(+), 10 deletions(-)
+
+commit 724ddc2dd8ce11dc30249dcb6023b0b8f56a739d
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Fri Jul 3 15:58:20 2009 +0200
+
+    Update Standards-Version to 3.8.2
+
+ debian/changelog |    1 +
+ debian/control   |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 4a1e8173f63c1c7a6807aa76280fc8aec128bc81
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Fri Jul 3 15:43:29 2009 +0200
+
+    Fix dpkg's preinst when alternatives dir contains unexpected subdirs
+    
+    Adjust the lintian overrides accordingly.
+
+ debian/changelog              |    2 ++
+ debian/dpkg.lintian-overrides |    6 +++---
+ debian/dpkg.preinst           |    5 +++--
+ 3 files changed, 8 insertions(+), 5 deletions(-)
+
+commit 49c5d0bbe00b3922fb07efae60fd65bb91c64bb1
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Fri Jul 3 15:35:50 2009 +0200
+
+    Add changelog entry for the install-info transition
+
+ TODO             |    1 +
+ debian/changelog |    7 +++++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 72d4a9154d0f7ac2d9a1adad3dd59368d9d86c2f
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Tue Jun 30 12:20:30 2009 +0200
+
+    Breaks: xemacs21-support instead instead of all xemacs21-*
+    
+    The maintainer decided to factorize the install-info dependency
+    in the xemacs21-support package so we should ensure that this
+    package gets upgraded and not only the other ones.
+
+ debian/control |    7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
+
+commit dd7baf825098209e1b311b3b5e19eaf8c18fe800
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Thu Jun 25 23:17:18 2009 +0200
+
+    Add breaks against all info-browsers that do not depend on install-info
+
+ debian/control |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 1b5209ec9b15a3ccccdf80f5e9ebfe102116a6d8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Mar 17 02:48:38 2009 +0200
+
+    install-info: Improve a bit the warning messages
+
+ utils/install-info.c |   17 +++++++++--------
+ 1 files changed, 9 insertions(+), 8 deletions(-)
+
+commit 06065fb42580849874dc94a7b7a2bcc0bd2798c3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Mar 17 02:41:21 2009 +0200
+
+    install-info: Print buggy maintainer script package in warning
+
+ utils/install-info.c |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 6859b8af0f9ce00cc25e84d6d1fcb4fb4eae09f7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Mar 17 02:39:12 2009 +0200
+
+    install-info: Use macros for warn and error output
+
+ utils/install-info.c |   38 ++++++++++++++++++++------------------
+ 1 files changed, 20 insertions(+), 18 deletions(-)
+
+commit 20dcd4f212fe9cfe928349de2d5a1ace735e18e9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Mar 17 02:35:33 2009 +0200
+
+    install-info: Generalize by using macros for paths
+
+ utils/install-info.c |   25 ++++++++++++++-----------
+ 1 files changed, 14 insertions(+), 11 deletions(-)
+
+commit ee31b22c9f3ccde710110e8512a2223b2ce35795
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Mar 17 02:20:16 2009 +0200
+
+    install-info: Add missing stdlib.h
+    
+    Fix build failure, getenv is declared in stdlib.h.
+
+ utils/install-info.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit e1f03a94a08efb9de3736ff8b9c7c3fe24cda50e
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Mar 17 02:18:18 2009 +0200
+
+    Use autoconf AC_ARG_PROGRAM support to rename install-info
+    
+    Rename the binary on install to avoid colliding with autoconf's
+    install-info builtin targets.
+
+ utils/.gitignore  |    3 +--
+ utils/Makefile.am |   19 ++++++++-----------
+ 2 files changed, 9 insertions(+), 13 deletions(-)
+
+commit c23407d285734d66aca07ecfbb45d7f8604ce706
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Fri Mar 13 15:47:52 2009 +0100
+
+    Replace install-info by a simple wrapper (or no-op command)
+    
+    In order to properly transition to GNU's install-info, dpkg's install-info
+    is modified to be a simple wrapper around /usr/bin/install-info. That
+    wrapper warns when the user explicitely calls /usr/sbin/install-info since
+    the new install-info is in /usr/bin/.
+    
+    This wrapper is meant to be removed at some point when all references
+    to /usr/sbin/install-info have gone (most probably in squeeze+1).
+    
+    Also remove the manual page since there's nothing to document any more
+    and add a lintian override until the wrapper is removed.
+    
+    Reference: http://wiki.debian.org/Transitions/DpkgToGnuInstallInfo
+
+ TODO                          |    2 -
+ debian/dpkg.install           |    1 -
+ debian/dpkg.lintian-overrides |    2 +
+ man/Makefile.am               |    1 -
+ man/install-info.8            |  295 -----------------------
+ man/po/po4a.cfg               |    5 -
+ po/POTFILES.in                |    1 -
+ scripts/.gitignore            |    2 -
+ scripts/Makefile.am           |   16 +--
+ scripts/install-info.pl       |  524 -----------------------------------------
+ utils/.gitignore              |    2 +
+ utils/Makefile.am             |   13 +
+ utils/install-info.c          |   65 +++++
+ 13 files changed, 83 insertions(+), 846 deletions(-)
+
+commit 645a9e329f874a470ae837d93525c769a0df4ec8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 2 11:24:08 2009 +0200
+
+    libdpkg: Refactor parsedb_state into a new structure
+    
+    Move state variables into a new struct and pass that instead of each of
+    them to the error, warning and field parsing functions. This is cleaner,
+    and should be “marginally” faster.
+
+ TODO            |    1 -
+ lib/fields.c    |  159 +++++++++++++++++++++++++-----------------------------
+ lib/parse.c     |   66 +++++++++++++----------
+ lib/parsedump.h |   25 +++++----
+ lib/parsehelp.c |   33 ++++++------
+ 5 files changed, 142 insertions(+), 142 deletions(-)
+
+commit bfb8cccada43b32dee587da80f38ce1b207aa9b1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 2 10:50:43 2009 +0200
+
+    libdpkg: Initialize parse lno to 0 to avoid decrementing it on rcall
+
+ lib/parse.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 2fa9eb87bba4fdb33635228f60a54b89f59292da
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 2 10:50:25 2009 +0200
+
+    Add dpkg-vendor to .gitignore
+
+ scripts/.gitignore |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 6aaa8c10678d5af3dd6e2026c0a48ac9cb1da789
+Author: Marcos Alvarez Costales <marcos.alvarez.costales@gmail.com>
+Date:   Wed Jul 1 20:57:03 2009 +0200
+
+    Asturian translation update
+
+ debian/changelog |    1 +
+ po/ast.po        |   25 +++++++++++++------------
+ 2 files changed, 14 insertions(+), 12 deletions(-)
+
+commit ebb721df8997021b6f6a3fcaa8be1450949e6dd4
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 1 10:23:19 2009 +0200
+
+    dpkg-scanpackages: Do not handle the Revision field
+    
+    This field has already been parsed and handled by “dpkg-deb -I”.
+    The code is doubly useless, as additionally the version comparison is
+    done before the Revision has been folded into the Version field.
+
+ debian/changelog             |    2 +-
+ scripts/dpkg-scanpackages.pl |    5 -----
+ 2 files changed, 1 insertions(+), 6 deletions(-)
+
+commit e6c2713bd4d59a88d1ae5234a4224416e0e9fa08
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 1 10:09:46 2009 +0200
+
+    dpkg-scanpackages: Do not remap obsolete fields
+    
+    Those fields have been remappedd already by “dpkg-deb -I”.
+
+ debian/changelog             |    2 ++
+ scripts/dpkg-scanpackages.pl |    7 -------
+ 2 files changed, 2 insertions(+), 7 deletions(-)
+
+commit ee157886303518ef56598f843d29c63349232391
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 1 09:21:18 2009 +0200
+
+    dpkg-scansources: Reduce variable scope in process_dsc
+    
+    Move them closer to their actual usage.
+
+ scripts/dpkg-scansources.pl |   13 ++++++-------
+ 1 files changed, 6 insertions(+), 7 deletions(-)
+
+commit 7602026aff2452f6d723a87146340f4ed3e3d863
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 1 09:17:47 2009 +0200
+
+    dpkg-scansources: Switch to use Dpkg::Cdata
+    
+    Use our modules instead of duplicating the .dsc parsing code. As a
+    side effect it now handles properly bogus files.
+
+ debian/changelog            |    2 +
+ scripts/dpkg-scansources.pl |  273 +++++++++++--------------------------------
+ 2 files changed, 70 insertions(+), 205 deletions(-)
+
+commit 396d3c27c10884d758b434a9ac637e709bf320b5
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue Jun 30 21:46:10 2009 +0200
+
+    Update german translation of manual pages
+    
+    Update to 1662t0u2f.
+
+ debian/changelog    |    3 +
+ man/po/de.po        |   21 +-
+ man/po/dpkg-man.pot | 2093 +++++++++++++++++++++++++++++++++++++--------------
+ 3 files changed, 1556 insertions(+), 561 deletions(-)
+
+commit a15532403f172d790031a71044f585578366e605
+Author: Jens Seidel <jensseidel@users.sf.net>
+Date:   Tue Jun 30 21:38:01 2009 +0200
+
+    Proofreading
+
+ man/po/de.po |   26 +++++++++++++-------------
+ 1 files changed, 13 insertions(+), 13 deletions(-)
+
+commit 0b413ae85fda839c47cfc35a9ffd0189889e0b67
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Tue Jun 30 07:29:12 2009 +0200
+
+    French translation update
+
+ debian/changelog |    4 +++
+ po/fr.po         |   77 +++++++++++++++++++----------------------------------
+ 2 files changed, 32 insertions(+), 49 deletions(-)
+
+commit ed4065c246bba34784b6babaff3a9a6b93fcc793
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jun 29 09:34:20 2009 +0200
+
+    dpkg-name: Do not handle Revision and Package_Revision fields
+    
+    Those fields have already been parsed and handled by “dpkg-deb -I”.
+
+ debian/changelog     |    2 ++
+ scripts/dpkg-name.pl |    5 -----
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+commit afcdfe571e8d20832996ec8d4593744fab3b52c1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jun 29 09:23:17 2009 +0200
+
+    dpkg-name: Fix inverted logic when deciding to assume the architecture
+    
+    This gets triggered when the package does not have such field.
+
+ debian/changelog     |    2 ++
+ scripts/dpkg-name.pl |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit e9c3e59475b7bcf0201b3c5a936c1f4f87382022
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jun 29 09:20:00 2009 +0200
+
+    dpkg-name: Call _g instead of g_
+
+ debian/changelog     |    1 +
+ scripts/dpkg-name.pl |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 34181ce3a1cf466af9ac2e94f68b60cbdfaf57c8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 27 19:26:03 2009 +0200
+
+    Bump version to 1.15.4~
+
+ configure.ac     |    2 +-
+ debian/changelog |    5 +++++
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 16199a8951e656bf3ef2fda67cb554a26fad785d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 27 19:07:16 2009 +0200
+
+    Release 1.15.3
+
+ configure.ac     |    2 +-
+ debian/changelog |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit d8338f3164508f8f4c1b6276c9c381e06acf663d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 27 19:04:56 2009 +0200
+
+    Add new scripts test cases to EXTRA_DIST
+
+ scripts/Makefile.am |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit b75b971b90c2d31d5fc3a675966f29c99d6f0cde
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 27 18:50:52 2009 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ man/po/de.po            | 1752 +++++++++++++++++++++++++++++++++++++++++++++-
+ man/po/dpkg-man.pot     |  217 ++++---
+ man/po/es.po            |  238 ++++---
+ man/po/fr.po            |  244 ++++---
+ man/po/hu.po            |  239 ++++---
+ man/po/ja.po            |  237 ++++---
+ man/po/pl.po            |  241 ++++---
+ man/po/pt_BR.po         |  239 ++++---
+ man/po/ru.po            |  236 ++++---
+ man/po/sv.po            |  288 +++++----
+ po/ast.po               |  701 ++++++++++----------
+ po/bs.po                |  690 ++++++++++---------
+ po/ca.po                |  714 ++++++++++----------
+ po/cs.po                |  724 ++++++++++----------
+ po/da.po                |  717 ++++++++++----------
+ po/de.po                |  701 ++++++++++----------
+ po/dpkg.pot             |  690 ++++++++++---------
+ po/dz.po                |  717 ++++++++++----------
+ po/el.po                |  719 ++++++++++----------
+ po/eo.po                |  701 ++++++++++----------
+ po/es.po                |  718 ++++++++++----------
+ po/et.po                |  711 ++++++++++----------
+ po/eu.po                |  701 ++++++++++----------
+ po/fr.po                |  735 ++++++++++----------
+ po/gl.po                |  719 ++++++++++----------
+ po/hu.po                |  717 ++++++++++----------
+ po/id.po                |  717 ++++++++++----------
+ po/it.po                |  717 ++++++++++----------
+ po/ja.po                |  717 ++++++++++----------
+ po/km.po                |  717 ++++++++++----------
+ po/ko.po                |  719 ++++++++++----------
+ po/ku.po                |  694 ++++++++++----------
+ po/lt.po                |  719 ++++++++++----------
+ po/mr.po                |  717 ++++++++++----------
+ po/nb.po                |  719 ++++++++++----------
+ po/ne.po                |  717 ++++++++++----------
+ po/nl.po                |  717 ++++++++++----------
+ po/nn.po                |  719 ++++++++++----------
+ po/pa.po                |  694 ++++++++++----------
+ po/pl.po                |  718 ++++++++++----------
+ po/pt.po                |  719 ++++++++++----------
+ po/pt_BR.po             |  717 ++++++++++----------
+ po/ro.po                |  724 ++++++++++----------
+ po/ru.po                |  703 ++++++++++----------
+ po/sk.po                |  703 ++++++++++----------
+ po/sv.po                |  233 ++++---
+ po/th.po                |  717 ++++++++++----------
+ po/tl.po                |  717 ++++++++++----------
+ po/vi.po                |  717 ++++++++++----------
+ po/zh_CN.po             |  701 ++++++++++----------
+ po/zh_TW.po             |  717 ++++++++++----------
+ scripts/po/ca.po        |  606 +++++++++--------
+ scripts/po/de.po        |  125 ++--
+ scripts/po/dpkg-dev.pot |  583 ++++++++--------
+ scripts/po/fr.po        |  661 ++++++++++--------
+ scripts/po/pl.po        |  655 ++++++++++--------
+ scripts/po/ru.po        |  655 ++++++++++--------
+ scripts/po/sv.po        |  423 ++++++------
+ 58 files changed, 19371 insertions(+), 17012 deletions(-)
+
+commit 3cc5a5bf4b6da9facf36c52bb97889a5ce2fd681
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 27 19:04:14 2009 +0200
+
+    Add new files to POTFILES
+
+ po/POTFILES.in |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 4401640147126170df7d188545b8ecd4ffd21d29
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sat Jun 27 18:46:36 2009 +0200
+
+    man: Remove non dot prefixed type field
+    
+    This seems to be obsolete and now the field has the form “#. type: ”.
+    Which gets duplicated with the old form.
+
+ man/po/de.po    | 1798 -----------------------------------------------------
+ man/po/es.po    | 1862 -------------------------------------------------------
+ man/po/fr.po    | 1855 ------------------------------------------------------
+ man/po/hu.po    | 1708 --------------------------------------------------
+ man/po/ja.po    | 1812 -----------------------------------------------------
+ man/po/pl.po    | 1683 -------------------------------------------------
+ man/po/pt_BR.po | 1743 ---------------------------------------------------
+ man/po/ru.po    | 1740 ---------------------------------------------------
+ man/po/sv.po    | 1718 --------------------------------------------------
+ 9 files changed, 0 insertions(+), 15919 deletions(-)
+
+commit c5b980dacefe000cc09694e0e7313fea5a43acfe
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 26 20:02:27 2009 +0200
+
+    dpkg-deb: Remove unused FILE variable
+    
+    Now that we are not closing gzfd indirectly by fclosing gz, we close it
+    explicitly.
+
+ dpkg-deb/build.c |    8 ++------
+ 1 files changed, 2 insertions(+), 6 deletions(-)
+
+commit 4308a347c5c17ab627f10bb77a98388162646d18
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Sat Jun 27 16:32:13 2009 +0200
+
+    Fix quotation marks in German dpkg translation
+
+ debian/changelog |    5 +++--
+ po/de.po         |    6 +++---
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+commit a3e560fe5d095e989dcfcda1935e51d72b82b780
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 26 05:16:05 2009 +0200
+
+    libdpkg-perl: Move unknown() from Dpkg::ErrorHandling to Dpkg::Fields
+
+ debian/changelog              |    1 +
+ scripts/Dpkg/ErrorHandling.pm |   10 +---------
+ scripts/Dpkg/Fields.pm        |   12 +++++++++++-
+ scripts/dpkg-genchanges.pl    |    4 ++--
+ scripts/dpkg-gencontrol.pl    |    4 ++--
+ scripts/dpkg-source.pl        |    4 ++--
+ 6 files changed, 19 insertions(+), 16 deletions(-)
+
+commit b05060cb961a6dcb1eac5cc1796058dbc2bdbfad
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 26 05:05:49 2009 +0200
+
+    Dpkg::ErrorHandling: Explicitly pass field argument to unknown()
+
+ debian/changelog              |    1 +
+ scripts/Dpkg/ErrorHandling.pm |    8 ++++----
+ scripts/dpkg-genchanges.pl    |    6 +++---
+ scripts/dpkg-gencontrol.pl    |    6 +++---
+ scripts/dpkg-source.pl        |    6 +++---
+ 5 files changed, 14 insertions(+), 13 deletions(-)
+
+commit 3862c3e7fe882c61c53f62294fd84dddee9d2f46
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 26 04:50:33 2009 +0200
+
+    libdpkg-perl: Import Exporter with ‘use base’
+    
+    We don't need to set @ISA now.
+
+ scripts/Dpkg/Arch.pm             |    3 +--
+ scripts/Dpkg/Cdata.pm            |    3 +--
+ scripts/Dpkg/Deps.pm             |    2 +-
+ scripts/Dpkg/Fields.pm           |    3 +--
+ scripts/Dpkg/IPC.pm              |    3 +--
+ scripts/Dpkg/Path.pm             |    3 +--
+ scripts/Dpkg/Source/Functions.pm |    3 +--
+ scripts/Dpkg/Vars.pm             |    3 +--
+ scripts/Dpkg/Vendor.pm           |    3 +--
+ scripts/Dpkg/Version.pm          |    3 +--
+ 10 files changed, 10 insertions(+), 19 deletions(-)
+
+commit 0e1e63afa089bca6f70a574f11033b724a6fc3c8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 26 04:04:16 2009 +0200
+
+    dpkg-scanpackages: Remove commented out code
+
+ scripts/dpkg-scanpackages.pl |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 0d887820bcb55b60aa423a428eb4919c12acf577
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 26 03:32:12 2009 +0200
+
+    Unclaim bug closure
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e29457dd5f8bfc8f6fc913b1899919f98be93bd7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 26 03:30:57 2009 +0200
+
+    man:  Mark argument names in dpkg-statoverride.1 in italic
+
+ debian/changelog        |    1 +
+ man/dpkg-statoverride.8 |   10 +++++-----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+commit ee21a3b9443f7a7a643fa1d41bf1ba2b93e32ccb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 26 02:10:53 2009 +0200
+
+    man: Document in dpkg-statoverride the format to specify mode
+    
+    Closes: #534551
+
+ debian/changelog        |    2 ++
+ man/dpkg-statoverride.8 |    3 ++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit a3454abb5b83ac12aec5c52f2ae4492faf6890c8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 26 01:52:58 2009 +0200
+
+    dpkg-split: Use the correct units (KiB) when referring to partsize
+
+ debian/changelog  |    1 +
+ dpkg-split/main.c |    2 +-
+ man/dpkg-split.1  |    4 ++--
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+commit d30fdccff56e8ed63e81e7e114c421d5c806d8e7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 21 16:46:30 2008 +0200
+
+    libdpkg: Do not try to close already closed files
+
+ debian/changelog |    1 +
+ lib/triglib.c    |   11 +++++++++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+commit d5ad25d85434acd7a4532334db2381a03d288ccd
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jun 24 05:51:33 2009 +0200
+
+    libdpkg: Suffix path related function names with ‘path_’
+
+ lib/dpkg-priv.h   |    4 ++--
+ lib/fields.c      |    2 +-
+ lib/path.c        |    4 ++--
+ lib/test/t-path.c |   26 +++++++++++++-------------
+ src/filesdb.c     |    2 +-
+ src/help.c        |    2 +-
+ src/query.c       |    2 +-
+ 7 files changed, 21 insertions(+), 21 deletions(-)
+
+commit fe930e9bb3e195825cce98e4abe825459a7e81e7
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Thu Jun 25 21:43:29 2009 +0200
+
+    Dpkg::Deps: fix dependency parsing code
+    
+    Fix dependency parsing code in Dpkg::Deps to not accept "foo\nbar"
+    even if foo is valid. A regex was improperly matching "\n" as
+    end of string due to usage of the "m" modifier.
+    
+    Also improve the warning displayed when the dependency can't be parsed.
+    
+    Add a non-regression test to ensure that this problem doesn't come back.
+    
+    Reported-by: Andrew Sayers <andrew-dpkg@pileofstuff.org>
+
+ debian/changelog          |    3 +++
+ scripts/Dpkg/Deps.pm      |    4 ++--
+ scripts/t/400_Dpkg_Deps.t |    7 ++++++-
+ 3 files changed, 11 insertions(+), 3 deletions(-)
+
+commit 2cf5b0f90d4fae8c6287fa0a44e84270ad5326d6
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Tue Jun 23 08:58:35 2009 +0200
+
+    Remove all invalid master alternatives found
+    
+    Initially I wanted to cleanup only problematic cases thinking that there
+    would be few. But apparently there must be an old version of
+    update-alternatives that created improper entries for slave alternatives
+    in /var/lib/dpkg/alternatives so I do a full scan once when we upgrade
+    from a version older than 1.15.3 and hope that we can forget about those
+    upgrade issues after that.
+
+ debian/changelog              |    4 ++--
+ debian/dpkg.lintian-overrides |    5 +++++
+ debian/dpkg.preinst           |   38 ++++++++++++++++++++++++++------------
+ 3 files changed, 33 insertions(+), 14 deletions(-)
+
+commit 85f2eb4dca5ad99cbbb014a5ab88019b06839068
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Jun 22 11:35:58 2009 +0200
+
+    Fix a spelling error in changelog (thanks lintian)
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 52ff937b5b8028dfa0745daafe913397a4e0b7cd
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Jun 22 11:21:19 2009 +0200
+
+    Dpkg::Shlibs::Objdump::get_symbol(): try fallback name for version-less symbols
+    
+    This also fixes the test suite as it was broken by the rename
+    of version-less symbols in "<name>@Base".
+
+ scripts/Dpkg/Shlibs/Objdump.pm |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit a3587e15b82e0f3a7367769307fe181c8151ce79
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Jun 21 22:29:48 2009 +0200
+
+    Dpkg::Shlibs::Objdump: assume version Base when no associated version
+    
+    This completes the fix started in
+    211c62c45d5f3d5f8ee3dc26668cd5a04e889076.
+
+ scripts/Dpkg/Shlibs/Objdump.pm |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d9c6694ce42d0e26b6c8dd06a74a26d55a6124c6
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Jun 21 21:49:05 2009 +0200
+
+    Update german scripts translation
+    
+    Update to 481t0f0u.
+
+ scripts/po/de.po |  349 +++++++++++++++++++++++++++---------------------------
+ 1 files changed, 174 insertions(+), 175 deletions(-)
+
+commit 63af4da6d1a2842df53db2e93e1ceca58d1b7615
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Sun Jun 21 10:52:09 2009 +0200
+
+    Dpkg::Shlibs::SymbolFile: support subclassing of Symbol object
+    
+    This change makes it easier to replace Dpkg::Shlibs::Symbol with
+    a derivative class by passing an appropriate $base_symbol parameter
+    in load().
+
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+commit da815b18f46b56b4897153b68041cafda21d087f
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Sun Jun 21 10:50:31 2009 +0200
+
+    dpkg-gensymbols(1): escape more minus signs
+
+ man/dpkg-gensymbols.1 |   14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 1ae77b82cff5462acffad67e2999973df880f0b7
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Jun 21 02:35:04 2009 +0200
+
+    dpkg-scan(packages|sources): support all checksums algo
+    
+    Use Dpkg::Checksums to generate all supported checksums when possible.
+
+ debian/changelog             |    2 +
+ scripts/dpkg-scanpackages.pl |   33 +++++++++++++++---------
+ scripts/dpkg-scansources.pl  |   56 ++++++++++++++++++------------------------
+ 3 files changed, 46 insertions(+), 45 deletions(-)
+
+commit f60b961d1909103eb6ab68efe9009c4b9580ebda
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Jun 21 00:42:37 2009 +0200
+
+    dpkg-genchanges: skip warning about lower version for backports
+    
+    Backports have by definition a version number lower than the original
+    version (to enable upgrades from backports to official packages). So skip
+    the corresponding warning when backports are detected thanks to the
+    usual version suffixes ~bpo (backports.org) and ~vola (volatile.d.o).
+
+ debian/changelog           |    2 ++
+ scripts/dpkg-genchanges.pl |    4 +++-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 012ac74f876b7031165a782dbfeb3f43692bf382
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Jun 21 00:27:44 2009 +0200
+
+    Dpkg::Vendor::get_vendor_file(): replaces spaces by dashes
+    
+    Also lookup filenames with dashes replacing spaces in the name
+    of the vendor.
+
+ debian/changelog       |    2 ++
+ scripts/Dpkg/Vendor.pm |    6 +++++-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 0a3d3fe21b629b55005c14889faaf8f84c4967c7
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Jun 21 00:16:54 2009 +0200
+
+    dpkg-source: ensure trustedkeys.gpg is used to check signatures
+
+ debian/changelog               |    3 +++
+ scripts/Dpkg/Source/Package.pm |    3 +++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit ffc5049d6a0faa7b63c423bbb256e7d70662bc7c
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sat Jun 20 23:39:53 2009 +0200
+
+    Dpkg::Shlibs::SymbolFile: add missing explanation
+
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 0bdf342a69be47a5d7654114539854ea87702216
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sat Jun 20 23:08:09 2009 +0200
+
+    Dpkg::Substvars: restructure to have a separate namespace for variables
+    
+    The addition of “_used” in the structure was in conflict with
+    a possible variable of the same name. So put the variables in
+    a dedicated hash to avoid this conflict and rename “_used” into
+    “used”.
+    
+    Correct the warning message too.
+    
+    Also add Joachim in the THANKS file for his contribution.
+
+ THANKS                         |    1 +
+ scripts/Dpkg/Substvars.pm      |   64 ++++++++++++++++++++-------------------
+ scripts/t/750_Dpkg_Substvars.t |    2 +-
+ 3 files changed, 35 insertions(+), 32 deletions(-)
+
+commit d60bb3e211d9496653d5061c112ce3092998fe11
+Author: Joachim Breitner <mail@joachim-breitner.de>
+Date:   Sat Jun 13 23:33:08 2009 +0200
+
+    dpkg-gencontrol: warn about unused substvars (closes: #532760)
+    
+    The change to Dpkg/Fields.pm is required to avoid unwanted warnings
+    on the F:<fieldname> substitutions.
+
+ debian/changelog           |    3 +++
+ scripts/Dpkg/Fields.pm     |    1 +
+ scripts/dpkg-gencontrol.pl |    2 ++
+ 3 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 69bee88969bc7766a4e2066927f1069b551fba2b
+Author: Joachim Breitner <mail@joachim-breitner.de>
+Date:   Sat Jun 13 23:25:23 2009 +0200
+
+    Dpkg::Substvars: track unused substitutions and add warning function
+    
+    This commit adds tracking of used variables in Dpkg::Substvars. It adds
+    two new methods, no_warn() to disable warnings about one of the
+    variables, warn_about_unused() to issue warnings (via
+    Dpkg::ErrorHandling::warning()).
+    
+    The test suite is extended accordingly.
+
+ scripts/Dpkg/Substvars.pm      |   46 ++++++++++++++++++++++++++++++++++++++++
+ scripts/t/750_Dpkg_Substvars.t |   18 ++++++++++++++-
+ 2 files changed, 63 insertions(+), 1 deletions(-)
+
+commit 38b79ccbca7460f0f39daf5baa1d7036464f5b0d
+Author: Joachim Breitner <mail@joachim-breitner.de>
+Date:   Sat Jun 13 22:54:49 2009 +0200
+
+    Dpkg::Substvars: add non-regression test suite
+
+ scripts/t/750_Dpkg_Substvars.t          |   74 +++++++++++++++++++++++++++++++
+ scripts/t/750_Dpkg_Substvars/substvars1 |    9 ++++
+ 2 files changed, 83 insertions(+), 0 deletions(-)
+
+commit bf4582423b44556f05744e7633d7d56a75fc77c9
+Author: Joachim Breitner <mail@joachim-breitner.de>
+Date:   Sat Jun 13 22:38:06 2009 +0200
+
+    Dpkg::Substvars: allow spaces in front of comments in substvars
+    
+    Principle of least surprise.
+
+ scripts/Dpkg/Substvars.pm |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c43ba8d76c43514206e467211295d8532944a61f
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sat Jun 20 21:45:48 2009 +0200
+
+    dpkg-gensymbols: add new “ignore-blacklist” tag
+    
+    Add new tag "ignore-blacklist" to force-include symbols which are
+    normally blacklisted. This can be useful for libgcc to include symbols
+    that the toolchain allows to be shared but that are often static
+    (and hence are blacklisted for this reason). Closes: #533642
+
+ debian/changelog                  |    4 ++++
+ man/dpkg-gensymbols.1             |    8 ++++++++
+ scripts/Dpkg/Shlibs/SymbolFile.pm |   13 +++++++------
+ 3 files changed, 19 insertions(+), 6 deletions(-)
+
+commit b8b229b61746b5bc5ecd51ccc961687f318e278d
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sat Jun 20 22:07:47 2009 +0200
+
+    Dpkg::Shlibs::Symbol: add new has_tag() and get_tag_value() functions
+
+ scripts/Dpkg/Shlibs/Symbol.pm |   14 ++++++++++++--
+ 1 files changed, 12 insertions(+), 2 deletions(-)
+
+commit 211c62c45d5f3d5f8ee3dc26668cd5a04e889076
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sat Jun 20 20:55:46 2009 +0200
+
+    Dpkg::Shlibs::SymbolFile: assume an implicit version "Base" for unversioned symbols
+
+ debian/changelog                  |    2 ++
+ scripts/Dpkg/Shlibs/SymbolFile.pm |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 49f9f9617800f2b4565e01e51d6481c61c6314ef
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sat Jun 20 20:30:59 2009 +0200
+
+    dpkg-gensymbols: do not output deprecated symbols
+    
+    The deprecated symbols appear commented with “#MISSING:”, they should
+    appear in the explanatory diff but not in the file generated.
+
+ debian/changelog           |    2 ++
+ scripts/dpkg-gensymbols.pl |    6 ++++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 9093cf1d97b544f2a8400b57fd1eaff69b9c5551
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sat Jun 20 19:28:29 2009 +0200
+
+    Add changelog entry for new dpkg-gensymbols feature
+
+ debian/changelog |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 2585b24fc60840db17f33db593087e03840f801c
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sat Jun 20 18:42:49 2009 +0200
+
+    Dpkg::Shlibs: code cleanup after merge and documentation update
+
+ man/dpkg-gensymbols.1             |   77 +++++++++++++-----------
+ scripts/Dpkg/Shlibs/Symbol.pm     |   11 +--
+ scripts/Dpkg/Shlibs/SymbolFile.pm |  115 ++++++++++++++++++++-----------------
+ 3 files changed, 108 insertions(+), 95 deletions(-)
+
+commit 5dec937e782343fb810a237fddfef3660bddfea9
+Author: Modestas Vainius <modestas@vainius.eu>
+Date:   Sat Jun 20 01:28:57 2009 +0300
+
+    Symbol tagging support and implementation of optional and arch tags
+    
+    Symbols might be tagged with arbitary number of tags which are separated by '|'
+    (aka pipe) character. Tags (only if there are any) must be enclosed in the ()
+    brackets right before a symbol name. Each tag can appear only once in the tag
+    specification for each symbol. A tag can optionally have a value. The tag value
+    is separated from the tag name by character '='. Tag names and values can be
+    arbitrary strings except they cannot contain any of the special ()|=
+    characters. A name of the tagged symbol can optionally be quoted with either '
+    or " characters (e.g. to allow whitespaces in the symbol name). If there are no
+    tags specified, symbol name cannot be quoted and symbol name continues up until
+    the first whitespace.
+    
+    Example of the quoted symbol with 2 tags (the first tag has a value while the
+    second does not):
+    
+     (tag1=value of the first tag|tag2)"Foo::Bar::foobar()"@Base 1.0 1
+    
+    Tags serve two purposes:
+    
+    * they can be used for symbol marking (e.g. when a symbol must be treated
+      specially under certain circumstances);
+    * they tell the parser that the specified symbol name must be processed in
+      certain way to become a raw symbol name as found in the object files.
+      Such tags are processed in the order they are specified.
+    
+    Symbol files with tags are not backwards compatible, so a new parameter
+    'template_mode' has been added to SymbolFile::dump(). If template_mode is not
+    set (default), dump() emits a fully post-processed symbol specifications as
+    directed by their tags. Tags themselves are ommited from output and unknown
+    tags are ignored. If template_mode is set, dump() keeps tags in the output and
+    emits symbol specifications as they were read from the symbol file.
+    
+    As a result, a new parameter -t was added to dpkg-gensymbols to support writing
+    the symbol file in template mode. Default is to write in non-template mode.
+    
+    (tag|...|tagN)#include "file_to_include"
+    
+    All symbols in the "file_to_include" will be tagged with #include tags by
+    default. A symbol in "file_to_include" can specify additional tags in its tag
+    specification or even override the tag value inherited from #include tags by
+    specifying another one in its own tag specifaction. There is no way for the
+    symbol to untag itself, even if the tag was inherited from #include.  #include
+    tags are assumed to go always before (in tagorder) symbol specific tags even if
+    the symbol overrides the tag. Recursive tagged #includes are supported.
+    
+    The patch also adds support for 2 tags:
+    
+    * optional - a symbol marked as optional can disappear from the object file at
+      any time and that will never cause dpkg-gensymbols to fail (just emit the
+      diff).  If optional symbol disappears, it is dumped as MISSING with
+      deprecated string set to the current package version (hence it always appears
+      in the dpkg-gensymbols diff). If optional symbol reappears, it gets
+      undeprecated but its minver is kept unchanged (contrary to reappearing
+      MISSING symbols).
+    
+      Example: C++ template instantiation which disappearance is not ABI breaking
+      (i.e. basically it is a private symbol).
+    
+      (optional)_ZN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE0EE11qt_metacastEPKc@Base 4:4.2.0
+    
+    * arch=<list of architectures as in Build-Depend dep> - allows to
+      mark a symbol as arch-specific. When dumping in non-templace mode, only
+      symbols concerned for the current host architecture are dumped. When dumping
+      in template mode, all arch-specific symbols are always dumped (including
+      proper tags). If arch-specific symbol appears on the arch that it is not
+      supposed to appear, it is made arch neutral (hence it appears in the
+      dpkg-gensymbols diff). If arch-specific symbol disappears from its arch, it
+      gets declared as MISSING.
+    
+      Example: armel specific symbol due to qreal mangling as float on arm(el)
+      and double on other arches.
+    
+      (arch=arm armel)_ZN6Phonon11AudioOutput13volumeChangedEd@Base 4:4.2.0
+      (arch=!armel !arm)_ZN6Phonon11AudioOutput13volumeChangedEf@Base 4:4.2.0
+
+ man/dpkg-gensymbols.1                        |  130 +++++++++++++--
+ scripts/Dpkg/Shlibs/Symbol.pm                |  239 ++++++++++++++++++++++++++
+ scripts/Dpkg/Shlibs/SymbolFile.pm            |  153 ++++++++++-------
+ scripts/Makefile.am                          |   22 ++-
+ scripts/dpkg-gensymbols.pl                   |   23 ++-
+ scripts/dpkg-shlibdeps.pl                    |    2 +-
+ scripts/t/200_Dpkg_Shlibs.t                  |  199 +++++++++++++++++++---
+ scripts/t/200_Dpkg_Shlibs/objdump.tags-amd64 |   70 ++++++++
+ scripts/t/200_Dpkg_Shlibs/objdump.tags-i386  |   71 ++++++++
+ scripts/t/200_Dpkg_Shlibs/symbols.include-3  |    5 +
+ scripts/t/200_Dpkg_Shlibs/symbols.tags.in    |    8 +
+ scripts/t/200_Dpkg_Shlibs/symboltags.c       |   23 +++
+ 12 files changed, 837 insertions(+), 108 deletions(-)
+
+commit e8698e08a1cca4949020cf12e26c4d189e3ba306
+Author: Peter Krefting <peterk@debian.org>
+Date:   Sat Jun 20 17:05:11 2009 +0100
+
+    Update Swedish translation.
+    
+    po/sv.po: Updated to 993t0f0u.
+    scripts/po/sv.po: Updated to 488t0f08.
+
+ po/sv.po         |  584 ++++++++++++++++++++++++++----------------------------
+ scripts/po/sv.po |  420 ++++++++++++++++++++++-----------------
+ 2 files changed, 518 insertions(+), 486 deletions(-)
+
+commit bce7972fbdff34d7ecd868753c61e1e9382f17a7
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Jun 20 14:13:36 2009 +0200
+
+    Update german scripts translation
+    
+    Update to 488t0f0u.
+
+ scripts/po/de.po |   16 ++++++++++++++--
+ 1 files changed, 14 insertions(+), 2 deletions(-)
+
+commit 213b91e7a511ef55be7c51db60846993a9f452b5
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Jun 20 12:00:26 2009 +0200
+
+    Update german scripts translation
+    
+    Update to 487t0f1u.
+
+ debian/changelog |    1 +
+ scripts/po/de.po |  412 ++++++++++++++++++++++++++++++------------------------
+ 2 files changed, 228 insertions(+), 185 deletions(-)
+
+commit 6a55f357c4cb88a547fe1557b3b9ad847da19700
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sat Jun 20 09:44:52 2009 +0200
+
+    Update german translation of manual pages
+    
+    Update to 1663t.
+
+ debian/changelog |    1 +
+ man/po/de.po     | 1829 +++---------------------------------------------------
+ 2 files changed, 89 insertions(+), 1741 deletions(-)
+
+commit 2c92025405471a5866fe12bd4bbd6014f0928466
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Fri Jun 19 17:36:30 2009 +0200
+
+    Add another alternative that needs to be cleaned up
+
+ debian/dpkg.preinst |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 7c44ddee45c21d3695fd73f5bd3a2ba88b4dbdc1
+Author: Miroslav Kure <kurem@debian.cz>
+Date:   Fri Jun 19 11:33:26 2009 +0200
+
+    Update Czech translation of dpkg/dselect
+    
+    po/cs.po: 1012t
+    dselect/po/cs.po: 279t
+
+ debian/changelog |    4 +
+ dselect/po/cs.po |    6 +-
+ po/cs.po         | 1216 ++++++++++++++++++++++++++----------------------------
+ 3 files changed, 593 insertions(+), 633 deletions(-)
+
+commit f40457f44f442d1394859e0c003b6d7437eb8386
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Jun 19 11:24:49 2009 +0200
+
+    Use NUL character instead of 0
+
+ dpkg-deb/build.c          |    4 ++--
+ dpkg-deb/extract.c        |   14 ++++++++------
+ dpkg-deb/info.c           |    7 ++++---
+ dpkg-split/info.c         |    8 ++++----
+ dpkg-split/queue.c        |    3 ++-
+ dpkg-split/split.c        |    2 +-
+ lib/dbmodify.c            |    2 +-
+ lib/fields.c              |   18 ++++++++++--------
+ lib/mlib.c                |    2 +-
+ lib/myopt.c               |   10 ++++++----
+ lib/parse.c               |    6 ++++--
+ lib/parsehelp.c           |    5 +++--
+ lib/tarfn.c               |    2 +-
+ lib/triglib.c             |    8 ++++----
+ lib/utils.c               |    2 +-
+ src/archives.c            |    6 +++---
+ src/configure.c           |    2 +-
+ src/depcon.c              |    2 +-
+ src/filesdb.c             |    2 +-
+ src/main.c                |    8 ++++----
+ src/processarc.c          |    9 +++++----
+ src/query.c               |    2 +-
+ src/remove.c              |    2 +-
+ src/statdb.c              |    8 ++++----
+ utils/start-stop-daemon.c |    2 +-
+ 25 files changed, 74 insertions(+), 62 deletions(-)
+
+commit 77b545df95ad92ee7ea1a8934a7953e9393031fa
+Author: Peter Krefting <peterk@debian.org>
+Date:   Thu Jun 18 21:47:36 2009 +0100
+
+    Update Swedish translation.
+    
+    Updated po/sv.po to 1012t0f0u.
+    Updated man/po/sv.po to 1661t0f0u.
+    Updated scripts/po/sv.po to 479t0f0u.
+
+ debian/changelog |    7 ++++
+ man/po/sv.po     |   87 ++++++++++++++++++++++++++++++++---------------------
+ po/sv.po         |    6 ++--
+ scripts/po/sv.po |   45 +++++++++++++++------------
+ 4 files changed, 87 insertions(+), 58 deletions(-)
+
+commit 95740341e95db8ac78fad3139ec3b58d3feb2f37
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jun 18 16:35:03 2009 +0200
+
+    dpkg-architecture: Remove unused variable
+
+ scripts/dpkg-architecture.pl |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 9e6f2f0791022ac8c3b1e3694509bdc1726b17b8
+Author: David Stansby <dstansby@googlemail.com>
+Date:   Thu Jun 18 08:30:26 2009 +0200
+
+    Fix english mistake (“as you request” → “as you requested”)
+
+ debian/changelog |    2 ++
+ po/ast.po        |   10 +++++-----
+ po/bs.po         |   10 +++++-----
+ po/ca.po         |   10 +++++-----
+ po/cs.po         |   10 +++++-----
+ po/da.po         |   10 +++++-----
+ po/de.po         |   10 +++++-----
+ po/dpkg.pot      |   10 +++++-----
+ po/dz.po         |   10 +++++-----
+ po/el.po         |   10 +++++-----
+ po/eo.po         |   10 +++++-----
+ po/es.po         |   10 +++++-----
+ po/et.po         |   10 +++++-----
+ po/eu.po         |   10 +++++-----
+ po/fr.po         |   10 +++++-----
+ po/gl.po         |   10 +++++-----
+ po/hu.po         |   10 +++++-----
+ po/id.po         |   10 +++++-----
+ po/it.po         |   10 +++++-----
+ po/ja.po         |   10 +++++-----
+ po/km.po         |   10 +++++-----
+ po/ko.po         |   10 +++++-----
+ po/ku.po         |   10 +++++-----
+ po/lt.po         |   10 +++++-----
+ po/mr.po         |   10 +++++-----
+ po/nb.po         |   10 +++++-----
+ po/ne.po         |   10 +++++-----
+ po/nl.po         |   10 +++++-----
+ po/nn.po         |   10 +++++-----
+ po/pa.po         |   10 +++++-----
+ po/pl.po         |   10 +++++-----
+ po/pt.po         |   10 +++++-----
+ po/pt_BR.po      |   10 +++++-----
+ po/ro.po         |   10 +++++-----
+ po/ru.po         |   10 +++++-----
+ po/sk.po         |   10 +++++-----
+ po/sv.po         |   10 +++++-----
+ po/th.po         |   10 +++++-----
+ po/tl.po         |   10 +++++-----
+ po/vi.po         |   10 +++++-----
+ po/zh_CN.po      |   10 +++++-----
+ po/zh_TW.po      |   10 +++++-----
+ src/archives.c   |    2 +-
+ src/configure.c  |    4 ++--
+ src/errors.c     |    2 +-
+ src/processarc.c |    2 +-
+ src/remove.c     |    2 +-
+ 47 files changed, 213 insertions(+), 211 deletions(-)
+
+commit 8e9df75625168c0a7631fdbd5f5e27f05cd56b95
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jun 17 03:32:25 2009 +0200
+
+    dpkg-name: Rewrite in perl
+
+ debian/changelog       |    1 +
+ scripts/Makefile.am    |    9 +--
+ scripts/dpkg-name.pl   |  256 ++++++++++++++++++++++++++++++++++++++++++++++++
+ scripts/dpkg-name.sh   |  207 --------------------------------------
+ scripts/po/POTFILES.in |    1 +
+ 5 files changed, 259 insertions(+), 215 deletions(-)
+
+commit db05f74c3fad40c90b5a8a48930ceeecc2a00d80
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jun 16 22:11:11 2009 +0200
+
+    Refactor statdb field parsing functions
+
+ src/filesdb.h |    4 ++
+ src/statdb.c  |   88 +++++++++++++++++++++++++++++++++++++++-----------------
+ 2 files changed, 65 insertions(+), 27 deletions(-)
+
+commit 4fb7afa06cbfef51a67b3e6da7648fa126e9f84c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jun 16 22:07:58 2009 +0200
+
+    Move diversion db parsing into a new file
+
+ src/Makefile.am |    2 +
+ src/divertdb.c  |  134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/filesdb.c   |   72 -----------------------------
+ 3 files changed, 136 insertions(+), 72 deletions(-)
+
+commit 133bc9b2039b1804ff291aefd595ade7b8317741
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Jun 16 22:05:09 2009 +0200
+
+    Move statoverride db parsing into a new file
+
+ src/Makefile.am |    1 +
+ src/filesdb.c   |  127 -------------------------------------
+ src/statdb.c    |  188 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 189 insertions(+), 127 deletions(-)
+
+commit 644aa62b334863671f881dc3ece4da9e6491d5ad
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sat Jun 13 21:50:46 2009 +0200
+
+    dpkg-buildpackage(1): add missing paragraph separator
+    
+    Reported-by: Per Andersson <avtobiff@gmail.com>
+
+ debian/changelog        |    2 ++
+ man/dpkg-buildpackage.1 |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 48a20395d3406b655844057315868748dceada2d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jun 15 02:19:12 2009 +0200
+
+    dpkg-scanpackages: Mark string for translation
+
+ scripts/dpkg-scanpackages.pl |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 1c18298e7510ffb2dab453293528ecd219d6a2b2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jun 14 20:34:22 2009 +0200
+
+    dpkg-scanpackages: Use info instead of ad-hoc printing
+    
+    Redirect it to STDERR to not pollute STDOUT where the Packages file is
+    being outputted.
+
+ scripts/dpkg-scanpackages.pl |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit d07ecdda8a1af8aeec8bba68fec5b25365e3ae5b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jun 14 20:32:41 2009 +0200
+
+    Dpkg::ErrorHandling: Support changing the file handle for info()
+    
+    Sometimes we need not clutter STDOUT when outputting data there.
+
+ scripts/Dpkg/ErrorHandling.pm |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit b299dad5ad3eb8bbcf75b0891f87744399e75574
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jun 14 19:57:05 2009 +0200
+
+    Dpkg::ErrorHandling: Add new report_options()
+    
+    Set report options via this new function instead of directly exporting
+    private variables.
+
+ scripts/Dpkg/ErrorHandling.pm     |   15 ++++++++++++---
+ scripts/dpkg-source.pl            |    4 ++--
+ scripts/t/100_Dpkg_Version.t      |    6 +++---
+ scripts/t/300_Dpkg_BuildOptions.t |    3 ++-
+ 4 files changed, 19 insertions(+), 9 deletions(-)
+
+commit 288aa90e881c1aaa8ddacdeeed8a5631142ffe67
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jun 14 19:02:55 2009 +0200
+
+    Dpkg::ErrorHandling: Remove unused warnerror() and $warnable_error
+    
+    Do not pass over -W and -E from dpkg-buildpackage to dpkg-source anymore
+    and warn directly about its deprecated status.
+
+ scripts/Dpkg/ErrorHandling.pm |   14 ++------------
+ scripts/dpkg-buildpackage.pl  |   13 ++++---------
+ 2 files changed, 6 insertions(+), 21 deletions(-)
+
+commit 3c6f5516c9656d39003eafc45221a2a3eaa467d8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jun 14 13:52:12 2009 +0200
+
+    dpkg-scansources: Use Dpkg::ErrorHandling instead of ad-hoc code
+    
+    Replace local reporting functionality with standard error and warning
+    Dpkg functions.
+
+ scripts/dpkg-scansources.pl |   93 ++++++++++++++++---------------------------
+ 1 files changed, 35 insertions(+), 58 deletions(-)
+
+commit 7df211874ca2223d8d3e6554ad611ad6ac26e530
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jun 15 01:18:02 2009 +0200
+
+    dpkg-scanpackages: Move missing override warning near the spurious one
+    
+    They are related so better to have them closer.
+
+ scripts/dpkg-scanpackages.pl |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit bc7279dd447b47d6175258cf2af47f53c1c6d23b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Jun 15 01:12:48 2009 +0200
+
+    dpkg-scanpackages: Use warning() instead of ad-hoc printing
+    
+    Remove now unused writelist().
+
+ scripts/dpkg-scanpackages.pl |   70 +++++++++++++++---------------------------
+ 1 files changed, 25 insertions(+), 45 deletions(-)
+
+commit f2d0f89f806829b39629e01016a774f25ef93a01
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jun 14 21:43:28 2009 +0200
+
+    dpkg-scanpackages: Fix spurious overrides output
+    
+    Split each package name and indent to the right.
+
+ scripts/dpkg-scanpackages.pl |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 8e3f26ad2d330da7269e77a097b8eefb3f148e02
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jun 14 21:41:24 2009 +0200
+
+    dpkg-scanpackages: Properly detect spurious overrides
+    
+    The detection was being done too late as no overriden information is
+    kept if the packages is not on the archive.
+
+ debian/changelog             |    1 +
+ scripts/dpkg-scanpackages.pl |    8 +++++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+commit 82304f1f29964a56cb498ed937c4fd5a97d23a7a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri Nov 21 11:38:04 2008 +0200
+
+    dpkg-source: Use default compressor values from Dpkg::Source::Compressor
+
+ debian/changelog       |    1 +
+ scripts/dpkg-source.pl |   13 +++++++------
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+commit 4bca5ba4f9d0cebdfdfff8daf2b46097dc901271
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Thu Jun 11 13:10:38 2009 +0200
+
+    Add one more case of alternative to cleanup (Closes: #532739)
+
+ debian/changelog    |    2 +-
+ debian/dpkg.preinst |    3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit f49da9f283b7cfa21ee833cc04cd274600bcd535
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Jun 8 18:05:39 2009 +0200
+
+    Dpkg::Source::CompressedFile::cleanup_after_open(): fix error message
+    
+    The $compressor->{cmdline} variable is removed by
+    $compressor->wait_end_process() so store it first in case we have to
+    display an error message.
+
+ scripts/Dpkg/Source/CompressedFile.pm |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 4690e08e95871ac1fc0498749466cf255a840e0c
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Jun 7 21:05:41 2009 +0200
+
+    update-alternatives: handle dangling alternative symlink
+    
+    update-alternatives did not properly handle when the
+    alternative symlink in /etc/alternatives was dangling
+    and pointing to a choice that does not exist currently.
+    Fix by switching the alternative to automatic mode so
+    that it's replaced by the best choice.
+
+ debian/changelog               |    2 ++
+ scripts/update-alternatives.pl |    8 +++++++-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+commit 057523d0a806a3cb5be38c8da1a2fc3f044ef4cc
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Jun 7 18:05:20 2009 +0200
+
+    Remove invalid master alternatives on upgrade
+    
+    update-alternatives was very laxist in its past and allowed things that
+    are now rightfully forbidden. For example, you can't use alternatives as
+    slave when it's a master alternative already. However there is sometimes
+    cruft files in /var/lib/dpkg/alternatives/ due to historical changes (or
+    bugs) that incorrectly trigger this check.
+    
+    We avoid this problem by removing the conflicting files on upgrade.
+
+ debian/changelog    |    2 ++
+ debian/dpkg.preinst |   15 +++++++++++++++
+ 2 files changed, 17 insertions(+), 0 deletions(-)
+
+commit ab964156eedce0067078b3d4371651275d7dc4c9
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sun Jun 7 14:47:05 2009 +0200
+
+    Updated Catalan translation
+
+ debian/changelog |    1 +
+ po/ca.po         |  232 +++++++++++++++++++++++++++---------------------------
+ 2 files changed, 117 insertions(+), 116 deletions(-)
+
+commit 3fe4e86fc9835013529ca29ae9577edc87296fef
+Author: Deng Xiyue <manphiz-guest@users.alioth.debian.org>
+Date:   Mon Jun 1 10:52:48 2009 +0200
+
+    Simplified Chinese translation update
+
+ debian/changelog |    3 +
+ po/zh_CN.po      |  555 +++++++++++++++++++++++++-----------------------------
+ 2 files changed, 259 insertions(+), 299 deletions(-)
+
+commit bbb33e5b828a2b237399def5ff15cd818245f4d3
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Thu May 28 15:31:32 2009 +0200
+
+    Unset TAR_OPTIONS when handling tar archives for source packages
+    
+    The command line interface is the only way that should control tar's
+    behaviour in its usage by dpkg as we want the same behaviour for
+    everybody.
+
+ debian/changelog               |    5 +++++
+ scripts/Dpkg/Source/Archive.pm |    2 ++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 24f7107e9815e90931fbccd1299757494431dd75
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 28 14:33:53 2009 +0200
+
+    Unset TAR_OPTIONS when extracting .deb archives
+    
+    We don't want the extraction to be affected by user settable environment
+    variables either. The command line tool is considered an interface for
+    which we want as much control as possible to guarantee no unintentional
+    behaviour changes to the format or they way it's being handled.
+    
+    Closes: #530860
+
+ debian/changelog   |    2 +-
+ dpkg-deb/extract.c |    3 +++
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 1f975373036a3f9e2cd441d205d307e25f639311
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 26 01:26:44 2009 +0200
+
+    Bump version to 1.15.3~
+
+ configure.ac     |    2 +-
+ debian/changelog |    6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit f4ab87b29a4abfe372395d66679d526e888d3559
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 26 01:02:00 2009 +0200
+
+    Release 1.15.2
+
+ configure.ac     |    2 +-
+ debian/changelog |    8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 62fef21ce9a5679cf5deaa2afa2d1261f4577f8f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 26 01:19:07 2009 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po       |  126 +++++++++++++++++++------------------------
+ dselect/po/ca.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/cs.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/da.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/de.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/dselect.pot |  126 +++++++++++++++++++------------------------
+ dselect/po/el.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/es.po       |  142 +++++++++++++++++++++++-------------------------
+ dselect/po/et.po       |  132 +++++++++++++++++++++------------------------
+ dselect/po/eu.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/fr.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/gl.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/hu.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/id.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/it.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/ja.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/ko.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/nb.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/nl.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/nn.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/pl.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/pt.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/pt_BR.po    |  138 +++++++++++++++++++++++------------------------
+ dselect/po/ro.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/ru.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/sk.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/sv.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/tl.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/vi.po       |  138 +++++++++++++++++++++++------------------------
+ dselect/po/zh_CN.po    |  138 +++++++++++++++++++++++------------------------
+ dselect/po/zh_TW.po    |  138 +++++++++++++++++++++++------------------------
+ po/ast.po              |   56 ++++++++++----------
+ po/bs.po               |   56 ++++++++++----------
+ po/ca.po               |   56 ++++++++++----------
+ po/cs.po               |   56 ++++++++++----------
+ po/da.po               |   56 ++++++++++----------
+ po/de.po               |   56 ++++++++++----------
+ po/dpkg.pot            |   56 ++++++++++----------
+ po/dz.po               |   56 ++++++++++----------
+ po/el.po               |   56 ++++++++++----------
+ po/eo.po               |   56 ++++++++++----------
+ po/es.po               |   56 ++++++++++----------
+ po/et.po               |   56 ++++++++++----------
+ po/eu.po               |   62 +++++++++++----------
+ po/fr.po               |   56 ++++++++++----------
+ po/gl.po               |   56 ++++++++++----------
+ po/hu.po               |   56 ++++++++++----------
+ po/id.po               |   56 ++++++++++----------
+ po/it.po               |   56 ++++++++++----------
+ po/ja.po               |   56 ++++++++++----------
+ po/km.po               |   56 ++++++++++----------
+ po/ko.po               |   56 ++++++++++----------
+ po/ku.po               |   56 ++++++++++----------
+ po/lt.po               |   56 ++++++++++----------
+ po/mr.po               |   56 ++++++++++----------
+ po/nb.po               |   56 ++++++++++----------
+ po/ne.po               |   56 ++++++++++----------
+ po/nl.po               |   56 ++++++++++----------
+ po/nn.po               |   56 ++++++++++----------
+ po/pa.po               |   56 ++++++++++----------
+ po/pl.po               |   56 ++++++++++----------
+ po/pt.po               |   56 ++++++++++----------
+ po/pt_BR.po            |   56 ++++++++++----------
+ po/ro.po               |   56 ++++++++++----------
+ po/ru.po               |   56 ++++++++++----------
+ po/sk.po               |   56 ++++++++++----------
+ po/sv.po               |   56 ++++++++++----------
+ po/th.po               |   56 ++++++++++----------
+ po/tl.po               |   56 ++++++++++----------
+ po/vi.po               |   56 ++++++++++----------
+ po/zh_CN.po            |   56 ++++++++++----------
+ po/zh_TW.po            |   56 ++++++++++----------
+ scripts/po/de.po       |   16 ++++--
+ 73 files changed, 3211 insertions(+), 3359 deletions(-)
+
+commit aeac662959cb1aa129a2a188dafdd896a6e05888
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon May 25 08:03:29 2009 +0200
+
+    Fix memory leaks due to not destroying pkg iterators
+
+ debian/changelog |    1 +
+ src/depcon.c     |    1 +
+ src/trigproc.c   |    1 +
+ 3 files changed, 3 insertions(+), 0 deletions(-)
+
+commit fa9b6e6133cdb9e1519efef3929c2d6eb2b73a4c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon May 25 07:55:14 2009 +0200
+
+    s-s-d: Refactor process schedule priority range checks
+    
+    Move into a new function, so we avoid warnings due to unused variables.
+
+ utils/start-stop-daemon.c |   28 ++++++++++++++++++----------
+ 1 files changed, 18 insertions(+), 10 deletions(-)
+
+commit 5ccdc88f40ec8bea792874b97596cda8368aff4d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 24 22:08:58 2009 +0200
+
+    dselect: Properly parse fdisk output in disk setup method
+    
+    util-linux's fdisk has not emitted the Begin column since 1998-06-10
+    version 2.8. Change the parsing code accordingly to make it actually
+    work.
+
+ debian/changelog           |    2 ++
+ dselect/methods/disk/setup |    6 +++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 328b98fff19dbafcb90008a0711672ded9c71401
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 24 21:18:30 2009 +0200
+
+    dselect: Fix bashism (“echo -e”) in disk setup method
+    
+    Closes: #530071
+
+ debian/changelog           |    1 +
+ dselect/methods/disk/setup |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 885726e7585b081eca172df9cda2a57134564922
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 24 21:13:26 2009 +0200
+
+    dselect: Refactor partition printing in disk setup method
+    
+    Move code into its own function.
+
+ dselect/methods/disk/setup |   13 ++++++++++---
+ 1 files changed, 10 insertions(+), 3 deletions(-)
+
+commit 93bb330136c95fd0f5e4ed1d29987dc64e4ba218
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sun May 24 14:44:10 2009 +0200
+
+    Fix typo and unfuzzy translations
+
+ man/dpkg-vendor.1   |    2 +-
+ man/po/de.po        |    2 +-
+ man/po/dpkg-man.pot |    2 +-
+ man/po/es.po        |    2 +-
+ man/po/fr.po        |    2 +-
+ man/po/hu.po        |    2 +-
+ man/po/ja.po        |    2 +-
+ man/po/pl.po        |    2 +-
+ man/po/pt_BR.po     |    2 +-
+ man/po/ru.po        |    2 +-
+ man/po/sv.po        |    2 +-
+ 11 files changed, 11 insertions(+), 11 deletions(-)
+
+commit 4b8978b3a418bf409dffc212da41ff84b0a8d8bc
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sun May 24 09:45:30 2009 +0200
+
+    Remove extra \n. Thanks to Helge Kreutzmann
+    Assign copyright for changes since 2005 to the French team
+    Drop upstream copyright
+
+ po/fr.po |   19 ++++---------------
+ 1 files changed, 4 insertions(+), 15 deletions(-)
+
+commit 747648c88dff4a4644917f5aeec80dc87d51658f
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sun May 24 09:42:21 2009 +0200
+
+    Updated French translation
+    Removed dpkg copyright at the head of the file. Only copyrights
+    for translations should be kept there
+
+ debian/changelog |    3 +++
+ dselect/po/fr.po |   24 ++++++------------------
+ 2 files changed, 9 insertions(+), 18 deletions(-)
+
+commit ad40a4332aa20ab633ad5d2a94c9b32b97d064cc
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sun May 24 09:39:19 2009 +0200
+
+    Convert to UTF-8
+
+ dselect/po/fr.po |  762 +++++++++++++++++++++++++++---------------------------
+ 1 files changed, 381 insertions(+), 381 deletions(-)
+
+commit 6c9ee12dcf8fce3526fe2cbda61b390e9597d5bd
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun May 24 09:33:31 2009 +0200
+
+    Update german scripts translation
+    
+    Update to 479t.
+
+ debian/changelog |    3 +-
+ scripts/po/de.po |   62 ++++++++++++++++++++++++++---------------------------
+ 2 files changed, 32 insertions(+), 33 deletions(-)
+
+commit 52d7b734f46e618efc966b28312b55cdcf3604d9
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sun May 24 08:37:30 2009 +0200
+
+    French translation update for scripts
+
+ debian/changelog |   13 ++++++++-----
+ 1 files changed, 8 insertions(+), 5 deletions(-)
+
+commit a09ffe0761431195d8ea99363aba1657fedbf1d6
+Author: Piarres Beobide <pi@beobide.net>
+Date:   Fri May 22 12:17:19 2009 +0200
+
+    Updated Basque translation
+
+ po/eu.po |   60 +++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 29 insertions(+), 31 deletions(-)
+
+commit 2ee037d786c178451135f4c68fdaef88da5419a0
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun May 24 08:05:22 2009 +0200
+
+    Update german translation of manual pages
+    
+    Update to 1661t.
+
+ debian/changelog |    3 ++
+ man/po/de.po     |   82 ++++++++++++++++++++++++++++++++---------------------
+ 2 files changed, 52 insertions(+), 33 deletions(-)
+
+commit 79bf96576c4f4570681128b449c6a3b816bd3786
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Fri May 22 09:32:14 2009 +0200
+
+    German dpkg translation update
+    
+    Update to 1005t7f.
+
+ debian/changelog |    5 +++--
+ po/de.po         |   16 +++++++---------
+ 2 files changed, 10 insertions(+), 11 deletions(-)
+
+commit 09ef46c7941def6905d2664f916d72a4b14c960d
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Fri May 22 08:56:24 2009 +0200
+
+    French translation update
+
+ debian/changelog |    1 +
+ po/fr.po         |    9 ++++-----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+commit d3bd0b6d96436adc76a09a06d2b9a915e401a3c3
+Author: Marcos <marcos.alvarez.costales@gmail.com>
+Date:   Fri May 22 08:53:55 2009 +0200
+
+    Asturian translation update
+    Closes: #529889
+
+ debian/changelog |    1 +
+ po/ast.po        |    8 ++++----
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+commit c410dce7c24c183be9e01df14dc0f8029bd00848
+Author: Piarres Beobide <pi+debian@beobide.net>
+Date:   Fri May 22 08:52:15 2009 +0200
+
+    Basque translation update. Closes: #529857
+
+ debian/changelog |    3 +
+ po/eu.po         |  881 +++++++++++++++++-------------------------------------
+ 2 files changed, 270 insertions(+), 614 deletions(-)
+
+commit e2e412977aefafa7df6f84c8cb6fe645dae85215
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Fri May 22 05:04:00 2009 +0200
+
+    dselect: Remove obsolete priorities support
+    
+    dselect shows wrong package priorities in the package selection screen.
+    This is because the string representations arrays haven't been updated
+    to reflect the removal of the “Recommended” and “Contrib” priorities
+    in commit c8d3938be127e256fd593f234858fb9d474b2353.
+
+ debian/changelog      |    2 ++
+ dselect/pkgdisplay.cc |    4 ----
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+commit 2251827c000ba901d0027194f6d9281184ede701
+Author: Guillem Jover <guillem@debian.org>
+Date:   Fri May 22 04:44:22 2009 +0200
+
+    s-s-d: Use the same exact name for all Hurd OS macros
+    
+    Use the properly capitalized version of the macro. This fixes a FTBFS
+    on GNU/Hurd due to a missmatched define usage.
+    
+    Regression introduced in fc860a55b26aee3d774ed010c43822491852bbc2.
+
+ debian/changelog          |    3 ++-
+ utils/start-stop-daemon.c |   18 +++++++++---------
+ 2 files changed, 11 insertions(+), 10 deletions(-)
+
+commit 0ea0cb5405b828afb1ffdd39e0ef96e562aba86f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 21 07:02:42 2009 +0200
+
+    Bump version to 1.15.2~
+
+ configure.ac     |    2 +-
+ debian/changelog |    6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 588381c24ec54f97ad980618778df19ac86ffc10
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 21 06:53:44 2009 +0200
+
+    Release 1.15.1
+
+ configure.ac     |    2 +-
+ debian/changelog |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit bd1812a0af338e9ea574f9fc1efe7a7d99aa4fa9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 21 06:35:16 2009 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |   96 +-
+ dselect/po/ca.po        |   96 +-
+ dselect/po/cs.po        |   96 +-
+ dselect/po/da.po        |   96 +-
+ dselect/po/de.po        |   96 +-
+ dselect/po/dselect.pot  |   96 +-
+ dselect/po/el.po        |   96 +-
+ dselect/po/es.po        |   96 +-
+ dselect/po/et.po        |   96 +-
+ dselect/po/eu.po        |   96 +-
+ dselect/po/fr.po        |   96 +-
+ dselect/po/gl.po        |   96 +-
+ dselect/po/hu.po        |   96 +-
+ dselect/po/id.po        |   96 +-
+ dselect/po/it.po        |   96 +-
+ dselect/po/ja.po        |   96 +-
+ dselect/po/ko.po        |   96 +-
+ dselect/po/nb.po        |   96 +-
+ dselect/po/nl.po        |   96 +-
+ dselect/po/nn.po        |   96 +-
+ dselect/po/pl.po        |   96 +-
+ dselect/po/pt.po        |   96 +-
+ dselect/po/pt_BR.po     |   96 +-
+ dselect/po/ro.po        |   96 +-
+ dselect/po/ru.po        |   96 +-
+ dselect/po/sk.po        |   96 +-
+ dselect/po/sv.po        |   96 +-
+ dselect/po/tl.po        |   96 +-
+ dselect/po/vi.po        |   96 +-
+ dselect/po/zh_CN.po     |   96 +-
+ dselect/po/zh_TW.po     |   96 +-
+ man/po/de.po            | 5681 +++++++++++++++++++++++++++++++----------------
+ man/po/dpkg-man.pot     | 4015 +++++++++++++++++-----------------
+ man/po/es.po            | 2702 ++++++++++++++++++----
+ man/po/fr.po            | 2738 +++++++++++++++++++-----
+ man/po/hu.po            | 2575 ++++++++++++++++++----
+ man/po/ja.po            | 2623 ++++++++++++++++++----
+ man/po/pl.po            | 2682 ++++++++++++++++++----
+ man/po/pt_BR.po         | 2584 ++++++++++++++++++----
+ man/po/ru.po            | 2627 ++++++++++++++++++----
+ man/po/sv.po            | 5698 +++++++++++++++++++++++++++++++----------------
+ po/ast.po               |  184 +-
+ po/bs.po                |  181 +-
+ po/ca.po                |  184 +-
+ po/cs.po                |  184 +-
+ po/da.po                |  184 +-
+ po/de.po                |  193 +-
+ po/dpkg.pot             |  181 +-
+ po/dz.po                |  184 +-
+ po/el.po                |  184 +-
+ po/eo.po                |  184 +-
+ po/es.po                |  184 +-
+ po/et.po                |  184 +-
+ po/eu.po                |  184 +-
+ po/fr.po                |  184 +-
+ po/gl.po                |  184 +-
+ po/hu.po                |  184 +-
+ po/id.po                |  184 +-
+ po/it.po                |  184 +-
+ po/ja.po                |  184 +-
+ po/km.po                |  184 +-
+ po/ko.po                |  184 +-
+ po/ku.po                |  181 +-
+ po/lt.po                |  184 +-
+ po/mr.po                |  184 +-
+ po/nb.po                |  184 +-
+ po/ne.po                |  184 +-
+ po/nl.po                |  184 +-
+ po/nn.po                |  184 +-
+ po/pa.po                |  181 +-
+ po/pl.po                |  184 +-
+ po/pt.po                |  184 +-
+ po/pt_BR.po             |  184 +-
+ po/ro.po                |  184 +-
+ po/ru.po                |  184 +-
+ po/sk.po                |  184 +-
+ po/sv.po                |  184 +-
+ po/th.po                |  184 +-
+ po/tl.po                |  184 +-
+ po/vi.po                |  184 +-
+ po/zh_CN.po             |  184 +-
+ po/zh_TW.po             |  184 +-
+ scripts/po/ca.po        |  750 ++++---
+ scripts/po/de.po        |  499 +++--
+ scripts/po/dpkg-dev.pot |  740 ++++---
+ scripts/po/fr.po        |  778 ++++---
+ scripts/po/pl.po        |  770 ++++---
+ scripts/po/ru.po        |  774 ++++---
+ scripts/po/sv.po        |  503 +++--
+ 89 files changed, 32683 insertions(+), 16573 deletions(-)
+
+commit 432925334746c722ef957d692c901eeb84c7d8f1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 21 06:16:33 2009 +0200
+
+    dpkg-deb: Do not warn when parsing unknown fields with “Private-” prefix
+    
+    Fields prefixed with “Private-” are intended to be used privately by
+    individuals, organizations or companies, and are expected to never be
+    standardized. This guarantees them to never collide with any official
+    field in the future. Because there's still the danger that different
+    organizations might end up using the same field name, those should
+    never be visible in any public repository.
+    
+    Closes: #353040
+    
+    Based-on-patch-by: Nils Rennebarth <nils.rennebarth@funkwerk-ec.com>
+
+ debian/changelog |    2 ++
+ dpkg-deb/build.c |    6 ++++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+commit adaf5c43dc21083aa89341dd78a573dcc1e12be5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 21 06:12:12 2009 +0200
+
+    Revert "dpkg-deb: don't warn on unknown fields starting with "X-""
+    
+    This reverts commit 66835c07b3eb5c6a5a1374e60e93dfaf12538323.
+    
+    Conflicts:
+    
+    	debian/changelog
+
+ debian/changelog |    3 ---
+ dpkg-deb/build.c |    3 ---
+ 2 files changed, 0 insertions(+), 6 deletions(-)
+
+commit bfda32490d1ff730322636c97a4ce4d65bbd69c5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 21 06:02:17 2009 +0200
+
+    s-s-d: Warn if --name argument is longer than supported by kernel
+    
+    Most kernels have a length limit on the process name stored in-kernel.
+    For now the checks done on Linux compatible procfs might hit this limit
+    and be unable to properly track the correct process. So warn in that
+    case and recommend switching to the more reliable --exec.
+    
+    Closes: #353015, #519128
+
+ debian/changelog          |    2 ++
+ utils/start-stop-daemon.c |   12 ++++++++++++
+ 2 files changed, 14 insertions(+), 0 deletions(-)
+
+commit 3bbdfa787d98084a682a404921e8bed6b5be8442
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 21 06:00:41 2009 +0200
+
+    s-s-d: Add new warning function
+    
+    Switch a previous ad-hoc warning message to use the new warning
+    function, which additionally properly prints to stderr.
+
+ utils/start-stop-daemon.c |   15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+commit 46184f85cdddbbc879b4aebe105b7125e169a23d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 21 05:26:51 2009 +0200
+
+    Fix typo (one ‘the’ too many)
+
+ README.translators |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ba2706754570efecb9cfba05ebcf2765d222c8a2
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Tue May 19 16:41:47 2009 +0200
+
+    dpkg-scanpackages: be less annoying with warning about overrides
+    
+    If the user doesn't specify an override file, then he doesn't care
+    about the fact that all packages are missing from the (non-existing)
+    override file. Disable the warning in this case.
+    
+    In other cases, when the override file is explicitely given, it's a
+    normal feature that the packages missing from it are listed; exactly like
+    other weirdness are reported (incorrect maintainer info, spurious override
+    entries).
+    
+    Based-on-patch-by: Piotr Engelking <inkerman42@gmail.com>
+
+ debian/changelog             |    3 +++
+ scripts/dpkg-scanpackages.pl |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit a4d87d52a10f7726934bc8d1a607dc28721a7a4d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 19 07:56:01 2009 +0200
+
+    dpkg-source: Do not state in --help there is a default substvar file
+
+ debian/changelog       |    2 ++
+ scripts/dpkg-source.pl |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit bf8ae12d0ec3710f409f7b2a533f496a15347da7
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 19 07:49:15 2009 +0200
+
+    Make deprecated dpkg-scanpackages --udeb option produce a warning
+    
+    Callers should use -tudeb instead.
+
+ README.feature-removal-schedule |    2 +-
+ debian/changelog                |    1 +
+ scripts/dpkg-scanpackages.pl    |   11 ++++++++---
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+commit 655872184c55febb2299eb6a19aa4d0612d2da60
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 19 07:39:08 2009 +0200
+
+    Remove deprecated status for substvars in dpkg-source and dpkg-genchanges
+    
+    Even if there's no use at all for substvars or they are (currently)
+    undesirable making the source not easily reproducible for Debian and
+    most derivatives using the same build processesor, it might be
+    interesting for uses like templated source package generation and
+    similar, or other interesting ideas we might not have thought about.
+    
+    Also the same logic we applied for the removal of the substvar support
+    could be applied to most of the “Build options” as well, as those do not
+    make sense in the normal build for official packages (like -U, or -D).
+    
+    Changed the code to stop producing warnings, and remove deprecated notes
+    from man page.
+
+ README.feature-removal-schedule |    9 ---------
+ debian/changelog                |    2 ++
+ man/dpkg-source.1               |    4 ++--
+ scripts/dpkg-genchanges.pl      |    1 -
+ scripts/dpkg-source.pl          |    2 --
+ 5 files changed, 4 insertions(+), 14 deletions(-)
+
+commit 3582817fd91ceab77cdd25d14ea2add1abe0be61
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 19 07:13:35 2009 +0200
+
+    Do not right justify the database reading progress percent counter
+    
+    There's an odd space most for most of the progress, which will never be
+    actually seen filled by the 100%. Seems slightly better to just not
+    indent it.
+
+ debian/changelog |    1 +
+ lib/progress.c   |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 398fd2848c4ea056ae4a0a9c404de436aa2f71e4
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Tue May 19 00:10:46 2009 +0200
+
+    dpkg-parsechangelog: documentation update
+    
+    Update dpkg-parsechangelog's documentation to make it clearer that spaces
+    are not allowed between single characters options and their values.
+    
+    For example, "-v1.14" works but "-v 1.14" doesn't. However "--since 1.14"
+    works. Long options can have values as the next command line argument but
+    not short ones.
+
+ debian/changelog               |    3 +++
+ man/dpkg-parsechangelog.1      |   12 ++++++------
+ scripts/dpkg-parsechangelog.pl |   20 +++++++++++---------
+ 3 files changed, 20 insertions(+), 15 deletions(-)
+
+commit 5962f9d2b2f5e70b223d04638302c0f2239af36e
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon May 18 23:22:04 2009 +0200
+
+    dpkg-parsechangelog: handle better non-existing versions
+    
+    When a non-existing version is passed in one of the --since, --until,
+    --to, --from options, the code will now replace them by a closely related
+    version that really exists.
+
+ debian/changelog          |    3 ++
+ scripts/Dpkg/Changelog.pm |   77 ++++++++++++++++++++++++++++++++++++++++----
+ 2 files changed, 73 insertions(+), 7 deletions(-)
+
+commit 12c75eb567675b6498b333a416929431c55a558a
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon May 18 22:10:05 2009 +0200
+
+    Fix changelog parsing code to differentiate the empty string from 0
+    
+    In many places, the code tested for a false version instead of
+    an empty version string. Fixing all those enabled dpkg-buildpackage -v0 to
+    work as expected.
+
+ debian/changelog             |    2 +
+ scripts/Dpkg/Changelog.pm    |   50 ++++++++++++++++++++++++-----------------
+ scripts/changelog/debian.pl  |    6 +++-
+ scripts/dpkg-buildpackage.pl |    8 +++---
+ scripts/dpkg-genchanges.pl   |    2 +-
+ 5 files changed, 40 insertions(+), 28 deletions(-)
+
+commit 9d1697bcc1ba87322a3ea6b2c7129656c52524de
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun May 17 19:16:48 2009 +0200
+
+    dpkg-buildpackage: error out properly when dpkg-checkbuilddeps is killed
+    
+    Use the standard function subprocerr() to error out when
+    dpkg-checkbuilddeps has not exited normally. Otherwise interpret the exit
+    code as usual.
+
+ debian/changelog             |    2 ++
+ scripts/dpkg-buildpackage.pl |    6 +++++-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 61eae73be741d724a282302fb68417c247ac2780
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun May 17 16:10:55 2009 +0200
+
+    dpkg-buildpackage: don't set DEB_VENDOR anymore
+    
+    Packages should use the new dpkg-vendor interface and not rely
+    on this environment variable.
+
+ debian/changelog             |    2 ++
+ man/dpkg-buildpackage.1      |    6 ------
+ scripts/dpkg-buildpackage.pl |    8 --------
+ 3 files changed, 2 insertions(+), 14 deletions(-)
+
+commit ffc27eb2fa5e00f65cd6c170fb9083738c125f17
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Fri May 15 18:17:18 2009 +0200
+
+    dpkg-genchanges: use same error string than in dpkg-buildpackage
+    
+    Reusing the same error message "cannot combine %s and %s" between
+    dpkg-genchanges and dpkg-buildpackage simplifies the work of translators.
+
+ scripts/dpkg-genchanges.pl |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 77270d7bf4dbffba0060635ca58a51f7e66b475c
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Fri May 15 16:41:31 2009 +0200
+
+    dpkg-buildpackage: factorize a command line sanity check
+
+ scripts/dpkg-buildpackage.pl |   15 +++------------
+ 1 files changed, 3 insertions(+), 12 deletions(-)
+
+commit 18dacea0fab9d81e85a5a7d4e9ec25435df7aa5b
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Fri May 15 16:28:45 2009 +0200
+
+    dpkg-buildpackage: allow options -nc and -S together
+    
+    This combination is generally not recommended as you want to ensure
+    that a source package contains only source and not any intermediary files
+    left-over by the previous build. Nevertheless it can be useful from time
+    to time and instead of bluntly refusing, we now simply warn the user
+    and let the build proceed.
+    
+    -nc still implies -b if nothing else has been specified as it's routinely
+    used to test if a fix is working by restarting a previously interrupted
+    build where it failed.
+
+ debian/changelog             |    2 ++
+ man/dpkg-buildpackage.1      |    3 ++-
+ scripts/dpkg-buildpackage.pl |   14 ++++++++------
+ 3 files changed, 12 insertions(+), 7 deletions(-)
+
+commit edb5b7598366738eb4d3b48ddff2dcef9cda4c54
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 14 07:49:59 2009 +0200
+
+    Remove obsolete 822-date program
+    
+    It has long been superseeded by ‘date -R’.
+
+ README.feature-removal-schedule |   13 +++++------
+ debian/changelog                |    1 +
+ debian/dpkg-dev.install         |    2 -
+ debian/usertags                 |    2 -
+ man/822-date.1                  |   40 ---------------------------------------
+ man/Makefile.am                 |    1 -
+ man/po/po4a.cfg                 |    5 ----
+ scripts/.gitignore              |    1 -
+ scripts/822-date.pl             |   17 ----------------
+ scripts/Makefile.am             |    2 -
+ scripts/po/POTFILES.in          |    1 -
+ 11 files changed, 7 insertions(+), 78 deletions(-)
+
+commit c8d3938be127e256fd593f234858fb9d474b2353
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 12 21:58:29 2009 +0200
+
+    Remove obsolete priorities support
+
+ README.feature-removal-schedule |   15 +++++++--------
+ debian/changelog                |    1 +
+ lib/dpkg-db.h                   |    7 +++++--
+ lib/parsehelp.c                 |    6 ------
+ 4 files changed, 13 insertions(+), 16 deletions(-)
+
+commit 9f6671925f3403900bb3a2f74cd4b6683a189052
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 12 20:21:55 2009 +0200
+
+    Remove obsolete --force-auto-select dpkg option
+
+ README.feature-removal-schedule |   17 +++++++----------
+ debian/changelog                |    1 +
+ src/main.c                      |    2 --
+ 3 files changed, 8 insertions(+), 12 deletions(-)
+
+commit 4b8061f8583220089eda1611fb7c55efd0cb41b5
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 12 16:24:58 2009 +0200
+
+    Remove obsolete --largemem and --smallmem dpkg options
+
+ README.feature-removal-schedule |   10 +++++-----
+ debian/changelog                |    1 +
+ src/main.c                      |    2 --
+ src/main.h                      |    2 +-
+ 4 files changed, 7 insertions(+), 8 deletions(-)
+
+commit a7a2de0e76049ac238cf70140dec2e39fb9a553b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon May 11 18:14:12 2009 +0200
+
+    Print a warning when using obsolete --print-installation-architecture
+    
+    Packages should be switched to use --print-architecture. This option
+    will be removed sometime in the future.
+    
+    Closes: #528171
+
+ README.feature-removal-schedule |    8 ++++++++
+ debian/changelog                |    2 ++
+ src/enquiry.c                   |    8 ++++++++
+ src/main.c                      |    2 +-
+ 4 files changed, 19 insertions(+), 1 deletions(-)
+
+commit 58b04d8f75a8b59bc2ec0f54429e3a47b060ecb6
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun May 10 21:31:40 2009 +0200
+
+    dpkg-buildpackage: add execute right on debian/rules when missing
+    
+    That right should normally not be missing as dpkg-source -x automatically
+    sets it. However manually applying a Debian diff doesn't restore
+    that right so let dpkg-buildpackage restore it in that case and display a
+    warning to let the user know that it was not really normal.
+
+ debian/changelog             |    2 ++
+ scripts/dpkg-buildpackage.pl |    5 +++++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 70c760198f9d116d85f20a587f60bb4bc3fff776
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun May 10 19:18:05 2009 +0200
+
+    dpkg-source: do not try to apply empty patch set
+    
+    In format 2.0 and 3.0 (quilt), do not try to apply the patches if
+    there are none.
+
+ scripts/Dpkg/Source/Package/V2.pm       |    2 ++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    3 ++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 57c5a9dd52955d5b2fd55f224d70cb4f3f40f437
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun May 10 19:15:29 2009 +0200
+
+    dpkg-source: minor update to "3.0 (quilt)" format
+    
+    Do not update/create debian/patches/.dpkg-source-applied during build,
+    it's only meant to document what patches have been applied at extraction
+    time.
+    
+    Also try to cleanup in case the patch serie is empty after removal of the
+    automatic patch. First remove debian/patches/series if it's empty and then
+    debian/patches/ itself in case it's empty as well.
+
+ debian/changelog                        |    3 +++
+ scripts/Dpkg/Source/Package/V2.pm       |    1 +
+ scripts/Dpkg/Source/Package/V3/quilt.pm |    5 ++---
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+
+commit 50e6ea1dc0193eacc95ec47f2d175c6bfcda14fc
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun May 10 17:30:02 2009 +0200
+
+    dpkg-source: fix automatic patch registration in format 3.0 (quilt)
+    
+    When the automatic patch is updated due to a second call to
+    dpkg-source, it's not always properly registered with quilt.
+    It must be applied with quilt itself otherwise quilt pop
+    then quilt push might fail when supplementary files have been modified
+    outside of quilt's knowledge.
+    
+    Furthermore quilt import was not a good choice as it failed trying to copy
+    the patch over itself. The new approach is to revert the patch and let
+    quilt reapply it with quilt fold. It will go over the list of files
+    modified by the new patch and add those which were not yet part of the
+    previous patch (hence adding the required unmodified files in
+    .pc/<patch-name>/).
+    
+    Based-on-patch-by: Goswin von Brederlow <goswin-v-b@web.de>
+
+ debian/changelog                        |    4 ++++
+ scripts/Dpkg/Source/Package/V3/quilt.pm |   22 ++++++++++++++++++----
+ 2 files changed, 22 insertions(+), 4 deletions(-)
+
+commit 170fd06d3573238bab92594afe4d49b61bf77407
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 10 19:59:25 2009 +0200
+
+    dpkg-vendor: Error out when no action option is provided
+    
+    It was previously giving perl warnings due to uninitialized variables.
+
+ scripts/dpkg-vendor.pl |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 289c179ef6d91ad4daec4abff7762d5b17a010c9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 10 19:53:08 2009 +0200
+
+    dpkg-vendor: Use usageerr instead of non-existent badusage
+
+ scripts/dpkg-vendor.pl |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1b075bd34bf8c2362b0999b29ec5c2ab88429db9
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 10 19:07:06 2009 +0200
+
+    s-s-d: Print valid values for IO scheduler class in --help output
+
+ debian/changelog          |    2 ++
+ utils/start-stop-daemon.c |    3 +++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 384f6d131f07110db4807cab02fefc02ccab7430
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 10 18:59:35 2009 +0200
+
+    s-s-d: Only print fatal errno string if it was non-zero
+
+ debian/changelog          |    1 +
+ utils/start-stop-daemon.c |    6 +++++-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit f40d17f3b7e7eeea80023762dc782791ffff8514
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 10 18:52:30 2009 +0200
+
+    s-s-d: Preserve faulting errno when printing reason in fatal function
+
+ debian/changelog          |    2 ++
+ utils/start-stop-daemon.c |    3 ++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 4a0c79171400847ea97ebd66384fde21f497964c
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 10 18:33:09 2009 +0200
+
+    Fix POD errors detected by podchecker in perl modules
+    
+    Add missing blank lines after =cut, close =over section with =back and
+    add a FIXME comment to an empty section.
+
+ scripts/Dpkg/Cdata.pm          |    2 ++
+ scripts/Dpkg/Changelog.pm      |    5 ++++-
+ scripts/Dpkg/Control.pm        |    9 +++++++++
+ scripts/Dpkg/Deps.pm           |    9 +++++++++
+ scripts/Dpkg/Fields.pm         |    7 +++++++
+ scripts/Dpkg/Path.pm           |    4 ++++
+ scripts/Dpkg/Substvars.pm      |    7 +++++++
+ scripts/Dpkg/Vendor.pm         |    9 +++++++++
+ scripts/Dpkg/Vendor/Default.pm |    3 +++
+ scripts/Dpkg/Vendor/Ubuntu.pm  |    3 +++
+ scripts/Dpkg/Version.pm        |    1 +
+ 11 files changed, 58 insertions(+), 1 deletions(-)
+
+commit 2b125e6ed96d88e0f352eba9bfc746a9640dc01a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 10 17:54:05 2009 +0200
+
+    Do not set the Arch substvar in dpkg-source
+    
+    Avoid setting the variable by default as it is expensive, and not
+    really needed for dpkg-source anyway. Split the setting into a new
+    member set_arch_substvars().
+    
+    Regression introduced in 120ecd5161f4cf468d611b3dea05ac8a43313a75.
+    
+    Closes: #526132
+
+ debian/changelog           |    2 ++
+ scripts/Dpkg/Substvars.pm  |   17 ++++++++++++++---
+ scripts/dpkg-genchanges.pl |    1 +
+ scripts/dpkg-gencontrol.pl |    1 +
+ 4 files changed, 18 insertions(+), 3 deletions(-)
+
+commit 70bf111c9a1060ada8eabe8787e149f25157f714
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu May 7 18:30:26 2009 +0200
+
+    Move Debian keyrings to the Debian vendor keyring hook
+    
+    As Ubuntu is a derivative from Debian, make it inherit the Debian vendor
+    class when running the keyrings hook.
+
+ debian/changelog               |    2 ++
+ scripts/Dpkg/Source/Package.pm |    6 ------
+ scripts/Dpkg/Vendor/Debian.pm  |   17 +++++++++++++++--
+ scripts/Dpkg/Vendor/Ubuntu.pm  |    8 +++++---
+ 4 files changed, 22 insertions(+), 11 deletions(-)
+
+commit 349aeaa4f2673678cf09d5a31d4b80db1f534639
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Thu Apr 9 18:07:09 2009 +0200
+
+    dpkg-vendor: new script to query various vendor information
+    
+    This tool is meant to be used in debian/rules files to have common source
+    packages across multiple distributions and yet still have slightly
+    different binary packages.
+    
+    To automatically conserve customizations across derivatives of a given
+    distribution, one can use “dpkg-vendor --derives-from vendor” so that all
+    derivatives keep the same customizations when they rebuild the source
+    package even if the current vendor is no more the same.
+
+ debian/changelog        |    4 ++
+ debian/dpkg-dev.install |    2 +
+ man/Makefile.am         |    1 +
+ man/dpkg-vendor.1       |   53 ++++++++++++++++++++++
+ man/po/po4a.cfg         |    5 ++
+ scripts/Makefile.am     |    2 +
+ scripts/dpkg-vendor.pl  |  113 +++++++++++++++++++++++++++++++++++++++++++++++
+ 7 files changed, 180 insertions(+), 0 deletions(-)
+
+commit 780d969788cbc639b75e876d010fbc0e80956aa0
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 5 17:40:32 2009 +0200
+
+    Do not install dselect and s-s-d man pages if disabled on configure
+    
+    When configuring with --without-dselect or --without-start-stop-daemon,
+    do not install the man pages related to those programs.
+
+ debian/changelog |    2 ++
+ man/Makefile.am  |   48 +++++++++++++++++++++++++++++++-----------------
+ 2 files changed, 33 insertions(+), 17 deletions(-)
+
+commit f8f681790429aec59d8fc3771fa2d6ec78ed77f6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 5 15:48:27 2009 +0200
+
+    Use backticks instead of non-portable make $(shell) function
+    
+    The backticks are treated like text, until the shell expands them, thus
+    making this solution portable.
+
+ debian/changelog |    1 +
+ man/Makefile.am  |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 618b6cd27b04c50e3e5b21b035b45aef58e6affb
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 5 15:39:46 2009 +0200
+
+    Declare the ChangeLog file to be removed on distclean
+    
+    This fixes ‘make distcheck’.
+
+ Makefile.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 6f165c4579b53597583305394cd4e1cb377d5fa8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 5 15:21:45 2009 +0200
+
+    Changelog police: Esperanto is a new language
+
+ debian/changelog |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d61abe87252a6a6b234c8eb59a8926c8f9887d32
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue May 5 15:20:21 2009 +0200
+
+    Enable Esperanto and Asturian languages
+    
+    Missed in commits ce04415c6b809e4936f9b69d5ea60daa06f0657d and
+    8ab2d4a31934027a1824f8ba6458e8de175ccdb5.
+
+ po/LINGUAS |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 45a7adc8ac5e8864d3a3865b7c0c9cb4ef3b4388
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon May 4 20:49:42 2009 +0200
+
+    update-alternatives: don't remove real files conflicting with link
+    
+    When an alternative is installed and a real file is in conflict, the real
+    file is kept. When the same alternative is fully removed, the real file
+    should be kept according to the same logic (but currently it was removed).
+    This commit modifies update-alternatives to follow this expected
+    behaviour.
+    
+    Also add a non-regression test.
+
+ debian/changelog                    |    3 +++
+ scripts/t/900_update_alternatives.t |    5 ++++-
+ scripts/update-alternatives.pl      |    4 ++--
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+commit da0538290b7dbbfb3c537441470767fd0879c985
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun May 3 14:07:00 2009 +0200
+
+    Add '.hgtags' to the default dpkg-source -i regex and -I pattern
+    
+    Closes: #525854
+
+ debian/changelog               |    2 ++
+ scripts/Dpkg/Source/Package.pm |    3 ++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit b5b8fb2f78d60ec9836eb7120ec38ffa6962b1dc
+Author: Yuri Kozlov <yuray@komyakino.ru>
+Date:   Sat May 2 18:18:05 2009 +0200
+
+    Updated Russian translation
+
+ debian/changelog |    1 +
+ po/ru.po         | 1034 +++++++++++++++++-------------------------------------
+ 2 files changed, 329 insertions(+), 706 deletions(-)
+
+commit 3624a4b0eb5499f367c1d8077240f151903cd70a
+Author: Philipp Kern <pkern@debian.org>
+Date:   Sat May 2 11:39:00 2009 +0200
+
+    dpkg-source: do not set arch:any in dsc on arch-restricted packages
+    
+    dpkg-source was pretty liberal in setting 'Architecture: any' in the
+    dsc: as soon as there are two binary packages, one being arch:all and
+    one being arch-restricted, you get arch:any in the dsc. This is
+    incorrect because the package will only build on the autobuilders
+    if there are architecture-dependent binary packages available.
+    
+    Thus this patch only produces arch:any if at least one binary package
+    specifies it. Otherwise it outputs the set of all binary architectures
+    (including arch:all).
+    
+    Closes: #526617
+    
+    Signed-off-by: Philipp Kern <pkern@debian.org>
+
+ debian/changelog       |    2 ++
+ scripts/dpkg-source.pl |   43 ++++++++++++++++++++-----------------------
+ 2 files changed, 22 insertions(+), 23 deletions(-)
+
+commit 0e8fe98658d63a07a1449cee61f16a67136134e6
+Author: Philipp Kern <pkern@debian.org>
+Date:   Sat May 2 11:26:25 2009 +0200
+
+    Fix format string in German translation
+    
+    Signed-off-by: Philipp Kern <pkern@debian.org>
+
+ scripts/po/de.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 38a231cc468837a6a1db306a77dff1ca1d31d2e8
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Apr 27 22:26:51 2009 +0200
+
+    Update german scripts translation
+    
+    Update to 477t.
+
+ scripts/po/de.po |  475 ++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 249 insertions(+), 226 deletions(-)
+
+commit ada924df6df039f66770d454b5e803169dc2b31b
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Mon Apr 27 22:20:42 2009 +0200
+
+    Update german translation of manual pages
+    
+    Update to 1659t.
+
+ man/po/de.po | 3877 ++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 1896 insertions(+), 1981 deletions(-)
+
+commit cbde6f587130724749c23908cce129380dc7652d
+Author: Colin Watson <cjwatson@canonical.com>
+Date:   Mon Apr 27 11:56:22 2009 +0100
+
+    dpkg-source: Add "keyrings" vendor hook
+    
+    Add "keyrings" vendor hook, used by dpkg-source to allow vendors to
+    supply additional keyrings against which source package signatures will
+    be verified. Implement this for Ubuntu.
+
+ debian/changelog               |    5 +++++
+ man/dpkg-source.1              |    2 +-
+ scripts/Dpkg/Source/Package.pm |    6 ++++++
+ scripts/Dpkg/Vendor/Default.pm |    8 ++++++++
+ scripts/Dpkg/Vendor/Ubuntu.pm  |    3 +++
+ 5 files changed, 23 insertions(+), 1 deletions(-)
+
+commit 609294de1074556ac6194fff7ddbfef0fec80841
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Apr 19 22:05:34 2009 +0200
+
+    dpkg-source: do not store user/group names in generated tarballs
+    
+    Do not store usernames and group names when creating tarballs
+    and use numeric UID/GID 0 instead. This concerns native source packages,
+    debian tarballs in "3.0 (quilt)" source packages, and any other source
+    format creating new tarballs with Dpkg::Source::Archive.
+
+ debian/changelog               |    2 ++
+ scripts/Dpkg/Source/Archive.pm |    3 ++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit f805a6546e7050a1024d924b805cff75cfd082d8
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Apr 19 20:54:12 2009 +0200
+
+    Add lintian override for embedded-zlib
+    
+    dpkg-deb links statically with zlib so that it can still work
+    even if the shared library is broken or unavailable. It's a facility
+    to be able to recover from difficult situations without having
+    to manually unpack debian packages.
+    
+    See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=139320 for
+    one discussion about this.
+
+ debian/dpkg.lintian-overrides |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 0f6f1016aa501387f60ec9f8b750263904fbf306
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Apr 19 20:51:10 2009 +0200
+
+    Update Standards-Version to 3.8.1
+
+ debian/changelog |    1 +
+ debian/control   |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 3525f79792cff51757d99d45f51c96a15e6fa779
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Apr 19 20:08:44 2009 +0200
+
+    dpkg-source: don't complain on binary files that are ignored
+    
+    To avoid mistakes with "3.0 (quilt)" source packages, dpkg-source fails if
+    it finds binary files that have not been whitelisted in the debian
+    directory. Unfortunately it also fails on binary files that are ignored
+    and that will not be included in the debian tarball. This commit fixes
+    that although not completely.
+    
+    The exclude patterns passed to tar --exclude are used to match filenames
+    and also full path names inside the tarball. This commit only adds support
+    for simple filename match. It is enough for all realistic cases.
+
+ debian/changelog                  |    3 +++
+ scripts/Dpkg/Source/Package/V2.pm |   24 +++++++++++++++++++++++-
+ 2 files changed, 26 insertions(+), 1 deletions(-)
+
+commit 64439508ccaf2c9a98fa11b7cce4df4d314cc334
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Fri Apr 17 22:24:19 2009 +0200
+
+    dpkg-source: accept dashes in component name of additional tarballs
+    
+    The regular expression used to identify additional tarballs (used in
+    formats "2.0" and "3.0 (quilt)") was too strict and refused dashes. This
+    commit fixes that and documents the set of allowed characters in the
+    dpkg-source manual page.
+
+ debian/changelog                  |    2 ++
+ man/dpkg-source.1                 |    1 +
+ scripts/Dpkg/Source/Package.pm    |    2 +-
+ scripts/Dpkg/Source/Package/V2.pm |    4 ++--
+ 4 files changed, 6 insertions(+), 3 deletions(-)
+
+commit fee30cd37c83bd85465edba36546a3661d273d7d
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Fri Apr 17 22:08:24 2009 +0200
+
+    Dpkg::Deps::parse(): parse properly an empty dep with spaces only
+    
+    Leading and trailing spaces were not stripped and when no further parsing
+    was done (because there's no valid dependency to parse) it was improperly
+    erroring out.
+
+ debian/changelog     |    2 ++
+ scripts/Dpkg/Deps.pm |    4 ++++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 100a2a29c7718613d97a8ae9543c69faf0da0436
+Author: Peter Krefting <peterk@debian.org>
+Date:   Tue Apr 14 09:40:42 2009 +0100
+
+    Update Swedish translation.
+    
+    Update man/po/sv.po to 1659t0f0u.
+    Update scripts/po/sv.po to 477t0f0u.
+
+ man/po/sv.po     | 3736 ++++++++++++++++++++++++++----------------------------
+ scripts/po/sv.po |  465 ++++----
+ 2 files changed, 2070 insertions(+), 2131 deletions(-)
+
+commit f3b72bc149660a938d7d147ce19d656aeee4cad2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Apr 13 06:14:42 2009 +0200
+
+    Fix typos in u-a man page
+    
+    Add a missing paragraph with heading tag.
+    Replace reference to ‘link’ with ‘name’ in --auto.
+    
+    Reported-by: Helge Kreutzmann <debian@helgefjell.de>
+
+ man/update-alternatives.8 |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 51926eebbba1f20c3bf994e7364512a1c63a25f2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Apr 13 04:57:43 2009 +0200
+
+    Detect the curses headers to use instead of hardcoding them
+    
+    Wrap the curses headers to use and select them through the config.h macros
+    detected at configure time. This way we can also cleanly detect the path
+    needed by mkcurkeys.pl w/o duplicating the selection logic.
+
+ TODO                     |    1 -
+ debian/changelog         |    1 +
+ dselect/Makefile.am      |    6 ++++--
+ dselect/dselect-curses.h |   40 ++++++++++++++++++++++++++++++++++++++++
+ dselect/dselect.h        |    3 +--
+ dselect/main.cc          |    6 ++++++
+ m4/libs.m4               |    2 ++
+ 7 files changed, 54 insertions(+), 5 deletions(-)
+
+commit f8ff44b68dbec2457bd3dbe0e9c891f73534f7b2
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Apr 13 04:42:53 2009 +0200
+
+    Add avr32 to cputable
+    
+    Closes: #523456
+
+ cputable         |    1 +
+ debian/changelog |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit e2d3483c9d297823e8917196925a00927d5d1afe
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Apr 13 04:38:20 2009 +0200
+
+    Sync archtable with architectures currently present in Debian sid
+    
+    Remove m68k.
+    Add kfreebsd-i386 and kfreebsd-amd64.
+
+ debian/archtable |    3 ++-
+ debian/changelog |    3 +++
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit e5235b174b04cd3662e9b189cd7502fc58a031a6
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Thu Apr 9 18:35:10 2009 +0200
+
+    dpkg-source: don't die on SIGPIPE of uncompressors
+    
+    Modify Dpkg::Source::CompressedFile to not die when uncompressors
+    processes (gunzip, bunzip, etc.) are killed by SIGPIPE. Recent tar
+    versions close the pipe before having read everything sent by the
+    uncompressor process when they encounter the end of the tar file.
+    This was of course problematic for Dpkg::Source::Archive.
+    This is a regression compared to etch's dpkg-source which dealt with
+    SIGPIPE properly.
+    
+    The Dpkg::Source::Compressor::wait_end_process() function had to be
+    extended to be able to forward options to Dpkg::IPC::wait_child().
+
+ debian/changelog                      |    3 +++
+ scripts/Dpkg/Source/CompressedFile.pm |   10 +++++++++-
+ scripts/Dpkg/Source/Compressor.pm     |    5 +++--
+ 3 files changed, 15 insertions(+), 3 deletions(-)
+
+commit f8cc0115a8d326416eb0fd968db86e0cb4f5a408
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Wed Apr 8 18:24:50 2009 +0200
+
+    Slovak translation update
+
+ po/sk.po |   67 +++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 34 insertions(+), 33 deletions(-)
+
+commit 8ab2d4a31934027a1824f8ba6458e8de175ccdb5
+Author: Felipe Castro <fefcas@gmail.com>
+Date:   Wed Apr 8 06:44:58 2009 +0200
+
+    Esperanto translation update
+    
+    Closes: #523023
+
+ debian/changelog |    1 +
+ po/eo.po         | 5870 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 5871 insertions(+), 0 deletions(-)
+
+commit c40bbd831c32b257001bbe6f5d88df16ea20bb07
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Apr 5 11:04:48 2009 +0200
+
+    Recomplete german translation of manual pages
+
+ man/po/de.po |   27 +++++++++++++--------------
+ 1 files changed, 13 insertions(+), 14 deletions(-)
+
+commit 2cd5f33d4808b912f649fb662f1235d21cd5e64e
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Apr 3 20:34:53 2009 +0200
+
+    Update german translation of manual pages
+    
+    Update to 1654t3u.
+
+ man/po/de.po |  154 ++++++++++++++++++++++++++++++++++++++++++----------------
+ 1 files changed, 112 insertions(+), 42 deletions(-)
+
+commit 28322a61ea6a17f8220dd0f9c7454ee9d03ec588
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Tue Mar 31 12:16:12 2009 +0200
+
+    Fix a translation mistake in french version of dpkg(1)
+    
+    Reported-by: Jonathan Gibert <jokot3@gmail.com>
+
+ debian/changelog |    2 ++
+ man/po/fr.po     |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 1b1a8a5773e94a014fc2093436bd1509ad53ff4f
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Mar 30 15:35:38 2009 +0200
+
+    Fix syntax in german translation.
+    
+    Reported-by: Modestas Vainius <modestas@vainius.eu>
+
+ man/po/de.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 734a784e75b71b31179327a7f284f76e3bbcb14e
+Author: Frank Lichtenheld <djpig@debian.org>
+Date:   Sun Mar 29 13:18:39 2009 +0200
+
+    Simplify Dpkg::Version
+    
+    Remove unnecessary function next_elem which just replicates the
+    standard shift behaviour. The additional function calls affect
+    performance negatively.
+
+ debian/changelog        |    6 +++++-
+ scripts/Dpkg/Version.pm |   18 +++++++-----------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+commit 3fe876365cc62f3cf9b74fb5b23150fe6d307d20
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Mar 27 21:27:10 2009 +0100
+
+    Unify (where applicable) translation of "create" as in po/de and fix typos
+
+ man/po/de.po     |   44 ++++++++++++++++++++++----------------------
+ scripts/po/de.po |   18 +++++++++---------
+ 2 files changed, 31 insertions(+), 31 deletions(-)
+
+commit 557be89bdb3547ba1233d022b81ce3b29b3581aa
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Fri Mar 27 20:14:10 2009 +0100
+
+    Unify translation of "create"
+
+ po/de.po |   26 +++++++++++++-------------
+ 1 files changed, 13 insertions(+), 13 deletions(-)
+
+commit 66835c07b3eb5c6a5a1374e60e93dfaf12538323
+Author: Nils Rennebarth <nils.rennebarth@funkwerk-ec.com>
+Date:   Fri Mar 27 19:31:18 2009 +0100
+
+    dpkg-deb: don't warn on unknown fields starting with "X-"
+    
+    The fields named "X-" are never going to collide with official
+    fields and there's no need to warn that they are unknown.
+    Users are already explicitely creating them with XB-X-* fields
+    in debian/control.
+
+ debian/changelog |    3 +++
+ dpkg-deb/build.c |    3 +++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 1e1038d76a201b179f900fcfc442a94e4aa3b3eb
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Mar 23 16:01:22 2009 +0100
+
+    Global review of error checking associated to strtol functions
+    
+    Several calls to strtol() or strtoul() are not followed by a
+    proper check that ensures that they have parsed an integer value
+    (and not an empty string).
+
+ dpkg-split/info.c         |    2 +-
+ dpkg-split/main.c         |    2 ++
+ src/filesdb.c             |    6 +++---
+ src/main.c                |   17 ++++++++++-------
+ utils/start-stop-daemon.c |    2 +-
+ 5 files changed, 17 insertions(+), 12 deletions(-)
+
+commit da116193fa0ec00f0c477614e5178c874a323753
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Fri Mar 27 18:21:07 2009 +0100
+
+    Update german translation of manual pages
+    
+    Update to 1635t6f16u.
+
+ man/po/de.po |   35 +++++++++++++++++++++++++++++++++--
+ 1 files changed, 33 insertions(+), 2 deletions(-)
+
+commit c1b9a3e2b1ddfc97deefb812c6689ad6b3629f46
+Author: Peter Krefting <peter@softwolves.pp.se>
+Date:   Sun Mar 22 15:12:12 2009 +0100
+
+    Fixed typo and incorrect translation in the dpkg-dev translation.
+    
+    Spotted by Daniel Nylander.
+
+ scripts/po/sv.po |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit d80d6958a20f3664b7bb0ef49f5fe5b8056836e6
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 22 11:45:10 2009 +0100
+
+    dpkg: refuses empty parameters when integer expected
+    
+    Fix setinteger() funtion used for parsing integer options to
+    refuse empty parameters. Currently only affects --abort-after.
+    
+    Based-on-patch-by: Bill Allombert <ballombe@debian.org>
+
+ THANKS           |    1 +
+ debian/changelog |    2 ++
+ src/main.c       |    2 +-
+ 3 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 5ddae0e36402c8694ed63b7caf5018e311129047
+Author: Bill Allombert <ballombe@debian.org>
+Date:   Sun Mar 22 12:22:22 2009 +0100
+
+    dpkg: separate arguments with "--" when calling dpkg-{deb,query}
+    
+    This is needed because any user-supplied argument separator is stripped by
+    the option parser such as "dpkg -S -- -pic" ends up calling "dpkg-query
+    --search -pic" which fails. With this patch, it calls "dpkg-query --search
+    -- -pic" and works as expected.
+
+ debian/changelog |    5 +++++
+ src/main.c       |    7 ++++++-
+ 2 files changed, 11 insertions(+), 1 deletions(-)
+
+commit cb4288636728df2a9187d042eea8f57f24790d29
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sat Mar 21 18:05:03 2009 +0100
+
+    Small fixes so that a build from a clean checkout works again
+    
+    Remove origin/Makefile from configure.ac.
+    
+    Fix debian/rules so that it works even if the auto-generated ChangeLog is
+    not there yet.
+    
+    Reported-by: Bill Allombert <Bill.Allombert@math.u-bordeaux1.fr>
+
+ configure.ac |    1 -
+ debian/rules |    4 ++--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+commit c3e6b6dfdb10d5883330fa314c0df7d85d7905d0
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Thu Mar 19 19:45:30 2009 +0100
+
+    Reviewed by Stéphane Blondon. Drop joke...
+
+ po/fr.po |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 981ccbf39a1b903d5c7dfc056b15bfe4dc563b96
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Wed Mar 18 20:13:01 2009 +0100
+
+    French translation completed
+
+ po/fr.po |  378 ++++++++++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 233 insertions(+), 145 deletions(-)
+
+commit dd977bc0ecb6ad9e8b8e727e4aa6aaabea04457a
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Wed Mar 18 19:50:23 2009 +0100
+
+    Fix another typo.
+
+ man/po/fr.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 9b585a4607bf6aa97d547e2afd559de9b9129991
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Wed Mar 18 19:49:06 2009 +0100
+
+    Fix another typo.
+
+ man/po/fr.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8aea716c734e42b809d5146a6cdad863662bdcd5
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Wed Mar 18 19:48:28 2009 +0100
+
+    *Possibly* fix another typo.
+
+ man/po/fr.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8939ce325c8cd5e1ba42b8aa8dd73756843d3882
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Wed Mar 18 19:47:44 2009 +0100
+
+    Another wrapping problem.
+
+ man/po/fr.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit d1f5ea901c829bad0bc4c75b6f5c1b2854bd29ae
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Wed Mar 18 19:47:02 2009 +0100
+
+    Fix typos.
+
+ man/po/fr.po |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 2cb8374d47f393911fe5843a75a8faa4d2abd85b
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Wed Mar 18 19:46:19 2009 +0100
+
+    Fix typo in a French manpage.
+
+ man/po/fr.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e154e909781d3b266bd746c8e77b1dd6967934b8
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Wed Mar 18 02:02:56 2009 +0100
+
+    Fix typos.
+
+ man/po/fr.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 16ed3e573e1c9233a3366ea262bea7a871c737e7
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Wed Mar 18 02:02:55 2009 +0100
+
+    *Possibly* fix another typo.
+
+ man/po/fr.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e3f72b6d2feedcf95aaf00453fb0a52e5cf5968e
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Wed Mar 18 02:02:53 2009 +0100
+
+    Fix typo.
+
+ man/po/fr.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d0b749781b8c70f853e13359e287073809906e29
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Wed Mar 18 02:02:50 2009 +0100
+
+    Adopt another style.
+
+ man/po/fr.po |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 62edf2b5613e73364b106be2f902d3c850ce4b3d
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Wed Mar 18 02:02:47 2009 +0100
+
+    Rephrase some bits (kind of “too much”) in a French manpage.
+
+ man/po/fr.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 6dba9d6d178df4529928978c709911b15fdfa733
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Wed Mar 18 02:02:46 2009 +0100
+
+    Workaround rendering bug in a French manpage.
+    
+    Non-breaking spaces seem not to be taken into account when the PO-file
+    lines are wrapped. Try and reformat in another way.
+
+ man/po/fr.po |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit a20f920fa416a8c2493b78f6a7d2779831b9e957
+Author: Cyril Brulebois <kibi@debian.org>
+Date:   Wed Mar 18 02:02:45 2009 +0100
+
+    Fix typo in a French manpage.
+
+ man/po/fr.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d145e4e7990e8acf090a3766cb6008f70475f425
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Tue Mar 17 22:13:47 2009 +0100
+
+    French translation update
+
+ po/fr.po |  420 ++++++++++++++++++++++++--------------------------------------
+ 1 files changed, 163 insertions(+), 257 deletions(-)
+
+commit 80716257ffb9674d78a606fe7f8e5b035d1dfdf3
+Author: Marcos <marcos.alvarez.costales@gmail.com>
+Date:   Tue Mar 17 07:12:21 2009 +0100
+
+    Completed Asturian translation
+    
+    Closes: #519998
+
+ debian/changelog |    2 +-
+ po/ast.po        |   12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+commit d8c47b9b7ddd60b74fb8a502f45000068c4669f8
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue Mar 17 22:13:00 2009 +0100
+
+    Update german translation of manual pages
+    
+    Update to 1626t6f25u.
+
+ man/po/de.po |  175 ++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 80 insertions(+), 95 deletions(-)
+
+commit 9b525629d5b318246a4b8cfb352fdf3d13d08afc
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Tue Mar 17 21:43:26 2009 +0100
+
+    Add debian/changelog entry for the German dpkg translation update
+    
+    Bring translation updates back into alphabetical order.
+
+ debian/changelog |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 69c003759ab6d8b538062705b2da7a4714b04e16
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Tue Mar 17 21:34:36 2009 +0100
+
+    Update German dpkg translation
+    
+    Update to 1001t11f.
+
+ po/de.po |  565 ++++++++++++++++++++++++++++----------------------------------
+ 1 files changed, 251 insertions(+), 314 deletions(-)
+
+commit ed4e04ccef996d5ef715fc9c1da5da6ca9fa372f
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Tue Mar 17 18:44:12 2009 +0100
+
+    dpkg-shlibdeps: improve debug messages displayed in verbose mode
+
+ scripts/dpkg-shlibdeps.pl |   18 +++++++++++++-----
+ 1 files changed, 13 insertions(+), 5 deletions(-)
+
+commit 02e3de2f1d687b19d305f7623e08742f6896ae7a
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Tue Mar 17 16:51:44 2009 +0100
+
+    dpkg-shlibdeps: fix code to find out minimal version among all symbols
+    
+    dpkg-shlibdeps did not always correctly initialize symbol-based
+    dependencies for libraries having symbols associated with a version "0".
+    
+    “$minver ||= $sym->{minver};” changed $minver to the first non-null version
+    that followed a null version. Because the null version is evidently
+    selected as the minimal version but that code considers it unset and
+    replaces it with whatever it has.
+    
+    Add a non-regression test for this part of the code.
+
+ debian/changelog                            |    4 ++++
+ scripts/Dpkg/Shlibs/SymbolFile.pm           |    2 +-
+ scripts/t/200_Dpkg_Shlibs.t                 |   12 +++++++++---
+ scripts/t/200_Dpkg_Shlibs/symbols.fake-2    |    2 +-
+ scripts/t/200_Dpkg_Shlibs/symbols.include-1 |    2 +-
+ 5 files changed, 16 insertions(+), 6 deletions(-)
+
+commit 4eaf5de367581c2a3cf3debafbc21e072a519ef2
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Mar 16 18:54:05 2009 +0100
+
+    Drop /etc/dpkg/origins as it's taken over by base-files (see #487437)
+
+ Makefile.am                   |    1 -
+ debian/changelog              |    1 +
+ debian/dpkg.install           |    1 -
+ debian/dpkg.lintian-overrides |    1 -
+ origins/Makefile.am           |   10 ----------
+ origins/debian                |    3 ---
+ 6 files changed, 1 insertions(+), 16 deletions(-)
+
+commit 5badd6d7165d2ac04b7b4b47d1c37986f33d5528
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Mar 16 11:12:00 2009 +0100
+
+    Dpkg::Deps: refuse to parse ORed deps only when union deps are requested
+    
+    This was the intended behaviour when that change was made
+    in f65e9c9a2e521e32b0de6a963ab1e58790001366.
+
+ scripts/Dpkg/Deps.pm |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 22f2ea26d7b848a9dc8b66a9c8fa264f5aa29b74
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Mar 16 11:00:16 2009 +0100
+
+    dpkg-buildpackage: add back an erroneously removed use statement
+    
+    “use Dpkg::Version qw(check_version);” should not have been removed
+    in this file.
+
+ scripts/dpkg-buildpackage.pl |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit f1d3f2dae6581d04743fa4877f78d44be66502df
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Mar 16 10:54:05 2009 +0100
+
+    Dpkg::IPC: add sanity check for timeout parameter and a non-regression test
+
+ scripts/Dpkg/IPC.pm      |    5 +++++
+ scripts/t/800_Dpkg_IPC.t |   12 ++++++++++--
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+commit 5b0024349ddbfefdcd45fd9382cc113234ba0f39
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 15 22:15:41 2009 +0100
+
+    dpkg-source: switch to standard info() function for output
+    
+    All buildd should use an updated sbuild by now, we can update the
+    format of dpkg-source's output without problems.
+
+ scripts/dpkg-source.pl |    6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+commit 7d7a32b36791ba9c458930c537875c32e9e3a57c
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 15 22:11:43 2009 +0100
+
+    Misc updates concerning gpg and dpkg-source
+    
+    * Always display a warning when the signature verification failed.
+    * Update the dpkg-source's manual page to document that only the user's
+      trustedkeys.gpg keyring is used for signature verification.
+
+ debian/changelog               |    2 ++
+ man/dpkg-source.1              |    3 ++-
+ scripts/Dpkg/Source/Package.pm |    2 ++
+ 3 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 09721c437877afd1549b1028c4f830898db6c57e
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 15 21:53:14 2009 +0100
+
+    Update dpkg-dev dependencies
+    
+    - Move gnupg to Recommends. It's needed to sign .dsc and .changes.
+    - Add gpgv to Recommends. Useful to check signatures of extracted packages.
+    - Add debian-maintainers to Suggests. Together with debian-keyring they
+      contain all the GPG keys required to verify official Debian packages.
+
+ debian/changelog |    5 +++++
+ debian/control   |    4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit eb23ea12c4599ec93c9c5e21929a5dd966991bb7
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 15 21:44:09 2009 +0100
+
+    dpkg-source: don't block indefinitely on gpg
+    
+    dpkg-source's signature check is now done with gpgv if possible and
+    timeouts if not completed within 10 seconds.
+
+ debian/changelog               |    2 ++
+ scripts/Dpkg/Source/Package.pm |   12 +++++++++---
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+commit eecd200a7aa51058c950345e60092c7fdd0ec1e2
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 15 21:14:18 2009 +0100
+
+    Dpkg::IPC: implement timeout for subprocesses
+    
+    Add a new option timeout for Dpkg::IPC::wait_child(). It implements
+    an alarm() based timeout for subprocesses and allows us to
+    fail if some processes do not return as expected.
+
+ scripts/Dpkg/IPC.pm |   30 ++++++++++++++++++++++++++----
+ 1 files changed, 26 insertions(+), 4 deletions(-)
+
+commit fe67e29f17678678091e2ba318d4ec8c0e6bef47
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 15 21:13:34 2009 +0100
+
+    Let git ignore vim swap files
+
+ .gitignore |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit f65e9c9a2e521e32b0de6a963ab1e58790001366
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 15 19:34:17 2009 +0100
+
+    dpkg-gencontrol: improve error message with a bad union dependency
+    
+    dpkg-gencontrol displays a better error message when an ORed dependency
+    is used in a union field like Conflicts, Replaces or Breaks.
+
+ debian/changelog           |    3 +++
+ scripts/Dpkg/Deps.pm       |    8 +++++++-
+ scripts/dpkg-gencontrol.pl |    6 ++++--
+ 3 files changed, 14 insertions(+), 3 deletions(-)
+
+commit acb9b6e9f20eec9d3799b50cb17c2e192c47c692
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 15 18:55:03 2009 +0100
+
+    dpkg-source: improve ignore regexp to catch vi swap files
+    
+    dpkg-source now ignores all possible vi swap file extensions (and not only
+    .swp). The corresponding exclude pattern for -I also got tightened to only
+    catch filenames starting with a dot. Closes: #515540
+
+ debian/changelog               |    3 +++
+ scripts/Dpkg/Source/Package.pm |    4 ++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit edbbd18df03628407f3d3628d0e49014dbc9ba48
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 15 18:18:44 2009 +0100
+
+    Dpkg::Version::check_version() should not die by default
+    
+    Add a new parameter to Dpkg::Version::check_version() to control whether
+    we should die in case of illegal version.
+    
+    Update all check_version() calls to pass this parameter and factorize some
+    duplicate calls in Dpkg::Source::Package::* with a single check in
+    the parent class Dpkg::Source::Package.
+
+ debian/changelog                      |    2 ++
+ scripts/Dpkg/Source/Package.pm        |    4 +++-
+ scripts/Dpkg/Source/Package/V1.pm     |    3 ---
+ scripts/Dpkg/Source/Package/V2.pm     |    3 ---
+ scripts/Dpkg/Source/Package/V3/bzr.pm |    3 ---
+ scripts/Dpkg/Source/Package/V3/git.pm |    3 ---
+ scripts/Dpkg/Version.pm               |   20 ++++++++++++++------
+ scripts/dpkg-buildpackage.pl          |    3 +--
+ scripts/dpkg-source.pl                |    2 +-
+ 9 files changed, 21 insertions(+), 22 deletions(-)
+
+commit 646c8876609072af7f456a78b046b0432e2c44d1
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sun Mar 15 15:28:53 2009 +0100
+
+    Completed Asturian translation
+
+ debian/changelog |    2 +-
+ po/ast.po        |  807 +++++++++++++++++++-----------------------------------
+ 2 files changed, 287 insertions(+), 522 deletions(-)
+
+commit 9520a890c2459186ddc7137d119b50cfa1cf1e40
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Sun Mar 15 14:44:15 2009 +0100
+
+    Partial French translation update
+
+ debian/changelog |    1 +
+ po/fr.po         |  479 +++++++++++++++++++++++++-----------------------------
+ 2 files changed, 221 insertions(+), 259 deletions(-)
+
+commit 4f761d89c84cee18e16da472daea38769fbcce0e
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 15 10:49:52 2009 +0100
+
+    dpkg-genchanges, dpkg-gencontrol: avoid perl warnings
+    
+    Fix dpkg-genchanges and dpkg-gencontrol to not trigger perl warnings
+    when the Architecture field is missing.
+
+ debian/changelog           |    2 ++
+ scripts/dpkg-genchanges.pl |    2 +-
+ scripts/dpkg-gencontrol.pl |    6 +++---
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+commit b02e87457ceb9c849915180034b9247d0c228df8
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 15 10:30:26 2009 +0100
+
+    Update deb-triggers(5) and dpkg-trigger(1)
+    
+    Update deb-triggers(5) and dpkg-trigger(1) to add a reference to
+    /usr/share/doc/dpkg/triggers.txt.gz.
+
+ debian/changelog   |    2 ++
+ man/deb-triggers.5 |    3 ++-
+ man/dpkg-trigger.1 |    2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 7d0ea44e98bfa20f6e5a16a3201f8a4cb1037710
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Fri Mar 13 20:33:46 2009 +0100
+
+    Updated French translation
+
+ scripts/po/fr.po |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit ce04415c6b809e4936f9b69d5ea60daa06f0657d
+Author: Marcos <marcos.alvarez.costales@gmail.com>
+Date:   Fri Mar 13 20:32:45 2009 +0100
+
+    Add Asturian translation
+    
+    Closes: #519478
+
+ debian/changelog |    3 +
+ po/ast.po        | 6509 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 6512 insertions(+), 0 deletions(-)
+
+commit 6e9f17ba8fa0ae75aee08579d08ba3fae8175869
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Fri Mar 13 18:02:35 2009 +0100
+
+    Fix Swedish translation so that it doesn't make po4a fail
+
+ man/po/sv.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c81e27d8d841199be246cd9e0b41f7ea44160afe
+Author: Peter Krefting <peterk@debian.org>
+Date:   Wed Mar 11 14:38:07 2009 +0100
+
+    Update Swedish translation
+    
+    Updated po/sv.po to 1012t0f0u.
+    Updated man/po/sv.po to 1657t0f0u.
+
+ debian/changelog |    1 +
+ man/po/sv.po     |  765 +++++++++++++++++++++++++++++++-----------------------
+ po/sv.po         |   14 +-
+ 3 files changed, 444 insertions(+), 336 deletions(-)
+
+commit ea2fc2fc25e4b3bd7481100cc449fa023a44ba51
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 11 02:57:32 2009 +0200
+
+    Regenerate dpkg-man.pot and merge .po files with it
+
+ man/po/de.po        |  581 +++++++++++++++++++++++++++++----------------------
+ man/po/dpkg-man.pot |  498 +++++++++++++++++++++++++------------------
+ man/po/es.po        |  524 ++++++++++++++++++++++++++--------------------
+ man/po/fr.po        |  529 +++++++++++++++++++++++++++--------------------
+ man/po/hu.po        |  525 ++++++++++++++++++++++++++--------------------
+ man/po/ja.po        |  526 +++++++++++++++++++++++++++--------------------
+ man/po/pl.po        |  527 +++++++++++++++++++++++++++--------------------
+ man/po/pt_BR.po     |  525 ++++++++++++++++++++++++++--------------------
+ man/po/ru.po        |  526 +++++++++++++++++++++++++++--------------------
+ man/po/sv.po        |  527 +++++++++++++++++++++++++++--------------------
+ 10 files changed, 3047 insertions(+), 2241 deletions(-)
+
+commit 2c43c07e599d2f26ef7cebf5f9adaaa4bb9c279f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 11 02:51:33 2009 +0200
+
+    u-a: Fix typo in man page (‘values’ → ‘value’)
+    
+    Introduced in commit 7277e7e87af9cf4313880f228c693aa78ad46a03.
+    
+    Reported-by: Helge Kreutzmann <debian@helgefjell.de>
+
+ man/update-alternatives.8 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2ad24268349afa6cdc56a14bf872a624e3f871a1
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 11 02:19:58 2009 +0200
+
+    Add missing bug closure for Slovak translation
+    
+    Missed in commit d95c2b580e4db994e5ad51e13baa3192fd8827d6.
+    
+    Closes: #519084
+
+ debian/changelog |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit b9be5e2b188d3a02929ebd9faa6ab52fc71d4183
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 11 02:17:46 2009 +0200
+
+    Change Slovak maintainer to Ivan Masár
+
+ dselect/po/LINGUAS |    2 +-
+ po/LINGUAS         |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 96ac92ab3f5439ab1ab510a55fb6e8a805269e04
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Tue Mar 10 21:40:54 2009 +0100
+
+    Update german translation of manual pages
+    
+    Update to 1600t25f20u.
+
+ debian/changelog |    3 +
+ man/po/de.add    |    2 +-
+ man/po/de.po     |  480 +++++++++++++++++++++++++++++-------------------------
+ 3 files changed, 260 insertions(+), 225 deletions(-)
+
+commit ab12b07d0575bc9a7a02311fee4447a247914d1b
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Mar 10 16:13:45 2009 +0200
+
+    Regenerate dpkg.pot and merge .po files with it
+
+ po/bs.po    |    8 ++------
+ po/ca.po    |   15 +++++++--------
+ po/cs.po    |   13 ++++++-------
+ po/da.po    |   13 ++++++-------
+ po/de.po    |   13 ++++++-------
+ po/dpkg.pot |    8 ++------
+ po/dz.po    |   13 ++++++-------
+ po/el.po    |   13 ++++++-------
+ po/es.po    |   13 ++++++-------
+ po/et.po    |   13 ++++++-------
+ po/eu.po    |   13 ++++++-------
+ po/fr.po    |   13 ++++++-------
+ po/gl.po    |   13 ++++++-------
+ po/hu.po    |   13 ++++++-------
+ po/id.po    |   13 ++++++-------
+ po/it.po    |   13 ++++++-------
+ po/ja.po    |   13 ++++++-------
+ po/km.po    |   13 ++++++-------
+ po/ko.po    |   13 ++++++-------
+ po/ku.po    |    8 ++------
+ po/lt.po    |   13 ++++++-------
+ po/mr.po    |   13 ++++++-------
+ po/nb.po    |   13 ++++++-------
+ po/ne.po    |   13 ++++++-------
+ po/nl.po    |   13 ++++++-------
+ po/nn.po    |   13 ++++++-------
+ po/pa.po    |    8 ++------
+ po/pl.po    |   13 ++++++-------
+ po/pt.po    |   13 ++++++-------
+ po/pt_BR.po |   13 ++++++-------
+ po/ro.po    |   13 ++++++-------
+ po/ru.po    |   13 ++++++-------
+ po/sk.po    |    9 ++++-----
+ po/sv.po    |   11 +++++------
+ po/th.po    |   13 ++++++-------
+ po/tl.po    |   13 ++++++-------
+ po/vi.po    |   13 ++++++-------
+ po/zh_CN.po |   13 ++++++-------
+ po/zh_TW.po |   13 ++++++-------
+ 39 files changed, 216 insertions(+), 267 deletions(-)
+
+commit d95c2b580e4db994e5ad51e13baa3192fd8827d6
+Author: Ivan Masár <helix84@centrum.sk>
+Date:   Tue Mar 10 16:11:22 2009 +0200
+
+    Update Slovak dpkg translation
+    
+    Update to 1013t.
+
+ po/sk.po |  571 ++++++++++++++++++++++++++++----------------------------------
+ 1 files changed, 260 insertions(+), 311 deletions(-)
+
+commit c473bbca60d67ee9d64a4fbe63507e8c9d73bb93
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Mar 10 15:55:56 2009 +0200
+
+    Fix typo in dpkg output (‘unexecpted’ → ‘unexpected’)
+    
+    Closes: #519082
+    Reported-by: Ivan Masár <helix84@centrum.sk>
+
+ debian/changelog |    4 ++++
+ src/filesdb.c    |    2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 8c651a05314924ed5823a8d995e515d34d0cfa4c
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Mar 9 22:54:13 2009 +0100
+
+    dpkg-source: add --skip-debianization extract option
+    
+    Extracting a source package with --skip-debianization can be interesting
+    when you want to import a source package in a VCS and want to import
+    the upstream sources without having precise knowledge of the internals
+    of all source package formats. This option is only supported for the
+    source formats "1.0", "2.0" and "3.0 (quilt)" that handle clearly
+    identified upstream sources.
+
+ man/dpkg-source.1                 |    6 ++++++
+ scripts/Dpkg/Source/Package.pm    |   10 ++++++++--
+ scripts/Dpkg/Source/Package/V1.pm |    6 +++++-
+ scripts/Dpkg/Source/Package/V2.pm |    9 ++++++++-
+ 4 files changed, 27 insertions(+), 4 deletions(-)
+
+commit 1463ac71babf0432b5753c20eebc060363694e34
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Mar 9 22:21:28 2009 +0100
+
+    dpkg-source: drop support of debian/control's Format field
+    
+    There are no interesting use case where it makes sense to hardcode
+    the source format directly in debian/control. So drop that feature
+    before people start abusing this field instead of using
+    debian/source/format (which dpkg-source can have to create in some cases).
+
+ debian/changelog       |    3 +++
+ man/dpkg-source.1      |    4 +---
+ scripts/dpkg-source.pl |    6 ++----
+ 3 files changed, 6 insertions(+), 7 deletions(-)
+
+commit 758986f4ed29e24270f89dc3f53e53f5782be2dd
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Mar 9 21:11:58 2009 +0100
+
+    dpkg-source(1): document format of debian/source/* files
+    
+    Also fix parsing of debian/source/include-binaries to ignore empty lines
+    in Dpkg::Source::Package::V2::do_build().
+
+ man/dpkg-source.1                 |   22 ++++++++++++++++++++--
+ scripts/Dpkg/Source/Package/V2.pm |    2 +-
+ 2 files changed, 21 insertions(+), 3 deletions(-)
+
+commit 492feedb3e75d99e9003105f5312d052d1156bc2
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Mar 9 20:43:26 2009 +0100
+
+    Add missing changelog entry.
+
+ debian/changelog |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit b67df30f27c89bcba8ada8b916f13a135daeda7e
+Author: Christian Perrier <bubulle@debian.org>
+Date:   Mon Mar 9 07:01:36 2009 +0100
+
+    Recomplete French translations
+    
+    Update to 473t.
+
+ debian/changelog |    1 +
+ scripts/po/fr.po |   46 +++++++++++++++++++++++++++++-----------------
+ 2 files changed, 30 insertions(+), 17 deletions(-)
+
+commit 3ebe1d45258628e9138ba65903e56b571dbf4bd7
+Author: Helge Kreutzmann <debian@helgefjell.de>
+Date:   Sun Mar 8 20:42:42 2009 +0100
+
+    Recomplete german scripts translation
+    
+    Update to 473t.
+
+ debian/changelog |    1 +
+ scripts/po/de.po |   42 ++++++++++++++++++++++++++----------------
+ 2 files changed, 27 insertions(+), 16 deletions(-)
+
+commit 5ee2d60084f43f1b51907e77dd9f07dc4d810618
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 8 19:13:49 2009 +0100
+
+    dpkg-shlibdeps: make shlibs.local override symbols files too
+    
+    As discussed in http://lists.debian.org/debian-devel/2009/03/msg00428.html
+    dropping the shlibs.local package override for symbols files was not
+    necessarily a good idea. So this commit makes dpkg-shlibdeps skip
+    the symbols files for a library if it detects that the relevant dependency
+    is available in the shlibs.local file.
+
+ man/dpkg-shlibdeps.1      |    3 ++-
+ scripts/dpkg-shlibdeps.pl |    9 ++++++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+commit 5fd387999d92ef1f47560980cffb54565a72a96b
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 8 16:11:53 2009 +0100
+
+    dpkg-shlibdeps: don't fail on binaries outside of a package's dir
+    
+    Dpkg 1.15.0 introduced a regression by trying to deduce the target
+    directory in order to adjust some warnings. This check failed when
+    dpkg-shlibdeps was run on files not (yet) installed in the package's
+    directory (debian/package/). Fix that and emit a warning so that
+    maintainers are encouraged to analyze the binaries once they have
+    been installed in their target directory.
+
+ debian/changelog          |    2 ++
+ scripts/dpkg-shlibdeps.pl |   10 ++++++++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+commit ea1530fe45c8b1ad61d91c0791c53ecf363899bf
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Sun Mar 8 15:50:58 2009 +0100
+
+    dpkg-source: call quilt only once to apply all patches
+    
+    Refactor Dpkg::Source::Package::V3::quilt::apply_patches() to
+    call quilt only once (quilt push -a -q) instead of once per package. This
+    dramatically improves performance for packages like glibc that
+    have a large number of patches.
+
+ debian/changelog                        |    2 +
+ scripts/Dpkg/Source/Package/V3/quilt.pm |   45 ++++++++++++++++++------------
+ 2 files changed, 29 insertions(+), 18 deletions(-)
+
+commit 1a01979e7607a068c7d33acfa238a08547b5b69a
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 4 23:26:33 2009 +0200
+
+    Regenerate .pot files and merge .po files with them
+
+ po/bs.po    |  132 +++++++++++++++++++++++++------------
+ po/ca.po    |  153 +++++++++++++++++++++++++------------------
+ po/cs.po    |  153 +++++++++++++++++++++++++------------------
+ po/da.po    |  153 +++++++++++++++++++++++++------------------
+ po/de.po    |  153 +++++++++++++++++++++++++------------------
+ po/dpkg.pot |  132 +++++++++++++++++++++++++------------
+ po/dz.po    |  153 +++++++++++++++++++++++++------------------
+ po/el.po    |  153 +++++++++++++++++++++++++------------------
+ po/es.po    |  153 +++++++++++++++++++++++++------------------
+ po/et.po    |  141 +++++++++++++++++++++++++---------------
+ po/eu.po    |  153 +++++++++++++++++++++++++------------------
+ po/fr.po    |  153 +++++++++++++++++++++++++------------------
+ po/gl.po    |  153 +++++++++++++++++++++++++------------------
+ po/hu.po    |  150 +++++++++++++++++++++++++------------------
+ po/id.po    |  150 +++++++++++++++++++++++++------------------
+ po/it.po    |  153 +++++++++++++++++++++++++------------------
+ po/ja.po    |  153 +++++++++++++++++++++++++------------------
+ po/km.po    |  153 +++++++++++++++++++++++++------------------
+ po/ko.po    |  153 +++++++++++++++++++++++++------------------
+ po/ku.po    |  138 +++++++++++++++++++++++++--------------
+ po/lt.po    |  150 +++++++++++++++++++++++++------------------
+ po/mr.po    |  154 +++++++++++++++++++++++++-------------------
+ po/nb.po    |  153 +++++++++++++++++++++++++------------------
+ po/ne.po    |  153 +++++++++++++++++++++++++------------------
+ po/nl.po    |  153 +++++++++++++++++++++++++------------------
+ po/nn.po    |  150 +++++++++++++++++++++++++------------------
+ po/pa.po    |  132 +++++++++++++++++++++++++------------
+ po/pl.po    |  153 +++++++++++++++++++++++++------------------
+ po/pt.po    |  153 +++++++++++++++++++++++++------------------
+ po/pt_BR.po |  153 +++++++++++++++++++++++++------------------
+ po/ro.po    |  153 +++++++++++++++++++++++++------------------
+ po/ru.po    |  153 +++++++++++++++++++++++++------------------
+ po/sk.po    |  153 +++++++++++++++++++++++++------------------
+ po/sv.po    |  209 ++++++++++++++++++++++++++++++++---------------------------
+ po/th.po    |  153 +++++++++++++++++++++++++------------------
+ po/tl.po    |  151 +++++++++++++++++++++++++------------------
+ po/vi.po    |  153 +++++++++++++++++++++++++------------------
+ po/zh_CN.po |  156 +++++++++++++++++++++++++-------------------
+ po/zh_TW.po |  153 +++++++++++++++++++++++++------------------
+ 39 files changed, 3458 insertions(+), 2465 deletions(-)
+
+commit d111d026a51110f95cc1661efaa99e2650843a5f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Mar 4 23:24:44 2009 +0200
+
+    Add new files missed on code refactoring
+    
+    Reported-by: Sven Joachim <svenjoac@gmx.de>
+
+ po/POTFILES.in |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 9b5eebb259cd074f0b175bdaeb60cf35397eb049
+Author: Peter Krefting <peterk@debian.org>
+Date:   Tue Mar 3 14:20:44 2009 +0100
+
+    Update Swedish translation.
+    
+    Updated dselect/po/sv.po to 283t0f0u.
+    Updated scripts/po/sv.po to 473t0f0u.
+    Updated po/sv.po to 1004t0f0u.
+
+ debian/changelog |    7 +
+ dselect/po/sv.po |    8 +-
+ po/sv.po         |  546 +++++++++++++++++++++++++-----------------------------
+ scripts/po/sv.po |   39 ++--
+ 4 files changed, 282 insertions(+), 318 deletions(-)
+
+commit b53a6a7e6651e82eeb8cfafa1981b1c5d33b4e04
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Feb 11 03:31:24 2009 +0200
+
+    Add new pkg_array_free function
+    
+    Use it to free the arrays after use, so that we do not leak.
+
+ src/pkg-array.c |    8 ++++++++
+ src/pkg-array.h |    1 +
+ src/query.c     |    4 ++++
+ src/select.c    |    2 ++
+ 4 files changed, 15 insertions(+), 0 deletions(-)
+
+commit 45e5ee9e4c9195a488c2e0e246b855e4bcbe6b4f
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Feb 11 03:28:19 2009 +0200
+
+    Refactor package array handling
+    
+    Create a new pkg_array structure, and two new functions to initialize
+    from the db, and to sort the array.
+
+ src/Makefile.am                  |    4 +-
+ src/pkg-array.c                  |   29 ++++++++++++++++
+ src/{pkg-array.c => pkg-array.h} |   27 ++++++++-------
+ src/query.c                      |   69 ++++++++++++++-----------------------
+ src/select.c                     |   27 +++++----------
+ 5 files changed, 80 insertions(+), 76 deletions(-)
+
+commit 2c0667d06a38c3a31ab43b79a979f29e5fcf0cf3
+Author: Guillem Jover <guillem@debian.org>
+Date:   Tue Feb 10 03:23:36 2009 +0200
+
+    Rename pkg-list.c to pkg-array.c
+
+ src/Makefile.am                 |    4 ++--
+ src/{pkg-list.c => pkg-array.c} |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 4da4f0145a451a13eab2cdb6b1d5e46d857fd93b
+Author: Raphael Hertzog <hertzog@debian.org>
+Date:   Mon Mar 2 18:10:40 2009 +0100
+
+    dpkg-genchanges: correctly handles additional upstream tarballs
+    
+    The source format 3.0 (quilt) allows additional upstream tarballs
+    named <pkg>_<upstreamversion>.orig-<component>.tar.<ext>. They
+    should be treated like normal .orig tarballs and be left out
+    like them in normal "binary and diff upload".
+
+ debian/changelog           |    5 +++++
+ scripts/dpkg-genchanges.pl |    5 +++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+commit 06665a08379c3a3054906602703077793f1bd048
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Mon Mar 2 17:21:57 2009 +0100
+
+    Update german dselect translation
+    
+    Update to 283t.
+
+ debian/changelog |    3 ++-
+ dselect/po/de.po |   50 ++++----------------------------------------------
+ 2 files changed, 6 insertions(+), 47 deletions(-)
+
+commit 1a0b8ade8f5f5130f77415f86f1686e8c097b768
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 2 06:56:25 2009 +0200
+
+    Switch to automatically generating the ChangeLog file
+    
+    Keep the old ChangeLog files as ChangeLog.old, and distribute them.
+    Automatically genereate the ChangeLog from “git log”. And update the
+    information for translators.
+
+ .gitignore                              |    1 +
+ ChangeLog => ChangeLog.old              |    0
+ Makefile.am                             |    6 ++++
+ README.translators                      |   44 +++++++++---------------------
+ debian/rules                            |    4 +-
+ dselect/po/{ChangeLog => ChangeLog.old} |    0
+ dselect/po/Makevars                     |    2 +
+ man/Makefile.am                         |    2 +-
+ man/po/{ChangeLog => ChangeLog.old}     |    0
+ po/{ChangeLog => ChangeLog.old}         |    0
+ po/Makevars                             |    2 +
+ scripts/po/{ChangeLog => ChangeLog.old} |    0
+ scripts/po/Makevars                     |    2 +
+ 13 files changed, 29 insertions(+), 34 deletions(-)
+
+commit 883b6e840f06e7d05e1c6a23824c5aefd3466754
+Author: Guillem Jover <guillem@debian.org>
+Date:   Mon Mar 2 06:23:10 2009 +0200
+
+    Bump version to 1.15.1~
+
+ configure.ac     |    2 +-
+ debian/changelog |    6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletions(-)
diff -uNr --exclude .git --exclude .bzr dpkg/ChangeLog.old /home/vorlon/devel/multiarch/dpkg-debian/ChangeLog.old
--- dpkg/ChangeLog.old	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/ChangeLog.old	2012-06-07 10:11:09.426073000 -0700
@@ -297,7 +297,7 @@
 
 2009-02-06  Raphaël Hertzog  <hertzog@debian.org>
 
-	* scripts/update-alternatives.pl: Ensure that a non-existant
+	* scripts/update-alternatives.pl: Ensure that a non-existent
 	alternative result in automatic mode configuration.
 
 2009-02-06  Raphaël Hertzog  <hertzog@debian.org>
@@ -4901,7 +4901,7 @@
 
 2007-10-12  Frank Lichtenheld  <djpig@debian.org>
 
-	* man/dpkg.1 (AUTHORS): Remove some unneccessary markup.
+	* man/dpkg.1 (AUTHORS): Remove some unnecessary markup.
 	Allows reuse of one more msgid.
 
 	* man/Makefile.am (update-po): New target to easily
@@ -5070,7 +5070,7 @@
 
 	* scripts/dpkg-source.pl (handleformat): Include
 	a trailing HT character in the diff labels if
-	the filename contains spaces. Apparantly this is
+	the filename contains spaces. Apparently this is
 	standard but undocumented diff behaviour.
 
 2007-09-30  Frank Lichtenheld  <djpig@debian.org>
@@ -5386,7 +5386,7 @@
 	maintainer_script_installed depending on the conflictor variable.
 	* src/packages.c (dependencies_ok): Remove comment stating that
 	Breaks needs to be implemented.
-	* src/depcon.c (depisok): Likewise. Remove return at the beggining
+	* src/depcon.c (depisok): Likewise. Remove return at the beginning
 	of the function checking for a Breaks dependency, that was
 	efectively making it a no-op in that case.
 	* src/processarc.c (process_archive): Fix indentation. Split calls
@@ -6575,7 +6575,7 @@
 	* scripts/controllib.pl (usageerr): Do not mark "%s: %s" for
 	translation.
 	* scripts/changelog/debian.pl: Remove "or argument" from the
-	"unkown option" string to merge it with other similar ones.
+	"unknown option" string to merge it with other similar ones.
 	* scripts/dpkg-distaddfile.pl: Quote '%s' in the "unknown option"
 	string.
 	* scripts/dpkg-source.pl: Likewise.
@@ -7077,7 +7077,7 @@
 
 2006-04-19  Nicolas Francois  <nicolas.francois@centraliens.net>
 
-	* man/C/install-info.8: Add a missing quote arround the date.
+	* man/C/install-info.8: Add a missing quote around the date.
 	* man/C/dpkg-source.1: Add a reference to the Debian Policy Manual
 	for a detailed description of the shlibs format.
 	Thanks to Russ Allbery.
@@ -7386,7 +7386,7 @@
 	and deleted configuration files. Gives and more
 	accurate description to the user and eliminates
 	a warning that was produced when trying to
-	backup a non-existant file.
+	backup a non-existent file.
 
 	* lib/dpkg-db.h (conffile): Add `obsolete' field.
 	* lib/dump.c (w_conffiles): Write "obsolete" at the
@@ -7544,7 +7544,7 @@
 	multiple versions of packages in a single Packages file;
 	use Getopt::Long instead of attempting to parse the command line
 	ourselves and doing it badly;
-	get rid of unecessary hashes and arrays that aren't used at all;
+	get rid of unnecessary hashes and arrays that aren't used at all;
 	output help when given the --help/-h/-? options
 
 2006-01-29  maximilian attems  <debian@sternwelten.at>
@@ -7643,7 +7643,7 @@
 	of the version in filenames, use (?=[.-]) and (?=\.) instead.
 	\b doesn't work in case the version ends with ~.
 
-	* AUTHORS: Updated for new maintainance team
+	* AUTHORS: Updated for new maintenance team
 	* debian/copyright: Add myself as copyright holder since
 	I also added a note to that effect with my dpkg-shlibdeps
 	patch.
@@ -7760,7 +7760,7 @@
 
 	* scripts/dpkg-source.pl: If gpg is installed, check
 	the signature of the .dsc file before unpacking.
-	Allow the unpacking to suceed if the .dsc is unsigned
+	Allow the unpacking to succeed if the .dsc is unsigned
 	but error out if the signature is bad. If gpg exits
 	with a code >2 (e.g. missing key), show the user the gpg
 	output but continue.
@@ -8270,14 +8270,14 @@
 	name pattern.  Document format of file --set-selections takes.
 
 	* man/C/dpkg-source.1: Remove unnecessary references to policy
-	and non-existant packaging manual.  Refer to dpkg-shlibdeps(1)
+	and non-existent packaging manual.  Refer to dpkg-shlibdeps(1)
 	for shlibs file format.  Will need to document changelog format
 	at some point.
 	* man/C/dselect.1: Remove unnecessary reference to policy, refer
 	other reference to the package by name.
-	* man/C/deb-old.5: Remove reference to non-existant packaging
+	* man/C/deb-old.5: Remove reference to non-existent packaging
 	manual.
-	* man/C/deb.5: Remove reference to non-existant packaging
+	* man/C/deb.5: Remove reference to non-existent packaging
 	manual, will have to document control contents better here later.
 
 	* man/C/dpkg.1: Fix typo (fileis -> file is).
@@ -8388,7 +8388,7 @@
 	* debian/dpkg.install: Remove md5sum-related files.
 	* debian/copyright: Remove mentions of utils/md5sum.c.
 	* debian/pseudo-tags: Remove md5sum tag; no point filing bugs on
-	a non-existant program.
+	a non-existent program.
 
 	* ostable (netbsd): Restore missing "*" on the end of the regex.
 
@@ -8537,7 +8537,7 @@
 	(rewrite_gnu): Rewrite along the lines of the code in m4/arch.m4 so
 	they should actually be vaguely consistent now.
 
-	* scripts/Makefile.am (do_perl_subst): Replace occurances of
+	* scripts/Makefile.am (do_perl_subst): Replace occurrences of
 	$pkgdatadir in scripts with the right value.
 
 2005-01-22  Robert Millan  <rmh@debian.org>
@@ -9809,7 +9809,7 @@
 
 Tue Apr 27 19:23:01 BST 2004 Scott James Remnant <scott@netsplit.com>
 
-  * main/dpkg.8: Correct reference to non-existant --force-reinstreq
+  * main/dpkg.8: Correct reference to non-existent --force-reinstreq
   option to --force-remove-reinstreq.
 
 Tue Apr 27 19:01:28 BST 2004 Ruben Porras <nahoo82@telefonica.net>
@@ -10202,7 +10202,7 @@
       Some fields may have vars in them, which breaks the validation.
     * dpkg-gencontrol calls substvars after parsing the control file, and
       then validates the substituted depends lines.  Originally,
-      substitution occured only during writing of the final output file.
+      substitution occurred only during writing of the final output file.
     * Andreas Barth <aba@not.so.argh.org>:
       Fix bad regex that didn't allow spaces in dependency field parsing.
       It now directly matches what the c code expects.  It previously was
@@ -11279,8 +11279,8 @@
 
 Wed Jan  2 15:00:26 CET 2002 Wichert Akkerman <wakkerma@debian.org>
 
-  * scripts/dpkg-checkbuilddeps.pl: use space seperated output instead
-    of comma seperated
+  * scripts/dpkg-checkbuilddeps.pl: use space separated output instead
+    of comma separated
 
 Tue Jan  1 14:10:55 CET 2002 Wichert Akkerman <wakkerma@debian.org>
 
@@ -12415,7 +12415,7 @@
 
 Fri Apr 20 14:59:14 CDT 2001 Adam Heath <doogie@debian.org>
 
-  * main/main.c: Accidentally commited a debug fprintf stmt in the last ci.
+  * main/main.c: Accidentally committed a debug fprintf stmt in the last ci.
 
 Fri Apr 20 13:42:12 CDT 2001 Adam Heath <doogie@debian.org>
 
@@ -12424,7 +12424,7 @@
 Fri Apr 20 13:02:23 CDT 2001 Adam Heath <doogie@debian.org>
 
   * po/fr.po: Fix typo.
-  * debian/changelog: Close additional bugs, from other already commited
+  * debian/changelog: Close additional bugs, from other already committed
     patches.
 
 Thu Apr 19 15:18:05 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
@@ -12438,7 +12438,7 @@
 
 Thu Apr 19 00:14:39 CDT 2001 Adam Heath <doogie@debian.org>
 
-  * main/enquiry.c: Errors during dpkg -s(and other similiar commands) are
+  * main/enquiry.c: Errors during dpkg -s(and other similar commands) are
     now printed on stderr.
 
 Thu Apr 19 00:03:16 CDT 2001 Adam Heath <doogie@debian.org>
@@ -12650,7 +12650,7 @@
 Fri Feb  2 14:27:47 CET 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/dpkg-statoverride.pl: use -e instead of -f to test
-    for filesystem object existance
+    for filesystem object existence
   * scripts/dpkg-source.pl: swap chdir and open in extracttar to
     prevent race with source-directory being removed while the
     sh/grep process is still running. Patch from Colin Watson
@@ -13156,7 +13156,7 @@
       warning if there is a NEEDED line in the objdump output that we cannot
       grok.
     + scripts/update-rc.d.pl: fix typo in regexp for scripts
-    + debian/rules: remove final occurance of emacs
+    + debian/rules: remove final occurrence of emacs
 
 Mon Dec  4 01:34:57 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
@@ -13699,7 +13699,7 @@
 Sun Feb 13 01:06:46 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/dpkg-buildpackage.sh: we know that dpkg-architecture is
-    installed since we provide it, so don't test for its existance
+    installed since we provide it, so don't test for its existence
   * More updates from Marcus Brinkman:
     + archtable: Change first column format from CPU to CPU-OS.
       Add entry for i386-gnu. Update comment.
@@ -14103,7 +14103,7 @@
   * Make it all build again
   * retro-actively add this ChangeLog entry
   * Removed bogus po/dpkg.po file
-  * No longer translater internal errors.. we want to see the English text
+  * No longer translate internal errors.. we want to see the English text
     in bugreports
 
 Fri Oct 29 20:16:43 EDT 1999 Ben Collins <bcollins@debian.org>
@@ -14158,7 +14158,7 @@
     error reporting. Also corrected checks on shlibs.local, which wasn't
     really being parsed, it now works as advertised.
   * scripts/{dpkg-gencontrol,dpkg-source,controllib.pl}: fixed references
-    to old style build dep fields to match current policy ammendment
+    to old style build dep fields to match current policy amendment
 
 Mon Oct 25 17:12:34 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 
@@ -14235,7 +14235,7 @@
     it was already broken when there was no gcc anyway :)
   * Fixed missing mipseb that was supposed to be in the archtable
   * Better output in update-alternatives --config, now shows the
-    current, and the prefered choices.
+    current, and the preferred choices.
   * dpkg-name: ignore epoch when getting version
   * 50dpkg-dev.el: add it as a conffile for dpkg-dev
   * dpkg-shlibdeps: redirect STDERR to /dev/null for the dpkg fork so we
@@ -14338,7 +14338,7 @@
     to libtool itself after running configure, much cleaner, and
     reversible since libtool is a generated file
   * Use DESTDIR when installing instead of specifying all our
-    dest dirs seperately in the make line. Also fix some of the
+    dest dirs separately in the make line. Also fix some of the
     make files to use DESTDIR when installing files
   * Regenerated .po files and dpkg.pot. Also added update.sh to the po/
     subdir for easier regenerating for cvs only
@@ -14805,7 +14805,7 @@
     against libraries it depends on).  Code by Richard Braakman
     <dark@xs4all.nl> and Yann Dirson <dirson@debian.org>.
   * debian/rules: remove all reference to the packaging manual as it is
-    now provided by the seperate "packaging-manual" package. [#21581,
+    now provided by the separate "packaging-manual" package. [#21581,
     #21186, #22698, #23342]
   * debian/rules: link dpkg-divert.1.gz to undocumented.7.gz as the lack
     of a real manpage has been reported in #11093.
@@ -14946,7 +14946,7 @@
   * Provide 50dpkg-dev.el for xemacs as well as emacs.
   * Explicitly provide path for debian-changelog-mode in 50dpkg-dev to use
     .el file as workaround until xemacs can read emacs19 .elc files.
-  * Pass top_distdir explicitly to 'make dist' to accomodate bug in
+  * Pass top_distdir explicitly to 'make dist' to accommodate bug in
     automake_1.1o-1.
   * Fix debian/build to make html documentation without including
     directories in tar archives (fixes #9348).
@@ -15127,7 +15127,7 @@
 dpkg (1.4.0.2) unstable; urgency=medium
 
   * dpkg-buildpackage.sh: reverted the quoting change -- (you
-    should use super, sudo, realy, but not su.  Or write a wrapper
+    should use super, sudo, really, but not su.  Or write a wrapper
     around su)
   * dpkg-buildpackge.sh: passing -m, -C, -v options to dpkg-genchanges
     more the way Ian likes ;-)
@@ -16068,7 +16068,7 @@
   * `hold' flag changed to be settable by the user only, and
     made orthogonal to the `reinstallation required' flag.
   * dpkg will install by default any packages with priority of
-    `standard' or better unless they're explictly deselected.
+    `standard' or better unless they're explicitly deselected.
 
   * dselect dependency/conflict resolution will suggest marking absent
     packages for `purge' rather than `deinstall'.
diff -uNr --exclude .git --exclude .bzr dpkg/config.h.in /home/vorlon/devel/multiarch/dpkg-debian/config.h.in
--- dpkg/config.h.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/config.h.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,340 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Set this to the canonical dpkg architecture name. */
+#undef ARCHITECTURE
+
+/* Set this to the canonical dpkg CPU name. */
+#undef ARCHITECTURE_CPU
+
+/* Set this to the canonical dpkg system name. */
+#undef ARCHITECTURE_OS
+
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+#undef ENABLE_NLS
+
+/* Define to 1 if you have the `alphasort' function. */
+#undef HAVE_ALPHASORT
+
+/* Define to 1 if you have the `asprintf' function. */
+#undef HAVE_ASPRINTF
+
+/* Define to 1 if you have the `bcopy' function. */
+#undef HAVE_BCOPY
+
+/* Define to 1 if the compiler supports C99. */
+#undef HAVE_C99
+
+/* Define to 1 if the 'snprintf' family is C99 conformant */
+#undef HAVE_C99_SNPRINTF
+
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
+/* Define to 1 if you have the <curses.h> header file. */
+#undef HAVE_CURSES_H
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+   */
+#undef HAVE_DCGETTEXT
+
+/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
+   don't. */
+#undef HAVE_DECL_SYS_SIGLIST
+
+/* Define to 1 if you have the <error.h> header file. */
+#undef HAVE_ERROR_H
+
+/* Define to 1 if you have the `getdtablesize' function. */
+#undef HAVE_GETDTABLESIZE
+
+/* Define to 1 if you have the `getexecname' function. */
+#undef HAVE_GETEXECNAME
+
+/* Define to 1 if you have the `getopt' function. */
+#undef HAVE_GETOPT
+
+/* Define to 1 if you have the `getopt_long' function. */
+#undef HAVE_GETOPT_LONG
+
+/* Define to 1 if you have the `getprogname' function. */
+#undef HAVE_GETPROGNAME
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define if you have the iconv() function and it works. */
+#undef HAVE_ICONV
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `isascii' function. */
+#undef HAVE_ISASCII
+
+/* Define to 1 if you have the <kvm.h> header file. */
+#undef HAVE_KVM_H
+
+/* Define to 1 if you have the <libintl.h> header file. */
+#undef HAVE_LIBINTL_H
+
+/* Define to 1 if you have the <linux/fiemap.h> header file. */
+#undef HAVE_LINUX_FIEMAP_H
+
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
+/* Define to 1 if you have the `lutimes' function. */
+#undef HAVE_LUTIMES
+
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `mmap' function. */
+#undef HAVE_MMAP
+
+/* Define to 1 if you have the <ncursesw/ncurses.h> header file. */
+#undef HAVE_NCURSESW_NCURSES_H
+
+/* Define to 1 if you have the <ncursesw/term.h> header file. */
+#undef HAVE_NCURSESW_TERM_H
+
+/* Define to 1 if you have the <ncurses.h> header file. */
+#undef HAVE_NCURSES_H
+
+/* Define to 1 if you have the <ncurses/ncurses.h> header file. */
+#undef HAVE_NCURSES_NCURSES_H
+
+/* Define to 1 if you have the <ncurses/term.h> header file. */
+#undef HAVE_NCURSES_TERM_H
+
+/* Define to 1 if you have the `obstack_free' function. */
+#undef HAVE_OBSTACK_FREE
+
+/* Define to 1 if 'offsetof' is declared in <stddef.h> */
+#undef HAVE_OFFSETOF
+
+/* Define to 1 if you have the `posix_fadvise' function. */
+#undef HAVE_POSIX_FADVISE
+
+/* Define to 1 if you have program_invocation_short_name */
+#undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
+
+/* Define to 1 if you have the `scandir' function. */
+#undef HAVE_SCANDIR
+
+/* Define to 1 if you have the `setsid' function. */
+#undef HAVE_SETSID
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#undef HAVE_STDDEF_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strnlen' function. */
+#undef HAVE_STRNLEN
+
+/* Define to 1 if you have the `strsignal' function. */
+#undef HAVE_STRSIGNAL
+
+/* Define to 1 if you have the `strtoimax' function. */
+#undef HAVE_STRTOIMAX
+
+/* Define to 1 if you have the `strtoul' function. */
+#undef HAVE_STRTOUL
+
+/* Define to 1 if you have the <sys/cdefs.h> header file. */
+#undef HAVE_SYS_CDEFS_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/syscall.h> header file. */
+#undef HAVE_SYS_SYSCALL_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <term.h> header file. */
+#undef HAVE_TERM_H
+
+/* Define to 1 if 'TIOCNOTTY' is declared in <sys/ioctl.h> */
+#undef HAVE_TIOCNOTTY
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `unsetenv' function. */
+#undef HAVE_UNSETENV
+
+/* Define to 1 if the 'va_copy' macro exists */
+#undef HAVE_VA_COPY
+
+/* Define to 1 if 'WCOREDUMP' is declared in <sys/wait.h> */
+#undef HAVE_WCOREDUMP
+
+/* Define to 1 if you have __progname */
+#undef HAVE___PROGNAME
+
+/* Acknowledge the volatility of the API. */
+#undef LIBDPKG_VOLATILE_API
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of `unsigned int', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_INT
+
+/* The size of `unsigned long', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_LONG
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Use unreliable mmap support */
+#undef USE_MMAP
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to 1 to use bz2 rather than console tool */
+#undef WITH_BZ2
+
+/* Define to 1 if dselect is compiled. */
+#undef WITH_DSELECT
+
+/* Define to 1 if install-info is compiled. */
+#undef WITH_INSTALL_INFO
+
+/* Define to 1 to compile in SELinux support */
+#undef WITH_SELINUX
+
+/* Define to 1 if start-stop-daemon is compiled. */
+#undef WITH_START_STOP_DAEMON
+
+/* Define to 1 if update-alternatives is compiled. */
+#undef WITH_UPDATE_ALTERNATIVES
+
+/* Define to 1 to use zlib rather than console tool */
+#undef WITH_ZLIB
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+   `char[]'. */
+#undef YYTEXT_POINTER
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef mode_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
+/* Define to 'int' if <malloc.h> does not define. */
+#undef ptrdiff_t
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
+
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+   code using `volatile' can become incorrect without. Disable with care. */
+#undef volatile
diff -uNr --exclude .git --exclude .bzr dpkg/configure /home/vorlon/devel/multiarch/dpkg-debian/configure
--- dpkg/configure	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/configure	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,12405 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.68 for dpkg 1.16.1.2.
+#
+# Report bugs to <debian-dpkg@lists.debian.org>.
+#
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: debian-dpkg@lists.debian.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='dpkg'
+PACKAGE_TARNAME='dpkg'
+PACKAGE_VERSION='1.16.1.2'
+PACKAGE_STRING='dpkg 1.16.1.2'
+PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org'
+PACKAGE_URL=''
+
+ac_unique_file="lib/dpkg/dpkg.h"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+gt_needs=
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+HAVE_UNSETENV_FALSE
+HAVE_UNSETENV_TRUE
+HAVE_ALPHASORT_FALSE
+HAVE_ALPHASORT_TRUE
+HAVE_SCANDIR_FALSE
+HAVE_SCANDIR_TRUE
+HAVE_ASPRINTF_FALSE
+HAVE_ASPRINTF_TRUE
+HAVE_STRSIGNAL_FALSE
+HAVE_STRSIGNAL_TRUE
+HAVE_STRERROR_FALSE
+HAVE_STRERROR_TRUE
+HAVE_STRNLEN_FALSE
+HAVE_STRNLEN_TRUE
+HAVE_OBSTACK_FREE_FALSE
+HAVE_OBSTACK_FREE_TRUE
+HAVE_GETOPT_LONG_FALSE
+HAVE_GETOPT_LONG_TRUE
+HAVE_GETOPT_FALSE
+HAVE_GETOPT_TRUE
+HAVE_C99_SNPRINTF_FALSE
+HAVE_C99_SNPRINTF_TRUE
+SSD_LIBS
+CURSES_LIBS
+USE_UNICODE
+SELINUX_LIBS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
+BZ2_LIBS
+ZLIB_LIBS
+PERL_COVER
+PERL_COVERAGE
+LCOV_GENHTML
+LCOV
+GCOV
+COVERAGE_ENABLED_FALSE
+COVERAGE_ENABLED_TRUE
+BUILD_POD_DOC_FALSE
+BUILD_POD_DOC_TRUE
+POD2MAN
+PERL_LIBDIR
+PERL
+USE_PO4A
+PO4A
+HAVE_DOT
+DOXYGEN
+RANLIB
+LEXLIB
+LEX_OUTPUT_ROOT
+LEX
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+logdir
+admindir
+WITH_INSTALL_INFO_FALSE
+WITH_INSTALL_INFO_TRUE
+WITH_UPDATE_ALTERNATIVES_FALSE
+WITH_UPDATE_ALTERNATIVES_TRUE
+WITH_START_STOP_DAEMON_FALSE
+WITH_START_STOP_DAEMON_TRUE
+WITH_DSELECT_FALSE
+WITH_DSELECT_TRUE
+POSUB
+LTLIBINTL
+LIBINTL
+INTLLIBS
+LTLIBICONV
+LIBICONV
+INTL_MACOSX_LIBS
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+XGETTEXT_EXTRA_OPTIONS
+MSGMERGE
+XGETTEXT_015
+XGETTEXT
+GMSGFMT_015
+MSGFMT_015
+GMSGFMT
+MSGFMT
+GETTEXT_MACRO_VERSION
+USE_NLS
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+EGREP
+GREP
+CPP
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_dependency_tracking
+enable_silent_rules
+enable_nls
+with_gnu_ld
+enable_rpath
+with_libiconv_prefix
+with_libintl_prefix
+with_dselect
+with_start_stop_daemon
+with_update_alternatives
+with_install_info
+with_admindir
+with_logdir
+enable_coverage
+enable_largefile
+with_zlib
+with_bz2
+with_selinux
+enable_unicode
+enable_mmap
+enable_compiler_warnings
+enable_compiler_optimisations
+enable_linker_optimisations
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+CXX
+CXXFLAGS
+CCC
+PERL
+PERL_LIBDIR
+ZLIB_LIBS
+BZ2_LIBS
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+SELINUX_LIBS
+CURSES_LIBS
+SSD_LIBS'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures dpkg 1.16.1.2 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/dpkg]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of dpkg 1.16.1.2:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
+  --disable-nls           do not use Native Language Support
+  --disable-rpath         do not hardcode runtime library paths
+  --enable-coverage       whether to enable code coverage
+  --disable-largefile     omit support for large files
+  --disable-unicode       do not use Unicode (wide chars) support
+  --enable-mmap           enable usage of unrealiable mmap if available
+  --disable-compiler-warnings
+                          Disable additional compiler warnings
+  --disable-compiler-optimisations
+                          Disable compiler optimisations
+  --disable-linker-optimisations
+                          Disable linker optimisations
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
+  --without-libiconv-prefix     don't search for libiconv in includedir and libdir
+  --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
+  --without-libintl-prefix     don't search for libintl in includedir and libdir
+  --without-dselect       do not build or use dselect
+  --without-start-stop-daemon
+                          do not build or use start-stop-daemon
+  --without-update-alternatives
+                          do not build or use update-alternatives
+  --without-install-info  do not build or use install-info
+  --with-admindir=DIR     dpkg database directory [LOCALSTATEDIR/lib/dpkg]
+  --with-logdir=DIR       system logging directory [LOCALSTATEDIR/log]
+  --with-zlib             use zlib library for compression and decompression
+  --with-bz2              use bz2 library for compression and decompression
+  --with-selinux          use selinux library to set security contexts
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  PERL        Perl interpreter
+  PERL_LIBDIR Perl library directory
+  ZLIB_LIBS   linker flags for zlib library
+  BZ2_LIBS    linker flags for bz2 library
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  SELINUX_LIBS
+              linker flags for selinux library
+  CURSES_LIBS linker flags for curses library
+  SSD_LIBS    linker flags for start-stop-daemon
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <debian-dpkg@lists.debian.org>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+dpkg configure 1.16.1.2
+generated by GNU Autoconf 2.68
+
+Copyright (C) 2010 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ------------------------------------------- ##
+## Report this to debian-dpkg@lists.debian.org ##
+## ------------------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid; break
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=$ac_mid; break
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_compute_int
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by dpkg $as_me 1.16.1.2, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+gt_needs="$gt_needs "
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+ac_aux_dir=
+for ac_dir in build-aux "$srcdir"/build-aux; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+
+
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+
+$as_echo "#define _MINIX 1" >>confdefs.h
+
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_safe_to_define___extensions__=yes
+else
+  ac_cv_safe_to_define___extensions__=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+
+
+am__api_version='1.11'
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+   fi
+
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='dpkg'
+ VERSION='1.16.1.2'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=0;;
+esac
+AM_BACKSLASH='\'
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+    # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then :
+  enableval=$enable_nls; USE_NLS=$enableval
+else
+  USE_NLS=yes
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+
+
+
+
+      GETTEXT_MACRO_VERSION=0.18
+
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MSGFMT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$MSGFMT" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+    ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GMSGFMT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GMSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+    case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XGETTEXT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$XGETTEXT" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+    ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+    rm -f messages.po
+
+    case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MSGMERGE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$MSGMERGE" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
+            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
+    ;;
+esac
+fi
+MSGMERGE="$ac_cv_path_MSGMERGE"
+if test "$MSGMERGE" != ":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        test -n "$localedir" || localedir='${datadir}/locale'
+
+
+    test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+
+
+  ac_config_commands="$ac_config_commands po-directories"
+
+
+
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${acl_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      *GNU* | *'with BFD'*)
+        test "$with_gnu_ld" != no && break ;;
+      *)
+        test "$with_gnu_ld" != yes && break ;;
+      esac
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${acl_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+
+                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
+if ${acl_cv_rpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+    # Check whether --enable-rpath was given.
+if test "${enable_rpath+set}" = set; then :
+  enableval=$enable_rpath; :
+else
+  enable_rpath=yes
+fi
+
+
+
+
+  acl_libdirstem=lib
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+$as_echo_n "checking for 64-bit host... " >&6; }
+if ${gl_cv_solaris_64bit+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef _LP64
+sixtyfour bits
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
+  gl_cv_solaris_64bit=yes
+else
+  gl_cv_solaris_64bit=no
+fi
+rm -f conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
+$as_echo "$gl_cv_solaris_64bit" >&6; }
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+        esac
+      fi
+      ;;
+    *)
+      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+      if test -n "$searchpath"; then
+        acl_save_IFS="${IFS= 	}"; IFS=":"
+        for searchdir in $searchpath; do
+          if test -d "$searchdir"; then
+            case "$searchdir" in
+              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
+      fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+
+
+
+
+
+
+
+
+
+
+
+
+    use_additional=yes
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+
+# Check whether --with-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then :
+  withval=$with_libiconv_prefix;
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
+      fi
+    fi
+
+fi
+
+      LIBICONV=
+  LTLIBICONV=
+  INCICONV=
+  LIBICONV_PREFIX=
+      HAVE_LIBICONV=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='iconv '
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+          else
+                                    :
+          fi
+        else
+                              found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+                                                        if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+              else
+                                                                                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                                if test "$acl_hardcode_direct" = yes; then
+                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                                                            haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                                                                                haveit=
+                    for x in $LDFLAGS $LIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                                                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                    else
+                                                                                                                                                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+              else
+                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+              fi
+            fi
+                        additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INCICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                                            INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+                        if test -n "$found_la"; then
+                                                        save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+                            for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+                    LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+            LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+            acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+    else
+            for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+            for found_dir in $ltrpathdirs; do
+      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+    done
+  fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CFPreferences.h>
+int
+main ()
+{
+CFPreferencesCopyAppValue(NULL, NULL)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gt_cv_func_CFPreferencesCopyAppValue=yes
+else
+  gt_cv_func_CFPreferencesCopyAppValue=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+
+$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+
+  fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CFLocale.h>
+int
+main ()
+{
+CFLocaleCopyCurrent();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gt_cv_func_CFLocaleCopyCurrent=yes
+else
+  gt_cv_func_CFLocaleCopyCurrent=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+
+$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+
+
+
+
+
+
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+    case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+    if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+
+
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+$as_echo_n "checking for GNU gettext in libc... " >&6; }
+if eval \${$gt_func_gnugettext_libc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$gt_func_gnugettext_libc=yes"
+else
+  eval "$gt_func_gnugettext_libc=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$gt_func_gnugettext_libc
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+
+
+
+
+
+          am_save_CPPFLAGS="$CPPFLAGS"
+
+  for element in $INCICONV; do
+    haveit=
+    for x in $CPPFLAGS; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+    fi
+  done
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if ${am_cv_func_iconv+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+      LIBS="$am_save_LIBS"
+    fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
+  if test "$am_cv_func_iconv" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if ${am_cv_func_iconv_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+            am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      if test "$cross_compiling" = yes; then :
+  case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\263";
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  am_cv_func_iconv_works=yes
+else
+  am_cv_func_iconv_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+      LIBS="$am_save_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+$as_echo "$am_cv_func_iconv_works" >&6; }
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
+  else
+            CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+
+
+
+
+
+
+
+
+
+
+
+    use_additional=yes
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+
+# Check whether --with-libintl-prefix was given.
+if test "${with_libintl_prefix+set}" = set; then :
+  withval=$with_libintl_prefix;
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
+      fi
+    fi
+
+fi
+
+      LIBINTL=
+  LTLIBINTL=
+  INCINTL=
+  LIBINTL_PREFIX=
+      HAVE_LIBINTL=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='intl '
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
+          else
+                                    :
+          fi
+        else
+                              found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIBINTL; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+                                                        if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+              else
+                                                                                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                                if test "$acl_hardcode_direct" = yes; then
+                                                      LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+                                                            haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                                                                                haveit=
+                    for x in $LDFLAGS $LIBINTL; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                                                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+                    else
+                                                                                                                                                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
+              else
+                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
+              fi
+            fi
+                        additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = 'intl'; then
+                  LIBINTL_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = 'intl'; then
+                  LIBINTL_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INCINTL; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                                            INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+                        if test -n "$found_la"; then
+                                                        save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+                            for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIBINTL; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIBINTL; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
+                    LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+            LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+            acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+    else
+            for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+            for found_dir in $ltrpathdirs; do
+      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
+    done
+  fi
+
+
+
+
+
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+$as_echo_n "checking for GNU gettext in libintl... " >&6; }
+if eval \${$gt_func_gnugettext_libintl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$gt_func_gnugettext_libintl=yes"
+else
+  eval "$gt_func_gnugettext_libintl=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  LIBINTL="$LIBINTL $LIBICONV"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                eval "$gt_func_gnugettext_libintl=yes"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"
+fi
+eval ac_res=\$$gt_func_gnugettext_libintl
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+        fi
+
+                                        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+                    LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+
+
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+                LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+$as_echo_n "checking whether to use NLS... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+  if test "$USE_NLS" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+$as_echo_n "checking where the gettext function comes from... " >&6; }
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+$as_echo "$gt_source" >&6; }
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+$as_echo_n "checking how to link with libintl... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+$as_echo "$LIBINTL" >&6; }
+
+  for element in $INCINTL; do
+    haveit=
+    for x in $CPPFLAGS; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+    fi
+  done
+
+      fi
+
+
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+
+    fi
+
+        POSUB=po
+  fi
+
+
+
+    INTLLIBS="$LIBINTL"
+
+
+
+
+
+
+
+# Allow compilation without optional programs
+
+
+# Check whether --with-dselect was given.
+if test "${with_dselect+set}" = set; then :
+  withval=$with_dselect; build_dselect=$with_dselect
+else
+  build_dselect=yes
+
+fi
+
+   if test "x$build_dselect" = "xyes"; then
+  WITH_DSELECT_TRUE=
+  WITH_DSELECT_FALSE='#'
+else
+  WITH_DSELECT_TRUE='#'
+  WITH_DSELECT_FALSE=
+fi
+
+  if test "x$build_dselect" = "xyes"; then :
+
+
+$as_echo "#define WITH_DSELECT 1" >>confdefs.h
+
+
+else
+
+    $as_echo "#define WITH_DSELECT 0" >>confdefs.h
+
+
+fi
+
+
+
+# Check whether --with-start-stop-daemon was given.
+if test "${with_start_stop_daemon+set}" = set; then :
+  withval=$with_start_stop_daemon; build_start_stop_daemon=$with_start_stop_daemon
+else
+  build_start_stop_daemon=yes
+
+fi
+
+   if test "x$build_start_stop_daemon" = "xyes"; then
+  WITH_START_STOP_DAEMON_TRUE=
+  WITH_START_STOP_DAEMON_FALSE='#'
+else
+  WITH_START_STOP_DAEMON_TRUE='#'
+  WITH_START_STOP_DAEMON_FALSE=
+fi
+
+  if test "x$build_start_stop_daemon" = "xyes"; then :
+
+
+$as_echo "#define WITH_START_STOP_DAEMON 1" >>confdefs.h
+
+
+else
+
+    $as_echo "#define WITH_START_STOP_DAEMON 0" >>confdefs.h
+
+
+fi
+
+
+
+# Check whether --with-update-alternatives was given.
+if test "${with_update_alternatives+set}" = set; then :
+  withval=$with_update_alternatives; build_update_alternatives=$with_update_alternatives
+else
+  build_update_alternatives=yes
+
+fi
+
+   if test "x$build_update_alternatives" = "xyes"; then
+  WITH_UPDATE_ALTERNATIVES_TRUE=
+  WITH_UPDATE_ALTERNATIVES_FALSE='#'
+else
+  WITH_UPDATE_ALTERNATIVES_TRUE='#'
+  WITH_UPDATE_ALTERNATIVES_FALSE=
+fi
+
+  if test "x$build_update_alternatives" = "xyes"; then :
+
+
+$as_echo "#define WITH_UPDATE_ALTERNATIVES 1" >>confdefs.h
+
+
+else
+
+    $as_echo "#define WITH_UPDATE_ALTERNATIVES 0" >>confdefs.h
+
+
+fi
+
+
+
+# Check whether --with-install-info was given.
+if test "${with_install_info+set}" = set; then :
+  withval=$with_install_info; build_install_info=$with_install_info
+else
+  build_install_info=yes
+
+fi
+
+   if test "x$build_install_info" = "xyes"; then
+  WITH_INSTALL_INFO_TRUE=
+  WITH_INSTALL_INFO_FALSE='#'
+else
+  WITH_INSTALL_INFO_TRUE='#'
+  WITH_INSTALL_INFO_FALSE=
+fi
+
+  if test "x$build_install_info" = "xyes"; then :
+
+
+$as_echo "#define WITH_INSTALL_INFO 1" >>confdefs.h
+
+
+else
+
+    $as_echo "#define WITH_INSTALL_INFO 0" >>confdefs.h
+
+
+fi
+
+
+# Allow alternate directories
+
+  admindir="${localstatedir}/lib/${PACKAGE_NAME}"
+
+# Check whether --with-admindir was given.
+if test "${with_admindir+set}" = set; then :
+  withval=$with_admindir; case $with_admindir in #(
+  "") :
+    as_fn_error $? "invalid admindir specified" "$LINENO" 5 ;; #(
+  *) :
+    admindir="$with_admindir" ;;
+esac
+
+fi
+
+
+
+
+  logdir="${localstatedir}/log"
+
+# Check whether --with-logdir was given.
+if test "${with_logdir+set}" = set; then :
+  withval=$with_logdir; case $with_logdir in #(
+  "") :
+    as_fn_error $? "invalid logdir specified" "$LINENO" 5 ;; #(
+  *) :
+    logdir="$with_logdir" ;;
+esac
+
+fi
+
+
+
+
+# Checks for programs.
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+else
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CXX"  am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CXX_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
+
+
+for ac_prog in flex lex
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LEX"; then
+  ac_cv_prog_LEX="$LEX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LEX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LEX=$ac_cv_prog_LEX
+if test -n "$LEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
+$as_echo "$LEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$LEX" && break
+done
+test -n "$LEX" || LEX=":"
+
+if test "x$LEX" != "x:"; then
+  cat >conftest.l <<_ACEOF
+%%
+a { ECHO; }
+b { REJECT; }
+c { yymore (); }
+d { yyless (1); }
+e { yyless (input () != 0); }
+f { unput (yytext[0]); }
+. { BEGIN INITIAL; }
+%%
+#ifdef YYTEXT_POINTER
+extern char *yytext;
+#endif
+int
+main (void)
+{
+  return ! yylex () + ! yywrap ();
+}
+_ACEOF
+{ { ac_try="$LEX conftest.l"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$LEX conftest.l") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
+$as_echo_n "checking lex output file root... " >&6; }
+if ${ac_cv_prog_lex_root+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+if test -f lex.yy.c; then
+  ac_cv_prog_lex_root=lex.yy
+elif test -f lexyy.c; then
+  ac_cv_prog_lex_root=lexyy
+else
+  as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
+$as_echo "$ac_cv_prog_lex_root" >&6; }
+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+
+if test -z "${LEXLIB+set}"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
+$as_echo_n "checking lex library... " >&6; }
+if ${ac_cv_lib_lex+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    ac_save_LIBS=$LIBS
+    ac_cv_lib_lex='none needed'
+    for ac_lib in '' -lfl -ll; do
+      LIBS="$ac_lib $ac_save_LIBS"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_lex=$ac_lib
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+      test "$ac_cv_lib_lex" != 'none needed' && break
+    done
+    LIBS=$ac_save_LIBS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
+$as_echo "$ac_cv_lib_lex" >&6; }
+  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
+$as_echo_n "checking whether yytext is a pointer... " >&6; }
+if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # POSIX says lex can declare yytext either as a pointer or an array; the
+# default is implementation-dependent.  Figure out which it is, since
+# not all implementations provide the %pointer and %array declarations.
+ac_cv_prog_lex_yytext_pointer=no
+ac_save_LIBS=$LIBS
+LIBS="$LEXLIB $ac_save_LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  #define YYTEXT_POINTER 1
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_prog_lex_yytext_pointer=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_save_LIBS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
+$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
+if test $ac_cv_prog_lex_yytext_pointer = yes; then
+
+$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
+
+fi
+rm -f conftest.l $LEX_OUTPUT_ROOT.c
+
+fi
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+for ac_prog in doxygen
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DOXYGEN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DOXYGEN"; then
+  ac_cv_prog_DOXYGEN="$DOXYGEN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DOXYGEN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DOXYGEN=$ac_cv_prog_DOXYGEN
+if test -n "$DOXYGEN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
+$as_echo "$DOXYGEN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$DOXYGEN" && break
+done
+
+# Extract the first word of "dot", so it can be a program name with args.
+set dummy dot; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_HAVE_DOT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$HAVE_DOT"; then
+  ac_cv_prog_HAVE_DOT="$HAVE_DOT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_HAVE_DOT="YES"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_HAVE_DOT" && ac_cv_prog_HAVE_DOT="NO"
+fi
+fi
+HAVE_DOT=$ac_cv_prog_HAVE_DOT
+if test -n "$HAVE_DOT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_DOT" >&5
+$as_echo "$HAVE_DOT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+for ac_prog in po4a
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PO4A+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PO4A"; then
+  ac_cv_prog_PO4A="$PO4A" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_PO4A="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+PO4A=$ac_cv_prog_PO4A
+if test -n "$PO4A"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PO4A" >&5
+$as_echo "$PO4A" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PO4A" && break
+done
+
+if test "$USE_NLS" = "yes" && test -n "$PO4A"; then
+  USE_PO4A=yes
+else
+  USE_PO4A=no
+fi
+
+
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PERL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="/usr/bin/perl"
+  ;;
+esac
+fi
+PERL=$ac_cv_path_PERL
+if test -n "$PERL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+PERL_LIBDIR=$($PERL -MConfig -e 'my $r = $Config{vendorlibexp};
+                                 $r =~ s/$Config{vendorprefixexp}/\$(prefix)/;
+                                 print $r')
+
+for ac_prog in pod2man
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_POD2MAN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$POD2MAN"; then
+  ac_cv_prog_POD2MAN="$POD2MAN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_POD2MAN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+POD2MAN=$ac_cv_prog_POD2MAN
+if test -n "$POD2MAN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POD2MAN" >&5
+$as_echo "$POD2MAN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$POD2MAN" && break
+done
+
+ if test "x$POD2MAN" != "x"; then
+  BUILD_POD_DOC_TRUE=
+  BUILD_POD_DOC_FALSE='#'
+else
+  BUILD_POD_DOC_TRUE='#'
+  BUILD_POD_DOC_FALSE=
+fi
+
+
+
+# Check whether --enable-coverage was given.
+if test "${enable_coverage+set}" = set; then :
+  enableval=$enable_coverage;
+else
+  enable_coverage=no
+fi
+
+ if test x$enable_coverage = xyes; then
+  COVERAGE_ENABLED_TRUE=
+  COVERAGE_ENABLED_FALSE='#'
+else
+  COVERAGE_ENABLED_TRUE='#'
+  COVERAGE_ENABLED_FALSE=
+fi
+
+
+if test "x$enable_coverage" = "xyes"; then
+   if test "x$GCC" = "xno"; then
+     as_fn_error $? "not compiling with gcc, which is required for C coverage support" "$LINENO" 5
+   fi
+
+   for ac_prog in gcov
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_GCOV+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GCOV"; then
+  ac_cv_prog_GCOV="$GCOV" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GCOV="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GCOV=$ac_cv_prog_GCOV
+if test -n "$GCOV"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOV" >&5
+$as_echo "$GCOV" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$GCOV" && break
+done
+
+   if test -z "$GCOV"; then
+     as_fn_error $? "missing gcov, which is required for C coverage support" "$LINENO" 5
+   fi
+
+   for ac_prog in lcov
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LCOV+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LCOV"; then
+  ac_cv_prog_LCOV="$LCOV" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LCOV="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LCOV=$ac_cv_prog_LCOV
+if test -n "$LCOV"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5
+$as_echo "$LCOV" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$LCOV" && break
+done
+
+   if test -z "$LCOV"; then
+      as_fn_error $? "missing lcov, which is required for C coverage support" "$LINENO" 5
+   fi
+
+   for ac_prog in genhtml
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LCOV_GENHTML+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LCOV_GENHTML"; then
+  ac_cv_prog_LCOV_GENHTML="$LCOV_GENHTML" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LCOV_GENHTML="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LCOV_GENHTML=$ac_cv_prog_LCOV_GENHTML
+if test -n "$LCOV_GENHTML"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV_GENHTML" >&5
+$as_echo "$LCOV_GENHTML" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$LCOV_GENHTML" && break
+done
+
+   if test -z "$LCOV_GENHTML"; then
+      as_fn_error $? "missing genhtml, which is required for C coverage support" "$LINENO" 5
+   fi
+
+   CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+   LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage"
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Devel::Cover perl module" >&5
+$as_echo_n "checking for Devel::Cover perl module... " >&6; }
+   if $($PERL -e "require Devel::Cover;" 2>/dev/null); then
+      PERL_COVERAGE="-MDevel::Cover"
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+   else
+      as_fn_error $? "Devel::Cover perl module is required for coverage support" "$LINENO" 5
+   fi
+   for ac_prog in cover
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PERL_COVER+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PERL_COVER"; then
+  ac_cv_prog_PERL_COVER="$PERL_COVER" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_PERL_COVER="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+PERL_COVER=$ac_cv_prog_PERL_COVER
+if test -n "$PERL_COVER"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL_COVER" >&5
+$as_echo "$PERL_COVER" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PERL_COVER" && break
+done
+
+   if test -z "$PERL_COVER"; then
+      as_fn_error $? "missing cover, which is required for perl coverage support" "$LINENO" 5
+   fi
+fi
+
+
+# Checks for operating system services and capabilities.
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
+fi
+
+
+# Checks for libraries.
+
+
+
+
+# Check whether --with-zlib was given.
+if test "${with_zlib+set}" = set; then :
+  withval=$with_zlib;
+fi
+
+  if test "x$with_zlib" != "xno"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzdopen in -lz" >&5
+$as_echo_n "checking for gzdopen in -lz... " >&6; }
+if ${ac_cv_lib_z_gzdopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gzdopen ();
+int
+main ()
+{
+return gzdopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_z_gzdopen=yes
+else
+  ac_cv_lib_z_gzdopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzdopen" >&5
+$as_echo "$ac_cv_lib_z_gzdopen" >&6; }
+if test "x$ac_cv_lib_z_gzdopen" = xyes; then :
+
+
+$as_echo "#define WITH_ZLIB 1" >>confdefs.h
+
+      if test "x$with_zlib" = "xstatic"; then
+        dpkg_zlib_libs="-Wl,-Bstatic -lz -Wl,-Bdynamic"
+      else
+        dpkg_zlib_libs="-lz"
+      fi
+      ZLIB_LIBS="${ZLIB_LIBS:+$ZLIB_LIBS }$dpkg_zlib_libs"
+      with_zlib="yes"
+
+else
+
+      if test -n "$with_zlib"; then
+        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "zlib library not found
+See \`config.log' for more details" "$LINENO" 5; }
+      fi
+
+fi
+
+
+    ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = xyes; then :
+
+else
+
+      if test -n "$with_zlib"; then
+        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "zlib header not found
+See \`config.log' for more details" "$LINENO" 5; }
+      fi
+
+fi
+
+
+  fi
+
+
+
+
+
+
+# Check whether --with-bz2 was given.
+if test "${with_bz2+set}" = set; then :
+  withval=$with_bz2;
+fi
+
+  if test "x$with_bz2" != "xno"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzdopen in -lbz2" >&5
+$as_echo_n "checking for BZ2_bzdopen in -lbz2... " >&6; }
+if ${ac_cv_lib_bz2_BZ2_bzdopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbz2  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char BZ2_bzdopen ();
+int
+main ()
+{
+return BZ2_bzdopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_bz2_BZ2_bzdopen=yes
+else
+  ac_cv_lib_bz2_BZ2_bzdopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzdopen" >&5
+$as_echo "$ac_cv_lib_bz2_BZ2_bzdopen" >&6; }
+if test "x$ac_cv_lib_bz2_BZ2_bzdopen" = xyes; then :
+
+
+$as_echo "#define WITH_BZ2 1" >>confdefs.h
+
+      if test "x$with_bz2" = "xstatic"; then
+        dpkg_bz2_libs="-Wl,-Bstatic -lbz2 -Wl,-Bdynamic"
+      else
+        dpkg_bz2_libs="-lbz2"
+      fi
+      BZ2_LIBS="${BZ2_LIBS:+$BZ2_LIBS }$dpkg_bz2_libs"
+      with_bz2="yes"
+
+else
+
+      if test -n "$with_bz2"; then
+        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "bz2 library not found
+See \`config.log' for more details" "$LINENO" 5; }
+      fi
+
+fi
+
+
+    ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_bzlib_h" = xyes; then :
+
+else
+
+      if test -n "$with_bz2"; then
+        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "bz2 header not found
+See \`config.log' for more details" "$LINENO" 5; }
+      fi
+
+fi
+
+
+  fi
+
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+
+
+# Check whether --with-selinux was given.
+if test "${with_selinux+set}" = set; then :
+  withval=$with_selinux;
+fi
+
+if test "x$with_selinux" != "xno"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5
+$as_echo_n "checking for is_selinux_enabled in -lselinux... " >&6; }
+if ${ac_cv_lib_selinux_is_selinux_enabled+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lselinux  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char is_selinux_enabled ();
+int
+main ()
+{
+return is_selinux_enabled ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_selinux_is_selinux_enabled=yes
+else
+  ac_cv_lib_selinux_is_selinux_enabled=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
+$as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
+if test "x$ac_cv_lib_selinux_is_selinux_enabled" = xyes; then :
+
+$as_echo "#define WITH_SELINUX 1" >>confdefs.h
+
+		if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+
+			if test "x$with_selinux" = "xstatic"; then
+				dpkg_selinux_libs="-Wl,-Bstatic "$($PKG_CONFIG --static --libs libselinux)" -Wl,-Bdynamic"
+			else
+				dpkg_selinux_libs=$($PKG_CONFIG --libs libselinux)
+			fi
+
+else
+
+			if test "x$with_selinux" = "xstatic"; then
+				dpkg_selinux_libs="-Wl,-Bstatic -lselinux -lsepol -Wl,-Bdynamic"
+			else
+				dpkg_selinux_libs="-lselinux"
+			fi
+
+fi
+		 SELINUX_LIBS="${SELINUX_LIBS:+$SELINUX_LIBS }$dpkg_selinux_libs"
+		 with_selinux="yes"
+else
+  if test -n "$with_selinux"; then
+			{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "selinux library not found
+See \`config.log' for more details" "$LINENO" 5; }
+		 fi
+fi
+
+
+	ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
+if test "x$ac_cv_header_selinux_selinux_h" = xyes; then :
+
+else
+  if test -n "$with_selinux"; then
+			{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "selinux header not found
+See \`config.log' for more details" "$LINENO" 5; }
+		 fi
+fi
+
+
+fi
+
+if test "x$build_dselect" = "xyes"; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Unicode is requested" >&5
+$as_echo_n "checking whether Unicode is requested... " >&6; }
+    # Check whether --enable-unicode was given.
+if test "${enable_unicode+set}" = set; then :
+  enableval=$enable_unicode; USE_UNICODE=$enableval
+else
+  USE_UNICODE=yes
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_UNICODE" >&5
+$as_echo "$USE_UNICODE" >&6; }
+
+
+
+
+for ac_header in ncurses/ncurses.h ncurses.h curses.h ncurses/term.h term.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ have_curses_header=yes
+fi
+
+done
+
+if test "x$USE_UNICODE" = "xyes"; then
+  for ac_header in ncursesw/ncurses.h ncursesw/term.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ have_curses_header=yes
+fi
+
+done
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5
+$as_echo_n "checking for initscr in -lncursesw... " >&6; }
+if ${ac_cv_lib_ncursesw_initscr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lncursesw  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char initscr ();
+int
+main ()
+{
+return initscr ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ncursesw_initscr=yes
+else
+  ac_cv_lib_ncursesw_initscr=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_initscr" >&5
+$as_echo "$ac_cv_lib_ncursesw_initscr" >&6; }
+if test "x$ac_cv_lib_ncursesw_initscr" = xyes; then :
+  CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncursesw"
+else
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
+$as_echo_n "checking for initscr in -lncurses... " >&6; }
+if ${ac_cv_lib_ncurses_initscr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lncurses  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char initscr ();
+int
+main ()
+{
+return initscr ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ncurses_initscr=yes
+else
+  ac_cv_lib_ncurses_initscr=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
+$as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
+if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
+  CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncurses"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5
+$as_echo_n "checking for initscr in -lcurses... " >&6; }
+if ${ac_cv_lib_curses_initscr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcurses  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char initscr ();
+int
+main ()
+{
+return initscr ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_curses_initscr=yes
+else
+  ac_cv_lib_curses_initscr=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5
+$as_echo "$ac_cv_lib_curses_initscr" >&6; }
+if test "x$ac_cv_lib_curses_initscr" = xyes; then :
+  CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lcurses"
+else
+  as_fn_error $? "no curses library found" "$LINENO" 5
+fi
+
+fi
+
+fi
+
+else
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
+$as_echo_n "checking for initscr in -lncurses... " >&6; }
+if ${ac_cv_lib_ncurses_initscr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lncurses  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char initscr ();
+int
+main ()
+{
+return initscr ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ncurses_initscr=yes
+else
+  ac_cv_lib_ncurses_initscr=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
+$as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
+if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
+  CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncurses"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5
+$as_echo_n "checking for initscr in -lcurses... " >&6; }
+if ${ac_cv_lib_curses_initscr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcurses  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char initscr ();
+int
+main ()
+{
+return initscr ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_curses_initscr=yes
+else
+  ac_cv_lib_curses_initscr=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5
+$as_echo "$ac_cv_lib_curses_initscr" >&6; }
+if test "x$ac_cv_lib_curses_initscr" = xyes; then :
+  CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lcurses"
+else
+  as_fn_error $? "no curses library found" "$LINENO" 5
+fi
+
+fi
+
+fi
+if test "x$have_curses_header" != "xyes"; then
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "curses header not found
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+fi
+if test "x$build_start_stop_daemon" = "xyes"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ihash_create in -lihash" >&5
+$as_echo_n "checking for ihash_create in -lihash... " >&6; }
+if ${ac_cv_lib_ihash_ihash_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lihash  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ihash_create ();
+int
+main ()
+{
+return ihash_create ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ihash_ihash_create=yes
+else
+  ac_cv_lib_ihash_ihash_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ihash_ihash_create" >&5
+$as_echo "$ac_cv_lib_ihash_ihash_create" >&6; }
+if test "x$ac_cv_lib_ihash_ihash_create" = xyes; then :
+  SSD_LIBS="${SSD_LIBS:+$SSD_LIBS }-lihash"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for proc_stat_list_create in -lps" >&5
+$as_echo_n "checking for proc_stat_list_create in -lps... " >&6; }
+if ${ac_cv_lib_ps_proc_stat_list_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lps  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char proc_stat_list_create ();
+int
+main ()
+{
+return proc_stat_list_create ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ps_proc_stat_list_create=yes
+else
+  ac_cv_lib_ps_proc_stat_list_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ps_proc_stat_list_create" >&5
+$as_echo "$ac_cv_lib_ps_proc_stat_list_create" >&6; }
+if test "x$ac_cv_lib_ps_proc_stat_list_create" = xyes; then :
+  SSD_LIBS="${SSD_LIBS:+$SSD_LIBS }-lps"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fmt_past_time in -lshouldbeinlibc" >&5
+$as_echo_n "checking for fmt_past_time in -lshouldbeinlibc... " >&6; }
+if ${ac_cv_lib_shouldbeinlibc_fmt_past_time+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lshouldbeinlibc  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char fmt_past_time ();
+int
+main ()
+{
+return fmt_past_time ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_shouldbeinlibc_fmt_past_time=yes
+else
+  ac_cv_lib_shouldbeinlibc_fmt_past_time=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_shouldbeinlibc_fmt_past_time" >&5
+$as_echo "$ac_cv_lib_shouldbeinlibc_fmt_past_time" >&6; }
+if test "x$ac_cv_lib_shouldbeinlibc_fmt_past_time" = xyes; then :
+  SSD_LIBS="${SSD_LIBS:+$SSD_LIBS }-lshouldbeinlibc"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_openfiles in -lkvm" >&5
+$as_echo_n "checking for kvm_openfiles in -lkvm... " >&6; }
+if ${ac_cv_lib_kvm_kvm_openfiles+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lkvm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char kvm_openfiles ();
+int
+main ()
+{
+return kvm_openfiles ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_kvm_kvm_openfiles=yes
+else
+  ac_cv_lib_kvm_kvm_openfiles=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_openfiles" >&5
+$as_echo "$ac_cv_lib_kvm_kvm_openfiles" >&6; }
+if test "x$ac_cv_lib_kvm_kvm_openfiles" = xyes; then :
+  SSD_LIBS="${SSD_LIBS:+$SSD_LIBS }-lkvm"
+fi
+
+
+fi
+
+# Checks for header files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+for ac_header in stddef.h error.h locale.h libintl.h kvm.h \
+                  sys/cdefs.h sys/syscall.h linux/fiemap.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+# Checks for typedefs, structures, and compiler characteristics.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+	     #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+else
+  ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
+
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if ${ac_cv_c_const+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+/* FIXME: Include the comments suggested by Paul. */
+#ifndef __cplusplus
+  /* Ultrix mips cc rejects this.  */
+  typedef int charset[2];
+  const charset cs;
+  /* SunOS 4.1.1 cc rejects this.  */
+  char const *const *pcpcc;
+  char **ppc;
+  /* NEC SVR4.0.2 mips cc rejects this.  */
+  struct point {int x, y;};
+  static struct point const zero = {0,0};
+  /* AIX XL C 1.02.0.0 rejects this.
+     It does not let you subtract one const X* pointer from another in
+     an arm of an if-expression whose if-part is not a constant
+     expression */
+  const char *g = "string";
+  pcpcc = &g + (g ? g-g : 0);
+  /* HPUX 7.0 cc rejects these. */
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
+  { /* SCO 3.2v4 cc rejects this.  */
+    char *t;
+    char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+    *t++ = 0;
+    if (s) return 0;
+  }
+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+    int x[] = {25, 17};
+    const int *foo = &x[0];
+    ++foo;
+  }
+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+    typedef const int *iptr;
+    iptr p = 0;
+    ++p;
+  }
+  { /* AIX XL C 1.02.0.0 rejects this saying
+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+    struct s { int j; const int *ap[3]; };
+    struct s *b; b->j = 5;
+  }
+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+    const int foo = 10;
+    if (!foo) return 0;
+  }
+  return !cs[0] && !zero.x;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_const=yes
+else
+  ac_cv_c_const=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
+if test $ac_cv_c_const = no; then
+
+$as_echo "#define const /**/" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_inline=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
+done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
+
+case $ac_cv_c_inline in
+  inline | yes) ;;
+  *)
+    case $ac_cv_c_inline in
+      no) ac_val=;;
+      *) ac_val=$ac_cv_c_inline;;
+    esac
+    cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
+$as_echo_n "checking for working volatile... " >&6; }
+if ${ac_cv_c_volatile+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+volatile int x;
+int * volatile y = (int *) 0;
+return !x && !y;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_volatile=yes
+else
+  ac_cv_c_volatile=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5
+$as_echo "$ac_cv_c_volatile" >&6; }
+if test $ac_cv_c_volatile = no; then
+
+$as_echo "#define volatile /**/" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports C99 features" >&5
+$as_echo_n "checking whether compiler supports C99 features... " >&6; }
+if ${dpkg_cv_c99+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdio.h>
+
+/* Variadic macro arguments. */
+#define variadic_macro(foo, ...) printf(foo, __VA_ARGS__)
+
+int
+main ()
+{
+
+	int rc;
+
+	/* Compound initializers. */
+	struct { int a, b; } foo = { .a = 1, .b = 2 };
+
+	/* Trailing comma in enum. */
+	enum { first, second, } quux;
+
+	/* Boolean type. */
+	bool bar = false;
+
+	/* Specific size type. */
+	uint32_t baz = 0;
+	size_t size = SIZE_MAX;
+	intmax_t imax = INTMAX_MAX;
+
+	/* Format modifiers. */
+	rc = printf("%jd", imax);
+	if (rc == 3)
+		return 1;
+	rc = printf("%zu", size);
+	if (rc == 3)
+		return 1;
+
+	/* Magic __func__ variable. */
+	printf("%s", __func__);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  dpkg_cv_c99=yes
+else
+  dpkg_cv_c99=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dpkg_cv_c99" >&5
+$as_echo "$dpkg_cv_c99" >&6; }
+if test "x$dpkg_cv_c99" = "xyes"; then :
+
+$as_echo "#define HAVE_C99 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking what argument makes compiler support C99 features" >&5
+$as_echo_n "checking what argument makes compiler support C99 features... " >&6; }
+if ${dpkg_cv_c99_arg+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  dpkg_cv_c99_arg=none
+		 dpkg_save_CC="$CC"
+		 for arg in "-std=gnu99" "-std=c99" "-c99" "-AC99" \
+		            "-xc99=all" "-qlanglvl=extc99"; do
+		    CC="$dpkg_save_CC $arg"
+		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdio.h>
+
+/* Variadic macro arguments. */
+#define variadic_macro(foo, ...) printf(foo, __VA_ARGS__)
+
+int
+main ()
+{
+
+	int rc;
+
+	/* Compound initializers. */
+	struct { int a, b; } foo = { .a = 1, .b = 2 };
+
+	/* Trailing comma in enum. */
+	enum { first, second, } quux;
+
+	/* Boolean type. */
+	bool bar = false;
+
+	/* Specific size type. */
+	uint32_t baz = 0;
+	size_t size = SIZE_MAX;
+	intmax_t imax = INTMAX_MAX;
+
+	/* Format modifiers. */
+	rc = printf("%jd", imax);
+	if (rc == 3)
+		return 1;
+	rc = printf("%zu", size);
+	if (rc == 3)
+		return 1;
+
+	/* Magic __func__ variable. */
+	printf("%s", __func__);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  dpkg_arg_worked=yes
+else
+  dpkg_arg_worked=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+		    CC="$dpkg_save_CC"
+
+		    if test "x$dpkg_arg_worked" = "xyes"; then :
+  dpkg_cv_c99_arg="$arg"; break
+fi
+		 done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dpkg_cv_c99_arg" >&5
+$as_echo "$dpkg_cv_c99_arg" >&6; }
+	 if test "x$dpkg_cv_c99_arg" != "xnone"; then :
+  CC="$CC $dpkg_cv_c99_arg"
+		$as_echo "#define HAVE_C99 1" >>confdefs.h
+
+else
+  as_fn_error $? "unsupported required C99 extensions" "$LINENO" 5
+fi
+fi
+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+if test "x$ac_cv_type_mode_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define mode_t int
+_ACEOF
+
+fi
+
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
+_ACEOF
+
+fi
+
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
+
+fi
+
+ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
+if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define ptrdiff_t int
+_ACEOF
+
+fi
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned int" >&5
+$as_echo_n "checking size of unsigned int... " >&6; }
+if ${ac_cv_sizeof_unsigned_int+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned int))" "ac_cv_sizeof_unsigned_int"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_unsigned_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (unsigned int)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_unsigned_int=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_int" >&5
+$as_echo "$ac_cv_sizeof_unsigned_int" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int
+_ACEOF
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5
+$as_echo_n "checking size of unsigned long... " >&6; }
+if ${ac_cv_sizeof_unsigned_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_unsigned_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (unsigned long)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_unsigned_long=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5
+$as_echo "$ac_cv_sizeof_unsigned_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
+_ACEOF
+
+
+for ac_header in unistd.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
+if test "x$ac_cv_header_unistd_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_UNISTD_H 1
+_ACEOF
+
+fi
+
+done
+
+ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "#include <signal.h>
+/* NetBSD declares sys_siglist in unistd.h.  */
+#if HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
+
+"
+if test "x$ac_cv_have_decl_sys_siglist" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_SYS_SIGLIST $ac_have_decl
+_ACEOF
+
+
+# Checks for library functions.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
+$as_echo_n "checking for va_copy... " >&6; }
+if ${dpkg_cv_va_copy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  dpkg_cv_va_copy=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+int main()
+{
+va_list v1, v2;
+va_copy (v1, v2);
+exit (0);
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  dpkg_cv_va_copy=yes
+else
+  dpkg_cv_va_copy=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dpkg_cv_va_copy" >&5
+$as_echo "$dpkg_cv_va_copy" >&6; }
+if test "x$dpkg_cv_va_copy" = "xyes"; then :
+
+$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 snprintf functions" >&5
+$as_echo_n "checking for C99 snprintf functions... " >&6; }
+if ${dpkg_cv_c99_snprintf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  dpkg_cv_c99_snprintf=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+int test_vsnprintf(const char *fmt, ...)
+{
+	int n;
+	va_list args;
+
+	va_start(args, fmt);
+	n = vsnprintf(NULL, 0, fmt, args);
+	va_end(args);
+
+	return n;
+}
+int main()
+{
+	int n;
+
+	n = snprintf(NULL, 0, "format %s %d", "string", 10);
+	if (n != strlen("format string 10"))
+		return 1;
+
+	n = test_vsnprintf("format %s %d", "string", 10);
+	if (n != strlen("format string 10"))
+		return 1;
+
+	return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  dpkg_cv_c99_snprintf=yes
+else
+  dpkg_cv_c99_snprintf=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dpkg_cv_c99_snprintf" >&5
+$as_echo "$dpkg_cv_c99_snprintf" >&6; }
+if test "x$dpkg_cv_c99_snprintf" = "xyes"; then :
+
+$as_echo "#define HAVE_C99_SNPRINTF 1" >>confdefs.h
+
+fi
+ if test "x$dpkg_cv_c99_snprintf" = "xyes"; then
+  HAVE_C99_SNPRINTF_TRUE=
+  HAVE_C99_SNPRINTF_FALSE='#'
+else
+  HAVE_C99_SNPRINTF_TRUE='#'
+  HAVE_C99_SNPRINTF_FALSE=
+fi
+
+
+
+  ac_fn_c_check_decl "$LINENO" "offsetof" "ac_cv_have_decl_offsetof" "#include <stddef.h>
+"
+if test "x$ac_cv_have_decl_offsetof" = xyes; then :
+
+$as_echo "#define HAVE_OFFSETOF 1" >>confdefs.h
+
+fi
+
+
+
+  ac_fn_c_check_decl "$LINENO" "WCOREDUMP" "ac_cv_have_decl_WCOREDUMP" "#include <sys/wait.h>
+"
+if test "x$ac_cv_have_decl_WCOREDUMP" = xyes; then :
+
+$as_echo "#define HAVE_WCOREDUMP 1" >>confdefs.h
+
+fi
+
+
+
+  ac_fn_c_check_decl "$LINENO" "TIOCNOTTY" "ac_cv_have_decl_TIOCNOTTY" "#include <sys/ioctl.h>
+"
+if test "x$ac_cv_have_decl_TIOCNOTTY" = xyes; then :
+
+$as_echo "#define HAVE_TIOCNOTTY 1" >>confdefs.h
+
+fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for program_invocation_short_name" >&5
+$as_echo_n "checking for program_invocation_short_name... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <errno.h>
+int
+main ()
+{
+const char *p = program_invocation_short_name;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+$as_echo "#define HAVE_PROGRAM_INVOCATION_SHORT_NAME 1" >>confdefs.h
+
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __progname" >&5
+$as_echo_n "checking for __progname... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+extern char *__progname;
+                   const char *p = __progname;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+$as_echo "#define HAVE___PROGNAME 1" >>confdefs.h
+
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+
+  for ac_func in getopt getopt_long obstack_free \
+                         strnlen strerror strsignal asprintf \
+                         scandir alphasort unsetenv
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+     if test "x$ac_cv_func_getopt" = "xyes"; then
+  HAVE_GETOPT_TRUE=
+  HAVE_GETOPT_FALSE='#'
+else
+  HAVE_GETOPT_TRUE='#'
+  HAVE_GETOPT_FALSE=
+fi
+
+
+     if test "x$ac_cv_func_getopt_long" = "xyes"; then
+  HAVE_GETOPT_LONG_TRUE=
+  HAVE_GETOPT_LONG_FALSE='#'
+else
+  HAVE_GETOPT_LONG_TRUE='#'
+  HAVE_GETOPT_LONG_FALSE=
+fi
+
+
+     if test "x$ac_cv_func_obstack_free" = "xyes"; then
+  HAVE_OBSTACK_FREE_TRUE=
+  HAVE_OBSTACK_FREE_FALSE='#'
+else
+  HAVE_OBSTACK_FREE_TRUE='#'
+  HAVE_OBSTACK_FREE_FALSE=
+fi
+
+
+     if test "x$ac_cv_func_strnlen" = "xyes"; then
+  HAVE_STRNLEN_TRUE=
+  HAVE_STRNLEN_FALSE='#'
+else
+  HAVE_STRNLEN_TRUE='#'
+  HAVE_STRNLEN_FALSE=
+fi
+
+
+     if test "x$ac_cv_func_strerror" = "xyes"; then
+  HAVE_STRERROR_TRUE=
+  HAVE_STRERROR_FALSE='#'
+else
+  HAVE_STRERROR_TRUE='#'
+  HAVE_STRERROR_FALSE=
+fi
+
+
+     if test "x$ac_cv_func_strsignal" = "xyes"; then
+  HAVE_STRSIGNAL_TRUE=
+  HAVE_STRSIGNAL_FALSE='#'
+else
+  HAVE_STRSIGNAL_TRUE='#'
+  HAVE_STRSIGNAL_FALSE=
+fi
+
+
+     if test "x$ac_cv_func_asprintf" = "xyes"; then
+  HAVE_ASPRINTF_TRUE=
+  HAVE_ASPRINTF_FALSE='#'
+else
+  HAVE_ASPRINTF_TRUE='#'
+  HAVE_ASPRINTF_FALSE=
+fi
+
+
+     if test "x$ac_cv_func_scandir" = "xyes"; then
+  HAVE_SCANDIR_TRUE=
+  HAVE_SCANDIR_FALSE='#'
+else
+  HAVE_SCANDIR_TRUE='#'
+  HAVE_SCANDIR_FALSE=
+fi
+
+
+     if test "x$ac_cv_func_alphasort" = "xyes"; then
+  HAVE_ALPHASORT_TRUE=
+  HAVE_ALPHASORT_FALSE='#'
+else
+  HAVE_ALPHASORT_TRUE='#'
+  HAVE_ALPHASORT_FALSE=
+fi
+
+
+     if test "x$ac_cv_func_unsetenv" = "xyes"; then
+  HAVE_UNSETENV_TRUE=
+  HAVE_UNSETENV_FALSE='#'
+else
+  HAVE_UNSETENV_TRUE='#'
+  HAVE_UNSETENV_FALSE=
+fi
+
+
+
+for ac_func in strtoul strtoimax isascii bcopy memcpy setsid getdtablesize \
+                getprogname getexecname lutimes posix_fadvise
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+  # Check whether --enable-mmap was given.
+if test "${enable_mmap+set}" = set; then :
+  enableval=$enable_mmap;
+else
+  enable_mmap=no
+fi
+
+
+  if test "x$enable_mmap" = "xyes"; then :
+
+    for ac_func in mmap
+do :
+  ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
+if test "x$ac_cv_func_mmap" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MMAP 1
+_ACEOF
+
+fi
+done
+
+
+$as_echo "#define USE_MMAP 1" >>confdefs.h
+
+
+fi
+
+
+# Checks for the build machinery.
+
+$as_echo "#define LIBDPKG_VOLATILE_API 1" >>confdefs.h
+
+# Check whether --enable-compiler-warnings was given.
+if test "${enable_compiler_warnings+set}" = set; then :
+  enableval=$enable_compiler_warnings;
+else
+  enable_compiler_warnings=yes
+fi
+
+
+WFLAGS="-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers \
+	 -Wmissing-declarations -Wmissing-format-attribute \
+	 -Wformat-security -Wpointer-arith \
+	 -Wvla -Winit-self -Wwrite-strings -Wcast-align -Wshadow"
+WCFLAGS="-Wdeclaration-after-statement -Wnested-externs -Wbad-function-cast \
+	 -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition"
+# Temporarily here until #542031 gets fixed in ncurses
+WCXXFLAGS="-Wno-unused-value"
+if test "x$enable_compiler_warnings" = "xyes"; then
+	if test "x$GCC" = "xyes"; then
+		CFLAGS="$WFLAGS $WCFLAGS $CFLAGS"
+        fi
+	if test "x$GXX" = "xyes"; then
+		CXXFLAGS="$WFLAGS $WCXXFLAGS $CXXFLAGS"
+	fi
+fi
+
+# Check whether --enable-compiler-optimisations was given.
+if test "${enable_compiler_optimisations+set}" = set; then :
+  enableval=$enable_compiler_optimisations;
+else
+  enable_compiler_optimisations=yes
+fi
+
+
+  if test "x$enable_compiler_optimisations" = "xno"; then :
+
+    CFLAGS=$(echo "$CFLAGS" | sed -e "s/ -O[1-9]*\b/ -O0/g")
+
+fi
+
+# Check whether --enable-linker-optimisations was given.
+if test "${enable_linker_optimisations+set}" = set; then :
+  enableval=$enable_linker_optimisations;
+else
+  enable_linker_optimisations=yes
+fi
+
+
+  if test "x$enable_linker_optimisations" = "xno"; then :
+
+    LDFLAGS=$(echo "$LDFLAGS" | sed -e "s/ -Wl,-O[0-9]*\b//g")
+
+else
+
+    LDFLAGS="$LDFLAGS -Wl,-O1"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dpkg cpu type" >&5
+$as_echo_n "checking dpkg cpu type... " >&6; }
+
+cpu_type=$(cd $srcdir/scripts; \
+    PERL5LIB=$(pwd) $PERL dpkg-architecture.pl -t$host -qDEB_HOST_ARCH_CPU 2>/dev/null)
+
+if test "x$cpu_type" = "x"; then
+	cpu_type=$host_cpu
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cpu_type" >&5
+$as_echo "$cpu_type" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $host_cpu not found in cputable" >&5
+$as_echo "$as_me: WARNING: $host_cpu not found in cputable" >&2;}
+else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cpu_type" >&5
+$as_echo "$cpu_type" >&6; }
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define ARCHITECTURE_CPU "${cpu_type}"
+_ACEOF
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dpkg operating system type" >&5
+$as_echo_n "checking dpkg operating system type... " >&6; }
+
+os_type=$(cd $srcdir/scripts; \
+    PERL5LIB=$(pwd) $PERL dpkg-architecture.pl -t$host -qDEB_HOST_ARCH_OS 2>/dev/null)
+
+if test "x$os_type" = "x"; then
+	os_type=$host_os
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $os_type" >&5
+$as_echo "$os_type" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $host_os not found in ostable" >&5
+$as_echo "$as_me: WARNING: $host_os not found in ostable" >&2;}
+else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $os_type" >&5
+$as_echo "$os_type" >&6; }
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define ARCHITECTURE_OS "${os_type}"
+_ACEOF
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dpkg architecture name" >&5
+$as_echo_n "checking dpkg architecture name... " >&6; }
+
+dpkg_arch=$(cd $srcdir/scripts; \
+    PERL5LIB=$(pwd) $PERL dpkg-architecture.pl -t$host -qDEB_HOST_ARCH 2>/dev/null)
+
+if test "x$dpkg_arch" = "x"; then
+	as_fn_error $? "cannot determine host dpkg architecture" "$LINENO" 5
+else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dpkg_arch" >&5
+$as_echo "$dpkg_arch" >&6; }
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define ARCHITECTURE "${dpkg_arch}"
+_ACEOF
+
+
+
+ac_config_files="$ac_config_files Makefile dpkg-deb/Makefile dpkg-split/Makefile dselect/Makefile dselect/methods/Makefile dselect/po/Makefile.in lib/Makefile lib/compat/Makefile lib/dpkg/Makefile lib/dpkg/libdpkg.pc lib/dpkg/test/Makefile doc/Doxyfile man/Makefile po/Makefile.in scripts/Makefile scripts/mk/Makefile scripts/po/Makefile.in src/Makefile utils/Makefile"
+
+ac_config_headers="$ac_config_headers config.h"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${WITH_DSELECT_TRUE}" && test -z "${WITH_DSELECT_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_DSELECT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_START_STOP_DAEMON_TRUE}" && test -z "${WITH_START_STOP_DAEMON_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_START_STOP_DAEMON\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_UPDATE_ALTERNATIVES_TRUE}" && test -z "${WITH_UPDATE_ALTERNATIVES_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_UPDATE_ALTERNATIVES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_INSTALL_INFO_TRUE}" && test -z "${WITH_INSTALL_INFO_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_INSTALL_INFO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_POD_DOC_TRUE}" && test -z "${BUILD_POD_DOC_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_POD_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COVERAGE_ENABLED_TRUE}" && test -z "${COVERAGE_ENABLED_FALSE}"; then
+  as_fn_error $? "conditional \"COVERAGE_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+if test -z "${HAVE_C99_SNPRINTF_TRUE}" && test -z "${HAVE_C99_SNPRINTF_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_C99_SNPRINTF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_GETOPT_TRUE}" && test -z "${HAVE_GETOPT_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GETOPT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_GETOPT_LONG_TRUE}" && test -z "${HAVE_GETOPT_LONG_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GETOPT_LONG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_OBSTACK_FREE_TRUE}" && test -z "${HAVE_OBSTACK_FREE_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_OBSTACK_FREE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_STRNLEN_TRUE}" && test -z "${HAVE_STRNLEN_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_STRNLEN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_STRERROR_TRUE}" && test -z "${HAVE_STRERROR_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_STRERROR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_STRSIGNAL_TRUE}" && test -z "${HAVE_STRSIGNAL_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_STRSIGNAL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_ASPRINTF_TRUE}" && test -z "${HAVE_ASPRINTF_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_ASPRINTF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_SCANDIR_TRUE}" && test -z "${HAVE_SCANDIR_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_SCANDIR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_ALPHASORT_TRUE}" && test -z "${HAVE_ALPHASORT_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_ALPHASORT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_UNSETENV_TRUE}" && test -z "${HAVE_UNSETENV_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_UNSETENV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by dpkg $as_me 1.16.1.2, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <debian-dpkg@lists.debian.org>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+dpkg config.status 1.16.1.2
+configured by $0, generated by GNU Autoconf 2.68,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2010 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+    # from automake < 1.5.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "dpkg-deb/Makefile") CONFIG_FILES="$CONFIG_FILES dpkg-deb/Makefile" ;;
+    "dpkg-split/Makefile") CONFIG_FILES="$CONFIG_FILES dpkg-split/Makefile" ;;
+    "dselect/Makefile") CONFIG_FILES="$CONFIG_FILES dselect/Makefile" ;;
+    "dselect/methods/Makefile") CONFIG_FILES="$CONFIG_FILES dselect/methods/Makefile" ;;
+    "dselect/po/Makefile.in") CONFIG_FILES="$CONFIG_FILES dselect/po/Makefile.in" ;;
+    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+    "lib/compat/Makefile") CONFIG_FILES="$CONFIG_FILES lib/compat/Makefile" ;;
+    "lib/dpkg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/dpkg/Makefile" ;;
+    "lib/dpkg/libdpkg.pc") CONFIG_FILES="$CONFIG_FILES lib/dpkg/libdpkg.pc" ;;
+    "lib/dpkg/test/Makefile") CONFIG_FILES="$CONFIG_FILES lib/dpkg/test/Makefile" ;;
+    "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;;
+    "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+    "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
+    "scripts/mk/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/mk/Makefile" ;;
+    "scripts/po/Makefile.in") CONFIG_FILES="$CONFIG_FILES scripts/po/Makefile.in" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+    "po-directories":C)
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          # Compute POFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+          # Compute UPDATEPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+          # Compute DUMMYPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+          # Compute GMOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          GMOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff -uNr --exclude .git --exclude .bzr dpkg/configure.ac /home/vorlon/devel/multiarch/dpkg-debian/configure.ac
--- dpkg/configure.ac	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/configure.ac	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,6 @@
 AC_CONFIG_AUX_DIR([build-aux])
 
 AC_USE_SYSTEM_EXTENSIONS
-DPKG_ARCHITECTURE
 
 AM_INIT_AUTOMAKE([1.8 foreign nostdinc])
 
@@ -80,18 +79,21 @@
 DPKG_CHECK_DECL([offsetof], [stddef.h])
 DPKG_CHECK_DECL([WCOREDUMP], [sys/wait.h])
 DPKG_CHECK_DECL([TIOCNOTTY], [sys/ioctl.h])
+DPKG_CHECK_PROGNAME
 DPKG_CHECK_COMPAT_FUNCS([getopt getopt_long obstack_free \
                          strnlen strerror strsignal asprintf \
                          scandir alphasort unsetenv])
 AC_CHECK_FUNCS([strtoul strtoimax isascii bcopy memcpy setsid getdtablesize \
-                lutimes posix_fadvise])
+                getprogname getexecname lutimes posix_fadvise])
 
 DPKG_MMAP
 
+# Checks for the build machinery.
 AC_DEFINE(LIBDPKG_VOLATILE_API, 1, [Acknowledge the volatility of the API.])
 DPKG_COMPILER_WARNINGS
 DPKG_COMPILER_OPTIMISATIONS
 DPKG_LINKER_OPTIMISATIONS
+DPKG_ARCHITECTURE
 
 AC_CONFIG_FILES([ Makefile
 		  dpkg-deb/Makefile
@@ -108,6 +110,7 @@
 		  man/Makefile
 		  po/Makefile.in
 		  scripts/Makefile
+		  scripts/mk/Makefile
 		  scripts/po/Makefile.in
 		  src/Makefile
 		  utils/Makefile ])
diff -uNr --exclude .git --exclude .bzr dpkg/debian/changelog /home/vorlon/devel/multiarch/dpkg-debian/debian/changelog
--- dpkg/debian/changelog	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/debian/changelog	2012-06-07 10:11:09.426073000 -0700
@@ -1,4 +1,48 @@
-dpkg (1.16.1) UNRELEASED; urgency=low
+dpkg (1.16.1.2) unstable; urgency=medium
+
+  [ Raphaël Hertzog ]
+  * Fix another typo to correctly set DEB_*_ARCH_BITS in architecture.mk.
+  * Set urgency to medium as changes are minor, and it should migrate
+    quickly in case 1.16.2 comes soon.
+
+  [ Jonathan Nieder ]
+  * Update dpkg-buildflags(1) to note that the processor option
+    -D_FORTIFY_SOURCE=2 is set in CPPFLAGS now instead of CFLAGS and
+    CXXFLAGS. Closes: #646073
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Fri, 25 Nov 2011 11:18:30 +0100
+
+dpkg (1.16.1.1) unstable; urgency=low
+
+  [ Raphaël Hertzog ]
+  * Fix dpkg-source to not ignore the automatic patch when checking
+    for unrecorded changes. Closes: #643148
+  * Let dpkg-source --commit create debian/patches when required.
+    Closes: #643037
+  * Fix dpkg-buildflags --dump to return 0 as exit code and not 1.
+  * Update dpkg-buildflags(1) to not include quotes in the examples
+    setting DEB_BUILD_MAINT_OPTIONS.
+  * Stop outputting build flags in dpkg-buildpackage as it confuses
+    maintainers who are overriding them in debian/rules and who
+    are not seeing the expected value in the build log.
+  * Fix trigger setup code to not reset the status of packages
+    when they are in a status different from triggers-awaited,
+    triggers-pending or installed. Closes: #644492
+  * Fix dpkg-source to ignore changes on debian/patches/.dpkg-source-applied
+    when building a "2.0" source package. Closes: #642656
+  * Fix buildflags.mk to re-export the environment variables that
+    the maintainer can use to change the build flags. Closes: #644412
+
+  [ Guillem Jover ]
+  * Change dpkg-buildflags to set preprocessor option -D_FORTIFY_SOURCE=2
+    in CPPFLAGS, instead of CFLAGS and CXXFLAGS. Closes: #642521, #643632
+  * Fix typo to correctly set DEB_*_ARCH_BITS instead of DEB_*_ARCH in
+    architecture.mk. Thanks to Thorsten Glaser <tg@mirbsd.org>.
+  * Make dpkg-buildflags disable full relro (bindnow) if relro is not enabled.
+
+ -- Guillem Jover <guillem@debian.org>  Fri, 14 Oct 2011 07:08:31 +0200
+
+dpkg (1.16.1) unstable; urgency=low
 
   [ Raphaël Hertzog ]
   * Dpkg::Deps: Implement new "reset" method and bump module version to 1.01
@@ -19,6 +63,92 @@
   * "any" no longer hides "all" in the Architecture field of a .dsc.
   * Fix dpkg --remove to really remove the triggers from the various
     internal files in /var/lib/dpkg/info/triggers/. Closes: #525160
+  * Avoid a perl warning in dpkg-gensymbols when no symbols file has been
+    generated (because it would have been empty). Closes: #626684
+  * Re-enable the Package-List field but drop the Architecture column since we
+    have no clear use case yet. It can always be added later on.
+    Also drop the source line since it duplicates other fields.
+    Closes: #619131
+  * Add the extraction part of Dpkg::Source::Package to the supported API.
+    Useful to extract source packages without having to depend on dpkg-source
+    (and hence dpkg-dev).
+  * Add the Dpkg::Vendor module to the supported API. Useful for lintian
+    when dpkg-dev is absent.
+  * Check presence of required parameters in dpkg-vendor. Closes: #628726
+    Thanks to Niels Thykier <niels@thykier.net> for the patch.
+  * Avoid a Perl warning in dpkg-buildflags when HOME is not set.
+    Closes: #635467
+  * dpkg-source can now also use debian/source/local-patch-header (that is not
+    included in the generated source package) instead of
+    debian/source/patch-header. Closes: #629582
+  * Changed dpkg-source --after-build to automatically unapply patches that it
+    has applied during --before-build.
+  * Fix two possible causes for the assertion failure "pigp->trigpend_head".
+    LP: #798793, #424358 Closes: #560251
+  * Use "special" instead of "particular" to qualify the "3.0 (custom)" format
+    in dpkg-source(1). Closes: #631435
+  * Add some supplementary checks to ensure debian/control has the required
+    fields. Closes: #631439
+  * dpkg-gensymbols(1): document syntax of comments. Closes: #630996
+  * Allow empty lines in symbols files to better delimit multiple libraries.
+    Thanks to Cyril Brulebois <kibi@debian.org> for the patch.
+  * dpkg: if "prerm upgrade" fails when downgrading, do not try to run
+    "prerm failed-upgrade" with the prerm of the oldest prerm, it can't work
+    around a bug of a newer prerm anyway.
+  * dpkg: support new "interest-noawait" and "activate-noawait" trigger
+    directives.
+  * dpkg-buildflags(1): make it clear that DEB_*_(SET|APPEND) environment
+    variables are meant for users and should not be used by packages.
+  * update-alternatives: do not allow to reuse a slave link in another
+    slave alternative. Closes: #631547
+  * Improve dpkg-source's logic to identify ignored files. Closes: #632168
+  * Fix a small typo in dpkg-source(1). Closes: #632937
+  * Reword the description of dpkg-source --before-build and --after-build
+    to be clearer. Closes: #608260
+  * dpkg-buildpackage no longer exports the compiler flags. Closes: #560070
+    Packages must directly call dpkg-buildflags to retrieve them.
+  * dpkg-buildflags supports a prepend command to modify the build
+    flags. Particularly useful for package maintainers who don't want
+    their supplementary flags to take precedence over user submitted
+    flags.
+  * Add new --dump action to dpkg-buildflags and make it the default action.
+    Closes: #603435
+  * dpkg-mergechangelogs now checks the return value of the close() call.
+    Thanks to Niels Thykier <niels@thykier.net> for the patch. Closes: #633539
+  * Similar changes to dpkg-shlibdeps and dpkg-gencontrol, also by Niels.
+  * Fix update-alternatives to not remove a real file when dropping a
+    symlink for a slave that's not provided by the new current choice.
+    Closes: #633627
+  * Improve dpkg-source's error message complaining about the lack
+    of the upstream tarball. Closes: #634510
+  * Add some common makefile snippets for use in rules files in
+    /usr/share/dpkg/: default.mk, architecture.mk, buildflags.mk, pkg-info.mk,
+    vendor.mk Closes: #606839
+  * Fix the dpkg-divert test-suite to also skip test that would fail if run
+    under root. Closes: #634961
+  * Change merge conflict separators created by dpkg-mergechangelogs to match
+    the usual norm of being composed of 7 characters. LP: #815700
+  * With source format 2.0 and 3.0 (quilt), dpkg-source now fails by default
+    when upstream changes have not been recorded in a quilt patch. The new
+    --commit operation can be used to properly record the changes before-hand.
+    LP: #797839
+    And it fails before installing the automatic patch in debian/patches/
+    Closes: #615899
+  * dpkg-buildflags now supports "--export=configure" to output compilation
+    flags on a single line with double quotes as delimiter of the various
+    values. It also uses DEB_<flag>_MAINT_<op> to let the maintainer
+    extend the build flags to use. Last but not least, it can now also strip
+    options from the returned build flags.
+  * Fix possible segfault of dpkg in findbreakcycle(). LP: #733414
+  * dpkg-source now properly cleans up the temporary tarball generated for
+    native formats in case of unexpected interruption. Closes: #631494
+  * Fix simplification logic of union dependencies. Closes: #637564
+  * Fix dpkg's handling of a hardlink pointing to a conffile. Closes: #638291
+  * Add example of extend-diff-ignore's usage in dpkg-source(1).
+    Closes: #640198
+  * dpkg-buildflags now returns hardening flags by default. Closes: #489771
+    They can be individually enabled/disabled via DEB_BUILD_MAINT_OPTIONS,
+    see dpkg-buildflags(1). Thanks to Kees Cook for his help.
 
   [ Guillem Jover ]
   * Install deb-src-control(5) man pages in dpkg-dev. Closes: #620520
@@ -73,17 +203,87 @@
   * Do not allow blank lines in field values. Closes: #308082
   * Do not warn on missing architecture on packages in config-files state,
     but then make sure the architecture field is usable. Closes: #604241
+  * Run du with --apparent-size when generating the Installed-Size field in
+    dpkg-gencontrol to get consistent results independent of build system.
+    Thanks to Ludovic Brenta <ludovic@ludovic-brenta.org>. Closes: #630533
+  * Do not fail to unpack shared directories missing on the file system
+    from packages being replaced by other packages. Closes: #631808
+  * Do not require programs to define thisname, provide two new functions
+    to handle the program name (dpkg_set_progname and dpkg_get_progname).
+    Closes: #631757
+  * Man pages cleanup:
+    - Rename “USAGE” dselect(1) section to “ACTIONS” and clarify they can
+      be performed interactively or from command line.
+    - Add missing built-in methods to dselect(1).
+    - Add missing escaping to field dashes in deb-control(5).
+    - Use dashes instead of underscores for variable text.
+    - Clarify that several front-end fields are not dselect specific in
+      dpkg-query(1).
+    - Use [option...] instead of [options] and friends.
+    - Use italics or bold instead of surrounding the text with <>.
+    - Correctly format text with bold and italics.
+    - Use minus signs and hyphens consistently in man pages.
+    - Fix reference to /etc/dpkg/dselect.cfg.d instead of dpkg.cfg.d in
+      dselect(1).
+    - Add missing optional group|gid --chuid argument in start-stop-daemon(8).
+  * Refer to Sources and Packages files as part of a repository instead of
+    as being of exclusive use or owned by APT, which has never been the case.
+  * Unify somewhat dpkg-maintscript-helper --help output with other commands.
+  * Add build-indep and build-arch targets as aliases for build in
+    debian/rules.
+  * Use the perl interpreter found by configure to call dpkg-architecture.pl
+    in the m4 DPKG_ARCHITECTURE macro.
+  * Add new --verbose option to dpkg-deb and change --extract to honour it.
+    Closes: #293280
+  * Add new --raw-extract option to dpkg-deb combining --control and
+    --extract. Closes: #552123
+  * Defer hardlink renames so that there's never a point were the new
+    file contents are accessible from the final path before they have
+    been fsync()ed and cannot be executed causing ETXTBSY when trying
+    to open the to be installed paths for writing.
+    Thanks to Jonathan Nieder <jrnieder@gmail.com>. Closes: #635683
+  * Clarify the default dpkg-deb compression-levels on the man page.
+  * Clarify dpkg --update-avail usage error message. Closes: #628055
+  * Change Dpkg::Compression default values depending on the compressor
+    used, and as such dpkg-source inherits this functionality.
+    Prompted by Timo Juhani Lindfors <timo.lindfors@iki.fi>.
+  * Print an actual error or warning message instead of assert()ing on
+    readlink()/stat() size discrepancies. Closes: #639229
+  * Update alternative links only if they change. This allows for a
+    read-only file system and a writable database. Closes: #636700
+    Based on a patch by Salvatore Bonaccorso <carnil@debian.org>.
+  * Fix double “error:” string in dpkg missing PATH error output.
+    Closes: #639997
+  * Do not warn on strange timestamps when unpacking with dpkg-deb.
+    Closes: #640298
+  * Reduce dpkg-trigger binary size by refactoring libdpkg modules so that
+    it does not end up pulling triglib.
+  * Reduce dpkg-deb binary size by refectoring libdpkg modules so that it
+    does not end up pulling triglib.
+  * Do not fail on --compare-version when generating parse warnings.
+    Existing packages with invalid versions should not fail on their
+    maintainer scripts due to that.
+  * Use the user name (instead of the user id) when setting the supplementary
+    groups in start-stop-daemon. Closes: #641834
+  * Use --srcdir and --destdir po4a options, and bump Build-Depends version
+    to 0.36.4.
 
   [ Updated dpkg translations ]
   * German (Sven Joachim). Closes: #620312
+  * Swedish (Peter Krefting).
+  * French (Christian Perrier).
 
   [ Updated man page translations ]
-  * German (Helge Kreutzmann).
+  * French (Christian Perrier).
+  * German (Helge Kreutzmann) including improvement by "Flo".
+  * Swedish (Peter Krefting).
 
   [ Updated scripts translations ]
+  * French (Christian Perrier, Sylvestre Ledru). Closes: #637096
   * German (Helge Kreutzmann).
+  * Swedish (Peter Krefting).
 
- -- Raphaël Hertzog <hertzog@debian.org>  Sat, 02 Apr 2011 09:21:26 +0200
+ -- Guillem Jover <guillem@debian.org>  Fri, 23 Sep 2011 06:00:11 +0200
 
 dpkg (1.16.0.3) unstable; urgency=medium
 
@@ -158,7 +358,7 @@
     works at all. Thanks to Ivan Gagis <igagis@gmail.com>. LP: #728708
   * Add armhf support to ostable and triplettable. Closes: #594179
   * Set the modification time for unpacked symlinks on supported systems.
-  * Fix undefined value useage in dpkg-genchanges when adding files w/o a
+  * Fix undefined value usage in dpkg-genchanges when adding files w/o a
     matching architecture, because they are not present in debian/control,
     this is most commonly the case due to dpkg-distaddfile.
   * Terminate immediately on dpkg-divert rename errors instead of propagating
@@ -166,6 +366,8 @@
     leak detectors. Closes: #620380
   * When moving a diverted file across filesystems in dpkg-divert, remove
     the source file.
+  * Fix large file support for .deb and split .deb in dpkg-deb, dpkg-split
+    and dpkg on 32-bit architectures.
 
   [ Raphaël Hertzog ]
   * Fail properly when debian/source/format is empty. Closes: #600854
@@ -175,7 +377,7 @@
     - it documents the VCS-* fields too. Closes: #483119
     Thanks to Oxan van Leeuwen <oxan@oxanvanleeuwen.nl> who wrote it
     as part of the Google Code In program.
-  * Enhance dpkg-shlibdeps to not fail immediatly when a library is not found.
+  * Enhance dpkg-shlibdeps to not fail immediately when a library is not found.
     Instead continue and fail after all problems have been reported. Thanks
     to Chris Baines <cbaines8@gmail.com> for the patch. Closes: #596841
   * Fix dpkg-source to not list Debian packaging files as modified
@@ -1780,7 +1982,7 @@
     - Cleanup and split of header files.
 
   [ Raphaël Hertzog ]
-  * Enhance dpkg-shlibdeps's error message when a library can't be found to
+  * Enhance dpkg-shlibdeps' error message when a library can't be found to
     include the ELF format of the desired library. Closes: #474671
   * dpkg-gensymbols now refuses empty values for the the -v -P and -e
     parameters.
@@ -2591,7 +2793,7 @@
     is used. That way we're consistent with the definition of that variable
     in deb-substvars(5). Closes: #433477
   * Add support of Dm-Upload-Allowed field. Closes: #453400
-  * Fix dpkg-shlibdeps's filtering of duplicated dependencies in fields of
+  * Fix dpkg-shlibdeps' filtering of duplicated dependencies in fields of
     lesser priority (when -d is used).
   * Fix behaviour of dpkg-shlibdeps when the same binary was passed multiple
     times for use in different dependency fields (-d option).
@@ -3743,7 +3945,7 @@
     attributes and other embellishments.
   * Add dpkg-query(1) in the SEE ALSO section in dpkg(1). Closes: #354643
   * Don't try to compile in SELinux support on GNU/kFreeBSD amd64.
-  * Add new quiet option to dpkg-source to supress warnings. Closes: #355065
+  * Add new quiet option to dpkg-source to suppress warnings. Closes: #355065
   * Do not expand architecture aliases anymore in .dsc files.
   * Change start-stop-daemon's --exec behaviour again on GNU/Linux to compare
     the referred file pointed by the '/proc/<pid>/exe' symlink, stripping
@@ -4155,7 +4357,7 @@
   SELinux support (Manoj Srivastava):
   * On SELinux-enabled systems, try to set the security context when the
     package is unpacked.  Closes: #193653, #249496, #307139.
-  * Added build-dependancy on libselinux1-dev.
+  * Added build-dependency on libselinux1-dev.
 
   Improvements to dpkg-source (Brendan O'Dea):
   * Support unpacking of "Wig And Pen" (Format 2.0) source packages.
@@ -4554,7 +4756,7 @@
       Closes: #120562.
     - Add --force-bad-verify to dpkg manpage.  Closes: #192812.
     - Correct dpkg manpage to refer to --force-remove-reinstreq instead of
-      -non-existant --force-reinstreq option.  Closes: #232831.
+      non-existent --force-reinstreq option.  Closes: #232831.
     - Correct documentation of --compare-versions arguments.  Closes: #232317.
     - Correct usage of "et al" to "et al.".  Closes: #230751.
     - Add dpkg-reconfigure(8) to SEE ALSO section of dpkg(8).  Closes: #233282.
@@ -4624,7 +4826,7 @@
   * Add --dir-file option to install-info for GNU install-info
     compatibility.  Closes: #179192
   * Refer to debian-policy in dpkg-doc's description instead of the
-    non-existant packaging-manual.  Closes: #120970.
+    non-existent packaging-manual.  Closes: #120970.
   * Remove incorrect mention of build-essential from dpkg-checkbuilddeps
     manpage.  Closes: #219210.
   * Add a note about diverting shared libraries to the dpkg-divert
@@ -4797,7 +4999,7 @@
       Some fields may have vars in them, which breaks the validation.
     * dpkg-gencontrol calls substvars after parsing the control file, and
       then validates the substituted depends lines.  Originally,
-      substitution occured only during writing of the final output file.
+      substitution occurred only during writing of the final output file.
     * Andreas Barth <aba@not.so.argh.org>:
       Fix bad regex that didn't allow spaces in dependency field parsing.
       It now directly matches what the c code expects.  It previously was
@@ -5143,7 +5345,7 @@
   * dselect now accepts regular expressions when searching for packages
     and can search in package descriptions as well.
     Closes: Bug#81009,#83139
-  * Move query commands into a seperate dpkg-query command. For the old options
+  * Move query commands into a separate dpkg-query command. For the old options
     (-L,-l,-s,-S) dpkg will still call it for you.
   * Add configurable package listing support to dpkg-query
   * Handle window resize in dselect main menu. Closes: Bug#98275
@@ -5173,7 +5375,7 @@
     Closes: #120924.
   * Make dpkg-checkbuilddeps always check for build-essential.
     Closes: Bug#118420.
-  * Use space seperated output instead of comma seperated in
+  * Use space separated output instead of comma separated in
     dpkg-checkbuilddeps
   * Update default ignore expression in dpkg-source to also match *~ and
     *.swp in subdirs. Closes: Bug#127458
@@ -5310,7 +5512,7 @@
 
   * Add a -W option to dpkg-source(and the other utils, where it is just
     passed thru), to turn certain errors into warnings(of which, only
-    one is changed, namely, the 'tar doesn't contain preceeding directory'
+    one is changed, namely, the 'tar doesn't contain preceding directory'
     error).  Closes: #101813, and partially 101845.
   * Don't error out if the files in the tar have leading './', for
     dpkg-source.  (another partial close of 101845).
@@ -5551,7 +5753,7 @@
     segfaults people have been seeing in dpkg.  Closes: Bug#90328.
   * Apply patch from bug#86847, that escapes intl chars in filenames.
     Closes: Bug#83752, #85040, #86847, #89000.
-  * Errors during dpkg -s(and other similiar commands) are now printed
+  * Errors during dpkg -s(and other similar commands) are now printed
     on stderr.  Closes: Bug#88987.
   * Add a --retry option to start-stop-daemon. Closes: Bug#75139
   * Fix regeps to extract Closes magic from a changelog so the #
@@ -5932,7 +6134,7 @@
     it was already broken when there was no gcc anyway :)
   * Fixed missing mipseb that was supposed to be in the archtable
   * Better output in update-alternatives --config, now shows the
-    current, and the prefered choices.
+    current, and the preferred choices.
   * dpkg-name: ignore epoch when getting version
   * 50dpkg-dev.el: add it as a conffile for dpkg-dev
   * internals.sgml: Removed references to the versions of build tools,
@@ -6395,7 +6597,7 @@
     against libraries it depends on).  Code by Richard Braakman
     <dark@xs4all.nl> and Yann Dirson <dirson@debian.org>.
   * debian/rules: remove all reference to the packaging manual as it is
-    now provided by the seperate "packaging-manual" package. [#21581,
+    now provided by the separate "packaging-manual" package. [#21581,
     #21186, #22698, #23342]
   * debian/rules: link dpkg-divert.1.gz to undocumented.7.gz as the lack
     of a real manpage has been reported in #11093.
@@ -6536,7 +6738,7 @@
   * Provide 50dpkg-dev.el for xemacs as well as emacs.
   * Explicitly provide path for debian-changelog-mode in 50dpkg-dev to use
     .el file as workaround until xemacs can read emacs19 .elc files.
-  * Pass top_distdir explicitly to 'make dist' to accomodate bug in
+  * Pass top_distdir explicitly to 'make dist' to accommodate bug in
     automake_1.1o-1.
   * Fix debian/build to make html documentation without including
     directories in tar archives (fixes #9348).
@@ -6717,7 +6919,7 @@
 dpkg (1.4.0.2) unstable; urgency=medium
 
   * dpkg-buildpackage.sh: reverted the quoting change -- (you
-    should use super, sudo, realy, but not su.  Or write a wrapper
+    should use super, sudo, really, but not su.  Or write a wrapper
     around su)
   * dpkg-buildpackge.sh: passing -m, -C, -v options to dpkg-genchanges
     more the way Ian likes ;-)
@@ -7658,7 +7860,7 @@
   * `hold' flag changed to be settable by the user only, and
     made orthogonal to the `reinstallation required' flag.
   * dpkg will install by default any packages with priority of
-    `standard' or better unless they're explictly deselected.
+    `standard' or better unless they're explicitly deselected.
 
   * dselect dependency/conflict resolution will suggest marking absent
     packages for `purge' rather than `deinstall'.
diff -uNr --exclude .git --exclude .bzr dpkg/debian/control /home/vorlon/devel/multiarch/dpkg-debian/debian/control
--- dpkg/debian/control	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/debian/control	2012-06-07 10:11:09.426073000 -0700
@@ -10,7 +10,7 @@
 Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git
 Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 7), pkg-config, flex,
- gettext (>= 0.18), po4a (>= 0.33.1),
+ gettext (>= 0.18), po4a (>= 0.36.4),
  zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev,
  libselinux1-dev (>= 1.28-4) [linux-any],
  libncursesw5-dev,
@@ -30,7 +30,6 @@
 
 Package: dpkg
 Architecture: any
-Multi-Arch: foreign
 Essential: yes
 Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1), xz-utils
 Depends: ${misc:Depends}
@@ -99,7 +98,6 @@
 Package: dselect
 Priority: optional
 Architecture: any
-Multi-Arch: foreign
 Depends: ${shlibs:Depends}, dpkg (>= 1.13.1), ${misc:Depends}
 Suggests: perl
 Conflicts: dpkg-ftp, dpkg-multicd
diff -uNr --exclude .git --exclude .bzr dpkg/debian/dpkg-dev.install /home/vorlon/devel/multiarch/dpkg-debian/debian/dpkg-dev.install
--- dpkg/debian/dpkg-dev.install	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/debian/dpkg-dev.install	2012-06-07 10:11:09.426073000 -0700
@@ -17,6 +17,7 @@
 usr/bin/dpkg-shlibdeps
 usr/bin/dpkg-source
 usr/bin/dpkg-vendor
+usr/share/dpkg/*.mk
 usr/share/man/{*/*,*}/deb-control.5
 usr/share/man/{*/*,*}/deb-src-control.5
 usr/share/man/{*/*,*}/deb-version.5
diff -uNr --exclude .git --exclude .bzr dpkg/debian/dpkg.install /home/vorlon/devel/multiarch/dpkg-debian/debian/dpkg.install
--- dpkg/debian/dpkg.install	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/debian/dpkg.install	2012-06-07 10:11:09.426073000 -0700
@@ -13,7 +13,7 @@
 usr/bin/dpkg-trigger
 usr/bin/update-alternatives
 usr/sbin
-usr/share/dpkg
+usr/share/dpkg/*table
 usr/share/locale/*/LC_MESSAGES/dpkg.mo
 usr/share/man/{*/*,*}/dpkg-deb.1
 usr/share/man/{*/*,*}/dpkg-divert.8
diff -uNr --exclude .git --exclude .bzr dpkg/debian/dpkg.postrm /home/vorlon/devel/multiarch/dpkg-debian/debian/dpkg.postrm
--- dpkg/debian/dpkg.postrm	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/debian/dpkg.postrm	2012-06-07 10:11:09.426073000 -0700
@@ -32,18 +32,6 @@
     rm -f /var/log/dpkg.log /var/log/dpkg.log.* 2>/dev/null
 }
 
-# Cleanup multiarch infodb leftovers
-cleanup_multiarch_infodb()
-{
-    admindir=${DPKG_ADMINDIR:-/var/lib/dpkg}
-    pkgadmindir=$admindir/info
-
-    echo "Cleaning up the multiarch dpkg control files database ..."
-    ls $pkgadmindir | grep : | while read oldfile; do
-        rm "$pkgadmindir/$oldfile"
-    done
-    rm -f $admindir/format
-}
 
 case "$1" in
     remove)
@@ -53,14 +41,7 @@
 	remove_logfile
 	;;
 
-    upgrade)
-	# Downgrade the multiarch db to a “monoarch” db layout
-	if dpkg --compare-versions "$2" lt 1.16.0; then
-	    cleanup_multiarch_infodb
-	fi
-	;;
-
-    failed-upgrade|disappear|abort-install|abort-upgrade)
+    upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)
 	;;
 
 
diff -uNr --exclude .git --exclude .bzr dpkg/debian/dpkg.prerm /home/vorlon/devel/multiarch/dpkg-debian/debian/dpkg.prerm
--- dpkg/debian/dpkg.prerm	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/debian/dpkg.prerm	2012-06-07 10:11:09.426073000 -0700
@@ -17,73 +17,54 @@
 # Before the package is replaced due to conflict:
 #      <prerm> remove in-favour <new-package> <version>
 
-downgrade_multiarch_infodb()
+ensure_no_triggers_noawait()
 {
     admindir=${DPKG_ADMINDIR:-/var/lib/dpkg}
     pkgadmindir=$admindir/info
 
-    coinst_pkgs="`ls "$pkgadmindir" | \
-        sed -n -e 's/^\([^:]\+:[^.]\+\)\..*$/\1/p' | sort -u | \
-        cut -d: -f1 | uniq -d`"
+    trig_noawait=$(find "$pkgadmindir" -name "*.triggers" -type f | \
+                   xargs -r grep -El "^(interest|activate)-(no)?await" | \
+		   sed -e 's,^.*/\([^/.:]\+\)[^/]\+$,\1,')
 
     # Abort if we cannot possibly downgrade
-    if [ -n "$coinst_pkgs" ]; then
+    if [ -n "$trig_noawait" ]; then
         cat <<- MSG
-	dpkg: error: You have more than one architecture instance for some
-	installed 'Multi-Arch: same' packages, to be able to downgrade dpkg
-	you will need to have only one instance installed per package.
+	dpkg: error: You have packages using the "interest-noawait" and/or
+	"activate-noawait" trigger directives but the dpkg version that
+	you're trying to downgrade to doesn't support them. Aborting
+	downgrade.
 
-	List of co-installed packages:
+	List of affected packages:
 
-	$coinst_pkgs
+	$trig_noawait
 	MSG
         exit 1
     fi
 
-    bad_dep_pkgs=$(dpkg-query -f'${Package} ${Depends} ${Recommends} ${Suggests} ${Enhances} ${Conflicts} ${Replaces} ${Breaks}\n' -W | \
-	grep ":any" | cut -d" " -f1 | sort -u)
-    if [ -n "$bad_dep_pkgs" ]; then
+    bad_triggers_files=$(find "$admindir/triggers" -type f | \
+                         xargs -r grep -l "/noawait$" || true)
+    if [ -n "$bad_triggers_files" ]; then
         cat <<- MSG
-	dpkg: error: Some installed packages have multiarch dependencies
-	that the old dpkg won't parse. You should get rid of them
-	(or downgrade them to versions without those dependencies) before
-	proceeding with dpkg's downgrade.
+	dpkg: error: Some internal trigger files unexpectedly reference
+	packages tagged with "/noawait" while their corresponding
+	infodb files doesn't seem to contain any "interest-noawait"
+	directive. Aborting the downgrade as those tags are not supported
+	by the version you're trying to downgrade to.
 
-	List of affected packages:
+	List of internal trigger files that are affected:
 
-	$bad_dep_pkgs
+	$bad_triggers_files
 	MSG
 	exit 1
     fi
-
-    for dep in Depends Recommends Suggests Enhances \
-	       Conflicts Replaces Breaks; do
-	if grep -qE "^$dep:.*:any" $admindir/available; then
-		cat <<- MSG
-		dpkg: error: $admindir/available references packages with
-		multiarch dependencies that the old dpkg won't parse. You
-		should clear this file with "dpkg --clear-avail" before
-		proceeding with dpkg's downgrade.
-		MSG
-		exit 1
-	fi
-    done
-
-    echo "Downgrading the multiarch dpkg control files database ..."
-    ls $pkgadmindir | grep : | while read oldfile; do
-        # We first do a round of hardlinks to the new names, so that the db
-        # will never be unusable for either of the dpkg versions.
-        newfile=$(echo $oldfile | sed -e 's/:[^.]\+//')
-        ln "$pkgadmindir/$oldfile" "$pkgadmindir/$newfile"
-    done
-    echo -n "1" >$admindir/format
 }
 
 case "$1" in
     upgrade)
-        # Downgrade the multiarch db to a “monoarch” db layout
-        if dpkg --compare-versions "$2" lt 1.16.0; then
-            downgrade_multiarch_infodb
+        # Allow the downgrade only if no package is using the
+	# (interest|activate)-noawait trigger directives
+        if dpkg --compare-versions "$2" lt 1.16.1~; then
+            ensure_no_triggers_noawait
         fi
         ;;
 
diff -uNr --exclude .git --exclude .bzr dpkg/debian/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/debian/.gitignore
--- dpkg/debian/.gitignore	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/debian/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1,9 +0,0 @@
-libdpkg-dev
-libdpkg-perl
-dpkg
-dpkg-dev
-dselect
-tmp
-files
-*.substvars
-*.debhelper.log
diff -uNr --exclude .git --exclude .bzr dpkg/debian/rules /home/vorlon/devel/multiarch/dpkg-debian/debian/rules
--- dpkg/debian/rules	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/debian/rules	2012-06-07 10:11:09.426073000 -0700
@@ -4,17 +4,8 @@
 
 WFLAGS := -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
 
-CFLAGS = -g $(WFLAGS)
-CXXFLAGS = -g $(WFLAGS)
-
-# Disable optimisations if ‘noopt’ found in $DEB_BUILD_OPTIONS
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-	CXXFLAGS += -O0
-else
-	CFLAGS += -O2
-	CXXFLAGS += -O2
-endif
+# Use the in-tree dpkg-buildflags
+dpkg_buildflags = DEB_CFLAGS_MAINT_APPEND="$(WFLAGS)" DEB_CXXFLAGS_MAINT_APPEND="$(WFLAGS)" PERL5LIB=$(CURDIR)/scripts DPKG_DATADIR=$(CURDIR) perl $(CURDIR)/scripts/dpkg-buildflags.pl
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -33,7 +24,9 @@
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	confflags += --with-selinux
 endif
-
+ifeq (,$(filter maintainer-build,$(DEB_BUILD_OPTIONS)))
+	confflags += --disable-silent-rules
+endif
 
 # Create configure script if necessary, automake handles rebuilding it.
 configure:
@@ -47,8 +40,7 @@
 
 	install -d build-tree
 	cd build-tree && ../configure $(confflags) \
-		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-		--disable-silent-rules \
+		$(shell $(dpkg_buildflags) --export=configure) \
 		--prefix=/usr \
 		--mandir=\$${datadir}/man \
 		--infodir=\$${datadir}/info \
@@ -58,7 +50,7 @@
 		--with-bz2
 
 # Build the package in build-tree
-build: build-tree/config.status
+build-indep build-arch build: build-tree/config.status
 	dh_testdir
 
 	cd build-tree && $(MAKE)
diff -uNr --exclude .git --exclude .bzr dpkg/debian/usertags /home/vorlon/devel/multiarch/dpkg-debian/debian/usertags
--- dpkg/debian/usertags	2011-03-01 14:31:03.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/debian/usertags	2012-06-07 10:11:09.426073000 -0700
@@ -27,7 +27,7 @@
 trivial		[TRIVIAL]	Bug should be trivial to fix.
 perf		[PERF]		Performance problems.
 new-field			Request for new control file fields.
-new-option			Request for new command-line option.
+new-option			Request for new command line option.
 deb-format			Changes to the binary (.deb) format.
 dsc-format			Changes to the source (.dsc) format.
 arch		[ARCH]		Updates to ‘cputable’, ‘ostable’ and porting
@@ -155,7 +155,7 @@
   + Performance issue [perf]
   + Trivial fix [trivial]
   + New control field [new-field]
-  + New command-line option [new-option]
+  + New command line option [new-option]
   + Binary package format [deb-format]
   + Source package format [dsc-format]
   + Architecture specific issue [arch]
diff -uNr --exclude .git --exclude .bzr dpkg/.dist-version /home/vorlon/devel/multiarch/dpkg-debian/.dist-version
--- dpkg/.dist-version	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/.dist-version	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1 @@
+1.16.1.2
diff -uNr --exclude .git --exclude .bzr dpkg/doc/coding-style.txt /home/vorlon/devel/multiarch/dpkg-debian/doc/coding-style.txt
--- dpkg/doc/coding-style.txt	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/doc/coding-style.txt	2012-06-07 10:11:09.426073000 -0700
@@ -64,7 +64,7 @@
 	                     "extra-string");
 }
 
-When wrapping, logical operators should be kept on the preceeding line:
+When wrapping, logical operators should be kept on the preceding line:
 
 	if (really_long_variable_to_be_checked_against_a &&
 	    really_long_variable_to_be_checked_against_b)
diff -uNr --exclude .git --exclude .bzr dpkg/doc/Doxyfile.in /home/vorlon/devel/multiarch/dpkg-debian/doc/Doxyfile.in
--- dpkg/doc/Doxyfile.in	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/doc/Doxyfile.in	2012-06-07 10:11:09.426073000 -0700
@@ -282,7 +282,7 @@
 # causing a significant performance penality.
 # If the system has enough physical memory increasing the cache will improve the
 # performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
+# a logarithmic scale so increasing the size by one will roughly double the
 # memory usage. The cache size is given by this formula:
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols
diff -uNr --exclude .git --exclude .bzr dpkg/doc/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/doc/.gitignore
--- dpkg/doc/.gitignore	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/doc/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1,3 +0,0 @@
-Doxyfile
-html
-coverage
diff -uNr --exclude .git --exclude .bzr dpkg/doc/README.api /home/vorlon/devel/multiarch/dpkg-debian/doc/README.api
--- dpkg/doc/README.api	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/doc/README.api	2012-06-07 10:11:09.426073000 -0700
@@ -31,7 +31,7 @@
 Status: stable
 Version: 2.0
 Description:
- Since dpkg 1.14.16, the set of command-line options that custom
+ Since dpkg 1.14.16, the set of command line options that custom
  changelog parsers must support has been expanded (see
  dpkg-parsechangelog(1)). For compatibility, changelog parsers supporting
  only the old options are supported in lenny. In lenny+1, that support
diff -uNr --exclude .git --exclude .bzr dpkg/doc/README.feature-removal-schedule /home/vorlon/devel/multiarch/dpkg-debian/doc/README.feature-removal-schedule
--- dpkg/doc/README.feature-removal-schedule	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/doc/README.feature-removal-schedule	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 Why:
  With the support of multiple source formats, the user should be explicit
  about the desired source format. The fallback to "1.0" is there only for
- backwards compatiblity but will be removed once all packages have the
+ backwards compatibility but will be removed once all packages have the
  debian/source/format file. This is unlikely to happen before 1.17.x.
 
 What: Source-Version (substvar)
diff -uNr --exclude .git --exclude .bzr dpkg/doc/triggers.txt /home/vorlon/devel/multiarch/dpkg-debian/doc/triggers.txt
--- dpkg/doc/triggers.txt	2011-03-01 14:31:03.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/doc/triggers.txt	2012-06-07 10:11:09.426073000 -0700
@@ -46,7 +46,8 @@
 deferred until it is convenient (as described below).
 
 At a trigger activation, the interested packages(s) are added to the
-triggering package's list of triggers-awaited packages; the triggering
+triggering package's list of triggers-awaited packages (unless the
+trigger has been configured to not require it); the triggering
 package is said to await the trigger processing.
 
 A package which has pending triggers, or which awaits triggers, is not
@@ -125,7 +126,7 @@
 
 If the `postinst triggered' run fails the package goes to
 `config-failed', so that the trigger processing will not be attempted
-again until explictly requested.
+again until explicitly requested.
 
 
              |
@@ -174,7 +175,7 @@
 Or to put it another way, triggered actions are considered irrelevant
 if the interested package I is not configured.  When I's postinst is
 called with `configure', it must do whatever actions are necessary to
-deal with any trigger activations which might have occured while it
+deal with any trigger activations which might have occurred while it
 was not configured, just as if the package was being configured for
 the first time.
 
@@ -263,7 +264,7 @@
 File triggers should not generally be used without mutual consent.
 The use of a file trigger, and the name of the trigger used, should be
 stated in policy, so that a package which creates a relevant file in a
-maintainer script can activate the trigger explictly.
+maintainer script can activate the trigger explicitly.
 
 File triggers must definitely not be used as an escalation tool in
 disagreements between different packages as to the desired contents of
@@ -311,7 +312,7 @@
 trigger names syntaxes and unrecognised trigger control directives.
 
 
-New command-line interfaces to dpkg tools
+New command line interfaces to dpkg tools
 -----------------------------------------
 
 See dpkg(1).
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-deb/build.c /home/vorlon/devel/multiarch/dpkg-debian/dpkg-deb/build.c
--- dpkg/dpkg-deb/build.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-deb/build.c	2012-06-07 10:11:09.426073000 -0700
@@ -48,7 +48,7 @@
 #include <dpkg/subproc.h>
 #include <dpkg/compress.h>
 #include <dpkg/ar.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-deb.h"
 
@@ -334,8 +334,8 @@
   m_asprintf(&controlfile, "%s/%s/%s", dir, BUILDCONTROLDIR, CONTROLFILE);
   parsedb(controlfile, pdb_recordavailable | pdb_rejectstatus, &pkg);
 
-  if (strspn(pkg->set->name, "abcdefghijklmnopqrstuvwxyz0123456789+-.") !=
-      strlen(pkg->set->name))
+  if (strspn(pkg->name, "abcdefghijklmnopqrstuvwxyz0123456789+-.") !=
+      strlen(pkg->name))
     ohshit(_("package name has characters that aren't lowercase alphanums or `-+.'"));
   if (pkg->priority == pri_other)
     warning(_("'%s' contains user-defined Priority value '%s'"),
@@ -374,9 +374,9 @@
   const char *versionstring, *arch_sep;
 
   versionstring = versiondescribe(&pkg->available.version, vdew_never);
-  arch_sep = pkg->available.arch->type == arch_none ? "" : "_";
-  m_asprintf(&path, "%s/%s_%s%s%s%s", dir, pkg->set->name, versionstring,
-             arch_sep, pkg->available.arch->name, DEBEXT);
+  arch_sep = pkg->available.arch[0] == '\0' ? "" : "_";
+  m_asprintf(&path, "%s/%s_%s%s%s%s", dir, pkg->name, versionstring,
+             arch_sep, pkg->available.arch, DEBEXT);
 
   return path;
 }
@@ -436,8 +436,7 @@
     pkg = check_new_pkg(dir);
     if (subdir)
       debar = pkg_get_pathname(debar, pkg);
-    printf(_("dpkg-deb: building package `%s' in `%s'.\n"),
-           pkg_describe(pkg, pdo_foreign | pdo_avail), debar);
+    printf(_("dpkg-deb: building package `%s' in `%s'.\n"), pkg->name, debar);
   }
   m_output(stdout, _("<standard output>"));
 
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-deb/dpkg-deb.h /home/vorlon/devel/multiarch/dpkg-debian/dpkg-deb/dpkg-deb.h
--- dpkg/dpkg-deb/dpkg-deb.h	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-deb/dpkg-deb.h	2012-06-07 10:11:09.426073000 -0700
@@ -29,8 +29,10 @@
 action_func do_field;
 action_func do_extract;
 action_func do_vextract;
+action_func do_raw_extract;
 action_func do_fsystarfile;
 
+extern int opt_verbose;
 extern int debugflag, nocheckflag, oldformatflag;
 
 void extracthalf(const char *debar, const char *dir,
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-deb/extract.c /home/vorlon/devel/multiarch/dpkg-debian/dpkg-deb/extract.c
--- dpkg/dpkg-deb/extract.c	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-deb/extract.c	2012-06-07 10:11:09.426073000 -0700
@@ -47,7 +47,7 @@
 #include <dpkg/command.h>
 #include <dpkg/compress.h>
 #include <dpkg/ar.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-deb.h"
 
@@ -175,8 +175,8 @@
       } else if (arh.ar_name[0] == '_') {
         /* Members with ‘_’ are noncritical, and if we don't understand
          * them we skip them. */
-        fd_null_copy(arfd, memberlen + (memberlen & 1),
-                     _("skipped archive member data from %s"), debar);
+        fd_skip(arfd, memberlen + (memberlen & 1),
+                _("skipped archive member data from %s"), debar);
       } else {
 	if (strncmp(arh.ar_name, ADMINMEMBER, sizeof(arh.ar_name)) == 0)
 	  adminmember = 1;
@@ -201,8 +201,8 @@
           ctrllennum= memberlen;
         }
         if (!adminmember != !admininfo) {
-          fd_null_copy(arfd, memberlen + (memberlen & 1),
-                       _("skipped archive member data from %s"), debar);
+          fd_skip(arfd, memberlen + (memberlen & 1),
+                  _("skipped archive member data from %s"), debar);
         } else {
           /* Yes! - found it. */
           break;
@@ -238,8 +238,8 @@
       memberlen = ctrllennum;
     } else {
       memberlen = stab.st_size - ctrllennum - strlen(ctrllenbuf) - l;
-      fd_null_copy(arfd, ctrllennum,
-                   _("skipped archive control member data from %s"), debar);
+      fd_skip(arfd, ctrllennum,
+              _("skipped archive control member data from %s"), debar);
     }
 
     if (admininfo >= 2) {
@@ -288,19 +288,6 @@
   close(arfd);
   if (taroption) close(p2[1]);
 
-  if (taroption && dir) {
-    if (chdir(dir)) {
-      if (errno == ENOENT) {
-        if (mkdir(dir, 0777))
-          ohshite(_("failed to create directory"));
-        if (chdir(dir))
-          ohshite(_("failed to chdir to directory after creating it"));
-      } else {
-        ohshite(_("failed to chdir to directory"));
-      }
-    }
-  }
-
   if (taroption) {
     c3 = subproc_fork();
     if (!c3) {
@@ -314,7 +301,19 @@
 
       unsetenv("TAR_OPTIONS");
 
-      execlp(TAR, "tar", buffer, "-", NULL);
+      if (dir) {
+        if (chdir(dir)) {
+          if (errno != ENOENT)
+            ohshite(_("failed to chdir to directory"));
+
+          if (mkdir(dir, 0777))
+            ohshite(_("failed to create directory"));
+          if (chdir(dir))
+            ohshite(_("failed to chdir to directory after creating it"));
+        }
+      }
+
+      execlp(TAR, "tar", buffer, "-", "--warning=no-timestamp", NULL);
       ohshite(_("unable to execute %s (%s)"), "tar", TAR);
     }
     close(p2[0]);
@@ -378,11 +377,48 @@
 int
 do_extract(const char *const *argv)
 {
-  return controlextractvextract(0, "xp", argv);
+  if (opt_verbose)
+    return controlextractvextract(0, "xpv", argv);
+  else
+    return controlextractvextract(0, "xp", argv);
 }
 
 int
 do_vextract(const char *const *argv)
 {
-  return controlextractvextract(0, "xpv", argv);
+  /* XXX: Backward compatibility. */
+  opt_verbose = 1;
+  return do_extract(argv);
+}
+
+int
+do_raw_extract(const char *const *argv)
+{
+  const char *debar, *dir;
+  char *control_dir;
+
+  debar = *argv++;
+  if (debar == NULL)
+    badusage(_("--%s needs a .deb filename argument"), cipaction->olong);
+
+  dir = *argv++;
+  if (dir == NULL)
+    badusage(_("--%s needs a target directory.\n"
+               "Perhaps you should be using dpkg --install ?"),
+             cipaction->olong);
+  else if (*argv)
+    badusage(_("--%s takes at most two arguments (.deb and directory)"),
+             cipaction->olong);
+
+  m_asprintf(&control_dir, "%s/%s", dir, EXTRACTCONTROLDIR);
+
+  if (opt_verbose)
+    extracthalf(debar, dir, "xpv", 0);
+  else
+    extracthalf(debar, dir, "xp", 0);
+  extracthalf(debar, control_dir, "x", 1);
+
+  free(control_dir);
+
+  return 0;
 }
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-deb/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/dpkg-deb/.gitignore
--- dpkg/dpkg-deb/.gitignore	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-deb/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-dpkg-deb
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-deb/info.c /home/vorlon/devel/multiarch/dpkg-debian/dpkg-deb/info.c
--- dpkg/dpkg-deb/info.c	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-deb/info.c	2012-06-07 10:11:09.426073000 -0700
@@ -44,7 +44,7 @@
 #include <dpkg/buffer.h>
 #include <dpkg/path.h>
 #include <dpkg/subproc.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-deb.h"
 
@@ -54,13 +54,13 @@
   struct stat stab;
 
   dir = argv[0];
-  if (chdir("/"))
-    ohshite(_("failed to chdir to `/' for cleanup"));
   if (lstat(dir, &stab) && errno == ENOENT)
     return;
 
   pid = subproc_fork();
   if (pid == 0) {
+    if (chdir("/"))
+      ohshite(_("failed to chdir to `/' for cleanup"));
     execlp(RM, "rm", "-rf", dir, NULL);
     ohshite(_("unable to execute %s (%s)"), _("rm command for cleanup"), RM);
   }
@@ -99,10 +99,7 @@
 
   while ((component = *argv++) != NULL) {
     varbuf_reset(&controlfile);
-    varbuf_add_str(&controlfile, dir);
-    varbuf_add_char(&controlfile, '/');
-    varbuf_add_str(&controlfile, component);
-    varbuf_end_str(&controlfile);
+    varbuf_printf(&controlfile, "%s/%s", dir, component);
 
     fd = open(controlfile.buf, O_RDONLY);
     if (fd >= 0) {
@@ -130,22 +127,28 @@
 {
   char interpreter[INTERPRETER_MAX+1], *p;
   int il, lines;
+  struct varbuf controlfile = VARBUF_INIT;
   struct dirent **cdlist, *cdep;
   int cdn, n;
   FILE *cc;
   struct stat stab;
   int c;
 
-  cdn= scandir(".", &cdlist, &ilist_select, alphasort);
+  cdn = scandir(dir, &cdlist, &ilist_select, alphasort);
   if (cdn == -1)
     ohshite(_("cannot scan directory `%.255s'"), dir);
 
   for (n = 0; n < cdn; n++) {
     cdep = cdlist[n];
-    if (stat(cdep->d_name,&stab))
+
+    varbuf_reset(&controlfile);
+    varbuf_printf(&controlfile, "%s/%s", dir, cdep->d_name);
+
+    if (stat(controlfile.buf, &stab))
       ohshite(_("cannot stat `%.255s' (in `%.255s')"), cdep->d_name, dir);
     if (S_ISREG(stab.st_mode)) {
-      if (!(cc= fopen(cdep->d_name,"r")))
+      cc = fopen(controlfile.buf, "r");
+      if (!cc)
         ohshite(_("cannot open `%.255s' (in `%.255s')"), cdep->d_name, dir);
       lines = 0;
       interpreter[0] = '\0';
@@ -174,9 +177,12 @@
   }
   free(cdlist);
 
-  if (!(cc= fopen("control","r"))) {
+  varbuf_reset(&controlfile);
+  varbuf_printf(&controlfile, "%s/%s", dir, CONTROLFILE);
+  cc = fopen(controlfile.buf, "r");
+  if (!cc) {
     if (errno != ENOENT)
-      ohshite(_("failed to read `%.255s' (in `%.255s')"), "control", dir);
+      ohshite(_("failed to read `%.255s' (in `%.255s')"), CONTROLFILE, dir);
     fputs(_("(no `control' file in control archive!)\n"), stdout);
   } else {
     lines= 1;
@@ -190,11 +196,12 @@
       putc('\n', stdout);
 
     if (ferror(cc))
-      ohshite(_("failed to read `%.255s' (in `%.255s')"), "control", dir);
+      ohshite(_("failed to read `%.255s' (in `%.255s')"), CONTROLFILE, dir);
     fclose(cc);
   }
 
   m_output(stdout, _("<standard output>"));
+  varbuf_destroy(&controlfile);
 }
 
 static void
@@ -202,13 +209,17 @@
            bool showfieldname)
 {
   FILE *cc;
+  char *controlfile;
   char fieldname[MAXFIELDNAME+1];
   char *pf;
   const char *const *fp;
   int c, lno, fnl;
   bool doing;
 
-  if (!(cc= fopen("control","r"))) ohshite(_("could not open the `control' component"));
+  m_asprintf(&controlfile, "%s/%s", dir, CONTROLFILE);
+  cc = fopen(controlfile, "r");
+  if (!cc)
+    ohshite(_("could not open the `control' component"));
   doing = true;
   lno = 1;
   for (;;) {
@@ -249,15 +260,17 @@
   }
   if (ferror(cc)) ohshite(_("failed during read of `control' component"));
   if (fclose(cc))
-    ohshite(_("error closing the '%s' component"), "control");
+    ohshite(_("error closing the '%s' component"), CONTROLFILE);
   if (doing) putc('\n',stdout);
   m_output(stdout, _("<standard output>"));
+  free(controlfile);
 }
 
 int
 do_showinfo(const char *const *argv)
 {
   const char *debar, *dir;
+  char *controlfile;
   struct pkginfo *pkg;
   struct pkg_format_node *fmt = pkg_format_parse(showformat);
 
@@ -266,9 +279,11 @@
 
   info_prepare(&argv, &debar, &dir, 1);
 
-  parsedb(CONTROLFILE, pdb_recordavailable | pdb_rejectstatus | pdb_ignorefiles,
-          &pkg);
+  m_asprintf(&controlfile, "%s/%s", dir, CONTROLFILE);
+  parsedb(controlfile,
+          pdb_recordavailable | pdb_rejectstatus | pdb_ignorefiles, &pkg);
   pkg_format_show(fmt, pkg, &pkg->available);
+  free(controlfile);
 
   return 0;
 }
@@ -298,7 +313,7 @@
   if (*argv) {
     info_field(debar, dir, argv, argv[1] != NULL);
   } else {
-    static const char *const controlonly[] = { "control", NULL };
+    static const char *const controlonly[] = { CONTROLFILE, NULL };
     info_spew(debar, dir, controlonly);
   }
 
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-deb/main.c /home/vorlon/devel/multiarch/dpkg-debian/dpkg-deb/main.c
--- dpkg/dpkg-deb/main.c	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-deb/main.c	2012-06-07 10:11:09.426073000 -0700
@@ -42,7 +42,7 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/compress.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-deb.h"
 
@@ -79,6 +79,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"));
 
@@ -96,6 +98,7 @@
   printf(_(
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -125,12 +128,12 @@
   exit(0);
 }
 
-const char thisname[]= BACKEND;
-const char printforhelp[]=
+static const char printforhelp[] =
   N_("Type dpkg-deb --help for help about manipulating *.deb files;\n"
      "Type dpkg --help for help about installing and deinstalling packages.");
 
 int debugflag=0, nocheckflag=0, oldformatflag=BUILDOLDPKGFORMAT;
+int opt_verbose = 0;
 struct compressor *compressor = &compressor_gzip;
 int compress_level = -1;
 
@@ -166,12 +169,14 @@
   ACTION("field",         'f', 0, do_field),
   ACTION("extract",       'x', 0, do_extract),
   ACTION("vextract",      'X', 0, do_vextract),
+  ACTION("raw-extract",   'R', 0, do_raw_extract),
   ACTION("fsys-tarfile",  0,   0, do_fsystarfile),
   ACTION("show",          'W', 0, do_showinfo),
 
   { "new",           0,   0, &oldformatflag, NULL,         NULL,          0 },
   { "old",           0,   0, &oldformatflag, NULL,         NULL,          1 },
   { "debug",         'D', 0, &debugflag,     NULL,         NULL,          1 },
+  { "verbose",       'v', 0, &opt_verbose,   NULL,         NULL,          1 },
   { "nocheck",       0,   0, &nocheckflag,   NULL,         NULL,          1 },
   { "compression",   'z', 1, NULL,           NULL,         set_compress_level },
   { "compress_type", 'Z', 1, NULL,           NULL,         setcompresstype  },
@@ -189,8 +194,9 @@
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
 
+  dpkg_set_progname(BACKEND);
   standard_startup();
-  myopt(&argv, cmdinfos);
+  myopt(&argv, cmdinfos, printforhelp);
 
   if (!cipaction) badusage(_("need an action option"));
 
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-deb/Makefile.in /home/vorlon/devel/multiarch/dpkg-debian/dpkg-deb/Makefile.in
--- dpkg/dpkg-deb/Makefile.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-deb/Makefile.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,560 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = dpkg-deb$(EXEEXT)
+subdir = dpkg-deb
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
+	$(top_srcdir)/m4/dpkg-build.m4 \
+	$(top_srcdir)/m4/dpkg-compiler.m4 \
+	$(top_srcdir)/m4/dpkg-coverage.m4 \
+	$(top_srcdir)/m4/dpkg-funcs.m4 $(top_srcdir)/m4/dpkg-libs.m4 \
+	$(top_srcdir)/m4/dpkg-linker.m4 $(top_srcdir)/m4/dpkg-progs.m4 \
+	$(top_srcdir)/m4/dpkg-types.m4 \
+	$(top_srcdir)/m4/dpkg-unicode.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_dpkg_deb_OBJECTS = build.$(OBJEXT) extract.$(OBJEXT) info.$(OBJEXT) \
+	main.$(OBJEXT)
+dpkg_deb_OBJECTS = $(am_dpkg_deb_OBJECTS)
+am__DEPENDENCIES_1 =
+dpkg_deb_DEPENDENCIES = ../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = 
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(dpkg_deb_SOURCES)
+DIST_SOURCES = $(dpkg_deb_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BZ2_LIBS = @BZ2_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCOV = @GCOV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LCOV = @LCOV@
+LCOV_GENHTML = @LCOV_GENHTML@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_COVER = @PERL_COVER@
+PERL_COVERAGE = @PERL_COVERAGE@
+PERL_LIBDIR = @PERL_LIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PO4A = @PO4A@
+POD2MAN = @POD2MAN@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_PO4A = @USE_PO4A@
+USE_UNICODE = @USE_UNICODE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+admindir = @admindir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-idirafter $(top_srcdir)/lib/compat \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/lib
+
+dpkg_deb_SOURCES = \
+	dpkg-deb.h \
+	build.c \
+	extract.c \
+	info.c \
+	main.c
+
+dpkg_deb_LDADD = \
+	../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a \
+	$(LIBINTL) \
+	$(ZLIB_LIBS) \
+	$(BZ2_LIBS)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dpkg-deb/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign dpkg-deb/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+dpkg-deb$(EXEEXT): $(dpkg_deb_OBJECTS) $(dpkg_deb_DEPENDENCIES) 
+	@rm -f dpkg-deb$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(dpkg_deb_OBJECTS) $(dpkg_deb_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/build.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extract.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-split/dpkg-split.h /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/dpkg-split.h
--- dpkg/dpkg-split/dpkg-split.h	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/dpkg-split.h	2012-06-07 10:11:09.426073000 -0700
@@ -73,7 +73,7 @@
 
 #define SPLITVERSION       "2.1"
 
-#define PARTSDIR          "parts/"
+#define PARTSDIR          "parts"
 
 #define PARTMAGIC         "debian-split"
 #define HEADERALLOWANCE    1024
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-split/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/.gitignore
--- dpkg/dpkg-split/.gitignore	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-dpkg-split
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-split/info.c /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/info.c
--- dpkg/dpkg-split/info.c	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/info.c	2012-06-07 10:11:09.426073000 -0700
@@ -37,7 +37,7 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/ar.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-split.h"
 
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-split/join.c /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/join.c
--- dpkg/dpkg-split/join.c	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/join.c	2012-06-07 10:11:09.426073000 -0700
@@ -33,7 +33,7 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/buffer.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-split.h"
 
@@ -55,7 +55,7 @@
     fd_in = open(pi->filename, O_RDONLY);
     if (fd_in < 0)
       ohshite(_("unable to (re)open input part file `%.250s'"), pi->filename);
-    fd_null_copy(fd_in, pi->headerlen, _("skipping split package header"));
+    fd_skip(fd_in, pi->headerlen, _("skipping split package header"));
     fd_fd_copy(fd_in, fd_out, pi->thispartlen, _("split package part"));
     close(fd_in);
 
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-split/main.c /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/main.c
--- dpkg/dpkg-split/main.c	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/main.c	2012-06-07 10:11:09.426073000 -0700
@@ -37,7 +37,7 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-split.h"
 
@@ -100,8 +100,7 @@
   exit(0);
 }
 
-const char thisname[]= SPLITTER;
-const char printforhelp[]= N_("Type dpkg-split --help for help.");
+static const char printforhelp[] = N_("Type dpkg-split --help for help.");
 
 struct partqueue *queue= NULL;
 
@@ -152,26 +151,17 @@
 
 int main(int argc, const char *const *argv) {
   int ret;
-  int l;
-  char *p;
 
   setlocale(LC_ALL, "");
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
 
+  dpkg_set_progname(SPLITTER);
   standard_startup();
-  myopt(&argv, cmdinfos);
+  myopt(&argv, cmdinfos, printforhelp);
 
   if (!cipaction) badusage(_("need an action option"));
 
-  l = strlen(opt_depotdir);
-  if (l && opt_depotdir[l - 1] != '/') {
-    p= nfmalloc(l+2);
-    strcpy(p, opt_depotdir);
-    strcpy(p+l,"/");
-    opt_depotdir = p;
-  }
-
   setvbuf(stdout,NULL,_IONBF,0);
 
   ret = cipaction->action(argv);
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-split/Makefile.in /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/Makefile.in
--- dpkg/dpkg-split/Makefile.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/Makefile.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,563 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = dpkg-split$(EXEEXT)
+subdir = dpkg-split
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
+	$(top_srcdir)/m4/dpkg-build.m4 \
+	$(top_srcdir)/m4/dpkg-compiler.m4 \
+	$(top_srcdir)/m4/dpkg-coverage.m4 \
+	$(top_srcdir)/m4/dpkg-funcs.m4 $(top_srcdir)/m4/dpkg-libs.m4 \
+	$(top_srcdir)/m4/dpkg-linker.m4 $(top_srcdir)/m4/dpkg-progs.m4 \
+	$(top_srcdir)/m4/dpkg-types.m4 \
+	$(top_srcdir)/m4/dpkg-unicode.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_dpkg_split_OBJECTS = info.$(OBJEXT) join.$(OBJEXT) main.$(OBJEXT) \
+	queue.$(OBJEXT) split.$(OBJEXT)
+dpkg_split_OBJECTS = $(am_dpkg_split_OBJECTS)
+am__DEPENDENCIES_1 =
+dpkg_split_DEPENDENCIES = ../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = 
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(dpkg_split_SOURCES)
+DIST_SOURCES = $(dpkg_split_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BZ2_LIBS = @BZ2_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCOV = @GCOV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LCOV = @LCOV@
+LCOV_GENHTML = @LCOV_GENHTML@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_COVER = @PERL_COVER@
+PERL_COVERAGE = @PERL_COVERAGE@
+PERL_LIBDIR = @PERL_LIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PO4A = @PO4A@
+POD2MAN = @POD2MAN@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_PO4A = @USE_PO4A@
+USE_UNICODE = @USE_UNICODE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+admindir = @admindir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DADMINDIR=\"$(admindir)\" \
+	-idirafter $(top_srcdir)/lib/compat \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/lib
+
+dpkg_split_SOURCES = \
+	dpkg-split.h \
+	info.c \
+	join.c \
+	main.c \
+	queue.c \
+	split.c
+
+dpkg_split_LDADD = \
+	../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a \
+	$(LIBINTL)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dpkg-split/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign dpkg-split/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+dpkg-split$(EXEEXT): $(dpkg_split_OBJECTS) $(dpkg_split_DEPENDENCIES) 
+	@rm -f dpkg-split$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(dpkg_split_OBJECTS) $(dpkg_split_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/queue.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/split.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS
+
+
+install-data-local:
+	$(mkdir_p) $(DESTDIR)$(admindir)/parts
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-split/queue.c /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/queue.c
--- dpkg/dpkg-split/queue.c	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/queue.c	2012-06-07 10:11:09.426073000 -0700
@@ -39,7 +39,7 @@
 #include <dpkg/dpkg-db.h>
 #include <dpkg/dir.h>
 #include <dpkg/buffer.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-split.h"
 
@@ -98,9 +98,8 @@
     pq->info.arch = NULL;
     pq->info.orglength= pq->info.thispartoffset= pq->info.thispartlen= 0;
     pq->info.headerlen= 0;
-    p = nfmalloc(strlen(opt_depotdir) + strlen(de->d_name) + 1);
-    strcpy(p, opt_depotdir);
-    strcat(p,de->d_name);
+    p = nfmalloc(strlen(opt_depotdir) + 1 + strlen(de->d_name) + 1);
+    sprintf(p, "%s/%s", opt_depotdir, de->d_name);
     pq->info.filename= p;
     if (!decompose_filename(de->d_name,pq)) {
       pq->info.md5sum= NULL;
@@ -171,8 +170,8 @@
     int ap;
     char *p, *q;
 
-    m_asprintf(&p, "%st.%lx", opt_depotdir, (long)getpid());
-    m_asprintf(&q, "%s%s.%jx.%x.%x", opt_depotdir, refi->md5sum,
+    m_asprintf(&p, "%s/t.%lx", opt_depotdir, (long)getpid());
+    m_asprintf(&q, "%s/%s.%jx.%x.%x", opt_depotdir, refi->md5sum,
                (intmax_t)refi->maxpartlen, refi->thispartn, refi->maxpartn);
 
     fd_src = open(partfile, O_RDONLY);
diff -uNr --exclude .git --exclude .bzr dpkg/dpkg-split/split.c /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/split.c
--- dpkg/dpkg-split/split.c	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dpkg-split/split.c	2012-06-07 10:11:09.426073000 -0700
@@ -3,7 +3,7 @@
  * split.c - splitting archives
  *
  * Copyright © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
- * Copyright © 2010 Guillem Jover <guillem@debian.org>
+ * Copyright © 2008-2011 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,10 +40,11 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
+#include <dpkg/path.h>
 #include <dpkg/subproc.h>
 #include <dpkg/buffer.h>
 #include <dpkg/ar.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-split.h"
 
@@ -160,10 +161,7 @@
 		prefixdir = m_strdup(dirname(t));
 		free(t);
 
-		t = m_strdup(prefix);
-		msdos_prefix = m_strdup(basename(t));
-		free(t);
-
+		msdos_prefix = m_strdup(path_basename(prefix));
 		prefix = clean_msdos_filename(msdos_prefix);
 	}
 
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/bindings.h /home/vorlon/devel/multiarch/dpkg-debian/dselect/bindings.h
--- dpkg/dselect/bindings.h	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/bindings.h	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /* -*- c++ -*-
- * dselect - selection of Debian packages
+ * dselect - Debian package maintenance user interface
  * bindings.h - keybindings class header file
  *
  * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/dselect-curses.h /home/vorlon/devel/multiarch/dpkg-debian/dselect/dselect-curses.h
--- dpkg/dselect/dselect-curses.h	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/dselect-curses.h	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /* -*- c++ -*-
- * dselect - selection of Debian packages
+ * dselect - Debian package maintenance user interface
  * dselect-curses.h - curses header wrapper
  *
  * Copyright © 2009 Guillem Jover <guillem@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/dselect.h /home/vorlon/devel/multiarch/dpkg-debian/dselect/dselect.h
--- dpkg/dselect/dselect.h	2011-03-24 16:35:56.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/dselect.h	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /* -*- c++ -*-
- * dselect - selection of Debian packages
+ * dselect - Debian package maintenance user interface
  * dselect.h - external definitions for this program
  *
  * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/dselect/.gitignore
--- dpkg/dselect/.gitignore	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-curkeys.h
-dselect
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/main.cc /home/vorlon/devel/multiarch/dpkg-debian/dselect/main.cc
--- dpkg/dselect/main.cc	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/main.cc	2012-06-07 10:11:09.426073000 -0700
@@ -51,14 +51,13 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dselect.h"
 #include "bindings.h"
 #include "pkglist.h"
 
-const char thisname[]= DSELECT;
-const char printforhelp[]= N_("Type dselect --help for help.");
+static const char printforhelp[] = N_("Type dselect --help for help.");
 
 modstatdb_rw readwrite;
 int expertmode= 0;
@@ -514,10 +513,12 @@
   bindtextdomain(DSELECT, LOCALEDIR);
   textdomain(DSELECT);
 
+  dpkg_set_progname(DSELECT);
+
   push_error_context_func(dselect_catch_fatal_error, print_fatal_error, 0);
 
   loadcfgfile(DSELECT, cmdinfos);
-  myopt(&argv,cmdinfos);
+  myopt(&argv, cmdinfos, printforhelp);
 
   admindir = dpkg_db_set_dir(admindir);
 
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/Makefile.in /home/vorlon/devel/multiarch/dpkg-debian/dselect/Makefile.in
--- dpkg/dselect/Makefile.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/Makefile.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,780 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = dselect$(EXEEXT)
+subdir = dselect
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
+	$(top_srcdir)/m4/dpkg-build.m4 \
+	$(top_srcdir)/m4/dpkg-compiler.m4 \
+	$(top_srcdir)/m4/dpkg-coverage.m4 \
+	$(top_srcdir)/m4/dpkg-funcs.m4 $(top_srcdir)/m4/dpkg-libs.m4 \
+	$(top_srcdir)/m4/dpkg-linker.m4 $(top_srcdir)/m4/dpkg-progs.m4 \
+	$(top_srcdir)/m4/dpkg-types.m4 \
+	$(top_srcdir)/m4/dpkg-unicode.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_dselect_OBJECTS = basecmds.$(OBJEXT) baselist.$(OBJEXT) \
+	basetop.$(OBJEXT) bindings.$(OBJEXT) curkeys.$(OBJEXT) \
+	helpmsgs.$(OBJEXT) main.$(OBJEXT) methkeys.$(OBJEXT) \
+	methlist.$(OBJEXT) method.$(OBJEXT) methparse.$(OBJEXT) \
+	pkgcmds.$(OBJEXT) pkgdepcon.$(OBJEXT) pkgdisplay.$(OBJEXT) \
+	pkginfo.$(OBJEXT) pkgkeys.$(OBJEXT) pkglist.$(OBJEXT) \
+	pkgsublist.$(OBJEXT) pkgtop.$(OBJEXT)
+dselect_OBJECTS = $(am_dselect_OBJECTS)
+am__DEPENDENCIES_1 =
+dselect_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = 
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(dselect_SOURCES)
+DIST_SOURCES = $(dselect_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BZ2_LIBS = @BZ2_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCOV = @GCOV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LCOV = @LCOV@
+LCOV_GENHTML = @LCOV_GENHTML@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_COVER = @PERL_COVER@
+PERL_COVERAGE = @PERL_COVERAGE@
+PERL_LIBDIR = @PERL_LIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PO4A = @PO4A@
+POD2MAN = @POD2MAN@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_PO4A = @USE_PO4A@
+USE_UNICODE = @USE_UNICODE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+admindir = @admindir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = methods po
+pkgconfdir = $(sysconfdir)/@PACKAGE@
+AM_CPPFLAGS = \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DADMINDIR=\"$(admindir)\" -DLIBDIR=\"$(pkglibdir)\" \
+	-DLOCALLIBDIR=\"/usr/local/lib/dpkg\" \
+	-idirafter $(top_srcdir)/lib/compat \
+	-iquote $(builddir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/lib
+
+dselect_SOURCES = \
+	dselect.h \
+	dselect-curses.h \
+	basecmds.cc \
+	baselist.cc \
+	basetop.cc \
+	bindings.cc bindings.h \
+	curkeys.cc \
+	helpmsgs.cc helpmsgs.h \
+	main.cc \
+	methkeys.cc \
+	methlist.cc \
+	method.cc method.h \
+	methparse.cc \
+	pkgcmds.cc \
+	pkgdepcon.cc \
+	pkgdisplay.cc \
+	pkginfo.cc \
+	pkgkeys.cc \
+	pkglist.cc pkglist.h \
+	pkgsublist.cc \
+	pkgtop.cc
+
+dselect_LDADD = \
+	$(CURSES_LIBS) \
+	../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a \
+	$(LIBINTL)
+
+EXTRA_DIST = keyoverride mkcurkeys.pl
+CLEANFILES = curkeys.h
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .cc .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dselect/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign dselect/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+dselect$(EXEEXT): $(dselect_OBJECTS) $(dselect_DEPENDENCIES) 
+	@rm -f dselect$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(dselect_OBJECTS) $(dselect_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basecmds.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/baselist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basetop.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bindings.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curkeys.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helpmsgs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/methkeys.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/methlist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/method.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/methparse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgcmds.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgdepcon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgdisplay.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkginfo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgkeys.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkglist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgsublist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgtop.Po@am__quote@
+
+.cc.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(PROGRAMS)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-data-local
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-binPROGRAMS
+
+
+curkeys.$(OBJEXT): curkeys.h
+curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl
+	$(AM_V_GEN) cursesfile=`echo '#include "dselect-curses.h"' | \
+		$(CPP) -I$(top_builddir) -I $(srcdir) - | \
+		grep 'curses.h' | head -n 1 | \
+		sed -e 's/^[^"]*"//; s/".*$$//'`; \
+	if [ "$$cursesfile" = "" ]; then \
+		echo "can't find curses file"; exit 1; \
+	fi; \
+	perl $(srcdir)/mkcurkeys.pl $< $$cursesfile >$@
+
+install-data-local:
+	$(mkdir_p) $(DESTDIR)$(pkgconfdir)/dselect.cfg.d
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/methods/ftp/install /home/vorlon/devel/multiarch/dpkg-debian/dselect/methods/ftp/install
--- dpkg/dselect/methods/ftp/install	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/methods/ftp/install	2012-06-07 10:11:09.426073000 -0700
@@ -431,7 +431,7 @@
 		last DOWNLOAD_TRY;
 	      }
 	  } elsif ($@) {
-             print "An error occured ($@) : stopping download\n";
+             print "An error occurred ($@) : stopping download\n";
 	  }
 	  last DOWNLOAD_TRY;
       }
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/methods/Makefile.in /home/vorlon/devel/multiarch/dpkg-debian/dselect/methods/Makefile.in
--- dpkg/dselect/methods/Makefile.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/methods/Makefile.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,560 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = dselect/methods
+DIST_COMMON = $(nobase_dist_methods_DATA) \
+	$(nobase_dist_methods_SCRIPTS) $(nobase_dist_perllib_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
+	$(top_srcdir)/m4/dpkg-build.m4 \
+	$(top_srcdir)/m4/dpkg-compiler.m4 \
+	$(top_srcdir)/m4/dpkg-coverage.m4 \
+	$(top_srcdir)/m4/dpkg-funcs.m4 $(top_srcdir)/m4/dpkg-libs.m4 \
+	$(top_srcdir)/m4/dpkg-linker.m4 $(top_srcdir)/m4/dpkg-progs.m4 \
+	$(top_srcdir)/m4/dpkg-types.m4 \
+	$(top_srcdir)/m4/dpkg-unicode.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(methodsdir)" "$(DESTDIR)$(methodsdir)" \
+	"$(DESTDIR)$(perllibdir)"
+SCRIPTS = $(nobase_dist_methods_SCRIPTS)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+DATA = $(nobase_dist_methods_DATA) $(nobase_dist_perllib_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BZ2_LIBS = @BZ2_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCOV = @GCOV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LCOV = @LCOV@
+LCOV_GENHTML = @LCOV_GENHTML@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_COVER = @PERL_COVER@
+PERL_COVERAGE = @PERL_COVERAGE@
+PERL_LIBDIR = @PERL_LIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PO4A = @PO4A@
+POD2MAN = @POD2MAN@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_PO4A = @USE_PO4A@
+USE_UNICODE = @USE_UNICODE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+admindir = @admindir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+methodsdir = $(pkglibdir)/methods
+nobase_dist_methods_DATA = \
+	disk/names \
+	disk/desc.cdrom \
+	disk/desc.nfs \
+	disk/desc.harddisk \
+	disk/desc.mounted \
+	floppy/names \
+	floppy/desc.floppy \
+	ftp/names \
+	ftp/desc.ftp \
+	ftp/README.mirrors.txt \
+	multicd/names \
+	multicd/desc.multi_cd \
+	multicd/desc.multi_mount \
+	multicd/desc.multi_nfs
+
+nobase_dist_methods_SCRIPTS = \
+	disk/setup \
+	disk/update \
+	disk/install \
+	floppy/setup \
+	floppy/update \
+	floppy/install \
+	ftp/setup \
+	ftp/update \
+	ftp/install \
+	multicd/setup \
+	multicd/update \
+	multicd/install
+
+perllibdir = $(PERL_LIBDIR)
+nobase_dist_perllib_DATA = Debian/Dselect/Ftp.pm
+EXTRA_DIST = multicd/README.multicd
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dselect/methods/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign dselect/methods/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-nobase_dist_methodsSCRIPTS: $(nobase_dist_methods_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(methodsdir)" || $(MKDIR_P) "$(DESTDIR)$(methodsdir)"
+	@list='$(nobase_dist_methods_SCRIPTS)'; test -n "$(methodsdir)" || list=; \
+	$(am__nobase_strip_setup); \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e "s|$$srcdirstrip/||" -e 'h;s|[^/]*$$||; s|^$$|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	  case $$type in \
+	  d) echo " $(MKDIR_P) '$(DESTDIR)$(methodsdir)/$$dir'"; \
+	     $(MKDIR_P) "$(DESTDIR)$(methodsdir)/$$dir" || exit $$?;; \
+	  f) \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(methodsdir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(methodsdir)$$dir" || exit $$?; \
+	     } \
+	  ;; esac \
+	; done
+
+uninstall-nobase_dist_methodsSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_dist_methods_SCRIPTS)'; test -n "$(methodsdir)" || exit 0; \
+	$(am__nobase_strip_setup); \
+	files=`$(am__nobase_strip) \
+	       -e 'h;s,.*/,,;$(transform);x;s|[^/]*$$||;G;s,\n,,'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(methodsdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(methodsdir)" && rm -f $$files
+install-nobase_dist_methodsDATA: $(nobase_dist_methods_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(methodsdir)" || $(MKDIR_P) "$(DESTDIR)$(methodsdir)"
+	@list='$(nobase_dist_methods_DATA)'; test -n "$(methodsdir)" || list=; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo "$(MKDIR_P) '$(DESTDIR)$(methodsdir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(methodsdir)/$$dir"; }; \
+	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(methodsdir)/$$dir'"; \
+	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(methodsdir)/$$dir" || exit $$?; }; \
+	done
+
+uninstall-nobase_dist_methodsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_dist_methods_DATA)'; test -n "$(methodsdir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(methodsdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(methodsdir)" && rm -f $$files
+install-nobase_dist_perllibDATA: $(nobase_dist_perllib_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(perllibdir)" || $(MKDIR_P) "$(DESTDIR)$(perllibdir)"
+	@list='$(nobase_dist_perllib_DATA)'; test -n "$(perllibdir)" || list=; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo "$(MKDIR_P) '$(DESTDIR)$(perllibdir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(perllibdir)/$$dir"; }; \
+	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(perllibdir)/$$dir'"; \
+	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(perllibdir)/$$dir" || exit $$?; }; \
+	done
+
+uninstall-nobase_dist_perllibDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_dist_perllib_DATA)'; test -n "$(perllibdir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(perllibdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(perllibdir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS) $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(methodsdir)" "$(DESTDIR)$(methodsdir)" "$(DESTDIR)$(perllibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local install-nobase_dist_methodsDATA \
+	install-nobase_dist_methodsSCRIPTS \
+	install-nobase_dist_perllibDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-nobase_dist_methodsDATA \
+	uninstall-nobase_dist_methodsSCRIPTS \
+	uninstall-nobase_dist_perllibDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-nobase_dist_methodsDATA \
+	install-nobase_dist_methodsSCRIPTS \
+	install-nobase_dist_perllibDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-nobase_dist_methodsDATA \
+	uninstall-nobase_dist_methodsSCRIPTS \
+	uninstall-nobase_dist_perllibDATA
+
+
+install-data-local:
+	$(mkdir_p) $(DESTDIR)$(admindir)/methods/mnt
+	$(mkdir_p) $(DESTDIR)$(admindir)/methods/disk
+	$(mkdir_p) $(DESTDIR)$(admindir)/methods/floppy
+	$(mkdir_p) $(DESTDIR)$(admindir)/methods/ftp
+	$(mkdir_p) $(DESTDIR)$(admindir)/methods/multicd
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/pkgcmds.cc /home/vorlon/devel/multiarch/dpkg-debian/dselect/pkgcmds.cc
--- dpkg/dselect/pkgcmds.cc	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/pkgcmds.cc	2012-06-07 10:11:09.426073000 -0700
@@ -60,13 +60,13 @@
 }
 
 void packagelist::affectedrange(int *startp, int *endp) {
-  if (table[cursorline]->pkg->set->name) {
+  if (table[cursorline]->pkg->name) {
     *startp= cursorline;
     *endp= cursorline+1;
     return;
   }
   int index = cursorline;
-  while (index < nitems && !table[index]->pkg->set->name)
+  while (index < nitems && !table[index]->pkg->name)
     index++;
   if (index >= nitems) {
     *startp= *endp= cursorline;
@@ -113,8 +113,7 @@
 
     affectedrange(&top,&bot);
     for (index= top; index < bot; index++) {
-      if (!table[index]->pkg->set->name)
-        continue;
+      if (!table[index]->pkg->name) continue;
       nw= reallywant(nwarg,table[index]);
       if (table[index]->selected == nw ||
           (table[index]->selected == pkginfo::want_purge &&
@@ -145,7 +144,7 @@
 int would_like_to_install(pkginfo::pkgwant wantvalue, pkginfo *pkg) {
   /* Returns: 1 for yes, 0 for no, -1 for if they want to preserve an error condition. */
   debug(dbg_general, "would_like_to_install(%d, %s) status %d",
-        wantvalue, pkg_describe(pkg, pdo_foreign), pkg->status);
+        wantvalue, pkg->name, pkg->status);
 
   if (wantvalue == pkginfo::want_install) return 1;
   if (wantvalue != pkginfo::want_hold) return 0;
@@ -156,10 +155,7 @@
 }
 
 const char *packagelist::itemname(int index) {
-  /* Ok, because output of itemname is never stored */
-  if (table[index]->pkg->set->name)
-    return pkg_describe(table[index]->pkg, pdo_foreign);
-  return table[index]->pkg->set->name;
+  return table[index]->pkg->name;
 }
 
 void packagelist::kd_swapstatorder() {
@@ -185,15 +181,14 @@
 }
 
 void packagelist::resortredisplay() {
-  const char *oldname = table[cursorline]->pkg->set->name;
+  const char *oldname= table[cursorline]->pkg->name;
   sortmakeheads();
   int newcursor;
   newcursor= 0;
   if (oldname) {
     int index;
     for (index=0; index<nitems; index++) {
-      if (table[index]->pkg->set->name &&
-          !strcasecmp(oldname, table[index]->pkg->set->name)) {
+      if (table[index]->pkg->name && !strcasecmp(oldname,table[index]->pkg->name)) {
         newcursor= index;
         break;
       }
@@ -243,7 +238,7 @@
 void packagelist::kd_revert_abort() {
   int index;
   for (index=0; index<nitems; index++) {
-    if (table[index]->pkg->set->name)
+    if (table[index]->pkg->name)
       table[index]->selected= table[index]->original;
     ldrawnstart= ldrawnend= -1;
   }
@@ -253,7 +248,7 @@
 void packagelist::kd_revertdirect() {
   int index;
   for (index=0; index<nitems; index++) {
-    if (table[index]->pkg->set->name)
+    if (table[index]->pkg->name)
       table[index]->selected= table[index]->direct;
     ldrawnstart= ldrawnend= -1;
   }
@@ -263,7 +258,7 @@
 void packagelist::kd_revertsuggest() {
   int index;
   for (index=0; index<nitems; index++) {
-    if (table[index]->pkg->set->name)
+    if (table[index]->pkg->name)
       table[index]->selected= table[index]->suggested;
     ldrawnstart= ldrawnend= -1;
   }
@@ -276,7 +271,7 @@
   int i;
 
   for (i = 0; i < nitems; i++) {
-    if (table[i]->pkg->set->name)
+    if (table[i]->pkg->name)
       table[i]->selected = reallywant(pkginfo::want_sentinel, table[i]);
     ldrawnstart = ldrawnend = -1;
   }
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/pkgdepcon.cc /home/vorlon/devel/multiarch/dpkg-debian/dselect/pkgdepcon.cc
--- dpkg/dselect/pkgdepcon.cc	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/pkgdepcon.cc	2012-06-07 10:11:09.426073000 -0700
@@ -49,14 +49,10 @@
 pkgbin *
 packagelist::find_pkgbin(pkginfo *pkg)
 {
-  pkgbin *r = &pkg->installed;
-  enum pkg_describe_opts pdo = pdo_foreign;
-  if (useavailable(pkg)) {
-    r = &pkg->available;
-    pdo = (enum pkg_describe_opts)(pdo | pdo_avail);
-  }
+  pkgbin *r;
+  r= useavailable(pkg) ? &pkg->available : &pkg->installed;
   debug(dbg_general, "packagelist[%p]::find_pkgbin(%s) useavailable=%d",
-        this, pkg_describe(pkg, pdo), useavailable(pkg));
+        this, pkg->name, useavailable(pkg));
 
   return r;
 }
@@ -64,12 +60,12 @@
 int packagelist::checkdependers(pkginfo *pkg, int changemade) {
   struct deppossi *possi;
 
-  for (possi = pkg->set->depended.available; possi; possi = possi->rev_next) {
+  for (possi = pkg->available.depended; possi; possi = possi->rev_next) {
     if (!useavailable(possi->up->up))
       continue;
     changemade = max(changemade, resolvedepcon(possi->up));
   }
-  for (possi = pkg->set->depended.installed; possi; possi = possi->rev_next) {
+  for (possi = pkg->installed.depended; possi; possi = possi->rev_next) {
     if (useavailable(possi->up->up))
       continue;
     changemade = max(changemade, resolvedepcon(possi->up));
@@ -89,11 +85,9 @@
     changemade= 0;
     int index;
     for (index=0; index<nitems; index++) {
-      if (!table[index]->pkg->set->name)
-        continue;
+      if (!table[index]->pkg->name) continue;
       debug(dbg_depcon, "packagelist[%p]::resolvesuggest() loop[%i] %s / %d",
-            this, index, pkg_describe(table[index]->pkg, pdo_foreign),
-            changemade);
+            this, index, table[index]->pkg->name, changemade);
       dependency *depends;
       for (depends = find_pkgbin(table[index]->pkg)->depends;
            depends;
@@ -105,11 +99,10 @@
            depends;
            depends= depends->next) {
         if (depends->type != dep_provides) continue;
-        changemade = checkdependers(&depends->list->ed->pkg, changemade);
+        changemade= checkdependers(depends->list->ed,changemade);
       }
       debug(dbg_depcon, "packagelist[%p]::resolvesuggest() loop[%i] %s / -> %d",
-            this, index, pkg_describe(table[index]->pkg, pdo_foreign),
-            changemade);
+            this, index, table[index]->pkg->name, changemade);
     }
     if (!changemade) break;
     maxchangemade = max(maxchangemade, changemade);
@@ -124,9 +117,8 @@
   if (!trythis->clientdata) return 0;
 
   debug(dbg_depcon, "update_best_to_change(best=%s{%d}, test=%s{%d});",
-        best ? pkg_describe(best->pkg, pdo_foreign) : "",
-        best ? (int)best->spriority : -1,
-        trythis->set->name, trythis->clientdata->spriority);
+        best ? best->pkg->name : "", best ? (int)best->spriority : -1,
+        trythis->name, trythis->clientdata->spriority);
 
   // If the problem is caused by us deselecting one of these packages
   // we should not try to select another one instead.
@@ -177,8 +169,7 @@
 
   debug(dbg_depcon,
         "packagelist[%p]::deselect_one_of(): er %s{%d} ed %s{%d} [%p]",
-        this, pkg_describe(er->pkg, pdo_foreign), er->spriority,
-        pkg_describe(ed->pkg, pdo_foreign), ed->spriority, dep);
+        this, er->pkg->name, er->spriority, ed->pkg->name, ed->spriority, dep);
 
   perpackagestate *best;
 
@@ -197,7 +188,7 @@
   else best= ed;                                      // ... failing that, the second
 
   debug(dbg_depcon, "packagelist[%p]::deselect_one_of(): best %s{%d}",
-        this, pkg_describe(best->pkg, pdo_foreign), best->spriority);
+        this, best->pkg->name, best->spriority);
 
   if (best->spriority >= sp_deselecting) return 0;
   best->suggested=
@@ -224,8 +215,7 @@
 
     debug(dbg_depcon,
           "packagelist[%p]::resolvedepcon([%p] %s --%s-->%s); (ing)->want=%s",
-          this, depends, pkg_describe(depends->up, pdo_foreign),
-          relatestrings[depends->type],
+          this, depends, depends->up->name, relatestrings[depends->type],
           pkg_names.string(), depends->up->clientdata ?
           wantstrings[depends->up->clientdata->suggested] : "(no clientdata)");
   }
@@ -271,7 +261,7 @@
     if (fixbyupgrade) {
       debug(dbg_depcon,
             "packagelist[%p]::resolvedepcon([%p]): fixbyupgrade %s",
-            this, depends, pkg_describe(fixbyupgrade->pkg, pdo_foreign));
+            this, depends, fixbyupgrade->pkg->name);
       best= fixbyupgrade;
     } else {
       best= 0;
@@ -279,11 +269,9 @@
            possi;
            possi= possi->next) {
         foundany= 0;
-        if (possi->ed->pkg.clientdata)
-          foundany = 1;
-        if (dep_update_best_to_change_stop(best, &possi->ed->pkg))
-          goto mustdeselect;
-        for (provider = possi->ed->depended.available;
+        if (possi->ed->clientdata) foundany= 1;
+        if (dep_update_best_to_change_stop(best, possi->ed)) goto mustdeselect;
+        for (provider = possi->ed->available.depended;
              provider;
              provider = provider->rev_next) {
           if (provider->up->type != dep_provides) continue;
@@ -301,7 +289,7 @@
     }
     debug(dbg_depcon,
           "packagelist[%p]::resolvedepcon([%p]): select best=%s{%d}",
-          this, depends, pkg_describe(best->pkg, pdo_foreign), best->spriority);
+          this, depends, best->pkg->name, best->spriority);
     if (best->spriority >= sp_selecting) return r;
     /* Always select depends. Only select recommends if we got here because
      * of a manually-initiated install request. */
@@ -315,7 +303,7 @@
     best= depends->up->clientdata;
     debug(dbg_depcon,
           "packagelist[%p]::resolvedepcon([%p]): mustdeselect best=%s{%d}",
-          this, depends, pkg_describe(best->pkg, pdo_foreign), best->spriority);
+          this, depends, best->pkg->name, best->spriority);
 
     if (best->spriority >= sp_deselecting) return r;
     /* Always remove depends, but never remove recommends. */
@@ -345,12 +333,10 @@
           "packagelist[%p]::resolvedepcon([%p]): conflict satisfied - ouch",
           this, depends);
 
-    if (depends->up->set != depends->list->ed) {
-      r = deselect_one_of(depends->up, &depends->list->ed->pkg, depends);
-      if (r)
-        return r;
+    if (depends->up != depends->list->ed) {
+      r= deselect_one_of(depends->up, depends->list->ed, depends);  if (r) return r;
     }
-    for (provider = depends->list->ed->depended.available;
+    for (provider = depends->list->ed->available.depended;
          provider;
          provider = provider->rev_next) {
       if (provider->up->type != dep_provides) continue;
@@ -376,31 +362,31 @@
   int would;
   pkginfo::pkgwant want= pkginfo::want_purge;
 
-  if (possi->ed->pkg.clientdata) {
-    want = possi->ed->pkg.clientdata->selected;
-    would = would_like_to_install(want, &possi->ed->pkg);
+  if (possi->ed->clientdata) {
+    want= possi->ed->clientdata->selected;
+    would= would_like_to_install(want,possi->ed);
   } else {
     would= 0;
   }
 
   if ((possi->up->type == dep_conflicts || possi->up->type == dep_breaks)
-      ? possi->up->up->set != possi->ed && would != 0
+      ? possi->up->up != possi->ed && would != 0
       : would > 0) {
     // If it's to be installed or left installed, then either it's of
     // the right version, and therefore OK, or a version must have
     // been specified, in which case we don't need to look at the rest
     // anyway.
-    if (useavailable(&possi->ed->pkg)) {
+    if (useavailable(possi->ed)) {
       assert(want == pkginfo::want_install);
-      return versionsatisfied(&possi->ed->pkg.available, possi);
+      return versionsatisfied(&possi->ed->available,possi);
     } else {
-      if (versionsatisfied(&possi->ed->pkg.installed, possi))
+      if (versionsatisfied(&possi->ed->installed, possi))
         return true;
       if (want == pkginfo::want_hold && fixbyupgrade && !*fixbyupgrade &&
-          versionsatisfied(&possi->ed->pkg.available, possi) &&
-          versioncompare(&possi->ed->pkg.available.version,
-                         &possi->ed->pkg.installed.version) > 1)
-        *fixbyupgrade = possi->ed->pkg.clientdata;
+          versionsatisfied(&possi->ed->available,possi) &&
+          versioncompare(&possi->ed->available.version,
+                         &possi->ed->installed.version) > 1)
+        *fixbyupgrade= possi->ed->clientdata;
       return false;
     }
   }
@@ -408,7 +394,7 @@
     return false;
   deppossi *provider;
 
-  for (provider = possi->ed->depended.installed;
+  for (provider = possi->ed->installed.depended;
        provider;
        provider = provider->rev_next) {
     if (provider->up->type == dep_provides &&
@@ -418,7 +404,7 @@
                               provider->up->up))
       return true;
   }
-  for (provider = possi->ed->depended.available;
+  for (provider = possi->ed->available.depended;
        provider;
        provider = provider->rev_next) {
     if (provider->up->type != dep_provides ||
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/pkginfo.cc /home/vorlon/devel/multiarch/dpkg-debian/dselect/pkginfo.cc
--- dpkg/dselect/pkginfo.cc	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/pkginfo.cc	2012-06-07 10:11:09.426073000 -0700
@@ -92,7 +92,7 @@
 void packagelist::itd_relations() {
   whatinfovb(_("Interrelationships"));
 
-  if (table[cursorline]->pkg->set->name) {
+  if (table[cursorline]->pkg->name) {
     debug(dbg_general, "packagelist[%p]::idt_relations(); '%s'",
           this, table[cursorline]->relations.string());
     waddstr(infopad,table[cursorline]->relations.string());
@@ -104,7 +104,7 @@
 void packagelist::itd_description() {
   whatinfovb(_("Description"));
 
-  if (table[cursorline]->pkg->set->name) {
+  if (table[cursorline]->pkg->name) {
     const char *m= table[cursorline]->pkg->available.description;
     if (!m || !*m)
       m = table[cursorline]->pkg->installed.description;
@@ -113,7 +113,7 @@
     const char *p= strchr(m,'\n');
     int l= p ? (int)(p-m) : strlen(m);
     wattrset(infopad,info_headattr);
-    waddstr(infopad, pkg_describe(table[cursorline]->pkg, pdo_foreign));
+    waddstr(infopad, table[cursorline]->pkg->name);
     waddstr(infopad," - ");
     waddnstr(infopad,m,l);
     wattrset(infopad,info_attr);
@@ -130,7 +130,7 @@
   whatinfovb(_("Installed control file information"));
 
   werase(infopad);
-  if (!table[cursorline]->pkg->set->name) {
+  if (!table[cursorline]->pkg->name) {
     severalinfoblurb();
   } else {
     varbuf vb;
@@ -146,7 +146,7 @@
   whatinfovb(_("Available control file information"));
 
   werase(infopad);
-  if (!table[cursorline]->pkg->set->name) {
+  if (!table[cursorline]->pkg->name) {
     severalinfoblurb();
   } else {
     varbuf vb;
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/pkglist.cc /home/vorlon/devel/multiarch/dpkg-debian/dselect/pkglist.cc
--- dpkg/dselect/pkglist.cc	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/pkglist.cc	2012-06-07 10:11:09.426073000 -0700
@@ -51,11 +51,9 @@
   }
 
   const char *asection= a->pkg->section;
-  if (!asection && a->pkg->set->name)
-    asection = "";
+  if (!asection && a->pkg->name) asection= "";
   const char *bsection= b->pkg->section;
-  if (!bsection && b->pkg->set->name)
-    bsection = "";
+  if (!bsection && b->pkg->name) bsection= "";
   int c_section=
     !asection || !bsection ?
       (!bsection) - (!asection) :
@@ -66,11 +64,10 @@
     a->pkg->priority - b->pkg->priority;
   if (!c_priority && a->pkg->priority == pkginfo::pri_other)
     c_priority= strcasecmp(a->pkg->otherpriority, b->pkg->otherpriority);
-  /* XXX: Should sort by architecture in case of equality */
   int c_name=
-    a->pkg->set->name && b->pkg->set->name ?
-      strcasecmp(a->pkg->set->name, b->pkg->set->name) :
-    (!b->pkg->set->name) - (!a->pkg->set->name);
+    a->pkg->name && b->pkg->name ?
+      strcasecmp(a->pkg->name, b->pkg->name) :
+    (!b->pkg->name) - (!a->pkg->name);
 
   switch (sortorder) {
   case so_section:
@@ -90,7 +87,7 @@
 void packagelist::discardheadings() {
   int a,b;
   for (a=0, b=0; a<nitems; a++) {
-    if (table[a]->pkg->set->name) {
+    if (table[a]->pkg->name) {
       table[b++]= table[a];
     }
   }
@@ -100,7 +97,7 @@
   head= headings;
   while (head) {
     next= head->uprec;
-    delete head->pkg->set;
+    delete head->pkg;
     delete head;
     head= next;
   }
@@ -126,10 +123,8 @@
         otherpriority ? otherpriority : "<null>",
         section ? section : "<null>");
 
-  struct pkgset *newset = new pkgset;
-  newset->name = NULL;
-  struct pkginfo *newhead = &newset->pkg;
-  newhead->set = newset;
+  struct pkginfo *newhead= new pkginfo;
+  newhead->name= 0;
   newhead->priority= priority;
   newhead->otherpriority= otherpriority;
   newhead->section= section;
@@ -179,7 +174,7 @@
     if (calcssadone) return;
     for (index=0; index < nitems; index++) {
       debug(dbg_general, "packagelist[%p]::ensurestatsortinfos() i=%d pkg=%s",
-            this, index, pkg_describe(table[index]->pkg, pdo_foreign));
+            this, index, table[index]->pkg->name);
       pkg= table[index]->pkg;
       switch (pkg->status) {
       case pkginfo::stat_unpacked:
@@ -229,7 +224,7 @@
     if (calcsssdone) return;
     for (index=0; index < nitems; index++) {
       debug(dbg_general, "packagelist[%p]::ensurestatsortinfos() i=%d pkg=%s",
-            this, index, pkg_describe(table[index]->pkg, pdo_foreign));
+            this, index, table[index]->pkg->name);
       switch (table[index]->pkg->status) {
       case pkginfo::stat_unpacked:
       case pkginfo::stat_halfconfigured:
@@ -286,7 +281,7 @@
   int a;
   for (a=0; a<nrealitems; a++) {
     thispkg= table[a]->pkg;
-    assert(thispkg->set->name);
+    assert(thispkg->name);
     int ssdiff= 0;
     ssavailval ssavail= ssa_none;
     ssstateval ssstate= sss_none;
@@ -316,7 +311,7 @@
     debug(dbg_general,
           "packagelist[%p]::sortmakeheads() pkg=%s  state=%d avail=%d %s  "
           "priority=%d otherpriority=%s %s  section=%s %s",
-          this, pkg_describe(thispkg, pdo_foreign),
+          this, thispkg->name,
           thispkg->clientdata->ssavail, thispkg->clientdata->ssstate,
           ssdiff ? "*diff" : "same",
           thispkg->priority,
@@ -356,7 +351,7 @@
 void packagelist::initialsetup() {
   debug(dbg_general, "packagelist[%p]::initialsetup()", this);
 
-  int allpackages = pkg_db_count_pkg();
+  int allpackages = pkg_db_count();
   datatable= new struct perpackagestate[allpackages];
 
   nallocated= allpackages+150; // will realloc if necessary, so 150 not critical
@@ -387,7 +382,7 @@
   nitems = 0;
 
   iter = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next_pkg(iter))) {
+  while ((pkg = pkg_db_iter_next(iter))) {
     struct perpackagestate *state= &datatable[nitems];
     state->pkg= pkg;
     if (pkg->status == pkginfo::stat_notinstalled &&
@@ -445,7 +440,7 @@
 }
 
 void perpackagestate::free(int recursive) {
-  if (pkg->set->name) {
+  if (pkg->name) {
     if (readwrite) {
       if (uprec) {
         assert(recursive);
@@ -609,7 +604,7 @@
   } else {
     packagelist *sub= new packagelist(bindings,0);
     for (index=0; index < nitems; index++)
-      if (table[index]->pkg->set->name)
+      if (table[index]->pkg->name)
         sub->add(table[index]->pkg);
     repeatedlydisplay(sub,dp_must);
     debug(dbg_general,
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/pkglist.h /home/vorlon/devel/multiarch/dpkg-debian/dselect/pkglist.h
--- dpkg/dselect/pkglist.h	2011-03-01 14:31:03.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/pkglist.h	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /* -*- c++ -*-
- * dselect - selection of Debian packages
+ * dselect - Debian package maintenance user interface
  * pkglist.h - external definitions for package list handling
  *
  * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/pkgsublist.cc /home/vorlon/devel/multiarch/dpkg-debian/dselect/pkgsublist.cc
--- dpkg/dselect/pkgsublist.cc	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/pkgsublist.cc	2012-06-07 10:11:09.426073000 -0700
@@ -33,14 +33,13 @@
 #include "bindings.h"
 
 void packagelist::add(pkginfo *pkg) {
-  debug(dbg_general, "packagelist[%p]::add(pkginfo %s)", this,
-        pkg_describe(pkg, pdo_foreign));
+  debug(dbg_general, "packagelist[%p]::add(pkginfo %s)", this, pkg->name);
   if (!recursive ||  // never add things to top level
       !pkg->clientdata ||  // don't add pure virtual packages
       pkg->clientdata->uprec)  // don't add ones already in the recursive list
     return;
   debug(dbg_general, "packagelist[%p]::add(pkginfo %s) adding",
-        this, pkg_describe(pkg, pdo_foreign));
+        this, pkg->name);
   perpackagestate *state= &datatable[nitems];
   state->pkg= pkg;
   state->direct= state->original= pkg->clientdata->selected;
@@ -55,21 +54,21 @@
 
 void packagelist::add(pkginfo *pkg, pkginfo::pkgwant nw) {
   debug(dbg_general, "packagelist[%p]::add(pkginfo %s, %s)",
-        this, pkg_describe(pkg, pdo_foreign), wantstrings[nw]);
+        this, pkg->name, wantstrings[nw]);
   add(pkg);  if (!pkg->clientdata) return;
   pkg->clientdata->direct= nw;
   selpriority np;
   np= would_like_to_install(nw,pkg) ? sp_selecting : sp_deselecting;
   if (pkg->clientdata->spriority > np) return;
   debug(dbg_general, "packagelist[%p]::add(pkginfo %s, %s) setting",
-        this, pkg_describe(pkg, pdo_foreign), wantstrings[nw]);
+        this, pkg->name, wantstrings[nw]);
   pkg->clientdata->suggested= pkg->clientdata->selected= nw;
   pkg->clientdata->spriority= np;
 }
 
 void packagelist::add(pkginfo *pkg, const char *extrainfo, showpriority showimp) {
   debug(dbg_general, "packagelist[%p]::add(pkginfo %s, ..., showpriority %d)",
-        this, pkg_describe(pkg, pdo_foreign), showimp);
+        this, pkg->name, showimp);
   add(pkg);  if (!pkg->clientdata) return;
   if (pkg->clientdata->dpriority < showimp) pkg->clientdata->dpriority= showimp;
   pkg->clientdata->relations(extrainfo);
@@ -118,7 +117,7 @@
 
   const char *comma= "";
   varbuf info;
-  info(pkg_describe(depends->up, pdo_foreign));
+  info(depends->up->name);
   info(' ');
   info(gettext(relatestrings[depends->type]));
   info(' ');
@@ -144,12 +143,12 @@
   info('\n');
   add(depends->up,info.string(),displayimportance);
   for (possi=depends->list; possi; possi=possi->next) {
-    add(&possi->ed->pkg, info.string(), displayimportance);
+    add(possi->ed,info.string(),displayimportance);
     if (possi->verrel == dvr_none && depends->type != dep_provides) {
       // providers aren't relevant if a version was specified, or
       // if we're looking at a provider relationship already
       deppossi *provider;
-      for (provider = possi->ed->depended.available;
+      for (provider = possi->ed->available.depended;
            provider;
            provider = provider->rev_next) {
         if (provider->up->type != dep_provides) continue;
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/pkgtop.cc /home/vorlon/devel/multiarch/dpkg-debian/dselect/pkgtop.cc
--- dpkg/dselect/pkgtop.cc	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/pkgtop.cc	2012-06-07 10:11:09.426073000 -0700
@@ -108,17 +108,16 @@
   const char *section= table[cursorline]->pkg->section;
   const char *priority= pkgprioritystring(table[cursorline]->pkg);
   char *buf= new char[500+
-                      max((table[cursorline]->pkg->set->name ?
-                           strlen(pkg_describe(table[cursorline]->pkg,
-                                               pdo_foreign)) : 0),
+                      max((table[cursorline]->pkg->name ?
+                           strlen(table[cursorline]->pkg->name) : 0),
                           (section ? strlen(section) : 0) +
                           (priority ? strlen(priority) : 0))];
 
-  if (table[cursorline]->pkg->set->name) {
+  if (table[cursorline]->pkg->name) {
     sprintf(buf,
             _("%-*s %s%s%s;  %s (was: %s).  %s"),
             package_width,
-            pkg_describe(table[cursorline]->pkg, pdo_foreign),
+            table[cursorline]->pkg->name,
             gettext(statusstrings[table[cursorline]->pkg->status]),
             ((eflagstrings[table[cursorline]->pkg->eflag][0]==' ') &&
               (eflagstrings[table[cursorline]->pkg->eflag][1]=='\0'))  ? "" : " - ",
@@ -145,7 +144,7 @@
 
   wattrset(listpad, selected ? listsel_attr : list_attr);
 
-  if (pkg->set->name) {
+  if (pkg->name) {
     if (verbose) {
       mvwprintw(listpad, screenline, 0, "%-*.*s ",
                 status_hold_width, status_hold_width,
@@ -200,7 +199,7 @@
               pkg->section ? pkg->section : "?");
 
     mvwprintw(listpad, screenline, package_column - 1, " %-*.*s ",
-              package_width, package_width, pkg_describe(pkg, pdo_foreign));
+              package_width, package_width, pkg->name);
 
     if (versioninstalled_width)
       mvwprintw(listpad, screenline, versioninstalled_column, "%-*.*s ",
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/boldquot.sed /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/boldquot.sed
--- dpkg/dselect/po/boldquot.sed	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/boldquot.sed	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,10 @@
+s/"\([^"]*\)"/“\1”/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“”/""/g
+s/“/“[1m/g
+s/”/[0m”/g
+s/‘/‘[1m/g
+s/’/[0m’/g
Binary files dpkg/dselect/po/bs.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/bs.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/bs.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/bs.po
--- dpkg/dselect/po/bs.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/bs.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\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"
@@ -24,25 +24,25 @@
 msgid "Error: "
 msgstr "Greška:"
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Pomoć:"
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr ""
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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 ""
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr ""
 
@@ -531,110 +531,110 @@
 "  \\                repeat last search\n"
 msgstr ""
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Ukucajte dselect --help za pomoć."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "p"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[P]ristup"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Izaberite metod pristupa koji će se korisiti."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[A]žuriraj"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Ažuriraj listu dostupnih paketa, po mogućnosti."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "o"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[O]dabir"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Odaberite koje pakete želite na vašem sistemu."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstaliraj"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Instaliraj i nadogradi željene pakete."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "d"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "Po[d]esi"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Podesi sve pakete koji nisu podešeni."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "u"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[U]kloni"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Ukloni neželjeni software"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "z"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "I[z]ađi"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Izađi iz dselect programa."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "meni"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, fuzzy, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debianov `%s' program za rukovanje paketima."
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 msgstr ""
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -647,18 +647,18 @@
 "ili kasniju za uslove kopiranja.  NEMA garancije.  Pogledajte\n"
 "dselect --licence za detalje.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -670,7 +670,7 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -678,7 +678,7 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -686,67 +686,67 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr ""
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Boje:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr ""
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr ""
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr ""
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr ""
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr ""
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "boja"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr ""
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr ""
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr ""
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
 "or make do with the per-package management tool %s.\n"
 msgstr ""
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr ""
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -755,18 +755,18 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
 "Read-only access: only preview of selections is available!"
 msgstr ""
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr ""
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr ""
Binary files dpkg/dselect/po/ca.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ca.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/ca.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ca.po
--- dpkg/dselect/po/ca.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ca.po	2012-06-07 10:11:09.426073000 -0700
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.15.8.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-10-24 17:38+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -25,20 +25,20 @@
 msgid "Error: "
 msgstr "Error: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Ajuda: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Premeu ? per al menú d'ajuda, . per al següent tema, <espai> per a sortir."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "La info. d'ajuda està disponible sota els següents temes:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -46,7 +46,7 @@
 "Premeu una tecla de de la llista superior, <espai> o «q» per a sortir de\n"
 "l'ajuda, o «.» (punt) per a llegir cada pàgina d'ajuda al seu torn. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "s'ha produït un error en llegir del teclat en l'ajuda"
 
@@ -734,104 +734,104 @@
 "   /                  cerca (Retorn canceŀla)\n"
 "   \\                  repeteix la darrera cerca\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Teclegeu dselect --help per a obtindre ajuda."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "m"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[M]ètode"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Escull el mètode d'accés que emprareu."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[A]ctualitza"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Actualitza la llista de paquets disponibles, si és possible."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[S]elecciona"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Selecciona els paquets que voleu en el sistema."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstaŀla"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Instaŀla i actualitza els paquets desitjats."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[C]onfigura"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Configura els paquets que no estiguin configurats."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "d"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[D]esinstaŀla"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Desinstaŀla els paquets no desitjats."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "t"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "Sur[T]"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Surt de dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menú"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Interfície de gestió de paquets «%s» de Debian versió %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -839,7 +839,7 @@
 "Copyright © 1994-1996 Ian Jackson.\n"
 "Copyright © 2000, 2001 Wichert akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -847,11 +847,11 @@
 "Això és programari lliure, vegeu la Llicència Publica General GNU versió 2\n"
 "o posterior per a les condicions de còpia. No hi ha CAP garantia.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr "<eixida estàndard>"
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -860,7 +860,7 @@
 "Forma d'ús: %s [<opció> …] [<acció> …]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -880,7 +880,7 @@
 "                                Configura els colors de la pantalla.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -891,7 +891,7 @@
 "  --version                     Mostra la versió.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -902,56 +902,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Parts de la pantalla:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Colors:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atributs:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "no es pot obrir el fitxer de depuració «%.255s»\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s invàlid: «%s»\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "part de la pantalla"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Especificació de color nula\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "color"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "atribut del color"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "El terminal no sembla donar suport al direccionament pel cursor.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "El terminal sembla no donar suport per a ressaltats.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -960,11 +960,11 @@
 "Establiu la variable TERM correctament, utilitzeu un terminal millor\n"
 "o feu la construcció amb l'eina de gestió per paquets %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "el terminal no té les característiques necessàries, s'està avortant"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -978,7 +978,7 @@
 "Premeu <enter> per a confirmar la selecció.   ^L redibuixa la pantalla.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -988,11 +988,11 @@
 "\n"
 "Accés de només lectura: només és poden veure les selecciones disponibles!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "no s'ha pogut fer «getch» en el menú principal"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "la cadena d'acció «%.50s» és desconeguda"
Binary files dpkg/dselect/po/cs.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/cs.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/cs.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/cs.po
--- dpkg/dselect/po/cs.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/cs.po	2012-06-07 10:11:09.426073000 -0700
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2009-09-11 20:35+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -27,19 +27,19 @@
 msgid "Error: "
 msgstr "Chyba: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Nápověda: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "Pro nápovědu stiskněte ?, pro další téma . a pro konec <mezeru>."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Nápověda je dostupná pro následující témata:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -47,7 +47,7 @@
 "Stiskněte klávesu ze seznamu výše, <mezeru> nebo `q' pro opuštění\n"
 "  nápovědy nebo tečku pro postupné čtení všech stránek nápovědy. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "chyba při čtení klávesnice v nápovědě"
 
@@ -715,104 +715,104 @@
 "  /                hledá (zrušení stiskem Return)\n"
 "  \\                opakuje poslední hledání\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Pro získání nápovědy napište dselect --help."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "p"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[P]řístup"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Volba přístupové metody."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[A]ktualizuj"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Aktualizace informací o dostupných balících."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "v"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[V]yber"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Výběr balíků pro instalaci a odinstalaci."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "n"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[N]ainstaluj"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Instalace a aktualizace vybraných balíků."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "k"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[K]konfiguruj"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Konfigurace všech nezkonfigurovaných balíků."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "o"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[O]dstraň"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Odebrání nežádoucích balíků."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "u"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[U]končit"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Ukončení dselectu."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s' rozhraní pro správu balíků verze %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -820,7 +820,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -831,11 +831,11 @@
 "pozdější. Toto programové vybavení je absolutně bez záruky.\n"
 "Více informací získáte použitím %s --licence.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr "<standardní výstup>"
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -844,7 +844,7 @@
 "Použití: %s [<volba> ...] [<akce> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -863,7 +863,7 @@
 "                             Nastaví barvy.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -875,7 +875,7 @@
 "  --license                  Zobrazí licenci.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -886,56 +886,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Části obrazovky:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Barvy:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atributy:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "nepodařilo se otevřít ladící soubor `%.255s'\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Neplatné %s `%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "část obrazovky"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Zadání prázdné barvy\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "barva"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "atribut barvy"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Zdá se, že terminál nepodporuje adresaci kurzoru.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Zdá se, že terminál nepodporuje zvýrazňování.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -944,11 +944,11 @@
 "Nastavte správně proměnnou TERM, použijte lepší terminál\n"
 "nebo použijte nástroj pro správu jednotlivých balíků %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminál postrádá nezbytné funkce, vzdávám to"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -963,7 +963,7 @@
 "číslic; Volbu potvrďte stiskem klávesy <enter>. Obrazovku překreslí ^L.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -973,11 +973,11 @@
 "\n"
 "Přístup pouze pro čtení: k dispozici je pouze přehled aktuálních nastavení!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "nepovedlo se getch v hlavním menu"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "neznámý akční řetězec `%.50s'"
Binary files dpkg/dselect/po/da.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/da.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/da.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/da.po
--- dpkg/dselect/po/da.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/da.po	2012-06-07 10:11:09.426073000 -0700
@@ -9,48 +9,48 @@
 msgstr ""
 "Project-Id-Version: dpkg_1.10.19_da\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2006-10-06 16:32+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: dselect/basecmds.cc:125
 msgid "Search for ? "
-msgstr "Sg efter ? "
+msgstr "Søg efter ? "
 
 #: dselect/basecmds.cc:147
 msgid "Error: "
 msgstr "Fejl: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
-msgstr "Hjlp: "
+msgstr "Hjælp: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
-msgstr "Tryk ? for hjlpemenu, . for nste emne, <mellemrum> afslutter hjlp."
+msgstr "Tryk ? for hjælpemenu, . for næste emne, <mellemrum> afslutter hjælp."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
-msgstr "Hjlpetekster for flgende emner er tilgngelige:"
+msgstr "Hjælpetekster for følgende emner er tilgængelige:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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 ""
-"Tryk en tast fra ovenstende liste, <mellemrum> eller'q for at afslutte\n"
-"  hjlpen eller punktum for at lse hjlpesiderne en ad gangen. "
+"Tryk en tast fra ovenstående liste, <mellemrum> eller'q for at afslutte\n"
+"  hjælpen eller punktum for at læse hjælpesiderne en ad gangen. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
-msgstr "fejl ved lsning fra tastatur i hjlp"
+msgstr "fejl ved læsning fra tastatur i hjælp"
 
 #: dselect/baselist.cc:57
 msgid "ioctl(TIOCGWINSZ) failed"
@@ -58,7 +58,7 @@
 
 #: dselect/baselist.cc:60
 msgid "doupdate in SIGWINCH handler failed"
-msgstr "doupdate i SIGWINCH-hndtering fejlede"
+msgstr "doupdate i SIGWINCH-håndtering fejlede"
 
 #: dselect/baselist.cc:67
 msgid "failed to restore old SIGWINCH sigact"
@@ -70,11 +70,11 @@
 
 #: dselect/baselist.cc:79
 msgid "failed to get old signal mask"
-msgstr "kunne ikke f gammel signalmaske"
+msgstr "kunne ikke få gammel signalmaske"
 
 #: dselect/baselist.cc:80
 msgid "failed to get old SIGWINCH sigact"
-msgstr "kunne ikke f gammel SIGWINCH sigact"
+msgstr "kunne ikke få gammel SIGWINCH sigact"
 
 #: dselect/baselist.cc:84
 msgid "failed to block SIGWINCH"
@@ -82,11 +82,11 @@
 
 #: dselect/baselist.cc:89
 msgid "failed to set new SIGWINCH sigact"
-msgstr "kunne ikke stte ny SIGWINCH sigact"
+msgstr "kunne ikke sætte ny SIGWINCH sigact"
 
 #: dselect/baselist.cc:126
 msgid "failed to allocate colour pair"
-msgstr "kunne ikke frigre farvepar"
+msgstr "kunne ikke frigøre farvepar"
 
 #: dselect/baselist.cc:167
 msgid "failed to create title window"
@@ -114,7 +114,7 @@
 
 #: dselect/baselist.cc:191
 msgid "failed to create query window"
-msgstr "kunne ikke oprette foresprgselsvindue"
+msgstr "kunne ikke oprette forespørgselsvindue"
 
 #: dselect/baselist.cc:255
 #, fuzzy
@@ -134,7 +134,7 @@
 #: dselect/baselist.cc:310
 #, c-format
 msgid "%s to go back"
-msgstr "%s for at g tilbage"
+msgstr "%s for at gå tilbage"
 
 #: dselect/bindings.cc:78
 msgid "[not bound]"
@@ -147,11 +147,11 @@
 
 #: dselect/bindings.cc:139
 msgid "Scroll onwards through help/information"
-msgstr "Rul forlns gennem hjlp/information"
+msgstr "Rul forlæns gennem hjælp/information"
 
 #: dselect/bindings.cc:140
 msgid "Scroll backwards through help/information"
-msgstr "Rul baglns gennem hjlp/information"
+msgstr "Rul baglæns gennem hjælp/information"
 
 #: dselect/bindings.cc:141
 msgid "Move up"
@@ -163,15 +163,15 @@
 
 #: dselect/bindings.cc:143
 msgid "Go to top of list"
-msgstr "G til toppen af listen"
+msgstr "Gå til toppen af listen"
 
 #: dselect/bindings.cc:144
 msgid "Go to end of list"
-msgstr "G til slutningen af listen"
+msgstr "Gå til slutningen af listen"
 
 #: dselect/bindings.cc:145
 msgid "Request help (cycle through help screens)"
-msgstr "F hjlp (skift hjlpeskrm)"
+msgstr "Få hjælp (skift hjælpeskærm)"
 
 #: dselect/bindings.cc:146
 msgid "Cycle through information displays"
@@ -179,7 +179,7 @@
 
 #: dselect/bindings.cc:147
 msgid "Redraw display"
-msgstr "Gentegn skrm"
+msgstr "Gentegn skærm"
 
 #: dselect/bindings.cc:148
 msgid "Scroll onwards through list by 1 line"
@@ -191,11 +191,11 @@
 
 #: dselect/bindings.cc:150
 msgid "Scroll onwards through help/information by 1 line"
-msgstr "Rul 1 linje videre i hjlp/information"
+msgstr "Rul 1 linje videre i hjælp/information"
 
 #: dselect/bindings.cc:151
 msgid "Scroll backwards through help/information by 1 line"
-msgstr "Rul 1 linje bagud i hjlp/information"
+msgstr "Rul 1 linje bagud i hjælp/information"
 
 #: dselect/bindings.cc:152
 msgid "Scroll onwards through list"
@@ -203,55 +203,55 @@
 
 #: dselect/bindings.cc:153
 msgid "Scroll backwards through list"
-msgstr "Rul baglns i listen"
+msgstr "Rul baglæns i listen"
 
 #: dselect/bindings.cc:156
 msgid "Mark package(s) for installation"
-msgstr "Markr pakke(r) for installation"
+msgstr "Markér pakke(r) for installation"
 
 #: dselect/bindings.cc:157
 msgid "Mark package(s) for deinstallation"
-msgstr "Markr pakke(r) for afinstallering"
+msgstr "Markér pakke(r) for afinstallering"
 
 #: dselect/bindings.cc:158
 msgid "Mark package(s) for deinstall and purge"
-msgstr "Markr pakke(r) for afinstallering og udrensning"
+msgstr "Markér pakke(r) for afinstallering og udrensning"
 
 #: dselect/bindings.cc:159
 msgid "Make highlight more specific"
-msgstr "Gr markering mere specifik"
+msgstr "Gør markering mere specifik"
 
 #: dselect/bindings.cc:160
 msgid "Make highlight less specific"
-msgstr "Gr markering mindre specifik"
+msgstr "Gør markering mindre specifik"
 
 #: dselect/bindings.cc:161
 msgid "Search for a package whose name contains a string"
-msgstr "Sg efter en pakke, der indeholder en streng"
+msgstr "Søg efter en pakke, der indeholder en streng"
 
 #: dselect/bindings.cc:162
 msgid "Repeat last search."
-msgstr "Gentag sidste sgning."
+msgstr "Gentag sidste søgning."
 
 #: dselect/bindings.cc:163
 msgid "Swap sort order priority/section"
-msgstr "Skift sorteringsrkkeflge-prioritet/gruppe"
+msgstr "Skift sorteringsrækkefølge-prioritet/gruppe"
 
 #: dselect/bindings.cc:164
 msgid "Quit, confirming, and checking dependencies"
-msgstr "Afslut bekrftende, og tjek afhngigheder"
+msgstr "Afslut bekræftende, og tjek afhængigheder"
 
 #: dselect/bindings.cc:165
 msgid "Quit, confirming without check"
-msgstr "Afslut bekrftende, uden tjek"
+msgstr "Afslut bekræftende, uden tjek"
 
 #: dselect/bindings.cc:166
 msgid "Quit, rejecting conflict/dependency suggestions"
-msgstr "Afslut, afvis konflikt/afhngigheds-forslag"
+msgstr "Afslut, afvis konflikt/afhængigheds-forslag"
 
 #: dselect/bindings.cc:167
 msgid "Abort - quit without making changes"
-msgstr "Afbryd - afslut uden at lave ndringer"
+msgstr "Afbryd - afslut uden at lave ændringer"
 
 #: dselect/bindings.cc:168
 msgid "Revert to old state for all packages"
@@ -259,7 +259,7 @@
 
 #: dselect/bindings.cc:169
 msgid "Revert to suggested state for all packages"
-msgstr "Genskab foreslet status for alle pakker"
+msgstr "Genskab foreslået status for alle pakker"
 
 #: dselect/bindings.cc:170
 msgid "Revert to directly requested state for all packages"
@@ -272,11 +272,11 @@
 
 #: dselect/bindings.cc:174
 msgid "Select currently-highlighted access method"
-msgstr "Vlg den markerede adgangsmetode"
+msgstr "Vælg den markerede adgangsmetode"
 
 #: dselect/bindings.cc:175
 msgid "Quit without changing selected access method"
-msgstr "Afslut uden at ndre den valgte adgangsmetode"
+msgstr "Afslut uden at ændre den valgte adgangsmetode"
 
 #: dselect/helpmsgs.cc:29
 msgid "Keystrokes"
@@ -314,7 +314,7 @@
 "cancel)\n"
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
-"Bevgelsestaster: Nste/Tidligere, Top/Bund, Op/Ned, Baglns/Forlns:\n"
+"Bevægelsestaster: Næste/Tidligere, Top/Bund, Op/Ned, Baglæns/Forlæns:\n"
 "  Pil-ned, j            Pil-op, k               Flyt markering\n"
 "  N, PgDn, mellemrum    P, PgUp, rettetast      rul listen 1 side\n"
 "  ^n                    ^p                      rul listen 1 linje\n"
@@ -322,25 +322,25 @@
 "liste\n"
 "  u                     d                       rul info 1 side\n"
 "  ^u                    ^d                      rul info 1 linje\n"
-"  B, Pil-venstre        F, Pil-hjre            panorr med 1/3 af "
-"skrmbredden\n"
-"  ^b                    ^f                      panorr med 1 tegn\n"
-"\n"
-"Markr pakker for senere behandling:\n"
-" +, Indst, installr el. opgradr  =, H  tilbagehold i nuvrende status\n"
-" -, Slet, afinstallr               :, G  frigr, opgradr eller forbliv "
+"  B, Pil-venstre        F, Pil-højre            panorér med 1/3 af "
+"skærmbredden\n"
+"  ^b                    ^f                      panorér med 1 tegn\n"
+"\n"
+"Markér pakker for senere behandling:\n"
+" +, Indsæt, installér el. opgradér  =, H  tilbagehold i nuværende status\n"
+" -, Slet, afinstallér               :, G  frigør, opgradér eller forbliv "
 "ikke-installeret\n"
-" _    afinstallr & udrens konfiguration\n"
+" _    afinstallér & udrens konfiguration\n"
 "                                             Forskelligt:\n"
-"Afslut, afbryd, overskriv (bemrk versaler!): ?, F1 vis hjlp (ogs Help)\n"
-" Retur   Bekrft, afslut (tjek afhngigheder) i, I  vis/skift info-"
+"Afslut, afbryd, overskriv (bemærk versaler!): ?, F1 vis hjælp (også Help)\n"
+" Retur   Bekræft, afslut (tjek afhængigheder) i, I  vis/skift info-"
 "visninger\n"
-"   Q     Bekrft, afslut (undertryk afh.)     o, O  skift sorteringsvalg\n"
-" X, Esc  Afbryd uden at gennemfre ndringer  v, V  skift statusvisning\n"
-"   R     Genskab status fr denne liste        ^l   gentegn skrm\n"
-"   U     st alle til foreslet status          /   sg (Retur for at "
+"   Q     Bekræft, afslut (undertryk afh.)     o, O  skift sorteringsvalg\n"
+" X, Esc  Afbryd uden at gennemføre ændringer  v, V  skift statusvisning\n"
+"   R     Genskab status før denne liste        ^l   gentegn skærm\n"
+"   U     sæt alle til foreslået status          /   søg (Retur for at "
 "fortryde)\n"
-"   D     st alle til direkte nsket status   n \\  gentag sidste sgning\n"
+"   D     sæt alle til direkte ønsket status   n \\  gentag sidste søgning\n"
 
 #: dselect/helpmsgs.cc:55
 msgid "Introduction to package selections"
@@ -378,34 +378,34 @@
 msgstr ""
 "Velkommen til dselect's hovedpakkeliste.\n"
 "\n"
-"Du vil blive prsenteret for en liste med installerede pakker og pakker, "
+"Du vil blive præsenteret for en liste med installerede pakker og pakker, "
 "der\n"
-"er tilgngelige for installation. Du kan bevge dig rundt i listen med\n"
+"er tilgængelige for installation. Du kan bevæge dig rundt i listen med\n"
 "piletasterne, markere pakker for installation (med '+') eller "
 "afinstallation\n"
 "(med '-'). Pakkerne kan enten markeres enkeltvist eller i grupper. Fra "
 "starten\n"
-"vil du bemrke, at linjen 'Alle pakker' er valgt. '+', '-' osv. vil berre\n"
+"vil du bemærke, at linjen 'Alle pakker' er valgt. '+', '-' osv. vil berøre\n"
 "alle pakkerne, der beskrives af den markerede linje.\n"
 "\n"
-"Nogle af dine valg vil give konflikter og afhngighedsproblemer. Du vil da "
-"f\n"
-"en delliste med de relevante pakker, s du kan udrede problemerne.\n"
-"\n"
-"Du br lse listen med taster og forklaringerne p det viste.\n"
-"Der er en del skrmhjlp til rdighed. Brug den endelig - tryk '?'\n"
-"til hver en tid for at f hjlp.\n"
-"\n"
-"Nr du har foretaget dine valg, kan du trykke <retur> for at bekrfte dine\n"
-"ndringer eller 'X' for at afbryde uden at gemme ndringerne. Et\n"
-"endeligt tjek for konflikter og afhngigheder vil blive foretaget\n"
-" - her kan du igen komme ud for at f en delliste.\n"
+"Nogle af dine valg vil give konflikter og afhængighedsproblemer. Du vil da "
+"få\n"
+"en delliste med de relevante pakker, så du kan udrede problemerne.\n"
+"\n"
+"Du bør læse listen med taster og forklaringerne på det viste.\n"
+"Der er en del skærmhjælp til rådighed. Brug den endelig - tryk '?'\n"
+"til hver en tid for at få hjælp.\n"
+"\n"
+"Når du har foretaget dine valg, kan du trykke <retur> for at bekræfte dine\n"
+"ændringer eller 'X' for at afbryde uden at gemme ændringerne. Et\n"
+"endeligt tjek for konflikter og afhængigheder vil blive foretaget\n"
+" - her kan du igen komme ud for at få en delliste.\n"
 "\n"
-"Tryk mellemrum for at forlade hjlpen og g til listen.\n"
+"Tryk mellemrum for at forlade hjælpen og gå til listen.\n"
 
 #: dselect/helpmsgs.cc:80
 msgid "Introduction to read-only package list browser"
-msgstr "Introduktion til skrivebeskyttet pakkeliste-sger"
+msgstr "Introduktion til skrivebeskyttet pakkeliste-søger"
 
 #: dselect/helpmsgs.cc:80
 msgid ""
@@ -429,25 +429,25 @@
 msgstr ""
 "Velkommen til dselect's hoved-pakkeliste.\n"
 "\n"
-" Du vil blive prsenteret med en liste over pakker, der er installerede "
+" Du vil blive præsenteret med en liste over pakker, der er installerede "
 "eller\n"
-"tilgngelige for installation. Siden du ikke har de ndvendige rettigheder\n"
+"tilgængelige for installation. Siden du ikke har de nødvendige rettigheder\n"
 "til at opdatere pakkestatus, er du i skrivebeskyttet tilstand. Du kan\n"
-"bevge dig rundt i listen med pilestaterne (se hjlpeskrmen 'Taster')\n"
-"(njagtig som hvis ville, hvis du havde skriveadgang - se hjlpeskrmen\n"
+"bevæge dig rundt i listen med pilestaterne (se hjælpeskærmen 'Taster')\n"
+"(nøjagtig som hvis ville, hvis du havde skriveadgang - se hjælpeskærmen\n"
 "'Taster') og se status for pakkerne samt oplysninger om dem.\n"
 "\n"
-"Du br lse listen med taster og beskrivelserne af visningerne.\n"
-"Der er megen tilgngelig hjlp, brug den endelig! Tryk til enhver tid '?'\n"
-"for hjlp.\n"
+"Du bør læse listen med taster og beskrivelserne af visningerne.\n"
+"Der er megen tilgængelig hjælp, brug den endelig! Tryk til enhver tid '?'\n"
+"for hjælp.\n"
 "\n"
-"Tryk 'Q' eller <retur> for at afslutte, nr du er frdig med at bladre.\n"
+"Tryk 'Q' eller <retur> for at afslutte, når du er færdig med at bladre.\n"
 "\n"
-"Tryk <mellemrum> for at forlade hjlpen og g til listen nu.\n"
+"Tryk <mellemrum> for at forlade hjælpen og gå til listen nu.\n"
 
 #: dselect/helpmsgs.cc:99
 msgid "Introduction to conflict/dependency resolution sub-list"
-msgstr "Introduktion til konflikt/afhngighedslsnings-dellisten"
+msgstr "Introduktion til konflikt/afhængighedsløsnings-dellisten"
 
 #: dselect/helpmsgs.cc:99
 msgid ""
@@ -483,33 +483,33 @@
 "Press <space> to leave help and enter the sub-list; remember: press `?' for "
 "help.\n"
 msgstr ""
-"Konflikt/afhngighedslsning - introduktion.\n"
+"Konflikt/afhængighedsløsning - introduktion.\n"
 "\n"
-"Et eller flere af dine valg har udlst en konflikt eller afhngighedsproblem "
+"Et eller flere af dine valg har udløst en konflikt eller afhængighedsproblem "
 "-\n"
-"nogle pakker br kun installeres sammen med visse andre, mens visse pakke-\n"
+"nogle pakker bør kun installeres sammen med visse andre, mens visse pakke-\n"
 "kombinationer ikke kan eksistere sammen.\n"
 "\n"
 "Du vil se en delliste med de involverede pakker. Den nederste halvdel af\n"
-"skrmen viser de relevante konflikter og afhngigheder; brug 'i' for at "
+"skærmen viser de relevante konflikter og afhængigheder; brug 'i' for at "
 "skifte\n"
 "mellem denne, pakkebeskrivelserne og intern kontrolinformation.\n"
 "\n"
-"Der er beregnet et st 'foreslede' pakker, og de indledende markeringer i\n"
-"denne delliste er sat efter dette, s du kan blot trykke <retur> for at\n"
-"acceptere forslagene, hvis du vil. Du kan trkke de valg, der gav "
+"Der er beregnet et sæt 'foreslåede' pakker, og de indledende markeringer i\n"
+"denne delliste er sat efter dette, så du kan blot trykke <retur> for at\n"
+"acceptere forslagene, hvis du vil. Du kan trække de valg, der gav "
 "problemerne,\n"
 "tilbage, og returnere til hovedlisten ved at trykke skift-'X'.\n"
 "\n"
-"Du kan ogs bevge dig rundt i listen og ndre markeringerne sledes at de\n"
-"svarer mere til dine nsker, og du kan 'afvise' mine forslag ved at bruge\n"
-"skift-'D' eller skift-'R' (se hjlpeskrmen 'Taster'). Du kan bruge "
+"Du kan også bevæge dig rundt i listen og ændre markeringerne således at de\n"
+"svarer mere til dine ønsker, og du kan 'afvise' mine forslag ved at bruge\n"
+"skift-'D' eller skift-'R' (se hjælpeskærmen 'Taster'). Du kan bruge "
 "skift-'Q'\n"
-"for at gennemtvinge de aktuelt viste valg, sfremt du vil tilsidestte\n"
+"for at gennemtvinge de aktuelt viste valg, såfremt du vil tilsidesætte\n"
 "forslaget og mener, at programmet tager fejl.\n"
 "\n"
-"Tryk mellemrum for at forlade hjlp og g til dellisten. Husk:'?' for "
-"hjlp.\n"
+"Tryk mellemrum for at forlade hjælp og gå til dellisten. Husk:'?' for "
+"hjælp.\n"
 
 #: dselect/helpmsgs.cc:125
 msgid "Display, part 1: package listing and status chars"
@@ -548,16 +548,16 @@
 "available version numbers (shift-V to display/hide) and summary "
 "description.\n"
 msgstr ""
-"Den verste halvdel af skrmen viser en liste over pakkerne. For hver pakke "
+"Den øverste halvdel af skærmen viser en liste over pakkerne. For hver pakke "
 "ser\n"
-"du fire sjler for dens aktuelle status p system og mark. I detaljeret "
+"du fire søjler for dens aktuelle status på system og mark. I detaljeret "
 "visning\n"
 "(brug 'v' til at skifte detaljering) er disse enkelttegn fra venstre til "
-"hjre:\n"
+"højre:\n"
 "\n"
-"  Fejlflag: Mellemrum - ingen fejl (men pakken kan vre delagt - se "
+"  Fejlflag: Mellemrum - ingen fejl (men pakken kan være ødelagt - se "
 "nedenfor)\n"
-"              'R'  - alvorlig fejl under installation, krver "
+"              'R'  - alvorlig fejl under installation, kræver "
 "geninstallation\n"
 " Instal.status: Mellemrum - ikke installeret\n"
 "                     '*'  - installeret\n"
@@ -565,18 +565,18 @@
 "beholdt\n"
 "       pakker i    { 'U'  - udpakket, men endnu ikke konfigureret\n"
 "   disse tilstande { 'C'  - halvt konfigureret (der skete en fejl)\n"
-"      er delagte  { 'I'  - halvt installeret (der skete en fejl)\n"
-" Gammelt mrke: det, der planlagdes for denne pakker inden denne liste\n"
-" Mrke: det, er planlgges for denne pakke\n"
+"      er ødelagte  { 'I'  - halvt installeret (der skete en fejl)\n"
+" Gammelt mærke: det, der planlagdes for denne pakker inden denne liste\n"
+" Mærke: det, er planlægges for denne pakke\n"
 "  '*': markeret for installation eller opgradering\n"
-"  '-': markeret for afinstallation, men konfigurationsfiler bestr\n"
-"  '=': holdes tilbage, pakken vil ikke blive ndret\n"
+"  '-': markeret for afinstallation, men konfigurationsfiler består\n"
+"  '=': holdes tilbage, pakken vil ikke blive ændret\n"
 "  '_': markeret for komplet udrensning - selv konfigurationsfiler slettes\n"
 "  'n': pakken er ny og mangler at blive markeret for installation/"
 "afinstallation/&c.\n"
 "\n"
-"Ogs hver pakkes prioritet, gruppe, navn, versionsnumre for installeret og\n"
-"tilgngelig version (skift-V for vis/skjul) og kort beskrivelse vises.\n"
+"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:152
 msgid "Display, part 2: list highlight; information display"
@@ -608,26 +608,26 @@
 "  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 ""
-"* Markering: n linje i pakkelisten vil vre markeret. Det indikerer\n"
-"  hvilke pakker, der vil berres af tryk p '+', '-' og '_'.\n"
+"* Markering: Èn linje i pakkelisten vil være markeret. Det indikerer\n"
+"  hvilke pakker, der vil berøres af tryk på '+', '-' og '_'.\n"
 "\n"
-"* Opdelingslinjen i midten af skrmen viser en kort forklaring af\n"
+"* Opdelingslinjen i midten af skærmen viser en kort forklaring af\n"
 "  den markerede pakkes status, eller, hvis en gruppe er markeret,\n"
-"  en beskrivelse af denne gruppe. Hvis du ikke forstr betydningen\n"
+"  en beskrivelse af denne gruppe. Hvis du ikke forstår betydningen\n"
 "  af de viste statustegn, kan du markere den relevante pakke og se\n"
-"  p opdelingslinjen, eller brug 'v'-tasten for detaljeret visning.\n"
-"  (Tryk 'v' igen for at g tilbage til koncis visning.\n"
+"  på opdelingslinjen, eller brug 'v'-tasten for detaljeret visning.\n"
+"  (Tryk 'v' igen for at gå tilbage til koncis visning.\n"
 "\n"
-"* I bunden af skrmen vises mere information om den aktuelt\n"
-"  markerede pakke (hvis der kun er n).\n"
+"* I bunden af skærmen vises mere information om den aktuelt\n"
+"  markerede pakke (hvis der kun er én).\n"
 "\n"
 "  Den kan vise en udvidet beskrivelse af pakken, de interne pakke-\n"
-"  kontroldetaljer (enten for den installerede eller tilgngelige version\n"
-"  af pakken), eller information om konflikter og afhngigheder, der\n"
-"  berrer den aktuelle pakke (i dellisten konflikt/afhngigheds-lsning).\n"
+"  kontroldetaljer (enten for den installerede eller tilgængelige version\n"
+"  af pakken), eller information om konflikter og afhængigheder, der\n"
+"  berører den aktuelle pakke (i dellisten konflikt/afhængigheds-løsning).\n"
 "\n"
 "  Brug 'i'-tasten for at skifte mellem visningerne og 'I' for at gemme\n"
-"  informationsvisningen eller udvide den til nsten hele skrmen.\n"
+"  informationsvisningen eller udvide den til næsten hele skærmen.\n"
 
 #: dselect/helpmsgs.cc:176
 msgid "Introduction to method selection display"
@@ -656,26 +656,26 @@
 "help\n"
 "menu reachable by pressing `?'.\n"
 msgstr ""
-"dselect og dpkg kan udfre automatisk installation ved indlsning af\n"
+"dselect og dpkg kan udføre automatisk installation ved indlæsning af\n"
 "pakkefiler, der skal installeres fra et ud af flere mulige steder.\n"
 "\n"
-"Denne liste giver dig mulighed for at vlge en af disse "
+"Denne liste giver dig mulighed for at vælge en af disse "
 "installationsmetoder.\n"
 "\n"
-"Flyt markren til den metode, du nsker at bruge og tryk Retur. S vil du\n"
-"blive spurgt om information, der krves for at udfre installationen.\n"
+"Flyt markøren til den metode, du ønsker at bruge og tryk Retur. Så vil du\n"
+"blive spurgt om information, der kræves for at udføre installationen.\n"
 "\n"
-"Nr du flytter markren mellem metoderne, vil en beskrivelse blive vist i "
+"Når du flytter markøren mellem metoderne, vil en beskrivelse blive vist i "
 "den.\n"
-"nedre halvdel af skrmen.\n"
+"nedre halvdel af skærmen.\n"
 "\n"
-"Hvis du nsker at afslutte uden at ndre noget, kan du bruge 'x'-tasten, men "
+"Hvis du ønsker at afslutte uden at ændre noget, kan du bruge 'x'-tasten, men "
 "du\n"
 "er i listen over installationsmetoder\n"
 "\n"
-"Tryk 'k' nu for en komplet liste over tilgngelige kommandoer, eller find "
+"Tryk 'k' nu for en komplet liste over tilgængelige kommandoer, eller find "
 "dem i\n"
-"hjlpemenuen ved at trykke '?'.\n"
+"hjælpemenuen ved at trykke '?'.\n"
 
 #: dselect/helpmsgs.cc:196
 msgid "Keystrokes for method selection"
@@ -706,7 +706,7 @@
 "  /                search (just return to cancel)\n"
 "  \\                repeat last search\n"
 msgstr ""
-"Bevgelsestaster: Nste/Tidligere, Top/Bund, Op/Ned, Baglns/Forlns:\n"
+"Bevægelsestaster: Næste/Tidligere, Top/Bund, Op/Ned, Baglæns/Forlæns:\n"
 "  n, Pil-ned            p, Pil-op               Flyt markering\n"
 "  N, PgDn, mellemrum    P, PgUp, rettetast      rul listen 1 side\n"
 "  ^n                    ^p                      rul listen 1 linje\n"
@@ -714,119 +714,119 @@
 "liste\n"
 "  u                     d                       rul info 1 side\n"
 "  ^u                    ^d                      rul info 1 linje\n"
-"  B, Pil-venstre        F, Pil-hjre            panorr med 1/3 af "
-"skrmbredden\n"
-"  ^b                    ^f                      panorr med 1 tegn\n"
-"(Disse bevgelsestaster er identiske med dem i pakkeliste-visningen.)\n"
+"  B, Pil-venstre        F, Pil-højre            panorér med 1/3 af "
+"skærmbredden\n"
+"  ^b                    ^f                      panorér med 1 tegn\n"
+"(Disse bevægelsestaster er identiske med dem i pakkeliste-visningen.)\n"
 "\n"
 "Afslut:\n"
-" Retur, Enter     vlg denne metode og g til dets konfigurationsdialog\n"
-" x, X             afbryd uden at ndre installationsmetode\n"
+" Retur, Enter     vælg denne metode og gå til dets konfigurationsdialog\n"
+" x, X             afbryd uden at ændre installationsmetode\n"
 "\n"
 "Forskelligt:\n"
-"  ?, Hjlp, F1     vi hjlp\n"
-" ^l                gentegn skrm\n"
-"  /                sg (fortryd umiddelbart med retur)\n"
-"  \\                gentag sidste sgning\n"
+"  ?, Hjælp, F1     vi hjælp\n"
+" ^l                gentegn skærm\n"
+"  /                søg (fortryd umiddelbart med retur)\n"
+"  \\                gentag sidste søgning\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
-msgstr "Skriv \"dselect --help\" for hjlp."
+msgstr "Skriv \"dselect --help\" for hjælp."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "t"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[T]ilgang"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
-msgstr "Vlg den nskede tilgangsmetode."
+msgstr "Vælg den ønskede tilgangsmetode."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "o"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
-msgstr "[O]pdatr"
+msgstr "[O]pdatér"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
-msgstr "Opdatr listen med tilgngelige pakker, hvis muligt."
+msgstr "Opdatér listen med tilgængelige pakker, hvis muligt."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
-msgstr "[U]dvlg"
+msgstr "[U]dvælg"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
-msgstr "Udvlg, hvilke pakker, du nsker p dit system."
+msgstr "Udvælg, hvilke pakker, du ønsker på dit system."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
-msgstr "[I]nstallr"
+msgstr "[I]nstallér"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
-msgstr "Installr og opgradr nskede pakker."
+msgstr "Installér og opgradér ønskede pakker."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "k"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[K]onfig"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
-msgstr "Konfigurr eventuelle ikke-konfigurerede pakker."
+msgstr "Konfigurér eventuelle ikke-konfigurerede pakker."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "a"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
-msgstr "[A]finstallr"
+msgstr "[A]finstallér"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
-msgstr "Afinstallr unsket programmel."
+msgstr "Afinstallér uønsket programmel."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "a"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[A]fslut"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Afslut dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
-msgstr "Debian '%s' pakkehndterings-brugerflade version %s.\n"
+msgstr "Debian '%s' pakkehåndterings-brugerflade version %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -834,21 +834,21 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
 msgstr ""
 "Dette er frit programmel; se \"GNU General Public License\" version 2 eller\n"
-"senere for forhold vedrrende ophavsret. Der er INGEN garanti.\n"
-"Se %s --license for detaljer vedrrende ophavsret og licens.\n"
+"senere for forhold vedrørende ophavsret. Der er INGEN garanti.\n"
+"Se %s --license for detaljer vedrørende ophavsret og licens.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -857,7 +857,7 @@
 "Brug: %s [<tilvalg> ...] [<handling> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -870,25 +870,25 @@
 msgstr ""
 "Tilvalg:\n"
 "  --admindir <mappe>         Benyt <mappe> i stedet for %s.\n"
-"  --expert                   Aktivr eksperttilstand.\n"
+"  --expert                   Aktivér eksperttilstand.\n"
 "  --debug <fil> | -D<fil>    Aktiverer aflusning, sender uddata til <file>.\n"
-"  --colour | --color skrmomrde:[forgrund],[baggrund][:attr[+attr+..]]\n"
-"                             Indstil skrmfarver.\n"
+"  --colour | --color skærmområde:[forgrund],[baggrund][:attr[+attr+..]]\n"
+"                             Indstil skærmfarver.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
 "  --version                  Show the version.\n"
 "\n"
 msgstr ""
-"  --help                     Vis denne hjlpebesked.\n"
+"  --help                     Vis denne hjælpebesked.\n"
 "  --version                  Vis versionsnummer.\n"
 "  --license | --licence      Vis licensen.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -899,69 +899,69 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
-msgstr "Skrmomrder:\n"
+msgstr "Skærmområder:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Farver:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Egenskaber:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
-msgstr "kunne ikke bne aflusningsfil '%.255s'\n"
+msgstr "kunne ikke åbne aflusningsfil '%.255s'\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Ugyldig %s '%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
-msgstr "skrmomrde"
+msgstr "skærmområde"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Nulfarveangivelse\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "farve"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "farveegenskab"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
-msgstr "Terminalen lader ikke til at understtte makradressering.\n"
+msgstr "Terminalen lader ikke til at understøtte makøradressering.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
-msgstr "Terminalen lader ikke til at understtte fremhvning.\n"
+msgstr "Terminalen lader ikke til at understøtte fremhævning.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
 "or make do with the per-package management tool %s.\n"
 msgstr ""
-"St din TERM-variabel korrekt, brug en bedre terminal\n"
-"eller njes med enkeltpakke-hndteringsvrktjet %s.\n"
+"Sæt din TERM-variabel korrekt, brug en bedre terminal\n"
+"eller nøjes med enkeltpakke-håndteringsværktøjet %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
-msgstr "teminalen mangler ndvendige funktioner. Giver op"
+msgstr "teminalen mangler nødvendige funktioner. Giver op"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -971,11 +971,11 @@
 msgstr ""
 "\n"
 "\n"
-"Bevg dig rundt med ^P og ^N, piletaster, forbogstaver eller tal;\n"
-"Tryk <retur> for at bekrfte valg.  ^L gentegner skrmen.\n"
+"Bevæg dig rundt med ^P og ^N, piletaster, forbogstaver eller tal;\n"
+"Tryk <retur> for at bekræfte valg.  ^L gentegner skærmen.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -983,13 +983,13 @@
 msgstr ""
 "\n"
 "\n"
-"Skrivebeskyttet adgang: kun visning af valg er tilgngelig!"
+"Skrivebeskyttet adgang: kun visning af valg er tilgængelig!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
-msgstr "kunne ikke udfre 'getch' i hovedmenu"
+msgstr "kunne ikke udføre 'getch' i hovedmenu"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "ukendt handlingsstreng '%.50s'"
@@ -1034,7 +1034,7 @@
 
 #: dselect/methlist.cc:197
 msgid "No explanation available."
-msgstr "Ingen tilgngelig forklaring."
+msgstr "Ingen tilgængelig forklaring."
 
 #: dselect/method.cc:67
 #, c-format
@@ -1053,25 +1053,25 @@
 "Press <enter> to continue."
 msgstr ""
 "\n"
-"Tryk <retur> for at fortstte."
+"Tryk <retur> for at fortsætte."
 
 #: dselect/method.cc:161
 #, c-format
 msgid "Press <enter> to continue.\n"
-msgstr "Tryk <retur> for at fortstte.\n"
+msgstr "Tryk <retur> for at fortsætte.\n"
 
 #: dselect/method.cc:162
 #, fuzzy
 msgid "<standard error>"
-msgstr "skrivefejl p standard-fejl"
+msgstr "skrivefejl på standard-fejl"
 
 #: dselect/method.cc:165
 msgid "error reading acknowledgement of program failure message"
-msgstr "fejl inder lsning af godkendelse af programfejlmeddelelse"
+msgstr "fejl inder læsning af godkendelse af programfejlmeddelelse"
 
 #: dselect/method.cc:196
 msgid "update available list script"
-msgstr "script til opdatering af tilgngelighedsliste"
+msgstr "script til opdatering af tilgængelighedsliste"
 
 #: dselect/method.cc:200
 msgid "installation script"
@@ -1079,7 +1079,7 @@
 
 #: dselect/method.cc:246
 msgid "query/setup script"
-msgstr "script til foresprgsel/opstning"
+msgstr "script til forespørgsel/opsætning"
 
 #: dselect/methparse.cc:53
 #, c-format
@@ -1089,12 +1089,12 @@
 #: dselect/methparse.cc:59
 #, c-format
 msgid "error reading options file `%.250s'"
-msgstr "fejl under lsning af tilvalgsfil '%.250s'"
+msgstr "fejl under læsning af tilvalgsfil '%.250s'"
 
 #: dselect/methparse.cc:90
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
-msgstr "kunne ikke lse '%.250s'-mappe for lsning af metoder"
+msgstr "kunne ikke læse '%.250s'-mappe for læsning af metoder"
 
 #: dselect/methparse.cc:106
 #, c-format
@@ -1104,20 +1104,20 @@
 #: dselect/methparse.cc:117
 #, c-format
 msgid "unable to access method script `%.250s'"
-msgstr "kunne ikke tilg metodescriptet '%.250s'"
+msgstr "kunne ikke tilgå metodescriptet '%.250s'"
 
 #: dselect/methparse.cc:123
 #, c-format
 msgid "unable to read method options file `%.250s'"
-msgstr "kunne ikke lse metodetilvalgsfil '%.250s'"
+msgstr "kunne ikke læse metodetilvalgsfil '%.250s'"
 
 #: dselect/methparse.cc:147
 msgid "non-digit where digit wanted"
-msgstr "ikke-tal, hvor et tal var nsket"
+msgstr "ikke-tal, hvor et tal var ønsket"
 
 #: dselect/methparse.cc:150
 msgid "EOF in index string"
-msgstr "slut-p-fil i indeksstreng"
+msgstr "slut-på-fil i indeksstreng"
 
 #: dselect/methparse.cc:153
 msgid "index string too long"
@@ -1125,15 +1125,15 @@
 
 #: dselect/methparse.cc:156
 msgid "newline before option name start"
-msgstr "linjeskift fr starten p tilvalgsnavn"
+msgstr "linjeskift før starten på tilvalgsnavn"
 
 #: dselect/methparse.cc:158
 msgid "EOF before option name start"
-msgstr "slut-p-fil inden starten af tilvalgsnavn"
+msgstr "slut-på-fil inden starten af tilvalgsnavn"
 
 #: dselect/methparse.cc:162
 msgid "nonalpha where option name start wanted"
-msgstr "ikke-bogstav, hvor tilvalgsnavn var nsket"
+msgstr "ikke-bogstav, hvor tilvalgsnavn var ønsket"
 
 #: dselect/methparse.cc:164
 msgid "non-alphanum in option name"
@@ -1141,7 +1141,7 @@
 
 #: dselect/methparse.cc:167
 msgid "EOF in option name"
-msgstr "slut-p-fil i tilvalgsnavn"
+msgstr "slut-på-fil i tilvalgsnavn"
 
 #: dselect/methparse.cc:172
 msgid "newline before summary"
@@ -1149,16 +1149,16 @@
 
 #: dselect/methparse.cc:174
 msgid "EOF before summary"
-msgstr "slut-p-fil inden beskrivelsen"
+msgstr "slut-på-fil inden beskrivelsen"
 
 #: dselect/methparse.cc:180
 msgid "EOF in summary - missing newline"
-msgstr "slut-p-fil i beskrivelsen - manglende linjeskift"
+msgstr "slut-på-fil i beskrivelsen - manglende linjeskift"
 
 #: dselect/methparse.cc:190
 #, c-format
 msgid "unable to open option description file `%.250s'"
-msgstr "kunne ikke bne tilvalgsbeskrivelsesfilen '%.250s'"
+msgstr "kunne ikke åbne tilvalgsbeskrivelsesfilen '%.250s'"
 
 #: dselect/methparse.cc:194
 #, c-format
@@ -1168,27 +1168,27 @@
 #: dselect/methparse.cc:198
 #, c-format
 msgid "failed to read option description file `%.250s'"
-msgstr "kunne ikke lse tilvalgsbeskrivelsesfilen '%.250s'"
+msgstr "kunne ikke læse tilvalgsbeskrivelsesfilen '%.250s'"
 
 #: dselect/methparse.cc:201
 #, c-format
 msgid "error during read of option description file `%.250s'"
-msgstr "fejl ved lsning af tilvalgsbeskrivelsesfilen '%.250s'"
+msgstr "fejl ved læsning af tilvalgsbeskrivelsesfilen '%.250s'"
 
 #: dselect/methparse.cc:224
 #, c-format
 msgid "error during read of method options file `%.250s'"
-msgstr "fejl ved lsning af metodetilvalgsfilen '%.250s'"
+msgstr "fejl ved læsning af metodetilvalgsfilen '%.250s'"
 
 #: dselect/methparse.cc:247
 #, c-format
 msgid "unable to open current option file `%.250s'"
-msgstr "kunne ikke bne aktuel tilvalgsfil '%.250s'"
+msgstr "kunne ikke åbne aktuel tilvalgsfil '%.250s'"
 
 #: dselect/methparse.cc:289
 #, c-format
 msgid "unable to open new option file `%.250s'"
-msgstr "kunne ikke bne ny tilvalgsfil '%.250s'"
+msgstr "kunne ikke åbne ny tilvalgsfil '%.250s'"
 
 #: dselect/methparse.cc:292
 #, c-format
@@ -1211,7 +1211,7 @@
 
 #: dselect/pkgdisplay.cc:37
 msgid "install"
-msgstr "installr"
+msgstr "installér"
 
 #: dselect/pkgdisplay.cc:38
 msgid "hold"
@@ -1219,7 +1219,7 @@
 
 #: dselect/pkgdisplay.cc:39
 msgid "remove"
-msgstr "afinstallr"
+msgstr "afinstallér"
 
 #: dselect/pkgdisplay.cc:40
 msgid "purge"
@@ -1235,7 +1235,7 @@
 
 #: dselect/pkgdisplay.cc:48
 msgid "REINSTALL"
-msgstr "GENINSTALLR"
+msgstr "GENINSTALLÉR"
 
 #: dselect/pkgdisplay.cc:51
 msgid "not installed"
@@ -1243,7 +1243,7 @@
 
 #: dselect/pkgdisplay.cc:52
 msgid "removed (configs remain)"
-msgstr "afinstalleret (opstning bevaret)"
+msgstr "afinstalleret (opsætning bevaret)"
 
 #: dselect/pkgdisplay.cc:53
 msgid "half installed"
@@ -1271,7 +1271,7 @@
 
 #: dselect/pkgdisplay.cc:61
 msgid "Required"
-msgstr "krvede"
+msgstr "krævede"
 
 #: dselect/pkgdisplay.cc:62
 msgid "Important"
@@ -1299,7 +1299,7 @@
 
 #: dselect/pkgdisplay.cc:70
 msgid "suggests"
-msgstr "foreslr"
+msgstr "foreslår"
 
 #: dselect/pkgdisplay.cc:71
 msgid "recommends"
@@ -1307,11 +1307,11 @@
 
 #: dselect/pkgdisplay.cc:72
 msgid "depends on"
-msgstr "afhnger af"
+msgstr "afhænger af"
 
 #: dselect/pkgdisplay.cc:73
 msgid "pre-depends on"
-msgstr "forhnds-afhnger af"
+msgstr "forhånds-afhænger af"
 
 #: dselect/pkgdisplay.cc:74
 msgid "breaks"
@@ -1363,7 +1363,7 @@
 
 #: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
 msgid "Broken"
-msgstr "delagte"
+msgstr "Ødelagte"
 
 #: dselect/pkgdisplay.cc:96
 msgid "New"
@@ -1375,7 +1375,7 @@
 
 #: dselect/pkgdisplay.cc:98
 msgid "Obsolete/local"
-msgstr "Forldede/lokale"
+msgstr "Forældede/lokale"
 
 #: dselect/pkgdisplay.cc:99
 msgid "Up-to-date"
@@ -1383,7 +1383,7 @@
 
 #: dselect/pkgdisplay.cc:100
 msgid "Available"
-msgstr "Tilgngelige"
+msgstr "Tilgængelige"
 
 #: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
 msgid "Removed"
@@ -1391,19 +1391,19 @@
 
 #: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
 msgid "Brokenly installed packages"
-msgstr "delagte installerede pakker"
+msgstr "Ødelagte installerede pakker"
 
 #: dselect/pkgdisplay.cc:103
 msgid "Newly available packages"
-msgstr "Nyligt tilgngelige pakker"
+msgstr "Nyligt tilgængelige pakker"
 
 #: dselect/pkgdisplay.cc:104
 msgid "Updated packages (newer version is available)"
-msgstr "Opdaterede pakker (nyere version tilgngelig)"
+msgstr "Opdaterede pakker (nyere version tilgængelig)"
 
 #: dselect/pkgdisplay.cc:105
 msgid "Obsolete and local packages present on system"
-msgstr "Forldede og lokale pakker p systemet"
+msgstr "Forældede og lokale pakker på systemet"
 
 #: dselect/pkgdisplay.cc:106
 msgid "Up to date installed packages"
@@ -1411,11 +1411,11 @@
 
 #: dselect/pkgdisplay.cc:107
 msgid "Available packages (not currently installed)"
-msgstr "Tilgngelige pakker (ikke installerede)"
+msgstr "Tilgængelige pakker (ikke installerede)"
 
 #: dselect/pkgdisplay.cc:108
 msgid "Removed and no longer available packages"
-msgstr "Afinstallerede og ikke lngere tilgngelige pakker"
+msgstr "Afinstallerede og ikke længere tilgængelige pakker"
 
 #: dselect/pkgdisplay.cc:112
 msgid "Installed packages"
@@ -1423,7 +1423,7 @@
 
 #: dselect/pkgdisplay.cc:113
 msgid "Removed packages (configuration still present)"
-msgstr "Afinstallerede pakker (opstning bevaret)"
+msgstr "Afinstallerede pakker (opsætning bevaret)"
 
 #: dselect/pkgdisplay.cc:114
 msgid "Purged packages and those never installed"
@@ -1479,7 +1479,7 @@
 
 #: dselect/pkgdisplay.cc:241
 msgid " (by availability)"
-msgstr " (efter tilgng.)"
+msgstr " (efter tilgæng.)"
 
 #: dselect/pkgdisplay.cc:244
 msgid " (by status)"
@@ -1487,19 +1487,19 @@
 
 #: dselect/pkgdisplay.cc:258
 msgid " mark:+/=/- terse:v help:?"
-msgstr " markr:+/=/- koncis:v hjlp:?"
+msgstr " markér:+/=/- koncis:v hjælp:?"
 
 #: dselect/pkgdisplay.cc:259
 msgid " mark:+/=/- verbose:v help:?"
-msgstr " markr:+/=/- detalj:v hjlp:?"
+msgstr " markér:+/=/- detalj:v hjælp:?"
 
 #: dselect/pkgdisplay.cc:260
 msgid " terse:v help:?"
-msgstr " koncis:v hjlp:?"
+msgstr " koncis:v hjælp:?"
 
 #: dselect/pkgdisplay.cc:261
 msgid " verbose:v help:?"
-msgstr " detaljer:v hjlp:?"
+msgstr " detaljer:v hjælp:?"
 
 #: dselect/pkginfo.cc:80
 msgid ""
@@ -1512,24 +1512,24 @@
 "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 ""
-"Den linje, du har markeret, reprsenterer mange pakker. Hvis du beder om "
-"installation, afinstallation, tilbageholdelse o.lign., vil det berre alle "
+"Den linje, du har markeret, repræsenterer mange pakker. Hvis du beder om "
+"installation, afinstallation, tilbageholdelse o.lign., vil det berøre alle "
 "pakkerne, der passer til det viste kriterie.\n"
 "\n"
 "Hvis du flytter markeringen til en linje med en enkelt pakke, vil du se "
 "information om pakken her.\n"
-"Du kan bruge 'o' eller'O' til at ndre sorteringsrkkeflgen og give dit "
+"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:93
 #, fuzzy
 msgid "Interrelationships"
-msgstr "sammenhnge"
+msgstr "sammenhænge"
 
 #: dselect/pkginfo.cc:112
 #, fuzzy
 msgid "No description available."
-msgstr "ingen tilgngelig beskrivelse."
+msgstr "ingen tilgængelig beskrivelse."
 
 #: dselect/pkginfo.cc:130
 #, fuzzy
@@ -1539,7 +1539,7 @@
 #: dselect/pkginfo.cc:146
 #, fuzzy
 msgid "Available control file information"
-msgstr "tilgngelig version af kontrolinformation for fil"
+msgstr "tilgængelig version af kontrolinformation for fil"
 
 #: dselect/pkglist.cc:416
 msgid "There are no packages."
@@ -1547,15 +1547,15 @@
 
 #: dselect/pkglist.cc:507
 msgid "invalid search option given"
-msgstr "ugyldigt sgetilvalg angivet"
+msgstr "ugyldigt søgetilvalg angivet"
 
 #: dselect/pkglist.cc:521
 msgid "error in regular expression"
-msgstr "fejl i regulrt udtryk"
+msgstr "fejl i regulært udtryk"
 
 #: dselect/pkgsublist.cc:107
 msgid " does not appear to be available\n"
-msgstr " lader ikke til at vre tilgngelig\n"
+msgstr " lader ikke til at være tilgængelig\n"
 
 #: dselect/pkgsublist.cc:127
 msgid " or "
@@ -1609,7 +1609,7 @@
 
 #: dselect/pkgtop.cc:271
 msgid "Old mark"
-msgstr "Gammelt mrke"
+msgstr "Gammelt mærke"
 
 #: dselect/pkgtop.cc:275
 msgid "Marked for"
@@ -1655,13 +1655,13 @@
 #~ msgstr "mislykkedes med en ukendt vente-returkode %d.\n"
 
 #~ msgid "unable to run %.250s process `%.250s'"
-#~ msgstr "kunne ikke kre %.250s processer '%.250s'"
+#~ msgstr "kunne ikke køre %.250s processer '%.250s'"
 
 #~ msgid "failed config"
 #~ msgstr "mislykket konfigurering"
 
 #~ msgid "unable to wait for %.250s"
-#~ msgstr "kunne ikke vente p %.250s"
+#~ msgstr "kunne ikke vente på %.250s"
 
 #~ msgid "got wrong child's status - asked for %ld, got %ld"
 #~ msgstr "fik forkert barns status - bad om %ld, fik %ld"
@@ -1708,7 +1708,7 @@
 #~ msgstr "fejl under af-fangning af signal %d: %s\n"
 
 #~ msgid "unable to ignore signal %d before running %.250s"
-#~ msgstr "kunne ikke ignorere signal %d fr krsel af %.250s"
+#~ msgstr "kunne ikke ignorere signal %d før kørsel af %.250s"
 
 #~ msgid "(no clientdata)"
 #~ msgstr "(ingen klientdata)"
@@ -1717,7 +1717,7 @@
 #~ msgstr "<tom>"
 
 #~ msgid "interrelationships affecting "
-#~ msgstr "sammenhnge der berrer "
+#~ msgstr "sammenhænge der berører "
 
 #~ msgid "description of "
 #~ msgstr "beskrivelse af "
@@ -1729,4 +1729,4 @@
 #~ msgstr "aktuelt installeret kontrolinformation"
 
 #~ msgid "available version of control info for "
-#~ msgstr "tilgngelig version af kontrolinformation for "
+#~ msgstr "tilgængelig version af kontrolinformation for "
Binary files dpkg/dselect/po/de.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/de.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/de.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/de.po
--- dpkg/dselect/po/de.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/de.po	2012-06-07 10:11:09.426073000 -0700
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.15.8.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-10-24 09:44+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -27,20 +27,20 @@
 msgid "Error: "
 msgstr "Fehler: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Hilfe: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 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."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Hilfeinformationen sind unter den folgenden Themen verfügbar:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -48,7 +48,7 @@
 "Drücken Sie eine Taste aus der obigen Liste, <Leer> oder »q«, um die\n"
 "  Hilfe zu beenden, oder ».«, um alle Hilfeseiten nacheinander zu lesen. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "Fehler beim Lesen der Tastatur in der Hilfe"
 
@@ -752,106 +752,106 @@
 "  /                Suchen (Abbruch mit Eingabetaste)\n"
 "  \\                letzte Suche wiederholen\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Geben Sie dselect --help ein, um Hilfe zu erhalten."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "z"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[Z]ugriff"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Zugriffsmethode auswählen."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "e"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[E]rneuern"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Liste der verfügbaren Pakete erneuern, falls möglich."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "a"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[A]uswählen"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Auswahl der für Ihr System gewünschten Pakete treffen."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstall."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Gewünschte Pakete installieren und aktualisieren."
 
 # Vorsicht Falle: "k" geht leider nicht, denn diese Taste bewegt
 # die Hervorhebung um eine Zeile nach oben!
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "f"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "Kon[f]ig."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Alle unkonfigurierten Pakete konfigurieren."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "l"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[L]öschen"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Nicht gewünschte Software löschen."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "b"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[B]eenden"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Dselect beenden."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "Menü"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian »%s« Paketverwaltungs-Frontend Version %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -859,7 +859,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -868,11 +868,11 @@
 "Version 2 oder höher für Kopierbedingungen. Es wird KEINE Haftung "
 "übernommen.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr "<Standardausgabe>"
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -881,7 +881,7 @@
 "Aufruf: %s [<Option> ...] [<Aktion> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -901,7 +901,7 @@
 "                               Bildschirmfarben konfigurieren.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -912,7 +912,7 @@
 "  --version                    Version anzeigen.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -923,57 +923,57 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Bildschirmelemente:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Farben:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attribute:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "Debug-Datei »%.255s« konnte nicht geöffnet werden\n"
 
 # %s kann unterchiedliches Geschlecht haben (Farbe, Bildschirmelement, Farbattribut)
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s »%s« ist ungültig\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "Bildschirmelement"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Leere Farbspezifikation\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "Farbe"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "Farbattribut"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Das Terminal scheint Cursoradressierung nicht zu unterstützen.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Das Terminal scheint Hervorhebung nicht zu unterstützen.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -982,11 +982,11 @@
 "Setzen Sie ihre TERM-Variable richtig, verwenden Sie ein besseres Terminal,\n"
 "oder begnügen Sie sich mit dem Werkzeug %s zur paketweisen Verwaltung.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "Terminal lässt notwendige Fähigkeiten vermissen, Abbruch"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -1000,7 +1000,7 @@
 "Drücken Sie <Eingabe> zur Bestätigung.   ^L zeichnet den Bildschirm neu.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -1010,11 +1010,11 @@
 "\n"
 "Nur-Lese-Zugriff: Lediglich die Vorschau der Auswahlen ist verfügbar!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "getch im Hauptmenü fehlgeschlagen"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "unbekannte Aktionszeichenkette »%.50s«"
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/dselect.pot /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/dselect.pot
--- dpkg/dselect/po/dselect.pot	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/dselect.pot	2012-06-07 10:11:09.426073000 -0700
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.16.0\n"
+"Project-Id-Version: dpkg 1.16.1.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,25 +25,25 @@
 msgid "Error: "
 msgstr ""
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr ""
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr ""
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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 ""
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr ""
 
@@ -531,127 +531,127 @@
 "  \\                repeat last search\n"
 msgstr ""
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr ""
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr ""
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr ""
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr ""
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr ""
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr ""
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr ""
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr ""
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr ""
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr ""
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr ""
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr ""
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr ""
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr ""
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr ""
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr ""
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr ""
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr ""
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr ""
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr ""
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr ""
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr ""
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr ""
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr ""
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 msgstr ""
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
 msgstr ""
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -663,7 +663,7 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -671,7 +671,7 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -679,67 +679,67 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr ""
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr ""
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr ""
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr ""
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr ""
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr ""
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr ""
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr ""
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr ""
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr ""
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr ""
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
 "or make do with the per-package management tool %s.\n"
 msgstr ""
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr ""
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -748,18 +748,18 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
 "Read-only access: only preview of selections is available!"
 msgstr ""
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr ""
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr ""
Binary files dpkg/dselect/po/el.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/el.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/el.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/el.po
--- dpkg/dselect/po/el.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/el.po	2012-06-07 10:11:09.426073000 -0700
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: dpkg_po_el\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\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"
@@ -35,19 +35,19 @@
 msgid "Error: "
 msgstr "Σφάλμα:"
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Βοήθεια: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "Πατήστε ? για μενού βοηθείας, <space> για επόμενο θέμα."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Πληροφορίες βοήθειας είναι διαθέσιμες για τα ακόλουθα θέματα:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -55,7 +55,7 @@
 "Πιέστε ένα πλήκτρο από την λίστα, <space> ή `q' για έξοδο από τη βοήθεια,\n"
 "  η '.' (τελεία) για να διαβάσετε κάθε σελίδα με τη σειρά. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "σφάλμα εισόδου από το πληκτρολόγιο στη βοήθεια"
 
@@ -756,110 +756,110 @@
 "  /                αναζήτηση (πιέστε return για να ακυρώσετε)\n"
 "  \\                επανάληψη τελευταίας αναζήτησης\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Πληκτρολογήστε dselect --help για βοήθεια."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "Πρόσβαση ([a])"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Επιλέξτε τη μέθοδο πρόσβασης που θα χρησιμοποιήσετε"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "Ανανέωση([u])"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Ανανέωσε τη λίστα των διαθέσιμων πακέτων, αν είναι δυνατό."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "Επιλογή ([s])"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Επιλέξτε ποια πακέτα θέλετε στο σύστημά σας."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "Εγκατάσταση ([i])"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Εγκατάσταση και αναβάθμιση ζητούμενων πακέτων."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "Ρύθμιση ([c])"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Ρύθμιση όποιων πακέτων είναι μη ρυθμισμένα."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "Αφαίρεση ([r])"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Αφαίρεση ανεπιθύμητου λογισμικού."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "Έξοδος ([q])"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Έξοδος από το dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "μενού"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, fuzzy, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Πρόγραμμα διαχείρισης των πακέτων του Debian `%s'"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 msgstr ""
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -870,18 +870,18 @@
 "μεταγενέστερης για συνθήκες αντιγραφής. Δεν υπάρχει ΚΑΜΙΑ εγγύηση.\n"
 "Δείτε dpkg-deb --licence για λεπτομέρειες.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -893,7 +893,7 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -901,7 +901,7 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -909,56 +909,56 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Οθόνες:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Χρώματα:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Ιδιότητες:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "αδύνατο το άνοιγμα του αρχείου debug `%.255s'\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Μη έγκυρο %s `%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "τμήμα οθόνης"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "κενός χρωματικός προσδιορισμός\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "χρώμα"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "ιδιότητα χρώματος"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Το τερματικό δεν φαίνεται να υποστηρίζει κατευθυνόμενο δρομέα.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Το τερματικό δεν φαίνεται να υποστηρίζει τονισμό.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, fuzzy, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -967,11 +967,11 @@
 "Ορίστε τη μεταβλητή TERM σωστά, χρησιμοποιήστε ένα καλύτερο τερματικό,\n"
 "ή χρησιμοποιήστε με το εργαλείο διαχείρισης μεμονωμένων πακέτων "
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "το τερματικό δεν υποστηρίζει απαραίτητα χαρακτηριστικά, εγκατάλειψη"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -985,7 +985,7 @@
 "Πιέστε <enter> για αποδοχή της επιλογής.   το ^L ανανεώνει την οθόνη.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -996,11 +996,11 @@
 "Πρόσβαση μόνο για ανάγνωση: Μόνο η προεπισκόπηση των επιλογών είναι "
 "διαθέσιμη!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "απέτυχε η getch στο κυρίως μενού"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "άγνωστη συμβολοσειρά δράσης `%.50s'"
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/en@boldquot.header /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/en@boldquot.header
--- dpkg/dselect/po/en@boldquot.header	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/en@boldquot.header	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,25 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/en@quot.header /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/en@quot.header
--- dpkg/dselect/po/en@quot.header	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/en@quot.header	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,22 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
Binary files dpkg/dselect/po/es.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/es.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/es.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/es.po
--- dpkg/dselect/po/es.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/es.po	2012-06-07 10:11:09.426073000 -0700
@@ -41,7 +41,7 @@
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.16\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-12-20 03:10+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -69,19 +69,19 @@
 msgid "Error: "
 msgstr "Error: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Ayuda: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "Pulse ? para el menú, . para el tema siguiente, <intro> para salir."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "La información de ayuda está disponible bajo los siguientes temas:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -90,7 +90,7 @@
 "ayuda,\n"
 " o `.' (punto) para leer cada una de las páginas de ayuda. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "error al leer del teclado en la ayuda"
 
@@ -800,105 +800,105 @@
 "  /              buscar (simplemente pulse Intro para cancelar)\n"
 "  \\              repetir la última búsqueda\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Escriba dselect --help para obtener ayuda."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "m"
 
 # Pongo método y no acceso porque la "A" está ya cogida para Actualizar. sv
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[M]étodo"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Escoger el método de acceso que se usará."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[A]ctualizar"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Actualizar la lista de paquetes disponibles, si se puede."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[S]eleccionar"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Solicitar qué paquetes desea en el sistema."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstalar"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Instalar y actualizar los paquetes deseados."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[C]onfigurar"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Configurar los paquetes que no estén configurados."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "d"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[D]esinstalar"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Desinstalar los paquetes no deseados."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "l"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "sa[L]ir"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Salir de dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menú"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Interfaz de manejo de paquetes %s de Debian `%s'.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -906,7 +906,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -914,11 +914,11 @@
 "Esto es software libre; vea la Licencia Pública General de GNU versión 2 o\n"
 "posterior para las condiciones de copia. No hay NINGUNA garantía.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr "<salida estándar>"
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -927,7 +927,7 @@
 "Modo de uso: %s [<opción> ...] [<acción> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -948,7 +948,7 @@
 "                                   Configura los colores de la pantalla.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -959,7 +959,7 @@
 "  --version                    Muestra la versión.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -970,56 +970,56 @@
 " access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Partes de pantalla:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Colores:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atributos:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "no se puede abrir el fichero de depuración `%.255s'\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s inválido `%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "parte de pantalla"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Especificación de color nula\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "color"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "atributo de color"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "El terminal no parece dar soporte al direccionamiento por cursor.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "El terminal parece no dar soporte al destacado.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -1028,11 +1028,11 @@
 "Establezca la variable TERM correctamente, utilice un terminal mejor,\n"
 "o manéjese con la herramienta de gestión por paquete %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "el terminal carece de propiedades necesarias: abandonando"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -1046,7 +1046,7 @@
 "Pulse <intro> para confirmar la selección.  ^L redibuja la pantalla.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -1056,11 +1056,11 @@
 "\n"
 "Acceso de sólo lectura: ¡solamente se pueden ver las selecciones!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "fallo en getch en el menú principal"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "cadena de acción desconocida `%.50s'"
Binary files dpkg/dselect/po/et.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/et.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/et.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/et.po
--- dpkg/dselect/po/et.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/et.po	2012-06-07 10:11:09.426073000 -0700
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: dselect 1.14.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2007-07-13 08:22+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -27,20 +27,20 @@
 msgid "Error: "
 msgstr "Viga: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Abi: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Abimenüü jaoks vajuta `?', järgmine teema: `.', abi sulgemine: <tühik>."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Abiteavet on võimalik saada järgnevate teemade kohta:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -49,7 +49,7 @@
 "  abiteabest väljumiseks klahve 'q' või <tühik> või abiteabe\n"
 "  lehthaaval lugemiseks klahvi `.'."
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "viga klaviatuurilt lugemisel (abiteabe ekraanil)"
 
@@ -582,104 +582,104 @@
 "  /                otsing (katkestamiseks Enter, kui otsingustring on tühi)\n"
 "  \\                viimase otsingu kordamine\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Abiteabe jaoks käivita `dselect --help'."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "p"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[P]ääs"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Kasutatavate ligipääsumeetodite valimine."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[U]uenda"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Saadaolevate pakkide nimekirja uuendamine (kui võimalik)."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "v"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[V]ali"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Pakkide oleku seadmine (paigaldamine, eemaldamine jne)."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "p"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[P]aigalda"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Pakkide paigaldamine ja uuendamine."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "s"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[S]eadista"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Kõigi seadistamata pakkide seadistamine."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "e"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[E]emalda"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Tarbetu tarkvara eemaldamine."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "l"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[L]õpeta"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Dselect'i sulgemine"
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr ""
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debiani `%s' pakihaldusprogrammi kasutajaliidese versioon %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -687,7 +687,7 @@
 "Autoriõigus (C) 1994-1996 Ian Jackson.\n"
 "Autoriõigus (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -697,11 +697,11 @@
 "Litsentsi 2. versioonis. Programmil puudub igasugune garantii.\n"
 "Autoriõiguste ja litsentsi üksikasjade nägemiseks käivita `%s --license'.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -710,7 +710,7 @@
 "Kasutamine: %s [<võti> ...] [<tegevus> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -730,7 +730,7 @@
 "                             Ekraanivärvuste seadistamine.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -742,7 +742,7 @@
 "  --license | --licence      Litsentsi näitamine.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -753,56 +753,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Ekraani osad:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Värvused:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Rekvisiidid:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "silumisfaili `%.255s' pole võimalik avada\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Lubamatu %s `%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "ekraani osa"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Tühi värvusekirjeldus\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "värvus"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "värvuse rekvisiit"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal ei paista kursori adresseerimist toetavat.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal ei paista esiletõstmist toetavat.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -811,11 +811,11 @@
 "Määra oma TERM muutuja korrektselt, kasuta paremat terminali\n"
 "või kasuta pakipõhist haldusvahendit %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalil puuduvad vajalikud võimalused, annan alla"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -830,7 +830,7 @@
 "^L joonistab ekraanipildi uuesti.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -840,11 +840,11 @@
 "\n"
 "Ligipääs ainult vaatamiseks: võimalik on kasutada ainult valikute eelvaadet!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "tõrge peamenüüs, funktsioonis getch"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "tundmatu tegevuse string `%.50s'"
Binary files dpkg/dselect/po/eu.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/eu.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/eu.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/eu.po
--- dpkg/dselect/po/eu.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/eu.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2009-01-05 16:29+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -26,21 +26,21 @@
 msgid "Error: "
 msgstr "Errorea: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Laguntza: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Sakatu ? laguntza-menua ikusteko, '.' hurrengo gaira joateko, <zuriunea> "
 "laguntzatik irteteko."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Laguntzako informazioa gai hauetan dago erabilgarri:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -48,7 +48,7 @@
 "Sakatu goiko zerrendako tekla bat,  <zuriunea> edo `q' laguntzatik irteteko\n"
 ", edo '.' (puntua) laguntza-orriak banan-banan irakurtzeko. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "errorea laguntzan teklatua irakurtzean"
 
@@ -737,104 +737,104 @@
 "  /                bilatu (uzteko, sakatu 'sartu')\n"
 "  \\               errepikatu azken bilaketa\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Idatzi dselect --help laguntza lortzeko."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[A]tzipena"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Aukeratu erabili nahi duzun atzipen-metodoa."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "e"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[E]guneratu"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Ahal bada, eguneratu pakete erabilgarrien zerrenda."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "h"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[H]autatu"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Eskatu sisteman izan nahi dituzun paketeak."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstalatu"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Instalatu eta bertsio-berritu nahi dituzun paketeak."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "k"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[K]onfiguratu"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Konfiguratu konfiguratu gabe dauden paketeak."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "e"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "K[e]ndu"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Kendu nahi ez duzun softwarea."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "I[r]ten"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Irten dselect-etik."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menua"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian-en pakete kudeatzeko `%s' interfazearen %s bertsioa.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -842,7 +842,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -853,11 +853,11 @@
 "EZ dago bermerik.\n"
 "Ikus %s --licence xehetasun gehiago izateko.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -866,7 +866,7 @@
 "Erabilera: %s [<aukera> ...] [<aukera> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -886,7 +886,7 @@
 "                             Pantaila koloreak konfiguratu.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -898,7 +898,7 @@
 "  --license                  Lizentzia bistarazi.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -909,56 +909,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Pantaila-zatiak:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Koloreak:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atributuak:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "ezin izan da `%.255s' arazketa-fitxategia ireki\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s `%s' baliogabea\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "pantaila-zatia"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Kolore-zehaztapen nulua\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "kolorea"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "kolore-atributua"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Badirudi terminalak ez duela onartzen kurtsore-helbideratzerik.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Badirudi terminalak ez duela onartzen nabarmentzea.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -967,11 +967,11 @@
 "Ezarri ondo TERM aldagaia, erabili terminal hobe bat,\n"
 "edo moldatu paketez pakete kudeatzeko %s tresnarekin .\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalak beharrezko eginbide batzuk falta ditu, utzi egingo da"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -986,7 +986,7 @@
 "Hautatzeko, sakatu <sartu>. Erabili ^L pantaila berriro marrazteko.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -996,11 +996,11 @@
 "\n"
 "Soilik irakurtzeko sarbidea: hautapenen aurrebista bakarrik dago erabilgarri!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "getch: huts egin du menu nagusian"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "`%.50s' ekintza-kate ezezaguna"
Binary files dpkg/dselect/po/fr.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/fr.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/fr.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/fr.po
--- dpkg/dselect/po/fr.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/fr.po	2012-06-07 10:11:09.426073000 -0700
@@ -50,7 +50,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-03-12 07:16+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: fr <debian-l10n-french@lists.debian.org>\n"
@@ -69,21 +69,21 @@
 msgid "Error: "
 msgstr "Erreur : "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Aide : "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Appuyez sur ? pour un menu d'aide, . pour le sujet suivant, <espace>\n"
 "pour quitter l'aide."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "L'information d'aide est accessible au travers des thèmes suivants :"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -92,7 +92,7 @@
 "  <espace> ou « q » pour sortir de l'aide,\n"
 "  ou . pour lire chaque page tour à tour. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "erreur de lecture du clavier dans l'aide"
 
@@ -797,104 +797,104 @@
 "  /               rechercher (appuyer sur entrée pour annuler)\n"
 "  \\               répéter la dernière recherche\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Taper dselect --help pour obtenir une aide."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[A]ccéder"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Choisir la méthode d'accès à utiliser"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "m"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[M]ise à jour"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Mise à jour de l'information sur les paquets disponibles, si possible."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[S]électionner"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Sélection des paquets que vous désirez avoir sur votre système."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstaller"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Installation et mise à niveau des paquets désirés."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[C]onfigurer"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Configuration de tout paquet non configuré."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[R]etirer"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Suppression des applications non désirées."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[Q]uitter"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Quitter dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Interface de gestion de paquets Debian « %s » version %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -902,7 +902,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -911,11 +911,11 @@
 "Public  License » version 2 ou supérieure pour prendre connaissance des\n"
 "conditions de reproduction. AUCUNE garantie n'est offerte.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr "<sortie standard>"
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -924,7 +924,7 @@
 "Syntaxe : %s [<option> ...] [<action> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -946,7 +946,7 @@
 "                             Configurer les couleurs d'affichage ;\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -957,7 +957,7 @@
 "  --version                  Afficher la version ;\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -968,56 +968,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Parties de l'écran :\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Couleurs :\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attributs :\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "impossible d'ouvrir le fichier de débogage « %.255s »\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Invalide %s « %s »\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "Partie de l'écran"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Spécification de couleur nulle\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "couleur"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "attribut de couleur"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Il semble que votre terminal ne supporte pas la gestion du curseur\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Il semble que votre terminal ne supporte pas le surlignage\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -1027,11 +1027,11 @@
 "un meilleur terminal ou contentez-vous d'une installation\n"
 "paquet par paquet avec l'outil de gestion de paquets %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "Il manque d'importantes fonctionnalités au terminal, abandon"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -1046,7 +1046,7 @@
 "Appuyez sur <Entrée> pour confirmer la sélection. ^L pour redessiner "
 "l'écran.\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -1056,11 +1056,11 @@
 "\n"
 "Accès en lecture seule : seul un aperçu des sélections est disponible !"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "échec de « getch » dans le menu principal"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "chaîne d'action inconnue « %.50s »"
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/.gitignore
--- dpkg/dselect/po/.gitignore	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1,9 +0,0 @@
-*.gmo
-*.sin
-*.sed
-*.header
-Makefile.in.in
-Makevars.template
-POTFILES
-Rules-quot
-stamp-po
Binary files dpkg/dselect/po/gl.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/gl.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/gl.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/gl.po
--- dpkg/dselect/po/gl.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/gl.po	2012-06-07 10:11:09.426073000 -0700
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: dselect_gl\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2008-12-27 15:56+0100\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
@@ -28,20 +28,20 @@
 msgid "Error: "
 msgstr "Erro: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Axuda: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Prema ? para o menú de axuda, . para o seguinte tema, <espazo> para saír."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Hai información de axuda dispoñíbel para os seguintes temas:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -49,7 +49,7 @@
 "Prema nunha tecla da lista de riba, <espazo> ou \"q\" para saír da axuda,\n"
 "  ou \".\" (punto) para ler as páxinas de axuda unha por unha. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "erro ao ler o teclado na axuda"
 
@@ -741,104 +741,104 @@
 "  /               procurar (prema só Intro para cancelar)\n"
 "  \\               repetir a última procura\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Escriba dselect --help para obter axuda."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[A]cceso"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Escolle o método de acceso a empregar."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "Act[U]alizar"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Actualiza a lista de paquetes dispoñíbeis, se é posíbel."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "E[S]coller"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Escolle os paquetes que se queren no sistema."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstalar"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Instala e actualiza os paquetes solicitados."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[C]onfigurar"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Configura os paquetes que non estean configurados."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "e"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[E]liminar"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Elimina o software non desexado."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "s"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[S]aír"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Sae de dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menú"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Interface de xestión de paquetes \"%s\" de Debian versión %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -846,7 +846,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -857,11 +857,11 @@
 "2 ou unha posterior para coñecer as condicións de copia. NON hai garantía.\n"
 "Consulte %s --license para os detalles de copyright e licenza.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -870,7 +870,7 @@
 "Emprego: %s [<opción> ...] [<acción> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -890,7 +890,7 @@
 "                             Configura as cores da pantalla.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -902,7 +902,7 @@
 "  --license                  Mostra a licenza.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -913,56 +913,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Partes da pantalla:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Cores:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atributos:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "non foi posíbel abrir o ficheiro de depuración \"%.255s\"\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s \"%s\" non válido\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "parte da pantalla"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Especificación de cores nula\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "cor"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "atributo de cores"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Semella que o terminal non soporta localización do cursor.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Semella que o terminal non soporta realzado.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -971,11 +971,11 @@
 "Estabeleza correctamente a variábel TERM, empregue un terminal mellor\n"
 "ou empregue a ferramenta de xestión paquete a paquete %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "o terminal non ten características necesarias; sáese"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -988,7 +988,7 @@
 "Móvase con ^P e ^N, as frechas do cursor, letras iniciais ou números;\n"
 "Prema <intro> para confirmar a escolla. ^L volve debuxar a pantalla.\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -998,11 +998,11 @@
 "\n"
 "Acceso de só lectura: só está dispoñíbel a antevisión das escollas."
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "non foi posíbel chamar a getch no menú principal"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "cadea de acción \"%.50s\" descoñecida"
Binary files dpkg/dselect/po/hu.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/hu.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/hu.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/hu.po
--- dpkg/dselect/po/hu.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/hu.po	2012-06-07 10:11:09.426073000 -0700
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2006-10-06 03:48+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"
@@ -22,19 +22,19 @@
 msgid "Error: "
 msgstr "Hiba:"
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Súgó:"
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "A ? súgó menüjét adja, a . lép, a <space> kilép a súgóból."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Az alábbiakról érhető el súgó:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -42,7 +42,7 @@
 "Üss le egy billentyűt a fentiekből, <space> vagy `q' a kilépés,\n"
 "  a `.' egymás után olvassa a súgó lapjait."
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "hiba a billentyűzet olvasásakor a súgóban"
 
@@ -568,106 +568,106 @@
 "  \\                repeat last search\n"
 msgstr ""
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "A dselect --help adja a súgót"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "e"
 
 # MAX  ENNÉL  3-AL !!!!!  TÖBB KARAKTER !
 # - sas
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[E]lérés"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Válassz elérési módot"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "f"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[F]rissítés"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Frissíti az elérhető csomagok listáját, ha lehetséges."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "v"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[V]álasztás"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Csomagok választása"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "t"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[T]elepítés"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Kért csomagok telepítése, frissítése."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "b"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[B]eállítás"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Beállítatlan csomagok beállítása."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "l"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[L]eszedés"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Nem kívánt szoftverek eltávolítása."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "k"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[K]ilépés"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Kilépés a dselect programból."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menü"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s' csomagkezelő felület %s verzió.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -675,7 +675,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -685,18 +685,18 @@
 "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"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -714,7 +714,7 @@
 "  --colour | --color képernyőrész:[előtér],[háttér][:attr[+attr+..]]\n"
 "                             Képernyőszínek beállítása.\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -722,7 +722,7 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -730,56 +730,56 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Képernyőrészek:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Színek:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attribútumok:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "sikertelen `%.255s' hibajavító fájl megnyitás\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Érvénytelen %s `%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "képernyőrész"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "nincs szín megadva\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "szín"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "színattribútum"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Úgy fest, a terminál nem támogatja a kurzorcímzést.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Úgy fest, a terminál nem támogatja a kiemelést.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -788,11 +788,11 @@
 "Javítsd a TERM változót, használj jobb terminált,\n"
 "vagy dolgozz e problémát elkerülő csomagkezelővel: %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "a terminál nem bír a szükséges képességekkel, feladom"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -806,7 +806,7 @@
 "Üss <enter>-t a választás megerősítéséhez. A ^L frissíti a képernyőt.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -816,11 +816,11 @@
 "\n"
 "Csak-olvasható hozzáférésed van: csak a választások előnézete érhető el!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "a főmenü elérése meghiúsult"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "ismeretlen `%.50s' művelet sztring"
Binary files dpkg/dselect/po/id.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/id.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/id.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/id.po
--- dpkg/dselect/po/id.po	2011-06-21 17:25:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/id.po	2012-06-07 10:11:09.426073000 -0700
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\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."
@@ -31,20 +31,20 @@
 msgid "Error: "
 msgstr "Kesalahan:"
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Bantuan:"
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Ketik ? untu menu panduan, . untuk topik selanjutnya, <spasi> untuk keluar."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Informasi panduan tersedia untuk topik-topik berikut ini:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -52,7 +52,7 @@
 "Ketik suatu tombol dari daftar di atas, <spasi> atau `q' untuk keluar,\n"
 "  atau '.' untuk membaca setiap halaman panduan bergantian."
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "ada kesalahan membaca keyboard dalam modus bantuan"
 
@@ -775,104 +775,104 @@
 "   /               cari (cukup tekan enter untuk membatalkan)\n"
 "  \\               ulangi pencarian terakhir\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "ketik 'dselect --help' untuk bantuan."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[A]Akses"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Pilih metode akses yang ingin digunakan."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "p"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[U]Perbaru"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Perbaharui daftar paket yang tersedia bila memungkinkan."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[S]Pilih"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Pilihlah paket yang ingin Anda pasang pada sistem."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "p"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]Pasang"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Pasang dan perbaharui paket-paket yang diinginkan."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[C]Konfigurasi"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Konfigurasi semua paket yang belum dikonfigurasi."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "b"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[R]Buang"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Buang perangkat lunak yang tak diinginkan."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[Q]Keluar"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "keluar dari dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Antarmuka penanganan paket Debian '%s' versi %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -880,7 +880,7 @@
 "Hak Cipta (C)  1994-1996 Ian Jackson.\n"
 "Hak CIpta (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -891,11 +891,11 @@
 "selanjutnya untuk persyaratan penggandaan. TIDAK ADA jaminan. \n"
 "Lihat %s --license keterangan hak cipta dan rincian lisensi.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -904,7 +904,7 @@
 "Penggunaan: %s [<pilihan> ...] [<aksi> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -925,7 +925,7 @@
 "                              Konfigurasi warna layar.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -937,7 +937,7 @@
 "  --license | --licence          Tampilkan lisensi program.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -948,56 +948,56 @@
 "   access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Bagian Layar: \n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Warna: \n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atribut: \n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "tidak dapat membuka berkas debug `%.250s'\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s `%s' tidak sah\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "bagian layar"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "tidak ada spesifikasi warna\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "warna"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "atribut warna"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal tampaknya tidak mendukung pengalamatan cursor.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal tampaknya tidak mendukung penyorotan.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -1006,11 +1006,11 @@
 "Setel variabel TERM Anda dengan benar, gunakan terminal yang lebih baik,\n"
 "atau lakukanlah dengan sarana pengelolaan per-paket %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminal tak memiliki fitur yang diperlukan, menyerah"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -1024,7 +1024,7 @@
 "Tekan <enter> untuk konfirmasi pilihan. ^L untuk menampil ulang layar.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -1034,11 +1034,11 @@
 "\n"
 "Akses hanya-baca: hanya pratilik pilihan yang tersedia!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "gagal melakukan 'getch' dalam menu utama"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "string aksi `%.50s' tidak dikenal"
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/insert-header.sin /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/insert-header.sin
--- dpkg/dselect/po/insert-header.sin	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/insert-header.sin	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,23 @@
+# Sed script that inserts the file called HEADER before the header entry.
+#
+# At each occurrence of a line starting with "msgid ", we execute the following
+# commands. At the first occurrence, insert the file. At the following
+# occurrences, do nothing. The distinction between the first and the following
+# occurrences is achieved by looking at the hold space.
+/^msgid /{
+x
+# Test if the hold space is empty.
+s/m/m/
+ta
+# Yes it was empty. First occurrence. Read the file.
+r HEADER
+# Output the file's contents by reading the next line. But don't lose the
+# current line while doing this.
+g
+N
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
Binary files dpkg/dselect/po/it.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/it.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/it.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/it.po
--- dpkg/dselect/po/it.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/it.po	2012-06-07 10:11:09.426073000 -0700
@@ -2,7 +2,7 @@
 # Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 # Lele Gaifax <lele@seldati.it>, 2000, 2001, 2002, 2003, 2004.
 #
-# Stefano Canepa <sc@linux.it>, 2004 only for an update becouse Lele was
+# Stefano Canepa <sc@linux.it>, 2004 only for an update because Lele was
 # unreachable and translation needed to be updated
 #
 # Stefano Canepa <sc@linux.it>, 2005.
@@ -43,7 +43,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.10.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\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"
@@ -60,19 +60,19 @@
 msgid "Error: "
 msgstr "Errore: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Aiuto: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "Premi ? per menu aiuto, . prossimo argomento, <spazio> per uscire."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Sono disponibili informazioni di aiuto sui seguenti argomenti:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -80,7 +80,7 @@
 "Premi un tasto della lista sopra, <spazio> o 'q' per uscire dall'aiuto,\n"
 "  o '.' (punto) per leggere ogni pagina di aiuto in sequenza. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "errore di lettura della tastiera nell'aiuto"
 
@@ -792,104 +792,104 @@
 "  /                cerca (basta un Invio per annullarla)\n"
 "  \\                ripeti l'ultima ricerca\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Esegui dselect --help per un aiuto."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "m"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[M]etodo"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Scegli il metodo di accesso da usare."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[A]ggiorna"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Aggiorna, se possibile, l'elenco dei pacchetti disponibili."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[S]eleziona"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Scegli quali pacchetti vuoi nel tuo sistema."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstalla"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Installa ed aggiorna i pacchetti scelti."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[C]onfigura"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Configura tutti i pacchetti ancora da configurare."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[R]imuovi"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Rimuovi il software non voluto."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "t"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[T]ermina"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Esci da dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menù"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s' interfaccia per la gestione dei pacchetti versione %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -897,7 +897,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -907,11 +907,11 @@
 "o successiva per le condizioni di copia. NON c'è alcuna garanzia.\n"
 "Si veda %s --license per il copyright e i dettagli della licenza.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -920,7 +920,7 @@
 "Uso: %s [<opzione> ...] [<azione> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -940,7 +940,7 @@
 "                             Configura i colori dello schermo.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -952,7 +952,7 @@
 "  --license | --licence      Mostra la licenza.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -963,57 +963,57 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Settori schermata:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Colori:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attributi:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "impossibile aprire il file di debug `%.255s'\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Elemento non valido per tabella %s: '%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "settore schermata"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Specificato un colore nullo\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "colore"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "attributo colore"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr ""
 "Il terminale non sembra in grado di gestire il posizionamento del cursore.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Il terminale non sembra in grado di gestire l'evidenziazione.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -1022,11 +1022,11 @@
 "Imposta correttamente la variabile TERM, utilizza un terminale migliore,\n"
 "oppure usa lo strumento di base per la gestione dei pacchetti %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "il terminale manca delle funzionalità necessarie, lascio perdere"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -1041,7 +1041,7 @@
 "Premi <invio> per confermare la selezione.   ^L ridisegna la schermata.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -1051,11 +1051,11 @@
 "\n"
 "Accesso in sola lettura: è possibile solo visionare le selezioni!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "impossibile eseguire getch nel menù principale"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "stringa di azione sconosciuta `%.50s'"
Binary files dpkg/dselect/po/ja.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ja.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/ja.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ja.po
--- dpkg/dselect/po/ja.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ja.po	2012-06-07 10:11:09.426073000 -0700
@@ -19,7 +19,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\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"
@@ -36,19 +36,19 @@
 msgid "Error: "
 msgstr "エラー: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "ヘルプ: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "ヘルプメニュー:?, 次のトピック:., ヘルプの終了:<スペース>"
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "以下のトピックからヘルプ情報を利用できます:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -56,7 +56,7 @@
 "上のリストからキーを入力してください。<space>、`q' でヘルプを終了します。\n"
 "または <.> でヘルプページを順次見ていくことができます。"
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "ヘルプのキーボード読み込みエラーです"
 
@@ -726,104 +726,104 @@
 "  /                検索 (リターンキーでキャンセル)\n"
 "  \\                検索次候補\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "ヘルプは dselect --help で参照できます。"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "アクセス(a)"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "使用するアクセス方法を選択する。"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "更新(u)"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "可能なら取得可能パッケージ一覧を更新する。"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "選択(s)"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "システムにインストールしたいパッケージを選択する。"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "導入(i)"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "要求したパッケージのインストール・更新を行う。"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "設定(c)"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "未設定のパッケージを設定する。"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "削除(r)"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "不必要なソフトを削除する。"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "終了(q)"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "dselect を終了する。"
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "メニュー"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s' パッケージ管理フロントエンド バージョン %s。\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -831,7 +831,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -842,18 +842,18 @@
 "2 もしくはそれ以降を参照してください。このソフトウェアは無保証です。\n"
 "コピーライトおよびライセンスの詳細は %s --licence を参照してください。\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
 msgstr "使い方: %s [<オプション> ...] [<アクション> ...]\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -873,7 +873,7 @@
 "                             画面の色を設定する\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -885,7 +885,7 @@
 "  --license | --licence      ライセンスを表示\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -896,56 +896,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "画面部:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "色:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "属性:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "デバッグファイル `%.250s' をオープンできませんでした\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "無効な %s `%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "画面部"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "色の指定が空です\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "色"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "色属性"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "端末がカーソル割り付けをサポートしていません。\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "端末がハイライトをサポートしていません。\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -954,11 +954,11 @@
 "TERM 環境変数を正しく設定してください。高機能な端末を使用するか、\n"
 "もしくはパッケージごとの管理ツール %s を使用しましょう。\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "必要とする機能がこの端末にはありません。終了します"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -972,7 +972,7 @@
 "リターンキーで選択項目を決定します。^L で画面を再描画します。\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -982,11 +982,11 @@
 "\n"
 "リードオンリーアクセス: 選択プレビューのみ利用できます!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "メインメニューでの getch に失敗しました"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不明なアクション文字列 `%.50s' です"
Binary files dpkg/dselect/po/ko.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ko.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/ko.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ko.po
--- dpkg/dselect/po/ko.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ko.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2007-09-16 22:55-0400\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -24,20 +24,20 @@
 msgid "Error: "
 msgstr "오류: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "도움말: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "도움말 메뉴는 ?, 다음 주제는 ., 도움말에서 나가시려면 <space>를 누르십시오."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "다음 주제에 대한 도움말 정보가 있습니다:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -45,7 +45,7 @@
 "위의 목록에 따라 키를 누르십시오. 도움말을 나가려면 <space>나 q를,\n"
 "  각 도움말 페이지를 순서대로 읽으려면 . 키를 누르십시오."
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "도움말에서 키보드를 읽는 데 오류가 발생했습니다"
 
@@ -716,104 +716,104 @@
 "  /                찾기 (취소하려면 그냥 Return을 누르십시오)\n"
 "  \\                마지막 찾기 반복\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "도움말이 필요하면 dselect --help를 실행하십시오."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "설치방법(A)"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "설치 방법을 선택합니다."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "업데이트(U)"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "이용 가능한 꾸러미 목록을 업데이트합니다."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "선택(S)"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "시스템에 설치하려는 꾸러미를 선택합니다."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "설치(I)"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "선택한 꾸러미를 설치하고 업그레이드합니다."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "설정(C)"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "설정하지 않은 꾸러미를 설정합니다."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "지우기(R)"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "원하지 않는 꾸러미를 지웁니다."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "끝내기(Q)"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "dselect를 끝냅니다."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "메뉴"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "데비안 `%s' 꾸러미 처리 프론트엔드 버전 %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -821,7 +821,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -831,11 +831,11 @@
 "version 2이상을 보십시오. 어떤 보증도 하지 않습니다.\n"
 "저작권 관련 정보를 보려면 %s --licence를 참고하십시오.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -844,7 +844,7 @@
 "사용법: %s [<option> ...] [<action> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -863,7 +863,7 @@
 "                             화면색 설정.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -875,7 +875,7 @@
 "  --license | --licence      저작권 관련 정보를 봄.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -886,56 +886,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "화면 구성 요소:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "색:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "속성:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "디버그 파일 `%.255s'을(를) 열 수 없습니다\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "올바르지 않은 %s `%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "화면 구성 요소"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "색 지정이 없습니다\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "색"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "색 속성"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "터미널이 커서 주소 지정을 지원하지 않는 것 같습니다.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "터미널이 반전을 지원하지 않는 것 같습니다.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -944,11 +944,11 @@
 "TERM 변수를 정확히 설정하든지 더 나은 터미널을 사용하든지,\n"
 "각 꾸러미 별로 개별적인 관리 도구 %s 이용하십시오.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "터미널에 필수적인 기능이 빠져 있습니다. 그만둡니다."
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -962,7 +962,7 @@
 "선택한 항목으로 들어가려면 <enter> 키를 누르십시오.   ^L은 화면을 다시 그립니"
 "다.\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -972,11 +972,11 @@
 "\n"
 "읽기 전용 접근: 선택된 사항을 미리 보는 것만 가능합니다!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "주 메뉴에서 getch가 실패했습니다"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "알 수 없는 명령 문자열 `%.50s'"
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/Makefile.in.in /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/Makefile.in.in
--- dpkg/dselect/po/Makefile.in.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/Makefile.in.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,444 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.18
+GETTEXT_MACRO_VERSION = 0.18
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+SHELL = /bin/sh
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+localedir = @localedir@
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+	@echo "$(MSGFMT) -c -o $@ $<"; \
+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+	@lang=`echo $* | sed -e 's,.*/,,'`; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
+
+
+all: check-macro-version all-@USE_NLS@
+
+all-yes: stamp-po
+all-no:
+
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+check-macro-version:
+	@test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+	       exit 1; \
+	     }
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+	  package_gnu='GNU '; \
+	else \
+	  package_gnu=''; \
+	fi; \
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
+	case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	  '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	  *) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --package-name="$${package_gnu}@PACKAGE@" \
+	      --package-version='@VERSION@' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	esac
+	test ! -f $(DOMAIN).po || { \
+	  if test -f $(srcdir)/$(DOMAIN).pot; then \
+	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+	    else \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	    fi; \
+	  else \
+	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	  fi; \
+	}
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+	$(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) \
+	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	           '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+	           *) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+	         esac; \
+	       }; \
+	else \
+	  $(MAKE) $${lang}.po-create; \
+	fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    $(INSTALL_DATA) $(srcdir)/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  for file in Makevars; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+install-data-no: all
+install-data-yes: all
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
+	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+	    fi; \
+	  done; \
+	done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	  : ; \
+	fi
+installdirs-data-no:
+installdirs-data-yes:
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	    fi; \
+	  done; \
+	done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+uninstall-data-no:
+uninstall-data-yes:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	  done; \
+	done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+	rm -f remove-potcdate.sed
+	rm -f stamp-poT
+	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+	rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+	$(MAKE) update-po
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  dists="$$dists Makevars.template"; \
+	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
+	if test -f $(srcdir)/ChangeLog; then \
+	  dists="$$dists ChangeLog"; \
+	fi; \
+	for i in 0 1 2 3 4 5 6 7 8 9; do \
+	  if test -f $(srcdir)/ChangeLog.$$i; then \
+	    dists="$$dists ChangeLog.$$i"; \
+	  fi; \
+	done; \
+	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+	for file in $$dists; do \
+	  if test -f $$file; then \
+	    cp -p $$file $(distdir) || exit 1; \
+	  else \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+	  fi; \
+	done
+
+update-po: Makefile
+	$(MAKE) $(DOMAIN).pot-update
+	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+	$(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+	exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	cd $(srcdir); \
+	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	       '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	       *) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	     esac; \
+	   }; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "msgmerge for $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+	@:
+
+# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
+# because execution permission bits may not work on the current file system.
+# Use @SHELL@, which is the shell determined by autoconf for the use by its
+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+	cd $(top_builddir) \
+	  && @SHELL@ ./config.status $(subdir)/$@.in po-directories
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Binary files dpkg/dselect/po/nb.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/nb.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/nb.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/nb.po
--- dpkg/dselect/po/nb.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/nb.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-09-02 23:01+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -26,21 +26,21 @@
 msgid "Error: "
 msgstr "Feil: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Hjelp: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Trykk ? for å vise hjelpemenyen, . for neste emne, <mellomrom> for å "
 "avslutte hjelp."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Hjelp for følgende emner er tilgjengelig:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -48,7 +48,7 @@
 "Trykk en tast fra lista over, <mellomrom> eller «q» for å avslutte hjelp,\n"
 "  eller «.» (punktum) for å lese hver hjelpeside etter hverandre. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "feil ved lesing av tastatur i hjelp"
 
@@ -727,104 +727,104 @@
 "  /                søk (bruk Enter til å avbryte med en gang)\n"
 "  \\                siste søk om igjen\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Skriv «dselect --help» for hjelp."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "t"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[T]ilgang"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Velg tilgangsmetoden som skal brukes."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "o"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[O]ppdater"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Oppdater liste over tilgjengelige pakker, hvis mulig."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "v"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[V]elg"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Be om de pakkene du vil ha på systemet."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstaller"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Installer og oppgrader de valgte pakkene."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "s"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[S]ett opp"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Sett opp pakker som ikke er satt opp."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "f"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[F]jern"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Fjern uønskede programmer."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "a"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[A]vslutt"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Avslutter dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "meny"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian «%s» brukergrensesnitt for pakkehåndtering versjon %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -832,7 +832,7 @@
 "Opphavsrett (C) 1994-1996 Ian Jackson.\n"
 "Opphavsrett (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -840,11 +840,11 @@
 "Dette er fri programvare. Du finner kopieringsvilkårene i\n"
 "GNU General Public License versjon 2 eller nyere. Det finnes INGEN garanti.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr "<standard utdata>"
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -853,7 +853,7 @@
 "Bruk: %s [<valg> ...] [<handling> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -872,7 +872,7 @@
 "                             Sett opp skjermfarger.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -883,7 +883,7 @@
 "  --version                  viser versjonsnummeret.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -894,56 +894,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Skjermdeler:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Farger:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attributter:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "klarte ikke åpne avlusingsfil `%.255s'\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Ugyldig %s `%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "skjermdel"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Ingen fargespesifikasjon\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "farge"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "fargeattributt"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminalen ser ikke ut til å støtte markøradressering.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminalen ser ikke ut til å støtte utheving.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -952,11 +952,11 @@
 "Sett TERM-variabelen riktig, bruk en bedre terminal eller \n"
 "du får klare deg med håndteringsverktøyet %s for hver pakke.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalen mangler nødvendige funksjoner, gir opp"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -971,7 +971,7 @@
 "Trykk <enter> for å bekrefte utvalget.   ^L tegner skjermen på nytt.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -981,11 +981,11 @@
 "\n"
 "Skrivebeskyttet tilgang: bare forhåndsvisning av utvalg er tilgjengelig!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "klarte ikke bruke «getch» i hovedmenyen"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "ukjent handlingsstreng `%.50s'"
Binary files dpkg/dselect/po/nl.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/nl.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/nl.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/nl.po
--- dpkg/dselect/po/nl.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/nl.po	2012-06-07 10:11:09.426073000 -0700
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.9.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2008-05-05 13:20+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"
@@ -20,21 +20,21 @@
 msgid "Error: "
 msgstr "Fout: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Hulp: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 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."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Hulp informatie is beschikbaar onder te volgende onderwerpen:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -43,7 +43,7 @@
 "sluiten,\n"
 "  of `.' (punt) om alle pagina's een voor een te lezen. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "fout bij lezen van toetsenbord in hulp"
 
@@ -737,104 +737,104 @@
 "  /                   zoeken (alleen enter voor annuleren)\n"
 "  \\                  laatste zoekopdracht herhalen\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Type dselect --help voor hulp."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "t"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[T]oegang"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Kies een toegangsmethode."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "b"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[B]ijwerken"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Werk de lijst met pakketten bij, indien mogelijk."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[S]electeer"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Vertel welke pakketten u op uw systeem wilt."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstalleren"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Installeer pakketten of werk gewenste pakketten bij."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[C]onfigureren"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Configureer pakketten die nog niet geconfigureerd zijn."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "v"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[V]erwijderen"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Verwijder ongewenste programmatuur."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "e"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[E]inde"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "dselect afsluiten."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s' pakketbeheer-frontend versie %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -842,7 +842,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -852,11 +852,11 @@
 "of later voor kopiëervoorwaarden.  Er is GEEN garantie.\n"
 "Zie %s --license voor auteursrechten en licentiedetails.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -865,7 +865,7 @@
 "Gebruik: %s [<optie> ...] [<actie> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -885,7 +885,7 @@
 "                                     Stel schermkleuren in.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -897,7 +897,7 @@
 "  --license | --licence  Toon de licentie.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -908,56 +908,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Schermdelen:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Kleuren:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attributes:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "kon debugbestand `%.255s' niet openen\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Ongeldige %s '%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "schermdeel"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Blanco-kleur specificatie\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "kleur"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "kleurattribuut"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal lijkt de cursor niet te kunnen besturen.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal lijkt oplichten niet te ondersteunen.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -966,11 +966,11 @@
 "Zet uw TERM variabele goed, gebruik een betere terminal,\n"
 "of doe het met de per-pakket-beheertool %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminal kan essentiële ... niet aan, er wordt opgegeven"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -984,7 +984,7 @@
 "Druk op <enter> om selectie te activeren.  ^L tekent het scherm opnieuw.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -994,11 +994,11 @@
 "\n"
 "Toegang is alleen lezen: de selecties worden niet bewaard!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "getch in hoofdmenu is mislukt"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "onbekend actiewoord `%.50s'"
Binary files dpkg/dselect/po/nn.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/nn.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/nn.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/nn.po
--- dpkg/dselect/po/nn.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/nn.po	2012-06-07 10:11:09.426073000 -0700
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: debconf_nn\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\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"
@@ -29,21 +29,21 @@
 msgid "Error: "
 msgstr "Feil: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Hjelp: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Trykk ? for å visa hjelpemeny, «.» for neste emne, <mellomrom> for å "
 "avslutta hjelpa."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Hjelp for følgjande emne er tilgjengeleg:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -51,7 +51,7 @@
 "Trykk ein tast frå lista over, <mellomrom> eller «q» for å avslutta hjelp.\n"
 "  eller «.» for å lese kvar hjelpeside etter kvarandre. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "feil ved lesing av tastatur i hjelp"
 
@@ -726,110 +726,110 @@
 "  /                søk (bruk Enter til å avbryta med ein gong)\n"
 "  \\                siste søk om att\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Skriv «dselect --help» for hjelp."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "t"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[T]ilgang"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Vel tilgangsmetoden som skal brukast"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "o"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[O]ppdater"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Oppdater liste over tilgjengelege pakkar, viss mogeleg."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "v"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[V]el"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Be om dei pakkane du vil ha på systemet."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstaller"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Installer og oppgrader dei valde pakkane."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "s"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[S]et opp"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Set opp pakkar som ikkje er sett opp."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "f"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[F]jern"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Fjern uønskte program."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "a"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[A]vslutt"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Avsluttar dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "meny"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, fuzzy, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s', brukargrensesnitt for pakkehandtering."
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 msgstr ""
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -839,18 +839,18 @@
 "GNU General Public License versjon 2 eller nyare. Det finst INGEN garanti.\n"
 "Sjå «dpkg-deb --licence» for detaljar.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -862,7 +862,7 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -870,7 +870,7 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -878,56 +878,56 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Skjermdelar:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Fargar:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attributtar:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "klarte ikkje opna avlusingsfil `%.255s'\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Ugyldig %s `%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "skjermdel"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Ingen fargespesifikasjon\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "farge"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "fargeattributt"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminalen ser ikkje ut til å støtta markøradressering.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminalen ser ikkje ut til å støtta utheving.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, fuzzy, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -936,11 +936,11 @@
 "Set TERM-variabelen rett, bruk ein betre terminal eller \n"
 "du lyt klare deg med handteringsverktøyet for kvar pakke "
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalen manglar nødvendige funksjonar, gjev opp"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -955,7 +955,7 @@
 "Trykk <enter> for å stadfesta utvalet.   ^L teiknar skjermen på ny.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -965,11 +965,11 @@
 "\n"
 "Skriveverna tilgang: berre førehandsvising av utval er tilgjengeleg!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "klarte ikkje bruka «getch» i hovedmenyen"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "ukjent handlingsstreng `%.50s'"
Binary files dpkg/dselect/po/pl.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/pl.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/pl.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/pl.po
--- dpkg/dselect/po/pl.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/pl.po	2012-06-07 10:11:09.426073000 -0700
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2009-09-27 02:41+0100\n"
 "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -30,21 +30,21 @@
 msgid "Error: "
 msgstr "Błąd: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Pomoc: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Naciśnij ?, by skorzystać z pomocy, . (kropkę), by przejść do następnego\n"
 "tematu, <spację>, by opuścić pomoc."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Informacje pomocy są dostępne pod następującymi tematami:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -52,7 +52,7 @@
 "Wybierz klawisz z powyższej listy, <spację> lub \"q\", by opuścić \n"
 "pomoc, lub \".\" (kropkę), by przeglądać po kolei strony pomocy. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "błąd odczytu klawiatury w pomocy"
 
@@ -736,104 +736,104 @@
 "  /                wyszukiwanie (return - anulowanie)\n"
 "  \\                powtórzenie ostatniego wyszukiwania\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Wpisz dselect --help aby otrzymać pomoc."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[A] Dostęp"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Wybór metody dostępu."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[U] Aktualizacja"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Zaktualizowanie informacji o dostępnych pakietach."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[S] Wybór"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Wybór pakietów instalowanych w systemie."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I] Instalacja"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Instalacja i uaktualnienie wybranych pakietów."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[C] Konfiguracja"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Konfiguracja pakietów, które pozostały nieskonfigurowane."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[R] Usuwanie"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Usuwanie niechcianych pakietów."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[Q] Wyjście"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Wyjście z dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian \"%s\", nakładka na program zarządzania pakietami, wersja %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -841,7 +841,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -853,11 +853,11 @@
 "Brak JAKIEJKOLWIEK gwarancji.\n"
 "Więcej szczegółów w %s --license.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr "<standardowe wyjście>"
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -866,7 +866,7 @@
 "Użycie: %s [<opcja> ...] [<akcja> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -885,7 +885,7 @@
 "                             Konfiguruje kolory ekranu.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -897,7 +897,7 @@
 "  --license                  Wyświetla informacje o licencji.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -908,56 +908,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Części widoku:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Kolory:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atrybuty:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "nie można otworzyć pliku debuggera \"%.255s\"\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Nieprawidłowy %s \"%s\"\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "część widoku"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Pusta specyfikacja koloru\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "kolor"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "atrybuty koloru"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal nie obsługuje adresowania kursora.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal nie obsługuje podświetlania.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -966,11 +966,11 @@
 "Proszę poprawnie ustawić zmienną TERM, użyć lepszego terminala,\n"
 "lub wykorzystać narzędzie do zarządzania pakietami %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "brak potrzebnych funkcji terminala, przerywanie"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -984,7 +984,7 @@
 "Wciśnij <enter> aby potwierdzić wybór.  ^L - odświeżenie ekranu.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -994,11 +994,11 @@
 "\n"
 "Tryb tylko do odczytu: można jedynie przeglądać listę pakietów!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "nie można wywołać \"getch\" w głównym menu"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "nieznane działanie \"%.50s\""
Binary files dpkg/dselect/po/poo.mo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/poo.mo differ
Binary files dpkg/dselect/po/pt_BR.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/pt_BR.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/pt_BR.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/pt_BR.po
--- dpkg/dselect/po/pt_BR.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/pt_BR.po	2012-06-07 10:11:09.426073000 -0700
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2008-06-09 02:53-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -29,21 +29,21 @@
 msgid "Error: "
 msgstr "Erro: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Ajuda: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Pressione ? para o menu de ajuda, . para o próximo tópico, <espaço> para "
 "sair da ajuda."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Informações de ajuda estão disponíveis nos seguintes tópicos:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -52,7 +52,7 @@
 "  sair da ajuda, ou '.' (ponto final) para ler uma página de\n"
 "  ajuda por vez. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "erro lendo teclado na ajuda"
 
@@ -742,104 +742,104 @@
 "  /                procura (enter para cancelar)\n"
 "  \\                repetir última busca\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Digite dselect --help para ajuda."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[A]cesso"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Escolher o método de acesso a usar."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[U]pdate"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Atualizar lista de pacotes disponíveis, se possível."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[S]elecionar"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Solicita quais pacotes você quer em seu sistema."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstalar"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Instalar e atualizar pacotes desejados."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[C]onfigurar"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Configurar quaisquer pacotes que estejam desconfigurados."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[R]emover"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Remover programas indesejados."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[Q]Sair"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Sair do dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Interface do gerenciador de pacotes do Debian '%s' versão %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -847,7 +847,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -858,11 +858,11 @@
 "NENHUMA garantia.\n"
 "Veja %s --license para detalhes de copyright e licença.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -871,7 +871,7 @@
 "Uso: %s [<opções> ...] [<ação> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -890,7 +890,7 @@
 "                             Configura cores da tela.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -902,7 +902,7 @@
 "  --license | --licence      Mostra a licença.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -913,56 +913,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Partes da tela:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Cores:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atributos:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "não foi possível abrir arquivo de depuração '%.250s'\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s inválido '%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "parte da tela"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Especificação de cor nula\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "cor"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "atributo cor"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal não parece dar suporte ao endereçamento de cursor.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal não parece dar suporte ao realce (\"highlighting\").\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -971,11 +971,11 @@
 "Defina sua variável TERM corretamente, use um terminal melhor,\n"
 "ou faça com a ferramenta de gerenciamento por-pacote %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminal não possui alguns recursos necessários, desistindo"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -988,7 +988,7 @@
 "Mova-se com ^P e ^N, teclas direcionais, letras iniciais, ou dígitos;\n"
 "Pressione <enter> para confirmar a seleção.   ^L redesenha a tela.\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -999,11 +999,11 @@
 "Acesso somente-leitura: apenas a pré-visualização das seleções está "
 "disponível!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "falhou ao executar \"getch\" no menu principal"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "string de ação desconhecida '%.50s'"
Binary files dpkg/dselect/po/pt.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/pt.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/pt.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/pt.po
--- dpkg/dselect/po/pt.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/pt.po	2012-06-07 10:11:09.426073000 -0700
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2008-12-27 16:05+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -23,20 +23,20 @@
 msgid "Error: "
 msgstr "Erro: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Ajuda: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 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."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Informação de ajuda está disponível sob os seguintes tópicos:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -44,7 +44,7 @@
 "Carregue numa tecla da lista acima, <espaço> ou `q' para sair da ajuda,\n"
 "  ou `.' (ponto final) para ler de cada vez uma página de ajuda."
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "erro lendo o teclado na ajuda"
 
@@ -727,104 +727,104 @@
 "  /               procurar (enter para cancelar)\n"
 "  \\               repetir última busca\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Escreva dselect --help para ajuda."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[A]cesso"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Escolha o método a utilizar."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "Act[U]alizar"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Actualizar a lista de pacotes disponíveis, se possível."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[S]eleccionar"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Solicite quais pacotes quer no seu sistema."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstalar"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Instalar e actualizar os pacotes desejados."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[C]onfig"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Configura pacotes ainda não configurados."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[R]emover"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Remover software não desejado"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[Q] Sair"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Sair do dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Frontend de gestão de pacotes Debian `%s' versão %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -832,7 +832,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -842,11 +842,11 @@
 "posterior para condições de cópia. Não existe NENHUMA garantia.\n"
 "Veja %s --license para detalhes de copyright e licença.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -855,7 +855,7 @@
 "Utilização: %s [<opção> ...] [<acção> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -875,7 +875,7 @@
 "                             Configurar as cores do ecrã.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -887,7 +887,7 @@
 "  --license | --licence      Mostrar a licença.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -898,56 +898,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Screenparts:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Cores:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atributos:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "não pode abrir ficheiro de debug `%.255s'\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s inválido `%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "screen part"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Especificação de cor nula\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "cor"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "atributo de cor"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "O terminal não parece suportar endereçamento do cursor.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "O terminal não parece suportar highlighting\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -956,11 +956,11 @@
 "Defina correctamente a veriável TERM, utilize um terminal melhor,\n"
 "ou faça-o com a ferramente de gestão por pacote %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "o terminal carece de funcionalidades necessárias, desistindo"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -973,7 +973,7 @@
 "Mova-se com ^P e ^N, teclas de cursor, letras iniciais, ou digitos;\n"
 "Carregue em <enter> para confirmar a selecção.   ^L re-desenha o ecrã.\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -983,11 +983,11 @@
 "\n"
 "Acesso apenas de leitura: só está disponível a visualização!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "falhou o getch no menu principal"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "string de acção desconhecida `%.50s'"
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/quot.sed /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/quot.sed
--- dpkg/dselect/po/quot.sed	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/quot.sed	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,6 @@
+s/"\([^"]*\)"/“\1”/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“”/""/g
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/remove-potcdate.sin /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/remove-potcdate.sin
--- dpkg/dselect/po/remove-potcdate.sin	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/remove-potcdate.sin	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,19 @@
+# Sed script that remove the POT-Creation-Date line in the header entry
+# from a POT file.
+#
+# The distinction between the first and the following occurrences of the
+# pattern is achieved by looking at the hold space.
+/^"POT-Creation-Date: .*"$/{
+x
+# Test if the hold space is empty.
+s/P/P/
+ta
+# Yes it was empty. First occurrence. Remove the line.
+g
+d
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
Binary files dpkg/dselect/po/ro.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ro.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/ro.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ro.po
--- dpkg/dselect/po/ro.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ro.po	2012-06-07 10:11:09.426073000 -0700
@@ -18,7 +18,7 @@
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2008-06-28 19:11+0300\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -39,21 +39,21 @@
 msgid "Error: "
 msgstr "Eroare: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Ajutor: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Apăsați ? pentru meniul ajutor, . pentru următorul subiect, <spațiu> pentru "
 "ieșire."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Informații ajutătoare sunt disponibile pentru următoarele subiecte:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -62,7 +62,7 @@
 "ajutor,\n"
 "  sau  „.” (oprire totală) pentru a citi fiecare pagină de ajutor. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "eroare citire tastatură în ajutor"
 
@@ -762,105 +762,105 @@
 "  /                căutare (enter pentru renunțare)\n"
 "  \\                repetă ultima căutare\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Tastați dselect --help pentru ajutor."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[A]cces"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Alegeți metoda de acces folosită."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "Act[u]alizare"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Actualizează lista pachetelor disponibile, dacă este posibil."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[S]elecție"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Cereți pachetele pe care le doriți în sistemul dvs."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstalare"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Instalează și actualizează pachetele dorite."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[C]onfigurare"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Configurează orice pachet neconfigurat."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "Îndepă[R]tare"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Îndepărtează programele nedorite."
 
 # semnifică tasta care trebuie apăsată, poate fi schimbată dar trebuie să verificăm conflictele
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "Ieșire [q]"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Ieșire din dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "meniu"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Interfață de manipulare a pachetelor Debian „%s”, versiunea %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -868,7 +868,7 @@
 "Drepturi de autor (C) 1994-1996 Ian Jackson.\n"
 "Drepturi de autor (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -878,11 +878,11 @@
 "ulterioară pentru condițiile de copiere. NU există NICI o garanție.\n"
 "Vezi %s --licence pentru detalii de licențiere și condiții de copiere.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -891,7 +891,7 @@
 "Utilizare: %s [<opțiune> ...] [<acțiune> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -910,7 +910,7 @@
 "  --colour | --color parteecran:[prim plan],[fundal][:atrib[+atrib+..]]\n"
 "                             Configurează culorile ecranului.\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -922,7 +922,7 @@
 "  --license | --licence      Afișează licența.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -933,56 +933,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Componente ecran:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Culori:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atribute:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "nu pot deschide fișierul de depanare „%.255s”\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Invalid %s „%s”\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "parte ecran"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Lipsă specificație de culoare\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "culoare"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "atribut culoare"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminalul nu pare să suporte adresare la nivel de cursor.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminalul nu pare să suporte evidențiere.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -991,11 +991,11 @@
 "Inițializați corect variabila de mediu TERM, folosiți un terminal mai bun,\n"
 "sau faceți asta cu programul de management per pachet %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalul nu suportă cerințele necesare, abandonez"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -1009,7 +1009,7 @@
 "Apăsați <enter> pentru confirmarea selecției.  ^L redesenează ecranul.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -1019,11 +1019,11 @@
 "\n"
 "Acces doar în citire: este disponibilă doar vizualizarea selecțiilor!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "eșec în getch în meniul principal"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "șir acțiune necunoscut „%.50s”"
Binary files dpkg/dselect/po/ru.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ru.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/Rules-quot /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/Rules-quot
--- dpkg/dselect/po/Rules-quot	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/Rules-quot	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,47 @@
+# Special Makefile rules for English message catalogs with quotation marks.
+
+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
+
+.SUFFIXES: .insert-header .po-update-en
+
+en@quot.po-create:
+	$(MAKE) en@quot.po-update
+en@boldquot.po-create:
+	$(MAKE) en@boldquot.po-update
+
+en@quot.po-update: en@quot.po-update-en
+en@boldquot.po-update: en@boldquot.po-update-en
+
+.insert-header.po-update-en:
+	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	ll=`echo $$lang | sed -e 's/@.*//'`; \
+	LC_ALL=C; export LC_ALL; \
+	cd $(srcdir); \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "creation of $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+en@quot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
+
+en@boldquot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
+
+mostlyclean: mostlyclean-quot
+mostlyclean-quot:
+	rm -f *.insert-header
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/ru.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ru.po
--- dpkg/dselect/po/ru.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/ru.po	2012-06-07 10:11:09.426073000 -0700
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.15.7.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-04-25 22:37+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -29,21 +29,21 @@
 msgid "Error: "
 msgstr "Ошибка: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Справка: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Нажмите ? для перехода в меню справки, . для перехода к следующей теме, "
 "<space> для выхода из справки"
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Доступна справочная информация по следующим темам:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -51,7 +51,7 @@
 "Нажмите одну из вышеперечисленных клавиш, <space> или `q' для выхода\n"
 "или `.' (точка) для последовательного просмотра страниц. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "ошибка ввода с клавиатуры в справке"
 
@@ -744,104 +744,104 @@
 "  /                поиск (ввод для отмены)\n"
 "  \\                повторить последний поиск\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Чтобы получить справку, введите dselect --help."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[A] Метод"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Выбор метода установки."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[U] Обновить"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Обновление списка доступных пакетов."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[S] Выбрать"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Выбор набора пакетов для установки, обновления и удаления."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I] Установить"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Установка и обновление пакетов."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[C] Настроить"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Настройка ещё не настроенных пакетов."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[R] Удалить"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Удаление ненужных пакетов."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[Q] Выход"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Выход из программы."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "меню"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Интерфейс управления пакетами Debian `%s', версия %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -849,7 +849,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -858,11 +858,11 @@
 "Универсальной общественной лицензии GNU версии 2 или более поздней.\n"
 "НИКАКИЕ гарантии не предоставляются.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr "<стандартный вывод>"
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -871,7 +871,7 @@
 "Использование: %s [<параметр> ...] [<действие> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -891,7 +891,7 @@
 "                             Настроить цвета экрана.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -902,7 +902,7 @@
 "  --version                  Показать версию.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -913,56 +913,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Секторы экрана:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Цвета:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Атрибуты:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "не удалось открыть отладочный файл `%.255s'\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Некорректный %s `%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "сектор экрана"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Задающие цвет значения пусты\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "цвет"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "атрибут цвета"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Терминал не поддерживает позиционирование курсора.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Терминал не поддерживает подсветку.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -971,11 +971,11 @@
 "Задайте верное значение переменной TERM, используйте более функциональный\n"
 "терминал или используйте программу управления отдельными пакетами %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "у терминала отсутствуют необходимые возможности, останов"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -990,7 +990,7 @@
 "Нажмите ввод для выбора действия.  ^L -- перерисовать экран.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -1000,11 +1000,11 @@
 "\n"
 "Доступ только для чтения: доступен только просмотр состояния пакетов!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "ожидание нажатия клавиши в главном меню завершилось неудачно"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "неизвестное действие `%.50s'"
Binary files dpkg/dselect/po/sk.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/sk.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/sk.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/sk.po
--- dpkg/dselect/po/sk.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/sk.po	2012-06-07 10:11:09.426073000 -0700
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2009-07-20 17:32+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -27,21 +27,21 @@
 msgid "Error: "
 msgstr "Chyba: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Pomocník: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Menu pomocníka zobrazíte stlačením ?, ďalšiu tému ., Pomocníka ukončíte "
 "<medzerník>."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Pomocník je dostupný pre nasledujúce témy: "
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -50,7 +50,7 @@
 "Pomocníka,\n"
 "  alebo „.“ (bodka) na postupné čítanie všetkých stránok Pomocníka."
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "chyba pri čítaní klávesnice v Pomocníkovi"
 
@@ -743,104 +743,104 @@
 "  /                vyhľadanie (stlačením Enter zrušíte operáciu)\n"
 "  \\               zopakuje posledné hľadanie\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Pomocníka vyvoláte príkazom „dselect --help“."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "p"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[P]rístup"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Vyberte si prístupovú metódu."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[A]ktualizácia"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Aktualizujte zoznam dostupných balíkov, ak je to možné."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "v"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[V]ýber "
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Vyžiadajte, ktoré balíky chcete vo vašom systéme."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "n"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[N]ainštalovať"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Nainštalovať a aktualizovať požadované balíky."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "k"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[K]onfigurovať"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Konfigurovať všetky nenakonfigurované balíky."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "o"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[O]dstrániť"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Odstrániť nechcený softvér."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "u"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[U]končiť"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Ukončiť dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian „%s“ - rozhranie na správu balíkov, verzia %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -848,7 +848,7 @@
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -859,11 +859,11 @@
 "Neposkytuje sa ŽIADNA záruka. Pomocou %s --licence získate\n"
 "podrobnosti o autorských právach a licencii.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -872,7 +872,7 @@
 "Použitie: %s [<voľba> ...] [<operácia> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -892,7 +892,7 @@
 "                               Nastaví farby obrazovky.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -904,7 +904,7 @@
 "  --license | --licence        Zobrazí licenciu.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -915,56 +915,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Časti obrazovky:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Farby:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Vlastnosti:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "nebolo možné otvoriť ladiaci súbor „%.255s“\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Nesprávny %s „%s“\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "časť obrazovky"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Žiadna farebná špecifikácia\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "farba"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "vlastnosť farby"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminál zdá sa nepodporuje adresovanie kurzoru.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Nezdá sa, že by terminál podporoval zvýraznenie.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -973,11 +973,11 @@
 "Nastavte vašu premennú TERM správne, použite lepší terminál,\n"
 "alebo to urobte pomocou nástroja na správu jednotlivých balíkov %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminálu chýbajú nevyhnutné zložky, ukončuje sa"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -992,7 +992,7 @@
 "Výber potvrdíte stlačením <Enter>. ^L prekreslí obrazovku.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -1002,11 +1002,11 @@
 "\n"
 "Prístup len na čítanie: možný je len prehľad výberov!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "zlyhala funkcia getch v hlavnom menu"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "neznámy reťazec operácie „%.50s“"
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/stamp-po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/stamp-po
--- dpkg/dselect/po/stamp-po	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/stamp-po	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1 @@
+timestamp
Binary files dpkg/dselect/po/sv.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/sv.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/sv.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/sv.po
--- dpkg/dselect/po/sv.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/sv.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-03-08 13:37+0100\n"
 "Last-Translator: Peter Krefting <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -24,19 +24,19 @@
 msgid "Error: "
 msgstr "Fel: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Hjälp: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "Tryck ? för hjälpmenyn, . för nästa ämne, <blanksteg> lämnar hjälpen."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Hjälpinformation finns för följande ämnen:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -45,7 +45,7 @@
 "hjälpen,\n"
 "  eller \".\" (punkt) för att läsa hjälpsidorna i sekvens. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "fel vid läsning av tangentbordet i hjälpfunktionen"
 
@@ -727,104 +727,104 @@
 "  /             sök (Enter avbryter)\n"
 "  \\             repetera senaste sökning\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Skriv dselect --help för hjälp."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "k"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "Åt[k]omst"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Välj använd åtkomstmetod."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[U]ppdatera"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Uppdatera listan över tillgängliga paket, om möjligt."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "v"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[V]älj"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Välj paket du vill ha på ditt system."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]nstallera"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Installera och uppgradera önskade paket."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "k"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[K]onfigurera"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Konfigurera paket som ännu ej konfigurerats."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[R]adera"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Ta bort oönskad programvara."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "a"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[A]vsluta"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Lämnar dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "meny"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian \"%s\" pakethanteringsgränssnitt version %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -832,7 +832,7 @@
 "Copyright © 1994-1996 Ian Jackson.\n"
 "Copyright © 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -840,11 +840,11 @@
 "Detta program är fri programvara. Se GNU General Public License version 2\n"
 "eller senare för kopieringsvillkor. Det finns INGEN garanti.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr "<standard ut>"
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -853,7 +853,7 @@
 "Användning: %s [<flagga> ...] [<åtgärd> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -872,7 +872,7 @@
 "                             Konfigurera skärmfärger.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -883,7 +883,7 @@
 "  --version                  Visa versionsnummer.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -894,56 +894,56 @@
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Skärmdelar:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Färger:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attribut:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "kunde inte öppna felsökningsfil \"%.255s\"\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Ogiltig %s \"%s\"\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "skärmdel"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Tom färgangivelse\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "färg"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "färgattribut"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminalen verkar inte tillåta marköradressering.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminalen verkar inte tillåta ljusmarkering.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -952,11 +952,11 @@
 "Ställ in din TERM-variabel korrekt, använd en bättre terminal\n"
 "eller lev med det per-pakethanterande verktyget %s.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalen saknar funktioner som behövs, ger upp"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -969,7 +969,7 @@
 "Använd ^P och ^N, piltangenter, första bokstäver eller siffror.\n"
 "Tryck <Enter> för att bekräfta val. ^L ritar om skärmen.\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -979,11 +979,11 @@
 "\n"
 "Skrivskyddat läge: du kan bara titta på innehållet!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "kunde inte läsa tecken i huvudmenyn"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "okänd åtgärdssträng \"%.50s\""
Binary files dpkg/dselect/po/tl.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/tl.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/tl.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/tl.po
--- dpkg/dselect/po/tl.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/tl.po	2012-06-07 10:11:09.426073000 -0700
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\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"
@@ -25,22 +25,22 @@
 msgid "Error: "
 msgstr "Error: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Tulong: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Pindutin ang ? para sa menu ng tulong, . para sa susunod na paksa,\n"
 "<puwang> upang lumabas sa tulong."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr ""
 "Ang magagamit niyong impormasyong makakatulong ay sa mga sumusunod na paksa:"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -49,7 +49,7 @@
 "lumabas\n"
 "sa tulong o `.' (tuldok) upang basahin ang bawat pahina ng tulong. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "error sa pagbasa ng tiklado habang nasa modong pagtulong"
 
@@ -772,110 +772,110 @@
 "  /                  paghanap (pindutin ang return para ihinto)\n"
 "  \\                  ulitin ang huling paghanap\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "dselect --help para sa tulong."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[A]kses"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Piliin ang paraan ng pag-akses na gagamitin."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[U]pdate/Isariwa"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Isariwa ang listahan ng magagamit na mga pakete, kung kaya."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "p"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[P]umili"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Hilingin ang mga paketeng nais niyo sa inyong sistema."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]luklok"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Iluklok at i-apgreyd ang mga paketeng ninanais."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[C]onfig/Isaayos"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Isaayos ang mga paketeng hindi pa nakaayos."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "t"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[T]anggalin"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Tanggalin ang hindi gustong mga software."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[Q]uit/Lumabas"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Lumabas sa dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, fuzzy, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s' mukha ng tagapangasiwa ng mga pakete."
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 msgstr ""
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -886,18 +886,18 @@
 "mas-bago para sa kundisyon ng pangongopya. Walang waranti.\n"
 "Basahin ang dpkg-deb --licence para sa detalye.\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -909,7 +909,7 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -917,7 +917,7 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -925,56 +925,56 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Bahagingtabing:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Colours/Mga kulay:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Mga attribute:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "hindi mabuksan ang talaksang pan-debug `%.255s'\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Di tanggap na %s `%s'\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "bahagi ng tabing"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Null na spesipikasyong pangkulay\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "kulay"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "attribute ng kulay"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Mukhang ang himpilan ay hindi sumusuporta ng cursor addressing.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Mukhang ang himpilan ay hindi sumusuporta ng highlighting.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, fuzzy, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -984,11 +984,11 @@
 "himpilan,\n"
 "o kayanin na lamang na gamit ang kasangkapang tagapangasiwa ng bawat pakete "
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "kulang ng kailangan na mga feature ang terminal, sumusuko na"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -1004,7 +1004,7 @@
 "tabing.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -1014,11 +1014,11 @@
 "\n"
 "Pagbasa-lamang na akses: matitignan lamang ang magagamit na mga pagpipilian!"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "bigo ang getch sa pangunahing menu"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "di kilalang action string `%.50s'"
Binary files dpkg/dselect/po/vi.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/vi.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/vi.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/vi.po
--- dpkg/dselect/po/vi.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/vi.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\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"
@@ -26,11 +26,11 @@
 msgid "Error: "
 msgstr "Lỗi: "
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "Trợ giúp: "
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Nhấn:\n"
@@ -38,11 +38,11 @@
 "\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."
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "Có sẵn thông tin trợ giúp dưới những chủ đề sau :"
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -52,7 +52,7 @@
 "\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. "
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "gặp lỗi khi đọc bàn phím trong trợ giúp"
 
@@ -727,104 +727,104 @@
 "  /                \t\ttìm kiếm (đơn giản nhấn Return để thôi)\n"
 "  \\                \t\tlặp lại tìm kiếm cuối cùng\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "Gõ « dselect --help » để xem trợ giúp."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "[A]Truy cập"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "Chọn phương pháp truy cập để sử dụng."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "[U]Cập nhật"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "Cập nhật danh sách những gói có sẵn, nếu có thể."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "[S]Chọn"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "Yêu cầu những gói muốn có trên hệ thống."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "[I]Cài"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "Cài đặt và nâng cấp các gói mong muốn."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "[C]ấu hình"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "Cấu hình những gói còn chưa được cấu hình."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "[R]Gỡ bỏ"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "Gỡ bỏ phần mềm không mong muốn."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "[Q]Thoát"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "Thoát khỏi dselect."
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "trình đơn"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Tiền tiêu quản lý gói Debian « %s » phiên bản %s.\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -832,7 +832,7 @@
 "Bản quyền © nam 1994-1996 Ian Jackson.\n"
 "Bản quyền © năm 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -843,11 +843,11 @@
 "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"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -856,7 +856,7 @@
 "Cách sử dụng: %s [<tùy_chọn> ...] [<hành_động> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -877,7 +877,7 @@
 "\t[TT là thuộc tính]\tcấu hình màu sắc màn hình\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -889,7 +889,7 @@
 "  --license | --licence      Hiện _giấy phép_.\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -905,56 +905,56 @@
 " • remove\tgỡ bỏ\n"
 " • quit\t\tthoát\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Các phần màn hình:\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "Màu sắc:\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "Thuộc tính:\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "không thể mở tập tin gỡ lỗi « %.250s »\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s không hợp lệ « %s »\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "phần màn hình"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "Đặc tả màu rỗng\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "màu"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "thuộc tính màu"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Thiết bị cuỗi có vẻ không hỗ trợ cách gán địa chỉ cho con chạy.\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Thiết bị cuỗi có vẻ không hỗ trợ chiếu sáng.\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -963,11 +963,11 @@
 "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:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "thiết bị cuối thiếu tính năng cần thiết, đầu hàng"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -981,7 +981,7 @@
 "Nhấn phím Enter để chọn.   ^L vẽ lại màn hình.\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -991,11 +991,11 @@
 "\n"
 "Truy cập chỉ đọc: chỉ có sẵn xem trước các lựa chọn."
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "việc getch (đọc từng ký tự khi gõ) vào trình đơn chính bị lỗi"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "chuỗi hành động không rõ « %.250s »"
Binary files dpkg/dselect/po/zh_CN.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/zh_CN.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/zh_CN.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/zh_CN.po
--- dpkg/dselect/po/zh_CN.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/zh_CN.po	2012-06-07 10:11:09.426073000 -0700
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\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"
@@ -28,20 +28,20 @@
 msgid "Error: "
 msgstr "错误："
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "帮助："
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "摁 ? 可以弹出帮助菜单，用 . 来进入下个主题，通过 <空格> 就能退出帮助界面。"
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "您可获得有关下列主题的帮助信息："
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -49,7 +49,7 @@
 "请摁上面列表中所示的按键，用 <空格> 或者“q”来退出帮助界面，\n"
 "或者用“.”(英文句点)来依次阅读帮助页面。"
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "在帮助界面读取键盘输入时出错"
 
@@ -711,104 +711,104 @@
 "  /                进行搜索(摁回车取消搜索)\n"
 "  \\               重复上次的搜索\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "输入 dselect --help 就可以阅读帮助信息。"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "来源[A]"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "选择所使用的安装来源。"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "更新[U]"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "如果可能的话，更新可用的软件包列表。"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "选择[S]"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "对系统中安装的软件包进行取舍。"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "安装[I]"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "安装并升级之前指定的软件包。"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "配置[C]"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "对所有还未配置的软件包进行配置"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "删除[R]"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "删除不需要的软件包"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "退出[Q]"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "退出 dselect 程序"
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "菜单"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian “%s” 软件包操作前端 %s 版。\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -816,7 +816,7 @@
 "版权所有 (C) 1994-1996 Ian Jackson。\n"
 "版权所有 (C) 2000,2001 Wichert Akkerman。\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -826,11 +826,11 @@
 "第二版或其更新的版本。该软件【不】提供任何担保。\n"
 "请通过执行 %s --licence 来查看版权和许可证的细节。\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -839,7 +839,7 @@
 "用法：%s [<选项> ...] [<操作> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -858,7 +858,7 @@
 "                             设置显示所用的配色。\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -870,7 +870,7 @@
 "  --license | --license      显示许可证。\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -881,56 +881,56 @@
 "  手段 更新 选择 安装 设置 卸载 退出\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "显示部位：\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "颜色：\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "属性：\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "无法打开调试信息文件“%.255s”\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "无效的 %s “%s”\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "显示部分"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "未指定颜色\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "颜色"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "颜色属性"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "终端不支持游标的定位。\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "终端不支持高亮显示。\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -939,11 +939,11 @@
 "请正确设置您的 TERM 变量，用一个更合适的终端类型，\n"
 "或者转用针对单个软件包的包管理工具，即 %s。\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "由于终端缺乏必要的特性，只得中止操作"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -957,7 +957,7 @@
 "摁 <回车> 来确认。  用 ^L 来刷屏。\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -967,11 +967,11 @@
 "\n"
 "只读访问：仅仅可以查看被选中的项目！"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "在主菜单界面中 getch 失败"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不能识别的操作字串“%.50s”"
Binary files dpkg/dselect/po/zh_TW.gmo and /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/zh_TW.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/dselect/po/zh_TW.po /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/zh_TW.po
--- dpkg/dselect/po/zh_TW.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/dselect/po/zh_TW.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\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"
@@ -26,19 +26,19 @@
 msgid "Error: "
 msgstr "錯誤："
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "幫助："
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "按 ? 可以彈出幫助選單，用 <space> 能進入下個主題並離開幫助畫面。"
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "您可獲得有關下列主題的幫助訊息："
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 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. "
@@ -46,7 +46,7 @@
 "請按上面列表中的按鍵，<space> 或“q”可退出幫助界面，\n"
 "或者用“.”(full stop)來依次閱讀幫助頁面。"
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "在幫助界面讀取鍵盤輸入時出錯"
 
@@ -703,110 +703,110 @@
 "  /                進行搜尋(按enter取消搜尋)\n"
 "  \\               重復上次的搜尋\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 msgid "Type dselect --help for help."
 msgstr "輸入 dselect --help 就可以閱讀幫助訊息。"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "來源[A]"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "選擇所使用的安裝來源。"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "更新[U]"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "如果可能的話，更新可用的套件列表。"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "選擇[S]"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "對系統中安裝的套件作取捨。"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "安裝[I]"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "安裝並升級之前指定的套件。"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "設定[C]"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "對所有尚未設定的套件進行設定"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "刪除[R]"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "刪除不需要的套件"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "退出[Q]"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "退出 dselect 程序"
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "選單"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, fuzzy, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian “%s” 套件操作前端程式"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 msgstr ""
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -816,18 +816,18 @@
 "第二或更新的版本。該軟體【不】提供任何擔保。\n"
 "請通過執行 dpkg-deb --licence 來查看版權和許可証的細節。\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -839,7 +839,7 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -847,7 +847,7 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -855,56 +855,56 @@
 "\n"
 msgstr ""
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "顯示部分：\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "顏色：\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "屬性：\n"
 
-#: dselect/main.cc:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "無法打開偵錯檔案“%.255s”\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "無效的 %s “%s”\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "顯示哪一部分"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "未指定顏色\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "顏色"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "顏色屬性"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "終端機不支持游標的定位。\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "終端機不支持高亮顯示。\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 #, fuzzy, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -913,11 +913,11 @@
 "請正確設定您的 TERM 變量，用一個更合適的終端機類型，\n"
 "或者改用針對單一套件的套裝管理工具，即 "
 
-#: dselect/main.cc:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "由於終端機缺乏必要的特色，只得中止操作"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -931,7 +931,7 @@
 "按 <enter> 來確認。  用 ^L 來重繪螢幕。\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -941,11 +941,11 @@
 "\n"
 "唯讀存取：僅僅可以預覽被選中的項目！"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "在主選單中 getch 失敗"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不能識別的操作字串“%.50s”"
diff -uNr --exclude .git --exclude .bzr dpkg/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/.gitignore
--- dpkg/.gitignore	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1,23 +0,0 @@
-# Inherited ignores
-*.a
-*.o
-*.gcno
-*.gcda
-*.gcov
-*.lcov
-.*.swp
-.deps/
-Makefile
-Makefile.in
-
-# Top dir ignores
-autom4te.cache/
-build-aux/
-build-tree/
-ABOUT-NLS
-ChangeLog
-INSTALL
-configure
-config.*
-aclocal.m4
-stamp-h1
diff -uNr --exclude .git --exclude .bzr dpkg/lib/compat/Makefile.in /home/vorlon/devel/multiarch/dpkg-debian/lib/compat/Makefile.in
--- dpkg/lib/compat/Makefile.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/compat/Makefile.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,556 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@HAVE_GETOPT_FALSE@am__append_1 = getopt.c getopt.h
+@HAVE_GETOPT_LONG_FALSE@am__append_2 = getopt1.c
+@HAVE_OBSTACK_FREE_FALSE@am__append_3 = obstack.c obstack.h
+@HAVE_STRNLEN_FALSE@am__append_4 = strnlen.c strnlen.h
+@HAVE_STRERROR_FALSE@am__append_5 = strerror.c
+@HAVE_STRSIGNAL_FALSE@am__append_6 = strsignal.c
+@HAVE_C99_SNPRINTF_FALSE@am__append_7 = snprintf.c vsnprintf.c
+@HAVE_ASPRINTF_FALSE@am__append_8 = asprintf.c vasprintf.c
+@HAVE_ALPHASORT_FALSE@am__append_9 = alphasort.c
+@HAVE_SCANDIR_FALSE@am__append_10 = scandir.c
+@HAVE_UNSETENV_FALSE@am__append_11 = unsetenv.c
+subdir = lib/compat
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
+	$(top_srcdir)/m4/dpkg-build.m4 \
+	$(top_srcdir)/m4/dpkg-compiler.m4 \
+	$(top_srcdir)/m4/dpkg-coverage.m4 \
+	$(top_srcdir)/m4/dpkg-funcs.m4 $(top_srcdir)/m4/dpkg-libs.m4 \
+	$(top_srcdir)/m4/dpkg-linker.m4 $(top_srcdir)/m4/dpkg-progs.m4 \
+	$(top_srcdir)/m4/dpkg-types.m4 \
+	$(top_srcdir)/m4/dpkg-unicode.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+libcompat_a_AR = $(AR) $(ARFLAGS)
+libcompat_a_LIBADD =
+am__libcompat_a_SOURCES_DIST = empty.c compat.h gettext.h getopt.c \
+	getopt.h getopt1.c obstack.c obstack.h strnlen.c strnlen.h \
+	strerror.c strsignal.c snprintf.c vsnprintf.c asprintf.c \
+	vasprintf.c alphasort.c scandir.c unsetenv.c
+@HAVE_GETOPT_FALSE@am__objects_1 = getopt.$(OBJEXT)
+@HAVE_GETOPT_LONG_FALSE@am__objects_2 = getopt1.$(OBJEXT)
+@HAVE_OBSTACK_FREE_FALSE@am__objects_3 = obstack.$(OBJEXT)
+@HAVE_STRNLEN_FALSE@am__objects_4 = strnlen.$(OBJEXT)
+@HAVE_STRERROR_FALSE@am__objects_5 = strerror.$(OBJEXT)
+@HAVE_STRSIGNAL_FALSE@am__objects_6 = strsignal.$(OBJEXT)
+@HAVE_C99_SNPRINTF_FALSE@am__objects_7 = snprintf.$(OBJEXT) \
+@HAVE_C99_SNPRINTF_FALSE@	vsnprintf.$(OBJEXT)
+@HAVE_ASPRINTF_FALSE@am__objects_8 = asprintf.$(OBJEXT) \
+@HAVE_ASPRINTF_FALSE@	vasprintf.$(OBJEXT)
+@HAVE_ALPHASORT_FALSE@am__objects_9 = alphasort.$(OBJEXT)
+@HAVE_SCANDIR_FALSE@am__objects_10 = scandir.$(OBJEXT)
+@HAVE_UNSETENV_FALSE@am__objects_11 = unsetenv.$(OBJEXT)
+am_libcompat_a_OBJECTS = empty.$(OBJEXT) $(am__objects_1) \
+	$(am__objects_2) $(am__objects_3) $(am__objects_4) \
+	$(am__objects_5) $(am__objects_6) $(am__objects_7) \
+	$(am__objects_8) $(am__objects_9) $(am__objects_10) \
+	$(am__objects_11)
+libcompat_a_OBJECTS = $(am_libcompat_a_OBJECTS)
+DEFAULT_INCLUDES = 
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(libcompat_a_SOURCES)
+DIST_SOURCES = $(am__libcompat_a_SOURCES_DIST)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BZ2_LIBS = @BZ2_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCOV = @GCOV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LCOV = @LCOV@
+LCOV_GENHTML = @LCOV_GENHTML@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_COVER = @PERL_COVER@
+PERL_COVERAGE = @PERL_COVERAGE@
+PERL_LIBDIR = @PERL_LIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PO4A = @PO4A@
+POD2MAN = @POD2MAN@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_PO4A = @USE_PO4A@
+USE_UNICODE = @USE_UNICODE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+admindir = @admindir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-idirafter $(top_srcdir)/lib/compat \
+	-I$(top_builddir)
+
+noinst_LIBRARIES = libcompat.a
+libcompat_a_SOURCES = empty.c compat.h gettext.h $(am__append_1) \
+	$(am__append_2) $(am__append_3) $(am__append_4) \
+	$(am__append_5) $(am__append_6) $(am__append_7) \
+	$(am__append_8) $(am__append_9) $(am__append_10) \
+	$(am__append_11)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/compat/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign lib/compat/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libcompat.a: $(libcompat_a_OBJECTS) $(libcompat_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libcompat.a
+	$(AM_V_AR)$(libcompat_a_AR) libcompat.a $(libcompat_a_OBJECTS) $(libcompat_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libcompat.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alphasort.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asprintf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empty.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obstack.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scandir.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsignal.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unsetenv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasprintf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsnprintf.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/arch.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/arch.c
--- dpkg/lib/dpkg/arch.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/arch.c	1969-12-31 16:00:00.000000000 -0800
@@ -1,173 +0,0 @@
-/*
- * libdpkg - Debian packaging suite library routines
- * arch.c - architecture database functions
- *
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include <compat.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <string.h>
-
-#include <dpkg/i18n.h>
-#include <dpkg/dpkg-db.h>
-#include <dpkg/arch.h>
-#include <dpkg/ehandle.h>
-
-/* This is a special architecture used to guarantee we always have a valid
- * structure to handle. */
-static struct dpkg_arch arch_item_none = {
-	.name = "",
-	.type = arch_none,
-	.next = NULL,
-};
-
-static struct dpkg_arch arch_item_any = {
-	.name = "any",
-	.type = arch_wildcard,
-	.next = NULL,
-};
-static struct dpkg_arch arch_item_all = {
-	.name = "all",
-	.type = arch_all,
-	.next = &arch_item_any,
-};
-static struct dpkg_arch arch_item_native = {
-	.name = ARCHITECTURE,
-	.type = arch_native,
-	.next = &arch_item_all,
-};
-static struct dpkg_arch *arch_list = &arch_item_native;
-
-static struct dpkg_arch *
-dpkg_arch_new(const char *name, enum arch_type type)
-{
-	struct dpkg_arch *new;
-
-	new = nfmalloc(sizeof(*new));
-	new->next = NULL;
-	new->name = nfstrsave(name);
-	new->type = type;
-
-	return new;
-}
-
-/**
- * Retrieve the struct dpkg_arch for the given architecture.
- *
- * Create a new structure for the architecture if it's not yet known from
- * the system, in that case it will have arch->type == arch_unknown, if the
- * architecture is illegal it will have arch->type == arch_illegal and if
- * name is NULL or an empty string then it will have arch->type == arch_none.
- *
- * @param name The architecture name.
- */
-struct dpkg_arch *
-dpkg_arch_find(const char *name)
-{
-	struct dpkg_arch *arch, *last_arch = NULL;
-	enum arch_type type;
-
-	if (name == NULL || name[0] == '\0')
-		return &arch_item_none;
-
-	for (arch = arch_list; arch; arch = arch->next) {
-		if (strcmp(arch->name, name) == 0)
-			return arch;
-		last_arch = arch;
-	}
-
-	if (dpkg_arch_name_is_illegal(name))
-		type = arch_illegal;
-	else
-		type = arch_unknown;
-
-	arch = dpkg_arch_new(name, type);
-	last_arch->next = arch;
-
-	return arch;
-}
-
-/**
- * Return the struct dpkg_arch corresponding to the native architecture.
- */
-struct dpkg_arch *
-dpkg_arch_get_native(void)
-{
-	return &arch_item_native;
-}
-
-/**
- * Return the complete list of architectures.
- *
- * In fact it returns the first item of the linked list and you can
- * traverse the list by following arch->next until it's NULL.
- */
-struct dpkg_arch *
-dpkg_arch_get_list(void)
-{
-	return arch_list;
-}
-
-/**
- * Reset the list of architectures.
- *
- * Must be called after nffreeall() to ensure we don't point to
- * unallocated memory.
- */
-void
-dpkg_arch_reset(void)
-{
-	arch_item_any.next = NULL;
-}
-
-/**
- * Verify if the architecture name is valid.
- *
- * Returns NULL if the architecture name is valid. Otherwise it returns a
- * string describing why it's not valid. Currently it ensures the name
- * starts with an alphanumeric and is then composed of a combinations of
- * dashes and alphanumerics.
- *
- * The function will abort if you pass it a NULL pointer.
- *
- * @param name The architectute name to verify.
- */
-const char *
-dpkg_arch_name_is_illegal(const char *name)
-{
-	static char buf[150];
-	const char *p = name;
-
-	assert(name);
-	if (!*p)
-		return _("may not be empty string");
-	if (!isalnum(*p))
-		return _("must start with an alphanumeric");
-	while (*++p != '\0')
-		if (!isalnum(*p) && *p != '-')
-			break;
-	if (*p == '\0')
-		return NULL;
-	snprintf(buf, sizeof(buf), _("character `%c' not allowed (only "
-	                             "letters, digits and characters `%s')"),
-	         *p, "-");
-	return buf;
-}
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/arch.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/arch.h
--- dpkg/lib/dpkg/arch.h	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/arch.h	1969-12-31 16:00:00.000000000 -0800
@@ -1,51 +0,0 @@
-/*
- * libdpkg - Debian packaging suite library routines
- * arch.h - architecture database functions
- *
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef LIBDPKG_ARCH_H
-#define LIBDPKG_ARCH_H
-
-#include <dpkg/macros.h>
-
-DPKG_BEGIN_DECLS
-
-struct dpkg_arch {
-	struct dpkg_arch *next;
-	const char *name;
-	enum arch_type {
-		arch_all,
-		arch_native,
-		arch_foreign,
-		arch_wildcard,
-		arch_none,
-		arch_illegal,
-		arch_unknown,
-	} type;
-};
-
-struct dpkg_arch *dpkg_arch_find(const char *name);
-struct dpkg_arch *dpkg_arch_get_native(void);
-struct dpkg_arch *dpkg_arch_get_list(void);
-const char *dpkg_arch_name_is_illegal(const char *name) DPKG_ATTR_NONNULL(1);
-void dpkg_arch_reset(void);
-
-DPKG_END_DECLS
-
-#endif /* LIBDPKG_ARCH_H */
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/buffer.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/buffer.c
--- dpkg/lib/dpkg/buffer.c	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/buffer.c	2012-06-07 10:11:09.426073000 -0700
@@ -54,16 +54,38 @@
 }
 
 static off_t
-buffer_init(struct buffer_data *data)
+buffer_filter_init(struct buffer_data *data)
 {
 	switch (data->type) {
-	case BUFFER_WRITE_MD5:
+	case BUFFER_FILTER_NULL:
+		break;
+	case BUFFER_FILTER_MD5:
 		buffer_md5_init(data);
 		break;
 	}
 	return 0;
 }
 
+static off_t
+buffer_filter_update(struct buffer_data *filter, const void *buf, off_t length)
+{
+	off_t ret = length;
+
+	switch (filter->type) {
+	case BUFFER_FILTER_NULL:
+		break;
+	case BUFFER_FILTER_MD5:
+		MD5Update(&(((struct buffer_md5_ctx *)filter->arg.ptr)->ctx),
+		          buf, length);
+		break;
+	default:
+		internerr("unknown data type '%i' in buffer_filter_update",
+		          filter->type);
+	}
+
+	return ret;
+}
+
 static void
 buffer_md5_done(struct buffer_data *data)
 {
@@ -84,10 +106,12 @@
 }
 
 static off_t
-buffer_done(struct buffer_data *data)
+buffer_filter_done(struct buffer_data *data)
 {
 	switch (data->type) {
-	case BUFFER_WRITE_MD5:
+	case BUFFER_FILTER_NULL:
+		break;
+	case BUFFER_FILTER_MD5:
 		buffer_md5_done(data);
 		break;
 	}
@@ -108,9 +132,6 @@
 		break;
 	case BUFFER_WRITE_NULL:
 		break;
-	case BUFFER_WRITE_MD5:
-		MD5Update(&(((struct buffer_md5_ctx *)data->arg.ptr)->ctx), buf, length);
-		break;
 	default:
 		internerr("unknown data type '%i' in buffer_write",
 		          data->type);
@@ -137,20 +158,22 @@
 }
 
 off_t
-buffer_hash(const void *input, void *output, int type, off_t limit)
+buffer_filter(const void *input, void *output, int type, off_t limit)
 {
 	struct buffer_data data = { .arg.ptr = output, .type = type };
 	off_t ret;
 
-	buffer_init(&data);
-	ret = buffer_write(&data, input, limit);
-	buffer_done(&data);
+	buffer_filter_init(&data);
+	ret = buffer_filter_update(&data, input, limit);
+	buffer_filter_done(&data);
 
 	return ret;
 }
 
 static off_t
-buffer_copy(struct buffer_data *read_data, struct buffer_data *write_data,
+buffer_copy(struct buffer_data *read_data,
+            struct buffer_data *filter,
+            struct buffer_data *write_data,
             off_t limit, const char *desc)
 {
 	char *buf;
@@ -165,12 +188,12 @@
 
 	buf = m_malloc(bufsize);
 
-	buffer_init(write_data);
+	buffer_filter_init(filter);
 
 	while (bufsize > 0) {
 		bytesread = buffer_read(read_data, buf, bufsize);
 		if (bytesread < 0)
-			break;
+			ohshite(_("failed to read on buffer copy for %s"), desc);
 		if (bytesread == 0)
 			break;
 
@@ -182,23 +205,21 @@
 				bufsize = limit;
 		}
 
+		buffer_filter_update(filter, buf, bytesread);
+
 		byteswritten = buffer_write(write_data, buf, bytesread);
 		if (byteswritten < 0)
-			break;
+			ohshite(_("failed in write on buffer copy for %s"), desc);
 		if (byteswritten == 0)
 			break;
 
 		totalwritten += byteswritten;
 	}
 
-	if (bytesread < 0)
-		ohshite(_("failed to read on buffer copy for %s"), desc);
-	if (byteswritten < 0)
-		ohshite(_("failed in write on buffer copy for %s"), desc);
 	if (limit > 0)
 		ohshit(_("short read on buffer copy for %s"), desc);
 
-	buffer_done(write_data);
+	buffer_filter_done(filter);
 
 	free(buf);
 
@@ -207,11 +228,13 @@
 
 off_t
 buffer_copy_IntInt(int Iin, int Tin,
+                   void *Pfilter, int Tfilter,
                    int Iout, int Tout,
                    off_t limit, const char *desc, ...)
 {
 	va_list args;
 	struct buffer_data read_data = { .type = Tin, .arg.i = Iin };
+	struct buffer_data filter = { .type = Tfilter, .arg.ptr = Pfilter };
 	struct buffer_data write_data = { .type = Tout, .arg.i = Iout };
 	struct varbuf v = VARBUF_INIT;
 	off_t ret;
@@ -220,7 +243,7 @@
 	varbuf_vprintf(&v, desc, args);
 	va_end(args);
 
-	ret = buffer_copy(&read_data, &write_data, limit, v.buf);
+	ret = buffer_copy(&read_data, &filter, &write_data, limit, v.buf);
 
 	varbuf_destroy(&v);
 
@@ -229,11 +252,13 @@
 
 off_t
 buffer_copy_IntPtr(int Iin, int Tin,
+                   void *Pfilter, int Tfilter,
                    void *Pout, int Tout,
                    off_t limit, const char *desc, ...)
 {
 	va_list args;
 	struct buffer_data read_data = { .type = Tin, .arg.i = Iin };
+	struct buffer_data filter = { .type = Tfilter, .arg.ptr = Pfilter };
 	struct buffer_data write_data = { .type = Tout, .arg.ptr = Pout };
 	struct varbuf v = VARBUF_INIT;
 	off_t ret;
@@ -242,7 +267,7 @@
 	varbuf_vprintf(&v, desc, args);
 	va_end(args);
 
-	ret = buffer_copy(&read_data, &write_data, limit, v.buf);
+	ret = buffer_copy(&read_data, &filter, &write_data, limit, v.buf);
 
 	varbuf_destroy(&v);
 
@@ -253,6 +278,7 @@
 buffer_skip(struct buffer_data *input, off_t limit, const char *desc)
 {
 	struct buffer_data output;
+	struct buffer_data filter;
 
 	switch (input->type) {
 	case BUFFER_READ_FD:
@@ -268,8 +294,10 @@
 
 	output.type = BUFFER_WRITE_NULL;
 	output.arg.ptr = NULL;
+	filter.type = BUFFER_FILTER_NULL;
+	filter.arg.ptr = NULL;
 
-	return buffer_copy(input, &output, limit, desc);
+	return buffer_copy(input, &filter, &output, limit, desc);
 }
 
 off_t
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/buffer.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/buffer.h
--- dpkg/lib/dpkg/buffer.h	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/buffer.h	2012-06-07 10:11:09.426073000 -0700
@@ -35,7 +35,9 @@
 #define BUFFER_WRITE_VBUF		1
 #define BUFFER_WRITE_FD			2
 #define BUFFER_WRITE_NULL		3
-#define BUFFER_WRITE_MD5		5
+
+#define BUFFER_FILTER_NULL		4
+#define BUFFER_FILTER_MD5		5
 
 #define BUFFER_READ_FD			0
 
@@ -48,29 +50,40 @@
 };
 
 # define buffer_md5(buf, hash, limit) \
-	buffer_hash(buf, hash, BUFFER_WRITE_MD5, limit)
+	buffer_filter(buf, hash, BUFFER_FILTER_MD5, limit)
 
 # define fd_md5(fd, hash, limit, ...) \
-	buffer_copy_IntPtr(fd, BUFFER_READ_FD, hash, BUFFER_WRITE_MD5, \
+	buffer_copy_IntPtr(fd, BUFFER_READ_FD, \
+	                   hash, BUFFER_FILTER_MD5, \
+	                   NULL, BUFFER_WRITE_NULL, \
 	                   limit, __VA_ARGS__)
 # define fd_fd_copy(fd1, fd2, limit, ...) \
-	buffer_copy_IntInt(fd1, BUFFER_READ_FD, fd2, BUFFER_WRITE_FD, \
+	buffer_copy_IntInt(fd1, BUFFER_READ_FD, \
+	                   NULL, BUFFER_FILTER_NULL, \
+	                   fd2, BUFFER_WRITE_FD, \
 	                   limit, __VA_ARGS__)
 # define fd_vbuf_copy(fd, buf, limit, ...) \
-	buffer_copy_IntPtr(fd, BUFFER_READ_FD, buf, BUFFER_WRITE_VBUF, \
+	buffer_copy_IntPtr(fd, BUFFER_READ_FD, \
+	                   NULL, BUFFER_FILTER_NULL, \
+	                   buf, BUFFER_WRITE_VBUF, \
 	                   limit, __VA_ARGS__)
-# define fd_null_copy(fd, limit, ...) \
+# define fd_skip(fd, limit, ...) \
 	buffer_skip_Int(fd, BUFFER_READ_FD, limit, __VA_ARGS__)
 
-off_t buffer_copy_IntPtr(int i, int typeIn, void *p, int typeOut,
+
+off_t buffer_copy_IntPtr(int i, int typeIn,
+                         void *f, int typeFilter,
+                         void *p, int typeOut,
                          off_t limit, const char *desc,
-                         ...) DPKG_ATTR_PRINTF(6);
-off_t buffer_copy_IntInt(int i1, int typeIn, int i2, int typeOut,
+                         ...) DPKG_ATTR_PRINTF(8);
+off_t buffer_copy_IntInt(int i1, int typeIn,
+                         void *f, int typeFilter,
+                         int i2, int typeOut,
                          off_t limit, const char *desc,
-                         ...) DPKG_ATTR_PRINTF(6);
+                         ...) DPKG_ATTR_PRINTF(8);
 off_t buffer_skip_Int(int I, int T, off_t limit, const char *desc_fmt, ...)
-                      DPKG_ATTR_PRINTF(4);
-off_t buffer_hash(const void *buf, void *hash, int typeOut, off_t length);
+	DPKG_ATTR_PRINTF(4);
+off_t buffer_filter(const void *buf, void *hash, int typeFilter, off_t length);
 
 DPKG_END_DECLS
 
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/command.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/command.c
--- dpkg/lib/dpkg/command.c	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/command.c	2012-06-07 10:11:09.426073000 -0700
@@ -2,7 +2,7 @@
  * libdpkg - Debian packaging suite library routines
  * command.c - command execution support
  *
- * Copyright © 2010 Guillem Jover <guillem@debian.org>
+ * Copyright © 2010-2011 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
 
 #include <dpkg/dpkg.h>
 #include <dpkg/i18n.h>
+#include <dpkg/path.h>
 #include <dpkg/command.h>
 
 /**
@@ -43,11 +44,9 @@
 command_init(struct command *cmd, const char *filename, const char *name)
 {
 	cmd->filename = filename;
-	if (name == NULL) {
-		const char *progname = strrchr(filename, '/');
-
-		cmd->name = progname ? progname + 1 : filename;
-	} else
+	if (name == NULL)
+		cmd->name = path_basename(filename);
+	else
 		cmd->name = name;
 	cmd->argc = 0;
 	cmd->argv_size = 10;
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/compress.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/compress.c
--- dpkg/lib/dpkg/compress.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/compress.c	2012-06-07 10:11:09.426073000 -0700
@@ -52,7 +52,7 @@
 	pid_t pid;
 
 	pid = subproc_fork();
-	if (pid != 0) {
+	if (pid == 0) {
 		if (fd_in != 0) {
 			m_dup2(fd_in, 0);
 			close(fd_in);
@@ -116,10 +116,10 @@
 
 		actualread = gzread(gzfile, buffer, sizeof(buffer));
 		if (actualread < 0) {
-			int err = 0;
-			const char *errmsg = gzerror(gzfile, &err);
+			int z_errnum = 0;
+			const char *errmsg = gzerror(gzfile, &z_errnum);
 
-			if (err == Z_ERRNO)
+			if (z_errnum == Z_ERRNO)
 				errmsg = strerror(errno);
 			ohshit(_("%s: internal gzip read error: '%s'"), desc,
 			       errmsg);
@@ -141,7 +141,7 @@
 {
 	char buffer[DPKG_BUFFER_SIZE];
 	char combuf[6];
-	int err;
+	int z_errnum;
 	gzFile gzfile;
 
 	snprintf(combuf, sizeof(combuf), "w%d", compress_level);
@@ -160,23 +160,23 @@
 
 		actualwrite = gzwrite(gzfile, buffer, actualread);
 		if (actualwrite != actualread) {
-			const char *errmsg = gzerror(gzfile, &err);
+			const char *errmsg = gzerror(gzfile, &z_errnum);
 
-			if (err == Z_ERRNO)
+			if (z_errnum == Z_ERRNO)
 				errmsg = strerror(errno);
 			ohshit(_("%s: internal gzip write error: '%s'"), desc,
 			       errmsg);
 		}
 	}
 
-	err = gzclose(gzfile);
-	if (err) {
+	z_errnum = gzclose(gzfile);
+	if (z_errnum) {
 		const char *errmsg;
 
-		if (err == Z_ERRNO)
+		if (z_errnum == Z_ERRNO)
 			errmsg = strerror(errno);
 		else
-			errmsg = zError(err);
+			errmsg = zError(z_errnum);
 		ohshit(_("%s: internal gzip write error: %s"), desc, errmsg);
 	}
 }
@@ -224,10 +224,10 @@
 
 		actualread = BZ2_bzread(bzfile, buffer, sizeof(buffer));
 		if (actualread < 0) {
-			int err = 0;
-			const char *errmsg = BZ2_bzerror(bzfile, &err);
+			int bz_errnum = 0;
+			const char *errmsg = BZ2_bzerror(bzfile, &bz_errnum);
 
-			if (err == BZ_IO_ERROR)
+			if (bz_errnum == BZ_IO_ERROR)
 				errmsg = strerror(errno);
 			ohshit(_("%s: internal bzip2 read error: '%s'"), desc,
 			       errmsg);
@@ -249,7 +249,7 @@
 {
 	char buffer[DPKG_BUFFER_SIZE];
 	char combuf[6];
-	int err;
+	int bz_errnum;
 	BZFILE *bzfile;
 
 	snprintf(combuf, sizeof(combuf), "w%d", compress_level);
@@ -268,20 +268,20 @@
 
 		actualwrite = BZ2_bzwrite(bzfile, buffer, actualread);
 		if (actualwrite != actualread) {
-			const char *errmsg = BZ2_bzerror(bzfile, &err);
+			const char *errmsg = BZ2_bzerror(bzfile, &bz_errnum);
 
-			if (err == BZ_IO_ERROR)
+			if (bz_errnum == BZ_IO_ERROR)
 				errmsg = strerror(errno);
 			ohshit(_("%s: internal bzip2 write error: '%s'"), desc,
 			       errmsg);
 		}
 	}
 
-	BZ2_bzWriteClose(&err, bzfile, 0, NULL, NULL);
-	if (err != BZ_OK) {
+	BZ2_bzWriteClose(&bz_errnum, bzfile, 0, NULL, NULL);
+	if (bz_errnum != BZ_OK) {
 		const char *errmsg = _("unexpected bzip2 error");
 
-		if (err == BZ_IO_ERROR)
+		if (bz_errnum == BZ_IO_ERROR)
 			errmsg = strerror(errno);
 		ohshit(_("%s: internal bzip2 write error: '%s'"), desc,
 		       errmsg);
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/dbmodify.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/dbmodify.c
--- dpkg/lib/dpkg/dbmodify.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/dbmodify.c	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * dbmodify.c - routines for managing dpkg database updates
  *
  * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
@@ -57,7 +57,6 @@
 static char *updatesdir;
 static int updateslength;
 static char *updatefnbuf, *updatefnrest;
-static char *infodir;
 static struct varbuf uvb;
 
 static int ulist_select(const struct dirent *de) {
@@ -142,7 +141,6 @@
   {   AVAILFILE,                  &availablefile      },
   {   UPDATESDIR,                 &updatesdir         },
   {   UPDATESDIR IMPORTANTTMP,    &importanttmpfile   },
-  {   INFODIR,                    &infodir            },
   {   NULL, NULL                                      }
 };
 
@@ -281,9 +279,9 @@
   if (cstatus != msdbrw_needsuperuserlockonly) {
     cleanupdates();
     if (cflags >= msdbrw_available_readonly)
-    parsedb(availablefile,
-            pdb_recordavailable | pdb_rejectstatus | pdb_lax_parser,
-            NULL);
+      parsedb(availablefile,
+              pdb_recordavailable | pdb_rejectstatus | pdb_lax_parser,
+              NULL);
   }
 
   if (cstatus >= msdbrw_write) {
@@ -346,24 +344,18 @@
   varbufrecord(&uvb, pkg, &pkg->installed);
 
   if (fwrite(uvb.buf, 1, uvb.used, importanttmp) != uvb.used)
-    ohshite(_("unable to write updated status of `%.250s'"),
-            pkg_describe(pkg, pdo_foreign));
+    ohshite(_("unable to write updated status of `%.250s'"), pkg->name);
   if (fflush(importanttmp))
-    ohshite(_("unable to flush updated status of `%.250s'"),
-            pkg_describe(pkg, pdo_foreign));
+    ohshite(_("unable to flush updated status of `%.250s'"), pkg->name);
   if (ftruncate(fileno(importanttmp), uvb.used))
-    ohshite(_("unable to truncate for updated status of `%.250s'"),
-            pkg_describe(pkg, pdo_foreign));
+    ohshite(_("unable to truncate for updated status of `%.250s'"), pkg->name);
   if (fsync(fileno(importanttmp)))
-    ohshite(_("unable to fsync updated status of `%.250s'"),
-            pkg_describe(pkg, pdo_foreign));
+    ohshite(_("unable to fsync updated status of `%.250s'"), pkg->name);
   if (fclose(importanttmp))
-    ohshite(_("unable to close updated status of `%.250s'"),
-            pkg_describe(pkg, pdo_foreign));
+    ohshite(_("unable to close updated status of `%.250s'"), pkg->name);
   sprintf(updatefnrest, IMPORTANTFMT, nextupdate);
   if (rename(importanttmpfile, updatefnbuf))
-    ohshite(_("unable to install updated status of `%.250s'"),
-            pkg_describe(pkg, pdo_foreign));
+    ohshite(_("unable to install updated status of `%.250s'"), pkg->name);
 
   dir_sync_path(updatesdir);
 
@@ -404,11 +396,9 @@
     pkg->trigaw.head = pkg->trigaw.tail = NULL;
   }
 
-  log_message("status %s %s %s", statusinfos[pkg->status].name,
-              pkg_describe(pkg, pdo_foreign),
+  log_message("status %s %s %s", statusinfos[pkg->status].name, pkg->name,
 	      versiondescribe(&pkg->installed.version, vdew_nonambig));
-  statusfd_send("status: %s: %s", pkg_describe(pkg, pdo_foreign),
-                statusinfos[pkg->status].name);
+  statusfd_send("status: %s: %s", pkg->name, statusinfos[pkg->status].name);
 
   if (cstatus >= msdbrw_write)
     modstatdb_note_core(pkg);
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/dpkg-db.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/dpkg-db.h
--- dpkg/lib/dpkg/dpkg-db.h	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/dpkg-db.h	2012-06-07 10:11:09.426073000 -0700
@@ -30,7 +30,6 @@
 #include <dpkg/macros.h>
 #include <dpkg/varbuf.h>
 #include <dpkg/version.h>
-#include <dpkg/arch.h>
 
 DPKG_BEGIN_DECLS
 
@@ -69,12 +68,10 @@
 
 struct deppossi {
   struct dependency *up;
-  struct pkgset *ed;
+  struct pkginfo *ed;
   struct deppossi *next, *rev_next, *rev_prev;
   struct versionrevision version;
   enum depverrel verrel;
-  const struct dpkg_arch *arch;
-  bool arch_is_implicit;
   bool cyclebreak;
 };
 
@@ -108,18 +105,13 @@
  */
 struct pkgbin {
   struct dependency *depends;
+  struct deppossi *depended;
   /* The ‘essential’ flag, true = yes, false = no (absent). */
   bool essential;
-  enum pkgmultiarch {
-    multiarch_no,
-    multiarch_same,
-    multiarch_allowed,
-    multiarch_foreign,
-  } multiarch;
-  const struct dpkg_arch *arch;
   const char *description;
   const char *maintainer;
   const char *source;
+  const char *arch;
   const char *installedsize;
   const char *origin;
   const char *bugs;
@@ -162,9 +154,8 @@
  * Note: Usually referred in the code as pig.
  */
 struct pkginfo {
-  struct pkgset *set;
-  struct pkginfo *arch_next;
-
+  struct pkginfo *next;
+  const char *name;
   enum pkgwant {
     want_unknown, want_install, want_hold, want_deinstall, want_purge,
     /* Not allowed except as special sentinel value in some places. */
@@ -209,20 +200,6 @@
   /* ->pend == this, non-NULL for us when Triggers-Pending. */
   struct trigaw *othertrigaw_head;
   struct trigpend *trigpend_head;
-
-};
-
-/**
- * Node describing a package set sharing the same package name.
- */
-struct pkgset {
-  struct pkgset *next;
-  const char *name;
-  struct pkginfo pkg;
-  struct {
-    struct deppossi *available;
-    struct deppossi *installed;
-  } depended;
 };
 
 /*** from dbdir.c ***/
@@ -260,20 +237,16 @@
 
 /*** from database.c ***/
 
-void pkgset_blank(struct pkgset *set);
 void pkg_blank(struct pkginfo *pp);
-void pkgbin_blank(struct pkgbin *pifp, bool keep_arch);
+void pkgbin_blank(struct pkgbin *pifp);
 bool pkg_is_informative(struct pkginfo *pkg, struct pkgbin *info);
 
-struct pkginfo *pkg_db_find_pkg(const char *name, const struct dpkg_arch *arch);
-struct pkgset *pkg_db_find_set(const char *name);
-int pkg_db_count_set(void);
-int pkg_db_count_pkg(void);
+struct pkginfo *pkg_db_find(const char *name);
+int pkg_db_count(void);
 void pkg_db_reset(void);
 
 struct pkgiterator *pkg_db_iter_new(void);
-struct pkginfo *pkg_db_iter_next_pkg(struct pkgiterator *iter);
-struct pkgset *pkg_db_iter_next_set(struct pkgiterator *iter);
+struct pkginfo *pkg_db_iter_next(struct pkgiterator *iter);
 void pkg_db_iter_free(struct pkgiterator *iter);
 
 void pkg_db_report(FILE *);
@@ -309,33 +282,21 @@
 #include <dpkg/namevalue.h>
 
 extern const struct namevalue booleaninfos[];
-extern const struct namevalue multiarchinfos[];
 extern const struct namevalue priorityinfos[];
 extern const struct namevalue statusinfos[];
 extern const struct namevalue eflaginfos[];
 extern const struct namevalue wantinfos[];
 
+#include <dpkg/error.h>
+
 enum versiondisplayepochwhen { vdew_never, vdew_nonambig, vdew_always };
 void varbufversion(struct varbuf*, const struct versionrevision*,
                    enum versiondisplayepochwhen);
-const char *parseversion(struct versionrevision *rversion, const char*);
+int parseversion(struct versionrevision *rversion, const char *,
+                 struct dpkg_error *err);
 const char *versiondescribe(const struct versionrevision*,
                             enum versiondisplayepochwhen);
 
-enum pkg_describe_opts {
-  pdo_never   = 000, /* Never display arch */
-  pdo_foreign = 001, /* Display arch when it's a foreign one */
-  pdo_ma_same = 002, /* Display arch when it's multi-arch same */
-  pdo_always  = 004, /* Always display arch */
-
-  /* Options that can be combined */
-  pdo_when    = 007, /* Mask to get the main options only */
-  pdo_avail   = 010, /* Use pkg->available instead of pkg->installed */
-};
-void varbuf_pkg(struct varbuf *vb, const struct pkginfo *pkg,
-                enum pkg_describe_opts pdo);
-const char *pkg_describe(const struct pkginfo *pkg, enum pkg_describe_opts pdo);
-
 /*** from dump.c ***/
 
 void writerecord(FILE*, const char*,
@@ -358,7 +319,6 @@
 
 /*** from vercmp.c ***/
 
-bool archsatisfied(struct pkgbin *it, struct deppossi *against);
 bool versionsatisfied(struct pkgbin *it, struct deppossi *against);
 bool versionsatisfied3(const struct versionrevision *it,
                        const struct versionrevision *ref,
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/dpkg.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/dpkg.h
--- dpkg/lib/dpkg/dpkg.h	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/dpkg.h	2012-06-07 10:11:09.426073000 -0700
@@ -64,12 +64,12 @@
 #define DIVERSIONSFILE    "diversions"
 #define STATOVERRIDEFILE  "statoverride"
 #define UPDATESDIR        "updates/"
-#define INFODIR           "info/"
-#define TRIGGERSDIR       "triggers/"
+#define INFODIR           "info"
+#define TRIGGERSDIR       "triggers"
 #define TRIGGERSFILEFILE  "File"
 #define TRIGGERSDEFERREDFILE "Unincorp"
 #define TRIGGERSLOCKFILE  "Lock"
-#define CONTROLDIRTMP     "tmp.ci/"
+#define CONTROLDIRTMP     "tmp.ci"
 #define IMPORTANTTMP      "tmp.i"
 #define REASSEMBLETMP     "reassemble" DEBEXT
 #define IMPORTANTMAXLEN    10
@@ -83,8 +83,11 @@
 #define MAXTRIGDIRECTIVE     256
 
 #define BACKEND		"dpkg-deb"
-#define DPKGQUERY	"dpkg-query"
 #define SPLITTER	"dpkg-split"
+#define DPKGQUERY	"dpkg-query"
+#define DPKGDIVERT	"dpkg-divert"
+#define DPKGSTAT	"dpkg-statoverride"
+#define DPKGTRIGGER	"dpkg-trigger"
 #define DPKG		"dpkg"
 #define DEBSIGVERIFY	"/usr/bin/debsig-verify"
 
@@ -95,6 +98,7 @@
 
 #define FIND_EXPRSTARTCHARS "-(),!"
 
+#include <dpkg/progname.h>
 #include <dpkg/ehandle.h>
 
 /*** from startup.c ***/
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/dump.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/dump.c
--- dpkg/lib/dpkg/dump.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/dump.c	2012-06-07 10:11:09.426073000 -0700
@@ -4,8 +4,6 @@
  *
  * Copyright © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
  * Copyright © 2001 Wichert Akkerman
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,10 +47,10 @@
        const struct pkginfo *pigp, const struct pkgbin *pifp,
        enum fwriteflags flags, const struct fieldinfo *fip)
 {
-  assert(pigp->set->name);
+  assert(pigp->name);
   if (flags&fw_printheader)
     varbuf_add_str(vb, "Package: ");
-  varbuf_add_str(vb, pigp->set->name);
+  varbuf_add_str(vb, pigp->name);
   if (flags&fw_printheader)
     varbuf_add_char(vb, '\n');
 }
@@ -168,43 +166,6 @@
 }
 
 void
-w_multiarch(struct varbuf *vb,
-            const struct pkginfo *pigp, const struct pkgbin *pifp,
-            enum fwriteflags flags, const struct fieldinfo *fip)
-{
-  int value = PKGPFIELD(pifp, fip->integer, int);
-
-  if (!(flags & fw_printheader)) {
-    varbuf_add_str(vb, multiarchinfos[value].name);
-    return;
-  }
-  if (!value)
-    return;
-  varbuf_add_str(vb, fip->name);
-  varbuf_add_str(vb, ": ");
-  varbuf_add_str(vb, multiarchinfos[value].name);
-  varbuf_add_char(vb, '\n');
-}
-
-void
-w_architecture(struct varbuf *vb,
-               const struct pkginfo *pigp, const struct pkgbin *pifp,
-               enum fwriteflags flags, const struct fieldinfo *fip)
-{
-  if (!pifp->arch)
-    return;
-  if (pifp->arch->type == arch_none)
-    return;
-  if (flags & fw_printheader) {
-    varbuf_add_str(vb, fip->name);
-    varbuf_add_str(vb, ": ");
-  }
-  varbuf_add_str(vb, pifp->arch->name);
-  if (flags & fw_printheader)
-    varbuf_add_char(vb, '\n');
-}
-
-void
 w_priority(struct varbuf *vb,
            const struct pkginfo *pigp, const struct pkgbin *pifp,
            enum fwriteflags flags, const struct fieldinfo *fip)
@@ -280,10 +241,6 @@
     varbuf_add_str(vb, possdel);
     possdel = " | ";
     varbuf_add_str(vb, dop->ed->name);
-    if (!dop->arch_is_implicit && dop->arch) {
-      varbuf_add_char(vb, ':');
-      varbuf_add_str(vb, dop->arch->name);
-    }
     if (dop->verrel != dvr_none) {
       varbuf_add_str(vb, " (");
       switch (dop->verrel) {
@@ -403,29 +360,13 @@
     varbuf_add_str(vb, "Triggers-Awaited:");
   for (ta = pigp->trigaw.head; ta; ta = ta->sameaw.next) {
     varbuf_add_char(vb, ' ');
-    varbuf_pkg(vb, ta->pend, pdo_foreign);
+    varbuf_add_str(vb, ta->pend->name);
   }
   if (flags & fw_printheader)
     varbuf_add_char(vb, '\n');
 }
 
 void
-w_packagespec(struct varbuf *vb,
-              const struct pkginfo *pigp, const struct pkgbin *pifp,
-              enum fwriteflags flags, const struct fieldinfo *fip)
-{
-  enum pkg_describe_opts pdo = pdo_foreign;
-
-  assert(pigp->set->name);
-  if (flags & fw_printheader)
-    return; /* PackageSpec is not meant to be printed as a real field */
-
-  if (pifp == &pigp->available)
-    pdo |= pdo_avail;
-  varbuf_pkg(vb, pigp, pdo);
-}
-
-void
 varbufrecord(struct varbuf *vb,
              const struct pkginfo *pigp, const struct pkgbin *pifp)
 {
@@ -451,14 +392,10 @@
 
   varbufrecord(&vb,pigp,pifp);
   varbuf_end_str(&vb);
-  if (fputs(vb.buf,file) < 0) {
-    enum pkg_describe_opts pdo = pdo_foreign;
-    if (pifp == &pigp->available)
-      pdo |= pdo_avail;
-    ohshite(_("failed to write details of `%.50s' to `%.250s'"),
-            pkg_describe(pigp, pdo), filename);
-  }
-  varbuf_destroy(&vb);
+  if (fputs(vb.buf,file) < 0)
+    ohshite(_("failed to write details of `%.50s' to `%.250s'"), pigp->name,
+	    filename);
+   varbuf_destroy(&vb);
 }
 
 void
@@ -489,7 +426,7 @@
     ohshite(_("unable to set buffering on %s database file"), which);
 
   it = pkg_db_iter_new();
-  while ((pigp = pkg_db_iter_next_pkg(it)) != NULL) {
+  while ((pigp = pkg_db_iter_next(it)) != NULL) {
     pifp = (flags & wdb_dump_available) ? &pigp->available : &pigp->installed;
     /* Don't dump records which have no useful content. */
     if (!pkg_is_informative(pigp, pifp))
@@ -499,10 +436,7 @@
     varbuf_end_str(&vb);
     if (fputs(vb.buf,file) < 0)
       ohshite(_("failed to write %s database record about '%.50s' to '%.250s'"),
-              which,
-              pkg_describe(pigp, pdo_foreign | ((flags & wdb_dump_available) ?
-                                                pdo_avail : 0)),
-              filename);
+              which, pigp->name, filename);
     varbuf_reset(&vb);
   }
   pkg_db_iter_free(it);
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/ehandle.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/ehandle.c
--- dpkg/lib/dpkg/ehandle.c	2011-03-24 16:35:56.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/ehandle.c	2012-06-07 10:11:09.426073000 -0700
@@ -31,6 +31,7 @@
 
 #include <dpkg/macros.h>
 #include <dpkg/i18n.h>
+#include <dpkg/progname.h>
 #include <dpkg/ehandle.h>
 
 /* 6x255 for inserted strings (%.255s &c in fmt; and %s with limited length arg)
@@ -91,13 +92,13 @@
      * abort. Hopefully the user can fix the situation (out of disk, out
      * of memory, etc). */
     fprintf(stderr, _("%s: unrecoverable fatal error, aborting:\n %s\n"),
-            thisname, errmsg);
+            dpkg_get_progname(), errmsg);
     exit(2);
   }
 
   if (econtext == NULL) {
     fprintf(stderr, _("%s: outside error context, aborting:\n %s\n"),
-            thisname, errmsg);
+            dpkg_get_progname(), errmsg);
     exit(2);
   } else if (econtext->handler_type == handler_type_func) {
     econtext->handler.func();
@@ -179,7 +180,8 @@
 static void
 print_cleanup_error(const char *emsg, const char *contextstring)
 {
-  fprintf(stderr, _("%s: error while cleaning up:\n %s\n"),thisname,emsg);
+  fprintf(stderr, _("%s: error while cleaning up:\n %s\n"),
+          dpkg_get_progname(), emsg);
 }
 
 static void
@@ -197,7 +199,7 @@
   if (++preventrecurse > 3) {
     onerr_abort++;
     fprintf(stderr, _("%s: too many nested errors during error recovery!!\n"),
-            thisname);
+            dpkg_get_progname());
     flagset= 0;
   } else {
     flagset= flagsetin;
@@ -347,7 +349,7 @@
 void
 print_fatal_error(const char *emsg, const char *contextstring)
 {
-  fprintf(stderr, _("%s: error: %s\n"), thisname, emsg);
+  fprintf(stderr, _("%s: error: %s\n"), dpkg_get_progname(), emsg);
 }
 
 void
@@ -388,7 +390,7 @@
 
   warn_count++;
   vsnprintf(buf, sizeof(buf), fmt, args);
-  fprintf(stderr, _("%s: warning: %s\n"), thisname, buf);
+  fprintf(stderr, _("%s: warning: %s\n"), dpkg_get_progname(), buf);
 }
 
 void
@@ -412,7 +414,7 @@
   va_end(args);
 
   fprintf(stderr, _("%s:%s:%d: internal error: %s\n"),
-          thisname, file, line, buf);
+          dpkg_get_progname(), file, line, buf);
 
   abort();
 }
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/ehandle.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/ehandle.h
--- dpkg/lib/dpkg/ehandle.h	2011-03-24 16:35:56.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/ehandle.h	2012-06-07 10:11:09.426073000 -0700
@@ -30,9 +30,6 @@
 
 DPKG_BEGIN_DECLS
 
-/* Defined separately in each program. */
-extern const char thisname[];
-
 extern volatile int onerr_abort;
 
 enum {
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/error.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/error.c
--- dpkg/lib/dpkg/error.c	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/error.c	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,93 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * error.c - error message reporting
+ *
+ * Copyright © 2011 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <errno.h>
+#include <stdlib.h>
+
+#include <dpkg/dpkg.h>
+#include <dpkg/varbuf.h>
+#include <dpkg/error.h>
+
+static void DPKG_ATTR_VPRINTF(3)
+dpkg_error_set(struct dpkg_error *err, int type, const char *fmt, va_list args)
+{
+	struct varbuf str = VARBUF_INIT;
+
+	if (err == NULL)
+		return;
+
+	err->type = type;
+
+	varbuf_vprintf(&str, fmt, args);
+	err->str = str.buf;
+}
+
+int
+dpkg_put_warn(struct dpkg_error *err, const char *fmt, ...)
+{
+	va_list args;
+
+	va_start(args, fmt);
+	dpkg_error_set(err, DPKG_MSG_WARN, fmt, args);
+	va_end(args);
+
+	return -1;
+}
+
+int
+dpkg_put_error(struct dpkg_error *err, const char *fmt, ...)
+{
+	va_list args;
+
+	va_start(args, fmt);
+	dpkg_error_set(err, DPKG_MSG_ERROR, fmt, args);
+	va_end(args);
+
+	return -1;
+}
+
+int
+dpkg_put_errno(struct dpkg_error *err, const char *fmt, ...)
+{
+	va_list args;
+	char *new_fmt;
+	int errno_saved = errno;
+
+	va_start(args, fmt);
+	m_asprintf(&new_fmt, "%s (%s)", fmt, strerror(errno_saved));
+	va_end(args);
+
+	dpkg_error_set(err, DPKG_MSG_ERROR, new_fmt, args);
+
+	free(new_fmt);
+
+	return -1;
+}
+
+void
+dpkg_error_destroy(struct dpkg_error *err)
+{
+	err->type = DPKG_MSG_NONE;
+	free(err->str);
+	err->str = NULL;
+}
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/error.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/error.h
--- dpkg/lib/dpkg/error.h	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/error.h	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,49 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * error.h - error message reporting
+ *
+ * Copyright © 2011 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBDPKG_ERROR_H
+#define LIBDPKG_ERROR_H
+
+#include <dpkg/macros.h>
+
+DPKG_BEGIN_DECLS
+
+struct dpkg_error {
+	enum dpkg_msg_type {
+		DPKG_MSG_NONE,
+		DPKG_MSG_WARN,
+		DPKG_MSG_ERROR,
+	} type;
+
+	char *str;
+};
+
+int dpkg_put_warn(struct dpkg_error *err, const char *fmt, ...)
+	DPKG_ATTR_PRINTF(2);
+int dpkg_put_error(struct dpkg_error *err, const char *fmt, ...)
+	DPKG_ATTR_PRINTF(2);
+int dpkg_put_errno(struct dpkg_error *err, const char *fmt, ...)
+	DPKG_ATTR_PRINTF(2);
+
+void dpkg_error_destroy(struct dpkg_error *err);
+
+DPKG_END_DECLS
+
+#endif /* LIBDPKG_ERROR_H */
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/fdio.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/fdio.c
--- dpkg/lib/dpkg/fdio.c	2011-03-01 14:31:03.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/fdio.c	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * libdpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * fdio.c - safe file descriptor based input/output
  *
  * Copyright © 2009-2010 Guillem Jover <guillem@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/fdio.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/fdio.h
--- dpkg/lib/dpkg/fdio.h	2011-03-01 14:31:03.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/fdio.h	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * libdpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * fdio.h - safe file descriptor based input/output
  *
  * Copyright © 2009-2010 Guillem Jover <guillem@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/fields.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/fields.c
--- dpkg/lib/dpkg/fields.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/fields.c	2012-06-07 10:11:09.426073000 -0700
@@ -4,9 +4,6 @@
  *
  * Copyright © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
  * Copyright © 2001 Wichert Akkerman
- * Copyright © 2009 Canonical Ltd.
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,14 +29,12 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/arch.h>
 #include <dpkg/path.h>
 #include <dpkg/parsedump.h>
-#include <dpkg/pkg-spec.h>
 #include <dpkg/triglib.h>
 
 static int
-parse_nv_next(struct parsedb_state *ps, const struct pkginfo *pigp,
+parse_nv_next(struct parsedb_state *ps,
               const char *what, const struct namevalue *nv_head,
               const char **strp)
 {
@@ -47,11 +42,11 @@
   const struct namevalue *nv;
 
   if (str_start[0] == '\0')
-    parse_error(ps, pigp, _("%s is missing"), what);
+    parse_error(ps, _("%s is missing"), what);
 
   nv = namevalue_find_by_name(nv_head, str_start);
   if (nv == NULL)
-    parse_error(ps, pigp, _("'%.50s' is not allowed for %s"), str_start, what);
+    parse_error(ps, _("'%.50s' is not allowed for %s"), str_start, what);
 
   /* We got the fallback value, skip further string validation. */
   if (nv->length == 0) {
@@ -67,15 +62,15 @@
 }
 
 static int
-parse_nv_last(struct parsedb_state *ps, const struct pkginfo *pkg,
+parse_nv_last(struct parsedb_state *ps,
               const char *what, const struct namevalue *nv_head,
               const char *str)
 {
   int value;
 
-  value = parse_nv_next(ps, pkg, what, nv_head, &str);
+  value = parse_nv_next(ps, what, nv_head, &str);
   if (str != NULL && str[0] != '\0')
-    parse_error(ps, pkg, _("junk after %s"), what);
+    parse_error(ps, _("junk after %s"), what);
 
   return value;
 }
@@ -89,9 +84,9 @@
 
   e = pkg_name_is_illegal(value, NULL);
   if (e != NULL)
-    parse_error(ps, pigp, _("invalid package name (%.250s)"), e);
-  /* We use the new name, as pkg_db_find_set() may have done a tolower for us. */
-  pigp->set->name = pkg_db_find_set(value)->name;
+    parse_error(ps, _("invalid package name (%.250s)"), e);
+  /* We use the new name, as pkg_db_find() may have done a tolower for us. */
+  pigp->name = pkg_db_find(value)->name;
 }
 
 void
@@ -104,9 +99,9 @@
   int allowextend;
 
   if (!*value)
-    parse_error(ps, pigp, _("empty file details field `%s'"), fip->name);
+    parse_error(ps, _("empty file details field `%s'"), fip->name);
   if (!(ps->flags & pdb_recordavailable))
-    parse_error(ps, pigp,
+    parse_error(ps,
                 _("file details field `%s' not allowed in status file"),
                fip->name);
   allowextend= !pigp->files;
@@ -119,7 +114,7 @@
     fdp= *fdpp;
     if (!fdp) {
       if (!allowextend)
-        parse_error(ps, pigp,
+        parse_error(ps,
                     _("too many values in file details field `%s' "
                       "(compared to others)"), fip->name);
       fdp= nfmalloc(sizeof(struct filedetails));
@@ -133,7 +128,7 @@
     cpos= space;
   }
   if (*fdpp)
-    parse_error(ps, pigp,
+    parse_error(ps,
                 _("too few values in file details field `%s' "
                   "(compared to others)"), fip->name);
 }
@@ -156,42 +151,12 @@
   if (!*value)
     return;
 
-  boolean = parse_nv_last(ps, pigp, _("yes/no in boolean field"),
+  boolean = parse_nv_last(ps, _("yes/no in boolean field"),
                           booleaninfos, value);
   PKGPFIELD(pifp, fip->integer, bool) = boolean;
 }
 
 void
-f_multiarch(struct pkginfo *pigp, struct pkgbin *pifp,
-            struct parsedb_state *ps,
-            const char *value, const struct fieldinfo *fip)
-{
-  int multiarch;
-
-  if (!*value)
-    return;
-
-  multiarch = parse_nv_last(ps, pigp,
-                            _("foreign/allowed/same/no in quadstate field"),
-                            multiarchinfos, value);
-  PKGPFIELD(pifp, fip->integer, int) = multiarch;
-}
-
-void
-f_architecture(struct pkginfo *pigp, struct pkgbin *pifp,
-               struct parsedb_state *ps,
-               const char *value, const struct fieldinfo *fip)
-{
-  if (!*value)
-    return;
-
-  pifp->arch = dpkg_arch_find(value);
-  if (pifp->arch->type == arch_illegal)
-    parse_warn(ps, pigp, _("'%s' is not a valid architecture name: %s"),
-               value, dpkg_arch_name_is_illegal(value));
-}
-
-void
 f_section(struct pkginfo *pigp, struct pkgbin *pifp,
           struct parsedb_state *ps,
           const char *value, const struct fieldinfo *fip)
@@ -206,7 +171,7 @@
            const char *value, const struct fieldinfo *fip)
 {
   if (!*value) return;
-  pigp->priority = parse_nv_last(ps, pigp, _("word in `priority' field"),
+  pigp->priority = parse_nv_last(ps, _("word in `priority' field"),
                                  priorityinfos, value);
   if (pigp->priority == pri_other) pigp->otherpriority= nfstrsave(value);
 }
@@ -217,18 +182,18 @@
          const char *value, const struct fieldinfo *fip)
 {
   if (ps->flags & pdb_rejectstatus)
-    parse_error(ps, pigp,
+    parse_error(ps,
                 _("value for `status' field not allowed in this context"));
   if (ps->flags & pdb_recordavailable)
     return;
 
-  pigp->want = parse_nv_next(ps, pigp,
+  pigp->want = parse_nv_next(ps,
                              _("first (want) word in `status' field"),
                              wantinfos, &value);
-  pigp->eflag = parse_nv_next(ps, pigp,
+  pigp->eflag = parse_nv_next(ps,
                               _("second (error) word in `status' field"),
                               eflaginfos, &value);
-  pigp->status = parse_nv_last(ps, pigp,
+  pigp->status = parse_nv_last(ps,
                                _("third (status) word in `status' field"),
                                statusinfos, value);
 }
@@ -238,7 +203,7 @@
           struct parsedb_state *ps,
           const char *value, const struct fieldinfo *fip)
 {
-  parse_db_version(ps, pigp, &pifp->version, value,
+  parse_db_version(ps, &pifp->version, value,
                    _("error in Version string '%.250s'"), value);
 }
 
@@ -249,7 +214,7 @@
 {
   char *newversion;
 
-  parse_warn(ps, pigp,
+  parse_warn(ps,
              _("obsolete `Revision' or `Package-Revision' field used"));
   if (!*value) return;
   if (pifp->version.revision && *pifp->version.revision) {
@@ -266,12 +231,12 @@
                 const char *value, const struct fieldinfo *fip)
 {
   if (ps->flags & pdb_rejectstatus)
-    parse_error(ps, pigp,
+    parse_error(ps,
                 _("value for `config-version' field not allowed in this context"));
   if (ps->flags & pdb_recordavailable)
     return;
 
-  parse_db_version(ps, pigp, &pigp->configversion, value,
+  parse_db_version(ps, &pigp->configversion, value,
                    _("error in Config-Version string '%.250s'"), value);
 
 }
@@ -283,8 +248,7 @@
                                 const char *endent,
                                 const char **word_start_r, int *word_len_r,
                                 const char **new_from_r,
-                                struct parsedb_state *ps,
-                                struct pkginfo *pigp)
+                                struct parsedb_state *ps)
 {
   const char *lastspc;
 
@@ -298,7 +262,7 @@
   return;
 
 malformed:
-  parse_error(ps, pigp,
+  parse_error(ps,
               _("value for `conffiles' has malformatted line `%.*s'"),
               (int)min(endent - value, 250), value);
 }
@@ -319,24 +283,24 @@
     c= *value++;
     if (c == '\n') continue;
     if (c != ' ')
-      parse_error(ps, pigp,
+      parse_error(ps,
                   _("value for `conffiles' has line starting with non-space `%c'"),
                   c);
     for (endent = value; (c = *endent) != '\0' && c != '\n'; endent++) ;
     conffvalue_lastword(value, endent, endent,
 			&hashstart, &hashlen, &endfn,
-                        ps, pigp);
+                        ps);
     obsolete= (hashlen == sizeof(obsolete_str)-1 &&
 	       !memcmp(hashstart, obsolete_str, hashlen));
     if (obsolete)
       conffvalue_lastword(value, endfn, endent,
 			  &hashstart, &hashlen, &endfn,
-			  ps, pigp);
+			  ps);
     newlink= nfmalloc(sizeof(struct conffile));
     value = path_skip_slash_dotslash(value);
     namelen= (int)(endfn-value);
     if (namelen <= 0)
-      parse_error(ps, pigp,
+      parse_error(ps,
                   _("root or null directory is listed as a conffile"));
     newptr = nfmalloc(namelen+2);
     newptr[0]= '/';
@@ -362,9 +326,9 @@
 {
   char c1, c2;
   const char *p, *emsg;
-  const char *depnamestart, *versionstart, *archstart;
-  int depnamelength, versionlength, archlength;
-  static struct varbuf depname, version, arch;
+  const char *depnamestart, *versionstart;
+  int depnamelength, versionlength;
+  static struct varbuf depname, version;
 
   struct dependency *dyp, **ldypp;
   struct deppossi *dop, **ldopp;
@@ -389,25 +353,25 @@
     for (;;) {
       depnamestart= p;
       /* Skip over package name characters. */
-      while (*p && !isspace(*p) && *p != ':' && *p != '(' && *p != ',' &&
-             *p != '|')
-        p++;
+      while (*p && !isspace(*p) && *p != '(' && *p != ',' && *p != '|') {
+	p++;
+      }
       depnamelength= p - depnamestart ;
       varbuf_reset(&depname);
       varbuf_add_buf(&depname, depnamestart, depnamelength);
       varbuf_end_str(&depname);
       if (!depname.buf[0])
-        parse_error(ps, pigp,
+        parse_error(ps,
                     _("`%s' field, missing package name, or garbage where "
                       "package name expected"), fip->name);
       emsg = pkg_name_is_illegal(depname.buf, NULL);
       if (emsg)
-        parse_error(ps, pigp,
+        parse_error(ps,
                     _("`%s' field, invalid package name `%.255s': %s"),
                     fip->name, depname.buf, emsg);
       dop= nfmalloc(sizeof(struct deppossi));
       dop->up= dyp;
-      dop->ed = pkg_db_find_set(depname.buf);
+      dop->ed = pkg_db_find(depname.buf);
       dop->next= NULL; *ldopp= dop; ldopp= &dop->next;
 
       /* Don't link this (which is after all only ‘newpig’ from
@@ -421,40 +385,6 @@
 
       dop->cyclebreak = false;
 
-      /* See if we have an architecture specifier */
-      if (*p == ':') {
-        archstart = ++p;
-        while (*p && !isspace(*p) && *p != '(' && *p != ',' && *p != '|')
-          p++;
-        archlength = p - archstart;
-        varbuf_reset(&arch);
-        varbuf_add_buf(&arch, archstart, archlength);
-        varbuf_add_char(&arch, '\0');
-        if (!arch.buf[0])
-          parse_error(ps, pigp,
-                      _("'%s' field, missing architecture name, or garbage "
-                        "where architecture name expected"), fip->name);
-        dop->arch = dpkg_arch_find(arch.buf);
-        dop->arch_is_implicit = false;
-        if (strcmp(arch.buf, "any") != 0)
-          emsg = _("a value different from 'any' is currently not allowed");
-        else if (dop->arch->type == arch_illegal)
-          emsg = dpkg_arch_name_is_illegal(arch.buf);
-        if (emsg)
-          parse_error(ps, pigp,
-                      _("'%s' field, reference to '%.255s': "
-                        "invalid architecture name '%.255s': %s"),
-                      fip->name, depname.buf, arch.buf, emsg);
-      } else if (fip->integer == dep_conflicts || fip->integer == dep_breaks ||
-                 fip->integer == dep_replaces) {
-        /* Conflics/Breaks/Replaces get an implicit "any" arch qualifier. */
-        dop->arch = dpkg_arch_find("any");
-        dop->arch_is_implicit = true;
-      } else {
-        dop->arch = NULL;
-        dop->arch_is_implicit = true;
-      }
-
       /* Skip whitespace after package name. */
       while (isspace(*p)) p++;
 
@@ -472,13 +402,13 @@
             dop->verrel |= (dvrf_strict | dvrf_builtup);
             p++;
           } else if (c2 == '<' || c2 == '>') {
-            parse_error(ps, pigp,
+            parse_error(ps,
                         _("`%s' field, reference to `%.255s':\n"
                           " bad version relationship %c%c"),
                         fip->name, depname.buf, c1, c2);
             dop->verrel= dvr_none;
           } else {
-            parse_warn(ps, pigp,
+            parse_warn(ps,
                        _("`%s' field, reference to `%.255s':\n"
                          " `%c' is obsolete, use `%c=' or `%c%c' instead"),
                        fip->name, depname.buf, c1, c1, c1, c1);
@@ -488,7 +418,7 @@
           dop->verrel= dvr_exact;
           p++;
         } else {
-          parse_warn(ps, pigp,
+          parse_warn(ps,
                      _("`%s' field, reference to `%.255s':\n"
                        " implicit exact match on version number, "
                        "suggest using `=' instead"),
@@ -496,11 +426,11 @@
           dop->verrel= dvr_exact;
         }
 	if ((dop->verrel!=dvr_exact) && (fip->integer==dep_provides))
-          parse_warn(ps, pigp,
+          parse_warn(ps,
                      _("Only exact versions may be used for Provides"));
 
         if (!isspace(*p) && !isalnum(*p)) {
-          parse_warn(ps, pigp,
+          parse_warn(ps,
                      _("`%s' field, reference to `%.255s':\n"
                        " version value starts with non-alphanumeric, "
                        "suggest adding a space"),
@@ -517,21 +447,21 @@
 	versionlength= p - versionstart;
         while (isspace(*p)) p++;
         if (*p == '(')
-          parse_error(ps, pigp,
+          parse_error(ps,
                       _("`%s' field, reference to `%.255s': "
                         "version contains `%c'"), fip->name, depname.buf, ')');
         else if (*p != ')')
-          parse_error(ps, pigp,
+          parse_error(ps,
                       _("`%s' field, reference to `%.255s': "
                         "version contains `%c'"), fip->name, depname.buf, ' ');
         else if (*p == '\0')
-          parse_error(ps, pigp,
+          parse_error(ps,
                       _("`%s' field, reference to `%.255s': "
                         "version unterminated"), fip->name, depname.buf);
         varbuf_reset(&version);
         varbuf_add_buf(&version, versionstart, versionlength);
         varbuf_end_str(&version);
-        parse_db_version(ps, pigp, &dop->version, version.buf,
+        parse_db_version(ps, &dop->version, version.buf,
                          _("'%s' field, reference to '%.255s': "
                            "error in version"), fip->name, depname.buf);
         p++; while (isspace(*p)) p++;
@@ -541,14 +471,14 @@
       }
       if (!*p || *p == ',') break;
       if (*p != '|')
-        parse_error(ps, pigp,
+        parse_error(ps,
                     _("`%s' field, syntax error after reference to package `%.255s'"),
                     fip->name, dop->ed->name);
       if (fip->integer == dep_conflicts ||
           fip->integer == dep_breaks ||
           fip->integer == dep_provides ||
           fip->integer == dep_replaces)
-        parse_error(ps, pigp,
+        parse_error(ps,
                     _("alternatives (`|') not allowed in %s field"), fip->name);
       p++; while (isspace(*p)) p++;
     }
@@ -602,18 +532,18 @@
   const char *word, *emsg;
 
   if (ps->flags & pdb_rejectstatus)
-    parse_error(ps, pend,
+    parse_error(ps,
                 _("value for `triggers-pending' field not allowed in "
                   "this context"));
 
   while ((word = scan_word(&value))) {
     emsg = trig_name_is_illegal(word);
     if (emsg)
-      parse_error(ps, pend,
+      parse_error(ps,
                   _("illegal pending trigger name `%.255s': %s"), word, emsg);
 
     if (!trig_note_pend_core(pend, nfstrsave(word)))
-      parse_error(ps, pend,
+      parse_error(ps,
                   _("duplicate pending trigger `%.255s'"), word);
   }
 }
@@ -625,35 +555,24 @@
 {
   const char *word, *emsg;
   struct pkginfo *pend;
-  struct pkg_spec pkgspec = PKG_SPEC_INIT(psf_def_native | psf_no_check);
 
   if (ps->flags & pdb_rejectstatus)
-    parse_error(ps, aw,
+    parse_error(ps,
                 _("value for `triggers-awaited' field not allowed in "
                   "this context"));
 
   while ((word = scan_word(&value))) {
-    pkg_spec_parse(&pkgspec, word);
-    emsg = pkg_spec_is_illegal(&pkgspec);
+    emsg = pkg_name_is_illegal(word, NULL);
     if (emsg)
-      parse_error(ps, aw,
+      parse_error(ps,
                   _("illegal package name in awaited trigger `%.255s': %s"),
                   word, emsg);
-    pend = pkg_spec_find_pkg(&pkgspec, NULL);
+    pend = pkg_db_find(word);
 
     if (!trig_note_aw(pend, aw))
-      parse_error(ps, aw,
+      parse_error(ps,
                   _("duplicate awaited trigger package `%.255s'"), word);
 
-    trig_enqueue_awaited_pend(pend);
+    trig_awaited_pend_enqueue(pend);
   }
-  pkg_spec_reset(&pkgspec);
-}
-
-void
-f_forbidden(struct pkginfo *pigp, struct pkgbin *pifp,
-            struct parsedb_state *ps,
-            const char *value, const struct fieldinfo *fip)
-{
-  parse_error(ps, pigp, _("Field '%s' is not allowed in input"), fip->name);
 }
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/file.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/file.c
--- dpkg/lib/dpkg/file.c	2011-03-24 16:35:56.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/file.c	2012-06-07 10:11:09.426073000 -0700
@@ -121,7 +121,7 @@
  *
  * @param lockfd The pointer to the lock file descriptor. It must be allocated
  *        statically as its addresses is passed to a cleanup handler.
- * @param flags The lock flags specifiying what type of locking to perform.
+ * @param flags The lock flags specifying what type of locking to perform.
  * @param filename The name of the file to lock.
  * @param desc The description of the file to lock.
  */
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/.gitignore
--- dpkg/lib/dpkg/.gitignore	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-trigdeferred.c
-libdpkg.pc
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/glob.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/glob.c
--- dpkg/lib/dpkg/glob.c	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/glob.c	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * glob.c - file globing functions
  *
  * Copyright © 2009, 2010 Guillem Jover <guillem@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/glob.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/glob.h
--- dpkg/lib/dpkg/glob.h	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/glob.h	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * glob.h - file globing functions
  *
  * Copyright © 2009, 2010 Guillem Jover <guillem@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/libdpkg.Versions /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/libdpkg.Versions
--- dpkg/lib/dpkg/libdpkg.Versions	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/libdpkg.Versions	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,9 @@
 LIBDPKG_0 {
 global:
+	# Program name
+	dpkg_set_progname;
+	dpkg_get_progname;
+
 	# Ar support
 	dpkg_ar_normalize_name;
 
@@ -54,6 +58,7 @@
 
 	str_escape_fmt;
 	str_strip_quotes;
+	str_quote_meta;
 
 	# Variable buffer support
 	varbuf_init;
@@ -129,29 +134,10 @@
 	dpkg_ar_member_put_mem;
 	dpkg_ar_member_get_size;
 
-	# Architecture DB
-	dpkg_arch_find;
-	dpkg_arch_get_native;
-	dpkg_arch_get_list;
-	dpkg_arch_name_is_illegal;
-	dpkg_arch_reset;
-
-	# Package specifiers
-	pkg_spec_reset;
-	pkg_spec_parse;
-	pkg_spec_is_pattern;
-	pkg_spec_is_illegal;
-	pkg_spec_find_pkg;
-	pkg_spec_match_pkg;
-	pkg_spec_iter_start;
-	pkg_spec_iter_next_pkg;
-
 	# Configuration and command line handling
 	loadcfgfile;
 	myopt;
 	badusage;
-	# printforhelp;		# XXX variable, do not require external
-	# thisname;		# XXX variable, do not require external
 	cipaction;		# XXX variable, do not export
 	setaction;
 	setobsolete;
@@ -196,8 +182,6 @@
 	copy_dependency_links;
 	pkg_sorter_by_name;
 	pkg_summary;
-	pkg_describe;
-	varbuf_pkg;
 
 	# Package list handling
 	pkg_list_new;
@@ -222,14 +206,11 @@
 	pkg_format_free;
 
 	# Package in-core database functions
-	pkg_db_find_set;
-	pkg_db_find_pkg;
-	pkg_db_count_set;
-	pkg_db_count_pkg;
+	pkg_db_find;
+	pkg_db_count;
 	pkg_db_reset;
 	pkg_db_iter_new;
-	pkg_db_iter_next_set;
-	pkg_db_iter_next_pkg;
+	pkg_db_iter_next;
 	pkg_db_iter_free;
 
 	# Package on-disk database functions
@@ -241,6 +222,10 @@
 	parsedb;
 	writedb;
 
+	dpkg_db_set_dir;
+	dpkg_db_get_dir;
+	dpkg_db_get_path;
+
 	# Log based package on-disk database support
 	modstatdb_init;
 	modstatdb_is_locked;
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/log.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/log.c
--- dpkg/lib/dpkg/log.c	2011-03-09 14:40:51.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/log.c	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * log.c - logging related functions
  *
  * Copyright © 2005 Scott James Remnant <scott@netsplit.com>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/Makefile.am /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/Makefile.am
--- dpkg/lib/dpkg/Makefile.am	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/Makefile.am	2012-06-07 10:11:09.426073000 -0700
@@ -25,7 +25,6 @@
 libdpkg_a_SOURCES = \
 	dlist.h \
 	ar.c \
-	arch.c \
 	buffer.c \
 	cleanup.c \
 	command.c \
@@ -36,6 +35,7 @@
 	dir.c \
 	dump.c \
 	ehandle.c \
+	error.c \
 	fdio.c \
 	file.c \
 	fields.c \
@@ -44,9 +44,9 @@
 	log.c \
 	md5.c md5.h \
 	mlib.c \
-	myopt.c \
 	namevalue.c \
 	nfmalloc.c \
+	options.c \
 	parse.c \
 	parsehelp.c \
 	path.c \
@@ -57,12 +57,14 @@
 	pkg-list.c \
 	pkg-queue.c \
 	pkg-show.c \
-	pkg-spec.c \
+	progname.c \
 	progress.c \
 	string.c \
 	subproc.c \
 	tarfn.c \
 	test.h \
+	trigname.c \
+	trignote.c \
 	triglib.c \
 	trigdeferred.l \
 	utils.c \
@@ -72,7 +74,6 @@
 
 pkginclude_HEADERS = \
 	ar.h \
-	arch.h \
 	buffer.h \
 	command.h \
 	compress.h \
@@ -81,12 +82,13 @@
 	dpkg.h \
 	dpkg-db.h \
 	ehandle.h \
+	error.h \
 	fdio.h \
 	file.h \
 	glob.h \
 	macros.h \
-	myopt.h \
 	namevalue.h \
+	options.h \
 	parsedump.h \
 	path.h \
 	pkg.h \
@@ -95,7 +97,7 @@
 	pkg-list.h \
 	pkg-queue.h \
 	pkg-show.h \
-	pkg-spec.h \
+	progname.h \
 	progress.h \
 	string.h \
 	subproc.h \
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/Makefile.in /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/Makefile.in
--- dpkg/lib/dpkg/Makefile.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/Makefile.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,928 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = lib/dpkg
+DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/libdpkg.pc.in trigdeferred.c
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
+	$(top_srcdir)/m4/dpkg-build.m4 \
+	$(top_srcdir)/m4/dpkg-compiler.m4 \
+	$(top_srcdir)/m4/dpkg-coverage.m4 \
+	$(top_srcdir)/m4/dpkg-funcs.m4 $(top_srcdir)/m4/dpkg-libs.m4 \
+	$(top_srcdir)/m4/dpkg-linker.m4 $(top_srcdir)/m4/dpkg-progs.m4 \
+	$(top_srcdir)/m4/dpkg-types.m4 \
+	$(top_srcdir)/m4/dpkg-unicode.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = libdpkg.pc
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(pkgincludedir)"
+LIBRARIES = $(lib_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+libdpkg_a_AR = $(AR) $(ARFLAGS)
+libdpkg_a_LIBADD =
+am_libdpkg_a_OBJECTS = ar.$(OBJEXT) buffer.$(OBJEXT) cleanup.$(OBJEXT) \
+	command.$(OBJEXT) compress.$(OBJEXT) dbdir.$(OBJEXT) \
+	dbmodify.$(OBJEXT) debug.$(OBJEXT) dir.$(OBJEXT) \
+	dump.$(OBJEXT) ehandle.$(OBJEXT) error.$(OBJEXT) \
+	fdio.$(OBJEXT) file.$(OBJEXT) fields.$(OBJEXT) glob.$(OBJEXT) \
+	log.$(OBJEXT) md5.$(OBJEXT) mlib.$(OBJEXT) namevalue.$(OBJEXT) \
+	nfmalloc.$(OBJEXT) options.$(OBJEXT) parse.$(OBJEXT) \
+	parsehelp.$(OBJEXT) path.$(OBJEXT) pkg.$(OBJEXT) \
+	pkg-db.$(OBJEXT) pkg-array.$(OBJEXT) pkg-format.$(OBJEXT) \
+	pkg-list.$(OBJEXT) pkg-queue.$(OBJEXT) pkg-show.$(OBJEXT) \
+	progname.$(OBJEXT) progress.$(OBJEXT) string.$(OBJEXT) \
+	subproc.$(OBJEXT) tarfn.$(OBJEXT) trigname.$(OBJEXT) \
+	trignote.$(OBJEXT) triglib.$(OBJEXT) trigdeferred.$(OBJEXT) \
+	utils.$(OBJEXT) varbuf.$(OBJEXT) vercmp.$(OBJEXT) \
+	version.$(OBJEXT)
+libdpkg_a_OBJECTS = $(am_libdpkg_a_OBJECTS)
+DEFAULT_INCLUDES = 
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+AM_V_LEX = $(am__v_LEX_$(V))
+am__v_LEX_ = $(am__v_LEX_$(AM_DEFAULT_VERBOSITY))
+am__v_LEX_0 = @echo "  LEX   " $@;
+YLWRAP = $(top_srcdir)/build-aux/ylwrap
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(libdpkg_a_SOURCES)
+DIST_SOURCES = $(libdpkg_a_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+DATA = $(pkgconfig_DATA)
+HEADERS = $(pkginclude_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BZ2_LIBS = @BZ2_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCOV = @GCOV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LCOV = @LCOV@
+LCOV_GENHTML = @LCOV_GENHTML@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_COVER = @PERL_COVER@
+PERL_COVERAGE = @PERL_COVERAGE@
+PERL_LIBDIR = @PERL_LIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PO4A = @PO4A@
+POD2MAN = @POD2MAN@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_PO4A = @USE_PO4A@
+USE_UNICODE = @USE_UNICODE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+admindir = @admindir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = . test
+pkgconfdir = $(sysconfdir)/@PACKAGE@
+AM_CPPFLAGS = \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DCONFIGDIR=\"$(pkgconfdir)\" \
+	-DADMINDIR=\"$(admindir)\" \
+	-idirafter $(top_srcdir)/lib/compat \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/lib
+
+EXTRA_DIST = \
+	libdpkg.Versions \
+	libdpkg.pc.in
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libdpkg.pc
+lib_LIBRARIES = libdpkg.a
+libdpkg_a_SOURCES = \
+	dlist.h \
+	ar.c \
+	buffer.c \
+	cleanup.c \
+	command.c \
+	compress.c \
+	dbdir.c \
+	dbmodify.c \
+	debug.c \
+	dir.c \
+	dump.c \
+	ehandle.c \
+	error.c \
+	fdio.c \
+	file.c \
+	fields.c \
+	glob.c \
+	i18n.h \
+	log.c \
+	md5.c md5.h \
+	mlib.c \
+	namevalue.c \
+	nfmalloc.c \
+	options.c \
+	parse.c \
+	parsehelp.c \
+	path.c \
+	pkg.c \
+	pkg-db.c \
+	pkg-array.c \
+	pkg-format.c \
+	pkg-list.c \
+	pkg-queue.c \
+	pkg-show.c \
+	progname.c \
+	progress.c \
+	string.c \
+	subproc.c \
+	tarfn.c \
+	test.h \
+	trigname.c \
+	trignote.c \
+	triglib.c \
+	trigdeferred.l \
+	utils.c \
+	varbuf.c \
+	vercmp.c \
+	version.c
+
+pkginclude_HEADERS = \
+	ar.h \
+	buffer.h \
+	command.h \
+	compress.h \
+	debug.h \
+	dir.h \
+	dpkg.h \
+	dpkg-db.h \
+	ehandle.h \
+	error.h \
+	fdio.h \
+	file.h \
+	glob.h \
+	macros.h \
+	namevalue.h \
+	options.h \
+	parsedump.h \
+	path.h \
+	pkg.h \
+	pkg-array.h \
+	pkg-format.h \
+	pkg-list.h \
+	pkg-queue.h \
+	pkg-show.h \
+	progname.h \
+	progress.h \
+	string.h \
+	subproc.h \
+	tarfn.h \
+	trigdeferred.h \
+	triglib.h \
+	varbuf.h \
+	version.h
+
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .l .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/dpkg/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign lib/dpkg/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+libdpkg.pc: $(top_builddir)/config.status $(srcdir)/libdpkg.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-libLIBRARIES: $(lib_LIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(INSTALL_DATA) $$list2 "$(DESTDIR)$(libdir)" || exit $$?; }
+	@$(POST_INSTALL)
+	@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  if test -f $$p; then \
+	    $(am__strip_dir) \
+	    echo " ( cd '$(DESTDIR)$(libdir)' && $(RANLIB) $$f )"; \
+	    ( cd "$(DESTDIR)$(libdir)" && $(RANLIB) $$f ) || exit $$?; \
+	  else :; fi; \
+	done
+
+uninstall-libLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libdir)' && rm -f "$$files" )"; \
+	cd "$(DESTDIR)$(libdir)" && rm -f $$files
+
+clean-libLIBRARIES:
+	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+libdpkg.a: $(libdpkg_a_OBJECTS) $(libdpkg_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libdpkg.a
+	$(AM_V_AR)$(libdpkg_a_AR) libdpkg.a $(libdpkg_a_OBJECTS) $(libdpkg_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libdpkg.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cleanup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbdir.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmodify.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ehandle.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fields.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glob.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mlib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/namevalue.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nfmalloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parsehelp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/path.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkg-array.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkg-db.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkg-format.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkg-list.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkg-queue.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkg-show.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progress.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subproc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tarfn.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trigdeferred.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/triglib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trigname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trignote.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/varbuf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vercmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.l.c:
+	$(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
+	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
+	done
+
+uninstall-pkgincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f trigdeferred.c
+clean: clean-recursive
+
+clean-am: clean-generic clean-libLIBRARIES mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-pkgconfigDATA install-pkgincludeHEADERS
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-libLIBRARIES
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-libLIBRARIES uninstall-pkgconfigDATA \
+	uninstall-pkgincludeHEADERS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic \
+	clean-libLIBRARIES ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-libLIBRARIES install-man \
+	install-pdf install-pdf-am install-pkgconfigDATA \
+	install-pkgincludeHEADERS install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-libLIBRARIES uninstall-pkgconfigDATA \
+	uninstall-pkgincludeHEADERS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/myopt.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/myopt.c
--- dpkg/lib/dpkg/myopt.c	2011-03-01 14:31:03.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/myopt.c	1969-12-31 16:00:00.000000000 -0800
@@ -1,284 +0,0 @@
-/*
- * libdpkg - Debian packaging suite library routines
- * myopt.c - my very own option parsing
- *
- * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
- * Copyright © 2000,2002 Wichert Akkerman <wichert@deephackmode.org>
- * Copyright © 2008,2009 Guillem Jover <guillem@debian.org>
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include <compat.h>
-
-#include <errno.h>
-#include <ctype.h>
-#include <string.h>
-#include <dirent.h>
-#include <stdarg.h>
-#include <stdlib.h>
-
-#include <dpkg/i18n.h>
-#include <dpkg/dpkg.h>
-#include <dpkg/string.h>
-#include <dpkg/myopt.h>
-
-void
-badusage(const char *fmt, ...)
-{
-  char buf[1024];
-  va_list args;
-
-  va_start(args, fmt);
-  vsnprintf(buf, sizeof(buf), fmt, args);
-  va_end(args);
-
-  ohshit("%s\n\n%s", buf, gettext(printforhelp));
-}
-
-static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(3)
-config_error(const char *file_name, int line_num, const char *fmt, ...)
-{
-  char buf[1024];
-  va_list args;
-
-  va_start(args, fmt);
-  vsnprintf(buf, sizeof(buf), fmt, args);
-  va_end(args);
-
-  ohshit(_("configuration error: %s:%d: %s"), file_name, line_num, buf);
-}
-
-void myfileopt(const char* fn, const struct cmdinfo* cmdinfos) {
-  FILE* file;
-  int line_num = 0;
-  char linebuf[MAX_CONFIG_LINE];
-
-  file= fopen(fn, "r");
-  if (!file) {
-    if (errno==ENOENT)
-      return;
-    warning(_("failed to open configuration file '%.255s' for reading: %s"),
-            fn, strerror(errno));
-    return;
-  }
-
-  while (fgets(linebuf, sizeof(linebuf), file)) {
-    char* opt;
-    const struct cmdinfo *cip;
-    int l;
-
-    line_num++;
-
-    if ((linebuf[0] == '#') || (linebuf[0] == '\n') || (linebuf[0] == '\0'))
-      continue;
-    l=strlen(linebuf);
-    if (linebuf[l - 1] == '\n')
-      linebuf[l - 1] = '\0';
-    for (opt=linebuf;isalnum(*opt)||*opt=='-';opt++) ;
-    if (*opt == '\0')
-      opt=NULL;
-    else {
-      *opt++ = '\0';
-      if (*opt=='=') opt++;
-      while (isspace(*opt)) opt++;
-
-      opt = str_strip_quotes(opt);
-      if (opt == NULL)
-        config_error(fn, line_num, _("unbalanced quotes in '%s'"), linebuf);
-    }
-
-    for (cip=cmdinfos; cip->olong || cip->oshort; cip++) {
-      if (!cip->olong) continue;
-      if (!strcmp(cip->olong,linebuf)) break;
-      l=strlen(cip->olong);
-      if ((cip->takesvalue==2) && (linebuf[l]=='-') &&
-	  !opt && !strncmp(linebuf,cip->olong,l)) {
-	opt=linebuf+l+1;
-	break;
-      }
-    }
-
-    if (!cip->olong)
-      config_error(fn, line_num, _("unknown option '%s'"), linebuf);
-
-    if (cip->takesvalue) {
-      if (!opt)
-        config_error(fn, line_num, _("'%s' needs a value"), linebuf);
-      if (cip->call) cip->call(cip,opt);
-      else
-        *cip->sassignto = m_strdup(opt);
-    } else {
-      if (opt)
-        config_error(fn, line_num, _("'%s' does not take a value"), linebuf);
-      if (cip->call) cip->call(cip,NULL);
-      else
-        *cip->iassignto = cip->arg_int;
-    }
-  }
-  if (ferror(file)) ohshite(_("read error in configuration file `%.255s'"), fn);
-  if (fclose(file)) ohshite(_("error closing configuration file `%.255s'"), fn);
-}
-
-static int
-valid_config_filename(const struct dirent *dent)
-{
-  const char *c;
-
-  if (dent->d_name[0] == '.')
-    return 0;
-
-  for (c = dent->d_name; *c; c++)
-    if (!isalnum(*c) && *c != '_' && *c != '-')
-      return 0;
-
-  if (*c == '\0')
-    return 1;
-  else
-    return 0;
-}
-
-static void
-load_config_dir(const char *prog, const struct cmdinfo* cmdinfos)
-{
-  char *dirname;
-  struct dirent **dlist;
-  int dlist_n, i;
-
-  m_asprintf(&dirname, "%s/%s.cfg.d", CONFIGDIR, prog);
-
-  dlist_n = scandir(dirname, &dlist, valid_config_filename, alphasort);
-  if (dlist_n < 0) {
-    if (errno == ENOENT) {
-      free(dirname);
-      return;
-    } else
-      ohshite(_("error opening configuration directory '%s'"), dirname);
-  }
-
-  for (i = 0; i < dlist_n; i++) {
-    char *filename;
-
-    m_asprintf(&filename, "%s/%s", dirname, dlist[i]->d_name);
-    myfileopt(filename, cmdinfos);
-
-    free(dlist[i]);
-    free(filename);
-  }
-
-  free(dirname);
-  free(dlist);
-}
-
-void loadcfgfile(const char *prog, const struct cmdinfo* cmdinfos) {
-  char *home, *file;
-
-  load_config_dir(prog, cmdinfos);
-
-  m_asprintf(&file, "%s/%s.cfg", CONFIGDIR, prog);
-  myfileopt(file, cmdinfos);
-  free(file);
-
-  if ((home = getenv("HOME")) != NULL) {
-    m_asprintf(&file, "%s/.%s.cfg", home, prog);
-    myfileopt(file, cmdinfos);
-    free(file);
-  }
-}
-
-void myopt(const char *const **argvp, const struct cmdinfo *cmdinfos) {
-  const struct cmdinfo *cip;
-  const char *p, *value;
-  int l;
-
-  ++(*argvp);
-  while ((p= **argvp) && *p == '-') {
-    ++(*argvp);
-    if (!strcmp(p,"--")) break;
-    if (*++p == '-') {
-      ++p; value=NULL;
-      for (cip= cmdinfos;
-           cip->olong || cip->oshort;
-           cip++) {
-        if (!cip->olong) continue;
-        if (!strcmp(p,cip->olong)) break;
-        l= strlen(cip->olong);
-        if (!strncmp(p,cip->olong,l) &&
-            (p[l]== ((cip->takesvalue==2) ? '-' : '='))) { value=p+l+1; break; }
-      }
-      if (!cip->olong) badusage(_("unknown option --%s"),p);
-      if (cip->takesvalue) {
-        if (!value) {
-          value= *(*argvp)++;
-          if (!value) badusage(_("--%s option takes a value"),cip->olong);
-        }
-        if (cip->call) cip->call(cip,value);
-        else *cip->sassignto= value;
-      } else {
-        if (value) badusage(_("--%s option does not take a value"),cip->olong);
-        if (cip->call) cip->call(cip,NULL);
-        else
-          *cip->iassignto = cip->arg_int;
-      }
-    } else {
-      while (*p) {
-        for (cip= cmdinfos; (cip->olong || cip->oshort) && *p != cip->oshort; cip++);
-        if (!cip->oshort) badusage(_("unknown option -%c"),*p);
-        p++;
-        if (cip->takesvalue) {
-          if (!*p) {
-            value= *(*argvp)++;
-            if (!value) badusage(_("-%c option takes a value"),cip->oshort);
-          } else {
-            value= p; p="";
-            if (*value == '=') value++;
-          }
-          if (cip->call) cip->call(cip,value);
-          else *cip->sassignto= value;
-        } else {
-          if (*p == '=') badusage(_("-%c option does not take a value"),cip->oshort);
-          if (cip->call) cip->call(cip,NULL);
-          else
-            *cip->iassignto = cip->arg_int;
-        }
-      }
-    }
-  }
-}
-
-void
-setobsolete(const struct cmdinfo *cip, const char *value)
-{
-  warning(_("obsolete option '--%s'\n"), cip->olong);
-}
-
-const struct cmdinfo *cipaction = NULL;
-
-/* XXX: This function is a hack. */
-static inline int
-option_short(int c)
-{
-  return c ? c : '\b';
-}
-
-void
-setaction(const struct cmdinfo *cip, const char *value)
-{
-  if (cipaction)
-    badusage(_("conflicting actions -%c (--%s) and -%c (--%s)"),
-             option_short(cip->oshort), cip->olong,
-             option_short(cipaction->oshort), cipaction->olong);
-  cipaction = cip;
-}
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/myopt.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/myopt.h
--- dpkg/lib/dpkg/myopt.h	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/myopt.h	1969-12-31 16:00:00.000000000 -0800
@@ -1,76 +0,0 @@
-/*
- * libdpkg - Debian packaging suite library routines
- * myopt.h - declarations for my very own option parsing
- *
- * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MYOPT_H
-#define MYOPT_H
-
-#include <dpkg/macros.h>
-
-DPKG_BEGIN_DECLS
-
-typedef int action_func(const char *const *argv);
-
-struct cmdinfo {
-  const char *olong;
-  char oshort;
-
-  /*
-   * 0 = Normal				(-o, --option)
-   * 1 = Standard value			(-o=value, --option=value or
-   *					 -o value, --option value)
-   * 2 = Option string continued	(--option-value)
-   */
-  int takesvalue;
-  int *iassignto;
-  const char **sassignto;
-  void (*call)(const struct cmdinfo*, const char *value);
-
-  int arg_int;
-  void *arg_ptr;
-
-  action_func *action;
-};
-
-extern const char printforhelp[];
-
-void badusage(const char *fmt, ...) DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1);
-
-#define MAX_CONFIG_LINE 1024
-
-void myfileopt(const char* fn, const struct cmdinfo* cmdinfos);
-void myopt(const char *const **argvp, const struct cmdinfo *cmdinfos);
-void loadcfgfile(const char *prog, const struct cmdinfo *cmdinfos);
-
-/**
- * Current cmdinfo action.
- */
-extern const struct cmdinfo *cipaction;
-
-void setaction(const struct cmdinfo *cip, const char *value);
-void setobsolete(const struct cmdinfo *cip, const char *value);
-
-#define ACTION(longopt, shortopt, code, func) \
- { longopt, shortopt, 0, NULL, NULL, setaction, code, NULL, func }
-#define OBSOLETE(longopt, shortopt) \
- { longopt, shortopt, 0, NULL, NULL, setobsolete, 0, NULL, NULL }
-
-DPKG_END_DECLS
-
-#endif /* MYOPT_H */
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/options.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/options.c
--- dpkg/lib/dpkg/options.c	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/options.c	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,291 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * options.c - option parsing functions
+ *
+ * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 2000,2002 Wichert Akkerman <wichert@deephackmode.org>
+ * Copyright © 2008,2009 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <errno.h>
+#include <ctype.h>
+#include <string.h>
+#include <dirent.h>
+#include <stdarg.h>
+#include <stdlib.h>
+
+#include <dpkg/i18n.h>
+#include <dpkg/dpkg.h>
+#include <dpkg/string.h>
+#include <dpkg/options.h>
+
+static const char *printforhelp;
+
+void
+badusage(const char *fmt, ...)
+{
+  char buf[1024];
+  va_list args;
+
+  va_start(args, fmt);
+  vsnprintf(buf, sizeof(buf), fmt, args);
+  va_end(args);
+
+  ohshit("%s\n\n%s", buf, gettext(printforhelp));
+}
+
+static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(3)
+config_error(const char *file_name, int line_num, const char *fmt, ...)
+{
+  char buf[1024];
+  va_list args;
+
+  va_start(args, fmt);
+  vsnprintf(buf, sizeof(buf), fmt, args);
+  va_end(args);
+
+  ohshit(_("configuration error: %s:%d: %s"), file_name, line_num, buf);
+}
+
+void myfileopt(const char* fn, const struct cmdinfo* cmdinfos) {
+  FILE* file;
+  int line_num = 0;
+  char linebuf[MAX_CONFIG_LINE];
+
+  file= fopen(fn, "r");
+  if (!file) {
+    if (errno==ENOENT)
+      return;
+    warning(_("failed to open configuration file '%.255s' for reading: %s"),
+            fn, strerror(errno));
+    return;
+  }
+
+  while (fgets(linebuf, sizeof(linebuf), file)) {
+    char* opt;
+    const struct cmdinfo *cip;
+    int l;
+
+    line_num++;
+
+    if ((linebuf[0] == '#') || (linebuf[0] == '\n') || (linebuf[0] == '\0'))
+      continue;
+    l=strlen(linebuf);
+    if (linebuf[l - 1] == '\n')
+      linebuf[l - 1] = '\0';
+    for (opt=linebuf;isalnum(*opt)||*opt=='-';opt++) ;
+    if (*opt == '\0')
+      opt=NULL;
+    else {
+      *opt++ = '\0';
+      if (*opt=='=') opt++;
+      while (isspace(*opt)) opt++;
+
+      opt = str_strip_quotes(opt);
+      if (opt == NULL)
+        config_error(fn, line_num, _("unbalanced quotes in '%s'"), linebuf);
+    }
+
+    for (cip=cmdinfos; cip->olong || cip->oshort; cip++) {
+      if (!cip->olong) continue;
+      if (!strcmp(cip->olong,linebuf)) break;
+      l=strlen(cip->olong);
+      if ((cip->takesvalue==2) && (linebuf[l]=='-') &&
+	  !opt && !strncmp(linebuf,cip->olong,l)) {
+	opt=linebuf+l+1;
+	break;
+      }
+    }
+
+    if (!cip->olong)
+      config_error(fn, line_num, _("unknown option '%s'"), linebuf);
+
+    if (cip->takesvalue) {
+      if (!opt)
+        config_error(fn, line_num, _("'%s' needs a value"), linebuf);
+      if (cip->call) cip->call(cip,opt);
+      else
+        *cip->sassignto = m_strdup(opt);
+    } else {
+      if (opt)
+        config_error(fn, line_num, _("'%s' does not take a value"), linebuf);
+      if (cip->call) cip->call(cip,NULL);
+      else
+        *cip->iassignto = cip->arg_int;
+    }
+  }
+  if (ferror(file)) ohshite(_("read error in configuration file `%.255s'"), fn);
+  if (fclose(file)) ohshite(_("error closing configuration file `%.255s'"), fn);
+}
+
+static int
+valid_config_filename(const struct dirent *dent)
+{
+  const char *c;
+
+  if (dent->d_name[0] == '.')
+    return 0;
+
+  for (c = dent->d_name; *c; c++)
+    if (!isalnum(*c) && *c != '_' && *c != '-')
+      return 0;
+
+  if (*c == '\0')
+    return 1;
+  else
+    return 0;
+}
+
+static void
+load_config_dir(const char *prog, const struct cmdinfo* cmdinfos)
+{
+  char *dirname;
+  struct dirent **dlist;
+  int dlist_n, i;
+
+  m_asprintf(&dirname, "%s/%s.cfg.d", CONFIGDIR, prog);
+
+  dlist_n = scandir(dirname, &dlist, valid_config_filename, alphasort);
+  if (dlist_n < 0) {
+    if (errno == ENOENT) {
+      free(dirname);
+      return;
+    } else
+      ohshite(_("error opening configuration directory '%s'"), dirname);
+  }
+
+  for (i = 0; i < dlist_n; i++) {
+    char *filename;
+
+    m_asprintf(&filename, "%s/%s", dirname, dlist[i]->d_name);
+    myfileopt(filename, cmdinfos);
+
+    free(dlist[i]);
+    free(filename);
+  }
+
+  free(dirname);
+  free(dlist);
+}
+
+void loadcfgfile(const char *prog, const struct cmdinfo* cmdinfos) {
+  char *home, *file;
+
+  load_config_dir(prog, cmdinfos);
+
+  m_asprintf(&file, "%s/%s.cfg", CONFIGDIR, prog);
+  myfileopt(file, cmdinfos);
+  free(file);
+
+  if ((home = getenv("HOME")) != NULL) {
+    m_asprintf(&file, "%s/.%s.cfg", home, prog);
+    myfileopt(file, cmdinfos);
+    free(file);
+  }
+}
+
+void
+myopt(const char *const **argvp, const struct cmdinfo *cmdinfos,
+      const char *help_str)
+{
+  const struct cmdinfo *cip;
+  const char *p, *value;
+  int l;
+
+  printforhelp = help_str;
+
+  ++(*argvp);
+  while ((p= **argvp) && *p == '-') {
+    ++(*argvp);
+    if (!strcmp(p,"--")) break;
+    if (*++p == '-') {
+      ++p; value=NULL;
+      for (cip= cmdinfos;
+           cip->olong || cip->oshort;
+           cip++) {
+        if (!cip->olong) continue;
+        if (!strcmp(p,cip->olong)) break;
+        l= strlen(cip->olong);
+        if (!strncmp(p,cip->olong,l) &&
+            (p[l]== ((cip->takesvalue==2) ? '-' : '='))) { value=p+l+1; break; }
+      }
+      if (!cip->olong) badusage(_("unknown option --%s"),p);
+      if (cip->takesvalue) {
+        if (!value) {
+          value= *(*argvp)++;
+          if (!value) badusage(_("--%s option takes a value"),cip->olong);
+        }
+        if (cip->call) cip->call(cip,value);
+        else *cip->sassignto= value;
+      } else {
+        if (value) badusage(_("--%s option does not take a value"),cip->olong);
+        if (cip->call) cip->call(cip,NULL);
+        else
+          *cip->iassignto = cip->arg_int;
+      }
+    } else {
+      while (*p) {
+        for (cip= cmdinfos; (cip->olong || cip->oshort) && *p != cip->oshort; cip++);
+        if (!cip->oshort) badusage(_("unknown option -%c"),*p);
+        p++;
+        if (cip->takesvalue) {
+          if (!*p) {
+            value= *(*argvp)++;
+            if (!value) badusage(_("-%c option takes a value"),cip->oshort);
+          } else {
+            value= p; p="";
+            if (*value == '=') value++;
+          }
+          if (cip->call) cip->call(cip,value);
+          else *cip->sassignto= value;
+        } else {
+          if (*p == '=') badusage(_("-%c option does not take a value"),cip->oshort);
+          if (cip->call) cip->call(cip,NULL);
+          else
+            *cip->iassignto = cip->arg_int;
+        }
+      }
+    }
+  }
+}
+
+void
+setobsolete(const struct cmdinfo *cip, const char *value)
+{
+  warning(_("obsolete option '--%s'\n"), cip->olong);
+}
+
+const struct cmdinfo *cipaction = NULL;
+
+/* XXX: This function is a hack. */
+static inline int
+option_short(int c)
+{
+  return c ? c : '\b';
+}
+
+void
+setaction(const struct cmdinfo *cip, const char *value)
+{
+  if (cipaction)
+    badusage(_("conflicting actions -%c (--%s) and -%c (--%s)"),
+             option_short(cip->oshort), cip->olong,
+             option_short(cipaction->oshort), cipaction->olong);
+  cipaction = cip;
+}
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/options.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/options.h
--- dpkg/lib/dpkg/options.h	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/options.h	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,75 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * options.h - option parsing functions
+ *
+ * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBDPKG_OPTIONS_H
+#define LIBDPKG_OPTIONS_H
+
+#include <dpkg/macros.h>
+
+DPKG_BEGIN_DECLS
+
+typedef int action_func(const char *const *argv);
+
+struct cmdinfo {
+  const char *olong;
+  char oshort;
+
+  /*
+   * 0 = Normal				(-o, --option)
+   * 1 = Standard value			(-o=value, --option=value or
+   *					 -o value, --option value)
+   * 2 = Option string continued	(--option-value)
+   */
+  int takesvalue;
+  int *iassignto;
+  const char **sassignto;
+  void (*call)(const struct cmdinfo*, const char *value);
+
+  int arg_int;
+  void *arg_ptr;
+
+  action_func *action;
+};
+
+void badusage(const char *fmt, ...) DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1);
+
+#define MAX_CONFIG_LINE 1024
+
+void myfileopt(const char* fn, const struct cmdinfo* cmdinfos);
+void myopt(const char *const **argvp, const struct cmdinfo *cmdinfos,
+           const char *help_str);
+void loadcfgfile(const char *prog, const struct cmdinfo *cmdinfos);
+
+/**
+ * Current cmdinfo action.
+ */
+extern const struct cmdinfo *cipaction;
+
+void setaction(const struct cmdinfo *cip, const char *value);
+void setobsolete(const struct cmdinfo *cip, const char *value);
+
+#define ACTION(longopt, shortopt, code, func) \
+ { longopt, shortopt, 0, NULL, NULL, setaction, code, NULL, func }
+#define OBSOLETE(longopt, shortopt) \
+ { longopt, shortopt, 0, NULL, NULL, setobsolete, 0, NULL, NULL }
+
+DPKG_END_DECLS
+
+#endif /* LIBDPKG_OPTIONS_H */
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/parse.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/parse.c
--- dpkg/lib/dpkg/parse.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/parse.c	2012-06-07 10:11:09.426073000 -0700
@@ -51,14 +51,13 @@
   { "Package",          f_name,            w_name                                     },
   { "Essential",        f_boolean,         w_booleandefno,   PKGIFPOFF(essential)     },
   { "Status",           f_status,          w_status                                   },
-  { "Multi-Arch",       f_multiarch,       w_multiarch,      PKGIFPOFF(multiarch)     },
   { "Priority",         f_priority,        w_priority                                 },
   { "Section",          f_section,         w_section                                  },
   { "Installed-Size",   f_charfield,       w_charfield,      PKGIFPOFF(installedsize) },
   { "Origin",           f_charfield,       w_charfield,      PKGIFPOFF(origin)        },
   { "Maintainer",       f_charfield,       w_charfield,      PKGIFPOFF(maintainer)    },
   { "Bugs",             f_charfield,       w_charfield,      PKGIFPOFF(bugs)          },
-  { "Architecture",     f_architecture,    w_architecture                             },
+  { "Architecture",     f_charfield,       w_charfield,      PKGIFPOFF(arch)          },
   { "Source",           f_charfield,       w_charfield,      PKGIFPOFF(source)        },
   { "Version",          f_version,         w_version,        PKGIFPOFF(version)       },
   { "Revision",         f_revision,        w_null                                     },
@@ -80,7 +79,6 @@
   { "Description",      f_charfield,       w_charfield,      PKGIFPOFF(description)   },
   { "Triggers-Pending", f_trigpend,        w_trigpend                                 },
   { "Triggers-Awaited", f_trigaw,          w_trigaw                                   },
-  { "PackageSpec",      f_forbidden,       w_packagespec                              },
   /* Note that aliases are added to the nicknames table. */
   {  NULL                                                                             }
 };
@@ -95,13 +93,15 @@
   { .nick = NULL }
 };
 
-struct field_state {
-  const char *fieldstart;
-  const char *valuestart;
-  struct varbuf value;
-  int fieldlen;
-  int valuelen;
-  int fieldencountered[array_count(fieldinfos)];
+/**
+ * Package object being parsed.
+ *
+ * Structure used to hold the parsed data for the package being constructed,
+ * before it gets properly inserted into the package database.
+ */
+struct pkg_parse_object {
+  struct pkginfo *pkg;
+  struct pkgbin *pkgbin;
 };
 
 /**
@@ -109,8 +109,9 @@
  */
 static void
 pkg_parse_field(struct parsedb_state *ps, struct field_state *fs,
-                struct pkginfo *pkg, struct pkgbin *pkgbin)
+                void *parse_obj)
 {
+  struct pkg_parse_object *pkg_obj = parse_obj;
   const struct nickname *nick;
   const struct fieldinfo *fip;
   int *ip;
@@ -129,25 +130,25 @@
       break;
   if (fip->name) {
     if ((*ip)++)
-      parse_error(ps, pkg,
+      parse_error(ps,
                   _("duplicate value for `%s' field"), fip->name);
 
     varbuf_reset(&fs->value);
     varbuf_add_buf(&fs->value, fs->valuestart, fs->valuelen);
     varbuf_end_str(&fs->value);
 
-    fip->rcall(pkg, pkgbin, ps, fs->value.buf, fip);
+    fip->rcall(pkg_obj->pkg, pkg_obj->pkgbin, ps, fs->value.buf, fip);
   } else {
     struct arbitraryfield *arp, **larpp;
 
     if (fs->fieldlen < 2)
-      parse_error(ps, pkg,
+      parse_error(ps,
                   _("user-defined field name `%.*s' too short"),
                   fs->fieldlen, fs->fieldstart);
-    larpp = &pkgbin->arbs;
+    larpp = &pkg_obj->pkgbin->arbs;
     while ((arp = *larpp) != NULL) {
       if (!strncasecmp(arp->name, fs->fieldstart, fs->fieldlen))
-        parse_error(ps, pkg,
+        parse_error(ps,
                    _("duplicate value for user-defined field `%.*s'"),
                    fs->fieldlen, fs->fieldstart);
       larpp = &arp->next;
@@ -167,10 +168,7 @@
 pkg_parse_verify(struct parsedb_state *ps,
                  struct pkginfo *pkg, struct pkgbin *pkgbin)
 {
-  struct dependency *dep;
-  struct deppossi *dop;
-
-  parse_must_have_field(ps, pkg, pkg->set->name, "package name");
+  parse_must_have_field(ps, pkg->name, "package name");
 
   /* XXX: We need to check for status != stat_halfinstalled as while
    * unpacking an unselected package, it will not have yet all data in
@@ -179,9 +177,9 @@
   if ((ps->flags & pdb_recordavailable) ||
       (pkg->status != stat_notinstalled &&
        pkg->status != stat_halfinstalled)) {
-    parse_ensure_have_field(ps, pkg, &pkgbin->description, "description");
-    parse_ensure_have_field(ps, pkg, &pkgbin->maintainer, "maintainer");
-    parse_must_have_field(ps, pkg, pkgbin->version.version, "version");
+    parse_ensure_have_field(ps, &pkgbin->description, "description");
+    parse_ensure_have_field(ps, &pkgbin->maintainer, "maintainer");
+    parse_must_have_field(ps, pkgbin->version.version, "version");
   }
 
   /* XXX: Versions before dpkg 1.10.19 did not preserve the Architecture
@@ -189,21 +187,14 @@
    * in stat_configfiles, ignore those too for now. */
   if ((ps->flags & pdb_recordavailable) ||
       pkg->status > stat_halfinstalled) {
-    /* Warn about missing architecture information if needed */
-    if (pkgbin->arch->type == arch_none)
-      parse_warn(ps, pkg, _("missing %s"), "architecture");
-
-    if (pkgbin->arch->type == arch_all && pkgbin->multiarch == multiarch_same)
-      parse_error(ps, pkg, _("package is marked '%s' but is architecture all"),
-                  "Multi-Arch: same");
+    /* We always want usable architecture information (as long as the package
+     * is in such a state that it make sense), so that it can be used safely
+     * on string comparisons and the like. */
+    parse_ensure_have_field(ps, &pkgbin->arch, "architecture");
+  } else if (pkgbin->arch == NULL) {
+    pkgbin->arch = "";
   }
 
-  /* Initialize deps to be arch-specific unless stated otherwise */
-  for (dep = pkgbin->depends; dep; dep = dep->next)
-    for (dop = dep->list; dop; dop = dop->next)
-      if (!dop->arch)
-        dop->arch = pkgbin->arch;
-
   /* Check the Config-Version information:
    * If there is a Config-Version it is definitely to be used, but
    * there shouldn't be one if the package is ‘installed’ (in which case
@@ -212,7 +203,7 @@
   if (!(ps->flags & pdb_recordavailable)) {
     if (pkg->configversion.version) {
       if (pkg->status == stat_installed || pkg->status == stat_notinstalled)
-        parse_error(ps, pkg,
+        parse_error(ps,
                     _("Configured-Version for package with inappropriate Status"));
     } else {
       if (pkg->status == stat_installed)
@@ -223,21 +214,21 @@
   if (pkg->trigaw.head &&
       (pkg->status <= stat_configfiles ||
        pkg->status >= stat_triggerspending))
-    parse_error(ps, pkg,
+    parse_error(ps,
                 _("package has status %s but triggers are awaited"),
                 statusinfos[pkg->status].name);
   else if (pkg->status == stat_triggersawaited && !pkg->trigaw.head)
-    parse_error(ps, pkg,
+    parse_error(ps,
                 _("package has status triggers-awaited but no triggers awaited"));
 
   if (pkg->trigpend_head &&
       !(pkg->status == stat_triggerspending ||
         pkg->status == stat_triggersawaited))
-    parse_error(ps, pkg,
+    parse_error(ps,
                 _("package has status %s but triggers are pending"),
                 statusinfos[pkg->status].name);
   else if (pkg->status == stat_triggerspending && !pkg->trigpend_head)
-    parse_error(ps, pkg,
+    parse_error(ps,
                 _("package has status triggers-pending but no triggers "
                   "pending"));
 
@@ -247,7 +238,7 @@
   if (!(ps->flags & pdb_recordavailable) &&
       pkg->status == stat_notinstalled &&
       pkgbin->conffiles) {
-    parse_warn(ps, pkg,
+    parse_warn(ps,
                _("Package which in state not-installed has conffiles, "
                  "forgetting them"));
     pkgbin->conffiles = NULL;
@@ -292,6 +283,12 @@
   /* Sort out the dependency mess. */
   copy_dependency_links(dst_pkg, &dst_pkgbin->depends, src_pkgbin->depends,
                         (ps->flags & pdb_recordavailable) ? true : false);
+  /* Leave the ‘depended’ pointer alone, we've just gone to such
+   * trouble to get it right :-). The ‘depends’ pointer in
+   * dst_pkgbin was indeed also updated by copy_dependency_links,
+   * but since the value was that from src_pkgbin anyway there's
+   * no need to copy it back. */
+  src_pkgbin->depended = dst_pkgbin->depended;
 
   /* Copy across data. */
   memcpy(dst_pkgbin, src_pkgbin, sizeof(struct pkgbin));
@@ -318,162 +315,239 @@
 }
 
 /**
- * Parse an RFC-822 style file.
- *
- * warnto, warncount and donep may be NULL.
- * If donep is not NULL only one package's information is expected.
+ * Open a file for RFC-822 parsing.
  */
-int parsedb(const char *filename, enum parsedbflags flags,
-            struct pkginfo **donep)
+void
+parse_open(struct parsedb_state *ps, const char *filename,
+           enum parsedbflags flags)
 {
   static int fd;
-  struct pkgset new_set;
-  struct pkginfo *new_pkg, *db_pkg;
-  struct pkgbin *new_pkgbin, *db_pkgbin;
-  int pdone;
-  char *data, *dataptr, *endptr;
   struct stat st;
-  struct parsedb_state ps;
-  struct field_state fs;
 
-  ps.filename = filename;
-  ps.flags = flags;
-  ps.lno = 0;
-
-  memset(&fs, 0, sizeof(fs));
-
-  new_pkg = &new_set.pkg;
-  if (flags & pdb_recordavailable)
-    new_pkgbin = &new_pkg->available;
-  else
-    new_pkgbin = &new_pkg->installed;
-
-  fd= open(filename, O_RDONLY);
-  if (fd == -1) ohshite(_("failed to open package info file `%.255s' for reading"),filename);
+  ps->filename = filename;
+  ps->flags = flags;
+  ps->lno = 0;
+  ps->pkg = NULL;
+  ps->pkgbin = NULL;
+
+  fd = open(filename, O_RDONLY);
+  if (fd == -1)
+    ohshite(_("failed to open package info file `%.255s' for reading"),
+            filename);
 
   push_cleanup(cu_closefd, ~ehflag_normaltidy, NULL, 0, 1, &fd);
 
   if (fstat(fd, &st) == -1)
-    ohshite(_("can't stat package info file `%.255s'"),filename);
+    ohshite(_("can't stat package info file `%.255s'"), filename);
 
   if (st.st_size > 0) {
 #ifdef USE_MMAP
-    dataptr = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-    if (dataptr == MAP_FAILED)
-      ohshite(_("can't mmap package info file `%.255s'"),filename);
+    ps->dataptr = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+    if (ps->dataptr == MAP_FAILED)
+      ohshite(_("can't mmap package info file `%.255s'"), filename);
 #else
-    dataptr = m_malloc(st.st_size);
+    ps->dataptr = m_malloc(st.st_size);
 
-    if (fd_read(fd, dataptr, st.st_size) < 0)
+    if (fd_read(fd, ps->dataptr, st.st_size) < 0)
       ohshite(_("reading package info file '%.255s'"), filename);
 #endif
-    data= dataptr;
-    endptr = dataptr + st.st_size;
+    ps->data = ps->dataptr;
+    ps->endptr = ps->dataptr + st.st_size;
   } else {
-    data= dataptr= endptr= NULL;
+    ps->data = ps->dataptr = ps->endptr = NULL;
   }
 
-  pdone= 0;
-#define EOF_mmap(dataptr, endptr)	(dataptr >= endptr)
-#define getc_mmap(dataptr)		*dataptr++;
-#define ungetc_mmap(c, dataptr, data)	dataptr--;
+  pop_cleanup(ehflag_normaltidy);
 
-  /* Loop per package. */
+  if (close(fd))
+    ohshite(_("failed to close after read: `%.255s'"), filename);
+}
+
+/**
+ * Parse an RFC-822 style stanza.
+ */
+bool
+parse_stanza(struct parsedb_state *ps, struct field_state *fs,
+             parse_field_func *parse_field, void *parse_obj)
+{
+  int c;
+
+  /* Skip adjacent new lines. */
+  while (!parse_EOF(ps)) {
+    c = parse_getc(ps);
+    if (c != '\n' && c != MSDOS_EOF_CHAR)
+      break;
+    ps->lno++;
+  }
+
+  /* Nothing relevant parsed, bail out. */
+  if (parse_EOF(ps))
+    return false;
+
+  /* Loop per field. */
   for (;;) {
-    int c;
+    bool blank_line;
 
-    memset(fs.fieldencountered, 0, sizeof(fs.fieldencountered));
-    pkgset_blank(&new_set);
+    /* Scan field name. */
+    fs->fieldstart = ps->dataptr - 1;
+    while (!parse_EOF(ps) && !isspace(c) && c != ':' && c != MSDOS_EOF_CHAR)
+      c = parse_getc(ps);
+    fs->fieldlen = ps->dataptr - fs->fieldstart - 1;
+
+    /* Skip spaces before ‘:’. */
+    while (!parse_EOF(ps) && c != '\n' && isspace(c))
+      c = parse_getc(ps);
+
+    /* Validate ‘:’. */
+    if (parse_EOF(ps))
+      parse_error(ps,
+                  _("EOF after field name `%.*s'"), fs->fieldlen, fs->fieldstart);
+    if (c == '\n')
+      parse_error(ps,
+                  _("newline in field name `%.*s'"), fs->fieldlen, fs->fieldstart);
+    if (c == MSDOS_EOF_CHAR)
+      parse_error(ps,
+                  _("MSDOS EOF (^Z) in field name `%.*s'"),
+                  fs->fieldlen, fs->fieldstart);
+    if (c != ':')
+      parse_error(ps,
+                  _("field name `%.*s' must be followed by colon"),
+                  fs->fieldlen, fs->fieldstart);
 
-    /* Skip adjacent new lines. */
-    while(!EOF_mmap(dataptr, endptr)) {
-      c= getc_mmap(dataptr); if (c!='\n' && c!=MSDOS_EOF_CHAR ) break;
-      ps.lno++;
+    /* Skip space after ‘:’ but before value and EOL. */
+    while (!parse_EOF(ps)) {
+      c = parse_getc(ps);
+      if (c == '\n' || !isspace(c))
+        break;
     }
-    if (EOF_mmap(dataptr, endptr)) break;
+    if (parse_EOF(ps))
+      parse_error(ps,
+                  _("EOF before value of field `%.*s' (missing final newline)"),
+                  fs->fieldlen, fs->fieldstart);
+    if (c == MSDOS_EOF_CHAR)
+      parse_error(ps,
+                  _("MSDOS EOF char in value of field `%.*s' (missing newline?)"),
+                  fs->fieldlen, fs->fieldstart);
 
-    /* Loop per field. */
-    for (;;) {
-      bool blank_line;
+    blank_line = false;
 
-      fs.fieldstart = dataptr - 1;
-      while (!EOF_mmap(dataptr, endptr) && !isspace(c) && c!=':' && c!=MSDOS_EOF_CHAR)
-        c= getc_mmap(dataptr);
-      fs.fieldlen = dataptr - fs.fieldstart - 1;
-      while (!EOF_mmap(dataptr, endptr) && c != '\n' && isspace(c)) c= getc_mmap(dataptr);
-      if (EOF_mmap(dataptr, endptr))
-        parse_error(&ps, new_pkg,
-                    _("EOF after field name `%.*s'"), fs.fieldlen, fs.fieldstart);
-      if (c == '\n')
-        parse_error(&ps, new_pkg,
-                    _("newline in field name `%.*s'"), fs.fieldlen, fs.fieldstart);
-      if (c == MSDOS_EOF_CHAR)
-        parse_error(&ps, new_pkg,
-                    _("MSDOS EOF (^Z) in field name `%.*s'"),
-                    fs.fieldlen, fs.fieldstart);
-      if (c != ':')
-        parse_error(&ps, new_pkg,
-                    _("field name `%.*s' must be followed by colon"),
-                    fs.fieldlen, fs.fieldstart);
-      /* Skip space after ‘:’ but before value and EOL. */
-      while(!EOF_mmap(dataptr, endptr)) {
-        c= getc_mmap(dataptr);
-        if (c == '\n' || !isspace(c)) break;
+    /* Scan field value. */
+    fs->valuestart = ps->dataptr - 1;
+    for (;;) {
+      if (c == '\n' || c == MSDOS_EOF_CHAR) {
+        if (blank_line)
+          parse_error(ps,
+                      _("blank line in value of field '%.*s'"),
+                      fs->fieldlen, fs->fieldstart);
+        ps->lno++;
+
+        if (parse_EOF(ps))
+          break;
+        c = parse_getc(ps);
+
+        /* Found double EOL, or start of new field. */
+        if (parse_EOF(ps) || c == '\n' || !isspace(c))
+          break;
+
+        parse_ungetc(c, ps);
+        c = '\n';
+        blank_line = true;
+      } else if (blank_line && !isspace(c)) {
+        blank_line = false;
       }
-      if (EOF_mmap(dataptr, endptr))
-        parse_error(&ps, new_pkg,
-                    _("EOF before value of field `%.*s' (missing final newline)"),
-                    fs.fieldlen, fs.fieldstart);
-      if (c == MSDOS_EOF_CHAR)
-        parse_error(&ps, new_pkg,
-                    _("MSDOS EOF char in value of field `%.*s' (missing newline?)"),
-                    fs.fieldlen, fs.fieldstart);
-
-      blank_line = false;
-
-      fs.valuestart = dataptr - 1;
-      for (;;) {
-        if (c == '\n' || c == MSDOS_EOF_CHAR) {
-          if (blank_line)
-            parse_error(&ps, new_pkg,
-                        _("blank line in value of field '%.*s'"),
-                        fs.fieldlen, fs.fieldstart);
-          ps.lno++;
-	  if (EOF_mmap(dataptr, endptr)) break;
-          c= getc_mmap(dataptr);
-          /* Found double EOL, or start of new field. */
-          if (EOF_mmap(dataptr, endptr) || c == '\n' || !isspace(c)) break;
-          ungetc_mmap(c,dataptr, data);
-          c= '\n';
-          blank_line = true;
-        } else if (blank_line && !isspace(c)) {
-          blank_line = false;
-        }
-
-        if (EOF_mmap(dataptr, endptr))
-          parse_error(&ps, new_pkg,
-                      _("EOF during value of field `%.*s' (missing final newline)"),
-                      fs.fieldlen, fs.fieldstart);
 
-        c= getc_mmap(dataptr);
-      }
-      fs.valuelen = dataptr - fs.valuestart - 1;
-      /* Trim ending space on value. */
-      while (fs.valuelen && isspace(*(fs.valuestart + fs.valuelen - 1)))
-        fs.valuelen--;
+      if (parse_EOF(ps))
+        parse_error(ps,
+                    _("EOF during value of field `%.*s' (missing final newline)"),
+                    fs->fieldlen, fs->fieldstart);
+
+      c = parse_getc(ps);
+    }
+    fs->valuelen = ps->dataptr - fs->valuestart - 1;
+
+    /* Trim ending space on value. */
+    while (fs->valuelen && isspace(*(fs->valuestart + fs->valuelen - 1)))
+      fs->valuelen--;
+
+    parse_field(ps, fs, parse_obj);
+
+    if (parse_EOF(ps) || c == '\n' || c == MSDOS_EOF_CHAR)
+      break;
+  } /* Loop per field. */
 
-      pkg_parse_field(&ps, &fs, new_pkg, new_pkgbin);
+  if (c == '\n')
+    ps->lno++;
 
-      if (EOF_mmap(dataptr, endptr) || c == '\n' || c == MSDOS_EOF_CHAR) break;
-    } /* Loop per field. */
+  return true;
+}
+
+/**
+ * Close an RFC-822 parser context.
+ */
+void
+parse_close(struct parsedb_state *ps)
+{
+  if (ps->data != NULL) {
+#ifdef USE_MMAP
+    munmap(ps->data, ps->endptr - ps->data);
+#else
+    free(ps->data);
+#endif
+  }
+}
+
+/**
+ * Parse an RFC-822 style file.
+ *
+ * donep may be NULL.
+ * If donep is not NULL only one package's information is expected.
+ */
+int parsedb(const char *filename, enum parsedbflags flags,
+            struct pkginfo **donep)
+{
+  struct pkginfo tmp_pkg;
+  struct pkginfo *new_pkg, *db_pkg;
+  struct pkgbin *new_pkgbin, *db_pkgbin;
+  struct pkg_parse_object pkg_obj;
+  int fieldencountered[array_count(fieldinfos)];
+  int pdone;
+  struct parsedb_state ps;
+  struct field_state fs;
+
+  memset(&fs, 0, sizeof(fs));
+  fs.fieldencountered = fieldencountered;
+
+  parse_open(&ps, filename, flags);
+
+  new_pkg = &tmp_pkg;
+  if (flags & pdb_recordavailable)
+    new_pkgbin = &new_pkg->available;
+  else
+    new_pkgbin = &new_pkg->installed;
+
+  ps.pkg = new_pkg;
+  ps.pkgbin = new_pkgbin;
+
+  pkg_obj.pkg = new_pkg;
+  pkg_obj.pkgbin = new_pkgbin;
+
+  pdone= 0;
+
+  /* Loop per package. */
+  for (;;) {
+    memset(fieldencountered, 0, sizeof(fieldencountered));
+    pkg_blank(new_pkg);
+
+    if (!parse_stanza(&ps, &fs, pkg_parse_field, &pkg_obj))
+      break;
 
     if (pdone && donep)
-      parse_error(&ps, new_pkg,
+      parse_error(&ps,
                   _("several package info entries found, only one allowed"));
 
     pkg_parse_verify(&ps, new_pkg, new_pkgbin);
 
-    db_pkg = pkg_db_find_pkg(new_pkg->set->name, new_pkgbin->arch);
+    db_pkg = pkg_db_find(new_pkg->name);
     if (flags & pdb_recordavailable)
       db_pkgbin = &db_pkg->available;
     else
@@ -488,20 +562,13 @@
     if (donep)
       *donep = db_pkg;
     pdone++;
-    if (EOF_mmap(dataptr, endptr)) break;
-    if (c == '\n')
-      ps.lno++;
-  }
-  if (data != NULL) {
-#ifdef USE_MMAP
-    munmap(data, st.st_size);
-#else
-    free(data);
-#endif
+    if (parse_EOF(&ps))
+      break;
   }
+
+  parse_close(&ps);
+
   varbuf_destroy(&fs.value);
-  pop_cleanup(ehflag_normaltidy);
-  if (close(fd)) ohshite(_("failed to close after read: `%.255s'"),filename);
   if (donep && !pdone) ohshit(_("no package information in `%.255s'"),filename);
 
   return pdone;
@@ -536,7 +603,8 @@
                            bool available)
 {
   struct dependency *dyp;
-  struct deppossi *dop, **revdeps;
+  struct deppossi *dop;
+  struct pkgbin *addtopifp;
 
   /* Delete ‘backward’ (‘depended’) links from other packages to
    * dependencies listed in old version of this one. We do this by
@@ -549,9 +617,9 @@
         dop->rev_prev->rev_next = dop->rev_next;
       else
         if (available)
-          dop->ed->depended.available = dop->rev_next;
+          dop->ed->available.depended = dop->rev_next;
         else
-          dop->ed->depended.installed = dop->rev_next;
+          dop->ed->installed.depended = dop->rev_next;
       if (dop->rev_next)
         dop->rev_next->rev_prev = dop->rev_prev;
     }
@@ -562,13 +630,12 @@
   for (dyp= newdepends; dyp; dyp= dyp->next) {
     dyp->up= pkg;
     for (dop= dyp->list; dop; dop= dop->next) {
-      revdeps = available ? &dop->ed->depended.available :
-                            &dop->ed->depended.installed;
-      dop->rev_next = *revdeps;
+      addtopifp= available ? &dop->ed->available : &dop->ed->installed;
+      dop->rev_next = addtopifp->depended;
       dop->rev_prev = NULL;
-      if (*revdeps)
-        (*revdeps)->rev_prev = dop;
-      *revdeps = dop;
+      if (addtopifp->depended)
+        addtopifp->depended->rev_prev = dop;
+      addtopifp->depended= dop;
     }
   }
 
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/parsedump.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/parsedump.h
--- dpkg/lib/dpkg/parsedump.h	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/parsedump.h	2012-06-07 10:11:09.426073000 -0700
@@ -26,10 +26,38 @@
 
 struct parsedb_state {
 	enum parsedbflags flags;
+	struct pkginfo *pkg;
+	struct pkgbin *pkgbin;
+	char *data;
+	char *dataptr;
+	char *endptr;
 	const char *filename;
 	int lno;
 };
 
+#define parse_EOF(ps)		((ps)->dataptr >= (ps)->endptr)
+#define parse_getc(ps)		*(ps)->dataptr++
+#define parse_ungetc(c, ps)	(ps)->dataptr--
+
+struct field_state {
+	const char *fieldstart;
+	const char *valuestart;
+	struct varbuf value;
+	int fieldlen;
+	int valuelen;
+	int *fieldencountered;
+};
+
+void parse_open(struct parsedb_state *ps, const char *filename,
+                enum parsedbflags flags);
+void parse_close(struct parsedb_state *ps);
+
+typedef void parse_field_func(struct parsedb_state *ps, struct field_state *fs,
+                              void *parse_obj);
+
+bool parse_stanza(struct parsedb_state *ps, struct field_state *fs,
+                  parse_field_func *parse_field, void *parse_obj);
+
 #define PKGIFPOFF(f) (offsetof(struct pkgbin, f))
 #define PKGPFIELD(pifp,of,type) (*(type*)((char*)(pifp)+(of)))
 
@@ -42,10 +70,7 @@
 freadfunction f_name, f_charfield, f_priority, f_section, f_status, f_filecharf;
 freadfunction f_boolean, f_dependency, f_conffiles, f_version, f_revision;
 freadfunction f_configversion;
-freadfunction f_multiarch;
-freadfunction f_architecture;
 freadfunction f_trigpend, f_trigaw;
-freadfunction f_forbidden;
 
 enum fwriteflags {
 	/* Print field header and trailing newline. */
@@ -57,11 +82,8 @@
 			    enum fwriteflags flags, const struct fieldinfo*);
 fwritefunction w_name, w_charfield, w_priority, w_section, w_status, w_configversion;
 fwritefunction w_version, w_null, w_booleandefno, w_dependency, w_conffiles;
-fwritefunction w_multiarch;
-fwritefunction w_architecture;
 fwritefunction w_filecharf;
 fwritefunction w_trigpend, w_trigaw;
-fwritefunction w_packagespec;
 
 struct fieldinfo {
   const char *name;
@@ -70,19 +92,17 @@
   size_t integer;
 };
 
-void parse_db_version(struct parsedb_state *ps, const struct pkginfo *pkg,
+void parse_db_version(struct parsedb_state *ps,
                       struct versionrevision *version, const char *value,
-                      const char *fmt, ...) DPKG_ATTR_PRINTF(5);
+                      const char *fmt, ...) DPKG_ATTR_PRINTF(4);
 
-void parse_error(struct parsedb_state *ps, const struct pkginfo *pigp,
-                 const char *fmt, ...) DPKG_ATTR_NORET DPKG_ATTR_PRINTF(3);
-void parse_warn(struct parsedb_state *ps, const struct pkginfo *pigp,
-                const char *fmt, ...) DPKG_ATTR_PRINTF(3);
+void parse_error(struct parsedb_state *ps, const char *fmt, ...)
+	DPKG_ATTR_NORET DPKG_ATTR_PRINTF(2);
+void parse_warn(struct parsedb_state *ps, const char *fmt, ...)
+	DPKG_ATTR_PRINTF(2);
 void parse_must_have_field(struct parsedb_state *ps,
-                           const struct pkginfo *pigp,
                            const char *value, const char *what);
 void parse_ensure_have_field(struct parsedb_state *ps,
-                             const struct pkginfo *pigp,
                              const char **value, const char *what);
 
 #define MSDOS_EOF_CHAR '\032' /* ^Z */
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/parsehelp.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/parsehelp.c
--- dpkg/lib/dpkg/parsehelp.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/parsehelp.c	2012-06-07 10:11:09.426073000 -0700
@@ -3,8 +3,6 @@
  * parsehelp.c - helpful routines for parsing and writing
  *
  * Copyright © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,25 +30,21 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/string.h>
+#include <dpkg/error.h>
 #include <dpkg/parsedump.h>
 
 static const char *
-parse_error_msg(struct parsedb_state *ps, const struct pkginfo *pigp,
-                const char *fmt)
+parse_error_msg(struct parsedb_state *ps, const char *fmt)
 {
   static char msg[1024];
   char filename[256];
 
   str_escape_fmt(filename, ps->filename, sizeof(filename));
 
-  if (pigp && pigp->set->name) {
-    enum pkg_describe_opts pdo = pdo_foreign;
-    if (ps->flags & pdb_recordavailable)
-      pdo |= pdo_avail;
+  if (ps->pkg && ps->pkg->name)
     sprintf(msg, _("parsing file '%.255s' near line %d package '%.255s':\n"
-                   " %.255s"), filename, ps->lno,
-                 pkg_describe(pigp, pdo), fmt);
-  } else
+                   " %.255s"), filename, ps->lno, ps->pkg->name, fmt);
+  else
     sprintf(msg, _("parsing file '%.255s' near line %d:\n"
                    " %.255s"), filename, ps->lno, fmt);
 
@@ -58,23 +52,21 @@
 }
 
 void
-parse_error(struct parsedb_state *ps,
-            const struct pkginfo *pigp, const char *fmt, ...)
+parse_error(struct parsedb_state *ps, const char *fmt, ...)
 {
   va_list args;
 
   va_start(args, fmt);
-  ohshitv(parse_error_msg(ps, pigp, fmt), args);
+  ohshitv(parse_error_msg(ps, fmt), args);
 }
 
 void
-parse_warn(struct parsedb_state *ps,
-           const struct pkginfo *pigp, const char *fmt, ...)
+parse_warn(struct parsedb_state *ps, const char *fmt, ...)
 {
   va_list args;
 
   va_start(args, fmt);
-  warningv(parse_error_msg(ps, pigp, fmt), args);
+  warningv(parse_error_msg(ps, fmt), args);
   va_end(args);
 }
 
@@ -84,14 +76,6 @@
   { .name = NULL }
 };
 
-const struct namevalue multiarchinfos[] = {
-  NAMEVALUE_DEF("no",      multiarch_no),
-  NAMEVALUE_DEF("same",    multiarch_same),
-  NAMEVALUE_DEF("allowed", multiarch_allowed),
-  NAMEVALUE_DEF("foreign", multiarch_foreign),
-  { .name = NULL }
-};
-
 const struct namevalue priorityinfos[] = {
   NAMEVALUE_DEF("required",                      pri_required),
   NAMEVALUE_DEF("important",                     pri_important),
@@ -202,93 +186,27 @@
 }
 
 /**
- * Add a string representation of the package to a varbuf.
- *
- * Works exactly like pkg_describe() but acts on the varbuf
- * instead of returning a string. It does not add a NUL termination
- * character to the varbuf.
- *
- * @param vb  The varbuf struct to modify.
- * @param pkg The package to consider.
- * @param pdo When to display the architecture qualifier.
- */
-void
-varbuf_pkg(struct varbuf *vb, const struct pkginfo *pkg,
-           enum pkg_describe_opts pdo)
-{
-  const struct pkgbin *pbin = &pkg->installed;
-  bool print_arch = false;
-
-  if (pdo & pdo_avail)
-    pbin = &pkg->available;
-
-  varbuf_add_str(vb, pkg->set->name);
-
-  if (pdo & pdo_always) {
-    print_arch = true;
-  } else if ((pdo & pdo_ma_same) && pbin->multiarch == multiarch_same) {
-    print_arch = true;
-  } else if ((pdo & pdo_foreign) && pbin->arch->type != arch_native &&
-             pbin->arch->type != arch_all && pbin->arch->type != arch_none) {
-    print_arch = true;
-  }
-
-  if (print_arch) {
-    varbuf_add_char(vb, ':');
-    varbuf_add_str(vb, pbin->arch->name);
-  }
-}
-
-/**
- * Return a string representation of the package.
- *
- * The returned string must not be freed, it's always reused by
- * the function as part of a round robin of varbuf (so that you can
- * invoke the function up to 10 times before the reference becomes
- * invalid).
+ * Parse a version string and check for invalid syntax.
  *
- * If you need to keep the returned value, you should thus make a copy of
- * it.
+ * Distinguish between lax (warnings) and strict (error) parsing.
  *
- * The pdo parameter should be one of pdo_foreign (print arch for foreign
- * packages only), pdo_always (always print arch), pdo_never (never print
- * arch) or pdo_ma_same (print arch for Multi-Arch: same packages and
- * non-native packages). It can be combined with pdo_avail if you want to
- * consider the architecture information from pkg->available instead of
- * pkg->installed.
+ * @param rversion The parsed version.
+ * @param string The version string to parse.
+ * @param err The warning or error message if any.
  *
- * @param pkg The package to consider.
- * @param pdo When to display the architecture qualifier.
- *
- * @return The string representation.
+ * @retval  0 On success.
+ * @retval -1 On failure, and err is set accordingly.
  */
-const char *
-pkg_describe(const struct pkginfo *pkg, enum pkg_describe_opts pdo)
-{
-  static struct varbuf bufs[10];
-  static int bufnum = 0;
-
-  struct varbuf *vb;
-
-  vb = &bufs[bufnum++];
-  if (bufnum == 10)
-    bufnum = 0;
-
-  varbuf_reset(vb);
-  varbuf_pkg(vb, pkg, pdo);
-  varbuf_add_char(vb, '\0');
-
-  return vb->buf;
-}
-
-static const char *
-parseversion_lax(struct versionrevision *rversion, const char *string)
+int
+parseversion(struct versionrevision *rversion, const char *string,
+             struct dpkg_error *err)
 {
   char *hyphen, *colon, *eepochcolon;
   const char *end, *ptr;
   unsigned long epoch;
 
-  if (!*string) return _("version string is empty");
+  if (!*string)
+    return dpkg_put_error(err, _("version string is empty"));
 
   /* Trim leading and trailing space. */
   while (*string && isblank(*string))
@@ -302,13 +220,16 @@
   ptr = end;
   while (*ptr && isblank(*ptr))
     ptr++;
-  if (*ptr) return _("version string has embedded spaces");
+  if (*ptr)
+    return dpkg_put_error(err, _("version string has embedded spaces"));
 
   colon= strchr(string,':');
   if (colon) {
     epoch= strtoul(string,&eepochcolon,10);
-    if (colon != eepochcolon) return _("epoch in version is not number");
-    if (!*++colon) return _("nothing after colon in version number");
+    if (colon != eepochcolon)
+      return dpkg_put_error(err, _("epoch in version is not number"));
+    if (!*++colon)
+      return dpkg_put_error(err, _("nothing after colon in version number"));
     string= colon;
     rversion->epoch= epoch;
   } else {
@@ -320,50 +241,20 @@
     *hyphen++ = '\0';
   rversion->revision= hyphen ? hyphen : "";
 
-  return NULL;
-}
-
-/**
- * Check for invalid syntax in version structure.
- *
- * The rest of the syntax has been already checked in parseversion_lax(). So
- * we only do the stricter checks here.
- *
- * @param rversion The version to verify.
- *
- * @return An error string, or NULL if eveyrthing was ok.
- */
-static const char *
-version_strict_check(struct versionrevision *rversion)
-{
-  const char *ptr;
-
   /* XXX: Would be faster to use something like cisversion and cisrevision. */
   ptr = rversion->version;
   if (*ptr && !cisdigit(*ptr++))
-    return _("version number does not start with digit");
+    return dpkg_put_warn(err, _("version number does not start with digit"));
   for (; *ptr; ptr++) {
     if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:", *ptr) == NULL)
-      return _("invalid character in version number");
+      return dpkg_put_warn(err, _("invalid character in version number"));
   }
   for (ptr = rversion->revision; *ptr; ptr++) {
     if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".+~", *ptr) == NULL)
-      return _("invalid character in revision number");
+      return dpkg_put_warn(err, _("invalid character in revision number"));
   }
 
-  return NULL;
-}
-
-const char *
-parseversion(struct versionrevision *rversion, const char *string)
-{
-  const char *emsg;
-
-  emsg = parseversion_lax(rversion, string);
-  if (emsg)
-    return emsg;
-
-  return version_strict_check(rversion);
+  return 0;
 }
 
 /**
@@ -373,63 +264,53 @@
  * on the parse options.
  *
  * @param ps The parsedb state.
- * @param pkg The package being parsed.
  * @param version The version to parse into.
  * @param value The version string to parse from.
  * @param fmt The error format string.
  */
 void
-parse_db_version(struct parsedb_state *ps, const struct pkginfo *pkg,
-                 struct versionrevision *version, const char *value,
-                 const char *fmt, ...)
+parse_db_version(struct parsedb_state *ps, struct versionrevision *version,
+                 const char *value, const char *fmt, ...)
 {
-  const char *msg;
-  bool warn_msg = false;
+  struct dpkg_error err;
+  va_list args;
+  char buf[1000];
 
-  msg = parseversion_lax(version, value);
-  if (msg == NULL) {
-    msg = version_strict_check(version);
-    if (ps->flags & pdb_lax_parser)
-      warn_msg = true;
-  }
+  if (parseversion(version, value, &err) == 0)
+    return;
 
-  if (msg) {
-    va_list args;
-    char buf[1000];
-
-    va_start(args, fmt);
-    vsnprintf(buf, sizeof(buf), fmt, args);
-    va_end(args);
-
-    if (warn_msg)
-      parse_warn(ps, pkg, "%s: %.250s", buf, msg);
-    else
-      parse_error(ps, pkg, "%s: %.250s", buf, msg);
-  }
+  va_start(args, fmt);
+  vsnprintf(buf, sizeof(buf), fmt, args);
+  va_end(args);
+
+  if (err.type == DPKG_MSG_WARN && (ps->flags & pdb_lax_parser))
+    parse_warn(ps, "%s: %.250s", buf, err.str);
+  else
+    parse_error(ps, "%s: %.250s", buf, err.str);
+
+  dpkg_error_destroy(&err);
 }
 
 void
 parse_must_have_field(struct parsedb_state *ps,
-                      const struct pkginfo *pigp,
                       const char *value, const char *what)
 {
   if (!value)
-    parse_error(ps, pigp, _("missing %s"), what);
+    parse_error(ps, _("missing %s"), what);
   else if (!*value)
-    parse_error(ps, pigp, _("empty value for %s"), what);
+    parse_error(ps, _("empty value for %s"), what);
 }
 
 void
 parse_ensure_have_field(struct parsedb_state *ps,
-                        const struct pkginfo *pigp,
                         const char **value, const char *what)
 {
   static const char empty[] = "";
 
   if (!*value) {
-    parse_warn(ps, pigp, _("missing %s"), what);
+    parse_warn(ps, _("missing %s"), what);
     *value = empty;
   } else if (!**value) {
-    parse_warn(ps, pigp, _("empty value for %s"), what);
+    parse_warn(ps, _("empty value for %s"), what);
   }
 }
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/path.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/path.c
--- dpkg/lib/dpkg/path.c	2011-03-09 14:40:51.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/path.c	2012-06-07 10:11:09.426073000 -0700
@@ -3,7 +3,7 @@
  * path.c - path handling functions
  *
  * Copyright © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
- * Copyright © 2008-2010 Guillem Jover <guillem@debian.org>
+ * Copyright © 2008-2011 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -73,6 +73,25 @@
 }
 
 /**
+ * Return the last component of a pathname.
+ *
+ * @param path The pathname to get the base name from.
+ *
+ * @return A pointer to the last component inside pathname.
+ */
+const char *
+path_basename(const char *path)
+{
+	const char *last_slash;
+
+	last_slash = strrchr(path, '/');
+	if (last_slash == NULL)
+		return path;
+	else
+		return last_slash + 1;
+}
+
+/**
  * Create a template for a temporary pathname.
  *
  * @param suffix The suffix to use for the template string.
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/path.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/path.h
--- dpkg/lib/dpkg/path.h	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/path.h	2012-06-07 10:11:09.426073000 -0700
@@ -2,7 +2,7 @@
  * libdpkg - Debian packaging suite library routines
  * path.h - path handling routines
  *
- * Copyright © 2008, 2009 Guillem Jover <guillem@debian.org>
+ * Copyright © 2008-2011 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 
 size_t path_trim_slash_slashdot(char *path);
 const char *path_skip_slash_dotslash(const char *path);
+const char *path_basename(const char *path);
 char *path_quote_filename(char *dst, const char *src, size_t size);
 
 char *path_make_temp_template(const char *suffix);
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/pkg-array.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-array.c
--- dpkg/lib/dpkg/pkg-array.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-array.c	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * pkg-array.c - primitives for pkg array handling
  *
  * Copyright © 1995,1996 Ian Jackson <ian@chiark.greenend.org.uk>
@@ -42,11 +42,11 @@
 	struct pkginfo *pkg;
 	int i;
 
-	a->n_pkgs = pkg_db_count_pkg();
+	a->n_pkgs = pkg_db_count();
 	a->pkgs = m_malloc(sizeof(a->pkgs[0]) * a->n_pkgs);
 
 	it = pkg_db_iter_new();
-	for (i = 0; (pkg = pkg_db_iter_next_pkg(it)); i++)
+	for (i = 0; (pkg = pkg_db_iter_next(it)); i++)
 		a->pkgs[i] = pkg;
 	pkg_db_iter_free(it);
 
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/pkg-array.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-array.h
--- dpkg/lib/dpkg/pkg-array.h	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-array.h	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * pkg-array.h - primitives for pkg array handling
  *
  * Copyright © 2009 Guillem Jover <guillem@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/pkg.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg.c
--- dpkg/lib/dpkg/pkg.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg.c	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * pkg.c - primitives for pkg handling
  *
  * Copyright © 1995, 1996 Ian Jackson <ian@chiark.greenend.org.uk>
@@ -28,19 +28,18 @@
 #include <dpkg/pkg.h>
 
 void
-pkgbin_blank(struct pkgbin *pkgbin, bool keep_arch)
+pkgbin_blank(struct pkgbin *pkgbin)
 {
 	pkgbin->essential = false;
-	pkgbin->multiarch = multiarch_no;
 	pkgbin->depends = NULL;
+	pkgbin->depended = NULL;
 	pkgbin->description = NULL;
 	pkgbin->maintainer = NULL;
 	pkgbin->source = NULL;
 	pkgbin->installedsize = NULL;
 	pkgbin->bugs = NULL;
 	pkgbin->origin = NULL;
-	if (!keep_arch)
-		pkgbin->arch = dpkg_arch_find(NULL);
+	pkgbin->arch = NULL;
 	blankversion(&pkgbin->version);
 	pkgbin->conffiles = NULL;
 	pkgbin->arbs = NULL;
@@ -49,8 +48,7 @@
 void
 pkg_blank(struct pkginfo *pkg)
 {
-	pkg->set = NULL;
-	pkg->arch_next = NULL;
+	pkg->name = NULL;
 	pkg->status = stat_notinstalled;
 	pkg->eflag = eflag_ok;
 	pkg->want = want_unknown;
@@ -64,18 +62,8 @@
 	pkg->trigaw.tail = NULL;
 	pkg->othertrigaw_head = NULL;
 	pkg->trigpend_head = NULL;
-	pkgbin_blank(&pkg->installed, false);
-	pkgbin_blank(&pkg->available, false);
-}
-
-void
-pkgset_blank(struct pkgset *set)
-{
-	set->name = NULL;
-	set->depended.available = NULL;
-	set->depended.installed = NULL;
-	pkg_blank(&set->pkg);
-	set->pkg.set = set;
+	pkgbin_blank(&pkg->installed);
+	pkgbin_blank(&pkg->available);
 }
 
 static int
@@ -132,24 +120,6 @@
 {
 	const struct pkginfo *pa = *(const struct pkginfo **)a;
 	const struct pkginfo *pb = *(const struct pkginfo **)b;
-	const char *arch_a = pa->installed.arch->name;
-	const char *arch_b = pb->installed.arch->name;
-	int res;
-
-	res = strcmp(pa->set->name, pb->set->name);
-	if (res)
-		return res;
-
-	if (pa->installed.arch == pb->installed.arch)
-		return 0;
-
-	/* Native arch sorts first */
-	if (pa->installed.arch->type == arch_all ||
-            pa->installed.arch->type == arch_native)
-		arch_a = "";
-	if (pb->installed.arch->type == arch_all ||
-            pb->installed.arch->type == arch_native)
-		arch_b = "";
 
-	return strcmp(arch_a, arch_b);
+	return strcmp(pa->name, pb->name);
 }
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/pkg-db.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-db.c
--- dpkg/lib/dpkg/pkg-db.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-db.c	2012-06-07 10:11:09.426073000 -0700
@@ -3,8 +3,6 @@
  * pkg-db.c - Low level package database routines (hash tables, etc.)
  *
  * Copyright © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +21,6 @@
 #include <config.h>
 #include <compat.h>
 
-#include <assert.h>
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
@@ -31,7 +28,6 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/arch.h>
 
 /* This must always be a prime for optimal performance.
  * With 4093 buckets, we glean a 20% speedup, for 8191 buckets
@@ -39,8 +35,8 @@
  * sizeof(void *) * 8063 (i.e. less than 32 KiB on 32bit systems). */
 #define BINS 8191
 
-static struct pkgset *bins[BINS];
-static int npkg, nset;
+static struct pkginfo *bins[BINS];
+static int npackages;
 
 #define FNV_offset_basis 2166136261ul
 #define FNV_mixing_prime 16777619ul
@@ -60,25 +56,10 @@
   return h;
 }
 
-/**
- * Return the package set with the given name.
- *
- * If the package already exists in the internal database, then it returns
- * the existing structure. Otherwise it allocates a new one and will
- * return it. The actual name associated to the package set is a lowercase
- * version of the name given in parameter.
- *
- * A package set (struct pkgset) can be composed of multiple package
- * instances (struct pkginfo) where each instance is distinguished
- * by its architecture (as recorded in pkg.{installed,available}.architecture).
- *
- * @param inname Name of the package set.
- * @return The package set.
- */
-struct pkgset *
-pkg_db_find_set(const char *inname)
+struct pkginfo *
+pkg_db_find(const char *inname)
 {
-  struct pkgset **pointerp, *newpkg;
+  struct pkginfo **pointerp, *newpkg;
   char *name = m_strdup(inname), *p;
 
   p= name;
@@ -87,104 +68,23 @@
   pointerp= bins + (hash(name) % (BINS));
   while (*pointerp && strcasecmp((*pointerp)->name,name))
     pointerp= &(*pointerp)->next;
-  if (*pointerp) {
-    free(name);
-    return *pointerp;
-  }
+  if (*pointerp) { free(name); return *pointerp; }
 
-  newpkg = nfmalloc(sizeof(struct pkgset));
-  pkgset_blank(newpkg);
+  newpkg= nfmalloc(sizeof(struct pkginfo));
+  pkg_blank(newpkg);
   newpkg->name= nfstrsave(name);
   newpkg->next= NULL;
   *pointerp= newpkg;
-  nset++;
-  npkg++;
+  npackages++;
 
   free(name);
   return newpkg;
 }
 
-/**
- * Return the package instance with the given name and architecture.
- *
- * It first uses pkg_db_find_set() to retrieve the right package set and
- * then traverse the various instances to find out whether there's one
- * matching the given architecture. If yes, it returns it. Otherwise it
- * allocates an new instance and register it in the package set berfore
- * returning it.
- *
- * If the requested architecture is a NULL pointer, it will be dealt like
- * the native architecture and the special architecture "all": it will
- * always return the first instance in the list (this one always exists
- * since it's part of the pksget structure).
- *
- * @param name The package name.
- * @param arch The requested architecture.
- * @return The package instance.
- */
-struct pkginfo *
-pkg_db_find_pkg(const char *name, const struct dpkg_arch *arch)
-{
-  struct pkgset *set;
-  struct pkginfo *pkg, **pkgp;
-
-  set = pkg_db_find_set(name);
-  pkg = &set->pkg;
-  if (!arch || arch->type == arch_native || arch->type == arch_all ||
-      arch->type == arch_none) {
-    /* Must always use the first instance */
-    assert(pkg->installed.arch->type == arch_native ||
-           pkg->installed.arch->type == arch_all ||
-           pkg->installed.arch->type == arch_none);
-    return pkg;
-  }
-
-  /* Look into alternate instances for the wanted architecture */
-  pkgp = &pkg->arch_next;
-  while (*pkgp) {
-    if (!(*pkgp)->installed.arch) {
-      /* pkginfo is not differentiated, use it */
-      (*pkgp)->installed.arch = arch;
-      (*pkgp)->available.arch = arch;
-      return *pkgp;
-    }
-    if ((*pkgp)->installed.arch == arch)
-      return *pkgp;
-    pkgp = &(*pkgp)->arch_next;
-  }
-
-  /* Need to create a new instance for the wanted architecture */
-  pkg = nfmalloc(sizeof(struct pkginfo));
-  pkg_blank(pkg);
-  pkg->set = set;
-  pkg->installed.arch = arch;
-  pkg->available.arch = arch;
-  *pkgp = pkg;
-  npkg++;
-
-  return pkg;
-}
-
-/**
- * Return the number of package sets available in the database.
- *
- * @return The number of package sets.
- */
 int
-pkg_db_count_set(void)
+pkg_db_count(void)
 {
-  return nset;
-}
-
-/**
- * Return the number of package instances available in the database.
- *
- * @return The number of package instances.
- */
-int
-pkg_db_count_pkg(void)
-{
-  return npkg;
+  return npackages;
 }
 
 struct pkgiterator {
@@ -192,13 +92,6 @@
   int nbinn;
 };
 
-/**
- * Create a new package iterator.
- *
- * It can iterate either over package sets or over package instances.
- *
- * @return The iterator.
- */
 struct pkgiterator *
 pkg_db_iter_new(void)
 {
@@ -209,76 +102,17 @@
   return i;
 }
 
-/**
- * Return the next package set in the database.
- *
- * If no further package set is available, it will return NULL.
- *
- * @name it The iterator.
- * @return A package set.
- */
-struct pkgset *
-pkg_db_iter_next_set(struct pkgiterator *it)
-{
-  struct pkgset *set;
-
-  while (!it->pigp) {
-    if (it->nbinn >= BINS)
-      return NULL;
-    if (bins[it->nbinn])
-      it->pigp = &bins[it->nbinn]->pkg;
-    it->nbinn++;
-  }
-
-  set = it->pigp->set;
-  if (set->next)
-    it->pigp = &set->next->pkg;
-  else
-    it->pigp = NULL;
-
-  return set;
-}
-
-/**
- * Return the next package instance in the database.
- *
- * If no further package instance is available, it will return NULL. Note
- * that it will return all instances of a given package set in sequential
- * order. The first instance for a given package set will always
- * correspond to the native architecture even if that package is not
- * installed or available.
- *
- * @name i The iterator.
- * @return A package instance.
- */
 struct pkginfo *
-pkg_db_iter_next_pkg(struct pkgiterator *i)
+pkg_db_iter_next(struct pkgiterator *i)
 {
   struct pkginfo *r;
-
   while (!i->pigp) {
     if (i->nbinn >= BINS) return NULL;
-    if (bins[i->nbinn])
-      i->pigp = &bins[i->nbinn]->pkg;
-    i->nbinn++;
+    i->pigp= bins[i->nbinn++];
   }
-
-  r = i->pigp;
-  if (r->arch_next)
-    i->pigp = r->arch_next;
-  else if (r->set->next)
-    i->pigp = &r->set->next->pkg;
-  else
-    i->pigp = NULL;
-
-  return r;
+  r= i->pigp; i->pigp= r->next; return r;
 }
 
-/**
- * Free up the resources associated to the package iterator.
- *
- * @name i The iterator.
- */
 void
 pkg_db_iter_free(struct pkgiterator *i)
 {
@@ -290,27 +124,25 @@
 {
   int i;
   nffreeall();
-  nset = 0;
-  npkg = 0;
+  npackages= 0;
   for (i=0; i<BINS; i++) bins[i]= NULL;
-  dpkg_arch_reset();
 }
 
 void
 pkg_db_report(FILE *file)
 {
   int i, c;
-  struct pkgset *pkg;
+  struct pkginfo *pkg;
   int *freq;
 
-  freq = m_malloc(sizeof(int) * nset + 1);
-  for (i = 0; i <= nset; i++) freq[i]= 0;
+  freq= m_malloc(sizeof(int)*npackages+1);
+  for (i=0; i<=npackages; i++) freq[i]= 0;
   for (i=0; i<BINS; i++) {
     for (c=0, pkg= bins[i]; pkg; c++, pkg= pkg->next);
     fprintf(file,"bin %5d has %7d\n",i,c);
     freq[c]++;
   }
-  for (i = nset; i > 0 && freq[i] == 0; i--);
+  for (i=npackages; i>0 && freq[i]==0; i--);
   while (i >= 0) {
     fprintf(file, "size %7d occurs %5d times\n", i, freq[i]);
     i--;
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/pkg.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg.h
--- dpkg/lib/dpkg/pkg.h	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg.h	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * pkg.h - primitives for pkg handling
  *
  * Copyright © 2009 Guillem Jover <guillem@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/pkg-list.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-list.c
--- dpkg/lib/dpkg/pkg-list.c	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-list.c	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * pkg-list.c - primitives for pkg linked list handling
  *
  * Copyright © 2009 Guillem Jover <guillem@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/pkg-list.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-list.h
--- dpkg/lib/dpkg/pkg-list.h	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-list.h	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * pkg-list.h - primitives for pkg linked list handling
  *
  * Copyright © 2009 Guillem Jover <guillem@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/pkg-queue.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-queue.c
--- dpkg/lib/dpkg/pkg-queue.c	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-queue.c	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * pkg-queue.c - primitives for pkg queue handling
  *
  * Copyright © 2010 Guillem Jover <guillem@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/pkg-queue.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-queue.h
--- dpkg/lib/dpkg/pkg-queue.h	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-queue.h	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * pkg-queue.h - primitives for pkg queue handling
  *
  * Copyright © 2010 Guillem Jover <guillem@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/pkg-show.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-show.c
--- dpkg/lib/dpkg/pkg-show.c	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-show.c	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * pkg-show.c - primitives for pkg information display
  *
  * Copyright © 1995,1996 Ian Jackson <ian@chiark.greenend.org.uk>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/pkg-show.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-show.h
--- dpkg/lib/dpkg/pkg-show.h	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-show.h	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * pkg-show.h - primitives for pkg information display
  *
  * Copyright © 2010 Guillem Jover <guillem@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/pkg-spec.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-spec.c
--- dpkg/lib/dpkg/pkg-spec.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-spec.c	1969-12-31 16:00:00.000000000 -0800
@@ -1,261 +0,0 @@
-/*
- * libdpkg - Debian packaging suite library routines
- * pkg-spec.c - routines to handle package specifiers
- *
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include <compat.h>
-
-#include <stdlib.h>
-#include <fnmatch.h>
-#include <string.h>
-#include <assert.h>
-
-#include <dpkg/i18n.h>
-#include <dpkg/dpkg.h>
-#include <dpkg/dpkg-db.h>
-#include <dpkg/arch.h>
-#include <dpkg/pkg-spec.h>
-
-static void pkg_spec_iter_reset(struct pkg_spec *ps);
-static bool pkg_spec_do_checks(struct pkg_spec *ps, bool fail_on_error);
-static bool pkg_spec_match_flags(struct pkg_spec *ps, struct pkginfo *pkg);
-static bool pkg_spec_match_arch(struct pkg_spec *ps, const struct dpkg_arch *arch);
-static bool pkg_spec_match_pkgname(struct pkg_spec *ps, const char *name);
-
-void
-pkg_spec_reset(struct pkg_spec *ps)
-{
-	if (!(ps->flags & psf_no_copy))
-		free(ps->name);
-	ps->name = NULL;
-	ps->arch = NULL;
-	pkg_spec_iter_reset(ps);
-	/* flags is left untouched on purpose */
-}
-
-bool
-pkg_spec_parse(struct pkg_spec *ps, const char *string)
-{
-	char *arch;
-
-	pkg_spec_reset(ps);
-
-	if (ps->flags & psf_no_copy)
-		ps->name = (char *) string;
-	else
-		ps->name = m_strdup(string);
-
-	arch = strchr(ps->name, ':');
-	if (arch) {
-		arch[0] = '\0';
-		arch++;
-	}
-	ps->arch = dpkg_arch_find(arch);
-
-	return pkg_spec_do_checks(ps, !(ps->flags & psf_no_check));
-}
-
-bool
-pkg_spec_do_checks(struct pkg_spec *ps, bool fail_on_error)
-{
-	const char *emsg;
-
-	ps->name_is_pattern = false;
-	ps->arch_is_pattern = false;
-
-	/* Detect if we have patterns and/or illegal names */
-	if ((ps->flags & psf_patterns) && strpbrk(ps->name, "*[?\\"))
-		ps->name_is_pattern = true;
-
-	if ((ps->flags & psf_patterns) && strpbrk(ps->arch->name, "*[?\\"))
-		ps->arch_is_pattern = true;
-
-	emsg = pkg_spec_is_illegal(ps);
-	if (fail_on_error && emsg)
-		ohshit("%s", emsg);
-
-	return (emsg == NULL);
-}
-
-bool
-pkg_spec_is_pattern(struct pkg_spec *ps)
-{
-	if (ps->name_is_pattern || ps->arch_is_pattern)
-		return true;
-	if ((ps->flags & psf_def_wildcard) && ps->arch->type == arch_none)
-		return true;
-	return false;
-}
-
-const char *
-pkg_spec_is_illegal(struct pkg_spec *ps)
-{
-	static char msg[1024];
-	const char *emsg;
-
-	if (!ps->name_is_pattern &&
-	    (emsg = pkg_name_is_illegal(ps->name, NULL))) {
-		snprintf(msg, 1024, _("package name in specifier '%s%s%s' is "
-		                      "illegal: %s"), ps->name,
-		         (ps->arch->type != arch_none) ? ":" : "",
-		         ps->arch->name, emsg);
-		return msg;
-	}
-
-	if (!ps->arch_is_pattern && ps->arch->type == arch_illegal) {
-		emsg = dpkg_arch_name_is_illegal(ps->arch->name);
-		snprintf(msg, 1024, _("architecture name in specifier '%s%s%s' "
-		                      "is illegal: %s"), ps->name,
-		         (ps->arch->type != arch_none) ? ":" : "",
-		         ps->arch->name, emsg);
-		return msg;
-	}
-
-	return NULL;
-}
-
-struct pkginfo *
-pkg_spec_find_pkg(struct pkg_spec *ps, const char *string)
-{
-	struct pkginfo *pkg = NULL;
-	const char *emsg;
-
-	if (ps->flags & (psf_patterns | psf_def_wildcard))
-		internerr("pkg_spec_find_pkg() incompatible with patterns");
-
-	if (string)
-		pkg_spec_parse(ps, string);
-
-	emsg = pkg_spec_is_illegal(ps);
-	if (emsg)
-		ohshit("%s", emsg);
-
-	pkg = pkg_db_find_pkg(ps->name, ps->arch);
-	if (!pkg_spec_match_flags(ps, pkg))
-		pkg = NULL;
-
-	if (string)
-		pkg_spec_reset(ps);
-
-	return pkg;
-}
-
-static bool
-pkg_spec_match_arch(struct pkg_spec *ps, const struct dpkg_arch *arch)
-{
-	if (ps->arch_is_pattern)
-		return (fnmatch(ps->arch->name, arch->name, 0) == 0);
-	else if (ps->arch->type != arch_none) /* !arch_is_pattern */
-		return (ps->arch == arch);
-
-	/* No arch specified  */
-	switch (ps->flags & psf_def_mask) {
-	case psf_def_native:
-		return (arch->type == arch_native || arch->type == arch_all ||
-		        arch->type == arch_none);
-	case psf_def_wildcard:
-		return true;
-	default:
-		internerr("multiple/unknown/no psf_def_* configured in pkg_spec");
-	}
-}
-
-static bool
-pkg_spec_match_pkgname(struct pkg_spec *ps, const char *name)
-{
-	if (ps->name_is_pattern) {
-		return (fnmatch(ps->name, name, 0) == 0);
-	} else {
-		return (strcmp(ps->name, name) == 0);
-	}
-}
-
-static bool
-pkg_spec_match_flags(struct pkg_spec *ps, struct pkginfo *pkg)
-{
-	if ((ps->flags & psf_skip_not_installed) &&
-	    pkg->status == stat_notinstalled)
-		return false;
-	if ((ps->flags & psf_skip_config_files) && pkg &&
-	    pkg->status == stat_configfiles)
-		return false;
-	return true;
-}
-
-bool
-pkg_spec_match_pkg(struct pkg_spec *ps, struct pkginfo *pkg,
-                   struct pkgbin *pbin)
-{
-	return (pkg_spec_match_flags(ps, pkg) &&
-	        pkg_spec_match_arch(ps, pbin->arch) &&
-	        pkg_spec_match_pkgname(ps, pkg->set->name));
-}
-
-static void
-pkg_spec_iter_reset(struct pkg_spec *ps)
-{
-	if (ps->pkg_iter) {
-		pkg_db_iter_free(ps->pkg_iter);
-		ps->pkg_iter = NULL;
-	}
-	ps->pkg_next = NULL;
-}
-
-void
-pkg_spec_iter_start(struct pkg_spec *ps)
-{
-	/* Cleanup from previous run if needed */
-	pkg_spec_iter_reset(ps);
-	/* Initialize iteration variables */
-	if (ps->name_is_pattern) {
-		ps->pkg_iter = pkg_db_iter_new();
-	} else {
-		ps->pkg_next = &pkg_db_find_set(ps->name)->pkg;
-	}
-}
-
-struct pkginfo *
-pkg_spec_iter_next_pkg(struct pkg_spec *ps)
-{
-	struct pkginfo *r;
-	struct pkgset *set;
-
-loop_arch:
-	/* Loop over all architectures and return the matching ones */
-	while (ps->pkg_next) {
-		r = ps->pkg_next;
-		ps->pkg_next = r->arch_next;
-		if (pkg_spec_match_flags(ps, r) &&
-		    pkg_spec_match_arch(ps, r->installed.arch))
-			return r;
-	}
-
-	/* Iterate over other package sets when needed */
-	if (!ps->pkg_iter)
-		return NULL;
-
-	while ((set = pkg_db_iter_next_set(ps->pkg_iter))) {
-		if (!pkg_spec_match_pkgname(ps, set->name))
-			continue;
-		ps->pkg_next = &set->pkg;
-		goto loop_arch;
-	}
-	return NULL;
-}
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/pkg-spec.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-spec.h
--- dpkg/lib/dpkg/pkg-spec.h	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/pkg-spec.h	1969-12-31 16:00:00.000000000 -0800
@@ -1,77 +0,0 @@
-/*
- * libdpkg - Debian packaging suite library routines
- * pkg-spec.h - definitions for package specifiers handling
- *
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef DPKG_PKGSPEC_H
-#define DPKG_PKGSPEC_H
-
-#include <stdbool.h>
-
-#include <dpkg/macros.h>
-#include <dpkg/dpkg-db.h>
-#include <dpkg/varbuf.h>
-#include <dpkg/arch.h>
-
-DPKG_BEGIN_DECLS
-
-struct pkg_spec {
-	char *name;
-	const struct dpkg_arch *arch;
-
-	enum pkg_spec_flags {
-		psf_no_copy            = 00001, /* No need to strdup name */
-		psf_no_check           = 00002, /* Don't fail on illegal pkg/arch names */
-		psf_patterns           = 00004, /* Detect patterns */
-		psf_skip_not_installed = 00010, /* Skip stat_notinstalled */
-		psf_skip_config_files  = 00020, /* Skip stat_configfiles */
-
-		/* How to consider the lack of an arch qualifier */
-		psf_def_native         = 00100,
-		psf_def_wildcard       = 00200,
-		psf_def_mask           = 00300,
-	} flags;
-
-	/* Members below are private */
-	bool name_is_pattern;
-	bool arch_is_pattern;
-
-	/* Used for the iterator */
-	struct pkgiterator *pkg_iter;
-	struct pkginfo *pkg_next;
-};
-
-#define PKG_SPEC_INIT(flags) { NULL, NULL, flags, false, false, NULL, NULL }
-
-void pkg_spec_reset(struct pkg_spec *ps);
-bool pkg_spec_parse(struct pkg_spec *ps, const char *string);
-
-struct pkginfo *pkg_spec_find_pkg(struct pkg_spec *ps, const char* string);
-bool pkg_spec_match_pkg(struct pkg_spec *ps, struct pkginfo *pkg,
-                        struct pkgbin *pbin);
-
-bool pkg_spec_is_pattern(struct pkg_spec *ps);
-const char *pkg_spec_is_illegal(struct pkg_spec *ps);
-
-void pkg_spec_iter_start(struct pkg_spec *ps);
-struct pkginfo *pkg_spec_iter_next_pkg(struct pkg_spec *ps);
-
-DPKG_END_DECLS
-
-#endif
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/progname.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/progname.c
--- dpkg/lib/dpkg/progname.c	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/progname.c	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,77 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * progname.c - program name handling functions
+ *
+ * Copyright © 2011 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <errno.h>
+#include <stdlib.h>
+
+#include <dpkg/path.h>
+#include <dpkg/progname.h>
+
+static const char *progname;
+
+/**
+ * Set the program name.
+ *
+ * This function will set the program name which will be used by error
+ * reporting functions, among others.
+ *
+ * @param name The new program name.
+ */
+void
+dpkg_set_progname(const char *name)
+{
+	progname = path_basename(name);
+}
+
+#if defined(HAVE___PROGNAME)
+extern const char *__progname;
+#endif
+
+/**
+ * Get the program name.
+ *
+ * The program name might have been set previously by dpkg_set_progname(),
+ * but if not this function will try to initialize it by system dependent
+ * means, so it's half safe to not call dpkg_set_progname() at all. At worst
+ * the function might return NULL in that case.
+ *
+ * @return A pointer to a static buffer with the program name.
+ */
+const char *
+dpkg_get_progname(void)
+{
+	if (progname == NULL) {
+#if defined(HAVE_PROGRAM_INVOCATION_SHORT_NAME)
+		progname = program_invocation_short_name;
+#elif defined(HAVE___PROGNAME)
+		progname = __progname;
+#elif defined(HAVE_GETPROGNAME)
+		progname = getprogname();
+#elif defined(HAVE_GETEXECNAME)
+		/* getexecname(3) returns an absolute path, normalize it. */
+		dpkg_set_progname(getexecname());
+#endif
+	}
+
+	return progname;
+}
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/progname.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/progname.h
--- dpkg/lib/dpkg/progname.h	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/progname.h	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,33 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * progname.h - program name handling functions
+ *
+ * Copyright © 2011 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBDPKG_PROGNAME_H
+#define LIBDPKG_PROGNAME_H
+
+#include <dpkg/macros.h>
+
+DPKG_BEGIN_DECLS
+
+void dpkg_set_progname(const char *name);
+const char *dpkg_get_progname(void);
+
+DPKG_END_DECLS
+
+#endif
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/progress.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/progress.c
--- dpkg/lib/dpkg/progress.c	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/progress.c	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * progress.c - generic progress reporting
  *
  * Copyright © 2009 Romain Francoise <rfrancoise@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/progress.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/progress.h
--- dpkg/lib/dpkg/progress.h	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/progress.h	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * progress.h - generic progress reporting
  *
  * Copyright © 2009 Guillem Jover <guillem@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/subproc.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/subproc.c
--- dpkg/lib/dpkg/subproc.c	2011-03-01 14:31:03.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/subproc.c	2012-06-07 10:11:09.426073000 -0700
@@ -35,24 +35,25 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/subproc.h>
 
-static int catch_signals[] = { SIGQUIT, SIGINT };
-static struct sigaction uncatch_signals[array_count(catch_signals)];
+static int signo_ignores[] = { SIGQUIT, SIGINT };
+static struct sigaction sa_save[array_count(signo_ignores)];
 
 void
 subproc_signals_setup(const char *name)
 {
+	struct sigaction sa;
 	size_t i;
-	struct sigaction catchsig;
 
 	onerr_abort++;
-	memset(&catchsig, 0, sizeof(catchsig));
-	catchsig.sa_handler = SIG_IGN;
-	sigemptyset(&catchsig.sa_mask);
-	catchsig.sa_flags = 0;
-	for (i = 0; i < array_count(catch_signals); i++)
-		if (sigaction(catch_signals[i], &catchsig, &uncatch_signals[i]))
+	memset(&sa, 0, sizeof(sa));
+	sigemptyset(&sa.sa_mask);
+	sa.sa_handler = SIG_IGN;
+	sa.sa_flags = 0;
+
+	for (i = 0; i < array_count(signo_ignores); i++)
+		if (sigaction(signo_ignores[i], &sa, &sa_save[i]))
 			ohshite(_("unable to ignore signal %s before running %.250s"),
-			        strsignal(catch_signals[i]), name);
+			        strsignal(signo_ignores[i]), name);
 	push_cleanup(subproc_signals_cleanup, ~0, NULL, 0, 0);
 	onerr_abort--;
 }
@@ -62,10 +63,10 @@
 {
 	size_t i;
 
-	for (i = 0; i < array_count(catch_signals); i++) {
-		if (sigaction(catch_signals[i], &uncatch_signals[i], NULL)) {
+	for (i = 0; i < array_count(signo_ignores); i++) {
+		if (sigaction(signo_ignores[i], &sa_save[i], NULL)) {
 			fprintf(stderr, _("error un-catching signal %s: %s\n"),
-			        strsignal(catch_signals[i]), strerror(errno));
+			        strsignal(signo_ignores[i]), strerror(errno));
 			onerr_abort++;
 		}
 	}
@@ -74,27 +75,27 @@
 static void
 print_subproc_error(const char *emsg, const char *contextstring)
 {
-	fprintf(stderr, _("%s (subprocess): %s\n"), thisname, emsg);
+	fprintf(stderr, _("%s (subprocess): %s\n"), dpkg_get_progname(), emsg);
 }
 
 pid_t
 subproc_fork(void)
 {
-	pid_t r;
+	pid_t pid;
 
-	r = fork();
-	if (r == -1) {
+	pid = fork();
+	if (pid == -1) {
 		onerr_abort++;
 		ohshite(_("fork failed"));
 	}
-	if (r > 0)
-		return r;
+	if (pid > 0)
+		return pid;
 
 	/* Push a new error context, so that we don't do the other cleanups,
 	 * because they'll be done by/in the parent process. */
 	push_error_context_func(catch_fatal_error, print_subproc_error, NULL);
 
-	return r;
+	return pid;
 }
 
 int
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/test/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/.gitignore
--- dpkg/lib/dpkg/test/.gitignore	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1,13 +0,0 @@
-t-ar
-t-arch
-t-buffer
-t-command
-t-macros
-t-path
-t-pkginfo
-t-pkg-list
-t-pkg-queue
-t-string
-t-test
-t-varbuf
-t-version
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/test/Makefile.am /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/Makefile.am
--- dpkg/lib/dpkg/test/Makefile.am	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/Makefile.am	2012-06-07 10:11:09.426073000 -0700
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
+	-DADMINDIR=\"$(admindir)\" \
 	-idirafter $(top_srcdir)/lib/compat \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/lib
@@ -14,13 +15,15 @@
 	t-string \
 	t-buffer \
 	t-path \
+	t-progname \
+	t-subproc \
 	t-command \
 	t-varbuf \
 	t-ar \
-	t-arch \
 	t-version \
 	t-pkginfo \
 	t-pkg-list \
-	t-pkg-queue
+	t-pkg-queue \
+	t-mod-db
 
 TESTS = $(check_PROGRAMS)
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/test/Makefile.in /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/Makefile.in
--- dpkg/lib/dpkg/test/Makefile.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/Makefile.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,718 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+check_PROGRAMS = t-test$(EXEEXT) t-macros$(EXEEXT) t-string$(EXEEXT) \
+	t-buffer$(EXEEXT) t-path$(EXEEXT) t-progname$(EXEEXT) \
+	t-subproc$(EXEEXT) t-command$(EXEEXT) t-varbuf$(EXEEXT) \
+	t-ar$(EXEEXT) t-version$(EXEEXT) t-pkginfo$(EXEEXT) \
+	t-pkg-list$(EXEEXT) t-pkg-queue$(EXEEXT) t-mod-db$(EXEEXT)
+subdir = lib/dpkg/test
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
+	$(top_srcdir)/m4/dpkg-build.m4 \
+	$(top_srcdir)/m4/dpkg-compiler.m4 \
+	$(top_srcdir)/m4/dpkg-coverage.m4 \
+	$(top_srcdir)/m4/dpkg-funcs.m4 $(top_srcdir)/m4/dpkg-libs.m4 \
+	$(top_srcdir)/m4/dpkg-linker.m4 $(top_srcdir)/m4/dpkg-progs.m4 \
+	$(top_srcdir)/m4/dpkg-types.m4 \
+	$(top_srcdir)/m4/dpkg-unicode.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+t_ar_SOURCES = t-ar.c
+t_ar_OBJECTS = t-ar.$(OBJEXT)
+t_ar_LDADD = $(LDADD)
+t_ar_DEPENDENCIES = ../libdpkg.a
+t_buffer_SOURCES = t-buffer.c
+t_buffer_OBJECTS = t-buffer.$(OBJEXT)
+t_buffer_LDADD = $(LDADD)
+t_buffer_DEPENDENCIES = ../libdpkg.a
+t_command_SOURCES = t-command.c
+t_command_OBJECTS = t-command.$(OBJEXT)
+t_command_LDADD = $(LDADD)
+t_command_DEPENDENCIES = ../libdpkg.a
+t_macros_SOURCES = t-macros.c
+t_macros_OBJECTS = t-macros.$(OBJEXT)
+t_macros_LDADD = $(LDADD)
+t_macros_DEPENDENCIES = ../libdpkg.a
+t_mod_db_SOURCES = t-mod-db.c
+t_mod_db_OBJECTS = t-mod-db.$(OBJEXT)
+t_mod_db_LDADD = $(LDADD)
+t_mod_db_DEPENDENCIES = ../libdpkg.a
+t_path_SOURCES = t-path.c
+t_path_OBJECTS = t-path.$(OBJEXT)
+t_path_LDADD = $(LDADD)
+t_path_DEPENDENCIES = ../libdpkg.a
+t_pkg_list_SOURCES = t-pkg-list.c
+t_pkg_list_OBJECTS = t-pkg-list.$(OBJEXT)
+t_pkg_list_LDADD = $(LDADD)
+t_pkg_list_DEPENDENCIES = ../libdpkg.a
+t_pkg_queue_SOURCES = t-pkg-queue.c
+t_pkg_queue_OBJECTS = t-pkg-queue.$(OBJEXT)
+t_pkg_queue_LDADD = $(LDADD)
+t_pkg_queue_DEPENDENCIES = ../libdpkg.a
+t_pkginfo_SOURCES = t-pkginfo.c
+t_pkginfo_OBJECTS = t-pkginfo.$(OBJEXT)
+t_pkginfo_LDADD = $(LDADD)
+t_pkginfo_DEPENDENCIES = ../libdpkg.a
+t_progname_SOURCES = t-progname.c
+t_progname_OBJECTS = t-progname.$(OBJEXT)
+t_progname_LDADD = $(LDADD)
+t_progname_DEPENDENCIES = ../libdpkg.a
+t_string_SOURCES = t-string.c
+t_string_OBJECTS = t-string.$(OBJEXT)
+t_string_LDADD = $(LDADD)
+t_string_DEPENDENCIES = ../libdpkg.a
+t_subproc_SOURCES = t-subproc.c
+t_subproc_OBJECTS = t-subproc.$(OBJEXT)
+t_subproc_LDADD = $(LDADD)
+t_subproc_DEPENDENCIES = ../libdpkg.a
+t_test_SOURCES = t-test.c
+t_test_OBJECTS = t-test.$(OBJEXT)
+t_test_LDADD = $(LDADD)
+t_test_DEPENDENCIES = ../libdpkg.a
+t_varbuf_SOURCES = t-varbuf.c
+t_varbuf_OBJECTS = t-varbuf.$(OBJEXT)
+t_varbuf_LDADD = $(LDADD)
+t_varbuf_DEPENDENCIES = ../libdpkg.a
+t_version_SOURCES = t-version.c
+t_version_OBJECTS = t-version.$(OBJEXT)
+t_version_LDADD = $(LDADD)
+t_version_DEPENDENCIES = ../libdpkg.a
+DEFAULT_INCLUDES = 
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = t-ar.c t-buffer.c t-command.c t-macros.c t-mod-db.c t-path.c \
+	t-pkg-list.c t-pkg-queue.c t-pkginfo.c t-progname.c t-string.c \
+	t-subproc.c t-test.c t-varbuf.c t-version.c
+DIST_SOURCES = t-ar.c t-buffer.c t-command.c t-macros.c t-mod-db.c \
+	t-path.c t-pkg-list.c t-pkg-queue.c t-pkginfo.c t-progname.c \
+	t-string.c t-subproc.c t-test.c t-varbuf.c t-version.c
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BZ2_LIBS = @BZ2_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCOV = @GCOV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LCOV = @LCOV@
+LCOV_GENHTML = @LCOV_GENHTML@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_COVER = @PERL_COVER@
+PERL_COVERAGE = @PERL_COVERAGE@
+PERL_LIBDIR = @PERL_LIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PO4A = @PO4A@
+POD2MAN = @POD2MAN@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_PO4A = @USE_PO4A@
+USE_UNICODE = @USE_UNICODE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+admindir = @admindir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DADMINDIR=\"$(admindir)\" \
+	-idirafter $(top_srcdir)/lib/compat \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/lib
+
+LDADD = ../libdpkg.a
+TESTS = $(check_PROGRAMS)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/dpkg/test/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign lib/dpkg/test/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-checkPROGRAMS:
+	-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+t-ar$(EXEEXT): $(t_ar_OBJECTS) $(t_ar_DEPENDENCIES) 
+	@rm -f t-ar$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_ar_OBJECTS) $(t_ar_LDADD) $(LIBS)
+t-buffer$(EXEEXT): $(t_buffer_OBJECTS) $(t_buffer_DEPENDENCIES) 
+	@rm -f t-buffer$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_buffer_OBJECTS) $(t_buffer_LDADD) $(LIBS)
+t-command$(EXEEXT): $(t_command_OBJECTS) $(t_command_DEPENDENCIES) 
+	@rm -f t-command$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_command_OBJECTS) $(t_command_LDADD) $(LIBS)
+t-macros$(EXEEXT): $(t_macros_OBJECTS) $(t_macros_DEPENDENCIES) 
+	@rm -f t-macros$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_macros_OBJECTS) $(t_macros_LDADD) $(LIBS)
+t-mod-db$(EXEEXT): $(t_mod_db_OBJECTS) $(t_mod_db_DEPENDENCIES) 
+	@rm -f t-mod-db$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_mod_db_OBJECTS) $(t_mod_db_LDADD) $(LIBS)
+t-path$(EXEEXT): $(t_path_OBJECTS) $(t_path_DEPENDENCIES) 
+	@rm -f t-path$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_path_OBJECTS) $(t_path_LDADD) $(LIBS)
+t-pkg-list$(EXEEXT): $(t_pkg_list_OBJECTS) $(t_pkg_list_DEPENDENCIES) 
+	@rm -f t-pkg-list$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_pkg_list_OBJECTS) $(t_pkg_list_LDADD) $(LIBS)
+t-pkg-queue$(EXEEXT): $(t_pkg_queue_OBJECTS) $(t_pkg_queue_DEPENDENCIES) 
+	@rm -f t-pkg-queue$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_pkg_queue_OBJECTS) $(t_pkg_queue_LDADD) $(LIBS)
+t-pkginfo$(EXEEXT): $(t_pkginfo_OBJECTS) $(t_pkginfo_DEPENDENCIES) 
+	@rm -f t-pkginfo$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_pkginfo_OBJECTS) $(t_pkginfo_LDADD) $(LIBS)
+t-progname$(EXEEXT): $(t_progname_OBJECTS) $(t_progname_DEPENDENCIES) 
+	@rm -f t-progname$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_progname_OBJECTS) $(t_progname_LDADD) $(LIBS)
+t-string$(EXEEXT): $(t_string_OBJECTS) $(t_string_DEPENDENCIES) 
+	@rm -f t-string$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_string_OBJECTS) $(t_string_LDADD) $(LIBS)
+t-subproc$(EXEEXT): $(t_subproc_OBJECTS) $(t_subproc_DEPENDENCIES) 
+	@rm -f t-subproc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_subproc_OBJECTS) $(t_subproc_LDADD) $(LIBS)
+t-test$(EXEEXT): $(t_test_OBJECTS) $(t_test_DEPENDENCIES) 
+	@rm -f t-test$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_test_OBJECTS) $(t_test_LDADD) $(LIBS)
+t-varbuf$(EXEEXT): $(t_varbuf_OBJECTS) $(t_varbuf_DEPENDENCIES) 
+	@rm -f t-varbuf$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_varbuf_OBJECTS) $(t_varbuf_LDADD) $(LIBS)
+t-version$(EXEEXT): $(t_version_OBJECTS) $(t_version_DEPENDENCIES) 
+	@rm -f t-version$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_version_OBJECTS) $(t_version_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-ar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-buffer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-command.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-macros.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-mod-db.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-path.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-pkg-list.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-pkg-queue.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-pkginfo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-progname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-string.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-subproc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-varbuf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-version.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+check-TESTS: $(TESTS)
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	srcdir=$(srcdir); export srcdir; \
+	list=' $(TESTS) '; \
+	$(am__tty_colors); \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xpass=`expr $$xpass + 1`; \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=XPASS; \
+	      ;; \
+	      *) \
+		col=$$grn; res=PASS; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xfail=`expr $$xfail + 1`; \
+		col=$$lgn; res=XFAIL; \
+	      ;; \
+	      *) \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=FAIL; \
+	      ;; \
+	      esac; \
+	    else \
+	      skip=`expr $$skip + 1`; \
+	      col=$$blu; res=SKIP; \
+	    fi; \
+	    echo "$${col}$$res$${std}: $$tst"; \
+	  done; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="$$All$$all $$tests passed"; \
+	    else \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+	    fi; \
+	  else \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all $$tests failed"; \
+	    else \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	    fi; \
+	  fi; \
+	  dashes="$$banner"; \
+	  skipped=""; \
+	  if test "$$skip" -ne 0; then \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
+	    else \
+	      skipped="($$skip tests were not run)"; \
+	    fi; \
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$skipped"; \
+	  fi; \
+	  report=""; \
+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$report"; \
+	  fi; \
+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
+	  if test "$$failed" -eq 0; then \
+	    echo "$$grn$$dashes"; \
+	  else \
+	    echo "$$red$$dashes"; \
+	  fi; \
+	  echo "$$banner"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
+	  echo "$$dashes$$std"; \
+	  test "$$failed" -eq 0; \
+	else :; fi
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-checkPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-generic ctags distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/test/t-arch.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-arch.c
--- dpkg/lib/dpkg/test/t-arch.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-arch.c	1969-12-31 16:00:00.000000000 -0800
@@ -1,129 +0,0 @@
-/*
- * libdpkg - Debian packaging suite library routines
- * t-arch.c - test dpkg_arch_* implementation
- *
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include <compat.h>
-
-#include <dpkg/test.h>
-#include <dpkg/dpkg-db.h>
-#include <dpkg/arch.h>
-
-static void
-test_dpkg_arch_find(void)
-{
-	struct dpkg_arch *arch;
-
-	/* Ensure the default architectures exist and are properly
-	 * initialized. */
-	arch = dpkg_arch_find("all");
-	test_pass(arch->type == arch_all);
-	arch = dpkg_arch_find(ARCHITECTURE);
-	test_pass(arch->type == arch_native);
-	arch = dpkg_arch_find("any");
-	test_pass(arch->type == arch_wildcard);
-
-	/* Empty architectures are marked none. */
-	arch = dpkg_arch_find(NULL);
-	test_pass(arch->type == arch_none);
-	test_str(arch->name, ==, "");
-	arch = dpkg_arch_find("");
-	test_pass(arch->type == arch_none);
-	test_str(arch->name, ==, "");
-
-	/* New valid architectures are marked unknown. */
-	arch = dpkg_arch_find("foobar");
-	test_pass(arch->type == arch_unknown);
-	test_str(arch->name, ==, "foobar");
-
-	/* New illegal architectures are marked illegal. */
-	arch = dpkg_arch_find("a:b");
-	test_pass(arch->type == arch_illegal);
-	test_str(arch->name, ==, "a:b");
-}
-
-static void
-test_dpkg_arch_get_native(void)
-{
-	struct dpkg_arch *arch;
-
-	arch = dpkg_arch_get_native();
-	test_str(arch->name, ==, ARCHITECTURE);
-	test_pass(arch->type == arch_native);
-}
-
-static void
-test_dpkg_arch_get_list(void)
-{
-	struct dpkg_arch *arch;
-	int count = 1;
-
-	/* Must never return NULL. */
-	arch = dpkg_arch_get_list();
-	test_pass(arch != NULL);
-
-	while ((arch = arch->next))
-		count++;
-
-	/* The default list contains at least 3 architectures. */
-	test_pass(count >= 3);
-}
-
-static void
-test_dpkg_arch_name_is_illegal(void)
-{
-	/* Ensure it refuses invalid architecture names. */
-	test_fail(dpkg_arch_name_is_illegal("") == NULL);
-	test_fail(dpkg_arch_name_is_illegal("-i386") == NULL);
-	test_fail(dpkg_arch_name_is_illegal(" i386") == NULL);
-	test_fail(dpkg_arch_name_is_illegal(":any") == NULL);
-	test_fail(dpkg_arch_name_is_illegal("amd64_test") == NULL);
-	test_fail(dpkg_arch_name_is_illegal("i386:test") == NULL);
-	test_fail(dpkg_arch_name_is_illegal("i386 amd64") == NULL);
-	test_fail(dpkg_arch_name_is_illegal("i386,amd64") == NULL);
-	test_fail(dpkg_arch_name_is_illegal("i386|amd64") == NULL);
-
-	/* Ensure it accepts common architecture names. */
-	test_pass(dpkg_arch_name_is_illegal("i386") == NULL);
-	test_pass(dpkg_arch_name_is_illegal("amd64") == NULL);
-	test_pass(dpkg_arch_name_is_illegal("hurd-i386") == NULL);
-	test_pass(dpkg_arch_name_is_illegal("kfreebsd-i386") == NULL);
-	test_pass(dpkg_arch_name_is_illegal("kfreebsd-amd64") == NULL);
-	test_pass(dpkg_arch_name_is_illegal("ia64") == NULL);
-	test_pass(dpkg_arch_name_is_illegal("alpha") == NULL);
-	test_pass(dpkg_arch_name_is_illegal("armel") == NULL);
-	test_pass(dpkg_arch_name_is_illegal("hppa") == NULL);
-	test_pass(dpkg_arch_name_is_illegal("mips") == NULL);
-	test_pass(dpkg_arch_name_is_illegal("mipsel") == NULL);
-	test_pass(dpkg_arch_name_is_illegal("powerpc") == NULL);
-	test_pass(dpkg_arch_name_is_illegal("s390") == NULL);
-	test_pass(dpkg_arch_name_is_illegal("sparc") == NULL);
-}
-
-void
-test(void)
-{
-	test_dpkg_arch_name_is_illegal();
-	test_dpkg_arch_get_native();
-	test_dpkg_arch_get_list(); /* Call it before _find. */
-	test_dpkg_arch_find();
-	pkg_db_reset(); /* Calls nffreeall() + dpkg_arch_reset() */
-	test_dpkg_arch_get_list();
-}
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/test/t-buffer.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-buffer.c
--- dpkg/lib/dpkg/test/t-buffer.c	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-buffer.c	2012-06-07 10:11:09.426073000 -0700
@@ -2,7 +2,7 @@
  * libdpkg - Debian packaging suite library routines
  * t-buffer.c - test buffer handling
  *
- * Copyright © 2009-2010 Guillem Jover <guillem@debian.org>
+ * Copyright © 2009-2011 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,24 +25,56 @@
 #include <dpkg/buffer.h>
 #include <dpkg/dpkg.h>
 
+#include <sys/types.h>
+
+#include <unistd.h>
+#include <stdlib.h>
 #include <stdio.h>
 
+static const char str_empty[] = "";
+static const char ref_hash_empty[] = "d41d8cd98f00b204e9800998ecf8427e";
+static const char str_test[] = "this is a test string\n";
+static const char ref_hash_test[] = "475aae3b885d70a9130eec23ab33f2b9";
+
 static void
 test_buffer_hash(void)
 {
-	const char str_test[] = "this is a test string\n";
-	const char str_empty[] = "";
 	char hash[MD5HASHLEN + 1];
 
 	buffer_md5(str_empty, hash, strlen(str_empty));
-	test_str(hash, ==, "d41d8cd98f00b204e9800998ecf8427e");
+	test_str(hash, ==, ref_hash_empty);
 
 	buffer_md5(str_test, hash, strlen(str_test));
-	test_str(hash, ==, "475aae3b885d70a9130eec23ab33f2b9");
+	test_str(hash, ==, ref_hash_test);
+}
+
+static void
+test_fdio_hash(void)
+{
+	char hash[MD5HASHLEN + 1];
+	char *test_file;
+	int fd;
+
+	test_file = strdup("test.XXXXXX");
+	test_pass(test_file != NULL);
+	fd = mkstemp(test_file);
+	test_pass(fd >= 0);
+
+	fd_md5(fd, hash, -1, "test empty file");
+	test_str(hash, ==, ref_hash_empty);
+
+	test_pass(write(fd, str_test, strlen(str_test)) == strlen(str_test));
+	test_pass(lseek(fd, 0, SEEK_SET) == 0);
+
+	fd_md5(fd, hash, -1, "test filled file");
+	test_str(hash, ==, ref_hash_test);
+
+	test_pass(unlink(test_file) == 0);
 }
 
 static void
 test(void)
 {
 	test_buffer_hash();
+	test_fdio_hash();
 }
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/test/t-command.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-command.c
--- dpkg/lib/dpkg/test/t-command.c	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-command.c	2012-06-07 10:11:09.426073000 -0700
@@ -2,7 +2,7 @@
  * libdpkg - Debian packaging suite library routines
  * t-command.c - test command implementation
  *
- * Copyright © 2010 Guillem Jover <guillem@debian.org>
+ * Copyright © 2010-2011 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -153,6 +153,25 @@
 }
 
 static void
+test_command_shell(void)
+{
+	pid_t pid;
+	int ret;
+
+	pid = subproc_fork();
+	if (pid == 0)
+		command_shell("true", "command shell pass test");
+	ret = subproc_wait_check(pid, "command shell pass test", 0);
+	test_pass(ret == 0);
+
+	pid = subproc_fork();
+	if (pid == 0)
+		command_shell("false", "command shell fail test");
+	ret = subproc_wait_check(pid, "command shell fail test", PROCNOERR);
+	test_fail(ret == 0);
+}
+
+static void
 test(void)
 {
 	test_command_init();
@@ -160,4 +179,5 @@
 	test_command_add_argl();
 	test_command_add_args();
 	test_command_exec();
+	test_command_shell();
 }
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/test/t-mod-db.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-mod-db.c
--- dpkg/lib/dpkg/test/t-mod-db.c	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-mod-db.c	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,56 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * t-db.c - test database implementation
+ *
+ * Copyright © 2011 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <stdlib.h>
+
+#include <dpkg/test.h>
+#include <dpkg/dpkg-db.h>
+
+static void
+test_db_dir(void)
+{
+	char *dir;
+
+	test_str(dpkg_db_get_dir(), ==, ADMINDIR);
+
+	dpkg_db_set_dir("testdir");
+	test_str(dpkg_db_get_dir(), ==, "testdir");
+
+	setenv("DPKG_ADMINDIR", "testenvdir", 1);
+	dpkg_db_set_dir(NULL);
+	test_str(dpkg_db_get_dir(), ==, "testenvdir");
+
+	unsetenv("DPKG_ADMINDIR");
+	dpkg_db_set_dir(NULL);
+	test_str(dpkg_db_get_dir(), ==, ADMINDIR);
+
+	dir = dpkg_db_get_path("testfile");
+	test_str(dir, ==, ADMINDIR "/testfile");
+	free(dir);
+}
+
+static void
+test(void)
+{
+	test_db_dir();
+}
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/test/t-path.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-path.c
--- dpkg/lib/dpkg/test/t-path.c	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-path.c	2012-06-07 10:11:09.426073000 -0700
@@ -74,6 +74,18 @@
 }
 
 static void
+test_path_basename(void)
+{
+	test_str(path_basename("./."), ==, ".");
+	test_str(path_basename("./"), ==, "");
+	test_str(path_basename("/."), ==, ".");
+	test_str(path_basename("/"), ==, "");
+	test_str(path_basename("/foo"), ==, "foo");
+	test_str(path_basename("/foo/bar"), ==, "bar");
+	test_str(path_basename("/foo/bar/"), ==, "");
+}
+
+static void
 test_path_temp(void)
 {
 	char *template;
@@ -162,6 +174,7 @@
 {
 	test_path_trim();
 	test_path_skip();
+	test_path_basename();
 	test_path_temp();
 	test_path_quote();
 }
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/test/t-progname.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-progname.c
--- dpkg/lib/dpkg/test/t-progname.c	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-progname.c	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,46 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * t-progname.c - test program name handling
+ *
+ * Copyright © 2011 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <dpkg/test.h>
+#include <dpkg/progname.h>
+
+static void
+test_progname(void)
+{
+	/* Test initially empty progname. */
+	test_str(dpkg_get_progname(), ==, "t-progname");
+
+	/* Test setting a new progname. */
+	dpkg_set_progname("newname");
+	test_str(dpkg_get_progname(), ==, "newname");
+
+	/* Test setting a new progname with path. */
+	dpkg_set_progname("path/newprogname");
+	test_str(dpkg_get_progname(), ==, "newprogname");
+}
+
+static void
+test(void)
+{
+	test_progname();
+}
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/test/t-subproc.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-subproc.c
--- dpkg/lib/dpkg/test/t-subproc.c	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-subproc.c	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,91 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * t-subproc.c - test sub-process module
+ *
+ * Copyright © 2011 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <sys/types.h>
+
+#include <fcntl.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include <dpkg/test.h>
+#include <dpkg/subproc.h>
+
+static void
+test_subproc_fork(void)
+{
+	pid_t pid;
+	int ret;
+
+	/* Test exit(). */
+	pid = subproc_fork();
+	if (pid == 0)
+		exit(0);
+	ret = subproc_wait_check(pid, "subproc exit pass", PROCNOERR);
+	test_pass(ret == 0);
+
+	pid = subproc_fork();
+	if (pid == 0)
+		exit(128);
+	ret = subproc_wait_check(pid, "subproc exit fail", PROCNOERR);
+	test_pass(ret == 128);
+
+	/* Test signals. */
+	pid = subproc_fork();
+	if (pid == 0)
+		raise(SIGINT);
+	ret = subproc_wait_check(pid, "subproc signal", PROCWARN);
+	test_pass(ret == -1);
+
+	pid = subproc_fork();
+	if (pid == 0)
+		raise(SIGTERM);
+	ret = subproc_wait_check(pid, "subproc signal", PROCWARN);
+	test_pass(ret == -1);
+
+	pid = subproc_fork();
+	if (pid == 0)
+		raise(SIGPIPE);
+	ret = subproc_wait_check(pid, "subproc SIGPIPE", PROCWARN | PROCPIPE);
+	test_pass(ret == 0);
+
+	pid = subproc_fork();
+	if (pid == 0)
+		raise(SIGPIPE);
+	ret = subproc_wait_check(pid, "subproc SIGPIPE", PROCWARN);
+	test_pass(ret == -1);
+}
+
+static void
+test(void)
+{
+	int fd;
+
+	/* XXX: Shut up output, we just want the error code. */
+	fd = open("/dev/null", O_RDWR);
+	test_pass(fd >= 0);
+	dup2(fd, 1);
+	dup2(fd, 2);
+
+	test_subproc_fork();
+}
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/test/t-varbuf.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-varbuf.c
--- dpkg/lib/dpkg/test/t-varbuf.c	2011-03-09 14:40:51.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-varbuf.c	2012-06-07 10:11:09.426073000 -0700
@@ -113,7 +113,7 @@
 }
 
 static void
-test_varbuf_addbuf(void)
+test_varbuf_add_buf(void)
 {
 	struct varbuf vb;
 
@@ -133,7 +133,7 @@
 }
 
 static void
-test_varbuf_addc(void)
+test_varbuf_add_char(void)
 {
 	struct varbuf vb;
 
@@ -200,6 +200,29 @@
 }
 
 static void
+test_varbuf_end_str(void)
+{
+	struct varbuf vb;
+
+	varbuf_init(&vb, 10);
+
+	varbuf_add_buf(&vb, "1234567890X", 11);
+	test_pass(vb.used == 11);
+	test_pass(vb.size >= vb.used);
+	test_mem(vb.buf, ==, "1234567890X", 11);
+
+	varbuf_trunc(&vb, 10);
+
+	varbuf_end_str(&vb);
+	test_pass(vb.used == 10);
+	test_pass(vb.size >= vb.used + 1);
+	test_pass(vb.buf[10] == '\0');
+	test_str(vb.buf, ==, "1234567890");
+
+	varbuf_destroy(&vb);
+}
+
+static void
 test_varbuf_printf(void)
 {
 	struct varbuf vb;
@@ -272,10 +295,11 @@
 	test_varbuf_prealloc();
 	test_varbuf_grow();
 	test_varbuf_trunc();
-	test_varbuf_addbuf();
-	test_varbuf_addc();
+	test_varbuf_add_buf();
+	test_varbuf_add_char();
 	test_varbuf_dup_char();
 	test_varbuf_map_char();
+	test_varbuf_end_str();
 	test_varbuf_printf();
 	test_varbuf_reset();
 	test_varbuf_detach();
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/test/t-version.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-version.c
--- dpkg/lib/dpkg/test/t-version.c	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test/t-version.c	2012-06-07 10:11:09.426073000 -0700
@@ -63,9 +63,21 @@
 	/* FIXME: Complete. */
 }
 
+#define test_warn(e) \
+	do { \
+		test_pass((e).type == DPKG_MSG_WARN); \
+		dpkg_error_destroy(&(e)); \
+	} while (0)
+#define test_error(e) \
+	do { \
+		test_pass((e).type == DPKG_MSG_ERROR); \
+		dpkg_error_destroy(&(e)); \
+	} while (0)
+
 static void
 test_version_parse(void)
 {
+	struct dpkg_error err;
 	struct versionrevision a, b;
 	const char *p;
 	char *verstr;
@@ -74,91 +86,109 @@
 	blankversion(&a);
 	b = version(0, "0", "");
 
-	test_pass(parseversion(&a, "0") == NULL);
+	test_pass(parseversion(&a, "0", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
-	test_pass(parseversion(&a, "0:0") == NULL);
+	test_pass(parseversion(&a, "0:0", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
-	test_pass(parseversion(&a, "0:0-") == NULL);
+	test_pass(parseversion(&a, "0:0-", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
 	b = version(0, "0", "0");
-	test_pass(parseversion(&a, "0:0-0") == NULL);
+	test_pass(parseversion(&a, "0:0-0", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
 	b = version(0, "0.0", "0.0");
-	test_pass(parseversion(&a, "0:0.0-0.0") == NULL);
+	test_pass(parseversion(&a, "0:0.0-0.0", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
 	/* Test epoched versions. */
 	b = version(1, "0", "");
-	test_pass(parseversion(&a, "1:0") == NULL);
+	test_pass(parseversion(&a, "1:0", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
 	b = version(5, "1", "");
-	test_pass(parseversion(&a, "5:1") == NULL);
+	test_pass(parseversion(&a, "5:1", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
 	/* Test multiple dashes. */
 	b = version(0, "0-0", "0");
-	test_pass(parseversion(&a, "0:0-0-0") == NULL);
+	test_pass(parseversion(&a, "0:0-0-0", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
 	b = version(0, "0-0-0", "0");
-	test_pass(parseversion(&a, "0:0-0-0-0") == NULL);
+	test_pass(parseversion(&a, "0:0-0-0-0", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
 	/* Test multiple colons. */
 	b = version(0, "0:0", "0");
-	test_pass(parseversion(&a, "0:0:0-0") == NULL);
+	test_pass(parseversion(&a, "0:0:0-0", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
 	b = version(0, "0:0:0", "0");
-	test_pass(parseversion(&a, "0:0:0:0-0") == NULL);
+	test_pass(parseversion(&a, "0:0:0:0-0", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
 	/* Test multiple dashes and colons. */
 	b = version(0, "0:0-0", "0");
-	test_pass(parseversion(&a, "0:0:0-0-0") == NULL);
+	test_pass(parseversion(&a, "0:0:0-0-0", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
 	b = version(0, "0-0:0", "0");
-	test_pass(parseversion(&a, "0:0-0:0-0") == NULL);
+	test_pass(parseversion(&a, "0:0-0:0-0", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
 	/* Test valid characters in upstream version. */
 	b = version(0, "09azAZ.-+~:", "0");
-	test_pass(parseversion(&a, "0:09azAZ.-+~:-0") == NULL);
+	test_pass(parseversion(&a, "0:09azAZ.-+~:-0", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
 	/* Test valid characters in revision. */
 	b = version(0, "0", "azAZ09.+~");
-	test_pass(parseversion(&a, "0:0-azAZ09.+~") == NULL);
+	test_pass(parseversion(&a, "0:0-azAZ09.+~", NULL) == 0);
 	test_pass(versioncompare(&a, &b) == 0);
 
+	/* Test empty version. */
+	test_pass(parseversion(&a, "", &err) != 0);
+	test_error(err);
+
+	/* Test empty upstream version after epoch. */
+	test_fail(parseversion(&a, "0:", &err) == 0);
+	test_error(err);
+
+	/* Test version with embedded spaces. */
+	test_fail(parseversion(&a, "0:0 0-1", &err) == 0);
+	test_error(err);
+
 	/* Test invalid characters in epoch. */
-	test_fail(parseversion(&a, "a:0-0") == NULL);
-	test_fail(parseversion(&a, "A:0-0") == NULL);
+	test_fail(parseversion(&a, "a:0-0", &err) == 0);
+	test_error(err);
+	test_fail(parseversion(&a, "A:0-0", &err) == 0);
+	test_error(err);
 
 	/* Test upstream version not starting with a digit */
-	test_fail(parseversion(&a, "0:abc3-0") == NULL);
+	test_fail(parseversion(&a, "0:abc3-0", &err) == 0);
+	test_warn(err);
 
 	/* Test invalid characters in upstream version. */
 	verstr = m_strdup("0:0a-0");
 	for (p = "!#@$%&/|\\<>()[]{};,_=*^'"; *p; p++) {
 		verstr[3] = *p;
-		test_fail(parseversion(&a, verstr) == NULL);
+		test_fail(parseversion(&a, verstr, &err) == 0);
+		test_warn(err);
 	}
 	free(verstr);
 
 	/* Test invalid characters in revision. */
-	test_fail(parseversion(&a, "0:0-0:0") == NULL);
+	test_fail(parseversion(&a, "0:0-0:0", &err) == 0);
+	test_warn(err);
 
 	verstr = m_strdup("0:0-0");
 	for (p = "!#@$%&/|\\<>()[]{}:;,_=*^'"; *p; p++) {
 		verstr[4] = *p;
-		test_fail(parseversion(&a, verstr) == NULL);
+		test_fail(parseversion(&a, verstr, &err) == 0);
+		test_warn(err);
 	}
 	free(verstr);
 
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/test.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test.h
--- dpkg/lib/dpkg/test.h	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/test.h	2012-06-07 10:11:09.426073000 -0700
@@ -38,8 +38,6 @@
 #ifndef TEST_MAIN_PROVIDED
 static void test(void);
 
-const char thisname[] = "test";
-
 int
 main(int argc, char **argv)
 {
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/trigdeferred.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/trigdeferred.c
--- dpkg/lib/dpkg/trigdeferred.c	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/trigdeferred.c	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,1990 @@
+#line 2 "trigdeferred.c"
+
+#line 4 "trigdeferred.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define yy_create_buffer trigdef_yy_create_buffer
+#define yy_delete_buffer trigdef_yy_delete_buffer
+#define yy_flex_debug trigdef_yy_flex_debug
+#define yy_init_buffer trigdef_yy_init_buffer
+#define yy_flush_buffer trigdef_yy_flush_buffer
+#define yy_load_buffer_state trigdef_yy_load_buffer_state
+#define yy_switch_to_buffer trigdef_yy_switch_to_buffer
+#define yyin trigdef_yyin
+#define yyleng trigdef_yyleng
+#define yylex trigdef_yylex
+#define yylineno trigdef_yylineno
+#define yyout trigdef_yyout
+#define yyrestart trigdef_yyrestart
+#define yytext trigdef_yytext
+#define yywrap trigdef_yywrap
+#define yyalloc trigdef_yyalloc
+#define yyrealloc trigdef_yyrealloc
+#define yyfree trigdef_yyfree
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE trigdef_yyrestart(trigdef_yyin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
+#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+extern int trigdef_yyleng;
+
+extern FILE *trigdef_yyin, *trigdef_yyout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up trigdef_yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up trigdef_yytext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	int yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via trigdef_yyrestart()), so that the user can continue scanning by
+	 * just pointing trigdef_yyin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* yy_hold_char holds the character lost when trigdef_yytext is formed. */
+static char yy_hold_char;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int trigdef_yyleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow trigdef_yywrap()'s to do buffer switches
+ * instead of setting up a fresh trigdef_yyin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void trigdef_yyrestart (FILE *input_file  );
+void trigdef_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE trigdef_yy_create_buffer (FILE *file,int size  );
+void trigdef_yy_delete_buffer (YY_BUFFER_STATE b  );
+void trigdef_yy_flush_buffer (YY_BUFFER_STATE b  );
+void trigdef_yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void trigdef_yypop_buffer_state (void );
+
+static void trigdef_yyensure_buffer_stack (void );
+static void trigdef_yy_load_buffer_state (void );
+static void trigdef_yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER trigdef_yy_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE trigdef_yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE trigdef_yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE trigdef_yy_scan_bytes (yyconst char *bytes,int len  );
+
+void *trigdef_yyalloc (yy_size_t  );
+void *trigdef_yyrealloc (void *,yy_size_t  );
+void trigdef_yyfree (void *  );
+
+#define yy_new_buffer trigdef_yy_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        trigdef_yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            trigdef_yy_create_buffer(trigdef_yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        trigdef_yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            trigdef_yy_create_buffer(trigdef_yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+#define trigdef_yywrap(n) 1
+#define YY_SKIP_YYWRAP
+
+typedef unsigned char YY_CHAR;
+
+FILE *trigdef_yyin = (FILE *) 0, *trigdef_yyout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int trigdef_yylineno;
+
+int trigdef_yylineno = 1;
+
+extern char *trigdef_yytext;
+#define yytext_ptr trigdef_yytext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up trigdef_yytext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	trigdef_yyleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 8
+#define YY_END_OF_BUFFER 9
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[23] =
+    {   0,
+        0,    0,    0,    0,    9,    7,    1,    1,    3,    3,
+        4,    6,    7,    5,    3,    0,    2,    3,    0,    6,
+        5,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    4,    4,    5,    4,    4,    4,    4,    4,
+        4,    4,    6,    4,    7,    6,    4,    7,    7,    7,
+        7,    7,    7,    7,    7,    7,    7,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    7,    7,    7,    7,
+
+        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+        7,    7,    4,    4,    4,    4,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[8] =
+    {   0,
+        1,    1,    1,    2,    2,    3,    3
+    } ;
+
+static yyconst flex_int16_t yy_base[27] =
+    {   0,
+        0,    0,    7,    0,   34,   35,   35,   35,    0,   14,
+       35,   35,   30,    0,    0,   29,   35,    0,   28,   35,
+        0,   35,   20,   23,   27,   26
+    } ;
+
+static yyconst flex_int16_t yy_def[27] =
+    {   0,
+       22,    1,   22,    3,   22,   22,   22,   22,   23,   22,
+       22,   22,   24,   25,   23,   26,   22,   10,   24,   22,
+       25,    0,   22,   22,   22,   22
+    } ;
+
+static yyconst flex_int16_t yy_nxt[43] =
+    {   0,
+        6,    7,    8,    9,   10,    9,    9,    6,   11,   12,
+        6,   13,    6,   14,   16,   16,   17,   18,   18,   18,
+       18,   15,   15,   19,   19,   19,   16,   16,   16,   21,
+       20,   17,   20,   22,    5,   22,   22,   22,   22,   22,
+       22,   22
+    } ;
+
+static yyconst flex_int16_t yy_chk[43] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    3,    3,    3,
+        3,    3,    3,    3,   10,   10,   10,   10,   10,   10,
+       10,   23,   23,   24,   24,   24,   26,   26,   26,   25,
+       19,   16,   13,    5,   22,   22,   22,   22,   22,   22,
+       22,   22
+    } ;
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int trigdef_yy_flex_debug;
+int trigdef_yy_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *trigdef_yytext;
+#line 1 "trigdeferred.l"
+/*
+ * libdpkg - Debian packaging suite library routines
+ * trigdeferred.l - parsing of triggers/Deferred
+ *
+ * Copyright © 2007 Canonical Ltd
+ * written by Ian Jackson <ian@chiark.greenend.org.uk>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/* Reset the name to the default value (instead of using "trigdeferred.c")
+ * so that automake (ylwrap) can find it. */
+
+#line 36 "trigdeferred.l"
+
+#include <config.h>
+#include <compat.h>
+
+#include <sys/stat.h>
+#include <sys/fcntl.h>
+
+#include <dpkg/i18n.h>
+#include <dpkg/dpkg.h>
+#include <dpkg/dpkg-db.h>
+#include <dpkg/file.h>
+#include <dpkg/dir.h>
+#include <dpkg/trigdeferred.h>
+#include <dpkg/triglib.h>
+
+#define YY_NO_INPUT
+#define YY_DECL int trigdef_parse(void)
+
+static struct varbuf fn, newfn;
+
+static const struct trigdefmeths *trigdef;
+
+#line 541 "trigdeferred.c"
+
+#define INITIAL 0
+#define midline 1
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int trigdef_yylex_destroy (void );
+
+int trigdef_yyget_debug (void );
+
+void trigdef_yyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE trigdef_yyget_extra (void );
+
+void trigdef_yyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *trigdef_yyget_in (void );
+
+void trigdef_yyset_in  (FILE * in_str  );
+
+FILE *trigdef_yyget_out (void );
+
+void trigdef_yyset_out  (FILE * out_str  );
+
+int trigdef_yyget_leng (void );
+
+char *trigdef_yyget_text (void );
+
+int trigdef_yyget_lineno (void );
+
+void trigdef_yyset_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int trigdef_yywrap (void );
+#else
+extern int trigdef_yywrap (void );
+#endif
+#endif
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
+#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO do { if (fwrite( trigdef_yytext, trigdef_yyleng, 1, trigdef_yyout )) {} } while (0)
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( trigdef_yyin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( trigdef_yyin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, trigdef_yyin))==0 && ferror(trigdef_yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(trigdef_yyin); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int trigdef_yylex (void);
+
+#define YY_DECL int trigdef_yylex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after trigdef_yytext and trigdef_yyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+#line 60 "trigdeferred.l"
+
+
+#line 730 "trigdeferred.c"
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! trigdef_yyin )
+			trigdef_yyin = stdin;
+
+		if ( ! trigdef_yyout )
+			trigdef_yyout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			trigdef_yyensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				trigdef_yy_create_buffer(trigdef_yyin,YY_BUF_SIZE );
+		}
+
+		trigdef_yy_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of trigdef_yytext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 23 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			++yy_cp;
+			}
+		while ( yy_current_state != 22 );
+		yy_cp = (yy_last_accepting_cpos);
+		yy_current_state = (yy_last_accepting_state);
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
+case 1:
+/* rule 1 can match eol */
+YY_RULE_SETUP
+#line 62 "trigdeferred.l"
+/* whitespace */
+	YY_BREAK
+case 2:
+/* rule 2 can match eol */
+YY_RULE_SETUP
+#line 63 "trigdeferred.l"
+/* comments */
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 64 "trigdeferred.l"
+{
+	trigdef->trig_begin(trigdef_yytext);
+	BEGIN(midline);
+	}
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 69 "trigdeferred.l"
+/* whitespace */
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 70 "trigdeferred.l"
+{
+	if (trigdef_yytext[0] == '-' && trigdef_yytext[1])
+		ohshit(_("invalid package name `%.250s' in triggers deferred "
+		         "file `%.250s'"), trigdef_yytext, fn.buf);
+	trigdef->package(trigdef_yytext);
+	}
+	YY_BREAK
+case 6:
+/* rule 6 can match eol */
+YY_RULE_SETUP
+#line 76 "trigdeferred.l"
+{
+	trigdef->trig_end();
+	BEGIN(0);
+	}
+	YY_BREAK
+case YY_STATE_EOF(midline):
+#line 80 "trigdeferred.l"
+{
+	ohshit(_("truncated triggers deferred file `%.250s'"), fn.buf);
+	}
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 84 "trigdeferred.l"
+{
+	ohshit(_("syntax error in triggers deferred file `%.250s' at "
+	         "character `%s'%s"),
+	       fn.buf, trigdef_yytext, YY_START == midline ? " midline": "");
+	}
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 90 "trigdeferred.l"
+YY_FATAL_ERROR( "flex scanner jammed" );
+	YY_BREAK
+#line 873 "trigdeferred.c"
+case YY_STATE_EOF(INITIAL):
+	yyterminate();
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed trigdef_yyin at a new source and called
+			 * trigdef_yylex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = trigdef_yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_last_accepting_cpos);
+				yy_current_state = (yy_last_accepting_state);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( trigdef_yywrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * trigdef_yytext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of trigdef_yylex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			int num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				int new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					trigdef_yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), (size_t) num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			trigdef_yyrestart(trigdef_yyin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) trigdef_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 23 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
+
+	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 23 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 22);
+
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			int offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					trigdef_yyrestart(trigdef_yyin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( trigdef_yywrap( ) )
+						return EOF;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve trigdef_yytext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void trigdef_yyrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        trigdef_yyensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            trigdef_yy_create_buffer(trigdef_yyin,YY_BUF_SIZE );
+	}
+
+	trigdef_yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	trigdef_yy_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void trigdef_yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		trigdef_yypop_buffer_state();
+	 *		trigdef_yypush_buffer_state(new_buffer);
+     */
+	trigdef_yyensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	trigdef_yy_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (trigdef_yywrap()) processing, but the only time this flag
+	 * is looked at is after trigdef_yywrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void trigdef_yy_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	trigdef_yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE trigdef_yy_create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) trigdef_yyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in trigdef_yy_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) trigdef_yyalloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in trigdef_yy_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	trigdef_yy_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with trigdef_yy_create_buffer()
+ * 
+ */
+    void trigdef_yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		trigdef_yyfree((void *) b->yy_ch_buf  );
+
+	trigdef_yyfree((void *) b  );
+}
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a trigdef_yyrestart() or at EOF.
+ */
+    static void trigdef_yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	trigdef_yy_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then trigdef_yy_init_buffer was _probably_
+     * called from trigdef_yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void trigdef_yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		trigdef_yy_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void trigdef_yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	trigdef_yyensure_buffer_stack();
+
+	/* This block is copied from trigdef_yy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from trigdef_yy_switch_to_buffer. */
+	trigdef_yy_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void trigdef_yypop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	trigdef_yy_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		trigdef_yy_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void trigdef_yyensure_buffer_stack (void)
+{
+	int num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)trigdef_yyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in trigdef_yyensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)trigdef_yyrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in trigdef_yyensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE trigdef_yy_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) trigdef_yyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in trigdef_yy_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	trigdef_yy_switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to trigdef_yylex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       trigdef_yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE trigdef_yy_scan_string (yyconst char * yystr )
+{
+    
+	return trigdef_yy_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to trigdef_yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE trigdef_yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	int i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) trigdef_yyalloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in trigdef_yy_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = trigdef_yy_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in trigdef_yy_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up trigdef_yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		trigdef_yytext[trigdef_yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = trigdef_yytext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		trigdef_yyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int trigdef_yyget_lineno  (void)
+{
+        
+    return trigdef_yylineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *trigdef_yyget_in  (void)
+{
+        return trigdef_yyin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *trigdef_yyget_out  (void)
+{
+        return trigdef_yyout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+int trigdef_yyget_leng  (void)
+{
+        return trigdef_yyleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *trigdef_yyget_text  (void)
+{
+        return trigdef_yytext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void trigdef_yyset_lineno (int  line_number )
+{
+    
+    trigdef_yylineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see trigdef_yy_switch_to_buffer
+ */
+void trigdef_yyset_in (FILE *  in_str )
+{
+        trigdef_yyin = in_str ;
+}
+
+void trigdef_yyset_out (FILE *  out_str )
+{
+        trigdef_yyout = out_str ;
+}
+
+int trigdef_yyget_debug  (void)
+{
+        return trigdef_yy_flex_debug;
+}
+
+void trigdef_yyset_debug (int  bdebug )
+{
+        trigdef_yy_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from trigdef_yylex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    trigdef_yyin = stdin;
+    trigdef_yyout = stdout;
+#else
+    trigdef_yyin = (FILE *) 0;
+    trigdef_yyout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * trigdef_yylex_init()
+     */
+    return 0;
+}
+
+/* trigdef_yylex_destroy is for both reentrant and non-reentrant scanners. */
+int trigdef_yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		trigdef_yy_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		trigdef_yypop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	trigdef_yyfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * trigdef_yylex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *trigdef_yyalloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *trigdef_yyrealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void trigdef_yyfree (void * ptr )
+{
+	free( (char *) ptr );	/* see trigdef_yyrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 90 "trigdeferred.l"
+
+
+
+/*---------- Deferred file handling ----------*/
+
+static char *triggersdir;
+static int lock_fd = -1;
+static FILE *old_deferred;
+static FILE *trig_new_deferred;
+
+static void
+constructfn(struct varbuf *vb, const char *dir, const char *tail)
+{
+	varbuf_reset(vb);
+	varbuf_add_str(vb, dir);
+	varbuf_add_char(vb, '/');
+	varbuf_add_str(vb, tail);
+	varbuf_end_str(vb);
+}
+
+/**
+ * Start processing of the triggers deferred file.
+ *
+ * @retval -1 Lock ENOENT with O_CREAT (directory does not exist).
+ * @retval -2 Unincorp empty, tduf_writeifempty unset.
+ * @retval -3 Unincorp ENOENT, tduf_writeifenoent unset.
+ * @retval  1 Unincorp ENOENT, tduf_writeifenoent set.
+ * @retval  2 Ok.
+ *
+ * For positive return values the caller must call trigdef_update_done!
+ */
+enum trigdef_update_status
+trigdef_update_start(enum trigdef_updateflags uf)
+{
+	struct stat stab;
+	int r;
+
+	triggersdir = dpkg_db_get_path(TRIGGERSDIR);
+
+	if (uf & tduf_write) {
+		constructfn(&fn, triggersdir, TRIGGERSLOCKFILE);
+		if (lock_fd == -1) {
+			lock_fd = open(fn.buf, O_RDWR | O_CREAT | O_TRUNC, 0600);
+			if (lock_fd == -1) {
+				if (!(errno == ENOENT && (uf & tduf_nolockok)))
+					ohshite(_("unable to open/create "
+					          "triggers lockfile `%.250s'"),
+					        fn.buf);
+				return tdus_error_no_dir;
+			}
+		}
+
+		file_lock(&lock_fd, FILE_LOCK_WAIT, fn.buf, _("triggers area"));
+	} else {
+		/* Dummy for pop_cleanups. */
+		push_cleanup(NULL, 0, NULL, 0, 0);
+	}
+
+	constructfn(&fn, triggersdir, TRIGGERSDEFERREDFILE);
+	r = stat(fn.buf, &stab);
+	if (r) {
+		if (errno != ENOENT)
+			ohshite(_("unable to stat triggers deferred file `%.250s'"),
+			        fn.buf);
+	} else if (!stab.st_size) {
+		if (!(uf & tduf_writeifempty)) {
+			pop_cleanup(ehflag_normaltidy);
+			return tdus_error_empty_deferred;
+		}
+	}
+
+	if (old_deferred)
+		fclose(old_deferred);
+	old_deferred = fopen(fn.buf, "r");
+	if (!old_deferred) {
+		if (errno != ENOENT)
+			ohshite(_("unable to open triggers deferred file `%.250s'"),
+			        fn.buf);
+		if (!(uf & tduf_writeifenoent)) {
+			pop_cleanup(ehflag_normaltidy);
+			return tdus_error_no_deferred;
+		}
+	}
+
+	if (uf & tduf_write) {
+		constructfn(&newfn, triggersdir, TRIGGERSDEFERREDFILE ".new");
+		if (trig_new_deferred)
+			fclose(trig_new_deferred);
+		trig_new_deferred = fopen(newfn.buf, "w");
+		if (!trig_new_deferred)
+			ohshite(_("unable to open/create new triggers deferred file `%.250s'"),
+			        newfn.buf);
+	}
+
+	if (!old_deferred)
+		return tdus_no_deferred;
+
+	trigdef_yyrestart(old_deferred);
+	BEGIN(0);
+
+	return tdus_ok;
+}
+
+void
+trigdef_set_methods(const struct trigdefmeths *methods)
+{
+	trigdef = methods;
+}
+
+void
+trigdef_update_printf(const char *format, ...)
+{
+	va_list ap;
+
+	va_start(ap, format);
+	vfprintf(trig_new_deferred, format, ap);
+	va_end(ap);
+}
+
+void
+trigdef_process_done(void)
+{
+	int r;
+
+	if (old_deferred) {
+		if (ferror(old_deferred))
+			ohshite(_("error reading triggers deferred file `%.250s'"),
+			        fn.buf);
+		fclose(old_deferred);
+		old_deferred = NULL;
+	}
+
+	if (trig_new_deferred) {
+		if (ferror(trig_new_deferred))
+			ohshite(_("unable to write new triggers deferred "
+			          "file `%.250s'"), newfn.buf);
+		r = fclose(trig_new_deferred);
+		trig_new_deferred = NULL;
+		if (r)
+			ohshite(_("unable to close new triggers deferred "
+			          "file `%.250s'"), newfn.buf);
+
+		if (rename(newfn.buf, fn.buf))
+			ohshite(_("unable to install new triggers deferred "
+			          "file `%.250s'"), fn.buf);
+
+		dir_sync_path(triggersdir);
+	}
+
+	free(triggersdir);
+	triggersdir = NULL;
+
+	/* Unlock. */
+	pop_cleanup(ehflag_normaltidy);
+}
+
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/trigdeferred.l /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/trigdeferred.l
--- dpkg/lib/dpkg/trigdeferred.l	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/trigdeferred.l	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 /*
- * dpkg - main program for package management
+ * libdpkg - Debian packaging suite library routines
  * trigdeferred.l - parsing of triggers/Deferred
  *
  * Copyright © 2007 Canonical Ltd
@@ -67,7 +67,7 @@
 	}
 
 <midline>[ \t]	/* whitespace */
-<midline>[-0-9a-z][-:+.0-9a-z]*	{
+<midline>[-0-9a-z][-+.0-9a-z]*	{
 	if (trigdef_yytext[0] == '-' && trigdef_yytext[1])
 		ohshit(_("invalid package name `%.250s' in triggers deferred "
 		         "file `%.250s'"), trigdef_yytext, fn.buf);
@@ -101,6 +101,7 @@
 {
 	varbuf_reset(vb);
 	varbuf_add_str(vb, dir);
+	varbuf_add_char(vb, '/');
 	varbuf_add_str(vb, tail);
 	varbuf_end_str(vb);
 }
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/triglib.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/triglib.c
--- dpkg/lib/dpkg/triglib.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/triglib.c	2012-06-07 10:11:09.426073000 -0700
@@ -4,6 +4,7 @@
  *
  * Copyright © 2007 Canonical Ltd
  * Written by Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 2008-2011 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,29 +34,11 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/pkg-list.h>
-#include <dpkg/pkg-spec.h>
 #include <dpkg/dlist.h>
 #include <dpkg/dir.h>
 #include <dpkg/trigdeferred.h>
 #include <dpkg/triglib.h>
 
-const char *
-trig_name_is_illegal(const char *p)
-{
-	int c;
-
-	if (!*p)
-		return _("empty trigger names are not permitted");
-
-	while ((c = *p++)) {
-		if (c <= ' ' || c >= 0177)
-			return _("trigger name contains invalid character");
-	}
-
-	return NULL;
-}
-
 /*========== Recording triggers. ==========*/
 
 static char *triggersdir, *triggersfilefile, *triggersnewfilefile;
@@ -116,73 +99,6 @@
 		}
 }
 
-/*
- * Note: This is also called from fields.c where *pend is a temporary!
- *
- * trig is not copied!
- */
-bool
-trig_note_pend_core(struct pkginfo *pend, const char *trig)
-{
-	struct trigpend *tp;
-
-	for (tp = pend->trigpend_head; tp; tp = tp->next)
-		if (!strcmp(tp->name, trig))
-			return false;
-
-	tp = nfmalloc(sizeof(*tp));
-	tp->name = trig;
-	tp->next = pend->trigpend_head;
-	pend->trigpend_head = tp;
-
-	return true;
-}
-
-/*
- * trig is not copied!
- *
- * @retval true  For done.
- * @retval false For already noted.
- */
-bool
-trig_note_pend(struct pkginfo *pend, const char *trig)
-{
-	if (!trig_note_pend_core(pend, trig))
-		return false;
-
-	pend->status = pend->trigaw.head ? stat_triggersawaited :
-	               stat_triggerspending;
-
-	return true;
-}
-
-/*
- * Note: This is called also from fields.c where *aw is a temporary
- * but pend is from pkg_db_find()!
- *
- * @retval true  For done.
- * @retval false For already noted.
- */
-bool
-trig_note_aw(struct pkginfo *pend, struct pkginfo *aw)
-{
-	struct trigaw *ta;
-
-	/* We search through aw's list because that's probably shorter. */
-	for (ta = aw->trigaw.head; ta; ta = ta->sameaw.next)
-		if (ta->pend == pend)
-			return false;
-
-	ta = nfmalloc(sizeof(*ta));
-	ta->aw = aw;
-	ta->pend = pend;
-	ta->samepend_next = pend->othertrigaw_head;
-	pend->othertrigaw_head = ta;
-	LIST_LINK_TAIL_PART(aw->trigaw, ta, sameaw.);
-
-	return true;
-}
-
 void
 trig_clear_awaiters(struct pkginfo *notpend)
 {
@@ -206,20 +122,6 @@
 	}
 }
 
-static struct pkg_list *trig_awaited_pend_head;
-
-void
-trig_enqueue_awaited_pend(struct pkginfo *pend)
-{
-	struct pkg_list *tp;
-
-	for (tp = trig_awaited_pend_head; tp; tp = tp->next)
-		if (tp->pkg == pend)
-			return;
-
-	pkg_list_prepend(&trig_awaited_pend_head, pend);
-}
-
 /*
  * Fix up packages in state triggers-awaited w/o the corresponding package
  * with pending triggers. This can happen when dpkg was interrupted
@@ -232,17 +134,11 @@
 void
 trig_fixup_awaiters(enum modstatdb_rw cstatus)
 {
-	struct pkg_list *tp;
-
 	if (cstatus < msdbrw_write)
 		return;
 
-	for (tp = trig_awaited_pend_head; tp; tp = tp->next)
-		if (!tp->pkg->trigpend_head)
-			trig_clear_awaiters(tp->pkg);
-
-	pkg_list_free(trig_awaited_pend_head);
-	trig_awaited_pend_head = NULL;
+	trig_awaited_pend_foreach(trig_clear_awaiters);
+	trig_awaited_pend_free();
 }
 
 /*---------- Generalized handling of trigger kinds. ----------*/
@@ -254,7 +150,8 @@
 	/* Rest are for everyone: */
 	void (*activate_awaiter)(struct pkginfo *pkg /* may be NULL */);
 	void (*activate_done)(void);
-	void (*interest_change)(const char *name, struct pkginfo *pkg, int signum);
+	void (*interest_change)(const char *name, struct pkginfo *pkg, int signum,
+	                        enum trig_options opts);
 };
 
 static const struct trigkindinfo tki_explicit, tki_file, tki_unknown;
@@ -319,11 +216,12 @@
 }
 
 static void DPKG_ATTR_NORET
-trk_unknown_interest_change(const char *trig, struct pkginfo *pkg, int signum)
+trk_unknown_interest_change(const char *trig, struct pkginfo *pkg, int signum,
+                            enum trig_options opts)
 {
 	ohshit(_("invalid or unknown syntax in trigger name `%.250s'"
 	         " (in trigger interests for package `%.250s')"),
-	       trig, pkg_describe(pkg, pdo_foreign));
+	       trig, pkg->name);
 }
 
 static const struct trigkindinfo tki_unknown = {
@@ -355,6 +253,7 @@
 
 	varbuf_reset(&trk_explicit_fn);
 	varbuf_add_str(&trk_explicit_fn, triggersdir);
+	varbuf_add_char(&trk_explicit_fn, '/');
 	varbuf_add_str(&trk_explicit_fn, trig);
 	varbuf_end_str(&trk_explicit_fn);
 
@@ -385,7 +284,6 @@
 	char buf[1024];
 	const char *emsg;
 	struct pkginfo *pend;
-	struct pkg_spec pkgspec = PKG_SPEC_INIT(psf_def_native | psf_no_check);
 
 	if (!trk_explicit_f)
 		return;
@@ -395,16 +293,22 @@
 		        trk_explicit_fn.buf);
 
 	while (trk_explicit_fgets(buf, sizeof(buf)) >= 0) {
-		pkg_spec_parse(&pkgspec, buf);
-		emsg = pkg_spec_is_illegal(&pkgspec);
+		char *slash;
+		bool noawait = false;
+		slash = strchr(buf, '/');
+		if (slash && strcmp("/noawait", slash) == 0) {
+			noawait = true;
+			*slash = '\0';
+		}
+		emsg = pkg_name_is_illegal(buf, NULL);
 		if (emsg)
 			ohshit(_("trigger interest file `%.250s' syntax error; "
 			         "illegal package name `%.250s': %.250s"),
 			       trk_explicit_fn.buf, buf, emsg);
-		pend = pkg_spec_find_pkg(&pkgspec, NULL);
-		trig_record_activation(pend, aw, trk_explicit_trig);
+		pend = pkg_db_find(buf);
+		trig_record_activation(pend, noawait ? NULL : aw,
+		                       trk_explicit_trig);
 	}
-	pkg_spec_reset(&pkgspec);
 }
 
 static void
@@ -439,14 +343,13 @@
 }
 
 static void
-trk_explicit_interest_change(const char *trig,  struct pkginfo *pkg, int signum)
+trk_explicit_interest_change(const char *trig,  struct pkginfo *pkg, int signum,
+                             enum trig_options opts)
 {
 	static struct varbuf newfn;
 	char buf[1024];
 	FILE *nf;
 	bool empty = true;
-	struct pkg_spec pkgspec = PKG_SPEC_INIT(psf_def_native | psf_no_copy |
-	                                        psf_no_check);
 
 	trk_explicit_start(trig);
 	varbuf_reset(&newfn);
@@ -459,14 +362,16 @@
 	push_cleanup(cu_closestream, ~ehflag_normaltidy, NULL, 0, 1, nf);
 
 	while (trk_explicit_f && trk_explicit_fgets(buf, sizeof(buf)) >= 0) {
-		pkg_spec_parse(&pkgspec, buf);
-		if (pkg_spec_match_pkg(&pkgspec, pkg, &pkg->installed))
+		int len = strlen(pkg->name);
+		if (strncmp(buf, pkg->name, len) == 0 &&
+		    (buf[len] == '\0' || buf[len] == '/'))
 			continue;
 		fprintf(nf, "%s\n", buf);
 		empty = false;
 	}
 	if (signum > 0) {
-		fprintf(nf, "%s\n", pkg_describe(pkg, pdo_foreign));
+		fprintf(nf, "%s%s\n", pkg->name,
+		        (opts == trig_noawait) ? "/noawait" : "");
 		empty = false;
 	}
 
@@ -513,7 +418,8 @@
  * but die if already present.
  */
 static void
-trk_file_interest_change(const char *trig, struct pkginfo *pkg, int signum)
+trk_file_interest_change(const char *trig, struct pkginfo *pkg, int signum,
+                         enum trig_options opts)
 {
 	struct filenamenode *fnn;
 	struct trigfileint **search, *tfi;
@@ -537,6 +443,7 @@
 	tfi = nfmalloc(sizeof(*tfi));
 	tfi->pkg = pkg;
 	tfi->fnn = fnn;
+	tfi->options = opts;
 	tfi->samefile_next = *trigh.namenode_interested(fnn);
 	*trigh.namenode_interested(fnn) = tfi;
 
@@ -544,10 +451,10 @@
 	goto edited;
 
 found:
+	tfi->options = opts;
 	if (signum > 1)
 		ohshit(_("duplicate file trigger interest for filename `%.250s' "
-		         "and package `%.250s'"), trig,
-		       pkg_describe(pkg, pdo_foreign));
+		         "and package `%.250s'"), trig, pkg->name);
 	if (signum > 0)
 		return;
 
@@ -577,10 +484,10 @@
 		        triggersnewfilefile);
 	push_cleanup(cu_closestream, ~ehflag_normaltidy, NULL, 0, 1, nf);
 
-	for (tfi = filetriggers.head; tfi; tfi = tfi->inoverall.next) {
-		fprintf(nf, "%s %s\n", trigh.namenode_name(tfi->fnn),
-		        pkg_describe(tfi->pkg, pdo_foreign));
-	}
+	for (tfi = filetriggers.head; tfi; tfi = tfi->inoverall.next)
+		fprintf(nf, "%s %s%s\n", trigh.namenode_name(tfi->fnn),
+		        tfi->pkg->name,
+		        (tfi->options == trig_noawait) ? "/noawait" : "");
 
 	if (ferror(nf))
 		ohshite(_("unable to write new file triggers file `%.250s'"),
@@ -624,7 +531,6 @@
 	char linebuf[1024], *space;
 	struct pkginfo *pkg;
 	const char *emsg;
-	struct pkg_spec pkgspec = PKG_SPEC_INIT(psf_def_native | psf_no_check);
 
 	if (filetriggers_edited >= 0)
 		return;
@@ -639,22 +545,27 @@
 
 	push_cleanup(cu_closestream, ~0, NULL, 0, 1, f);
 	while (fgets_checked(linebuf, sizeof(linebuf), f, triggersfilefile) >= 0) {
+		char *slash;
+		enum trig_options trig_opts = trig_await;
 		space = strchr(linebuf, ' ');
 		if (!space || linebuf[0] != '/')
 			ohshit(_("syntax error in file triggers file `%.250s'"),
 			       triggersfilefile);
 		*space++ = '\0';
 
-		pkg_spec_parse(&pkgspec, space);
-		emsg = pkg_spec_is_illegal(&pkgspec);
+		slash = strchr(space, '/');
+		if (slash && strcmp("/noawait", slash) == 0) {
+			trig_opts = trig_noawait;
+			*slash = '\0';
+		}
+		emsg = pkg_name_is_illegal(space, NULL);
 		if (emsg)
 			ohshit(_("file triggers record mentions illegal "
 			         "package name `%.250s' (for interest in file "
 				 "`%.250s'): %.250s"), space, linebuf, emsg);
-		pkg = pkg_spec_find_pkg(&pkgspec, NULL);
-		trk_file_interest_change(linebuf, pkg, +2);
+		pkg = pkg_db_find(space);
+		trk_file_interest_change(linebuf, pkg, +2, trig_opts);
 	}
-	pkg_spec_reset(&pkgspec);
 	pop_cleanup(ehflag_normaltidy);
 ok:
 	filetriggers_edited = 0;
@@ -678,7 +589,8 @@
 
 	for (tfi = *trigh.namenode_interested(trig); tfi;
 	     tfi = tfi->samefile_next)
-		trig_record_activation(tfi->pkg, aw, trigh.namenode_name(trig));
+		trig_record_activation(tfi->pkg, (tfi->options == trig_noawait) ?
+		                       NULL : aw, trigh.namenode_name(trig));
 }
 
 static void
@@ -710,39 +622,41 @@
 /*---------- Trigger control info file. ----------*/
 
 static void
-trig_cicb_interest_change(const char *trig, struct pkginfo *pkg, int signum)
+trig_cicb_interest_change(const char *trig, struct pkginfo *pkg, int signum,
+                          enum trig_options opts)
 {
 	const struct trigkindinfo *tki = trig_classify_byname(trig);
 
 	assert(filetriggers_edited >= 0);
-	tki->interest_change(trig, pkg, signum);
+	tki->interest_change(trig, pkg, signum, opts);
 }
 
 void
-trig_cicb_interest_delete(const char *trig, void *user)
+trig_cicb_interest_delete(const char *trig, void *user, enum trig_options opts)
 {
-	trig_cicb_interest_change(trig, user, -1);
+	trig_cicb_interest_change(trig, user, -1, opts);
 }
 
 void
-trig_cicb_interest_add(const char *trig, void *user)
+trig_cicb_interest_add(const char *trig, void *user, enum trig_options opts)
 {
-	trig_cicb_interest_change(trig, user, +1);
+	trig_cicb_interest_change(trig, user, +1, opts);
 }
 
 void
-trig_cicb_statuschange_activate(const char *trig, void *user)
+trig_cicb_statuschange_activate(const char *trig, void *user,
+                                enum trig_options opts)
 {
 	struct pkginfo *aw = user;
 
 	trig_activate_start(trig);
-	dtki->activate_awaiter(aw);
+	dtki->activate_awaiter((opts == trig_noawait) ? NULL : aw);
 	dtki->activate_done();
 }
 
 static void
 parse_ci_call(const char *file, const char *cmd, trig_parse_cicb *cb,
-              const char *trig, void *user)
+              const char *trig, void *user, enum trig_options opts)
 {
 	const char *emsg;
 
@@ -752,7 +666,7 @@
 		         "syntax in trigger name `%.250s': %.250s"),
 		       file, trig, emsg);
 	if (cb)
-		cb(trig, user);
+		cb(trig, user, opts);
 }
 
 void
@@ -787,9 +701,13 @@
 		while (cisspace(*spc))
 			spc++;
 		if (!strcmp(cmd, "interest")) {
-			parse_ci_call(file, cmd, interest, spc, user);
+			parse_ci_call(file, cmd, interest, spc, user, trig_await);
+		} else if (!strcmp(cmd, "interest-noawait")) {
+			parse_ci_call(file, cmd, interest, spc, user, trig_noawait);
 		} else if (!strcmp(cmd, "activate")) {
-			parse_ci_call(file, cmd, activate, spc, user);
+			parse_ci_call(file, cmd, activate, spc, user, trig_await);
+		} else if (!strcmp(cmd, "activate-noawait")) {
+			parse_ci_call(file, cmd, activate, spc, user, trig_noawait);
 		} else {
 			ohshit(_("triggers ci file contains unknown directive `%.250s'"),
 			       cmd);
@@ -809,11 +727,7 @@
 static void
 tdm_incorp_package(const char *awname)
 {
-	struct pkginfo *aw = NULL;
-	if (strcmp(awname, "-")) {
-		struct pkg_spec ps = PKG_SPEC_INIT(psf_def_native);
-		aw = pkg_spec_find_pkg(&ps, awname);
-	}
+	struct pkginfo *aw = strcmp(awname, "-") ? pkg_db_find(awname) : NULL;
 
 	dtki->activate_awaiter(aw);
 }
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/triglib.h /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/triglib.h
--- dpkg/lib/dpkg/triglib.h	2011-03-24 16:35:56.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/triglib.h	2012-06-07 10:11:09.426073000 -0700
@@ -38,9 +38,15 @@
 
 const char *trig_name_is_illegal(const char *p);
 
+enum trig_options {
+	trig_await,
+	trig_noawait
+};
+
 struct trigfileint {
 	struct pkginfo *pkg;
 	struct filenamenode *fnn;
+	enum trig_options options;
 	struct trigfileint *samefile_next;
 	struct {
 		struct trigfileint *next, *prev;
@@ -77,16 +83,22 @@
 bool trig_note_aw(struct pkginfo *pend, struct pkginfo *aw);
 void trig_clear_awaiters(struct pkginfo *notpend);
 
-void trig_enqueue_awaited_pend(struct pkginfo *pend);
+typedef void trig_awaited_pend_foreach_func(struct pkginfo *pkg);
+
+void trig_awaited_pend_enqueue(struct pkginfo *pend);
+void trig_awaited_pend_foreach(trig_awaited_pend_foreach_func *func);
+void trig_awaited_pend_free(void);
+
 void trig_fixup_awaiters(enum modstatdb_rw cstatus);
 
 void trig_file_interests_ensure(void);
 void trig_file_interests_save(void);
 
-typedef void trig_parse_cicb(const char *trig, void *user);
-void trig_cicb_interest_delete(const char *trig, void *user);
-void trig_cicb_interest_add(const char *trig, void *user);
-void trig_cicb_statuschange_activate(const char *trig, void *user);
+typedef void trig_parse_cicb(const char *trig, void *user, enum trig_options to);
+void trig_cicb_interest_delete(const char *trig, void *user, enum trig_options to);
+void trig_cicb_interest_add(const char *trig, void *user, enum trig_options to);
+void trig_cicb_statuschange_activate(const char *trig, void *user,
+                                     enum trig_options to);
 void trig_parse_ci(const char *file, trig_parse_cicb *interest,
                    trig_parse_cicb *activate, void *user);
 
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/trigname.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/trigname.c
--- dpkg/lib/dpkg/trigname.c	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/trigname.c	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,42 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * trigname.c - trigger name handling
+ *
+ * Copyright © 2007 Canonical Ltd
+ * Written by Ian Jackson <ian@chiark.greenend.org.uk>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <dpkg/i18n.h>
+#include <dpkg/triglib.h>
+
+const char *
+trig_name_is_illegal(const char *p)
+{
+	int c;
+
+	if (!*p)
+		return _("empty trigger names are not permitted");
+
+	while ((c = *p++)) {
+		if (c <= ' ' || c >= 0177)
+			return _("trigger name contains invalid character");
+	}
+
+	return NULL;
+}
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/trignote.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/trignote.c
--- dpkg/lib/dpkg/trignote.c	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/trignote.c	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,128 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * trignote.c - trigger note handling
+ *
+ * Copyright © 2007 Canonical Ltd
+ * Written by Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 2008-2011 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <dpkg/dpkg.h>
+#include <dpkg/dpkg-db.h>
+#include <dpkg/pkg-list.h>
+#include <dpkg/dlist.h>
+#include <dpkg/triglib.h>
+
+/*
+ * Note: This is also called from fields.c where *pend is a temporary!
+ *
+ * trig is not copied!
+ */
+bool
+trig_note_pend_core(struct pkginfo *pend, const char *trig)
+{
+	struct trigpend *tp;
+
+	for (tp = pend->trigpend_head; tp; tp = tp->next)
+		if (!strcmp(tp->name, trig))
+			return false;
+
+	tp = nfmalloc(sizeof(*tp));
+	tp->name = trig;
+	tp->next = pend->trigpend_head;
+	pend->trigpend_head = tp;
+
+	return true;
+}
+
+/*
+ * trig is not copied!
+ *
+ * @retval true  For done.
+ * @retval false For already noted.
+ */
+bool
+trig_note_pend(struct pkginfo *pend, const char *trig)
+{
+	if (!trig_note_pend_core(pend, trig))
+		return false;
+
+	pend->status = pend->trigaw.head ? stat_triggersawaited :
+	               stat_triggerspending;
+
+	return true;
+}
+
+/*
+ * Note: This is called also from fields.c where *aw is a temporary
+ * but pend is from pkg_db_find()!
+ *
+ * @retval true  For done.
+ * @retval false For already noted.
+ */
+bool
+trig_note_aw(struct pkginfo *pend, struct pkginfo *aw)
+{
+	struct trigaw *ta;
+
+	/* We search through aw's list because that's probably shorter. */
+	for (ta = aw->trigaw.head; ta; ta = ta->sameaw.next)
+		if (ta->pend == pend)
+			return false;
+
+	ta = nfmalloc(sizeof(*ta));
+	ta->aw = aw;
+	ta->pend = pend;
+	ta->samepend_next = pend->othertrigaw_head;
+	pend->othertrigaw_head = ta;
+	LIST_LINK_TAIL_PART(aw->trigaw, ta, sameaw.);
+
+	return true;
+}
+
+static struct pkg_list *trig_awaited_pend_head;
+
+void
+trig_awaited_pend_enqueue(struct pkginfo *pend)
+{
+	struct pkg_list *tp;
+
+	for (tp = trig_awaited_pend_head; tp; tp = tp->next)
+		if (tp->pkg == pend)
+			return;
+
+	pkg_list_prepend(&trig_awaited_pend_head, pend);
+}
+
+void
+trig_awaited_pend_foreach(trig_awaited_pend_foreach_func *func)
+{
+	struct pkg_list *tp;
+
+	for (tp = trig_awaited_pend_head; tp; tp = tp->next)
+		if (!tp->pkg->trigpend_head)
+			func(tp->pkg);
+}
+
+void
+trig_awaited_pend_free(void)
+{
+	pkg_list_free(trig_awaited_pend_head);
+	trig_awaited_pend_head = NULL;
+}
diff -uNr --exclude .git --exclude .bzr dpkg/lib/dpkg/vercmp.c /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/vercmp.c
--- dpkg/lib/dpkg/vercmp.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/dpkg/vercmp.c	2012-06-07 10:11:09.426073000 -0700
@@ -3,7 +3,6 @@
  * vercmp.c - comparison of version numbers
  *
  * Copyright © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
- * Copyright © 2009 Canonical Ltd.
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +26,6 @@
 
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/arch.h>
 #include <dpkg/parsedump.h>
 
 bool
@@ -119,44 +117,3 @@
 {
   return versionsatisfied3(&it->version,&against->version,against->verrel);
 }
-
-bool
-archsatisfied(struct pkgbin *it, struct deppossi *against)
-{
-  const struct dpkg_arch *dep_arch, *pkg_arch;
-
-  /* The rules are supposed to be:
-   * - unqualified Depends/Pre-Depends/Recommends/Suggests are only
-   *   satisfied by a package of a different architecture if the target
-   *   package is Multi-Arch: foreign
-   * - Depends/Pre-Depends/Recommends/Suggests on pkg:any are satisfied by
-   *   a package of a different architecture if the target package is
-   *   Multi-Arch: allowed
-   * - all other Depends/Pre-Depends/Recommends/Suggests are only
-   *   satisfied by packages of the same architecture
-   * - Architecture: all packages are treated the same as packages of the
-   *   native architecture
-   * - Conflicts/Replaces/Breaks are assumed to apply to packages of any
-   *   arch
-   */
-
-  if (it->multiarch == multiarch_foreign)
-    return true;
-
-  dep_arch = against->arch;
-  if (dep_arch->type == arch_wildcard &&
-      (it->multiarch == multiarch_allowed ||
-       against->up->type == dep_conflicts ||
-       against->up->type == dep_replaces ||
-       against->up->type == dep_breaks))
-    return true;
-
-  if (dep_arch->type == arch_none || dep_arch->type == arch_all)
-    dep_arch = dpkg_arch_get_native();
-
-  pkg_arch = it->arch;
-  if (pkg_arch->type == arch_none || pkg_arch->type == arch_all)
-    pkg_arch = dpkg_arch_get_native();
-
-  return (dep_arch == pkg_arch);
-}
diff -uNr --exclude .git --exclude .bzr dpkg/lib/Makefile.in /home/vorlon/devel/multiarch/dpkg-debian/lib/Makefile.in
--- dpkg/lib/Makefile.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/lib/Makefile.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,596 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = lib
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
+	$(top_srcdir)/m4/dpkg-build.m4 \
+	$(top_srcdir)/m4/dpkg-compiler.m4 \
+	$(top_srcdir)/m4/dpkg-coverage.m4 \
+	$(top_srcdir)/m4/dpkg-funcs.m4 $(top_srcdir)/m4/dpkg-libs.m4 \
+	$(top_srcdir)/m4/dpkg-linker.m4 $(top_srcdir)/m4/dpkg-progs.m4 \
+	$(top_srcdir)/m4/dpkg-types.m4 \
+	$(top_srcdir)/m4/dpkg-unicode.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BZ2_LIBS = @BZ2_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCOV = @GCOV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LCOV = @LCOV@
+LCOV_GENHTML = @LCOV_GENHTML@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_COVER = @PERL_COVER@
+PERL_COVERAGE = @PERL_COVERAGE@
+PERL_LIBDIR = @PERL_LIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PO4A = @PO4A@
+POD2MAN = @POD2MAN@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_PO4A = @USE_PO4A@
+USE_UNICODE = @USE_UNICODE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+admindir = @admindir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = \
+	compat \
+	dpkg
+
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign lib/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude .git --exclude .bzr dpkg/m4/dpkg-arch.m4 /home/vorlon/devel/multiarch/dpkg-debian/m4/dpkg-arch.m4
--- dpkg/m4/dpkg-arch.m4	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/m4/dpkg-arch.m4	2012-06-07 10:11:09.426073000 -0700
@@ -6,9 +6,10 @@
 # Use dpkg-architecture from the source tree to set sh_var using DEB_VAR for
 # the target architecture, to avoid duplicating its logic.
 AC_DEFUN([_DPKG_ARCHITECTURE], [
+AC_REQUIRE([DPKG_PROG_PERL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 $2=$(cd $srcdir/scripts; \
-    PERL5LIB=$(pwd) ./dpkg-architecture.pl -t$host -q$1 2>/dev/null)
+    PERL5LIB=$(pwd) $PERL dpkg-architecture.pl -t$host -q$1 2>/dev/null)
 ])# _DPKG_ARCHITECURE
 
 # DPKG_CPU_TYPE
@@ -56,7 +57,11 @@
 DPKG_OS_TYPE
 AC_MSG_CHECKING([dpkg architecture name])
 _DPKG_ARCHITECTURE([DEB_HOST_ARCH], [dpkg_arch])
-AC_MSG_RESULT([$dpkg_arch])
+if test "x$dpkg_arch" = "x"; then
+	AC_MSG_ERROR([cannot determine host dpkg architecture])
+else
+	AC_MSG_RESULT([$dpkg_arch])
+fi
 AC_DEFINE_UNQUOTED(ARCHITECTURE, "${dpkg_arch}",
 	[Set this to the canonical dpkg architecture name.])
 ])# DPKG_ARCHITECTURE
diff -uNr --exclude .git --exclude .bzr dpkg/m4/dpkg-funcs.m4 /home/vorlon/devel/multiarch/dpkg-debian/m4/dpkg-funcs.m4
--- dpkg/m4/dpkg-funcs.m4	2011-03-01 14:31:03.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/m4/dpkg-funcs.m4	2012-06-07 10:11:09.426073000 -0700
@@ -85,6 +85,29 @@
   ])
 ])
 
+# DPKG_CHECK_PROGNAME
+# -------------------
+# Check for system implementations of program name tracking.
+AC_DEFUN([DPKG_CHECK_PROGNAME],
+[
+  AC_MSG_CHECKING([for program_invocation_short_name])
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <errno.h>]],
+                 [[const char *p = program_invocation_short_name;]])],
+                 [AC_DEFINE([HAVE_PROGRAM_INVOCATION_SHORT_NAME], [1],
+                            [Define to 1 if you have program_invocation_short_name])
+                  AC_MSG_RESULT([yes])],
+                 [AC_MSG_RESULT([no])])
+
+  AC_MSG_CHECKING([for __progname])
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
+                 [[extern char *__progname;
+                   const char *p = __progname;]])],
+                 [AC_DEFINE([HAVE___PROGNAME], [1],
+                            [Define to 1 if you have __progname])
+                  AC_MSG_RESULT([yes])],
+                 [AC_MSG_RESULT([no])])
+]) # DPKG_CHECK_PROGNAME
+
 # DPKG_CHECK_COMPAT_FUNCS(LIST)
 # -----------------------
 # Check each function and define an automake conditional
diff -uNr --exclude .git --exclude .bzr dpkg/m4/gettext.m4 /home/vorlon/devel/multiarch/dpkg-debian/m4/gettext.m4
--- dpkg/m4/gettext.m4	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/m4/gettext.m4	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,383 @@
+# gettext.m4 serial 63 (gettext-0.18)
+dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
+dnl    default (if it is not specified or empty) is 'no-libtool'.
+dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
+dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries.  If empty,
+dnl    the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+  dnl Argument checking.
+  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
+    [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+  define([gt_included_intl],
+    ifelse([$1], [external],
+      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+      [yes]))
+  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+  gt_NEEDS_INIT
+  AM_GNU_GETTEXT_NEED([$2])
+
+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
+  ifelse(gt_included_intl, yes, [
+    AC_REQUIRE([AM_INTL_SUBDIR])dnl
+  ])
+
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+  dnl documented, we avoid it.
+  ifelse(gt_included_intl, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
+  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+  gt_INTL_MACOSX
+
+  dnl Set USE_NLS.
+  AC_REQUIRE([AM_NLS])
+
+  ifelse(gt_included_intl, yes, [
+    BUILD_INCLUDED_LIBINTL=no
+    USE_INCLUDED_LIBINTL=no
+  ])
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+  dnl Add a version number to the cache macros.
+  case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+  dnl If we use NLS figure out what method
+  if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+    ifelse(gt_included_intl, yes, [
+      AC_MSG_CHECKING([whether included gettext is requested])
+      AC_ARG_WITH([included-gettext],
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+    ])
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
+
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+         [AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;],
+            [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
+            [eval "$gt_func_gnugettext_libc=yes"],
+            [eval "$gt_func_gnugettext_libc=no"])])
+
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+          dnl Sometimes libintl requires libiconv, so first search for libiconv.
+          ifelse(gt_included_intl, yes, , [
+            AM_ICONV_LINK
+          ])
+          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+          dnl even if libiconv doesn't exist.
+          AC_LIB_LINKFLAGS_BODY([intl])
+          AC_CACHE_CHECK([for GNU gettext in libintl],
+            [$gt_func_gnugettext_libintl],
+           [gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+            dnl Now see whether libintl exists and does not depend on libiconv.
+            AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+              [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+              [eval "$gt_func_gnugettext_libintl=yes"],
+              [eval "$gt_func_gnugettext_libintl=no"])
+            dnl Now see whether libintl exists and depends on libiconv.
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+                [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+               [LIBINTL="$LIBINTL $LIBICONV"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                eval "$gt_func_gnugettext_libintl=yes"
+               ])
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"])
+        fi
+
+        dnl If an already present or preinstalled GNU gettext() is found,
+        dnl use it.  But if this macro is used in GNU gettext, and GNU
+        dnl gettext is already preinstalled in libintl, we update this
+        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+          dnl Reset the values set by searching for libintl.
+          LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+    ifelse(gt_included_intl, yes, [
+        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+          dnl GNU gettext is not found in the C library.
+          dnl Fall back on included GNU gettext library.
+          nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        BUILD_INCLUDED_LIBINTL=yes
+        USE_INCLUDED_LIBINTL=yes
+        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      CATOBJEXT=
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions to use GNU gettext tools.
+        CATOBJEXT=.gmo
+      fi
+    ])
+
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Some extra flags are needed during linking.
+        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+      AC_DEFINE([ENABLE_NLS], [1],
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  AC_MSG_CHECKING([whether to use NLS])
+  AC_MSG_RESULT([$USE_NLS])
+  if test "$USE_NLS" = "yes"; then
+    AC_MSG_CHECKING([where the gettext function comes from])
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    AC_MSG_RESULT([$gt_source])
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        AC_MSG_CHECKING([how to link with libintl])
+        AC_MSG_RESULT([$LIBINTL])
+        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+      fi
+
+      dnl For backward compatibility. Some packages may be using this.
+      AC_DEFINE([HAVE_GETTEXT], [1],
+       [Define if the GNU gettext() function is already present or preinstalled.])
+      AC_DEFINE([HAVE_DCGETTEXT], [1],
+       [Define if the GNU dcgettext() function is already present or preinstalled.])
+    fi
+
+    dnl We need to process the po/ directory.
+    POSUB=po
+  fi
+
+  ifelse(gt_included_intl, yes, [
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
+    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+      BUILD_INCLUDED_LIBINTL=yes
+    fi
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST([BUILD_INCLUDED_LIBINTL])
+    AC_SUBST([USE_INCLUDED_LIBINTL])
+    AC_SUBST([CATOBJEXT])
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
+    AC_SUBST([DATADIRNAME])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST([INSTOBJEXT])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST([GENCAT])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INTLOBJS=
+    if test "$USE_INCLUDED_LIBINTL" = yes; then
+      INTLOBJS="\$(GETTOBJS)"
+    fi
+    AC_SUBST([INTLOBJS])
+
+    dnl Enable libtool support if the surrounding package wishes it.
+    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+    AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
+  ])
+
+  dnl For backward compatibility. Some Makefiles may be using this.
+  INTLLIBS="$LIBINTL"
+  AC_SUBST([INTLLIBS])
+
+  dnl Make all documented variables known to autoconf.
+  AC_SUBST([LIBINTL])
+  AC_SUBST([LTLIBINTL])
+  AC_SUBST([POSUB])
+])
+
+
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
+[
+  m4_divert_text([DEFAULTS], [gt_needs=])
+  m4_define([gt_NEEDS_INIT], [])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
+[
+  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff -uNr --exclude .git --exclude .bzr dpkg/m4/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/m4/.gitignore
--- dpkg/m4/.gitignore	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/m4/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-*.m4
-!dpkg-*.m4
diff -uNr --exclude .git --exclude .bzr dpkg/m4/iconv.m4 /home/vorlon/devel/multiarch/dpkg-debian/m4/iconv.m4
--- dpkg/m4/iconv.m4	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/m4/iconv.m4	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,199 @@
+# iconv.m4 serial 9 (gettext-0.18)
+dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
+[
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+
+  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed libiconv and not disabled its use
+  dnl via --without-libiconv-prefix, he wants to use it. The first
+  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  am_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      [am_cv_func_iconv=yes])
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        [am_cv_lib_iconv=yes]
+        [am_cv_func_iconv=yes])
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
+      dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
+      am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      AC_TRY_RUN([
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\263";
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
+        [case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac])
+      LIBS="$am_save_LIBS"
+    ])
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+    AC_DEFINE([HAVE_ICONV], [1],
+      [Define if you have the iconv() function and it works.])
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    AC_MSG_CHECKING([how to link with libiconv])
+    AC_MSG_RESULT([$LIBICONV])
+  else
+    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+    dnl either.
+    CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+  AC_SUBST([LIBICONV])
+  AC_SUBST([LTLIBICONV])
+])
+
+AC_DEFUN([AM_ICONV],
+[
+  AM_ICONV_LINK
+  if test "$am_cv_func_iconv" = yes; then
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL([am_cv_proto_iconv], [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([
+         $am_cv_proto_iconv])
+    AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+])
diff -uNr --exclude .git --exclude .bzr dpkg/m4/intlmacosx.m4 /home/vorlon/devel/multiarch/dpkg-debian/m4/intlmacosx.m4
--- dpkg/m4/intlmacosx.m4	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/m4/intlmacosx.m4	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,51 @@
+# intlmacosx.m4 serial 3 (gettext-0.18)
+dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in MacOS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    [gt_cv_func_CFPreferencesCopyAppValue],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
+      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in MacOS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
+      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
diff -uNr --exclude .git --exclude .bzr dpkg/m4/lib-ld.m4 /home/vorlon/devel/multiarch/dpkg-debian/m4/lib-ld.m4
--- dpkg/m4/lib-ld.m4	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/m4/lib-ld.m4	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,110 @@
+# lib-ld.m4 serial 4 (gettext-0.18)
+dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
+
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by GCC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]* | [A-Za-z]:[\\/]*)]
+      [re_direlt='/[^/][^/]*/\.\./']
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL([acl_cv_path_LD],
+[if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      *GNU* | *'with BFD'*)
+        test "$with_gnu_ld" != no && break ;;
+      *)
+        test "$with_gnu_ld" != yes && break ;;
+      esac
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT([$LD])
+else
+  AC_MSG_RESULT([no])
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])
diff -uNr --exclude .git --exclude .bzr dpkg/m4/lib-link.m4 /home/vorlon/devel/multiarch/dpkg-debian/m4/lib-link.m4
--- dpkg/m4/lib-link.m4	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/m4/lib-link.m4	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,774 @@
+# lib-link.m4 serial 21 (gettext-0.18)
+dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_PREREQ([2.54])
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. The missing-message
+dnl defaults to 'no' and may contain additional hints for the user.
+dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
+dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    ac_save_LIBS="$LIBS"
+    dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
+    dnl because these -l options might require -L options that are present in
+    dnl LIBS. -l options benefit only from the -L options listed before it.
+    dnl Otherwise, add it to the front of LIBS, because it may be a static
+    dnl library that depends on another static library that is present in LIBS.
+    dnl Static libraries benefit only from the static libraries listed after
+    dnl it.
+    case " $LIB[]NAME" in
+      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
+      *)       LIBS="$LIB[]NAME $LIBS" ;;
+    esac
+    AC_TRY_LINK([$3], [$4],
+      [ac_cv_lib[]Name=yes],
+      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
+    LIBS="$ac_save_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+  ])
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE([rpath],
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_FROMPACKAGE(name, package)
+dnl declares that libname comes from the given package. The configure file
+dnl will then not have a --with-libname-prefix option but a
+dnl --with-package-prefix option. Several libraries can come from the same
+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
+dnl macro call that searches for libname.
+AC_DEFUN([AC_LIB_FROMPACKAGE],
+[
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  define([acl_frompackage_]NAME, [$2])
+  popdef([NAME])
+  pushdef([PACK],[$2])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  define([acl_libsinpackage_]PACKUP,
+    m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
+  popdef([PACKUP])
+  popdef([PACK])
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_ARG_WITH(P_A_C_K[-prefix],
+[[  --with-]]P_A_C_K[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
+  --without-]]P_A_C_K[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
+      fi
+    fi
+])
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Using breadth-first-seach.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  LIB[]NAME[]_PREFIX=
+  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
+  dnl computed. So it has to be reset here.
+  HAVE_LIB[]NAME=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+            dnl The same code as in the loop below:
+            dnl First look for a shared library.
+            if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+            dnl Then look for a static library.
+            if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              dnl Linking with a shared library. We attempt to hardcode its
+              dnl directory into the executable's runpath, unless it's the
+              dnl standard /usr/lib.
+              if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$acl_hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INC[]NAME; do
+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    dnl   3. if it's already present in $LDFLAGS or the already
+                    dnl      constructed $LIBNAME,
+                    dnl   4. if it doesn't exist as a directory.
+                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                    dnl Handle this in the next round.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+  popdef([P_A_C_K])
+  popdef([PACKLIBS])
+  popdef([PACKUP])
+  popdef([PACK])
+  popdef([NAME])
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    fi
+  done
+])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+  AC_REQUIRE([AC_LIB_RPATH])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  $1=
+  if test "$enable_rpath" != no; then
+    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+      dnl Use an explicit option to hardcode directories into the resulting
+      dnl binary.
+      rpathdirs=
+      next=
+      for opt in $2; do
+        if test -n "$next"; then
+          dir="$next"
+          dnl No need to hardcode the standard /usr/lib.
+          if test "X$dir" != "X/usr/$acl_libdirstem" \
+             && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+            rpathdirs="$rpathdirs $dir"
+          fi
+          next=
+        else
+          case $opt in
+            -L) next=yes ;;
+            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+                 dnl No need to hardcode the standard /usr/lib.
+                 if test "X$dir" != "X/usr/$acl_libdirstem" \
+                    && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+                   rpathdirs="$rpathdirs $dir"
+                 fi
+                 next= ;;
+            *) next= ;;
+          esac
+        fi
+      done
+      if test "X$rpathdirs" != "X"; then
+        if test -n ""$3""; then
+          dnl libtool is used for linking. Use -R options.
+          for dir in $rpathdirs; do
+            $1="${$1}${$1:+ }-R$dir"
+          done
+        else
+          dnl The linker is used for linking directly.
+          if test -n "$acl_hardcode_libdir_separator"; then
+            dnl Weird platform: only the last -rpath option counts, the user
+            dnl must pass all path elements in one option.
+            alldirs=
+            for dir in $rpathdirs; do
+              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
+            done
+            acl_save_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$acl_hardcode_libdir_flag_spec\"
+            libdir="$acl_save_libdir"
+            $1="$flag"
+          else
+            dnl The -rpath options are cumulative.
+            for dir in $rpathdirs; do
+              acl_save_libdir="$libdir"
+              libdir="$dir"
+              eval flag=\"$acl_hardcode_libdir_flag_spec\"
+              libdir="$acl_save_libdir"
+              $1="${$1}${$1:+ }$flag"
+            done
+          fi
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST([$1])
+])
diff -uNr --exclude .git --exclude .bzr dpkg/m4/lib-prefix.m4 /home/vorlon/devel/multiarch/dpkg-debian/m4/lib-prefix.m4
--- dpkg/m4/lib-prefix.m4	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/m4/lib-prefix.m4	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,224 @@
+# lib-prefix.m4 serial 7 (gettext-0.18)
+dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib-prefix],
+[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+  --without-lib-prefix    don't search for libraries in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+])
+  if test $use_additional = yes; then
+    dnl Potentially add $additional_includedir to $CPPFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/include,
+    dnl   2. if it's already present in $CPPFLAGS,
+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_includedir" = "X/usr/local/include"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+    dnl Potentially add $additional_libdir to $LDFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/lib,
+    dnl   2. if it's already present in $LDFLAGS,
+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+      haveit=
+      for x in $LDFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
+  fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_PREPARE_MULTILIB creates
+dnl - a variable acl_libdirstem, containing the basename of the libdir, either
+dnl   "lib" or "lib64" or "lib/64",
+dnl - a variable acl_libdirstem2, as a secondary possible value for
+dnl   acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
+dnl   "lib/amd64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+  dnl There is no formal standard regarding lib and lib64.
+  dnl On glibc systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
+  dnl the compiler's default mode by looking at the compiler's library search
+  dnl path. If at least one of its elements ends in /lib64 or points to a
+  dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
+  dnl Otherwise we use the default, namely "lib".
+  dnl On Solaris systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
+  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  acl_libdirstem=lib
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+      dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
+      dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
+      dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
+      dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
+      dnl symlink is missing, so we set acl_libdirstem2 too.
+      AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
+        [AC_EGREP_CPP([sixtyfour bits], [
+#ifdef _LP64
+sixtyfour bits
+#endif
+           ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
+        ])
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+        esac
+      fi
+      ;;
+    *)
+      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+      if test -n "$searchpath"; then
+        acl_save_IFS="${IFS= 	}"; IFS=":"
+        for searchdir in $searchpath; do
+          if test -d "$searchdir"; then
+            case "$searchdir" in
+              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
+      fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+])
diff -uNr --exclude .git --exclude .bzr dpkg/m4/nls.m4 /home/vorlon/devel/multiarch/dpkg-debian/m4/nls.m4
--- dpkg/m4/nls.m4	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/m4/nls.m4	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,32 @@
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE([nls],
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
+])
diff -uNr --exclude .git --exclude .bzr dpkg/m4/po.m4 /home/vorlon/devel/multiarch/dpkg-debian/m4/po.m4
--- dpkg/m4/po.m4	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/m4/po.m4	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,449 @@
+# po.m4 serial 17 (gettext-0.18)
+dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AM_NLS])dnl
+
+  dnl Release version of the gettext macros. This is used to ensure that
+  dnl the gettext macros and po/Makefile.in.in are in sync.
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+
+  dnl Perform the following tests also if --disable-nls has been given,
+  dnl because they are needed for "make dist" to work.
+
+  dnl Search for GNU msgfmt in the PATH.
+  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+  dnl The second test excludes FreeBSD msgfmt.
+  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
+
+  dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([MSGFMT_015])
+changequote(,)dnl
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([GMSGFMT_015])
+
+  dnl Search for GNU xgettext 0.12 or newer in the PATH.
+  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+  dnl The second test excludes FreeBSD xgettext.
+  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  dnl Remove leftover from FreeBSD xgettext call.
+  rm -f messages.po
+
+  dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([XGETTEXT_015])
+
+  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
+
+  dnl Installation directories.
+  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+  dnl have to define it here, so that it can be used in po/Makefile.
+  test -n "$localedir" || localedir='${datadir}/locale'
+  AC_SUBST([localedir])
+
+  dnl Support for AM_XGETTEXT_OPTION.
+  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
+  AC_CONFIG_COMMANDS([po-directories], [[
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          # Compute POFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+          # Compute UPDATEPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+          # Compute DUMMYPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+          # Compute GMOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          GMOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done]],
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+    # from automake < 1.5.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+   ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+  # When this code is run, in config.status, two variables have already been
+  # set:
+  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+  # - LINGUAS is the value of the environment variable LINGUAS at configure
+  #   time.
+
+changequote(,)dnl
+  # Adjust a relative srcdir.
+  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+  # In autoconf-2.13 it is called $ac_given_srcdir.
+  # In autoconf-2.50 it is called $srcdir.
+  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+  case "$ac_given_srcdir" in
+    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+    /*) top_srcdir="$ac_given_srcdir" ;;
+    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  # Find a way to echo strings without interpreting backslash.
+  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+    gt_echo='echo'
+  else
+    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+      gt_echo='printf %s\n'
+    else
+      echo_func () {
+        cat <<EOT
+$*
+EOT
+      }
+      gt_echo='echo_func'
+    fi
+  fi
+
+  # A sed script that extracts the value of VARIABLE from a Makefile.
+  sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^[	 ]*VARIABLE[	 ]*=/{
+  # Seen the first line of the variable definition.
+  s/^[	 ]*VARIABLE[	 ]*=//
+  ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+  # Set POTFILES to the value of the Makefile variable POTFILES.
+  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
+  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+  # Compute POTFILES_DEPS as
+  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+  POTFILES_DEPS=
+  for file in $POTFILES; do
+    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+  done
+  POMAKEFILEDEPS=""
+
+  if test -n "$OBSOLETE_ALL_LINGUAS"; then
+    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+  fi
+  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+    # The LINGUAS file contains the set of available languages.
+    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+  else
+    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
+    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+  fi
+  # Hide the ALL_LINGUAS assigment from automake < 1.5.
+  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+  # Compute POFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+  # Compute UPDATEPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+  # Compute DUMMYPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+  # Compute GMOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+  # Compute PROPERTIESFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+  # Compute CLASSFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+  # Compute QMFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+  # Compute MSGFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+  # Compute RESOURCESDLLFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+  case "$ac_given_srcdir" in
+    .) srcdirpre= ;;
+    *) srcdirpre='$(srcdir)/' ;;
+  esac
+  POFILES=
+  UPDATEPOFILES=
+  DUMMYPOFILES=
+  GMOFILES=
+  PROPERTIESFILES=
+  CLASSFILES=
+  QMFILES=
+  MSGFILES=
+  RESOURCESDLLFILES=
+  for lang in $ALL_LINGUAS; do
+    POFILES="$POFILES $srcdirpre$lang.po"
+    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+    QMFILES="$QMFILES $srcdirpre$lang.qm"
+    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+  done
+  # CATALOGS depends on both $ac_dir and the user's LINGUAS
+  # environment variable.
+  INST_LINGUAS=
+  if test -n "$ALL_LINGUAS"; then
+    for presentlang in $ALL_LINGUAS; do
+      useit=no
+      if test "%UNSET%" != "$LINGUAS"; then
+        desiredlanguages="$LINGUAS"
+      else
+        desiredlanguages="$ALL_LINGUAS"
+      fi
+      for desiredlang in $desiredlanguages; do
+        # Use the presentlang catalog if desiredlang is
+        #   a. equal to presentlang, or
+        #   b. a variant of presentlang (because in this case,
+        #      presentlang can be used as a fallback for messages
+        #      which are not translated in the desiredlang catalog).
+        case "$desiredlang" in
+          "$presentlang"*) useit=yes;;
+        esac
+      done
+      if test $useit = yes; then
+        INST_LINGUAS="$INST_LINGUAS $presentlang"
+      fi
+    done
+  fi
+  CATALOGS=
+  JAVACATALOGS=
+  QTCATALOGS=
+  TCLCATALOGS=
+  CSHARPCATALOGS=
+  if test -n "$INST_LINGUAS"; then
+    for lang in $INST_LINGUAS; do
+      CATALOGS="$CATALOGS $lang.gmo"
+      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+      QTCATALOGS="$QTCATALOGS $lang.qm"
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+    done
+  fi
+
+  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if test -n "$POMAKEFILEDEPS"; then
+    cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+  fi
+  mv "$ac_file.tmp" "$ac_file"
+])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+  XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])
diff -uNr --exclude .git --exclude .bzr dpkg/m4/progtest.m4 /home/vorlon/devel/multiarch/dpkg-debian/m4/progtest.m4
--- dpkg/m4/progtest.m4	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/m4/progtest.m4	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,92 @@
+# progtest.m4 serial 6 (gettext-0.18)
+dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+AC_PREREQ([2.50])
+
+# Search path for a program which passes the given test.
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL([ac_cv_path_$1],
+[case "[$]$1" in
+  [[\\/]]* | ?:[[\\/]]*)
+    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in ifelse([$5], , $PATH, [$5]); do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
+          if [$3]; then
+            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+    ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$][$1])
+else
+  AC_MSG_RESULT([no])
+fi
+AC_SUBST([$1])dnl
+])
diff -uNr --exclude .git --exclude .bzr dpkg/Makefile.in /home/vorlon/devel/multiarch/dpkg-debian/Makefile.in
--- dpkg/Makefile.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/Makefile.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,949 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = .
+DIST_COMMON = README $(am__configure_deps) $(dist_pkgdata_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in $(top_srcdir)/configure \
+	$(top_srcdir)/doc/Doxyfile.in ABOUT-NLS AUTHORS COPYING \
+	ChangeLog NEWS THANKS TODO build-aux/config.guess \
+	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
+	build-aux/install-sh build-aux/missing build-aux/ylwrap
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
+	$(top_srcdir)/m4/dpkg-build.m4 \
+	$(top_srcdir)/m4/dpkg-compiler.m4 \
+	$(top_srcdir)/m4/dpkg-coverage.m4 \
+	$(top_srcdir)/m4/dpkg-funcs.m4 $(top_srcdir)/m4/dpkg-libs.m4 \
+	$(top_srcdir)/m4/dpkg-linker.m4 $(top_srcdir)/m4/dpkg-progs.m4 \
+	$(top_srcdir)/m4/dpkg-types.m4 \
+	$(top_srcdir)/m4/dpkg-unicode.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = doc/Doxyfile
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(dist_pkgdata_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = lib dpkg-deb dpkg-split src utils dselect scripts po \
+	man
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BZ2_LIBS = @BZ2_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCOV = @GCOV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LCOV = @LCOV@
+LCOV_GENHTML = @LCOV_GENHTML@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_COVER = @PERL_COVER@
+PERL_COVERAGE = @PERL_COVERAGE@
+PERL_LIBDIR = @PERL_LIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PO4A = @PO4A@
+POD2MAN = @POD2MAN@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_PO4A = @USE_PO4A@
+USE_UNICODE = @USE_UNICODE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+admindir = @admindir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@WITH_DSELECT_TRUE@MAYBE_DSELECT = dselect
+SUBDIRS = \
+	lib \
+	dpkg-deb \
+	dpkg-split \
+	src \
+	utils \
+	$(MAYBE_DSELECT) \
+	scripts \
+	po \
+	man
+
+ACLOCAL_AMFLAGS = -I m4
+dist_pkgdata_DATA = cputable ostable triplettable
+EXTRA_DIST = \
+	.mailmap \
+	ChangeLog.old \
+	README.translators \
+	get-version \
+	doc/README.api \
+	doc/README.feature-removal-schedule \
+	doc/coding-style.txt \
+	doc/lcov-epilog \
+	doc/lcov-prolog \
+	doc/triggers.txt \
+	debian/archtable \
+	debian/changelog \
+	debian/compat \
+	debian/control \
+	debian/copyright \
+	debian/dpkg-dev.docs \
+	debian/dpkg-dev.install \
+	debian/dpkg-dev.preinst \
+	debian/dpkg-dev.lintian-overrides \
+	debian/dpkg.cfg \
+	debian/dpkg.cron.daily \
+	debian/dpkg.docs \
+	debian/dpkg.install \
+	debian/dpkg.postinst \
+	debian/dpkg.postrm \
+	debian/dpkg.preinst \
+	debian/dpkg.prerm \
+	debian/dpkg.logrotate \
+	debian/dpkg.links \
+	debian/dpkg.lintian-overrides \
+	debian/dselect.cfg \
+	debian/dselect.docs \
+	debian/dselect.install \
+	debian/dselect.preinst \
+	debian/dselect.lintian-overrides \
+	debian/libdpkg-dev.docs \
+	debian/libdpkg-dev.install \
+	debian/libdpkg-dev.lintian-overrides \
+	debian/libdpkg-perl.docs \
+	debian/libdpkg-perl.install \
+	debian/libdpkg-perl.lintian-overrides \
+	debian/source/lintian-overrides \
+	debian/source/format \
+	debian/source/options \
+	debian/usertags \
+	debian/rules \
+	debian/shlibs.default \
+	debian/shlibs.override
+
+@COVERAGE_ENABLED_TRUE@LCOV_OPTS = -q --checksum
+@COVERAGE_ENABLED_TRUE@LCOV_CAPTURE_OPTS = $(LCOV_OPTS) --no-recursion \
+@COVERAGE_ENABLED_TRUE@	-d $(top_builddir)/lib/dpkg \
+@COVERAGE_ENABLED_TRUE@	-d $(top_builddir)/src \
+@COVERAGE_ENABLED_TRUE@	-d $(top_builddir)/utils
+
+DISTCLEANFILES = ChangeLog
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+am--refresh:
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in:  $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+doc/Doxyfile: $(top_builddir)/config.status $(top_srcdir)/doc/Doxyfile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
+	done
+
+uninstall-dist_pkgdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@$(am__cd) '$(distuninstallcheck_dir)' \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA) config.h
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-local mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-dist_pkgdataDATA
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-dist_pkgdataDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	clean-local ctags ctags-recursive dist dist-all dist-bzip2 \
+	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-generic distclean-hdr \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dist_pkgdataDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-dist_pkgdataDATA
+
+
+.PHONY: doc
+
+doc: doc/Doxyfile
+	$(DOXYGEN) doc/Doxyfile
+
+doc-clean:
+	rm -rf doc/html/
+
+# Code coverage support
+
+.PHONY: coverage coverage-clean
+
+@COVERAGE_ENABLED_TRUE@coverage: all
+@COVERAGE_ENABLED_TRUE@	$(RM) -f *.lcov
+@COVERAGE_ENABLED_TRUE@	find -name '*.gcda' -o -name '*.gcov' | xargs $(RM) -f
+
+@COVERAGE_ENABLED_TRUE@	$(LCOV) $(LCOV_CAPTURE_OPTS) -c -o dpkg_base.lcov -i
+@COVERAGE_ENABLED_TRUE@	$(MAKE) -C lib/dpkg check
+@COVERAGE_ENABLED_TRUE@	$(MAKE) -C src check
+@COVERAGE_ENABLED_TRUE@	$(MAKE) -C utils check
+@COVERAGE_ENABLED_TRUE@	$(LCOV) $(LCOV_CAPTURE_OPTS) -c -o dpkg_test.lcov
+@COVERAGE_ENABLED_TRUE@	$(LCOV) $(LCOV_OPTS) -a dpkg_base.lcov -a dpkg_test.lcov \
+@COVERAGE_ENABLED_TRUE@	  -o dpkg_merge.lcov
+@COVERAGE_ENABLED_TRUE@	$(LCOV) $(LCOV_OPTS) -r dpkg_merge.lcov '/usr/include/*' -o dpkg.lcov
+@COVERAGE_ENABLED_TRUE@	$(LCOV_GENHTML) -q --legend --title "dpkg C code coverage" \
+@COVERAGE_ENABLED_TRUE@	  --html-prolog $(top_srcdir)/doc/lcov-prolog \
+@COVERAGE_ENABLED_TRUE@	  --html-epilog $(top_srcdir)/doc/lcov-epilog \
+@COVERAGE_ENABLED_TRUE@	  -o doc/coverage dpkg.lcov
+
+@COVERAGE_ENABLED_TRUE@	$(MAKE) -C scripts $@
+
+@COVERAGE_ENABLED_TRUE@coverage-clean:
+@COVERAGE_ENABLED_TRUE@	rm -rf doc/coverage/
+@COVERAGE_ENABLED_TRUE@	find -name '*.gcno' -o -name '*.gcda' -o \
+@COVERAGE_ENABLED_TRUE@	     -name '*.gcov' -o -name '*.lcov' | xargs rm -f
+@COVERAGE_ENABLED_FALSE@coverage:
+@COVERAGE_ENABLED_FALSE@	@echo "Need to reconfigure with --enable-coverage"
+
+@COVERAGE_ENABLED_FALSE@coverage-clean:
+
+.PHONY: update-po
+
+update-po:
+	$(MAKE) -C po update-po
+	$(MAKE) -C scripts/po update-po
+	$(MAKE) -C dselect/po update-po
+	$(MAKE) -C man update-po
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	git log -C --stat 1.15.0.. >$@
+
+# If we create the dist tarball from the git repository, make sure
+# that we're not forgetting some files...
+dist-hook:
+	echo $(VERSION) >$(distdir)/.dist-version
+	if [ -e .git ]; then \
+		for file in `git ls-files | grep -v .gitignore`; do \
+			if [ ! -e "$(distdir)/$$file" ]; then \
+				echo "$$file is missing in $(distdir)" >&2 ; \
+				exit 1 ; \
+			fi ; \
+		done ; \
+	fi
+
+clean-local: doc-clean coverage-clean
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/deb.5 /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb.5
--- dpkg/man/de/deb.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,77 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb 5 2011\-08\-14 Debian\-Projekt Debian
+.SH NAME
+deb \- Debian\-Binrpaketformat
+.SH BERSICHT
+\fIDateiname\fP\fB.deb\fP
+.SH BESCHREIBUNG
+Das \fB.deb\fP\-Format ist das Debian\-Binrpaketdateiformat. Es wird von dpkg
+0.93.76 und neuer verstanden, und wird standardmig von allen
+dpkg\-Versionen seit 1.2.0 und allen i386/ELF\-Versionen seit 1.1.1elf
+erzeugt.
+.PP
+Das hier beschriebene Format wird seit Debian 0.93 verwendet; Details ber
+das alte Format sind in \fBdeb\-old\fP(5) beschrieben.
+.SH FORMAT
+Die Datei ist ein \fBar\fP\-Archiv mit einer magischen Zahl von
+\fB!<arch>\fP. Der Dateiname kann mit einem Schrgstrich abschlieen.
+.PP
+Derzeit werden die folgenden \fBtar\fP\-Archive erlaubt: alter Stil (V7\-)Format,
+pre\-POSIX\-ustar\-Format, eine Teilmenge des GNU\-Formats (nur der neue Stil
+mit langen Pfadnamen und langen Linknamen, untersttzt seit Dpkg 1.4.1.17)
+und das POSIX\-ustar\-Format (lange Namen seit Dpkg 1.15.0
+untersttzt). Unbekannte Tar\-Typeinstellungen werden als Fehler betrachtet.
+.PP
+Das erste Mitglied heit \fBdebian\-binary\fP und enthlt eine Reihe von Zeilen,
+die durch Zeilenumbrche getrennt sind. Derzeit ist nur eine Zeile
+vorhanden, die Versionsnummer, \fB2.0\fP zum Zeitpunkt zu dem diese
+Handbuchseite geschrieben wurde. Programme, die Archive im neuen Format
+lesen, sollten darauf vorbereitet sein, dass sich die Nachkommazahl erhht
+und neue Zeilen vorhanden sein knnen, und sollten diese ignorieren, falls
+dies der Fall ist.
+.PP
+Falls sich die Vorkommazahl gendert hat, wurde eine inkompatible nderung
+durchgefhrt und das Programm sollte sich beenden. Falls dies nicht der Fall
+ist, dann sollte das Programm sicher fortfahren knnen, es sei denn, ein
+unerwartetes Mitglied ist im Archiv (abgesehen vom Ende) gefunden worden,
+wie unten beschrieben.
+.PP
+Das zweite erforderliche Mitglied heit \fBcontrol.tar.gz\fP. Es ist ein
+gezipptes Tar\-Archiv, das die Steuerinformationen als eine Reihe von
+normalen Dateien enthlt, von denen die Datei \fBcontrol\fP zwingend
+erforderlich ist und die Kern\-Steuerinformationen enthlt. Der
+Steuer\-Tarball kann optional einen Eintrag fr \fB.\fP, das aktuelle
+Verzeichnis, enthalten.
+.PP
+Das dritte, letzte zwingend bentigte Mitglied heit \fBdata.tar\fP. Es enthlt
+das Dateisystem als Tar\-Archiv, entweder unkomprimiert (seit Dpkg 1.10.24
+untersttzt) oder mit gzip (Dateiendung \fB.gz\fP), xz (Dateiendung \fB.xz\fP seit
+Dpkg 1.15.6 untersttzt),bzip2 (Dateiendung \fB.bz2\fP, seit Dpkg 1.10.24
+untersttzt) oder lzma (Dateiendung \fB.lzma\fP, seit Dpkg 1.13.25 untersttzt)
+komprimiert.
+.PP
+Diese Mitglieder mssen in genau dieser Reihenfolge auftauchen. Aktuelle
+Implementationen sollten zustzliche Mitglieder nach \fBdata.tar\fP
+ignorieren. Weitere Mitglieder knnten in der Zukunft definiert werden und
+werden (falls mglich) nach diesen drei platziert. Alle zustzlichen
+Mitglieder, die vor \fBdata.tar\fP eingefgt werden knnten und die problemlos
+von lteren Programmen ignoriert werden sollten, werden Namen haben, die mit
+einem Unterstrich \fB_\fP anfangen.
+.PP
+Solche neuen Mitglieder, die nicht problemlos ignoriert werden knnen,
+werden vor \fBdata.tar\fP mit Namen, die nicht mit einem Unterstrich anfangen,
+eingefgt oder werden (wahrscheinlicher) dazu fhren, dass die
+Hauptversionsnummer erhht wird.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdeb\-old\fP(5), \fBdpkg\-deb\fP(1), \fBdeb\-control\fP(5).
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/deb-control.5 /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-control.5
--- dpkg/man/de/deb-control.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-control.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,261 @@
+.\" Author: Raul Miller
+.\" Includes text from the debian Guidelines by Ian Jackson, Ian Murdock
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-control 5 2011\-08\-14 Debian\-Projekt Debian
+.SH NAME
+deb\-control \- Dateiformat der Hauptsteuerdatei von Debian\-Paketen
+.
+.SH BERSICHT
+control
+.
+.SH BESCHREIBUNG
+Jedes Debian\-Paket enthlt die Hauptsteuerdatei control, die eine Reihe
+von Feldern oder Kommentaren (wenn die Zeile mit \fB#\fP beginnt)
+enthlt. Jedes Feld beginnt mit einer Markierung, wie \fBPackage\fP oder
+\fBVersion\fP (Gro\-/Kleinschreibung egal), gefolgt von einem Doppelpunkt und
+dem Krper des Feldes. Felder werden nur durch die Feldmarkierungen
+abgegrenzt. Mit anderen Worten, Feldtexte knnen mehrere Zeilen berspannen,
+aber die Installationswerkzeuge werden im Allgemeinen die Zeilen bei der
+Verarbeitung des Feldkrpers zusammenfassen (mit Ausnahme des
+\fBDescription\fP\-Feldes, sehen Sie dazu unten).
+.
+.SH "NOTWENDIGE FELDER"
+.TP 
+\fBPackage:\fP\fI Paketname\fP
+Der Wert dieses Feldes bestimmt den Paketnamen und wird von den meisten
+Installationswerkzeugen verwendet, um Dateinamen zu erstellen.
+.TP 
+\fBVersion:\fP\fI Versions\-Zeichenkette\fP
+Typischerweise ist das die Original\-Paketversionsnummer, in der Form, die
+der Programmautor verwendet. Es kann auch eine Debian\-Revisionsnummer
+enthalten (fr nicht aus Debian stammende Pakete). Das genaue Format und der
+Sortieralgorithmus sind in \fBdeb\-version\fP(5) beschrieben.
+.TP 
+\fBMaintainer:\fP\fI Vollstndiger\-Name\-und\-E\-Mail\fP
+Sollte in dem Format Joe Bloggs <jbloggs@foo.com> sein und ist
+typischerweise die Person, die das Paket erstellt hat, im Gegensatz zum
+Autor der Software, die paketiert wurde.
+.TP 
+\fBDescription:\fP\fI Kurzbeschreibung\fP
+\fB \fP\fILangbeschreibung\fP
+.br
+Das Format der Paketbeschreibung ist eine kurze knappe Zusammenfassung auf
+der ersten Zeile (nach dem Description\-Feld). Die folgenden Zeilen sollten
+als lngere, detailliertere Beschreibung verwendet werden. Jede Zeile der
+Langbeschreibung muss von einem Leerzeichen begonnen werden, und Leerzeilen
+in der Langbeschreibung mssen einen einzelnen . hinter dem einleitenden
+Leerzeichen enthalten.
+.
+.SH "OPTIONALE FELDER"
+.TP 
+\fBSection:\fP\fI Bereich\fP
+Dies ist ein allgemeines Feld, das dem Paket eine Kategorie gibt, basierend
+auf der Software, die es installiert. Einige bliche Bereiche sind utils,
+net, mail, text, x11 usw.
+.TP 
+\fBPriority:\fP\fI Prioritt\fP
+Setzt die Bedeutung dieses Pakets in Bezug zu dem Gesamtsystem. bliche
+Prioritten sind required, standard, optional, extra usw.
+.LP
+In Debian haben die \fBSection\fP\- und \fBPriority\fP\-Felder einen definierten
+Satz an akzeptierten Werten, basierend auf dem Richtlinien\-Handbuch. Eine
+Liste dieser Werte kann aus der neusten Version des Pakets \fBdebian\-policy\fP
+erhalten werden.
+.TP 
+\fBEssential:\fP \fByes\fP|\fBno\fP
+Dieses Feld wird normalerweise nur bentigt, wenn die Antwort \fByes\fP
+lautet. Es bezeichnet ein Paket, das fr den ordnungsgemen Betrieb des
+Systems bentigt wird. Dpkg oder jedes andere Installationswerkzeug wird es
+nicht erlauben, ein \fBEssential\fP\-Paket zu entfernen (zumindestens nicht ohne
+die Verwendung einer der force\-Optionen).
+.TP 
+\fBArchitecture:\fP \fIarch\fP|\fBall\fP
+Die Architektur spezifiziert den Hardwaretyp fr den dieses Paket kompiliert
+wurde. Gelufige Architekturen sind i386, m68k, sparc, alpha,
+powerpc usw. Beachten Sie, dass die Option \fBall\fP fr Pakete gedacht ist,
+die Architektur\-unabhngig sind. Einige Beispiele hierfr sind Shell\- und
+Perl\-Skripte und Dokumentation.
+.TP 
+\fBOrigin:\fP\fI Name\fP
+Der Name der Distribution, aus der dieses Paket ursprnglich stammt.
+.TP 
+\fBBugs:\fP\fI URL\fP
+Die \fIURL\fP der Fehlerdatenbank fr dieses Paket. Das derzeit verwendete
+Format ist \fIBTS\-Art\fP\fB://\fP\fIBTS\-Adresse\fP wie in
+\fBdebbugs://bugs.debian.org\fP.
+.TP 
+\fBHomepage:\fP\fI URL\fP
+Die \fIURL\fP des Original\- (Upstream\-)Projekts.
+.TP 
+\fBTag:\fP \fI Liste\-von\-Markierungen\fP
+Liste der untersttzten Markierungen (Tags), die die Eigenschaften des
+Pakets beschreiben. Die Beschreibung und die Liste der untersttzten
+Markierungen kann in dem Paket \fBdebtags\fP gefunden werden.
+.TP 
+\fBMulti\-Arch:\fP \fBsame\fP|\fBforeign\fP|\fBallowed\fP
+Das Feld wird dazu verwandt, anzugeben, wie sich dieses Paket in einer
+Multi\-Arch\-Installation verhalten soll. Der Wert \fBsame\fP bedeutet, dass das
+Paket mit sich selbst koinstallierbar ist, aber nicht dazu verwandt werden
+darf, die Abhngigkeit eines Pakets von einer anderen Architektur mit ihm
+selbst zu erfllen. Der Wert \fBforeign\fP bedeutet, dass das Paket nicht mit
+sich selbst koinstallierbar ist, aber es erlaubt sein soll, die Abhngigkeit
+eines Pakets von einer anderen Architektur mit ihm selbst zu erfllen. Der
+Wert \fBallowed\fP erlaubt es invers Abhngigen in ihrem Feld Depends
+anzuzeigen, dass sie ein Paket von einer fremden Architektur bentigen, hat
+aber ansonsten keinen Effekt. Dieses Feld sollte in Paketen mit dem Feld
+\fBArchitecture: all\fP nicht verwandt werden.
+.TP 
+\fBSource:\fP \fI Quell\-Name\fP
+Der Name des Quellpakets, aus dem dieses Binrpaket abstammt, falls es sich
+vom Namen dieses Paketes unterscheidet.
+
+.TP 
+.PD 0
+\fBSubarchitecture:\fP \fI Wert\fP
+.TP 
+.PD 0
+\fBKernel\-Version:\fP \fI Wert\fP
+.TP 
+.PD
+\fBInstaller\-Menu\-Item:\fP \fI Wert\fP
+Diese Felder werden im Debian\-Installer verwandt und werden normalerweise
+nicht bentigt. Lesen Sie /usr/share/doc/debian\-installer/devel/modules.txt
+aus dem Paket \fBdebian\-installer\fP fr weitere Informationen ber sie.
+
+.TP 
+\fBDepends:\fP \fI Paketliste\fP
+Liste von Paketen, die bentigt werden, damit dieses Paket eine
+nicht\-triviale Menge an Funktionen anbieten kann. Die
+Paketverwaltungssoftware wird es nicht erlauben, dass ein Paket installiert
+wird, falls die in seinem \fBDepends\fP\-Feld aufgefhrten Pakete nicht
+installiert sind (zumindestens nicht ohne Verwendung der
+Force\-Optionen). Bei einer Installation werden Postinst\-Skripte von
+Paketen, die im Feld Depends: aufgefhrt sind, vor den Postinst\-Skripten
+der eigentlichen Pakete ausgefhrt. Bei der gegenteiligen Operation, der
+Paket\-Entfernung, wird das Prerm\-Skript eines Paketes vor den Prerm\-Skripten
+der Pakete ausgefhrt, die im Feld Depends: aufgefhrt sind.
+.TP 
+\fBPre\-Depends:\fP \fI Paketliste\fP
+Liste an Paketen die installiert \fBund\fP konfiguriert sein mssen, bevor
+dieses Paket installiert werden kann. Dies wird normalerweise in dem Fall
+verwendet, wo dieses Paket ein anderes Paket zum Ausfhren seines
+preinst\-Skriptes bentigt.
+.TP 
+\fBRecommends:\fP \fI Paketliste\fP
+Liste an Paketen, die in allen, abgesehen von ungewhnlichen, Installationen
+zusammen angefunden wrden. Die Paketverwaltungssoftware wird den Benutzer
+warnen, falls er ein Paket ohne die im \fBRecommends\fP\-Feld aufgefhrten
+Pakete installiert.
+.TP 
+\fBSuggests:\fP \fI Paketliste\fP
+Liste an Paketen die einen Bezug zu diesem haben und vielleicht seine
+Ntzlichkeit erweitern knnten, aber ohne die das zu installierende Paket
+perfekt sinnvoll ist.
+.LP
+Die Syntax der \fBDepends\fP, \fBPre\-Depends\fP, \fBRecommends\fP und
+\fBSuggests\fP\-Felder ist eine Liste von Gruppen von alternativen Paketen. Jede
+Gruppe ist eine Liste von durch vertikale Striche (oder Pipe\-Symbole) |
+getrennte Pakete. Die Gruppen werden durch Kommata getrennt. Kommata mssen
+als UND, vertikale Striche als ODER gelesen werden, wobei die vertikalen
+Striche strker binden. Jeder Paketname wird optional gefolgt von einer
+Versionsnummer\-Spezifikation in Klammern.
+.LP
+Eine Versionsnummer kann mit >> beginnen, in diesem Falle passen
+alle neueren Versionen, und kann die Debian\-Paketrevision (getrennt durch
+einen Bindestrich) enthalten oder auch nicht. Akzeptierte
+Versionsbeziehungen sind >> fr grer als, << fr
+kleiner als, >= fr grer als oder identisch zu, <= fr kleiner
+als oder identisch zu und = fr identisch zu.
+.TP 
+\fBBreaks:\fP \fI Paketliste\fP
+Liste Paketen auf, die von diesem Paket beschdigt werden, zum Beispiel in
+dem sie Fehler zugnglich machen, wenn sich das andere Paket auf dieses
+Paket verlsst. Die Paketverwaltungssoftware wird es beschdigten Paketen
+nicht erlauben, sich zu konfigurieren; im Allgemeinen wird das Problem
+behoben, indem ein Upgrade des im \fBBreaks\fP\-Feld aufgefhrten Pakets
+durchgefhrt wird.
+.TP 
+\fBConflicts:\fP \fI Paketliste\fP
+Liste an Paketen, die mit diesem in Konflikt stehen, beispielsweise indem
+beide Dateien den gleichen Namen enthalten. Die Paketverwaltungssoftware
+wird es nicht erlauben, Pakete, die in Konflikt stehen, gleichzeitig zu
+installieren. Zwei in Konflikt stehende Pakete sollten jeweils eine
+\fBConflicts\fP\-Zeile enthalten, die das andere Paket erwhnen.
+.TP 
+\fBReplaces:\fP \fIPaketliste\fP
+Liste an Paketen, von denen dieses Dateien ersetzt. Dies wird dazu
+verwendet, um diesem Paket zu erlauben, Dateien von einem anderen Paket zu
+ersetzen und wird gewhnlich mit dem \fBConflicts\fP\-Feld verwendet, um die
+Entfernung des anderen Paketes zu erlauben, falls dieses auch die gleichen
+Dateien wie das im Konflikt stehende Paket hat.
+.TP 
+\fBProvides:\fP \fI Paketliste\fP
+Dies ist eine Liste von virtuellen Paketen, die dieses Paket
+bereitstellt. Gewhnlich wird dies verwendet, wenn mehrere Pakete alle den
+gleichen Dienst bereitstellen. Beispielsweise knnen Sendmail und Exim als
+Mailserver dienen, daher stellen sie ein gemeinsames Paket
+(mail\-transport\-agent) bereit, von dem andere Pakete abhngen knnen. Dies
+erlaubt es Sendmail oder Exim als gltige Optionen zur Erfllung der
+Abhngigkeit zu dienen. Dies verhindert, dass Pakete, die von einem
+E\-Mail\-Server abhngen, alle Paketnamen fr alle E\-Mail\-Server wissen und
+| zur Unterteilung der Liste verwenden mssen.
+.LP
+Die Syntax von \fBBreaks\fP, \fBConflicts\fP, \fBReplaces\fP und \fBProvides\fP ist eine
+Liste von Paketnamen, getrennt durch Kommata (und optionalen
+Leerzeichen). Im \fBBreaks\fP\- und \fBConflicts\fP\-Feld sollte das Komma als
+ODER gelesen werden. Eine optionale Version kann auch mit der gleichen
+Syntax wie oben fr die \fBBreaks\fP\-, \fBConflicts\fP\- und \fBReplaces\fP\-Felder
+angegeben werden.
+.
+.TP 
+\fBBuilt\-Using:\fP \fI Paketliste\fP
+Dieses Feld fhrt zustzliche Quellpakete auf, die whrend des Baus des
+Binrpakets verwandt wurden. Dies dient als Hinweis fr die
+Archivverwaltungssoftware, dass zustzliche Quellpakete vorhanden bleiben
+mssen, whrend dieses Binrpaket betreut wird. Dieses Feld muss eine Liste
+von Quellpaketnamen enthalten, bei denen eine strenge Versionsbeziehung (=)
+angegeben ist. Beachten Sie, dass die Archivverwaltungssoftware
+wahrscheinlich einen Upload ablehnen wird, bei dem eine
+\fBBuilt\-Using\fP\-Beziehung angegeben wurde, die innerhalb des Archivs nicht
+erfllt werden kann.
+.
+.SH BEISPIEL
+.\" .RS
+.nf
+# Comment
+Package: grep
+Essential: yes
+Priority: required
+Section: base
+Maintainer: Wichert Akkerman <wakkerma@debian.org>
+Architecture: sparc
+Version: 2.4\-1
+Pre\-Depends: libc6 (>= 2.0.105)
+Provides: rgrep
+Conflicts: rgrep
+Description: GNU grep, egrep und fgrep.
+ Die GNU\-Familie der Grep\-Werkzeuge knnte die schnellste im Westen sein.
+ GNU Grep basiert auf einem schellen lazy\-state deterministic matcher
+ (rund zweimal so schnell wie der standardmige Unix\-Egrep) hybridisiert
+ mit einer Boyer\-Moore\-Gosper\-Suche fr eine feste Zeichenkette, die
+ unmglichen Text von der Betrachtung durch den vollen Matcher verhindert
+ ohne notwendigerweise jedes Zeichen anzuschauen. Das Ergebnis ist
+ typischerweise um ein mehrfaches Schneller als Unix Grep oder Egrep.
+ (Regulre Ausdrcke, die Rckreferenzierungen enthalten, werden allerdings
+ langsamer laufen.)
+.fi
+.\" .RE
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdeb\fP(5), \fBdeb\-version\fP(5), \fBdebtags\fP(1), \fBdpkg\fP(1), \fBdpkg\-deb\fP(1).
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/deb-extra-override.5 /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-extra-override.5
--- dpkg/man/de/deb-extra-override.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-extra-override.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,44 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-extra\-override 5 2009\-08\-16 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+deb\-extra\-override \- Debian\-Archive Zusatz\-override\-Datei
+.
+.SH BERSICHT
+override
+.
+.SH BESCHREIBUNG
+Whrend der Groteil der Informationen ber ein binres oder Quellpaket in
+der Datei control/.dsc gefunden werden kann, kann alles davon berschrieben
+werden, wenn es in die Dateien Packages/Sources exportiert wird. Die
+Zusatz\-override\-Datei enthlt diese berschreibungen (engl. overrides).
+.PP
+Die Zusatz\-override\-Datei hat ein einfaches, durch Leerzeichen getrenntes
+Format. Kommentare sind erlaubt (angezeigt durch ein \fB#\fP).
+.PP
+.in +5
+\fIPaket\fP \fIFeldname\fP \fIWert\fP
+.in -5
+.PP
+\fIPaket\fP ist der Name des Binr\-/Quellpakets.
+.PP
+\fIFeldname\fP ist der Name des Feldes, das berschrieben wird. \fIWert\fP ist der
+in das Feld zu setzende Wert. Er kann Leerzeichen enthalten, da die Zeile in
+nicht mehr als drei Spalten aufgeteilt wird, wenn sie ausgewertet wird.
+.PP
+Die Zusatz\-override\-Dateien, die fr die Erstellung der offiziellen
+Paketliste verwendet werden, knnen im \fIindices\fP\-Verzeichnis auf jedem
+Debian\-Spiegel gefunden werden.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\-scanpackages\fP(1), \fBdpkg\-scansources\fP(1), \fBapt\-ftparchive\fP(1).
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/deb-old.5 /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-old.5
--- dpkg/man/de/deb-old.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-old.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,54 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-old 5 2011\-08\-14 Debian\-Projekt Debian
+.SH NAME
+deb\-old \- Debian Binrpaketformat in alter Ausfhrung
+.
+.SH BERSICHT
+\fIDateiname\fP\fB.deb\fP
+.
+.SH BESCHREIBUNG
+Das \fB.deb\fP\-Format ist das Debian Binrpaketdateiformat. Diese Handbuchseite
+beschreibt das \fBalte\fP Format, das vor Debian 0.93 verwendet wurde. Bitte
+lesen Sie \fBdeb\fP(5) fr Details ber das neue Format.
+.
+.SH FORMAT
+Die Datei besteht aus zwei Zeilen an Formatinformationen als ASCII\-Text,
+gefolgt von zwei aneinandergehngten ustar\-Dateien.
+.PP
+Die erste Zeile ist die Formatversionsnummer, aufgefllt auf 8 Stellen, und
+ist \fB0.939000\fP fr alle Archive im alten Format.
+.PP
+Die zweite Zeile ist eine dezimale Zeichenkette (ohne fhrende Nullen), die
+die Lnge der ersten gzippten Tar\-Datei angibt.
+.PP
+Jede dieser Zeilen wird durch ein einzelnes Zeilenvorschubzeichen
+abgeschlossen.
+.PP
+Die erste Tar\-Datei enthlt die Steuerinformationen als eine Serie von
+normalen Dateien. Die Datei \fBcontrol\fP muss vorhanden sein, da sie die
+Kern\-Steuerinformationen enthlt.
+.PP
+In einigen sehr alten Archiven knnen die Dateien in der Steuer\-Tar\-Datei
+optional in einem \fBDEBIAN\fP\-Unterverzeichnis sein. In diesem Fall ist das
+\fBDEBIAN\fP\-Unterverzeichnis auch in der Steuer\-Tar\-Datei, und die
+Steuer\-Tar\-Datei hat nur Dateien in diesem Verzeichnis. Optional kann die
+Steuer\-Tar\-Datei einen Eintrag fr \fB.\fP enthalten, d.h. fr das aktuelle
+Verzeichnis.
+.PP
+Die zweite gzippte Tar\-Datei ist das Dateisystemarchiv, das Pfadnamen
+relativ zum Wurzelverzeichnis des System, auf dem installiert werden soll,
+enthlt. Die Pfadnamen haben keine fhrenden Schrgstriche.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdeb\fP(5), \fBdpkg\-deb\fP(1), \fBdeb\-control\fP(5).
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/deb-override.5 /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-override.5
--- dpkg/man/de/deb-override.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-override.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,64 @@
+.\" This manpage is copyright (C) 1996 Michael Shields <shields@crosslink.net>.
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-override 5 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+deb\-override \- Debian\-Archive override\-Datei
+.
+.SH BERSICHT
+override
+.
+.SH BESCHREIBUNG
+Whrend der Groteil der Informationen ber ein Paket in der Steuerdatei
+gefunden werden kann, wird ein Teil von den Distributionszaren zentral statt
+von den Betreuern verwaltet, um eine gewisse globael Konsistenz zu
+bieten. Diese Informationen finden sich in der override\-Datei.
+.PP
+Die override\-Datei hat ein einfaches, durch Leerzeichen getrenntes
+Format. Kommentare sind erlaubt (angezeigt durch ein \fB#\fP).
+.PP
+.in +5
+\fIPaket\fP \fIPrioritt\fP \fIBereich\fP [\fIBetreuerinformation\fP]
+.in -5
+.PP
+\fIPaket\fP ist der Name des Pakets. Eintrge in der override\-Datei fr Pakete,
+die nicht im Baum von Binrpaketen gefunden werden knnen, werden ignoriert.
+.PP
+\fIPrioritt\fP und \fIBereich\fP entsprechen den Feldern \fIpriority\fP und
+\fIsection\fP der Steuerdatei in dem .deb. Die erlaubten Werte werden in den
+Debian\-Richtlinien (\fIDebian policy\fP) aufgefhrt.
+.PP
+\fIBetreuerinformation\fP kann, falls vorhanden, entweder der Name des
+Betreuers fr ein bedingungsloses berschreiben, oder ansonsten
+\fIAlterBetreuer\fP \fB=>\fP \fINeuerBetreuer\fP um eine Ersetzung durchzufhren,
+sein.
+.PP
+Die override\-Dateien, die fr die Erstellung der offiziellen Paketliste
+verwendet werden, knnen im \fIindices\fP\-Verzeichnis auf jedem Debian\-Spiegel
+gefunden werden.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\-scanpackages\fP(1), \fBdpkg\-scansources\fP(1), \fBapt\-ftparchive\fP(1),
+\fB/usr/share/doc/debian\-policy/policy.html/index.html\fP.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/deb-shlibs.5 /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-shlibs.5
--- dpkg/man/de/deb-shlibs.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-shlibs.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,63 @@
+.\" Copyright © 1996 Michael Shields <shields@crosslink.net>
+.\" Copyright © 2008 Zack Weinberg <zackw@panix.com>
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-shlibs 5 2008\-02\-17 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+deb\-shlibs \- Debians Informationsdatei fr Laufzeitbibliotheken
+.
+.SH BESCHREIBUNG
+.PP
+\fBshlibs\fP\-Dateien bilden Laufzeitbibliotheknamen und \-versionen (\fIsonames\fP)
+auf Abhngigkeiten ab, die fr eine Paketsteuerdatei geeignet sind. Es gibt
+einen Eintrag pro Zeile. Leerzeilen sind \fBnicht\fP erlaubt. Zeilen, die mit
+\fB#\fP beginnen, werden als Kommentarzeilen betrachtet und ignoriert. Alle
+anderen Zeilen mssen dem nachfolgenden Format folgen:
+.IP
+[\fITyp\fP\fB:\fP] \fIBibliothek\fP \fIVersion\fP \fIAbhngigkeiten\fP
+.PP
+Die Felder \fIBibliothek\fP und \fIVersion\fP werden durch Leerzeichen begrenzt,
+das Feld \fIAbhngigkeiten\fP geht aber bis zum Ende der Zeile. Das Feld \fITyp\fP
+ist optional und wird normalerweise nicht bentigt.
+.PP
+Lesen Sie das Debian\-Richtlinienhandbuch (Debian Policy Manual) fr weitere
+Details.
+.
+.SH BEISPIELE
+.PP
+Die \fBshlibs\fP\-Datei fr ein typisches Bibliothekspaket namens \fIlibcrunch1\fP,
+das eine Bibliothek mit dem Sonamen \fIlibcrunch.so.1\fP bereitstellt, knnte
+wie folgt lauten:
+.IP
+libcrunch 1 libcrunch1 (>= 1.2\-1)
+.PP
+\fIAbhngigkeiten\fP muss die neuste Version des Pakets erwhnen, das neuen
+Symbole zu der Bibliothek hinzugefgt hat: im obigen Beispiel wurden neue
+Symbole zu Version 1.2 von \fIlibcrunch\fP hinzugefgt. Dies ist nicht der
+einzige Grund, dass Abhngigkeiten enger gefasst werden mssen; auch hier
+gilt: Lesen Sie das Debian\-Richtlinienhandbuch fr Details.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\-shlibdeps\fP(1), \fBdeb\-symbols\fP(5).
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/deb-split.5 /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-split.5
--- dpkg/man/de/deb-split.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-split.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,66 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-split 5 2011\-07\-04 Debian\-Projekt Debian
+.SH NAME
+deb\-split \- mehrteiliges Debian\-Binrpaketformat
+.SH BERSICHT
+\fIDateiname\fP\fB.deb\fP
+.SH BESCHREIBUNG
+Das mehrteilige \fB.deb\fP\-Format wird zum Aufteilen von groen Paketen in
+kleinere Stcke zur Erleichterung des Transports auf kleinen Medien
+verwandt.
+.SH FORMAT
+Die Datei ist ein \fBar\fP\-Archiv mit einer magischen Zahl von
+\fB!<arch>\fP. Der Dateiname kann (seit Dpkg 1.15.6) mit einem
+Schrgstrich abschlieen.
+.PP
+Das erste Mitglied heit \fBdebian\-split\fP und enthlt eine Reihe von Zeilen,
+getrennt durch Leerzeilen. Derzeit sind acht Zeilen vorhanden:
+.IP \(bu 4
+Die Formatversionsnummer, zum Zeitpunkt der Erstellung dieser Handbuchseite
+lautet sie \fB2.1\fP.
+.IP \(bu
+Der Paketname.
+.IP \(bu
+Die Paketversion.
+.IP \(bu
+Die Md5sum des Pakets.
+.IP \(bu
+Die Gesamtgre des Pakets.
+.IP \(bu
+Die maximale Teilegre
+.IP \(bu
+Die aktuelle Teilenummer, gefolgt von einem Schrgstrich und der
+Gesamtanzahl an Teilen (wie in \(oq1/10\(cq).
+.IP \(bu
+Die Paketarchitektur (seit Dpkg 1.16.1).
+.PP
+Programme, die mehrteilige Archive lesen, sollten darauf vorbereitet sein,
+dass zustzliche Zeilen vorhanden sein knnen, und sollten diese ignorieren,
+falls dies der Fall ist.
+.PP
+Falls sich die Versionsnummer gendert hat, wurde eine inkompatible nderung
+durchgefhrt und das Programm sollte sich beenden. Falls dies nicht der Fall
+ist, dann sollte das Programm sicher fortfahren knnen, es sei denn, ein
+unerwartetes Mitglied ist im Archiv (abgesehen vom Ende) gefunden worden,
+wie unten beschrieben.
+.PP
+Das zweite, letzte bentigte Mitglied heit \fBdata.\fP\fIN\fP, wobei \fIN\fP die
+Teilnummer angibt. Es enthlt die rohen Daten des Teils.
+.PP
+Diese Mitglieder mssen in genau dieser Reihenfolge auftauchen. Aktuelle
+Implementationen sollten zustzliche Mitglieder nach \fBdata.\fP\fIN\fP
+ignorieren. Weitere Mitglieder knnten in der Zukunft definiert werden und
+werden (falls mglich) nach diesen drei platziert.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdeb\fP(5), \fBdpkg\-split\fP(1).
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/deb-src-control.5 /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-src-control.5
--- dpkg/man/de/deb-src-control.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-src-control.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,318 @@
+.\" Author: Oxan van Leeuwen
+.\" Includes text from the deb-control manual page by Raul Miller
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-src\-control 5 2011\-08\-14 Debian\-Projekt Debian
+.SH NAME
+deb\-src\-control \- Dateiformat der Hauptsteuerdatei von Debian\-Quellpaketen
+.
+.SH BERSICHT
+control
+.
+.SH BESCHREIBUNG
+Jedes Debian\-Quellpaket enhlt die Hauptsteuerdatei control, die
+mindestens zwei Abstze enthlt, die durch eine Leerzeile getrennt
+werden. Der erste Absatz fhrt alle allgemeinen Informationen ber das
+Quellpaket auf, whrend jeder folgende Absatz genau ein Binrpaket
+beschreibt. Jeder Absatz besteht aus mindestens einem Feld. Ein Feld beginnt
+mit einem Feldnamen, wie \fBPackage\fP oder \fBSection\fP (Gro\-/Kleinschreibung
+egal), gefolgt von einem Doppelpunkt, dem Inhalt des Feldes und einem
+Zeilenumbruch. Mehrzeilige Felder sind auch erlaubt, aber jede ergnzende
+Zeile ohne Feldnamen sollte mit mindestens einem Leerzeichen beginnen. Der
+Inhalt des mehrzeiligen Feldes wird durch die Werkzeuge im Allgemeinen zu
+einer Zeile zusammengefhrt (das Feld \fBDescription\fP ist eine Ausnahme,
+siehe unten). Um Leerzeilen in ein mehrzeiliges Feld einzufgen, verwenden
+Sie einen Satzpunkt nach dem Leerzeichen. Zeilen, die mit \fB#\fP beginnen,
+werden als Kommentare betrachtet.
+.
+.SH QUELLPAKET\-FELDER
+.TP 
+\fBSource:\fP \fIQuellpaketname\fP (verpflichtend)
+Der Wert dieses Feldes ist der Name des Quellpakets und sollte mit dem Namen
+des Quellpakets in der Datei debian/changelog bereinstimmen. Ein Paketname
+darf nur aus Kleinbuchstaben (a\-z), Ziffern (0\-9), Plus\- (+) und
+Minuszeichen (\-) und Satzpunkten (.) bestehen. Paketnamen mssen mindestens
+zwei Zeichen lang sein und mit einem alphanumerischen Zeichen beginnen.
+
+.TP 
+\fBMaintainer:\fP \fIVollstndiger\-Name\-und\-E\-Mail\fP (verpflichtend)
+Sollte in dem Format Joe Bloggs <jbloggs@foo.com> sein und
+verweist auf die Person, die derzeit das Paket betreut, im Gegensatz zum
+Autor der Software, die paketiert wurde, oder dem ursprnglichen Paketierer.
+
+.TP 
+\fBUploaders:\fP\fI Vollstndiger\-Name\-und\-E\-Mail\fP
+Listet die Namen und E\-Mail\-Adressen der Ko\-Betreuer des Pakets auf, im
+gleichen Format wie das Feld Maintainer. Mehrere Ko\-Betreuer sollten durch
+Kommata getrennt werden.
+
+.TP 
+\fBStandards\-Version:\fP \fI Versionszeichenkette\fP
+Dies dokumentiert die neuste Version der Standards (die aus dem
+Debian\-Richtlinienhandbuch und den aus dem Paket \fBdebian\-policy\fP
+referenzierten Texten besteht), an den sich das Paket hlt.
+
+.TP 
+\fBDM\-Upload\-Allowed:\fP \fByes\fP|\fBno\fP
+Dieses Feld gibt an, ob das Paket von einem Debian\-Betreuer, der im Feld
+Maintainer oder Uploader auftaucht, hochgeladen werden kann. Der
+Standardwert ist no (nein).
+
+.TP 
+\fBHomepage:\fP\fI URL\fP
+Die URL des Original\- (Upstream\-)Projekts.
+
+.TP 
+\fBBugs:\fP\fI URL\fP
+Die \fIURL\fP der Fehlerdatenbank fr dieses Paket. Das derzeit verwendete
+Format ist \fIBTS\-Art\fP\fB://\fP\fIBTS\-Adresse\fP wie in
+\fBdebbugs://bugs.debian.org\fP. Dieses Feld wird normalerweise nicht bentigt.
+
+.TP 
+\fBVcs\-*:\fP \fI URL\fP
+Die \fIURL\fP des Versionskontrollsystem\-Depots, das fr die Betreuung des
+Pakets verwandt wird. Derzeit werden \fBArch\fP, \fBBzr\fP (Bazaar), \fBCvs\fP,
+\fBDarcs\fP, \fBGit\fP, \fBHg\fP (Mercurial), \fBMtn\fP (Monotone) und \fBSvn\fP
+(Subversion) untersttzt. Normalerweise zeigt dieses Feld auf die neuste
+Version des Pakets, wie den Hauptzweig oder den Trunk.
+
+.TP 
+\fBVcs\-Browser:\fP \fI URL\fP
+Die \fIURL\fP der Webschnittstelle, um das Versionskontrollsystem\-Depot
+anzuschauen.
+
+.TP 
+\fBOrigin:\fP\fI Name\fP
+Der Name der Distribution, aus der dieses Paket ursprnglich stammt. Dieses
+Feld wird normalerweise nicht bentigt.
+
+.TP 
+\fBSection:\fP\fI Bereich\fP
+Dies ist ein allgemeines Feld, das dem Paket eine Kategorie gibt, basierend
+auf der Software, die es installiert. Einige bliche Bereiche sind utils,
+net, mail, text, x11 usw.
+
+.TP 
+\fBPriority:\fP\fI Prioritt\fP
+Setzt die Bedeutung dieses Pakets in Bezug zu dem Gesamtsystem. bliche
+Prioritten sind required, standard, optional, extra usw.
+
+In Debian haben die \fBSection\fP\- und \fBPriority\fP\-Felder einen definierten
+Satz an akzeptierten Werten, basierend auf dem Richtlinien\-Handbuch. Eine
+Liste dieser Werte kann aus der neusten Version des Pakets \fBdebian\-policy\fP
+erhalten werden.
+
+.TP 
+\fBBuild\-Depends:\fP \fI Paketliste\fP
+Eine Liste der Pakete, die installiert und konfiguriert sein mssen, um das
+Quellpaket zu bauen.
+
+.TP 
+\fBBuild\-Depends\-Indep:\fP \fI Paketliste\fP
+Identisch zu \fBBuild\-Depends\fP, wird aber nur zum Bau der
+architekturunabhngigen Pakete bentigt. In diesem Fall sind die
+\fBBuild\-Depends\fP auch installiert.
+
+.TP 
+\fBBuild\-Conflicts:\fP \fI Paketliste\fP
+Eine Liste von Paketen, die beim Bau des Pakets nicht installiert sein
+sollten, beispielsweise da sie mit dem verwandten Bausystem in Konflikt
+geraten.
+
+.TP 
+\fBBuild\-Conflicts\-Indep:\fP \fI Paketliste\fP
+Identisch zu \fBBuild\-Conflicts\fP, wird aber nur zum Bau der
+architekturunabhngigen Pakete bentigt.
+
+Die Syntax der Felder \fBBuild\-Depends\fP und \fBBuild\-Depends\-Indep\fP ist eine
+Liste von Gruppen von alternativen Paketen. Jede Gruppe ist eine Liste von
+durch vertikale Striche (oder Pipe\-Symbole) | getrennte Pakete. Die
+Gruppen werden durch Kommata getrennt. Kommata mssen als UND, vertikale
+Striche als ODER gelesen werden, wobei die vertikalen Striche strker
+binden. Jeder Paketname wird optional gefolgt von einer
+Versionsnummer\-Spezifikation in Klammern und einer Architekturspezifikation
+in eckigen Klammern.
+
+Syntaxtisch werden die Felder \fBBuild\-Conflicts\fP und
+\fBBuild\-Conflicts\-Indep\fP durch eine Komma\-separierte Liste von Paketnamen
+dargestellt, wobei das Komma als UND verstanden wird. Die Angabe
+alternativer Pakete mit dem Pipe\-Symbol wird nicht untersttzt. Jedem
+Paketnamen folgt optional eine Versionnummerangabe in Klammern und eine
+Architekturspezifikation in eckigen Klammern.
+
+Eine Versionsnummer kann mit >> beginnen, in diesem Falle passen
+alle neueren Versionen, und kann die Debian\-Paketrevision (getrennt durch
+einen Bindestrich) enthalten oder auch nicht. Akzeptierte
+Versionsbeziehungen sind >> fr grer als, << fr
+kleiner als, >= fr grer als oder identisch zu, <= fr kleiner
+als oder identisch zu und = fr identisch zu.
+
+Eine Architekturspezifikation besteht aus einer oder mehreren durch
+Leerzeichen getrennten Architekturnamen. Jedem Namen darf ein Ausrufezeichen
+vorangestellt werden, das NICHT bedeutet.
+
+Beachten Sie, dass die Abhngigkeiten von Paketen aus der Menge der
+\fBbuild\-essential\fP entfallen kann und die Angabe von Baukonflikten gegen sie
+nicht mglich ist. Eine Liste dieser Pakete befindet sich im Paket
+build\-essential.
+
+
+.SH BINRPAKET\-FELDER
+
+.LP
+Beachten Sie, dass die Felder \fBPriority\fP, \fBSection\fP und \fBHomepage\fP sich
+auch im Binrprogrammabsatz befinden knnen, um die globalen Werte des
+Quellpakets zu berschreiben.
+
+.TP 
+\fBPackage:\fP \fIBinrpaketname\fP (verpflichtend)
+Dieses Feld wird zur Angabe des Binrpaketnamens verwandt. Es gelten die
+gleichen Einschrnkungen wie beim Quellpaketnamen.
+
+.TP 
+\fBArchitecture:\fP \fIarch\fP|\fBall\fP|\fBany\fP (verpflichtend)
+Die Architektur gibt an, auf welcher Art von Hardware dieses Paket
+luft. Bei Paketen, die auf allen Architekturen laufen, verwenden Sie den
+Wert \fBany\fP. Fr Pakete, die architekturunabhngig sind, wie Shell\- und
+Perl\-Skripte oder Dokumentation, verwenden Sie den Wert \fBall\fP. Um das Paket
+fr einen bestimmten Satz von Architekturen zu begrenzen, geben Sie die
+durch Leerzeichen getrennten Namen der Architekturen an. Es ist auch
+mglich, Platzhalter fr Architekturen in dieser Liste anzugeben (lesen Sie
+\fBdpkg\-architecture\fP(1) fr weitere Informationen dazu).
+
+.TP 
+\fBPackage\-Type:\fP \fBdeb\fP|\fBudeb\fP
+Dieses Feld definiert die Art des Pakets. udeb ist fr grenbegrenzte
+Pakete, wie sie vom Debian\-Installer verwandt werden. deb ist der
+Standardwert, er wird angenommen, falls das Feld fehlt. Weitere Typen
+knnten in der Zukunft hinzugefgt werden.
+
+.TP 
+.PD 0
+\fBSubarchitecture:\fP \fI Wert\fP
+.TP 
+.PD 0
+\fBKernel\-Version:\fP \fI Wert\fP
+.TP 
+.PD 0
+\fBInstaller\-Menu\-Item:\fP \fI Wert\fP
+Diese Felder werden im Debian\-Installer verwandt und werden normalerweise
+nicht bentigt. Lesen Sie /usr/share/doc/debian\-installer/devel/modules.txt
+aus dem Paket \fBdebian\-installer\fP fr weitere Informationen ber sie.
+
+.TP 
+.PD 0
+\fBEssential:\fP \fByes\fP|\fBno\fP
+.TP 
+.PD 0
+\fBMulti\-Arch:\fP \fBsame\fP|\fBforeign\fP|\fBallowed\fP
+.TP 
+.PD 0
+\fBTag:\fP \fI Liste\-von\-Markierungen\fP
+.TP 
+.PD 0
+\fBDescription:\fP \fIKurzbeschreibung\fP (verpflichtend)
+Diese Felder sind in der Handbuchseite \fBdeb\-control\fP(5) beschrieben, da sie
+wrtlich in die Steuerdatei des Binrpakets kopiert werden.
+
+.TP 
+.PD 0
+\fBDepends:\fP \fI Paketliste\fP
+.TP 
+.PD 0
+\fBPre\-Depends:\fP \fI Paketliste\fP
+.TP 
+.PD 0
+\fBRecommends:\fP \fI Paketliste\fP
+.TP 
+.PD 0
+\fBSuggests:\fP \fI Paketliste\fP
+.TP 
+.PD 0
+\fBBreaks:\fP \fI Paketliste\fP
+.TP 
+.PD 0
+\fBEnhances:\fP \fI Paketliste\fP
+.TP 
+.PD 0
+\fBReplaces:\fP \fIPaketliste\fP
+.TP 
+.PD 0
+\fBConflicts:\fP \fI Paketliste\fP
+.TP 
+.PD 0
+\fBProvides:\fP \fI Paketliste\fP
+.TP 
+.PD 0
+\fBBuilt\-Using:\fP \fI Paketliste\fP
+.br
+Diese Felder deklarieren die Beziehungen zwischen Paketen. Sie werden in der
+Handbuchseite \fBdeb\-control\fP(5) und im Paket \fBdebian\-policy\fP beschrieben.
+
+.SH "BENUTZERDEFINIERTE FELDER"
+Es ist erlaubt, zustzliche benutzerdefinierte Felder zu der Steuerdatei
+hinzuzufgen. Die Werkzeuge werden diese Felder ignorieren. Falls Sie
+mchten, dass die Felder in die Ausgabedateien, wie z.B. die Binrpakete,
+kopiert werden, mssen Sie ein angepasstes Namensschema verwenden: Die
+Felder sollten mit einem X, gefolgt von einem oder mehr der Buchstaben BCS
+und einem Gedankenstrich beginnen. Falls der Buchstabe B benutzt wird, wird
+das Feld in der Steuerdatei des Binrpakets auftauchen, siehe
+\fBdeb\-control\fP(5), beim Buchstaben S in der Quellpaketsteuerdatei wie sie
+von \fBdpkg\-source\fP(1) erstellt wird und beim Buchstaben C in der
+hochgeladenen Datei control (.changes). Beachten Sie, dass die
+X[BCS]\-Vorsilben beim Kopieren in die Ausgabedateien entfernt werden. Ein
+Feld \fBXC\-Approved\-By\fP wird als \fBApproved\-By\fP in der Datei changes, aber
+nicht in den Steuerdateien des Quell\- und Binrpakets auftauchen.
+
+
+.SH BEISPIEL
+.\" .RS
+.nf
+# Kommentar
+Source: dpkg
+Section: admin
+Priority: required
+Maintainer: Dpkg Developers <debian\-dpkg@lists.debian.org>
+# dieses Feld wird in das Binr\- und Quellpaket kopiert
+XBS\-Upstream\-Release\-Status: stable
+Homepage: http://wiki.debian.org/Teams/Dpkg
+Vcs\-Browser: http://git.debian.org/?p=dpkg/dpkg.git
+Vcs\-Git: git://git.debian.org/git/dpkg/dpkg.git
+Standards\-Version: 3.7.3
+Build\-Depends: pkg\-config, debhelper (>= 4.1.81),
+ libselinux1\-dev (>= 1.28\-4) [!linux\-any]
+
+Package: dpkg\-dev
+Section: utils
+Priority: optional
+Architecture: all
+# dies ist ein spezielles Feld im Binrpaket
+XB\-Mentoring\-Contact: Raphael Hertzog <hertzog@debian.org>
+Depends: dpkg (>= 1.14.6), perl5, perl\-modules, cpio (>= 2.4.2\-2),
+ bzip2, lzma, patch (>= 2.2\-1), make, binutils, libtimedate\-perl
+Recommends: gcc | c\-compiler, build\-essential
+Suggests: gnupg, debian\-keyring
+Conflicts: dpkg\-cross (<< 2.0.0), devscripts (<< 2.10.26)
+Replaces: manpages\-pl (<= 20051117\-1)
+Description: Debian package development tools
+ This package provides the development tools (including dpkg\-source)
+ required to unpack, build and upload Debian source packages.
+ .
+ Most Debian source packages will require additional tools to build;
+ for example, most packages need make and the C compiler gcc.
+.fi
+
+
+.\" .RE
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdeb\-control\fP(5), \fBdeb\-version\fP(5), \fBdpkg\-source\fP(1)
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/deb-substvars.5 /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-substvars.5
--- dpkg/man/de/deb-substvars.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-substvars.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,152 @@
+.\" Authors: Ian Jackson
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-substvars 5 2009\-07\-15 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+deb\-substvars \- Substitutionsvariablen in Debian\-Quellen
+.
+.SH BERSICHT
+substvars
+.
+.SH BESCHREIBUNG
+Bevor \fBdpkg\-source\fP, \fBdpkg\-gencontrol\fP und \fBdpkg\-genchanges\fP ihre
+Steuerinformationen (zu der Quellsteuer\-Datei \fB.dsc\fP fr \fBdpkg\-source\fP und
+zu der Standardausgabe fr \fBdpkg\-gencontrol\fP und \fBdpkg\-genchanges\fP)
+schreiben, fhren sie einige Variablensubstitutionen in der Ausgabedatei
+durch.
+
+Eine Variablensubstitution hat die Form
+\fB${\fP\fIVariablenname\fP\fB}\fP. Variablennamen bestehen aus alphanumerischen
+Zeichen (womit sie auch beginnen), Gedankenstrichen und
+Doppelpunkten. Variablensubstitutionen werden wiederholt durchgefhrt, bis
+keine brig geblieben sind; der komplette Text des Feldes nach der
+Substitution wird erneut auf weitere Substitutionen geprft.
+
+Nachdem alle Substitutionen erfolgt sind, wird jedes Auftreten der
+Zeichenkette \fB${}\fP (die keine erlaubte Substitution ist) durch das
+\fB$\fP\-Zeichen ersetzt.
+
+Obwohl die Variablensubstitution bei allen Feldern der Steuerdatei
+vorgenommen wird, werden einige dieser Felder whrend des Bauens bentigt
+und verwendet, wenn die Substitution noch nicht erfolgt ist. Daher knnen
+Sie Variablen nicht in den Feldern \fBPackage\fP, \fBSource\fP und \fBArchitecture\fP
+verwenden.
+
+Variablenersetzung erfolgt am Inhalt der Felder, nachdem sie geparst
+(ausgewertet) wurden. Falls Sie eine Variable ber mehrere Zeilen
+expandieren mchten, mssen Sie nach dem Zeilenumbruch daher kein
+Leerzeichen einfgen. Dies passiert bei der Ausgabe des Feldes implizit. Ist
+beispielsweise die Variable \fB${Description}\fP auf foo ist bar.${Newline}foo
+ist super. gesetzt und Sie haben das folgende Feld:
+
+ Description: foo application
+  ${Description}
+  .
+  Weiterer Text.
+
+Dann wird dies zu Folgenden fhren:
+
+ Description: foo application
+  foo ist bar.
+  foo ist super.
+  .
+  Weiterer Text.
+
+Variablen knnen ber die allgemeine \fB\-V\fP\-Option gesetzt werden. Sie knnen
+auch in der \fBdebian/substvars\fP (bzw. in der ber die Option \fB\-T\fP gesetzten
+Datei) angegeben werden. Diese Datei besteht auch Zeilen der Form
+\fIName\fP\fB=\fP\fIWert\fP. Leerzeichen am Zeilenende, leere Zeilen und Zeilen, die
+mit dem \fB#\fP\-Symbol starten (Kommentare) werden ignoriert.
+
+Zustzlich sind die folgenden Standardvariablen verfgbar:
+.TP 
+\fBArch\fP
+Die aktuelle Bau\-Architektur (von \fBdpkg \-\-print\-architecture\fP).
+.TP 
+\fBsource:Version\fP
+Die Quellpaket\-Version.
+.TP 
+\fBsource:Upstream\-Version\fP
+Die Paketversion der Originalautoren, einschlielich der Epoche der
+Debian\-Version, falls vorhanden.
+.TP 
+\fBbinary:Version\fP
+Die Binrpaketversion (die z.B. in einem binNMU von source:Version abweichen
+kann).
+.TP 
+\fBSource\-Version\fP
+Die Quellpaketversion (aus der changelog\-Datei). Diese Variable ist jetzt
+\fBveraltet\fP, da ihre Bedeutung von ihrer Funktion abweicht, bitte verwenden
+Sie \fBsource:Version\fP oder \fBbinary:Version\fP wo zutreffend.
+.TP 
+\fBInstalled\-Size\fP
+Die Gesamtgre der vom Paket installierten Dateien. Dieser Wert wird in das
+entsprechende Feld der control\-Datei kopiert; wird es gesetzt, verndert
+es den Wert dieses Feldes. Falls diese Variable nicht gesetzt ist, wird
+\fBdpkg\-gencontrol\fP \fBdu \-k debian/tmp\fP verwenden, um den Standardwert zu
+ermitteln.
+.TP 
+\fBExtra\-Size\fP
+Zustzlicher Plattenplatz, der verwendet wird, wenn das Paket installiert
+ist. Falls diese Variable gesetzt ist, wird dieser Wert zu der
+\fBInstalled\-Size\fP\-Variablen hinzuaddiert (egal ob sie explizit gesetzt oder
+der Standardwert verwendet wird), bevor sie in das Feld \fBInstalled\-Size\fP
+der control\-Datei kopiert wird.
+.TP 
+\fBF:\fP\fIFeldname\fP
+Der Wert des Ausgabefeldes \fIFeldname\fP (der in der kanonischen
+Gro\-/Kleinschreibung angegeben werden muss). Das Setzen dieser Variablen
+hat nur einen Effekt an den Stellen, wo diese explizit expandiert werden.
+.TP 
+\fBFormat\fP
+Die Formatversion der \fB.changes\fP\-Datei, die von dieser Version der
+Quellpaketierskripte erstellt wird. Falls Sie diese Variable setzen, werden
+die Inhalte des \fBFormat\fP\-Feldes in der \fB.changes\fP\-Datei auch gendert.
+.TP 
+\fBNewline\fP, \fBSpace\fP, \fBTab\fP
+Diese Variablen enthalten das jeweils korrespondieren Zeichen
+(\fBZeilenumbruch\fP, \fBLeerzeichen\fP und \fBTabulator\fP in dieser Reihenfolge).
+.TP 
+\fBshlibs:\fP\fIdependencyfield\fP
+Variableneinstellungen mit Namen dieser Form werden von \fBdpkg\-shlibdeps\fP
+erstellt.
+.TP 
+\fBdpkg:Upstream\-Version\fP
+Die Original\- (Upstream\-)Version von Dpkg.
+.TP 
+\fBdpkg:Version\fP
+Die komplette Version von Dpkg.
+.LP
+Falls auf eine Variable Bezug genommen wird, diese aber nicht definiert ist,
+wird es eine Warnung erstellen und ein leerer Wert wird angenommen.
+.
+.SH DATEIEN
+.TP 
+\fBdebian/substvars\fP
+Liste von Substitutionsvariablen und \-werten.
+.
+.SH FEHLER
+Die Stelle, an der das berschreiben von Feldern passiert, verglichen mit
+bestimmten Standard\-Ausgabe\-Feldeinstellungen, ist eher konfus.
+
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\fP(1), \fBdpkg\-genchanges\fP(1), \fBdpkg\-gencontrol\fP(1),
+\fBdpkg\-shlibdeps\fP(1), \fBdpkg\-source\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/deb-symbols.5 /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-symbols.5
--- dpkg/man/de/deb-symbols.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-symbols.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,79 @@
+.\" Author: Raphaël Hertzog
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-symbols 5 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+deb\-symbols \- Debians erweiterte Informationsdatei von Laufzeitbibliotheken
+.
+.SH BERSICHT
+symbols
+.
+.SH BESCHREIBUNG
+Das Format eines Eintrags fr eine erweiterte Abhngigkeitsinformation einer
+Laufzeitbibliothek (shared library) lautet:
+.PP
+\fIBibliotheks\-Soname Hauptabhngigkeitsvorlage\fP
+.br
+[ | \fIalternative\-Abhngigkeitsvorlage\fP ]
+.br
+[ ... ]
+.br
+[ * \fIFeldname\fP: \fIFeldwert\fP ]
+.br
+[ ... ]
+ \fISymbol\fP \fIMinimalversion\fP[ \fIKennung\-der\-Abhngigkeitsvorlage\fP ]
+.P
+Der \fIBibliotheks\-Soname\fP ist genau der Wert des SONAME\-Feldes, wie er von
+\fBobjdump\fP(1) exportiert wird. Eine \fIAbhngigkeitsvorlage\fP ist eine
+Abhngigkeit, in der \fI#MINVER#\fP dynamisch entweder von einer
+Versionsprfung der Art (>= \fIMinimalversion\fP) oder durch nichts
+ersetzt wird, falls eine nicht\-versionierte Abhngigkeit als ausreichend
+erachtet wird.
+.P
+Jedem exportierten \fISymbol\fP (aufgefhrt als \fIName\fP@\fIVersion\fP, mit
+\fIVersion\fP als Base, falls die Bibliothek nicht versioniert ist) wird eine
+\fIMinimalversion\fP seiner Abhngigkeitsvorlage zugeordnet (die
+Hauptabhngigkeitsvorlage wird verwandt, falls die
+\fIKennung\-der\-Abhngigkeitsvorlage\fP nicht vorhanden ist). Die erste
+alternative Abhngigkeitsvorlage wird mit 1 nummeriert, die zweite mit 2
+usw.
+.P
+Jeder Eintrag fr eine Bibliothek kann auch einige Felder mit
+Metainformationen enthalten. Diese Felder werden in Zeilen gespeichert, die
+mit einem Stern beginnen. Derzeit ist \fIBuild\-Depends\-Package\fP das einzige
+gltige Feld, es gibt den Namen des \-dev\-Pakets an, das der Bibliothek
+zugeordnet ist, und wird von \fBdpkg\-shlibdeps\fP verwandt, um sicherzustellen,
+dass die erstellte Abhngigkeit mindestens genauso strikt ist wie die
+zugehrige Bau\-Abhngigkeit.
+.SH BEISPIELE
+.SS "Einfache Symboldatei"
+.PP
+libftp.so.3 libftp3 #MINVER#
+ DefaultNetbuf@Base 3.1\-1\-6
+ FtpAccess@Base 3.1\-1\-6
+ [...]
+.SS "Fortgeschrittene Symboldatei"
+.PP
+libGL.so.1 libgl1
+.br
+| libgl1\-mesa\-glx #MINVER#
+.br
+* Build\-Depends\-Package: libgl1\-mesa\-dev
+ publicGlSymbol@Base 6.3\-1
+ [...]
+ implementationSpecificSymbol@Base 6.5.2\-7 1
+ [...]
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBhttp://wiki.debian.org/Projects/ImprovedDpkgShlibdeps\fP
+.br
+\fBdpkg\-shlibdeps\fP(1), \fBdpkg\-gensymbols\fP(1).
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/deb-triggers.5 /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-triggers.5
--- dpkg/man/de/deb-triggers.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-triggers.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,77 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-triggers 5 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+deb\-triggers \- Paket\-Trigger
+.
+.SH BERSICHT
+triggers
+.
+.SH BESCHREIBUNG
+Ein Paket erklrt seine Beziehung zu einigen Trigger(n) (deutsch: Auslsern)
+indem es eine Datei \fItriggers\fP in seinem Steuerarchiv
+(d.h. \fIDEBIAN/triggers\fP whrend der Paketerstellung) hinzunimmt.
+.PP
+Diese Datei enthlt Direktiven, eine pro Zeile. Leerzeichen am Anfang und
+Ende sowie alles nach dem ersten \fB#\fP werden in jeder Zeile entfernt und
+leere Zeilen werden ignoriert.
+.PP
+Die derzeit untersttzten Steuerdirektiven fr Trigger sind:
+.PP
+.in +5
+\fBinterest\fP \fITrigger\-Name\fP
+.PP
+.in +5
+\fBinterest\-noawait\fP \fITrigger\-Name\fP
+.PP
+.in +5
+Gibt an, dass das Paket an dem benannten Trigger interessiert ist. Alle
+Trigger, an denen ein Paket interessiert ist, mssen mit dieser Direktive in
+der Trigger\-Steuerdatei aufgefhrt werden. Die Variante noawait setzt die
+triggernden Pakete nicht in den Zustand triggers\-awaited. Dies sollte
+verwandt werden, wenn die von den Triggern bereitgestellte Funktionalitt
+nicht uerst wichtig ist.
+.PP
+.in +5
+\fBactivate\fP \fITrigger\-Name\fP
+.PP
+.in +5
+\fBactivate\-noawait\fP \fITrigger\-Name\fP
+.PP
+.in +5
+Sorgt dafr, dass nderungen an dem Zustand dieses Pakets einen
+spezifizierten Trigger aktiviert. Der Trigger wird am Beginn folgender
+Operationen aktiviert: unpack, configure, remove (hinzugefgt zum Nutzen von
+Paketen, die im Konflikt zueinander stehen), purge und deconfigure. Die
+Variante noawait setzt die triggernden Pakete nicht in den Zustand
+triggers\-awaited. Dies sollte verwandt werden, wenn die von den Triggern
+bereitgestellte Funktionalitt nicht uerst wichtig ist.
+.PP
+.in +5
+Falls dieses Paket whrend des Entpackens eines anderen Pakets verschwindet,
+wird der Trigger aktiviert, wenn das Verschwinden whrend des Endes der
+unpack\-Operation bemerkt wird. Triggerverarbeitung und bergnge von
+Trigger\-erwartend auf installiert fhren nicht zu Aktivierungen. Im Falle
+von unpack werden sowohl die in der alten als auch die in der neuen Version
+des Pakets angegebenen Trigger aktiviert.
+.PP
+Unbekannte Direktiven sind ein Fehler, der die Installation eines Pakets
+verhindert.
+.PP
+Die Varianten \-noawait werden nur von Dpkg 1.16.1 oder neuer untersttzt
+und werden bei lteren Dpkg zu Fehlern fhren. Es wird daher empfohlen, ein
+Pre\-Depends: dpkg (>= 1.16.1) zu jedem Paket hinzuzufgen, dass diese
+Direktiven nutzen mchte.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\-trigger\fP(1), \fBdpkg\fP(1), \fB/usr/share/doc/dpkg\-dev/triggers.txt.gz\fP.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/deb-version.5 /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-version.5
--- dpkg/man/de/deb-version.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/deb-version.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,120 @@
+.\" Includes text from the Debian Policy probably by Ian Jackson and others
+.\" The copyright given below is that of the whole policy, but probably
+.\" incomplete.
+.\" Conversion to roff by Frank Lichtenheld
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-version 5 2011\-08\-14 Debian\-Projekt Debian
+.SH NAME
+deb\-version \- Versionsnummer\-Format von Debian\-Paketen
+.
+.SH BERSICHT
+[ \fIEpoche\fP\fB:\fP]\fIUpstream\-Version\fP[\fB\-\fP\fIDebian\-Revision\fP]
+.SH BESCHREIBUNG
+Die fr Debian Binr\- und Quellpakete verwendete Versionsnummer besteht aus
+drei Komponenten. Diese sind:
+.TP 
+\fIEpoche\fP
+Dies ist eine einzelne (typischerweise kleine) vorzeichenlose ganze
+Zahl. Sie darf entfallen, wobei dann Null angenommen wird. Falls sie
+entfllt, darf die \fIUpstream\-Version\fP keine Doppelpunkte enthalten.
+.IP
+Sie existiert, um Fehler in den Versionsnummern lterer Versionen des Pakets
+zu erlauben und auch, um das bisherige Nummerierungsschema eines Paketes
+aufzugeben.
+.TP 
+\fIUpstream\-Version\fP
+Dies ist der Hauptteil der Versionsnummer. Normalerweise ist dies die
+Versionsnummer des Originalpakets (Upstream), aus dem die \fI.deb\fP\-Datei
+erstellt wurde, falls dies zutrifft. Normalerweise wird diese im gleichen
+Format vorliegen, wie sie von den Originalautoren angegeben wurde;
+allerdings mag es notwendig sein, sie umzuformatieren, damit sie in das
+Format des Paketverwaltungssystems und des Vergleichsschemas passt.
+.IP
+Das Vergleichsverhalten des Paketverwaltungssystems in Hinblick auf die
+\fIUpstream\-Version\fP wird unten beschrieben. Der \fIUpstream\-Version\fP\-Anteil
+der Versionnummer muss angegeben werden.
+.IP
+\fIUpstream\-Version\fP darf nur alphanumerische Zeichen (A\-Za\-z0\-9) und \fB.\fP
+\fB+\fP \fB\-\fP \fB:\fP \fB~\fP (Satzpunkt, Plus, Bindestrich, Doppelpunkt, Tilde)
+enthalten und sollte mit einer Zahl beginnen. Falls es keine
+\fIDebian\-Revision\fP gibt, sind Bindestriche nicht erlaubt; falls es keine
+\fIEpoche\fP gibt, sind Doppelpunkte nicht erlaubt.
+.TP 
+\fIDebian\-Revision\fP
+Dieser Teil der Versionsnummer spezifiziert die Version des Debian\-Paketes,
+basierend auf der Version der Originalautoren. Er kann nur alphanumerische
+Zeichen und \fB+\fP \fB.\fP \fB~\fP (Plus, Satzpunkt, Tilde) enthalten und wird
+genauso wie die \fIUpstream\-Version\fP verglichen.
+.IP
+Dieser Teil ist optional; falls er nicht vorhanden ist, darf
+\fIUpstream\-Version\fP keinen Bindestrich enthalten. Dieses Format ist fr den
+Fall, dass ein Stck Software speziell dafr geschrieben wurde, ein
+Debian\-Paket zu werden und es daher nur eine Debianisierung gibt und somit
+keine Revisionsanzeige notwendig ist.
+.IP
+Es ist blich, die \fIDebian\-Revision\fP jedesmal bei 1 neu zu starten, wenn
+die \fIUpstream\-Version\fP erhht wird.
+.IP
+Dpkg wird die Versionsnummer beim letzten Bindestrich in der Zeichenkette
+auftrennen (falls dieser existiert) um die \fIUpstream\-Version\fP und die
+\fIDebian\-Revision\fP zu bestimmen. Im Vergleich befindet sich eine fehlende
+\fIDebian\-Revision\fP vor einer vorhandenen (beachten Sie aber, dass es sich
+bei der \fIDebian\-Revision\fP um den Teil der Versionsnummer mit der geringsten
+Signifikanz handelt).
+.SS Sortieralgorithmus
+Die \fIUpstream\-Version\fP\- und \fIDebian\-Revision\fP\-Teile werden von der
+Paketverwaltung nach dem gleichen Algorithmus verglichen:
+.PP
+Die Zeichenketten werden von links nach rechts verglichen.
+.PP
+Zuerst wird der Anfangsteil jeder Zeichenkette bestimmt, der komplett aus
+nicht\-Ziffern\-Zeichen besteht. Diese zwei Teile (von denen einer leer sein
+kann) werden lexikalisch verglichen. Wird ein Unterschied gefunden, wird
+dieser zurckgeliefert. Der lexikalische Vergleich ist ein vernderter
+Vergleich von ASCII\-Werten, bei denen Buchstaben vor allen nicht\-Buchstaben
+sortiert werden und die Tilde vor allem sortiert wird, sogar vor dem Ende
+eines Teiles. So sind zum Beispiel die folgenden Teile in sortierter
+Reihenfolge: ~~, ~~a, ~, der leere Teil, a.
+.PP
+Dann wird der Anfangsteil des Restes jeder Zeichenkette bestimmt, der
+komplett aus Ziffern besteht. Der numerische Wert dieser zwei Teile wird
+verglichen, und jeder gefundene Unterschied wird als Ergebnis des Vergleichs
+zurckgeliefert. Fr diesen Zweck zhlt die leere Zeichenkette (die nur am
+Ende einer oder beider der zu vergleichenden Versionszeichenketten
+auftauchen kann) als Null.
+.PP
+Diese zwei Schritte (Vergleichen und Entfernen von
+nicht\-Ziffern\-Zeichenketten und Ziffern\-Zeichenketten am Anfang) werden
+wiederholt, bis ein Unterschied gefunden wird oder beide Zeichenketten
+erschpft wurden.
+.PP
+Beachten Sie, dass Epochen uns erlauben, Fehler in der Versionsnummerierung
+zurckzulassen, und mit Situationen umzugehen, in denen sich das Schema der
+Versionsnummerierung ndert. Sie sind \fBnicht\fP dazu gedacht, mit
+Versionsnummern umzugehen, die Zeichenketten aus Buchstaben enthalten, die
+das Paketverwaltungssystem nicht interpretieren kann (wie ALPHA oder
+pre) oder mit unklugen Reihenfolgen.
+.SH WARNUNG
+Das Tilde\-Zeichen uns seine speziellen Sortiereigenschaften wurden in
+Version 1.10 von dpkg eingefhrt und einige Teile von dpkg\-dev haben erst
+spter in der 1.10.x\-Serie Untersttzung dafr erhalten.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdeb\-control\fP(5), \fBdeb\fP(5), \fBdpkg\fP(1)
+.SH AUTOREN
+Copyright \(co 1996,1997,1998 Ian Jackson and Christian Schwarz
+.br
+Copyright \(co 2007 Frank Lichtenheld
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg.1
--- dpkg/man/de/dpkg.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,806 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg 1 2011\-08\-14 Debian\-Projekt dpkg\-Programmsammlung
+.SH NAME
+dpkg \- Paketverwalter fr Debian
+.
+.SH BERSICHT
+\fBdpkg\fP [\fIOption\fP...] \fIAktionen\fP
+.
+.SH WARNUNG
+Dieses Handbuch ist fr Benutzer gedacht, die die Kommandozeilenoptionen und
+Paketzustnde von \fBdpkg\fP detaillierter verstehen wollen, als durch \fBdpkg
+\-\-help\fP beschrieben ist.
+
+Es sollte \fInicht\fP von Paketbetreuern verwendet werden, die verstehen
+wollen, wie \fBdpkg\fP ihr Paket installieren wird. Die Beschreibung von den
+Ttigkeiten von \fBdpkg\fP beim Installieren und Entfernen von Paketen ist
+besonders unzulnglich.
+.
+.SH BESCHREIBUNG
+\fBdpkg\fP ist ein Werkzeug, um Debian\-Pakete zu installieren, zu bauen und zu
+verwalten. Die primre und benutzerfreundlichere Oberflche fr \fBdpkg\fP ist
+\fBaptitude\fP(1). \fBdpkg\fP selbst wird komplett ber Kommandozeilenoptionen
+gesteuert, die aus genau einer Aktion und Null oder mehreren Optionen
+bestehen. Der Aktionsparameter teilt \fBdpkg\fP mit, was zu tun ist, und die
+Optionen steuern die Aktionen in irgendeiner Weise.
+
+\fBdpkg\fP kann auch als Oberflche fr \fBdpkg\-deb\fP(1) und \fBdpkg\-query\fP(1)
+verwendet werden. Die Liste der untersttzen Aktionen kann im Abschnitt
+\fBAKTIONEN\fP gefunden werden. Falls so eine Aktion angetroffen wird, fhrt
+\fBdpkg\fP einfach \fBdpkg\-deb\fP oder \fBdpkg\-query\fP mit den bergebenen
+Parametern aus, allerdings werden derzeit keine spezifischen Optionen an
+diese bergeben. Um solche Optionen zu verwenden, mssen die Backends direkt
+aufgerufen werden.
+.
+.SH "INFORMATIONEN BER PAKETE"
+\fBdpkg\fP verwaltet einige ntzliche Informationen ber verfgbare Pakete. Die
+Informationen sind in drei Klassen unterteilt: \fBStatus\fP, \fBAuswahlstatus\fP
+und \fBSchalter\fP. Diese Werte sind hauptschlich zur nderung durch
+\fBdselect\fP gedacht.
+.SS PAKETZUSTNDE
+.TP 
+\fBnicht\-installiert\fP
+Das Paket ist nicht auf Ihrem System installiert.
+.TP 
+\fBConfig\-Dateien\fP
+Nur die Konfigurationsdateien des Pakets existieren auf dem System.
+.TP 
+\fBhalb\-installiert\fP
+Die Installation des Paketes wurde begonnen, aber aus irgendeinem Grund
+nicht abgeschlossen.
+.TP 
+\fBentpackt\fP
+Das Paket ist entpackt, aber nicht konfiguriert.
+.TP 
+\fBhalb\-konfiguriert\fP
+Das Paket ist entpackt und die Konfiguration wurde begonnen, aber aus
+irgendeinem Grund nicht abgeschlossen.
+.TP 
+\fBtriggers\-awaited\fP
+Das Paket erwartet Trigger\-Verarbeitung durch ein anderes Paket.
+.TP 
+\fBtriggers\-pending\fP
+Das Paket wurde getriggert.
+.TP 
+\fBinstalliert\fP
+Das Paket ist entpackt und konfigurierte korrekt.
+.SS PAKETAUSWAHL\-STATUS
+.TP 
+\fBinstalliere\fP
+Das Paket ist zur Installation ausgewhlt.
+.TP 
+\fBhalten\fP
+Ein Paket, das mit \fBhalten\fP markiert ist, wird von \fBdpkg\fP nicht behandelt,
+es sei denn Sie erzwingen dies mit der Option \fB\-\-force\-hold\fP.
+.TP 
+\fBdeinstalliere\fP
+Das Paket ist zur Deinstallation ausgewhlt (d.h. wir wollen alle Dateien
+auer den Konfigurationsdateien entfernen).
+.TP 
+\fBvollstndig lschen\fP
+Das Paket ist zum vollstndigen Lschen (purge) ausgewhlt (d.h. wir
+wollen alle Dateien aus den Systemverzeichnissen inklusive der
+Konfigurationsdateien entfernen).
+.SS PAKET\-SCHALTER
+.TP 
+\fBNeuinst. notw\fP
+Ein mit \fBNeuinst. notw\fP markiertes Paket ist defekt und muss erneut
+installiert werden. Diese Pakete knnen nicht entfernt werden, es sei denn,
+Sie erzwingen dies mit der Option \fB\-\-force\-remove\-reinstreq\fP.
+.
+.SH AKTIONEN
+.TP 
+\fB\-i\fP, \fB\-\-install\fP \fIPaketdatei\fP...
+Installiere das Paket. Falls die \fB\-\-recursive\fP oder \fB\-R\fP\-Option angegeben
+ist, muss sich \fIPaketdatei\fP stattdessen auf ein Verzeichnis beziehen.
+
+Die Installation besteht aus folgenden Schritten:
+.br
+
+\fB1.\fP Extrahiere die Steuerdateien aus dem neuen Paket.
+.br
+
+\fB2.\fP Falls eine andere Version des gleichen Pakets vor der der neuen
+Installation installiert war, dann fhre das \fIprerm\fP\-Skript des alten
+Paketes aus.
+.br
+
+\fB3.\fP Fhre das \fIpreinst\fP\-Skript aus, falls dies vom Paket bereitgestellt
+wird.
+.br
+
+\fB4.\fP Entpacke die neuen Dateien und sichere gleichzeitig die alten Dateien,
+so dass diese, falls etwas schief geht, wiederhergestellt werden knnen.
+.br
+
+\fB5.\fP Falls eine andere Version des gleichen Pakets vor der der neuen
+Installation installiert war, dann fhre das \fIpostrm\fP\-Skript des alten
+Paketes aus. Beachten Sie, dass dieses Skript nach dem \fIpreinst\fP\-Skript des
+neuen Pakets ausgefhrt wird, da neue Dateien zeitgleich zu der Entfernung
+alter Dateien geschrieben werden.
+.br
+
+\fB6.\fP Konfiguriere das Paket. Lesen Sie \fB\-\-configure\fP fr detaillierte
+Informationen wie dies geschieht.
+.TP 
+\fB\-\-unpack \fP\fIPaketdatei\fP ...
+Entpacke das Paket, aber konfiguriere es nicht. Falls die \fB\-\-recursive\fP
+oder \fB\-R\fP\-Option angegeben ist, muss sich \fIPaketdatei\fP stattdessen auf ein
+Verzeichnis beziehen.
+.TP 
+\fB\-\-configure \fP\fIPaket\fP ...|\fB\-a\fP|\fB\-\-pending\fP
+Konfiguriert ein entpacktes aber noch nicht konfiguriertes Paket. Falls
+\fB\-a\fP oder \fB\-\-pending\fP anstelle von \fIPaket\fP angegeben ist, werden alle
+entpackten aber nicht konfigurierten Pakete konfiguriert.
+
+Um ein Paket zu rekonfigurieren, dass bereits konfiguriert wurde, verwenden
+Sie stattdessen den Befehl \fBdpkg\-reconfigure\fP(8).
+
+Die Konfiguration besteht aus folgenden Schritten:
+.br
+
+\fB1.\fP Entpacke die Conffiles und sichere gleichzeitig die alten Conffiles,
+so dass diese, falls etwas schief geht, wiederhergestellt werden knnen.
+.br
+
+\fB2.\fP Fhre das \fIpostinst\fP\-Skript aus, falls dies vom Paket bereitgestellt
+wird.
+.TP 
+\fB\-\-triggers\-only\fP \fIPaket\fP...|\fB\-a\fP|\fB\-\-pending\fP
+Verarbeite nur Trigger. Alle ausstehenden Trigger werden verarbeitet. Falls
+Paketnamen bergeben werden, werden nur die Trigger dieser Pakete
+verarbeitet, jedes genau einmal wo notwendig. Die Verwendung dieser Option
+kann Pakete in die unzulssigen Stati \fBtriggers\-awaited\fP und
+\fBtriggers\-pending\fP bringen. Durch die Ausfhrung von \fBdpkg \-\-configure
+\-\-pending\fP kann dies spter behoben werden.
+.TP 
+\fB\-r\fP, \fB\-\-remove\fP, \fB\-P\fP, \fB\-\-purge \fP\fIPaket\fP ...|\fB\-a\fP|\fB\-\-pending\fP
+Entferne ein installiertes Paket. \fB\-r\fP oder \fB\-\-remove\fP entfernen alles
+auer Conffiles. Dies knnte die Rekonfiguration vermeiden, falls das Paket
+spter wieder reinstalliert wird. (Conffiles sind die Konfigurationsdateien,
+die in der \fIdebian/conffiles\fP\-Steuerdatei aufgefhrt sind). \fB\-P\fP oder
+\fB\-\-purge\fP entfernt alles, auch Conffiles. Falls \fB\-a\fP oder \fB\-\-pending\fP
+anstatt eines Paketnamens angegeben werden, dann werden alle Pakete, die
+entpackt aber zur Entfernung oder vollstndigen Lschung in der Datei
+\fI/var/lib/dpkg/status\fP markiert sind, entfernt beziehungsweise vollstndig
+gelscht. Hinweis: Einige Konfigurationsdateien knnen \fBdpkg\fP nicht bekannt
+sein, da sie separat durch die Konfigurationsskripte angelegt und verwaltet
+werden. In diesem Fall wird \fBdpkg\fP sie nicht selbst entfernen sondern das
+Skript \fIpostrm\fP (das von \fBdpkg\fP aufgerufen wird) des Pakets muss sich
+whrend des vollstndigen Lschens um das Entfernen kmmern. Natrlich
+betrifft dies nur Dateien in den Systemverzeichnissen, nicht
+Konfigurationsdateien, die in die Home\-Verzeichnisse der individuellen
+Benutzer geschrieben werden.
+
+Entfernung eines Paketes besteht aus den folgenden Schritte:
+.br
+
+\fB1.\fP Fhre das \fIprerm\fP\-Skript aus
+.br
+
+\fB2.\fP Entferne die installierten Dateien
+.br
+
+\fB3.\fP Fhre das \fIpostrm\fP\-Skript aus
+.br
+.TP 
+\fB\-\-update\-avail\fP, \fB\-\-merge\-avail\fP \fIPackages\-Datei\fP
+Aktualisiere \fBdpkg\fPs und \fBdselect\fPs Verstndnis darber, welche Pakete
+verfgbar sind. Mit der Aktion \fB\-\-merge\-avail\fP wird alte Information mit
+der Information aus der \fIPackages\-Datei\fP zusammengefhrt. Mit der Aktion
+\fB\-\-update\-avail\fP wird die alte Information durch die Information aus der
+\fIPackages\-Datei\fP ersetzt. Die mit Debian vertriebene \fIPackages\-Datei\fP
+heit einfach \fIPackages\fP. \fBdpkg\fP hlt seine Aufzeichnungen ber die
+verfgbaren Pakete in \fI/var/lib/dpkg/available\fP.
+
+Ein einfacher Befehl, um die Datei \fIavailable\fP in einem Rutsch zu holen und
+zu aktualisieren ist \fBdselect update\fP. Beachten Sie, dass diese Datei
+nahezu nutzlos ist, falls Sie nicht \fBdselect\fP sondern eine APT\-basierte
+Oberflche verwenden: APT verfgt ber sein eigenes System, die verfgbaren
+Pakete zu berwachen.
+.TP 
+\fB\-A\fP, \fB\-\-record\-avail\fP \fIPaketdatei\fP ...
+Aktualisiere mit den Informationen aus dem Paket \fIPaketdatei\fP \fBdpkg\fPs und
+\fBdselect\fPs Verstndnis darber, welche Pakete verfgbar sind. Falls die
+\fB\-\-recursive\fP oder \fB\-R\fP\-Option angegeben ist, muss sich \fIPaketdatei\fP
+stattdessen auf ein Verzeichnis beziehen.
+.TP 
+\fB\-\-forget\-old\-unavail\fP
+Jetzt \fBveraltet\fP und ohne Funktion, da \fBdpkg\fP automatisch nicht
+installierte nicht verfgbare Pakete vergisst.
+.TP 
+\fB\-\-clear\-avail\fP
+Lsche die existierenden Informationen darber, welche Pakete verfgbar
+sind.
+.TP 
+\fB\-C\fP, \fB\-\-audit\fP
+Suche nach Pakete, die in Ihrem System nur teilweise installiert
+wurden. \fBdpkg\fP wird Vorschlge machen, was mit ihnen geschehen soll, um sie
+in Funktion zu bringen.
+.TP 
+\fB\-\-get\-selections\fP [\fIPaket\-Name\-Muster\fP...]
+Hole Liste von Paketauswahlen und schreibe sie auf die Standardausgabe. Ohne
+Muster werden nicht\-installierte Pakete (d.h. solche, die vorher
+vollstndig gelscht wurden) nicht angezeigt.
+.TP 
+\fB\-\-set\-selections\fP
+Setze die Paketauswahl durch Einlesen einer Datei von der
+Standardeingabe. Diese Datei sollte im Format \fIPaket\fP \fIZustand\fP sein,
+wobei Zustand einer aus \fBinstall\fP, \fBhold\fP, \fBdeinstall\fP oder \fBpurge\fP
+ist. Leerzeilen und Kommentarzeilen (beginnend mit #) sind auch erlaubt.
+.TP 
+\fB\-\-clear\-selections\fP
+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.
+.TP 
+\fB\-\-yet\-to\-unpack\fP
+Sucht nach Paketen dir zur Installation ausgewhlt wurden, die aber aus
+irgendeinem Grund noch nicht installiert wurden.
+.TP 
+.TP 
+\fB\-\-print\-architecture\fP
+Gebe die Architektur der Pakete aus, die \fBdpkg\fP installiert (beispielsweise
+i386).
+.TP 
+\fB\-\-compare\-versions \fP\fIVer1 Op Ver2\fP
+Vergleiche Versionsnummern, wobei \fIOp\fP ein binrer Operator ist. \fBdpkg\fP
+liefert Erfolg (Nullergebnis) falls die angegebene Bedingung erfllt ist und
+einen Fehler (nicht\-Null\-Ergebnis) andernfalls. Es gibt zwei Gruppen von
+Operatoren, die sich in der Behandlung von leeren \fIVer1\fP oder \fIVer2\fP
+unterscheiden. Die folgenden behandeln leere Versionen als jnger als jede
+andere Version: \fBlt le eq ne ge gt\fP. Die folgenden behandeln eine leere
+Version als lter als jede Version: \fBlt\-nl le\-nl ge\-nl gt\-nl\fP. Die
+folgenden sind nur aus Kompatibilitt mit der Steuerdateisyntax
+bereitgestellt: \fB< << <= = >= >> >\fP.
+.TP 
+\fB\-\-command\-fd \fP\fIn\fP
+Akzeptiert eine Reihe von Befehlen an Eingabe\-Dateideskriptor \fIn\fP. Hinweis:
+Zustzliche auf der Kommandozeile und durch diesen Dateideskriptor gesetzte
+Optionen werden nicht fr nachfolgende Befehle, die im gleichen Lauf
+ausgefhrt werden, zurckgesetzt.
+.TP 
+\fB\-\-help\fP
+Zeige eine kurze Hilfenachricht an.
+.TP 
+\fB\-\-force\-help\fP
+Gebe Hilfe ber die \fB\-\-force\-\fP\fISache\fP\-Optionen.
+.TP 
+\fB\-Dh\fP, \fB\-\-debug=help\fP
+Gib Hilfe ber Debugging\-Optionen.
+.TP 
+\fB\-\-version\fP
+Zeige \fBdpkg\fP Versionsinformationen an.
+.TP 
+\fBdpkg\-deb\-Aktionen\fP
+Lesen Sie \fBdpkg\-deb\fP(1) fr weitere Informationen ber die folgenden
+Aktionen.
+
+.nf
+\fB\-b\fP, \fB\-\-build\fP \fIVerzeichnis\fP [\fIArchiv\fP|\fIVerzeichnis\fP]
+    Baue ein deb\-Paket.
+\fB\-c\fP, \fB\-\-contents\fP \fIArchiv\fP
+    Liste den Inhalt eines deb\-Paketes auf.
+\fB\-e\fP, \fB\-\-control\fP \fIDateiname\fP [\fIVerzeichnis\fP]
+    Extrahiere Steuerinformationen von einem Paket.
+\fB\-x\fP, \fB\-\-extract\fP \fIArchiv Verzeichnis\fP
+    Extrahiere die vom Paket enthaltenen Dateien.
+\fB\-f\fP, \fB\-\-field\fP \fIArchiv\fP [\fISteuerfeld\fP] ...
+    Zeige das/die Steuerfeld(er) eines Paketes an.
+\fB\-\-fsys\-tarfile\fP \fIArchiv\fP
+    Zeige die von einem Debian\-Paket enthaltene Dateisystem\-Tardatei an.
+\fB\-I\fP, \fB\-\-info\fP \fIArchiv\fP [\fISteuerdatei\fP]
+    Zeige Informationen ber ein Paket.
+.fi
+
+.TP 
+\fBdpkg\-query\-Aktionen\fP
+Lesen Sie \fBdpkg\-query\fP(1) fr weitere Informationen ber die folgenden
+Aktionen.
+
+.nf
+
+\fB\-l\fP, \fB\-\-list\fP \fIPaketnamen\-Muster\fP ...
+    Liste auf das bergebene Suchmuster passende Pakete auf.
+\fB\-s\fP, \fB\-\-status\fP \fIPaketname\fP ...
+    Berichte den Status des spezifizierten Pakets.
+\fB\-L\fP, \fB\-\-listfiles\fP \fIPaketname\fP ...
+    Liste die aus \fBPaketname\fP auf Ihrem System installierten Dateien auf.
+\fB\-S\fP, \fB\-\-search\fP \fIDateinamen\-Suchmuster\fP ...
+    Suche nach einem Dateinamen in installierten Paketen.
+\fB\-p\fP, \fB\-\-print\-avail\fP \fIPaketname\fP
+    Zeige Details ber \fIPaketname\fP, wie in \fI/var/lib/dpkg/available\fP
+    gefunden. Benutzer von APT\-basierten Oberflchen sollten stattdessen
+    \fBapt\-cache show\fP \fIPaketname\fP verwenden.
+.fi
+.
+.SH OPTIONEN
+Alle Optionen knnen auf der Kommandozeile, in der
+\fBdpkg\fP\-Konfigurationsdatei \fI/etc/dpkg/dpkg.cfg\fP oder in den Dateien im
+Konfigurationsverzeichnis \fI/etc/dpkg/dpkg.cfg.d/\fP angegeben werden. Jede
+Zeile in der Konfigurationsdatei ist entweder eine Option (exakt die gleiche
+wie die Befehlszeilenoption nur ohne fhrende Gedankenstriche) oder ein
+Kommentar (falls sie mit \fB#\fP beginnt).
+.br
+.TP 
+\fB\-\-abort\-after=\fP\fIZahl\fP
+ndere nach wie vielen Fehlern \fBdpkg\fP abbrechen wird. Der Standardwert ist
+50.
+.TP 
+\fB\-B\fP, \fB\-\-auto\-deconfigure\fP
+Wenn ein Paket entfernt wird besteht die Mglichkeit, dass ein anderes
+installiertes Paket von dem entfernten Paket abhngt. Die Angabe dieser
+Option fhrt zur automatischen Dekonfiguration des Paketes, das von dem
+entfernten Paket abhngt.
+.TP 
+\fB\-D\fP\fIOktal\fP\fB, \-\-debug=\fP\fIOktal\fP
+Schalte Debugging ein. \fIOktal\fP wird durch bitweise Oder\-Verknpfung der
+gewnschten Werte von der nachfolgenden Liste gebildet (beachten Sie, dass
+sich diese Werte in zuknftigen Verffentlichungen verndern knnen). \fB\-Dh\fP
+oder \fB\-\-debug=help\fP zeigen diese Debugging\-Werte an.
+
+  Nummer  Beschreibung
+      1   Allgemein hilfreiche Fortschrittsinformationen
+      2   Aufruf und Status der Betreuerskripte
+     10   Ausgabe fr jede verarbeitete Datei
+    100   Umfangreiche Ausgabe fr jede verarbeitete Datei
+     20   Ausgabe fr jede Konfigurationsdatei
+    200   Umfangreiche Ausgabe fr jede Konfigurationsdatei
+     40   Abhngigkeiten und Konflikte
+    400   Umfangreiche Abhngigkeiten/Konflikte\-Ausgabe
+  10000   Trigger\-Aktivierung und \-Verarbeitung
+  20000   Umfangreiche Ausgabe bezglich Trigger
+  40000   Alberne Menge an Ausgabe bezglich Trigger
+   1000   Umfangreiches Gelaber beispielsweise ber das dpkg/info\-Verzeichnis
+   2000   Verrckte Mengen an Gelaber
+.TP 
+\fB\-\-force\-\fP\fISachen\fP, \fB\-\-no\-force\-\fP\fISachen\fP, \fB\-\-refuse\-\fP\fISachen\fP
+
+Erzwinge oder verweigere (\fBno\-force\fP und \fBrefuse\fP bedeuten das gleiche)
+bestimmte Sachen. \fISachen\fP ist eine Komma\-separierte Liste von Dingen, die
+im folgenden beschrieben sind. \fB\-\-force\-help\fP zeigt eine Nachricht an, die
+diese beschreibt. Mit (*) markierte Dinge werden standardmig erzwungen.
+
+\fIWarnung. Diese Optionen sind hauptschlich fr den Einsatz durch Experten
+gedacht. Der Einsatz ohne komplettes Verstndnis der Effekte kann Ihr
+gesamtes System zerstren.\fP
+
+\fBall\fP: Schaltet alle force\-Optionen ein (oder aus).
+
+\fBdowngrade\fP(*): Installiere ein Paket, selbst wenn eine neuere Version
+davon bereits installiert ist.
+
+\fIWarnung: Derzeit fhrt Dpkg keine Abhngigkeitsberprfung bei der
+Installation lterer Versionen (als bereits installiert) durch
+(sog. Downgrade) und wird Sie daher nicht warnen, falls dadurch die
+Abhngigkeit eines anderen Pakets nicht mehr erfllt ist. Dies kann
+ernsthafte Seiteneffekte haben, ein Downgrade einer essenziellen
+Systemkomponente kann Ihr gesamtes System unbrauchbar machen. Verwenden Sie
+diese Option mit Vorsicht.\fP
+
+\fBconfigure\-any\fP: Konfiguriere auch jedes entpackte, aber unkonfigurierte
+Paket von dem das aktuelle Paket abhngt.
+
+\fBhold\fP: Verarbeite auch Pakete, die mit halten markiert sind.
+
+\fBremove\-reinstreq\fP: Entferne ein Paket, selbst falls es defekt ist und zur
+Neuinstallation markiert ist. Dies kann beispielsweise dazu fhren, dass
+Teile des Pakets auf dem System bleiben und von \fBdpkg\fP vergessen werden.
+
+\fBremove\-essential\fP: Entferne, selbst falls das Paket als essenziell
+betrachtet wird. Essenzielle Pakete enthalten hauptschlich sehr
+grundlegende Unix\-Befehle. Diese zu entfernen kann dazu fhren, dass das
+gesamte System nicht mehr arbeitet \- verwenden Sie diese Option daher mit
+Vorsicht.
+
+\fBdepends\fP: Verwandle alle Abhngigkeitsprobleme in Warnungen.
+
+\fBdepends\-version\fP: Ignoriere Versionen bei der Prfung von Abhngigkeiten.
+
+\fBbreaks\fP: Installiere, selbst falls dies ein anderes Paket beschdigt.
+
+\fBconflicts\fP: Installiere, selbst wenn es mit einem anderen Paket in
+Konflikt steht. Dies ist gefhrlich, da dies gewhnlich dazu fhrt, dass
+einige Dateien berschrieben werden.
+
+\fBconfmiss\fP: Installiere immer ein fehlendes Conffile. Dies ist gefhrlich,
+da es bedeutet, dass eine nderung (die Entfernung) an der Datei nicht
+erhalten wird.
+
+\fBconfnew\fP: Falls eine Conffile modifiziert wurde, installiere immer die
+neue Version ohne Rckfrage, es sei denn, \fB\-\-force\-confdef\fP ist ebenfalls
+angegeben, in welchem Falle die Standardaktion bevorzugt wird.
+
+\fBconfold\fP: Falls eine Conffile modifiziert wurde, behalte immer die alte
+Version ohne Rckfrage, es sei denn, \fB\-\-force\-confdef\fP ist ebenfalls
+angegeben, in welchem Falle die Standardaktion bevorzugt wird.
+
+\fBconfdef\fP: Falls eine Conffile verndert wurde, whle immer die
+Standardaktion. Falls es keine Standardaktion gibt, halte an um den Benutzer
+zu fragen, es sei denn, \fB\-\-force\-confnew\fP oder \fB\-\-force\-confold\fP sind
+ebenfalls angegeben, in welchem Falle dies verwendet wird, um die
+letztendliche Aktion zu bestimmen.
+
+\fBconfask\fP: Falls eine Conffile verndert wurde, biete immer an, sie durch
+die Version aus dem Paket zu ersetzen, selbst falls sich die Version in dem
+Paket nicht gendert hat. Falls auch einer von \fB\-\-force\-confmiss\fP,
+\fB\-\-force\-confnew\fP, \fB\-\-force\-confold\fP oder \fB\-\-force\-confdef\fP angegeben
+wird, wird sie dazu verwandt, die letztendliche Aktion zu ermitteln.
+
+\fBoverwrite\fP: berschreibe die Datei aus einem Paket mit einer Datei aus
+einem anderen Paket.
+
+\fBoverwrite\-dir\fP berschreibe das Verzeichnis aus einem Paket mit einer
+Datei aus einem anderen Paket.
+
+\fBoverwrite\-diverted\fP: berschreibe eine umgeleitete (diverted) Datei mit
+einer nicht umgeleiteten.
+
+\fBunsafe\-io\fP: Beim Entpacken keine sicheren E/A\-Operationen
+durchfhren. Derzeit impliziert dies, dass vor Dateiumbenennungen kein
+Systemsync durchgefhrt wird. Dieser Sync fhrt bei einigen Dateisystemen zu
+erheblichen Leistungseinbuen, unglcklicherweise bei solchen, die berhaupt
+sichere E/A aufgrund ihres unzuverlssigen Verhaltens bentigen, auf denen
+bei abrupten Systemabstrzen Dateien der Lnge Null entstehen knnen.
+
+\fIHinweis:\fP Fr den Hauptmisstter Ext4 sollten Sie stattdessen die
+Einhngeoption \fBnodelalloc\fP verwenden, die sowohl die Leistungseinbue
+verhindert als auch Datensicherheitsprobleme vermeidet. Letzteres bedeutet,
+dass bei abrupten Systemabstrzen bei jeder Software, die keine Syncs vor
+atomaren Umbenennungen durchfhrt, keine Dateien der Lnge Null generiert
+werden.
+
+\fIWarnung: Die Verwendung dieser Option kann die Leistung erhhen,
+allerdings knnen dabei Daten verloren gehen. Verwenden Sie die Option
+vorsichtig.\fP
+
+\fBarchitecture\fP: Verarbeite sogar Pakete mit der falschen oder keiner
+Architektur.
+
+\fBbad\-version\fP: Verarbeite sogar Pakete mit falschen Versionen.
+
+\fBbad\-path\fP: Im \fBPATH\fP fehlen wichtige Programme, daher sind Probleme
+wahrscheinlich.
+
+\fBnot\-root\fP: Versuche Sachen zu (de)installieren, selbst falls nicht root.
+
+\fBbad\-verify\fP: Installiere ein Paket selbst wenn die Authentizittsprfung
+fehlschlgt.
+
+.TP 
+\fB\-\-ignore\-depends\fP=\fIPaket\fP,...
+Ignoriere Abhngigkeitsberprfungen fr ein bestimmtes Paket (tatschlich
+wird die berprfung durchgefhrt, aber nur Warnungen ber Konflikte werden
+angezeigt, sonst nichts).
+.TP 
+\fB\-\-no\-act\fP, \fB\-\-dry\-run\fP, \fB\-\-simulate\fP
+Erledige alles, was gemacht werden soll, aber schreibe keine
+nderungen. Dies wird verwendet um zu sehen, was mit der spezifizierten
+nderung passieren wrde ohne tatschlich etwas zu modifizieren.
+
+Stellen Sie sicher, dass \fB\-\-no\-act\fP vor dem Aktions\-Parameter steht, oder
+Sie knnten mit unerwnschten Ergebnissen enden. (Beispielsweise wird \fBdpkg
+\-\-purge foo \-\-no\-act\fP zuerst das Paket foo bereinigen und dann versuchen,
+das Paket \-\-no\-act zu bereinigen, obwohl Sie wahrscheinlich davon ausgingen,
+dass tatschlich gar nichts passieren sollte)
+.TP 
+\fB\-R\fP, \fB\-\-recursive\fP
+Behandle rekursiv alle regulren Dateien, die auf das Muster \fB*.deb\fP passen
+und im angegeben Verzeichnis sowie allen Unterverzeichnis liegen. Dies kann
+mit den Aktionen \fB\-i\fP, \fB\-A\fP, \fB\-\-install\fP, \fB\-\-unpack\fP und \fB\-\-avail\fP
+verwendet werden.
+.TP 
+\fB\-G\fP
+Installiere ein Paket nicht, falls bereits eine neuere Version des gleichen
+Paketes installiert ist. Dies ist ein Alias fr \fB\-\-refuse\-downgrade\fP.
+.TP 
+\fB\-\-admindir=\fP\fIVerz\fP
+ndere das voreingestellte administrative Verzeichnis (standardmig
+\fI/var/lib/dpkg\fP), in dem viele Dateien liegen, die Informationen ber den
+Status von installierten und deinstallierten Pakete usw. liegen.
+.TP 
+\fB\-\-instdir=\fP\fIVerz\fP
+ndere das voreingestellte Installationsverzeichnis. Dieses Verzeichnis gibt
+an, wo Pakete installiert werden. \fBinstdir\fP (standardmig \fI/\fP) ist auch
+das Verzeichnis, das an \fBchroot\fP(2) vor dem Aufruf der Installationsskripte
+des Paketes bergeben wird, was bedeutet, dass die Skripte \fBinstdir\fP als
+ein Wurzelverzeichnis sehen.
+.TP 
+\fB\-root=\fP\fIVerz\fP
+Durch ndern von \fBroot\fP wird \fBinstdir\fP auf \fIVerz\fP und \fBadmindir\fP auf
+\fIVerz\fP\fB/var/lib/dpkg\fP gendert.
+.TP 
+\fB\-O\fP, \fB\-\-selected\-only\fP
+Bearbeite nur die Pakete, die zur Installation ausgewhlt sind. Die
+eigentliche Markierung erfolgt mit \fBdselect\fP oder durch \fBdpkg\fP, wenn es
+Pakete bearbeitet. Beispielsweise wird ein Paket bei der Entfernung als zur
+Deinstallation ausgewhlt markiert.
+.TP 
+\fB\-E\fP, \fB\-\-skip\-same\-version\fP
+Installiere das Paket nicht, falls die gleiche Version des Pakets bereits
+installiert ist.
+.P
+\fB\-\-pre\-invoke=\fP\fIBefehl\fP
+.br
+\fB\-\-post\-invoke=\fP\fIBefehl\fP
+.RS
+Setzt einen Aufruf\-Hook \fIBefehl\fP, der via sh \-c vor oder nach dem
+Dpkg\-Aufruf der Dpkg\-Aktionen \fIunpack\fP, \fIconfigure\fP, \fIinstall\fP,
+\fItriggers\-only\fP, \fIremove\fP und \fIpurge\fP ausgefhrt wird. Diese Option kann
+mehrfach angegeben werden. Die Reihenfolge der Optionen wird erhalten, wobei
+Eintrge aus den Konfigurationsdateien Vorrang einnehmen. Die
+Umgebungsvariable \fBDPKG_HOOK_ACTION\fP wird fr die Hooks auf die aktuelle
+Dpkg\-Aktion gesetzt. Hinweis: Oberflchen knnten Dpkg mehrere Male pro
+Ausfhrung aufrufen, wodurch die Hooks fter als erwartet ausgefhrt werden
+knnten.
+.RE
+.P
+\fB\-\-path\-exclude=\fP\fIGlob\-Muster\fP
+.br
+\fB\-\-path\-include=\fP\fIGlob\-Muster\fP
+.RS
+Setzt \fIGlob\-Muster\fP als Pfadfilter, entweder durch Ausschluss oder durch
+Wiedereinschluss vorher ausgeschlossener Pfade, die whrend der Installation
+auf bestimmte Muster passen.
+
+\fIWarnung: Beachten Sie, dass abhngig von den ausgeschlossenen Pfaden Sie
+Ihr System komplett beschdigen knnten. Verwenden Sie dies daher
+vorsichtig.\fP
+
+Das Glob\-Muster kann die gleichen Platzhalter wie in der Shell verwenden,
+wobei * auf eine beliebige Folge von Zeichen, auch dem Leerzeichen und
+/, passt. Beispielsweise passt \fI/usr/*/READ*\fP auf
+\fI/usr/share/doc/package/README\fP. Wie gewhnlich passt ? auf ein
+einzelnes Zeichen (wieder auch auf /). Und [ beginnt eine Zeichenklasse,
+die eine Liste von Zeichen, Bereiche und Komplemente enthalten kann. Lesen
+Sie \fBglob\fP(7) fr detaillierte Informationen ber das Globben. Hinweis:
+Aktuelle Implementierungen knnten mehr Verzeichnisse und symbolische Links
+als bentigt wieder einschlieen. Um auf der sicheren Seite zu sein und in
+der Zukunft mgliche Entpackfehler zu vermeiden, knnte dies durch
+zuknftige Arbeiten behoben werden.
+
+Dies kann dazu verwandt werden, alle Pfade auer bestimmten zu entferen, ein
+typischer Fall lautet:
+
+.nf
+\fB\-\-path\-exclude=/usr/share/doc/*\fP
+\fB\-\-path\-include=/usr/share/doc/*/copyright\fP
+.fi
+
+Hiermit werden alle Dokumentationsdateien (auer den Copyright\-Dateien)
+entfernt.
+
+Diese zwei Optionen knnen mehrfach angegeben und miteinander verschachtelt
+werden. Beide werden in der angegebenen Reihenfolge ausgewertet, wobei die
+letzte Regel, die auf eine Datei passt, die Entscheidung fllt.
+.RE
+.TP 
+\fB\-\-status\-fd \fP\fIn\fP
+Schicke maschinenlesbare Paketstatus\- und Fortschrittsinformationen an den
+Dateideskriptor \fIn\fP. Diese Option kann mehrfach angegeben werden. Die
+Information besteht typischerweise aus einem Datensatz pro Zeile in
+folgendem Format:
+.RS
+.TP 
+\fBstatus: \fP\fIPaket\fP\fB: \fP\fIStatus\fP
+Paketstatus gendert; \fIStatus\fP entsprechend der Statusdatei.
+.TP 
+\fBstatus: \fP\fIPaket\fP\fB : error : \fP\fIausfhrliche\-Fehlermeldung\fP
+Ein Fehler ist aufgetreten. Alle mglichen Zeilenumbrche in
+\fIausfhrliche\-Fehlermeldung\fP werden vor der Ausgabe in Leerzeichen
+gewandelt.
+.TP 
+\fBstatus: \fP\fIDatei\fP\fB : conffile\-prompt : \fP\fIecht\-alt\fP\fB \fP\fIecht\-neu\fP\fB \fP\fIbenutzer\-edit\fP\fB \fP\fIdist\-edit\fP
+Dem Benutzer wird eine Conffile\-Frage gestellt.
+.TP 
+\fBprocessing: \fP\fIStufe\fP\fB: \fP\fIPaket\fP
+Versandt genau bevor eine Verarbeitungsstufe beginnt. \fIStufe\fP ist eine der
+folgenden: \fBupgrade\fP, \fBinstall\fP (beide werden vor dem Entpacken versandt),
+\fBconfigure\fP, \fBtrigproc\fP, \fBdisappear\fP, \fBremove\fP, \fBpurge\fP.
+.RE
+.TP 
+\fB\-\-status\-logger\fP=\fIBefehl\fP
+Schicke maschinenlesbare Paketstatus\- und Fortschrittsinformationen an die
+Standardeingabe des \fIBefehl\fPs der Shell. Diese Option kann mehrfach
+angegeben werden. Das verwandte Ausgabeformat ist identisch zu dem in
+\fB\-\-status\-fd.\fP
+.RE
+.TP 
+\fB\-\-log=\fP\fIDateiname\fP
+Protokolliere Statusnderungsaktualisierungen und \-Aktionen in \fIDateiname\fP
+anstatt in die Standard\-Datei \fI/var/log/dpkg.log\fP. Falls diese Option
+mehrfach bergeben wird, wird der letzte Dateiname
+verwendet. Protokollnachrichten sind von der Form JJJJ\-MM\-TT HH:MM:SS
+status \fIZustand\fP \fIPkt\fP \fIinstallierte\-Version\fP fr
+Statusnderungsaktualisierungen; JJJJ\-MM\-TT HH:MM:SS \fIAktion\fP \fIPkt\fP
+\fIinstallierte\-Version\fP \fIverfgbare\-Version\fP fr Aktionen, wobei \fIAktion\fP
+entweder \fBinstall\fP, \fBupgrade\fP, \fBremove\fP oder \fBpurge\fP ist; und
+YYYY\-MM\-DD HH:MM:SS conffile \fIDateiname\fP \fIEntscheidung\fP fr
+Conffile\-nderungen ist, wobei \fIEntscheidung\fP entweder \fBinstall\fP oder
+\fBkeep\fP ist.
+.TP 
+\fB\-\-no\-debsig\fP
+Versuche nicht, Paketsignaturen zu berprfen.
+.TP 
+\fB\-\-no\-triggers\fP
+Fhre keine Trigger in diesem Durchlauf aus (Aktivierungen werden dennoch
+aufgezeichnet). Falls dies mit \fB\-\-configure\fP \fIPaket\fP oder
+\fB\-\-triggers\-only\fP \fIPaket\fP verwandt wird, wird das Postinst des benannten
+Pakets dennoch ausgefhrt, selbst falls nur ein Trigger\-Lauf notwendig
+ist. Die Verwendung dieser Option kann Pakete in die unzulssigen Stati
+\fBtriggers\-awaited\fP und \fBtriggers\-pending\fP bringen. Durch die Ausfhrung
+von \fBdpkg \-\-configure \-\-pending\fP kann dies spter behoben werden.
+.TP 
+\fB\-\-triggers\fP
+Annulliert ein vorheriges \fB\-\-no\-triggers\fP.
+.
+.SH DATEIEN
+.TP 
+\fI/etc/dpkg/dpkg.cfg\fP
+Konfigurationsdatei mit Standardeinstellungen der Optionen.
+.TP 
+\fI/var/log/dpkg.log\fP
+Standard\-Protokolldatei (lesen Sie \fI/etc/dpkg/dpkg.cfg\fP(5) und die Option
+\fB\-\-log\fP).
+.P
+Die anderen unten aufgefhrten Dateien sind in ihrem Standardverzeichnis,
+lesen Sie den Text zur Option \fB\-\-admindir\fP um zu sehen, wie sie den Ort
+dieser Dateien ndern knnen.
+.TP 
+\fI/var/lib/dpkg/available\fP
+Liste der verfgbaren Pakete.
+.TP 
+\fI/var/lib/dpkg/status\fP
+Statusse der verfgbaren Pakete. Diese Datei enthlt Informationen darber,
+ob ein Paket zur Entfernung markiert ist oder nicht, ob es installiert ist
+oder nicht usw. Lesen Sie den Abschnitt \fBINFORMATIONEN BER PAKETE\fP fr
+weitere Informationen.
+
+Die Statusdatei wird tglich nach \fI/var/backups\fP gesichert. Dies kann
+hilfreich sein, falls sie aufgrund von Problemen mit dem Dateisystem
+verloren gegangen oder beschdigt worden ist.
+.P
+Die folgenden Dateien sind Komponenten von Binrpaketen. Lesen Sie \fBdeb\fP(5)
+fr weitere Informationen ber sie:
+.TP 
+\fIcontrol\fP
+.TP 
+\fIconffiles\fP
+.TP 
+\fIpreinst\fP
+.TP 
+\fIpostinst\fP
+.TP 
+\fIprerm\fP
+.TP 
+\fIpostrm\fP
+.
+.SH UMGEBUNG
+.TP 
+\fBHOME\fP
+Falls gesetzt wird \fBdpkg\fP es als das Verzeichnis verwenden, aus dem die
+benutzerspezifische Konfigurationsdatei gelesen wird.
+.TP 
+\fBTMPDIR\fP
+Falls gesetzt wird \fBdpkg\fP es als das Verzeichnis verwenden, in dem
+temporre Dateien und Verzeichnisse erstellt werden.
+.TP 
+\fBPAGER\fP
+Das Programm, das \fBdpkg\fP ausfhren wird, wenn es die Conffiles anzeigt.
+.TP 
+\fBSHELL\fP
+Das Programm, das \fBdpkg\fP ausfhren wird, wenn es eine neue Shell startet.
+.TP 
+\fBCOLUMNS\fP
+Setzt die Anzahl von Spalten die \fBdpkg\fP verwenden soll, wenn es
+formatierten Text anzeigt. Derzeit nur von \-l verwendet.
+.TP 
+\fBDPKG_SHELL_REASON\fP
+Wird von \fBdpkg\fP auf der Shell, die von der Conffile\-Eingabeaufforderung
+gestartet wird, um die Situation zu analysieren, gesetzt. Derzeit gltiger
+Wert: \fBconffile\-prompt\fP.
+.TP 
+\fBDPKG_CONFFILE_OLD\fP
+Wird von \fBdpkg\fP auf der Shell, die von der Conffile\-Eingabeaufforderung
+gestartet wird, um die Situation zu analysieren, gesetzt. Enthlt den Pfad
+zu der alten Conffile.
+.TP 
+\fBDPKG_CONFFILE_NEW\fP
+Wird von \fBdpkg\fP auf der Shell, die von der Conffile\-Eingabeaufforderung
+gestartet wird, um die Situation zu analysieren, gesetzt. Enthlt den Pfad
+zu der neuen Conffile.
+.TP 
+\fBDPKG_RUNNING_VERSION\fP
+Wird von \fBdpkg\fP fr die Betreuer\-Skript\-Umgebung auf die Version der
+aktuell laufenden Instanz von \fBdpkg\fP gesetzt.
+.TP 
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP
+Wird von \fBdpkg\fP fr die Betreuer\-Skript\-Umgebung auf den in Arbeit
+befindlichen Paketnamen gesetzt.
+.TP 
+\fBDPKG_MAINTSCRIPT_ARCH\fP
+Wird von \fBdpkg\fP fr die Betreuer\-Skript\-Umgebung auf die Architektur
+gesetzt, fr die das Paket gebaut wurde.
+.TP 
+\fBDPKG_MAINTSCRIPT_NAME\fP
+Wird von \fBdpkg\fP fr die Betreuer\-Skript\-Umgebung auf den Namen des
+laufenden Skripts (preinst, postinst, prerm, postrm) gesetzt.
+.
+.SH BEISPIELE
+Um Pakete mit Bezug zum \fBvi\fP(1)\-Editor aufzulisten:
+.br
+     \fBdpkg \-l \(aq*vi*\(aq\fP
+.br
+
+Um die Eintrge von zwei Paketen in \fI/var/lib/dpkg/available\fP zu sehen:
+.br
+     \fBdpkg \-\-print\-avail elvis vim | less\fP
+.br
+
+Wenn Sie die Liste der Pakete selbst durchsuchen wollen:
+.br
+     \fBless /var/lib/dpkg/available\fP
+.br
+
+Um ein installiertes Elvis\-Paket zu entfernen:
+.br
+     \fBdpkg \-r elvis\fP
+.br
+
+Um ein Paket zu installieren, mssen Sie es erst in einem Archiv oder auf
+einer CD\-ROM finden. Die available\-Datei zeigt, dass das vim\-Paket im
+Bereich editors ist:
+.br
+     \fBcd /media/cdrom/pool/main/v/vim\fP
+     \fBdpkg \-i vim_4.5\-3.deb\fP
+.br
+
+Um eine lokale Kopie der Paketauswahl\-Zustnde zu erstellen:
+.br
+     \fBdpkg \-\-get\-selections >meine_auswahl\fP
+.br
+
+Sie knnen diese Datei zu einem anderen Computer bringen und sie dort mit
+folgenden Befehlen installieren:
+.br
+     \fBdpkg \-\-clear\-selections\fP
+     \fBdpkg \-\-set\-selections <meine_auswahl\fP
+.br
+
+Beachten Sie, dass dies nichts wirklich installiert oder entfernt, sondern
+lediglich den Auswahlzustand der angeforderten Pakete setzt. Sie werden eine
+andere Anwendung bentigen, um die angeforderten Pakete tatschlich
+herunterzuladen und zu installieren. Fhren Sie beispielsweise \fBapt\-get
+dselect\-upgrade\fP aus.
+
+Gewhnlich werden Sie feststellen, dass \fBdselect\fP(1) eine bequemere Art
+ist, den Paketauswahlzustand zu ndern.
+.br
+.
+.SH "ZUSTZLICHE FUNKTIONALITT"
+Zustzliche Funktionalitt kann durch die Installation jedes der folgenden
+Pakete erhalten werden: \fBapt\fP, \fBaptitude\fP und \fBdebsums\fP.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBaptitude\fP(1), \fBapt\fP(1), \fBdselect\fP(1), \fBdpkg\-deb\fP(1), \fBdpkg\-query\fP(1),
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg.cfg\fP(5) und \fBdpkg\-reconfigure\fP(8).
+.
+.SH FEHLER
+\fB\-\-no\-act\fP gibt gewhnlich weniger Informationen als hilfreich sein
+knnten.
+.
+.SH AUTOREN
+Lesen Sie \fI/usr/share/doc/dpkg/THANKS\fP fr die Liste der Leute, die zu
+\fBdpkg\fP beigetragen haben.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-architecture.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-architecture.1
--- dpkg/man/de/dpkg-architecture.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-architecture.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,323 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-architecture 1 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-architecture \- Architektur zum Paketbau setzen und bestimmen
+.
+.SH BERSICHT
+\fBdpkg\-architecture\fP [\fIOption\fP...] [\fIBefehl\fP]
+.PP
+.
+.SH BESCHREIBUNG
+dpkg\-architecture stellt eine Mglichkeit bereit, die Rechner\-Architektur
+fr den Paketbau zu bestimmen und zu setzen.
+.PP
+Die Bau\-Architektur wird immer ber einen externen Aufruf an \fBdpkg\fP(1)
+bestimmt und kann nicht auf der Kommandozeile gesetzt werden.
+.PP
+Sie knnen die Host\-Architektur (Wirt\-Architektur) spezifizieren, indem Sie
+eine oder beide der Optionen \fB\-a\fP oder \fB\-t\fP verwenden. Der Standardwert
+wird ber einen externen Aufruf an \fBgcc\fP(1) ermittelt oder ist identisch
+mit der Bauarchitektur, falls sowohl \s-1CC\s0 als auch Gcc nicht verfgbar
+sind. Einer von \fB\-a\fP oder \fB\-t\fP ist ausreichend, der Wert des anderen wird
+auf einen brauchbaren Wert gesetzt. Tatschlich ist es oft besser, nur einen
+der beiden anzugeben, da \fBdpkg\-architecture\fP Sie warnen wird, falls Ihre
+Wahl nicht mit dem Standardwert bereinstimmt.
+.
+.SH BEFEHLE
+.TP 
+\fB\-l\fP
+Zeige die Umgebungsvariablen, eine pro Zeile, in dem Format
+\fIVARIABLE=Wert\fP. Dies ist die Standardaktion.
+.TP 
+\fB\-e\fP\fIDebian\-Architektur\fP
+berprfe auf Gleichheit der Architekturen. Standardmig wird
+\fIDebian\-Architektur\fP gegen die aktuelle Debian\-Architektur auf dem Host
+geprft. 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.
+.TP 
+\fB\-i\fP\fIArchitektur\-Platzhalter\fP
+berprfe die Identitt einer Architektur, indem \fIArchitektur\-Platzhalter\fP
+als ein Architektur\-Platzhalter expandiert und mit der aktuellen
+Debian\-Architektur verglichen wird. Der Befehl endet mit einem Exit\-Status
+von 0, falls eine bereinstimmung gefunden wurde, ansonsten mit 1.
+.TP 
+\fB\-q\fP\fIVariablenname\fP
+Zeige den Wert einer einzelnen Variablen an.
+.TP 
+\fB\-s\fP
+Zeige einen Export\-Befehl. Dies kann dazu verwendet werden, um
+Umgebungsvariablen mittels eval zu setzen.
+.TP 
+\fB\-u\fP
+hnlich wie \fB\-s\fP, gebe einen Export\-Befehl aus, der alle Variablen lscht.
+.TP 
+\fB\-c\fP\fI Befehl\fP
+Fhre einen \fIBefehl\fP in einer Umgebung aus, in der alle Variablen auf die
+festgelegten Werte gesetzt sind.
+.TP 
+\fB\-L\fP
+Zeige eine Liste von gltigen Architekturnamen.
+.TP 
+\fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH OPTIONEN
+.TP 
+\fB\-a\fP\fIDebian\-Architektur\fP
+Setze die Debian\-Architektur.
+.TP 
+\fB\-t\fP\fIGNU\-Systemtyp\fP
+Setze den GNU\-Systemtyp.
+.TP 
+\fB\-f\fP
+Existierende Umgebungsvariablen mit dem gleichen Namen wie vom Skript
+verwendet werden nicht berschrieben (d.h. sie werden von
+\fBdpkg\-architecture\fP verwendet), es sei denn, die force\-Markierung ist
+gesetzt. Dies erlaubt es dem Benutzer einen Wert zu berschreiben, selbst
+wenn der Aufruf von \fBdpkg\-architecture\fP tief in einem anderen Skript
+versteckt ist (beispielsweise \fBdpkg\-buildpackage\fP(1)).
+.
+.SH AUSDRCKE
+.IP Baumaschine 4
+Die Maschine, auf der das Paket gebaut wird.
+.IP Host\-Maschine 4
+Die Maschine, fr die das Paket gebaut ist.
+.IP Debian\-Architektur 4
+Die Debian\-Architektur\-Zeichenkette, die den binren Baum im
+\s-1FTP\s0\-Archiv spezifiziert. Beispiele: i386, sparc, hurd\-i386.
+.IP Architektur\-Platzhalter 4
+Ein Architektur\-Platzhalter ist eine spezielle Architektur\-Zeichenkette, die
+auf jede reale Architektur, die ein Teil davon ist, passt. Die allgemeine
+Form ist <Kern>\-<CPU>. Beispiele: linux\-any, any\-i386,
+hurd\-any.
+.IP \s-1GNU\s0\-Systemtyp 4
+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.
+.
+.SH VARIABLEN
+Die folgenden Variablen werden von \fBdpkg\-architecture\fP gesetzt:
+.IP \s-1DEB_BUILD_ARCH\s0 4
+Die Debian\-Architektur der Baumaschine.
+.IP \s-1DEB_BUILD_ARCH_OS\s0 4
+Der Debian\-Systemname der Baumaschine.
+.IP \s-1DEB_BUILD_ARCH_CPU\s0 4
+Der Debian\-CPU\-Name der Baumaschine.
+.IP \s-1DEB_BUILD_ARCH_BITS\s0 4
+Die Zeigergre der Baumaschine in Bits.
+.IP \s-1DEB_BUILD_ARCH_ENDIAN\s0 4
+Die Endianness der Baumaschine (little/big).
+.IP \s-1DEB_BUILD_GNU_CPU\s0 4
+Der \s-1CPU\s0\-Teil von \s-1DEB_BUILD_GNU_TYPE\s0.
+.IP \s-1DEB_BUILD_GNU_SYSTEM\s0 4
+Der System\-Teil von \s-1DEB_BUILD_GNU_TYPE\s0.
+.IP \s-1DEB_BUILD_GNU_TYPE\s0 4
+Der \s-1GNU\s0\-Systemtyp der Baumaschine.
+.IP \s-1DEB_BUILD_MULTIARCH\s0 4
+Der klargestellte \s-1GNU\s0\-Systemtyp der Baumaschine, wird fr
+Dateisystempfade benutzt.
+.IP \s-1DEB_HOST_ARCH\s0 4
+Die Debian\-Architektur der Host\-Maschine.
+.IP \s-1DEB_HOST_ARCH_OS\s0 4
+Der Debian\-Systemname der Host\-Maschine.
+.IP \s-1DEB_HOST_ARCH_CPU\s0 4
+Der Debian\-CPU\-Name der Host\-Maschine.
+.IP \s-1DEB_HOST_ARCH_BITS\s0 4
+Die Zeigergre der Host\-Maschine in Bits.
+.IP \s-1DEB_HOST_ARCH_ENDIAN\s0 4
+Die Endianness der Host\-Maschine (little/big).
+.IP \s-1DEB_HOST_GNU_CPU\s0 4
+Der \s-1CPU\s0\-Teil von \s-1DEB_HOST_GNU_TYPE\s0.
+.IP \s-1DEB_HOST_GNU_SYSTEM\s0 4
+Der System\-Teil von \s-1DEB_HOST_GNU_TYPE\s0.
+.IP \s-1DEB_HOST_GNU_TYPE\s0 4
+Der \s-1GNU\s0\-Systemtyp der Host\-Maschine.
+.IP \s-1DEB_HOST_MULTIARCH\s0 4
+Der klargestellte \s-1GNU\s0\-Systemtyp der Host\-Maschine, wird fr
+Dateisystempfade benutzt.
+.
+.SH DEBIAN/RULES
+Die Umgebungsvariablen, die von \fBdpkg\-architecture\fP gesetzt werden, werden
+an \fIdebian/rules\fP 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 \fBdpkg\-architecture\fP mit der \-q\-Option
+initialisieren. Hier sind einige Beispiele, die auch zeigen, wie sie die
+Cross\-Kompilierungs\-Untersttzung in Ihrem Paket verbessern knnen:
+.PP
+
+Anstatt von:
+.IP
+.nf
+ARCH=\`dpkg \-\-print\-architecture\`
+configure $(\s-1ARCH\s0)\-linux
+.fi
+.PP
+verwenden Sie bitte das folgende:
+.IP
+.nf
+\&\s-1DEB_BUILD_GNU_TYPE\s0 := $(shell dpkg\-architecture \-qDEB_BUILD_GNU_TYPE)
+\&\s-1DEB_HOST_GNU_TYPE\s0 := $(shell dpkg\-architecture \-qDEB_HOST_GNU_TYPE)
+
+configure \-\-build=$(\s-1DEB_BUILD_GNU_TYPE\s0) \-\-host=$(\s-1DEB_HOST_GNU_TYPE\s0)
+.fi
+.PP
+
+Anstatt von:
+.IP
+.nf
+ARCH=\`dpkg \-\-print\-architecture\`
+ifeq ($(\s-1ARCH\s0),alpha)
+  ...
+endif
+.fi
+.PP
+bitte verwenden Sie:
+.IP
+.nf
+\&\s-1DEB_HOST_ARCH\s0 := $(shell dpkg\-architecture \-qDEB_HOST_ARCH)
+
+ifeq ($(\s-1DEB_HOST_ARCH\s0),alpha)
+  ...
+endif
+.fi
+.PP
+oder, falls Sie nur den CPU\- oder OS\-Typ berprfen mssen, verwenden Sie
+die DEB_HOST_ARCH_CPU\- oder DEB_HOST_ARCH_OS\-Variablen.
+.PP
+Im Allgemeinen wird der Aufruf von Dpkg in der rules\-Datei, um
+Architektur\-Informationen zu erhalten, abgelehnt (falls Sie
+Rckwrtskompatibilitt bereitstellen wollen, siehe unten). Insbesondere die
+\-\-print\-architecture\-Option ist unzuverlssig, da wir Debian\-Architekturen
+haben, die nicht mit einem Prozessornamen bereinstimmen.
+.
+.SH RCKWRTSKOMPATIBILITT
+Die Variablen DEB_*_ARCH_BITS und DEB_*_ARCH_ENDIAN wurden in dpkg\-dev
+1.15.4 eingefhrt. Werden sie in \fIdebian/rules\fP verwandt, bentigen sie
+daher eine Bauabhngigkeit von dpkg\-dev (>= 1.15.4).
+.PP
+Die DEB_HOST_ARCH_CPU\- und DEB_HOST_ARCH_OS\-Variablen wurden in dpkg\-dev
+1.13.2 eingefhrt. Vorher tendierten die \fIdebian/rules\fP\-Dateien dazu, die
+Werte der DEB_HOST_GNU_CPU\- oder DEB_HOST_GNU_TYPE\-Variablen zu berprfen,
+die aber nderungen unterlagen.
+.PP
+Wo \fIdebian/rules\fP\-Dateien diese Variablen berprfen um festzustellen, wie
+oder was zu kompilieren ist, sollten diese aktualisiert werden, um die neuen
+Variablen und Werte zu verwenden. Sie mchten eventuell
+Rckwrtskompatibilitt zu lteren Versionen von Dpkg\-dev erhalten, indem
+Sie den folgenden Code verwenden:
+.IP
+.nf
+DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_CPU 2>/dev/null)
+DEB_HOST_ARCH_OS := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_OS 2>/dev/null)
+
+# Bercksichtige die Ausgabe des alten Dpkg\-architecture.
+ifeq ($(DEB_HOST_ARCH_CPU),)
+  DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_GNU_CPU)
+  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
+    DEB_HOST_ARCH_CPU := amd64
+  endif
+endif
+ifeq ($(DEB_HOST_ARCH_OS),)
+  DEB_HOST_ARCH_OS := $(subst \-gnu,,$(shell dpkg\-architecture \-qDEB_HOST_GNU_SYSTEM))
+  ifeq ($(DEB_HOST_ARCH_OS),gnu)
+    DEB_HOST_ARCH_OS := hurd
+  endif
+endif
+.fi
+.PP
+Und hnlich fr DEB_BUILD_ARCH_CPU und DEB_BUILD_ARCH_OS.
+.PP
+Falls Sie noch Versionen von Dpkg\-dev, die \fBdpkg\-architecture\fP nicht
+enthielten, untersttzen wollen, erledigt dies folgendes:
+.IP
+.nf
+\&\s-1DEB_BUILD_ARCH\s0 := $(shell dpkg \-\-print\-architecture)
+\&\s-1DEB_BUILD_GNU_CPU\s0 := $(patsubst hurd\-%,%,$(\s-1DEB_BUILD_ARCH\s0))
+ifeq ($(filter\-out hurd\-%,$(\s-1DEB_BUILD_ARCH\s0)),)
+  \s-1DEB_BUILD_GNU_SYSTEM\s0 := gnu
+else
+  \s-1DEB_BUILD_GNU_SYSTEM\s0 := linux\-gnu
+endif
+DEB_BUILD_GNU_TYPE=$(\s-1DEB_BUILD_GNU_CPU\s0)\-$(\s-1DEB_BUILD_GNU_SYSTEM\s0)
+
+\&\s-1DEB_HOST_ARCH\s0 := $(\s-1DEB_BUILD_ARCH\s0)
+\&\s-1DEB_HOST_GNU_CPU\s0 := $(\s-1DEB_BUILD_GNU_CPU\s0)
+\&\s-1DEB_HOST_GNU_SYSTEM\s0 := $(\s-1DEB_BUILD_GNU_SYSTEM\s0)
+\&\s-1DEB_HOST_GNU_TYPE\s0 := $(\s-1DEB_BUILD_GNU_TYPE\s0)
+.fi
+.PP
+Setzen Sie eine Untermenge dieser Zeilen oben in Ihre debian/rules\-Datei;
+diese Standardwerte werden berschrieben, falls Dpkg\-architecture verwendet
+wird.
+.PP
+Sie bentigen nicht den ganzen Satz. Whlen Sie einen konsistenten Satz, der
+nur die Werte enthlt, die Sie in der rules\-Datei verwenden. Falls Sie
+beispielsweise nur die Host\-Debian\-Architektur bentigen, 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 natrlichen Kompilierung rckwrtskompatibel sein wollen).
+.PP
+Die \fB\-e\fP\- und \fB\-i\fP\-Optionen wurden erst in relativ neuen Versionen von
+\fBdpkg\-architecture\fP eingefhrt (seit Dpkg 1.13.13).
+.
+.SH BEISPIELE
+\fBdpkg\-buildpackage\fP akzeptiert die \fB\-a\fP\-Option und gibt dies an
+\fBdpkg\-architecture\fP weiter. Weitere Beispiele:
+.IP
+CC=i386\-gnu\-gcc dpkg\-architecture \-c debian/rules build
+.IP
+eval \`dpkg\-architecture \-u\`
+.PP
+berprfe, ob eine Architektur identisch zu der aktuellen Architektur oder
+einer bergebenen ist:
+.IP
+dpkg\-architecture \-elinux\-alpha
+.IP
+dpkg\-architecture \-amips \-elinux\-mips
+.PP
+berprfe, ob die aktuelle oder eine mit \-a bergebene Architektur
+Linux\-Systeme sind:
+.IP
+dpkg\-architecture \-ilinux\-any
+.IP
+dpkg\-architecture \-ai386 \-ilinux\-any
+.
+.SH DATEIEN
+Alle diese Dateien mssen vorhanden sein, damit \fBdpkg\-architecture\fP
+funktioniert. Ihr Ort kann zur Laufzeit mit der Umgebungsvariable
+\fBDPKG_DATADIR\fP berschrieben werden.
+.TP 
+\fI/usr/share/dpkg/cputable\fP
+Tabelle der bekannten CPU\-Namen und Abbildungen auf ihre GNU\-Namen.
+.TP 
+\fI/usr/share/dpkg/ostable\fP
+Tabelle der bekannten Betriebssystemnamen und Abbildungen auf ihre
+GNU\-Namen.
+.TP 
+\fI/usr/share/dpkg/triplettable\fP
+Abbildung zwischen den Debian\-Architektur\-Tripletts und den
+Debian\-Architekturnamen.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\-buildpackage\fP(1), \fBdpkg\-cross\fP(1).
+.
+.SH AUTOR
+\fBdpkg\-architecture\fP und diese Handbuchseite wurden ursprnglich von Marcus
+Brinkmann <brinkmd@debian.org> geschrieben.
+
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-buildflags.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-buildflags.1
--- dpkg/man/de/dpkg-buildflags.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-buildflags.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,292 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-buildflags 1 2011\-09\-13 Debian\-Projekt dpkg\-Programmsammlung
+.SH NAME
+dpkg\-buildflags \- liefert Bauschalter zum Einsatz beim Paketbau
+.
+.SH BERSICHT
+\fBdpkg\-buildflags\fP [\fIOption\fP...] [\fIBefehl\fP]
+.
+.SH BESCHREIBUNG
+\fBdpkg\-buildflags\fP ist ein Werkzeug, das zum Abfragen der zu verwendenden
+Kompilierungsschalter fr den Bau von Debian\-Paketen eingesetzt wird.
+.
+Die Standardschalter werden vom Lieferanten definiert, sie knnen auf
+mehrere Arten erweitert/berschrieben werden:
+.IP 1.
+systemweit mit \fB/etc/dpkg/buildflags.conf\fP
+.IP 2.
+fr den aktuellen Benutzer mit \fB$XDG_CONFIG_HOME/dpkg/buildflags.conf\fP,
+wobei \fB$XDG_CONFIG_HOME\fP standardmig auf \fB$HOME/.config\fP gesetzt ist
+.IP 3.
+temporr durch den Benutzer mittels Umgebungsvariablen (siehe Abschnitt
+\fBUMGEBUNG\fP)
+.IP 4.
+dynamisch durch den Paketverwalter mittels Umgebungsvariablen, die ber
+\fBdebian/rules\fP gesetzt wurden (siehe Abschnitt \fBUMGEBUNG\fP)
+.P
+Die Konfigurationsdateien knnen zwei Arten von Direktiven enthalten:
+.TP 
+\fBSET\fP\fI Schalter Wert\fP
+berschreibt den Schalter namens \fISchalter\fP, um den Wert \fIWert\fP zu
+erhalten.
+.TP 
+\fBSTRIP\fP\fI Schalter Wert\fP
+Aus dem Schalter namens \fISchalter\fP alle in \fIWert\fP aufgefhrten Bauschalter
+entfernen
+.TP 
+\fBAPPEND\fP\fI Schalter Wert\fP
+Erweitert den Schalter namens \fISchalter\fP durch Anhngen der in \fIWert\fP
+angegebenen Optionen. Ein Leerzeichen wird vor den angehngten Wert
+vorangestellt, falls der derzeitige Wert nicht leer ist.
+.TP 
+\fBPREPEND\fP\fI Schalter Wert\fP
+Erweitert den Schalter namens \fISchalter\fP durch Voranstellen der in \fIWert\fP
+angegebenen Optionen. Ein Leerzeichen wird hinter den vorangestellten Wert
+angehngt, falls der derzeitige Wert nicht leer ist.
+.P
+Die Konfigurationsdateien knnen Kommentare auf Zeilen enthalten, die mit
+einer Raute (#) beginnen. Leere Zeilen werden auch ignoriert.
+.SH BEFEHLE
+.TP 
+\fB\-\-dump\fP
+Auf der Standardausgabe alle Kompilierschalter und ihre Werte ausgeben. Es
+wird ein Schalter pro Zeile ausgegeben, wobei der Werte durch ein
+Gleichheitszeichen (\fISchalter\fP=\fIWert\fP) abgetrennt wird. Dies ist die
+Standardaktion.
+.TP 
+\fB\-\-list\fP
+Gibt die Liste der vom aktuellen Lieferanten untersttzen Schalter (eine pro
+Zeile) aus. Lesen Sie den Abschnitt \fBUNTERSTTZTE SCHALTER\fP fr weitere
+Informationen ber sie.
+.TP 
+\fB\-\-export=\fP\fIFormat\fP
+Auf der Standardausgabe Shell\- (falls \fIFormat\fP \fBsh\fP ist) oder Make\- (falls
+\fIFormat\fP \fBmake\fP ist) Befehle ausgeben, die dazu verwandt werden knnen,
+alle Kompilierschalter in die Umgebung zu exportieren. Falls \fIFormat\fP
+\fBconfigure\fP lautet, kann die Ausgabe fr eine Kommandozeile von
+\&\fB./configure\fP verwandt werden. Falls der Wert von \fIFormat\fP nicht angegeben
+wird, wird \fBsh\fP angenommen. Nur Kompilierschalter, die mit einem
+Grobuchstaben beginnen, werden aufgenommen. Bei allen anderen wird
+angenommen, dass sie fr die Umgebung nicht geeignet sind.
+.TP 
+\fB\-\-get\fP\fI Schalter\fP
+Gibt den Wert des Schalters auf der Standardausgabe aus. Beendet sich mit 0,
+falls der Schalter bekannt ist, andernfalls mit 1.
+.TP 
+\fB\-\-origin\fP\fI Schalter\fP
+Gibt den Ursprung des von \fB\-\-get\fP gelieferten Werts aus. Beendet sich mit
+0, falls der Schalter bekannt ist, andernfalls mit 1. Der Ursprung kann
+einer der folgenden Werte sein:
+.RS
+.TP 
+\fBvendor\fP
+der ursprnglich vom Lieferanten gesetzte Schalter wird zurckgeliefert
+.TP 
+\fBsystem\fP
+der Schalter wurde durch eine systemweite Konfiguration gesetzt/verndert
+.TP 
+\fBuser\fP
+der Schalter wurde durch eine benutzerspezifische Konfiguration
+gesetzt/verndert
+.TP 
+\fBenv\fP
+der Schalter wurde durch eine umgebungsspezifische Konfiguration
+gesetzt/verndert
+.RE
+.TP 
+\fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH "UNTERSTTZTE SCHALTER"
+.TP 
+\fBCFLAGS\fP
+Optionen fr den C\-Compiler. Der vom Lieferanten gesetzte Standardwert
+enthlt \fI\-g\fP und die Standard Optimierungsstufe (normalerweise \fI\-O2\fP oder
+\fI\-O0\fP, falls die Umgebungsvariable \fBDEB_BUILD_OPTIONS\fP \fInoopt\fP definiert.
+.TP 
+\fBCPPFLAGS\fP
+Optionen fr den C\-Prprozessor. Standardwert: leer
+.TP 
+\fBCXXFLAGS\fP
+Optionen fr den C++\-Compiler. Identisch zu \fBCFLAGS\fP.
+.TP 
+\fBFFLAGS\fP
+Optionen fr den Fortran\-Compiler. Identisch zu \fBCFLAGS\fP.
+.TP 
+\fBLDFLAGS\fP
+Optionen die beim Linken von Programmen oder Laufzeitbibliotheken an den
+Compiler weitergegeben werden (falls der Linker direkt aufgerufen wird,
+mssen \fB\-Wl\fP und \fB,\fP aus diesen Optionen entfernt werden). Standardmig
+leer.
+.
+.SH DATEIEN
+.TP 
+\fB/etc/dpkg/buildflags.conf\fP
+Systemweite Konfigurationsdatei
+.TP 
+\fB$XDG_CONFIG_HOME/dpkg/buildflags.conf\fP oder \fB$HOME/.config/dpkg/buildflags.conf\fP
+Benutzer\-Konfigurationsdatei
+.SH UMGEBUNG
+Es gibt einen Satz von zwei Umgebungsvariablen, die den gleichen Vorgang
+durchfhren. Der erste (DEB_\fISchalter\fP_\fIVorg\fP) sollte niemals innerhalb
+von \fBdebian/rules\fP verwandt werden. Er ist fr Benutzer gedacht, die das
+Quellpaket mit anderen Bauschaltern erneut bauen mchten. Der zweite Satz
+(DEB_\fISchalter\fP_MAINT_\fIVorg\fP) sollte nur durch Paketbetreuer in
+\fBdebian/rules\fP verwandt werden, um die entstehenden Bauschalter zu ndern.
+.TP 
+\fBDEB_\fP\fISchalter\fP\fB_SET\fP
+.TQ
+\fBDEB_\fP\fISchalter\fP\fB_MAINT_SET\fP
+Diese Variable kann zum Erzwingen des fr \fISchalter\fP zurckgegebenen Werts
+verwandt werden.
+.TP 
+\fBDEB_\fP\fISchalter\fP\fB_STRIP\fP
+.TQ
+\fBDEB_\fP\fISchalter\fP\fB_MAINT_STRIP\fP
+Diese Variable kann zum Bereitstellen einer durch Leerzeichen getrennten
+Liste von Optionen verwandt werden, die aus dem Satz von \fISchalter\fP
+zurckgelieferten Schaltern entfernt werden.
+.TP 
+\fBDEB_\fP\fISchalter\fP\fB_APPEND\fP
+.TQ
+\fBDEB_\fP\fISchalter\fP\fB_MAINT_APPEND\fP
+Diese Variable kann zum Anhngen ergnzender Optionen zum Wert, der von
+\fISchalter\fP zurckgegeben wird, verwandt werden.
+.TP 
+\fBDEB_\fP\fISchalter\fP\fB_PREPEND\fP
+.TQ
+\fBDEB_\fP\fISchalter\fP\fB_MAINT_PREPEND\fP
+Diese Variable kann zum Voranstellen ergnzender Optionen zum Wert, der von
+\fISchalter\fP zurckgegeben wird, verwandt werden.
+.TP 
+\fBDEB_BUILD_MAINT_OPTIONS\fP
+Diese Variable kann zum Deaktivieren oder Aktivieren verschiedener
+Hrtungsbauschalter durch die Option \fBhardening\fP verwandt werden. Lesen Sie
+den Abschnitt \fBHRTUNG\fP fr weitere Details.
+.
+.SH HRTUNG
+Mehrere Kompilierzeit\-Optionen (weiter unten beschrieben) knnen dazu
+verwandt werden, ein erstelltes Programm gegen Speicherverflschungsangriffe
+zu hrten, oder zustzliche Warnungsmeldungen whrend der bersetzung
+auszugeben. Sie werden fr Architekturen, die diese untersttzen,
+standardmig aktiviert; die Ausnahmen sind unten angegeben.
+.P
+Jede Hrtungsfunktionalitt kann durch den entsprechenden \fBHrtungs\-\fP\-Wert
+in der Umgebungsvariablen \fBDEB_BUILD_MAINT_OPTIONS\fP mit den +\- und
+\-\-Schaltern aktiviert und deaktiviert werden. Soll beispielsweise die
+pie\-Funktionalitt aktiviert und die fortify\-Funktionalitt deaktiviert
+werden, knnen Sie Folgendes in \fBdebian/rules\fP verwenden:
+.P
+  export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,\-fortify
+.P
+Die spezielle Funktionalitt \fBall\fP kann dazu verwandt werden, alle
+Hrtungsfunktionalitten auf einmal zu aktivieren oder zu deaktiveren. Um
+daher alles zu deaktiveren und nur format und fortify zu aktiveren, kann
+Folgendes eingesetzt werden:
+.P
+  export DEB_BUILD_MAINT_OPTIONS=hardening=\-all,+format,+fortify
+.
+.TP 
+\fBformat\fP
+Diese Einstellung (standardmig aktiviert) fgt \fB\-Wformat
+\-Wformat\-security \-Werror=format\-security\fP zu \fBCFLAGS\fP und \fBCXXFLAGS\fP
+hinzu. Damit wird ber inkorrekte Formatzeichenkettenverwendungen gewarnt
+und zu einem Fehler fhren, wenn Formatfunktionen deart verwandt werden,
+dass daraus ein mgliches Sicherheitsproblem werden knnte. Derzeit warnt
+dies ber Aufrufe auf \fBprintf\fP\- und \fBscanf\fP\-Funktionen, bei denen die
+Formatzeichenkette nicht eine reine Zeichenkette ist und es keine
+Formatargumente gibt, wie in \fBprintf(foo);\fP statt \fBprintf("%s",
+foo);\fP. Dies knnte ein Sicherheitsproblem sein, falls die
+Formatzeichenkette aus einer unvertrauenswrdigen Eingabe stammt und %n
+enthlt.
+.
+.TP 
+\fBfortify\fP
+This setting (enabled by default) adds \fB\-D_FORTIFY_SOURCE=2\fP to
+\fBCPPFLAGS\fP. During code generation the compiler knows a great deal of
+information about buffer sizes (where possible), and attempts to replace
+insecure unlimited length buffer function calls with length\-limited
+ones. This is especially useful for old, crufty code.  Additionally, format
+strings in writable memory that contain '%n' are blocked. If an application
+depends on such a format string, it will need to be worked around.
+
+Beachten Sie, dass die Quellen auch mit \fB\-O1\fP oder hher kompiliert werden
+mssen, damit diese Option einen Effekt hat.
+.TP 
+\fBstackprotector\fP
+Diese Einstellung (standardmig aktiviert) fgt \fB\-fstack\-protector
+\-\-param=ssp\-buffer\-size=4\fP zu \fBCFLAGS\fP und \fBCXXFLAGS\fP hinzu. Dies fgt
+Sicherheitsprfungen gegen die berschreibung des Stapelspeichers (Stacks)
+hinzu. Damit werden viele mgliche Code\-Einfgeangriffe zu
+Abbruchsituationen. Im besten Fall werden damit Code\-Einfgungsangriffe zu
+Diensteverweigerungsangriffen oder zu keinen Problemen (abhngig von der
+Anwendung).
+
+Diese Funktionalitt bentigt das Linken mit Glibc (oder einem anderen
+Anbieter von \fB__stack_chk_fail\fP). Sie muss daher deaktiviert werden, wenn
+mit \fB\-nostdlib\fP oder \fB\-ffreestanding\fP oder hnlichem gebaut wird.
+.
+.TP 
+\fBrelro\fP
+Diese Einstellung (standardmig aktiviert) fgt \fB\-Wl,\-z,relro\fP zu
+\fBLDFLAGS\fP hinzu. Whrend des Ladens des Programms mssen mehrere
+ELF\-Speicherabschnitte vom Binder (Linker) geschrieben werden. Diese
+Einstellung signalisiert dem Ladeprogramm, diese Abschnitte in
+nur\-Lese\-Zugriff zu ndern, bevor die Steuerung an das Programm bergeben
+wird. Insbesondere verhindert dies GOT\-berschreibeangriffe.
+.
+.TP 
+\fBbindnow\fP
+This setting (disabled by default) adds \fB\-Wl,\-z,now\fP to \fBLDFLAGS\fP. During
+program load, all dynamic symbols are resolved, allowing for the entire PLT
+to be marked read\-only (due to \fBrelro\fP above).
+.
+.TP 
+\fBpie\fP
+Diese Einstellung (standardmig deaktiviert) fgt \fB\-fPIE\fP zu \fBCFLAGS\fP und
+\fBCXXFLAGS\fP sowie \fB\-fPIE \-pie\fP zu \fBLDFLAGS\fP hinzu. Position Independent
+Executable (positionsunabhngige Programme) werden bentigt, um Address
+Space Layout Randomization (Bereitstellung eines zuflligen
+Adressbereichlayouts) auszunutzen, der von einigen Kernelversionen
+bereitgestellt wird. Whrend ASLR bereits fr Datenbereiche auf dem Stapel
+(Stack) und Heap erzwungen werden kann (brk und mmap), mssen die
+Codebereiche positionsunabhngig bersetzt werden. Laufzeitbibliotheken
+machen dies bereits (\-fPIC), so dass sie ASLR automatisch erhalten, aber
+Programm\-.text\-Regionen mssen mit PIE gebaut werden, um ASLR zu
+erhalten. Wenn dies passiert, sind ROP\- (Return Oriented Programming)
+Angriffe sehr viel schwerer durchzufhren, da es keine statischen Orte mehr
+gibt, zu denen whrend eines Speicherverflschungsangriffs hingesprungen
+werden knnte.
+
+Dies ist nicht mit \fB\-fPIC\fP kompatibel, daher muss beim Erstellen von
+Laufzeitbibliotheken Vorsicht angewandt werden.
+
+Zustzlich knnen auf einigen Architekturen (am deutlichsten auf i368)
+Leistungsverluste von bis zu 15% in sehr text\-Segment\-lastigen
+Anwendungsfllen auftreten, da PIE ber allgemeine Register implementiert
+ist; in den meisten Anwendungsfllen sind dies weniger als 1%. Architekturen
+mit mehr allgemeinen Registern (z.B. Amd64) erfahren nicht diese
+Schlimmstfall\-Strafe.
+.
+.SH AUTOR
+Copyright \(co 2007\-2011 Rapha\[:e]l Hertzog
+.sp
+Copyright \(co 2011 Kees Cook
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
+
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-buildpackage.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-buildpackage.1
--- dpkg/man/de/dpkg-buildpackage.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-buildpackage.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,260 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-buildpackage 1 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-buildpackage \- baue Binr\- oder Quellpakete aus Quellen
+.
+.SH BERSICHT
+\fBdpkg\-buildpackage\fP [\fIOption\fP...]
+.
+.SH BESCHREIBUNG
+\fBdpkg\-buildpackage\fP ist ein Programm, das den Prozess des Bauens eines
+Debian\-Paketes automatisiert. Es besteht aus den folgenden Schritten:
+.IP \fB1.\fP 3
+Es bereitet die Bauumgebung vor, indem verschiedene Umgebungsvariablen
+gesetzt werden (siehe \fBUMGEBUNG\fP) und ruft \fBdpkg\-source \-\-before\-build\fP
+auf (es sei denn, \fB\-T\fP oder \fB\-\-target\fP wurde verwandt).
+.IP \fB2.\fP 3
+Es prft, dass Bauabhngigkeiten und \-konflikte erfllt sind (falls \fB\-d\fP
+nicht angegeben ist).
+.IP \fB3.\fP 3
+Falls ein spezielles Ziel mit der Option \fB\-T\fP oder \fB\-\-target\fP ausgewhlt
+wurde, ruft es diese Ziel auf und endet hier. Andernfalls ruft es \fBfakeroot
+debian/ rules clean\fP auf, um den Bau\-Baum zu bereinigen (falls \fB\-nc\fP nicht
+angegeben ist).
+.IP \fB4.\fP 3
+Es ruft \fBdpkg\-source \-b\fP auf, um das Quellpaket zu erstellen (falls nicht
+mit \fB\-b\fP, \fB\-B\fP oder \fB\-A\fP ein rein\-binrer Bau erbeten wurde).
+.IP \fB5.\fP 3
+Es ruft \fBdebian/rules\fP \fBbuild\fP, gefolgt von \fBfakeroot debian/rules\fP
+\fIBinrziel\fP auf (falls nicht ein reiner Quellbau mit \fB\-S\fP erbeten
+wurde). Beachten Sie, dass \fIBinrziel\fP entweder \fBbinary\fP (Standardfall,
+oder falls \fB\-b\fP angegeben ist) oder \fBbinary\-arch\fP (falls \fB\-B\fP angegeben
+ist) oder \fBbinary\-indep\fP (falls \fB\-A\fP angegeben ist) lautet.
+.IP \fB6.\fP 3
+Es ruft \fBgpg\fP auf, um die \fB.dsc\fP\-Datei zu signieren (falls vorhanden und
+\fB\-us\fP nicht angegeben wurde).
+.IP \fB7.\fP 3
+Es ruft \fBdpkg\-genchanges\fP auf, um eine \fB.changes\fP\-Datei zu
+erstellen. Viele Optionen von \fBdpkg\-buildpackage\fP werden an
+\fBdpkg\-genchanges\fP weitergeleitet.
+.IP \fB8.\fP 3
+Es ruft \fBgpg\fP auf, um die \fB.changes\fP\-Datei zu signieren (falls \fB\-uc\fP
+nicht angegeben wurde).
+.IP \fB9.\fP 3
+Falls \fB\-tc\fP angegeben ist, wird \fBfakeroot debian/rules clean\fP erneut
+aufgerufen. Schlielich ruft es \fBdpkg\-source \-\-after\-build\fP auf.
+.
+.SH OPTIONEN
+.TP 
+\fB\-b\fP
+Spezifiziert einen rein binren Bau, keine Quelldateien sollen gebaut
+und/oder vertrieben (im Sinne von verteilen) werden. Wird an
+\fBdpkg\-genchanges\fP weitergegeben.
+.TP 
+\fB\-B\fP
+Spezifiziert einen rein binren Bau, beschrnkt auf architekturabhngige
+Pakete. Wird an \fBdpkg\-genchanges\fP weitergegeben.
+.TP 
+\fB\-A\fP
+Spezifiziert einen rein binren Bau, beschrnkt auf architekturunabhngige
+Pakete. Wird an \fBdpkg\-genchanges\fP weitergegeben.
+.TP 
+\fB\-S\fP
+Spezifiziert einen reinen Bau der Quellen, keine Binrpakete mssen erstellt
+werden. Wird an \fBdpkg\-genchanges\fP weitergegeben.
+.TP 
+\fB\-F\fP
+Spezifiziert einen normalen kompletten Bau, Binr\- und Quellpakete werden
+gebaut. Dies ist identisch zum Standardfall, wenn keine Bauoption
+spezifiziert wird.
+.P
+\fB\-\-target=\fP\fIZiel\fP
+.br
+\fB\-\-target \fP\fIZiel\fP
+.br
+\fB\-T\fP\fIZiel\fP
+.RS
+Ruft \fBdebian/rules\fP \fIZiel\fP auf, nachdem die Bauumgebung eingerichtet wurde
+und beendet den Paketbauprozess hier. Falls auch \fB\-\-as\-root\fP angegeben
+wurde, wird der Befehl mit root\-Rechten ausgefhrt (siehe \fB\-r\fP). Beachten
+Sie, dass offizielle Ziele, bei denen die Debian\-Richtlinien verlangen, dass
+Sie mit root\-Rechten ausgefhrt werden, diese Option nicht bentigen.
+.RE
+.TP 
+\fB\-\-as\-root\fP
+Ergibt nur mit \fB\-\-target\fP einen Sinn. Erfordert, dass das Ziel mit
+Root\-Rechten ausgefhrt wird.
+.P
+\fB\-si\fP
+.br
+\fB\-sa\fP
+.br
+\fB\-sd\fP
+.br
+\fB\-v\fP\fIVersion\fP
+.br
+\fB\-C\fP\fInderungsbeschreibung\fP
+.br
+\fB\-m\fP\fIBetreueradresse\fP
+.br
+\fB\-e\fP\fIBetreueradresse\fP
+.RS
+Wird unverndert an \fBdpkg\-genchanges\fP weitergegeben. Lesen Sie dessen
+Handbuchseite.
+.RE
+.TP 
+\fB\-a\fP\fIArchitektur\fP
+Spezifiziert die Debian\-Architektur, fr die gebaut wird. Die Architektur
+der Maschine, auf der gebaut wird, wird automatisch bestimmt, und ist auch
+die Voreinstellung fr die Gastgebermaschine (host machine).
+.TP 
+\fB\-t\fP\fIGNU\-Systemtyp\fP
+Spezifiziere den GNU\-Systemtyp, fr den wir bauen. Er kann anstelle von \-a
+oder als Ergnzung verwandt werden, um den Standard GNU\-Systemtyp der
+Ziel\-Debian\-Architektur zu berschreiben.
+.TP 
+\fB\-j\fP\fIAuftrge\fP
+Anzahl an Auftrgen, die simultan laufen drfen, quivalent zu der Option
+von \fBmake\fP(1) mit dem gleichen Namen. Fgt sich selbst zu der
+Umgebungsvariablen MAKEFLAGS hinzu, was dazu fhren sollte, dass alle
+folgenden Aufrufe von make diese Option erben werden. Fgt auch
+\fBparallel=\fP\fIAuftrge\fP zu der Umgebungsvariablen DEB_BUILD_OPTIONS hinzu,
+was es debian/rules\-Dateien erlaubt, diese Information fr eigene Zwecke zu
+verwenden. Der Eintrag \fBparallel=\fP\fIAuftrge\fP in der Umgebungsvariablen
+DEB_BUILD_OPTIONS berschreibt den Wert von \fB\-j\fP, falls diese Option
+angegeben ist.
+.TP 
+\fB\-D\fP
+Prfe Bauabhngigkeiten und \-konflikte; Abbruch falls diese nicht erfllt
+sind. Dies ist das Standardverhalten.
+.TP 
+\fB\-d\fP
+berprfe Bauabhngigkeiten und \-konflikte nicht.
+.TP 
+\fB\-nc\fP
+Bereinige den Quellbaum nicht (impliziert \fB\-b\fP, falls ansonsten nichts aus
+\fB\-B\fP, \fB\-A\fP oder \fB\-S\fP gewhlt wurde).
+.TP 
+\fB\-tc\fP
+Den Quellbaum subern (verwendet \fIroot\-werde\-Befehl\fP \fBdebian/rules clean\fP)
+nachdem das Paket gebaut wurde.
+.TP 
+\fB\-r\fP\fIroot\-werde\-Befehl\fP
+Wenn \fBdpkg\-buildpackage\fP einen Teil des Bauprozesses als Root ausfhren
+muss, stellt es dem auszfhrenden Befehl den \fIroot\-werde\-Befehl\fP voran,
+falls dieser angegeben wurde. Andernfalls wird standardmig \fBfakeroot\fP
+verwendet, falls es vorhanden ist. Der \fIroot\-werde\-Befehl\fP sollte der Name
+des Programmes im \fBPATH\fP sein und wird als Argumente den Namen des wirklich
+auszufhrenden Befehles und dessen Argumente erhalten. \fIroot\-werde\-Befehl\fP
+kann Parameter enthalten (die durch Leerzeichen voneinander getrennt sein
+mssen), aber keine Shell\-Metazeichen. Typischerweise ist der
+\fIroot\-werde\-Befehl\fP \fBfakeroot\fP, \fBsudo\fP, \fBsuper\fP oder \fBreally\fP. \fBsu\fP
+ist nicht geeignet, da es nur die Shell des Benutzers mit \fB\-c\fP aufrufen
+kann, anstatt Argumente individuell zur Ausfhrung des Programms zu
+bergeben.
+.TP 
+\fB\-R\fP\fIrules\-Datei\fP
+Der Bau eines Debian\-Pakets erfolgt gewhnlich durch Aufruf von
+\fBdebian/rules\fP als ein Befehl mit mehreren Standardparametern. Mit dieser
+Option ist es mglich, einen anderen Programmaufruf zum Bau des Paketes zu
+verwenden (es knnen durch Leerzeichen getrennte Parameter angegeben
+werden). Alternativ kann die Standard\-debian/rules\-Datei mit einem anderen
+Make\-Programm ausgefhrt werden (zum Beispiel durch die Verwendung von
+\fB/usr/local/bin/make \-f debian/rules\fP als \fIrules\-Datei\fP).
+.TP 
+\fB\-p\fP\fIsignier\-Befehl\fP
+Wenn \fBdpkg\-buildpackage\fP GPG oder PGP zum Signieren einer Quellsteuerdatei
+((\fB.dsc\fP)) oder einer \fB.changes\fP\-Datei bentigt, wird es statt \fBgpg\fP den
+\fIsignier\-Befehl\fP ausfhren (und dabei falls notwendig den \fBPATH\fP
+durchsuchen). Falls \fIsignier\-Befehl\fP seine Argumente im GPG\- statt im
+PGP\-Stil verlangt, sollten Sie die \fB\-sgpg\fP\-Option
+verwenden. \fIsignier\-Befehl\fP sollte keine Leerzeichen oder andere
+Metazeichen der Shell enthalten.
+.TP 
+\fB\-k\fP\fISchlssel\-id\fP
+Geben Sie die Schlssel\-ID zur Signatur von Paketen an.
+.TP 
+\fB\-us\fP
+Das Quellpaket nicht signieren.
+.TP 
+\fB\-uc\fP
+Die \fB.changes\fP\-Datei nicht signieren.
+.P
+\fB\-i\fP[\fIRegexp\fP]
+.br
+\fB\-I\fP\fI[Muster]\fP
+.br
+\fB\-s\fP[\fBnsAkurKUR\fP]
+.br
+\fB\-z\fP, \fB\-Z\fP
+.br
+.RS
+Wird unverndert an \fBdpkg\-source\fP weitergegeben. Lesen Sie dessen
+Handbuchseite.
+.RE
+.TP 
+\fB\-\-source\-option=\fP\fIOpt\fP
+Option \fIOpt\fP an \fBdpkg\-source\fP weitergeben.
+.TP 
+\fB\-\-changes\-option=\fP\fIOpt\fP
+Option \fIOpt\fP an \fBdpkg\-genchanges\fP weitergeben.
+.P
+\fB\-\-admindir=\fP\fIVerz\fP
+.br
+\fB\-\-admindir \fP\fIVerz\fP
+.RS
+ndert den Ablageort der \fBdpkg\fP\-Datenbank. Der Standardort ist
+\fI/var/lib/dpkg\fP.
+.RE
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH UMGEBUNG
+Selbst falls \fBdpkg\-buildpackage\fP einige Variablen exportiert, sollte
+\fBdebian/rules\fP sich nicht auf ihre Gegenwart verlassen, sondern stattdessen
+die entsprechende Schnittstelle verwenden, um die bentigten Werte zu
+abzufragen.
+.SS "Von dpkg\-architecture gesetzte Variablen"
+Beim Aufruf von \fBdpkg\-architecture\fP werden die Parameter von \fB\-a\fP und
+\fB\-t\fP durchgereicht. Jede Variable, die von seiner Option \fB\-s\fP ausgegeben
+wird, wird in die Bauumgebung integriert.
+.SS "Kompilierschalter werden nicht mehr exportiert"
+Zwischen den Versionen 1.14.17 and 1.16.1 exportierte \fBdpkg\-buildpackage\fP
+Kompilierschalter (\fBCFLAGS\fP, \fBCXXFLAGS\fP, \fBFFLAGS\fP, \fBCPPFLAGS\fP und
+\fBLDFLAGS\fP) mit Werten, die von \fBdpkg\-buildflags\fP geliefert wurden. Dies
+ist nicht mehr der Fall.
+.
+.SH FEHLER
+Es sollte mglich sein, Leerzeichen und Metazeichen der Shell in und
+Anfangsargumente fr \fIroot\-werde\-Befehl\fP und \fIsignier\-Befehl\fP anzugeben.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\-source\fP(1), \fBdpkg\-architecture\fP(1), \fBdpkg\-buildflags\fP(1),
+\fBdpkg\-genchanges\fP(1), \fBfakeroot\fP(1), \fBgpg\fP(1).
+.
+.SH AUTOREN
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2007 Frank Lichtenheld
+.br
+Copyright \(co 2007\-2010 Rapha\[:e]l Hertzog
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg.cfg.5 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg.cfg.5
--- dpkg/man/de/dpkg.cfg.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg.cfg.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,37 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg.cfg 5 2009\-09\-05 Debian\-Projekt dpkg\-Programmsammlung
+.SH NAME
+dpkg.cfg \- dpkg Konfigurationsdatei
+.
+.SH BESCHREIBUNG
+Diese Datei enthlt Standardoptionen fr dpkg. Jede Zeile enthlt eine
+einzelne Option, die exakt die gleiche wie fr die normalen
+Kommandozeilen\-Option von dpkg sind, abgesehen von den einleitenden
+Gedankenstrichen, die hier nicht verwendet werden. Anfhrungszeichen
+(Quotes) um Optionswerte werden entfernt. Kommentare sind durch Einleiten
+einer Zeile mit einem Rautenzeichen ("\fB#\fP") erlaubt.
+.
+.SH DATEIEN
+\fI/etc/dpkg/dpkg.cfg.d/[0\-9a\-zA\-Z_\-]*\fP
+.br
+\fI/etc/dpkg/dpkg.cfg\fP
+.br
+\fI~/.dpkg.cfg\fP
+.
+.SH AUTOR
+Lesen Sie \fI/usr/share/doc/dpkg/THANKS\fP fr die Liste der Leute, die zu
+\fBdpkg\fP beigetragen haben.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\fP(1).
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-checkbuilddeps.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-checkbuilddeps.1
--- dpkg/man/de/dpkg-checkbuilddeps.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-checkbuilddeps.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,55 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-checkbuilddeps 1 2011\-07\-04 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-checkbuilddeps \- berprfe Bauabhngigkeiten und \-konflikte
+.
+.SH BERSICHT
+\fBdpkg\-checkbuilddeps\fP [\fIOption\fP...] [\fIBefehlsdatei\fP]
+.
+.SH BESCHREIBUNG
+Dieses Programm berprft die im System installierten Pakete gegen die
+Bauabhngigkeiten und Baukonflikte, die in der Steuerdatei aufgefhrt
+sind. Falls welche davon nicht erfllt sind, zeigt es diese an und beendet
+sich mit einem von Null verschiedenen Rckgabewert.
+.P
+Standardmig wird \fBdebian/control\fP gelesen, aber ein alternativer
+Steuerdateiname kann auf der Kommandozeile angegeben werden.
+.
+.SH OPTIONEN
+.TP 
+\fB\-\-admindir=\fP\fIVerz\fP
+ndert den Ablageort der \fBdpkg\fP\-Datenbank. Der Standardort ist
+\fI/var/lib/dpkg\fP.
+.TP 
+\fB\-B\fP
+Ignoriere \fIBuild\-Depends\-Indep\fP\-Zeilen. Verwenden Sie dies, wenn keine
+arch\-indep\-Pakete gebaut werden.
+.TP 
+\fB\-d \fP\fIZeichenkette\-fr\-Bauabhngigkeiten\fP
+.TP 
+\fB\-c \fP\fIZeichenkette\-fr\-Baukonflikte\fP
+Verwende die angegebenen Bauabhngigkeiten/\-konflikte statt denen der Datei
+\fIdebian/control\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH AUTOR
+Copyright \(co 2001 Joey Hess
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-deb.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-deb.1
--- dpkg/man/de/dpkg-deb.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-deb.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,219 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-deb 1 2011\-08\-14 Debian\-Projekt dpkg\-Programmsammlung
+.SH NAME
+dpkg\-deb \- Debian\-Paketarchiv (.deb) Manipulationswerkzeug
+.
+.SH BERSICHT
+\fBdpkg\-deb\fP [\fIOption\fP...] \fIBefehl\fP
+.
+.SH BESCHREIBUNG
+\fBdpkg\-deb\fP packt und entpackt Debian\-Archive und stellt Informationen ber
+sie breit.
+.PP
+Verwenden Sie \fBdpkg\fP, um Pakete auf Ihrem System hinzuzufgen oder zu
+entfernen
+.PP
+Sie knnen \fBdpkg\-deb\fP durch Aufruf von \fBdpkg\fP mit beliebigen Optionen, die
+Sie an \fBdpkg\-deb\fP bergeben wollen, aufrufen. \fBdpkg\fP erkennt, dass Sie
+\fBdpkg\-deb\fP wollten und wird es fr Sie ausfhren.
+.
+.SH BEFEHLE
+.TP 
+\fB\-b\fP, \fB\-\-build\fP \fIVerzeichnis\fP [\fIArchiv\fP|\fIVerzeichnis\fP]
+Legt ein Debian\-Archiv aus dem Dateisystembaum, der in \fIVerzeichnis\fP
+gespeichert ist, an. \fIVerzeichnis\fP muss ein \fBDEBIAN\fP\-Unterverzeichnis
+aufweisen, das die Dateien mit Steuerinformation wie die control\-Datei
+selbst enthlt. Dieses Verzeichnis wird \fInicht\fP in dem Dateisystemarchiv
+des Binrpakets auftauchen, sondern die Dateien selbst werden in den
+Steuer\-Informationsbereich des Binrpakets gepackt.
+
+Falls Sie nicht \fB\-\-nocheck\fP angeben, wird \fBdpkg\-deb\fP \fBDEBIAN/control\fP
+lesen und es parsen. Es prft sie auf Syntax\-Fehler und andere Probleme und
+zeigt den Namen des zu bauenden Binrpakets an. \fBdpkg\-deb\fP wird auch die
+Rechte der Betreuer\-Skripte und anderer Dateien im
+\fBDEBIAN\fP\-Steuer\-Informationsverzeichnis prfen.
+
+Falls kein \fIArchiv\fP angegeben ist, wird \fBdpkg\-deb\fP das Paket in die Datei
+\fIVerzeichnis\fP\fB.deb\fP schreiben.
+
+Falls das anzulegende Archiv bereits existiert, wird es berschrieben.
+
+Falls das zweite Argument ein Verzeichnis ist, wird \fBdpkg\-deb\fP in die Datei
+\fIPaket\fP\fB_\fP\fIVersion\fP\fB_\fP\fIarch\fP\fB.deb\fP oder \fIPaket\fP\fB_\fP\fIVersion\fP\fB.deb\fP,
+falls kein \fBArchitecture\fP\-Feld in der Paket\-Steuerdatei vorhanden ist,
+schreiben. Wenn ein Zielverzeichnis statt einer Datei angegeben ist, darf
+die Option \fB\-\-nocheck\fP nicht verwendet werden (da \fBdpkg\-deb\fP die
+Paketsteuerdatei lesen und parsen muss, um den zu verwendenden Dateinamen zu
+bestimmen).
+.TP 
+\fB\-I\fP, \fB\-\-info\fP \fIArchiv\fP [\fISteuer\-Dateiname\fP ...]
+Stellt Informationen ber ein Binrpaketarchiv bereit.
+
+Falls keine \fISteuer\-Dateiname\fPn angegeben sind, wird es eine
+Zusammenfassung des Inhalts des Pakets sowie dessen Steuerdatei ausgeben.
+
+Falls \fISteuer\-Dateiname\fPn angegeben sind, wird \fBdpkg\-deb\fP diese in der
+angegebenen Reihenfolge ausgeben; falls einige der Komponenten nicht
+vorhanden sind, wird es eine Fehlernachricht nach Stderr ber jede ausgeben
+und sich mit dem Status 2 beenden.
+.TP 
+\fB\-W\fP, \fB\-\-show\fP \fIArchiv\fP
+Stellt Informationen ber Binrpaketarchive im Format dar, das mit dem
+Argument \fB\-\-showformat\fP angegeben wurde. Das Standardformat zeigt den
+Paketnamen und die Paketversion in einer Zeile, getrennt durch einen
+Tabulator.
+.TP 
+\fB\-f\fP, \fB\-\-field\fP \fIArchiv\fP [\fISteuer\-Feldname\fP ...]
+Extrahiert die Informationen der control\-Datei aus einem Binrpaketarchiv.
+
+Falls keine \fBSteuerdatei\-Feld\fPer angegeben sind, gibt es die gesamte
+control\-Datei aus.
+
+Falls welche angegeben sind, gibt \fBdpkg\-deb\fP ihren Inhalt in der
+Reihenfolge aus, in der sie in der control\-Datei angegeben sind. Falls mehr
+als ein \fBSteuerdatei\-Feld\fP angegeben ist, stellt \fBdpkg\-deb\fP jedem Inhalt
+seinen Feldnamen (und einen Doppelpunkt mit Leerzeichen) voran.
+
+Falls angeforderte Felder nicht gefunden werden wird kein Fehler gemeldet.
+.TP 
+\fB\-c\fP, \fB\-\-contents\fP \fIArchiv\fP
+Listet den Inhalt des Dateisystem\-Archivanteils des Paketarchivs auf. Die
+Ausgabe erfolgt derzeit in dem Format, das von \fBtar\fP in der ausfhrlichen
+Auflistung erstellt wird.
+.TP 
+\fB\-x\fP, \fB\-\-extract\fP \fIArchiv\-Verzeichnis\fP
+Extrahiert den Dateisystembaum aus einem Paketarchiv in das angegebene
+Verzeichnis.
+
+Beachten Sie, dass das Extrahieren eines Pakets in das Wurzelverzeichnis
+\fInicht\fP zu einer korrekten Installation fhrt! Verwenden Sie \fBdpkg\fP zur
+Paketinstallation.
+
+\fIVerzeichnis\fP (aber nicht die bergeordneten) wird falls notwendig
+angelegt. Seine Rechte werden angepasst, um mit dem Inhalt des Pakets
+bereinzustimmen.
+.TP 
+\fB\-X\fP, \fB\-\-vextract\fP \fIArchiv\-Verzeichnis\fP
+Ist wie \fB\-\-extract\fP (\fB\-x\fP) mit \fB\-\-verbose\fP (\fB\-v\fP), das beim Arbeiten
+eine Liste von extrahierten Dateien ausgibt.
+.TP 
+\fB\-R\fP, \fB\-\-raw\-extract\fP \fIArchiv\-Verzeichnis\fP
+Extrahiert den Dateisystembaum aus einem Paketarchiv in ein angegebenes
+Verzeichnis und die Steuerinformationensdateien in das
+DEBIAN\-Unterverzeichnis des angegebenen Verzeichnisses.
+
+Das Zielverzeichnis (aber nicht bergeordnete) wird, falls notwendig,
+angelegt.
+.TP 
+\fB\-\-fsys\-tarfile\fP \fIArchiv\fP
+Extrahiert die Dateisystembaum\-Daten aus einem Binrpaket und schickt sie
+zur Standardausgabe im \fBtar\fP\-Format. Dies kann zusammen mit \fBtar\fP(1)
+verwendet werden, um eine bestimmte Datei aus einem Paketarchiv zu
+extrahieren. Das Eingabearchiv wird immer sequenziell verarbeitet.
+.TP 
+\fB\-e\fP, \fB\-\-control\fP \fIArchiv\fP [\fIVerzeichnis\fP]
+Extrahiert die Steuer\-Informationsdateien aus einem Paketarchiv in das
+angegebene Verzeichnis.
+
+Falls kein Verzeichnis angegeben ist, wird das Unterverzeichnis \fBDEBIAN\fP im
+aktuellen Verzeichnis verwendet.
+
+Das Zielverzeichnis (aber nicht bergeordnete) wird, falls notwendig,
+angelegt.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH OPTIONEN
+.TP 
+\fB\-\-showformat=\fP\fIFormat\fP
+Diese Option wird dazu verwendet, das Format der Ausgabe anzugeben, das
+\fB\-\-show\fP verwenden wird. Das Format ist eine Zeichenkette, die fr jedes
+aufgefhrte Paket ausgegeben wird.
+
+Die Zeichenkette darf jedes Statusfeld in der Form ${\fIFeldname\fP}
+referenzieren, eine Liste der mglichen Felder kann leicht mittels \fB\-I\fP fr
+das gleiche Paket ermittelt werden. Eine komplette Erluterung der
+Formatieroptionen (darunter die Escape\-Sequenzen und Feld\-Tabulatoren) kann
+in der Erklrung der Option \fB\-\-showformat\fP von \fBdpkg\-query\fP(1) gefunden
+werden.
+
+Die Voreinstellung fr dieses Feld ist "${Package}\et${Version}\en".
+.TP 
+\fB\-z\fP\fIKomprimierstufe\fP
+Gibt die Komprimierstufe an, die im Komprimier\-Backendprogramm beim Bau
+eines Pakets verwendet werden soll. Standardmig ist dies 9 fr Gzip und
+Bzip2, 6 fr Xz und Lzma.
+.TP 
+\fB\-Z\fP\fIKomprimierart\fP
+Gibt die Art der Komprimierung beim Bau eines Pakets an. Erlaubte Werte sind
+\fIgzip\fP, \fIxz\fP, \fIbzip2\fP, \fIlzma\fP und \fInone\fP (voreingestellt ist \fIgzip\fP).
+.TP 
+\fB\-\-new\fP
+Stellt sicher, dass \fBdpkg\-deb\fP ein Archiv im neuen Format baut. Dies ist
+die Voreinstellung.
+.TP 
+\fB\-\-old\fP
+Zwingt \fBdpkg\-deb\fP dazu, ein Archiv im alten Format zu bauen. Dieses alte
+Format wird nicht so leicht von nicht\-Debian\-Werkzeugen eingelesen und ist
+jetzt veraltet; der einzige Zweck ist zum Bau von Paketen, die von
+Dpkg\-Versionen kleiner 0.93.76 (September 1995) eingelesen werden
+sollen. Diese Dpkg\-Version wurde nur als i386 a.out\-Programm verffentlicht.
+.TP 
+\fB\-\-nocheck\fP
+Unterdrckt die normalen berprfungen von \fBdpkg\-deb \-\-build\fP ber die
+vorgeschlagenen Inhalte eines Archivs. Damit knnen Sie jedes Archiv bauen,
+das Sie mchten, egal wie defekt es ist.
+.TP 
+\fB\-v\fP, \fB\-\-verbose\fP
+Aktiviert ausfhrliche Ausgabe. Dies betrifft derzeit nur \fB\-\-extract\fP,
+wodurch dieses sich wie \fB\-\-vextract\fP verhlt.
+.TP 
+\fB\-D\fP, \fB\-\-debug\fP
+Aktiviert Fehlersuch\-Ausgaben (debugging). Dies ist nicht sehr
+interessant.
+.
+.SH UMGEBUNG
+.TP 
+\fBTMPDIR\fP
+Falls gesetzt wird \fBdpkg\-deb\fP es als das Verzeichnis verwenden, in dem
+temporre Dateien und Verzeichnisse erstellt werden.
+.
+.SH FEHLER
+\fBdpkg\-deb \-I\fP \fIPaket1\fP\fB.deb\fP \fIPaket2\fP\fB.deb\fP macht das Falsche.
+
+\&\fB.deb\fP\-Dateien werden nicht authentifiziert; in der Tat gibt es noch nicht
+mal eine klare Prfsumme. (Abstraktere Werkzeuge wie APT untersttzten die
+Authentifizierung von \fB.deb\fP\-Paketen, die von einem vorgegebenen Depot
+geholt wurden und die meisten Pakete stellen heutzutage eine
+md5sum\-Steuerdatei bereit, die mittels debian/rules erstellt
+wurde. Allerdings wird dies von den Werkzeugen auf niedrigerer Ebene nicht
+direkt untersttzt.)
+
+Versuchen Sie nicht, nur mit \fBdpkg\-deb\fP Software zu installieren! Sie
+mssen \fBdpkg\fP selber verwenden, um sicherzustellen, dass alle Dateien an
+den richtigen Ort platziert werden, die Paketskripte ausgefhrt werden und
+sein Status und Inhalt aufgezeichnet wird.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\fP(1), \fBdselect\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995\-1996 Ian Jackson
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-distaddfile.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-distaddfile.1
--- dpkg/man/de/dpkg-distaddfile.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-distaddfile.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,57 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-distaddfile 1 2011\-07\-04 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-distaddfile \- Eintrge zu debian/files hinzufgen
+.
+.SH BERSICHT
+\fBdpkg\-distaddfile\fP [\fIOption\fP...]\fI Dateiname Bereich Prioritt\fP
+.
+.SH BESCHREIBUNG
+\fBdpkg\-distaddfile\fP fgt einen Eintrag fr eine benannte Datei in
+\fBdebian/files\fP hinzu.
+
+Es erwartet drei nicht\-Options\-Argumente, den Dateinamen, den Bereich und
+die Prioritt fr die \fB.changes\fP\-Datei.
+
+Der Dateiname sollte relativ zum Verzeichnis angegeben werden, in dem
+\fBdpkg\-genchanges\fP die Dateien erwartet, normalerweise \fB..\fP, statt ein
+relativer Pfadname zu dem aktuellen Verzeichnis zu sein, wenn
+\fBdpkg\-distaddfile\fP ausgefhrt wird.
+.
+.SH OPTIONEN
+.TP 
+\fB\-f\fP\fIDateienlistDatei\fP
+Lese oder schreibe die Liste der hochzuladenen Dateien hierher, statt
+\fBdebian/files\fP zu verwenden.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH DATEIEN
+.TP 
+\fBdebian/files\fP
+Die Liste der erzeugten Dateien, die Teil des vorbereiteten Uploads
+sind. \fBdpkg\-distaddfile\fP kann dazu verwendet werden, zustzliche Dateien
+hinzuzufgen.
+.
+.SH AUTOREN
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-divert.8 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-divert.8
--- dpkg/man/de/dpkg-divert.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-divert.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,154 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-divert 8 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-divert \- Hinwegsetzen ber die Paketversion einer Datei
+.
+.SH BERSICHT
+\fBdpkg\-divert\fP [\fIOption\fP...] \fIBefehl\fP
+.
+.SH BESCHREIBUNG
+\fBdpkg\-divert\fP ist ein Hilfswerkzeug, um die Liste der Umleitungen
+einzurichten und zu aktualisieren.
+.PP
+Datei\-\fIDiversionen\fP (Umleitungen) sind eine Mglichkeit, \fBdpkg\fP(1) dazu zu
+zwingen, eine Datei nicht an ihren Standardplatz, sondern an einem
+\fIumgeleiteten\fP Ort zu installieren. Umleitungen knnen innerhalb der
+Debian\-Paketskripte verwendet werden, um eine Datei beiseitezuschieben, wenn
+sie einen Konflikt auslst. Systemadministratoren knnen 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 mssen, wenn eine neuere Version eines Paketes, die diese
+Dateien enthlt, installiert wird.
+.sp
+.SH BEFEHLE
+.TP 
+[\fB\-\-add\fP] \fIDatei\fP
+Fgt eine Umleitung fr \fIDatei\fP hinzu.
+.TP 
+\fB\-\-remove\fP\fI Datei\fP
+Entferne eine Umleitung fr \fIDatei\fP.
+.TP 
+\fB\-\-list\fP\fI Glob\-Muster\fP
+Liste Umleitungen auf, die auf \fIGlob\-Muster\fP passen.
+.TP 
+\fB\-\-listpackage\fP\fI Datei\fP
+Gibt den Namen des Pakets aus, die \fIDatei\fP umleitet. Gibt LOCAL aus, falls
+die Datei lokal umgeleitet wurde und nichts, falls \fIDatei\fP nicht umgeleitet
+wurde.
+.TP 
+\fB\-\-truename\fP\fI Datei\fP
+Zeige den echten Namen fr eine umgeleitete Datei an.
+.
+.SH OPTIONEN
+.TP 
+\fB\-\-admindir\fP\fI Verzeichnis\fP
+Setze das Dpkg\-Datenverzeichnis auf \fIVerzeichnis\fP (Standard:
+\fI/var/lib/dpkg\fP).
+.TP 
+\fB\-\-divert\fP\fI Umleitziel\fP
+\fIUmleitziel\fP ist der Zielort, wo die Versionen der \fIDatei\fP, wie sie von
+anderen Paketen bereitgestellt wird, hin umgeleitet werden.
+.TP 
+\fB\-\-local\fP
+Gibt an, dass alle Versionen dieser Datei umgeleitet sind. Dies bedeutet,
+dass es keine Ausnahmen gibt, und egal was fr ein Paket auch installiert
+ist, die Datei ist umgeleitet. Dies kann vom Administrator verwendet werden,
+um eine lokal genderte Version zu installieren.
+.TP 
+\fB\-\-package\fP\fI Paket\fP
+\fIPaket\fP ist der Name des Pakets, dessen Kopie von \fIDatei\fP nicht umgeleitet
+wird, d.h. \fIDatei\fP wird fr alle Pakete auer \fIPaket\fP umgeleitet.
+.TP 
+\fB\-\-quiet\fP
+Ruhiger Modus, d.h. keine langatmige Ausgabe.
+.TP 
+\fB\-\-rename\fP
+Schiebe die Dateien tatschlich beiseite (oder zurck). \fBdpkg\-divert\fP wird
+den Arbeitsvorgang abbrechen, falls die Zieldatei bereits existiert.
+.TP 
+\fB\-\-test\fP
+Testmodus, d.h. fhre keine nderungen durch, sondern zeige sie lediglich.
+.TP 
+\fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH BEMERKUNGEN
+Beim Hinzufgen ist die Standardeinstellung \fB\-\-local\fP und \fB\-\-divert\fP
+\fIOriginalname\fP.\fBdistrib\fP. Beim Entfernen mssen, falls angegeben,
+\fB\-\-package\fP oder \fB\-\-local\fP und \fB\-\-divert\fP bereinstimmen.
+
+Verzeichnisse knnen mit \fBdpkg\-divert\fP nicht umgeleitet werden.
+
+Vorsicht sollte beim Umleiten von Laufzeit\-Bibliotheken walten gelassen
+werden, da \fBldconfig\fP(8) einen symbolischen Link, basierend auf dem in der
+Bibliothek eingebetteten DT_SONAME\-Feld, anlegt. 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.
+.
+.SH BEISPIELE
+Um alle Kopien von \fI/usr/bin/example\fP auf \fI/usr/bin/example.foo\fP
+umzuleiten, d.h. alle Pakete, die \fI/usr/bin/example\fP zur Verfgung stellen,
+dazu anzuleiten, diese Datei stattdessen als \fI/usr/bin/example.foo\fP zu
+installieren und die Umbenennung, falls notwendig, durchzufhren:
+.HP
+dpkg\-divert \-\-divert /usr/bin/example.foo \-\-rename /usr/bin/example
+.PP
+Um diese Umleitung zu entfernen:
+.HP
+dpkg\-divert \-\-rename \-\-remove /usr/bin/example
+
+.PP
+Um fr jedes Paket \- auer Ihrem eigenen \fIwibble\fP\-Paket \-, das versucht,
+\fI/usr/bin/example\fP zu installieren, dieses auf \fI/usr/bin/example.foo\fP
+umzuleiten:
+.HP
+dpkg\-divert \-\-package wibble \-\-divert /usr/bin/example.foo \-\-rename
+/usr/bin/example
+.PP
+Um diese Umleitung zu entfernen:
+.HP
+dpkg\-divert \-\-package wibble \-\-rename \-\-remove /usr/bin/example
+.
+.SH UMGEBUNG
+.TP 
+\fBDPKG_ADMINDIR\fP
+Falls gesetzt und die Option \fB\-\-admindir\fP nicht verwandt wurde, wird dies
+als Datenverzeichnis von Dpkg verwandt.
+.TP 
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP
+Falls gesetzt und die Optionen \fB\-\-local\fP und \fB\-\-package\fP nicht verwandt
+wurden, wird \fBdpkg\-divert\fP dies als Paketnamen verwenden.
+.
+.SH DATEIEN
+.TP 
+\fI/var/lib/dpkg/diversions\fP
+Datei, die die aktuelle Liste von Umleitungen des Systems enthlt. Sie
+befindet sich im Dpkg\-Administrationsverzeichnis, zusammen mit anderen fr
+Dpkg wichtigen Dateien, wie \fIstatus\fP oder \fIavailable\fP.
+.br
+Hinweis: \fBdpkg\-divert\fP erhlt die alte Kopie dieser Datei, mit der Endung
+\fI\-old\fP, bevor es sie mit der neuen ersetzt.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995 Ian Jackson
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-genchanges.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-genchanges.1
--- dpkg/man/de/dpkg-genchanges.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-genchanges.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,140 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-genchanges 1 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-dpkg\-genchanges \- erstelle Debian .changes\-Dateien
+.
+.SH BERSICHT
+\fBdpkg\-genchanges\fP [\fIOption\fP...]
+.br
+.
+.SH BESCHREIBUNG
+\fBdpkg\-genchanges\fP liest Informationen aus einem entpackten und gebauten
+Debian\-Quellcodebaum und aus den darin erzeugten Dateien und erzeugt eine
+Debian\-Steuerdatei fr das Hochladen (die \fB.changes\fP\-Datei).
+.
+.SH OPTIONEN
+.TP 
+\fB\-b\fP, \fB\-B\fP, \fB\-A\fP
+Gibt an, das ein rein\-binrer Bau stattfindet (keine Quelldateien sollen
+eingeschlossen werden). Es gibt zwischen \fB\-b\fP, \fB\-B\fP und \fB\-A\fP keinen
+Unterschied, die erstellte Datei \fB.changes\fP beinhaltet alle Dateien, die
+von den \fBbinary\-*\fP\-Zielen der zu bauenden Pakete erstellt werden.
+.TP 
+\fB\-S\fP
+Gibt an, dass nur die Quellen hochgeladen werden sollen (keine Binrpakete
+werden enthalten sein).
+.PP
+Die \fB\-s\fP\fIx\fP Optionen steuern, ob das Original\-Quellarchiv dem Upload
+hinzugefgt wird, falls die Quellen erzeugt werden (d.h. \fB\-b\fP oder \fB\-B\fP
+nicht verwendet wurden).
+.TP 
+\fB\-si\fP
+Standardmig, oder falls angegeben, werden die Originalquellen nur
+hinzugefgt, falls sich die Versionsnummer der Originalautoren (die Version
+ohne Epoche und ohne die Debian\-Revision) von der Versionsnummer der
+Originalautoren in dem letzten Changlog\-Eintrag unterscheidet.
+.TP 
+\fB\-sa\fP
+Erzwingt die Hinzunahme der Originalquellen.
+.TP 
+\fB\-sd\fP
+Erzwingt den Ausschluss der Originalquellen und fgt nur den Diff hinzu.
+.fi
+.TP 
+\fB\-v\fP\fIVersion\fP
+Dies fhrt dazu, dass changelog\-Informationen von allen Versionen, die
+strikt neuer als \fIVersion\fP sind, verwendet werden.
+.TP 
+\fB\-C\fP\fInderungsbeschreibung\fP
+Lese die Beschreibung der nderungen aus der Datei \fInderungsbeschreibung\fP
+anstatt die Informationen aus dem changelog\-Datei des Quellbaums zu
+verwenden.
+.TP 
+\fB\-m\fP\fIBetreueradresse\fP
+Verwende \fIBetreueradresse\fP als Namen und E\-Mail\-Adresse des Betreuers
+dieses Paketes, anstatt die Informationen aus der control\-Datei des
+Quellbaums zu verwenden.
+.TP 
+\fB\-e\fP\fIBetreueradresse\fP
+Verwende \fIBetreueradresse\fP als Namen und E\-Mail\-Adresse des Betreuers fr
+diesen Upload, anstatt die Informationen aus dem changelog des Quellbaums
+zu verwenden.
+.TP 
+\fB\-V\fP\fIName\fP\fB=\fP\fIWert\fP
+Setzt eine Ausgabesubstitutionsvariable. Lesen Sie \fBdeb\-substvars\fP(5) fr
+eine Besprechung des Ausgabesubstitution.
+.TP 
+\fB\-T\fP\fIsubstvardatei\fP
+Lese die Substitutionsvariablen aus \fIsubstvardatei\fP; standardmig
+\fBdebian/substvars\fP. Bei den ausgegeben Feldern erfolgt keine
+Variablensubstitution, die besondere Variable \fIFormat\fP wird allerdings das
+Feld mit dem gleichen Namen berschreiben. Diese Option kann mehrfach
+verwandt werden, um Substitutionsvariablen aus mehreren Dateien einzulesen.
+
+.TP 
+\fB\-D\fP\fIFeld\fP\fB=\fP\fIWert\fP
+berschreibe oder ergnze ein Ausgabe\-Steuerdatei\-Feld.
+.TP 
+\fB\-U\fP\fIfield\fP
+Entferne ein Ausgabe\-Steuerdatei\-Feld.
+.TP 
+\fB\-c\fP\fISteuerdatei\fP
+Gibt die Haupt\-Steuerdatei an, aus der Informationen gelesen werden
+sollen. Standardmig \fBdebian/control\fP.
+.TP 
+\fB\-l\fP\fIChangelog\-Datei\fP
+Gibt die nderungsprotokolldatei an, aus der Informationen gelesen werden
+sollen. Standardmig \fBdebian/changelog\fP.
+.TP 
+\fB\-f\fP\fIDateienlistDatei\fP
+Lese die Liste der hochzuladenen Dateien von hier, statt \fBdebian/files\fP zu
+verwenden.
+.TP 
+\fB\-F\fP\fIChangelog\-Format\fP
+Gibt das Format der nderungsprotokolldatei an. Standardmig wird das
+Format aus einer speziellen Zeile in der Nhe des Endes der
+nderungsprotokolldatei gelesen oder, falls dies fehlschlgt, wird das
+Debian\-Standardformat angenommen.
+.TP 
+\fB\-u\fP\fIHochladedateiverzeichnis\fP
+Suche nach Dateien, die hochgeladen werden sollen, in
+\fIHochladedateiverzeichnis\fP statt in \fB..\fP (\fBdpkg\-genchanges\fP muss diese
+Dateien finden, so dass es ihre Gren und Prfsummen in die
+\&\fB.changes\fP\-Datei aufnehmen kann.
+.TP 
+\fB\-q\fP
+Normalerweise schreibt \fBdpkg\-genchanges\fP informative Meldungen auf die
+Standard\-Fehlerausgabe, beispielsweise wie viele Quelldateien des Pakets
+hochgeladen werden. \fB\-q\fP unterdrckt diese Meldungen.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH DATEIEN
+.TP 
+\fBdebian/files\fP
+Die Liste der erstellten Dateien, die Teil der zum Hochladen vorbereiteten
+Dateien sind. \fBdpkg\-genchanges\fP liest hier die Daten, wenn es die Datei
+\&\fB.changes\fP erstellt.
+.
+.SH AUTOREN
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-gencontrol.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-gencontrol.1
--- dpkg/man/de/dpkg-gencontrol.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-gencontrol.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,140 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-gencontrol 1 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-gencontrol \- erstelle Debian control\-Dateien
+.
+.SH BERSICHT
+\fBdpkg\-gencontrol\fP [\fIOption\fP...]
+.
+.SH BESCHREIBUNG
+\fBdpkg\-gencontrol\fP liest Informationen aus einem entpackten
+Debian\-Quellcodebaum und erzeugt eine binre Paketsteuerdatei (standardmig
+debian/tmp/DEBIAN/control); dabei vereinfacht es die Felder mit
+Paketbeziehungen.
+.sp
+Daher werden \fIPre\-Depends\fP, \fIDepends\fP, \fIRecommends\fP und \fISuggests\fP in
+dieser Reihenfolge vereinfacht, indem Abhngigkeiten, die aufgrund der
+jeweils ermittelten strkeren Abhngigkeit bereits erfllt sind, entfernt
+werden. Es wird auch alle Selbstabhngigkeiten entfernen (tatschlich werden
+alle Abhngigkeiten entfernt, die aufgrund der installierten Version des
+aktuellen Pakets automatisch erfllt werden). Logisch betrachtet behlt es
+den Durchschnitt von mehrfachen Abhngigkeiten auf das gleiche Paket. Die
+Reihenfolge der Abhngigkeiten wird so gut wie mglich beibehalten: falls
+eine Abhngigkeit aufgrund einer weiter hinten im Feld auftauchenden
+weiteren Abhngigkeit gestrichen werden muss, so bernimmt die letztere
+Abhngigkeit den Platz der gestrichenen.
+.sp
+Die anderen Paketbeziehungsfelder (\fIEnhances\fP, \fIConflicts\fP, \fIBreaks\fP,
+\fIReplaces\fP und \fIProvides\fP) werden auch individuell vereinfacht, indem die
+Vereinigung der verschiedenen Abhngigkeiten berechnet wird, wenn ein Paket
+mehrfach in dem Feld aufgefhrt ist.
+.sp
+\fBdpkg\-gencontrol\fP fgt auch einen Eintrag fr das Binrpaket in
+\fBdebian/files\fP hinzu.
+.
+.SH OPTIONEN
+.TP 
+\fB\-v\fP\fIVersion\fP
+Setzt die Versionsnummer des zu erstellenden Binrpaketes.
+.TP 
+\fB\-V\fP\fIName\fP\fB=\fP\fIWert\fP
+Setzt eine Ausgabesubstitutionsvariable. Lesen Sie \fBdeb\-substvars\fP(5) fr
+eine Besprechung der Ausgabesubstitution.
+.TP 
+\fB\-T\fP\fIsubstvardatei\fP
+Lese die Substitutionsvariablen aus \fIsubstvardatei\fP; standardmig
+\fBdebian/substvars\fP. Diese Option kann mehrfach verwandt werden, um
+Substitutionsvariablen aus mehreren Dateien einzulesen.
+.TP 
+\fB\-D\fP\fIFeld\fP\fB=\fP\fIWert\fP
+berschreibe oder ergnze ein Ausgabe\-Steuerdatei\-Feld.
+.TP 
+\fB\-U\fP\fIfield\fP
+Entferne ein Ausgabe\-Steuerdatei\-Feld.
+.TP 
+\fB\-c\fP\fISteuerdatei\fP
+Gibt die Haupt\-Steuerdatei an, aus der Informationen gelesen werden
+sollen. Standardmig \fBdebian/control\fP.
+.TP 
+\fB\-l\fP\fIChangelog\-Datei\fP
+Gibt die nderungsprotokolldatei an, aus der Informationen gelesen werden
+sollen. Standardmig \fBdebian/changelog\fP.
+.TP 
+\fB\-f\fP\fIDateienlistDatei\fP
+Lese oder schreibe die Liste der hochzuladenen Dateien hierher, statt
+\fBdebian/files\fP zu verwenden.
+.TP 
+\fB\-F\fP\fIChangelog\-Format\fP
+Gibt das Format der nderungsprotokolldatei an. Standardmig wird das
+Format aus einer speziellen Zeile in der Nhe des Endes der
+nderungsprotokolldatei gelesen oder, falls dies fehlschlgt, wird das
+Debian\-Standardformat angenommen.
+.TP 
+\fB\-p\fP\fIPaket\fP
+Erstellt Informationen fr das Binrpaket \fIPaket\fP. Falls die Steuerdatei
+der Quellen nur ein Binrpakete auffhrt, kann diese Option weggelassen
+werden; andernfalls ist sie notwendig, um festzulegen, von welchen
+Binrpaketen die Informationen erstellt werden sollen.
+.TP 
+\fB\-n\fP\fIDateiname\fP
+Gehe davon aus, das der Dateiname des Pakets \fIDateiname\fP sein wird, statt
+des normalen Dateinamens Paket_Version_Architektur.deb.
+.TP 
+\fB\-is\fP, \fB\-ip\fP, \fB\-isp\fP
+Diese Optionen werden aufgrund der Kompatibilitt mit lteren Versionen von
+dpkg\-dev ignoriert, sind aber jetzt veraltet. Bisher wurden sie verwendet,
+um dpkg\-gencontrol mitzuteilen, die Felder Section und Priority in die
+Steuerdatei mit aufzunehmen. Dies passiert jetzt standardmig. Falls Sie
+das alte Verhalten erreichen mchten, knnen Sie die Option \fB\-U\fP verwenden,
+um Felder aus der Steuerdatei zu entfernen.
+.TP 
+\fB\-P\fP\fIPaketbauverzeichnis\fP
+Teilt \fBdpkg\-source\fP mit, dass das Paket in \fIPaketbauverzeichnis\fP statt in
+\fBdebian/tmp\fP gebaut wird. Dieser Wert wird dazu verwendet, den Standardwert
+der Substitutionsvariablen \fBInstalled\-Size\fP und des Feldes der Steuerdatei
+(mittels \fBdu\fP) zu finden, und fr den Standard\-Ablageplatz der
+Ausgabedatei.
+.TP 
+\fB\-O\fP
+Gebe die Steuerdatei in die Standardausgabe statt nach
+\fBdebian/tmp/DEBIAN/control\fP (oder \fIPaketbauverzeichnis\fP\fB/DEBIAN/control\fP
+falls \fB\-P\fP verwendet worden ist) aus.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH DATEIEN
+.TP 
+\fBdebian/control\fP
+Die Haupt\-Steuer\-Informationsdatei fr die Quellen. Sie gibt
+versionsunabhngige Informationen ber das Quellpaket und die Binrpakete,
+die sie erstellen kann, an.
+.TP 
+\fBdebian/files\fP
+Die Liste der erstellten Dateien, die Teil des Uploads sind, der vorbereitet
+wird. \fBdpkg\-gencontrol\fP fgt die vermuteten Dateinamen von Binrpaketen
+hinzu, deren Steuerdateien es hier generiert.
+.
+.SH AUTOREN
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2007\-2008 Rapha\[:e]l Hertzog
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-gensymbols.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-gensymbols.1
--- dpkg/man/de/dpkg-gensymbols.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-gensymbols.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,520 @@
+.\" Author: Raphaël Hertzog
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-gensymbols 1 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-gensymbols \- erstelle Symboldateien (Abhngigkeitsinformationen fr
+Laufzeitbibliotheken)
+.
+.SH BERSICHT
+\fBdpkg\-gensymbols\fP [\fIOption\fP...]
+.
+.SH BESCHREIBUNG
+\fBdpkg\-gensymbols\fP durchsucht einen temporren Baubaum (standardmig
+debian/tmp), sucht nach Bibliotheken und erstellt eine Datei \fIsymbols\fP, die
+diese beschreibt. Diese Datei wird, falls sie nicht leer ist, in das
+Unterverzeichnis DEBIAN des Baubaums installiert, so dass sie schlussendlich
+in der Steuerinformation des Pakets auftaucht.
+.P
+Beim Erstellen dieser Dateien verwendet es als Eingabe einige vom Betreuer
+bereitgestellte Symboldateien. Es sucht nach den folgenden Dateien (und
+verwendet die erste, die gefunden wird):
+.IP \(bu 4
+debian/\fIPaket\fP.symbols.\fIArchitektur\fP
+.IP \(bu 4
+debian/symbols.\fIArchitektur\fP
+.IP \(bu 4
+debian/\fIPaket\fP.symbols
+.IP \(bu 4
+debian/symbols
+.P
+Der Hauptzweck dieser Dateien besteht darin, die minimale Version
+bereitzustellen, die mit jedem von der Bibliothek bereitgestellten Symbol
+verknpft ist. Normalerweise entspricht dies der ersten Version des Pakets,
+die dieses Symbol bereitgestellt hat, kann aber vom Betreuer erhht werden,
+falls die ABI des Symbols ohne Brechen der Rckwrtskompatibilitt erweitert
+wurde. Es liegt in der Verwantwortung des Betreuers, diese Dateien aktuell
+zu halten, aber \fBdpkg\-gensymbols\fP hilft ihm.
+.P
+Wenn die erstellten Symboldateien sich von denen, die der Betreuer
+bereitgestellt hat, unterscheiden, wird \fBdpkg\-gensymbols\fP ein Diff zwischen
+den zwei Versionen anzeigen. Falls die Unterschiede desweiteren zu
+gravierend sind, wird es sogar fehlschlagen (Sie knnen einstellen, wie
+groe Unterschiede Sie tolerieren knnen, sehen Sie hierzu die Option
+\fB\-c\fP).
+.SH "SYMBOLDATEIEN PFLEGEN"
+Die Symboldateien sind nur wirklich ntzlich, falls sie die Entwicklung
+eines Paketes ber mehrere Verffentlichungen hinweg wiedergeben. Daher muss
+der Betreuer sie immer aktualisieren, wenn eine neues Symbol hinzugefgt
+wird, so dass die zugeordnete minimale Version der Realitt entspricht. Um
+dies vernnftig durchzufhren, kann er Diffs aus den Bauprotokolle
+verwenden. Meistens kann der Diff direkt auf die Datei
+debian/\fIPaket\fP.symbols angewandt werden. Allerdings werden normalerweise
+weitere Anpassungen notwendig: es wird beispielsweise empfohlen, die
+Debian\-Revision von der minimalen Version zu entfernen, so dass Backports
+mit einer niedrigeren Versionsnummer aber der gleichen Version der
+Originalautoren immer noch die erstellten Abhngigkeiten erfllen. Falls die
+Debian\-Revision nicht entfernt werden kann, da das Symbol wirklich von der
+Debian\-spezifischen nderung hinzugefgt wurde, dann sollte der Version ~
+angehngt werden.
+.P
+Bevor irgendein Patch auf die Symboldatei angewendet wird, sollte der
+Betreuer zweimal prfen, dass der Patch vernnftig ist. ffentliche Symbole
+sollten nicht verschwinden, daher sollte der Patch idealerweise nur neue
+Zeilen hinzufgen.
+.P
+Beachten Sie, dass Sie in Symboldateien Kommentare einfgen knnen: jede
+Zeile, die mit # als ersten Zeichen beginnt, ist ein Kommentare, falls sie
+nicht mit #include beginnt (siehe Abschnitt \fBIncludes
+verwenden\fP). Zeilen, die mit #MISSING: anfangen, sind besondere
+Kommentare, die verschwundene Symbole dokumentieren.
+.SS "Verwendung der #PACKAGE#\-Ersetzung"
+.P
+In einigen seltenen Fllen unterscheidet sich der Name der Bibliothek auf
+verschiedenen Architekturen. Um zu vermeiden, dass der Paketname in der
+Symboldatei fest kodiert wird, knnen Sie die Markierung \fI#PACKAGE#\fP
+verwenden. Whrend der Installation der Symboldatei wird sie durch den
+echten Paketnamen ersetzt. Anders als die Markierung \fI#MINVER#\fP wird
+\fI#PACKAGE#\fP nie in der Symboldatei innerhalb eines Binrpakets auftauchen.
+.SS "Verwendung von Symbolkennzeichnungen"
+.P
+Symbolkennzeichnungen sind ntzlich, um Symbole zu markieren, die in
+irgendeiner Weise besonders sind. Jedes Symbol kann eine beliebige Anzahl
+zugeordneter Kennzeichnungen besitzen. Whrend alle Kennzeichnungen
+ausgewertet und gespeichert werden, werden nur einige von \fBdpkg\-gensymbols\fP
+verstanden und lsen eine Spezialbehandlung der Symbole aus. Lesen Sie den
+Unterabschnit \fBStandardsymbolkennzeichnungen\fP fr eine Referenz dieser
+Kennzeichnungen.
+.P
+Kennzeichnungsspezifikationen kommen direkt vor dem Symbolnamen (dazwischen
+sind keine Leerzeichen erlaubt). Sie beginnen immer mit einer ffnenden
+Klammer \fB(\fP, enden mit einer schlieenden Klammer \fB)\fP und mssen
+mindestens eine Kennzeichnung enthalten. Mehrere Kennzeichnungen werden
+durch das Zeichen \fB|\fP getrennt. Jede Kennzeichnungen kann optional einen
+Wert enthalten, der von der Kennzeichnung durch das Zeichen \fB=\fP getrennt
+wird. Kennzeichennamen und \-werte knnen beliebige Zeichenketten sein, sie
+drfen allerdings keine der der besonderen Zeichen \fB)\fP \fB|\fP \fB=\fP
+enthalten. Symbolnamen, die einer Kennzeichnungsspezifikation folgen, knnen
+optional mit den Zeichen \fB'\fP oder \fB"\fP zitiert werden, um Leerzeichen darin
+zu erlauben. Falls keine Kennzeichnungen fr das Symbol spezifiziert sind,
+werden Zitatzeichen als Teil des Symbolnamens behandelt, der bis zum ersten
+Leerzeichen geht.
+.P
+ (Kennz1=bin markiert|Name mit Leerraum)"zitiertes gekennz Symbol"@Base 1.0
+ (optional)gekennzeichnet_unzitiertes_Symbol@Base 1.0 1
+ ungekennzeichnetes_Symbol@Base 1.0
+.P
+Das erste Symbol im Beispiel heit \fIzitiertes gekennz Symbol\fP und hat zwei
+Kennzeichnungen: \fIKennz1\fP mit dem Wert \fIbin markiert\fP und \fIName mit
+Leerraum\fP ohne Wert. Das zweite Symbol heit
+\fIgekennzeichnet_unzitiertes_Symbol\fP und ist nur mit dem Kennzeichen namens
+\fIoptional\fP gekennzeichnet. Das letzte Symbol ist ein Beispiel eines
+normalen, nicht gekennzeichneten Symbols.
+.P
+Da Symbolkennzeichnungen eine Erweiterung des Formats \fIdeb\-symbols(5)\fP
+sind, knnen sie nur Teil der in Quellpaketen verwandten Symboldateien sein
+(diese Dateien sollten dann als Vorlagen zum Bau der Symboldateien, die in
+Binrpakete eingebettet werden, gesehen werden). Wenn \fBdpkg\-gensymbols\fP
+ohne die Option \fI\-t\fP aufgerufen wird, wird es alle Symbole ausgeben, die
+zum Format \fIdeb\-symbols(5)\fP kompatibel sind: Es verarbeitet die Symbole
+entsprechend der Anforderungen ihrer Standardkennzeichnungen und entfernt
+alle Kennzeichnungen aus der Ausgabe. Im Gegensatz dazu werden alle Symbole
+und ihre Kennzeichnungen (sowohl die Standardkennzeichnungen als auch die
+unbekannten) im Vorlagenmodus (\fI\-t\fP) in der Ausgabe beibehalten und in
+ihrer Originalform wie sie geladen wurden auch geschrieben.
+.SS Standard\-Symbolkennzeichnungen
+.TP 
+\fBoptional\fP
+Ein als optional gekennzeichnetes Symbol kann jederzeit von der Bibliothek
+verschwinden und wird nie zum Fehlschlag von \fBdpkg\-gensymbols\fP
+fhren. Verschwundene optionale Symbole werden kontinuierlich als MISSING
+(Fehlend) in dem Diff in jeder neuen Paketversion auftauchen. Dieses
+Verhalten dient als Erinnerung fr den Betreuer, dass so ein Symbol aus der
+Symboldatei entfernt oder wieder der Bibliothek hinzugefgt werden
+muss. Wenn das optionale Symbol, dass bisher als MISSING bezeichnet gewesen
+war, pltzlich in der nchsten Version wieder auftaucht, wird es wieder auf
+den Status existing (existierend) gebracht, wobei die minimale Version
+unverndert bleibt.
+
+Diese Markierung ist fr private Symbole ntzlich, deren Verschwinden keinen
+ABI\-Bruch auslst. Beispielsweise fallen die meisten
+C++\-Template\-Instanziierungen in diese Kategorie. Wie jede andere Markierung
+kann auch diese einen beliebigen Wert haben: sie knnte angeben, warum
+dieses Symbol als optional betrachtet wird.
+.TP 
+\fBarch=\fP\fIArchitekturliste\fP
+Die Markierung erlaubt es, den Satz an Architekturen einzugrenzen, auf denen
+das Symbol existieren sollte. Wenn die Symbolliste mit den in der Bibliothek
+entdeckten Symbolen aktualisiert wird, werden alle architekturspezifischen
+Symbole, die nicht auf die aktuelle Host\-Architektur passen, so behandelt,
+als ob sie nicht existierten. Falls ein architekturspezifisches Symbol, das
+auf die aktuelle Host\-Architektur passt, in der Bibliothek nicht existiert,
+werden die normalen Regeln fr fehlende Symbole angewandt und
+\fBdpkg\-gensymbols\fP knnte dadurch fehlschlagen. Auf der anderen Seite, falls
+das architekturspezifische Symbol gefunden wurde, wenn es nicht existieren
+sollte (da die aktuelle Host\-Architektur nicht in der Markierung aufgefhrt
+ist), wird sie architekturneutral gemacht (d.h. die Architekturmarkierung
+wird entfernt und das Symbol wird im Diff aufgrund dieser nderung
+auftauchen), aber es wird nicht als neu betrachtet.
+
+Beim Betrieb im standardmigen nicht\-Vorlagen\-Modus werden unter den
+architekturspezifischen Symbolen nur die in die Symboldatei geschrieben, die
+auf die aktuelle Host\-Architektur passen. Auf der anderen Seite werden beim
+Betrieb im Vorlagenmodus alle architekturspezifischen Symbole (darunter auch
+die von fremden Architekturen) immer in die Symboldatei geschrieben.
+
+Das Format der \fIArchitekturliste\fP ist das gleiche wie das des Feldes
+\fIBuild\-Depends\fP in \fIdebian/control\fP (auer den einschlieenden eckigen
+Klammern []). Beispielsweise wird das erste Symbol aus der folgenden Liste
+nur auf den Architekturen Alpha, Amd64, kFreebsd\-amd64 und Ia64 betrachtet,
+whrend das zweite berall auer auf Armel betrachtet wird.
+
+ (arch=alpha amd64 kfreebsd\-amd64 ia64)ein_64bit_spezifisches_Symbol@Base 1.0
+ (arch=!armel)Symbol_hat_Armel_nicht@Base 1.0
+.TP 
+\fBignore\-blacklist\fP
+dpkg\-gensymbols verfgt ber eine interne Ausschuliste (blacklist) von
+Symbolen, die nicht in Symboldateien auftauchen sollten, da sie
+normalerweise nur Seiteneffekte von Implementierungsdetails in der
+Werkzeugkette darstellen. Falls Sie aus irgendeinem Grund wollen, dass diese
+Symbole in der Symboldatei aufgenommen werden, sollten Sie das Symbol mit
+\fBignore\-blacklist\fP kennzeichnen. Dies kann fr einige grundlegende
+Bibliotheken der Werkzeugkette wie libgcc notwendig sein.
+.TP 
+\fBc++\fP
+Gibt \fIc++\fP\-Symbolmuster an. Lesen Sie den Unterabschnitt \fBVerwendung von
+Symbolmuster\fP unten.
+.TP 
+\fBsymver\fP
+Gibt \fIsymver\fP (Symbolversion)\-Symbolmuster an. Lesen Sie den Unterabschnitt
+\fBVerwendung von Symbolmuster\fP unten.
+.TP 
+\fBregex\fP
+Gibt \fIregex\fP\-Symbolmuster an. Lesen Sie den Unterabschnitt \fBVerwendung von
+Symbolmuster\fP unten.
+.SS "Verwendung von Symbolmustern"
+.P
+Anders als die Standardsymbolspezifikation kann ein Muster mehrere reale
+Symbole aus der Bibliothek abdecken. \fBdpkg\-gensymbols\fP wird versuchen,
+jedes Muster auf jedes reale Symbol, fr das \fIkein\fP spezifisches
+Symbolgegenstck in der Symboldatei definiert ist, zu passen. Wann immer das
+erste passende Muster gefunden wurde, werden alle Kennzeichnungen und
+Eigenschaften als Basisspezifikation des Symbols verwandt. Falls keines der
+Muster passt, wird das Symbol als neu betrachtet.
+
+Ein Muster wird als verloren betrachtet, falls es auf kein Symbol in der
+Bibliothek passt. Standardmig wird dies ein Versagen von
+\fBdpkg\-gensymbols\fP in der Stufe \fI\-c1\fP oder hher auslsen. Falls der
+Fehlschlag allerdings unerwnscht ist, kann das Muster mit der Kennzeichnung
+\fIoptional\fP markiert werden. Falls das Muster dann auf nichts passt wird es
+im Diff nur als MISSING (fehlend) auftauchen. Desweiteren kann das Muster
+wie jedes Symbol auf die spezielle Architektur mit der Kennzeichnung \fIarch\fP
+beschrnkt werden. Bitte lesen Sie den Unterabschnitt \fBStandard
+Symbolkennzeichnungen\fP oben fr weitere Informationen.
+
+Muster sind eine Erweiterung des Formats \fIdeb\-symbols(5)\fP; sie sind daher
+nur in Symboldatei\-Vorlagen gltig. Die Musterspezifikationssyntax
+unterscheidet sich nicht von der eines spezifischen Symbols. Allerdings
+dient der Symbolnamenteil der Spezifikation als Ausdruck, der gegen
+\fIName@Version\fP eines realen Symbols gepasst wird. Um zwischen den
+verschiedenen Mustertypen zu unterscheiden, wird es typischerweise mit einer
+speziellen Kennzeichnung gekennzeichnet.
+
+Derzeit untersttzt \fBdpkg\-gensymbols\fP drei grundlegene Mustertypen:
+.TP  3
+\fBc++\fP
+Dieses Muster wird durch die Kennzeichnung \fIc++\fP verzeichnet. Es passt nur
+auf die entworrenen (demangled) Symbolnamen (wie sie vom Hilfswerkzeug
+\fBc++filt\fP(1) ausgegeben werden). Dieses Muster ist sehr hilfreich um auf
+Symbole zu passen, bei dem die verworrenen (mangled) Namen sich auf
+verschiedenen Architekturen unterscheiden whrend die entworrenen die
+gleichen bleiben. Eine Gruppe solcher Symbole ist \fInon\-virtual thunks\fP, die
+einen architekturspezifischen Versatz in ihren verworrenen Namen eingebettet
+haben. Eine hufige Instanz dieses Falles ist ein virtueller Destruktur, der
+unter rautenfrmiger Vererbung ein nicht\-virtuelles Thunk\-Symbol
+bentigt. Selbst wenn beispielsweise _ZThn8_N3NSB6ClassDD1Ev@Base auf 32
+Bit\-Architekturen _ZThn16_N3NSB6ClassDD1Ev@Base auf 64 Bit\-Architekturen
+ist, kann es mit einem einzigen \fIc++\fP\-Muster gepasst werden:
+.RS
+.PP
+libdummy.so.1 libdummy1 #MINVER#
+ [...]
+ (c++)"non\-virtual thunk to NSB::ClassD::~ClassD()@Base" 1.0
+ [...]
+.P
+Der entworrene Name oben kann durch Ausfhrung folgenden Befehls erhalten
+werden:
+.PP
+ $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt
+.P
+Bitte beachten Sie, dass per Definition zwar der verworrene Name in der
+Bibliothek eindeutig ist, die aber nicht notwendigerweise fr die
+entworrenen Namen zutrifft. Ein Satz von unterschiedlichen realen Symbolen
+knnen den gleichen entworrenen Namen haben. Beispielsweise ist das der Fall
+bei nicht\-virtuellen Thunk\-Symbolen in komplexen Vererbungskonfigurationen
+oder bei den meisten Konstruktoren und Destruktoren (da g++ typischerweise
+zwei reale Symbole fr sie generiert). Da diese Kollisionen aber auf dem
+ABI\-Niveau passieren, sollten sie nicht die Qualitt der Symboldatei
+reduzieren.
+.RE
+.TP 
+\fBsymver\fP
+Dieses Muster wird durch die Kennzeichnung \fIsymver\fP verzeichnet. Gut
+betreute Bibliotheken verfgen ber versionierte Symbole, wobei jede Version
+zu der Version der Originalautoren passt, in der dieses Symbol hinzugefgt
+wurde. Falls das der Fall ist, knnen SIe ein \fIsymver\fP\-Muster verwenden, um
+auf jedes zu einer spezifizierten Version zugeordnete Symbol zu
+passen. Beispiel:
+.RS
+.PP
+libc.so.6 libc6 #MINVER#
+ (symver)GLIBC_2.0 2.0
+ [...]
+ (symver)GLIBC_2.7 2.7
+ access@GLIBC_2.0 2.2
+.PP
+Alle Version GLIBC_2.0 und GLIBC_2.7 zugeordneten Symbole werden zu einer
+minimalen Version 2.0 bzw. 2.7 fhren, wobei das Symbol access@GLIBC_2.0 die
+Ausnahme darstellt. Es wird zu einer minimalen Abhngigkeit auf libc6
+Version 2.2 fhren, obwohl es im Geltungsbereich des Musters
+(symver)GLIBC_2.0 passt, da spezielle Symbole vor Mustern Vorrang haben.
+.P
+Bitte beachten Sie, dass Platzhaltermuster im alten Format (angezeigt durch
+*@version im Symbolnamenfeld) zwar noch untersttzt werden, sie aber durch
+die Syntax im neuen Format (symver|optional)version abgelst
+wurden. Beispielsweise sollte *@GLIBC_2.0 2.0 als
+(symver|optional)GLIBC_2.0 2.0 geschrieben werden, falls das gleiche
+Verhalten bentigt wird.
+.RE
+.TP 
+\fBregex\fP
+Muster mit regulren Ausdrcken werden durch die Kennzeichnung \fIregex\fP
+verzeichnet. Sie passen auf den regulren Ausdruck von Perl, der im
+Symbolnamenfeld angegeben ist. Ein regulrer Ausdruck wird wie er ist
+gepasst. Denken Sie daher daran, ihn mit dem Zeichen \fI^\fP zu beginnen, da er
+ansonsten auf jeden Teil der Zeichenkette des realen Symbols \fIname@version\fP
+passt. Beispiel:
+.RS
+.PP
+libdummy.so.1 libdummy1 #MINVER#
+ (regex)"^mystack_.*@Base$" 1.0
+ (regex|optional)"private" 1.0
+.P
+Symbole wie mystack_new@Base, mystack_push@Base, mystack_pop@Base
+usw. werden vom ersten Muster gepasst, whrend dies z.B. fr
+ng_mystack_new@Base nicht der Fall ist. Das zweite Muster wird auf alle
+Symbole, die die Zeichenkette private in ihren Namen enthalten, passen und
+die gepassten Symbole erben die Kennzeichnung \fIoptional\fP vom Muster.
+.RE
+.P
+Die oben aufgefhrten grundlegenden Muster knnen \- wo es Sinn ergibt \-
+kombiniert werden. In diesem Fall werden sie in der Reihenfolge verarbeitet,
+in der die Kennzeichnungen angegeben sind. Im Beispiel
+.PP
+ (c++|regex)"^NSA::ClassA::Private::privmethod\ed\e(int\e)@Base" 1.0
+ (regex|c++)N3NSA6ClassA7Private11privmethod\edEi@Base 1.0
+.P
+werden die Symbole _ZN3NSA6ClassA7Private11privmethod1Ei@Base und
+_ZN3NSA6ClassA7Private11privmethod2Ei@Base gepasst. Beim Passen der ersten
+Musters wird das rohe Symbol erst als C++\-Symbol entworren, dann wird der
+entworrende Name gegen den regulren Ausdruck gepasst. Auf der anderen Seite
+wird beim Passen des zweiten Musters der regulre Ausdruck gegen den rohen
+Symbolnamen gepasst, dann wird das Symbol berprft, ob es ein C++\-Symbol
+ist, indem das Entwirren versucht wird. Ein Fehlschlag eines einfachen
+Musters wird zum Fehlschlag des gesamten Musters fhren. Daher wird
+beispielsweise __N3NSA6ClassA7Private11privmethod\edEi@Base keines der
+Muster passen, da es kein gltiges C++\-Symbol ist.
+.P
+Im Allgemeinen werden die Muster in zwei Kategorien eingeteilt: Aliase
+(grundlegende \fIc++\fP\- und \fIsymver\fP\-Muster) und generische Muster (\fIregex\fP
+und alle Kombinationen grundlegender Muster). Passen von grundlegenden
+alias\-basierenden Mustern ist schnell (O(1)), whrend generische Muster O(N)
+(wobei N die Anzahl der generischen Muster ist) fr jedes Symbol ist. Daher
+wird empfohlen, generische Muster nicht zu viel zu verwenden.
+.P
+Wenn mehrere Muster auf das gleiche Symbol passen, werden Aliase (zuerst
+\fIc++\fP, dann \fIsymver\fP) gegenber den generischen Mustern
+bevorzugt. Generische Muster werden in der Reihenfolge, in der sie in der
+Symboldateivorlage gefunden werden, gepasst, bis zum ersten Erfolg. Beachten
+Sie aber, dass das manuelle Anordnen der Vorlagendateieintrge nicht
+empfohlen wird, da \fBdpkg\-gensymbols\fP Diffs basierend auf der
+alphanumerischen Reihenfolge ihrer Namen erstellt.
+.SS "Includes verwenden"
+.P
+Wenn der Satz der exportierten Symbolen sich zwischen Architekturen
+unterscheidet, kann es ineffizient werden, eine einzige Symboldatei zu
+verwenden. In diesen Fllen kann sich eine Include\-Direktive in einer Reihe
+von Arten als ntzlich erweisen:
+.IP \(bu 4
+Sie knnen den gemeinsamen Teil in eine externe Datei auslagern und diese
+Datei dann in Ihre \fIPaket\fP.symbols.\fIArch\fP\-Datei mit einer
+include\-Direktive wie folgt einbinden:
+
+#include "\fIPakete\fP.symbols.common"
+.IP \(bu
+Die Include\-Direktive kann auch wie jedes Symbol gekennzeichnet werden:
+
+(Kennzeichen|...|KennzeichenN)#include "einzubindende\-Datei"
+
+Als Ergebnis werden alle Symbole aus \fIeinzubindende\-Datei\fP standardmig
+als mit \fIKennzeichen\fP ... \fIKennzeichenN\fP gekennzeichnet betrachtet. Sie
+knnen diese Funktionalitt benutzen, um eine gemeinsame Datei
+\fIPaket\fP.symbols zu erstellen, die architekturspezifische Symboldateien
+einbindet:
+
+  common_symbol1@Base 1.0
+ (arch=amd64 ia64 alpha)#include "Paket.symbols.64bit"
+ (arch=!amd64 !ia64 !alpha)#include "Paket.symbols.32bit"
+  common_symbol2@Base 1.0
+.P
+Die Symboldateien werden Zeile fr Zeile gelesen und include\-Direktiven
+werden bearbeitet, sobald sie erkannt werden. Das bedeutet, dass der Inhalt
+der Include\-Datei jeden Inhalt berschreiben kann, der vor der
+Include\-Direktive aufgetaucht ist und Inhalt nach der Direktive alles aus
+der Include\-Datei berschreiben kann. Jedes Symbol (oder sogar weitere
+#include\-Direktiven) in der Include\-Datei kann zustzliche Kennzeichnungen
+spezifizieren oder Werte der vererbtgen Kennzeichnungen in ihrer
+Kennzeichnungsspezifikation berschreiben. Allerdings gibt es keine
+Mglichkeit fr ein Symbol, die ererbten Kennzeichnungen zu berschreiben.
+.P
+Eine eingebundene Datei kann die Kopfzeile wiederholen, die den SONAME der
+Bibliothek enthlt. In diesem Fall berschreibt sie jede vorher gelesene
+Kopfzeile. Allerdings ist es im Allgemeinen am Besten, die Wiederholung von
+Kopfzeilen zu vermeiden. Ein Weg dies zu erreichen, ist wie folgt:
+.PP
+#include "libirgendwas1.symbols.common"
+ arch_spezifisches_Symbol@Base 1.0
+.SS "Gute Bibliotheksverwaltung"
+.P
+Eine gut verwaltete Bibliothek hat die folgenden Eigenschaften:
+.IP \(bu 4
+seine API ist stabil (ffentliche Symbole entfallen nie, nur neue
+ffentliche Symbole werden hinzugefgt) und inkompatible nderungen erfolgen
+nur, wenn sich der SONAME ndert,
+.IP \(bu 4
+idealerweise verwendet sie Symbolversionierung, um ABI\-Stabilitt trotz
+interner nderungen und API\-Erweiterungen zu erreichen,
+.IP \(bu 4
+sie exportiert nie private Symbole (als Hilfslsung knnen diese als
+optional gekennzeichnet werden).
+.P
+Bei der Verwaltung der Symboldatei kann das Auftauchen und Verschwinden von
+Symbolen leicht bemerkt werden. Es ist aber schwieriger, inkompatbile API\-
+und ABI\-nderungen zu bemerken. Daher sollte der Betreuer intensiv die
+Changelog\-Eintrge durchschauen und nach Fllen suchen, in denen die Regeln
+der guten Bibliotheksverwaltung gebrochen wurden. Falls mgliche Probleme
+entdeckt wurden, sollten der Originalautor informiert werden, da eine
+Korrektur vom Originalautor immer besser als eine Debian\-spezifische
+Hilfslsung ist.
+.SH OPTIONEN
+.TP 
+\fB\-P\fP\fIPaketbauverzeichnis\fP
+Suche nach \fIPaketbauverzeichnis\fP statt nach debian/tmp.
+.TP 
+\fB\-p\fP\fIPaket\fP
+Definiert den Paketnamen. Bentigt, falls mehr als ein binres Paket in
+debian/control aufgefhrt ist (oder falls es keine Datei debian/control
+gibt).
+.TP 
+\fB\-v\fP\fIVersion\fP
+Definiert die Paketversion. Standardmig wird eie Version aus
+debian/changelog ausgelesen. Bentigt, falls der Aufruf auerhalb des
+Quellpaketbaums erfolgt.
+.TP 
+\fB\-e\fP\fIBibliotheksdatei\fP
+Nur die explizit aufgefhrten Bibliotheken untersuchen statt alle
+ffentlichen Bibliotheken zu finden. Sie knnen einen regulren Ausdruck in
+\fIBibliotheksdatei\fP verwenden, um mehrere Bibliotheken mit einem einzelnen
+Argument zu passen (andernfalls bentigen Sie mehrere \fB\-e\fP).
+.TP 
+\fB\-I\fP\fIDateiname\fP
+Verwende \fIDateiname\fP als Referenzdatei, um die Symboldatei zu erstellen,
+die dann im Paket selbst integriert wird.
+.TP 
+\fB\-O\fP
+Gebe die erstellte Symboldatei in die Standardausgabe aus statt sie im
+Paketbaubaum zu speichern.
+.TP  
+\fB\-O\fP\fIDateiname\fP
+Speichere die erstellte Symboldatei unter \fIDateiname\fP. Falls \fIDateiname\fP
+bereits existiert, wird deren Inhalt als Grundlage fr die erstellte
+Symboldatei verwandt. Sie knnen diese Funktionalitt benutzen, um eine
+Symboldatei zu aktualisieren, so dass sie zu einer neueren Version der
+Originalautoren Ihrer Bibliothek passt.
+.TP 
+\fB\-t\fP
+Schreibe die Symboldatei im Vorlagenmodus statt im zu \fIdeb\-symbols(5)\fP
+kompatiblen Format. Der Hauptunterschied besteht darin, dass im
+Vorlagenmodus die Symbolnamen und Kennzeichnungen in ihrer Originalform
+geschrieben werden, im Gegensatz zu den verarbeiteten Symbolnamen mit
+entfernen Kennzeichnungen im Kompatibilittsmodus. Desweiteren knnten
+einige Symbole beim Schreiben einer Standard \fIdeb\-symbols(5)\fP\-Datei
+entfernt werden (gem der Verarbeitungsregeln fr Kennzeichen), whrend in
+der Symboldateivorlage immer alle Symbole geschrieben werden.
+.TP 
+\fB\-c\fP\fI[0\-4]\fP
+Definiert die Prfungen, die beim Vergleich der erstellten Symboldatei mit
+der Vorlagendatei als Startpunkt erfolgen sollen. Standardardstufe ist
+1. Zunehmende Stufen fhren mehr Prfungen durch und enthalten alle
+Prfungen der niedrigeren Stufen. Stufe 0 schlgt nie fehl. Stufe 1 schlgt
+fehl, wenn einige Symbole verschwunden sind. Stufe 2 schlgt fehlt, falls
+einige neue Symbole eingefhrt wurden. Stufe 3 schlgt fehl, falls einige
+Bibliotheken verschwunden sind. Stufe 4 schlgt fehl, falls einige
+Bibliotheken hinzugekommen sind.
+
+Dieser Wert kann von der Umgebungsvariablen DPKG_GENSYMBOLS_CHECK_LEVEL
+berschrieben werden.
+.TP 
+\fB\-q\fP
+Ruhig verhalten und nie einen Diff zwischen der erstellten Symboldatei und
+der als Startpunkt verwandten Vorlagendatei erstellen oder keine Warnungen
+bezglich neuer/verlorender Bibliotheken oder neuer/verlorender Symbole
+ausgeben. Diese Option deaktiviert nur die informative Ausgabe aber nicht
+die Prfungen selbst (sehen Sie hierzu die Option \fI\-c\fP).
+.TP 
+\fB\-a\fP\fIArchitektur\fP
+Nehme \fIArch\fP als Host\-Architektur beim Verarbeiten der Symboldateien
+an. Verwenden Sie diese Option, um Symboldateien oder Diffs fr beliebige
+Architekturen zu erstellen, vorausgesetzt, die Binrprogramme sind bereits
+verfgbar.
+.TP 
+\fB\-d\fP
+Debug\-Modus aktivieren. Eine Vielzahl von Nachrichten wird angezeigt, um zu
+erklren, was \fBdpkg\-gensymbols\fP durchfhrt.
+.TP 
+\fB\-V\fP
+Ausfhrlichen Modus aktivieren. Die erstellte Symboldatei enthlt veraltete
+Symbole als Kommentare. Im Vorlagenmodus werden Mustersymbole desweiteren
+von Kommentaren gefolgt, die die echten Symbole auffhren, die auf dieses
+Muster passen.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBhttp://people.redhat.com/drepper/symbol\-versioning\fP
+.br
+\fBhttp://people.redhat.com/drepper/goodpractice.pdf\fP
+.br
+\fBhttp://people.redhat.com/drepper/dsohowto.pdf\fP
+.br
+\fBdeb\-symbols\fP(5), \fBdpkg\-shlibdeps\fP(1).
+.
+.SH AUTOREN
+Copyright \(co 2007\-2009 Rapha\[:e]l Hertzog
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-maintscript-helper.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-maintscript-helper.1
--- dpkg/man/de/dpkg-maintscript-helper.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-maintscript-helper.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,158 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-maintscript\-helper 1 2011\-08\-14 Debian\-Projekt dpkg\-Programmsammlung
+.SH NAME
+dpkg\-maintscript\-helper \- Bekannte Einschrnkungen in Dpkg in
+Betreuerskripten umgehen
+.
+.SH BERSICHT
+\fBdpkg\-maintscript\-helper\fP \fIBefehl\fP [\fIParameter\fP...] \fB\-\-\fP
+\fIBetr\-Skript\-Parameter\fP...
+.
+.SH "BEFEHLE UND PARAMETER"
+.P
+\fBrm_conffile\fP \fIConffile\fP [\fIletzteVersion\fP [\fIPaket\fP]]
+.P
+\fBmv_conffile\fP \fIAlteConffile\fP \fINeueConffile\fP [\fIletzteVersion\fP [\fIPaket\fP]]
+.
+.SH BESCHREIBUNG
+.P
+Dieses Programm wurde so entworfen, dass es in Betreuerskripten ausgefhrt
+werden kann, um einige Aufgaben zu erledigen, die Dpkg (noch) nicht selbst
+erledigen kann, entweder aufgrund von Design\-Entscheidungen oder aufgrund
+aktueller Einschrnkungen.
+.P
+Viele dieser Aufgaben bentigen koordinierte Aktionen aus mehreren
+Betreuerskripten (\fBpreinst\fP, \fBpostinst\fP, \fBprerm\fP, \fBpostrm\fP). Um Fehler
+zu vermeiden, wird der gleiche Aufruf einfach in alle Skripte eingefgt und
+das Programm wird sein Verhalten automatisch abhngig von der Variable
+\fBDPKG_MAINTSCRIPT_NAME\fP und den Argumenten im Betreuerskript, die Sie nach
+einem doppelten Schrgstrich bergeben mssen, anpassen.
+.
+.SH "CONFFILE\-BEZOGENE AUFGABEN"
+.P
+Beim Upgrade eines Pakets wird Dpkg ein Conffile (eine Konfigurationsdatei,
+bei der Dpkg die nderungen des Benutzers erhalten soll) nicht automatischen
+entfernen, falls sie nicht in der neueren Version enthalten ist. Es gibt
+zwei Hauptgrnde dafr; der erste ist, dass die Conffile versehentlich
+entfallen sein und die nchste Version sie wieder herstellen knnte und die
+Benutzer die nderung nicht weggeworfen sehen wollen. Der zweite besteht
+darin, dass Paketen erlaubt werden soll, von einer Dpkg\-betreuten Conffile
+auf eine Datei, die von den Betreuerskripten des Pakets, normalerweise mit
+einem Werkzeug wie Debconf oder Ucf, verwaltet wird, umzustellen.
+.P
+Das bedeutet, falls ein Paket eine Conffile umbenennen oder entfernen soll,
+muss es dies explizit durchfhren und \fBdpkg\-maintscript\-helper\fP kann dazu
+verwandt werden, eine sanfte Lschung und Verschiebung von Conffiles
+innerhalb von Betreuerskripten durchzufhren.
+.
+.SS "EINE CONFFILE ENTFERNEN"
+.P
+Falls eine Conffile komplett entfernt wird, sollte sie von der Platte
+entfernt werden, falls der Benutzer sie nicht verndert hat. Falls es lokale
+Anpassungen gibt, sollten diese erhalten werden. Falls das Upgrade des
+Pakets abgebrochen wird, sollte die neuerdings veraltete Conffile nicht
+verschwinden.
+.P
+All dies wird durch Einsetzen der folgenden Shell\-Schnipsel in die
+Betreuerskripte \fBpreinst\fP, \fBpostinst\fP und \fBpostrm\fP implementiert:
+.P
+    dpkg\-maintscript\-helper rm_conffile \e
+        \fIConffile\fP \fIletzteVersion\fP \fIPaket\fP \-\- "$@"
+.P
+\fIConffile\fP ist der Dateiname der zu entfernenden Conffile. \fIletzteVersion\fP
+ist die letzte Version des Pakets, das die Conffile enthielt (oder die
+letzte Version des Pakets, das sich nicht darum kmmerte, die veraltete
+Conffile zu lschen, falls dies nicht sofort implementiert wurde). Falls
+\fIletzteVersion\fP leer oder entfallen ist wird die Durchfhrung bei jedem
+Upgrade versucht. \fIPaket\fP ist der Paketname. Er ist optional, da er
+standardmig mit $DPKG_MAINTSCRIPT_PACKAGE belegt ist (diese Variable wird
+von Dpkg auf den Namen des momentan in Bearbeitung befindlichen Pakets
+gesetzt). Alle Parameter des Betreuerskripts mssen nach \-\- an das
+Programm weitergeleitet werden.
+.P
+Aktuelle Implementierung: im \fBpreinst\fP wird geprft, ob die Conffile
+gendert wurde. Dann wird sie entweder in \fIConffile\fP\fB.dpkg\-remove\fP (falls
+sie nicht gendert wurde) oder in \fIConffile\fP\fB.dpkg\-backup\fP (falls sie
+gendert wurde) umbenannt. Im \fBpostinst\fP wird letztere in
+\fIConffile\fP\fB.dpkg\-bak\fP umbenannt und als Referenz behalten, da sie
+Benutzernderungen enthlt, whrend erstere entfernt wird. Falls das Upgrade
+des Pakets abgebrochen wird, reinstalliert \fBpostrm\fP die ursprngliche
+Conffile. Whrend des vollstndigen Lschens wird \fBpostrm\fP auch die bisher
+behaltene Datei \fB.dpkg\-bak\fP entfernen.
+.
+.SS "EINE CONFFILE UMBENENNEN"
+.P
+Falls eine Conffile von einem Ort zu einem anderen verschoben wird, mssen
+Sie sicherstellen, dass Sie auch alle nderungen des Benutzers mit
+bernehmen. Anfnglich erscheint dies als einfache nderung am Skript
+\fBpreinst\fP, allerdings wird dies dazu fhren, dass der Benutzer von Dpkg
+aufgefordert wird, die Bearbeitung der Conffile zu besttigen, obwohl sie
+fr diese gar nicht verantwortlich sind.
+.P
+Sanfte Umbenennung kann durch Einsetzen der folgenden Shell\-Schnipsel in die
+Betreuerskripte \fBpreinst\fP, \fBpostinst\fP und \fBpostrm\fP implementiert werden:
+.P
+    dpkg\-maintscript\-helper mv_conffile \e
+        \fIalteConffile\fP \fIneueConffile\fP \fIletzteVersion\fP \fIPaket\fP \-\- "$@"
+.P
+\fIalteConffile\fP und \fIneueConffile\fP sind der alte und der neue Name der
+umzubenennenden Conffile. \fIletzteVersion\fP ist die letzte Version des
+Pakets, die die Conffile mit dem alten Namen enthielt. Falls
+\fIletzteVersion\fP leer oder entfallen ist, wird die Durchfhrung bei jedem
+Upgrade versucht (Hinweis: Es ist sicherer, die Version anzugeben und die
+Durchfhrung nur einmal versuchen zu lassen). \fIPaket\fP ist der Paketname. Er
+ist optional, da er standardmig mit $DPKG_MAINTSCRIPT_PACKAGE belegt ist
+(diese Variable wird von Dpkg auf den Namen des momentan in Bearbeitung
+befindlichen Pakets gesetzt). Alle Parameter des Betreuerskripts mssen nach
+\-\- an das Programm weitergeleitet werden.
+.P
+Aktuelle Implementierung: das \fBpreinst\fP berprft, ob die Conffile
+verndert wurde, falls ja, verbleibt sie am Platz, andernfalls wird sie in
+\fIalteConffile\fP\fB.dpkg\-remove\fP umbenannt. Bei der Konfiguration entfernt das
+\fBpostinst\fP \fIalteConffile\fP\fB.dpkg\-remove\fP und bennent \fIalteConffile\fP in
+\fIneueConffile\fP um, falls \fIalteConffile\fP noch existiert. Falls
+abort\-upgrade/abort\-install eintritt, benennt das \fBpostrm\fP wieder
+\fIalteConffile\fP\fB.dpkg\-remove\fP in \fIalteConffile\fP zurck, falls notwendig.
+.
+.SH "INTEGRATION IN PAKETE"
+.P
+Da \fBdpkg\-maintscript\-helper\fP im \fBpreinst\fP verwandt wird, bentigt der
+bedingungslose Einsatz eine pre\-Abhngigkeit (\fIpre\-dependency\fP), um
+sicherzustellen, dass die Mindestversion von Dpkg breits entpackt wurde. Die
+bentigte Version hngt vom verwandten Befehl ab, fr \fBrm_conffile\fP und
+\fBmv_conffile\fP lautet sie 1.15.7.2:
+.P
+    \fBPre\-Depends:\fP dpkg (>= 1.15.7.2)
+.P
+In vielen Fllen sind aber die Ausfhrungen des Programms fr das Paket
+nicht kritisch und statt einer pre\-Abhngigkeit soll das Programm nur
+aufgerufen werden, falls bekannt ist, dass der bentigte Befehl vom derzeit
+installierten Dpkg untersttzt wird:
+.P
+    if dpkg\-maintscript\-helper supports \fIcommand\fP; then
+        dpkg\-maintscript\-helper \fIcommand\fP ...
+    fi
+.
+.SH AUTOREN
+Copyright \(co 2010 Rapha\[:e]l Hertzog
+.br
+Copyright \(co 2008 Joey Hess
+.br
+Copyright \(co 2007 Guillem Jover
+.br
+Copyright \(co 2005 Scott James Remnant
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
+
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-mergechangelogs.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-mergechangelogs.1
--- dpkg/man/de/dpkg-mergechangelogs.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-mergechangelogs.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,85 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-mergechangelogs 1 2011\-08\-14 Debian\-Projekt dpkg\-Programmsammlung
+.SH NAME
+dpkg\-mergechangelogs \- 3\-Wege\-Zusammenfhrung von debian/changelog\-Dateien
+.
+.SH BERSICHT
+\fBdpkg\-mergechangelogs\fP [\fIOption\fP...] \fIalt\fP \fIneu\-a\fP \fIneu\-b\fP [\fIAusgabe\fP]
+.
+.SH BESCHREIBUNG
+.P
+Dieses Programm wird die drei bereitgestellten Versionen des
+Debian\-Changelogs verwenden, um eine zusammengefhrte Changelog\-Datei zu
+erstellen. Das resultierende Changelog wird in der Datei \fIAusgabe\fP
+gespeichert oder an die Standardausgabe ausgegeben, falls dieser Parameter
+fehlt.
+.P
+Jeder Eintrag wird durch seine Versionsnummer identifiziert und es wird
+angenommen, dass sie nicht im Konflikt stehen, sie werden einfach in der
+richtigen Reihenfolge eingemischt (in absteigender Reihenfolge). Wenn
+\fB\-\-merge\-prereleases\fP verwandt wird, wird der Anteil der Versionsnummer
+nach der letzten Tilde entfernt, so dass 1.0\-1~exp1 und 1.0\-1~exp5 als
+gleicher Eintrag angenommen werden. Wenn die gleiche Version sowohl in
+\fIneu\-a\fP als auch in \fIneu\-b\fP verfgbar ist, wird eine normale,
+zeilenbasierte 3\-Wege\-Zusammenfhrung versucht (vorausgesetzt, dass das
+Modul Algorithm::Merge verfgbar ist \[em] es ist Teil des Pakets
+libalgorithm\-merge\-perl \[em] andernfalls erhalten Sie einen globalen
+Konflikt im Inhalt des Eintrags).
+.
+.SH OPTIONEN
+.TP 
+\fB\-\-merge\-prereleases\fP, \fB\-m\fP
+Entfernt den Teil nach der letzten Tilde in der Versionsnummer beim
+Versionsvergleich, um festzustellen, ob zwei Eintrge identisch sein sollen
+oder nicht.
+.sp
+Dies ist ntzlich, wenn Sie den gleichen Changelog\-Eintrag beibehalten, aber
+regelmig die Versionsnummer erhhen. Beispielsweise knnten Sie
+2.3\-1~exp1, 2.3\-1~exp2, ... bis zur offiziellen Verffentlichung 2.3\-1
+verwenden und alle enthalten den gleichen Changelog\-Eintrag, der sich im
+Laufe der Zeit entwickelt hat.
+.TP 
+\fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH EINSCHRNKUNGEN
+.P
+Alles, was nicht von Dpkg::Changelog ausgewertet werden kann, geht beim
+Zusammenfhren verloren. Dies betrifft Zeug wie Modelines von Vim,
+Kommentare, die eigentlich nicht da sein sollten, usw.
+.
+.SH "INTEGRATION MIT GIT"
+.P
+Falls Sie dieses Programm dazu verwenden mchten, Debian\-Changelog\-Dateien
+in einem Git\-Depot zusammenzufhren, mssen Sie zuerst einen neuen
+Merge\-Driver in \fB.git/config\fP oder in \fB~/.gitconfig\fP registrieren:
+.P
+ [merge "dpkg\-mergechangelogs"]
+     name = debian/changelog merge driver
+     driver = dpkg\-mergechangelogs \-m %O %A %B %A
+.P
+Dann mssen Sie entweder in \fB.gitattributes\fP im Depot selbst oder in
+\&\fB.git/info/attributes\fP das Merge\-Attribut fr die Datei debian/changelog
+einrichten:
+.P
+ debian/changelog merge=dpkg\-mergechangelogs
+.SH AUTOR
+Copyright \(co 2009\-2010 Rapha\[:e]l Hertzog
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
+
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-name.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-name.1
--- dpkg/man/de/dpkg-name.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-name.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,109 @@
+.\" This is an -*- nroff -*- source file.
+.\" dpkg-name and this manpage are Copyright © 1995,1996 by Erick Branderhorst.
+.\"
+.\" This is free software; see the GNU General Public Licence version 2
+.\" or later for copying conditions.  There is NO warranty.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-name 1 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-name \- Debian\-Pakete zu vollen Paketnamen umbenennen
+.
+.SH BERSICHT
+\fBdpkg\-name\fP [\fIOption\fP...] [\fB\-\-\fP] \fIDatei\fP...
+.
+.SH BESCHREIBUNG
+.PP
+Diese Handbuchseite dokumentiert das \fBdpkg\-name\fP\-Programm, das eine
+einfache Mglichkeit bereitstellt, \fBDebian\fP\-Pakete in ihren vollen
+Paketnamen umzubenennen. Ein voller Paketname besteht aus
+\fIPaket\fP\fB_\fP\fIVersion\fP\fB_\fP\fIArchitektur\fP\fB.\fP\fIPakettyp\fP wie in der
+Steuerdatei des Pakets spezifiziert. Der \fIVersion\fP\-Teil des Dateinamens
+besteht aus der Versionsinformation der Originalautoren optional gefolgt von
+einem Gedankenstrich und der Revisionsinformation. Der \fIPakettyp\fP\-Teil
+entstammt dem Feld \fIpackage_type\fP (falls vorhanden) oder wird auf \fBdeb\fP
+gesetzt.
+.
+.SH OPTIONEN
+.TP 
+\fB\-a\fP, \fB\-\-no\-architecture\fP
+Der Zieldateiname wird keine Architekturinformation enthalten.
+.TP 
+\fB\-k\fP, \fB\-\-symlink\fP
+Lege einen Symlink an, anstatt zu verschieben.
+.TP 
+\fB\-o\fP, \fB\-\-overwrite\fP
+Existierende Dateien werden berschrieben, falls sie den gleichen Namen wie
+der Zieldateiname haben.
+.TP 
+\fB\-s\fP, \fB\-\-subdir\fP [\fIVerzeichnis\fP]
+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 Steuerteils des Pakets extrahiert. Das Zielverzeichnis
+wird unstable/binary\-\fIArchitektur\fP/\fIBereich\fP sein. Falls der Bereich
+nicht in der Steuerdatei gefunden werden kann, dann wird no\-section
+angenommen, und in diesem Fall, wie auch fr die Bereiche non\-free und
+contrib ist das Zielverzeichnis \fIBereich\fP/binary\-\fIArchitektur\fP. 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.
+.TP 
+\fB\-c\fP, \fB\-\-create\-dir\fP
+Diese Option kann zusammen mit der Option \-s verwendet werden. Falls das
+Zielverzeichnis nicht gefunden werden kann, wird es automatisch
+angelegt. \fBVerwenden Sie diese Option mit Vorsicht.\fP
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-v\fP, \fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH BEISPIELE
+.TP 
+\fBdpkg\-name bar\-foo.deb\fP
+Die Datei bar\-foo.deb wird in bar\-foo_1.0\-2_i386.deb oder etwas hnliches
+(abhngig von der Information, die in dem Steuerteil von bar\-foo.deb ist)
+umbenannt.
+.TP 
+\fBfind /root/debian/ \-name \(aq*.deb\(aq | xargs \-n 1 dpkg\-name \-a\fP
+Alle Dateien mit der Endung deb im Verzeichnis /root/debian und seiner
+Unterverzeichnisse werden von dpkg\-name \- falls notwendig \- ohne
+Architekturinformation umbenannt.
+.TP 
+\fBfind \-name \(aq*.deb\(aq | xargs \-n 1 dpkg\-name \-a \-o \-s \-c\fP
+\fBMachen Sie dies nicht.\fP Ihr Archiv wird eine komplette Schweinerei werden,
+da viele Pakete nicht mit Bereichsinformationen kommen. \fBMachen Sie dies
+nicht.\fP
+.TP 
+\fBdpkg \-\-build debian\-tmp && dpkg\-name \-o \-s .. debian\-tmp.deb\fP
+Dies kann beim Bau neuer Pakete verwendet werden.
+.
+.SH FEHLER
+Einige Pakete folgen nicht der Namensstruktur
+\fIPaket\fP\fB_\fP\fIVersion\fP\fB_\fP\fIArchitektur\fP\fB.deb\fP. Pakete, die von dpkg\-name
+umbenannt wurden, folgen dieser Struktur. Im Allgemeinen hat diese keinen
+Einfluss darauf, wie Pakete von \fBdselect\fP(1)/\fBdpkg\fP(1) installiert werden,
+aber andere Installationswerkzeuge knnen von dieser Benennungsstruktur
+abhngen.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\fP(1), \fBdpkg\-deb\fP(1), \fBfind\fP(1),
+\fBxargs\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995,1996 Erick Branderhorst
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-parsechangelog.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-parsechangelog.1
--- dpkg/man/de/dpkg-parsechangelog.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-parsechangelog.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,137 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-parsechangelog 1 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-parsechangelog \- auswerten von Debian changelog\-Dateien
+.
+.SH BERSICHT
+\fBdpkg\-parsechangelog\fP [\fIOption\fP...]
+.
+.SH BESCHREIBUNG
+\fBdpkg\-parsechangelog\fP liest das nderungsprotokoll (changelog) eines
+entpackten Debian\-Quellcodebaums ein, wertet diese aus und gibt die
+Informationen in der Standard\-Ausgabe in maschinenlesbarer Form aus.
+.
+.SH OPTIONEN
+.TP 
+\fB\-l\fP\fIChangelog\-Datei\fP
+Gibt die nderungsprotokolldatei an, aus der Informationen gelesen werden
+sollen. Standardmig \fBdebian/changelog\fP.
+.TP 
+\fB\-F\fP\fIChangelog\-Format\fP
+Gibt das Format der nderungsprotokolldatei an. Standardmig wird das
+Format aus einer speziellen Zeile in der Nhe des Endes der
+nderungsprotokolldatei gelesen oder, falls dies fehlschlgt, wird das
+Debian\-Standardformat angenommen.
+.TP 
+\fB\-L\fP\fIlibverzeichnis\fP
+Spezifiziere ein zustzliches Verzeichnis, dass nach Parser\-Skripten
+durchsucht werden soll. Diese Verzeichnis wird vor den
+Standardverzeichnissen (derzeit \fB/usr/local/lib/dpkg/parsechangelog\fP und
+\fB/usr/lib/dpkg/parsechangelog\fP) durchsucht.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.SS Parser\-Optionen:
+Die folgenden Optionen knnen verwendet werden, um die Ausgabe des
+Changelog\-Parsers zu beinflussen, z.B. den Bereich der Eintrge oder das
+Format der Ausgabe. Sie mssen vom in Frage kommenden Parser\-Skript
+untersttzt werden. Lesen Sie auch \fBWARNUNGEN\fP.
+.TP 
+\fB\-\-format\fP\fI Ausgabeformat\fP
+Setze das Ausgabeformat. Derzeit werden die Werte \fIdpkg\fP und \fIrfc822\fP
+untersttzt. \fIdpkg\fP ist das klassische Ausgabeformat (es existiert lnger
+als diese Option), das voreingestellt ist. Es besteht aus einem Absatz im
+Debian\-Steuerformat (lesen Sie \fBdeb\-control\fP(5)). Falls mehr als ein
+Eintrag angefordert wird, dann werden die meisten Felder aus dem letzten
+Eintrag verwendet, falls dies nicht anders angegeben wird:
+.RS
+.TP 
+\fBSource:\fP\fI Paketname\fP
+.TP 
+\fBVersion:\fP\fI Version\fP
+.TP 
+\fBDistribution:\fP\fI Ziel\-Distribution\fP
+.TP 
+\fBUrgency:\fP\fI Dringlichkeit\fP
+Die hchste Dringlichkeit aller enthaltenen Eintrge wird verwendet.
+.TP 
+\fBMaintainer:\fP\fI Autor\fP
+.TP 
+\fBDate:\fP\fI Datum\fP
+.TP 
+\fBCloses:\fP\fI Fehlernummer\fP
+Die Felder Closes aller enthaltenen Eintrge werden zusammengefasst.
+.TP 
+\fBChanges:\fP\fI Changelog\-Eintrge\fP
+Der Text aller Changelog\-Eintrge wird aneinandergehngt. Um aus diesem Feld
+ein gltiges mehrzeiliges Feld im Debian Steuer\-Format zu bekomen, werden
+leere Zeilen mit einem einzelnen Satzpunkt ersetzt und alle Zeilen durch ein
+Leerzeichen eingerckt. Der genaue Inhalt hngt vom Changelog\-Format ab.
+.RE
+.IP
+Es knnen zustzliche benutzerdefinierte Felder vorhanden sein.
+.IP
+Das \fBrfc822\fP\-Format verwendet die gleichen Felder, gibt aber einzelne
+Abstze fr jeden Changelog\-Eintrag aus, so dass alle Metadaten fr jeden
+Eintrag erhalten bleiben.
+.TP 
+\fB\-\-since\fP \fIVersion\fP, \fB\-s\fP\fIVersion\fP,\fB \-v\fP\fIVersion\fP
+fge alle nderungen neuer als aus \fIVersion\fP hinzu.
+.TP 
+\fB\-\-until\fP \fIVersion\fP, \fB\-u\fP\fIVersion\fP
+fge alle nderungen lter als aus \fIVersion\fP hinzu.
+.TP 
+\fB\-\-from\fP \fIVersion\fP, \fB\-f\fP\fIVersion\fP
+fge alle nderungen aus oder neuer als aus \fIVersion\fP hinzu.
+.TP 
+\fB\-\-to\fP \fIVersion\fP, \fB\-t\fP\fIVersion\fP
+fge alle nderungen aus oder lter als aus \fIVersion\fP hinzu.
+.TP 
+\fB\-\-count\fP \fIAnzahl\fP, \fB\-c\fP\fIAnzahl\fP, \fB\-n\fP\fIAnzahl\fP
+fge \fIAnzahl\fP Eintrge vom Kopf (oder vom Fu, falls \fIAnzahl\fP negativ ist)
+hinzu.
+.TP 
+\fB\-\-offset\fP \fIZahl\fP, \fB\-o\fP\fIZahl\fP
+ndere den Startpunkt fr \-\-count, gezhlt vom Kopf (oder Fu falls, falls
+\fIZahl\fP negativ ist).
+.TP 
+\fB\-\-all\fP
+alle nderungen aufnehmen. Hinweis: Andere Optionen haben keine Wirkung,
+wenn diese verwandt wird.
+.
+.SH WARNUNG
+Alle \fBParser\-Optionen\fP auer \-v werden nur von \fBdpkg\fP Version 1.14.16 oder
+neuer untersttzt. Parser von Dritten fr Changelog\-Formate auer \fIdebian\fP
+knnten nicht alle Optionen untersttzen.
+.
+.SH DATEIEN
+.TP 
+\fBdebian/changelog\fP
+Die changelog\-Datei wird verwendet, um versionsabhngige Informationen ber
+das Quellpaket, wie beispielsweise die Dringlichkeit (urgency) und die
+Distribution des Uploads, die nderungen seit einer bestimmten
+Verffentlichung und die Quellversionsnummer selbst zu erhalten.
+.
+.SH AUTOREN
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2007, 2008 Frank Lichtenheld
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-query.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-query.1
--- dpkg/man/de/dpkg-query.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-query.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,238 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-query 1 2011\-08\-14 Debian\-Projekt dpkg\-Programmsammlung
+.SH NAME
+dpkg\-query \- ein Werkzeug, um die dpkg\-Datenbank abzufragen
+.
+.SH BERSICHT
+\fBdpkg\-query\fP [\fIOption\fP...] \fIBefehl\fP
+.
+.SH BESCHREIBUNG
+\fBdpkg\-query\fP ist ein Werkzeug, um Informationen ber Pakete zu zeigen, die
+in der \fBdpkg\fP\-Datenbank aufgefhrt sind.
+.
+.SH BEFEHLE
+.TP 
+\fB\-l\fP, \fB\-\-list\fP [\fIPaketname\-Muster\fP ...]
+Liste Pakete auf, deren Namen auf ein bestimmtes Muster passt. Falls kein
+\fIPaketname\-Muster\fP angegeben ist, liste alle Pakete in
+\fI/var/lib/dpkg/status\fP auf. Dabei werden alle Pakete ausgeschlossen, die
+als nicht\-installiert markiert sind (d.h. frher endgltig entfernt
+wurden). Beachten Sie, dass Sie wahrscheinlich \fIPaketname\-Muster\fP durch
+Anfhrungszeichen schtzen mssen, um die Shell an der Dateinamen\-Expansion
+zu hindern. Folgender Befehl listet beispielsweise alle Paketnamen, die mit
+libc6 beginnen, auf:
+
+.nf
+  \fBdpkg\-query \-l \(aqlibc6*\(aq\fP
+.fi
+
+Die ersten drei Spalten der Ausgabe zeigen die gewnschte Aktion, den
+Paketstatus und Fehler, in dieser Reihenfolge.
+
+Gewnschte Aktion:
+.nf
+  u = Unbekannt
+  i = Installieren
+  h = Halten
+  r = Entfernen
+  p = Vollstndig Lschen
+.fi
+
+Paketstatus:
+.nf
+  n = Nicht installiert
+  c = Config\-Datei
+  H = Halb installiert
+  U = Entpackt
+  F = Fehlgeschl. Konfiguration
+  W = Trigger erWartet
+  t = Trigger anhngig
+  i = Installiert
+.fi
+
+Fehler\-Schalter:
+.nf
+  <leer> = (kein)
+  R = Neuinstallation notwendig
+.fi
+
+Ein Grobuchstabe als Status oder Fehler zeigt an, dass das Paket
+wahrscheinlich schwere Fehler verursachen wird. Bitte lesen Sie \fBdpkg\fP(1)
+ber die oben genannten Zustnde und Schalter.
+
+Das Ausgabeformat dieser Option kann nicht konfiguriert werden, variiert
+aber automatisch mit der Terminalbreite. Die Ausgabe ist fr menschliche
+Leser gedacht und nicht leicht maschinenlesbar. Lesen Sie ber die Optionen
+\fB\-W\fP (\fB\-\-show\fP) und \fB\-\-showformat\fP, um das Ausgabeformat zu
+konfigurieren.
+.TP 
+\fB\-W\fP, \fB\-\-show\fP [\fIPaketname\-Muster\fP ...]
+Genau wie die \fB\-\-list\fP\-Option wird dies alle Pakete, die auf das angegebene
+Muster passen, auffhren. Allerdings kann die Ausgabe mit der
+\fB\-\-showformat\fP\-Option angepasst werden. Im Standardausgabeformat wird eine
+Zeile pro passendem Paket ausgegeben, wobei in jeder Zeile Name und
+installierte Version des Pakets getrennt durch einen Tabulator enthalten
+sind.
+.TP 
+\fB\-s\fP, \fB\-\-status\fP \fIPaketname\fP ...
+Berichte Zustand des angegebenen Paketes. Dies zeigt nur den Eintrag in der
+Datenbank der Zustnde der installierten Pakete. Wenn mehrere \fIPaketname\fP
+aufgefhrt sind, werden die angeforderten Statuseintrge durch Leerzeilen
+getrennt.
+.TP 
+\fB\-L\fP, \fB\-\-listfiles\fP \fIPaketname\fP ...
+Auffhren von Dateien, die durch \fIPaketname\fP installiert wurden. Wenn
+mehrere \fIPaketname\fP aufgefhrt sind, werden die angeforderten Dateilisten
+durch Leerzeilen getrennt. Beachten Sie aber, dass Dateien, die durch
+Paket\-spezifische Installationsskripte angelegt wurden, nicht aufgefhrt
+werden.
+.TP 
+\fB\-c\fP, \fB\-\-control\-path\fP \fIPaketname\fP [\fISteuerdatei\fP]
+Listet die Pfade fr Steuerdateien auf, die von \fIPaketname\fP auf Ihrem
+System installiert wurden. Falls \fISteuerdatei\fP angegeben wurde, liste nur
+den Pfad fr diese Steuerdatei auf, falls sie existiert. \fBWarnung:\fP: Dieser
+Befehl ist halb\-ffentlich, er sollte nur als letzter Rettungsanker verwandt
+werden, falls keine weitere Schnittstelle verfgbar ist. Er knnte spter
+veraltet werden, falls bessere Schnittstellen oder die aktuellen,
+Architektur\-bedingten Defizite gelst wurden.
+.TP 
+\fB\-S\fP, \fB\-\-search\fP \fIDateiname\-Suchmuster\fP ...
+Suche nach Paketen, denen Paketen, die auf ein bestimmtes Muster passen,
+gehren. Die normalen Jokerzeichen (wildcards) der Shell knnen in diesem
+Muster verwandt werden. Dieser Befehl wird weder die zustzlichen Dateien,
+die durch Betreuer\-Skripte angelegt wurden, noch Alternativen auffhren.
+.TP 
+\fB\-p\fP, \fB\-\-print\-avail\fP \fIPaketname\fP
+Zeige Details ber \fIPaketname\fP an, wie diese in \fI/var/lib/dpkg/available\fP
+vorliegen. Wenn mehrere \fIPaketname\fP aufgefhrt sind, werden die
+angeforderten \fIavailable\fP\-Eintrge durch Leerzeilen getrennt.
+
+Benutzer APT\-basierter Oberflchen sollten \fBapt\-cache show\fP \fIPaketname\fP
+verwenden, da die Datei \fIavailable\fP nur bei der Benutzung von \fBdselect\fP
+aktuell bleibt.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH OPTIONEN
+.TP 
+\fB\-\-admindir=\fP\fIVerz\fP
+ndert den Ablageort der \fBdpkg\fP\-Datenbank. Der Standardort ist
+\fI/var/lib/dpkg\fP.
+.TP 
+\fB\-f\fP, \fB\-\-showformat=\fP\fIFormat\fP
+Diese Option wird dazu verwendet, das Format der Ausgabe anzugeben, das
+\fB\-\-show\fP verwenden wird. Das Format ist eine Zeichenkette, die fr jedes
+aufgefhrte Paket ausgegeben wird.
+
+In der Formatzeichenkette leitet \(lq\fB\e\fP\(rq Escape\-Sequenzen ein:
+
+.nf
+    \fB\en\fP  Zeilenumbruch
+    \fB\er\fP  Wagenrcklauf
+    \fB\et\fP  Tabulator
+.fi
+
+\(lq\fB\e\fP\(rq vor einem anderen Zeichen unterdrckt jede spezielle Bedeutung
+des folgenden Zeichens. Dies ist fr \(lq\fB\e\fP\(rq und \(lq\fB$\fP\(rq
+ntzlich.
+
+Paketinformationen knnen einbezogen werden, indem Variablenreferenzen auf
+Paketfelder eingefgt werden. Hierbei wird folgende Syntax verwendet:
+\(lq\fB${\fP\fIFeld\fP[\fB;\fP\fIBreite\fP]\fB}\fP\(rq. Felder werden rechtsbndig
+ausgegeben, falls die Breite nicht negativ ist und somit linksbndige
+Ausgabe erfolgt. Die folgenden \fIFeld\fPer werden verstanden, sind aber nicht
+notwendigerweise in der Status\-Datei verfgbar (nur interne Felder oder
+Felder, die im Binrpaket abgespeichert sind, landen dort):
+
+.nf
+    \fBArchitecture\fP
+    \fBBugs\fP
+    \fBConffiles\fP (intern)
+    \fBConfig\-Version\fP (intern)
+    \fBConflicts\fP
+    \fBBreaks\fP
+    \fBDepends\fP
+    \fBDescription\fP
+    \fBEnhances\fP
+    \fBEssential\fP
+    \fBFilename\fP (intern, Oberflchen\-bezogen)
+    \fBHomepage\fP
+    \fBInstalled\-Size\fP
+    \fBMD5sum\fP (intern, Oberflchen\-bezogen)
+    \fBMSDOS\-Filename\fP (intern, Oberflchen\-bezogen)
+    \fBMaintainer\fP
+    \fBOrigin\fP
+    \fBPackage\fP
+    \fBPre\-Depends\fP
+    \fBPriority\fP
+    \fBProvides\fP
+    \fBRecommends\fP
+    \fBReplaces\fP
+    \fBRevision\fP (veraltet)
+    \fBSection\fP
+    \fBSize\fP (intern, Oberflchen\-bezogen)
+    \fBSource\fP
+    \fBStatus\fP (intern)
+    \fBSuggests\fP
+    \fBTag\fP (normalerweise nicht in dem .deb sondern in den Packages\-Dateien des Depots
+    \fBTriggers\-Awaited\fP (intern)
+    \fBTriggers\-Pending\fP (intern)
+    \fBVersion\fP
+.fi
+
+Die Standard\-Formatzeichenkette ist
+\(lq\fB${Package}\et${Version}\en\fP\(rq. Tatschlich knnen auch alle anderen
+Felder, die in der Statusdatei gefunden werden knnen
+(d.h. benutzerdefinierte Felder), abgefragt werden. Sie werden so
+dargestellt, wie sie gefunden werden, es erfolgt keine Umwandlung oder
+Fehlerberprfung. Um den Namen des Dpkg\-Betreuers und die installierte
+Version zu erhalten, knnten Sie folgendes ausfhren:
+
+.nf
+  \fBdpkg\-query \-W \-f=\(aq${Package} ${Version}\et${Maintainer}\en\(aq dpkg\fP
+.fi
+.
+.SH RCKGABEWERT
+.TP 
+\fB0\fP
+Die angeforderte Abfrage wurde erfolgreich ausgefhrt.
+.TP 
+\fB1\fP
+Beim Lesen der Kommandozeile oder beim Ausfhren der Abfrage traten Probleme
+auf. Dazu gehren auch keine Datei oder Paket gefunden (auer fr
+\-\-control\-path).
+.
+.SH UMGEBUNG
+.TP 
+\fBDPKG_ADMINDIR\fP
+Falls gesetzt und die Option \fB\-\-admindir\fP nicht verwandt wurde, wird dies
+als Datenverzeichnis von Dpkg verwandt.
+.TP 
+\fBCOLUMNS\fP
+Diese Einstellung beeinflusst die Ausgabe der \fB\-\-list\fP\-Option durch
+Verndern der Breite ihrer Ausgabe.
+.
+.SH AUTOR
+Copyright \(co 2001 Wichert Akkerman
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\fP(1).
+
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-scanpackages.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-scanpackages.1
--- dpkg/man/de/dpkg-scanpackages.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-scanpackages.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,105 @@
+.\" Copyright © 1996 Michael Shields <shields@crosslink.net>
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-scanpackages 1 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-scanpackages \- erstelle Packages\-Index\-Dateien
+.
+.SH BERSICHT
+\fBdpkg\-scanpackages\fP [\fIOption\fP...] \fIBinr\-Verz\fP [\fIoverride\-Datei\fP
+[\fIPfad\-Prfix\fP]] \fB>\fP \fIPakete\fP
+.
+.SH BESCHREIBUNG
+\fBdpkg\-scanpackages\fP schaut durch einen Baum von Debian\-Binrpaketen und
+erstellt eine Packages\-Datei, die von \fBapt\fP(8), \fBdselect\fP(1)
+usw. verwendet wird, um dem Benutzer zu erzhlen, welche Pakete zur
+Installation verfgbar sind. Diese Packages\-Dateien sind die gleichen, die
+auch auf den Debian\-Archiv\-Sites und CD\-ROMs vorliegen. Sie knnen selbst
+\fBdpkg\-scanpackages\fP verwenden, falls Sie ein Verzeichnis von lokalen
+Paketen zur Installation auf einem Cluster von Maschinen anlegen.
+.PP
+\fBHinweis:\fP Falls Sie auf die erzeugte Packages\-Datei mit \fBapt\fP zugreifen
+wollen, werden Sie wahrscheinlich die Datei mit \fBbzip2\fP(1) komprimieren
+mssen (und damit ein Packages.bz2\-Datei erstellen). Apt ignoriert \-
+abgesehen von lokalem Zugriff (d.h. ber \fBfile://\fP\-Quellen) \-
+unkomprimierte Packages\-Dateien.
+.PP
+\fIBinr\-Verz\fP ist der Name des zu verarbeitenden Baums von Binrpaketen
+(beispielsweise \fBcontrib/binary\-i386\fP). 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.
+.PP
+\fIoverride\-Datei\fP ist der Name einer einzulesenden Datei, die Informationen
+darber enthlt, wie das Paket in die Distribution passt (sie kann eine
+komprimierte Datei sein); siehe \fBdeb\-override\fP(5).
+.PP
+\fIPfad\-Prfix\fP ist eine optionale Zeichenkette, die vor das Dateinamenfeld
+gehngt werden soll.
+.PP
+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.
+.
+.SH OPTIONEN
+.TP 
+\fB\-t\fP, \fB\-\-type\fP \fITyp\fP
+Suche nach *.\fITyp\fP statt *.deb\-Paketen.
+.TP 
+\fB\-u\fP, \fB\-\-udeb\fP
+\fBVeralteter\fP Alias fr \fB\-tudeb\fP.
+.TP 
+\fB\-e\fP, \fB\-\-extra\-override\fP \fIDatei\fP
+Durchsuche \fIDatei\fP, um zustzliche Overrides zu finden (die Datei kann
+komprimiert sein). Lesen Sie \fBdeb\-extra\-override\fP(5) fr weitere
+Informationen ber deren Format.
+.TP 
+\fB\-a\fP, \fB\-\-arch\fP \fIarch\fP
+Verwende ein Muster, das aus \fI*_all.deb\fP und \fI*_arch.deb\fP besteht, statt
+nach allen Debs zu suchen.
+.TP 
+\fB\-m\fP, \fB\-\-multiversion\fP
+Nimm alle gefundenen Pakete in der Ausgabe auf.
+.TP 
+\fB\-M\fP, \fB\-\-medium\fP \fIID\-Zeichenkette\fP
+Fge ein Feld X\-Medium hinzu, das den Wert von \fIID\-Zeichenkette\fP
+enthlt. Dieses Feld wird bentigt, falls Sie die Dateien \fBPackages.cd\fP fr
+den Einsatz mit der Multicd\-Zugriffsmethode von Dselect erstellen wollen.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH DIAGNOSE
+\fBdpkg\-scanpackages\fP gibt die gewhnlichen selbsterklrenden Fehler aus. Es
+warnt auch ber Pakete, die im falschen Unterverzeichnis sind, doppelt
+vorkommen, ein Filename\-Feld in ihrer Steuerdatei haben, in der
+Override\-Datei fehlen oder fr die Betreuer\-Substitutionen vorliegen, die
+keinen Effekt haben.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\fP(1), \fBdselect\fP(1), \fBdeb\-override\fP(5), \fBdeb\-extra\-override\fP(5),
+\fBdpkg\-scansources\fP(1).
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-scansources.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-scansources.1
--- dpkg/man/de/dpkg-scansources.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-scansources.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,81 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-scansources 1 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-scanpackages \- erstelle Quell\-Index\-Dateien
+.
+.SH BERSICHT
+\fBdpkg\-scansources\fP [\fIOption\fP...] \fIBinr\-Verz\fP [\fIoverride\-Datei\fP
+[\fIPfad\-Prefix\fP]] \fB>\fP \fISources\fP
+.
+.SH BESCHREIBUNG
+\fBdpkg\-scansources\fP durchsucht das bergebene \fIBinr\-Verz\fP nach
+\&\fI.dsc\fP\-Dateien. Diese werden verwendet, um einen Debian\-Quell\-Index zu
+erstellen, der auf der Standardausgabe ausgegeben wird.
+.PP
+Die \fIoverride\-Datei\fP wird, falls angegeben, verwendet, um die Prioritten
+in den ergebenen Index\-Datenstzen zu setzen und sich ber das Betreuer\-Feld
+in den \fI.dsc\fP\-Dateien hinwegzusetzen. Diese Datei kann komprimiert
+sein. Lesen Sie \fBdpkg\-scanpackages\fP(1) fr das Format dieser
+Datei. \s-1Beachten Sie\s0: Da die override\-Datei nach Binr\- und nicht
+Quellpaketen indiziert wird, gibt es hier ein kleines Problem. Die aktuelle
+Implementierung verwendet die hchste Prioritt aller von einer
+\&\fI.dsc\fP\-Datei erzeugten Binrpakete fr die Prioritt des Quellpakets, und
+den Inhalt fr das Hinwegsetzen ber die Betreuer\-Information aus dem
+Eintrag fr das erste in der \fI.dsc\fP\-Datei aufgefhrte Binrpaket. Dies
+knnte sich ndern.
+.PP
+Der \fIPfad\-Prfix\fP 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
+enthlt.
+.
+.PP
+\fBHinweis:\fP Falls Sie auf die erzeugte Sources\-Datei mit \fBapt\fP(8) zugreifen
+wollen, werden Sie wahrscheinlich die Datei mit \fBgzip\fP(1) komprimieren
+mssen (und damit ein Sources.gz\-Datei erstellen). Apt ignoriert \- abgesehen
+von lokalem Zugriff (d.h. ber \fBfile://\fP\-Quellen) \- unkomprimierte
+Sources\-Dateien.
+.
+.SH OPTIONEN
+.IP "\fB\-n\fP, \fB\-\-no\-sort\fP" 4
+Sortiere die Index\-Datenstze nicht. Normalerweise werden sie nach
+Quellpaketnamen sortiert.
+.TP 
+.IP "\fB\-e\fP, \fB\-\-extra\-override\fP \fIDatei\fP" 4
+Durchsuche \fIDatei\fP, um zustzliche Overrides zu finden (die Datei kann
+komprimiert sein). Lesen Sie \fBdeb\-extra\-override\fP(5) fr weitere
+Informationen ber deren Format.
+.IP "\fB\-s\fP, \fB\-\-source\-override\fP \fIDatei\fP" 4
+Verwenden Sie \fIDatei\fP als Quell\-override\-Datei (die Datei kann komprimiert
+sein). Die Standardeinstellung ist der Name der override\-Datei, die Sie
+angegeben haben, um \fI.src\fP ergnzt.
+.sp
+Die Quell\-override\-Datei hat ein anderes Format als die
+Binr\-override\-Datei.Sie enthlt 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 fr die Einstellung des Bereichs.
+.IP \fB\-\-debug\fP 4
+Schalte Debugging ein.
+.IP \fB\-\-help\fP 4
+Zeige den Bedienungshinweis und beende.
+.IP \fB\-\-version\fP 4
+Gebe die Version aus und beende sich.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdeb\-override\fP(5), \fBdeb\-extra\-override\fP(5), \fBdpkg\-scanpackages\fP(1).
+.
+.SH AUTOR
+Roderick Schertler <roderick@argon.org>
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-shlibdeps.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-shlibdeps.1
--- dpkg/man/de/dpkg-shlibdeps.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-shlibdeps.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,318 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-shlibdeps 1 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-shlibdeps \- erstelle Substvar\-Abhngigkeiten fr Laufzeitbibliotheken
+.
+.SH BERSICHT
+\fBdpkg\-shlibdeps\fP [\fIOption\fP...] [\fB\-e\fP]\fIProgramm\fP [\fIOption\fP...]
+.
+.SH BESCHREIBUNG
+\fBdpkg\-shlibdeps\fP berechnet Abhngigkeiten von Laufzeitbibliotheken fr
+Programme, deren Name als Argument bergeben werden. Die Abhngigkeiten
+werden zu der Datei der Substitutionsvariablen \fBdebian/substvars\fP als
+Variablennamen \fBshlibs:\fP\fIAbhngigkeitsfeld\fP hinzugefgt, wobei
+\fIAbhngigkeitsfeld\fP der Feldname einer Abhngigkeit ist. Alle anderen
+Variablen, die mit \fBshlibs:\fP beginnen, werden aus der Datei entfernt.
+.P
+\fBdpkg\-shlibdeps\fP hat zwei mgliche Informationsquellen zur Erstellung der
+Abhngigkeitsinformationen. Entweder \fISymbol\fP\- oder
+\fIShlibs\fP\-Dateien. \fBdpkg\-shlibdeps\fP findet fr jedes Programm, das es
+analysiert, die Bibliotheken heraus, gegen die es gelinkt ist. Bei jeder
+Bibliothek schaut es entweder in die \fISymbol\fP\- oder in in \fIShlibs\fP\-Datei
+(falls erstere nicht existiert odr falls debian/shlibs.local die relevanten
+Abhngigkeiten enthlt). Beide Dateien sollten von dem Bibliothekspaket
+bereitgestellt werden und sollten daher als
+/var/lib/dpkg/info/\fIPaket\fP.\fISymbol\fP oder
+/var/lib/dpkg/info/\fIPaket\fP.\fIShlibs\fP verfgbar sein. Der Paketname wird in
+zwei Schritten identifiziert: zuerst wird die Bibliotheksdatei auf dem
+System gefunden (durch Prfung der gleichen Verzeichnisse wie bei \fBld.so\fP),
+dann wird \fBdpkg \-S \fP\fIBibliotheksdatei\fP verwendet, um das Paket, das die
+Bibliothek bereitstellt, zu ermitteln.
+.SS Symboldateien
+Symboldateien enthalten feiner\-granulare Abhngigkeitsinformationen, indem
+sie die Minimalabhngigkeit fr jedes von der Bibliothek exportierte Symbol
+beschreiben. Das Skript versucht, eine Symboldatei die zu dem
+Bibliothekspaket gehrt, an den folgenden Orten zuzuordnen (der erste
+Treffer wird verwendet):
+.IP debian/*/DEBIAN/symbols
+Informationen ber Laufzeitbibliotheken, die vom aktuellen Bauprozess
+erstellt werden, der auch \fBdpkg\-shlibdeps\fP aufruft. Sie werden von
+\fBdpkg\-gensymbols\fP(1) erstellt. Sie werden nur verwendet, falls die
+Bibliothek im Bau\-Baum des Pakets gefunden wird. Die Symboldatei im Bau\-Baum
+hat Vorrang gegenber Symboldateien aus anderen Binrpaketen.
+.IP /etc/dpkg/symbols/\fIPaket\fP.symbols.\fIArchitektur\fP
+.IP /etc/dpkg/symbols/\fIPaket\fP.symbols
+Systemabhngige berschreibung der Abhngigkeitsinformationen von
+Laufzeitbibliotheken. \fIArchitektur\fP ist die Architektur des aktuellen
+Systems (ermittelt durch \fBdpkg\-architecture \-qDEB_HOST_ARCH\fP).
+.IP "Ausgabe von \(lq\fBdpkg\-query \-\-control\-path\fP \fIPaket\fP symbols\(rq"
+Vom Paket bereitgestellte Abhngigkeitsinformationen fr
+Laufzeitbibliotheken. Falls nicht durch \-\-admindir berschrieben, befinden
+sich solche Dateien unter /var/lib/dpkg.
+.P
+Whrend des Durchsuchens aller vom Programm verwendeten Symbole erinnert
+sich \fBdpkg\-shlibdeps\fP an die grte Minimalversion, die von jeder
+Bibliothek bentigt wird. Am Ende des Prozesses ist es in der Lage, die
+minimale Abhngigkeit fr jede eingesetzte Bibliothek zu schreiben
+(vorausgesetzt, die Informationen in den \fISymbol\fP\-Dateien sind korrekt).
+.P
+Als Sicherheitsmanahme kann eine Symbols\-Datei ein Meta\-Informationsfeld
+\fIBuild\-Depends\-Package\fP enthalten. \fBdpkg\-shlibdeps\fP extrahiert dann die
+minimale Version, die von dem korrespondierenden Paket im Feld Build\-Depends
+bentigt wird, und verwendet diese Version, falls sie hher ist als die
+minimale Version, die beim Durchsuchen der Symbole ermittelt wurde.
+.SS Shlibs\-Dateien
+Shlibs\-Dateien ordnen Bibliotheken direkt Abhngigkeiten zu (ohne auf die
+Symbole zu schauen). Daher ist dies oft strker als bentigt, aber dafr
+sicher und leicht zu handhaben.
+.P
+Die Abhngigkeiten fr eine Bibliothek wird an verschiedenen Stellen
+nachgeschlagen. Die erste Datei, die Informationen fr die betrachtete
+Bibliothek bereitstellt, wird verwendet:
+.IP debian/shlibs.local
+Paket\-beschrnkte berschreibung der Abhngigkeitsinformationen von
+Laufzeitbibliotheken.
+.IP /etc/dpkg/shlibs.override
+Systemabhngige berschreibung der Abhngigkeitsinformationen von
+Laufzeitbibliotheken.
+.IP debian/*/DEBIAN/shlibs
+Informationen ber Laufzeitbibliotheken, die vom aktuellen Bauprozess
+erstellt werden, der auch \fBdpkg\-shlibdeps\fP aufruft. Sie werden nur
+verwendet, falls die Bibliothek im Bau\-Verzeichnis eines Pakets gefunden
+wird. Die Shlibs\-Datei in diesem Bau\-Verzeichnis hat gegenber
+Shlibs\-Dateien von anderen Binrpaketen Vorrang.
+.IP "Ausgabe von \(lq\fBdpkg\-query \-\-control\-path\fP \fIPaket\fP shlibs\(rq"
+Vom Paket bereitgestellte Abhngigkeitsinformationen fr
+Laufzeitbibliotheken. Falls nicht durch \-\-admindir berschrieben, befinden
+sich solche Dateien unter /var/lib/dpkg.
+.IP /etc/dpkg/shlibs.default
+Systemabhngige Vorgaben fr Abhngigkeitsinformationen von
+Laufzeitbibliotheken.
+.P
+Die extrahierten Abhngigkeiten werden direkt verwendet (es sei den, sie
+werden als Dubletten herausgefiltert oder sie sind schwcher als eine andere
+Abhngigkeit).
+.SH OPTIONEN
+\fBdpkg\-shlibdeps\fP interpretiert nicht\-Options\-Argumente als Namen von
+ausfhrbaren Programmen, als ob diese mit \fB\-e\fP\fIProgramm\fP bergeben worden
+wren.
+.TP 
+\fB\-e\fP\fIProgramm\fP
+Abhngigkeiten aufnehmen, die fr von \fIProgramm\fP bentigte
+Laufzeitbibliotheken angemessen sind.
+.TP 
+\fB\-d\fP\fIAbhngigkeitsfeld\fP
+Fge Abhngigkeiten hinzu, die zum Abhngigkeitsfeld \fIAbhngigkeitsfeld\fP
+der Steuerdatei hinzugefgt werden sollen. (Die Abhngigkeiten fr dieses
+Feld werden in die Variable \fBshlibs:\fP\fIAbhngigkeitsfeld\fP geschrieben.)
+
+Die Option \fB\-d\fP\fIAbhngigkeitsfeld\fP betrifft alle Programme, die danach
+angegeben werden, bis zum nchsten \fB\-d\fP\fIAbhngigkeitsfeld\fP. Der
+Standardwert fr \fIAbhngigkeitsfeld\fP ist \fBDepends\fP.
+
+Falls der gleiche Abhngigkeitseintrag (oder ein Satz von Alternativen) mehr
+als einmal in den erkannten Abhngigkeitsfeldnamen \fBPre\-Depends\fP,
+\fBDepends\fP, \fBRecommends\fP, \fBEnhances\fP oder \fBSuggests\fP auftaucht, wird
+\fBdpkg\-shlibdeps\fP die Abhngigkeit von allen Feldern auer dem, das die
+wichtigsten Abhngigkeiten reprsentiert, entfernen.
+.TP 
+\fB\-p\fP\fIVariablennameprfix\fP
+Beginn die Substitutionsvariablen mit \fIVariablennameprfix\fP\fB:\fP statt mit
+\fBshlibs:\fP. Entsprechend werden alle Substitutionsvariablen, die mit
+\fIVariablennameprfix\fP\fB:\fP (statt mit \fBshlibs:\fP) beginnen, aus den
+Substitutionsvariablen entfernt.
+.TP 
+\fB\-O\fP
+Gebe die Variableneinstellung in die Standardausgabe aus, statt sie zu der
+Substitutionsvariablendatei (standardmig (\fBdebian/substvars\fP)
+hinzuzufgen.
+.TP 
+\fB\-t\fP\fITyp\fP
+Bevorzuge Abhngigkeitsinformationen fr Laufzeitbibliotheken, die fr ein
+vorgegebenes Paket markiert sind. Falls keine Markierungsinformation
+verfgbar ist, fllt dies auf unmarkierte Informationen zurck. Der
+Standard\-Pakettyp ist deb. Abhngigkeitsinformationen fr
+Laufzeitbibliotheken werden fr einen vorgegebenen Typ markiert, indem vor
+sie der Namen des Typs, ein Doppelpunkt und ein Leerzeichen gesetzt wird.
+.TP 
+\fB\-L\fP\fIlokalshlibsdatei\fP
+Lese die Hinwegsetz\-Abhngigkeiten von Laufzeitbibliotheken aus
+\fIlokalshlibsdatei\fP statt aus \fBdebian/shlibs.local\fP.
+.TP 
+\fB\-T\fP\fIsubstvardatei\fP
+Schreibe Substitutionsvariablen in \fISubstvardatei\fP; standardmig
+\fBdebian/substvars\fP.
+.TP 
+\fB\-v\fP
+Aktiviere ausfhrlichen Modus. Eine Vielzahl von Nachrichten wird angezeigt,
+um zu erklren, was \fBdpkg\-shlibdeps\fP durchfhrt.
+.TP 
+\fB\-x\fP\fIPaket\fP
+Schliee das Paket von den generierten Abhngigkeiten aus. Dies ist fr
+Pakete ntzlich, die ELF\-Programmdateien (Programme oder
+Bibliothekserweiterungen) bereitstellen, die eine Bibliothek im gleichen
+Paket verwenden, um selbst\-Abhngigkeiten zu vermeiden. Diese Option kann
+mehrfach verwendet werden, um mehrere Pakete auszuschlieen.
+.TP 
+\fB\-S\fP\fIPaketbauverzeichnis\fP
+Schaue beim Versuch, eine Bibliothek zu finden, zuerst in
+\fIPaketbauverzeichnis\fP. Dies ist ntzlich, wenn das Quellpaket mehrere
+Spielarten der gleichen Bibliothek baut und Sie sicherstellen wollen, dass
+Sie die Abhngigkeit aus einem bestimmten Binrpaket erhalten. Sie knnen
+diese Option mehrfach verwenden: Verzeichnisse werden in der gleichen
+Reihenfolge vor Verzeichnissen anderer Binrpakete probiert.
+.TP 
+\fB\-\-ignore\-missing\-info\fP
+Falls keine Abhngigkeitsinformationen fr die Laufzeitbibliothek gefunden
+werden kann, erfolgt kein Fehlschlag. Von der Verwendung dieser Option wird
+abgearten, da alle Bibliotheken Abhngigkeitsinformationen bereitstellen
+sollten (entweder ber shlibs\-Dateien oder ber symbols\-Dateien), selbst
+falls diese noch nicht von anderen Paketen verwendet werden.
+.TP 
+\fB\-\-warnings=\fP\fIWert\fP
+\fIWert\fP ist ein Bitfeld, das den Satz an Warnungen definiert, die von
+\fBdpkg\-shlibdeps\fP ausgegeben werden knnen. Bit 0 (Wert=1) aktiviert die
+Warnung Symbol \fISym\fP, verwendet von \fIProgramm\fP, in keiner der
+Bibliotheken gefunden., Bit 1 (Wert=2) aktiviert die Warnung Abhngigkeit
+von \fIBibliothek\fP knnte vermieden werden und Bit 2 (Wert=4) aktiviert die
+Warnung \fIProgramm\fP sollte nicht gegen \fIBibliothek\fP gelinkt
+werden. Standardmig ist \fIWert\fP 3: die ersten zwei Warnungen sind
+standardmig aktiv, die letzte nicht. Setzten Sie \fIWert\fP auf 7, falls Sie
+mchten, dass alle Warnungen aktiv sein sollen.
+.TP 
+\fB\-\-admindir=\fP\fIVerz\fP
+ndert den Ablageort der \fBdpkg\fP\-Datenbank. Der Standardort ist
+\fI/var/lib/dpkg\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH WARNUNGEN
+Da \fBdpkg\-shlibdeps\fP den Symbolsatz, der von jedem Programm des erstellten
+Pakets verwendet wird, analysiert, ist es in mehreren Fllen in der Lage,
+Warnungen auszugeben. Sie informieren Sie ber Dinge, die im Paket
+verbessert werden knnen. Meistens betreffen diese Verbesserungen direkt die
+Quellen der Originalautoren. In der Reihenfolge abnehmender Wichtigkeit
+folgen hier die relevanten Warnungen, die auftauchen knnten:
+.TP 
+\fBSymbol\fP \fI Symbol\fP\fB, verwendet von \fP\fIProgramm\fP\fB, in keiner der Bibliotheken gefunden.\fP
+Das angegebene Symbol wurde nicht in den Bibliotheken gefunden, gegen die
+das Programm gelinkt wurde. \fIProgramm\fP ist hchstwahrscheinlich eine
+Bibliothek und muss mit zustzlichen Bibliotheken whrend des Bau\-Prozesses
+gelinkt werden (Option \fB\-l\fP\fIBibliothek\fP des Linkers).
+.TP 
+\fIProgramm\fP\fB enthlt eine nicht\-auflsbare Referenz auf Symbol \fP\fISym\fP\fB: wahrscheinlich eine Erweiterung\fP.
+Das angegebene Symbol wurde nicht in den Bibliotheken gefunden, die mit
+diesem Programm verlinkt sind. Das \fIProgamm\fP ist hchstwahrscheinlich eine
+Erweiterung und das Symbol wird von dem Programm bereitgestellt, das diese
+Erweiterung ldt. Theoretisch verfgt eine Erweiterung nicht ber einen
+SONAMEn, allerdings ist dies bei diesem Programm der Fall und daher konnte
+es nicht eindeutig als Erweiterung erkannt werden. Die Tatsache, dass dieses
+Programm in einem nicht\-ffentlichen Verzeichnis gespeichert wird ist
+allerdings ein starkes Anzeichen dafr, dass es keine normale gemeinsam
+benutzte Bibliothek ist. Falls dieses Programm tatschlich eine Erweiterung
+ist, ignorieren Sie die Warnung. Allerdings besteht immer die Mglichkeit,
+dass es eine echte Bibliothek ist und dass Programme, die damit verlinken,
+einen RPATH verwenden, so dass der dynamische Lader sie findet. In diesem
+Fall ist die Bibliothek beschdigt und muss repariert werden.
+.TP 
+\fBAbhngigkeit von \fP\fIBibliothek\fP\fB knnte vermieden werden, falls \fP\fIProgramm\fP\fB nicht unntigerweise dagegen gelinkt wre (es verwendet keines seiner Symbole.\fP
+Keines der \fIProgramme\fP die gegen \fIBibliothek\fP gelinkt sind verwendet eines
+der von der Bibliothek bereitgestellten Symbole. Indem Sie die Programme
+korrigierten, vermieden Sie die Abhngigkeit, die mit dieser Bibliothek
+verbunden ist (es sei denn, die Abhngigkeit wird auch durch eine andere
+Bibliothek generiert, die diese Bibliothek wirklich verwendet).
+.TP 
+\fIProgramm\fP\fB sollte nicht gegen \fP\fIBibliothek\fP\fB gelinkt werden (es verwendet keines ihrer Symbole).\fP
+Das \fIProgramm\fP ist gegen eine Bibliothek gelinkt, die es nicht
+bentigt. Das ist kein Problem, aber bei der Ladezeit knnen kleine
+Leistungsverbesserungen erreicht werden, indem diese Bibliothek nicht in das
+Programm gelinkt wird. Diese Warnung berprft die gleichen Informationen
+wie die vorhergehende, allerdings fr jedes Programm statt global fr alle
+berprften Programme.
+.SH FEHLER
+\fBdpkg\-shlibdeps\fP wird fehlschlagen, falls es eine vom Programm verwendete
+ffentliche Bibliothek nicht finden kann oder falls diese Bibliothek keine
+zugeordneten Abhngigkeitsinformationen hat (entweder eine Shlibs\- oder
+Symbols\-Datei). Eine ffentliche Bibliothek hat einen SONAME und ist
+versioniert (libirgendwas.so.\fIX\fP). Eine private Bibliothek (wie z.B. ein
+Erweiterung) sollte keinen SONAME haben und braucht nicht versioniert zu
+sein.
+.TP 
+\fBkonnte Bibliothek \fP\fISONAME\-der\-Bibliothek\fP\fB bentigt von \fP\fIProgramm\fP\fB nicht finden (ihr RPATH ist \fP\fIrpath\fP\fB).\fP
+Das \fIProgramm\fP verwendet eine Bibliothek mit Namen
+\fISONAME\-der\-Bibliothek\fP, aber \fBdpkg\-shlibdeps\fP konnte diese Bibliothek
+nicht finden. \fBdpkg\-shlibdeps\fP erstellt folgendermaen eine Liste der zu
+prfenden Verzeichnisse: im RPATH des Programms aufgefhrte Verzeichnisse,
+in /etc/ld.so.conf aufgefhrte Verzeichnisse, in der Umgebungsvariable
+LD_LIBRARY_PATH aufgefhrte Verzeichnisse und standardmige ffentliche
+Verzeichnisse (/lib, /usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Dann
+prft es diese Verzeichnisse im Bau\-Baum des analysierten Pakets, in den mit
+der Kommandozeilenoption \-S angegebenen Paketbauverzeichnisse, in anderen
+Paketbau\-Bumen, die eine DEBIAN/shlibs\- oder DEBIAN/symbols\-Datei enthalten
+und schlielich im Wurzelverzeichnis. Falls die Bibliothek nicht in einem
+dieser Verzeichnisse gefunden wird, erhalten Sie diesen Fehler.
+
+Falls sich die nicht gefundene Bibliothek in einem privaten Verzeichnis des
+gleichen Pakets befindet, mssen Sie das Verzeichnis zu LD_LIBRARY_PATH
+hinzufgen. Falls sie sich in einem anderen gerade zu bauenden Paket
+befindet, mssen Sie sicherstellen, dass die shlibs/symbols\-Datei dieses
+Pakets bereits angelegt ist und dass LD_LIBRARY_PATH das geeignete
+Verzeichnis enthlt, falls die Bibliothek zudem in einem privaten
+Verzeichnis liegt.
+.TP 
+\fBKeine Abhngigkeitsinformationen fr \fP\fIBibliotheksdatei\fP\fB (verwendet von \fP\fIProgramm\fP\fB) gefunden.\fP
+Die von \fIProgramm\fP bentigte Bibliothek wurde von \fBdpkg\-shlibdeps\fP in
+\fIBibliotheksdatei\fP gefunden, allerdings konnte \fBdpkg\-shlibdeps\fP keine
+Abhngigkeitsinformationen fr diese Bibliothek ermitteln. Um die
+Abhngigkeit herauszufinden, hat es versucht, die Bibliothek mittels \fBdpkg
+\-S \fP\fIBibliotheksdatei\fP auf ein Debian\-Paket abzubilden. Dann berprfte es
+die zugehrigen Shlibs\- und Symboldateien in /var/lib/dpkg/info/ und die
+verschiedenen Paketbaubume ((debian/*/DEBIAN/).
+
+Dieser Fehlschlag kann durch defekte oder fehlende Shlibs\- oder
+Symboldateien im Paket der Bibliothek ausgelst werden. Er knnte auch
+auftreten, falls die Bibliothek im gleichen Quellpaket gebaut wird und die
+Shlibs\-Datei noch nicht angelegt wurde (wobei Sie in diesem Fall
+debian/rules korrigieren mssen, damit die Shlibs\-Datei erstellt wird bevor
+\fBdpkg\-shlibdeps\fP aufgerufen wird). Defekte RPATH knnen auch dazu fhren,
+dass die Bibliothek unter nicht\-kanonischen Namen gefunden wird
+(beispielsweise /usr/lib/openoffice.org/../lib/libssl.so.0.9.8 statt
+/usr/lib/libssl.so.0.9.8), so dass dann diese keinem Paket zugeordnet ist;
+\fBdpkg\-shlibdeps\fP versucht dies zu umgehen, indem es auf einen kanonischen
+Namen (mittels \fBrealpath\fP(3)) zurckfllt, allerdings knnte dies manchmal
+nicht funktionieren. Es ist immer am besten, den RPATH zu bereinigen, um
+Probleme zu vermeiden.
+
+Viele weitere Informationen darber, wo nach Abhngigkeitsinformationen
+gesucht wird, knnen durch einen Aufruf von \fBdpkg\-shlibdeps\fP im
+geschwtzigen Modus (\-v) erhalten werden. Dies kann ntzlich sein, falls Sie
+nicht verstehen, warum es Ihnen diesen Fehler meldet.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdeb\-shlibs\fP(5), \fBdeb\-symbols\fP(5), \fBdpkg\-gensymbols\fP(1).
+.
+.SH AUTOREN
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2006 Frank Lichtenheld
+.br
+Copyright \(co 2007\-2008 Rapha\[:e]l Hertzog
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-source.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-source.1
--- dpkg/man/de/dpkg-source.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-source.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,739 @@
+.\" Authors: Ian Jackson, Raphaël Hertzog
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-source 1 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-source \- Debian Quellpaket\- (.dsc) Manipulations\-Werkzeuge
+.
+.SH BERSICHT
+\fBdpkg\-source\fP [\fIOption\fP...] \fIBefehl\fP
+.
+.SH BESCHREIBUNG
+\fBdpkg\-source\fP packt und entpackt Debian Quellarchive.
+
+Keiner dieser Befehle erlaubt es, mehrere Optionen zu einer zu kombinieren,
+und sie erlauben es nicht, den Wert einer Option in einem separaten Argument
+zu speichern.
+.
+.SH BEFEHLE
+.TP 
+\fB\-x \fP\fIDateiname\fP\fB.dsc\fP [\fIAusgabe\-Verzeichnis\fP]
+Extrahiere ein Quellpaket. Ein nicht\-Options\-Argument muss angegeben werden,
+der Name der Debian Quell\-Steuer\-Datei (\fB.dsc\fP). Optional kann ein zweites
+nicht\-Options\-Argument angegeben werden, um das Verzeichnis anzugeben, in
+das das Quellpaket extrahiert werden soll. Dieses Verzeichis darf dann nicht
+existieren. Falls kein Ausgabeverzeichnis angegeben ist, wird das Quellpaket
+in das Verzeichnis namens \fIQuelle\fP\-\fIVersion\fP unterhalb des aktuellen
+Arbeitsverzeichnisses extrahiert.
+
+\fBdpkg\-source\fP wird die Namen der anderen Datei(en) aus der Steuerdatei
+einlesen, die das Quellpaket ergeben; es wird angenommen, dass diese im
+gleichen Verzeichnis wie die \fB.dsc\fP liegen.
+
+Die Dateien in dem extrahierten Paket werden die Rechte und Eigentmer
+haben, die erwartet wrden, falls die Dateien und Verzeichnisse einfach
+angelegt worden wren \- Verzeichnisse und Programmdateien werden 0777 und
+einfache Dateien 0666, beide durch die umask der Person, die extrahiert,
+entsprechend angepasst; falls das bergeordnete Verzeichnis setgid ist,
+werden dies die extrahierten Verzeichnisse auch sein, und alle Dateien und
+Verzeichnisse werden die Gruppeneigentmerschaft erben.
+
+Falls das Quellpaket ein nicht\-Standard\-Format verwendet (derzeit bedeutet
+sind dies alle Formate auer 1.0) wird sein Name in
+\fBdebian/source/format\fP gespeichert, so dass alle folgenden Bauversuchen des
+Quellpakets standardmig das gleiche Format verwenden.
+
+.TP 
+\fB\-b\fP \fIVerzeichnis\fP [\fIFormat\-abhngige\-Parameter\fP]
+Baue ein Quellpaket. Das erste nicht\-Options\-Argument wird als Name des
+Verzeichnisses verwandt, das den debianisierten (d.h. mit einem
+Unterverzeichnis debian und ggf. nderungen an den Originaldateien
+versehenen) Quellbaum enthlt. Abhngig vom dem zum Bau verwandten
+Quellpaketformat knnten zustzliche Parameter akzeptiert werden.
+
+\fBdpkg\-source\fP wird das Quellpaket mit dem ersten gefundenen Format aus der
+folgenden geordneten Liste bauen: dem mit der Kommandozeilenoption(en)
+\fI\-\-format\fP angegeben Format, dem in \fBdebian/source/format\fP angegebenen
+Format, 1.0. Die Rckfalloption 1.0 ist veraltet und wird irgendwann in
+der Zukunft entfernt werden, Sie sollten das gewnschte Quellformat immmer
+in \fBdebian/source/format\fP dokumentieren. Die verschiedenen
+Quellpaketformate werden im Abschnitt \fBQUELLPAKET\-FORMATE\fP ausfhrlich
+beschrieben.
+
+.TP 
+\fB\-\-print\-format\fP \fIVerzeichnis\fP
+Gibt das Quellformat aus, dass zum Bau des Quellpakets verwandt wrde, falls
+\fBdpkg\-source \-b \fP\fIVerzeichnis\fP aufgerufen wrde (unter den gleichen
+Bedingungen und mit den gleichen Parametern).
+
+.TP 
+\fB\-\-before\-build\fP \fIVerzeichnis\fP
+Der entsprechende Hook dess Quellpaketformats soll ausgefhrt werden. Dieser
+Hook wird vor jedem Bau des Pakets aufgerufen (\fBdpkg\-buildpackage\fP ruft ihn
+sehr frh, sogar vor \fBdebian/rules clean\fP auf). Dieser Befehl ist
+idempotent und kann mehrfach aufgerufen werden. Nicht alle Quellformate
+implementieren in diesem Hook etwas und wenn dies erfolgt, dann gewhnlich
+zur Vorbereitung des Quellbaums fr den Bau, in dem beispielsweise
+sichergestellt wird, dass alle Debian\-Patches angewandt sind.
+
+.TP 
+\fB\-\-after\-build\fP \fIVerzeichnis\fP
+Der entsprechende Hook dess Quellpaketformats soll ausgefhrt werden. Dieser
+Hook wird nach jedem Bau des Pakets aufgerufen (\fBdpkg\-buildpackage\fP ruft
+als letztes auf). Dieser Befehl ist idempotent und kann mehrfach aufgerufen
+werden. Nicht alle Quellformate implementieren in diesem Hook etwas und wenn
+dies erfolgt, dann gewhnlich um rckgngig zu machen, was \fB\-\-before\-build\fP
+durchgefhrt hat.
+
+.TP 
+\fB\-\-commit\fP [\fIVerzeichnis\fP] ...
+Zeichnet nderungen am in \fIVerzeichnis\fP entpackten Quellbaum auf. Dieser
+Befehl kann zustzliche Parameter akzeptieren, abhngig vom Quellformat. Er
+wird zu einer Fehlermeldung bei Formaten, fr denen dieser Vorgang keine
+Bedeutung hat, fhren.
+
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH "GENERISCHE BAUOPTIONEN"
+.TP 
+\fB\-c\fP\fISteuerdatei\fP
+Bestimmt die Hauptquell\-control\-Datei, aus der Informationen ausgelesen
+werden sollen. Der Standardwert ist \fBdebian/control\fP. Falls der Pfadname
+relativ ist, wird dieser relativ zum obersten Verzeichnis des Quellbaums
+interpretiert.
+.TP 
+\fB\-l\fP\fIChangelog\-Datei\fP
+Bestimmt die change log\-Datei, aus der Informationen ausgelesen werden
+sollen. Der Standardwert ist \fBdebian/changelog\fP. Falls der Pfadname relativ
+ist, wird dieser relativ zum obersten Verzeichnis des Quellbaums
+interpretiert.
+.TP 
+\fB\-F\fP\fIChangelog\-Format\fP
+Gibt das Format der nderungsprotokolldatei an. Standardmig wird das
+Format aus einer speziellen Zeile in der Nhe des Endes der
+nderungsprotokolldatei gelesen oder, falls dies fehlschlgt, wird das
+Debian\-Standardformat angenommen.
+.TP 
+\fB\-\-format=\fP\fIWert\fP
+Verwende das angegebene Format zum Bau des Quellpakets. Es berschreibt
+jedes in \fBdebian/source/format\fP angegebene Format.
+.TP 
+\fB\-V\fP\fIName\fP\fB=\fP\fIWert\fP
+Setzt eine Ausgabesubstitutionsvariable. Lesen Sie \fBdeb\-substvars\fP(5) fr
+eine Besprechung des Ausgabesubstitution.
+.TP 
+\fB\-T\fP\fIsubstvardatei\fP
+Lese Substitutionsvariablen aus \fIsubstvardatei\fP; standardmig wird keine
+Datei gelesen. Diese Option kann mehrfach verwandt werden, um
+Substitutionsvariablen aus mehreren Dateien einzulesen.
+.TP 
+\fB\-D\fP\fIFeld\fP\fB=\fP\fIWert\fP
+berschreibe oder ergnze ein Ausgabe\-Steuerdatei\-Feld.
+.TP 
+\fB\-U\fP\fIfield\fP
+Entferne ein Ausgabe\-Steuerdatei\-Feld.
+.TP 
+\fB\-Z\fP\fIKomprimierung\fP, \fB\-\-compression\fP=\fIKomprimierung\fP
+Gibt die Komprimierung an, die fr die angelegte Dateien (Tarblle und
+Diffs) verwendet wird. Beachten Sie, dass diese Option nicht dazu fhrt,
+dass existierende Tarblle rekomprimiert werden, sie betrifft nur neue
+Dateien. Untersttzte Werte sind \fIgzip\fP, \fIbzip2\fP, \fIlzma\fP und
+\fIxz\fP. \fIgzip\fP ist voreingestellt. \fIxz\fP wird erst seit Dpkg\-dev 1.15.5
+untersttzt.
+.TP 
+\fB\-z\fP\fIStufe\fP, \fB\-\-compression\-level\fP=\fIStufe\fP
+Zu verwendende Komprimierstufe. Wie bei \fB\-Z\fP betrifft dies nur neu
+angelegte Dateien. Untersttzte Werte sind \fI1\fP bis \fI9\fP, \fIbest\fP (am
+besten) und \fIfast\fP (schnell). Der Standardwert ist \fI9\fP fr Gzip und Bzip2,
+\fI6\fP fr Xz und Lzma.
+.TP 
+\fB\-i\fP[\fIregexp\fP], \fB\-\-diff\-ignore\fP[=\fIregexp\fP]
+Sie knnen einen regulren Perl\-Ausdruck angeben, der auf Dateien passt, die
+Sie aus der Liste der Dateien fr den Diff entfernen mchten; diese Liste
+wird von einem Find\-Befehl generiert. Falls das Quellpaket als Version
+3\-Quellpaket mittels eines VCS gebaut wird, ignoriert dies stattdessen
+nderungen an bestimmten Dateien, die noch nicht bertragen (committed)
+wurden (mit \-i.* werden alle davon ignoriert). \fB\-i\fP aktiviert diese Option
+mit einem voreingestellten regulren Ausdruck, der Steuerdateien und
+\-Verzeichnisse der hufigsten Revisionskontrollsysteme, Backups,
+Swap\-Dateien und Bau\-Ausgabeverzeichnisse von Libtool herausgefiltert. Es
+kann nur einen aktiven regulren Ausdruck geben, von mehrfach angegebenen
+\fB\-i\fP\-Optionen wird nur die letzte bercksichtigt.
+
+Dies ist sehr hilfreich, um irrelevante Dateien, die im Diff aufgenommen
+werden, zu entfernen. Falls Sie zum Beispiel Ihre Quellen in einem
+Revisionskontrollsystem speichern und Checkout verwenden mchten, um Ihr
+Quellpaket zu bauen, ohne die zustzlichen Dateien und Verzeichnisse, die
+darin typischerweise enthalten sind (z.B. CVS/, .cvsignore, .svn/), mit
+aufzunehmen. Der voreingestellte regulre Ausdruck ist bereits sehr
+erschpfend, aber falls Sie ihn ersetzen mssen, beachten Sie, dass er
+standardmig auf alle Teile des Pfades passen kann. Falls Sie daher nur den
+Anfang eines Pfades oder komplette Dateinamen vergleichen wollen, mssen Sie
+die notwendigen Anker (z.B. (^|/), ($|/)) selbst bereitstellen.
+.TP 
+\fB\-\-extend\-diff\-ignore\fP=\fIregexp\fP
+Der angegebene regulre Ausdruck (Perl\-Format) wird den standardmigen Wert
+von \fB\-\-diff\-ignore\fP and dessen aktuellen Wert (falls gesetzt)
+erweiteren. Dies erfolgt, indem \fB|\fP\fIregexp\fP an den existierenden Wert
+angehngt wird. Diese Option ist bequem in \fBdebian/source/options\fP zu
+nutzen, um einige automatisch erstellten Dateien von der automatischen
+Patch\-Erzeugung auszuschlieen.
+.TP 
+\fB\-I\fP[\fIDateimuster\fP], \fB\-\-tar\-ignore\fP[=\fIDateimuster\fP]
+Falls diese Option angegeben wird, wird der Dateiname an die
+\-\-exclude\-Option von \fBtar\fP(1) weitergegeben, wenn es zur Erstellung der
+Datei .orig.tar oder .tar aufgerufen wird. Zum Beispiel fhrt \-ICVS dazu,
+dass tar ber CVS\-Verzeichnisse hinweggeht, wenn es eine .tar\-Datei
+erstellt. Diese Option kann mehrfach wiederholt werden, um mehrere Muster
+aufzufhren, die ausgeschlossen werden sollen.
+
+\fB\-I\fP fgt standardmig von selbst \-\-exclude\-Optionen hinzu, die die
+Steuerdateien und \-Verzeichnisse der hufigsten Revisionskontrollsysteme,
+Backups, Swap\-Dateien und Bau\-Ausgabeverzeichnisse von Libtool
+herausfiltern.
+.PP
+\fBHinweis:\fP Obwohl sie hnliche Zwecke verfolgen, haben \fB\-i\fP und \fB\-I\fP eine
+sehr verschiedene Syntax und Semantik. \fB\-i\fP kann nur einmal angegeben
+werden und nimmt einen regulren Perlausdruck an, der gegen den vollen
+relativen Pfad jeder Datei geprft wird. \fB\-I\fP kann mehrfach angegeben
+werden und nimmt ein Dateinamen\-Muster mit Shell\-Jokerzeichen an. Das Muster
+wird gegen den vollen relativen Pfad aber auch individuell gegen jeden Teil
+des Pfades angewendet. Die exakte Symantik der Option \-\-exclude ist etwas
+kompliziert, lesen Sie
+http://www.gnu.org/software/tar/manual/tar.html#wildcards fr eine komplette
+Dokumentation.
+
+Der voreingestellte regulre Ausdruck und Muster fr beide Optionen knnen
+in der Ausgabe des Befehls \fB\-\-help\fP gesehen werden.
+.SH "GENERISCHE EXTRAHIERUNGSOPTIONEN"
+.TP 
+\fB\-\-no\-copy\fP
+Kopiere die Original\-Tarblle in die Nhe des extrahierten Quellpakets.
+.TP 
+\fB\-\-no\-check\fP
+Prfe Signaturen und Prfsummen vor dem Entpacken nicht.
+.TP 
+\fB\-\-require\-valid\-signature\fP
+Entpacken des Quellpakets ablehnen, falls es keine OpenPGP\-Signatur enthlt,
+die entweder mit dem \fItrustedkeys.gpg\fP\-Schlsselring des Benutzers, mit
+einem der Schlsselringen des Lieferanten oder mit einem der offiziellen
+Debian\-Schsselringe (\fI/usr/share/keyrings/debian\-keyring.gpg\fP und
+\fI/usr/share/keyrings/debian\-maintainers.gpg\fP) berprft werden kann.
+
+.SH QUELLPAKET\-FORMATE
+Falls Sie nicht wissen, welches Quellformat Sie verwenden sollen, verwenden
+Sie wahrscheinlich am besten entweder 3.0 (quilt) oder 3.0
+(native). Lesen Sie http://wiki.debian.org/Projects/DebSrc3.0 fr
+Informationen ber den Einsatz dieser Formate innerhalb von Debian.
+
+.SS "Format: 1.0"
+Ein Quellpaket in diesem Format besteht entweder aus einem \fB.orig.tar.gz\fP
+mit zugehrigem \fB.diff.gz\fP oder einem einzelnen \fB.tar.gz\fP (in diesem Fall
+wird das Paket als \fInativ\fP bezeichnet).
+
+\fBExtrahieren\fP
+
+Extrahieren eines nativen Pakets ist ein einfaches Extrahieren eines
+einzelnen Tarballs in das Zielverzeichnis. Extrahieren eines nicht\-nativen
+Pakets erfolgt zuerst durch Entpacken des \fB.orig.tar.gz\fP und dann durch
+Anwendung des Patches aus der \fB.diff.gz\fP\-Datei. Der Zeitstempel aller
+gepatchten Dateien wird auf den Zeitpunkt der Extrahierung des Quellpakets
+zurckgesetzt (das vermeidet Zeitstempelverstze, die zu Problemen fhren,
+wenn autogenerierte Dateien gepatcht werden). Der Diff kann neue Dateien
+anlegen (das gesamte Debian\-Verzeichnis wird auf diese Weise erstellt), kann
+aber keine Dateien entfernen (leere Dateien bleiben zurck).
+
+\fBBauen\fP
+
+Bauen eines nativen Paket besteht nur aus dem Erstellen eines einzigen
+Tarballs mit dem Quellverzeichnis. Bauen eines nicht\-nativen Pakets schliet
+das Extrahieren des Original\-Tarballs in ein separates Verzeichnis .orig
+und die Neuerstellung des \fB.diff.gz\fP durch Vergleich des
+Quellpaket\-\fIVerzeichnisses\fP mit dem Verzeichnis .orig ein.
+
+.TP 
+\fBBau\-Optionen (mit \-b):\fP
+.PP
+Falls ein zweites nicht\-Options\-Argument angegeben ist, sollte es der Namen
+des Originalquellverzeichnisses oder der Tardatei sein. Falls das Paket
+Debian\-spezifisch ist, dann sollte dieses Argument die leere Zeichenkette
+sein, da es kein Debianisierungs\-Diff gibt. Falls kein zweites Argument
+bergeben wird, dann schaut \fBdpkg\-source\fP nach der ursprnglichen Tardatei
+\fIPaket\fP\fB_\fP\fIUpstream\-Version\fP\fB.orig.tar.\fP\fIErweiterung\fP oder dem
+ursprnglichen Quellverzeichnis \fIVerzeichnis\fP\fB.orig\fP, abhngig von den
+\fB\-sX\fP\-Argumenten.
+
+\fB\-sa\fP, \fB\-sp\fP, \fB\-sk\fP, \fB\-su\fP und \fB\-sr\fP werden keine existierenden
+Tardateien oder Verzeichnisse berschreiben. Falls dies gewnscht ist,
+sollten stattdessen \fB\-sA\fP, \fB\-sP\fP, \fB\-sK\fP, \fB\-sU\fP und \fB\-sR\fP verwendet
+werden.
+.TP 
+\fB\-sk\fP
+Gibt an, dass die Originalquellen als Tardatei erwartet werden sollen,
+standardmig \fIPaket\fP\fB_\fP\fIUrsprungsversion\fP\fB.orig.tar\fP\fIErweiterung\fP. Es
+wird diese Originalquellen als Tardatei am Platz belassen, oder sie in das
+aktuelle Verzeichnis kopieren, falls sie dort noch nicht sind. Der Tarball
+wird nach \fIVerzeichnis\fP\fB.orig\fP fr die Erstellung des Diffs entpackt.
+.TP 
+\fB\-sp\fP
+Wie \fB\-sk\fP, aber das Verzeichnis wird danach entfernt.
+.TP 
+\fB\-su\fP
+Gibt an, dass die Originalquellen als Verzeichnis erwartet werden,
+standardmig \fIPaket\fP\fB\-\fP\fIUrsprungsversion\fP\fB.orig\fP. \fBdpkg\-source\fP wird
+daraus ein neues Original\-Quellarchiv erstellen.
+.TP 
+\fB\-sr\fP
+Wie \fB\-su\fP, aber das Verzeichnis wird nach der Verwendung entfernt.
+.TP 
+\fB\-ss\fP
+Gibt an, dass die Originalquellen sowohl als Verzeichnis als auch als
+Tardatei verfgbar sind. dpkg\-source wird das Verzeichnis zur Erstellung des
+Diffs verwenden, aber die Tardatei fr die \fB.dsc\fP. Diese Option muss mit
+Vorsicht verwendet werden \- falls das Verzeichnis und die Tardatei nicht
+zusammen passen, wird ein fehlerhaftes Quellarchiv erstellt.
+.TP 
+\fB\-sn\fP
+Gibt an, dass nicht nach Originalquellen geschaut und kein Diff erstellt
+werden soll. Das zweite Argument, falls angegeben, muss die leere
+Zeichenkette sein. Dies wird fr Debian\-spezifische Pakete verwendet, die
+keine Quellen von Originalautoren und somit kein Debianisierungs\-Diff haben.
+.TP 
+\fB\-sa\fP oder \fB\-sA\fP
+Gibt an, dass nach dem Original\-Quellarchiv als Tardatei oder als
+Verzeichnis gesucht werden soll \- das zweite Argument, falls vorhanden, kann
+eines von beiden sein, oder die leere Zeichenkette (dies ist quivalent zur
+Verwendung von \fB\-sn\fP). Falls eine Tardatei gefunden wird, wird diese zur
+Erstellung eines Diffs entpackt und danach entfernt (dies ist quivalent zu
+\fB\-sp\fP); falls ein Verzeichnis gefunden wird, wird dieses gepackt, um die
+Originalquellen zu erstellen und danach entfernt (dies ist quivalent zu
+\fB\-sr\fP); falls keines von beiden gefunden wird, wird angenommen, dass das
+Paket kein Debianisierungs\-Diff sondern nur ein direktes Quellarchiv (dies
+ist quivalent zu \fB\-sn\fP). Falls sowohl ein Verzeichnis als auch eine
+Tar\-Datei gefunden werden, dann ignoriert \fBdpkg\-source\fP das Verzeichnis,
+und berschreibt es, falls \fB\-sA\fP angegeben wurde (dies ist quivalent zu
+\fB\-sP\fP) oder lst einen Fehler aus, falls \fB\-sa\fP angegeben wurde. \fB\-sA\fP ist
+die Voreinstellung.
+.TP 
+\fB\-\-abort\-on\-upstream\-changes\fP
+Der Prozess schlgt fehl, falls das erstellte Diff nderungen an Dateien
+auerhalb des Unterverzeichnisses debian enthlt. Diese Option ist in
+\fBdebian/source/options\fP nicht erlaubt, kann aber in
+\fBdebian/source/local\-options\fP verwandt werden.
+
+.TP 
+\fBExtrahierungs\-Optionen (mit \-x):\fP
+.PP
+In allen Fllen werden die Originalquellbume entfernt.
+.TP 
+\fB\-sp\fP
+Verwendet beim Extrahieren. Die Originalquellen (falls vorhanden) werden als
+Tar\-Datei belassen. Falls diese sich nicht im aktuellen Verzeichnis befinden
+oder falls eine existierende, aber davon verschiedene Datei bereits
+vorhanden ist, wird sie dort hin kopiert. (\fBDies ist die Voreinstellung.\fP)
+.TP 
+\fB\-su\fP
+Entpackt den Originalquellbaum.
+.TP 
+\fB\-sn\fP
+Stellt sicher, dass die Originalquellen weder in das aktuelle Verzeichnis
+kopiert noch entpackt werden. Jeder Originalquellbaum, der im aktuellen
+Verzeichnis war, wird dennoch entfernt.
+.PP
+Alle \fB\-s\fP\fIX\fP\-Optionen schlieen sich paarweise aus. Falls Sie mehr als
+eine angeben, wird nur die letzte verwendet.
+.TP 
+\fB\-\-skip\-debianization\fP
+berspringt die Anwendung des Debian\-Diffs auf die Quellen der
+Originalautoren.
+.
+.SS "Format: 2.0"
+Auch als wig&pen bekannt. Dieses Format wird nicht fr den breiten Einsatz
+empfohlen, es wird durch das Format 3.0 (quilt) ersetzt. Wig&pen war die
+erste Spezifikation eines Paketformats der nchsten Generation.
+
+Das Verhalten dieses Formats ist identisch zum Format 3.0 (quilt),
+abgesehen davon, dass es keine explizite Liste von Patches verwendet. Alle
+Dateien in \fBdebian/patches/\fP, die auf den regulren Perlausdruck \fB[\ew\-]+\fP
+passen, mssen gltige Patches sein: sie werden zum Zeitpunkt der
+Extrahierung angewandt.
+
+Wenn ein neues Quellpaket gebaut wird, werden alle nderungen an den Quellen
+der Originalautoren in einem Patch mit Namen \fBzz_debian\-diff\-auto\fP
+gespeichert.
+.
+.SS "Format: 3.0 (native)"
+Dieses Format ist eine Erweiterung des nativen Paketformats wie es im
+1.0\-Format definiert ist. Es untersttzt alle Kompressionsmethoden und
+ignoriert standardmig alle VCS\-spezifischen Dateien und Verzeichnisse
+sowie viele temporre Dateien (lesen Sie den Standardwert der Option \fB\-I\fP
+bei der Ausgabe von \fB\-\-help\fP).
+.
+.SS "Format: 3.0 (quilt)"
+Ein Quellpaket in diesem Format enthlt mindestens einen Original\-Tarball
+(\fB.orig.tar.\fP\fIerw\fP, wobei \fIerw\fP \fBgz\fP, \fBbz2\fP, \fBlzma\fP und \fBxz\fP sein
+kann) und einen Debian\-Tarball (\fB.debian.tar.\fP\fIerw\fP). Es kann auch
+zustzliche Original\-Tarblle (\fB.orig\-\fP\fIKomponente\fP\fB.tar.\fP\fIerw\fP))
+enthalten. \fIKomponente\fP kann nur alphanumerische Zeichen und
+Gedankenstriche (\-) enthalten.
+.PP
+\fBExtrahieren\fP
+.PP
+Der Haupt\-Originaltarball wird zuerst extrahiert, dann werden alle
+zustzlichen Originaltarblle in Unterverzeichnisse extrahiert, die nach dem
+\fIKomponente\fPn\-Teil ihres Dateinamens benannt werden (jedes bereits
+existierende Verzeichnis wird ersetzt). Der Debian\-Tarball wird auf das
+Quellverzeichnis extrahiert, nachdem jedes bereits existierende
+\fBdebian\fP\-Verzeichnis entfernt wurde. Beachten Sie, dass der Debian\-Tarball
+ein \fBdebian\fP\-Unterverzeichnis enthalten muss, er aber auch Binrdateien
+auerhalb dieses Verzeichnisses enthalten darf (sehen Sie hierzu die Option
+\fB\-\-include\-binaries\fP).
+.PP
+Dann werden alle in \fBdebian/patches/debian.series\fP oder
+\fBdebian/patches/series\fP aufgefhrten Patches angewandt. Falls die erstere
+Datei verwandt wird und die letztere nicht existiert (oder ein Symlink ist),
+dann wird die letztere mit einem Symlink zu ersterer ersetzt. Dies ist zur
+Vereinfachung der Verwendung von Quilt gedacht, um den Satz an Patches zu
+verwalten. Beachten Sie allerdings, dass \fBdpkg\-source\fP zwar Seriendateien
+auswertet, in denen explizite Optionen fr die Anwendung der Patches
+verwandt werden (diese werden auf jede Zeile nach dem Patch\-Dateinamen und
+einem oder mehreren Leerzeichen gespeichert), diese Optionen dann aber
+ignoriert und immer erwartet, dass die Patches mit der Option \fB\-p1\fP von
+\fBpatch\fP angewandt werden knnen. Es wird daher eine Warnung ausgeben, wenn
+es auf solche Optionen trifft, und der Bau wird wahrscheinlich fehlschlagen.
+.PP
+hnlich wie bei Quilt knnen Patches auch Dateien entfernen.
+.PP
+Die Datei \fB.pc/applied\-patches\fP wird angelegt, falls einige Patches whrend
+der Extrahierung angewandt wurden.
+.PP
+\fBBauen\fP
+.PP
+Alle im aktuellen Verzeichnis gefundenen Original\-Tarblle werden in ein
+temporres Verzeichnis entpackt. Hierbei wird die gleiche Logik wie fr das
+Entpacken verwandt, das debian\-Verzeichnis wird in das temporre Verzeichnis
+kopiert und alle Patches auer dem automatischen Patch
+(\fBdebian\-changes\-\fP\fIVersion\fP oder \fBdebian\-changes\fP, abhngig von
+\fB\-\-single\-debian\-patch\fP) werden angewandt. Das temporre Verzeichnis wird
+mit dem Quellpaketverzeichnis verglichen. Wenn der Diff nicht leer ist,
+schlgt der Bau fehl, falls nicht \fB\-\-single\-debian\-patch\fP oder
+\fB\-\-auto\-commit\fP verwandt wurde; in diesem Fall wird der Diff im
+automatischen Patch gespeichert. Falls der automatische Patch
+erzeugt/gelscht wird, wird er zu der Datei series und den Quilt\-Metadaten
+hinzugefgt bzw. aus diesen gelscht.
+
+nderungen an Binrdateien knnen in einem Diff nicht dargestellt werden und
+fhren daher zu einem Fehlschlag, es sei denn, der Betreuer hat sich
+absichtlich dazu entschlossen, die vernderte Binrdatei dem Debian\-Tarball
+hinzuzufgen (indem er sie in \fBdebian/source/include\-binaries\fP aufgefhrt
+hat). Der Bau wird auch fehlschlagen, falls er Binrdateien im
+debian\-Unterverzeichnis findet, die nicht ber
+\fBdebian/source/include\-binaries\fP freigegeben wurden.
+
+Das aktualisierte debian\-Verzeichnis und die Liste der vernderten Programme
+wird dann zur Erstellung des Debian\-Tarballs verwandt.
+
+Der automatisch erstellte Diff enthlt keine nderungen an VCS\-spezifischen
+sowie vielen temporren Dateien (lesen Sie hierzu den zur Option \fB\-i\fP
+zugeordneten Standardwert in der Ausgabe von \fB\-\-help\fP). Insbesondere wird
+das von Quilt verwandte \fB.pc\fP\-Verzeichnis whrend der Erstellung des
+automatischen Patches ignoriert.
+
+Hinweis: \fBdpkg\-source\fP \fB\-\-before\-build\fP (und \fB\-b\fP) stellen sicher, dass
+alle in der Series\-Datei aufgefhrten Patches angewendet sind, so dss ein
+Paketbau immer mit allen angewandten Patches durchgefhrt wird. Dies
+erfolgt, indem nicht angewandte Patches ermittelt werden (sie sind in der
+Datei \fBseries\fP, aber nicht in der Datei \fB.pc/applied\-patches\fP aufgefhrt)
+und wenn der erste Patch in dem Satz ohne Fehler angewandt werden kann,
+werden sie alle angewandt. Die Option \fB\-\-no\-preparation\fP kann zum
+Abschalten dieses Verhaltens verwandt werden.
+
+.PP
+\fBnderungen aufzeichnen\fP
+.TP 
+\fB\-\-commit\fP [\fIVerzeichnis\fP] [\fIPatch\-Name\fP] [\fIPatch\-Datei\fP]
+Erstellt einen Patch, der den lokalen nderungen entspricht, die nicht vom
+Quilt\-Patch\-System verwaltet werden und integriert es unter dem Namen
+\fIPatch\-Name\fP in das Patch\-System. Falls der Name fehlt, wird er interaktiv
+erfragt. Falls \fIPatch\-Datei\fP angegeben ist, wird er als Patch, der zu den
+lokalen nderungen, die integriert werden sollen, gehrt, verwandt. Dies ist
+primr nach einem Baufehler ntzlich, der diese Datei vorgenerierte. Sobald
+die Patch integriert wurde, wird ein Editor gestartet, so dass Sie die
+Metainformationen in den Kopfzeilen des Patches einfgen knnen.
+
+.PP
+\fBBau\-Optionen\fP
+.TP 
+\fB\-\-allow\-version\-of\-quilt\-db=\fP\fIVersion\fP
+Erlaubt es \fBdpkg\-source\fP, ein Quellpaket zu bauen, falls die Version der
+Quilt\-Metadaten die angegebene ist, selbst falls \fBdpkg\-source\fP nichts davon
+wei. Effektiv teilt dies mit, dass die angegebene Version der
+Quilt\-Metadaten zu Version 2, die \fBdpkg\-source\fP derzeit untersttzt,
+kompatibel ist. Die Version der Quilt\-Metadaten wird in \fB.pc/.version\fP
+gespeichert.
+.TP 
+\fB\-\-include\-removal\fP
+Ignoriere entfernte Dateien nicht und fge sie zu dem automatisch
+generierten Patch hinzu.
+.TP 
+\fB\-\-include\-timestamp\fP
+Fge Zeitstempel zu dem automatisch generierten Patch hinzu.
+.TP 
+\fB\-\-include\-binaries\fP
+Fge alle vernderten Programme zu dem debian\-Tarball hinzu. Fge sie auch
+in \fBdebian/source/include\-binaries\fP: sie werden in folgenden Bauten
+standardmig hinzugefgt und diese Option wird daher dann nicht mehr
+bentigt.
+.TP 
+\fB\-\-no\-preparation\fP
+Versuche nicht den Bau\-Baum durch Anwenden aller derzeit nicht angewandten
+Patches vorzubreiten.
+.TP 
+\fB\-\-single\-debian\-patch\fP
+Verwende \fBdebian/patches/debian\-changes\fP statt
+\fBdebian/patches/debian\-changes\-\fP\fIVersion\fP als Namen fr den whrend des
+Baus automatisch generierten Patch. Diese Option ist insbesondere ntzlich,
+wenn das Paket in einem VCS betreut wird und ein Patch\-Satz nicht
+zuverlssig erstellt werden kann. Stattdessen sollte der aktuelle Diff zu
+den Quellen der Originalautoren in einem einzelnen Patch gespeichert
+werden. Diese Option sollte in \fBdebian/source/local\-options\fP eingestellt
+werden und wrde dann von einer Datei \fBdebian/source/local\-patch\-header\fP
+begleitet, in der erklrt wird, wie die Debian\-nderungen am besten
+begutachtet werden knnen, beispielsweise im eingesetzten VCS.
+.TP 
+\fB\-\-create\-empty\-orig\fP
+Erstelle den Hauptoriginal\-Tarball automatisch als leer falls er fehlt und
+falls es ergnzende Original\-Tarblle gibt. Diese Option ist dafr gedacht,
+wenn das Quellpaket nur eine Sammlung von mehreren Softwaren der
+Originalautoren ist und es keine Haupt\-Software gibt.
+.TP 
+\fB\-\-unapply\-patches\fP
+Entfernt die Patches im Hook \fB\-\-after\-build\fP. Normalerweise bentigen Sie
+diese Option nicht, da Dpkg\-source alle Patches automatisch entfernen wird,
+wenn es sie whrend \fB\-\-before\-build\fP angewandt hatte. Diese Option ist nur
+in \fBdebian/source/local\-options\fP erlaubt, so dass alle erstellten
+Quellpakete standardmig das gleiche Verhalten zeigen.
+.TP 
+\fB\-\-abort\-on\-upstream\-changes\fP
+Dieser Prozess schlgt fehl, falls ein automatischer Patch erstellt
+wurde. Diese Option kann dazu verwandt werden, sicherzustellen, dass alle
+nderungen korrekt in separaten Quilt\-Patches aufgezeichnet wurden, bevor
+das Paket gebaut wurde. Diese Option ist in \fBdebian/source/options\fP nicht
+erlaubt, kann aber in \fBdebian/source/local\-options\fP verwandt werden.
+.TP 
+\fB\-\-auto\-commit\fP
+Der Vorgang schlgt nicht fehl, falls ein automatischer Patch erstellt
+wurde, stattdessen wird dieser sofort in die Quilt\-Serie aufgenommen.
+
+.PP
+\fBExtrahierungs\-Optionen\fP
+.TP 
+\fB\-\-skip\-debianization\fP
+berspringt das Entpacken des Debian\-Tarballs auf die Quellen der
+Originalautoren.
+.TP 
+\fB\-\-skip\-patches\fP
+Wende am Ende der Extrahierung keine Patches an.
+.
+.SS "Format: 3.0 (custom)"
+Dieses Format ist besonders. Es stellt kein echtes Quellpaket dar, kann aber
+zur Erstellung eines Quellpakets mit beliebigen Dateien verwandt werden.
+.PP
+\fBBau\-Optionen\fP
+.PP
+Alle Argumente, die keine Optionen sind, werden als Dateien verstanden, die
+in das generierte Quellpaket integriert werden sollen. Sie mssen existieren
+und sich bevorzugt im aktuellen Verzeichnis befinden. Mindestens eine Datei
+muss angegeben werden.
+.TP 
+\fB\-\-target\-format=\fP\fIWert\fP
+\fBNotwendig\fP. Definiert das echte Format des generierten Quellpakets. Die
+generierte .dsc\-Datei wird diesen Wert und nicht 3.0 (custom) in ihrem
+\fIFormat\fP\-Feld enthalten.
+.
+.SS "Format: 3.0 (git)"
+Dieses Format ist experimentell.
+.PP
+Ein Quellpaket in diesem Format besteht aus einem einzelnen Bndel eines
+Git\-Depots \fB.git\fP, um die Quellen des Pakets zu verwahren. Es kann auch
+eine Datei \fB.gitshallow\fP geben, die die Revisionen fr einen flachen
+Git\-Clone auffhrt.
+.PP
+\fBExtrahieren\fP
+.PP
+Das Bndel wird als Git\-Depot in das Zielverzeichnis geklont. Falls es eine
+Datei gitshallow gibt, wird diese als .git/shallow innerhalb des geklonten
+Git\-Depots installiert.
+.PP
+Beachten Sie, dass standardmig im neuen Depot der gleiche Zweig
+ausgecheckt ist, der auch in der ursprnglichen Quelle ausgecheckt war
+(typischerweise master, es knnte aber auch was beliebig anderes
+sein). Alle anderen Zweige sind unter remotes/origin/ verfgbar.
+.PP
+\fBBauen\fP
+.PP
+Bevor fortgefahren wird, werden einige berprfungen ausgefhrt, um
+sicherzustellen, dass keine nicht\-ignorierten, nicht\-bertragene
+(uncommitted) nderungen vorliegen.
+.PP
+\fBgit\-bundle\fP(1) wird zur Erstellung des Bndels des Git\-Depots
+verwandt. Standardmig werden alle Zweige und Markierungen im Depot im
+Bndel einbezogen.
+.PP
+\fBBau\-Optionen\fP
+.TP 
+\fB\-\-git\-ref=\fP\fIReferenz\fP
+Erlaubt die Angabe einer Git\-Referenz zur Aufnahme in dem Git\-Bndel. Die
+Verwendung deaktiviert das standardmige Verhalten, alle Zweige und
+Markierungen aufzunehmen. Kann mehrfach angegeben werden. \fIReferenz\fP kann
+der Name eines Zweiges oder einer Markierung, der/die aufgenommen werden
+soll, sein. Es kann auch ein Parameter sein, der an \fBgit\-rev\-list\fP(1)
+bergeben werden kann. Verwenden Sie beispielsweise \-\-git\-ref=master, um
+nur den Master\-Zweig aufzunehmen. Um alle Markierungen und Zweige auer dem
+Zweig private aufzunehmen, verwenden Sie \-\-git\-ref=\-\-all
+\-\-git\-ref=^private.
+.TP 
+\fB\-\-git\-depth=\fP\fIZahl\fP
+Erstellt einen seichten Klon mit einem Verlauf, der bei der angegebenen
+Anzahl an Revisionen abgeschnitten wird.
+.SS "Format: 3.0 (bzr)"
+Dieses Formate ist experimentell. Es erstellt einen einzigen Tarball, der
+das Bzr\-Depot enthlt.
+.PP
+\fBExtrahieren\fP
+.PP
+Der Tarball wird entpackt und dann wird Bzr verwandt, um den aktuellen Zweig
+auszuchecken.
+.PP
+\fBBauen\fP
+.PP
+Bevor fortgefahren wird, werden einige berprfungen ausgefhrt, um
+sicherzustellen, dass keine nicht\-ignorierten, nicht\-bertragene
+(uncommitted) nderungen vorliegen.
+.PP
+Dann wird der VCS\-spezifische Teil des Quellpakets in ein temporres
+Verzeichnis kopiert. Bevor dieses temporre Verzeichnis in einen Tarball
+gepackt wird, werden verschiedene Bereinigungen durchgefhrt, um Platz zu
+sparen.
+.SH "WARNUNGEN UND FEHLER"
+.SS "kein Quellformat in debian/source/format angegeben"
+Die Datei \fBdebian/source/format\fP sollte immer existieren und das gewnschte
+Quellformat angeben. Fr Rckwrtskompatibilitt wird das Format 1.0
+angenommen, wenn die Datei nicht existiert, aber Sie sollten sich nicht
+darauf verlassen: Irgendwann in der Zukunft wird dpkg\-source verndert und
+dann fehlschlagen, wenn diese Datei nicht existiert.
+
+Die Begrndung liegt darin, dass 1.0 nicht mehr das empfohlene Format ist,
+Sie sollten normalerweise eines der neueren Formate (3.0 (quilt), 3.0
+(native)) auswhlen, aber \fBdpkg\-source\fP wird dies nicht fr Sie
+automatisch vornehmen. Falls Sie weiterhin das alte Format verwenden
+mchten, sollten Sie dies explizit angeben und 1.0 in
+\fBdebian/source/format\fP eintragen.
+.SS "der Diff verndert die folgenden Dateien der Originalautoren"
+Beim Einsatz des Quellformats 1.0 ist es normalerweise keine gute Idee,
+die Dateien der Originalautoren direkt zu verndern, da die nderungen
+grtenteils versteckt und undokumentiert in der diff.gz\-Datei
+verschwinden. Stattdessen sollten Sie Ihre nderungen als Patches im
+debian\-Verzeichnis speichern und whrend des Baus anwenden. Um diese
+Komplexitt zu vermeiden, knnen Sie auch das Format 3.0 (quilt)
+verwenden, das dies von sich aus anbietet.
+.SS "kann nderungen an \fIDatei\fP nicht darstellen"
+nderungen an den Quellen der Originalautoren werden normalerweise als
+Patch\-Dateien gespeichert, aber nicht alle nderungen knnen als Patches
+dargestellt werden: Sie knnen nur nderungen am Inhalt einfacher
+Textdateien vornehmen. Falls Sie versuchen, eine Datei mit etwas eines
+anderen Typs zu ersetzen (beispielsweise eine einfache Datei mit einem
+Symlink oder einem Verzeichnis), werden Sie diese Fehlermeldung erhalten.
+.SS "neu angelegte leere Datei \fIDatei\fP wird im Diff nicht dargestellt werden"
+Leere Dateien knnen nicht mit Patchdateien erstellt werden. Daher wird
+diese nderung nicht im Quellpaket aufgezeichnet und Sie erhalten dazu diese
+Warnung.
+.SS "ausfhrbarer Modus \fIRechte\fP von \fIDatei\fP wird nicht im Diff dargestellt werden"
+.SS "besonderer Modus \fIRechte\fP von \fIDatei\fP wird nicht im Diff dargestellt werden"
+Patch\-Dateien speichern nicht die Rechte von Dateien und daher werden
+genderte Rechte nicht im Quellpaket gespeichert. Diese Warnung erinnert Sie
+an diese Tatsache.
+.SH DATEIFORMATE
+.SS debian/source/format
+Diese Datei enthlt auf einer einzelnen Zeile das Format, das zum Bau des
+Quellpakets verwandt werden soll (mgliche Formate sind oben
+beschrieben). Leerzeichen am Zeilenanfang oder \-ende sind nicht erlaubt.
+.SS debian/source/include\-binaries
+Diese Datei enthlt eine Liste von Binrdateien (eine pro Zeile), die in den
+Debian\-Tarball aufgenommen werden sollen. Leerzeichen am Anfang und Ende der
+Zeile werden entfernt. Zeilen, die mit # anfangen, sind Kommentare und
+werden bersprungen. Leere Zeilen werden ignoriert.
+.SS debian/source/options
+Diese Datei enhlt eine Liste an Optionen, die automatisch vor den Satz an
+Befehlszeilenoptionen bei einem Aufruf \fBdpkg\-source \-b\fP oder \fBdpkg\-source
+\-\-print\-format\fP gesetzt werden sollen. Optionen wie \fB\-compression\fP und
+\fB\-\-compression\-level\fP sind fr diese Datei gut geeignet.
+.P
+Jede Option sollte auf einer separaten Zeile stehen. Leerzeilen und Zeilen,
+die mit # beginnen, werden ignoriert. Das einleitende \-\- sollte entfernt
+werden und kurze Optionen sind nicht erlaubt. Optionale Leerzeichen um das
+=\-Symbol sowie optionale Anfhrungszeichen um den Wert sind erlaubt. Hier
+ist ein Beispiel fr so eine Datei:
+.P
+  # lass dpkg\-source ein debian.tar.bz2 mit maximaler Komprimierung
+  # erstellen
+  compression = "bzip2"
+  compression\-level = 9
+  # verwende debian/patches/debian\-changes als automatischen Patch
+  single\-debian\-patch
+  # ignoriere nderungen von config.{sub,guess}
+  extend\-diff\-ignore = "(^|/)(config.sub|config.guess)$"
+.P
+Hinweis: \fB\-\-format\fP\-Optionen werden in dieser Datei nicht akzeptiert, Sie
+sollten stattdessen \fBdebian/source/format\fP verwenden.
+.SS debian/source/local\-options
+Genau wie \fBdebian/source/options\fP, auer das die Datei nicht in das
+erstellte Quellpaket aufgenommen wird. Dies kann ntzlich sein, um
+Voreinstellungen zu speichern, die an einen bestimmten Betreuer oder an ein
+bestimmtes VCS, in dem das Paket gewartet wird, gebunden sind.
+.SS debian/source/local\-patch\-header
+.SS debian/source/patch\-header
+Formloser Text, der an den Anfang des in den Formaten 2.0 und 3.0
+(quilt) generierten automatischen Patches gestellt
+wird. \fBlocal\-patch\-header\fP wird dem erstellen Quellpaket nicht hinzugefgt,
+\fBpatch\-header\fP dagegen schon.
+.SS debian/patches/series
+Diese Datei fhrt alle Patches auf, die (in der angegebenen Reihenfolge) auf
+das Quellpaket der Originalautoren angewandt werden mssen. Leerzeichen am
+Anfang und Ende werden entfernt. Zeilen, die mit # anfangen, sind
+Kommentare und werden bersprungen. Leere Zeilen werden ignoriert. Die
+verbleibenen Zeilen beginnen mit dem Dateinamen eines Patches (relativ zum
+Verzeichnis \fBdebian/patches/\fP) bis zum ersten Leerzeichen oder bis zum
+Zeilenende. Bis zum Ende der Zeile oder bis zum ersten # gefolgt von einem
+oder mehreren Leerzeichen (dies markiert den Beginn eines Kommentars, der
+bis zum Zeilenende geht) knnen optionale Quilt\-Befehle folgen.
+.SH FEHLER
+Die Stelle, an der das berschreiben von Feldern passiert, verglichen mit
+bestimmten Standard\-Ausgabe\-Feldeinstellungen, ist eher konfus.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\-deb\fP(1), \fBdpkg\fP(1), \fBdselect\fP(1).
+.
+.SH AUTOREN
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2008\-2011 Rapha\[:e]l Hertzog
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-split.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-split.1
--- dpkg/man/de/dpkg-split.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-split.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,202 @@
+.\" Authors: Ian Jackson
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-split 1 2011\-07\-04 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-split \- Debian\-Paketarchiv Teilungs\- und Zusammensetzwerkzeug
+.
+.SH BERSICHT
+\fBdpkg\-split\fP [\fIOption\fP...] \fIBefehl\fP
+.
+.SH BESCHREIBUNG
+\fBdpkg\-split\fP zerteilt Debian\-Binrpaketdateien in kleinere Teile und setzt
+diese wieder zusammen, um die Lagerung von groen Paketdateien auf kleinen
+Medien wie Disketten zu ermglichen.
+
+Es kann manuell mit den Optionen \fB\-\-split\fP, \fB\-\-join\fP und \fB\-\-info\fP
+verwendet werden.
+
+Es hat auch einen automatischen Modus, der ber die \fB\-\-auto\fP\-Option
+aufgerufen wird, wo es eine Liste von Teilen, die bereits gesehen, aber noch
+nicht wieder zusammengesetzt wurden, verwaltet. Sobald alle Teile gesehen
+wurden, wird dann die Datei wieder zusammengesetzt. Die Optionen \fB\-\-listq\fP
+und \fB\-\-discard\fP erlauben die Verwaltung dieser Liste.
+
+Alle Teilungs\-, Vereinigungs\- und Warteoperationen erzeugen informative
+Nachrichten auf der Standardausgabe; diese knnen ohne Risiko ignoriert
+werden.
+.
+.SH BEFEHLE
+.TP 
+\fB\-s\fP, \fB\-\-split\fP \fIKomplettarchiv\fP [\fIPrfix\fP]
+Teilt ein einzelnes Debian\-Binrpaket in mehrere Teile.
+
+Die Teile werden \fIPrfix\fP\fB.\fP\fIN\fP\fBof\fP\fIM\fP\fB.deb\fP benannt, wobei \fIN\fP die
+bei 1 beginnende Teilnummer und \fIM\fP die Gesamtzahl der Teile ist (beide
+Angaben dezimal).
+
+Falls kein \fIPrfix\fP bereitgestellt wird, wird der Dateiname von
+\fIKomplettarchiv\fP genommen, einschlielich Verzeichnis, wobei das
+abschlieende \fB.deb\fP entfernt wird.
+.TP 
+\fB\-j\fP, \fB\-\-join\fP \fITeil\fP...
+Vereint die Teile einer Paketdatei, und baut damit die Originaldatei wieder
+zusammen, wie sie vor dem Aufteilen war.
+
+Die Teildateien, die als Argument bergeben werden, mssen alle Teile der
+gleichen Originaldatei sein. Jeder Teil muss genau einmal in der
+Argumentliste auftauchen, allerdings mssen die Teile nicht in ihrer
+Reihenfolge aufgefhrt werden.
+
+Die Teile mssen natrlich alle mit der gleichen zur Zeit des Aufteilens
+angegeben Teil\-Gre generiert worden sein. Dies bedeutet, dass sie fr
+gewhnlich von dem gleichen Aufruf von \fBdpkg\-split \-\-split\fP erzeugt worden
+sein mssen.
+
+Die Dateinamen der Teile sind fr den Prozess des Wiederzusammenbauens nicht
+relevant.
+
+Standardmig wird die Ausgabedatei \fIPaket\fP\fB\-\fP\fIVersion\fP\fB_\fP\fIArch\fP\fB.deb\fP
+genannt.
+
+.TP 
+\fB\-I\fP, \fB\-\-info\fP \fITeil\fP...
+Gibt Informationen ber die angegebenen Teildatei(en) in menschenlesbarem
+Format aus. Argumente, die keine Binrpaketdateien sind, fhren zu einer
+entsprechenden Nachricht (allerdings auch in der Standardausgabe).
+.TP 
+\fB\-a\fP, \fB\-\-auto \-o\fP \fI Komplettausgabe Teil\fP
+Reiht Teile automatisch in die Warteschlange und setzt, falls mglich, ein
+Paket wieder zusammen.
+
+Der angegebene \fITeil\fP wird untersucht und mit anderen Teilen desselben
+Paketes (falls vorhanden) in der Warteschlange der Paketdatei\-Teile
+verglichen.
+
+Falls alle Teile der Paketdatei, von der \fITeil\fP ein Teil ist, verfgbar
+sind, dann wird das Paket wieder zusammengesetzt und nach \fIKomplettausgabe\fP
+geschrieben (welche fr gewhnlich noch nicht existieren sollte, obgleich
+dies kein Fehler ist).
+
+Falls nicht, wird \fITeil\fP in die Warteschlange kopiert und
+\fIKomplettausgabe\fP wird nicht erzeugt.
+
+Falls \fITeil\fP kein Teil eines aufgeteilten Binrpaketes ist, dann beendet
+sich \fIdpkg\-split\fP mit Rckgabecode \fB1\fP; falls irgendwelche anderen
+Probleme auftreten lautet der Rckgabecode \fB2\fP.
+
+Die Option \fB\-\-output\fP oder \fB\-o\fP muss bei Verwenden von \fB\-\-auto\fP angegeben
+werden. (Falls dies nicht obligatorisch wre, wsste das Programm nicht,
+welche Ausgabedatei es zu erwarten htte.)
+.TP 
+\fB\-l\fP, \fB\-\-listq\fP
+Listet den Inhalt der Warteschlange der wieder zusammenzubauenden Pakete
+auf.
+
+Fr jede Paketdatei, von der Teile in der Warteschlange sind, enthlt die
+Ausgabe den Namen des Paketes, die Teile in der Warteschlange sowie die
+Gesamtanzahl gespeicherter Bytes in der Warteschlange.
+.TP 
+\fB\-d\fP, \fB\-\-discard\fP [\fIPaket\fP...]
+Dies lscht Teile aus der Warteschlange derer, die auf die verbleibenden
+Teile ihrer Pakete warten.
+
+Falls kein \fIPaket\fP agegeben wird, wird die Warteschlange komplett geleert;
+falls irgendwelche angegeben sind, werden nur die Teile des/der passenden
+Pakete(s) gelscht.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH OPTIONEN
+.TP 
+\fB\-\-depotdir\fP\fI Verzeichnis\fP
+Gibt ein alternatives Verzeichnis fr die Warteschlange von Teilen, die auf
+automatisches Wiederzusammenfhren warten, an. Standardmig ist dies
+\fB/var/lib/dpkg\fP.
+.TP 
+\fB\-S\fP, \fB\-\-partsize\fP \fIkibibytes\fP
+Gibt die maximale Teilgre in kibibytes (1024 bytes) beim Aufteilen
+an. Standardmig ist dies 450 kiB.
+.TP 
+\fB\-o\fP, \fB\-\-output\fP \fIKomplettausgabe\fP
+Gibt den Ausgabe\-Dateinamen fr ein Wiederzusammenbauen an.
+
+Dies hebt die Voreinstellung fr ein manuelles Wiederzusammenbauen auf
+(\fB\-\-join\fP) und ist zwingend fr ein automatisches
+Einreihen\-oder\-Zusammenbauen (\fB\-\-auto\fP) notwendig.
+.TP 
+\fB\-Q\fP, \fB\-\-npquiet\fP
+Falls Sie ein automatisches Einreihen oder Wiederzusammensetzen durchfhren,
+gibt \fBdpkg\-split\fP normalerweise eine Meldung aus, falls ein bergebener
+\fITeil\fP kein Binrpaketteil ist. Diese Option unterdrckt diese Meldung um
+Programmen wie \fBdpkg\fP zu erlauben, sowohl mit geteilten als auch
+ungeteilten Paketen umzugehen, ohne strende Meldungen zu erzeugen.
+.TP 
+\fB\-\-msdos\fP
+Erzwingt, dass die von \fB\-\-split\fP erzeugten Ausgabe\-Dateinamen
+MSDOS\-kompatibel sind.
+
+Dies verstmmelt den Prfix \- entweder den voreingestellten aus dem
+Eingabe\-Dateinamen abgeleiteten oder den als Argument bergebenen:
+alphanummerische Zeichen werden klein geschrieben, Pluszeichen werden durch
+\fBx\fP ersetzt und alle anderen Zeichen werden entfernt.
+
+Das Ergebnis wird dann soweit wie ntig abgeschnitten, und Dateinamen der
+Form \fIPrfixN\fP\fBof\fP\fIM\fP\fB.deb\fP werden generiert.
+.
+.SH RCKGABEWERT
+.TP 
+\fB0\fP
+Das angeforderte Aufteilen, Zusammenfgen oder ein anderer Befehl war
+erfolgreich. \fB\-\-info\fP\-Befehle werden als erfolgreich gewertet, sogar falls
+die Dateien keine Teile eines Binrpaketes waren.
+.TP 
+\fB1\fP
+Tritt nur bei \fB\-\-auto\fP auf und zeigt an, dass die Datei \fITeil\fP kein Teil
+eines Binrprogramms war.
+.TP 
+\fB2\fP
+Eine bestimmte Gattung von Problemen trat auf, wie zum Beispiel ein
+Fehlschlag eines Systemaufrufs, eine Datei, die wie ein Paketteil aussah
+aber beschdigt war, ein Benutzungsfehler oder einige andere Probleme.
+.
+.SH FEHLER
+Volle Details ber die Pakete in der Warteschlange sind nicht zu erhalten,
+ohne selbst im Warteschlangenverzeichnis zu whlen.
+
+Es gibt keine einfache Art zu testen, ob eine Datei, die ein Teil eines
+Binrpaketes sein knnte, eines ist.
+.
+.SH DATEIEN
+.TP 
+\fI/var/lib/dpkg/parts\fP
+Das voreingestellte Verzeichnis fr die Warteschlange der Teil\-Dateien, die
+auf automatisches Zusammenfgen warten.
+
+Die in diesem Verzeichnis benutzten Dateinamen liegen in einem intern
+\fBdpkg\-split\fP\-Format vor und sind sehr wahrscheinlich fr andere Programme
+nicht ntzlich, und in keinem Fall sollte sich auf das Format der Dateinamen
+verlassen werden.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\-deb\fP(1), \fBdpkg\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995\-1996 Ian Jackson
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-statoverride.8 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-statoverride.8
--- dpkg/man/de/dpkg-statoverride.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-statoverride.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,104 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-statoverride 8 2011\-07\-04 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+dpkg\-statoverride \- ber Eigentmerschaft und Modus von Dateien hinwegsetzen
+.
+.SH BERSICHT
+\fBdpkg\-statoverride\fP [\fIOption\fP...] \fIBefehl\fP
+.
+.SH BESCHREIBUNG
+\fBStat\-Hinwegsetzungen\fP sind eine Mglichkeit \fBdpkg\fP(1) zu berichten,
+einen anderen Eigentmer oder Modus fr eine Datei zu verwenden, wenn ein
+Paket installiert wird. (Hinweis: Ich verwende das Wort Datei hier, aber
+tatschlich kann dies jedes Dateisystemobjekt sein, das Dpkg handhabt,
+darunter Verzeichnisse, Gerte, usw.). Dies kann dazu verwendet werden,
+Programme, die normalerweise setuid sind, dazu zu zwingen, ohne
+setuid\-Markierung zu installieren, oder nur von einer bestimmten Gruppe
+ausfhrbar zu sein.
+.P
+\fBdpkg\-statoverride\fP ist ein Hilfswerkzeug um die Liste der
+Status\-Hinwegsetzungen zu verwalten. Es hat drei grundlegende Funktionen:
+Hinzufgen, Entfernen und Auflisten von Hinwegsetzungen.
+.
+.SH BEFEHLE
+.TP 
+\fB\-\-add\fP\fI Benutzer Gruppe Modus Datei\fP
+Fge eine Hinwegsetzung fr \fIDatei\fP hinzu. \fIDatei\fP muss noch nicht
+existieren wenn dieser Befehl verwendet wird; die Hinwegsetzung wird
+aufbewahrt und spter verwendet. Benutzer und Gruppen knnen ber ihren
+Namen (beispielsweise \fBroot\fP oder \fBnobody\fP) spezifiziert werden, oder ber
+ihre Nummer mit vorangestelltem \fB#\fP (beispielsweise \fB#0\fP oder
+\fB#65534\fP). Der \fIModus\fP muss oktal angegeben werden.
+
+Falls \-\-update angegeben ist und die \fIDatei\fP existiert, dann wird diese
+sofort auf den neuen Eigentmer und Modus eingestellt.
+.TP 
+\fB\-\-remove\fP\fI Datei\fP
+Entfernt eine Hinwegsetzung fr \fIDatei\fP, der Status von \fIDatei\fP bleibt
+durch diesen Befehl unverndert.
+.TP 
+\fB\-\-list\fP [\fIGlob\-Muster\fP]
+Liste alle Hinwegsetzungen auf. Falls ein Glob\-Muster spezifiziert wurde,
+begrenze die Ausgabe auf Hinwegsetzungen, die auf den Glob passen. Falles es
+keine Hinwegsetzungen gibt oder keine auf den Glob passt, wird sich
+\fBdpkg\-statoverride\fP mit einem Exit\-Wert von 1 beenden.
+.TP 
+\fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH OPTIONEN
+.TP 
+\fB\-\-admindir\fP\fI Verzeichnis\fP
+Wechsle das \fIVerzeichnis\fP der Dpkg\-Datenbank, wo auch die
+statoverride\-Datei gelagert ist. Der Standard ist \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-\-force\fP
+Erzwinge eine Aktion, selbst wenn eine Sinn\-berprfung diese normalerweise
+verbte. Dies ist notwendig, um sich ber eine existierende Hinwegsetzung
+hinwegzusetzen.
+.TP 
+\fB\-\-update\fP
+Versuche die Datei sofort auf den neuen Eigentmer und neuen Modus zu
+ndern, falls sie existiert.
+.TP 
+\fB\-\-quiet\fP
+Sei nicht so ausfhrlich darber, was wir machen.
+.
+.SH UMGEBUNG
+.TP 
+\fBDPKG_ADMINDIR\fP
+Falls gesetzt und die Option \fB\-\-admindir\fP nicht verwandt wurde, wird dies
+als Datenverzeichnis von Dpkg verwandt.
+.
+.SH DATEIEN
+.TP 
+\fI/var/lib/dpkg/statoverride\fP
+Datei, die die aktuelle Liste der Hinwegsetzungen auf dem System
+enthlt. Sie befindet sich im Dpkg\-Administrationsverzeichnis, zusammen mit
+anderen fr Dpkg wichtigen Dateien, wie status oder available.
+.br
+Hinweis: \fBdpkg\-statoverride\fP erhlt die alte Kopie dieser Datei mit der
+Endung \-old bevor es sie mit einer neuen ersetzt.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\fP(1).
+.
+.SH AUTOR
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-trigger.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-trigger.1
--- dpkg/man/de/dpkg-trigger.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-trigger.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,80 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-trigger 1 2011\-08\-14 Debian\-Projekt dpkg\-Programmsammlung
+.SH NAME
+dpkg\-trigger \- ein Paket\-Trigger\-Hilfswerkzeug
+.
+.SH BERSICHT
+\fBdpkg\-trigger\fP [\fIOption\fP...] \fITrigger\-Name\fP
+.br
+\fBdpkg\-trigger\fP [\fIOption\fP...] \fIBefehl\fP
+.
+.SH BESCHREIBUNG
+\fBdpkg\-trigger\fP ist ein Werkzeug, um Trigger (deutsch: Auslser) explizit zu
+aktivieren und den laufenden \fBdpkg\fP auf deren Untersttzung hin zu
+berprfen.
+.PP
+Dies kann von Betreuerskripten in komplexen und if\-then\-else\-Situationen
+verwandt werden, wo die Datei\-Trigger oder die Steuerung von Dateidirektiven
+durch explizite \fBactivate\fP\-Trigger nicht ausreichen. Es kann auch zum
+Testen und von Systemadministratoren verwandt werden (beachten Sie aber,
+dass Trigger nicht tatschlich durch \fBdpkg\-trigger\fP ausgefhrt werden).
+.PP
+Nicht erkannte Triggernamen\-Syntaxen sind fr \fBdpkg\-trigger\fP ein Fehler.
+.
+.SH BEFEHLE
+.TP 
+\fB\-\-check\-supported\fP
+berprfe, ob der laufende \fBdpkg\fP Trigger untersttzt (normalerweise vom
+Postinst aufgerufen). Endet mit \fB0\fP, falls ein Trigger\-fhiger \fBdpkg\fP
+ausgefhrt wurde, oder mit \fB1\fP und einer Fehlermeldung nach Stderr, falls
+nicht. Normalerweise ist es allerdings besser, einfach den gewnschten
+Trigger mit \fBdpkg\-trigger\fP zu aktivieren.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH OPTIONEN
+.TP 
+\fB\-\-admindir=\fP\fIVerz\fP
+ndert den Ablageort der \fBdpkg\fP\-Datenbank. Der Standardort ist
+\fI/var/lib/dpkg\fP.
+.TP 
+\fB\-\-by\-package=\fP\fIPaket\fP
+berschreibe den Trigger\-Erwartenden (normalerweise wird dies von \fBdpkg\fP
+durch die Umgebungsvariable \fBDPKG_MAINTSCRIPT_PACKAGE\fP der Betreuerskripte
+gesetzt, wobei das Paket benannt wird, zu dem das Skript gehrt und dies
+wird standardmig verwandt).
+.TP 
+\fB\-\-no\-await\fP
+Diese Option arrangiert, dass das aufrufende Paket T (falls zutreffend)
+nicht auf die Abarbeitung des Triggers warten muss, das bzw. die
+interessierte(n) Paket(e) I werden nicht zu der Liste der auf Bearbeitung
+wartenden Trigger von T hinzugefgt und der Status von T bleibt
+unverndert. T kann als installiert betrachtet werden, obwohl I den Trigger
+noch nicht verarbeitet haben knnte.
+.TP 
+\fB\-\-no\-act\fP
+Nur testen, nichts tatschlich ndern.
+.
+.SH UMGEBUNG
+.TP 
+\fBDPKG_ADMINDIR\fP
+Falls gesetzt und die Option \fB\-\-admindir\fP nicht verwandt wurde, wird dies
+als Datenverzeichnis von Dpkg verwandt.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\fP(1), \fBdeb\-triggers\fP(5), \fB/usr/share/doc/dpkg\-dev/triggers.txt.gz\fP.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dpkg-vendor.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-vendor.1
--- dpkg/man/de/dpkg-vendor.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dpkg-vendor.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,66 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-vendor 1 2011\-07\-04 Debian\-Projekt dpkg\-Programmsammlung
+.SH NAME
+dpkg\-vendor \- fragt Informationen ber den Distributionslieferanten ab
+.
+.SH BERSICHT
+\fBdpkg\-vendor\fP [\fIOption\fP...] \fIBefehl\fP
+.
+.SH BESCHREIBUNG
+\fBdpkg\-vendor\fP ist ein Werkzeug, um Informationen ber in
+\fB/etc/dpkg/origins\fP aufgefhrte Lieferanten (engl. vendor)
+abzufragen. \fB/etc/dpkg/origins/default\fP enthlt Informationen ber den
+aktuellen Lieferanten.
+.
+.SH BEFEHLE
+.TP 
+\fB\-\-is\fP\fI Lieferant\fP
+Beendet sich mit \fB0\fP, falls der aktuelle Lieferant \fILieferant\fP ist,
+ansonsten mit einem von Null verschiedenen Wert.
+.TP 
+\fB\-\-derives\-from\fP\fI Lieferant\fP
+Beendet sich mit \fB0\fP, falls die aktuelle Lieferant\-Distribution von
+\fILieferant\fP abgeleitet ist, ansonsten mit einem von Null verschiedenen
+Wert. Es verwendet das Feld Parent, um alle Vorfahren des aktuellen
+Lieferanten zu ermitteln.
+.TP 
+\fB\-\-query\fP\fI Feld\fP
+Gibt auf der Standardausgabe den Wert des Lieferanten\-spezifischen \fIFeld\fPes
+fr den aktuellen Lieferanten aus.
+.TP 
+\fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH OPTIONEN
+.TP 
+\fB\-\-vendor\fP\fI Lieferant\fP
+Nimmt an, dass der aktuelle Lieferant \fILieferant\fP ist, statt ihn ber die
+Umgebungsvariable \fBDEB_VENDOR\fP oder aus \fB/etc/dpkg/origins/default\fP zu
+ermitteln.
+.
+.SH UMGEBUNG
+.TP 
+\fBDEB_VENDOR\fP
+Diese Einstellung definiert den aktuellen Lieferanten. Falls nicht gesetzt,
+wird er aus \fB/etc/dpkg/origins/default\fP ermittelt.
+.
+.SH AUTOR
+Copyright \(co 2009 Rapha\[:e]l Hertzog
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
+
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dselect.1 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dselect.1
--- dpkg/man/de/dselect.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dselect.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,479 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dselect 1 2011\-08\-14 Debian\-Projekt Debian
+.SH NAME
+dselect \- Debian\-Paketverwaltungsoberflche
+.
+.SH BERSICHT
+\fBdselect\fP [\fIOption\fP...] \fIAktion\fP
+.
+.SH BESCHREIBUNG
+\fBdselect\fP
+ist eine der primren Benutzerschnittstellen zur Verwaltung von Paketen auf
+einem Debian\-System. Im Basis\-Men von \fBdselect\fP kann der Systemadministrator:
+ \- Die Liste der verfgbaren Paketversionen aktualisieren,
+ \- Den Status der installierten und verfgbaren Pakete betrachten,
+ \- Die Paketauswahl ndern und Abhngigkeiten verwalten,
+ \- Neue Pakete installieren oder ein Upgrade auf neuere Versionen durchfhren.
+.PP
+\fBdselect\fP arbeitet als Oberflche von \fBdpkg\fP(1), dem systemnahen
+Debian\-Paket\-Handhabungswerkzeug. Es bietet einen
+Vollbildschirm\-Paketauswahl\-Verwalter mit einem Paketeabhngigkeits\- und
+\-konfliktlser. Bei Aufruf mit Administratorprivilegien knnen Pakete
+installiert und entfernt sowie Upgrades durchgefhrt werden. Verschiedene
+Zugriffsmethoden knnen konfiguriert werden um verfgbare Paketinformationen
+und installierbare Pakete aus Paketdepots zu holen. Abhngig von der
+verwendeten Zugriffsmethode knnen diese Depots ffentliche Archiv\-Server im
+Internet, lokale Archiv\-Server oder CD\-ROMs sein. Die empfohlene
+Zugriffsmethode ist \fIapt\fP, die vom Paket \fBapt\fP bereitgestellt wird.
+.PP
+Normalerweise wird \fBdselect\fP ohne Parameter aufgerufen. Es wird ein
+interaktives Men prsentiert, das dem Benutzer eine Liste von Aktionen
+anbietet. Falls eine Aktion als Argument bergeben wird, wird diese Aktion
+sofort begonnen. Es sind noch mehrere Kommandozeilenparameter vorhanden, um
+das Laufzeitverhalten von \fBdselect\fP zu verndern oder zustzliche
+Informationen ber das Programm anzuzeigen.
+.
+.SH OPTIONEN
+Alle Optionen knnen sowohl auf der Kommandozeile als auch in der
+Konfigurationsdatei \fI/etc/dpkg/dselect.cfg\fP oder in den Dateien im
+Konfigurationsverzeichnis \fI/etc/dpkg/dselect.cfg.d/\fP von \fBdselect\fP
+angegeben werden. Jede Zeile in der Konfigurationsdatei ist entweder eine
+Option (exakt identisch mit der Kommandozeilenoption, nur ohne einleitende
+Gedankenstriche) oder ein Kommentar (falls sie mit \fB#\fP beginnt).
+.br
+.TP 
+\fB\-\-admindir\fP\fI Verzeichnis\fP
+ndert das Verzeichnis, in dem die Dateien \fIstatus\fP, \fIavailable\fP und
+hnliche Dateien von Dpkg liegen. Standardmig ist dies \fI/var/lib/dpkg\fP
+und normalerweise sollte es keinen Grund geben, dieses zu ndern.
+.TP 
+\fB\-\-debug\fP\fI Datei\fP|\fI \fP\fB\-D\fP\fIDatei\fP
+Aktiviere Debugging. Debug\-Informationen werden nach \fIDatei\fP gesendet.
+.TP 
+\fB\-\-expert\fP
+Aktiviert den Expertenmodus, d.h. zeigt keine mglicherweise nervenden
+Hilfeinformationen an.
+.TP 
+[\fB\-\-colour\fP|\fB\-\-color\fP \fIBildschirmteil:\fP[\fIVordergrund\fP],[\fIHintergrund\fP][\fI:Attr\fP[\fI+Attr+..\fP]]]
+Konfiguriert die Bildschirmfarben. Dies funktioniert nur, falls Ihr
+Bildschirm Farben untersttzt. Diese Option kann mehrfach verwendet werden
+(und wird am besten in \fIdselect.cfg\fP verwendet). Jede Verwendung ndert die
+Farben (und optional andere Attribute) eines Teils des Bildschirms. Die
+Teile des Bildschirms (von oben nach unten) sind:
+.RS
+.TP 
+\fBtitle\fP
+Der Bildschirm\-Titel.
+.TP 
+\fBlisthead\fP
+Die Kopfzeile ber der Paketliste.
+.TP 
+\fBlist\fP
+Die scrollende Liste von Paketen (und auch etwas Hilfetext).
+.TP 
+\fBlistsel\fP
+Der ausgewhlte Eintrag in der Liste.
+.TP 
+\fBpkgstate\fP
+In der Liste der Pakete, der Text, der den aktuellen Zustand jedes Pakets
+anzeigt.
+.TP 
+\fBpkgstatesel\fP
+In der Liste der Pakete, der Text, der den aktuellen Zustand des aktuell
+ausgewhlten Paketes anzeigt.
+.TP 
+\fBinfohead\fP
+Die Kopfzeile, die den Zustand des aktuell ausgewhlten Paketes anzeigt.
+.TP 
+\fBinfodesc\fP
+Die Kurzbeschreibung des Pakets.
+.TP 
+\fBinfo\fP
+Verwendet um Paketinformationen wie die Paketbeschreibung anzuzeigen.
+.TP 
+\fBinfofoot\fP
+Die unterste Zeile des Bildschirms bei der Paketauswahl.
+.TP 
+\fBquery\fP
+Verwendet zum Anzeigen von Abfragezeilen
+.TP 
+\fBhelpscreen\fP
+Farbe der Hilfebildschirme.
+.RE
+.P
+Nach dem Teil des Bildschirms kommt ein Doppelpunkt und die Farbangabe. Sie
+knnen entweder die Vordergrundfarbe, die Hintergrundfarbe oder beide
+angeben und damit die eingebauten Werte berschreiben. Verwenden Sie die
+Standard\-Farbnamen von Curses.
+.P
+Optional kann nach der Farbangabe ein weiterer Doppelpunkt und eine
+Attribut\-Angabe folgen. Dies ist eine Liste von einem oder mehreren
+Attribut(en), getrennt durch Plus\-Zeichen (+). Folgende Attribute sind
+verfgbar (aber nicht alle funktionieren in allen Terminals): normal,
+standout, underline, reverse, blink, bright, dim, bold
+.TP 
+\fB\-\-help\fP
+Gib einen kurzen Hilfetext aus und beende sich erfolgreich.
+.TP 
+\fB\-\-version\fP
+Gebe Versionsinformationen aus und beende sich erfolgreich.
+.
+.SH AKTIONEN
+Wenn \fBDselect\fP gestartet wird, kann es die folgenden Aktionen durchfhren,
+entweder direkt, falls sie auf der Kommandozeile angegeben wurde oder indem
+dem Benutzer ein Men der verfgbaren Aktionen bei interkativen Betrieb
+angezeigt wird:
+.SS Zugriff
+Whle und konfiguriere eine Zugriffsmethode fr Paketdepots.
+.sp
+Standardmig stellt \fBdselect\fP mehrere Methoden wie \fIcdrom\fP, \fImulti_cd\fP,
+\fInfs\fP, \fImulti_nfs\fP, \fIharddisk\fP, \fImounted\fP, \fImulti_mount\fP, \fIfloppy\fP
+oder \fIftp\fP zur Verfgung, aber andere Pakete knnen zustzliche Methoden
+bereitstellen, z.B. stellt das \fBapt\fP\-Paket die \fIapt\fP\-Zugriffsmethode
+bereit.
+.sp
+Die Verwendung der \fIapt\fP\-Zugriffsmethode wird nachdrcklich empfohlen.
+.sp
+.SS Erneuern
+Die verfgbare Paketdatenbank auffrischen.
+.sp
+Holt die Liste der verfgbaren Paketversionen aus dem Paket\-Depot, das fr
+die aktuelle Zugriffsmethode konfiguriert ist, und aktualisiert die
+Datenbank von dpkg. Die Paketliste wird im Depot typischerweise in Dateien
+mit den Namen \fIPackages\fP oder \fIPackages.gz\fP bereitgestellt. Diese Dateien
+knnen von den Betreuern des Depots mit dem Programm \fBdpkg\-scanpackages\fP(1)
+erstellt werden.
+.sp
+Die Details der Aktion Erneuern hngen von der Implementierung der
+Zugriffsmethode ab. Normalerweise ist der Prozess unkompliziert und verlangt
+keine Benutzerinteraktionen.
+.sp
+.SS Auswhlen
+Paketauswahlen oder \-abhngigkeiten betrachten oder verwalten.
+.sp
+Dies ist die Hauptfunktionalitt von \fBdselect\fP. Im Auswahlbildschirm kann
+der Benutzer die Liste der verfgbaren und installierten Pakete
+begutachten. Wenn \fBdselect\fP mit administrativen Rechten ausgefhrt wird ist
+es auch mglich, den Paketauswahlzustand interaktiv zu verndern. \fBdselect\fP
+verfolgt die Auswirkungen dieser nderungen auf andere abhngige oder im
+Konflikt stehende Pakete.
+.sp
+Wenn ein Konflikt oder eine fehlgeschlagene Abhngigkeit erkannt wird, wird
+dem Benutzer ein Unterbildschirm mit einer Lsung der
+Abhngigkeitsproblematik angeboten. Auf diesem Bildschirm wird eine Liste
+der im Konflikt stehenden oder abhngigen Pakete gezeigt, wobei fr jedes
+aufgefhrte Paket der Grund ebenfalls angegeben ist. Der Benutzer kann die
+Vorschlge von \fBdselect\fP annehmen, sich ber sie hinwegsetzen oder alle
+nderungen zurcknehmen, darunter diejenigen, die zu den unerfllten
+Abhngigkeiten oder Konflikten fhrten.
+.sp
+Die Verwendung des interaktiven Paketauswahlbildschirms wird unten
+detaillierter beschrieben.
+.sp
+.SS Installieren
+Installiert ausgewhlte Pakete.
+.sp
+Die konfigurierte Zugriffsmethode wird installierbare oder fr ein Upgrade
+verfgbare Pakete aus den relevanten Depots holen und dann mittels \fBdpkg\fP
+installieren. Abhngig von der Implementation der Zugriffsmethode knnen
+alle Pakete vor der Installation bereits geholt werden, oder bei Bedarf
+geholt werden. Bei einigen Zugriffsmethoden werden auch Pakete entfernt, die
+zur Entfernung markiert wurden.
+.sp
+Falls whrend der Installation ein Fehler auftrat ist es normalerweise
+empfehlenswert, die Installation erneut durchzufhren. In den meisten Fllen
+wird das Problem verschwinden oder gelst werden. Falls Probleme bleiben
+oder die durchgefhrte Installation nicht korrekt war, untersuchen Sie bitte
+den Grund und die Umstnde und reichen Sie einen Fehler in der
+Fehlerdatenbank von Debian ein. Anleitungen wie dies erfolgen kann, sind auf
+http://bugs.debian.org/ verfgbar oder knnen durch Lesen der Dokumentation
+fr \fBbug\fP(1) oder \fBreportbug\fP(1) (falls diese installiert sind) erhalten
+werden.
+.sp
+Details der Installationsaktion hngen von der Implementierung der
+Zugriffsmethode ab. Die Aufmerksamkeit und Eingabe des Benutzers knnten
+whrend der Installation, Konfiguration oder dem Entfernen von Paketen
+notwendig sein. Dies hngt von den Betreuerskripten im Paket ab. Einige
+Pakete verwenden die Bibliothek \fBdebconf\fP(1), die flexiblere oder sogar
+automatisierte Installationseinrichtungen erlaubt.
+.sp
+.SS Konfig
+Konfiguriert alle bisher installierten, aber noch nicht voll konfigurierten
+Pakete.
+.sp
+.SS Lschen
+Lscht oder entfernt installierte Pakete vollstndig, die zum Lschen
+markiert sind.
+.sp
+.SS Beenden
+\fBDselect\fP beenden
+.sp
+Beendet das Programm mit dem Fehlercode Null (erfolgreich).
+.sp
+.
+.SH Paketauswahlverwaltung
+.sp
+.SS Einfhrung
+.sp
+\fBdselect\fP setzt den Administrator direkt einigen Komplexitten aus, die
+beim Verwalten groer Paketmengen mit vielen Abhngigkeiten untereinander
+auftreten. Fr einen Benutzer, der sich mit den Konzepten und den Arten des
+Debian\-Paktverwaltungssystems nicht auskennt kann dies recht berwltigend
+sein. Obwohl \fBdselect\fP darauf abzielt, die Paketverwaltung und
+\-administration zu vereinfachen, kann es dazu nur ein Werkzeug sein und
+somit nicht ausreichende Administratorfhigkeiten und
+Administratorverstndnis ersetzen. Es wird vom Benutzer erwartet, dass er
+mit den Konzepten des unterliegenden Debian\-Paketsystems vertraut ist. Im
+Zweifelsfall ziehen Sie die Handbuchseite \fBdpkg\fP(1) und das
+Debian\-Richtlinien\-Handbuch zu Rate. Letzteres ist auf Englisch im Paket
+\fBdebian\-policy\fP enthalten.
+.sp
+Falls \fBdselect\fP nicht im Experten\- oder direkten Modus luft wird zuerst
+ein Hilfebildschirm angezeigt, wenn diese Aktion vom Men ausgewhlt
+wird. Dem Benutzer wird \fInachdrcklich\fP empfohlen, die gesamten in der
+Online\-Hilfe angezeigten Informationen zu prfen, wenn diese angezeigt
+werden. Die Online\-Hilfebildschirme knnen jederzeit mit der Taste \fB?\fP
+aufgerufen werden.
+.sp
+.SS Bildschirmlayout
+.sp
+Der Auswahlbildschirm ist standardmig in eine obere und eine untere Hlfte
+geteilt. Die obere Hlft zeigt eine Liste von Paketen. Ein Cursorbalken
+whlt individuelle Pakete oder, falls zutreffend, eine Gruppe von Paketen
+durch Auswahl der Gruppenkopfzeile aus. Die untere Hlfte des Bildschirms
+zeigt einige Details ber das derzeit in der oberen Hlfte des Bildschirms
+ausgewhlte Paket an. Die Art der angezeigten Details kann variiert werden.
+.sp
+Drcken der Taste \fBI\fP schaltet zwischen der Vollbilddarstellung der
+Paketliste, einer vergrerten Darstellung der Paketdetails und dem
+gleichmig geteilten Bildschirm um.
+.sp
+.SS Paket\-Detailbetrachtung
+.sp
+Standardmig zeigt die Paket\-Detailbetrachtung die ausfhrliche
+Paketbeschreibung des derzeit in der Paketstatusliste ausgewhlten Pakets.
+Die Art der Details kann durch Drcken der Taste \fBi\fP umgeschaltet werden.
+Diese wechseln zwischen:
+ \- der ausfhrlichen Beschreibung
+ \- der Steuerinformation fr die installierte Version
+ \- der Steuerinformation fr die verfgbare Version
+.sp
+Im Bildschirm der Abhngigkeitsauflsung gibt es auch die Mglichkeit, die
+spezifizierten nicht aufgelsten Abhngigkeiten oder Konflikte mit Bezug zu
+dem Paket anzuschauen und deren Auflistung zu erreichen.
+.sp
+.SS Paketstatusliste
+.sp
+Der Hauptauswahlbildschirm zeigt eine Liste aller Pakete, die dem
+Debian\-Paketverwaltungssystem bekannt sind. Dies beinhaltet alle auf dem
+System installierten Pakete und Pakete, die aus den verfgbaren
+Paketdatenbanken bekannt sind.
+.sp
+Fr jedes Paket zeigt die Liste den Paketstatus, die Prioritt, den Bereich,
+installierte und verfgbare Versionen, den Namen und die Kurzbeschreibung
+des Paketes, alles in einer Zeile. Durch Drcken der Taste \fBV\fP kann die
+Anzeige der installierten und verfgbaren Version zwischen ein und aus
+umgeschaltet werden. Durch Drcken der Taste \fBv\fP wird die Anzeige des
+Paketstatus zwischen ausfhrlich und verkrzt umgeschaltet. Die verkrzte
+Anzeige ist voreingestellt.
+.sp
+Die Kurzstatusangabe besteht aus vier Teilen: einer Fehlermarkierung, die
+normalerweise leer sein sollte, dem aktuellen Status, dem letzten
+Auswahlstatus und dem aktuellen Auswahlstatus. Die ersten zwei beziehen sich
+auf den derzeitigen Status des Pakets, das zweite Paar behandeln die vom
+Benutzer gesetzte Auswahl.
+.sp
+Dies sind die Bedeutungen der kurzen Paketstatus\-Anzeige\-Codes:
+ Fehlermarkierung:
+  \fIleer\fP    kein Fehler
+  \fBR\fP       schwerwiegender Fehler, Neuinstallation notwendig;
+ Installierter Status:
+  \fIleer\fP    nicht installiert;
+  \fB*\fP       vollstndig installiert und konfiguriert;
+  \fB\-\fP       nicht installiert, aber einige Konfigurationsdateien knnten bleiben;
+  \fBU\fP       entpackt, aber noch nicht konfiguriert;
+  \fBC\fP       halb konfiguriert (ein Fehler ist aufgetreten);
+  \fBI\fP       halb installiert (ein Fehler ist aufgetreten).
+ Aktuelle und angeforderte Auswahlen:
+  \fB*\fP       markiert zur Installation oder Upgrade;
+  \fB\-\fP       markiert zur Entfernung, Konfigurationsdateien bleiben;
+  \fB=\fP       auf halten: Paket wird berhaupt nicht verarbeitet werden;
+  \fB_\fP       markiert zum vollstndigen Lschen, auch der Konfiguration;
+  \fBn\fP       Paket ist neu und muss erst noch markiert werden.
+.sp
+.SS "Cursor\- und Bildschirm\-Bewegung"
+.sp
+Die Paketauswahllisten und die Abhngigkeitskonflikte\-Lsungsbildschirme
+knnen mit den Bewegungsbefehlen navigiert werden, die auf die folgenden
+Tasten abgebildet sind:
+.br
+  \fBp, Hoch, k\fP                bewege Cursor\-Balken hoch
+  \fBn, Runter, j\fP              bewege Cursor\-Balken runter
+  \fBP, Bild hoch, Rckschritt\fP scrolle Liste eine Seite hoch
+  \fBN, Bild runter, Leertaste\fP scrolle Liste eine Seite runter
+  \fB^p\fP                        scrolle Liste eine Zeile hoch
+  \fB^n\fP                        scrolle Liste eine Zeile runter
+  \fBt, Pos 1\fP                  springe zum Listen\-Anfang
+  \fBe, Ende\fP                   springe zum Listen\-Ende
+  \fBu\fP                         scrolle Info eine Seite hoch
+  \fBd\fP                         scrolle Info eine Seite runter
+  \fB^u\fP                        scrolle Info eine Zeile hoch
+  \fB^d\fP                        scrolle Info eine Zeile runter
+  \fBB, Linker Pfeil\fP           bewege Bildschirm 1/3\-Bildschirmbreite links
+  \fBF, Rechter Pfeil\fP          bewege Bildschirm 1/3\-Bildschirmbreite rechts
+  \fB^b\fP                        bewege Bildschirm ein Zeichen nach links
+  \fB^f\fP                        bewege Bildschirm ein Zeichen nach rechts
+.sp
+.SS "Suchen und Sortieren"
+.sp
+Die Liste der Pakete kann nach Paketnamen durchsucht werden. Dies erfolgt
+durch Drcken von \fB/\fP und der Eingabe einer einfachen
+Suchzeichenkette. Die Zeichenkette wird als regulrer Ausdruck gem
+\fBregex\fP(7) interpretiert. Falls Sie zu dem Suchausdruck \fB/d\fP hinzufgen
+wird Dselect auch in Beschreibungen suchen. Falls Sie \fB/i\fP hinzufgen,
+wird Gro\-/Kleinschreibung ignoriert. Sie knnen die Suffixe wie folgt
+kombinieren: \fB/id\fP. Wiederholtes Suchen wird durch Drcken von \fBn\fP
+oder \fB\e\fP erreicht, bis das gewnschte Paket gefunden wurde. Falls die
+Suche das Ende der Liste erreicht, springt sie zum Anfang und fhrt von dort
+fort.
+.sp
+Die List\-Sortierreihenfolge kann durch wiederholtes
+Drcken der Tasten \fBo\fP and \fBO\fP verndert werden.
+Die folgenden Sortierreihenfolgen knnen ausgewhlt werden:
+ alphabetisch      verfgbar           Status
+ Prioritt+Bereich verfgbar+Prioritt Status+Prioritt
+ Bereich+Prioritt verfgbar+Bereich   Status+Bereich
+.br
+Wo dies oben nicht explizit aufgefhrt ist, wird alphabetische Reihenfolge
+als abschlieender Unterordnungs\-Sortierschlssel verwendet.
+.sp
+.SS "Auswahlen ndern"
+.sp
+Der angeforderte Auswahlstatus individueller Pakete kann mit
+den folgenden Befehlen gendert werden:
+  \fB+, Einfg\fP     Installieren oder Upgrade durchfhren
+  \fB=, H\fP         gegenwrtigen Status und Version beibehalten
+  \fB:, G\fP         Loslassen: Upgrad durchfhren oder uninstalliert lassen
+  \fB\-, Entf\fP      Entfernen, aber Konfiguration behalten
+  \fB_\fP            Entfernen und Konfiguration lschen
+.sp
+Wenn sich aus der nderungsanforderung eine oder mehrere unerfllte
+Abhngigkeiten oder Konflikte ergeben, bietet \fBdselect\fP dem Benutzer einen
+Bildschirm zu Abhngigkeitsauflsung an. Dieser wird weiter unten
+detaillierter beschrieben.
+.sp
+Es ist auch mglich, die Befehle auf Gruppen von Paketauswahlen anzuwenden,
+indem mit dem Cursor\-Balken die Gruppen\-berschrift ausgewhlt wird. Die
+genaue Gruppierung der Pakete hngt von den Einstellungen der aktuellen
+Listensortierung ab.
+.sp
+Vernderungen von groen Gruppen von Auswahlen sollten vorsichtig
+durchgefhrt werden, da dies sofort zu einer groen Anzahl an
+nicht\-aufgelsten Abhngigkeiten oder Konflikten fhren kann, die dann alle
+im Bildschirm der Abhngigkeitsauflsung dargestellt werden. Dies kann dann
+schwer zu handhaben sein. In der Praxis sind nur die Operationen Halten und
+Loslassen ntzlich, wenn sie auf Gruppen angewandt werden.
+.sp
+.SS "Abhngigkeiten und Konflikte auflsen"
+.sp
+Wenn sich aus der nderungsanforderung eine oder mehrere unerfllte
+Abhngigkeiten oder Konflikte ergeben, bietet \fBdselect\fP dem Benutzer einen
+Bildschirm zu Abhngigkeitsauflsung an. Zuerst wird allerdings ein
+Hilfebildschirm angezeigt.
+.sp
+Die obere Hlfte dieses Bildschirms fhrt alle Pakete auf, die auf Grund der
+angeforderten nderung unerfllte Abhngigkeiten oder Konflikte haben und
+alle Pakete, deren Installation (einige) dieser Abhngigkeiten erfllen oder
+deren Entfernung (einige) der Konflikte beseitigen kann. Die untere Hlfte
+zeigt standardmig die Abhngigkeiten oder Konflikte, die zu der Auflistung
+des derzeit ausgewhlte Paketes gefhrt haben.
+.sp
+Wenn anfnglich eine Teilliste von Paketen dargestellt wird, knnte
+\fBdselect\fP bereits den erbetenen Auswahlstatus von einigen der aufgefhrten
+Pakete gesetzt haben, um die Abhngigkeiten oder Konflikte aufzulsen, die
+dazu gefhrt hatten, dass der Bildschirm zu Abhngigkeitsauflsung angezeigt
+wurde. Normalerweise ist es am besten, den Vorschlgen von \fBdselect\fP zu
+folgen.
+.sp
+Durch Drcken der Taste \fBR\fP kann der Auswahlzustand der aufgefhrten
+Pakete zu den Originaleinstellungen zurckgesetzt werden, wie er vor den
+unaufgelsten Abhngigkeiten oder Konflikten war. Durch Drcken der Taste
+\fBD\fP werden die automatischen Vorschlge zurckgesetzt, aber die
+nderungen, die zu der Anzeige des Abhngigkeitsauflsungsbildschirms
+gefhrt hatten, werden wie gebeten beibehalten. Schlielich werden durch
+Drcken der Taste \fBU\fP die Auswahlen wieder auf die automatischen
+Auswahlwerte gesetzt.
+.sp
+.SS "Die angeforderten Auswahlen einrichten"
+.sp
+Durch Drcken von \fBEnter\fP wird die derzeit angezeigte Auswahlgruppe
+akzeptiert. Falls \fBdselect\fP keine unaufgelsten Abhngigkeit als Ergebnis
+der angeforderten Auswahl entdeckt, wird die neue Auswahl gesetzt. Falls es
+allerdings unaufgelste Abhngigkeiten gibt, wird \fBdselect\fP dem Benutzer
+erneut den Bildschirm mit der Abhngigkeitsauflsung anzeigen.
+.sp
+Um die Menge der Auswahlen zu ndern, die unaufgelste Abhngigkeiten oder
+Konflikte erzeugt und \fBdselect\fP zu zwingen, diese zu akzeptieren, drcken
+Sie die Taste \fBQ\fP. Dies setzt die Auswahl wie vom Benutzer angegeben,
+ohne Bedingungen. Machen Sie dies nur, wenn Sie sich ber die Konsequenzen
+im Klaren sind.
+.sp
+Der gegenteilige Effekt, um alle Auswahlnderungen zurckzusetzen und zurck
+auf die vorherige Auswahlliste zu gehen, wird durch Drcken der Tasten
+\fBX\fP oder \fBEsc\fP erreicht. Durch wiederholtes Drcken dieser Tasten
+knnen mglicherweise schdliche nderungen an der angeforderten
+Paketauswahl komplett auf die letzten bestehenden Einstellungen
+zurckgesetzt werden.
+.sp
+Falls Sie bestimmte Einstellungen aus Versehen vornehmen und alle Auswahlen
+so zurcksetzen wollen, dass diese den bereits auf dem System installierten
+Paketen entsprechen, dann drcken Sie die Taste \fBC\fP. Dies hnelt etwas
+der Verwendung des Befehls Loslassen, angewendet auf alle Pakete, bietet
+aber einen etwas deutlicheren Panikknopf, falls der Benutzer aus Versehen
+die \fBEingabetaste\fP gedrckt hat.
+.sp
+.
+.SH UMGEBUNG
+.TP 
+\fBHOME\fP
+Falls gesetzt wird \fBdselect\fP es als das Verzeichnis verwenden, aus dem die
+benutzerspezifische Konfigurationsdatei gelesen wird.
+.
+.SH FEHLER
+Die Paketauswahl\-Schnittstelle von \fBDselect\fP bringt einige neue Benutzer
+durcheinander. Gerchteweise bringt sie sogar erfahrene Kernelentwickler zum
+Heulen.
+.sp
+Die Dokumentation ist verbesserungswrdig.
+.sp
+Es gibt keine Hilfe\-Option im Hauptmen.
+.sp
+Die sichtbare Liste von verfgbaren Paketen kann nicht verkleinert werden.
+.sp
+Die eingebauten Zugriffsmethoden knnen sich nicht mehr mit aktuellen
+Qualittsstandards messen. Verwenden Sie die von apt bereitgestellte
+Zugriffsmethode, sie funktioniert nicht nur, sondern ist sogar flexibler als
+die eingebauten Zugriffsmethoden.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdpkg\fP(1), \fBapt\-get\fP(8), \fBsources.list\fP(5), \fBdeb\fP(5).
+.
+.SH AUTOREN
+\fBDselect\fP wurde von Ian Jackson (ijackson@gnu.ai.mit.edu) geschrieben. Die
+komplette Liste der Beitragenden kann mittels dselect \-\-version
+herausgefunden werden.
+.br
+Diese Handbuchseite wurde von Juho Vuori <javuori@cc.helsinki.fi>,
+Josip Rodin und Joost kooij geschrieben.
+
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/dselect.cfg.5 /home/vorlon/devel/multiarch/dpkg-debian/man/de/dselect.cfg.5
--- dpkg/man/de/dselect.cfg.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/dselect.cfg.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,37 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dselect.cfg 5 2011\-07\-03 Debian\-Projekt dpkg\-Programmsammlung
+.SH NAME
+dselect.cfg \- dselect Konfigurationsdatei
+.
+.SH BESCHREIBUNG
+Diese Datei enthlt Standardoptionen fr dselect. Jede Zeile enthlt eine
+einzelne Option, die exakt die gleiche wie fr die normalen
+Kommandozeilen\-Option von dselect sind, abgesehen von den einleitenden
+Gedankenstrichen, die hier nicht verwendet werden. Anfhrungszeichen
+(Quotes) um Optionswerte werden entfernt. Kommentare sind durch Einleiten
+einer Zeile mit einem Rautenzeichen (\fB#\fP) erlaubt.
+.
+.SH DATEIEN
+\fI/etc/dpkg/dselect.cfg.d/[0\-9a\-zA\-Z_\-]*\fP
+.br
+\fI/etc/dpkg/dselect.cfg\fP
+.br
+\fI~/.dselect.cfg\fP
+.
+.SH AUTOR
+Lesen Sie \fI/usr/share/doc/dpkg/THANKS\fP fr die Liste der Leute, die zu
+\fBdselect\fP beigetragen haben.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBdselect\fP(1).
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/start-stop-daemon.8 /home/vorlon/devel/multiarch/dpkg-debian/man/de/start-stop-daemon.8
--- dpkg/man/de/start-stop-daemon.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/start-stop-daemon.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,260 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH start\-stop\-daemon 8 2011\-07\-04 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+start\-stop\-daemon \- startet und stoppt System\-Daemon\-Programme
+.
+.SH BERSICHT
+\fBstart\-stop\-daemon\fP [\fIOption\fP...] \fIBefehl\fP
+.
+.SH BESCHREIBUNG
+\fBstart\-stop\-daemon\fP wird zur Steuerung der Erzeugung und Beendigung von
+Prozessen auf Systemebene verwendet. Durch die Verwendung einer der
+Abgleich\-Optionen kann \fBstart\-stop\-daemon\fP so konfiguriert werden, dass er
+existierende Instanzen von einem laufenden Prozess finden kann.
+.PP
+Hinweis: Falls \fB\-\-pidfile\fP nicht angegeben ist, verhlt sich
+\fBstart\-stop\-daemon\fP hnlich zu \fBkillall\fP(1). \fBstart\-stop\-daemon\fP wird die
+Prozesstabelle nach Prozessen durchsuchen, die auf den Prozessnamen, uid
+und/oder gid (falls angegeben) passen. Jeder passende Prozess wird
+\fB\-\-start\fP daran hindern, den Daemon zu starten. Allen passenden Prozessen
+wird das TERM\-Signal (oder das mit \fB\-\-signal\fP oder \fB\-\-retry\fP angegebene)
+geschickt, falls \fB\-\-stop\fP angegeben ist. Fr Daemons die langlebige Kinder
+haben, die ein \fB\-\-stop\fP berleben mssen, mssen Sie eine PID\-Datei
+angeben.
+.
+.SH BEFEHLE
+.TP 
+\fB\-S\fP, \fB\-\-start\fP [\fB\-\-\fP] \fIArgumente\fP
+Prfe auf Existenz eines angegebenen Prozesses. Falls ein solcher Prozess
+existiert fhrt \fBstart\-stop\-daemon\fP nichts aus und beendet sich mit
+Fehlerstatus 1 (0, falls \fB\-\-oknodo\fP angegeben wurde). Falls ein solcher
+Prozess nicht existiert, dann startet es eine Instanz, entweder unter
+Verwendung des ausfhrbaren Programms, das mittels \fB\-\-exec\fP (oder, falls
+angegeben, mittels \fB\-\-startas\fP) spezifiziert wurde. Jedes weitere auf der
+Kommandozeile nach \fB\-\-\fP angegebene Argument wird unverndert an das zu
+startende Programm weitergegeben.
+.TP 
+\fB\-K\fP, \fB\-\-stop\fP
+berprft auf die Existenz eines speziellen Prozesses. Falls ein solcher
+Prozess existiert, dann sendet \fBstart\-stop\-daemon\fP das durch \fB\-\-signal\fP
+angegebene Signal und beendet sich mit Fehlerstatus 0. Falls kein solcher
+Prozess existiert, dann beendet sich \fBstart\-stop\-daemon\fP mit Fehlerstatus 1
+(0 falls \fB\-\-oknodo\fP angegeben ist). Falls \fB\-\-retry\fP angegeben wurde, wird
+\fBstart\-stop\-daemon\fP berprfen, ob der/die Prozess(e) beendet wurden.
+.TP 
+\fB\-T\fP, \fB\-\-status\fP
+berprft auf die Existenz eines bestimmten Prozesses und liefert den
+Exit\-Status\-Code entsprechend der LSB Init Script Actions zurck.
+.TP 
+\fB\-H\fP, \fB\-\-help\fP
+Zeige Bedienungsinformationen und beendet sich.
+.TP 
+\fB\-V\fP, \fB\-\-version\fP
+Zeige die Programmversion und beendet sich.
+.
+.SH ABGLEICH\-OPTIONEN
+.TP 
+\fB\-p\fP, \fB\-\-pidfile\fP \fIpid\-Datei\fP
+berprfe, ob ein Prozess die Datei \fIpid\-Datei\fP angelegt hat.
+.TP 
+\fB\-x\fP, \fB\-\-exec\fP \fIProgramm\fP
+berprfe auf Prozesse die (laut \fB/proc/\fP\fIpid\fP\fB/exe\fP) Instanzen von
+diesem Programm sind.
+.TP 
+\fB\-n\fP, \fB\-\-name\fP \fIProzessname\fP
+berprfe (laut \fB/proc/\fP\fIpid\fP\fB/stat\fP) auf Prozesse mit dem Namen
+\fIProzessname\fP.
+.TP 
+\fB\-u\fP, \fB\-\-user\fP \fIBenutzername\fP|\fIuid\fP
+berprfe auf Prozesse die dem mit \fIBenutzername\fP oder \fIuid\fP
+spezifizierten Benutzer gehren.
+.
+.SH OPTIONEN
+.TP 
+\fB\-g\fP, \fB\-\-group\fP \fIGruppe\fP|\fIgid\fP
+Wechsle zum Starten des Prozesses zur \fIGruppe\fP oder \fIgid\fP.
+.TP 
+\fB\-s\fP, \fB\-\-signal\fP \fISignal\fP
+Mit \fB\-\-stop\fP wird das an den zu beendenden Prozess zu sendende Signal
+spezifiziert (standardmig TERM).
+.TP 
+\fB\-R\fP, \fB\-\-retry\fP \fIZeitberschreitung\fP|\fIPlan\fP
+Mit \fB\-\-stop\fP spezifiziert, dass \fBstart\-stop\-daemon\fP berprfen soll, ob
+der Prozess (die Prozesse) sich beenden. Es berprft wiederholt, ob
+passende Prozesse laufen, bis dies nicht mehr der Fall ist. Falls sich die
+Prozesse nicht beenden, werden weitere im Plan angegebene Aktionen
+durchgefhrt.
+
+Falls \fIZeitberschreitung\fP anstelle von \fIPlan\fP spezifiziert wird, dann
+wird der Plan
+\fISignal\fP\fB/\fP\fIZeitberschreitung\fP\fB/KILL/\fP\fIZeitberschreitung\fP verwendet,
+wobei \fISignal\fP das mit \fB\-\-signal\fP spezifizierte Signal ist.
+
+\fIPlan\fP ist eine Liste von mindestens zwei durch Schrgstriche (\fB/\fP)
+getrennten Punkten; jeder Punkt kann aus \fB\-\fP\fISignalnummer\fP oder
+[\fB\-\fP]\fISignalname\fP bestehen, was bedeutet, dass dieses Signal gesendet
+werden soll, oder aus \fIZeitberschreitung\fP, was bedeutet, dass soviele
+Sekunden auf das Beenden von Prozessen gewartet werden soll, oder aus
+\fBforever\fP was bedeutet, den Rest des Plans falls notwendig fr immer zu
+wiederholen.
+
+Falls das Ende des Plans erreicht wird und \fBforever\fP nicht spezifiziert
+wurde, dann beendet sich der \fBstart\-stop\-daemon\fP mit dem Fehlerstatus
+2. Falls ein Plan spezifiziert wurde, dann wird jedes mit \fB\-\-signal\fP
+spezifizierte Signal ignoriert.
+.TP 
+\fB\-a\fP, \fB\-\-startas\fP \fIPfadname\fP
+Mit \fB\-\-start\fP wird der ber \fIPfadname\fP spezifizierte Prozess
+gestartet. Falls nicht angegeben, werden standardmig die an \fB\-\-exec\fP
+bergebenen Argumente verwendet.
+.TP 
+\fB\-t\fP, \fB\-\-test\fP
+Gebe die Aktionen aus, die erledigt wrden und setze die entsprechenden
+Rckgabewerte, fhre aber keine Aktionen durch.
+.TP 
+\fB\-o\fP, \fB\-\-oknodo\fP
+Liefert den Rckgabewert 0 anstatt 1 falls keine Aktionen ausgefhrt wurden
+(wrden).
+.TP 
+\fB\-q\fP, \fB\-\-quiet\fP
+Gebe keine informativen Meldungen aus, zeige nur Fehlermeldungen an.
+.TP 
+\fB\-c \fP, \fB \-\-chuid \fP\fIBenutzername\fP|\fIuid\fP[\fB:\fP\fIGruppe\fP|\fIgid\fP]
+Wechsele vor dem Start des Prozesses zu diesem Benutzername/uid. Sie knnen
+durch Anhngen von \fB:\fP auch die Gruppe spezifizieren, in diesem Fall wird
+die Gruppe oder gid wie bei dem chown\-Befehl (\fIBenutzer\fP\fB:\fP\fIGruppe\fP)
+angegeben. Falls ein Benutzer ohne Gruppe angegeben ist, wird die primre
+GID fr diesen Benutzer verwandt. Wenn Sie diese Option verwenden, mssen
+Sie daran denken, dass die primre und zustzliche Gruppen auch gesetzt
+werden, selbst wenn die Option \fB\-\-group\fP nicht angegeben wird. Die Option
+\fB\-\-group\fP ist nur fr Gruppen, in denen der Benutzer normalerweise kein
+Mitglied ist (wie das Hinzufgen von pro\-Prozess Gruppenmitgliedschaften fr
+generische Benutzer wie \fBnobody\fP).
+.TP 
+\fB\-r\fP, \fB\-\-chroot\fP \fIWurzel\fP
+Chdir und chroot vor dem Start des Prozesse zu \fIWurzel\fP. Bitte beachten
+Sie, dass die PID\-Datei auch nach dem chroot geschrieben wird.
+.TP 
+\fB\-d\fP, \fB\-\-chdir\fP \fIPfad\fP
+Chdir vor dem Starten des Prozesses zu \fIPfad\fP. Dies wird, falls die
+\fB\-r\fP|\fB\-\-chroot\fP Option gesetzt ist, nach dem chroot durchgefhrt. Falls
+nicht angegeben, wird start\-stop\-daemon vor dem Prozess\-Start in das
+Wurzelverzeichnis wechseln.
+.TP 
+\fB\-b\fP, \fB\-\-background\fP
+Typischerweise verwendet fr Programme, die sich nicht selbstndig
+ablsen. Diese Option zwingt \fBstart\-stop\-daemon\fP vor dem Start des
+Prozesses einen Fork durchzufhren, und zwingt diesen dann in den
+Hintergrund. \fBWARNUNG: start\-stop\-daemon\fP kann nicht den Rckgabewert
+berprfen, falls der Prozess aus \fBirgendeinem\fP Grund nicht startet. Dies
+ist ein letztes Mittel und ist nur fr Programme gedacht, bei denen das
+selbststndige Forken keinen Sinn ergibt oder wo es nicht sinnvoll ist, den
+Code hierfr hinzuzufgen.
+.TP 
+\fB\-N\fP, \fB\-\-nicelevel\fP \fIGanzzahl\fP
+Dies ndert die Prioritt des Prozesses bevor er gestartet wird.
+.TP 
+\fB\-P\fP, \fB\-\-procsched\fP \fIStrategie\fP\fB:\fP\fIPrioritt\fP
+Dies ndert die Prozesssteuerstrategie (process scheduler policy) und die
+Prioritt des Prozesses, bevor dieser gestartet wird. Die Prioritt kann
+optional festgelegt werden, indem ein \fB:\fP gefolgt von einem Wert angegeben
+wird. Die Standard\-\fIPrioritt\fP betrgt 0. Die derzeit untersttzten Werte
+fr die Strategie lauten \fBother\fP, \fBfifo\fP und \fBrr\fP.
+.TP 
+\fB\-I\fP, \fB\-\-iosched\fP \fIKlasse\fP\fB:\fP\fIPrioritt\fP
+Dies ndert die IO\-Steuerklasse (IO scheduler class) und die Prioritt des
+Prozesses, bevor dieser gestartet wird. Die Prioritt kann optional
+festgelegt werden, indem ein \fB:\fP gefolgt von einem Wert angegeben wird. Die
+Standard\-\fIPrioritt\fP betrgt 4, auer \fIKlasse\fP lautet \fBidle\fP, dann
+betrgt sie immer 7. Die derzeit untersttzten Werte fr die \fIKlasse\fP
+lauten \fBidle\fP, \fBbest\-effort\fP und \fBreal\-time\fP.
+.TP 
+\fB\-k\fP, \fB\-\-umask\fP \fIMaske\fP
+Dies setzt die umask des Prozesses bevor er gestartet wird.
+.TP 
+\fB\-m\fP, \fB\-\-make\-pidfile\fP
+Verwendet, wenn ein Programm gestartet wird, das keine eigene PID\-Datei
+anlegt. Diese Option sorgt dafr, dass \fBstart\-stop\-daemon\fP die mit
+\fB\-\-pidfile\fP referenzierte Datei anlegt und die PID kurz vor der Ausfhrung
+des Prozesse hineinlegt. Beachten Sie, dass die Datei nicht entfernt wird,
+wenn das Programm beendet wird. \fBHINWEIS:\fP Diese Funktion knnte in nicht
+allen Fllen funktionieren. Insbesondere wenn das auszufhrende Programm
+sich vom Hauptprozess forkt. Deshalb ist diese Option normalerweise nur in
+Kombination mit der Option \fB\-\-background\fP sinnvoll.
+.TP 
+\fB\-v\fP, \fB\-\-verbose\fP
+Gibt ausfhrliche informative Meldungen aus.
+.
+.SH RCKGABEWERT
+.TP 
+\fB0\fP
+Die angeforderte Aktion wurde durchgefhrt. Falls \fB\-\-oknodo\fP angegeben
+wurde, kann es auch sein, dass nicht durchgefhrt wurde. Das kann passieren,
+wenn \fB\-\-start\fP angegeben wurde und der passende Prozess bereits lief oder
+wenn \fB\-\-stop\fP angegeben wurde und es keinen passenden Prozess gab.
+.TP 
+\fB1\fP
+Falls \fB\-\-oknodo\fP nicht angegeben war und nichts durchgefhrt wurde.
+.TP 
+\fB2\fP
+Falls \fB\-\-stop\fP und \fB\-\-retry\fP angegeben waren, aber das Ende des Plans
+erreicht wurde und die Prozesse noch liefen.
+.TP 
+\fB3\fP
+Jeder andere Fehler.
+.PP
+Bei der Verwendung des Befehls \fB\-\-status\fP werden die folgenden Statuscodes
+zurckgeliefert:
+.TP 
+\fB0\fP
+Programm luft.
+.TP 
+\fB1\fP
+Programm luft nicht und die PID\-Datei existiert.
+.TP 
+\fB3\fP
+Programm luft nicht.
+.TP 
+\fB4\fP
+Programmstatus kann nicht bestimmt werden.
+.
+.SH BEISPIEL
+Starte den Daemon \fBfood\fP falls noch keiner luft (ein Prozess mit Namen
+food, der als Benutzer food mit PID in food.pid luft):
+.IP
+.nf
+start\-stop\-daemon \-\-start \-\-oknodo \-\-user food \-\-name food \-\-pidfile /var/run/food.pid \-\-startas /usr/sbin/food \-\-chuid food \-\- \-\-daemon
+.fi
+.PP
+Schicke \fBSIGTERM\fP an \fBfood\fP und warte bis zu fnf Sekunden auf sein
+Beenden:
+.IP
+.nf
+start\-stop\-daemon \-\-stop \-\-oknodo \-\-user food \-\-name food \-\-pidfile /var/run/food.pid \-\-retry 5
+.fi
+.PP
+Vorfhrung eines angepassten Plans zum Beenden von \fBfood\fP:
+.IP
+.nf
+start\-stop\-daemon \-\-stop \-\-oknodo \-\-user food \-\-name food \-\-pidfile /var/run/food.pid \-\-retry=TERM/30/KILL/5
+.fi
+.PP
+.
+.SH AUTOREN
+Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl> basierend
+auf einer vorherigen Version von Ian Jackson
+<ian@chiark.greenend.org.uk>.
+
+Handbuchseite von Klee Dienes <klee@mit.edu>, teilweise von Ian
+Jackson umformatiert.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
diff -uNr --exclude .git --exclude .bzr dpkg/man/de/update-alternatives.8 /home/vorlon/devel/multiarch/dpkg-debian/man/de/update-alternatives.8
--- dpkg/man/de/update-alternatives.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/de/update-alternatives.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,439 @@
+.\" update\-alternatives.8
+.\" This man page is copyright 1997 Charles Briscoe-Smith
+.\" This is free documentation; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published
+.\" by the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.  There is NO WARRANTY.  You can
+.\" find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH update\-alternatives 8 2011\-08\-14 Debian\-Projekt dpkg\-Hilfsprogramme
+.SH NAME
+update\-alternatives \- Verwaltung symbolischer Links zur Bestimmung von
+Standardwerten fr Befehle
+.
+.SH BERSICHT
+\fBupdate\-alternatives\fP [\fIOption\fP...] \fIBefehl\fP
+.
+.SH BESCHREIBUNG
+\fBupdate\-alternatives\fP erzeugt, entfernt, verwaltet und zeigt die
+Informationen ber die symbolischen Links, die das Debian
+Alternativ\-System bilden, an.
+.PP
+Es ist mglich, mehrere Programme, die die gleiche oder hnliche
+Funktionalitt bereitstellen, gleichzeitig auf einem System zu
+installieren. Beispielsweise sind auf vielen Systemen mehrere Texteditoren
+gleichzeitig installiert. Dies gibt den Benutzern eines Systems die
+Mglichkeit, falls gewnscht, jeweils einen anderen Editor zu verwenden,
+allerdings wird es damit fr ein Programm schwierig, einen guten Wahl fr
+einen Editor zum Starten zu treffen, falls der Benutzer keine spezielle Wahl
+getroffen hat.
+.PP
+Debians Alternativ\-System hat das Ziel, dieses Problem zu lsen. Ein
+generischer Name im Dateisystem wird von allen Dateien, die austauschbare
+Funktionalitt bereitstellen, verwendet. Das Alternativ\-System bestimmt
+zusammen mit dem Systemadministrator welche Datei tatschlich durch diesen
+generischen Namen referenziert wird. Falls beispielsweise sowohl der
+Texteditor \fBed\fP(1) als auch \fBnvi\fP(1) im System installiert sind, wird das
+Alternativ\-System dafr sorgen, dass der generische Name \fI/usr/bin/editor\fP
+standardmig auf \fI/usr/bin/nvi\fP zeigt. Der Systemadministrator kann dies
+ndern und dafr sorgen, dass er stattdessen auf \fI/usr/bin/ed\fP zeigt, und
+das Alternativ\-System wird diese Einstellung nicht verndern, bis es
+explizit dazu aufgefordert wird.
+.PP
+Der generische Name ist nicht ein direkter symbolischer Link auf die
+ausgewhlte Alternative. Stattdessen ist es ein symbolischer Link auf einen
+Namen im \fIAlternativ\-Verzeichnis\fP, welches wiederum ein symbolischer Link
+auf die tatschlich referenzierte Datei ist. Dies ist so realisiert, damit
+die nderungen des Systemadministrators auf das \fI/etc\fP Verzeichnis
+beschrnkt bleiben: der FHS (siehe dort) erklrt warum dies eine Gute Idee
+ist.
+.PP
+Fr jedes Paket, das eine Datei mit einer bestimmten Funktionalitt
+bereitstellt, wird bei der Installation, der nderung oder der Entfernung
+\fBupdate\-alternatives\fP aufgerufen, um die Informationen ber diese Datei im
+Alternativ\-System zu aktualisieren. \fBupdate\-alternatives\fP wird gewhnlich
+vom Skript \fBpostinst\fP (configure) oder \fBprerm\fP (install) eines
+Debian\-Paketes aufgerufen.
+.PP
+Es ist oft sinnvoll, dass eine Reihe von Alternativen synchronisiert werden,
+so dass sie als Gruppe gendert werden; wenn beispielsweise mehrere
+Versionen des \fBvi\fP(1) Editors installiert sind, sollte die Handbuchseite,
+die durch \fI/usr/share/man/man1/vi.1\fP referenziert wird, zu dem ausfhrbaren
+Programm, dass durch \fI/usr/bin/vi\fP referenziert wird,
+gehren. \fBupdate\-alternatives\fP erledigt dies mit Hilfe von \fIMaster\-\fP und
+\fISlave\-Links\fP; wird der Master\-Link gendert, wird auch jeder zugehrige
+Slave\-Link gendert. Ein Master\-Link und seine zugehrigen Slave\-Links
+bilden zusammen eine \fILink\-Gruppe\fP.
+.PP
+Eine Linkgruppe ist zu jeder Zeit in einem der beiden Modi: automatisch oder
+manuell. Ist eine Gruppe im automatischen Modus, dann wird das
+Alternativ\-System bei der Paketinstallation und \-entfernung automatisch
+entscheiden, ob und wie die Links aktualisiert werden. Im manuellen Modus
+wird das Alternativ\-System die Wahl des Administrators beibehalten und
+nderungen der Links vermeiden (auer irgendetwas ist defekt).
+.PP
+Beim erstmaligen Einfhren in das System befindet sich eine Linkgruppe im
+automatischen Modus. Fhrt der Systemadministrator nderungen an den
+automatischen Einstellungen des Systems durch, wird dies beim nchsten
+Aufruf von \fBupdate\-alternatives\fP auf die Linkgruppe bemerkt und die Gruppe
+wird automatisch in den manuellen Modus umgeschaltet.
+.PP
+Jede Alternative hat eine ihr zugeordnete \fIPrioritt\fP. Befindet sich eine
+Linkgruppe im automatischen Modus, zeigen die Mitglieder einer Gruppe auf
+die Alternative mit der hchsten Prioritt.
+.PP
+Wird die \fB\-\-config\fP\-Option verwendet, dann zeigt \fBupdate\-alternatives\fP
+alle Auswahlmglichkeiten fr die Link\-Gruppe an, fr die der gegebene
+\fIName\fP der Master\-Alternative\-Name ist. Die aktuelle Auswahl ist mit *
+markiert. Sie werden dann aufgefordert, Ihre Auswahl bezglich der
+Linkgruppe anzugeben. Abhngig von der getroffenen Auswahl knnte sich die
+Link\-Gruppe nicht mehr im \fIautomatischen\fP Modus befinden. Sie mssen dann
+die Option \fB\-\-auto\fP verwenden, um wieder in den automatischen Zustand
+zurckzukehren (oder Sie knnen \fB\-\-config\fP erneut ausfhren und den als
+automatisch markierten Eintrag auswhlen).
+.PP
+Falls Sie nicht\-interaktiv konfigurieren mchten, knnen Sie stattdessen die
+\fB\-\-set\fP Option verwenden (siehe unten).
+.PP
+Verschiedene Pakete, die die gleiche Datei bereitstellen, mssen dies
+\fBkooperativ\fP durchfhren. Anders gesagt ist in diesem Fall die Verwendung
+von \fBupdate\-alternatives\fP fr alle beteiligten Pakete \fBzwingend\fP. Es ist
+nicht mglich, sich ber eine Datei in einem Paket hinwegzusetzen, welches
+den \fBupdate\-alternatives\fP\-Mechanismus nicht verwendet.
+.
+.SH BEGRIFFE
+Da die Ttigkeiten von \fBupdate\-alternatives\fP recht komplex sind, sollen
+einige spezielle Begriffe helfen, seine Vorgehensweise zu erlutern.
+.TP 
+generischer Name (oder Alternativ\-Link)
+Ein Name wie \fI/usr/bin/editor\fP, der sich ber das Alternativ\-System auf
+eine Reihe von Dateien mit hnlicher Funktionalitt bezieht.
+.TP 
+Alternativ\-Name
+Der Name eines symbolischen Links im Alternativ\-Verzeichnis.
+.TP 
+Alternative (oder Alternativ\-Pfad)
+Der Name einer speziellen Datei im Dateisystem, die mittels eines
+generischen Namens ber das Alternativ\-System zugreifbar gemacht werden
+kann.
+.TP 
+Alternativ\-Verzeichnis
+Ein Verzeichnis, standardmig \fI/etc/alternatives\fP, das die Symlinks
+enthlt.
+.TP 
+administratives Verzeichnis
+Ein Verzeichnis, standardmig \fI/var/lib/dpkg/alternatives\fP, das die
+\fBupdate\-alternatives\fP Zustandsinformationen enthlt.
+.TP 
+Linkgruppe
+Ein Satz zusammengehrender Symlinks, die als Gruppe aktualisiert werden
+sollen.
+.TP 
+Master\-Link
+Der Alternativ\-Link in einer Linkgruppe der bestimmt, wie die anderen Links
+in der Gruppe konfiguriert werden.
+.TP 
+Slave\-Link
+Ein Alternativ\-Link in einer Linkgruppe, der durch die Einstellung des
+Master\-Links gesteuert wird.
+.TP 
+automatischer Modus
+Ist eine Linkgruppe im automatischen Modus, dann sorgt das Alternativ\-System
+dafr, dass die Links in der Gruppe auf die fr die Gruppe passende
+Alternative mit der hchsten Prioritt zeigen.
+.TP 
+manueller Modus
+Ist eine Linkgruppe im manuellen Modus, dann fhrt das Alternativ\-System
+keine nderungen an den Einstellungen des Systemadministrators durch.
+.
+.SH BEFEHLE
+.TP 
+\fB\-\-install\fP \fILink Name Pfad Prioritt\fP [\fB\-\-slave\fP \fILink Name Pfad\fP] ...
+Fge eine Gruppe von Alternativen zum System hinzu. \fILink\fP ist der
+generische Name des Master\-Links, \fIName\fP ist der Name seines Symlinks im
+Alternativ\-Verzeichnis und \fIPfad\fP ist die Alternative, die fr den
+Master\-Link eingefhrt wird. Die Argumente nach \fB\-\-slave\fP sind der
+generische Name, Symlink\-Name in dem Alternativ\-Verzeichnis und der
+Alternativ\-Pfad fr den Slave\-Link. Null oder mehrere \fB\-\-slave\fP\-Optionen,
+jede von drei Argumenten gefolgt, knnen spezifiziert werden. Beachten Sie,
+dass die Master\-Alternative existieren muss, ansonsten schlgt der Aufruf
+fehl. Falls allerdings eine Slave\-Alternative nicht existiert wird der
+zugehrige Slave\-Alternative\-Link einfach nicht installiert (es wird noch
+eine Warnung ausgegeben). Falls eine echte Datei an einer Stelle installiert
+wird, an der ein Alternativ\-Link installiert werden muss, wird diese
+beibehalten, solange \fB\-\-force\fP nicht verwandt wird.
+.IP
+Falls der angegebene Alternativ\-Name bereits in den Aufzeichnungen des
+Alternativ\-Systems existiert, werden die angegebenen Informationen als neuer
+Satz von Alternativen fr die Gruppe hinzugefgt. Andernfalls wird eine neue
+Gruppe, eingestellt im automatischen Modus, mit dieser Information
+hinzugefgt. Falls die Gruppe sich im automatischen Modus befindet und die
+Prioritt der neu hinzugefgten Alternative hher ist als die jeder anderen
+installierten Alternative fr diese Gruppe werden die Symlinks aktualisiert,
+so dass sie auf die neu hinzugefgte Alternative zeigen.
+.TP 
+\fB\-\-set\fP \fIName Pfad\fP
+Setzt das Programm \fIPfad\fP als Alternative fr \fIName\fP. Dies ist quivalent
+zu \fB\-\-config\fP, ist aber nicht interaktiv und kann somit geskriptet werden.
+.TP 
+\fB\-\-remove\fP \fIName Pfad\fP
+Entferne eine Alternative und alle zugehrigen Slave\-Links. \fIName\fP ist ein
+Name im Alternativ\-Verzeichnis, und \fIPfad\fP ist ein absoluter Dateiname zu
+dem \fIName\fP gelinkt werden knnte. Falls \fIName\fP tatschlich nach \fIPfad\fP
+gelinkt ist, dann wird \fIName\fP aktualisiert, um auf eine andere geeignete
+Alternative zu zeigen (und die Gruppe wird wieder in den automatischen Modus
+versetzt) oder entfernt, falls keine solche Alternative brig
+bleibt. Zugehrige Slave\-Links werden entsprechend aktualisiert oder
+entfernt. Falls der Link derzeit nicht auf \fIPfad\fP zeigt, werden keine Links
+gendert; nur die Information ber die Alternative wird entfernt.
+.TP 
+\fB\-\-remove\-all\fP \fIName\fP
+Entferne alle Alternativen und deren zugehrige Slave\-Links. \fIName\fP ist ein
+Name im Alternativ\-Verzeichnis.
+.TP 
+\fB\-\-all\fP
+Ruft \fB\-\-config\fP fr alle Alternativen auf. In der Kombination mit
+\fB\-\-skip\-auto\fP kann dies ntzlich sein, um alle Alternativen zu prfen und
+zu konfigurieren, die sich nicht im automatischen Modus befinden. Defekte
+Alternativen werden auch angezeigt. Um alle defekten Alternativen zu
+reparieren dient daher ein einfacher Aufruf von \fByes \[aq]\[aq] |
+update\-alternatives \-\-force \-\-all\fP.
+.TP 
+\fB\-\-auto\fP \fIName\fP
+berfhrt die Linkgruppe hinter der Alternative mit Name \fIName\fP in den
+automatischen Modus. Bei diesem Prozess werden der Master\-Symlink und seine
+Slave\-Links aktualisiert, um auf die installierte Alternative mit hchster
+Prioritt zu zeigen.
+.TP 
+\fB\-\-display\fP \fIName\fP
+Zeige Informationen ber die Linkgruppe an. Die angezeigten Informationen
+enthalten den Modus der Gruppe (automatisch oder manuell), auf welche
+Alternative der Master\-Link derzeit zeigt, welche weiteren Alternativen zur
+Verfgung stehen (und ihre zugehrigen Slave\-Alternativen), und die
+installierte Alternative mit der hchsten Prioritt.
+.TP 
+\fB\-\-get\-selections\fP
+Fhre alle Master\-Alternativ\-Namen (die eine Linkgruppe steuern) mit ihrem
+Status auf. Jede Zeile enthlt bis zu 3 Felder (getrennt durch mindestens
+ein Leerzeichen). Im ersten Feld steht der Alternativ\-Name, im zweiten der
+Status (entweder auto oder manual) und im letzten die derzeitige Wahl
+der Alternative (Achtung: Dies ist ein Dateiname, der Leerzeichen enthalten
+kann).
+.TP 
+\fB\-\-set\-selections\fP
+Lese eine Konfiguration von Alternativen ber die Standardeingabe im von
+\fBupdate\-alternatives \-\-get\-selections\fP generierten Format und konfiguriere
+die Alternativen entsprechend neu.
+.TP 
+\fB\-\-query\fP \fIName\fP
+Zeige alle Informationen ber die Linkgruppe an, wie dies auch von \-\-display
+erfolgt, allerdings in einem maschinenlesbaren Format (siehe Abschnitt
+\fBABFRAGE\-FORMAT\fP unten).
+.TP 
+\fB\-\-list\fP \fIName\fP
+Zeige alle Ziele der Linkgruppe an.
+.TP 
+\fB\-\-config\fP \fIName\fP
+Zeige die verfgbaren Alternativen fr eine Linkgruppe an und erlaube es dem
+Benutzer interaktiv auszuwhlen, welche zu benutzen ist. Die Linkgruppe wird
+aktualisiert.
+.TP 
+\fB\-\-help\fP
+Zeige den Bedienungshinweis und beende.
+.TP 
+\fB\-\-version\fP
+Gebe die Version aus und beende sich.
+.
+.SH OPTIONEN
+.TP 
+\fB\-\-altdir\fP\fI Verzeichnis\fP
+Spezifiziert das Alternativ\-Verzeichnis, wenn sich dieses von der
+Standardeinstellung unterscheiden soll.
+.TP 
+\fB\-\-admindir\fP\fI Verzeichnis\fP
+Spezifiziert das administrative Verzeichnis, wenn sich dieses von der
+Standardeinstellung unterscheiden soll.
+.TP 
+\fB\-\-log\fP\fI Datei\fP
+Gibt die Protokolldatei an, wenn diese sich von der Vorgabe
+(/var/log/alternatives.log) unterscheiden soll.
+.TP 
+\fB\-\-force\fP
+Lsst \fBupdate\-alternatives\fP alle echten Dateien ersetzen oder entfernen,
+die sich an Stellen befinden, an denen ein Alternativ\-Link installiert
+werden muss.
+.TP 
+\fB\-\-skip\-auto\fP
+berspringt die Konfigurationsabfrage fr Alternativen, die korrekt im
+automatische Modus konfiguriert sind. Diese Option ist nur mit \fB\-\-config\fP
+oder \fB\-\-all\fP relevant.
+.TP 
+\fB\-\-verbose\fP
+Erzeugt mehr Kommentare ber die Ttigkeit von \fBupdate\-alternatives\fP.
+.TP 
+\fB\-\-quiet\fP
+Erzeuge keine Kommentare, es sei denn, ein Fehler tritt auf.
+.
+.SH UMGEBUNG
+.TP 
+\fBDPKG_ADMINDIR\fP
+Falls gesetzt und die Option \fB\-\-admindir\fP nicht angegeben wurde, wird dies
+als Basis\-Administrationsverzeichnis verwandt.
+.
+.SH DATEIEN
+.TP 
+\fI/etc/alternatives/\fP
+Das standardmige Alternativ\-Verzeichnis. Kann mittels der Option
+\fB\-\-altdir\fP gendert werden.
+.TP 
+\fI/var/lib/dpkg/alternatives/\fP
+Das standardmige administrative Verzeichnis. Kann mittels der
+\fB\-\-admindir\fP Option gendert werden.
+.
+.SH RCKGABEWERT
+.TP 
+\fB0\fP
+Die angeforderte Aktion wurde erfolgreich ausgefhrt.
+.TP 
+\fB2\fP
+Beim Lesen der Kommandozeile oder beim Ausfhren der Aktion traten Probleme
+auf.
+.
+.SH ABFRAGE\-FORMAT
+Das Format von \fBupdate\-alternatives \-\-query\fP ist ein RFC822\-artiges,
+flaches Format. Es besteht aus \fIn\fP+1 Blcken, wobei \fIn\fP die Anzahl der in
+einer abgefragten Linkgruppe verfgbaren Alternativen ist. Der erste Block
+enthlt die folgenden Felder:
+.TP 
+\fBLink:\fP\fI Link\fP
+Der generische Name der Alternative.
+.TP 
+\fBStatus:\fP\fI Status\fP
+Der Status der Alternative (\fBauto\fP oder \fBmanual\fP).
+.TP 
+\fBBest:\fP\fI beste\-Wahl\fP
+Der Pfad der besten Alternative fr diese Linkgruppe. Nicht vorhanden, falls
+keine Alternative verfgbar ist.
+.TP 
+\fBValue:\fP\fI derzeit\-ausgewhlte\-Alternative\fP
+Der Pfad der derzeit ausgewhlten Alternative. Es akzeptiert auch den
+magischen Wert \fBnone\fP, der verwandt wird, falls der Link nicht existiert.
+.TP 
+.TP 
+Die anderen Blcke beschreiben die verfgbaren Alternativen in der abgefragten Linkgruppe:
+.TP 
+\fBAlternative:\fP\fI Pfad\-dieser\-Alternativen\fP
+Pfad zum Block dieser Alternativen.
+.TP 
+\fBPriority:\fP\fI Priorittswert\fP
+Wert der Prioritt dieser Alternativen.
+.TP 
+\fBSlaves:\fP\fI Liste\-von\-Slaves\fP
+Wenn diese Kopfzeile vorhanden ist enthlt die \fBnchste\fP Zeile alle
+Slave\-Alternativen, die dem Masterlink dieser Alternativen zugeordnet
+sind. Pro Zeile wird ein Slave aufgefhrt. Jede Zeile enthlt ein
+Leerzeichen, den generischen Namen des Slaves, ein weiteres Leerzeichen und
+den Pfad zu der Slave\-Alternative.
+.
+.TP 
+\fBBeispiel\fP
+.nf
+$ update\-alternatives \-\-query editor
+Link: editor
+Status: auto
+Best: /usr/bin/vim.gtk
+Value: /usr/bin/vim.gtk
+
+Alternative: /bin/ed
+Priority: \-100
+Slaves:
+ editor.1.gz /usr/share/man/man1/ed.1.gz
+
+Alternative: /usr/bin/vim.gtk
+Priority: 50
+Slaves:
+ editor.1.gz /usr/share/man/man1/vim.1.gz
+ editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz
+ editor.pl.ISO8859\-2.1.gz /usr/share/man/pl.ISO8859\-2/man1/vim.1.gz
+ editor.it.ISO8859\-1.1.gz /usr/share/man/it.ISO8859\-1/man1/vim.1.gz
+ editor.pl.UTF\-8.1.gz /usr/share/man/pl.UTF\-8/man1/vim.1.gz
+ editor.it.1.gz /usr/share/man/it/man1/vim.1.gz
+ editor.fr.UTF\-8.1.gz /usr/share/man/fr.UTF\-8/man1/vim.1.gz
+ editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz
+ editor.it.UTF\-8.1.gz /usr/share/man/it.UTF\-8/man1/vim.1.gz
+ editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz
+ editor.fr.ISO8859\-1.1.gz /usr/share/man/fr.ISO8859\-1/man1/vim.1.gz
+.fi
+.
+.SH DIAGNOSE
+Mit \fB\-\-verbose\fP quatscht \fBupdate\-alternatives\fP ohne Unterlass ber seine
+Aktivitten auf seinem Standardausgabekanal. Falls Probleme auftreten, gibt
+\fBupdate\-alternatives\fP eine Fehlermeldung auf seinem Standardfehlerkanal aus
+und beendet sich mit dem Exit\-Status 2. Die Diagnostiken sollten
+selbsterklrend sein; falls Sie dies nicht so empfinden, melden Sie dies
+bitte als Fehler.
+.
+.SH BEISPIELE
+Es gibt mehrere Pakete, die einen zum \fBvi\fP\-kompatiblen Texteditor
+bereitstellen, beispielsweise \fBnvi\fP und \fBvim\fP. Welcher benutzt wird, wird
+durch die Linkgruppe \fBvi\fP eingestellt, welche Links fr das Programm selber
+und die zugehrige Handbuchseite beinhaltet.
+.PP
+Um alle verfgbaren Programme anzuzeigen, die \fBvi\fP bereitstellen, und die
+dazu gehrigen Einstellungen, benutzen Sie die Aktion \fB\-\-display\fP:
+.RS
+.PP
+\fBupdate\-alternatives \-\-display vi\fP
+.RE
+.PP
+Um eine bestimmte \fBvi\fP\-Implementation auszuwhlen, benutzen Sie als Root
+den folgenden Befehl und whlen dann eine Zahl aus der Liste aus:
+.RS
+.PP
+\fBupdate\-alternatives \-\-config vi\fP
+.RE
+.PP
+Um zur automatischen Auswahl der \fBvi\fP\-Implementation zurckzukehren, fhren
+Sie folgendes als Root aus:
+.RS
+.PP
+\fBupdate\-alternatives \-\-auto vi\fP
+.RE
+.
+.SH FEHLER
+Falls Sie einen Fehler finden, melden Sie ihn bitte ber die Fehlerdatenbank
+von Debian.
+.PP
+Falls Sie einen Unterschied zwischen der Implementation von
+\fBupdate\-alternatives\fP und dieser Handbuchseite finden, ist dies ein Fehler,
+entweder in der Implementation oder in der Dokumentation; bitte melden Sie
+dies.
+.
+.SH AUTOREN
+Copyright \(co 1995 Ian Jackson
+.br
+Copyright \(co 2009 Rapha\[:e]l Hertzog
+.sp
+Dies ist Freie Software; lesen Sie die GNU General Public License Version 2
+oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
+.PP
+Diese Handbuchseite ist Copyright 1997,1998 durch Charles Briscoe\-Smith und
+anderen.
+.sp
+Dies ist Freie Dokumentation; lesen Sie die GNU General Public License
+Version 2 oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.
+.
+.SH BERSETZUNG
+Die deutsche bersetzung wurde 2004, 2006-2011 von Helge Kreutzmann
+<debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
+2008 von Sven Joachim <svenjoac@gmx.de>
+angefertigt. Diese bersetzung ist Freie Dokumentation; lesen Sie die
+GNU General Public License Version 2 oder neuer fr die Kopierbedingungen.
+Es gibt KEINE HAFTUNG.
+.SH "SIEHE AUCH"
+\fBln\fP(1), FHS, der Dateisystem Hierarchie\-Standard (Filesystem Hierarchy
+Standard).
diff -uNr --exclude .git --exclude .bzr dpkg/man/deb.5 /home/vorlon/devel/multiarch/dpkg-debian/man/deb.5
--- dpkg/man/deb.5	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/deb.5	2012-06-07 10:11:09.426073000 -0700
@@ -1,4 +1,4 @@
-.TH deb 5 "2009-02-27" "Debian Project" "Debian"
+.TH deb 5 "2011-08-14" "Debian Project" "Debian"
 .SH NAME
 deb \- Debian binary package format
 .SH SYNOPSIS
@@ -12,7 +12,7 @@
 .PP
 The format described here is used since Debian 0.93; details of the
 old format are described in
-.BR deb-old (5).
+.BR deb\-old (5).
 .SH FORMAT
 The file is an
 .B ar
@@ -27,7 +27,7 @@
 Unrecognized tar typeflags are considered an error.
 .PP
 The first member is named
-.B debian-binary
+.B debian\-binary
 and contains a series of lines, separated by newlines. Currently only
 one line is present, the format version number,
 .BR 2.0
@@ -77,6 +77,6 @@
 with names starting with something other than underscores, or will
 (more likely) cause the major version number to be increased.
 .SH SEE ALSO
-.BR deb-old (5),
-.BR dpkg-deb (1),
-.BR deb-control (5).
+.BR deb\-old (5),
+.BR dpkg\-deb (1),
+.BR deb\-control (5).
diff -uNr --exclude .git --exclude .bzr dpkg/man/deb-control.5 /home/vorlon/devel/multiarch/dpkg-debian/man/deb-control.5
--- dpkg/man/deb-control.5	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/deb-control.5	2012-06-07 10:11:09.426073000 -0700
@@ -1,6 +1,6 @@
 .\" Author: Raul Miller
 .\" Includes text from the debian Guidelines by Ian Jackson, Ian Murdock
-.TH deb\-control 5 "2010-07-29" "Debian Project" "Debian"
+.TH deb\-control 5 "2011-08-14" "Debian Project" "Debian"
 .SH NAME
 deb\-control \- Debian packages' master control file format
 .
@@ -24,24 +24,24 @@
 .
 .SH REQUIRED FIELDS
 .TP
-.BR Package: " <package name>"
+.BI Package: " package-name"
 The value of this field determines the package name, and is used to
 generate file names by most installation tools.
 .TP
-.BR Version: " <version string>"
+.BI Version: " version-string"
 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 non-native packages). The exact format and sorting algorithm
 are described in
 .BR deb\-version (5).
 .TP
-.BR Maintainer: " <fullname email>"
+.BI Maintainer: " fullname-email"
 Should be in the format `Joe Bloggs <jbloggs@foo.com>', and is typically
 the person who created the package, as opposed to the author of the
 software that was packaged.
 .TP
-.BR Description: " <short description>"
-.BR " " "<long description>"
+.BI Description: " short-description"
+.BI " " "long-description"
 .br
 The format for the package description is a short brief summary on the
 first line (after the "Description" field). The following lines should be
@@ -51,12 +51,12 @@
 .
 .SH OPTIONAL FIELDS
 .TP
-.BR Section: " <section>"
+.BI Section: " section"
 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', `text', `x11' etc.
 .TP
-.BR Priority: " <priority>"
+.BI Priority: " priority"
 Sets the importance of this package in relation to the system as a whole.
 Common priorities are `required', `standard', `optional', `extra' etc.
 .LP
@@ -69,14 +69,14 @@
 .B debian\-policy
 package.
 .TP
-.BR Essential: " <yes|no>"
-This field is usually only needed when the answer is `yes'. It denotes
+.BR Essential: " \fByes\fP|\fBno\fP"
+This field is usually only needed when the answer is \fByes\fP. It denotes
 a package that is required for proper operation of the system. Dpkg
 or any other installation tool will not allow an
 .B Essential
 package to be removed (at least not without using one of the force options).
 .TP
-.BR Architecture: " <arch|all>"
+.BR Architecture: " \fIarch\fP|\fBall\fP"
 The architecture specifies which type of hardware this package was compiled
 for. Common architectures are `i386', `m68k', `sparc', `alpha', `powerpc'
 etc. Note that the
@@ -84,51 +84,53 @@
 option is meant for packages that are architecture independent. Some examples
 of this are shell and Perl scripts, and documentation.
 .TP
-.BR Origin: " <name>"
+.BI Origin: " name"
 The name of the distribution this package is originating from.
 .TP
-.BR Bugs: " <url>"
-The url of the bug tracking system for this package. The current used format
-is \fB<bts_type>://<bts_address>\fP, like \fBdebbugs://bugs.debian.org\fP.
+.BI Bugs: " url"
+The \fIurl\fP of the bug tracking system for this package. The current
+used format is \fIbts-type\fP\fB://\fP\fIbts-address\fP, like
+\fBdebbugs://bugs.debian.org\fP.
 .TP
-.BR Homepage: " <url>"
-The upstream project home page URL.
+.BI Homepage: " url"
+The upstream project home page \fIurl\fP.
 .TP
-.BR Tag: " <tag list>"
+.BI Tag: " tag-list"
 List of tags describing the qualities of the package. The description and
 list of supported tags can be found in the \fBdebtags\fP package.
 .TP
-.BR Multi\-Arch: " <same|foreign|allowed>"
+.BR Multi\-Arch: " \fBsame\fP|\fBforeign\fP|\fBallowed\fP"
 This field is used to indicate how this package should behave on a multi-arch
-installations. The value `same' means that the package is co-installable with
-itself, but it must not be used to satisfy the dependency of any package of a
-different architecture from itself. The value `foreign' means that the package is
-not co-installable with itself, but should be allowed to satisfy the dependency
-of a package of a different arch from itself. The value `allowed` allows
-reverse-dependencies to indicate in their Depends field that they need a package
-from a foreign architecture, but has no effect otherwise. This field should not
-be present in packages with the Architecture: all field.
+installations. The value \fBsame\fP means that the package is co-installable
+with itself, but it must not be used to satisfy the dependency of any package
+of a different architecture from itself. The value \fBforeign\fP means that
+the package is not co-installable with itself, but should be allowed to
+satisfy the dependency of a package of a different arch from itself. The
+value \fBallowed\fP allows reverse-dependencies to indicate in their
+Depends field that they need a package from a foreign architecture, but
+has no effect otherwise. This field should not be present in packages
+with the \fBArchitecture: all\fP field.
 .TP
-.BR Source: " <source name>"
+.BI Source: " source-name"
 The name of the source package that this binary package came from, if
 different than the name of the package itself.
 
 .TP
 .PD 0
-.BR Subarchitecture: " <value>"
+.BI Subarchitecture: " value"
 .TP
 .PD 0
-.BR Kernel\-Version: " <value>"
+.BI Kernel\-Version: " value"
 .TP
 .PD
-.BR Installer\-Menu\-Item: " <value>"
+.BI Installer\-Menu\-Item: " value"
 These fields are used by the debian\-installer and are usually not needed.
 See /usr/share/doc/debian\-installer/devel/modules.txt from the
 .B debian\-installer
 package for more details about them.
 
 .TP
-.BR Depends: " <package list>"
+.BI Depends: " package-list"
 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 package to be installed if the packages listed in its
@@ -139,21 +141,21 @@
 opposite, in a removal, the prerm script of a package is run before
 those of the packages listed in its Depends: field.
 .TP
-.BR Pre\-Depends: " <package list>"
+.BI Pre\-Depends: " package-list"
 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 requires another package for running its preinst
 script.
 .TP
-.BR Recommends: " <package list>"
+.BI Recommends: " package-list"
 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 install a package without those listed in its
 .B Recommends
 field.
 .TP
-.BR Suggests: " <package list>"
+.BI Suggests: " package-list"
 Lists packages that are related to this one and can perhaps enhance
 its usefulness, but without which installing this package is perfectly
 reasonable.
@@ -176,7 +178,7 @@
 "<<" for less than, ">=" for greater than or equal to, "<=" for less than
 or equal to, and "=" for equal to.
 .TP
-.BR Breaks: " <package list>"
+.BI Breaks: " package-list"
 Lists packages that this one breaks, for example by exposing bugs
 when the named packages rely on this one. The package maintenance
 software will not allow broken packages to be configured; generally
@@ -184,7 +186,7 @@
 .B Breaks
 field.
 .TP
-.BR Conflicts: " <package list>"
+.BI Conflicts: " package-list"
 Lists packages that conflict with this one, for example by containing
 files with the same names. The package maintenance software will not
 allow conflicting packages to be installed at the same time. Two
@@ -192,7 +194,7 @@
 .B Conflicts
 line mentioning the other.
 .TP
-.BR Replaces: " <package list>"
+.BI Replaces: " package-list"
 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 usually used with the
@@ -200,7 +202,7 @@
 field to force removal of the other package, if this one also has the
 same files as the conflicted package.
 .TP
-.BR Provides: " <package list>"
+.BI Provides: " package-list"
 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 example, sendmail and exim can serve as a mail server, so they
@@ -230,14 +232,14 @@
 fields.
 .
 .TP
-.BR Built-Using: " <package list>"
+.BI Built\-Using: " package-list"
 This field lists extra source packages that were used during the build of this
 binary package.  This is an indication to the archive maintenance software that
 these extra source packages must be kept whilst this binary package is
 maintained.  This field must be a list of source package names with strict (=)
 version relationships.  Note that the archive maintenance software is likely to
 refuse to accept an upload which declares a
-.B Built-Using
+.B Built\-Using
 relationship which cannot be satisfied within the archive.
 .
 .SH EXAMPLE
@@ -250,8 +252,8 @@
 Section: base
 Maintainer: Wichert Akkerman <wakkerma@debian.org>
 Architecture: sparc
-Version: 2.4-1
-Pre-Depends: libc6 (>= 2.0.105)
+Version: 2.4\-1
+Pre\-Depends: libc6 (>= 2.0.105)
 Provides: rgrep
 Conflicts: rgrep
 Description: GNU grep, egrep and fgrep.
diff -uNr --exclude .git --exclude .bzr dpkg/man/deb-old.5 /home/vorlon/devel/multiarch/dpkg-debian/man/deb-old.5
--- dpkg/man/deb-old.5	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/deb-old.5	2012-06-07 10:11:09.426073000 -0700
@@ -1,4 +1,4 @@
-.TH deb\-old 5 "2006-02-28" "Debian Project" "Debian"
+.TH deb\-old 5 "2011-08-14" "Debian Project" "Debian"
 .SH NAME
 deb\-old \- old style Debian binary package format
 .
@@ -50,5 +50,5 @@
 .
 .SH SEE ALSO
 .BR deb (5),
-.BR dpkg-deb (1),
-.BR deb-control (5).
+.BR dpkg\-deb (1),
+.BR deb\-control (5).
diff -uNr --exclude .git --exclude .bzr dpkg/man/deb-override.5 /home/vorlon/devel/multiarch/dpkg-debian/man/deb-override.5
--- dpkg/man/deb-override.5	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/deb-override.5	2012-06-07 10:11:09.426073000 -0700
@@ -12,7 +12,7 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
-.TH deb\-override 5 "2007-03-07" "Debian Project" "dpkg utilities"
+.TH deb\-override 5 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 deb\-override \- Debian archive override file
 .
@@ -63,4 +63,4 @@
 .BR dpkg\-scanpackages (1),
 .BR dpkg\-scansources (1),
 .BR apt\-ftparchive (1),
-.BR /usr/share/doc/debian-policy/policy.html/index.html .
+.BR /usr/share/doc/debian\-policy/policy.html/index.html .
diff -uNr --exclude .git --exclude .bzr dpkg/man/deb-shlibs.5 /home/vorlon/devel/multiarch/dpkg-debian/man/deb-shlibs.5
--- dpkg/man/deb-shlibs.5	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/deb-shlibs.5	2012-06-07 10:11:09.426073000 -0700
@@ -27,7 +27,7 @@
 with an \fB#\fP character are considered commentary, and are ignored.
 All other lines must have the format
 .IP
-.RI [ type: ]
+.RI [ type\fB:\fP ]
 .I library
 .I version
 .I dependencies
diff -uNr --exclude .git --exclude .bzr dpkg/man/deb-split.5 /home/vorlon/devel/multiarch/dpkg-debian/man/deb-split.5
--- dpkg/man/deb-split.5	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/deb-split.5	2012-06-07 10:11:09.426073000 -0700
@@ -1,4 +1,4 @@
-.TH deb\-split 5 "2011-04-15" "Debian Project" "Debian"
+.TH deb\-split 5 "2011-07-04" "Debian Project" "Debian"
 .SH NAME
 deb\-split \- Debian multi-part binary package format
 .SH SYNOPSIS
@@ -39,11 +39,11 @@
 be able to safely continue, unless it encounters an unexpected member
 in the archive (except at the end), as described below.
 .PP
-The second, last required member is named \fBdata.\fPN, where N denotes
-the part number. It contains the raw part data.
+The second, last required member is named \fBdata.\fP\fIN\fP, where \fIN\fP
+denotes the part number. It contains the raw part data.
 .PP
 These members must occur in this exact order. Current implementations
-should ignore any additional members after \fBdata.\fPN.
+should ignore any additional members after \fBdata.\fP\fIN\fP.
 Further members may be defined in the future, and (if possible) will be
 placed after these two.
 .SH SEE ALSO
diff -uNr --exclude .git --exclude .bzr dpkg/man/deb-src-control.5 /home/vorlon/devel/multiarch/dpkg-debian/man/deb-src-control.5
--- dpkg/man/deb-src-control.5	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/deb-src-control.5	2012-06-07 10:11:09.426073000 -0700
@@ -1,6 +1,6 @@
 .\" Author: Oxan van Leeuwen
 .\" Includes text from the deb-control manual page by Raul Miller
-.TH deb\-src\-control 5 "2011-04-29" "Debian Project" "Debian"
+.TH deb\-src\-control 5 "2011-08-14" "Debian Project" "Debian"
 .SH NAME
 deb\-src\-control \- Debian source packages' master control file format
 .
@@ -28,7 +28,7 @@
 .
 .SH SOURCE FIELDS
 .TP
-.BR Source: " <source package name> (required)"
+.BR Source: " \fIsource-package-name\fP (required)"
 The value of this field is the name of the source package, and should
 match the name of the source package in the debian/changelog file. A package
 name must consist only of lower case letters (a-z), digits (0-9), plus (+) and
@@ -36,63 +36,65 @@
 long and must start with an alphanumeric character.
 
 .TP
-.BR Maintainer: " <fullname email> (required)"
+.BR Maintainer: " \fIfullname-email\fP (required)"
 Should be in the format "Joe Bloggs <jbloggs@foo.com>", and references the
 person who currently maintains the package, as opposed to the author of the
 software or the original packager.
 
 .TP
-.BR Uploaders: " <fullname email>"
+.BI Uploaders: " fullname-email"
 Lists all the names and email addresses of co-maintainers of the package, in
 the same format as the Maintainer field. Multiple co-maintainers should be
 separated by a comma.
 
 .TP
-.BR Standards\-Version: " <version string>"
+.BI Standards\-Version: " version-string"
 This documents the most recent version of the standards (which consists of the
 Debian Policy Manual and referenced texts from the
 .B debian\-policy
 package) this package complies to.
 
 .TP
-.BR DM\-Upload\-Allowed: " <yes|no>"
+.BR DM\-Upload\-Allowed: " \fByes\fP|\fBno\fP"
 This field indicates whether the package can be uploaded by Debian Maintainers
 appearing in the Maintainer or Uploaders field. The default value is "no".
 
 .TP
-.BR Homepage: " <url>"
+.BI Homepage: " url"
 The upstream project home page URL.
 
 .TP
-.BR Bugs: " <url>"
-The url of the bug tracking system for this package. The current used format
-is \fB<bts_type>://<bts_address>\fP, like \fBdebbugs://bugs.debian.org\fP. This
-field is usually not needed.
+.BI Bugs: " url"
+The \fIurl\fP of the bug tracking system for this package. The current
+used format is \fIbts-type\fP\fB://\fP\fIbts-address\fP, like
+\fBdebbugs://bugs.debian.org\fP. This field is usually not needed.
 
 .TP
-.BR Vcs\-*: " <url>"
-The url of the Version Control System repository used to maintain this package.
-Currently supported are Arch, Bzr (Bazaar), Cvs, Darcs, Git, Hg (Mercurial),
-Mtn (Monotone) and Svn (Subversion). Usually this field points to the latest
-version of the package, such as the main branch or the trunk.
+.BI Vcs\-*: " url"
+The \fIurl\fP of the Version Control System repository used to maintain this
+package. Currently supported are \fBArch\fP, \fBBzr\fP (Bazaar), \fBCvs\fP,
+\fBDarcs\fP, \fBGit\fP, \fBHg\fP (Mercurial), \fBMtn\fP (Monotone) and
+\fBSvn\fP (Subversion). Usually this field points to the latest version
+of the package, such as the main branch or the trunk.
 
 .TP
-.BR Vcs\-Browser: " <url>"
-The url of a webinterface to browse the Version Control System repository.
+.BI Vcs\-Browser: " url"
+The \fIurl\fP of a webinterface to browse the Version Control System
+repository.
 
 .TP
-.BR Origin: " <name>"
+.BI Origin: " name"
 The name of the distribution this package is originating from. This field is
 usually not needed.
 
 .TP
-.BR Section: " <section>"
+.BI Section: " section"
 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", "text", "x11", etc.
 
 .TP
-.BR Priority: " <priority>"
+.BI Priority: " priority"
 Sets the importance of this package in relation to the system as a whole.
 Common priorities are "required", "standard", "optional", "extra", etc.
 
@@ -106,25 +108,25 @@
 package.
 
 .TP
-.BR Build\-Depends: " <package list>"
+.BI Build\-Depends: " package-list"
 A list of packages that need to be installed and configured to be able to build
 the source package.
 
 .TP
-.BR Build\-Depends\-Indep: " <package list>"
-Same as Build\-Depends, but they are only needed when building the
-architecture independent packages. The Build\-Depends are also installed
+.BI Build\-Depends\-Indep: " package-list"
+Same as \fBBuild\-Depends\fP, but they are only needed when building the
+architecture independent packages. The \fBBuild\-Depends\fP are also installed
 in this case.
 
 .TP
-.BR Build\-Conflicts: " <package list>"
+.BI Build\-Conflicts: " package-list"
 A list of packages that should not be installed when the package is build, for
 example because they interfere with the used build system.
 
 .TP
-.BR Build\-Conflicts\-Indep: " <package list>"
-Same as Build\-Conflicts, but only when building the architecture independent
-packages.
+.BI Build\-Conflicts\-Indep: " package-list"
+Same as \fBBuild\-Conflicts\fP, but only when building the architecture
+independent packages.
 
 The syntax of the
 .B Build\-Depends
@@ -173,12 +175,12 @@
 source package.
 
 .TP
-.BR Package: " <binary package name> (required)"
+.BR Package: " \fIbinary-package-name\fP (required)"
 This field is used to name the binary package name. The same restrictions as
 to a source package name apply.
 
 .TP
-.BR Architecture: " <arch|all|any> (required)"
+.BR Architecture: " \fIarch\fP|\fBall\fP|\fBany\fP (required)"
 The architecture specifies on which type of hardware this package runs. For
 packages that run on all architectures, use the
 .B any
@@ -192,20 +194,20 @@
 for more information about them).
 
 .TP
-.BR Package\-Type: " <deb|udeb>"
+.BR Package\-Type: " \fBdeb\fP|\fBudeb\fP"
 This field defines the type of the package. "udeb" is for size-constrained
 packages used by the debian installer. "deb" is the default value, it's
 assumed if the field is absent. More types might be added in the future.
 
 .TP
 .PD 0
-.BR Subarchitecture: " <value>"
+.BI Subarchitecture: " value"
 .TP
 .PD 0
-.BR Kernel\-Version: " <value>"
+.BI Kernel\-Version: " value"
 .TP
 .PD 0
-.BR Installer\-Menu\-Item: " <value>"
+.BI Installer\-Menu\-Item: " value"
 These fields are used by the debian\-installer and are usually not needed.
 See /usr/share/doc/debian\-installer/devel/modules.txt from the
 .B debian\-installer
@@ -213,16 +215,16 @@
 
 .TP
 .PD 0
-.BR Essential: " <yes|no>"
+.BR Essential: " \fByes\fP|\fBno\fP"
 .TP
 .PD 0
-.BR Multi\-Arch: " <same|foreign|allowed> "
+.BR Multi\-Arch: " \fBsame\fP|\fBforeign\fP|\fBallowed\fP"
 .TP
 .PD 0
-.BR Tag: " <tag list>"
+.BI Tag: " tag-list"
 .TP
 .PD 0
-.BR Description: " <short description> (required)"
+.BR Description: " \fIshort-description\fP (required)"
 These fields are described in the
 .BR deb\-control (5)
 manual page, as they are copied literally to the control file of the binary
@@ -230,34 +232,34 @@
 
 .TP
 .PD 0
-.BR Depends: " <package list>"
+.BI Depends: " package-list"
 .TP
 .PD 0
-.BR Pre\-Depends: " <package list>"
+.BI Pre\-Depends: " package-list"
 .TP
 .PD 0
-.BR Recommends: " <package list>"
+.BI Recommends: " package-list"
 .TP
 .PD 0
-.BR Suggests: " <package list>"
+.BI Suggests: " package-list"
 .TP
 .PD 0
-.BR Breaks: " <package list>"
+.BI Breaks: " package-list"
 .TP
 .PD 0
-.BR Enhances: " <package list>"
+.BI Enhances: " package-list"
 .TP
 .PD 0
-.BR Replaces: " <package list>"
+.BI Replaces: " package-list"
 .TP
 .PD 0
-.BR Conflicts: " <package list>"
+.BI Conflicts: " package-list"
 .TP
 .PD 0
-.BR Provides: " <package list>"
+.BI Provides: " package-list"
 .TP
 .PD 0
-.BR Built-Using: " <package list>"
+.BI Built\-Using: " package-list"
 .br
 These fields declare relationships between packages. They are discussed in
 the
@@ -290,30 +292,30 @@
 Source: dpkg
 Section: admin
 Priority: required
-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
+Maintainer: Dpkg Developers <debian\-dpkg@lists.debian.org>
 # this field is copied to the binary and source packages
-XBS-Upstream-Release-Status: stable
+XBS\-Upstream\-Release\-Status: stable
 Homepage: http://wiki.debian.org/Teams/Dpkg
-Vcs-Browser: http://git.debian.org/?p=dpkg/dpkg.git
-Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git
-Standards-Version: 3.7.3
-Build-Depends: pkg-config, debhelper (>= 4.1.81),
- libselinux1-dev (>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+Vcs\-Browser: http://git.debian.org/?p=dpkg/dpkg.git
+Vcs\-Git: git://git.debian.org/git/dpkg/dpkg.git
+Standards\-Version: 3.7.3
+Build\-Depends: pkg\-config, debhelper (>= 4.1.81),
+ libselinux1\-dev (>= 1.28\-4) [!linux\-any]
 
-Package: dpkg-dev
+Package: dpkg\-dev
 Section: utils
 Priority: optional
 Architecture: all
 # this is a custom field in the binary package
-XB-Mentoring-Contact: Raphael Hertzog <hertzog@debian.org>
-Depends: dpkg (>= 1.14.6), perl5, perl-modules, cpio (>= 2.4.2-2), bzip2, lzma,
- patch (>= 2.2-1), make, binutils, libtimedate-perl
-Recommends: gcc | c-compiler, build-essential
-Suggests: gnupg, debian-keyring
-Conflicts: dpkg-cross (<< 2.0.0), devscripts (<< 2.10.26)
-Replaces: manpages-pl (<= 20051117-1)
+XB\-Mentoring\-Contact: Raphael Hertzog <hertzog@debian.org>
+Depends: dpkg (>= 1.14.6), perl5, perl\-modules, cpio (>= 2.4.2\-2),
+ bzip2, lzma, patch (>= 2.2\-1), make, binutils, libtimedate\-perl
+Recommends: gcc | c\-compiler, build\-essential
+Suggests: gnupg, debian\-keyring
+Conflicts: dpkg\-cross (<< 2.0.0), devscripts (<< 2.10.26)
+Replaces: manpages\-pl (<= 20051117\-1)
 Description: Debian package development tools
- This package provides the development tools (including dpkg-source)
+ This package provides the development tools (including dpkg\-source)
  required to unpack, build and upload Debian source packages.
  .
  Most Debian source packages will require additional tools to build;
diff -uNr --exclude .git --exclude .bzr dpkg/man/deb-symbols.5 /home/vorlon/devel/multiarch/dpkg-debian/man/deb-symbols.5
--- dpkg/man/deb-symbols.5	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/deb-symbols.5	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 .\" Author: Raphaël Hertzog
-.TH deb\-symbols 5 "2007-07-16" "Debian Project" "dpkg utilities"
+.TH deb\-symbols 5 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 deb\-symbols \- Debian's extended shared library information file
 .
@@ -10,35 +10,35 @@
 The format for an extended shared library dependency information entry
 in these files is:
 .PP
-<library soname> <main dependency template>
+.I library-soname main-dependency-template
 .br
-[ | <alternative dependency template> ]
+[ | \fIalternative-dependency-template\fP ]
 .br
 [ ... ]
 .br
-[ * <field-name>: <field value> ]
+[ * \fIfield-name\fP: \fIfield-value\fP ]
 .br
 [ ... ]
- <symbol> <minimal version>[ <id of dependency template> ]
+ \fIsymbol\fP \fIminimal-version\fP[ \fIid-of-dependency-template\fP ]
 .P
-The \fIlibrary soname\fR is exactly the value of the SONAME field
-as exported by \fBobjdump\fR(1). A \fIdependency template\fR is a
+The \fIlibrary-soname\fR is exactly the value of the SONAME field
+as exported by \fBobjdump\fR(1). A \fIdependency-template\fR is a
 dependency where \fI#MINVER#\fR is dynamically replaced either by
-a version check like "(>= \fIminimal version\fR)" or by nothing (if
+a version check like "(>= \fIminimal-version\fR)" or by nothing (if
 an unversioned dependency is deemed sufficient). 
 .P
 Each exported \fIsymbol\fR (listed as \fIname\fR@\fIversion\fR, with
 \fIversion\fR being "Base" if the library is not versioned) is associated
-to a \fIminimal version\fR of its dependency template (the main dependency
-template is used if \fIid of dependency template\fR is not present). The
+to a \fIminimal-version\fR of its dependency template (the main dependency
+template is used if \fIid-of-dependency-template\fR is not present). The
 first alternative dependency template is numbered 1, the second one 2,
 etc.
 .P
 Each entry for a library can also have some fields of meta-information.
 Those fields are stored on lines starting with an asterisk. Currently,
-the only valid field is \fIBuild-Depends-Package\fR, it indicates the name
+the only valid field is \fIBuild\-Depends\-Package\fR, it indicates the name
 of the "\-dev" package associated to the library and is used by
-dpkg-shlibdeps to make sure that the dependency generated is at least as
+\fBdpkg\-shlibdeps\fP to make sure that the dependency generated is at least as
 strict as the corresponding build dependency.
 .SH EXAMPLES
 .SS Simple symbols file
@@ -51,9 +51,9 @@
 .PP 
 libGL.so.1 libgl1
 .br
-| libgl1-mesa-glx #MINVER#
+| libgl1\-mesa\-glx #MINVER#
 .br
-* Build-Depends-Package: libgl1-mesa-dev
+* Build\-Depends\-Package: libgl1\-mesa\-dev
  publicGlSymbol@Base 6.3-1
  [...]
  implementationSpecificSymbol@Base 6.5.2-7 1
diff -uNr --exclude .git --exclude .bzr dpkg/man/deb-triggers.5 /home/vorlon/devel/multiarch/dpkg-debian/man/deb-triggers.5
--- dpkg/man/deb-triggers.5	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/deb-triggers.5	2012-06-07 10:11:09.426073000 -0700
@@ -1,4 +1,4 @@
-.TH deb\-triggers 5 "2009-03-15" "Debian Project" "dpkg utilities"
+.TH deb\-triggers 5 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 deb\-triggers \- package triggers
 .
@@ -21,32 +21,50 @@
 .I trigger-name
 .PP
 .in +5
+.B interest\-noawait
+.I trigger-name
+.PP
+.in +5
 Specifies that the package is interested in the named trigger. All
 triggers in which a package is interested must be listed using this
-directive in the triggers control file.
+directive in the triggers control file. The "noawait" variant does
+not put the triggering packages in triggers\-awaited state. This should
+be used when the functionality provided by the trigger is not crucial.
 .PP
 .in +5
 .B activate
 .I trigger-name
 .PP
 .in +5
+.B activate\-noawait
+.I trigger-name
+.PP
+.in +5
 Arranges that changes to this package's state will activate the
 specified trigger. The trigger will be activated at the start of
 the following operations: unpack, configure, remove (including for
 the benefit of a conflicting package), purge and deconfigure.
+The "noawait" variant does not put the triggering packages in
+triggers\-awaited state. This should be used when the functionality
+provided by the trigger is not crucial.
 .PP
 .in +5
 If this package disappears during the unpacking of another package
 the trigger will be activated when the disappearance is noted
 towards the end of the unpack. Trigger processing, and transition
-from triggers-awaited to installed, does not cause activations.
+from triggers\-awaited to installed, does not cause activations.
 In the case of unpack, triggers mentioned in both the old and new
 versions of the package will be activated.
 .PP
 Unknown directives are an error which will prevent installation of the
 package.
+.PP
+The "\-noawait" variants are only supported by dpkg 1.16.1 or newer, and
+will lead to errors if used with an older dpkg. It is thus recommended
+to add a "Pre\-Depends: dpkg (>= 1.16.1)" to any package that wish to use
+those directives.
 .
 .SH SEE ALSO
 .BR dpkg\-trigger (1),
 .BR dpkg (1),
-.BR /usr/share/doc/dpkg-dev/triggers.txt.gz .
+.BR /usr/share/doc/dpkg\-dev/triggers.txt.gz .
diff -uNr --exclude .git --exclude .bzr dpkg/man/deb-version.5 /home/vorlon/devel/multiarch/dpkg-debian/man/deb-version.5
--- dpkg/man/deb-version.5	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/deb-version.5	2012-06-07 10:11:09.426073000 -0700
@@ -2,12 +2,12 @@
 .\" The copyright given below is that of the whole policy, but probably
 .\" incomplete.
 .\" Conversion to roff by Frank Lichtenheld
-.TH deb\-version 5 "2008-08-18" "Debian Project" "Debian"
+.TH deb\-version 5 "2011-08-14" "Debian Project" "Debian"
 .SH NAME
 deb\-version \- Debian package version number format
 .
 .SH SYNOPSIS
-.RI "[ " epoch ":] " upstream_version " [\-" debian_revision " ]"
+.RI "[" epoch "\fB:\fP]" upstream-version "[\fB\-\fP" debian-revision "]"
 .SH DESCRIPTION
 Version numbers as used for Debian binary and source packages
 consist of three components. These are:
@@ -15,14 +15,14 @@
 .I epoch
 This is a single (generally small) unsigned integer.  It
 may be omitted, in which case zero is assumed.  If it is
-omitted then the \fIupstream_version\fP may not
+omitted then the \fIupstream-version\fP may not
 contain any colons.
 .IP
 It is provided to allow mistakes in the version numbers
 of older versions of a package, and also a package's
 previous version numbering schemes, to be left behind.
 .TP
-.I upstream_version
+.I upstream-version
 This is the main part of the version number.  It is
 usually the version number of the original ("upstream")
 package from which the \fI.deb\fP file has been made,
@@ -33,48 +33,48 @@
 scheme.
 .IP
 The comparison behavior of the package management system
-with respect to the \fIupstream_version\fP is
-described below.  The \fIupstream_version\fP
+with respect to the \fIupstream-version\fP is
+described below. The \fIupstream-version\fP
 portion of the version number is mandatory.
 .IP
-The \fIupstream_version\fP may contain only
+The \fIupstream-version\fP may contain only
 alphanumerics ("A-Za-z0-9") and the characters
 .BR . " " + " " \- " " : " " ~
 (full stop, plus, hyphen, colon, tilde) and should
 start with a digit.  If there is no
-\fIdebian_revision\fP then hyphens are not allowed;
+\fIdebian-revision\fP then hyphens are not allowed;
 if there is no \fIepoch\fP then colons are not
 allowed.
 .TP
-.I debian_revision
+.I debian-revision
 This part of the version number specifies the version of
 the Debian package based on the upstream version.  It
 may contain only alphanumerics and the characters
 .BR + " " . " " ~
 (plus, full stop, tilde) and is
 compared in the same way as the
-\fIupstream_version\fP is.
+\fIupstream-version\fP is.
 .IP
 It is optional; if it isn't present then the
-\fIupstream_version\fP may not contain a hyphen.
+\fIupstream-version\fP may not contain a hyphen.
 This format represents the case where a piece of
 software was written specifically to be turned into a
 Debian package, and so there is only one "debianisation"
 of it and therefore no revision indication is required.
 .IP
 It is conventional to restart the
-\fIdebian_revision\fP at '1' each time time the
-\fIupstream_version\fP is increased.
+\fIdebian-revision\fP at '1' each time time the
+\fIupstream-version\fP is increased.
 .IP
 Dpkg will break the version
 number apart at the last hyphen in the string (if there
-is one) to determine the \fIupstream_version\fP and
-\fIdebian_revision\fP.  The absence of a
-\fIdebian_revision\fP compares earlier than the
-presence of one (but note that the \fIdebian_revision\fP
+is one) to determine the \fIupstream-version\fP and
+\fIdebian-revision\fP. The absence of a
+\fIdebian-revision\fP compares earlier than the
+presence of one (but note that the \fIdebian-revision\fP
 is the least significant part of the version number).
 .SS Sorting Algorithm
-The \fIupstream_version\fP and \fIdebian_revision\fP
+The \fIupstream-version\fP and \fIdebian-revision\fP
 parts are compared by the package management system using the
 same algorithm:
 .PP
@@ -111,10 +111,10 @@
 silly orderings.
 .SH CAVEATS
 The tilde character and its special sorting properties were introduced
-in dpkg, version 1.10 and some parts of dpkg-dev only gained
+in dpkg, version 1.10 and some parts of dpkg\-dev only gained
 support for it later in the 1.10.x series.
 .SH SEE ALSO
-.BR deb-control (5),
+.BR deb\-control (5),
 .BR deb (5),
 .BR dpkg (1)
 .SH AUTHORS
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg.1
--- dpkg/man/dpkg.1	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
-.TH dpkg 1 "2011-04-27" "Debian Project" "dpkg suite"
+.TH dpkg 1 "2011-08-14" "Debian Project" "dpkg suite"
 .SH NAME
 dpkg \- package manager for Debian
 .
 .SH SYNOPSIS
 .B dpkg
-[\fIoptions\fP] \fIaction\fP
+.RI [ option "...] " action
 .
 .SH WARNING
 This manual is intended for users wishing to understand \fBdpkg\fP's
@@ -88,9 +88,9 @@
 .
 .SH ACTIONS
 .TP
-\fB\-i\fP, \fB\-\-install\fP \fIpackage_file\fP...
+\fB\-i\fP, \fB\-\-install\fP \fIpackage-file\fP...
 Install the package. If \fB\-\-recursive\fP or \fB\-R\fP option is
-specified, \fIpackage_file\fP must refer to a directory instead.
+specified, \fIpackage-file\fP must refer to a directory instead.
 
 Installation consists of the following steps:
 .br
@@ -119,9 +119,9 @@
 \fB6.\fP Configure the package. See \fB\-\-configure\fP for detailed
 information about how this is done.
 .TP
-\fB\-\-unpack \fP\fIpackage_file\fP...
+\fB\-\-unpack \fP\fIpackage-file\fP...
 Unpack the package, but don't configure it. If \fB\-\-recursive\fP or
-\fB\-R\fP option is specified, \fIpackage_file\fP must refer to a
+\fB\-R\fP option is specified, \fIpackage-file\fP must refer to a
 directory instead.
 .TP
 \fB\-\-configure \fP\fIpackage\fP...|\fB\-a\fP|\fB\-\-pending\fP
@@ -193,10 +193,10 @@
 if you don't use \fBdselect\fR but an APT-based frontend: APT has its
 own system to keep track of available packages.
 .TP
-\fB\-A\fP, \fB\-\-record\-avail\fP \fIpackage_file\fP...
+\fB\-A\fP, \fB\-\-record\-avail\fP \fIpackage-file\fP...
 Update \fBdpkg\fP and \fBdselect\fP's idea of which packages are
-available with information from the package \fIpackage_file\fP. If
-\fB\-\-recursive\fP or \fB\-R\fP option is specified, \fIpackage_file\fP
+available with information from the package \fIpackage-file\fP. If
+\fB\-\-recursive\fP or \fB\-R\fP option is specified, \fIpackage-file\fP
 must refer to a directory instead.
 .TP
 .B \-\-forget\-old\-unavail
@@ -218,9 +218,9 @@
 .TP
 .B \-\-set\-selections
 Set package selections using file read from stdin. This file should be
-in the format '<package> <state>', where state is one of install, hold,
-deinstall or purge. Blank lines and comment lines beginning with '#'
-are also permitted.
+in the format '\fIpackage\fP \fIstate\fP', where state is one of
+\fBinstall\fP, \fBhold\fP, \fBdeinstall\fP or \fBpurge\fP. Blank lines
+and comment lines beginning with '#' are also permitted.
 .TP
 .B \-\-clear\-selections
 Set the requested state of every non-essential package to deinstall.
@@ -235,16 +235,6 @@
 .B \-\-print\-architecture
 Print architecture of packages \fBdpkg\fP installs (for example, "i386").
 .TP
-.B \-\-foreign\-architecture \fIarchitecture\fP
-Add \fIarchitecture\fP to the list of architectures for which packages can be
-installed without using \fB\-\-force\-architecture\fP, in addition to the
-architecture \fBdpkg\fP is built for (i.e.: the output of
-\fB\-\-print\-architecture\fP).
-.TP
-.B \-\-print\-foreign\-architectures
-Print a space-separated list of the extra architectures \fBdpkg\fP is
-configured to allow packages to be installed for.
-.TP
 .B \-\-compare\-versions \fIver1 op ver2\fP
 Compare version numbers, where \fIop\fP is a binary operator. \fBdpkg\fP
 returns success (zero result) if the specified condition is satisfied,
@@ -256,8 +246,8 @@
 only for compatibility with control file syntax: \fB< << <= = >= >>
 >\fP.
 .TP
-.B \-\-command\-fd \fI<n>\fP
-Accept a series of commands on input file descriptor \fI<n>\fP. Note:
+.B \-\-command\-fd \fIn\fP
+Accept a series of commands on input file descriptor \fIn\fP. Note:
 additional options set on the command line, and through this file descriptor,
 are not reset for subsequent commands executed during the same run.
 .TP
@@ -592,7 +582,7 @@
 An error occurred. Any possible newlines in \fIextended-error-message\fR
 will be converted to spaces before output.
 .TP
-.BI "status: " file " : conffile-prompt : '" real-old "' '" real-new "' " useredited " " distedited
+.BI "status: " file " : conffile\-prompt : '" real-old "' '" real-new "' " useredited " " distedited
 User is being asked a conffile question.
 .TP
 .BI "processing: " stage ": " package
@@ -611,13 +601,13 @@
 Log status change updates and actions to \fIfilename\fP, instead of
 the default \fI/var/log/dpkg.log\fP. 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
-<state> <pkg> <installed-version>' for status change updates;
-`YYYY-MM-DD HH:MM:SS <action> <pkg> <installed-version>
-<available-version>' for actions where \fI<action>\fP is one of install,
-upgrade, remove, purge; and `YYYY-MM-DD HH:MM:SS conffile <filename>
-<decision>' for conffile changes where \fI<decision>\fP is either install
-or keep.
+`YYYY-MM-DD HH:MM:SS status \fIstate\fP \fIpkg\fP \fIinstalled-version\fP'
+for status change updates;
+`YYYY-MM-DD HH:MM:SS \fIaction\fP \fIpkg\fP \fIinstalled-version\fP
+\fIavailable-version\fP' for actions where \fIaction\fP is one of
+\fBinstall\fP, \fBupgrade\fP, \fBremove\fP, \fBpurge\fP; and
+`YYYY-MM-DD HH:MM:SS conffile \fIfilename\fP \fIdecision\fP' for conffile
+changes where \fIdecision\fP is either \fBinstall\fP or \fBkeep\fP.
 .TP
 \fB\-\-no\-debsig\fP
 Do not try to verify package signatures.
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-architecture.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-architecture.1
--- dpkg/man/dpkg-architecture.1	2011-03-24 16:35:56.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-architecture.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,15 +1,14 @@
-.TH dpkg\-architecture 1 "2009-08-15" "Debian Project" "dpkg utilities"
+.TH dpkg\-architecture 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH "NAME"
 dpkg\-architecture \- set and determine the architecture for package building
 .
 .SH SYNOPSIS
-.B dpkg-architecture
-.RI [ options ]
-.RI [ commands ]
+.B dpkg\-architecture
+.RI [ option "...] [" command ]
 .PP
 .
 .SH DESCRIPTION
-dpkg-architecture does provide a facility to determine and set the build and
+dpkg\-architecture does provide a facility to determine and set the build and
 host architecture for package building.
 .PP
 The build architecture is always determined by an external call to
@@ -75,7 +74,7 @@
 .TP
 .B \-f
 Values set by existing environment variables with the same name as used by
-the scripts are honored (i.e. used by \fBdpkg-architecture\fP), except if
+the scripts are honored (i.e. used by \fBdpkg\-architecture\fP), except if
 this force flag is present. This allows the user
 to override a value even when the call to \fBdpkg\-architecture\fP is buried
 in some other script (for example \fBdpkg\-buildpackage\fP(1)).
@@ -194,18 +193,18 @@
 .
 .SH "BACKWARD COMPATIBILITY"
 The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced
-in dpkg-dev 1.15.4. Using them in \fIdebian/rules\fR thus requires a
-build-dependency on dpkg-dev (>= 1.15.4).
+in dpkg\-dev 1.15.4. Using them in \fIdebian/rules\fR thus requires a
+build-dependency on dpkg\-dev (>= 1.15.4).
 .PP
 The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced
-in dpkg-dev 1.13.2. Before this \fIdebian/rules\fR files tended to check
+in dpkg\-dev 1.13.2. Before this \fIdebian/rules\fR files tended to check
 the values of the DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which
 have been subject to change.
 .PP
 Where \fIdebian/rules\fR 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\-dev by using the following code:
 .IP
 .nf
 DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_CPU 2>/dev/null)
@@ -228,8 +227,8 @@
 .PP
 And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS.
 .PP
-If you still wish to support versions of dpkg-dev that did not include
-\fBdpkg-architecture\fR, the following does the job:
+If you still wish to support versions of dpkg\-dev that did not include
+\fBdpkg\-architecture\fR, the following does the job:
 .IP
 .nf
 \&\s-1DEB_BUILD_ARCH\s0 := $(shell dpkg \-\-print\-architecture)
@@ -237,7 +236,7 @@
 ifeq ($(filter\-out hurd\-%,$(\s-1DEB_BUILD_ARCH\s0)),)
   \s-1DEB_BUILD_GNU_SYSTEM\s0 := gnu
 else
-  \s-1DEB_BUILD_GNU_SYSTEM\s0 := linux-gnu
+  \s-1DEB_BUILD_GNU_SYSTEM\s0 := linux\-gnu
 endif
 DEB_BUILD_GNU_TYPE=$(\s-1DEB_BUILD_GNU_CPU\s0)\-$(\s-1DEB_BUILD_GNU_SYSTEM\s0)
 
@@ -248,7 +247,7 @@
 .fi
 .PP
 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.
+default values will be overwritten if dpkg\-architecture is used.
 .PP
 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
@@ -283,9 +282,9 @@
 dpkg\-architecture \-ai386 \-ilinux\-any
 .
 .SH FILES
-All these files have to be present for \fBdpkg-architecture\fP to
+All these files have to be present for \fBdpkg\-architecture\fP to
 work. Their location can be overridden at runtime with the environment
-variable DPKG_DATADIR.
+variable \fBDPKG_DATADIR\fP.
 .TP
 .I /usr/share/dpkg/cputable
 Table of known CPU names and mapping to their GNU name.
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-buildflags.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-buildflags.1
--- dpkg/man/dpkg-buildflags.1	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-buildflags.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
-.TH dpkg\-buildflags 1 "2010-07-29" "Debian Project" "dpkg suite"
+.TH dpkg\-buildflags 1 "2011-09-13" "Debian Project" "dpkg suite"
 .SH NAME
 dpkg\-buildflags \- returns build flags to use during package build
 .
 .SH SYNOPSIS
 .B dpkg\-buildflags
-.RI [ option "...] " command
+.RI [ option "...] [" command ]
 .
 .SH DESCRIPTION
 \fBdpkg\-buildflags\fP is a tool to retrieve compilation flags to use during
@@ -18,21 +18,37 @@
 for the current user with \fB$XDG_CONFIG_HOME/dpkg/buildflags.conf\fP
 where \fB$XDG_CONFIG_HOME\fP defaults to \fB$HOME/.config\fP;
 .IP 3.
-temporarily with environment variables (see section \fBENVIRONMENT\fP).
+temporarily by the user with environment variables (see section
+\fBENVIRONMENT\fP);
+.IP 4.
+dynamically by the package maintainer with environment variables set via
+\fBdebian/rules\fP (see section \fBENVIRONMENT\fP).
 .P
 The configuration files can contain two types of directives:
 .TP
 .BI SET " flag value"
 Override the flag named \fIflag\fP to have the value \fIvalue\fP.
 .TP
+.BI STRIP " flag value"
+Strip from the flag named \fIflag\fP all the build flags listed in \fIvalue\fP.
+.TP
 .BI APPEND " flag value"
-Extend the flag named \fIflag\fP with the options given in \fIvalue\fP.
+Extend the flag named \fIflag\fP by appending the options given in \fIvalue\fP.
 A space is prepended to the appended value if the flag's current value is non-empty.
+.TP
+.BI PREPEND " flag value"
+Extend the flag named \fIflag\fP by prepending the options given in \fIvalue\fP.
+A space is appended to the prepended value if the flag's current value is non-empty.
 .P
 The configuration files can contain comments on lines starting with a hash
 (#). Empty lines are also ignored.
 .SH COMMANDS
 .TP
+.BI \-\-dump
+Print to standard output all compilation flags and their values. It prints
+one flag per line separated from its value by an equal sign
+("\fIflag\fP=\fIvalue\fP"). This is the default action.
+.TP
 .BI \-\-list
 Print the list of flags supported by the current vendor
 (one per line). See the \fBSUPPORTED FLAGS\fP section for more
@@ -41,7 +57,9 @@
 .BI \-\-export= format
 Print to standard output shell (if \fIformat\fP is \fBsh\fP) or make
 (if \fIformat\fP is \fBmake\fP) commands that can be used to export
-all the compilation flags in the environment. If the \fIformat\fP value is not
+all the compilation flags in the environment. If \fIformat\fP is
+\fBconfigure\fP then the output can be used on a \fB./configure\fP
+command-line. If the \fIformat\fP value is not
 given, \fBsh\fP is assumed. Only compilation flags starting with an
 upper case character are included, others are assumed to not be suitable
 for the environment.
@@ -79,8 +97,8 @@
 .TP
 .B CFLAGS
 Options for the C compiler. The default value set by the vendor
-includes \fI-g\fP and the default optimization level (\fI-O2\fP usually,
-or \fI-O0\fP if the \fBDEB_BUILD_OPTIONS\fP environment variable defines
+includes \fI\-g\fP and the default optimization level (\fI\-O2\fP usually,
+or \fI\-O0\fP if the \fBDEB_BUILD_OPTIONS\fP environment variable defines
 \fInoopt\fP).
 .TP
 .B CPPFLAGS
@@ -95,7 +113,7 @@
 .B LDFLAGS
 Options passed to the compiler when linking executables or shared
 objects (if the linker is called directly, then
-.B -Wl
+.B \-Wl
 and
 .B ,
 have to be stripped from these options). Default value: empty.
@@ -108,17 +126,147 @@
 .BR $XDG_CONFIG_HOME/dpkg/buildflags.conf " or " $HOME/.config/dpkg/buildflags.conf
 User configuration file.
 .SH ENVIRONMENT
+There are 2 sets of environment variables doing the same operations, the
+first one (DEB_\fIflag\fP_\fIop\fP) should never be used within
+\fBdebian/rules\fP. It's meant for any user that wants to rebuild the
+source package with different build flags. The second set
+(DEB_\fIflag\fP_MAINT_\fIop\fP) should only be used in \fBdebian/rules\fP
+by package maintainers to change the resulting build flags.
 .TP
 .BI DEB_ flag _SET
+.TQ
+.BI DEB_ flag _MAINT_SET
 This variable can be used to force the value returned for the given
 \fIflag\fP.
 .TP
+.BI DEB_ flag _STRIP
+.TQ
+.BI DEB_ flag _MAINT_STRIP
+This variable can be used to provide a space separated list of options
+that will be stripped from the set of flags returned for the given
+\fIflag\fP.
+.TP
 .BI DEB_ flag _APPEND
+.TQ
+.BI DEB_ flag _MAINT_APPEND
 This variable can be used to append supplementary options to the value
 returned for the given \fIflag\fP.
+.TP
+.BI DEB_ flag _PREPEND
+.TQ
+.BI DEB_ flag _MAINT_PREPEND
+This variable can be used to prepend supplementary options to the value
+returned for the given \fIflag\fP.
+.TP
+.B DEB_BUILD_MAINT_OPTIONS
+This variable can be used to disable/enable various hardening build
+flags through the \fBhardening\fP option. See the \fBHARDENING\fP section
+for details.
+.
+.SH HARDENING
+Several compile-time options (detailed below) can be used to help harden
+a resulting binary against memory corruption attacks, or provide
+additional warning messages during compilation. Except as noted below,
+these are enabled by default for architectures that support them.
+.P
+Each hardening feature can be enabled and disabled in the
+\fBDEB_BUILD_MAINT_OPTIONS\fP environment variable's \fBhardening\fP
+value with the "+" and "\-" modifier. For example, to enable the
+"pie" feature and disable the "fortify" feature you can do this
+in \fBdebian/rules\fP:
+.P
+  export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,\-fortify
+.P
+The special feature \fBall\fP can be used to enable or disable all
+hardening features at the same time. Thus disabling everything and
+enabling only "format" and "fortify" can be achieved with:
+.P
+  export DEB_BUILD_MAINT_OPTIONS=hardening=\-all,+format,+fortify
+.
+.TP
+.B format
+This setting (enabled by default) adds
+.B \-Wformat \-Wformat\-security \-Werror=format\-security
+to \fBCFLAGS\fP and \fBCXXFLAGS\fP. This will warn about improper format
+string uses, and will fail when format functions are used in a way that
+that represent possible security problems. At present, this warns about
+calls to \fBprintf\fP and \fBscanf\fP functions where the format string is
+not a string literal and there are no format arguments, as in
+\fBprintf(foo);\fP instead of \fPprintf("%s", foo);\fP
+This may be a security hole if the format string came from untrusted
+input and contains "%n".
+.
+.TP
+.B fortify
+This setting (enabled by default) adds
+.B \-D_FORTIFY_SOURCE=2
+to \fBCPPFLAGS\fP. During code generation the compiler
+knows a great deal of information about buffer sizes (where possible), and
+attempts to replace insecure unlimited length buffer function calls with
+length-limited ones. This is especially useful for old, crufty code.
+Additionally, format strings in writable memory that contain '%n' are
+blocked. If an application depends on such a format string, it will need
+to be worked around.
+
+Note that for this option to have any effect, the source must also
+be compiled with \fB\-O1\fP or higher.
+.TP
+.B stackprotector
+This setting (enabled by default) adds
+.B \-fstack-protector \-\-param=ssp\-buffer\-size=4
+to \fBCFLAGS\fP and \fBCXXFLAGS\fP. This adds safety checks against stack
+overwrites. This renders many potential code injection attacks into
+aborting situations. In the best case this turns code injection
+vulnerabilities into denial of service or into non-issues (depending on
+the application).
+
+This feature requires linking against glibc (or another provider of
+\fB__stack_chk_fail\fP), so needs to be disabled when building with
+\fB\-nostdlib\fP or \fB\-ffreestanding\fP or similar.
+.
+.TP
+.B relro
+This setting (enabled by default) adds
+.B \-Wl,\-z,relro
+to \fBLDFLAGS\fP.  During program load, several ELF memory sections need
+to be written to by the linker. This flags the loader to turn these
+sections read-only before turning over control to the program. Most
+notably this prevents GOT overwrite attacks.
+.
+.TP
+.B bindnow
+This setting (disabled by default) adds
+.B \-Wl,\-z,now
+to \fBLDFLAGS\fP. During program load, all dynamic symbols are resolved,
+allowing for the entire PLT to be marked read-only (due to \fBrelro\fP
+above).
+.
+.TP
+.B pie
+This setting (disabled by default) adds \fB\-fPIE\fP to \fBCFLAGS\fP and
+\fBCXXFLAGS\fP, and \fB\-fPIE \-pie\fP to \fBLDFLAGS\fP. Position Independent
+Executable are needed to take advantage of Address Space Layout
+Randomization, supported by some kernel versions. While ASLR can already
+be enforced for data areas in the stack and heap (brk and mmap), the code
+areas must be compiled as position-independent. Shared libraries already
+do this (\-fPIC), so they gain ASLR automatically, but binary .text
+regions need to be build PIE to gain ASLR. When this happens, ROP (Return
+Oriented Programming) attacks are much harder since there are no static
+locations to bounce off of during a memory corruption attack.
+
+This is not compatible with \fB\-fPIC\fP so care must be taken when
+building shared objects.
+
+Additionally, since PIE is implemented via a general register, some
+architectures (most notably i386) can see performance losses of up to
+15% in very text-segment-heavy application workloads; most workloads
+see less than 1%. Architectures with more general registers (e.g. amd64)
+do not see as high a worst-case penalty.
 .
 .SH AUTHOR
-Copyright \(co 2010 Rapha\[:e]l Hertzog
+Copyright \(co 2010-2011 Rapha\[:e]l Hertzog
+.sp
+Copyright \(co 2011 Kees Cook
 .sp
 This is free software; see the GNU General Public Licence version 2 or
 later for copying conditions. There is NO WARRANTY.
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-buildpackage.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-buildpackage.1
--- dpkg/man/dpkg-buildpackage.1	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-buildpackage.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
-.TH dpkg\-buildpackage 1 "2010-07-29" "Debian Project" "dpkg utilities"
+.TH dpkg\-buildpackage 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-buildpackage \- build binary or source packages from sources
 .
 .SH SYNOPSIS
 .B dpkg\-buildpackage
-.RI [ options ]
+.RI [ option ...]
 .
 .SH DESCRIPTION
 .B dpkg\-buildpackage
@@ -23,7 +23,7 @@
 \fBfakeroot debian/rules clean\fP to clean the build-tree (unless
 \fB\-nc\fP is specified).
 .IP \fB4.\fP 3
-It calls \fBdpkg-source \-b\fP to generate the source package (unless
+It calls \fBdpkg\-source \-b\fP to generate the source package (unless
 a binary\-only build has been requested with \fB\-b\fP, \fB\-B\fP or
 \fB\-A\fP).
 .IP \fB5.\fP 3
@@ -31,15 +31,15 @@
 \fBfakeroot debian/rules\fP \fIbinary-target\fP (unless a source-only
 build has been requested with \fB\-S\fP). Note that \fIbinary-target\fR is
 either \fBbinary\fP (default case, or if \fB\-b\fP is specified)
-or \fBbinary-arch\fP (if \fB\-B\fP is specified) or \fBbinary-indep\fP
+or \fBbinary\-arch\fP (if \fB\-B\fP is specified) or \fBbinary\-indep\fP
 (if \fB\-A\fP is specified).
 .IP \fB6.\fP 3
 It calls \fBgpg\fP to sign the \fB.dsc\fP file (if any, unless
 \fB\-us\fP is specified).
 .IP \fB7.\fP 3
-It calls \fBdpkg-genchanges\fP to generate a \fB.changes\fP file.
-Many \fBdpkg-buildpackage\fP options are forwarded to
-\fBdpkg-genchanges\fP.
+It calls \fBdpkg\-genchanges\fP to generate a \fB.changes\fP file.
+Many \fBdpkg\-buildpackage\fP options are forwarded to
+\fBdpkg\-genchanges\fP.
 .IP \fB8.\fP 3
 It calls \fBgpg\fP to sign the \fB.changes\fP file (unless \fB\-uc\fP
 is specified).
@@ -51,19 +51,19 @@
 .TP
 .B \-b
 Specifies a binary-only build, no source files are to be built and/or
-distributed. Passed to \fBdpkg-genchanges\fP.
+distributed. Passed to \fBdpkg\-genchanges\fP.
 .TP
 .B \-B
 Specifies a binary-only build, limited to architecture dependent packages.
-Passed to \fBdpkg-genchanges\fP.
+Passed to \fBdpkg\-genchanges\fP.
 .TP
 .B \-A
 Specifies a binary-only build, limited to architecture independent
-packages. Passed to \fBdpkg-genchanges\fP.
+packages. Passed to \fBdpkg\-genchanges\fP.
 .TP
 .B \-S
 Specifies a source-only build, no binary packages need to be made.
-Passed to \fBdpkg-genchanges\fP.
+Passed to \fBdpkg\-genchanges\fP.
 .TP
 .B \-F
 Specifies a normal full build, binary and source packages will be built.
@@ -100,7 +100,7 @@
 .br
 .BI \-e maintaineraddress
 .RS
-Passed unchanged to \fBdpkg-genchanges\fP. See its manual page.
+Passed unchanged to \fBdpkg\-genchanges\fP. See its manual page.
 .RE
 .TP
 .BI \-a architecture
@@ -122,7 +122,7 @@
 to the DEB_BUILD_OPTIONS environment variable which allows
 debian/rules files to use this information for their own purposes.
 The \fBparallel=\fP\fIjobs\fP in DEB_BUILD_OPTIONS environment variable
-will override the \fB-j\fP value if this option is given.
+will override the \fB\-j\fP value if this option is given.
 .TP
 .B \-D
 Check build dependencies and conflicts; abort if unsatisfied. This is the
@@ -133,7 +133,7 @@
 .TP
 .B \-nc
 Do not clean the source tree (implies \fB\-b\fP if nothing else has been
-selected among \fB-B\fP, \fB-A\fP or \fB-S\fP).
+selected among \fB\-B\fP, \fB\-A\fP or \fB\-S\fP).
 .TP
 .B \-tc
 Clean the source tree (using
@@ -173,7 +173,7 @@
 include space separated parameters).
 Alternatively it can be used to execute the standard rules file with
 another make program (for example by using
-.B /usr/local/bin/make -f debian/rules
+.B /usr/local/bin/make \-f debian/rules
 as \fIrules-file\fR).
 .TP
 .BI \-p sign-command
@@ -208,10 +208,10 @@
 .RE
 .TP
 .BI \-\-source\-option= opt
-Pass option \fIopt\fP to \fBdpkg-source\fP.
+Pass option \fIopt\fP to \fBdpkg\-source\fP.
 .TP
 .BI \-\-changes\-option= opt
-Pass option \fIopt\fP to \fBdpkg-genchanges\fP.
+Pass option \fIopt\fP to \fBdpkg\-genchanges\fP.
 .P
 .BI \-\-admindir= dir
 .br
@@ -228,18 +228,18 @@
 Show the version and exit.
 .
 .SH ENVIRONMENT
-Even if \fBdpkg\-buildpackage\fP export some variables, \fBdebian/rules\fP
+Even if \fBdpkg\-buildpackage\fP exports some variables, \fBdebian/rules\fP
 should not rely on their presence and should instead use the
 respective interface to retrieve the needed values.
-.SS Variables set by dpkg-architecture
+.SS Variables set by dpkg\-architecture
 \fBdpkg\-architecture\fP is called with the \fB\-a\fP and \fB\-t\fP
 parameters forwarded. Any variable that is output by its \fB\-s\fP
 option is integrated in the build environment.
-.SS Compiler flags
-The \fBCFLAGS\fP, \fBCXXFLAGS\fP, \fBFFLAGS\fP, \fBCPPFLAGS\fP
-and \fBLDFLAGS\fP environment variables are set to the values
-that \fBdpkg\-buildflags\fP returned. See its manual page for more
-information.
+.SS Compiler flags are no longer exported
+Between versions 1.14.17 and 1.16.1, \fBdpkg\-buildpackage\fP
+exported compiler flags (\fBCFLAGS\fP, \fBCXXFLAGS\fP, \fBFFLAGS\fP,
+\fBCPPFLAGS\fP and \fBLDFLAGS\fP) with values as returned
+by \fBdpkg\-buildflags\fP. This is no longer the case.
 .
 .SH BUGS
 It should be possible to specify spaces and shell metacharacters in
@@ -249,6 +249,7 @@
 .SH "SEE ALSO"
 .BR dpkg\-source (1),
 .BR dpkg\-architecture (1),
+.BR dpkg\-buildflags (1),
 .BR dpkg\-genchanges (1),
 .BR fakeroot (1),
 .BR gpg (1).
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-checkbuilddeps.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-checkbuilddeps.1
--- dpkg/man/dpkg-checkbuilddeps.1	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-checkbuilddeps.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
-.TH dpkg\-checkbuilddeps 1 "2009-11-21" "Debian Project" "dpkg utilities"
+.TH dpkg\-checkbuilddeps 1 "2011-07-04" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-checkbuilddeps \- check build dependencies and conflicts
 .
 .SH SYNOPSIS
 .B dpkg\-checkbuilddeps
-.RI [ options ]
+.RI [ option ...]
 .RI [ control-file ]
 .
 .SH DESCRIPTION
@@ -12,7 +12,7 @@
 dependencies and build conflicts listed in the control file. If any are
 not met, it displays them and exits with a nonzero return code.
 .P
-By default, \fIdebian/control\fR is read, but an alternate control filename
+By default, \fBdebian/control\fR is read, but an alternate control filename
 may be specified on the command line.
 .
 .SH OPTIONS
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-deb.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-deb.1
--- dpkg/man/dpkg-deb.1	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-deb.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,11 +1,10 @@
-.TH dpkg\-deb 1 "2011-04-26" "Debian Project" "dpkg suite"
+.TH dpkg\-deb 1 "2011-08-14" "Debian Project" "dpkg suite"
 .SH NAME
 dpkg\-deb \- Debian package archive (.deb) manipulation tool
 .
 .SH SYNOPSIS
 .B dpkg\-deb
-.RI [ options ]
-.I command
+.RI [ option "...] " command
 .
 .SH DESCRIPTION
 .B dpkg\-deb
@@ -140,7 +139,16 @@
 .BR \-X ", " \-\-vextract " \fIarchive directory\fP"
 Is like
 .BR \-\-extract " (" \-x ")"
-but prints a listing of the files extracted as it goes.
+with
+.BR \-\-verbose " (" \-v ")"
+which prints a listing of the files extracted as it goes.
+.TP
+.BR \-R ", " \-\-raw\-extract " \fIarchive directory\fP"
+Extracts the filesystem tree from a package archive into a specified
+directory, and the control information files into a DEBIAN subdirectory
+of the specified directory.
+
+The target directory (but not its parents) will be created if necessary.
 .TP
 .BR \-\-fsys\-tarfile " \fIarchive\fP"
 Extracts the filesystem tree data from a binary package and sends it
@@ -182,15 +190,15 @@
 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 \fB\-\-showformat\fP option in
-.BR dpkg-query (1).
+.BR dpkg\-query (1).
 
 The default for this field is "${Package}\\t${Version}\\n".
 .TP
-.BI \-z compress_level
-Specify which compression level to pass to the compressor backend program,
-when building a package.
+.BI \-z compress-level
+Specify which compression level to use on the compressor backend, when
+building a package (default is 9 for gzip and bzip2, 6 for xz and lzma).
 .TP
-.BI \-Z compress_type
+.BI \-Z compress-type
 Specify which compression type to use when building a package. Allowed
 values are \fIgzip\fP, \fIxz\fP, \fIbzip2\fP, \fIlzma\fP, and \fInone\fP
 (default is \fIgzip\fP).
@@ -214,6 +222,10 @@
 usual checks on the proposed contents of an archive. You can build
 any archive you want, no matter how broken, this way.
 .TP
+.BR \-v ", " \-\-verbose
+Enables verbose output. This currently only affects \fB\-\-extract\fP making
+it behave like \fB\-\-vextract\fP.
+.TP
 .BR \-D ", " \-\-debug
 Enables debugging output. This is not very interesting.
 .
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-distaddfile.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-distaddfile.1
--- dpkg/man/dpkg-distaddfile.1	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-distaddfile.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
-.TH dpkg\-distaddfile 1 "2008-08-18" "Debian Project" "dpkg utilities"
+.TH dpkg\-distaddfile 1 "2011-07-04" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-distaddfile \- add entries to debian/files
 .
 .SH SYNOPSIS
 .B dpkg\-distaddfile
-.RI [ options ] " filename section priority"
+.RI [ option ...] " filename section priority"
 .
 .SH DESCRIPTION
 .B dpkg\-distaddfile
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-divert.8 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-divert.8
--- dpkg/man/dpkg-divert.8	2011-03-01 14:31:03.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-divert.8	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
-.TH dpkg\-divert 8 "2010-10-12" "Debian Project" "dpkg utilities"
+.TH dpkg\-divert 8 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-divert \- override a package's version of a file
 .
 .SH SYNOPSIS
 .B dpkg\-divert
-.RI [ options ]
+.RI [ option ...]
 .I command
 .
 .SH DESCRIPTION
@@ -77,8 +77,8 @@
 .
 .SH NOTES
 When adding, default is \fB\-\-local\fP and \fB\-\-divert\fP
-\fI<original>.distrib\fP. When removing, \fB\-\-package\fP or \fB\-\-local\fP
-and \fB\-\-divert\fP must match if specified.
+\fIoriginal\fP\fB.distrib\fP. When removing, \fB\-\-package\fP or
+\fB\-\-local\fP and \fB\-\-divert\fP must match if specified.
 
 Directories can't be diverted with \fBdpkg\-divert\fP.
 
@@ -93,21 +93,21 @@
 i.e. directs all packages providing \fI/usr/bin/example\fR to install it as
 \fI/usr/bin/example.foo\fR, performing the rename if required:
 .HP
-dpkg-divert \-\-divert /usr/bin/example.foo \-\-rename /usr/bin/example
+dpkg\-divert \-\-divert /usr/bin/example.foo \-\-rename /usr/bin/example
 .PP
 To remove that diversion:
 .HP
-dpkg-divert \-\-rename \-\-remove /usr/bin/example
+dpkg\-divert \-\-rename \-\-remove /usr/bin/example
 
 .PP
 To divert any package trying to install \fI/usr/bin/example\fR to
 \fI/usr/bin/example.foo\fR, except your own \fIwibble\fR package:
 .HP
-dpkg-divert \-\-package wibble \-\-divert /usr/bin/example.foo \-\-rename /usr/bin/example
+dpkg\-divert \-\-package wibble \-\-divert /usr/bin/example.foo \-\-rename /usr/bin/example
 .PP
 To remove that diversion:
 .HP
-dpkg-divert \-\-package wibble \-\-rename \-\-remove /usr/bin/example
+dpkg\-divert \-\-package wibble \-\-rename \-\-remove /usr/bin/example
 .
 .SH ENVIRONMENT
 .TP
@@ -116,7 +116,7 @@
 be used as the dpkg data directory.
 .TP
 .B DPKG_MAINTSCRIPT_PACKAGE
-If set and the \fI\-\-local\fP and \fI\-\-package\fP options have not been
+If set and the \fB\-\-local\fP and \fB\-\-package\fP options have not been
 specified, \fBdpkg\-divert\fP will use it as the package name.
 .
 .SH FILES
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-genchanges.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-genchanges.1
--- dpkg/man/dpkg-genchanges.1	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-genchanges.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
-.TH dpkg\-genchanges 1 "2008-08-18" "Debian Project" "dpkg utilities"
+.TH dpkg\-genchanges 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-genchanges \- generate Debian .changes files
 .
 .SH SYNOPSIS
 .B dpkg\-genchanges
-.RI [ options ]
+.RI [ option ...]
 .br
 .
 .SH DESCRIPTION
@@ -29,7 +29,7 @@
 Specifies that only the source should be uploaded (no binary packages
 will be included).
 .PP
-The \fB-s\fP\fIx\fP options control whether the original source archive is
+The \fB\-s\fP\fIx\fP options control whether the original source archive is
 included in the upload if any source is being generated (i.e.
 .BR \-b " or " \-B
 haven't been used).
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-gencontrol.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-gencontrol.1
--- dpkg/man/dpkg-gencontrol.1	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-gencontrol.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
-.TH dpkg\-gencontrol 1 "2008-08-18" "Debian Project" "dpkg utilities"
+.TH dpkg\-gencontrol 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-gencontrol \- generate Debian control files
 .
 .SH SYNOPSIS
 .B dpkg\-gencontrol
-.RI [ options ]
+.RI [ option ...]
 .
 .SH DESCRIPTION
 .B dpkg\-gencontrol
@@ -13,7 +13,7 @@
 during this process it will simplify the relation fields.
 .sp
 Thus
-.IR Pre-Depends ", " Depends ", " Recommends " and " Suggests
+.IR Pre\-Depends ", " Depends ", " Recommends " and " Suggests
 are simplified in this
 order by removing dependencies which are known to be true according to the
 stronger dependencies already parsed. It will also remove any self-dependency
@@ -90,8 +90,8 @@
 .TP
 .BR \-is ", " \-ip ", " \-isp
 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
+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
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-gensymbols.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-gensymbols.1
--- dpkg/man/dpkg-gensymbols.1	2011-03-09 14:40:51.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-gensymbols.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,11 +1,11 @@
 .\" Author: Raphaël Hertzog
-.TH dpkg\-gensymbols 1 "2009-08-07" "Debian Project" "dpkg utilities"
+.TH dpkg\-gensymbols 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-gensymbols \- generate symbols files (shared library dependency information)
 .
 .SH SYNOPSIS
 .B dpkg\-gensymbols
-.RI [ options ]
+.RI [ option ...]
 .
 .SH DESCRIPTION
 .B dpkg\-gensymbols
@@ -56,6 +56,11 @@
 Before applying any patch to the symbols file, the maintainer should
 double-check that it's sane. Public symbols are not supposed to disappear,
 so the patch should ideally only add new lines.
+.P
+Note that you can put comments in symbols files: any line with '#' as the
+first character is a comment except if it starts with '#include' (see
+section \fBUsing includes\fP). Lines starting with '#MISSING:' are special
+comments documenting symbols that have disappeared.
 .SS Using #PACKAGE# substitution
 .P
 In some rare cases, the name of the library varies between architectures.
@@ -142,12 +147,12 @@
 in template mode.
 
 The format of \fIarchitecture list\fR is the same as the one used in the
-\fIBuild-Depends\fR field of \fIdebian/control\fR (except the enclosing
+\fIBuild\-Depends\fR field of \fIdebian/control\fR (except the enclosing
 square brackets []). For example, the first symbol from the list below
-will be considered only on alpha, amd64, kfreebsd-amd64 and ia64 architectures
+will be considered only on alpha, amd64, kfreebsd\-amd64 and ia64 architectures
 while the second one anywhere except on armel.
 
- (arch=alpha amd64 kfreebsd-amd64 ia64)a_64bit_specific_symbol@Base 1.0
+ (arch=alpha amd64 kfreebsd\-amd64 ia64)a_64bit_specific_symbol@Base 1.0
  (arch=!armel)symbol_armel_does_not_have@Base 1.0
 .TP
 .B ignore\-blacklist
@@ -172,14 +177,14 @@
 .SS Using symbol patterns
 .P
 Unlike a standard symbol specification, a pattern may cover multiple real
-symbols from the library. \fBdpkg-gensymbols\fR will attempt to match each
+symbols from the library. \fBdpkg\-gensymbols\fR will attempt to match each
 pattern against each real symbol that does \fInot\fR have a specific symbol
 counterpart defined in the symbol file. Whenever the first matching pattern is
 found, all its tags and properties will be used as a basis specification of the
 symbol. If none of the patterns matches, the symbol will be considered as new.
 
 A pattern is considered lost if it does not match any symbol in the library. By
-default this will trigger a \fBdpkg-gensymbols\fR failure under \fI-c1\fR or
+default this will trigger a \fBdpkg\-gensymbols\fR failure under \fI\-c1\fR or
 higher level. However, if the failure is undesired, the pattern may be marked
 with the \fIoptional\fR tag. Then if the pattern does not match anything, it
 will only appear in the diff as MISSING. Moreover, like any symbol, the pattern
@@ -200,7 +205,7 @@
 their demangled symbol name (as emitted by \fBc++filt\fR(1) utility). This
 pattern is very handy for matching symbols which mangled names might vary
 across different architectures while their demangled names remain the same. One
-group of such symbols is \fInon-virtual thunks\fR which have architecture
+group of such symbols is \fInon\-virtual thunks\fR which have architecture
 specific offsets embedded in their mangled names. A common instance of this
 case is a virtual destructor which under diamond inheritance needs a
 non-virtual thunk symbol. For example, even if _ZThn8_N3NSB6ClassDD1Ev@Base on
@@ -210,7 +215,7 @@
 .PP
 libdummy.so.1 libdummy1 #MINVER#
  [...]
- (c++)"non-virtual thunk to NSB::ClassD::~ClassD()@Base" 1.0
+ (c++)"non\-virtual thunk to NSB::ClassD::~ClassD()@Base" 1.0
  [...]
 .P
 The demangled name above can be obtained by executing the following command:
@@ -296,7 +301,7 @@
 then \fIsymver\fR) are preferred over generic patterns. Generic patterns are
 matched in the order they are found in the symbol file template until the first
 success.  Please note, however, that manual reordering of template file entries
-is not recommended because \fBdpkg-gensymbols\fR generates diffs based on the
+is not recommended because \fBdpkg\-gensymbols\fR generates diffs based on the
 alphanumerical order of their names.
 .SS Using includes
 .P
@@ -312,9 +317,9 @@
 .IP \(bu
 The include directive may also be tagged like any symbol:
 
-(tag|..|tagN)#include "file_to_include"
+(tag|..|tagN)#include "file-to-include"
 
-As a result, all symbols included from \fIfile_to_include\fR will be considered
+As a result, all symbols included from \fIfile-to-include\fR will be considered
 to be tagged with \fItag\fR .. \fItagN\fR by default. You can use this feature
 to create a common \fIpackage\fR.symbols file which includes architecture
 specific symbol files:
@@ -443,7 +448,7 @@
 Show the version and exit.
 .
 .SH "SEE ALSO"
-.BR http://people.redhat.com/drepper/symbol-versioning
+.BR http://people.redhat.com/drepper/symbol\-versioning
 .br
 .BR http://people.redhat.com/drepper/goodpractice.pdf
 .br
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-maintscript-helper.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-maintscript-helper.1
--- dpkg/man/dpkg-maintscript-helper.1	2011-03-09 14:40:51.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-maintscript-helper.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
-.TH dpkg\-maintscript\-helper 1 "2010-04-16" "Debian Project" "dpkg suite"
+.TH dpkg\-maintscript\-helper 1 "2011-08-14" "Debian Project" "dpkg suite"
 .SH NAME
 dpkg\-maintscript\-helper \- works around known dpkg limitations in maintainer scripts
 .
 .SH SYNOPSIS
 .B dpkg\-maintscript\-helper
-.IR command " [" parameters "...] \-\- " maint-script-parameters
+.IR command " [" parameter "...] \fB\-\-\fP " maint-script-parameter ...
 .
 .SH COMMANDS AND PARAMETERS
 .P
@@ -22,7 +22,7 @@
 scripts (\fBpreinst\fP, \fBpostinst\fP, \fBprerm\fP, \fBpostrm\fP). To
 avoid mistakes the same call simply needs to be put in all scripts and the
 program will automatically adapt its behaviour based on the environment
-variable DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments
+variable \fBDPKG_MAINTSCRIPT_NAME\fP and on the maintainer scripts arguments
 that you have to forward after a double dash.
 .
 .SH CONFFILE RELATED TASKS
@@ -114,15 +114,15 @@
 depends on the command used, for \fBrm_conffile\fP and \fBmv_conffile\fP
 it is 1.15.7.2:
 .P
-    Pre-Depends: dpkg (>= 1.15.7.2)
+    \fBPre\-Depends:\fP dpkg (>= 1.15.7.2)
 .P
 But in many cases the operation done by the program is not critical for
 the package, and instead of using a pre-dependency we can call the
 program only if we know that the required command is supported by
 the currently installed dpkg:
 .P
-    if dpkg-maintscript-helper supports <command>; then
-        dpkg-maintscript-helper <command> ...
+    if dpkg\-maintscript\-helper supports \fIcommand\fP; then
+        dpkg\-maintscript\-helper \fIcommand\fP ...
     fi
 .
 .SH AUTHORS
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-mergechangelogs.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-mergechangelogs.1
--- dpkg/man/dpkg-mergechangelogs.1	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-mergechangelogs.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
-.TH dpkg\-mergechangelogs 1 "2010-04-18" "Debian Project" "dpkg suite"
+.TH dpkg\-mergechangelogs 1 "2011-08-14" "Debian Project" "dpkg suite"
 .SH NAME
 dpkg\-mergechangelogs \- 3-way merge of debian/changelog files
 .
 .SH SYNOPSIS
 .B dpkg\-mergechangelogs
-.RI [ option "...] " old " " new\-a " " new\-b " [" out ]
+.RI [ option "...] " old " " new-a " " new-b " [" out ]
 .
 .SH DESCRIPTION
 .P
@@ -17,23 +17,23 @@
 be not conflicting, they are simply merged in the right order (by
 decreasing version number). When \fB\-\-merge\-prereleases\fP is used, the
 part of the version number after the last tilde is dropped so that
-1.0-1~exp1 and 1.0-1~exp5 are considered to be the same entry. When the
-same version is available in both \fInew\-a\fP and \fInew\-b\fP, a standard
+1.0\-1~exp1 and 1.0\-1~exp5 are considered to be the same entry. When the
+same version is available in both \fInew-a\fP and \fInew-b\fP, a standard
 line-based 3-way merge is attempted (provided that the module
 Algorithm::Merge is available \[em] it's part of the package
-libalgorithm-merge-perl \[em] otherwise you get a global conflict on the
+libalgorithm\-merge\-perl \[em] otherwise you get a global conflict on the
 content of the entry).
 .
 .SH OPTIONS
 .TP
-.BR \-\-merge-prereleases ", " \-m
+.BR \-\-merge\-prereleases ", " \-m
 Drop the part after the last tilde in the version number when doing
 version comparison to identify if two entries are supposed to be
 the same or not.
 .sp
 This is useful when you keep using the same changelog entry but you
 increase its version number regularly. For instance, you might have
-2.3-1~exp1, 2.3-1~exp2, ... until the official release 2.3-1 and they
+2.3\-1~exp1, 2.3\-1~exp2, ... until the official release 2.3\-1 and they
 are all the same changelog entry that has evolved over time.
 .TP
 .B \-\-help
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-name.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-name.1
--- dpkg/man/dpkg-name.1	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-name.1	2012-06-07 10:11:09.426073000 -0700
@@ -3,15 +3,15 @@
 .\"
 .\" This is free software; see the GNU General Public Licence version 2
 .\" or later for copying conditions.  There is NO warranty.
-.TH dpkg\-name 1 "2008-08-18" "Debian Project" "dpkg utilities"
+.TH dpkg\-name 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-name \- rename Debian packages to full package names
 .
 .SH SYNOPSIS
 .B dpkg\-name
-.RI [ options  ]
+.RI [ option ...]
 .RB [ \-\- ]
-.I files
+.IR file ...
 .
 .SH DESCRIPTION
 .PP
@@ -19,11 +19,12 @@
 .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 \fI<package>_<version>_<architecture>.<package_type>\fP as specified in
-the control file of the package. The \fI<version>\fP part of the filename
+packages into their full package names. A full package name consists of
+.IB package _ version _ architecture . package-type
+as specified in the control file of the package. The \fIversion\fP part
+of the filename
 consists of the upstream version information optionally followed by a
-hyphen and the revision information. The \fI<package_type>\fP part comes
+hyphen and the revision information. The \fIpackage-type\fP part comes
 from that field if present or fallbacks to \fBdeb\fP.
 .
 .SH OPTIONS
@@ -43,11 +44,11 @@
 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\-<architecture>/<section>'. 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
-`<section>/binary\-<architecture>'. The section field isn't required so
-a lot of packages will find their way to the `no\-section' area. Use
+`unstable/binary\-\fIarchitecture\fP/\fIsection\fP'. 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
+`\fIsection\fP/binary\-\fIarchitecture\fP'. 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.
 .TP
 .BR \-c ", " \-\-create\-dir
@@ -84,11 +85,11 @@
 .
 .SH BUGS
 Some packages don't follow the name structure
-<package>_<version>_<architecture>.deb. Packages renamed by dpkg\-name
+.IB package _ version _ architecture .deb\fR.\fP
+Packages renamed by dpkg\-name
 will follow this structure. Generally this will have no impact on how
 packages are installed by
-.BR dselect (1)/
-.BR dpkg (1),
+.BR dselect (1)/ dpkg (1),
 but other installation tools
 might depend on this naming structure.
 .
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-parsechangelog.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-parsechangelog.1
--- dpkg/man/dpkg-parsechangelog.1	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-parsechangelog.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
-.TH dpkg\-parsechangelog 1 "2009-05-19" "Debian Project" "dpkg utilities"
+.TH dpkg\-parsechangelog 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-parsechangelog \- parse Debian changelog files
 .
 .SH SYNOPSIS
 .B dpkg\-parsechangelog
-.RI [ options ]
+.RI [ option ...]
 .
 .SH DESCRIPTION
 .B dpkg\-parsechangelog
@@ -47,28 +47,28 @@
 .IR dpkg " and " rfc822 .
 \fIdpkg\fP is the classic output format (from before this
 option existed) and the default. It consists of one paragraph
-in Debian control format (see \fBdeb-control\fP(5)). If more
+in Debian control format (see \fBdeb\-control\fP(5)). If more
 than one entry is requested, then most fields are taken from the
 latest entry, except otherwise stated:
 .RS
 .TP
-.BR Source: " <pkg name>"
+.BI Source: " pkg-name"
 .TP
-.BR Version: " <version>"
+.BI Version: " version"
 .TP
-.BR Distribution: " <target distribution>"
+.BI Distribution: " target-distribution"
 .TP
-.BR Urgency: " <urgency>"
+.BI Urgency: " urgency"
 The highest urgency of all included entries is used.
 .TP
-.BR Maintainer: " <author>"
+.BI Maintainer: " author"
 .TP
-.BR Date: " <date>"
+.BI Date: " date"
 .TP
-.BR Closes: " <bug number>"
+.BI Closes: " bug-number"
 The Closes fields of all included entries are merged.
 .TP
-.BR Changes: " <changelog entries>"
+.BI Changes: " changelog-entries"
 The text of all changelog entries is concatenated. To make
 this field a valid Debian control format multiline field
 empty lines are replaced with a single full stop and all lines
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-query.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-query.1
--- dpkg/man/dpkg-query.1	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-query.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,4 +1,4 @@
-.TH dpkg\-query 1 "2011-04-28" "Debian Project" "dpkg suite"
+.TH dpkg\-query 1 "2011-08-14" "Debian Project" "dpkg suite"
 .SH NAME
 dpkg\-query \- a tool to query the dpkg database
 .
@@ -70,9 +70,7 @@
 the given pattern. However the output can be customized using the
 \fB\-\-showformat\fP option.
 The default output format gives one line per matching package, each line
-having the name (extended with the architecture qualifier for
-foreign architecture packages) and installed version of the package,
-separated by a tab.
+having the name and installed version of the package, separated by a tab.
 .TP
 .BR \-s ", " \-\-status " \fIpackage-name\fP..."
 Report status of specified package. This just displays the entry in
@@ -158,15 +156,14 @@
     \fBDescription\fP
     \fBEnhances\fP
     \fBEssential\fP
-    \fBFilename\fP (internal, dselect related)
+    \fBFilename\fP (internal, front-end related)
     \fBHomepage\fP
     \fBInstalled\-Size\fP
-    \fBMD5sum\fP (internal, dselect related)
-    \fBMSDOS\-Filename\fP (internal, dselect related)
+    \fBMD5sum\fP (internal, front-end related)
+    \fBMSDOS\-Filename\fP (internal, front-end related)
     \fBMaintainer\fP
     \fBOrigin\fP
     \fBPackage\fP
-    \fBPackageSpec\fP (virtual field)
     \fBPre\-Depends\fP
     \fBPriority\fP
     \fBProvides\fP
@@ -174,28 +171,25 @@
     \fBReplaces\fP
     \fBRevision\fP (obsolete)
     \fBSection\fP
-    \fBSize\fP (internal, dselect related)
+    \fBSize\fP (internal, front-end related)
     \fBSource\fP
     \fBStatus\fP (internal)
     \fBSuggests\fP
-    \fBTag\fP (usually not in the .deb but in APT's Packages files)
-    \fBTriggers-Awaited\fP (internal)
-    \fBTriggers-Pending\fP (internal)
+    \fBTag\fP (usually not in the .deb but in the repository Packages files)
+    \fBTriggers\-Awaited\fP (internal)
+    \fBTriggers\-Pending\fP (internal)
     \fBVersion\fP
 .fi
 
-The default format string is \(lq\fB${PackageSpec}\et${Version}\en\fP\(rq.
+The default format string is \(lq\fB${Package}\et${Version}\en\fP\(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. \fBPackageSpec\fP is a
-special field that will print the package name with an architecture
-qualifier (like "libc6:amd64") if the package is of a foreign architecture
-(an architecture that doesn't match dpkg's architecture).
+conversion nor error checking is done on them.
 To get the name of the dpkg maintainer and the installed version, you could
 run:
 
 .nf
-  \fBdpkg\-query \-W \-f=\(aq${PackageSpec} ${Version}\\t${Maintainer}\\n\(aq dpkg\fP
+  \fBdpkg\-query \-W \-f=\(aq${Package} ${Version}\\t${Maintainer}\\n\(aq dpkg\fP
 .fi
 .
 .SH "EXIT STATUS"
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-scanpackages.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-scanpackages.1
--- dpkg/man/dpkg-scanpackages.1	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-scanpackages.1	2012-06-07 10:11:09.426073000 -0700
@@ -12,14 +12,13 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
-.TH dpkg\-scanpackages 1 "2009-10-01" "Debian Project" "dpkg utilities"
+.TH dpkg\-scanpackages 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-scanpackages \- create Packages index files
 .
 .SH SYNOPSIS
 .B dpkg\-scanpackages
-.RI [ options ]
-.I binary-dir
+.RI [ option "...] " binary-dir
 .RI [ override-file
 .RI [ path-prefix ]]
 .B >
@@ -75,7 +74,7 @@
 Scan for *.\fItype\fP packages, instead of *.deb.
 .TP
 .BR \-u ", " \-\-udeb
-\fBObsolete\fP alias for \fB-tudeb\fP.
+\fBObsolete\fP alias for \fB\-tudeb\fP.
 .TP
 .BR \-e ", " \-\-extra\-override " \fIfile\fP"
 Scan \fIfile\fP to find supplementary overrides (the file can be
@@ -90,8 +89,8 @@
 .BR \-m ", " \-\-multiversion
 Include all found packages in the output.
 .TP
-.BR \-M ", " \-\-medium " \fIid\-string\fP"
-Add an X-Medium field containing the value \fIid\-string\fP. This field
+.BR \-M ", " \-\-medium " \fIid-string\fP"
+Add an X\-Medium field containing the value \fIid-string\fP. This field
 is required if you want to generate \fBPackages.cd\fP files for use
 by the multicd access method of dselect.
 .TP
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-scansources.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-scansources.1
--- dpkg/man/dpkg-scansources.1	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-scansources.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,25 +1,24 @@
-.TH dpkg\-scansources 1 "2009-10-01" "Debian Project" "dpkg utilities"
+.TH dpkg\-scansources 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-scansources \- create Sources index files
 .
 .SH SYNOPSIS
 .B dpkg\-scansources
-.RI [ options ]
-.I binary-dir
+.RI [ option "...] " binary-dir
 .RI [ override-file
 .RI [ path-prefix ]]
 .B >
 .I Sources
 .
 .SH DESCRIPTION
-\fBdpkg-scansources\fR scans the given \fIbinary-dir\fR for \fI.dsc\fR files.
+\fBdpkg\-scansources\fR scans the given \fIbinary-dir\fR for \fI.dsc\fR files.
 These are used to create a Debian source index, which is output to
 stdout.
 .PP
 The \fIoverride-file\fR, if given, is used to set priorities in the resulting
 index records and to override the maintainer field given in the \fI.dsc\fR
 files. The file can be compressed. See
-.BR deb-override (5)
+.BR deb\-override (5)
 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
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-shlibdeps.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-shlibdeps.1
--- dpkg/man/dpkg-shlibdeps.1	2011-03-09 14:40:51.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-shlibdeps.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,12 +1,10 @@
-.TH dpkg\-shlibdeps 1 "2011-03-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-shlibdeps 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-shlibdeps \- generate shared library substvar dependencies
 .
 .SH SYNOPSIS
 .B dpkg\-shlibdeps
-.RI [ options ]
-.IR executable | \fB-e\fPexecutable
-.RI [ options ]
+.RI [ option "...] [" \fB\-e\fP ] executable " [" option ...]
 .
 .SH DESCRIPTION
 .B dpkg\-shlibdeps
@@ -18,8 +16,8 @@
 .BI shlibs: dependencyfield
 where
 .I dependencyfield
-is a dependency field name. Any other variables starting
-.I shlibs:
+is a dependency field name. Any other variables starting with
+.B shlibs:
 are removed from the file.
 .P
 .B dpkg\-shlibdeps
@@ -42,7 +40,7 @@
 or /var/lib/dpkg/info/\fIpackage\fR.\fIshlibs\fR. The package name is
 identified in two steps: find the library file on the system (looking in
 the same directories that \fBld.so\fR would use), then use
-.BI "dpkg -S " library\-file
+.BI "dpkg \-S " library-file
 to lookup the package providing the library.
 .SS Symbols files
 Symbols files contain finer-grained dependency information by providing
@@ -61,8 +59,8 @@
 .IP /etc/dpkg/symbols/\fIpackage\fR.symbols
 Per-system overriding shared library dependency information.
 \fIarch\fR is the architecture of the current system (obtained by
-.BR "dpkg-architecture -qDEB_HOST_ARCH" ).
-.IP "Output from \(lq\fBdpkg-query \-\-control\-path\fR \fIpackage\fR symbols\(rq"
+.BR "dpkg\-architecture \-qDEB_HOST_ARCH" ).
+.IP "Output from \(lq\fBdpkg\-query \-\-control\-path\fR \fIpackage\fR symbols\(rq"
 Package-provided shared library dependency information.
 Unless overridden by \-\-admindir, those files are located in /var/lib/dpkg.
 .P 
@@ -74,10 +72,10 @@
 accurate).
 .P
 As a safe-guard measure, a symbols file can provide a
-\fIBuild-Depends-Package\fR meta-information field and
-.B dpkg-shlibdeps
+\fIBuild\-Depends\-Package\fR meta-information field and
+.B dpkg\-shlibdeps
 will extract the minimal version required by the corresponding package in
-the Build-Depends field and use this version if it's higher than the
+the Build\-Depends field and use this version if it's higher than the
 minimal version computed by scanning symbols.
 .SS Shlibs files
 Shlibs files associate directly a library to a dependency (without looking
@@ -96,7 +94,7 @@
 They are only used if the library is found in a package's build tree. The
 shlibs file in that build tree takes precedence over shlibs files from
 other binary packages.
-.IP "Output from \(lq\fBdpkg-query \-\-control\-path\fP \fIpackage\fR shlibs\(rq"
+.IP "Output from \(lq\fBdpkg\-query \-\-control\-path\fP \fIpackage\fR shlibs\(rq"
 Package-provided shared library dependency information.
 Unless overridden by \-\-admindir, those files are located in /var/lib/dpkg.
 .IP /etc/dpkg/shlibs.default
@@ -233,8 +231,8 @@
 .BI symbol " sym" " used by " binary " found in none of the libraries."
 The indicated symbol has not been found in the libraries linked with the
 binary. The \fIbinary\fR is most likely a library and it needs to be linked
-with an additional library during the build process (option \fB-l\fR\fIlibrary\fR
-of the linker).
+with an additional library during the build process (option
+\fB\-l\fR\fIlibrary\fR of the linker).
 .TP
 .IB binary " contains an unresolvable reference to symbol " sym ": it's probably a plugin
 The indicated symbol has not been found in the libraries linked with the
@@ -269,8 +267,8 @@
 (libsomething.so.\fIX\fR). A private library (like a plugin) should not
 have a SONAME and doesn't need to be versioned.
 .TP
-.BI "couldn't find library " library\-soname " needed by " binary " (its RPATH is '" rpath "')"
-The \fIbinary\fR uses a library called \fIlibrary\-soname\fR but
+.BI "couldn't find library " library-soname " needed by " binary " (its RPATH is '" rpath "')"
+The \fIbinary\fR uses a library called \fIlibrary-soname\fR but
 .B dpkg\-shlibdeps
 has been unable to find the library.
 .B dpkg\-shlibdeps
@@ -279,8 +277,8 @@
 directories listed in the LD_LIBRARY_PATH environment variable, and
 standard public directories (/lib, /usr/lib, /lib32, /usr/lib32, /lib64,
 /usr/lib64). Then it checks those directories in the package's build tree
-of the binary being analyzed, in the packages's build trees indicated with
-the \-S command\-line option, in other packages's build trees that contains
+of the binary being analyzed, in the packages' build trees indicated with
+the \-S command-line option, in other packages' build trees that contains
 a DEBIAN/shlibs or DEBIAN/symbols file and finally in the root directory.
 If the library is not found in any of those directories, then you get this
 error.
@@ -291,15 +289,15 @@
 file of this package is already created and that LD_LIBRARY_PATH
 contains the appropriate directory if it also is in a private directory.
 .TP
-.BI "no dependency information found for " library\-file " (used by " binary ")."
+.BI "no dependency information found for " library-file " (used by " binary ")."
 The library needed by \fIbinary\fR has been found by
 .B dpkg\-shlibdeps
-in \fIlibrary\-file\fR but
+in \fIlibrary-file\fR but
 .B dpkg\-shlibdeps
 has been unable to find any dependency information for that library. To
 find out the dependency, it has tried to map the library to a Debian
 package with the help of
-.BI "dpkg -S " library\-file\fR.
+.BI "dpkg \-S " library-file\fR.
 Then it checked the corresponding shlibs and symbols files in
 /var/lib/dpkg/info/, and in the various package's build trees
 (debian/*/DEBIAN/).
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-source.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-source.1
--- dpkg/man/dpkg-source.1	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-source.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,12 +1,11 @@
 .\" Authors: Ian Jackson, Raphaël Hertzog
-.TH dpkg\-source 1 "2011-03-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-source 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-source \- Debian source package (.dsc) manipulation tool
 .
 .SH SYNOPSIS
 .B dpkg\-source
-.RI [ options ]
-.I command
+.RI [ option "...] " command
 .
 .SH DESCRIPTION
 .B dpkg\-source
@@ -57,7 +56,7 @@
 
 \fBdpkg\-source\fP will build the source package with the first format
 found in this ordered list:
-the format indicated with the \fI\-\-format\fP command-line option,
+the format indicated with the \fI\-\-format\fP command line option,
 the format indicated in \fBdebian/source/format\fP,
 "1.0". The fallback to "1.0" is deprecated and will be removed at some
 point in the future, you should always document the desired source format
@@ -72,20 +71,27 @@
 
 .TP
 .RI "\fB\-\-before\-build\fP " directory
-This command should be called before any build of the package
-(\fBdpkg\-buildpackage\fP calls it very early even before \fBdebian/rules
-clean\fP). This command should be idempotent and can be called multiple
-times. Not all source formats implement something in this hook, and those
-that do usually prepare the source tree for the build for example by
-ensuring that the Debian patches are applied.
+Run the corresponding hook of the source package format. This hook is
+called before any build of the package (\fBdpkg\-buildpackage\fP calls it
+very early even before \fBdebian/rules clean\fP). This command is
+idempotent and can be called multiple times. Not all source formats
+implement something in this hook, and those that do usually prepare the
+source tree for the build for example by ensuring that the Debian patches
+are applied.
 
 .TP
 .RI "\fB\-\-after\-build\fP " directory
-This command should be called after any build of the package
-(\fBdpkg\-buildpackage\fP calls it last). This command should be idempotent
-and can be called multiple times. Not all source formats implement
-something in this hook, and those that do usually use it to undo what
-\fB\-\-before\-build\fP has done.
+Run the corresponding hook of the source package format. This hook is
+called after any build of the package (\fBdpkg\-buildpackage\fP calls it
+last). This command is idempotent and can be called multiple times. Not
+all source formats implement something in this hook, and those that do
+usually use it to undo what \fB\-\-before\-build\fP has done.
+
+.TP
+.RI "\fB\-\-commit\fP [" directory "] ..."
+Record changes in the source tree unpacked in \fIdirectory\fP. This
+command can take supplementary parameters depending on the source format.
+It will error out for formats where this operation doesn't mean anything.
 
 .TP
 .BR \-h ", " \-\-help
@@ -141,13 +147,13 @@
 it only affects new files. Supported values are:
 .IR gzip ", " bzip2 ", " lzma " and " xz .
 \fIgzip\fP is the default. \fIxz\fP is only supported since
-dpkg-dev 1.15.5.
+dpkg\-dev 1.15.5.
 .TP
 .BR \-z "\fIlevel\fP, " \-\-compression\-level =\fIlevel\fP
 Compression level to use. As with \fB\-Z\fP it only affects newly created
 files. Supported values are:
 .IR 1 " to " 9 ", " best ", and " fast .
-\fI9\fP is the default.
+The default is \fI9\fP for gzip and bzip2, \fI6\fP for xz and lzma.
 .TP
 .BR \-i "[\fIregexp\fP], " \-\-diff\-ignore [=\fIregexp\fP]
 You may specify a perl regular expression to match files you want
@@ -193,10 +199,10 @@
 directories.
 .PP
 .B Note:
-While they have similar purposes, \fB-i\fP and \fB-I\fP have very
-different syntax and semantics. \fB-i\fP can only be specified once and
+While they have similar purposes, \fB\-i\fP and \fB\-I\fP have very
+different syntax and semantics. \fB\-i\fP can only be specified once and
 takes a perl compatible regular expression which is matched against
-the full relative path of each file. \fB-I\fP can specified
+the full relative path of each file. \fB\-I\fP can specified
 multiple times and takes a filename pattern with shell wildcards.
 The pattern is applied to the full relative path but also
 to each part of the path individually. The exact semantic of tar's
@@ -219,8 +225,8 @@
 signature that can be verified either with the user's
 \fItrustedkeys.gpg\fP keyring, one of the vendor-specific keyrings, or one
 of the official Debian keyrings
-(\fI/usr/share/keyrings/debian-keyring.gpg\fP
-and \fI/usr/share/keyrings/debian-maintainers.gpg\fP).
+(\fI/usr/share/keyrings/debian\-keyring.gpg\fP
+and \fI/usr/share/keyrings/debian\-maintainers.gpg\fP).
 
 .SH SOURCE PACKAGE FORMATS
 If you don't know what source format to use, you should probably pick
@@ -302,7 +308,7 @@
 .TP
 .B \-ss
 Specifies that the original source is available both as a directory
-and as a tarfile. dpkg-source will use the directory to create the diff, but
+and as a tarfile. dpkg\-source will use the directory to create the diff, but
 the tarfile to create the
 .BR .dsc .
 This option must be used with care - if the directory and tarfile do
@@ -384,22 +390,22 @@
 must be valid patches: they are applied at extraction time.
 
 When building a new source package, any change to the upstream source
-is stored in a patch named \fBzz_debian-diff-auto\fP.
+is stored in a patch named \fBzz_debian\-diff\-auto\fP.
 .
 .SS Format: 3.0 (native)
 This format is an extension of the native package format as defined
 in the 1.0 format. It supports all compression methods and
 will ignore by default any VCS specific files and directories
 as well as many temporary files (see default value associated to
-\fB-I\fP option in the \fB\-\-help\fP output).
+\fB\-I\fP option in the \fB\-\-help\fP output).
 .
 .SS Format: 3.0 (quilt)
 A source package in this format contains at least
 an original tarball (\fB.orig.tar.\fP\fIext\fP where \fIext\fP can be
 \fBgz\fP, \fBbz2\fP, \fBlzma\fP and \fBxz\fP) and a debian tarball
 (\fB.debian.tar.\fP\fIext\fP). It can also contain additional original
-tarballs (\fB.orig-\fP\fIcomponent\fP\fB.tar.\fP\fIext\fP).
-\fIcomponent\fP can only contain alphanumeric characters and dashes ("-").
+tarballs (\fB.orig\-\fP\fIcomponent\fP\fB.tar.\fP\fIext\fP).
+\fIcomponent\fP can only contain alphanumeric characters and dashes ("\-").
 .PP
 .B Extracting
 .PP
@@ -420,13 +426,13 @@
 however that while \fBdpkg\-source\fP parses correctly series files with
 explicit options used for patch application (stored on each line
 after the patch filename and one or more spaces), it does ignore those
-options and always expect patches that can be applied with the \fB-p1\fP
+options and always expect patches that can be applied with the \fB\-p1\fP
 option of \fBpatch\fP. It will thus emit a warning when it encounters
 such options, and the build is likely to fail.
 .PP
 Similarly to quilt's default behaviour, the patches can remove files too.
 .PP
-The file \fB.pc/applied-patches\fP is created if some
+The file \fB.pc/applied\-patches\fP is created if some
 patches have been applied during the extraction.
 .PP
 .B Building
@@ -434,10 +440,12 @@
 All original tarballs found in the current directory are extracted in a
 temporary directory by following the same logic as for the unpack, the
 debian directory is copied over in the temporary directory, and all
-patches except the automatic patch (\fBdebian-changes-\fP\fIversion\fP
-or \fBdebian-changes\fP, depending on \fB\-\-single\-debian\-patch\fP) are
+patches except the automatic patch (\fBdebian\-changes\-\fP\fIversion\fP
+or \fBdebian\-changes\fP, depending on \fB\-\-single\-debian\-patch\fP) are
 applied. The temporary directory is compared to the source package
-directory and the diff (if non-empty) is stored in the automatic patch.
+directory. When the diff is non-empty, the build fails unless
+\fB\-\-single\-debian\-patch\fP or \fB\-\-auto\-commit\fP
+has been used, in which case the diff is stored in the automatic patch.
 If the automatic patch is created/deleted, it's added/removed from the
 series file and from the quilt metadata.
 
@@ -445,32 +453,41 @@
 on a binary file is not representable in a diff and will thus lead to a
 failure unless the maintainer deliberately decided to include that
 modified binary file in the debian tarball (by listing it in
-\fBdebian/source/include-binaries\fP). The build will also fail if it
+\fBdebian/source/include\-binaries\fP). The build will also fail if it
 finds binary files in the debian sub-directory unless they have been
-whitelisted through \fBdebian/source/include-binaries\fP.
+whitelisted through \fBdebian/source/include\-binaries\fP.
 
 The updated debian directory and the list of modified binaries is then
 used to generate the debian tarball.
 
 The automatically generated diff doesn't include changes on VCS specific
 files as well as many temporary files (see default value associated to
-\fB-i\fP option in the \fB\-\-help\fP output). In particular, the
+\fB\-i\fP option in the \fB\-\-help\fP output). In particular, the
 \fB.pc\fP directory used by quilt is ignored during generation of the
 automatic patch.
 
-Note: \fBdpkg\-source\fP expects the source tree to have all patches
-listed in the series file applied when you generate the source package.
-This is not the case when the source tree has been obtained by unpacking a
-source package using the Format: 1.0 for instance. To mitigate the
-problem, \fBdpkg\-source\fP will apply the patches by itself if it
-believes that they have not yet been applied. To detect this situation, it
-uses the following heuristic: it finds the list of supposedly unapplied
-patches (they are listed in the \fBseries\fP file but not in
-\fB.pc/applied-patches\fP), and if the first patch in that set can be
-applied without errors, it will apply them all.
-The option \fB\-\-no\-preparation\fP can be used to disable this
-behaviour. This operation is usually done as part of the
-\fB\-\-prepare\-build\fP command.
+Note: \fBdpkg\-source\fP \fB\-\-before\-build\fP (and \fB\-b\fP) will
+ensure that all patches listed in the series file are applied so that a
+package build always has all patches applied. It does this by finding
+unapplied patches (they are listed in the \fBseries\fP file but not in
+\fB.pc/applied\-patches\fP), and if the first patch in that set can be
+applied without errors, it will apply them all. The option
+\fB\-\-no\-preparation\fP can be used to disable this
+behavior.
+
+.PP
+.B Recording changes
+.TP
+.RI "\fB\-\-commit\fP [" directory "] [" patch-name "] [" patch-file ]
+Generates a patch corresponding to the local changes that are not managed
+by the quilt patch system and integrates it in the patch system under
+the name \fIpatch-name\fP. If the name is missing, it will be asked
+interactively. If \fIpatch-file\fP is given, it is used as the patch
+corresponding to the local changes to integrate. This is mainly useful
+after a build failure that pre-generated this file. Once integrated, an
+editor is launched so that you can edit the meta-information in the patch
+header.
+
 .PP
 .B Build options
 .TP
@@ -491,7 +508,7 @@
 .TP
 .B \-\-include\-binaries
 Add all modified binaries in the debian tarball. Also add them to
-\fBdebian/source/include-binaries\fP: they will be added by default
+\fBdebian/source/include\-binaries\fP: they will be added by default
 in subsequent builds and this option is thus no more needed.
 .TP
 .B \-\-no\-preparation
@@ -499,14 +516,15 @@
 apparently unapplied.
 .TP
 .B \-\-single\-debian\-patch
-Use \fBdebian/patches/debian-changes\fP instead of
-\fBdebian/patches/debian-changes-\fP\fIversion\fP for the name of the
+Use \fBdebian/patches/debian\-changes\fP instead of
+\fBdebian/patches/debian\-changes\-\fP\fIversion\fP for the name of the
 automatic patch generated during build. This option is particularly
 useful when the package is maintained in a VCS and a patch set can't reliably
 be generated. Instead the current diff with upstream should be stored in a
-single patch. When using this option, it is recommended to create
-a debian/source/patch-header file explaining how the Debian changes can be
-best reviewed, for example in the VCS that is used.
+single patch. The option would be put in \fBdebian/source/local\-options\fP
+and would be accompanied by a \fBdebian/source/local\-patch\-header\fP file
+explaining how the Debian changes can be best reviewed, for example in the
+VCS that is used.
 .TP
 .B \-\-create\-empty\-orig
 Automatically create the main original tarball as empty if it's missing
@@ -515,13 +533,11 @@
 software and where there's no "main" software.
 .TP
 .B \-\-unapply\-patches
-Unapply the patches in the \fB\-\-after\-build\fP hook. This is mainly
-useful when you build your package directly in a VCS that contains
-unpatched upstream source and where you want to keep the tree unpatched
-even after a package build. This option is usually put in
-\fBdebian/source/local\-options\fP (it's not allowed in
-\fBdebian/source/options\fP so that all generated source packages have the
-same behaviour by default).
+Unapply the patches in the \fB\-\-after\-build\fP hook. You usually don't
+need this option as dpkg\-source will automatically unapply the patches
+if it did apply them during \fB\-\-before\-build\fP. This
+option is only allowed in \fBdebian/source/local\-options\fP so that all
+generated source packages have the same behavior by default.
 .TP
 .B \-\-abort\-on\-upstream\-changes
 The process fails if an automatic patch has been generated. This option
@@ -529,6 +545,10 @@
 quilt patches prior to the source package build. This option is not
 allowed in \fBdebian/source/options\fP but can be used in
 \fBdebian/source/local\-options\fP.
+.TP
+.B \-\-auto\-commit
+The process doesn't fail if an automatic patch has been generated, instead
+it's immediately recorded in the quilt series.
 
 .PP
 .B Extract options
@@ -540,13 +560,13 @@
 Do not apply patches at the end of the extraction.
 .
 .SS Format: 3.0 (custom)
-This format is particular. It doesn't represent a real source package
+This format is special. It doesn't represent a real source package
 format but can be used to create source packages with arbitrary files.
 .PP
 .B Build options
 .PP
 All non-option arguments are taken as files to integrate in the
-generated source package. They must exist and are preferrably
+generated source package. They must exist and are preferably
 in the current directory. At least one file must be given.
 .TP
 .BI \-\-target\-format= value
@@ -570,15 +590,15 @@
 .PP
 Note that by default the new repository will have the same branch checked
 out that was checked out in the original source. (Typically "master", but
-it could be anything.) Any other branches will be available, under as
-`remotes/origin/`
+it could be anything.) Any other branches will be available under
+`remotes/origin/`.
 .PP
 .B Building
 .PP
 Before going any further, some checks are done to ensure that we
 don't have any non-ignored uncommitted changes.
 .PP
-\fBgit-bundle\fP(1) is used to generate a bundle of the git repository.
+\fBgit\-bundle\fP(1) is used to generate a bundle of the git repository.
 By default, all branches and tags in the repository are included in the
 bundle.
 .PP
@@ -589,7 +609,7 @@
 the default behavior of including all branches and tags. May be specified
 multiple times. The \fIref\fP can be the name of a branch or tag to
 include. It may also be any parameter that can be passed to
-\fBgit-rev-list\fP(1). For example, to include only
+\fBgit\-rev\-list\fP(1). For example, to include only
 the master branch, use \-\-git\-ref=master. To include all tags and
 branches, except for the private branch, use \-\-git\-ref=\-\-all
 \-\-git\-ref=^private
@@ -619,12 +639,12 @@
 The file \fBdebian/source/format\fP should always exist and indicate the
 desired source format. For backwards compatibility, format "1.0" is
 assumed when the file doesn't exist but you should not rely on this:
-at some point in the future dpkg-source will be modified to fail when that
+at some point in the future dpkg\-source will be modified to fail when that
 file doesn't exist.
 
 The rationale is that format "1.0" is no longer the recommended format,
 you should usually pick one of the newer formats ("3.0 (quilt)", "3.0
-(native)") but \fBdpkg-source\fP will not do this automatically for you.
+(native)") but \fBdpkg\-source\fP will not do this automatically for you.
 If you want to continue using the old format, you should be explicit about
 it and put "1.0" in \fBdebian/source/format\fP.
 .SS the diff modifies the following upstream files
@@ -653,7 +673,7 @@
 This file contains on a single line the format that should be used to
 build the source package (possible formats are described above). No leading
 or trailing spaces are allowed.
-.SS debian/source/include-binaries
+.SS debian/source/include\-binaries
 This file contains a list of binary files (one per line) that should be
 included in the debian tarball. Leading and trailing spaces are stripped.
 Lines starting with "#" are comments and are skipped. Empty lines are ignored.
@@ -670,22 +690,26 @@
 around the "=" symbol and optional quotes are allowed around the value.
 Here's an example of such a file:
 .P
-  # let dpkg-source create a debian.tar.bz2 with maximal compression
+  # let dpkg\-source create a debian.tar.bz2 with maximal compression
   compression = "bzip2"
-  compression-level = 9
-  # use debian/patches/debian-changes as automatic patch
-  single-debian-patch
+  compression\-level = 9
+  # use debian/patches/debian\-changes as automatic patch
+  single\-debian\-patch
+  # ignore changes on config.{sub,guess}
+  extend-diff-ignore = "(^|/)(config\.sub|config\.guess)$"
 .P
 Note: \fBformat\fR options are not accepted in this file, you should
 use \fBdebian/source/format\fR instead.
-.SS debian/source/local-options
+.SS debian/source/local\-options
 Exactly like \fBdebian/source/options\fP except that the file is not
 included in the generated source package. It can be useful to store
 a preference tied to the maintainer or to the VCS repository where
 the source package is maintained.
-.SS debian/source/patch-header
+.SS debian/source/local\-patch\-header
+.SS debian/source/patch\-header
 Free form text that is put on top of the automatic patch generated
-in formats "2.0" or "3.0 (quilt)".
+in formats "2.0" or "3.0 (quilt)". \fBlocal\-patch\-header\fP is not
+included in the generated source package while \fBpatch\-header\fP is.
 .SS debian/patches/series
 This file lists all patches that have to be applied (in the given order)
 on top of the upstream source package. Leading and trailing spaces are
@@ -708,7 +732,7 @@
 .br
 Copyright \(co 2000 Wichert Akkerman
 .br
-Copyright \(co 2008-2010 Rapha\[:e]l Hertzog
+Copyright \(co 2008-2011 Rapha\[:e]l Hertzog
 .sp
 This is free software; see the GNU General Public Licence version 2 or later
 for copying conditions. There is NO WARRANTY.
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-split.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-split.1
--- dpkg/man/dpkg-split.1	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-split.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,12 +1,11 @@
 .\" Authors: Ian Jackson
-.TH dpkg\-split 1 "2011-04-28" "Debian Project" "dpkg utilities"
+.TH dpkg\-split 1 "2011-07-04" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-split \- Debian package archive split/join tool
 .
 .SH SYNOPSIS
 .B dpkg\-split
-.RI [ options ]
-.I command
+.RI [ option "...] " command
 .
 .SH DESCRIPTION
 .B dpkg\-split
@@ -99,8 +98,8 @@
 .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.
+will exit with status \fB1\fP; if some other trouble occurs then it will
+exit with status \fB2\fP.
 
 The
 .BR \-\-output " or " \-o
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-statoverride.8 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-statoverride.8
--- dpkg/man/dpkg-statoverride.8	2011-03-01 14:31:03.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-statoverride.8	2012-06-07 10:11:09.426073000 -0700
@@ -1,11 +1,10 @@
-.TH dpkg\-statoverride 8 "2009-06-26" "Debian project" "dpkg utilities"
+.TH dpkg\-statoverride 8 "2011-07-04" "Debian project" "dpkg utilities"
 .SH NAME
 dpkg\-statoverride \- override ownership and mode of files
 .
 .SH SYNOPSIS
 .B dpkg\-statoverride
-.RI [ options ]
-.I command
+.RI [ option "...] " command
 .
 .SH DESCRIPTION
 `\fBstat overrides\fR' are a way to tell
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-trigger.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-trigger.1
--- dpkg/man/dpkg-trigger.1	2011-03-01 14:31:03.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-trigger.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,4 +1,4 @@
-.TH dpkg\-trigger 1 "2009-03-15" "Debian Project" "dpkg suite"
+.TH dpkg\-trigger 1 "2011-08-14" "Debian Project" "dpkg suite"
 .SH NAME
 dpkg\-trigger \- a package trigger utility
 .
@@ -25,9 +25,9 @@
 .TP
 .BR \-\-check\-supported
 Check if the running \fBdpkg\fP supports triggers (usually called from a
-postinst). Will exit 0 if a triggers-capable \fBdpkg\fP has run, or 1 with
-an error message to stderr if not. Normally, however, it is better just to
-activate the desired trigger with \fBdpkg\-trigger\fP.
+postinst). Will exit \fB0\fP if a triggers-capable \fBdpkg\fP has run,
+or \fB1\fP with an error message to stderr if not. Normally, however,
+it is better just to activate the desired trigger with \fBdpkg\-trigger\fP.
 .TP
 .BR \-h ", " \-\-help
 Show the usage message and exit.
@@ -43,7 +43,7 @@
 .TP
 .BR \-\-by\-package=\fIpackage\fR
 Override trigger awaiter (normally set by \fBdpkg\fP through the
-DPKG_MAINTSCRIPT_PACKAGE environment variable of the maintainer scripts,
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP environment variable of the maintainer scripts,
 naming the package to which the script belongs, and this will be used
 by default).
 .TP
@@ -64,5 +64,6 @@
 be used as the dpkg data directory.
 .
 .SH SEE ALSO
-.BR dpkg "(1), " deb-triggers "(5), " /usr/share/doc/dpkg-dev/triggers.txt.gz .
-
+.BR dpkg (1),
+.BR deb\-triggers (5),
+.BR /usr/share/doc/dpkg\-dev/triggers.txt.gz .
diff -uNr --exclude .git --exclude .bzr dpkg/man/dpkg-vendor.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-vendor.1
--- dpkg/man/dpkg-vendor.1	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dpkg-vendor.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,4 +1,4 @@
-.TH dpkg\-vendor 1 "2009-05-10" "Debian Project" "dpkg suite"
+.TH dpkg\-vendor 1 "2011-07-04" "Debian Project" "dpkg suite"
 .SH NAME
 dpkg\-vendor \- queries information about distribution vendors
 .
@@ -14,11 +14,11 @@
 .SH COMMANDS
 .TP
 .BI \-\-is " vendor"
-Exits with 0 if the current vendor is \fIvendor\fP. Otherwise exits
+Exits with \fB0\fP if the current vendor is \fIvendor\fP. Otherwise exits
 with non-zero.
 .TP
 .BI \-\-derives\-from " vendor"
-Exits with 0 if the current vendor distribution is a derivative of
+Exits with \fB0\fP if the current vendor distribution is a derivative of
 \fIvendor\fP, otherwise exits with non-zero. It uses the "Parent" field
 to browse all ancestors of the current vendor.
 .TP
@@ -36,7 +36,7 @@
 .TP
 .BI \-\-vendor " vendor"
 Assumes the current vendor is \fIvendor\fP instead of discovering it
-with the DEB_VENDOR environment variable or
+with the \fBDEB_VENDOR\fP environment variable or
 \fB/etc/dpkg/origins/default\fP.
 .
 .SH ENVIRONMENT
diff -uNr --exclude .git --exclude .bzr dpkg/man/dselect.1 /home/vorlon/devel/multiarch/dpkg-debian/man/dselect.1
--- dpkg/man/dselect.1	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dselect.1	2012-06-07 10:11:09.426073000 -0700
@@ -1,18 +1,10 @@
-.TH dselect 1 "2010-03-07" "Debian Project" "Debian"
+.TH dselect 1 "2011-08-14" "Debian Project" "Debian"
 .SH NAME
 dselect \- Debian package management frontend
 .
 .SH SYNOPSIS
 .B dselect
-.RB [ \-\-admindir
-.IR <directory> ]
-.RB [ \-\-help ]
-.RB [ \-\-version ]
-.RB [ \-\-expert ]
-.RB [ \-\-debug | \-D\fI<file>\fP ]
-.RI [ <action> ]
-.RB [ \-\-colour | \-\-color
-.IR screenpart: [ foreground ],[ background ][ :attr [ +attr+.. ]]]
+.RI [ option "...] [" action ]
 .
 .SH DESCRIPTION
 .B dselect
@@ -38,25 +30,25 @@
 Normally \fBdselect\fP 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
+command line parameters are still available to modify the running behaviour
 of \fBdselect\fP or show additional information about the program.
 .
 .SH OPTIONS
-All options can be specified both on the commandline and in the \fBdselect\fP
+All options can be specified both on the command line and in the \fBdselect\fP
 configuration file \fI/etc/dpkg/dselect.cfg\fP or the files on the
-configuration directory \fI/etc/dpkg/dpkg.cfg.d/\fP. Each line in the
+configuration directory \fI/etc/dpkg/dselect.cfg.d/\fP. 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
+command line option but without leading dashes) or a comment (if it starts
 with a \fB#\fR).
 .br
 .TP
-.BI \-\-admindir " <directory>"
+.BI \-\-admindir " directory"
 Changes the directory where the dpkg `\fIstatus\fP', `\fIavailable\fP' and
 similar files are located. This defaults to \fI/var/lib/dpkg\fP
 and normally there shouldn't be any need to change it.
 .TP
-.BI \-\-debug " <file> \fR|\fP " \-D <file>
-Turn on debugging. Debugging information is sent to \fI<file>\fP.
+.BI \-\-debug " file \fR|\fP " \-D file
+Turn on debugging. Debugging information is sent to \fIfile\fP.
 .TP
 .B \-\-expert
 Turns on expert mode, i.e. doesn't display possibly annoying help
@@ -125,19 +117,20 @@
 .B \-\-version
 Print version information and exit successfully.
 .
-.SH USAGE
+.SH ACTIONS
 When
 .B dselect
-is started interactively, it prompts the user with a menu of available
-actions:
+is started it can perform the following actions, either directly if it
+was specified on the command line or by prompting the user with a menu
+of available actions if running interactively:
 .SS access
 Choose and configure an access method to access package repositories.
 .sp
 By default, \fBdselect\fP provides several methods such
-as \fIfloppy\fP, \fIharddisk\fP or \fIcdrom\fP, but other packages
-may provide additional methods, eg. the \fIapt\fP access method provided
-by the \fBapt\fP package or \fImulti_cd\fP by the \fBdpkg\-multicd\fP
-package.
+as \fIcdrom\fP, \fImulti_cd\fP, \fInfs\fP, \fImulti_nfs\fP, \fIharddisk\fP,
+\fImounted\fP, \fImulti_mount\fP, \fIfloppy\fP or \fIftp\fP, but other
+packages may provide additional methods, eg. the \fIapt\fP access method
+provided by the \fBapt\fP package.
 .sp
 The use of the \fIapt\fP access method is strongly recommended.
 .sp
diff -uNr --exclude .git --exclude .bzr dpkg/man/dselect.cfg.5 /home/vorlon/devel/multiarch/dpkg-debian/man/dselect.cfg.5
--- dpkg/man/dselect.cfg.5	2010-12-23 19:46:44.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/dselect.cfg.5	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
-.TH dselect.cfg 5 "2009-09-05" "Debian Project" "dpkg suite"
+.TH dselect.cfg 5 "2011-07-03" "Debian Project" "dpkg suite"
 .SH NAME
 dselect.cfg \- dselect configuration file
 .
 .SH DESCRIPTION
 This file contains default options for dselect. Each line contains a
-single option which is exactly the same as a normal commandline
+single option which is exactly the same as a normal command line
 option for dselect except for the leading dashes which are not used
 here. Quotes surrounding option values are stripped. Comments are
 allowed by starting a line with a hash sign ("\fB#\fR").
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/deb.5 /home/vorlon/devel/multiarch/dpkg-debian/man/es/deb.5
--- dpkg/man/es/deb.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/deb.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,81 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb 5 2011\-08\-14 "Proyecto Debian" Debian
+.SH NOMBRE
+deb \- Formato de paquete binario de Debian
+.SH SINOPSIS
+\fInombre\-fichero\fP\fB.deb\fP
+.SH DESCRIPCIN
+El formato \fB.deb\fP es el empleado para los paquetes binarios de Debian. La
+versin 0.93.76 de dpkg y posteriores son compatibles con este formato, y
+dpkg lo genera por omisin desde la versin 1.2.0, y en todas las versiones
+i386/ELF desde 1.1.1elf.
+.PP
+El formato descrito aqu se usa desde Debian 0.93; los detalles sobre el
+anterior formato se describen en \fBdeb\-old\fP(5).
+.SH FORMATO
+El fichero es un archivo \fBar\fP con un valor mgico de
+\fB!<arch>\fP. Los nombres de fichero pueden contener una barra al
+final.
+.PP
+Los archivos \fBtar\fP compatibles son el viejo formato (v7), el formato
+pre\-POSIX ustar, un subconjunto del formato GNU (slo los nombres de ruta y
+de enlace largos del nuevo estilo, compatible con dpkg desde la versin
+1.4.1.17), y el formato POSIX ustar (compatible con nombres largos desde
+dpkg 1.15.0). Las marcas de tipo de tar que no se reconozcan se toman como
+un error.
+.PP
+El primer miembro se llama \fBdebian\-binary\fP y contiene una serie de lneas
+separadas por saltos de lnea. Actualmente slo hay una lnea, el nmero de
+versin del formato, \fB2.0\fP en el momento en que se escribi esta pgina de
+manual. Los programas que lean archivos con el formato nuevo deberan prever
+un aumento de los nmeros menores y la aparicin de nuevas lneas, las
+cuales deberan ignorar en caso de aparecer.
+.PP
+Si el nmero mayor ha cambiado es que hay cambios incompatibles y el
+programa se debera detener. De no ser as debera poder seguir sin
+problemas, a no ser que se encuentre un miembro no esperado en el archivo
+(excepto al final), como se describe ms abajo.
+.PP
+El segundo miembro obligatorio es \fBcontrol.tar.gz\fP. Es un archivo tar
+comprimido con gzip que contiene la informacin de control del paquete en
+una serie de ficheros de texto, de los cuales \fBcontrol\fP es obligatorio y
+contiene la informacin de control principal. Opcionalmente, el fichero tar
+de control puede contener una entrada para \fB.\fP, el directorio actual.
+.PP
+El tercer y ltimo miembro obligatorio se llama \fBdata.tar\fP. Contiene el
+sistema de ficheros como un archivo tar, el cual puede estar descomprimido
+(compatible desde la versin 1.10.24 de dpkg) o comprimido con gzip
+(extensin \fB.gz\fP), xz (extensin \fB.xz\fP, compatible desde la versin
+1.15.6), bzip2 (extensin \fB.bz2\fP, compatible desde la versin 1.10.24 de
+dpkg) o lzma (extensin \fB.lzma\fP, compatible desde la versin 1.13.25 de
+dpkg).
+.PP
+Estos miembros deben aparecer en este mismo orden. Las implementaciones
+actuales deberan ignorar cualquier miembro adicional despus de
+\fBdata.tar\fP. Se podran definirse nuevos miembros en el futuro, y se
+pondrn, si es posible, despus de stos tres. Cualquier miembro adicional
+que se tuviese que insertar antes de \fBdata.tar\fP, y que los programas ms
+antiguos puedan ignorar, tendr un nombre que comience con un guin bajo,
+\fB_\fP.
+.PP
+Los nuevos miembros que no se puedan ignorar sin problemas se insertarn
+antes de \fBdata.tar\fP, con nombres que empiecen por algo que no sea un guin
+bajo, o (posiblemente) causarn un incremento del nmero mayor de versin.
+.SH "VASE TAMBIN"
+\fBdeb\-old\fP(5), \fBdpkg\-deb\fP(1), \fBdeb\-control\fP(5).
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/deb-extra-override.5 /home/vorlon/devel/multiarch/dpkg-debian/man/es/deb-extra-override.5
--- dpkg/man/es/deb-extra-override.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/deb-extra-override.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,50 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-extra\-override 5 "16 de Agosto de 2008" "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+deb\-extra\-override \- Fichero de sustituciones adicional de archivo de Debian
+.
+.SH SINOPSIS
+override
+.
+.SH DESCRIPCIN
+Mientras que puede encontrar la mayora de la informacin de un paquete
+binario o fuente en el fichero control/.dsc, puede sustituir todo su
+contenido al exportarlo a los ficheros Packages y Sources. El fichero
+override adicional (i.e. override.lenny.extra.gz) contiene tales
+sustituciones.
+.PP
+El fichero override adicional tiene un formato simple, delimitado por
+espacios en blanco. Se permiten comentarios precedidos de \fB#\fP.
+.PP
+.in +5
+\fIpaquete\fP \fInombre\-del\-campo\fP \fIvalor\fP
+.in -5
+.PP
+\fIpaquete\fP es el nombre del paquete binario o fuente.
+.PP
+\fInombre\-del\-campo\fP es el nombre del campo a sustituir, y \fIvalor\fP es el
+valor a insertar en el campo. Puede contener espacios ya que la lnea se
+divide en al menos 3 columnas durante el anlisis.
+.PP
+Los ficheros override adicionales que se usan para hacer las listas de
+paquetes oficiales suelen encontrarse en el directorio \fIindices\fP de
+cualquier rplica de Debian.
+.
+.SH "VASE TAMBIN"
+\fBdpkg\-scanpackages\fP(1), \fBdpkg\-scansources\fP(1), \fBapt\-ftparchive\fP(1).
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/deb-old.5 /home/vorlon/devel/multiarch/dpkg-debian/man/es/deb-old.5
--- dpkg/man/es/deb-old.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/deb-old.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,59 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-old 5 2011\-08\-14 "Proyecto Debian" Debian
+.SH NOMBRE
+deb\-old \- Antiguo formato de paquete binario de Debian
+.
+.SH SINOPSIS
+\fInombre\-fichero\fP\fB.deb\fP
+.
+.SH DESCRIPCIN
+El formato \fB.deb\fP es el formato de fichero de paquete binario de Debian.
+Esta pgina de manual describe el formato \fBantiguo\fP, usado previamente a la
+versin 0.93 de Debian. Consulte el manual \fBdeb\fP(5) para ms detalles sobre
+el nuevo formato.
+.
+.SH FORMATO
+El fichero est formado por dos lineas con informacin del formato en texto
+ASCII, seguido por dos ficheros ustar concatenados y comprimidos va gzip.
+.PP
+La primera lnea indica la versin del formato completada con 0 hasta cubrir
+8 dgitos, y es \fB0.939000\fP para todos los archivos con formato antiguo.
+.PP
+La segunda lnea es un nmero decimal (sin ceros precedentes) que indica el
+tamao del primer fichero tar comprimido con gzip.
+.PP
+Cada lnea finaliza con un nico carcter de nueva lnea.
+.PP
+El primer fichero tar contiene la informacin de control como un conjunto de
+ficheros comunes. El fichero \fBcontrol\fP debe estar presente, ya que contiene
+la informacin de control bsica.
+.PP
+En algunos archivos muy antiguos, los ficheros de control en el fichero tar
+pueden estar opcionalmente en un subdirectorio \fBDEBIAN\fP. En este caso, el
+subdirectorio \fBDEBIAN\fP estar tambin en el fichero tar de control, y el
+fichero tar de control tendr solamente archivos en este directorio. De
+forma opcional, el fichero tar podr contener una entrada para \fB.\fP, esto
+es, el directorio actual.
+.PP
+El segundo fichero tar comprimido con gzip es el archivo del sistema de
+ficheros, que contiene las rutas relativas al directorio raz del sistema
+donde se instalar. Los nombres de ruta no tienen barras precedentes.
+.
+.SH "VASE TAMBIN"
+\fBdeb\fP(5), \fBdpkg\-deb\fP(1), \fBdeb\-control\fP(5).
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/deb-override.5 /home/vorlon/devel/multiarch/dpkg-debian/man/es/deb-override.5
--- dpkg/man/es/deb-override.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/deb-override.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,70 @@
+.\" This manpage is copyright (C) 1996 Michael Shields <shields@crosslink.net>.
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-override 5 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+deb\-override \- Fichero de sustituciones de archivo de Debian
+.
+.SH SINOPSIS
+override
+.
+.SH DESCRIPCIN
+Mientras que la mayora de la informacin acerca de los paquetes se
+encuentra en el fichero de control parte de esta informacin se debe
+rellenar por los encargados de planificar la distribucin, en lugar de los
+responsables de los paquetes, ofreciendo as una mayor consistencia
+global. Esta informacin se encuentra en el fichero override
+(sustitucin).
+.PP
+El fichero override tiene un formato simple, delimitado por espacios en
+blanco. Se permiten comentarios precedidos de \fB#\fP.
+.PP
+.in +5
+\fIpaquete\fP \fIprioridad\fP \fIseccin\fP [\fIinformacin\-del\-mantenedor\fP]
+.in -5
+.PP
+\fIpaquete\fP El nombre del paquete. Se ignorarn las entradas en el fichero
+override de paquetes no encontrados en el rbol de paquetes binarios.
+.PP
+\fIprioridad\fP y \fIseccin\fP se corresponden con sus respectivos campos de
+control disponibles en el .deb. Los valores permitidos se listan en el
+Manual de Normas de Debian.
+.PP
+De estar presente \fIinformacin\-del\-mantenedor\fP, puede ser el nombre del
+responsable de un override incondicional, o bien \fIantiguo\-mantenedor\fP
+\fB=>\fP \fInuevo\-mantenedor\fP para hacer una sustitucin.
+.PP
+Puede encontrar los ficheros override que se usan para hacer las listas
+Packages oficiales en el directorio \fIindices\fP de cualquier rplica de
+Debian.
+.
+.SH "VASE TAMBIN"
+\fBdpkg\-scanpackages\fP(1), \fBdpkg\-scansources\fP(1), \fBapt\-ftparchive\fP(1),
+\fB/usr/share/doc/debian\-policy/policy.html/index.html\fP.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/deb-shlibs.5 /home/vorlon/devel/multiarch/dpkg-debian/man/es/deb-shlibs.5
--- dpkg/man/es/deb-shlibs.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/deb-shlibs.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,68 @@
+.\" Copyright © 1996 Michael Shields <shields@crosslink.net>
+.\" Copyright © 2008 Zack Weinberg <zackw@panix.com>
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-shlibs 5 "17 de Febrero de 2009" "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+deb\-shlibs \- Fichero de informacin de bibliotecas compartidas de Debian
+.
+.SH DESCRIPCIN
+.PP
+\fBshlibs\fP crea una correlacin entre los nombres y versiones de bibliotecas
+compartidas (\fIsonames\fP) y las dependencias, de manera adecuada para su
+inclusin en el fichero de control del paquete. Se inserta una entrada por
+lnea, y las lneas vacas \fBno\fP estn permitidas. Las lneas que empiezan
+con un carcter \fB#\fP se consideran comentarios, y se ignorarn. Todas las
+dems lneas deben seguir el formato
+.IP
+[\fItype\fP\fB:\fP] \fIlibrary\fP \fIversion\fP \fIdependencies\fP
+.PP
+Los campos \fIbiblioteca\fP y \fIversin\fP se delimitan con espacios en blanco,
+pero el campo de las \fIdependencias\fP se extiende hasta el fin de lnea. El
+campo \fItipo\fP es opcional, y habitualmente innecesario.
+.PP
+Consulte el Manual de Normas de Debian para ms detalles.
+.
+.SH EJEMPLOS
+.PP
+El aspecto de un fichero \fBshlibs\fP para un paquete tpico de bibliotecas
+llamado \fIlibcrunch1\fP, el cual proporciona una biblioteca cuyo soname es
+I\fIlibcrunch.so.1\fP, podra ser
+.IP
+libcrunch 1 libcrunch1 (>= 1.2\-1)
+.PP
+Las \fIdependencias\fP deben mencionar la versin ms reciente del paquete que
+aadi smbolos nuevos a la biblioteca: en el ejemplo anterior, les
+aadieron smbolos nuevos en la versin 1.2 de \fIlibcrunch\fP. Esta no es la
+nica razn por la que se deben reforzar las relaciones de dependencia; una
+vez ms, consulte el Manual de Normas de Debian para ms detalles.
+.
+.SH "VASE TAMBIN"
+\fBdpkg\-shlibdeps\fP(1), \fBdeb\-symbols\fP(5).
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/deb-substvars.5 /home/vorlon/devel/multiarch/dpkg-debian/man/es/deb-substvars.5
--- dpkg/man/es/deb-substvars.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/deb-substvars.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,157 @@
+.\" Authors: Ian Jackson
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-substvars 5 "15 de Julio de 2009" "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+deb\-substvars \- Sustitucin de variables de fuentes de Debian
+.
+.SH SINOPSIS
+substvars
+.
+.SH DESCRIPCIN
+Antes de que \fBdpkg\-source\fP, \fBdpkg\-gencontrol\fP y \fBdpkg\-genchanges\fP
+escriban su informacin de control (al fichero \fB.dsc\fP de control en el caso
+de \fBdpkg\-source\fP, y a la salida estndar en el de \fBdpkg\-gencontrol\fP y
+\fBdpkg\-genchanges\fP), realizan algunas sustituciones de variables en el
+fichero de salida.
+
+Una sustitucin de variable tiene la forma
+\fB${\fP\fInombre\-de\-variable\fP\fB}\fP. Los nombres de variable consisten de
+caracteres alfanumricos, guiones y dos puntos (:), y comienzan siempre con
+un carcter alfanumrico. La sustitucin de variables se lleva a cabo
+repetidamente hasta que no queda ninguna; el texto completo del campo tras
+la sustitucin se revisa de nuevo en busca de ms sustituciones.
+
+Despus de que todas las sustituciones hayan tenido lugar, cada aparicin de
+la cadena \fB${}\fP (que no es una sustitucin legal) se reemplaza por un signo
+\fB$\fP.
+
+A pesar de que la sustitucin de variables se realiza sobre todos los
+campos, algunos de estos campos se usan obligatoriamente durante la
+construccin, cuando la sustitucin an no se ha ejecutado. Por ello, no
+puede usar variables en los campos \fBPackage\fP, \fBSource\fP y \fBArchitecture\fP.
+
+La sustitucin de variables se ejecuta sobre el contenido de los campos
+despus de su anlisis, y por ello no necesita incluir un espacio despus de
+la nueva lnea para expandir una variable sobre varias lneas. Esto se hace
+implcitamente cuando el campo se muestra por la salida. Por ejemplo, si la
+variable \fB${Description}\fP est definida como foo es bar.${Newline}foo es
+increble. y tiene el siguiente campo:
+
+ Description: aplicacin foo
+  ${Description}
+  .
+  Ms texto.
+
+El resultado sera:
+
+ Description: aplicacin foo
+  foo es bar.
+  foo es increble.
+  .
+  Ms texto.
+
+Las variables se pueden definir usando la opcin comn \fB\-V\fP. Tambin se
+pueden especificar en el fichero \fBdebian/substvars\fP (u otro fichero
+especificado mediante la opcin \fB\-T\fP). Este fichero consiste de lneas con
+la forma \fInombre\fP\fB=\fP\fIvalor\fP. Los caracteres en blanco al final de cada
+lnea, las lneas vacas y las lneas que comiencen con el smbolo \fB#\fP
+(comentarios) son ignorados.
+
+De manera adicional, las siguientes variables estndar estn disponibles:
+.TP 
+\fBArch\fP
+La arquitectura de construccin actual (de \fBdpkg \-\-print\-architecture\fP).
+.TP 
+\fBsource:Version\fP
+La versin del paquete fuente.
+.TP 
+\fBsource:Upstream\-Version\fP
+La versin del paquete del autor original, incluyendo la versin epoch de
+Debian, de existir.
+.TP 
+\fBbinary:Version\fP
+La versin del paquete binario (puede ser distinto de source:Version, por
+ejemplo, con un NMU binario).
+.TP 
+\fBSource\-Version\fP
+La versin del paquete fuente (del fichero de registro de cambios). Esta
+variable est \fBobsoleta\fP, ya que su significado difiere de su funcin. Use
+\fBsource:Version\fP o \fBbinary:Version\fP segn requiera la ocasin.
+.TP 
+\fBInstalled\-Size\fP
+El tamao total de los ficheros del paquete ya instalado. Este valor se
+copia al campo del fichero de control correspondiente; definirlo modifica el
+valor de dicho campo. Si la variable no est definida, \fBdpkg\-gencontrol\fP
+usar \fBdu \-k debian/tmp\fP para hallar el valor predefinido.
+.TP 
+\fBExtra\-Size\fP
+El espacio en disco adicional usado cuando se instala el paquete. Si se
+define esta variable, su valor se aade al de la variable \fBInstalled\-Size\fP
+(tanto si se establece manualmente como si se usa el valor predefinido)
+antes de copiarse al campo \fBInstalled\-Size\fP del fichero de control.
+.TP 
+\fBF:\fP\fInombre\-campo\fP
+El valor de la salida del campo \fInombre\-campo\fP (que se debe proporcionar
+siguiendo la convencin de maysculas y minsculas). Definir estas variables
+no tiene ningn efecto excepto en aquellos lugares donde se expandan
+explcitamente.
+.TP 
+\fBFormat\fP
+El formato del fichero \fB.changes\fP generado por esta versin de los scripts
+de empaquetado de fuentes. Si define esta variable, el contenido del campo
+\fBFormat\fP en el fichero \fB.changes\fP cambiar igualmente.
+.TP 
+\fBNewline\fP, \fBSpace\fP, \fBTab\fP
+Estas variables contienen cada una el carcter cuyo nombre especifican en
+ingls. Nota del traductor: Newline = Retorno de lnea, Space = Espacio, Tab
+= Tabulador.
+.TP 
+\fBshlibs:\fP\fIcampo\-de\-dependencia\fP
+Las variables con nombres de esta forma se generan mediante
+\fBdpkg\-shlibdeps\fP.
+.TP 
+\fBdpkg:Upstream\-Version\fP
+La versin de la fuente original de dpkg.
+.TP 
+\fBdpkg:Version\fP
+La versin completa de dpkg.
+.LP
+Si se hace referencia a una variable pero no se define se genera un aviso y
+se asume un valor vaco.
+.
+.SH FICHEROS
+.TP 
+\fBdebian/substvars\fP
+Lista de variables a sustituir y valores.
+.
+.SH FALLOS
+No est claro el punto en el cual se produce la sustitucin de campos,
+comparado con ciertas opciones de los campos de salida estndar.
+
+.SH "VASE TAMBIN"
+\fBdpkg\fP(1), \fBdpkg\-genchanges\fP(1), \fBdpkg\-gencontrol\fP(1),
+\fBdpkg\-shlibdeps\fP(1), \fBdpkg\-source\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg.1
--- dpkg/man/es/dpkg.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,792 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg \- Gestor de paquetes de Debian
+.
+.SH SINOPSIS
+\fBdpkg\fP [\fIoption\fP...] \fIaction\fP
+.
+.SH AVISO
+El propsito de este manual es que los usuarios entiendan las opciones de
+invocacin de \fBdpkg\fP y el estado de los paquetes con ms detalle que la que
+ofrece \fBdpkg \-\-help\fP.
+
+Los responsables de paquetes \fIno\fP deberan usar \fBdpkg \-\-help\fP para
+comprender el proceso de instalacin de \fBdpkg\fP. Las descripciones de lo que
+hace \fBdpkg\fP al instalar y desinstalar son particularmente imprecisas.
+.
+.SH DESCRIPCIN
+\fBdpkg\fP es una herramienta para instalar, compilar, eliminar y manipular los
+paquetes de Debian. La interfaz principal y ms intuitiva para \fBdpkg\fP es
+\fBaptitude\fP(1). \fBdpkg\fP se invoca con parmetros de lnea de rdenes, que
+consisten de una sola accin y cero o ms opciones. La accin o parmetro
+dice a \fBdpkg\fP qu hacer, mientras que las opciones controlan de una manera
+u otra su comportamiento.
+
+\fBdpkg\fP can also be used as a front\-end to \fBdpkg\-deb\fP(1) and
+\fBdpkg\-query\fP(1). The list of supported actions can be found later on in the
+\fBACTIONS\fP section. If any such action is encountered \fBdpkg\fP just runs
+\fBdpkg\-deb\fP or \fBdpkg\-query\fP with the parameters given to it, but no
+specific options are currently passed to them, to use any such option the
+back\-ends need to be called directly.
+.
+.SH "INFORMACIN SOBRE PAQUETES"
+\fBdpkg\fP posibilita el acceso a bastante informacin sobre los paquetes
+disponibles. Esta informacin se divide en tres clases: \fBestados\fP,
+\fBestados de seleccin\fP e \fBindicadores\fP. Habitualmente, estos valores se
+modifican principalmente con \fBdselect\fP.
+.SS "ESTADOS DEL PAQUETE"
+.TP 
+\fBnot\-installed\fP
+El paquete no est instalado en el sistema.
+.TP 
+\fBconfig\-files\fP
+Slo quedan los ficheros de configuracin del paquete en el sistema.
+.TP 
+\fBhalf\-installed\fP
+Se inici la instalacin del paquete, pero no se complet por alguna razn.
+.TP 
+\fBunpacked\fP
+El paquete est descomprimido, pero no configurado.
+.TP 
+\fBhalf\-configured\fP
+El paquete est descomprimido y la configuracin se ha iniciado, pero no
+finaliz por alguna razn.
+.TP 
+\fBtriggers\-awaited\fP
+El paquete aguarda al proceso de los disparadores de otro paquete.
+.TP 
+\fBtriggers\-pending\fP
+Los disparadores del paquete se han activado.
+.TP 
+\fBinstalled\fP
+El paquete est correctamente desempaquetado y configurado.
+.SS "ESTADOS DE SELECCIN DEL PAQUETE"
+.TP 
+\fBinstall\fP
+El paquete se ha seleccionado para su instalacin.
+.TP 
+\fBhold\fP
+\fBdpkg\fP no modificar un paquete marcado con \fBhold\fP (retenido), a no ser
+que se le fuerce a ello con la opcin \fB\-\-force\-hold\fP.
+.TP 
+\fBdeinstall\fP
+El paquete se ha seleccionado para su desinstalacin (es decir, que queremos
+borrar todo excepto los ficheros de configuracin).
+.TP 
+\fBpurge\fP
+El paquete se ha seleccionado para que se purgue (es decir, que queremos
+borrar todo en los directorios del sistema, incluyendo los ficheros de
+configuracin).
+.SS "INDICADORES DEL PAQUETE"
+.TP 
+\fBreinst\-required\fP
+Un paquete marcado con \fBreinst\-required\fP est roto y precisa una
+reinstalacin. Estos paquetes no se pueden borrar a no ser que fuerce la
+accin con la opcin \fB\-\-force\-remove\-reinstreq\fP.
+.
+.SH ACCIONES
+.TP 
+\fB\-i\fP, \fB\-\-install\fP \fIpackage\-file\fP...
+Install the package. If \fB\-\-recursive\fP or \fB\-R\fP option is specified,
+\fIpackage\-file\fP must refer to a directory instead.
+
+La instalacin consiste de los siguientes pasos:
+.br
+
+\fB1.\fP Extraccin de los ficheros de control del paquete nuevo.
+.br
+
+\fB2.\fP De existir otra versin del mismo paquete en el sistema, se ejecuta el
+script \fIprerm\fP (pre\-eliminacin) del antiguo paquete.
+.br
+
+\fB3.\fP Ejecucin del script \fIpreinst\fP (pre\-instalacin) del paquete, de
+existir.
+.br
+
+\fB4.\fP Desempaquetado de los nuevos ficheros, a la vez que se crea una copia
+de seguridad de los antiguos para su restauracin en caso de fallo.
+.br
+
+\fB5.\fP De existir otra versin del mismo paquete previamente instalado en el
+sistema, se ejecutar el script \fIpostrm\fP (post\-eliminacin) del paquete
+antiguo. Tenga en cuenta que este script se ejecuta despus del script
+\fIpreinst\fP del paquete nuevo ya que los nuevos ficheros se escriben a la vez
+que se borran los antiguos.
+.br
+
+\fB6.\fP Configuracin del paquete. Para una informacin detallada sobre este
+proceso, consulte \fB\-\-configure\fP.
+.TP 
+\fB\-\-unpack \fP\fIpackage\-file\fP...
+Unpack the package, but don't configure it. If \fB\-\-recursive\fP or \fB\-R\fP
+option is specified, \fIpackage\-file\fP must refer to a directory instead.
+.TP 
+\fB\-\-configure \fP\fIpaquete\fP...|\fB\-a\fP|\fB\-\-pending\fP
+Configura un paquete que est desempaquetado pero no configurado. Si se
+introducen las opciones \fB\-a\fP o \fB\-\-pending\fP en lugar de un \fIpaquete\fP, se
+configurarn todos los paquetes desempaquetados pero no configurados.
+
+Para reconfigurar un paquete que ya fue configurado, pruebe la orden
+\fBdpkg\-reconfigure\fP(8).
+
+La configuracin consiste de los siguientes pasos:
+.br
+
+\fB1.\fP Desempaquetado de los ficheros de configuracin conffiles, a la vez
+se crea una copia de seguridad de los antiguos para su restauracin en caso
+de fallo.
+.br
+
+\fB2.\fP Ejecucin del script \fIpostinst\fP (post\-instalacin) del paquete, si
+existe.
+.TP 
+\fB\-\-triggers\-only\fP \fIpaquete\fP...|\fB\-a\fP|\fB\-\-pending\fP
+Procesa slo los disparadores. Todos los disparadores pendientes (pending)
+se procesarn a menos que especifique el(los) paquete(s), uno por uno de ser
+necesario. El uso de esta opcin puede dejar paquetes con los estados no
+deseados de \fBtriggers\-awaited\fP y \fBtriggers\-pending\fP. Puede arreglar esto
+ms tarde ejecutando \fBdpkg \-\-configure \-\-pending\fP.
+.TP 
+\fB\-r\fP, \fB\-\-remove\fP, \fB\-P\fP, \fB\-\-purge \fP\fIpaquete\fP...|\fB\-a\fP|\fB\-\-pending\fP
+Elimina un paquete instalado. Las opciones \fB\-r\fP y \fB\-\-remove\fP eliminan todo
+excepto los ficheros de configuracin conffiles. Esto puede evitar tener
+que configurar de nuevo el paquete si se reinstala despus (los conffiles
+son ficheros de configuracin listados en el fichero de control
+\fIDEBIAN/conffiles\fP). \fB\-P\fP o \fB\-\-purge\fP eliminan todo incluyendo los
+ficheros de configuracin conffile. De usar las opciones \fB\-a\fP y
+\fB\-\-pending\fP en lugar de un nombre de paquete, todos los que estn al menos
+desempaquetados pero marcados para su eliminacin o purgacin en
+\fI/var/lib/dpkg/status\fP se eliminarn o purgarn respectivamente. Nota:
+puede que \fBdpkg\fP desconozca algunos ficheros si su creacin y manipulacin
+ocurri aisladamente a travs de los scripts de configuracin. De ser as,
+\fBdpkg\fP no los eliminar directamente sino que el script \fIpostrm\fP del
+paquete (invocado por \fBdpkg\fP) ejecutar la eliminacin de estos ficheros
+durante la purgacin del paquete. Por supuesto, esto slo tiene efecto en
+los directorios de sistema, no sobre los ficheros de configuracin escritos
+en los directorios home/ de usuario.
+
+La eliminacin de un paquete consiste de los siguientes pasos:
+.br
+
+\fB1.\fP Ejecucin del script \fIprerm\fP.
+.br
+
+\fB2.\fP Eliminacin de los ficheros instalados.
+.br
+
+\fB3.\fP Ejecucin del script \fIpostrm\fP.
+.br
+.TP 
+\fB\-\-update\-avail\fP, \fB\-\-merge\-avail\fP \fIfichero\-Packages\fP
+Actualiza la lista de paquetes disponibles de \fBdpkg\fP y \fBdselect\fP. La
+accin \fB\-\-merge\-avail\fP combina la informacin antigua con la informacin
+del \fIfichero\-Packages\fP. El \fIfichero\-Packages\fP distribuido con Debian se
+llama simplemente \fIPackages\fP. El programa \fBdpkg\fP guarda un registro de los
+paquetes disponibles en \fI/var/lib/dpkg/available\fP.
+
+\fBdselect update\fP ofrece una manera sencilla y directa de obtener y
+actualizar el fichero \fIavailable\fP (disponible). Tenga en cuenta que el
+fichero es casi inservible si usa una interfaz basada en APT en lugar de
+\fBdselect\fP: APT tiene su propio sistema de registrar los paquetes
+disponibles.
+.TP 
+\fB\-A\fP, \fB\-\-record\-avail\fP \fIpackage\-file\fP...
+Update \fBdpkg\fP and \fBdselect\fP's idea of which packages are available with
+information from the package \fIpackage\-file\fP. If \fB\-\-recursive\fP or \fB\-R\fP
+option is specified, \fIpackage\-file\fP must refer to a directory instead.
+.TP 
+\fB\-\-forget\-old\-unavail\fP
+\fBObsoleta\fP, y una opcin inservible ya que \fBdpkg\fP olvidar automticamente
+los paquetes desinstalados no disponibles.
+.TP 
+\fB\-\-clear\-avail\fP
+Elimina la informacin sobre qu paquetes estn disponibles.
+.TP 
+ \fB\-C\fP, \fB\-\-audit\fP
+Busca paquetes que se hayan instalado parcialmente en el sistema. El
+programa \fBdpkg\fP sugerir qu hacer con ellos para hacerlos funcionar.
+.TP 
+\fB\-\-get\-selections\fP [\fIpatrn\-nombre\-paquete\fP...]
+Muestra la lista de selecciones de paquetes por la salida estndar. De no
+introducir un patrn se mostrar la lista de paquetes no instalados (esto
+es, previamente purgados) .
+.TP 
+\fB\-\-set\-selections\fP
+Set package selections using file read from stdin. This file should be in
+the format '\fIpackage\fP \fIstate\fP', where state is one of \fBinstall\fP, \fBhold\fP,
+\fBdeinstall\fP or \fBpurge\fP. Blank lines and comment lines beginning with '#'
+are also permitted.
+.TP 
+\fB\-\-clear\-selections\fP
+Define el estado deseado de todo paquete no esencial para su
+desinstalacin. La intencin es usar esto inmediatamente despus de
+\-\-set\-selections, para desinstalar todo paquete que no est en la lista
+introducida a \-\-set\-selections.
+.TP 
+\fB\-\-yet\-to\-unpack\fP
+Busca los paquetes seleccionados para su instalacin, pero que por alguna
+razn todava no se han instalado.
+.TP 
+.TP 
+\fB\-\-print\-architecture\fP
+Muestra la arquitectura de los paquetes que \fBdpkg\fP instala (por ejemplo,
+i386).
+.TP 
+\fB\-\-compare\-versions \fP\fIver1 op ver2\fP
+Compara los nmeros de versin, siendo \fIop\fP un operador binario. \fBdpkg\fP
+devuelve xito (cero) si la condicin especificada se cumple, y fallo (un
+resultado distinto de cero) en caso contrario. Hay dos grupos de operadores
+que difieren en su comportamiento cuando les falta alguno de los operandos,
+\fIver1\fP o \fIver2\fP. Los primeros tratan la falta de versin como la versin
+ms antigua posible: \fBlt le eq ne ge gt\fP. Los otros tratan la falta de
+versin como la ms moderna posible: \fBlt\-nl le\-nl ge\-nl gt\-nl\fP. stos se
+proporcionan slo por compatibilidad con la sintaxis del fichero de control:
+\fB< << <= = >= >> >\fP.
+.TP 
+\fB\-\-command\-fd \fP\fIn\fP
+Accept a series of commands on input file descriptor \fIn\fP. Note: additional
+options set on the command line, and through this file descriptor, are not
+reset for subsequent commands executed during the same run.
+.TP 
+\fB\-\-help\fP
+Muestra un resumen de las instrucciones de uso.
+.TP 
+\fB\-\-force\-help\fP
+Muestra la ayuda de las opciones \fB\-\-force\-\fP\fIalgo\fP.
+.TP 
+\fB\-Dh\fP, \fB\-\-debug=help\fP
+Muestra la ayuda de las opciones de depuracin.
+.TP 
+\fB\-\-version\fP
+Muestra la versin de \fBdpkg\fP.
+.TP 
+\fBdpkg\-deb actions\fP
+Consulte \fBdpkg\-deb\fP(1) para ms informacin sobre las siguientes acciones.
+
+.nf
+\fB\-b\fP | \fB\-\-build\fP \fIdirectorio\fP [\fIfichero\fP]
+    Construye un paquete Debian GNU/Linux.
+\fB\-c\fP | \fB\-\-contents\fP \fIfichero\fP
+    Muestra el contenido de un paquete Debian GNU/Linux.
+\fB\-e\fP | \fB\-\-control\fP \fIfichero\fP [\fIdirectorio\fP]
+    Extrae la informacin de control de un paquete.
+\fB\-x\fP | \fB\-\-extract\fP \fIfichero directorio\fP
+    Extrae los ficheros contenidos en el paquete.
+\fB\-X\fP, \fB\-\-vextract\fP \fIarchive directory\fP
+    Extrae y muestra los nombres de fichero que un
+    paquete contiene.
+\fB\-f\fP | \fB\-\-field\fP  \fIfichero\fP [\fIcampo\-control\fP] ...
+    Muestra el/los campo(s) de control de un paquete.
+\fB\-\-fsys\-tarfile\fP \fIfichero\fP
+    Muestra el fichero tar contenido en el paquete deb.
+\fBdpkg \-I\fP | \fB\-\-info\fP \fIfichero\fP [\fIfichero\-control\fP]
+    Muestra informacin sobre el paquete.
+.fi
+
+.TP 
+\fBdpkg\-query\-actions\fP
+Consulte \fBdpkg\-query\fP(1) para ms informacin sobre las siguientes
+acciones:
+
+.nf
+
+\fB\-l\fP | \fB\-\-list\fP \fIpatrn\-nombre\-paquete\fP ...
+    Lista los paquetes cuyo nombre encaja en el patrn dado.
+\fB\-s\fP | \fB\-\-status\fP \fInombre\-paquete\fP ...
+    Informa del estado del paquete especificado.
+\fB\-L\fP | \fB\-\-listfiles\fP \fIpaquete\fP ...
+    Lista los ficheros instalados en el sistema que pertenecen a
+    \fBpaquete\fP.
+\fB\-S\fP | \fB\-\-search\fP \fIpatrn\-bsqueda\-ficheros\fP ...
+    Busca un fichero en los paquetes instalados.
+\fB\-p\fP | \fB\-\-print\-avail\fP \fIpaquete\fP ...
+    Imprime informacin sobre el \fIpaquete\fP, extrada de
+    \fI/var/lib/dpkg/available\fP. Los usuarios de interfaces de APT
+    deberan usar \fBapt\-cache show\fP \fIpaquete\fP.
+.fi
+.
+.SH OPCIONES
+Todas las opciones se pueden definir en la lnea de rdenes, en el fichero
+de configuracin de \fBdpkg\fP \fI/etc/dpkg/dpkg.cfg\fP y en el directorio de
+configuracin \fI/etc/dpkg/dpkg.cfg.d/\fP. Cada lnea de este fichero es bien
+una opcin (exactamente la misma que en la lnea de rdenes, pero sin los
+guiones al principio) o bien un comentario (si empieza con \fB#\fP).
+.br
+.TP 
+\fB\-\-abort\-after=\fP\fInmero\fP
+Modifica cuntos errores llevan a \fBdpkg\fP a interrumpir el proceso. El valor
+por omisin es 50.
+.TP 
+\fB\-B\fP, \fB\-\-auto\-deconfigure\fP
+Al eliminar un paquete puede que otro dependa de l. Definir esta opcin
+producir la desconfiguracin automtica del paquete que dependa del
+paquete eliminado.
+.TP 
+\fB\-D\fP\fIoctal\fP\fB, \-\-debug=\fP\fIoctal\fP
+Activa el modo de depuracin. El parmetro \fIoctal\fP se forma uniendo los
+valores de la siguiente lista mediante la operacin \fIor\fP a nivel de bits
+(tenga en cuenta que estos valores podran cambiar en futuras
+versiones). \fB\-Dh\fP o \fB\-\-debug=help\fP muestran estos valores.
+
+    Number   Description
+         1   Generally helpful progress information
+         2   Invocation and status of maintainer scripts
+        10   Output for each file processed
+       100   Lots of output for each file processed
+        20   Output for each configuration file
+       200   Lots of output for each configuration file
+        40   Dependencies and conflicts
+       400   Lots of dependencies/conflicts output
+     10000   Trigger activation and processing
+     20000   Lots of output regarding triggers
+     40000   Silly amounts of output regarding triggers
+      1000   Lots of drivel about e.g. the dpkg/info dir
+      2000   Insane amounts of drivel
+.TP 
+\fB\-\-force\-\fP\fIcosas\fP, \fB\-\-no\-force\-\fP\fIcosas\fP, \fB\-\-refuse\-\fP\fIcosas\fP
+
+Fuerza o rechaza (\fBno\-force\fP y \fBrefuse\fP significan lo mismo) hacer ciertas
+cosas. El parmetro \fIcosas\fP es una lista de cosas definidas a continuacin
+y separadas por comas. La opcin \fB\-\-force\-help\fP muestra un mensaje que las
+describe. Las cosas marcadas con (*) se fuerzan por omisin.
+
+\fIAviso: Estas opciones estn pensadas bsicamente para un uso
+experto. Usarlas sin conocer totalmente sus efectos podra dejar su sistema
+sin funcionamiento.\fP
+
+\fBall\fP: Activa (o desactiva) todas las opciones de forzar.
+
+\fBdowngrade\fP(*): Instala un paquete, incluso si ya existe una versin ms
+nueva instalada.
+
+\fIAviso: actualmente dpkg no comprueba de ninguna manera las dependencias al
+desactualizar y por lo tanto no avisar si rompe alguna dependencia de otro
+paquete. Una situacin as podra tener efectos secundarios graves;
+desactualizar componentes esenciales del sistema incluso podra inutilizar
+su sistema por completo. selo con cuidado.\fP
+
+\fBconfigure\-any\fP: Configura tambin los paquetes desempaquetados pero no
+configurados sobre los que depende el paquete.
+
+\fBhold\fP: Procesa los paquetes incluso si estn marcados con hold
+(retener).
+
+\fBremove\-reinstreq\fP: Elimina un paquete incluso si est roto y marcado para
+una necesaria reinstalacin. Esto podra causar, por ejemplo, que algunas
+partes del paquete quedasen en el sistema, de las que \fBdpkg\fP se olvidara.
+
+\fBremove\-essential\fP: Elimina, incluso si el paquete se considera
+esencial. Los paquetes esenciales contienen principalmente rdenes de Unix
+muy bsicas. Borrarlos podra hacer que el sistema dejase de funcionar en
+absoluto as que use esta opcin con cuidado.
+
+\fBdepends\fP: Convierte todos los problemas de dependencias en avisos.
+
+\fBdepends\-version\fP: No tiene en cuenta las versiones al comprobar las
+dependencias.
+
+\fBbreaks\fP: Instala, aunque suponga romper otro paquete.
+
+\fBconflicts\fP: Instala, incluso si entra en conflicto con otro paquete. Esta
+opcin es peligrosa dado que generalmente sobreescribir algunos ficheros.
+
+\fBconfmiss\fP: Instala siempre un fichero de configuracin conffile, de no
+existir. Es peligroso porque no guarda los cambios (la eliminacin) hechos
+al fichero.
+
+\fBconfnew\fP: Si se ha modificado un fichero de configuracin conffile
+instala siempre la nueva versin sin preguntar, a menos que se defina
+tambin la opcin \fB\-\-force\-confdef\fP, en cuyo caso se toma la accin
+predefinida.
+
+\fBconfold\fP: Si se ha modificado un fichero de configuracin conffile,
+mantener siempre la versin existente sin preguntar, a menos que tambin se
+defina la opcin \fB\-\-force\-confdef\fP, en cuyo caso se toma la accin
+predefinida.
+
+\fBconfdef\fP: Si se ha modificado un fichero de configuracin conffile,
+elegir siempre la opcin predefinida. Si no existe se detendr y preguntar
+al usuario, a no ser que se usen tambin las opciones \fB\-\-force\-confnew\fP o
+\fB\-\-force\-confold\fP, en cuyo caso se usar una de estas opciones para tomar
+la decisin final.
+
+\fBconfdef\fP: Si se ha modificado un fichero de configuracin conffile,
+ofrece siempre reemplazar este con la versin en el paquete incluso si la
+versin del paquete no ha cambiado. Si se introduce cualquiera de las
+opciones \fB\-\-force\-confnew\fP o \fB\-\-force\-confold\fP o \fB\-\-force\-confdef\fP, se
+usar esta para tomar la decisin final.
+
+\fBoverwrite\fP: Sobreescribe un fichero de un paquete con un fichero de otro.
+
+\fBoverwrite\-dir\fP: Sobreescribe un directorio de un paquete con un fichero de
+otro.
+
+\fBoverwrite\-diverted\fP: Sobreescribe una versin desviada de un fichero con
+una no desviada.
+
+\fBunsafe\-io\fP: No realiza las operaciones I/O seguras al
+desempaquetar. Actualmente, implica que no se realiza la sincronizacin del
+sistema de ficheros antes de renombrar un fichero, lo cual causa una
+apreciable degradacin del rendimiento en algunos sistemas de
+fichero. Desafortunadamente, los que requieren I/O segura para empezar en
+primer lugar debido a su comportamiento irregular causan ficheros de tamao
+cero en fallos severos del sistema.
+
+\fINote\fP: Para ext4, el sistema con ms problemas de este sentido, considere
+usar la opcin de montaje \fBnodelalloc\fP, lo que arregla la degradacin del
+rendimiento y los problemas de seguridad de datos. Lo ltimo lo soluciona
+haciendo que el sistema de ficheros no produzca ficheros de tamao cero
+durante fallos severos del sistema con cualquier software que no realiza una
+sincronizacin antes de los renombres atmicos.
+
+\fIAdvertencia: Usar esta opcin puede aumentar el rendimiento a costa de la
+prdida de datos. selo con cuidado.\fP
+
+\fBarchitecture\fP: Process even packages with wrong or no architecture.
+
+\fBbad\-version\fP: Process even packages with wrong versions.
+
+\fBbad\-path\fP: \fBPATH\fP no contiene algunos programas importantes, as que es
+bastante posible que haya problemas.
+
+\fBnot\-root\fP: Intenta la (des)instalacin incluso si no es el usuario root.
+
+\fBbad\-verify\fP: Instala un paquete aunque falle la comprobacin de
+autenticidad.
+
+.TP 
+\fB\-\-ignore\-depends\fP=\fIpaquete\fP,...
+Ignora la comprobacin de dependencias para los paquetes definidos (en
+realidad, se hacen las comprobaciones pero se imprimen avisos en vez de
+interrumpir el proceso).
+.TP 
+\fB\-\-no\-act\fP, \fB\-\-dry\-run\fP, \fB\-\-simulate\fP
+Hace todo lo que se supone que debe hacer, pero no realiza ningn cambio. Se
+utiliza para ver qu ocurrira con las opciones seleccionadas sin realizar
+cambios reales.
+
+Asegrese de introducir la opcin \fB\-\-no\-act\fP antes del parmetro de accin,
+o podra acabar con resultados no deseados. (Por ejemplo: \fBdpkg \-\-purge foo
+\-\-no\-act\fP purgar primero el paquete foo y luego intentar purgar el paquete
+\-\-no\-act, aunque probablemente usted esperaba que no hiciera nada!).
+.TP 
+\fB\-R\fP, \fB\-\-recursive\fP
+Acta recursivamente sobre todos los ficheros que coincidan con el patrn
+\fB*.deb\fP que se encuentren en el directorio definido, y tambin todos sus
+subdirectorios. Se puede usar con las opciones \fB\-i\fP, \fB\-A\fP, \fB\-\-install\fP,
+\fB\-\-unpack\fP y \fB\-\-avail\fP.
+.TP 
+\fB\-G\fP
+No instala un paquete del que ya existe una versin ms nueva en el
+sistema. Es un alias de \fB\-\-refuse\-downgrade\fP.
+.TP 
+\fB\-\-admindir=\fP\fIdirectorio\fP
+Cambia el directorio de administracin predefinido. ste contiene muchos
+ficheros que ofrecen informacin relativa al estado de paquetes instalados o
+no instalados, etc. (Por omisin, \fI/var/lib/dpkg\fP).
+.TP 
+\fB\-\-instdir=\fP\fIdirectorio\fP
+Cambia el directorio de instalacin predefinido, la ubicacin en la que se
+instalarn los paquetes. \fBinstdir\fP es tambin el directorio introducido a
+\fBchroot\fP(2) antes de ejecutar los scripts de instalacin del paquete, lo
+que significa que stos vern \fBinstdir\fP como directorio raz. (Por omisin,
+\fI/\fP).
+.TP 
+\fB\-\-root=\fP\fIdirectorio\fP
+Cambiar \fBroot\fP da el valor de \fIdirectorio\fP a \fBinstdir\fP, y el valor
+\fIdir\fP\fB/var/lib/dpkg\fP a \fBadmindir\fP.
+.TP 
+\fB\-O\fP, \fB\-\-selected\-only\fP
+Procesa slo los paquetes seleccionados para su instalacin. La marca en s
+la hacen \fBdselect\fP o \fBdpkg\fP al manipular paquetes. Por ejemplo, si se
+borra uno, ste se marcar para su desinstalacin.
+.TP 
+\fB\-E\fP, \fB\-\-skip\-same\-version\fP
+Evita la instalacin de un paquete si tiene la misma versin que la ya
+instalada.
+.P
+\fB\-\-pre\-invoke=\fP\fIorden\fP
+.br
+\fB\-\-post\-invoke=\fP\fIorden\fP
+.RS
+Define una \fIorden\fP hook que se invocar mediante sh \-c antes o despus
+de que dpkg ejecute una accin \fIunpack\fP, \fIconfigure\fP, \fIinstall\fP,
+\fItriggers\-only\fP, \fIremove\fP o \fIpurge\fP. Puede definir esta opcin varias
+veces. Se respeta el orden de aparicin de las opciones, con preferencia de
+las presentes en los ficheros de configuracin. La variable de entorno
+\fBDPKG_HOOK_ACTION\fP define los hooks a la accin de dpkg actual.Nota:
+puede que las interfaces ejecuten dpkg varias veces en cada invocacin, lo
+cual puede ejecutar ms rdenes encadenadas que las esperadas.
+.RE
+.P
+\fB\-\-path\-exclude=\fP\fIcomodn\fP
+.br
+\fB\-\-path\-include=\fP\fIcomodn\fP
+.RS
+Define \fIcomodn\fP (glob pattern) como un filtro de ruta, bien excluyendo o
+incluyendo otra vez rutas anteriormente excluidas que encajan con los
+patrones definidos durante la instalacin.
+
+\fIAviso: tenga en cuenta que dependendiendo de las rutas que excluya, puede
+dejar su sistema inutilizable, selo con precuacin.\fP
+
+Los patrones de comodn (glob) usan los mismos comodines que el intrprete
+de rdenes, donde * encaja con cualquier cadena de caracteres, incluyendo
+una cadena vaca y /. Por ejemplo, \fI'/usr/*/READ*'\fP encaja con
+\&\fI'/usr/share/doc/package/README'\fP. Como es habitual, ? encaja cualquier
+carcter nico (una vez ms, incluyendo /). Y [ inicia una clase
+(class) de carcter, que puede contener una lista de caracteres, rangos y
+complementaciones. Consulte \fBglob\fP(7) para ms informacin acerca del uso
+de comodines. Nota: puede que la implementacin actual incluya otra vez ms
+directorios y enlaces simblicos que los necesarios. Puede que un desarrollo
+en el futuro arregle esto para estar ms seguros y evitar un posible error
+de desempaquetado.
+
+Puede usar esto para eliminar todas las rutas a excepcin de algunas en
+particular; un tpico uso es:
+
+.nf
+\fB\-\-path\-exclude=/usr/share/doc/*\fP
+\fB\-\-path\-include=/usr/share/doc/*/copyright\fP
+.fi
+
+para eliminar todos los ficheros de documentacin a excepcin de los
+ficheros de derechos de autor.
+
+Estas dos opciones se pueden definir varias veces, y se pueden
+interpolar. Ambos se procesan en el orden dado, y la ltima regla que encaja
+con un nombre de fichero realiza la decisin.
+.RE
+.TP 
+\fB\-\-status\-fd \fP\fIn\fP
+Enva la informacin del estado del paquete e informacin de progreso en
+formato mquina al descriptor de fichero \fIn\fP. Puede introducir esta opcin
+varias veces. La informacin aparece habitualmente con un registro por
+lnea, en una de las siguientes formas.
+.RS
+.TP 
+\fBstatus: \fP\fIpaquete\fP\fB: \fP\fIestado\fP
+El estado del paquete ha cambiado; el \fIestado\fP es el que aparece en el
+fichero de estado.
+.TP 
+\fBstatus: \fP\fIpaquete\fP\fB : error : \fP\fImensaje\-de\-fallo\-detallado\fP
+An error occurred. Any possible newlines in \fIextended\-error\-message\fP will
+be converted to spaces before output.
+.TP 
+\fBstatus: \fP\fIfichero\fP\fB : conffile\-prompt : '\fP\fIreal\-old\fP\fB' '\fP\fIreal\-new\fP\fB' \fP\fIedicin\-usuario\fP\fB \fP\fIedicin\-distribucin\fP
+El usuario tiene que responder a una pregunta de un fichero de configuracin
+conffile.
+.TP 
+\fBprocessing: \fP\fIetapa\fP\fB: \fP\fIpaquete\fP
+Se enva justo despus del inicio del estado de procesamiento. El \fIestado\fP
+puede ser \fBupgrade\fP, \fBinstall\fP (ambos se envan antes de desempaquetar),
+\fBconfigure\fP, \fBtrigproc\fP, \fBdisappear\fP, \fBremove\fP o \fBpurge\fP.
+.RE
+.TP 
+\fB\-\-status\-logger\fP=\fIcommand\fP
+Send machine\-readable package status and progress information to the shell
+\fIcommand\fP's standard input. This option can be specified multiple
+times. The output format used is the same as in \fB\-\-status\-fd.\fP
+.RE
+.TP 
+\fB\-\-log=\fP\fIfichero\fP
+Log status change updates and actions to \fIfilename\fP, instead of the default
+\fI/var/log/dpkg.log\fP. 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
+\fIstate\fP \fIpkg\fP \fIinstalled\-version\fP' for status change updates; `YYYY\-MM\-DD
+HH:MM:SS \fIaction\fP \fIpkg\fP \fIinstalled\-version\fP \fIavailable\-version\fP' for
+actions where \fIaction\fP is one of \fBinstall\fP, \fBupgrade\fP, \fBremove\fP,
+\fBpurge\fP; and `YYYY\-MM\-DD HH:MM:SS conffile \fIfilename\fP \fIdecision\fP' for
+conffile changes where \fIdecision\fP is either \fBinstall\fP or \fBkeep\fP.
+.TP 
+\fB\-\-no\-debsig\fP
+No intenta verificar las firmas de los paquetes.
+.TP 
+\fB\-\-no\-triggers\fP
+No ejecuta ningn disparador durante esta ejecucin (se grabarn las
+activaciones). Si se usa con \fB\-\-configure\fP \fIpaquete\fP o \fB\-\-triggers\-only\fP
+\fIpaquete\fP, el script postinst del paquete nombrado tendr permisos de
+ejecucin aunque slo se necesite ejecutar un disparador. El uso de esta
+opcin puede dejar paquetes con el estado no deseado de \fBtriggers\-awaited\fP
+y \fBtriggers\-pending\fP. Puede arreglar esto ms tarde ejecutando \fBdpkg
+\-\-configure \-\-pending\fP.
+.TP 
+\fB\-\-triggers\fP
+Cancela un \fB\-\-no\-triggers\fP previo.
+.
+.SH FICHEROS
+.TP 
+\fI/etc/dpkg/dpkg.cfg\fP
+El fichero de configuracin con las opciones predefinidas.
+.TP 
+\fI/var/log/dpkg.log\fP
+El fichero de registro predefinido (consulte \fI/etc/dpkg/dpkg.cfg\fP(5) y la
+opcin \fB\-\-log\fP).
+.P
+Los otros ficheros listados a continuacin estn en sus directorios
+predefinidos. Consulte la opcin \fB\-\-admindir\fP para ver cmo modificar la
+ubicacin de estos ficheros.
+.TP 
+\fI/var/lib/dpkg/available\fP
+Lista de paquetes disponibles.
+.TP 
+\fI/var/lib/dpkg/status\fP
+Los estados de los paquetes disponibles. Este fichero contiene informacin
+sobre si un paquete est marcado o no para su eliminacin, si est o no est
+instalado, etc. Para ms informacin, consulte el apartado \fBINFORMACIN
+SOBRE PAQUETES\fP.
+
+Una copia de seguridad diaria del fichero de estado se crea en
+\fI/var/backups\fP. Puede ser til si se ha perdido o ha quedado daado por
+problemas con el sistema de ficheros.
+.P
+Los siguientes ficheros son componentes de un paquete binario. Consulte
+\fBdeb\fP(5) para ms informacin sobre stos:
+.TP 
+\fIcontrol\fP
+.TP 
+\fIconffiles\fP
+.TP 
+\fIpreinst\fP
+.TP 
+\fIpostinst\fP
+.TP 
+\fIprerm\fP
+.TP 
+\fIpostrm\fP
+.
+.SH ENTORNO
+.TP 
+\fBHOME\fP
+Si se define, \fBdpkg\fP lo usar como el directorio del cual leer el fichero
+de configuracin especfico del usuario.
+.TP 
+\fBTMPDIR\fP
+Si se define, \fBdpkg\fP lo usar como el directorio en el que crear ficheros y
+directorios temporales.
+.TP 
+\fBPAGER\fP
+El programa que \fBdpkg\fP ejecutar al mostrar los ficheros de configuracin
+conffiles.
+.TP 
+\fBSHELL\fP
+El programa que \fBdpkg\fP ejecutar al iniciar un nuevo intrprete de rdenes.
+.TP 
+\fBCOLUMNS\fP
+Define el nmero de columnas que \fBdpkg\fP puede usar para mostrar la
+informacin. Por ahora slo la usa la opcin \-l.
+.TP 
+\fBDPKG_SHELL_REASON\fP
+Definido por \fBdpkg\fP en el intrprete de rdenes iniciado en el dilogo del
+fichero de configuracin conffile para examinar la situacin. El valor
+vlido actualmente es \fBconffile\-prompt\fP.
+.TP 
+\fBDPKG_CONFFILE_OLD\fP
+Definido por \fBdpkg\fP en el intrprete de rdenes iniciado en el dilogo del
+fichero de configuracin conffile para examinar la situacin. Contiene la
+ruta al fichero de configuracin antiguo.
+.TP 
+\fBDPKG_CONFFILE_NEW\fP
+Definido por \fBdpkg\fP en el intrprete de rdenes iniciado en el dilogo del
+fichero de configuracin conffile para examinar la situacin. Contiene la
+ruta al fichero de configuracin conffile nuevo.
+.TP 
+\fBDPKG_RUNNING_VERSION\fP
+Definido por \fBdpkg\fP en el script del entorno del mantenedor con el valor de
+la versin en ejecucin de \fBdpkg\fP.
+.TP 
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP
+Definido por \fBdpkg\fP en el script de entorno del mantenedor con el valor del
+nombre del paquete manipulado.
+.TP 
+\fBDPKG_MAINTSCRIPT_ARCH\fP
+Definido por \fBdpkg\fP en el script de entorno del mantenedor con el valor de
+la arquitectura de paquete para la cual se compil.
+.TP 
+\fBDPKG_MAINTSCRIPT_NAME\fP
+Definido por \fBdpkg\fP en el script del entorno del mantenedor con el valor
+del nombre del script en ejecucin (preinst, postinst, prerm,
+postrm).
+.
+.SH EJEMPLOS
+Para listar los paquetes con el editor \fBvi\fP(1) en su nombre:
+.br
+     \fBdpkg \-l \(aq*vi*\(aq\fP
+.br
+
+Para ver las entradas en \fI/var/lib/dpkg/available\fP de dos paquetes:
+.br
+     \fBdpkg \-\-print\-avail elvis vim | less\fP
+.br
+
+Para buscar personalmente en la lista de paquetes:
+.br
+     \fBless /var/lib/dpkg/available\fP
+.br
+
+Para borrar un paquete instalado llamado elvis:
+.br
+     \fBdpkg \-r elvis\fP
+.br
+
+Para instalar un paquete, ste tiene que estar disponible en un archivo o
+disco ptico. El fichero available muestra que el paquete vim est en la
+seccin editors:
+.br
+     \fBcd /media/cdrom/pool/main/v/vim\fP
+     \fBdpkg \-i vim_4.5\-3.deb\fP
+.br
+
+Para hacer una copia local de las selecciones de estados de paquetes:
+.br
+     \fB dpkg \-\-get\-selections >mis\-selecciones\fP
+.br
+
+Podra copiar este fichero a otra mquina e instalarlo all con:
+.br
+     \fBdpkg \-\-clear\-selections\fP
+     \fBdpkg \-\-set\-selections <mis\-selecciones\fP
+.br
+
+Tenga en cuenta que esto no instalar ni borrar nada, simplemente
+modificar el estado de seleccin de los paquetes seleccionados. Necesitar
+otra aplicacin para obtener los paquetes e instalarlos. Por ejemplo,
+ejecute \fBapt\-get dselect\-upgrade\fP.
+
+Por lo general, encontrar que \fBdselect\fP(8) es una forma ms cmoda de
+modificar los estados de seleccin de los paquetes.
+.br
+.
+.SH "FUNCIONALIDAD ADICIONAL"
+Puede ganar funcionalidades adicionales instalando alguno de los siguientes
+paquetes: \fIapt\fP, \fIaptitude\fP y \fIdebsums\fP.
+.
+.SH "VASE TAMBIN"
+\fBaptitude\fP(1), \fBapt\fP(1), \fBdselect\fP(1), \fBdpkg\-deb\fP(1), \fBdpkg\-query\fP(1),
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg.cfg\fP(5), y \fBdpkg\-reconfigure\fP(8).
+.
+.SH FALLOS
+Habitualmente, la opcin \fB\-\-no\-act\fP da menos informacin de la que
+necesita.
+.
+.SH AUTORES
+Consulte \fI/usr/share/doc/dpkg/THANKS\fP para una lista de las personas que
+han contribuido a \fBdpkg\fP.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-architecture.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-architecture.1
--- dpkg/man/es/dpkg-architecture.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-architecture.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,326 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-architecture 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-architecture \- Configurar y determinar la arquitectura para la
+construccin de paquetes
+.
+.SH SINOPSIS
+\fBdpkg\-architecture\fP [\fIoption\fP...] [\fIcommand\fP]
+.PP
+.
+.SH DESCRIPCIN
+dpkg\-architecture facilita determinar y configurar la arquitectura de
+construccin y de la mquina anfitrin para la construccin de un paquete.
+.PP
+La arquitectura de construccin siempre se determina con una invocacin
+externa a \fBdpkg\fP(1), y no se puede definir en la lnea de rdenes.
+.PP
+Puede definir la arquitectura del anfitrin introduciendo una o ambas
+opciones \fB\-a\fP y \fB\-t\fP. El valor por omisin es una invocacin externa a
+\fBgcc\fP(1), o la misma que la arquitectura de construccin en caso de no
+disponer de \s-1CC\s0 o gcc. Es suficiente usar \fB\-a\fP o \fB\-t\fP, el valor del
+otro se definir con un valor predefinido adecuado. De hecho, a veces es
+mejor definir slo uno, ya que \fBdpkg\-architecture\fP le avisar si su opcin
+no encaja con la opcin predefinida.
+.
+.SH RDENES
+.TP 
+\fB\-l\fP
+Muestra las variables de entorno, una por lnea, con el formato
+\fIVARIABLE=valor\fP. Esta es la accin predefinida.
+.TP 
+\fB\-e\fP\fIdebian\-architecture\fP
+Revisa si la arquitectura es la misma. Por omisin, \fIdebian\-architecture\fP
+se compara con la arquitectura del sistema Debian actual, el sistema
+anfitrin. Esta accin no expande los comodines de arquitectura. La orden
+finaliza con un estado de salida de cero si coinciden, y de 1 en caso
+contrario.
+.TP 
+\fB\-i\fP\fIcomodn\-arquitectura\fP
+Revisa la identidad de la arquitectura expandiendo \fIcomodin\-arquitectura\fP
+como un comodn de arquitectura, y comparndola con la arquitectura del
+sistema Debian actual. La orden finaliza con un estado de salida de cero si
+coincide, y de 1 en caso contrario.
+.TP 
+\fB\-q\fP\fInombre\-variable\fP
+Muestra el valor de una nica variable.
+.TP 
+\fB\-s\fP
+Muestra una orden export. Se puede usar para definir las variables de
+entorno mediante eval.
+.TP 
+\fB\-u\fP
+Muestra una orden similar a \fB\-s\fP, pero para eliminar la definicin
+(unset) de todas las variables.
+.TP 
+\fB\-c\fP\fI orden\fP
+Ejecuta una \fIorden\fP en un entorno cuyas variables ya estn definidas con un
+valor predefinido.
+.TP 
+\fB\-L\fP
+Muestra una lista de nombres de arquitectura vlidos.
+.TP 
+\fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH OPCIONES
+.TP 
+\fB\-a\fP\fIdebian\-architecture\fP
+Define la arquitectura de Debian.
+.TP 
+\fB\-t\fP\fItipo\-sistema\-gnu\fP
+Define el tipo de sistema GNU.
+.TP 
+\fB\-f\fP
+Los scripts respetan los valores de variables de entorno preexistentes que
+tienen el mismo nombre que los valores contenidos en el script (por ejemplo,
+usados por \fBdpkg\-architecture\fP), a menos que se use esta marca de
+forzado. Permite al usuario sobreescribir un valor, an cuando la invocacin
+a \fBdpkg\-architecture\fP se encuentra en otro script (por ejemplo,
+\fBdpkg\-buildpackage\fP(1)).
+.
+.SH TRMINOS
+.IP "mquina de construccin" 4
+La mquina en la que se construye el paquete.
+.IP "mquina anfitrin" 4
+La mquina para la cual se construye el paquete.
+.IP "Arquitectura de Debian" 4
+La cadena de la arquitectura de Debian, que especifica el rbol binario en
+el archivo \s-1FTP\s0. Ejemplos: i386, sparc, hurd\-i386.
+.IP "comodn de arquitectura" 4
+Un comodn de arquitectura es una cadena especial de arquitectura que encaja
+con cualquier arquitectura real del que es parte. La forma habitual es
+<kernel>\-<cpu>. Ejemplos: linux\-any, any\-i386, hurd\-any.
+.IP "tipo de sistema \s-1GNU\s0" 4
+Una cadena de definicin de arquitectura que consiste de dos partes
+separadas por un guin: el procesador y el sistema. Ejemplos:
+i386\-linux\-gnu, sparc\-linux\-gnu, i386\-gnu, x86_64\-netbsd.
+.
+.SH VARIABLES
+Las siguientes variables se definen mediante \fBdpkg\-architecture\fP:
+.IP \s-1DEB_BUILD_ARCH\s0 4
+La arquitectura de Debian de la mquina de construccin.
+.IP \s-1DEB_BUILD_ARCH_OS\s0 4
+El nombre del sistema Debian de la mquina de construccin.
+.IP \s-1DEB_BUILD_ARCH_CPU\s0 4
+El nombre de Debian del procesador de la mquina de construccin.
+.IP \s-1DEB_BUILD_ARCH_BITS\s0 4
+El tamao del puntero de la mquina de construccin, en bits.
+.IP \s-1DEB_BUILD_ARCH_ENDIAN\s0 4
+El nivel de endianizacin de la mquina de construccin, little o big.
+.IP \s-1DEB_BUILD_GNU_CPU\s0 4
+La parte \s-1CPU\s0 de \s-1DEB_BUILD_GNU_TYPE\s0.
+.IP \s-1DEB_BUILD_GNU_SYSTEM\s0 4
+La parte de System de \s-1DEB_BUILD_GNU_TYPE\s0.
+.IP \s-1DEB_BUILD_GNU_TYPE\s0 4
+El tipo de sistema \s-1GNU\s0 de la mquina de construccin.
+.IP \s-1DEB_BUILD_MULTIARCH\s0 4
+The clarified \s-1GNU\s0 system type of the build machine, used for
+filesystem paths.
+.IP \s-1DEB_HOST_ARCH\s0 4
+La arquitectura de Debian de la mquina anfitrin.
+.IP \s-1DEB_HOST_ARCH_OS\s0 4
+El nombre de sistema Debian de la mquina anfitrin.
+.IP \s-1DEB_HOST_ARCH_CPU\s0 4
+El nombre del procesador Debian de la mquina anfitrin.
+.IP \s-1DEB_HOST_ARCH_BITS\s0 4
+El tamao del puntero de la mquina anfitrin, en bits.
+.IP \s-1DEB_HOST_ARCH_ENDIAN\s0 4
+El nivel de endianizacin de la mquina anfitrin, little o big.
+.IP \s-1DEB_HOST_GNU_CPU\s0 4
+La parte de \s-1CPU\s0 de \s-1DEB_HOST_GNU_TYPE\s0.
+.IP \s-1DEB_HOST_GNU_SYSTEM\s0 4
+La parte de System de \s-1DEB_HOST_GNU_TYPE\s0.
+.IP \s-1DEB_HOST_GNU_TYPE\s0 4
+El tipo de sistema \s-1GNU\s0 de la mquina anfitrin.
+.IP \s-1DEB_HOST_MULTIARCH\s0 4
+The clarified \s-1GNU\s0 system type of the host machine, used for
+filesystem paths.
+.
+.SH DEBIAN/RULES
+Las variables de entorno definidas por \fBdpkg\-architecture\fP se introducen a
+\fIdebian/rules\fP como variables de make (consulte la documentacin de
+make). Por otra parte, no debera depender de ellos, ya que esto rompe la
+invocacin manual del script. En lugar de ello, se deberan iniciar mediante
+\fBdpkg\-architecture\fP con la opcin \-q. Aqu hay algunos ejemplos, que
+muestran tambin como mejorar la compatibilidad de su paquete con la
+construccin para varias arquitecturas.
+.PP
+
+En lugar de:
+.IP
+.nf
+ARCH=\`dpkg \-\-print\-architecture\`
+configure $(\s-1ARCH\s0)\-linux
+.fi
+.PP
+use lo siguiente:
+.IP
+.nf
+\&\s-1DEB_BUILD_GNU_TYPE\s0 := $(shell dpkg\-architecture \-qDEB_BUILD_GNU_TYPE)
+\&\s-1DEB_HOST_GNU_TYPE\s0 := $(shell dpkg\-architecture \-qDEB_HOST_GNU_TYPE)
+
+configure \-\-build=$(\s-1DEB_BUILD_GNU_TYPE\s0) \-\-host=$(\s-1DEB_HOST_GNU_TYPE\s0)
+.fi
+.PP
+
+En lugar de:
+.IP
+.nf
+ARCH=\`dpkg \-\-print\-architecture\`
+ifeq ($(\s-1ARCH\s0),alpha)
+  ...
+endif
+.fi
+.PP
+use:
+.IP
+.nf
+\&\s-1DEB_HOST_ARCH\s0 := $(shell dpkg\-architecture \-qDEB_HOST_ARCH)
+
+ifeq ($(\s-1DEB_HOST_ARCH\s0),alpha)
+  ...
+endif
+.fi
+.PP
+o si slo precisa revisar el tipo de sistema o CPU, use las variables
+DEB_HOST_ARCH_OS o DEB_HOST_ARCH_CPU.
+.PP
+En general, invocar dpkg en el fichero de reglas (rules) para obtener la
+informacin de arquitectura est obsoleto (a menos que desee ofrecer
+compatibilidad con versiones anteriores, vase a continuacin). La opcin
+\-\-print\-architecture es particularmente inestable, ya que existen
+arquitecturas de Debian que no encajan con el nombre de un procesador.
+.
+.SH "COMPATIBILIDAD CON VERSIONES ANTERIORES"
+Las variables DEB_*_ARCH_BITS y DEB_*_ARCH_ENDIAN se introdujeron a
+partir de la versin 1.15.4 de dpkg\-dev. Su uso en \fIdebian/rules\fP requiere
+una dependencia de construccin sobre dpkg\-dev (>= 1.15.4).
+.PP
+Las variables DEB_HOST_ARCH_CPU y DEB_HOST_ARCH_OS se introdujeron a
+partir de la versin 1.13.2 de dpkg\-dev. Antes, los ficheros \fIdebian/rules\fP
+solan revisar aquellos valores de DEB_HOST_GNU_CPU o DEB_HOST_GNU_TYPE
+susceptibles de haber cambiado.
+.PP
+Se deberan actualizar aquellas partes de los ficheros \fIdebian/rules\fP que
+revisan las variables que deciden el modo o el objetivo a compilar. Puede
+usar el siguiente cdigo si desea permitir la compatibilidad con versiones
+anteriores de dpkg\-dev:
+.IP
+.nf
+DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_CPU 2>/dev/null)
+DEB_HOST_ARCH_OS := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_OS 2>/dev/null)
+
+# Take account of old dpkg\-architecture output.
+ifeq ($(DEB_HOST_ARCH_CPU),)
+  DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_GNU_CPU)
+  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
+    DEB_HOST_ARCH_CPU := amd64
+  endif
+endif
+ifeq ($(DEB_HOST_ARCH_OS),)
+  DEB_HOST_ARCH_OS := $(subst \-gnu,,$(shell dpkg\-architecture \-qDEB_HOST_GNU_SYSTEM))
+  ifeq ($(DEB_HOST_ARCH_OS),gnu)
+    DEB_HOST_ARCH_OS := hurd
+  endif
+endif
+.fi
+.PP
+Y de forma parecida con DEB_BUILD_ARCH_CPU y DEB_BUILD_ARCH_OS.
+.PP
+Si desea la compatibilidad con versiones de dpkg\-dev que no incluan
+\fBdpkg\-architecture\fP, puede usar lo siguiente:
+.IP
+.nf
+\&\s-1DEB_BUILD_ARCH\s0 := $(shell dpkg \-\-print\-architecture)
+\&\s-1DEB_BUILD_GNU_CPU\s0 := $(patsubst hurd\-%,%,$(\s-1DEB_BUILD_ARCH\s0))
+ifeq ($(filter\-out hurd\-%,$(\s-1DEB_BUILD_ARCH\s0)),)
+  \s-1DEB_BUILD_GNU_SYSTEM\s0 := gnu
+else
+  \s-1DEB_BUILD_GNU_SYSTEM\s0 := linux\-gnu
+endif
+DEB_BUILD_GNU_TYPE=$(\s-1DEB_BUILD_GNU_CPU\s0)\-$(\s-1DEB_BUILD_GNU_SYSTEM\s0)
+
+\&\s-1DEB_HOST_ARCH\s0 := $(\s-1DEB_BUILD_ARCH\s0)
+\&\s-1DEB_HOST_GNU_CPU\s0 := $(\s-1DEB_BUILD_GNU_CPU\s0)
+\&\s-1DEB_HOST_GNU_SYSTEM\s0 := $(\s-1DEB_BUILD_GNU_SYSTEM\s0)
+\&\s-1DEB_HOST_GNU_TYPE\s0 := $(\s-1DEB_BUILD_GNU_TYPE\s0)
+.fi
+.PP
+Inserte un subconjunto de estas lneas al inicio del fichero debian/rules;
+estos valores predefinidos se sobreescribirn en caso de usar
+dpkg\-architecture.
+.PP
+No necesita el conjunto completo. Seleccione un conjunto consistente que
+contenga los valores que usa en el fichero de reglas. Por ejemplo, si slo
+necesita la arquitectura Debian del sistema de destino, tiene suficiente con
+DEB_HOST_ARCH=\`dpkg \-\-print\-architecture\ (de hecho, esta es la
+arquitectura de Debian de la mquina de construccin, pero recuerde que slo
+intentamos crear la compatibilidad con versiones anteriores que tienen una
+compilacin nativa).
+.PP
+Las opciones \fB\-e\fP y \fB\-i\fP aparecieron en recientes versiones de
+\fBdpkg\-architecture\fP (a partir de la versin 1.13.13 de dpkg).
+.
+.SH EJEMPLOS
+\fBdpkg\-buildpackage\fP acepta la opcin \fB\-a\fP y la introduce a
+\fBdpkg\-architecture\fP. Otros ejemplos:
+.IP
+CC=i386\-gnu\-gcc dpkg\-architecture \-c debian/rules build
+.IP
+eval \`dpkg\-architecture \-u\`
+.PP
+Revisa si una arquitectura equivale a la arquitectura actual o dada:
+.IP
+dpkg\-architecture \-elinux\-alpha
+.IP
+dpkg\-architecture \-amips \-elinux\-mips
+.PP
+Revisa si la arquitectura actual o introducida con \-a es de un sistema
+Linux:
+.IP
+dpkg\-architecture \-ilinux\-any
+.IP
+dpkg\-architecture \-ai386 \-ilinux\-any
+.
+.SH FICHEROS
+All these files have to be present for \fBdpkg\-architecture\fP to work. Their
+location can be overridden at runtime with the environment variable
+\fBDPKG_DATADIR\fP.
+.TP 
+\fI/usr/share/dpkg/cputable\fP
+Tabla de nombres de CPU conocidos y su correlacin con su nombre GNU.
+.TP 
+\fI/usr/share/dpkg/ostable\fP
+Tabla de sistemas operativos conocidos y su correlacin con su nombre GNU.
+.TP 
+\fI/usr/share/dpkg/triplettable\fP
+Correlacin entre tuples de 3 de la arquitectura de Debian, y los nombres de
+arquitectura de Debian.
+.
+.SH "VASE TAMBIN"
+\fBdpkg\-buildpackage\fP(1), \fBdpkg\-cross\fP(1).
+.
+.SH AUTOR
+\fBdpkg\-architecture\fP y su pgina de manual fueron escritos originalmente por
+Marcus Brinkmann <brinkmd@debian.org>.
+
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-buildpackage.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-buildpackage.1
--- dpkg/man/es/dpkg-buildpackage.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-buildpackage.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,265 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-buildpackage 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-buildpackage \- Construccin de paquetes binarios o fuente a partir de
+las fuentes
+.
+.SH SINOPSIS
+\fBdpkg\-buildpackage\fP [\fIoption\fP...]
+.
+.SH DESCRIPCIN
+\fBdpkg\-buildpackage\fP es un programa que automatiza el proceso de
+construccin de un paquete de Debian. ste consiste de los siguientes pasos:
+.IP \fB1.\fP 3
+Preparacin del entorno de construccin, definiendo varias variables de
+entorno (consulte \fBVARIABLES DE ENTORNO\fP) para invocar \fBdpkg\-source
+\-\-before\-build\fP (a menos que se defina \fB\-T\fP o \fB\-\-target\fP.
+.IP \fB2.\fP 3
+Verificar que las dependencias y conflictos de construccin
+(build\-dependencies y build\-conflicts, respectivamente) estn
+satisfechas (a menos que especifique \fB\-d\fP).
+.IP \fB3.\fP 3
+Si se selecciona un objetivo especfico con \fB\-T\fP o \fB\-\-target\fP, invoca ese
+objetivo y se detiene. De no ser as, invoca \fBfakeroot debian/rules clean\fP
+para limpiar el rbol de construccin (a menos que especifique \fB\-nc\fP).
+.IP \fB4.\fP 3
+Invocacin de \fBdpkg\-source \-b\fP para generar el paquete fuente (a menos que
+se requiera slo la construccin del paquete binario con \fB\-b\fP, \fB\-B\fP o
+\fB\-A\fP).
+.IP \fB5.\fP 3
+It calls \fBdebian/rules\fP \fBbuild\fP followed by \fBfakeroot debian/rules\fP
+\fIbinary\-target\fP (unless a source\-only build has been requested with
+\fB\-S\fP). Note that \fIbinary\-target\fP is either \fBbinary\fP (default case, or if
+\fB\-b\fP is specified)  or \fBbinary\-arch\fP (if \fB\-B\fP is specified) or
+\fBbinary\-indep\fP (if \fB\-A\fP is specified).
+.IP \fB6.\fP 3
+Invocacin de \fBgpg\fP para firmar el fichero \fB.dsc\fP (de existir, a menos que
+se especifique \fB\-us\fP).
+.IP \fB7.\fP 3
+Invocacin de \fBdpkg\-genchanges\fP para generar el fichero \fB.changes\fP. Muchas
+de las opciones de \fBdpkg\-buildpackage\fP se introducen a \fBdpkg\-genchanges\fP.
+.IP \fB8.\fP 3
+Invocacin de \fBgpg\fP para firmar el fichero \fB.changes\fP (a menos que se
+especifique \fB\-us\fP).
+.IP \fB9.\fP 3
+Si se especifica \fB\-tc\fP, se invocar nuevamente \fBfakeroot debian/rules
+clean\fP. Por ltimo, invoca \fBdpkg\-source \-\-after\-build\fP.
+.
+.SH OPCIONES
+.TP 
+\fB\-b\fP
+Especifica una construccin slo binaria, no se construirn ficheros de
+fuentes y/o distribuidas. Se introduce a \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-B\fP
+Especifica una construccin slo binaria, limitada a paquetes dependientes
+de arquitectura. Se introduce a \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-A\fP
+Especifica una construccin slo binaria, limitada a paquetes independientes
+de la arquitectura. Se introduce a \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-S\fP
+Especifica una construccin slo de las fuentes, no se construir ningn
+paquete binario. Se introduce a \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-F\fP
+Define una construccin completa normal, se construyen los paquetes binarios
+y de fuente. Es idntica al comportamiento predefinido cuando no se define
+ninguna opcin de construccin.
+.P
+\fB\-\-target=\fP\fItarget\fP
+.br
+\fB\-\-target \fP\fItarget\fP
+.br
+\fB\-T\fP\fItarget\fP
+.RS
+Invoca \fBdebian/rules\fP \fItarget\fP despus de definir el entorno de
+construccin, deteniendo en este punto el proceso de construccin del
+paquete. Si se introduce \fB\-\-as\-root\fP, la orden se ejecutar como el usuario
+root (vase \fB\-r\fP). Tenga en cuenta que los objetivos oficiales que
+precisan ejecutarse como administrador segn las directrices de Debian no
+necesitan esta opcin.
+.RE
+.TP 
+\fB\-\-as\-root\fP
+Su uso slo tiene sentido con \fB\-\-target\fP. Requiere que se ejecute el
+objetivo con permisos del usuario root.
+.P
+\fB\-si\fP
+.br
+\fB\-sa\fP
+.br
+\fB\-sd\fP
+.br
+\fB\-v\fP\fIversin\fP
+.br
+\fB\-C\fP\fIdescripcin\-de\-cambios\fP
+.br
+\fB\-m\fP\fIdireccin\-mantenedor\fP
+.br
+\fB\-e\fP\fIdireccin\-mantenedor\fP
+.RS
+Se introduce sin cambios a \fBdpkg\-genchanges\fP. Consulte la pgina de manual.
+.RE
+.TP 
+\fB\-a\fP\fIarquitectura\fP
+Especifica la arquitectura de Debian para la cual se construye el
+paquete. La arquitectura de la mquina en la que se construye el paquete se
+detecta automticamente, y es tambin la arquitectura de destino por omisin
+para la mquina anfitrin.
+.TP 
+\fB\-t\fP\fItipo\-sistema\-gnu\fP
+Define el tipo de sistema GNU para el cual se construye el paquete. Se puede
+usar en lugar de \-a, o como un complemento para invalidar el tipo de
+sistema GNU predefinido de la arquitectura Debian de destino.
+.TP 
+\fB\-j\fP\fItareas\fP
+El nmero mximo de tareas (jobs) ejecutndose simultneamente,
+equivalente a la opcin de \fBmake\fP(1) del mismo nombre. Se aadir a la
+variable de entorno MAKEFLAGS, que causa que todas las invocaciones
+posteriores a make hereden esta opcin. Tambin aade
+\fBparallel=\fP\fItareas\fP a la variable de entorno DEB_BUILD_OPTIONS, que
+permite que los ficheros debian/rules usen esta informacin para sus
+propios propsitos. \fBparallel=\fP\fItareas\fP en la variable de entorno
+DEB_BUILD_OPTIONS invalida el valor \fB\-j\fP en caso de introducir esta
+opcin.
+.TP 
+\fB\-D\fP
+Verifica las dependencias y los conflictos de construccin, interrumpiendo
+el proceso si alguna no est satisfecha. Este es el comportamiento por
+omisin.
+.TP 
+\fB\-d\fP
+No revisa dependencias ni conflictos de construccin.
+.TP 
+\fB\-nc\fP
+No limpia el rbol de fuentes (implica \fB\-b\fP si no se introdujo \fB\-B\fP, \fB\-A\fP
+o \fB\-S\fP).
+.TP 
+\fB\-tc\fP
+Limpia el rbol de fuentes (usando \fIorden\-para\-obtener\-root\fP \fBdebian/rules
+clean\fP) despus de la creacin del paquete.
+.TP 
+\fB\-r\fP\fIorden\-para\-obtener\-root\fP
+Cuando \fBdpkg\-buildpackage\fP necesite ejecutar parte del proceso de
+construccin como root, aade el prefijo \fIorden\-para\-obtener\-root\fP a la
+orden a ejecutar en caso de haberse especificado. La
+\fIorden\-para\-obtener\-root\fP debe ser el nombre de un programa que est dentro
+del \fBPATH\fP, y tomar como argumentos el nombre del proceso a ejecutar, as
+como los argumentos que ste toma. La \fIorden\-para\-obtener\-root\fP puede
+incluir parmetros, pero no caracteres especiales del intrprete de
+rdenes. La \fIorden\-para\-obtener\-root\fP puede ser \fBfakeroot\fP, \fBsudo\fP,
+\fBsuper\fP o \fBreally\fP. \fBsu\fP no es adecuado ya que slo puede invocar el
+intrprete de rdenes del usuario con \fB\-c\fP, en lugar de introducir los
+argumentos individualmente a la orden a ejecutar.
+.TP 
+\fB\-R\fP\fIfichero\-reglas\fP
+Habitualmente, construir un paquete de Debian incluye invocar
+\fBdebian/rules\fP como una orden con varios parmetros estndar. Esta opcin
+posibilita invocar otro programa para construir el paquete (puede incluir
+parmetros separados por espacios). Por otra parte, se puede usar para
+ejecutar el fichero de reglas (rules) estndar con otro programa de make
+(por ejemplo, usando \fB/usr/local/bin/make \-f debian/rules\fP como
+\fIfichero\-reglas\fP.
+.TP 
+\fB\-p\fP\fIorden\-para\-firmar\fP
+Cuando \fBdpkg\-buildpackage\fP necesita ejecutar GPG o PGP para firmar el
+fichero fuente de control (\fB.dsc\fP) o un fichero \fB.changes\fP, ejecutar
+\fIorden\-para\-firmar\fP (buscando en \fBPATH\fP si es necesario) en lugar de
+\fBgpg\fP. \fIorden\-para\-firmar\fP recibir todos los argumentos que obtendra
+\fBpgp\fP. Debe usar la opcin \fB\-sgpg\fP si la \fIorden\-para\-firmar\fP toma los
+argumentos en formato GPG en vez de PGP. La \fIorden\-para\-firmar\fP no debe
+contener espacios ni tampoco caracteres especiales del intrprete de
+rdenes.
+.TP 
+\fB\-k\fP\fIllave\-id\fP
+Especifica una llave de identificacin a usar para firmar los paquetes.
+.TP 
+\fB\-us\fP
+No firma el paquete fuente.
+.TP 
+\fB\-uc\fP
+No firma el fichero \fB.changes\fP.
+.P
+\fB\-i\fP[\fIexp\-reg\fP]
+.br
+\fB\-I\fP\fI[patrn]\fP
+.br
+\fB\-s\fP[\fBnsAkurKUR\fP]
+.br
+\fB\-z\fP, \fB\-Z\fP
+.br
+.RS
+Se introduce sin cambios a \fBdpkg\-source\fP. Consulte la pgina de manual.
+.RE
+.TP 
+\fB\-\-source\-option=\fP\fIopcin\fP
+Introduce la opcin \fIopcin\fP a \fBdpkg\-source\fP.
+.TP 
+\fB\-\-changes\-option=\fP\fIopcin\fP
+Introduce la opcin \fIopcin\fP a \fBdpkg\-genchanges\fP.
+.P
+\fB\-\-admindir=\fP\fIdirectorio\fP
+.br
+\fB\-\-admindir\fP \fIdirectorio\fP
+.RS
+Cambia el directorio con la base de datos de \fBdpkg\fP. Por omisin es
+\fI/var/lib/dpkg\fP.
+.RE
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH ENTORNO
+Even if \fBdpkg\-buildpackage\fP exports some variables, \fBdebian/rules\fP should
+not rely on their presence and should instead use the respective interface
+to retrieve the needed values.
+.SS "Variables definidas por dpkg\-architecture"
+\fBdpkg\-architecture\fP se invoca con los parmetros \fB\-a\fP y \fB\-t\fP. Toda
+variable que ofrece una salida mediante su opcin \fB\-s\fP se integra en el
+entorno de construccin.
+.SS "Compiler flags are no longer exported"
+Between versions 1.14.17 and 1.16.1, \fBdpkg\-buildpackage\fP exported compiler
+flags (\fBCFLAGS\fP, \fBCXXFLAGS\fP, \fBFFLAGS\fP, \fBCPPFLAGS\fP and \fBLDFLAGS\fP) with
+values as returned by \fBdpkg\-buildflags\fP. This is no longer the case.
+.
+.SH FALLOS
+Debera ser posible especificar espacios y caracteres especiales del
+intrprete de rdenes en los argumentos iniciales de la
+\fIorden\-para\-obtener\-root\fP y la \fIorden\-para\-firmar\fP.
+.
+.SH "VASE TAMBIN"
+\fBdpkg\-source\fP(1), \fBdpkg\-architecture\fP(1), \fBdpkg\-buildflags\fP(1),
+\fBdpkg\-genchanges\fP(1), \fBfakeroot\fP(1), \fBgpg\fP(1).
+.
+.SH AUTORES
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2007 Frank Lichtenheld
+.br
+Copyright \(co 2008\-2010 Rapha\[:e]l Hertzog
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg.cfg.5 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg.cfg.5
--- dpkg/man/es/dpkg.cfg.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg.cfg.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,41 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg.cfg 5 "5 de Septiembre de 2009" "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg.cfg \- Fichero de configuracin de dpkg
+.
+.SH DESCRIPCIN
+Este fichero contiene las opciones predefinidas de dpkg. Cada lnea contiene
+una nica opcin, idntica a una opcin de lnea de rdenes normal de dpkg a
+excepcin de la ausencia de guiones precedentes. Las comillas que rodeen
+valores de opciones desaparecern. Se permiten comentarios si la lnea
+comienza con una almohadilla (\fB#\fP).
+.
+.SH FICHEROS
+\fI/etc/dpkg/dpkg.cfg.d/[0\-9a\-zA\-Z_\-]*\fP
+.br
+\fI/etc/dpkg/dpkg.cfg\fP
+.br
+\fI~/.dpkg.cfg\fP
+.
+.SH AUTOR
+Consulte \fI/usr/share/doc/dpkg/THANKS\fP para una lista de las personas que
+han contribuido a \fBdpkg\fP.
+.
+.SH "VASE TAMBIN"
+\fBdpkg\fP(1).
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-checkbuilddeps.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-checkbuilddeps.1
--- dpkg/man/es/dpkg-checkbuilddeps.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-checkbuilddeps.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,60 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-checkbuilddeps 1 2011\-07\-04 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-checkbuilddeps \- Comprueba las dependencias y conflictos de compilacin
+.
+.SH SINOPSIS
+\fBdpkg\-checkbuilddeps\fP [\fIoption\fP...] [\fIcontrol\-file\fP]
+.
+.SH DESCRIPCIN
+Este programa comprueba que los paquetes instalados en el sistema satisfacen
+las dependencias y conflictos de compilacin listados en el fichero de
+control del paquete. Si alguna de estas condiciones no se cumple avisa y
+finaliza el proceso devolviendo un cdigo de error distinto de cero.
+.P
+By default, \fBdebian/control\fP is read, but an alternate control filename may
+be specified on the command line.
+.
+.SH OPCIONES
+.TP 
+\fB\-\-admindir=\fP\fIdirectorio\fP
+Cambia el directorio con la base de datos de \fBdpkg\fP. Por omisin es
+\fI/var/lib/dpkg\fP.
+.TP 
+\fB\-B\fP
+Ignora las lneas \fIBuild\-Depends\-Indep\fP. Se debe usar cuando se construyen
+paquetes independientes de la arquitectura.
+.TP 
+\fB\-d \fP\fIcadena\-dependencias\-compilacin\fP
+.TP 
+\fB\-c \fP\fIcadena\-conflicto\-compilacin\fP
+Usa las dependencias y conflictos de compilacin dados en lugar de aquellos
+listados en el fichero \fIdebian/control\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH AUTOR
+Copyright \(co 2001 Joey Hess
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-deb.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-deb.1
--- dpkg/man/es/dpkg-deb.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-deb.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,223 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-deb 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-deb \- Herramienta de manipulacin de archivos de paquete (.deb) de
+Debian
+.
+.SH SINOPSIS
+\fBdpkg\-deb\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH DESCRIPCIN
+\fBdpkg\-deb\fP empaqueta, desempaqueta y ofrece informacin sobre archivos de
+Debian.
+.PP
+Use \fBdpkg\fP para instalar y eliminar paquetes de su sistema.
+.PP
+Tambin puede invocar \fBdpkg\-deb\fP usando \fBdpkg\fP con cualquiera de las
+opciones que desee introducir a \fBdpkg\-deb\fP. \fBdpkg\fP notar que desea usar
+\fBdpkg\-deb\fP, y lo ejecutar por usted.
+.
+.SH RDENES
+.TP 
+\fB\-b\fP, \fB\-\-build\fP \fIdirectorio\fP [\fIarchivo\fP|\fIdirectorio\fP]
+Crea un archivo de Debian a partir del rbol del sistema de ficheros ubicado
+en el \fIdirectorio\fP. El \fIdirectorio\fP debe tener un subdirectorio \fBDEBIAN\fP,
+el cual contiene los ficheros de informacin tales como el fichero de
+control. Este directorio \fIno\fP aparecer en el sistema de ficheros del
+archivo de paquete binario, sino que los ficheros contenidos se ubicarn en
+el rea de la informacin de control del paquete binario.
+
+\fBdpkg\-deb\fP leer y analizar \fBDEBIAN/control\fP a menos que especifique
+\fB\-\-nocheck\fP. Comprobar posibles errores de sintaxis y otros problemas,
+mostrando el nombre del paquete binario que se est creando. \fBdpkg\-deb\fP
+tambin comprobar los permisos de los scripts del mantenedor as como de
+los otros ficheros que se encuentren en el directorio de la informacin de
+control \fBDEBIAN\fP.
+
+Si no se especifica un \fIarchivo\fP, \fBdpkg\-deb\fP crear el paquete como un
+fichero \fIdirectorio\fP\fB.deb\fP.
+
+Si el archivo a crear ya existe se sobreescribir.
+
+Si el segundo argumento es un directorio, \fBdpkg\-deb\fP escribir en el
+fichero \fIpaquete\fP\fB_\fP\fIversin\fP\fB_\fP\fIarquitectura\fP\fB.deb\fP, o
+\fIpaquete\fP\fB_\fP\fIversin\fP\fB.deb\fP si el campo \fBArquitecture\fP no est presente
+en el fichero de control del paquete. No se debera usar la opcin
+\fB\-\-nocheck\fP cuando se especifica un directorio de destino en lugar de un
+fichero ya que \fBdpkg\-deb\fP necesita leer y analizar el fichero de control
+del paquete para as determinar qu nombre de archivo usar.
+.TP 
+\fB\-I\fP, \fB\-\-info\fP \fIarchivo\fP [\fIfichero\-de\-control\fP ..]
+Ofrece informacin acerca del paquete binario.
+
+Si no se especifica el \fIfichero(s)\-de\-control\fP se mostrar un resumen de
+los contenidos del paquete as como del fichero de control.
+
+Si se especifica algn \fIfichero\-de\-control\fP, \fBdpkg\-deb\fP imprimir los
+contenidos en el orden en que se especificaron. Si cualquiera de los
+componentes no estuviese presente se mostrar un mensaje de error por la
+salida de error estndar para cada uno de ellos, interrumpiendo el proceso
+con el estado de salida 2.
+.TP 
+\fB\-W\fP, \fB\-\-show\fP \fIarchivo\fP
+Ofrece informacin acerca del paquete binario con el formato definido por el
+argumento \fB\-\-showformat\fP. El formato predefinido muestra el nombre del
+paquete y la versin en una sola lnea, separados por un tabulado.
+.TP 
+\fB\-f\fP, \fB\-\-field\fP \fIarchivo\fP [\fIcampo\-del\-fichero\-control\fP ...]
+Extrae informacin del fichero de control del fichero de un paquete binario.
+
+Si no se especifica ningn \fBcampo\-del\-fichero\-control\fP, se mostrar todo el
+fichero de control.
+
+Si se especifica algn campo, \fBdpkg\-deb\fP mostrar sus contenidos en el
+orden en el cual aparecen en el fichero de control. Si se especifica ms de
+un \fBcampo\-del\-fichero\-control\fP, \fBdpkg\-deb\fP preceder cada uno con el
+nombre del campo (ms dos puntos y un espacio).
+
+No se informa de ningn error para los campos solicitados pero no
+encontrados.
+.TP 
+\fB\-c\fP, \fB\-\-contents\fP \fIarchivo\fP
+Lista los contenidos de la parte del archivo de paquete que se instala en el
+rbol del sistema de ficheros, sin incluir ficheros especficos del sistema
+de empaquetado de Debian. La lista se genera con el formato producido por el
+listado informativo de \fBtar\fP.
+.TP 
+\fB\-x\fP, \fB\-\-extract\fP \fIdirectorio\-archivo\fP
+Extrae el rbol del sistema de ficheros del archivo de paquetes al
+directorio especificado.
+
+Tenga en cuenta que \fIno\fP obtendr una instalacin correcta si extrae un
+paquete en el directorio raz! Use \fBdpkg\fP para instalar paquetes.
+
+Se crear el \fIdirectorio\fP (pero no los directorios padre) de ser necesario,
+modificando sus permisos de acuerdo a los contenidos del paquete.
+.TP 
+\fB\-X\fP, \fB\-\-vextract\fP \fIdirectorio\-archivo\fP
+Is like \fB\-\-extract\fP (\fB\-x\fP)  with \fB\-\-verbose\fP (\fB\-v\fP)  which prints a
+listing of the files extracted as it goes.
+.TP 
+\fB\-R\fP, \fB\-\-raw\-extract\fP \fIarchive directory\fP
+Extracts the filesystem tree from a package archive into a specified
+directory, and the control information files into a DEBIAN subdirectory of
+the specified directory.
+
+El directorio de destino (pero no los directorios padre) se crear de ser
+necesario.
+.TP 
+\fB\-\-fsys\-tarfile\fP \fIarchivo\fP
+Extracts the filesystem tree data from a binary package and sends it to
+standard output in \fBtar\fP format. Together with \fBtar\fP(1)  this can be used
+to extract a particular file from a package archive.  The input archive will
+always be processed sequentially.
+.TP 
+\fB\-e\fP, \fB\-\-control\fP \fIarchivo\fP [\fIdirectorio\fP]
+Extrae los ficheros de informacin de control de un archivo de paquete al
+directorio especificado.
+
+Si no se especifica ningn directorio, se usar el subdirectorio \fBDEBIAN\fP
+del directorio actual.
+
+El directorio de destino (pero no los directorios padre) se crear de ser
+necesario.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH OPCIONES
+.TP 
+\fB\-\-showformat=\fP\fIformat\fP
+Esta opcin sirve para especificar el formato de la salida que \fB\-\-show\fP
+producir. El formato es una cadena que ser la salida de cada paquete
+listado.
+
+La cadena puede mostrar cualquier campo de estado usando la forma
+${\fInombre\-campo\fP}, y puede generar una lista de campos vlidos usando
+\fB\-I\fP con el mismo paquete. Para una explicacin de las opciones de formato
+(incluyendo secuencias de escape y el tabulado de los campos), consulte la
+explicacin de la opcin \fB\-\-showformat\fP en \fBdpkg\-query\fP (1).
+
+El valor predefinido de este campo es ${Package}\et${Version}\en.
+.TP 
+\fB\-z\fP\fIcompress\-level\fP
+Specify which compression level to use on the compressor backend, when
+building a package (default is 9 for gzip and bzip2, 6 for xz and lzma).
+.TP 
+\fB\-Z\fP\fIcompress\-type\fP
+Especifica el tipo de compresin a usar al construir un paquete. Los valores
+aceptados son \fIgzip\fP, \fIxz\fP, \fIbzip2\fP, \fIlzma\fP, y \fInone\fP (ninguno). El
+valor predefinido es \fIgzip\fP.
+.TP 
+\fB\-\-new\fP
+Asegura que \fBdpkg\-deb\fP construya un archivo con el nuevo formato. ste es
+el comportamiento por omisin.
+.TP 
+\fB\-\-old\fP
+Fuerza que \fBdpkg\-deb\fP construya un archivo con el formato antiguo
+(old). Este formato antiguo de archivo es ms difcil de analizar por las
+herramientas que no forman parte de Debian, y a da de hoy est
+obsoleto. Slo se usa al construir paquetes que versiones de dpkg anteriores
+a 0.93.76 (septiembre 1995) analizarn, la cual se distribuy slo para
+sistemas i386 en formato a.out.
+.TP 
+\fB\-\-nocheck\fP
+Impide las comprobaciones habituales de \fBdpkg\-deb \-\-build\fP sobre los
+contenidos del archivo. Puede construir cualquier archivo que desee, no
+importa lo mal que est.
+.TP 
+\fB\-v\fP, \fB\-\-verbose\fP
+Enables verbose output. This currently only affects \fB\-\-extract\fP making it
+behave like \fB\-\-vextract\fP.
+.TP 
+\fB\-D\fP, \fB\-\-debug\fP
+Activa los mensajes de depuracin. No son muy interesantes.
+.
+.SH ENTORNO
+.TP 
+\fBTMPDIR\fP
+Si se define, \fBdpkg\-deb\fP lo usar como el directorio en el que crear
+ficheros temporales y directorios.
+.
+.SH FALLOS
+\fBdpkg\-deb \-I\fP \fIpaquete1\fP\fB.deb\fP \fIpaquete2\fP\fB.deb\fP no funciona como
+debera.
+
+No realiza ninguna comprobacin de autenticidad de los ficheros \fB.deb\fP; de
+hecho, ni siquiera una suma de control. Las herramientas de nivel alto como
+APT son capaces de autenticar paquetes obtenidos desde el repositorio dado,
+y la mayora de estos ofrecen a da de hoy un fichero de sumas de control
+md5 generado por debian/rules. Las herramientas de bajo nivel no tienen
+una compatibilidad directa con estos procesos.
+
+No use \fBdpkg\-deb\fP para instalar software! Debe usar \fBdpkg\fP para asegurar
+que todos los ficheros se instalan en el sitio correcto, los scripts del
+paquete se ejecuten y que se registren los contenidos y estado el de ste.
+.
+.SH "VASE TAMBIN"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\fP(1), \fBdselect\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995\-1996 Ian Jackson
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-distaddfile.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-distaddfile.1
--- dpkg/man/es/dpkg-distaddfile.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-distaddfile.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,60 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-distaddfile 1 2011\-07\-04 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-distaddfile \- Aade entradas a debian/files
+.
+.SH SINOPSIS
+\fBdpkg\-distaddfile\fP [\fIoption\fP...]\fI filename section priority\fP
+.
+.SH DESCRIPCIN
+\fBdpkg\-distaddfile\fP aade una entrada para un fichero dado a
+\fBdebian/files\fP.
+
+Toma tres argumentos no opcionales, el nombre de fichero, seccin y
+prioridad para el fichero \fB.changes\fP.
+
+El nombre del fichero debe ser relativo al directorio donde
+\fBdpkg\-genchanges\fP espera encontrar los ficheros, habitualmente \fB..\fP, en
+lugar de ser relativo al directorio donde se ejecuta \fBdpkg\-distaddfile\fP.
+.
+.SH OPCIONES
+.TP 
+\fB\-f\fP\fIfichero\-lista\-ficheros\fP
+Lee o escribe la lista de ficheros a subir desde el fichero especificado, en
+lugar de usar \fBdebian/files\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH FICHEROS
+.TP 
+\fBdebian/files\fP
+La lista de ficheros generados que son parte de los datos subidos en
+proceso. Puede usar \fBdpkg\-distaddfile\fP para aadir ficheros adicionales.
+.
+.SH AUTORES
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-divert.8 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-divert.8
--- dpkg/man/es/dpkg-divert.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-divert.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,159 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-divert 8 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-divert \- Redefine la versin de un fichero del paquete
+.
+.SH SINOPSIS
+\fBdpkg\-divert\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH DESCRIPCIN
+\fBdpkg\-divert\fP es una herramienta para configurar y actualizar la lista de
+redirecciones.
+.PP
+La \fIredireccin\fP (diversion) de ficheros es una forma de evitar que dpkg
+instale un fichero en su ubicacin, sino que lo instale en una ubicacin
+\fIredirigida\fP. Las redirecciones se pueden usar a travs de los scripts en
+los paquetes Debian para mover un fichero cuando causa un conflicto. Los
+administradores de sistema pueden usarlo tambin para redefinir el fichero
+de configuracin de algn paquete, o cuando algunos ficheros (que no estn
+marcados como conffiles) deben ser preservados por dpkg si se instala una
+versin nueva del paquete que contiene estos ficheros.
+.sp
+.SH RDENES
+.TP 
+[\fB\-\-add\fP] \fIfichero\fP
+Aade una redireccin para el \fIfichero\fP.
+.TP 
+\fB\-\-remove\fP\fI fichero\fP
+Elimina una redireccin para el \fIfichero\fP.
+.TP 
+\fB\-\-list\fP\fI comodn\fP
+Lista las redirecciones que encajan con el \fIcomodn\fP (patrn glob).
+.TP 
+\fB\-\-listpackage\fP\fI fichero\fP
+Muestra el nombre del paquete que redirige al \fIfichero\fP. Muestra LOCAL si
+el fichero est redirigido localmente, y nada si el \fIfichero\fP no est
+redirigido.
+.TP 
+\fB\-\-truename\fP\fI fichero\fP
+Muestra el nombre real del fichero redirigido.
+.
+.SH OPCIONES
+.TP 
+\fB\-\-admindir\fP\fI directorio\fP
+Define el directorio de datos de dpkg como \fIdirectorio\fP (por omisin:
+\fI/var/lib/dpkg\fP).
+.TP 
+\fB\-\-divert\fP\fI redirigir\-a\fP
+\fIredirigir\-a\fP es la ubicacin donde las versiones del \fIfichero\fP, tal y
+como otros paquetes lo ofrecen, se redirigir.
+.TP 
+\fB\-\-local\fP
+Especifica que todas las versiones de los paquetes de este fichero se
+redirigirn. Esto es, sin excepciones, y sin importar qu paquete est
+instalado, el fichero se redirigir. El administrador del sistema puede usar
+esto para instalar una versin modificada localmente.
+.TP 
+\fB\-\-package\fP\fI paquete\fP
+<paquete> es el nombre de un paquete cuya copia del \fIfichero\fP no se
+redirigir. Por ejemplo, el \fIfichero\fP se redirigir para todos los paquetes
+a excepcin de \fIpaquete\fP.
+.TP 
+\fB\-\-quiet\fP
+Modo silencioso, esto es: sin informacin detallada.
+.TP 
+\fB\-\-rename\fP
+Mueve el archivo a un lado (o atrs). \fBdpkg\-divert\fP interrumpir la
+operacin en caso de que el fichero destino ya exista.
+.TP 
+\fB\-\-test\fP
+Modo de prueba, esto es, no realiza ningn cambio, slo muestra su
+ejecucin.
+.TP 
+\fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH NOTAS
+When adding, default is \fB\-\-local\fP and \fB\-\-divert\fP
+\fIoriginal\fP\fB.distrib\fP. When removing, \fB\-\-package\fP or \fB\-\-local\fP and
+\fB\-\-divert\fP must match if specified.
+
+Los directorios no se pueden redirigir con \fBdpkg\-divert\fP.
+
+Debe tener cuidado al redireccionar bibliotecas compartidas, \fBldconfig\fP (8)
+crea un enlace simblico basado en el campo DT_SONAME integrado en la
+biblioteca. Ya que ldconfig no respeta las redirecciones (slo dpkg lo
+hace), si una biblioteca redirigida tiene el mismo SONAME que la que no
+est redirigida, es posible que el enlace simblico acabe apuntando a la
+biblioteca redirigida.
+.
+.SH EJEMPLOS
+Para redireccionar todas las copias de \fI/usr/bin/ejemplo\fP a
+\fI/usr/bin/ejemplo.foo\fP; har que todos los paquetes que provean
+\fI/usr/bin/ejemplo\fP lo instalen como \fI/usr/bin/ejemplo.foo\fP, renombrando el
+fichero en caso de ser necesario.
+.HP
+dpkg\-divert \-\-divert /usr/bin/ejemplo.foo \-\-rename /usr/bin/ejemplo
+.PP
+Para eliminar esa redireccin:
+.HP
+dpkg\-divert \-\-rename \-\-remove /usr/bin/ejemplo
+
+.PP
+Para redireccionar cualquier paquete que instale \fI/usr/bin/ejemplo\fP como
+\fI/usr/bin/ejemplo.foo\fP, a excepcin de su propio paquete \fIwibble\fP.
+.HP
+dpkg\-divert \-\-package wibble \-\-divert /usr/bin/ejemplo.foo \-\-rename
+/usr/bin/ejemplo
+.PP
+Para eliminar esa redireccin:
+.HP
+dpkg\-divert \-\-package wibble \-\-rename \-\-remove /usr/bin/ejemplo
+.
+.SH ENTORNO
+.TP 
+\fBDPKG_ADMINDIR\fP
+If set and the \fB\-\-admindir\fP option has not been specified, it will be used
+as the dpkg data directory.
+.TP 
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP
+If set and the \fB\-\-local\fP and \fB\-\-package\fP options have not been specified,
+\fBdpkg\-divert\fP will use it as the package name.
+.
+.SH FICHEROS
+.TP 
+\fI/var/lib/dpkg/diversions\fP
+El fichero que contiene la lista actual de redirecciones en el sistema. Est
+ubicado en el directorio de administracin de dpkg, as como otros ficheros
+importantes para dpkg, como \fIstatus\fP o \fIavailable\fP.
+.br
+Nota: \fBdpkg\-divert\fP preserva la copia antigua de este archivo, insertando
+la extensin \fI\-old\fP antes de reemplazarlo con uno nuevo.
+.
+.SH "VASE TAMBIN"
+\fBdpkg\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995 Ian Jackson
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-genchanges.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-genchanges.1
--- dpkg/man/es/dpkg-genchanges.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-genchanges.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,147 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-genchanges 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-genchanges \- Generacin de ficheros de Debian .changes
+.
+.SH SINOPSIS
+\fBdpkg\-genchanges\fP [\fIoption\fP...]
+.br
+.
+.SH DESCRIPCIN
+\fBdpkg\-genchanges\fP lee la informacin de un rbol de fuentes de Debian
+desempaquetado y construido, as como de los ficheros que ha generado, y
+crea un fichero de control de subida de Debian, el fichero \fB.changes\fP.
+.
+.SH OPCIONES
+.TP 
+\fB\-b\fP, \fB\-B\fP, \fB\-A\fP
+Define que slo se va a realizar una construccin binaria (no se incluyen
+los ficheros de fuente). No hay diferencias entre \fB\-b\fP, \fB\-B\fP y \fB\-A\fP, y el
+fichero \fB.changes\fP incluir aquellos ficheros creados mediante el o los
+target de make binarios (\fBbinary\-*\fP) del paquete a construir.
+.TP 
+\fB\-S\fP
+Define que slo se deben subir las fuentes (no se incluirn paquetes
+binarios).
+.PP
+Las opciones \fB\-s\fP\fIx\fP controlan si el archivo original de las fuentes se
+incluye en la subida generada, en caso de generar alguna fuente (por
+ejemplo, si no se han usado \fB\-b\fP o \fB\-B\fP).
+.TP 
+\fB\-si\fP
+Por omisin, o si se especifica, las fuentes originales se incluirn si el
+nmero de versin del autor original (la versin sin epoch y sin la parte
+del nmero de versin que corresponde a la revisin de Debian) difiere del
+nmero de versin de la fuente original en la entrada del registro de
+cambios.
+.TP 
+\fB\-sa\fP
+Fuerza la inclusin de la fuente original.
+.TP 
+\fB\-sd\fP
+Fuerza la exclusin de la fuente original y slo incluye el fichero de
+diferencias .diff.
+.fi
+.TP 
+\fB\-v\fP\fIversin\fP
+Provoca el uso de la informacin del registro de cambios de todas las
+versiones estrictamente posteriores a \fIversin\fP.
+.TP 
+\fB\-C\fP\fIdescripcin\-de\-cambios\fP
+Lee la descripcin de los cambios del fichero \fIchangesdescription\fP en vez
+de usar la informacin contenida en el fichero de cambios del rbol de
+fuentes.
+.TP 
+\fB\-m\fP\fIdireccin\-mantenedor\fP
+Utiliza \fIdireccin\-mantenedor\fP como el nombre y direccin de correo del
+responsable de este paquete, en lugar de usar la informacin del fichero de
+control del rbol de fuentes.
+.TP 
+\fB\-e\fP\fIdireccin\-mantenedor\fP
+Utiliza \fIdireccin\-mantenedor\fP como el nombre y direccin de correo del
+responsable de esta subida, en lugar de usar la informacin del registro de
+cambios del rbol de fuentes.
+.TP 
+\fB\-V\fP\fInombre\fP\fB=\fP\fIvalor\fP
+Define una variable de sustitucin de la salida. Consulte
+\fBdeb\-substvars\fP(5) para ms informacin acerca de la sustitucin de la
+salida.
+.TP 
+\fB\-T\fP\fIfichero\-variables\-sust\fP
+Lee variables de sustitucin desde el \fIfichero\-variables\-sust\fP;
+\fBdebian/substvars\fP es el valor por omisin. No se realiza ninguna
+sustitucin de variables en ninguno de los campos que son parte de la
+salida. Por otra para, la variable especial \fIFormat\fP sobreescribir el
+campo del mismo nombre. Puede usar esta opcin varias veces para leer
+variables de sustitucin de varios ficheros.
+
+.TP 
+\fB\-D\fP\fIcampo\fP\fB=\fP\fIvalor\fP
+Sobreescribe o aade un campo en el fichero de control de salida.
+.TP 
+\fB\-U\fP\fIcampo\fP
+Elimina un campo del fichero de control de salida.
+.TP 
+\fB\-c\fP\fIfichero\-control\fP
+Define el fichero de control principal de las fuentes del que leer la
+informacin. Por omisin es \fBdebian/control\fP.
+.TP 
+\fB\-l\fP\fIfichero\-cambios\fP
+Define el fichero de registro de cambios del que leer la informacin. Por
+omisin es \fBdebian/changelog\fP.
+.TP 
+\fB\-f\fP\fIfichero\-lista\-ficheros\fP
+Lee o escribe la lista de ficheros para subir aqu, en lugar de usar
+\fBdebian/files\fP.
+.TP 
+\fB\-F\fP\fIformato\-registro\-cambios\fP
+Define el formato del registro de cambios. Por omisin, el formato se lee de
+una lnea especial cerca del final del registro de cambios o, en caso de
+fallo, usa el formato estndar debian.
+.TP 
+\fB\-u\fP\fIdirectorio\-subida\-ficheros\fP
+Busca ficheros a subir en \fIdirectorio\-subida\-ficheros\fP en lugar de \fB..\fP
+(\fBdpkg\-genchanges\fP necesita encontrar estos ficheros para poder incluir sus
+tamaos y sumas de verificacin en el fichero \fB.changes\fP).
+.TP 
+\fB\-q\fP
+Habitualmente, \fBdpkg\-genchanges\fP producir mensajes informativos por la
+salida de error estndar, por ejemplo acerca de cuntos de los ficheros
+fuente de los paquetes se estn subiendo. \fB\-q\fP suprime dichos mensajes.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH FICHEROS
+.TP 
+\fBdebian/files\fP
+La lista de ficheros generados que forman parte de la subida al servidor en
+preparacin. \fBdpkg\-genchanges\fP lee los datos aqu cuando produce un fichero
+\&\fB.changes\fP.
+.
+.SH AUTORES
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-gencontrol.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-gencontrol.1
--- dpkg/man/es/dpkg-gencontrol.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-gencontrol.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,145 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-gencontrol 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-gencontrol \- Generacin de ficheros de control de Debian
+.
+.SH SINOPSIS
+\fBdpkg\-gencontrol\fP [\fIoption\fP...]
+.
+.SH DESCRIPCIN
+\fBdpkg\-gencontrol\fP lee la informacin desde un rbol de fuentes de Debian
+desempaquetado, y genera un fichero de control de paquete binario (por
+omisin ubicado en debian/tmp/DEBIAN/control); durante el proceso, tambin
+simplificar los campos de las relaciones.
+.sp
+Por ello, \fIPre\-Depends\fP, \fIDepends\fP, \fIRecommends\fP y \fISuggests\fP se
+simplifican en este orden mediante la eliminacin de dependencias reales de
+acuerdo a las dependencias ms fuertes ya analizadas. Tambin elimina
+cualquier dependencia sobre si mismo (de hecho, eliminar cualquier
+dependencia tomada como verdadera, true, si la versin actual del paquete
+ya se encuentra instalada). Retendr de forma lgica la interseccin de
+varias dependencias sobre el mismo paquete. El orden de las dependencias se
+modifica lo menos posible: en caso de tener que eliminar una dependencia
+debida a que otra aparece ms adelante en el campo, sta tomar la posicin
+de la dependencia descartada.
+.sp
+Los otros campos de relacin (\fIEnhances\fP, \fIConflicts\fP, \fIBreaks\fP,
+\fIReplaces\fP y \fIProvides\fP) se simplifican individualmente computando la
+unin de todas las dependencias cuando un paquete aparece varias veces en el
+campo.
+.sp
+\fBdpkg\-gencontrol\fP tambin aade una entrada para el paquete binario en
+\fBdebian/files\fP.
+.
+.SH OPCIONES
+.TP 
+\fB\-v\fP\fIversin\fP
+Define el nmero de versin del paquete binario a generar.
+.TP 
+\fB\-V\fP\fInombre\fP\fB=\fP\fIvalor\fP
+Define una variable de sustitucin de la salida. Consulte
+\fBdeb\-substvars\fP(5) para ms informacin acerca de la sustitucin de la
+salida.
+.TP 
+\fB\-T\fP\fIfichero\-variables\-sust\fP
+Lee variables de sustitucin desde el \fIfichero\-variables\-sust\fP;
+\fBdebian/substvars\fP es el valor por omisin. Puede usar esta opcin varias
+veces para leer variables de sustitucin de varios ficheros.
+.TP 
+\fB\-D\fP\fIcampo\fP\fB=\fP\fIvalor\fP
+Sobreescribe o aade un campo en el fichero de control de salida.
+.TP 
+\fB\-U\fP\fIcampo\fP
+Elimina un campo del fichero de control de salida.
+.TP 
+\fB\-c\fP\fIfichero\-control\fP
+Define el fichero de control principal de las fuentes del que leer la
+informacin. Por omisin es \fBdebian/control\fP.
+.TP 
+\fB\-l\fP\fIfichero\-cambios\fP
+Define el fichero de registro de cambios del que leer la informacin. Por
+omisin es \fBdebian/changelog\fP.
+.TP 
+\fB\-f\fP\fIfichero\-lista\-ficheros\fP
+Lee o escribe la lista de ficheros a subir desde el fichero especificado, en
+lugar de usar \fBdebian/files\fP.
+.TP 
+\fB\-F\fP\fIformato\-registro\-cambios\fP
+Define el formato del registro de cambios. Por omisin, el formato se lee de
+una lnea especial cerca del final del registro de cambios o, en caso de
+fallo, usa el formato estndar debian.
+.TP 
+\fB\-p\fP\fIpaquete\fP
+Genera informacin para el paquete binario \fIpaquete\fP. Puede omitir esta
+opcin si el fichero de control de las fuentes lista un slo paquete
+binario; de no ser as, es esencial seleccionar el paquete binario del cual
+se desea generar la informacin.
+.TP 
+\fB\-n\fP\fInombrefichero\fP
+Supone que el nombre de fichero del paquete ser \fInombre\-fichero\fP en vez
+del habitual, paquete_versin_arquitectura.deb.
+.TP 
+\fB\-is\fP, \fB\-ip\fP, \fB\-isp\fP
+Estas opciones se ignoran por compatibilidad con versiones anteriores de
+dpkg\-dev, pero ya estn obsoletas. Antes se usaban para hacer que
+dpkg\-gencontrol incluyese los campos Section y Priority en el fichero de
+control. Hoy en da es el comportamiento predefinido. Si desea el
+comportamiento antiguo deber usar la opcin \fB\-U\fP para eliminar los campos
+del fichero de control.
+.TP 
+\fB\-P\fP\fIdirectorio\-compilacin\-paquete\fP
+Dice a \fBdpkg\-source\fP que el paquete se est creando en
+\fIdirectorio\-compilacin\-paquete\fP en vez de \fBdebian/tmp\fP. Se usa para
+encontrar el valor por omisin de la variable de sustitucin y campo del
+fichero de control \fBInstalled\-Size\fP, Tamao\-Instalado, (usando \fBdu\fP), y
+para establecer la ruta predefinida del fichero de salida.
+.TP 
+\fB\-O\fP
+Muestra el fichero de control por la salida estndar, en lugar de
+\fBdebian/tmp/DEBIAN/control\fP (o
+\fIdirectorio\-compilacin\-paquete\fP\fB/DEBIAN/control\fP si se us la opcin
+\fB\-P\fP).
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH FICHEROS
+.TP 
+\fBdebian/control\fP
+El fichero de informacin de control de fuentes principal, que da
+informacin independiente de la versin acerca del paquete fuente y los
+paquetes binarios que puede generar.
+.TP 
+\fBdebian/files\fP
+La lista de ficheros generados que forman parte de la subida en
+preparacin. \fBdpkg\-gencontrol\fP aade los supuestos nombres de fichero de
+paquetes binarios cuyos ficheros de control genera.
+.
+.SH AUTORES
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2007\-2008 Rapha\[:e]l Hertzog
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-gensymbols.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-gensymbols.1
--- dpkg/man/es/dpkg-gensymbols.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-gensymbols.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,517 @@
+.\" Author: Raphaël Hertzog
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-gensymbols 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-gensymbols \- Generacin de ficheros symbols (informacin de
+dependencia de bibliotecas compartidas)
+.
+.SH SINOPSIS
+\fBdpkg\-gensymbols\fP [\fIoption\fP...]
+.
+.SH DESCRIPCIN
+\fBdpkg\-gensymbols\fP analiza un rbol temporal de construccin (debian/tmp
+por omisin) en busca de bibliotecas para generar un fichero \fIsymbols\fP que
+los describa. Este fichero, si no est vaco, se instala en el subdirectorio
+DEBIAN del rbol de construccin, para despus incluir el contenido en la
+informacin de control del paquete.
+.P
+Al generar estos ficheros, usa algunos ficheros symbols como entrada
+proporcionados por el desarrollador. Busca los siguientes ficheros, usando
+el primero que encuentra.
+.IP \(bu 4
+debian/\fIpackage\fP.symbols.\fIarch\fP
+.IP \(bu 4
+debian/symbols.\fIarch\fP
+.IP \(bu 4
+debian/\fIpackage\fP.symbols
+.IP \(bu 4
+debian/symbols
+.P
+La meta principal de estos ficheros es proporcionar la versin mnima
+asociada a cada smbolo proporcionado por las bibliotecas. Habitualmente, se
+corresponde con la primera versin de ese paquete que proporciona el
+smbolo, pero el desarrollador lo puede incrementar manualmente si la ABI
+del smbolo se extiende sin romper la compatibilidad con versiones
+anteriores. Es la responsabilidad del desarrollador que estos ficheros estn
+al da y que sean apropiados, pero \fBdpkg\-gensymbols\fP le asiste en esta
+tarea.
+.P
+Cuando los ficheros symbols generados difieren del proporcionado por el
+desarrollador, \fBdpkg\-gensymbols\fP mostrar las diferencias entre ambas
+versiones. Ms an, puede que falle si la diferencia es demasiado grande,
+(puede configurar cuanta diferencia tolerar, consulte la opcin \fB\-c\fP).
+.SH "MANTENER FICHEROS SYMBOLS"
+Los ficheros symbols son realmente tiles slo cuando reflejan la
+evolucin del paquete a lo largo de varias publicaciones. Por ello, el
+desarrollador tiene que actualizarlos cada vez que se aada un smbolo
+nuevo, para que as la mnima versin asociada concuerde con la
+realidad. Para hacer esto apropiadamente puede usar los diff contenidos en
+los registros de construccin. En la mayora de los caso, el diff se
+aplica directamente sobre el fichero debian/\fIpackage\fP.symbols. Dicho
+esto, es necesario afinar este proceso: se recomienda, por ejemplo, eliminar
+el nmero de revisin de Debian de la versin mnima para que as aquellas
+adaptaciones hacia atrs (backports) con un nmero de versin menor, pero
+con la misma versin que la fuente original, puedan satisfacer las
+dependencias generadas. Si no se puede eliminar la revisin de Debian porque
+el smbolo se aadi debido a un cambio especfico de Debian puede afijar
+~ a la versin.
+.P
+Antes de aplicar un parche al fichero symbols el desarrollador debera
+revisar nuevamente que es adecuado. Se espera que los smbolos pblicos no
+desaparezcan as que, idealmente, el parche slo debera aadir lneas
+nuevas.
+.P
+Note that you can put comments in symbols files: any line with '#' as the
+first character is a comment except if it starts with '#include' (see
+section \fBUsing includes\fP). Lines starting with '#MISSING:' are special
+comments documenting symbols that have disappeared.
+.SS "Usar la sustitucin de #PACKAGE#"
+.P
+En algunos casos aislados el nombre de la biblioteca vara segn la
+arquitectura. Puede usar el marcador \fI#PACKAGE#\fP para evitar incrustar
+(hardcode) el nombre del paquete en el fichero symbols. Se reemplazar
+por el nombre real del paquete durante la instalacin de los ficheros
+symbols. A diferencia del marcador \fI#MINVER#\fP, \fI#PACKAGE#\fP nunca
+aparecer en un fichero symbols contenido en un paquete binario.
+.SS "Usar etiquetas de smbolos"
+.P
+El etiquetado de smbolos es til para marcar aquellos smbolos que son de
+alguna manera especiales. Cada smbolo puede tener un nmero arbitrario de
+etiquetas asociadas a ste. Aunque se analizan y guardan todas las
+etiquetas, \fBdpkg\-gensymbols\fP slo entiende algunas de ellas, e iniciar un
+tratamiento especial de los smbolos. Consulte la sub\-seccin \fBEtiquetas
+estndar de smbolos\fP para una referencia de estas etiquetas.
+.P
+La especificacin de la etiqueta aparece a continuacin del nombre del
+smbolo (no se permite un espacio vaco entre estos). Siempre comienza con
+un parntesis de apertura \fB(\fP, finaliza con un parntesis de cierre \fB)\fP, y
+debe contener al menos una etiqueta. Varias etiquetas se separan con un
+carcter \fB|\fP. Opcionalmente, cada etiqueta puede tener un valor separado
+del nombre de la etiqueta mediante el carcter \fB=\fP. Los nombres de etiqueta
+y valores pueden ser cadenas arbitrarias, a excepcin de que no pueden
+contener ningn carcter especial: \fB)\fP, \fB|\fP y \fB=\fP. Los nombres de smbolo
+a continuacin de una especificacin de etiqueta se pueden entrecomillar con
+caracteres \fB'\fP o \fB"\fP, permitiendo as espacios vacos. Por otra parte, de
+no existir ninguna etiqueta definida para el smbolo, las comillas se
+tratarn como parte del nombre del smbolo, continuando hasta el primer
+espacio.
+.P
+ (tag1=tengo una marca|nombre de etiqueta con espacio)"smbolo
+ entrecomillado y etiquetado"@Base 1.0
+ (optional)smbolo_sin_comillas_y_etiquetado@Base 1.0 1
+ smbolo_sin_etiquetar@Base 1.0
+.P
+El primer smbolo del ejemplo se llama \fIsmbolo entrecomillado y
+etiquetado\fP, y tiene dos etiquetas: \fItag1\fP, con el valor \fItengo una marca\fP
+y \fInombre de etiqueta con espacio\fP, que no tiene valor. El segundo smbolo
+se llama \fIsmbolo_sin_comillas_y_etiquetado\fP, y slo tiene una etiqueta
+llamada \fIoptional\fP. El ltimo smbolo es un ejemplo de un smbolo normal
+sin etiquetar.
+.P
+Debido a que las etiquetas de smbolos son una extensin del formato
+\fIdeb\-symbols(5)\fP slo pueden formar parte de los ficheros symbols de
+paquetes fuente (estos ficheros deberan aparecer como plantillas usadas
+para generar los ficheros symbols integrados en paquetes binarios). Cuando
+invoca \fBdpkg\-gensymbols\fP con la opcin \fI\-t\fP, enviar por la salida
+ficheros symbols compatibles con el formato \fIdeb\-symbols(5)\fP: procesa
+completamente los smbolos de acuerdo a los requerimientos de sus etiquetas
+estndar, y elimina todas las etiquetas de la salida. Por otra parte, en el
+modo plantilla (\fI\-t\fP), todos los smbolos y etiquetas (estndar y
+desconocidos) se muestran por la salida, y se escriben en su forma original
+a medida que se cargan.
+.SS "Etiquetas de smbolo estndar"
+.TP 
+\fBoptional\fP
+Un smbolo marcado como opcional puede desaparecer de la biblioteca en
+cualquier momento sin causar un fallo de \fBdpkg\-gensymbols\fP. Por otra parte,
+los smbolos opcionales desaparecidos aparecern continuamente como
+MISSING (ausente) en el diff de cada nueva revisin del paquete. Este
+comportamiento sirve como un recordatorio para el desarrollador para
+informar de la necesidad de eliminar tal smbolo del fichero symbols, o de
+aadir ste nuevamente a la biblioteca. Cuando el smbolo opcional declarado
+previamente como MISSING reaparece de sbito en la siguiente revisin, se
+actualizara a un estado existente sin modificar la versin mnima.
+
+Esta etiqueta es til para aquellos smbolos privados cuya desaparicin no
+rompe la ABI. Por ejemplo, la mayora de plantillas de produccin de un
+objeto definido ms especficamente por medio del reemplazo de ciertas
+variables por valores (instantiation) de C++ se encuentran dentro de esta
+categora. Al igual que con cualquier otra etiqueta, ste puede tener un
+valor arbitrario: se puede usar para indicar porqu el smbolo se considera
+opcional.
+.TP 
+\fBarch=\fP\fIlista\-de\-arquitecturas\fP
+Esta etiqueta permite limitar el conjunto de arquitecturas dnde se supone
+que el smbolo existe. Cuando la lista de smbolos se actualiza con los
+smbolos descubiertos en la biblioteca, todos los smbolos especficos de la
+arquitectura que no son relevantes para la arquitectura anfitrin se toman
+como no existentes. Si un smbolo especfico a la arquitectura que concuerda
+con la arquitectura anfitrin presente no existe en la biblioteca, se
+aplicarn los procedimientos normales para smbolos desaparecidos, llevando
+a que \fBdpkg\-gensymbols\fP falle. Por otra parte, si el smbolo especfico a
+la arquitectura se encuentra cuando se supona que no existe (porque la
+arquitectura anfitrin presente no est listada en la etiqueta), pasa a ser
+neutral a la arquitectura (por ejemplo, se elimina la etiqueta de
+arquitectura, apareciendo el smbolo en el diff debido a la modificacin),
+pero no se toma como un nuevo smbolo.
+
+Al operar en el modo por omisin (sin plantilla) slo se escribirn al
+fichero symbols aquellos smbolos especficos a la arquitectura que
+coinciden con la arquitectura anfitrin. Por otra parte, en el modo
+plantilla todos los smbolos especficos a la arquitectura (incluyendo
+arquitecturas alternativas) siempre se escribirn al fichero symbols.
+
+El formato de \fIlista\-de\-arquitecturas\fP es el mismo que el usado en el campo
+\fIBuild\-Depends\fP de \fIdebian/control\fP (a excepcin de los parntesis
+cuadrados de cierre []). Por ejemplo, el primer smbolo de la lista a
+continuacin se considerar slo en las arquitecturas alpha, amd64,
+kfreebsd\-amd64 y ia64, mientras que el segundo en todos menos armel.
+
+ (arch=alpha amd64 kfreebsd\-amd64 ia64)un_smbolo _especfico_64bit@Base 1.0
+ (arch=!armel)smbolo_que_armel_no_tiene@Base 1.0
+.TP 
+\fBignore\-blacklist\fP
+dpkg\-gensymbols tiene una lista negra interna de smbolos que no deberan
+aparecer en los ficheros symbols, ya que habitualmente son slo efectos
+secundarios de los detallas de implementacin de la cadena de
+herramientas. Si por alguna razn desea incluir uno de esos smbolos en el
+fichero symbols debera etiquetar el smbolo con
+\fBignore\-blacklist\fP. Puede ser necesario con alguna cadena de herramientas
+de bajo nivel como libgcc.
+.TP 
+\fBc++\fP
+Denota el patrn \fIc++\fP\- Consulte la subseccin a continuacin \fBUsar
+patrones de smbolos\fP.
+.TP 
+\fBsymver\fP
+Denota el patrn de smbolos \fIsymver\fP (versin del smbolo). Consulte la
+sub\-seccin a continuacin \fBUsar patrones de smbolos\fP.
+.TP 
+\fBregex\fP
+Denota el patrn de smbolos \fIregex\fP (expresin regular). Consulte la
+sub\-seccin a continuacin \fBUsar patrones de smbolos\fP.
+.SS "Usar patrones de smbolos."
+.P
+A diferencia de cualquier definicin de smbolo estndar un patrn puede
+cubrir varios smbolos reales de la biblioteca. \fBdpkg\-gensymbols\fP intentar
+emparejar cada patrn con cada smbolo real que \fIno\fP tiene un smbolo
+especfico de contrapartida definido en el fichero de smbolos. En el
+momento que se encuentre el primer patrn que coincida se usarn todas sus
+etiquetas y propiedades como un definicin bsica del smbolo. Si ninguno de
+los patrones encaja, el smbolo se considerar nuevo.
+
+Un patrn se considera perdido si no encaja con ningn smbolo en la
+biblioteca. Por omisin, esto accionar un fallo de \fBdpkg\-gensymbols\fP bajo
+\fI\-c1\fP o un nivel superior. Aun as, si no desea la aparicin del fallo,
+puede marcar el patrn con la etiqueta \fIoptional\fP. Entonces, si el patrn
+no encaja con nada simplemente aparecer en el diff como MISSING. An
+ms, al igual que con cualquier smbolo, puede limitar el patrn a unas
+arquitecturas definidas con la etiqueta \fIarch\fP. Consulte la seccin
+anterior \fBEtiquetas de smbolo estndar\fP.
+
+Los patrones son una extensin del formato \fIdeb\-symbols(5)\fP, y por ello
+slo son vlidos en plantillas de fichero de smbolos. Por otra parte, la
+parte del nombre del smbolo definido sirve como una expresin que se
+comparar con el \fInombre@versin\fP del smbolo real. Para poder distinguir
+entre los diferentes tipos de patrn, ste se etiquetar habitualmente con
+una etiqueta especial.
+
+A da de hoy, \fBdpkg\-gensymbols\fP es compatible con tres tipos de patrones
+bsicos:
+.TP  3
+\fBc++\fP
+Este patrn se indica con la etiqueta \fIc++\fP. Slo encaja con el nombre
+demangled de smbolos C++ (tal y como muestra la herramienta
+\fBc++filt\fP(1)). Este patrn es de utilidad para emparejar smbolos con
+nombres mangled que pueden variar segn la arquitectura, mientras que sus
+nombres demangled permanecen sin cambios. Un grupo de estos smbolos son
+los \fIthunk no virtuales\fP, que tienen direcciones relativas (offsets)
+especficas a la arquitectura integradas en sus nombres mangled. Un
+ejemplo comn de este caso es un destructor virtual, que bajo una herencia
+de diamante necesita un smbolo thunk no virtual. Por ejemplo, incluso si
+_ZThn8_N3NSB6ClassDD1Ev@Base en arquitecturas de 32bit es
+_ZThn16_N3NSB6ClassDD1Ev@Base en arquitecturas de 64bit, puede emparejarlo
+con un nico patrn \fIc++\fP:
+.RS
+.PP
+libdummy.so.1 libdummy1 #MINVER#
+ [...]
+ (c++)"non\-virtual thunk to NSB::ClassD::~ClassD()@Base" 1.0
+ [...]
+.P
+Puede obtener el nombre demangled del ejemplo anterior ejecutando la
+siguiente orden:
+.PP
+ $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt
+.P
+Observe que aunque el nombre mangled sea por definicin nico en la
+biblioteca, no es necesariamente cierto para nombres demangled. Puede que
+dos smbolos reales y distintos tengan el mismo nombre demangled. Por
+ejemplo, en caso de existir smbolos thunk no virtuales en complejas
+configuraciones de herencia, o con la mayora de constructores y
+destructores (ya que habitualmente g++ genera dos smbolos para ellos). Por
+otra parte, estas colisiones aparecen al nivel de la ABI, y por ello no
+deberan degradar la calidad del fichero de smbolos.
+.RE
+.TP 
+\fBsymver\fP
+La etiqueta \fIsymver\fP indica este patrn. Las bibliotecas bien mantenidas
+tienen smbolos con versin, donde cada versin corresponde con la versin
+del autor original en la que se aadi el smbolo. De ser as, puede usar un
+patrn \fIsymver\fP para emparejar el smbolo asociado con una versin en
+particular. Por ejemplo:
+.RS
+.PP
+libc.so.6 libc6 #MINVER#
+ (symver)GLIBC_2.0 2.0
+ [...]
+ (symver)GLIBC_2.7 2.7
+ access@GLIBC_2.0 2.2
+.PP
+Todos los smbolos asociados con las versiones GLIBC_2.0 y GLIBC_2.7
+llevan a una versin mnima de 2.0 y 2.7 respectivamente, con la excepcin
+del smbolo access@GLIBC_2.0. El segundo lleva a una dependencia mnima
+sobre la versin 2.2 de libc6, a pesar de estar en el rango del patrn
+(symver)GLIBC_2.0, debido a que los smbolos especficos tiene precedencia
+sobre los patrones.
+.P
+Tenga en cuanta que los patrones de comodn antiguos (indicados por
+*@versio en el campo del nombre del smbolo) son an compatibles, aunque
+han quedado obsoletos por el nuevo estilo de sintaxis
+(symver|optional)versin. Por ejemplo, debera escribir *@GLIBC_2.0 2.0
+como (symver|optional)GLIBC_2.0 2.0 si desea el mismo comportamiento.
+.RE
+.TP 
+\fBregex\fP
+Los patrones de expresiones regulares se indican con la etiqueta
+\fIregex\fP. Buscan coincidencias con la expresin regular de perl definido en
+el campo de nombre del smbolo. Una expresin regular se empareja tal cual,
+por ello no olvide insertar \fI^\fP al inicio de la misma o puede que coincida
+con cualquier parte de la cadena real del smbolo \fInombre@versin\fP. Por
+ejemplo:
+.RS
+.PP
+libdummy.so.1 libdummy1 #MINVER#
+ (regex)"^mystack_.*@Base$" 1.0
+ (regex|optional)"private" 1.0
+.P
+Los smbolos como mystack_new@Base, mystack_push@Base,
+mystack_pop@Base y similares encajaran con el primer patrn, mientras que
+otros como ng_mystack_new@Base no lo haran. El segundo patrn encaja con
+todos los smbolos con private en su nombre, y las coincidencias heredarn
+de este patrn la etiqueta \fIoptional\fP.
+.RE
+.P
+Puede combinar los patrones listados anteriormente, cuando tenga sentido. En
+tal caso, se procesan en el orden de las etiquetas definidas. Por ejemplo,
+ambos
+.PP
+ (c++|regex)"^NSA::ClassA::Private::privmethod\ed\e(int\e)@Base" 1.0
+ (regex|c++)N3NSA6ClassA7Private11privmethod\edEi@Base 1.0
+.P
+encaja con _ZN3NSA6ClassA7Private11privmethod1Ei@Base y
+_ZN3NSA6ClassA7Private11privmethod2Ei@Base. Al comparar el primer patrn
+se demangle el smbolo sin procesar como smbolo C++, para despus
+comparar el nombre demangled con la expresin regular. Por otra parte, al
+comparar el segundo patrn la expresin regular se compara con el nombre sin
+procesar del smbolo, para despus confirmar si es un smbolo de C++
+mediante demangle. Un fallo de un patrn bsico lleva a un fallo de todo
+el patrn. Por ejemplo, __N3NSA6ClassA7Private11privmethod\edEi@Base no
+encajara con ningn patrn porque no es un smbolo vlido de C++.
+.P
+En general, todos los patrones se dividen en dos grupos: aliases (los
+bsicos \fIc++\fP y \fIsymver\fP) y patrones genricos (\fIregex\fP, todas las
+combinaciones de varios patrones bsicos). Establecer coincidencias con
+patrones basados en alias es rpido (0(1)) mientras que los patrones
+genricos son 0(N) (N \- cuenta genrica del patrn) para cada
+smbolo. Debido a ello, se recomienda no abusar de los patrones genricos.
+.P
+Los alias (primero \fIc++\fP, despus \fIsymver\fP) tienen prioridad sobre los
+patrones genricos. stos se emparejan por orden de aparicin en la
+plantilla del fichero de smbolos hasta el primer resultado de xito. Tenga
+en cuenta, no obstante, que no se recomienda la reorganizacin manual de las
+entradas en plantillas de fichero ya que \fBdpkg\-gensymbols\fP genera diffs
+basados en el orden alfanumrico de sus nombres.
+.SS "Usar include"
+.P
+Hay casos en los que usar un slo fichero de smbolos es contraproducente
+cuando el conjunto de smbolos exportados difiere segn la arquitectura. En
+estos casos, una directiva include puede ser til de un par de maneras:
+.IP \(bu 4
+Puede factorizar la parte comn en algn fichero externo, e incluir ese
+fichero en su fichero \fIpaquete\fP.symbols.\fIarq\fP usando una directiva
+include como esta:
+
+#include "\fIpackages\fP.symbols.common"
+.IP \(bu
+Al igual que con cualquier smbolo, puede etiquetar la directiva include:
+
+(tag|..|tagN)#include "file\-to\-include"
+
+As a result, all symbols included from \fIfile\-to\-include\fP will be considered
+to be tagged with \fItag\fP .. \fItagN\fP by default. You can use this feature to
+create a common \fIpackage\fP.symbols file which includes architecture specific
+symbol files:
+
+  common_symbol1@Base 1.0
+ (arch=amd64 ia64 alpha)#include "package.symbols.64bit"
+ (arch=!amd64 !ia64 !alpha)#include "package.symbols.32bit"
+  common_symbol2@Base 1.0
+.P
+Los ficheros de smbolos se leen lnea a lnea, y las directivas include
+se procesan por orden de aparicin. Esto significa que el contenido del
+fichero incluido puede sustituir cualquier contenido aparecido antes de la
+directiva include, y que todo contenido a continuacin de la directiva
+puede sustituir cualquier contenido del fichero incluido. Todo smbolo (o
+incluso otra directiva #include) en el fichero incluido puede especificar
+etiquetas adicionales, o sustituir valores de las etiquetas heredadas en la
+especificacin de etiqueta. Por otra parte, el smbolo no puede eliminar
+ninguna de las etiquetas heredadas.
+.P
+Un fichero incluido puede repetir la lnea de cabecera que contiene el
+SONAME de la biblioteca. En tal caso, sustituye cualquier lnea de
+cabecera leda anteriormente. Por otra parte, generalmente es mejor evitar
+duplicar las lneas de cabecera. A continuacin puede ver una manera de
+realizar esto:
+.PP
+#include "libsomething1.symbols.common"
+ arch_specific_symbol@Base 1.0
+.SS "Buena gestin de bibliotecas"
+.P
+Una biblioteca mantenida adecuadamente tiene las siguientes caractersticas:
+.IP \(bu 4
+su API es estable (los smbolos pblicos nunca se eliminan, sino que slo se
+aaden smbolos nuevos), y los cambios pueden introducir una
+incompatibilidad slo cuando el SONAME cambia;
+.IP \(bu 4
+Idealmente, usa el versionado de smbolos para alcanzar la estabilidad de la
+ABI, a pesar de cambios internos y la extensin de la API;
+.IP \(bu 4
+No exporta smbolos privados (tales como smbolos etiquetados como
+opcionales para evitar un problema).
+.P
+Al mantener un fichero symbols es sencillo notar la aparicin y
+desaparicin de smbolos. Pero es ms difcil notar cambios incompatibles en
+las API y ABI. Por ello, el responsable del paquete debera leer
+cuidadosamente el registro de cambios de la fuente original en busca de
+casos en los que se ha roto la correcta gestin de bibliotecas. Se debera
+notificar al autor original en caso de encontrar problemas potenciales, ya
+que un arreglo en la fuente original del software es siempre preferible a un
+arreglo especfico de Debian.
+.SH OPCIONES
+.TP 
+\fB\-P\fP\fIdirectorio\-compilacin\-paquete\fP
+Analiza \fIdirectorio\-compilacin\-paquete\fP en lugar de debian/tmp.
+.TP 
+\fB\-p\fP\fIpaquete\fP
+Define el nombre del paquete. Es necesario si aparece ms de un paquete
+binario en debian/control (o si no existe ningn fichero
+debian/control).
+.TP 
+\fB\-v\fP\fIversin\fP
+Define la versin del paquete. El valor por omisin es la versin extrada
+de debian/changelog. Necesario en caso de una invocacin externa al rbol
+del paquete fuente.
+.TP 
+\fB\-e\fP\fIfichero\-biblioteca\fP
+Slo analiza las bibliotecas listadas explcitamente, en lugar de buscar
+todas las bibliotecas pblicas. Puede usar una expresin regular en
+\fIfichero\-biblioteca\fP para emparejar varias bibliotecas con un nico
+argumento (de otra forma, necesita varias \fB\-e\fP).
+.TP 
+\fB\-I\fP\fInombre\-fichero\fP
+Usa \fInombre\-fichero\fP como un fichero de referencia para generar el fichero
+symbols integrado en el mismo paquete.
+.TP 
+\fB\-O\fP
+Muestra por la salida estndar el fichero symbols generado, en lugar de
+almacenarlo en el rbol de construccin del paquete.
+.TP  
+\fB\-O\fP\fIfichero\fP
+Guarda el fichero de smbolos generado como \fIfichero\fP. Si el \fIfichero\fP ya
+existe su contenido se usar como base para el fichero symbols
+generado. Puede usar esta caracterstica para actualizar un fichero
+symbols para que coincida con una versin ms reciente de la biblioteca
+del autor original.
+.TP 
+\fB\-t\fP
+Escribe el fichero symbols en modo plantilla en lugar del formato
+compatible con \fIdeb\-symbols(5)\fP. La diferencia ms notable es que en modo
+plantilla los nombres de smbolo y etiquetas se escriben en su forma
+original, en lugar de los nombres de smbolo post\-procesados con las
+etiquetas eliminadas en modo compatible. Adems, puede que se omitan algunos
+smbolos al escribir un fichero estndar de \fIdeb\-symbols(5)\fP (de acuerdo a
+las reglas de procesamiento de etiquetas), mientras que siempre se insertan
+todos los smbolos en el modo plantilla.
+.TP 
+\fB\-c\fP\fI[0\-4]\fP
+Define las comprobaciones a realizar al comparar el fichero symbols
+generado usando como base el fichero de plantilla. El nivel predefinido es
+1. Aumentar los niveles conlleva ms comprobaciones, as como la inclusin
+de todos los niveles inferiores. El nivel 0 nunca falla. El nivel 1 falla si
+algunos smbolos han desaparecido. El nivel 2 falla si se han introducido
+smbolos nuevos. El nivel 3 falla si han desaparecido algunas
+bibliotecas. El nivel 4 falla si se han introducido bibliotecas nuevas.
+
+Puede sustituir este valor con la variable de entorno
+DPKG_GENSYMBOLS_CHECK_LEVEL.
+.TP 
+\fB\-q\fP
+No muestra informes y nunca genera un diff entre el fichero symbols
+generado y el fichero de plantilla tomado como base, ni muestra ningn aviso
+relativo a bibliotecas nuevas o ausentes, o smbolos nuevos o ausentes. Esta
+opcin solo desactiva la salida informativa, pero no las comprobaciones
+(consulte la opcin \fI\-c\fP).
+.TP 
+\fB\-a\fP\fIarquitectura\fP
+Toma \fIarquitectura\fP como la arquitectura anfitrin al procesar ficheros
+symbols. Use esta opcin para generar un fichero symbols o un diff
+para cualquier arquitectura, siempre y cuando sus binarios ya estn
+disponibles.
+.TP 
+\fB\-d\fP
+Activa el modo de depuracin. Se muestran numerosos mensajes que explican
+las acciones de \fBdpkg\-gensymbols\fP.
+.TP 
+\fB\-V\fP
+Activa el modo verboso. El fichero symbols generado contiene smbolos
+obsoletos en la forma de comentarios. Adems, en modo plantilla los patrones
+de smbolo anteceden a los comentarios que listan los smbolos reales que
+coinciden con el patrn.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH "VASE TAMBIN"
+\fBhttp://people.redhat.com/drepper/symbol\-versioning\fP
+.br
+\fBhttp://people.redhat.com/drepper/goodpractice.pdf\fP
+.br
+\fBhttp://people.redhat.com/drepper/dsohowto.pdf\fP
+.br
+\fBdeb\-symbols\fP(5), \fBdpkg\-shlibdeps\fP(1).
+.
+.SH AUTORES
+Copyright \(co 2007\-2009 Rapha\[:e]l Hertzog
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-maintscript-helper.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-maintscript-helper.1
--- dpkg/man/es/dpkg-maintscript-helper.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-maintscript-helper.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,168 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-maintscript\-helper 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-maintscript\-helper \- Solucin alternativa a las limitaciones de dpkg en
+scripts de mantenedor
+.
+.SH SINOPSIS
+\fBdpkg\-maintscript\-helper\fP \fIcommand\fP [\fIparameter\fP...] \fB\-\-\fP
+\fImaint\-script\-parameter\fP...
+.
+.SH "RDENES Y PARMETROS"
+.P
+\fBrm_\fP \fIconffile\fP [\fIltima\-versin\fP [\fIpaquete\fP]]
+.P
+\fBmv_conffile\fP \fIconffile\-antiguo\fP \fIconffile\-nuevo\fP [\fIltima\-versin\fP
+[\fIpaquete\fP]]
+.
+.SH DESCRIPCIN
+.P
+Este programa est diseado para su uso dentro de scripts de mantenedor para
+realizar tareas que dpkg no puede (por ahora) gestionar de forma nativa,
+bien por decisiones de diseo o limitaciones actuales.
+.P
+Many of those tasks require coordinated actions from several maintainer
+scripts (\fBpreinst\fP, \fBpostinst\fP, \fBprerm\fP, \fBpostrm\fP). To avoid mistakes
+the same call simply needs to be put in all scripts and the program will
+automatically adapt its behaviour based on the environment variable
+\fBDPKG_MAINTSCRIPT_NAME\fP and on the maintainer scripts arguments that you
+have to forward after a double dash.
+.
+.SH "TAREAS CON FICHEROS DE CONFIGURACIN CONFFILES"
+.P
+Al actualizar un paquete, dpkg no eliminar automticamente un fichero de
+configuracin (un fichero de configuracin con cambios del usuario que dpkg
+debera preservar) si no est presente en la versin ms reciente. Existen
+dos razones principales para esto: la primera es que puede que el fichero de
+configuracin conffile haya desaparecido accidentalmente, con lo que la
+siguiente versin la restaurara. Los usuarios no querran ver desparecer
+los cambios hechos. La segunda es permitir a los paquetes una transicin de
+un fichero de configuracin conffile mantenido por dpkg a un fichero
+mantenido por los scripts de mantenedor del paquete, habitualmente con una
+herramienta como debconf o ucf.
+.P
+Esto significa que si un paquete pretende renombrar o eliminar un fichero de
+configuracin, debe hacerlo de forma explcita. \fBdpkg\-maintscript\-helper\fP
+se puede usar para implementar con sencillez dentro de los scripts del
+mantenedor la eliminacin y el desplazamiento de ficheros de configuracin
+conffile.
+.
+.SS "ELIMINAR UN FICHERO DE CONFIGURACIN CONFFILE"
+.P
+Si se elimina un fichero de configuracin conffile por completo, se
+debera eliminar del disco a menos que un usuario lo haya modificado. Se
+deberan preservar modificaciones locales en caso de existir. Si se cancela
+la actualizacin del paquete, el fichero de configuracin conffile
+declarado como obsoleto no debera desaparecer.
+.P
+Esto se puede integrar introduciendo el siguiente texto de consola en los
+scripts de mantenedor \fBpreinst\fP, \fBpostinst\fP y \fBpostrm\fP:
+.P
+    dpkg\-maintscript\-helper rm_conffile \e
+        \fIconffile\fP \fIltima\-versin\fP \fIpaquete\fP \-\- "$@"
+.P
+\fIconffile\fP es el nombre del fichero de configuracin conffile a
+eliminar. \fIltima\-versin\fP es la ltima versin del paquete que contena el
+fichero de configuracin conffile (o la ltima versin del paquete que no
+se ocup de eliminar el fichero de configuracin conffile obsoleto en el
+caso de que este mtodo no se implement inmediatamente). Si
+\fIltima\-versin\fP est vaco o se omite, se intentar la operacin en cada
+actualizacin. \fIpaquete\fP es el nombre del paquete, su aparicin es opcional
+ya que el valor por omisin es $DPKG_MAINTSCRIPT_PACKAGE (dpkg define esta
+variable con el nombre del paquete sobre el que acta). Todos los parmetros
+de los scripts de mantenedor se deben introducir al programa despus de
+\-\-.
+.P
+Implementacin actual: en el script \fBpreinst\fP, comprueba si se ha
+modificado el fichero de configuracin y lo renombra bien como
+\fIconffile\fP\fB.dpkg\-remove\fP (si no se ha modificado), o como
+\fIconffile\fP\fB.dpkg\-backup\fP (si se ha modificado). En el script \fBpostinst\fP,
+el segundo fichero se renombra a \fIconffile\fP\fB.dpkg\-bak\fP y se guarda como
+referencia ya que contiene modificaciones del usuario, mientras que el
+primer script se elimina. Si se interrumpe la actualizacin del paquete, el
+script \fBpostrm\fP reinstalar el fichero de configuracin conffile
+original. Durante el purgado, el script \fBpostrm\fP borrar tambin el fichero
+\&\fB.dpkg\-bak\fP mantenido hasta ahora.
+.
+.SS "RENOMBRAR UN FICHERO DE CONFIGURACIN CONFFILE"
+.P
+Si se ha cambiado la ubicacin de un fichero de configuracin conffile
+debe asegurarse de que tambin migra los cambios hechos por el usuario. Esto
+puede parecer en principio como un sencillo cambio en el script \fBpreinst\fP,
+aunque resultar en un dilogo de dpkg para confirmar la edicin del fichero
+conffile incluso si no son responsables de ellos.
+.P
+Puede integrar renombrar con sencillez insertando el siguiente texto de
+consola en los scripts de mantenedor \fBpreinst\fP, \fBpostinst\fP y \fBpostrm\fP.
+.P
+    dpkg\-maintscript\-helper mv_conffile \e
+        \fIconffile\-antiguo\fP \fIconffile\-nuevo\fP \fIltima\-versin\fP
+        \fIpaquete\fP \-\- "$@"
+.P
+\fIconffile\-antiguo\fP y \fIconffile\-nuevo\fP son el nombre antiguo y nuevo del
+fichero de configuracin conffile a renombrar. \fIltima\-versin\fP es la
+ltima versin del paquete que contena el fichero de configuracin
+conffile con el nombre antiguo. Si \fIultima\-versin\fP est vaco o se
+omite, se ejecutar la operacin en cada actualizacin (nota: es ms seguro
+dar la versin y ejecutar la operacin una sola vez). \fIpaquete\fP es el
+nombre del paquete, opcional ya que su valor por omisin es
+$DPKG_MAINTSCRIPT_PACKAGE (dpkg define esta variable con el nombre del
+paquete sobre el que acta). Todos los parmetros de scripts de mantenedor
+se deben introducir despus de \-\-.
+.P
+Implementacin actual: el script \fBpreinst\fP comprueba si se ha modificado el
+fichero de configuracin conffile, preservndolo en su lugar si es as, o
+renombrndolo como \fIconffile\-antiguo\fP\fB.dpkg\-remove\fP en caso
+contrario. Durante la configuracin, el script \fBpostinst\fP elimina
+\fIconffile\-antiguo\fP\fB.dpkg\-remove\fP y renombra \fIconffile\-antiguo\fP como
+\fIconffile\-nuevo\fP si el primero an est disponible. Durante la cancelacin
+de una instalacin o actualizacin el script \fIpostrm\fP renombra
+\fIconffile\-antiguo\fP\fB.dpkg\-remove\fP nuevamente como \fIconffile\-antiguo\fP de
+ser necesario.
+.
+.SH "INTEGRACIN EN PAQUETES"
+.P
+Given that \fBdpkg\-maintscript\-helper\fP is used in the \fBpreinst\fP, using it
+unconditionally requires a pre\-dependency to ensure that the required
+version of dpkg has been unpacked before. The required version depends on
+the command used, for \fBrm_conffile\fP and \fBmv_conffile\fP it is 1.15.7.2:
+.P
+    \fBPre\-Depends:\fP dpkg (>= 1.15.7.2)
+.P
+An as, en muchos casos la operacin efectuada por el programa no es
+crtica para el paquete, y en lugar de usar un pre\-dependencia puede invocar
+el programa slo si sabemos que la orden requerida es compatible con la
+versin de dpkg actualmente instalada:
+.P
+    if dpkg\-maintscript\-helper supports \fIcommand\fP; then
+        dpkg\-maintscript\-helper \fIcommand\fP ...
+    fi
+.
+.SH AUTORES
+Copyright \(co 2010 Rapha\[:e]l Hertzog
+.br
+Copyright \(co 2008 Joey Hess
+.br
+Copyright \(co 2007 Guillem Jover
+.br
+Copyright \(co 2005 Scott James Remnant
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-mergechangelogs.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-mergechangelogs.1
--- dpkg/man/es/dpkg-mergechangelogs.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-mergechangelogs.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,89 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-mergechangelogs 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-mergechangelogs \- Fusin a partir de tres versiones (3\-way merge) de
+ficheros debian/changelog
+.
+.SH SINOPSIS
+\fBdpkg\-mergechangelogs\fP [\fIopcin\fP...] \fIantiguo\fP \fInuevo\-a\fP \fInuevo\-b\fP
+[\fIsalida\fP]
+.
+.SH DESCRIPCIN
+.P
+Este programa usa las tres versiones proporcionadas del registro de cambios
+de Debian para generar un fichero de registro de cambios (changelog)
+fusionado. El registro de cambios resultante se guarda en el fichero
+\fIsalida\fP, o se mostrar por la salida estndar en caso de no introducir tal
+parmetro.
+.P
+Cada entrada se identifica por su nmero de versin y, asumiendo que no
+entran en conflicto, se fusionarn en el orden correcto (por orden
+decreciente del nmero de versin). Cuando se usa \fB\-\-merge\-prereleases\fP, se
+omitir el nmero de versin tras la ltima tilde, de forma que 1.0\-1~exp1
+y 1.0\-1~exp5 se tomarn como la misma entrada. Cuando la misma versin
+est disponible en \fInuevo\-a\fP y \fInuevo\-b\fP, se intentar una fusin estndar
+de las lneas de las tres versiones (slo si esta disponible el mdulo
+Algorithm::Merge \[em] parte del paquete libalgorithm\-merge\-perl \[em],
+de no ser as, obtendr un conflicto global en el contenido de la entrada).
+.
+.SH OPCIONES
+.TP 
+\fB\-\-merge\-prereleases\fP, \fB\-m\fP
+Elimina la parte tras la ltima virgulilla en el nmero de versin al
+realizar una comparacin para identificar si dos entradas son la misma o no.
+.sp
+Es til cuando siempre se usa la misma entrada en el registro de cambios,
+pero aumenta el nmero de versin regularmente. Por ejemplo, puede tener
+2.3\-1~exp1, 2.3\-1~exp2... hasta la publicacin oficial 2.3\-1, teniendo
+todas la misma entrada en el registro de cambios, pero que ha evolucionado
+con el tiempo.
+.TP 
+\fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH LIMITACIONES
+.P
+Se perder durante la fusin todo lo que Dpkg::Changelog no analice. Esto
+puede incluir cosas como modelines de vim, comentarios donde no deberan
+estar, etc.
+.
+.SH "INTEGRACIN CON GIT"
+.P
+Si desea usar este programa para fusionar ficheros de registro de cambios de
+Debian en un repositorio git primero tendr que registrar un nuevo merge
+driver en \fB.git/config\fP o \fB~/.gitconfig\fP:
+.P
+ [merge "dpkg\-mergechangelogs"]
+     name = debian/changelog merge driver
+     driver = dpkg\-mergechangelogs \-m %O %A %B %A
+.P
+Despus tendr que definir el merge attribute para el fichero
+debian/changelog bien en \fB.gitattributes\fP en el mismo repositorio, o en
+\&\fB.git/info/attributes\fP:
+.P
+ debian/changelog merge=dpkg\-mergechangelogs
+.SH AUTOR
+Copyright \(co 2009\-2010 Rapha\[:e]l Hertzog
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-name.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-name.1
--- dpkg/man/es/dpkg-name.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-name.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,112 @@
+.\" This is an -*- nroff -*- source file.
+.\" dpkg-name and this manpage are Copyright © 1995,1996 by Erick Branderhorst.
+.\"
+.\" This is free software; see the GNU General Public Licence version 2
+.\" or later for copying conditions.  There is NO warranty.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-name 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-name \- Renombra paquetes de Debian a nombres completos de paquete
+.
+.SH SINOPSIS
+\fBdpkg\-name\fP [\fIoption\fP...] [\fB\-\-\fP] \fIfile\fP...
+.
+.SH DESCRIPCIN
+.PP
+This manual page documents the \fBdpkg\-name\fP program which provides an easy
+way to rename \fBDebian\fP packages into their full package names. A full
+package name consists of
+\fIpackage\fP\fB_\fP\fIversion\fP\fB_\fP\fIarchitecture\fP\fB.\fP\fIpackage\-type\fP as specified
+in the control file of the package. The \fIversion\fP part of the filename
+consists of the upstream version information optionally followed by a hyphen
+and the revision information. The \fIpackage\-type\fP part comes from that field
+if present or fallbacks to \fBdeb\fP.
+.
+.SH OPCIONES
+.TP 
+\fB\-a\fP, \fB\-\-no\-architecture\fP
+El nombre del fichero de destino no incluir informacin sobre la
+arquitectura.
+.TP 
+\fB\-k\fP, \fB\-\-symlink\fP
+Crea un enlace simblico en vez de mover el fichero.
+.TP 
+\fB\-o\fP, \fB\-\-overwrite\fP
+Los ficheros existentes se sobreescribirn si poseen el mismo nombre que el
+fichero de destino.
+.TP 
+\fB\-s\fP, \fB\-\-subdir\fP [\fIdirectorio\fP]
+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\-\fIarchitecture\fP/\fIsection\fP'. 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
+`\fIsection\fP/binary\-\fIarchitecture\fP'. 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.
+.TP 
+\fB\-c\fP, \fB\-\-create\-dir\fP
+Esta opcin se puede usar junto con la opcin \-s. Si no se encuentra
+ningn directorio de destino, se crear automticamente. \fBUse esta opcin
+con cuidado.\fP
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-v\fP, \fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH EJEMPLOS
+.TP 
+\fBdpkg\-name bar\-foo.deb\fP
+El fichero bar\-foo.deb se renombrar a bar\-foo_1.0\-2_i386.deb o similar
+(dependiendo de cual sea la informacin en la seccin de control de
+bar\-foo.deb).
+.TP 
+\fBfind /root/debian/ \-name \(aq*.deb\(aq | xargs \-n 1 dpkg\-name \-a\fP
+dpkg\-name renombrar todos los ficheros con la extensin .deb dentro del
+directorio /root/debian y sus subdirectorios, en caso de ser necesario, a
+nombres sin informacin de arquitectura.
+.TP 
+\fBfind \-name \(aq*.deb\(aq | xargs \-n 1 dpkg\-name \-a \-o \-s \-c\fP
+\fBNo haga esto.\fP Su archivo se corromper completamente debido a que una
+gran cantidad de paquetes no incluyen una seccin de informacin. \fBNo haga
+esto.\fP
+.TP 
+\fBdpkg \-\-build debian\-tmp && dpkg\-name \-o \-s .. debian\-tmp.deb\fP
+Puede utilizar esto al construir paquetes nuevos.
+.
+.SH FALLOS
+Some packages don't follow the name structure
+\fIpackage\fP\fB_\fP\fIversion\fP\fB_\fP\fIarchitecture\fP\fB.deb\fP.  Packages renamed by
+dpkg\-name will follow this structure. Generally this will have no impact on
+how packages are installed by \fBdselect\fP(1)/\fBdpkg\fP(1), but other
+installation tools might depend on this naming structure.
+.
+.SH "VASE TAMBIN"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\fP(1), \fBdpkg\-deb\fP(1), \fBfind\fP(1),
+\fBxargs\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995,1996 Erick Branderhorst
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-parsechangelog.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-parsechangelog.1
--- dpkg/man/es/dpkg-parsechangelog.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-parsechangelog.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,142 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-parsechangelog 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-parsechangelog \- Anlisis de ficheros de registro de cambios de Debian
+.
+.SH SINOPSIS
+\fBdpkg\-parsechangelog\fP [\fIoption\fP...]
+.
+.SH DESCRIPCIN
+\fBdpkg\-parsechangelog\fP lee y analiza el registro de cambios de un rbol de
+fuentes de Debian desempaquetado, mostrando la informacin contenida a
+travs de la salida estndar en un formato legible por el sistema.
+.
+.SH OPCIONES
+.TP 
+\fB\-l\fP\fIfichero\-cambios\fP
+Define el fichero de registro de cambios del que leer la informacin. Por
+omisin es \fBdebian/changelog\fP.
+.TP 
+\fB\-F\fP\fIformato\-registro\-cambios\fP
+Define el formato del registro de cambios. Por omisin, el formato se lee de
+una lnea especial cerca del final del registro de cambios o, en caso de
+fallo, usa el formato estndar debian.
+.TP 
+\fB\-L\fP\fIdirectorio\-bibliotecas\fP
+Define un directorio adicional en el que buscar scripts de anlisis. Este
+directorio se analiza antes que los directorios predefinidos,
+\fB/usr/local/lib/dpkg/parsechangelog\fP y \fB/usr/lib/dpkg/parsechangelog\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.SS "Opciones de anlisis"
+Las siguientes opciones permiten modificar la salida del analizador de
+registros de cambio, por ejemplo, el rango de las entradas o el formato de
+la salida. Deben ser compatibles con el script analizador en cuestin. Vase
+tambin \fBADVERTENCIAS\fP.
+.TP 
+\fB\-\-format\fP\fI formato\-salida\fP
+Define el formato de la salido. Los valores compatibles son \fIdpkg\fP y
+\fIrfc822\fP. \fIdpkg\fP es el formato de salida clsico (anterior a la existencia
+de esta opcin) y el valor predefinido. Consiste de un prrafo con el
+formato de control de Debian (consulte \fBdeb\-control\fP(5)). En caso de
+requerir ms de una entrada, la mayora de campos se toman de la ltima
+entrada, a menos que se especifique lo contrario:
+.RS
+.TP 
+\fBSource:\fP\fI pkg\-name\fP
+.TP 
+\fBVersion:\fP\fI version\fP
+.TP 
+\fBDistribution:\fP\fI target\-distribution\fP
+.TP 
+\fBUrgency:\fP\fI urgency\fP
+Se usa la urgencia ms elevada presente entre todas las entradas incluidas.
+.TP 
+\fBMaintainer:\fP\fI author\fP
+.TP 
+\fBDate:\fP\fI date\fP
+.TP 
+\fBCloses:\fP\fI bug\-number\fP
+Los campos Closes de todas las entradas incluidas se fusionan.
+.TP 
+\fBChanges:\fP\fI changelog\-entries\fP
+El texto de todas las entradas del registro de cambios se encadena. Para que
+sto tenga un formato de control multi\-lnea de Debian vlido, las lneas
+vacas se reemplazan por un retorno de lnea, y se inserta un sangrado de un
+carcter de espacio en todas las lneas. El contenido exacto depende del
+formato del registro de cambios.
+.RE
+.IP
+Pueden que aparezcan campos adicionales definidos por el usuario.
+.IP
+El formato \fBrfc822\fP emplea los mismos campos, pero devuelve por la salida
+un prrafo por cada entrada en el registro de cambios, de forma que se
+preservan los metadatos de cada entrada.
+.TP 
+\fB\-\-since\fP \fIversin\fP, \fB\-s\fP\fIversin\fP,\fB \-v\fP\fIversin\fP
+Incluye todos los cambios posteriores a la \fIversin\fP.
+.TP 
+\fB\-\-until\fP \fIversin\fP, \fB\-u\fP\fIversin\fP
+Incluye todos los cambios anteriores a la \fIversin\fP.
+.TP 
+\fB\-\-from\fP \fIversin\fP, \fB\-f\fP\fIversin\fP
+Incluye todos los cambios posteriores o de la misma \fIversin\fP.
+.TP 
+\fB\-\-to\fP \fIversin\fP, \fB\-t\fP\fIversin\fP
+Incluye todos los cambios anteriores o de la misma \fIversin\fP.
+.TP 
+\fB\-\-count\fP \fInmero\fP, \fB\-c\fP\fInmero\fP, \fB\-n\fP\fInmero\fP
+Incluye un \fInmero\fP de entradas desde el inicio (o el final en caso de que
+el \fInmero\fP sea menor que 0).
+.TP 
+\fB\-\-offset\fP \fInmero\fP, \fB\-o\fP\fInmero\fP
+Modifica el punto de inicio para \-\-count (cuenta), empezando por el
+principio (o el final si el \fInmero\fP es menor que 0).
+.TP 
+\fB\-\-all\fP
+Incluye todos los cambios. Nota: otras opciones no tendrn efecto cuando
+esta est en uso.
+.
+.SH ADVERTENCIAS
+Todas las \fBOpciones de anlisis\fP, a excepcin de \-v, son compatibles a
+partir de la versin 1.14.16 y posteriores de \fBdpkg\fP. Puede que los
+analizadores de formatos de registro de cambios adems de \fIdebian\fP y
+procedentes de otras fuentes no acepten todas las opciones.
+.
+.SH FICHEROS
+.TP 
+\fBdebian/changelog\fP
+El fichero de registro de cambios se usa para obtener informacin
+dependiente de la versin acerca del paquete fuente, as como la urgencia y
+la distribucin de una subida, los cambios realizados desde una versin en
+concreto y el propio nmero de versin de la fuente.
+.
+.SH AUTORES
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2007, 2008 Frank Lichtenheld
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-query.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-query.1
--- dpkg/man/es/dpkg-query.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-query.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,239 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-query 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-query \- Una herramienta para consultar la base de datos de dpkg
+.
+.SH SINOPSIS
+\fBdpkg\-query\fP [\fIopcin\fP...] \fIorden\fP
+.
+.SH DESCRIPCIN
+\fBdpkg\-query\fP es una herramienta que muestra informacin sobre paquetes
+listados en la base de datos de \fBdpkg\fP.
+.
+.SH RDENES
+.TP 
+\fB\-l\fP, \fB\-\-list\fP [\fIpackage\-name\-pattern\fP...]
+Lista los paquetes que encajan con el patrn dado. Si no se entrega un
+\fIpatrn\-nombre\-paquete\fP, lista los paquetes en \fI/var/lib/dpkg/status\fP,
+excluyendo aquellos marcados como no instalados (esto es, aquellos
+previamente purgados). Puede usar los comodines habituales del intrprete de
+rdenes en el \fIpatrn\-nombre\-paquete\fP. Tenga en cuenta que posiblemente
+tenga que entrecomillar \fIpatrn\-nombre\-paquete\fP para evitar que el
+intrprete realice una expansin del nombre del fichero. Por ejemplo, lo
+siguiente lista todos los paquetes que empiezan con libc6.
+
+.nf
+  \fBdpkg\-query \-l \(aqlibc6*\(aq\fP
+.fi
+
+Las tres primeras columnas de la salida muestran la accin deseada, el
+estado del paquete as como errores, en este orden.
+
+Accin deseada:
+.nf
+  u = Desconocida
+  i = Instalar
+  h = Retener
+  r = Eliminar
+  p = Purgar
+.fi
+
+Estado del paquete
+.nf
+  n = No instalado
+  c = Ficheros de configuracin
+  H = Parcialmente instalado
+  U = Desempaquetado
+  F = Parcialmente configurado
+  W = Disparadores esperando
+  t = Disparadores pendientes
+  i = Instalado
+.fi
+
+Marcas de error:
+.nf
+  <empty> = (none)
+  R = Reinst\-required
+.fi
+
+Un estado con mayscula o una letra de error indica que es posible que el
+cause problemas serios. Para ms informacin acerca de los estados y marcas
+consulte \fBdpkg\fP(1).
+
+El formato de la salida de esta opcin no se puede modificar, pero vara
+automticamente para encajar el ancho de la terminal. Esto se hace para
+lectores humanos, pero no facilita su lectura por el sistema. Consulte \fB\-W\fP
+(\fB\-\-show\fP) y \fB\-\-showformat\fP  para ver una manera de configurar el formato
+de la salida.
+.TP 
+\fB\-W\fP, \fB\-\-show\fP [\fIpackage\-name\-pattern\fP...]
+Al igual que la opcin \fB\-\-list\fP, esto lista todos los paquetes que encajan
+con el patrn dado. Por otra parte, puede configurar la salida usando la
+opcin \fB\-\-showformat\fP. El formato predefinido de la salida da una lnea por
+cada paquete que encaje, mostrando el nombre y la versin instalada, y
+separados por una tabulacin.
+.TP 
+\fB\-s\fP, \fB\-\-status\fP \fInombre\-paquete\fP...
+Report status of specified package. This just displays the entry in the
+installed package status database. When multiple \fIpackage\-name\fP are listed,
+the requested status entries are separated by an empty line.
+.TP 
+\fB\-L\fP, \fB\-\-listfiles\fP \fInombre\-paquete\fP...
+List files installed to your system from \fIpackage\-name\fP. When multiple
+\fIpackage\-name\fP are listed, the requested lists of files are separated by an
+empty line. However, note that files created by package\-specific
+installation\-scripts are not listed.
+.TP 
+\fB\-c\fP, \fB\-\-control\-path\fP \fInombre\-paquete\fP [\fIfichero\-control\fP]
+Lista las rutas de los ficheros de control de \fInombre\-paquete\fP instalados
+en el sistema. Si se define \fIfichero\-control\fP, slo se mostrar la ruta de
+ese fichero de control. \fBAdvertencia\fP: esta orden es semi\-pblica, y slo
+se debera usar como la ltima solucin y en caso de no disponer de ninguna
+otra interfaz. Puede que quede obsoleto en el futuro en caso de aparecer
+mejores interfaces, o si se solucionan las deficiencias actuales de su
+arquitectura.
+.TP 
+\fB\-S\fP, \fB\-\-search\fP \fIpatrn\-bsqueda\-fichero\fP...
+Search for packages that own files corresponding to the given pattern.
+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.
+.TP 
+\fB\-p\fP, \fB\-\-print\-avail\fP \fInombre\-paquete\fP...
+Display details about \fIpackage\-name\fP, as found in
+\fI/var/lib/dpkg/available\fP. When multiple \fIpackage\-name\fP are listed, the
+requested \fIavailable\fP entries are separated by an empty line.
+
+Users of APT\-based frontends should use \fBapt\-cache show\fP \fIpackage\-name\fP
+instead as the \fIavailable\fP file is only kept up\-to\-date when using
+\fBdselect\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH OPCIONES
+.TP 
+\fB\-\-admindir=\fP\fIdirectorio\fP
+Cambia el directorio con la base de datos de \fBdpkg\fP. Por omisin es
+\fI/var/lib/dpkg\fP.
+.TP 
+\fB\-f\fP, \fB\-\-showformat=\fP\fIformato\fP
+Esta opcin sirve para especificar el formato de la salida que \fB\-\-show\fP
+producir. El formato es una cadena que ser la salida de cada paquete
+listado.
+
+En la cadena de formato, \(lq\fB\e\fP\(rq introduce escapes:
+
+.nf
+    \fB\en\fP  nueva lnea
+    \fB\er\fP  retorno de lnea
+    \fB\et\fP  tabulacin
+.fi
+
+\(lq\fB\e\fP\(rq posicionado antes de cualquier otro carcter suprime cualquier
+significado especial que puede tener el siguiente carcter, til para
+\(lq\fB\e\fP\(rq and \(lq\fB$\fP\(rq.
+
+Puede incluir informacin del paquete insertando variables de referencia a
+los campos del paquete usando la sintaxis
+\(lq\fB${\fP\fIfield\fP[\fB;\fP\fIwidth\fP]\fB}\fP\(rq. Los campos se alinean a la derecha
+a menos que el ancho sea negativo, en cuyo caso se alinean a la
+izquierda. Los siguientes \fIcampos\fP se reconocen pero no estn siempre
+disponibles en el fichero de estado (slo se guardan los campos internos o
+campos contenidos en el paquete binario):
+
+.nf
+    \fBArchitecture\fP
+    \fBBugs\fP
+    \fBConffiles\fP (internal)
+    \fBConfig\-Version\fP (internal)
+    \fBConflicts\fP
+    \fBBreaks\fP
+    \fBDepends\fP
+    \fBDescription\fP
+    \fBEnhances\fP
+    \fBEssential\fP
+    \fBFilename\fP (internal, front\-end related)
+    \fBHomepage\fP
+    \fBInstalled\-Size\fP
+    \fBMD5sum\fP (internal, front\-end related)
+    \fBMSDOS\-Filename\fP (internal, front\-end related)
+    \fBMaintainer\fP
+    \fBOrigin\fP
+    \fBPackage\fP
+    \fBPre\-Depends\fP
+    \fBPriority\fP
+    \fBProvides\fP
+    \fBRecommends\fP
+    \fBReplaces\fP
+    \fBRevision\fP (obsolete)
+    \fBSection\fP
+    \fBSize\fP (internal, front\-end related)
+    \fBSource\fP
+    \fBStatus\fP (internal)
+    \fBSuggests\fP
+    \fBTag\fP (usually not in the .deb but in the repository Packages files)
+    \fBTriggers\-Awaited\fP (internal)
+    \fBTriggers\-Pending\fP (internal)
+    \fBVersion\fP
+.fi
+
+La cadena de formato por omisin es
+\(lq\fB${Package}\et${Version}\en\fP\(rq. En realidad, puede consultar todos
+los campos contenidos en el fichero de estado (por ejemplo, etiquetas de
+usuario). Aparecern tal cual, sin conversin o revisin de fallos. Para
+obtener el nombre del responsable de dpkg y la versin instalada ejecute lo
+siguiente:
+
+.nf
+  \fBdpkg\-query \-W \-f=\(aq${Package} ${Version}\et${Maintainer}\en\(aq dpkg\fP
+.fi
+.
+.SH "ESTADOS DE SALIDA"
+.TP 
+\fB0\fP
+La consulta requerida se ejecut con xito.
+.TP 
+\fB1\fP
+Se han detectado problemas analizando la lnea de rdenes o realizando la
+consulta requerida, adems de que no se han encontrado ningn fichero o
+paquete (a excepcin de \-\-control\-path).
+.
+.SH ENTORNO
+.TP 
+\fBDPKG_ADMINDIR\fP
+If set and the \fB\-\-admindir\fP option has not been specified, it will be used
+as the dpkg data directory.
+.TP 
+\fBCOLUMNS\fP
+Esta opcin influencia la salida de \fB\-\-list\fP al modificar el ancho de la
+salida.
+.
+.SH AUTOR
+Copyright \(co 2001 Wichert Akkerman
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.
+.SH "VASE TAMBIN"
+\fBdpkg\fP(1).
+
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-scanpackages.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-scanpackages.1
--- dpkg/man/es/dpkg-scanpackages.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-scanpackages.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,110 @@
+.\" Copyright © 1996 Michael Shields <shields@crosslink.net>
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-scanpackages 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-scanpackages \- Creacin de ficheros de ndice Packages
+.
+.SH SINOPSIS
+\fBdpkg\-scanpackages\fP [\fIoption\fP...] \fIbinary\-dir\fP [\fIoverride\-file\fP
+[\fIpath\-prefix\fP]] \fB>\fP \fIPackages\fP
+.
+.SH DESCRIPCIN
+\fBdpkg\-scanpackages\fP busca paquetes binarios de Debian en un rbol de
+directorios, creando un fichero Packages usado por \fBdselect\fP(8) y otros
+para mostrar al usuario los paquetes disponibles para su instalacin. Estos
+ficheros Packages son idnticos a los presentes en los archivos de Debian
+en Internet o en los discos pticos. \fBdpkg\-scanpackages\fP se puede usar para
+crear un directorio local con paquetes a instalar en una o varias mquinas.
+.PP
+\fBNota:\fP Si desea acceder al fichero Packages generado mediante \fBapt\fP,
+posiblemente necesite comprimir el fichero con \fBbzip\fP(1), generando un
+fichero Packages.bz2, o \fBgzip\fP(1), que generara un fichero
+Packages.gz. apt ignora los ficheros Packages descomprimidos, a
+excepcin de los ficheros locales (por ejemplo, \fBfile://\fP sources).
+.PP
+\fIdirectorio\-binario\fP es el nombre del rbol de directorios que contiene los
+paquetes binarios  a procesar (por ejemplo, \fBcontrib/binary\-i386\fP). Se
+recomienda que este directorio sea relativo al directorio principal del
+archivo de Debian, ya que todo fichero listado en el nuevo fichero
+Packages empezar por esta cadena de caracteres.
+.PP
+\fIfichero\-override\fP es el nombre del fichero que contiene informacin acerca
+de cmo se instalan los paquetes en la distribucin (puede ser un fichero
+comprimido); consulte \fBdeb\-override\fP(5).
+.PP
+\fIprefijo\-ruta\fP es una cadena opcional que se antepondr a los campos
+Filename.
+.PP
+En caso de existir ms de una versin de un paquete, slo se mostrar la
+ltima por la salida. Si comparten la misma versin pero difieren en la
+arquitectura, slo se usar el primero.
+.
+.SH OPCIONES
+.TP 
+\fB\-t\fP, \fB\-\-type\fP \fItipo\fP
+Busca paquetes *.\fItipo\fP en vez de *.deb.
+.TP 
+\fB\-u\fP, \fB\-\-udeb\fP
+Alias \fBobsoleto\fP para \fB\-tudeb\fP.
+.TP 
+\fB\-e\fP, \fB\-\-extra\-override\fP \fIfichero\fP
+Analiza el \fIfichero\fP para encontrar alternativas adicionales (el fichero
+puede estar descomprimido). Consulte \fBdeb\-extra\-override\fP(5) para ms
+informacin acerca del formato.
+.TP 
+\fB\-a\fP, \fB\-\-arch\fP \fIarquitectura\fP
+Usa un patrn que consiste de \fI*_all.deb\fP y \fI*_arch.deb\fP, en lugar de
+buscar todos los .deb.
+.TP 
+\fB\-m\fP, \fB\-\-multiversion\fP
+Incluye en la salida todos los paquetes encontrados.
+.TP 
+\fB\-M\fP, \fB\-\-medium\fP \fIcadena\-identificacin\fP
+Aade un campo X\-Medium, que consiste del valor de la
+\fIcadena\-identificacin\fP. Este campo es necesario si desea generar ficheros
+\fBPackages.cd\fP para su uso a travs del mtodo multicd de dselect.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH DIAGNSTICOS
+\fBdpkg\-scanpackages\fP devuelve los errores auto\-explicativos
+habituales. Adems, genera avisos sobre paquetes presentes en un
+subdirectorio equivocado, duplicados, que tienen un campo Filename en su
+fichero de control, no aparecen en el fichero de anulacin, o que contienen
+alguna sustitucin del responsable del paquete que no tiene efecto.
+.
+.SH "VASE TAMBIN"
+\fBdpkg\fP(1), \fBdselect\fP(1), \fBdeb\-override\fP(5), \fBdeb\-extra\-override\fP(5),
+\fBdpkg\-scansources\fP(1).
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-scansources.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-scansources.1
--- dpkg/man/es/dpkg-scansources.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-scansources.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,85 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-scansources 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-scansources \- Creacin de ficheros de ndice Sources
+.
+.SH SINOPSIS
+\fBdpkg\-scansources\fP [\fIoption\fP...] \fIbinary\-dir\fP [\fIoverride\-file\fP
+[\fIpath\-prefix\fP]] \fB>\fP \fISources\fP
+.
+.SH DESCRIPCIN
+\fBdpkg\-scansources\fP busca ficheros \fI.dsc\fP en el \fIdirectorio\-binario\fP
+dado. Estos sirven para crear un ndice de fuentes de Debian, que se muestra
+por la salida estndar.
+.PP
+Si se proporciona un \fIfichero\-override\fP, se usar para fijar prioridades en
+el ndice resultante y sobreescribir el campo del mantenedor dado en los
+ficheros \fI.dsc\fP. El fichero se puede comprimir. Consulte \fBdeb\-override\fP(5)
+para conocer ms acerca del formato de este fichero. \s-1NB:\s0 Debido a que
+el fichero override se indexa con el paquetes binario, y no con las
+fuentes, encontramos un pequeo problema. La implementacin actual usa la
+prioridad ms alta entre los paquetes binarios producidos por un fichero
+\&\fI.dsc\fP, para as obtener la prioridad del paquete fuente, as como la
+entrada override del primer paquete binario listado en el fichero \fI.dsc\fP
+que modifica la informacin sobre el mantenedor. Esto puede cambiar en un
+futuro.
+.PP
+Si se proporciona \fIprefijo\-ruta\fP, se antepondr al campo del directorio en
+el ndice de fuentes generado. Habitualmente, se usa para hacer que el campo
+de directorio contenga la ruta desde el directorio superior del archivo de
+Debian.
+.
+.PP
+\fBNota:\fP Si desea acceder al fichero generado Sources mediante \fBapt\fP(8),
+es posible que necesite comprimir el fichero con \fBgzip\fP(1), generando as
+un fichero Sources.gz. apt ignora ficheros Sources descomprimidos, a
+excepcin de ficheros locales (por ejemplo, \fBfile://\fP sources).
+.
+.SH OPCIONES
+.IP "\fB\-n\fP, \fB\-\-no\-sort\fP" 4
+Evita ordenar los registros del ndice de fuentes. Habitualmente, se ordena
+por el nombre de los paquetes fuente.
+.TP 
+.IP "\fB\-e\fP, \fB\-\-extra\-override\fP \fIfichero\fP" 4
+Analiza el \fIfichero\fP para encontrar alternativas adicionales (el fichero
+puede estar descomprimido). Consulte \fBdeb\-extra\-override\fP(5) para ms
+informacin acerca del formato.
+.IP "\fB\-s\fP, \fB\-\-source\-override\fP \fIfichero\fP" 4
+Usa el \fIfichero\fP como el fichero override de las fuentes. Por omisin es
+el nombre del fichero override con la extensin \fI.src\fP que defini
+anteriormente.
+.sp
+El fichero override de las fuentes est en un formato distinto del fichero
+override de los paquetes binarios. Contiene solamente dos campos separados
+por espacios en blanco, siendo el primer campo el nombre del paquete fuente
+y el segundo el de seccin. Se omiten las lneas en blanco y de
+comentarios. Si un paquete aparece en ambos ficheros, el fichero override
+de las fuentes tiene preferencia.
+.IP \fB\-\-debug\fP 4
+Activa la depuracin.
+.IP \fB\-\-help\fP 4
+Muestra el modo de uso y termina.
+.IP \fB\-\-version\fP 4
+Muestra la versin y termina.
+.
+.SH "VASE TAMBIN"
+\fBdeb\-override\fP(5), \fBdeb\-extra\-override\fP(5), \fBdpkg\-scanpackages\fP(1).
+.
+.SH AUTOR
+Roderick Schertler <roderick@argon.org>
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-shlibdeps.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-shlibdeps.1
--- dpkg/man/es/dpkg-shlibdeps.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-shlibdeps.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,314 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-shlibdeps 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-shlibdeps \- Genera dependencias de bibliotecas compartidas de
+sustitucin de variables
+.
+.SH SINOPSIS
+\fBdpkg\-shlibdeps\fP [\fIoption\fP...] [\fB\-e\fP]\fIexecutable\fP [\fIoption\fP...]
+.
+.SH DESCRIPCIN
+\fBdpkg\-shlibdeps\fP calculates shared library dependencies for executables
+named in its arguments. The dependencies are added to the substitution
+variables file \fBdebian/substvars\fP as variable names
+\fBshlibs:\fP\fIdependencyfield\fP where \fIdependencyfield\fP is a dependency field
+name. Any other variables starting with \fBshlibs:\fP are removed from the
+file.
+.P
+\fBdpkg\-shlibdeps\fP tiene dos posibles fuentes de informacin para generar la
+informacin de dependencias. Estos son los ficheros \fIsymbols\fP y
+\fIshlibs\fP. Por cada binario que \fBdpkg\-shlibdeps\fP analiza, busca la lista de
+bibliotecas enlazadas con ste. Entonces, por cada biblioteca, busca el
+fichero \fIsymbols\fP o el fichero \fIshlibs\fP (en caso de que el primero no
+exista, o si debian/shlibs.local contiene la dependencia relevante). Se
+asume que el paquete de la biblioteca proporciona ambos ficheros, y por ello
+debera estar disponible como /var/lib/dpkg/info/\fIpaquete\fP.\fIsymbols\fP o
+/var/lib/dpkg/info/\fIpackage\fP.\fIshlibs\fP. El nombre del paquete se
+identifica en dos pasos: bsqueda en el sistema del fichero de la biblioteca
+(buscando en los mismos directorios que usara \fBld.so\fP), y ejecucin de
+\fBdpkg \-S \fP\fIlibrary\-file\fP para conocer el paquete que proporciona la
+biblioteca.
+.SS "Ficheros de smbolos"
+Los ficheros de smbolos contienen una informacin ms precisa de las
+dependencias, proporcionando la dependencia mnima de cada smbolo que la
+biblioteca exporta. El script intenta encontrar un fichero de smbolos
+asociado al paquete de la biblioteca en las siguientes ubicaciones (se usa
+la primera coincidencia):
+.IP debian/*/DEBIAN/symbols
+La informacin de biblioteca compartida generada por el proceso de
+construccin actual, que tambin invoca \fBdpkg\-shlibdeps\fP. Se generan
+mediante \fBdpkg\-gensymbols\fP(1). Slo se usan en caso de encontrar la
+biblioteca en la rbol de construccin del paquete. El fichero de smbolos
+de ese rbol de construccin tiene prioridad sobre los ficheros de smbolos
+de otros paquetes binarios.
+.IP /etc/dpkg/symbols/\fIpaquete\fP.symbols.\fIarquitectura\fP
+.IP /etc/dpkg/symbols/\fIpaquete\fP.symbols
+Informacin de redefinicin de bibliotecas compartidas por cada
+sistema. \fIarquitectura\fP es la arquitectura del sistema actual (obtenido
+mediante \fBdpkg\-architecture \- qDEB_HOST_ARCH\fP).
+.IP "Output from \(lq\fBdpkg\-query \-\-control\-path\fP \fIpackage\fP symbols\(rq"
+Package\-provided shared library dependency information.  Unless overridden
+by \-\-admindir, those files are located in /var/lib/dpkg.
+.P
+\fBdpkg\-shlibdeps\fP recuerda la versin mnima (ms grande) necesaria para
+cada biblioteca al analizar los smbolos usados por todos los binarios. Al
+finalizar el proceso, puede escribir la dependencia mnima para cada
+biblioteca usada (siempre que la informacin de los ficheros \fIsymbols\fP sea
+precisa).
+.P
+Como medida de precaucin, un fichero de smbolos puede proporcionar un
+campo de meta informacin \fIBuild\-Depends\-Package\fP para que
+\fBdpkg\-shlibdeps\fP extraiga la versin mnima requerida por el paquete
+correspondiente en el campo Build\-Depends, y usar tal versin si es mayor
+que la versin mnima calculada en el anlisis de smbolos.
+.SS "Ficheros shlibs"
+Los ficheros shlibs asocian de forma directa una librera con una
+dependencia (sin analizar symbols). Por ello, es ms slido que necesario,
+pero sencillo y seguro de manipular.
+.P
+Las dependencias de una biblioteca se buscan en varias ubicaciones. Se usar
+el primer fichero que proporcione informacin de la biblioteca relevante.
+.IP debian/shlibs.local
+Informacin acerca de redefinicin de dependencias de bibliotecas
+compartidas especficas al paquete local.
+.IP /etc/dpkg/shlibs.override
+Informacin acerca de redefinicin de dependencias de bibliotecas
+compartidas para cada sistema.
+.IP debian/*/DEBIAN/shlibs
+La informacin de bibliotecas compartidas generada por el proceso de
+construccin actual, que \fBdpkg\-shlibdeps\fP tambin invoca. Slo se usa si la
+biblioteca se encuentra en el rbol de construccin del paquete. El fichero
+shlibs en el rbol de construccin tiene prioridad sobre otros ficheros
+shlibs de otros paquetes binarios.
+.IP "Output from \(lq\fBdpkg\-query \-\-control\-path\fP \fIpackage\fP shlibs\(rq"
+Package\-provided shared library dependency information.  Unless overridden
+by \-\-admindir, those files are located in /var/lib/dpkg.
+.IP /etc/dpkg/shlibs.default
+Informacin del sistema acerca de las dependencias predefinidas de
+bibliotecas compartidas.
+.P
+Tras ello, se usan las dependencias extradas directamente (a menos que se
+hayan omitido debido que se les identifique como duplicados, o como ms
+dbiles que otra dependencia).
+.SH OPCIONES
+\fBdpkg\-shlibdeps\fP interpreta cualquier argumento que no sea una opcin como
+el nombre de un fichero ejecutable, igual que si se hubiesen proporcionado
+con \fB\-e\fP\fIejecutable\fP.
+.TP 
+\fB\-e\fP\fIejecutable\fP
+Incluye dependencias apropiadas para las bibliotecas compartidas requeridas
+por el \fIejecutable\fP.
+.TP 
+\fB\-d\fP\fIcampo\-dependencias\fP
+Aade dependencias al campo \fIcampo\-dependencias\fP del fichero de
+control. (Las dependencias para este campo se ubican en la variable
+\fBshlibs:\fP\fIcampo\-dependencias\fP).
+
+La opcin \fB\-d\fP\fIcampo\-dependencias\fP tiene efecto para todos los ejecutables
+despus de dicha opcin, hasta el siguiente \fB\-d\fP\fIcampo\-dependencias\fP. Por
+omisin el \fIcampo\-dependencias\fP es \fBDepends\fP.
+
+Si la misma dependencia (o un conjunto de alternativas) aparece en ms de
+uno de los nombres de campo de dependencias reconocidos: \fBPre\-Depends\fP,
+\fBDepends\fP, \fBRecommends\fP, \fBEnhances\fP o \fBSuggests\fP, \fBdpkg\-shlibdeps\fP
+eliminar automticamente la dependencia de todos los campos, exceptuando
+aqul que contenga las dependencias ms importantes.
+.TP 
+\fB\-p\fP\fIprefijo\-de\-variable\fP
+Provoca que las variables de sustitucin empiecen por
+\fIprefijo\-de\-variable\fP\fB:\fP en vez de \fBshlibs:\fP. Asimismo, cualquier
+variable de sustitucin ya existente que empiece por
+\fIprefijo\-de\-variable\fP\fB:\fP (en vez de \fBshlibs:\fP) se eliminar del fichero
+de sustitucin de variables.
+.TP 
+\fB\-O\fP
+Muestra las propiedades de las variables de sustitucin por la salida
+estndar, en lugar de aadirse al fichero de sustitucin de variables (por
+omisin \fBdebian/substvars\fP).
+.TP 
+\fB\-t\fP\fItipo\fP
+Da prioridad a la informacin de dependencia de bibliotecas compartidas
+etiquetada para el tipo de paquete dado. En caso de no existir ninguna
+informacin etiquetada, usa informacin sin etiquetar por omisin. El tipo
+de paquete predefinido es deb. La informacin de dependencia de
+bibliotecas compartidas se etiqueta para un tipo dado prefijando ste con el
+nombre del tipo, dos puntos, y un espacio.
+.TP 
+\fB\-L\fP\fIfichero\-shlibs\-local\fP
+Provoca que \fBdpkg\-shlibs\fP lea la informacin sobre dependencias con
+bibliotecas compartidas desde \fIfichero\-shlibs\-local\fP en vez de
+\fBdebian/shlibs.local\fP.
+.TP 
+\fB\-T\fP\fIfichero\-variables\-sust\fP
+Escribe las variables de sustitucin en \fIfichero\-sustitucin\-variables\fP;
+por omisin \fBdebian/substvars\fP.
+.TP 
+\fB\-v\fP
+Activa el modo informativo. Se muestran numerosos mensajes que explican las
+acciones de \fBdpkg\-shlindeps\fP.
+.TP 
+\fB\-x\fP\fIpaquete\fP
+Excluye el paquete de las dependencias generadas. Es til para evitar
+auto\-dependencias de paquetes que proporcionan binarios ELF (ejecutables o
+extensiones de bibliotecas) y que usan una biblioteca contenida en el mismo
+paquete. Esta opcin se puede usar varias veces para excluir varios
+paquetes.
+.TP 
+\fB\-S\fP\fIdirectorio\-compilacin\-paquete\fP
+Analiza el \fIdirectorio\-compilacin\-paquete\fP primero al buscar una
+biblioteca. Es til cuando el paquete fuente genera distintas variantes de
+la misma biblioteca, y quiere asegurar que obtiene la dependencia de un
+paquete binario dado. Puede usar esta opcin varias veces: los directorios
+se analizan en el mismo orden antes de analizar los directorios de otros
+paquetes binarios.
+.TP 
+\fB\-\-ignore\-missing\-info\fP
+No devuelve un fallo en caso de no encontrar la informacin de dependencia
+de una biblioteca compartida. No se recomienda usar esta opcin ya que todas
+las bibliotecas deberan proporcionar informacin de dependencia (mediante
+los ficheros shlibs, o ficheros de smbolos), incluso cuando otros
+paquetes no los usan actualmente.
+.TP 
+\fB\-\-warnings=\fP\fIvalor\fP
+\fIvalor\fP es un campo de bit que define el conjunto de avisos que
+\fBdpkg\-shlibdeps\fP puede emitir. Bit 0 (valor=1) activa el aviso symbol
+\fIsym\fP used by \fIbinary\fP found in none of the libraries, el bit 1 (valor=2)
+activa el aviso dependency on \fIlibrary\fP could be avoided, y bit 2
+(valor=4) activa el aviso \fIbinary\fP shouldn't be linked with
+\fIlibrary\fP. El \fIvalor\fP predefinido es 3: los dos primeros avisos estn
+activados por omisin, no el ltimo. Defina el \fIvalor\fP con 7 si desea que
+todos los avisos estn activos.
+.TP 
+\fB\-\-admindir=\fP\fIdirectorio\fP
+Cambia el directorio con la base de datos de \fBdpkg\fP. Por omisin es
+\fI/var/lib/dpkg\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH ADVERTENCIAS
+Debido a que \fBdpkg\-shlibdeps\fP analiza el conjunto de smbolos usado por
+cada binario del paquete generado, puede mostrar avisos en varias
+situaciones. stos informan de aspectos mejorables del paquete. En la
+mayora de los casos, conciernen directamente a las fuentes original. A
+continuacin se muestran los varios mensajes de advertencia que pueden
+aparecer, por orden de importancia decreciente.
+.TP 
+\fBsymbol\fP\fI sym\fP\fB used by \fP\fIbinary\fP\fB found in none of the libraries.\fP
+El smbolo indicado no se encontr en las bibliotecas enlazadas con el
+binario. Posiblemente, \fIbinario\fP es una biblioteca, y necesita estar
+enlazado con una biblioteca adicional durante el proceso de construccin
+(opcin \fB\-l\fP\fIbiblioteca\fP del enlazador).
+.TP 
+\fIbinary\fP\fB contains an unresolvable reference to symbol \fP\fIsym\fP\fB: it's probably a plugin\fP
+El smbolo indicado no se ha encontrado en las bibliotecas enlazadas con el
+binario. Probablemente, el \fIbinario\fP es una extensin, y cabe que el
+programa que carga tal extensin proporciona el smbolo. Tericamente, una
+extensin no tiene ningn SONAME, pero s este binario, y por ello no se
+le puede identificar claramente como tal. An as, el hecho de que el
+binario se guarda en un directorio no pblico es una indicacin de que no es
+una biblioteca compartida normal. Si el binario es realmente una extensin,
+no haga caso de este aviso. Siempre cabe la posibilidad de que es una
+biblioteca real, y que los programas que enlazan con el usan un RPATH para
+que el cargador dinmico lo encuentre. En tal caso, la biblioteca est rota
+y precisa un arreglo.
+.TP 
+\fBdependency on \fP\fIlibrary\fP\fB could be avoided if \fP\fIbinaries\fP\fB were not uselessly linked against it (they use none of its symbols).\fP
+Ninguno de los \fIbinarios\fP enlazados con la \fIbiblioteca\fP usan smbolos que
+proporciona la biblioteca. Al arreglar todos los binarios, evitara la
+dependencia asociada a esta biblioteca (a menos que la dependencia se genere
+tambin para otra biblioteca que s la usa).
+.TP 
+\fIbinary\fP\fB shouldn't be linked with \fP\fIlibrary\fP\fB (it uses none of its symbols).\fP
+El \fIbinario\fP est enlazado con una biblioteca que no necesita. No es un
+problema, pero puede optimizar levemente el tiempo de carga del binario si
+no enlaza tal binario a la biblioteca. Este aviso revisa la misma
+informacin que el anterior, pero lo hace para cada binario, en lugar de una
+revisin global de todos los binarios.
+.SH FALLOS
+\fBdpkg\-shlibdeps\fP fallar si no puede encontrar ninguna biblioteca pblica
+usada por un binario, o si no existe ninguna informacin de dependencia
+asociada a esta biblioteca (el fichero shlibs, o el fichero
+symbols). Una biblioteca pblica tiene un SONAME, el cual tiene
+informacin de versin (biblioteca.so.\fIx\fP). Una biblioteca privada (como
+una extensin) no debera tener un SONAME, y por ello no necesita
+informacin de versin.
+.TP 
+\fBcouldn't find library \fP\fIlibrary\-soname\fP\fB needed by \fP\fIbinary\fP\fB (its RPATH is '\fP\fIrpath\fP\fB')\fP
+The \fIbinary\fP uses a library called \fIlibrary\-soname\fP but \fBdpkg\-shlibdeps\fP
+has been unable to find the library.  \fBdpkg\-shlibdeps\fP creates a list of
+directories to check as following: directories listed in the RPATH of the
+binary, directories listed in /etc/ld.so.conf, directories listed in the
+LD_LIBRARY_PATH environment variable, and standard public directories (/lib,
+/usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks those
+directories in the package's build tree of the binary being analyzed, in the
+packages' build trees indicated with the \-S command\-line option, in other
+packages' build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file
+and finally in the root directory.  If the library is not found in any of
+those directories, then you get this error.
+
+Si la biblioteca que no se encontr est dentro de un directorio privado del
+mismo paquete, querr aadir el directorio a LD_LIBRARY_PATH. Si est en
+otro paquete binario en construccin, querr asegurar que el fichero
+shlibs o symbols de este paquete ya existe, y que LD_LIBRARY_PATH
+contiene el directorio adecuado, en caso de ser un directorio privado.
+.TP 
+\fBno dependency information found for \fP\fIlibrary\-file\fP\fB (used by \fP\fIbinary\fP\fB).\fP
+\fBdpkg\-shlibdeps\fP encontr la biblioteca que \fIbinario\fP necesita en
+\fIfichero\-biblioteca\fP, pero no ha sido capaz de encontrar ninguna
+informacin de dependencia para esta biblioteca. Para encontrar la
+dependencia, intent establecer una correlacin de la biblioteca con el
+paquete Debian con la ayuda de \fBdpkg \-S \fP\fIfichero\-biblioteca\fP. Despus
+revis los correspondientes ficheros shlibs y symbols en
+/var/lib/dpkg/info/, y en los distintos rboles de construccin del
+paquete (debian/*/DEBIAN/).
+
+Este fallo puede estar causado por un fichero shlibs o symbols
+incorrecto o ausente en el paquete de la biblioteca. Tambin cabe que la
+biblioteca se construya dentro del mismo paquete fuente, y que an no se
+haya creado el fichero shlibs (en cuyo caso debera arreglar
+debian/rules para crear shlibs antes de invocar \fBdpkg\-shlibdeps\fP). Un
+incorrecto RPATH tambin puede llevar a encontrar la biblioteca bajo un
+nombre no cannico (por ejemplo,
+/usr/lib/openoffice.org/../lib/libssl.so.0.9.8 en lugar de
+/usr/lib/libssl.so.0.9.8) que no est asociado a ningn
+paquete. \fBdpkg\-shlibdeps\fP intenta evitar esto usando un nombre cannico
+(con \fBrealpath\fP(3)), pero no siempre funciona. Siempre es mejor limpiar el
+RPATH del binario para evitar problemas.
+
+Invocar \fBdpkg\-shlibdeps\fP en modo informativo (\-v) ofrece mucha ms
+informacin acerca de dnde busc la informacin de dependencia. Puede ser
+til si no entiende porque muestra este fallo.
+.SH "VASE TAMBIN"
+\fBdeb\-shlibs\fP(5), \fBdeb\-symbols\fP(5), \fBdpkg\-gensymbols\fP(1).
+.
+.SH AUTORES
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2006 Frank Lichtenheld
+.br
+Copyright \(co 2007\-2008 Rapha\[:e]l Hertzog
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-source.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-source.1
--- dpkg/man/es/dpkg-source.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-source.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,716 @@
+.\" Authors: Ian Jackson, Raphaël Hertzog
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-source 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-source \- Herramienta de manipulacin de paquetes fuente de Debian
+.dsc
+.
+.SH SINOPSIS
+\fBdpkg\-source\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH DESCRIPCIN
+\fBdpkg\-source\fP empaqueta y desempaqueta archivos de fuentes de Debian.
+
+Ninguna de estas rdenes permite combinar mltiples opciones en una
+sola. Tampoco permiten que el valor de una opcin se especifique en un
+argumento separado.
+.
+.SH RDENES
+.TP 
+\fB\-x \fP\fIfichero\fP\fB.dsc \fP[\fIdirectorio\-salida\fP]
+Extrae un paquete fuente. Se debe suministrar un argumento que no sea una
+opcin, el nombre del fichero de control de fuente de Debian
+(\fB.dsc\fP). Puede introducir un segundo argumento que no sea una opcin para
+definir el directorio en el que extraer el paquete fuente, el cual no debe
+existir. En caso de no definir ningn directorio, el paquete fuente se
+extraer en un directorio llamado \fIfuente\fP\-\fIversin\fP dentro del directorio
+actual.
+
+\fBdpkg\-source\fP lee los nombres de los dems ficheros que componen el paquete
+fuente desde el fichero de control; se asume que estn en el mismo
+directorio que el fichero \fB.dsc\fP.
+
+Los permisos y propietarios de los ficheros del paquete extrado sern los
+mismos que se esperaran si los ficheros se hubiesen simplemente creado \-
+0777 para directorios y ejecutables y 0666 para el resto de ficheros, ambos
+modificados segn el umask del extractor. Si el directorio superior tiene
+activado el bit setgid, los directorios extrados lo tendrn tambin, y
+todos los ficheros y directorios heredarn el grupo al que pertenece.
+
+Si el paquete fuente usa un formato no estndar (a da de hoy, todos los
+formatos menos 1.0), su nombre se guardar en \fBdebian/source/format\fP para
+que las siguientes construcciones del paquete fuente usen el mismo formato
+por omisin.
+
+.TP 
+\fB\-b\fP \fIdirectorio\fP [\fIparmetros\-especficos\-formato\fP]
+Construye un paquete fuente. El primer argumento, que no opcin, se toma
+como el nombre del directorio que contiene el rbol de fuentes debianizado
+(por ejemplo, con un subdirectorio debian/, y puede que cambios en los
+ficheros originales). Puede especificar parmetros adicionales, dependiendo
+del formato de paquete fuente usado en la construccin del paquete.
+
+\fBdpkg\-source\fP will build the source package with the first format found in
+this ordered list: the format indicated with the \fI\-\-format\fP command line
+option, the format indicated in \fBdebian/source/format\fP, "1.0". The fallback
+to "1.0" is deprecated and will be removed at some point in the future, you
+should always document the desired source format in
+\fBdebian/source/format\fP. See section \fBSOURCE PACKAGE FORMATS\fP for an
+extensive description of the various source package formats.
+
+.TP 
+\fB\-\-print\-format\fP \fIdirectorio\fP
+Muestra el formato de fuentes a usar en la construccin del paquete fuente
+si se invoc \fBdpkg\-source \-b \fP\fIdirectorio\fP (con las mismas condiciones y
+los mismos parmetros).
+
+.TP 
+\fB\-\-before\-build\fP \fIdirectorio\fP
+Run the corresponding hook of the source package format. This hook is called
+before any build of the package (\fBdpkg\-buildpackage\fP calls it very early
+even before \fBdebian/rules clean\fP). This command is idempotent and can be
+called multiple times. Not all source formats implement something in this
+hook, and those that do usually prepare the source tree for the build for
+example by ensuring that the Debian patches are applied.
+
+.TP 
+\fB\-\-after\-build\fP \fIdirectorio\fP
+Run the corresponding hook of the source package format. This hook is called
+after any build of the package (\fBdpkg\-buildpackage\fP calls it last). This
+command is idempotent and can be called multiple times. Not all source
+formats implement something in this hook, and those that do usually use it
+to undo what \fB\-\-before\-build\fP has done.
+
+.TP 
+\fB\-\-commit\fP [\fIdirectory\fP] ...
+Record changes in the source tree unpacked in \fIdirectory\fP. This command can
+take supplementary parameters depending on the source format.  It will error
+out for formats where this operation doesn't mean anything.
+
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH "OPCIONES GENRICAS DE CONSTRUCCIN"
+.TP 
+\fB\-c\fP\fIfichero\-control\fP
+Define el fichero de control principal de las fuentes del que leer la
+informacin, \fBdebian/control\fP por omisin. Si se introducen rutas
+relativas, stas se interpretan empezando en el directorio superior del
+rbol de fuentes.
+.TP 
+\fB\-l\fP\fIfichero\-cambios\fP
+Define el fichero de registro de cambios del que leer la informacin,
+\fBdebian/changelog\fP por omisin. Si se introducen rutas relativas, stas se
+interpretan empezando en el directorio superior del rbol de fuentes.
+.TP 
+\fB\-F\fP\fIformato\-registro\-cambios\fP
+Define el formato del registro de cambios. Por omisin, el formato se lee de
+una lnea especial cerca del final del registro de cambios o, en caso de
+fallo, usa el formato estndar debian.
+.TP 
+\fB\-\-format=\fP\fIvalor\fP
+Usa el formato dado para la construccin del paquete fuente. Esto
+sobreescribe cualquier formato presente en\fBdebian/source/format\fP.
+.TP 
+\fB\-V\fP\fInombre\fP\fB=\fP\fIvalor\fP
+Define una variable de sustitucin de la salida. Consulte
+\fBdeb\-substvars\fP(5) para ms informacin acerca de la sustitucin de la
+salida.
+.TP 
+\fB\-T\fP\fIfichero\-variables\-sust\fP
+Lee las variables de sustitucin desde \fIfichero\-variables\-sust\fP; el valor
+por omisin es no leer ninguno. Puede usar esta opcin varias veces para
+leer variables de sustitucin de varios ficheros.
+.TP 
+\fB\-D\fP\fIcampo\fP\fB=\fP\fIvalor\fP
+Sobreescribe o aade un campo en el fichero de control de salida.
+.TP 
+\fB\-U\fP\fIcampo\fP
+Elimina un campo del fichero de control de salida.
+.TP 
+\fB\-Z\fP\fIcompression\fP, \fB\-\-compression\fP=\fIcompresin\fP
+Define qu compresin usar con los ficheros creados (archivos tar y ficheros
+diff). Tenga en cuenta que esta opcin no provoca que los archivos tar
+existentes se compriman nuevamente, slo afecta a los ficheros nuevos. Los
+valores permitidos son: \fIgzip\fP, \fIbzip2\fP, \fIlzma\fP y \fIxz\fP. \fIgzip\fP se usa
+por omisin. La compatibilidad con \fIxz\fP es posible desde dpkg\-dev 1.15.5.
+.TP 
+\fB\-z\fP\fIlevel\fP, \fB\-\-compression\-level\fP=\fInivel\fP
+Compression level to use. As with \fB\-Z\fP it only affects newly created
+files. Supported values are: \fI1\fP to \fI9\fP, \fIbest\fP, and \fIfast\fP.  The
+default is \fI9\fP for gzip and bzip2, \fI6\fP for xz and lzma.
+.TP 
+\fB\-i\fP[\fIexpresin\-regular\fP], \fB\-\-diff\-ignore\fP[=\fIexpresin\-regular\fP]
+Puede especificar una expresin regular de Perl para indicar aquellos
+ficheros que desee excluir de la lista de ficheros para el diff (esta
+lista se genera con una orden find). Puede usar esto para ignorar cambios no
+introducidos en ficheros especficos, en caso de construir un paquete fuente
+como un paquete fuente versin 3 usando VCS. Por s mismo, \fB\-i\fP activa la
+opcin con una expresin regular predefinida que elimina los ficheros y
+directorios de control de los sistemas de control de versiones ms comunes,
+los ficheros de respaldo, los ficheros de intercambio y los directorios que
+se generan como resultado de las operaciones de Libtool. Slo puede haber
+una expresin regular activa, y en caso de existir varias opciones \fB\-i\fP
+slo se tendr en cuenta la ltima.
+
+Esto es til para eliminar ficheros externos que se incluyen en el
+diff. Por ejemplo, si desarrolla su software en sistema de control de
+versiones y desea realizar un checkout para construir un paquete fuente,
+sin incluir los ficheros y directorios adicionales que habitualmente
+contiene (por ejemplo, CVS/, .cvsignore, .svn). La expresin regular
+predefinida es bastante completa, pero si necesita reemplazarla, tenga en
+cuenta que por omisin, puede coincidir con cualquier parte de la ruta. Por
+ello, si desea emparejar el principio de un nombre de fichero, o slo
+nombres de fichero completos, tendr que introducir directamente el anclaje
+necesario (por ejemplo, '(^|/)', '($|/)').
+.TP 
+\fB\-\-extend\-diff\-ignore\fP=\fIexpresin\-regular\fP
+The perl regular expression specified will extend the default value of
+\fB\-\-diff\-ignore\fP and its current value (if set). It does this by
+concatenating "\fB|\fP\fIregexp\fP" to the existing value.  This option is
+convenient to use in \fBdebian/source/options\fP to exclude some auto\-generated
+files from the automatic patch generation.
+.TP 
+\fB\-I\fP[\fIpatrn\-fichero\fP], \fB\-\-tar\-ignore\fP[=\fIpatrn\-fichero\fP]
+Si se especifica esta opcin, el nombre de fichero se pasar como parmetro
+a la opcin \-\-exclude de \fBtar\fP(1) al generar el fichero .orig.tar o
+.tar. Por ejemplo, \-ICVS har que tar omita los directorios CVS cuando
+genere el fichero .tar.gz. La opcin se puede repetir varias veces para
+listar varios patrones a excluir.
+
+Por si mismo, \fB\-I\fP aade las opciones predefinidas \-\-exclude, que
+filtrarn los ficheros de control y los directorios de los sistemas de
+control de versiones ms comunes, ficheros de respaldo e intercambio, y los
+directorios de salida de construccin de Libtool.
+.PP
+\fBNota:\fP A pesar de tener objetivos similares, \fBi\fP y \fBI\fP tienen una
+sintaxis y semntica muy diferentes. Slo puede especificar \fBi\fP una vez,
+que toma una expresin regular compatible con Perl, la cual se compara con
+la ruta relativa de cada fichero. Puede especificar \fBI\fP varias veces, y
+toma un patrn de nombre de fichero con comodines de intrprete de
+rdenes. El patrn se compara con la ruta relativa, y tambin con cada parte
+de la ruta, de manera individual. La semntica exacta de la opcin
+\-\-exclude de tar es algo complicada, consulte
+http://www.gnu.org/software/tar/manual/tar.html#wildcards para una completa
+documentacin.
+
+Puede consultar los patrones y expresiones regulares predefinidas de ambas
+opciones en la salida de la orden \fB\-\-help\fP.
+.SH "OPCIONES DE EXTRACCIN GENRICAS"
+.TP 
+\fB\-\-no\-copy\fP
+No copia los ficheros tar originales cerca del paquete fuente extrado.
+.TP 
+\fB\-\-no\-check\fP
+No revisa las firmas y sumas de control antes de desempaquetar.
+.TP 
+\fB\-\-require\-valid\-signature\fP
+Rechaza desempaquetar el paquete fuente si no contiene una firma OpenPGP,
+que se verifica o bien con el anillo de claves de usuario
+\fItrustedkeys.gpg\fP, uno de los anillos de claves especficos del proveedor,
+o uno de los anillos de claves oficiales de Debian,
+\fI/usr/share/keyrings/debian\-keyring.gpg\fP y
+\fI/usr/share/keyrings/debian\-maintainers.gpg\fP.
+
+.SH "FORMATOS DE PAQUETE FUENTE"
+Si no sabe qu formato de fuentes usar, debera seleccionar o bien 3.0
+(quilt) o 3.0 (native). Consulte
+http://wiki.debian.org/Projects/DebSrc3.0 para ms informacin acerca del
+desarrollo de estos formatos dentro del proyecto Debian.
+
+.SS "Formato: 1.0"
+Un paquete fuente en este formato consiste bien de un \fB.orig.tar.gz\fP
+asociado a un \fB.diff.gz\fP, o bien de un nico \fB.tar.gz\fP (en tal caso, el
+paquete se considera \fInative\fP).
+
+\fBExtraccin\fP
+
+Extraer un paquete nativo es simplemente una extraccin de un nico archivo
+tar en el directorio destino. Extraer un paquete no nativo se realiza,
+primero, desempaquetando el \fB.orig.tar.gz\fP para despus aplicar el parche
+contenido en el fichero \fB.diff.gz\fP. La marca temporal de todos los ficheros
+parcheados se modifica en el momento de extraer el paquete fuente (esto
+evita bifurcaciones de las marcas temporales, que conducen a problemas
+cuando se parchean los ficheros generados automticamente). El diff puede
+crear nuevos ficheros (todo el directorio debian/ se crea de esta manera)
+pero no puede eliminar ficheros (los ficheros vacos permanecern en el
+sistema).
+
+\fBConstruccin\fP
+
+Construir un paquete nativo consiste de la creacin de un nico archivo tar
+con el directorio fuente. Construir un paquete no nativo incluye extraer el
+archivo tar original en otro directorio .orig, regenerando el \fB.diff.gz\fP
+por comparacin del \fIdirectorio\fP del paquete fuente con el directorio
+.orig.
+
+.TP 
+\fBOpciones de construccin (con \-b):\fP
+.PP
+Si hay un segundo argumento, debera ser el nombre del directorio de
+fuentes, del fichero tar original o la cadena vaca, si el paquete es
+especfico de Debian y por tanto carece de diffs debianizantes. Si no se
+proporciona un segundo argumento, \fBdpkg\-source\fP buscar el archivo tar
+original \fIpaquete\fP\fB_\fP\fIversin\-autor\-original\fP\fB.orig.tar.gz\fP o el
+directorio de fuentes original \fIdirectorio\fP\fB.orig\fP en funcin de los
+argumentos \fB\-sX\fP.
+
+\fB\-sa\fP, \fB\-sp\fP, \fB\-sk\fP, \fB\-su\fP y \fB\-sr\fP no sobreescribirn directorios o
+ficheros tar existentes. Si esto es lo que desea, debera utilizar \fB\-sA\fP,
+\fB\-sP\fP, \fB\-sK\fP, \fB\-sU\fP y \fB\-sR\fP en su lugar.
+.TP 
+\fB\-sk\fP
+Define que se espera la fuente original como un archivo tar, por omisin
+\fIpaquete\fP\fB_\fP\fIversin\-autor\-original\fP\fB.orig.tar.gz\fP. La fuente original
+se dejar en el sitio como un fichero tar, o se copiar al directorio actual
+en caso de no estar ya ah presente. El archivo tar se desempaquetar en
+\fIdirectorio\fP\fB.orig\fP para la generacin del diff.
+.TP 
+\fB\-sp\fP
+Idntica a \fB\-sk\fP, a diferencia de que eliminar el directorio al finalizar.
+.TP 
+\fB\-su\fP
+Define que se espera que la fuente original sea un directorio, por omisin
+\fIpaquete\fP\fB\-\fP\fIversin\-autor\-original\fP\fB.orig\fP, y que \fBdpkg\-source\fP crear
+un fichero de fuentes nuevo a partir de l.
+.TP 
+\fB\-sr\fP
+Idntica a \fB\-su\fP, a diferencia de que eliminar el directorio despus de su
+uso.
+.TP 
+\fB\-ss\fP
+Define que la fuente original est disponible tanto como directorio como un
+fichero tar. dpkg\-source usar el directorio para crear el diff , pero el
+fichero tar para crear el \fB.dsc\fP. Debe usar esta opcin con precaucin, ya
+que si el directorio y el archivo tar no coinciden se generar un archivo
+fuente invlido.
+.TP 
+\fB\-sn\fP
+Omite la bsqueda de la fuente original y no generar un diff. El segundo
+argumento, en caso de existir, debe ser la cadena vaca. Esta opcin se usa
+en paquetes especficos de Debian que no tienen fuentes del autor original
+por separado, y por tanto carecen de ficheros diff debianizantes.
+.TP 
+\fB\-sa\fP or \fB\-sA\fP
+Defina una bsqueda de la fuente original como directorio o como archivo tar
+\- el segundo argumento, de existir, puede ser cualquiera de las dos cosas o
+la cadena vaca (equivale a usar \fB\-sn\fP). Si se encuentra un fichero tar, se
+desempaquetar para crear el diff y eliminar posteriormente (equivale a
+\fB\-sp\fP); si se encuentra un directorio, se empaquetar para crear la fuente
+original y se eliminar posteriormente (equivale a \fB\-sr\fP); si no se
+encuentra ninguno de los dos, se asume que el paquete no tiene ficheros
+diff debianizantes, nicamente un fichero de fuentes (equivale a
+\fB\-sn\fP). Si se encuentran ambos, \fBdpkg\-source\fP ignorar el directorio,
+sobreescribindolo, si se especific \fB\-sA\fP (equivale a \fB\-sP\fP), o generar
+un error si se defini \fB\-sa\fP. \fB\-sA\fP es la opcin predefinida.
+.TP 
+\fB\-\-abort\-on\-upstream\-changes\fP
+El procesa dar fallo si el diff generado contiene cambios realizados a
+ficheros fuera del subdirectorio debian. Esta opcin no se puede usar en
+\fBdebian/source/options\fP pero se puede usar en
+\fBdebian/source/local\-options\fP.
+
+.TP 
+\fBOpciones de extraccin (con \-x):\fP
+.PP
+En todos los casos cualquier rbol de fuentes original ser eliminado.
+.TP 
+\fB\-sp\fP
+Si se usa en la extraccin, la fuente original (de existir) 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. (\fBsta es la accin por
+omisin\fP).
+.TP 
+\fB\-su\fP
+Desempaqueta el rbol de fuentes original.
+.TP 
+\fB\-sn\fP
+Asegura 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.
+.PP
+Todas las opciones \fB\-s\fP\fIX\fP son mutuamente excluyentes. Si define ms de
+una, slo se usar la ltima.
+.TP 
+\fB\-\-skip\-debianization\fP
+Omite la aplicacin del diff de debian con las fuentes del autor original.
+.
+.SS "Formato: 2.0"
+Tambin conocido como wig&pen. No se recomienda este formato para un uso
+masivo, ya que el formato 3.0 (quilt) lo reemplaza. Wig&pen fue la primera
+especificacin de un formato de paquete fuente de nueva generacin.
+
+El comportamiento de este formato es idntico al del formato 3.0 (quilt),
+a excepcin de que no usa una lista explcita de parches. Todos los ficheros
+en \fBdebian/patches/\fP que coinciden con la expresin regular de perl
+\fB[\ew\-]+\fP deben ser parches vlidos: se aplican durante el proceso de
+extraccin.
+
+Al construir un nuevo paquete fuente, todo cambio en las fuentes original se
+guardan en un parche llamado \fBzz_debian\-diff\-auto\fP.
+.
+.SS "Formato: 3.0 (nativo)"
+Este formato es una extensin del formato de paquete nativo como se define
+en el formato 1.0. Es compatible con todos los mtodos de compresin, e
+ignorar cualquier fichero o directorio especfico a sistemas de control de
+versiones, as como muchos ficheros temporales (consulte el valor
+predefinido asociado a la opcin \fB\-I\fP en la salida de \fB\-\-help\fP).
+.
+.SS "Format: 3.0 (quilt)"
+Un paquete fuente con este formato contiene al menos un archivo tar original
+(\fB.orig.tar.\fP\fIext\fP, siendo \fIext\fP \fBgz\fP, \fBbz2\fP, \fBlzma\fP o \fBxz\fP) y un
+archivo tar de Debian (\fB.debian.tar.\fP\fIext\fP).  Tambin contiene archivos
+tar originales adicionales
+(\fB.orig\-\fP\fIcomponente\fP\fB.tar.\fP\fIext\fP). \fIcomponente\fP slo puede contener
+caracteres alfanumricos y guiones (\-).
+.PP
+\fBExtraccin\fP
+.PP
+Primero se extrae el archivo tar original, y despus se extraen todos los
+archivos tar originales en subdirectorios nombrados a partir de la parte de
+\fIcomponente\fP de su nombre de fichero (todo directorio preexistente se
+reemplazar). El archivo tar de Debian se extrae en el directorio raz del
+rbol despus de la eliminacin de cualquier directorio \fBdebian\fP
+preexistente. Tenga en cuenta que el archivo tar de Debian debe contener un
+subdirectorio \fBdebian\fP, pero tambin puede contener ficheros binarios
+externos a ese directorio (consulte la opcin \fB\-\-include\-binaries\fP).
+.PP
+En este momento se aplican todos los parches listados en
+\fBdebian/patches/debian.series\fP o \fBdebian/patches/series\fP. Si el primer
+fichero se usa, y el segundo no existe (o es un enlace simblico), ste se
+reemplazar con un enlace simblico al primero. El objetivo de esto es
+simplificar el uso de quilt al gestionar el conjunto de parches. No
+obstante, tenga en cuenta que mientras que \fBdpkg\-source\fP analiza
+correctamente los ficheros en series con opciones explcitas para la
+aplicacin del parche (guardados en cada lnea despus del nombre de fichero
+del parche y uno o ms espacios), ignora aquellas opciones que siempre
+esperan parches que se puedan aplicar con la opcin \fB\-p1\fP de \fBpatch\fP. De
+no ser as, mostrar un aviso en caso de encontrar tales opciones, y cabe
+que la construccin falle.
+.PP
+De forma similar al comportamiento predefinido de quilt, los parches tambin
+pueden eliminar ficheros.
+.PP
+El fichero \fB.pc/applied\-patches\fP se crea en caso de aplicar parches durante
+la extraccin.
+.PP
+\fBConstruccin\fP
+.PP
+All original tarballs found in the current directory are extracted in a
+temporary directory by following the same logic as for the unpack, the
+debian directory is copied over in the temporary directory, and all patches
+except the automatic patch (\fBdebian\-changes\-\fP\fIversion\fP or
+\fBdebian\-changes\fP, depending on \fB\-\-single\-debian\-patch\fP) are applied. The
+temporary directory is compared to the source package directory. When the
+diff is non\-empty, the build fails unless \fB\-\-single\-debian\-patch\fP or
+\fB\-\-auto\-commit\fP has been used, in which case the diff is stored in the
+automatic patch.  If the automatic patch is created/deleted, it's
+added/removed from the series file and from the quilt metadata.
+
+Cualquier cambio en un fichero binario no se puede representar en un diff,
+conduciendo as a un fallo a menos que el desarrollador decida
+explcitamente incluir el fichero binario modificado en el archivo tar
+debian (mediante su listado en \fBdebian/source/include\-binaries\fP). La
+construccin tambin fallar si encuentra ficheros binarios en el
+subdirectorio debian, a menos que estn en el whitelist de
+\fBdebian/source/include\-binaries\fP.
+
+Llegado a este punto se genera el archivo tar debian en base al directorio
+debian modificado y la lista de binarios modificados.
+
+El diff generado automticamente no incluye cambios en ficheros
+especficos al sistema de control de versiones, as como muchos otros
+ficheros temporales (consulte el valor predefinido asociado a \fB\-i\fP en la
+salida de \fB\-\-help\fP). En particular, se ignora el directorio \fB.pc\fP empleado
+por quilt durante la creacin del parche automtico.
+
+Note: \fBdpkg\-source\fP \fB\-\-before\-build\fP (and \fB\-b\fP) will ensure that all
+patches listed in the series file are applied so that a package build always
+has all patches applied. It does this by finding unapplied patches (they are
+listed in the \fBseries\fP file but not in \fB.pc/applied\-patches\fP), and if the
+first patch in that set can be applied without errors, it will apply them
+all. The option \fB\-\-no\-preparation\fP can be used to disable this behavior.
+
+.PP
+\fBRecording changes\fP
+.TP 
+\fB\-\-commit\fP [\fIdirectory\fP] [\fIpatch\-name\fP] [\fIpatch\-file\fP]
+Generates a patch corresponding to the local changes that are not managed by
+the quilt patch system and integrates it in the patch system under the name
+\fIpatch\-name\fP. If the name is missing, it will be asked interactively. If
+\fIpatch\-file\fP is given, it is used as the patch corresponding to the local
+changes to integrate. This is mainly useful after a build failure that
+pre\-generated this file. Once integrated, an editor is launched so that you
+can edit the meta\-information in the patch header.
+
+.PP
+\fBOpciones de construccin\fP
+.TP 
+\fB\-\-allow\-version\-of\-quilt\-db=\fP\fIversin\fP
+Permite que \fBdpkg\-source\fP construya el paquete fuente si la versin de los
+metadatos de quilt es el especificado, incluso si \fBdpkg\-source\fP no lo
+conoce. De hecho, esto dice que la versin dada de los metadatos de quilt es
+compatible con la versin 2, con la que \fBdpkg\-source\fP tiene compatibilidad
+actualmente. Esta versin de los metadatos de quilt se guardan en
+\&\fB.pc/.version\fP.
+.TP 
+\fB\-\-include\-removal\fP
+No ignora los ficheros eliminados y los incluye en el parche generado
+automticamente.
+.TP 
+\fB\-\-include\-timestamp\fP
+Incluye la marca temporal en el parche generado automticamente.
+.TP 
+\fB\-\-include\-binaries\fP
+Aade todos los ficheros binarios modificados al archivo tar
+debian. Tambin los aade a \fBdebian/source/include\-binaries\fP: se aadirn
+por omisin en futuras construcciones, con lo que esta opcin ya no ser
+necesaria.
+.TP 
+\fB\-\-no\-preparation\fP
+No intenta preparar el rbol de construccin aplicando parches que estn
+supuestamente sin aplicar.
+.TP 
+\fB\-\-single\-debian\-patch\fP
+Use \fBdebian/patches/debian\-changes\fP instead of
+\fBdebian/patches/debian\-changes\-\fP\fIversion\fP for the name of the automatic
+patch generated during build. This option is particularly useful when the
+package is maintained in a VCS and a patch set can't reliably be
+generated. Instead the current diff with upstream should be stored in a
+single patch. The option would be put in \fBdebian/source/local\-options\fP and
+would be accompanied by a \fBdebian/source/local\-patch\-header\fP file
+explaining how the Debian changes can be best reviewed, for example in the
+VCS that is used.
+.TP 
+\fB\-\-create\-empty\-orig\fP
+Crea automticamente el archivo tar principal y original como vaco en caso
+de no existir y si hay otros archivos tar originales adicionales. Esta
+opcin est diseada para su uso cuando el paquete fuente es un conjunto de
+varios programas de la fuente principal y cuando no hay programas
+principales.
+.TP 
+\fB\-\-unapply\-patches\fP
+Unapply the patches in the \fB\-\-after\-build\fP hook. You usually don't need
+this option as dpkg\-source will automatically unapply the patches if it did
+apply them during \fB\-\-before\-build\fP. This option is only allowed in
+\fBdebian/source/local\-options\fP so that all generated source packages have
+the same behavior by default.
+.TP 
+\fB\-\-abort\-on\-upstream\-changes\fP
+El proceso falla si se genera un parche automtico. Esta opcin se puede
+usar para asegurar que todos los cambios se registren apropiadamente en
+parches de quilt separados antes de la construccin del paquete fuente. Esta
+opcin no se permite en \fBdebian/source/options\fP pero se puede usar en
+\fBdebian/source/local\-options\fP.
+.TP 
+\fB\-\-auto\-commit\fP
+The process doesn't fail if an automatic patch has been generated, instead
+it's immediately recorded in the quilt series.
+
+.PP
+\fBOpciones de extraccin\fP
+.TP 
+\fB\-\-skip\-debianization\fP
+Omite la extraccin del archivo tar debian sobre las fuente del autor
+original.
+.TP 
+\fB\-\-skip\-patches\fP
+No aplica los parches al finalizar la extraccin.
+.
+.SS "Formato: 3.0 (custom)"
+This format is special. It doesn't represent a real source package format
+but can be used to create source packages with arbitrary files.
+.PP
+\fBOpciones de construccin\fP
+.PP
+Todos los argumentos que no son opciones se toman como ficheros a integrar
+en el paquete fuente generado. Deben existir, a ser posible en el directorio
+actual. Debe introducir al menos un fichero.
+.TP 
+\fB\-\-target\-format=\fP\fIvalor\fP
+\fBObligatorio\fP. Define el formato real del paquete fuente generado. El
+fichero .dsc generado contendr este valor en su campo \fIFormat\fP y no 3.0
+(custom).
+.
+.SS "Format: 3.0 (git)"
+Este formato es experimental.
+.PP
+Un paquete de fuente con este formato consiste de un slo archivo con un
+repositorio \fB.git\fP, que guarda la fuente del paquete. Puede tambin existir
+un fichero \fB.gitshallow\fP que lista las revisiones de una clonacin de git
+superficial (shallow).
+.PP
+\fBExtraccin\fP
+.PP
+El archivo se clona como un repositorio git en el directorio destino. Si hay
+un fichero gitshallow, se instala como .git/shallow dentro del
+repositorio git clonado.
+.PP
+Tenga en cuenta que, por omisin, el nuevo repositorio tendr un checkout
+de la misma rama de la que se realiz el checkout de la fuente
+original. (Habitualmente, master, pero podra ser cualquier otra cosa.)
+Todas las dems ramas estarn disponibles bajo remotes/origin/.
+.PP
+\fBConstruccin\fP
+.PP
+Antes de continuar, se realizan algunas revisiones para asegurar que no
+queden cambios no ignorados a remitir al repositorio mediante commit.
+.PP
+\fBgit\-bundle\fP(1) se usa para generar un archivo a partir de un repositorio
+git. Por omisin, se incluyen en el archivo todas las ramas y etiquetas en
+el repositorio.
+.PP
+\fBOpciones de construccin\fP
+.TP 
+\fB\-\-git\-ref=\fP\fIref\fP
+Permite especificar una referencia (ref) de git a incluir en el archivo de
+git. Su uso desactiva el comportamiento predefinido de incluir todas las
+ramas y etiquetas, y se puede definir varias veces. \fIref\fP puede ser el
+nombre de una rama o etiqueta a incluir. Por ejemplo, para incluir slo la
+rama master, use \-\-git\-ref=master. Para incluir todas las etiquetas y
+ramas a excepcin de la rama local (private), use \-\-git\-ref=\-\-all
+\-\-git\-ref=^private.
+.TP 
+\fB\-\-git\-depth=\fP\fInumber\fP
+Crea un clon superficial (shalow) con la historia truncada en el nmero
+definido de revisiones.
+.SS "Format: 3.0 (bzr)"
+Este formato es experimental. Genera un nico archivo tar que contiene el
+repositorio bzr.
+.PP
+\fBExtraccin\fP
+.PP
+El archivo tar se desempaqueta, usando despus bzr para realizar un
+checkout de la rama actual.
+.PP
+\fBConstruccin\fP
+.PP
+Antes de continuar, se realizan algunas revisiones para asegurar que no
+queden cambios no ignorados a remitir al repositorio mediante commit.
+.PP
+Entones, la parte del directorio de fuentes especfico al sistema de control
+de versiones se copia a un directorio temporal. Antes de empaquetar este
+directorio temporal en una archivo tar se realizan varios procesos de
+limpieza, para as ahorrar espacio.
+.SH "AVISOS Y ERRORES"
+.SS "no se defini ningn formato de fuentes en debian/source/format"
+El fichero \fBdebian/source/format\fP siempre debera existir e indicar el
+formato de fuentes deseado. Por razones de compatibilidad hacia atrs, se
+supone el formato 1.0 cuando el fichero no existe, pero no debera
+depender de esto. En algn punto en el futuro, se modificar dpkg para que
+falle cuando no encuentre ese fichero.
+
+El fundamente es que el formato 1.0 ya no es el formato recomendado, sino
+que debera escoger uno de los formatos ms recientes (3.0 (quilt), 3.0
+(native)). \fBdpkg\-source\fP no har esto automticamente. Si desea continuar
+usando el formato antiguo, tendr que ser explcito e insertar 1.0 en
+\fBdebian/source/format\fP.
+.SS "el diff modifica los siguientes ficheros de la fuente original"
+Generalmente, es una mala idea modificar ficheros de la fuente original si
+est usando el formato de fuentes 1.0 ya que los cambios terminarn
+ocultos y generalmente sin documentar dentro del fichero diff.gz. Debera
+guardar los cambios como parches en el directorio debian y aplicarlos en
+tiempo de construccin. Para evitar esta complejidad tambin puede usar el
+formato 3.0 (quilt), que ofrece esto de forma nativa.
+.SS "no se pueden representar los cambios al \fIfichero\fP"
+Los cambios a las fuentes originales se suelen guardar el ficheros de
+parche, pero no todos los cambios se pueden representar con parches: slo
+pueden alterar el contenido de ficheros de texto simple. Si intenta
+reemplazar un fichero con algo de otro tipo (por ejemplo, un fichero simple
+con un enlace simblico o directorio), obtendr el siguiente mensaje de
+error.
+.SS "el fichero vaco \fIfichero\fP recientemente creado no estar representado en el diff"
+No se pueden crear ficheros vacos con ficheros de parche. Por ello, este
+cambio no se registra en el paquete fuente, est usted avisado.
+.SS "los \fIpermisos\fP de modo de ejecucin del \fIfichero\fP no se representarn en el diff"
+.SS "los \fIpermisos\fP de modo especial del \fIfichero\fP no se representarn en el diff"
+Los ficheros de parche no registran permisos de los ficheros, y por ello los
+permisos modificados no se guardan en el paquete fuente. Este aviso le sirve
+de recordatorio.
+.SH "FORMATOS DE FICHERO"
+.SS debian/source/format
+Este fichero contiene en una nica lnea el formato que se debera usar para
+construir el paquete fuente (los formatos posibles se describen en un punto
+anterior). No se permiten espacios vacos al principio o final de la lnea.
+.SS debian/source/include\-binaries
+Este fichero contiene una lista de ficheros binarios (uno por lnea) que se
+deberan incluir en el archivo tar debian. Se eliminan los espacios vacos
+al principio y final de la lnea. Las lneas que comienzan con # son
+comentarios, y por tanto, se omiten. Se ignorarn lneas vacas.
+.SS debian/source/options
+Este fichero contiene una lista de opciones largas que se deberan anexar al
+conjunto de las opciones de lnea de rdenes de una invocacin a
+\fBdpkg\-source \-b\fP o \fBdpkg\-source \-\-print\-format\fP. Las opciones como
+\fB\-\-compression\fP y \fB\-\-compression\-level\fP son adecuadas con este fichero.
+.P
+Cada opcin debera aparecer en una lnea separada. Se ignorarn las lneas
+vacas, y aquellas que comienzan con #. Los guiones \-\- al principio de
+la opcin se deberan eliminar, y no se permiten opciones cortas. Se
+permiten espacios adicionales en torno al smbolo =, as como comillas
+dobles en torno al valor. Aqu tiene un ejemplo de este fichero:
+.P
+  # let dpkg\-source create a debian.tar.bz2 with maximal compression
+  compression = "bzip2"
+  compression\-level = 9
+  # use debian/patches/debian\-changes as automatic patch
+  single\-debian\-patch
+  # ignore changes on config.{sub,guess}
+  extend\-diff\-ignore = "(^|/)(config.sub|config.guess)$"
+.P
+Nota: no se permiten en este fichero las opciones de \fBformato\fP, y debera
+usar \fBdebian/source/format\fP en su lugar.
+.SS debian/source/local\-options
+Idntico a \fBdebian/source/options\fP, a excepcin de que el fichero no se
+incluye en el paquete fuente generado. Puede ser til para guardar una
+preferencia ligada al mantenedor a al repositorio del sistema de control de
+versiones dnde el paquete es mantenido.
+.SS debian/source/local\-patch\-header
+.SS debian/source/patch\-header
+Free form text that is put on top of the automatic patch generated in
+formats "2.0" or "3.0 (quilt)". \fBlocal\-patch\-header\fP is not included in the
+generated source package while \fBpatch\-header\fP is.
+.SS debian/patches/series
+Este fichero lista todos los parches que se deben aplicar (en el orden dado)
+al paquete fuente del autor original. Se eliminarn los espacios vacos al
+principio y final de la lnea. Las lneas que comienzan con # son
+comentarios, y se omiten. Las lneas restantes empiezan con un nombre de
+fichero de un parche (relativo al directorio \fBdebian/patches/\fP) hasta el
+primer carcter de espacio, o el final de la lnea. Opcionalmente, puede
+insetar a continuacin opciones de quilt hasta el final de lnea, o el
+primer # precedido de uno o ms espacios (que indican el inicio de un
+comentario hasta el final de la lnea).
+.SH FALLOS
+No est claro el punto en el cual se produce la sustitucin de campos,
+comparado con ciertas opciones de los campos de salida estndar.
+.SH "VASE TAMBIN"
+\fBdpkg\-deb\fP(1), \fBdpkg\fP(1), \fBdselect\fP(1).
+.
+.SH AUTORES
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2008\-2011 Rapha\[:e]l Hertzog
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-split.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-split.1
--- dpkg/man/es/dpkg-split.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-split.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,196 @@
+.\" Authors: Ian Jackson
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-split 1 2011\-07\-04 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-split \- Herramienta para separar y unir paquetes Debian
+.
+.SH SINOPSIS
+\fBdpkg\-split\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH DESCRIPCIN
+\fBdpkg\-split\fP separa un paquete binario de Debian en varias partes ms
+pequeas para luego volverlas a unir, posibilitando almacenar paquetes en
+dispositivos de poca capacidad, como disquetes.
+
+Se puede usar manualmente usando las opciones \fB\-\-split\fP, \fB\-\-join\fP y
+\fB\-\-info\fP.
+
+Tambin ofrece un modo automtico mediante la opcin \fB\-\-auto\fP, que crea una
+cola con las partes que ha analizado pero an separadas para despus crear
+el paquete tras analizar todas las partes. Las opciones \fB\-\-listq\fP y
+\fB\-\-discard\fP permiten administrar la cola.
+
+Los procesos de separar, unir y posicionado en cola producen mensajes
+informativos por la salida estndar, que se pueden ignorar sin ningn
+riesgo.
+.
+.SH RDENES
+.TP 
+\fB\-s\fP, \fB\-\-split\fP \fIpaquete\-completo\fP [\fIprefix\fP]
+Divide un nico paquete binario de Debian en varias partes.
+
+Las partes reciben el nombre \fIprefijo\fP\fB.\fP\fIN\fP\fBof\fP\fIM\fP\fB.deb\fP, siendo \fIN\fP
+el nmero de la parte, comenzando por 1, y \fIM\fP el nmero total de partes
+(ambos en decimal).
+
+Si no se proporciona ningn \fIprefijo\fP, se toma el nombre del
+\fIfichero\-completo\fP, incluyendo el directorio, y eliminando cualquier
+terminacin \fB.deb\fP.
+.TP 
+\fB\-j\fP, \fB\-\-join\fP \fIparte\fP...
+Une las partes de un paquete, dejando el paquete tal y como era
+originalmente.
+
+Las partes que se proporcionen como argumento deben ser todas parte del
+mismo fichero original. Cada parte se debe proporcionar una sola vez, aunque
+no necesariamente en orden.
+
+Todas las partes se deben generar con el mismo tamao especificado en el
+momento de la divisin, lo que significa que todas se deben generar con la
+misma invocacin de \fBdpkg\-split \-\-split\fP.
+
+El nombre de las partes carece de importancia para el proceso de unin.
+
+By default the output file is called
+\fIpackage\fP\fB_\fP\fIversion\fP\fB_\fP\fIarch\fP\fB.deb\fP.
+
+.TP 
+\fB\-I\fP, \fB\-\-info\fP \fIparte\fP...
+Muestra informacin, en un formato legible por el usuario, acerca de la
+parte o partes del fichero especificadas. Los argumentos que no son parte de
+un paquete binario producen un mensaje avisando del problema (por la salida
+estndar).
+.TP 
+\fB\-a\fP, \fB\-\-auto \-o\fP \fIsalida\-completa parte\fP
+Posiciona las partes en la cola automticamente, y une nuevamente el
+paquete, si es posible.
+
+La \fIparte\fP especificada se examina y compara junto con las otras partes del
+mismo paquete (si hay alguna) en la cola de las partes de ficheros de
+paquete.
+
+Si estn disponibles todas las partes del fichero al que pertenece la
+\fIparte\fP, se une paquete y guarda en la \fIsalida\-completa\fP (que normalmente
+no existe, aunque esto no es un error).
+
+De no se as, la \fIparte\fP se copia en la cola pero no se crea la
+\fIsalida\-completa\fP.
+
+If \fIpart\fP is not a split binary package part then \fBdpkg\-split\fP will exit
+with status \fB1\fP; if some other trouble occurs then it will exit with status
+\fB2\fP.
+
+Debe proporcionar la opcin \fB\-\-output\fP o \fB\-o\fP cuando use \fB\-\-auto\fP. (Si
+este argumento no fuese obligatorio el programa que ejecute \fBdpkg\-split\fP no
+sabra que fichero esperar).
+.TP 
+\fB\-l\fP, \fB\-\-listq\fP
+Lista los contenidos de la cola de paquetes cuyas partes unir.
+
+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 nmero total de bytes
+guardados en sta.
+.TP 
+\fB\-d\fP, \fB\-\-discard\fP [\fIpaquete\fP...]
+Descarta partes de la cola de aqullas que esperan las partes restantes del
+paquete para su unin con otras.
+
+Si no se especifica ningn \fIpaquete\fP se limpia la cola por completo, si se
+especifica alguno slo se eliminan las partes de los paquetes relevantes.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH OPCIONES
+.TP 
+\fB\-\-depotdir\fP\fI directorio\fP
+Especifica un directorio alternativo para las partes que se encuentran en la
+cola esperando para ser unidas. Por omisin es \fB/var/lib/dpkg\fP.
+.TP 
+\fB\-S\fP, \fB\-\-partsize\fP \fIkibibytes\fP
+Especifica el tamao mximo de cada parte en kilobytes (1024 bytes). Por
+omisin es 450Kb.
+.TP 
+\fB\-o\fP, \fB\-\-output\fP \fIcomplete\-output\fP
+Especifica el nombre del fichero generado por la unin de las partes.
+
+sto sustituye al nombre por omisin en modo manual (\fB\-\-join\fP),  y es
+obligatorio con el modo automtico (\fB\-\-auto\fP).
+.TP 
+\fB\-Q\fP, \fB\-\-npquiet\fP
+Cuando \fBdpkg\-split\fP est en modo automtico, normalmente muestra mensajes
+si se le pasa una \fIparte\fP que no es parte del paquete binario. Esta opcin
+suprime estos mensajes, permitiendo que programas como \fBdpkg\fP puedan
+separar y unir paquetes sin producir mensajes poco informativos.
+.TP 
+\fB\-\-msdos\fP
+Fuerza que los nombres de los ficheros generados como salida de \fB\-\-split\fP
+sean compatibles con msdos.
+
+Esta opcin modifica el prefijo (tanto el prefijo por omisin como el
+proporcionado por un argumento): los caracteres alfanumricos se pasan a
+minsculas, los signos de suma + se reemplazan con \fBx\fP y se descartan el
+resto de caracteres.
+
+El resultado restante se trunca hasta donde sea necesario de forma que se
+generen ficheros con la forma \fIprefijoN\fP\fBof\fP\fIM\fP\fB.deb.\fP
+.
+.SH "ESTADOS DE SALIDA"
+.TP 
+\fB0\fP
+The requested split, merge, or other command succeeded.  \fB\-\-info\fP commands
+count as successful even if the files are not binary package parts.
+.TP 
+\fB1\fP
+Only occurs with \fB\-\-auto\fP and indicates that the \fIpart\fP file was not a
+binary package part.
+.TP 
+\fB2\fP
+Some kind of trouble happened, 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.
+.
+.SH FALLOS
+Es imposible obtener todos los detalles de los paquetes que estn en la cola
+sin investigar directamente la cola.
+
+No existe una manera sencilla de comprobar si el fichero que puede ser parte
+de un paquete binario es realmente uno.
+.
+.SH FICHEROS
+.TP 
+\fI/var/lib/dpkg/parts\fP
+El directorio por omisin donde las partes esperan para la unin automtica.
+
+Los nombre de los ficheros usados en este directorio se encuentran en un
+formato interno de \fBdpkg\-split\fP, y es improbable que sean tiles para otros
+programas. En cualquier caso, no se debera depender del formato del nombre
+del fichero.
+.
+.SH "VASE TAMBIN"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\-deb\fP(1), \fBdpkg\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995\-1996 Ian Jackson
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-statoverride.8 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-statoverride.8
--- dpkg/man/es/dpkg-statoverride.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-statoverride.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,108 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-statoverride 8 2011\-07\-04 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-statoverride \- Sustitucin del propietario y modo de ficheros
+.
+.SH SINOPSIS
+\fBdpkg\-statoverride\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH DESCRIPCIN
+\fBLa sustitucin de propiedades\fP es un modo de indicar a \fBdpkg\fP(1) que use
+un propietario o modo diferente para un fichero cuando un paquete est
+instalado (Nota: aqu usamos la palabra fichero, pero puede tratarse de
+cualquier objeto del sistema de ficheros que dpkg pueda manejar, incluyendo
+directorios, dispositivos, etc). Se puede usar para forzar que programas que
+normalmente se instalan con bit setuid se instalen sin esta marca, o que
+slo sean ejecutables por un grupo en concreto.
+.P
+\fBdpkg\-statoverride\fP es una herramienta para administrar la lista de
+sustituciones. Tiene tres funciones bsicas: aadir, eliminar y listar las
+excepciones.
+.
+.SH RDENES
+.TP 
+\fB\-\-add\fP\fI usuario grupo modo fichero\fP
+Aade una sustitucin para el \fBfichero\fP. No es necesario que el \fIfichero\fP
+exista cuando se use esta orden, la sustitucin se guardar para usarse
+posteriormente. Los usuarios y los grupos se pueden definir por su nombre
+(por ejemplo \fBroot\fP o \fBnobody\fP), o por su nmero precedido por un \fB#\fP
+(por ejemplo \fB#0\fP o \fB#65534\fP). El \fImodo\fP se debe definir en base al
+sistema octal.
+
+Si se proporciona la opcin \-\-update y el \fIfichero\fP existe, se le asigna
+inmediatamente el nuevo propietario y modo.
+.TP 
+\fB\-\-remove\fP\fI fichero\fP
+Elimina una sustitucin para el \fIfichero\fP, esta orden no modifica el estado
+del \fBfichero\fP.
+.TP 
+\fB\-\-list\fP [\fIcomodn\fP]
+Lista todas las sustituciones. Si se define un comodn, restringir la
+salida a lo que concuerde con el patrn. Si no hay ninguna sustitucin o
+ninguna concuerda con el patrn, \fBdpkg\-statoverride\fP finalizar con un
+cdigo de salida de 1.
+.TP 
+\fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH OPCIONES
+.TP 
+\fB\-\-admindir\fP\fI directorio\fP
+Cambia el \fIdirectorio\fP con la base de datos de dpkg, donde tambin se
+guarda la informacin relativa al fichero statoverride. Por omisin es
+/var/lib/dpkg.
+.TP 
+\fB\-\-force\fP
+Fuerza una accin, incluso si sta pudiese resultar perjudicial. Es
+necesario para poder modificar una sustitucin existente.
+.TP 
+\fB\-\-update\fP
+Trata inmediatamente de cambiar el fichero al nuevo propietario y modo, de
+existir.
+.TP 
+\fB\-\-quiet\fP
+Reduce el nivel de informacin de las acciones tomadas.
+.
+.SH ENTORNO
+.TP 
+\fBDPKG_ADMINDIR\fP
+If set and the \fB\-\-admindir\fP option has not been specified, it will be used
+as the dpkg data directory.
+.
+.SH FICHEROS
+.TP 
+\fI/var/lib/dpkg/statoverride\fP
+El fichero que contiene la lista actual de sustituciones de propiedades del
+sistema. Se encuentra en el directorio de administracin de dpkg, junto con
+otros ficheros importantes para dpkg como status o available.
+.br
+Nota: \fBdpkg\-statoverride\fP preserva una copia antigua del fichero con la
+extensin \-old antes de reemplazarla con una nueva.
+.
+.SH "VASE TAMBIN"
+\fBdpkg\fP(1).
+.
+.SH AUTOR
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-trigger.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-trigger.1
--- dpkg/man/es/dpkg-trigger.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-trigger.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,85 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-trigger 1 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-trigger \- Herramienta de disparadores de paquete
+.
+.SH SINOPSIS
+\fBdpkg\-trigger\fP [\fIopcin\fP...] \fInombre\-disparador\fP
+.br
+\fBdpkg\-trigger\fP [\fIopcin\fP...] \fIorden\fP
+.
+.SH DESCRIPCIN
+\fBdpkg\-trigger\fP es una herramienta para activar disparadores
+intencionadamente y revisar su compatibilidad con la versin de \fBdpkg\fP en
+ejecucin.
+.PP
+Se puede usar mediante scripts del desarrollador en situaciones complejas y
+condicionales en las que los ficheros de disparadores, o la declaracin de
+la directiva \fBactivate\fP en el fichero de control, no son suficientemente
+informativos. Tambin se puede usar para comprobaciones y administradores de
+sistemas (pero tenga en cuenta que \fBdpkg\-trigger\fP no accionar los
+disparadores).
+.PP
+La sintaxis no reconocida de nombres de disparadores son un error para
+\fBdpkg\-trigger\fP.
+.
+.SH RDENES
+.TP 
+\fB\-\-check\-supported\fP
+Check if the running \fBdpkg\fP supports triggers (usually called from a
+postinst). Will exit \fB0\fP if a triggers\-capable \fBdpkg\fP has run, or \fB1\fP
+with an error message to stderr if not. Normally, however, it is better just
+to activate the desired trigger with \fBdpkg\-trigger\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH OPCIONES
+.TP 
+\fB\-\-admindir=\fP\fIdirectorio\fP
+Cambia el directorio con la base de datos de \fBdpkg\fP. Por omisin es
+\fI/var/lib/dpkg\fP.
+.TP 
+\fB\-\-by\-package=\fP\fIpaquete\fP
+Override trigger awaiter (normally set by \fBdpkg\fP through the
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP environment variable of the maintainer scripts,
+naming the package to which the script belongs, and this will be used by
+default).
+.TP 
+\fB\-\-no\-await\fP
+Esta opcin define que la invocacin al paquete T (de existir) no necesita
+esperar al procesamiento de este disparador; el paquete(s) interesado I no
+se aadir a la lista de espera del procesado del disparador, sin cambiar el
+estado de T. Puede que se considere que T est instalado aunque no se haya
+procesado el disparador.
+.TP 
+\fB\-\-no\-act\fP
+Realiza un simulacro sin cambios en el sistema.
+.
+.SH ENTORNO
+.TP 
+\fBDPKG_ADMINDIR\fP
+If set and the \fB\-\-admindir\fP option has not been specified, it will be used
+as the dpkg data directory.
+.
+.SH "VASE TAMBIN"
+\fBdpkg\fP(1), \fBdeb\-triggers\fP(5), \fB/usr/share/doc/dpkg\-dev/triggers.txt.gz\fP.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dpkg-vendor.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-vendor.1
--- dpkg/man/es/dpkg-vendor.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dpkg-vendor.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,68 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-vendor 1 2011\-07\-04 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dpkg\-vendor \- Consulta informacin relativa al proveedor de la publicacin
+.
+.SH SINOPSIS
+\fBdpkg\-vendor\fP [\fIopcin\fP...] \fIorden\fP
+.
+.SH DESCRIPCIN
+\fBdpkg\-vendor\fP es una herramienta para consultar informacin de los
+proveedores listados en \fB/etc/dpkg/origins\fP. \fB/etc/dpkg/origins/default\fP
+contiene informacin acerca del proveedor actual.
+.
+.SH RDENES
+.TP 
+\fB\-\-is\fP\fI proveedor\fP
+Exits with \fB0\fP if the current vendor is \fIvendor\fP. Otherwise exits with
+non\-zero.
+.TP 
+\fB\-\-derives\-from\fP\fI proveedor\fP
+Exits with \fB0\fP if the current vendor distribution is a derivative of
+\fIvendor\fP, otherwise exits with non\-zero. It uses the "Parent" field to
+browse all ancestors of the current vendor.
+.TP 
+\fB\-\-query\fP\fI campo\fP
+Muestra por la salida estndar el valor especfico de proveedor \fIcampo\fP en
+relacin al proveedor actual.
+.TP 
+\fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH OPCIONES
+.TP 
+\fB\-\-vendor\fP\fI proveedor\fP
+Assumes the current vendor is \fIvendor\fP instead of discovering it with the
+\fBDEB_VENDOR\fP environment variable or \fB/etc/dpkg/origins/default\fP.
+.
+.SH ENTORNO
+.TP 
+\fBDEB_VENDOR\fP
+Esta opcin define el proveedor actual. De estar vaco, el proveedor actual
+se definir leyendo \fB/etc/dpkg/origins/default\fP.
+.
+.SH AUTOR
+Copyright \(co 2009 Rapha\[:e]l Hertzog
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dselect.1 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dselect.1
--- dpkg/man/es/dselect.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dselect.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,472 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dselect 1 2011\-08\-14 "Proyecto Debian" Debian
+.SH NOMBRE
+dselect \- Interfaz para la gestin de paquetes de Debian
+.
+.SH SINOPSIS
+\fBdselect\fP [\fIoption\fP...] [\fIaction\fP]
+.
+.SH DESCRIPCIN
+\fBdselect\fP
+es una de las principales interfaces para la gestin de paquetes en un
+sistema Debian GNU/Linux. El men principal de \fBdselect\fP permite al
+administrador del sistema:
+ \- Actualizar la lista de paquetes disponibles
+ \- Ver el estado de los paquetes instalados y disponibles
+ \- Alterar selecciones de paquetes y gestionar las dependencias
+ \- Instalar paquetes nuevos o actualizarlos a nuevas versiones
+.PP
+\fBdselect\fP funciona como una interfaz de \fBdpkg(8)\fP, la herramienta de bajo
+nivel de manipulacin de paquetes de Debian. Ofrece una pantalla completa de
+seleccin de paquetes con un solucionador de dependencias y
+conflictos. Cuando se ejecuta con permisos de administrador permite
+instalar, actualizar y eliminar paquetes. Puede configurar varios mtodos de
+acceso para conocer las versiones disponibles e instalables desde
+repositorios de paquetes. Dependiendo del mtodo de acceso usado, esos
+repositorios de paquetes pueden ser archivos pblicos en servidores a travs
+de Internet, servidores de archivo locales o bien discos pticos. El mtodo
+de acceso recomendado es \fIapt\fP, proporcionado por el paquete \fBapt\fP.
+.PP
+Normally \fBdselect\fP 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 command line
+parameters are still available to modify the running behaviour of \fBdselect\fP
+or show additional information about the program.
+.
+.SH OPCIONES
+All options can be specified both on the command line and in the \fBdselect\fP
+configuration file \fI/etc/dpkg/dselect.cfg\fP or the files on the
+configuration directory \fI/etc/dpkg/dselect.cfg.d/\fP. 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 \fB#\fP).
+.br
+.TP 
+\fB\-\-admindir\fP\fI directorio\fP
+Cambia el directorio donde se ubican los ficheros de dpkg \fIstatus\fP,
+\fIavailable\fP y otros. Es \fI/var/lib/dpkg\fP por omisin y en condiciones
+normales no se  debera cambiar.
+.TP 
+\fB\-\-debug\fP\fI file \fP|\fI \fP\fB\-D\fP\fIfile\fP
+Turn on debugging. Debugging information is sent to \fIfile\fP.
+.TP 
+\fB\-\-expert\fP
+Activa el modo experto. Por ejemplo, no muestra mensajes de ayuda
+posiblemente molestos.
+.TP 
+\fB\-\-colour\fP|\fB\-\-color\fP \fIparte\-de\-pantalla:\fP[\fIprimer\-plano\fP],[\fIfondo\fP][\fI:attr\fP[\fI+attr+..\fP]]
+Configura los colores de la pantalla. Esto slo funciona si su equipo es
+capaz de mostrar colores. Puede usar esta opcin cuantas veces desee (es
+mejor usarla en \fIdselect.cfg\fP). 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:
+.RS
+.TP 
+\fBtitle\fP
+El ttulo de la pantalla.
+.TP 
+\fBlisthead\fP
+La lnea de cabecera encima de la lista de paquetes.
+.TP 
+\fBlist\fP
+La lista de paquetes (y tambin otros textos de ayuda).
+.TP 
+\fBlistsel\fP
+El elemento seleccionado en la lista.
+.TP 
+\fBpkgstate\fP
+En la lista de paquetes, el texto que indica el estado actual de cada
+paquete.
+.TP 
+\fBpkgstatesel\fP
+En la lista de paquetes, el texto que indica el estado actual del paquete
+seleccionado.
+.TP 
+\fBinfohead\fP
+La lnea de cabecera que muestra el estado del paquete seleccionado.
+.TP 
+\fBinfodesc\fP
+La descripcin corta del paquete.
+.TP 
+\fBinfo\fP
+Se usa para mostrar la informacin del paquete as como su descripcin.
+.TP 
+\fBinfofoot\fP
+La ltima lnea de la pantalla cuando se seleccionan paquetes.
+.TP 
+\fBquery\fP
+Se usa para mostrar lneas de consulta.
+.TP 
+\fBhelpscreen\fP
+Color de las pantallas de ayuda.
+.RE
+.P
+A continuacin de la parte de la pantalla aparecen dos puntos y la
+definicin del color. Puede definir el color del primer plano, el color de
+fondo, o ambos evitando los colores predefinidos. Se deben usar nombres
+estndar de colores de la biblioteca curses.
+.P
+Opcionalmente, a continuacin de la especificacin de colores hay otros dos
+puntos, y la especificacin de los atributos. sta es una lista de uno o ms
+atributos, separados por un signo de suma +. Los atributos disponibles
+incluyen (no todos funcionarn en todos los terminales): normal, standout,
+underline, reverse, blink, bright, dim, bold.
+.TP 
+\fB\-\-help\fP
+Muestra un breve texto de ayuda y cierra con xito.
+.TP 
+\fB\-\-version\fP
+Muestra la informacin de versin del programa y cierra con xito.
+.
+.SH ACCIONES
+When \fBdselect\fP is started it can perform the following actions, either
+directly if it was specified on the command line or by prompting the user
+with a menu of available actions if running interactively:
+.SS access
+Seleccin y configuracin de un mtodo de acceso para acceder a los
+repositorios de paquetes.
+.sp
+By default, \fBdselect\fP provides several methods such as \fIcdrom\fP,
+\fImulti_cd\fP, \fInfs\fP, \fImulti_nfs\fP, \fIharddisk\fP, \fImounted\fP, \fImulti_mount\fP,
+\fIfloppy\fP or \fIftp\fP, but other packages may provide additional methods,
+eg. the \fIapt\fP access method provided by the \fBapt\fP package.
+.sp
+El uso del mtodo de acceso va \fIapt\fP es altamente recomendado.
+.sp
+.SS update
+Actualiza la lista disponible de paquetes.
+.sp
+Obtiene una lista de versiones disponibles de paquetes desde un repositorio,
+configurado por el mtodo de acceso seleccionado, y actualiza la base de
+datos de dpkg. Habitualmente, el repositorio proporciona la lista de
+paquetes mediante ficheros llamados \fBPackages\fP o \fBPackages.gz\fP. Los
+responsables de repositorios pueden generar estos ficheros a travs del
+programa \fBdpkg\-scanpackages(1)\fP.
+.sp
+Los detalles de la accin de actualizar dependen del mtodo de acceso que se
+haya implementado. Normalmente este proceso es automtico y no requiere la
+interverncin del usuario.
+.sp
+.SS select
+Examina o gestiona la seleccin de paquetes y sus respectivas dependencias.
+.sp
+Esta es la funcin principal de \fBdselect\fP. En la pantalla de seleccin, el
+usuario puede examinar una lista de todos los paquetes disponibles e
+instalados. Cuando se ejecuta con permisos de administrador tambin es
+posible cambiar el estado de la seleccin interactivamente. \fBdselect\fP
+registra las implicaciones de estos cambios en relacin a otros paquetes
+dependencia o que entran en conflicto.
+.sp
+Cuando hay un conflicto, o bien una dependencia falla, se muestra la
+pantalla de resolucin de dependencias. En esta pantalla aparece una lista
+de paquetes conflictivos o dependientes, y por para cada paquete en la
+lista, se muestra la razn de su aparicin en ella. El usuario puede
+ejecutar las sugerencias que \fBdselect\fP ofrece, evitarlas, o bien deshacer
+los cambios hechos, incluyendo aquellos en los que se dejaron dependencias o
+conflictos sin resolver.
+.sp
+A continuacin se explica con ms detalle el uso de la pantalla interactiva
+de seleccin de paquetes.
+.sp
+.SS install
+Instala los paquetes seleccionados.
+.sp
+El mtodo de acceso configurado descargar los paquetes instalables o
+actualizables desde los repositorios, y los instalar usando
+\fBdpkg\fP. Dependiendo de la implementacin del mtodo de acceso, todos los
+paquetes se pueden descargar previamente a la instalacin, o bien cuando se
+requiera. Algunos mtodos de acceso podran borrar paquetes que se marcaron
+para su eliminacin.
+.sp
+Si ocurre algn error durante la instalacin, normalmente se aconseja
+ejecutar la instalacin nuevamente. En la mayora de los casos los problemas
+desaparecern o bien se resolvern. Si el problema persiste o la instalacin
+se ejecut de forma incorrecta, le rogamos investigue las causas y
+circunstancias del problema, y remita un informe de fallos al sistema de
+seguimiento de fallos de Debian. Puede encontrar las instrucciones
+correspondientes en http://bugs.debian.org/, o bien leyendo la
+documentacin de los programas \fBbug(1)\fP o \fBreportbug(1)\fP, si es que estn
+instalados.
+.sp
+Los detalles acerca de la accin de instalar dependen de la implementacin
+del mtodo de acceso. Puede que se requiera la atencin completa del usuario
+durante la instalacin, configuracin o eliminacin de los paquetes
+correspondientes. Esto depende exclusivamente de los scripts del mantenedor
+de los paquetes. Algunos paquetes hacen uso de la biblioteca de
+\fBdebconf(8)\fP, permitiendo as una instalacin ms flexible o incluso ms
+automatizada.
+.sp
+.SS config
+Configura cualquier paquete previamente instalado, pero no configurado
+totalmente.
+.sp
+.SS remove
+Elimina o purga (N.T. es decir, elimina los ficheros de configuracin) los
+paquetes instalados que estn marcados para su eliminacin.
+.sp
+.SS quit
+Salir de \fBdselect\fP
+.sp
+Termina el programa con xito (el cdigo de error devuelto es 0).
+.sp
+.
+.SH "Manipulacin de selecciones de paquetes"
+.sp
+.SS Introduccin
+.sp
+\fBdselect\fP expone directamente al administrador a algunas de las
+complejidades relacionadas con la gestin de grandes conjuntos de paquetes
+con muchas dependencias entrelazadas. El usuario que no est familiarizado
+con los conceptos y el sistema de gestin de paquetes de Debian puede
+encontrar este proceso un tanto abrumador. A pesar de que el objetivo de
+\fBdselect\fP es ser un programa que facilite la gestin y administracin de
+paquetes, slo lo hace de forma instrumental, por lo que no se puede
+considerar como un substituto de los conocimientos y habilidades de un
+administrador. Se requiere que el usuario est familiarizado con los
+conceptos subyacentes al sistema de paquetes de Debian. En caso de dudas,
+consulte la pgina de manual de \fBdpkg(8)\fP y el Manual de Normas de Debian.
+.sp
+A menos que se ejecute \fBdselect\fP en modo experto o intermedio, se muestra
+una pantalla de ayuda cuando se selecciona esta accin desde el men. Se
+aconseja \fIfervientemente\fP al usuario que estudie toda la informacin
+presentada en las pantallas de ayuda. La ayuda en lnea puede obtenerse en
+cualquier momento pulsando la tecla \fB?\fP.
+.sp
+.SS "Disposicin de la pantalla"
+.sp
+La pantalla de seleccin est dividida en dos partes, superior e inferior,
+de forma predefinido. La parte superior muestra la lista de paquetes. Puede
+seleccionar un paquete individual pulsando sobre l, o un grupo de paquetes,
+si es que se puede, seleccionando la cabecera del grupo. La parte inferior
+de la pantalla muestra algunos de los detalles del paquete seleccionado en
+la parte superior de la pantalla. El tipo de detalle mostrado puede variar.
+.sp
+Pulsar la tecla \fBI\fP conmuta la lista de paquetes a pantalla completa, una
+vista aumentada de los detalles de los paquetes, o la divide la pantalla
+simtricamente.
+.sp
+.SS "Detalles de la vista de paquetes."
+.sp
+Por omisin se muestra una descripcin bastante extensa del paquete
+seleccionado en la lista.
+Puede modificar el tipo de detalles pulsando la tecla \fBi\fP.
+Las opciones posibles son:
+ \- La descripcin extendida
+ \- La informacin de control de la versin instalada
+ \- La informacin de control de la versin disponible
+.sp
+La pantalla de resolucin de dependencias tambin ofrece la posibilidad de
+ver los posibles problemas de dependencias o conflictos sin resolver
+relacionados con el paquete que causa los problemas.
+.sp
+.SS "Lista de estado de los paquetes"
+.sp
+La pantalla principal muestra una lista de todos los paquetes conocidos por
+el sistema de gestin de paquetes de Debian. Esto incluye los paquetes
+instalados en el sistema y tambin aquellos conocidos mediante la base de
+datos de paquetes disponibles.
+.sp
+Para cada paquete, la lista muestra el estado, prioridad, seccin, las
+versiones instalada y disponible, el nombre del paquete y su descripcin
+corta, todo esto en una sola lnea. Pulsar la tecla \fBV\fP conmuta la
+aparicin de la versin instalada, o la disponible. La tecla \fBv\fP modifica
+la pantalla del estado del paquete a la forma breve o informativa. La forma
+breve es la opcin predefinido.
+.sp
+La forma breve del estado consiste de cuatro partes: una marca de fallo, la
+cual normalmente debera estar vaca, el estado actual, el estado de la
+ltima seleccin y el estado de la seleccin actual. Las dos primeras estn
+en directa relacin con el estado actual del paquete, el segundo par con las
+selecciones del usuario.
+.sp
+Aqu tiene una tabla de significados de indicadores del estado del paquete:
+ Marca de error:
+  \fIvaco\fP   No hay error.
+  \fBR\fP       Error serio, necesita una reinstalacin.
+ Estado de la instalacin:
+  \fIvaco\fP   No est instalado.
+  \fB*\fP       Totalmente instalado y configurado.
+  \fB\-\fP       No est instalado, pero an existen archivos de
+             configuracin.
+  \fBU\fP       Desempaquetado, pero no configurado por el momento.
+  \fBC\fP       Medio\-configurado (ocurri un error).
+  \fBI\fP       Medio\-instalado (ocurri un error).
+ Seleccin actual y solicitada:
+  \fB*\fP       Marcado para su instalacin o actualizacin.
+  \fB\-\fP       Marcado para su eliminacin, no se eliminarn
+             los ficheros de configuracin.
+  \fB=\fP       Bloqueado: el paquete no se procesar en absoluto.
+  \fB_\fP       El paquete est marcado para su purgacin,
+             tambin elimina los ficheros de configuracin.
+  \fBn\fP       El paquete es nuevo y an no se ha marcado.
+.sp
+.SS "Movimiento del cursor y de la pantalla"
+.sp
+La lista de seleccin de paquetes y la pantalla de resolucin de
+dependencias y conflictos se pueden explorar usando las siguientes teclas:
+.br
+  \fBp, arriba, k\fP       Mueve el cursor hacia arriba.
+  \fBn, abajo, j\fP        Mueve el cursor hacia abajo.
+  \fBP, repg, retorno\fP  Mueve la lista una pgina hacia arriba.
+  \fBN, avpg, Espacio\fP  Mueve la lista una pgina hacia abajo.
+  \fB^p\fP                 Mueve la lista una lnea hacia arriba.
+  \fB^n\fP                 Mueve la lista una lnea hacia abajo.
+  \fBt, Inicio\fP          Salta al principio de la lista.
+  \fBe, Fin\fP             Salta al fin de la lista.
+  \fBu\fP                  Mueve info una pgina hacia arriba.
+  \fBd\fP                  Mueve info una pgina hacia abajo.
+  \fB^u\fP                 Mueve info una lnea hacia abajo.
+  \fB^d\fP                 Mueve info una lnea hacia abajo.
+  \fBB, izquierda\fP       Exhibe la pantalla 1/3 hacia la izquierda.
+  \fBF, derecha\fP         Exhibe la pantalla 1/3 hacia la derecha.
+  \fB^b\fP                 Exhibe un carcter hacia la izquierda.
+  \fB^f\fP                 Exhibe un carcter hacia la derecha.
+.sp
+.SS "Buscar y ordenar"
+.sp
+Puede realizar bsquedas de paquetes en la lista mediante el nombre. Puede
+hacerlo pulsando la tecla \fB/\fP y escribiendo el nombre del paquete que
+desea buscar. Este nombre se interpreta como una expresin regular de
+acuerdo a \fBregex\fP(7). Si se aade \fB/d\fP a la bsqueda, dselect buscar
+tambin en las descripciones. Si se aade \fB/i\fP la bsqueda no
+discriminar entre maysculas y minsculas. Puede combinar estas dos
+opciones de esta manera: \fB/id\fP. Puede repetir la bsqueda pulsando las
+teclas \fBn\fP o \fB\e\fP, hasta encontrar el paquete que estaba buscando. Si
+la bsqueda comienza al final de la lista, subir al principio y tambin
+continuar la bsqueda desde ese punto.
+.sp
+El orden de la lista se puede modificar pulsando las teclas
+\fBo\fP y \fBO\fP repetidamente.
+Los siguientes ordenamientos son posibles:
+ alfabtico        disponible          	 estado
+ prioridad+seccin disponible+prioridad  estado+prioridad
+ seccin+prioridad disponible+seccin    estado+seccin
+.br
+Si no se usa explcitamente ninguno de los mencionados arriba, se usa el
+orden alfabtico.
+.sp
+.SS "Modificar selecciones."
+.sp
+El estado de la seleccin solicitada de paquetes individuales se puede
+alterar mediante las siguientes rdenes:
+  \fB+, Insert\fP    Instala o actualiza.
+  \fB=, H\fP         Bloqueado en el estado y versin actual.
+  \fB:, G\fP         Elimina el bloqueo: actualiza o deja sin instalar.
+  \fB\-, Supr\fP      Elimina, pero deja los ficheros de configuracin.
+  \fB_\fP            Elimina y borra los ficheros de configuracin.
+.sp
+Cuando los cambios resultan en una o ms dependencias no satisfechas, o
+tambin en conflictos, \fBdselect\fP muestra al usuario una pantalla de
+resolucin de dependencias. Esta pantalla se explicar en detalle ms abajo.
+.sp
+Tambin es posible aplicar estas rdenes a grupos de selecciones de
+paquetes, apuntando el cursor a la cabecera del grupo. El agrupamiento
+exacto de los paquetes depende de la configuracin del ordenamiento de la
+lista.
+.sp
+Se debe tomar el cuidado apropiado al alterar grupos grandes de selecciones,
+ya que esto puede crear inmediatamente una larga lista de dependencias sin
+resolver o conflictos con otros paquetes, los cuales aparecern en una
+pantalla nica, dificultando su gestin. En la prctica, al manipular grupos
+slo son tiles las operaciones de retencin hold y unhold.
+.sp
+.SS "Resolver problemas de dependencias y conflictos"
+.sp
+Cuando el cambio resulta en una o ms dependencias sin resolver o
+conflictos, \fBdselect\fP muestra al usuario una pantalla con la posible
+solucin al problema. Primero, sin embargo, se muestra una pantalla
+informativa.
+.sp
+La mitad superior de esta pantalla enumera todos los paquetes que tendrn
+conflictos, o problemas de dependencias sin resolver, como resultado del
+cambio requerido por el usuario, adems de todos los paquetes cuya
+instalacin solucionar el problema. La mitad inferior muestra los problemas
+de dependencia o conflictos que causa el paquete seleccionado.
+.sp
+Cuando la sub\-lista de paquetes se exhibe inicialmente puede que \fBdselect\fP
+ya haya definido el estado de seleccin requerido de alguno de los paquetes
+listados, para as resolver los problemas de dependencias o conflictos que
+causaron la aparicin de la pantalla de resolucin de
+dependencias. Habitualmente, lo mejor es seguir las sugerencias que
+\fBdselect\fP presenta.
+.sp
+Puede devolver el estado de los paquetes seleccionados en la lista a su
+configuracin original, as como tambin las dependencias sin resolver y los
+conflictos que generaron, pulsando la tecla \fBR\fP. Para reajustar las
+sugerencias automticas pulse la tecla \fBD\fP, aunque permanecer el cambio
+que causo la aparicin de la pantalla de resolucin de dependencias. Por
+ltimo, si pulsa la tecla \fBU\fP las selecciones se configurarn nuevamente
+con los valores automticos de las sugerencias.
+.sp
+.SS "Establecer las selecciones solicitadas"
+.sp
+La tecla \fBIntro\fP acepta la lista actual de selecciones. Si \fBdselect\fP
+detecta que no hay problemas, aceptar las nuevas selecciones. Sin embargo,
+si hay dependencias sin resolver \fBdselect\fP mostrar nuevamente la pantalla
+de resolucin de dependencias.
+.sp
+Para modificar una lista de selecciones que crea dependencias sin resolver o
+conflictos, y forzar a \fBdselect\fP a aceptarla, pulse la tecla \fBQ\fP. Esto
+define las selecciones definidas por el usuario,
+incondicionalmente. Generalmente, no se debera hacer esto a menos que sepa
+lo que est haciendo.
+.sp
+El efecto opuesto, deshacer sus cambios y volver hacia atrs hasta que no
+tenga problemas, se puede realizar pulsando la tecla \fBX\fP o \fBescape\fP. Si
+pulsa repetidamente estas teclas puede retirar cualquier cambio perjudicial
+a las selecciones de paquetes, volviendo as a la ltima configuracin
+definida.
+.sp
+Si ha realizado un error al definir la lista de paquetes y desea revertir
+las selecciones actuales a lo que ya est instalado en el sistema, pulse
+\fBC\fP. Es similar a usar la orden unhold sobre todos los paquetes, pero
+ofrece un botn de pnico ms obvio para aquellos casos en los que el
+usuario puls \fBIntro\fP por error.
+.sp
+.
+.SH ENTORNO
+.TP 
+\fBHOME\fP
+Si se define, \fBdselect\fP lo usar como el directorio del cual leer el
+fichero de configuracin especfico del usuario.
+.
+.SH FALLOS
+La interfaz de seleccin de paquetes de \fBdselect\fP puede parecer confusa
+para algunos usuarios nuevos. Existen informes de que ha llevado a las
+lgrimas a experimentados desarrolladores del ncleo.
+.sp
+La documentacin est incompleta.
+.sp
+No hay ninguna opcin de ayuda en el men principal.
+.sp
+La lista de paquetes disponibles no se puede reducir.
+.sp
+Los otros mtodos de acceso no tienen tanta calidad como el mtodo que
+ofrece apt. Use el mtodo de acceso que apt ofrece. Adems de que no est
+roto, es mucho ms flexible que los mtodos de acceso integrados.
+.
+.SH "VASE TAMBIN"
+\fBdpkg\fP(1), \fBapt\-get\fP(8), \fBsources.list\fP(5), \fBdeb\fP(5).
+.
+.SH AUTORES
+\fBdselect\fP fue escrito por Ian Jackson (ijackson@gnu.ai.mit.edu). Puede ver
+una lista completa de contribuyentes con dselect \-\-version.
+.br
+Esta pgina de manual fue escrita por Juho Vuori <javuori@cc.helsinki.fi
+>, Josip Rodin y Joost kooij.
+
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/dselect.cfg.5 /home/vorlon/devel/multiarch/dpkg-debian/man/es/dselect.cfg.5
--- dpkg/man/es/dselect.cfg.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/dselect.cfg.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,41 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dselect.cfg 5 2011\-07\-03 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+dselect.cfg \- Fichero de configuracin de dselect
+.
+.SH DESCRIPCIN
+This file contains default options for dselect. Each line contains a single
+option which is exactly the same as a normal command line option for dselect
+except for the leading dashes which are not used here. Quotes surrounding
+option values are stripped. Comments are allowed by starting a line with a
+hash sign ("\fB#\fP").
+.
+.SH FICHEROS
+\fI/etc/dpkg/dselect.cfg.d/[0\-9a\-zA\-Z_\-]*\fP
+.br
+\fI/etc/dpkg/dselect.cfg\fP
+.br
+\fI~/.dselect.cfg\fP
+.
+.SH AUTOR
+Consulte \fI/usr/share/doc/dpkg/THANKS\fP para una lista de las personas que
+han contribuido a \fBdselect\fP.
+.
+.SH "VASE TAMBIN"
+\fBdselect\fP(1).
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/es/update-alternatives.8 /home/vorlon/devel/multiarch/dpkg-debian/man/es/update-alternatives.8
--- dpkg/man/es/update-alternatives.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/es/update-alternatives.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,428 @@
+.\" update\-alternatives.8
+.\" This man page is copyright 1997 Charles Briscoe-Smith
+.\" This is free documentation; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published
+.\" by the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.  There is NO WARRANTY.  You can
+.\" find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH update\-alternatives 8 2011\-08\-14 "Proyecto Debian" "Herramientas de dpkg"
+.SH NOMBRE
+update\-alternatives \- Gestin de enlaces simblicos que determinan rdenes
+predefinidas
+.
+.SH SINOPSIS
+\fBupdate\-alternatives\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH DESCRIPCIN
+\fBupdate\-alternatives\fP crea, elimina, gestiona y muestra informacin sobre
+los enlaces simblicos que conforman el sistema de alternativas de Debian.
+.PP
+Es posible que tenga en el sistema varios programas instalados a la vez que
+realizan la misma funcin. Por ejemplo, muchos sistemas tienen varios
+editores de texto instalados al mismo tiempo, lo que deja la eleccin de qu
+editor de texto usar en manos del usuario, si ste lo desea, pero hace
+difcil que un programa elija la opcin correcta si el usuario no ha
+definido ninguna preferencia.
+.PP
+El objetivo del sistema de alternativas de Debian es resolver este
+problema. Un nombre genrico 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 genrico. Por ejemplo, si los editores
+de texto \fBed\fP(1) y \fBnvi\fP(1) estn instalados conjuntamente en el sistema,
+el sistema de alternativas har que el nombre genrico \fI/usr/bin/editor\fP se
+refiera a \fI/usr/bin/nvi\fP por omisin. El administrador del sistema puede
+modificar esto y hacer que se refiera a \fI/usr/bin/ed\fP, y el sistema de
+alternativas no modificar esto posteriormente hasta que se solicite
+explcitamente.
+.PP
+El nombre genrico no es un enlace simblico directo a la alternativa
+seleccionada. En vez de esto, es un enlace simblico a un nombre en el
+\fIdirectorio\fP de \fIalternativas\fP (/etc/alternatives), que a su vez es un
+enlace simblico al fichero al que se hace referencia en realidad. El
+objetivo es que los cambios del administrador se mantengan dentro del
+directorio \fI/etc\fP: el FHS (q.v.) da razones de por qu esto es bueno.
+.PP
+Cuando se instala o desinstala un paquete que provee un fichero con una
+funcionalidad en particular se invoca \fBupdate\-alternatives\fP para actualizar
+la informacin del sistema de alternativas acerca de ese
+fichero. Habitualmente, \fBupdate\-alternatives\fP se invoca desde los scripts
+\fBpostinst\fP (post\-instalacin o configuracin) o \fBprerm\fP (pre\-eliminacin)
+de los paquetes de Debian.
+.PP
+Habitualmente, es til que un nmero de alternativas se sincronicen de tal
+modo que se puedan cambiar como un grupo. Por ejemplo, cuando varias
+versiones del editor \fBvi\fP(1) estn instaladas la pgina del manual
+preferida por \fI/usr/share/man/man1/vi.1\fP debe corresponder con el
+ejecutable al que hace referencia \fI/usr/bin/vi\fP. \fBupdate\-alternatives\fP
+manipula esto en trminos de enlaces \fImaestro\fP y \fIesclavo\fP; cuando se
+cambia el maestro, todos los esclavos relacionados con l tambin
+cambian. Un enlace maestro y sus esclavos relacionados forman un \fIgrupo\fP de
+\fIenlaces\fP.
+.PP
+Cada grupo de enlaces est en todo momento en uno de los dos modos posibles:
+automtico o manual. Cuando un grupo est en modo automtico el sistema de
+alternativas decide automticamente el momento de actualizar los enlaces a
+medida que se instalan o desinstalan paquetes. En modo manual el sistema de
+alternativas deja todas estas decisiones en manos del administrador del
+sistema.
+.PP
+Los grupos de enlaces se establecen en modo automtico la primera vez que
+aparecen en el sistema. Si el administrador del sistema hace cambios en la
+configuracin automtica del sistema, \fBupdate\-alternatives\fP se dar cuenta
+la prxima vez que se ejecute sobre el grupo de enlaces cambiados y el grupo
+pasar automticamente a modo manual.
+.PP
+Cada alternativa tiene una \fIprioridad\fP asociada. Cuando un grupo de enlaces
+se encuentra en modo automtico, los miembros del grupo apuntarn a la
+alternativa con la prioridad ms alta.
+.PP
+When using the \fB\-\-config\fP option, \fBupdate\-alternatives\fP will list all of
+the choices for the link group of which given \fIname\fP is the master
+alternative name. The current choice is marked with a '*'.  You will then be
+prompted for your choice regarding this link group.  Depending on the choice
+made, the link group might no longer be in \fIauto\fP mode. You will need to
+use the \fB\-\-auto\fP option in order to return to the automatic mode (or you
+can rerun \fB\-\-config\fP and select the entry marked as automatic).
+.PP
+If you want to configure non\-interactively you can use the \fB\-\-set\fP option
+instead (see below).
+.PP
+Los diferentes paquetes que proveen el mismo fichero tienen que hacerlo de
+forma \fBcooperativa\fP. En otras palabras, el uso de \fBupdate\-alternatives\fP es
+\fBobligatorio\fP con todos los paquetes relacionados con esa situacin. No es
+posible sobreescribir el fichero de un paquete que no usa el mecanismo de
+\fBupdate\-alternatives\fP.
+.
+.SH TERMINOLOGA
+Debido a que las actividades que realiza \fBupdate\-alternatives\fP estn
+fuertemente relacionadas entre s, la definicin de algunos trminos
+especficos ayudar a entender su funcionamiento.
+.TP 
+nombre genrico (o enlace alternativo)
+Un nombre, como \fI/usr/bin/editor\fP, que mediante el sistema de alternativas
+hace referencia a uno de los posibles ficheros con una funcin similar.
+.TP 
+nombre de la alternativa
+El nombre de un enlace simblico en el directorio de alternativas.
+.TP 
+alternativa (o ruta alternativa)
+El nombre de un fichero especfico en el sistema de ficheros al que se puede
+acceder a travs de un nombre genrico usando el sistema de alternativas.
+.TP 
+directorio de alternativas
+El directorio que contiene los enlaces, por omisin es \fI/etc/alternatives\fP.
+.TP 
+directorio administrativo
+El directorio que contiene la informacin de estado de
+\fBupdate\-alternatives\fP, por omisin es \fI/var/lib/dpkg/alternatives\fP.
+.TP 
+grupo de enlaces
+Un conjunto de enlaces relacionados con el objetivo de que se actualicen
+como grupo.
+.TP 
+enlace maestro
+El enlace alternativo en un grupo de enlaces que determina cmo se
+configuran el resto de los enlaces del grupo.
+.TP 
+enlace esclavo
+Un enlace alternativo en un grupo de enlaces definido por el enlace maestro.
+.TP 
+modo automtico
+Cuando un grupo de enlaces se encuentra en modo automtico el sistema de
+alternativas asegura que los enlaces del grupo apuntan a la alternativa con
+la mayor prioridad en ese grupo.
+.TP 
+modo manual
+Cuando un grupo de enlaces se encuentra en modo manual el sistema de
+alternativas no har ningn cambio en la configuracin del administrador.
+.
+.SH RDENES
+.TP 
+\fB\-\-install\fP \fIenlace nombre ruta prioridad\fP [\fB\-\-slave\fP \fIenlace nombre ruta\fP] ...
+Aade un grupo de alternativas al sistema. \fIenlace\fP es el nombre genrico
+del enlace maestro, \fInombre\fP es el nombre del enlace simblico en el
+directorio de alternativas, y \fIruta\fP es la alternativa que se va a
+introducir para el enlace maestro. Los argumentos a continuacin de
+\fB\-\-slave\fP son el nombre genrico, el nombre del enlace simblico en el
+directorio de alternativas, y la ruta alternativa para el enlace
+esclavo. Puede definir cero o ms opciones de \fB\-\-slave\fP, cada uno seguido
+de tres argumentos. Tenga en cuenta que la alternativa maestra debe existir
+previamente o la invocacin fallar. Por otra parte, si la alternativa
+esclava no existe, el enlace esclavo alternativo correspondiente no se
+instalar, mostrando un aviso. Un fichero real instalado en la ubicacin de
+un enlace alternativo nunca se eliminar a menos que se use \fB\-\-force\fP.
+.IP
+Si el nombre de la alternativa definida ya existe en los registros del
+sistema de alternativas la informacin suministrada se aadir como un nuevo
+conjunto de alternativas para el grupo. De otra forma se crear un grupo
+nuevo en modo automtico, al que se le aadir la informacin
+suministrada. Si el grupo est en modo automtico, y la prioridad nueva
+aadida es mayor que cualquier otra alternativa instalada para ese grupo,
+los enlaces se actualizarn para apuntar a las nuevas alternativas.
+.TP 
+\fB\-\-set\fP \fInombre ruta\fP
+Set the program \fIpath\fP as alternative for \fIname.\fP This is equivalent to
+\fB\-\-config\fP but is non\-interactive and thus scriptable.
+.TP 
+\fB\-\-remove\fP \fInombre ruta\fP
+Elimina una alternativa y todos sus enlaces esclavos asociados. \fInombre\fP es
+el nombre en el directorio de alternativas y \fIruta\fP es el nombre absoluto
+del fichero al que \fInombre\fP se podra enlazar. Si \fInombre\fP est en
+realidad enlazado a \fIruta\fP, \fInombre\fP se actualizar para que apunte a otra
+alternativa apropiada o se eliminar si no queda ninguna alternativa
+restante. Los enlaces esclavos asociados se actualizarn o eliminarn
+correspondientemente. Si el enlace no apunta a \fIruta\fP, no se cambia ningn
+enlace, slo se elimina la informacin acerca de la alternativa.
+.TP 
+\fB\-\-remove\-all\fP \fInombre\fP
+Elimina todas las alternativas y todos sus enlaces esclavos
+asociados. \fInombre\fP es un nombre en el directorio de alternativas.
+.TP 
+\fB\-\-all\fP
+Invoca \fB\-\-config\fP sobre todas las alternativas. Puede ser til en
+combinacin con \fB\-\-skip\-auto\fP para revisar y configurar todas las
+alternativas que no estn configuradas en modo automtico. Tambin se
+muestran las alternativas rotas. Una manera sencilla de arreglar todas las
+alternativas rotas es invocar \fByes \[aq]\[aq] | update\-alternatives \-\-force
+\-\-all\fP.
+.TP 
+\fB\-\-auto\fP \fInombre\fP
+Cambia el grupo de enlaces dependientes de la alternativa \fInombre\fP a modo
+automtico. En el proceso, el enlace simblico y sus esclavos se
+actualizarn para apuntar a la alternativa instalada con una prioridad
+mayor.
+.TP 
+\fB\-\-display\fP \fInombre\fP
+Muestra informacin acerca del grupo de enlaces. La informacin incluye el
+modo del grupo (manual o automtico), a qu alternativa apunta el enlace
+maestro, qu otras alternativas existen (y sus alternativas esclavas
+correspondientes), y la alternativa de mayor prioridad instalada en el
+sistema.
+.TP 
+\fB\-\-get\-selections\fP
+Crea un listado de todas los nombres de alternativas maestras (aquellas que
+controlan un grupo de enlaces) y su estado. Cada lnea contiene hasta 3
+campos, separados por uno o ms espacios. El primer campo es el nombre de la
+alternativa, el segundo es el estado (bien auto o manual), y el ltimo
+contiene la eleccin presente para la alternativa (puede contener espacios
+ya que es un nombre de fichero).
+.TP 
+\fB\-\-set\-selections\fP
+Lee la configuracin de alternativas por la entrada estndar en el formato
+generado por \fBupdate\-alternatives \-\-get\-selections\fP y los reconfigura
+apropiadamente.
+.TP 
+\fB\-\-query\fP \fInombre\fP
+Muestra informacin acerca del grupo de enlaces, al igual que \-\-display,
+pero de una manera que el sistema puede analizar (consulte la seccin
+\fBFORMATO DE CONSULTA\fP ms abajo).
+.TP 
+\fB\-\-list\fP \fIname\fP
+Muestra todos los objetivos del grupo de enlaces.
+.TP 
+\fB\-\-config\fP \fInombre\fP
+Muestra las alternativas disponibles para un grupo de enlaces y permite al
+usuario seleccionar interactivamente cual usar. El grupo de enlaces se
+actualizar.
+.TP 
+\fB\-\-help\fP
+Muestra el modo de uso y termina.
+.TP 
+\fB\-\-version\fP
+Muestra la versin y termina.
+.
+.SH OPCIONES
+.TP 
+\fB\-\-altdir\fP \fIdirectorio\fP
+Define el directorio de alternativas, cuando es diferente del directorio por
+omisin.
+.TP 
+\fB\-\-admindir\fP\fI directorio\fP
+Define el directorio administrativo, cuando es diferente del directorio por
+omisin.
+.TP 
+\fB\-\-log=\fP\fIfichero\fP
+Define el fichero de registro de alternativas cuando es diferente del valor
+por omisin (/var/log/alternativas.log).
+.TP 
+\fB\-\-force\fP
+Let \fBupdate\-alternatives\fP replace or drop any real file that is installed
+where an alternative link has to be installed or removed.
+.TP 
+\fB\-\-skip\-auto\fP
+Omite el dialogo de configuracin de alternativas para aquellas configuradas
+adecuadamente en modo automtico. Esta opcin solo tiene sentido con
+\fB\-\-config\fP o \fB\-\-all\fP.
+.TP 
+\fB\-\-verbose\fP
+Genera una salida con ms informacin acerca de lo que
+\fBupdate\-alternatives\fP est haciendo.
+.TP 
+\fB\-\-quiet\fP
+No genera ningn comentario a menos que ocurra algn error.
+.
+.SH ENTORNO
+.TP 
+\fBDPKG_ADMINDIR\fP
+If set and the \fB\-\-admindir\fP option has not been specified, it will be used
+as the base administrative directory.
+.
+.SH FICHEROS
+.TP 
+\fI/etc/alternatives/\fP
+El directorio de alternativas por omisin. Se puede cambiar con la opcin
+\fB\-\-altdir\fP.
+.TP 
+\fI/var/lib/dpkg/alternatives/\fP
+El directorio de administracin por omisin. Se puede modificar con la
+opcin \fB\-\-admindir\fP.
+.
+.SH "ESTADOS DE SALIDA"
+.TP 
+\fB0\fP
+La accin requerida finaliz con xito.
+.TP 
+\fB2\fP
+Se encontraron problemas analizando la lnea de rdenes o realizando la
+accin requerida.
+.
+.SH "FORMATO DE CONSULTA"
+The \fBupdate\-alternatives \-\-query\fP format is using an RFC822\-like flat
+format. It's made of \fIn\fP + 1 blocks where \fIn\fP is the number of
+alternatives available in the queried link group. The first block contains
+the following fields:
+.TP 
+\fBLink:\fP\fI link\fP
+El nombre genrico de la alternativa.
+.TP 
+\fBStatus:\fP\fI status\fP
+El estado de la alternativa (\fBauto\fP o \fBmanual\fP).
+.TP 
+\fBBest:\fP\fI best\-choice\fP
+La ruta de la mejor alternativa para este grupo de enlaces. No aparece si no
+existen alternativas disponibles.
+.TP 
+\fBValue:\fP\fI currently\-selected\-alternative\fP
+La ruta de la alternativa seleccionada en ese momento. Tambin puede tomar
+el valor mgico \fBnone\fP (ninguno). Se usa si el enlace no existe.
+.TP 
+.TP 
+Los siguientes bloques describen las alternativas disponibles en el grupo de enlaces consultado:
+.TP 
+\fBAlternative:\fP\fI path\-of\-this\-alternative\fP
+Ruta a la alternativa de este bloque.
+.TP 
+\fBPriority:\fP\fI priority\-value\fP
+Valor de la prioridad de esta alternativa.
+.TP 
+\fBSlaves:\fP\fI list\-of\-slaves\fP
+Cuando esta cabecera est presente, las lneas \fBnext\fP contienen todas las
+alternativas esclavas asociadas al enlace maestro de la alternativa. Hay un
+esclavo por lnea. Cada lnea contiene un espacio, el nombre genrico de la
+alternativa esclava, otro espacio, y la ruta a la alternativa esclava.
+.
+.TP 
+\fBEjemplo\fP
+.nf
+$ update\-alternatives \-\-query editor
+Link: editor
+Status: auto
+Best: /usr/bin/vim.gtk
+Value: /usr/bin/vim.gtk
+
+Alternative: /bin/ed
+Priority: \-100
+Slaves:
+ editor.1.gz /usr/share/man/man1/ed.1.gz
+
+Alternative: /usr/bin/vim.gtk
+Priority: 50
+Slaves:
+ editor.1.gz /usr/share/man/man1/vim.1.gz
+ editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz
+ editor.pl.ISO8859\-2.1.gz /usr/share/man/pl.ISO8859\-2/man1/vim.1.gz
+ editor.it.ISO8859\-1.1.gz /usr/share/man/it.ISO8859\-1/man1/vim.1.gz
+ editor.pl.UTF\-8.1.gz /usr/share/man/pl.UTF\-8/man1/vim.1.gz
+ editor.it.1.gz /usr/share/man/it/man1/vim.1.gz
+ editor.fr.UTF\-8.1.gz /usr/share/man/fr.UTF\-8/man1/vim.1.gz
+ editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz
+ editor.it.UTF\-8.1.gz /usr/share/man/it.UTF\-8/man1/vim.1.gz
+ editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz
+ editor.fr.ISO8859\-1.1.gz /usr/share/man/fr.ISO8859\-1/man1/vim.1.gz
+.fi
+.
+.SH DIAGNSTICOS
+With \fB\-\-verbose\fP \fBupdate\-alternatives\fP chatters incessantly about its
+activities on its standard output channel.  If problems occur,
+\fBupdate\-alternatives\fP 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.
+.
+.SH EJEMPLOS
+Hay varios paquetes que proporcionan un editor de texto compatible con
+\fBvi\fP, por ejemplo \fBnvi\fPy \fBvim\fP. El grupo de enlaces \fBvi\fP selecciona cual
+se usa, incluyendo enlaces para el programa y la pgina del manual asociada.
+.PP
+To display the available packages which provide \fBvi\fP and the current
+setting for it, use the \fB\-\-display\fP action:
+.RS
+.PP
+\fBupdate\-alternatives \-\-display vi\fP
+.RE
+.PP
+Para elegir una implementacin de \fBvi\fP en particular use la siguiente orden
+como el usuario root y seleccione un nmero de la lista:
+.RS
+.PP
+\fBupdate\-alternatives \-\-config vi\fP
+.RE
+.PP
+Para que la implementacin de \fBvi\fP se vuelva a elegir de forma automtica,
+haga como administrador:
+.RS
+.PP
+\fBupdate\-alternatives \-\-auto vi\fP
+.RE
+.
+.SH FALLOS
+Si encuentra algn fallo informe de ello usando el sistema de seguimiento de
+fallos de Debian.
+.PP
+Si encuentra alguna discrepancia entre el modo de operar de
+\fBupdate\-alternatives\fP y esta pgina del manual, es un fallo, bien en la
+implementacin o bien en la documentacin. Le rogamos que informe de ello.
+.
+.SH AUTORES
+Copyright \(co 1995 Ian Jackson
+.br
+Copyright \(co 2009 Rapha\[:e]l Hertzog
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.PP
+Los derechos de autor de esta pgina de manual pertenecen a Charles
+Briscoe\-Smith y otros, 1997,1998.
+.sp
+Esto es software libre; vea la versin 2 o posterior de la Licencia Pblica
+General GNU para condiciones de copia. NO hay ninguna garanta.
+.
+.SH "VASE TAMBIN"
+\fBln\fP(1), FHS, el estndar de la jerarqua del sistema de ficheros.
+.SH "TRADUCTOR"
+Rudy Godoy <rudy@kernel\-panik.org>,
+Rubn Porras <nahoo@inicia.es>,
+Bruno Barrera C. <bruno.barrera@igloo.cl>,
+Carlos Izquierdo <gheesh@ertis.net>,
+Esteban Manchado y
+NOK.
+Debian L10n Spanish <debian\-l10n\-spanish@lists.debian.org>.
+.br
+Revisiones por Santiago Vila <sanvila@unex.es>,
+Javier Fernndez\-Sanguino, Rubn Porras,
+Luis Uribe y Omar Campagne.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/deb.5 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb.5
--- dpkg/man/fr/deb.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,77 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb 5 2011\-08\-14 "Projet Debian" Debian
+.SH NOM
+deb \- Format des paquets binaires Debian
+.SH SYNOPSIS
+\fInom\-du\-fichier.deb\fP
+.SH DESCRIPTION
+Le format \fB.deb\fP est le format des paquets binaires de Debian. Il est
+compatible avec les versions 0.93.76 et ultrieures de dpkg, et il est
+gnr par dfaut par toutes les versions de dpkg depuis la version 1.2.0
+ainsi que toutes les versions i386/ELF depuis la version 1.1.1elf.
+.PP
+Le format dcrit ici est utilis depuis la version 0.93 de Debian\ ; les
+dtails concernant le vieux format sont consultables dans \fBdeb\-old\fP(5).
+.SH FORMAT
+Le fichier est une archive \fBar\fP avec un numro magique de
+\fB!<arch>.\fP. Les noms de fichiers peuvent comporter un caractre
+\ /\  final.
+.PP
+Les archives \fBtar\fP actuellement gres sont, le format v7 d'origine, the
+format ustar pr\-POSIX, un sous\-ensemble du format GNU (uniquement le
+nouveau format de noms longs pour les chemins et les liens, grs depuis
+dpkg 1.4.1.17) et le format ustar POSIX (noms longs grs depuis dpkg
+1.15.0). Les marqueurs du type (\ typeflags\ ) tar inconnus provoquent une
+erreur.
+.PP
+Le premier membre est nomm \fBdebian\-binary\fP et contient une succession de
+lignes, spares par des retours\-chariot. Pour le moment, une seule ligne
+est prsente\ : le numro de version du format, \fB2.0\fP  l'heure o ce
+document a t crit. Les programmes lisant des archives Debian rcentes
+doivent tre prpars  une augmentation du numro de version mineur et  la
+prsence de nouvelles lignes, ainsi qu' les ignorer s'il le faut.
+.PP
+Si le numro de version majeur a chang, cela signifie qu'une modification
+entranant une incompatibilit entre les versions a t effectue, et le
+programme doit alors s'arrter. Si ce n'est pas le cas, le programme doit
+tre en mesure de continuer  traiter correctement le fichier,  moins qu'il
+ne rencontre un membre non reconnu dans l'archive (except  la fin de cette
+dernire), comme dcrit ci\-dessous.
+.PP
+Le second membre requis est nomm \fBcontrol.tar.gz\fP. Il s'agit d'une archive
+tar compresse grce  gzip contenant les informations de contrle du
+paquet, sous la forme d'une srie de fichiers, parmi lesquels le fichier
+\fBcontrol\fP est strictement requis et contient les principales informations
+de contrle. L'archive de contrle peut ventuellement contenir une entre
+pour \ .\ , le rpertoire courant.
+.PP
+Le troisime et dernier membre obligatoire est appel \fBdata.tar\fP. Il
+contient le systme de fichiers sous forme d'une archive tar, soit non
+compresse (gr depuis dpkg 1.10.24) ou compress avec gzip (avec extension
+\&\fB.gz\fP), xz (avec extensions \fB.xz\fP, gr depuis dpkg 1.15.6), bzip2 (avec
+extensions \fB.bz2\fP, gr depuis dpkg 1.10.24) ou lzma (avec extension
+\&\fB.lzma\fP, gr depuis dpkg 1.13.25).
+.PP
+Ces trois membres doivent apparatre dans cet ordre exact. Les
+implmentations actuelles devraient ignorer tout membre additionnel suivant
+\fBdata.tar.gz\fP. D'autres membres seront ventuellement proposs, et (si
+possible) seront placs aprs ces trois derniers. Tout autre membre qui
+ncessitera d'tre insr avant \fBdata.tar.gz\fP et qui pourra tre ignor
+sans problme par des programmes plus anciens, aura un nom commenant par un
+caractre de soulignement, \ \fB_\fP\ .
+.PP
+Les nouveaux membres qui ne pourront pas tre ignors sans consquence
+seront insrs avant \fBdata.tar.gz\fP avec des noms prfixs par quelque chose
+d'autre qu'un caractre de soulignement, ou impliqueront plus probablement
+une incrmentation du numro majeur de version.
+.SH "VOIR AUSSI"
+\fBdeb\-old\fP(5), \fBdpkg\-deb\fP(1), \fBdeb\-control\fP(5).
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/deb-control.5 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-control.5
--- dpkg/man/fr/deb-control.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-control.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,256 @@
+.\" Author: Raul Miller
+.\" Includes text from the debian Guidelines by Ian Jackson, Ian Murdock
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-control 5 2011\-08\-14 "Projet Debian" Debian
+.SH NOM
+deb\-control \- Format du fichier principal de contrle dans les paquets
+Debian
+.
+.SH SYNOPSIS
+contrle
+.
+.SH DESCRIPTION
+Chaque paquet Debian possde un fichier principal de contrle qui contient
+un certain nombre de champs ou de commentaires pour les lignes commenant
+par un caractre \ \fB#\fP\ . Chaque champ commence par une tiquette, telle
+que \fBPackage\fP ou \fBVersion\fP (la casse n'importe pas), suivie d'un \ :\ , et
+du contenu du champ. Les champs sont spars seulement par des tiquettes de
+champ. En d'autres termes, le contenu d'un champ peut s'tendre sur
+plusieurs lignes, mais les outils d'installation joindront en gnral les
+lignes pendant le traitement du contenu du champ (sauf pour le champ
+\fBDescription\fP, voyez ci\-dessous).
+.
+.SH "LES CHAMPS EXIGS"
+.TP 
+\fBPackage:\fP\fI nom\-du\-paquet\fP
+La valeur de ce champ donne le nom du paquet, et la plupart des outils
+d'installation s'en servent pour produire les noms des paquets.
+.TP 
+\fBVersion:\fP \fIchane pour la version\fP
+C'est classiquement le numro de version du paquet d'origine dans la forme
+choisie par l'auteur du programme. Il peut y avoir aussi un numro de
+rvision Debian (pour les paquets non natifs). Le format exact et
+l'algorithme de tri sont dcrits dans \fBdeb\-version\fP(5).
+.TP 
+\fBMaintainer:\fP \fI nom\-complet\-adresse\-lectronique\fP
+Le format de ce champ sera \ Jean Dupont <jdupont@foo.com>\ \ ; et
+c'est bien sr le crateur du paquet, par opposition  l'auteur du programme
+mis en paquet.
+.TP 
+\fBDescription:\fP \fI description courte\fP
+\fB \fP\fIdescription longue\fP
+.br
+Le format de la description du paquet est un rsum bref sur la premire
+ligne (aprs le champ \ Description\ ). Les lignes suivantes peuvent servir
+ une description plus longue et plus dtaille. Chaque ligne de cette
+description longue doit tre prcde d'une espace\ ; quand c'est une ligne
+blanche, elle doit contenir un seul \ .\  aprs cet espace.
+.
+.SH "CHAMPS OPTIONNELS"
+.TP 
+\fBSection:\fP \fI section\fP
+C'est un champ gnral qui indique la catgorie d'un paquet\ ; cette
+catgorie est fonde sur le programme que ce paquet installe. \ Utils\ ,
+\ net\ , \ mail\ , \ text\ , \ x11\ , etc. reprsentent quelques catgories
+habituelles.
+.TP 
+\fBPriority:\fP \fIpriorit\fP
+Dfinit l'importance du paquet  l'intrieur du systme
+gnral. \ Required\ , \ standard\ , \ optional\ , \ extra\ ,
+etc. reprsentent des priorits habituelles.
+.LP
+Les champs \fBSection\fP et \fBPriority\fP possdent un ensemble dfini de valeurs
+acceptes, tir de la Charte Debian (\ Debian Policy\ ). On peut en trouver
+une liste dans la version la plus rcente du paquet \fBdebian\-policy\fP.
+.TP 
+\fBEssential:\fP \fByes\fP|\fBno\fP
+On se sert habituellement de ce champ uniquement si la rponse est
+\fByes\fP. Il signifie que ce paquet est exig pour un fonctionnement correct
+du systme. Dpkg et les autres outils d'installation interdisent la
+suppression d'un paquet \fBEssential\fP (du moins tant qu'une des options de
+forage n'est pas utilise).
+.TP 
+\fBArchitecture:\fP \fIarch\fP|\fBall\fP
+L'architecture prcise pour quel type de matriel le paquet a t
+compil. Voici quelques architectures habituelles\ : \ i386\ , \ m68k\ ,
+\ sparc\ , \ alpha\ , \ powerpc\ , etc. Remarquez que l'option \fBall\fP
+signifie que le paquet est indpendant de toute architecture. Les scripts
+shell ou Perl, ainsi que la documentation sont dans ce cas.
+.TP 
+\fBOrigin:\fP \fI nom\fP
+Nom de la distribution dont ce paquet provient.
+.TP 
+\fBBugs:\fP \fI URL\fP
+\fIurl\fPURL du systme de suivi de bogues (BTS) de ce paquet. Le format
+utilis est \fItype_de_bts\fP\fB://\fP\fIadresse_du_bts\fP, par exemple
+\fBdebbugs://bugs.debian.org\fP.
+.TP 
+\fBHomepage:\fP\fI URL\fP
+\fIURL\fP de la page d'accueil du projet amont.
+.TP 
+\fBTag:\fP \fIliste d'tiquettes\fP
+Liste d'tiquettes dcrivant les qualits du paquet. La description et la
+liste des tiquettes (\ tags\ ) gres peut tre trouve dans le paquet
+\fBdebtags\fP.
+.TP 
+\fBMulti\-Arch:\fP \fBsame\fP|\fBforeign\fP|\fBallowed\fP
+This field is used to indicate how this package should behave on a
+multi\-arch installations. The value \fBsame\fP means that the package is
+co\-installable with itself, but it must not be used to satisfy the
+dependency of any package of a different architecture from itself. The value
+\fBforeign\fP means that the package is not co\-installable with itself, but
+should be allowed to satisfy the dependency of a package of a different arch
+from itself. The value \fBallowed\fP allows reverse\-dependencies to indicate in
+their Depends field that they need a package from a foreign architecture,
+but has no effect otherwise. This field should not be present in packages
+with the \fBArchitecture: all\fP field.
+.TP 
+\fBSource:\fP\fI nom du source\fP
+Le nom du paquet source d'o provient le paquet binaire, s'il y a une
+diffrence entre les deux noms.
+
+.TP 
+.PD 0
+\fBSubarchitecture:\fP\fI valeur\fP
+.TP 
+.PD 0
+\fBKernel\-Version:\fP\fI valeur\fP
+.TP 
+.PD
+\fBInstaller\-Menu\-Item:\fP\fI valeur\fP
+Ces champs sont utiliss par l'installateur et ne sont en gnral pas
+ncessaires. Veuillez consulter
+/usr/share/doc/debian\-installer/devel/modules.txt  fourni avec le paquet
+\fBdebian\-installer\fP pour plus de dtails.
+
+.TP 
+\fBDepends:\fP\fI liste de paquets\fP
+C'est la liste des paquets exigs pour que ce paquet arrive  fonctionner de
+manire non triviale. Le programme de maintenance des paquets interdit
+l'installation d'un paquet quand les paquets rpertoris dans le champ
+\fBDepends\fP ne sont pas installs (du moins tant qu'une option de forage
+n'est pas utilise)\ ; il lance les scripts \ postinst\  des paquets
+rpertoris dans les champs \ Depends:\  avant les scripts \ postinst\  des
+paquets qui dpendent d'eux.  l'inverse, lors d'une suppression les scripts
+\ prerm\  des paquets sont lancs avant ceux de leurs dpendances.
+.TP 
+\fBPre\-Depends:\fP\fI liste de paquets\fP
+C'est la liste des paquets qui doivent tre installs \fBet\fP configurs avant
+que ce paquet puisse tre install. Habituellement, on utilise ce champ
+quand un paquet a besoin d'un autre paquet pour lancer son script
+\ preinst\ .
+.TP 
+\fBRecommends:\fP\fI liste de paquets\fP
+C'est la liste des paquets qu'on trouverait avec ce paquet dans toute
+installation standard. Le programme de maintenance des paquets avertit
+l'utilisateur quand il installe un paquet sans installer les paquets
+rpertoris dans le champ \fBRecommends.\fP
+.TP 
+\fBSuggests:\fP\fIliste de paquets\fP
+C'est la liste des paquets qui, associs avec ce paquet, peuvent amliorer
+son utilit\ ; nanmoins, une installation sans ces paquets est parfaitement
+raisonnable.
+.LP
+La syntaxe des champs \fBDepends,\fP \fBPre\-Depends,\fP \fBRecommends,\fP et
+\fBSuggests\fP est une liste de groupes contenant des paquets
+successifs. Chaque groupe est une liste de paquets spars par une barre
+verticale (le symbole du tube) \ |\ . Les groupes sont spars par des
+virgules. Une virgule reprsente un \ ET\  logique et une barre verticale
+reprsente un \ OU\  logique\ ; le tube reprsente un lien plus fort. Chaque
+lment est le nom d'un paquet suivi de faon optionnelle par un numro de
+version entre parenthses.
+.LP
+Un numro de version peut commencer par \ >>\ , et dans ce cas toute
+version suprieure correspondra, et il peut indiquer (ou pas) le numro de
+rvision pour le paquet debian (les deux numros tant spars par un trait
+d'union). Voici les relations acceptes pour les versions\ : \ >>\ 
+pour suprieur , \ <<\  pour infrieur , \ >=\  pour suprieur
+ou gal, \ <=\  pour infrieur ou gal, et \ =\  pour gal .
+.TP 
+\fBBreaks:\fP\fIliste de paquets\fP
+C'est une liste de paquets que ce paquet \ casse\ , par exemple en rvlant
+des bogues quand les paquets concerns dpendent de celui\-ci. Le programme
+de maintenance des paquets interdit la configuration de paquets casss\ ;\ une
+mthode usuelle de rsolution est la mise  jour des paquets mentionns dans
+le champ \fBBreaks\fP.
+.TP 
+\fBConflicts:\fP\fIliste de paquets\fP
+C'est une liste de paquets qui sont en conflit avec ce paquet\ ; ils
+contiennent par exemple des fichiers qui ont le mme nom. Le programme de
+maintenance des paquets interdit l'installation simultane de paquets en
+conflit. Deux paquets en conflit renseigneront une ligne \fBConflicts\fP avec
+le nom de l'autre paquet.
+.TP 
+\fBReplaces:\fP\fI liste de paquets\fP
+C'est une liste de paquets que ce paquet remplace. Il peut ainsi remplacer
+les fichiers de ces autres paquets\ ; on se sert pour cela du champ
+\fBConflicts\fP pour forcer la suppression des autres paquets, si celui\-l
+possde aussi les mmes fichiers que le paquet en conflit.
+.TP 
+\fBProvides:\fP \fIliste de paquets\fP
+C'est une liste de paquets virtuels que ce paquet \ remplit\ . On s'en sert
+habituellement pour des paquets qui offrent le mme service. Par exemple,
+sendmail et exim sont des serveurs de courrier, et donc ils \ remplissent\ 
+chacun le paquet \ mail\-transport\-agent\ \ ; ainsi les autres paquets peuvent
+dpendre de ce paquet virtuel. Sendmail et exim peuvent ainsi chacun
+satisfaire la dpendance. Les paquets qui dpendent d'un serveur de courrier
+n'ont pas  connatre les noms de tous les serveurs de courrier et n'ont pas
+ utiliser \ |\  comme sparateur de liste.
+.LP
+La syntaxe des champs \fBBreaks\fP, \fBConflicts\fP, \fBReplaces\fP et \fBProvides\fP
+est une liste de noms de paquets, spars par des virgules (et des espaces
+facultatifs). Dans les champs \fBBreaks\fP et \fBConflicts\fP la virgule sera lue
+comme un \ OU\ . On peut donner une version optionnelle de la mme faon que
+ci\-dessus dans les champs \fBBreaks\fP, \fBConflicts\fP et \fBReplaces\fP.
+.
+.TP 
+\fBBuilt\-Using:\fP\fI liste de paquets\fP
+Ce champ affiche les paquets source supplmentaires utilises lors de la
+construction du paquet binaire. Il permet d'indiquer aux logiciels de
+gestion de l'archive que des paquets source supplmentaires doivent tre
+conserves tant que le paquet binaire est maintenu. Ce champ doit tre une
+liste de paquets source avec des rfrences strictes de version
+(=). Veuillez noter que les logiciels de gestion de l'archive risque de ne
+pas accepter un envoi qui dclare une relation \fBBuilt\-Using\fP qui ne peut
+pas tre satisfaite dans l'archive.
+.
+.SH EXEMPLE
+.\" .RS
+.nf
+# Commentaire
+Package: grep
+Essential: yes
+Priority: required
+Section: base
+Maintainer: Wichert Akkerman <wakkerma@debian.org>
+Architecture: sparc
+Version: 2.4\-1
+Pre\-Depends: libc6 (>= 2.0.105)
+Provides: rgrep
+Conflicts: rgrep
+Description: GNU grep, egrep and fgrep.
+ Il se peut que le grep de la famille GNU des utilitaires grep soit
+ le plus rapide de l'ouest\ ! Le grep de GNU est fond sur un mcanisme
+ rapide de mise en correspondance dterministe d'tats simples (environ
+ deux fois plus rapide que le \ egrep\  standard d'Unix), modifi par une
+ recherche de type Boyer\-Moore\-Gosper qui cherche une chane donne en
+ empchant que les textes impossibles soient analyss par le mcanisme de
+ mise en correspondance d'expressions rationnelles et sans avoir
+ ncessairement besoin de voir chaque caractre. C'est beaucoup plus
+ rapide  que les \ grep\  ou \ egrep\  d'Unix.
+ (Des expressions rationnelles contenant des rfrences circulaires
+ ralentissent cependant le programme.)
+.fi
+.\" .RE
+.
+.SH "VOIR AUSSI"
+\fBdeb\fP(5), \fBdeb\-version\fP(5), \fBdebtags\fP(1), \fBdpkg\fP(1), \fBdpkg\-deb\fP(1).
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/deb-extra-override.5 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-extra-override.5
--- dpkg/man/fr/deb-extra-override.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-extra-override.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,42 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-extra\-override 5 16\-08\-2009 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+deb\-extra\-override \- Fichier override supplmentaire d'une archive Debian
+.
+.SH SYNOPSIS
+override
+.
+.SH DESCRIPTION
+Bien que la majorit des informations d'un paquet source ou binaire puisse
+tre trouves dans le fichier control/.dsc, ces informations peuvent tre
+remplaces lors de l'exportation dans des fichiers Packages ouSources. Les
+fichier d'\ override\  supplmentaire contient les valeurs remplaces.
+.PP
+Les lments du fichier \ override\  supplmentaire sont spars simplement
+par un espace. Les commentaires commencent par un caractre \fB\ #\ \fP.
+.PP
+.in +5
+\fIpaquet\fP \fInom\-de\-champ\fP \fIvaleur\fP
+.in -5
+.PP
+\fIpaquet\fP est le nom du paquet binaire/source.
+.PP
+\fInom\-champ\fP est le nom du champ qui est remplac. \fIvaleur\fP est la valeur 
+mettre dans ce champ. Elle peut contenir des espaces car la ligne est
+dcoupe en 3 colonnes au plus quand elle est analyse.
+.PP
+Les fichiers de drogation (\ override\ ) supplmentaires utiliss pour
+tablir les fichiers officiels \ Packages\  se trouvent dans le rpertoire
+\fIindices\fP des miroirs Debian.
+.
+.SH "VOIR AUSSI"
+\fBdpkg\-scanpackages\fP(1), \fBdpkg\-scansources\fP(1), \fBapt\-ftparchive\fP(1).
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/deb-old.5 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-old.5
--- dpkg/man/fr/deb-old.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-old.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,52 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-old 5 2011\-08\-14 "Projet Debian" Debian
+.SH NOM
+deb\-old \- Ancien format des paquets binaires Debian
+.
+.SH SYNOPSIS
+\fInom\-du\-fichier.deb\fP
+.
+.SH DESCRIPTION
+Le format de fichier \fB.deb\fP correspond aux paquets binaires Debian. Cette
+page de manuel dcrit l'\fBancien\fP format, utilis avant la version 0.93 de
+Debian. Veuillez consulter \fBdeb\fP(5) pour les informations sur le nouveau
+format.
+.
+.SH FORMAT
+Le fichier consiste en deux lignes d'information au format texte ASCII,
+suivi par la concatnation de deux fichiers ustar compress avec gzip.
+.PP
+La premire ligne indique la version du format, remplie sur 8 chiffres,
+c'est  dire \fB0.939000\fP pour toutes les archives dans l'ancien format.
+.PP
+La deuxime ligne fournit un nombre dcimal (sans zros en tte), qui
+indique la taille de la premire archive tar compresse avec gzip.
+.PP
+Chacune de ces lignes se termine par un unique caractre de nouvelle ligne.
+.PP
+La premire archive tar contient les informations de contrle, sous forme
+d'une srie de fichiers ordinaires. Le fichier \fBcontrol\fP doit tre prsent,
+puisqu'il contient les informations principales de contrle.
+.PP
+Dans certaines archives vraiment anciennes, les fichiers de l'archive de
+contrle peuvent se trouver dans un sous\-rpertoire \fBDEBIAN\fP. Dans ce cas,
+le sous\-rpertoire \fBDEBIAN\fP se trouve galement dans l'archive de contrle,
+qui ne contiendra que des fichiers de ce rpertoire. En option, l'archive de
+contrle peut contenir une entre pour \fB.\fP, le rpertoire courant.
+.PP
+La seconde archive compresse avec gzip correspond  l'archive  placer dans
+le systme de fichiers. Elle contient des chemins relatifs  la racine du
+systme dans lequel se fera l'installation. Les noms de fichiers ne dbutent
+pas par des barres obliques (\ /\ ).
+.
+.SH "VOIR AUSSI"
+\fBdeb\fP(5), \fBdpkg\-deb\fP(1), \fBdeb\-control\fP(5).
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/deb-override.5 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-override.5
--- dpkg/man/fr/deb-override.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-override.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,64 @@
+.\" This manpage is copyright (C) 1996 Michael Shields <shields@crosslink.net>.
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-override 5 2011\-08\-14 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+deb\-override \- Fichier override d'une archive Debian
+.
+.SH SYNOPSIS
+override
+.
+.SH DESCRIPTION
+Bien que l'on puisse trouver dans le fichier \ control\  la plupart des
+informations concernant un paquet, certaines doivent tre inscrites par les
+responsables de la distribution plutt que par le responsable du paquet afin
+de garantir une cohrence globale. Ces informations se trouvent dans le
+fichier \ override\ .
+.PP
+Les lments du fichier \ override\  sont spars simplement par un
+espace. Les commentaires commencent par un caractre \fB\ #\ \fP.
+.PP
+.in +5
+\fIpaquet\fP \fIpriorit\fP \fIsection\fP [\fIresponsable\fP]
+.in -5
+.PP
+\fIpaquet\fP est le nom du paquet. Les entres du fichier \ override\ 
+concernant des paquets qui ne sont pas dans l'arborescence des paquets
+binaires sont ignores.
+.PP
+\fIpriority\fP et \fIsection\fP correspondent respectivement aux champs de
+contrle prsent dans le fichier .deb. Les valeurs autorise sont dfinies
+dans la Charte Debian.
+.PP
+L'lment \fIresponsable,\fP quand il existe, peut reprsenter soit le nom du
+responsable quand il s'agit d'un remplacement sans condition, soit la chane
+\fIancienresponsable\fP \fB=>\fP \fInouveauresponsable\fP pour un changement de
+responsable.
+.PP
+On peut trouver les fichiers \ override\ , dont on se sert pour tablir les
+fichiers officiels \ Packages\ , dans le rpertoire \fIindices\fP des miroirs
+Debian.
+.
+.SH "VOIR AUSSI"
+\fBdpkg\-scanpackages\fP(1), \fBdpkg\-scansources\fP(1), \fBapt\-ftparchive\fP(1),
+\fB/usr/share/doc/debian\-policy/policy.html/index.html\fP.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/deb-shlibs.5 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-shlibs.5
--- dpkg/man/fr/deb-shlibs.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-shlibs.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,61 @@
+.\" Copyright © 1996 Michael Shields <shields@crosslink.net>
+.\" Copyright © 2008 Zack Weinberg <zackw@panix.com>
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-shlibs 5 17\-02\-2008 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+deb\-shlibs \- Fichier d'information sur les bibliothques partages Debian
+.
+.SH DESCRIPTION
+.PP
+Les fichiers \fBshlibs\fP associent les noms et versions (\fIsonames\fP) des
+bibliothques partages aux dpendances correspondantes dans les fichiers de
+contrle des paquets. Il y a une entre par ligne et les lignes vides ne
+sont \fBpas autorises\fP. Les lignes commencant par le caractre \fB(\ #\ )\fP
+sont considres comme tant des commentaires et sont ignores. Toutes les
+autres lignes doivent tre au format
+.IP
+[\fItype\fP\fB:\fP] \fIlibrary\fP \fIversion\fP \fIdependencies\fP
+.PP
+Les champs \fIbibliothque\fP et \fIversion\fP sont spars par des espaces. Le le
+champ \fIdpendance\fP finit la ligne. Le champ \fItype\fP est optionnel et donc
+normalement pas ncessaire.
+.PP
+Lire la charte Debian pour plus d'informations.
+.
+.SH EXEMPLES
+.PP
+Le fichier \fBshlibs\fP pour un paquet nomm \fIlibcrunch1\fP, qui fournit une
+bibliothque dont le nom est \fIlibcrunch.so.1\fP, doit avoir la ligne
+.IP
+libcrunch 1 libcrunch1 (>= 1.2\-1)
+.PP
+Les \fIdpendances\fP doivent indiquer la version la plus rcente du paquet qui
+ajoute de nouveaux symboles  la bibliothque\ : dans l'exemple prcdent, de
+nouveaux symboles ont t ajouts avec la version 1.2 de \fIlibcrunch\fP. Ce
+n'est pas la seule raison pour laquelle les dpendances doivent tre suivies
+avec soin\ ; une fois de plus, veuillez vous reporter  la charte Debian pour
+plus de dtails.
+.
+.SH "VOIR AUSSI"
+\fBdpkg\-shlibdeps\fP(1), \fBdeb\-symbols\fP(5).
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/deb-split.5 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-split.5
--- dpkg/man/fr/deb-split.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-split.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,64 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-split 5 07\-04\-2011 "Projet Debian" Debian
+.SH NOM
+deb\-split \- formatage de paquets binaires Debian en plusieurs parties
+.SH SYNOPSIS
+\fInom\-du\-fichier.deb\fP
+.SH DESCRIPTION
+Le format \fB.deb\fP en parties multiples (multi\-part) permet de dcouper de
+gros paquets en petites parties pour faciliter leur transport sur des
+supports de faible capacit.
+.SH FORMAT
+Le fichier est une archive \fBar\fP avec un numro magique de
+\fB!<arch>.\fP. Les noms de fichiers peuvent comporter un caractre
+\ /\  final (depuis dpkg 1.15.6).
+.PP
+Le premier membre est appel \fBdebians\-split\fP et contient un ensemble de
+lignes, spares par des retours  la ligne. Actuellement, huit lignes sont
+prsentes\ :
+.IP \(bu 4
+Numro de version du format, \fB2.1\fP au moment de la rdaction de cette page
+de manuel.
+.IP \(bu
+Nom du paquet
+.IP \(bu
+Version du paquet
+.IP \(bu
+Somme de contrle MD5 du paquet
+.IP \(bu
+Taille totale du paquet
+.IP \(bu
+Taille maximale d'un membre
+.IP \(bu
+Numro du membre courant, suivi d'une barre oblique (/) et du nombre total
+de membres (par exemple \(oq1/10\(cq).
+.IP \(bu
+Architecture du paquet (depuis dpkg 1.16.1)
+.PP
+Les programmes qui lisent des archives en parties multiples doivent
+autoriser la prsence de lignes supplmentaires (et les ignorer si elles
+existent).
+.PP
+Si le numro de version majeur a chang, cela signifie qu'une modification
+incompatible a t effectue, et le programme doit alors s'arrter. Si ce
+n'est pas le cas, le programme doit tre en mesure de poursuivre
+correctement,  moins qu'il ne rencontre un membre non reconnu dans
+l'archive (except  la fin de cette dernire), comme dcrit ci\-dessous.
+.PP
+The second, last required member is named \fBdata.\fP\fIN\fP, where \fIN\fP denotes
+the part number. It contains the raw part data.
+.PP
+These members must occur in this exact order. Current implementations should
+ignore any additional members after \fBdata.\fP\fIN\fP.  Further members may be
+defined in the future, and (if possible) will be placed after these two.
+.SH "VOIR AUSSI"
+\fBdeb\fP(5), \fBdpkg\-split\fP(1).
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/deb-src-control.5 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-src-control.5
--- dpkg/man/fr/deb-src-control.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-src-control.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,322 @@
+.\" Author: Oxan van Leeuwen
+.\" Includes text from the deb-control manual page by Raul Miller
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-src\-control 5 2011\-08\-14 "Projet Debian" Debian
+.SH NOM
+deb\-src\-control \- Format du fichier principal de contrle dans les paquets
+Debian
+.
+.SH SYNOPSIS
+contrle
+.
+.SH DESCRIPTION
+Chaque paquet source Debian contient un fichier \ control\  matre, qui
+contient au moins 2 paragraphes, spars par une ligne vide. Le premier
+paragraphe donne toutes les informations  propos du paquet source en
+gnral et chaque paragraphe qui suit dcrit exactement un paquet
+binaire. Chaque paragraphe contient au moins un champ. Un champ commence par
+le nomdu champ, par exemple \fBPackage\fP ou \fBSection\fP (la casse n'est pas
+significative), suivi d'un caractre \ deux\-points\ , du contenu du champ et
+d'un retour  la ligne. Les champs multi\-lignes sont aussi possibles, mais
+chaque ligne supplmentaire, qui ne comporte pas de nom de champ, doit
+commencer par au moins un espace. Le contenu des champs multi\-lignes est en
+gnral rassembl en une ligne unique par les outils (sauf pour le champ
+\fBDescription\fP, voir ci\-dessous). Pour inclure des lignes vides dans un
+champ multi\-lignes, il est ncessaire de mettre un point aprs l'espace
+initial. Les lignes commenant pas \fB\ #\ \fP sont traites comme des
+commentaires.
+.
+.SH "LES CHAMPS SOURCE"
+.TP 
+\fBSource:\fP \fInom du paquet source\fP (requis)
+La valeur de ce champ est le nom du paquet source et doit correspondre au
+nom du paquet source dans le fichier debian/changelog. Un nom de paquet doit
+tre constitu uniquement de lettres minuscules (a\-z), de chiffres (0\-9),
+des caractres plus (+) et moins (\-) et de points (.). Les noms de paquets
+doit comporter au moins deux caractres et doivent commencer par un
+caractre alphanumrique.
+
+.TP 
+\fBMaintainer:\fP \fInom complet et adresse lectronique\fP (requis)
+Le format de ce champ sera \ Jean Dupont <jdupont@foo.com>\ \ ; et
+indique le crateur du paquet, par opposition  l'auteur du programme mis en
+paquet.
+
+.TP 
+\fBUploaders:\fP\fI nom complet et adresse lectronique\fP
+Affiche les noms et les adresses lectroniques des co\-responsables du
+paquet, au mme format que le champ Maintainer. Des co\-responsables
+multiples peuvent tre spars par une virgule.
+
+.TP 
+\fBStandards\-Version:\fP\fI chane de version\fP
+Ce champ indique la version la plus rcente des normes (constitues par la
+Charte Debian et les textes indiqus dans le paquet \fBdebian\-policy\fP)
+auxquelles ce paquet se conforme.
+
+.TP 
+\fBDM\-Upload\-Allowed:\fP \fByes\fP|\fBno\fP
+Ce champ indique si un paquet peut tre envoy par les mainteneurs Debian
+qui sont indiqus dans le champ Maintainer ou le champ Uploaders. La valeur
+par dfaut est \ no\ .
+
+.TP 
+\fBHomepage:\fP\fI URL\fP
+URL de la page d'accueil du projet amont.
+
+.TP 
+\fBBugs:\fP \fI URL\fP
+Indique l'\fIURL\fP du systme de suivi de bogues (BTS) de ce paquet. Le format
+utilis est \fItype_de_bts\fP\fB://\fP\fIadresse_du_btsE\fP, par exemple
+\fBdebbugs://bugs.debian.org\fP. Ce champ est en gnral inutile.
+
+.TP 
+\fBVcs\-*:\fP\fI URL\fP
+Ce champ indique l'\fIURL\fP du systme de gestion de version utilis pour la
+gestion du paquet. Les systmes grs sont \fBArch\fP, \fBBzr\fP (Bazaar), \fBCvs\fP,
+\fBDarcs\fP, \fBGit\fP, \fBHg\fP (Mercurial), \fBMtn\fP (Monotone) et \fBSvn\fP
+(Subversion). En gnral, ce champ fait rfrence  la dernire version du
+paquet, c'est  dire la branche principale ou le \ trunk\ .
+
+.TP 
+\fBVcs\-Browser:\fP\fI URL\fP
+indique l'\fIURL\fP de l'interface web permettant de parcourir le dpt du
+systme de gestion de version.
+
+.TP 
+\fBOrigin:\fP \fI nom\fP
+indique le nom de la distribution dont le paquet provient. Ce champ n'est
+souvent pas ncessaire.
+
+.TP 
+\fBSection:\fP \fI section\fP
+champ gnral qui indique la catgorie d'un paquet\ ; cette catgorie est
+fonde sur les programmes que ce paquet installe. \ Utils\ , \ net\ ,
+\ mail\ , \ text\ , \ x11\ , etc. reprsentent quelques catgories
+habituelles.
+
+.TP 
+\fBPriority:\fP \fIpriorit\fP
+dfinit l'importance du paquet  l'intrieur du systme
+gnral. \ Required\ , \ standard\ , \ optional\ , \ extra\ ,
+etc. reprsentent des priorits habituelles.
+
+Les champs \fBSection\fP et \fBPriority\fP possdent un ensemble dfini de valeurs
+acceptes, tir de la Charte Debian (\ Debian Policy\ ). On peut en trouver
+une liste dans la version la plus rcente du paquet \fBdebian\-policy\fP.
+
+.TP 
+\fBBuild\-Depends:\fP\fI liste de paquets\fP
+liste des paquets qu'il est ncessaire d'installer et configurer pour
+pouvoir construire le paquet source.
+
+.TP 
+\fBBuild\-Depends\-Indep:\fP\fI liste de paquets\fP
+liste analogue  \fBBuild\-Depends\fP, mais restreinte aux paquets ncessaires
+pour construire les paquets indpendants de l'architecture. Les paquets
+indiqus dans \fBBuild\-Depends\fP sont alors aussi installs.
+
+.TP 
+\fBBuild\-Conflicts:\fP\fI liste de paquets\fP
+liste de paquets qui ne doivent pas tre installs lorsque le paquet est
+construit, par exemple s'ils interfrent avec le systme de construction
+utilis.
+
+.TP 
+\fBBuild\-Conflicts\-Indep:\fP\fI liste de paquets\fP
+liste analogue  \fBBuild\-Conflicts\fP mais restreinte  la construction des
+paquets indpendants de l'architecture.
+
+La syntaxe des champs \fBBuild\-Depends\fP \fBBuild\-Depends\-Indep\fPest une liste
+de groupes contenant des paquets successifs. Chaque groupe est une liste de
+paquets spars par une barre verticale (le symbole du tube) \ |\ . Les
+groupes sont spars par des virgules. Une virgule reprsente un \ ET\ 
+logique et une barre verticale reprsente un \ OU\  logique\ ; le tube
+reprsente un lien plus fort. Chaque lment est le nom d'un paquet suivi de
+faon optionnelle par un numro de version entre parenthses et une
+indication d'architecture entre accolades.
+
+La syntaxe des champs \fBBuild\-Conflicts\fP \fBBuild\-Conflicts\-Indep\fPest une
+liste de paquets spars par des virgules qui reprsentent le \ ET\ 
+logique. L'indication de paquets alternatifs avec une barre verticale (le
+symbole du tube) \ |\  n'est pas prise en charge. Chaque om de paquet peut
+tre suivi de faon optionnelle par un numro de version entre parenthses
+et une indication d'architecture entre accolades.
+
+Un numro de version peut commencer par \ >>\ , et dans ce cas toute
+version suprieure correspondra, et il peut indiquer (ou pas) le numro de
+rvision pour le paquet Debian (les deux numros tant spars par un trait
+d'union). Voici les relations acceptes pour les versions\ : \ >>\ 
+pour suprieur , \ <<\  pour infrieur , \ >=\  pour suprieur
+ou gal, \ <=\  pour infrieur ou gal, et \ =\  pour gal .
+
+Une indication d'architecture consiste en un ou plusieurs noms
+d'architectures, spars par des espaces. Un nom d'architecture peut tre
+prcd d'un point d'eclamation qui correspond alors au \ NON\  logique.
+
+Veuillez noter que les dpendance que les paquets du jeu \fBbuild\-essential\fP
+peuvent tre omises et qu'il n'est pas possible de dclarer des conflits
+avec ces paquets. La liste des paquets concerns est fournie par le paquet
+build\-essential.
+
+
+.SH "CHAMPS BINAIRES"
+
+.LP
+Veuillez noter que les champs \fBPriority\fP, \fBSection\fP and \fBHomepage\fP
+peuvent tre placs dans le paragraphe d'un paquet binaire et leur valeur
+remplace alors celle du paquet source.
+
+.TP 
+\fBPackage:\fP \fInom du paquet binaire\fP (requis)
+Ce champ sert  indiquer le nom du paquet binaire. Les restrictions sont les
+mmes que celle des paquets source.
+
+.TP 
+\fBArchitecture:\fP \fIarch\fP|\fBall\fP|\fBany\fP (requis)
+Ce champ indique l'architecture matrielle sur laquelle le paquet peut tre
+utilis. Les paquets qui peuvent tre utiliss sur toute architecture
+doivent utiliser le champ \fBany\fP. Les paquets indpendants de
+l'architecture, tels les scripts shell ou Perl ou la documentation utilisent
+la valeur \fBall\fP. Pour restreindre un paquet  certaines architectures,
+leurs noms doivent tre indiqus spars par des espaces. Il est galement
+possible d'utiliser des noms gnriques d'architectures dans cette liste
+(voir \fBdpkg\-architecture\fP(1) pour plus d'informations sur ces architectures
+gnriques).
+
+.TP 
+\fBPackage\-Type:\fP \fBdeb\fP|\fBudeb\fP
+Ce champ indique le type de paquet. La valeur \ udeb\  est  utiliser pour
+les paquets  taille contrle utiliss par l'installateur Debian. La valeur
+\ deb\  est la valeur par dfaut qui est utilise si le champ n'est pas
+prsent. De nouveaux types pourraient tre ajouts au fil du temps.
+
+.TP 
+.PD 0
+\fBSubarchitecture:\fP\fI valeur\fP
+.TP 
+.PD 0
+\fBKernel\-Version:\fP\fI valeur\fP
+.TP 
+.PD 0
+\fBInstaller\-Menu\-Item:\fP\fI valeur\fP
+Ces champs sont utiliss par l'installateur et ne sont en gnral pas
+ncessaires. Veuillez consulter
+/usr/share/doc/debian\-installer/devel/modules.txt  fourni avec le paquet
+\fBdebian\-installer\fP pour plus de dtails.
+
+.TP 
+.PD 0
+\fBEssential:\fP \fByes\fP|\fBno\fP
+.TP 
+.PD 0
+\fBMulti\-Arch:\fP \fBsame\fP|\fBforeign\fP|\fBallowed\fP
+.TP 
+.PD 0
+\fBTag:\fP \fIliste d'tiquettes\fP
+.TP 
+.PD 0
+\fBDescription:\fP \fIdescription courte\fP (requis)
+Ces champs sont dcrits dans la page de manuel de \fBdeb\-control\fP(5), car ils
+sont copis littralement dans le fichier \ control\  du paquet binaire.
+
+.TP 
+.PD 0
+\fBDepends:\fP\fI liste de paquets\fP
+.TP 
+.PD 0
+\fBPre\-Depends:\fP\fI liste de paquets\fP
+.TP 
+.PD 0
+\fBRecommends:\fP\fI liste de paquets\fP
+.TP 
+.PD 0
+\fBSuggests:\fP\fIliste de paquets\fP
+.TP 
+.PD 0
+\fBBreaks:\fP\fIliste de paquets\fP
+.TP 
+.PD 0
+\fBEnhances:\fP\fI liste de paquets\fP
+.TP 
+.PD 0
+\fBReplaces:\fP\fI liste de paquets\fP
+.TP 
+.PD 0
+\fBConflicts:\fP\fIliste de paquets\fP
+.TP 
+.PD 0
+\fBProvides:\fP \fIliste de paquets\fP
+.TP 
+.PD 0
+\fBBuilt\-Using:\fP\fI liste de paquets\fP
+.br
+Ces champs indiquent les relations entre les paquets. Ils sont dtaills
+dans la page de manuel \fBdeb\-control\fP(5) et dans le paquet \fBdebian\-policy\fP.
+
+.SH "LES CHAMPS UTILISATEUR"
+Il est possible d'ajouter des champs dfinis par l'utilisateur au fichier
+\ control\ . Les outils les ignoreront. Si ces champs doivent tre copis
+vers les fichiers crs, par exemple les paquets binaires, il est
+indispensable d'utiliser un schma de nommage personnalis\ :\ les champs
+doivent commencer par la lettre X suivie de l'un des lettres B, C ou S et
+d'un tiret. Si la lettre B est utilise, le champ sera copi dans le fichier
+\ control\  du paquet binaire, voir \fBdeb\-control\fP(5). Avec la lettre S, le
+champ sera copi dans le fichier \ control\  du paquet source cr par
+\fBdpkg\-source\fP(1). Enfin, la lettre C provoquera la recopie du champ dans le
+fichier de contrle de l'envoi (\ .changes\ ). Les prfixes X[BCS]\- sont
+supprims lors de ces recopies. Ainsi, un champ \fBXC\-Approved\-By\fP apparatra
+sous le nom \fBApproved\-By\fP dans le fichier \ changes\  mais pas dans le
+fichier \ control\  du paquet binaire ni dans celui du paquet source.
+
+
+.SH EXEMPLE
+.\" .RS
+.nf
+# Comment
+Source: dpkg
+Section: admin
+Priority: required
+Maintainer: Dpkg Developers <debian\-dpkg@lists.debian.org>
+# this field is copied to the binary and source packages
+XBS\-Upstream\-Release\-Status: stable
+Homepage: http://wiki.debian.org/Teams/Dpkg
+Vcs\-Browser: http://git.debian.org/?p=dpkg/dpkg.git
+Vcs\-Git: git://git.debian.org/git/dpkg/dpkg.git
+Standards\-Version: 3.7.3
+Build\-Depends: pkg\-config, debhelper (>= 4.1.81),
+ libselinux1\-dev (>= 1.28\-4) [!linux\-any]
+
+Package: dpkg\-dev
+Section: utils
+Priority: optional
+Architecture: all
+# this is a custom field in the binary package
+XB\-Mentoring\-Contact: Raphael Hertzog <hertzog@debian.org>
+Depends: dpkg (>= 1.14.6), perl5, perl\-modules, cpio (>= 2.4.2\-2),
+ bzip2, lzma, patch (>= 2.2\-1), make, binutils, libtimedate\-perl
+Recommends: gcc | c\-compiler, build\-essential
+Suggests: gnupg, debian\-keyring
+Conflicts: dpkg\-cross (<< 2.0.0), devscripts (<< 2.10.26)
+Replaces: manpages\-pl (<= 20051117\-1)
+Description: Debian package development tools
+ This package provides the development tools (including dpkg\-source)
+ required to unpack, build and upload Debian source packages.
+ .
+ Most Debian source packages will require additional tools to build;
+ for example, most packages need make and the C compiler gcc.
+.fi
+
+
+.\" .RE
+.SH "VOIR AUSSI"
+\fBdeb\-control\fP(5), \fBdeb\-version\fP(5), \fBdpkg\-source\fP(1)
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/deb-substvars.5 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-substvars.5
--- dpkg/man/fr/deb-substvars.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/deb-substvars.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,151 @@
+.\" Authors: Ian Jackson
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-substvars 5 15\-07\-2009 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+deb\-substvars \- Variables de substitution de source Debian
+.
+.SH SYNOPSIS
+substvars
+.
+.SH DESCRIPTION
+Avant que \fBdpkg\-source\fP, \fBdpkg\-gencontrol\fP et \fBdpkg\-genchanges\fP
+n'crivent leurs informations de contrle (dans le fichier source de
+contrle \fB.dsc\fP pour \fBdpkg\-source\fP et sur la sortie standard pour
+\fBdpkg\-gencontrol\fP et \fBdpkg\-genchanges\fP), ils ralisent quelques
+substitutions de variables dans le fichier de sortie.
+
+Une substitution de variable est de la forme\ : \fB${\fP\fInom\-variable\fP\fB}\fP. Les
+noms de variable consistent en caractres alphanumriques, traits d'union et
+\ deux points\ \ ; ils commencent par une lettre ou un chiffre. La
+substitution se fait rptitivement jusqu' ce qu'il n'en reste aucune 
+faire\ ; le texte entier du champ aprs la substitution est rexamin pour
+chercher d'autres substitutions.
+
+Quand toutes les substitutions ont t faites, chaque occurrence de la
+chane \fB${}\fP (laquelle n'est pas une substitution autorise) est remplace
+par un signe \fB$\fP.
+
+Lorsque le remplacement de variables est effectu sur tous les champs de
+contrle, certains de ces champs sont utiliss et ncessaires pendant la
+constructions alors mme que la substitution n'a pas encore pu tre
+effectue. Cela explique pourquoi il n'est pas possible d'utiliser de
+variables dans les champs \fBPackage\fP, \fBSource\fP et \fBArchitecture\fP.
+
+La substitution de variables se fait dans le contexte des champs aprs leur
+analyse. En consquence, si vous souhaitez qu'une variable soit remplace
+sur plusieurs lignes, il n'est pas ncessaire de placer un espace aprs le
+retour  la ligne. Cela se fait implicitement quand le champ est
+affich. Par exemple, si la variable \fB${Description}\fP est positionne sur
+\ foo est bar.${Newline}foo est super.\  et si vous avez le champ suivant\ :
+
+ Description: application foo
+  ${Description}
+  .
+  Encore du texte.
+
+Le rsultat final sera\ :
+
+ Description: application foo
+  foo est bar.
+  foo est super.
+  .
+  More text.
+
+On peut dfinir les variables en utilisant l'option commune \fB\-V\fP. On peut
+aussi se servir du fichier \fBdebian/substvars\fP (ou tout autre fichier avec
+l'option \fB\-T\fP). Ce fichier est compos de lignes de la forme suivante\ :
+\fInom\fP\fB=\fP\fIvaleur\fP. Les espaces rsiduels sur chaque ligne, les lignes
+vides et les lignes qui commencent par un symbole \fB#\fP sont ignors.
+
+En outre, les variables standard suivantes sont disponibles\ :
+.TP 
+\fBArch\fP
+L'architecture pour laquelle on construit (tire de \fBdpkg
+\-\-print\-architecture\fP).
+.TP 
+\fBsource:Version\fP
+La version du paquet source.
+.TP 
+\fBsource:Upstream\-Version\fP
+La version amont du paquet source, avec ventuellement l'\ epoch\  de la
+version debian.
+.TP 
+\fBbinary:Version\fP
+La version du paquet binaire (qui peut tre diffrente de source:Version
+dans un binNMU par exemple).
+.TP 
+\fBSource\-Version\fP
+La version du paquet source, selon le fichier changelog. Cette variable est
+maintenant \fBdconseille\fP car sa signification est distincte de sa
+fonction. Utilisez plutt \fBsource:Version\fP ou \fBbinary:Version\fP.
+.TP 
+\fBInstalled\-Size\fP
+La taille de tous les fichiers installs du paquet. Cette valeur est copie
+dans le champ adquat du fichier \ control\ \ ; Quand on fixe cette variable,
+cela modifie la valeur de ce champ. Quand elle est indtermine,
+\fBdpkg\-gencontrol\fP use de la commande \fBdu \-k debian/tmp\fP pour trouver une
+valeur par dfaut.
+.TP 
+\fBExtra\-Size\fP
+L'espace disque supplmentaire utilis pour l'installation du paquet. Quand
+on fixe cette variable, on ajoute sa valeur  la valeur de la variable
+\fBInstalled\-Size\fP (qu'elle soit dfinie explicitement ou calcule par
+dfaut) avant que la variable \fBInstalled\-Size\fP ne soit copie dans le champ
+du fichier \ control\ .
+.TP 
+\fBF:\fP\fIfieldname\fP
+La valeur du champ \fIfieldname\fP 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 dveloppes.
+.TP 
+\fBFormat\fP
+La version du format du fichier \fB.changes\fP produite par la version des
+scripts construisant le source. Quand on dtermine cette variable, le
+contenu du champ \fBFormat\fP dans le fichier \fB.changes\fP est aussi modifi.
+.TP 
+\fBNewline\fP, \fBSpace\fP, \fBTab\fP
+Ces variables contiennent chacune le caractre correspondant.
+.TP 
+\fBshlibs:\fP\fIdependencyfield\fP
+Les variables dtermines de cette faon sont produites par
+\fBdpkg\-shlibdeps\fP.
+.TP 
+\fBdpkg:Upstream\-Version\fP
+La version amont de dpkg.
+.TP 
+\fBdpkg:Version\fP
+La version complte de dpkg.
+.LP
+Quand une variable est rfrence mais n'est pas dfinie, cela produit un
+avertissement et une valeur nulle est assume.
+.
+.SH FICHIERS
+.TP 
+\fBdebian/substvars\fP
+La liste des variables de substitution et leurs valeurs.
+.
+.SH BOGUES
+Le moment o a lieu le remplacement d'un champ par rapport  certaines
+dterminations de champ affiches sur la sortie standard est plutt
+embrouill.
+
+.SH "VOIR AUSSI"
+\fBdpkg\fP(1), \fBdpkg\-genchanges\fP(1), \fBdpkg\-gencontrol\fP(1),
+\fBdpkg\-shlibdeps\fP(1), \fBdpkg\-source\fP(1).
+.
+.SH AUTEUR
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg.1
--- dpkg/man/fr/dpkg.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,792 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg 1 2011\-08\-14 "Projet Debian" "suite dpkg"
+.SH NOM
+dpkg \- un gestionnaire de paquet pour Debian
+.
+.SH SYNOPSIS
+\fBdpkg\fP [\fIoption\fP...] \fIaction\fP
+.
+.SH AVERTISSEMENT
+Ce manuel est destin aux utilisateurs qui souhaitent aller au\-del de la
+commande \fBdpkg \-\-help\fP pour la comprhension des options de la ligne de
+commande et des tats des paquets.
+
+Les responsables de paquet qui veulent comprendre comment \fBdpkg\fP installe
+leur paquet \fIne doivent pas\fP l'utiliser. Les descriptions concernant
+l'installation ou la dsinstallation des paquets sont trs insuffisantes.
+.
+.SH DESCRIPTION
+\fBdpkg\fP est un outil pour l'installation, la cration, la suppression et la
+gestion des paquets Debian. \fBaptitude\fP(1) est la principale interface 
+\fBdpkg\fP et la plus agrable pour l'utilisateur.  \fBdpkg\fP lui\-mme est
+entirement contrl par des paramtres sur la ligne de commande. Une
+commande comporte exactement une action et zro ou plusieurs options. Le
+paramtre \ action\  dit ce que \fBdpkg\fP doit faire et les options modifient
+l'action d'une manire ou d'une autre.
+
+\fBdpkg\fP can also be used as a front\-end to \fBdpkg\-deb\fP(1) and
+\fBdpkg\-query\fP(1). The list of supported actions can be found later on in the
+\fBACTIONS\fP section. If any such action is encountered \fBdpkg\fP just runs
+\fBdpkg\-deb\fP or \fBdpkg\-query\fP with the parameters given to it, but no
+specific options are currently passed to them, to use any such option the
+back\-ends need to be called directly.
+.
+.SH "RENSEIGNEMENTS SUR LES PAQUETS"
+\fBdpkg\fP conserve des renseignements utiles sur les paquets disponibles.
+Cette information est divise en trois classes\ : les tats, les tats de la
+slection et les drapeaux. La modification de ces valeurs est principalement
+dvolue  \fBdselect\fP.
+.SS "TATS DES PAQUETS"
+.TP 
+\fBnot\-installed\fP
+Le paquet n'est pas install sur le systme.
+.TP 
+\fBconfig\-files\fP
+Seuls les fichiers de configuration du paquet existent sur le systme.
+.TP 
+\fBhalf\-installed\fP
+L'installation du paquet a commenc mais, pour une raison quelconque, ne
+s'est pas termine.
+.TP 
+\fBunpacked\fP
+Le paquet est dpaquet mais n'est pas configur.
+.TP 
+\fBhalf\-configured\fP
+Le paquet est dpaquet et la configuration a commenc mais, pour une
+quelconque raison, ne s'est pas termine.
+.TP 
+\fBtriggers\-awaited\fP
+Le paquet attend l'excution d'une action diffre qui est  la charge d'un
+autre paquet.
+.TP 
+\fBtriggers\-pending\fP
+Une action diffre de ce paquet a t active, il reste  l'excuter.
+.TP 
+\fBinstalled\fP
+Le paquet est dpaquet et correctement configur.
+.SS "TATS DE LA SLECTION DES PAQUETS"
+.TP 
+\fBinstall\fP
+Le paquet est slectionn pour tre install.
+.TP 
+\fBhold\fP
+\fBdpkg\fP laisse de ct un paquet marqu \fBhold\fP,  moins qu'il ne soit lanc
+avec l'option de forage \fB\-\-force\-hold\fP.
+.TP 
+\fBdeinstall\fP
+Le paquet est slectionn pour tre dsinstall (c.\-\-d. qu'on veut
+supprimer tous les fichiers  l'exception des fichiers de configuration).
+.TP 
+\fBpurge\fP
+Le paquet est slectionn pour tre purg (c.\-\-d. qu'on veut tout supprimer
+dans les rpertoire du systme mme les fichiers de configuration).
+.SS "DRAPEAUX DES PAQUETS"
+.TP 
+\fBreinst\-required\fP
+Un paquet marqu \fBreinst\-required\fP est dfectueux et demande une
+rinstallation. \fBdpkg\fP ne peut supprimer de tels paquets,  moins qu'il ne
+soit lanc avec l'option de forage \fB\-\-force\-remove\-reinstreq\fP.
+.
+.SH ACTIONS
+.TP 
+\fB\-i\fP, \fB\-\-install\fP \fIpackage\-file\fP...
+Install the package. If \fB\-\-recursive\fP or \fB\-R\fP option is specified,
+\fIpackage\-file\fP must refer to a directory instead.
+
+L'installation comporte les tapes suivantes\ :
+.br
+
+\fB1.\fP Extraction des fichiers de contrle du nouveau paquet.
+.br
+
+\fB2.\fP Quand une ancienne version du mme paquet est dj installe,
+excution du script \fIprerm\fP de l'ancien paquet.
+.br
+
+\fB3.\fP Lancement du script \fIpreinst\fP, s'il est fourni par le paquet.
+.br
+
+\fB4.\fP Dpaquetage des nouveaux fichiers et, en mme temps, sauvegarde des
+anciens de manire  pouvoir les restaurer si quelque chose tourne mal.
+.br
+
+\fB5.\fP Quand une ancienne version du mme paquet est dj installe,
+excution du script \fIpostrm\fP de l'ancien paquet. Il faut remarquer que ce
+script est excut aprs le script \fIpreinst\fP du nouveau paquet, parce que
+les nouveaux fichiers sont crits dans le mme temps que les anciens sont
+supprims.
+.br
+
+\fB6.\fP Configuration du paquet. Voyez l'action \fB\-\-configure\fP pour savoir
+comment cela se passe.
+.TP 
+\fB\-\-unpack \fP\fIpackage\-file\fP...
+Unpack the package, but don't configure it. If \fB\-\-recursive\fP or \fB\-R\fP
+option is specified, \fIpackage\-file\fP must refer to a directory instead.
+.TP 
+\fB\-\-configure \fP\fIpaquet\fP...|\fB\-a\fP|\fB\-\-pending\fP
+Reconfiguration d'un paquet dpaquet mais non encore configur. Si l'option
+\fB\-a\fP ou \fB\-\-pending\fP est utilise au lieu de \fIpaquet\fP, tous les paquets
+dpaquets mais non configurs sont configurs.
+
+Pour reconfigurer un paquet qui l'a dj t, vous devriez plutt utiliser
+la commande \fBdpkg\-reconfigure\fP(8).
+
+La configuration comporte les tapes suivantes\ :
+.br
+
+\fB1.\fP Dpaquetage des fichiers de configuration, et dans le mme temps
+sauvegarde des anciens fichiers de configuration, de manire  pouvoir les
+restaurer si quelque chose se passe mal.
+.br
+
+\fB2.\fP Excution du script \fBpostinst\fP, s'il est fourni par le paquet.
+.TP 
+\fB\-\-triggers\-only\fP \fIpaquet\fP ...|\fB\-a\fP | \fB\-\-pending\fP
+N'excute que les actions diffres. Toutes les actions diffres en attente
+seront traites. Si des noms des paquets sont fournis, les actions diffres
+de ces paquets seront traites, une fois chacune lorsque
+ncessaire. L'utilisation de cette option peut laisser des paquets dans les
+tats incorrects de \fBtriggers\-awaited\fP et de \fBtriggers\-pending\fP. Cela peut
+tre corrig plus tard en excutant\ : \fBdpkg \-\-configure \-\-pending\fP.
+.TP 
+\fB\-r\fP, \fB\-\-remove\fP, \fB\-P\fP, \fB\-\-purge \fP\fIpaquet\fP...|\fB\-a\fP|\fB\-\-pending\fP
+Supprime un paquet install. L'action \fB\-r\fP ou \fB\-\-remove\fP supprime tout
+sauf les fichiers de configuration. Cela peut viter la reconfiguration du
+paquet lors d'une rinstallation. Les fichiers de configuration sont les
+fichiers rpertoris dans le fichier de contrle
+\fIdebian/conffiles\fP. L'option \fB\-P\fP ou \fB\-\-purge\fP supprime tout, y compris
+les fichiers de configuration. Si l'on donne l'option \fB\-a\fP ou \fB\-\-pending\fP
+ la place d'un nom de paquet, tous les paquets non dpaquets, mais qui
+sont marqus comme devant tre supprims ou purgs dans le fichier
+\fI/var/lib/dpkg/status\fP, sont respectivement supprims ou
+purgs. Note\ :\ certains fichiers de configuration peuvent tre inconnus de
+\fBdpkg\fP car ils sont crs et grs  part, via les scripts de
+configuration. Dans ce cas, \fBdpkg\fP ne les supprimera pas lui\-mme et le
+script \fIpostrm\fP du paquet (qui est appel par \fBdpkg\fP) doit s'occuper de
+leur suppression. Bien entendu, cela ne s'applique qu'aux fichiers situs
+dans les rpertoires du systme, pas  ceux existant dans les rpertoires
+personnels des utilisateurs.
+
+La suppression d'un paquet comporte les tapes suivantes\ :
+.br
+
+\fB1.\fP Lancement du script \fIprerm\fP
+.br
+
+\fB2.\fP Suppression des fichiers installs
+.br
+
+\fB3.\fP lancement du script \fIpostrm\fP
+.br
+.TP 
+\fB\-\-update\-avail\fP, \fB\-\-merge\-avail\fP \fIfichier\-Paquets\fP
+Met  jour l'information de \fBdpkg\fP et de \fBdselect\fP sur les paquets
+disponibles. L'action \fB\-\-merge\-avail\fP combine les informations anciennes
+avec celles qui proviennent du fichier \fIfichier\-Packages\fP. L'action
+\fB\-\-update\-avail\fP remplace les informations anciennes par celles qui
+proviennent du fichier \fIfichier\-Packages\fP. Le fichier \fIfichier\-Packages\fP
+distribu avec Debian est appel simplement \fIPackages\fP. \fBdpkg\fP garde son
+propre enregistrement des paquets disponibles dans
+\fI/var/lib/dpkg/available\fP.
+
+A commande unique plus simple permettant de rcuprer et mettre  jour le
+fichier \fIavailable\fP est \fBdselect update\fP. Veuillez noter que ce fichier
+est  peu prs inutile si vous n'utilisez pas \fBdselect\fP mais une interface
+base sur APT. APT comporte en effet son propre mcanisme pour suivre les
+paquets disponibles.
+.TP 
+\fB\-A\fP, \fB\-\-record\-avail\fP \fIpackage\-file\fP...
+Update \fBdpkg\fP and \fBdselect\fP's idea of which packages are available with
+information from the package \fIpackage\-file\fP. If \fB\-\-recursive\fP or \fB\-R\fP
+option is specified, \fIpackage\-file\fP must refer to a directory instead.
+.TP 
+\fB\-\-forget\-old\-unavail\fP
+Dsormais \fBobsolte\fP et sans effet car \fBdpkg\fP oublie automatiquement les
+paquets dsinstalls qui ne sont pas disponibles.
+.TP 
+\fB\-\-clear\-avail\fP
+Efface les renseignements existants sur les paquets disponibles.
+.TP 
+\fB\-C\fP, \fB\-\-audit\fP
+Recherche les paquets qui n'ont t que partiellement installs sur le
+systme. \fBdpkg\fP suggre une manire de les faire fonctionner.
+.TP 
+\fB\-\-get\-selections\fP [\fImotif\-nom\-paquet\fP...]
+Obtient la liste des slections des paquets, et l'envoie sur la sortie
+standard. Sans un motif, les paquets non installs (c'est  dire ceux qui
+ont t prcdemment purgs) ne seront pas affichs.
+.TP 
+\fB\-\-set\-selections\fP
+Set package selections using file read from stdin. This file should be in
+the format '\fIpackage\fP \fIstate\fP', where state is one of \fBinstall\fP, \fBhold\fP,
+\fBdeinstall\fP or \fBpurge\fP. Blank lines and comment lines beginning with '#'
+are also permitted.
+.TP 
+\fB\-\-clear\-selections\fP
+Met l'tat de chaque paquet non essentiel  \ deinstall\ . Il faut utiliser
+cette option juste avant \-\-set\-selections, pour dsinstaller les paquets qui
+ne sont pas affichs par \-\-set\-selections.
+.TP 
+\fB\-\-yet\-to\-unpack\fP
+Recherche les paquets qui ont t slectionns pour l'installation, mais qui
+pour une raison quelconque, ne sont pas encore installs.
+.TP 
+.TP 
+\fB\-\-print\-architecture\fP
+Affiche l'architecture des paquets installs (par exemple, \ i386\ ).
+.TP 
+\fB\-\-compare\-versions \fP\fIver1 op ver2\fP
+Compare des numros de version, o \fIop\fP est un oprateur binaire. \fBdpkg\fP
+retourne un zro si la condition spcifie est vrifie, et retourne un
+nombre diffrent de zro dans le cas contraire. Il y a deux groupes
+d'oprateurs\ ; ils diffrent par leur faon de traiter l'absence de \fIver1\fP
+ou de \fIver2\fP. Pour les oprateurs suivants, \fBlt le eq ne ge gt\fP, l'absence
+d'une version est considre comme infrieure  toute version\ ; pour les
+oprateurs \fBlt\-nl le\-nl ge\-nl gt\-nl\fP, l'absence d'une version est
+considre comme suprieure  toute version. Les oprateurs \fB<
+<< <= = >= >> >\fP ne sont fournis que pour la
+compatibilit avec la syntaxe du fichier de contrle.
+.TP 
+\fB\-\-command\-fd \fP\fIn\fP
+Accept a series of commands on input file descriptor \fIn\fP. Note: additional
+options set on the command line, and through this file descriptor, are not
+reset for subsequent commands executed during the same run.
+.TP 
+\fB\-\-help\fP
+Affiche un court message d'aide.
+.TP 
+\fB\-\-force\-help\fP
+Donne des renseignements sur les options \fB\-\-force\-\fP\fIquelque\-chose\fP.
+.TP 
+\fB\-Dh\fP, \fB\-\-debug=help\fP
+donne des renseignements sur les options de dbogage.
+.TP 
+\fB\-\-version\fP
+Affiche la version de \fBdpkg\fP.
+.TP 
+\fBdpkg\-deb actions\fP
+Voyez \fBdpkg\-deb\fP(1) pour des renseignements supplmentaires sur les actions
+suivantes.
+
+.nf
+\fB\-b\fP, \fB\-\-build\fP \fIrpertoire\fP [\fIarchive\fP|\fIrpertoire\fP]
+    Construit un paquet deb.
+\fB\-c\fP, \fB\-\-contents\fP \fIarchive\fP
+    Liste le contenu d'un paquet deb.
+\fB\-e\fP, \fB\-\-control\fP \fInom\-de\-fichier\fP [\fIrpertoire\fP]
+    Extrait les informations de contrle d'un paquet.
+\fB\-x\fP, \fB\-\-extract\fP \fIrpertoire de l'archive\fP
+    Extrait et affiche les fichiers contenus dans un paquet.
+\fB\-f\fP, \fB\-\-field\fP \fInom\-de\-fichier\fP [\fIchamp de contrle\fP] ...
+    Affiche le(s) champ(s) de contrle d'un paquet.
+\fB\-\-fsys\-tarfile\fP \fIarchive\fP
+    Affiche le contenu du fichier \ tar\  d'un paquet Debian.
+\fB\-I\fP, \fB\-\-info\fP \fInom\-de\-fichier\fP [\fIfichier de contrle\fP]
+    Affiche des renseignements sur un paquet.
+.fi
+
+.TP 
+\fBdpkg\-query actions\fP
+Voyez \fBdpkg\-query\fP(1) pour davantage d'explications sur les actions
+suivantes.
+
+.nf
+
+\fB\-l\fP, \fB\-\-list\fP \fImotif\-du\-nom\-du\-paquet\fP ...
+    Affiche la liste des paquets qui correspondent au motif.
+\fB\-s\fP, \fB\-\-status\fP \fInom\-du\-paquet\fP ...
+    Donne l'tat du paquet indiqu.
+\fB\-L\fP, \fB\-\-listfiles\fP \fInom\-paquet\fP ...
+    Affiche la liste des fichiers installs qui appartiennent
+     \fIpaquet\fP.
+\fB\-S\fP, \fB\-\-search\fP \fImotif\-du\-fichier\-\-rechercher\fP ...
+    Recherche un fichier dans les paquets installs.
+\fB\-p\fP, \fB\-\-print\-avail\fP \fInom\-du\-paquet\fP
+    Affiche les informations trouves dans \fI/var/lib/dpkg/available\fP
+     propos de \fIpaquet\fP. Les utilisateurs des interfaces  APT
+    devraient plutt utiliser \fBapt\-cache show\fP \fInom\-du\-paquet\fP.
+.fi
+.
+.SH OPTIONS
+On peut spcifier une option  la fois sur la ligne de commande et dans le
+fichier de configuration de \fBdpkg\fP, \fI/etc/dpkg/dpkg.cfg\fP ou dans les
+fichiers du rpertoire de configuration \fI/etc/dpkg/dpkg.cfg.d/\fP. Chaque
+ligne de ce fichier est soit une option (identique  une option en ligne de
+commande mais sans tiret), soit un commentaire, commenant par \fB#\fP.
+.br
+.TP 
+\fB\-\-abort\-after=\fP\fInombre\fP
+Modifie le nombre d'erreurs au del duquel \fBdpkg\fP s'arrte. Il est par
+dfaut gal  50.
+.TP 
+\fB\-B\fP, \fB\-\-auto\-deconfigure\fP
+Quand un paquet est supprim, il peut arriver qu'un paquet install
+dpendait du paquet supprim. En spcifiant cette option, on obtient la
+dconfiguration automatique du paquet qui dpendait du paquet supprim.
+.TP 
+\fB\-D\fP\fIoctal\fP\fB, \-\-debug=\fP\fIoctal\fP
+Demande de dbogage. \fIoctal\fP est form en faisant un \ ou\  logique entre
+des valeurs souhaites appartenant  la liste ci\-dessous (notez que ces
+valeurs pourront changer dans les prochaines versions). \fB\-Dh\fP ou
+\fB\-\-debug=help\fP affiche ces valeurs de dbogage.
+
+    Number   Description
+         1   Generally helpful progress information
+         2   Invocation and status of maintainer scripts
+        10   Output for each file processed
+       100   Lots of output for each file processed
+        20   Output for each configuration file
+       200   Lots of output for each configuration file
+        40   Dependencies and conflicts
+       400   Lots of dependencies/conflicts output
+     10000   Trigger activation and processing
+     20000   Lots of output regarding triggers
+     40000   Silly amounts of output regarding triggers
+      1000   Lots of drivel about e.g. the dpkg/info dir
+      2000   Insane amounts of drivel
+.TP 
+\fB\-\-force\-\fP\fIquelque\-chose\fP, \fB\-\-no\-force\-\fP\fIquelque\-chose\fP, \fB\-\-refuse\-\fP\fIquelque\-chose\fP
+
+Forcer ou refuser (\fBno\-force\fP et \fBrefuse\fP signifient la mme chose) de
+faire quelque chose. \fIquelque\-chose\fP est une liste d'actions spares par
+des virgules, dcrites ci\-aprs. \fB\-\-force\-help\fP affiche un message qui les
+dcrit. Les actions marques d'un (*) sont forces par dfaut.
+
+\fIAvertissement\ : Ces options sont principalement destines aux experts. Un
+usage auquel manque la pleine comprhension de leurs effets peut casser le
+systme entier.\fP
+
+\fBall\fP\ : Met en oeuvre (ou pas) toutes les options de forage.
+
+\fBdowngrade\fP(*)\ : Installe un paquet, mme si une version plus rcente du
+paquet est dj installe.
+
+\fIAvertissement\ : Pour l'instant, dpkg ne recherche pas les dpendances lors
+d'un retour  une version infrieure d'un paquet\ ; il ne vous prviendra pas
+si la version choisie casse les dpendances d'un autre paquet. Cela peut
+avoir de srieuses consquences\ ;\ et si l'on revient  des versions
+antrieures des programmes essentiels du systme, cela peut rendre votre
+systme inutilisable. N'utiliser qu'avec prcaution.\fP
+
+\fBconfigure\-any\fP\ : Configure aussi les paquets dpaquets mais non
+configurs dont dpend le paquet en question.
+
+\fBhold\fP\ : Traite mme les paquets marqus \  garder\  (\ hold\ ).
+
+\fBremove\-reinstreq\fP\ : Supprime un paquet, mme dfectueux et marqu comme
+demandant une rinstallation. Il se peut, ds lors, que des lments du
+paquet restent dans le systme et soient oublis par \fBdpkg\fP.
+
+\fBremove\-essential\fP\ : supprime un paquet mme s'il est considr comme
+indispensable. Les paquets \ Essential\  comportent les commandes Unix les
+plus fondamentales et les enlever peut casser le systme entier. Il faut
+utiliser cette option avec prudence.
+
+\fBdepends\fP\ : Change tous les problmes de dpendance en avertissements.
+
+\fBdepends\-version\fP\ : Ignore les versions dans les questions de dpendance.
+
+\fBbreaks\fP: Force l'installation, mme si cela risque de casser un autre
+paquet.
+
+\fBconflicts\fP\ : Installe un paquet, mme s'il est en conflit avec un autre
+paquet. C'est dangereux car habituellement cela produit le remplacement de
+certains fichiers.
+
+\fBconfmiss\fP\ : Installe un fichier de configuration manquant. Cette opration
+estdangereuse, puisque les changements apports au fichier ne seront pas
+prservs (suppression).
+
+\fBconfnew\fP\ : Quand un \ conffile\  a t modifi, toujours installer la
+nouvelle version et ne rien demander, sauf si l'option \fB\-\-force\-confdef\fP
+est aussi prsente, auquel cas l'action par dfaut est choisie.
+
+\fBconfold\fP\ : Quand un \ conffile\  a t modifi, garder l'ancienne version
+et ne rien demander, sauf si l'option \fB\-\-force\-confdef\fP est aussi prsente,
+auquel cas l'action par dfaut est choisie.
+
+\fBconfdef\fP\ : Utilise toujours l'action par dfaut quand un \ conffile\  a
+t modifi. Quand il n'y a pas d'action par dfaut, la commande s'arrte et
+interroge l'utilisateur,  moins que l'option \fB\-\-force\-confnew\fP ou l'option
+\fB\-\-force\-confold\fP n'ait t donne, auquel cas elle se sert de ces options
+pour dterminer ce qu'il faut faire.
+
+\fBconfask\fP\ : Si un fichier de configuration a t modifi, propose de le
+remplacer avec la version du paquet, mme si celle\-ci n'a pas chang. Si
+l'une des options \fB\-\-force\-confmiss\fP, \fB\-\-force\-confnew\fP,
+\fB\-\-force\-confold\fP, ou \fB\-\-force\-confdef\fP est galement mentionne, elle
+dterminera l'action finalement utilise.
+
+\fBoverwrite\fP\ : Remplace un fichier par un fichier d'un autre paquet.
+
+\fBoverwrite\-dir\fP\ : Remplace un rpertoire par un rpertoire d'un autre
+paquet.
+
+\fBoverwrite\-diverted\fP\ : Remplace un fichier dtourn avec une version non
+dtourne.
+
+\fBunsafe\-io\fP: Ne pas effectuer d'actions d'entre/sortie non sre lors de la
+dcompression. Cela implique actuellement de ne pas synchroniser le systme
+de fichiers avant le renommage de fichiers, ce qui est une cause connue de
+dgradation des performances sur certains systmes, en gnral ceux qui, peu
+fiables, ont besoin d'actions sres pour viter de terminer avec des
+fichiers de taille vide en cas d'interruption inopine.
+
+\fINote\fP: Pour ext4, le principal concern, il est suggr de plutt utiliser
+l'option de montage \fBnodelalloc\fP, qui corrigera  la fois la dgradation
+des performances et les problmes de scurit des donnes. Elle permet
+notamment d'viter de terminer avec des fichiers vides lors des arrts
+brutaux pour tout logiciel qui ne synchronise pas le systme de fichiers
+avant chaque renommage.
+
+\fIAvertissement : L'utilisation de cette option peut amliorer la
+performance mais augmente le risque de perte de donnes. Elle est donc 
+utiliser avec prcautions.\fP
+
+\fBarchitecture\fP: Process even packages with wrong or no architecture.
+
+\fBbad\-version\fP: Process even packages with wrong versions.
+
+\fBbad\-path\fP\ : Programmes importants non visibles par la variable \fBPATH\fP, ce
+qui va poser des problmes.
+
+\fBnot\-root\fP\ : Tente de (ds)installer mme sans tre root.
+
+\fBbad\-verify\fP\ : Installe un paquet mme si la vrification de son
+authenticit a chou.
+
+.TP 
+\fB\-\-ignore\-depends\fP=\fIpaquet\fP,...
+Ne tient pas compte de la vrification des dpendances pour les paquets
+spcifis (en fait, la vrification est faite mais on ne donne rien d'autre
+que des avertissements).
+.TP 
+\fB\-\-no\-act\fP, \fB\-\-dry\-run\fP, \fB\-\-simulate\fP
+Faire tout ce qui doit tre fait, mais n'crire aucune modification. On
+utilise cette option pour voir ce qui se passe sans modifier quoi que ce
+soit.
+
+Assurez\-vous de donner l'option \fB\-\-no\-act\fP avant le paramtre action, sinon
+des rsultats fcheux sont probables. Par exemple, la commande \fBdpkg
+\-\-purge foo \-\-no\-act\fP purge d'abord le paquet foo et essaie ensuite de
+purger le paquet \-\-no\-act, mme si vous comptiez qu'elle ne ferait rien du
+tout.
+.TP 
+\fB\-R\fP, \fB\-\-recursive\fP
+Traite rcursivement tous les simples fichiers qui correspondent au motif
+\fB*.deb\fP et qui se trouvent dans les rpertoires et sous\-rpertoires
+spcifis. On peut utiliser cette option avec les actions \fB\-i\fP, \fB\-A\fP,
+\fB\-\-install\fP, \fB\-\-unpack\fP et \fB\-\-avail\fP.
+.TP 
+\fB\-G\fP
+Ne pas installer un paquet si une version plus rcente de ce paquet est dj
+installe. C'est un alias pour \fB\-\-refuse\-downgrade\fP.
+.TP 
+\fB\-\-admindir\fP=\fIdir\fP
+Modifie le rpertoire d'administration par dfaut, qui contient de nombreux
+fichiers donnant des informations au sujet de l'tat des paquets installs
+ou non, etc. (Le rpertoire par dfaut tant \fI/var/lib/dpkg\fP)
+.TP 
+\fB\-\-instdir=\fP\fIrepertoire\fP
+Change le rpertoire d'installation par dfaut qui indique o les paquets
+vont tre installs. \fBinstdir\fP est aussi le nom du rpertoire indiqu 
+\fBchroot\fP(2) avant que ne soient lancs les scripts d'installation, ce qui
+signifie que ces scripts voient \fBinstdir\fP comme rpertoire racine. (Le
+rpertoire par dfaut est \fI/\fP).
+.TP 
+\fB\-\-root=\fP\fIrpertoire\fP
+Modifier \fBroot\fP change \fBinstdir\fP par \fIrpertoire\fP et \fBadmindir\fP par
+\fIdir\fP\fB/var/lib/dpkg\fP.
+.TP 
+\fB\-O\fP, \fB\-\-selected\-only\fP
+Traiter seulement les paquets qui sont slectionns pour l'installation. La
+slection est rellement faite par \fBdselect\fP ou par \fBdpkg\fP quand ils
+manipulent les paquets. Par exemple, quand un paquet est supprim, il est
+marqu comme ayant t slectionn pour une dsinstallation.
+.TP 
+\fB\-E\fP, \fB\-\-skip\-same\-version\fP
+Ne pas installer le paquet si la mme version du paquet est dj installe.
+.P
+\fB\-\-pre\-invoke=\fP\fIcommande\fP
+.br
+\fB\-\-post\-invoke=\fP\fIcommande\fP
+.RS
+Programme l'excution de \fIcommande\fP via \ sh \-c\  avant ou aprs
+l'excution de dpkg pour les actions \fIunpack\fP, \fIconfigure\fP, \fIinstall\fP,
+\fItriggers\-only\fP, \fIremove\fP et \fIpurge\fP. Cette option peut tre utilise
+plusieurs fois. L'ordre dans lequel les options multiples sont indiques
+sera prserv et celles indiques dans le fichier de configuration auront la
+priorit. La variable d'environnement \fBDPKG_HOOK_ACTION\fP est utilise pour
+indiquer aux scripts utiliss quelle est l'action actuelle de
+dpkg. Note\ :\ les interfaces de dpkg peuvent l'appeler plusieurs fois 
+chaque invocation, ce qui peut provoquer l'excution des \ hooks\  plus
+souvent que prvu.
+.RE
+.P
+\fB\-\-path\-exclude=\fP\fImotif\-global\fP
+.br
+\fB\-\-path\-include=\fP\fImotif\-global\fP
+.RS
+Utilise \fImotif\-global\fP comme filtre de chemins, soit en excluant, soit en
+r\-incluant des chemins prcdemment exclus, correspondant au motif indiqu,
+pendant l'installation.
+
+\fIAttention\ :\ dpendre des chemins exclus peut entirement casser le
+systme. Ce rglage soit donc tre utilis avec prcautions.\fP
+
+Les motifs globaux utilisent les mmes caractres joker que le
+shell\ o\ \ *\  correspond  une squence quelconque de caractres, y compris
+une chane vide ou le caractre \ /\ . Ainsi, \fI'/usr/*/READ*'\fP comportera
+\&\fI'/usr/share/doc/package/README'\fP. Comme toujours, le caractre \ ?\ 
+correspond  un caractre quelconque (y compris \ /\ ). Le caractre \ [\ 
+marque le dbut d'une classe de caractres, qui contient une liste de
+caractres, sries de caractres ou complments de sries. Veuillez
+consulter \fBglob\fP(7) pour plus d'informations  propos des correspondances
+globales. Note\ :\ l'implmentation actuelle pourrait r\-inclure plus de
+rpertoires et liens symboliques que ncessaire, par souci de scurit et
+pour viter des ches possibles de dcompression. Des modifications  venir
+pourraient changer cela.
+
+Cela peut servir  exclure tous les chemins sauf certains spcifiques. Un
+cas classique d'utilisation est\ :
+
+.nf
+\fB\-\-path\-exclude=/usr/share/doc/*\fP
+\fB\-\-path\-include=/usr/share/doc/*/copyright\fP
+.fi
+
+qui permet de supprimer tous les fichiers de documentation sauf les fichiers
+de \ copyright\ .
+
+Ces deux options peuvent tre utilises plusieurs fois et ventuellement
+tre alternes entre elles. Les deux sont traites dans l'ordre indiqu\ :\ la
+dernire rgle correspondant  un fichier donn est alors celle qui sera
+utilise.
+.RE
+.TP 
+\fB\-\-status\-fd \fP\fIn\fP
+Envoie un tat du paquet comprhensible par la machine et met  jour cette
+information dans le fichier de description \fIn\fP. Cette option peut tre
+spcifie plusieurs fois. L'information est gnralement constitue d'un
+enregistrement par ligne, dans l'une des formes suivantes\ :
+.RS
+.TP 
+\fBstatus: \fP\fIpaquet\fP\fB: \fP\fIstatus\fP
+L'tat du paquet a chang\ ; le \fIstatus\fP est tel que dans le fichier d'tat
+(\ status file\ ).
+.TP 
+\fBstatus: \fP\fIpaquet\fP\fB : error : \fP\fImessage\-d'erreur\-complet\fP
+An error occurred. Any possible newlines in \fIextended\-error\-message\fP will
+be converted to spaces before output.
+.TP 
+\fBstatus: \fP\fIfichier\fP\fB : conffile\-prompt : '\fP\fIreal\-old\fP\fB' '\fP\fIreal\-new\fP\fB' \fP\fIuseredited\fP\fB \fP\fIdistedited\fP
+Une question pour un fichier de configuration va tre pose  l'utilisateur.
+.TP 
+\fBprocessing: \fP\fIstage\fP\fB: \fP\fIpaquet\fP
+Envoy juste avant le dbut du traitement d'un stage. Les \fIstages\fP sont
+\fBupgrade\fP, \fBinstall\fP (les deux sont envoys avant le dpaquetage),
+\fBconfigure\fP, \fBtrigproc\fP, \fBdisappear\fP, \fBremove\fP, \fBpurge\fP.
+.RE
+.TP 
+\fB\-\-status\-logger\fP=\fIcommand\fP
+Send machine\-readable package status and progress information to the shell
+\fIcommand\fP's standard input. This option can be specified multiple
+times. The output format used is the same as in \fB\-\-status\-fd.\fP
+.RE
+.TP 
+\fB\-\-log=\fP\fIfichier\fP
+Log status change updates and actions to \fIfilename\fP, instead of the default
+\fI/var/log/dpkg.log\fP. 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
+\fIstate\fP \fIpkg\fP \fIinstalled\-version\fP' for status change updates; `YYYY\-MM\-DD
+HH:MM:SS \fIaction\fP \fIpkg\fP \fIinstalled\-version\fP \fIavailable\-version\fP' for
+actions where \fIaction\fP is one of \fBinstall\fP, \fBupgrade\fP, \fBremove\fP,
+\fBpurge\fP; and `YYYY\-MM\-DD HH:MM:SS conffile \fIfilename\fP \fIdecision\fP' for
+conffile changes where \fIdecision\fP is either \fBinstall\fP or \fBkeep\fP.
+.TP 
+\fB\-\-no\-debsig\fP
+Ne pas tenter de vrifier la signature des paquets.
+.TP 
+\fB\-\-no\-triggers\fP
+Durant ce traitement ne pas lancer d'actions diffres (les activations
+seront toujours enregistres). S'il est utilis avec \fB\-\-configure\fP
+\fIpaquet\fP ou \fB\-\-triggers\-only\fP \fIpaquet\fP alors le postinst du paquet sera
+toujours excut mme si seule l'excution d'une action diffre est
+ncessaire. L'utilisation de cette option peut laisser des paquets dans les
+mauvais tats \fBtriggers\-awaited\fP et \fBtriggers\-pending\fP. Cela peut tre
+corrig plus tard en excutant \fBdpkg \-\-configure \-\-pending\fP.
+.TP 
+\fB\-\-triggers\fP
+Annule un prcdent \fB\-\-no\-triggers\fP.
+.
+.SH FICHIERS
+.TP 
+\fI/etc/dpkg/dpkg.cfg\fP
+Fichier de configuration contenant les options par dfaut.
+.TP 
+\fI/var/log/dpkg.log\fP
+Fichier journal standard. Voyez \fI/etc/dpkg/dpkg.cfg\fP(5) et l'option
+\fB\-\-log\fP.
+.P
+Les autres fichiers rpertoris ici sont dans leur rpertoire par dfaut,
+voyez l'option \fB\-\-admindir\fP pour savoir changer l'emplacement de ces
+fichiers.
+.TP 
+\fI/var/lib/dpkg/available\fP
+Liste des paquets disponibles.
+.TP 
+\fI/var/lib/dpkg/status\fP
+tats des paquets disponibles. Ce fichier contient des informations qui
+permettent de savoir si un paquet est marqu comme devant tre supprim ou
+pas, devant tre install ou pas, etc. Voyez la section \fBRENSEIGNEMENTS SUR
+LES PAQUETS\fP pour des informations supplmentaires.
+
+Le fichier d'tat est sauvegard quotidiennement dans \fI/var/backups\fP. Cela
+peut tre utile en cas de perte ou de corruption de  des problmes de
+systme de fichiers.
+.P
+Les fichiers suivants font partie d'un paquet binaire. Voyez \fBdeb\fP(5) pour
+des informations supplmentaires\ :
+.TP 
+\fIcontrol\fP
+.TP 
+\fIconffiles\fP
+.TP 
+\fIpreinst\fP
+.TP 
+\fIpostinst\fP
+.TP 
+\fIprerm\fP
+.TP 
+\fIpostrm\fP
+.
+.SH ENVIRONNEMENT
+.TP 
+\fBHOME\fP
+Si cette option est utilise, \fBdpkg\fP utilisera le rpertoire indiqu pour
+lire le fichier de configuration propre  l'utilisateur.
+.TP 
+\fBTMPDIR\fP
+Si cette option est utilise, \fBdpkg\fP utilisera le rpertoire indiqu pour
+crer les fichiers et rpertoire temporaires.
+.TP 
+\fBPAGER\fP
+Cette option indique le programme excut par \fBdpkg\fP quand il affiche les
+fichiers de configuration.
+.TP 
+\fBSHELL\fP
+Le programme excut par \fBdpkg\fP quand il lance un nouvel interprteur de
+commandes.
+.TP 
+\fBCOLUMNS\fP
+Fixe le nombre de colonnes utiliss par \fBdpkg\fP lorsqu'il affiche un texte
+format. Seule l'action \fB\-l\fP se sert actuellement de cette variable.
+.TP 
+\fBDPKG_SHELL_REASON\fP
+Cette variable dfinit l'invite du shell lanc par \fBdpkg\fP lorsqu'il lui est
+demand d'\  examiner la situation\  lors du traitement des fichiers de
+configuration. La valeur actuellement valable est\ :\ \fBconffile\-prompt\fP/
+.TP 
+\fBDPKG_CONFFILE_OLD\fP
+Cette variable est dfinie pour le shell lanc par \fBdpkg\fP lorsqu'il lui est
+demand d'\  examiner la situation\  lors du traitement des fichiers de
+configuration. Elle contient le nom de l'ancien fichier de configuration.
+.TP 
+\fBDPKG_CONFFILE_NEW\fP
+Cette variable est dfinie pour le shell lanc par \fBdpkg\fP lorsqu'il lui est
+demand d'\  examiner la situation\  lors du traitement des fichiers de
+configuration. Elle contient le nom du nouveau fichier de configuration.
+.TP 
+\fBDPKG_RUNNING_VERSION\fP
+Cette variables est dfinie par \fBdpkg\fP dans l'environnement du script du
+responsable. Elle contient la version de l'instance de \fBdpkg\fP en cours
+d'excution.
+.TP 
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP
+Dfinie par \fBdpkg\fP dans l'environnement du script du responsable, cette
+variable contient le nom du paquet en cours de traitement.
+.TP 
+\fBDPKG_MAINTSCRIPT_ARCH\fP
+Dfinie par \fBdpkg\fP dans l'environnement du script du responsable, cette
+variable contient l'architecture pour laquelle le paquet a t construit.
+.TP 
+\fBDPKG_MAINTSCRIPT_NAME\fP
+Dfinie par \fBdpkg\fP dans l'environnement du script du responsable, cette
+variable contient le nom du script en cours d'excution (preinst, postinst,
+prerm, postrm).
+.
+.SH EXEMPLES
+Pour afficher les paquets lis au programme \fBvi\fP(1)\ :
+.br
+    \fBdpkg \-l \(aq*vi*\(aq\fP
+.br
+
+Pour voir les entres de \fI/var/lib/dpkg/available\fP concernant deux
+paquets\ :
+.br
+    \fBdpkg \-\-print\-avail elvis vim | less\fP
+.br
+
+Pour rechercher vous\-mme dans la liste des paquets\ :
+.br
+    \fBless /var/lib/dpkg/available\fP
+.br
+
+Pour supprimer le paquet install elvis\ :
+.br
+    \fBdpkg \-r elvis\fP
+.br
+
+Pour installer un paquet, vous devez d'abord le trouver dans une archive ou
+sur un CD. Le fichier \ available\  montre que le paquet vim se trouve dans
+la section \ editors\ \ :
+.br
+     \fBcd /media/cdrom/pool/main/v/vim\fP
+     \fBdpkg \-i vim_4.5\-3.deb\fP
+.br
+
+Pour faire une copie locale des tats de slection des paquets\ :
+.br
+    \fBdpkg \-\-get\-selections >myselections\fP
+.br
+
+Vous pourriez transfrer ce fichier sur un autre ordinateur et l'installer
+de cette manire\ :
+.br
+    \fBdpkg \-\-clear\-selections\fP
+    \fBdpkg \-\-set\-selections <myselections\fP
+.br
+
+On remarquera que cela n'installe ou ne supprime rien du tout\ ; cela ne fait
+qu'enregistrer l'tat souhait des paquets. Vous aurez besoin d'autres
+applications pour rcuprer et installer rellement les paquets requis. Par
+exemple, excutez \fBapt\-get dselect\-upgrade\fP.
+
+Habituellement, vous trouverez que \fBdselect\fP(1) fournit une faon plus
+aise de modifier les tats de slection des paquets.
+.br
+.
+.SH "FONCTIONNALITS SUPPLMENTAIRES"
+D'autres possibilits sont offertes en installant les paquets suivants\ :
+\fBapt\fP, \fBaptitude\fP et \fBdebsums\fP.
+.
+.SH "VOIR AUSSI"
+\fBaptitude\fP(1), \fBapt\fP(1), \fBdselect\fP(1), \fBdpkg\-deb\fP(1), \fBdpkg\-query\fP(1),
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg.cfg\fP(5) et \fBdpkg\-reconfigure\fP(8).
+.
+.SH BOGUES
+L'option \fB\-\-no\-act\fP ne donne pas assez d'informations utiles.
+.
+.SH AUTEURS
+Consultez \fI/usr/share/doc/dpkg/THANKS\fP pour la liste de ceux qui ont
+contribu  \fBdpkg\fP.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-architecture.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-architecture.1
--- dpkg/man/fr/dpkg-architecture.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-architecture.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,321 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-architecture 1 2011\-08\-14 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-architecture \- Fixer et dterminer l'architecture pour la construction
+d'un paquet
+.
+.SH SYNOPSIS
+\fBdpkg\-architecture\fP [\fIoption\fP...] [\fIcommand\fP]
+.PP
+.
+.SH DESCRIPTION
+dpkg\-architecture aide  dterminer et  fixer l'architecture de
+construction et l'architecture hte pour la cration d'un paquet.
+.PP
+L'architecture de construction est toujours dtermine par un appel externe
+ \fBdpkg\fP(1). Elle ne peut pas tre spcifie en ligne de commande.
+.PP
+Vous pouvez spcifier une architecture hte en utilisant une des options
+\fB\-a\fP et \fB\-t\fP (ou les deux). Par dfaut, la valeur est dtermine par un
+appel  \fBgcc\fP(1), ou en utilisant l'architecture de construction si
+\s-1CC\s0 ou gcc ne sont pas disponibles. Utiliser une seule des options
+\fB\-a\fP et \fB\-t\fP est suffisant, la valeur de l'une est utilise comme valeur
+par dfaut de l'autre. Bien sr, il est prfrable de n'en prciser qu'une
+seule, puisque \fBdpkg\-architecture\fP affichera un avertissement si le choix
+ne correspond pas  la valeur par dfaut.
+.
+.SH COMMANDES
+.TP 
+\fB\-l\fP
+Affiche les variables d'environnement, une par ligne, en utilisant le format
+\fIVARIABLE=valeur\fP. C'est l'action par dfaut.
+.TP 
+\fB\-e\fP\fIarchitecture\-debian\fP
+Vrifie l'galit d'architectures. Par dfaut, \fIarchitecture\-debian\fP est
+compare  l'architecture Debian actuelle, qui est celle de la machine
+hte. Cette action ne dveloppe pas les architectures joker. La commande
+quitte avec un code de retour de 0 si l'architecture correspond et de 1 dans
+le cas contraire.
+.TP 
+\fB\-i\fP\fIarchitecture\-joker\fP
+Vrifie l'galit d'architectures en dveloppant \fIarchitecture\-joker\fP et en
+comparant  l'architecture Debian actuelle. La commande quitte avec un code
+de retour de 0 si l'architecture correspond et de 1 dans le cas contraire.
+.TP 
+\fB\-q\fP\fInom\-de\-variable\fP
+Affiche la valeur d'une seule variable.
+.TP 
+\fB\-s\fP
+Produit une commande, qui peut tre utilise pour positionner les variables
+d'environnement avec \ eval\ .
+.TP 
+\fB\-u\fP
+Produit une commande similaire  celle produite par \fB\-s\fP, mais pour
+supprimer les variables de l'environnement.
+.TP 
+\fB\-c\fP \fIcommande\fP
+Excute une \fIcommande\fP dans un environnement o toutes les variables sont
+positionnes aux valeurs spcifies.
+.TP 
+\fB\-L\fP
+Affiche une liste des architectures valables.
+.TP 
+\fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH OPTIONS
+.TP 
+\fB\-a\fP\fIarchitecture\-debian\fP
+Fixe l'architecture Debian.
+.TP 
+\fB\-t\fP\fItype\-de\-systme\-gnu\fP
+Fixe le type de systme GNU.
+.TP 
+\fB\-f\fP
+Les valeurs positionnes par les variables d'environnement ayant le mme nom
+que celles utilises par les scripts sont prises en compte (c'est\-\-dire
+utilise par \fBdpkg\-architecture\fP), sauf si cette option est prsente. Ceci
+permet  un utilisateur de surcharger une valeur mme lorsque l'appel 
+\fBdpkg\-architecture\fP est inclus dans un autre script (par exemple
+\fBdpkg\-buildpackage\fP(1)).
+.
+.SH TERMINOLOGIE
+.IP "Machine de construction" 4
+Machine sur laquelle le paquet est construit.
+.IP "Machine hte" 4
+Machine pour laquelle le paquet est construit.
+.IP "Architecture Debian" 4
+Chane de caractres de l'architecture Debian, qui spcifie l'emplacement
+dans l'archive \s-1FTP\s0. Par exemple\ : i386, sparc, hurd\-i386.
+.IP "Architecture joker" 4
+Une architecture joker est une architecture spciale qui correspond  toutes
+les architectures relles qui en font partie. Il est en gnral de la forme
+<noyau>\-<processeur>. Par exemple\ : linux\-any, any\-i386,
+hurd\-any.
+.IP "Type de systme \s-1GNU\s0" 4
+Chane de caractres dfinissant l'architecture et constitue de deux
+parties spares par un tiret\ : processeur et systme. Par exemple\ :
+i386\-linux\-gnu, sparc\-linux\-gnu, i386\-gnu, x86_64\-netbsd.
+.
+.SH "VARIABLES D'ENVIRONNEMENT"
+Les variables suivantes sont positionnes par \fBdpkg\-architecture\fP\ :
+.IP \s-1DEB_BUILD_ARCH\s0 4
+Architecture Debian de la machine de construction.
+.IP \s-1DEB_BUILD_ARCH_OS\s0 4
+Nom du systme Debian de la machine de construction.
+.IP \s-1DEB_BUILD_ARCH_CPU\s0 4
+Nom de processeur Debian de la machine de construction.
+.IP \s-1DEB_BUILD_ARCH_BITS\s0 4
+Taille de pointeur de la machine de construction (en bits).
+.IP \s-1DEB_BUILD_ARCH_ENDIAN\s0 4
+\ Endianness\ de la machine de construction (little ou big).
+.IP \s-1DEB_BUILD_GNU_CPU\s0 4
+Partie \s-1CPU\s0 de \s-1DEB_BUILD_GNU_TYPE\s0.
+.IP \s-1DEB_BUILD_GNU_SYSTEM\s0 4
+Partie \ systme\  de \s-1DEB_BUILD_GNU_TYPE\s0.
+.IP \s-1DEB_BUILD_GNU_TYPE\s0 4
+Type de systme \s-1GNU\s0 de la machine de construction.
+.IP \s-1DEB_BUILD_MULTIARCH\s0 4
+The clarified \s-1GNU\s0 system type of the build machine, used for
+filesystem paths.
+.IP \s-1DEB_HOST_ARCH\s0 4
+Architecture Debian de la machine hte.
+.IP \s-1DEB_HOST_ARCH_OS\s0 4
+Nom du systme Debian de la machine hte.
+.IP \s-1DEB_HOST_ARCH_CPU\s0 4
+Nom du processeur Debian de la machine hte.
+.IP \s-1DEB_HOST_ARCH_BITS\s0 4
+Taille de pointeur de la machine hte (en bits).
+.IP \s-1DEB_HOST_ARCH_ENDIAN\s0 4
+\ Endianess\  de la machine hte (little ou big).
+.IP \s-1DEB_HOST_GNU_CPU\s0 4
+Partie \ processeur\  de \s-1DEB_HOST_GNU_TYPE\s0.
+.IP \s-1DEB_HOST_GNU_SYSTEM\s0 4
+Partie \ systme\  de \s-1DEB_HOST_GNU_TYPE\s0.
+.IP \s-1DEB_HOST_GNU_TYPE\s0 4
+Type de systme \s-1GNU\s0 de la machine hte.
+.IP \s-1DEB_HOST_MULTIARCH\s0 4
+The clarified \s-1GNU\s0 system type of the host machine, used for
+filesystem paths.
+.
+.SH DEBIAN/RULES
+Les variables d'environnement dfinies par \fBdpkg\-architecture\fP sont
+fournies  \fIdebian/rules\fP comme variables pour make (consultez la
+documentation de make). Cependant, vous ne devez pas compter l\-dessus
+puisque cela empche les appels manuels  ce script.  la place, vous devez
+toujours les initialiser en utilisant \fBdpkg\-architecture\fP avec l'option
+\-q. Voici quelques exemples, qui indiquent aussi comment amliorer la
+gestion des compilations croises de votre paquet\ :
+.PP
+
+Au lieu de\ :
+.IP
+.nf
+ARCH=\`dpkg \-\-print\-architecture\`
+configure $(\s-1ARCH\s0)\-linux
+.fi
+.PP
+Veuillez utiliser\ :
+.IP
+.nf
+\&\s-1DEB_BUILD_GNU_TYPE\s0\ := $(shell dpkg\-architecture \-qDEB_BUILD_GNU_TYPE)
+\&\s-1DEB_HOST_GNU_TYPE\s0\ := $(shell dpkg\-architecture \-qDEB_HOST_GNU_TYPE)
+
+configure \-\-build=$(\s-1DEB_BUILD_GNU_TYPE\s0) \-\-host=$(\s-1DEB_HOST_GNU_TYPE\s0)
+.fi
+.PP
+
+Au lieu de\ :
+.IP
+.nf
+ARCH=\`dpkg \-\-print\-architecture\`
+ifeq ($(\s-1ARCH\s0),alpha)
+  ...
+endif
+.fi
+.PP
+Veuillez utiliser\ :
+.IP
+.nf
+\&\s-1DEB_HOST_ARCH\s0\ := $(shell dpkg\-architecture \-qDEB_HOST_ARCH)
+
+ifeq ($(\s-1DEB_HOST_ARCH\s0),alpha)
+  ...
+endif
+.fi
+.PP
+Ou, si vous n'avez besoin que de vrifier le type du processeur et du
+systme, utilisez les variables DEB_HOST_ARCH_CPU ou DEB_HOST_ARCH_OS.
+.PP
+Appeler dpkg dans les fichiers \ rules\  pour obtenir les informations sur
+l'architecture est dconseill (sauf pour des raisons de compatibilit
+arrire, voyez ci\-dessous). En particulier, l'option \-\-print\-architecture
+n'est pas fiable puisque certaines architectures Debian ne correspondent 
+aucun nom de processeur.
+.
+.SH "COMPATIBILIT ARRIRE"
+Les variables DEB_*_ARCH_BITS et DEB_*_ARCH_ENDIAN sont apparues avec la
+version 1.15.4 de dpkg\-dev. Si elles sont utilises dans \fIdebian/rules\fP,
+une dpendance de construction sur dpkg\-dev (>= 1.15.4) est ncessaire.
+.PP
+Les variables DEB_HOST_ARCH_CPU et DEB_HOST_ARCH_OS sont apparues avec la
+version 1.13.2 de dpkg\-dev. Auparavant, les fichiers \fIdebian/rules\fP
+utilisaient les variables DEB_HOST_GNU_CPU ou DEB_HOST_GNU_TYPE qui ont eu
+tendance  varier dans le temps.
+.PP
+Si ces variables sont encore utilises dans un fichier \fIdebian/rules\fP pour
+dcider quoi construire et comment, il faut les remplacer par les nouvelles
+variables. Vous pouvez rester compatible avec les versions prcdentes de
+dpkg\-dev en utilisant le code suivant\ :
+.IP
+.nf
+DEB_HOST_ARCH_CPU\ := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_CPU 2>/dev/null)
+DEB_HOST_ARCH_OS\ := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_OS 2>/dev/null)
+
+# Prise en compte des anciennes versions de dpkg\-architecture.
+ifeq ($(DEB_HOST_ARCH_CPU),)
+  DEB_HOST_ARCH_CPU\ := $(shell dpkg\-architecture \-qDEB_HOST_GNU_CPU)
+  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
+    DEB_HOST_ARCH_CPU\ := amd64
+  endif
+endif
+ifeq ($(DEB_HOST_ARCH_OS),)
+  DEB_HOST_ARCH_OS\ := $(subst \-gnu,,$(shell dpkg\-architecture \-qDEB_HOST_GNU_SYSTEM))
+  ifeq ($(DEB_HOST_ARCH_OS),gnu)
+    DEB_HOST_ARCH_OS\ := hurd
+  endif
+endif
+.fi
+.PP
+Et de la mme faon pour DEB_BUILD_ARCH_CPU et DEB_BUILD_ARCH_OS.
+.PP
+Pour accepter encore les versions de dpkg\-dev qui n'incluent pas
+\fBdpkg\-architecture\fP, vous pouvez utiliser\ :
+.IP
+.nf
+\&\s-1DEB_BUILD_ARCH\s0\ := $(shell dpkg \-\-print\-architecture)
+\&\s-1DEB_BUILD_GNU_CPU\s0\ := $(patsubst hurd\-%,%,$(\s-1DEB_BUILD_ARCH\s0))
+ifeq ($(filter\-out hurd\-%,$(\s-1DEB_BUILD_ARCH\s0)),)
+  \s-1DEB_BUILD_GNU_SYSTEM\s0\ := gnu
+else
+  \s-1DEB_BUILD_GNU_SYSTEM\s0\ := linux\-gnu
+endif
+DEB_BUILD_GNU_TYPE=$(\s-1DEB_BUILD_GNU_CPU\s0)\-$(\s-1DEB_BUILD_GNU_SYSTEM\s0)
+
+\&\s-1DEB_HOST_ARCH\s0\ := $(\s-1DEB_BUILD_ARCH\s0)
+\&\s-1DEB_HOST_GNU_CPU\s0\ := $(\s-1DEB_BUILD_GNU_CPU\s0)
+\&\s-1DEB_HOST_GNU_SYSTEM\s0\ := $(\s-1DEB_BUILD_GNU_SYSTEM\s0)
+\&\s-1DEB_HOST_GNU_TYPE\s0\ := $(\s-1DEB_BUILD_GNU_TYPE\s0)
+.fi
+.PP
+Vous pouvez placer certaines de ces lignes au dbut de votre
+debian/rules. Ces valeurs par dfaut seront crases si dpkg\-architecture
+est utilis.
+.PP
+Vous n'avez pas besoin de toutes ces lignes. Choisissez uniquement les
+variables que vous utilisez dans votre fichier \ rules\ . Par exemple, si
+vous n'avez besoin que de l'architecture hte Debian, `DEB_HOST_ARCH=\`dpkg
+\-\-print\-architecture\`' est suffisant (il s'agit bien sr de l'architecture
+Debian de la machine de construction, mais le but est ici de rester
+compatible avec les anciennes compilations natives).
+.PP
+Les options \fB\-e\fP et \fB\-i\fP n'ont t ajoutes que relativement rcemment 
+\fBdpkg\-architecture\fP (depuis la version 1.13.13 de dpkg).
+.
+.SH EXEMPLES
+\fBdpkg\-buildpackage\fP accepte l'option \fB\-a\fP, et la passe 
+\fBdpkg\-architecture\fP. Voici d'autres exemples\ :
+.IP
+CC=i386\-gnu\-gcc dpkg\-architecture \-c debian/rules build
+.IP
+eval \`dpkg\-architecture \-u\`
+.PP
+Vrifie si une architecture est identique  l'architecture actuelle ou 
+celle spcifie\ :
+.IP
+dpkg\-architecture \-elinux\-alpha
+.IP
+dpkg\-architecture \-amips \-elinux\-mips
+.PP
+Vrifie si l'architecture actuelle ou celle spcifie avec \-a correspond 
+un systme Linux\ :
+.IP
+dpkg\-architecture \-ilinux\-any
+.IP
+dpkg\-architecture \-ai386 \-ilinux\-any
+.
+.SH FICHIERS
+All these files have to be present for \fBdpkg\-architecture\fP to work. Their
+location can be overridden at runtime with the environment variable
+\fBDPKG_DATADIR\fP.
+.TP 
+\fI/usr/share/dpkg/cputable\fP
+Table des noms de processeurs connus et liaison avec leur nom GNU.
+.TP 
+\fI/usr/share/dpkg/ostable\fP
+Table des noms des systmes d'exploitation connus et liaison avec leurs noms
+GNU.
+.TP 
+\fI/usr/share/dpkg/triplettable\fP
+Correspondances entre les triplets de l'architecture Debian et les noms des
+architectures Debian.
+.
+.SH "VOIR AUSSI"
+\fBdpkg\-buildpackage\fP(1), \fBdpkg\-cross\fP(1).
+.
+.SH AUTEUR
+\fBdpkg\-architecture\fP et cette page de manuel ont t initialement crits par
+Marcus Brinkmann <brinkmd@debian.org>.
+
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-buildpackage.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-buildpackage.1
--- dpkg/man/fr/dpkg-buildpackage.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-buildpackage.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,262 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-buildpackage 1 2011\-08\-14 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-buildpackage \- Construire depuis les sources des paquets binaires ou
+sources
+.
+.SH SYNOPSIS
+\fBdpkg\-buildpackage\fP [\fIoption\fP...]
+.
+.SH DESCRIPTION
+\fBdpkg\-buildpackage\fP est un programme qui permet d'automatiser la
+construction d'un paquet Debian. Il comporte les tapes suivantes\ :
+.IP \fB1.\fP 3
+Prparation de l'environnement de compilation par positionnement de diverses
+variables d'environnement (voir \fBVARIABLES D'ENVIRONNEMENT\fP) et appel de
+\fBdpkg\-source \-\-before\-build\fP (sauf si \fB\-T\fP ou \fB\-\-target\fP ont t
+utiliss).
+.IP \fB2.\fP 3
+Contrle des dpendances de constructions et des conflits de construction
+(non effectu si \fB\-d\fP est utilis).
+.IP \fB3.\fP 3
+Si une cible particuilre a t indique avec les options \fB\-T\fP ou
+\fB\-\-target\fP, appel de cette cible et arrt. Dans le cas contraire, appel de
+\fBfakeroot debian/rules clean\fP pour nettoyage de l'arborescence source (sauf
+si \fB\-nc\fP a t utilis).
+.IP \fB4.\fP 3
+Appel de \fBdpkg\-source \-b\fP pour crer le paquet source (sauf si une
+contruction binaire seule a t demande avec \fB\-b\fP, \fB\-B\fP ou \fB\-A\fP).
+.IP \fB5.\fP 3
+It calls \fBdebian/rules\fP \fBbuild\fP followed by \fBfakeroot debian/rules\fP
+\fIbinary\-target\fP (unless a source\-only build has been requested with
+\fB\-S\fP). Note that \fIbinary\-target\fP is either \fBbinary\fP (default case, or if
+\fB\-b\fP is specified)  or \fBbinary\-arch\fP (if \fB\-B\fP is specified) or
+\fBbinary\-indep\fP (if \fB\-A\fP is specified).
+.IP \fB6.\fP 3
+Appel de \fBgpg\fP pour signature du fichier \fB.dsc\fP (sauf si \fB\-us\fP est
+utilis).
+.IP \fB7.\fP 3
+Appel de \fBdpkg\-genchanges\fP pour crer un fichier \fB.changes\fP. De nombreuses
+options de \fBdpkg\-buildpackage\fP sont passes  \fBdpkg\-genchanges\fP.
+.IP \fB8.\fP 3
+Appel de \fBgpg\fP pour signer le fichier \fB.changes\fP (sauf si \fB\-uc\fP est
+utilis).
+.IP \fB9.\fP 3
+Si \fB\-tc\fP est utilis, appel de \fBfakeroot debian/rules clean\fP 
+nouveau. Enfin, appel de \fBdpkg\-source \-\-after\-build\fP.
+.
+.SH OPTIONS
+.TP 
+\fB\-b\fP
+Indique que seul un paquet binaire est  construire\ ; aucun fichier source
+n'est  construire et/ou  distribuer. Pass  \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-B\fP
+Indique que seul un paquet binaire est  construire\ ; aucun fichier,
+appartenant  un paquet binaire ne dpendant pas d'une architecture, n'est 
+distribuer. Pass  \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-A\fP
+Indique que seul un paquet binaire est  construire\ ; aucun fichier,
+appartenant  un paquet binaire ne dpendant pas d'une architecture, n'est 
+distribuer. Pass  \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-S\fP
+Ne construit qu'un paquet source, aucun paquet binaire ne sera
+construit. Pass  \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-F\fP
+Construction complte o les paquets sources et binaires sont
+construits. Identique au cas par dfaut o aucune option de construction
+n'est indique.
+.P
+\fB\-\-target=\fP\fIcible\fP
+.br
+\fB\-\-target \fP\fIcible\fP
+.br
+\fB\-T\fP\fIcible\fP
+.RS
+Appelle \fBdebian/rules\fP \fIcible\fP aprs avoir mis en place l'environnement de
+construction, puis interrompt le processus de construction. Si \fB\-\-as\-root\fP
+est galement utilis, la commande sera excute avec les privilges du
+superutilisateur (voir \fB\-r\fP). Noter que les cibles dont l'excution par
+root est impose par la Charte Debian n'ont pas besoin de cette option.
+.RE
+.TP 
+\fB\-\-as\-root\fP
+N'est utile qu'avec \fB\-\-target\fP. Impose d'excuter la cible avec les
+privilges du superutilisateur.
+.P
+\fB\-si\fP
+.br
+\fB\-sa\fP
+.br
+\fB\-sd\fP
+.br
+\fB\-v\fP\fIversion\fP
+.br
+\fB\-C\fP\fIdescription\-des\-changements\fP
+.br
+\fB\-m\fP\fIadresse\-du\-responsable\fP
+.br
+\fB\-e\fP\fIadresse\-du\-responsable\fP
+.RS
+Pass tel quel  \fBdpkg\-genchanges\fP. Voir sa page de manuel.
+.RE
+.TP 
+\fB\-a\fP\fIarchitecture\fP
+Prcise l'architecture Debian pour laquelle on construit. L'architecture de
+la machine sur laquelle on construit est automatiquement dtermine\ ; c'est
+aussi l'architecture par dfaut de la machine hte.
+.TP 
+\fB\-t\fP\fItype\-de\-systme\-gnu\fP
+Prcise le type de systme GNU pour lequel construire. Il peut tre utilis
+ la place de \fB\-a\fP ou en tant que complment afin de remplacer le type de
+systme GNU par dfaut de l'architecture Debian cible.
+.TP 
+\fB\-j\fP\fIjobs\fP
+Nombre de processus simultans qui peuvent tre excuts, quivalent 
+l'option \fBmake\fP(1) du mme nom. S'ajoutera tout seul  la variable
+d'environnement MAKEFLAGS, afin que les appels suivants de make en
+hritent. Ajoute aussi \fBparallel=\fP\fIjobs\fP  la variable d'environnement
+DEB_BUILD_OPTIONS ce qui permet aux fichiers debian/rules d'utiliser cette
+information pour leurs propres besoins. La prsence de \fBparallel=\fP\fIjobs\fP
+dans la variable d'environnement DEB_BUILD_OPTIONS remplace la valeur de
+l'option \fB\-j\fP si elle est prcise.
+.TP 
+\fB\-D\fP
+Vrifier les dpendances de constructions et les conflits\ ; se termine en
+cas de problmes. Ceci est le comportement par dfaut.
+.TP 
+\fB\-d\fP
+Ne pas vrifier les dpendances de constructions et les conflits.
+.TP 
+\fB\-nc\fP
+Ne pas nettoyer l'arborescence des sources (implique \fB\-b\fP si aucune des
+options \fB\-B\fP, \fB\-A\fP ou \fB\-S\fP n'est utilise).
+.TP 
+\fB\-tc\fP
+Nettoyage de l'arborescence (en utilisant
+\fIcommande\-pour\-obtenir\-privilges\-de\-root\fP \fBdebian/rules clean\fP)  aprs la
+construction du paquet.
+.TP 
+\fB\-r\fP\fIcommande\-pour\-obtenir\-privilges\-de\-root\fP
+Quand \fBdpkg\-buildpackage\fP doit excuter une partie du processus de
+construction en tant que root, il prfixe la commande excute par
+\fIcommande\-pour\-obtenir\-privilges\-de\-root\fP, si une a t spcifi. Si ce
+n'est pas le cas alors \fBfakeroot\fP est utilis par
+dfaut. \fIcommande\-pour\-obtenir\-privilges\-de\-root\fP doit dbuter par le nom
+d'un programme accessible depuis \fBPATH\fP et avoir comme arguments le nom de
+la commande relle avec les arguments qu'elle doit
+prendre. \fIcommande\-pour\-obtenir\-privilges\-de\-root\fP peut recevoir des
+paramtres (ils doivent tre spars par des espaces) mais aucun
+\ mtacaractre\  de l'interprteur de commandes. Classiquement
+\fIcommande\-pour\-obtenir\-privilges\-de\-root\fP devrait tre \fBfakeroot\fP,
+\fBsudo\fP, \fBsuper\fP ou \fBreally\fP. \fBsu\fP ne va pas, puisque ce programme peut
+uniquement utiliser l'interprteur de commandes de l'utilisateur avec
+l'option \fB\-c\fP au lieu de passer directement les arguments  la commande qui
+doit tre excute.
+.TP 
+\fB\-R\fP\fIfichier\-rules\fP
+Construire un paquet Debian implique gnralement l'invocation de
+\fBdebian/rules\fP comme une commande avec de nombreux paramtres
+standards. Avec cette option, il est possible d'utiliser un autre programme
+ utiliser pour la construction de paquet (ainsi que ses paramtres spars
+par des espaces). Une autre utilisation possible est d'excuter le fichier
+rules standard avec un autre programme de construction (par exemple en
+utilisant \fB/usr/local/bin/make \-f debian/rules\fP comme \fIfichier\-rules\fP).
+.TP 
+\fB\-p\fP\fIcommande\-de\-signature\fP
+Quand \fBdpkg\-buildpackage\fP doit excuter GPG ou PGP pour signer un fichier
+source de contrle (\fB.dsc\fP) ou un fichier \fB.changes\fP, il excute
+\fIcommande\-de\-signature\fP (recherch via \fBPATH\fP si ncessaire) au lieu de
+\fBpgp\fP. \fIcommande\-de\-signature\fP reoit tous les paramtres qu'aurait
+reu\fBpgp\fP. Si \fIcommande\-de\-signature\fP veut recevoir ses paramtres  la
+manire de GPG plutt qu' la manire de PGP, il faut utiliser l'option
+\fB\-sgpg\fP. \fIcommande\-de\-signature\fP ne contiendra pas d'espace ni aucun
+\ mtacaractre\  de l'interprteur de commandes.
+.TP 
+\fB\-k\fP\fIkey\-id\fP
+Prcise une cl pour la signature des paquets.
+.TP 
+\fB\-us\fP
+Ne pas signer le paquet source.
+.TP 
+\fB\-uc\fP
+Ne pas signer le fichier \fB.changes\fP.
+.P
+\fB\-i\fP[\fIregexp\fP]
+.br
+\fB\-I\fP\fI[motif]\fP
+.br
+\fB\-s\fP[\fBnsAkurKUR\fP]
+.br
+\fB\-z\fP, \fB\-Z\fP
+.br
+.RS
+Chane passe telle quelle  \fBdpkg\-source\fP. Voir la page de manuel
+correspondante.
+.RE
+.TP 
+\fB\-\-source\-option=\fP\fIopt\fP
+Passe l'option \fIopt\fP  \fBdpkg\-source\fP.
+.TP 
+\fB\-\-changes\-option=\fP\fIopt\fP
+Passe l'option \fIopt\fP  \fBdpkg\-genchanges\fP.
+.P
+\fB\-\-admindir\fP=\fIdir\fP
+.br
+\fB\-\-admindir \fP\fIrp\fP
+.RS
+Change l'endroit o se trouve la base de donnes de \fBdpkg\fP. Par dfaut,
+c'est \fI/var/lib/dpkg\fP.
+.RE
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH ENVIRONNEMENT
+Even if \fBdpkg\-buildpackage\fP exports some variables, \fBdebian/rules\fP should
+not rely on their presence and should instead use the respective interface
+to retrieve the needed values.
+.SS "Variables positionnes par \fBdpkg\-architecture\fP"
+\fBdpkg\-architecture\fP est lanc avec les paramtres de \fB\-a\fP and \fB\-t\fP. Toute
+variable retourne par l'option \fB\-s\fP est intgre dans l'environnement de
+construction.
+.SS "Compiler flags are no longer exported"
+Between versions 1.14.17 and 1.16.1, \fBdpkg\-buildpackage\fP exported compiler
+flags (\fBCFLAGS\fP, \fBCXXFLAGS\fP, \fBFFLAGS\fP, \fBCPPFLAGS\fP and \fBLDFLAGS\fP) with
+values as returned by \fBdpkg\-buildflags\fP. This is no longer the case.
+.
+.SH BOGUES
+On devrait pouvoir mettre des espaces et des mtacaractres du shell dans
+les arguments initiaux de \fIcommande\-pour\-obtenir\-privilges\-de\-root\fP et
+\fIcommande\-de\-signature\fP.
+.
+.SH "VOIR AUSSI"
+\fBdpkg\-source\fP(1), \fBdpkg\-architecture\fP(1), \fBdpkg\-buildflags\fP(1),
+\fBdpkg\-genchanges\fP(1), \fBfakeroot\fP(1), \fBgpg\fP(1).
+.
+.SH AUTEURS
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2007 Frank Lichtenheld
+.br
+Copyright \(co 2008\-2010 Rapha\[:e]l Hertzog
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg.cfg.5 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg.cfg.5
--- dpkg/man/fr/dpkg.cfg.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg.cfg.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,34 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg.cfg 5 05\-09\-2009 "Projet Debian" "suite dpkg"
+.SH NOM
+dpkg.cfg \- fichier de configuration de dpkg
+.
+.SH DESCRIPTION
+Ce fichier liste les options appliques par dfaut  dpkg. Chaque ligne
+contient une seule option, crite exactement comme sur la ligne de commande
+mais sans les tirets initiaux, inutiliss. Les guillemets autour des valeurs
+d'options sont supprims. Les commentaires sont autoriss en faisant
+commencer la ligne par un caractre \fB("#")\fP.
+.
+.SH FICHIERS
+\fI/etc/dpkg/dpkg.cfg.d/[0\-9a\-zA\-Z_\-]*\fP
+.br
+\fI/etc/dpkg/dpkg.cfg\fP
+.br
+\fI~/.dpkg.cfg\fP
+.
+.SH AUTEUR
+Consultez \fI/usr/share/doc/dpkg/THANKS\fP pour la liste de ceux qui ont
+contribu  \fBdpkg\fP.
+.
+.SH "VOIR AUSSI"
+\fBdpkg\fP(1).
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-checkbuilddeps.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-checkbuilddeps.1
--- dpkg/man/fr/dpkg-checkbuilddeps.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-checkbuilddeps.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,54 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-checkbuilddeps 1 07\-04\-2011 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-checkbuilddeps \- vrifier les dpendances et les conflits de
+construction
+.
+.SH SYNOPSIS
+\fBdpkg\-checkbuilddeps\fP [\fIoption\fP...] [\fIcontrol\-file\fP]
+.
+.SH DESCRIPTION
+Ce programme vrifie si les dpendances et les conflits de construction
+lists dans le fichier control existent dans les paquets installs sur le
+systme. S'il en existe, il les affiche et se termine avec un code de retour
+diffrent de 0.
+.P
+By default, \fBdebian/control\fP is read, but an alternate control filename may
+be specified on the command line.
+.
+.SH OPTIONS
+.TP 
+\fB\-\-admindir\fP=\fIdir\fP
+Change l'endroit o se trouve la base de donnes de \fBdpkg\fP. Par dfaut,
+c'est \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-B\fP
+Ignore les lignes \fIBuild\-Depends\-Indep\fP.  utiliser lorsque aucun paquet
+indpendant d'une architecture ne va tre construit.
+.TP 
+\fB\-d \fP\fIchaine\-des\-dpendances\-pour\-la\-construction\fP
+.TP 
+\fB\-c \fP\fIchane\-des\-conflits\-de\-construction\fP
+Utilise les dpendances et conflits de construction donns au lieu de ceux
+indiqus dans le fichier \fIdebian/control\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH AUTEUR
+Copyright \(co 2001 Joey Hess
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-deb.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-deb.1
--- dpkg/man/fr/dpkg-deb.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-deb.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,213 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-deb 1 2011\-08\-14 "Projet Debian" "suite dpkg"
+.SH NOM
+dpkg\-deb \- outil pour la manipulation des archives (.deb) des paquets Debian
+.
+.SH SYNOPSIS
+\fBdpkg\-deb\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH DESCRIPTION
+\fBdpkg\-deb\fP cre un paquet, dpaquette une archive ou donne des
+renseignements sur les archives Debian
+.PP
+\fBdpkg\fP sert  installer ou  supprimer des paquets sur le systme.
+.PP
+Il est possible d'excuter \fBdpkg\-deb\fP en appelant \fBdpkg\fP avec les options
+de \fBdpkg\-deb\fP. \fBdpkg\fP comprend que \fBdpkg\-deb\fP est appel et le lance.
+.
+.SH COMMANDES
+.TP 
+\fB\-b\fP, \fB\-\-build\fP \fIrpertoire\fP [\fIarchive\fP|\fIrpertoire\fP]
+Cre une archive Debian avec l'arborescence contenue dans
+\fIrpertoire\fP. \fIrpertoire\fP doit possder un sous\-rpertoire \fBDEBIAN\fP qui
+contient les fichiers de contrle tel que le fichier \ control\ 
+lui\-mme. Ce rpertoire \fIn'apparat pas\fP dans l'archive de l'arborescence
+du paquet binaire\ ; mais les fichiers qu'il contient sont mis dans la zone
+de contrle du paquet binaire.
+
+ moins de prciser \fB\-\-nocheck\fP, \fBdpkg\-deb\fP lit \fBDEBIAN/control\fP et
+l'analyse. Il cherche les erreurs de syntaxe et d'autres problmes
+existants\ ; puis il affiche le nom du paquet binaire qu'il
+construit. \fBdpkg\-deb\fP vrifie aussi les permissions des scripts du
+responsable et des autres fichiers qu'il trouve dans le rpertoire de
+contrle \fBDEBIAN\fP.
+
+Quand aucune \fIarchive\fP n'est donne, \fBdpkg\-deb\fP appelle le paquet
+\fIrpertoire\fP\fB.deb\fP.
+
+Si l'archive qui doit tre cre existe dj, elle est remplace.
+
+Quand le second argument est un rpertoire, \fBdpkg\-deb\fP appelle le paquet
+\fIpaquet\fP\fB_\fP\fIversion\fP\fB_\fP\fIarch\fP\fB.deb\fP,\fB ou bien
+\fP\fIpaquet\fP\fB_\fP\fIversion\fP\fB.deb\fP si aucun champ \fBArchitecture\fP n'est prsent
+dans le fichier de contrle du paquet. Quand un rpertoire cible est prcis
+ la place d'un fichier, l'option \fB\-\-nocheck\fP ne doit pas tre utilise
+(puisque \fBdpkg\-deb\fP a besoin de lire et d'analyser le fichier de contrle
+du paquet pour connatre le nom de fichier  utiliser).
+.TP 
+\fB\-I\fP, \fB\-\-info\fP \fIarchive\fP [\fInom\-fichier\-control\fP...]
+Donne des renseignements sur une archive de paquet binaire.
+
+Quand aucun argument \fIfichier\-control\fP n'est prcis, un rsum du contenu
+du paquet ainsi que son fichier \ control\  sont affichs.
+
+Quand un argument \fIfichier\-control\fP est prcis, \fBdpkg\-deb\fP affiche les
+lments dans l'ordre d'apparition\ ; quand l'un des lments n'est pas
+prsent, il affiche un message d'erreur sur \ stderr\  et quitte avec un
+code gal  2.
+.TP 
+\fB\-W\fP, \fB\-\-show\fP \fIarchive\fP
+Cette option donne des informations sur l'archive d'un paquet binaire selon
+le format spcifi par l'argument \fB\-\-showformat\fP. Le format par dfaut
+affiche le nom et la version du paquet sur une seule ligne, spars par une
+tabulation.
+.TP 
+\fB\-f\fP, \fB\-\-field\fP \fIarchive\fP [\fInom\-du\-champ\-de\-control\fP...]
+Extrait les renseignements du fichier \ control\  de l'archive du paquet
+binaire.
+
+Quand aucun argument \fBcontrol\-fichier\-champ\fP n'est prcis, le fichier
+\ control\  est affich en entier.
+
+Quand il y en a un, \fBdpkg\-deb\fP affiche ses lments en suivant leur ordre
+d'apparition dans le fichier \ control\ . Quand il y a plus d'un argument
+\fBcontrol\-fichier\-field,\fP \fBdpkg\-deb\fP fait prcder chacun par le nom de son
+champ (puis par un \ deux\-points\  et une espace).
+
+L'absence des champs demands ne provoque pas de message d'erreur.
+.TP 
+\fB\-c\fP, \fB\-\-contents\fP \fIarchive\fP
+Liste seulement l'arborescence des fichiers d'une archive de paquet. C'est
+en fait le rsultat produit par la commande \fBtar\fP et une option
+d'numration verbeuse.
+.TP 
+\fB\-x\fP, \fB\-\-extract\fP \fIarchive rpertoire\fP
+Extrait l'arborescence des fichiers d'un paquet archive dans le rpertoire
+spcifi.
+
+Il faut remarquer que l'extraction d'un paquet dans le rpertoire root \fIne
+produit pas\fP une installation correcte\ ! Utilisez \fBdpkg\fP pour
+l'installation des paquets.
+
+\fIrpertoire\fP est cr si ncessaire (mais pas ses rpertoires parents) et
+ses permissions sont modifies pour correspondre au cnotenu du paquet.
+.TP 
+\fB\-X\fP, \fB\-\-vextract\fP \fIarchive rpertoire\fP
+Is like \fB\-\-extract\fP (\fB\-x\fP)  with \fB\-\-verbose\fP (\fB\-v\fP)  which prints a
+listing of the files extracted as it goes.
+.TP 
+\fB\-R\fP, \fB\-\-raw\-extract\fP \fIarchive directory\fP
+Extracts the filesystem tree from a package archive into a specified
+directory, and the control information files into a DEBIAN subdirectory of
+the specified directory.
+
+Le rpertoire cible est cr si ncessaire (mais pas ses rpertoires
+parents).
+.TP 
+\fB\-\-fsys\-tarfile\fP \fIarchive\fP
+Extracts the filesystem tree data from a binary package and sends it to
+standard output in \fBtar\fP format. Together with \fBtar\fP(1)  this can be used
+to extract a particular file from a package archive.  The input archive will
+always be processed sequentially.
+.TP 
+\fB\-e\fP, \fB\-\-control\fP \fIarchive\fP [\fIrpertoire\fP]
+Extrait les fichiers de contrle d'une archive de paquet dans le rpertoire
+spcifi.
+
+Quand aucun rpertoire n'est prcis, on utilise un sous\-rpertoire
+\fBDEBIAN\fP du rpertoire actuel.
+
+Le rpertoire cible est cr si ncessaire (mais pas ses rpertoires
+parents).
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH OPTIONS
+.TP 
+\fB\-\-showformat=\fP\fIformat\fP
+Cette option sert  spcifier le format de sortie de l'option \fB\-\-show\fP. Ce
+format sera utilis pour chaque paquet list.
+
+Cet argument est une chane qui peut rfrencer tout champ avec la forme
+${\fIfield\-name\fP}\ ; une liste des champs valables peut tre facilement
+produite avec l'option \fB\-I\fP sur le mme paquet. Une explication complte
+des options de formatage (avec les squences d'chappement et les espaces
+entre les champs) se trouve dans la page \fBdpkg\-query\fP(1), option
+\fB\-\-showformat\fP.
+
+Par dfaut, la valeur de ce champ est ${Package}\et${Version}\en.
+.TP 
+\fB\-z\fP\fIcompress\-level\fP
+Specify which compression level to use on the compressor backend, when
+building a package (default is 9 for gzip and bzip2, 6 for xz and lzma).
+.TP 
+\fB\-Z\fP\fIcompress\-type\fP
+Indique le type de compression  utiliser lors de la construction d'un
+paquet. Les valeurs autorises sont \fIgzip\fP (la valeur par dfaut), \fIxz\fP,
+\fIbzip2\fP, \fIlzma\fP et \fInone\fP (aucune compression).
+.TP 
+\fB\-\-new\fP
+S'assure que \fBdpkg\-deb\fP construit une archive avec le \ nouveau\ 
+format. C'est le comportement par dfaut.
+.TP 
+\fB\-\-old\fP
+Oblige \fBdpkg\-deb\fP  construire une archive avec l'\ ancien\  format. Ce
+format, moins facilement compris par les outils non\-Debian, est maintenant
+dpass. On l'utilise seulement quand on construit des paquets qui doivent
+tre analyss 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\ .
+.TP 
+\fB\-\-nocheck\fP
+Empche les vrifications normales de \fBdpkg\-deb \-\-build\fP quant au contenu
+propos d'une archive. De cette faon, on peut construire n'importe quelle
+archive, aussi dfectueuse soit\-elle.
+.TP 
+\fB\-v\fP, \fB\-\-verbose\fP
+Enables verbose output. This currently only affects \fB\-\-extract\fP making it
+behave like \fB\-\-vextract\fP.
+.TP 
+\fB\-D\fP, \fB\-\-debug\fP
+Permet les messages de dbogage. Ce n'est pas trs intressant.
+.
+.SH ENVIRONNEMENT
+.TP 
+\fBTMPDIR\fP
+Si cette option est utilise, \fBdpkg\fP l'utilisera comme rpertoire pour
+crer les fichiers et rpertoire temporaires.
+.
+.SH BOGUES
+\fBdpkg\-deb \-I\fP \fIpaquet1\fP\fB.deb\fP \fIpaquet2\fP\fB.deb\fP se trompe.
+
+Il n'existe pas d'authentification des fichiers \fB.deb\fP. Il n'existe mme
+pas de systme de somme de contrle immdiat. Les outils de haut niveau
+comme APT grent l'authentification des paquets \fB.deb\fP rcuprs depuis un
+dpt donn et la plupart des paquets fournissent dsormais une comme de
+contrle MD5 cre par debian/rules. Cependant, ceci n'est pas directement
+gr par les outils de plus bas niveau.
+
+N'essayez pas d'installer un logiciel avec \fBdpkg\-deb\ !\fP Vous devez utiliser
+\fBdpkg\fP pour tre sr que tous ses fichiers sont correctement mis en place,
+que les scripts du paquet sont excuts et que son contenu et son tat sont
+enregistrs.
+.
+.SH "VOIR AUSSI"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\fP(1), \fBdselect\fP(1).
+.
+.SH AUTEUR
+Copyright \(co 1995\-1996 Ian Jackson
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-distaddfile.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-distaddfile.1
--- dpkg/man/fr/dpkg-distaddfile.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-distaddfile.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,54 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-distaddfile 1 07\-04\-2011 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-distaddfile \- Ajouter une entre au fichier debian/files.
+.
+.SH SYNOPSIS
+\fBdpkg\-distaddfile\fP [\fIoption\fP...]\fI filename section priority\fP
+.
+.SH DESCRIPTION
+\fBdpkg\-distaddfile\fP ajoute une entre pour un fichier dans \fBdebian/files\fP.
+
+Il prend trois arguments sans option,  savoir le nom du fichier, la section
+et la priorit, pour le fichier \fB.changes\fP.
+
+Le nom du fichier sera indiqu relativement au rpertoire dans lequel
+\fBdpkg\-genchanges\fP s'attend  trouver les fichiers, habituellement \fB..\fP,
+plutt que relativement au rpertoire dans lequel est excut
+\fBdpkg\-distaddfile.\fP
+.
+.SH OPTIONS
+.TP 
+\fB\-f\fP\fIfichier/liste\-des\-fichiers\fP
+Lit ou crit la liste des fichiers qui doivent tre envoys vers l'archive
+dans ce fichier plutt que dans le fichier \fBdebian/files\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH FICHIERS
+.TP 
+\fBdebian/files\fP
+La liste des fichiers crs qui seront installs sur le
+serveur. \fBdpkg\-distaddfile\fP peut tre utilis pour ajouter des fichiers
+supplmentaires.
+.
+.SH AUTEURS
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-divert.8 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-divert.8
--- dpkg/man/fr/dpkg-divert.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-divert.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,150 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-divert 8 2011\-08\-14 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-divert \- remplacer la version d'un fichier contenu dans un paquet.
+.
+.SH SYNOPSIS
+\fBdpkg\-divert\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH DESCRIPTION
+\fBdpkg\-divert\fP sert  crer et  mettre  jour la liste des dtournements.
+.PP
+Le \ dtournement\  de fichier est un moyen d'obliger \fBdpkg\fP(1)  installer
+un fichier non pas dans l'emplacement prvu mais dans un autre. Les scripts
+des paquets Debian se servent de la dviation pour dplacer les fichiers qui
+crent des conflits. Les administrateurs s'en servent, lors de
+l'installation d'une version plus rcente 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 prservs par
+dpkg.
+.sp
+.SH COMMANDES
+.TP 
+[\fB\-\-add\fP] \fIfichier\fP
+Ajouter un dtournement pour le \fIfichier\fP.
+.TP 
+\fB\-\-remove\fP\fI fichier\fP
+Supprimer un dtournement pour le \fIfichier\fP.
+.TP 
+\fB\-\-list\fP \fIexp\-reg\fP
+Lister les dtournements qui correspondent  \fIexp\-reg\fP.
+.TP 
+\fB\-\-listpackage\fP\fI fichier\fP
+Afficher le nom du paquet qui drive (\ divert\ ) \fIfichier\fP. Affiche LOCAL
+si \fIfichier\fP est driv localement et n'affiche rien si \fIfichier\fP n'est
+pas driv.
+.TP 
+\fB\-\-truename\fP\fI fichier\fP
+Afficher le vrai nom d'un fichier dtourn.
+.
+.SH OPTIONS
+.TP 
+\fB\-\-admindir\fP\fI rpertoire\fP
+Dfinir le rpertoire de donnes de Dpkg comme \fIrpertoire\fP (par dfaut
+c'est \fI/var/lib/dpkg\fP).
+.TP 
+\fB\-\-divert\fP\fI dtourner\-dans\fP
+\fIdtourner\-dans\fP est l'emplacement vers lequel les versions de \fIfichier\fP,
+tel qu'il est donn par d'autres paquets, seront dtournes.
+.TP 
+\fB\-\-local\fP
+Indique que toutes les versions de ce fichier sont dtournes. Cela signifie
+qu'il n'y a pas d'exception et quel que soit le paquet install, ce fichier
+sera dtourn. Un administrateur peut par exemple installer une version
+modifie localement.
+.TP 
+\fB\-\-package\fP\fI paquet\fP
+\fIpaquet\fP est le nom du paquet dont la copie de \fIfichier\fP ne sera pas
+dtourne. Autrement dit, \fIfichier\fP sera dtourn sauf s'il appartient 
+\fIpaquet\fP.
+.TP 
+\fB\-\-quiet\fP
+Mode silencieux, pas de bavardage.
+.TP 
+\fB\-\-rename\fP
+Met en fait le fichier de ct. Quand le fichier de destination existe,
+\fBdpkg\-divert\fP interrompt l'opration.
+.TP 
+\fB\-\-test\fP
+Mode de test, ne rien modifier rellement, seulement montrer.
+.TP 
+\fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH NOTES
+When adding, default is \fB\-\-local\fP and \fB\-\-divert\fP
+\fIoriginal\fP\fB.distrib\fP. When removing, \fB\-\-package\fP or \fB\-\-local\fP and
+\fB\-\-divert\fP must match if specified.
+
+On ne peut pas dtourner des rpertoires avec \fBdpkg\-divert\fP.
+
+Il faut faire attention quand une bibliothque partage est
+dtourne. \fBldconfig\fP(8) cre un lien symbolique  partir du champ
+DT_SONAME embarqu dans la bibliothque. ldconfig ne connat pas les
+dtournements (seul dpkg le fait), et si une bibliothque dtourne possde
+le mme SONAME que la bibliothque non dtourne, le lien symbolique peut
+pointer en fin de compte sur la bibliothque dtourne.
+.
+.SH EXEMPLES
+Pour dtourner toutes les copies de \fI/usr/bin/example\fP vers
+\fI/usr/bin/example.foo\fP, c'est\-\-dire demander aux paquets qui fournissent
+\fI/usr/bin/example\fP de l'installer dans \fI/usr/bin/example.foo\fP, en
+effectuant le changement de nom si ncessaire\ :
+.HP
+dpkg\-divert \-\-divert /usr/bin/example.foo \-\-rename /usr/bin/example
+.PP
+Pour supprimer ce dtournement\ :
+.HP
+dpkg\-divert \-\-rename \-\-remove /usr/bin/example
+
+.PP
+Pour dtourner un paquet qui veut installer \fI/usr/bin/example\fP dans
+\fI/usr/bin/example.foo\fP, sauf votre propre paquet \fIwibble\fP\ :
+.HP
+dpkg\-divert \-\-package wibble \-\-divert /usr/bin/example.foo \-\-rename
+/usr/bin/example
+.PP
+Pour supprimer ce dtournement\ :
+.HP
+dpkg\-divert \-\-package wibble \-\-rename \-\-remove /usr/bin/example
+.
+.SH ENVIRONNEMENT
+.TP 
+\fBDPKG_ADMINDIR\fP
+If set and the \fB\-\-admindir\fP option has not been specified, it will be used
+as the dpkg data directory.
+.TP 
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP
+If set and the \fB\-\-local\fP and \fB\-\-package\fP options have not been specified,
+\fBdpkg\-divert\fP will use it as the package name.
+.
+.SH FICHIERS
+.TP 
+\fI/var/lib/dpkg/diversions\fP
+Ce fichier contient la liste des dtournements en oeuvre sur le systme. Il
+se trouve dans le rpertoire d'administration de dpkg, avec d'autres
+fichiers importants comme \ status\  ou \ available\ .
+.br
+Note\ : \fBdpkg\-divert\fP prserve l'ancienne copie de ce fichier, avec
+l'extension \ \-old\ , avant de la remplacer par la nouvelle.
+.
+.SH "VOIR AUSSI"
+\fBdpkg\fP(1).
+.
+.SH AUTEUR
+Copyright \(co 1995 Ian Jackson
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-genchanges.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-genchanges.1
--- dpkg/man/fr/dpkg-genchanges.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-genchanges.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,140 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-genchanges 1 2011\-08\-14 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-genchanges \- Crer des fichiers \ .changes\ .
+.
+.SH SYNOPSIS
+\fBdpkg\-genchanges\fP [\fIoption\fP...]
+.br
+.
+.SH DESCRIPTION
+\fBdpkg\-genchanges\fP lit les informations  la fois dans une arborescence
+debian dpaquete et dj construite et sur les fichiers qui ont t crs\ ;
+puis il cre un fichier de contrle pour la mise en place dans l'archive
+Debian (c'est le fichier \fB.changes\fP).
+.
+.SH OPTIONS
+.TP 
+\fB\-b\fP, \fB\-B\fP, \fB\-A\fP
+Prcise que l'on veut uniquement une construction du binaire (les fichiers
+sources ne seront pas inclus). Il n'y a pas de distinction entre \fB\-b\fP,
+\fB\-B\fP et \fB\-A\fP\ ; le fichier produit \fB.changes\fP reprendra tous les fichiers
+crs par les cibles \fBbinary\-*\fP du paquet en cours de construction..
+.TP 
+\fB\-S\fP
+Ne construit que le paquet source (aucun paquet binaire ne sera construit).
+.PP
+Les options \fB\-s\fP\fIx\fP contrlent si l'archive source d'origine est incluse
+dans l'installation produite si un paquet source est cr (cad. que les
+options \fB\-b\fP ou \fB\-B\fP n'ont pas t utilises).
+.TP 
+\fB\-si\fP
+Par dfaut, ou quand l'option est indique, les sources d'origine sont
+incluses uniquement si le numro de version majeur (c..d. la version sans
+les parties epoch et \ rvision Debian\ ) diffre de la version prcdente
+indique dans le fichier de changelog.
+.TP 
+\fB\-sa\fP
+Force l'inclusion des sources d'origine.
+.TP 
+\fB\-sd\fP
+Force l'exclusion des sources d'origine et inclut seulement le \ diff\ .
+.fi
+.TP 
+\fB\-v\fP\fIversion\fP
+Force l'utilisation des informations contenues dans le fichier \ changelog\ 
+et qui concernent toutes les versions strictement plus rcentes que
+\fIversion\fP.
+.TP 
+\fB\-C\fP\fIdescription\-des\-changements\fP
+Lit la description des changements dans le fichier
+\fIdescription\-des\-changements\fP plutt que dans le fichier \ changelog\  de
+l'arborescence source.
+.TP 
+\fB\-m\fP\fIadresse\-du\-responsable\fP
+Utilise \fIadresse\-du\-responsable\fP comme nom et adresse lectronique du
+responsable de paquet plutt que d'utiliser les informations contenues dans
+le fichier \ control\  de l'arborescence source.
+.TP 
+\fB\-e\fP\fIadresse\-du\-responsable\fP
+Utilise \fIadresse\-du\-responsable\fP comme nom et adresse lectronique du
+responsable de paquet pour cette mise en place, plutt que d'utiliser les
+informations contenues dans le fichier \ changelog\  de l'arborescence
+source.
+.TP 
+\fB\-V\fP\fInom\fP\fB=\fP\fIvaleur\fP
+Fixe la valeur d'une variable de substitution. Consultez \fBdeb\-substvars\fP(5)
+pour une discussion sur la valeur de substitution.
+.TP 
+\fB\-T\fP\fIfichier/substvars\fP
+Lecture des variables de substitution depuis \fIsubstvarsfile\fP\ ; la valeur
+par dfaut est \fBdebian/substvars\fP. Aucune substitution de variable n'est
+faite sur les champs de sorties, cependant la variable spciale \fIFormat\fP
+remplacera le champs qui porte le mme nom. Cette option peut tre utilise
+plusieurs fois pour lire les variables de substitution depuis plusieurs
+fichiers.
+
+.TP 
+\fB\-D\fP\fIchamp\fP\fB=\fP\fIvaleur\fP
+Remplace ou ajoute en sortie un champ dans le fichier de contrle.
+.TP 
+\fB\-U\fP\fIchamp\fP
+Supprime en sortie un champ dans le fichier de contrle.
+.TP 
+\fB\-c\fP\fIfichier/control\fP
+Indique le principal fichier de contrle des sources o trouver des
+renseignements. Par dfaut, c'est le fichier \fBdebian/control\fP.
+.TP 
+\fB\-l\fP\fIfichier/changelog\fP
+Indique le fichier d'enregistrement des changements o trouver des
+renseignements. Par dfaut, c'est le fichier \fBdebian/changelog\fP.
+.TP 
+\fB\-f\fP\fIfichier/liste\-des\-fichiers\fP
+Lit ou crit la liste des fichiers qui doivent tre envoys vers l'archive
+dans ce fichier plutt que dans le fichier \fBdebian/files\fP.
+.TP 
+\fB\-F\fP\fIformat\-du\-changelog\fP
+Donne le format du fichier changelog. Par dfaut, c'est une ligne spciale,
+prs de la fin du fichier, qui l'indique\ ; sinon, on utilise le format
+classique \fBdebian\fP.
+.TP 
+\fB\-u\fP\fIrpertoire\-des\-fichiers\-\-installer\fP
+Cherche les fichiers  installer dans \fIrpertoire\-des\-fichiers\-\-installer\fP
+plutt que dans \fB..\fP (\fBdpkg\-genchanges\fP doit trouver ces fichiers de
+manire  mettre leurs tailles et leurs sommes de contrle dans le fichier
+\&\fB.changes.)\fP
+.TP 
+\fB\-q\fP
+\fBdpkg\-genchanges\fP 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. \fB\-q\fP supprime ces messages.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH FICHIERS
+.TP 
+\fBdebian/files\fP
+La liste des fichiers crs qui seront installs sur le
+serveur. \fBdpkg\-genchanges\fP lit dans ce fichier les donnes ncessaires  la
+cration du fichier \fB.changes\fP.
+.
+.SH AUTEURS
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-gencontrol.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-gencontrol.1
--- dpkg/man/fr/dpkg-gencontrol.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-gencontrol.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,139 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-gencontrol 1 2011\-08\-14 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-gencontrol \- Crer des fichiers de contrle Debian.
+.
+.SH SYNOPSIS
+\fBdpkg\-gencontrol\fP [\fIoption\fP...]
+.
+.SH DESCRIPTION
+\fBdpkg\-gencontrol\fP lit les informations contenues dans une arborescence
+Debian dpaquete et cre le fichier \ control\  d'un paquet binaire (par
+dfaut, c'est le fichier debian/tmp/DEBIAN/control)\ ; durant cette action il
+y a simplification des champs de relations.
+.sp
+\fIPre\-Depends\fP, \fIDepends\fP, \fIRecommends\fP et \fISuggests\fP sont simplifis
+dans cet ordre supprimer les dpendances qui sont connues pour tre vrifi
+par la plus forte dpendance dj traite. Sont aussi supprimes toutes les
+auto\-dpendances (dans les faits, cela supprime les dpendances qui sont
+dj valides par la version du paquet dj install). Logiquement, il
+conserve les correspondances entre plusieurs dpendances dans le mme
+paquet. L'ordre des dpendances est conserv du mieux possible\ : si une
+dpendance doit tre supprime  cause d'une autre dpendance qui se trouve
+dans un champs suivant, la dpendance remplaante prendra la place de celle
+limine.
+.sp
+Les autre champs (\fIEnhances\fP, \fIConflicts\fP, \fIBreaks\fP, \fIReplaces\fP et
+\fIProvides\fP) sont galement simplifis individuellement par l'analyse des
+diffrentes dpendances lorsque un paquet est indiqu plusieurs fois dans le
+champ.
+.sp
+\fBdpkg\-gencontrol\fP ajoute aussi une entre pour un paquet binaire dans
+\fBdebian/files\fP.
+.
+.SH OPTIONS
+.TP 
+\fB\-v\fP\fIversion\fP
+Fixe le numro de version du paquet binaire qui sera cr.
+.TP 
+\fB\-V\fP\fInom\fP\fB=\fP\fIvaleur\fP
+Fixe la valeur d'une variable de substitution. Consultez \fBdeb\-substvars\fP(5)
+pour une discussion sur la valeur de substitution.
+.TP 
+\fB\-T\fP\fIfichier/substvars\fP
+Lecture des variables de substitution depuis \fIsubstvarsfile\fP\ ; la valeur
+par dfaut est \fBdebian/substvars\fP. Cette option peut tre utilise
+plusieurs fois pour lire les variables de substitution depuis plusieurs
+fichiers.
+.TP 
+\fB\-D\fP\fIchamp\fP\fB=\fP\fIvaleur\fP
+Remplace ou ajoute en sortie un champ dans le fichier de contrle.
+.TP 
+\fB\-U\fP\fIchamp\fP
+Supprime en sortie un champ dans le fichier de contrle.
+.TP 
+\fB\-c\fP\fIfichier/control\fP
+Indique le principal fichier de contrle des sources o trouver des
+renseignements. Par dfaut, c'est le fichier \fBdebian/control\fP.
+.TP 
+\fB\-l\fP\fIfichier/changelog\fP
+Indique le fichier d'enregistrement des changements o trouver des
+renseignements. Par dfaut, c'est le fichier \fBdebian/changelog\fP.
+.TP 
+\fB\-f\fP\fIfichier/liste\-des\-fichiers\fP
+Lit ou crit la liste des fichiers qui doivent tre envoys vers l'archive
+dans ce fichier plutt que dans le fichier \fBdebian/files\fP.
+.TP 
+\fB\-F\fP\fIformat\-du\-changelog\fP
+Donne le format du fichier changelog. Par dfaut, c'est une ligne spciale,
+prs de la fin du fichier, qui l'indique\ ; sinon, on utilise le format
+classique \fBdebian\fP.
+.TP 
+\fB\-p\fP\fIpaquet\fP
+Cette option produit les informations concernant le paquet binaire
+\fIpaquet\fP.Si le fichier de contrle des sources liste un seul paquet
+binaire, on peut omettre cette option\ ; sinon il est indispensable
+d'indiquer le paquet pour lequel on veut produire les informations.
+.TP 
+\fB\-n\fP\fInom\-de\-fichier\fP
+Le nom du paquet est \fInom\-de\-fichier\fP au lieu de l'habituel\ :
+paquet_version_arch.deb.
+.TP 
+\fB\-is\fP, \fB\-ip\fP, \fB\-isp\fP
+Ces options, conserves pour compatibilit avec les anciennes versions de
+dpkg\-dev, sont maintenant dconseilles. Elles servaient  dire 
+dpkg\-gencontrol d'inclure les champs \ Section\  et \ Priority\  dans le
+fichier \ control\ . C'est maintenant le comportement par dfaut. Si vous
+voulez l'ancien comportement, vous pouvez utiliser l'option \fB\-U\fP pour
+supprimer ces champs du fichier \ control\ .
+.TP 
+\fB\-P\fP\fIrep\-de\-construction\-du\-paquet\fP
+Cette option indique  \fBdpkg\-source\fP que le rpertoire de construction du
+paquet est \fIrep\-de\-construction\-du\-paquet\fP au lieu de \fBdebian/tmp.\fP Cette
+valeur sert  trouver la valeur par dfaut de la variable de substitution
+\fBInstalled\-Size\fP et celle du champ correspondant dans le fichier de
+contrle (on utilise la commande \fBdu\fP)\ ; elle donne aussi l'emplacement par
+dfaut pour le fichier de sortie.
+.TP 
+\fB\-O\fP
+Affiche le fichier de contrle sur la sortie standard au lieu de
+\fBdebian/tmp/DEBIAN/control\fP (ou
+\fIrep\-de\-construction\-du\-paquet\fP\fB/DEBIAN/control\fP si l'option \fB\-P\fP a t
+utilise).
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH FICHIERS
+.TP 
+\fBdebian/control\fP
+Le principal fichier d'information sur les sources\ ; il donne des
+renseignements qui ne dpendent pas d'une version concernant le paquet
+source et les paquets binaires qui peuvent tre crs.
+.TP 
+\fBdebian/files\fP
+La liste des fichiers crs qui font partie de ceux qui seront installs sur
+le serveur. \fBdpkg\-gencontrol\fP ajoute les noms prsums des fichiers des
+paquets binaires  partir des fichiers \ control\  qu'il cre.
+.
+.SH AUTEURS
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2007\-2008 Rapha\[:e]l Hertzog
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-gensymbols.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-gensymbols.1
--- dpkg/man/fr/dpkg-gensymbols.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-gensymbols.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,524 @@
+.\" Author: Raphaël Hertzog
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-gensymbols 1 2011\-08\-14 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-gensymbols \- cration des fichiers de symboles (information destine
+aux dpendances de bibliothques partages)
+.
+.SH SYNOPSIS
+\fBdpkg\-gensymbols\fP [\fIoption\fP...]
+.
+.SH DESCRIPTION
+\fBdpkg\-gensymbols\fP analyse un rpertoire temporaire de construction (par
+dfaut debian/tmp), y recherche les bibliothques et cre un fichier
+\fIsymbols\fP file qui les dcrit. Si ce fichier n'est pas vide, il est
+install dans le sous\-rpertoire DEBIAN du rpertoire de construction afin
+de pouvoir tre inclus dans les informations de contrle du paquet.
+.P
+Lors de la cration de ces fichiers, il utilise en entre certains fichiers
+de symboles fournis par le responsable. Il recherche les fichiers suivants
+(en utilisant le premier trouv)\ :
+.IP \(bu 4
+debian/\fIpaquet\fP.symbols.\fIarch\fP
+.IP \(bu 4
+debian/symbols.\fIarch\fP
+.IP \(bu 4
+debian/\fIpaquet\fP.symbols
+.IP \(bu 4
+debian/symbols
+.P
+L'intrt principal de ces fichiers est de fournir la version minimale
+associe  chaque symbole fourni par les bibliothques. En gnral, cela
+correspond  la premire version du paquet qui a fourni ce symbole, mais
+cette valeur peut tre augmente manuellement par le responsable si
+l'interface binaire applicative (ABI) du symbole est tendue sans casser la
+compatibilit avec les versions prcdentes. La tenue  jour de ces fichiers
+est  la charge du responsable du paquet, avec l'aide de \fBdpkg\-gensymbols\fP
+\&.
+.P
+Quand les fichiers de symboles crs sont diffrents de ceux fournis par le
+responsable, \fBdpkg\-gensymbols\fP affichera les diffrences entre les deux
+fichiers. Si ces diffrences sont trop importantes, le programme peut mme
+se terminer en chec (le nombre de diffrences tolres peut tre rgl avec
+l'option \fB\-c\fP).
+.SH "TENUE  JOUR DES FICHIERS SYMBOLES"
+Les fichiers de symboles deviennent rellement utiles lorsqu'ils permettent
+de suivre l'volution du paquet sur plusieurs versions. En consquence, le
+responsable doit les mettre  jour chaque fois qu'un nouveau symbole est
+ajout afin que la version minimale associe corresponde  la ralit. Pour
+effectuer cette opration correctement, il est ncessaire d'utiliser le
+fichier de diffrence indiqu dans le journal de construction. Dans la
+plupart des cas, ce fichier de diffrences peut tre appliqu tel quel au
+fichier debian/\fIpaquet\fP.symbols. Cela tant, quelques adaptations sont
+gnralement ncessaires\ :\ il est par exemple recommand de retirer le
+numro de rvision Debian de la version minimale afin que les paquets
+rtro\-ports, de numro de version infrieur mais avec la mme version amont
+continuent  rpondre aux pr\-requis. Si le numro de rvision Debian ne
+peut vraiment pas tre retir car le nouveau symbole est la consquence
+d'une modification propre  Debian, il est suggr d'ajouter un suffixe
+\ ~\  au numro de version.
+.P
+Avant d'appliquer le correctif au fichier de symboles, le responsable doit
+contrler qu'il est correct. Les symboles publics sont supposs ne jamais
+disparatre et le correctif ne devrait donc qu'ajouter des lignes.
+.P
+Note that you can put comments in symbols files: any line with '#' as the
+first character is a comment except if it starts with '#include' (see
+section \fBUsing includes\fP). Lines starting with '#MISSING:' are special
+comments documenting symbols that have disappeared.
+.SS "Utilisation du remplacement de #PACKAGE#"
+.P
+Dans de rares cas, le nom de la bibliothque dpend de l'architecture. Afin
+d'viter de coder le nom du paquet en dur dans le fichier de symboles, il
+est possible d'utiliser le marqueur \fI#PACKAGE#\fP. Il sera remplac par le
+vrai nom du paquet lors de l'installation des fichiers de symboles.  la
+diffrence du marqueur \fI#MINVER#\fP, \fI#PACKAGE#\fP n'apparatra jamais dans le
+fichier de symboles d'un paquet binaire.
+.SS "Utilisation des tiquettes de symboles"
+.P
+L'tiquetage des symboles (\ symbol tagging\ ) est utile pour marquer des
+symboles qui sont particuliers d'une manire ou d'une autre. Tout symbole
+peut avoir un nombre quelconque d'tiquettes associes.  Bien que toutes les
+tiquettes soient analyses et conserves, seules certaines d'entre elles
+sont comprises par \fBdpkg\-gensymbols\fP et dclenchent un traitement
+spcifique des symboles. Veuillez consulter la sous\-section \fBtiquettes
+standard de symboles\fP pour une rfrence complte  propos de ces
+tiquettes.
+.P
+L'indication de l'tiquette vient juste avant le nom du symbole (sans
+espace). Elle commence toujours par une parenthse ouvrante \fB(\fP, se termine
+avec une parenthse fermante \fB)\fP et doit contenir au moins une
+tiquette. Les tiquettes multiples doivent tre spares par le caractre
+\fB|\fP. Chaque tiquette peut comporter optionnellement une valeur, spare du
+nom de l'tiquette par le caractre \fB=\fP. Les noms et valeurs des tiquettes
+sont des chanes quelconques qui ne doivent pas comporter les caractres
+\fB)\fP \fB|\fP et \fB=\fP. Les noms de symboles qui suivent une tiquette peuvent
+optionnellement tre mis entre guillemets avec les caractres \fB'\fP ou \fB"\fP
+afin d'y autoriser la prsence d'espaces. Cependant, si aucune tiquette
+n'est utilise, les guillemets sont alors traits comme une partie du nom du
+symbole, qui s'arrte alors au premier espace.
+.P
+ (tiq1=je suis marqu|tiquette avec espace)"symbole comportant des espaces"@Base 1.0
+ (optional)symbole_non_protg@Base 1.0 1
+ symbole_non_tiquet@Base 1.0
+.P
+Le premier symbole de cet exemple est appel \fIsymbole comportant des
+espaces\fP et utilise deux tiquettes\ :\ \fItiq1\fP avec la valeur \fIje suis
+marqu\fP et \fItiquette avec espace\fP sans valeur. Le deuxime symbole, appel
+\fIsymbole_non_protg\fP ne comporte que l'tiquette \fIoptional\fP. Le dernier
+symbole est un exemple de symbole normal sans tiquette.
+.P
+Comme les tiquettes de symboles sont une extension du format de
+\fIdeb\-symbols(5)\fP, elles ne peuvent apparatre que dans les fichiers de
+symboles des paquets source (ces fichiers peuvent ensuite tre vus comme des
+modles permettant de construire les fichiers de symboles inclus dans les
+paquets binaires). Lorsque \fBdpkg\-gensymbols\fP est lanc sans l'option \fI\-t\fP,
+il affiche les fichiers de symboles compatibles avec le format
+\fIdeb\-symbols(5)\fP\ :\ il traite entirement les symboles d'aprs les exigences
+des tiquettes standard et supprime les tiquettes dans sa sortie. Au
+contraire, dans le mode modle (\ template\ , option \fI\-t\fP), tous les
+symboles et leurs tiquettes (standard et inconnues) sont conservs dans la
+sortie et crits dans leur forme d'origine.
+.SS "tiquettes standard de symboles"
+.TP 
+\fBoptional\fP
+Un symbole marqu comme optionnel peut disparatre de la bibliothque  tout
+moment et ne provoquera pas l'chec de \fBdpkg\-gensymbols\fP. Cependant, les
+symboles optionnels disparus apparatront en permanence comme manquants dans
+le fichier de diffrences,  chaque nouvelle version du paquet. Ce
+comportement sert de rappel au responsable qu'un tel symbole doit tre
+supprim du fichier de symboles ou bien rajout  la bibliothque. Un
+telsymbole optionnel, prcdemment dclar comme manquant (\ MISSING\ ),
+rapparatre soudainement dans la version suivante en tant remis  l'tat
+existant (\ existing\ ), sans modification de sa version minimale.
+
+Cette tiquette est utile pour les symboles qui sont privs car leur
+disparition ne provoque pas de changement d'interface applicative (ABI). Par
+exemple, les plupart des modles d'instantiacion C++ sont dans cette
+catgorie. Comme toute autre tiquette, celle\-ci peut comproter une valeur
+arbitraire qui peut servir  indiquer pour quelle raison le symbole est
+optionnel.
+.TP 
+\fBarch=\fP\fIliste d'architectures\fP
+Cette tiquette permet de restreindre la liste des architectures avec
+lesquelles le symbole est cens exister. Lorsque la liste des ymboles est
+mise  jour avec ceux dcouverts dans la bibliothque, tous les symboles
+spcifiques d'architectures qui ne concernent pas l'architecture en cours
+sont ignors. Si un symbole propre  l'architecture en cours n'existe pas
+dans la bibliothque, les processus normaux pour des symboles manquants
+s'appliquent jusqu' ventuellement provoquer l'chec de
+\fBdpkg\-gensymbols\fP. D'un autre ct, si le symbole propre  une architecture
+est trouv alors qu'il n'est pas cens exister (parce que l'architecture
+courante n'est pas mentionne dans l'tiquette), il est rendu indpendant de
+l'architecture (l'tiquette d'architecture est abandonne et le symbole
+apparat dans le fichier de diffrences) mais non considr comme
+nouveau. (NdT\ : une aspirine peut tre ncessaire aprs la lecture de ce
+paragraphe)
+
+Dans le mode de fonctionnement par dfaut (pas en mode \ modle\ ), seuls
+les symboles spcifiques de certaines architectures qui correspondent 
+l'architecture courante sont crits dans le fichier de symboles. Au
+contraire, tous les symboles spcifiques d'architectures (y compris ceux des
+architectures diffrentes) seront crits dans le fichier de symboles, dans
+le mode \ modle\ .
+
+Le format de \fIarchitecture list\fP est le mme que le format utilis dans les
+champs \fIBuild\-Depends\fP des fichiers \fIdebian/control\fP ( l'exception des
+crochets d'inclusion []). Par exemple, le premier symbole de la liste qui
+suit sera pris en compte sur les architectures alpha, amd64, kfreebsd\-amd64
+et ia64, mais le second uniquement sur armel.
+
+ (arch=alpha amd64 kfreebsd\-amd64 ia64)un_symbole_spcifique_64bit@Base 1.0
+ (arch=!armel)un_symbole_inexistant_sur_armel@Base 1.0
+.TP 
+\fBignore\-blacklist\fP
+dpkg\-gensymbols comporte une liste interne de symboles ignors qui ne
+devraient pas apparatre dans les fichiers de symboles car ils sont en
+gnral uniquement des effets de bord de dtails de mise en oeuvre de la
+chane d'outils de construction. Si, pour une rison prcise, vous voulez
+vraiment inclure un de ces symboles dans le fichier, vous pouvez imposer
+qu'il soit ignor, avec \fBignore\-blacklist\fP. Cela peut tre utile pour
+certaines bibliothques de bas niveau telles que libgcc.
+.TP 
+\fBc++\fP
+Indique un motif de symbole \fIc++\fP. Voir la sous\-section \fBUtilisation de
+canevas de symboles\fP plus loin.
+.TP 
+\fBsymver\fP
+Indique un motif de symbole \fIsymver\fP (version de symbole).
+.TP 
+\fBregex\fP
+Indique un motif de symbole bas sur des \fIexpressions rationnelles\fP. Voir
+la sous\-section \fBUtilisation des motifs de symboles\fP plus loin.
+.SS "Utilisation des motifs de symboles"
+.P
+Au contraire d'une indication normale de symbole, un motif permet de couvrir
+des symboles multiples de la bibliothque. \fBdpkg\-gensymbols\fP essaie de
+faire correspondre chaque motif  chaque symbole qui n'est pas explicitement
+dfini dans le fichier de symboles. Ds qu'un motif est trouv qui
+corresponde au symbole, l'ensemble de ses tiquettes et proprits sont
+utiliss comme spcification de base du symbole. Si aucun des motifs ne
+correspond, le symbole sera considr comme nouveau.
+
+A motif est considr comme perdu si aucun symbole ne lui correspond dans la
+bibliothque. Par dfaut, cela provoquera un chec de \fBdpkg\-gensymbols\fP
+s'il est utilis avec l'option \fI\-c1\fP (ou une valeur plus
+leve). Cependant, si l'chec n'est pas souhait, le motif peut tre marqu
+comme optionnel avec l'tiquette \fIoptional\fP. Dans ce cas, si lemotif ne
+correspond  rien, il sera simplement mentionn dans le fichier de
+diffrences comme \fIMISSING\fP (manquant). De plus, comme pour tout autre
+symbole, le motif peut tre limit  des architectures donnes avec
+l'tiquette \fIarch\fP. Veuillez consulter la sous\-section \fBtiquettes
+standard de symboles\fP pour plus d'informations.
+
+Les motifs sont une extension du format de \fIdeb\-symbols(5)\fP en ce sens
+qu'ils ne sont valables que dans les modles de fichiers de
+symboles. Cependant, la partie comportant le nom de symbole est utilise
+comme une expression  faire correspondre  \fIname@version\fP du symbole
+rel. Afin de faire la distinction entre les diffrents types de motifs, un
+motif sera usuellement marqu avec une tiquette spciale.
+
+Actuellement, \fBdpkg\-gensymbols\fP gres trois type de base de motifs\ :
+.TP  3
+\fBc++\fP
+Ce motif est repr par l'tiquette \fIc++\fP. Il ne sera compar qu'aux
+symboles C++ avec leur nom de symbole complet (demangled) tel qu'affich
+avec l'utilitaire \fBc++filt\fP. Ce motif est trs pratique pour faire
+correspondre les symboles dont les noms raccourcis (mangled) peut diffrer
+selon les architectures bien que leurs noms complet restent les mmes. Un
+tel groupe de symboles sont les \fInon\-virtual thunks\fP pou rlesquels les
+dcalages (offsets) spcifiques d'architectures sont inclus dans leur nom
+court. Une manifestation  usuelle de ce cas est le destructeur virtuel qui,
+en \ diamon inheritance\  (NdT: intraduisible?) a besoin d'un symbole
+\ thunk\  (Ndt: ditto) non virtuel. Par exemple, mme si
+_ZThn8_N3NSB6ClassDD1Ev@Base sur une architecture 32bit est identique 
+_ZThn16_N3NSB6ClassDD1Ev@Base sur une architecture 64bit, les deux peuvent
+tre indiqus avec le mme motif \fIc++\fP\ :
+.RS
+.PP
+libdummy.so.1 libdummy1 #MINVER#
+ [...]
+ (c++)"non\-virtual thunk to NSB::ClassD::~ClassD()@Base" 1.0
+ [...]
+.P
+Le nom complet ci\-dessus peut tre obtenu avec la commande suivante\ :
+.PP
+ $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt
+.P
+Veuillez noter que, bien que le nom complet soit unique dans la bibliothque
+par dfinition, cela n'est pas forcment vrai pour le nom raccourci. Deux
+symboles rels diffrents peuvent avoir le mme nom raccourci. C'est par
+exemple le cas avec les symboles \ thunk\  non virtuels dans des
+configurations d'hritage complexes ou avec la plupart des constructeurs et
+destructeurs (puisque g++ cre usuellement deux symboles rels pour
+eux). Cependant, comme ces collisions se produisent au niveau de l'interface
+applicative binaire (ABI), elle ne devraient pas dgrader la qualit du
+fichier de symboles.
+.RE
+.TP 
+\fBsymver\fP
+Ce motif est indiqu par l'tiquette \fIsymver\fP. Les bibliothques bien
+gres utilisent des symboles versionns o chaque version correspond  la
+version amont  laquelle le symbole a t ajout. Si c'est le cas, il est
+possible d'utiliser un motif \fIsymver\fP pour faire correspondre chaque
+symbole associe  la version spcifique. Par exemple\ :
+.RS
+.PP
+libc.so.6 libc6 #MINVER#
+ (symver)GLIBC_2.0 2.0
+ [...]
+ (symver)GLIBC_2.7 2.7
+ access@GLIBC_2.0 2.2
+.PP
+Tous les symboles associs avec les versions GLIBC_2.0 et GLIBC_2.7
+conduiront respectivement  des versions minimales de 2.0 et 2.7, 
+l'exception du symbole access@GLIBC_2.0. Ce dernier amne  une dpendance
+minimale sur la version 2.2 de libc6 bien qu'il soit dans le scope de
+\ (symvar)GLIBC_2.0\ . Cela est d au fait que les symboles spcifiques
+prennent le pas sur les motifs.
+.P
+Veuillez noter que les anciens motifs avec caractres gnriques (indiqus
+sous la forme \ *@version\ ) dans le champ de nom de symbole sont toujours
+grs. La nouvelle syntaxe \ (symver|optional)version\  doit toutefois leur
+tre prfre. Par exemple, \ *@GLIBC_2.0 2.0\  devrait tre crit sous la
+forme \ (symver|optional)GLIBC_2.0 2.0\  si un comportement analogue est
+recherch.
+.RE
+.TP 
+\fBregex\fP
+Les motifs d'expressions rationnelles sont indiqus par l'tiquette
+\fIregex\fP. La correspondance se fait avec une expression rationnelle Perl sur
+le champ de nom de symbole. la correspondance est faite telle quelle et il
+ne faut donc pas oublier le caractre \fI^\fP, sinon la correspondance est
+faite sur n'importe quelle partie du symbole rel \fIname@version\fP. Par
+exemple\ :
+.RS
+.PP
+libdummy.so.1 libdummy1 #MINVER#
+ (regex)"^mystack_.*@Base$" 1.0
+ (regex|optional)"private" 1.0
+.P
+Les symboles tels que \ mystack_new@Base\ , \ mystack_push@Base\ ,
+\ mystack_pop@Base\ , etc. seront en correspondance avec le premier motif
+alors que, par exemple, \ ng_mystack_new@Base\  ne le sera pas. Le deuxime
+motif correspondra pour tous les symboles qui comportent la chane
+\ private\  dans leur nom et les correspondances hriteront de l'tiquette
+\fIoptional\fP depuis le motif.
+.RE
+.P
+Les motifs de base indiqus prcdemment peuvent tre combins au
+besoin. Dans ce cas, ils sont traits dans l'ordre o les tiquettes sont
+indiques. Par exemple, les deux motifs
+.PP
+ (c++|regex)"^NSA::ClassA::Private::privmethod\ed\e(int\e)@Base" 1.0
+ (regex|c++)N3NSA6ClassA7Private11privmethod\edEi@Base 1.0
+.P
+Seront en correspondance avec les symboles
+\ _ZN3NSA6ClassA7Private11privmethod1Ei@Base"\  et
+\ _ZN3NSA6ClassA7Private11privmethod2Ei@Base\ . Lors de la correspondance
+avec le premier motif, le symbole complet est d'abord dcod en tant que
+symbole C++, puis compr  l'expression rationnelle. D'un autre ct, lors
+de la correspondance avec le deuxime motif, l'expression rationnelle est
+compare au nom de symbole brut, puis le symbole est test en tant que
+symbole C++ en tentant de le dcoder. L'chec de n'importe quel motif de
+base provoquera l'chec de l'ensemble du motif. Ainsi, par exemple,
+\ __N3NSA6ClassA7Private11privmethod\edEi@Base\  ne correspondra  aucun des
+motifs car ce n'est pas un symbole C++ valable (Ndt\ :\ j'ai l'impression de
+traduire du Klingon\ !).
+.P
+En gnral, les motifs sont diviss en deux groupes\ :\ les alias (\fIc++\fP et
+\fIsymver\fP de base) et les motifs gnriques (\fIregex\fP et toutes les
+combinaisons de motifs de base multiples). La correspondance de motifs bass
+sur des alias est rapide (0(1)) alors que les motifs gnriques sont 0(N) (N
+tant le nombre de motifs gnriques) pour chaque symbole. En consquence,
+il est dconseill d'abuser des motifs gnriques.
+.P
+Lorsque plusieurs motifs correspondent pour le mme symbole rel, les aliaas
+(d'abord \fIc++\fP, puis \fIsymver\fP) sont privilgis par rapport aux motifs
+gnriques. Ceux\-ci sont essays dans l'ordre o ils apparaissent dans le
+modle de fichier de symbole, en s'arrtant  la premire
+correspondance. Veuillez noter, cependant, que la modification manuelle de
+l'ordre des entres de fichiers n'est pas recommande car \fBdpkg\-gensymbols\fP
+cre des fichiers de diffrences d'aprs l'ordre alphabtico\-numrique de
+leur nom.
+.SS "Utilisation des inclusions"
+.P
+Lorsqu'un jeu de symboles exports varie selon les architectures, il est
+souvent peu efficace d'utiliser un seul fichier de symboles.  Pour couvrir
+ces cas, une directive d'inclusion peut devenir utile dans certains cas.
+.IP \(bu 4
+Il est possible de factoriser la partie commune dans un fichier externe
+donn et l'inclure dans le fichier \fIpaquet\fP.symbols.\fIarch\fP avec une
+directive \ include\  utilise de la manire suivante\ :
+
+#include "\fIpaquets\fP.symbols.common"
+.IP \(bu
+La directive d'inclusion peut galement tre tiquete comme tout autre
+symbole\ :
+
+(tag|..|tagN)#include "file\-to\-include"
+
+As a result, all symbols included from \fIfile\-to\-include\fP will be considered
+to be tagged with \fItag\fP .. \fItagN\fP by default. You can use this feature to
+create a common \fIpackage\fP.symbols file which includes architecture specific
+symbol files:
+
+  symbole_commun1@Base 1.0
+ (arch=amd64 ia64 alpha)#include "package.symbols.64bit"
+ (arch=!amd64 !ia64 !alpha)#include "package.symbols.32bit"
+  symbole_commun2@Base 1.0
+.P
+Les fichiers de symboles sont lus ligne par ligne et les directives
+d'inclusion sont traites ds qu'elles sont trouves. En consquence, le
+contenu du fichier d'inclusion peut remplacer une dfinition qui prcde
+l'inclusion at que ce qui suit l'inclusion peut remplacer une dfinition
+qu'elle ajoutait. Tout symbole (ou mme une autre directive d'inclusion)
+dans le fichier inclus pet dfinir des tiquettes supplmentaires ou
+remplacer les valeurs d'tiquettes hrites, dans sa dfinition
+d'tiquettes.. Cependant, pour un symbole donn, il n'existe pas de mthode
+permettant de remplacer une de ses tiquettes hrites.
+.P
+Un fichier inclus peut reprendre la ligne d'en\-tte qui contient le
+\ SONAME\  de la bibliothque. Dans ce cas, cela remplace toute ligne
+d'en\-tte prcdente. Il est cependant dconseill de dupliquer les lignes
+d'en\-tte. Une faon de le faire est la mthode suivante\ :
+.PP
+#include "libmachin1.symbols.common"
+ symboles_specifique_architecture@Base 1.0
+.SS "Bonnes pratiques de gestion des bibliothques"
+.P
+une bibliothque bien maintenue offre les possibilits suivantes\ :
+.IP \(bu 4
+son interface de programmation (API) est stable (les symboles publics ne
+sont jamais supprims et les changement ne concernant que des ajouts de
+nouveaux symboles publics) et les modifications provoquant un
+incompatibilit doivent tre combins avec un changement de SONAME\ ;
+.IP \(bu 4
+idalement, elle utilise le versionnement des symboles pour garantir la
+stabilit de interface applicative binaire (ABI) malgr ses modifications
+internes et l'extension de son API\ ;
+.IP \(bu 4
+elle n'exporte pas les symboles privs (afin de contourner cela, de tels
+symboles peuvent tre tiquets comme optionnels)
+.P
+En maintenant le fichier de symboles, il est facile d'en voir apparatre et
+disparatre. Cependant, il est plus difficile de contrler la prsence
+d'ventuelles modifications d'API ou ABI. En consquence, le mainteneur doit
+contrler soigneusement le journal des modifications amont,  la recherche
+de cas o une saine gestion des bibliothque put avoir t omise. Si des
+problmes potentiels sont dcouverts, l'auteur amont doit tre averti(e) car
+une correction en amont est meilleure qu'un travail spcifique au paquet
+Debian.
+.SH OPTIONS
+.TP 
+\fB\-P\fP\fIrpertoire\-construction\-paquet\fP
+Analyse de \fIrpertoire\-construction\-paquet\fP, plutt que debian/tmp.
+.TP 
+\fB\-p\fP\fIpaquet\fP
+Dfinit le nom du paquet. Requis si plus d'un paquet binaire est indiqu
+dans debian/control (ou s'il n'y a pas de fichier debian/control).
+.TP 
+\fB\-v\fP\fIversion\fP
+Dfinit la version du paquet. La valeur par dfaut est la version extraite
+de debian/changelog. Ce paramtre est requis si le programme est lanc en
+dehors de l'arborescence source d'un paquet.
+.TP 
+\fB\-e\fP\fIfichier\-bibliothque\fP
+N'analyse que les bibliothques explicitement mentionnes au lieu de
+rechercher toutes les bibliothques publiques. Une expression rationnelle
+peut tre utilise dans \fIfichier\-bibliothque\fP pour correspondre 
+plusieurs bibliothques avec un seul paramtre (dans le cas contraire,
+plusieurs paramtres \fB\-e\fP sont ncessaires).
+.TP 
+\fB\-I\fP\fInom\-de\-fichier\fP
+Utilise \fInom\-de\-fichier\fP comme fichier de rfrence pour crer le fichier
+de symboles  intgrer dans le paquet lui\-mme.
+.TP 
+\fB\-O\fP
+Affiche le fichier de symboles cr sur la sortie standard au lieu de
+l'crire dans l'arborescence source du paquet.
+.TP  
+\fB\-O\fP\fInom\-de\-fichier\fP
+Enregistre le fichier de symboles cr avec le nom \fInom\-de\-fichier\fP. Si
+\fInom\-de\-fichier\fP existe dj, son contenu sera utilis comme base pour le
+fichier cr. Cette fonctionnalit permet de mettre  jour le fichier de
+symboles pour qu'il corresponde  une nouvelle version amont de la
+bibliothque.
+.TP 
+\fB\-t\fP
+crit le fichier de symboles en mode modle plutt que dans un format
+compatible avec \fIdeb\-symbols(5)\fP. La diffrence majeure rside dans le fait
+que les noms de symboles et les tiquettes sont crits dans leur forme
+d'origine au lieu d'tre interprts, avec rduction des tiquettes en mode
+de compatibilit. De plus, certains symboles peuvent tre omis lors de
+l'criture d'un fichier \fIdeb\-symbols(5)\fP standard (selon les rgles de
+traitement des tiquettes) alors que tous les symboles sont crits lors de
+la cration d'un modle de fichier de symboles.
+.TP 
+\fB\-c\fP\fI[0\-4]\fP
+Dfinit les contrles  effectuer lors de la comparaison des symboles crs
+en utilisant le fichier de modle comme point de dpart. Le niveau par
+dfaut est 1. Plus le niveau est augment, plus le nombre de contrle
+effectus est important. Chaque niveau de contrle  comporte les contrles
+effectus pour les niveaux infrieurs. Le niveau 0 n'choue jamais. Le
+niveau 1 choue si certains symboles ont disparu. Le niveau 2 choue si de
+nouveaux symboles ont t ajouts. Le niveau 3 choue si certaines
+bibliothques ont disparu. Le niveau 4 choue si des bibliothques ont t
+ajoutes.
+
+Cette valeur peut tre remplace par la valeur de la variable
+d'environnement DPKG_GENSYMBOLS_CHECK_LEVEL.
+.TP 
+\fB\-q\fP
+Fonctionne en mode silencieux et ne cre jamais de fichier de diffrences
+entre le fichier de symboles cr et le fichier modle utilis comme point
+de dpart. N'affiche galement aucun avertissement  propos de bibliothques
+nouvelles ou disparues ou de symboles nouveaux ou disparus. Cette option ne
+dsactive que l'affichage informatif, mais pas les contrles eux\-mmes (voir
+l'option \fI\-c\fP).
+.TP 
+\fB\-a\fP\fIarch\fP
+Dfinit \fIarch\fP comme architecture lors du traitement des fichiers de
+symboles. Cette option permet de crer un fichier de symboles ou un fichier
+de diffrences pour n'importe quelle architecture,  condition que les
+fichiers binaires correspondants soient dj disponibles.
+.TP 
+\fB\-d\fP
+Active le mode verbeux. De nombreux messages sont affichs pour expliquer ce
+que \fBdpkg\-gensymbols\fP fait.
+.TP 
+\fB\-V\fP
+Active le mode verbeux. Le fichier de symboles cr contiendra les symbols
+dprcis sous forme de commentaires. De plus, en mode modle, les motifs de
+symboles seront suivis de commentaires affichant les symboles rels qui
+correspondent au motif.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH "VOIR AUSSI"
+\fBhttp://people.redhat.com/drepper/symbol\-versioning\fP
+.br
+\fBhttp://people.redhat.com/drepper/goodpractice.pdf\fP
+.br
+\fBhttp://people.redhat.com/drepper/dsohowto.pdf\fP
+.br
+\fBdeb\-symbols\fP(5), \fBdpkg\-shlibdeps\fP(1).
+.
+.SH AUTEURS
+Copyright \(co 2007\-2009 Rapha\[:e]l Hertzog
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-maintscript-helper.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-maintscript-helper.1
--- dpkg/man/fr/dpkg-maintscript-helper.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-maintscript-helper.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,160 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-maintscript\-helper 1 2011\-08\-14 "Projet Debian" "suite dpkg"
+.SH NOM
+dpkg\-maintscript\-helper \- contournement des limitations connues de dpkg dans
+les scripts du responsable
+.
+.SH SYNOPSIS
+\fBdpkg\-maintscript\-helper\fP \fIcommand\fP [\fIparameter\fP...] \fB\-\-\fP
+\fImaint\-script\-parameter\fP...
+.
+.SH "COMMANDES ET PARAMTRES"
+.P
+\fBrm_conffile\fP \fIfichier\-de\-configuration\fP [\fIdernire\-version\fP [\fIpaquet\fP]]
+.P
+\fBmv_conffile\fP \fIancien\-fichier\-de\-configuration\fP
+\fInouveau\-fichier\-de\-configuration\fP [\fIdernire\-version\fP [\fIpaquet\fP]]
+.
+.SH DESCRIPTION
+.P
+Ce programme est prvu pour tre excut dans les scripts du responsable
+afin de raliser certaines tches que dpkg ne peut pas (encore) prendre en
+charge directement  cause de limites de conception ou de limitations
+actuelles.
+.P
+Many of those tasks require coordinated actions from several maintainer
+scripts (\fBpreinst\fP, \fBpostinst\fP, \fBprerm\fP, \fBpostrm\fP). To avoid mistakes
+the same call simply needs to be put in all scripts and the program will
+automatically adapt its behaviour based on the environment variable
+\fBDPKG_MAINTSCRIPT_NAME\fP and on the maintainer scripts arguments that you
+have to forward after a double dash.
+.
+.SH "TCHES LIES AUX FICHIERS DE CONFIGURATION"
+.P
+Lors de la mise  jour d'un paquet, dpkg ne supprime pas automatiquement les
+fichiers de configuration (comportant des modifications locales  prserver)
+s'il n'est pas prsent dans la nouvelle version. Il existe deux raisons
+principales  cela. En premier lieu, le fichier de configuration peut avoir
+t supprim par accident, tre rintgr dans la version suivante et il
+peut tre ncessaire de retrouver les modifications locales. Ensuite,
+l'objectif est galement de permettre d'effectuer la transition depuis des
+fichiers de configuration grs par dpkg vers un fichier gr via les
+scripts du responsable, en gnral  l'aide d'un outil comme debconf ou ucf.
+.P
+Cela signifie que si un paquet a besoin de renommer ou supprimer un fichier
+de configuration, il doit le faire explicitement. L'objectif de
+\fBdpkg\-maintscript\-helper\fP est donc de fournir des mthodes de suppression
+ou renommage de fichiers de configuration via les scripts du responsable.
+.
+.SS "SUPPRESSION D'UN FICHIER DE CONFIGURATION"
+.P
+Si un fichier de configuration est compltement supprim, il doit tre
+effac du disque sauf si l'administrateur local l'a modifi. Les ventuelles
+modifications locales doivent tre conserves. Si la mise  jour du paquet
+est interrompue, le fichier de configuration rendu obsolte ne doit pas
+avoir disparu.
+.P
+L'ensemble de ces pr\-requis est mis en oeuvre en utilisant les commandes
+shell suivantes dans les scripts \fBpreinst\fP, \fBpostinst\fP et \fBpostrm\fP\ :
+.P
+    dpkg\-maintscript\-helper rm_conffile \e
+        \fIfichier\-de\-configuration\fP \fIdernire\-version\fP \fIpaquet\fP \-\- "$@"
+.P
+\fIfichier\-de\-configuration\fP est le nom du fichier de configuration 
+supprimer. \fIdernire\-version\fP est la dernire version du paquet qui le
+fournissait (ou la dernire version du paquet qui ne prenait pas soin de
+supprimer le fichier de configuration obsolte si la suppression correcte
+n'a pas t immdiatement mise en oeuvre). Si \fIdernire\-version\fP est vide
+ou est omis, cette suppression sera tent pour toute mise  jour. \fIpaquet\fP
+est le nom du paquet. Ce paramtre est optionnel, la valeur par dfaut tant
+$DPKG_MAINTSCRIPT_PACKAGE (cette variable est positionne par dpkg sur le
+nom du paquet sur lequel il travaille). Tous les paramtres des scripts du
+responsable doivent tre redirigs au programme aprs \ \-\-\ .
+.P
+Dtails de la mise en oeuvre actuelle\ :\ dans le script \fBpreinst\fP, il est
+vrifi si le fichier de configuration a t modifi. Celui\-ci est alors
+renomm, soit en \fIfichier\-de\-configuration\fP\fB.dpkg\-remove\fP s'il n'a pas t
+modifi, soit en \fIfichier\-de\-configuration\fP\fB.dpkg\-backup\fP s'il l'a
+t. Dans le script \fBpostinst\fP, ce dernier fichier est ensuite renomm en
+\fIfichier\-de\-configuration\fP\fB.dpkg\-bak\fP et conserv pour rfrence puisqu'il
+contient des modifications locales, mais le premier est supprim. Si la mise
+ jour du paquet est interrompue, le script \fBpostrm\fP remet en place le
+fichier de configuration d'origine.  la purge du paquet, le script
+\fBpostrm\fP supprimera galement le fichier \fB.dpkg\-bak\fP qui avait t
+conserv jusque l.
+.
+.SS "RENOMMAGE D'UN FICHIER DE CONFIGURATION"
+.P
+Si un fichier de configuration est dplac  un autre endroit, il est
+ncessaire de garantir la prservation des modifications locales.  premire
+vue, cela peut sembler tre une simple modification dans le script
+\fBpreinst\fP, mais cela risque de rsultat dans une demande, par dpkg,
+d'approbation de modifications locales qui n'existent pas rellement.
+.P
+Un renommage lgant peut tre mis en oeuvre avec les extraits shell qui
+suivent, dans les scripts \fBpreinst\fP, \fBpostinst\fP et \fBpostrm\fP.
+.P
+    dpkg\-maintscript\-helper mv_conffile \e
+        \fIancien\-fichier\fP \fInouveau\-fichier\fP \fIdernire\-version\fP \fIpaquet\fP \-\- "$@"
+.P
+\fIancien\-fichier\fP et \fInouveau\-fichier\fP sont les deux noms successifs du
+fichier de configuration. \fIdernire\-version\fP est la dernire version du
+paquet qui contenait le fichier de configuration avec l'ancien nnom. Si
+\fIdernire\-version\fP est vide ou manquant, l'opration sera tente  chaque
+mise  jour (il est plus sr d'indiquer la bonne version afin qe l'opration
+ne soit tente qu'une fois). \fIpaquet\fP est le nom du paquet. Ce paramtre
+est optionnel, la valeur par dfaut tant $DPKG_MAINTSCRIPT_PACKAGE (cette
+variable est positionne par dpkg sur le nom du paquet sur lequel il
+travaille). Tous les paramtres des scripts du responsable doivent tre
+redirigs au programme aprs \ \-\-\ .
+.P
+Dtails de la mise en oeuvre actuelle\ :\ dans le script \fBpreinst\fP, il est
+vrifi si le fichier de configuration a t modifi. Celui\-ci est alors
+soit laiss en place s'il a t modifi, soit renomm en
+\fIancien\-fichier\fP\fB.dpkg\-remove\fP s'il ne l'a pas t. Lors de la
+configurations, le script \fBpostinst\fP supprime
+\fIancien\-fichier\fP\fB.dpkg\-remove\fP et renomme \fIancien\-fichier\fP and
+\fInouveau\-fichier\fP si \fIancien\-fichier\fP existe toujours Si la mise  jour ou
+l'installation sont interrompues, le script \fBpostrm\fP renomme
+\fIancien\-fichier\fP\fB.dpkg\-remove\fP en \fIancien\-fichier\fP si c'est
+indispensable.
+.
+.SH "INTGRATION DANS LES PAQUETS"
+.P
+Given that \fBdpkg\-maintscript\-helper\fP is used in the \fBpreinst\fP, using it
+unconditionally requires a pre\-dependency to ensure that the required
+version of dpkg has been unpacked before. The required version depends on
+the command used, for \fBrm_conffile\fP and \fBmv_conffile\fP it is 1.15.7.2:
+.P
+    \fBPre\-Depends:\fP dpkg (>= 1.15.7.2)
+.P
+Cependant, dans de nombreux cas, l'opration ralise par le programme n'est
+pas critique pour le paquet et au lieu d'utiliser une pr\-dpendance, il est
+possible de ne lancer le programme que si on a la certitude que la commande
+ncessaire est gre par la version actuellement installe de dpkg\ :
+.P
+    if dpkg\-maintscript\-helper supports \fIcommand\fP; then
+        dpkg\-maintscript\-helper \fIcommand\fP ...
+    fi
+.
+.SH AUTEURS
+Copyright \(co 2010 Rapha\[:e]l Hertzog
+.br
+Copyright \(co 2008 Joey Hess
+.br
+Copyright \(co 2007 Guillem Jover
+.br
+Copyright \(co 2005 Scott James Remnant
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-mergechangelogs.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-mergechangelogs.1
--- dpkg/man/fr/dpkg-mergechangelogs.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-mergechangelogs.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,83 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-mergechangelogs 1 2011\-08\-14 "Projet Debian" "suite dpkg"
+.SH NOM
+dpkg\-mergechangelogs \- fusion triple de fichiers debian/changelog
+.
+.SH SYNOPSIS
+\fBdpkg\-mergechangelogs\fP [\fIoption\fP...] \fIancien\fP \fInouveau\-a\fP \fInouveau\-b\fP
+[\fIsortie\fP]
+.
+.SH DESCRIPTION
+.P
+Ce programme utilise les 3 versions fournies de journal des modifications
+(\ changelog\ ) Debian pour crer un fichier de journalisation fusionn. Le
+rsultat est plac dans le fichier \fIsortie\fP ou affich sur la sortie
+standard si ce paramtre est omis.
+.P
+Chaque entre est identifie par son numro de version. Les entres ne sont
+pas censes entrer en conflit, mais sont simplement fusionnes dans le bon
+ordre (par numro de version dcroissant). Si l'option
+\fB\-\-merge\-prereleases\fP est utilise, la partie de numro de version qui suit
+le dernier caractre tilde est omise\ ;\ les versions 1.0\-1~exp1 et 1.0\-1exp5
+sont ainsi considres comme la mme entre.  Quand la mme version est
+mentionne dans \fInouveau\-a\fP et \fInouveau\-b\fP, une fusion triple ligne 
+ligne  standard est tente (sous rserve que le module Algorithm::Merge soit
+disponible \[em] il est fourni par le paquet libalgorithm\-merge\-perl
+\[em]. Dans le cas contraire, un conflit global est cr dans le contexte de
+cette entre.
+.
+.SH OPTIONS
+.TP 
+\fB\-\-merge\-prereleases\fP, \fB\-m\fP
+Omet la version qui suit le dernier caractre tilde dans les numros de
+versions, lors de la comparaison qui permet d'identifier si ceux entres
+sont les mmes ou pas.
+.sp
+Cette option utile lorsqu'on conserve la mme entre de journal mais que la
+version est incrmente rgulirement. Par exemple, cela permet d'utiliser
+les numros 2.3\-1~exp1, 2.3\-1~exp2, etc. jusqu' une publication officielle
+numrote 2.3\-1, toutes ces versions tant considres comme l'volution
+dans le temps de la mme version.
+.TP 
+\fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH LIMITATIONS
+.P
+Tout ce qui ne peut pas tre analys par Dpkg::Changelog est perdu lors de
+la fusion. Cela peut comprendre des lignes de mode vim, des commentaires qui
+ne sont pas censs se trouver l, etc.
+.
+.SH "INTGRATION AVEC GIT"
+.P
+Si vous souhaitez utiliser ce programme pour fusionner des journaux de
+modifications Debian dans un dpt git, vous devez tout d'abord enregistrer
+un nouveau pilote de fusion dan \fB.git/config\fP ou \fB~/.gitconfig\fP\ :
+.P
+ [merge "dpkg\-mergechangelogs"]
+     name = debian/changelog merge driver
+     driver = dpkg\-mergechangelogs \-m %O %A %B %A
+.P
+Vous devez ensuite configurer l'attribut de fusion pour le fichier
+debian/changelog, soit dans \fB.gitattributes\fP du dpt lui\-mme, soit dans
+\&\fB.git/info/attributes\fP\ :
+.P
+ debian/changelog merge=dpkg\-mergechangelogs
+.SH AUTEUR
+Copyright \(co 2009\-2010 Rapha\[:e]l Hertzog
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-name.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-name.1
--- dpkg/man/fr/dpkg-name.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-name.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,104 @@
+.\" This is an -*- nroff -*- source file.
+.\" dpkg-name and this manpage are Copyright © 1995,1996 by Erick Branderhorst.
+.\"
+.\" This is free software; see the GNU General Public Licence version 2
+.\" or later for copying conditions.  There is NO warranty.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-name 1 2011\-08\-14 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-name \- redonne aux paquets Debian leur nom complet
+.
+.SH SYNOPSIS
+\fBdpkg\-name\fP [\fIoption\fP...] [\fB\-\-\fP] \fIfile\fP...
+.
+.SH DESCRIPTION
+.PP
+This manual page documents the \fBdpkg\-name\fP program which provides an easy
+way to rename \fBDebian\fP packages into their full package names. A full
+package name consists of
+\fIpackage\fP\fB_\fP\fIversion\fP\fB_\fP\fIarchitecture\fP\fB.\fP\fIpackage\-type\fP as specified
+in the control file of the package. The \fIversion\fP part of the filename
+consists of the upstream version information optionally followed by a hyphen
+and the revision information. The \fIpackage\-type\fP part comes from that field
+if present or fallbacks to \fBdeb\fP.
+.
+.SH OPTIONS
+.TP 
+\fB\-a\fP, \fB\-\-no\-architecture\fP
+Le nom du fichier n'aura pas l'information sur l'architecture.
+.TP 
+\fB\-k\fP, \fB\-\-symlink\fP
+Faire un lien symbolique plutt qu'une cration de fichier.
+.TP 
+\fB\-o\fP, \fB\-\-overwrite\fP
+Remplace des fichiers existants s'ils ont le mme nom que le fichier de
+destination.
+.TP 
+\fB\-s\fP, \fB\-\-subdir\fP [\fIrep\fP]
+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\-\fIarchitecture\fP/\fIsection\fP'. 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
+`\fIsection\fP/binary\-\fIarchitecture\fP'. 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.
+.TP 
+\fB\-c\fP, \fB\-\-create\-dir\fP
+On peut utiliser cette option avec l'option \-s. Quand un rpertoire cible
+n'est pas trouv, il est cr automatiquement.  \fBUtilisez cette option avec
+soin.\fP
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-v\fP, \fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH EXEMPLES
+.TP 
+\fBdpkg\-name bar\-foo.deb\fP
+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 contrle de \ bar\-foo.deb\ .
+.TP 
+\fBfind /root/debian/ \-name \(aq*.deb\(aq | xargs \-n 1 dpkg\-name \-a\fP
+Cette commande redonne leur nom complet  tous les fichiers qui se trouvent
+dans le rpertoire /root/debian et ses sous\-rpertoires et qui possdent une
+extension \ deb\ , mais supprime l'information sur l'architecture.
+.TP 
+\fBfind \-name \(aq*.deb\(aq | xargs \-n 1 dpkg\-name \-a \-o \-s \-c\fP
+\fBNe faites pas a\ !\fP L'archive sera compltement gche par des paquets qui
+ne possdent pas d'informations sur la section. \fBNe faites pas a\ !\fP
+.TP 
+\fBdpkg \-\-build debian\-tmp && dpkg\-name \-o \-s .. debian\-tmp.deb\fP
+On peut se servir de cette commande lors de la construction d'un nouveau
+paquet.
+.
+.SH BOGUES
+Some packages don't follow the name structure
+\fIpackage\fP\fB_\fP\fIversion\fP\fB_\fP\fIarchitecture\fP\fB.deb\fP.  Packages renamed by
+dpkg\-name will follow this structure. Generally this will have no impact on
+how packages are installed by \fBdselect\fP(1)/\fBdpkg\fP(1), but other
+installation tools might depend on this naming structure.
+.
+.SH "VOIR AUSSI"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\fP(1), \fBdpkg\-deb\fP(1), \fBfind\fP(1),
+\fBxargs\fP(1).
+.
+.SH AUTEUR
+Copyright \(co 1995,1996 Erick Branderhorst
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-parsechangelog.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-parsechangelog.1
--- dpkg/man/fr/dpkg-parsechangelog.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-parsechangelog.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,137 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-parsechangelog 1 2011\-08\-14 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-parsechangelog \- Analyser un fichier changelog Debian.
+.
+.SH SYNOPSIS
+\fBdpkg\-parsechangelog\fP [\fIoption\fP...]
+.
+.SH DESCRIPTION
+\fBdpkg\-parsechangelog\fP lit et fait l'analyse du fichier \ changelog\  d'une
+arborescence source dpaquete et affiche les informations qu'il contient
+sur la sortie standard et sous une forme lisible par la machine.
+.
+.SH OPTIONS
+.TP 
+\fB\-l\fP\fIfichier/changelog\fP
+Indique le fichier d'enregistrement des changements o trouver des
+renseignements. Par dfaut, c'est le fichier \fBdebian/changelog\fP.
+.TP 
+\fB\-F\fP\fIformat\-du\-changelog\fP
+Donne le format du fichier changelog. Par dfaut, c'est une ligne spciale,
+prs de la fin du fichier, qui l'indique\ ; sinon, on utilise le format
+classique \fBdebian\fP.
+.TP 
+\fB\-L\fP\fIrep_lib\fP
+Spcifie un rpertoire supplmentaire pour la recherche de scripts
+d'analyse. Ce rpertoire est examin avant les rpertoires par dfaut qui
+sont \fB/usr/local/lib/dpkg/parsechangelog\fP et
+\fB/usr/lib/dpkg/parsechangelog\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.SS "Options de filtrage"
+Les options suivantes peuvent tre utilises pour influencer la sortie de
+l'analyseur du journal des modifications (\ changelog\ ), par exemple la
+gamme d'entres ou le format de sortie. Ils doivent tre grs par le script
+d'analyse en question. Voir aussi \fBCAVEATS\fP.
+.TP 
+\fB\-\-format\fP\fI outputformat\fP
+Rgle le format de sortie. Actuellement les valeurs gres sont \fIdpkg\fP et
+\fIrfc822\fP. \fIdpkg\fP est le format classique de sortie (avant que cette option
+n'existe) et l'option par dfaut. Il se compose d'un paragraphe dans le
+format du fichier de contrle Debian (voir \fBdeb\-control\fP(5)). Si plus d'une
+entre est demande, alors la plupart des champs sont tirs de la dernire
+entre, sauf s'il y a l'indication\ :
+.RS
+.TP 
+\fBSource:\fP\fI pkg\-name\fP
+.TP 
+\fBVersion:\fP\fI version\fP
+.TP 
+\fBDistribution:\fP\fI target\-distribution\fP
+.TP 
+\fBUrgency:\fP\fI urgency\fP
+La priorit la plus haute de celles indiques est utilise.
+.TP 
+\fBMaintainer:\fP\fI author\fP
+.TP 
+\fBDate:\fP\fI date\fP
+.TP 
+\fBCloses:\fP\fI bug\-number\fP
+Les champs \ Closes\  de toutes les entres incluses sont fusionns.
+.TP 
+\fBChanges:\fP\fI changelog\-entries\fP
+Le texte de toutes les entres de changelog est concatn. Pour faire de ce
+champ un champ de contrle Debian valide, les lignes multiples qui sont
+vides sont remplaces par un point \fB"."\fP et toutes les lignes sont
+intentes par un seul espace. Le contenu exact dpend du format du
+changelog.
+.RE
+.IP
+Il est possible d'avoir d'autres champs qui sont dfinis par l'utilisateur.
+.IP
+Le format \fBrfc822\fP utilise les mmes champs mais le rsultat est un
+paragraphe distinct pour chaque entre du changelog afin que toutes les
+mtadonnes de chaque entre soit prserves.
+.TP 
+\fB\-\-since\fP \fIversion\fP, \fB\-s\fP\fIversion\fP,\fB \-v\fP\fIversion\fP
+inclut tous les changements qui ont suivi la \fIversion\fP.
+.TP 
+\fB\-\-until\fP \fIversion\fP, \fB\-u\fP\fIversion\fP
+inclut tous les changements qui ont eu lieu avant la \fIversion\fP.
+.TP 
+\fB\-\-from\fP \fIversion\fP, \fB\-f\fP\fIversion\fP
+inclut tous les changements depuis la \fIversion\fP (incluse).
+.TP 
+\fB\-\-to\fP \fIversion\fP, \fB\-t\fP\fIversion\fP
+inclut tous les changements apports jusqu' la \fIversion\fP comprise.
+.TP 
+\fB\-\-count\fP \fInombre\fP, \fB\-c\fP\fInombre\fP, \fB\-n\fP\fInombre\fP
+inclut ce \fInombre\fP d'entres depuis le dbut (ou la fin si le \fInombre\fP est
+infrieur  0).
+.TP 
+\fB\-\-offset\fP \fInombre\fP, \fB\-o\fP\fInombre\fP
+modifie le point de dpart pour \ \-\-count\ ,  compter du dbut (ou la fin
+si le \fInombre\fP est infrieure  0).
+.TP 
+\fB\-\-all\fP
+inclut toutes les modifications. Note\ :\ d'autres options deviennent sans
+effet lorsque celle\-ci est utilise.
+.
+.SH CAVEATS
+Toutes les \fBOptions d'analyse\fP sauf \ \-v\  sont gres par \fBdpkg\fP avec la
+version 1.14.16 et suivantes. Les analyseurs tiers pour le format du
+changelog plus vieux que \fIdebian\fP ne grent peut\-tre pas toutes les
+options.
+.
+.SH FICHIERS
+.TP 
+\fBdebian/changelog\fP
+Le fichier d'enregistrement des modifications\ ; on s'en sert pour connatre
+les informations qui dpendent 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 numro de la version source
+lui\-mme.
+.
+.SH AUTEURS
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2007, 2008 Frank Lichtenheld
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-query.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-query.1
--- dpkg/man/fr/dpkg-query.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-query.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,231 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-query 1 2011\-08\-14 "Projet Debian" "suite dpkg"
+.SH NOM
+dpkg\-query \- Un outil pour interroger la base de donnes de dpkg
+.
+.SH SYNOPSIS
+\fBdpkg\-query\fP [\fIoption\fP...] \fIcommande\fP
+.
+.SH DESCRIPTION
+\fBdpkg\-query\fP est un outil pour afficher des informations sur les paquets
+connus par la base de donnes de \fBdpkg\fP.
+.
+.SH COMMANDES
+.TP 
+\fB\-l\fP, \fB\-\-list\fP [\fIpackage\-name\-pattern\fP...]
+Affiche les paquets correspondants au motif donn. Si aucun
+\fInom\-paquet\-motif\fP n'est indiqu, affiche tous les paquets de
+\fI/var/lib/dpkg/status\fP, sauf ceux qui ne sont pas installs (c'est  dire
+ceux qui ont t prcdemment purgs). Les mtacaractres ordinaires de
+l'interprteur de commandes sont autoriss dans \fInom\-paquet\-motif\fP. Il
+faudra sans doute mettre \fInom\-paquet\-motif\fP entre apostrophes pour viter
+l'expansion des noms de fichier par l'interprteur de commandes. Par
+exemple, tous les paquets dont le nom commence par \ libc6\  seront affichs
+par la commande\ :
+
+.nf
+\fBdpkg\-query \-l \(aqlibc6*\(aq\fP
+.fi
+
+Les trois premires colonnes affiches montrent dans l'ordre\ : l'action
+souhaite, l'tat du paquet et les erreurs.
+
+Action souhaite\ :
+.nf
+  u = Inconnu (Unknown)
+  i = Installer (Install)
+  h = Garder (Hold)
+  r = Supprimer (Remove)
+  p = Purger (Purge)
+.fi
+
+tat du paquet\ :
+.nf
+  n = Non install (Not\-installed
+)  c = Fichiers de configuration (Config\-files)
+  H = Semi\-install (Half\-installed)
+  U = Dcompress (Unpacked)
+  F = Semi\-configur (Half\-configured)
+  W = Attente de dclenchements (Triggers\-awaiting)
+  t = Dclenchements en attente (Triggers\-pending)
+  i = Install (Installed)
+.fi
+
+Drapeaux d'erreur\ :
+.nf
+  <empty> = (none)
+  R = Reinst\-required
+.fi
+
+Un tat en majuscules ou une lettre d'erreur indiquent que le paquet peut
+provoquer des problmes graves. Veuillez consulter \fBdpkg\fP(1)  propos des
+tats et drapeaux ci\-dessus.
+
+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 \fB\-W\fP (\fB\-\-show\fP) et \fB\-\-showformat\fP pour
+une possible configuration de ce format.
+.TP 
+\fB\-W\fP, \fB\-\-show\fP [\fIpackage\-name\-pattern\fP...]
+Tout comme l'option \fB\-\-list\fP, cette option affiche la liste des paquets qui
+correspondent au motif donn. La sortie peut cependant tre formate en
+utilisant l'option \fB\-\-showformat\fP. Le format de sortie par dfaut est le
+suivant\ : une ligne pour chaque paquet, avec le nom et la version installe,
+spar par une tabulation.
+.TP 
+\fB\-s\fP, \fB\-\-status\fP \fInom\-paquet\fP ...
+Report status of specified package. This just displays the entry in the
+installed package status database. When multiple \fIpackage\-name\fP are listed,
+the requested status entries are separated by an empty line.
+.TP 
+\fB\-L\fP, \fB\-\-listfiles\fP \fInom\-paquet\fP...
+List files installed to your system from \fIpackage\-name\fP. When multiple
+\fIpackage\-name\fP are listed, the requested lists of files are separated by an
+empty line. However, note that files created by package\-specific
+installation\-scripts are not listed.
+.TP 
+\fB\-c\fP, \fB\-\-control\-path\fP \fInom\-paquet\fP [\fIfichier\-contrle\fP]
+Affiche les chemins pour les fichiers de contrle installs sur votre
+systme pour \fInom\-paquet\fP. Si \fIfichier\-contrle\fP est indiqu, seul le
+chemin pour ce fichier de contrle sera affich, s'il est
+prsent. \fBAttention\fP\ :\ cette commande est semi\-publique et ne devrait tre
+utilise qu'en dernier ressort et si aucune autre interface n'est
+disponible. Elle pourrait devenir obsolte dans le futur si de meilleures
+interfaces sont mises en place ou si les dfauts actuels d'architecture sont
+rsolus.
+.TP 
+\fB\-S\fP, \fB\-\-search\fP \fImotif\-de\-nom\-a\-rechercher\fP...
+Search for packages that own files corresponding to the given pattern.
+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.
+.TP 
+\fB\-p\fP, \fB\-\-print\-avail\fP \fInom\-paquet\fP...
+Display details about \fIpackage\-name\fP, as found in
+\fI/var/lib/dpkg/available\fP. When multiple \fIpackage\-name\fP are listed, the
+requested \fIavailable\fP entries are separated by an empty line.
+
+Users of APT\-based frontends should use \fBapt\-cache show\fP \fIpackage\-name\fP
+instead as the \fIavailable\fP file is only kept up\-to\-date when using
+\fBdselect\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH OPTIONS
+.TP 
+\fB\-\-admindir\fP=\fIdir\fP
+Change l'endroit o se trouve la base de donnes de \fBdpkg\fP. Par dfaut,
+c'est \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-f\fP, \fB\-\-showformat=\fP\fIformat\fP
+Cette option sert  spcifier le format de sortie de l'option \fB\-\-show\fP. Ce
+format sera utilis pour chaque paquet list.
+
+Dans la chane, \(lq\fB\e\fP\(rq dspcifie le caractre
+
+.nf
+    \fB\en\fP  nouvelle ligne
+    \fB\er\fP  retour chariot
+    \fB\et\fP  tabulation
+.fi
+
+\(lq\fB\e\fP\(rq avant un caractre supprime la signification du caractre qui
+suit. C'est utile pour les caractres \(lq\fB\e\fP\(rq and \(lq\fB$\fP\(rq.
+
+L'information relative  un paquet peut tre indique en insrant des appels
+de variables spcifiant des champs du paquet avec la syntaxe suivante\ :
+\(lq\fB${\fP\fIfield\fP[\fB;\fP\fIwidth\fP]\fB}\fP\(rq. Les champs sont aligns  droite, 
+moins que la largeur ne soit ngative, auquel cas ils sont aligns 
+gauche. Les champs suivants sont reconnus, mais pas ncessairement
+disponibles dans le fichier d'tat (seuls les champs internes ou les champs
+conservs avec le paquet binaire le sont)\ :
+
+.nf
+    \fBArchitecture\fP
+    \fBBugs\fP
+    \fBConffiles\fP (internal)
+    \fBConfig\-Version\fP (internal)
+    \fBConflicts\fP
+    \fBBreaks\fP
+    \fBDepends\fP
+    \fBDescription\fP
+    \fBEnhances\fP
+    \fBEssential\fP
+    \fBFilename\fP (internal, front\-end related)
+    \fBHomepage\fP
+    \fBInstalled\-Size\fP
+    \fBMD5sum\fP (internal, front\-end related)
+    \fBMSDOS\-Filename\fP (internal, front\-end related)
+    \fBMaintainer\fP
+    \fBOrigin\fP
+    \fBPackage\fP
+    \fBPre\-Depends\fP
+    \fBPriority\fP
+    \fBProvides\fP
+    \fBRecommends\fP
+    \fBReplaces\fP
+    \fBRevision\fP (obsolete)
+    \fBSection\fP
+    \fBSize\fP (internal, front\-end related)
+    \fBSource\fP
+    \fBStatus\fP (internal)
+    \fBSuggests\fP
+    \fBTag\fP (usually not in the .deb but in the repository Packages files)
+    \fBTriggers\-Awaited\fP (internal)
+    \fBTriggers\-Pending\fP (internal)
+    \fBVersion\fP
+.fi
+
+Le format par dfaut est le suivant\ :
+\(lq\fB${Package}\et${Version}\en\fP\(rq. Tous les autres champs du fichier
+status, par exemple des champs dfinis par l'utilisateur, peuvent tre
+demands. Ils seront affichs mais sans aucune mise en forme et aucune
+vrification n'est faite. Pour obtenir le nom du responsable de dpkg et la
+version installe, excutez par exemple\ :
+
+.nf
+  \fBdpkg\-query \-W \-f=\(aq${Package} ${Version}\et${Maintainer}\en\(aq dpkg\fP
+.fi
+.
+.SH "CODE DE SORTIE"
+.TP 
+\fB0\fP
+La requte demande s'est correctement droule.
+.TP 
+\fB1\fP
+Des problmes sont survenus lors de l'analyse de la ligne de commande ou
+bien pendant l'excution de la requte. Cela peut tre une absence de
+fichier ou de paquet (sauf pour \-\-control\-path).
+.
+.SH ENVIRONNEMENT
+.TP 
+\fBDPKG_ADMINDIR\fP
+If set and the \fB\-\-admindir\fP option has not been specified, it will be used
+as the dpkg data directory.
+.TP 
+\fBCOLUMNS\fP
+Ce rglage influence la sortie de l'option \fB\-\-list\fP en modifiant la largeur
+d'affichage.
+.
+.SH AUTEUR
+Copyright \(co 2001 Wichert Akkerman
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.
+.SH "VOIR AUSSI"
+\fBdpkg\fP(1).
+
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-scanpackages.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-scanpackages.1
--- dpkg/man/fr/dpkg-scanpackages.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-scanpackages.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,105 @@
+.\" Copyright © 1996 Michael Shields <shields@crosslink.net>
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-scanpackages 1 2011\-08\-14 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-scanpackages \- crer des fichiers d'index de paquets.
+.
+.SH SYNOPSIS
+\fBdpkg\-scanpackages\fP [\fIoption\fP...] \fIbinary\-dir\fP [\fIoverride\-file\fP
+[\fIpath\-prefix\fP]] \fB>\fP \fIPackages\fP
+.
+.SH DESCRIPTION
+\fBdpkg\-scanpackages\fP trie une arborescence contenant des paquets binaires
+Debian et cre un fichier \ Packages\  qui permettra  \fBapt\fP(8),
+\fBdselect\fP(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 CD. Quand on cre un
+rpertoire contenant des paquets qu'on veut installer sur un ensemble de
+machines, on peut se servir soi\-mme de \fBdpkg\-scanpackages\fP.
+.PP
+\fBNote\ :\fP Pour pouvoir accder avec \fBapt\fP au fichier Packages cr, il
+faudra sans doute le compresser avec \fBbzip2\fP(1) (qui cre un fichier
+Packages.bz2) ou \fBgzip\fP(1) (qui cre un fichier Packages.gz). apt ignore
+les fichiers Packages non compresss, sauf pour des sources locales (cad
+\fBfile://\fP).
+.PP
+\fIrep\-de\-binaires\fP est le nom de l'arborescence des paquets binaires (par
+exemple \fBcontrib/binary\-i386)\fP 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
+chane.
+.PP
+\fIfichier\-d'\-override\fP est le nom du fichier qui contient les renseignements
+sur la manire dont le paquet s'insre dans la distribution (ce fichier peut
+tre compress)\ ; voir \fBdeb\-override\fP(5).
+.PP
+\fIchemin\-\-prfixer\fP est une chane facultative qui prfixera les champs
+\ Filename\ .
+.PP
+S'il existe plusieurs versions d'un paquet, seule la plus rcente est
+affiche en sortie. Si les paquets ont la mme version mais diffrent par
+l'architecture, seul le premier trouv est utilis.
+.
+.SH OPTIONS
+.TP 
+\fB\-t\fP, \fB\-\-type\fP \fItype\fP
+Recherche des fichiers *.\fItype\fP, plutt que \fI*.deb\fP.
+.TP 
+\fB\-u\fP, \fB\-\-udeb\fP
+Alias \fBobsolete\fP pour \fB\-tudeb\fP.
+.TP 
+\fB\-e\fP, \fB\-\-extra\-override\fP \fIfichier\fP
+Examine \fIfichier\fP  la recherche d'\ overrides\  supplmentaires (ce
+fichier peut tre compress). Voir \fBdeb\-extra\-override\fP(5) pour plus
+d'information sur le format utilis.
+.TP 
+\fB\-a\fP, \fB\-\-arch\fP \fIarch\fP
+Utiliser un motif quivalent  \fI*_all.deb\fP et  \fI*_arch.deb\fP, plutt que
+de rechercher tous les fichiers debs.
+.TP 
+\fB\-m\fP, \fB\-\-multiversion\fP
+Affiche tous les paquets trouvs en sortie.
+.TP 
+\fB\-M\fP, \fB\-\-medium\fP \fIid\-chane\fP
+Ajoute un champ X\-Medium qui contient la valeur \fIid\-chane\fP. Ce champ est
+obligatoire si vous voulez crer des fichiers \fBPackages.cd\fP files destins
+ tre utiliss avec la mthode multicd de dselect.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH DIAGNOSTICS
+\fBdpkg\-scanpackages\fP affiche les erreurs habituelles qui se comprennent
+d'elles\-mmes. Il affiche aussi des avertissements quand des paquets sont
+dans un mauvais sous\-rpertoire, 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.
+.
+.SH "VOIR AUSSI"
+\fBdpkg\fP(1), \fBdselect\fP(1), \fBdeb\-override\fP(5), \fBdeb\-extra\-override\fP(5),
+\fBdpkg\-scansources\fP(1).
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-scansources.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-scansources.1
--- dpkg/man/fr/dpkg-scansources.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-scansources.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,76 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-scansources 1 2011\-08\-14 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-scansources \- crer des fichiers d'index de sources
+.
+.SH SYNOPSIS
+\fBdpkg\-scansources\fP [\fIoption\fP...] \fIbinary\-dir\fP [\fIoverride\-file\fP
+[\fIpath\-prefix\fP]] \fB>\fP \fISources\fP
+.
+.SH DESCRIPTION
+\fBdpkg\-scansources\fP recherche des fichiers \fI.dsc\fP dans le rpertoire
+\fIrep\-de\-binaires\fP indiqu. Ces fichiers sont utiliss pour crer un index
+de sources Debian, qui est envoy sur la sortie standard.
+.PP
+Le \fIfichier\-override\fP, s'il est indiqu, est utilis pour fixer les
+priorits dans l'index cr et pour modifier le responsable donn par les
+fichiers \fI.dsc\fP. Consultez \fBdeb\-override\fP(5) pour plus de dtails sur le
+format de ce fichier. \s-1Note\ :\s0 S comme le fichier override est index
+par paquet binaire et non pas par paquet source, cela pose un lger
+problme. L'implmentation actuelle utilise la priorit la plus leve des
+paquets produit par un fichier \fI.dsc\fP comme priorit du paquet source, et
+l'entre du fichier override du premier paquet binaire list dans le fichier
+\&\fI.dsc\fP pour modifier l'information sur le responsable. Ceci pourra changer.
+.PP
+Le \fIchemin\-\-prfixer\fP, s'il est indiqu, est ajout au dbut du champ
+Directory (\ rpertoire\ ) dans l'index des sources gnr. C'est en rgle
+gnrale utilis pour que le champ Directory contienne un chemin depuis la
+racine de l'archive Debian.
+.
+.PP
+\fBNote\ :\fP Si vous voulez accder au fichier Sources gnr avec \fBapt\fP(8),
+vous devrez probablement compresser ce fichier avec \fBgzip\fP(1) (pour crer
+un fichier Sources.gz). Apt ignore les fichiers Sources non compresss sauf
+pour les accs locaux (c'est\-\-dire les sources \fBfile://\fP).
+.
+.SH OPTIONS
+.IP "\fB\-n\fP, \fB\-\-no\-sort\fP" 4
+Ne trie pas les entres de l'index. Elles sont d'habitude tries en fonction
+du nom du paquet source.
+.TP 
+.IP "\fB\-e\fP, \fB\-\-extra\-override\fP \fIfichier\fP" 4
+Examine \fIfichier\fP  la recherche d'\ overrides\  supplmentaires (ce
+fichier peut tre compress). Voir \fBdeb\-extra\-override\fP(5) pour plus
+d'information sur le format utilis.
+.IP "\fB\-s\fP, \fB\-\-source\-override\fP \fIfichier\fP" 4
+Utilise \fIfichier\fP comme fichier override des sources (ce fichier peut tre
+compress). La valeur par dfaut est le fichier override indiqu auquel est
+ajoute l'extension \fI.src\fP.
+.sp
+Le format des fichiers override des sources est diffrent des fichiers
+override des binaires. Il ne contient que deux champs spars par des
+espaces, le premier indique le paquet source et le second, la section. Les
+lignes blanches et les lignes de commentaire sont ignores comme 
+l'habitude. Si un paquet apparat dans chaque fichier, le fichier des
+sources est prioritaire pour fixer la section.
+.IP \fB\-\-debug\fP 4
+Active le dbogage.
+.IP \fB\-\-help\fP 4
+Affiche un message d'aide puis quitte.
+.IP \fB\-\-version\fP 4
+Affiche le numro de version puis quitte.
+.
+.SH "VOIR AUSSI"
+\fBdeb\-override\fP(5), \fBdeb\-extra\-override\fP(5), \fBdpkg\-scanpackages\fP(1).
+.
+.SH AUTEUR
+Roderick Schertler <roderick@argon.org>
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-shlibdeps.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-shlibdeps.1
--- dpkg/man/fr/dpkg-shlibdeps.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-shlibdeps.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,313 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-shlibdeps 1 2011\-08\-14 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-shlibdeps \- gnrateur de variables de substitution de dpendances pour
+bibliothques partages
+.
+.SH SYNOPSIS
+\fBdpkg\-shlibdeps\fP [\fIoption\fP...] [\fB\-e\fP]\fIexecutable\fP [\fIoption\fP...]
+.
+.SH DESCRIPTION
+\fBdpkg\-shlibdeps\fP calculates shared library dependencies for executables
+named in its arguments. The dependencies are added to the substitution
+variables file \fBdebian/substvars\fP as variable names
+\fBshlibs:\fP\fIdependencyfield\fP where \fIdependencyfield\fP is a dependency field
+name. Any other variables starting with \fBshlibs:\fP are removed from the
+file.
+.P
+\fBdpkg\-shlibdeps\fP a deux sources possibles pour crer les informations
+concernant les dpendances. Soit les fichiers \fIsymbols\fP, soit les fichiers
+\fIshlibs\fP. Pour chaque fichier binaire qu'il analyse, \fBdpkg\-shlibdeps\fP
+recherche la liste des bibliothques partages qui lui sont lies. Puis,
+pour chacune d'elles il analyse soit le fichier \fIsymbols\fP, soit le fichier
+\fIshlibs\fP (si le premier n'existe pas ou si debian/shlibs.local contient les
+dpendances appropries). Ces deux fichiers sont senss tre fournis par le
+paquet de la bibliothque et disponibles dans
+/var/lib/dpkg/info/\fIpaquet\fP.\fIsymbols\fP ou
+/var/lib/dpkg/info/\fIpaquet\fP.\fIshlibs\fP. Le nom du paquet est trouv en deux
+tapes\ : en cherchant les fichiers de la bibliothque sur le systme, dans
+le rpertoire que \fBld.so\fP utiliserait, puis un utilisant \fBdpkg \-S
+\fP\fIfichier\-bibliothque\fP pour trouver le paquet qui fournit cette
+bibliothque.
+.SS "Fichiers symboles"
+Les fichiers symboles contiennent des informations de dpendances plus fines
+en fournissant les dpendances minimales pour chaque symbole de la
+bibliothque exporte. Le script essaie de trouver un fichier de symboles
+associ  un paquet de bibliothque dans les emplacements suivants (le
+premier trouv est utilis)\ :
+.IP debian/*/DEBIAN/symbols
+L'information des bibliothques partages gnre par l'actuel processus de
+construction qui invoque aussi \fBdpkg\-shlibdeps\fP. Elles sont gnres par
+\fBdpkg\-gensymbols\fP(1) et ne sont utilises que si la bibliothque se trouve
+dans l'arbre de construction d'un paquet. Le fichier des symboles qui
+construit l'arbre s'appuie sur les fichiers de symboles d'autres paquets
+binaires.
+.IP /etc/dpkg/symbols/\fIpaquet\fP.symbols.\fIarchitecture\fP
+.IP /etc/dpkg/symbols/\fIpaquet\fP.symbols
+L'information de dpendance des bibliothques partages associe aux
+systmes. \fIarch\fP est l'architecture du systme actuel (obtenu par
+\fBdpkg\-architecture \-qDEB_HOST_ARCH\fP).
+.IP "Output from \(lq\fBdpkg\-query \-\-control\-path\fP \fIpackage\fP symbols\(rq"
+Package\-provided shared library dependency information.  Unless overridden
+by \-\-admindir, those files are located in /var/lib/dpkg.
+.P
+Lors de l'analyse des symboles utiliss par tous les binaires,
+\fBdpkg\-shlibdeps\fP retient la (plus grande) version minimale ncessaire pour
+chaque bibliothque.  la fin du processus, il est capable d'crire la
+dpendance minimale pour toutes les bibliothques utilises ( condition que
+l'information des fichiers \fIsymbols\fP soit exacte).
+.P
+Comme garde\-fou, un fichier de symboles peut fournir un champ
+\fIBuild\-Depends\-Package\fP de mta\-information et \fBdpkg\-shlibdeps\fP en
+extraira la version minimale requise par le paquet correspondant depuis ce
+champ Build\-Depends et utiliser cette version si elle est suprieure  la
+version minimale calcule par l'examen des symboles.
+.SS "Fichiers Shlibs"
+Les fichiers Shlibs associent directement une bibliothque  une dpendance
+(sans regarder les symboles). Il agit donc souvent plus fortement que ce
+dont on aurait besoin mais il reste trs sr et facile  manipuler.
+.P
+Les dpendances d'une bibliothque sont recherches  plusieurs endroits. Le
+premier fichier d'informations trouv qui concerne la bibliothque est
+utilis\ :
+.IP debian/shlibs.local
+Fichier particulier  un paquet remplaant les informations qui concernent
+les dpendances envers des bibliothques partages.
+.IP /etc/dpkg/shlibs.override
+Fichier systme remplaant les informations qui concernent les dpendances
+envers des bibliothques partages.
+.IP debian/*/DEBIAN/shlibs
+Information sur la bibliothque partage gnr par le processus actuel de
+construction qui invoque aussi \fBdpkg\-shlibdeps\fP. Il n'est utilis que si la
+bibliothque se trouve dans l'arbre de construction du paquet. Le fichier
+shlibs qui construit l'arbre a priorit sur les fichiers shlibs des autres
+paquets binaires.
+.IP "Output from \(lq\fBdpkg\-query \-\-control\-path\fP \fIpackage\fP shlibs\(rq"
+Package\-provided shared library dependency information.  Unless overridden
+by \-\-admindir, those files are located in /var/lib/dpkg.
+.IP /etc/dpkg/shlibs.default
+Fichier systme par dfaut concernant les informations de dpendance envers
+des bibliothques partages.
+.P
+Les dpendances trouves sont ensuite directement utilises (sauf si elles
+sont filtres parce qu'elles ont t identifies comme tant en double, ou
+d'un niveau plus faible qu'une autre dpendance).
+.SH OPTIONS
+\fBdpkg\-shlibdeps\fP interprte des arguments sans option comme des commandes
+excutables, comme si on avait simplement donn \fB\-e\fP\fIexcutable\fP.
+.TP 
+\fB\-e\fP\fIexcutable\fP
+Cette option inclut les bonnes dpendances envers les bibliothques
+partages que demande \fIexcutable\fP.
+.TP 
+\fB\-d\fP\fIchamp\-dpendance\fP
+Cette option ajoute les dpendances destines au champ \ dpendance\  du
+fichier de contrle \fIchamp\-dpendance.\fP (Les dpendances pour ce champ sont
+dans la variable \fBshlibs:\fP\fIchamp\-dpendance\fP.)
+
+L'option \fB\-d\fP\fIchamp\-dpendance\fP concerne tous les excutables qui suivent
+l'option, jusqu' la prochaine option \fB\-d\fP\fIchamp\-dpendance\fP. Par dfaut,
+\fIchamp\-dpendance\fP vaut \fBDepends\fP.
+
+Quand, dans plusieurs champs reconnus ayant trait aux dpendances comme les
+champs \fBPre\-Depends\fP, \fBDepends\fP, \fBRecommends\fP, \fBEnhances\fP ou \fBSuggests\fP
+apparat la mme entre (ou bien un ensemble d'alternatives),
+\fBdpkg\-shlibdeps\fP supprime automatiquement les dpendances dans tous les
+champs sauf celui qui reprsente les dpendances les plus importantes.
+.TP 
+\fB\-p\fP\fIprfixe\-pour\-le\-nom\-des\-variables\fP
+Fait commencer les variables de substitution par
+\fIprfixe\-pour\-le\-nom\-des\-variables\fP\fB:\fP au lieu de \fBshlibs:\fP. De mme,
+toute variable de substitution commenant par
+\fIprfixe\-pour\-le\-nom\-des\-variables\fP\fB:\fP (au lieu de \fBshlibs:\fP) est enleve
+du fichier de substitution des variables.
+.TP 
+\fB\-O\fP
+Affiche les dfinitions des variables de substitution sur la sortie
+standard, plutt que de les ajouter dans le fichier de substitution des
+variables qui est par dfaut debian/substvars.
+.TP 
+\fB\-t\fP\fItype\fP
+Prfrer les informations sur les dpendances des bibliothques partages
+qui sont tiquetes pour un type de paquet donn. Si aucune information de
+type n'est donne, il n'utilisera pas d'information. Par dfaut, le type de
+paquet est \ deb\ . On peut crer une tiquette pour ces informations en les
+prfixant par le nom du type, un deux\-points et une espace.
+.TP 
+\fB\-L\fP\fIfichier\-local\-shlibs\fP
+Lire les informations de remplacement concernant les dpendances envers les
+bibliothques partages dans \fIfichier\-local\-shlibs\fP au lieu de
+\fBdebian/shlibs.local\fP.
+.TP 
+\fB\-T\fP\fIfichier/substvars\fP
+crire les variables de substitution dans \fIfichier/substvars\fP\ ; le fichier
+par dfaut est \fBdebian/substvars\fP.
+.TP 
+\fB\-v\fP
+Active le mode verbeux. De nombreux messages sont affichs pour expliquer ce
+que \fBdpkg\-shlibdeps\fP fait.
+.TP 
+\fB\-x\fP\fIpackage\fP
+Exclut le paquet des dpendances gnres. Cela vite les auto\-dpendances
+pour les paquets fournissant des excutables ELF (excutables ou modules
+complmentaires de bibliothque) qui utilisent une bibliothque incluse dans
+ce mme paquet. Cette option peut tre utilise plusieurs fois pour exclure
+plusieurs paquets.
+.TP 
+\fB\-S\fP\fIpkgbuilddir\fP
+Recherche dans \fIpkgbuilddir\fP en premier et essaie de trouver une
+bibliothque. C'est utile lorsque le paquet source construit plusieurs
+saveurs de la mme bibliothque et que vous voulez vous assurer que vous
+obtiendrez la dpendance d'un paquet binaire donn. Cette option peut tre
+utilise plusieurs fois\ : les rpertoires seront examins dans le mme ordre
+avant les rpertoires d'autres paquets binaires.
+.TP 
+\fB\-\-ignore\-missing\-info\fP
+Pas d'chec si l'information de dpendance ne peut pas tre trouve pour une
+bibliothque partage. L'utilisation de cette option est dconseille,
+toutes les bibliothques devraient fournir leurs informations de dpendance
+(que ce soit avec les fichiers shlibs, ou avec les fichiers symboles), mme
+si elles ne sont pas encore utilises par d'autres paquets.
+.TP 
+\fB\-\-warnings=\fP\fIvaleur\fP
+\fIvaleur\fP est un champ de \ bit\  dfinissant l'ensemble des avertissements
+qui peuvent tre mis par \fBdpkg\-shlibdeps\fP. Le bit 0 (valeur = 1) active
+l'avertissement \ symbole \fIsym\fP utilis par le \fIbinaire\fP trouv dans
+aucune des bibliothques\ . Le bit 1 (valeur = 2) active l'avertissement
+\ la dpendance  la \fIbibliothque\fP pourrait tre vite\ . Le bit 2
+(valeur = 4) active l'avertissement \ Le \fIbinaire\fP ne devrait pas tre li
+ la \fIbibliothque\fP\ . La \fIvaleur\fP par dfaut est 3\ : les deux premires
+mises en garde sont actives par dfaut, la dernire ne l'est
+pas. Positionnez la \fIvaleur\fP  7 si vous souhaitez que tous les
+avertissements soient actifs.
+.TP 
+\fB\-\-admindir\fP=\fIdir\fP
+Change l'endroit o se trouve la base de donnes de \fBdpkg\fP. Par dfaut,
+c'est \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH AVERTISSEMENTS
+Depuis que \fBdpkg\-shlibdeps\fP analyse l'ensemble des symboles utiliss par
+chaque binaire gnr par le paquet, il est en mesure d'mettre des
+avertissements dans plusieurs cas. Ils vous informent des choses qui peuvent
+tre amliores dans le paquet. Dans la plupart des cas, ces amliorations
+concernent directement les sources amont. Dans l'ordre d'importance
+dcroissant, voici les diffrents avertissements que vous pouvez
+rencontrer\ :
+.TP 
+\fBsymbole\fP\fI sym\fP\fB utilis par \fP\fIbinaire\fP\fB trouv dans aucune des bibliothques.\fP
+Le symbole indiqu n'a pas t trouv dans les bibliothques lies au
+binaire. Le \fIbinaire\fP est probablement plutt une bibliothque et elle doit
+tre lie avec une bibliothque supplmentaire durant le processus de
+construction (l'option \fB\-l\fP\fIbibliothque\fP de l'diteur de liens).
+.TP 
+\fIbinary\fP\fB contient une rfrence non rsolue au symbole \fP\fIsym\fP\fB: il s'agit probablement d'un greffon (plugin)\fP
+Le symbole indiqu n'a pas t trouv dans les bilbiohtques lies avec le
+fichier binaire. Le \fIbinaire\fP es trs probablement un greffon (plugin) et
+le symbole est probablement fourni par le programme qui charge ce
+greffon. En thori, un greffon n'a pas de \ SONAME\  mais ce binaire en
+possde un et n'a pas pu tre identifi en tant que tel. Cependant, le fait
+que le binaire soit stock dans un rpertoire non public est une indication
+forte qu'il ne s'agit pas d'une bibliothque partage normale. Si le binaire
+est vraiment un greffon, vous pouvez ignorer cet avertissement. Il existe
+cependant une possibilit qu'il s'agisse d'un vrai binaire et que les
+programmes avec lequel il est li utilisent un RPATH afin que le chargeur
+dynamique le trouve. Dans ce cas, la bibliothque est incorrecte et doit
+tre corrige.
+.TP 
+\fBla dpendance sur la\fP \fIbibliothque\fP \fBpourrait tre vite si\fP \fIles binaires\fP\fB inutiles n'taient pas lis  celle\-ci (ils n'utilisent aucun de ses symboles).\fP
+Aucun des \fIbinaires\fP lis  la \fIbibliothque\fP utilise les symboles qu'elle
+fournit. En corrigeant tous les binaires, vous viteriez la dpendance
+associe  cette bibliothque ( moins que la mme dpendance soit galement
+lie  une autre bibliothque qui est elle rellement utilise).
+.TP 
+\fIle binaire\fP\fB ne devrait pas tre li avec la \fP\fIbibliothque\fP\fB (il ne fait usage d'aucun de ses symboles).\fP
+Le \fIbinaire\fP est li  une bibliothque dont il n'a pas besoin. Ce n'est
+pas un problme mais de petites amliorations de performance dans le temps
+de chargement de celui\-ci peuvent tre obtenues en ne le liant pas  cette
+bibliothque. Cet avertissement vrifie la mme information que la
+prcdente mais elle le fait pour tous les binaires au lieu de ne faire le
+contrle qu'au niveau global sur tous les binaires analyss.
+.SH ERREURS
+\fBdpkg\-shlibdeps\fP chouera s'il ne peut pas trouver de bibliothque publique
+utilise par un binaire ou si cette bibliothque n'a pas d'informations sur
+les dpendances associes (soit les fichier shlibs, soit le fichier des
+symboles). Une bibliothque publique a un SONAME et un numro de version
+(libsomething.so.\fIX\fP). Une bibliothque prive (comme un module
+additionnel) ne devrait pas avoir de SONAME et n'a pas besoin d'avoir de
+version.
+.TP 
+\fBimpossible de trouver la bibliothque \fP\fIlibrary\-soname\fP \fBdemande par le\fP \fIbinaire\fP \fB(son RPATH est '\fP\fIrpath\fP\fB')\fP
+The \fIbinary\fP uses a library called \fIlibrary\-soname\fP but \fBdpkg\-shlibdeps\fP
+has been unable to find the library.  \fBdpkg\-shlibdeps\fP creates a list of
+directories to check as following: directories listed in the RPATH of the
+binary, directories listed in /etc/ld.so.conf, directories listed in the
+LD_LIBRARY_PATH environment variable, and standard public directories (/lib,
+/usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks those
+directories in the package's build tree of the binary being analyzed, in the
+packages' build trees indicated with the \-S command\-line option, in other
+packages' build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file
+and finally in the root directory.  If the library is not found in any of
+those directories, then you get this error.
+
+Si la bibliothque non trouve est cependant disponible dans le rpertoire
+priv de ce mme paquet, alors il vous faut ajouter ce rpertoire dans
+LD_LIBRARY_PATH. S'il est dans un autre paquet binaire en cours de
+construction, alors assurez\-vous que le fichier shlibs/symbols de ce paquet
+est dj cr et que LD_LIBRARY_PATH contient le rpertoire appropri si
+c'est aussi un rpertoire priv.
+.TP 
+\fBaucune information de dpendance trouv pour\fP \fIla bibliothque\fP \fB(utilise par le\fP \fIbinaire\fP\fB).\fP
+La bibliothque ncessaire au \fIbinaire\fP a t trouve par \fBdpkg\-shlibdeps\fP
+dans \fIfichier\-bibliothque\fP mais \fBdpkg\-shlibdeps\fP n'a pas t en mesure de
+trouver d'informations de dpendance pour cette bibliothque. Pour trouver
+la dpendance, il a essay de lier la bibliothque  un paquet Debian avec
+l'aide de \fBdpkg \-S \fP\fIfichier\-bibliothque\fP. Puis, il a vrifi les shlibs
+correspondants et les fichiers symboles de /var/lib/dpkg/info/ et enfin les
+diffrents arbres des paquets construits (debian/*/DEBIAN/).
+
+Cet chec peut tre caus par un shlibs ou un fichier de symboles qui serait
+mauvais ou manquant dans le paquet. Une autre cause serait que la
+bibliothque soit construite au sein du mme paquet source et que les
+fichiers shlibs n'aient pas encore t crs (dans ce cas debian/rules doit
+tre modifi pour crer le shlibs avant l'appel de \fBdpkg\-shlibdeps\fP). Un
+mauvais RPATH peut aussi conduire  ce que la bibliothque soit trouve sous
+un nom non\-canonique (comme: /usr/lib/openoffice.org/../lib/libssl.so.0.9.8
+au lieu de /usr/lib/libssl.so.0.9.8) qui n'est associ  aucun paquet,
+\fBdpkg\-shlibdeps\fP essaie de travailler sur ce nom non\-canonique (en
+utilisant \fBrealpath\fP(3)), mais cela ne fonctionne pas toujours. Il est
+toujours prfrable de bien nettoyer le RPATH du binaire afin d'viter ces
+problmes.
+
+L'appel de \fBdpkg\-shlibdeps\fP en mode verbeux (\-v) fournira beaucoup plus
+informations sur l'endroit o il a essay de trouver l'information sur les
+dpendances. Ceci peut tre utile si vous ne comprenez pas pourquoi vous
+obtenez cette erreur.
+.SH "VOIR AUSSI"
+\fBdeb\-shlibs\fP(5), \fBdeb\-symbols\fP(5), \fBdpkg\-gensymbols\fP(1).
+.
+.SH AUTEURS
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2006 Frank Lichtenheld
+.br
+Copyright \(co 2007\-2008 Rapha\[:e]l Hertzog
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-source.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-source.1
--- dpkg/man/fr/dpkg-source.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-source.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,724 @@
+.\" Authors: Ian Jackson, Raphaël Hertzog
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-source 1 2011\-08\-14 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-source \- outil de manipulation des paquets sources Debian (.dsc).
+.
+.SH SYNOPSIS
+\fBdpkg\-source\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH DESCRIPTION
+\fBdpkg\-source\fP empaquete ou dpaquete une archive source Debian.
+
+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 spar.
+.
+.SH COMMANDES
+.TP 
+\fB\-x \fP\fIfichier\fP\fB.dsc\fP [\fIrpertoire\-de\-sortie\fP]
+Cette option sert  extraire un paquet source. On doit donner un seul
+argument sans option\ : le nom du fichier de contrle des sources Debian
+(\fB.dsc\fP).  Un deuxime argument sans option peut tre donn pour indiquer
+le rpertoire o extraire le paquet source, cela ne doit pas exister. Quand
+aucun rpertoire n'est indiqu, le paquet source est extrait dans un
+rpertoire \fIsource\fP\-\fIversion\fP du rpertoire courant.
+
+\fBdpkg\-source\fP lit, dans le fichier de contrle, les noms des fichiers qui
+composent le paquet source\ ; il suppose qu'ils sont dans le mme rpertoire
+que le fichier \fB.dsc\fP.
+
+Les fichiers extraits du paquet auront le mme systme de proprit et de
+permission que s'ils avaient t simplement crs \-\- les rpertoires et les
+fichiers excutables auront un systme de permission gal  0777 et les
+simples fichiers, 0666\ ; ces deux systmes tant modifis par le masque de
+celui qui fait l'extraction\ ; si le rpertoire parent est \ setgid\ , les
+rpertoires extraits le seront aussi et tous les fichiers et rpertoires
+hriteront du systme de proprit de ce groupe.
+
+Si le paquet source utilise un format non\-standard (actuellement, cela
+signifie tous les formats sauf le "1.0"), son nom sera enregistr dans
+\fBdebian/source/format\fP de sorte que la construction du paquet source
+utilise le mme format par dfaut.
+
+.TP 
+\fB\-b\fP \fIrpertoire\fP [\fIparamtres\-dans\-un\-format\-spcifique\fP]
+Construit un paquet source. Le premier argument non optionnel est pris comme
+nom du rpertoire contenant l'arborescence des sources Debianises
+(c'est\-\-dire avec un sous\-rpertoire debian et peut\-tre des modifications
+sur les fichiers d'origine). Selon le format du paquet source utilis pour
+construire le paquet, d'autres paramtres peuvent tre accepts.
+
+\fBdpkg\-source\fP will build the source package with the first format found in
+this ordered list: the format indicated with the \fI\-\-format\fP command line
+option, the format indicated in \fBdebian/source/format\fP, "1.0". The fallback
+to "1.0" is deprecated and will be removed at some point in the future, you
+should always document the desired source format in
+\fBdebian/source/format\fP. See section \fBSOURCE PACKAGE FORMATS\fP for an
+extensive description of the various source package formats.
+
+.TP 
+\fB\-\-print\-format\fP \fIrpertoire\fP
+Affiche le format source qui serait utilis pour construire le paquet source
+si \fBdpkg\-source \-b \fP\fIrpertoire\fP tait utilis (dans les mmes conditions
+et avec les mmes options).
+
+.TP 
+\fB\-\-before\-build\fP \fIrpertoire\fP
+Run the corresponding hook of the source package format. This hook is called
+before any build of the package (\fBdpkg\-buildpackage\fP calls it very early
+even before \fBdebian/rules clean\fP). This command is idempotent and can be
+called multiple times. Not all source formats implement something in this
+hook, and those that do usually prepare the source tree for the build for
+example by ensuring that the Debian patches are applied.
+
+.TP 
+\fB\-\-after\-build\fP \fIrpertoire\fP
+Run the corresponding hook of the source package format. This hook is called
+after any build of the package (\fBdpkg\-buildpackage\fP calls it last). This
+command is idempotent and can be called multiple times. Not all source
+formats implement something in this hook, and those that do usually use it
+to undo what \fB\-\-before\-build\fP has done.
+
+.TP 
+\fB\-\-commit\fP [\fIdirectory\fP] ...
+Record changes in the source tree unpacked in \fIdirectory\fP. This command can
+take supplementary parameters depending on the source format.  It will error
+out for formats where this operation doesn't mean anything.
+
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH "OPTIONS DE CONSTRUCTION GNRIQUES"
+.TP 
+\fB\-c\fP\fIfichier/control\fP
+Indique le principal fichier de contrle des sources o trouver les
+renseignements. Par dfaut, c'est le fichier \fBdebian/control\fP. Lorsqu'un
+chemin relatif est fourni, on considre qu'il est relatif au rpertoire le
+plus lev de l'arborescence source.
+.TP 
+\fB\-l\fP\fIfichier/changelog\fP
+Indique le fichier d'enregistrement des changements o trouver des
+renseignements. Par dfaut, c'est le fichier \fBdebian/changelog\fP. Lorsqu'un
+chemin relatif est fourni, on considre qu'il est relatif au rpertoire le
+plus lev de l'arborescence source.
+.TP 
+\fB\-F\fP\fIformat\-du\-changelog\fP
+Donne le format du fichier changelog. Par dfaut, c'est une ligne spciale,
+prs de la fin du fichier, qui l'indique\ ; sinon, on utilise le format
+classique \fBdebian\fP.
+.TP 
+\fB\-\-format=\fP\fIvaleur\fP
+Utilise le format indiqu pour la construction du paquet source. Ce choix
+remplace le format indiqu dans \fBdebian/source/format\fP.
+.TP 
+\fB\-V\fP\fInom\fP\fB=\fP\fIvaleur\fP
+Fixe la valeur d'une variable de substitution. Consultez \fBdeb\-substvars\fP(5)
+pour une discussion sur la valeur de substitution.
+.TP 
+\fB\-T\fP\fIfichier/substvars\fP
+Lit les variables de substitution dans \fIfichier\-substvars\fP\ ; par dfaut
+aucun fichier n'est lu. Cette option peut tre utilise plusieurs fois pour
+lire des variables de substitution depuis plusieurs fichiers.
+.TP 
+\fB\-D\fP\fIchamp\fP\fB=\fP\fIvaleur\fP
+Remplace ou ajoute en sortie un champ dans le fichier de contrle.
+.TP 
+\fB\-U\fP\fIchamp\fP
+Supprime en sortie un champ dans le fichier de contrle.
+.TP 
+\fB\-Z\fP\fIcompression\fP, \fB\-\-compression\fP=\fIcompression\fP
+Spcifie le niveau de compression  utiliser pour les fichiers crs
+(archives et fichiers diffs). Notez que cette option ne causera pas la
+recompression des archives existantes, cela ne concerne que les nouveaux
+fichiers. Les valeurs acceptes sont les suivantes\ : \fIgzip\fP, \fIbzip2\fP,
+\fIlzma\fP et \fIxz\fP. \fIgzip\fP tant l'option par dfaut. \fIxz\fP n'est gr que
+depuis dpkg\-dev 1.15.5.
+.TP 
+\fB\-z\fP\fIniveau\fP, \fB\-\-compression\-level\fP=\fIniveau\fP
+Compression level to use. As with \fB\-Z\fP it only affects newly created
+files. Supported values are: \fI1\fP to \fI9\fP, \fIbest\fP, and \fIfast\fP.  The
+default is \fI9\fP for gzip and bzip2, \fI6\fP for xz and lzma.
+.TP 
+\fB\-i\fP[\fIexpr. rat.\fP], \fB\-\-diff\-ignore\fP[=\fIexpr. rat.\fP]
+Il est possible de donner une expression rationnelle Perl pour filtrer les
+fichiers qui doivent tre limins de la liste des fichiers pour le
+\ diff\ . Cette liste est cre avec une commande \ find\ . Si le fichier
+source en construction est un fichier source de version 3 utilisant un
+systme de suivi de versions, cette option est utile pour ignorer les
+modifications non envoyes. L'option \fB\-i\fP active cette fonction avec une
+expression rationnelle qui couvre les fichiers de contrle des plus usuels
+systmes de gestion de version, les fichiers de sauvegardes, les fichiers
+d'change et les rpertoires utiliss par Libtool. Il ne peut y avoir qu'une
+seule expression rationnelle active\ ; seule la dernire mentionne sera
+prise en compte.
+
+C'est trs utile pour supprimer des fichiers qui sont inclus dans le diff,
+par exemple, si vous maintenez un source avec un systme de contrle de
+rvision et que voulez construire un paquet source sans inclure des fichiers
+et rpertoires additionnels qu'il contient gnralement (par exemple CVS/,
+\&.cvsignore, .svn/). L'expression rationnelle par dfaut  est dj trs
+exhaustive, mais si avez besoin de la remplacer, veuillez noter que par
+dfaut, il sait vrifier n'importe quelle partie d'un chemin, donc si vous
+voulez trouver le dbut d'un nom de fichier ou des noms de fichiers
+complets, vous devrez fournir les caractres spciaux vous\-mme (par
+exemple'(^|/)', '($|/)').
+.TP 
+\fB\-\-extend\-diff\-ignore\fP=\fIexpr.rat.\fP
+The perl regular expression specified will extend the default value of
+\fB\-\-diff\-ignore\fP and its current value (if set). It does this by
+concatenating "\fB|\fP\fIregexp\fP" to the existing value.  This option is
+convenient to use in \fBdebian/source/options\fP to exclude some auto\-generated
+files from the automatic patch generation.
+.TP 
+\fB\-I\fP[\fImotif\-fichier\fP], \fB\-\-tar\-ignore\fP[=\fImotif\-fichier\fP]
+Avec cette option, le fichier est pass  l'option \fBtar\fP(1) quand on veut
+crer un fichier .orig.tar.gz ou .tar.gz. Par exemple, \-ICVS fera que tar
+sautera les rpertoires du CVS quand il doit crer un fichier .tar.gz. On
+peut rpter cette option pour exclure plusieurs fichiers.
+
+\fB\-I\fP ajoute par dfaut des options \-\-exclude\  qui limineront les
+fichiers et les rpertoires de contrles des systmes les plus connus de
+contrle de version, les fichiers d'change et de sauvegarde et les
+rpertoires utiliss par Libtool.
+.PP
+\fBNote\ :\fP mme si elles ont des rles similaires, \fB\-i\fP et \fB\-I\fP ont une
+syntaxe et une smantique trs diffrentes. \fB\-i\fP ne peut tre spcifi
+qu'une fois et reoit une expression rationnelle compatible avec le langage
+Perl qui est applique sur chaque chemin relatif complet de chaque
+fichier. \fBI\fP peut tre spcifi plusieurs fois et prend un motif de nom de
+fichier avec les mta\-caractres du shell. Le motif est appliqu au chemin
+relatif complet mais aussi  chaque partie du chemin individuellement. La
+smantique exacte de l'option \ tar \-\-exclude\  est un peu complique, voir
+http://www.gnu.org/software/tar/manuel/tar.html#wildcards pour une
+documentation plus complte.
+
+L'expression rationnelle et le motif par dfaut pour les deux options
+peuvent tre trouvs dans la sortie de la commande \fB\-\-help\fP.
+.SH "LES OPTIONS GENERIQUES POUR EXTRACTION"
+.TP 
+\fB\-\-no\-copy\fP
+Ne pas copier l'archive d'origine prs de l'extraction du paquet source.
+.TP 
+\fB\-\-no\-check\fP
+Ne vrifie pas les signatures et les sommes de contrle avant de dpaqueter.
+.TP 
+\fB\-\-require\-valid\-signature\fP
+Refuse de dcompresser le paquet source s'il ne contient pas de signature
+OpenPGP pouvant tre vrifie soit avec le fichier de cls
+\fItrustedkeys.gpg\fP de l'utilisateur, un des fichiers de cls propre  un
+distributeur ou un des fichiers de cls officiels de Debian
+(\fI/usr/share/keyrings/debian\-keyring.gpg\fP et
+\fI/usr/share/keyrings/debian\-maintainers.gpg\fP).
+
+.SH "FORMATS DE PAQUET SOURCE"
+Si vous ne savez pas quel format source utiliser, il est conseill de
+choisir soit \ 3.0 (quilt)" soit "3.0 (native)". Voir
+http://wiki.debian.org/Projects/DebSrc3.0 pour plus d'informations sur la
+mise en oeuvre de ces formats dans Debian.
+
+.SS "Format: 1.0"
+Un paquet source dans ce format se compose soit d'un \fB.orig.tar.gz\fP associ
+ un \fB.diff.gz\fP ou un simple \fB.tar.gz\fP (dans ce cas, le paquet est appel
+natif \fI"native"\fP).
+
+\fBExtracting\fP
+
+Extraire un paquet natif revient  une simple extraction de l'archive TAR
+dans le rpertoire cible. L'extraction d'un paquet non\-natif consiste au
+dpaquetage du \fB.orig.tar.gz\fP puis l'application des correctifs contenues
+dans le \fB.diff.gz\fP. La date de tous les fichiers correctifs est celle du
+moment o a eu lieu l'extraction depuis le paquet source (cela vite les
+heures fausses menant  des problmes lorsque des fichiers gnrs
+automatiquement sont modifis). Le diff peut crer de nouveaux fichiers
+(tout le rpertoire debian est cr de cette faon) mais ne peut pas
+supprimer de fichiers (les fichiers vides seront laiss l).
+
+\fBConstruction\fP
+
+Construire un paquet natif revient simplement  crer une archive TAR avec
+le rpertoire du source. La cration d'un paquet non\-natif consiste 
+extraire l'archive d'origine dans un rpertoire spar ".orig" puis
+rgnrer le \fB.diff.gz\fP en comparant le \fIrpertoire\fP du paquet source avec
+rpertoire ".orig".
+
+.TP 
+\fBOptions de construction (avec \-b):\fP
+.PP
+Si l'on donne un second argument, ce sera le nom du rpertoire source
+d'origine ou le nom du fichier \ tar\  ou bien une chane vide si le paquet
+est un \ 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 donns, \fBdpkg\-source\fP cherche le fichier \ tar\  des
+sources d'origine \fIpaquet\fP\fB_\fP\fIversion\-d'origine\fP\fB.orig.tar.gz\fP ou bien
+le rpertoire source d'origine \fIrpertoire\fP\fB.orig\fP selon les paramtres
+\fB\-sX\fP.
+
+Les options \fB\-sa\fP, \fB\-sp\fP, \fB\-sk\fP, \fB\-su\fP et \fB\-sr\fP ne remplacent pas les
+fichiers \ tar\  ou les rpertoires existants. Pour cela, il faut utiliser
+les options \fB\-sA\fP, \fB\-sP\fP, \fB\-sK\fP, \fB\-sU\fP et \fB\-sR.\fP
+.TP 
+\fB\-sk\fP
+Quand on spcifie en fichier source d'origine un fichier \ tar\ \ ; par
+dfaut, \fIpaquet\fP\fB_\fP\fIversion\-d'origine\fP\fB.orig.tar\fP\fIextension\fP. Il le
+laisse en place en tant que fichier \ tar\  ou le copie dans le rpertoire
+en cours s'il n'y est pas dj. Le fichier sera dpaquet dans
+\fIrpertoire\fP\fB.orig\fP pour la gnration du fichier diff.
+.TP 
+\fB\-sp\fP
+Comme \fB\-sk\fP mais supprimera le rpertoire  nouveau par la suite.
+.TP 
+\fB\-su\fP
+Quand on spcifie que le source d'origine est un rpertoire\ ; la valeur par
+dfaut est le rpertoire \fIpaquet\fP\fB\-\fP\fIversion\-d'origine\fP\fB.orig\fP et
+\fBdpkg\-source\fP cre une nouvelle archive du source d'origine.
+.TP 
+\fB\-sr\fP
+Comme \fB\-su\fP mais supprimera ce rpertoire aprs utilisation.
+.TP 
+\fB\-ss\fP
+Indique que le source d'origine est disponible  la fois comme un rpertoire
+et comme un fichier \ tar\ . \ dpkg\-source\  se servira du rpertoire pour
+crer le \ diff\ , mais du fichier \ tar\  pour crer le fichier
+\&\fB.dsc\fP. Aussi, faire attention avec cette option. Si le rpertoire et le
+fichier \ tar\  ne correspondent pas, une mauvaise archive source en
+rsulte.
+.TP 
+\fB\-sn\fP
+Indique de ne pas chercher de source d'origine et de ne pas crer de
+\ diff\ . Le second argument, s'il existe, doit tre une chane vide. Cela
+sert pour les paquets Debian pure souche qui n'ont pas une source d'origine
+distincte et donc pas de fichier \ diff\  de debianisation.
+.TP 
+\fB\-sa\fP or \fB\-sA\fP
+Indique comme source d'origine soit un fichier \ tar\ , soit un rpertoire \-
+le deuxime argument, s'il existe, doit tre l'un d'eux ou bien une chane
+vide (cela revient  utiliser l'option \fB\-sn)\fP. Quand un fichier \ tar\ 
+existe, il est dpaquet pour crer le fichier \ diff\ \ ; ensuite il est
+supprim (cela revient  utiliser l'option \fB\-sp)\fP\ ; quand un rpertoire est
+trouv, il est dpaquet et \fBdpkg\-source\fP cre le source d'origine et
+supprime ensuite ce rpertoire (cela revient  utiliser l'option \fB\-sr)\fP\ ;
+quand ni l'un ni l'autre n'est trouv, \fBdpkg\-source\fP suppose que le paquet
+ne possde pas de fichier \ diff\  de debianisation, mais seulement une
+simple archive source (cela revient  utiliser l'option \fB\-sn\fP). Quand les
+deux sont trouvs, \fBdpkg\-source\fP ignore le rpertoire et le remplace si
+l'option \fB\-sA\fP a t spcifie (cela revient  utiliser l'option \fB\-sP)\fP ou
+il provoque une erreur si l'option \fB\-sa\fP a t spcifie. L'option par
+dfaut est \fB\-sA\fP.
+.TP 
+\fB\-\-abort\-on\-upstream\-changes\fP
+Ce processus choue si le fichier de diffrences contient des modifications
+apportes  des fichiers en dehors du sous\-rpertoire debian. Cette option
+n'est pas autorise dans \fBdebian/source/options\fP mais peut tre utilise
+dans \fBdebian/source/local\-options\fP.
+
+.TP 
+\fBoptions d'extractions (avec \-x):\fP
+.PP
+Dans tous ces cas, l'arborescence existante des sources d'origine est
+supprime.
+.TP 
+\fB\-sp\fP
+Quand on extrait le rpertoire source d'origine (s'il existe), il est
+conserv en tant que fichier \ tar\ . S'il n'est pas dj dans le rpertoire
+courant ou si ce rpertoire contient un fichier diffrent, le fichier
+\ tar\  est copi dans ce rpertoire. (\fBCeci est le comportement par
+dfaut\fP).
+.TP 
+\fB\-su\fP
+Dpaquetage de l'arborescence du rpertoire source d'origine.
+.TP 
+\fB\-sn\fP
+Assure que le rpertoire source d'origine ne sera ni copi dans le
+rpertoire en cours, ni dpaquet. Si une arborescence source d'origine est
+prsente dans le rpertoire courant, elle est toujours supprime.
+.PP
+Toutes les options \fB\-s\fP\fIX\fP s'excluent mutuellement. Si vous en indiquez
+plusieurs, seule la dernire sera prise en compte.
+.TP 
+\fB\-\-skip\-debianization\fP
+Passe l'tape d'application du fichier de diffrences Debian aux sources
+amont.
+.
+.SS "Format: 2.0"
+Aussi connu sous le nom de \ wig&pen\ . Ce format n'est pas recommand afin
+d'assurer une utilisation massive du format "3.0 (quilt)" qui le
+remplace. Wig&pen a t la premire spcification d'une nouvelle gnration
+de format de paquet source.
+
+Le comportement de ce format est le mme que pour le format "3.0 (quilt)"
+sauf qu'il n'utilise pas de liste explicite de correctifs. Tous les fichiers
+dans \fBdebian/patches/\fP correspondant  l'expression rationnelle Perl
+\fB[\ew\-]+\fP doivent tre des correctifs valides\ : ils sont appliqus au
+moment de l'extraction.
+
+Lors de la construction d'un nouveau paquet source, toute modification
+apporte  la source amont est enregistr dans un correctif nomm
+\fBzz_debian\-diff\-auto\fP.
+.
+.SS "Format: 3.0 (native)"
+Ce format est une extension du format de paquet natif tel que dfini dans le
+format 1.0. Il gre toutes les mthodes de compression et ignore par dfaut
+tout fichier et rpertoire VCS ainsi que de nombreux fichiers temporaires
+(voir la valeur par dfaut associ  l'option \fB\-I\fP dans la sortie de
+\fB\-\-help\fP).
+.
+.SS "Format: 3.0 (quilt)"
+Un paquet source dans ce format contient au moins une archive tar d'origine
+(\fB.orig.tar.\fP\fIext\fP o \fIext\fP peut tre \fBgz\fP, \fBbz2\fP \fBlzma\fP et \fBxz\fP) et
+une archive tar debian (\fB.debian.tar.\fP\fIext\fP). Il peut galement contenir
+d'autres archives tar d'origine
+(\fB.orig\-\fP\fIcomposant\fP\fB.tar.\fP\fIext\fP). \fIcomposant\fP ne peut tre constitu
+que de caractres alphanumriques et de tirets (\ \-\ ).
+.PP
+\fBExtracting\fP
+.PP
+L'archive principale tar d'origine est extraite tout d'abord, puis toutes
+les autres archives tar d'origine sont extraites dans des sous\-rpertoires
+dont le nom est form  partir de la partie \fIcomposant\fP de leur
+nom. L'archive tar Debian est extraite par dessus le rpertoire source,
+aprs la suppression de tout rpertoire \fBdebian\fP existant. Notez que
+l'archive tar Debian doit contenir un sous\-rpertoire \fBdebian\fP, mais il
+peut galement contenir des fichiers binaires en dehors de ce rpertoire
+(voir l'option \fB\-\-include\-binaries\fP).
+.PP
+Toutes les modifications figurant dans \fBdebian/patches/debian.series\fP ou
+\fBdebian/patches/series\fP sont alors appliques. Si l'ancien fichier est
+utilis et qu'il n'y a pas de plus rcent (ou que c'est un lien symbolique),
+alors celui\-ci est remplac par un lien symbolique vers l'ancien. Cette
+disposition vise  simplifier l'utilisation de \ quilt\  pour grer
+l'ensemble des patches. Notez toutefois que si \fBdpkg\-source\fP analyse
+correctement une srie de fichiers avec les options utilises pour
+l'application du correctif (stockes sur chaque ligne aprs le nom du patch
+et d'un ou plusieurs espaces), il n'ignore pas cesoptions et s'attendra
+toujours que les correctifs puissent tre appliqus avec l'option \fB\-p1\fP de
+\fBpatch\fP. Il va donc mettre un avertissement lorsqu'il rencontre ces
+options, et la construction est susceptible d'chouer.
+.PP
+Similaire au comportement par dfaut de \ quilt\ , les modifications peuvent
+aussi supprimer des fichiers.
+.PP
+Le fichier \fB.pc/applied\-patches\fP est cr si certains correctifs ont t
+appliqus au cours de l'extraction.
+.PP
+\fBConstruction\fP
+.PP
+All original tarballs found in the current directory are extracted in a
+temporary directory by following the same logic as for the unpack, the
+debian directory is copied over in the temporary directory, and all patches
+except the automatic patch (\fBdebian\-changes\-\fP\fIversion\fP or
+\fBdebian\-changes\fP, depending on \fB\-\-single\-debian\-patch\fP) are applied. The
+temporary directory is compared to the source package directory. When the
+diff is non\-empty, the build fails unless \fB\-\-single\-debian\-patch\fP or
+\fB\-\-auto\-commit\fP has been used, in which case the diff is stored in the
+automatic patch.  If the automatic patch is created/deleted, it's
+added/removed from the series file and from the quilt metadata.
+
+Tout changement dans un fichier binaire ne peut tre indiqu dans le diff et
+va dboucher sur un chec  moins que le mainteneur dcide dlibrment
+d'inclure cette modification binaire dans l'archive tar Debian (en le
+listant dans \fBdebian/source/include\-binaries\fP). La construction pourra
+galement chouer si des fichiers binaires sont trouvs dans le
+sous\-rpertoire debian sans tre indiqu dans la liste blanche de
+\fBdebian/source/include\-binaries\fP.
+
+Le rpertoire debian mis  jour et la liste des binaires modifis sont
+ensuite utiliss pour recrer l'archive tar debian.
+
+Le diff gnr automatiquement n'inclut pas les changements spcifiques sur
+les fichiers VCS ainsi sur que de nombreux fichiers temporaires (pour la
+valeur par dfaut associe  l'option \fB\-i\fP, voir la sortie de
+\fB\-\-help\fP). En particulier, le rpertoire \fB.pc\fP utilis par \ quilt\  est
+ignor lors de la gnration automatique du patch.
+
+Note: \fBdpkg\-source\fP \fB\-\-before\-build\fP (and \fB\-b\fP) will ensure that all
+patches listed in the series file are applied so that a package build always
+has all patches applied. It does this by finding unapplied patches (they are
+listed in the \fBseries\fP file but not in \fB.pc/applied\-patches\fP), and if the
+first patch in that set can be applied without errors, it will apply them
+all. The option \fB\-\-no\-preparation\fP can be used to disable this behavior.
+
+.PP
+\fBRecording changes\fP
+.TP 
+\fB\-\-commit\fP [\fIdirectory\fP] [\fIpatch\-name\fP] [\fIpatch\-file\fP]
+Generates a patch corresponding to the local changes that are not managed by
+the quilt patch system and integrates it in the patch system under the name
+\fIpatch\-name\fP. If the name is missing, it will be asked interactively. If
+\fIpatch\-file\fP is given, it is used as the patch corresponding to the local
+changes to integrate. This is mainly useful after a build failure that
+pre\-generated this file. Once integrated, an editor is launched so that you
+can edit the meta\-information in the patch header.
+
+.PP
+\fBOptions de construction\fP
+.TP 
+\fB\-\-allow\-version\-of\-quilt\-db=\fP\fIversion\fP
+Autorise \fBdpkg\-source\fP  construire le fichier si la version des
+mta\-donnes de quilt est celle indique, mme si \fBdpkg\-source\fP n'en n'a
+pas connaissance. En fait, cela indique que la version indique des
+mta\-donnes de quilt est compatible avec la version 2 que \fBdpkg\-source\fP
+gre. La version des mta\-donnes de quilt est conserve dans
+\&\fB.pc/.version\fP.
+.TP 
+\fB\-\-include\-removal\fP
+Ne pas ignorer les fichiers supprims et les inclure dans le fichier de
+modification gnr automatiquement.
+.TP 
+\fB\-\-include\-timestamp\fP
+Inclure la date dans le patch gnr automatiquement.
+.TP 
+\fB\-\-include\-binaries\fP
+Ajouter tous les binaires modifis dans l'archive tar debian. Les ajouter
+aussi  \fBdebian/source/include\-binaries\fP\ : elles seront ajoutes par dfaut
+dans les constructions correspondantes aussi cette option n'est donc plus
+ncessaire.
+.TP 
+\fB\-\-no\-preparation\fP
+Ne pas essayer de prparer l'arbre de la construction en appliquant les
+correctifs qui ne lui sont apparemment pas appliqus.
+.TP 
+\fB\-\-single\-debian\-patch\fP
+Use \fBdebian/patches/debian\-changes\fP instead of
+\fBdebian/patches/debian\-changes\-\fP\fIversion\fP for the name of the automatic
+patch generated during build. This option is particularly useful when the
+package is maintained in a VCS and a patch set can't reliably be
+generated. Instead the current diff with upstream should be stored in a
+single patch. The option would be put in \fBdebian/source/local\-options\fP and
+would be accompanied by a \fBdebian/source/local\-patch\-header\fP file
+explaining how the Debian changes can be best reviewed, for example in the
+VCS that is used.
+.TP 
+\fB\-\-create\-empty\-orig\fP
+Cre automatiquement une archive tar d'origine vide si elle est manquante et
+qu'il existe des archives tar d'origine additionnelles. Cette option peut
+tre utilise lorsque le paquet source est une collection de diffrentes
+sources amont et qu'il n'existe pas de logiciel  principal\ .
+.TP 
+\fB\-\-unapply\-patches\fP
+Unapply the patches in the \fB\-\-after\-build\fP hook. You usually don't need
+this option as dpkg\-source will automatically unapply the patches if it did
+apply them during \fB\-\-before\-build\fP. This option is only allowed in
+\fBdebian/source/local\-options\fP so that all generated source packages have
+the same behavior by default.
+.TP 
+\fB\-\-abort\-on\-upstream\-changes\fP
+Ce processus chouera si un correctif automatique a t cr. Elle peut
+servir  vrifier que toutes les modifications ont t enregistres
+correctement dans des correctifs quilt distincts avant la construction du
+paquet source. Elle n'est pas autorise dans \fBdebian/source/options\fP mais
+peut prendre place dans \fBdebian/source/local\-options\fP.
+.TP 
+\fB\-\-auto\-commit\fP
+The process doesn't fail if an automatic patch has been generated, instead
+it's immediately recorded in the quilt series.
+
+.PP
+\fBOptions d'extraction\fP
+.TP 
+\fB\-\-skip\-debianization\fP
+Passe l'tape d'extraction de l'archive tar debian par dessus les sources
+amont
+.TP 
+\fB\-\-skip\-patches\fP
+Ne pas appliquer des correctifs  la fin de l'extraction.
+.
+.SS "Format: 3.0 (custom)"
+This format is special. It doesn't represent a real source package format
+but can be used to create source packages with arbitrary files.
+.PP
+\fBOptions de construction\fP
+.PP
+Tous les arguments qui ne sont pas des options sont pris pour des fichiers 
+intgrer dans le paquet source gnr. Ils doivent exister et tre de
+prfrence dans le rpertoire courant. Au moins un fichier doit tre donn.
+.TP 
+\fB\-\-target\-format=\fP\fIvaleur\fP
+\fBRequired\fP. Dfinit le format rel du paquet source gnr. Le fichier
+gnr .dsc contiendra cette valeur dans son champ \fIformat\fP et non "3.0
+(custom)".
+.
+.SS "Format: 3.0 (git)"
+Ce format est exprimental.
+.PP
+Un paquet source qui utilise ce format est constitu d'un ensemble d'un seul
+dpt git \fB.git\fP qui contient les sources du paquet.  Il peut galement
+exister un fichier \fB.gitshallow\fP qui donne les rvisions d'un clone git
+\ shallow\ .
+.PP
+\fBExtracting\fP
+.PP
+Cet ensemble est clon sous forme d'un dpt git dans le rpertoire
+cible. S'il existe un fichier .gitshallow, il est install en tant que
+\ .git/shallow\  dans le dpt git clon.
+.PP
+Veuillez noter que, par dfaut, le nouveau dpt aura la mme branche
+rcupre que celle qui tait rcupre dans les sources d'origine (souvent
+\ master\  mais cela peut tre tout  fait autre chose). Toutes les autres
+branches seront disponibles sous \ remotes/origin\ .
+.PP
+\fBConstruction\fP
+.PP
+Avant d'aller plus loin, quelques vrifications sont effectues afin de
+s'assurer qu'il n'existe aucun changement non\-soumis et  ne pas ignorer.
+.PP
+\fBgit\-bundle\fP(1) permet de crer un ensemble  partir du dpt git. Par
+dfaut, toutes les branches et tiquettes du dpt sont inclus dans cet
+ensemble.
+.PP
+\fBOptions de construction\fP
+.TP 
+\fB\-\-git\-ref=\fP\fIrf\fP
+Permet d'indiquer une rfrence git  inclure dans l'ensemble
+git. L'utilisation de cette option dsactive le comportement par dfaut qui
+est d'inclure toutes les branches et tiquettes. Cette option peut\-tre
+utilise plusieurs fois. Le paramtre \fIrf\fP peut tre le nom d'une branche
+ou une tiquette  inclure. Il peut galement tre tout paramtre que l'on
+peut passer  \fBgit\-rev\-list\fP(1). Par exemple, pour n'inclure que la
+\ master\ , on peut utiliser \-\-git\-ref=master. Pour inclure toutes les
+tiquettes et toutes les branches, sauf la branche prive, on peut utiliser
+\-git\-ref=\-\-all \-\- git\-ref=^private.
+.TP 
+\fB\-\-git\-depth=\fP\fInombre\fP
+Cre un clone \ shallow\  dont l'historique est tronqu au nombre indiqu de
+rvisions.
+.SS "Format: 3.0 (bzr)"
+Ce format est exprimental. Il cre une archive tar contenant le dpt bzr
+correspondant.
+.PP
+\fBExtracting\fP
+.PP
+L'archive tar est dcompresse puis bzr est utilis afin de rcuprer la
+branche courante.
+.PP
+\fBConstruction\fP
+.PP
+Avant d'aller plus loin, quelques vrifications sont effectues afin de
+s'assurer qu'il n'existe aucun changement non\-soumis et  ne pas ignorer.
+.PP
+Ensuite, la partie spcifique du rpertoire source du gestionnaire de
+versions est copie dans un rpertoire temporaire. Avant que ce rpertoire
+temporaire ne soit empaquet dans une archive tar, divers nettoyages sont
+effectues pour conomiser de l'espace.
+.SH "AVERTISSEMENTS ET ERREURS"
+.SS "aucun format source indiqu dans debian/source/format"
+Le fichier \fBdebian/source/format\fP devrait toujours exister et indiquer le
+format source souhait. Pour prserver la compatibilit avec d'anciennes
+versions, le format \ 1.0\  est implicite quand le fichier n'existe pas. Il
+est dconseill de dpendre de ce comportement qui pourrait tre modifi
+dans de futures versions de dpkg\-source, qui choueront alors en l'absence
+d'une mention explicite de format.
+
+Cela est d au fait que le format \ 1.0\  n'est plus le format recommand,
+qu'il est conseill de choisir un des formats les plus rcents (\ 3.0
+(quilt)\  ou \ 3.0 (native)\ ) mais que dpkg\-source ne le fera pas
+automatiquement. Si vous souhaitez continuer  utiliser l'ancien format, il
+est ncessaire d'tre explicite et indiquer \ 1.0\  dans
+\fBdebian/source/format\fP.
+.SS "le fichier de diffrences modifie les fichiers amont suivants"
+Lors de l'utilisation du format source \ 1.0\ , il est dconseill de
+modifier directement les fichiers amont car les modifications restent alors
+caches et souvent non documentes dans le fichier diff.gz. AU contraire, il
+est conseill de conserver les modifications sous forme de correctifs dans
+le rpertoire debian et de les appliquer au moment de la construction. Pour
+viter ces oprations plus complexes, vous pouvez galement choisir le
+format \ 3.0 (quilt)\  qui permet ces oprations de manire native.
+.SS "impossible d'identifier les changements de \fIfichier\fP"
+Les modifications des sources amont sont en gnral conserves dans des
+fichiers de correctifs mais certaines modifications ne peuvent tre
+reprsentes sous forme de tels fichiers qui ne peuvent modifier que des
+fichiers texte. Si vous essayez de remplacer un fichier avec un objet d'un
+type diffrent (par exemple remplacer un fichier par un lien ou un
+rpertoire), ce message d'erreur s'affichera.
+.SS "le fichier \fIfichier\fP, nouvellement cr, ne sera pas reprsent dans le fichier de diffrences"
+Les fichiers vides ne peuvent pas tre crs avec des correctifs. En
+consquence, la modification n'est pas enregistre dans le paquet source, ce
+qui provoque cet avertissement.
+.SS "le mode excutable \fIpermissions\fP de \fIfichier\fP ne sera pas reprsent dans le fichier de diffrences"
+.SS "le mode spcial \fIpermissions\fP de \fIfichier\fP ne sera pas reprsent dans le fichier de diffrences"
+Les fichiers correctifs n'enregistrent pas les permissions de fichiers et,
+en consquence, les permissions modifies ne sont pas enregistres dans le
+paquet source, ce qui provoque cet avertissement.
+.SH "FORMATS DE FICHIERS"
+.SS debian/source/format
+Ce fichier contient sur une seule ligne le format  utiliser pour construire
+le paquet source (les formats accepts sont dcrits plus haut). Il ne doit
+pas contenir d'espaces avant ou aprs l'indication du format.
+.SS debian/source/include\-binaries
+Ce fichier contient une liste de fichiers binaires (un par ligne) qui
+doivent tre inclus dans l'archive tar debian. Les espaces placs avant ou
+aprs ces noms sont supprims. Les lignes commenant par \ #\  sont des
+commentaires et sont ignores, ainsi que les lignes vides.
+.SS debian/source/options
+Ce fichier contient la liste des options qui seront automatiquement ajoutes
+au jeu d'options de ligne de commande utilises par \fBdpkg\-source \-b\fP ou
+\fBdpkg\-source \-\-print\-format\fP. Des options comme \fB\-\-compression\fP et
+\fB\-\-compression\-level\fP conviennent bien pour ce fichier.
+.P
+Chaque option doit tre place sur une ligne distincte. Les lignes vides et
+les lignes commenant par le caractre \ #\  sont ignores. Les caractres
+initiaux \ \-\-\  doivent tre retirs et les options courtes ne peuvent pas
+tre utilises. Des espaces optionnels sont autoriss autour du symbole
+\ =\ , ainsi que des guillemets optionnels autour de la valeur d'une option
+donne. Voici un exemple d'un tel fichier\ :
+.P
+  # let dpkg\-source create a debian.tar.bz2 with maximal compression
+  compression = "bzip2"
+  compression\-level = 9
+  # use debian/patches/debian\-changes as automatic patch
+  single\-debian\-patch
+  # ignore changes on config.{sub,guess}
+  extend\-diff\-ignore = "(^|/)(config.sub|config.guess)$"
+.P
+Note\ : les options de \fBformat\fP ne sont pas acceptes dans ce fichier. Vous
+devriez utiliser \fBdebian/source/format\fP  la place.
+.SS debian/source/local\-options
+Identique  \fBdebian/source/options\fP mais n'est pas enregistr dans le
+paquet source cr. Ce fichier peut tre utile pour conserver une prfrence
+propre au responsable ou au dpt de gestionnaire de versions o le paquet
+source est gr.
+.SS debian/source/local\-patch\-header
+.SS debian/source/patch\-header
+Free form text that is put on top of the automatic patch generated in
+formats "2.0" or "3.0 (quilt)". \fBlocal\-patch\-header\fP is not included in the
+generated source package while \fBpatch\-header\fP is.
+.SS debian/patches/series
+Ce fichier comporte la liste de toutes les corrections qui ont t
+appliques (dans l'ordre indiqu) aux sources amont. Les espaces situs
+avant et aprs les noms sont ignors. Les lignes commenant par \ #\  sont
+des commentaires et sont ignores, ainsi que les lignes vides. Les autres
+lignes dbutent par le nom du fichier de correction (relatif au rpertoire
+\fBdebian/patches/\fP) qui se termine au premier espace ou  la fin de la
+ligne. Des options facultatives de quilt peuvent tre places jusqu' la fin
+de la ligne ou jusqu'au premier caractre \ #\  prcd par un ou plusieurs
+espaces (qui indique un commentaire qui se poursuit jusqu' la fin de la
+ligne).
+.SH BOGUES
+Le moment o a lieu le remplacement d'un champ par rapport  certaines
+dterminations de champ affiches sur la sortie standard est plutt
+embrouill.
+.SH "VOIR AUSSI"
+\fBdpkg\-deb\fP(1), \fBdpkg\fP(1), \fBdselect\fP(1).
+.
+.SH AUTEURS
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2008\-2011 Rapha\[:e]l Hertzog
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-split.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-split.1
--- dpkg/man/fr/dpkg-split.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-split.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,195 @@
+.\" Authors: Ian Jackson
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-split 1 07\-04\-2011 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-split \- outil de dcomposition/recomposition des paquets Debian
+.
+.SH SYNOPSIS
+\fBdpkg\-split\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH DESCRIPTION
+\fBdpkg\-split\fP dcompose les fichiers d'un paquet binaire Debian en parties
+plus petites (et les recompose), pour permettre l'enregistrement des
+fichiers d'un paquet volumineux sur des mdia de faible capacit tels que
+les disquettes.
+
+On peut s'en servir \  la main\  avec les options \fB\-\-split\fP, \fB\-\-join\fP et
+\fB\-\-info\fP.
+
+Il possde aussi un mode automatique, appel avec l'option \fB\-\-auto\fP, dans
+lequel il conserve sparment dans une file les parties connues ou recompose
+le fichier d'un paquet quand il connat toutes ses parties. Les options
+\fB\-\-listq\fP et \fB\-\-discard\fP permettent la gestion de cette file.
+
+Toutes les oprations de dcomposition, recomposition ou de mise en file
+produisent des messages sur la sortie standard\ ; ils peuvent tre
+tranquillement ignors.
+.
+.SH COMMANDES
+.TP 
+\fB\-s\fP, \fB\-\-split\fP \fIarchive\-complte\fP [\fIprfixe\fP]
+Dcompose en plusieurs parties un paquet binaire Debian.
+
+Le nom d'une partie est\ : \fIprfixe\fP\fB.\fP\fIN\fP\fBde\fP\fIM\fP\fB.deb\fP o \fIN\fP le
+numro de partie, commenant  1, et \fIM\fP est le nombre total de parties
+(les deux sont des dcimaux).
+
+Quand on ne donne pas de \fIprfixe\fP, le nom du fichier \fIarchive\-complte\fP
+est utilis, en incluant le rpertoire et en supprimant tout \fB.deb\fP
+restant.
+.TP 
+\fB\-j\fP, \fB\-\-join\fP \fIpartie\fP...
+Rassemble les parties d'un fichier, recomposant ainsi le fichier d'origine
+tel qu'il tait avant la dcomposition.
+
+Ces parties, donnes comme arguments, doivent appartenir toutes au mme
+fichier binaire d'origine. Chaque partie ne doit apparatre qu'une seule
+fois dans la liste des arguments\ ; mais il est inutile de les ordonner.
+
+Les parties doivent bien sr avoir t cres selon le mme modle (taille
+maximum des parties), qui est dclar au moment de la dcomposition\ ; ce qui
+signifie en fait qu'elles doivent avoir t cres par le mme appel 
+\fBdpkg\-split \-\-split\fP.
+
+Les parties des noms ne sont pas significatives pour le processus de
+recomposition.
+
+By default the output file is called
+\fIpackage\fP\fB_\fP\fIversion\fP\fB_\fP\fIarch\fP\fB.deb\fP.
+
+.TP 
+\fB\-I\fP, \fB\-\-info\fP \fIpartie\fP...
+Affiche les renseignements concernant telle partie dans un format lisible
+par tous. Les arguments ne reprsentant pas la partie d'un fichier binaire
+le disent aussi sur la sortie standard.
+.TP 
+\fB\-a\fP, \fB\-\-auto \-o\fP \fIfichier\-complet partie\fP
+Met en file automatiquement les parties en vue de la recomposition d'un
+paquet.
+
+La \fIpartie\fP dclare est examine et compare avec les autres parties du
+mme paquet qui se trouvent (si elles existent) dans la file.
+
+Quand toutes les parties d'un fichier (auquel appartient la partie \fIpart\fP)
+sont prsentes, le fichier est recompos et cr en tant que
+\fIfichier\-complet\fP (ce fichier ne devrait pas dj exister, mais ce n'est
+pas une erreur).
+
+Quand ce n'est pas le cas, la partie \fIpart\fP est mise dans la file et le
+fichier \fIfichier\-complet\fP n'est pas cr.
+
+If \fIpart\fP is not a split binary package part then \fBdpkg\-split\fP will exit
+with status \fB1\fP; if some other trouble occurs then it will exit with status
+\fB2\fP.
+
+L'option \fB\-\-output\fP ou \fB\-o\fP doit tre fournie avec l'action \fB\-\-auto\fP. Si
+cela n'tait pas obligatoire, le programme appelant ne saurait pas quel
+fichier attendre.
+.TP 
+\fB\-l\fP, \fB\-\-listq\fP
+Liste le contenu d'une file de paquets  recomposer.
+
+Pour chaque fichier possdant des parties dans la file, cette action donne
+le nom du fichier, les parties prsentes dans la file et le nombre total
+d'octets conservs.
+.TP 
+\fB\-d\fP, \fB\-\-discard\fP [\fIpaquet\fP...]
+Cette action laisse de ct certaines parties dans la file, celles qui sont
+en attente des autres parties composant le paquet.
+
+Quand aucun \fIpaquet\fP n'est donn, la file est vide\ ; si un paquet est
+donn, seules les parties de ce paquet sont dtruites.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH OPTIONS
+.TP 
+\fB\-\-depotdir\fP\fI rpertoire\fP
+Indique un rpertoire diffrent pour la file comprenant les parties en
+attente d'une recomposition automatique. Par dfaut, c'est le rpertoire
+\fB/var/lib/dpkg\fP.
+.TP 
+\fB\-S\fP, \fB\-\-partsize\fP \fIkibi\-octets\fP
+Indique, en kibi\-octets (1024 octets), la taille maximum d'une partie lors
+d'une dcomposition. Par dfaut, la taille maximum est de 450\ Kio.
+.TP 
+\fB\-o\fP, \fB\-\-output\fP \fIfichier\-complet\fP
+Indique le nom du fichier  produire pour une recomposition.
+
+Cela annule le fichier par dfaut lors d'une recomposition \  la main\ 
+(\fB\-\-join\fP) et c'est obligatoire pour une recomposition ou une mise en file
+automatiques (\fB\-\-auto\fP).
+.TP 
+\fB\-Q\fP, \fB\-\-npquiet\fP
+Pour une recomposition ou une mise en file automatiques, \fBdpkg\-split\fP
+affiche habituellement un message si on lui donne une \fIpartie\fP qui n'est
+pas une partie d'un paquet binaire. Cette option supprime ce message\ ; cela
+permet  des programmes comme \fBdpkg\fP de ne pas afficher de faux messages
+quand il est confront  des paquets dcomposs et des paquets non
+dcomposs.
+.TP 
+\fB\-\-msdos\fP
+Oblige le nom des fichiers produits par \fB\-\-split\fP  se conformer  msdos.
+
+Cela supprime le prfixe \- soit celui par dfaut driv du fichier d'entre,
+soit celui donn comme argument\ : les caractres alphanumriques sont en
+minuscules, les signes plus sont remplacs par des \fBx\fP et tous les autres
+caractres sont abandonns.
+
+le rsultat est alors tronqu autant que ncessaire et des fichiers de la
+forme\ : \fIprefixN\fP\fBof\fP\fIM\fP\fB.deb\fP sont crs.
+.
+.SH "CODE DE SORTIE"
+.TP 
+\fB0\fP
+The requested split, merge, or other command succeeded.  \fB\-\-info\fP commands
+count as successful even if the files are not binary package parts.
+.TP 
+\fB1\fP
+Only occurs with \fB\-\-auto\fP and indicates that the \fIpart\fP file was not a
+binary package part.
+.TP 
+\fB2\fP
+Some kind of trouble happened, 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.
+.
+.SH BOGUES
+On ne peut pas obtenir tous les dtails voulus sur les paquets prsents dans
+la file  moins d'aller voir soi\-mme dans le rpertoire de la file.
+
+On ne peut pas facilement savoir si un fichier est vraiment la partie d'un
+paquet binaire ou non.
+.
+.SH FICHIERS
+.TP 
+\fI/var/lib/dpkg/parts\fP
+Le rpertoire par dfaut de la file contenant les fichiers qui attendent une
+recomposition automatique.
+
+Les noms de fichiers utiliss dans ce rpertoire sont dans un format
+particulier  \fBdpkg\-split\fP et ne sont sans doute pas utiles pour d'autres
+programmes\ ; en tous cas on ne peut pas compter sur ce format de nom de
+fichier.
+.
+.SH "VOIR AUSSI"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\-deb\fP(1), \fBdpkg\fP(1).
+.
+.SH AUTEUR
+Copyright \(co 1995\-1996 Ian Jackson
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-statoverride.8 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-statoverride.8
--- dpkg/man/fr/dpkg-statoverride.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-statoverride.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,100 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-statoverride 8 07\-04\-2011 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-statoverride \- annuler la proprit et le mode des fichiers
+.
+.SH SYNOPSIS
+\fBdpkg\-statoverride\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH DESCRIPTION
+Les \ \fBdrogations au statut\fP\  sont une faon de demander  \fBdpkg\fP(1) de
+changer le propritaire ou le mode d'un fichier lors de l'installation d'un
+paquet. (Note\ : je dis \ fichier\  ici, mais cela peut tre en ralit
+n'importe quel systme de fichiers grable par Dpkg, par exemple, des
+rpertoires, des priphriques, etc.) On peut s'en servir pour forcer
+l'installation de programmes qui sont normalement \ setuid\  sans ce drapeau
+\ setuid\ , ou pour les rendre excutables seulement par un groupe donn.
+.P
+\fBdpkg\-statoverride\fP est un utilitaire pour grer la liste des
+drogations. Il possde trois fonctions lmentaires\ : l'ajout, la
+suppression et le listage des drogations.
+.
+.SH COMMANDES
+.TP 
+\fB\-\-add\fP\fI utilisateur groupe mode fichier\fP
+Ajoute une drogation (\ override\ ) pour \fIfichier\fP. \fIfichier\fP n'a pas
+besoin d'exister quand cette commande est utilise\ ; la drogation est
+stocke et utilise par la suite. Les utilisateurs ou les groupes peuvent
+tre indiqus par leur nom (par exemple \fBroot\fP ou \fBnobody\fP), ou bien par
+leur numro, en prfixant ce numro par le caractre \ \fB#\fP\  (par exemple,
+\fB#0\fP ou \fB#65534\fP). Le \fImode\fP doit tre indiqu en numrotation octale.
+
+Si \-\-update est utilise et si \fIfichier\fP existe, le fichier obtient un
+nouveau propritaire et un nouveau mode.
+.TP 
+\fB\-\-remove\fP\fI fichier\fP
+Supprime une drogation (\ override\ ) pour \fIfichier\fP, l'tat de \fIfichier\fP
+est inchang.
+.TP 
+\fB\-\-list\fP [\fIexp\-reg\fP]
+Liste toutes les drogations. Quand on donne une expression rationnelle, on
+rduit la sortie aux drogations qui correspondent au motif. Quand il n'y a
+pas de drogation, ou quand aucune ne correspond au motif,
+\fBdpkg\-statoverride\fP se termine avec un code de sortie gal  1.
+.TP 
+\fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH OPTIONS
+.TP 
+\fB\-\-admindir\fP\fI rpertoire\fP
+Change le \fIrpertoire\fP de la base de donnes de dpkg, o se trouve aussi le
+fichier statoverride. La valeur par dfaut est \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-\-force\fP
+Forcer une opration, mme si une vrification raisonnable
+l'interdirait. C'est ncessaire pour annuler une prcdente drogation.
+.TP 
+\fB\-\-update\fP
+Essayer de changer immdiatement le propritaire et le mode du fichier si ce
+fichier existe.
+.TP 
+\fB\-\-quiet\fP
+Moins de bavardage sur ce qui est fait.
+.
+.SH ENVIRONNEMENT
+.TP 
+\fBDPKG_ADMINDIR\fP
+If set and the \fB\-\-admindir\fP option has not been specified, it will be used
+as the dpkg data directory.
+.
+.SH FICHIERS
+.TP 
+\fI/var/lib/dpkg/statoverride\fP
+Ce fichier contient la liste actuelle des drogations concernant le
+systme. Il se trouve dans le rpertoire d'administration de Dpkg, avec les
+autres fichiers importants comme \ status\  ou \ available\ .
+.br
+Note\ : \fBdpkg\-statoverride\fP garde une copie de ce fichier, avec une
+extension "\-old", avant de le remplacer par un nouveau.
+.
+.SH "VOIR AUSSI"
+\fBdpkg\fP(1).
+.
+.SH AUTEUR
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-trigger.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-trigger.1
--- dpkg/man/fr/dpkg-trigger.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-trigger.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,78 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-trigger 1 2011\-08\-14 "Projet Debian" "suite dpkg"
+.SH NOM
+dpkg\-trigger \- un utilitaire pour activer les actions diffres de paquets
+.
+.SH SYNOPSIS
+\fBdpkg\-trigger\fP [\fIoption\fP...] \fInom\-action\-diffre\fP
+.br
+\fBdpkg\-trigger\fP [\fIoption\fP...] \fIcommande\fP
+.
+.SH DESCRIPTION
+\fBdpkg\-trigger\fP est un outil pour activer explicitement les actions
+diffres et pour vrifier leur gestion dans le fonctionnement de \fBdpkg\fP.
+.PP
+Utilisable par les scripts du mainteneur dans certaines situations complexes
+o un fichier d'actions diffres (\ triggers\ ) ou la directive \fBactivate\fP
+du fichier de contrle des actions diffres ne sont pas suffisants. Peut
+galement tre utilis pour des essais ou par les administrateurs systme
+(noter que les actions diffres ne seront alors pas excutes par
+\fBdpkg\-trigger\fP).
+.PP
+Les syntaxes non\-reconnues pour le nom des actions diffres constituent une
+erreur pour \fBdpkg\-trigger\fP.
+.
+.SH COMMANDES
+.TP 
+\fB\-\-check\-supported\fP
+Check if the running \fBdpkg\fP supports triggers (usually called from a
+postinst). Will exit \fB0\fP if a triggers\-capable \fBdpkg\fP has run, or \fB1\fP
+with an error message to stderr if not. Normally, however, it is better just
+to activate the desired trigger with \fBdpkg\-trigger\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH OPTIONS
+.TP 
+\fB\-\-admindir\fP=\fIdir\fP
+Change l'endroit o se trouve la base de donnes de \fBdpkg\fP. Par dfaut,
+c'est \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-\-by\-package=\fP\fIpaquet\fP
+Override trigger awaiter (normally set by \fBdpkg\fP through the
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP environment variable of the maintainer scripts,
+naming the package to which the script belongs, and this will be used by
+default).
+.TP 
+\fB\-\-no\-await\fP
+Cette option fait en sorte que le paquet appelant T (s'il existe) n'a pas
+besoin d'attendre l'excution de cette action diffre\ ; I, le(s) paquet(s)
+associ(s)  l'action diffre, ne sera pas ajout  liste des paquets dont
+le traitement des actions diffres est attendu par T et l'tat de T reste
+inchang. T peut tre considr install mme si les actions diffres de I
+n'ont pas encore t excutes.
+.TP 
+\fB\-\-no\-act\fP
+Teste uniquement, n'apporte aucun changement.
+.
+.SH ENVIRONNEMENT
+.TP 
+\fBDPKG_ADMINDIR\fP
+If set and the \fB\-\-admindir\fP option has not been specified, it will be used
+as the dpkg data directory.
+.
+.SH "VOIR AUSSI"
+\fBdpkg\fP(1), \fBdeb\-triggers\fP(5), \fB/usr/share/doc/dpkg\-dev/triggers.txt.gz\fP.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dpkg-vendor.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-vendor.1
--- dpkg/man/fr/dpkg-vendor.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dpkg-vendor.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,62 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-vendor 1 07\-04\-2011 "Projet Debian" "suite dpkg"
+.SH NOM
+dpkg\-vendor \- rcupre les informations sur les diteurs de distribution
+.
+.SH SYNOPSIS
+\fBdpkg\-vendor\fP [\fIoption\fP...] \fIcommande\fP
+.
+.SH DESCRIPTION
+\fBdpkg\-vendor\fP est un outil qui permet de rcuprer des informations sur les
+diteurs (\ vendors\ ) de distributions rfrencs dans
+\fB/etc/dpkg/origins\fP. \fB/etc/dpkg/origins/default\fP contient l'information
+relative  l'diteur actuellement utilis.
+.
+.SH COMMANDES
+.TP 
+\fB\-\-is\fP\fI diteur\fP
+Exits with \fB0\fP if the current vendor is \fIvendor\fP. Otherwise exits with
+non\-zero.
+.TP 
+\fB\-\-derives\-from\fP\fI diteur\fP
+Exits with \fB0\fP if the current vendor distribution is a derivative of
+\fIvendor\fP, otherwise exits with non\-zero. It uses the "Parent" field to
+browse all ancestors of the current vendor.
+.TP 
+\fB\-\-query\fP\fI champ\fP
+Affiche sur la sortie standard la valeur du champ spcifique \fIchamp\fP de
+l'diteur actuel.
+.TP 
+\fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH OPTIONS
+.TP 
+\fB\-\-vendor\fP\fI diteur\fP
+Assumes the current vendor is \fIvendor\fP instead of discovering it with the
+\fBDEB_VENDOR\fP environment variable or \fB/etc/dpkg/origins/default\fP.
+.
+.SH ENVIRONNEMENT
+.TP 
+\fBDEB_VENDOR\fP
+Ce rglage dfinit l'diteur (\ vendor\ ) actuel. Si cette valeur est vide,
+le contenu du fichier \fB/etc/dpkg/origins/default\fP est utilis.
+.
+.SH AUTEUR
+Copyright \(co 2009 Rapha\[:e]l Hertzog
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dselect.1 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dselect.1
--- dpkg/man/fr/dselect.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dselect.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,453 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dselect 1 2011\-08\-14 "Projet Debian" Debian
+.SH NOM
+dselect \- Interface de gestion de paquets Debian.
+.
+.SH SYNOPSIS
+\fBdselect\fP [\fIoption\fP...] [\fIaction\fP]
+.
+.SH DESCRIPTION
+\fBdselect\fP est une des principales interfaces de gestion des paquets sur un systme Debian.  partir du menu principal de \fBdselect\fP, l'administrateur systme peut\ :
+ \- Mettre  jour la liste des versions des paquets disponibles,
+ \- Voir l'tat des paquets installs ou disponibles,
+ \- Modifier les slections de paquets et grer les dpendances,
+ \- Installer de nouveaux paquets ou mettre  jour vers de nouvelles versions.
+.PP
+\fBdselect\fP est une interface au dessus de \fBdpkg\fP(1), l'outil bas niveau de
+gestion des paquets Debian. Il propose  l'cran un gestionnaire de
+slections de paquets avec la possibilit de rsoudre les conflits et
+dpendances. Excut avec les droits administrateur, il permet d'installer
+des paquets, les mettre  jour ou les retirer. Plusieurs mthode d'accs
+peuvent tre configures pour rcuprer les informations sur les versions
+des paquets disponibles et les paquets eux\-mmes dans les dpts de
+paquets. Suivant la mthode d'accs utilise, ces dpts peuvent tre des
+serveurs d'archives publics sur Internet, des serveurs locaux ou des
+CDROM. La mthode d'accs recommande est \fIapt\fP, qui est fournie par le
+paquet \fBapt\fP.
+.PP
+Normally \fBdselect\fP 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 command line
+parameters are still available to modify the running behaviour of \fBdselect\fP
+or show additional information about the program.
+.
+.SH OPTIONS
+All options can be specified both on the command line and in the \fBdselect\fP
+configuration file \fI/etc/dpkg/dselect.cfg\fP or the files on the
+configuration directory \fI/etc/dpkg/dselect.cfg.d/\fP. 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 \fB#\fP).
+.br
+.TP 
+\fB\-\-admindir\fP\fI rpertoire\fP
+Change le rpertoire o les fichiers \ \fIstatus\fP\ , \ \fIavailable\fP\  et
+autres sont situs. Le rpertoire par dfaut est \fI/var/lib/dpkg\fP et il ne
+devrait pas avoir besoin de le modifier.
+.TP 
+\fB\-\-debug\fP\fI file \fP|\fI \fP\fB\-D\fP\fIfile\fP
+Turn on debugging. Debugging information is sent to \fIfile\fP.
+.TP 
+\fB\-\-expert\fP
+Activer le mode expert, c'est\-\-dire ne pas afficher les messages d'aide
+ennuyeux.
+.TP 
+\fB\-\-colour\fP|\fB\-\-color\fP \fIpartie_cran:\fP[\fIpremier_plan\fP],[\fIarrire_plan\fP][\fI:attr\fP[\fI+attr+..\fP]]
+Configure les couleurs des crans. Ceci ne fonctionne que si votre terminal
+gre les couleurs. Cette option peut\-tre utilise plusieurs fois (et il est
+prfrable de l'utiliser dans \fIdselect.cfg\fP). Chaque utilisation change la
+couleur (et, en option, d'autres attributs) d'une partie de l'cran. Les
+parties de l'cran (de haut en bas) sont\ :
+.RS
+.TP 
+\fBtitle\fP
+Le titre de l'cran.
+.TP 
+\fBlisthead\fP
+La ligne d'en\-tte au dessus de la liste de paquets.
+.TP 
+\fBlist\fP
+La liste droulante de paquets (et de textes explicatifs).
+.TP 
+\fBlistsel\fP
+L'lment slectionn dans la liste.
+.TP 
+\fBpkgstate\fP
+Dans la liste des paquets, le texte qui indique l'tat actuel de chaque
+paquet.
+.TP 
+\fBpkgstatesel\fP
+Dans la liste des paquets, le texte qui indique l'tat actuel du paquet
+slectionn.
+.TP 
+\fBinfohead\fP
+La ligne d'en\-tte qui affiche l'tat du paquet slectionn.
+.TP 
+\fBinfodesc\fP
+La description courte du paquet.
+.TP 
+\fBinfo\fP
+Utilis pour afficher les informations sur le paquet, comme par exemple la
+description du paquet.
+.TP 
+\fBinfofoot\fP
+La dernire ligne de l'cran lors de la slection des paquets.
+.TP 
+\fBquery\fP
+Utilis pour les lignes des recherches.
+.TP 
+\fBhelpscreen\fP
+La couleur des crans d'aide.
+.RE
+.P
+Aprs la partie de l'cran concerne, vient un signe deux\-points et la
+spcification des couleurs. Pour surcharger les valeurs des couleurs
+compiles, vous pouvez indiquer la couleur du premier plan, de
+l'arrire\-plan, ou les deux. Utilisez les noms standard de couleurs curses.
+.P
+En option, les spcifications des couleurs peuvent tre suivies d'un signe
+deux\-points et de la spcification d'un attribut. Il s'agit d'une liste
+d'attributs, spars par des caractres plus (\ +\ ). Parmi les attributs
+disponibles, on trouve (tous ne fonctionnent pas sur tous les terminaux)\ :
+normal, standout, underline, reverse, blink, bright, dim et bold.
+.TP 
+\fB\-\-help\fP
+Affiche une aide rapide et se termine normalement.
+.TP 
+\fB\-\-version\fP
+Affiche la version et se termine normalement.
+.
+.SH ACTIONS
+When \fBdselect\fP is started it can perform the following actions, either
+directly if it was specified on the command line or by prompting the user
+with a menu of available actions if running interactively:
+.SS "Accder (access)"
+Choisir et configurer une mthode d'accs aux dpts de paquets.
+.sp
+By default, \fBdselect\fP provides several methods such as \fIcdrom\fP,
+\fImulti_cd\fP, \fInfs\fP, \fImulti_nfs\fP, \fIharddisk\fP, \fImounted\fP, \fImulti_mount\fP,
+\fIfloppy\fP or \fIftp\fP, but other packages may provide additional methods,
+eg. the \fIapt\fP access method provided by the \fBapt\fP package.
+.sp
+L'utilisation de la mthode d'accs \fIapt\fP est fortement conseille.
+.sp
+.SS "Mise  jour (update)"
+Rafrachir la liste des paquets disponibles.
+.sp
+Rcupre une liste de versions de paquets disponibles depuis un dpt de
+paquets, qui a t configur pour la mthode d'accs actuelle, puis met 
+jour la base de donnes de dpkg. Les listes de paquets sont d'habitude
+fournis par les dpts sous la forme de fichiers \fIPackages\fP ou
+\fIPackages.gz\fP. Ces fichiers peuvent tre gnrs par les responsables des
+dpts grce au programme \fBdpkg\-scanpackages\fP(1).
+.sp
+Le fonctionnement dtaill des mises  jour dpend de l'implmentation de la
+mthode d'accs. Normalement le processus se passe tout seul, sans
+intervention de l'utilisateur.
+.sp
+.SS "Slectionner (select)"
+Voir ou grer les paquets slectionns et les dpendances.
+.sp
+Il s'agit de la fonction principale de \fBdselect\fP. Dans l'cran de
+slection, l'utilisateur peut consulter la liste de tous les paquets
+disponibles ou installs. Excut avec les privilges administrateur, il
+permet galement de changer de faon interactive l'tat de paquets
+slectionns. \fBdselect\fP vrifie les implications de ces changements
+vis\-\-vis des dpendances et des conflits entre paquets.
+.sp
+Lorsqu'un conflit ou une dpendance manquante est dtect, un sous\-cran de
+rsolution des dpendances est propos  l'utilisateur. Dans cet cran, une
+liste de paquets avec des conflits ou avec des dpendances manquantes est
+affiche et pour chaque paquet list, la raison de sa prsence dans cette
+liste est indique. L'utilisateur peut ensuite appliquer les suggestion de
+\fBdselect\fP, les modifier ou supprimer toutes les modifications, dont celles
+qui ont cr les conflits ou dpendances non rsolues.
+.sp
+L'utilisation de l'cran interactif des slections de paquets est explique
+de faon plus dtaille ci\-dessous.
+.sp
+.SS "Installer (install)"
+Installer les paquets slectionns.
+.sp
+La mthode d'accs rcuprera dans les dpts les paquets qui peuvent tre
+installs ou mis  jour, puis les installe avec \fBdpkg\fP. En fonction de la
+mthode d'accs, les paquets peuvent tre tous rcuprs avant installation,
+ou rcuprs  la demande. Certaines mthodes d'accs retirent galement les
+paquets qui ont t marqus pour tre retirs.
+.sp
+Si une erreur apparat lors de l'installation, il est recommand de
+redmarrer une installation. La plupart des fois, les problmes
+disparaissent ou sont rsolus. Si les problmes persistent ou si
+l'installation n'est pas correcte, veuillez examiner les causes et
+circonstances puis soumettez un rapport de bogue au systme de suivi des
+bogues Debian. Les instructions pour soumettre ces rapports de bogues se
+trouvent sur http://bugs.debian.org/ ou dans la page de manuel de
+\fBreportbug\fP(1), si ce paquet est install.
+.sp
+Les dtails de l'action d'installation dpendent de l'implmentation de la
+mthode d'accs. L'attention et la contribution de l'utilisateur peuvent
+tre ncessaire lors de l'installation ou du retrait des paquets. Ceci
+dpend des scripts des responsables des paquets. Certains paquets utilisent
+la bibliothque \fBdebconf\fP(1), ce qui permet la mise en place
+d'installations plus flexibles ou mme automatises.
+.sp
+.SS "Configurer (config)"
+Configure les paquets dj installs mais n'tant pas compltement
+installs.
+.sp
+.SS "Retirer (remove)"
+Retirer ou purger les paquets installs qui sont marqus comme tant 
+retirer.
+.sp
+.SS "Quitter (quit)"
+Quitter \fBdselect\fP
+.sp
+Quitte le programme avec un code d'erreur de 0 (succs).
+.sp
+.
+.SH "Gestion des slections de paquets"
+.sp
+.SS Introduction
+.sp
+\fBdselect\fP expose directement l'administrateur  une partie de la complexit
+lie  la gestion d'un grand nombre de paquets ayant beaucoup de liens entre
+eux. Pour un utilisateur qui n'est pas habitu aux concepts et au systme de
+gestion des paquets Debian, cela peut tre perturbant. Mais \fBdselect\fP est
+conu pour aider la gestion et l'administration des paquets. Ce n'est qu'un
+outil, et ne doit pas remplacer la comprhension et les aptitudes d'un
+administrateur. L'utilisateur doit tre familier des concepts sous\-jacents
+au systme de gestion des paquets Debian. En cas de doute, consultez la page
+de manuel \fBdpkg\fP(1) et la charte Debian prsente dans le paquet
+\fBdebian\-policy\fP.
+.sp
+A moins que \fBdselect\fP soit lanc en mode expert ou intermdiaire, un
+message d'aide est d'abord affich lorsque cette action est choisie dans le
+menu. Il est \fBfortement\fP conseill  l'utilisateur d'tudier toutes les
+informations dans ces crans d'aide lorsqu'ils apparaissent. Les crans
+d'aide peuvent tre affichs  tout moment  l'aide de la touche \ \fB?\fP\ .
+.sp
+.SS "Disposition de l'cran"
+.sp
+L'cran de slection est dcoup par dfaut en une moiti suprieure et une
+moiti infrieure. La moiti suprieure affiche une liste de paquets. Un
+curseur permet de slectionner un paquet, ou un groupe de paquet en
+slectionnant le titre du groupe, si a s'applique. La moiti infrieure de
+l'cran affiche les dtails du paquet slectionn dans la moiti
+suprieure. Le type de dtail affich peut varier.
+.sp
+Appuyez sur la touche \ \fBI\fP\  pour passer d'un affichage de la liste des
+paquets en mode plein\-cran,  un affichage plus important des dtails des
+paquets ou  un mode partag quitablement.
+.sp
+.SS "Vue des dtails d'un paquet"
+.sp
+La vue des dtails d'un paquet affiche par dfaut la description longue du paquet slectionn dans la liste des paquets. Le type de dtail peut tre modifi en pressant la touche \ \fBi\fP\ . Ceci permet de passer de\ :
+ \- la description longue
+ \- les informations de contrle de la version installe
+ \- les informations de contrle de la version disponible
+.sp
+Dans un cran de rsolution des dpendances, on peut galement voir les
+dpendances et conflits spcifiques au paquet et qui expliquent la prsence
+du paquet dans la liste.
+.sp
+.SS "Liste des tats des paquets"
+.sp
+L'cran principal de slection affiche une liste de tous les paquets connus
+par le systme de gestion des paquets Debian. Ceci inclus les paquets
+installs sur le systme et les paquets connus par la base de donnes des
+paquets disponibles.
+.sp
+Pour tous les paquets, la liste affiche sur une ligne l'tat du paquet, sa
+priorit, sa section, les versions installes et disponibles, le nom du
+paquet et sa description courte. En appuyant sur la touche \ \fBV\fP\ , on peut
+activer ou dsactiver l'affichage des versions installes et disponibles. En
+appuyant sur la touche \ \fBv\fP\ , l'affichage de l'tat passe d'un mode
+verbeux  un mode raccourci. Par dfaut, l'tat raccourci est utilis.
+.sp
+L'tat raccourci consiste en 4 parties\ : un drapeau d'erreur, qui est
+d'habitude vide, l'tat courant, l'tat de slection prcdent et l'tat de
+slection actuel. Les deux premiers donnent des indications sur l'tat
+courant du paquet, les deux suivants concernent les slections dfinies par
+l'utilisateur.
+.sp
+Voici la signification des codes d'indication des tats\ :
+ Drapeau d'erreur\ :
+  \fIvide\fP    aucune erreur\ ;
+  \fBR\fP       erreur srieuse, rinstallation ncessaire.
+ tat d'installation\ :
+  \fIvide\fP    pas install\ ;
+  \fB*\fP       compltement install et configur\ ;
+  \fB\-\fP       pas install, mais des fichiers de configuration existent toujours\ ;
+  \fBU\fP       dpaquet, mais toujours pas configur\ ;
+  \fBC\fP        moiti configur (il y a eu une erreur)\ ;
+  \fBI\fP        moiti install (il y a eu une erreur).
+ Slection actuelle et demande\ :
+  \fB*\fP       marqu comme tant  installer ou  mettre  jour\ ;
+  \fB\-\fP       marqu comme tant  retirer, en conservant la configuration\ ;
+  \fB=\fP       marqu comme  conserver\ : le paquet ne sera pas trait\ ;
+  \fB_\fP       marqu comme tant  nettoy, la configuration sera retire galement\ ;
+  \fBn\fP       nouveau paquet, n'a toujours pas t marqu.
+.sp
+.SS "Dplacement du curseur et de l'cran"
+.sp
+Vous pouvez naviguer dans la liste de slection des paquets et dans l'cran
+de rsolution des dpendances et des conflits  l'aide des touches
+suivantes\ :
+.br
+  \fBp, Haut, k\fP             dplace le curseur vers le haut
+  \fBn, Bas, j\fP              dplace le curseur vers le bas
+  \fBP, Page\-prc., Effacer\fP fait dfiler la liste d'une page vers le haut
+  \fBN, Page\-suiv., Espace\fP  fait dfiler la liste d'une page vers le bas
+  \fB^p\fP                     fait dfiler la liste d'une ligne vers le haut
+  \fB^n\fP                     fait dfiler la liste d'une ligne vers le bas
+  \fBt, Home\fP                saute au dbut de la liste
+  \fBe, Fin\fP                 saute  la fin de la liste
+  \fBu\fP                      fait dfiler les informations d'une page vers le haut
+  \fBd\fP                      fait dfiler les informations d'une page vers le bas
+  \fB^u\fP                     fait dfiler les informations d'une ligne vers le haut
+  \fB^d\fP                     fait dfiler les informations d'une ligne vers le bas
+  \fBB, gauche\fP              dplace l'affichage de 1/3 vers la gauche
+  \fBF, droite\fP              dplace l'affichage de 1/3 vers la droite
+  \fB^b\fP                     dplace l'affichage d'un caractre vers la gauche
+  \fB^f\fP                     dplace l'affichage d'un caractre vers la droite
+.sp
+.SS "Recherches et tris"
+.sp
+On peut rechercher un paquet par son nom dans la liste des paquets. Pour
+cela, il faut presser la touche \ \fB/\fP\ , puis taper le texte 
+rechercher. Ce texte est interprt comme une expression rationnelle (voir
+\fBregex\fP(7)). Si vous ajoutez \ \fB/d\fP\   la recherche, dselect recherchera
+galement dans les descriptions. Si vous ajoutez \ \fB/i\fP\ , la recherche ne
+prend pas en compte la casse. Les deux suffixes peuvent tre combins comme
+ceci\ : \ \fB/id\fP\ . La recherche peut tre rpte en appuyant sur la touche
+\ \fBn\fP\  ou \ \fB\e\fP\ , jusqu' ce que le paquet soit trouv. Lorsque la
+recherche atteint la fin de la liste, elle recommence au dbut.
+.sp
+On peut changer l'ordre du tri en appuyant sur la touche \ \fBo\fP\  ou \ \fBO\fP\ . Les neuf systmes de tris suivants existent\ :
+ alphabtique      disponible           tat
+ priorit+section  disponible+priorit  tat+priorit
+ section+priorit  disponible+section   tat+section
+.br
+Lorsqu'il n'est pas indiqu, l'ordre alphabtique est utilis comme dernier
+critre de tri.
+.sp
+.SS "Modifier les slections"
+.sp
+Le type de slection demand d'un paquet peut tre chang  l'aide des commandes suivantes\ :
+  \fB+, Inser\fP     installer ou mettre  jour
+  \fB=, H\fP          garder dans l'tat et la version actuels
+  \fB:, G\fP         ne plus garder\ : mettre  jour ou laisser non install
+  \fB\-, Suppr\fP     retirer, en gardant la configuration
+  \fB_\fP            retirer et supprimer la configuration
+.sp
+Lorsque la demande de modification entrane des dpendances non satisfaites
+ou des conflits, \fBdselect\fP fournit  l'utilisateur un cran de rsolution
+des dpendances. Ceci sera dcrit plus tard.
+.sp
+Il est galement possible d'appliquer ces commandes  des groupes de
+slections de paquets en plaant le curseur sur le titre d'un groupe. Le
+regroupement des paquets dpend de la faon dont les paquets sont tris dans
+la liste.
+.sp
+Une attention particulire doit tre prise lors de la modification de grands
+groupes de slections, parce qu'ils peuvent crer rapidement un nombre
+important de dpendances non rsolues ou de conflits, qui seraient tous
+lists dans un cran de rsolution de dpendances, le rendant difficile 
+utiliser. En pratique, seules les oprations \  garder\  et \ ne plus
+garder\  sont utiles pour les groupes.
+.sp
+.SS "Rsoudre les dpendances et les conflits"
+.sp
+Lorsque la demande de modification entrane des dpendances non satisfaites
+ou des conflits, \fBdselect\fP fournit  l'utilisateur un cran de rsolution
+des dpendances. Mais un cran d'information est affich dans un premier
+temps.
+.sp
+La moiti suprieure de cet cran liste tous les paquets ayant des
+dpendances non rsolues ou des conflits dus aux modifications demandes,
+ainsi que les paquets dont l'installation permettrait de rsoudre une
+dpendance ou dont le retrait permettrait de rsoudre un conflit. La moiti
+infrieure affiche par dfaut les dpendances ou conflits pour lesquels le
+paquet slectionn se trouve prsent dans la liste.
+.sp
+Quand la sous\-liste de paquets est affiche pour la premire fois,
+\fBdselect\fP peut avoir dj fix les tats demands pour certains des paquets
+lists, ceci afin de rsoudre les dpendances ou les conflits qui ont caus
+l'apparition de l'cran de rsolution des dpendances. Il est d'habitude
+recommand de suivre les suggestions de \fBdselect\fP.
+.sp
+Le type de slection des paquets lists peut tre remis dans leurs tats
+prcdents, avant que le problme de dpendance ou le conflit soit cr, en
+appuyant sur la touche \ \fBR\fP\ . La touche \ \fBD\fP\  permet de remettre 
+zro les suggestions automatiques, tout en conservant les modifications qui
+ont causes l'apparition de l'cran de rsolution des dpendances. Enfin, la
+touche \ \fBU\fP\  permet de rtablir les suggestions automatiques.
+.sp
+.SS "tablir les slections demandes"
+.sp
+En appuyant sur \fBEntre\fP, les slections affiches sont acceptes. Si
+\fBdselect\fP ne dtecte pas de dpendances non rsolues du fait de ces
+slections, les nouvelles slections sont tablies. Cependant, si des
+dpendances non rsolues sont trouves, \fBdselect\fP affichera de nouveau un
+cran de rsolution des dpendances.
+.sp
+Pour modifier un jeu de slections qui causent des dpendances non rsolues
+ou des conflits, et forcer \fBdselect\fP  l'accepter, appuyez sur la touche
+\ \fBQ\fP\ . Ceci fixe les slections telles qu'elles sont dfinies par
+l'utilisateur, sans condition. En gnral, ne faites pas cela, sauf si vous
+avez bien lu ce qu'il y a d'crit.
+.sp
+L'effet inverse, qui consiste  oublier les demandes de modification des
+slections et revenir  la liste prcdente de slections, peut tre obtenu
+en appuyant sur la touche \ \fBX\fP\  ou \ \fBEchap\fP\ . En rptant l'opration,
+on peut compltement revenir  la dernire configuration tablie.
+.sp
+Si par erreur vous avez fix certains paramtres et que vous souhaitez
+revenir en arrire sur ce qui est actuellement install sur le systme,
+appuyez sur la touche \fB'C'\fP. C'est un peu comme utiliser la commande de
+dblocage sur tous les paquets, mais cela offre un bouton panique plus
+vident pour les cas o l'utilisateur  appuy sur \fBentrer\fP
+accidentellement.
+.sp
+.
+.SH ENVIRONNEMENT
+.TP 
+\fBHOME\fP
+Si positionn, sera utilis par \fBdselect\fP comme le rpertoire d'o sera lu
+le fichier de configuration propre  l'utilisateur.
+.
+.SH BOGUES
+L'interface \fBdselect\fP de slection de paquets est droutante pour les
+nouveaux utilisateurs. On rapporte mme qu'elle fait pleurer certains
+dveloppeurs chevronns du noyau (NdT\ :\ du moins les derniers historiques
+dinosaures qui s'en servent encore).
+.sp
+La documentation manque.
+.sp
+Il n'existe pas d'option d'aide dans le menu.
+.sp
+La liste visible des paquets disponibles ne peut pas tre rduite.
+.sp
+La mthode d'accs intgre ne satisfait pas les normes de qualit
+actuelles. Utilisez plutt la mthode fournie par APT. Non seulement elle
+n'est pas casse, mais en plus elle est plus souple que la mthode d'accs
+intgre.
+.
+.SH "VOIR AUSSI"
+\fBdpkg\fP(1), \fBapt\-get\fP(8), \fBsources.list\fP(5), \fBdeb\fP(5).
+.
+.SH AUTEURS
+\fBdselect\fP a t crit par Ian Jackson (ijackson@gnu.ai.mit.edu). La liste
+complte des contributeurs est affiche par \ dselect \-\-version\ .
+.br
+Cette page de manuel a t crite par Juho Vuori
+<javuori@cc.helsinki.fi>, Josip Rodin et Joost kooij.
+
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/dselect.cfg.5 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dselect.cfg.5
--- dpkg/man/fr/dselect.cfg.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/dselect.cfg.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,34 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dselect.cfg 5 2011\-07\-03 "Projet Debian" "suite dpkg"
+.SH NOM
+dselect.cfg \- Fichier de configuration de dselect
+.
+.SH DESCRIPTION
+This file contains default options for dselect. Each line contains a single
+option which is exactly the same as a normal command line option for dselect
+except for the leading dashes which are not used here. Quotes surrounding
+option values are stripped. Comments are allowed by starting a line with a
+hash sign ("\fB#\fP").
+.
+.SH FICHIERS
+\fI/etc/dpkg/dselect.cfg.d/[0\-9a\-zA\-Z_\-]*\fP
+.br
+\fI/etc/dpkg/dselect.cfg\fP
+.br
+\fI~/.dselect.cfg\fP
+.
+.SH AUTEUR
+Consultez \fI/usr/share/doc/dpkg/THANKS\fP pour la liste de ceux qui ont
+contribu  \fBdselect\fP.
+.
+.SH "VOIR AUSSI"
+\fBdselect\fP(1).
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/fr/update-alternatives.8 /home/vorlon/devel/multiarch/dpkg-debian/man/fr/update-alternatives.8
--- dpkg/man/fr/update-alternatives.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/fr/update-alternatives.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,426 @@
+.\" update\-alternatives.8
+.\" This man page is copyright 1997 Charles Briscoe-Smith
+.\" This is free documentation; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published
+.\" by the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.  There is NO WARRANTY.  You can
+.\" find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH update\-alternatives 8 2011\-08\-14 "Projet Debian" "Utilitaires de dpkg"
+.SH NOM
+update\-alternatives \- maintenance des liens symboliques dterminant les noms
+par dfaut de certaines commandes
+.
+.SH SYNOPSIS
+\fBupdate\-alternatives\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH DESCRIPTION
+\fBupdate\-alternatives\fP cre, enlve, conserve et affiche des informations
+concernant les liens symboliques qui forment le systme Debian des
+\ alternatives\ .
+.PP
+Il est possible d'installer, sur un mme systme et en mme temps, des
+programmes qui remplissent des fonctions identiques ou semblables. Par
+exemple, beaucoup de systmes installent plusieurs diteurs de texte en mme
+temps. Cela permet  chaque utilisateur d'un systme de choisir, s'il le
+dsire, un diteur de texte diffrent\ ; mais cela rend les choses difficiles
+pour le programme qui doit choisir un bon diteur de texte quand
+l'utilisateur n'a pas fait de choix prcis.
+.PP
+Le systme Debian des \ alternatives\  essaie de rsoudre ce problme. Tous
+les fichiers qui proposent des fonctions interchangeables se servent d'un
+nom gnrique qui se trouve dans l'arborescence. Le systme des
+\ alternatives\  et l'administrateur systme font connatre ensemble le
+fichier qui est rellement vis par ce nom gnrique. Par exemple, si les
+diteurs de texte \fBed\fP(1) et \fBnvi\fP(1) sont tous les deux installs, le
+systme des \ alternatives\  fait que le nom gnrique \fI/usr/bin/editor\fP
+renvoie par dfaut  \fI/usr/bin/nvi\fP. L'administrateur systme peut
+remplacer cette assignation par \fI/usr/bin/ed\fP et le systme des
+\ alternatives\  ne la changera pas tant qu'on ne lui aura pas demand
+explicitement de le faire.
+.PP
+Le nom gnrique n'est pas un lien symbolique direct vers l'alternative
+choisie. C'est en fait un lien symbolique vers un nom situ dans le
+\fIrpertoire\fP \fIdes \ alternatives\ \fP, lequel nom est  son tour un lien
+symbolique vers le fichier rellement vis. Les modifications faites par
+l'administrateur systme sont ainsi confines dans le rpertoire \fI/etc\fP\ ;
+le FHS (lisez\-le) donne de Bonnes Raisons de faire ainsi.
+.PP
+Chaque fois qu'un paquet proposant un fichier pour une fonction dtermine,
+est install, modifi ou dsinstall, \fBupdate\-alternatives\fP est appel pour
+mettre  jour les informations concernant ce fichier dans le systme des
+\ alternatives\ . En gnral, \fBupdate\-alternatives\fP est appel dans les
+scripts \fBpostinst\fP (configure) et \fBprerm\fP (install) des paquets Debian.
+.PP
+Il est souvent utile de synchroniser certaines alternatives, de manire 
+pouvoir les manipuler globalement\ ; par exemple, quand plusieurs versions de
+\fBvi\fP(1)  sont installes, la page de manuel qui est vise par
+\fI/usr/share/man/man1/vi.1\fP devrait correspondre 
+\fI/usr/bin/vi\fP. \fBupdate\-alternatives\fP gre ce problme avec les liens
+\fIprincipaux (\ master\ )\fP et les liens \fIsecondaires (\ slave\ )\fP. Quand le
+lien principal est chang, tous les liens secondaires associs sont
+changs. Un lien principal et ses liens secondaires associs composent un
+\fIgroupe\fP de \fIliens.\fP
+.PP
+ tout moment, un groupe de liens est dans l'un des deux modes suivants\ :
+automatique ou manuel. Quand un groupe est dans le mode automatique et que
+des paquets sont installs ou dsinstalls, le systme des \ alternatives\ 
+dcide automatiquement s'il doit mettre  jour les liens et comment le
+faire. Dans le mode manuel, le systme des \ alternatives\  ne change pas
+les liens et laisse l'administrateur systme prendre toutes les dcisions
+(sauf si quelque chose est cass).
+.PP
+Un groupe de liens est en mode automatique quand il est cre sur un systme
+pour la premire fois. Quand l'administrateur systme modifie le paramtrage
+automatique du systme, \fBupdate\-alternatives\fP le remarquera la prochaine
+fois qu'il sera lanc pour ce groupe aux liens modifis et il fera passer ce
+groupe en mode manuel.
+.PP
+ chaque alternative est associe une \fIpriorit\fP. Quand un groupe de liens
+est en mode automatique, l'alternative vise par les lments du groupe est
+celle qui possde la priorit la plus leve.
+.PP
+When using the \fB\-\-config\fP option, \fBupdate\-alternatives\fP will list all of
+the choices for the link group of which given \fIname\fP is the master
+alternative name. The current choice is marked with a '*'.  You will then be
+prompted for your choice regarding this link group.  Depending on the choice
+made, the link group might no longer be in \fIauto\fP mode. You will need to
+use the \fB\-\-auto\fP option in order to return to the automatic mode (or you
+can rerun \fB\-\-config\fP and select the entry marked as automatic).
+.PP
+If you want to configure non\-interactively you can use the \fB\-\-set\fP option
+instead (see below).
+.PP
+Les diffrents paquets qui fournissent un mme fichier doivent le faire en
+\fBcollaborant\fP. En d'autres termes, l'utilisation de \fBupdate\-alternatives\fP
+est \fBobligatoire\fP pour tous les paquets qui sont dans ce cas et il n'est
+pas possible de remplacer un fichier d'un paquet qui n'utilise pas le
+mcanisme offert par \fBupdate\-alternatives\fP.
+.
+.SH TERMINOLOGIE
+Comme les oprations de \fBupdate\-alternatives\fP sont trs compliques, voici
+quelques termes qui faciliteront l'explication.
+.TP 
+nom gnrique (ou lien alternatif)
+C'est un nom, par exemple \fI/usr/bin/editor\fP, qui renvoie,  travers le
+systme des \ alternatives\ ,  l'un des fichiers qui remplissent des
+fonctions similaires.
+.TP 
+nom alternatif
+Nom d'un lien symbolique dans le rpertoire des alternatives.
+.TP 
+alternative (ou chemin alternatif)
+C'est le nom d'un fichier particulier dans l'arborescence\ ; il peut tre
+accessible avec un nom gnriques grce au systme d'alternatives.
+.TP 
+rpertoire des alternatives 
+C'est le rpertoire qui contient les liens symboliques\ ; il s'agit par
+dfaut de \fI/etc/alternatives.\fP
+.TP 
+rpertoire administratif
+C'est le rpertoire qui contient des renseignements sur l'tat de
+\fBupdate\-alternatives.\fP Il s'agit par dfaut de
+\fI/var/lib/dpkg/alternatives.\fP
+.TP 
+groupe de liens
+C'est un ensemble de liens symboliques corrls, de manire qu'on puisse les
+mettre  jour en une seule fois.
+.TP 
+lien principal
+Dans un groupe de liens, le lient alternatif est le lien qui dtermine
+comment sont configurs les autres liens du groupe.
+.TP 
+lien secondaire (\ slave\ )
+Un lien alternatif est un groupe de liens contrls par le rglage du lien
+principal.
+.TP 
+mode automatique
+Quand un groupe de liens est en mode automatique, le systme des
+\ alternatives\  assure que les liens dans le groupe pointent vers
+l'alternative possdant la priorit la plus leve dans ce groupe.
+.TP 
+mode manuel 
+Quand un groupe de liens est en mode manuel, le systme des \ alternatives\ 
+ne modifie pas le paramtrage de l'administrateur systme.
+.
+.SH COMMANDES
+.TP 
+\fB\-\-install\fP \fIlien nom chemin priorit\fP [\fB\-\-slave\fP \fIlien nom chemin\fP]...
+Ajoute un groupe d'alternatives au systme. \fIlien\fP est le nom gnrique du
+lien principal, \fInom\fP est le nom de son lien symbolique, et \fIchemin\fP est
+l'alternative prsente pour le lien principal. Les paramtres qui suivent
+\fB\-\-slave\fP sont le nom gnrique, le lien symbolique dans le rpertoire des
+alternatives et l'alternative pour un lien secondaire. On peut indiquer zro
+ou plusieurs options \fB\-\-slave\fP chacune suivie par trois
+paramtres. L'alternative principale doit exister, sinon la commande
+chouera. Cependant, si une alternative secondaire n'existe pas, le lien
+secondaire ne sera simplement pas install (mais un avertissement sera
+affich). Si un fichier existe  l'emplacement o l'alternative doit tre
+installe, il est conserv sauf si \fB\-\-force\fP est utilis.
+.IP
+Quand le lien principal spcifi existe dj dans les enregistrements du
+systme des \ alternatives\ , les renseignements fournis sont ajouts dans
+un nouvel ensemble d'alternatives pour le groupe. Sinon, un nouveau groupe
+contenant ces informations est ajout et mis en mode automatique. Quand un
+groupe est en mode automatique, et que la priorit des alternatives
+nouvellement ajoutes est suprieure  celle de toutes les alternatives
+installes dans ce groupe, les liens symboliques sont mis  jour et pointent
+vers les alternatives nouvellement ajoutes.
+.TP 
+\fB\-\-set\fP \fInom chemin\fP
+Set the program \fIpath\fP as alternative for \fIname.\fP This is equivalent to
+\fB\-\-config\fP but is non\-interactive and thus scriptable.
+.TP 
+\fB\-\-remove\fP \fInom chemin\fP
+Enlve une alternative et tous ses liens secondaires associs. \fInom\fP est un
+nom dans le rpertoire des \ alternatives\ , et \fIchemin\fP est un nom de
+fichier auquel \fInom\fP peut tre li. Quand \fInom\fP est en effet li 
+\fIchemin\fP, \fInom\fP est mis  jour et pointe vers une autre alternative
+adquate ou bien est enlev s'il n'y en a pas d'autre. De mme, les liens
+secondaires associs sont mis  jour ou enlevs. Quand le lien ne pointe pas
+dj sur \fIchemin\fP, aucun lien n'est modifi\ ; seules les informations sur
+l'alternative sont supprimes.
+.TP 
+\fB\-\-remove\-all\fP \fInom\fP
+Supprime toutes les alternatives et tous les liens secondaires
+associs. \fInom\fP est un nom dans le rpertoire des alternatives.
+.TP 
+\fB\-\-all\fP
+Utilise \fB\-\-call\fP sur toutes les alternatives. Cette option peut tre
+combine avec \fB\-\-skip\-auto\fP pour revoir et configurer toutes les
+alternatives qui ne sont pas en mode automatique. Les alternatives errones
+sont aussi affiches. Ainsi, une mthode simple pour corriger les
+alternatives casses est d'utiliser \fByes \[aq]\[aq] | update\-alternatives
+\-\-force \-\-all\fP.
+.TP 
+\fB\-\-auto\fP \fInom\fP
+Passe le lien symbolique principal \fInom\fP en mode automatique. En mme
+temps, le lien symbolique principal et ses liens secondaires sont mis  jour
+et pointent vers les alternatives avec les priorits les plus leves.
+.TP 
+\fB\-\-display\fP \fInom\fP
+Affiche des renseignements sur le groupe de liens. L'information affiche
+comprend le mode du groupe (auto ou manuel), vers quelle alternative le lien
+symbolique pointe actuellement, quelles autres alternatives sont disponibles
+(et les liens secondaires associs), et l'alternative actuellement installe
+qui possde la priorit la plus leve.
+.TP 
+\fB\-\-get\-selections\fP
+Affiche tous les noms principaux d'alternatives (ceux qui contrlent un
+groupe de liens) ainsi que leur tat. Chaque ligne comporte jusqu' trois
+champs (spars par un ou plusieurs espaces). Le premier est le nom de
+l'alternative, le second est son tat (\ auto\  ou \ manual\ ) et le dernier
+montre le choix actuel pour l'alternative (il s'agit d'un nom de fichier,
+qui peut contenir des espaces).
+.TP 
+\fB\-\-set\-selections\fP
+Lit la configuration des alternatives sur l'entre standard, dans le format
+utilis par \fBupdate\-alternatives \-\-get\-selections\fP et les configure en
+consquence.
+.TP 
+\fB\-\-query\fP \fInom\fP
+Affiche des informations sur le groupe de liens de manire analogue 
+\-\-display, mais sous une forme qui peut tre analyse automatiquement (voir
+la section \fBFORMAT DE REQUTE\fP ci\-dessous).
+.TP 
+\fB\-\-list\fP \fInom\fP
+Affiche toutes les cibles du groupe de liens.
+.TP 
+\fB\-\-config\fP \fInom\fP
+Affiche les alternatives disponibles pour un groupe de liens et permetde
+choisir interactivement laquelle doit tre utilise. Le groupe de liens est
+mis  jour.
+.TP 
+\fB\-\-help\fP
+Affiche un message d'aide puis quitte.
+.TP 
+\fB\-\-version\fP
+Affiche le numro de version puis quitte.
+.
+.SH OPTIONS
+.TP 
+\fB\-\-altdir\fP\fI rpertoire\fP
+Donne le rpertoire des alternatives, quand il est diffrent de celui par
+dfaut.
+.TP 
+\fB\-\-admindir\fP\fI rpertoire\fP
+Donne le rpertoire administratif, quand il est diffrent de celui par
+dfaut.
+.TP 
+\fB\-\-log\fP\fI fichier\fP
+Indique le fichier journal, pour utiliser un fichier diffrent du fichier
+par dfaut (/var/log/alternatives.log).
+.TP 
+\fB\-\-force\fP
+Let \fBupdate\-alternatives\fP replace or drop any real file that is installed
+where an alternative link has to be installed or removed.
+.TP 
+\fB\-\-skip\-auto\fP
+Passe l'invite de configuration pour les alternatives qui sont correctement
+configures en mode automatique. Cette option n'est pertinente qu'avec
+\fB\-\-config\fP ou \fB\-\-all\fP.
+.TP 
+\fB\-\-verbose\fP
+produit plus de commentaires sur ce que fait \fBupdate\-alternatives\fP.
+.TP 
+\fB\-\-quiet\fP
+Ne cre pas de commentaire  moins qu'une erreur ne survienne.
+.
+.SH ENVIRONNEMENT
+.TP 
+\fBDPKG_ADMINDIR\fP
+If set and the \fB\-\-admindir\fP option has not been specified, it will be used
+as the base administrative directory.
+.
+.SH FICHIERS
+.TP 
+\fI/etc/alternatives/\fP
+Le rpertoire des \ alternatives\  par dfaut. Peut tre remplac avec
+l'option \fB\-\-altdir\fP.
+.TP 
+\fI/var/lib/dpkg/alternatives/\fP
+Le rpertoire administratif par dfaut. Peut tre remplac avec l'option
+\fB\-\-admindir\fP
+.
+.SH "CODE DE SORTIE"
+.TP 
+\fB0\fP
+L'action demande s'est correctement droule.
+.TP 
+\fB2\fP
+Des problmes sont survenus lors de l'analyse de la ligne de commande ou
+bien pendant l'excution de l'action.
+.
+.SH "FORMAT DE REQUTE"
+The \fBupdate\-alternatives \-\-query\fP format is using an RFC822\-like flat
+format. It's made of \fIn\fP + 1 blocks where \fIn\fP is the number of
+alternatives available in the queried link group. The first block contains
+the following fields:
+.TP 
+\fBLink:\fP\fI link\fP
+Nom gnrique de l'alternative.
+.TP 
+\fBStatus:\fP\fI status\fP
+tat de l'alternative (\fBauto\fP ou \fBmanual\fP).
+.TP 
+\fBBest:\fP\fI best\-choice\fP
+Chemin de la meilleure alternative pour ce groupe de liens. N'est pas
+prsent si aucun alternative n'est disponible.
+.TP 
+\fBValue:\fP\fI currently\-selected\-alternative\fP
+Chemin de l'alternative actuellement choisie. Peut aussi prendre la valeur
+spciale \fBnone\fP, utilise si le lien n'existe pas.
+.TP 
+.TP 
+Les autres blocs dcrivent les alternatives disponibles dans le groupe de liens interrog.
+.TP 
+\fBAlternative:\fP\fI path\-of\-this\-alternative\fP
+Chemin vers l'alternative de ce bloc
+.TP 
+\fBPriority:\fP\fI priority\-value\fP
+Valeur de la priorit alternative.
+.TP 
+\fBSlaves:\fP\fI list\-of\-slaves\fP
+Lorsque cet en\-tte est prsent, la ligne suivante contient toutes les
+alternatives secondaires associes au lien principal de cette alternative, 
+raison d'une alternative secondaire par ligne. Chaque ligne comporte un
+espace, le nom de l'alternative secondaire, un espace et le chemin vers
+l'alternative secondaire.
+.
+.TP 
+\fBExemple\fP
+.nf
+$ update\-alternatives \-\-query editor
+Link: editor
+Status: auto
+Best: /usr/bin/vim.gtk
+Value: /usr/bin/vim.gtk
+
+Alternative: /bin/ed
+Priority: \-100
+Slaves:
+ editor.1.gz /usr/share/man/man1/ed.1.gz
+
+Alternative: /usr/bin/vim.gtk
+Priority: 50
+Slaves:
+ editor.1.gz /usr/share/man/man1/vim.1.gz
+ editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz
+ editor.pl.ISO8859\-2.1.gz /usr/share/man/pl.ISO8859\-2/man1/vim.1.gz
+ editor.it.ISO8859\-1.1.gz /usr/share/man/it.ISO8859\-1/man1/vim.1.gz
+ editor.pl.UTF\-8.1.gz /usr/share/man/pl.UTF\-8/man1/vim.1.gz
+ editor.it.1.gz /usr/share/man/it/man1/vim.1.gz
+ editor.fr.UTF\-8.1.gz /usr/share/man/fr.UTF\-8/man1/vim.1.gz
+ editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz
+ editor.it.UTF\-8.1.gz /usr/share/man/it.UTF\-8/man1/vim.1.gz
+ editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz
+ editor.fr.ISO8859\-1.1.gz /usr/share/man/fr.ISO8859\-1/man1/vim.1.gz
+.fi
+.
+.SH DIAGNOSTICS
+With \fB\-\-verbose\fP \fBupdate\-alternatives\fP chatters incessantly about its
+activities on its standard output channel.  If problems occur,
+\fBupdate\-alternatives\fP 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.
+.
+.SH EXEMPLES
+Plusieurs paquets fournissent un diteur de texte compatible avec \fBvi\fP, par
+exemple \fBnvi\fP et \fBvim\fP. Celui qui sera utilis est dtermin par le groupe
+de liens \fBvi\fP, qui comprend des liens pour le programme lui\-mme et sa page
+de manuel.
+.PP
+To display the available packages which provide \fBvi\fP and the current
+setting for it, use the \fB\-\-display\fP action:
+.RS
+.PP
+\fBupdate\-alternatives \-\-display vi\fP
+.RE
+.PP
+Pour choisir une implmentation particulire de \fBvi\fP on peut utiliser cette
+commande en tant que superutilisateur et choisir un nombre dans la liste\ :
+.RS
+.PP
+\fBupdate\-alternatives \-\-config vi\fP
+.RE
+.PP
+Pour retrouver l'implmentation par dfaut de \fBvi\fP on peut utiliser cette
+commande en tant que super\-utilisateur\ :
+.RS
+.PP
+\fBupdate\-alternatives \-\-auto vi\fP
+.RE
+.
+.SH BOGUES
+Si vous trouvez un bogue, veuillez le signaler au systme de suivi des
+bogues de Debian.
+.PP
+Si vous trouvez une discordance entre l'action de \fBupdate\-alternatives\fP et
+cette page de manuel, c'est qu'il y a un bogue, soit dans l'implmentation
+soit dans la documentation\ ; faites un rapport.
+.
+.SH AUTEURS
+Copyright \(co 1995 Ian Jackson
+.br
+Copyright \(co 2009 Rapha\[:e]l Hertzog
+.sp
+Ce programme est un logiciel libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.PP
+Cette page de manuel est copyright 1997, 1998 Charles Briscoe\-Smith et
+autres auteurs.
+.sp
+Cette documentation est libre\ ; voyez la \ GNU General Public Licence\ 
+version 2 ou suprieure pour le copyright. Il n'y a PAS de garantie.
+.
+.SH "VOIR AUSSI"
+\fBln\fP(1), FHS, le standard pour l'organisation du systme de fichiers.
+.SH TRADUCTION
+Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
+Philippe Batailler, 2006.
+Nicolas Franois, 2006.
+Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/man/.gitignore
--- dpkg/man/.gitignore	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1,10 +0,0 @@
-de
-es
-fr
-hu
-ja
-pl
-pt_BR
-ru
-sv
-man.stamp
diff -uNr --exclude .git --exclude .bzr dpkg/man/hu/dpkg.cfg.5 /home/vorlon/devel/multiarch/dpkg-debian/man/hu/dpkg.cfg.5
--- dpkg/man/hu/dpkg.cfg.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/hu/dpkg.cfg.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,31 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg.cfg 5 2009\-09\-05 "Debian Project" "dpkg kszlet"
+.SH NV
+dpkg.cfg \- dpkg konfigurcis fjl
+.
+.SH LERS
+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. Quotes surrounding
+option values are stripped. Comments are allowed by starting a line with a
+hash sign ("\fB#\fP").
+.
+.SH FJLOK
+\fI/etc/dpkg/dpkg.cfg.d/[0\-9a\-zA\-Z_\-]*\fP
+.br
+\fI/etc/dpkg/dpkg.cfg\fP
+.br
+\fI~/.dpkg.cfg\fP
+.
+.SH SZERZ
+Lsd a \fI/usr/share/doc/dpkg/THANKS\fP fjlt, melyben a \fBdpkg\fP ksztst
+segt szemlyek listja tallhat.
+.
+.SH "LSD MG"
+\fBdpkg\fP(1).
+.P
+Ford: SZERVC Attila
diff -uNr --exclude .git --exclude .bzr dpkg/man/hu/dselect.cfg.5 /home/vorlon/devel/multiarch/dpkg-debian/man/hu/dselect.cfg.5
--- dpkg/man/hu/dselect.cfg.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/hu/dselect.cfg.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,31 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dselect.cfg 5 2011\-07\-03 "Debian Project" "dpkg kszlet"
+.SH NV
+dselect.cfg \- dselect konfigurcis fjl
+.
+.SH LERS
+This file contains default options for dselect. Each line contains a single
+option which is exactly the same as a normal command line option for dselect
+except for the leading dashes which are not used here. Quotes surrounding
+option values are stripped. Comments are allowed by starting a line with a
+hash sign ("\fB#\fP").
+.
+.SH FJLOK
+\fI/etc/dpkg/dselect.cfg.d/[0\-9a\-zA\-Z_\-]*\fP
+.br
+\fI/etc/dpkg/dselect.cfg\fP
+.br
+\fI~/.dselect.cfg\fP
+.
+.SH SZERZ
+Lsd a \fI/usr/share/doc/dpkg/THANKS\fP fjlt, melyben a \fBdselect\fP ksztst
+segt szemlyek listja tallhat.
+.
+.SH "LSD MG"
+\fBdselect\fP(1).
+.P
+Ford: SZERVC Attila
diff -uNr --exclude .git --exclude .bzr dpkg/man/ja/deb-old.5 /home/vorlon/devel/multiarch/dpkg-debian/man/ja/deb-old.5
--- dpkg/man/ja/deb-old.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/ja/deb-old.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,48 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-old 5 2011\-08\-14 "Debian Project" Debian
+.SH NAME
+deb\-old \- Debian Хʥѥåեޥå
+.
+.SH 
+\fIfilename\fP\fB.deb\fP
+.
+.SH 
+\&\fB.deb\fP եޥåȤ Debian ХʥѥåΥեǤ롣Υޥ˥奢ǤϡDebian 0.93 ˻ѤƤ
+\fB\fP ˤĤƵҤ롣ξܺ٤ˤĤƤ \fBdeb\fP(5) 򻲾Ȥ줿
+.
+.SH եޥå
+2 Ԥ ASCII ƥȤˤեޥåȾ󤬤ꡢ 2 Ĥ gzip ̤줿 ustar ե뤬³
+.PP
+1 ܤ 8 ˤեޥåȥСֹǤꡢ֤Ϥ٤ \fB0.939000\fP Ǥ롣
+.PP
+2 ܤϤҤȤܤ gzip  tar ե礭Ϳ(0 Ϥޤʤ) ʿǤ롣
+.PP
+줾ιԤνϲʸҤȤĤǤ롣
+.PP
+1 ܤ tar եϡʿʸե뷲Ȥƴޤࡣ\fBcontrol\fP եɬܤǤꡢ濴Ȥʤޤࡣ
+.PP
+˸Ť֤Ǥϡ control tar եΥե뤬 \fBDEBIAN\fP ֥ǥ쥯ȥˤ뤳Ȥ⤢롣ξ硢
+control tar եˤ \fBDEBIAN\fP ֥ǥ쥯ȥ꤬¸ߤ control tar
+եϤΥǥ쥯ȥˤΤߥեͭ롣 control tar եϡ `\fB.\fP',
+Ĥޤꥫȥǥ쥯ȥ˥եޤळȤ⤢롣
+.PP
+2 ܤ gzip  tar
+եϥե륷ƥॢ֤Ǥꡢ󥹥ȡ뤵륷ƥΥ롼ȥǥ쥯ȥ꤫Хѥ̾ޤǤ롣ѥ̾Ƭ˥å(/)Ϥʤ
+.
+.SH Ϣ
+\fBdeb\fP(5), \fBdpkg\-deb\fP(1), \fBdeb\-control\fP(5).
+.SH 
+ظ  <sekido@mbox.kyoto-inet.or.jp>.
+ë Ÿ <nabe@debian.or.jp>.
+߷ ˾ <nabetaro@debian.or.jp>.
+ <ishikawa@linux.or.jp>.
+ʸ <ukai@debian.or.jp>.
+ <kise@fuyuneko.jp>.
+ͺ <nakano@apm.seikei.ac.jp>.
+ <kise@fuyuneko.jp>.
+.SH 
+Debian JP Documentation ML <debian-doc@debian.or.jp>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/ja/dselect.1 /home/vorlon/devel/multiarch/dpkg-debian/man/ja/dselect.1
--- dpkg/man/ja/dselect.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/ja/dselect.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,350 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dselect 1 2011\-08\-14 "Debian Project" Debian
+.SH NAME
+dselect \- Debian ѥåեȥ
+.
+.SH 
+\fBdselect\fP [\fIoption\fP...] [\fIaction\fP]
+.
+.SH 
+\fBdselect\fP  Debian ƥΡפʥѥåѥ桼󥿡եΰĤǤ롣ƥԤϡ\fBdselect\fP Υᥤ˥塼ǰʲԤ롣
+ \- ѲǽѥåΥСꥹȤι
+ \- 󥹥ȡѤߡѲǽѥåξλȡ
+ \- إѥåڤӰ¸ط
+ \- ѥåΥ󥹥ȡ俷Сؤι
+.PP
+\fBdselect\fP ϡ\fBdpkg\fP(1) ( Debian ѥåġ)
+ΥեȥɤȤư롣ѥåΰ¸βԤʤ롢̥ѥåޥ͡Ǥ뤳ȤħǤ롣Ը¤ǵưȡѥåΥ󥹥ȡ롢ԤȤǤ롣ޤѥåݥȥꡢѲǽѥåΥС䡢󥹥ȡǽѥåμ뤿Ρ͡ʥǤ롣Ѥ륢ˤäơ󥿡ͥåȾθС륵СCD\-ROM
+ݥȥˤǤ롣侩륢ϡ\fBapt\fP ѥå󶡤 \fIapt\fP Ǥ롣
+.PP
+Normally \fBdselect\fP 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 command line
+parameters are still available to modify the running behaviour of \fBdselect\fP
+or show additional information about the program.
+.
+.SH ץ
+All options can be specified both on the command line and in the \fBdselect\fP
+configuration file \fI/etc/dpkg/dselect.cfg\fP or the files on the
+configuration directory \fI/etc/dpkg/dselect.cfg.d/\fP. 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 \fB#\fP).
+.br
+.TP 
+\fB\-\-admindir\fP\fI directory\fP
+dpkg Ѥ `status' ե `available' եʤɤ֤ǥ쥯ȥѹ롣ǥեȤ
+\fI/var/lib/dpkg\fP ǡ̾ѹɬפϤʤ
+.TP 
+\fB\-\-debug\fP\fI file \fP|\fI \fP\fB\-D\fP\fIfile\fP
+Turn on debugging. Debugging information is sent to \fIfile\fP.
+.TP 
+\fB\-\-expert\fP
+ѡȥ⡼ɤͭˤ롣Ĥޤꡢ뤵إפɽʤ
+.TP 
+\fB\-\-colour\fP|\fB\-\-color\fP \fIscreenpart:\fP[\fIforeground\fP],[\fIbackground\fP][\fI:attr\fP[\fI+attr+..\fP]]
+ɽꤹ롣ǥץ쥤顼ɽ򥵥ݡȤƤͭǤ롣ΥץϡʣǤ( \fIdselect.cfg\fP
+ǰֻѤƤ)ꤴȤˡ̤ΰο(¾°)ѹ롣 (夫鲼ޤ) ̤ϼΤȤ:
+.RS
+.TP 
+\fBtitle\fP
+̥ȥ
+.TP 
+\fBlisthead\fP
+ѥåꥹȤξΥإå饤
+.TP 
+\fBlist\fP
+ѥåꥹȤΥΰ (إפɽ)
+.TP 
+\fBlistsel\fP
+ꥹ
+.TP 
+\fBpkgstate\fP
+ѥåꥹ桢ѥåθ߾ɽ
+.TP 
+\fBpkgstatesel\fP
+ѥåꥹ桢򤷤ѥåθ߾ɽ
+.TP 
+\fBinfohead\fP
+ѥåξɽΥإå
+.TP 
+\fBinfodesc\fP
+ѥåûʸ
+.TP 
+\fBinfo\fP
+ѥåʤɤΥѥåɽ
+.TP 
+\fBinfofoot\fP
+ѥåβ̺ǲ
+.TP 
+\fBquery\fP
+׵ɽ
+.TP 
+\fBhelpscreen\fP
+إײ̤ο
+.RE
+.P
+̤̤θˡȿ򵭽Ҥ롣ѥο̵뤷ơʿطʿ뤤ξꤹ뤳ȤǤ롣ɸ curses
+̾ΤѤ롣
+.P
+Ǥդǡθ̤Υǡ°Ǥ롣ϥץ饹("+")ʸˤäʬΥ줿ʣ°ΥꥹȤǤ롣Ѳǽ°ʲ󤹤(٤Ƥ°٤ƤüͭȤϸ¤ʤ):
+normal, standout, underline, reverse, blink, bright, dim, bold
+.TP 
+\fB\-\-help\fP
+ñʥإפɽｪλ롣
+.TP 
+\fB\-\-version\fP
+Print version information and exit successfully.
+.
+.SH 
+When \fBdselect\fP is started it can perform the following actions, either
+directly if it was specified on the command line or by prompting the user
+with a menu of available actions if running interactively:
+.SS access
+ѥåݥȥ˥뤿Ρꤹ롣
+.sp
+By default, \fBdselect\fP provides several methods such as \fIcdrom\fP,
+\fImulti_cd\fP, \fInfs\fP, \fImulti_nfs\fP, \fIharddisk\fP, \fImounted\fP, \fImulti_mount\fP,
+\fIfloppy\fP or \fIftp\fP, but other packages may provide additional methods,
+eg. the \fIapt\fP access method provided by the \fBapt\fP package.
+.sp
+\fIapt\fP λѤ򡢶侩롣
+.sp
+.SS update
+Ѳǽѥåǡ١եå夹롣
+.sp
+ѲǽѥåΥСꥹȤ򡢸ꤷƤ륢ǡѥåݥȥ꤫dpkg
+ǡ١򹹿롣ѥåꥹȤϡŪˤ \fBPackages\fP, \fBPackages.gz\fP
+Ȥ̾ǡݥȥ󶡤Ƥ롣ݥȥԤϡ\fBdpkg\-scanpackages\fP(1)
+ȤץѤơΥե뤳ȤǤ롣
+.sp
+update ξܺ٤ϡμ˰¸롣̾Υץñǡ桼ϤɬפȤʤ
+.sp
+.SS select
+ѥå¸طɽԤ
+.sp
+줬 \fBdselect\fP
+ΥᥤǽǤ롣򤷤̤ǡѲǽ󥹥ȡѤߥѥåΥꥹȤĴǤ롣Ը¤Ǽ¹ԤȡŪˡѥåѹ뤳ȤǤ롣
+\fBdselect\fP ϡѹ˴ϢƵ¾ΰ¸ѥåˤĤƤƱͤפ롣
+.sp
+¸μԤ򸡽Фȡ¸ط襵ֲ̤桼󼨤롣β̤Ǥϡѥå¸ѥå򡢤ͳȤȤɽ롣桼ϡ\fBdselect\fP
+ƤѹƤŬѤƤ褤ΰƤ񤭤Ƥ褤ޤѹ򤹤٤ƸᤷƤ褤ʾ򡢰¸礬褵ޤǡ֤
+.sp
+Ūʥѥå̤ξܺ٤ʻȤҤ롣
+.sp
+.SS install
+򤷤ѥå򥤥󥹥ȡ뤹롣
+.sp
+󥹥ȡ롦ѥåꤷŬڤʥݥȥ \fBdpkg\fP
+Ѥƥ󥹥ȡԤμ˰¸뤬󥹥ȡѥå⤷ɬפʻ˼롣ˤꡢޡĤѥåκԤ⤢롣
+.sp
+󥹥ȡ˥顼ȯ硢⤦ install
+Ԥ褦¥롣ξǤ⡢ۤȤ꤬ȯʤѤߤȤʤäƤ롣꤬Ĥäޤޤäꡢ󥹥ȡ뤬۾ｪλ硢Ĵ٤ơDebian
+ХץƥإХ򤷤ƤХˡϡhttp://bugs.debian.org/ 䡢󥹥ȡ뤵ƤС
+\fBbug\fP(1)  \fBreportbug\fP(1) ʸ򻲾ȤΤȡ
+.sp
+install
+ξܺ٤ϥμ˰¸롣ѥåΥ󥹥ȡ롢ꡢˡ桼դ¥ꡢϤ׵᤹ǽ⤢롣ϥѥåԥץȤ˰¸롣ѥåˤäƤϡ\fBdebconf\fP(1)
+饤֥ѤƤꡢǼư줿󥹥ȡ륻åȥåפǽǤ롣
+.sp
+.SS config
+Ǥ˥󥹥ȡѤߤ꤬λƤʤѥåԤ
+.sp
+.SS remove
+ޡĤ󥹥ȡѤߥѥåΡԤ
+.sp
+.SS quit
+\fBdselect\fP λ롣
+.sp
+顼 0 () ǥץλ롣
+.sp
+.
+.SH ѥå
+.sp
+.SS 
+.sp
+̤߰¸طĥѥå \fBdselect\fP ǴʣˡԤľ̤롣 Debian
+ѥåƥγǰ䡢ˡ˴Ƥʤ桼ˤȤäƤϡϰŪǤ餢롣 \fBdselect\fP
+ϡѥåȴȤô¤ܻؤƤ롣ñô¤ΩĤǡԤȤƤεѤμѤˤϤʤʤ桼ˤϡDebian
+ѥå󥰥ƥˤĤƤδóǰ̤뤳Ȥ׵ᤵ롣䤬С\fBdpkg\fP(1) Υޥ˥奢䡢\fBdebian\-policy\fP
+ѥå˴ޤޤƤ Debian ݥꥷޥ˥奢򻲾ȤƤۤ
+.sp
+\fBdselect\fP
+ѡȥ⡼ɤľܥ⡼ɤǵưʤ硢˥塼饢ֺݤˡ˥إײ̤ɽ롣饤إײ̤ݥåץåפݤˤϡ˼Ƥ򤹤٤ƸƤ褦\fI\fP᤹롣饤إײ̤ϡĤǤ
+\&\fB''\fP ɽǤ롣
+.sp
+.SS ̥쥤
+.sp
+̤ϡǥեȤǾ岼 2
+ʬ䤵Ƥ롣ȾʬϡѥåꥹȤɽƤ롣СǸġΥѥå򤷤ꡢ롼ץإå(Ǥ)ơѥå롼פ򤷤Ǥ롣̤βȾʬϡ̤ξȾʬǸ򤷤Ƥѥåξܺ٤ɽ롣ɽܺ٤ΥפϡѹǤ롣
+.sp
+ \fB'I'\fP 򲡤ȤˡѥåꥹȤɽѥåܺ٤γ硢̤ζʬڤؤ롣
+.sp
+.SS ѥåܺɽ
+.sp
+ǥեȤΥѥåܺɽϡѥåꥹǸ򤵤ƤѥåΡĹѥåʸɽ롣ܺ٥פ \fB'i'\fP 򲡤Ȥ˰ʲڤؤ롣
+ \- Ĺʸ
+ \- 󥹥ȡѤߥСΥȥ
+ \- ѲǽСΥȥ
+.sp
+¸ط̤ǤϡΥѥå̤¸ط򡢤θȤȤɽǽ롣
+.sp
+.SS ѥåꥹ
+.sp
+ᥤ̤ϡ Debian
+ѥåƥबΤäƤѥåɽ롣ˤϡƥ˥󥹥ȡѤߤΥѥåȡѲǽѥåǡ١ΤäƤѥåޤޤ롣
+.sp
+ꥹȤˤϥѥåȤˡѥåξͥ١󡢥󥹥ȡѤߡѲǽС󡢥ѥå̾ûʸ 1 Ԥɽ롣
+\&\fB'V'\fP 򲡤ȡ󥹥ȡѤߥСѲǽСɽ ON/OFF Ǥ롣 \fB'v'\fP
+򲡤ȡѥåܺɽȴάɽڤؤ롣άɽǥեȤǤ롣
+.sp
+άɽϡʲ 4 ѡȤʬƤ롣顼ե饰 (̾說ꥢ)ߤξǤ롣Ϥ 2
+Ĥϥѥåθߤξɽθ 2 Ĥϥ桼åȤɽƤ롣
+.sp
+ѥåάɽΥɤˤϰʲΰ̣롣
+ 顼ե饰:
+  \fI\fP      顼ʤ
+  \fBR\fP       ʥ顼 (׺ƥ󥹥ȡ)
+ 󥹥ȡ:
+  \fI\fP      ̤󥹥ȡ
+  \fB*\fP       󥹥ȡѤߡѤ
+  \fB\-\fP       ̤󥹥ȡե뤬ĤäƤ
+  \fBU\fP       ŸѤߤ꤬ѤǤʤ
+  \fBC\fP       Ⱦ (顼ȯ)
+  \fBI\fP       Ⱦ󥹥ȡ (顼ȯ)
+ ߤ׵ᤷ:
+  \fB*\fP       󥹥ȡ롦ޡ
+  \fB\-\fP       ޡ (եϻĤ)
+  \fB=\fP       α (ѥåˤʤˤԤʤ)
+  \fB_\fP       ޡ (ե)
+  \fBn\fP       ѥåǤޤޡդƤʤ
+.sp
+.SS 뤪Ӳ̰ư
+.sp
+ѥåꥹȤ¸ط̤ǤϡʲΥΥޥɤǤ롣
+.br
+  \fBp, Up, k\fP           С˰ư
+  \fBn, Down, j\fP         С򲼤˰ư
+  \fBP, Pgup, Backspace\fP ꥹȤ 1 ڡ˥
+  \fBN, Pgdn, Space\fP     ꥹȤ 1 ڡ˥
+  \fB^p\fP                 ꥹȤ 1 Ծ˥
+  \fB^n\fP                 ꥹȤ 1 Բ˥
+  \fBt, Home\fP            ꥹȤƬ˥
+  \fBe, End\fP             ꥹȤκǸ˥
+  \fBu\fP                   1 ڡ˥
+  \fBd\fP                   1 ڡ˥
+  \fB^u\fP                  1 Ծ˥
+  \fB^d\fP                  1 Բ˥
+  \fBB, Left\-arrow\fP      ɽ 1/3 ̺˥
+  \fBF, Right\-arrow\fP     ɽ 1/3 ̱˥
+  \fB^b\fP                 ɽ 1 ʸ˥
+  \fB^f\fP                 ɽ 1 ʸ˥
+.sp
+.SS ¤ؤ
+.sp
+ѥåꥹȤϥѥå̾Ǹ뤳ȤǤ롣ѥåΥꥹȤǤϡ \fB'/'\fP
+򲡤Ƥ顢ñʸʸϤ뤳Ȥǡѥå̾θǤ롣ʸϡɽ \fBregex\fP(7)
+ǲϤ롣ʸ³ \fB'/d'\fP äȡʸ⸡롣 \fB'/i'\fP äϡʸʸζ̤򤷤ʤ
+2 Ĥź \fB'/id'\fP Τ褦ˤĤʤƤ⵭ҤǤ롣̤Фơ³ \fB'n'\fP ʤ \fB'\e'\fP
+򲡤ȡŪΥѥåޤǡ򷫤֤롣ꥹȤκǸޤãȡƬ롣
+.sp
+ꥹȤΥȽϡ\fB'o'\fP  \fB'O'\fP 򷫤֤ѹ롣
+ʲ 9 ̤ΥȽ٤롣
+ ե٥å     Ѳǽ             
+ ͥ+  Ѳǽ+ͥ      +ͥ
+ +ͥ  Ѳǽ+  +
+.br
+嵭ꥹȤˤƤʤǸ˥ե٥åȽǥȤ롣
+.sp
+.SS ѹ
+.sp
+줾Υѥå׵ϡʲΥޥɤѹǤ롣
+  \fB+, Insert\fP    󥹥ȡ롦
+  \fB=, H\fP         ߤξСα
+  \fB:, G\fP         α (ʤ̤󥹥ȡΤޤޤȤ)
+  \fB\-, Delete\fP    ϻĤ
+  \fB_\fP            ä
+.sp
+ѹ׵η̡¸­ʤä궥礷硢 \fBdselect\fP ϰ¸ط̤󼨤롣ϸۤ롣
+.sp
+ˡ롼ץإå˥СươѥåΥ롼פ˥ޥɤŬѤ뤳ȤǤ롣ѥåΤʥ롼ײǤ뤫ϡߤΥꥹȤΥȽ˰¸롣
+.sp
+٤̤̤¸ȯ뤿ᡢȤ礭롼פѹϡʬդ٤Ǥ롣 1
+Ĥΰ¸ط̤ˡ٤ɽ뤳ȤȤʤ뤿ᡢ褹Τ񤷤ºݤˤϡ롼פѹͭѤʤΤϡααλ餤Ǥ롣
+.sp
+.SS ¸
+.sp
+ѹ̤¸礬ȯ硢 \fBdselect\fP ϰ¸ط̤ɽ롣Ƥξϡ˥إײ̤ɽ롣
+.sp
+β̤ξȾʬˤϡ̤¸礬ѥå䡢׵ᤵ줿ѹη̡ư¸褹Τ˥󥹥ȡ뤹Фѥå褹Τ˺Фѥå򤹤٤ɽ롣Ⱦʬˤϡ򤷤Ƥѥåΰ¸䶥θ򡢥ǥեȤɽ롣
+.sp
+When the sublist of packages is displayed initially, \fBdselect\fP may have
+already set the requested selection status of some of the listed packages,
+in order to resolve the depends or conflicts that caused the dependency
+resolution screen to be displayed. Usually, it is best to follow up the
+suggestions made by \fBdselect\fP.
+.sp
+\&\fB'R'\fP 򲡤ȤǡѥåꥹȤ̤¸礬Τ褦ˡ᤻\fB'D'\fP
+򲡤ȤǡưƤϥꥻåȤ뤬¸ط̤ѹϡ׵ᤷΤƱͤ˰ݻ롣ǽŪ \fB'U'\fP
+򲡤ȤǡưƤ򥻥åȤ뤳ȤǤ롣
+.sp
+.SS ׵γ
+.sp
+\fBenter\fP 򲡤ȡɽƤ򥻥åȤǳꤹ롣׵η̡̤¸ФʤС \fBdselect\fP
+Ͽꤹ롣ޤ̤¸¸ߤ硢 \fBdselect\fP ϰ¸ط̤ɽ롣
+.sp
+̤¸礬¸ߤǡ\fBdselect\fP ϳˤϡ \fB'Q'\fP
+򲡤ϥ桼ꤷ̵˥åȤ롣Ūˡܺ٤ɤǤʤС򤷤ʤȡ
+.sp
+ȿФˡäꥹȤ򸵤᤹ϡ \fB'X'\fP  \fBescape\fP
+򲡤ȡ򲿲ⲡȤǡΤѹ׵äǸ˳ꤷ᤹ȤǤ롣
+.sp
+If you mistakenly establish some settings and wish to revert all the
+selections to what is currently installed on the system, press the \fB'C'\fP
+key.  This is somewhat similar to using the unhold command on all packages,
+but provides a more obvious panic button in cases where the user pressed
+\fBenter\fP by accident.
+.sp
+.
+.SH Ķѿ
+.TP 
+\fBHOME\fP
+If set, \fBdselect\fP will use it as the directory from which to read the user
+specific configuration file.
+.
+.SH Х
+\fBdselect\fP ѥå򥤥󥿡եϡ桼𤵤롣ʹȤǤϡиѤͥ볫ȯԤǤ顢òƤ롣
+.sp
+ʸ­ʤ
+.sp
+ᥤ˥塼˥إץץ󤬤ʤ
+.sp
+ѲǽѥåΥꥹɽ򸺤餻ʤ
+.sp
+¢ǤϡϤ丽ߤʼʤ apt
+󶡤륢ѤСʤǤʤ¢˽Ǥ롣
+.
+.SH Ϣ
+\fBdpkg\fP(1), \fBapt\-get\fP(8), \fBsources.list\fP(5), \fBdeb\fP(5).
+.
+.SH 
+\fBdselect\fP was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list
+of contributors may be found in 'dselect \-\-version'.
+.br
+Υޥ˥奢 Juho Vuori <javuori@cc.helsinki.fi> ˤäƽ񤫤졢 Josip Rodin,
+Joost kooij 
+
+.SH 
+ظ  <sekido@mbox.kyoto-inet.or.jp>.
+ë Ÿ <nabe@debian.or.jp>.
+߷ ˾ <nabetaro@debian.or.jp>.
+ <ishikawa@linux.or.jp>.
+ʸ <ukai@debian.or.jp>.
+ <kise@fuyuneko.jp>.
+ͺ <nakano@apm.seikei.ac.jp>.
+ <kise@fuyuneko.jp>.
+.SH 
+Debian JP Documentation ML <debian-doc@debian.or.jp>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/Makefile.am /home/vorlon/devel/multiarch/dpkg-debian/man/Makefile.am
--- dpkg/man/Makefile.am	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/Makefile.am	2012-06-07 10:11:09.426073000 -0700
@@ -1,45 +1,100 @@
 ## Process this file with automake to produce Makefile.in
 
+dist_man_MANS = \
+	deb-control.5 \
+	deb-src-control.5 \
+	deb-version.5 \
+	deb-shlibs.5 \
+	deb-split.5 \
+	deb-substvars.5 \
+	deb-symbols.5 \
+	deb-triggers.5 \
+	deb-old.5 \
+	deb-override.5 \
+	deb-extra-override.5 \
+	deb.5 \
+	dpkg-architecture.1 \
+	dpkg-buildflags.1 \
+	dpkg-buildpackage.1 \
+	dpkg-checkbuilddeps.1 \
+	dpkg-deb.1 \
+	dpkg-distaddfile.1 \
+	dpkg-divert.8 \
+	dpkg-genchanges.1 \
+	dpkg-gencontrol.1 \
+	dpkg-gensymbols.1 \
+	dpkg-maintscript-helper.1 \
+	dpkg-mergechangelogs.1 \
+	dpkg-name.1 \
+	dpkg-parsechangelog.1 \
+	dpkg-query.1 \
+	dpkg-scanpackages.1 \
+	dpkg-scansources.1 \
+	dpkg-shlibdeps.1 \
+	dpkg-source.1 \
+	dpkg-split.1 \
+	dpkg-statoverride.8 \
+	dpkg-trigger.1 \
+	dpkg-vendor.1 \
+	dpkg.1 \
+	dpkg.cfg.5
+
+if WITH_DSELECT
+dist_man_MANS += \
+	dselect.1 \
+	dselect.cfg.5
+endif
+
+if WITH_START_STOP_DAEMON
+dist_man_MANS += \
+	start-stop-daemon.8
+endif
+
+if WITH_UPDATE_ALTERNATIVES
+dist_man_MANS += \
+	update-alternatives.8
+endif
+
+EXTRA_DIST = \
+	po/ChangeLog.old \
+	po/po4a.cfg \
+	po/dpkg-man.pot
+
+
+# Extract the list of languages from the po4a config file.
+LINGUAS_DIST = `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg`
+
+# If the user has not defined it let's use the default.
+LINGUAS ?= $(LINGUAS_DIST)
+
+
 PO4A_V = $(PO4A_V_$(V))
 PO4A_V_ = $(PO4A_V_$(AM_DEFAULT_VERBOSITY))
 PO4A_V_0 = @echo "  PO4A   $@";
 
-PO4A_RM_V = $(PO4A_RM_V_$(V))
-PO4A_RM_V_ = $(PO4A_RM_V_$(AM_DEFAULT_VERBOSITY))
-PO4A_RM_V_0 = @echo "  PO4ARM $@";
+PO4A_OPTS = --previous --srcdir $(srcdir) --destdir $(CURDIR) --no-backups
 
 all-local: all-local-@USE_PO4A@
 
 all-local-no:
 all-local-yes: man.stamp
 
-PO4A_COMMON_OPTS = --previous --variable builddir=$(CURDIR)
-PO4A_BUILD_OPTS = $(PO4A_COMMON_OPTS) --no-backups
-PO4A_CLEAN_OPTS = $(PO4A_COMMON_OPTS) --rm-backups --rm-translations
-
 # FIXME: Use a stamp file until po4a supports them internally.
 man.stamp:
-	$(PO4A_V) cd $(srcdir) && \
-	$(PO4A) $(PO4A_BUILD_OPTS) po/po4a.cfg
+	$(PO4A_V) $(PO4A) $(PO4A_OPTS) $(srcdir)/po/po4a.cfg
 	$(AM_V_at) touch $@
 
 clean-local: clean-local-@USE_PO4A@
 
 clean-local-no:
 clean-local-yes:
-	$(PO4A_RM_V) cd $(srcdir) && \
-	$(PO4A) $(PO4A_CLEAN_OPTS) po/po4a.cfg
+	rm -rf $(LINGUAS_DIST)
 	$(AM_V_at) rm -f man.stamp
 
-update-po:
-	$(PO4A_V) cd $(srcdir) && \
-	$(PO4A) $(PO4A_BUILD_OPTS) --force po/po4a.cfg
-
-# Extract the list of languages from the po4a config file.
-LINGUAS_DIST = `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg`
+.PHONY: update-po
 
-# If the user has not defined it let's use the default.
-LINGUAS ?= $(LINGUAS_DIST)
+update-po:
+	$(PO4A_V) $(PO4A) $(PO4A_OPTS) --force $(srcdir)/po/po4a.cfg
 
 install-data-local: install-data-local-@USE_PO4A@
 
@@ -87,65 +142,3 @@
 		$(mkdir_p) $(distdir)/$$lang; \
 		cp -r $(srcdir)/$$lang $(distdir)/; \
 	done
-
-dist_man_MANS = \
-	deb-control.5 \
-	deb-src-control.5 \
-	deb-version.5 \
-	deb-shlibs.5 \
-	deb-split.5 \
-	deb-substvars.5 \
-	deb-symbols.5 \
-	deb-triggers.5 \
-	deb-old.5 \
-	deb-override.5 \
-	deb-extra-override.5 \
-	deb.5 \
-	dpkg-architecture.1 \
-	dpkg-buildflags.1 \
-	dpkg-buildpackage.1 \
-	dpkg-checkbuilddeps.1 \
-	dpkg-deb.1 \
-	dpkg-distaddfile.1 \
-	dpkg-divert.8 \
-	dpkg-genchanges.1 \
-	dpkg-gencontrol.1 \
-	dpkg-gensymbols.1 \
-	dpkg-maintscript-helper.1 \
-	dpkg-mergechangelogs.1 \
-	dpkg-name.1 \
-	dpkg-parsechangelog.1 \
-	dpkg-query.1 \
-	dpkg-scanpackages.1 \
-	dpkg-scansources.1 \
-	dpkg-shlibdeps.1 \
-	dpkg-source.1 \
-	dpkg-split.1 \
-	dpkg-statoverride.8 \
-	dpkg-trigger.1 \
-	dpkg-vendor.1 \
-	dpkg.1 \
-	dpkg.cfg.5
-
-if WITH_DSELECT
-dist_man_MANS += \
-	dselect.1 \
-	dselect.cfg.5
-endif
-
-if WITH_START_STOP_DAEMON
-dist_man_MANS += \
-	start-stop-daemon.8
-endif
-
-if WITH_UPDATE_ALTERNATIVES
-dist_man_MANS += \
-	update-alternatives.8
-endif
-
-EXTRA_DIST = \
-	po/ChangeLog.old \
-	po/po4a.cfg \
-	po/dpkg-man.pot
-
-.PHONY: update-po
diff -uNr --exclude .git --exclude .bzr dpkg/man/Makefile.in /home/vorlon/devel/multiarch/dpkg-debian/man/Makefile.in
--- dpkg/man/Makefile.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/Makefile.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,663 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@WITH_DSELECT_TRUE@am__append_1 = \
+@WITH_DSELECT_TRUE@	dselect.1 \
+@WITH_DSELECT_TRUE@	dselect.cfg.5
+
+@WITH_START_STOP_DAEMON_TRUE@am__append_2 = \
+@WITH_START_STOP_DAEMON_TRUE@	start-stop-daemon.8
+
+@WITH_UPDATE_ALTERNATIVES_TRUE@am__append_3 = \
+@WITH_UPDATE_ALTERNATIVES_TRUE@	update-alternatives.8
+
+subdir = man
+DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
+	$(top_srcdir)/m4/dpkg-build.m4 \
+	$(top_srcdir)/m4/dpkg-compiler.m4 \
+	$(top_srcdir)/m4/dpkg-coverage.m4 \
+	$(top_srcdir)/m4/dpkg-funcs.m4 $(top_srcdir)/m4/dpkg-libs.m4 \
+	$(top_srcdir)/m4/dpkg-linker.m4 $(top_srcdir)/m4/dpkg-progs.m4 \
+	$(top_srcdir)/m4/dpkg-types.m4 \
+	$(top_srcdir)/m4/dpkg-unicode.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+man1dir = $(mandir)/man1
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
+	"$(DESTDIR)$(man8dir)"
+man5dir = $(mandir)/man5
+man8dir = $(mandir)/man8
+NROFF = nroff
+MANS = $(dist_man_MANS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BZ2_LIBS = @BZ2_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCOV = @GCOV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LCOV = @LCOV@
+LCOV_GENHTML = @LCOV_GENHTML@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_COVER = @PERL_COVER@
+PERL_COVERAGE = @PERL_COVERAGE@
+PERL_LIBDIR = @PERL_LIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PO4A = @PO4A@
+POD2MAN = @POD2MAN@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_PO4A = @USE_PO4A@
+USE_UNICODE = @USE_UNICODE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+admindir = @admindir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+dist_man_MANS = deb-control.5 deb-src-control.5 deb-version.5 \
+	deb-shlibs.5 deb-split.5 deb-substvars.5 deb-symbols.5 \
+	deb-triggers.5 deb-old.5 deb-override.5 deb-extra-override.5 \
+	deb.5 dpkg-architecture.1 dpkg-buildflags.1 \
+	dpkg-buildpackage.1 dpkg-checkbuilddeps.1 dpkg-deb.1 \
+	dpkg-distaddfile.1 dpkg-divert.8 dpkg-genchanges.1 \
+	dpkg-gencontrol.1 dpkg-gensymbols.1 dpkg-maintscript-helper.1 \
+	dpkg-mergechangelogs.1 dpkg-name.1 dpkg-parsechangelog.1 \
+	dpkg-query.1 dpkg-scanpackages.1 dpkg-scansources.1 \
+	dpkg-shlibdeps.1 dpkg-source.1 dpkg-split.1 \
+	dpkg-statoverride.8 dpkg-trigger.1 dpkg-vendor.1 dpkg.1 \
+	dpkg.cfg.5 $(am__append_1) $(am__append_2) $(am__append_3)
+EXTRA_DIST = \
+	po/ChangeLog.old \
+	po/po4a.cfg \
+	po/dpkg-man.pot
+
+
+# Extract the list of languages from the po4a config file.
+LINGUAS_DIST = `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg`
+PO4A_V = $(PO4A_V_$(V))
+PO4A_V_ = $(PO4A_V_$(AM_DEFAULT_VERBOSITY))
+PO4A_V_0 = @echo "  PO4A   $@";
+PO4A_OPTS = --previous --srcdir $(srcdir) --destdir $(CURDIR) --no-backups
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign man/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-man1: $(dist_man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+install-man5: $(dist_man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
+	@list=''; test -n "$(man5dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.5[a-z]*$$/p'; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man5:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man5dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.5[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
+install-man8: $(dist_man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
+	@list=''; test -n "$(man8dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.8[a-z]*$$/p'; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man8:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man8dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.8[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@list='$(MANS)'; if test -n "$$list"; then \
+	  list=`for p in $$list; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+	  if test -n "$$list" && \
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+	    exit 1; \
+	  else :; fi; \
+	else :; fi
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: check-am
+all-am: Makefile $(MANS) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local install-man
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man: install-man1 install-man5 install-man8
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-local uninstall-man
+
+uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-local dist-hook distclean distclean-generic distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-man5 install-man8 install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-local \
+	uninstall-man uninstall-man1 uninstall-man5 uninstall-man8
+
+
+# If the user has not defined it let's use the default.
+LINGUAS ?= $(LINGUAS_DIST)
+
+all-local: all-local-@USE_PO4A@
+
+all-local-no:
+all-local-yes: man.stamp
+
+# FIXME: Use a stamp file until po4a supports them internally.
+man.stamp:
+	$(PO4A_V) $(PO4A) $(PO4A_OPTS) $(srcdir)/po/po4a.cfg
+	$(AM_V_at) touch $@
+
+clean-local: clean-local-@USE_PO4A@
+
+clean-local-no:
+clean-local-yes:
+	rm -rf $(LINGUAS_DIST)
+	$(AM_V_at) rm -f man.stamp
+
+.PHONY: update-po
+
+update-po:
+	$(PO4A_V) $(PO4A) $(PO4A_OPTS) --force $(srcdir)/po/po4a.cfg
+
+install-data-local: install-data-local-@USE_PO4A@
+
+install-data-local-no:
+install-data-local-yes:
+	for lang in $(LINGUAS); do \
+		files=""; \
+		for trans in $(dist_man_MANS); do \
+			if [ -f $(CURDIR)/$$lang/$$trans ]; then \
+				files="$$files $(CURDIR)/$$lang/$$trans"; \
+			elif [ -f $(srcdir)/$$lang/$$trans ]; then \
+				files="$$files $(srcdir)/$$lang/$$trans"; \
+			fi; \
+		done; \
+		$(MAKE) install-man \
+			mandir="$(mandir)/$$lang" \
+			man_MANS="" \
+			dist_man_MANS="$$files"; \
+	done
+
+uninstall-local: uninstall-local-@USE_PO4A@
+
+uninstall-local-no:
+uninstall-local-yes:
+	for lang in $(LINGUAS); do \
+		files=""; \
+		for trans in $(dist_man_MANS); do \
+			if [ -f $(CURDIR)/$$lang/$$trans ]; then \
+				files="$$files $(CURDIR)/$$lang/$$trans"; \
+			elif [ -f $(srcdir)/$$lang/$$trans ]; then \
+				files="$$files $(srcdir)/$$lang/$$trans"; \
+			fi; \
+		done; \
+		$(MAKE) uninstall-man \
+			mandir="$(mandir)/$$lang" \
+			man_MANS="" \
+			dist_man_MANS="$$files"; \
+	done
+
+dist-hook: man.stamp
+	cp $(srcdir)/man.stamp $(distdir)/
+	for lang in $(LINGUAS_DIST); do \
+		cp $(srcdir)/po/$$lang.po $(distdir)/po; \
+		cp $(srcdir)/po/$$lang.add $(distdir)/po; \
+		$(mkdir_p) $(distdir)/$$lang; \
+		cp -r $(srcdir)/$$lang $(distdir)/; \
+	done
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/deb.5 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/deb.5
--- dpkg/man/pl/deb.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/deb.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,76 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb 5 2011\-08\-14 "Projekt Debiana" Debian
+.SH NAZWA
+deb \- format binarnego pakietu Debiana
+.SH SKADNIA
+\fInazwa_pliku\fP\fB.deb\fP
+.SH OPIS
+Format \fB.deb\fP jest formatem pliku binarnego pakietu Debiana. Jest rozumiany
+przez dpkg 0.93.76 i pniejsze i domylnie generowany przez wszystkie
+wersje dpkg wiksze ni 1.2.0 i wszystkie wersje i386/ELF poczwszy od
+1.1.1elf.
+.PP
+Opisany tu format jest uywany od wersji 0.93 Debiana; szczegy starego
+formatu s opisane w \fBdpkg\-deb\fP(5).
+.SH FORMAT
+Plik ten jest archiwum \fBar\fP majcym liczb magiczn z
+\fB!<arch>\fP. Nazwy plikw mog zawiera koczcy znak ukonika.
+.PP
+Aktualnie dozwolone archiwa \fBtar\fP mog mie: format w starym stylu (v7),
+poprzedzajcy POSIX format ustar, podzbir formatu GNU (jedynie dugie
+cieki i dugie nazwy dowiza w nowym stylu, wspierane od dpkg 1.4.1.17),
+oraz zgodny z POSIX format ustar (dugie nazwy wspierane od dpkg
+1.15.0). Nieznane flagi typw tar s uwaane za bd.
+.PP
+Pierwszy skadnik nazywa si \fBdebian\-binary\fP i zawiera seri linii
+rozdzielonych znakami nowej linii. Obecnie plik ten zawiera tylko jedn
+lini \- numer wersji formatu, ktry \- w czasie pisania tej strony
+podrcznika \- wynosi \fB2.0\fP. Programy obsugujce archiwa w nowym formacie
+powinny by gotowe na obsuenie zmiany liczby pobocznej (po kropce) oraz na
+obecno nowych linii, ktre powinny ignorowa.
+.PP
+Jeeli zmieni si gwna liczba numeru wersji (liczba przed kropk), oznacza
+to, e wprowadzone zmiany w formacie s niekompatybilne z poprzedni wersj
+i program powinien si zatrzyma. Jeeli si nie zatrzyma, to powinien
+kontynuowa dziaanie a do napotkania nieoczekiwanego skadnika w archiwum
+(chyba, e wystpuje on na kocu), tak jak to opisano poniej.
+.PP
+Drugi wymagany skadnik nazywa si \fBcontrol.tar.gz\fP. Jest to spakowane
+archiwum tar zawierajce informacje kontrolne pakietu, jako seri plikw
+tekstowych, wrd ktrych wymaganym plikiem jest \fBcontrol\fP, zawierajcy
+podstawowe informacje kontrolne. Archiwum tar moe zawiera opcjonalny wpis
+dotyczcy biecego katalogu "\fB.\fP".
+.PP
+The third, last required member is named \fBdata.tar\fP.  It contains the
+filesystem as a tar archive, either not compressed (supported since dpkg
+1.10.24), or compressed with gzip (with \fB.gz\fP extension), xz (with \fB.xz\fP
+extension, supported since dpkg 1.15.6), bzip2 (with \fB.bz2\fP extension,
+supported since dpkg 1.10.24) or lzma (with \fB.lzma\fP extension, supported
+since dpkg 1.13.25).
+.PP
+Skadniki te musz wystpowa w tym powyszym porzdku. Implementacje
+powinny ignorowa jakiekolwiek dodatkowe skadniki wystpujce po
+\fBdata.tar\fP. Kolejne skadniki mog zosta zdefiniowane w przyszoci i
+(jeeli bdzie to moliwe) bd umieszczone po trzech wyej
+wymienionych. Dodatkowe skadniki, dla ktrych wymagane by byo ich
+umieszczenie przed \fBdata.tar\fP i ktre powinny by ignorowane przez starsze
+programy, bd miay nazwy zaczynajce si od znaku podkrelenia "\fB_\fP".
+.PP
+Te nowe skadniki, ktre nie bd mogy zosta zignorowane, zostan
+umieszczone przed \fBdata.tar\fP, a ich nazwy bd si zaczyna od znaku innego
+ni podkrelenie, lub (co jest bardziej prawdopodobne) spowoduj zwikszenie
+gwnej (major) wersji formatu pliku deb.
+.SH "ZOBACZ TAKE"
+\fBdeb\-old\fP(5), \fBdpkg\-deb\fP(1), \fBdeb\-control\fP(5).
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/deb-extra-override.5 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/deb-extra-override.5
--- dpkg/man/pl/deb-extra-override.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/deb-extra-override.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,44 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-extra\-override 5 2009\-08\-16 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+deb\-extra\-override \- plik dodatkowych nadpisa archiwum Debiana
+.
+.SH SKADNIA
+override
+.
+.SH OPIS
+Wikszo informacji o binarnym lub rdowym pakiecie moe by zawarta w
+pliku control/.dsc, jednak caa ta informacja moe by nadpisana podczas
+eksportowania do plikw Packages/Sources. Plik dodatkowych nadpisa zawiera
+takie wanie nadpisania.
+.PP
+Dodatkowy plik nadpisa ma prosty format pl rozdzielonych biaymi znakami
+(spacjami). Dozwolone s komentarze (zaczynajce si od \fB#\fP).
+.PP
+.in +5
+\fIpakiet\fP \fInazwa\-pola\fP \fIwarto\fP
+.in -5
+.PP
+\fIpakiet\fP jest nazw binarnego lub rdowego pakietu.
+.PP
+\fInazwa\-pola\fP jest nazw nadpisywanego pola. \fIwarto\fP jest wartoci,
+ktra bdzie umieszczona w tym polu. Moe ona zawiera spacje, poniewa
+linia jest dzielona podczas parsowania na nie wicej ni 3 kolumny.
+.PP
+Dodatkowe pliki nadpisa uywane do stworzenia oficjalnych list Packages
+mona znale w katalogu \fIindices\fP na kadym mirrorze Debiana.
+.
+.SH "ZOBACZ TAKE"
+\fBdpkg\-scanpackages\fP(1), \fBdpkg\-scansources\fP(1), \fBapt\-ftparchive\fP(1).
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/deb-old.5 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/deb-old.5
--- dpkg/man/pl/deb-old.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/deb-old.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,53 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-old 5 2011\-08\-14 "Projekt Debiana" Debian
+.SH NAZWA
+deb\-old \- stary format binarnego pakietu Debiana
+.
+.SH SKADNIA
+\fInazwa_pliku\fP\fB.deb\fP
+.
+.SH OPIS
+Format \fB.deb\fP jest formatem binarnego pakietu Debiana. Ta strona
+podrcznika opisuje \fBstary\fP format, uywany przed wersj 0.93
+Debiana. Szczegy nowego formatu mona znale w \fBdeb\fP(5).
+.
+.SH FORMAT
+Plik skada si z dwu linii informacji o formacie jako tekst ASCII, po
+ktrych nastpuj dwa poczone pliki ustar spakowane gzipem.
+.PP
+Pierwsz lini jest numer wersji formatu, wyrwnany do 8 cyfr. Dla starego
+formatu numer ten wynosi \fB0.939000\fP.
+.PP
+W drugiej linii jest zapisana liczba dziesitna (bez pocztkowych zer)
+podajce dugo pierwszego zgzipowanego pliku tar.
+.PP
+Kada z tych linii jest zakoczona pojedynczym znakiem nowej linii.
+.PP
+Pierwszy plik tar zawiera informacje kontrolne, jako seri zwyczajnych
+plikw. Zawsze musi by obecny plik \fBcontrol\fP zawierajcy gwne informacje
+kontrolne.
+.PP
+W bardzo starych archiwach, pliki w archiwum kontrolnym mogy by
+umieszczone w podkatalogu \fBDEBIAN\fP. W takim wypadku katalog \fBDEBIAN\fP
+bdzie wystpowa rwnie w archiwum kontrolnym, ktre bdzie zawierao
+pliki tylko w tym katalogu. Opcjonalnie archiwum kontrolne moe zawiera
+rwnie wpis dla "\fB.\fP", czyli katalogu biecego.
+.PP
+Drugim skompresowanym archiwum tar jest archiwum systemu plikw, zawierajce
+nazwy cieek relatywne do gwnego katalogu systemu, na ktrym bd
+instalowane. Nazwy te nie zaczynaj si od ukonikw.
+.
+.SH "ZOBACZ TAKE"
+\fBdeb\fP(5), \fBdpkg\-deb\fP(1), \fBdeb\-control\fP(5).
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/deb-shlibs.5 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/deb-shlibs.5
--- dpkg/man/pl/deb-shlibs.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/deb-shlibs.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,63 @@
+.\" Copyright © 1996 Michael Shields <shields@crosslink.net>
+.\" Copyright © 2008 Zack Weinberg <zackw@panix.com>
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-shlibs 5 2008\-02\-17 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+deb\-shlibs \- plik z informacjami o bibliotekach wspdzielonych w Debianie
+.
+.SH OPIS
+.PP
+Pliki \fBshlibs\fP odwzorowuj nazwy i wersje (tzw. \fIsonames\fP) bibliotek
+wspdzielonych na zalenoci odpowiednie dla pliku kontrolnego pakietu. W
+kadej linii moe by umieszczony tylko jeden wpis. Puste linie \fInie\fP mog
+wystpowa. Linie zaczynajce si od znaku \fB#\fP s uwaane za komentarze i
+ignorowane. Wszystkie pozostae linie musz mie nastpujcy format:
+.IP
+[\fItype\fP\fB:\fP] \fIlibrary\fP \fIversion\fP \fIdependencies\fP
+.PP
+The \fIlibrary\fP and \fIversion\fP fields are whitespace\-delimited, but the
+\fIdependencies\fP field extends to the end of the line.  The \fItype\fP field is
+optional and normally not needed.
+.PP
+Dalsze szczegy mona znale w Zasadach polityki Debiana.
+.
+.SH PRZYKADY
+.PP
+Plik \fBshlibs\fP dla typowego pakietu z bibliotekami, nazwanego \fIlibcrunch1\fP,
+dostarczajcego tylko jedn bibliotek, ktrej soname to \fIlibcrunch.so.1\fP,
+moe wyglda tak:
+.IP
+libcrunch 1 libcrunch1 (>= 1.2\-1)
+.PP
+Pole \fIzalenoci\fP musi wymienia najnowsz wersj pakietu, w ktrej dodano
+nowe symbole do biblioteki: w powyszym przykadzie nowe symbole byy dodane
+do wersji 1.2 biblioteki  \fIlibcrunch\fP. Nie jest to jedyny powd,dla ktrego
+zalenoci mog by zawane; szczegy mona znale w dokumencie "Zasady
+polityki Debiana".
+.
+.SH "ZOBACZ TAKE"
+\fBdpkg\-shlibdeps\fP(1), \fBdeb\-symbols\fP(5).
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/deb-substvars.5 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/deb-substvars.5
--- dpkg/man/pl/deb-substvars.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/deb-substvars.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,149 @@
+.\" Authors: Ian Jackson
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-substvars 5 2009\-07\-15 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+deb\-substvars \- zmienne podstawiania rdowych pakietw Debiana
+.
+.SH SKADNIA
+substvars
+.
+.SH OPIS
+Zanim \fBdpkg\-source\fP, \fBdpkg\-gencontrol\fP i \fBdpkg\-genchanges\fP zapisz swoje
+informacje kontrolne (do rdowego pliku \fB.dsc\fP w wypadku \fBdpkg\-source\fP i
+na standardowe wyjcie w wypadku \fBdpkg\-gencontrol\fP i \fBdpkg\-genchanges\fP),
+wykonuj podstawienia pewnych zmiennych na pliku wyjciowym.
+
+Podstawienie zmiennej ma posta \fB${\fP\fInazwa\-zmiennej\fP\fB}\fP. Nazwy zmiennych
+skadaj si ze znakw alfanumerycznych, mylnikw oraz dwukropkw i
+zaczynaj si od znaku alfanumerycznego. Podstawienia zmiennych s
+powtarzane dopty, a nie bdzie nic do podstawienia; peen tekst pola po
+podstawieniu jest ponownie skanowany w poszukiwaniu kolejnych podstawie.
+
+Po dokonaniu wszystkich podstawie, kade wystpienie acucha \fB${}\fP (ktry
+nie jest poprawnym podstawieniem) jest zastpowane przez znak \fB$\fP.
+
+Podstawianie zmiennych jest wykonywane na wszystkich polach kontrolnych,
+jednak niektre z tych pl s uywane oraz wymagane podczas budowania, gdy
+podstawienie nie zostao jeszcze wykonane. Dlatego nie mona uywa
+zmiennych w polach \fBPackage\fP, \fBSource\fP oraz \fBArchitecture\fP.
+
+Variable substitution happens on the content of the fields after they have
+been parsed, thus if you want a variable to expand over multiple lines you
+do not have to include a space after the newline. This is done implicitly
+when the field is output. For example, if the variable \fB${Description}\fP is
+set to "foo is bar.${Newline}foo is great." and if you have the following
+field:
+
+ Description: foo application
+  ${Description}
+  .
+  More text.
+
+It will result in:
+
+ Description: foo application
+  foo is bar.
+  foo is great.
+  .
+  More text.
+
+Zmienne mona ustawi za pomoc opcji \fB\-V\fP. Mona je take poda w pliku
+\fBdebian/substvars\fP (lub jakimkolwiek innym pliku wskazanym opcj
+\fB\-T\fP). Plik ten skada si z linii w postaci
+\fInazwa\fP\fB=\fP\fIwarto\fP. Kocowe spacje w kadej linii, linie puste oraz
+linie zaczynajce si od znaku \fB#\fP (czyli komentarze) s ignorowane.
+
+Dodatkowo dostpne s nastpujce standardowe zmienne:
+.TP 
+\fBArch\fP
+Bieca architektura budowania (z \fBdpkg \-\-print\-architecture\fP).
+.TP 
+\fBsource:Version\fP
+Wersja pakietu rdowego
+.TP 
+\fBsource:Upstream\-Version\fP
+Oryginalna wersja autora pakietu rdowego, wczajc wersj epoki Debiana
+jeli jest.
+.TP 
+\fBbinary:Version\fP
+Wersja pakietu binarnego (moe si rni od source:Version na przykad w
+przypadku binNMU).
+.TP 
+\fBSource\-Version\fP
+Wersja pakietu rdowego (z dziennika zmian). Ta zmienna jest obecnie
+\fBprzestarzaa\fP, jako e jej znaczenie jest inne ni jej
+funkcjonalno. Prosimy uywa \fBsource:Version\fP lub \fBbinary:Version\fP, w
+zalenoci od wymaga.
+.TP 
+\fBInstalled\-Size\fP
+Cakowity rozmiar plikw zainstalowanych przez pakiet. Warto ta jest
+kopiowana do odpowiadajcego jej pola w pliku kontrolnym; ustawienie jej
+zmodyfikuje warto tego pola. Jeli nie ustawiono zmiennej, to
+\fBdpkg\-gencontrol\fP uyje \fBdu \-k debian/tmp\fP, aby znale jej warto
+domyln.
+.TP 
+\fBExtra\-Size\fP
+Dodatkowa przestrze dyskowa, uywana podczas instalowania pakietu. Jeli ta
+zmienna jest ustawiona, to jej warto jest dodawana do wartoci zmiennej
+\fBInstalled\-Size\fP (niezalenie od tego, czy zostaa otwarcie ustawiona, czy
+ma warto domyln), zanim zostania skopiowana do pola \fBInstalled\-Size\fP
+pliku kontrolnego.
+.TP 
+\fBF:\fP\fInazwa\-pola\fP
+Warto pola wyjciowego \fInazwa_pola\fP (ktre musi by podane z uyciem
+Notacji\-Wielbdziej). Ustawienie takich zmiennych wpywa tylko na miejsca,
+gdzie s one jawnie rozwijane.
+.TP 
+\fBFormat\fP
+Wersja formatu pliku \fB.changes\fP wygenerowana przez t wersj skryptw
+przygotowujcych pakiety rdowe. Ustawienie tej zmiennej zmienia rwnie
+zawarto pola \fBFormat\fP w pliku \fB.changes\fP.
+.TP 
+\fBNewline\fP, \fBSpace\fP, \fBTab\fP
+Kada z tych zmiennych zawiera odpowiadajcy jej znak.
+.TP 
+\fBshlibs:\fP\fIpole\-zalenoci\fP
+Ustawienia zmiennych w tej postaci s generowane przez \fBdpkg\-shlibdeps\fP.
+.TP 
+\fBdpkg:Upstream\-Version\fP
+Oryginalna wersja dpkg, nadana przez autorw.
+.TP 
+\fBdpkg:Version\fP
+Pena wersja programu dpkg.
+.LP
+Jeeli jest odwoanie do niezdefiniowanej zmiennej, to generowane jest
+ostrzeenie i przyjmowana jest pusta warto zmiennej.
+.
+.SH PLIKI
+.TP 
+\fBdebian/substvars\fP
+Lista zmiennych podstawiania i ich wartoci.
+.
+.SH BDY
+Punkt, w ktrym nastpuje nadpisywanie pl w porwnaniu do pewnych
+standardowych ustawie pl wyjciowych jest do zagmatwany.
+
+.SH "ZOBACZ TAKE"
+\fBdpkg\fP(1), \fBdpkg\-genchanges\fP(1), \fBdpkg\-gencontrol\fP(1),
+\fBdpkg\-shlibdeps\fP(1), \fBdpkg\-source\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg.1
--- dpkg/man/pl/dpkg.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,774 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg 1 2011\-08\-14 "Projekt Debiana" "uytki dpkg"
+.SH NAZWA
+dpkg \- meneder pakietw Debiana
+.
+.SH SKADNIA
+\fBdpkg\fP [\fIoption\fP...] \fIaction\fP
+.
+.SH UWAGA
+Ten podrcznik jest przeznaczony dla uytkownikw, ktrzy chc pozna opcje
+programu \fBdpkg\fP oraz chc dowiedzie si o pakietach wicej ni podaje to
+\fBdpkg \-\-help\fP.
+
+Ten podrcznik \fInie\fP wyjania technicznych szczegw, np. w jaki sposb
+\fBdpkg\fP instaluje lub usuwa swoje pakiety, gdy jest to dla przecitnego
+uytkownika zupenie nieistotne.
+.
+.SH OPIS
+\fBdpkg\fP jest narzdziem do instalowania, tworzenia, usuwania pakietw
+systemu Debian oraz do zarzdzania nimi. Podstawowym i bardziej przyjaznym
+uytkownikowi narzdziem\-nakadk \fBdpkg\fP jest \fBaptitude\fP(1). Sam \fBdpkg\fP
+jest obsugiwany z linii komend, przez podanie dokadnie jednego dziaania
+oraz dodatkowych, nieobowizkowych opcji. Parametr dziaanie okrela, co
+\fBdpkg\fP ma zrobi, a dodatkowe opcje modyfikuj to dziaanie.
+
+\fBdpkg\fP can also be used as a front\-end to \fBdpkg\-deb\fP(1) and
+\fBdpkg\-query\fP(1). The list of supported actions can be found later on in the
+\fBACTIONS\fP section. If any such action is encountered \fBdpkg\fP just runs
+\fBdpkg\-deb\fP or \fBdpkg\-query\fP with the parameters given to it, but no
+specific options are currently passed to them, to use any such option the
+back\-ends need to be called directly.
+.
+.SH "INFORMACJE O PAKIETACH"
+\fBdpkg\fP zarzdza informacjami o dostpnych pakietach. Informacje zostay
+podzielone na trzy klasy: \fBstan biecy\fP, \fBstan wyboru\fP oraz
+\fBflag\fP. Wartoci te mog zosta zmienione za pomoc programu \fBdselect\fP.
+.SS "STAN BIECY PAKIETW"
+.TP 
+\fBnot\-installed (niezainstalowany)\fP
+Pakiet nie jest zainstalowany w systemie.
+.TP 
+\fBconfig\-files (pliki\-konfiguracyjne)\fP
+Tylko pliki konfiguracyjne pakietu zostay w systemie.
+.TP 
+\fBhalf\-installed (wpzainstalowany)\fP
+Instalacja pakietu zostaa rozpoczta, ale niedokoczona z pewnych powodw.
+.TP 
+\fBunpacked (rozpakowany)\fP
+Pakiet jest rozpakowany, ale nie skonfigurowany.
+.TP 
+\fBhalf\-configured (wpskonfigurowany)\fP
+Pakiet jest rozpakowany, a konfiguracja zostaa rozpoczta, ale
+niedokoczona z pewnych powodw.
+.TP 
+\fBtriggers\-awaited\fP
+Pakiet oczekuje przetworzenia wyzwalaczy przez inny pakiet.
+.TP 
+\fBtriggers\-pending\fP
+Pakiet zosta pobudzony.
+.TP 
+\fBinstalled (zainstalowany)\fP
+Pakiet jest rozpakowany i poprawnie skonfigurowany.
+.SS "STAN WYBORU PAKIETW"
+.TP 
+\fBinstall (instalacja)\fP
+Pakiet zosta wybrany do zainstalowania.
+.TP 
+\fBhold (wstrzymanie)\fP
+Pakiet oznaczony jako \fBwstrzymany\fP nie jest obsugiwany przez \fBdpkg\fP,
+chyba e uyje si opcji \fB\-\-force\-hold\fP.
+.TP 
+\fBdeinstall (deinstalacja)\fP
+Pakiet zosta wybrany do odinstalowania (to znaczy, e chcemy skasowa
+wszystkie pliki pakietu oprcz plikw konfiguracyjnych).
+.TP 
+\fBpurge (wyczyszczenie)\fP
+The package is selected to be purged (i.e. we want to remove everything from
+system directories, even configuration files).
+.SS "FLAGI PAKIETW"
+.TP 
+\fBreinst\-required (konieczna\-reinstalacja)\fP
+Pakiet oznaczony jako \fBkonieczna\-reinstalacja\fP jest uszkodzony i wymaga
+reinstalacji. Taki pakiet nie moe zosta usunity, chyba e uyje si opcji
+\fB\-\-force\-remove\-reinstreq\fP.
+.
+.SH AKCJE
+.TP 
+\fB\-i\fP, \fB\-\-install\fP \fIpackage\-file\fP...
+Install the package. If \fB\-\-recursive\fP or \fB\-R\fP option is specified,
+\fIpackage\-file\fP must refer to a directory instead.
+
+Instalacja skada si z nastpujcych krokw:
+.br
+
+\fB1.\fP Rozpakowanie plikw kontrolnych nowego pakietu.
+.br
+
+\fB2.\fP Jeli inna wersja tego samego pakietu jest ju zainstalowana,
+uruchomienie skryptu \fIprerm\fP starego pakietu.
+.br
+
+\fB3.\fP Uruchomienie skryptu \fIpreinst\fP, jeli pakiet go zawiera.
+.br
+
+\fB4.\fP Rozpakowanie nowych plikw, ale przechowanie starych na wypadek, gdyby
+instalacja si nie powioda i trzeba by je odzyska.
+.br
+
+\fB5.\fP Jeli inna wersja tego samego pakietu bya poprzednio zainstalowana,
+uruchomienie skryptu \fIpostrm\fP starego pakietu. Prosz zauway, e ten
+skrypt jest uruchamiany po skrypcie \fIpreinst\fP nowego pakietu, poniewa nowe
+pliki s zapisywane w tym samym czasie, gdy stare s kasowane.
+.br
+
+\fB6.\fP Konfiguracja pakietu. Bardziej szczegowe informacje zawarto przy
+opisie parametru \fB\-\-configure\fP.
+.TP 
+\fB\-\-unpack \fP\fIpackage\-file\fP...
+Unpack the package, but don't configure it. If \fB\-\-recursive\fP or \fB\-R\fP
+option is specified, \fIpackage\-file\fP must refer to a directory instead.
+.TP 
+\fB\-\-configure \fP\fIpakiet\fP...|\fB\-a\fP|\fB\-\-pending\fP
+Configure a package which has been unpacked but not yet configured.  If
+\fB\-a\fP or \fB\-\-pending\fP is given instead of \fIpackage\fP, all unpacked but
+unconfigured packages are configured.
+
+To reconfigure a package which has already been configured, try the
+\fBdpkg\-reconfigure\fP(8)  command instead.
+
+Konfigurowanie skada si z nastpujcych krokw:
+.br
+
+\fB1.\fP Rozpakowanie nowych plikw konfiguracyjnych, ale przechowanie starych
+na wypadek, gdyby konfigurowanie si nie powiodo i trzeba by je odzyska.
+.br
+
+\fB2.\fP Uruchomienie skryptu \fIpostinst\fP, jeli pakiet go zawiera.
+.TP 
+\fB\-\-triggers\-only\fP \fIpakiet\fP...|\fB\-a\fP|\fB\-\-pending\fP
+Przetwarzanie samych wyzwalaczy. Wszystkie zaplanowane wyzwalacze zostan
+przetworzone. Jeli podane s nazwy pakietw, tylko ich wyzwalacze zostan
+przetworzone \- kady dokadnie raz, tam gdzie to potrzebne. Uycie tej opcji
+moe pozostawi pakiety w niewaciwym stanie \fBtriggers\-awaited\fP lub
+\fBtriggers\-pending\fP. Moe to by pniej naprawione przez wywoanie: \fBdpkg
+\-\-configure \-\-pending\fP.
+.TP 
+\fB\-r\fP, \fB\-\-remove\fP, \fB\-P\fP, \fB\-\-purge \fP\fIpakiet\fP...|\fB\-a\fP|\fB\-\-pending\fP
+Remove an installed package. \fB\-r\fP or \fB\-\-remove\fP remove everything except
+conffiles. This may avoid having to reconfigure the package if it is
+reinstalled later. (Conffiles are configuration files that are listed in the
+\fIDEBIAN/conffiles\fP control file). \fB\-P\fP or \fB\-\-purge\fP removes everything,
+including conffiles. If \fB\-a\fP or \fB\-\-pending\fP is given instead of a package
+name, then all packages unpacked, but marked to be removed or purged in file
+\fI/var/lib/dpkg/status\fP, are removed or purged, respectively. Note: some
+configuration files might be unknown to \fBdpkg\fP because they are created and
+handled separately through the configuration scripts. In that case, \fBdpkg\fP
+won't remove them by itself, but the package's \fIpostrm\fP script (which is
+called by \fBdpkg\fP), has to take care of their removal during purge. Of
+course, this only applies to files in system directories, not configuration
+files written to individual users' home directories.
+
+Usunicie pakietu skada si z nastpujcych krokw:
+.br
+
+\fB1.\fP Uruchomienie skryptu \fIprerm\fP
+.br
+
+\fB2.\fP Usunicie zainstalowanych plikw
+.br
+
+\fB3.\fP Uruchomienie skryptu \fIpostrm\fP
+.br
+.TP 
+\fB\-\-update\-avail\fP, \fB\-\-merge\-avail\fP \fIplik\-pakietw\fP
+Zaktualizowanie bazy danych programu \fBdpkg\fP oraz \fBdselect\fP o dostpnych
+pakietach. Opcja \fB\-\-merge\-avail\fP powoduje, e poprzednie informacje s
+czone z nowymi z \fIpliku_pakietw\fP. Opcja \fB\-\-update\-avail\fP powoduje
+zastpienie starych informacji nowymi z \fIpliku_pakietw\fP. \fIPlik_pakietw\fP
+dystrybuowany razem z systemem Debian nazywa si po prostu
+\fIPackages\fP. \fBdpkg\fP przechowuje informacje o dostpnych pakietach w pliku
+\fI/var/lib/dpkg/available\fP.
+
+Prostszym poleceniem, ktrego mona uy w celu pobrania i odwieenia pliku
+\fIavailable\fP, jest \fBdselect update\fP. Prosz zauway, e plik ten jest
+zasadniczo nieuyteczny, jeli nie uywa si \fBdselect\fP tylko nakadki
+bazujcej na APT. Przyczyn tego jest fakt, e APT posiada wasny system
+okrelania dostpnoci pakietw.
+.TP 
+\fB\-A\fP, \fB\-\-record\-avail\fP \fIpackage\-file\fP...
+Update \fBdpkg\fP and \fBdselect\fP's idea of which packages are available with
+information from the package \fIpackage\-file\fP. If \fB\-\-recursive\fP or \fB\-R\fP
+option is specified, \fIpackage\-file\fP must refer to a directory instead.
+.TP 
+\fB\-\-forget\-old\-unavail\fP
+Aktualnie \fBprzestarzae\fP i nie daje adnego efektu, poniewa \fBdpkg\fP
+automatycznie zapomina o niezainstalowanych, niedostpnych pakietach.
+.TP 
+\fB\-\-clear\-avail\fP
+Skasowanie informacji o dostpnych pakietach.
+.TP 
+ \fB\-C\fP, \fB\-\-audit\fP
+Wyszukanie pakietw, ktre zainstalowane s w systemie tylko
+czciowo. \fBdpkg\fP zasugeruje, co mona zrobi z tymi pakietami, aby w peni
+dziaay.
+.TP 
+\fB\-\-get\-selections\fP [\fIwzorzec\-nazwy\-pakietu\fP...]
+Pobranie listy wybranych pakietw i wypisanie jej na stdout. Jeeli nie
+podano wzorca, pakiety niezainstalowane (czyli takie, ktre nie zostay
+uprzednio wyczyszczone) nie zostan wywietlone.
+.TP 
+\fB\-\-set\-selections\fP
+Set package selections using file read from stdin. This file should be in
+the format '\fIpackage\fP \fIstate\fP', where state is one of \fBinstall\fP, \fBhold\fP,
+\fBdeinstall\fP or \fBpurge\fP. Blank lines and comment lines beginning with '#'
+are also permitted.
+.TP 
+\fB\-\-clear\-selections\fP
+Oznacza wszystkie pakiety nie bdce pakietami niezbdnymi (essential) jako
+przeznaczone do usunicia. Opcja ta powinna by uyta bezporednio przed
+\-\-set\-selections, aby usun wszystkie pakiety niewymienione w
+\-\-set\-selections.
+.TP 
+\fB\-\-yet\-to\-unpack\fP
+Wyszukanie pakietw przeznaczonych do zainstalowania, ktre z pewnych
+powodw nie mogy zosta zainstalowane.
+.TP 
+.TP 
+\fB\-\-print\-architecture\fP
+Podanie architektury pakietw instalowanych przez \fBdpkg\fP (na przykad
+"i386").
+.TP 
+\fB\-\-compare\-versions \fP\fIwersja1 op wersja2\fP
+Porwnanie numerw wersji, gdzie \fIop\fP jest operatorem binarnym. \fBdpkg\fP
+zwrci prawd (rezultat zerowy) \- gdy warunek jest speniony, lub zwrci
+fasz (rezultat niezerowy) \- w przeciwnym razie. Istniej dwie grupy
+operatorw, w zalenoci od tego, w jaki sposb traktuje si pusty numer
+\fIwersji1\fP lub \fIwersji2\fP. Operatory, dla ktrych pusty numer wersji oznacza
+wersj wczeniejsz ni dowolna: \fBlt le eq ne ge gt\fP. Operatory, dla
+ktrych pusty numer wersji oznacza wersj pniejsz ni dowolna: \fBlt\-nl
+le\-nl ge\-nl gt\-nl\fP. Operatory istniejce, aby zachowa kompatybilno z
+plikiem kontrolnym: \fB< << <= = >= >> >\fP.
+.TP 
+\fB\-\-command\-fd \fP\fIn\fP
+Accept a series of commands on input file descriptor \fIn\fP. Note: additional
+options set on the command line, and through this file descriptor, are not
+reset for subsequent commands executed during the same run.
+.TP 
+\fB\-\-help\fP
+Wywietlenie krtkiego komunikatu pomocy.
+.TP 
+\fB\-\-force\-help\fP
+Wywietlenie opisu opcji \fB\-\-force\-\fP\fIdziaanie\fP.
+.TP 
+\fB\-Dh\fP, \fB\-\-debug=help\fP
+Wywietlenie opisu opcji debuggera.
+.TP 
+\fB\-\-version\fP
+Wywietlenie informacji o wersji \fBdpkg\fP.
+.TP 
+\fBakcje dpkg\-deb\fP
+Prosz zajrze do \fBdpkg\-deb\fP(1), aby pozna peny opis nastpujcych
+dziaa.
+
+.nf
+\fB\-b\fP, \fB\-\-build\fP \fIkatalog\fP [\fIarchiwum\fP|\fIkatalog\fP]
+    Zbudowanie pakietu deb.
+\fB\-c\fP, \fB\-\-contents\fP \fIarchiwum\fP
+    Podanie zawartoci pakietu deb.
+\fB\-e\fP, \fB\-\-control\fP \fInazwa\-pliku\fP [\fIkatalog\fP]
+    Rozpakowanie plikw kontrolnych z pakietu.
+\fB\-x\fP, \fB\-\-extract\fP \fIarchiwum katalog\fP
+     Rozpakowanie plikw zawartych w pakiecie.
+\fB\-X\fP, \fB\-\-vextract\fP \fIarchiwum katalog\fP
+    Rozpakowanie pakietu i podanie nazw plikw, ktre
+    zawiera pakiet.
+\fB\-f\fP, \fB\-\-field\fP \fIarchiwum\fP [\fIpole\-kontrolne\fP...]
+    Podanie informacji z pl kontrolnych pakietu.
+\fB\-\-fsys\-tarfile\fP \fIarchiwum\fP
+    Podanie na stdout archiwum tar, ktre zawiera pakiet
+    Debiana.
+\fB\-I\fP, \fB\-\-info\fP \fIarchiwum\fP [\fIplik\-kontrolny\fP...]
+     Podanie informacji o pakiecie.
+.fi
+
+.TP 
+\fBakcje dpkg\-query\fP
+Prosz przeczyta \fBdpkg\-query\fP(8), aby uzyska szczegowe informacje o
+nastpujcych dziaaniach.
+
+.nf
+
+\fB\-l\fP, \fB\-\-list\fP \fIwzorzec\-nazw\-pakietw\fP...
+    Wywietla pakiety pasujce do wzorca.
+\fB\-s\fP, \fB\-\-status\fP \fInazwa\-pakietu\fP...
+    Wywietla informacje o stanie danego pakietu.
+\fB\-L\fP, \fB\-\-listfiles\fP \fInazwa\-pakietu\fP...
+    Wywietla list plikw zainstalowanych w systemie przez pakiet \fInazwa\-pakietu\fP.
+\fB\-S\fP, \fB\-\-search\fP \fIwzorzec\-wyszukiwania\-nazw\-plikw\fP...
+    Wyszukuje nazwy plikw w zainstalowanych pakietach.
+\fB\-p\fP, \fB\-\-print\-avail\fP \fInazwa\-pakietu\fP...
+    Wywietla szczegowe informacje na temat pakietu \fInazwa\-pakietu\fP,
+    pochodzce z pliku \fI/var/lib/dpkg/available\fP. Uytkownicy nakadek
+    opartych o APT powinni uywa \fBapt\-cache show\fP \fIpackage\-name\fP zamiast
+    tej opcji.
+.fi
+.
+.SH OPCJE
+Wszystkie opcje mog by podane zarwno w linii polece, jak i w pliku
+konfiguracyjnym \fI/etc/dpkg/dpkg.cfg\fP programu \fBdpkg\fP lub w plikach w
+katalogu konfiguracyjnym \fI/etc/dpkg/dpkg.cfg.d/\fP. Kada linia pliku
+konfiguracyjnego jest albo opcj (dokadnie tak sam jak opcja linii
+polece, ale bez pocztkowych mylnikw), albo komentarzem (jeeli zaczyna
+si od \fB#\fP).
+.br
+.TP 
+\fB\-\-abort\-after=\fP\fIliczba\fP
+Zmiana liczby bdw, po ktrych \fBdpkg\fP zaprzestanie dziaania. Domylna
+warto to 50.
+.TP 
+\fB\-B\fP, \fB\-\-auto\-deconfigure\fP
+Gdy pakiet jest usuwany, moliwe jest, e inny zainstalowany pakiet zaley
+od tego usuwanego. Podanie tej opcji spowoduje automatyczne dekonfigurowanie
+pakietw, ktre s zalene od usuwanego.
+.TP 
+\fB\-D\fP\fIsemkowo\fP, \fB\-\-debug=\fP\fIsemkowo\fP
+Wczenie trybu debuggera. \fIsemkowo\fP jest liczb semkow bdc sum
+logiczn bitw opcji debuggera z poniszej listy (te wartoci mog si
+zmieni w przyszoci). Parametr \fB\-Dh\fP lub \fB\-\-debug=help\fP wywietla te
+wartoci.
+
+    Number   Description
+         1   Generally helpful progress information
+         2   Invocation and status of maintainer scripts
+        10   Output for each file processed
+       100   Lots of output for each file processed
+        20   Output for each configuration file
+       200   Lots of output for each configuration file
+        40   Dependencies and conflicts
+       400   Lots of dependencies/conflicts output
+     10000   Trigger activation and processing
+     20000   Lots of output regarding triggers
+     40000   Silly amounts of output regarding triggers
+      1000   Lots of drivel about e.g. the dpkg/info dir
+      2000   Insane amounts of drivel
+.TP 
+\fB\-\-force\-\fP\fIdziaania\fP, \fB\-\-no\-force\-\fP\fIdziaania\fP, \fB\-\-refuse\-\fP\fIdziaania\fP
+
+Wymu (\fB\-\-force\-\fP) wykonanie pewnych dziaa lub pozostaw domylny sposb
+(\fBno\-force\fP i \fBrefuse\fP oznaczaj to samo) wykonania dziaa. \fIdziaania\fP
+to rozdzielona przecinkami lista dziaa. \fB\-\-force\-help\fP wywietla opis
+tych dziaa. Dziaania oznaczone przez (*) s domylnie wymuszone.
+
+\fIOstrzeenie: Te opcje s zwykle przeznaczone wycznie dla dowiadczonych
+uytkownikw. Uycie ich bez penego zrozumienia efektu dziaania moe
+spowodowa uszkodzenie systemu.\fP
+
+\fBall\fP: Wcza (lub wycza) wszystkie opcje typu "force".
+
+\fBdowngrade\fP(*): Zainstalowanie pakietu, nawet gdy nowsza jego wersja jest
+ju zainstalowana.
+
+\fIOstrzeenie: W chwili obecnej dpkg nie sprawdza zalenoci podczas
+instalowania starszej wersji pakietu i dlatego nie wypisze ostrzeenia,
+jeeli zainstalowanie starszej wersji popsuje zalenoci innych
+pakietw. Instalowanie starszych wersji niezbdnych (essential) pakietw
+moe spowodowa \- i jest to powany skutek uboczny \- e Twj system nie
+bdzie si nadawa do uytku. Prosz uywa tej opcji ostronie.\fP
+
+\fBconfigure\-any\fP: Skonfigurowanie wszystkich rozpakowanych ale
+nieskonfigurowanych pakietw, od ktrych zaley biecy pakiet.
+
+\fBhold\fP: Dziaanie obejmie take pakiety oznaczone jako "wstrzymane" (hold).
+
+\fBremove\-reinstreq\fP: Usunicie pakietu, nawet wtedy gdy jest uszkodzony i
+wymaga przeinstalowania. Moe to spowodowa pozostawienie czci pakietu w
+systemie, gdy \fBdpkg\fP zapomni o niej.
+
+\fBremove\-essential\fP: Usunicie pakietu, nawet wtedy gdy jest on uznany za
+niezbdny (essential). Pakiety niezbdne zawieraj podstawowe polecenia
+Uniksa. Usunicie ich moe spowodowa, e system przestanie dziaa. Naley
+zachowa szczegln ostrono przy uyciu tej opcji.
+
+\fBdepends\fP: Zamiana wszystkich problemw z zalenociami na ostrzeenia.
+
+\fBdepends\-version\fP: Zignorowanie problemw z numerami wersji przy
+sprawdzaniu zalenoci.
+
+\fBbreaks\fP: Instalacja, nawet jeliby to popsuo inny pakiet.
+
+\fBconflicts\fP: Instalacja, nawet gdy pakiet powoduje konflikt z
+innym. Powsta moe niebezpieczestwo nadpisania plikw z innego pakietu,
+dlatego naley zachowa ostrono przy uyciu tej opcji.
+
+\fBconfmiss\fP: Zawsze bd instalowane brakujce pliki
+konfiguracyjne. Uywanie tej opcji moe by niebezpieczne, poniewa nie
+zachowuje to zmiany dokonanej na pliku (czyli jego usunicia).
+
+\fBconfnew\fP: Jeli plik konfiguracyjny zosta zmodyfikowany, zainstalowana
+zostanie jego nowa wersja bez pytania, chyba e uyto rwnie opcji
+\fB\-\-force\-confdef\fP, co spowoduje wykonanie domylnej akcji.
+
+\fBconfold\fP: Jeli plik konfiguracyjny zosta zmodyfikowany, stara wersja
+zostanie zachowana bez pytania, chyba e uyto rwnie opcji
+\fB\-\-force\-confdef\fP, co spowoduje wykonanie domylnej akcji.
+
+\fBconfdef\fP: Jeli plik konfiguracyjny zosta zmodyfikowany, wybrane zostanie
+domylne dziaanie. Jeeli nie okrelono domylnej akcji, uytkownik
+zostanie poproszony o dokonanie wyboru. Podanie dodatkowo opcji
+\fB\-\-force\-confnew\fP lub \fB\-\-force\-confold\fP zdecyduje o dalszym dziaaniu.
+
+\fBconfask\fP: If a conffile has been modified always offer to replace it with
+the version in the package, even if the version in the package did not
+change. If any of \fB\-\-force\-confmiss\fP, \fB\-\-force\-confnew\fP,
+\fB\-\-force\-confold\fP, or \fB\-\-force\-confdef\fP is also given, it will be used to
+decide the final action.
+
+\fBoverwrite\fP: Nadpisanie plikw z innych pakietw, w przypadku gdy dany plik
+wystpuje take w innym pakiecie.
+
+\fBoverwrite\-dir\fP Nadpisanie katalogw z innych pakietw, w przypadku gdy
+dany katalog wystpuje take w innym pakiecie.
+
+\fBoverwrite\-diverted\fP: Nadpisanie plikw ominitych plikami nieominitymi.
+
+\fBunsafe\-io\fP: Do not perform safe I/O operations when unpacking. Currently
+this implies not performing file system syncs before file renames, which is
+known to cause substantial performance degradation on some file systems,
+unfortunately the ones that require the safe I/O on the first place due to
+their unreliable behaviour causing zero\-length files on abrupt system
+crashes.
+
+\fINote\fP: For ext4, the main offender, consider using instead the mount
+option \fBnodelalloc\fP, which will fix both the performance degradation and
+the data safety issues, the latter by making the file system not produce
+zero\-length files on abrupt system crashes with any software not doing syncs
+before atomic renames.
+
+\fIWarning: Using this option might improve performance at the cost of losing
+data, use with care.\fP
+
+\fBarchitecture\fP: Process even packages with wrong or no architecture.
+
+\fBbad\-version\fP: Process even packages with wrong versions.
+
+\fBbad\-path\fP: Zignorowanie braku pewnych programw w ciece zmiennej
+systemowej \fBPATH\fP.
+
+\fBnot\-root\fP: Prba (de)instalacji, gdy dpkg nie jest uruchamiany z konta
+administartora.
+
+\fBbad\-verify\fP: Instalowanie pakietu, nawet jeeli nie powiedzie si
+sprawdzenie jego autentycznoci.
+
+.TP 
+\fB\-\-ignore\-depends\fP=\fIpakiet\fP,...
+Zignorowanie sprawdzania zalenoci od podanych pakietw (a cilej rzecz
+biorc, sprawdzanie si odbywa, ale w przypadku konfliktw wywietlane jest
+tylko ostrzeenie).
+.TP 
+\fB\-\-no\-act\fP, \fB\-\-dry\-run\fP, \fB\-\-simulate\fP
+Podejmowane dziaania nie powoduj adnych zmian. Ta opcja jest uyteczna,
+gdy potrzeba sprawdzi, czy dziaanie si wykona, ale bez powodowania zmian
+czegokolwiek.
+
+Opcj \fB\-\-no\-act\fP naley poda jako pierwszy parametr, gdy w przeciwnym
+razie mona otrzyma niespodziewane efekty. (np. \fBdpkg \-\-purge bla
+\-\-no\-act\fP wyczyci pakiet bla, a nastpnie sprbuje wyczyci pakiet o
+nazwie \-\-no\-act, mimo e najprawdopodobniej spodziewae si, e takie
+polecenie nic nie zrobi).
+.TP 
+\fB\-R\fP, \fB\-\-recursive\fP
+Dziaanie obejmie wszystkie pliki \fB*.deb\fP z podanego katalogu, wraz z
+podkatalogami tego katalogu. Ta opcja moe zosta uyta wraz z \fB\-i\fP, \fB\-A\fP,
+\fB\-\-install\fP, \fB\-\-unpack\fP oraz \fB\-\-avail\fP.
+.TP 
+\fB\-G\fP
+Nieinstalowanie pakietu, jeli jego nowsza wersja jest ju
+zainstalowana. Jest to dokadnie to samo, co \fB\-\-refuse\-downgrade\fP.
+.TP 
+\fB\-\-admindir=\fP\fIkatalog\fP
+Zmiana domylnego katalogu administracyjnego, zawierajcego wiele plikw
+dostarczajcych informacji o stanie zainstalowanych i niezainstalowanych
+pakietw itp. (Warto domylna to \fI/var/lib/dpkg\fP).
+.TP 
+\fB\-\-instdir=\fP\fIkatalog\fP
+Zmiana domylnego katalogu instalacyjnego, czyli katalogu, w ktrym pakiety
+s instalowane. \fBinstdir\fP jest take katalogiem przekazywanym do
+\fBchroot\fP(2) przed uruchomieniem skryptw dostarczonyhc przez opiekuna
+pakietu, co oznacza, e skrypty te widz \fBinstdir\fP jako gwny katalog
+hierarchii. (Warto domylna to \fI/\fP).
+.TP 
+\fB\-\-root=\fP\fIkatalog\fP
+Zmiana \fBroot\fP zmienia \fBinstdir\fP na \fIkatalog\fP i \fBadmindir\fP na
+\fIkatalog\fP\fB/var/lib/dpkg\fP.
+.TP 
+\fB\-O\fP, \fB\-\-selected\-only\fP
+Dziaanie obejmuje wycznie pakiety wybrane do instalacji. Wybr moe
+zosta dokonany przez polecenie \fBdselect\fP lub \fBdpkg\fP, gdy wykonuje
+operacje na pakietach. Na przykad pakiet usuwany jest zaznaczany jako
+wybrany do odinstalowania.
+.TP 
+\fB\-E\fP, \fB\-\-skip\-same\-version\fP
+Nieinstalowanie pakietu, jeli o tej samej wersji jest ju zainstalowany w
+systemie.
+.P
+\fB\-\-pre\-invoke=\fP\fIpolecenie\fP
+.br
+\fB\-\-post\-invoke=\fP\fIpolecenie\fP
+.RS
+Okrela dodatkowe \fIpolecenie\fP, ktre bdzie wywoane przez "sh \-c" przed
+lub po wykonaniu przez dpkg akcji: \fIunpack\fP, \fIconfigure\fP, \fIinstall\fP,
+\fItriggers\-only\fP, \fIremove\fP oraz \fIpurge\fP. Opcja ta moe by podana
+wielokrotnie. Zachowywana jest kolejno podawania opcji, poprzedzane s one
+jeszcze opcjami z plikw konfiguracyjnych. Zmienna rodowiska
+\fBDPKG_HOOK_ACTION\fP jest ustawiana dla dodatkowych polece na warto
+odpowiadajc biecej akcji dpkg. Uwaga: nakadki mog uruchamia dpkg
+kilka razy w cigu jednego wywoania, co moe spowodowa uruchomienie
+dodatkowych polece wicej razy ni oczekiwano.
+.RE
+.P
+\fB\-\-path\-exclude=\fP\fIglob\-pattern\fP
+.br
+\fB\-\-path\-include=\fP\fIglob\-pattern\fP
+.RS
+Set \fIglob\-pattern\fP as a path filter, either by excluding or re\-including
+previously excluded paths matching the specified patterns during install.
+
+\fIWarning: take into account that depending on the excluded paths you might
+completely break your system, use with caution.\fP
+
+The glob patterns use the same wildcards used in the shell, were '*' matches
+any sequence of characters, including the empty string and also '/'. For
+example, \fI'/usr/*/READ*'\fP matches \fI'/usr/share/doc/package/README'\fP.  As
+usual, '?' matches any single character (again, including '/'). And '['
+starts a character class, which can contain a list of characters, ranges and
+complementations. See \fBglob\fP(7) for detailed information about
+globbing. Note: the current implementation might re\-include more directories
+and symlinks than needed, to be on the safe side and avoid possible unpack
+failures, future work might fix this.
+
+This can be used to remove all paths except some particular ones; a typical
+case is:
+
+.nf
+\fB\-\-path\-exclude=/usr/share/doc/*\fP
+\fB\-\-path\-include=/usr/share/doc/*/copyright\fP
+.fi
+
+to remove all documentation files except the copyright files.
+
+These two options can be specified multiple times, and interleaved with each
+other. Both are processed in the given order, with the last rule that
+matches a file name making the decision.
+.RE
+.TP 
+\fB\-\-status\-fd \fP\fIn\fP
+Wysanie "czytelnego dla maszyny" statusu pakietu i informacji o postpie do
+deskryptora pliku \fIn\fP. Ta opcja moe by podana wielokrotnie. Informacja
+jest oglnie zapisywana po jednym wpisie w linii, w jednej z nastpujcych
+form:
+.RS
+.TP 
+\fBstatus: \fP\fIpakiet\fP\fB: \fP\fIstatus\fP
+Nastpia zmiana statusu pakietu, \fIstatus\fP jest taki jak w pliku statusu
+pakietu.
+.TP 
+\fBstatus: \fP\fIpakiet\fP\fB : error : \fP\fIrozszerzony\-komunikat\-bdu\fP
+An error occurred. Any possible newlines in \fIextended\-error\-message\fP will
+be converted to spaces before output.
+.TP 
+\fBstatus: \fP\fIplik\fP\fB : conffile\-prompt : '\fP\fIprawdziwy\-stary\fP\fB' '\fP\fIprawdziwy\-nowy\fP\fB' \fP\fIzmiany\-uytkownika\fP\fB \fP\fIzmiany\-dystrybucyjne\fP
+Uytkownikowi zostanie przedstawione pytanie odnonie pliku
+konfiguracyjnego.
+.TP 
+\fBprocessing: \fP\fIetap\fP\fB: \fP\fIpakiet\fP
+Sent just before a processing stage starts. \fIstage\fP is one of \fBupgrade\fP,
+\fBinstall\fP (both sent before unpacking), \fBconfigure\fP, \fBtrigproc\fP,
+\fBdisappear\fP, \fBremove\fP, \fBpurge\fP.
+.RE
+.TP 
+\fB\-\-status\-logger\fP=\fIcommand\fP
+Send machine\-readable package status and progress information to the shell
+\fIcommand\fP's standard input. This option can be specified multiple
+times. The output format used is the same as in \fB\-\-status\-fd.\fP
+.RE
+.TP 
+\fB\-\-log=\fP\fInazwa\-pliku\fP
+Log status change updates and actions to \fIfilename\fP, instead of the default
+\fI/var/log/dpkg.log\fP. 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
+\fIstate\fP \fIpkg\fP \fIinstalled\-version\fP' for status change updates; `YYYY\-MM\-DD
+HH:MM:SS \fIaction\fP \fIpkg\fP \fIinstalled\-version\fP \fIavailable\-version\fP' for
+actions where \fIaction\fP is one of \fBinstall\fP, \fBupgrade\fP, \fBremove\fP,
+\fBpurge\fP; and `YYYY\-MM\-DD HH:MM:SS conffile \fIfilename\fP \fIdecision\fP' for
+conffile changes where \fIdecision\fP is either \fBinstall\fP or \fBkeep\fP.
+.TP 
+\fB\-\-no\-debsig\fP
+Nie prbuje weryfikowa sygnatur pakietu.
+.TP 
+\fB\-\-no\-triggers\fP
+Nie uruchamiaj adnych wyzwalaczy w tym przebiegu (aktywacje nadal bd
+zarejestrowane). Przy uyciu wraz z \fB\-\-configure\fP \fIpakiet\fP lub
+\fB\-\-triggers\-only\fP \fIpakiet\fP skrypt "postinst" wskazanego pakietu nadal
+zostanie uruchomiony, nawet jeli wymagane jest tylko uruchomienie
+wyzwalaczy. Uycie tej opcji moe pozostawi pakiety w niewaciwym stanie
+\fBtriggers\-awaited\fP lub \fBtriggers\-pending\fP. Moe to by pniej naprawione
+przez wywoanie: \fBdpkg \-\-configure \-\-pending\fP.
+.TP 
+\fB\-\-triggers\fP
+Anuluje poprzednie \fB\-\-no\-triggers\fP.
+.
+.SH PLIKI
+.TP 
+\fI/etc/dpkg/dpkg.cfg\fP
+Plik konfiguracyjny zawierajcy domylne opcje.
+.TP 
+\fI/var/log/dpkg.log\fP
+Domylny plik logu (patrz \fI/etc/dpkg/dpkg.cfg\fP(5) i opcja \fB\-\-log\fP).
+.P
+Pozostae pliki wymienione poniej odnosz si do swoich domylnych
+katalogw. Opcja \fB\-\-admindir\fP moe zmieni lokalizacj tych plikw.
+.TP 
+\fI/var/lib/dpkg/available\fP
+Lista dostpnych pakietw.
+.TP 
+\fI/var/lib/dpkg/status\fP
+Stan dostpnych pakietw. Ten plik zawiera informacje o tym, czy dany pakiet
+jest wybrany do skasowania, czy jest zainstalowany itp. Te informacje s
+opisane w sekcji \fBINFORMACJE O PAKIETACH\fP.
+
+Kopia zapasowa pliku statusu jest tworzona w \fI/var/backups\fP kadego
+dnia. Moe to by przydatne jeli zostanie on utracony lub uszkodzony z
+powodu kopotw z systemami plikw.
+.P
+Ponisze pliki s czci skadow pakietw binarnych. Wicej informacji o
+nich mona znale w \fBdeb\fP(5).
+.TP 
+\fIcontrol\fP
+.TP 
+\fIconffiles\fP
+.TP 
+\fIpreinst\fP
+.TP 
+\fIpostinst\fP
+.TP 
+\fIprerm\fP
+.TP 
+\fIpostrm\fP
+.
+.SH RODOWISKO
+.TP 
+\fBHOME\fP
+If set, \fBdpkg\fP will use it as the directory from which to read the user
+specific configuration file.
+.TP 
+\fBTMPDIR\fP
+If set, \fBdpkg\fP will use it as the directory in which to create temporary
+files and directories.
+.TP 
+\fBPAGER\fP
+The program \fBdpkg\fP will execute when displaying the conffiles.
+.TP 
+\fBSHELL\fP
+Program uruchamiany przez \fBdpkg\fP, gdy trzeba uruchomi now sesj powoki.
+.TP 
+\fBCOLUMNS\fP
+Ustawia liczb kolumn uywanych przez \fBdpkg\fP w czasie wywietlania
+sformatowanego tekstu. Obecnie uywane tylko przez opcj \-l.
+.TP 
+\fBDPKG_SHELL_REASON\fP
+Defined by \fBdpkg\fP on the shell spawned on the conffile prompt to examine
+the situation. Current valid value: \fBconffile\-prompt\fP.
+.TP 
+\fBDPKG_CONFFILE_OLD\fP
+Defined by \fBdpkg\fP on the shell spawned on the conffile prompt to examine
+the situation. Contains the path to the old conffile.
+.TP 
+\fBDPKG_CONFFILE_NEW\fP
+Defined by \fBdpkg\fP on the shell spawned on the conffile prompt to examine
+the situation. Contains the path to the new conffile.
+.TP 
+\fBDPKG_RUNNING_VERSION\fP
+Zdefiniowana przez \fBdpkg\fP w rodowisku skryptu opiekuna pakietu, jako
+wersja aktualnie uruchomionej instancji programu \fBdpkg\fP.
+.TP 
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP
+Zdefiniowana przez \fBdpkg\fP w rodowisku skryptu opiekuna pakietu, jako nazwa
+przetwarzanego pakietu.
+.TP 
+\fBDPKG_MAINTSCRIPT_ARCH\fP
+Zdefiniowana przez \fBdpkg\fP w rodowisku skryptu opiekuna pakietu, jako
+architektura dla ktrej budowano pakiet.
+.TP 
+\fBDPKG_MAINTSCRIPT_NAME\fP
+Defined by \fBdpkg\fP on the maintainer script environment to the name of the
+script running (preinst, postinst, prerm, postrm).
+.
+.SH PRZYKADY
+Wywietlenie wszystkich pakietw zwizanych z edytorem \fBvi\fP(1):
+.br
+    \fBdpkg \-l \(aq*vi*\(aq\fP
+.br
+
+Wywietlenie informacji z pliku \fI/var/lib/dpkg/available\fP o dwch
+pakietach:
+.br
+     \fBdpkg \-\-print\-avail elvis vim | less\fP
+.br
+
+Samodzielne przeszukanie informacji o pakietach:
+.br
+     \fBless /var/lib/dpkg/available\fP
+.br
+
+Wykasowanie zainstalowanego pakietu elvis:
+.br
+     \fBdpkg \-r elvis\fP
+.br
+
+Aby zainstalowa pakiet, naley wpierw znale go w archiwum lub na
+CDROM. Plik "available" pokazuje, e pakiet vim jest w sekcji "editors":
+.br
+     \fBcd /media/cdrom/pool/main/v/vim\fP
+     \fBdpkg \-i vim_4.5\-3.deb\fP
+.br
+
+Aby stworzy kopi lokalnie wybranych pakietw:
+.br
+     \fBdpkg \-\-get\-selections >mojepakiety\fP
+.br
+
+Ten plik mona przenie do innego systemu i zainstalowa te pakiety
+poprzez:
+.br
+     \fBdpkg \-\-clear\-selections\fP
+     \fBdpkg \-\-set\-selections <mojepakiety\fP
+.br
+
+Naley zauway, e ta opcja nie powoduje zainstalowania lub usunicia
+czegokolwiek, ale tylko zaznacza wskazane pakiety do zainstalowania bd
+usunicia. Do pobrania i zainstalowania tych pakietw trzeba uy innego
+programu. Na przykad mona w tym celu uy polecenia \fBapt\-get
+dselect\-upgrade\fP.
+
+Zwyczajowo do wyboru pakietw suy \fBdselect\fP(1), ktry daje wiksze
+moliwoci zmiany ich stanu.
+.br
+.
+.SH "DODATKOWA FUNKCJONALNO"
+Dodatkow funkcjonalno mona uzyska, instalujc ktrykolwiek z
+nastpujcych pakietw: \fBapt\fP, \fBaptitude\fP oraz \fBdebsums\fP.
+.
+.SH "ZOBACZ TAKE"
+\fBaptitude\fP(1), \fBapt\fP(1), \fBdselect\fP(1), \fBdpkg\-deb\fP(1), \fBdpkg\-query\fP(1),
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg.cfg\fP(5), oraz \fBdpkg\-reconfigure\fP(8).
+.
+.SH BDY
+\fB\-\-no\-act\fP podaje raczej zbyt mao pomocnych informacji.
+.
+.SH AUTORZY
+Patrz plik \fI/usr/share/doc/dpkg/THANKS.gz\fP zawierajcy list osb, ktre
+przyczyniy si do rozwoju programu \fBdpkg\fP.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-architecture.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-architecture.1
--- dpkg/man/pl/dpkg-architecture.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-architecture.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,319 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-architecture 1 2011\-08\-14 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+dpkg\-architecture \- ustawia i zwraca architektur budowania pakietw.
+.
+.SH SKADNIA
+\fBdpkg\-architecture\fP [\fIoption\fP...] [\fIcommand\fP]
+.PP
+.
+.SH OPIS
+dpkg\-architecture dostarcza sposobu na okrelenie i ustawienie architektury
+budowania oraz architektury docelowej dla budowania pakietw.
+.PP
+Architektura budowania jest zawsze okrelana przez wywoanie \fBdpkg\fP i nie
+moe by ustawiona w linii polece.
+.PP
+Mona poda architektur docelow przez podanie jednej lub obu opcji spord
+\fB\-a\fP i \fB\-t\fP. Warto domylna jest okrelana przez wywoanie programu
+\fBgcc\fP(1), a w razie gdy \s-1CC\s0 i gcc nie s dostpne, jest taka sama jak
+architektura budowania. Wystarczy poda tylko jedn spord opcji \fB\-a\fP i
+\fB\-t\fP, poniewa ta druga zostanie ustawiona na sensown warto domyln. Co
+wicej, czsto podanie jednej opcji jest lepsze ni podanie ich obu naraz,
+gdy \fBdpkg\-architecture\fP wypisze ostrzeenie, jeli podane wartoci nie
+bd odpowiaday wartociom domylnym.
+.
+.SH POLECENIA
+.TP 
+\fB\-l\fP
+Wywietla zmienne rodowiskowe, po jednej w kadej linii, w formacie
+\fIZMIENNA=warto\fP. Jest to domylna akcja.
+.TP 
+\fB\-e\fP\fIarchitektura\-debiana\fP
+Sprawdza rwnowano architektur. Domylnie \fIarchitektura\-debiana\fP jest
+porwnywana z biec architektur Debiana, traktowan jako architektura
+gospodarza. Ta akcja nie rozwija masek architektur. Polecenie koczy si
+kodem wyjcia 0 jeli dopasowanie architektur si powiodo, lub kodem 1
+jeli nie byo dopasowania.
+.TP 
+\fB\-i\fP\fImaska\-architektury\fP
+Sprawdzenie architektury przez rozwinicie w odpowiedni sposb
+\fImaski\-architektury\fP i porwnanie z biec architektur Debiana. Polecenie
+koczy si kodem wyjcia 0 jeli dopasowanie architektur si powiodo, lub
+kodem 1 jeli nie byo dopasowania.
+.TP 
+\fB\-q\fP\fInazwa\-zmiennej\fP
+Wywietla warto pojedynczej zmiennej.
+.TP 
+\fB\-s\fP
+Wywietla polecenie export, ktre moe by uyte do ustawienia zmiennych
+rodowiskowych za pomoc eval.
+.TP 
+\fB\-u\fP
+Wywietla polecenie podobne do \fB\-s\fP, jednake ze wszystkimi zmiennymi
+nieustawionymi.
+.TP 
+\fB\-c\fP\fI polecenie\fP
+Wykonuje \fIpolecenie\fP w rodowisku, ktre ma wszystkie zmienne ustawione na
+wyznaczone wartoci.
+.TP 
+\fB\-L\fP
+Wywietla list poprawnych nazw architektur.
+.TP 
+\fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH OPCJE
+.TP 
+\fB\-a\fP\fIarchitektura\-debiana\fP
+Ustawia architektur Debiana.
+.TP 
+\fB\-t\fP\fItyp\-systemu\-gnu\fP
+Ustawia typ systemu GNU.
+.TP 
+\fB\-f\fP
+Honorowane s wartoci ustawione w istniejcych zmiennych rodowiskowych o
+tych samych nazwach, co uywane w skryptach (np. uyte przez
+\fBdpkg\-architecture\fP), chyba e jest obecna ta flaga wymuszenia. Pozwala to
+na nadpisanie wartoci nawet jeli wywoanie \fBdpkg\-architecture\fP jest
+ukryte gboko w jakim innym skrypcie (np. \fBdpkg\-buildpackage\fP(1)).
+.
+.SH WARUNKI
+.IP "maszyna budowania" 4
+Rodzaj maszyny, na ktrej pakiet jest budowany.
+.IP "maszyna docelowa" 4
+Rodzaj maszyny, dla ktrej pakiet jest budowany.
+.IP "architektura Debiana" 4
+acuch znakw zawierajcy architektur Debiana, ktra okrela drzewo
+binarne w archiwum \s-1FTP\s0. Przykady: i386, sparc, hurd\-i386.
+.IP "maska architektury" 4
+Maska architektury jest specjalnym acuchem znakw, ktry bdzie pasowa do
+kadej architektury, ktra jest jego czci. Oglna posta jest
+nastpujca: <jdro>\-<procesor>. Przykady: linux\-any,
+any\-i386, hurd\-any.
+.IP "typ systemu \s-1GNU\s0" 4
+acuch znakw okrelajcy architektur skadajcy si z dwch czci
+oddzielonych mylnikiem: procesor i system. Przykady: i386\-linux\-gnu,
+sparc\-linux\-gnu, i386\-gnu, x86_64\-netbsd.
+.
+.SH ZMIENNE
+\fBdpkg\-architecture\fP ustawia nastpujce zmienne:
+.IP \s-1DEB_BUILD_ARCH\s0 4
+Architektura wg Debiana komputera, na ktrym budowany jest pakiet.
+.IP \s-1DEB_BUILD_ARCH_OS\s0 4
+Nazwa systemu wg Debiana komputera, na ktrym budowany jest pakiet.
+.IP \s-1DEB_BUILD_ARCH_CPU\s0 4
+Nazwa procesora wg Debiana komputera, na ktrym budowany jest pakiet.
+.IP \s-1DEB_BUILD_ARCH_BITS\s0 4
+Rozmiar wskanika na komputerze budujcym (w bitach).
+.IP \s-1DEB_BUILD_ARCH_ENDIAN\s0 4
+Kolejno bajtw (endian) na komputerze budujcym (little / big).
+.IP \s-1DEB_BUILD_GNU_CPU\s0 4
+The \s-1CPU\s0 part of \s-1DEB_BUILD_GNU_TYPE\s0.
+.IP \s-1DEB_BUILD_GNU_SYSTEM\s0 4
+Cze dotyczca systemu z \s-1DEB_BUILD_GNU_TYPE\s0.
+.IP \s-1DEB_BUILD_GNU_TYPE\s0 4
+Typ systemu \s-1GNU\s0 komputera, na ktrym budowany jest pakiet.
+.IP \s-1DEB_BUILD_MULTIARCH\s0 4
+The clarified \s-1GNU\s0 system type of the build machine, used for
+filesystem paths.
+.IP \s-1DEB_HOST_ARCH\s0 4
+Architektura wg Debiana dla maszyny docelowej.
+.IP \s-1DEB_BUILD_ARCH_OS\s0 4
+Nazwa systemu wg Debiana dla maszyny docelowej.
+.IP \s-1DEB_HOST_ARCH_CPU\s0 4
+Nazwa procesora wg Debiana dla maszyny docelowej.
+.IP \s-1DEB_HOST_ARCH_BITS\s0 4
+Rozmiar wskanika na maszynie docelowej (w bitach).
+.IP \s-1DEB_HOST_ARCH_ENDIAN\s0 4
+Kolejno bajtw (endian) na maszynie docelowej (little / big).
+.IP \s-1DEB_HOST_GNU_CPU\s0 4
+Cz dotyczca \s-1CUP\s0 z \s-1DEB_HOST_GNU_TYPE\s0.
+.IP \s-1DEB_HOST_GNU_SYSTEM\s0 4
+Cz dotyczca systemu z \s-1DEB_HOST_GNU_TYPE\s0.
+.IP \s-1DEB_HOST_GNU_TYPE\s0 4
+Typ systemu \s-1GNU\s0 dla maszyny docelowej.
+.IP \s-1DEB_HOST_MULTIARCH\s0 4
+The clarified \s-1GNU\s0 system type of the host machine, used for
+filesystem paths.
+.
+.SH DEBIAN/RULES
+Zmienne rodowiskowe ustawione przez \fBdpkg\-architecture\fP s przekazywane do
+\fIdebian/rules\fP jako zmienne programu make (patrz dokumentacja do
+make). Jednake nie naley na nich polega, gdy psuje to rczne
+uruchomienie tego skryptu. Zamiast tego, naley zawsze inicjowa je,
+uywajc \fBdpkg\-architecture\fP z opcj \-q. Poniej znajduje si par
+przykadw, ktre take pokazuj, jak mona polepszy wsparcie dla
+kompilacji krzyowej pakietu:
+.PP
+
+Zamiast:
+.IP
+.nf
+ARCH=\`dpkg \-\-print\-architecture\`
+configure $(\s-1ARCH\s0)\-linux
+.fi
+.PP
+prosz uywa:
+.IP
+.nf
+\&\s-1DEB_BUILD_GNU_TYPE\s0 := $(shell dpkg\-architecture \-qDEB_BUILD_GNU_TYPE)
+\&\s-1DEB_HOST_GNU_TYPE\s0 := $(shell dpkg\-architecture \-qDEB_HOST_GNU_TYPE)
+
+configure \-\-build=$(\s-1DEB_BUILD_GNU_TYPE\s0) \-\-host=$(\s-1DEB_HOST_GNU_TYPE\s0)
+.fi
+.PP
+
+Zamiast:
+.IP
+.nf
+ARCH=\`dpkg \-\-print\-architecture\`
+ifeq ($(\s-1ARCH\s0),alpha)
+  ...
+endif
+.fi
+.PP
+prosz uywa:
+.IP
+.nf
+\&\s-1DEB_HOST_ARCH\s0 := $(shell dpkg\-architecture \-qDEB_HOST_ARCH)
+
+ifeq ($(\s-1DEB_HOST_ARCH\s0),alpha)
+  ...
+endif
+.fi
+.PP
+albo jeli trzeba sprawdzi tylko typ CPU lub OS, naley uy zmiennych
+DEB_HOST_ARCH_CPU lub DEB_HOST_ARCH_OS.
+.PP
+Oglnie wywoywanie dpkg w pliku rules w celu pobrania informacji o
+architekturze jest przestarzae (chyba e chce si zachowa kompatybilno
+wsteczn, patrz niej). W szczeglnoci opcja \-\-print\-architecture jest
+niezbyt wiarygodna, poniewa istniej architektury Debiana, ktre nie s
+rwne nazwie procesora.
+.
+.SH "KOMPATYBILNO WSTECZNA"
+Zmienne DEB_*_ARCH_BITS oraz DEB_*_ARCH_ENDIAN zostay wprowadzone w
+dpkg\-dev 1.15.4. Uywanie ich w \fIdebian/rules\fP wymaga wic zalenoci czasu
+budowania dla dpkg\-dev (>= 1.15.4).
+.PP
+Zmienne DEB_HOST_ARCH_CPU oraz DEB_HOST_ARCH_OS s dostpne w miar nowych
+wersjach \fBdpkg\-architecture\fP (od dpkg 1.13.2). Wczeniej w plikach
+\fIdebian/rules\fP byy sprawdzane zmienne DEB_HOST_GNU_CPU lub
+DEB_HOST_GNU_TYPE, ktre zostay zmienione.
+.PP
+Wszystkie pliki \fIdebian/rules\fP, decydujce na podstawie tych zmiennych jak
+i co kompilowa, powinny by zaktualizowane i przystosowane do uywania
+nowych zmiennych i ich wartoci. Aby zachowa wsteczn kompatybilno z
+poprzednimi wersjami dpkg\-dev, mona uy nastpujcego kodu:
+.IP
+.nf
+DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_CPU 2>/dev/null)
+DEB_HOST_ARCH_OS := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_OS 2>/dev/null)
+
+# Bierze pod uwag wyjcie ze starego dpkg\-architecture.
+ifeq ($(DEB_HOST_ARCH_CPU),)
+  DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_GNU_CPU)
+  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
+    DEB_HOST_ARCH_CPU := amd64
+  endif
+endif
+ifeq ($(DEB_HOST_ARCH_OS),)
+  DEB_HOST_ARCH_OS := $(subst \-gnu,,$(shell dpkg\-architecture \-qDEB_HOST_GNU_SYSTEM))
+  ifeq ($(DEB_HOST_ARCH_OS),gnu)
+    DEB_HOST_ARCH_OS := hurd
+  endif
+endif
+.fi
+.PP
+I podobnie dla DEB_BUILD_ARCH_CPU oraz DEB_BUILD_ARCH_OS.
+.PP
+Jeli chcesz wci obsugiwa wersje dpkg\-dev, ktre nie zawieraj
+\fBdpkg\-architecture\fP, to poniszy kod wykonuje to zadanie:
+.IP
+.nf
+\&\s-1DEB_BUILD_ARCH\s0 := $(shell dpkg \-\-print\-architecture)
+\&\s-1DEB_BUILD_GNU_CPU\s0 := $(patsubst hurd\-%,%,$(\s-1DEB_BUILD_ARCH\s0))
+ifeq ($(filter\-out hurd\-%,$(\s-1DEB_BUILD_ARCH\s0)),)
+  \s-1DEB_BUILD_GNU_SYSTEM\s0 := gnu
+else
+  \s-1DEB_BUILD_GNU_SYSTEM\s0 := linux\-gnu
+endif
+DEB_BUILD_GNU_TYPE=$(\s-1DEB_BUILD_GNU_CPU\s0)\-$(\s-1DEB_BUILD_GNU_SYSTEM\s0)
+
+\&\s-1DEB_HOST_ARCH\s0 := $(\s-1DEB_BUILD_ARCH\s0)
+\&\s-1DEB_HOST_GNU_CPU\s0 := $(\s-1DEB_BUILD_GNU_CPU\s0)
+\&\s-1DEB_HOST_GNU_SYSTEM\s0 := $(\s-1DEB_BUILD_GNU_SYSTEM\s0)
+\&\s-1DEB_HOST_GNU_TYPE\s0 := $(\s-1DEB_BUILD_GNU_TYPE\s0)
+.fi
+.PP
+Umie podzbir tych linii na grze pliku debian/rules; te domylne wartoci
+bd nadpisane przez dpkg\-architecture, jeli jest uywane.
+.PP
+Nie ma potrzeby uywania penego zestawu zmiennych. Mona wybra spjny ich
+zbir, zawierajcy wartoci uywane w pliku rules. Na przykad, jeeli
+potrzebna jest tylko architektura Debiana maszyny, dla ktrej budowany jest
+pakiet, wystarczajce jest uycie "DEB_HOST_ARCH=\`dpkg
+\-\-print\-architecture\`" (tak naprawd jest to architektura Debiana maszyny,
+na ktrej jest budowany pakiet, ale prosz pamita, e prbujemy tylko
+zachowa wsteczn zgodno z natywn kompilacj).
+.PP
+Opcje \fB\-e\fP i \fB\-i\fP zostay wprowadzone w miar nowych wersjach
+\fBdpkg\-architecture\fP (od wersji dpkg 1.13.13).
+.
+.SH PRZYKADY
+\fBdpkg\-buildpackage\fP akceptuje opcj \fB\-a\fP i przekazuje j do
+\fBdpkg\-architecture\fP. Inne przykady:
+.IP
+CC=i386\-gnu\-gcc dpkg\-architecture \-c debian/rules build
+.IP
+eval \`dpkg\-architecture \-u\`
+.PP
+Sprawdzanie, czy architektura jest rwna architekturze biecej lub podanej:
+.IP
+dpkg\-architecture \-elinux\-alpha
+.IP
+dpkg\-architecture \-amips \-elinux\-mips
+.PP
+Sprawdzanie, czy architektura bieca podana przez \-a jest systemem Linuksa:
+.IP
+dpkg\-architecture \-ilinux\-any
+.IP
+dpkg\-architecture \-ai386 \-ilinux\-any
+.
+.SH PLIKI
+All these files have to be present for \fBdpkg\-architecture\fP to work. Their
+location can be overridden at runtime with the environment variable
+\fBDPKG_DATADIR\fP.
+.TP 
+\fI/usr/share/dpkg/cputable\fP
+Tabela znanych nazw procesorw i ich mapowanie na nazwy GNU.
+.TP 
+\fI/usr/share/dpkg/ostable\fP
+Tabela nazw znanych systemw operacyjnych i ich mapowanie na nazwy GNU.
+.TP 
+\fI/usr/share/dpkg/triplettable\fP
+Mapowanie midzy trjkami architektur Debiana a nazwami architektur Debiana.
+.
+.SH "ZOBACZ TAKE"
+\fBdpkg\-buildpackage\fP(1), \fBdpkg\-cross\fP(1).
+.
+.SH AUTOR
+\fBdpkg\-architecture\fP i ta strona podrcznika ekranowego zostay napisane
+Marcusa Brinkmanna <brinkmd@debian.org>.
+
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-buildpackage.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-buildpackage.1
--- dpkg/man/pl/dpkg-buildpackage.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-buildpackage.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,259 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-buildpackage 1 2011\-08\-14 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+dpkg\-buildpackage \- buduje pakiety rdowe lub binarne ze rde
+.
+.SH SKADNIA
+\fBdpkg\-buildpackage\fP [\fIoption\fP...]
+.
+.SH OPIS
+\fBdpkg\-buildpackage\fP jest programem automatyzujcym proces budowania pakietu
+Debiana. Proces ten skada si z nastpujcych krokw:
+.IP \fB1.\fP 3
+It prepares the build environment by setting various environment variables
+(see \fBENVIRONMENT\fP) and calls \fBdpkg\-source \-\-before\-build\fP (unless \fB\-T\fP
+or \fB\-\-target\fP has been used).
+.IP \fB2.\fP 3
+Sprawdza czy zalenoci i konflikty czasu budowania s spenione (o ile nie
+jest podane \fB\-d\fP).
+.IP \fB3.\fP 3
+Jeli okrelony cel zosta wskazany z uyciem opcji \fB\-T\fP lub \fB\-\-target\fP,
+wywouje ten cel i na tym koczy. W przeciwnym wypadku wywouje \fBfakeroot
+debian/rules clean\fP, aby wyczyci drzewo budowania pakietu (chyba e uyje
+si opcji \fB\-nc\fP).
+.IP \fB4.\fP 3
+It calls \fBdpkg\-source \-b\fP to generate the source package (unless a
+binary\-only build has been requested with \fB\-b\fP, \fB\-B\fP or \fB\-A\fP).
+.IP \fB5.\fP 3
+It calls \fBdebian/rules\fP \fBbuild\fP followed by \fBfakeroot debian/rules\fP
+\fIbinary\-target\fP (unless a source\-only build has been requested with
+\fB\-S\fP). Note that \fIbinary\-target\fP is either \fBbinary\fP (default case, or if
+\fB\-b\fP is specified)  or \fBbinary\-arch\fP (if \fB\-B\fP is specified) or
+\fBbinary\-indep\fP (if \fB\-A\fP is specified).
+.IP \fB6.\fP 3
+Wywouje \fBgpg\fP aby podpisa plik \fB.dsc\fP (jeli jest, chyba e podano opcj
+\fB\-us\fP).
+.IP \fB7.\fP 3
+Wywouje \fBdpkg\-genchanges\fP aby wygenerowa plik \fB.changes\fP. Do
+\fBdpkg\-genchanges\fP przekazywanych jest wiele opcji \fBdpkg\-buildpackage\fP.
+.IP \fB8.\fP 3
+Wywouje \fBgpg\fP aby podpisa plik \fB.changes\fP (chyba e podano opcj
+\fB\-uc\fP).
+.IP \fB9.\fP 3
+If \fB\-tc\fP is specified, it will call \fBfakeroot debian/rules clean\fP
+again. Finally it calls \fBdpkg\-source \-\-after\-build\fP.
+.
+.SH OPCJE
+.TP 
+\fB\-b\fP
+Okrela budowanie tylko pakietw binarnych, adne pliki rdowe nie bd
+budowane ani dystrybuowane. Przekazywane do \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-B\fP
+Okrela budowanie tylko pakietw binarnych, ograniczone do pakietw
+zalenych od architektury. Przekazywane do \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-A\fP
+Okrela budowanie tylko pakietw binarnych, ograniczone do pakietw
+niezalenych od architektury. Przekazywane do \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-S\fP
+Okrela budowanie tylko pakietw rdowych, bez budowania pakietw
+binarnych. Przekazywane do \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-F\fP
+Specifies a normal full build, binary and source packages will be built.
+This is the same as the default case when no build option is specified.
+.P
+\fB\-\-target=\fP\fIcel\fP
+.br
+\fB\-\-target \fP\fIcel\fP
+.br
+\fB\-T\fP\fIcel\fP
+.RS
+Wywouje \fBdebian/rules\fP \fIcel\fP po przygotowaniu rodowiska budowania i na
+tym koczy proces budowania pakietu. Jeli podana zostaa rwnie opcja
+\fB\-\-as\-root\fP, wtedy polecenie to jest wykonywane z prawami
+administratora. Prosz zauway, e cele oficjalnie okrelone w Polityce
+Debiana jako wymagajce uruchamiania z prawami administratora nie wymagaj
+tej opcji.
+.RE
+.TP 
+\fB\-\-as\-root\fP
+Znaczca jedynie w poczeniu z opcj \fB\-\-target\fP. Wymusza uruchomienie celu
+z prawami administratora.
+.P
+\fB\-si\fP
+.br
+\fB\-sa\fP
+.br
+\fB\-sd\fP
+.br
+\fB\-v\fP\fIwersja\fP
+.br
+\fB\-C\fP\fIopis_zmian\fP
+.br
+\fB\-m\fP\fIadres opiekuna\fP
+.br
+\fB\-e\fP\fIadres_opiekuna\fP
+.RS
+Przekazywana bez zmian do \fBdpkg\-genchanges\fP. Wicej informacji na stronie
+podrcznika tego programu.
+.RE
+.TP 
+\fB\-a\fP\fIarchitektura\fP
+Okrela architektur Debiana dla ktrej jest budowany pakiet. Architektura
+maszyny, na ktrej jest budowany pakiet, jest okrelana automatycznie i
+stanowi rwnie domyln architektur docelow.
+.TP 
+\fB\-t\fP\fItyp\-systemu\-gnu\fP
+Okrela typ systemu GNU, dla ktrego budujemy. Moe by uyte zamiast \-a lub
+jako uzupenienie do nadpisania domylnego typu systemu GNU docelowej
+architektury Debiana.
+.TP 
+\fB\-j\fP\fIzadania\fP
+Liczba zada, ktre mog zosta rwnoczenie uruchomione, odpowiednik opcji
+\fBmake\fP(1) o tej samej nazwie. Dodaje si do zmiennej rodowiskowej
+MAKEFLAGS, co powinno spowodowa, e wszystkie kolejne wywoania programu
+make odziedzicz t opcj. Take dodaje \fBparallel=\fP\fIzadania\fP do zmiennej
+rodowiskowej DEB_BUILD_OPTIONS, co pozwala plikom debian/rules na
+korzystanie z tej informacji dla ich wasnych celw. Warto
+\fBparallel=\fP\fIzadania\fP zmiennej rodowiska DEB_BUILD_OPTIONS nadpisuje
+warto przekazan w opcji \fB\-j\fP, jeli zostaa ona podana.
+.TP 
+\fB\-D\fP
+Sprawdza zalenoci i konflikty czasu budowania, przerywa dziaanie z bdem
+jeeli nie bd spenione. Jest to zachowanie domylne.
+.TP 
+\fB\-d\fP
+Nie sprawdza zalenoci czasu budowania ani konfliktw.
+.TP 
+\fB\-nc\fP
+Pomija czyszczenie drzewa rde pakietu (implikuje \fB\-b\fP, jeli nic innego
+nie zostao wybrane spord \fB\-B\fP, \fB\-A\fP oraz \fB\-S\fP).
+.TP 
+\fB\-tc\fP
+Po zbudowaniu pakietu czyci katalog ze rdami (uywajc
+\fIgain\-root\-command\fP \fBdebian/rules clean\fP).
+.TP 
+\fB\-r\fP\fIpolecenie\-uzyskiwania\-praw\-administratora\fP
+Kiedy \fBdpkg\-buildpackage\fP potrzebuje wykona cz procesu budowania jako
+administrator, poprzedza wykonywane polecenia
+\fIpoleceniem\-uzyskiwania\-praw\-administratora\fP, jeli takowe zostao
+podane. Jeli natomiast nie zostao podane, zostanie domylnie uyte
+polecenie \fBfakeroot\fP, o ile jest
+dostpne. \fIpolecenie\-uzyskiwania\-praw\-administratora\fP powinno zaczyna si
+nazw programu dostpnego przez zmienn systemow \fBPATH\fP, ktremu bd
+przekazywane argumenty w postaci waciwego programu do wykonania oraz jego
+parametrw. \fIpolecenie\-uzyskiwania\-praw\-administratora\fP moe samo zawiera
+parametry (musz by one rozdzielone spacjami), ale nie moe zawiera
+metaznakw powoki. \fIpoleceniem\-uzyskiwania\-praw\-administratora\fP mog
+typowo by \fBfakeroot\fP, \fBsudo\fP, \fBsuper\fP lub \fBreally\fP. \fBsu\fP nie nadaje
+si do tego celu, poniewa moe tylko wywoa powok uytkownika uywajc
+\fB\-c\fP zamiast przekazywa indywidualnie argumenty dla polecenia do
+wykonania.
+.TP 
+\fB\-R\fP\fIplik_rules\fP
+Budowanie pakietu Debiana zwykle wymaga wywoania \fBdebian/rules\fP jako
+polecenia z kilkoma standardowymi parametrami. Uywajc tej opcji mona
+poda wywoanie innego programu, ktry posuy do zbudowania pakietu (moe
+take zawiera dodatkowe parametry rozdzielone spacjami). Moe by take
+uyta do wykonania standardowego pliku regu z uyciem innego programu make
+(np. podajc \fB/usr/local/bin/make \-f debian/rules\fP jako \fIplik_rules\fP).
+.TP 
+\fB\-p\fP\fIpolecenie\-podpisywania\fP
+Gdy \fBdpkg\-buildpackage\fP bdzie potrzebowa wywoa GPG lub PGP aby podpisa
+plik kontrolny rde (\fB.dsc\fP) lub plik \fB.changes\fP, zostanie uruchomione
+\fIpolecenie\-podpisywania\fP (w razie koniecznoci przeszukujc \fBPATH\fP)
+zamiast \fBgpg\fP. Parametry normalnie przekazywane do \fBpgp\fP zostan
+przekazane do \fIpolecenia\-podpisywania\fP. Jeli \fIpolecenie\-podpisywania\fP
+przyjmuje argumenty w stylu GPG zamiast atylu PGP, naley uy opcji
+\fB\-sgpg\fP. \fIpolecenie\-podpisywania\fP nie powinno zawiera spacji ani innych
+metaznakw powoki.
+.TP 
+\fB\-k\fP\fIid\-klucza\fP
+Okrela ID klucza uywanego do podpisywania pakietw.
+.TP 
+\fB\-us\fP
+Nie prbuje podpisywa pakietw.
+.TP 
+\fB\-uc\fP
+Nie prbuje podpisywa plikw \fB.changes\fP.
+.P
+\fB\-i\fP[\fIwyra_regularne\fP]
+.br
+\fB\-I\fP\fI[wzorzec]\fP
+.br
+\fB\-s\fP[\fBnsAkurKUR\fP]
+.br
+\fB\-z\fP, \fB\-Z\fP
+.br
+.RS
+Przekazywana bez zmian do \fBdpkg\-source\fP. Wicej informacji na stronie
+podrcznika tego programu
+.RE
+.TP 
+\fB\-\-source\-option=\fP\fIopt\fP
+Pass option \fIopt\fP to \fBdpkg\-source\fP.
+.TP 
+\fB\-\-changes\-option=\fP\fIopt\fP
+Pass option \fIopt\fP to \fBdpkg\-genchanges\fP.
+.P
+\fB\-\-admindir=\fP\fIkatalog\fP
+.br
+\fB\-\-admindir \fP\fIkatalog\fP
+.RS
+Zmienia pooenie bazy danych \fBdpkg\fP. Domylnie jest to \fI/var/lib/dpkg\fP.
+.RE
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH RODOWISKO
+Even if \fBdpkg\-buildpackage\fP exports some variables, \fBdebian/rules\fP should
+not rely on their presence and should instead use the respective interface
+to retrieve the needed values.
+.SS "Zmienne ustawiane przez dpkg\-architecture"
+Wywouje program \fBdpkg\-architecture\fP z przekazaniem parametrw \fB\-a\fP oraz
+\fB\-t\fP. Wszystkie zmienne uzyskane na wyjciu dziki jego opcji \fB\-s\fP s
+doczane do rodowiska budowania.
+.SS "Compiler flags are no longer exported"
+Between versions 1.14.17 and 1.16.1, \fBdpkg\-buildpackage\fP exported compiler
+flags (\fBCFLAGS\fP, \fBCXXFLAGS\fP, \fBFFLAGS\fP, \fBCPPFLAGS\fP and \fBLDFLAGS\fP) with
+values as returned by \fBdpkg\-buildflags\fP. This is no longer the case.
+.
+.SH BDY
+Powinno by moliwe podanie spacji, metaznakw powoki oraz argumentw dla
+\fIgain\-root\-command\fP oraz \fIsign\-command\fP.
+.
+.SH "ZOBACZ TAKE"
+\fBdpkg\-source\fP(1), \fBdpkg\-architecture\fP(1), \fBdpkg\-buildflags\fP(1),
+\fBdpkg\-genchanges\fP(1), \fBfakeroot\fP(1), \fBgpg\fP(1).
+.
+.SH AUTORZY
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2007 Frank Lichtenheld
+.br
+Copyright \(co 2008\-2010 Rapha\[:e]l Hertzog
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg.cfg.5 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg.cfg.5
--- dpkg/man/pl/dpkg.cfg.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg.cfg.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,37 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg.cfg 5 2009\-09\-05 "Projekt Debiana" "uytki dpkg"
+.SH NAZWA
+dpkg.cfg \- plik konfiguracyjny programu dpkg
+.
+.SH OPIS
+Plik ten zawiera domylne opcje programu dpkg. W kadej linii wymieniona
+jest pojedyncza opcja, dokadnie taka sama jak normalna opcja linii polece
+programu dpkg, z wyjtkiem tego, e nie s uywane pocztkowe
+mylniki. Znaki cudzysoww otaczajce wartoci opcji s usuwane. Mona
+uywa komentarzy, zaczynajc lini znakiem hash ("\fB#\fP").
+.
+.SH PLIKI
+\fI/etc/dpkg/dpkg.cfg.d/[0\-9a\-zA\-Z_\-]*\fP
+.br
+\fI/etc/dpkg/dpkg.cfg\fP
+.br
+\fI~/.dpkg.cfg\fP
+.
+.SH AUTOR
+Patrz plik \fI/usr/share/doc/dpkg/THANKS.gz\fP zawierajcy list osb, ktre
+przyczyniy si do rozwoju programu \fBdpkg\fP.
+.
+.SH "ZOBACZ TAKE"
+\fBdpkg\fP(1).
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-checkbuilddeps.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-checkbuilddeps.1
--- dpkg/man/pl/dpkg-checkbuilddeps.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-checkbuilddeps.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,55 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-checkbuilddeps 1 2011\-07\-04 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+dpkg\-checkbuilddeps \- sprawdza zalenoci i konflikty czasu budowania
+.
+.SH SKADNIA
+\fBdpkg\-checkbuilddeps\fP [\fIoption\fP...] [\fIcontrol\-file\fP]
+.
+.SH OPIS
+Program ten sprawdza pakiety zainstalowane w systemie w stosunku do wymaga
+i konfliktw zapisanych w pliku kontrolnym. Jeeli ktre nie s spenione,
+wywietla je i koczy dziaanie z niezerowym kodem powrotu.
+.P
+By default, \fBdebian/control\fP is read, but an alternate control filename may
+be specified on the command line.
+.
+.SH OPCJE
+.TP 
+\fB\-\-admindir=\fP\fIkatalog\fP
+Zmienia pooenie bazy danych \fBdpkg\fP. Domylnie jest to \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-B\fP
+Ignoruje linie \fIBuild\-Depends\-Indep\fP. Naley uywa, jeli nie bd
+budowane pakiety niezalene od architektury.
+.TP 
+\fB\-d \fP\fIzalenoci_budowania\fP
+.TP 
+\fB\-c \fP\fIkonflikty_budowania\fP
+Uywa podanych zalenoci/konfliktw czasu budowania zamiast wymienionych w
+pliku \fIdebian/control\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH AUTOR
+Copyright \(co 2001 Joey Hess
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-deb.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-deb.1
--- dpkg/man/pl/dpkg-deb.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-deb.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,208 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-deb 1 2011\-08\-14 "Projekt Debiana" "uytki dpkg"
+.SH NAZWA
+dpkg\-deb \- narzdzie obsugi plikw archiwum Debiana (.deb)
+.
+.SH SKADNIA
+\fBdpkg\-deb\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH OPIS
+\fBdpkg\-deb\fP tworzy, rozpakowuje i podaje informacje o plikach archiwum
+(czyli pakietach) Debiana.
+.PP
+Do instalowania i usuwania pakietw z systemu suy polecenie \fBdpkg\fP.
+.PP
+Ponadto mona skorzysta z \fBdpkg\-deb\fP wywoujc \fBdpkg\fP z odpowiedni
+opcj, ktra zostanie przekazana do \fBdpkg\-deb\fP. \fBdpkg\fP uruchomi
+\fBdpkg\-deb\fP i wykona dan operacj.
+.
+.SH POLECENIA
+.TP 
+\fB\-b\fP, \fB\-\-build\fP \fIkatalog\fP [\fIarchiwum\fP|\fIkatalog\fP]
+Tworzy archiwum Debiana z plikw zawartych w \fIkatalogu\fP. \fIkatalog\fP musi
+zawiera podkatalog o nazwie \fBDEBIAN\fP, w ktrym zawarte s pliki kontrolne,
+takie jak np. control. Ten katalog \fInie\fP pojawi si w archiwum binarnym
+pakietu, tylko zostanie umieszczony jako informacje kontrolne pakietu, ktre
+opisuj waciwoci pakietu.
+
+Jeli pominito opcj \fB\-\-nocheck\fP, \fBdpkg\-deb\fP odczyta plik
+\fBDEBIAN/control\fP i przetworzy go. Sprawdzi przy tym, czy nie wystpuj w
+nim bdy skadniowe lub inne problemy, a nastpnie wywietli nazw pakietu,
+ktry jest tworzony. \fBdpkg\-deb\fP ponadto sprawdzi prawa dostpu skryptw
+instalacyjnych i innych plikw znajdujcych si w katalogu \fBDEBIAN\fP.
+
+Jeli nie podano nazwy \fIarchiwum\fP, to \fBdpkg\-deb\fP zapisze pakiet w pliku
+\fIkatalog\fP\fB.deb\fP.
+
+Jeeli taki pakiet ju istnieje, to zostanie nadpisany.
+
+Jeli drugim argumentem jest \fIkatalog\fP, to \fBdpkg\-deb\fP zapisze pakiet pod
+nazw \fIkatalog\fP\fB/\fP\fIpakiet\fP\fB_\fP\fIwersja\fP\fB_\fP\fIarch\fP\fB.deb\fP lub
+\fIkatalog\fP\fB/\fP\fIpakiet\fP\fB_\fP\fIwersja\fP\fB.deb\fP, jeli nie zostao okrelone
+pole \fBArchitecture\fP w pliku kontrolnym. Gdy podany jest \fIkatalog\fP, to nie
+moe zosta uyta opcja \fB\-\-no\-check\fP, poniewa \fBdpkg\-deb\fP musi przetworzy
+plik kontrolny, aby rozpozna nazw i wersj pakietu.
+.TP 
+\fB\-I\fP, \fB\-\-info\fP \fIarchiwum\fP [\fInazwa\-pliku\-kontrolnego\fP...]
+Dostarcza informacji o pakiecie.
+
+Gdy nie podano adnej \fInazwy\-pliku\-kontrolnego\fP, wywietlana jest
+informacja o zawartoci pakietu oraz zestawienie wykorzystanych plikw
+kontrolnych.
+
+W razie podania \fInazwy\-pliku\-kontrolnego\fP, \fBdpkg\-deb\fP wywietli zawarto
+tego pliku. Jeli ten plik nie istnieje, wywietlony zostanie komunikat
+bdu na standardowe wyjcie bdw i program zakoczy si z kodem bdu 2.
+.TP 
+\fB\-W\fP, \fB\-\-show\fP \fIarchiwum\fP
+Wywietla informacj o pakiecie binarnym w formacie okrelonym opcj
+\fB\-\-showformat\fP. W domylnym formacie w kadej linii wywietlane s nazwa i
+wersja pakietu, oddzielone od siebie znakiem tabulacji.
+.TP 
+\fB\-f\fP, \fB\-\-field\fP \fIarchiwum\fP [\fInazwa\-pola\-kontrolnego\fP...]
+Wywietla zawarto pliku kontrolnego o nazwie control.
+
+Jeli nie podano adnej \fBnazwy\-pola\-kontrolnego\fP, to wywietlana jest
+zawarto caego pliku control.
+
+Jeli podano \fBnazw\-pola\-kontrolnego\fP, to \fBdpkg\-deb\fP wywietli jej
+zawarto. Gdy podano wicej ni jedn \fBnazw\-pola\-kontrolnego\fP, to
+\fBdpkg\-deb\fP wywietli pola wraz z nazw (oraz dwukropkiem i spacj) w takiej
+kolejnoci, w jakiej s wymienione w pliku kontrolnym.
+
+Dla nieodnalezionych pl kontrolnych nie s wywietlane komunikaty bdw.
+.TP 
+\fB\-c\fP, \fB\-\-contents\fP \fIarchiwum\fP
+Wywietla zawarto archiwum. Wydruk jest podany w takiej postaci, jak
+generuje polecenie \fBtar\fP.
+.TP 
+\fB\-x\fP, \fB\-\-extract\fP \fIkatalog archiwum\fP
+Rozpakowuje zawarto archiwum do podanego \fIkatalogu\fP.
+
+Prosz zauway, e rozpakowanie pakietu w katalogu gwnym \fInie\fP jest
+odpowiednikiem zainstalowania pakietu! Do tego celu suy wycznie
+polecenie \fBdpkg\fP.
+
+\fIkatalog\fP (ale bez katalogw nadrzdnych) zostanie utworzony jeli trzeba,
+a jego uprawnienia zostan zmodyfikowane tak, aby odpowiaday zawartoci
+pakietu.
+.TP 
+\fB\-X\fP, \fB\-\-vextract\fP \fIkatalog archiwum\fP
+Is like \fB\-\-extract\fP (\fB\-x\fP)  with \fB\-\-verbose\fP (\fB\-v\fP)  which prints a
+listing of the files extracted as it goes.
+.TP 
+\fB\-R\fP, \fB\-\-raw\-extract\fP \fIarchive directory\fP
+Extracts the filesystem tree from a package archive into a specified
+directory, and the control information files into a DEBIAN subdirectory of
+the specified directory.
+
+W razie potrzeby, katalog docelowy bdzie utworzony.
+.TP 
+\fB\-\-fsys\-tarfile\fP \fIarchiwum\fP
+Extracts the filesystem tree data from a binary package and sends it to
+standard output in \fBtar\fP format. Together with \fBtar\fP(1)  this can be used
+to extract a particular file from a package archive.  The input archive will
+always be processed sequentially.
+.TP 
+\fB\-e\fP, \fB\-\-control\fP \fIarchiwum\fP [\fIkatalog\fP]
+Rozpakowuje pliki kontrolne pakietu do podanego \fIkatalogu\fP.
+
+Jeli \fIkatalog\fP nie zosta okrelony, pliki s rozpakowywane do podkatalogu
+\fBDEBIAN\fP w katalogu biecym.
+
+W razie potrzeby, katalog docelowy bdzie utworzony.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH OPCJE
+.TP 
+\fB\-\-showformat=\fP\fIformat\fP
+Opcja jest uywana do podania formatu wyjcia produkowanego przez
+\fB\-\-show\fP. Format jest acuchem znakw, ktry bdzie wywietlony dla
+kadego wypisanego pakietu.
+
+Argumentem jest acuch znakw w postaci "${\fInazwa\-pola\fP}", ktry moe si
+odnosi do dowolnego pola pliku stanu. List nazw poprawnych pl mona atwo
+wygenerowa, uywajc opcji \fB\-I\fP na tym samym pakiecie. Pene wyjanienie
+opcji formatowania (cznie z sekwencjami cytowania i rozdzielaniem pl)
+mona znale w opisie opcji \fB\-\-showformat\fP w \fBdpkg\-query\fP(1).
+
+Domyln wartoci tego pola jest "${Package}\et${Version}\en".
+.TP 
+\fB\-z\fP\fIcompress\-level\fP
+Specify which compression level to use on the compressor backend, when
+building a package (default is 9 for gzip and bzip2, 6 for xz and lzma).
+.TP 
+\fB\-Z\fP\fIcompress\-type\fP
+Specify which compression type to use when building a package. Allowed
+values are \fIgzip\fP, \fIxz\fP, \fIbzip2\fP, \fIlzma\fP, and \fInone\fP (default is
+\fIgzip\fP).
+.TP 
+\fB\-\-new\fP
+Zapewnia, e \fBdpkg\-deb\fP utworzy "nowy" format archiwum. Ta opcja jest
+domylna.
+.TP 
+\fB\-\-old\fP
+Wymusza utworzenie przez \fBdpkg\-deb\fP "starego" formatu archiwum. Ten format
+jest sabo obsugiwany przez narzdzia spoza dystrybucji Debiana i obecnie
+jest przestarzay. Ta opcja jest uyteczna jedynie w przypadku korzystania z
+wersji dpkg wczeniejszej ni 0.93.76 (wrzesie 1995), ktra bya
+opublikowana jedynie dla i386 a.out.
+.TP 
+\fB\-\-nocheck\fP
+Powoduje, e polecenie \fBdpkg\-deb \-\-build\fP nie bdzie sprawdza zawartoci
+archiwum. W ten sposb mona utworzy niepoprawny pakiet, jeli zajdzie taka
+potrzeba.
+.TP 
+\fB\-v\fP, \fB\-\-verbose\fP
+Enables verbose output. This currently only affects \fB\-\-extract\fP making it
+behave like \fB\-\-vextract\fP.
+.TP 
+\fB\-D\fP, \fB\-\-debug\fP
+Wcza opcj debugowania. Nie jest to zbyt interesujce.
+.
+.SH RODOWISKO
+.TP 
+\fBTMPDIR\fP
+If set, \fBdpkg\-deb\fP will use it as the directory in which to create
+temporary files and directories.
+.
+.SH BDY
+\fBdpkg\-deb \-I\fP \fIpakiet1\fP\fB.deb\fP \fIpakiet2\fP\fB.deb\fP dziaa niepoprawnie.
+
+Nie ma sprawdzania autentycznoci plikw \fB.deb\fP, a nawet nie ma prostej
+sumy kontrolnej. (Narzdzia wyszego poziomu takie jak APT wspieraj
+uwierzytelnianie pakietw \fB.deb\fP pobieranych z danego repozytorium, za
+wikszo wspczesnych pakietw dostarcza plik kontrolny md5sum
+wygenerowany przez debian/rules. Niestety, nie jest to bezporednio
+wspierane przez narzdzia niszego poziomu.)
+
+Nie naley uywa \fBdpkg\-deb\fP do instalowania oprogramowania! Do tego celu
+naley korzysta z \fBdpkg\fP, ktry zainstaluje poprawnie pliki i uruchomi
+potrzebne skrypty instalacyjne.
+.
+.SH "ZOBACZ TAKE"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\fP(1), \fBdselect\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995\-1996 Ian Jackson
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-distaddfile.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-distaddfile.1
--- dpkg/man/pl/dpkg-distaddfile.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-distaddfile.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,57 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-distaddfile 1 2011\-07\-04 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+dpkg\-distaddfile \- dodaje wpisy do debian/files
+.
+.SH SKADNIA
+\fBdpkg\-distaddfile\fP [\fIoption\fP...]\fI filename section priority\fP
+.
+.SH OPIS
+\fBdpkg\-distaddfile\fP dodaje wpis dotyczcy podanego pliku do \fBdebian/files\fP.
+
+Pobiera trzy argumenty nie bdce opcjami: nazw pliku oraz sekcj i
+priorytet dla pliku \fB.changes\fP.
+
+Nazwa pliku powinna by podana relatywnie w stosunku do katalogu, w ktrym
+\fBdpkg\-genchanges\fP bdzie szuka plikw, zazwyczaj jako \fB..\fP, raczej ni
+by ciek relatywn do biecego katalogu, podczas dziaania
+\fBdpkg\-distaddfile\fP.
+.
+.SH OPCJE
+.TP 
+\fB\-f\fP\fIplik_z_list_plikw\fP
+Czyta lub zapisuje list plikw wydania do pliku podanego jako argument tej
+opcji, zamiast do pliku \fBdebian/files\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH PLIKI
+.TP 
+\fBdebian/files\fP
+Lista wygenerowanych plikw, ktre s czci przygotowywanego wydania. Aby
+doda dodatkowe pliki, mona uy \fBdpkg\-distaddfile\fP.
+.
+.SH AUTORZY
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-divert.8 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-divert.8
--- dpkg/man/pl/dpkg-divert.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-divert.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,155 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-divert 8 2011\-08\-14 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+dpkg\-divert \- nadpisywanie plikw z pakietw
+.
+.SH SKADNIA
+\fBdpkg\-divert\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH OPIS
+\fBdpkg\-diver\fP jest narzdziem uywanym do tworzenia i aktualizowania listy
+nadpisa plikw.
+.PP
+"\fINadpisania\fP" plikw s sposobem na wymuszenie na programie \fBdpkg\fP(1)
+instalowania pliku nie w domylnej lokalizacji, lecz w nowej, \fInadpisanej\fP
+lokalizacji. Nadpisania mog by uywane w skryptach pakietw Debiana do
+przeniesienia plikw, ktre powoduj konflikty. Administrator systemu moe
+ich take uy do nadpisania plikw konfiguracyjnych pewnych pakietw, albo
+wtedy gdy niektre pliki (nieoznaczone jako "pliki konfiguracyjne") musz
+by zachowane przez dpkg podczas instalacji nowej wersji pakietu
+zawierajcego te pliki.
+.sp
+.SH POLECENIA
+.TP 
+[\fB\-\-add\fP] \fIplik\fP
+Dodaje nadpisanie \fIpliku\fP.
+.TP 
+\fB\-\-remove\fP \fIplik\fP
+Usuwa nadpisanie \fIpliku\fP.
+.TP 
+\fB\-\-list\fP\fI wzorzec\-glob\fP
+Wywietla nadpisania pasujce do \fIwzorca\-glob\fP.
+.TP 
+\fB\-\-listpackage\fP\fI plik\fP
+Wywietla nazw pakietu, ktry zawiera ominicie \fIpliku\fP. Wywietla napis
+LOCAL jeli \fIplik\fP jest ominity lokalnie, nie wywietla nic jeli dla
+\fIpliku\fP nie ma ominicia.
+.TP 
+\fB\-\-truename\fP\fI plik\fP
+Wywietla rzeczywist nazw nadpisanego pliku.
+.
+.SH OPCJE
+.TP 
+\fB\-\-admindir\fP\fI katalog\fP
+Ustawia katalog bazy danych dpkg na \fIkatalog\fP (domylnie \fI/var/lib/dpkg\fP).
+.TP 
+\fB\-\-divert\fP \fInadpisz\-do\fP
+\fInadpisz\-do\fP jest lokalizacj, do ktrej zostan nadpisane wersje \fIpliku\fP
+dostarczane przez inne pakiety.
+.TP 
+\fB\-\-local\fP
+Okrela, e zostan nadpisane wszystkie wersje tego pliku. Oznacza to ,e
+bez adnych wyjtkw, plik jest nadpisywany, niezalenie od tego, ktry
+pakiet jest instalowany. Administrator moe tego uy do zainstalowania
+lokalnie zmodyfikowanej wersji pliku.
+.TP 
+\fB\-\-package\fP\fI pakiet\fP
+\fIpakiet\fP jest nazw pakietu, ktrego kopia \fIpliku\fP nie bdzie nadpisana,
+tj. \fIplik\fP bdzie nadpisany dla wszystkich pakietw oprcz podanego
+\fIpakietu\fP.
+.TP 
+\fB\-\-quiet\fP
+Tryb cichy, bez rozwlekych komunikatw.
+.TP 
+\fB\-\-rename\fP
+Przenosi plik w jedn lub drug stron. \fBdpkg\-divert\fP przerwie dziaanie,
+jeeli plik docelowy ju istnieje.
+.TP 
+\fB\-\-test\fP
+Tryb testowy, tzn. nie wykonuje adnych akcji, tylko pokazuje, co zostaoby
+zrobione.
+.TP 
+\fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH UWAGI
+When adding, default is \fB\-\-local\fP and \fB\-\-divert\fP
+\fIoriginal\fP\fB.distrib\fP. When removing, \fB\-\-package\fP or \fB\-\-local\fP and
+\fB\-\-divert\fP must match if specified.
+
+Za pomoc \fBdpkg\-divert\fP nie mona nadpisa katalogw.
+
+Naley by ostronym podczas nadpisywania bibliotek
+wspdzielonych. \fBldconfig\fP(8) tworzy dowizania symboliczne na podstawie
+pola DT_SONAME ustawionego w bibliotece. Poniewa ldconfig nie honoruje
+nadpisa (tylko dpkg to robi), dowizanie symboliczne moe wskazywa na
+nadpisan bibliotek, jeeli ta nadpisana biblioteka ma takie samo SONAME,
+co nienadpisana.
+.
+.SH PRZYKADY
+Aby nadpisa wszystkie kopie pliku \fI/usr/bin/przykad\fP do
+\fI/usr/bin/przykad.bla\fP, tj. spowodowa, e wszystkie pakiety dostarczajce
+\fI/usr/bin/przykad\fP zainstaluj ten plik jako \fI/usr/bin/przykad.bla\fP i
+zmieni nazw pliku, jeli jest to wymagane:
+.HP
+dpkg\-divert \-\-divert /usr/bin/przykad.bla \-\-rename /usr/bin/przykad
+.PP
+Aby usun to nadpisanie:
+.HP
+dpkg\-divert \-\-rename \-\-remove /usr/bin/przykad
+
+.PP
+Aby napisa \fI/usr/bin/przykad\fP jako \fI/usr/bin/przykad.bla\fP wszystkim
+pakietom, prbujcym zainstalowa ten plik, oprcz pakietu \fIwibble\fP:
+.HP
+dpkg\-divert \-\-package wibble \-\-divert /usr/bin/przykad.bla \-\-rename
+/usr/bin/przykad
+.PP
+Aby usun to nadpisanie:
+.HP
+dpkg\-divert \-\-package wibble \-\-rename \-\-remove /usr/bin/przykad
+.
+.SH RODOWISKO
+.TP 
+\fBDPKG_ADMINDIR\fP
+If set and the \fB\-\-admindir\fP option has not been specified, it will be used
+as the dpkg data directory.
+.TP 
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP
+If set and the \fB\-\-local\fP and \fB\-\-package\fP options have not been specified,
+\fBdpkg\-divert\fP will use it as the package name.
+.
+.SH PLIKI
+.TP 
+\fI/var/lib/dpkg/diversions\fP
+Plik zawierajcy obecn list nadpisa plikw w systemie. Zlokalizowany jest
+w katalogu administracyjnym dpkg, cznie z innymi plikami wanymi dla dpkg,
+takimi jak \fIstatus\fP lub \fIavailable\fP.
+.br
+Uwaga: przed zastpieniem pliku now wersj, \fBdpkg\-divert\fP zachowuje star
+kopi w pliku z rozszerzeniem "\-old".
+.
+.SH "ZOBACZ TAKE"
+\fBdpkg\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995 Ian Jackson
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-genchanges.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-genchanges.1
--- dpkg/man/pl/dpkg-genchanges.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-genchanges.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,138 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-genchanges 1 2011\-08\-14 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+dpkg\-genchanges \- tworzy pliki .changes
+.
+.SH SKADNIA
+\fBdpkg\-genchanges\fP [\fIoption\fP...]
+.br
+.
+.SH OPIS
+\fBdpkg\-genchanges\fP czyta informacje z rozpakowanego i zbudowanego drzewa
+pakietu rdowego Debiana oraz z plikw, ktre wygenerowa, i na ich
+podstawie tworzy plik kontrolny wydania (plik \fB.changes\fP).
+.
+.SH OPCJE
+.TP 
+\fB\-b\fP, \fB\-B\fP, \fB\-A\fP
+Okrela, e wykonywane jest budowanie tylko pakietw binarnych (bez
+wczania jakichkolwiek plikw rdowych). Nie ma rnicy midzy \fB\-b\fP,
+\fB\-B\fP i \fB\-A\fP, wygenerowany plik \fB.changes\fP bdzie zawiera wszystkie pliki
+utworzone przez reguy \fBbinary\-*\fP budowanych wanie pakietw.
+.TP 
+\fB\-S\fP
+Okrela, e tylko rda bd doczone do wydania (bez adnych pakietw
+binarnych).
+.PP
+Opcje \fB\-s\fP\fIx\fP okrelaj, czy do wydania doczane s oryginalne pliki
+rdowe, jeeli zostanie wygenerowany cho jeden z nich (tj. nie uyto
+opcji \fB\-b\fP lub \fB\-B\fP).
+.TP 
+\fB\-si\fP
+Domylnie lub jeli to okrelono, oryginalne rda bd doczone tylko
+jeli numer oryginalnej wersji autora programu (tzn. wersja bez epoki i bez
+numeru rewizji Debiana) rni si od numeru wersji autora programu z
+poprzedniego wpisu dziennika zmian.
+.TP 
+\fB\-sa\fP
+Wymusza doczenie oryginalnych rde.
+.TP 
+\fB\-sd\fP
+Wymusza pominicie oryginalnych rde i doczenie tylko pliku rnic
+(diff).
+.fi
+.TP 
+\fB\-v\fP\fIwersja\fP
+Powoduje, e bd uywane informacje z dziennika zmian ze wszystkich wersji
+wikszych ni \fIwersja\fP.
+.TP 
+\fB\-C\fP\fIopis_zmian\fP
+Czyta opis zmian z pliku \fIopis_zmian\fP, zamiast uywa informacji z
+dziennika zmian z katalogu ze rdami.
+.TP 
+\fB\-m\fP\fIadres opiekuna\fP
+Uywa \fIadresu_opiekuna\fP jako nazwy i adresu e\-mail opiekuna tego pakietu,
+zamiast pobiera te wartoci z pliku kontrolnego z katalogu ze rdami.
+.TP 
+\fB\-e\fP\fIadres_opiekuna\fP
+Uywa \fIadresu_opiekuna\fP jako nazwy i adresu e\-mail opiekuna tego wydania,
+zamiast pobiera te wartoci z dziennika zmian z katalogu ze rdami.
+.TP 
+\fB\-V\fP\fInazwa\fP\fB=\fP\fIwarto\fP
+Ustawia zmienn podstawienia wyjcia. Szczegowy opis podstawiania
+zmiennych wyjciowych znajduje si w \fBdeb\-substvars\fP(5).
+.TP 
+\fB\-T\fP\fIplik_zmiennych_podst\fP
+Read substitution variables in \fIsubstvarsfile\fP; the default is
+\fBdebian/substvars\fP.  No variable substitution is done on any of the fields
+that are output, however the special variable \fIFormat\fP will override the
+field of the same name. This option can be used multiple times to read
+substitution variables from multiple files.
+
+.TP 
+\fB\-D\fP\fIpole\fP\fB=\fP\fIwarto\fP
+Nadpisuje lub dodaje wyjciowe pole pliku kontrolnego.
+.TP 
+\fB\-U\fP\fIpole\fP
+Usuwa wyjciowe pole pliku kontrolnego.
+.TP 
+\fB\-c\fP\fIplik_kontrolny\fP
+Okrela gwny plik kontrolny, z ktrego bd czytane informacje. Domylnie
+jest to \fBdebian/control\fP.
+.TP 
+\fB\-l\fP\fIdziennik_zmian\fP
+Okrela dziennik zmian, z ktrego bd czytane informacje. Domylnym plikiem
+jest \fBdebian/changelog\fP.
+.TP 
+\fB\-f\fP\fIplik_z_list_plikw\fP
+Czyta z tego pliku list plikw do wydania zamiast uywa \fBdebian/files\fP.
+.TP 
+\fB\-F\fP\fIformat_dziennika_zmian\fP
+Okrela format dziennika zmian. Domylnie format jest czytany ze specjalnej
+linii znajdujcej si przy kocu pliku lub \- jeli taka linia nie istnieje \-
+uywany jest standardowy format Debiana.
+.TP 
+\fB\-u\fP\fIkatalog_z_plikami_wydania\fP
+Poszukuje plikw, ktre maj by doczone do wydania w
+\fIkatalogu_z_plikami_wydania\fP zamiast w katalogu \fB..\fP (\fBdpkg\-genchanges\fP
+musi znale te pliki, tak eby mc zapisa ich rozmiary oraz sumy kontrolne
+w pliku \fB.changes\fP).
+.TP 
+\fB\-q\fP
+Zazwyczaj \fBdpkg\-genchanges\fP na standardowym wyjciu bdw wypisze
+komunikaty informujce na przykad o liczbie plikw wygenerowanych
+rdowych pakietu. \fB\-q\fP powstrzymuje wypisywanie takich komunikatw
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH PLIKI
+.TP 
+\fBdebian/files\fP
+Lista wygenerowanych plikw, ktre s czci przygotowywanego
+wydania. \fBdpkg\-genchanges\fP czyta std dane podczas tworzenia pliku
+\&\fB.changes\fP.
+.
+.SH AUTORZY
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-gencontrol.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-gencontrol.1
--- dpkg/man/pl/dpkg-gencontrol.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-gencontrol.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,140 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-gencontrol 1 2011\-08\-14 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+dpkg\-gencontrol \- tworzy pliki kontrolne Debiana
+.
+.SH SKADNIA
+\fBdpkg\-gencontrol\fP [\fIoption\fP...]
+.
+.SH OPIS
+\fBdpkg\-gencontrol\fP czyta informacje z rozpakowanego drzewa rde pakietu
+Debiana i generuje plik kontrolny pakietu binarnego (domylnie jest to
+debian/tmp/DEBIAN/control), upraszczajc podczas tego procesu pola dotyczce
+zalenoci.
+.sp
+Pola \fIPre\-Depends\fP, \fIDepends\fP, \fIRecommends\fP oraz \fISuggests\fP s
+upraszczane w tej wanie kolejnoci przez usuwanie zalenoci o ktrych
+wiadomo, e s prawdziwe, poniewa wynikaj z innych, przetworzonych ju
+mocniejszych zalenoci. Usunite take bd wszelkie zalenoci pakietu od
+samego siebie (dokadniej: usunite bd wszystkie zalenoci, ktre bd
+prawdziwe po zainstalowaniu biecej wersji pakietu). Mwic jzykiem
+logiki, zachowana bdzie cz wsplna ze zbioru wszystkich zalenoci
+dotyczcych tego samego pakietu. Porzdek zalenoci jest zachowywany w
+takim stopniu, w jakim jest to tylko moliwe: jeeli jaka zaleno musi
+by usunita z powodu innej zalenoci wystpujcej dalej w danym polu,
+wypierajca zaleno zajmie miejsce tej usuwanej.
+.sp
+Pozostae pola relacyjne (\fIEnhances\fP, \fIConflicts\fP, \fIBreaks\fP, \fIReplaces\fP
+oraz \fIProvides\fP) take s indywidualnie upraszczane przez wyliczanie sumy
+rnych zalenoci, jeli w danym polu pakiet jest wymieniony wiele razy.
+.sp
+\fBdpkg\-gencontrol\fP dodaje ponadto wpis dotyczcy pakietu binarnego do
+\fBdebian/files\fP.
+.
+.SH OPCJE
+.TP 
+\fB\-v\fP\fIwersja\fP
+Ustawia numer wersji generowanego pakietu binarnego.
+.TP 
+\fB\-V\fP\fInazwa\fP\fB=\fP\fIwarto\fP
+Ustawia zmienn podstawienia wyjcia. Szczegowy opis podstawiania
+zmiennych wyjciowych znajduje si w \fBdeb\-substvars\fP(5).
+.TP 
+\fB\-T\fP\fIplik_zmiennych_podst\fP
+Read substitution variables in \fIsubstvarsfile\fP; the default is
+\fBdebian/substvars\fP.  This option can be used multiple times to read
+substitution variables from multiple files.
+.TP 
+\fB\-D\fP\fIpole\fP\fB=\fP\fIwarto\fP
+Nadpisuje lub dodaje wyjciowe pole pliku kontrolnego.
+.TP 
+\fB\-U\fP\fIpole\fP
+Usuwa wyjciowe pole pliku kontrolnego.
+.TP 
+\fB\-c\fP\fIplik_kontrolny\fP
+Okrela gwny plik kontrolny, z ktrego bd czytane informacje. Domylnie
+jest to \fBdebian/control\fP.
+.TP 
+\fB\-l\fP\fIdziennik_zmian\fP
+Okrela dziennik zmian, z ktrego bd czytane informacje. Domylnym plikiem
+jest \fBdebian/changelog\fP.
+.TP 
+\fB\-f\fP\fIplik_z_list_plikw\fP
+Czyta lub zapisuje list plikw wydania do pliku podanego jako argument tej
+opcji, zamiast do pliku \fBdebian/files\fP.
+.TP 
+\fB\-F\fP\fIformat_dziennika_zmian\fP
+Okrela format dziennika zmian. Domylnie format jest czytany ze specjalnej
+linii znajdujcej si przy kocu pliku lub \- jeli taka linia nie istnieje \-
+uywany jest standardowy format Debiana.
+.TP 
+\fB\-p\fP\fIpakiet\fP
+Generuje informacje o pakiecie binarnym \fIpakiet\fP. Jeeli plik kontrolny
+pakietu rdowego wymienia tylko jeden pakiet binarny, to opcj t mona
+pomin, w przeciwnym wypadku wymagane jest wskazanie, dla ktrego pakietu
+binarnego wygenerowa informacje.
+.TP 
+\fB\-n\fP\fInazwa_pliku\fP
+Okrela, e nazw pliku pakietu bdzie \fInazwa_pliku\fP zamiast normalnej
+nazwy pliku w postaci pakiet_wersja_architektura.deb
+.TP 
+\fB\-is\fP, \fB\-ip\fP, \fB\-isp\fP
+Te opcje s ignorowane w celu zachowania kompatybilnoci ze starszymi
+wersjami dpkg\-dev, obecnie s uznawane za przestarzae. Poprzednio byy
+uywane do nakazania programowi dpkg\-gencontrol wczenia pl Section i
+Priority do pliku kontrolnego. Obecnie jest to domylne zachowanie. Aby
+uzyska poprzednie zachowanie, mona uy opcji \fB\-U\fP, dziki ktrej mona
+usun powysze pola z pliku kontrolnego.
+.TP 
+\fB\-P\fP\fIkatalog_budowania_pakietu\fP
+Mwi programowi \fBdpkg\-source\fP, e pakiet jest budowany w
+\fIkatalogu_budowania_pakietu\fP, zamiast w \fBdebian/tmp\fP. Katalog ten jest
+uywany do znalezienia domylnych wartoci zmiennej podstawiania
+\fBInstalled\-Size\fP i pola w pliku kontrolnym o tej samej nazwie (przy uyciu
+du) oraz domylnej lokalizacji pliku wynikowego.
+.TP 
+\fB\-O\fP
+Wypisuje plik kontrolny na standardowe wyjcie, a nie do pliku
+\fBdebian/tmp/DEBIAN/control\fP (lub
+\fIkatalogu_budowania_pakietu\fP\fB/DEBIAN/control\fP, gdy uyto \fB\-P\fP).
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH PLIKI
+.TP 
+\fBdebian/control\fP
+Gwny plik kontrolny, zawierajcy niezalene od wersji informacje zarwno o
+pakiecie rdowym, jak i o pakietach binarnych, ktre s tworzone z pakietu
+rdowego.
+.TP 
+\fBdebian/files\fP
+Lista wygenerowanych plikw, ktre s czci przygotowywanego
+wydania. \fBdpkg\-gencontrol\fP zapisuje tutaj przypuszczalne nazwy
+plikw\-pakietw binarnych generowanych z pliku kontrolnego.
+.
+.SH AUTORZY
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2007\-2008 Rapha\[:e]l Hertzog
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-name.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-name.1
--- dpkg/man/pl/dpkg-name.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-name.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,106 @@
+.\" This is an -*- nroff -*- source file.
+.\" dpkg-name and this manpage are Copyright © 1995,1996 by Erick Branderhorst.
+.\"
+.\" This is free software; see the GNU General Public Licence version 2
+.\" or later for copying conditions.  There is NO warranty.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-name 1 2011\-08\-14 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+dpkg\-name \- zmienia nazwy pakietw Debiana na pene
+.
+.SH SKADNIA
+\fBdpkg\-name\fP [\fIoption\fP...] [\fB\-\-\fP] \fIfile\fP...
+.
+.SH OPIS
+.PP
+This manual page documents the \fBdpkg\-name\fP program which provides an easy
+way to rename \fBDebian\fP packages into their full package names. A full
+package name consists of
+\fIpackage\fP\fB_\fP\fIversion\fP\fB_\fP\fIarchitecture\fP\fB.\fP\fIpackage\-type\fP as specified
+in the control file of the package. The \fIversion\fP part of the filename
+consists of the upstream version information optionally followed by a hyphen
+and the revision information. The \fIpackage\-type\fP part comes from that field
+if present or fallbacks to \fBdeb\fP.
+.
+.SH OPCJE
+.TP 
+\fB\-a\fP, \fB\-\-no\-architecture\fP
+Wynikowy plik nie bdzie mia informacji o architekturze.
+.TP 
+\fB\-k\fP, \fB\-\-symlink\fP
+Tworzy dowizanie symboliczne, zamiast przenosi plik.
+.TP 
+\fB\-o\fP, \fB\-\-overwrite\fP
+Istniejce pliki bd nadpisane, jeeli ich nazwy s takie same jak nazwy
+plikw wynikowych.
+.TP 
+\fB\-s\fP, \fB\-\-subdir\fP [\fIkatalog\fP]
+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\-\fIarchitecture\fP/\fIsection\fP'. 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
+`\fIsection\fP/binary\-\fIarchitecture\fP'. 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.
+.TP 
+\fB\-c\fP, \fB\-\-create\-dir\fP
+Opcja ta moe by uyta cznie z opcj \-s. Jeli katalog docelowy nie
+istnieje, to zostanie utworzony. \fBProsz ostronie uywa tej opcji.\fP
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-v\fP, \fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH PRZYKADY
+.TP 
+\fBdpkg\-name bar\-foo.deb\fP
+Nazwa pliku "bar\-foo.deb" zostanie zmieniona na bar\-foo_1.0\-2_i386.deb lub
+co podobnego (w zalenoci od informacji zawartych w pliku kontrolnym
+pakietu "bar\-foo.deb").
+.TP 
+\fBfind /root/debian/ \-name \(aq*.deb\(aq | xargs \-n 1 dpkg\-name \-a\fP
+dpkg\-name, jeli jest to konieczne, zmieni nazwy wszystkich pliki z
+rozszerzeniem "deb" z katalogu /root/debian i jego podkatalogw na nazwy
+niezawierajce informacji o architekturze.
+.TP 
+\fBfind \-name \(aq*.deb\(aq | xargs \-n 1 dpkg\-name \-a \-o \-s \-c\fP
+\fBNie rb tego\fP. Twoje archiwum zostanie kompletnie zepsute, poniewa wiele
+pakietw nie bdzie miao informacji o sekcji. \fBNie rb tego\fP.
+.TP 
+\fBdpkg \-\-build debian\-tmp && dpkg\-name \-o \-s .. debian\-tmp.deb\fP
+Moe zosta uyte do budowania nowych pakietw.
+.
+.SH BDY
+Some packages don't follow the name structure
+\fIpackage\fP\fB_\fP\fIversion\fP\fB_\fP\fIarchitecture\fP\fB.deb\fP.  Packages renamed by
+dpkg\-name will follow this structure. Generally this will have no impact on
+how packages are installed by \fBdselect\fP(1)/\fBdpkg\fP(1), but other
+installation tools might depend on this naming structure.
+.
+.SH "ZOBACZ TAKE"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\fP(1), \fBdpkg\-deb\fP(1), \fBfind\fP(1),
+\fBxargs\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995,1996 Erick Branderhorst
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-parsechangelog.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-parsechangelog.1
--- dpkg/man/pl/dpkg-parsechangelog.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-parsechangelog.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,136 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-parsechangelog 1 2011\-08\-14 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+dpkg\-parsechangelog \- przetwarza pliki dziennikw zmian Debiana
+.
+.SH SKADNIA
+\fBdpkg\-parsechangelog\fP [\fIoption\fP...]
+.
+.SH OPIS
+\fBdpkg\-parsechangelog\fP czyta i przetwarza dziennik zmian rozpakowanego
+drzewa rde pakietu Debiana i wypisuje te informacje na standardowym
+wyjciu w postaci czytelnej dla maszyny.
+.
+.SH OPCJE
+.TP 
+\fB\-l\fP\fIdziennik_zmian\fP
+Okrela dziennik zmian, z ktrego bd czytane informacje. Domylnym plikiem
+jest \fBdebian/changelog\fP.
+.TP 
+\fB\-F\fP\fIformat_dziennika_zmian\fP
+Okrela format dziennika zmian. Domylnie format jest czytany ze specjalnej
+linii znajdujcej si przy kocu pliku lub \- jeli taka linia nie istnieje \-
+uywany jest standardowy format Debiana.
+.TP 
+\fB\-L\fP\fIkatalog\-lib\fP
+Okrela dodatkowy katalog, w ktrym bd wyszukiwane skrypty
+parsera. Katalog ten jest przeszukiwany przed domylnymi katalogami, ktrymi
+obecnie s \fB/usr/local/lib/dpkg/parsechangelog\fP oraz
+\fB/usr/lib/dpkg/parsechangelog\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.SS "Opcje parsera"
+Ponisze opcje mog by uyte do wpywania na parser dziennika zmian, np. na
+zakres wpisw lub format wyjcia. Powinny by obsugiwane przez skrypty
+parsera. Patrz take \fBOSTRZEENIA\fP.
+.TP 
+\fB\-\-format\fP \fIformat_wyjciowy\fP
+Ustawia format wyjcia. Obecnie wspieranymi wartociami s \fIdpkg\fP oraz
+\fIrfc822\fP. \fIdpkg\fP jest klasycznym formatem wyjcia (z czasw sprzed
+powstania tej opcji) i jest domylnym formatem. Skada si z jednego akapitu
+w formacie pliku kontrolnego Debiana (patrz \fBdpkg\-control\fP(5)). Jeli
+zadano wicej ni jednego wpisu, to o ile nie podano inaczej \- wikszo
+pl jest brana z najnowszego wpisu:
+.RS
+.TP 
+\fBSource:\fP\fI pkg\-name\fP
+.TP 
+\fBVersion:\fP\fI version\fP
+.TP 
+\fBDistribution:\fP\fI target\-distribution\fP
+.TP 
+\fBUrgency:\fP\fI urgency\fP
+Jest uywana najwiksza warto wanoci ze wszystkich doczonych wpisw.
+.TP 
+\fBMaintainer:\fP\fI author\fP
+.TP 
+\fBDate:\fP\fI date\fP
+.TP 
+\fBCloses:\fP\fI bug\-number\fP
+Pola Closes wszystkich wczonych wpisw s czone.
+.TP 
+\fBChanges:\fP\fI changelog\-entries\fP
+Tekst wszystkich wpisw dziennika zmian jest czony. Aby uczyni to pole
+poprawnym wieloliniowym polem w formacie pliku kontrolnego Debiana,
+wszystkie puste linie s zastpowane pojedynczymi kropkami oraz jest
+dodawana spacja na pocztku kadej linii. Dokadana zawarto zaley od
+formatu dziennika zmian.
+.RE
+.IP
+Mog take wystpowa dodatkowe pola zdefiniowane przez uytkownika.
+.IP
+Format \fBrfc822\fP uywa tych samych pl, ale wypisuje osobny akapit dla
+kadego uytego wpisu z dziennika zmian tak, e zachowane s wszystkie
+metadane z kadego wpisu.
+.TP 
+\fB\-\-since\fP \fIwersja\fP, \fB\-s\fP\fIwersja\fP,\fB \-v\fP\fIwersja\fP
+docza wszystkie zmiany pniejsze ni \fIwersja\fP.
+.TP 
+\fB\-\-until\fP \fIwersja\fP, \fB\-u\fP\fIwersja\fP
+docza wszystkie zmiany wczeniejsze ni \fIversja\fP.
+.TP 
+\fB\-\-from\fP \fIwersja\fP, \fB\-f\fP\fIwersja\fP
+docza wszystkie zmiany rwne \fIwersji\fP lub pniejsze od niej.
+.TP 
+\fB\-\-to\fP \fIwersja\fP, \fB\-t\fP\fIwersja\fP
+docza wszystkie zmiany wiksze do \fIwersji\fP lub rwne jej.
+.TP 
+\fB\-\-count\fP \fIliczba\fP, \fB\-c\fP\fIliczba\fP, \fB\-n\fP\fIliczba\fP
+docza \fIliczba\fP wpisw z pocztku pliku (lub z jego koca, gdy \fIliczba\fP
+jest mniejsza od zera).
+.TP 
+\fB\-\-offset\fP \fIliczba\fP, \fB\-o\fP\fIliczba\fP
+zmienia punkt pocztkowy dla opcji \-\-count, liczc od pocztku pliku (lub od
+jego koca, jeli \fIliczba\fP jest mniejsza od zera).
+.TP 
+\fB\-\-all\fP
+include all changes. Note: other options have no effect when this is in use.
+.
+.SH OSTRZEENIA
+Wszystkie \fBopcje parsera\fP, z wyjtkiem \-v, s obsugiwane przez \fBdpkg\fP od
+wersji 1.14.16. Zewntrzne parsery dziennikw zmian w formatach innych ni
+\fIdebian\fP mog nie obsugiwa wszystkich opcji.
+.
+.SH PLIKI
+.TP 
+\fBdebian/changelog\fP
+Dziennik zmian jest uywany do pozyskania informacji o pakiecie rdowym
+zalenych od jego wersji, takich jak wano i dystrybucja wydania, zmiany
+dokonane po okrelonym wydaniu, oraz numer wersji pakietu.
+.
+.SH AUTORZY
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2007, 2008 Frank Lichtenheld
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-scansources.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-scansources.1
--- dpkg/man/pl/dpkg-scansources.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-scansources.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,78 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-scansources 1 2011\-08\-14 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+dpkg\-scanpackages \- tworzy pliki indeksowe Sources
+.
+.SH SKADNIA
+\fBdpkg\-scansources\fP [\fIoption\fP...] \fIbinary\-dir\fP [\fIoverride\-file\fP
+[\fIpath\-prefix\fP]] \fB>\fP \fISources\fP
+.
+.SH OPIS
+\fBdpkg\-scansources\fP skanuje podany \fIkatalog_binarny\fP w poszukiwaniu plikw
+\&\fI.dsc\fP, uywanych do utworzenia indeksu rdowych pakietw Debiana, ktry
+nastpnie jest wypisywany na standardowe wyjcie.
+.PP
+The \fIoverride\-file\fP, if given, is used to set priorities in the resulting
+index records and to override the maintainer field given in the \fI.dsc\fP
+files. The file can be compressed. See \fBdeb\-override\fP(5)  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 \fI.dsc\fP file for the priority of the source package, and the override
+entry for the first binary package listed in the \fI.dsc\fP file to modify
+maintainer information. This might change.
+.PP
+\fIPrefiks_cieki\fP, jeli podano, jest doczany na pocztek pola Directory
+w wygenerowanym indeksie rdowym. Oglnie jest to uywane, aby pola
+Directory zawieray ciek od najwyszego poziomu hierarchii archiwum
+Debiana.
+.
+.PP
+\fBUwaga\fP: Aby \fBapt\fP(8) mogo uy wygenerowanego pliku Sources, naley go
+skompresowa programem \fBgzip\fP(1) (tworzc plik Sources.gz). apt ignoruje
+nieskompresowane pliki Sources z wyjtkiem lokalnego dostpu
+(tj. pochodzcego z \fBfile://\fP).
+.
+.SH OPCJE
+.IP "\fB\-n\fP, \fB\-\-no\-sort\fP" 4
+Nie sortuje rekordw indeksu. Normalnie s one posortowane po nazwie pakietu
+rdowego.
+.TP 
+.IP "\fB\-e\fP, \fB\-\-extra\-override\fP \fIplik\fP" 4
+Scan \fIfile\fP to find supplementary overrides (the file can be
+compressed). See \fBdeb\-extra\-override\fP(5)  for more information on its
+format.
+.IP "\fB\-s\fP, \fB\-\-source\-override\fP \fIplik\fP" 4
+Use \fIfile\fP as the source override file (the file can be compressed).  The
+default is the name of the override file you specified with \fI.src\fP
+appended.
+.sp
+Format plik nadpisa rde rni si od formatu nadpisa pakietw
+binarnych. Zawiera tylko dwa pola oddzielone od siebie biaymi znakami:
+pierwszym jest nazwa pakietu, a drugim \- sekcja. Linie puste oraz linie
+komentarza s ignorowane. Jeli pakiet pojawia si w obu plikach, to podczas
+ustawiania sekcji nadpisanie rde ma wikszy priorytet.
+.IP \fB\-\-debug\fP 4
+Wcza tryb debugowania.
+.IP \fB\-\-help\fP 4
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.IP \fB\-\-version\fP 4
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH "ZOBACZ TAKE"
+\fBdeb\-override\fP(5), \fBdeb\-extra\-override\fP(5), \fBdpkg\-scanpackages\fP(1).
+.
+.SH AUTOR
+Roderick Schertler <roderick@argon.org>
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-shlibdeps.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-shlibdeps.1
--- dpkg/man/pl/dpkg-shlibdeps.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-shlibdeps.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,304 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-shlibdeps 1 2011\-08\-14 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+dpkg\-shlibdeps \- generowanie zalenoci podstawie wspdzielonych bibliotek
+.
+.SH SKADNIA
+\fBdpkg\-shlibdeps\fP [\fIoption\fP...] [\fB\-e\fP]\fIexecutable\fP [\fIoption\fP...]
+.
+.SH OPIS
+\fBdpkg\-shlibdeps\fP calculates shared library dependencies for executables
+named in its arguments. The dependencies are added to the substitution
+variables file \fBdebian/substvars\fP as variable names
+\fBshlibs:\fP\fIdependencyfield\fP where \fIdependencyfield\fP is a dependency field
+name. Any other variables starting with \fBshlibs:\fP are removed from the
+file.
+.P
+\fBdpkg\-shlibdeps\fP ma dwa rda informacji suce do generowania informacji
+o zalenociach. S to pliki \fIsymbols\fP lub pliki \fIshlibs\fP. Dla kadego
+pliku binarnego analizowanego przez \fBdpkg\-shlibdeps\fP okrelana jest lista
+bibliotek, z ktrymi jest on linkowany. Nastpnie dla kadej biblioteki
+przegldany jest plik \fIsymbols\fP lub plik \fIshlibs\fP (jeli ten pierwszy nie
+istnieje, lub gdy debian/shlibs.local zawiera stosown zaleno). Oba pliki
+powinny by dostarczane przez pakiet zawierajcy bibliotek i powinny wic
+by dostpne jako /var/lib/dpkg/info/\fIpakiet\fP.\fIsymbols\fP lub
+/var/lib/dpkg/info/\fIpakiet\fP.\fIshlibs\fP. Nazwa pakietu jest okrelana w dwch
+krokach: odnalezienie pliku biblioteki w systemie (sprawdzajc w tych samych
+katalogach, ktrych uywa \fBld.so\fP), a nastpnie uycie \fBdpkg \-S
+\fP\fIplik\-biblioteki\fP w celu okrelenia pakietu dostarczajcego dan
+bibliotek.
+.SS "Pliki symboli"
+Pliki symboli zawieraj dokadniejsze okrelenia informacji o zalenociach,
+dostarczajc minimum zalenoci dla kadego symbolu eksportowanego przez
+bibliotek. Skrypt prbuje odnale plik zwizany z pakietem biblioteki w
+nastpujcych miejscach (uyte jest pierwsze dopasowanie):
+.IP debian/*/DEBIAN/symbols
+Informacje o wspdzielonej bibliotece wygenerowane w biecym procesie
+budowy, ktry wywoa rwnie \fBdpkg\-shlibdeps\fP. S one generowane przez
+\fBdpkg\-gensymbols\fP(1). S uywane tylko, gdy biblioteka znajduje si w
+drzewie budowania pakietu. Plik "symbols" z tego drzewa ma pierwszestwo nad
+plikami symboli z innych pakietw binarnych.
+.IP /etc/dpkg/symbols/\fIpakiet\fP.symbols.\fIarch\fP
+.IP /etc/dpkg/symbols/\fIpakiet\fP.symbols
+Informacje o zasigu systemu, ktre nadpisuj informacje o zalenociach
+bibliotek wspdzielonych. \fIarch\fP jest architektur biecego systemu
+(okrelon przez \fBdpkg\-architecture \-qDEB_HOST_ARCH\fP).
+.IP "Output from \(lq\fBdpkg\-query \-\-control\-path\fP \fIpackage\fP symbols\(rq"
+Package\-provided shared library dependency information.  Unless overridden
+by \-\-admindir, those files are located in /var/lib/dpkg.
+.P
+Podczas przeszukiwania symboli uywanych przez wszystkie pliki binarne,
+\fBdpkg\-shlibdeps\fP zapamituje (najwiksz) minimaln wersj wymagan dla
+kadej biblioteki. Na kocu procesu jest wic w stanie wypisa minimalne
+zalenoci dla kadej uytej biblioteki (pod warunkiem, e informacja z
+plikw \fIsymbols\fP jest dokadna).
+.P
+Jako zabezpieczenie plik symboli moe zawiera pole metainformacji
+\fIBuild\-Depends\-Package\fP, za \fBdpkg\-shlibdeps\fP okrelajc minimaln wersj
+wymagan przez odpowiadajcy pakiet z pola Build\-Depends bdzie uywa
+wanie tej wersji, jeli jest ona wysza ni minimalna wersja okrelona
+dziki przeszukiwaniu symboli.
+.SS "Pliki \(dqshlibs\(dq"
+Pliki "shlibs" wi bezporednio bibliotek z zalenociami (bez
+przegldania symboli). Jest to wic czsto silniejsze ni naprawd
+potrzebne, ale bardzo bezpieczne i atwe w obsudze.
+.P
+Zalenoci dla biblioteki s wyszukiwane w kilku miejscach. Uywany jest
+pierwszy plik zawierajcy informacje dla danej biblioteki:
+.IP debian/shlibs.local
+Lokalne informacje z pakietu nadpisujce informacje o zalenociach
+bibliotek wspdzielonych.
+.IP /etc/dpkg/shlibs.override
+Informacje o zasigu systemu, ktre nadpisuj informacje o zalenociach
+bibliotek wspdzielonych.
+.IP debian/*/DEBIAN/shlibs
+Informacje o zalenociach wspdzielonych bibliotek wygenerowane w biecym
+procesie budowy, ktry wywoa rwnie \fBdpkg\-shlibdeps\fP. S uywane tylko,
+gdy biblioteka znajduje si w drzewie budowania pakietu. Plik "shlibs" z
+tego drzewa ma pierwszestwo nad plikami shlibs z innych pakietw
+binarnych."
+.IP "Output from \(lq\fBdpkg\-query \-\-control\-path\fP \fIpackage\fP shlibs\(rq"
+Package\-provided shared library dependency information.  Unless overridden
+by \-\-admindir, those files are located in /var/lib/dpkg.
+.IP /etc/dpkg/shlibs.default
+Domylna informacja o zalenociach bibliotek wspdzielonych, o zakresie
+systemu.
+.P
+Uzyskane zalenoci s uywane bezporednio (chyba, e s odfiltrowane
+poniewa zostay zidentyfikowane jako duplikaty lub sabsze ni jaka inna
+zaleno).
+.SH OPCJE
+\fBdpkg\-shlibdeps\fP interpretuje parametry nie bdce opcjami jako nazwy
+plikw wykonywalnych, tak jakby byy podane przez \fB\-e\fP\fIplik_wykonywalny\fP.
+.TP 
+\fB\-e\fP\fIplik_wykonywalny\fP
+Wczenie zalenoci odpowiadajcych bibliotekom wspdzielonym wymaganym
+przez \fIplik_wykonywalny\fP.
+.TP 
+\fB\-d\fP\fIpole_zalenoci\fP
+Dodanie zalenoci, ktre maj by dodane do pola zalenoci
+\fIpole_zalenoci\fP pliku kontrolnego. (Zalenoci dla tego pola s
+umieszczane w zmiennej \fBshlibs:\fP\fIpole_zalenoci\fP.)
+
+Opcja \fB\-d\fP\fIpole_zalenoci\fP wpywa na wszystkie pliki wykonywalne podane
+po tej opcji, a do nastpnego \fB\-d\fP\fIpole_zalenoci\fP. Domylnym
+\fIpolem_zalenoci\fP jest \fBDepends\fP.
+
+Jeli to samo okrelenie zalenoci (lub zbir alternatyw) pojawia si w
+wicej ni jednej nazwie z rozrnianych pl zalenoci \fBPre\-Depends\fP,
+\fBDepends\fP, \fBRecommends\fP, \fBEnhances\fP lub \fBSuggests\fP to \fBdpkg\-shlibdeps\fP
+automatycznie usunie zaleno ze wszystkich pl, poza polem reprezentujcym
+najwaniejsze zalenoci.
+.TP 
+\fB\-p\fP\fIprefiks_nazw_zmiennych\fP
+Rozpoczynanie nazw zmiennych podstawiania od \fIprefiks_nazw_zmiennych\fP\fB:\fP
+zamiast \fBshlibs:\fP. Podobnie, wszystkie zmienne rozpoczynajce si od
+\fIprefiks_nazw_zmiennych\fP\fB:\fP (zamiast \fBshlibs:\fP) s usuwane z pliku
+zmiennych podstawiania.
+.TP 
+\fB\-O\fP
+Wywietlenie ustawie zmiennych podstawiania na standardowe wyjcie, zamiast
+dodawania ich do pliku zmiennych podstawiania (domylnie
+\fBdebian/substvars\fP).
+.TP 
+\fB\-t\fP\fItyp\fP
+Preferowanie informacji o zalenociach bibliotek wspdzielonych
+oznaczonych dla danego typu pakietu. Jeli informacji oznaczonych nie ma,
+uywane s informacje bez oznacze. Domylnym typem pakietu jest
+"deb". Informacje o zalenociach bibliotek wspdzielonych s oznaczane dla
+danego typu pakietu przez poprzedzenie ich nazw typu, dwukropkiem oraz
+biaymi znakami (spacjami).
+.TP 
+\fB\-L\fP\fIlokalny_plik_shlibs\fP
+Odczyt nadpisa informacji o bibliotekach wspdzielonych z
+\fIlokalnego_pliku_shlibs\fP zamiast \fBdebian/shlibs.local\fP.
+.TP 
+\fB\-T\fP\fIplik_zmiennych_podst\fP
+Zapis zmiennych podstawiania w pliku \fIplik_zmiennych_podst\fP; domylnie jest
+to \fBdebian/substvars\fP.
+.TP 
+\fB\-v\fP
+Wczenie dodatkowych informacji. Wywietlanych jest wiele komunikatw
+tumaczcych dziaanie \fBdpkg\-shlibdeps\fP.
+.TP 
+\fB\-x\fP\fIpakiet\fP
+Wyczenie pakietu z generowanych zalenoci. Uyteczne aby zapobiec
+zalenociom pakietu od samego siebie dla pakietw dostarczajcych binaria
+typu ELF (pliki wykonywalne lub biblioteki), ktre zale od innej
+biblioteki zawartej w tym samym pakiecie. Ta opcja moe by uyta
+wielokrotnie aby wyczy kilka pakietw.
+.TP 
+\fB\-S\fP\fIkatalog_budowania_pakietu\fP
+Przegldanie najpierw \fIkatalogu_budowania_pakietu\fP przy prbie odnalezienia
+biblioteki. Przydatne gdy pakiet rdowy tworzy wiele odmian tej samej
+biblioteki, a chce si zapewni uzyskanie zalenoci od okrelonego pakietu
+binarnego. Ta opcja moe by uyta wielokrotnie: katalogi bd przegldane w
+tej samej kolejnoci przed katalogami innych pakietw binarnych.
+.TP 
+\fB\-\-ignore\-missing\-info\fP
+Kontynuacja pomimo braku informacji o zalenociach dla biblioteki
+wspdzielonej. Odradza si uywanie tej opcji, wszystkie biblioteki powinny
+dostarcza informacje o zalenociach (w postaci plikw shlibs lub plikw
+symboli) \- nawet jeli nie s jeszcze uywane przez inne pakiety.
+.TP 
+\fB\-\-warnings=\fP\fIwarto\fP
+\fIwarto\fP jest polem bitowym definiujcym zbir ostrzee, ktre mog by
+wysane przez \fBdpkg\-shlibdeps\fP. Bit 0 (warto=1) wcza ostrzeenie "w
+adnej z bibliotek nie znaleziono symbolu \fIsymb\fP uywanego przez
+\fIplik_binarny\fP", bit 1 (warto=2) wcza ostrzeenie "mona by unikn
+zalenoci od biblioteki \fIbibl\fP", za bit 2 (warto=4) wcza ostrzeenie
+"\fIplik_binarny\fP nie powinien by linkowany z \fIbibliotek\fP". Domyln
+\fIwartoci\fP jest 3: pierwsze dwa ostrzeenia s domylnie aktywne, za
+ostatnie nie. Ustawienie \fIwartoci\fP na 7 powoduje aktywacj wszystkich
+ostrzee.
+.TP 
+\fB\-\-admindir=\fP\fIkatalog\fP
+Zmienia pooenie bazy danych \fBdpkg\fP. Domylnie jest to \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH UWAGI
+Poniewa \fBdpkg\-shlibdeps\fP analizuje zbir symboli uywanych przez kady
+plik binarny generowanego pakietu, jest w stanie wysya ostrzeenia w
+pewnych przypadkach. Informuj one o rzeczach, ktre mog by ulepszone w
+pakiecie. W wikszoci przypadkw dotyczy to bezporednio oryginalnych
+rde. Poniej zebrane s ostrzeenia na jakie mona natrafi, w kolejnoci
+malejcej wanoci:
+.TP 
+\fBw adnej z bibliotek nie znaleziono symbolu\fP\fI symb\fP\fB uywanego przez \fP\fIplik_binarny\fP
+Wskazany symbol nie zosta odnaleziony w adnej z bibliotek, z ktrymi jest
+linkowany plik binarny. Taki \fIplik_binarny\fP jest najpewniej bibliotek i
+powinien by linkowany z dodatkow bibliotek podczas budowania pakietu
+(opcja \fB\-l\fP\fIbiblioteka\fP linkera).
+.TP 
+\fIplik_binarny\fP\fB zawiera nierozwizywalne odniesienie do symbolu \fP\fIsym\fP\fB: prawdopodobnie jest to wtyczka\fP
+Wskazany symbol nie zosta odnaleziony w adnej z bibliotek, z ktrymi jest
+linkowany plik binarny. Taki \fIplik_binarny\fP jest najpewniej wtyczk i jest
+prawdopodobnie dostarczany wraz z programem, ktry aduj tak
+wtyczk. Teoretycznie wtyczka nie powinna mie pola SONAME, jednak ten plik
+binarny je posiada i nie mona go zidentyfikowa na tej podstawie. Fakt, i
+plik ten jest umieszczony w niepublicznym katalogu mocno wskazuje na to, e
+nie jest on zwyk bibliotek wspdzielon. Jeli plik binarny rzeczywicie
+jest wtyczk, mona pomin to ostrzeenie. Jednak zawsze istnieje
+moliwo, e jest to biblioteka i programy z ni linkowane uywaj RPATH,
+aby dynamiczny loader by w stanie j odnale. W takim przypadku bibliotek
+mona uzna za zepsut i naley j naprawi.
+.TP 
+\fBmona by unikn zalenoci od \fP\fIbiblioteki\fP\fB, jeeli nie byoby niepotrzebnego linkowania \fP\fIplikw_binarnych\fP\fB z ni (nie s uywane adne z tamtejszych symboli).\fP
+aden z \fIplikw_binarnych\fP, ktre s linkowane z \fIbibliotek\fP nie uywa
+symboli przez ni udostpnianych. Poprawiajc wszystkie pliki binarne mona
+unikn zalenoci zwizanych z t bibliotek (chyba, e taka sama zaleno
+jest rwnie generowana przez inn bibliotek, ktra jest faktycznie
+uywana).
+.TP 
+\fIplik_binarny\fP\fB nie powinien by linkowany z \fP\fIbibliotek\fP\fB (nie s uywane adne z tamtejszych symboli).\fP
+\fIplik_binarny\fP jest linkowany z bibliotek, ktrej nie potrzebuje. Nie jest
+to problem, ale mona uzyska pewn popraw wydajnoci czasu adowania pliku
+binarnego, jeli biblioteka ta nie bdzie z nim linkowana. To ostrzeenie
+sprawdza te same informacje co poprzednie, ale wykonuje to dla kadego pliku
+binarnego zamiast wykonywania globalnego sprawdzenia dla wszystkich
+analizowanych plikw.
+.SH BDY
+\fBdpkg\-shlibdeps\fP przerwie dziaanie z bdem jeli nie bdzie w stanie
+znale publicznej biblioteki uywanej przez plik binarny, lub jeli
+biblioteka taka nie bdzie mie powizanej informacji o zalenociach (pliku
+shlibs lub pliku symboli). Publiczne biblioteki maj SONAME i s
+wersjonowane (jak np. libsomething.so.\fIX\fP). Biblioteki prywatne (jak
+np. wtyczki) nie powinny mie SONAME i nie musz by wersjonowane.
+.TP 
+\fBnie mona znale biblioteki \fP\fIsoname\-biblioteki\fP\fB potrzebnej dla \fP\fIpliku_binarnego\fP\fB (RPATH to "\fP\fIrpath\fP\fB")\fP
+The \fIbinary\fP uses a library called \fIlibrary\-soname\fP but \fBdpkg\-shlibdeps\fP
+has been unable to find the library.  \fBdpkg\-shlibdeps\fP creates a list of
+directories to check as following: directories listed in the RPATH of the
+binary, directories listed in /etc/ld.so.conf, directories listed in the
+LD_LIBRARY_PATH environment variable, and standard public directories (/lib,
+/usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks those
+directories in the package's build tree of the binary being analyzed, in the
+packages' build trees indicated with the \-S command\-line option, in other
+packages' build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file
+and finally in the root directory.  If the library is not found in any of
+those directories, then you get this error.
+
+Jeli nie odnaleziona biblioteka jest w prywatnym katalogu tego samego
+pakietu, naley doda taki katalog do LD_LIBRARY_PATH. Jeli biblioteka jest
+w innym budowanym binarnym pakiecie, naley upewni si, e plik shlibs lub
+plik symboli dla tego pakietu zosta stworzony oraz, e LD_LIBRARY_PATH
+zawiera odpowiedni katalog jeli biblioteka take jest w katalogu prywatnym.
+.TP 
+\fBnie znaleziono informacji o zalenociach dla \fP\fIplik\-biblioteki\fP\fB (uywanego przez \fP\fIplik\-binarny\fP\fB).\fP
+Biblioteka wymagana przez \fIplik\-binarny\fP zostaa znaleziona przez
+\fBdpkg\-shlibdeps\fP w \fIpliku\-biblioteki\fP, ale \fBdpkg\-shlibdeps\fP nie mg
+odnale adnej informacji o zalenociach dla tej biblioteki. Aby okreli
+zalenoci, podjto prb uycia \fBdpkg \-S\fP\fIplik\-biblioteki\fP w celu
+okrelenia pakietu dostarczajcego dan bibliotek. Nastpnie sprawdzono
+odpowiednie pliki shlibs i pliki symboli w /var/lib/dpkg/info/ oraz w
+rnych drzewach budowania pakietw (debian/*/DEBIAN/).
+
+To niepowodzenie moe by spowodowane przez niepoprawny lub nieistniejcy
+plik shlibs lub plik symboli w pakiecie biblioteki. Moe si rwnie zdarzy
+jeli biblioteka jest budowana wewntrz tego samego pakietu rdowego, a
+pliki shlibs jeszcze nie zostay stworzone (w takim przypadku naley
+poprawi debian/rules aby shlibs byy tworzone przed wywoaniem
+\fBdpkg\-shlibdeps\fP). Niewaciwa warto RPATH moe rwnie powodowa, e
+biblioteka zostanie odnaleziona pod nietypow nazw, ktra nie jest zwizana
+z adnym pakietem (np. /usr/lib/openoffice.org/../lib/libssl.so.0.9.8
+zamiast /usr/lib/libssl.so.0.9.8). \fBdpkg\-shlibdeps\fP prbuje poradzi sobie
+z tym starajc si odczyta nazw kanoniczn (z uyciem \fBrealpath\fP(3)) ale
+moe to nie zawsze zadziaa. Aby unikn problemw, najlepiej jest zawsze
+doprowadzi do porzdku RPATH pliku binarnego.
+
+Wywoanie \fBdpkg\-shlibdeps\fP w trybie rozszerzonej informacji (\-v) dostarcza
+wielu dodatkowych informacji o tym, gdzie prbowa on znale informacj o
+zalenociach. Moe to by przydatne jeli nie wiadomo dlaczego zwracany
+jest ten bd.
+.SH "ZOBACZ TAKE"
+\fBdeb\-shlibs\fP(5), \fBdeb\-symbols\fP(5), \fBdpkg\-gensymbols\fP(1).
+.
+.SH AUTORZY
+Copyright \(co 1995\-1996 Ian Jackson
+.br
+Copyright \(co 2000 Wichert Akkerman
+.br
+Copyright \(co 2006 Frank Lichtenheld
+.br
+Copyright \(co 2007\-2008 Rapha\[:e]l Hertzog
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-split.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-split.1
--- dpkg/man/pl/dpkg-split.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-split.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,184 @@
+.\" Authors: Ian Jackson
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-split 1 2011\-07\-04 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+dpkg\-split \- narzdzie dzielenia/czenia pakietw Debiana
+.
+.SH SKADNIA
+\fBdpkg\-split\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH OPIS
+\fBdpkg\-split\fP dzieli pakiety binarne Debiana na mniejsze czci oraz scala
+je z powrotem, tak e moliwe jest przechowanie wikszych pakietw na maych
+nonikach, takich jak dyskietki.
+
+Program wywouje si rcznie, wraz z opcj \fB\-\-split\fP, \fB\-\-join\fP lub
+\fB\-\-info\fP.
+
+Moliwe jest take wywoanie automatyczne, przez uycie opcji
+\fB\-\-auto\fP. Wtedy to tworzona jest kolejka czci pakietu, a gdy wszystkie
+czci bd dostpne, cay pakiet zostanie odtworzony. Opcje \fB\-\-listq\fP i
+\fB\-\-discard\fP pozwalaj na zarzdzanie kolejk.
+
+Wszystkie dziaania, takie jak rozdzielanie, czenie, czy kolejkowanie,
+powoduj wywietlenie informacji na standardowe wyjcie. Informacje te mona
+zignorowa.
+.
+.SH POLECENIA
+.TP 
+\fB\-s\fP, \fB\-\-split\fP \fIkompletne\-archiwum\fP [\fIprzedrostek\fP]
+Rozdzielenie pojedynczego pakietu binarnego na poszczeglne czci.
+
+Czci maj nazw \fIprzyrostek\fP\fB.\fP\fIN\fP\fBof\fP\fIM\fP\fB.deb\fP gdzie \fIN\fP jest
+numerem czci, rozpoczynajc od 1, a \fIM\fP jest liczb wszystkich czci
+(dziesitnie).
+
+Jeli nie podano \fIprzedrostka\fP, to uyta jest nazwa pliku
+\fIpenego\-archiwum\fP, wraz z katalogiem, gdy jest okrelony. Ponadto usunita
+jest kocwka \fB.deb\fP.
+.TP 
+\fB\-j\fP, \fB\-\-join\fP \fIpart\fP...
+czenie czci pakietu i odtworzenie oryginalnego pliku sprzed dzielenia.
+
+Pliki podane jako argumenty musz by czciami tego samego oryginalnego
+pakietu. Kada cz musi pojawi si raz na licie argumentw, ale nie jest
+konieczne zachowanie waciwej kolejnoci.
+
+Czci musz by wygenerowane z uyciem tego samego rozmiaru, co oznacza, e
+musz to by te same czci utworzone za pomoc polecenia \fBdpkg\-split
+\-\-split\fP.
+
+Nazwy plikw czci nie maj znaczenia dla procesu odtworzenia pakietu.
+
+By default the output file is called
+\fIpackage\fP\fB_\fP\fIversion\fP\fB_\fP\fIarch\fP\fB.deb\fP.
+
+.TP 
+\fB\-I\fP, \fB\-\-info\fP \fIpart\fP...
+Wywietlanie informacji, podanych w formacie czytelnym dla czowieka, o
+czciach pakietu. Argumenty, ktre nie s czci pakietu, powoduj
+wywietlenie informacji o tym fakcie na standardowym wyjciu.
+.TP 
+\fB\-a\fP, \fB\-\-auto \-o\fP \fIpene\-archiwum cz\fP
+Automatyczne kolejkowanie czci i odtworzenie pakietu, gdy to jest moliwe.
+
+Podana \fIcz\fP zostaje sprawdzona i porwnana z innymi czciami tego
+samego pakietu, ktre znajduj si w kolejce.
+
+Jeli wszystkie czci pakietu s ju dostpne, pakiet jest odtwarzany i
+zapisywany do \fIpenego\-archiwum\fP.
+
+Jeli jeszcze nie ma wszystkich czci, podana \fIcz\fP jest kopiowana do
+kolejki i \fIpene\-archiwum\fP nie jest odtwarzane.
+
+If \fIpart\fP is not a split binary package part then \fBdpkg\-split\fP will exit
+with status \fB1\fP; if some other trouble occurs then it will exit with status
+\fB2\fP.
+
+Opcja \fB\-\-output\fP lub \fB\-o\fP musi zosta podana w przypadku uycia
+\fB\-\-auto\fP. (W przeciwnym razie program nie wiedziaby, jakiego spodziewa
+si pliku wyjciowego.)
+.TP 
+\fB\-l\fP, \fB\-\-listq\fP
+Listowanie zawartoci kolejki czci pakietu do odtworzenia.
+
+Dla kadego pliku czci pakietu wywietlana jest nazwa pakietu, cz w
+kolejce, cakowita liczba bajtw przechowywanych w kolejce.
+.TP 
+\fB\-d\fP, \fB\-\-discard\fP [\fIpakiet\fP...]
+Usuwa czci pakietu z kolejki.
+
+Jeli nie podano nazwy \fIpakietu\fP, czyszczona jest caa kolejka. Gdy nazwa
+jest podana, usuwane s tylko czci podanego pakietu.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH OPCJE
+.TP 
+\fB\-\-depotdir\fP\fI katalog\fP
+Okrelenie alternatywnego katalogu dla kolejki czci pakietw do
+zrekonstruowania. Domylnym jest \fB/var/lib/dpkg\fP.
+.TP 
+\fB\-S\fP, \fB\-\-partsize\fP \fIkibibajty\fP
+Okrelenie maksymalnego rozmiaru czci pakietu w kibibajtach (KiB, 1024
+bajtw). Wartoci domyln jest 450 KiB.
+.TP 
+\fB\-o\fP, \fB\-\-output\fP \fIpene\-archiwum\fP
+Okrelenie nazwy pliku penego archiwum.
+
+Ta opcja nadpisuje domyln nazw przy odtwarzaniu pakietu (\fB\-\-join\fP) oraz
+jest wymagana przy automatycznym odtwarzaniu pakietu (\fB\-\-auto\fP).
+.TP 
+\fB\-Q\fP, \fB\-\-npquiet\fP
+Gdy wykonywane jest automatyczne czenie czci pakietu, \fBdpkg\-split\fP
+zwykle wywietla informacje o bdzie, gdy dany plik \fIczci\fP nie jest
+czci pakietu. Ta opcja zapobiega wywietlaniu nadmiernej iloci
+informacji przez programy takie jak \fBdpkg\fP.
+.TP 
+\fB\-\-msdos\fP
+Pliki generowane przez \fB\-\-split\fP s zapisywane w formacie odczytywanym
+przez MSDOS.
+
+Zmieniany jest przedrostek, zarwno ten domylny jak i ten podany w
+argumencie: litery s zamieniane na mae, znak plusa zamieniany jest na
+\fBx\fP, a pozostae znaki s pomijane.
+
+Powstay przedrostek jest ucinany do niezbdnego rozmiaru. Powstaa nazwa ma
+posta \fIprzedrostekN\fP\fBof\fP\fIM\fP\fB.deb..\fP
+.
+.SH "KOD WYJCIA"
+.TP 
+\fB0\fP
+The requested split, merge, or other command succeeded.  \fB\-\-info\fP commands
+count as successful even if the files are not binary package parts.
+.TP 
+\fB1\fP
+Only occurs with \fB\-\-auto\fP and indicates that the \fIpart\fP file was not a
+binary package part.
+.TP 
+\fB2\fP
+Some kind of trouble happened, 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.
+.
+.SH BDY
+Pobranie penej informacji o pakietach w kolejce jest niemoliwe, bez
+przeszukania katalogu kolejki.
+
+Nie ma prostego testu na sprawdzenie, czy dany plik jest na pewno czci
+pakietu.
+.
+.SH PLIKI
+.TP 
+\fI/var/lib/dpkg/parts\fP
+Domylny katalog kolejki czci pakietw czekajcych na automatyczne
+odtworzenie.
+
+Nazwy plikw w tym katalogu s wewntrznie utworzone przez \fBdpkg\-split\fP i
+nie s uyteczne dla innych programw.
+.
+.SH "ZOBACZ TAKE"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\-deb\fP(1), \fBdpkg\fP(1).
+.
+.SH AUTOR
+Copyright \(co 1995\-1996 Ian Jackson
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-statoverride.8 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-statoverride.8
--- dpkg/man/pl/dpkg-statoverride.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-statoverride.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,102 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-statoverride 8 2011\-07\-04 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+dpkg\-statoverride \- nadpisywanie waciciela i praw plikw
+.
+.SH SKADNIA
+\fBdpkg\-statoverride\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH OPIS
+\fBNadpisania stanu\fP s sposobem nakazania programowi \fBdpkg\fP(1) uycie
+innego waciciela i trybu pliku podczas instalacji pakietu. (Uwaga: uyem
+tu sowa "plik", ale tak naprawd moe to by dowolny obiekt systemu plikw,
+ktrym zarzdza dpkg, np. katalogi czy urzdzenia). Mona ich uy do
+zmuszenia programw, ktre s zazwyczaj instalowane z flag setuid, by byy
+zainstalowane bez tej flagi lubby byy moliwe do wykonania tylko przez
+pewn grup uytkownikw.
+.P
+\fBdpkg\-statoverride\fP jest narzdziem uytkowym do zarzdzania list nadpisa
+stanu. Ma trzy podstawowe funkcje: dodawania, usuwania i wywietlania listy
+takich nadpisa.
+.
+.SH POLECENIA
+.TP 
+\fB\-\-add\fP\fI uytkownik grupa tryb plik\fP
+Dodaje nadpisanie dla \fIpliku\fP. Sam \fIplik\fP nie musi istnie w czasie
+wykonania tego polecenia, nadpisanie bdzie przechowane i uyte
+pniej. Uytkownikw i grupy mona podawa uywajc albo ich nazw (na
+przykad \fBroot\fP lub \fBnobody\fP), albo ich numeru poprzedzonego znakiem
+"\fB#\fP" (na przykad \fB#0\fP lub \fB#65534\fP). Natomiast \fItryb\fP musi by podany
+jako liczba semkowa.
+
+Jeeli podano opcj \-\-update i \fIplik\fP istnieje, to nowy waciciel i prawa
+zostan od razu ustawione.
+.TP 
+\fB\-\-remove\fP \fIplik\fP
+Usuwa nadpisanie \fIpliku\fP. Polecenie to nie zmienia stanu \fIpliku\fP.
+.TP 
+\fB\-\-list\fP [\fIwzorzec\-glob\fP]
+Wywietla wszystkie napisania. Jeeli podano wzorzec nazwy, to wyjciowa
+lista bdzie zawiera tylko nadpisania pasujce do tego wzorca. Jeeli nie
+ma adnych nadpisa lub adne nadpisanie nie pasuje do wzorca, to
+\fBdpkg\-statoverride\fP zakoczy dziaanie z kodem bdu 1.
+.TP 
+\fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH OPCJE
+.TP 
+\fB\-\-admindir\fP\fI katalog\fP
+Zmienia \fIkatalog\fP bazy danych dpkg, w ktrym take jest przechowywany plik
+statoverride. Domylnie jest to \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-\-force\fP
+Wymusza podan akcj, nawet jeeli sprawdzenia dokonywane przez program by
+tego zabroniy. Jest to potrzebne, aby nadpisa istniejce nadpisanie.
+.TP 
+\fB\-\-update\fP
+Od razy prbuje zmieni waciciela i prawa pliku, jeeli ten plik istnieje.
+.TP 
+\fB\-\-quiet\fP
+Wywietla mniej komunikatw o podejmowanych przez program akcjach.
+.
+.SH RODOWISKO
+.TP 
+\fBDPKG_ADMINDIR\fP
+If set and the \fB\-\-admindir\fP option has not been specified, it will be used
+as the dpkg data directory.
+.
+.SH PLIKI
+.TP 
+\fI/var/lib/dpkg/statoverride\fP
+Plik zawierajcy obecn list nadpisa stanu w systemie. Zlokalizowany jest
+w katalogu administracyjnym dpkg, cznie z innymi plikami wanymi dla dpkg,
+takimi jak "status" lub "available".
+.br
+Uwaga: przed zastpieniem pliku now wersj, \fBdpkg\-statoverride\fP zachowuje
+star kopi w pliku z rozszerzeniem "\-old".
+.
+.SH "ZOBACZ TAKE"
+\fBdpkg\fP(1).
+.
+.SH AUTOR
+Copyright \(co 2000 Wichert Akkerman
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-trigger.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-trigger.1
--- dpkg/man/pl/dpkg-trigger.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-trigger.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,77 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-trigger 1 2011\-08\-14 "Projekt Debiana" "uytki dpkg"
+.SH NAZWA
+dpkg\-trigger \- program pomocniczy wyzwalaczy dla pakietw
+.
+.SH SKADNIA
+\fBdpkg\-trigger\fP [\fIopcja\fP...] \fInazwa\-wyzwalacza\fP
+.br
+\fBdpkg\-trigger\fP [\fIopcja\fP...] \fIpolecenie\fP
+.
+.SH OPIS
+\fBdpkg\-trigger\fP jest narzdziem, ktre pozwala jawnie aktywowa wyzwalacze
+oraz sprawdza wsparcie dla nich w uruchomionym \fBdpkg\fP.
+.PP
+Moe by uyte przez skrypty opiekuna pakietu w sytuacjach zoonych i
+oboonych warunkami, gdy wyzwalacze plikowe lub dyrektywy \fBactivate\fP z
+pliku kontrolnego triggers s niewystarczajce. Moe by rwnie uyte do
+testowania oraz przez administratorw systemu (prosz zauway, e same
+wyzwalacze nie bd uruchamiane przez \fBdpkg\-trigger\fP).
+.PP
+Nierozpoznana skadnia nazwy wyzwalacza stanowi bd dla \fBdpkg\-trigger\fP.
+.
+.SH POLECENIA
+.TP 
+\fB\-\-check\-supported\fP
+Check if the running \fBdpkg\fP supports triggers (usually called from a
+postinst). Will exit \fB0\fP if a triggers\-capable \fBdpkg\fP has run, or \fB1\fP
+with an error message to stderr if not. Normally, however, it is better just
+to activate the desired trigger with \fBdpkg\-trigger\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH OPCJE
+.TP 
+\fB\-\-admindir=\fP\fIkatalog\fP
+Zmienia pooenie bazy danych \fBdpkg\fP. Domylnie jest to \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-\-by\-package=\fP\fIpakiet\fP
+Override trigger awaiter (normally set by \fBdpkg\fP through the
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP environment variable of the maintainer scripts,
+naming the package to which the script belongs, and this will be used by
+default).
+.TP 
+\fB\-\-no\-await\fP
+Ta opcja zapewnia, e wywoujcy pakiet T (jeli jest) nie potrzebuje
+oczekiwa na przetworzenie tego wyzwalacza. Tzw. "zainteresowane" pakiet(y)
+I nie bd dodane do listy pakietw oczekujcych na przetworzenie wyzwalacza
+dla T, a status T nie zostanie zmieniony. Mona uwaa T za zainstalowany,
+mimo e pakiet(y) I wyzwalacz mg jeszcze nie zosta przetworzony.
+.TP 
+\fB\-\-no\-act\fP
+ Tylko test \- bez wykonywania adnych zmian.
+.
+.SH RODOWISKO
+.TP 
+\fBDPKG_ADMINDIR\fP
+If set and the \fB\-\-admindir\fP option has not been specified, it will be used
+as the dpkg data directory.
+.
+.SH "ZOBACZ TAKE"
+\fBdpkg\fP(1), \fBdeb\-triggers\fP(5), \fB/usr/share/doc/dpkg\-dev/triggers.txt.gz\fP.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dpkg-vendor.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-vendor.1
--- dpkg/man/pl/dpkg-vendor.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dpkg-vendor.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,65 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-vendor 1 2011\-07\-04 "Projekt Debiana" "uytki dpkg"
+.SH NAZWA
+dpkg\-vendor \- odczytuje informacj o twrcach dystrybucji
+.
+.SH SKADNIA
+\fBdpkg\-vendor\fP [\fIopcja\fP...] \fIpolecenie\fP
+.
+.SH OPIS
+\fBdpkg\-vendor\fP jest narzdziem pozwalajcym na odczytywanie informacji o
+twrcach wymienionych w \fB/etc/dpkg/origins\fP. \fB/etc/dpkg/origins/default\fP
+zawiera informacje dotyczce aktualnego twrcy.
+.
+.SH POLECENIA
+.TP 
+\fB\-\-is\fP\fI twrca\fP
+Exits with \fB0\fP if the current vendor is \fIvendor\fP. Otherwise exits with
+non\-zero.
+.TP 
+\fB\-\-derives\-from\fP\fI twrca\fP
+Exits with \fB0\fP if the current vendor distribution is a derivative of
+\fIvendor\fP, otherwise exits with non\-zero. It uses the "Parent" field to
+browse all ancestors of the current vendor.
+.TP 
+\fB\-\-query\fP\fI pole\fP
+Wywietla na standardowym wyjciu warto okrelonego \fIpola\fP odczytanego z
+informacji dotyczcych aktualnego twrcy.
+.TP 
+\fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH OPCJE
+.TP 
+\fB\-\-vendor\fP\fI twrca\fP
+Assumes the current vendor is \fIvendor\fP instead of discovering it with the
+\fBDEB_VENDOR\fP environment variable or \fB/etc/dpkg/origins/default\fP.
+.
+.SH RODOWISKO
+.TP 
+\fBDEB_VENDOR\fP
+Ustawienie okrelajce aktualnego twrc. Jeli nie jest ustawione, aktualny
+twrca zostanie okrelony poprzez odczytanie z \fB/etc/dpkg/origins/default\fP.
+.
+.SH AUTOR
+Copyright \(co 2009 Rapha\[:e]l Hertzog
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dselect.1 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dselect.1
--- dpkg/man/pl/dselect.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dselect.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,455 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dselect 1 2011\-08\-14 "Projekt Debiana" Debian
+.SH NAZWA
+dselect \- konsolowe narzdzie zarzdzania pakietami Debiana
+.
+.SH SKADNIA
+\fBdselect\fP [\fIoption\fP...] [\fIaction\fP]
+.
+.SH OPIS
+\fBdselect\fP
+jest jednym z podstawowych narzdzi uytkownika do zarzdzania
+pakietami Debiana. Z gwnego menu programu \fBdselect\fP administrator systemu moe:
+ \- zaktualizowa list dostpnych pakietw,
+ \- wywietli stan zainstalowanych i dostpnych wersji pakietw,
+ \- wybiera pakiety i zarzdza zalenociami,
+ \- zainstalowa nowe pakiety lub zaktualizowa pakiety do nowszych wersji.
+.PP
+\fBdselect\fP jest nakadk na polecenie \fBdpkg(1)\fP, niskopoziomowe narzdzie
+zarzdzania pakietami Debiana. Jego podstawow zalet jest menader
+penoekranowego wyboru pakietw z moliwoci znajdowania zalenoci midzy
+nimi i rozwizywania konfliktw. Program uruchomiony z prawami
+administratora daje moliwo instalowania, aktualizowania oraz usuwania
+pakietw. Mona skonfigurowa rnorodne metody dostpu, za ktrych pomoc
+mona cign z repozytorium pakietw zarwno informacje o dostpnych
+wersjach pakietw, jak i same pakiety do zainstalowania. W zalenoci od
+metody dostpu repozytoria te mog si znajdowa na publicznych
+serwerach\-archiwach w Internecie, lokalnych serwerach z archiwami lub na
+CD\-ROM\-ach. Zalecan metod dostpu jest metoda \fIapt\fP, dostarczana przez
+pakiet \fBapt\fP.
+.PP
+Normally \fBdselect\fP 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 command line
+parameters are still available to modify the running behaviour of \fBdselect\fP
+or show additional information about the program.
+.
+.SH OPCJE
+All options can be specified both on the command line and in the \fBdselect\fP
+configuration file \fI/etc/dpkg/dselect.cfg\fP or the files on the
+configuration directory \fI/etc/dpkg/dselect.cfg.d/\fP. 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 \fB#\fP).
+.br
+.TP 
+\fB\-\-admindir\fP\fI katalog\fP
+Zmienia katalog zawierajcy pliki "\fIstatus\fP" ,"\fIavailable\fP" i inne
+potrzebne programowi \fBdpkg\fP. Domylnym katalogiem jest \fI/var/lib/dpkg\fP i
+zazwyczaj nie powinno by potrzeby zmieniania go na inny.
+.TP 
+\fB\-\-debug\fP\fI file \fP|\fI \fP\fB\-D\fP\fIfile\fP
+Turn on debugging. Debugging information is sent to \fIfile\fP.
+.TP 
+\fB\-\-expert\fP
+Wcza tryb dowiadczonego uytkownika i na przykad nie wywietla mczcych
+informacji z pomoc.
+.TP 
+\fB\-\-colour\fP|\fB\-\-color\fP \fIcz_ekranu:\fP[\fIpierwszoplan\fP],[\fIto\fP][\fI:atr\fP[\fI+atr+..\fP]]
+Ustawia kolory ekranu. Dziaa tylko pod warunkiem, e terminal obsuguje
+kolory. Ta opcja moe zosta uyta wiele razy (i najlepiej jej uywa w
+\fIdselect.cfg\fP). Kade uycie zmienia kolor (i opcjonalnie inne atrybuty)
+jakiej czci ekranu. Czci ekranu s nastpujce (od gry do dou):
+.RS
+.TP 
+\fBtitle\fP
+Tytu ekranu.
+.TP 
+\fBlisthead\fP
+Linia nagwka nad list pakietw.
+.TP 
+\fBlist\fP
+Przewijana lista pakietw (i rwnie niektre teksty pomocy).
+.TP 
+\fBlistsel\fP
+Podwietlony element z listy.
+.TP 
+\fBpkgstate\fP
+W licie pakietw \- tekst oznaczajcy obecny stan kadego pakietu.
+.TP 
+\fBpkgstatesel\fP
+W licie pakietw \- tekst oznaczajcy obecny stan podwietlonego pakietu.
+.TP 
+\fBinfohead\fP
+Linia nagwka, w ktrej wywietlony jest stan obecnie zaznaczonego pakietu.
+.TP 
+\fBinfodesc\fP
+Krtki opis pakietu.
+.TP 
+\fBinfo\fP
+Uywane do wywietlania informacji o pakiecie takich jak jego opis.
+.TP 
+\fBinfofoot\fP
+Ostatnia linia ekranu z wyborem pakietw.
+.TP 
+\fBquery\fP
+Uywane do wywietlania linii zapyta.
+.TP 
+\fBhelpscreen\fP
+Kolor ekranw pomocy.
+.RE
+.P
+Po czci ekranu nastpuje dwukropek i specyfikacja koloru. Mona okreli
+kolor czcionek, kolor ta albo oba te kolory, uniewaniajc domylne
+wartoci kolorw. Naley uywa standardowych nazw kolorw z biblioteki
+curses.
+.P
+Opcjonalnie, po specyfikacji kolorw mona doda jeszcze jeden dwukropek, a
+po nim opis atrybutw. Jest to lista zawierajca jeden lub wicej atrybutw
+oddzielonych znakami plusa ("+"). Dostpne atrybuty (nie wszystkie dziaaj
+na wszystkich terminalach) to: normal (normalny), standout (wyrniony),
+underline (podkrelony), reverse (odwrcony), blink (migajcy), bright
+(jasny), dim (ciemny), bold (pogrubiony).
+.TP 
+\fB\-\-help\fP
+Wywietla krtk informacj o pomocy i pomylnie koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH AKCJE
+When \fBdselect\fP is started it can perform the following actions, either
+directly if it was specified on the command line or by prompting the user
+with a menu of available actions if running interactively:
+.SS "access (dostp)"
+Wybiera metod dostpu uywan do znalezienia repozytorium pakietw.
+.sp
+By default, \fBdselect\fP provides several methods such as \fIcdrom\fP,
+\fImulti_cd\fP, \fInfs\fP, \fImulti_nfs\fP, \fIharddisk\fP, \fImounted\fP, \fImulti_mount\fP,
+\fIfloppy\fP or \fIftp\fP, but other packages may provide additional methods,
+eg. the \fIapt\fP access method provided by the \fBapt\fP package.
+.sp
+Zalecane jest uywanie metody \fIapt\fP.
+.sp
+.SS "update (aktualizacja)"
+Aktualizuje baz dostpnych pakietw.
+.sp
+ciga list dostpnych wersji pakietw z repozytorium pakietw,
+skonfigurowanego za pomoc wybranej metody dostpu, i aktualizuje baz
+pakietw programu dpkg. Listy pakietw s zwyczajowo zawarte w repozytorium
+w plikach nazwanych \fIPackages\fP lub \fIPackages.gz\fP. Pliki te mog zosta
+wygenerowane przez opiekunw repozytoriw za pomoc programu
+\fBdpkg\-scanpackages\fP(1).
+.sp
+Szczegy aktualizacji zale od implementacji metody dostpu. Zazwyczaj ten
+proces jest bardzo prosty i nie wymaga interakcji z uytkownikiem.
+.sp
+.SS "select (wybr)"
+Wywietla informacje o wyborze pakietw i zalenociach oraz zarzdza nimi.
+.sp
+Jest to gwna funkcja programu \fBdselect\fP. W ekranie wyboru pakietw
+uytkownik moe przeglda list dostpnych i zainstalowanych
+pakietw. Jeeli program dziaa z uprawnieniami administratora, moliwe jest
+interaktywne zmienianie stanu pakietw. \fBdselect\fP ledzi wpyw tych zmian
+na pakiety zalene.
+.sp
+Jeli zostanie wykryty konflikt lub niespeniona zaleno, wywietlany jest
+ekran rozwizywania zalenoci pokazujcy list pakietw, powodujcych
+konflikt lub niespenion zaleno i dla kadego wywietlonego pakietu \-
+przyczyn, dla ktrej jest on wywietlony. Uytkownik moe zastosowa si do
+sugestii zaproponowanych przez \fBdselect\fP, uniewani je lub wycofa si ze
+zmian, wczajc w to pakiety, ktre spowodoway niespenione zalenoci lub
+konflikty.
+.sp
+Uywanie ekrany do zarzdania interaktywnym wyborem pakietw jest
+szczegowo wyjnione poniej.
+.sp
+.SS "install (instalacja)"
+Instaluje wybrane pakiety.
+.sp
+Za pomoc skonfigurowanej metody dostpu zostan z odpowiednich repozytoriw
+pobrane pakiety do zainstalowania lub zaktualizowania za pomoc programu
+\fBdpkg\fP. Zalenie od implementacji tej metody dostpu, pakiety mog zosta
+pobrane wczeniej \- przed instalacj \- lub wtedy, gdy bd
+potrzebne. Niektre metody dostpu rwnie usuwaj pakiety zaznaczone do
+usunicia.
+.sp
+Jeeli podczas instalacji wystpi bd, poleca si uruchomienie akcji
+install jeszcze raz. W wikszoci przypadkw, problemy same znikn lub
+zostan rozwizane. Jeli problem pozostaje lub przeprowadzona instalacja
+bya nieprawidowa, prosimy o zbadanie przyczyn problemu i okolicznoci jego
+wystpienia i o wysanie reportu o bdzie do systemu ledzenia bdw
+Debiana. Instrukcje, jak to zrobi, mona znale pod adresem
+http://bugs.debian.org/ albo w dokumentacji programw \fBbug\fP(1) lub
+\fBreportbug\fP(1), jeeli s zainstalowane.
+.sp
+Szczegy dotyczce akcji instalacji zale od implementacji metody
+dostpu. Podczas instalacji, konfiguracji czy usuwania pakietw moe by
+potrzebna interakcja z uytkownikiem. Zaley to od skryptw opiekuna
+pakietu. Niektre pakiety uywaj biblioteki \fBdebconf\fP(1), co pozwala na
+bardziej elastyczn lub nawet w peni automatyczn instalacj pakietu.
+.sp
+.SS "config (konfigurowanie)"
+Konfiguruje wszystkie pakiety poprzednio zainstalowane, ale nie do koca
+skonfigurowane.
+.sp
+.SS "remove (usuwanie)"
+Usuwa lub czyci te zainstalowane pakiety, ktre s zaznaczone do usunicia.
+.sp
+.SS "quit (wyjcie)"
+Wyjcie z \fBdselect\fP.
+.sp
+Wychodzi z programu z zerowym kodem bdu (pomylnie).
+.sp
+.
+.SH "Zarzdzanie wyborem pakietw"
+.sp
+.SS Wstp
+.sp
+\fBdselect\fP odkrywa przed administratorem niektre zoonoci wice si z
+zarzdzaniem duym zbiorem pakietw z wieloma zalenociami midzy nimi. Dla
+uytkownika, ktry nie jest zaznajomiony z koncepcjami Debianowego systemu
+zarzdzania pakietami, moe to by bardzo przytaczajce. Chocia celem
+programu \fBdselect\fP jest uatwienie zarzdzania i administrowania pakietami,
+jest on tylko instrumentem sucym do tego i nie moe w wystarczajcym
+stopniu zastpi umiejtnoci i wiedzy administratora. Uytkownik powinien
+by zaznajomiony z koncepcjami lecymi u podstaw systemu pakietw
+Debiana. W razie jakichkolwiek wtpliwoci, naley je sprawdzi w
+podrczniku \fBdpkg\fP(1) oraz w podrczniku "Zasady polityki Debiana" zawartym
+w pakiecie \fBdebian\-policy\fP.
+.sp
+Jeeli \fBdselect\fP nie by uruchomiony w trybie eksperta (expert) lub trybie
+pilnym (immediate), to po wybraniu akcji z menu, wywietlany jest ekran
+pomocy. Uytkownik \fIpowinien\fP dokadnie przeczyta wszystkie informacje
+zawarte w ekranach pomocy, kiedy si pojawiaj. Ekrany pomocy mog zosta
+wywietlone w dowolnym momencie przez wybranie klawisza \fB"?"\fP.
+.sp
+.SS "Ukad ekranu"
+.sp
+Ekran wyboru pakietw domylnie podzielony jest na grn i doln poow. W
+grnej poowie wywietlona jest lista pakietw. Za pomoc paska wyboru mona
+wybra pojedynczy pakiet lub grup pakietw, przez zaznaczenie nagwka
+grupy pakietw. W dolnej poowie ekranu pokazane s szczegowe informacje
+na temat pakietu obecnie wybranego w grnej poowie ekranu. Typ tych
+informacji moe by rny.
+.sp
+Nacinicie klawisza \fB"I"\fP przecza pomidzy penoekranowym widokiem
+pakietw, powikszonym widokiem szczegowych informacji o pakiecie albo
+dzieli ekran na poow.
+.sp
+.SS "Widok szczegowych informacji o pakiecie"
+.sp
+W widoku szczegowych informacji o pakiecie domylnie wywietlony jest rozszerzony
+opis pakietu obecnie wybranego w licie pakietw.
+Typ tych informacji moe by zmieniony za pomoc klawisza \fB"i"\fP. Moliwe wybory s
+nastpujce:
+ \- poszerzony opis
+ \- informacja o zainstalowanej wersji pakietu
+ \- informacja o dostpnej wersji pakietu
+.sp
+Ekran rozwizywania zalenoci daje take moliwo podejrzenia okrelonych
+niespenionych zalenoci bd konfliktw zwizanych z pakietem, tj. tych
+zalenoci, ktre spowodoway wylistowanie tego pakietu.
+.sp
+.SS "Lista stanw pakietw"
+.sp
+W gwnym ekranie wyboru pakietw wywietlona jest lista wszystkich pakietw
+znanych systemowi zarzdzania pakietami Debiana. S to zarwno pakiety
+zainstalowane w systemie, jak i pakiety zawarte w bazie dostpnych pakietw.
+.sp
+Dla kadego pakietu pokazane s: jego stan, priorytet, sekcja, numer wersji
+zainstalowanej i numer wersji dostpnej, nazwa pakietu oraz krtki opis \-
+wszystko w jednej linii. Naciskajc klawisz \fB"V"\fP, mona wcza i wycza
+wywietlanie informacji o numerze zainstalowanej i dostpnej wersji
+pakietu. Nacinicie klawisza \fB"v"\fP powoduje przeczanie pomidzy
+wywietlaniem rozwlekego i skrconego opisu stanu pakietu. Skrcony opis
+stanu jest wywietlany domylnie.
+.sp
+Na skrcony opis stanu pakietu skadaj si cztery czci: flaga bdu,
+ktra normalnie powinna by czysta, obecny stan zainstalowania pakietu,
+poprzedni stan wyboru pakietu oraz obecny stan wyboru pakietu. Dwie pierwsze
+czci s zwizane z obecnym stanem pakietu, kolejne dwie \- zwizane z
+wyborami dokonanymi przez uytkownika.
+.sp
+Oznaczenia uywane w skrconym opisie stanu pakietu s nastpujce:
+ Flaga bdu:
+  \fIpusty\fP   bez bdu;
+  \fBR\fP       powany bd, pakiet wymaga reinstalacji;
+ Stan instalacji:
+  \fIpusty\fP   nie zainstalowany;
+  \fB*\fP       w peni zainstalowany i skonfigurowany;
+  \fB\-\fP       nie zainstalowany, ale mogy pozosta pliki konfiguracyjne;
+  \fBU\fP       rozpakowany, ale jeszcze nie skonfigurowany;
+  \fBC\fP       w poowie skonfigurowany (wystpi bd);
+  \fBI\fP       w poowie zainstalowany (wystpi bd).
+ Obecne i dane wybory:
+  \fB*\fP       zaznaczony do zainstalowania lub zaktualizowania;
+  \fB\-\fP       zaznaczony do usunicia z pozostawieniem plikw konfig.;
+  \fB=\fP       wstrzymany: pakiet nie bdzie przetwarzany;
+  \fB_\fP       zaznaczony do usunicia i wyczyszczenia plikw konfig.;
+  \fBn\fP       pakiet jest nowy i jeszcze nie by znaczony.
+.sp
+.SS "Przesuwanie kursora i ekranu"
+.sp
+Ekran wyboru pakietw oraz ekran rozwizywania zalenoci mona przesuwa
+uywajc polece przypisanych do nastpujcych klawiszy:
+.br
+  \fBp, Up, k\fP           przesunicie paska kursora w gr
+  \fBn, Down, j\fP         przesunicie paska kursora w d
+  \fBP, Pgup, Backspace\fP przesunicie listy 1 stron w gr
+  \fBN, Pgdn, Space\fP     przesunicie listy 1 stron w d
+  \fB^p\fP                 przesunicie listy 1 lini w gr
+  \fB^n\fP                 przesunicie listy 1 lini w d
+  \fBt, Home\fP            skok na pocztek listy
+  \fBe, End\fP             skok na koniec listy
+  \fBu\fP                  przesunicie informacji 1 stron w gr
+  \fBd\fP                  przesunicie informacji 1 stron w d
+  \fB^u\fP                 przesunicie informacji 1 lini w gr
+  \fB^d\fP                 przesunicie informacji 1 lini w d
+  \fBB, Left\-arrow\fP      przesunicie ekranu o 1/3 ekranu w lewo
+  \fBF, Right\-arrow\fP     przesunicie ekranu o 1/3 ekranu w prawo
+  \fB^b\fP                 przesunicie ekranu o 1 znak w lewo
+  \fB^f\fP                 przesunicie ekranu o 1 znak w prawo
+.sp
+.SS "Wyszukiwanie i sortowanie"
+.sp
+List pakietw mona przeszukiwa po nazwie pakietu. Mona to zrobi,
+przyciskajc \fB"/"\fP i wpisujc tekst wyszukiwania, ktry jest interpretowany
+jako wyraenie regularne \fBregex\fP(7). Dodanie \fB"/d"\fP do acucha
+wyszukiwania, spowoduje przeszukiwanie rwnie opisw. Dodanie \fB"/i"\fP
+spowoduje ignorowanie wielkoci znakw podczas wyszukiwania. Mona czy te
+sufiksy, na przykad tak: \fB"/id"\fP. Powtrne wyszukiwanie nastpuje przez
+wielokrotne naciskanie klawiszy \fB"n"\fP lub \fB"\e"\fP, a do znalezienia
+poszukiwanego pakietu. Po osigniciu koca listy, poszukiwanie jest
+kontynuowane od pocztku listy.
+.sp
+Porzdek sortowania listy mona zmienia przez wielokrotne naciskanie
+klawiszy \fB"o"\fP i \fB"O"\fP.
+Mona wybra jeden z dziewiciu nastpujcych porzdkw sortowania:
+ alfabetyczny      dostpny            stan
+ priorytet+sekcja  dostpny+priorytet  stan+priorytet
+ sekcja+priorytet  dostpny+sekcja     stan+sekcja
+.br
+Tam gdzie nie jest to powyej wyranie powiedziane, porzdek alfabetyczny
+jest uywany jako klucz podwyszukiwania.
+.sp
+.SS "Zmienianie wyboru pakietw"
+.sp
+dany stan wyboru indywidualnych pakietw mona zmieni
+za pomoc nastpujcych polece:
+  \fB+, Insert\fP    instalacja lub aktualizacja
+  \fB=, H\fP         wstrzymanie pakietu w obecnym stanie i wersji
+  \fB:, G\fP         zaprzestanie wstrzymania: aktualizacja pakietu lub pozostawienie go jako niezainstalowanego
+  \fB\-, Delete\fP    usunicie, ale z zostawieniem plikw konfiguracyjnych
+  \fB_\fP            usunicie z wyczyszczeniem plikw konfiguracyjnych
+.sp
+Kiedy w wyniku zmian powstaj jedna lub wicej niespenionych zalenoci
+albo konflikty, \fBdselect\fP wywietla uytkownikowi ekran rozwizywania
+zalenoci. Bdzie on objaniony nieco pniej.
+.sp
+Powysze polecenia mona zastosowa rwnie do grup pakietw \- przez
+ustawienie paska kursora na nagwku grupy. Sposb grupowania pakietw
+zaley od ustawie sortowania listy pakietw.
+.sp
+Naley zachowa naleyt ostrono, zmieniajc due grupy pakietw,
+poniewa moe to oznacza natychmiastowe utworzenie duej liczby
+niespenionych zalenoci i konfliktw, bardzo trudnej do rozwizania. W
+praktyce tylko operacje wstrzymania i zaprzestania wstrzymania s uyteczne
+w odniesieniu do grup pakietw.
+.sp
+.SS "Rozwizywanie zalenoci i konfliktw"
+.sp
+Kiedy w wyniku zmian powstaj jedna lub wicej niespenionych zalenoci
+albo konflikty, \fBdselect\fP wywietla uytkownikowi ekran rozwizywania
+zalenoci. Najpierw, jednake, wywietlany jest ekran pomocy.
+.sp
+W grnej poowie ekranu rozwizywania zalenoci wywietlone s wszystkie te
+pakiety, ktre w wyniku zastosowania danych przez uytkownika zmian
+miayby niespenione zalenoci albo konflikty, oraz wszystkie te pakiety,
+ktrych instalacja speniaby ktre z tych zalenoci, lub ktrych
+usunicie rozwizaoby konflikty. W dolnej poowie wywietlone s te
+zalenoci lub konflikty, ktre spowodoway, e obecnie wybrany pakiet
+zosta umieszczony na licie.
+.sp
+Wywietlajc pocztkow podlist pakietw, \fBdselect\fP mg ustawi ju pewne
+dane wybory niektrych spord wylistowanych pakietw, w celu rozwizania
+zalenoci lub konfliktw, ktre byy przyczyn wywietlenia ekranu
+rozwizywania zalenoci. Zazwyczaj najlepszym wyjciem jest zastosowanie
+si do sugestii zrobionych przez \fBdselect\fP.
+.sp
+Moliwe jest przywrcenie stanu wyborw wylistowanych pakietw do
+poprzednich ustawie, zanim zostay stworzone nierozwizane zalenoci lub
+konflikty \- przez nacinicie klawisza \fB"R"\fP. Naciskajc klawisz \fB"D"\fP,
+spowodujemy odznaczenie automatycznych propozycji i jest przy tym
+zachowywana zmiana, ktra spowodowaa wywietlenie ekranu rozwizywania
+zalenoci. W kocu, po naciniciu klawisza \fB"U"\fP wybory s ponownie
+ustawiane na sugerowane wartoci.
+.sp
+.SS "Ustanawianie danych wyborw pakietw"
+.sp
+Po naciniciu klawisza \fBenter\fP, obecnie wywietlony zbir wyborw zostaje
+zaakceptowany. Jeeli \fBdselect\fP nie wykryje niespenionych zalenoci
+powstaych w wyniku zaakceptowania danych wyborw, to zostan one
+ustawione. Jednake, jeeli bd nierozwizane zalenoci, to \fBdselect\fP
+ponownie wywietli ekran rozwizywania zalenoci.
+.sp
+Aby zmieni zbir wyborw, ktry powoduje powstanie nierozwizanych
+zalenoci i zmusi \fBdselect\fP do zaakceptowania go, naley nacisn klawisz
+\fB"Q"\fP. Spowoduje to bezwarunkowe ustawienie wyborw podanych przez
+uytkownika. Oglnie, nie naley tego robi.
+.sp
+Aby uzyska przeciwny efekt \- wycofanie si ze wszystkich zmian i powrcenie
+do poprzedniej listy wyborw, naley nacisn klawisze \fB"X"\fP lub
+\fBescape\fP. Przez powtarzajce si przyciskanie tych klawiszy mona wycofa
+si ze wszystkich potencjalnie szkodliwych zmian w wyborze pakietw a do
+ostatniego dobrego ustawienia.
+.sp
+Jeeli pewne ustawienia przez pomyk zostay wczone i istnieje potrzeba
+wycofania tych zmian i zmienienia ustawie na takie, jakie s obecnie w
+systemie, naley uy przycisku \fB"C"\fP. Jest to troch podobne do polecenia
+unhold wydanego na wszystkich pakietach, ale dostarcza bardziej oczywistego
+sposobu dziaania w sytuacji, gdy uytkownik nacisn \fBEnter\fP przez
+pomyk.
+.sp
+.
+.SH RODOWISKO
+.TP 
+\fBHOME\fP
+If set, \fBdselect\fP will use it as the directory from which to read the user
+specific configuration file.
+.
+.SH BDY
+Dla nowych uytkownikw, \fBdselect\fP moe by trudny do opanowania. Podobno
+zmusza do paczu nawet wytrawnych wsptwrcw jdra Linuksa.
+.sp
+Dokumentacja jest wybrakowana.
+.sp
+Brak opcji "pomoc" w gwnym menu.
+.sp
+Nie mona ograniczy listy dostpnych pakietw.
+.sp
+Wbudowane metody dostpu nie s zgodne z obecnymi standardami
+jakoci. Naley uywa metody apt, ktra nie tylko nie jest zepsuta, ale
+take jest o wiele bardziej elastyczna ni metody wbudowane.
+.
+.SH "ZOBACZ TAKE"
+\fBdpkg\fP(1), \fBapt\-get\fP(8), \fBsources.list\fP(5), \fBdeb\fP(5).
+.
+.SH AUTORZY
+\fBdselect\fP was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list
+of contributors may be found in 'dselect \-\-version'.
+.br
+Podrcznik napisali Juho Vuori <javuori@cc.helsinki.fi>, Josip Rodin
+i Joost kooij.
+
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/dselect.cfg.5 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dselect.cfg.5
--- dpkg/man/pl/dselect.cfg.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/dselect.cfg.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,37 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dselect.cfg 5 2011\-07\-03 "Projekt Debiana" "uytki dpkg"
+.SH NAZWA
+dselect.cfg \- plik konfiguracyjny programu dselect
+.
+.SH OPIS
+This file contains default options for dselect. Each line contains a single
+option which is exactly the same as a normal command line option for dselect
+except for the leading dashes which are not used here. Quotes surrounding
+option values are stripped. Comments are allowed by starting a line with a
+hash sign ("\fB#\fP").
+.
+.SH PLIKI
+\fI/etc/dpkg/dselect.cfg.d/[0\-9a\-zA\-Z_\-]*\fP
+.br
+\fI/etc/dpkg/dselect.cfg\fP
+.br
+\fI~/.dselect.cfg\fP
+.
+.SH AUTOR
+Patrz plik \fI/usr/share/doc/dpkg/THANKS.gz\fP zawierajcy list osb, ktre
+przyczyniy si do rozwoju programu \fBdselect\fP.
+.
+.SH "ZOBACZ TAKE"
+\fBdselect\fP(1).
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/pl/update-alternatives.8 /home/vorlon/devel/multiarch/dpkg-debian/man/pl/update-alternatives.8
--- dpkg/man/pl/update-alternatives.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/pl/update-alternatives.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,417 @@
+.\" update\-alternatives.8
+.\" This man page is copyright 1997 Charles Briscoe-Smith
+.\" This is free documentation; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published
+.\" by the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.  There is NO WARRANTY.  You can
+.\" find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH update\-alternatives 8 2011\-08\-14 "Projekt Debiana" "programy pomocnicze dpkg"
+.SH NAZWA
+update\-alternatives \- zarzdzanie dowizaniami symbolicznymi okrelajcymi
+domylne polecenia
+.
+.SH SKADNIA
+\fBupdate\-alternatives\fP [\fIoption\fP...] \fIcommand\fP
+.
+.SH OPIS
+\fBupdate\-alternatives\fP tworzy, usuwa, wywietla informacje o dowizaniach
+symbolicznych skadajcych si na system alternatyw Debiana oraz nimi
+zarzdza.
+.PP
+Kilka programw majcych t sam lub podobn funkcjonalno moe zosta
+zainstalowanych w systemie w tym samym czasie. Na przykad w wielu systemach
+jest zainstalowanych jednoczenie kilka edytorw tekstu. Stanowi to
+uatwienie dla uytkownikw takiego systemu, z ktrych kady moe uruchomi
+inny edytor, jeli ma na to ochot. Z drugiej strony jest to jednak
+utrudnienie dla programw chccych podj waciw decyzj, ktry edytor
+uruchomi, jeeli uytkownik nie okreli swoich preferencji co do edytora.
+.PP
+Celem systemu alternatyw Debiana jest rozwizanie tego problemu. Oglna
+nazwa w systemie plikw jest wspdzielona przez wszystkie pliki
+dostarczajce zmieniajc si funkcjonalno. System alternatyw oraz
+administrator systemu okrelaj, do ktrego obecnego pliku prowadzi ta
+oglna nazwa. Na przykad, jeeli zainstalowano zarwno edytor \fBed\fP(1) jak
+i \fBnvi\fP(1), to system alternatyw spowoduje, e nazwa oglna
+\fI/usr/bin/editor\fP bdzie si odnosi do \fI/usr/bin/nvi\fP. Administrator
+systemu moe zmieni to ustawienie na \fI/usr/bin/ed\fP, a system alternatyw
+tego nie zmieni, chyba e administrator kae mu tak zrobi.
+.PP
+Nazwa oglna nie jest bezporednim dowizaniem symbolicznym do wybranej
+alternatywy, ale jest dowizaniem do pliku w \fIkatalogu\fP \fIalternatyw\fP,
+ktre z kolei jest dowizaniem do waciwego pliku. Jest tak zrobione
+dlatego, eby zmiany wprowadzane przez administratora systemu byy
+ograniczone do katalogu \fI/etc\fP: standard FHS wymienia powody, aby tak
+zrobi.
+.PP
+Kiedy pakiet dostarczajcy pliku o okrelonej funkcjonalnoci jest
+instalowany, zmieniany lub usuwany, wywoywany jest program
+\fBupdate\-alternatives\fP, aby zaktualizowa informacje o tym pliku w systemie
+alternatyw. \fBupdate\-alternatives\fP jest zazwyczaj wywoywany ze skryptw
+\fBpostinst\fP (configure) lub \fBprerm\fP (install) w pakietach Debiana.
+.PP
+Czsto uyteczne jest, aby pewna liczba alternatyw bya zsynchronizowana,
+tak eby bya zmieniana jako grupa. Na przykad jeeli jest zainstalowane
+kilka wersji edytora \fBvi\fP(1), to strona podrcznika
+\fI/usr/share/man/man1/vi.1\fP powinna odpowiada wersji programu
+zainstalowanego jako \fI/usr/bin/vi\fP. \fBupdate\-alternatives\fP obsuguje to
+przy pomocy dowiza \fIgwnych\fP i \fIpodrzdnych\fP \- zmiana dowizania
+gwnego powoduje zmian skojarzonych dowiza podrzdnych. Dowizanie
+gwne i skojarzone z nim dowizania podrzdne tworz \fIgrup\fP \fIdowiza\fP.
+.PP
+Kada grupa dowiza jest zawsze w jednym z dwch trybw: automatycznym lub
+rcznym. W trybie automatycznym podczas instalacji lub usuwania pakietu
+system alternatyw automatycznie zdecyduje, czy i jak aktualizowa
+dowizania. W trybie rcznym system alternatyw nie bdzie zmienia dowiza
+i zostawi wszystkie decyzje administratorowi systemu.
+.PP
+Grupa dowiza jest trybie automatycznym, kiedy jest po raz pierwszy
+wprowadzana do systemu. Jeeli administrator systemu wprowadzi zmiany do
+automatycznych ustawie, bd one wzite pod uwag podczas nastpnego
+uruchomienia \fBupdate\-alternatives\fP na takiej zmienionej grupie dowiza, a
+grupa ta automatycznie przejdzie w tryb rczny.
+.PP
+Z kad alternatyw skojarzony jest \fIpriorytet\fP. Jeeli grupa dowiza jest
+w trybie automatycznym, to wybran alternatyw bdzie ta, ktra ma najwyszy
+priorytet.
+.PP
+When using the \fB\-\-config\fP option, \fBupdate\-alternatives\fP will list all of
+the choices for the link group of which given \fIname\fP is the master
+alternative name. The current choice is marked with a '*'.  You will then be
+prompted for your choice regarding this link group.  Depending on the choice
+made, the link group might no longer be in \fIauto\fP mode. You will need to
+use the \fB\-\-auto\fP option in order to return to the automatic mode (or you
+can rerun \fB\-\-config\fP and select the entry marked as automatic).
+.PP
+If you want to configure non\-interactively you can use the \fB\-\-set\fP option
+instead (see below).
+.PP
+Rne pakiety dostarczajce tych samych plikw powinny \fBwsppracowa\fP ze
+sob w tym zakresie. Oznacza to, e uywanie programu \fBupdate\-alternatives\fP
+jest \fBobowizkowe\fP dla wszystkich takich pakietw \- nie jest moliwe
+nadpisanie pewnych plikw w pakiecie, ktry nie uywa mechanizmu
+\fBupdate\-alternatives\fP.
+.
+.SH TERMINOLOGIA
+Poniewa operacje programu \fBupdate\-alternatives\fP s do zoone, poniej
+podane s terminy, ktre pomog je zrozumie.
+.TP 
+nazwa oglna (lub dowizanie alternatywy)
+Nazwa, taka jak \fI/usr/bin/editor\fP, ktra odnosi si przez system alternatyw
+do jednego z kilku plikw o podobnej funkcjonalnoci.
+.TP 
+nazwa alternatywy
+Nazwa dowizania symbolicznego w katalogu alternatyw.
+.TP 
+alternatywa (lub cieka alternatywy)
+Nazwa okrelonego pliku w systemie plikw, ktry w systemie alternatyw moe
+by dostpny przez nazw ogln.
+.TP 
+katalog alternatyw
+Katalog zawierajcy dowizania symboliczne, domylnie \fI/etc/alternatives\fP.
+.TP 
+katalog administracyjny
+Katalog zawierajcy informacje o stanie \fBupdate\-alternatives\fP, domylnie
+\fI/var/lib/dpkg/alternatives\fP.
+.TP 
+grupa dowiza
+Zbir powizanych dowiza symbolicznych, zarzdzany jako grupa.
+.TP 
+dowizanie gwne
+Dowizanie alternatywy w grupie dowiza, ktre okrela sposb
+konfigurowania innych dowiza z tej grupy.
+.TP 
+dowizanie podrzdne
+Dowizanie alternatywy w grupie dowiza, ktre jest kontrolowane przez
+ustawienie gwnego dowizania.
+.TP 
+tryb automatyczny
+Kiedy grupa dowiza jest w trybie automatycznym, system alternatyw zapewni,
+e dowizania z tej grupy wskazuj na alternatyw o najwyszym priorytecie.
+.TP 
+tryb rczny
+Kiedy grupa dowiza jest w trybie rcznym, system alternatyw nic nie zmieni
+w ustawieniach wprowadzonych przez administratora systemu.
+.
+.SH POLECENIA
+.TP 
+\fB\-\-install\fP \fIdowizanie nazwa cieka priorytet\fP [\fB\-\-slave\fP \fIdowizanie nazwa cieka\fP]...
+Dodaje grup alternatyw do systemu. \fIdowizanie\fP jest ogln nazw gwnego
+dowizania, \fInazwa\fP jest nazw dowizania symbolicznego w katalogu
+alternatyw, a \fIcieka\fP jest wprowadzan alternatyw dla gwnego
+dowizania. Argumentami opcji \fB\-\-slave\fP s nazwa oglna, nazwa dowizania
+symbolicznego w katalogu alternatyw i cieka alternatywy dla dowizania
+podrzdnego. Mona poda zero lub wicej opcji \fB\-\-slave\fP, po kadej musz
+nastpowa jej trzy argumenty. Naley zauway, e gwna alternatywa musi
+istnie, inaczej wywoanie si nie powiedzie. Jednak jeli nie bdzie
+istnie podrzdna alternatywa, odpowiednie dowizanie podrzdne po prostu
+nie zostanie zainstalowane (ale nadal bdzie wywietlane ostrzeenie). Jeli
+w miejscu gdzie powinno by zainstalowane dowizanie alternatywy istnieje
+rzeczywisty plik, jest on zachowywany, chyba e uyta jest opcja \fB\-\-force\fP.
+.IP
+Jeeli okrelona nazwa alternatywy ju istnieje w systemie alternatyw, to
+podana informacja bdzie dodana jako nowy zbir alternatyw dla tej grupy. W
+przeciwnym wypadku zostanie utworzona nowa grupa, ustawiona w tryb
+automatyczny. Jeeli grupa jest w trybie automatycznym, a priorytet nowo
+dodawanych alternatyw jest wikszy od priorytetu kadej z innych
+zainstalowanych alternatyw w tej grupie, to dowizania symboliczne bd
+zaktualizowane tak, eby prowadziy do nowo dodanych alternatyw.
+.TP 
+\fB\-\-set\fP \fInazwa cieka\fP
+Set the program \fIpath\fP as alternative for \fIname.\fP This is equivalent to
+\fB\-\-config\fP but is non\-interactive and thus scriptable.
+.TP 
+\fB\-\-remove\fP \fInazwa cieka\fP
+Usuwa alternatyw i wszystkie dowizania podrzdne z ni
+skojarzone. \fInazwa\fP jest nazw w katalogu alternatyw, \fIcieka\fP jest
+absolutn nazw pliku, do ktrej \fInazwa\fP mogaby by dowizaniem. Jeeli
+\fInazwa\fP rzeczywicie jest dowizaniem do \fIcieki\fP, to \fInazwa\fP zostanie
+zaktualizowana, tak eby wskazywaa na inn odpowiedni alternatyw (za
+grupa jest ustawiana ponownie w tryb automatyczny), albo zostanie usunita
+jeeli nie pozostanie ani jedna alternatywa. Skojarzone dowizania podrzdne
+zostan odpowiednio zaktualizowane lub usunite. Jeeli dowizanie nie
+prowadzi obecnie do \fIcieki\fP, to adne dowizania nie bd aktualizowane;
+zostanie tylko usunita informacja o alternatywie.
+.TP 
+\fB\-\-remove\-all\fP \fInazwa\fP
+Usuwa wszystkie dowizania alternatyw i wszystkie skojarzone z nimi
+dowizania podrzdne. \fInazwa\fP jest nazw w katalogu alternatyw.
+.TP 
+\fB\-\-all\fP
+Wywouje \fB\-\-config\fP dla wszystkich alternatyw. Mona to uytecznie poczy
+z \fB\-\-skip\-auto\fP aby przejrze i skonfigurowa wszystkie alternatywy, ktre
+nie s skonfigurowane w tryb automatyczny. Wywietlane s rwnie
+nieaktualne alternatywy. Dlatego prostym sposobem naprawienia uszkodzonych
+alternatyw jest wywoanie \fByes \[aq]\[aq] | update\-alternatives \-\-force
+\-\-all\fP.
+.TP 
+\fB\-\-auto\fP \fInazwa\fP
+Przecza grup dowiza dla alternatywy w tryb automatyczny. Podczas tego
+procesu, gwne dowizanie wraz z jego dowizaniami podrzdnymi bd
+zaktualizowane tak, aby wskazywa na alternatyw o najwyszym priorytecie.
+.TP 
+\fB\-\-display\fP \fInazwa\fP
+Wywietla informacje o grupie dowiza. Informacje te zawieraj tryb grupy
+(automatyczny lub rczny), okrelaj na ktr alternatyw obecnie wskazuje
+dowizanie gwne, jakie s inne dostpne alternatywy (i odpowiadajce im
+alternatywy podrzdne) oraz obecnie zainstalowan alternatyw o najwyszym
+priorytecie.
+.TP 
+\fB\-\-get\-selections\fP
+Wywietla wszystkie nazwy gwnych alternatyw (kontrolujcych grup
+dowiza) oraz ich status. Kada linia zawiera do 3 pl (rozdzielonych co
+najmniej jedn spacj). Pierwsze pole okrela nazw alternatywy, drugie pole
+to status ("auto" lub "manual"), za ostatnie pole zawiera biecy wybr dla
+alternatywy (uwaga: jest to nazwa pliku i moe zawiera znaki spacji).
+.TP 
+\fB\-\-set\-selections\fP
+Wczytuje konfiguracj alternatyw ze standardowego wejcia w formacie
+wygenerowanym przez \fBupdate\-alternatives \-\-get\-selections\fP i odpowiednio je
+rekonfiguruje.
+.TP 
+\fB\-\-query\fP \fInazwa\fP
+Wywietla informacj o grupie dowiza tak jak \-\-display, ale w sposb
+odpowiedni dla maszynowego parsowania (dokadniejszy opis poniej, w sekcji
+\fBFORMAT ZAPYTANIA\fP).
+.TP 
+\fB\-\-list\fP \fInazwa\fP
+Wywietla wszystkie cele w grupie dowiza.
+.TP 
+\fB\-\-config\fP \fInazwa\fP
+Wywietla dostpne alternatywy w grupie dowiza i pozwala uytkownikowi
+interakcyjnie wybra, ktrej naley uy. Grupa dowiza zostanie
+odpowiednio zaktualizowana.
+.TP 
+\fB\-\-help\fP
+Wywietla informacj o uytkowaniu i koczy dziaanie.
+.TP 
+\fB\-\-version\fP
+Wywietla informacj o wersji i pomylnie koczy dziaanie.
+.
+.SH OPCJE
+.TP 
+\fB\-\-altdir\fP\fI katalog\fP
+Okrela katalog alternatyw, jeeli ma by inny ni domylny.
+.TP 
+\fB\-\-admindir\fP\fI katalog\fP
+Okrela katalog administracyjny, jeeli ma by inny ni domylny.
+.TP 
+\fB\-\-log\fP\fI plik\fP
+Specifies the log file, when this is to be different from the default
+(/var/log/alternatives.log).
+.TP 
+\fB\-\-force\fP
+Let \fBupdate\-alternatives\fP replace or drop any real file that is installed
+where an alternative link has to be installed or removed.
+.TP 
+\fB\-\-skip\-auto\fP
+Pomija pytania o konfiguracj alternatyw, ktre s waciwie skonfigurowane
+w trybie automatycznym. Ta opcja ma znaczenie tylko przy \fB\-\-config\fP lub
+\fB\-\-all\fP.
+.TP 
+\fB\-\-verbose\fP
+Podaje wicej informacji o przebiegu wykonywania \fBupdate\-alternatives\fP.
+.TP 
+\fB\-\-quiet\fP
+Nie wywietla adnych komentarzy, chyba e wystpi bd.
+.
+.SH RODOWISKO
+.TP 
+\fBDPKG_ADMINDIR\fP
+If set and the \fB\-\-admindir\fP option has not been specified, it will be used
+as the base administrative directory.
+.
+.SH PLIKI
+.TP 
+\fI/etc/alternatives/\fP
+Domylny katalog alternatyw. Mona go zmieni opcj \fB\-altdir\fP.
+.TP 
+\fI/var/lib/dpkg/alternatives/\fP
+Domylny katalog administracyjny. Mona go zmieni opcj \fB\-admindir\fP.
+.
+.SH "KOD WYJCIA"
+.TP 
+\fB0\fP
+Akcja zakoczya si powodzeniem.
+.TP 
+\fB2\fP
+Wystpiy problemy podczas przetwarzania linii polece lub wykonywania
+akcji.
+.
+.SH "FORMAT ZAPYTANIA"
+The \fBupdate\-alternatives \-\-query\fP format is using an RFC822\-like flat
+format. It's made of \fIn\fP + 1 blocks where \fIn\fP is the number of
+alternatives available in the queried link group. The first block contains
+the following fields:
+.TP 
+\fBLink:\fP\fI link\fP
+Nazwa oglna alternatywy.
+.TP 
+\fBStatus:\fP\fI status\fP
+Status alternatywy (\fBauto\fP lub \fBmanual\fP).
+.TP 
+\fBBest:\fP\fI best\-choice\fP
+cieka najlepszej alternatywy dla tej grupy dowiza. Nie jest wywietlana,
+jeli nie ma dostpnych adnych alternatyw.
+.TP 
+\fBValue:\fP\fI currently\-selected\-alternative\fP
+cieka aktualnie wybranej alternatywy. Moe rwnie przyjmowa specjaln
+warto \fBnone\fP \- jest ona uywana jeli dowizanie nie istnieje.
+.TP 
+.TP 
+Inne bloki opisuj dostpne alternatywy w grupie dowiza, do ktrej odnosi si zapytanie:
+.TP 
+\fBAlternative:\fP\fI path\-of\-this\-alternative\fP
+cieka do alternatywy opisywanej w tym bloku.
+.TP 
+\fBPriority:\fP\fI priority\-value\fP
+Warto priorytetu alternatywy.
+.TP 
+\fBSlaves:\fP\fI list\-of\-slaves\fP
+Gdy obecny jest ten nagwek, \fBnastpne\fP linie zawieraj wszystkie
+podrzdne alternatywy zwizane z gwnym dowizaniem alternatywy. W kadej
+linii podana jest jedna podrzdna alternatywa. Kada linia zawiera jedn
+spacj, ogln nazw alternatywy podrzdnej, kolejn spacj i w kocu
+ciek do alternatywy podrzdnej.
+.
+.TP 
+\fBPrzykad\fP
+.nf
+$ update\-alternatives \-\-query editor
+Link: editor
+Status: auto
+Best: /usr/bin/vim.gtk
+Value: /usr/bin/vim.gtk
+
+Alternative: /bin/ed
+Priority: \-100
+Slaves:
+ editor.1.gz /usr/share/man/man1/ed.1.gz
+
+Alternative: /usr/bin/vim.gtk
+Priority: 50
+Slaves:
+ editor.1.gz /usr/share/man/man1/vim.1.gz
+ editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz
+ editor.pl.ISO8859\-2.1.gz /usr/share/man/pl.ISO8859\-2/man1/vim.1.gz
+ editor.it.ISO8859\-1.1.gz /usr/share/man/it.ISO8859\-1/man1/vim.1.gz
+ editor.pl.UTF\-8.1.gz /usr/share/man/pl.UTF\-8/man1/vim.1.gz
+ editor.it.1.gz /usr/share/man/it/man1/vim.1.gz
+ editor.fr.UTF\-8.1.gz /usr/share/man/fr.UTF\-8/man1/vim.1.gz
+ editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz
+ editor.it.UTF\-8.1.gz /usr/share/man/it.UTF\-8/man1/vim.1.gz
+ editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz
+ editor.fr.ISO8859\-1.1.gz /usr/share/man/fr.ISO8859\-1/man1/vim.1.gz
+.fi
+.
+.SH DIAGNOSTYKA
+With \fB\-\-verbose\fP \fBupdate\-alternatives\fP chatters incessantly about its
+activities on its standard output channel.  If problems occur,
+\fBupdate\-alternatives\fP 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.
+.
+.SH PRZYKADY
+Istnieje klika pakietw, ktre dostarczaj edytora tekstu kompatybilnego z
+edytorem \fBvi\fP, na przykad \fBnvi\fP i \fBvim\fP. To, ktry pakiet bdzie
+uywany, kontrolowane jest przez grup dowiza \fBvi\fP, zawierajc
+dowizania do samego programu i odpowiadajcych mu stron podrcznika.
+.PP
+To display the available packages which provide \fBvi\fP and the current
+setting for it, use the \fB\-\-display\fP action:
+.RS
+.PP
+\fBupdate\-alternatives \-\-display vi\fP
+.RE
+.PP
+Aby wybra okrelon implementacj edytora \fBvi\fP, naley uy tego polecenia
+jako uytkownik root i wybra liczb z listy:
+.RS
+.PP
+\fBupdate\-alternatives \-\-config vi\fP
+.RE
+.PP
+Aby przywrci automatyczne wybieranie implementacji programu \fBvi\fP, naley
+jako uytkownik root wykona:
+.RS
+.PP
+\fBupdate\-alternatives \-\-auto vi\fP
+.RE
+.
+.SH BDY
+W razie znalezienia bdu, prosimy o jego zgoszenie, uywajc systemu
+ledzenia bdw Debiana.
+.PP
+Rozbienoci pomidzy dziaaniem \fBupdate\-alternatives\fP a t stron
+podrcznika stanowi albo bd w implementacji, albo w dokumentacji. W razie
+znalezienia jakichkolwiek rozbienoci, prosimy o ich zgoszenie.
+.
+.SH AUTORZY
+Copyright \(co 1995 Ian Jackson
+.br
+Copyright \(co 2009 Rapha\[:e]l Hertzog
+.sp
+Niniejszy program jest oprogramowaniem wolnym, sprawd Powszechn Licencj
+Publiczn GNU w wersji drugiej lub pniejszej, by dowiedzie si o
+warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.PP
+Copyright tej strony podrcznika: 1997,1998 Charles Briscoe\-Smith i inni.
+.sp
+To jest wolna dokumentacja, sprawd Powszechn Licencj Publiczn GNU w
+wersji drugiej lub pniejszej, by dowiedzie si o warunkach
+dystrybucji. Brak JAKIEJKOLWIEK gwarancji.
+.
+.SH "ZOBACZ TAKE"
+\fBln\fP(1), FHS \- standard hierarchii systemu plikw.
+.SH "TUMACZE"
+Piotr Roszatycki <dexter@debian.org>, 1999
+.br
+Bartosz Feski <fenio@debian.org>, 2004-2005
+.br
+Robert Luberda <robert@debian.org>, 2006-2008
+.br
+Wiktor Wandachowicz <siryes@gmail.com>, 2008
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/de.po /home/vorlon/devel/multiarch/dpkg-debian/man/po/de.po
--- dpkg/man/po/de.po	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/de.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2011-05-06 17:59+0000\n"
-"PO-Revision-Date: 2011-05-06 20:24+0200\n"
+"POT-Creation-Date: 2011-11-25 11:22+0100\n"
+"PO-Revision-Date: 2011-09-18 09:42+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "Language: \n"
@@ -23,10 +23,17 @@
 msgstr "deb"
 
 #. type: TH
-#: deb.5:1
+#: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-version.5:5 deb-old.5:1
+#: deb-override.5:15 deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg-buildpackage.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-trigger.1:1
+#: dselect.1:1 update-alternatives.8:8
 #, no-wrap
-msgid "2009-02-27"
-msgstr "2009-02-27"
+msgid "2011-08-14"
+msgstr "2011-08-14"
 
 #. type: TH
 #: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-split.5:1 deb-version.5:5
@@ -97,15 +104,15 @@
 #: deb.5:6 deb-control.5:10 deb-src-control.5:10 deb-split.5:6
 #: deb-version.5:11 deb-old.5:8 deb-override.5:22 deb-extra-override.5:8
 #: deb-shlibs.5:20 deb-substvars.5:9 deb-symbols.5:9 deb-triggers.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildflags.1:9
+#: dpkg.1:19 dpkg-architecture.1:10 dpkg.cfg.5:5 dpkg-buildflags.1:9
 #: 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-deb.1:9 dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
 #: dpkg-gensymbols.1:10 dpkg-maintscript-helper.1:15 dpkg-mergechangelogs.1:9
 #: dpkg-name.1:16 dpkg-parsechangelog.1:9 dpkg-query.1:9
-#: dpkg-scanpackages.1:28 dpkg-scansources.1:14 dpkg-shlibdeps.1:11
-#: dpkg-source.1:11 dpkg-split.1:11 dpkg-statoverride.8:10 dpkg-trigger.1:12
-#: dpkg-vendor.1:9 dselect.1:17 dselect.cfg.5:5 start-stop-daemon.8:10
-#: update-alternatives.8:17
+#: dpkg-scanpackages.1:27 dpkg-scansources.1:13 dpkg-shlibdeps.1:9
+#: dpkg-source.1:10 dpkg-split.1:10 dpkg-statoverride.8:9 dpkg-trigger.1:12
+#: dpkg-vendor.1:9 dselect.1:9 dselect.cfg.5:5 start-stop-daemon.8:9
+#: update-alternatives.8:16
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "BESCHREIBUNG"
@@ -257,15 +264,15 @@
 "Hauptversionsnummer erhöht wird."
 
 #. type: SH
-#: deb.5:79 deb-control.5:269 deb-src-control.5:325 deb-split.5:49
+#: deb.5:79 deb-control.5:271 deb-src-control.5:327 deb-split.5:49
 #: deb-version.5:116 deb-old.5:51 deb-override.5:62 deb-extra-override.5:37
-#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:49
-#: dpkg.1:768 dpkg-architecture.1:300 dpkg.cfg.5:23 dpkg-buildpackage.1:249
-#: dpkg-deb.1:247 dpkg-divert.8:132 dpkg-gensymbols.1:445 dpkg-name.1:95
-#: dpkg-query.1:220 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:701 dpkg-split.1:218
-#: dpkg-statoverride.8:85 dpkg-trigger.1:66 dselect.1:452 dselect.cfg.5:23
-#: update-alternatives.8:509
+#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:67
+#: dpkg.1:768 dpkg-architecture.1:299 dpkg.cfg.5:23 dpkg-buildpackage.1:249
+#: dpkg-deb.1:259 dpkg-divert.8:132 dpkg-gensymbols.1:450 dpkg-name.1:96
+#: dpkg-query.1:220 dpkg-scanpackages.1:110 dpkg-scansources.1:71
+#: dpkg-shlibdeps.1:324 dpkg-source.1:725 dpkg-split.1:217
+#: dpkg-statoverride.8:84 dpkg-trigger.1:66 dselect.1:445 dselect.cfg.5:23
+#: update-alternatives.8:508
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
@@ -281,12 +288,6 @@
 msgid "deb-control"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-control.5:3 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
-#, no-wrap
-msgid "2010-07-29"
-msgstr "2010-07-29"
-
 #. type: Plain text
 #: deb-control.5:6
 msgid "deb-control - Debian packages' master control file format"
@@ -328,8 +329,8 @@
 #. type: TP
 #: deb-control.5:26
 #, no-wrap
-msgid "B<Package:> E<lt>package nameE<gt>"
-msgstr "B<Package:> E<lt>PaketnameE<gt>"
+msgid "B<Package:>I< package-name>"
+msgstr "B<Package:>I< Paketname>"
 
 #. type: Plain text
 #: deb-control.5:30
@@ -343,8 +344,8 @@
 #. type: TP
 #: deb-control.5:30
 #, no-wrap
-msgid "B<Version:> E<lt>version stringE<gt>"
-msgstr "B<Version:> E<lt>Versions-ZeichenketteE<gt>"
+msgid "B<Version:>I< version-string>"
+msgstr "B<Version:>I< Versions-Zeichenkette>"
 
 #. type: Plain text
 #: deb-control.5:37
@@ -362,8 +363,8 @@
 #. type: TP
 #: deb-control.5:37
 #, no-wrap
-msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgstr "B<Maintainer:> E<lt>Vollständiger Name E-MailE<gt>"
+msgid "B<Maintainer:>I< fullname-email>"
+msgstr "B<Maintainer:>I< Vollständiger-Name-und-E-Mail>"
 
 #. type: Plain text
 #: deb-control.5:42
@@ -379,13 +380,13 @@
 #. type: TP
 #: deb-control.5:42
 #, no-wrap
-msgid "B<Description:> E<lt>short descriptionE<gt>"
-msgstr "B<Description:> E<lt>KurzbeschreibungE<gt>"
+msgid "B<Description:>I< short-description>"
+msgstr "B<Description:>I< Kurzbeschreibung>"
 
 #. type: Plain text
 #: deb-control.5:45
-msgid "B< >E<lt>long descriptionE<gt>"
-msgstr "B< >E<lt>LangbeschreibungE<gt>"
+msgid "B< >I<long-description>"
+msgstr "B< >I<Langbeschreibung>"
 
 #. type: Plain text
 #: deb-control.5:51
@@ -410,10 +411,10 @@
 msgstr "OPTIONALE FELDER"
 
 #. type: TP
-#: deb-control.5:53 deb-src-control.5:88
+#: deb-control.5:53 deb-src-control.5:90
 #, no-wrap
-msgid "B<Section:> E<lt>sectionE<gt>"
-msgstr "B<Section:> E<lt>BereichE<gt>"
+msgid "B<Section:>I< section>"
+msgstr "B<Section:>I< Bereich>"
 
 #. type: Plain text
 #: deb-control.5:58
@@ -427,10 +428,10 @@
 "»net«, »mail«, »text«, »x11« usw."
 
 #. type: TP
-#: deb-control.5:58 deb-src-control.5:94
+#: deb-control.5:58 deb-src-control.5:96
 #, no-wrap
-msgid "B<Priority:> E<lt>priorityE<gt>"
-msgstr "B<Priority:> E<lt>PrioritätE<gt>"
+msgid "B<Priority:>I< priority>"
+msgstr "B<Priority:>I< Priorität>"
 
 #. type: Plain text
 #: deb-control.5:62
@@ -442,7 +443,7 @@
 "Prioritäten sind »required«, »standard«, »optional«, »extra« usw."
 
 #. type: Plain text
-#: deb-control.5:71 deb-src-control.5:107
+#: deb-control.5:71 deb-src-control.5:109
 msgid ""
 "In Debian, the B<Section> and B<Priority> fields have a defined set of "
 "accepted values based on the Policy Manual.  A list of these values can be "
@@ -454,20 +455,20 @@
 "erhalten werden."
 
 #. type: TP
-#: deb-control.5:71 deb-src-control.5:214
+#: deb-control.5:71 deb-src-control.5:216
 #, no-wrap
-msgid "B<Essential:> E<lt>yes|noE<gt>"
-msgstr "B<Essential:> E<lt>yes|noE<gt>"
+msgid "B<Essential:> B<yes>|B<no>"
+msgstr "B<Essential:> B<yes>|B<no>"
 
 #. type: Plain text
 #: deb-control.5:78
 msgid ""
-"This field is usually only needed when the answer is `yes'. It denotes a "
+"This field is usually only needed when the answer is B<yes>. It denotes a "
 "package that is required for proper operation of the system. Dpkg or any "
 "other installation tool will not allow an B<Essential> package to be removed "
 "(at least not without using one of the force options)."
 msgstr ""
-"Dieses Feld wird normalerweise nur benötigt, wenn die Antwort »yes« lautet. "
+"Dieses Feld wird normalerweise nur benötigt, wenn die Antwort B<yes> lautet. "
 "Es bezeichnet ein Paket, das für den ordnungsgemäßen Betrieb des Systems "
 "benötigt wird. Dpkg oder jedes andere Installationswerkzeug wird es nicht "
 "erlauben, ein B<Essential>-Paket zu entfernen (zumindestens nicht ohne die "
@@ -476,8 +477,8 @@
 #. type: TP
 #: deb-control.5:78
 #, no-wrap
-msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgstr "B<Architecture:> E<lt>arch|allE<gt>"
+msgid "B<Architecture:> I<arch>|B<all>"
+msgstr "B<Architecture:> I<arch>|B<all>"
 
 #. type: Plain text
 #: deb-control.5:86
@@ -495,10 +496,10 @@
 "Perl-Skripte und Dokumentation."
 
 #. type: TP
-#: deb-control.5:86 deb-src-control.5:83
+#: deb-control.5:86 deb-src-control.5:85
 #, no-wrap
-msgid "B<Origin:> E<lt>nameE<gt>"
-msgstr "B<Origin:> E<lt>NameE<gt>"
+msgid "B<Origin:>I< name>"
+msgstr "B<Origin:>I< Name>"
 
 #. type: Plain text
 #: deb-control.5:89
@@ -508,39 +509,38 @@
 #. type: TP
 #: deb-control.5:89 deb-src-control.5:66
 #, no-wrap
-msgid "B<Bugs:> E<lt>urlE<gt>"
-msgstr "B<Bugs:> E<lt>URLE<gt>"
+msgid "B<Bugs:>I< url>"
+msgstr "B<Bugs:>I< URL>"
 
 #. type: Plain text
-#: deb-control.5:93
+#: deb-control.5:94
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian.org>."
 msgstr ""
-"Die URL der Fehlerdatenbank für dieses Paket. Das derzeit verwendete Format "
-"ist B<E<lt>BTS_ArtE<gt>://E<lt>BTS_AdresseE<gt>> wie in B<debbugs://bugs."
-"debian.org>."
+"Die I<URL> der Fehlerdatenbank für dieses Paket. Das derzeit verwendete "
+"Format ist I<BTS-Art>B<://>I<BTS-Adresse> wie in B<debbugs://bugs.debian."
+"org>."
 
 #. type: TP
-#: deb-control.5:93 deb-src-control.5:62
+#: deb-control.5:94 deb-src-control.5:62
 #, no-wrap
-msgid "B<Homepage:> E<lt>urlE<gt>"
-msgstr "B<Homepage:> E<lt>URLE<gt>"
+msgid "B<Homepage:>I< url>"
+msgstr "B<Homepage:>I< URL>"
 
 #. type: Plain text
-#: deb-control.5:96 deb-src-control.5:65
-msgid "The upstream project home page URL."
-msgstr "Die URL des Original- (Upstream-)Projekts."
+#: deb-control.5:97
+msgid "The upstream project home page I<url>."
+msgstr "Die I<URL> des Original- (Upstream-)Projekts."
 
 #. type: TP
-#: deb-control.5:96 deb-src-control.5:220
+#: deb-control.5:97 deb-src-control.5:222
 #, no-wrap
-msgid "B<Tag:> E<lt>tag listE<gt>"
-msgstr "B<Tag:> E<lt>Liste von MarkierungenE<gt>"
+msgid "B<Tag:>I< tag-list>"
+msgstr "B<Tag:> I< Liste-von-Markierungen>"
 
 #. type: Plain text
-#: deb-control.5:100
+#: deb-control.5:101
 msgid ""
 "List of tags describing the qualities of the package. The description and "
 "list of supported tags can be found in the B<debtags> package."
@@ -550,45 +550,45 @@
 "Markierungen kann in dem Paket B<debtags> gefunden werden."
 
 #. type: TP
-#: deb-control.5:100
+#: deb-control.5:101 deb-src-control.5:219
 #, no-wrap
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt>"
-msgstr "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt>"
+msgid "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>"
+msgstr "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>"
 
 #. type: Plain text
-#: deb-control.5:111
+#: deb-control.5:113
 msgid ""
 "This field is used to indicate how this package should behave on a multi-"
-"arch installations. The value `same' means that the package is co-"
+"arch installations. The value B<same> means that the package is co-"
 "installable with itself, but it must not be used to satisfy the dependency "
-"of any package of a different architecture from itself. The value `foreign' "
+"of any package of a different architecture from itself. The value B<foreign> "
 "means that the package is not co-installable with itself, but should be "
 "allowed to satisfy the dependency of a package of a different arch from "
-"itself. The value `allowed` allows reverse-dependencies to indicate in their "
-"Depends field that they need a package from a foreign architecture, but has "
-"no effect otherwise. This field should not be present in packages with the "
-"Architecture: all field."
+"itself. The value B<allowed> allows reverse-dependencies to indicate in "
+"their Depends field that they need a package from a foreign architecture, "
+"but has no effect otherwise. This field should not be present in packages "
+"with the B<Architecture: all> field."
 msgstr ""
 "Das Feld wird dazu verwandt, anzugeben, wie sich dieses Paket in einer Multi-"
-"Arch-Installation verhalten soll. Der Wert »same« bedeutet, dass das Paket "
+"Arch-Installation verhalten soll. Der Wert B<same> bedeutet, dass das Paket "
 "mit sich selbst koinstallierbar ist, aber nicht dazu verwandt werden darf, "
 "die Abhängigkeit eines Pakets von einer anderen Architektur mit ihm selbst "
-"zu erfüllen. Der Wert »foreign« bedeutet, dass das Paket nicht mit sich "
+"zu erfüllen. Der Wert B<foreign> bedeutet, dass das Paket nicht mit sich "
 "selbst koinstallierbar ist, aber es erlaubt sein soll, die Abhängigkeit "
 "eines Pakets von einer anderen Architektur mit ihm selbst zu erfüllen. Der "
-"Wert »allowed« erlaubt es invers Abhängigen in ihrem Feld »Depends« "
+"Wert B<allowed> erlaubt es invers Abhängigen in ihrem Feld »Depends« "
 "anzuzeigen, dass sie ein Paket von einer fremden Architektur benötigen, hat "
 "aber ansonsten keinen Effekt. Dieses Feld sollte in Paketen mit dem Feld "
-"»Architecture: all« nicht verwandt werden."
+"B<Architecture: all> nicht verwandt werden."
 
 #. type: TP
-#: deb-control.5:111
+#: deb-control.5:113
 #, no-wrap
-msgid "B<Source:> E<lt>source nameE<gt>"
-msgstr "B<Source:> E<lt>Quell-NameE<gt>"
+msgid "B<Source:>I< source-name>"
+msgstr "B<Source:> I< Quell-Name>"
 
 #. type: Plain text
-#: deb-control.5:115
+#: deb-control.5:117
 msgid ""
 "The name of the source package that this binary package came from, if "
 "different than the name of the package itself."
@@ -597,25 +597,25 @@
 "vom Namen dieses Paketes unterscheidet."
 
 #. type: TP
-#: deb-control.5:116 deb-src-control.5:200
+#: deb-control.5:118 deb-src-control.5:202
 #, no-wrap
-msgid "B<Subarchitecture:> E<lt>valueE<gt>"
-msgstr "B<Subarchitecture:> E<lt>WertE<gt>"
+msgid "B<Subarchitecture:>I< value>"
+msgstr "B<Subarchitecture:> I< Wert>"
 
 #. type: TP
-#: deb-control.5:119 deb-src-control.5:203
+#: deb-control.5:121 deb-src-control.5:205
 #, no-wrap
-msgid "B<Kernel-Version:> E<lt>valueE<gt>"
-msgstr "B<Kernel-Version:> E<lt>WertE<gt>"
+msgid "B<Kernel-Version:>I< value>"
+msgstr "B<Kernel-Version:> I< Wert>"
 
 #. type: TP
-#: deb-control.5:122 deb-src-control.5:206
+#: deb-control.5:124 deb-src-control.5:208
 #, no-wrap
-msgid "B<Installer-Menu-Item:> E<lt>valueE<gt>"
-msgstr "B<Installer-Menu-Item:> E<lt>WertE<gt>"
+msgid "B<Installer-Menu-Item:>I< value>"
+msgstr "B<Installer-Menu-Item:> I< Wert>"
 
 #. type: Plain text
-#: deb-control.5:129 deb-src-control.5:213
+#: deb-control.5:131 deb-src-control.5:215
 msgid ""
 "These fields are used by the debian-installer and are usually not needed.  "
 "See /usr/share/doc/debian-installer/devel/modules.txt from the B<debian-"
@@ -626,13 +626,13 @@
 "aus dem Paket B<debian-installer> für weitere Informationen über sie."
 
 #. type: TP
-#: deb-control.5:130 deb-src-control.5:231
+#: deb-control.5:132 deb-src-control.5:233
 #, no-wrap
-msgid "B<Depends:> E<lt>package listE<gt>"
-msgstr "B<Depends:> E<lt>PaketlisteE<gt>"
+msgid "B<Depends:>I< package-list>"
+msgstr "B<Depends:> I< Paketliste>"
 
 #. type: Plain text
-#: deb-control.5:141
+#: deb-control.5:143
 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 "
@@ -655,13 +655,13 @@
 "aufgeführt sind."
 
 #. type: TP
-#: deb-control.5:141 deb-src-control.5:234
+#: deb-control.5:143 deb-src-control.5:236
 #, no-wrap
-msgid "B<Pre-Depends:> E<lt>package listE<gt>"
-msgstr "B<Pre-Depends:> E<lt>PaketlisteE<gt>"
+msgid "B<Pre-Depends:>I< package-list>"
+msgstr "B<Pre-Depends:> I< Paketliste>"
 
 #. type: Plain text
-#: deb-control.5:148
+#: deb-control.5:150
 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 "
@@ -673,13 +673,13 @@
 "Skriptes benötigt."
 
 #. type: TP
-#: deb-control.5:148 deb-src-control.5:237
+#: deb-control.5:150 deb-src-control.5:239
 #, no-wrap
-msgid "B<Recommends:> E<lt>package listE<gt>"
-msgstr "B<Recommends:> E<lt>PaketlisteE<gt>"
+msgid "B<Recommends:>I< package-list>"
+msgstr "B<Recommends:> I< Paketliste>"
 
 #. type: Plain text
-#: deb-control.5:155
+#: deb-control.5:157
 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 "
@@ -691,13 +691,13 @@
 "Pakete installiert."
 
 #. type: TP
-#: deb-control.5:155 deb-src-control.5:240
+#: deb-control.5:157 deb-src-control.5:242
 #, no-wrap
-msgid "B<Suggests:> E<lt>package listE<gt>"
-msgstr "B<Suggests:> E<lt>PaketlisteE<gt>"
+msgid "B<Suggests:>I< package-list>"
+msgstr "B<Suggests:> I< Paketliste>"
 
 #. type: Plain text
-#: deb-control.5:160
+#: deb-control.5:162
 msgid ""
 "Lists packages that are related to this one and can perhaps enhance its "
 "usefulness, but without which installing this package is perfectly "
@@ -708,7 +708,7 @@
 "perfekt sinnvoll ist."
 
 #. type: Plain text
-#: deb-control.5:172
+#: deb-control.5:174
 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 "
@@ -726,7 +726,7 @@
 "Versionsnummer-Spezifikation in Klammern."
 
 #. type: Plain text
-#: deb-control.5:178
+#: deb-control.5:180
 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 "
@@ -742,13 +742,13 @@
 "als oder identisch zu und »=« für identisch zu."
 
 #. type: TP
-#: deb-control.5:178 deb-src-control.5:243
+#: deb-control.5:180 deb-src-control.5:245
 #, no-wrap
-msgid "B<Breaks:> E<lt>package listE<gt>"
-msgstr "B<Breaks:> E<lt>PaketlisteE<gt>"
+msgid "B<Breaks:>I< package-list>"
+msgstr "B<Breaks:> I< Paketliste>"
 
 #. type: Plain text
-#: deb-control.5:186
+#: deb-control.5:188
 msgid ""
 "Lists packages that this one breaks, for example by exposing bugs when the "
 "named packages rely on this one. The package maintenance software will not "
@@ -763,13 +763,13 @@
 "durchgeführt wird."
 
 #. type: TP
-#: deb-control.5:186 deb-src-control.5:252
+#: deb-control.5:188 deb-src-control.5:254
 #, no-wrap
-msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgstr "B<Conflicts:> E<lt>PaketlisteE<gt>"
+msgid "B<Conflicts:>I< package-list>"
+msgstr "B<Conflicts:> I< Paketliste>"
 
 #. type: Plain text
-#: deb-control.5:194
+#: deb-control.5:196
 msgid ""
 "Lists packages that conflict with this one, for example by containing files "
 "with the same names. The package maintenance software will not allow "
@@ -783,13 +783,13 @@
 "B<Conflicts>-Zeile enthalten, die das andere Paket erwähnen."
 
 #. type: TP
-#: deb-control.5:194 deb-src-control.5:249
+#: deb-control.5:196 deb-src-control.5:251
 #, no-wrap
-msgid "B<Replaces:> E<lt>package listE<gt>"
-msgstr "B<Replaces:> E<lt>PaketlisteE<gt>"
+msgid "B<Replaces:>I< package-list>"
+msgstr "B<Replaces:> I<Paketliste>"
 
 #. type: Plain text
-#: deb-control.5:202
+#: deb-control.5:204
 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 "
@@ -803,13 +803,13 @@
 "Dateien wie das im Konflikt stehende Paket hat."
 
 #. type: TP
-#: deb-control.5:202 deb-src-control.5:255
+#: deb-control.5:204 deb-src-control.5:257
 #, no-wrap
-msgid "B<Provides:> E<lt>package listE<gt>"
-msgstr "B<Provides:> E<lt>PaketlisteE<gt>"
+msgid "B<Provides:>I< package-list>"
+msgstr "B<Provides:> I< Paketliste>"
 
 #. type: Plain text
-#: deb-control.5:212
+#: deb-control.5:214
 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 "
@@ -831,7 +831,7 @@
 "verwenden müssen."
 
 #. type: Plain text
-#: deb-control.5:231
+#: deb-control.5:233
 msgid ""
 "The syntax of B<Breaks>, B<Conflicts>, B<Replaces> and B<Provides> is a list "
 "of package names, separated by commas (and optional whitespace).  In the "
@@ -846,13 +846,13 @@
 "für die B<Breaks>-, B<Conflicts>- und B<Replaces>-Felder angegeben werden."
 
 #. type: TP
-#: deb-control.5:232 deb-src-control.5:258
+#: deb-control.5:234 deb-src-control.5:260
 #, no-wrap
-msgid "B<Built-Using:> E<lt>package listE<gt>"
-msgstr "B<Built-Using:> E<lt>PaketlisteE<gt>"
+msgid "B<Built-Using:>I< package-list>"
+msgstr "B<Built-Using:> I< Paketliste>"
 
 #. type: Plain text
-#: deb-control.5:242
+#: deb-control.5:244
 msgid ""
 "This field lists extra source packages that were used during the build of "
 "this binary package.  This is an indication to the archive maintenance "
@@ -873,13 +873,13 @@
 "kann."
 
 #. type: SH
-#: deb-control.5:243 deb-src-control.5:286 start-stop-daemon.8:303
+#: deb-control.5:245 deb-src-control.5:288 start-stop-daemon.8:302
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "BEISPIEL"
 
 #. type: Plain text
-#: deb-control.5:266
+#: deb-control.5:268
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -926,7 +926,7 @@
 " langsamer laufen.)\n"
 
 #. type: Plain text
-#: deb-control.5:274
+#: deb-control.5:276
 msgid ""
 "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr ""
@@ -938,12 +938,6 @@
 msgid "deb-src-control"
 msgstr "deb-src-control"
 
-#. type: TH
-#: deb-src-control.5:3
-#, no-wrap
-msgid "2011-04-29"
-msgstr "2011-04-29"
-
 #. type: Plain text
 #: deb-src-control.5:6
 msgid "deb-src-control - Debian source packages' master control file format"
@@ -990,8 +984,8 @@
 #. type: TP
 #: deb-src-control.5:30
 #, no-wrap
-msgid "B<Source:> E<lt>source package nameE<gt> (required)"
-msgstr "B<Source:> E<lt>Quellpaket-NameE<gt> (verpflichtend)"
+msgid "B<Source:> I<source-package-name> (required)"
+msgstr "B<Source:> I<Quellpaketname> (verpflichtend)"
 
 #. type: Plain text
 #: deb-src-control.5:37
@@ -1011,8 +1005,8 @@
 #. type: TP
 #: deb-src-control.5:38
 #, no-wrap
-msgid "B<Maintainer:> E<lt>fullname emailE<gt> (required)"
-msgstr "B<Maintainer:> E<lt>Vollständiger Name E-MailE<gt> (verpflichtend)"
+msgid "B<Maintainer:> I<fullname-email> (required)"
+msgstr "B<Maintainer:> I<Vollständiger-Name-und-E-Mail> (verpflichtend)"
 
 #. type: Plain text
 #: deb-src-control.5:43
@@ -1028,8 +1022,8 @@
 #. type: TP
 #: deb-src-control.5:44
 #, no-wrap
-msgid "B<Uploaders:> E<lt>fullname emailE<gt>"
-msgstr "B<Uploaders:> E<lt>Vollständiger Name E-MailE<gt>"
+msgid "B<Uploaders:>I< fullname-email>"
+msgstr "B<Uploaders:>I< Vollständiger-Name-und-E-Mail>"
 
 #. type: Plain text
 #: deb-src-control.5:49
@@ -1045,8 +1039,8 @@
 #. type: TP
 #: deb-src-control.5:50
 #, no-wrap
-msgid "B<Standards-Version:> E<lt>version stringE<gt>"
-msgstr "B<Standards-Version:> E<lt>Versions-ZeichenketteE<gt>"
+msgid "B<Standards-Version:>I< version-string>"
+msgstr "B<Standards-Version:> I< Versionszeichenkette>"
 
 #. type: Plain text
 #: deb-src-control.5:56
@@ -1062,8 +1056,8 @@
 #. type: TP
 #: deb-src-control.5:57
 #, no-wrap
-msgid "B<DM-Upload-Allowed:> E<lt>yes|noE<gt>"
-msgstr "B<DM-Upload-Allowed:> E<lt>yes|noE<gt>"
+msgid "B<DM-Upload-Allowed:> B<yes>|B<no>"
+msgstr "B<DM-Upload-Allowed:> B<yes>|B<no>"
 
 #. type: Plain text
 #: deb-src-control.5:61
@@ -1077,52 +1071,58 @@
 "Standardwert ist »no« (nein)."
 
 #. type: Plain text
+#: deb-src-control.5:65
+msgid "The upstream project home page URL."
+msgstr "Die URL des Original- (Upstream-)Projekts."
+
+#. type: Plain text
 #: deb-src-control.5:71
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>. This field is usually not needed."
-msgstr ""
-"Die URL der Fehlerdatenbank für dieses Paket. Das derzeit verwendete Format "
-"ist B<E<lt>BTS_ArtE<gt>://E<lt>BTS_AdresseE<gt>> wie in B<debbugs://bugs."
-"debian.org>. Dieses Feld wird normalerweise nicht benötigt."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian."
+"org>. This field is usually not needed."
+msgstr ""
+"Die I<URL> der Fehlerdatenbank für dieses Paket. Das derzeit verwendete "
+"Format ist I<BTS-Art>B<://>I<BTS-Adresse> wie in B<debbugs://bugs.debian."
+"org>. Dieses Feld wird normalerweise nicht benötigt."
 
 #. type: TP
 #: deb-src-control.5:72
 #, no-wrap
-msgid "B<Vcs-*:> E<lt>urlE<gt>"
-msgstr "B<Vcs-*:> E<lt>URLE<gt>"
+msgid "B<Vcs-*:>I< url>"
+msgstr "B<Vcs-*:> I< URL>"
 
 #. type: Plain text
-#: deb-src-control.5:78
+#: deb-src-control.5:79
 msgid ""
-"The url of the Version Control System repository used to maintain this "
-"package.  Currently supported are Arch, Bzr (Bazaar), Cvs, Darcs, Git, Hg "
-"(Mercurial), Mtn (Monotone) and Svn (Subversion). Usually this field points "
-"to the latest version of the package, such as the main branch or the trunk."
-msgstr ""
-"Die URL des Versionskontrollsystem-Depots, das für die Betreuung des Pakets "
-"verwandt wird. Derzeit werden Arch, Bzr (Bazaar), Cvs, Darcs, Git, Hg "
-"(Mercurial), Mtn (Monotone) und Svn (Subversion) unterstützt. Normalerweise "
-"zeigt dieses Feld auf die neuste Version des Pakets, wie den Hauptzweig oder "
-"den Trunk."
+"The I<url> of the Version Control System repository used to maintain this "
+"package. Currently supported are B<Arch>, B<Bzr> (Bazaar), B<Cvs>, B<Darcs>, "
+"B<Git>, B<Hg> (Mercurial), B<Mtn> (Monotone) and B<Svn> (Subversion). "
+"Usually this field points to the latest version of the package, such as the "
+"main branch or the trunk."
+msgstr ""
+"Die I<URL> des Versionskontrollsystem-Depots, das für die Betreuung des "
+"Pakets verwandt wird. Derzeit werden B<Arch>, B<Bzr> (Bazaar), B<Cvs>, "
+"B<Darcs>, B<Git>, B<Hg> (Mercurial), B<Mtn> (Monotone) und B<Svn> "
+"(Subversion) unterstützt. Normalerweise zeigt dieses Feld auf die neuste "
+"Version des Pakets, wie den Hauptzweig oder den Trunk."
 
 #. type: TP
-#: deb-src-control.5:79
+#: deb-src-control.5:80
 #, no-wrap
-msgid "B<Vcs-Browser:> E<lt>urlE<gt>"
-msgstr "B<Vcs-Browser:> E<lt>URLE<gt>"
+msgid "B<Vcs-Browser:>I< url>"
+msgstr "B<Vcs-Browser:> I< URL>"
 
 #. type: Plain text
-#: deb-src-control.5:82
+#: deb-src-control.5:84
 msgid ""
-"The url of a webinterface to browse the Version Control System repository."
+"The I<url> of a webinterface to browse the Version Control System repository."
 msgstr ""
-"Die URL der Webschnittstelle, um das Versionskontrollsystem-Depot "
+"Die I<URL> der Webschnittstelle, um das Versionskontrollsystem-Depot "
 "anzuschauen."
 
 #. type: Plain text
-#: deb-src-control.5:87
+#: deb-src-control.5:89
 msgid ""
 "The name of the distribution this package is originating from. This field is "
 "usually not needed."
@@ -1131,7 +1131,7 @@
 "Feld wird normalerweise nicht benötigt."
 
 #. type: Plain text
-#: deb-src-control.5:93
+#: deb-src-control.5:95
 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\", "
@@ -1142,7 +1142,7 @@
 "»net«, »mail«, »text«, »x11« usw."
 
 #. type: Plain text
-#: deb-src-control.5:98
+#: deb-src-control.5:100
 msgid ""
 "Sets the importance of this package in relation to the system as a whole.  "
 "Common priorities are \"required\", \"standard\", \"optional\", \"extra\", "
@@ -1152,13 +1152,13 @@
 "Prioritäten sind »required«, »standard«, »optional«, »extra« usw."
 
 #. type: TP
-#: deb-src-control.5:108
+#: deb-src-control.5:110
 #, no-wrap
-msgid "B<Build-Depends:> E<lt>package listE<gt>"
-msgstr "B<Build-Depends:> E<lt>PaketlisteE<gt>"
+msgid "B<Build-Depends:>I< package-list>"
+msgstr "B<Build-Depends:> I< Paketliste>"
 
 #. type: Plain text
-#: deb-src-control.5:112
+#: deb-src-control.5:114
 msgid ""
 "A list of packages that need to be installed and configured to be able to "
 "build the source package."
@@ -1167,30 +1167,30 @@
 "Quellpaket zu bauen."
 
 #. type: TP
-#: deb-src-control.5:113
+#: deb-src-control.5:115
 #, no-wrap
-msgid "B<Build-Depends-Indep:> E<lt>package listE<gt>"
-msgstr "B<Build-Depends-Indep:> E<lt>PaketlisteE<gt>"
+msgid "B<Build-Depends-Indep:>I< package-list>"
+msgstr "B<Build-Depends-Indep:> I< Paketliste>"
 
 #. type: Plain text
-#: deb-src-control.5:118
+#: deb-src-control.5:120
 msgid ""
-"Same as Build-Depends, but they are only needed when building the "
-"architecture independent packages. The Build-Depends are also installed in "
-"this case."
+"Same as B<Build-Depends>, but they are only needed when building the "
+"architecture independent packages. The B<Build-Depends> are also installed "
+"in this case."
 msgstr ""
-"Identisch zu Build-Depends, wird aber nur zum Bau der "
-"architekturunabhängigen Pakete benötigt. In diesem Fall sind die Build-"
-"Depends auch installiert."
+"Identisch zu B<Build-Depends>, wird aber nur zum Bau der "
+"architekturunabhängigen Pakete benötigt. In diesem Fall sind die B<Build-"
+"Depends> auch installiert."
 
 #. type: TP
-#: deb-src-control.5:119
+#: deb-src-control.5:121
 #, no-wrap
-msgid "B<Build-Conflicts:> E<lt>package listE<gt>"
-msgstr "B<Build-Conflicts:> E<lt>PaketlisteE<gt>"
+msgid "B<Build-Conflicts:>I< package-list>"
+msgstr "B<Build-Conflicts:> I< Paketliste>"
 
 #. type: Plain text
-#: deb-src-control.5:123
+#: deb-src-control.5:125
 msgid ""
 "A list of packages that should not be installed when the package is build, "
 "for example because they interfere with the used build system."
@@ -1200,22 +1200,22 @@
 "geraten."
 
 #. type: TP
-#: deb-src-control.5:124
+#: deb-src-control.5:126
 #, no-wrap
-msgid "B<Build-Conflicts-Indep:> E<lt>package listE<gt>"
-msgstr "B<Build-Conflicts-Indep:> E<lt>PaketlisteE<gt>"
+msgid "B<Build-Conflicts-Indep:>I< package-list>"
+msgstr "B<Build-Conflicts-Indep:> I< Paketliste>"
 
 #. type: Plain text
-#: deb-src-control.5:128
+#: deb-src-control.5:130
 msgid ""
-"Same as Build-Conflicts, but only when building the architecture independent "
-"packages."
+"Same as B<Build-Conflicts>, but only when building the architecture "
+"independent packages."
 msgstr ""
-"Identisch zu Build-Conflicts, wird aber nur zum Bau der "
+"Identisch zu B<Build-Conflicts>, wird aber nur zum Bau der "
 "architekturunabhängigen Pakete benötigt."
 
 #. type: Plain text
-#: deb-src-control.5:139
+#: deb-src-control.5:141
 msgid ""
 "The syntax of the B<Build-Depends> and B<Build-Depends-Indep> fields is a "
 "list of groups of alternative packages. Each group is a list of packages "
@@ -1235,7 +1235,7 @@
 "Klammern."
 
 #. type: Plain text
-#: deb-src-control.5:148
+#: deb-src-control.5:150
 msgid ""
 "The syntax of the B<Build-Conflicts> and B<Build-Conflicts-Indep> fields is "
 "a list of comma-separated package names, where the comma is read as an \"AND"
@@ -1251,7 +1251,7 @@
 "Klammern."
 
 #. type: Plain text
-#: deb-src-control.5:154
+#: deb-src-control.5:156
 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 "
@@ -1267,7 +1267,7 @@
 "als oder identisch zu und »=« für identisch zu."
 
 #. type: Plain text
-#: deb-src-control.5:158
+#: deb-src-control.5:160
 msgid ""
 "A architecture specification consists of one or more architecture names, "
 "separated by whitespace. Exclamation marks may be prepended to each of the "
@@ -1278,7 +1278,7 @@
 "vorangestellt werden, das »NICHT« bedeutet."
 
 #. type: Plain text
-#: deb-src-control.5:163
+#: deb-src-control.5:165
 msgid ""
 "Note that dependencies on packages in the B<build-essential> set can be "
 "omitted and that declaring build conflicts against them is impossible. A "
@@ -1289,13 +1289,13 @@
 "möglich ist. Eine Liste dieser Pakete befindet sich im Paket build-essential."
 
 #. type: SH
-#: deb-src-control.5:165
+#: deb-src-control.5:167
 #, no-wrap
 msgid "BINARY FIELDS"
 msgstr "BINÄRPAKET-FELDER"
 
 #. type: Plain text
-#: deb-src-control.5:174
+#: deb-src-control.5:176
 msgid ""
 "Note that the B<Priority>, B<Section> and B<Homepage> fields can also be in "
 "a binary paragraph to override the global value from the source package."
@@ -1305,13 +1305,13 @@
 "Quellpakets zu überschreiben."
 
 #. type: TP
-#: deb-src-control.5:175
+#: deb-src-control.5:177
 #, no-wrap
-msgid "B<Package:> E<lt>binary package nameE<gt> (required)"
-msgstr "B<Package:> E<lt>BinärpaketnameE<gt> (verpflichtend)"
+msgid "B<Package:> I<binary-package-name> (required)"
+msgstr "B<Package:> I<Binärpaketname> (verpflichtend)"
 
 #. type: Plain text
-#: deb-src-control.5:179
+#: deb-src-control.5:181
 msgid ""
 "This field is used to name the binary package name. The same restrictions as "
 "to a source package name apply."
@@ -1320,13 +1320,13 @@
 "gleichen Einschränkungen wie beim Quellpaketnamen."
 
 #. type: TP
-#: deb-src-control.5:180
+#: deb-src-control.5:182
 #, no-wrap
-msgid "B<Architecture:> E<lt>arch|all|anyE<gt> (required)"
-msgstr "B<Architecture:> E<lt>arch|allanyE<gt> (verpflichtend)"
+msgid "B<Architecture:> I<arch>|B<all>|B<any> (required)"
+msgstr "B<Architecture:> I<arch>|B<all>|B<any> (verpflichtend)"
 
 #. type: Plain text
-#: deb-src-control.5:193
+#: deb-src-control.5:195
 msgid ""
 "The architecture specifies on which type of hardware this package runs. For "
 "packages that run on all architectures, use the B<any> value. For packages "
@@ -1346,13 +1346,13 @@
 "architecture>(1) für weitere Informationen dazu)."
 
 #. type: TP
-#: deb-src-control.5:194
+#: deb-src-control.5:196
 #, no-wrap
-msgid "B<Package-Type:> E<lt>deb|udebE<gt>"
-msgstr "B<Package-Type:> E<lt>deb|udebE<gt>"
+msgid "B<Package-Type:> B<deb>|B<udeb>"
+msgstr "B<Package-Type:> B<deb>|B<udeb>"
 
 #. type: Plain text
-#: deb-src-control.5:199
+#: deb-src-control.5:201
 msgid ""
 "This field defines the type of the package. \"udeb\" is for size-constrained "
 "packages used by the debian installer. \"deb\" is the default value, it's "
@@ -1364,19 +1364,13 @@
 "könnten in der Zukunft hinzugefügt werden."
 
 #. type: TP
-#: deb-src-control.5:217
-#, no-wrap
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
-msgstr "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
-
-#. type: TP
-#: deb-src-control.5:223
+#: deb-src-control.5:225
 #, no-wrap
-msgid "B<Description:> E<lt>short descriptionE<gt> (required)"
-msgstr "B<Description:> E<lt>KurzbeschreibungE<gt> (verpflichtend)"
+msgid "B<Description:> I<short-description> (required)"
+msgstr "B<Description:> I<Kurzbeschreibung> (verpflichtend)"
 
 #. type: Plain text
-#: deb-src-control.5:230
+#: deb-src-control.5:232
 msgid ""
 "These fields are described in the B<deb-control>(5)  manual page, as they "
 "are copied literally to the control file of the binary package."
@@ -1385,13 +1379,13 @@
 "wörtlich in die Steuerdatei des Binärpakets kopiert werden."
 
 #. type: TP
-#: deb-src-control.5:246
+#: deb-src-control.5:248
 #, no-wrap
-msgid "B<Enhances:> E<lt>package listE<gt>"
-msgstr "B<Enhances:> E<lt>PaketlisteE<gt>"
+msgid "B<Enhances:>I< package-list>"
+msgstr "B<Enhances:> I< Paketliste>"
 
 #. type: Plain text
-#: deb-src-control.5:268
+#: deb-src-control.5:270
 msgid ""
 "These fields declare relationships between packages. They are discussed in "
 "the B<deb-control>(5)  manpage and in the B<debian-policy> package."
@@ -1400,13 +1394,13 @@
 "Handbuchseite B<deb-control>(5) und im Paket B<debian-policy> beschrieben."
 
 #. type: SH
-#: deb-src-control.5:269
+#: deb-src-control.5:271
 #, no-wrap
 msgid "USER-DEFINED FIELDS"
 msgstr "BENUTZERDEFINIERTE FELDER"
 
 #. type: Plain text
-#: deb-src-control.5:284
+#: deb-src-control.5:286
 msgid ""
 "It is allowed to add additional user-defined fields to the control file. The "
 "tools will ignore these fields. If you want the fields to be copied over to "
@@ -1436,7 +1430,7 @@
 "Quell- und Binärpakets auftauchen."
 
 #. type: Plain text
-#: deb-src-control.5:302
+#: deb-src-control.5:304
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -1451,7 +1445,7 @@
 "Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
-" libselinux1-dev (E<gt>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]\n"
+" libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
 msgstr ""
 "# Kommentar\n"
 "Source: dpkg\n"
@@ -1465,10 +1459,10 @@
 "Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
-" libselinux1-dev (E<gt>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]\n"
+" libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
 
 #. type: Plain text
-#: deb-src-control.5:321
+#: deb-src-control.5:323
 #, no-wrap
 msgid ""
 "Package: dpkg-dev\n"
@@ -1477,8 +1471,8 @@
 "Architecture: all\n"
 "# this is a custom field in the binary package\n"
 "XB-Mentoring-Contact: Raphael Hertzog E<lt>hertzog@debian.orgE<gt>\n"
-"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2), bzip2, lzma,\n"
-" patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
+"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2),\n"
+" bzip2, lzma, patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
 "Recommends: gcc | c-compiler, build-essential\n"
 "Suggests: gnupg, debian-keyring\n"
 "Conflicts: dpkg-cross (E<lt>E<lt> 2.0.0), devscripts (E<lt>E<lt> 2.10.26)\n"
@@ -1496,8 +1490,8 @@
 "Architecture: all\n"
 "# dies ist ein spezielles Feld im Binärpaket\n"
 "XB-Mentoring-Contact: Raphael Hertzog E<lt>hertzog@debian.orgE<gt>\n"
-"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2), bzip2, lzma,\n"
-" patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
+"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2),\n"
+" bzip2, lzma, patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
 "Recommends: gcc | c-compiler, build-essential\n"
 "Suggests: gnupg, debian-keyring\n"
 "Conflicts: dpkg-cross (E<lt>E<lt> 2.0.0), devscripts (E<lt>E<lt> 2.10.26)\n"
@@ -1510,7 +1504,7 @@
 " for example, most packages need make and the C compiler gcc.\n"
 
 #. type: Plain text
-#: deb-src-control.5:328
+#: deb-src-control.5:330
 msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
 msgstr "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
 
@@ -1521,17 +1515,17 @@
 msgstr "deb-split"
 
 #. type: TH
-#: deb-split.5:1
+#: deb-split.5:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 dpkg-vendor.1:1 start-stop-daemon.8:1
 #, no-wrap
-msgid "2011-04-15"
-msgstr "2011-04-15"
+msgid "2011-07-04"
+msgstr "2011-07-04"
 
 #. type: Plain text
 #: deb-split.5:4
 msgid "deb-split - Debian multi-part binary package format"
 msgstr "deb-split - mehrteiliges Debian-Binärpaketformat"
 
-# type: Plain text
 #. type: Plain text
 #: deb-split.5:9
 msgid ""
@@ -1564,8 +1558,8 @@
 #: deb-split.5:15 deb-split.5:18 deb-split.5:20 deb-split.5:22 deb-split.5:24
 #: deb-split.5:26 deb-split.5:28 deb-split.5:31 dpkg-gensymbols.1:20
 #: dpkg-gensymbols.1:22 dpkg-gensymbols.1:24 dpkg-gensymbols.1:26
-#: dpkg-gensymbols.1:306 dpkg-gensymbols.1:312 dpkg-gensymbols.1:346
-#: dpkg-gensymbols.1:350 dpkg-gensymbols.1:353
+#: dpkg-gensymbols.1:311 dpkg-gensymbols.1:317 dpkg-gensymbols.1:351
+#: dpkg-gensymbols.1:355 dpkg-gensymbols.1:358
 #, no-wrap
 msgid "\\(bu"
 msgstr "\\(bu"
@@ -1617,7 +1611,6 @@
 msgid "The package architecture (since dpkg 1.16.1)."
 msgstr "Die Paketarchitektur (seit Dpkg 1.16.1)."
 
-# type: Plain text
 #. type: Plain text
 #: deb-split.5:36
 msgid ""
@@ -1645,23 +1638,23 @@
 #. type: Plain text
 #: deb-split.5:44
 msgid ""
-"The second, last required member is named B<data.>N, where N denotes the "
-"part number. It contains the raw part data."
+"The second, last required member is named B<data.>I<N>, where I<N> denotes "
+"the part number. It contains the raw part data."
 msgstr ""
-"Das zweite, letzte benötigte Mitglied heißt B<data.>N, wobei N die "
+"Das zweite, letzte benötigte Mitglied heißt B<data.>I<N>, wobei I<N> die "
 "Teilnummer angibt. Es enthält die rohen Daten des Teils."
 
 #. type: Plain text
 #: deb-split.5:49
 msgid ""
 "These members must occur in this exact order. Current implementations should "
-"ignore any additional members after B<data.>N.  Further members may be "
+"ignore any additional members after B<data.>I<N>.  Further members may be "
 "defined in the future, and (if possible) will be placed after these two."
 msgstr ""
 "Diese Mitglieder müssen in genau dieser Reihenfolge auftauchen. Aktuelle "
-"Implementationen sollten zusätzliche Mitglieder nach B<data.>N ignorieren. "
-"Weitere Mitglieder könnten in der Zukunft definiert werden und werden (falls "
-"möglich) nach diesen drei platziert."
+"Implementationen sollten zusätzliche Mitglieder nach B<data.>I<N> "
+"ignorieren. Weitere Mitglieder könnten in der Zukunft definiert werden und "
+"werden (falls möglich) nach diesen drei platziert."
 
 #. type: Plain text
 #: deb-split.5:51
@@ -1674,13 +1667,6 @@
 msgid "deb-version"
 msgstr "deb-version"
 
-#. type: TH
-#: deb-version.5:5 dpkg-distaddfile.1:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-name.1:6
-#, no-wrap
-msgid "2008-08-18"
-msgstr "2008-08-18"
-
 #. type: Plain text
 #: deb-version.5:8
 msgid "deb-version - Debian package version number format"
@@ -1688,8 +1674,8 @@
 
 #. type: Plain text
 #: deb-version.5:11
-msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
-msgstr "[ I<Epoche>:] I<Upstream-Version> [-I<Debian-Revision> ]"
+msgid "[I<epoch>B<:>]I<upstream-version>[B<->I<debian-revision>]"
+msgstr "[ I<Epoche>B<:>]I<Upstream-Version>[B<->I<Debian-Revision>]"
 
 #. type: Plain text
 #: deb-version.5:14
@@ -1710,7 +1696,7 @@
 #: deb-version.5:20
 msgid ""
 "This is a single (generally small) unsigned integer.  It may be omitted, in "
-"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"which case zero is assumed.  If it is omitted then the I<upstream-version> "
 "may not contain any colons."
 msgstr ""
 "Dies ist eine einzelne (typischerweise kleine) vorzeichenlose ganze Zahl. "
@@ -1731,7 +1717,7 @@
 #. type: TP
 #: deb-version.5:24
 #, no-wrap
-msgid "I<upstream_version>"
+msgid "I<upstream-version>"
 msgstr "I<Upstream-Version>"
 
 #. type: Plain text
@@ -1755,7 +1741,7 @@
 #: deb-version.5:39
 msgid ""
 "The comparison behavior of the package management system with respect to the "
-"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"I<upstream-version> is described below. The I<upstream-version> portion of "
 "the version number is mandatory."
 msgstr ""
 "Das Vergleichsverhalten des Paketverwaltungssystems in Hinblick auf die "
@@ -1765,9 +1751,9 @@
 #. type: Plain text
 #: deb-version.5:48
 msgid ""
-"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"The I<upstream-version> may contain only alphanumerics (\"A-Za-z0-9\") and "
 "the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
-"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"tilde) and should start with a digit.  If there is no I<debian-revision> "
 "then hyphens are not allowed; if there is no I<epoch> then colons are not "
 "allowed."
 msgstr ""
@@ -1780,7 +1766,7 @@
 #. type: TP
 #: deb-version.5:48
 #, no-wrap
-msgid "I<debian_revision>"
+msgid "I<debian-revision>"
 msgstr "I<Debian-Revision>"
 
 #. type: Plain text
@@ -1789,7 +1775,7 @@
 "This part of the version number specifies the version of the Debian package "
 "based on the upstream version.  It may contain only alphanumerics and the "
 "characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
-"same way as the I<upstream_version> is."
+"same way as the I<upstream-version> is."
 msgstr ""
 "Dieser Teil der Versionsnummer spezifiziert die Version des Debian-Paketes, "
 "basierend auf der Version der Originalautoren. Er kann nur alphanumerische "
@@ -1799,7 +1785,7 @@
 #. type: Plain text
 #: deb-version.5:64
 msgid ""
-"It is optional; if it isn't present then the I<upstream_version> may not "
+"It is optional; if it isn't present then the I<upstream-version> may not "
 "contain a hyphen.  This format represents the case where a piece of software "
 "was written specifically to be turned into a Debian package, and so there is "
 "only one \"debianisation\" of it and therefore no revision indication is "
@@ -1814,8 +1800,8 @@
 #. type: Plain text
 #: deb-version.5:68
 msgid ""
-"It is conventional to restart the I<debian_revision> at '1' each time time "
-"the I<upstream_version> is increased."
+"It is conventional to restart the I<debian-revision> at '1' each time time "
+"the I<upstream-version> is increased."
 msgstr ""
 "Es ist üblich, die I<Debian-Revision> jedesmal bei »1« neu zu starten, wenn "
 "die I<Upstream-Version> erhöht wird."
@@ -1824,9 +1810,9 @@
 #: deb-version.5:76
 msgid ""
 "Dpkg will break the version number apart at the last hyphen in the string "
-"(if there is one) to determine the I<upstream_version> and "
-"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
-"than the presence of one (but note that the I<debian_revision> is the least "
+"(if there is one) to determine the I<upstream-version> and I<debian-"
+"revision>. The absence of a I<debian-revision> compares earlier than the "
+"presence of one (but note that the I<debian-revision> is the least "
 "significant part of the version number)."
 msgstr ""
 "Dpkg wird die Versionsnummer beim letzten Bindestrich in der Zeichenkette "
@@ -1845,7 +1831,7 @@
 #. type: Plain text
 #: deb-version.5:80
 msgid ""
-"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"The I<upstream-version> and I<debian-revision> parts are compared by the "
 "package management system using the same algorithm:"
 msgstr ""
 "Die I<Upstream-Version>- und I<Debian-Revision>-Teile werden von der "
@@ -1942,11 +1928,11 @@
 msgstr "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
 
 #. type: SH
-#: deb-version.5:120 dpkg.1:783 dpkg-buildpackage.1:256 dpkg-distaddfile.1:47
-#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
+#: deb-version.5:120 dpkg.1:783 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:460
 #: dpkg-maintscript-helper.1:128 dpkg-parsechangelog.1:123
-#: dpkg-shlibdeps.1:331 dpkg-source.1:706 dselect.1:458
-#: start-stop-daemon.8:324 update-alternatives.8:495
+#: dpkg-shlibdeps.1:329 dpkg-source.1:730 dselect.1:451
+#: start-stop-daemon.8:323 update-alternatives.8:494
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTOREN"
@@ -1958,18 +1944,18 @@
 msgstr "Copyright \\(co 1996,1997,1998 Ian Jackson and Christian Schwarz"
 
 #. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:262
+#: deb-version.5:124 dpkg-buildpackage.1:263
 msgid "Copyright \\(co 2007 Frank Lichtenheld"
 msgstr "Copyright \\(co 2007 Frank Lichtenheld"
 
 #. type: Plain text
-#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:125
-#: dpkg-buildpackage.1:266 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
-#: dpkg-deb.1:257 dpkg-divert.8:139 dpkg-genchanges.1:154
-#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-maintscript-helper.1:139
-#: dpkg-mergechangelogs.1:71 dpkg-name.1:107 dpkg-parsechangelog.1:131
-#: dpkg-query.1:219 dpkg-shlibdeps.1:341 dpkg-source.1:714 dpkg-split.1:228
-#: dpkg-statoverride.8:92 dpkg-vendor.1:53 update-alternatives.8:502
+#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:273
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:269 dpkg-divert.8:139 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:464 dpkg-maintscript-helper.1:139
+#: dpkg-mergechangelogs.1:71 dpkg-name.1:108 dpkg-parsechangelog.1:131
+#: dpkg-query.1:219 dpkg-shlibdeps.1:339 dpkg-source.1:738 dpkg-split.1:227
+#: dpkg-statoverride.8:91 dpkg-vendor.1:53 update-alternatives.8:501
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO WARRANTY."
@@ -1983,12 +1969,6 @@
 msgid "deb-old"
 msgstr "deb-old"
 
-#. type: TH
-#: deb-old.5:1
-#, no-wrap
-msgid "2006-02-28"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-old.5:4
 msgid "deb-old - old style Debian binary package format"
@@ -2088,12 +2068,6 @@
 msgstr "deb-override"
 
 #. type: TH
-#: deb-override.5:15
-#, no-wrap
-msgid "2007-03-07"
-msgstr "2007-03-07"
-
-#. type: TH
 #: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
 #: deb-symbols.5:2 deb-triggers.5:1 dpkg-architecture.1:1
 #: dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1
@@ -2209,7 +2183,6 @@
 msgid "deb-extra-override - Debian archive extra override file"
 msgstr "deb-extra-override - Debian-Archive Zusatz-override-Datei"
 
-# type: Plain text
 #. type: Plain text
 #: deb-extra-override.5:12
 msgid ""
@@ -2236,13 +2209,11 @@
 msgid "I<package> I<field-name> I<value>"
 msgstr "I<Paket> I<Feldname> I<Wert>"
 
-# type: Plain text
 #. type: Plain text
 #: deb-extra-override.5:25
 msgid "I<package> is the name of the binary/source package."
 msgstr "I<Paket> ist der Name des Binär-/Quellpakets."
 
-# type: Plain text
 #. type: Plain text
 #: deb-extra-override.5:31
 msgid ""
@@ -2303,8 +2274,8 @@
 
 #. type: Plain text
 #: deb-shlibs.5:34
-msgid "[I<type:>] I<library> I<version> I<dependencies>"
-msgstr "[I<Typ:>] I<Bibliothek> I<Version> I<Abhängigkeiten>"
+msgid "[I<type>B<:>] I<library> I<version> I<dependencies>"
+msgstr "[I<Typ>B<:>] I<Bibliothek> I<Version> I<Abhängigkeiten>"
 
 #. type: Plain text
 #: deb-shlibs.5:38
@@ -2325,8 +2296,8 @@
 "Details."
 
 #. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:714 dpkg-architecture.1:263
-#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:460
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:714 dpkg-architecture.1:262
+#: dpkg-divert.8:91 dpkg-name.1:65 update-alternatives.8:459
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "BEISPIELE"
@@ -2428,7 +2399,6 @@
 "Zeichenkette B<${}> (die keine erlaubte Substitution ist) durch das B<$>-"
 "Zeichen ersetzt."
 
-# type: Plain text
 #. type: Plain text
 #: deb-substvars.5:38
 msgid ""
@@ -2717,11 +2687,11 @@
 "wird es eine Warnung erstellen und ein leerer Wert wird angenommen."
 
 #. type: SH
-#: deb-substvars.5:145 dpkg.1:627 dpkg-architecture.1:285 dpkg.cfg.5:12
-#: dpkg-buildflags.1:103 dpkg-distaddfile.1:39 dpkg-divert.8:122
+#: deb-substvars.5:145 dpkg.1:627 dpkg-architecture.1:284 dpkg.cfg.5:12
+#: dpkg-buildflags.1:121 dpkg-distaddfile.1:39 dpkg-divert.8:122
 #: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
-#: dpkg-split.1:207 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:361
+#: dpkg-split.1:206 dpkg-statoverride.8:74 dselect.cfg.5:12
+#: update-alternatives.8:360
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
@@ -2738,15 +2708,15 @@
 msgstr "Liste von Substitutionsvariablen und -werten."
 
 #. type: SH
-#: deb-substvars.5:150 dpkg.1:780 dpkg-buildpackage.1:244 dpkg-deb.1:226
-#: dpkg-name.1:85 dpkg-source.1:698 dpkg-split.1:200 dselect.1:436
-#: update-alternatives.8:487
+#: deb-substvars.5:150 dpkg.1:780 dpkg-buildpackage.1:244 dpkg-deb.1:238
+#: dpkg-name.1:86 dpkg-source.1:722 dpkg-split.1:199 dselect.1:429
+#: update-alternatives.8:486
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text
-#: deb-substvars.5:153 dpkg-source.1:701
+#: deb-substvars.5:153 dpkg-source.1:725
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -2764,27 +2734,27 @@
 "(1), B<dpkg-source>(1)."
 
 #. type: SH
-#: deb-substvars.5:161 dpkg-architecture.1:304 dpkg.cfg.5:19
-#: dpkg-buildflags.1:120 dpkg-checkbuilddeps.1:40 dpkg-deb.1:253
-#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:103
-#: dpkg-query.1:214 dpkg-scansources.1:77 dpkg-split.1:224
-#: dpkg-statoverride.8:88 dpkg-vendor.1:48 dselect.cfg.5:19
+#: deb-substvars.5:161 dpkg-architecture.1:303 dpkg.cfg.5:19
+#: dpkg-buildflags.1:266 dpkg-checkbuilddeps.1:40 dpkg-deb.1:265
+#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:104
+#: dpkg-query.1:214 dpkg-scansources.1:76 dpkg-split.1:223
+#: dpkg-statoverride.8:87 dpkg-vendor.1:48 dselect.cfg.5:19
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: deb-substvars.5:163 dpkg-buildpackage.1:258 dpkg-distaddfile.1:49
-#: dpkg-deb.1:255 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:708
-#: dpkg-split.1:226
+#: deb-substvars.5:163 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
+#: dpkg-deb.1:267 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:331 dpkg-source.1:732
+#: dpkg-split.1:225
 msgid "Copyright \\(co 1995-1996 Ian Jackson"
 msgstr "Copyright \\(co 1995-1996 Ian Jackson"
 
 #. type: Plain text
-#: deb-substvars.5:165 dpkg-buildpackage.1:260 dpkg-distaddfile.1:51
+#: deb-substvars.5:165 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
 #: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
-#: dpkg-shlibdeps.1:335 dpkg-source.1:710 dpkg-statoverride.8:90
+#: dpkg-shlibdeps.1:333 dpkg-source.1:734 dpkg-statoverride.8:89
 msgid "Copyright \\(co 2000 Wichert Akkerman"
 msgstr "Copyright \\(co 2000 Wichert Akkerman"
 
@@ -2794,12 +2764,6 @@
 msgid "deb-symbols"
 msgstr "deb-symbols"
 
-#. type: TH
-#: deb-symbols.5:2
-#, no-wrap
-msgid "2007-07-16"
-msgstr "2007-07-16"
-
 #. type: Plain text
 #: deb-symbols.5:5
 msgid "deb-symbols - Debian's extended shared library information file"
@@ -2822,13 +2786,13 @@
 
 #. type: Plain text
 #: deb-symbols.5:14
-msgid "E<lt>library sonameE<gt> E<lt>main dependency templateE<gt>"
-msgstr "E<lt>Bibliotheks-SonameE<gt> E<lt>HauptabhängigkeitsvorlageE<gt>"
+msgid "I<library-soname main-dependency-template>"
+msgstr "I<Bibliotheks-Soname Hauptabhängigkeitsvorlage>"
 
 #. type: Plain text
 #: deb-symbols.5:16
-msgid "[ | E<lt>alternative dependency templateE<gt> ]"
-msgstr "[ | E<lt>alternative AbhängigkeitsvorlageE<gt> ]"
+msgid "[ | I<alternative-dependency-template> ]"
+msgstr "[ | I<alternative-Abhängigkeitsvorlage> ]"
 
 #. type: Plain text
 #: deb-symbols.5:18
@@ -2837,25 +2801,25 @@
 
 #. type: Plain text
 #: deb-symbols.5:20
-msgid "[ * E<lt>field-nameE<gt>: E<lt>field valueE<gt> ]"
-msgstr "[ * E<lt>FeldnameE<gt>: E<lt>FeldwertE<gt> ]"
+msgid "[ * I<field-name>: I<field-value> ]"
+msgstr "[ * I<Feldname>: I<Feldwert> ]"
 
 #. type: Plain text
 #: deb-symbols.5:23
 #, no-wrap
 msgid ""
 "[ ... ]\n"
-" E<lt>symbolE<gt> E<lt>minimal versionE<gt>[ E<lt>id of dependency templateE<gt> ]\n"
+" I<symbol> I<minimal-version>[ I<id-of-dependency-template> ]\n"
 msgstr ""
 "[ ... ]\n"
-" E<lt>SymbolE<gt> E<lt>MinimalversionE<gt>[ E<lt>Kennung der AbhängigkeitsvorlageE<gt> ]\n"
+" I<Symbol> I<Minimalversion>[ I<Kennung-der-Abhängigkeitsvorlage> ]\n"
 
 #. type: Plain text
 #: deb-symbols.5:29
 msgid ""
-"The I<library soname> is exactly the value of the SONAME field as exported "
-"by B<objdump>(1). A I<dependency template> is a dependency where I<#MINVER#> "
-"is dynamically replaced either by a version check like \"(E<gt>= I<minimal "
+"The I<library-soname> is exactly the value of the SONAME field as exported "
+"by B<objdump>(1). A I<dependency-template> is a dependency where I<#MINVER#> "
+"is dynamically replaced either by a version check like \"(E<gt>= I<minimal-"
 "version>)\" or by nothing (if an unversioned dependency is deemed "
 "sufficient)."
 msgstr ""
@@ -2870,15 +2834,15 @@
 #: deb-symbols.5:36
 msgid ""
 "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> being "
-"\"Base\" if the library is not versioned) is associated to a I<minimal "
+"\"Base\" if the library is not versioned) is associated to a I<minimal-"
 "version> of its dependency template (the main dependency template is used if "
-"I<id of dependency template> is not present). The first alternative "
+"I<id-of-dependency-template> is not present). The first alternative "
 "dependency template is numbered 1, the second one 2, etc."
 msgstr ""
 "Jedem exportierten I<Symbol> (aufgeführt als I<Name>@I<Version>, mit "
 "I<Version> als »Base«, falls die Bibliothek nicht versioniert ist) wird eine "
-"Minimalversion seiner Abhängigkeitsvorlage zugeordnet (die "
-"Hauptabhängigkeitsvorlage wird verwandt, falls die I<Kennung der "
+"I<Minimalversion> seiner Abhängigkeitsvorlage zugeordnet (die "
+"Hauptabhängigkeitsvorlage wird verwandt, falls die I<Kennung-der-"
 "Abhängigkeitsvorlage> nicht vorhanden ist). Die erste alternative "
 "Abhängigkeitsvorlage wird mit 1 nummeriert, die zweite mit 2 usw."
 
@@ -2888,15 +2852,15 @@
 "Each entry for a library can also have some fields of meta-information.  "
 "Those fields are stored on lines starting with an asterisk. Currently, the "
 "only valid field is I<Build-Depends-Package>, it indicates the name of the "
-"\"-dev\" package associated to the library and is used by dpkg-shlibdeps to "
-"make sure that the dependency generated is at least as strict as the "
+"\"-dev\" package associated to the library and is used by B<dpkg-shlibdeps> "
+"to make sure that the dependency generated is at least as strict as the "
 "corresponding build dependency."
 msgstr ""
 "Jeder Eintrag für eine Bibliothek kann auch einige Felder mit "
 "Metainformationen enthalten. Diese Felder werden in Zeilen gespeichert, die "
 "mit einem Stern beginnen. Derzeit ist I<Build-Depends-Package> das einzige "
 "gültige Feld, es gibt den Namen des »-dev«-Pakets an, das der Bibliothek "
-"zugeordnet ist, und wird von dpkg-shlibdeps verwandt, um sicherzustellen, "
+"zugeordnet ist, und wird von B<dpkg-shlibdeps> verwandt, um sicherzustellen, "
 "dass die erstellte Abhängigkeit mindestens genauso strikt ist wie die "
 "zugehörige Bau-Abhängigkeit."
 
@@ -2968,12 +2932,6 @@
 msgid "deb-triggers"
 msgstr "deb-triggers"
 
-#. type: TH
-#: deb-triggers.5:1 dpkg-trigger.1:1
-#, no-wrap
-msgid "2009-03-15"
-msgstr "2009-03-15"
-
 #. type: Plain text
 #: deb-triggers.5:4
 msgid "deb-triggers - package triggers"
@@ -3017,36 +2975,56 @@
 msgstr "B<interest> I<Trigger-Name>"
 
 #. type: Plain text
-#: deb-triggers.5:27
+#: deb-triggers.5:26
+msgid "B<interest-noawait> I<trigger-name>"
+msgstr "B<interest-noawait> I<Trigger-Name>"
+
+#. type: Plain text
+#: deb-triggers.5:33
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file."
+"triggers control file. The \"noawait\" variant does not put the triggering "
+"packages in triggers-awaited state. This should be used when the "
+"functionality provided by the trigger is not crucial."
 msgstr ""
 "Gibt an, dass das Paket an dem benannten Trigger interessiert ist. Alle "
 "Trigger, an denen ein Paket interessiert ist, müssen mit dieser Direktive in "
-"der Trigger-Steuerdatei aufgeführt werden."
+"der Trigger-Steuerdatei aufgeführt werden. Die Variante »noawait« setzt die "
+"triggernden Pakete nicht in den Zustand »triggers-awaited«. Dies sollte "
+"verwandt werden, wenn die von den Triggern bereitgestellte Funktionalität "
+"nicht äußerst wichtig ist."
 
 #. type: Plain text
-#: deb-triggers.5:31
+#: deb-triggers.5:37
 msgid "B<activate> I<trigger-name>"
 msgstr "B<activate> I<Trigger-Name>"
 
 #. type: Plain text
-#: deb-triggers.5:37
+#: deb-triggers.5:41
+msgid "B<activate-noawait> I<trigger-name>"
+msgstr "B<activate-noawait> I<Trigger-Name>"
+
+#. type: Plain text
+#: deb-triggers.5:50
 msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure."
+"conflicting package), purge and deconfigure.  The \"noawait\" variant does "
+"not put the triggering packages in triggers-awaited state. This should be "
+"used when the functionality provided by the trigger is not crucial."
 msgstr ""
 "Sorgt dafür, dass Änderungen an dem Zustand dieses Pakets einen "
 "spezifizierten Trigger aktiviert. Der Trigger wird am Beginn folgender "
 "Operationen aktiviert: unpack, configure, remove (hinzugefügt zum Nutzen von "
-"Paketen, die im Konflikt zueinander stehen), purge und deconfigure."
+"Paketen, die im Konflikt zueinander stehen), purge und deconfigure. Die "
+"Variante »noawait« setzt die triggernden Pakete nicht in den Zustand "
+"»triggers-awaited«. Dies sollte verwandt werden, wenn die von den Triggern "
+"bereitgestellte Funktionalität nicht äußerst wichtig ist."
 
 #. type: Plain text
-#: deb-triggers.5:45
+#: deb-triggers.5:58
 msgid ""
 "If this package disappears during the unpacking of another package the "
 "trigger will be activated when the disappearance is noted towards the end of "
@@ -3062,7 +3040,7 @@
 "angegebenen Trigger aktiviert."
 
 #. type: Plain text
-#: deb-triggers.5:48
+#: deb-triggers.5:61
 msgid ""
 "Unknown directives are an error which will prevent installation of the "
 "package."
@@ -3071,7 +3049,20 @@
 "verhindert."
 
 #. type: Plain text
-#: deb-triggers.5:52
+#: deb-triggers.5:66
+msgid ""
+"The \"-noawait\" variants are only supported by dpkg 1.16.1 or newer, and "
+"will lead to errors if used with an older dpkg. It is thus recommended to "
+"add a \"Pre-Depends: dpkg (E<gt>= 1.16.1)\" to any package that wish to use "
+"those directives."
+msgstr ""
+"Die Varianten »-noawait« werden nur von Dpkg 1.16.1 oder neuer unterstützt "
+"und werden bei älteren Dpkg zu Fehlern führen. Es wird daher empfohlen, ein "
+"»Pre-Depends: dpkg (E<gt>= 1.16.1)« zu jedem Paket hinzuzufügen, dass diese "
+"Direktiven nutzen möchte."
+
+#. type: Plain text
+#: deb-triggers.5:70
 msgid ""
 "B<dpkg-trigger>(1), B<dpkg>(1), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
 msgstr ""
@@ -3084,12 +3075,6 @@
 msgstr "dpkg"
 
 #. type: TH
-#: dpkg.1:1
-#, no-wrap
-msgid "2011-04-27"
-msgstr "2011-04-27"
-
-#. type: TH
 #: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
 #: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-query.1:1
 #: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.cfg.5:1
@@ -3104,8 +3089,8 @@
 
 #. type: Plain text
 #: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
-msgstr "B<dpkg> [I<Optionen>] I<Aktionen>"
+msgid "B<dpkg> [I<option>...] I<action>"
+msgstr "B<dpkg> [I<Option>...] I<Aktionen>"
 
 #. type: SH
 #: dpkg.1:9
@@ -3378,7 +3363,7 @@
 "Sie erzwingen dies mit der Option B<--force-remove-reinstreq>."
 
 #. type: SH
-#: dpkg.1:89
+#: dpkg.1:89 dselect.1:120
 #, no-wrap
 msgid "ACTIONS"
 msgstr "AKTIONEN"
@@ -3386,14 +3371,14 @@
 #. type: TP
 #: dpkg.1:90
 #, no-wrap
-msgid "B<-i>, B<--install> I<package_file>..."
+msgid "B<-i>, B<--install> I<package-file>..."
 msgstr "B<-i>, B<--install> I<Paketdatei>..."
 
 #. type: Plain text
 #: dpkg.1:94
 msgid ""
 "Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"I<package-file> must refer to a directory instead."
 msgstr ""
 "Installiere das Paket. Falls die B<--recursive> oder B<-R>-Option angegeben "
 "ist, muss sich I<Paketdatei> stattdessen auf ein Verzeichnis beziehen."
@@ -3460,14 +3445,14 @@
 #. type: TP
 #: dpkg.1:121
 #, no-wrap
-msgid "B<--unpack >I<package_file>..."
+msgid "B<--unpack >I<package-file>..."
 msgstr "B<--unpack >I<Paketdatei> ..."
 
 #. type: Plain text
 #: dpkg.1:126
 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."
+"option is specified, I<package-file> must refer to a directory instead."
 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 "
@@ -3642,15 +3627,15 @@
 #. type: TP
 #: dpkg.1:195
 #, no-wrap
-msgid "B<-A>, B<--record-avail> I<package_file>..."
+msgid "B<-A>, B<--record-avail> I<package-file>..."
 msgstr "B<-A>, B<--record-avail> I<Paketdatei> ..."
 
 #. type: Plain text
 #: dpkg.1:201
 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."
+"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 ""
 "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<--"
@@ -3663,7 +3648,6 @@
 msgid "B<--forget-old-unavail>"
 msgstr "B<--forget-old-unavail>"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg.1:205
 msgid ""
@@ -3719,7 +3703,7 @@
 "»vollständig gelöscht« wurden) nicht angezeigt."
 
 #. type: TP
-#: dpkg.1:218 update-alternatives.8:300
+#: dpkg.1:218 update-alternatives.8:299
 #, no-wrap
 msgid "B<--set-selections>"
 msgstr "B<--set-selections>"
@@ -3728,14 +3712,14 @@
 #: dpkg.1:224
 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 format 'I<package> I<state>', where state is one of B<install>, B<hold>, "
+"B<deinstall> or B<purge>. Blank lines and comment lines beginning with '#' "
+"are also permitted."
 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."
+"Diese Datei sollte im Format »I<Paket> I<Zustand>« sein, wobei Zustand einer "
+"aus B<install>, B<hold>, B<deinstall> oder B<purge> ist. Leerzeilen und "
+"Kommentarzeilen (beginnend mit »#«) sind auch erlaubt."
 
 #. type: TP
 #: dpkg.1:224
@@ -3815,26 +3799,25 @@
 #. type: TP
 #: dpkg.1:248
 #, no-wrap
-msgid "B<--command-fd >I<E<lt>nE<gt>>"
-msgstr "B<--command-fd >I<E<lt>nE<gt>>"
+msgid "B<--command-fd >I<n>"
+msgstr "B<--command-fd >I<n>"
 
 #. type: Plain text
 #: dpkg.1:253
 msgid ""
-"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and through this file "
-"descriptor, are not reset for subsequent commands executed during the same "
-"run."
-msgstr ""
-"Akzeptiert eine Reihe von Befehlen an Eingabe-Dateideskriptor "
-"I<E<lt>nE<gt>>. Hinweis: Zusätzliche auf der Kommandozeile und durch diesen "
-"Dateideskriptor gesetzte Optionen werden nicht für nachfolgende Befehle, die "
-"im gleichen Lauf ausgeführt werden, zurückgesetzt."
+"Accept a series of commands on input file descriptor I<n>. Note: additional "
+"options set on the command line, and through this file descriptor, are not "
+"reset for subsequent commands executed during the same run."
+msgstr ""
+"Akzeptiert eine Reihe von Befehlen an Eingabe-Dateideskriptor I<n>. Hinweis: "
+"Zusätzliche auf der Kommandozeile und durch diesen Dateideskriptor gesetzte "
+"Optionen werden nicht für nachfolgende Befehle, die im gleichen Lauf "
+"ausgeführt werden, zurückgesetzt."
 
 #. type: TP
-#: dpkg.1:253 dpkg-architecture.1:61 dpkg-buildflags.1:71 dpkg-divert.8:71
-#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
-#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
+#: dpkg.1:253 dpkg-architecture.1:60 dpkg-buildflags.1:89 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:66 dpkg-statoverride.8:44
+#: dpkg-vendor.1:28 dselect.1:113 update-alternatives.8:316
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
@@ -3867,14 +3850,14 @@
 msgstr "Gib Hilfe über Debugging-Optionen."
 
 #. type: TP
-#: dpkg.1:262 dpkg-architecture.1:64 dpkg-buildflags.1:74
+#: dpkg.1:262 dpkg-architecture.1:63 dpkg-buildflags.1:92
 #: dpkg-buildpackage.1:226 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
-#: dpkg-deb.1:167 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
-#: dpkg-query.1:113 dpkg-scanpackages.1:100 dpkg-scansources.1:69
-#: dpkg-shlibdeps.1:220 dpkg-source.1:93 dpkg-split.1:130
-#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
-#: update-alternatives.8:320
+#: dpkg-deb.1:175 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:113 dpkg-scanpackages.1:99 dpkg-scansources.1:68
+#: dpkg-shlibdeps.1:218 dpkg-source.1:99 dpkg-split.1:129
+#: dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:116
+#: update-alternatives.8:319
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
@@ -3979,14 +3962,14 @@
 "    B<apt-cache show> I<Paketname> verwenden.\n"
 
 #. type: SH
-#: dpkg.1:310 dpkg-architecture.1:68 dpkg-buildpackage.1:50
-#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:171
+#: dpkg.1:310 dpkg-architecture.1:67 dpkg-buildpackage.1:50
+#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:179
 #: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
-#: dpkg-parsechangelog.1:15 dpkg-query.1:117 dpkg-scanpackages.1:72
-#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
-#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
-#: start-stop-daemon.8:104 update-alternatives.8:324
+#: dpkg-gensymbols.1:369 dpkg-mergechangelogs.1:27 dpkg-name.1:30
+#: dpkg-parsechangelog.1:15 dpkg-query.1:117 dpkg-scanpackages.1:71
+#: dpkg-scansources.1:44 dpkg-shlibdeps.1:106 dpkg-split.1:133
+#: dpkg-statoverride.8:51 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:36
+#: start-stop-daemon.8:103 update-alternatives.8:323
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPTIONEN"
@@ -4459,7 +4442,7 @@
 
 #. type: TP
 #: dpkg.1:495 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
-#: dpkg-query.1:118 dpkg-shlibdeps.1:213 dpkg-trigger.1:39
+#: dpkg-query.1:118 dpkg-shlibdeps.1:211 dpkg-trigger.1:39
 #, no-wrap
 msgid "B<--admindir=>I<dir>"
 msgstr "B<--admindir=>I<Verz>"
@@ -4769,24 +4752,22 @@
 "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."
+"I<state> I<pkg> I<installed-version>' for status change updates; `YYYY-MM-DD "
+"HH:MM:SS I<action> I<pkg> I<installed-version> I<available-version>' for "
+"actions where I<action> is one of B<install>, B<upgrade>, B<remove>, "
+"B<purge>; and `YYYY-MM-DD HH:MM:SS conffile I<filename> I<decision>' for "
+"conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 "Protokolliere Statusä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 »JJJJ-MM-TT HH:MM:SS status "
-"E<lt>ZustandE<gt> E<lt>PktE<gt> E<lt>installierte-VersionE<gt>« für "
-"Statusänderungsaktualisierungen; »JJJJ-MM-TT 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."
+"I<Zustand> I<Pkt> I<installierte-Version>« für "
+"Statusänderungsaktualisierungen; »JJJJ-MM-TT HH:MM:SS I<Aktion> I<Pkt> "
+"I<installierte-Version> I<verfügbare-Version>« für Aktionen, wobei I<Aktion> "
+"entweder B<install>, B<upgrade>, B<remove> oder B<purge> ist; und »YYYY-MM-"
+"DD HH:MM:SS conffile I<Dateiname> I<Entscheidung>« für Conffile-Änderungen "
+"ist, wobei I<Entscheidung> entweder B<install> oder B<keep> ist."
 
 #. type: TP
 #: dpkg.1:611
@@ -4897,7 +4878,6 @@
 "oder nicht usw. Lesen Sie den Abschnitt B<INFORMATIONEN ÜBER PAKETE> für "
 "weitere Informationen."
 
-# type: Plain text
 #. type: Plain text
 #: dpkg.1:650
 msgid ""
@@ -4954,20 +4934,19 @@
 msgstr "I<postrm>"
 
 #. type: SH
-#: dpkg.1:666 dpkg-buildflags.1:110 dpkg-buildpackage.1:230 dpkg-deb.1:220
-#: dpkg-divert.8:112 dpkg-query.1:204 dpkg-statoverride.8:69 dpkg-trigger.1:60
-#: dpkg-vendor.1:42 dselect.1:430 update-alternatives.8:355
+#: dpkg.1:666 dpkg-buildflags.1:128 dpkg-buildpackage.1:230 dpkg-deb.1:232
+#: dpkg-divert.8:112 dpkg-query.1:204 dpkg-statoverride.8:68 dpkg-trigger.1:60
+#: dpkg-vendor.1:42 dselect.1:423 update-alternatives.8:354
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "UMGEBUNG"
 
 #. type: TP
-#: dpkg.1:667 dselect.1:431
+#: dpkg.1:667 dselect.1:424
 #, no-wrap
 msgid "B<HOME>"
 msgstr "B<HOME>"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg.1:671
 msgid ""
@@ -4977,14 +4956,12 @@
 "Falls gesetzt wird B<dpkg> es als das Verzeichnis verwenden, aus dem die "
 "benutzerspezifische Konfigurationsdatei gelesen wird."
 
-# type: TP
 #. type: TP
-#: dpkg.1:671 dpkg-deb.1:221
+#: dpkg.1:671 dpkg-deb.1:233
 #, no-wrap
 msgid "B<TMPDIR>"
 msgstr "B<TMPDIR>"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg.1:675
 msgid ""
@@ -5087,7 +5064,6 @@
 msgid "B<DPKG_RUNNING_VERSION>"
 msgstr "B<DPKG_RUNNING_VERSION>"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg.1:701
 msgid ""
@@ -5103,7 +5079,6 @@
 msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
 msgstr "B<DPKG_MAINTSCRIPT_PACKAGE>"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg.1:705
 msgid ""
@@ -5119,7 +5094,6 @@
 msgid "B<DPKG_MAINTSCRIPT_ARCH>"
 msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg.1:709
 msgid ""
@@ -5135,7 +5109,6 @@
 msgid "B<DPKG_MAINTSCRIPT_NAME>"
 msgstr "B<DPKG_MAINTSCRIPT_NAME>"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg.1:713
 msgid ""
@@ -5307,12 +5280,6 @@
 msgid "dpkg-architecture"
 msgstr "dpkg-architecture"
 
-#. type: TH
-#: dpkg-architecture.1:1
-#, no-wrap
-msgid "2009-08-15"
-msgstr "2009-08-15"
-
 #. type: Plain text
 #: dpkg-architecture.1:4
 msgid ""
@@ -5320,12 +5287,12 @@
 msgstr "dpkg-architecture - Architektur zum Paketbau setzen und bestimmen"
 
 #. type: Plain text
-#: dpkg-architecture.1:9
-msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
-msgstr "B<dpkg-architecture> [I<Optionen>] [I<Befehle>]"
+#: dpkg-architecture.1:8
+msgid "B<dpkg-architecture> [I<option>...] [I<command>]"
+msgstr "B<dpkg-architecture> [I<Option>...] [I<Befehl>]"
 
 #. type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg-architecture.1:13
 msgid ""
 "dpkg-architecture does provide a facility to determine and set the build and "
 "host architecture for package building."
@@ -5334,7 +5301,7 @@
 "für den Paketbau zu bestimmen und zu setzen."
 
 #. type: Plain text
-#: dpkg-architecture.1:17
+#: dpkg-architecture.1:16
 msgid ""
 "The build architecture is always determined by an external call to B<dpkg>"
 "(1), and can not be set at the command line."
@@ -5343,7 +5310,7 @@
 "bestimmt und kann nicht auf der Kommandozeile gesetzt werden."
 
 #. type: Plain text
-#: dpkg-architecture.1:26
+#: dpkg-architecture.1:25
 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 "
@@ -5363,22 +5330,22 @@
 "wird, falls Ihre Wahl nicht mit dem Standardwert übereinstimmt."
 
 #. type: SH
-#: dpkg-architecture.1:27 dpkg-buildflags.1:34 dpkg-deb.1:28 dpkg-divert.8:24
-#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
-#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
-#: update-alternatives.8:203
+#: dpkg-architecture.1:26 dpkg-buildflags.1:45 dpkg-deb.1:27 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:18 dpkg-split.1:31 dpkg-statoverride.8:23
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:34
+#: update-alternatives.8:202
 #, no-wrap
 msgid "COMMANDS"
 msgstr "BEFEHLE"
 
 #. type: TP
-#: dpkg-architecture.1:28
+#: dpkg-architecture.1:27
 #, no-wrap
 msgid "B<-l>"
 msgstr "B<-l>"
 
 #. type: Plain text
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 msgid ""
 "Print the environment variables, one each line, in the format "
 "I<VARIABLE=value>. This is the default action."
@@ -5387,13 +5354,13 @@
 "I<VARIABLE=Wert>. Dies ist die Standardaktion."
 
 #. type: TP
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 #, no-wrap
 msgid "B<-e>I<debian-architecture>"
 msgstr "B<-e>I<Debian-Architektur>"
 
 #. type: Plain text
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 msgid ""
 "Check for equality of architecture. By default I<debian-architecture> is "
 "compared against the current Debian architecture, being the host.  This "
@@ -5407,13 +5374,13 @@
 "besteht, andernfalls mit 1."
 
 #. type: TP
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 #, no-wrap
 msgid "B<-i>I<architecture-wildcard>"
 msgstr "B<-i>I<Architektur-Platzhalter>"
 
 #. type: Plain text
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 msgid ""
 "Check for identity of architecture by expanding I<architecture-wildcard> as "
 "an architecture wildcard and comparing against the current Debian "
@@ -5426,24 +5393,24 @@
 "falls eine Übereinstimmung gefunden wurde, ansonsten mit 1."
 
 #. type: TP
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 #, no-wrap
 msgid "B<-q>I<variable-name>"
 msgstr "B<-q>I<Variablenname>"
 
 #. type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 msgid "Print the value of a single variable."
 msgstr "Zeige den Wert einer einzelnen Variablen an."
 
 #. type: TP
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 #, no-wrap
 msgid "B<-s>"
 msgstr "B<-s>"
 
 #. type: Plain text
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 msgid ""
 "Print an export command. This can be used to set the environment variables "
 "using eval."
@@ -5452,25 +5419,25 @@
 "Umgebungsvariablen mittels eval zu setzen."
 
 #. type: TP
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 #, no-wrap
 msgid "B<-u>"
 msgstr "B<-u>"
 
 #. type: Plain text
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 "Ähnlich wie B<-s>, gebe einen Export-Befehl aus, der alle Variablen löscht."
 
 #. type: TP
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 #, no-wrap
 msgid "B<-c>I< command>"
 msgstr "B<-c>I< Befehl>"
 
 #. type: Plain text
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 msgid ""
 "Execute a I<command> in an environment which has all variables set to the "
 "determined value."
@@ -5479,70 +5446,70 @@
 "festgelegten Werte gesetzt sind."
 
 #. type: TP
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 #, no-wrap
 msgid "B<-L>"
 msgstr "B<-L>"
 
 #. type: Plain text
-#: dpkg-architecture.1:61
+#: dpkg-architecture.1:60
 msgid "Print a list of valid architecture names."
 msgstr "Zeige eine Liste von gültigen Architekturnamen."
 
 #. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildflags.1:74 dpkg-buildpackage.1:226
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:167
+#: dpkg-architecture.1:63 dpkg-buildflags.1:92 dpkg-buildpackage.1:226
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:175
 #: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
-#: dpkg-parsechangelog.1:36 dpkg-query.1:113 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:93
-#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
-#: update-alternatives.8:320
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-name.1:61
+#: dpkg-parsechangelog.1:36 dpkg-query.1:113 dpkg-scanpackages.1:99
+#: dpkg-scansources.1:68 dpkg-shlibdeps.1:218 dpkg-source.1:99
+#: dpkg-split.1:129 dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31
+#: update-alternatives.8:319
 msgid "Show the usage message and exit."
 msgstr "Zeige den Bedienungshinweis und beende."
 
 #. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildflags.1:77 dpkg-buildpackage.1:229
-#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:170
+#: dpkg-architecture.1:66 dpkg-buildflags.1:95 dpkg-buildpackage.1:229
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:178
 #: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
-#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
-#: dpkg-parsechangelog.1:39 dpkg-query.1:116 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:96
-#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
-#: update-alternatives.8:323
+#: dpkg-gensymbols.1:449 dpkg-mergechangelogs.1:44 dpkg-name.1:64
+#: dpkg-parsechangelog.1:39 dpkg-query.1:116 dpkg-scanpackages.1:102
+#: dpkg-scansources.1:70 dpkg-shlibdeps.1:221 dpkg-source.1:102
+#: dpkg-split.1:132 dpkg-statoverride.8:50 dpkg-trigger.1:37 dpkg-vendor.1:34
+#: update-alternatives.8:322
 msgid "Show the version and exit."
 msgstr "Gebe die Version aus und beende sich."
 
 #. type: TP
-#: dpkg-architecture.1:69
+#: dpkg-architecture.1:68
 #, no-wrap
 msgid "B<-a>I<debian-architecture>"
 msgstr "B<-a>I<Debian-Architektur>"
 
 #. type: Plain text
-#: dpkg-architecture.1:72
+#: dpkg-architecture.1:71
 msgid "Set the Debian architecture."
 msgstr "Setze die Debian-Architektur."
 
 #. type: TP
-#: dpkg-architecture.1:72 dpkg-buildpackage.1:110
+#: dpkg-architecture.1:71 dpkg-buildpackage.1:110
 #, no-wrap
 msgid "B<-t>I<gnu-system-type>"
 msgstr "B<-t>I<GNU-Systemtyp>"
 
 #. type: Plain text
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 msgid "Set the GNU system type."
 msgstr "Setze den GNU-Systemtyp."
 
 #. type: TP
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 #, no-wrap
 msgid "B<-f>"
 msgstr "B<-f>"
 
 #. type: Plain text
-#: dpkg-architecture.1:82
+#: dpkg-architecture.1:81
 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 "
@@ -5558,41 +5525,41 @@
 "(beispielsweise B<dpkg-buildpackage>(1))."
 
 #. type: SH
-#: dpkg-architecture.1:83
+#: dpkg-architecture.1:82
 #, no-wrap
 msgid "TERMS"
 msgstr "AUSDRÜCKE"
 
 #. type: IP
-#: dpkg-architecture.1:84
+#: dpkg-architecture.1:83
 #, no-wrap
 msgid "build machine"
 msgstr "Baumaschine"
 
 #. type: Plain text
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 msgid "The machine the package is built on."
 msgstr "Die Maschine, auf der das Paket gebaut wird."
 
 #. type: IP
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 #, no-wrap
 msgid "host machine"
 msgstr "Host-Maschine"
 
 #. type: Plain text
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 msgid "The machine the package is built for."
 msgstr "Die Maschine, für die das Paket gebaut ist."
 
 #. type: IP
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 #, no-wrap
 msgid "Debian architecture"
 msgstr "Debian-Architektur"
 
 #. type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 msgid ""
 "The Debian architecture string, which specifies the binary tree in the "
 "\\s-1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
@@ -5601,13 +5568,13 @@
 "Archiv spezifiziert. Beispiele: i386, sparc, hurd-i386."
 
 #. type: IP
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 #, no-wrap
 msgid "architecture wildcard"
 msgstr "Architektur-Platzhalter"
 
 #. type: Plain text
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 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>-"
@@ -5619,13 +5586,13 @@
 "any."
 
 #. type: IP
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 #, no-wrap
 msgid "\\s-1GNU\\s0 system type"
 msgstr "\\s-1GNU\\s0-Systemtyp"
 
 #. type: Plain text
-#: dpkg-architecture.1:99
+#: dpkg-architecture.1:98
 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, "
@@ -5636,112 +5603,112 @@
 "sparc-linux-gnu, i386-gnu, x86_64-netbsd."
 
 #. type: SH
-#: dpkg-architecture.1:100
+#: dpkg-architecture.1:99
 #, no-wrap
 msgid "VARIABLES"
 msgstr "VARIABLEN"
 
 #. type: Plain text
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 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
+#: dpkg-architecture.1:101
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 msgid "The Debian architecture of the build machine."
 msgstr "Die Debian-Architektur der Baumaschine."
 
 #. type: IP
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 #, 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:105
 msgid "The Debian system name of the build machine."
 msgstr "Der Debian-Systemname der Baumaschine."
 
 #. type: IP
-#: dpkg-architecture.1:106
+#: dpkg-architecture.1:105
 #, 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:107
 msgid "The Debian cpu name of the build machine."
 msgstr "Der Debian-CPU-Name der Baumaschine."
 
 #. type: IP
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 msgid "The pointer size of the build machine (in bits)."
 msgstr "Die Zeigergröße der Baumaschine in Bits."
 
 #. type: IP
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 msgid "The endianness of the build machine (little / big)."
 msgstr "Die Endianness der Baumaschine (little/big)."
 
 #. type: IP
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 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:114
+#: dpkg-architecture.1:113
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr "Der System-Teil von \\s-1DEB_BUILD_GNU_TYPE\\s0."
 
 #. type: IP
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr "Der \\s-1GNU\\s0-Systemtyp der Baumaschine."
 
 #. type: IP
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 #, no-wrap
 msgid "\\s-1DEB_BUILD_MULTIARCH\\s0"
 msgstr "\\s-1DEB_BUILD_MULTIARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 msgid ""
 "The clarified \\s-1GNU\\s0 system type of the build machine, used for "
 "filesystem paths."
@@ -5750,101 +5717,101 @@
 "Dateisystempfade benutzt."
 
 #. type: IP
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr "\\s-1DEB_HOST_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 msgid "The Debian architecture of the host machine."
 msgstr "Die Debian-Architektur der Host-Maschine."
 
 #. type: IP
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_OS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 msgid "The Debian system name of the host machine."
 msgstr "Der Debian-Systemname der Host-Maschine."
 
 #. type: IP
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 msgid "The Debian cpu name of the host machine."
 msgstr "Der Debian-CPU-Name der Host-Maschine."
 
 #. type: IP
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_BITS\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_BITS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 msgid "The pointer size of the host machine (in bits)."
 msgstr "Die Zeigergröße der Host-Maschine in Bits."
 
 #. type: IP
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_ENDIAN\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_ENDIAN\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 msgid "The endianness of the host machine (little / big)."
 msgstr "Die Endianness der Host-Maschine (little/big)."
 
 #. type: IP
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr "\\s-1DEB_HOST_GNU_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 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: IP
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr "Der System-Teil von \\s-1DEB_HOST_GNU_TYPE\\s0."
 
 #. type: IP
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr "\\s-1DEB_HOST_GNU_TYPE\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 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:137
+#: dpkg-architecture.1:136
 #, no-wrap
 msgid "\\s-1DEB_HOST_MULTIARCH\\s0"
 msgstr "\\s-1DEB_HOST_MULTIARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:140
+#: dpkg-architecture.1:139
 msgid ""
 "The clarified \\s-1GNU\\s0 system type of the host machine, used for "
 "filesystem paths."
@@ -5853,13 +5820,13 @@
 "Dateisystempfade benutzt."
 
 #. type: SH
-#: dpkg-architecture.1:141
+#: dpkg-architecture.1:140
 #, no-wrap
 msgid "DEBIAN/RULES"
 msgstr "DEBIAN/RULES"
 
 #. type: Plain text
-#: dpkg-architecture.1:149
+#: dpkg-architecture.1:148
 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 "
@@ -5877,12 +5844,12 @@
 "Cross-Kompilierungs-Unterstützung in Ihrem Paket verbessern können:"
 
 #. type: Plain text
-#: dpkg-architecture.1:152 dpkg-architecture.1:169
+#: dpkg-architecture.1:151 dpkg-architecture.1:168
 msgid "Instead of:"
 msgstr "Anstatt von:"
 
 #. type: Plain text
-#: dpkg-architecture.1:156
+#: dpkg-architecture.1:155
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5892,12 +5859,12 @@
 "configure $(\\s-1ARCH\\s0)-linux\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:159
+#: dpkg-architecture.1:158
 msgid "please use the following:"
 msgstr "verwenden Sie bitte das folgende:"
 
 #. type: Plain text
-#: dpkg-architecture.1:163
+#: dpkg-architecture.1:162
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
@@ -5907,13 +5874,13 @@
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:165
+#: dpkg-architecture.1:164
 #, 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:175
+#: dpkg-architecture.1:174
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5927,18 +5894,18 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:178
+#: dpkg-architecture.1:177
 msgid "please use:"
 msgstr "bitte verwenden Sie:"
 
 #. type: Plain text
-#: dpkg-architecture.1:181
+#: dpkg-architecture.1:180
 #, 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:185
+#: dpkg-architecture.1:184
 #, no-wrap
 msgid ""
 "ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
@@ -5950,7 +5917,7 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:189
+#: dpkg-architecture.1:188
 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."
@@ -5959,7 +5926,7 @@
 "die DEB_HOST_ARCH_CPU- oder DEB_HOST_ARCH_OS-Variablen."
 
 #. type: Plain text
-#: dpkg-architecture.1:194
+#: dpkg-architecture.1:193
 msgid ""
 "In general, calling dpkg in the rules file to get architecture information "
 "is deprecated (unless you want to provide backward compatibility, see "
@@ -5973,14 +5940,13 @@
 "einem Prozessornamen übereinstimmen."
 
 #. type: SH
-#: dpkg-architecture.1:195
+#: dpkg-architecture.1:194
 #, no-wrap
 msgid "BACKWARD COMPATIBILITY"
 msgstr "RÜCKWÄRTSKOMPATIBILITÄT"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-architecture.1:199
+#: dpkg-architecture.1:198
 msgid ""
 "The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced in dpkg-"
 "dev 1.15.4. Using them in I<debian/rules> thus requires a build-dependency "
@@ -5991,7 +5957,7 @@
 "daher eine Bauabhängigkeit von dpkg-dev (E<gt>= 1.15.4)."
 
 #. type: Plain text
-#: dpkg-architecture.1:204
+#: dpkg-architecture.1:203
 msgid ""
 "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in dpkg-"
 "dev 1.13.2. Before this I<debian/rules> files tended to check the values of "
@@ -6004,7 +5970,7 @@
 "die aber Änderungen unterlagen."
 
 #. type: Plain text
-#: dpkg-architecture.1:209
+#: dpkg-architecture.1:208
 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 "
@@ -6018,7 +5984,7 @@
 "Sie den folgenden Code verwenden:"
 
 #. type: Plain text
-#: dpkg-architecture.1:213
+#: dpkg-architecture.1:212
 #, no-wrap
 msgid ""
 "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
@@ -6028,7 +5994,7 @@
 "DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:227
+#: dpkg-architecture.1:226
 #, no-wrap
 msgid ""
 "# Take account of old dpkg-architecture output.\n"
@@ -6060,12 +6026,12 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:230
+#: dpkg-architecture.1:229
 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-architecture.1:233
+#: dpkg-architecture.1:232
 msgid ""
 "If you still wish to support versions of dpkg-dev that did not include "
 "B<dpkg-architecture>, the following does the job:"
@@ -6074,7 +6040,7 @@
 "enthielten, unterstützen wollen, erledigt dies folgendes:"
 
 #. type: Plain text
-#: dpkg-architecture.1:243
+#: dpkg-architecture.1:242
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
@@ -6096,7 +6062,7 @@
 "DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:248
+#: dpkg-architecture.1:247
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
@@ -6110,7 +6076,7 @@
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:252
+#: dpkg-architecture.1:251
 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."
@@ -6120,7 +6086,7 @@
 "wird."
 
 #. type: Plain text
-#: dpkg-architecture.1:259
+#: dpkg-architecture.1:258
 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 "
@@ -6137,7 +6103,7 @@
 "»natürlichen« Kompilierung rückwärtskompatibel sein wollen)."
 
 #. type: Plain text
-#: dpkg-architecture.1:262
+#: dpkg-architecture.1:261
 msgid ""
 "The B<-e> and B<-i> options were only introduced in relatively recent "
 "versions of B<dpkg-architecture> (since dpkg 1.13.13)."
@@ -6146,7 +6112,7 @@
 "B<dpkg-architecture> eingeführt (seit Dpkg 1.13.13)."
 
 #. type: Plain text
-#: dpkg-architecture.1:266
+#: dpkg-architecture.1:265
 msgid ""
 "B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
 "architecture>. Other examples:"
@@ -6155,17 +6121,17 @@
 "architecture> weiter. Weitere Beispiele:"
 
 #. type: Plain text
-#: dpkg-architecture.1:268
+#: dpkg-architecture.1:267
 msgid "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 msgstr "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 
 #. type: Plain text
-#: dpkg-architecture.1:270
+#: dpkg-architecture.1:269
 msgid "eval \\`dpkg-architecture -u\\`"
 msgstr "eval \\`dpkg-architecture -u\\`"
 
 #. type: Plain text
-#: dpkg-architecture.1:273
+#: dpkg-architecture.1:272
 msgid ""
 "Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
@@ -6173,17 +6139,17 @@
 "einer übergebenen ist:"
 
 #. type: Plain text
-#: dpkg-architecture.1:275
+#: dpkg-architecture.1:274
 msgid "dpkg-architecture -elinux-alpha"
 msgstr "dpkg-architecture -elinux-alpha"
 
 #. type: Plain text
-#: dpkg-architecture.1:277
+#: dpkg-architecture.1:276
 msgid "dpkg-architecture -amips -elinux-mips"
 msgstr "dpkg-architecture -amips -elinux-mips"
 
 #. type: Plain text
-#: dpkg-architecture.1:280
+#: dpkg-architecture.1:279
 msgid ""
 "Check if the current architecture or an architecture provided with -a are "
 "Linux systems:"
@@ -6192,57 +6158,57 @@
 "Systeme sind:"
 
 #. type: Plain text
-#: dpkg-architecture.1:282
+#: dpkg-architecture.1:281
 msgid "dpkg-architecture -ilinux-any"
 msgstr "dpkg-architecture -ilinux-any"
 
 #. type: Plain text
-#: dpkg-architecture.1:284
+#: dpkg-architecture.1:283
 msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr "dpkg-architecture -ai386 -ilinux-any"
 
 #. type: Plain text
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 msgid ""
 "All these files have to be present for B<dpkg-architecture> to work. Their "
 "location can be overridden at runtime with the environment variable "
-"DPKG_DATADIR."
+"B<DPKG_DATADIR>."
 msgstr ""
 "Alle diese Dateien müssen vorhanden sein, damit B<dpkg-architecture> "
 "funktioniert. Ihr Ort kann zur Laufzeit mit der Umgebungsvariable "
-"DPKG_DATADIR überschrieben werden."
+"B<DPKG_DATADIR> überschrieben werden."
 
 #. type: TP
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 #, no-wrap
 msgid "I</usr/share/dpkg/cputable>"
 msgstr "I</usr/share/dpkg/cputable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 msgid "Table of known CPU names and mapping to their GNU name."
 msgstr "Tabelle der bekannten CPU-Namen und Abbildungen auf ihre GNU-Namen."
 
 #. type: TP
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 #, no-wrap
 msgid "I</usr/share/dpkg/ostable>"
 msgstr "I</usr/share/dpkg/ostable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 msgid "Table of known operating system names and mapping to their GNU name."
 msgstr ""
 "Tabelle der bekannten Betriebssystemnamen und Abbildungen auf ihre GNU-Namen."
 
 #. type: TP
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 #, no-wrap
 msgid "I</usr/share/dpkg/triplettable>"
 msgstr "I</usr/share/dpkg/triplettable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:299
+#: dpkg-architecture.1:298
 msgid ""
 "Mapping between Debian architecture triplets and Debian architecture names."
 msgstr ""
@@ -6250,12 +6216,12 @@
 "Architekturnamen."
 
 #. type: Plain text
-#: dpkg-architecture.1:303
+#: dpkg-architecture.1:302
 msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 msgstr "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 
 #. type: Plain text
-#: dpkg-architecture.1:308
+#: dpkg-architecture.1:307
 msgid ""
 "B<dpkg-architecture> and this man page were initially written by Marcus "
 "Brinkmann E<lt>brinkmd@debian.orgE<gt>."
@@ -6270,7 +6236,7 @@
 msgstr "dpkg.cfg"
 
 #. type: TH
-#: dpkg.cfg.5:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1
 #, no-wrap
 msgid "2009-09-05"
 msgstr "2009-09-05"
@@ -6307,7 +6273,7 @@
 msgstr "I<~/.dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:222 dpkg-statoverride.8:87
+#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:222 dpkg-statoverride.8:86
 msgid "B<dpkg>(1)."
 msgstr "B<dpkg>(1)."
 
@@ -6317,7 +6283,13 @@
 msgid "dpkg-buildflags"
 msgstr "dpkg-buildflags"
 
-# type: Plain text
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+#| msgid "2011-09-09"
+msgid "2011-09-13"
+msgstr "2011-09-09"
+
 #. type: Plain text
 #: dpkg-buildflags.1:4
 msgid "dpkg-buildflags - returns build flags to use during package build"
@@ -6325,8 +6297,8 @@
 
 #. type: Plain text
 #: dpkg-buildflags.1:8
-msgid "B<dpkg-buildflags> [I<option>...] I<command>"
-msgstr "B<dpkg-buildflags> [I<Option>...] I<Befehl>"
+msgid "B<dpkg-buildflags> [I<option>...] [I<command>]"
+msgstr "B<dpkg-buildflags> [I<Option>...] [I<Befehl>]"
 
 #. type: Plain text
 #: dpkg-buildflags.1:12
@@ -6337,7 +6309,6 @@
 "B<dpkg-buildflags> ist ein Werkzeug, das zum Abfragen der zu verwendenden "
 "Kompilierungsschalter für den Bau von Debian-Paketen eingesetzt wird."
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-buildflags.1:15
 msgid ""
@@ -6347,14 +6318,12 @@
 "Die Standardschalter werden vom Lieferanten definiert, sie können auf "
 "mehrere Arten erweitert/überschrieben werden:"
 
-# type: IP
 #. type: IP
 #: dpkg-buildflags.1:15
 #, no-wrap
 msgid "1."
 msgstr "1."
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-buildflags.1:17
 msgid "system-wide with B</etc/dpkg/buildflags.conf>;"
@@ -6372,10 +6341,9 @@
 "for the current user with B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> where B<"
 "$XDG_CONFIG_HOME> defaults to B<$HOME/.config>;"
 msgstr ""
-"für den aktuellen Benutzer mit  B<$XDG_CONFIG_HOME/dpkg/buildflags.conf>, "
+"für den aktuellen Benutzer mit B<$XDG_CONFIG_HOME/dpkg/buildflags.conf>, "
 "wobei B<$XDG_CONFIG_HOME> standardmäßig auf B<$HOME/.config> gesetzt ist"
 
-# type: IP
 #. type: IP
 #: dpkg-buildflags.1:20
 #, no-wrap
@@ -6383,52 +6351,97 @@
 msgstr "3."
 
 #. type: Plain text
-#: dpkg-buildflags.1:22
-msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
-msgstr "temporär mittels Umgebungsvariablen (siehe Abschnitt B<UMGEBUNG>)."
+#: dpkg-buildflags.1:23
+msgid ""
+"temporarily by the user with environment variables (see section "
+"B<ENVIRONMENT>);"
+msgstr ""
+"temporär durch den Benutzer mittels Umgebungsvariablen (siehe Abschnitt "
+"B<UMGEBUNG>)"
+
+#. type: IP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "4."
+msgstr "4."
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid ""
+"dynamically by the package maintainer with environment variables set via "
+"B<debian/rules> (see section B<ENVIRONMENT>)."
+msgstr ""
+"dynamisch durch den Paketverwalter mittels Umgebungsvariablen, die über "
+"B<debian/rules> gesetzt wurden (siehe Abschnitt B<UMGEBUNG>)"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 msgid "The configuration files can contain two types of directives:"
 msgstr "Die Konfigurationsdateien können zwei Arten von Direktiven enthalten:"
 
-# type: TP
 #. type: TP
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 #, no-wrap
 msgid "B<SET>I< flag value>"
 msgstr "B<SET>I< Schalter Wert>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
 msgid "Override the flag named I<flag> to have the value I<value>."
 msgstr ""
 "Überschreibt den Schalter namens I<Schalter>, um den Wert I<Wert> zu "
 "erhalten."
 
-# type: TP
 #. type: TP
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
+#, no-wrap
+msgid "B<STRIP>I< flag value>"
+msgstr "B<STRIP>I< Schalter Wert>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:34
+msgid ""
+"Strip from the flag named I<flag> all the build flags listed in I<value>."
+msgstr ""
+"Aus dem Schalter namens I<Schalter> alle in I<Wert> aufgeführten Bauschalter "
+"entfernen"
+
+#. type: TP
+#: dpkg-buildflags.1:34
 #, no-wrap
 msgid "B<APPEND>I< flag value>"
 msgstr "B<APPEND>I< Schalter Wert>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:31
+#: dpkg-buildflags.1:38
+msgid ""
+"Extend the flag named I<flag> by appending the options given in I<value>.  A "
+"space is prepended to the appended value if the flag's current value is non-"
+"empty."
+msgstr ""
+"Erweitert den Schalter namens I<Schalter> durch Anhängen der in I<Wert> "
+"angegebenen Optionen. Ein Leerzeichen wird vor den angehängten Wert "
+"vorangestellt, falls der derzeitige Wert nicht leer ist."
+
+#. type: TP
+#: dpkg-buildflags.1:38
+#, no-wrap
+msgid "B<PREPEND>I< flag value>"
+msgstr "B<PREPEND>I< Schalter Wert>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:42
 msgid ""
-"Extend the flag named I<flag> with the options given in I<value>.  A space "
-"is prepended to the appended value if the flag's current value is non-empty."
+"Extend the flag named I<flag> by prepending the options given in I<value>.  "
+"A space is appended to the prepended value if the flag's current value is "
+"non-empty."
 msgstr ""
-"Erweitert den Schalter namens I<Schalter> mit den in I<Wert> angegebenen "
-"Optionen. Ein Leerzeichen wird vor den angehängten Wert vorangestellt, falls "
-"der derzeitige Wert nicht leer ist."
+"Erweitert den Schalter namens I<Schalter> durch Voranstellen der in I<Wert> "
+"angegebenen Optionen. Ein Leerzeichen wird hinter den vorangestellten Wert "
+"angehängt, falls der derzeitige Wert nicht leer ist."
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:34
+#: dpkg-buildflags.1:45
 msgid ""
 "The configuration files can contain comments on lines starting with a hash "
 "(#). Empty lines are also ignored."
@@ -6437,14 +6450,31 @@
 "einer Raute (#) beginnen. Leere Zeilen werden auch ignoriert."
 
 #. type: TP
-#: dpkg-buildflags.1:35
+#: dpkg-buildflags.1:46
+#, no-wrap
+msgid "B<--dump>"
+msgstr "B<--dump>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:51
+msgid ""
+"Print to standard output all compilation flags and their values. It prints "
+"one flag per line separated from its value by an equal sign "
+"(\"I<flag>=I<value>\"). This is the default action."
+msgstr ""
+"Auf der Standardausgabe alle Kompilierschalter und ihre Werte ausgeben. Es "
+"wird ein Schalter pro Zeile ausgegeben, wobei der Werte durch ein "
+"Gleichheitszeichen (»I<Schalter>=I<Wert>«) abgetrennt wird. Dies ist die "
+"Standardaktion."
+
+#. type: TP
+#: dpkg-buildflags.1:51
 #, no-wrap
 msgid "B<--list>"
 msgstr "B<--list>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 msgid ""
 "Print the list of flags supported by the current vendor (one per line). See "
 "the B<SUPPORTED FLAGS> section for more information about them."
@@ -6454,37 +6484,38 @@
 "Informationen über sie."
 
 #. type: TP
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 #, no-wrap
 msgid "B<--export=>I<format>"
 msgstr "B<--export=>I<Format>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 msgid ""
 "Print to standard output shell (if I<format> is B<sh>) or make (if I<format> "
 "is B<make>) commands that can be used to export all the compilation flags in "
-"the environment. If the I<format> value is not given, B<sh> is assumed. Only "
-"compilation flags starting with an upper case character are included, others "
-"are assumed to not be suitable for the environment."
+"the environment. If I<format> is B<configure> then the output can be used on "
+"a B<./configure> command-line. If the I<format> value is not given, B<sh> is "
+"assumed. Only compilation flags starting with an upper case character are "
+"included, others are assumed to not be suitable for the environment."
 msgstr ""
 "Auf der Standardausgabe Shell- (falls I<Format> B<sh> ist) oder Make- (falls "
 "I<Format> B<make> ist) Befehle ausgeben, die dazu verwandt werden können, "
-"alle Kompilierschalter in die Umgebung zu exportieren. Falls der Wert von "
-"I<Format> nicht angegeben wird, wird B<sh> angenommen. Nur "
-"Kompilierschalter, die mit einem Großbuchstaben beginnen, werden "
-"aufgenommen. Bei allen anderen wird angenommen, dass sie für die Umgebung "
-"nicht geeignet sind."
+"alle Kompilierschalter in die Umgebung zu exportieren. Falls I<Format> "
+"B<configure> lautet, kann die Ausgabe für eine Kommandozeile von B<./"
+"configure> verwandt werden. Falls der Wert von I<Format> nicht angegeben "
+"wird, wird B<sh> angenommen. Nur Kompilierschalter, die mit einem "
+"Großbuchstaben beginnen, werden aufgenommen. Bei allen anderen wird "
+"angenommen, dass sie für die Umgebung nicht geeignet sind."
 
 #. type: TP
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 #, no-wrap
 msgid "B<--get>I< flag>"
 msgstr "B<--get>I< Schalter>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 msgid ""
 "Print the value of the flag on standard output. Exits with 0 if the flag is "
 "known otherwise exits with 1."
@@ -6493,14 +6524,13 @@
 "falls der Schalter bekannt ist, andernfalls mit 1."
 
 #. type: TP
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 #, no-wrap
 msgid "B<--origin>I< flag>"
 msgstr "B<--origin>I< Schalter>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:57
+#: dpkg-buildflags.1:75
 msgid ""
 "Print the origin of the value that is returned by B<--get>. Exits with 0 if "
 "the flag is known otherwise exits with 1. The origin can be one of the "
@@ -6511,75 +6541,69 @@
 "einer der folgenden Werte sein:"
 
 #. type: TP
-#: dpkg-buildflags.1:58
+#: dpkg-buildflags.1:76
 #, no-wrap
 msgid "B<vendor>"
 msgstr "B<vendor>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 msgid "the original flag set by the vendor is returned;"
 msgstr ""
 "der ursprünglich vom Lieferanten gesetzte Schalter wird zurückgeliefert"
 
 #. type: TP
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 #, no-wrap
 msgid "B<system>"
 msgstr "B<system>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 msgid "the flag is set/modified by a system-wide configuration;"
 msgstr ""
 "der Schalter wurde durch eine systemweite Konfiguration gesetzt/verändert"
 
 #. type: TP
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 #, no-wrap
 msgid "B<user>"
 msgstr "B<user>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 msgid "the flag is set/modified by a user-specific configuration;"
 msgstr ""
 "der Schalter wurde durch eine benutzerspezifische Konfiguration gesetzt/"
 "verändert"
 
 #. type: TP
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 #, no-wrap
 msgid "B<env>"
 msgstr "B<env>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:70
+#: dpkg-buildflags.1:88
 msgid "the flag is set/modified by an environment-specific configuration."
 msgstr ""
 "der Schalter wurde durch eine umgebungsspezifische Konfiguration gesetzt/"
 "verändert"
 
-# type: SH
 #. type: SH
-#: dpkg-buildflags.1:78
+#: dpkg-buildflags.1:96
 #, no-wrap
 msgid "SUPPORTED FLAGS"
 msgstr "UNTERSTÜTZTE SCHALTER"
 
 #. type: TP
-#: dpkg-buildflags.1:79
+#: dpkg-buildflags.1:97
 #, no-wrap
 msgid "B<CFLAGS>"
 msgstr "B<CFLAGS>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 msgid ""
 "Options for the C compiler. The default value set by the vendor includes I<-"
 "g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
@@ -6590,49 +6614,46 @@
 "I<-O0>, falls die Umgebungsvariable B<DEB_BUILD_OPTIONS> I<noopt> definiert."
 
 #. type: TP
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 #, no-wrap
 msgid "B<CPPFLAGS>"
 msgstr "B<CPPFLAGS>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 msgid "Options for the C preprocessor. Default value: empty."
 msgstr "Optionen für den C-Präprozessor. Standardwert: leer"
 
 #. type: TP
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 #, no-wrap
 msgid "B<CXXFLAGS>"
 msgstr "B<CXXFLAGS>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 msgid "Options for the C++ compiler. Same as B<CFLAGS>."
 msgstr "Optionen für den C++-Compiler. Identisch zu B<CFLAGS>."
 
 #. type: TP
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 #, no-wrap
 msgid "B<FFLAGS>"
 msgstr "B<FFLAGS>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
 msgstr "Optionen für den Fortran-Compiler. Identisch zu B<CFLAGS>."
 
 #. type: TP
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 #, no-wrap
 msgid "B<LDFLAGS>"
 msgstr "B<LDFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:102
+#: dpkg-buildflags.1:120
 msgid ""
 "Options passed to the compiler when linking executables or shared objects "
 "(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
@@ -6644,53 +6665,100 @@
 "leer."
 
 #. type: TP
-#: dpkg-buildflags.1:104
+#: dpkg-buildflags.1:122
 #, no-wrap
 msgid "B</etc/dpkg/buildflags.conf>"
 msgstr "B</etc/dpkg/buildflags.conf>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 msgid "System wide configuration file."
 msgstr "Systemweite Konfigurationsdatei"
 
 #. type: TP
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 #, no-wrap
 msgid "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or B<$HOME/.config/dpkg/buildflags.conf>"
 msgstr "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> oder B<$HOME/.config/dpkg/buildflags.conf>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:110
+#: dpkg-buildflags.1:128
 msgid "User configuration file."
 msgstr "Benutzer-Konfigurationsdatei"
 
-# type: TP
+#. type: Plain text
+#: dpkg-buildflags.1:135
+msgid ""
+"There are 2 sets of environment variables doing the same operations, the "
+"first one (DEB_I<flag>_I<op>) should never be used within B<debian/rules>. "
+"It's meant for any user that wants to rebuild the source package with "
+"different build flags. The second set (DEB_I<flag>_MAINT_I<op>) should only "
+"be used in B<debian/rules> by package maintainers to change the resulting "
+"build flags."
+msgstr ""
+"Es gibt einen Satz von zwei Umgebungsvariablen, die den gleichen Vorgang "
+"durchführen. Der erste (DEB_I<Schalter>_I<Vorg>) sollte niemals innerhalb "
+"von B<debian/rules> verwandt werden. Er ist für Benutzer gedacht, die das "
+"Quellpaket mit anderen Bauschaltern erneut bauen möchten. Der zweite Satz "
+"(DEB_I<Schalter>_MAINT_I<Vorg>) sollte nur durch Paketbetreuer in B<debian/"
+"rules> verwandt werden, um die entstehenden Bauschalter zu ändern."
+
 #. type: TP
-#: dpkg-buildflags.1:111
+#: dpkg-buildflags.1:135
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_SET>"
 msgstr "B<DEB_>I<Schalter>B<_SET>"
 
-# type: Plain text
+#. type: TQ
+#: dpkg-buildflags.1:137
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_SET>"
+msgstr "B<DEB_>I<Schalter>B<_MAINT_SET>"
+
 #. type: Plain text
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
 msgid ""
 "This variable can be used to force the value returned for the given I<flag>."
 msgstr ""
 "Diese Variable kann zum Erzwingen des für I<Schalter> zurückgegebenen Werts "
 "verwandt werden."
 
-# type: TP
 #. type: TP
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_STRIP>"
+msgstr "B<DEB_>I<Schalter>B<_STRIP>"
+
+#. type: TQ
+#: dpkg-buildflags.1:143
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_STRIP>"
+msgstr "B<DEB_>I<Schalter>B<_MAINT_STRIP>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:148
+msgid ""
+"This variable can be used to provide a space separated list of options that "
+"will be stripped from the set of flags returned for the given I<flag>."
+msgstr ""
+"Diese Variable kann zum Bereitstellen einer durch Leerzeichen getrennten "
+"Liste von Optionen verwandt werden, die aus dem Satz von I<Schalter> "
+"zurückgelieferten Schaltern entfernt werden."
+
+#. type: TP
+#: dpkg-buildflags.1:148
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_APPEND>"
 msgstr "B<DEB_>I<Schalter>B<_APPEND>"
 
-# type: Plain text
+#. type: TQ
+#: dpkg-buildflags.1:150
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_APPEND>"
+msgstr "B<DEB_>I<Schalter>B<_MAINT_APPEND>"
+
 #. type: Plain text
-#: dpkg-buildflags.1:119
+#: dpkg-buildflags.1:154
 msgid ""
 "This variable can be used to append supplementary options to the value "
 "returned for the given I<flag>."
@@ -6698,10 +6766,325 @@
 "Diese Variable kann zum Anhängen ergänzender Optionen zum Wert, der von "
 "I<Schalter> zurückgegeben wird, verwandt werden."
 
+#. type: TP
+#: dpkg-buildflags.1:154
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_PREPEND>"
+msgstr "B<DEB_>I<Schalter>B<_PREPEND>"
+
+#. type: TQ
+#: dpkg-buildflags.1:156
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_PREPEND>"
+msgstr "B<DEB_>I<Schalter>B<_MAINT_PREPEND>"
+
 #. type: Plain text
-#: dpkg-buildflags.1:122 dpkg-maintscript-helper.1:130
-msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
-msgstr "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+#: dpkg-buildflags.1:160
+msgid ""
+"This variable can be used to prepend supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+"Diese Variable kann zum Voranstellen ergänzender Optionen zum Wert, der von "
+"I<Schalter> zurückgegeben wird, verwandt werden."
+
+#. type: TP
+#: dpkg-buildflags.1:160
+#, no-wrap
+msgid "B<DEB_BUILD_MAINT_OPTIONS>"
+msgstr "B<DEB_BUILD_MAINT_OPTIONS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:165
+msgid ""
+"This variable can be used to disable/enable various hardening build flags "
+"through the B<hardening> option. See the B<HARDENING> section for details."
+msgstr ""
+"Diese Variable kann zum Deaktivieren oder Aktivieren verschiedener "
+"Härtungsbauschalter durch die Option B<hardening> verwandt werden. Lesen Sie "
+"den Abschnitt B<HÄRTUNG> für weitere Details."
+
+#. type: SH
+#: dpkg-buildflags.1:166
+#, no-wrap
+msgid "HARDENING"
+msgstr "HÄRTUNG"
+
+#. type: Plain text
+#: dpkg-buildflags.1:171
+msgid ""
+"Several compile-time options (detailed below) can be used to help harden a "
+"resulting binary against memory corruption attacks, or provide additional "
+"warning messages during compilation. Except as noted below, these are "
+"enabled by default for architectures that support them."
+msgstr ""
+"Mehrere Kompilierzeit-Optionen (weiter unten beschrieben) können dazu "
+"verwandt werden, ein erstelltes Programm gegen Speicherverfälschungsangriffe "
+"zu härten, oder zusätzliche Warnungsmeldungen während der Übersetzung "
+"auszugeben. Sie werden für Architekturen, die diese unterstützen, "
+"standardmäßig aktiviert; die Ausnahmen sind unten angegeben."
+
+#. type: Plain text
+#: dpkg-buildflags.1:177
+msgid ""
+"Each hardening feature can be enabled and disabled in the "
+"B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value with "
+"the \"+\" and \"-\" modifier. For example, to enable the \"pie\" feature and "
+"disable the \"fortify\" feature you can do this in B<debian/rules>:"
+msgstr ""
+"Jede Härtungsfunktionalität kann durch den entsprechenden B<Härtungs->-Wert "
+"in der Umgebungsvariablen B<DEB_BUILD_MAINT_OPTIONS> mit den »+«- und »-«-"
+"Schaltern aktiviert und deaktiviert werden. Soll beispielsweise die »pie«-"
+"Funktionalität aktiviert und die »fortify«-Funktionalität deaktiviert "
+"werden, können Sie Folgendes in B<debian/rules> verwenden:"
+
+#. type: Plain text
+#: dpkg-buildflags.1:179
+#, fuzzy, no-wrap
+#| msgid "  export DEB_BUILD_MAINT_OPTIONS=\"hardening=+pie,-fortify\"\n"
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n"
+msgstr "  export DEB_BUILD_MAINT_OPTIONS=\"hardening=+pie,-fortify\"\n"
+
+#. type: Plain text
+#: dpkg-buildflags.1:183
+msgid ""
+"The special feature B<all> can be used to enable or disable all hardening "
+"features at the same time. Thus disabling everything and enabling only "
+"\"format\" and \"fortify\" can be achieved with:"
+msgstr ""
+"Die spezielle Funktionalität B<all> kann dazu verwandt werden, alle "
+"Härtungsfunktionalitäten auf einmal zu aktivieren oder zu deaktiveren. Um "
+"daher alles zu deaktiveren und nur »format« und »fortify« zu aktiveren, kann "
+"Folgendes eingesetzt werden:"
+
+#. type: Plain text
+#: dpkg-buildflags.1:185
+#, fuzzy, no-wrap
+#| msgid "  export DEB_BUILD_MAINT_OPTIONS=\"hardening=-all,+format,+fortify\"\n"
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n"
+msgstr "  export DEB_BUILD_MAINT_OPTIONS=\"hardening=-all,+format,+fortify\"\n"
+
+#. type: TP
+#: dpkg-buildflags.1:186
+#, no-wrap
+msgid "B<format>"
+msgstr "B<format>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:198
+msgid ""
+"This setting (enabled by default) adds B<-Wformat -Wformat-security -"
+"Werror=format-security> to B<CFLAGS> and B<CXXFLAGS>. This will warn about "
+"improper format string uses, and will fail when format functions are used in "
+"a way that that represent possible security problems. At present, this warns "
+"about calls to B<printf> and B<scanf> functions where the format string is "
+"not a string literal and there are no format arguments, as in B<printf(foo);"
+"> instead of B<printf(\"%s\", foo);> This may be a security hole if the "
+"format string came from untrusted input and contains \"%n\"."
+msgstr ""
+"Diese Einstellung (standardmäßig aktiviert) fügt B<-Wformat -Wformat-"
+"security -Werror=format-security> zu B<CFLAGS> und B<CXXFLAGS> hinzu. Damit "
+"wird über inkorrekte Formatzeichenkettenverwendungen gewarnt und zu einem "
+"Fehler führen, wenn Formatfunktionen deart verwandt werden, dass daraus ein "
+"mögliches Sicherheitsproblem werden könnte. Derzeit warnt dies über Aufrufe "
+"auf B<printf>- und B<scanf>-Funktionen, bei denen die Formatzeichenkette "
+"nicht eine reine Zeichenkette ist und es keine Formatargumente gibt, wie in "
+"B<printf(foo);> statt B<printf(\"%s\", foo);>. Dies könnte ein "
+"Sicherheitsproblem sein, falls die Formatzeichenkette aus einer "
+"unvertrauenswürdigen Eingabe stammt und »%n« enthält."
+
+#. type: TP
+#: dpkg-buildflags.1:199
+#, no-wrap
+msgid "B<fortify>"
+msgstr "B<fortify>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:210
+#, fuzzy
+#| msgid ""
+#| "This setting (enabled by default) adds B<-D_FORTIFY_SOURCE=2> to "
+#| "B<CFLAGS> and B<CXXFLAGS>. During code generation the compiler knows a "
+#| "great deal of information about buffer sizes (where possible), and "
+#| "attempts to replace insecure unlimited length buffer function calls with "
+#| "length-limited ones. This is especially useful for old, crufty code.  "
+#| "Additionally, format strings in writable memory that contain '%n' are "
+#| "blocked. If an application depends on such a format string, it will need "
+#| "to be worked around."
+msgid ""
+"This setting (enabled by default) adds B<-D_FORTIFY_SOURCE=2> to "
+"B<CPPFLAGS>. During code generation the compiler knows a great deal of "
+"information about buffer sizes (where possible), and attempts to replace "
+"insecure unlimited length buffer function calls with length-limited ones. "
+"This is especially useful for old, crufty code.  Additionally, format "
+"strings in writable memory that contain '%n' are blocked. If an application "
+"depends on such a format string, it will need to be worked around."
+msgstr ""
+"Diese Einstellung (standardmäßig aktiviert) fügt B<-D_FORTIFY_SOURCE=2> zu "
+"B<CFLAGS> und B<CXXFLAGS> hinzu. Während der Code-Erstellung hat der "
+"Compiler umfangreiche Informationen über Puffergrößen (wo möglich) und "
+"versucht, unsichere unbegrenzte Pufferfunktionsaufrufe durch längenbegrenzte "
+"zu ersetzen. Das ist besonders für alten, verkramten Code nützlich. "
+"Zusätzlich werden Formatzeichenketten in schreibbarem Speicher, die »%n« "
+"enthalten, blockiert. Falls eine Anwendung von solchen Formatzeichenketten "
+"abhängt, müssen dafür andere Lösungsmöglichkeiten gefunden werden."
+
+#. type: Plain text
+#: dpkg-buildflags.1:213
+msgid ""
+"Note that for this option to have any effect, the source must also be "
+"compiled with B<-O1> or higher."
+msgstr ""
+"Beachten Sie, dass die Quellen auch mit B<-O1> oder höher kompiliert werden "
+"müssen, damit diese Option einen Effekt hat."
+
+#. type: TP
+#: dpkg-buildflags.1:213
+#, no-wrap
+msgid "B<stackprotector>"
+msgstr "B<stackprotector>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:222
+msgid ""
+"This setting (enabled by default) adds B<-fstack-protector --param=ssp-"
+"buffer-size=4> to B<CFLAGS> and B<CXXFLAGS>. This adds safety checks against "
+"stack overwrites. This renders many potential code injection attacks into "
+"aborting situations. In the best case this turns code injection "
+"vulnerabilities into denial of service or into non-issues (depending on the "
+"application)."
+msgstr ""
+"Diese Einstellung (standardmäßig aktiviert) fügt B<-fstack-protector --"
+"param=ssp-buffer-size=4> zu B<CFLAGS> und B<CXXFLAGS> hinzu. Dies fügt "
+"Sicherheitsprüfungen gegen die Überschreibung des Stapelspeichers (Stacks) "
+"hinzu. Damit werden viele mögliche Code-Einfügeangriffe zu "
+"Abbruchsituationen. Im besten Fall werden damit Code-Einfügungsangriffe zu "
+"Diensteverweigerungsangriffen oder zu keinen Problemen (abhängig von der "
+"Anwendung)."
+
+#. type: Plain text
+#: dpkg-buildflags.1:226
+msgid ""
+"This feature requires linking against glibc (or another provider of "
+"B<__stack_chk_fail>), so needs to be disabled when building with B<-"
+"nostdlib> or B<-ffreestanding> or similar."
+msgstr ""
+"Diese Funktionalität benötigt das Linken mit Glibc (oder einem anderen "
+"Anbieter von B<__stack_chk_fail>). Sie muss daher deaktiviert werden, wenn "
+"mit B<-nostdlib> oder B<-ffreestanding> oder Ähnlichem gebaut wird."
+
+#. type: TP
+#: dpkg-buildflags.1:227
+#, no-wrap
+msgid "B<relro>"
+msgstr "B<relro>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:235
+msgid ""
+"This setting (enabled by default) adds B<-Wl,-z,relro> to B<LDFLAGS>.  "
+"During program load, several ELF memory sections need to be written to by "
+"the linker. This flags the loader to turn these sections read-only before "
+"turning over control to the program. Most notably this prevents GOT "
+"overwrite attacks."
+msgstr ""
+"Diese Einstellung (standardmäßig aktiviert) fügt B<-Wl,-z,relro> zu "
+"B<LDFLAGS> hinzu. Während des Ladens des Programms müssen mehrere ELF-"
+"Speicherabschnitte vom Binder (Linker) geschrieben werden. Diese Einstellung "
+"signalisiert dem Ladeprogramm, diese Abschnitte in nur-Lese-Zugriff zu "
+"ändern, bevor die Steuerung an das Programm übergeben wird. Insbesondere "
+"verhindert dies GOT-Überschreibeangriffe."
+
+#. type: TP
+#: dpkg-buildflags.1:236
+#, no-wrap
+msgid "B<bindnow>"
+msgstr "B<bindnow>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:243
+#, fuzzy
+#| msgid ""
+#| "This setting (enabled by default) adds B<-Wl,-z,now> to B<LDFLAGS>. "
+#| "During program load, all dynamic symbols are resolved, allowing for the "
+#| "entire PLT to be marked read-only (due to B<relro> above)."
+msgid ""
+"This setting (disabled by default) adds B<-Wl,-z,now> to B<LDFLAGS>. During "
+"program load, all dynamic symbols are resolved, allowing for the entire PLT "
+"to be marked read-only (due to B<relro> above)."
+msgstr ""
+"Diese Einstellung (standardmäßig aktiviert) fügt B<-Wl,-z,now> zu B<LDFLAGS> "
+"hinzu. Während des Ladens des Programms werden alle dynamischen Symbole "
+"aufgelöst, womit das gesamte PLT nur-lesend markiert werden kann (aufgrund "
+"von B<relro> oben)."
+
+#. type: TP
+#: dpkg-buildflags.1:244
+#, no-wrap
+msgid "B<pie>"
+msgstr "B<pie>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:256
+msgid ""
+"This setting (disabled by default) adds B<-fPIE> to B<CFLAGS> and "
+"B<CXXFLAGS>, and B<-fPIE -pie> to B<LDFLAGS>. Position Independent "
+"Executable are needed to take advantage of Address Space Layout "
+"Randomization, supported by some kernel versions. While ASLR can already be "
+"enforced for data areas in the stack and heap (brk and mmap), the code areas "
+"must be compiled as position-independent. Shared libraries already do this (-"
+"fPIC), so they gain ASLR automatically, but binary .text regions need to be "
+"build PIE to gain ASLR. When this happens, ROP (Return Oriented Programming) "
+"attacks are much harder since there are no static locations to bounce off of "
+"during a memory corruption attack."
+msgstr ""
+"Diese Einstellung (standardmäßig deaktiviert) fügt B<-fPIE> zu B<CFLAGS> und "
+"B<CXXFLAGS> sowie B<-fPIE -pie> zu B<LDFLAGS> hinzu. »Position Independent "
+"Executable« (positionsunabhängige Programme) werden benötigt, um »Address "
+"Space Layout Randomization« (Bereitstellung eines zufälligen "
+"Adressbereichlayouts) auszunutzen, der von einigen Kernelversionen "
+"bereitgestellt wird. Während ASLR bereits für Datenbereiche auf dem Stapel "
+"(Stack) und Heap erzwungen werden kann (brk und mmap), müssen die "
+"Codebereiche positionsunabhängig übersetzt werden. Laufzeitbibliotheken "
+"machen dies bereits (-fPIC), so dass sie ASLR automatisch erhalten, aber "
+"Programm-.text-Regionen müssen mit PIE gebaut werden, um ASLR zu erhalten. "
+"Wenn dies passiert, sind ROP- (Return Oriented Programming) Angriffe sehr "
+"viel schwerer durchzuführen, da es keine statischen Orte mehr gibt, zu denen "
+"während eines Speicherverfälschungsangriffs hingesprungen werden könnte."
+
+#. type: Plain text
+#: dpkg-buildflags.1:259
+msgid ""
+"This is not compatible with B<-fPIC> so care must be taken when building "
+"shared objects."
+msgstr ""
+"Dies ist nicht mit B<-fPIC> kompatibel, daher muss beim Erstellen von "
+"Laufzeitbibliotheken Vorsicht angewandt werden."
+
+#. type: Plain text
+#: dpkg-buildflags.1:265
+msgid ""
+"Additionally, since PIE is implemented via a general register, some "
+"architectures (most notably i386) can see performance losses of up to 15% in "
+"very text-segment-heavy application workloads; most workloads see less than "
+"1%. Architectures with more general registers (e.g. amd64)  do not see as "
+"high a worst-case penalty."
+msgstr ""
+"Zusätzlich können auf einigen Architekturen (am deutlichsten auf i368) "
+"Leistungsverluste von bis zu 15% in sehr text-Segment-lastigen "
+"Anwendungsfällen auftreten, da PIE über allgemeine Register implementiert "
+"ist; in den meisten Anwendungsfällen sind dies weniger als 1%. Architekturen "
+"mit mehr allgemeinen Registern (z.B. Amd64) erfahren nicht diese "
+"Schlimmstfall-Strafe."
+
+#. type: Plain text
+#: dpkg-buildflags.1:268
+msgid "Copyright \\(co 2010-2011 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2007-2011 Rapha\\[:e]l Hertzog"
+
+#. type: Plain text
+#: dpkg-buildflags.1:270
+msgid "Copyright \\(co 2011 Kees Cook"
+msgstr "Copyright \\(co 2011 Kees Cook"
 
 #. type: TH
 #: dpkg-buildpackage.1:1
@@ -6716,8 +7099,8 @@
 
 #. type: Plain text
 #: dpkg-buildpackage.1:8
-msgid "B<dpkg-buildpackage> [I<options>]"
-msgstr "B<dpkg-buildpackage> [I<Optionen>]"
+msgid "B<dpkg-buildpackage> [I<option>...]"
+msgstr "B<dpkg-buildpackage> [I<Option>...]"
 
 #. type: Plain text
 #: dpkg-buildpackage.1:13
@@ -6809,11 +7192,10 @@
 "B<-A> is specified)."
 msgstr ""
 "Es ruft B<debian/rules> B<build>, gefolgt von B<fakeroot debian/rules> "
-"I<Programm-Ziel> auf (falls nicht ein reiner Quellbau mit B<-S> erbeten "
-"wurde). Beachten Sie, dass I<Programm-Ziel> entweder B<binary> "
-"(Standardfall, oder falls B<-b> angegeben wurde) oder B<binary-arch> (falls "
-"B<-B> angegeben wurde) oder B<binary-indep> (falls B<-A> angegeben wurde) "
-"lautet."
+"I<Binärziel> auf (falls nicht ein reiner Quellbau mit B<-S> erbeten wurde). "
+"Beachten Sie, dass I<Binärziel> entweder B<binary> (Standardfall, oder falls "
+"B<-b> angegeben ist) oder B<binary-arch> (falls B<-B> angegeben ist) oder "
+"B<binary-indep> (falls B<-A> angegeben ist) lautet."
 
 #. type: IP
 #: dpkg-buildpackage.1:36
@@ -7016,7 +7398,7 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:96 dpkg-genchanges.1:49 dpkg-gencontrol.1:38
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 #, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<-v>I<Version>"
@@ -7117,7 +7499,7 @@
 "sind. Dies ist das Standardverhalten."
 
 #. type: TP
-#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:427
+#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:432
 #, no-wrap
 msgid "B<-d>"
 msgstr "B<-d>"
@@ -7327,7 +7709,7 @@
 
 #. type: Plain text
 #: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:122
-#: dpkg-shlibdeps.1:217 dpkg-trigger.1:43
+#: dpkg-shlibdeps.1:215 dpkg-trigger.1:43
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
 "lib/dpkg>."
@@ -7337,19 +7719,18 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:223 dpkg-checkbuilddeps.1:33 dpkg-distaddfile.1:32
-#: dpkg-deb.1:164 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
-#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
-#: dpkg-query.1:110 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:90 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-deb.1:172 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
+#: dpkg-gensymbols.1:443 dpkg-name.1:58 dpkg-parsechangelog.1:33
+#: dpkg-query.1:110 dpkg-scanpackages.1:96 dpkg-shlibdeps.1:215
+#: dpkg-source.1:96 dpkg-split.1:126 dpkg-trigger.1:31
 #, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr "B<-h>, B<--help>"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-buildpackage.1:234
 msgid ""
-"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"Even if B<dpkg-buildpackage> exports some variables, B<debian/rules> should "
 "not rely on their presence and should instead use the respective interface "
 "to retrieve the needed values."
 msgstr ""
@@ -7378,19 +7759,20 @@
 #. type: SS
 #: dpkg-buildpackage.1:238
 #, no-wrap
-msgid "Compiler flags"
-msgstr "Compiler-Schalter"
+msgid "Compiler flags are no longer exported"
+msgstr "Kompilierschalter werden nicht mehr exportiert"
 
 #. type: Plain text
 #: dpkg-buildpackage.1:243
 msgid ""
-"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
-"environment variables are set to the values that B<dpkg-buildflags> "
-"returned. See its manual page for more information."
-msgstr ""
-"Die Umgebungsvariablen B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> und "
-"B<LDFLAGS> werden auf die Werte gesetzt, die B<dpkg-buildflags> "
-"zurückliefert. Lesen Sie die Handbuchseite für weitere Informationen."
+"Between versions 1.14.17 and 1.16.1, B<dpkg-buildpackage> exported compiler "
+"flags (B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS>) with "
+"values as returned by B<dpkg-buildflags>. This is no longer the case."
+msgstr ""
+"Zwischen den Versionen 1.14.17 and 1.16.1 exportierte B<dpkg-buildpackage> "
+"Kompilierschalter (B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> und "
+"B<LDFLAGS>) mit Werten, die von B<dpkg-buildflags> geliefert wurden. Dies "
+"ist nicht mehr der Fall."
 
 #. type: Plain text
 #: dpkg-buildpackage.1:248
@@ -7402,16 +7784,16 @@
 "Anfangsargumente für I<root-werde-Befehl> und I<signier-Befehl> anzugeben."
 
 #. type: Plain text
-#: dpkg-buildpackage.1:255
+#: dpkg-buildpackage.1:256
 msgid ""
-"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
-"B<fakeroot>(1), B<gpg>(1)."
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
+"genchanges>(1), B<fakeroot>(1), B<gpg>(1)."
 msgstr ""
-"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
-"B<fakeroot>(1), B<gpg>(1)."
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
+"genchanges>(1), B<fakeroot>(1), B<gpg>(1)."
 
 #. type: Plain text
-#: dpkg-buildpackage.1:264 dpkg-source.1:712
+#: dpkg-buildpackage.1:265
 msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2007-2010 Rapha\\[:e]l Hertzog"
 
@@ -7421,12 +7803,6 @@
 msgid "dpkg-checkbuilddeps"
 msgstr "dpkg-checkbuilddeps"
 
-#. type: TH
-#: dpkg-checkbuilddeps.1:1
-#, no-wrap
-msgid "2009-11-21"
-msgstr "2009-11-21"
-
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:4
 msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
@@ -7434,8 +7810,8 @@
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:9
-msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
-msgstr "B<dpkg-checkbuilddeps> [I<Optionen>] [I<Befehlsdatei>]"
+msgid "B<dpkg-checkbuilddeps> [I<option>...] [I<control-file>]"
+msgstr "B<dpkg-checkbuilddeps> [I<Option>...] [I<Befehlsdatei>]"
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:14
@@ -7452,10 +7828,10 @@
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:17
 msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
+"By default, B<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 "
+"Standardmäßig wird B<debian/control> gelesen, aber ein alternativer "
 "Steuerdateiname kann auf der Kommandozeile angegeben werden."
 
 #. type: Plain text
@@ -7506,8 +7882,8 @@
 
 #. type: Plain text
 #: 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>"
+msgid "B<dpkg-distaddfile> [I<option>...]I< filename section priority>"
+msgstr "B<dpkg-distaddfile> [I<Option>...]I< Dateiname Bereich Priorität>"
 
 #. type: Plain text
 #: dpkg-distaddfile.1:13
@@ -7574,24 +7950,18 @@
 msgid "dpkg-deb"
 msgstr "dpkg-deb"
 
-#. type: TH
-#: dpkg-deb.1:1
-#, no-wrap
-msgid "2011-04-26"
-msgstr "2011-04-26"
-
 #. type: Plain text
 #: dpkg-deb.1:4
 msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
 msgstr "dpkg-deb - Debian-Paketarchiv (.deb) Manipulationswerkzeug"
 
 #. type: Plain text
-#: dpkg-deb.1:9
-msgid "B<dpkg-deb> [I<options>] I<command>"
-msgstr "B<dpkg-deb> [I<Optionen>] I<Befehl>"
+#: dpkg-deb.1:8
+msgid "B<dpkg-deb> [I<option>...] I<command>"
+msgstr "B<dpkg-deb> [I<Option>...] I<Befehl>"
 
 #. type: Plain text
-#: dpkg-deb.1:13
+#: dpkg-deb.1:12
 msgid ""
 "B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr ""
@@ -7599,14 +7969,14 @@
 "sie breit."
 
 #. type: Plain text
-#: dpkg-deb.1:17
+#: dpkg-deb.1:16
 msgid "Use B<dpkg> to install and remove packages from your system."
 msgstr ""
 "Verwenden Sie B<dpkg>, um Pakete auf Ihrem System hinzuzufügen oder zu "
 "entfernen"
 
 #. type: Plain text
-#: dpkg-deb.1:27
+#: dpkg-deb.1:26
 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> "
@@ -7617,13 +7987,13 @@
 "B<dpkg-deb> wollten und wird es für Sie ausführen."
 
 #. type: TP
-#: dpkg-deb.1:29
+#: dpkg-deb.1:28
 #, no-wrap
 msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
 msgstr "B<-b>, B<--build> I<Verzeichnis> [I<Archiv>|I<Verzeichnis>]"
 
 #. type: Plain text
-#: dpkg-deb.1:41
+#: dpkg-deb.1:40
 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 "
@@ -7639,7 +8009,7 @@
 "Informationsbereich des Binärpakets gepackt."
 
 #. type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-deb.1:52
 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 "
@@ -7654,7 +8024,7 @@
 "Informationsverzeichnis prüfen."
 
 #. type: Plain text
-#: dpkg-deb.1:60
+#: dpkg-deb.1:59
 msgid ""
 "If no I<archive> is specified then B<dpkg-deb> will write the package into "
 "the file I<directory>B<.deb>."
@@ -7663,12 +8033,12 @@
 "I<Verzeichnis>B<.deb> schreiben."
 
 #. type: Plain text
-#: dpkg-deb.1:62
+#: dpkg-deb.1:61
 msgid "If the archive to be created already exists it will be overwritten."
 msgstr "Falls das anzulegende Archiv bereits existiert, wird es überschrieben."
 
 #. type: Plain text
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 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 "
@@ -7686,18 +8056,18 @@
 "bestimmen)."
 
 #. type: TP
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 #, no-wrap
 msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr "B<-I>, B<--info> I<Archiv> [I<Steuer-Dateiname> ...]"
 
 #. type: Plain text
-#: dpkg-deb.1:81
+#: dpkg-deb.1:80
 msgid "Provides information about a binary package archive."
 msgstr "Stellt Informationen über ein Binärpaketarchiv bereit."
 
 #. type: Plain text
-#: dpkg-deb.1:86
+#: dpkg-deb.1:85
 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."
@@ -7706,7 +8076,7 @@
 "Zusammenfassung des Inhalts des Pakets sowie dessen Steuerdatei ausgeben."
 
 #. type: Plain text
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 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 "
@@ -7719,13 +8089,13 @@
 "und sich mit dem Status 2 beenden."
 
 #. type: TP
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 #, no-wrap
 msgid "B<-W>, B<--show> I<archive>"
 msgstr "B<-W>, B<--show> I<Archiv>"
 
 #. type: Plain text
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 msgid ""
 "Provides information about a binary package archive in the format specified "
 "by the B<--showformat> argument. The default format displays the package's "
@@ -7737,19 +8107,19 @@
 "Tabulator."
 
 #. type: TP
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 #, no-wrap
 msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr "B<-f>, B<--field> I<Archiv> [I<Steuer-Feldname> ...]"
 
 #. type: Plain text
-#: dpkg-deb.1:104
+#: dpkg-deb.1:103
 msgid "Extracts control file information from a binary package archive."
 msgstr ""
 "Extrahiert die Informationen der control-Datei aus einem Binärpaketarchiv."
 
 #. type: Plain text
-#: dpkg-deb.1:108
+#: dpkg-deb.1:107
 msgid ""
 "If no B<control-file-field>s are specified then it will print the whole "
 "control file."
@@ -7758,7 +8128,7 @@
 "control-Datei aus."
 
 #. type: Plain text
-#: dpkg-deb.1:117
+#: dpkg-deb.1:116
 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-"
@@ -7771,19 +8141,19 @@
 "seinen Feldnamen (und einen Doppelpunkt mit Leerzeichen) voran."
 
 #. type: Plain text
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 msgid "No errors are reported for fields requested but not found."
 msgstr ""
 "Falls angeforderte Felder nicht gefunden werden wird kein Fehler gemeldet."
 
 #. type: TP
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 #, no-wrap
 msgid "B<-c>, B<--contents> I<archive>"
 msgstr "B<-c>, B<--contents> I<Archiv>"
 
 #. type: Plain text
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 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 "
@@ -7794,13 +8164,13 @@
 "Auflistung erstellt wird."
 
 #. type: TP
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 #, no-wrap
 msgid "B<-x>, B<--extract> I<archive directory>"
 msgstr "B<-x>, B<--extract> I<Archiv-Verzeichnis>"
 
 #. type: Plain text
-#: dpkg-deb.1:129
+#: dpkg-deb.1:128
 msgid ""
 "Extracts the filesystem tree from a package archive into the specified "
 "directory."
@@ -7809,7 +8179,7 @@
 "Verzeichnis."
 
 #. type: Plain text
-#: dpkg-deb.1:135
+#: dpkg-deb.1:134
 msgid ""
 "Note that extracting a package to the root directory will I<not> result in a "
 "correct installation! Use B<dpkg> to install packages."
@@ -7819,7 +8189,7 @@
 "Paketinstallation."
 
 #. type: Plain text
-#: dpkg-deb.1:139
+#: dpkg-deb.1:138
 msgid ""
 "I<directory> (but not its parents) will be created if necessary, and its "
 "permissions modified to match the contents of the package."
@@ -7829,30 +8199,55 @@
 "übereinzustimmen."
 
 #. type: TP
-#: dpkg-deb.1:139
+#: dpkg-deb.1:138
 #, no-wrap
 msgid "B<-X>, B<--vextract> I<archive directory>"
 msgstr "B<-X>, B<--vextract> I<Archiv-Verzeichnis>"
 
 #. type: Plain text
-#: dpkg-deb.1:144
+#: dpkg-deb.1:145
 msgid ""
-"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
-"it goes."
+"Is like B<--extract> (B<-x>)  with B<--verbose> (B<-v>)  which prints a "
+"listing of the files extracted as it goes."
 msgstr ""
-"Ist wie B<--extract> (B<-x>), gibt aber beim Arbeiten eine Liste von "
-"extrahierten Dateien aus."
+"Ist wie B<--extract> (B<-x>) mit B<--verbose> (B<-v>), das beim Arbeiten "
+"eine Liste von extrahierten Dateien ausgibt."
 
 #. type: TP
-#: dpkg-deb.1:144
+#: dpkg-deb.1:145
 #, no-wrap
-msgid "B<--fsys-tarfile> I<archive>"
-msgstr "B<--fsys-tarfile> I<Archiv>"
+msgid "B<-R>, B<--raw-extract> I<archive directory>"
+msgstr "B<-R>, B<--raw-extract> I<Archiv-Verzeichnis>"
 
 #. type: Plain text
-#: dpkg-deb.1:153
+#: dpkg-deb.1:150
 msgid ""
-"Extracts the filesystem tree data from a binary package and sends it to "
+"Extracts the filesystem tree from a package archive into a specified "
+"directory, and the control information files into a DEBIAN subdirectory of "
+"the specified directory."
+msgstr ""
+"Extrahiert den Dateisystembaum aus einem Paketarchiv in ein angegebenes "
+"Verzeichnis und die Steuerinformationensdateien in das DEBIAN-"
+"Unterverzeichnis des angegebenen Verzeichnisses."
+
+#. type: Plain text
+#: dpkg-deb.1:152 dpkg-deb.1:172
+msgid ""
+"The target directory (but not its parents) will be created if necessary."
+msgstr ""
+"Das Zielverzeichnis (aber nicht übergeordnete) wird, falls notwendig, "
+"angelegt."
+
+#. type: TP
+#: dpkg-deb.1:152
+#, no-wrap
+msgid "B<--fsys-tarfile> I<archive>"
+msgstr "B<--fsys-tarfile> I<Archiv>"
+
+#. type: Plain text
+#: dpkg-deb.1:161
+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.  The input archive will "
 "always be processed sequentially."
@@ -7863,13 +8258,13 @@
 "extrahieren. Das Eingabearchiv wird immer sequenziell verarbeitet."
 
 #. type: TP
-#: dpkg-deb.1:153
+#: dpkg-deb.1:161
 #, no-wrap
 msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<-e>, B<--control> I<Archiv> [I<Verzeichnis>]"
 
 #. type: Plain text
-#: dpkg-deb.1:157
+#: dpkg-deb.1:165
 msgid ""
 "Extracts the control information files from a package archive into the "
 "specified directory."
@@ -7878,7 +8273,7 @@
 "angegebene Verzeichnis."
 
 #. type: Plain text
-#: dpkg-deb.1:161
+#: dpkg-deb.1:169
 msgid ""
 "If no directory is specified then a subdirectory B<DEBIAN> in the current "
 "directory is used."
@@ -7886,22 +8281,14 @@
 "Falls kein Verzeichnis angegeben ist, wird das Unterverzeichnis B<DEBIAN> im "
 "aktuellen Verzeichnis verwendet."
 
-#. type: Plain text
-#: dpkg-deb.1:164
-msgid ""
-"The target directory (but not its parents) will be created if necessary."
-msgstr ""
-"Das Zielverzeichnis (aber nicht übergeordnete) wird, falls notwendig, "
-"angelegt."
-
 #. type: TP
-#: dpkg-deb.1:172
+#: dpkg-deb.1:180
 #, no-wrap
 msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<Format>"
 
 #. type: Plain text
-#: dpkg-deb.1:177 dpkg-query.1:127
+#: dpkg-deb.1:185 dpkg-query.1:127
 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."
@@ -7911,7 +8298,7 @@
 "aufgeführte Paket ausgegeben wird."
 
 #. type: Plain text
-#: dpkg-deb.1:186
+#: dpkg-deb.1:194
 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 "
@@ -7927,34 +8314,35 @@
 "werden."
 
 #. type: Plain text
-#: dpkg-deb.1:188
+#: dpkg-deb.1:196
 msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
 msgstr ""
 "Die Voreinstellung für dieses Feld ist \"${Package}\\et${Version}\\en\"."
 
 #. type: TP
-#: dpkg-deb.1:188
+#: dpkg-deb.1:196
 #, no-wrap
-msgid "B<-z>I<compress_level>"
+msgid "B<-z>I<compress-level>"
 msgstr "B<-z>I<Komprimierstufe>"
 
 #. type: Plain text
-#: dpkg-deb.1:192
+#: dpkg-deb.1:200
 msgid ""
-"Specify which compression level to pass to the compressor backend program, "
-"when building a package."
+"Specify which compression level to use on the compressor backend, when "
+"building a package (default is 9 for gzip and bzip2, 6 for xz and lzma)."
 msgstr ""
-"Gibt die Komprimierstufe an, die an das Komprimier-Backendprogramm beim Bau "
-"eines Pakets übergeben werden soll."
+"Gibt die Komprimierstufe an, die im Komprimier-Backendprogramm beim Bau "
+"eines Pakets verwendet werden soll. Standardmäßig ist dies 9 für Gzip und "
+"Bzip2, 6 für Xz und Lzma."
 
 #. type: TP
-#: dpkg-deb.1:192
+#: dpkg-deb.1:200
 #, no-wrap
-msgid "B<-Z>I<compress_type>"
-msgstr "B<-Z>I<komprimier_Art>"
+msgid "B<-Z>I<compress-type>"
+msgstr "B<-Z>I<Komprimierart>"
 
 #. type: Plain text
-#: dpkg-deb.1:197
+#: dpkg-deb.1:205
 msgid ""
 "Specify which compression type to use when building a package. Allowed "
 "values are I<gzip>, I<xz>, I<bzip2>, I<lzma>, and I<none> (default is "
@@ -7964,13 +8352,13 @@
 "I<gzip>, I<xz>, I<bzip2>, I<lzma> und I<none> (voreingestellt ist I<gzip>)."
 
 #. type: TP
-#: dpkg-deb.1:197
+#: dpkg-deb.1:205
 #, no-wrap
 msgid "B<--new>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-deb.1:202
+#: dpkg-deb.1:210
 msgid ""
 "Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
@@ -7978,13 +8366,13 @@
 "die Voreinstellung."
 
 #. type: TP
-#: dpkg-deb.1:202
+#: dpkg-deb.1:210
 #, no-wrap
 msgid "B<--old>"
 msgstr "B<--old>"
 
 #. type: Plain text
-#: dpkg-deb.1:210
+#: dpkg-deb.1:218
 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 "
@@ -7998,13 +8386,13 @@
 "Dpkg-Version wurde nur als i386 a.out-Programm veröffentlicht."
 
 #. type: TP
-#: dpkg-deb.1:210
+#: dpkg-deb.1:218
 #, no-wrap
 msgid "B<--nocheck>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-deb.1:216
+#: dpkg-deb.1:224
 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."
@@ -8014,20 +8402,34 @@
 "das Sie möchten, egal wie defekt es ist."
 
 #. type: TP
-#: dpkg-deb.1:216
+#: dpkg-deb.1:224 start-stop-daemon.8:255
+#, no-wrap
+msgid "B<-v>, B<--verbose>"
+msgstr "B<-v>, B<--verbose>"
+
+#. type: Plain text
+#: dpkg-deb.1:228
+msgid ""
+"Enables verbose output. This currently only affects B<--extract> making it "
+"behave like B<--vextract>."
+msgstr ""
+"Aktiviert ausführliche Ausgabe. Dies betrifft derzeit nur B<--extract>, "
+"wodurch dieses sich wie B<--vextract> verhält."
+
+#. type: TP
+#: dpkg-deb.1:228
 #, no-wrap
 msgid "B<-D>, B<--debug>"
 msgstr "B<-D>, B<--debug>"
 
 #. type: Plain text
-#: dpkg-deb.1:219
+#: dpkg-deb.1:231
 msgid "Enables debugging output. This is not very interesting."
 msgstr ""
 "Aktiviert Fehlersuch-Ausgaben (»debugging«). Dies ist nicht sehr interessant."
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-deb.1:225
+#: dpkg-deb.1:237
 msgid ""
 "If set, B<dpkg-deb> will use it as the directory in which to create "
 "temporary files and directories."
@@ -8036,13 +8438,13 @@
 "temporäre Dateien und Verzeichnisse erstellt werden."
 
 #. type: Plain text
-#: dpkg-deb.1:231
+#: dpkg-deb.1:243
 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."
 
 #. type: Plain text
-#: dpkg-deb.1:239
+#: dpkg-deb.1:251
 msgid ""
 "There is no authentication on B<.deb> files; in fact, there isn't even a "
 "straightforward checksum.  (Higher level tools like APT support "
@@ -8058,7 +8460,7 @@
 "dies von den Werkzeugen auf niedrigerer Ebene nicht direkt unterstützt.)"
 
 #. type: Plain text
-#: dpkg-deb.1:246
+#: dpkg-deb.1:258
 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 "
@@ -8070,7 +8472,7 @@
 "sein Status und Inhalt aufgezeichnet wird."
 
 #. type: Plain text
-#: dpkg-deb.1:252
+#: dpkg-deb.1:264
 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)."
 
@@ -8080,12 +8482,6 @@
 msgid "dpkg-divert"
 msgstr "dpkg-divert"
 
-#. type: TH
-#: dpkg-divert.8:1
-#, no-wrap
-msgid "2010-10-12"
-msgstr "2010-10-12"
-
 #. type: Plain text
 #: dpkg-divert.8:4
 msgid "dpkg-divert - override a package's version of a file"
@@ -8093,8 +8489,8 @@
 
 #. type: Plain text
 #: dpkg-divert.8:9
-msgid "B<dpkg-divert> [I<options>] I<command>"
-msgstr "B<dpkg-divert> [I<Optionen>] I<Befehl>"
+msgid "B<dpkg-divert> [I<option>...] I<command>"
+msgstr "B<dpkg-divert> [I<Option>...] I<Befehl>"
 
 #. type: Plain text
 #: dpkg-divert.8:13
@@ -8138,7 +8534,7 @@
 msgstr "Fügt eine Umleitung für I<Datei> hinzu."
 
 #. type: TP
-#: dpkg-divert.8:28 dpkg-statoverride.8:36
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
 #, no-wrap
 msgid "B<--remove>I< file>"
 msgstr "B<--remove>I< Datei>"
@@ -8187,7 +8583,8 @@
 msgstr "Zeige den echten Namen für eine umgeleitete Datei an."
 
 #. type: TP
-#: dpkg-divert.8:43 dpkg-statoverride.8:53 update-alternatives.8:329
+#: dpkg-divert.8:43 dpkg-statoverride.8:52 dselect.1:44
+#: update-alternatives.8:328
 #, no-wrap
 msgid "B<--admindir>I< directory>"
 msgstr "B<--admindir>I< Verzeichnis>"
@@ -8250,7 +8647,7 @@
 "wird, d.h. I<Datei> wird für alle Pakete außer I<Paket> umgeleitet."
 
 #. type: TP
-#: dpkg-divert.8:61 dpkg-statoverride.8:65 update-alternatives.8:351
+#: dpkg-divert.8:61 dpkg-statoverride.8:64 update-alternatives.8:350
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
@@ -8296,13 +8693,13 @@
 #. type: Plain text
 #: dpkg-divert.8:82
 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 adding, default is B<--local> and B<--divert> I<original>B<.distrib>. "
+"When removing, B<--package> or B<--local> and B<--divert> must match if "
+"specified."
 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."
+"I<Originalname>.B<distrib>. Beim Entfernen müssen, falls angegeben, B<--"
+"package> oder B<--local> und B<--divert> übereinstimmen."
 
 #. type: Plain text
 #: dpkg-divert.8:84
@@ -8376,16 +8773,15 @@
 msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
 msgstr "dpkg-divert --package wibble --rename --remove /usr/bin/example"
 
-# type: TP
 #. type: TP
-#: dpkg-divert.8:113 dpkg-query.1:205 dpkg-statoverride.8:70 dpkg-trigger.1:61
-#: update-alternatives.8:356
+#: dpkg-divert.8:113 dpkg-query.1:205 dpkg-statoverride.8:69 dpkg-trigger.1:61
+#: update-alternatives.8:355
 #, no-wrap
 msgid "B<DPKG_ADMINDIR>"
 msgstr "B<DPKG_ADMINDIR>"
 
 #. type: Plain text
-#: dpkg-divert.8:117 dpkg-query.1:209 dpkg-statoverride.8:74 dpkg-trigger.1:65
+#: dpkg-divert.8:117 dpkg-query.1:209 dpkg-statoverride.8:73 dpkg-trigger.1:65
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the dpkg data directory."
@@ -8396,10 +8792,10 @@
 #. type: Plain text
 #: dpkg-divert.8:121
 msgid ""
-"If set and the I<--local> and I<--package> options have not been specified, "
+"If set and the B<--local> and B<--package> options have not been specified, "
 "B<dpkg-divert> will use it as the package name."
 msgstr ""
-"Falls gesetzt und die Optionen I<--local> und I<--package> nicht verwandt "
+"Falls gesetzt und die Optionen B<--local> und B<--package> nicht verwandt "
 "wurden, wird B<dpkg-divert> dies als Paketnamen verwenden."
 
 #. type: TP
@@ -8429,7 +8825,7 @@
 "I<-old>, bevor es sie mit der neuen ersetzt."
 
 #. type: Plain text
-#: dpkg-divert.8:137 update-alternatives.8:497
+#: dpkg-divert.8:137 update-alternatives.8:496
 msgid "Copyright \\(co 1995 Ian Jackson"
 msgstr "Copyright \\(co 1995 Ian Jackson"
 
@@ -8446,8 +8842,8 @@
 
 #. type: Plain text
 #: dpkg-genchanges.1:8
-msgid "B<dpkg-genchanges> [I<options>]"
-msgstr "B<dpkg-genchanges> [I<Optionen>]"
+msgid "B<dpkg-genchanges> [I<option>...]"
+msgstr "B<dpkg-genchanges> [I<Option>...]"
 
 #. type: Plain text
 #: dpkg-genchanges.1:16
@@ -8565,13 +8961,13 @@
 "zu verwenden."
 
 #. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:121
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:127
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr "B<-V>I<Name>B<=>I<Wert>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-source.1:131
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
@@ -8580,8 +8976,8 @@
 "eine Besprechung des Ausgabesubstitution."
 
 #. type: TP
-#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:169
+#: dpkg-source.1:131
 #, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<-T>I<substvardatei>"
@@ -8602,29 +8998,29 @@
 "Substitutionsvariablen aus mehreren Dateien einzulesen."
 
 #. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:131
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:137
 #, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<Feld>B<=>I<Wert>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 msgid "Override or add an output control file field."
 msgstr "Überschreibe oder ergänze ein Ausgabe-Steuerdatei-Feld."
 
 #. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 #, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<-U>I<field>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:137
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:143
 msgid "Remove an output control file field."
 msgstr "Entferne ein Ausgabe-Steuerdatei-Feld."
 
 #. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:98
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:104
 #, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "B<-c>I<Steuerdatei>"
@@ -8640,7 +9036,7 @@
 
 #. type: TP
 #: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr "B<-l>I<Changelog-Datei>"
@@ -8665,14 +9061,14 @@
 
 #. type: TP
 #: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr "B<-F>I<Changelog-Format>"
 
 #. type: Plain text
 #: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 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 "
@@ -8702,7 +9098,7 @@
 "Datei aufnehmen kann."
 
 #. type: TP
-#: dpkg-genchanges.1:123 dpkg-gensymbols.1:416
+#: dpkg-genchanges.1:123 dpkg-gensymbols.1:421
 #, no-wrap
 msgid "B<-q>"
 msgstr "B<-q>"
@@ -8741,8 +9137,8 @@
 
 #. type: Plain text
 #: dpkg-gencontrol.1:8
-msgid "B<dpkg-gencontrol> [I<options>]"
-msgstr "B<dpkg-gencontrol> [I<Optionen>]"
+msgid "B<dpkg-gencontrol> [I<option>...]"
+msgstr "B<dpkg-gencontrol> [I<Option>...]"
 
 #. type: Plain text
 #: dpkg-gencontrol.1:14
@@ -8828,7 +9224,7 @@
 "Substitutionsvariablen aus mehreren Dateien einzulesen."
 
 #. type: TP
-#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:368
+#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:373
 #, no-wrap
 msgid "B<-p>I<package>"
 msgstr "B<-p>I<Paket>"
@@ -8903,7 +9299,7 @@
 "(mittels B<du>) zu finden, und für den Standard-Ablageplatz der Ausgabedatei."
 
 #. type: TP
-#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:386 dpkg-shlibdeps.1:152
+#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:391 dpkg-shlibdeps.1:150
 #, no-wrap
 msgid "B<-O>"
 msgstr "B<-O>"
@@ -8946,7 +9342,7 @@
 "hinzu, deren Steuerdateien es hier generiert."
 
 #. type: Plain text
-#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:339
+#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:337
 msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 
@@ -8956,12 +9352,6 @@
 msgid "dpkg-gensymbols"
 msgstr "dpkg-gensymbols"
 
-#. type: TH
-#: dpkg-gensymbols.1:2
-#, no-wrap
-msgid "2009-08-07"
-msgstr "2009-08-07"
-
 #. type: Plain text
 #: dpkg-gensymbols.1:5
 msgid ""
@@ -8973,8 +9363,8 @@
 
 #. type: Plain text
 #: dpkg-gensymbols.1:9
-msgid "B<dpkg-gensymbols> [I<options>]"
-msgstr "B<dpkg-gensymbols> [I<Optionen>]"
+msgid "B<dpkg-gensymbols> [I<option>...]"
+msgstr "B<dpkg-gensymbols> [I<Option>...]"
 
 #. type: Plain text
 #: dpkg-gensymbols.1:16
@@ -9103,14 +9493,28 @@
 "sollten nicht verschwinden, daher sollte der Patch idealerweise nur neue "
 "Zeilen hinzufügen."
 
+#. type: Plain text
+#: dpkg-gensymbols.1:64
+msgid ""
+"Note that you can put comments in symbols files: any line with '#' as the "
+"first character is a comment except if it starts with '#include' (see "
+"section B<Using includes>). Lines starting with '#MISSING:' are special "
+"comments documenting symbols that have disappeared."
+msgstr ""
+"Beachten Sie, dass Sie in Symboldateien Kommentare einfügen können: jede "
+"Zeile, die mit »#« als ersten Zeichen beginnt, ist ein Kommentare, falls sie "
+"nicht mit »#include« beginnt (siehe Abschnitt B<Includes verwenden>). "
+"Zeilen, die mit »#MISSING:« anfangen, sind besondere Kommentare, die "
+"verschwundene Symbole dokumentieren."
+
 #. type: SS
-#: dpkg-gensymbols.1:59
+#: dpkg-gensymbols.1:64
 #, no-wrap
 msgid "Using #PACKAGE# substitution"
 msgstr "Verwendung der #PACKAGE#-Ersetzung"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 msgid ""
 "In some rare cases, the name of the library varies between architectures.  "
 "To avoid hardcoding the name of the package in the symbols file, you can use "
@@ -9126,13 +9530,13 @@
 "I<#PACKAGE#> nie in der Symboldatei innerhalb eines Binärpakets auftauchen."
 
 #. type: SS
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 #, no-wrap
 msgid "Using symbol tags"
 msgstr "Verwendung von Symbolkennzeichnungen"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:74
+#: dpkg-gensymbols.1:79
 msgid ""
 "Symbol tagging is useful for marking symbols that are special in some way.  "
 "Any symbol can have an arbitrary number of tags associated with it. While "
@@ -9149,7 +9553,7 @@
 "Kennzeichnungen."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:86
+#: dpkg-gensymbols.1:91
 msgid ""
 "Tag specification comes right before the symbol name (no whitespace is "
 "allowed in between). It always starts with an opening bracket B<(>, ends "
@@ -9178,7 +9582,7 @@
 "Leerzeichen geht."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:90
+#: dpkg-gensymbols.1:95
 #, no-wrap
 msgid ""
 " (tag1=i am marked|tag name with space)\"tagged quoted symbol\"@Base 1.0\n"
@@ -9190,7 +9594,7 @@
 " ungekennzeichnetes_Symbol@Base 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:96
+#: dpkg-gensymbols.1:101
 msgid ""
 "The first symbol in the example is named I<tagged quoted symbol> and has two "
 "tags: I<tag1> with value I<i am marked> and I<tag name with space> that has "
@@ -9206,7 +9610,7 @@
 "normalen, nicht gekennzeichneten Symbols."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 msgid ""
 "Since symbol tags are an extension of the I<deb-symbols(5)> format, they can "
 "only be part of the symbols files used in source packages (those files "
@@ -9232,19 +9636,19 @@
 "ihrer Originalform wie sie geladen wurden auch geschrieben."
 
 #. type: SS
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 #, no-wrap
 msgid "Standard symbol tags"
 msgstr "Standard-Symbolkennzeichnungen"
 
 #. type: TP
-#: dpkg-gensymbols.1:109
+#: dpkg-gensymbols.1:114
 #, no-wrap
 msgid "B<optional>"
 msgstr "B<optional>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:119
+#: dpkg-gensymbols.1:124
 msgid ""
 "A symbol marked as optional can disappear from the library at any time and "
 "that will never cause B<dpkg-gensymbols> to fail. However, disappeared "
@@ -9267,7 +9671,7 @@
 "bleibt."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 msgid ""
 "This tag is useful for symbols which are private where their disappearance "
 "do not cause ABI breakage. For example, most of C++ template instantiations "
@@ -9282,13 +9686,13 @@
 "als optional betrachtet wird."
 
 #. type: TP
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 #, no-wrap
 msgid "B<arch=>I<architecture list>"
 msgstr "B<arch=>I<Architekturliste>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:137
+#: dpkg-gensymbols.1:142
 msgid ""
 "This tag allows one to restrict the set of architectures where the symbol is "
 "supposed to exist. When the symbols list is updated with the symbols "
@@ -9317,7 +9721,7 @@
 "auftauchen), aber es wird nicht als neu betrachtet."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:143
+#: dpkg-gensymbols.1:148
 msgid ""
 "When operating in the default non-template mode, among arch-specific symbols "
 "only those that match the current host architecture are written to the "
@@ -9332,7 +9736,7 @@
 "die von fremden Architekturen) immer in die Symboldatei geschrieben."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:149
+#: dpkg-gensymbols.1:154
 msgid ""
 "The format of I<architecture list> is the same as the one used in the "
 "I<Build-Depends> field of I<debian/control> (except the enclosing square "
@@ -9347,7 +9751,7 @@
 "während das zweite überall außer auf Armel betrachtet wird."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid ""
 " (arch=alpha amd64 kfreebsd-amd64 ia64)a_64bit_specific_symbol@Base 1.0\n"
@@ -9357,13 +9761,13 @@
 " (arch=!armel)Symbol_hat_Armel_nicht@Base 1.0\n"
 
 #. type: TP
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid "B<ignore-blacklist>"
 msgstr "B<ignore-blacklist>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:160
+#: dpkg-gensymbols.1:165
 msgid ""
 "dpkg-gensymbols has an internal blacklist of symbols that should not appear "
 "in symbols files as they are usually only side-effects of implementation "
@@ -9381,13 +9785,13 @@
 "Bibliotheken der Werkzeugkette wie libgcc notwendig sein."
 
 #. type: TP
-#: dpkg-gensymbols.1:160 dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:165 dpkg-gensymbols.1:202
 #, no-wrap
 msgid "B<c++>"
 msgstr "B<c++>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:164
+#: dpkg-gensymbols.1:169
 msgid ""
 "Denotes I<c++> symbol pattern. See B<Using symbol patterns> subsection below."
 msgstr ""
@@ -9395,13 +9799,13 @@
 "Symbolmuster> unten."
 
 #. type: TP
-#: dpkg-gensymbols.1:164 dpkg-gensymbols.1:228
+#: dpkg-gensymbols.1:169 dpkg-gensymbols.1:233
 #, no-wrap
 msgid "B<symver>"
 msgstr "B<symver>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:168
+#: dpkg-gensymbols.1:173
 msgid ""
 "Denotes I<symver> (symbol version) symbol pattern. See B<Using symbol "
 "patterns> subsection below."
@@ -9410,13 +9814,13 @@
 "B<Verwendung von Symbolmuster> unten."
 
 #. type: TP
-#: dpkg-gensymbols.1:168 dpkg-gensymbols.1:253
+#: dpkg-gensymbols.1:173 dpkg-gensymbols.1:258
 #, no-wrap
 msgid "B<regex>"
 msgstr "B<regex>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 msgid ""
 "Denotes I<regex> symbol pattern. See B<Using symbol patterns> subsection "
 "below."
@@ -9425,13 +9829,13 @@
 "Symbolmuster> unten."
 
 #. type: SS
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 #, no-wrap
 msgid "Using symbol patterns"
 msgstr "Verwendung von Symbolmustern"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:180
+#: dpkg-gensymbols.1:185
 msgid ""
 "Unlike a standard symbol specification, a pattern may cover multiple real "
 "symbols from the library. B<dpkg-gensymbols> will attempt to match each "
@@ -9450,7 +9854,7 @@
 "Muster passt, wird das Symbol als neu betrachtet."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:188
+#: dpkg-gensymbols.1:193
 msgid ""
 "A pattern is considered lost if it does not match any symbol in the library. "
 "By default this will trigger a B<dpkg-gensymbols> failure under I<-c1> or "
@@ -9472,7 +9876,7 @@
 "Symbolkennzeichnungen> oben für weitere Informationen."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:195
+#: dpkg-gensymbols.1:200
 msgid ""
 "Patterns are an extension of the I<deb-symbols(5)> format hence they are "
 "only valid in symbol file templates. Pattern specification syntax is not any "
@@ -9490,12 +9894,12 @@
 "speziellen Kennzeichnung gekennzeichnet."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:202
 msgid "At the moment, B<dpkg-gensymbols> supports three basic pattern types:"
 msgstr "Derzeit unterstützt B<dpkg-gensymbols> drei grundlegene Mustertypen:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:209
+#: dpkg-gensymbols.1:214
 msgid ""
 "This pattern is denoted by the I<c++> tag. It matches only C++ symbols by "
 "their demangled symbol name (as emitted by B<c++filt>(1) utility). This "
@@ -9522,7 +9926,7 @@
 "kann es mit einem einzigen I<c++>-Muster gepasst werden:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:215
+#: dpkg-gensymbols.1:220
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -9536,7 +9940,7 @@
 " [...]\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:217
+#: dpkg-gensymbols.1:222
 msgid ""
 "The demangled name above can be obtained by executing the following command:"
 msgstr ""
@@ -9544,13 +9948,13 @@
 "werden:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:219
+#: dpkg-gensymbols.1:224
 #, no-wrap
 msgid " $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt\n"
 msgstr " $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:227
+#: dpkg-gensymbols.1:232
 msgid ""
 "Please note that while mangled name is unique in the library by definition, "
 "this is not necessarily true for demangled names. A couple of distinct real "
@@ -9570,7 +9974,7 @@
 "Niveau passieren, sollten sie nicht die Qualität der Symboldatei reduzieren."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:234
+#: dpkg-gensymbols.1:239
 msgid ""
 "This pattern is denoted by the I<symver> tag. Well maintained libraries have "
 "versioned symbols where each version corresponds to the upstream version "
@@ -9585,7 +9989,7 @@
 "Beispiel:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:241
+#: dpkg-gensymbols.1:246
 #, no-wrap
 msgid ""
 "libc.so.6 libc6 #MINVER#\n"
@@ -9601,7 +10005,7 @@
 " access@GLIBC_2.0 2.2\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:247
+#: dpkg-gensymbols.1:252
 msgid ""
 "All symbols associated with versions GLIBC_2.0 and GLIBC_2.7 will lead to "
 "minimal version of 2.0 and 2.7 respectively with the exception of the symbol "
@@ -9616,7 +10020,7 @@
 "GLIBC_2.0« passt, da spezielle Symbole vor Mustern Vorrang haben."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:252
+#: dpkg-gensymbols.1:257
 msgid ""
 "Please note that while old style wildcard patterns (denoted by \"*@version\" "
 "in the symbol name field) are still supported, they have been deprecated by "
@@ -9631,7 +10035,7 @@
 "geschrieben werden, falls das gleiche Verhalten benötigt wird."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:260
+#: dpkg-gensymbols.1:265
 msgid ""
 "Regular expression patterns are denoted by the I<regex> tag. They match by "
 "the perl regular expression specified in the symbol name field. A regular "
@@ -9647,7 +10051,7 @@
 "passt. Beispiel:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:265
+#: dpkg-gensymbols.1:270
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -9659,7 +10063,7 @@
 " (regex|optional)\"private\" 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:270
+#: dpkg-gensymbols.1:275
 msgid ""
 "Symbols like \"mystack_new@Base\", \"mystack_push@Base\", \"mystack_pop@Base"
 "\" etc.  will be matched by the first pattern while e.g. "
@@ -9674,7 +10078,7 @@
 "die gepassten Symbole erben die Kennzeichnung I<optional> vom Muster."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:275
+#: dpkg-gensymbols.1:280
 msgid ""
 "Basic patterns listed above can be combined where it makes sense. In that "
 "case, they are processed in the order in which the tags are specified. For "
@@ -9685,7 +10089,7 @@
 "in der die Kennzeichnungen angegeben sind. Im Beispiel"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:278
+#: dpkg-gensymbols.1:283
 #, no-wrap
 msgid ""
 " (c++|regex)\"^NSA::ClassA::Private::privmethod\\ed\\e(int\\e)@Base\" 1.0\n"
@@ -9695,7 +10099,7 @@
 " (regex|c++)N3NSA6ClassA7Private11privmethod\\edEi@Base 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:288
+#: dpkg-gensymbols.1:293
 msgid ""
 "will match symbols \"_ZN3NSA6ClassA7Private11privmethod1Ei@Base\" and "
 "\"_ZN3NSA6ClassA7Private11privmethod2Ei@Base\". When matching the first "
@@ -9720,7 +10124,7 @@
 "Muster passen, da es kein gültiges C++-Symbol ist."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:294
+#: dpkg-gensymbols.1:299
 msgid ""
 "In general, all patterns are divided into two groups: aliases (basic I<c++> "
 "and I<symver>) and generic patterns (I<regex>, all combinations of multiple "
@@ -9736,7 +10140,7 @@
 "wird empfohlen, generische Muster nicht zu viel zu verwenden."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 msgid ""
 "When multiple patterns match the same real symbol, aliases (first I<c++>, "
 "then I<symver>) are preferred over generic patterns. Generic patterns are "
@@ -9754,13 +10158,13 @@
 "erstellt."
 
 #. type: SS
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 #, no-wrap
 msgid "Using includes"
 msgstr "Includes verwenden"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:306
+#: dpkg-gensymbols.1:311
 msgid ""
 "When the set of exported symbols differ between architectures, it may become "
 "inefficient to use a single symbol file. In those cases, an include "
@@ -9772,7 +10176,7 @@
 "von Arten als nützlich erweisen:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:310
+#: dpkg-gensymbols.1:315
 msgid ""
 "You can factorize the common part in some external file and include that "
 "file in your I<package>.symbols.I<arch> file by using an include directive "
@@ -9783,36 +10187,36 @@
 "Direktive wie folgt einbinden:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:312
+#: dpkg-gensymbols.1:317
 msgid "#include \"I<packages>.symbols.common\""
 msgstr "#include \"I<Pakete>.symbols.common\""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:314
+#: dpkg-gensymbols.1:319
 msgid "The include directive may also be tagged like any symbol:"
 msgstr ""
 "Die Include-Direktive kann auch wie jedes Symbol gekennzeichnet werden:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:316
-msgid "(tag|..|tagN)#include \"file_to_include\""
-msgstr "(Kennzeichen|...|KennzeichenN)#include \"einzubindende_Datei\""
+#: dpkg-gensymbols.1:321
+msgid "(tag|..|tagN)#include \"file-to-include\""
+msgstr "(Kennzeichen|...|KennzeichenN)#include \"einzubindende-Datei\""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:321
+#: dpkg-gensymbols.1:326
 msgid ""
-"As a result, all symbols included from I<file_to_include> will be considered "
+"As a result, all symbols included from I<file-to-include> will be considered "
 "to be tagged with I<tag> .. I<tagN> by default. You can use this feature to "
 "create a common I<package>.symbols file which includes architecture specific "
 "symbol files:"
 msgstr ""
-"Als Ergebnis werden alle Symbole aus I<einzubindende_Datei> standardmäßig "
+"Als Ergebnis werden alle Symbole aus I<einzubindende-Datei> standardmäßig "
 "als mit I<Kennzeichen> ... I<KennzeichenN> gekennzeichnet betrachtet. Sie "
 "können diese Funktionalität benutzen, um eine gemeinsame Datei I<Paket>."
 "symbols zu erstellen, die architekturspezifische Symboldateien einbindet:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:326
+#: dpkg-gensymbols.1:331
 #, no-wrap
 msgid ""
 "  common_symbol1@Base 1.0\n"
@@ -9826,7 +10230,7 @@
 "  common_symbol2@Base 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:335
+#: dpkg-gensymbols.1:340
 msgid ""
 "The symbols files are read line by line, and include directives are "
 "processed as soon as they are encountered. This means that the content of "
@@ -9848,7 +10252,7 @@
 "Möglichkeit für ein Symbol, die ererbten Kennzeichnungen zu überschreiben."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:340
+#: dpkg-gensymbols.1:345
 msgid ""
 "An included file can repeat the header line containing the SONAME of the "
 "library. In that case, it overrides any header line previously read.  "
@@ -9861,7 +10265,7 @@
 "Kopfzeilen zu vermeiden. Ein Weg dies zu erreichen, ist wie folgt:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid ""
 "#include \"libsomething1.symbols.common\"\n"
@@ -9871,18 +10275,18 @@
 " arch_spezifisches_Symbol@Base 1.0\n"
 
 #. type: SS
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid "Good library management"
 msgstr "Gute Bibliotheksverwaltung"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:346
+#: dpkg-gensymbols.1:351
 msgid "A well-maintained library has the following features:"
 msgstr "Eine gut verwaltete Bibliothek hat die folgenden Eigenschaften:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:350
+#: dpkg-gensymbols.1:355
 msgid ""
 "its API is stable (public symbols are never dropped, only new public symbols "
 "are added) and changes in incompatible ways only when the SONAME changes;"
@@ -9892,7 +10296,7 @@
 "nur, wenn sich der SONAME ändert,"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:353
+#: dpkg-gensymbols.1:358
 msgid ""
 "ideally, it uses symbol versioning to achieve ABI stability despite internal "
 "changes and API extension;"
@@ -9901,7 +10305,7 @@
 "interner Änderungen und API-Erweiterungen zu erreichen,"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:356
+#: dpkg-gensymbols.1:361
 msgid ""
 "it doesn't export private symbols (such symbols can be tagged optional as "
 "workaround)."
@@ -9910,7 +10314,7 @@
 "optional gekennzeichnet werden)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:364
+#: dpkg-gensymbols.1:369
 msgid ""
 "While maintaining the symbols file, it's easy to notice appearance and "
 "disappearance of symbols. But it's more difficult to catch incompatible API "
@@ -9930,18 +10334,18 @@
 "Hilfslösung ist."
 
 #. type: TP
-#: dpkg-gensymbols.1:365
+#: dpkg-gensymbols.1:370
 #, no-wrap
 msgid "B<-P>I<package-build-dir>"
 msgstr "B<-P>I<Paketbauverzeichnis>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:368
+#: dpkg-gensymbols.1:373
 msgid "Scan I<package-build-dir> instead of debian/tmp."
 msgstr "Suche nach I<Paketbauverzeichnis> statt nach debian/tmp."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 msgid ""
 "Define the package name. Required if more than one binary package is listed "
 "in debian/control (or if there's no debian/control file)."
@@ -9951,7 +10355,7 @@
 "gibt)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 msgid ""
 "Define the package version. Defaults to the version extracted from debian/"
 "changelog. Required if called outside of a source package tree."
@@ -9961,13 +10365,13 @@
 "Quellpaketbaums erfolgt."
 
 #. type: TP
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 #, no-wrap
 msgid "B<-e>I<library-file>"
 msgstr "B<-e>I<Bibliotheksdatei>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 msgid ""
 "Only analyze libraries explicitly listed instead of finding all public "
 "libraries. You can use a regular expression in I<library-file> to match "
@@ -9980,13 +10384,13 @@
 "Argument zu passen (andernfalls benötigen Sie mehrere B<-e>)."
 
 #. type: TP
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 #, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<-I>I<Dateiname>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:386
+#: dpkg-gensymbols.1:391
 msgid ""
 "Use I<filename> as reference file to generate the symbols file that is "
 "integrated in the package itself."
@@ -9995,7 +10399,7 @@
 "die dann im Paket selbst integriert wird."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 msgid ""
 "Print the generated symbols file to standard output, rather than being "
 "stored in the package build tree."
@@ -10004,13 +10408,13 @@
 "Paketbaubaum zu speichern."
 
 #. type: TP
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 #, no-wrap
 msgid "B<-O>I<filename>"
 msgstr "B<-O>I<Dateiname>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 msgid ""
 "Store the generated symbols file as I<filename>. If I<filename> is pre-"
 "existing, its content is used as basis for the generated symbols file.  You "
@@ -10024,13 +10428,13 @@
 "Originalautoren Ihrer Bibliothek passt."
 
 #. type: TP
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 #, no-wrap
 msgid "B<-t>"
 msgstr "B<-t>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 msgid ""
 "Write the symbol file in template mode rather than the format compatible "
 "with I<deb-symbols(5)>. The main difference is that in the template mode "
@@ -10050,13 +10454,13 @@
 "der Symboldateivorlage immer alle Symbole geschrieben werden."
 
 #. type: TP
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 #, no-wrap
 msgid "B<-c>I<[0-4]>"
 msgstr "B<-c>I<[0-4]>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:413
+#: dpkg-gensymbols.1:418
 msgid ""
 "Define the checks to do when comparing the generated symbols file with the "
 "template file used as starting point. By default the level is 1. Increasing "
@@ -10075,7 +10479,7 @@
 "hinzugekommen sind."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:416
+#: dpkg-gensymbols.1:421
 msgid ""
 "This value can be overridden by the environment variable "
 "DPKG_GENSYMBOLS_CHECK_LEVEL."
@@ -10085,7 +10489,7 @@
 
 # oder -> und vor Zeile "keine Warnung"
 #. type: Plain text
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 msgid ""
 "Keep quiet and never generate a diff between generated symbols file and the "
 "template file used as starting point or show any warnings about new/lost "
@@ -10099,13 +10503,13 @@
 "die Prüfungen selbst (sehen Sie hierzu die Option I<-c>)."
 
 #. type: TP
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 #, no-wrap
 msgid "B<-a>I<arch>"
 msgstr "B<-a>I<Architektur>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:427
+#: dpkg-gensymbols.1:432
 msgid ""
 "Assume I<arch> as host architecture when processing symbol files. Use this "
 "option to generate a symbol file or diff for any architecture provided its "
@@ -10117,7 +10521,7 @@
 "verfügbar."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 msgid ""
 "Enable debug mode. Numerous messages are displayed to explain what B<dpkg-"
 "gensymbols> does."
@@ -10126,13 +10530,13 @@
 "erklären, was B<dpkg-gensymbols> durchführt."
 
 #. type: TP
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 #, no-wrap
 msgid "B<-V>"
 msgstr "B<-V>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:438
+#: dpkg-gensymbols.1:443
 msgid ""
 "Enable verbose mode. The generated symbols file contains deprecated symbols "
 "as comments. Furthermore in template mode, pattern symbols are followed by "
@@ -10144,44 +10548,36 @@
 "Muster passen."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:447
+#: dpkg-gensymbols.1:452
 msgid "B<http://people.redhat.com/drepper/symbol-versioning>"
 msgstr "B<http://people.redhat.com/drepper/symbol-versioning>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:449
+#: dpkg-gensymbols.1:454
 msgid "B<http://people.redhat.com/drepper/goodpractice.pdf>"
 msgstr "B<http://people.redhat.com/drepper/goodpractice.pdf>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:451
+#: dpkg-gensymbols.1:456
 msgid "B<http://people.redhat.com/drepper/dsohowto.pdf>"
 msgstr "B<http://people.redhat.com/drepper/dsohowto.pdf>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:454
+#: dpkg-gensymbols.1:459
 msgid "B<deb-symbols>(5), B<dpkg-shlibdeps>(1)."
 msgstr "B<deb-symbols>(5), B<dpkg-shlibdeps>(1)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:457
+#: dpkg-gensymbols.1:462
 msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
 
-# type: TH
 #. type: TH
 #: dpkg-maintscript-helper.1:1
 #, no-wrap
 msgid "dpkg-maintscript-helper"
 msgstr "dpkg-maintscript-helper"
 
-#. type: TH
-#: dpkg-maintscript-helper.1:1
-#, no-wrap
-msgid "2010-04-16"
-msgstr "2010-04-16"
-
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:4
 msgid ""
@@ -10191,30 +10587,26 @@
 "dpkg-maintscript-helper - Bekannte Einschränkungen in Dpkg in "
 "Betreuerskripten umgehen"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:8
 msgid ""
-"B<dpkg-maintscript-helper> I<command> [I<parameters>...] -- I<maint-script-"
-"parameters>"
+"B<dpkg-maintscript-helper> I<command> [I<parameter>...] B<--> I<maint-script-"
+"parameter>..."
 msgstr ""
-"B<dpkg-maintscript-helper> I<Befehl> [I<Parameter>...] -- I<Betr-Skript-"
-"Parameter>"
+"B<dpkg-maintscript-helper> I<Befehl> [I<Parameter>...] B<--> I<Betr-Skript-"
+"Parameter>..."
 
-# type: SH
 #. type: SH
 #: dpkg-maintscript-helper.1:9
 #, no-wrap
 msgid "COMMANDS AND PARAMETERS"
 msgstr "BEFEHLE UND PARAMETER"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:12
 msgid "B<rm_conffile> I<conffile> [I<lastversion> [I<package>]]"
 msgstr "B<rm_conffile> I<Conffile> [I<letzteVersion> [I<Paket>]]"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:14
 msgid ""
@@ -10222,7 +10614,6 @@
 msgstr ""
 "B<mv_conffile> I<AlteConffile> I<NeueConffile> [I<letzteVersion> [I<Paket>]]"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:20
 msgid ""
@@ -10235,7 +10626,6 @@
 "erledigen kann, entweder aufgrund von Design-Entscheidungen oder aufgrund "
 "aktueller Einschränkungen."
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:27
 msgid ""
@@ -10243,24 +10633,22 @@
 "scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
 "the same call simply needs to be put in all scripts and the program will "
 "automatically adapt its behaviour based on the environment variable "
-"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
-"to forward after a double dash."
+"B<DPKG_MAINTSCRIPT_NAME> and on the maintainer scripts arguments that you "
+"have to forward after a double dash."
 msgstr ""
 "Viele dieser Aufgaben benötigen koordinierte Aktionen aus mehreren "
 "Betreuerskripten (B<preinst>, B<postinst>, B<prerm>, B<postrm>). Um Fehler "
 "zu vermeiden, wird der gleiche Aufruf einfach in alle Skripte eingefügt und "
 "das Programm wird sein Verhalten automatisch abhängig von der Variable "
-"DPKG_MAINTSCRIPT_NAME und den Argumenten im Betreuerskript, die Sie nach "
+"B<DPKG_MAINTSCRIPT_NAME> und den Argumenten im Betreuerskript, die Sie nach "
 "einem doppelten Schrägstrich übergeben müssen, anpassen."
 
-# type: SH
 #. type: SH
 #: dpkg-maintscript-helper.1:28
 #, no-wrap
 msgid "CONFFILE RELATED TASKS"
 msgstr "CONFFILE-BEZOGENE AUFGABEN"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:38
 msgid ""
@@ -10283,7 +10671,6 @@
 "auf eine Datei, die von den Betreuerskripten des Pakets, normalerweise mit "
 "einem Werkzeug wie Debconf oder Ucf, verwaltet wird, umzustellen."
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:43
 msgid ""
@@ -10297,14 +10684,12 @@
 "verwandt werden, eine sanfte Löschung und Verschiebung von Conffiles "
 "innerhalb von Betreuerskripten durchzuführen."
 
-# type: SS
 #. type: SS
 #: dpkg-maintscript-helper.1:44
 #, no-wrap
 msgid "REMOVING A CONFFILE"
 msgstr "EINE CONFFILE ENTFERNEN"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:50
 msgid ""
@@ -10319,7 +10704,6 @@
 "Pakets abgebrochen wird, sollte die neuerdings veraltete Conffile nicht "
 "verschwinden."
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:53
 msgid ""
@@ -10329,7 +10713,6 @@
 "All dies wird durch Einsetzen der folgenden Shell-Schnipsel in die "
 "Betreuerskripte B<preinst>, B<postinst> und B<postrm> implementiert:"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:56
 #, no-wrap
@@ -10340,7 +10723,6 @@
 "    dpkg-maintscript-helper rm_conffile \\e\n"
 "        I<Conffile> I<letzteVersion> I<Paket> -- \"$@\"\n"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:66
 msgid ""
@@ -10365,7 +10747,6 @@
 "gesetzt). Alle Parameter des Betreuerskripts müssen nach »--« an das "
 "Programm weitergeleitet werden."
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:75
 msgid ""
@@ -10388,14 +10769,12 @@
 "Während des vollständigen Löschens wird B<postrm> auch die bisher behaltene "
 "Datei B<.dpkg-bak> entfernen."
 
-# type: SS
 #. type: SS
 #: dpkg-maintscript-helper.1:76
 #, no-wrap
 msgid "RENAMING A CONFFILE"
 msgstr "EINE CONFFILE UMBENENNEN"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:83
 msgid ""
@@ -10412,7 +10791,6 @@
 "aufgefordert wird, die Bearbeitung der Conffile zu bestätigen, obwohl sie "
 "für diese gar nicht verantwortlich sind."
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:87
 msgid ""
@@ -10422,7 +10800,6 @@
 "Sanfte Umbenennung kann durch Einsetzen der folgenden Shell-Schnipsel in die "
 "Betreuerskripte B<preinst>, B<postinst> und B<postrm> implementiert werden:"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:90
 #, no-wrap
@@ -10433,7 +10810,6 @@
 "    dpkg-maintscript-helper mv_conffile \\e\n"
 "        I<alteConffile> I<neueConffile> I<letzteVersion> I<Paket> -- \"$@\"\n"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:100
 msgid ""
@@ -10458,7 +10834,6 @@
 "befindlichen Pakets gesetzt). Alle Parameter des Betreuerskripts müssen nach "
 "»--« an das Programm weitergeleitet werden."
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-maintscript-helper.1:108
 msgid ""
@@ -10501,8 +10876,8 @@
 #. type: Plain text
 #: dpkg-maintscript-helper.1:118
 #, no-wrap
-msgid "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
-msgstr "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
+msgid "    B<Pre-Depends:> dpkg (E<gt>= 1.15.7.2)\n"
+msgstr "    B<Pre-Depends:> dpkg (E<gt>= 1.15.7.2)\n"
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:123
@@ -10521,15 +10896,20 @@
 #: dpkg-maintscript-helper.1:127
 #, no-wrap
 msgid ""
-"    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
-"        dpkg-maintscript-helper E<lt>commandE<gt> ...\n"
+"    if dpkg-maintscript-helper supports I<command>; then\n"
+"        dpkg-maintscript-helper I<command> ...\n"
 "    fi\n"
 msgstr ""
-"    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
-"        dpkg-maintscript-helper E<lt>commandE<gt> ...\n"
+"    if dpkg-maintscript-helper supports I<command>; then\n"
+"        dpkg-maintscript-helper I<command> ...\n"
 "    fi\n"
 
 #. type: Plain text
+#: dpkg-maintscript-helper.1:130
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+
+#. type: Plain text
 #: dpkg-maintscript-helper.1:132
 msgid "Copyright \\(co 2008 Joey Hess"
 msgstr "Copyright \\(co 2008 Joey Hess"
@@ -10550,12 +10930,6 @@
 msgid "dpkg-mergechangelogs"
 msgstr "dpkg-mergechangelogs"
 
-#. type: TH
-#: dpkg-mergechangelogs.1:1
-#, no-wrap
-msgid "2010-04-18"
-msgstr "2010-04-18"
-
 #. type: Plain text
 #: dpkg-mergechangelogs.1:4
 msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
@@ -10569,7 +10943,6 @@
 msgstr ""
 "B<dpkg-mergechangelogs> [I<Option>...] I<alt> I<neu-a> I<neu-b> [I<Ausgabe>]"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-mergechangelogs.1:15
 msgid ""
@@ -10582,7 +10955,6 @@
 "Das resultierende Changelog wird in der Datei I<Ausgabe> gespeichert oder an "
 "die Standardausgabe ausgegeben, falls dieser Parameter fehlt."
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-mergechangelogs.1:26
 msgid ""
@@ -10607,14 +10979,12 @@
 "verfügbar ist \\[em] es ist Teil des Pakets libalgorithm-merge-perl \\[em] "
 "andernfalls erhalten Sie einen globalen Konflikt im Inhalt des Eintrags)."
 
-# type: TP
 #. type: TP
 #: dpkg-mergechangelogs.1:28
 #, no-wrap
 msgid "B<--merge-prereleases>, B<-m>"
 msgstr "B<--merge-prereleases>, B<-m>"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-mergechangelogs.1:33
 msgid ""
@@ -10625,7 +10995,6 @@
 "Versionsvergleich, um festzustellen, ob zwei Einträge identisch sein sollen "
 "oder nicht."
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-mergechangelogs.1:38
 msgid ""
@@ -10646,7 +11015,6 @@
 msgid "LIMITATIONS"
 msgstr "EINSCHRÄNKUNGEN"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-mergechangelogs.1:50
 msgid ""
@@ -10658,14 +11026,12 @@
 "Zusammenführen verloren. Dies betrifft Zeug wie Modelines von Vim, "
 "Kommentare, die eigentlich nicht da sein sollten, usw."
 
-# type: SH
 #. type: SH
 #: dpkg-mergechangelogs.1:51
 #, no-wrap
 msgid "INTEGRATION WITH GIT"
 msgstr "INTEGRATION MIT GIT"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-mergechangelogs.1:56
 msgid ""
@@ -10677,7 +11043,6 @@
 "in einem Git-Depot zusammenzuführen, müssen Sie zuerst einen neuen Merge-"
 "Driver in B<.git/config> oder in B<~/.gitconfig> registrieren:"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-mergechangelogs.1:60
 #, no-wrap
@@ -10690,7 +11055,6 @@
 "     name = debian/changelog merge driver\n"
 "     driver = dpkg-mergechangelogs -m %O %A %B %A\n"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-mergechangelogs.1:64
 msgid ""
@@ -10702,7 +11066,6 @@
 "info/attributes> das Merge-Attribut für die Datei debian/changelog "
 "einrichten:"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-mergechangelogs.1:66
 #, no-wrap
@@ -10727,63 +11090,60 @@
 
 #. type: Plain text
 #: dpkg-name.1:15
-msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
-msgstr "B<dpkg-name> [I<Optionen>] [B<-->] I<Dateien>"
+msgid "B<dpkg-name> [I<option>...] [B<-->] I<file>..."
+msgstr "B<dpkg-name> [I<Option>...] [B<-->] I<Datei>..."
 
 #. type: Plain text
-#: dpkg-name.1:28
+#: dpkg-name.1:29
 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>."
-"E<lt>package_typeE<gt>> 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. "
-"The I<E<lt>package_typeE<gt>> part comes from that field if present or "
-"fallbacks to B<deb>."
+"package name consists of I<package>B<_>I<version>B<_>I<architecture>B<."
+">I<package-type> as specified in the control file of the package. The "
+"I<version> part of the filename consists of the upstream version information "
+"optionally followed by a hyphen and the revision information. The I<package-"
+"type> part comes from that field if present or fallbacks to B<deb>."
 msgstr ""
 "Diese Handbuchseite dokumentiert das B<dpkg-name>-Programm, das eine "
 "einfache Möglichkeit bereitstellt, B<Debian>-Pakete in ihren vollen "
 "Paketnamen umzubenennen. Ein voller Paketname besteht aus "
-"I<E<lt>PaketE<gt>_E<lt>VersionE<gt>_E<lt>ArchitekturE<gt>."
-"E<lt>PakettypE<gt>> wie in der Steuerdatei des Pakets spezifiziert. Der "
-"I<E<lt>VersionE<gt>>-Teil des Dateinamens besteht aus der "
-"Versionsinformation der Originalautoren optional gefolgt von einem "
-"Gedankenstrich und der Revisionsinformation. Der I<E<lt>PakettypE<gt>>-Teil "
+"I<Paket>B<_>I<Version>B<_>I<Architektur>B<.>I<Pakettyp> wie in der "
+"Steuerdatei des Pakets spezifiziert. Der I<Version>-Teil des Dateinamens "
+"besteht aus der Versionsinformation der Originalautoren optional gefolgt von "
+"einem Gedankenstrich und der Revisionsinformation. Der I<Pakettyp>-Teil "
 "entstammt dem Feld I<package_type> (falls vorhanden) oder wird auf B<deb> "
 "gesetzt."
 
 #. type: TP
-#: dpkg-name.1:30
+#: dpkg-name.1:31
 #, no-wrap
 msgid "B<-a>, B<--no-architecture>"
 msgstr "B<-a>, B<--no-architecture>"
 
 #. type: Plain text
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 msgid "The destination filename will not have the architecture information."
 msgstr "Der Zieldateiname wird keine Architekturinformation enthalten."
 
 #. type: TP
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 #, no-wrap
 msgid "B<-k>, B<--symlink>"
 msgstr "B<-k>, B<--symlink>"
 
 #. type: Plain text
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 msgid "Create a symlink, instead of moving."
 msgstr "Lege einen Symlink an, anstatt zu verschieben."
 
 #. type: TP
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 #, no-wrap
 msgid "B<-o>, B<--overwrite>"
 msgstr "B<-o>, B<--overwrite>"
 
 #. type: Plain text
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 msgid ""
 "Existing files will be overwritten if they have the same name as the "
 "destination filename."
@@ -10792,45 +11152,44 @@
 "der Zieldateiname haben."
 
 #. type: TP
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 #, no-wrap
 msgid "B<-s>, B<--subdir> [I<dir>]"
 msgstr "B<-s>, B<--subdir> [I<Verzeichnis>]"
 
 #. type: Plain text
-#: dpkg-name.1:52
+#: dpkg-name.1:53
 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 package. The target directory will be `unstable/binary-I<architecture>/"
+"I<section>'. 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 `I<section>/binary-I<architecture>'. 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 Steuerteils des Pakets extrahiert. Das Zielverzeichnis wird "
-"»unstable/binary-E<lt>ArchitekturE<gt>/E<lt>BereichE<gt>« sein. Falls der "
-"Bereich nicht in der Steuerdatei 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>BereichE<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."
+"Verzeichnis verschoben, andernfalls wird das Zielverzeichnis aus dem "
+"»section«-Feld des Steuerteils des Pakets extrahiert. Das Zielverzeichnis "
+"wird »unstable/binary-I<Architektur>/I<Bereich>« sein. Falls der Bereich "
+"nicht in der Steuerdatei 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 »I<Bereich>/binary-I<Architektur>«. 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-name.1:52
+#: dpkg-name.1:53
 #, no-wrap
 msgid "B<-c>, B<--create-dir>"
 msgstr "B<-c>, B<--create-dir>"
 
 #. type: Plain text
-#: dpkg-name.1:57
+#: dpkg-name.1:58
 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.>"
@@ -10840,19 +11199,19 @@
 "B<Verwenden Sie diese Option mit Vorsicht.>"
 
 #. type: TP
-#: dpkg-name.1:60
+#: dpkg-name.1:61
 #, no-wrap
 msgid "B<-v>, B<--version>"
 msgstr "B<-v>, B<--version>"
 
 #. type: TP
-#: dpkg-name.1:65
+#: dpkg-name.1:66
 #, no-wrap
 msgid "B<dpkg-name bar-foo.deb>"
 msgstr "B<dpkg-name bar-foo.deb>"
 
 #. type: Plain text
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 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 "
@@ -10863,13 +11222,13 @@
 "umbenannt."
 
 #. type: TP
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 #, 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:75
+#: dpkg-name.1:76
 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 "
@@ -10880,13 +11239,13 @@
 "Architekturinformation umbenannt."
 
 #. type: TP
-#: dpkg-name.1:75
+#: dpkg-name.1:76
 #, 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:81
+#: dpkg-name.1:82
 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.>"
@@ -10896,34 +11255,34 @@
 "nicht.>"
 
 #. type: TP
-#: dpkg-name.1:81
+#: dpkg-name.1:82
 #, 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:84
+#: dpkg-name.1:85
 msgid "This can be used when building new packages."
 msgstr "Dies kann beim Bau neuer Pakete verwendet werden."
 
 #. type: Plain text
-#: dpkg-name.1:94
+#: dpkg-name.1:95
 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 "
+"I<package>B<_>I<version>B<_>I<architecture>B<.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>PaketE<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."
+"I<Paket>B<_>I<Version>B<_>I<Architektur>B<.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:102
+#: dpkg-name.1:103
 msgid ""
 "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
 "B<xargs>(1)."
@@ -10932,7 +11291,7 @@
 "B<xargs>(1)."
 
 #. type: Plain text
-#: dpkg-name.1:105
+#: dpkg-name.1:106
 msgid "Copyright \\(co 1995,1996 Erick Branderhorst"
 msgstr "Copyright \\(co 1995,1996 Erick Branderhorst"
 
@@ -10942,12 +11301,6 @@
 msgid "dpkg-parsechangelog"
 msgstr "dpkg-parsechangelog"
 
-#. type: TH
-#: dpkg-parsechangelog.1:1
-#, no-wrap
-msgid "2009-05-19"
-msgstr "2009-05-19"
-
 #. type: Plain text
 #: dpkg-parsechangelog.1:4
 msgid "dpkg-parsechangelog - parse Debian changelog files"
@@ -10955,8 +11308,8 @@
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:8
-msgid "B<dpkg-parsechangelog> [I<options>]"
-msgstr "B<dpkg-parsechangelog> [I<Optionen>]"
+msgid "B<dpkg-parsechangelog> [I<option>...]"
+msgstr "B<dpkg-parsechangelog> [I<Option>...]"
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:14
@@ -11030,26 +11383,26 @@
 #. type: TP
 #: dpkg-parsechangelog.1:54
 #, no-wrap
-msgid "B<Source:> E<lt>pkg nameE<gt>"
-msgstr "B<Source:> E<lt>Paket-NameE<gt>"
+msgid "B<Source:>I< pkg-name>"
+msgstr "B<Source:>I< Paketname>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:56
 #, no-wrap
-msgid "B<Version:> E<lt>versionE<gt>"
-msgstr "B<Version:> E<lt>VersionE<gt>"
+msgid "B<Version:>I< version>"
+msgstr "B<Version:>I< Version>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:58
 #, no-wrap
-msgid "B<Distribution:> E<lt>target distributionE<gt>"
-msgstr "B<Distribution:> E<lt>Ziel-DistributionE<gt>"
+msgid "B<Distribution:>I< target-distribution>"
+msgstr "B<Distribution:>I< Ziel-Distribution>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:60
 #, no-wrap
-msgid "B<Urgency:> E<lt>urgencyE<gt>"
-msgstr "B<Urgency:> E<lt>DringlichkeitE<gt>"
+msgid "B<Urgency:>I< urgency>"
+msgstr "B<Urgency:>I< Dringlichkeit>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:63
@@ -11059,20 +11412,20 @@
 #. type: TP
 #: dpkg-parsechangelog.1:63
 #, no-wrap
-msgid "B<Maintainer:> E<lt>authorE<gt>"
-msgstr "B<Maintainer:> E<lt>AutorE<gt>"
+msgid "B<Maintainer:>I< author>"
+msgstr "B<Maintainer:>I< Autor>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:65
 #, no-wrap
-msgid "B<Date:> E<lt>dateE<gt>"
-msgstr "B<Date:> E<lt>DatumE<gt>"
+msgid "B<Date:>I< date>"
+msgstr "B<Date:>I< Datum>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:67
 #, no-wrap
-msgid "B<Closes:> E<lt>bug numberE<gt>"
-msgstr "B<Closes:> E<lt>FehlernummerE<gt>"
+msgid "B<Closes:>I< bug-number>"
+msgstr "B<Closes:>I< Fehlernummer>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:70
@@ -11082,8 +11435,8 @@
 #. type: TP
 #: dpkg-parsechangelog.1:70
 #, no-wrap
-msgid "B<Changes:> E<lt>changelog entriesE<gt>"
-msgstr "B<Changes:> E<lt>Changelog-EinträgeE<gt>"
+msgid "B<Changes:>I< changelog-entries>"
+msgstr "B<Changes:>I< Changelog-Einträge>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:77
@@ -11188,12 +11541,11 @@
 "I<Zahl> negativ ist)."
 
 #. type: TP
-#: dpkg-parsechangelog.1:104 update-alternatives.8:269
+#: dpkg-parsechangelog.1:104 update-alternatives.8:268
 #, no-wrap
 msgid "B<--all>"
 msgstr "B<--all>"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-parsechangelog.1:108
 msgid ""
@@ -11243,12 +11595,6 @@
 msgid "dpkg-query"
 msgstr "dpkg-query"
 
-#. type: TH
-#: dpkg-query.1:1 dpkg-split.1:2 start-stop-daemon.8:1 update-alternatives.8:8
-#, no-wrap
-msgid "2011-04-28"
-msgstr "2011-04-28"
-
 #. type: Plain text
 #: dpkg-query.1:4
 msgid "dpkg-query - a tool to query the dpkg database"
@@ -11300,7 +11646,6 @@
 msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
 msgstr "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-query.1:31
 msgid ""
@@ -11310,13 +11655,11 @@
 "Die ersten drei Spalten der Ausgabe zeigen die gewünschte Aktion, den "
 "Paketstatus und Fehler, in dieser Reihenfolge."
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-query.1:33
 msgid "Desired action:"
 msgstr "Gewünschte Aktion:"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-query.1:39
 #, no-wrap
@@ -11338,7 +11681,6 @@
 msgid "Package status:"
 msgstr "Paketstatus:"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-query.1:51
 #, no-wrap
@@ -11352,8 +11694,8 @@
 "  t = Triggers-pending\n"
 "  i = Installed\n"
 msgstr ""
-"  n = Nicht\n"
-"  c = Config\n"
+"  n = Nicht installiert\n"
+"  c = Config-Datei\n"
 "  H = Halb installiert\n"
 "  U = Entpackt\n"
 "  F = Fehlgeschl. Konfiguration\n"
@@ -11366,7 +11708,6 @@
 msgid "Error flags:"
 msgstr "Fehler-Schalter:"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-query.1:57
 #, no-wrap
@@ -11377,7 +11718,6 @@
 "  E<lt>leerE<gt> = (kein)\n"
 "  R = Neuinstallation notwendig\n"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-query.1:62
 msgid ""
@@ -11599,11 +11939,11 @@
 "    B<Description>\n"
 "    B<Enhances>\n"
 "    B<Essential>\n"
-"    B<Filename> (internal, dselect related)\n"
+"    B<Filename> (internal, front-end related)\n"
 "    B<Homepage>\n"
 "    B<Installed-Size>\n"
-"    B<MD5sum> (internal, dselect related)\n"
-"    B<MSDOS-Filename> (internal, dselect related)\n"
+"    B<MD5sum> (internal, front-end related)\n"
+"    B<MSDOS-Filename> (internal, front-end related)\n"
 "    B<Maintainer>\n"
 "    B<Origin>\n"
 "    B<Package>\n"
@@ -11614,11 +11954,11 @@
 "    B<Replaces>\n"
 "    B<Revision> (obsolete)\n"
 "    B<Section>\n"
-"    B<Size> (internal, dselect related)\n"
+"    B<Size> (internal, front-end related)\n"
 "    B<Source>\n"
 "    B<Status> (internal)\n"
 "    B<Suggests>\n"
-"    B<Tag> (usually not in the .deb but in APT's Packages files)\n"
+"    B<Tag> (usually not in the .deb but in the repository Packages files)\n"
 "    B<Triggers-Awaited> (internal)\n"
 "    B<Triggers-Pending> (internal)\n"
 "    B<Version>\n"
@@ -11633,11 +11973,11 @@
 "    B<Description>\n"
 "    B<Enhances>\n"
 "    B<Essential>\n"
-"    B<Filename> (intern, Dselect-bezogen)\n"
+"    B<Filename> (intern, Oberflächen-bezogen)\n"
 "    B<Homepage>\n"
 "    B<Installed-Size>\n"
-"    B<MD5sum> (intern, Dselect-bezogen)\n"
-"    B<MSDOS-Filename> (intern, Dselect-bezogen)\n"
+"    B<MD5sum> (intern, Oberflächen-bezogen)\n"
+"    B<MSDOS-Filename> (intern, Oberflächen-bezogen)\n"
 "    B<Maintainer>\n"
 "    B<Origin>\n"
 "    B<Package>\n"
@@ -11648,11 +11988,11 @@
 "    B<Replaces>\n"
 "    B<Revision> (veraltet)\n"
 "    B<Section>\n"
-"    B<Size> (intern, Dselect-bezogen)\n"
+"    B<Size> (intern, Oberflächen-bezogen)\n"
 "    B<Source>\n"
 "    B<Status> (intern)\n"
 "    B<Suggests>\n"
-"    B<Tag> (normalerweise nicht in dem .deb sondern in APTs Packages-Dateien\n"
+"    B<Tag> (normalerweise nicht in dem .deb sondern in den Packages-Dateien des Depots\n"
 "    B<Triggers-Awaited> (intern)\n"
 "    B<Triggers-Pending> (intern)\n"
 "    B<Version>\n"
@@ -11680,15 +12020,15 @@
 msgstr "  B<dpkg-query -W -f=\\(aq${Package} ${Version}\\et${Maintainer}\\en\\(aq dpkg>\n"
 
 #. type: SH
-#: dpkg-query.1:195 dpkg-split.1:180 start-stop-daemon.8:260
-#: update-alternatives.8:375
+#: dpkg-query.1:195 dpkg-split.1:179 start-stop-daemon.8:259
+#: update-alternatives.8:374
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "RÜCKGABEWERT"
 
 #. type: TP
-#: dpkg-query.1:196 dpkg-split.1:181 start-stop-daemon.8:261
-#: start-stop-daemon.8:290 update-alternatives.8:376
+#: dpkg-query.1:196 dpkg-split.1:180 start-stop-daemon.8:260
+#: start-stop-daemon.8:289 update-alternatives.8:375
 #, no-wrap
 msgid "B<0>"
 msgstr "B<0>"
@@ -11699,8 +12039,8 @@
 msgstr "Die angeforderte Abfrage wurde erfolgreich ausgeführt."
 
 #. type: TP
-#: dpkg-query.1:199 dpkg-split.1:187 start-stop-daemon.8:271
-#: start-stop-daemon.8:293
+#: dpkg-query.1:199 dpkg-split.1:186 start-stop-daemon.8:270
+#: start-stop-daemon.8:292
 #, no-wrap
 msgid "B<1>"
 msgstr "B<1>"
@@ -11735,28 +12075,22 @@
 msgid "dpkg-scanpackages"
 msgstr "dpkg-scanpackages"
 
-#. type: TH
-#: dpkg-scanpackages.1:15 dpkg-scansources.1:1
-#, no-wrap
-msgid "2009-10-01"
-msgstr "2009-10-01"
-
 #. type: Plain text
 #: dpkg-scanpackages.1:18
 msgid "dpkg-scanpackages - create Packages index files"
 msgstr "dpkg-scanpackages - erstelle Packages-Index-Dateien"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:27
+#: dpkg-scanpackages.1:26
 msgid ""
-"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scanpackages> [I<option>...] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
-"B<dpkg-scanpackages> [I<Optionen>] I<Binär-Verz> [I<override-Datei> [I<Pfad-"
+"B<dpkg-scanpackages> [I<Option>...] I<Binär-Verz> [I<override-Datei> [I<Pfad-"
 "Präfix>]] B<E<gt>> I<Pakete>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:40
+#: dpkg-scanpackages.1:39
 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 "
@@ -11774,7 +12108,7 @@
 "Installation auf einem Cluster von Maschinen anlegen."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:52
+#: 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<bzip2>(1)  (generating a "
@@ -11789,7 +12123,7 @@
 "unkomprimierte Packages-Dateien."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:59
+#: 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 "
@@ -11802,7 +12136,7 @@
 "Packages-Datei mit dieser Zeichenkette beginnen wird."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-scanpackages.1:63
 msgid ""
 "I<overridefile> is the name of a file to read which contains information "
 "about how the package fits into the distribution (it can be a compressed "
@@ -11813,7 +12147,7 @@
 "komprimierte Datei sein); siehe B<deb-override>(5)."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-scanpackages.1:66
 msgid ""
 "I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
@@ -11821,7 +12155,7 @@
 "gehängt werden soll."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:71
+#: dpkg-scanpackages.1:70
 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 "
@@ -11832,36 +12166,35 @@
 "in der Architektur unterscheiden, wird das zuerst gefundene verwendet."
 
 #. type: TP
-#: dpkg-scanpackages.1:73
+#: dpkg-scanpackages.1:72
 #, no-wrap
 msgid "B<-t>, B<--type> I<type>"
 msgstr "B<-t>, B<--type> I<Typ>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 msgid "Scan for *.I<type> packages, instead of *.deb."
 msgstr "Suche nach *.I<Typ> statt *.deb-Paketen."
 
 #. type: TP
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 #, no-wrap
 msgid "B<-u>, B<--udeb>"
 msgstr "B<-u>, B<--udeb>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:79
+#: dpkg-scanpackages.1:78
 msgid "B<Obsolete> alias for B<-tudeb>."
 msgstr "B<Veralteter> Alias für B<-tudeb>."
 
 #. type: IP
-#: dpkg-scanpackages.1:79 dpkg-scansources.1:50
+#: dpkg-scanpackages.1:78 dpkg-scansources.1:49
 #, no-wrap
 msgid "B<-e>, B<--extra-override> I<file>"
 msgstr "B<-e>, B<--extra-override> I<Datei>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-scanpackages.1:85 dpkg-scansources.1:55
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:54
 msgid ""
 "Scan I<file> to find supplementary overrides (the file can be compressed). "
 "See B<deb-extra-override>(5)  for more information on its format."
@@ -11871,13 +12204,13 @@
 "Informationen über deren Format."
 
 #. type: TP
-#: dpkg-scanpackages.1:85
+#: dpkg-scanpackages.1:84
 #, no-wrap
 msgid "B<-a>, B<--arch> I<arch>"
 msgstr "B<-a>, B<--arch> I<arch>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 msgid ""
 "Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
 "scanning for all debs."
@@ -11886,25 +12219,24 @@
 "nach allen Debs zu suchen."
 
 #. type: TP
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 #, no-wrap
 msgid "B<-m>, B<--multiversion>"
 msgstr "B<-m>, B<--multiversion>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 msgid "Include all found packages in the output."
 msgstr "Nimm alle gefundenen Pakete in der Ausgabe auf."
 
 #. type: TP
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 #, no-wrap
 msgid "B<-M>, B<--medium> I<id-string>"
 msgstr "B<-M>, B<--medium> I<ID-Zeichenkette>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-scanpackages.1:97
+#: dpkg-scanpackages.1:96
 msgid ""
 "Add an X-Medium field containing the value I<id-string>. This field is "
 "required if you want to generate B<Packages.cd> files for use by the multicd "
@@ -11915,13 +12247,13 @@
 "Einsatz mit der Multicd-Zugriffsmethode von Dselect erstellen wollen."
 
 #. type: SH
-#: dpkg-scanpackages.1:104 update-alternatives.8:449
+#: dpkg-scanpackages.1:103 update-alternatives.8:448
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSE"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:110
+#: dpkg-scanpackages.1:109
 msgid ""
 "B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
 "warns about packages that are in the wrong subdirectory, are duplicated, "
@@ -11935,7 +12267,7 @@
 "Effekt haben."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:116
+#: dpkg-scanpackages.1:115
 msgid ""
 "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<deb-extra-override>(5), "
 "B<dpkg-scansources>(1)."
@@ -11955,16 +12287,16 @@
 msgstr "dpkg-scanpackages - erstelle Quell-Index-Dateien"
 
 #. type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-scansources.1:12
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scansources> [I<option>...] 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-"
+"B<dpkg-scansources> [I<Option>...] I<Binär-Verz> [I<override-Datei> [I<Pfad-"
 "Prefix>]] B<E<gt>> I<Sources>"
 
 #. type: Plain text
-#: dpkg-scansources.1:18
+#: dpkg-scansources.1:17
 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."
@@ -11974,7 +12306,7 @@
 "der auf der Standardausgabe ausgegeben wird."
 
 #. type: Plain text
-#: dpkg-scansources.1:29
+#: dpkg-scansources.1:28
 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> "
@@ -11998,7 +12330,7 @@
 "der I<.dsc>-Datei aufgeführte Binärpaket. Dies könnte sich ändern."
 
 #. type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-scansources.1:32
 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 "
@@ -12010,7 +12342,7 @@
 "enthält."
 
 #. type: Plain text
-#: dpkg-scansources.1:44
+#: dpkg-scansources.1:43
 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 "
@@ -12024,13 +12356,13 @@
 "Dateien."
 
 #. type: IP
-#: dpkg-scansources.1:46
+#: dpkg-scansources.1:45
 #, no-wrap
 msgid "B<-n>, B<--no-sort>"
 msgstr "B<-n>, B<--no-sort>"
 
 #. type: Plain text
-#: dpkg-scansources.1:49
+#: dpkg-scansources.1:48
 msgid ""
 "Don't sort the index records. Normally they are sorted by source package "
 "name."
@@ -12039,13 +12371,13 @@
 "Quellpaketnamen sortiert."
 
 #. type: IP
-#: dpkg-scansources.1:55
+#: dpkg-scansources.1:54
 #, no-wrap
 msgid "B<-s>, B<--source-override> I<file>"
 msgstr "B<-s>, B<--source-override> I<Datei>"
 
 #. type: Plain text
-#: dpkg-scansources.1:59
+#: dpkg-scansources.1:58
 msgid ""
 "Use I<file> as the source override file (the file can be compressed).  The "
 "default is the name of the override file you specified with I<.src> appended."
@@ -12055,7 +12387,7 @@
 "angegeben haben, um I<.src> ergänzt."
 
 #. type: Plain text
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 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 "
@@ -12071,23 +12403,23 @@
 "des Bereichs."
 
 #. type: IP
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 #. type: Plain text
-#: dpkg-scansources.1:67
+#: dpkg-scansources.1:66
 msgid "Turn debugging on."
 msgstr "Schalte Debugging ein."
 
 #. type: Plain text
-#: dpkg-scansources.1:76
+#: dpkg-scansources.1:75
 msgid "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 msgstr "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 
 #. type: Plain text
-#: dpkg-scansources.1:78
+#: dpkg-scansources.1:77
 msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 
@@ -12097,12 +12429,6 @@
 msgid "dpkg-shlibdeps"
 msgstr "dpkg-shlibdeps"
 
-#. type: TH
-#: dpkg-shlibdeps.1:1 dpkg-source.1:2
-#, no-wrap
-msgid "2011-03-04"
-msgstr "2011-03-04"
-
 #. type: Plain text
 #: dpkg-shlibdeps.1:4
 msgid "dpkg-shlibdeps - generate shared library substvar dependencies"
@@ -12110,30 +12436,28 @@
 "dpkg-shlibdeps - erstelle Substvar-Abhängigkeiten für Laufzeitbibliotheken"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:10
-msgid ""
-"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
-msgstr ""
-"B<dpkg-shlibdeps> [I<Optionen>] I<Programm>|B<-e>I<Programm> [I<Optionen>]"
+#: dpkg-shlibdeps.1:8
+msgid "B<dpkg-shlibdeps> [I<option>...] [B<-e>]I<executable> [I<option>...]"
+msgstr "B<dpkg-shlibdeps> [I<Option>...] [B<-e>]I<Programm> [I<Option>...]"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:24
+#: dpkg-shlibdeps.1:22
 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."
+"other variables starting with B<shlibs:> are removed from the file."
 msgstr ""
 "B<dpkg-shlibdeps> berechnet Abhängigkeiten von Laufzeitbibliotheken für "
 "Programme, deren Name als Argument übergeben werden. Die Abhängigkeiten "
 "werden zu der Datei der Substitutionsvariablen B<debian/substvars> als "
 "Variablennamen B<shlibs:>I<Abhängigkeitsfeld> hinzugefügt, wobei "
 "I<Abhängigkeitsfeld> der Feldname einer Abhängigkeit ist. Alle anderen "
-"Variablen, die mit I<shlibs:> beginnen, werden aus der Datei entfernt."
+"Variablen, die mit B<shlibs:> beginnen, werden aus der Datei entfernt."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 msgid ""
 "B<dpkg-shlibdeps> has two possible sources of information to generate "
 "dependency information. Either I<symbols> files or I<shlibs> files. For each "
@@ -12163,13 +12487,13 @@
 "Bibliothek bereitstellt, zu ermitteln."
 
 #. type: SS
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 #, no-wrap
 msgid "Symbols files"
 msgstr "Symboldateien"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 msgid ""
 "Symbols files contain finer-grained dependency information by providing the "
 "minimum dependency for each symbol that the library exports. The script "
@@ -12183,13 +12507,13 @@
 "Treffer wird verwendet):"
 
 #. type: IP
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 #, no-wrap
 msgid "debian/*/DEBIAN/symbols"
 msgstr "debian/*/DEBIAN/symbols"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are generated by B<dpkg-gensymbols>(1).  "
@@ -12204,19 +12528,19 @@
 "gegenüber Symboldateien aus anderen Binärpaketen."
 
 #. type: IP
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols.I<arch>"
 msgstr "/etc/dpkg/symbols/I<Paket>.symbols.I<Architektur>"
 
 #. type: IP
-#: dpkg-shlibdeps.1:61
+#: dpkg-shlibdeps.1:59
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols"
 msgstr "/etc/dpkg/symbols/I<Paket>.symbols"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 msgid ""
 "Per-system overriding shared library dependency information.  I<arch> is the "
 "architecture of the current system (obtained by B<dpkg-architecture -"
@@ -12227,13 +12551,13 @@
 "Systems (ermittelt durch B<dpkg-architecture -qDEB_HOST_ARCH>)."
 
 #. type: IP
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> symbols\\(rq"
 msgstr "Ausgabe von \\(lqB<dpkg-query --control-path> I<Paket> symbols\\(rq"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:68 dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:66 dpkg-shlibdeps.1:100
 msgid ""
 "Package-provided shared library dependency information.  Unless overridden "
 "by --admindir, those files are located in /var/lib/dpkg."
@@ -12243,7 +12567,7 @@
 "sich solche Dateien unter /var/lib/dpkg."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:75
+#: dpkg-shlibdeps.1:73
 msgid ""
 "While scanning the symbols used by all binaries, B<dpkg-shlibdeps> remembers "
 "the (biggest) minimal version needed for each library. At the end of the "
@@ -12257,7 +12581,7 @@
 "(vorausgesetzt, die Informationen in den I<Symbol>-Dateien sind korrekt)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 msgid ""
 "As a safe-guard measure, a symbols file can provide a I<Build-Depends-"
 "Package> meta-information field and B<dpkg-shlibdeps> will extract the "
@@ -12272,13 +12596,13 @@
 "minimale Version, die beim Durchsuchen der Symbole ermittelt wurde."
 
 #. type: SS
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 #, no-wrap
 msgid "Shlibs files"
 msgstr "Shlibs-Dateien"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:86
+#: dpkg-shlibdeps.1:84
 msgid ""
 "Shlibs files associate directly a library to a dependency (without looking "
 "at the symbols). It's thus often stronger than really needed but very safe "
@@ -12289,7 +12613,7 @@
 "sicher und leicht zu handhaben."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 msgid ""
 "The dependencies for a library are looked up in several places. The first "
 "file providing information for the library of interest is used:"
@@ -12299,39 +12623,39 @@
 "Bibliothek bereitstellt, wird verwendet:"
 
 #. type: IP
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 #, no-wrap
 msgid "debian/shlibs.local"
 msgstr "debian/shlibs.local"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 msgid "Package-local overriding shared library dependency information."
 msgstr ""
 "Paket-beschränkte Überschreibung der Abhängigkeitsinformationen von "
 "Laufzeitbibliotheken."
 
 #. type: IP
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 #, no-wrap
 msgid "/etc/dpkg/shlibs.override"
 msgstr "/etc/dpkg/shlibs.override"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 msgid "Per-system overriding shared library dependency information."
 msgstr ""
 "Systemabhängige Überschreibung der Abhängigkeitsinformationen von "
 "Laufzeitbibliotheken."
 
 #. type: IP
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 #, no-wrap
 msgid "debian/*/DEBIAN/shlibs"
 msgstr "debian/*/DEBIAN/shlibs"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are only used if the library is found in a "
@@ -12345,26 +12669,26 @@
 "Dateien von anderen Binärpaketen Vorrang."
 
 #. type: IP
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> shlibs\\(rq"
 msgstr "Ausgabe von \\(lqB<dpkg-query --control-path> I<Paket> shlibs\\(rq"
 
 #. type: IP
-#: dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:100
 #, no-wrap
 msgid "/etc/dpkg/shlibs.default"
 msgstr "/etc/dpkg/shlibs.default"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:104
+#: dpkg-shlibdeps.1:102
 msgid "Per-system default shared library dependency information."
 msgstr ""
 "Systemabhängige Vorgaben für Abhängigkeitsinformationen von "
 "Laufzeitbibliotheken."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:108
+#: dpkg-shlibdeps.1:106
 msgid ""
 "The extracted dependencies are then directly used (except if they are "
 "filtered out because they have been identified as duplicate, or as weaker "
@@ -12375,7 +12699,7 @@
 "Abhängigkeit)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 msgid ""
 "B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
 "as if they'd been supplied as B<-e>I<executable>."
@@ -12385,13 +12709,13 @@
 "wären."
 
 #. type: TP
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 #, no-wrap
 msgid "B<-e>I<executable>"
 msgstr "B<-e>I<Programm>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 msgid ""
 "Include dependencies appropriate for the shared libraries required by "
 "I<executable>."
@@ -12400,13 +12724,13 @@
 "Laufzeitbibliotheken angemessen sind."
 
 #. type: TP
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 #, no-wrap
 msgid "B<-d>I<dependencyfield>"
 msgstr "B<-d>I<Abhängigkeitsfeld>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:123
+#: dpkg-shlibdeps.1:121
 msgid ""
 "Add dependencies to be added to the control file dependency field "
 "I<dependencyfield>.  (The dependencies for this field are placed in the "
@@ -12417,7 +12741,7 @@
 "Feld werden in die Variable B<shlibs:>I<Abhängigkeitsfeld> geschrieben.)"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:133
+#: dpkg-shlibdeps.1:131
 msgid ""
 "The B<-d>I<dependencyfield> option takes effect for all executables after "
 "the option, until the next B<-d>I<dependencyfield>.  The default "
@@ -12428,7 +12752,7 @@
 "Standardwert für I<Abhängigkeitsfeld> ist B<Depends>."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 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>, "
@@ -12443,13 +12767,13 @@
 "wichtigsten Abhängigkeiten repräsentiert, entfernen."
 
 #. type: TP
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 #, no-wrap
 msgid "B<-p>I<varnameprefix>"
 msgstr "B<-p>I<Variablennamepräfix>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:152
+#: dpkg-shlibdeps.1:150
 msgid ""
 "Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
 ">.  Likewise, any existing substitution variables starting with "
@@ -12462,7 +12786,7 @@
 "Substitutionsvariablen entfernt."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 msgid ""
 "Print substitution variable settings to standard output, rather than being "
 "added to the substitution variables file (B<debian/substvars> by default)."
@@ -12472,13 +12796,13 @@
 "hinzuzufügen."
 
 #. type: TP
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 #, no-wrap
 msgid "B<-t>I<type>"
 msgstr "B<-t>I<Typ>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 msgid ""
 "Prefer shared library dependency information tagged for the given package "
 "type. If no tagged information is available, falls back to untagged "
@@ -12494,13 +12818,13 @@
 "Typs, ein Doppelpunkt und ein Leerzeichen gesetzt wird."
 
 #. type: TP
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 #, no-wrap
 msgid "B<-L>I<localshlibsfile>"
 msgstr "B<-L>I<lokalshlibsdatei>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:171
+#: dpkg-shlibdeps.1:169
 msgid ""
 "Read overriding shared library dependency information from "
 "I<localshlibsfile> instead of B<debian/shlibs.local>."
@@ -12509,7 +12833,7 @@
 "I<lokalshlibsdatei> statt aus B<debian/shlibs.local>."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 msgid ""
 "Write substitution variables in I<substvarsfile>; the default is B<debian/"
 "substvars>."
@@ -12518,13 +12842,13 @@
 "substvars>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 #, no-wrap
 msgid "B<-v>"
 msgstr "B<-v>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 msgid ""
 "Enable verbose mode. Numerous messages are displayed to explain what B<dpkg-"
 "shlibdeps> does."
@@ -12533,13 +12857,13 @@
 "um zu erklären, was B<dpkg-shlibdeps> durchführt."
 
 #. type: TP
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 #, no-wrap
 msgid "B<-x>I<package>"
 msgstr "B<-x>I<Paket>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 msgid ""
 "Exclude the package from the generated dependencies. This is useful to avoid "
 "self-dependencies for packages which provide ELF binaries (executables or "
@@ -12553,13 +12877,13 @@
 "mehrfach verwendet werden, um mehrere Pakete auszuschließen."
 
 #. type: TP
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 #, no-wrap
 msgid "B<-S>I<pkgbuilddir>"
 msgstr "B<-S>I<Paketbauverzeichnis>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 msgid ""
 "Look into I<pkgbuilddir> first when trying to find a library. This is useful "
 "when the source package builds multiple flavors of the same library and you "
@@ -12575,13 +12899,13 @@
 "Reihenfolge vor Verzeichnissen anderer Binärpakete probiert."
 
 #. type: TP
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 #, no-wrap
 msgid "B<--ignore-missing-info>"
 msgstr "B<--ignore-missing-info>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 msgid ""
 "Do not fail if dependency information can't be found for a shared library.  "
 "Usage of this option is discouraged, all libraries should provide dependency "
@@ -12595,13 +12919,13 @@
 "falls diese noch nicht von anderen Paketen verwendet werden."
 
 #. type: TP
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 #, no-wrap
 msgid "B<--warnings=>I<value>"
 msgstr "B<--warnings=>I<Wert>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:213
+#: dpkg-shlibdeps.1:211
 msgid ""
 "I<value> is a bit field defining the set of warnings that can be emitted by "
 "B<dpkg-shlibdeps>.  Bit 0 (value=1) enables the warning \"symbol I<sym> used "
@@ -12622,13 +12946,13 @@
 "alle Warnungen aktiv sein sollen."
 
 #. type: SH
-#: dpkg-shlibdeps.1:224
+#: dpkg-shlibdeps.1:222
 #, no-wrap
 msgid "WARNINGS"
 msgstr "WARNUNGEN"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 msgid ""
 "Since B<dpkg-shlibdeps> analyzes the set of symbols used by each binary of "
 "the generated package, it is able to emit warnings in several cases. They "
@@ -12644,13 +12968,13 @@
 "folgen hier die relevanten Warnungen, die auftauchen könnten:"
 
 #. type: TP
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 #, no-wrap
 msgid "B<symbol>I< sym>B< used by >I<binary>B< found in none of the libraries.>"
 msgstr "B<Symbol> I< Symbol>B<, verwendet von >I<Programm>B<, in keiner der Bibliotheken gefunden.>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a library and it needs to be linked "
@@ -12663,13 +12987,13 @@
 "gelinkt werden (Option B<-l>I<Bibliothek> des Linkers)."
 
 #. type: TP
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 #, no-wrap
 msgid "I<binary>B< contains an unresolvable reference to symbol >I<sym>B<: it's probably a plugin>"
 msgstr "I<Programm>B< enthält eine nicht-auflösbare Referenz auf Symbol >I<Sym>B<: wahrscheinlich eine Erweiterung>."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a plugin and the symbol is probably "
@@ -12697,13 +13021,13 @@
 "Fall ist die Bibliothek beschädigt und muss repariert werden."
 
 #. type: TP
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 #, no-wrap
 msgid "B<dependency on >I<library>B< could be avoided if >I<binaries>B< were not uselessly linked against it (they use none of its symbols).>"
 msgstr "B<Abhängigkeit von >I<Bibliothek>B< könnte vermieden werden, falls >I<Programm>B< nicht unnötigerweise dagegen gelinkt wäre (es verwendet keines seiner Symbole.>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 msgid ""
 "None of the I<binaries> that are linked with I<library> use any of the "
 "symbols provided by the library. By fixing all the binaries, you would avoid "
@@ -12717,13 +13041,13 @@
 "Bibliothek generiert, die diese Bibliothek wirklich verwendet)."
 
 #. type: TP
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 #, no-wrap
 msgid "I<binary>B< shouldn't be linked with >I<library>B< (it uses none of its symbols).>"
 msgstr "I<Programm>B< sollte nicht gegen >I<Bibliothek>B< gelinkt werden (es verwendet keines ihrer Symbole).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 msgid ""
 "The I<binary> is linked to a library that it doesn't need. It's not a "
 "problem but some small performance improvements in binary load time can be "
@@ -12739,13 +13063,13 @@
 "überprüften Programme."
 
 #. type: SH
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 #, no-wrap
 msgid "ERRORS"
 msgstr "FEHLER"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 msgid ""
 "B<dpkg-shlibdeps> will fail if it can't find a public library used by a "
 "binary or if this library has no associated dependency information (either "
@@ -12762,13 +13086,13 @@
 "sein."
 
 #. type: TP
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 #, no-wrap
 msgid "B<couldn't find library >I<library-soname>B< needed by >I<binary>B< (its RPATH is '>I<rpath>B<')>"
 msgstr "B<konnte Bibliothek >I<SONAME-der-Bibliothek>B< benötigt von >I<Programm>B< nicht finden (ihr RPATH ist »>I<rpath>B<«).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:287
+#: dpkg-shlibdeps.1:285
 msgid ""
 "The I<binary> uses a library called I<library-soname> but B<dpkg-shlibdeps> "
 "has been unable to find the library.  B<dpkg-shlibdeps> creates a list of "
@@ -12777,8 +13101,8 @@
 "LD_LIBRARY_PATH environment variable, and standard public directories (/"
 "lib, /usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks those "
 "directories in the package's build tree of the binary being analyzed, in the "
-"packages's build trees indicated with the -S command-line option, in other "
-"packages's build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
+"packages' build trees indicated with the -S command-line option, in other "
+"packages' build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
 "and finally in the root directory.  If the library is not found in any of "
 "those directories, then you get this error."
 msgstr ""
@@ -12796,7 +13120,7 @@
 "dieser Verzeichnisse gefunden wird, erhalten Sie diesen Fehler."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 msgid ""
 "If the library not found is in a private directory of the same package, then "
 "you want to add the directory to LD_LIBRARY_PATH. If it's in another binary "
@@ -12813,13 +13137,13 @@
 "Verzeichnis liegt."
 
 #. type: TP
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 #, no-wrap
 msgid "B<no dependency information found for >I<library-file>B< (used by >I<binary>B<).>"
 msgstr "B<Keine Abhängigkeitsinformationen für >I<Bibliotheksdatei>B< (verwendet von >I<Programm>B<) gefunden.>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:306
+#: dpkg-shlibdeps.1:304
 msgid ""
 "The library needed by I<binary> has been found by B<dpkg-shlibdeps> in "
 "I<library-file> but B<dpkg-shlibdeps> has been unable to find any dependency "
@@ -12837,7 +13161,7 @@
 "verschiedenen Paketbaubäume ((debian/*/DEBIAN/)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:320
+#: dpkg-shlibdeps.1:318
 msgid ""
 "This failure can be caused by a bad or missing shlibs or symbols file in the "
 "package of the library. It might also happen if the library is built within "
@@ -12864,7 +13188,7 @@
 "ist immer am besten, den RPATH zu bereinigen, um Probleme zu vermeiden."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:326
+#: dpkg-shlibdeps.1:324
 msgid ""
 "Calling B<dpkg-shlibdeps> in verbose mode (-v) will provide much more "
 "information about where it tried to find the dependency information. This "
@@ -12876,12 +13200,12 @@
 "nicht verstehen, warum es Ihnen diesen Fehler meldet."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:330
+#: dpkg-shlibdeps.1:328
 msgid "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 msgstr "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:337
+#: dpkg-shlibdeps.1:335
 msgid "Copyright \\(co 2006 Frank Lichtenheld"
 msgstr "Copyright \\(co 2006 Frank Lichtenheld"
 
@@ -12897,17 +13221,17 @@
 msgstr "dpkg-source - Debian Quellpaket- (.dsc) Manipulations-Werkzeuge"
 
 #. type: Plain text
-#: dpkg-source.1:10
-msgid "B<dpkg-source> [I<options>] I<command>"
-msgstr "B<dpkg-source> [I<Optionen>] I<Befehl>"
+#: dpkg-source.1:9
+msgid "B<dpkg-source> [I<option>...] I<command>"
+msgstr "B<dpkg-source> [I<Option>...] I<Befehl>"
 
 #. type: Plain text
-#: dpkg-source.1:14
+#: dpkg-source.1:13
 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:18
+#: dpkg-source.1:17
 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 "
@@ -12918,13 +13242,13 @@
 "zu speichern."
 
 #. type: TP
-#: dpkg-source.1:20
+#: dpkg-source.1:19
 #, no-wrap
 msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr "B<-x >I<Dateiname>B<.dsc> [I<Ausgabe-Verzeichnis>]"
 
 #. type: Plain text
-#: dpkg-source.1:30
+#: dpkg-source.1:29
 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 "
@@ -12942,7 +13266,7 @@
 "Arbeitsverzeichnisses extrahiert."
 
 #. type: Plain text
-#: dpkg-source.1:36
+#: dpkg-source.1:35
 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 "
@@ -12953,7 +13277,7 @@
 "gleichen Verzeichnis wie die B<.dsc> liegen."
 
 #. type: Plain text
-#: dpkg-source.1:44
+#: dpkg-source.1:43
 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 "
@@ -12971,7 +13295,7 @@
 "Verzeichnisse werden die Gruppeneigentümerschaft erben."
 
 #. type: Plain text
-#: dpkg-source.1:49
+#: dpkg-source.1:48
 msgid ""
 "If the source package uses a non-standard format (currently this means all "
 "formats except \"1.0\"), its name will be stored in B<debian/source/format> "
@@ -12984,13 +13308,13 @@
 "standardmäßig das gleiche Format verwenden."
 
 #. type: TP
-#: dpkg-source.1:50
+#: dpkg-source.1:49
 #, no-wrap
 msgid "B<-b> I<directory> [I<format-specific-parameters>]"
 msgstr "B<-b> I<Verzeichnis> [I<Format-abhängige-Parameter>]"
 
 #. type: Plain text
-#: dpkg-source.1:57
+#: dpkg-source.1:56
 msgid ""
 "Build a source package. The first non-option argument is taken as the name "
 "of the directory containing the debianized source tree (i.e. with a debian "
@@ -13005,10 +13329,10 @@
 "Quellpaketformat könnten zusätzliche Parameter akzeptiert werden."
 
 #. type: Plain text
-#: dpkg-source.1:66
+#: dpkg-source.1:65
 msgid ""
 "B<dpkg-source> will build the source package with the first format found in "
-"this ordered list: the format indicated with the I<--format> command-line "
+"this ordered list: the format indicated with the I<--format> command line "
 "option, the format indicated in B<debian/source/format>, \"1.0\". The "
 "fallback to \"1.0\" is deprecated and will be removed at some point in the "
 "future, you should always document the desired source format in B<debian/"
@@ -13024,14 +13348,13 @@
 "werden im Abschnitt B<QUELLPAKET-FORMATE> ausführlich beschrieben."
 
 #. type: TP
-#: dpkg-source.1:67
+#: dpkg-source.1:66
 #, no-wrap
 msgid "B<--print-format> I<directory>"
 msgstr "B<--print-format> I<Verzeichnis>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:72
+#: dpkg-source.1:71
 msgid ""
 "Print the source format that would be used to build the source package if "
 "B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -13042,28 +13365,28 @@
 "Bedingungen und mit den gleichen Parametern)."
 
 #. type: TP
-#: dpkg-source.1:73
+#: dpkg-source.1:72
 #, no-wrap
 msgid "B<--before-build> I<directory>"
 msgstr "B<--before-build> I<Verzeichnis>"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-source.1:81
 msgid ""
-"This command should be called before any build of the package (B<dpkg-"
-"buildpackage> calls it very early even before B<debian/rules clean>). This "
-"command should be idempotent and can be called multiple times. Not all "
-"source formats implement something in this hook, and those that do usually "
-"prepare the source tree for the build for example by ensuring that the "
-"Debian patches are applied."
-msgstr ""
-"Dieser Befehl sollte vor jedem Bau des Pakets aufgerufen werden (B<dpkg-"
-"buildpackage> ruft ihn sehr früh vor B<debian/rules clean> auf). Dieser "
-"Befehl sollte idempotent sein und kann mehrfach aufgerufen werden. Nicht "
-"alle Quellformate implementieren in diesem Hook etwas und wenn dies erfolgt, "
-"dann gewöhnlich zur Vorbereitung des Quellbaums für den Bau, in dem "
-"beispielsweise sichergestellt wird, dass alle Debian-Patches angewandt sind."
+"Run the corresponding hook of the source package format. This hook is called "
+"before any build of the package (B<dpkg-buildpackage> calls it very early "
+"even before B<debian/rules clean>). This command is idempotent and can be "
+"called multiple times. Not all source formats implement something in this "
+"hook, and those that do usually prepare the source tree for the build for "
+"example by ensuring that the Debian patches are applied."
+msgstr ""
+"Der entsprechende Hook dess Quellpaketformats soll ausgeführt werden. Dieser "
+"Hook wird vor jedem Bau des Pakets aufgerufen (B<dpkg-buildpackage> ruft ihn "
+"sehr früh, sogar vor B<debian/rules clean> auf). Dieser Befehl ist "
+"idempotent und kann mehrfach aufgerufen werden. Nicht alle Quellformate "
+"implementieren in diesem Hook etwas und wenn dies erfolgt, dann gewöhnlich "
+"zur Vorbereitung des Quellbaums für den Bau, in dem beispielsweise "
+"sichergestellt wird, dass alle Debian-Patches angewandt sind."
 
 #. type: TP
 #: dpkg-source.1:82
@@ -13071,30 +13394,48 @@
 msgid "B<--after-build> I<directory>"
 msgstr "B<--after-build> I<Verzeichnis>"
 
-# type: Plain text
 #. type: Plain text
 #: dpkg-source.1:89
 msgid ""
-"This command should be called after any build of the package (B<dpkg-"
-"buildpackage> calls it last). This command should be idempotent and can be "
-"called multiple times. Not all source formats implement something in this "
-"hook, and those that do usually use it to undo what B<--before-build> has "
-"done."
+"Run the corresponding hook of the source package format. This hook is called "
+"after any build of the package (B<dpkg-buildpackage> calls it last). This "
+"command is idempotent and can be called multiple times. Not all source "
+"formats implement something in this hook, and those that do usually use it "
+"to undo what B<--before-build> has done."
+msgstr ""
+"Der entsprechende Hook dess Quellpaketformats soll ausgeführt werden. Dieser "
+"Hook wird nach jedem Bau des Pakets aufgerufen (B<dpkg-buildpackage> ruft "
+"als letztes auf). Dieser Befehl ist idempotent und kann mehrfach aufgerufen "
+"werden. Nicht alle Quellformate implementieren in diesem Hook etwas und wenn "
+"dies erfolgt, dann gewöhnlich um rückgängig zu machen, was B<--before-build> "
+"durchgeführt hat."
+
+#. type: TP
+#: dpkg-source.1:90
+#, no-wrap
+msgid "B<--commit> [I<directory>] ..."
+msgstr "B<--commit> [I<Verzeichnis>] ..."
+
+#. type: Plain text
+#: dpkg-source.1:95
+msgid ""
+"Record changes in the source tree unpacked in I<directory>. This command can "
+"take supplementary parameters depending on the source format.  It will error "
+"out for formats where this operation doesn't mean anything."
 msgstr ""
-"Dieser Befehl sollte nach jedem Bau des Pakets aufgerufen werden (B<dpkg-"
-"buildpackage> ruft als letztes auf). Dieser Befehl sollte idempotent sein "
-"und kann mehrfach aufgerufen werden. Nicht alle Quellformate implementieren "
-"in diesem Hook etwas und wenn dies erfolgt, dann gewöhnlich um rückgängig zu "
-"machen, was B<--before-build> durchgeführt hat."
+"Zeichnet Änderungen am in I<Verzeichnis> entpackten Quellbaum auf. Dieser "
+"Befehl kann zusätzliche Parameter akzeptieren, abhängig vom Quellformat. Er "
+"wird zu einer Fehlermeldung bei Formaten, für denen dieser Vorgang keine "
+"Bedeutung hat, führen."
 
 #. type: SH
-#: dpkg-source.1:97
+#: dpkg-source.1:103
 #, no-wrap
 msgid "GENERIC BUILD OPTIONS"
 msgstr "GENERISCHE BAUOPTIONEN"
 
 #. type: Plain text
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 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 "
@@ -13106,7 +13447,7 @@
 "interpretiert."
 
 #. type: Plain text
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 msgid ""
 "Specifies the change log file to read information from. The default is "
 "B<debian/changelog>.  If given with relative pathname this is interpreted "
@@ -13118,13 +13459,13 @@
 "interpretiert."
 
 #. type: TP
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 #, no-wrap
 msgid "B<--format=>I<value>"
 msgstr "B<--format=>I<Wert>"
 
 #. type: Plain text
-#: dpkg-source.1:121
+#: dpkg-source.1:127
 msgid ""
 "Use the given format for building the source package. It does override any "
 "format given in B<debian/source/format>."
@@ -13133,7 +13474,7 @@
 "jedes in B<debian/source/format> angegebene Format."
 
 #. type: Plain text
-#: dpkg-source.1:131
+#: dpkg-source.1:137
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is to not read "
 "any file. This option can be used multiple times to read substitution "
@@ -13144,13 +13485,13 @@
 "Substitutionsvariablen aus mehreren Dateien einzulesen."
 
 #. type: TP
-#: dpkg-source.1:137
+#: dpkg-source.1:143
 #, no-wrap
 msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
 msgstr "B<-Z>I<Komprimierung>, B<--compression>=I<Komprimierung>"
 
 #. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 msgid ""
 "Specify the compression to use for created files (tarballs and diffs).  Note "
 "that this option will not cause existing tarballs to be recompressed, it "
@@ -13165,30 +13506,31 @@
 "I<gzip> ist voreingestellt. I<xz> wird erst seit Dpkg-dev 1.15.5 unterstützt."
 
 #. type: TP
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 #, no-wrap
 msgid "B<-z>I<level>, B<--compression-level>=I<level>"
 msgstr "B<-z>I<Stufe>, B<--compression-level>=I<Stufe>"
 
 #. type: Plain text
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 msgid ""
 "Compression level to use. As with B<-Z> it only affects newly created files. "
-"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  I<9> is the "
-"default."
+"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  The default is "
+"I<9> for gzip and bzip2, I<6> for xz and lzma."
 msgstr ""
 "Zu verwendende Komprimierstufe. Wie bei B<-Z> betrifft dies nur neu "
 "angelegte Dateien. Unterstützte Werte sind I<1> bis I<9>, I<best> (am "
-"besten) und I<fast> (schnell). I<9> ist voreingestellt."
+"besten) und I<fast> (schnell). Der Standardwert ist I<9> für Gzip und Bzip2, "
+"I<6> für Xz und Lzma."
 
 #. type: TP
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 #, no-wrap
 msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
 msgstr "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
 
 #. type: Plain text
-#: dpkg-source.1:163
+#: dpkg-source.1:169
 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 "
@@ -13213,7 +13555,7 @@
 "wird nur die letzte berücksichtigt."
 
 #. type: Plain text
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 msgid ""
 "This is very helpful in cutting out extraneous files that get included in "
 "the diff, e.g. if you maintain your source in a revision control system and "
@@ -13237,13 +13579,13 @@
 "die notwendigen Anker (z.B. »(^|/)«, »($|/)«) selbst bereitstellen."
 
 #. type: TP
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 #, no-wrap
 msgid "B<--extend-diff-ignore>=I<regexp>"
 msgstr "B<--extend-diff-ignore>=I<regexp>"
 
 #. type: Plain text
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 msgid ""
 "The perl regular expression specified will extend the default value of B<--"
 "diff-ignore> and its current value (if set). It does this by concatenating "
@@ -13251,22 +13593,21 @@
 "in B<debian/source/options> to exclude some auto-generated files from the "
 "automatic patch generation."
 msgstr ""
-"Der angegebene reguläre Ausdruck (Perl-Format) wird den standardmäßigen "
-"Wert von B<--diff-ignore> and dessen aktuellen Wert (falls gesetzt) "
-"erweiteren. Dies erfolgt, indem »B<|>I<regexp>« an den existierenden Wert "
-"angehängt wird. Diese "
-"Option ist bequem in B<debian/source/options> zu nutzen, um einige "
-"automatisch erstellten Dateien von der automatischen Patch-Erzeugung "
+"Der angegebene reguläre Ausdruck (Perl-Format) wird den standardmäßigen Wert "
+"von B<--diff-ignore> and dessen aktuellen Wert (falls gesetzt) erweiteren. "
+"Dies erfolgt, indem »B<|>I<regexp>« an den existierenden Wert angehängt "
+"wird. Diese Option ist bequem in B<debian/source/options> zu nutzen, um "
+"einige automatisch erstellten Dateien von der automatischen Patch-Erzeugung "
 "auszuschließen."
 
 #. type: TP
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 #, no-wrap
 msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
 msgstr "B<-I>[I<Dateimuster>], B<--tar-ignore>[=I<Dateimuster>]"
 
 #. type: Plain text
-#: dpkg-source.1:189
+#: dpkg-source.1:195
 msgid ""
 "If this option is specified, the pattern will be passed to B<tar>(1)'s --"
 "exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -13282,7 +13623,7 @@
 "ausgeschlossen werden sollen."
 
 #. type: Plain text
-#: dpkg-source.1:194
+#: dpkg-source.1:200
 msgid ""
 "B<-I> by itself adds default --exclude options that will filter out control "
 "files and directories of the most common revision control systems, backup "
@@ -13293,7 +13634,7 @@
 "Backups, Swap-Dateien und Bau-Ausgabeverzeichnisse von Libtool herausfiltern."
 
 #. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:212
 msgid ""
 "B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
 "different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -13315,7 +13656,7 @@
 "html#wildcards für eine komplette Dokumentation."
 
 #. type: Plain text
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 msgid ""
 "The default regexp and patterns for both options can be seen in the output "
 "of the B<--help> command."
@@ -13324,42 +13665,42 @@
 "in der Ausgabe des Befehls B<--help> gesehen werden."
 
 #. type: SH
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 #, no-wrap
 msgid "GENERIC EXTRACT OPTIONS"
 msgstr "GENERISCHE EXTRAHIERUNGSOPTIONEN"
 
 #. type: TP
-#: dpkg-source.1:210
+#: dpkg-source.1:216
 #, no-wrap
 msgid "B<--no-copy>"
 msgstr "B<--no-copy>"
 
 #. type: Plain text
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 msgid "Do not copy original tarballs near the extracted source package."
 msgstr ""
 "Kopiere die Original-Tarbälle in die Nähe des extrahierten Quellpakets."
 
 #. type: TP
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 #, no-wrap
 msgid "B<--no-check>"
 msgstr "B<--no-check>"
 
 #. type: Plain text
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 msgid "Do not check signatures and checksums before unpacking."
 msgstr "Prüfe Signaturen und Prüfsummen vor dem Entpacken nicht."
 
 #. type: TP
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 #, no-wrap
 msgid "B<--require-valid-signature>"
 msgstr "B<--require-valid-signature>"
 
 #. type: Plain text
-#: dpkg-source.1:224
+#: dpkg-source.1:230
 msgid ""
 "Refuse to unpack the source package if it doesn't contain an OpenPGP "
 "signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -13374,14 +13715,13 @@
 "share/keyrings/debian-maintainers.gpg>) überprüft werden kann."
 
 #. type: SH
-#: dpkg-source.1:225
+#: dpkg-source.1:231
 #, no-wrap
 msgid "SOURCE PACKAGE FORMATS"
 msgstr "QUELLPAKET-FORMATE"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:230
+#: dpkg-source.1:236
 msgid ""
 "If you don't know what source format to use, you should probably pick either "
 "\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
@@ -13393,13 +13733,13 @@
 "den Einsatz dieser Formate innerhalb von Debian."
 
 #. type: SS
-#: dpkg-source.1:231
+#: dpkg-source.1:237
 #, no-wrap
 msgid "Format: 1.0"
 msgstr "Format: 1.0"
 
 #. type: Plain text
-#: dpkg-source.1:235
+#: dpkg-source.1:241
 msgid ""
 "A source package in this format consists either of a B<.orig.tar.gz> "
 "associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -13410,12 +13750,12 @@
 "wird das Paket als I<nativ> bezeichnet)."
 
 #. type: Plain text
-#: dpkg-source.1:237 dpkg-source.1:405 dpkg-source.1:566 dpkg-source.1:605
+#: dpkg-source.1:243 dpkg-source.1:411 dpkg-source.1:586 dpkg-source.1:625
 msgid "B<Extracting>"
 msgstr "B<Extrahieren>"
 
 #. type: Plain text
-#: dpkg-source.1:247
+#: dpkg-source.1:253
 msgid ""
 "Extracting a native package is a simple extraction of the single tarball in "
 "the target directory. Extracting a non-native package is done by first "
@@ -13437,12 +13777,12 @@
 "aber keine Dateien entfernen (leere Dateien bleiben zurück)."
 
 #. type: Plain text
-#: dpkg-source.1:249 dpkg-source.1:433 dpkg-source.1:577 dpkg-source.1:610
+#: dpkg-source.1:255 dpkg-source.1:439 dpkg-source.1:597 dpkg-source.1:630
 msgid "B<Building>"
 msgstr "B<Bauen>"
 
 #. type: Plain text
-#: dpkg-source.1:255
+#: dpkg-source.1:261
 msgid ""
 "Building a native package is just creating a single tarball with the source "
 "directory. Building a non-native package involves extracting the original "
@@ -13456,13 +13796,13 @@
 "I<Verzeichnisses> mit dem Verzeichnis .orig ein."
 
 #. type: TP
-#: dpkg-source.1:256
+#: dpkg-source.1:262
 #, no-wrap
 msgid "B<Build options (with -b):>"
 msgstr "B<Bau-Optionen (mit -b):>"
 
 #. type: Plain text
-#: dpkg-source.1:269
+#: dpkg-source.1:275
 msgid ""
 "If a second non-option argument is supplied it should be the name of the "
 "original source directory or tarfile or the empty string if the package is a "
@@ -13481,7 +13821,7 @@
 "sX>-Argumenten."
 
 #. type: Plain text
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 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<-"
@@ -13493,13 +13833,13 @@
 "werden."
 
 #. type: TP
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 #, no-wrap
 msgid "B<-sk>"
 msgstr "B<-sk>"
 
 #. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:290
 msgid ""
 "Specifies to expect the original source as a tarfile, by default "
 "I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>.  It will leave "
@@ -13514,24 +13854,24 @@
 "wird nach I<Verzeichnis>B<.orig> für die Erstellung des Diffs entpackt."
 
 #. type: TP
-#: dpkg-source.1:284 dpkg-source.1:353
+#: dpkg-source.1:290 dpkg-source.1:359
 #, no-wrap
 msgid "B<-sp>"
 msgstr "B<-sp>"
 
 #. type: Plain text
-#: dpkg-source.1:289
+#: dpkg-source.1:295
 msgid "Like B<-sk> but will remove the directory again afterwards."
 msgstr "Wie B<-sk>, aber das Verzeichnis wird danach entfernt."
 
 #. type: TP
-#: dpkg-source.1:289 dpkg-source.1:359
+#: dpkg-source.1:295 dpkg-source.1:365
 #, no-wrap
 msgid "B<-su>"
 msgstr "B<-su>"
 
 #. type: Plain text
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 msgid ""
 "Specifies that 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 "
@@ -13542,24 +13882,24 @@
 "daraus ein neues Original-Quellarchiv erstellen."
 
 #. type: TP
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 #, no-wrap
 msgid "B<-sr>"
 msgstr "B<-sr>"
 
 #. type: Plain text
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr "Wie B<-su>, aber das Verzeichnis wird nach der Verwendung entfernt."
 
 #. type: TP
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 #, no-wrap
 msgid "B<-ss>"
 msgstr "B<-ss>"
 
 #. type: Plain text
-#: dpkg-source.1:310
+#: dpkg-source.1:316
 msgid ""
 "Specifies that the original source is available both as a directory and as a "
 "tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -13573,13 +13913,13 @@
 "zusammen passen, wird ein fehlerhaftes Quellarchiv erstellt."
 
 #. type: TP
-#: dpkg-source.1:310 dpkg-source.1:362
+#: dpkg-source.1:316 dpkg-source.1:368
 #, no-wrap
 msgid "B<-sn>"
 msgstr "B<-sn>"
 
 #. type: Plain text
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 msgid ""
 "Specifies to not look for any original source, and to not generate a diff.  "
 "The second argument, if supplied, must be the empty string. This is used for "
@@ -13592,13 +13932,13 @@
 "keine Quellen von Originalautoren und somit kein Debianisierungs-Diff haben."
 
 #. type: TP
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 #, no-wrap
 msgid "B<-sa> or B<-sA>"
 msgstr "B<-sa> oder B<-sA>"
 
 #. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:348
 msgid ""
 "Specifies to 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 "
@@ -13628,13 +13968,13 @@
 "die Voreinstellung."
 
 #. type: TP
-#: dpkg-source.1:342 dpkg-source.1:525
+#: dpkg-source.1:348 dpkg-source.1:541
 #, no-wrap
 msgid "B<--abort-on-upstream-changes>"
 msgstr "B<--abort-on-upstream-changes>"
 
 #. type: Plain text
-#: dpkg-source.1:348
+#: dpkg-source.1:354
 msgid ""
 "The process fails if the generated diff contains changes to files outside of "
 "the debian sub-directory. This option is not allowed in B<debian/source/"
@@ -13646,18 +13986,18 @@
 "options> verwandt werden."
 
 #. type: TP
-#: dpkg-source.1:349
+#: dpkg-source.1:355
 #, no-wrap
 msgid "B<Extract options (with -x):>"
 msgstr "B<Extrahierungs-Optionen (mit -x):>"
 
 #. type: Plain text
-#: dpkg-source.1:353
+#: dpkg-source.1:359
 msgid "In all cases any existing original source tree will be removed."
 msgstr "In allen Fällen werden die Originalquellbäume entfernt."
 
 #. type: Plain text
-#: dpkg-source.1:359
+#: dpkg-source.1:365
 msgid ""
 "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 "
@@ -13670,12 +14010,12 @@
 "vorhanden ist, wird sie dort hin kopiert. (B<Dies ist die Voreinstellung.>)"
 
 #. type: Plain text
-#: dpkg-source.1:362
+#: dpkg-source.1:368
 msgid "Unpacks the original source tree."
 msgstr "Entpackt den Originalquellbaum."
 
 #. type: Plain text
-#: dpkg-source.1:367
+#: dpkg-source.1:373
 msgid ""
 "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 "
@@ -13686,7 +14026,7 @@
 "Verzeichnis war, wird dennoch entfernt."
 
 #. type: Plain text
-#: dpkg-source.1:372
+#: dpkg-source.1:378
 msgid ""
 "All the B<-s>I<X> options are mutually exclusive. If you specify more than "
 "one only the last one will be used."
@@ -13695,26 +14035,26 @@
 "eine angeben, wird nur die letzte verwendet."
 
 #. type: TP
-#: dpkg-source.1:372 dpkg-source.1:535
+#: dpkg-source.1:378 dpkg-source.1:555
 #, no-wrap
 msgid "B<--skip-debianization>"
 msgstr "B<--skip-debianization>"
 
 #. type: Plain text
-#: dpkg-source.1:375
+#: dpkg-source.1:381
 msgid "Skips application of the debian diff on top of the upstream sources."
 msgstr ""
 "Überspringt die Anwendung des Debian-Diffs auf die Quellen der "
 "Originalautoren."
 
 #. type: SS
-#: dpkg-source.1:376
+#: dpkg-source.1:382
 #, no-wrap
 msgid "Format: 2.0"
 msgstr "Format: 2.0"
 
 #. type: Plain text
-#: dpkg-source.1:380
+#: dpkg-source.1:386
 msgid ""
 "Also known as wig&pen. This format is not recommended for wide-spread usage, "
 "the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -13725,7 +14065,7 @@
 "erste Spezifikation eines Paketformats der nächsten Generation."
 
 #. type: Plain text
-#: dpkg-source.1:385
+#: dpkg-source.1:391
 msgid ""
 "The behaviour of this format is the same as the \"3.0 (quilt)\" format "
 "except that it doesn't use an explicit list of patches. All files in "
@@ -13739,7 +14079,7 @@
 "Extrahierung angewandt."
 
 #. type: Plain text
-#: dpkg-source.1:388
+#: dpkg-source.1:394
 msgid ""
 "When building a new source package, any change to the upstream source is "
 "stored in a patch named B<zz_debian-diff-auto>."
@@ -13749,13 +14089,13 @@
 "gespeichert."
 
 #. type: SS
-#: dpkg-source.1:389
+#: dpkg-source.1:395
 #, no-wrap
 msgid "Format: 3.0 (native)"
 msgstr "Format: 3.0 (native)"
 
 #. type: Plain text
-#: dpkg-source.1:395
+#: dpkg-source.1:401
 msgid ""
 "This format is an extension of the native package format as defined in the "
 "1.0 format. It supports all compression methods and will ignore by default "
@@ -13769,13 +14109,13 @@
 "Ausgabe von B<--help>)."
 
 #. type: SS
-#: dpkg-source.1:396
+#: dpkg-source.1:402
 #, no-wrap
 msgid "Format: 3.0 (quilt)"
 msgstr "Format: 3.0 (quilt)"
 
 #. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:409
 msgid ""
 "A source package in this format contains at least an original tarball (B<."
 "orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -13791,7 +14131,7 @@
 "Gedankenstriche (»-«) enthalten."
 
 #. type: Plain text
-#: dpkg-source.1:414
+#: dpkg-source.1:420
 msgid ""
 "The main original tarball is extracted first, then all additional original "
 "tarballs are extracted in subdirectories named after the I<component> part "
@@ -13812,7 +14152,7 @@
 "B<--include-binaries>)."
 
 #. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:432
 msgid ""
 "All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
 "series> are then applied.  If the former file is used and the latter one "
@@ -13839,13 +14179,13 @@
 "solche Optionen trifft, und der Bau wird wahrscheinlich fehlschlagen."
 
 #. type: Plain text
-#: dpkg-source.1:428
+#: dpkg-source.1:434
 msgid ""
 "Similarly to quilt's default behaviour, the patches can remove files too."
 msgstr "Ähnlich wie bei Quilt können Patches auch Dateien entfernen."
 
 #. type: Plain text
-#: dpkg-source.1:431
+#: dpkg-source.1:437
 msgid ""
 "The file B<.pc/applied-patches> is created if some patches have been applied "
 "during the extraction."
@@ -13854,16 +14194,18 @@
 "der Extrahierung angewandt wurden."
 
 #. type: Plain text
-#: dpkg-source.1:443
+#: dpkg-source.1:451
 msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
 "except the automatic patch (B<debian-changes->I<version> or B<debian-"
 "changes>, depending on B<--single-debian-patch>) are applied. The temporary "
-"directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in the automatic patch.  If the automatic patch is created/"
-"deleted, it's added/removed from the series file and from the quilt metadata."
+"directory is compared to the source package directory. When the diff is non-"
+"empty, the build fails unless B<--single-debian-patch> or B<--auto-commit> "
+"has been used, in which case the diff is stored in the automatic patch.  If "
+"the automatic patch is created/deleted, it's added/removed from the series "
+"file and from the quilt metadata."
 msgstr ""
 "Alle im aktuellen Verzeichnis gefundenen Original-Tarbälle werden in ein "
 "temporäres Verzeichnis entpackt. Hierbei wird die gleiche Logik wie für das "
@@ -13871,13 +14213,15 @@
 "kopiert und alle Patches außer dem automatischen Patch (B<debian-changes-"
 ">I<Version> oder B<debian-changes>, abhängig von B<--single-debian-patch>) "
 "werden angewandt. Das temporäre Verzeichnis wird mit dem "
-"Quellpaketverzeichnis verglichen und der Diff (falls nicht-leer) wird im "
-"automatischen Patch gespeichert. Falls der automatische Patch erzeugt/"
-"gelöscht wird, wird er zu der Datei series und den Quilt-Metadaten "
-"hinzugefügt bzw. aus diesen gelöscht."
+"Quellpaketverzeichnis verglichen. Wenn der Diff nicht leer ist, schlägt der "
+"Bau fehl, falls nicht B<--single-debian-patch> oder B<--auto-commit> "
+"verwandt wurde; in diesem Fall wird der Diff im automatischen Patch "
+"gespeichert. Falls der automatische Patch erzeugt/gelöscht wird, wird er zu "
+"der Datei series und den Quilt-Metadaten hinzugefügt bzw. aus diesen "
+"gelöscht."
 
 #. type: Plain text
-#: dpkg-source.1:451
+#: dpkg-source.1:459
 msgid ""
 "Any change on a binary file is not representable in a diff and will thus "
 "lead to a failure unless the maintainer deliberately decided to include that "
@@ -13895,7 +14239,7 @@
 "freigegeben wurden."
 
 #. type: Plain text
-#: dpkg-source.1:454
+#: dpkg-source.1:462
 msgid ""
 "The updated debian directory and the list of modified binaries is then used "
 "to generate the debian tarball."
@@ -13904,7 +14248,7 @@
 "wird dann zur Erstellung des Debian-Tarballs verwandt."
 
 #. type: Plain text
-#: dpkg-source.1:460
+#: dpkg-source.1:468
 msgid ""
 "The automatically generated diff doesn't include changes on VCS specific "
 "files as well as many temporary files (see default value associated to B<-i> "
@@ -13918,47 +14262,68 @@
 "automatischen Patches ignoriert."
 
 #. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:477
+msgid ""
+"Note: B<dpkg-source> B<--before-build> (and B<-b>) will ensure that all "
+"patches listed in the series file are applied so that a package build always "
+"has all patches applied. It does this by finding unapplied patches (they are "
+"listed in the B<series> file but not in B<.pc/applied-patches>), and if the "
+"first patch in that set can be applied without errors, it will apply them "
+"all. The option B<--no-preparation> can be used to disable this behavior."
+msgstr ""
+"Hinweis: B<dpkg-source> B<--before-build> (und B<-b>) stellen sicher, dass "
+"alle in der Series-Datei aufgeführten Patches angewendet sind, so dss ein "
+"Paketbau immer mit allen angewandten Patches durchgeführt wird. Dies "
+"erfolgt, indem nicht angewandte Patches ermittelt werden (sie sind in der "
+"Datei B<series>, aber nicht in der Datei B<.pc/applied-patches> aufgeführt) "
+"und wenn der erste Patch in dem Satz ohne Fehler angewandt werden kann, "
+"werden sie alle angewandt. Die Option B<--no-preparation> kann zum "
+"Abschalten dieses Verhaltens verwandt werden."
+
+#. type: Plain text
+#: dpkg-source.1:480
+msgid "B<Recording changes>"
+msgstr "B<Änderungen aufzeichnen>"
+
+#. type: TP
+#: dpkg-source.1:480
+#, no-wrap
+msgid "B<--commit> [I<directory>] [I<patch-name>] [I<patch-file>]"
+msgstr "B<--commit> [I<Verzeichnis>] [I<Patch-Name>] [I<Patch-Datei>]"
+
+#. type: Plain text
+#: dpkg-source.1:490
 msgid ""
-"Note: B<dpkg-source> expects the source tree to have all patches listed in "
-"the series file applied when you generate the source package.  This is not "
-"the case when the source tree has been obtained by unpacking a source "
-"package using the Format: 1.0 for instance. To mitigate the problem, B<dpkg-"
-"source> will apply the patches by itself if it believes that they have not "
-"yet been applied. To detect this situation, it uses the following heuristic: "
-"it finds the list of supposedly unapplied patches (they are listed in the "
-"B<series> file but not in B<.pc/applied-patches>), and if the first patch in "
-"that set can be applied without errors, it will apply them all.  The option "
-"B<--no-preparation> can be used to disable this behaviour. This operation is "
-"usually done as part of the B<--prepare-build> command."
-msgstr ""
-"Hinweis: B<dpkg-source> erwartet, dass alle Patches aus der Series-Datei auf "
-"dem Quellbaum angewandt wurden, wenn Sie das Quellpaket erstellen. Dies ist "
-"z.B. nicht der Fall, wenn der Quellbaum durch Entpacken eines Quellpakets im "
-"Format: 1.0 erhalten wurde. Um das Problem zu entschärfen, wird B<dpkg-"
-"source> die Patches selbst anwenden, falls es glaubt, dass sie noch nicht "
-"angewandt wurden. Um diese Situation zu erkennen, verwendet es die folgende "
-"Heuristik: Es findet die Liste der vermutlich noch nicht angewandten Patches "
-"(sie sind in der Datei B<series>, aber nicht in der Datei B<.pc/applied-"
-"patches> aufgeführt) und wenn der erste Patch in dem Satz ohne Fehler "
-"angewandt werden kann, werden sie alle angewandt. Die Option B<--no-"
-"preparation> kann zum Abschalten dieses Verhaltens verwandt werden. Dieser "
-"Ablauf passiert normalerweise als Teil des Befehls B<--prepare-build>."
+"Generates a patch corresponding to the local changes that are not managed by "
+"the quilt patch system and integrates it in the patch system under the name "
+"I<patch-name>. If the name is missing, it will be asked interactively. If "
+"I<patch-file> is given, it is used as the patch corresponding to the local "
+"changes to integrate. This is mainly useful after a build failure that pre-"
+"generated this file. Once integrated, an editor is launched so that you can "
+"edit the meta-information in the patch header."
+msgstr ""
+"Erstellt einen Patch, der den lokalen Änderungen entspricht, die nicht vom "
+"Quilt-Patch-System verwaltet werden und integriert es unter dem Namen "
+"I<Patch-Name> in das Patch-System. Falls der Name fehlt, wird er interaktiv "
+"erfragt. Falls I<Patch-Datei> angegeben ist, wird er als Patch, der zu den "
+"lokalen Änderungen, die integriert werden sollen, gehört, verwandt. Dies ist "
+"primär nach einem Baufehler nützlich, der diese Datei vorgenerierte. Sobald "
+"die Patch integriert wurde, wird ein Editor gestartet, so dass Sie die "
+"Metainformationen in den Kopfzeilen des Patches einfügen können."
 
 #. type: Plain text
-#: dpkg-source.1:476 dpkg-source.1:547 dpkg-source.1:586
+#: dpkg-source.1:493 dpkg-source.1:567 dpkg-source.1:606
 msgid "B<Build options>"
 msgstr "B<Bau-Optionen>"
 
 #. type: TP
-#: dpkg-source.1:476
+#: dpkg-source.1:493
 #, no-wrap
 msgid "B<--allow-version-of-quilt-db=>I<version>"
 msgstr "B<--allow-version-of-quilt-db=>I<Version>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 msgid ""
 "Allow B<dpkg-source> to build the source package if the version of the quilt "
 "metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -13973,13 +14338,13 @@
 "ist. Die Version der Quilt-Metadaten wird in B<.pc/.version> gespeichert."
 
 #. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 #, no-wrap
 msgid "B<--include-removal>"
 msgstr "B<--include-removal>"
 
 #. type: Plain text
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 msgid ""
 "Do not ignore removed files and include them in the automatically generated "
 "patch."
@@ -13988,24 +14353,24 @@
 "generierten Patch hinzu."
 
 #. type: TP
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 #, no-wrap
 msgid "B<--include-timestamp>"
 msgstr "B<--include-timestamp>"
 
 #. type: Plain text
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 msgid "Include timestamp in the automatically generated patch."
 msgstr "Füge Zeitstempel zu dem automatisch generierten Patch hinzu."
 
 #. type: TP
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 #, no-wrap
 msgid "B<--include-binaries>"
 msgstr "B<--include-binaries>"
 
 #. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 msgid ""
 "Add all modified binaries in the debian tarball. Also add them to B<debian/"
 "source/include-binaries>: they will be added by default in subsequent builds "
@@ -14017,13 +14382,13 @@
 "benötigt."
 
 #. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 #, no-wrap
 msgid "B<--no-preparation>"
 msgstr "B<--no-preparation>"
 
 #. type: Plain text
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 msgid ""
 "Do not try to prepare the build tree by applying patches which are "
 "apparently unapplied."
@@ -14032,41 +14397,42 @@
 "Patches vorzubreiten."
 
 #. type: TP
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 #, no-wrap
 msgid "B<--single-debian-patch>"
 msgstr "B<--single-debian-patch>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 msgid ""
 "Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
 "changes->I<version> for the name of the automatic patch generated during "
 "build. This option is particularly useful when the package is maintained in "
 "a VCS and a patch set can't reliably be generated. Instead the current diff "
-"with upstream should be stored in a single patch. When using this option, it "
-"is recommended to create a debian/source/patch-header file explaining how "
-"the Debian changes can be best reviewed, for example in the VCS that is used."
+"with upstream should be stored in a single patch. The option would be put in "
+"B<debian/source/local-options> and would be accompanied by a B<debian/source/"
+"local-patch-header> file explaining how the Debian changes can be best "
+"reviewed, for example in the VCS that is used."
 msgstr ""
 "Verwende B<debian/patches/debian-changes> statt B<debian/patches/debian-"
 "changes->I<Version> als Namen für den während des Baus automatisch "
 "generierten Patch. Diese Option ist insbesondere nützlich, wenn das Paket in "
 "einem VCS betreut wird und ein Patch-Satz nicht zuverlässig erstellt werden "
 "kann. Stattdessen sollte der aktuelle Diff zu den Quellen der "
-"Originalautoren in einem einzelnen Patch gespeichert werden. Beim Verwenden "
-"dieser Option wird empfohlen, eine Datei debian/source/patch-header zu "
-"erstellen, in der erklärt wird, wie die Debian-Änderungen am besten "
-"begutachtet werden können, beispielsweise im eingesetzten VCS."
+"Originalautoren in einem einzelnen Patch gespeichert werden. Diese Option "
+"sollte in B<debian/source/local-options> eingestellt werden und würde dann "
+"von einer Datei B<debian/source/local-patch-header> begleitet, in der "
+"erklärt wird, wie die Debian-Änderungen am besten begutachtet werden können, "
+"beispielsweise im eingesetzten VCS."
 
 #. type: TP
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 #, no-wrap
 msgid "B<--create-empty-orig>"
 msgstr "B<--create-empty-orig>"
 
 #. type: Plain text
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 msgid ""
 "Automatically create the main original tarball as empty if it's missing and "
 "if there are supplementary original tarballs. This option is meant to be "
@@ -14079,31 +14445,28 @@
 "Originalautoren ist und es keine »Haupt«-Software gibt."
 
 #. type: TP
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 #, no-wrap
 msgid "B<--unapply-patches>"
 msgstr "B<--unapply-patches>"
 
 #. type: Plain text
-#: dpkg-source.1:525
+#: dpkg-source.1:541
 msgid ""
-"Unapply the patches in the B<--after-build> hook. This is mainly useful when "
-"you build your package directly in a VCS that contains unpatched upstream "
-"source and where you want to keep the tree unpatched even after a package "
-"build. This option is usually put in B<debian/source/local-options> (it's "
-"not allowed in B<debian/source/options> so that all generated source "
-"packages have the same behaviour by default)."
-msgstr ""
-"Entfernt die Patches im Hook B<--after-build>. Dies ist hauptsächlich "
-"nützlich, wenn Sie Ihr Paket direkt in einem VCS bauen, das die Quellen der "
-"Originalautoren ohne Patches enthält und in dem Sie den Baum ohne Patches "
-"behalten wollen, selbst nachdem ein Paket gebaut wurde. Diese Option kommt "
-"normalerweise in B<debian/source/local-options> (sie ist in B<debian/source/"
-"options> nicht erlaubt, so dass die erstellten Quellpakete standardmäßig das "
-"gleiche Verhalten zeigen)."
+"Unapply the patches in the B<--after-build> hook. You usually don't need "
+"this option as dpkg-source will automatically unapply the patches if it did "
+"apply them during B<--before-build>. This option is only allowed in B<debian/"
+"source/local-options> so that all generated source packages have the same "
+"behavior by default."
+msgstr ""
+"Entfernt die Patches im Hook B<--after-build>. Normalerweise benötigen Sie "
+"diese Option nicht, da Dpkg-source alle Patches automatisch entfernen wird, "
+"wenn es sie während B<--before-build> angewandt hatte. Diese Option ist nur "
+"in B<debian/source/local-options> erlaubt, so dass alle erstellten "
+"Quellpakete standardmäßig das gleiche Verhalten zeigen."
 
 #. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:548
 msgid ""
 "The process fails if an automatic patch has been generated. This option can "
 "be used to ensure that all changes were properly recorded in separate quilt "
@@ -14116,50 +14479,65 @@
 "das Paket gebaut wurde. Diese Option ist in B<debian/source/options> nicht "
 "erlaubt, kann aber in B<debian/source/local-options> verwandt werden."
 
+#. type: TP
+#: dpkg-source.1:548
+#, no-wrap
+msgid "B<--auto-commit>"
+msgstr "B<--auto-commit>"
+
+#. type: Plain text
+#: dpkg-source.1:552
+msgid ""
+"The process doesn't fail if an automatic patch has been generated, instead "
+"it's immediately recorded in the quilt series."
+msgstr ""
+"Der Vorgang schlägt nicht fehl, falls ein automatischer Patch erstellt "
+"wurde, stattdessen wird dieser sofort in die Quilt-Serie aufgenommen."
+
 #. type: Plain text
-#: dpkg-source.1:535
+#: dpkg-source.1:555
 msgid "B<Extract options>"
 msgstr "B<Extrahierungs-Optionen>"
 
 #. type: Plain text
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 msgid "Skips extraction of the debian tarball on top of the upstream sources."
 msgstr ""
 "Überspringt das Entpacken des Debian-Tarballs auf die Quellen der "
 "Originalautoren."
 
 #. type: TP
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 #, no-wrap
 msgid "B<--skip-patches>"
 msgstr "B<--skip-patches>"
 
 #. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:561
 msgid "Do not apply patches at the end of the extraction."
 msgstr "Wende am Ende der Extrahierung keine Patches an."
 
 #. type: SS
-#: dpkg-source.1:542
+#: dpkg-source.1:562
 #, no-wrap
 msgid "Format: 3.0 (custom)"
 msgstr "Format: 3.0 (custom)"
 
 #. type: Plain text
-#: dpkg-source.1:545
+#: dpkg-source.1:565
 msgid ""
-"This format is particular. It doesn't represent a real source package format "
+"This format is special. It doesn't represent a real source package format "
 "but can be used to create source packages with arbitrary files."
 msgstr ""
 "Dieses Format ist besonders. Es stellt kein echtes Quellpaket dar, kann aber "
 "zur Erstellung eines Quellpakets mit beliebigen Dateien verwandt werden."
 
 #. type: Plain text
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 msgid ""
 "All non-option arguments are taken as files to integrate in the generated "
-"source package. They must exist and are preferrably in the current "
-"directory. At least one file must be given."
+"source package. They must exist and are preferably in the current directory. "
+"At least one file must be given."
 msgstr ""
 "Alle Argumente, die keine Optionen sind, werden als Dateien verstanden, die "
 "in das generierte Quellpaket integriert werden sollen. Sie müssen existieren "
@@ -14167,13 +14545,13 @@
 "muss angegeben werden."
 
 #. type: TP
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 #, no-wrap
 msgid "B<--target-format=>I<value>"
 msgstr "B<--target-format=>I<Wert>"
 
 #. type: Plain text
-#: dpkg-source.1:556
+#: dpkg-source.1:576
 msgid ""
 "B<Required>. Defines the real format of the generated source package.  The "
 "generated .dsc file will contain this value in its I<Format> field and not "
@@ -14184,18 +14562,18 @@
 "I<Format>-Feld enthalten."
 
 #. type: SS
-#: dpkg-source.1:557
+#: dpkg-source.1:577
 #, no-wrap
 msgid "Format: 3.0 (git)"
 msgstr "Format: 3.0 (git)"
 
 #. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:579
 msgid "This format is experimental."
 msgstr "Dieses Format ist experimentell."
 
 #. type: Plain text
-#: dpkg-source.1:564
+#: dpkg-source.1:584
 msgid ""
 "A source package in this format consists of a single bundle of a git "
 "repository B<.git> to hold the source of a package.  There may also be a B<."
@@ -14207,7 +14585,7 @@
 "aufführt."
 
 #. type: Plain text
-#: dpkg-source.1:570
+#: dpkg-source.1:590
 msgid ""
 "The bundle is cloned as a git repository to the target directory.  If there "
 "is a gitshallow file, it is installed as `.git/shallow` inside the cloned "
@@ -14218,12 +14596,12 @@
 "Git-Depots installiert."
 
 #. type: Plain text
-#: dpkg-source.1:575
+#: dpkg-source.1:595
 msgid ""
 "Note that by default the new repository will have the same branch checked "
 "out that was checked out in the original source. (Typically \"master\", but "
-"it could be anything.) Any other branches will be available, under as "
-"`remotes/origin/`"
+"it could be anything.) Any other branches will be available under `remotes/"
+"origin/`."
 msgstr ""
 "Beachten Sie, dass standardmäßig im neuen Depot der gleiche Zweig "
 "ausgecheckt ist, der auch in der ursprünglichen Quelle ausgecheckt war "
@@ -14231,7 +14609,7 @@
 "Alle anderen Zweige sind unter »remotes/origin/« verfügbar."
 
 #. type: Plain text
-#: dpkg-source.1:580 dpkg-source.1:613
+#: dpkg-source.1:600 dpkg-source.1:633
 msgid ""
 "Before going any further, some checks are done to ensure that we don't have "
 "any non-ignored uncommitted changes."
@@ -14241,7 +14619,7 @@
 "(»uncommitted«) Änderungen vorliegen."
 
 #. type: Plain text
-#: dpkg-source.1:584
+#: dpkg-source.1:604
 msgid ""
 "B<git-bundle>(1) is used to generate a bundle of the git repository.  By "
 "default, all branches and tags in the repository are included in the bundle."
@@ -14251,13 +14629,13 @@
 "einbezogen."
 
 #. type: TP
-#: dpkg-source.1:586
+#: dpkg-source.1:606
 #, no-wrap
 msgid "B<--git-ref=>I<ref>"
 msgstr "B<--git-ref=>I<Referenz>"
 
 #. type: Plain text
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 msgid ""
 "Allows specifying a git ref to include in the git bundle. Use disables the "
 "default behavior of including all branches and tags. May be specified "
@@ -14278,13 +14656,13 @@
 "ref=^private."
 
 #. type: TP
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 #, no-wrap
 msgid "B<--git-depth=>I<number>"
 msgstr "B<--git-depth=>I<Zahl>"
 
 #. type: Plain text
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 msgid ""
 "Creates a shallow clone with a history truncated to the specified number of "
 "revisions."
@@ -14293,13 +14671,13 @@
 "Anzahl an Revisionen abgeschnitten wird."
 
 #. type: SS
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 #, no-wrap
 msgid "Format: 3.0 (bzr)"
 msgstr "Format: 3.0 (bzr)"
 
 #. type: Plain text
-#: dpkg-source.1:603
+#: dpkg-source.1:623
 msgid ""
 "This format is experimental. It generates a single tarball containing the "
 "bzr repository."
@@ -14308,7 +14686,7 @@
 "das Bzr-Depot enthält."
 
 #. type: Plain text
-#: dpkg-source.1:608
+#: dpkg-source.1:628
 msgid ""
 "The tarball is unpacked and then bzr is used to checkout the current branch."
 msgstr ""
@@ -14316,7 +14694,7 @@
 "auszuchecken."
 
 #. type: Plain text
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 msgid ""
 "Then the VCS specific part of the source directory is copied over to a "
 "temporary directory. Before this temporary directory is packed in a tarball, "
@@ -14327,23 +14705,20 @@
 "gepackt wird, werden verschiedene Bereinigungen durchgeführt, um Platz zu "
 "sparen."
 
-# type: SH
 #. type: SH
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 #, no-wrap
 msgid "WARNINGS AND ERRORS"
 msgstr "WARNUNGEN UND FEHLER"
 
-# type: SS
 #. type: SS
-#: dpkg-source.1:618
+#: dpkg-source.1:638
 #, no-wrap
 msgid "no source format specified in debian/source/format"
 msgstr "kein Quellformat in debian/source/format angegeben"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:624
+#: dpkg-source.1:644
 msgid ""
 "The file B<debian/source/format> should always exist and indicate the "
 "desired source format. For backwards compatibility, format \"1.0\" is "
@@ -14357,9 +14732,8 @@
 "darauf verlassen: Irgendwann in der Zukunft wird dpkg-source verändert und "
 "dann fehlschlagen, wenn diese Datei nicht existiert."
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 msgid ""
 "The rationale is that format \"1.0\" is no longer the recommended format, "
 "you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
@@ -14374,16 +14748,14 @@
 "möchten, sollten Sie dies explizit angeben und »1.0« in B<debian/source/"
 "format> eintragen."
 
-# type: SS
 #. type: SS
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 #, no-wrap
 msgid "the diff modifies the following upstream files"
 msgstr "der Diff verändert die folgenden Dateien der Originalautoren"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 msgid ""
 "When using source format \"1.0\" it is usually a bad idea to modify upstream "
 "files directly as the changes end up hidden and mostly undocumented in the ."
@@ -14399,16 +14771,14 @@
 "können Sie auch das Format »3.0 (quilt)« verwenden, das dies von sich aus "
 "anbietet."
 
-# type: SS
 #. type: SS
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 #, no-wrap
 msgid "cannot represent change to I<file>"
 msgstr "kann Änderungen an I<Datei> nicht darstellen"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 msgid ""
 "Changes to upstream sources are usually stored with patch files, but not all "
 "changes can be represented with patches: they can only alter the content of "
@@ -14423,16 +14793,14 @@
 "anderen Typs zu ersetzen (beispielsweise eine einfache Datei mit einem "
 "Symlink oder einem Verzeichnis), werden Sie diese Fehlermeldung erhalten."
 
-# type: SS
 #. type: SS
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 #, no-wrap
 msgid "newly created empty file I<file> will not be represented in diff"
 msgstr "neu angelegte leere Datei I<Datei> wird im Diff nicht dargestellt werden"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 msgid ""
 "Empty files can't be created with patch files. Thus this change is not "
 "recorded in the source package and you are warned about it."
@@ -14441,23 +14809,20 @@
 "diese Änderung nicht im Quellpaket aufgezeichnet und Sie erhalten dazu diese "
 "Warnung."
 
-# type: SS
 #. type: SS
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 #, no-wrap
 msgid "executable mode I<perms> of I<file> will not be represented in diff"
 msgstr "ausführbarer Modus I<Rechte> von I<Datei> wird nicht im Diff dargestellt werden"
 
-# type: SS
 #. type: SS
-#: dpkg-source.1:647
+#: dpkg-source.1:667
 #, no-wrap
 msgid "special mode I<perms> of I<file> will not be represented in diff"
 msgstr "besonderer Modus I<Rechte> von I<Datei> wird nicht im Diff dargestellt werden"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 msgid ""
 "Patch files do not record permissions of files and thus modified permissions "
 "are not stored in the source package. This warning reminds you of that fact."
@@ -14467,19 +14832,19 @@
 "an diese Tatsache."
 
 #. type: SH
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 #, no-wrap
 msgid "FILE FORMATS"
 msgstr "DATEIFORMATE"
 
 #. type: SS
-#: dpkg-source.1:652
+#: dpkg-source.1:672
 #, no-wrap
 msgid "debian/source/format"
 msgstr "debian/source/format"
 
 #. type: Plain text
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 msgid ""
 "This file contains on a single line the format that should be used to build "
 "the source package (possible formats are described above). No leading or "
@@ -14490,13 +14855,13 @@
 "Leerzeichen am Zeilenanfang oder -ende sind nicht erlaubt."
 
 #. type: SS
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 #, no-wrap
 msgid "debian/source/include-binaries"
 msgstr "debian/source/include-binaries"
 
 #. type: Plain text
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 msgid ""
 "This file contains a list of binary files (one per line) that should be "
 "included in the debian tarball. Leading and trailing spaces are stripped.  "
@@ -14509,14 +14874,13 @@
 "werden übersprungen. Leere Zeilen werden ignoriert."
 
 #. type: SS
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 #, no-wrap
 msgid "debian/source/options"
 msgstr "debian/source/options"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:666
+#: dpkg-source.1:686
 msgid ""
 "This file contains a list of long options that should be automatically "
 "prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -14528,9 +14892,8 @@
 "--print-format> gesetzt werden sollen. Optionen wie B<-compression> und B<--"
 "compression-level> sind für diese Datei gut geeignet."
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:672
+#: dpkg-source.1:692
 msgid ""
 "Each option should be put on a separate line. Empty lines and lines starting "
 "with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -14545,7 +14908,7 @@
 "ist ein Beispiel für so eine Datei:"
 
 #. type: Plain text
-#: dpkg-source.1:678
+#: dpkg-source.1:700
 #, no-wrap
 msgid ""
 "  # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -14553,6 +14916,8 @@
 "  compression-level = 9\n"
 "  # use debian/patches/debian-changes as automatic patch\n"
 "  single-debian-patch\n"
+"  # ignore changes on config.{sub,guess}\n"
+"  extend-diff-ignore = \"(^|/)(config.sub|config.guess)$\"\n"
 msgstr ""
 "  # lass dpkg-source ein debian.tar.bz2 mit maximaler Komprimierung\n"
 "  # erstellen\n"
@@ -14560,10 +14925,11 @@
 "  compression-level = 9\n"
 "  # verwende debian/patches/debian-changes als automatischen Patch\n"
 "  single-debian-patch\n"
+"  # ignoriere Änderungen von config.{sub,guess}\n"
+"  extend-diff-ignore = \"(^|/)(config.sub|config.guess)$\"\n"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 msgid ""
 "Note: B<format> options are not accepted in this file, you should use "
 "B<debian/source/format> instead."
@@ -14572,14 +14938,13 @@
 "sollten stattdessen B<debian/source/format> verwenden."
 
 #. type: SS
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 #, no-wrap
 msgid "debian/source/local-options"
 msgstr "debian/source/local-options"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:686
+#: dpkg-source.1:708
 msgid ""
 "Exactly like B<debian/source/options> except that the file is not included "
 "in the generated source package. It can be useful to store a preference tied "
@@ -14592,29 +14957,37 @@
 "bestimmtes VCS, in dem das Paket gewartet wird, gebunden sind."
 
 #. type: SS
-#: dpkg-source.1:686
+#: dpkg-source.1:708
+#, no-wrap
+msgid "debian/source/local-patch-header"
+msgstr "debian/source/local-patch-header"
+
+#. type: SS
+#: dpkg-source.1:709
 #, no-wrap
 msgid "debian/source/patch-header"
 msgstr "debian/source/patch-header"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 msgid ""
 "Free form text that is put on top of the automatic patch generated in "
-"formats \"2.0\" or \"3.0 (quilt)\"."
+"formats \"2.0\" or \"3.0 (quilt)\". B<local-patch-header> is not included in "
+"the generated source package while B<patch-header> is."
 msgstr ""
 "Formloser Text, der an den Anfang des in den Formaten »2.0« und »3.0 "
-"(quilt)« generierten automatischen Patches gestellt wird."
+"(quilt)« generierten automatischen Patches gestellt wird. B<local-patch-"
+"header> wird dem erstellen Quellpaket nicht hinzugefügt, B<patch-header> "
+"dagegen schon."
 
 #. type: SS
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 #, no-wrap
 msgid "debian/patches/series"
 msgstr "debian/patches/series"
 
 #. type: Plain text
-#: dpkg-source.1:698
+#: dpkg-source.1:722
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
@@ -14636,10 +15009,15 @@
 "bis zum Zeilenende geht) können optionale Quilt-Befehle folgen."
 
 #. type: Plain text
-#: dpkg-source.1:705
+#: dpkg-source.1:729
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 
+#. type: Plain text
+#: dpkg-source.1:736
+msgid "Copyright \\(co 2008-2011 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2008-2011 Rapha\\[:e]l Hertzog"
+
 #. type: TH
 #: dpkg-split.1:2
 #, no-wrap
@@ -14652,12 +15030,12 @@
 msgstr "dpkg-split - Debian-Paketarchiv Teilungs- und Zusammensetzwerkzeug"
 
 #. type: Plain text
-#: dpkg-split.1:10
-msgid "B<dpkg-split> [I<options>] I<command>"
-msgstr "B<dpkg-split> [I<Optionen>] I<Befehl>"
+#: dpkg-split.1:9
+msgid "B<dpkg-split> [I<option>...] I<command>"
+msgstr "B<dpkg-split> [I<Option>...] I<Befehl>"
 
 #. type: Plain text
-#: dpkg-split.1:16
+#: dpkg-split.1:15
 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 "
@@ -14668,7 +15046,7 @@
 "Medien wie Disketten zu ermöglichen."
 
 #. type: Plain text
-#: dpkg-split.1:20
+#: dpkg-split.1:19
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
@@ -14677,7 +15055,7 @@
 "verwendet werden."
 
 #. type: Plain text
-#: dpkg-split.1:28
+#: dpkg-split.1:27
 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 "
@@ -14691,7 +15069,7 @@
 "und B<--discard> erlauben die Verwaltung dieser Liste."
 
 #. type: Plain text
-#: dpkg-split.1:31
+#: dpkg-split.1:30
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
@@ -14701,18 +15079,18 @@
 "werden."
 
 #. type: TP
-#: dpkg-split.1:33
+#: dpkg-split.1:32
 #, no-wrap
 msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
 msgstr "B<-s>, B<--split> I<Komplettarchiv> [I<Präfix>]"
 
 #. type: Plain text
-#: dpkg-split.1:36
+#: dpkg-split.1:35
 msgid "Splits a single Debian binary package into several parts."
 msgstr "Teilt ein einzelnes Debian-Binärpaket in mehrere Teile."
 
 #. type: Plain text
-#: dpkg-split.1:44
+#: dpkg-split.1:43
 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 "
@@ -14723,7 +15101,7 @@
 "Angaben dezimal)."
 
 #. type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 msgid ""
 "If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
 "including directory, with any trailing B<.deb> removed."
@@ -14733,13 +15111,13 @@
 "abschließende B<.deb> entfernt wird."
 
 #. type: TP
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 #, no-wrap
 msgid "B<-j>, B<--join> I<part>..."
 msgstr "B<-j>, B<--join> I<Teil>..."
 
 #. type: Plain text
-#: dpkg-split.1:56
+#: dpkg-split.1:55
 msgid ""
 "Joins the parts of a package file together, reassembling the original file "
 "as it was before it was split."
@@ -14748,7 +15126,7 @@
 "zusammen, wie sie vor dem Aufteilen war."
 
 #. type: Plain text
-#: dpkg-split.1:60
+#: dpkg-split.1:59
 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 "
@@ -14760,7 +15138,7 @@
 "Reihenfolge aufgeführt werden."
 
 #. type: Plain text
-#: dpkg-split.1:65
+#: dpkg-split.1:64
 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 "
@@ -14772,14 +15150,14 @@
 "sein müssen."
 
 #. type: Plain text
-#: dpkg-split.1:67
+#: dpkg-split.1:66
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 "Die Dateinamen der Teile sind für den Prozess des Wiederzusammenbauens nicht "
 "relevant."
 
 #. type: Plain text
-#: dpkg-split.1:70
+#: dpkg-split.1:69
 msgid ""
 "By default the output file is called I<package>B<_>I<version>B<_>I<arch>B<."
 "deb>."
@@ -14788,13 +15166,13 @@
 "genannt."
 
 #. type: TP
-#: dpkg-split.1:71
+#: dpkg-split.1:70
 #, no-wrap
 msgid "B<-I>, B<--info> I<part>..."
 msgstr "B<-I>, B<--info> I<Teil>..."
 
 #. type: Plain text
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -14805,20 +15183,20 @@
 "entsprechenden Nachricht (allerdings auch in der Standardausgabe)."
 
 #. type: TP
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 #, no-wrap
 msgid "B<-a>, B<--auto -o> I<complete-output part>"
 msgstr "B<-a>, B<--auto -o> I< Komplettausgabe Teil>"
 
 #. type: Plain text
-#: dpkg-split.1:79
+#: dpkg-split.1:78
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 "Reiht Teile automatisch in die Warteschlange und setzt, falls möglich, ein "
 "Paket wieder zusammen."
 
 #. type: Plain text
-#: dpkg-split.1:84
+#: dpkg-split.1:83
 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."
@@ -14828,7 +15206,7 @@
 "verglichen."
 
 #. type: Plain text
-#: dpkg-split.1:91
+#: dpkg-split.1:90
 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 "
@@ -14840,7 +15218,7 @@
 "dies kein Fehler ist)."
 
 #. type: Plain text
-#: dpkg-split.1:97
+#: dpkg-split.1:96
 msgid ""
 "If not then the I<part> is copied into the queue and I<complete-output> is "
 "not created."
@@ -14849,17 +15227,18 @@
 "I<Komplettausgabe> wird nicht erzeugt."
 
 #. type: Plain text
-#: dpkg-split.1:104
+#: dpkg-split.1:103
 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."
+"with status B<1>; if some other trouble occurs then it will exit with status "
+"B<2>."
 msgstr ""
 "Falls I<Teil> kein Teil eines aufgeteilten Binärpaketes ist, dann beendet "
-"sich I<dpkg-split> mit Rückgabecode 1; falls irgendwelche anderen Probleme "
-"auftreten lautet der Rückgabecode 2."
+"sich I<dpkg-split> mit Rückgabecode B<1>; falls irgendwelche anderen "
+"Probleme auftreten lautet der Rückgabecode B<2>."
 
 #. type: Plain text
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 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 "
@@ -14870,19 +15249,19 @@
 "welche Ausgabedatei es zu erwarten hätte.)"
 
 #. type: TP
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 #, no-wrap
 msgid "B<-l>, B<--listq>"
 msgstr "B<-l>, B<--listq>"
 
 #. type: Plain text
-#: dpkg-split.1:114
+#: dpkg-split.1:113
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr ""
 "Listet den Inhalt der Warteschlange der wieder zusammenzubauenden Pakete auf."
 
 #. type: Plain text
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 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 "
@@ -14893,13 +15272,13 @@
 "Gesamtanzahl gespeicherter Bytes in der Warteschlange."
 
 #. type: TP
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 #, no-wrap
 msgid "B<-d>, B<--discard> [I<package>...]"
 msgstr "B<-d>, B<--discard> [I<Paket>...]"
 
 #. type: Plain text
-#: dpkg-split.1:122
+#: dpkg-split.1:121
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
@@ -14908,7 +15287,7 @@
 "Teile ihrer Pakete warten."
 
 #. type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:126
 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."
@@ -14918,13 +15297,13 @@
 "Pakete(s) gelöscht."
 
 #. type: TP
-#: dpkg-split.1:135
+#: dpkg-split.1:134
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr "B<--depotdir>I< Verzeichnis>"
 
 #. type: Plain text
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 msgid ""
 "Specifies an alternative directory for the queue of parts awaiting automatic "
 "reassembly. The default is B</var/lib/dpkg>."
@@ -14934,13 +15313,13 @@
 "lib/dpkg>."
 
 #. type: TP
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 #, no-wrap
 msgid "B<-S>, B<--partsize> I<kibibytes>"
 msgstr "B<-S>, B<--partsize> I<kibibytes>"
 
 #. type: Plain text
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 msgid ""
 "Specifies the maximum part size when splitting, in kibibytes (1024 bytes). "
 "The default is 450 KiB."
@@ -14949,18 +15328,18 @@
 "Standardmäßig ist dies 450 kiB."
 
 #. type: TP
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 #, no-wrap
 msgid "B<-o>, B<--output> I<complete-output>"
 msgstr "B<-o>, B<--output> I<Komplettausgabe>"
 
 #. type: Plain text
-#: dpkg-split.1:147
+#: dpkg-split.1:146
 msgid "Specifies the output file name for a reassembly."
 msgstr "Gibt den Ausgabe-Dateinamen für ein Wiederzusammenbauen an."
 
 #. type: Plain text
-#: dpkg-split.1:152
+#: dpkg-split.1:151
 msgid ""
 "This overrides the default for a manual reassembly (B<--join>)  and is "
 "mandatory for an automatic queue-or-reassemble (B<--auto>)."
@@ -14970,13 +15349,13 @@
 "(B<--auto>) notwendig."
 
 #. type: TP
-#: dpkg-split.1:152
+#: dpkg-split.1:151
 #, no-wrap
 msgid "B<-Q>, B<--npquiet>"
 msgstr "B<-Q>, B<--npquiet>"
 
 #. type: Plain text
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 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 "
@@ -14990,13 +15369,13 @@
 "ungeteilten Paketen umzugehen, ohne störende Meldungen zu erzeugen."
 
 #. type: TP
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 #, no-wrap
 msgid "B<--msdos>"
 msgstr "B<--msdos>"
 
 #. type: Plain text
-#: dpkg-split.1:168
+#: dpkg-split.1:167
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
@@ -15004,7 +15383,7 @@
 "kompatibel sind."
 
 #. type: Plain text
-#: dpkg-split.1:174
+#: dpkg-split.1:173
 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 "
@@ -15016,7 +15395,7 @@
 "alle anderen Zeichen werden entfernt."
 
 #. type: Plain text
-#: dpkg-split.1:179
+#: dpkg-split.1:178
 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."
@@ -15025,7 +15404,7 @@
 "Form I<PräfixN>B<of>I<M>B<.deb> werden generiert."
 
 #. type: Plain text
-#: dpkg-split.1:187
+#: dpkg-split.1:186
 msgid ""
 "The requested split, merge, or other command succeeded.  B<--info> commands "
 "count as successful even if the files are not binary package parts."
@@ -15035,7 +15414,7 @@
 "die Dateien keine Teile eines Binärpaketes waren."
 
 #. type: Plain text
-#: dpkg-split.1:194
+#: dpkg-split.1:193
 msgid ""
 "Only occurs with B<--auto> and indicates that the I<part> file was not a "
 "binary package part."
@@ -15044,13 +15423,13 @@
 "eines Binärprogramms war."
 
 #. type: TP
-#: dpkg-split.1:194 start-stop-daemon.8:276 update-alternatives.8:379
+#: dpkg-split.1:193 start-stop-daemon.8:275 update-alternatives.8:378
 #, no-wrap
 msgid "B<2>"
 msgstr "B<2>"
 
 #. type: Plain text
-#: dpkg-split.1:199
+#: dpkg-split.1:198
 msgid ""
 "Some kind of trouble happened, such as a system call failure, a file that "
 "looked like a package part file but was corrupted, a usage error or some "
@@ -15061,7 +15440,7 @@
 "aber beschädigt war, ein Benutzungsfehler oder einige andere Probleme."
 
 #. type: Plain text
-#: dpkg-split.1:203
+#: dpkg-split.1:202
 msgid ""
 "Full details of the packages in the queue are impossible to get without "
 "digging into the queue directory yourself."
@@ -15070,7 +15449,7 @@
 "ohne selbst im Warteschlangenverzeichnis zu wühlen."
 
 #. type: Plain text
-#: dpkg-split.1:206
+#: dpkg-split.1:205
 msgid ""
 "There is no easy way to test whether a file that may be a binary package "
 "part is one."
@@ -15079,13 +15458,13 @@
 "Binärpaketes sein könnte, eines ist."
 
 #. type: TP
-#: dpkg-split.1:208
+#: dpkg-split.1:207
 #, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "I</var/lib/dpkg/parts>"
 
 #. type: Plain text
-#: dpkg-split.1:212
+#: dpkg-split.1:211
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
@@ -15093,7 +15472,7 @@
 "auf automatisches Zusammenfügen warten."
 
 #. type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:216
 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 "
@@ -15105,7 +15484,7 @@
 "verlassen werden."
 
 #. type: Plain text
-#: dpkg-split.1:223
+#: dpkg-split.1:222
 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)."
 
@@ -15118,12 +15497,6 @@
 #. type: TH
 #: dpkg-statoverride.8:1
 #, no-wrap
-msgid "2009-06-26"
-msgstr "2009-06-26"
-
-#. type: TH
-#: dpkg-statoverride.8:1
-#, no-wrap
 msgid "Debian project"
 msgstr "Debian-Projekt"
 
@@ -15134,12 +15507,12 @@
 "dpkg-statoverride - über Eigentümerschaft und Modus von Dateien hinwegsetzen"
 
 #. type: Plain text
-#: dpkg-statoverride.8:9
-msgid "B<dpkg-statoverride> [I<options>] I<command>"
-msgstr "B<dpkg-statoverride> [I<Optionen>] I<Befehl>"
+#: dpkg-statoverride.8:8
+msgid "B<dpkg-statoverride> [I<option>...] I<command>"
+msgstr "B<dpkg-statoverride> [I<Option>...] I<Befehl>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:19
+#: dpkg-statoverride.8:18
 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' "
@@ -15158,7 +15531,7 @@
 "zu sein."
 
 #. type: Plain text
-#: dpkg-statoverride.8:23
+#: dpkg-statoverride.8:22
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
@@ -15168,13 +15541,13 @@
 "Hinzufügen, Entfernen und Auflisten von Hinwegsetzungen."
 
 #. type: TP
-#: dpkg-statoverride.8:25
+#: dpkg-statoverride.8:24
 #, no-wrap
 msgid "B<--add>I< user group mode file>"
 msgstr "B<--add>I< Benutzer Gruppe Modus Datei>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:33
+#: dpkg-statoverride.8:32
 msgid ""
 "Add an override for I<file>. I<file> does not need to exist when this "
 "command is used; the override will be stored and used later.  Users and "
@@ -15190,7 +15563,7 @@
 "B<#65534>). Der I<Modus> muss oktal angegeben werden."
 
 #. type: Plain text
-#: dpkg-statoverride.8:36
+#: dpkg-statoverride.8:35
 msgid ""
 "If --update is specified and I<file> exists, it is immediately set to the "
 "new owner and mode."
@@ -15199,7 +15572,7 @@
 "sofort auf den neuen Eigentümer und Modus eingestellt."
 
 #. type: Plain text
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 msgid ""
 "Remove an override for I<file>, the status of I<file> is left unchanged by "
 "this command."
@@ -15208,13 +15581,13 @@
 "durch diesen Befehl unverändert."
 
 #. type: TP
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 #, no-wrap
 msgid "B<--list> [I<glob-pattern>]"
 msgstr "B<--list> [I<Glob-Muster>]"
 
 #. type: Plain text
-#: dpkg-statoverride.8:45
+#: 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 "
@@ -15226,7 +15599,7 @@
 "statoverride> mit einem Exit-Wert von 1 beenden."
 
 #. type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:56
 msgid ""
 "Change the I<directory> of the dpkg database where the statoverride file is "
 "also stored. Defaults to I</var/lib/dpkg>."
@@ -15235,13 +15608,13 @@
 "Datei gelagert ist. Der Standard ist I</var/lib/dpkg>."
 
 #. type: TP
-#: dpkg-statoverride.8:57 update-alternatives.8:337
+#: dpkg-statoverride.8:56 update-alternatives.8:336
 #, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:61
+#: 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."
@@ -15251,13 +15624,13 @@
 "hinwegzusetzen."
 
 #. type: TP
-#: dpkg-statoverride.8:61
+#: dpkg-statoverride.8:60
 #, no-wrap
 msgid "B<--update>"
 msgstr "B<--update>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:65
+#: dpkg-statoverride.8:64
 msgid ""
 "Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
@@ -15265,18 +15638,18 @@
 "ändern, falls sie existiert."
 
 #. type: Plain text
-#: dpkg-statoverride.8:68
+#: dpkg-statoverride.8:67
 msgid "Be less verbose about what we do."
 msgstr "Sei nicht so ausführlich darüber, was wir machen."
 
 #. type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:75
 #, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr "I</var/lib/dpkg/statoverride>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:80
 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 "
@@ -15287,7 +15660,7 @@
 "für Dpkg wichtigen Dateien, wie »status« oder »available«."
 
 #. type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:83
 msgid ""
 "Note: B<dpkg-statoverride> preserves the old copy of this file, with "
 "extension \"-old\", before replacing it with the new one."
@@ -15357,13 +15730,13 @@
 #: dpkg-trigger.1:31
 msgid ""
 "Check if the running B<dpkg> supports triggers (usually called from a "
-"postinst). Will exit 0 if a triggers-capable B<dpkg> has run, or 1 with an "
-"error message to stderr if not. Normally, however, it is better just to "
-"activate the desired trigger with B<dpkg-trigger>."
+"postinst). Will exit B<0> if a triggers-capable B<dpkg> has run, or B<1> "
+"with an error message to stderr if not. Normally, however, it is better just "
+"to activate the desired trigger with B<dpkg-trigger>."
 msgstr ""
 "Überprüfe, ob der laufende B<dpkg> Trigger unterstützt (normalerweise vom "
-"Postinst aufgerufen). Endet mit 0, falls ein Trigger-fähiger B<dpkg> "
-"ausgeführt wurde, oder mit 1 und einer Fehlermeldung nach Stderr, falls "
+"Postinst aufgerufen). Endet mit B<0>, falls ein Trigger-fähiger B<dpkg> "
+"ausgeführt wurde, oder mit B<1> und einer Fehlermeldung nach Stderr, falls "
 "nicht. Normalerweise ist es allerdings besser, einfach den gewünschten "
 "Trigger mit B<dpkg-trigger> zu aktivieren."
 
@@ -15377,12 +15750,12 @@
 #: dpkg-trigger.1:49
 msgid ""
 "Override trigger awaiter (normally set by B<dpkg> through the "
-"DPKG_MAINTSCRIPT_PACKAGE environment variable of the maintainer scripts, "
+"B<DPKG_MAINTSCRIPT_PACKAGE> environment variable of the maintainer scripts, "
 "naming the package to which the script belongs, and this will be used by "
 "default)."
 msgstr ""
 "Überschreibe den Trigger-Erwartenden (normalerweise wird dies von B<dpkg> "
-"durch die Umgebungsvariable DPKG_MAINTSCRIPT_PACKAGE der Betreuerskripte "
+"durch die Umgebungsvariable B<DPKG_MAINTSCRIPT_PACKAGE> der Betreuerskripte "
 "gesetzt, wobei das Paket benannt wird, zu dem das Skript gehört und dies "
 "wird standardmäßig verwandt)."
 
@@ -15419,7 +15792,7 @@
 msgstr "Nur testen, nichts tatsächlich ändern."
 
 #. type: Plain text
-#: dpkg-trigger.1:68
+#: dpkg-trigger.1:69
 msgid ""
 "B<dpkg>(1), B<deb-triggers>(5), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
 msgstr ""
@@ -15431,12 +15804,6 @@
 msgid "dpkg-vendor"
 msgstr "dpkg-vendor"
 
-#. type: TH
-#: dpkg-vendor.1:1
-#, no-wrap
-msgid "2009-05-10"
-msgstr "2009-05-10"
-
 #. type: Plain text
 #: dpkg-vendor.1:4
 msgid "dpkg-vendor - queries information about distribution vendors"
@@ -15467,11 +15834,11 @@
 #. type: Plain text
 #: dpkg-vendor.1:19
 msgid ""
-"Exits with 0 if the current vendor is I<vendor>. Otherwise exits with non-"
+"Exits with B<0> if the current vendor is I<vendor>. Otherwise exits with non-"
 "zero."
 msgstr ""
-"Beendet sich mit 0, falls der aktuelle Lieferant I<Lieferant> ist, ansonsten "
-"mit einem von Null verschiedenen Wert."
+"Beendet sich mit B<0>, falls der aktuelle Lieferant I<Lieferant> ist, "
+"ansonsten mit einem von Null verschiedenen Wert."
 
 #. type: TP
 #: dpkg-vendor.1:19
@@ -15482,11 +15849,11 @@
 #. type: Plain text
 #: dpkg-vendor.1:24
 msgid ""
-"Exits with 0 if the current vendor distribution is a derivative of "
+"Exits with B<0> if the current vendor distribution is a derivative of "
 "I<vendor>, otherwise exits with non-zero. It uses the \"Parent\" field to "
 "browse all ancestors of the current vendor."
 msgstr ""
-"Beendet sich mit 0, falls die aktuelle Lieferant-Distribution von "
+"Beendet sich mit B<0>, falls die aktuelle Lieferant-Distribution von "
 "I<Lieferant> abgeleitet ist, ansonsten mit einem von Null verschiedenen "
 "Wert. Es verwendet das Feld »Parent«, um alle Vorfahren des aktuellen "
 "Lieferanten zu ermitteln."
@@ -15516,10 +15883,10 @@
 #: dpkg-vendor.1:41
 msgid ""
 "Assumes the current vendor is I<vendor> instead of discovering it with the "
-"DEB_VENDOR environment variable or B</etc/dpkg/origins/default>."
+"B<DEB_VENDOR> environment variable or B</etc/dpkg/origins/default>."
 msgstr ""
 "Nimmt an, dass der aktuelle Lieferant I<Lieferant> ist, statt ihn über die "
-"Umgebungsvariable DEB_VENDOR oder aus B</etc/dpkg/origins/default> zu "
+"Umgebungsvariable B<DEB_VENDOR> oder aus B</etc/dpkg/origins/default> zu "
 "ermitteln."
 
 #. type: TP
@@ -15538,7 +15905,7 @@
 "wird er aus B</etc/dpkg/origins/default> ermittelt."
 
 #. type: Plain text
-#: dpkg-vendor.1:50 update-alternatives.8:499
+#: dpkg-vendor.1:50 update-alternatives.8:498
 msgid "Copyright \\(co 2009 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2009 Rapha\\[:e]l Hertzog"
 
@@ -15548,32 +15915,18 @@
 msgid "dselect"
 msgstr "dselect"
 
-#. type: TH
-#: dselect.1:1
-#, no-wrap
-msgid "2010-03-07"
-msgstr "2010-03-07"
-
 #. type: Plain text
 #: dselect.1:4
 msgid "dselect - Debian package management frontend"
 msgstr "dselect - Debian-Paketverwaltungsoberfläche"
 
 #. type: Plain text
-#: dselect.1:16
-msgid ""
-"B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--version>] "
-"[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 ""
-"B<dselect> [B<--admindir> I<E<lt>VerzeichnisE<gt>>] [B<--help>] [B<--"
-"version>] [B<--expert>] [B<--debug>|B<-D>I<E<lt>DateiE<gt>>] "
-"[I<E<lt>AktionE<gt>>] [B<--colour>|B<--color> I<Bildschirmteil:>"
-"[I<Vordergrund>],[I<Hintergrund>][I<:Attr>[I<+Attr+..>]]]"
+#: dselect.1:8
+msgid "B<dselect> [I<option>...] [I<action>]"
+msgstr "B<dselect> [I<Option>...] I<Aktion>"
 
 #. type: Plain text
-#: dselect.1:25
+#: dselect.1:17
 #, no-wrap
 msgid ""
 "B<dselect>\n"
@@ -15593,7 +15946,7 @@
 " - Neue Pakete installieren oder ein Upgrade auf neuere Versionen durchführen.\n"
 
 #. type: Plain text
-#: dselect.1:37
+#: dselect.1:29
 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 "
@@ -15617,11 +15970,11 @@
 "I<apt>, die vom Paket B<apt> bereitgestellt wird."
 
 #. type: Plain text
-#: dselect.1:43
+#: dselect.1:35
 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 "
+"argument, then that action is started immediately. Several command line "
 "parameters are still available to modify the running behaviour of B<dselect> "
 "or show additional information about the program."
 msgstr ""
@@ -15633,29 +15986,23 @@
 "Informationen über das Programm anzuzeigen."
 
 #. type: Plain text
-#: dselect.1:51
+#: dselect.1:43
 msgid ""
-"All options can be specified both on the commandline and in the B<dselect> "
+"All options can be specified both on the command line and in the B<dselect> "
 "configuration file I</etc/dpkg/dselect.cfg> or the files on the "
-"configuration directory I</etc/dpkg/dpkg.cfg.d/>. Each line in the "
-"configuration file is either an option (exactly the same as the commandline "
+"configuration directory I</etc/dpkg/dselect.cfg.d/>. 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 ""
 "Alle Optionen können sowohl auf der Kommandozeile als auch in der "
 "Konfigurationsdatei I</etc/dpkg/dselect.cfg> oder in den Dateien im "
-"Konfigurationsverzeichnis I</etc/dpkg/dpkg.cfg.d/> von B<dselect> angegeben "
-"werden. Jede Zeile in der Konfigurationsdatei ist entweder eine Option "
-"(exakt identisch mit der Kommandozeilenoption, nur ohne einleitende "
+"Konfigurationsverzeichnis I</etc/dpkg/dselect.cfg.d/> von B<dselect> "
+"angegeben werden. Jede Zeile in der Konfigurationsdatei ist entweder eine "
+"Option (exakt identisch mit der Kommandozeilenoption, nur ohne einleitende "
 "Gedankenstriche) oder ein Kommentar (falls sie mit B<#> beginnt)."
 
-#. 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
+#: dselect.1:49
 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 "
@@ -15666,26 +16013,25 @@
 "und normalerweise sollte es keinen Grund geben, dieses zu ändern."
 
 #. type: TP
-#: dselect.1:57
+#: dselect.1:49
 #, no-wrap
-msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
-msgstr "B<--debug>I< E<lt>DateiE<gt> >|I< >B<-D>I<E<lt>DateiE<gt>>"
+msgid "B<--debug>I< file >|I< >B<-D>I<file>"
+msgstr "B<--debug>I< Datei>|I< >B<-D>I<Datei>"
 
 #. type: Plain text
-#: dselect.1:60
-msgid "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+#: dselect.1:52
+msgid "Turn on debugging. Debugging information is sent to I<file>."
 msgstr ""
-"Aktiviere Debugging. Debug-Informationen werden nach I<E<lt>DateiE<gt>> "
-"gesendet."
+"Aktiviere Debugging. Debug-Informationen werden nach I<Datei> gesendet."
 
 #. type: TP
-#: dselect.1:60
+#: dselect.1:52
 #, no-wrap
 msgid "B<--expert>"
 msgstr "B<--expert>"
 
 #. type: Plain text
-#: dselect.1:64
+#: dselect.1:56
 msgid ""
 "Turns on expert mode, i.e. doesn't display possibly annoying help messages."
 msgstr ""
@@ -15693,13 +16039,13 @@
 "Hilfeinformationen an."
 
 #. type: TP
-#: dselect.1:64
+#: dselect.1:56
 #, no-wrap
 msgid "B<--colour>|B<--color> I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]"
 msgstr "[B<--colour>|B<--color> I<Bildschirmteil:>[I<Vordergrund>],[I<Hintergrund>][I<:Attr>[I<+Attr+..>]]]"
 
 #. type: Plain text
-#: dselect.1:71
+#: dselect.1:63
 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>). "
@@ -15713,57 +16059,57 @@
 "Teile des Bildschirms (von oben nach unten) sind:"
 
 #. type: TP
-#: dselect.1:72
+#: dselect.1:64
 #, no-wrap
 msgid "B<title>"
 msgstr "B<title>"
 
 #. type: Plain text
-#: dselect.1:75
+#: dselect.1:67
 msgid "The screen title."
 msgstr "Der Bildschirm-Titel."
 
 #. type: TP
-#: dselect.1:75
+#: dselect.1:67
 #, no-wrap
 msgid "B<listhead>"
 msgstr "B<listhead>"
 
 #. type: Plain text
-#: dselect.1:78
+#: dselect.1:70
 msgid "The header line above the list of packages."
 msgstr "Die Kopfzeile über der Paketliste."
 
 #. type: TP
-#: dselect.1:78
+#: dselect.1:70
 #, no-wrap
 msgid "B<list>"
 msgstr "B<list>"
 
 #. type: Plain text
-#: dselect.1:81
+#: dselect.1:73
 msgid "The scrolling list of packages (and also some help text)."
 msgstr "Die scrollende Liste von Paketen (und auch etwas Hilfetext)."
 
 #. type: TP
-#: dselect.1:81
+#: dselect.1:73
 #, no-wrap
 msgid "B<listsel>"
 msgstr "B<listsel>"
 
 #. type: Plain text
-#: dselect.1:84
+#: dselect.1:76
 msgid "The selected item in the list."
 msgstr "Der ausgewählte Eintrag in der Liste."
 
 #. type: TP
-#: dselect.1:84
+#: dselect.1:76
 #, no-wrap
 msgid "B<pkgstate>"
 msgstr "B<pkgstate>"
 
 #. type: Plain text
-#: dselect.1:88
+#: dselect.1:80
 msgid ""
 "In the list of packages, the text indicating the current state of each "
 "package."
@@ -15772,14 +16118,13 @@
 "anzeigt."
 
 #. type: TP
-#: dselect.1:88
+#: dselect.1:80
 #, no-wrap
 msgid "B<pkgstatesel>"
 msgstr "B<pkgstatesel>"
 
-# FIXME in Squeeze korrigieren
 #. type: Plain text
-#: dselect.1:92
+#: dselect.1:84
 msgid ""
 "In the list of packages, the text indicating the current state of the "
 "currently selected package."
@@ -15788,75 +16133,75 @@
 "ausgewählten Paketes anzeigt."
 
 #. type: TP
-#: dselect.1:92
+#: dselect.1:84
 #, no-wrap
 msgid "B<infohead>"
 msgstr "B<infohead>"
 
 #. type: Plain text
-#: dselect.1:95
+#: dselect.1:87
 msgid ""
 "The header line that displays the state of the currently selected package."
 msgstr ""
 "Die Kopfzeile, die den Zustand des aktuell ausgewählten Paketes anzeigt."
 
 #. type: TP
-#: dselect.1:95
+#: dselect.1:87
 #, no-wrap
 msgid "B<infodesc>"
 msgstr "B<infodesc>"
 
 #. type: Plain text
-#: dselect.1:98
+#: dselect.1:90
 msgid "The package's short description."
 msgstr "Die Kurzbeschreibung des Pakets."
 
 #. type: TP
-#: dselect.1:98
+#: dselect.1:90
 #, no-wrap
 msgid "B<info>"
 msgstr "B<info>"
 
 #. type: Plain text
-#: dselect.1:101
+#: dselect.1:93
 msgid "Used to display package info such as the package's description."
 msgstr "Verwendet um Paketinformationen wie die Paketbeschreibung anzuzeigen."
 
 #. type: TP
-#: dselect.1:101
+#: dselect.1:93
 #, no-wrap
 msgid "B<infofoot>"
 msgstr "B<infofoot>"
 
 #. type: Plain text
-#: dselect.1:104
+#: dselect.1:96
 msgid "The last line of the screen when selecting packages."
 msgstr "Die unterste Zeile des Bildschirms bei der Paketauswahl."
 
 #. type: TP
-#: dselect.1:104
+#: dselect.1:96
 #, no-wrap
 msgid "B<query>"
 msgstr "B<query>"
 
 #. type: Plain text
-#: dselect.1:107
+#: dselect.1:99
 msgid "Used to display query lines"
 msgstr "Verwendet zum Anzeigen von Abfragezeilen"
 
 #. type: TP
-#: dselect.1:107
+#: dselect.1:99
 #, no-wrap
 msgid "B<helpscreen>"
 msgstr "B<helpscreen>"
 
 #. type: Plain text
-#: dselect.1:110
+#: dselect.1:102
 msgid "Color of help screens."
 msgstr "Farbe der Hilfebildschirme."
 
 #. type: Plain text
-#: dselect.1:115
+#: dselect.1:107
 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, "
@@ -15868,7 +16213,7 @@
 "Standard-Farbnamen von Curses."
 
 #. type: Plain text
-#: dselect.1:121
+#: dselect.1:113
 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 "
@@ -15883,56 +16228,54 @@
 "reverse, blink, bright, dim, bold"
 
 #. type: Plain text
-#: dselect.1:124
+#: dselect.1:116
 msgid "Print a brief help text and exit successfully."
 msgstr "Gib einen kurzen Hilfetext aus und beende sich erfolgreich."
 
 #. type: Plain text
-#: dselect.1:127
+#: dselect.1:119
 msgid "Print version information and exit successfully."
 msgstr "Gebe Versionsinformationen aus und beende sich erfolgreich."
 
-#. type: SH
-#: dselect.1:128
-#, no-wrap
-msgid "USAGE"
-msgstr "VERWENDUNG"
-
 #. type: Plain text
-#: dselect.1:133
+#: dselect.1:126
 msgid ""
-"When B<dselect> is started interactively, it prompts the user with a menu of "
-"available actions:"
-msgstr ""
-"Wenn B<Dselect> interaktiv gestartet wird, bietet es dem Benutzer ein Menü "
-"von verfügbaren Aktionen:"
+"When B<dselect> is started it can perform the following actions, either "
+"directly if it was specified on the command line or by prompting the user "
+"with a menu of available actions if running interactively:"
+msgstr ""
+"Wenn B<Dselect> gestartet wird, kann es die folgenden Aktionen durchführen, "
+"entweder direkt, falls sie auf der Kommandozeile angegeben wurde oder indem "
+"dem Benutzer ein Menü der verfügbaren Aktionen bei interkativen Betrieb "
+"angezeigt wird:"
 
 #. type: SS
-#: dselect.1:133
+#: dselect.1:126
 #, no-wrap
 msgid "access"
 msgstr "Zugriff"
 
 #. type: Plain text
-#: dselect.1:135
+#: dselect.1:128
 msgid "Choose and configure an access method to access package repositories."
 msgstr "Wähle und konfiguriere eine Zugriffsmethode für Paketdepots."
 
 #. type: Plain text
-#: dselect.1:141
+#: dselect.1:134
 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."
+"By default, B<dselect> provides several methods such as I<cdrom>, "
+"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount>, "
+"I<floppy> or I<ftp>, but other packages may provide additional methods, eg. "
+"the I<apt> access method provided by the B<apt> package."
 msgstr ""
-"Standardmäßig stellt B<dselect> mehrere Methoden wie I<floppy>, I<harddisk> "
-"oder I<cdrom> zur Verfügung, aber andere Pakete können zusätzliche Methoden "
-"bereitstellen, z.B. das B<apt>-Paket stellt die I<apt>-Zugriffsmethode oder "
-"das B<dpkg-multicd>-Paket I<multi_cd> bereit."
+"Standardmäßig stellt B<dselect> mehrere Methoden wie I<cdrom>, I<multi_cd>, "
+"I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount>, I<floppy> "
+"oder I<ftp> zur Verfügung, aber andere Pakete können zusätzliche Methoden "
+"bereitstellen, z.B. stellt das B<apt>-Paket die I<apt>-Zugriffsmethode "
+"bereit."
 
 #. type: Plain text
-#: dselect.1:143
+#: dselect.1:136
 msgid "The use of the I<apt> access method is strongly recommended."
 msgstr ""
 "Die Verwendung der I<apt>-Zugriffsmethode wird nachdrücklich empfohlen."
@@ -15941,18 +16284,18 @@
 # abkürzen. Sven
 # HK: Daher hier untypische Übersetzung!
 #. type: SS
-#: dselect.1:144
+#: dselect.1:137
 #, no-wrap
 msgid "update"
 msgstr "Erneuern"
 
 #. type: Plain text
-#: dselect.1:146
+#: dselect.1:139
 msgid "Refresh the available packages database."
 msgstr "Die verfügbare Paketdatenbank auffrischen."
 
 #. type: Plain text
-#: dselect.1:153
+#: dselect.1:146
 msgid ""
 "Retrieves a list of available package versions from the package repository, "
 "configured for the current access method, and update the dpkg database. The "
@@ -15969,7 +16312,7 @@
 
 # HK: »Erneuern« s.o.
 #. type: Plain text
-#: dselect.1:156
+#: dselect.1:149
 msgid ""
 "Details of the update action depend on the access method's implementation.  "
 "Normally the process is straightforward and requires no user interaction."
@@ -15979,18 +16322,18 @@
 "keine Benutzerinteraktionen."
 
 #. type: SS
-#: dselect.1:157
+#: dselect.1:150
 #, no-wrap
 msgid "select"
 msgstr "Auswählen"
 
 #. type: Plain text
-#: dselect.1:159
+#: dselect.1:152
 msgid "View or manage package selections and dependencies."
 msgstr "Paketauswahlen oder -abhängigkeiten betrachten oder verwalten."
 
 #. type: Plain text
-#: dselect.1:165
+#: dselect.1:158
 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 "
@@ -16006,7 +16349,7 @@
 "Konflikt stehende Pakete."
 
 #. type: Plain text
-#: dselect.1:172
+#: dselect.1:165
 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 "
@@ -16025,7 +16368,7 @@
 "Abhängigkeiten oder Konflikten führten."
 
 #. type: Plain text
-#: dselect.1:175
+#: dselect.1:168
 msgid ""
 "The use of the interactive package selections management screen is explained "
 "in more detail below."
@@ -16034,18 +16377,18 @@
 "detaillierter beschrieben."
 
 #. type: SS
-#: dselect.1:176
+#: dselect.1:169
 #, no-wrap
 msgid "install"
 msgstr "Installieren"
 
 #. type: Plain text
-#: dselect.1:178
+#: dselect.1:171
 msgid "Installs selected packages."
 msgstr "Installiert ausgewählte Pakete."
 
 #. type: Plain text
-#: dselect.1:184
+#: dselect.1:177
 msgid ""
 "The configured access method will fetch installable or upgradable packages "
 "from the relevant repositories and install these using B<dpkg>.  Depending "
@@ -16061,7 +16404,7 @@
 "zur Entfernung markiert wurden."
 
 #. type: Plain text
-#: dselect.1:192
+#: dselect.1:185
 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 "
@@ -16082,7 +16425,7 @@
 "werden."
 
 #. type: Plain text
-#: dselect.1:199
+#: dselect.1:192
 msgid ""
 "Details of the install action depend on the access method's implementation.  "
 "The user's attention and input may be required during installation, "
@@ -16098,61 +16441,61 @@
 "automatisierte Installationseinrichtungen erlaubt."
 
 #. type: SS
-#: dselect.1:200
+#: dselect.1:193
 #, no-wrap
 msgid "config"
 msgstr "Konfig"
 
 #. type: Plain text
-#: dselect.1:202
+#: dselect.1:195
 msgid "Configures any previously installed, but not fully configured packages."
 msgstr ""
 "Konfiguriert alle bisher installierten, aber noch nicht voll konfigurierten "
 "Pakete."
 
 #. type: SS
-#: dselect.1:203
+#: dselect.1:196
 #, no-wrap
 msgid "remove"
 msgstr "Löschen"
 
 #. type: Plain text
-#: dselect.1:205
+#: dselect.1:198
 msgid "Removes or purges installed packages, that are marked for removal."
 msgstr ""
 "Löscht oder entfernt installierte Pakete vollständig, die zum Löschen "
 "markiert sind."
 
 #. type: SS
-#: dselect.1:206
+#: dselect.1:199
 #, no-wrap
 msgid "quit"
 msgstr "Beenden"
 
 #. type: Plain text
-#: dselect.1:208
+#: dselect.1:201
 msgid "Quit B<dselect>"
 msgstr "B<Dselect> beenden"
 
 #. type: Plain text
-#: dselect.1:210
+#: dselect.1:203
 msgid "Exits the program with zero (successful) errorcode."
 msgstr "Beendet das Programm mit dem Fehlercode Null (erfolgreich)."
 
 #. type: SH
-#: dselect.1:212
+#: dselect.1:205
 #, no-wrap
 msgid "Package selections management"
 msgstr "Paketauswahlverwaltung"
 
 #. type: SS
-#: dselect.1:214
+#: dselect.1:207
 #, no-wrap
 msgid "Introduction"
 msgstr "Einführung"
 
 #. type: Plain text
-#: dselect.1:230
+#: dselect.1:223
 msgid ""
 "B<dselect> directly exposes the administrator to some of the complexities "
 "involved with managing large sets of packages with many interdependencies. "
@@ -16178,7 +16521,7 @@
 "Letzteres ist auf Englisch im Paket B<debian-policy> enthalten."
 
 #. type: Plain text
-#: dselect.1:236
+#: dselect.1:229
 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> "
@@ -16194,13 +16537,13 @@
 "werden."
 
 #. type: SS
-#: dselect.1:237
+#: dselect.1:230
 #, no-wrap
 msgid "Screen layout"
 msgstr "Bildschirmlayout"
 
 #. type: Plain text
-#: dselect.1:245
+#: dselect.1:238
 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 "
@@ -16217,7 +16560,7 @@
 "ausgewählte Paket an. Die Art der angezeigten Details kann variiert werden."
 
 #. type: Plain text
-#: dselect.1:248
+#: dselect.1:241
 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."
@@ -16227,13 +16570,13 @@
 "gleichmäßig geteilten Bildschirm um."
 
 #. type: SS
-#: dselect.1:249
+#: dselect.1:242
 #, no-wrap
 msgid "Package details view"
 msgstr "Paket-Detailbetrachtung"
 
 #. type: Plain text
-#: dselect.1:258
+#: dselect.1:251
 #, no-wrap
 msgid ""
 "The package details view by default shows the extended package description\n"
@@ -16253,7 +16596,7 @@
 " - der Steuerinformation für die verfügbare Version\n"
 
 #. type: Plain text
-#: dselect.1:262
+#: dselect.1:255
 msgid ""
 "In a dependency resolution screen, there is also the possibility of viewing "
 "the specific unresolved depends or conflicts related to the package and "
@@ -16264,13 +16607,13 @@
 "dem Paket anzuschauen und deren Auflistung zu erreichen."
 
 #. type: SS
-#: dselect.1:263
+#: dselect.1:256
 #, no-wrap
 msgid "Packages status list"
 msgstr "Paketstatusliste"
 
 #. type: Plain text
-#: dselect.1:268
+#: dselect.1:261
 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 "
@@ -16282,7 +16625,7 @@
 "bekannt sind."
 
 #. type: Plain text
-#: dselect.1:276
+#: dselect.1:269
 msgid ""
 "For every package, the list shows the package's status, priority, section, "
 "installed and available versions, the package name and its short "
@@ -16300,7 +16643,7 @@
 "Anzeige ist voreingestellt."
 
 #. type: Plain text
-#: dselect.1:282
+#: dselect.1:275
 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 "
@@ -16314,7 +16657,7 @@
 "Benutzer gesetzte Auswahl."
 
 #. type: Plain text
-#: dselect.1:300
+#: dselect.1:293
 #, no-wrap
 msgid ""
 "These are the meanings of the shorthand package status indicator codes:\n"
@@ -16354,13 +16697,13 @@
 "  B<n>       Paket ist neu und muss erst noch markiert werden.\n"
 
 #. type: SS
-#: dselect.1:301
+#: dselect.1:294
 #, no-wrap
 msgid "Cursor and screen movement"
 msgstr "Cursor- und Bildschirm-Bewegung"
 
 #. type: Plain text
-#: dselect.1:306
+#: dselect.1:299
 msgid ""
 "The package selection list and the dependency conflict resolution screens "
 "can be navigated using motion commands mapped to the following keys:"
@@ -16370,7 +16713,7 @@
 "Tasten abgebildet sind:"
 
 #. type: Plain text
-#: dselect.1:323
+#: dselect.1:316
 #, no-wrap
 msgid ""
 "  B<p, Up, k>           move cursor bar up\n"
@@ -16408,13 +16751,13 @@
 "  B<^f>                        bewege Bildschirm ein Zeichen nach rechts\n"
 
 #. type: SS
-#: dselect.1:324
+#: dselect.1:317
 #, no-wrap
 msgid "Searching and sorting"
 msgstr "Suchen und Sortieren"
 
 #. type: Plain text
-#: dselect.1:338
+#: dselect.1:331
 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 "
@@ -16437,7 +16780,7 @@
 "der Liste erreicht, springt sie zum Anfang und fährt von dort fort."
 
 #. type: Plain text
-#: dselect.1:345
+#: dselect.1:338
 #, no-wrap
 msgid ""
 "The list sort order can be varied by pressing\n"
@@ -16455,7 +16798,7 @@
 " Bereich+Priorität verfügbar+Bereich   Status+Bereich\n"
 
 #. type: Plain text
-#: dselect.1:348
+#: dselect.1:341
 msgid ""
 "Where not listed above explicitly, alphabetic order is used as the final "
 "subordering sort key."
@@ -16464,13 +16807,13 @@
 "als abschließender Unterordnungs-Sortierschlüssel verwendet."
 
 #. type: SS
-#: dselect.1:349
+#: dselect.1:342
 #, no-wrap
 msgid "Altering selections"
 msgstr "Auswahlen ändern"
 
 #. type: Plain text
-#: dselect.1:358
+#: dselect.1:351
 #, no-wrap
 msgid ""
 "The requested selection state of individual packages may be\n"
@@ -16490,7 +16833,7 @@
 "  B<_>            Entfernen und Konfiguration löschen\n"
 
 #. type: Plain text
-#: dselect.1:362
+#: dselect.1:355
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -16502,7 +16845,7 @@
 "detaillierter beschrieben."
 
 #. type: Plain text
-#: dselect.1:367
+#: dselect.1:360
 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 "
@@ -16511,10 +16854,10 @@
 "Es ist auch möglich, die Befehle auf Gruppen von Paketauswahlen anzuwenden, "
 "indem mit dem Cursor-Balken die Gruppen-Überschrift ausgewählt wird. Die "
 "genaue Gruppierung der Pakete hängt von den Einstellungen der aktuellen "
-"Listen-Sortierung ab."
+"Listensortierung ab."
 
 #. type: Plain text
-#: dselect.1:373
+#: dselect.1:366
 msgid ""
 "Proper care should be taken when altering large groups of selections, "
 "because this can instantaneously create large numbers of unresolved depends "
@@ -16530,13 +16873,13 @@
 "Loslassen nützlich, wenn sie auf Gruppen angewandt werden."
 
 #. type: SS
-#: dselect.1:374
+#: dselect.1:367
 #, no-wrap
 msgid "Resolving depends and conflicts"
 msgstr "Abhängigkeiten und Konflikte auflösen"
 
 #. type: Plain text
-#: dselect.1:379
+#: dselect.1:372
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -16548,7 +16891,7 @@
 "Hilfebildschirm angezeigt."
 
 #. type: Plain text
-#: dselect.1:386
+#: dselect.1:379
 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 "
@@ -16565,7 +16908,7 @@
 "des derzeit ausgewählte Paketes geführt haben."
 
 #. type: Plain text
-#: dselect.1:392
+#: dselect.1:385
 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, "
@@ -16581,7 +16924,7 @@
 "folgen."
 
 #. type: Plain text
-#: dselect.1:400
+#: dselect.1:393
 msgid ""
 "The listed packages' selection state may be reverted to the original "
 "settings, as they were before the unresolved depends or conflicts were "
@@ -16600,13 +16943,13 @@
 "Auswahlwerte gesetzt."
 
 #. type: SS
-#: dselect.1:401
+#: dselect.1:394
 #, no-wrap
 msgid "Establishing the requested selections"
 msgstr "Die angeforderten Auswahlen einrichten"
 
 #. type: Plain text
-#: dselect.1:408
+#: dselect.1:401
 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 "
@@ -16621,7 +16964,7 @@
 "erneut den Bildschirm mit der Abhängigkeitsauflösung anzeigen."
 
 #. type: Plain text
-#: dselect.1:414
+#: dselect.1:407
 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 "
@@ -16635,7 +16978,7 @@
 "im Klaren sind."
 
 #. type: Plain text
-#: dselect.1:421
+#: dselect.1:414
 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 "
@@ -16651,7 +16994,7 @@
 "zurückgesetzt werden."
 
 #. type: Plain text
-#: dselect.1:428
+#: dselect.1:421
 msgid ""
 "If you mistakenly establish some settings and wish to revert all the "
 "selections to what is currently installed on the system, press the B<'C'> "
@@ -16666,9 +17009,8 @@
 "aber einen etwas deutlicheren Panikknopf, falls der Benutzer aus Versehen "
 "die B<Eingabetaste> gedrückt hat."
 
-# type: Plain text
 #. type: Plain text
-#: dselect.1:435
+#: dselect.1:428
 msgid ""
 "If set, B<dselect> will use it as the directory from which to read the user "
 "specific configuration file."
@@ -16677,7 +17019,7 @@
 "benutzerspezifische Konfigurationsdatei gelesen wird."
 
 #. type: Plain text
-#: dselect.1:441
+#: dselect.1:434
 msgid ""
 "The B<dselect> package selection interface is confusing to some new users.  "
 "Reportedly, it even makes seasoned kernel developers cry."
@@ -16687,23 +17029,23 @@
 "Heulen."
 
 #. type: Plain text
-#: dselect.1:443
+#: dselect.1:436
 msgid "The documentation is lacking."
 msgstr "Die Dokumentation ist verbesserungswürdig."
 
 #. type: Plain text
-#: dselect.1:445
+#: dselect.1:438
 msgid "There is no help option in the main menu."
 msgstr "Es gibt keine Hilfe-Option im Hauptmenü."
 
 #. type: Plain text
-#: dselect.1:447
+#: dselect.1:440
 msgid "The visible list of available packages cannot be reduced."
 msgstr ""
 "Die sichtbare Liste von verfügbaren Paketen kann nicht verkleinert werden."
 
 #. type: Plain text
-#: dselect.1:451
+#: dselect.1:444
 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, "
@@ -16715,12 +17057,12 @@
 "die eingebauten Zugriffsmethoden."
 
 #. type: Plain text
-#: dselect.1:457
+#: dselect.1:450
 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:462
+#: dselect.1:455
 msgid ""
 "B<dselect> was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list "
 "of contributors may be found in 'dselect --version'."
@@ -16730,7 +17072,7 @@
 "herausgefunden werden."
 
 #. type: Plain text
-#: dselect.1:465
+#: dselect.1:458
 msgid ""
 "This manual page was written by Juho Vuori E<lt>javuori@cc.helsinki.fiE<gt>, "
 "Josip Rodin and Joost kooij."
@@ -16744,6 +17086,12 @@
 msgid "dselect.cfg"
 msgstr "dselect.cfg"
 
+#. type: TH
+#: dselect.cfg.5:1
+#, no-wrap
+msgid "2011-07-03"
+msgstr "2011-07-03"
+
 #. type: Plain text
 #: dselect.cfg.5:4
 msgid "dselect.cfg - dselect configuration file"
@@ -16753,7 +17101,7 @@
 #: 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 "
+"option which is exactly the same as a normal command line option for dselect "
 "except for the leading dashes which are not used here. Quotes surrounding "
 "option values are stripped. Comments are allowed by starting a line with a "
 "hash sign (\"B<#>\")."
@@ -16806,12 +17154,12 @@
 msgstr "start-stop-daemon - startet und stoppt System-Daemon-Programme"
 
 #. type: Plain text
-#: start-stop-daemon.8:9
-msgid "B<start-stop-daemon> [I<options>] I<command>"
-msgstr "B<start-stop-daemon> [I<Optionen>] I<Befehl>"
+#: start-stop-daemon.8:8
+msgid "B<start-stop-daemon> [I<option>...] I<command>"
+msgstr "B<start-stop-daemon> [I<Option>...] I<Befehl>"
 
 #. type: Plain text
-#: start-stop-daemon.8:15
+#: start-stop-daemon.8:14
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
 "system-level processes.  Using one of the matching options, B<start-stop-"
@@ -16823,7 +17171,7 @@
 "existierende Instanzen von einem laufenden Prozess finden kann."
 
 #. type: Plain text
-#: start-stop-daemon.8:34
+#: start-stop-daemon.8:33
 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 "
@@ -16844,13 +17192,13 @@
 "ein B<--stop> überleben müssen, müssen Sie eine PID-Datei angeben."
 
 #. type: TP
-#: start-stop-daemon.8:36
+#: start-stop-daemon.8:35
 #, no-wrap
 msgid "B<-S>, B<--start> [B<-->] I<arguments>"
 msgstr "B<-S>, B<--start> [B<-->] I<Argumente>"
 
 #. type: Plain text
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 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<--"
@@ -16869,13 +17217,13 @@
 "startende Programm weitergegeben."
 
 #. type: TP
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 #, no-wrap
 msgid "B<-K>, B<--stop>"
 msgstr "B<-K>, B<--stop>"
 
 #. type: Plain text
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
 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 "
@@ -16892,13 +17240,13 @@
 "B<start-stop-daemon> überprüfen, ob der/die Prozess(e) beendet wurden."
 
 #. type: TP
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
 #, no-wrap
 msgid "B<-T>, B<--status>"
 msgstr "B<-T>, B<--status>"
 
 #. type: Plain text
-#: start-stop-daemon.8:75
+#: start-stop-daemon.8:74
 msgid ""
 "Check for the existence of a specified process, and returns an exit status "
 "code, according to the LSB Init Script Actions."
@@ -16907,52 +17255,52 @@
 "Status-Code entsprechend der »LSB Init Script Actions« zurück."
 
 #. type: TP
-#: start-stop-daemon.8:75
+#: start-stop-daemon.8:74
 #, no-wrap
 msgid "B<-H>, B<--help>"
 msgstr "B<-H>, B<--help>"
 
 #. type: Plain text
-#: start-stop-daemon.8:78
+#: start-stop-daemon.8:77
 msgid "Show usage information and exit."
 msgstr "Zeige Bedienungsinformationen und beendet sich."
 
 #. type: TP
-#: start-stop-daemon.8:78
+#: start-stop-daemon.8:77
 #, no-wrap
 msgid "B<-V>, B<--version>"
 msgstr "B<-V>, B<--version>"
 
 #. type: Plain text
-#: start-stop-daemon.8:81
+#: start-stop-daemon.8:80
 msgid "Show the program version and exit."
 msgstr "Zeige die Programmversion und beendet sich."
 
 #. type: SH
-#: start-stop-daemon.8:82
+#: start-stop-daemon.8:81
 #, no-wrap
 msgid "MATCHING OPTIONS"
 msgstr "ABGLEICH-OPTIONEN"
 
 #. type: TP
-#: start-stop-daemon.8:83
+#: start-stop-daemon.8:82
 #, 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:87
+#: start-stop-daemon.8:86
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr "Überprüfe, ob ein Prozess die Datei I<pid-Datei> angelegt hat."
 
 #. type: TP
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:86
 #, no-wrap
 msgid "B<-x>, B<--exec> I<executable>"
 msgstr "B<-x>, B<--exec> I<Programm>"
 
 #. type: Plain text
-#: start-stop-daemon.8:91
+#: start-stop-daemon.8:90
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
@@ -16961,13 +17309,13 @@
 "diesem Programm sind."
 
 #. type: TP
-#: start-stop-daemon.8:91
+#: start-stop-daemon.8:90
 #, no-wrap
 msgid "B<-n>, B<--name> I<process-name>"
 msgstr "B<-n>, B<--name> I<Prozessname>"
 
 #. type: Plain text
-#: start-stop-daemon.8:97
+#: start-stop-daemon.8:96
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
@@ -16976,13 +17324,13 @@
 "I<Prozessname>."
 
 #. type: TP
-#: start-stop-daemon.8:97
+#: start-stop-daemon.8:96
 #, 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:103
+#: start-stop-daemon.8:102
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
@@ -16990,24 +17338,24 @@
 "spezifizierten Benutzer gehören."
 
 #. type: TP
-#: start-stop-daemon.8:105
+#: start-stop-daemon.8:104
 #, 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:108
+#: start-stop-daemon.8:107
 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:108
+#: start-stop-daemon.8:107
 #, no-wrap
 msgid "B<-s>, B<--signal> I<signal>"
 msgstr "B<-s>, B<--signal> I<Signal>"
 
 #. type: Plain text
-#: start-stop-daemon.8:113
+#: start-stop-daemon.8:112
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default TERM)."
@@ -17016,13 +17364,13 @@
 "spezifiziert (standardmäßig TERM)."
 
 #. type: TP
-#: start-stop-daemon.8:113
+#: start-stop-daemon.8:112
 #, 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:123
+#: start-stop-daemon.8:122
 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 "
@@ -17036,7 +17384,7 @@
 "durchgeführt."
 
 #. type: Plain text
-#: start-stop-daemon.8:134
+#: start-stop-daemon.8:133
 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 "
@@ -17048,7 +17396,7 @@
 "spezifizierte Signal ist."
 
 #. type: Plain text
-#: start-stop-daemon.8:150
+#: start-stop-daemon.8:149
 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 "
@@ -17064,7 +17412,7 @@
 "bedeutet, den Rest des Plans falls notwendig für immer zu wiederholen."
 
 #. type: Plain text
-#: start-stop-daemon.8:160
+#: start-stop-daemon.8:159
 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, "
@@ -17076,13 +17424,13 @@
 "spezifizierte Signal ignoriert."
 
 #. type: TP
-#: start-stop-daemon.8:160
+#: start-stop-daemon.8:159
 #, no-wrap
 msgid "B<-a>, B<--startas> I<pathname>"
 msgstr "B<-a>, B<--startas> I<Pfadname>"
 
 #. type: Plain text
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:167
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
@@ -17092,13 +17440,13 @@
 "Argumente verwendet."
 
 #. type: TP
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:167
 #, no-wrap
 msgid "B<-t>, B<--test>"
 msgstr "B<-t>, B<--test>"
 
 #. type: Plain text
-#: start-stop-daemon.8:172
+#: start-stop-daemon.8:171
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
@@ -17107,37 +17455,37 @@
 "Rückgabewerte, führe aber keine Aktionen durch."
 
 #. type: TP
-#: start-stop-daemon.8:172
+#: start-stop-daemon.8:171
 #, no-wrap
 msgid "B<-o>, B<--oknodo>"
 msgstr "B<-o>, B<--oknodo>"
 
 #. type: Plain text
-#: start-stop-daemon.8:175
+#: start-stop-daemon.8:174
 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:175
+#: start-stop-daemon.8:174
 #, no-wrap
 msgid "B<-q>, B<--quiet>"
 msgstr "B<-q>, B<--quiet>"
 
 #. type: Plain text
-#: start-stop-daemon.8:178
+#: start-stop-daemon.8:177
 msgid "Do not print informational messages; only display error messages."
 msgstr "Gebe keine informativen Meldungen aus, zeige nur Fehlermeldungen an."
 
 #. type: TP
-#: start-stop-daemon.8:178
+#: start-stop-daemon.8:177
 #, no-wrap
-msgid "B<-c>, B<--chuid> I<username>|I<uid>"
-msgstr "B<-c >, B< --chuid >I<Benutzername>|I<uid>"
+msgid "B<-c>, B<--chuid> I<username>|I<uid>[B<:>I<group>|I<gid>]"
+msgstr "B<-c >, B< --chuid >I<Benutzername>|I<uid>[B<:>I<Gruppe>|I<gid>]"
 
 #. type: Plain text
-#: start-stop-daemon.8:196
+#: start-stop-daemon.8:195
 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 "
@@ -17160,13 +17508,13 @@
 "generische Benutzer wie B<nobody>)."
 
 #. type: TP
-#: start-stop-daemon.8:196
+#: start-stop-daemon.8:195
 #, no-wrap
 msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<-r>, B<--chroot> I<Wurzel>"
 
 #. type: Plain text
-#: start-stop-daemon.8:202
+#: start-stop-daemon.8:201
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
@@ -17175,13 +17523,13 @@
 "Sie, dass die PID-Datei auch nach dem chroot geschrieben wird."
 
 #. type: TP
-#: start-stop-daemon.8:202
+#: start-stop-daemon.8:201
 #, no-wrap
 msgid "B<-d>, B<--chdir> I<path>"
 msgstr "B<-d>, B<--chdir> I<Pfad>"
 
 #. type: Plain text
-#: start-stop-daemon.8:210
+#: start-stop-daemon.8:209
 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-"
@@ -17193,13 +17541,13 @@
 "Wurzelverzeichnis wechseln."
 
 #. type: TP
-#: start-stop-daemon.8:210
+#: start-stop-daemon.8:209
 #, no-wrap
 msgid "B<-b>, B<--background>"
 msgstr "B<-b>, B<--background>"
 
 #. type: Plain text
-#: start-stop-daemon.8:222
+#: start-stop-daemon.8:221
 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 "
@@ -17218,24 +17566,24 @@
 "ergibt oder wo es nicht sinnvoll ist, den Code hierfür hinzuzufügen."
 
 #. type: TP
-#: start-stop-daemon.8:222
+#: start-stop-daemon.8:221
 #, no-wrap
 msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr "B<-N>, B<--nicelevel> I<Ganzzahl>"
 
 #. type: Plain text
-#: start-stop-daemon.8:225
+#: start-stop-daemon.8:224
 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:225
+#: start-stop-daemon.8:224
 #, no-wrap
 msgid "B<-P>, B<--procsched> I<policy>B<:>I<priority>"
 msgstr "B<-P>, B<--procsched> I<Strategie>B<:>I<Priorität>"
 
 #. type: Plain text
-#: start-stop-daemon.8:231
+#: start-stop-daemon.8:230
 msgid ""
 "This alters the process scheduler policy and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -17249,13 +17597,13 @@
 "für die Strategie lauten B<other>, B<fifo> und B<rr>."
 
 #. type: TP
-#: start-stop-daemon.8:231
+#: start-stop-daemon.8:230
 #, no-wrap
 msgid "B<-I>, B<--iosched> I<class>B<:>I<priority>"
 msgstr "B<-I>, B<--iosched> I<Klasse>B<:>I<Priorität>"
 
 #. type: Plain text
-#: start-stop-daemon.8:238
+#: start-stop-daemon.8:237
 msgid ""
 "This alters the IO scheduler class and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -17271,24 +17619,24 @@
 "lauten B<idle>, B<best-effort> und B<real-time>."
 
 #. type: TP
-#: start-stop-daemon.8:238
+#: start-stop-daemon.8:237
 #, no-wrap
 msgid "B<-k>, B<--umask> I<mask>"
 msgstr "B<-k>, B<--umask> I<Maske>"
 
 #. type: Plain text
-#: start-stop-daemon.8:241
+#: start-stop-daemon.8:240
 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:241
+#: start-stop-daemon.8:240
 #, no-wrap
 msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-m>, B<--make-pidfile>"
 
 #. type: Plain text
-#: start-stop-daemon.8:256
+#: start-stop-daemon.8:255
 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<--"
@@ -17307,19 +17655,13 @@
 "Hauptprozess forkt. Deshalb ist diese Option normalerweise nur in "
 "Kombination mit der Option B<--background> sinnvoll."
 
-#. type: TP
-#: start-stop-daemon.8:256
-#, no-wrap
-msgid "B<-v>, B<--verbose>"
-msgstr "B<-v>, B<--verbose>"
-
 #. type: Plain text
-#: start-stop-daemon.8:259
+#: start-stop-daemon.8:258
 msgid "Print verbose informational messages."
 msgstr "Gibt ausführliche informative Meldungen aus."
 
 #. type: Plain text
-#: start-stop-daemon.8:271
+#: start-stop-daemon.8:270
 msgid ""
 "The requested action was performed. If B<--oknodo> was specified, it's also "
 "possible that nothing had to be done.  This can happen when B<--start> was "
@@ -17332,12 +17674,12 @@
 "wenn B<--stop> angegeben wurde und es keinen passenden Prozess gab."
 
 #. type: Plain text
-#: start-stop-daemon.8:276
+#: start-stop-daemon.8:275
 msgid "If B<--oknodo> was not specified and nothing was done."
 msgstr "Falls B<--oknodo> nicht angegeben war und nichts durchgeführt wurde."
 
 #. type: Plain text
-#: start-stop-daemon.8:284
+#: start-stop-daemon.8:283
 msgid ""
 "If B<--stop> and B<--retry> were specified, but the end of the schedule was "
 "reached and the processes were still running."
@@ -17346,18 +17688,18 @@
 "erreicht wurde und die Prozesse noch liefen."
 
 #. type: TP
-#: start-stop-daemon.8:284 start-stop-daemon.8:296
+#: start-stop-daemon.8:283 start-stop-daemon.8:295
 #, no-wrap
 msgid "B<3>"
 msgstr "B<3>"
 
 #. type: Plain text
-#: start-stop-daemon.8:287
+#: start-stop-daemon.8:286
 msgid "Any other error."
 msgstr "Jeder andere Fehler."
 
 #. type: Plain text
-#: start-stop-daemon.8:290
+#: start-stop-daemon.8:289
 msgid ""
 "When using the B<--status> command, the following status codes are returned:"
 msgstr ""
@@ -17365,33 +17707,33 @@
 "zurückgeliefert:"
 
 #. type: Plain text
-#: start-stop-daemon.8:293
+#: start-stop-daemon.8:292
 msgid "Program is running."
 msgstr "Programm läuft."
 
 #. type: Plain text
-#: start-stop-daemon.8:296
+#: start-stop-daemon.8:295
 msgid "Program is not running and the pid file exists."
 msgstr "Programm läuft nicht und die PID-Datei existiert."
 
 #. type: Plain text
-#: start-stop-daemon.8:299
+#: start-stop-daemon.8:298
 msgid "Program is not running."
 msgstr "Programm läuft nicht."
 
 #. type: TP
-#: start-stop-daemon.8:299
+#: start-stop-daemon.8:298
 #, no-wrap
 msgid "B<4>"
 msgstr "B<4>"
 
 #. type: Plain text
-#: start-stop-daemon.8:302
+#: start-stop-daemon.8:301
 msgid "Unable to determine program status."
 msgstr "Programmstatus kann nicht bestimmt werden."
 
 #. type: Plain text
-#: start-stop-daemon.8:306
+#: start-stop-daemon.8:305
 msgid ""
 "Start the B<food> daemon, unless one is already running (a process named "
 "food, running as user food, with pid in food.pid):"
@@ -17400,37 +17742,37 @@
 "food, der als Benutzer food mit PID in food.pid läuft):"
 
 #. type: Plain text
-#: start-stop-daemon.8:309
+#: start-stop-daemon.8:308
 #, no-wrap
 msgid "start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon\n"
 msgstr "start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:312
+#: start-stop-daemon.8:311
 msgid "Send B<SIGTERM> to B<food> and wait up to 5 seconds for it to stop:"
 msgstr ""
 "Schicke B<SIGTERM> an B<food> und warte bis zu fünf Sekunden auf sein "
 "Beenden:"
 
 #. type: Plain text
-#: start-stop-daemon.8:315
+#: start-stop-daemon.8:314
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5\n"
 msgstr "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:318
+#: start-stop-daemon.8:317
 msgid "Demonstration of a custom schedule for stopping B<food>:"
 msgstr "Vorführung eines angepassten Plans zum Beenden von B<food>:"
 
 #. type: Plain text
-#: start-stop-daemon.8:321
+#: start-stop-daemon.8:320
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5\n"
 msgstr "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:327
+#: start-stop-daemon.8:326
 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>."
@@ -17440,7 +17782,7 @@
 "ukE<gt>."
 
 #. type: Plain text
-#: start-stop-daemon.8:329
+#: start-stop-daemon.8:328
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -17463,12 +17805,12 @@
 "Standardwerten für Befehle"
 
 #. type: Plain text
-#: update-alternatives.8:16
-msgid "B<update-alternatives> [I<options>] I<command>"
-msgstr "B<update-alternatives> [I<Optionen>] I<Befehl>"
+#: update-alternatives.8:15
+msgid "B<update-alternatives> [I<option>...] I<command>"
+msgstr "B<update-alternatives> [I<Option>...] I<Befehl>"
 
 #. type: Plain text
-#: update-alternatives.8:21
+#: update-alternatives.8:20
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
@@ -17478,7 +17820,7 @@
 "System« bilden, an."
 
 #. type: Plain text
-#: update-alternatives.8:29
+#: update-alternatives.8:28
 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 "
@@ -17496,7 +17838,7 @@
 "Starten zu treffen, falls der Benutzer keine spezielle Wahl getroffen hat."
 
 #. type: Plain text
-#: update-alternatives.8:51
+#: update-alternatives.8:50
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -17522,7 +17864,7 @@
 "explizit dazu aufgefordert wird."
 
 #. type: Plain text
-#: update-alternatives.8:61
+#: update-alternatives.8:60
 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> "
@@ -17540,7 +17882,7 @@
 "ist."
 
 #. type: Plain text
-#: update-alternatives.8:73
+#: update-alternatives.8:72
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -17556,7 +17898,7 @@
 "Paketes aufgerufen."
 
 #. type: Plain text
-#: update-alternatives.8:92
+#: update-alternatives.8:91
 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>"
@@ -17577,7 +17919,7 @@
 "eine I<Link-Gruppe>."
 
 #. type: Plain text
-#: update-alternatives.8:101
+#: 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 "
@@ -17594,7 +17936,7 @@
 "Links vermeiden (außer irgendetwas ist defekt)."
 
 #. type: Plain text
-#: update-alternatives.8:110
+#: 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 "
@@ -17609,7 +17951,7 @@
 "wird automatisch in den manuellen Modus umgeschaltet."
 
 #. type: Plain text
-#: update-alternatives.8:117
+#: 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 "
@@ -17620,37 +17962,37 @@
 "die Alternative mit der höchsten Priorität."
 
 #. type: Plain text
-#: update-alternatives.8:134
+#: update-alternatives.8:133
 msgid ""
-"When using the I<--config> option, B<update-alternatives> will list all of "
+"When using the B<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master "
 "alternative name. The current choice is marked with a '*'.  You will then be "
 "prompted for your choice regarding this link group.  Depending on the choice "
 "made, the link group might no longer be in I<auto> mode. You will need to "
-"use the I<--auto> option in order to return to the automatic mode (or you "
-"can rerun I<--config> and select the entry marked as automatic)."
+"use the B<--auto> option in order to return to the automatic mode (or you "
+"can rerun B<--config> and select the entry marked as automatic)."
 msgstr ""
-"Wird die I<--config>-Option verwendet, dann zeigt B<update-alternatives> "
+"Wird die B<--config>-Option verwendet, dann zeigt B<update-alternatives> "
 "alle Auswahlmöglichkeiten für die Link-Gruppe an, für die der gegebene "
 "I<Name> der Master-Alternative-Name ist. Die aktuelle Auswahl ist mit »*« "
 "markiert. Sie werden dann aufgefordert, Ihre Auswahl bezüglich der "
 "Linkgruppe anzugeben. Abhängig von der getroffenen Auswahl könnte sich die "
 "Link-Gruppe nicht mehr im I<automatischen> Modus befinden. Sie müssen dann "
-"die Option I<--auto> verwenden, um wieder in den automatischen Zustand "
-"zurückzukehren (oder Sie können I<--config> erneut ausführen und den als "
+"die Option B<--auto> verwenden, um wieder in den automatischen Zustand "
+"zurückzukehren (oder Sie können B<--config> erneut ausführen und den als "
 "automatisch markierten Eintrag auswählen)."
 
 #. type: Plain text
-#: update-alternatives.8:138
+#: update-alternatives.8:137
 msgid ""
-"If you want to configure non-interactively you can use the I<--set> option "
+"If you want to configure non-interactively you can use the B<--set> option "
 "instead (see below)."
 msgstr ""
 "Falls Sie nicht-interaktiv konfigurieren möchten, können Sie stattdessen die "
-"I<--set> Option verwenden (siehe unten)."
+"B<--set> Option verwenden (siehe unten)."
 
 #. type: Plain text
-#: update-alternatives.8:149
+#: update-alternatives.8:148
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "In other words, the usage of B<update-alternatives> is B<mandatory> for all "
@@ -17664,13 +18006,13 @@
 "den B<update-alternatives>-Mechanismus nicht verwendet."
 
 #. type: SH
-#: update-alternatives.8:150
+#: update-alternatives.8:149
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr "BEGRIFFE"
 
 #. type: Plain text
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
@@ -17679,13 +18021,13 @@
 "einige spezielle Begriffe helfen, seine Vorgehensweise zu erläutern."
 
 #. type: TP
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 #, no-wrap
 msgid "generic name (or alternative link)"
 msgstr "generischer Name (oder Alternativ-Link)"
 
 #. type: Plain text
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
 "to one of a number of files of similar function."
@@ -17694,24 +18036,24 @@
 "eine Reihe von Dateien mit ähnlicher Funktionalität bezieht."
 
 #. type: TP
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 #, no-wrap
 msgid "alternative name"
 msgstr "Alternativ-Name"
 
 #. type: Plain text
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 msgid "The name of a symbolic link in the alternatives directory."
 msgstr "Der Name eines symbolischen Links im Alternativ-Verzeichnis."
 
 #. type: TP
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 #, no-wrap
 msgid "alternative (or alternative path)"
 msgstr "Alternative (oder Alternativ-Pfad)"
 
 #. type: Plain text
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 msgid ""
 "The name of a specific file in the filesystem, which may be made accessible "
 "via a generic name using the alternatives system."
@@ -17720,26 +18062,26 @@
 "generischen Namens über das Alternativ-System zugreifbar gemacht werden kann."
 
 #. type: TP
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 #, no-wrap
 msgid "alternatives directory"
 msgstr "Alternativ-Verzeichnis"
 
 #. type: Plain text
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 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:173
+#: update-alternatives.8:172
 #, no-wrap
 msgid "administrative directory"
 msgstr "administratives Verzeichnis"
 
 #. type: Plain text
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
 "alternatives>' state information."
@@ -17748,26 +18090,26 @@
 "B<update-alternatives> Zustandsinformationen enthält."
 
 #. type: TP
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 #, no-wrap
 msgid "link group"
 msgstr "Linkgruppe"
 
 #. type: Plain text
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 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:183
+#: update-alternatives.8:182
 #, no-wrap
 msgid "master link"
 msgstr "Master-Link"
 
 #. type: Plain text
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 msgid ""
 "The alternative link in a link group which determines how the other links in "
 "the group are configured."
@@ -17776,13 +18118,13 @@
 "in der Gruppe konfiguriert werden."
 
 #. type: TP
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 #, no-wrap
 msgid "slave link"
 msgstr "Slave-Link"
 
 #. type: Plain text
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 msgid ""
 "An alternative link in a link group which is controlled by the setting of "
 "the master link."
@@ -17791,13 +18133,13 @@
 "Master-Links gesteuert wird."
 
 #. type: TP
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 #, no-wrap
 msgid "automatic mode"
 msgstr "automatischer Modus"
 
 #. type: Plain text
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 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 "
@@ -17808,13 +18150,13 @@
 "Alternative mit der höchsten Priorität zeigen."
 
 #. type: TP
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 #, no-wrap
 msgid "manual mode"
 msgstr "manueller Modus"
 
 #. type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:201
 msgid ""
 "When a link group is in manual mode, the alternatives system will not make "
 "any changes to the system administrator's settings."
@@ -17823,13 +18165,13 @@
 "keine Änderungen an den Einstellungen des Systemadministrators durch."
 
 #. type: TP
-#: update-alternatives.8:204
+#: update-alternatives.8:203
 #, no-wrap
 msgid "B<--install> I<link name path priority> [B<--slave> I<link name path>]..."
 msgstr "B<--install> I<Link Name Pfad Priorität> [B<--slave> I<Link Name Pfad>] ..."
 
 #. type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:222
 msgid ""
 "Add a group of alternatives to the system.  I<link> is the generic name for "
 "the master link, I<name> is the name of its symlink in the alternatives "
@@ -17858,7 +18200,7 @@
 "B<--force> nicht verwandt wird."
 
 #. type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 msgid ""
 "If the alternative name specified exists already in the alternatives "
 "system's records, the information supplied will be added as a new set of "
@@ -17878,28 +18220,28 @@
 "so dass sie auf die neu hinzugefügte Alternative zeigen."
 
 #. type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr "B<--set> I<Name Pfad>"
 
 #. type: Plain text
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
-"I<--config> but is non-interactive and thus scriptable."
+"B<--config> but is non-interactive and thus scriptable."
 msgstr ""
 "Setzt das Programm I<Pfad> als Alternative für I<Name>. Dies ist äquivalent "
-"zu I<--config>, ist aber nicht interaktiv und kann somit geskriptet werden."
+"zu B<--config>, ist aber nicht interaktiv und kann somit geskriptet werden."
 
 #. type: TP
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr "B<--remove> I<Name Pfad>"
 
 #. type: Plain text
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 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 "
@@ -17921,13 +18263,13 @@
 "die Information über die Alternative wird entfernt."
 
 #. type: TP
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr "B<--remove-all> I<Name>"
 
 #. type: Plain text
-#: update-alternatives.8:269
+#: update-alternatives.8:268
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
@@ -17936,7 +18278,7 @@
 "Name im Alternativ-Verzeichnis."
 
 #. type: Plain text
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 msgid ""
 "Call B<--config> on all alternatives. It can be usefully combined with B<--"
 "skip-auto> to review and configure all alternatives which are not configured "
@@ -17952,13 +18294,13 @@
 "alternatives --force --all>."
 
 #. type: TP
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 #, no-wrap
 msgid "B<--auto> I<name>"
 msgstr "B<--auto> I<Name>"
 
 #. type: Plain text
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 msgid ""
 "Switch the link group behind the alternative for I<name> to automatic mode.  "
 "In the process, the master symlink and its slaves are updated to point to "
@@ -17970,13 +18312,13 @@
 "Priorität zu zeigen."
 
 #. type: TP
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 #, no-wrap
 msgid "B<--display> I<name>"
 msgstr "B<--display> I<Name>"
 
 #. type: Plain text
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 msgid ""
 "Display information about the link group.  Information displayed includes "
 "the group's mode (auto or manual), which alternative the master link "
@@ -17991,13 +18333,13 @@
 "installierte Alternative mit der höchsten Priorität."
 
 #. type: TP
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 #, no-wrap
 msgid "B<--get-selections>"
 msgstr "B<--get-selections>"
 
 #. type: Plain text
-#: update-alternatives.8:300
+#: update-alternatives.8:299
 msgid ""
 "List all master alternative names (those controlling a link group)  and "
 "their status. Each line contains up to 3 fields (separated by one or more "
@@ -18014,7 +18356,7 @@
 "kann)."
 
 #. type: Plain text
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 msgid ""
 "Read configuration of alternatives on standard input in the format generated "
 "by B<update-alternatives --get-selections> and reconfigure them accordingly."
@@ -18024,13 +18366,13 @@
 "die Alternativen entsprechend neu."
 
 #. type: TP
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 #, no-wrap
 msgid "B<--query> I<name>"
 msgstr "B<--query> I<Name>"
 
 #. type: Plain text
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 msgid ""
 "Display information about the link group like --display does, but in a "
 "machine parseable way (see section B<QUERY FORMAT> below)."
@@ -18040,24 +18382,24 @@
 "B<ABFRAGE-FORMAT> unten)."
 
 #. type: TP
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 #, no-wrap
 msgid "B<--list> I<name>"
 msgstr "B<--list> I<Name>"
 
 #. type: Plain text
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 msgid "Display all targets of the link group."
 msgstr "Zeige alle Ziele der Linkgruppe an."
 
 #. type: TP
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 #, no-wrap
 msgid "B<--config> I<name>"
 msgstr "B<--config> I<Name>"
 
 #. type: Plain text
-#: update-alternatives.8:317
+#: update-alternatives.8:316
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated."
@@ -18067,13 +18409,13 @@
 "aktualisiert."
 
 #. type: TP
-#: update-alternatives.8:325
+#: update-alternatives.8:324
 #, no-wrap
 msgid "B<--altdir>I< directory>"
 msgstr "B<--altdir>I< Verzeichnis>"
 
 #. type: Plain text
-#: update-alternatives.8:329
+#: update-alternatives.8:328
 msgid ""
 "Specifies the alternatives directory, when this is to be different from the "
 "default."
@@ -18082,7 +18424,7 @@
 "Standardeinstellung unterscheiden soll."
 
 #. type: Plain text
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 msgid ""
 "Specifies the administrative directory, when this is to be different from "
 "the default."
@@ -18091,13 +18433,13 @@
 "Standardeinstellung unterscheiden soll."
 
 #. type: TP
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 #, no-wrap
 msgid "B<--log>I< file>"
 msgstr "B<--log>I< Datei>"
 
 #. type: Plain text
-#: update-alternatives.8:337
+#: update-alternatives.8:336
 msgid ""
 "Specifies the log file, when this is to be different from the default (/var/"
 "log/alternatives.log)."
@@ -18106,22 +18448,23 @@
 "alternatives.log) unterscheiden soll."
 
 #. type: Plain text
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 msgid ""
-"Let B<update-alternatives> replace any real file that is installed where an "
-"alternative link has to be installed."
+"Let B<update-alternatives> replace or drop any real file that is installed "
+"where an alternative link has to be installed or removed."
 msgstr ""
-"Lässt B<update-alternatives> alle echten Dateien ersetzen, die sich an "
-"Stellen befinden, an denen ein Alternativ-Link installiert werden muss."
+"Lässt B<update-alternatives> alle echten Dateien ersetzen oder entfernen, "
+"die sich an Stellen befinden, an denen ein Alternativ-Link installiert "
+"werden muss."
 
 #. type: TP
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 #, no-wrap
 msgid "B<--skip-auto>"
 msgstr "B<--skip-auto>"
 
 #. type: Plain text
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 msgid ""
 "Skip configuration prompt for alternatives which are properly configured in "
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
@@ -18131,23 +18474,23 @@
 "oder B<--all> relevant."
 
 #. type: TP
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 #, no-wrap
 msgid "B<--verbose>"
 msgstr "B<--verbose>"
 
 #. type: Plain text
-#: update-alternatives.8:351
+#: update-alternatives.8:350
 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:354
+#: update-alternatives.8:353
 msgid "Don't generate any comments unless errors occur."
 msgstr "Erzeuge keine Kommentare, es sei denn, ein Fehler tritt auf."
 
 #. type: Plain text
-#: update-alternatives.8:360
+#: update-alternatives.8:359
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the base administrative directory."
@@ -18156,13 +18499,13 @@
 "als Basis-Administrationsverzeichnis verwandt."
 
 #. type: TP
-#: update-alternatives.8:362
+#: update-alternatives.8:361
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr "I</etc/alternatives/>"
 
 #. type: Plain text
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
@@ -18171,13 +18514,13 @@
 "altdir> geändert werden."
 
 #. type: TP
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 #, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "I</var/lib/dpkg/alternatives/>"
 
 #. type: Plain text
-#: update-alternatives.8:374
+#: update-alternatives.8:373
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
@@ -18186,12 +18529,12 @@
 "admindir> Option geändert werden."
 
 #. type: Plain text
-#: update-alternatives.8:379
+#: update-alternatives.8:378
 msgid "The requested action was successfully performed."
 msgstr "Die angeforderte Aktion wurde erfolgreich ausgeführt."
 
 #. type: Plain text
-#: update-alternatives.8:383
+#: update-alternatives.8:382
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
@@ -18200,54 +18543,54 @@
 "auf."
 
 #. type: SH
-#: update-alternatives.8:384
+#: update-alternatives.8:383
 #, no-wrap
 msgid "QUERY FORMAT"
 msgstr "ABFRAGE-FORMAT"
 
 #. type: Plain text
-#: update-alternatives.8:389
+#: update-alternatives.8:388
 msgid ""
-"The B<update-alternatives> I<--query> format is using an RFC822-like flat "
+"The B<update-alternatives --query> format is using an RFC822-like flat "
 "format. It's made of I<n> + 1 blocks where I<n> is the number of "
 "alternatives available in the queried link group. The first block contains "
 "the following fields:"
 msgstr ""
-"Das Format von B<update-alternatives> I<--query> ist ein RFC822-artiges, "
+"Das Format von B<update-alternatives --query> ist ein RFC822-artiges, "
 "flaches Format. Es besteht aus I<n>+1 Blöcken, wobei I<n> die Anzahl der in "
 "einer abgefragten Linkgruppe verfügbaren Alternativen ist. Der erste Block "
 "enthält die folgenden Felder:"
 
 #. type: TP
-#: update-alternatives.8:389
+#: update-alternatives.8:388
 #, no-wrap
-msgid "B<Link:> E<lt>linkE<gt>"
-msgstr "B<Link:> E<lt>LinkE<gt>"
+msgid "B<Link:>I< link>"
+msgstr "B<Link:>I< Link>"
 
 #. type: Plain text
-#: update-alternatives.8:392
+#: update-alternatives.8:391
 msgid "The generic name of the alternative."
 msgstr "Der generische Name der Alternative."
 
 #. type: TP
-#: update-alternatives.8:392
+#: update-alternatives.8:391
 #, no-wrap
-msgid "B<Status:> E<lt>statusE<gt>"
-msgstr "B<Status:> E<lt>StatusE<gt>"
+msgid "B<Status:>I< status>"
+msgstr "B<Status:>I< Status>"
 
 #. type: Plain text
-#: update-alternatives.8:395
+#: update-alternatives.8:394
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr "Der Status der Alternative (B<auto> oder B<manual>)."
 
 #. type: TP
-#: update-alternatives.8:395
+#: update-alternatives.8:394
 #, no-wrap
-msgid "B<Best:> E<lt>best choiceE<gt>"
-msgstr "B<Best:> E<lt>beste WahlE<gt>"
+msgid "B<Best:>I< best-choice>"
+msgstr "B<Best:>I< beste-Wahl>"
 
 #. type: Plain text
-#: update-alternatives.8:399
+#: update-alternatives.8:398
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
@@ -18256,13 +18599,13 @@
 "keine Alternative verfügbar ist."
 
 #. type: TP
-#: update-alternatives.8:399
+#: update-alternatives.8:398
 #, no-wrap
-msgid "B<Value:> E<lt>currently selected alternativeE<gt> "
-msgstr "B<Value:> E<lt>derzeit ausgewählte AlternativeE<gt>"
+msgid "B<Value:>I< currently-selected-alternative>"
+msgstr "B<Value:>I< derzeit-ausgewählte-Alternative>"
 
 #. type: Plain text
-#: update-alternatives.8:403
+#: update-alternatives.8:402
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
@@ -18271,41 +18614,41 @@
 "magischen Wert B<none>, der verwandt wird, falls der Link nicht existiert."
 
 #. type: TP
-#: update-alternatives.8:404
+#: update-alternatives.8:403
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr "Die anderen Blöcke beschreiben die verfügbaren Alternativen in der abgefragten Linkgruppe:"
 
 #. type: TP
-#: update-alternatives.8:406
+#: update-alternatives.8:405
 #, no-wrap
-msgid "B<Alternative:> E<lt>path of this alternativeE<gt>"
-msgstr "B<Alternative:> E<lt>Pfad dieser AlternativenE<gt>"
+msgid "B<Alternative:>I< path-of-this-alternative>"
+msgstr "B<Alternative:>I< Pfad-dieser-Alternativen>"
 
 #. type: Plain text
-#: update-alternatives.8:409
+#: update-alternatives.8:408
 msgid "Path to this block's alternative."
 msgstr "Pfad zum Block dieser Alternativen."
 
 #. type: TP
-#: update-alternatives.8:409
+#: update-alternatives.8:408
 #, no-wrap
-msgid "B<Priority:> E<lt>priority valueE<gt>"
-msgstr "B<Priority:> E<lt>PrioritätswertE<gt>"
+msgid "B<Priority:>I< priority-value>"
+msgstr "B<Priority:>I< Prioritätswert>"
 
 #. type: Plain text
-#: update-alternatives.8:412
+#: update-alternatives.8:411
 msgid "Value of the priority of this alternative."
 msgstr "Wert der Priorität dieser Alternativen."
 
 #. type: TP
-#: update-alternatives.8:412
+#: update-alternatives.8:411
 #, no-wrap
-msgid "B<Slaves:> E<lt>list of slavesE<gt>"
-msgstr "B<Slaves:> E<lt>Liste von SlavesE<gt>"
+msgid "B<Slaves:>I< list-of-slaves>"
+msgstr "B<Slaves:>I< Liste-von-Slaves>"
 
 #. type: Plain text
-#: update-alternatives.8:418
+#: update-alternatives.8:417
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -18319,13 +18662,13 @@
 "Slave-Alternative."
 
 #. type: TP
-#: update-alternatives.8:419
+#: update-alternatives.8:418
 #, no-wrap
 msgid "B<Example>"
 msgstr "B<Beispiel>"
 
 #. type: Plain text
-#: update-alternatives.8:427
+#: update-alternatives.8:426
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
@@ -18341,7 +18684,7 @@
 "Value: /usr/bin/vim.gtk\n"
 
 #. type: Plain text
-#: update-alternatives.8:432
+#: update-alternatives.8:431
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -18355,7 +18698,7 @@
 " editor.1.gz /usr/share/man/man1/ed.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:447
+#: update-alternatives.8:446
 #, no-wrap
 msgid ""
 "Alternative: /usr/bin/vim.gtk\n"
@@ -18389,15 +18732,15 @@
 " editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:459
+#: update-alternatives.8:458
 msgid ""
-"With I<--verbose> B<update-alternatives> chatters incessantly about its "
+"With B<--verbose> 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 ""
-"Mit I<--verbose> quatscht B<update-alternatives> ohne Unterlass über seine "
+"Mit B<--verbose> quatscht B<update-alternatives> ohne Unterlass über seine "
 "Aktivitäten auf seinem Standardausgabekanal. Falls Probleme auftreten, gibt "
 "B<update-alternatives> eine Fehlermeldung auf seinem Standardfehlerkanal aus "
 "und beendet sich mit dem Exit-Status 2. Die Diagnostiken sollten "
@@ -18405,7 +18748,7 @@
 "bitte als Fehler."
 
 #. type: Plain text
-#: update-alternatives.8:465
+#: update-alternatives.8:464
 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 "
@@ -18418,21 +18761,21 @@
 "und die zugehörige Handbuchseite beinhaltet."
 
 #. type: Plain text
-#: update-alternatives.8:468
+#: update-alternatives.8:467
 msgid ""
 "To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
+"setting for it, use the B<--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:"
+"dazu gehörigen Einstellungen, benutzen Sie die Aktion B<--display>:"
 
 #. type: Plain text
-#: update-alternatives.8:471
+#: update-alternatives.8:470
 msgid "B<update-alternatives --display vi>"
 msgstr "B<update-alternatives --display vi>"
 
 #. type: Plain text
-#: update-alternatives.8:475
+#: update-alternatives.8:474
 msgid ""
 "To choose a particular B<vi> implementation, use this command as root and "
 "then select a number from the list:"
@@ -18441,12 +18784,12 @@
 "den folgenden Befehl und wählen dann eine Zahl aus der Liste aus:"
 
 #. type: Plain text
-#: update-alternatives.8:478
+#: update-alternatives.8:477
 msgid "B<update-alternatives --config vi>"
 msgstr "B<update-alternatives --config vi>"
 
 #. type: Plain text
-#: update-alternatives.8:482
+#: update-alternatives.8:481
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
@@ -18455,12 +18798,12 @@
 "Sie folgendes als Root aus:"
 
 #. type: Plain text
-#: update-alternatives.8:485
+#: update-alternatives.8:484
 msgid "B<update-alternatives --auto vi>"
 msgstr "B<update-alternatives --auto vi>"
 
 #. type: Plain text
-#: update-alternatives.8:489
+#: update-alternatives.8:488
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
 msgstr ""
@@ -18468,7 +18811,7 @@
 "von Debian."
 
 #. type: Plain text
-#: update-alternatives.8:494
+#: update-alternatives.8:493
 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 "
@@ -18479,7 +18822,7 @@
 "in der Implementation oder in der Dokumentation; bitte melden Sie dies."
 
 #. type: Plain text
-#: update-alternatives.8:505
+#: update-alternatives.8:504
 msgid ""
 "This manual page is copyright 1997,1998 Charles Briscoe-Smith and others."
 msgstr ""
@@ -18487,7 +18830,7 @@
 "anderen."
 
 #. type: Plain text
-#: update-alternatives.8:508
+#: update-alternatives.8:507
 msgid ""
 "This is free documentation; see the GNU General Public Licence version 2 or "
 "later for copying conditions. There is NO WARRANTY."
@@ -18496,12 +18839,167 @@
 "Version 2 oder neuer für die Kopierbedingungen. Es gibt KEINE Haftung."
 
 #. type: Plain text
-#: update-alternatives.8:511
+#: update-alternatives.8:510
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 "B<ln>(1), FHS, der Dateisystem Hierarchie-Standard (Filesystem Hierarchy "
 "Standard)."
 
+#~ msgid "B<Build-Features:>I< features-list>"
+#~ msgstr "B<Build-Features:> I< Funktionalitätsliste>"
+
+#~ msgid ""
+#~ "A comma-separated list of names of build-time features that are supported "
+#~ "by the source package. Currently, the only supported feature is B<build-"
+#~ "arch>. It allows dpkg-buildpackage to call the I<build-arch> or I<build-"
+#~ "indep> targets in place of I<build>."
+#~ msgstr ""
+#~ "Eine durch Komma separierte Liste von Funktionalitätsnamen, die vom "
+#~ "Quellpaket für den Paketbau unterstützt werden. Derzeit ist die einzige "
+#~ "unterstützte Funktionalität B<build-arch>. Dies erlaubt es Dpkg-"
+#~ "buildpackage, die Ziele I<build-arch> oder I<build-indep> anstelle von "
+#~ "I<build> aufzurufen."
+
+#~ msgid ""
+#~ "by the package maintainer with one of the following files (the first "
+#~ "found is used): B<debian/buildflags.>I<arch>, B<debian/buildflags.>I<os>, "
+#~ "B<debian/buildflags>. The I<arch> substitution corresponds to the "
+#~ "DEB_HOST_ARCH variable returned by B<dpkg-architecture> while I<os> "
+#~ "corresponds to DEB_HOST_ARCH_OS."
+#~ msgstr ""
+#~ "durch den Paketbetreuer mittels einer der folgenden Dateien (die zuerst "
+#~ "gefundene wird verwandt): B<debian/buildflags.>I<Arch>, B<debian/"
+#~ "buildflags.>I<OS>, B<debian/buildflags>. Die Ersetzung I<Arch> entspricht "
+#~ "der von B<dpkg-architecture> zurückgelieferten Variablen DEB_HOST_ARCH, "
+#~ "während I<OS> DEB_HOST_ARCH_OS entspricht."
+
+#~ msgid ""
+#~ "B<debian/buildflags.>I<arch>B<, debian/buildflags.>I<os>B<, debian/"
+#~ "buildflags>"
+#~ msgstr ""
+#~ "B<debian/buildflags.>I<Arch>B<, debian/buildflags.>I<OS>B<, debian/"
+#~ "buildflags>"
+
+#~ msgid "Package maintainer configuration file."
+#~ msgstr "Konfigurationsdatei des Paketverwalters"
+
+#~ msgid ""
+#~ "Those environment variables should not be set by official packages, they "
+#~ "are meant for users who are recompiling a Debian package and would like "
+#~ "to change the compilation flags."
+#~ msgstr ""
+#~ "Diese Umgebungsvariablen sollten von offiziellen Paketen nicht gesetzt "
+#~ "werden, sie sind für Benutzer gedacht, die ein Debian-Paket neu "
+#~ "übersetzen und die Übersetzungsschalter ändern wollen."
+
+#~ msgid "2010-07-29"
+#~ msgstr "2010-07-29"
+
+#~ msgid "Compiler flags"
+#~ msgstr "Compiler-Schalter"
+
+#~ msgid ""
+#~ "The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
+#~ "environment variables are set to the values that B<dpkg-buildflags> "
+#~ "returned. See its manual page for more information."
+#~ msgstr ""
+#~ "Die Umgebungsvariablen B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> und "
+#~ "B<LDFLAGS> werden auf die Werte gesetzt, die B<dpkg-buildflags> "
+#~ "zurückliefert. Lesen Sie die Handbuchseite für weitere Informationen."
+
+#~ msgid "B<Package:> E<lt>package nameE<gt>"
+#~ msgstr "B<Package:> E<lt>PaketnameE<gt>"
+
+#~ msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
+#~ msgstr "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
+
+#~ msgid "2011-04-15"
+#~ msgstr "2011-04-15"
+
+#~ msgid "2008-08-18"
+#~ msgstr "2008-08-18"
+
+#~ msgid "2009-08-15"
+#~ msgstr "2009-08-15"
+
+#~ msgid "2009-11-21"
+#~ msgstr "2009-11-21"
+
+#~ msgid "2011-04-26"
+#~ msgstr "2011-04-26"
+
+#~ msgid "2010-10-12"
+#~ msgstr "2010-10-12"
+
+#~ msgid "2009-08-07"
+#~ msgstr "2009-08-07"
+
+#~ msgid "2010-04-16"
+#~ msgstr "2010-04-16"
+
+#~ msgid "2009-05-19"
+#~ msgstr "2009-05-19"
+
+#~ msgid "2011-04-28"
+#~ msgstr "2011-04-28"
+
+#~ msgid "2009-10-01"
+#~ msgstr "2009-10-01"
+
+#~ msgid "2009-06-26"
+#~ msgstr "2009-06-26"
+
+#~ msgid "2009-05-10"
+#~ msgstr "2009-05-10"
+
+#~ msgid "2010-03-07"
+#~ msgstr "2010-03-07"
+
+#~ msgid ""
+#~ "B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--"
+#~ "version>] [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 ""
+#~ "B<dselect> [B<--admindir> I<E<lt>VerzeichnisE<gt>>] [B<--help>] [B<--"
+#~ "version>] [B<--expert>] [B<--debug>|B<-D>I<E<lt>DateiE<gt>>] "
+#~ "[I<E<lt>AktionE<gt>>] [B<--colour>|B<--color> I<Bildschirmteil:>"
+#~ "[I<Vordergrund>],[I<Hintergrund>][I<:Attr>[I<+Attr+..>]]]"
+
+#~ msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+#~ msgstr "B<--admindir>I< E<lt>VerzeichnisE<gt>>"
+
+#~ msgid "USAGE"
+#~ msgstr "VERWENDUNG"
+
+#~ msgid ""
+#~ "Note: B<dpkg-source> expects the source tree to have all patches listed "
+#~ "in the series file applied when you generate the source package.  This is "
+#~ "not the case when the source tree has been obtained by unpacking a source "
+#~ "package using the Format: 1.0 for instance. To mitigate the problem, "
+#~ "B<dpkg-source> will apply the patches by itself if it believes that they "
+#~ "have not yet been applied. To detect this situation, it uses the "
+#~ "following heuristic: it finds the list of supposedly unapplied patches "
+#~ "(they are listed in the B<series> file but not in B<.pc/applied-"
+#~ "patches>), and if the first patch in that set can be applied without "
+#~ "errors, it will apply them all.  The option B<--no-preparation> can be "
+#~ "used to disable this behaviour. This operation is usually done as part of "
+#~ "the B<--prepare-build> command."
+#~ msgstr ""
+#~ "Hinweis: B<dpkg-source> erwartet, dass alle Patches aus der Series-Datei "
+#~ "auf dem Quellbaum angewandt wurden, wenn Sie das Quellpaket erstellen. "
+#~ "Dies ist z.B. nicht der Fall, wenn der Quellbaum durch Entpacken eines "
+#~ "Quellpakets im Format: 1.0 erhalten wurde. Um das Problem zu entschärfen, "
+#~ "wird B<dpkg-source> die Patches selbst anwenden, falls es glaubt, dass "
+#~ "sie noch nicht angewandt wurden. Um diese Situation zu erkennen, "
+#~ "verwendet es die folgende Heuristik: Es findet die Liste der vermutlich "
+#~ "noch nicht angewandten Patches (sie sind in der Datei B<series>, aber "
+#~ "nicht in der Datei B<.pc/applied-patches> aufgeführt) und wenn der erste "
+#~ "Patch in dem Satz ohne Fehler angewandt werden kann, werden sie alle "
+#~ "angewandt. Die Option B<--no-preparation> kann zum Abschalten dieses "
+#~ "Verhaltens verwandt werden. Dieser Ablauf passiert normalerweise als Teil "
+#~ "des Befehls B<--prepare-build>."
+
 #~ msgid "2010-11-22"
 #~ msgstr "2010-11-22"
 
@@ -18564,7 +19062,6 @@
 #~ msgid "0"
 #~ msgstr "0"
 
-# type: IP
 #~ msgid "1"
 #~ msgstr "1"
 
@@ -18680,7 +19177,6 @@
 #~ msgid "2010-04-11"
 #~ msgstr "2010-04-11"
 
-# type: Plain text
 #~ msgid ""
 #~ "Defined by B<dpkg> on the maintainer script environment to the private "
 #~ "library directory of the currently running B<dpkg> instance."
@@ -18702,11 +19198,9 @@
 #~ "werden. Falls das Paket in einem Unterverzeichnis des I<Binär-Verz> "
 #~ "gefunden wird, dann wird dies mit I<Bereich> überprüft."
 
-# type: Plain text
 #~ msgid "for the current user with B<~/.config/dpkg-buildflags.conf>;"
 #~ msgstr "für den aktuellen Benutzer mit B<~/.config/dpkg-buildflags.conf>"
 
-# type: TP
 #~ msgid "B<~/.config/dpkg-buildflags.conf>"
 #~ msgstr "B<~/.config/dpkg-buildflags.conf>"
 
@@ -18743,32 +19237,6 @@
 #~ "auf einen Wert gesetzt, der für Cross-Kompilierung geeignet ist (»/usr/"
 #~ "I<gnu-system-type>/lib/pkgconfig/:/usr/share/pkgconfig«)."
 
-#~ msgid ""
-#~ "Note: B<dpkg-source> expects the source tree to have all patches listed "
-#~ "in the series file applied when you generate the source package.  This is "
-#~ "not the case when the source tree has been obtained by unpacking a source "
-#~ "package using the Format: 1.0 for instance. To mitigate the problem, "
-#~ "B<dpkg-source> will apply the patches by itself if it believes that they "
-#~ "have not yet been applied. To detect this situation, it uses the "
-#~ "following heuristic: it finds the list of supposedly unapplied patches "
-#~ "(they are listed in the B<series> file but not in B<.pc/applied-"
-#~ "patches>), and if the first patch in that set can be applied without "
-#~ "errors, it will apply them all.  The option B<--no-preparation> can be "
-#~ "used to disable this behaviour."
-#~ msgstr ""
-#~ "Hinweis: B<dpkg-source> erwartet, dass alle Patches aus der Series-Datei "
-#~ "auf dem Quellbaum angewandt wurden, wenn Sie das Quellpaket erstellen. "
-#~ "Dies ist z.B. nicht der Fall, wenn der Quellbaum durch Entpacken eines "
-#~ "Quellpakets im Format: 1.0 erhalten wurde. Um das Problem zu entschärfen, "
-#~ "wird B<dpkg-source> die Patches selbst anwenden, falls es glaubt, dass "
-#~ "sie noch nicht angewandt wurden. Um diese Situation zu erkennen, "
-#~ "verwendet es die folgende Heuristik: Es findet die Liste der vermutlich "
-#~ "noch nicht angewandten Patches (sie sind in der Datei B<series>, aber "
-#~ "nicht in der Datei B<.pc/applied-patches> aufgeführt) und wenn der erste "
-#~ "Patch in dem Satz ohne Fehler angewandt werden kann, werden sie alle "
-#~ "angewandt. Die Option B<--no-preparation> kann zum Abschalten dieses "
-#~ "Verhaltens verwandt werden."
-
 #~ msgid "[I<tag:>] I<library> I<version> I<dependencies>"
 #~ msgstr "[I<Markierung:>] I<Bibliothek> I<Version> I<Abhängigkeiten>"
 
@@ -18884,7 +19352,6 @@
 #~ "angegebenen Format, »1.0«. Die verschiedenen Quellpaketformate werden im "
 #~ "Abschnitt B<QUELLPAKET-FORMATE> ausführlich beschrieben."
 
-# type: Plain text
 #~ msgid ""
 #~ "If you don't know what source format you should use, you should probably "
 #~ "pick either \"3.0 (quilt)\" or \"3.0 (native)\". They will become the "
@@ -18913,7 +19380,6 @@
 #~ msgid "2009-09-06"
 #~ msgstr "2009-09-16"
 
-# type: Plain text
 #~ msgid ""
 #~ "Print the source format that would be used to build the source package if "
 #~ "B<dpkg-source -b >I<directory> was called (in the same conditions and "
@@ -19105,7 +19571,6 @@
 #~ "Informationen darüber enthält, wie das Paket in die Distribution passt; "
 #~ "siehe B<deb-override>(5)."
 
-# type: Plain text
 #~ msgid ""
 #~ "Scan I<file> to find supplementary overrides. See B<deb-extra-override>"
 #~ "(5)  for more information on its format."
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/dpkg-man.pot /home/vorlon/devel/multiarch/dpkg-debian/man/po/dpkg-man.pot
--- dpkg/man/po/dpkg-man.pot	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/dpkg-man.pot	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-04-01 22:11+0300\n"
+"POT-Creation-Date: 2011-09-23 03:38+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,9 +23,9 @@
 msgstr ""
 
 #. type: TH
-#: deb.5:1
+#: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-version.5:5 deb-old.5:1 deb-override.5:15 deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1 dpkg-architecture.1:1 dpkg-buildpackage.1:1 dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2 dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-name.1:6 dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15 dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-trigger.1:1 dselect.1:1 update-alternatives.8:8
 #, no-wrap
-msgid "2009-02-27"
+msgid "2011-08-14"
 msgstr ""
 
 #. type: TH
@@ -63,7 +63,7 @@
 msgstr ""
 
 #. type: SH
-#: deb.5:6 deb-control.5:10 deb-src-control.5:10 deb-split.5:6 deb-version.5:11 deb-old.5:8 deb-override.5:22 deb-extra-override.5:8 deb-shlibs.5:20 deb-substvars.5:9 deb-symbols.5:9 deb-triggers.5:8 dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildflags.1:9 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-gensymbols.1:10 dpkg-maintscript-helper.1:15 dpkg-mergechangelogs.1:9 dpkg-name.1:16 dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:28 dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:11 dpkg-split.1:11 dpkg-statoverride.8:10 dpkg-trigger.1:12 dpkg-vendor.1:9 dselect.1:17 dselect.cfg.5:5 start-stop-daemon.8:10 update-alternatives.8:17
+#: deb.5:6 deb-control.5:10 deb-src-control.5:10 deb-split.5:6 deb-version.5:11 deb-old.5:8 deb-override.5:22 deb-extra-override.5:8 deb-shlibs.5:20 deb-substvars.5:9 deb-symbols.5:9 deb-triggers.5:8 dpkg.1:19 dpkg-architecture.1:10 dpkg.cfg.5:5 dpkg-buildflags.1:9 dpkg-buildpackage.1:9 dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:9 dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9 dpkg-gensymbols.1:10 dpkg-maintscript-helper.1:15 dpkg-mergechangelogs.1:9 dpkg-name.1:16 dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:27 dpkg-scansources.1:13 dpkg-shlibdeps.1:9 dpkg-source.1:10 dpkg-split.1:10 dpkg-statoverride.8:9 dpkg-trigger.1:12 dpkg-vendor.1:9 dselect.1:9 dselect.cfg.5:5 start-stop-daemon.8:9 update-alternatives.8:16
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
@@ -168,7 +168,7 @@
 msgstr ""
 
 #. type: SH
-#: deb.5:79 deb-control.5:269 deb-src-control.5:322 deb-split.5:37 deb-version.5:116 deb-old.5:51 deb-override.5:62 deb-extra-override.5:37 deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:49 dpkg.1:782 dpkg-architecture.1:300 dpkg.cfg.5:23 dpkg-buildpackage.1:249 dpkg-deb.1:246 dpkg-divert.8:132 dpkg-gensymbols.1:445 dpkg-name.1:95 dpkg-query.1:212 dpkg-scanpackages.1:111 dpkg-scansources.1:72 dpkg-shlibdeps.1:326 dpkg-source.1:701 dpkg-split.1:223 dpkg-statoverride.8:85 dpkg-trigger.1:66 dselect.1:452 dselect.cfg.5:23 update-alternatives.8:507
+#: deb.5:79 deb-control.5:271 deb-src-control.5:327 deb-split.5:49 deb-version.5:116 deb-old.5:51 deb-override.5:62 deb-extra-override.5:37 deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:67 dpkg.1:768 dpkg-architecture.1:299 dpkg.cfg.5:23 dpkg-buildpackage.1:249 dpkg-deb.1:259 dpkg-divert.8:132 dpkg-gensymbols.1:450 dpkg-name.1:96 dpkg-query.1:220 dpkg-scanpackages.1:110 dpkg-scansources.1:71 dpkg-shlibdeps.1:324 dpkg-source.1:725 dpkg-split.1:217 dpkg-statoverride.8:84 dpkg-trigger.1:66 dselect.1:445 dselect.cfg.5:23 update-alternatives.8:508
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -184,12 +184,6 @@
 msgid "deb-control"
 msgstr ""
 
-#. type: TH
-#: deb-control.5:3 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
-#, no-wrap
-msgid "2010-07-29"
-msgstr ""
-
 #. type: Plain text
 #: deb-control.5:6
 msgid "deb-control - Debian packages' master control file format"
@@ -222,7 +216,7 @@
 #. type: TP
 #: deb-control.5:26
 #, no-wrap
-msgid "B<Package:> E<lt>package nameE<gt>"
+msgid "B<Package:>I< package-name>"
 msgstr ""
 
 #. type: Plain text
@@ -235,7 +229,7 @@
 #. type: TP
 #: deb-control.5:30
 #, no-wrap
-msgid "B<Version:> E<lt>version stringE<gt>"
+msgid "B<Version:>I< version-string>"
 msgstr ""
 
 #. type: Plain text
@@ -250,7 +244,7 @@
 #. type: TP
 #: deb-control.5:37
 #, no-wrap
-msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
+msgid "B<Maintainer:>I< fullname-email>"
 msgstr ""
 
 #. type: Plain text
@@ -264,12 +258,12 @@
 #. type: TP
 #: deb-control.5:42
 #, no-wrap
-msgid "B<Description:> E<lt>short descriptionE<gt>"
+msgid "B<Description:>I< short-description>"
 msgstr ""
 
 #. type: Plain text
 #: deb-control.5:45
-msgid "B< >E<lt>long descriptionE<gt>"
+msgid "B< >I<long-description>"
 msgstr ""
 
 #. type: Plain text
@@ -289,9 +283,9 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:53 deb-src-control.5:88
+#: deb-control.5:53 deb-src-control.5:90
 #, no-wrap
-msgid "B<Section:> E<lt>sectionE<gt>"
+msgid "B<Section:>I< section>"
 msgstr ""
 
 #. type: Plain text
@@ -303,9 +297,9 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:58 deb-src-control.5:94
+#: deb-control.5:58 deb-src-control.5:96
 #, no-wrap
-msgid "B<Priority:> E<lt>priorityE<gt>"
+msgid "B<Priority:>I< priority>"
 msgstr ""
 
 #. type: Plain text
@@ -316,7 +310,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:71 deb-src-control.5:107
+#: deb-control.5:71 deb-src-control.5:109
 msgid ""
 "In Debian, the B<Section> and B<Priority> fields have a defined set of "
 "accepted values based on the Policy Manual.  A list of these values can be "
@@ -324,15 +318,15 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:71 deb-src-control.5:211
+#: deb-control.5:71 deb-src-control.5:216
 #, no-wrap
-msgid "B<Essential:> E<lt>yes|noE<gt>"
+msgid "B<Essential:> B<yes>|B<no>"
 msgstr ""
 
 #. type: Plain text
 #: deb-control.5:78
 msgid ""
-"This field is usually only needed when the answer is `yes'. It denotes a "
+"This field is usually only needed when the answer is B<yes>. It denotes a "
 "package that is required for proper operation of the system. Dpkg or any "
 "other installation tool will not allow an B<Essential> package to be removed "
 "(at least not without using one of the force options)."
@@ -341,7 +335,7 @@
 #. type: TP
 #: deb-control.5:78
 #, no-wrap
-msgid "B<Architecture:> E<lt>arch|allE<gt>"
+msgid "B<Architecture:> I<arch>|B<all>"
 msgstr ""
 
 #. type: Plain text
@@ -355,9 +349,9 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:86 deb-src-control.5:83
+#: deb-control.5:86 deb-src-control.5:85
 #, no-wrap
-msgid "B<Origin:> E<lt>nameE<gt>"
+msgid "B<Origin:>I< name>"
 msgstr ""
 
 #. type: Plain text
@@ -368,95 +362,95 @@
 #. type: TP
 #: deb-control.5:89 deb-src-control.5:66
 #, no-wrap
-msgid "B<Bugs:> E<lt>urlE<gt>"
+msgid "B<Bugs:>I< url>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:93
+#: deb-control.5:94
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like "
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like "
 "B<debbugs://bugs.debian.org>."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:93 deb-src-control.5:62
+#: deb-control.5:94 deb-src-control.5:62
 #, no-wrap
-msgid "B<Homepage:> E<lt>urlE<gt>"
+msgid "B<Homepage:>I< url>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:96 deb-src-control.5:65
-msgid "The upstream project home page URL."
+#: deb-control.5:97
+msgid "The upstream project home page I<url>."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:96 deb-src-control.5:217
+#: deb-control.5:97 deb-src-control.5:222
 #, no-wrap
-msgid "B<Tag:> E<lt>tag listE<gt>"
+msgid "B<Tag:>I< tag-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:100
+#: deb-control.5:101
 msgid ""
 "List of tags describing the qualities of the package. The description and "
 "list of supported tags can be found in the B<debtags> package."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:100
+#: deb-control.5:101 deb-src-control.5:219
 #, no-wrap
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt>"
+msgid "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:111
+#: deb-control.5:113
 msgid ""
 "This field is used to indicate how this package should behave on a "
-"multi-arch installations. The value `same' means that the package is "
+"multi-arch installations. The value B<same> means that the package is "
 "co-installable with itself, but it must not be used to satisfy the "
 "dependency of any package of a different architecture from itself. The value "
-"`foreign' means that the package is not co-installable with itself, but "
+"B<foreign> means that the package is not co-installable with itself, but "
 "should be allowed to satisfy the dependency of a package of a different arch "
-"from itself. The value `allowed` allows reverse-dependencies to indicate in "
+"from itself. The value B<allowed> allows reverse-dependencies to indicate in "
 "their Depends field that they need a package from a foreign architecture, "
 "but has no effect otherwise. This field should not be present in packages "
-"with the Architecture: all field."
+"with the B<Architecture: all> field."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:111
+#: deb-control.5:113
 #, no-wrap
-msgid "B<Source:> E<lt>source nameE<gt>"
+msgid "B<Source:>I< source-name>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:115
+#: deb-control.5:117
 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:116 deb-src-control.5:197
+#: deb-control.5:118 deb-src-control.5:202
 #, no-wrap
-msgid "B<Subarchitecture:> E<lt>valueE<gt>"
+msgid "B<Subarchitecture:>I< value>"
 msgstr ""
 
 #. type: TP
-#: deb-control.5:119 deb-src-control.5:200
+#: deb-control.5:121 deb-src-control.5:205
 #, no-wrap
-msgid "B<Kernel-Version:> E<lt>valueE<gt>"
+msgid "B<Kernel-Version:>I< value>"
 msgstr ""
 
 #. type: TP
-#: deb-control.5:122 deb-src-control.5:203
+#: deb-control.5:124 deb-src-control.5:208
 #, no-wrap
-msgid "B<Installer-Menu-Item:> E<lt>valueE<gt>"
+msgid "B<Installer-Menu-Item:>I< value>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:129 deb-src-control.5:210
+#: deb-control.5:131 deb-src-control.5:215
 msgid ""
 "These fields are used by the debian-installer and are usually not needed.  "
 "See /usr/share/doc/debian-installer/devel/modules.txt from the "
@@ -464,13 +458,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:130 deb-src-control.5:228
+#: deb-control.5:132 deb-src-control.5:233
 #, no-wrap
-msgid "B<Depends:> E<lt>package listE<gt>"
+msgid "B<Depends:>I< package-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:141
+#: deb-control.5:143
 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 "
@@ -483,13 +477,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:141 deb-src-control.5:231
+#: deb-control.5:143 deb-src-control.5:236
 #, no-wrap
-msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+msgid "B<Pre-Depends:>I< package-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:148
+#: deb-control.5:150
 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 "
@@ -497,13 +491,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:148 deb-src-control.5:234
+#: deb-control.5:150 deb-src-control.5:239
 #, no-wrap
-msgid "B<Recommends:> E<lt>package listE<gt>"
+msgid "B<Recommends:>I< package-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:155
+#: deb-control.5:157
 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 "
@@ -511,13 +505,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:155 deb-src-control.5:237
+#: deb-control.5:157 deb-src-control.5:242
 #, no-wrap
-msgid "B<Suggests:> E<lt>package listE<gt>"
+msgid "B<Suggests:>I< package-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:160
+#: deb-control.5:162
 msgid ""
 "Lists packages that are related to this one and can perhaps enhance its "
 "usefulness, but without which installing this package is perfectly "
@@ -525,7 +519,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:172
+#: deb-control.5:174
 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 "
@@ -536,7 +530,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:178
+#: deb-control.5:180
 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 "
@@ -546,13 +540,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:178 deb-src-control.5:240
+#: deb-control.5:180 deb-src-control.5:245
 #, no-wrap
-msgid "B<Breaks:> E<lt>package listE<gt>"
+msgid "B<Breaks:>I< package-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:186
+#: deb-control.5:188
 msgid ""
 "Lists packages that this one breaks, for example by exposing bugs when the "
 "named packages rely on this one. The package maintenance software will not "
@@ -561,13 +555,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:186 deb-src-control.5:249
+#: deb-control.5:188 deb-src-control.5:254
 #, no-wrap
-msgid "B<Conflicts:> E<lt>package listE<gt>"
+msgid "B<Conflicts:>I< package-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:194
+#: deb-control.5:196
 msgid ""
 "Lists packages that conflict with this one, for example by containing files "
 "with the same names. The package maintenance software will not allow "
@@ -576,13 +570,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:194 deb-src-control.5:246
+#: deb-control.5:196 deb-src-control.5:251
 #, no-wrap
-msgid "B<Replaces:> E<lt>package listE<gt>"
+msgid "B<Replaces:>I< package-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:202
+#: deb-control.5:204
 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 "
@@ -591,13 +585,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:202 deb-src-control.5:252
+#: deb-control.5:204 deb-src-control.5:257
 #, no-wrap
-msgid "B<Provides:> E<lt>package listE<gt>"
+msgid "B<Provides:>I< package-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:212
+#: deb-control.5:214
 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 "
@@ -610,7 +604,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:231
+#: deb-control.5:233
 msgid ""
 "The syntax of B<Breaks>, B<Conflicts>, B<Replaces> and B<Provides> is a list "
 "of package names, separated by commas (and optional whitespace).  In the "
@@ -620,13 +614,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:232 deb-src-control.5:255
+#: deb-control.5:234 deb-src-control.5:260
 #, no-wrap
-msgid "B<Built-Using:> E<lt>package listE<gt>"
+msgid "B<Built-Using:>I< package-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:242
+#: deb-control.5:244
 msgid ""
 "This field lists extra source packages that were used during the build of "
 "this binary package.  This is an indication to the archive maintenance "
@@ -638,13 +632,13 @@
 msgstr ""
 
 #. type: SH
-#: deb-control.5:243 deb-src-control.5:283 start-stop-daemon.8:273
+#: deb-control.5:245 deb-src-control.5:288 start-stop-daemon.8:302
 #, no-wrap
 msgid "EXAMPLE"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:266
+#: deb-control.5:268
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -670,7 +664,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:274
+#: deb-control.5:276
 msgid "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr ""
 
@@ -680,12 +674,6 @@
 msgid "deb-src-control"
 msgstr ""
 
-#. type: TH
-#: deb-src-control.5:3
-#, no-wrap
-msgid "2010-11-22"
-msgstr ""
-
 #. type: Plain text
 #: deb-src-control.5:6
 msgid "deb-src-control - Debian source packages' master control file format"
@@ -705,8 +693,7 @@
 "one space. The content of the multi-line fields is generally joined to a "
 "single line by the tools (except in the case of the B<Description> field, "
 "see below). To insert empty lines into a multi-line field, insert a dot "
-"after the space. The paragraphs are separated by an empty line. Lines "
-"starting with a B<'#'> are treated as comments."
+"after the space. Lines starting with a B<'#'> are treated as comments."
 msgstr ""
 
 #. type: SH
@@ -718,7 +705,7 @@
 #. type: TP
 #: deb-src-control.5:30
 #, no-wrap
-msgid "B<Source:> E<lt>source package nameE<gt> (required)"
+msgid "B<Source:> I<source-package-name> (required)"
 msgstr ""
 
 #. type: Plain text
@@ -734,7 +721,7 @@
 #. type: TP
 #: deb-src-control.5:38
 #, no-wrap
-msgid "B<Maintainer:> E<lt>fullname emailE<gt> (required)"
+msgid "B<Maintainer:> I<fullname-email> (required)"
 msgstr ""
 
 #. type: Plain text
@@ -748,7 +735,7 @@
 #. type: TP
 #: deb-src-control.5:44
 #, no-wrap
-msgid "B<Uploaders:> E<lt>fullname emailE<gt>"
+msgid "B<Uploaders:>I< fullname-email>"
 msgstr ""
 
 #. type: Plain text
@@ -762,7 +749,7 @@
 #. type: TP
 #: deb-src-control.5:50
 #, no-wrap
-msgid "B<Standards-Version:> E<lt>version stringE<gt>"
+msgid "B<Standards-Version:>I< version-string>"
 msgstr ""
 
 #. type: Plain text
@@ -776,7 +763,7 @@
 #. type: TP
 #: deb-src-control.5:57
 #, no-wrap
-msgid "B<DM-Upload-Allowed:> E<lt>yes|noE<gt>"
+msgid "B<DM-Upload-Allowed:> B<yes>|B<no>"
 msgstr ""
 
 #. type: Plain text
@@ -788,48 +775,56 @@
 msgstr ""
 
 #. type: Plain text
+#: deb-src-control.5:65
+msgid "The upstream project home page URL."
+msgstr ""
+
+#. type: Plain text
 #: deb-src-control.5:71
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like "
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like "
 "B<debbugs://bugs.debian.org>. This field is usually not needed."
 msgstr ""
 
 #. type: TP
 #: deb-src-control.5:72
 #, no-wrap
-msgid "B<Vcs-*:> E<lt>urlE<gt>"
+msgid "B<Vcs-*:>I< url>"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:78
+#: deb-src-control.5:79
 msgid ""
-"The url of the Version Control System repository used to maintain this "
-"package.  Currently supported are Arch, Bzr (Bazaar), Cvs, Darcs, Git, Hg "
-"(Mercurial), Mtn (Monotone) and Svn (Subversion). Usually this field points "
-"to the latest version of the package, such as the main branch or the trunk."
+"The I<url> of the Version Control System repository used to maintain this "
+"package. Currently supported are B<Arch>, B<Bzr> (Bazaar), B<Cvs>, B<Darcs>, "
+"B<Git>, B<Hg> (Mercurial), B<Mtn> (Monotone) and B<Svn> "
+"(Subversion). Usually this field points to the latest version of the "
+"package, such as the main branch or the trunk."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:79
+#: deb-src-control.5:80
 #, no-wrap
-msgid "B<Vcs-Browser:> E<lt>urlE<gt>"
+msgid "B<Vcs-Browser:>I< url>"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:82
-msgid "The url of a webinterface to browse the Version Control System repository."
+#: deb-src-control.5:84
+msgid ""
+"The I<url> of a webinterface to browse the Version Control System "
+"repository."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:87
+#: deb-src-control.5:89
 msgid ""
 "The name of the distribution this package is originating from. This field is "
 "usually not needed."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:93
+#: deb-src-control.5:95
 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\", "
@@ -837,7 +832,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:98
+#: deb-src-control.5:100
 msgid ""
 "Sets the importance of this package in relation to the system as a whole.  "
 "Common priorities are \"required\", \"standard\", \"optional\", \"extra\", "
@@ -845,60 +840,60 @@
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:108
+#: deb-src-control.5:110
 #, no-wrap
-msgid "B<Build-Depends:> E<lt>package listE<gt>"
+msgid "B<Build-Depends:>I< package-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:112
+#: deb-src-control.5:114
 msgid ""
 "A list of packages that need to be installed and configured to be able to "
 "build the source package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:113
+#: deb-src-control.5:115
 #, no-wrap
-msgid "B<Build-Depends-Indep:> E<lt>package listE<gt>"
+msgid "B<Build-Depends-Indep:>I< package-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:118
+#: deb-src-control.5:120
 msgid ""
-"Same as Build-Depends, but they are only needed when building the "
-"architecture independent packages. The Build-Depends are also installed in "
-"this case."
+"Same as B<Build-Depends>, but they are only needed when building the "
+"architecture independent packages. The B<Build-Depends> are also installed "
+"in this case."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:119
+#: deb-src-control.5:121
 #, no-wrap
-msgid "B<Build-Conflicts:> E<lt>package listE<gt>"
+msgid "B<Build-Conflicts:>I< package-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:123
+#: deb-src-control.5:125
 msgid ""
 "A list of packages that should not be installed when the package is build, "
 "for example because they interfere with the used build system."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:124
+#: deb-src-control.5:126
 #, no-wrap
-msgid "B<Build-Conflicts-Indep:> E<lt>package listE<gt>"
+msgid "B<Build-Conflicts-Indep:>I< package-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:128
+#: deb-src-control.5:130
 msgid ""
-"Same as Build-Conflicts, but only when building the architecture independent "
-"packages."
+"Same as B<Build-Conflicts>, but only when building the architecture "
+"independent packages."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:139
+#: deb-src-control.5:141
 msgid ""
 "The syntax of the B<Build-Depends> and B<Build-Depends-Indep> fields is a "
 "list of groups of alternative packages. Each group is a list of packages "
@@ -910,7 +905,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:148
+#: deb-src-control.5:150
 msgid ""
 "The syntax of the B<Build-Conflicts> and B<Build-Conflicts-Indep> fields is "
 "a list of comma-separated package names, where the comma is read as an "
@@ -920,7 +915,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:154
+#: deb-src-control.5:156
 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 "
@@ -930,7 +925,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:158
+#: deb-src-control.5:160
 msgid ""
 "A architecture specification consists of one or more architecture names, "
 "separated by whitespace. Exclamation marks may be prepended to each of the "
@@ -938,7 +933,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:163
+#: deb-src-control.5:165
 msgid ""
 "Note that dependencies on packages in the B<build-essential> set can be "
 "omitted and that declaring build conflicts against them is impossible. A "
@@ -946,55 +941,57 @@
 msgstr ""
 
 #. type: SH
-#: deb-src-control.5:165
+#: deb-src-control.5:167
 #, no-wrap
 msgid "BINARY FIELDS"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:174
+#: deb-src-control.5:176
 msgid ""
 "Note that the B<Priority>, B<Section> and B<Homepage> fields can also be in "
 "a binary paragraph to override the global value from the source package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:175
+#: deb-src-control.5:177
 #, no-wrap
-msgid "B<Package:> E<lt>binary package nameE<gt> (required)"
+msgid "B<Package:> I<binary-package-name> (required)"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:179
+#: deb-src-control.5:181
 msgid ""
 "This field is used to name the binary package name. The same restrictions as "
 "to a source package name apply."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:180
+#: deb-src-control.5:182
 #, no-wrap
-msgid "B<Architecture:> E<lt>arch|all|anyE<gt> (required)"
+msgid "B<Architecture:> I<arch>|B<all>|B<any> (required)"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:190
+#: deb-src-control.5:195
 msgid ""
 "The architecture specifies on which type of hardware this package runs. For "
 "packages that run on all architectures, use the B<any> value. For packages "
 "that are architecture independent, such as shell and Perl scripts or "
 "documentation, use the B<all> value. To restrict the packages to a certain "
-"set of architectures, specify the architecture names, separated by a space."
+"set of architectures, specify the architecture names, separated by a "
+"space. It's also possible to put architecture wildcards in that list (see "
+"B<dpkg-architecture>(1)  for more information about them)."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:191
+#: deb-src-control.5:196
 #, no-wrap
-msgid "B<Package-Type:> E<lt>deb|udebE<gt>"
+msgid "B<Package-Type:> B<deb>|B<udeb>"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:196
+#: deb-src-control.5:201
 msgid ""
 "This field defines the type of the package. \"udeb\" is for size-constrained "
 "packages used by the debian installer. \"deb\" is the default value, it's "
@@ -1002,45 +999,39 @@
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:214
-#, no-wrap
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
-msgstr ""
-
-#. type: TP
-#: deb-src-control.5:220
+#: deb-src-control.5:225
 #, no-wrap
-msgid "B<Description:> E<lt>short descriptionE<gt> (required)"
+msgid "B<Description:> I<short-description> (required)"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:227
+#: deb-src-control.5:232
 msgid ""
 "These fields are described in the B<deb-control>(5)  manual page, as they "
 "are copied literally to the control file of the binary package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:243
+#: deb-src-control.5:248
 #, no-wrap
-msgid "B<Enhances:> E<lt>package listE<gt>"
+msgid "B<Enhances:>I< package-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:265
+#: deb-src-control.5:270
 msgid ""
 "These fields declare relationships between packages. They are discussed in "
 "the B<deb-control>(5)  manpage and in the B<debian-policy> package."
 msgstr ""
 
 #. type: SH
-#: deb-src-control.5:266
+#: deb-src-control.5:271
 #, no-wrap
 msgid "USER-DEFINED FIELDS"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:281
+#: deb-src-control.5:286
 msgid ""
 "It is allowed to add additional user-defined fields to the control file. The "
 "tools will ignore these fields. If you want the fields to be copied over to "
@@ -1057,7 +1048,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:299
+#: deb-src-control.5:304
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -1072,12 +1063,11 @@
 "Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
-" libselinux1-dev (E<gt>= 1.28-4) [!hurd-i386 !kfreebsd-i386 "
-"!kfreebsd-amd64]\n"
+" libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:318
+#: deb-src-control.5:323
 #, no-wrap
 msgid ""
 "Package: dpkg-dev\n"
@@ -1086,9 +1076,8 @@
 "Architecture: all\n"
 "# this is a custom field in the binary package\n"
 "XB-Mentoring-Contact: Raphael Hertzog E<lt>hertzog@debian.orgE<gt>\n"
-"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2), "
-"bzip2, lzma,\n"
-" patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
+"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2),\n"
+" bzip2, lzma, patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
 "Recommends: gcc | c-compiler, build-essential\n"
 "Suggests: gnupg, debian-keyring\n"
 "Conflicts: dpkg-cross (E<lt>E<lt> 2.0.0), devscripts (E<lt>E<lt> 2.10.26)\n"
@@ -1102,7 +1091,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:325
+#: deb-src-control.5:330
 msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
 msgstr ""
 
@@ -1113,9 +1102,9 @@
 msgstr ""
 
 #. type: TH
-#: deb-split.5:1
+#: deb-split.5:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-split.1:2 dpkg-statoverride.8:1 dpkg-vendor.1:1 start-stop-daemon.8:1
 #, no-wrap
-msgid "2010-01-28"
+msgid "2011-07-04"
 msgstr ""
 
 #. type: Plain text
@@ -1138,26 +1127,69 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-split.5:21
+#: deb-split.5:15
 msgid ""
 "The first member is named B<debian-split> and contains a series of lines, "
-"separated by newlines. Currently seven lines are present.  The first is the "
-"format version number, B<2.1> at the time this manual page was written. The "
-"second is the package name. The third is the package version. The fourth is "
-"the md5sum of the package.  The fifth is the total size of the package. The "
-"sixth is the maximum part size. The seventh is the current part number, "
-"followed by a slash and the total amount of parts (as in \\(oq1/10\\(cq)."
+"separated by newlines. Currently eight lines are present:"
+msgstr ""
+
+#. type: IP
+#: deb-split.5:15 deb-split.5:18 deb-split.5:20 deb-split.5:22 deb-split.5:24 deb-split.5:26 deb-split.5:28 deb-split.5:31 dpkg-gensymbols.1:20 dpkg-gensymbols.1:22 dpkg-gensymbols.1:24 dpkg-gensymbols.1:26 dpkg-gensymbols.1:311 dpkg-gensymbols.1:317 dpkg-gensymbols.1:351 dpkg-gensymbols.1:355 dpkg-gensymbols.1:358
+#, no-wrap
+msgid "\\(bu"
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:18
+msgid "The format version number, B<2.1> at the time this manual page was written."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:20
+msgid "The package name."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:22
+msgid "The package version."
 msgstr ""
 
 #. type: Plain text
 #: deb-split.5:24
+msgid "The md5sum of the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:26
+msgid "The total size of the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:28
+msgid "The maximum part size."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:31
+msgid ""
+"The current part number, followed by a slash and the total amount of parts "
+"(as in \\(oq1/10\\(cq)."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:33
+msgid "The package architecture (since dpkg 1.16.1)."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:36
 msgid ""
 "Programs which read multi-part archives should be prepared for additional "
 "lines to be present, and should ignore these if this is the case."
 msgstr ""
 
 #. type: Plain text
-#: deb-split.5:29
+#: deb-split.5:41
 msgid ""
 "If the version 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 "
@@ -1166,22 +1198,22 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-split.5:32
+#: deb-split.5:44
 msgid ""
-"The second, last required member is named B<data.>N, where N denotes the "
-"part number. It contains the raw part data."
+"The second, last required member is named B<data.>I<N>, where I<N> denotes "
+"the part number. It contains the raw part data."
 msgstr ""
 
 #. type: Plain text
-#: deb-split.5:37
+#: deb-split.5:49
 msgid ""
 "These members must occur in this exact order. Current implementations should "
-"ignore any additional members after B<data.>N.  Further members may be "
+"ignore any additional members after B<data.>I<N>.  Further members may be "
 "defined in the future, and (if possible) will be placed after these two."
 msgstr ""
 
 #. type: Plain text
-#: deb-split.5:39
+#: deb-split.5:51
 msgid "B<deb>(5), B<dpkg-split>(1)."
 msgstr ""
 
@@ -1191,12 +1223,6 @@
 msgid "deb-version"
 msgstr ""
 
-#. type: TH
-#: deb-version.5:5 dpkg-distaddfile.1:1 dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
-#, no-wrap
-msgid "2008-08-18"
-msgstr ""
-
 #. type: Plain text
 #: deb-version.5:8
 msgid "deb-version - Debian package version number format"
@@ -1204,7 +1230,7 @@
 
 #. type: Plain text
 #: deb-version.5:11
-msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgid "[I<epoch>B<:>]I<upstream-version>[B<->I<debian-revision>]"
 msgstr ""
 
 #. type: Plain text
@@ -1224,7 +1250,7 @@
 #: deb-version.5:20
 msgid ""
 "This is a single (generally small) unsigned integer.  It may be omitted, in "
-"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"which case zero is assumed.  If it is omitted then the I<upstream-version> "
 "may not contain any colons."
 msgstr ""
 
@@ -1239,7 +1265,7 @@
 #. type: TP
 #: deb-version.5:24
 #, no-wrap
-msgid "I<upstream_version>"
+msgid "I<upstream-version>"
 msgstr ""
 
 #. type: Plain text
@@ -1257,16 +1283,16 @@
 #: deb-version.5:39
 msgid ""
 "The comparison behavior of the package management system with respect to the "
-"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"I<upstream-version> is described below. The I<upstream-version> portion of "
 "the version number is mandatory."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:48
 msgid ""
-"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"The I<upstream-version> may contain only alphanumerics (\"A-Za-z0-9\") and "
 "the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
-"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"tilde) and should start with a digit.  If there is no I<debian-revision> "
 "then hyphens are not allowed; if there is no I<epoch> then colons are not "
 "allowed."
 msgstr ""
@@ -1274,7 +1300,7 @@
 #. type: TP
 #: deb-version.5:48
 #, no-wrap
-msgid "I<debian_revision>"
+msgid "I<debian-revision>"
 msgstr ""
 
 #. type: Plain text
@@ -1283,13 +1309,13 @@
 "This part of the version number specifies the version of the Debian package "
 "based on the upstream version.  It may contain only alphanumerics and the "
 "characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
-"same way as the I<upstream_version> is."
+"same way as the I<upstream-version> is."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:64
 msgid ""
-"It is optional; if it isn't present then the I<upstream_version> may not "
+"It is optional; if it isn't present then the I<upstream-version> may not "
 "contain a hyphen.  This format represents the case where a piece of software "
 "was written specifically to be turned into a Debian package, and so there is "
 "only one \"debianisation\" of it and therefore no revision indication is "
@@ -1299,17 +1325,17 @@
 #. type: Plain text
 #: deb-version.5:68
 msgid ""
-"It is conventional to restart the I<debian_revision> at '1' each time time "
-"the I<upstream_version> is increased."
+"It is conventional to restart the I<debian-revision> at '1' each time time "
+"the I<upstream-version> is increased."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:76
 msgid ""
 "Dpkg will break the version number apart at the last hyphen in the string "
-"(if there is one) to determine the I<upstream_version> and "
-"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
-"than the presence of one (but note that the I<debian_revision> is the least "
+"(if there is one) to determine the I<upstream-version> and "
+"I<debian-revision>. The absence of a I<debian-revision> compares earlier "
+"than the presence of one (but note that the I<debian-revision> is the least "
 "significant part of the version number)."
 msgstr ""
 
@@ -1322,7 +1348,7 @@
 #. type: Plain text
 #: deb-version.5:80
 msgid ""
-"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"The I<upstream-version> and I<debian-revision> parts are compared by the "
 "package management system using the same algorithm:"
 msgstr ""
 
@@ -1391,7 +1417,7 @@
 msgstr ""
 
 #. type: SH
-#: deb-version.5:120 dpkg.1:797 dpkg-buildpackage.1:256 dpkg-distaddfile.1:47 dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455 dpkg-maintscript-helper.1:128 dpkg-parsechangelog.1:123 dpkg-shlibdeps.1:331 dpkg-source.1:706 dselect.1:458 start-stop-daemon.8:294 update-alternatives.8:493
+#: deb-version.5:120 dpkg.1:783 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47 dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:460 dpkg-maintscript-helper.1:128 dpkg-parsechangelog.1:123 dpkg-shlibdeps.1:329 dpkg-source.1:730 dselect.1:451 start-stop-daemon.8:323 update-alternatives.8:494
 #, no-wrap
 msgid "AUTHORS"
 msgstr ""
@@ -1402,12 +1428,12 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:262
+#: deb-version.5:124 dpkg-buildpackage.1:263
 msgid "Copyright \\(co 2007 Frank Lichtenheld"
 msgstr ""
 
 #. type: Plain text
-#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:125 dpkg-buildpackage.1:266 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53 dpkg-deb.1:256 dpkg-divert.8:139 dpkg-genchanges.1:154 dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-maintscript-helper.1:139 dpkg-mergechangelogs.1:71 dpkg-name.1:107 dpkg-parsechangelog.1:131 dpkg-query.1:211 dpkg-shlibdeps.1:341 dpkg-source.1:714 dpkg-split.1:233 dpkg-statoverride.8:92 dpkg-vendor.1:53 update-alternatives.8:500
+#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:273 dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53 dpkg-deb.1:269 dpkg-divert.8:139 dpkg-genchanges.1:154 dpkg-gencontrol.1:150 dpkg-gensymbols.1:464 dpkg-maintscript-helper.1:139 dpkg-mergechangelogs.1:71 dpkg-name.1:108 dpkg-parsechangelog.1:131 dpkg-query.1:219 dpkg-shlibdeps.1:339 dpkg-source.1:738 dpkg-split.1:227 dpkg-statoverride.8:91 dpkg-vendor.1:53 update-alternatives.8:501
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO WARRANTY."
@@ -1419,12 +1445,6 @@
 msgid "deb-old"
 msgstr ""
 
-#. type: TH
-#: deb-old.5:1
-#, no-wrap
-msgid "2006-02-28"
-msgstr ""
-
 #. type: Plain text
 #: deb-old.5:4
 msgid "deb-old - old style Debian binary package format"
@@ -1502,12 +1522,6 @@
 msgstr ""
 
 #. type: TH
-#: deb-override.5:15
-#, no-wrap
-msgid "2007-03-07"
-msgstr ""
-
-#. type: TH
 #: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2 deb-symbols.5:2 deb-triggers.5:1 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-gensymbols.1:2 dpkg-name.1:6 dpkg-parsechangelog.1:1 dpkg-scanpackages.1:15 dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1 start-stop-daemon.8:1 update-alternatives.8:8
 #, no-wrap
 msgid "dpkg utilities"
@@ -1671,7 +1685,7 @@
 
 #. type: Plain text
 #: deb-shlibs.5:34
-msgid "[I<type:>] I<library> I<version> I<dependencies>"
+msgid "[I<type>B<:>] I<library> I<version> I<dependencies>"
 msgstr ""
 
 #. type: Plain text
@@ -1688,7 +1702,7 @@
 msgstr ""
 
 #. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:728 dpkg-architecture.1:263 dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:458
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:714 dpkg-architecture.1:262 dpkg-divert.8:91 dpkg-name.1:65 update-alternatives.8:459
 #, no-wrap
 msgid "EXAMPLES"
 msgstr ""
@@ -2003,7 +2017,7 @@
 msgstr ""
 
 #. type: SH
-#: deb-substvars.5:145 dpkg.1:641 dpkg-architecture.1:285 dpkg.cfg.5:12 dpkg-buildflags.1:103 dpkg-distaddfile.1:39 dpkg-divert.8:122 dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115 dpkg-split.1:212 dpkg-statoverride.8:75 dselect.cfg.5:12 update-alternatives.8:361
+#: deb-substvars.5:145 dpkg.1:627 dpkg-architecture.1:284 dpkg.cfg.5:12 dpkg-buildflags.1:121 dpkg-distaddfile.1:39 dpkg-divert.8:122 dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115 dpkg-split.1:206 dpkg-statoverride.8:74 dselect.cfg.5:12 update-alternatives.8:360
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -2020,13 +2034,13 @@
 msgstr ""
 
 #. type: SH
-#: deb-substvars.5:150 dpkg.1:794 dpkg-buildpackage.1:244 dpkg-deb.1:225 dpkg-name.1:85 dpkg-source.1:698 dpkg-split.1:197 dselect.1:436 update-alternatives.8:485
+#: deb-substvars.5:150 dpkg.1:780 dpkg-buildpackage.1:244 dpkg-deb.1:238 dpkg-name.1:86 dpkg-source.1:722 dpkg-split.1:199 dselect.1:429 update-alternatives.8:486
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: deb-substvars.5:153 dpkg-source.1:701
+#: deb-substvars.5:153 dpkg-source.1:725
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -2040,18 +2054,18 @@
 msgstr ""
 
 #. type: SH
-#: deb-substvars.5:161 dpkg-architecture.1:304 dpkg.cfg.5:19 dpkg-buildflags.1:120 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252 dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:103 dpkg-query.1:206 dpkg-scansources.1:77 dpkg-split.1:229 dpkg-statoverride.8:88 dpkg-vendor.1:48 dselect.cfg.5:19
+#: deb-substvars.5:161 dpkg-architecture.1:303 dpkg.cfg.5:19 dpkg-buildflags.1:266 dpkg-checkbuilddeps.1:40 dpkg-deb.1:265 dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:104 dpkg-query.1:214 dpkg-scansources.1:76 dpkg-split.1:223 dpkg-statoverride.8:87 dpkg-vendor.1:48 dselect.cfg.5:19
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: deb-substvars.5:163 dpkg-buildpackage.1:258 dpkg-distaddfile.1:49 dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144 dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:708 dpkg-split.1:231
+#: deb-substvars.5:163 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49 dpkg-deb.1:267 dpkg-genchanges.1:150 dpkg-gencontrol.1:144 dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:331 dpkg-source.1:732 dpkg-split.1:225
 msgid "Copyright \\(co 1995-1996 Ian Jackson"
 msgstr ""
 
 #. type: Plain text
-#: deb-substvars.5:165 dpkg-buildpackage.1:260 dpkg-distaddfile.1:51 dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127 dpkg-shlibdeps.1:335 dpkg-source.1:710 dpkg-statoverride.8:90
+#: deb-substvars.5:165 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51 dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127 dpkg-shlibdeps.1:333 dpkg-source.1:734 dpkg-statoverride.8:89
 msgid "Copyright \\(co 2000 Wichert Akkerman"
 msgstr ""
 
@@ -2061,12 +2075,6 @@
 msgid "deb-symbols"
 msgstr ""
 
-#. type: TH
-#: deb-symbols.5:2
-#, no-wrap
-msgid "2007-07-16"
-msgstr ""
-
 #. type: Plain text
 #: deb-symbols.5:5
 msgid "deb-symbols - Debian's extended shared library information file"
@@ -2086,12 +2094,12 @@
 
 #. type: Plain text
 #: deb-symbols.5:14
-msgid "E<lt>library sonameE<gt> E<lt>main dependency templateE<gt>"
+msgid "I<library-soname main-dependency-template>"
 msgstr ""
 
 #. type: Plain text
 #: deb-symbols.5:16
-msgid "[ | E<lt>alternative dependency templateE<gt> ]"
+msgid "[ | I<alternative-dependency-template> ]"
 msgstr ""
 
 #. type: Plain text
@@ -2101,7 +2109,7 @@
 
 #. type: Plain text
 #: deb-symbols.5:20
-msgid "[ * E<lt>field-nameE<gt>: E<lt>field valueE<gt> ]"
+msgid "[ * I<field-name>: I<field-value> ]"
 msgstr ""
 
 #. type: Plain text
@@ -2109,17 +2117,16 @@
 #, no-wrap
 msgid ""
 "[ ... ]\n"
-" E<lt>symbolE<gt> E<lt>minimal versionE<gt>[ E<lt>id of dependency "
-"templateE<gt> ]\n"
+" I<symbol> I<minimal-version>[ I<id-of-dependency-template> ]\n"
 msgstr ""
 
 #. type: Plain text
 #: deb-symbols.5:29
 msgid ""
-"The I<library soname> is exactly the value of the SONAME field as exported "
-"by B<objdump>(1). A I<dependency template> is a dependency where I<#MINVER#> "
-"is dynamically replaced either by a version check like \"(E<gt>= I<minimal "
-"version>)\" or by nothing (if an unversioned dependency is deemed "
+"The I<library-soname> is exactly the value of the SONAME field as exported "
+"by B<objdump>(1). A I<dependency-template> is a dependency where I<#MINVER#> "
+"is dynamically replaced either by a version check like \"(E<gt>= "
+"I<minimal-version>)\" or by nothing (if an unversioned dependency is deemed "
 "sufficient)."
 msgstr ""
 
@@ -2127,10 +2134,10 @@
 #: deb-symbols.5:36
 msgid ""
 "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> being "
-"\"Base\" if the library is not versioned) is associated to a I<minimal "
-"version> of its dependency template (the main dependency template is used if "
-"I<id of dependency template> is not present). The first alternative "
-"dependency template is numbered 1, the second one 2, etc."
+"\"Base\" if the library is not versioned) is associated to a "
+"I<minimal-version> of its dependency template (the main dependency template "
+"is used if I<id-of-dependency-template> is not present). The first "
+"alternative dependency template is numbered 1, the second one 2, etc."
 msgstr ""
 
 #. type: Plain text
@@ -2139,8 +2146,8 @@
 "Each entry for a library can also have some fields of meta-information.  "
 "Those fields are stored on lines starting with an asterisk. Currently, the "
 "only valid field is I<Build-Depends-Package>, it indicates the name of the "
-"\"-dev\" package associated to the library and is used by dpkg-shlibdeps to "
-"make sure that the dependency generated is at least as strict as the "
+"\"-dev\" package associated to the library and is used by B<dpkg-shlibdeps> "
+"to make sure that the dependency generated is at least as strict as the "
 "corresponding build dependency."
 msgstr ""
 
@@ -2203,12 +2210,6 @@
 msgid "deb-triggers"
 msgstr ""
 
-#. type: TH
-#: deb-triggers.5:1 dpkg-trigger.1:1
-#, no-wrap
-msgid "2009-03-15"
-msgstr ""
-
 #. type: Plain text
 #: deb-triggers.5:4
 msgid "deb-triggers - package triggers"
@@ -2246,29 +2247,43 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:27
+#: deb-triggers.5:26
+msgid "B<interest-noawait> I<trigger-name>"
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.5:33
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file."
+"triggers control file. The \"noawait\" variant does not put the triggering "
+"packages in triggers-awaited state. This should be used when the "
+"functionality provided by the trigger is not crucial."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:31
+#: deb-triggers.5:37
 msgid "B<activate> I<trigger-name>"
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:37
+#: deb-triggers.5:41
+msgid "B<activate-noawait> I<trigger-name>"
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.5:50
 msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure."
+"conflicting package), purge and deconfigure.  The \"noawait\" variant does "
+"not put the triggering packages in triggers-awaited state. This should be "
+"used when the functionality provided by the trigger is not crucial."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:45
+#: deb-triggers.5:58
 msgid ""
 "If this package disappears during the unpacking of another package the "
 "trigger will be activated when the disappearance is noted towards the end of "
@@ -2278,27 +2293,30 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:48
+#: deb-triggers.5:61
 msgid ""
 "Unknown directives are an error which will prevent installation of the "
 "package."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:52
-msgid "B<dpkg-trigger>(1), B<dpkg>(1), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
+#: deb-triggers.5:66
+msgid ""
+"The \"-noawait\" variants are only supported by dpkg 1.16.1 or newer, and "
+"will lead to errors if used with an older dpkg. It is thus recommended to "
+"add a \"Pre-Depends: dpkg (E<gt>= 1.16.1)\" to any package that wish to use "
+"those directives."
 msgstr ""
 
-#. type: TH
-#: dpkg.1:1
-#, no-wrap
-msgid "dpkg"
+#. type: Plain text
+#: deb-triggers.5:70
+msgid "B<dpkg-trigger>(1), B<dpkg>(1), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
 msgstr ""
 
 #. type: TH
 #: dpkg.1:1
 #, no-wrap
-msgid "2011-02-05"
+msgid "dpkg"
 msgstr ""
 
 #. type: TH
@@ -2314,7 +2332,7 @@
 
 #. type: Plain text
 #: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
+msgid "B<dpkg> [I<option>...] I<action>"
 msgstr ""
 
 #. type: SH
@@ -2351,40 +2369,24 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:31
-msgid ""
-"B<dpkg> can 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
+#: dpkg.1:33
 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:42
-msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+"B<dpkg> can also be used as a front-end to B<dpkg-deb>(1) and "
+"B<dpkg-query>(1). The list of supported actions can be found later on in the "
+"B<ACTIONS> section. If any such action is encountered B<dpkg> just runs "
+"B<dpkg-deb> or B<dpkg-query> with the parameters given to it, but no "
+"specific options are currently passed to them, to use any such option the "
+"back-ends need to be called directly."
 msgstr ""
 
 #. type: SH
-#: dpkg.1:43
+#: dpkg.1:34
 #, no-wrap
 msgid "INFORMATION ABOUT PACKAGES"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:48
+#: dpkg.1:39
 msgid ""
 "B<dpkg> maintains some usable information about available packages. The "
 "information is divided in three classes: B<states>, B<selection states> and "
@@ -2392,173 +2394,173 @@
 msgstr ""
 
 #. type: SS
-#: dpkg.1:48
+#: dpkg.1:39
 #, no-wrap
 msgid "PACKAGE STATES"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:49
+#: dpkg.1:40
 #, no-wrap
 msgid "B<not-installed>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:52
+#: dpkg.1:43
 msgid "The package is not installed on your system."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:52
+#: dpkg.1:43
 #, no-wrap
 msgid "B<config-files>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:55
+#: dpkg.1:46
 msgid "Only the configuration files of the package exist on the system."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:55
+#: dpkg.1:46
 #, no-wrap
 msgid "B<half-installed>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:59
+#: dpkg.1:50
 msgid ""
 "The installation of the package has been started, but not completed for some "
 "reason."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:59
+#: dpkg.1:50
 #, no-wrap
 msgid "B<unpacked>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:62
+#: dpkg.1:53
 msgid "The package is unpacked, but not configured."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:62
+#: dpkg.1:53
 #, no-wrap
 msgid "B<half-configured>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:66
+#: dpkg.1:57
 msgid ""
 "The package is unpacked and configuration has been started, but not yet "
 "completed for some reason."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:66
+#: dpkg.1:57
 #, no-wrap
 msgid "B<triggers-awaited>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:69
+#: dpkg.1:60
 msgid "The package awaits trigger processing by another package."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:69
+#: dpkg.1:60
 #, no-wrap
 msgid "B<triggers-pending>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:72
+#: dpkg.1:63
 msgid "The package has been triggered."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:72
+#: dpkg.1:63
 #, no-wrap
 msgid "B<installed>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:75
+#: dpkg.1:66
 msgid "The package is unpacked and configured OK."
 msgstr ""
 
 #. type: SS
-#: dpkg.1:75
+#: dpkg.1:66
 #, no-wrap
 msgid "PACKAGE SELECTION STATES"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:76
+#: dpkg.1:67
 #, no-wrap
 msgid "B<install>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:79
+#: dpkg.1:70
 msgid "The package is selected for installation."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:79
+#: dpkg.1:70
 #, no-wrap
 msgid "B<hold>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:83
+#: dpkg.1:74
 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:83
+#: dpkg.1:74
 #, no-wrap
 msgid "B<deinstall>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:87
+#: dpkg.1:78
 msgid ""
 "The package is selected for deinstallation (i.e. we want to remove all "
 "files, except configuration files)."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:87
+#: dpkg.1:78
 #, no-wrap
 msgid "B<purge>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:91
+#: dpkg.1:82
 msgid ""
 "The package is selected to be purged (i.e. we want to remove everything from "
 "system directories, even configuration files)."
 msgstr ""
 
 #. type: SS
-#: dpkg.1:91
+#: dpkg.1:82
 #, no-wrap
 msgid "PACKAGE FLAGS"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:92
+#: dpkg.1:83
 #, no-wrap
 msgid "B<reinst-required>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:97
+#: dpkg.1:88
 msgid ""
 "A package marked B<reinst-required> is broken and requires "
 "reinstallation. These packages cannot be removed, unless forced with option "
@@ -2566,55 +2568,55 @@
 msgstr ""
 
 #. type: SH
-#: dpkg.1:98
+#: dpkg.1:89 dselect.1:120
 #, no-wrap
 msgid "ACTIONS"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:99
+#: dpkg.1:90
 #, no-wrap
-msgid "B<-i>, B<--install> I<package_file>..."
+msgid "B<-i>, B<--install> I<package-file>..."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:103
+#: dpkg.1:94
 msgid ""
 "Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"I<package-file> must refer to a directory instead."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:105
+#: dpkg.1:96
 msgid "Installation consists of the following steps:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:108
+#: dpkg.1:99
 msgid "B<1.> Extract the control files of the new package."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:112
+#: dpkg.1:103
 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 ""
 
 #. type: Plain text
-#: dpkg.1:115
+#: dpkg.1:106
 msgid "B<3.> Run I<preinst> script, if provided by the package."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:119
+#: dpkg.1:110
 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:126
+#: dpkg.1:117
 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 "
@@ -2623,33 +2625,33 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:130
+#: dpkg.1:121
 msgid ""
 "B<6.> Configure the package. See B<--configure> for detailed information "
 "about how this is done."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:130
+#: dpkg.1:121
 #, no-wrap
-msgid "B<--unpack >I<package_file>..."
+msgid "B<--unpack >I<package-file>..."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:135
+#: dpkg.1:126
 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."
+"option is specified, I<package-file> must refer to a directory instead."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:135
+#: dpkg.1:126
 #, no-wrap
 msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:140
+#: dpkg.1:131
 msgid ""
 "Configure a package which has been unpacked but not yet configured.  If "
 "B<-a> or B<--pending> is given instead of I<package>, all unpacked but "
@@ -2657,37 +2659,37 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:144
+#: dpkg.1:135
 msgid ""
 "To reconfigure a package which has already been configured, try the "
 "B<dpkg-reconfigure>(8)  command instead."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:146
+#: dpkg.1:137
 msgid "Configuring consists of the following steps:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:151
+#: dpkg.1:142
 msgid ""
 "B<1.> Unpack the conffiles, and at the same time back up the old conffiles, "
 "so that they can be restored if something goes wrong."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:154
+#: dpkg.1:145
 msgid "B<2.> Run I<postinst> script, if provided by the package."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:154
+#: dpkg.1:145
 #, no-wrap
 msgid "B<--triggers-only> I<package>...|B<-a>|B<--pending>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:161
+#: dpkg.1:152
 msgid ""
 "Processes only triggers. All pending triggers will be processed. If package "
 "names are supplied only those packages' triggers will be processed, exactly "
@@ -2697,13 +2699,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:161
+#: dpkg.1:152
 #, no-wrap
 msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:178
+#: dpkg.1:169
 msgid ""
 "Remove an installed package. B<-r> or B<--remove> remove everything except "
 "conffiles. This may avoid having to reconfigure the package if it is "
@@ -2721,33 +2723,33 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:180
+#: dpkg.1:171
 msgid "Removing of a package consists of the following steps:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:183
+#: dpkg.1:174
 msgid "B<1.> Run I<prerm> script"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:186
+#: dpkg.1:177
 msgid "B<2.> Remove the installed files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:189
+#: dpkg.1:180
 msgid "B<3.> Run I<postrm> script"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:190
+#: dpkg.1:181
 #, no-wrap
 msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:199
+#: dpkg.1:190
 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 "
@@ -2758,7 +2760,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:204
+#: dpkg.1:195
 msgid ""
 "A simpler one-shot command to retrieve and update the I<available> file is "
 "B<dselect update>. Note that this file is mostly useless if you don't use "
@@ -2767,64 +2769,64 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:204
+#: dpkg.1:195
 #, no-wrap
-msgid "B<-A>, B<--record-avail> I<package_file>..."
+msgid "B<-A>, B<--record-avail> I<package-file>..."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:210
+#: dpkg.1:201
 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."
+"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:210
+#: dpkg.1:201
 #, no-wrap
 msgid "B<--forget-old-unavail>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:214
+#: dpkg.1:205
 msgid ""
 "Now B<obsolete> and a no-op as B<dpkg> will automatically forget uninstalled "
 "unavailable packages."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:214
+#: dpkg.1:205
 #, no-wrap
 msgid "B<--clear-avail>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:217
+#: dpkg.1:208
 msgid "Erase the existing information about what packages are available."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:217
+#: dpkg.1:208
 #, no-wrap
 msgid " B<-C>, B<--audit>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:222
+#: dpkg.1:213
 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: TP
-#: dpkg.1:222
+#: dpkg.1:213
 #, no-wrap
 msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:227
+#: dpkg.1:218
 msgid ""
 "Get list of package selections, and write it to stdout. Without a pattern, "
 "non-installed packages (i.e. those which have been previously purged)  will "
@@ -2832,28 +2834,28 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:227 update-alternatives.8:300
+#: dpkg.1:218 update-alternatives.8:299
 #, no-wrap
 msgid "B<--set-selections>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:233
+#: dpkg.1:224
 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 format 'I<package> I<state>', where state is one of B<install>, B<hold>, "
+"B<deinstall> or B<purge>. Blank lines and comment lines beginning with '#' "
+"are also permitted."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:233
+#: dpkg.1:224
 #, no-wrap
 msgid "B<--clear-selections>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:238
+#: dpkg.1:229
 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 "
@@ -2861,37 +2863,37 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:238
+#: dpkg.1:229
 #, no-wrap
 msgid "B<--yet-to-unpack>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:242
+#: dpkg.1:233
 msgid ""
 "Searches for packages selected for installation, but which for some reason "
 "still haven't been installed."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:243
+#: dpkg.1:234
 #, no-wrap
 msgid "B<--print-architecture>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:246
+#: dpkg.1:237
 msgid "Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:246
+#: dpkg.1:237
 #, no-wrap
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:257
+#: dpkg.1:248
 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 "
@@ -2904,77 +2906,76 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:257
+#: dpkg.1:248
 #, no-wrap
-msgid "B<--command-fd >I<E<lt>nE<gt>>"
+msgid "B<--command-fd >I<n>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:262
+#: dpkg.1:253
 msgid ""
-"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and through this file "
-"descriptor, are not reset for subsequent commands executed during the same "
-"run."
+"Accept a series of commands on input file descriptor I<n>. Note: additional "
+"options set on the command line, and through this file descriptor, are not "
+"reset for subsequent commands executed during the same run."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:262 dpkg-architecture.1:61 dpkg-buildflags.1:71 dpkg-divert.8:71 dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45 dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
+#: dpkg.1:253 dpkg-architecture.1:60 dpkg-buildflags.1:89 dpkg-divert.8:71 dpkg-mergechangelogs.1:38 dpkg-scansources.1:66 dpkg-statoverride.8:44 dpkg-vendor.1:28 dselect.1:113 update-alternatives.8:316
 #, no-wrap
 msgid "B<--help>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:265
+#: dpkg.1:256
 msgid "Display a brief help message."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:265
+#: dpkg.1:256
 #, no-wrap
 msgid "B<--force-help>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:268
+#: dpkg.1:259
 msgid "Give help about the B<--force->I<thing> options."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:268
+#: dpkg.1:259
 #, no-wrap
 msgid "B<-Dh>, B<--debug=help>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:271
+#: dpkg.1:262
 msgid "Give help about debugging options."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:271 dpkg-architecture.1:64 dpkg-buildflags.1:74 dpkg-buildpackage.1:226 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:93 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124 update-alternatives.8:320
+#: dpkg.1:262 dpkg-architecture.1:63 dpkg-buildflags.1:92 dpkg-buildpackage.1:226 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:175 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124 dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36 dpkg-query.1:113 dpkg-scanpackages.1:99 dpkg-scansources.1:68 dpkg-shlibdeps.1:218 dpkg-source.1:99 dpkg-split.1:129 dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:116 update-alternatives.8:319
 #, no-wrap
 msgid "B<--version>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:274
+#: dpkg.1:265
 msgid "Display B<dpkg> version information."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:274
+#: dpkg.1:265
 #, no-wrap
 msgid "B<dpkg-deb actions>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:277
+#: dpkg.1:268
 msgid "See B<dpkg-deb>(1) for more information about the following actions."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:297
+#: dpkg.1:288
 #, no-wrap
 msgid ""
 "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
@@ -2998,18 +2999,18 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:299
+#: dpkg.1:290
 #, no-wrap
 msgid "B<dpkg-query actions>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:302
+#: dpkg.1:293
 msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:317
+#: dpkg.1:308
 #, no-wrap
 msgid ""
 "B<-l>, B<--list> I<package-name-pattern>...\n"
@@ -3027,13 +3028,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg.1:319 dpkg-architecture.1:68 dpkg-buildpackage.1:50 dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170 dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37 dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29 dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72 dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134 dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44 start-stop-daemon.8:100 update-alternatives.8:324
+#: dpkg.1:310 dpkg-architecture.1:67 dpkg-buildpackage.1:50 dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:179 dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37 dpkg-gensymbols.1:369 dpkg-mergechangelogs.1:27 dpkg-name.1:30 dpkg-parsechangelog.1:15 dpkg-query.1:117 dpkg-scanpackages.1:71 dpkg-scansources.1:44 dpkg-shlibdeps.1:106 dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:36 start-stop-daemon.8:103 update-alternatives.8:323
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:325
+#: dpkg.1:316
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg> or the files on the configuration "
@@ -3043,24 +3044,24 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:326
+#: dpkg.1:317
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:329
+#: dpkg.1:320
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:329
+#: dpkg.1:320
 #, no-wrap
 msgid "B<-B>, B<--auto-deconfigure>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:335
+#: dpkg.1:326
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -3069,13 +3070,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:335
+#: dpkg.1:326
 #, no-wrap
 msgid "B<-D>I<octal>B<, --debug=>I<octal>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:341
+#: dpkg.1:332
 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 "
@@ -3083,7 +3084,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:356
+#: dpkg.1:347
 #, no-wrap
 msgid ""
 "    Number   Description\n"
@@ -3103,13 +3104,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:356
+#: dpkg.1:347
 #, no-wrap
 msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:363
+#: dpkg.1:354
 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 "
@@ -3118,7 +3119,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:367
+#: dpkg.1:358
 msgid ""
 "I<Warning: These options are mostly intended to be used by experts "
 "only. Using them without fully understanding their effects may break your "
@@ -3126,19 +3127,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:370
+#: dpkg.1:361
 msgid "B<all>: Turns on (or off) all force options."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:373
+#: dpkg.1:364
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:380
+#: dpkg.1:371
 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 "
@@ -3148,19 +3149,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:384
+#: dpkg.1:375
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:387
+#: dpkg.1:378
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:392
+#: dpkg.1:383
 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 "
@@ -3168,7 +3169,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:397
+#: dpkg.1:388
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered "
 "essential. Essential packages contain mostly very basic Unix "
@@ -3177,36 +3178,36 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:400
+#: dpkg.1:391
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:403
+#: dpkg.1:394
 msgid "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:406
+#: dpkg.1:397
 msgid "B<breaks>: Install, even if this would break another package."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:410
+#: dpkg.1:401
 msgid ""
 "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:415
+#: dpkg.1:406
 msgid ""
 "B<confmiss>: Always install a missing conffile. This is dangerous, since it "
 "means not preserving a change (removing) made to the file."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:420
+#: dpkg.1:411
 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 "
@@ -3214,7 +3215,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:425
+#: dpkg.1:416
 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 "
@@ -3222,7 +3223,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:431
+#: dpkg.1:422
 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 "
@@ -3231,7 +3232,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:438
+#: dpkg.1:429
 msgid ""
 "B<confask>: If a conffile has been modified always offer to replace it with "
 "the version in the package, even if the version in the package did not "
@@ -3241,22 +3242,22 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:441
+#: dpkg.1:432
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:444
+#: dpkg.1:435
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:447
+#: dpkg.1:438
 msgid "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:455
+#: dpkg.1:446
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking. Currently "
 "this implies not performing file system syncs before file renames, which is "
@@ -3267,7 +3268,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:461
+#: dpkg.1:452
 msgid ""
 "I<Note>: For ext4, the main offender, consider using instead the mount "
 "option B<nodelalloc>, which will fix both the performance degradation and "
@@ -3277,77 +3278,58 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:464
+#: dpkg.1:455
 msgid ""
 "I<Warning: Using this option might improve performance at the cost of losing "
 "data, use with care.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:467
+#: dpkg.1:458
 msgid "B<architecture>: Process even packages with wrong or no architecture."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:470
+#: dpkg.1:461
+msgid "B<bad-version>: Process even packages with wrong versions."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.1:464
 msgid "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:473
+#: dpkg.1:467
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:476
+#: dpkg.1:470
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:477
+#: dpkg.1:471
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:481
+#: dpkg.1:475
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:481
-#, no-wrap
-msgid "B<--new>, B<--old>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg.1:485
-msgid "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
-msgstr ""
-
-#. type: TP
-#: dpkg.1:485 dpkg-deb.1:209
-#, no-wrap
-msgid "B<--nocheck>"
-msgstr ""
-
-#. type: Plain text
-#: dpkg.1:489
-msgid ""
-"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:489
+#: dpkg.1:475
 #, no-wrap
 msgid "B<--no-act>, B<--dry-run>, B<--simulate>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:494
+#: dpkg.1:480
 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, "
@@ -3355,7 +3337,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:499
+#: dpkg.1:485
 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 "
@@ -3364,13 +3346,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:499
+#: dpkg.1:485
 #, no-wrap
 msgid "B<-R>, B<--recursive>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:505
+#: dpkg.1:491
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -3378,26 +3360,26 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:505
+#: dpkg.1:491
 #, no-wrap
 msgid "B<-G>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:509
+#: dpkg.1:495
 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.1:509 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19 dpkg-query.1:112 dpkg-shlibdeps.1:213 dpkg-trigger.1:39
+#: dpkg.1:495 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19 dpkg-query.1:118 dpkg-shlibdeps.1:211 dpkg-trigger.1:39
 #, no-wrap
 msgid "B<--admindir=>I<dir>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:514
+#: dpkg.1:500
 msgid ""
 "Change default administrative directory, which contains many files that give "
 "information about status of installed or uninstalled packages, etc.  "
@@ -3405,13 +3387,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:514
+#: dpkg.1:500
 #, no-wrap
 msgid "B<--instdir=>I<dir>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:521
+#: dpkg.1:507
 msgid ""
 "Change default installation directory which refers to the directory where "
 "packages are to be installed. B<instdir> is also the directory passed to "
@@ -3420,26 +3402,26 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:521
+#: dpkg.1:507
 #, no-wrap
 msgid "B<--root=>I<dir>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:525
+#: dpkg.1:511
 msgid ""
 "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to "
 "I<dir>B</var/lib/dpkg>."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:525
+#: dpkg.1:511
 #, no-wrap
 msgid "B<-O>, B<--selected-only>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:531
+#: dpkg.1:517
 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 "
@@ -3448,30 +3430,30 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:531
+#: dpkg.1:517
 #, no-wrap
 msgid "B<-E>, B<--skip-same-version>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:535
+#: dpkg.1:521
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:537
+#: dpkg.1:523
 msgid "B<--pre-invoke=>I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:539
+#: dpkg.1:525
 msgid "B<--post-invoke=>I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:548
+#: dpkg.1:534
 msgid ""
 "Set an invoke hook I<command> to be run via ``sh -c'' before or after the "
 "dpkg run for the I<unpack>, I<configure>, I<install>, I<triggers-only>, "
@@ -3484,31 +3466,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:551
+#: dpkg.1:537
 msgid "B<--path-exclude=>I<glob-pattern>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:553
+#: dpkg.1:539
 msgid "B<--path-include=>I<glob-pattern>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:556
+#: dpkg.1:542
 msgid ""
 "Set I<glob-pattern> as a path filter, either by excluding or re-including "
 "previously excluded paths matching the specified patterns during install."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:559
+#: dpkg.1:545
 msgid ""
 "I<Warning: take into account that depending on the excluded paths you might "
 "completely break your system, use with caution.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:569
+#: dpkg.1:555
 msgid ""
 "The glob patterns use the same wildcards used in the shell, were '*' matches "
 "any sequence of characters, including the empty string and also '/'. For "
@@ -3522,14 +3504,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:572
+#: dpkg.1:558
 msgid ""
 "This can be used to remove all paths except some particular ones; a typical "
 "case is:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:576
+#: dpkg.1:562
 #, no-wrap
 msgid ""
 "B<--path-exclude=/usr/share/doc/*>\n"
@@ -3537,12 +3519,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:579
+#: dpkg.1:565
 msgid "to remove all documentation files except the copyright files."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:583
+#: dpkg.1:569
 msgid ""
 "These two options can be specified multiple times, and interleaved with each "
 "other. Both are processed in the given order, with the last rule that "
@@ -3550,13 +3532,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:584
+#: dpkg.1:570
 #, no-wrap
 msgid "B<--status-fd >I<n>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:590
+#: dpkg.1:576
 msgid ""
 "Send machine-readable package status and progress information to file "
 "descriptor I<n>. This option can be specified multiple times. The "
@@ -3564,31 +3546,31 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:591
+#: dpkg.1:577
 #, no-wrap
 msgid "B<status: >I<package>B<: >I<status>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:594
+#: dpkg.1:580
 msgid "Package status changed; I<status> is as in the status file."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:594
+#: dpkg.1:580
 #, no-wrap
 msgid "B<status: >I<package>B< : error : >I<extended-error-message>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:598
+#: dpkg.1:584
 msgid ""
 "An error occurred. Any possible newlines in I<extended-error-message> will "
 "be converted to spaces before output."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:598
+#: dpkg.1:584
 #, no-wrap
 msgid ""
 "B<status: >I<file>B< : conffile-prompt : '>I<real-old>B<' '>I<real-new>B<' "
@@ -3596,18 +3578,18 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:601
+#: dpkg.1:587
 msgid "User is being asked a conffile question."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:601
+#: dpkg.1:587
 #, no-wrap
 msgid "B<processing: >I<stage>B<: >I<package>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:606
+#: dpkg.1:592
 msgid ""
 "Sent just before a processing stage starts. I<stage> is one of B<upgrade>, "
 "B<install> (both sent before unpacking), B<configure>, B<trigproc>, "
@@ -3615,13 +3597,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:607
+#: dpkg.1:593
 #, no-wrap
 msgid "B<--status-logger>=I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:612
+#: dpkg.1:598
 msgid ""
 "Send machine-readable package status and progress information to the shell "
 "I<command>'s standard input. This option can be specified multiple "
@@ -3629,44 +3611,43 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:613
+#: dpkg.1:599
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:625
+#: dpkg.1:611
 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."
+"I<state> I<pkg> I<installed-version>' for status change updates; `YYYY-MM-DD "
+"HH:MM:SS I<action> I<pkg> I<installed-version> I<available-version>' for "
+"actions where I<action> is one of B<install>, B<upgrade>, B<remove>, "
+"B<purge>; and `YYYY-MM-DD HH:MM:SS conffile I<filename> I<decision>' for "
+"conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:625
+#: dpkg.1:611
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:628
+#: dpkg.1:614
 msgid "Do not try to verify package signatures."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:628
+#: dpkg.1:614
 #, no-wrap
 msgid "B<--no-triggers>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:637
+#: dpkg.1:623
 msgid ""
 "Do not run any triggers in this run (activations will still be recorded).  "
 "If used with B<--configure> I<package> or B<--triggers-only> I<package> then "
@@ -3677,64 +3658,64 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:637
+#: dpkg.1:623
 #, no-wrap
 msgid "B<--triggers>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:640
+#: dpkg.1:626
 msgid "Cancels a previous B<--no-triggers>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:642 dpkg.cfg.5:16
+#: dpkg.1:628 dpkg.cfg.5:16
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:645
+#: dpkg.1:631
 msgid "Configuration file with default options."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:645
+#: dpkg.1:631
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:649
+#: dpkg.1:635
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:652
+#: dpkg.1:638
 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: TP
-#: dpkg.1:652
+#: dpkg.1:638
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:655
+#: dpkg.1:641
 msgid "List of available packages."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:655
+#: dpkg.1:641
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:661
+#: dpkg.1:647
 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, "
@@ -3742,266 +3723,266 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:650
 msgid ""
 "The status file is backed up daily in I</var/backups>. It can be useful if "
 "it's lost or corrupted due to filesystems troubles."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:653
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:667
+#: dpkg.1:653
 #, no-wrap
 msgid "I<control>"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:669
+#: dpkg.1:655
 #, no-wrap
 msgid "I<conffiles>"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:671
+#: dpkg.1:657
 #, no-wrap
 msgid "I<preinst>"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:673
+#: dpkg.1:659
 #, no-wrap
 msgid "I<postinst>"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:675
+#: dpkg.1:661
 #, no-wrap
 msgid "I<prerm>"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:677
+#: dpkg.1:663
 #, no-wrap
 msgid "I<postrm>"
 msgstr ""
 
 #. type: SH
-#: dpkg.1:680 dpkg-buildflags.1:110 dpkg-buildpackage.1:230 dpkg-deb.1:219 dpkg-divert.8:112 dpkg-query.1:196 dpkg-statoverride.8:69 dpkg-trigger.1:60 dpkg-vendor.1:42 dselect.1:430 update-alternatives.8:355
+#: dpkg.1:666 dpkg-buildflags.1:128 dpkg-buildpackage.1:230 dpkg-deb.1:232 dpkg-divert.8:112 dpkg-query.1:204 dpkg-statoverride.8:68 dpkg-trigger.1:60 dpkg-vendor.1:42 dselect.1:423 update-alternatives.8:354
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:681 dselect.1:431
+#: dpkg.1:667 dselect.1:424
 #, no-wrap
 msgid "B<HOME>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:671
 msgid ""
 "If set, B<dpkg> will use it as the directory from which to read the user "
 "specific configuration file."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:685 dpkg-deb.1:220
+#: dpkg.1:671 dpkg-deb.1:233
 #, no-wrap
 msgid "B<TMPDIR>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:689
+#: dpkg.1:675
 msgid ""
 "If set, B<dpkg> will use it as the directory in which to create temporary "
 "files and directories."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:689
+#: dpkg.1:675
 #, no-wrap
 msgid "B<PAGER>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:692
+#: dpkg.1:678
 msgid "The program B<dpkg> will execute when displaying the conffiles."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:692
+#: dpkg.1:678
 #, no-wrap
 msgid "B<SHELL>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:695
+#: dpkg.1:681
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:695 dpkg-query.1:201
+#: dpkg.1:681 dpkg-query.1:209
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:699
+#: dpkg.1:685
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:699
+#: dpkg.1:685
 #, no-wrap
 msgid "B<DPKG_SHELL_REASON>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:689
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Current valid value: B<conffile-prompt>."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:703
+#: dpkg.1:689
 #, no-wrap
 msgid "B<DPKG_CONFFILE_OLD>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:707
+#: dpkg.1:693
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the old conffile."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:707
+#: dpkg.1:693
 #, no-wrap
 msgid "B<DPKG_CONFFILE_NEW>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:711
+#: dpkg.1:697
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the new conffile."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:711
+#: dpkg.1:697
 #, no-wrap
 msgid "B<DPKG_RUNNING_VERSION>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:715
+#: dpkg.1:701
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the version of "
 "the currently running B<dpkg> instance."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:715 dpkg-divert.8:117
+#: dpkg.1:701 dpkg-divert.8:117
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:719
+#: dpkg.1:705
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the package name "
 "being handled."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:719
+#: dpkg.1:705
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_ARCH>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:709
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the architecture "
 "the package got built for."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:723
+#: dpkg.1:709
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_NAME>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:727
+#: dpkg.1:713
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the name of the "
 "script running (preinst, postinst, prerm, postrm)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:730
+#: dpkg.1:716
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:732
+#: dpkg.1:718
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:735
+#: dpkg.1:721
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:737
+#: dpkg.1:723
 #, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:740
+#: dpkg.1:726
 msgid "To search the listing of packages yourself:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:742
+#: dpkg.1:728
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:745
+#: dpkg.1:731
 msgid "To remove an installed elvis package:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:747
+#: dpkg.1:733
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:752
+#: dpkg.1:738
 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: Plain text
-#: dpkg.1:755
+#: dpkg.1:741
 #, no-wrap
 msgid ""
 "     B<cd /media/cdrom/pool/main/v/vim>\n"
@@ -4009,23 +3990,23 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:758
+#: dpkg.1:744
 msgid "To make a local copy of the package selection states:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:760
+#: dpkg.1:746
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:764
+#: dpkg.1:750
 msgid "You might transfer this file to another computer, and install it there with:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:767
+#: dpkg.1:753
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -4033,7 +4014,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:773
+#: dpkg.1:759
 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 "
@@ -4042,39 +4023,39 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:776
+#: dpkg.1:762
 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:778
+#: dpkg.1:764
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:781
+#: dpkg.1:767
 msgid ""
 "Additional functionality can be gained by installing any of the following "
 "packages: B<apt>, B<aptitude> and B<debsums>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:793
+#: dpkg.1:779
 msgid ""
 "B<aptitude>(1), B<apt>(1), 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.1:796
+#: dpkg.1:782
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:799 dpkg.cfg.5:22
+#: dpkg.1:785 dpkg.cfg.5:22
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
 "contributed to B<dpkg>."
@@ -4086,38 +4067,32 @@
 msgid "dpkg-architecture"
 msgstr ""
 
-#. type: TH
-#: dpkg-architecture.1:1
-#, no-wrap
-msgid "2009-08-15"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-architecture.1:4
 msgid "dpkg-architecture - set and determine the architecture for package building"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:9
-msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
+#: dpkg-architecture.1:8
+msgid "B<dpkg-architecture> [I<option>...] [I<command>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg-architecture.1:13
 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:16
 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:25
 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 "
@@ -4129,32 +4104,32 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:27 dpkg-buildflags.1:34 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24 dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35 update-alternatives.8:203
+#: dpkg-architecture.1:26 dpkg-buildflags.1:45 dpkg-deb.1:27 dpkg-divert.8:24 dpkg-query.1:13 dpkg-source.1:18 dpkg-split.1:31 dpkg-statoverride.8:23 dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:34 update-alternatives.8:202
 #, no-wrap
 msgid "COMMANDS"
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:28
+#: dpkg-architecture.1:27
 #, no-wrap
 msgid "B<-l>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 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:31
 #, no-wrap
 msgid "B<-e>I<debian-architecture>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 msgid ""
 "Check for equality of architecture. By default I<debian-architecture> is "
 "compared against the current Debian architecture, being the host.  This "
@@ -4163,13 +4138,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 #, no-wrap
 msgid "B<-i>I<architecture-wildcard>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 msgid ""
 "Check for identity of architecture by expanding I<architecture-wildcard> as "
 "an architecture wildcard and comparing against the current Debian "
@@ -4178,104 +4153,104 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 #, no-wrap
 msgid "B<-q>I<variable-name>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 msgid "Print the value of a single variable."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 #, no-wrap
 msgid "B<-s>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 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:50
 #, no-wrap
 msgid "B<-u>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 #, no-wrap
 msgid "B<-c>I< command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 msgid ""
 "Execute a I<command> in an environment which has all variables set to the "
 "determined value."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 #, no-wrap
 msgid "B<-L>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:61
+#: dpkg-architecture.1:60
 msgid "Print a list of valid architecture names."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildflags.1:74 dpkg-buildpackage.1:226 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124 dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60 dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:93 dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 update-alternatives.8:320
+#: dpkg-architecture.1:63 dpkg-buildflags.1:92 dpkg-buildpackage.1:226 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:175 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124 dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-name.1:61 dpkg-parsechangelog.1:36 dpkg-query.1:113 dpkg-scanpackages.1:99 dpkg-scansources.1:68 dpkg-shlibdeps.1:218 dpkg-source.1:99 dpkg-split.1:129 dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31 update-alternatives.8:319
 msgid "Show the usage message and exit."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildflags.1:77 dpkg-buildpackage.1:229 dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169 dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127 dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63 dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103 dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:96 dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34 update-alternatives.8:323
+#: dpkg-architecture.1:66 dpkg-buildflags.1:95 dpkg-buildpackage.1:229 dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:178 dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127 dpkg-gensymbols.1:449 dpkg-mergechangelogs.1:44 dpkg-name.1:64 dpkg-parsechangelog.1:39 dpkg-query.1:116 dpkg-scanpackages.1:102 dpkg-scansources.1:70 dpkg-shlibdeps.1:221 dpkg-source.1:102 dpkg-split.1:132 dpkg-statoverride.8:50 dpkg-trigger.1:37 dpkg-vendor.1:34 update-alternatives.8:322
 msgid "Show the version and exit."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:69
+#: dpkg-architecture.1:68
 #, no-wrap
 msgid "B<-a>I<debian-architecture>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:72
+#: dpkg-architecture.1:71
 msgid "Set the Debian architecture."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:72 dpkg-buildpackage.1:110
+#: dpkg-architecture.1:71 dpkg-buildpackage.1:110
 #, no-wrap
 msgid "B<-t>I<gnu-system-type>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 msgid "Set the GNU system type."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 #, no-wrap
 msgid "B<-f>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:82
+#: dpkg-architecture.1:81
 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 "
@@ -4285,54 +4260,54 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:83
+#: dpkg-architecture.1:82
 #, no-wrap
 msgid "TERMS"
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:84
+#: dpkg-architecture.1:83
 #, no-wrap
 msgid "build machine"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 msgid "The machine the package is built on."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 #, no-wrap
 msgid "host machine"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 msgid "The machine the package is built for."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 #, no-wrap
 msgid "Debian architecture"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 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:90
 #, no-wrap
 msgid "architecture wildcard"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 msgid ""
 "An architecture wildcard is a special architecture string that will match "
 "any real architecture being part of it. The general form is "
@@ -4340,13 +4315,13 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 #, no-wrap
 msgid "\\s-1GNU\\s0 system type"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:99
+#: dpkg-architecture.1:98
 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, "
@@ -4354,226 +4329,226 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:100
+#: dpkg-architecture.1:99
 #, no-wrap
 msgid "VARIABLES"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 msgid "The Debian architecture of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:106
+#: dpkg-architecture.1:105
 msgid "The Debian system name of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:106
+#: dpkg-architecture.1:105
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 msgid "The Debian cpu name of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 msgid "The pointer size of the build machine (in bits)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 msgid "The endianness of the build machine (little / big)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 #, no-wrap
 msgid "\\s-1DEB_BUILD_MULTIARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 msgid ""
 "The clarified \\s-1GNU\\s0 system type of the build machine, used for "
 "filesystem paths."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 msgid "The Debian architecture of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 msgid "The Debian system name of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 msgid "The Debian cpu name of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_BITS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 msgid "The pointer size of the host machine (in bits)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_ENDIAN\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 msgid "The endianness of the host machine (little / big)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 #, no-wrap
 msgid "\\s-1DEB_HOST_MULTIARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:140
+#: dpkg-architecture.1:139
 msgid ""
 "The clarified \\s-1GNU\\s0 system type of the host machine, used for "
 "filesystem paths."
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:141
+#: dpkg-architecture.1:140
 #, no-wrap
 msgid "DEBIAN/RULES"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:149
+#: dpkg-architecture.1:148
 msgid ""
 "The environment variables set by B<dpkg-architecture> are passed to "
 "I<debian/rules> as make variables (see make documentation). However, you "
@@ -4584,12 +4559,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:152 dpkg-architecture.1:169
+#: dpkg-architecture.1:151 dpkg-architecture.1:168
 msgid "Instead of:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:156
+#: dpkg-architecture.1:155
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -4597,12 +4572,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:159
+#: dpkg-architecture.1:158
 msgid "please use the following:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:163
+#: dpkg-architecture.1:162
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture "
@@ -4612,7 +4587,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:165
+#: dpkg-architecture.1:164
 #, no-wrap
 msgid ""
 "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) "
@@ -4620,7 +4595,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:175
+#: dpkg-architecture.1:174
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -4630,18 +4605,18 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:178
+#: dpkg-architecture.1:177
 msgid "please use:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:181
+#: dpkg-architecture.1:180
 #, no-wrap
 msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:185
+#: dpkg-architecture.1:184
 #, no-wrap
 msgid ""
 "ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
@@ -4650,14 +4625,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:189
+#: dpkg-architecture.1:188
 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:194
+#: dpkg-architecture.1:193
 msgid ""
 "In general, calling dpkg in the rules file to get architecture information "
 "is deprecated (unless you want to provide backward compatibility, see "
@@ -4666,13 +4641,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:195
+#: dpkg-architecture.1:194
 #, no-wrap
 msgid "BACKWARD COMPATIBILITY"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:199
+#: dpkg-architecture.1:198
 msgid ""
 "The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced in "
 "dpkg-dev 1.15.4. Using them in I<debian/rules> thus requires a "
@@ -4680,7 +4655,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:204
+#: dpkg-architecture.1:203
 msgid ""
 "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in "
 "dpkg-dev 1.13.2. Before this I<debian/rules> files tended to check the "
@@ -4689,7 +4664,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:209
+#: dpkg-architecture.1:208
 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 "
@@ -4698,7 +4673,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:213
+#: dpkg-architecture.1:212
 #, no-wrap
 msgid ""
 "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU "
@@ -4708,7 +4683,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:227
+#: dpkg-architecture.1:226
 #, no-wrap
 msgid ""
 "# Take account of old dpkg-architecture output.\n"
@@ -4728,19 +4703,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:230
+#: dpkg-architecture.1:229
 msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:233
+#: dpkg-architecture.1:232
 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:243
+#: dpkg-architecture.1:242
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
@@ -4755,7 +4730,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:248
+#: dpkg-architecture.1:247
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
@@ -4765,14 +4740,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:252
+#: dpkg-architecture.1:251
 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:259
+#: dpkg-architecture.1:258
 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 "
@@ -4783,111 +4758,111 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:262
+#: dpkg-architecture.1:261
 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:266
+#: dpkg-architecture.1:265
 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:268
+#: dpkg-architecture.1:267
 msgid "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:270
+#: dpkg-architecture.1:269
 msgid "eval \\`dpkg-architecture -u\\`"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:273
+#: dpkg-architecture.1:272
 msgid ""
 "Check if an architecture is equal to the current architecture or a given "
 "one:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:275
+#: dpkg-architecture.1:274
 msgid "dpkg-architecture -elinux-alpha"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:277
+#: dpkg-architecture.1:276
 msgid "dpkg-architecture -amips -elinux-mips"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:280
+#: dpkg-architecture.1:279
 msgid ""
 "Check if the current architecture or an architecture provided with -a are "
 "Linux systems:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:282
+#: dpkg-architecture.1:281
 msgid "dpkg-architecture -ilinux-any"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:284
+#: dpkg-architecture.1:283
 msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 msgid ""
 "All these files have to be present for B<dpkg-architecture> to work. Their "
 "location can be overridden at runtime with the environment variable "
-"DPKG_DATADIR."
+"B<DPKG_DATADIR>."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 #, no-wrap
 msgid "I</usr/share/dpkg/cputable>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 msgid "Table of known CPU names and mapping to their GNU name."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 #, no-wrap
 msgid "I</usr/share/dpkg/ostable>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 msgid "Table of known operating system names and mapping to their GNU name."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 #, no-wrap
 msgid "I</usr/share/dpkg/triplettable>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:299
+#: dpkg-architecture.1:298
 msgid "Mapping between Debian architecture triplets and Debian architecture names."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:303
+#: dpkg-architecture.1:302
 msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:308
+#: dpkg-architecture.1:307
 msgid ""
 "B<dpkg-architecture> and this man page were initially written by Marcus "
 "Brinkmann E<lt>brinkmd@debian.orgE<gt>."
@@ -4900,7 +4875,7 @@
 msgstr ""
 
 #. type: TH
-#: dpkg.cfg.5:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1
 #, no-wrap
 msgid "2009-09-05"
 msgstr ""
@@ -4931,7 +4906,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:214 dpkg-statoverride.8:87
+#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:222 dpkg-statoverride.8:86
 msgid "B<dpkg>(1)."
 msgstr ""
 
@@ -4941,6 +4916,12 @@
 msgid "dpkg-buildflags"
 msgstr ""
 
+#. type: TH
+#: dpkg-buildflags.1:1
+#, no-wrap
+msgid "2011-09-13"
+msgstr ""
+
 #. type: Plain text
 #: dpkg-buildflags.1:4
 msgid "dpkg-buildflags - returns build flags to use during package build"
@@ -4948,7 +4929,7 @@
 
 #. type: Plain text
 #: dpkg-buildflags.1:8
-msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgid "B<dpkg-buildflags> [I<option>...] [I<command>]"
 msgstr ""
 
 #. type: Plain text
@@ -4996,96 +4977,152 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:22
-msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+#: dpkg-buildflags.1:23
+msgid ""
+"temporarily by the user with environment variables (see section "
+"B<ENVIRONMENT>);"
 msgstr ""
 
-#. type: Plain text
-#: dpkg-buildflags.1:24
-msgid "The configuration files can contain two types of directives:"
+#. type: IP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "4."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid ""
+"dynamically by the package maintainer with environment variables set via "
+"B<debian/rules> (see section B<ENVIRONMENT>)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:28
+msgid "The configuration files can contain two types of directives:"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 #, no-wrap
 msgid "B<SET>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
 msgid "Override the flag named I<flag> to have the value I<value>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
+#, no-wrap
+msgid "B<STRIP>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:34
+msgid "Strip from the flag named I<flag> all the build flags listed in I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
 #, no-wrap
 msgid "B<APPEND>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:31
+#: dpkg-buildflags.1:38
 msgid ""
-"Extend the flag named I<flag> with the options given in I<value>.  A space "
-"is prepended to the appended value if the flag's current value is non-empty."
+"Extend the flag named I<flag> by appending the options given in I<value>.  A "
+"space is prepended to the appended value if the flag's current value is "
+"non-empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:38
+#, no-wrap
+msgid "B<PREPEND>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:34
+#: dpkg-buildflags.1:42
+msgid ""
+"Extend the flag named I<flag> by prepending the options given in I<value>.  "
+"A space is appended to the prepended value if the flag's current value is "
+"non-empty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:45
 msgid ""
 "The configuration files can contain comments on lines starting with a hash "
 "(#). Empty lines are also ignored."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:35
+#: dpkg-buildflags.1:46
+#, no-wrap
+msgid "B<--dump>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:51
+msgid ""
+"Print to standard output all compilation flags and their values. It prints "
+"one flag per line separated from its value by an equal sign "
+"(\"I<flag>=I<value>\"). This is the default action."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:51
 #, no-wrap
 msgid "B<--list>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 msgid ""
 "Print the list of flags supported by the current vendor (one per line). See "
 "the B<SUPPORTED FLAGS> section for more information about them."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 #, no-wrap
 msgid "B<--export=>I<format>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 msgid ""
 "Print to standard output shell (if I<format> is B<sh>) or make (if I<format> "
 "is B<make>) commands that can be used to export all the compilation flags in "
-"the environment. If the I<format> value is not given, B<sh> is assumed. Only "
-"compilation flags starting with an upper case character are included, others "
-"are assumed to not be suitable for the environment."
+"the environment. If I<format> is B<configure> then the output can be used on "
+"a B<./configure> command-line. If the I<format> value is not given, B<sh> is "
+"assumed. Only compilation flags starting with an upper case character are "
+"included, others are assumed to not be suitable for the environment."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 #, no-wrap
 msgid "B<--get>I< flag>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 msgid ""
 "Print the value of the flag on standard output. Exits with 0 if the flag is "
 "known otherwise exits with 1."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 #, no-wrap
 msgid "B<--origin>I< flag>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:57
+#: dpkg-buildflags.1:75
 msgid ""
 "Print the origin of the value that is returned by B<--get>. Exits with 0 if "
 "the flag is known otherwise exits with 1. The origin can be one of the "
@@ -5093,63 +5130,63 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:58
+#: dpkg-buildflags.1:76
 #, no-wrap
 msgid "B<vendor>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 msgid "the original flag set by the vendor is returned;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 #, no-wrap
 msgid "B<system>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 msgid "the flag is set/modified by a system-wide configuration;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 #, no-wrap
 msgid "B<user>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 msgid "the flag is set/modified by a user-specific configuration;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 #, no-wrap
 msgid "B<env>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:70
+#: dpkg-buildflags.1:88
 msgid "the flag is set/modified by an environment-specific configuration."
 msgstr ""
 
 #. type: SH
-#: dpkg-buildflags.1:78
+#: dpkg-buildflags.1:96
 #, no-wrap
 msgid "SUPPORTED FLAGS"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:79
+#: dpkg-buildflags.1:97
 #, no-wrap
 msgid "B<CFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 msgid ""
 "Options for the C compiler. The default value set by the vendor includes "
 "I<-g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
@@ -5157,46 +5194,46 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 #, no-wrap
 msgid "B<CPPFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 msgid "Options for the C preprocessor. Default value: empty."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 #, no-wrap
 msgid "B<CXXFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 msgid "Options for the C++ compiler. Same as B<CFLAGS>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 #, no-wrap
 msgid "B<FFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 #, no-wrap
 msgid "B<LDFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:102
+#: dpkg-buildflags.1:120
 msgid ""
 "Options passed to the compiler when linking executables or shared objects "
 "(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
@@ -5204,18 +5241,18 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:104
+#: dpkg-buildflags.1:122
 #, no-wrap
 msgid "B</etc/dpkg/buildflags.conf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 msgid "System wide configuration file."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 #, no-wrap
 msgid ""
 "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or "
@@ -5223,37 +5260,297 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:110
+#: dpkg-buildflags.1:128
 msgid "User configuration file."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-buildflags.1:135
+msgid ""
+"There are 2 sets of environment variables doing the same operations, the "
+"first one (DEB_I<flag>_I<op>) should never be used within "
+"B<debian/rules>. It's meant for any user that wants to rebuild the source "
+"package with different build flags. The second set (DEB_I<flag>_MAINT_I<op>) "
+"should only be used in B<debian/rules> by package maintainers to change the "
+"resulting build flags."
+msgstr ""
+
 #. type: TP
-#: dpkg-buildflags.1:111
+#: dpkg-buildflags.1:135
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_SET>"
 msgstr ""
 
+#. type: TQ
+#: dpkg-buildflags.1:137
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_SET>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
 msgid "This variable can be used to force the value returned for the given I<flag>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_STRIP>"
+msgstr ""
+
+#. type: TQ
+#: dpkg-buildflags.1:143
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_STRIP>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:148
+msgid ""
+"This variable can be used to provide a space separated list of options that "
+"will be stripped from the set of flags returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:148
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_APPEND>"
 msgstr ""
 
+#. type: TQ
+#: dpkg-buildflags.1:150
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_APPEND>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:119
+#: dpkg-buildflags.1:154
 msgid ""
 "This variable can be used to append supplementary options to the value "
 "returned for the given I<flag>."
 msgstr ""
 
+#. type: TP
+#: dpkg-buildflags.1:154
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_PREPEND>"
+msgstr ""
+
+#. type: TQ
+#: dpkg-buildflags.1:156
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_PREPEND>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:122 dpkg-maintscript-helper.1:130
-msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+#: dpkg-buildflags.1:160
+msgid ""
+"This variable can be used to prepend supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:160
+#, no-wrap
+msgid "B<DEB_BUILD_MAINT_OPTIONS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:165
+msgid ""
+"This variable can be used to disable/enable various hardening build flags "
+"through the B<hardening> option. See the B<HARDENING> section for details."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:166
+#, no-wrap
+msgid "HARDENING"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:171
+msgid ""
+"Several compile-time options (detailed below) can be used to help harden a "
+"resulting binary against memory corruption attacks, or provide additional "
+"warning messages during compilation. Except as noted below, these are "
+"enabled by default for architectures that support them."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:177
+msgid ""
+"Each hardening feature can be enabled and disabled in the "
+"B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value with "
+"the \"+\" and \"-\" modifier. For example, to enable the \"pie\" feature and "
+"disable the \"fortify\" feature you can do this in B<debian/rules>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:179
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=\"hardening=+pie,-fortify\"\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:183
+msgid ""
+"The special feature B<all> can be used to enable or disable all hardening "
+"features at the same time. Thus disabling everything and enabling only "
+"\"format\" and \"fortify\" can be achieved with:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:185
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=\"hardening=-all,+format,+fortify\"\n"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:186
+#, no-wrap
+msgid "B<format>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:198
+msgid ""
+"This setting (enabled by default) adds B<-Wformat -Wformat-security "
+"-Werror=format-security> to B<CFLAGS> and B<CXXFLAGS>. This will warn about "
+"improper format string uses, and will fail when format functions are used in "
+"a way that that represent possible security problems. At present, this warns "
+"about calls to B<printf> and B<scanf> functions where the format string is "
+"not a string literal and there are no format arguments, as in "
+"B<printf(foo);> instead of B<printf(\"%s\", foo);> This may be a security "
+"hole if the format string came from untrusted input and contains \"%n\"."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:199
+#, no-wrap
+msgid "B<fortify>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:210
+msgid ""
+"This setting (enabled by default) adds B<-D_FORTIFY_SOURCE=2> to B<CFLAGS> "
+"and B<CXXFLAGS>. During code generation the compiler knows a great deal of "
+"information about buffer sizes (where possible), and attempts to replace "
+"insecure unlimited length buffer function calls with length-limited "
+"ones. This is especially useful for old, crufty code.  Additionally, format "
+"strings in writable memory that contain '%n' are blocked. If an application "
+"depends on such a format string, it will need to be worked around."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:213
+msgid ""
+"Note that for this option to have any effect, the source must also be "
+"compiled with B<-O1> or higher."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:213
+#, no-wrap
+msgid "B<stackprotector>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:222
+msgid ""
+"This setting (enabled by default) adds B<-fstack-protector "
+"--param=ssp-buffer-size=4> to B<CFLAGS> and B<CXXFLAGS>. This adds safety "
+"checks against stack overwrites. This renders many potential code injection "
+"attacks into aborting situations. In the best case this turns code injection "
+"vulnerabilities into denial of service or into non-issues (depending on the "
+"application)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:226
+msgid ""
+"This feature requires linking against glibc (or another provider of "
+"B<__stack_chk_fail>), so needs to be disabled when building with "
+"B<-nostdlib> or B<-ffreestanding> or similar."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:227
+#, no-wrap
+msgid "B<relro>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:235
+msgid ""
+"This setting (enabled by default) adds B<-Wl,-z,relro> to B<LDFLAGS>.  "
+"During program load, several ELF memory sections need to be written to by "
+"the linker. This flags the loader to turn these sections read-only before "
+"turning over control to the program. Most notably this prevents GOT "
+"overwrite attacks."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:236
+#, no-wrap
+msgid "B<bindnow>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:243
+msgid ""
+"This setting (disabled by default) adds B<-Wl,-z,now> to B<LDFLAGS>. During "
+"program load, all dynamic symbols are resolved, allowing for the entire PLT "
+"to be marked read-only (due to B<relro> above)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:244
+#, no-wrap
+msgid "B<pie>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:256
+msgid ""
+"This setting (disabled by default) adds B<-fPIE> to B<CFLAGS> and "
+"B<CXXFLAGS>, and B<-fPIE -pie> to B<LDFLAGS>. Position Independent "
+"Executable are needed to take advantage of Address Space Layout "
+"Randomization, supported by some kernel versions. While ASLR can already be "
+"enforced for data areas in the stack and heap (brk and mmap), the code areas "
+"must be compiled as position-independent. Shared libraries already do this "
+"(-fPIC), so they gain ASLR automatically, but binary .text regions need to "
+"be build PIE to gain ASLR. When this happens, ROP (Return Oriented "
+"Programming) attacks are much harder since there are no static locations to "
+"bounce off of during a memory corruption attack."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:259
+msgid ""
+"This is not compatible with B<-fPIC> so care must be taken when building "
+"shared objects."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:265
+msgid ""
+"Additionally, since PIE is implemented via a general register, some "
+"architectures (most notably i386) can see performance losses of up to 15% in "
+"very text-segment-heavy application workloads; most workloads see less than "
+"1%. Architectures with more general registers (e.g. amd64)  do not see as "
+"high a worst-case penalty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:268
+msgid "Copyright \\(co 2010-2011 Rapha\\[:e]l Hertzog"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:270
+msgid "Copyright \\(co 2011 Kees Cook"
 msgstr ""
 
 #. type: TH
@@ -5269,7 +5566,7 @@
 
 #. type: Plain text
 #: dpkg-buildpackage.1:8
-msgid "B<dpkg-buildpackage> [I<options>]"
+msgid "B<dpkg-buildpackage> [I<option>...]"
 msgstr ""
 
 #. type: Plain text
@@ -5520,7 +5817,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildpackage.1:96 dpkg-genchanges.1:49 dpkg-gencontrol.1:38 dpkg-gensymbols.1:372
+#: dpkg-buildpackage.1:96 dpkg-genchanges.1:49 dpkg-gencontrol.1:38 dpkg-gensymbols.1:377
 #, no-wrap
 msgid "B<-v>I<version>"
 msgstr ""
@@ -5602,7 +5899,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:427
+#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:432
 #, no-wrap
 msgid "B<-d>"
 msgstr ""
@@ -5781,14 +6078,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:116 dpkg-shlibdeps.1:217 dpkg-trigger.1:43
+#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:122 dpkg-shlibdeps.1:215 dpkg-trigger.1:43
 msgid ""
 "Change the location of the B<dpkg> database. The default location is "
 "I</var/lib/dpkg>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildpackage.1:223 dpkg-checkbuilddeps.1:33 dpkg-distaddfile.1:32 dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121 dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33 dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217 dpkg-source.1:90 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-buildpackage.1:223 dpkg-checkbuilddeps.1:33 dpkg-distaddfile.1:32 dpkg-deb.1:172 dpkg-genchanges.1:131 dpkg-gencontrol.1:121 dpkg-gensymbols.1:443 dpkg-name.1:58 dpkg-parsechangelog.1:33 dpkg-query.1:110 dpkg-scanpackages.1:96 dpkg-shlibdeps.1:215 dpkg-source.1:96 dpkg-split.1:126 dpkg-trigger.1:31
 #, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr ""
@@ -5796,7 +6093,7 @@
 #. type: Plain text
 #: dpkg-buildpackage.1:234
 msgid ""
-"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"Even if B<dpkg-buildpackage> exports some variables, B<debian/rules> should "
 "not rely on their presence and should instead use the respective interface "
 "to retrieve the needed values."
 msgstr ""
@@ -5818,15 +6115,15 @@
 #. type: SS
 #: dpkg-buildpackage.1:238
 #, no-wrap
-msgid "Compiler flags"
+msgid "Compiler flags are no longer exported"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-buildpackage.1:243
 msgid ""
-"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
-"environment variables are set to the values that B<dpkg-buildflags> "
-"returned. See its manual page for more information."
+"Between versions 1.14.17 and 1.16.1, B<dpkg-buildpackage> exported compiler "
+"flags (B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS>) with "
+"values as returned by B<dpkg-buildflags>. This is no longer the case."
 msgstr ""
 
 #. type: Plain text
@@ -5837,14 +6134,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildpackage.1:255
+#: dpkg-buildpackage.1:256
 msgid ""
-"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
-"B<fakeroot>(1), B<gpg>(1)."
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), "
+"B<dpkg-genchanges>(1), B<fakeroot>(1), B<gpg>(1)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildpackage.1:264 dpkg-source.1:712
+#: dpkg-buildpackage.1:265
 msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
 msgstr ""
 
@@ -5854,12 +6151,6 @@
 msgid "dpkg-checkbuilddeps"
 msgstr ""
 
-#. type: TH
-#: dpkg-checkbuilddeps.1:1
-#, no-wrap
-msgid "2009-11-21"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:4
 msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
@@ -5867,7 +6158,7 @@
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:9
-msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgid "B<dpkg-checkbuilddeps> [I<option>...] [I<control-file>]"
 msgstr ""
 
 #. type: Plain text
@@ -5881,7 +6172,7 @@
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:17
 msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
+"By default, B<debian/control> is read, but an alternate control filename may "
 "be specified on the command line."
 msgstr ""
 
@@ -5929,7 +6220,7 @@
 
 #. type: Plain text
 #: dpkg-distaddfile.1:8
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+msgid "B<dpkg-distaddfile> [I<option>...]I< filename section priority>"
 msgstr ""
 
 #. type: Plain text
@@ -5985,34 +6276,28 @@
 msgid "dpkg-deb"
 msgstr ""
 
-#. type: TH
-#: dpkg-deb.1:1 dpkg-query.1:1 dselect.1:1
-#, no-wrap
-msgid "2010-03-07"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-deb.1:4
 msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:9
-msgid "B<dpkg-deb> [I<options>] I<command>"
+#: dpkg-deb.1:8
+msgid "B<dpkg-deb> [I<option>...] I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:13
+#: dpkg-deb.1:12
 msgid "B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:17
+#: dpkg-deb.1:16
 msgid "Use B<dpkg> to install and remove packages from your system."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:27
+#: dpkg-deb.1:26
 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> "
@@ -6020,13 +6305,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:29
+#: dpkg-deb.1:28
 #, no-wrap
 msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:41
+#: dpkg-deb.1:40
 msgid ""
 "Creates a debian archive from the filesystem tree stored in "
 "I<directory>. I<directory> must have a B<DEBIAN> subdirectory, which "
@@ -6037,7 +6322,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-deb.1:52
 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 "
@@ -6047,19 +6332,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:60
+#: dpkg-deb.1:59
 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-deb.1:62
+#: dpkg-deb.1:61
 msgid "If the archive to be created already exists it will be overwritten."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 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 "
@@ -6070,25 +6355,25 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 #, no-wrap
 msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:81
+#: dpkg-deb.1:80
 msgid "Provides information about a binary package archive."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:86
+#: dpkg-deb.1:85
 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-deb.1:94
+#: dpkg-deb.1:93
 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 "
@@ -6097,13 +6382,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 #, no-wrap
 msgid "B<-W>, B<--show> I<archive>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 msgid ""
 "Provides information about a binary package archive in the format specified "
 "by the B<--showformat> argument. The default format displays the package's "
@@ -6111,25 +6396,25 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 #, no-wrap
 msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:104
+#: dpkg-deb.1:103
 msgid "Extracts control file information from a binary package archive."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:108
+#: dpkg-deb.1:107
 msgid ""
 "If no B<control-file-field>s are specified then it will print the whole "
 "control file."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:117
+#: dpkg-deb.1:116
 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 "
@@ -6138,18 +6423,18 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 msgid "No errors are reported for fields requested but not found."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 #, no-wrap
 msgid "B<-c>, B<--contents> I<archive>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 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 "
@@ -6157,99 +6442,114 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 #, no-wrap
 msgid "B<-x>, B<--extract> I<archive directory>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:129
+#: dpkg-deb.1:128
 msgid ""
 "Extracts the filesystem tree from a package archive into the specified "
 "directory."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:135
+#: dpkg-deb.1:134
 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-deb.1:139
+#: dpkg-deb.1:138
 msgid ""
 "I<directory> (but not its parents) will be created if necessary, and its "
 "permissions modified to match the contents of the package."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:139
+#: dpkg-deb.1:138
 #, no-wrap
 msgid "B<-X>, B<--vextract> I<archive directory>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:144
+#: dpkg-deb.1:145
 msgid ""
-"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
-"it goes."
+"Is like B<--extract> (B<-x>)  with B<--verbose> (B<-v>)  which prints a "
+"listing of the files extracted as it goes."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:144
+#: dpkg-deb.1:145
 #, no-wrap
-msgid "B<--fsys-tarfile> I<archive>"
+msgid "B<-R>, B<--raw-extract> I<archive directory>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-deb.1:150
+msgid ""
+"Extracts the filesystem tree from a package archive into a specified "
+"directory, and the control information files into a DEBIAN subdirectory of "
+"the specified directory."
 msgstr ""
 
 #. type: Plain text
+#: dpkg-deb.1:152 dpkg-deb.1:172
+msgid "The target directory (but not its parents) will be created if necessary."
+msgstr ""
+
+#. type: TP
 #: dpkg-deb.1:152
+#, no-wrap
+msgid "B<--fsys-tarfile> I<archive>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-deb.1:161
 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."
+"to extract a particular file from a package archive.  The input archive will "
+"always be processed sequentially."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
 #, no-wrap
 msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:156
+#: dpkg-deb.1:165
 msgid ""
 "Extracts the control information files from a package archive into the "
 "specified directory."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:160
+#: dpkg-deb.1:169
 msgid ""
 "If no directory is specified then a subdirectory B<DEBIAN> in the current "
 "directory is used."
 msgstr ""
 
-#. type: Plain text
-#: dpkg-deb.1:163
-msgid "The target directory (but not its parents) will be created if necessary."
-msgstr ""
-
 #. type: TP
-#: dpkg-deb.1:171
+#: dpkg-deb.1:180
 #, no-wrap
 msgid "B<--showformat=>I<format>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:176 dpkg-query.1:121
+#: dpkg-deb.1:185 dpkg-query.1:127
 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."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:185
+#: dpkg-deb.1:194
 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 "
@@ -6259,31 +6559,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:187
+#: dpkg-deb.1:196
 msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:187
+#: dpkg-deb.1:196
 #, no-wrap
-msgid "B<-z>I<compress_level>"
+msgid "B<-z>I<compress-level>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:191
+#: dpkg-deb.1:200
 msgid ""
-"Specify which compression level to pass to the compressor backend program, "
-"when building a package."
+"Specify which compression level to use on the compressor backend, when "
+"building a package (default is 9 for gzip and bzip2, 6 for xz and lzma)."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:191
+#: dpkg-deb.1:200
 #, no-wrap
-msgid "B<-Z>I<compress_type>"
+msgid "B<-Z>I<compress-type>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 msgid ""
 "Specify which compression type to use when building a package. Allowed "
 "values are I<gzip>, I<xz>, I<bzip2>, I<lzma>, and I<none> (default is "
@@ -6291,24 +6591,24 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 #, no-wrap
 msgid "B<--new>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 msgid "Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 #, no-wrap
 msgid "B<--old>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:209
+#: dpkg-deb.1:218
 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 "
@@ -6316,38 +6616,57 @@
 "0.93.76 (September 1995), which was released as i386 a.out only."
 msgstr ""
 
+#. type: TP
+#: dpkg-deb.1:218
+#, no-wrap
+msgid "B<--nocheck>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224
 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:215
+#: dpkg-deb.1:224 start-stop-daemon.8:255
+#, no-wrap
+msgid "B<-v>, B<--verbose>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-deb.1:228
+msgid ""
+"Enables verbose output. This currently only affects B<--extract> making it "
+"behave like B<--vextract>."
+msgstr ""
+
+#. type: TP
+#: dpkg-deb.1:228
 #, no-wrap
 msgid "B<-D>, B<--debug>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:218
+#: dpkg-deb.1:231
 msgid "Enables debugging output. This is not very interesting."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:224
+#: dpkg-deb.1:237
 msgid ""
 "If set, B<dpkg-deb> will use it as the directory in which to create "
 "temporary files and directories."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:230
+#: dpkg-deb.1:243
 msgid "B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:238
+#: dpkg-deb.1:251
 msgid ""
 "There is no authentication on B<.deb> files; in fact, there isn't even a "
 "straightforward checksum.  (Higher level tools like APT support "
@@ -6358,7 +6677,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:245
+#: dpkg-deb.1:258
 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 "
@@ -6366,7 +6685,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:251
+#: dpkg-deb.1:264
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr ""
 
@@ -6376,12 +6695,6 @@
 msgid "dpkg-divert"
 msgstr ""
 
-#. type: TH
-#: dpkg-divert.8:1
-#, no-wrap
-msgid "2010-10-12"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-divert.8:4
 msgid "dpkg-divert - override a package's version of a file"
@@ -6389,7 +6702,7 @@
 
 #. type: Plain text
 #: dpkg-divert.8:9
-msgid "B<dpkg-divert> [I<options>] I<command>"
+msgid "B<dpkg-divert> [I<option>...] I<command>"
 msgstr ""
 
 #. type: Plain text
@@ -6423,7 +6736,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:28 dpkg-statoverride.8:36
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
 #, no-wrap
 msgid "B<--remove>I< file>"
 msgstr ""
@@ -6469,7 +6782,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:43 dpkg-statoverride.8:53 update-alternatives.8:329
+#: dpkg-divert.8:43 dpkg-statoverride.8:52 dselect.1:44 update-alternatives.8:328
 #, no-wrap
 msgid "B<--admindir>I< directory>"
 msgstr ""
@@ -6521,7 +6834,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:61 dpkg-statoverride.8:65 update-alternatives.8:351
+#: dpkg-divert.8:61 dpkg-statoverride.8:64 update-alternatives.8:350
 #, no-wrap
 msgid "B<--quiet>"
 msgstr ""
@@ -6565,7 +6878,7 @@
 #: dpkg-divert.8:82
 msgid ""
 "When adding, default is B<--local> and B<--divert> "
-"I<E<lt>originalE<gt>.distrib>. When removing, B<--package> or B<--local> and "
+"I<original>B<.distrib>. When removing, B<--package> or B<--local> and "
 "B<--divert> must match if specified."
 msgstr ""
 
@@ -6627,13 +6940,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:113 dpkg-query.1:197 dpkg-statoverride.8:70 dpkg-trigger.1:61 update-alternatives.8:356
+#: dpkg-divert.8:113 dpkg-query.1:205 dpkg-statoverride.8:69 dpkg-trigger.1:61 update-alternatives.8:355
 #, no-wrap
 msgid "B<DPKG_ADMINDIR>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-divert.8:117 dpkg-query.1:201 dpkg-statoverride.8:74 dpkg-trigger.1:65
+#: dpkg-divert.8:117 dpkg-query.1:209 dpkg-statoverride.8:73 dpkg-trigger.1:65
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the dpkg data directory."
@@ -6642,7 +6955,7 @@
 #. type: Plain text
 #: dpkg-divert.8:121
 msgid ""
-"If set and the I<--local> and I<--package> options have not been specified, "
+"If set and the B<--local> and B<--package> options have not been specified, "
 "B<dpkg-divert> will use it as the package name."
 msgstr ""
 
@@ -6668,7 +6981,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-divert.8:137 update-alternatives.8:495
+#: dpkg-divert.8:137 update-alternatives.8:496
 msgid "Copyright \\(co 1995 Ian Jackson"
 msgstr ""
 
@@ -6685,7 +6998,7 @@
 
 #. type: Plain text
 #: dpkg-genchanges.1:8
-msgid "B<dpkg-genchanges> [I<options>]"
+msgid "B<dpkg-genchanges> [I<option>...]"
 msgstr ""
 
 #. type: Plain text
@@ -6776,20 +7089,20 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:121
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:127
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-source.1:131
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171 dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:169 dpkg-source.1:131
 #, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr ""
@@ -6805,29 +7118,29 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:131
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:137
 #, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 msgid "Override or add an output control file field."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 #, no-wrap
 msgid "B<-U>I<field>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:137
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:143
 msgid "Remove an output control file field."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:98
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:104
 #, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr ""
@@ -6840,7 +7153,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16 dpkg-source.1:105
+#: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16 dpkg-source.1:111
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
@@ -6860,13 +7173,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21 dpkg-source.1:112
+#: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21 dpkg-source.1:118
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26 dpkg-source.1:117
+#: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26 dpkg-source.1:123
 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 "
@@ -6888,7 +7201,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:123 dpkg-gensymbols.1:416
+#: dpkg-genchanges.1:123 dpkg-gensymbols.1:421
 #, no-wrap
 msgid "B<-q>"
 msgstr ""
@@ -6921,7 +7234,7 @@
 
 #. type: Plain text
 #: dpkg-gencontrol.1:8
-msgid "B<dpkg-gencontrol> [I<options>]"
+msgid "B<dpkg-gencontrol> [I<option>...]"
 msgstr ""
 
 #. type: Plain text
@@ -6984,7 +7297,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:368
+#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:373
 #, no-wrap
 msgid "B<-p>I<package>"
 msgstr ""
@@ -7043,7 +7356,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:386 dpkg-shlibdeps.1:152
+#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:391 dpkg-shlibdeps.1:150
 #, no-wrap
 msgid "B<-O>"
 msgstr ""
@@ -7078,7 +7391,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:339
+#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:337
 msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 msgstr ""
 
@@ -7088,12 +7401,6 @@
 msgid "dpkg-gensymbols"
 msgstr ""
 
-#. type: TH
-#: dpkg-gensymbols.1:2
-#, no-wrap
-msgid "2009-08-07"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-gensymbols.1:5
 msgid ""
@@ -7103,7 +7410,7 @@
 
 #. type: Plain text
 #: dpkg-gensymbols.1:9
-msgid "B<dpkg-gensymbols> [I<options>]"
+msgid "B<dpkg-gensymbols> [I<option>...]"
 msgstr ""
 
 #. type: Plain text
@@ -7124,12 +7431,6 @@
 "found):"
 msgstr ""
 
-#. type: IP
-#: dpkg-gensymbols.1:20 dpkg-gensymbols.1:22 dpkg-gensymbols.1:24 dpkg-gensymbols.1:26 dpkg-gensymbols.1:306 dpkg-gensymbols.1:312 dpkg-gensymbols.1:346 dpkg-gensymbols.1:350 dpkg-gensymbols.1:353
-#, no-wrap
-msgid "\\(bu"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-gensymbols.1:22
 msgid "debian/I<package>.symbols.I<arch>"
@@ -7201,14 +7502,23 @@
 "so the patch should ideally only add new lines."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-gensymbols.1:64
+msgid ""
+"Note that you can put comments in symbols files: any line with '#' as the "
+"first character is a comment except if it starts with '#include' (see "
+"section B<Using includes>). Lines starting with '#MISSING:' are special "
+"comments documenting symbols that have disappeared."
+msgstr ""
+
 #. type: SS
-#: dpkg-gensymbols.1:59
+#: dpkg-gensymbols.1:64
 #, no-wrap
 msgid "Using #PACKAGE# substitution"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 msgid ""
 "In some rare cases, the name of the library varies between architectures.  "
 "To avoid hardcoding the name of the package in the symbols file, you can use "
@@ -7218,13 +7528,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 #, no-wrap
 msgid "Using symbol tags"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:74
+#: dpkg-gensymbols.1:79
 msgid ""
 "Symbol tagging is useful for marking symbols that are special in some way.  "
 "Any symbol can have an arbitrary number of tags associated with it. While "
@@ -7234,7 +7544,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:86
+#: dpkg-gensymbols.1:91
 msgid ""
 "Tag specification comes right before the symbol name (no whitespace is "
 "allowed in between). It always starts with an opening bracket B<(>, ends "
@@ -7250,7 +7560,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:90
+#: dpkg-gensymbols.1:95
 #, no-wrap
 msgid ""
 " (tag1=i am marked|tag name with space)\"tagged quoted symbol\"@Base 1.0\n"
@@ -7259,7 +7569,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:96
+#: dpkg-gensymbols.1:101
 msgid ""
 "The first symbol in the example is named I<tagged quoted symbol> and has two "
 "tags: I<tag1> with value I<i am marked> and I<tag name with space> that has "
@@ -7269,7 +7579,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 msgid ""
 "Since symbol tags are an extension of the I<deb-symbols(5)> format, they can "
 "only be part of the symbols files used in source packages (those files "
@@ -7284,19 +7594,19 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 #, no-wrap
 msgid "Standard symbol tags"
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:109
+#: dpkg-gensymbols.1:114
 #, no-wrap
 msgid "B<optional>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:119
+#: dpkg-gensymbols.1:124
 msgid ""
 "A symbol marked as optional can disappear from the library at any time and "
 "that will never cause B<dpkg-gensymbols> to fail. However, disappeared "
@@ -7309,7 +7619,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 msgid ""
 "This tag is useful for symbols which are private where their disappearance "
 "do not cause ABI breakage. For example, most of C++ template instantiations "
@@ -7319,13 +7629,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 #, no-wrap
 msgid "B<arch=>I<architecture list>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:137
+#: dpkg-gensymbols.1:142
 msgid ""
 "This tag allows one to restrict the set of architectures where the symbol is "
 "supposed to exist. When the symbols list is updated with the symbols "
@@ -7341,7 +7651,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:143
+#: dpkg-gensymbols.1:148
 msgid ""
 "When operating in the default non-template mode, among arch-specific symbols "
 "only those that match the current host architecture are written to the "
@@ -7351,7 +7661,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:149
+#: dpkg-gensymbols.1:154
 msgid ""
 "The format of I<architecture list> is the same as the one used in the "
 "I<Build-Depends> field of I<debian/control> (except the enclosing square "
@@ -7361,7 +7671,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid ""
 " (arch=alpha amd64 kfreebsd-amd64 ia64)a_64bit_specific_symbol@Base 1.0\n"
@@ -7369,13 +7679,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid "B<ignore-blacklist>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:160
+#: dpkg-gensymbols.1:165
 msgid ""
 "dpkg-gensymbols has an internal blacklist of symbols that should not appear "
 "in symbols files as they are usually only side-effects of implementation "
@@ -7386,52 +7696,52 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:160 dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:165 dpkg-gensymbols.1:202
 #, no-wrap
 msgid "B<c++>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:164
+#: dpkg-gensymbols.1:169
 msgid ""
 "Denotes I<c++> symbol pattern. See B<Using symbol patterns> subsection "
 "below."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:164 dpkg-gensymbols.1:228
+#: dpkg-gensymbols.1:169 dpkg-gensymbols.1:233
 #, no-wrap
 msgid "B<symver>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:168
+#: dpkg-gensymbols.1:173
 msgid ""
 "Denotes I<symver> (symbol version) symbol pattern. See B<Using symbol "
 "patterns> subsection below."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:168 dpkg-gensymbols.1:253
+#: dpkg-gensymbols.1:173 dpkg-gensymbols.1:258
 #, no-wrap
 msgid "B<regex>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 msgid ""
 "Denotes I<regex> symbol pattern. See B<Using symbol patterns> subsection "
 "below."
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 #, no-wrap
 msgid "Using symbol patterns"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:180
+#: dpkg-gensymbols.1:185
 msgid ""
 "Unlike a standard symbol specification, a pattern may cover multiple real "
 "symbols from the library. B<dpkg-gensymbols> will attempt to match each "
@@ -7443,7 +7753,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:188
+#: dpkg-gensymbols.1:193
 msgid ""
 "A pattern is considered lost if it does not match any symbol in the "
 "library. By default this will trigger a B<dpkg-gensymbols> failure under "
@@ -7456,7 +7766,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:195
+#: dpkg-gensymbols.1:200
 msgid ""
 "Patterns are an extension of the I<deb-symbols(5)> format hence they are "
 "only valid in symbol file templates. Pattern specification syntax is not any "
@@ -7467,12 +7777,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:202
 msgid "At the moment, B<dpkg-gensymbols> supports three basic pattern types:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:209
+#: dpkg-gensymbols.1:214
 msgid ""
 "This pattern is denoted by the I<c++> tag. It matches only C++ symbols by "
 "their demangled symbol name (as emitted by B<c++filt>(1) utility). This "
@@ -7488,7 +7798,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:215
+#: dpkg-gensymbols.1:220
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -7498,18 +7808,18 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:217
+#: dpkg-gensymbols.1:222
 msgid "The demangled name above can be obtained by executing the following command:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:219
+#: dpkg-gensymbols.1:224
 #, no-wrap
 msgid " $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:227
+#: dpkg-gensymbols.1:232
 msgid ""
 "Please note that while mangled name is unique in the library by definition, "
 "this is not necessarily true for demangled names. A couple of distinct real "
@@ -7521,7 +7831,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:234
+#: dpkg-gensymbols.1:239
 msgid ""
 "This pattern is denoted by the I<symver> tag. Well maintained libraries have "
 "versioned symbols where each version corresponds to the upstream version "
@@ -7530,7 +7840,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:241
+#: dpkg-gensymbols.1:246
 #, no-wrap
 msgid ""
 "libc.so.6 libc6 #MINVER#\n"
@@ -7541,7 +7851,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:247
+#: dpkg-gensymbols.1:252
 msgid ""
 "All symbols associated with versions GLIBC_2.0 and GLIBC_2.7 will lead to "
 "minimal version of 2.0 and 2.7 respectively with the exception of the symbol "
@@ -7551,7 +7861,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:252
+#: dpkg-gensymbols.1:257
 msgid ""
 "Please note that while old style wildcard patterns (denoted by \"*@version\" "
 "in the symbol name field) are still supported, they have been deprecated by "
@@ -7561,7 +7871,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:260
+#: dpkg-gensymbols.1:265
 msgid ""
 "Regular expression patterns are denoted by the I<regex> tag. They match by "
 "the perl regular expression specified in the symbol name field. A regular "
@@ -7571,7 +7881,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:265
+#: dpkg-gensymbols.1:270
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -7580,7 +7890,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:270
+#: dpkg-gensymbols.1:275
 msgid ""
 "Symbols like \"mystack_new@Base\", \"mystack_push@Base\", "
 "\"mystack_pop@Base\" etc.  will be matched by the first pattern while "
@@ -7590,7 +7900,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:275
+#: dpkg-gensymbols.1:280
 msgid ""
 "Basic patterns listed above can be combined where it makes sense. In that "
 "case, they are processed in the order in which the tags are specified. For "
@@ -7598,7 +7908,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:278
+#: dpkg-gensymbols.1:283
 #, no-wrap
 msgid ""
 " (c++|regex)\"^NSA::ClassA::Private::privmethod\\ed\\e(int\\e)@Base\" 1.0\n"
@@ -7606,7 +7916,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:288
+#: dpkg-gensymbols.1:293
 msgid ""
 "will match symbols \"_ZN3NSA6ClassA7Private11privmethod1Ei@Base\" and "
 "\"_ZN3NSA6ClassA7Private11privmethod2Ei@Base\". When matching the first "
@@ -7621,7 +7931,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:294
+#: dpkg-gensymbols.1:299
 msgid ""
 "In general, all patterns are divided into two groups: aliases (basic I<c++> "
 "and I<symver>) and generic patterns (I<regex>, all combinations of multiple "
@@ -7631,7 +7941,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 msgid ""
 "When multiple patterns match the same real symbol, aliases (first I<c++>, "
 "then I<symver>) are preferred over generic patterns. Generic patterns are "
@@ -7642,13 +7952,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 #, no-wrap
 msgid "Using includes"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:306
+#: dpkg-gensymbols.1:311
 msgid ""
 "When the set of exported symbols differ between architectures, it may become "
 "inefficient to use a single symbol file. In those cases, an include "
@@ -7656,7 +7966,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:310
+#: dpkg-gensymbols.1:315
 msgid ""
 "You can factorize the common part in some external file and include that "
 "file in your I<package>.symbols.I<arch> file by using an include directive "
@@ -7664,31 +7974,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:312
+#: dpkg-gensymbols.1:317
 msgid "#include \"I<packages>.symbols.common\""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:314
+#: dpkg-gensymbols.1:319
 msgid "The include directive may also be tagged like any symbol:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:316
-msgid "(tag|..|tagN)#include \"file_to_include\""
+#: dpkg-gensymbols.1:321
+msgid "(tag|..|tagN)#include \"file-to-include\""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:321
+#: dpkg-gensymbols.1:326
 msgid ""
-"As a result, all symbols included from I<file_to_include> will be considered "
+"As a result, all symbols included from I<file-to-include> will be considered "
 "to be tagged with I<tag> .. I<tagN> by default. You can use this feature to "
 "create a common I<package>.symbols file which includes architecture specific "
 "symbol files:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:326
+#: dpkg-gensymbols.1:331
 #, no-wrap
 msgid ""
 "  common_symbol1@Base 1.0\n"
@@ -7698,7 +8008,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:335
+#: dpkg-gensymbols.1:340
 msgid ""
 "The symbols files are read line by line, and include directives are "
 "processed as soon as they are encountered. This means that the content of "
@@ -7711,7 +8021,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:340
+#: dpkg-gensymbols.1:345
 msgid ""
 "An included file can repeat the header line containing the SONAME of the "
 "library. In that case, it overrides any header line previously read.  "
@@ -7720,7 +8030,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid ""
 "#include \"libsomething1.symbols.common\"\n"
@@ -7728,39 +8038,39 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid "Good library management"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:346
+#: dpkg-gensymbols.1:351
 msgid "A well-maintained library has the following features:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:350
+#: dpkg-gensymbols.1:355
 msgid ""
 "its API is stable (public symbols are never dropped, only new public symbols "
 "are added) and changes in incompatible ways only when the SONAME changes;"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:353
+#: dpkg-gensymbols.1:358
 msgid ""
 "ideally, it uses symbol versioning to achieve ABI stability despite internal "
 "changes and API extension;"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:356
+#: dpkg-gensymbols.1:361
 msgid ""
 "it doesn't export private symbols (such symbols can be tagged optional as "
 "workaround)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:364
+#: dpkg-gensymbols.1:369
 msgid ""
 "While maintaining the symbols file, it's easy to notice appearance and "
 "disappearance of symbols. But it's more difficult to catch incompatible API "
@@ -7772,38 +8082,38 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:365
+#: dpkg-gensymbols.1:370
 #, no-wrap
 msgid "B<-P>I<package-build-dir>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:368
+#: dpkg-gensymbols.1:373
 msgid "Scan I<package-build-dir> instead of debian/tmp."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 msgid ""
 "Define the package name. Required if more than one binary package is listed "
 "in debian/control (or if there's no debian/control file)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 msgid ""
 "Define the package version. Defaults to the version extracted from "
 "debian/changelog. Required if called outside of a source package tree."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 #, no-wrap
 msgid "B<-e>I<library-file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 msgid ""
 "Only analyze libraries explicitly listed instead of finding all public "
 "libraries. You can use a regular expression in I<library-file> to match "
@@ -7812,33 +8122,33 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 #, no-wrap
 msgid "B<-I>I<filename>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:386
+#: dpkg-gensymbols.1:391
 msgid ""
 "Use I<filename> as reference file to generate the symbols file that is "
 "integrated in the package itself."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 msgid ""
 "Print the generated symbols file to standard output, rather than being "
 "stored in the package build tree."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 #, no-wrap
 msgid "B<-O>I<filename>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 msgid ""
 "Store the generated symbols file as I<filename>. If I<filename> is "
 "pre-existing, its content is used as basis for the generated symbols file.  "
@@ -7847,13 +8157,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 #, no-wrap
 msgid "B<-t>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 msgid ""
 "Write the symbol file in template mode rather than the format compatible "
 "with I<deb-symbols(5)>. The main difference is that in the template mode "
@@ -7865,13 +8175,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 #, no-wrap
 msgid "B<-c>I<[0-4]>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:413
+#: dpkg-gensymbols.1:418
 msgid ""
 "Define the checks to do when comparing the generated symbols file with the "
 "template file used as starting point. By default the level is 1. Increasing "
@@ -7882,14 +8192,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:416
+#: dpkg-gensymbols.1:421
 msgid ""
 "This value can be overridden by the environment variable "
 "DPKG_GENSYMBOLS_CHECK_LEVEL."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 msgid ""
 "Keep quiet and never generate a diff between generated symbols file and the "
 "template file used as starting point or show any warnings about new/lost "
@@ -7898,13 +8208,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 #, no-wrap
 msgid "B<-a>I<arch>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:427
+#: dpkg-gensymbols.1:432
 msgid ""
 "Assume I<arch> as host architecture when processing symbol files. Use this "
 "option to generate a symbol file or diff for any architecture provided its "
@@ -7912,20 +8222,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 msgid ""
 "Enable debug mode. Numerous messages are displayed to explain what "
 "B<dpkg-gensymbols> does."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 #, no-wrap
 msgid "B<-V>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:438
+#: dpkg-gensymbols.1:443
 msgid ""
 "Enable verbose mode. The generated symbols file contains deprecated symbols "
 "as comments. Furthermore in template mode, pattern symbols are followed by "
@@ -7933,27 +8243,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:447
+#: dpkg-gensymbols.1:452
 msgid "B<http://people.redhat.com/drepper/symbol-versioning>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:449
+#: dpkg-gensymbols.1:454
 msgid "B<http://people.redhat.com/drepper/goodpractice.pdf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:451
+#: dpkg-gensymbols.1:456
 msgid "B<http://people.redhat.com/drepper/dsohowto.pdf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:454
+#: dpkg-gensymbols.1:459
 msgid "B<deb-symbols>(5), B<dpkg-shlibdeps>(1)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:457
+#: dpkg-gensymbols.1:462
 msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
 msgstr ""
 
@@ -7963,12 +8273,6 @@
 msgid "dpkg-maintscript-helper"
 msgstr ""
 
-#. type: TH
-#: dpkg-maintscript-helper.1:1
-#, no-wrap
-msgid "2010-04-16"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-maintscript-helper.1:4
 msgid ""
@@ -7979,8 +8283,8 @@
 #. type: Plain text
 #: dpkg-maintscript-helper.1:8
 msgid ""
-"B<dpkg-maintscript-helper> I<command> [I<parameters>...] -- "
-"I<maint-script-parameters>"
+"B<dpkg-maintscript-helper> I<command> [I<parameter>...] B<--> "
+"I<maint-script-parameter>..."
 msgstr ""
 
 #. type: SH
@@ -8014,8 +8318,8 @@
 "scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
 "the same call simply needs to be put in all scripts and the program will "
 "automatically adapt its behaviour based on the environment variable "
-"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
-"to forward after a double dash."
+"B<DPKG_MAINTSCRIPT_NAME> and on the maintainer scripts arguments that you "
+"have to forward after a double dash."
 msgstr ""
 
 #. type: SH
@@ -8178,7 +8482,7 @@
 #. type: Plain text
 #: dpkg-maintscript-helper.1:118
 #, no-wrap
-msgid "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
+msgid "    B<Pre-Depends:> dpkg (E<gt>= 1.15.7.2)\n"
 msgstr ""
 
 #. type: Plain text
@@ -8194,12 +8498,17 @@
 #: dpkg-maintscript-helper.1:127
 #, no-wrap
 msgid ""
-"    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
-"        dpkg-maintscript-helper E<lt>commandE<gt> ...\n"
+"    if dpkg-maintscript-helper supports I<command>; then\n"
+"        dpkg-maintscript-helper I<command> ...\n"
 "    fi\n"
 msgstr ""
 
 #. type: Plain text
+#: dpkg-maintscript-helper.1:130
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr ""
+
+#. type: Plain text
 #: dpkg-maintscript-helper.1:132
 msgid "Copyright \\(co 2008 Joey Hess"
 msgstr ""
@@ -8220,12 +8529,6 @@
 msgid "dpkg-mergechangelogs"
 msgstr ""
 
-#. type: TH
-#: dpkg-mergechangelogs.1:1
-#, no-wrap
-msgid "2010-04-18"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-mergechangelogs.1:4
 msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
@@ -8349,106 +8652,105 @@
 
 #. type: Plain text
 #: dpkg-name.1:15
-msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+msgid "B<dpkg-name> [I<option>...] [B<-->] I<file>..."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:28
+#: dpkg-name.1:29
 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>.E<lt>package_typeE<gt>> "
-"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. The "
-"I<E<lt>package_typeE<gt>> part comes from that field if present or fallbacks "
-"to B<deb>."
+"I<package>B<_>I<version>B<_>I<architecture>B<.>I<package-type> as specified "
+"in the control file of the package. The I<version> part of the filename "
+"consists of the upstream version information optionally followed by a hyphen "
+"and the revision information. The I<package-type> part comes from that field "
+"if present or fallbacks to B<deb>."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:30
+#: dpkg-name.1:31
 #, no-wrap
 msgid "B<-a>, B<--no-architecture>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 msgid "The destination filename will not have the architecture information."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 #, no-wrap
 msgid "B<-k>, B<--symlink>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 msgid "Create a symlink, instead of moving."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 #, no-wrap
 msgid "B<-o>, B<--overwrite>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 msgid ""
 "Existing files will be overwritten if they have the same name as the "
 "destination filename."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 #, no-wrap
 msgid "B<-s>, B<--subdir> [I<dir>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:52
+#: dpkg-name.1:53
 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."
+"`unstable/binary-I<architecture>/I<section>'. 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 "
+"`I<section>/binary-I<architecture>'. 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:52
+#: dpkg-name.1:53
 #, no-wrap
 msgid "B<-c>, B<--create-dir>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:57
+#: dpkg-name.1:58
 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:60
+#: dpkg-name.1:61
 #, no-wrap
 msgid "B<-v>, B<--version>"
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:65
+#: dpkg-name.1:66
 #, no-wrap
 msgid "B<dpkg-name bar-foo.deb>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 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 "
@@ -8456,13 +8758,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 #, no-wrap
 msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:75
+#: dpkg-name.1:76
 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 "
@@ -8470,48 +8772,48 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:75
+#: dpkg-name.1:76
 #, no-wrap
 msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:81
+#: dpkg-name.1:82
 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:81
+#: dpkg-name.1:82
 #, no-wrap
 msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:84
+#: dpkg-name.1:85
 msgid "This can be used when building new packages."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:94
+#: dpkg-name.1:95
 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 "
+"I<package>B<_>I<version>B<_>I<architecture>B<.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:102
+#: dpkg-name.1:103
 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-name.1:105
+#: dpkg-name.1:106
 msgid "Copyright \\(co 1995,1996 Erick Branderhorst"
 msgstr ""
 
@@ -8521,12 +8823,6 @@
 msgid "dpkg-parsechangelog"
 msgstr ""
 
-#. type: TH
-#: dpkg-parsechangelog.1:1
-#, no-wrap
-msgid "2009-05-19"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-parsechangelog.1:4
 msgid "dpkg-parsechangelog - parse Debian changelog files"
@@ -8534,7 +8830,7 @@
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:8
-msgid "B<dpkg-parsechangelog> [I<options>]"
+msgid "B<dpkg-parsechangelog> [I<option>...]"
 msgstr ""
 
 #. type: Plain text
@@ -8592,25 +8888,25 @@
 #. type: TP
 #: dpkg-parsechangelog.1:54
 #, no-wrap
-msgid "B<Source:> E<lt>pkg nameE<gt>"
+msgid "B<Source:>I< pkg-name>"
 msgstr ""
 
 #. type: TP
 #: dpkg-parsechangelog.1:56
 #, no-wrap
-msgid "B<Version:> E<lt>versionE<gt>"
+msgid "B<Version:>I< version>"
 msgstr ""
 
 #. type: TP
 #: dpkg-parsechangelog.1:58
 #, no-wrap
-msgid "B<Distribution:> E<lt>target distributionE<gt>"
+msgid "B<Distribution:>I< target-distribution>"
 msgstr ""
 
 #. type: TP
 #: dpkg-parsechangelog.1:60
 #, no-wrap
-msgid "B<Urgency:> E<lt>urgencyE<gt>"
+msgid "B<Urgency:>I< urgency>"
 msgstr ""
 
 #. type: Plain text
@@ -8621,19 +8917,19 @@
 #. type: TP
 #: dpkg-parsechangelog.1:63
 #, no-wrap
-msgid "B<Maintainer:> E<lt>authorE<gt>"
+msgid "B<Maintainer:>I< author>"
 msgstr ""
 
 #. type: TP
 #: dpkg-parsechangelog.1:65
 #, no-wrap
-msgid "B<Date:> E<lt>dateE<gt>"
+msgid "B<Date:>I< date>"
 msgstr ""
 
 #. type: TP
 #: dpkg-parsechangelog.1:67
 #, no-wrap
-msgid "B<Closes:> E<lt>bug numberE<gt>"
+msgid "B<Closes:>I< bug-number>"
 msgstr ""
 
 #. type: Plain text
@@ -8644,7 +8940,7 @@
 #. type: TP
 #: dpkg-parsechangelog.1:70
 #, no-wrap
-msgid "B<Changes:> E<lt>changelog entriesE<gt>"
+msgid "B<Changes:>I< changelog-entries>"
 msgstr ""
 
 #. type: Plain text
@@ -8739,7 +9035,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-parsechangelog.1:104 update-alternatives.8:269
+#: dpkg-parsechangelog.1:104 update-alternatives.8:268
 #, no-wrap
 msgid "B<--all>"
 msgstr ""
@@ -8920,33 +9216,36 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:78
+#: dpkg-query.1:79
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"installed package status database. When multiple I<package-name> are listed, "
+"the requested status entries are separated by an empty line."
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:78
+#: dpkg-query.1:79
 #, no-wrap
 msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:83
+#: dpkg-query.1:85
 msgid ""
-"List files installed to your system from I<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+"List files installed to your system from I<package-name>. When multiple "
+"I<package-name> are listed, the requested lists of files are separated by an "
+"empty line. However, note that files created by package-specific "
+"installation-scripts are not listed."
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:83
+#: dpkg-query.1:85
 #, no-wrap
 msgid "B<-c>, B<--control-path> I<package-name> [I<control-file>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 msgid ""
 "List paths for control files installed to your system from I<package-name>.  "
 "If I<control-file> is specified then only list the path for that control "
@@ -8957,47 +9256,55 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 #, no-wrap
 msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:97
+#: dpkg-query.1:99
 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."
+"Search for packages that own files corresponding to the given pattern.  "
+"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:97
+#: dpkg-query.1:99
 #, no-wrap
 msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:104
+#: dpkg-query.1:105
 msgid ""
 "Display details about I<package-name>, as found in "
-"I</var/lib/dpkg/available>. Users of APT-based frontends should use "
-"B<apt-cache show> I<package-name> instead as the I<available> file is only "
-"kept up-to-date when using B<dselect>."
+"I</var/lib/dpkg/available>. When multiple I<package-name> are listed, the "
+"requested I<available> entries are separated by an empty line."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.1:110
+msgid ""
+"Users of APT-based frontends should use B<apt-cache show> I<package-name> "
+"instead as the I<available> file is only kept up-to-date when using "
+"B<dselect>."
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:116
+#: dpkg-query.1:122
 #, no-wrap
 msgid "B<-f>, B<--showformat=>I<format>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:123
+#: dpkg-query.1:129
 msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:128
+#: dpkg-query.1:134
 #, no-wrap
 msgid ""
 "    B<\\en>  newline\n"
@@ -9006,7 +9313,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:133
+#: dpkg-query.1:139
 msgid ""
 "\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
 "of the following character, which is useful for \\(lqB<\\e>\\(rq and "
@@ -9014,7 +9321,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:141
+#: dpkg-query.1:147
 msgid ""
 "Package information can be included by inserting variable references to "
 "package fields using the syntax "
@@ -9026,7 +9333,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:176
+#: dpkg-query.1:182
 #, no-wrap
 msgid ""
 "    B<Architecture>\n"
@@ -9039,11 +9346,11 @@
 "    B<Description>\n"
 "    B<Enhances>\n"
 "    B<Essential>\n"
-"    B<Filename> (internal, dselect related)\n"
+"    B<Filename> (internal, front-end related)\n"
 "    B<Homepage>\n"
 "    B<Installed-Size>\n"
-"    B<MD5sum> (internal, dselect related)\n"
-"    B<MSDOS-Filename> (internal, dselect related)\n"
+"    B<MD5sum> (internal, front-end related)\n"
+"    B<MSDOS-Filename> (internal, front-end related)\n"
 "    B<Maintainer>\n"
 "    B<Origin>\n"
 "    B<Package>\n"
@@ -9054,18 +9361,18 @@
 "    B<Replaces>\n"
 "    B<Revision> (obsolete)\n"
 "    B<Section>\n"
-"    B<Size> (internal, dselect related)\n"
+"    B<Size> (internal, front-end related)\n"
 "    B<Source>\n"
 "    B<Status> (internal)\n"
 "    B<Suggests>\n"
-"    B<Tag> (usually not in the .deb but in APT's Packages files)\n"
+"    B<Tag> (usually not in the .deb but in the repository Packages files)\n"
 "    B<Triggers-Awaited> (internal)\n"
 "    B<Triggers-Pending> (internal)\n"
 "    B<Version>\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:184
+#: dpkg-query.1:190
 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 "
@@ -9075,7 +9382,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:187
+#: dpkg-query.1:193
 #, no-wrap
 msgid ""
 "  B<dpkg-query -W -f=\\(aq${Package} ${Version}\\et${Maintainer}\\en\\(aq "
@@ -9083,44 +9390,44 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-query.1:189 dpkg-split.1:180 start-stop-daemon.8:256 update-alternatives.8:375
+#: dpkg-query.1:195 dpkg-split.1:179 start-stop-daemon.8:259 update-alternatives.8:374
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr ""
 
-#. type: IP
-#: dpkg-query.1:190 update-alternatives.8:376
+#. type: TP
+#: dpkg-query.1:196 dpkg-split.1:180 start-stop-daemon.8:260 start-stop-daemon.8:289 update-alternatives.8:375
 #, no-wrap
-msgid "0"
+msgid "B<0>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:192
+#: dpkg-query.1:199
 msgid "The requested query was successfully performed."
 msgstr ""
 
-#. type: IP
-#: dpkg-query.1:192
+#. type: TP
+#: dpkg-query.1:199 dpkg-split.1:186 start-stop-daemon.8:270 start-stop-daemon.8:292
 #, no-wrap
-msgid "1"
+msgid "B<1>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:195
+#: dpkg-query.1:203
 msgid ""
 "Problems were encountered while parsing the command line or performing the "
 "query, including no file or package being found (except for --control-path)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:205
+#: dpkg-query.1:213
 msgid ""
 "This setting influences the output of the B<--list> option by changing the "
 "width of its output."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:208
+#: dpkg-query.1:216
 msgid "Copyright \\(co 2001 Wichert Akkerman"
 msgstr ""
 
@@ -9130,26 +9437,20 @@
 msgid "dpkg-scanpackages"
 msgstr ""
 
-#. type: TH
-#: dpkg-scanpackages.1:15 dpkg-scansources.1:1
-#, no-wrap
-msgid "2009-10-01"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-scanpackages.1:18
 msgid "dpkg-scanpackages - create Packages index files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:27
+#: dpkg-scanpackages.1:26
 msgid ""
-"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> "
+"B<dpkg-scanpackages> [I<option>...] I<binary-dir> [I<override-file> "
 "[I<path-prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:40
+#: dpkg-scanpackages.1:39
 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 "
@@ -9160,7 +9461,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:52
+#: 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<bzip2>(1)  (generating a "
@@ -9170,7 +9471,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:59
+#: 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 "
@@ -9179,7 +9480,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-scanpackages.1:63
 msgid ""
 "I<overridefile> is the name of a file to read which contains information "
 "about how the package fits into the distribution (it can be a compressed "
@@ -9187,12 +9488,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-scanpackages.1:66
 msgid "I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:71
+#: dpkg-scanpackages.1:70
 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 "
@@ -9200,35 +9501,35 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:73
+#: dpkg-scanpackages.1:72
 #, no-wrap
 msgid "B<-t>, B<--type> I<type>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 msgid "Scan for *.I<type> packages, instead of *.deb."
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 #, no-wrap
 msgid "B<-u>, B<--udeb>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:79
+#: dpkg-scanpackages.1:78
 msgid "B<Obsolete> alias for B<-tudeb>."
 msgstr ""
 
 #. type: IP
-#: dpkg-scanpackages.1:79 dpkg-scansources.1:50
+#: dpkg-scanpackages.1:78 dpkg-scansources.1:49
 #, no-wrap
 msgid "B<-e>, B<--extra-override> I<file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:85 dpkg-scansources.1:55
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:54
 msgid ""
 "Scan I<file> to find supplementary overrides (the file can be "
 "compressed). See B<deb-extra-override>(5)  for more information on its "
@@ -9236,37 +9537,37 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:85
+#: dpkg-scanpackages.1:84
 #, no-wrap
 msgid "B<-a>, B<--arch> I<arch>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 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:89
+#: dpkg-scanpackages.1:88
 #, no-wrap
 msgid "B<-m>, B<--multiversion>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 msgid "Include all found packages in the output."
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 #, no-wrap
 msgid "B<-M>, B<--medium> I<id-string>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:97
+#: dpkg-scanpackages.1:96
 msgid ""
 "Add an X-Medium field containing the value I<id-string>. This field is "
 "required if you want to generate B<Packages.cd> files for use by the multicd "
@@ -9274,13 +9575,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-scanpackages.1:104 update-alternatives.8:447
+#: dpkg-scanpackages.1:103 update-alternatives.8:448
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:110
+#: dpkg-scanpackages.1:109
 msgid ""
 "B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
 "warns about packages that are in the wrong subdirectory, are duplicated, "
@@ -9289,7 +9590,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:116
+#: dpkg-scanpackages.1:115
 msgid ""
 "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<deb-extra-override>(5), "
 "B<dpkg-scansources>(1)."
@@ -9307,21 +9608,21 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-scansources.1:12
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> "
+"B<dpkg-scansources> [I<option>...] 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:17
 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:28
 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> "
@@ -9335,7 +9636,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-scansources.1:32
 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 "
@@ -9343,7 +9644,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:44
+#: dpkg-scansources.1:43
 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 "
@@ -9352,26 +9653,26 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-scansources.1:46
+#: dpkg-scansources.1:45
 #, no-wrap
 msgid "B<-n>, B<--no-sort>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:49
+#: dpkg-scansources.1:48
 msgid ""
 "Don't sort the index records. Normally they are sorted by source package "
 "name."
 msgstr ""
 
 #. type: IP
-#: dpkg-scansources.1:55
+#: dpkg-scansources.1:54
 #, no-wrap
 msgid "B<-s>, B<--source-override> I<file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:59
+#: dpkg-scansources.1:58
 msgid ""
 "Use I<file> as the source override file (the file can be compressed).  The "
 "default is the name of the override file you specified with I<.src> "
@@ -9379,7 +9680,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 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 "
@@ -9389,23 +9690,23 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 #, no-wrap
 msgid "B<--debug>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:67
+#: dpkg-scansources.1:66
 msgid "Turn debugging on."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:76
+#: dpkg-scansources.1:75
 msgid "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:78
+#: dpkg-scansources.1:77
 msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr ""
 
@@ -9415,34 +9716,29 @@
 msgid "dpkg-shlibdeps"
 msgstr ""
 
-#. type: TH
-#: dpkg-shlibdeps.1:1 dpkg-source.1:2 start-stop-daemon.8:1 update-alternatives.8:8
-#, no-wrap
-msgid "2011-03-04"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-shlibdeps.1:4
 msgid "dpkg-shlibdeps - generate shared library substvar dependencies"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:10
-msgid "B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
+#: dpkg-shlibdeps.1:8
+msgid "B<dpkg-shlibdeps> [I<option>...] [B<-e>]I<executable> [I<option>...]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:24
+#: dpkg-shlibdeps.1:22
 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."
+"name. Any other variables starting with B<shlibs:> are removed from the "
+"file."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 msgid ""
 "B<dpkg-shlibdeps> has two possible sources of information to generate "
 "dependency information. Either I<symbols> files or I<shlibs> files. For each "
@@ -9459,13 +9755,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 #, no-wrap
 msgid "Symbols files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 msgid ""
 "Symbols files contain finer-grained dependency information by providing the "
 "minimum dependency for each symbol that the library exports. The script "
@@ -9474,13 +9770,13 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 #, no-wrap
 msgid "debian/*/DEBIAN/symbols"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are generated by B<dpkg-gensymbols>(1).  "
@@ -9490,19 +9786,19 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols.I<arch>"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:61
+#: dpkg-shlibdeps.1:59
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 msgid ""
 "Per-system overriding shared library dependency information.  I<arch> is the "
 "architecture of the current system (obtained by B<dpkg-architecture "
@@ -9510,20 +9806,20 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> symbols\\(rq"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:68 dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:66 dpkg-shlibdeps.1:100
 msgid ""
 "Package-provided shared library dependency information.  Unless overridden "
 "by --admindir, those files are located in /var/lib/dpkg."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:75
+#: dpkg-shlibdeps.1:73
 msgid ""
 "While scanning the symbols used by all binaries, B<dpkg-shlibdeps> remembers "
 "the (biggest) minimal version needed for each library. At the end of the "
@@ -9532,7 +9828,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 msgid ""
 "As a safe-guard measure, a symbols file can provide a "
 "I<Build-Depends-Package> meta-information field and B<dpkg-shlibdeps> will "
@@ -9542,13 +9838,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 #, no-wrap
 msgid "Shlibs files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:86
+#: dpkg-shlibdeps.1:84
 msgid ""
 "Shlibs files associate directly a library to a dependency (without looking "
 "at the symbols). It's thus often stronger than really needed but very safe "
@@ -9556,42 +9852,42 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 msgid ""
 "The dependencies for a library are looked up in several places. The first "
 "file providing information for the library of interest is used:"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 #, no-wrap
 msgid "debian/shlibs.local"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 msgid "Package-local overriding shared library dependency information."
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 #, no-wrap
 msgid "/etc/dpkg/shlibs.override"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 msgid "Per-system overriding shared library dependency information."
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 #, no-wrap
 msgid "debian/*/DEBIAN/shlibs"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are only used if the library is found in a "
@@ -9600,24 +9896,24 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> shlibs\\(rq"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:100
 #, no-wrap
 msgid "/etc/dpkg/shlibs.default"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:104
+#: dpkg-shlibdeps.1:102
 msgid "Per-system default shared library dependency information."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:108
+#: dpkg-shlibdeps.1:106
 msgid ""
 "The extracted dependencies are then directly used (except if they are "
 "filtered out because they have been identified as duplicate, or as weaker "
@@ -9625,33 +9921,33 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 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:113
+#: dpkg-shlibdeps.1:111
 #, no-wrap
 msgid "B<-e>I<executable>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 msgid ""
 "Include dependencies appropriate for the shared libraries required by "
 "I<executable>."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 #, no-wrap
 msgid "B<-d>I<dependencyfield>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:123
+#: dpkg-shlibdeps.1:121
 msgid ""
 "Add dependencies to be added to the control file dependency field "
 "I<dependencyfield>.  (The dependencies for this field are placed in the "
@@ -9659,7 +9955,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:133
+#: dpkg-shlibdeps.1:131
 msgid ""
 "The B<-d>I<dependencyfield> option takes effect for all executables after "
 "the option, until the next B<-d>I<dependencyfield>.  The default "
@@ -9667,7 +9963,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 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>, "
@@ -9677,13 +9973,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 #, no-wrap
 msgid "B<-p>I<varnameprefix>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:152
+#: dpkg-shlibdeps.1:150
 msgid ""
 "Start substitution variables with I<varnameprefix>B<:> instead of "
 "B<shlibs:>.  Likewise, any existing substitution variables starting with "
@@ -9692,20 +9988,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 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:158
+#: dpkg-shlibdeps.1:156
 #, no-wrap
 msgid "B<-t>I<type>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 msgid ""
 "Prefer shared library dependency information tagged for the given package "
 "type. If no tagged information is available, falls back to untagged "
@@ -9715,46 +10011,46 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 #, no-wrap
 msgid "B<-L>I<localshlibsfile>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:171
+#: dpkg-shlibdeps.1:169
 msgid ""
 "Read overriding shared library dependency information from "
 "I<localshlibsfile> instead of B<debian/shlibs.local>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 msgid ""
 "Write substitution variables in I<substvarsfile>; the default is "
 "B<debian/substvars>."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 #, no-wrap
 msgid "B<-v>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 msgid ""
 "Enable verbose mode. Numerous messages are displayed to explain what "
 "B<dpkg-shlibdeps> does."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 #, no-wrap
 msgid "B<-x>I<package>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 msgid ""
 "Exclude the package from the generated dependencies. This is useful to avoid "
 "self-dependencies for packages which provide ELF binaries (executables or "
@@ -9763,13 +10059,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 #, no-wrap
 msgid "B<-S>I<pkgbuilddir>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 msgid ""
 "Look into I<pkgbuilddir> first when trying to find a library. This is useful "
 "when the source package builds multiple flavors of the same library and you "
@@ -9779,13 +10075,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 #, no-wrap
 msgid "B<--ignore-missing-info>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 msgid ""
 "Do not fail if dependency information can't be found for a shared library.  "
 "Usage of this option is discouraged, all libraries should provide dependency "
@@ -9794,13 +10090,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 #, no-wrap
 msgid "B<--warnings=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:213
+#: dpkg-shlibdeps.1:211
 msgid ""
 "I<value> is a bit field defining the set of warnings that can be emitted by "
 "B<dpkg-shlibdeps>.  Bit 0 (value=1) enables the warning \"symbol I<sym> used "
@@ -9812,13 +10108,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-shlibdeps.1:224
+#: dpkg-shlibdeps.1:222
 #, no-wrap
 msgid "WARNINGS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 msgid ""
 "Since B<dpkg-shlibdeps> analyzes the set of symbols used by each binary of "
 "the generated package, it is able to emit warnings in several cases. They "
@@ -9828,13 +10124,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 #, no-wrap
 msgid "B<symbol>I< sym>B< used by >I<binary>B< found in none of the libraries.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a library and it needs to be linked "
@@ -9843,7 +10139,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 #, no-wrap
 msgid ""
 "I<binary>B< contains an unresolvable reference to symbol >I<sym>B<: it's "
@@ -9851,7 +10147,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a plugin and the symbol is probably "
@@ -9866,7 +10162,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 #, no-wrap
 msgid ""
 "B<dependency on >I<library>B< could be avoided if >I<binaries>B< were not "
@@ -9874,7 +10170,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 msgid ""
 "None of the I<binaries> that are linked with I<library> use any of the "
 "symbols provided by the library. By fixing all the binaries, you would avoid "
@@ -9883,7 +10179,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 #, no-wrap
 msgid ""
 "I<binary>B< shouldn't be linked with >I<library>B< (it uses none of its "
@@ -9891,7 +10187,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 msgid ""
 "The I<binary> is linked to a library that it doesn't need. It's not a "
 "problem but some small performance improvements in binary load time can be "
@@ -9901,13 +10197,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 #, no-wrap
 msgid "ERRORS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 msgid ""
 "B<dpkg-shlibdeps> will fail if it can't find a public library used by a "
 "binary or if this library has no associated dependency information (either "
@@ -9917,7 +10213,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 #, no-wrap
 msgid ""
 "B<couldn't find library >I<library-soname>B< needed by >I<binary>B< (its "
@@ -9925,7 +10221,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:287
+#: dpkg-shlibdeps.1:285
 msgid ""
 "The I<binary> uses a library called I<library-soname> but B<dpkg-shlibdeps> "
 "has been unable to find the library.  B<dpkg-shlibdeps> creates a list of "
@@ -9934,14 +10230,14 @@
 "LD_LIBRARY_PATH environment variable, and standard public directories (/lib, "
 "/usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks those "
 "directories in the package's build tree of the binary being analyzed, in the "
-"packages's build trees indicated with the -S command-line option, in other "
-"packages's build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
+"packages' build trees indicated with the -S command-line option, in other "
+"packages' build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
 "and finally in the root directory.  If the library is not found in any of "
 "those directories, then you get this error."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 msgid ""
 "If the library not found is in a private directory of the same package, then "
 "you want to add the directory to LD_LIBRARY_PATH. If it's in another binary "
@@ -9951,7 +10247,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 #, no-wrap
 msgid ""
 "B<no dependency information found for >I<library-file>B< (used by "
@@ -9959,7 +10255,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:306
+#: dpkg-shlibdeps.1:304
 msgid ""
 "The library needed by I<binary> has been found by B<dpkg-shlibdeps> in "
 "I<library-file> but B<dpkg-shlibdeps> has been unable to find any dependency "
@@ -9971,7 +10267,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:320
+#: dpkg-shlibdeps.1:318
 msgid ""
 "This failure can be caused by a bad or missing shlibs or symbols file in the "
 "package of the library. It might also happen if the library is built within "
@@ -9987,7 +10283,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:326
+#: dpkg-shlibdeps.1:324
 msgid ""
 "Calling B<dpkg-shlibdeps> in verbose mode (-v) will provide much more "
 "information about where it tried to find the dependency information. This "
@@ -9995,12 +10291,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:330
+#: dpkg-shlibdeps.1:328
 msgid "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:337
+#: dpkg-shlibdeps.1:335
 msgid "Copyright \\(co 2006 Frank Lichtenheld"
 msgstr ""
 
@@ -10016,17 +10312,17 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:10
-msgid "B<dpkg-source> [I<options>] I<command>"
+#: dpkg-source.1:9
+msgid "B<dpkg-source> [I<option>...] I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:14
+#: dpkg-source.1:13
 msgid "B<dpkg-source> packs and unpacks Debian source archives."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:18
+#: dpkg-source.1:17
 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 "
@@ -10034,13 +10330,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:20
+#: dpkg-source.1:19
 #, no-wrap
 msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:30
+#: dpkg-source.1:29
 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 "
@@ -10051,7 +10347,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:36
+#: dpkg-source.1:35
 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 "
@@ -10059,7 +10355,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:44
+#: dpkg-source.1:43
 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 "
@@ -10070,7 +10366,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:49
+#: dpkg-source.1:48
 msgid ""
 "If the source package uses a non-standard format (currently this means all "
 "formats except \"1.0\"), its name will be stored in B<debian/source/format> "
@@ -10079,13 +10375,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:50
+#: dpkg-source.1:49
 #, no-wrap
 msgid "B<-b> I<directory> [I<format-specific-parameters>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:57
+#: dpkg-source.1:56
 msgid ""
 "Build a source package. The first non-option argument is taken as the name "
 "of the directory containing the debianized source tree (i.e. with a debian "
@@ -10095,10 +10391,10 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:66
+#: dpkg-source.1:65
 msgid ""
 "B<dpkg-source> will build the source package with the first format found in "
-"this ordered list: the format indicated with the I<--format> command-line "
+"this ordered list: the format indicated with the I<--format> command line "
 "option, the format indicated in B<debian/source/format>, \"1.0\". The "
 "fallback to \"1.0\" is deprecated and will be removed at some point in the "
 "future, you should always document the desired source format in "
@@ -10107,13 +10403,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:67
+#: dpkg-source.1:66
 #, no-wrap
 msgid "B<--print-format> I<directory>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:72
+#: dpkg-source.1:71
 msgid ""
 "Print the source format that would be used to build the source package if "
 "B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -10121,7 +10417,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:73
+#: dpkg-source.1:72
 #, no-wrap
 msgid "B<--before-build> I<directory>"
 msgstr ""
@@ -10129,12 +10425,12 @@
 #. type: Plain text
 #: dpkg-source.1:81
 msgid ""
-"This command should be called before any build of the package "
-"(B<dpkg-buildpackage> calls it very early even before B<debian/rules "
-"clean>). This command should be idempotent and can be called multiple "
-"times. Not all source formats implement something in this hook, and those "
-"that do usually prepare the source tree for the build for example by "
-"ensuring that the Debian patches are applied."
+"Run the corresponding hook of the source package format. This hook is called "
+"before any build of the package (B<dpkg-buildpackage> calls it very early "
+"even before B<debian/rules clean>). This command is idempotent and can be "
+"called multiple times. Not all source formats implement something in this "
+"hook, and those that do usually prepare the source tree for the build for "
+"example by ensuring that the Debian patches are applied."
 msgstr ""
 
 #. type: TP
@@ -10146,21 +10442,35 @@
 #. type: Plain text
 #: dpkg-source.1:89
 msgid ""
-"This command should be called after any build of the package "
-"(B<dpkg-buildpackage> calls it last). This command should be idempotent and "
-"can be called multiple times. Not all source formats implement something in "
-"this hook, and those that do usually use it to undo what B<--before-build> "
-"has done."
+"Run the corresponding hook of the source package format. This hook is called "
+"after any build of the package (B<dpkg-buildpackage> calls it last). This "
+"command is idempotent and can be called multiple times. Not all source "
+"formats implement something in this hook, and those that do usually use it "
+"to undo what B<--before-build> has done."
+msgstr ""
+
+#. type: TP
+#: dpkg-source.1:90
+#, no-wrap
+msgid "B<--commit> [I<directory>] ..."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:95
+msgid ""
+"Record changes in the source tree unpacked in I<directory>. This command can "
+"take supplementary parameters depending on the source format.  It will error "
+"out for formats where this operation doesn't mean anything."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:97
+#: dpkg-source.1:103
 #, no-wrap
 msgid "GENERIC BUILD OPTIONS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 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 "
@@ -10168,7 +10478,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 msgid ""
 "Specifies the change log file to read information from. The default is "
 "B<debian/changelog>.  If given with relative pathname this is interpreted "
@@ -10176,20 +10486,20 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 #, no-wrap
 msgid "B<--format=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:121
+#: dpkg-source.1:127
 msgid ""
 "Use the given format for building the source package. It does override any "
 "format given in B<debian/source/format>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:131
+#: dpkg-source.1:137
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is to not read "
 "any file. This option can be used multiple times to read substitution "
@@ -10197,13 +10507,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:137
+#: dpkg-source.1:143
 #, no-wrap
 msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 msgid ""
 "Specify the compression to use for created files (tarballs and diffs).  Note "
 "that this option will not cause existing tarballs to be recompressed, it "
@@ -10213,27 +10523,27 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 #, no-wrap
 msgid "B<-z>I<level>, B<--compression-level>=I<level>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 msgid ""
 "Compression level to use. As with B<-Z> it only affects newly created "
-"files. Supported values are: I<1> to I<9>, I<best>, and I<fast>.  I<9> is "
-"the default."
+"files. Supported values are: I<1> to I<9>, I<best>, and I<fast>.  The "
+"default is I<9> for gzip and bzip2, I<6> for xz and lzma."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 #, no-wrap
 msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:163
+#: dpkg-source.1:169
 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 "
@@ -10247,7 +10557,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 msgid ""
 "This is very helpful in cutting out extraneous files that get included in "
 "the diff, e.g. if you maintain your source in a revision control system and "
@@ -10261,29 +10571,29 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 #, no-wrap
 msgid "B<--extend-diff-ignore>=I<regexp>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 msgid ""
-"The perl regular expression specified will extend the default regular "
-"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
-"default regexp.  This option is convenient to use in "
-"B<debian/source/options> to exclude some auto-generated files from the "
-"automatic patch generation."
+"The perl regular expression specified will extend the default value of "
+"B<--diff-ignore> and its current value (if set). It does this by "
+"concatenating \"B<|>I<regexp>\" to the existing value.  This option is "
+"convenient to use in B<debian/source/options> to exclude some auto-generated "
+"files from the automatic patch generation."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 #, no-wrap
 msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:189
+#: dpkg-source.1:195
 msgid ""
 "If this option is specified, the pattern will be passed to B<tar>(1)'s "
 "--exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -10293,7 +10603,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:194
+#: dpkg-source.1:200
 msgid ""
 "B<-I> by itself adds default --exclude options that will filter out control "
 "files and directories of the most common revision control systems, backup "
@@ -10301,7 +10611,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:212
 msgid ""
 "B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
 "different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -10315,48 +10625,48 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 msgid ""
 "The default regexp and patterns for both options can be seen in the output "
 "of the B<--help> command."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 #, no-wrap
 msgid "GENERIC EXTRACT OPTIONS"
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:210
+#: dpkg-source.1:216
 #, no-wrap
 msgid "B<--no-copy>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 msgid "Do not copy original tarballs near the extracted source package."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 #, no-wrap
 msgid "B<--no-check>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 msgid "Do not check signatures and checksums before unpacking."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 #, no-wrap
 msgid "B<--require-valid-signature>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:224
+#: dpkg-source.1:230
 msgid ""
 "Refuse to unpack the source package if it doesn't contain an OpenPGP "
 "signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -10366,13 +10676,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:225
+#: dpkg-source.1:231
 #, no-wrap
 msgid "SOURCE PACKAGE FORMATS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:230
+#: dpkg-source.1:236
 msgid ""
 "If you don't know what source format to use, you should probably pick either "
 "\"3.0 (quilt)\" or \"3.0 (native)\". See "
@@ -10381,13 +10691,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:231
+#: dpkg-source.1:237
 #, no-wrap
 msgid "Format: 1.0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:235
+#: dpkg-source.1:241
 msgid ""
 "A source package in this format consists either of a B<.orig.tar.gz> "
 "associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -10395,12 +10705,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:237 dpkg-source.1:405 dpkg-source.1:566 dpkg-source.1:605
+#: dpkg-source.1:243 dpkg-source.1:411 dpkg-source.1:586 dpkg-source.1:625
 msgid "B<Extracting>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:247
+#: dpkg-source.1:253
 msgid ""
 "Extracting a native package is a simple extraction of the single tarball in "
 "the target directory. Extracting a non-native package is done by first "
@@ -10413,12 +10723,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:249 dpkg-source.1:433 dpkg-source.1:577 dpkg-source.1:610
+#: dpkg-source.1:255 dpkg-source.1:439 dpkg-source.1:597 dpkg-source.1:630
 msgid "B<Building>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:255
+#: dpkg-source.1:261
 msgid ""
 "Building a native package is just creating a single tarball with the source "
 "directory. Building a non-native package involves extracting the original "
@@ -10427,13 +10737,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:256
+#: dpkg-source.1:262
 #, no-wrap
 msgid "B<Build options (with -b):>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:269
+#: dpkg-source.1:275
 msgid ""
 "If a second non-option argument is supplied it should be the name of the "
 "original source directory or tarfile or the empty string if the package is a "
@@ -10444,7 +10754,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 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>, "
@@ -10452,13 +10762,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 #, no-wrap
 msgid "B<-sk>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:290
 msgid ""
 "Specifies to expect the original source as a tarfile, by default "
 "I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>.  It will leave "
@@ -10468,24 +10778,24 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:284 dpkg-source.1:353
+#: dpkg-source.1:290 dpkg-source.1:359
 #, no-wrap
 msgid "B<-sp>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:289
+#: dpkg-source.1:295
 msgid "Like B<-sk> but will remove the directory again afterwards."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:289 dpkg-source.1:359
+#: dpkg-source.1:295 dpkg-source.1:365
 #, no-wrap
 msgid "B<-su>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 msgid ""
 "Specifies that 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 "
@@ -10493,24 +10803,24 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 #, no-wrap
 msgid "B<-sr>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 #, no-wrap
 msgid "B<-ss>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:310
+#: dpkg-source.1:316
 msgid ""
 "Specifies that the original source is available both as a directory and as a "
 "tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -10519,13 +10829,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:310 dpkg-source.1:362
+#: dpkg-source.1:316 dpkg-source.1:368
 #, no-wrap
 msgid "B<-sn>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 msgid ""
 "Specifies to not look for any original source, and to not generate a diff.  "
 "The second argument, if supplied, must be the empty string. This is used for "
@@ -10534,13 +10844,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 #, no-wrap
 msgid "B<-sa> or B<-sA>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:348
 msgid ""
 "Specifies to 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 "
@@ -10556,13 +10866,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:342 dpkg-source.1:525
+#: dpkg-source.1:348 dpkg-source.1:541
 #, no-wrap
 msgid "B<--abort-on-upstream-changes>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:348
+#: dpkg-source.1:354
 msgid ""
 "The process fails if the generated diff contains changes to files outside of "
 "the debian sub-directory. This option is not allowed in "
@@ -10570,18 +10880,18 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:349
+#: dpkg-source.1:355
 #, no-wrap
 msgid "B<Extract options (with -x):>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:353
+#: dpkg-source.1:359
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:359
+#: dpkg-source.1:365
 msgid ""
 "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 "
@@ -10590,12 +10900,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:362
+#: dpkg-source.1:368
 msgid "Unpacks the original source tree."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:367
+#: dpkg-source.1:373
 msgid ""
 "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 "
@@ -10603,31 +10913,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:372
+#: dpkg-source.1:378
 msgid ""
 "All the B<-s>I<X> options are mutually exclusive. If you specify more than "
 "one only the last one will be used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:372 dpkg-source.1:535
+#: dpkg-source.1:378 dpkg-source.1:555
 #, no-wrap
 msgid "B<--skip-debianization>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:375
+#: dpkg-source.1:381
 msgid "Skips application of the debian diff on top of the upstream sources."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:376
+#: dpkg-source.1:382
 #, no-wrap
 msgid "Format: 2.0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:380
+#: dpkg-source.1:386
 msgid ""
 "Also known as wig&pen. This format is not recommended for wide-spread usage, "
 "the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -10635,7 +10945,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:385
+#: dpkg-source.1:391
 msgid ""
 "The behaviour of this format is the same as the \"3.0 (quilt)\" format "
 "except that it doesn't use an explicit list of patches. All files in "
@@ -10644,20 +10954,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:388
+#: dpkg-source.1:394
 msgid ""
 "When building a new source package, any change to the upstream source is "
 "stored in a patch named B<zz_debian-diff-auto>."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:389
+#: dpkg-source.1:395
 #, no-wrap
 msgid "Format: 3.0 (native)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:395
+#: dpkg-source.1:401
 msgid ""
 "This format is an extension of the native package format as defined in the "
 "1.0 format. It supports all compression methods and will ignore by default "
@@ -10666,13 +10976,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:396
+#: dpkg-source.1:402
 #, no-wrap
 msgid "Format: 3.0 (quilt)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:409
 msgid ""
 "A source package in this format contains at least an original tarball "
 "(B<.orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) "
@@ -10682,7 +10992,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:414
+#: dpkg-source.1:420
 msgid ""
 "The main original tarball is extracted first, then all additional original "
 "tarballs are extracted in subdirectories named after the I<component> part "
@@ -10694,7 +11004,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:432
 msgid ""
 "All patches listed in B<debian/patches/debian.series> or "
 "B<debian/patches/series> are then applied.  If the former file is used and "
@@ -10709,33 +11019,34 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:428
+#: dpkg-source.1:434
 msgid "Similarly to quilt's default behaviour, the patches can remove files too."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:431
+#: dpkg-source.1:437
 msgid ""
 "The file B<.pc/applied-patches> is created if some patches have been applied "
 "during the extraction."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:443
+#: dpkg-source.1:451
 msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
 "except the automatic patch (B<debian-changes->I<version> or "
 "B<debian-changes>, depending on B<--single-debian-patch>) are applied. The "
-"temporary directory is compared to the source package directory and the diff "
-"(if non-empty) is stored in the automatic patch.  If the automatic patch is "
-"created/deleted, it's added/removed from the series file and from the quilt "
-"metadata."
+"temporary directory is compared to the source package directory. When the "
+"diff is non-empty, the build fails unless B<--single-debian-patch> or "
+"B<--auto-commit> has been used, in which case the diff is stored in the "
+"automatic patch.  If the automatic patch is created/deleted, it's "
+"added/removed from the series file and from the quilt metadata."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:451
+#: dpkg-source.1:459
 msgid ""
 "Any change on a binary file is not representable in a diff and will thus "
 "lead to a failure unless the maintainer deliberately decided to include that "
@@ -10746,14 +11057,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:454
+#: dpkg-source.1:462
 msgid ""
 "The updated debian directory and the list of modified binaries is then used "
 "to generate the debian tarball."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:460
+#: dpkg-source.1:468
 msgid ""
 "The automatically generated diff doesn't include changes on VCS specific "
 "files as well as many temporary files (see default value associated to B<-i> "
@@ -10762,35 +11073,52 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:477
 msgid ""
-"Note: B<dpkg-source> expects the source tree to have all patches listed in "
-"the series file applied when you generate the source package.  This is not "
-"the case when the source tree has been obtained by unpacking a source "
-"package using the Format: 1.0 for instance. To mitigate the problem, "
-"B<dpkg-source> will apply the patches by itself if it believes that they "
-"have not yet been applied. To detect this situation, it uses the following "
-"heuristic: it finds the list of supposedly unapplied patches (they are "
+"Note: B<dpkg-source> B<--before-build> (and B<-b>) will ensure that all "
+"patches listed in the series file are applied so that a package build always "
+"has all patches applied. It does this by finding unapplied patches (they are "
 "listed in the B<series> file but not in B<.pc/applied-patches>), and if the "
 "first patch in that set can be applied without errors, it will apply them "
-"all.  The option B<--no-preparation> can be used to disable this "
-"behaviour. This operation is usually done as part of the B<--prepare-build> "
-"command."
+"all. The option B<--no-preparation> can be used to disable this behavior."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:480
+msgid "B<Recording changes>"
+msgstr ""
+
+#. type: TP
+#: dpkg-source.1:480
+#, no-wrap
+msgid "B<--commit> [I<directory>] [I<patch-name>] [I<patch-file>]"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:490
+msgid ""
+"Generates a patch corresponding to the local changes that are not managed by "
+"the quilt patch system and integrates it in the patch system under the name "
+"I<patch-name>. If the name is missing, it will be asked interactively. If "
+"I<patch-file> is given, it is used as the patch corresponding to the local "
+"changes to integrate. This is mainly useful after a build failure that "
+"pre-generated this file. Once integrated, an editor is launched so that you "
+"can edit the meta-information in the patch header."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:476 dpkg-source.1:547 dpkg-source.1:586
+#: dpkg-source.1:493 dpkg-source.1:567 dpkg-source.1:606
 msgid "B<Build options>"
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:476
+#: dpkg-source.1:493
 #, no-wrap
 msgid "B<--allow-version-of-quilt-db=>I<version>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 msgid ""
 "Allow B<dpkg-source> to build the source package if the version of the quilt "
 "metadata is the one specified, even if B<dpkg-source> doesn't know about "
@@ -10800,37 +11128,37 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 #, no-wrap
 msgid "B<--include-removal>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 msgid ""
 "Do not ignore removed files and include them in the automatically generated "
 "patch."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 #, no-wrap
 msgid "B<--include-timestamp>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 msgid "Include timestamp in the automatically generated patch."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 #, no-wrap
 msgid "B<--include-binaries>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 msgid ""
 "Add all modified binaries in the debian tarball. Also add them to "
 "B<debian/source/include-binaries>: they will be added by default in "
@@ -10838,45 +11166,46 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 #, no-wrap
 msgid "B<--no-preparation>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 msgid ""
 "Do not try to prepare the build tree by applying patches which are "
 "apparently unapplied."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 #, no-wrap
 msgid "B<--single-debian-patch>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 msgid ""
 "Use B<debian/patches/debian-changes> instead of "
 "B<debian/patches/debian-changes->I<version> for the name of the automatic "
 "patch generated during build. This option is particularly useful when the "
 "package is maintained in a VCS and a patch set can't reliably be "
 "generated. Instead the current diff with upstream should be stored in a "
-"single patch. When using this option, it is recommended to create a "
-"debian/source/patch-header file explaining how the Debian changes can be "
-"best reviewed, for example in the VCS that is used."
+"single patch. The option would be put in B<debian/source/local-options> and "
+"would be accompanied by a B<debian/source/local-patch-header> file "
+"explaining how the Debian changes can be best reviewed, for example in the "
+"VCS that is used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 #, no-wrap
 msgid "B<--create-empty-orig>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 msgid ""
 "Automatically create the main original tarball as empty if it's missing and "
 "if there are supplementary original tarballs. This option is meant to be "
@@ -10885,24 +11214,23 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 #, no-wrap
 msgid "B<--unapply-patches>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:525
+#: dpkg-source.1:541
 msgid ""
-"Unapply the patches in the B<--after-build> hook. This is mainly useful when "
-"you build your package directly in a VCS that contains unpatched upstream "
-"source and where you want to keep the tree unpatched even after a package "
-"build. This option is usually put in B<debian/source/local-options> (it's "
-"not allowed in B<debian/source/options> so that all generated source "
-"packages have the same behaviour by default)."
+"Unapply the patches in the B<--after-build> hook. You usually don't need "
+"this option as dpkg-source will automatically unapply the patches if it did "
+"apply them during B<--before-build>. This option is only allowed in "
+"B<debian/source/local-options> so that all generated source packages have "
+"the same behavior by default."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:548
 msgid ""
 "The process fails if an automatic patch has been generated. This option can "
 "be used to ensure that all changes were properly recorded in separate quilt "
@@ -10910,56 +11238,69 @@
 "B<debian/source/options> but can be used in B<debian/source/local-options>."
 msgstr ""
 
+#. type: TP
+#: dpkg-source.1:548
+#, no-wrap
+msgid "B<--auto-commit>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:552
+msgid ""
+"The process doesn't fail if an automatic patch has been generated, instead "
+"it's immediately recorded in the quilt series."
+msgstr ""
+
 #. type: Plain text
-#: dpkg-source.1:535
+#: dpkg-source.1:555
 msgid "B<Extract options>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 msgid "Skips extraction of the debian tarball on top of the upstream sources."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 #, no-wrap
 msgid "B<--skip-patches>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:561
 msgid "Do not apply patches at the end of the extraction."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:542
+#: dpkg-source.1:562
 #, no-wrap
 msgid "Format: 3.0 (custom)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:545
+#: dpkg-source.1:565
 msgid ""
-"This format is particular. It doesn't represent a real source package format "
+"This format is special. It doesn't represent a real source package format "
 "but can be used to create source packages with arbitrary files."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 msgid ""
 "All non-option arguments are taken as files to integrate in the generated "
-"source package. They must exist and are preferrably in the current "
+"source package. They must exist and are preferably in the current "
 "directory. At least one file must be given."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 #, no-wrap
 msgid "B<--target-format=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:556
+#: dpkg-source.1:576
 msgid ""
 "B<Required>. Defines the real format of the generated source package.  The "
 "generated .dsc file will contain this value in its I<Format> field and not "
@@ -10967,18 +11308,18 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:557
+#: dpkg-source.1:577
 #, no-wrap
 msgid "Format: 3.0 (git)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:579
 msgid "This format is experimental."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:564
+#: dpkg-source.1:584
 msgid ""
 "A source package in this format consists of a single bundle of a git "
 "repository B<.git> to hold the source of a package.  There may also be a "
@@ -10986,7 +11327,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:570
+#: dpkg-source.1:590
 msgid ""
 "The bundle is cloned as a git repository to the target directory.  If there "
 "is a gitshallow file, it is installed as `.git/shallow` inside the cloned "
@@ -10994,36 +11335,36 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:575
+#: dpkg-source.1:595
 msgid ""
 "Note that by default the new repository will have the same branch checked "
 "out that was checked out in the original source. (Typically \"master\", but "
-"it could be anything.) Any other branches will be available, under as "
-"`remotes/origin/`"
+"it could be anything.) Any other branches will be available under "
+"`remotes/origin/`."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:580 dpkg-source.1:613
+#: dpkg-source.1:600 dpkg-source.1:633
 msgid ""
 "Before going any further, some checks are done to ensure that we don't have "
 "any non-ignored uncommitted changes."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:584
+#: dpkg-source.1:604
 msgid ""
 "B<git-bundle>(1) is used to generate a bundle of the git repository.  By "
 "default, all branches and tags in the repository are included in the bundle."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:586
+#: dpkg-source.1:606
 #, no-wrap
 msgid "B<--git-ref=>I<ref>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 msgid ""
 "Allows specifying a git ref to include in the git bundle. Use disables the "
 "default behavior of including all branches and tags. May be specified "
@@ -11035,38 +11376,38 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 #, no-wrap
 msgid "B<--git-depth=>I<number>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 msgid ""
 "Creates a shallow clone with a history truncated to the specified number of "
 "revisions."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 #, no-wrap
 msgid "Format: 3.0 (bzr)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:603
+#: dpkg-source.1:623
 msgid ""
 "This format is experimental. It generates a single tarball containing the "
 "bzr repository."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:608
+#: dpkg-source.1:628
 msgid "The tarball is unpacked and then bzr is used to checkout the current branch."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 msgid ""
 "Then the VCS specific part of the source directory is copied over to a "
 "temporary directory. Before this temporary directory is packed in a tarball, "
@@ -11074,19 +11415,19 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 #, no-wrap
 msgid "WARNINGS AND ERRORS"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:618
+#: dpkg-source.1:638
 #, no-wrap
 msgid "no source format specified in debian/source/format"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:624
+#: dpkg-source.1:644
 msgid ""
 "The file B<debian/source/format> should always exist and indicate the "
 "desired source format. For backwards compatibility, format \"1.0\" is "
@@ -11096,7 +11437,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 msgid ""
 "The rationale is that format \"1.0\" is no longer the recommended format, "
 "you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
@@ -11106,13 +11447,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 #, no-wrap
 msgid "the diff modifies the following upstream files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 msgid ""
 "When using source format \"1.0\" it is usually a bad idea to modify upstream "
 "files directly as the changes end up hidden and mostly undocumented in the "
@@ -11122,13 +11463,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 #, no-wrap
 msgid "cannot represent change to I<file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 msgid ""
 "Changes to upstream sources are usually stored with patch files, but not all "
 "changes can be represented with patches: they can only alter the content of "
@@ -11138,51 +11479,51 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 #, no-wrap
 msgid "newly created empty file I<file> will not be represented in diff"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 msgid ""
 "Empty files can't be created with patch files. Thus this change is not "
 "recorded in the source package and you are warned about it."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 #, no-wrap
 msgid "executable mode I<perms> of I<file> will not be represented in diff"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:647
+#: dpkg-source.1:667
 #, no-wrap
 msgid "special mode I<perms> of I<file> will not be represented in diff"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 msgid ""
 "Patch files do not record permissions of files and thus modified permissions "
 "are not stored in the source package. This warning reminds you of that fact."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 #, no-wrap
 msgid "FILE FORMATS"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:652
+#: dpkg-source.1:672
 #, no-wrap
 msgid "debian/source/format"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 msgid ""
 "This file contains on a single line the format that should be used to build "
 "the source package (possible formats are described above). No leading or "
@@ -11190,13 +11531,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 #, no-wrap
 msgid "debian/source/include-binaries"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 msgid ""
 "This file contains a list of binary files (one per line) that should be "
 "included in the debian tarball. Leading and trailing spaces are stripped.  "
@@ -11205,13 +11546,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 #, no-wrap
 msgid "debian/source/options"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:666
+#: dpkg-source.1:686
 msgid ""
 "This file contains a list of long options that should be automatically "
 "prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -11220,7 +11561,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:672
+#: dpkg-source.1:692
 msgid ""
 "Each option should be put on a separate line. Empty lines and lines starting "
 "with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -11230,7 +11571,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:678
+#: dpkg-source.1:700
 #, no-wrap
 msgid ""
 "  # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -11238,23 +11579,25 @@
 "  compression-level = 9\n"
 "  # use debian/patches/debian-changes as automatic patch\n"
 "  single-debian-patch\n"
+"  # ignore changes on config.{sub,guess}\n"
+"  extend-diff-ignore = \"(^|/)(config.sub|config.guess)$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 msgid ""
 "Note: B<format> options are not accepted in this file, you should use "
 "B<debian/source/format> instead."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 #, no-wrap
 msgid "debian/source/local-options"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:686
+#: dpkg-source.1:708
 msgid ""
 "Exactly like B<debian/source/options> except that the file is not included "
 "in the generated source package. It can be useful to store a preference tied "
@@ -11263,26 +11606,33 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:686
+#: dpkg-source.1:708
+#, no-wrap
+msgid "debian/source/local-patch-header"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.1:709
 #, no-wrap
 msgid "debian/source/patch-header"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 msgid ""
 "Free form text that is put on top of the automatic patch generated in "
-"formats \"2.0\" or \"3.0 (quilt)\"."
+"formats \"2.0\" or \"3.0 (quilt)\". B<local-patch-header> is not included in "
+"the generated source package while B<patch-header> is."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 #, no-wrap
 msgid "debian/patches/series"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:698
+#: dpkg-source.1:722
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
@@ -11295,20 +11645,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:705
+#: dpkg-source.1:729
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr ""
 
-#. type: TH
-#: dpkg-split.1:2
-#, no-wrap
-msgid "dpkg-split"
+#. type: Plain text
+#: dpkg-source.1:736
+msgid "Copyright \\(co 2008-2011 Rapha\\[:e]l Hertzog"
 msgstr ""
 
 #. type: TH
-#: dpkg-split.1:2 dpkg-statoverride.8:1
+#: dpkg-split.1:2
 #, no-wrap
-msgid "2009-06-26"
+msgid "dpkg-split"
 msgstr ""
 
 #. type: Plain text
@@ -11317,12 +11666,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:10
-msgid "B<dpkg-split> [I<options>] I<command>"
+#: dpkg-split.1:9
+msgid "B<dpkg-split> [I<option>...] I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:16
+#: dpkg-split.1:15
 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 "
@@ -11330,14 +11679,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:20
+#: dpkg-split.1:19
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:28
+#: dpkg-split.1:27
 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 "
@@ -11346,25 +11695,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:31
+#: dpkg-split.1:30
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:33
+#: dpkg-split.1:32
 #, no-wrap
 msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:36
+#: dpkg-split.1:35
 msgid "Splits a single Debian binary package into several parts."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:44
+#: dpkg-split.1:43
 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 "
@@ -11372,27 +11721,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 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:52
+#: dpkg-split.1:51
 #, no-wrap
 msgid "B<-j>, B<--join> I<part>..."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:56
+#: dpkg-split.1:55
 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:60
+#: dpkg-split.1:59
 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 "
@@ -11400,7 +11749,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:65
+#: dpkg-split.1:64
 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 "
@@ -11408,23 +11757,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:67
+#: dpkg-split.1:66
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:70
-msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
+#: dpkg-split.1:69
+msgid ""
+"By default the output file is called "
+"I<package>B<_>I<version>B<_>I<arch>B<.deb>."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:71
+#: dpkg-split.1:70
 #, no-wrap
 msgid "B<-I>, B<--info> I<part>..."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -11432,25 +11783,25 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 #, no-wrap
 msgid "B<-a>, B<--auto -o> I<complete-output part>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:79
+#: dpkg-split.1:78
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:84
+#: dpkg-split.1:83
 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:91
+#: dpkg-split.1:90
 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 "
@@ -11458,21 +11809,22 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:97
+#: dpkg-split.1:96
 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:104
+#: dpkg-split.1:103
 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."
+"with status B<1>; if some other trouble occurs then it will exit with status "
+"B<2>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 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 "
@@ -11480,18 +11832,18 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 #, no-wrap
 msgid "B<-l>, B<--listq>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:114
+#: dpkg-split.1:113
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 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 "
@@ -11499,77 +11851,77 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 #, no-wrap
 msgid "B<-d>, B<--discard> [I<package>...]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:122
+#: dpkg-split.1:121
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:126
 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: TP
-#: dpkg-split.1:135
+#: dpkg-split.1:134
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 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:140
+#: dpkg-split.1:139
 #, no-wrap
 msgid "B<-S>, B<--partsize> I<kibibytes>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 msgid ""
 "Specifies the maximum part size when splitting, in kibibytes (1024 "
 "bytes). The default is 450 KiB."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 #, no-wrap
 msgid "B<-o>, B<--output> I<complete-output>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:147
+#: dpkg-split.1:146
 msgid "Specifies the output file name for a reassembly."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:152
+#: dpkg-split.1:151
 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:152
+#: dpkg-split.1:151
 #, no-wrap
 msgid "B<-Q>, B<--npquiet>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 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 "
@@ -11578,18 +11930,18 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 #, no-wrap
 msgid "B<--msdos>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:168
+#: dpkg-split.1:167
 msgid "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:174
+#: dpkg-split.1:173
 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 "
@@ -11597,7 +11949,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:179
+#: dpkg-split.1:178
 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."
@@ -11606,68 +11958,58 @@
 #. type: Plain text
 #: dpkg-split.1:186
 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."
+"The requested split, merge, or other command succeeded.  B<--info> commands "
+"count as successful even if the files are not binary package parts."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:192
+#: dpkg-split.1:193
 msgid ""
-"An exit status of 1 occurs only with B<--auto> and indicates that the "
-"I<part> file was not a binary package part."
+"Only occurs with B<--auto> and indicates that the I<part> file was not a "
+"binary package part."
 msgstr ""
 
-#. type: Plain text
-#: dpkg-split.1:196
-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."
+#. type: TP
+#: dpkg-split.1:193 start-stop-daemon.8:275 update-alternatives.8:378
+#, no-wrap
+msgid "B<2>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:201
+#: dpkg-split.1:198
 msgid ""
-"B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
-"of Debian packages."
+"Some kind of trouble happened, 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 ""
 
 #. type: Plain text
-#: dpkg-split.1:204
+#: dpkg-split.1:202
 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:207
+#: dpkg-split.1:205
 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:211
-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 ""
-
 #. type: TP
-#: dpkg-split.1:213
+#: dpkg-split.1:207
 #, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:211
 msgid "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:222
+#: dpkg-split.1:216
 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 "
@@ -11675,7 +12017,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:222
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr ""
 
@@ -11697,12 +12039,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:9
-msgid "B<dpkg-statoverride> [I<options>] I<command>"
+#: dpkg-statoverride.8:8
+msgid "B<dpkg-statoverride> [I<option>...] I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:19
+#: dpkg-statoverride.8:18
 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' "
@@ -11713,20 +12055,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:23
+#: dpkg-statoverride.8:22
 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:25
+#: dpkg-statoverride.8:24
 #, no-wrap
 msgid "B<--add>I< user group mode file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:33
+#: dpkg-statoverride.8:32
 msgid ""
 "Add an override for I<file>. I<file> does not need to exist when this "
 "command is used; the override will be stored and used later.  Users and "
@@ -11736,27 +12078,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:36
+#: dpkg-statoverride.8:35
 msgid ""
 "If --update is specified and I<file> exists, it is immediately set to the "
 "new owner and mode."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 msgid ""
 "Remove an override for I<file>, the status of I<file> is left unchanged by "
 "this command."
 msgstr ""
 
 #. type: TP
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 #, no-wrap
 msgid "B<--list> [I<glob-pattern>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:45
+#: 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 "
@@ -11764,49 +12106,49 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:56
 msgid ""
 "Change the I<directory> of the dpkg database where the statoverride file is "
 "also stored. Defaults to I</var/lib/dpkg>."
 msgstr ""
 
 #. type: TP
-#: dpkg-statoverride.8:57 update-alternatives.8:337
+#: dpkg-statoverride.8:56 update-alternatives.8:336
 #, no-wrap
 msgid "B<--force>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:61
+#: 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:61
+#: dpkg-statoverride.8:60
 #, no-wrap
 msgid "B<--update>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:65
+#: 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:68
+#: dpkg-statoverride.8:67
 msgid "Be less verbose about what we do."
 msgstr ""
 
 #. type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:75
 #, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:80
 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 "
@@ -11814,7 +12156,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:83
 msgid ""
 "Note: B<dpkg-statoverride> preserves the old copy of this file, with "
 "extension \"-old\", before replacing it with the new one."
@@ -11873,9 +12215,9 @@
 #: dpkg-trigger.1:31
 msgid ""
 "Check if the running B<dpkg> supports triggers (usually called from a "
-"postinst). Will exit 0 if a triggers-capable B<dpkg> has run, or 1 with an "
-"error message to stderr if not. Normally, however, it is better just to "
-"activate the desired trigger with B<dpkg-trigger>."
+"postinst). Will exit B<0> if a triggers-capable B<dpkg> has run, or B<1> "
+"with an error message to stderr if not. Normally, however, it is better just "
+"to activate the desired trigger with B<dpkg-trigger>."
 msgstr ""
 
 #. type: TP
@@ -11888,7 +12230,7 @@
 #: dpkg-trigger.1:49
 msgid ""
 "Override trigger awaiter (normally set by B<dpkg> through the "
-"DPKG_MAINTSCRIPT_PACKAGE environment variable of the maintainer scripts, "
+"B<DPKG_MAINTSCRIPT_PACKAGE> environment variable of the maintainer scripts, "
 "naming the package to which the script belongs, and this will be used by "
 "default)."
 msgstr ""
@@ -11921,7 +12263,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-trigger.1:68
+#: dpkg-trigger.1:69
 msgid "B<dpkg>(1), B<deb-triggers>(5), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
 msgstr ""
 
@@ -11931,12 +12273,6 @@
 msgid "dpkg-vendor"
 msgstr ""
 
-#. type: TH
-#: dpkg-vendor.1:1
-#, no-wrap
-msgid "2009-05-10"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-vendor.1:4
 msgid "dpkg-vendor - queries information about distribution vendors"
@@ -11964,7 +12300,7 @@
 #. type: Plain text
 #: dpkg-vendor.1:19
 msgid ""
-"Exits with 0 if the current vendor is I<vendor>. Otherwise exits with "
+"Exits with B<0> if the current vendor is I<vendor>. Otherwise exits with "
 "non-zero."
 msgstr ""
 
@@ -11977,7 +12313,7 @@
 #. type: Plain text
 #: dpkg-vendor.1:24
 msgid ""
-"Exits with 0 if the current vendor distribution is a derivative of "
+"Exits with B<0> if the current vendor distribution is a derivative of "
 "I<vendor>, otherwise exits with non-zero. It uses the \"Parent\" field to "
 "browse all ancestors of the current vendor."
 msgstr ""
@@ -12005,7 +12341,7 @@
 #: dpkg-vendor.1:41
 msgid ""
 "Assumes the current vendor is I<vendor> instead of discovering it with the "
-"DEB_VENDOR environment variable or B</etc/dpkg/origins/default>."
+"B<DEB_VENDOR> environment variable or B</etc/dpkg/origins/default>."
 msgstr ""
 
 #. type: TP
@@ -12022,7 +12358,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-vendor.1:50 update-alternatives.8:497
+#: dpkg-vendor.1:50 update-alternatives.8:498
 msgid "Copyright \\(co 2009 Rapha\\[:e]l Hertzog"
 msgstr ""
 
@@ -12038,16 +12374,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:16
-msgid ""
-"B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--version>] "
-"[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+..>]]]"
+#: dselect.1:8
+msgid "B<dselect> [I<option>...] [I<action>]"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:25
+#: dselect.1:17
 #, no-wrap
 msgid ""
 "B<dselect>\n"
@@ -12060,7 +12392,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:37
+#: dselect.1:29
 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 "
@@ -12074,33 +12406,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:43
+#: dselect.1:35
 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 "
+"argument, then that action is started immediately. Several command line "
 "parameters are still available to modify the running behaviour of B<dselect> "
 "or show additional information about the program."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:51
+#: dselect.1:43
 msgid ""
-"All options can be specified both on the commandline and in the B<dselect> "
+"All options can be specified both on the command line and in the B<dselect> "
 "configuration file I</etc/dpkg/dselect.cfg> or the files on the "
-"configuration directory I</etc/dpkg/dpkg.cfg.d/>. Each line in the "
-"configuration file is either an option (exactly the same as the commandline "
+"configuration directory I</etc/dpkg/dselect.cfg.d/>. 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
-#: dselect.1:52
-#, no-wrap
-msgid "B<--admindir>I< E<lt>directoryE<gt>>"
-msgstr ""
-
 #. type: Plain text
-#: dselect.1:57
+#: dselect.1:49
 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 "
@@ -12108,29 +12434,29 @@
 msgstr ""
 
 #. type: TP
-#: dselect.1:57
+#: dselect.1:49
 #, no-wrap
-msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
+msgid "B<--debug>I< file >|I< >B<-D>I<file>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:60
-msgid "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+#: dselect.1:52
+msgid "Turn on debugging. Debugging information is sent to I<file>."
 msgstr ""
 
 #. type: TP
-#: dselect.1:60
+#: dselect.1:52
 #, no-wrap
 msgid "B<--expert>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:64
+#: dselect.1:56
 msgid "Turns on expert mode, i.e. doesn't display possibly annoying help messages."
 msgstr ""
 
 #. type: TP
-#: dselect.1:64
+#: dselect.1:56
 #, no-wrap
 msgid ""
 "B<--colour>|B<--color> "
@@ -12138,7 +12464,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:71
+#: dselect.1:63
 msgid ""
 "Configures screen colors. This works only if your display supports colors.  "
 "This option may be used multiple times (and is best used in "
@@ -12148,143 +12474,143 @@
 msgstr ""
 
 #. type: TP
-#: dselect.1:72
+#: dselect.1:64
 #, no-wrap
 msgid "B<title>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:75
+#: dselect.1:67
 msgid "The screen title."
 msgstr ""
 
 #. type: TP
-#: dselect.1:75
+#: dselect.1:67
 #, no-wrap
 msgid "B<listhead>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:78
+#: dselect.1:70
 msgid "The header line above the list of packages."
 msgstr ""
 
 #. type: TP
-#: dselect.1:78
+#: dselect.1:70
 #, no-wrap
 msgid "B<list>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:81
+#: dselect.1:73
 msgid "The scrolling list of packages (and also some help text)."
 msgstr ""
 
 #. type: TP
-#: dselect.1:81
+#: dselect.1:73
 #, no-wrap
 msgid "B<listsel>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:84
+#: dselect.1:76
 msgid "The selected item in the list."
 msgstr ""
 
 #. type: TP
-#: dselect.1:84
+#: dselect.1:76
 #, no-wrap
 msgid "B<pkgstate>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:88
+#: dselect.1:80
 msgid ""
 "In the list of packages, the text indicating the current state of each "
 "package."
 msgstr ""
 
 #. type: TP
-#: dselect.1:88
+#: dselect.1:80
 #, no-wrap
 msgid "B<pkgstatesel>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:92
+#: dselect.1:84
 msgid ""
 "In the list of packages, the text indicating the current state of the "
 "currently selected package."
 msgstr ""
 
 #. type: TP
-#: dselect.1:92
+#: dselect.1:84
 #, no-wrap
 msgid "B<infohead>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:95
+#: dselect.1:87
 msgid "The header line that displays the state of the currently selected package."
 msgstr ""
 
 #. type: TP
-#: dselect.1:95
+#: dselect.1:87
 #, no-wrap
 msgid "B<infodesc>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:98
+#: dselect.1:90
 msgid "The package's short description."
 msgstr ""
 
 #. type: TP
-#: dselect.1:98
+#: dselect.1:90
 #, no-wrap
 msgid "B<info>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:101
+#: dselect.1:93
 msgid "Used to display package info such as the package's description."
 msgstr ""
 
 #. type: TP
-#: dselect.1:101
+#: dselect.1:93
 #, no-wrap
 msgid "B<infofoot>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:104
+#: dselect.1:96
 msgid "The last line of the screen when selecting packages."
 msgstr ""
 
 #. type: TP
-#: dselect.1:104
+#: dselect.1:96
 #, no-wrap
 msgid "B<query>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:107
+#: dselect.1:99
 msgid "Used to display query lines"
 msgstr ""
 
 #. type: TP
-#: dselect.1:107
+#: dselect.1:99
 #, no-wrap
 msgid "B<helpscreen>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:110
+#: dselect.1:102
 msgid "Color of help screens."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:115
+#: dselect.1:107
 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, "
@@ -12292,7 +12618,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:121
+#: dselect.1:113
 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 "
@@ -12302,66 +12628,61 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:124
+#: dselect.1:116
 msgid "Print a brief help text and exit successfully."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:127
+#: dselect.1:119
 msgid "Print version information and exit successfully."
 msgstr ""
 
-#. type: SH
-#: dselect.1:128
-#, no-wrap
-msgid "USAGE"
-msgstr ""
-
 #. type: Plain text
-#: dselect.1:133
+#: dselect.1:126
 msgid ""
-"When B<dselect> is started interactively, it prompts the user with a menu of "
-"available actions:"
+"When B<dselect> is started it can perform the following actions, either "
+"directly if it was specified on the command line or by prompting the user "
+"with a menu of available actions if running interactively:"
 msgstr ""
 
 #. type: SS
-#: dselect.1:133
+#: dselect.1:126
 #, no-wrap
 msgid "access"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:135
+#: dselect.1:128
 msgid "Choose and configure an access method to access package repositories."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:141
+#: dselect.1:134
 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."
+"By default, B<dselect> provides several methods such as I<cdrom>, "
+"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount>, "
+"I<floppy> or I<ftp>, but other packages may provide additional methods, "
+"eg. the I<apt> access method provided by the B<apt> package."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:143
+#: dselect.1:136
 msgid "The use of the I<apt> access method is strongly recommended."
 msgstr ""
 
 #. type: SS
-#: dselect.1:144
+#: dselect.1:137
 #, no-wrap
 msgid "update"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:146
+#: dselect.1:139
 msgid "Refresh the available packages database."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:153
+#: dselect.1:146
 msgid ""
 "Retrieves a list of available package versions from the package repository, "
 "configured for the current access method, and update the dpkg database. The "
@@ -12371,25 +12692,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:156
+#: dselect.1:149
 msgid ""
 "Details of the update action depend on the access method's implementation.  "
 "Normally the process is straightforward and requires no user interaction."
 msgstr ""
 
 #. type: SS
-#: dselect.1:157
+#: dselect.1:150
 #, no-wrap
 msgid "select"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:159
+#: dselect.1:152
 msgid "View or manage package selections and dependencies."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:165
+#: dselect.1:158
 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 "
@@ -12399,7 +12720,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:172
+#: dselect.1:165
 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 "
@@ -12410,25 +12731,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:175
+#: dselect.1:168
 msgid ""
 "The use of the interactive package selections management screen is explained "
 "in more detail below."
 msgstr ""
 
 #. type: SS
-#: dselect.1:176
+#: dselect.1:169
 #, no-wrap
 msgid "install"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:178
+#: dselect.1:171
 msgid "Installs selected packages."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:184
+#: dselect.1:177
 msgid ""
 "The configured access method will fetch installable or upgradable packages "
 "from the relevant repositories and install these using B<dpkg>.  Depending "
@@ -12438,7 +12759,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:192
+#: dselect.1:185
 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 "
@@ -12450,7 +12771,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:199
+#: dselect.1:192
 msgid ""
 "Details of the install action depend on the access method's implementation.  "
 "The user's attention and input may be required during installation, "
@@ -12460,57 +12781,57 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:200
+#: dselect.1:193
 #, no-wrap
 msgid "config"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:202
+#: dselect.1:195
 msgid "Configures any previously installed, but not fully configured packages."
 msgstr ""
 
 #. type: SS
-#: dselect.1:203
+#: dselect.1:196
 #, no-wrap
 msgid "remove"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:205
+#: dselect.1:198
 msgid "Removes or purges installed packages, that are marked for removal."
 msgstr ""
 
 #. type: SS
-#: dselect.1:206
+#: dselect.1:199
 #, no-wrap
 msgid "quit"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:208
+#: dselect.1:201
 msgid "Quit B<dselect>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:210
+#: dselect.1:203
 msgid "Exits the program with zero (successful) errorcode."
 msgstr ""
 
 #. type: SH
-#: dselect.1:212
+#: dselect.1:205
 #, no-wrap
 msgid "Package selections management"
 msgstr ""
 
 #. type: SS
-#: dselect.1:214
+#: dselect.1:207
 #, no-wrap
 msgid "Introduction"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:230
+#: dselect.1:223
 msgid ""
 "B<dselect> directly exposes the administrator to some of the complexities "
 "involved with managing large sets of packages with many "
@@ -12525,7 +12846,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:236
+#: dselect.1:229
 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> "
@@ -12535,13 +12856,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:237
+#: dselect.1:230
 #, no-wrap
 msgid "Screen layout"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:245
+#: dselect.1:238
 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 "
@@ -12552,20 +12873,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:248
+#: dselect.1:241
 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 ""
 
 #. type: SS
-#: dselect.1:249
+#: dselect.1:242
 #, no-wrap
 msgid "Package details view"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:258
+#: dselect.1:251
 #, no-wrap
 msgid ""
 "The package details view by default shows the extended package description\n"
@@ -12578,7 +12899,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:262
+#: dselect.1:255
 msgid ""
 "In a dependency resolution screen, there is also the possibility of viewing "
 "the specific unresolved depends or conflicts related to the package and "
@@ -12586,13 +12907,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:263
+#: dselect.1:256
 #, no-wrap
 msgid "Packages status list"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:268
+#: dselect.1:261
 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 "
@@ -12600,7 +12921,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:276
+#: dselect.1:269
 msgid ""
 "For every package, the list shows the package's status, priority, section, "
 "installed and available versions, the package name and its short "
@@ -12611,7 +12932,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:282
+#: dselect.1:275
 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 "
@@ -12620,7 +12941,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:300
+#: dselect.1:293
 #, no-wrap
 msgid ""
 "These are the meanings of the shorthand package status indicator codes:\n"
@@ -12643,20 +12964,20 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:301
+#: dselect.1:294
 #, no-wrap
 msgid "Cursor and screen movement"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:306
+#: dselect.1:299
 msgid ""
 "The package selection list and the dependency conflict resolution screens "
 "can be navigated using motion commands mapped to the following keys:"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:323
+#: dselect.1:316
 #, no-wrap
 msgid ""
 "  B<p, Up, k>           move cursor bar up\n"
@@ -12678,13 +12999,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:324
+#: dselect.1:317
 #, no-wrap
 msgid "Searching and sorting"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:338
+#: dselect.1:331
 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 "
@@ -12698,7 +13019,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:345
+#: dselect.1:338
 #, no-wrap
 msgid ""
 "The list sort order can be varied by pressing\n"
@@ -12710,20 +13031,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:348
+#: dselect.1:341
 msgid ""
 "Where not listed above explicitly, alphabetic order is used as the final "
 "subordering sort key."
 msgstr ""
 
 #. type: SS
-#: dselect.1:349
+#: dselect.1:342
 #, no-wrap
 msgid "Altering selections"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:358
+#: dselect.1:351
 #, no-wrap
 msgid ""
 "The requested selection state of individual packages may be\n"
@@ -12736,7 +13057,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:362
+#: dselect.1:355
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution "
@@ -12744,7 +13065,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:367
+#: dselect.1:360
 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 "
@@ -12752,7 +13073,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:373
+#: dselect.1:366
 msgid ""
 "Proper care should be taken when altering large groups of selections, "
 "because this can instantaneously create large numbers of unresolved depends "
@@ -12762,13 +13083,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:374
+#: dselect.1:367
 #, no-wrap
 msgid "Resolving depends and conflicts"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:379
+#: dselect.1:372
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution "
@@ -12776,7 +13097,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:386
+#: dselect.1:379
 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 "
@@ -12787,7 +13108,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:392
+#: dselect.1:385
 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, "
@@ -12797,7 +13118,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:400
+#: dselect.1:393
 msgid ""
 "The listed packages' selection state may be reverted to the original "
 "settings, as they were before the unresolved depends or conflicts were "
@@ -12808,13 +13129,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:401
+#: dselect.1:394
 #, no-wrap
 msgid "Establishing the requested selections"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:408
+#: dselect.1:401
 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 "
@@ -12824,7 +13145,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:414
+#: dselect.1:407
 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 "
@@ -12833,7 +13154,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:421
+#: dselect.1:414
 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 "
@@ -12843,7 +13164,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:428
+#: dselect.1:421
 msgid ""
 "If you mistakenly establish some settings and wish to revert all the "
 "selections to what is currently installed on the system, press the B<'C'> "
@@ -12853,36 +13174,36 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:435
+#: dselect.1:428
 msgid ""
 "If set, B<dselect> will use it as the directory from which to read the user "
 "specific configuration file."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:441
+#: dselect.1:434
 msgid ""
 "The B<dselect> package selection interface is confusing to some new users.  "
 "Reportedly, it even makes seasoned kernel developers cry."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:443
+#: dselect.1:436
 msgid "The documentation is lacking."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:445
+#: dselect.1:438
 msgid "There is no help option in the main menu."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:447
+#: dselect.1:440
 msgid "The visible list of available packages cannot be reduced."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:451
+#: dselect.1:444
 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, "
@@ -12890,19 +13211,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:457
+#: dselect.1:450
 msgid "B<dpkg>(1), B<apt-get>(8), B<sources.list>(5), B<deb>(5)."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:462
+#: dselect.1:455
 msgid ""
 "B<dselect> was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list "
 "of contributors may be found in 'dselect --version'."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:465
+#: dselect.1:458
 msgid ""
 "This manual page was written by Juho Vuori E<lt>javuori@cc.helsinki.fiE<gt>, "
 "Josip Rodin and Joost kooij."
@@ -12914,6 +13235,12 @@
 msgid "dselect.cfg"
 msgstr ""
 
+#. type: TH
+#: dselect.cfg.5:1
+#, no-wrap
+msgid "2011-07-03"
+msgstr ""
+
 #. type: Plain text
 #: dselect.cfg.5:4
 msgid "dselect.cfg - dselect configuration file"
@@ -12923,7 +13250,7 @@
 #: 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 "
+"option which is exactly the same as a normal command line option for dselect "
 "except for the leading dashes which are not used here. Quotes surrounding "
 "option values are stripped. Comments are allowed by starting a line with a "
 "hash sign (\"B<#>\")."
@@ -12968,12 +13295,12 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:9
-msgid "B<start-stop-daemon> [I<options>] I<command>"
+#: start-stop-daemon.8:8
+msgid "B<start-stop-daemon> [I<option>...] I<command>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:15
+#: start-stop-daemon.8:14
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
 "system-level processes.  Using one of the matching options, "
@@ -12982,7 +13309,7 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:34
+#: start-stop-daemon.8:33
 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 "
@@ -12995,13 +13322,13 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:36
+#: start-stop-daemon.8:35
 #, no-wrap
 msgid "B<-S>, B<--start> [B<-->] I<arguments>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 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 "
@@ -13012,13 +13339,13 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 #, no-wrap
 msgid "B<-K>, B<--stop>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
 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 "
@@ -13029,113 +13356,126 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
 #, no-wrap
-msgid "B<-H>, B<--help>"
+msgid "B<-T>, B<--status>"
 msgstr ""
 
 #. type: Plain text
 #: start-stop-daemon.8:74
-msgid "Show usage information and exit."
+msgid ""
+"Check for the existence of a specified process, and returns an exit status "
+"code, according to the LSB Init Script Actions."
 msgstr ""
 
 #. type: TP
 #: start-stop-daemon.8:74
 #, no-wrap
-msgid "B<-V>, B<--version>"
+msgid "B<-H>, B<--help>"
 msgstr ""
 
 #. type: Plain text
 #: start-stop-daemon.8:77
+msgid "Show usage information and exit."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:77
+#, no-wrap
+msgid "B<-V>, B<--version>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:80
 msgid "Show the program version and exit."
 msgstr ""
 
 #. type: SH
-#: start-stop-daemon.8:78
+#: start-stop-daemon.8:81
 #, no-wrap
 msgid "MATCHING OPTIONS"
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:79
+#: start-stop-daemon.8:82
 #, no-wrap
 msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:83
+#: start-stop-daemon.8:86
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:83
+#: start-stop-daemon.8:86
 #, no-wrap
 msgid "B<-x>, B<--exec> I<executable>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 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:87
+#: start-stop-daemon.8:90
 #, no-wrap
 msgid "B<-n>, B<--name> I<process-name>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:93
+#: start-stop-daemon.8:96
 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:93
+#: start-stop-daemon.8:96
 #, no-wrap
 msgid "B<-u>, B<--user> I<username>|I<uid>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:99
+#: start-stop-daemon.8:102
 msgid "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:101
+#: start-stop-daemon.8:104
 #, no-wrap
 msgid "B<-g>, B<--group> I<group>|I<gid>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:107
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:107
 #, no-wrap
 msgid "B<-s>, B<--signal> I<signal>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:109
+#: start-stop-daemon.8:112
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default TERM)."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:109
+#: start-stop-daemon.8:112
 #, no-wrap
 msgid "B<-R>, B<--retry> I<timeout>|I<schedule>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:119
+#: start-stop-daemon.8:122
 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 "
@@ -13144,7 +13484,7 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:130
+#: start-stop-daemon.8:133
 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 "
@@ -13152,7 +13492,7 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:146
+#: start-stop-daemon.8:149
 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 "
@@ -13162,7 +13502,7 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 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, "
@@ -13170,61 +13510,61 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 #, no-wrap
 msgid "B<-a>, B<--startas> I<pathname>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:164
+#: start-stop-daemon.8:167
 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:164
+#: start-stop-daemon.8:167
 #, no-wrap
 msgid "B<-t>, B<--test>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 #, no-wrap
 msgid "B<-o>, B<--oknodo>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 #, no-wrap
 msgid "B<-q>, B<--quiet>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:174
+#: start-stop-daemon.8:177
 msgid "Do not print informational messages; only display error messages."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:174
+#: start-stop-daemon.8:177
 #, no-wrap
-msgid "B<-c>, B<--chuid> I<username>|I<uid>"
+msgid "B<-c>, B<--chuid> I<username>|I<uid>[B<:>I<group>|I<gid>]"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 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 "
@@ -13238,26 +13578,26 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 #, no-wrap
 msgid "B<-r>, B<--chroot> I<root>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 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:198
+#: start-stop-daemon.8:201
 #, no-wrap
 msgid "B<-d>, B<--chdir> I<path>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 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, "
@@ -13266,13 +13606,13 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 #, no-wrap
 msgid "B<-b>, B<--background>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 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 "
@@ -13284,24 +13624,24 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 #, no-wrap
 msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 msgid "This alters the priority of the process before starting it."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 #, no-wrap
 msgid "B<-P>, B<--procsched> I<policy>B<:>I<priority>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 msgid ""
 "This alters the process scheduler policy and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -13310,13 +13650,13 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 #, no-wrap
 msgid "B<-I>, B<--iosched> I<class>B<:>I<priority>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 msgid ""
 "This alters the IO scheduler class and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -13326,24 +13666,24 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 #, no-wrap
 msgid "B<-k>, B<--umask> I<mask>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 msgid "This sets the umask of the process before starting it."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 #, no-wrap
 msgid "B<-m>, B<--make-pidfile>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:252
+#: start-stop-daemon.8:255
 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 "
@@ -13354,38 +13694,83 @@
 "usually only useful when combined with the B<--background> option."
 msgstr ""
 
+#. type: Plain text
+#: start-stop-daemon.8:258
+msgid "Print verbose informational messages."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:270
+msgid ""
+"The requested action was performed. If B<--oknodo> was specified, it's also "
+"possible that nothing had to be done.  This can happen when B<--start> was "
+"specified and a matching process was already running, or when B<--stop> was "
+"specified and there were no matching processes."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:275
+msgid "If B<--oknodo> was not specified and nothing was done."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:283
+msgid ""
+"If B<--stop> and B<--retry> were specified, but the end of the schedule was "
+"reached and the processes were still running."
+msgstr ""
+
 #. type: TP
-#: start-stop-daemon.8:252
+#: start-stop-daemon.8:283 start-stop-daemon.8:295
 #, no-wrap
-msgid "B<-v>, B<--verbose>"
+msgid "B<3>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:255
-msgid "Print verbose informational messages."
+#: start-stop-daemon.8:286
+msgid "Any other error."
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:272
-msgid ""
-"B<start-stop-daemon> returns 0 if the requested action was performed, or if "
-"B<--oknodo> is specified and either B<--start> was specified and a matching "
-"process was already running, or B<--stop> was specified and there were no "
-"matching processes. If B<--oknodo> was not specified and nothing was done, 1 "
-"is returned. If B<--stop> and B<--retry> were specified, but the end of the "
-"schedule was reached and the processes were still running, the error value "
-"is 2. For all other errors, the status is 3."
+#: start-stop-daemon.8:289
+msgid "When using the B<--status> command, the following status codes are returned:"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:292
+msgid "Program is running."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:295
+msgid "Program is not running and the pid file exists."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:298
+msgid "Program is not running."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:298
+#, no-wrap
+msgid "B<4>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:276
+#: start-stop-daemon.8:301
+msgid "Unable to determine program status."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:305
 msgid ""
 "Start the B<food> daemon, unless one is already running (a process named "
 "food, running as user food, with pid in food.pid):"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:279
+#: start-stop-daemon.8:308
 #, no-wrap
 msgid ""
 "start-stop-daemon --start --oknodo --user food --name food --pidfile "
@@ -13393,12 +13778,12 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:282
+#: start-stop-daemon.8:311
 msgid "Send B<SIGTERM> to B<food> and wait up to 5 seconds for it to stop:"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:285
+#: start-stop-daemon.8:314
 #, no-wrap
 msgid ""
 "start-stop-daemon --stop --oknodo --user food --name food --pidfile "
@@ -13406,12 +13791,12 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:288
+#: start-stop-daemon.8:317
 msgid "Demonstration of a custom schedule for stopping B<food>:"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:291
+#: start-stop-daemon.8:320
 #, no-wrap
 msgid ""
 "start-stop-daemon --stop --oknodo --user food --name food --pidfile "
@@ -13419,14 +13804,14 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:297
+#: start-stop-daemon.8:326
 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:299
+#: start-stop-daemon.8:328
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -13444,19 +13829,19 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:16
-msgid "B<update-alternatives> [I<options>] I<command>"
+#: update-alternatives.8:15
+msgid "B<update-alternatives> [I<option>...] I<command>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:21
+#: update-alternatives.8:20
 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:29
+#: update-alternatives.8:28
 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 "
@@ -13467,7 +13852,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:51
+#: update-alternatives.8:50
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -13482,7 +13867,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:61
+#: update-alternatives.8:60
 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> "
@@ -13493,7 +13878,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:73
+#: update-alternatives.8:72
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -13503,7 +13888,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:92
+#: update-alternatives.8:91
 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 "
@@ -13516,7 +13901,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:101
+#: 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 "
@@ -13527,7 +13912,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:110
+#: 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 "
@@ -13537,7 +13922,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:117
+#: 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 "
@@ -13545,26 +13930,26 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:134
+#: update-alternatives.8:133
 msgid ""
-"When using the I<--config> option, B<update-alternatives> will list all of "
+"When using the B<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master "
 "alternative name. The current choice is marked with a '*'.  You will then be "
 "prompted for your choice regarding this link group.  Depending on the choice "
 "made, the link group might no longer be in I<auto> mode. You will need to "
-"use the I<--auto> option in order to return to the automatic mode (or you "
-"can rerun I<--config> and select the entry marked as automatic)."
+"use the B<--auto> option in order to return to the automatic mode (or you "
+"can rerun B<--config> and select the entry marked as automatic)."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:138
+#: update-alternatives.8:137
 msgid ""
-"If you want to configure non-interactively you can use the I<--set> option "
+"If you want to configure non-interactively you can use the B<--set> option "
 "instead (see below)."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:149
+#: update-alternatives.8:148
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "In other words, the usage of B<update-alternatives> is B<mandatory> for all "
@@ -13573,124 +13958,124 @@
 msgstr ""
 
 #. type: SH
-#: update-alternatives.8:150
+#: update-alternatives.8:149
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 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:155
+#: update-alternatives.8:154
 #, no-wrap
 msgid "generic name (or alternative link)"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 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:161
+#: update-alternatives.8:160
 #, no-wrap
 msgid "alternative name"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 msgid "The name of a symbolic link in the alternatives directory."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 #, no-wrap
 msgid "alternative (or alternative path)"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 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:168
+#: update-alternatives.8:167
 #, no-wrap
 msgid "alternatives directory"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 #, no-wrap
 msgid "administrative directory"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing "
 "B<update-alternatives>' state information."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 #, no-wrap
 msgid "link group"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 #, no-wrap
 msgid "master link"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 msgid ""
 "The alternative link in a link group which determines how the other links in "
 "the group are configured."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 #, no-wrap
 msgid "slave link"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 msgid ""
 "An alternative link in a link group which is controlled by the setting of "
 "the master link."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 #, no-wrap
 msgid "automatic mode"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 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 "
@@ -13698,26 +14083,26 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 #, no-wrap
 msgid "manual mode"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:201
 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: TP
-#: update-alternatives.8:204
+#: update-alternatives.8:203
 #, no-wrap
 msgid "B<--install> I<link name path priority> [B<--slave> I<link name path>]..."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:222
 msgid ""
 "Add a group of alternatives to the system.  I<link> is the generic name for "
 "the master link, I<name> is the name of its symlink in the alternatives "
@@ -13733,7 +14118,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 msgid ""
 "If the alternative name specified exists already in the alternatives "
 "system's records, the information supplied will be added as a new set of "
@@ -13745,26 +14130,26 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
-"I<--config> but is non-interactive and thus scriptable."
+"B<--config> but is non-interactive and thus scriptable."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 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 "
@@ -13777,20 +14162,20 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:269
+#: update-alternatives.8:268
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 msgid ""
 "Call B<--config> on all alternatives. It can be usefully combined with "
 "B<--skip-auto> to review and configure all alternatives which are not "
@@ -13800,13 +14185,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 #, no-wrap
 msgid "B<--auto> I<name>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 msgid ""
 "Switch the link group behind the alternative for I<name> to automatic mode.  "
 "In the process, the master symlink and its slaves are updated to point to "
@@ -13814,13 +14199,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 #, no-wrap
 msgid "B<--display> I<name>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 msgid ""
 "Display information about the link group.  Information displayed includes "
 "the group's mode (auto or manual), which alternative the master link "
@@ -13830,13 +14215,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 #, no-wrap
 msgid "B<--get-selections>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:300
+#: update-alternatives.8:299
 msgid ""
 "List all master alternative names (those controlling a link group)  and "
 "their status. Each line contains up to 3 fields (separated by one or more "
@@ -13847,146 +14232,146 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 msgid ""
 "Read configuration of alternatives on standard input in the format generated "
 "by B<update-alternatives --get-selections> and reconfigure them accordingly."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 #, no-wrap
 msgid "B<--query> I<name>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 msgid ""
 "Display information about the link group like --display does, but in a "
 "machine parseable way (see section B<QUERY FORMAT> below)."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 #, no-wrap
 msgid "B<--list> I<name>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 msgid "Display all targets of the link group."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 #, no-wrap
 msgid "B<--config> I<name>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:317
+#: update-alternatives.8:316
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:325
+#: update-alternatives.8:324
 #, no-wrap
 msgid "B<--altdir>I< directory>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:329
+#: update-alternatives.8:328
 msgid ""
 "Specifies the alternatives directory, when this is to be different from the "
 "default."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 msgid ""
 "Specifies the administrative directory, when this is to be different from "
 "the default."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 #, no-wrap
 msgid "B<--log>I< file>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:337
+#: update-alternatives.8:336
 msgid ""
 "Specifies the log file, when this is to be different from the default "
 "(/var/log/alternatives.log)."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 msgid ""
-"Let B<update-alternatives> replace any real file that is installed where an "
-"alternative link has to be installed."
+"Let B<update-alternatives> replace or drop any real file that is installed "
+"where an alternative link has to be installed or removed."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 #, no-wrap
 msgid "B<--skip-auto>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 msgid ""
 "Skip configuration prompt for alternatives which are properly configured in "
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 #, no-wrap
 msgid "B<--verbose>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:351
+#: update-alternatives.8:350
 msgid "Generate more comments about what B<update-alternatives> is doing."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:354
+#: update-alternatives.8:353
 msgid "Don't generate any comments unless errors occur."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:360
+#: update-alternatives.8:359
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the base administrative directory."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:362
+#: update-alternatives.8:361
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 #, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:374
+#: update-alternatives.8:373
 msgid ""
 "The default administration directory.  Can be overridden by the "
 "B<--admindir> option."
@@ -13997,84 +14382,78 @@
 msgid "The requested action was successfully performed."
 msgstr ""
 
-#. type: IP
-#: update-alternatives.8:378
-#, no-wrap
-msgid "2"
-msgstr ""
-
 #. type: Plain text
-#: update-alternatives.8:381
+#: update-alternatives.8:382
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
 msgstr ""
 
 #. type: SH
-#: update-alternatives.8:382
+#: update-alternatives.8:383
 #, no-wrap
 msgid "QUERY FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:387
+#: update-alternatives.8:388
 msgid ""
-"The B<update-alternatives> I<--query> format is using an RFC822-like flat "
+"The B<update-alternatives --query> format is using an RFC822-like flat "
 "format. It's made of I<n> + 1 blocks where I<n> is the number of "
 "alternatives available in the queried link group. The first block contains "
 "the following fields:"
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:387
+#: update-alternatives.8:388
 #, no-wrap
-msgid "B<Link:> E<lt>linkE<gt>"
+msgid "B<Link:>I< link>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 msgid "The generic name of the alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 #, no-wrap
-msgid "B<Status:> E<lt>statusE<gt>"
+msgid "B<Status:>I< status>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 #, no-wrap
-msgid "B<Best:> E<lt>best choiceE<gt>"
+msgid "B<Best:>I< best-choice>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 #, no-wrap
-msgid "B<Value:> E<lt>currently selected alternativeE<gt> "
+msgid "B<Value:>I< currently-selected-alternative>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:401
+#: update-alternatives.8:402
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:402
+#: update-alternatives.8:403
 #, no-wrap
 msgid ""
 "The other blocks describe the available alternatives in the queried link "
@@ -14082,35 +14461,35 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:404
+#: update-alternatives.8:405
 #, no-wrap
-msgid "B<Alternative:> E<lt>path of this alternativeE<gt>"
+msgid "B<Alternative:>I< path-of-this-alternative>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 msgid "Path to this block's alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 #, no-wrap
-msgid "B<Priority:> E<lt>priority valueE<gt>"
+msgid "B<Priority:>I< priority-value>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 msgid "Value of the priority of this alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 #, no-wrap
-msgid "B<Slaves:> E<lt>list of slavesE<gt>"
+msgid "B<Slaves:>I< list-of-slaves>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:416
+#: update-alternatives.8:417
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -14119,13 +14498,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:417
+#: update-alternatives.8:418
 #, no-wrap
 msgid "B<Example>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:426
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
@@ -14136,7 +14515,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:430
+#: update-alternatives.8:431
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -14146,7 +14525,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:446
 #, no-wrap
 msgid ""
 "Alternative: /usr/bin/vim.gtk\n"
@@ -14166,9 +14545,9 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:457
+#: update-alternatives.8:458
 msgid ""
-"With I<--verbose> B<update-alternatives> chatters incessantly about its "
+"With B<--verbose> 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 "
@@ -14176,7 +14555,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:464
 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 "
@@ -14185,48 +14564,48 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:466
+#: update-alternatives.8:467
 msgid ""
 "To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
+"setting for it, use the B<--display> action:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:469
+#: update-alternatives.8:470
 msgid "B<update-alternatives --display vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:473
+#: update-alternatives.8:474
 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:476
+#: update-alternatives.8:477
 msgid "B<update-alternatives --config vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:480
+#: update-alternatives.8:481
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:483
+#: update-alternatives.8:484
 msgid "B<update-alternatives --auto vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:488
 msgid "If you find a bug, please report it using the Debian bug-tracking system."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:492
+#: update-alternatives.8:493
 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 "
@@ -14234,18 +14613,18 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:503
+#: update-alternatives.8:504
 msgid "This manual page is copyright 1997,1998 Charles Briscoe-Smith and others."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:506
+#: update-alternatives.8:507
 msgid ""
 "This is free documentation; see the GNU General Public Licence version 2 or "
 "later for copying conditions. There is NO WARRANTY."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:509
+#: update-alternatives.8:510
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/es.po /home/vorlon/devel/multiarch/dpkg-debian/man/po/es.po
--- dpkg/man/po/es.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/es.po	2012-06-07 10:11:09.426073000 -0700
@@ -38,7 +38,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.18.8.5\n"
-"POT-Creation-Date: 2011-04-01 22:07+0300\n"
+"POT-Creation-Date: 2011-11-25 11:22+0100\n"
 "PO-Revision-Date: 2010-12-15 20:18+0100\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -56,10 +56,18 @@
 msgstr "deb"
 
 #. type: TH
-#: deb.5:1
-#, no-wrap
-msgid "2009-02-27"
-msgstr "27 de Febrero de 2009"
+#: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-version.5:5 deb-old.5:1
+#: deb-override.5:15 deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg-buildpackage.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-trigger.1:1
+#: dselect.1:1 update-alternatives.8:8
+#, fuzzy, no-wrap
+#| msgid "2010-03-07"
+msgid "2011-08-14"
+msgstr "7 de Marzo de 2010"
 
 #. type: TH
 #: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-split.5:1 deb-version.5:5
@@ -130,15 +138,15 @@
 #: deb.5:6 deb-control.5:10 deb-src-control.5:10 deb-split.5:6
 #: deb-version.5:11 deb-old.5:8 deb-override.5:22 deb-extra-override.5:8
 #: deb-shlibs.5:20 deb-substvars.5:9 deb-symbols.5:9 deb-triggers.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildflags.1:9
+#: dpkg.1:19 dpkg-architecture.1:10 dpkg.cfg.5:5 dpkg-buildflags.1:9
 #: 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-deb.1:9 dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
 #: dpkg-gensymbols.1:10 dpkg-maintscript-helper.1:15 dpkg-mergechangelogs.1:9
 #: dpkg-name.1:16 dpkg-parsechangelog.1:9 dpkg-query.1:9
-#: dpkg-scanpackages.1:28 dpkg-scansources.1:14 dpkg-shlibdeps.1:11
-#: dpkg-source.1:11 dpkg-split.1:11 dpkg-statoverride.8:10 dpkg-trigger.1:12
-#: dpkg-vendor.1:9 dselect.1:17 dselect.cfg.5:5 start-stop-daemon.8:10
-#: update-alternatives.8:17
+#: dpkg-scanpackages.1:27 dpkg-scansources.1:13 dpkg-shlibdeps.1:9
+#: dpkg-source.1:10 dpkg-split.1:10 dpkg-statoverride.8:9 dpkg-trigger.1:12
+#: dpkg-vendor.1:9 dselect.1:9 dselect.cfg.5:5 start-stop-daemon.8:9
+#: update-alternatives.8:16
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIPCIÓN"
@@ -288,15 +296,15 @@
 "bajo, o (posiblemente) causarán un incremento del número mayor de versión."
 
 #. type: SH
-#: deb.5:79 deb-control.5:269 deb-src-control.5:322 deb-split.5:37
+#: deb.5:79 deb-control.5:271 deb-src-control.5:327 deb-split.5:49
 #: deb-version.5:116 deb-old.5:51 deb-override.5:62 deb-extra-override.5:37
-#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:49
-#: dpkg.1:782 dpkg-architecture.1:300 dpkg.cfg.5:23 dpkg-buildpackage.1:249
-#: dpkg-deb.1:246 dpkg-divert.8:132 dpkg-gensymbols.1:445 dpkg-name.1:95
-#: dpkg-query.1:212 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:701 dpkg-split.1:223
-#: dpkg-statoverride.8:85 dpkg-trigger.1:66 dselect.1:452 dselect.cfg.5:23
-#: update-alternatives.8:507
+#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:67
+#: dpkg.1:768 dpkg-architecture.1:299 dpkg.cfg.5:23 dpkg-buildpackage.1:249
+#: dpkg-deb.1:259 dpkg-divert.8:132 dpkg-gensymbols.1:450 dpkg-name.1:96
+#: dpkg-query.1:220 dpkg-scanpackages.1:110 dpkg-scansources.1:71
+#: dpkg-shlibdeps.1:324 dpkg-source.1:725 dpkg-split.1:217
+#: dpkg-statoverride.8:84 dpkg-trigger.1:66 dselect.1:445 dselect.cfg.5:23
+#: update-alternatives.8:508
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VÉASE TAMBIÉN"
@@ -312,12 +320,6 @@
 msgid "deb-control"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-control.5:3 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
-#, no-wrap
-msgid "2010-07-29"
-msgstr "29 de julio del 2010"
-
 #. type: Plain text
 #: deb-control.5:6
 msgid "deb-control - Debian packages' master control file format"
@@ -358,9 +360,10 @@
 
 #. type: TP
 #: deb-control.5:26
-#, no-wrap
-msgid "B<Package:> E<lt>package nameE<gt>"
-msgstr "B<Package:> E<lt>nombre-del-paqueteE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<--package>I< package>"
+msgid "B<Package:>I< package-name>"
+msgstr "B<--package>I< paquete>"
 
 #. type: Plain text
 #: deb-control.5:30
@@ -373,8 +376,9 @@
 
 #. type: TP
 #: deb-control.5:30
-#, no-wrap
-msgid "B<Version:> E<lt>version stringE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Version:> E<lt>version stringE<gt>"
+msgid "B<Version:>I< version-string>"
 msgstr "B<Version:> E<lt>cadena-de-caracteres-con-el-número-de-versiónE<gt>"
 
 #. type: Plain text
@@ -392,8 +396,9 @@
 
 #. type: TP
 #: deb-control.5:37
-#, no-wrap
-msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
+msgid "B<Maintainer:>I< fullname-email>"
 msgstr "B<Maintainer:> E<lt>nombre-completo correo-electrónicoE<gt>"
 
 #. type: Plain text
@@ -409,13 +414,16 @@
 
 #. type: TP
 #: deb-control.5:42
-#, no-wrap
-msgid "B<Description:> E<lt>short descriptionE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Description:> E<lt>short descriptionE<gt>"
+msgid "B<Description:>I< short-description>"
 msgstr "B<Description:> E<lt>descripción-cortaE<gt>"
 
 #. type: Plain text
 #: deb-control.5:45
-msgid "B< >E<lt>long descriptionE<gt>"
+#, fuzzy
+#| msgid "B< >E<lt>long descriptionE<gt>"
+msgid "B< >I<long-description>"
 msgstr "B< >E<lt>descripción-largaE<gt>"
 
 #. type: Plain text
@@ -440,9 +448,10 @@
 msgstr "CAMPOS OPCIONALES"
 
 #. type: TP
-#: deb-control.5:53 deb-src-control.5:88
-#, no-wrap
-msgid "B<Section:> E<lt>sectionE<gt>"
+#: deb-control.5:53 deb-src-control.5:90
+#, fuzzy, no-wrap
+#| msgid "B<Section:> E<lt>sectionE<gt>"
+msgid "B<Section:>I< section>"
 msgstr "B<Section:> E<lt>secciónE<gt>"
 
 #. type: Plain text
@@ -457,9 +466,10 @@
 "«text», «x11» etc."
 
 #. type: TP
-#: deb-control.5:58 deb-src-control.5:94
-#, no-wrap
-msgid "B<Priority:> E<lt>priorityE<gt>"
+#: deb-control.5:58 deb-src-control.5:96
+#, fuzzy, no-wrap
+#| msgid "B<Priority:> E<lt>priorityE<gt>"
+msgid "B<Priority:>I< priority>"
 msgstr "B<Priority:> E<lt>prioridadE<gt>"
 
 #. type: Plain text
@@ -472,7 +482,7 @@
 "prioridades comunes son «required», «standard», «optional», «extra» etc."
 
 #. type: Plain text
-#: deb-control.5:71 deb-src-control.5:107
+#: deb-control.5:71 deb-src-control.5:109
 msgid ""
 "In Debian, the B<Section> and B<Priority> fields have a defined set of "
 "accepted values based on the Policy Manual.  A list of these values can be "
@@ -484,15 +494,22 @@
 "paquete B<debian-policy>."
 
 #. type: TP
-#: deb-control.5:71 deb-src-control.5:211
-#, no-wrap
-msgid "B<Essential:> E<lt>yes|noE<gt>"
+#: deb-control.5:71 deb-src-control.5:216
+#, fuzzy, no-wrap
+#| msgid "B<Essential:> E<lt>yes|noE<gt>"
+msgid "B<Essential:> B<yes>|B<no>"
 msgstr "B<Essential:> E<lt>yes|noE<gt>"
 
 #. type: Plain text
 #: deb-control.5:78
+#, fuzzy
+#| 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 "
+#| "other installation tool will not allow an B<Essential> package to be "
+#| "removed (at least not without using one of the force options)."
 msgid ""
-"This field is usually only needed when the answer is `yes'. It denotes a "
+"This field is usually only needed when the answer is B<yes>. It denotes a "
 "package that is required for proper operation of the system. Dpkg or any "
 "other installation tool will not allow an B<Essential> package to be removed "
 "(at least not without using one of the force options)."
@@ -504,8 +521,9 @@
 
 #. type: TP
 #: deb-control.5:78
-#, no-wrap
-msgid "B<Architecture:> E<lt>arch|allE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Architecture:> E<lt>arch|allE<gt>"
+msgid "B<Architecture:> I<arch>|B<all>"
 msgstr "B<Architecture:> E<lt>arch|allE<gt>"
 
 #. type: Plain text
@@ -523,9 +541,10 @@
 "los scripts de Perl o documentación."
 
 #. type: TP
-#: deb-control.5:86 deb-src-control.5:83
-#, no-wrap
-msgid "B<Origin:> E<lt>nameE<gt>"
+#: deb-control.5:86 deb-src-control.5:85
+#, fuzzy, no-wrap
+#| msgid "B<Origin:> E<lt>nameE<gt>"
+msgid "B<Origin:>I< name>"
 msgstr "B<Origin:> E<lt>nombreE<gt>"
 
 #. type: Plain text
@@ -535,40 +554,49 @@
 
 #. type: TP
 #: deb-control.5:89 deb-src-control.5:66
-#, no-wrap
-msgid "B<Bugs:> E<lt>urlE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Bugs:> E<lt>urlE<gt>"
+msgid "B<Bugs:>I< url>"
 msgstr "B<Bugs:> E<lt>urlE<gt>"
 
 #. type: Plain text
-#: deb-control.5:93
+#: deb-control.5:94
+#, fuzzy
+#| msgid ""
+#| "The url of the bug tracking system for this package. The current used "
+#| "format is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://"
+#| "bugs.debian.org>."
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian.org>."
 msgstr ""
 "La dirección url del sistema de seguimiento de fallos de este paquete. El "
 "formato usado actualmente es: B<E<lt>tipo-btsE<gt>://E<lt>direccion-"
 "btsE<gt>>, por ejemplo B<debbugs://bugs.debian.org>."
 
 #. type: TP
-#: deb-control.5:93 deb-src-control.5:62
-#, no-wrap
-msgid "B<Homepage:> E<lt>urlE<gt>"
+#: deb-control.5:94 deb-src-control.5:62
+#, fuzzy, no-wrap
+#| msgid "B<Homepage:> E<lt>urlE<gt>"
+msgid "B<Homepage:>I< url>"
 msgstr "B<Homepage:> E<lt>urlE<gt>"
 
 #. type: Plain text
-#: deb-control.5:96 deb-src-control.5:65
-msgid "The upstream project home page URL."
+#: deb-control.5:97
+#, fuzzy
+#| msgid "The upstream project home page URL."
+msgid "The upstream project home page I<url>."
 msgstr "La dirección url de la página oficial del autor original."
 
 #. type: TP
-#: deb-control.5:96 deb-src-control.5:217
-#, no-wrap
-msgid "B<Tag:> E<lt>tag listE<gt>"
+#: deb-control.5:97 deb-src-control.5:222
+#, fuzzy, no-wrap
+#| msgid "B<Tag:> E<lt>tag listE<gt>"
+msgid "B<Tag:>I< tag-list>"
 msgstr "B<Tag:> E<lt>lista-de-etiquetasE<gt>"
 
 #. type: Plain text
-#: deb-control.5:100
+#: deb-control.5:101
 msgid ""
 "List of tags describing the qualities of the package. The description and "
 "list of supported tags can be found in the B<debtags> package."
@@ -578,35 +606,36 @@
 "B<debtags>."
 
 #. type: TP
-#: deb-control.5:100
+#: deb-control.5:101 deb-src-control.5:219
 #, fuzzy, no-wrap
 #| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt>"
+msgid "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>"
 msgstr "B<Source:> E<lt>nombre-del-código-fuenteE<gt>"
 
 #. type: Plain text
-#: deb-control.5:111
+#: deb-control.5:113
 msgid ""
 "This field is used to indicate how this package should behave on a multi-"
-"arch installations. The value `same' means that the package is co-"
+"arch installations. The value B<same> means that the package is co-"
 "installable with itself, but it must not be used to satisfy the dependency "
-"of any package of a different architecture from itself. The value `foreign' "
+"of any package of a different architecture from itself. The value B<foreign> "
 "means that the package is not co-installable with itself, but should be "
 "allowed to satisfy the dependency of a package of a different arch from "
-"itself. The value `allowed` allows reverse-dependencies to indicate in their "
-"Depends field that they need a package from a foreign architecture, but has "
-"no effect otherwise. This field should not be present in packages with the "
-"Architecture: all field."
+"itself. The value B<allowed> allows reverse-dependencies to indicate in "
+"their Depends field that they need a package from a foreign architecture, "
+"but has no effect otherwise. This field should not be present in packages "
+"with the B<Architecture: all> field."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:111
-#, no-wrap
-msgid "B<Source:> E<lt>source nameE<gt>"
+#: deb-control.5:113
+#, fuzzy, no-wrap
+#| msgid "B<Source:> E<lt>source nameE<gt>"
+msgid "B<Source:>I< source-name>"
 msgstr "B<Source:> E<lt>nombre-del-código-fuenteE<gt>"
 
 #. type: Plain text
-#: deb-control.5:115
+#: deb-control.5:117
 msgid ""
 "The name of the source package that this binary package came from, if "
 "different than the name of the package itself."
@@ -615,28 +644,28 @@
 "tener un nombre diferente al paquete original."
 
 #. type: TP
-#: deb-control.5:116 deb-src-control.5:197
+#: deb-control.5:118 deb-src-control.5:202
 #, fuzzy, no-wrap
 #| msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgid "B<Subarchitecture:> E<lt>valueE<gt>"
+msgid "B<Subarchitecture:>I< value>"
 msgstr "B<Architecture:> E<lt>arch|allE<gt>"
 
 #. type: TP
-#: deb-control.5:119 deb-src-control.5:200
+#: deb-control.5:121 deb-src-control.5:205
 #, fuzzy, no-wrap
 #| msgid "B<Version:> E<lt>versionE<gt>"
-msgid "B<Kernel-Version:> E<lt>valueE<gt>"
+msgid "B<Kernel-Version:>I< value>"
 msgstr "B<Version:> E<lt>versiónE<gt>"
 
 #. type: TP
-#: deb-control.5:122 deb-src-control.5:203
+#: deb-control.5:124 deb-src-control.5:208
 #, fuzzy, no-wrap
 #| msgid "B<Date:> E<lt>dateE<gt>"
-msgid "B<Installer-Menu-Item:> E<lt>valueE<gt>"
+msgid "B<Installer-Menu-Item:>I< value>"
 msgstr "B<Date:> E<lt>fechaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:129 deb-src-control.5:210
+#: deb-control.5:131 deb-src-control.5:215
 msgid ""
 "These fields are used by the debian-installer and are usually not needed.  "
 "See /usr/share/doc/debian-installer/devel/modules.txt from the B<debian-"
@@ -644,13 +673,14 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:130 deb-src-control.5:228
-#, no-wrap
-msgid "B<Depends:> E<lt>package listE<gt>"
+#: deb-control.5:132 deb-src-control.5:233
+#, fuzzy, no-wrap
+#| msgid "B<Depends:> E<lt>package listE<gt>"
+msgid "B<Depends:>I< package-list>"
 msgstr "B<Depends:> E<lt>lista-de-paquetesE<gt>"
 
 #. type: Plain text
-#: deb-control.5:141
+#: deb-control.5:143
 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 "
@@ -672,13 +702,14 @@
 "campo «Depends:»."
 
 #. type: TP
-#: deb-control.5:141 deb-src-control.5:231
-#, no-wrap
-msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+#: deb-control.5:143 deb-src-control.5:236
+#, fuzzy, no-wrap
+#| msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+msgid "B<Pre-Depends:>I< package-list>"
 msgstr "B<Pre-Depends:> E<lt>lista-de-paquetesE<gt>"
 
 #. type: Plain text
-#: deb-control.5:148
+#: deb-control.5:150
 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 "
@@ -689,13 +720,14 @@
 "algún otro paquete para la ejecución de su script «preinst»."
 
 #. type: TP
-#: deb-control.5:148 deb-src-control.5:234
-#, no-wrap
-msgid "B<Recommends:> E<lt>package listE<gt>"
+#: deb-control.5:150 deb-src-control.5:239
+#, fuzzy, no-wrap
+#| msgid "B<Recommends:> E<lt>package listE<gt>"
+msgid "B<Recommends:>I< package-list>"
 msgstr "B<Recommends:> E<lt>lista-de-paquetesE<gt>"
 
 #. type: Plain text
-#: deb-control.5:155
+#: deb-control.5:157
 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 "
@@ -706,13 +738,14 @@
 "los paquetes listados en su campo B<Recommends>."
 
 #. type: TP
-#: deb-control.5:155 deb-src-control.5:237
-#, no-wrap
-msgid "B<Suggests:> E<lt>package listE<gt>"
+#: deb-control.5:157 deb-src-control.5:242
+#, fuzzy, no-wrap
+#| msgid "B<Suggests:> E<lt>package listE<gt>"
+msgid "B<Suggests:>I< package-list>"
 msgstr "B<Suggests:> E<lt>lista-de-paquetesE<gt>"
 
 #. type: Plain text
-#: deb-control.5:160
+#: deb-control.5:162
 msgid ""
 "Lists packages that are related to this one and can perhaps enhance its "
 "usefulness, but without which installing this package is perfectly "
@@ -723,7 +756,7 @@
 "éstos."
 
 #. type: Plain text
-#: deb-control.5:172
+#: deb-control.5:174
 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 "
@@ -741,7 +774,7 @@
 "entre paréntesis."
 
 #. type: Plain text
-#: deb-control.5:178
+#: deb-control.5:180
 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 "
@@ -756,13 +789,14 @@
 "o igual que, «E<lt>=» para menor o igual y «=» para igual que."
 
 #. type: TP
-#: deb-control.5:178 deb-src-control.5:240
-#, no-wrap
-msgid "B<Breaks:> E<lt>package listE<gt>"
+#: deb-control.5:180 deb-src-control.5:245
+#, fuzzy, no-wrap
+#| msgid "B<Breaks:> E<lt>package listE<gt>"
+msgid "B<Breaks:>I< package-list>"
 msgstr "B<Breaks:> E<lt>lista-de-paquetesE<gt>"
 
 #. type: Plain text
-#: deb-control.5:186
+#: deb-control.5:188
 msgid ""
 "Lists packages that this one breaks, for example by exposing bugs when the "
 "named packages rely on this one. The package maintenance software will not "
@@ -775,13 +809,14 @@
 "es actualizar los paquetes mencionados en el campo B<Breaks>."
 
 #. type: TP
-#: deb-control.5:186 deb-src-control.5:249
-#, no-wrap
-msgid "B<Conflicts:> E<lt>package listE<gt>"
+#: deb-control.5:188 deb-src-control.5:254
+#, fuzzy, no-wrap
+#| msgid "B<Conflicts:> E<lt>package listE<gt>"
+msgid "B<Conflicts:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>lista-de-paquetesE<gt>"
 
 #. type: Plain text
-#: deb-control.5:194
+#: deb-control.5:196
 msgid ""
 "Lists packages that conflict with this one, for example by containing files "
 "with the same names. The package maintenance software will not allow "
@@ -795,13 +830,14 @@
 "B<Conflicts>."
 
 #. type: TP
-#: deb-control.5:194 deb-src-control.5:246
-#, no-wrap
-msgid "B<Replaces:> E<lt>package listE<gt>"
+#: deb-control.5:196 deb-src-control.5:251
+#, fuzzy, no-wrap
+#| msgid "B<Replaces:> E<lt>package listE<gt>"
+msgid "B<Replaces:>I< package-list>"
 msgstr "B<Replaces:> E<lt>lista-de-paquetesE<gt>"
 
 #. type: Plain text
-#: deb-control.5:202
+#: deb-control.5:204
 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 "
@@ -814,13 +850,14 @@
 "paquete en caso de que este paquete tenga ficheros con el mismo nombre."
 
 #. type: TP
-#: deb-control.5:202 deb-src-control.5:252
-#, no-wrap
-msgid "B<Provides:> E<lt>package listE<gt>"
+#: deb-control.5:204 deb-src-control.5:257
+#, fuzzy, no-wrap
+#| msgid "B<Provides:> E<lt>package listE<gt>"
+msgid "B<Provides:>I< package-list>"
 msgstr "B<Provides:> E<lt>lista-de-paquetesE<gt>"
 
 #. type: Plain text
-#: deb-control.5:212
+#: deb-control.5:214
 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 "
@@ -842,7 +879,7 @@
 "separarlos."
 
 #. type: Plain text
-#: deb-control.5:231
+#: deb-control.5:233
 msgid ""
 "The syntax of B<Breaks>, B<Conflicts>, B<Replaces> and B<Provides> is a list "
 "of package names, separated by commas (and optional whitespace).  In the "
@@ -857,14 +894,14 @@
 "campos B<Breaks>, B<Conflicts> y B<Replaces>."
 
 #. type: TP
-#: deb-control.5:232 deb-src-control.5:255
+#: deb-control.5:234 deb-src-control.5:260
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Built-Using:> E<lt>package listE<gt>"
+msgid "B<Built-Using:>I< package-list>"
 msgstr "B<Depends:> E<lt>lista-de-paquetesE<gt>"
 
 #. type: Plain text
-#: deb-control.5:242
+#: deb-control.5:244
 msgid ""
 "This field lists extra source packages that were used during the build of "
 "this binary package.  This is an indication to the archive maintenance "
@@ -876,13 +913,13 @@
 msgstr ""
 
 #. type: SH
-#: deb-control.5:243 deb-src-control.5:283 start-stop-daemon.8:273
+#: deb-control.5:245 deb-src-control.5:288 start-stop-daemon.8:302
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "EJEMPLO"
 
 #. type: Plain text
-#: deb-control.5:266
+#: deb-control.5:268
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -927,7 +964,7 @@
 " will run more slowly, however.)\n"
 
 #. type: Plain text
-#: deb-control.5:274
+#: deb-control.5:276
 msgid ""
 "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr ""
@@ -940,13 +977,6 @@
 msgid "deb-src-control"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-src-control.5:3
-#, fuzzy, no-wrap
-#| msgid "2010-01-28"
-msgid "2010-11-22"
-msgstr "28 de enero del 2010"
-
 #. type: Plain text
 #: deb-src-control.5:6
 #, fuzzy
@@ -969,8 +999,7 @@
 "one space. The content of the multi-line fields is generally joined to a "
 "single line by the tools (except in the case of the B<Description> field, "
 "see below). To insert empty lines into a multi-line field, insert a dot "
-"after the space. The paragraphs are separated by an empty line. Lines "
-"starting with a B<'#'> are treated as comments."
+"after the space. Lines starting with a B<'#'> are treated as comments."
 msgstr ""
 
 #. type: SH
@@ -984,7 +1013,7 @@
 #: deb-src-control.5:30
 #, fuzzy, no-wrap
 #| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Source:> E<lt>source package nameE<gt> (required)"
+msgid "B<Source:> I<source-package-name> (required)"
 msgstr "B<Source:> E<lt>nombre-del-código-fuenteE<gt>"
 
 #. type: Plain text
@@ -1001,7 +1030,7 @@
 #: deb-src-control.5:38
 #, fuzzy, no-wrap
 #| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgid "B<Maintainer:> E<lt>fullname emailE<gt> (required)"
+msgid "B<Maintainer:> I<fullname-email> (required)"
 msgstr "B<Maintainer:> E<lt>nombre-completo correo-electrónicoE<gt>"
 
 #. type: Plain text
@@ -1024,7 +1053,7 @@
 #: deb-src-control.5:44
 #, fuzzy, no-wrap
 #| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgid "B<Uploaders:> E<lt>fullname emailE<gt>"
+msgid "B<Uploaders:>I< fullname-email>"
 msgstr "B<Maintainer:> E<lt>nombre-completo correo-electrónicoE<gt>"
 
 #. type: Plain text
@@ -1039,7 +1068,7 @@
 #: deb-src-control.5:50
 #, fuzzy, no-wrap
 #| msgid "B<Version:> E<lt>version stringE<gt>"
-msgid "B<Standards-Version:> E<lt>version stringE<gt>"
+msgid "B<Standards-Version:>I< version-string>"
 msgstr "B<Version:> E<lt>cadena-de-caracteres-con-el-número-de-versiónE<gt>"
 
 #. type: Plain text
@@ -1054,7 +1083,7 @@
 #: deb-src-control.5:57
 #, fuzzy, no-wrap
 #| msgid "B<Essential:> E<lt>yes|noE<gt>"
-msgid "B<DM-Upload-Allowed:> E<lt>yes|noE<gt>"
+msgid "B<DM-Upload-Allowed:> B<yes>|B<no>"
 msgstr "B<Essential:> E<lt>yes|noE<gt>"
 
 #. type: Plain text
@@ -1066,6 +1095,11 @@
 msgstr ""
 
 #. type: Plain text
+#: deb-src-control.5:65
+msgid "The upstream project home page URL."
+msgstr "La dirección url de la página oficial del autor original."
+
+#. type: Plain text
 #: deb-src-control.5:71
 #, fuzzy
 #| msgid ""
@@ -1073,9 +1107,9 @@
 #| "format is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://"
 #| "bugs.debian.org>."
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>. This field is usually not needed."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian."
+"org>. This field is usually not needed."
 msgstr ""
 "La dirección url del sistema de seguimiento de fallos de este paquete. El "
 "formato usado actualmente es: B<E<lt>tipo-btsE<gt>://E<lt>direccion-"
@@ -1085,33 +1119,34 @@
 #: deb-src-control.5:72
 #, fuzzy, no-wrap
 #| msgid "B<Bugs:> E<lt>urlE<gt>"
-msgid "B<Vcs-*:> E<lt>urlE<gt>"
+msgid "B<Vcs-*:>I< url>"
 msgstr "B<Bugs:> E<lt>urlE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:78
+#: deb-src-control.5:79
 msgid ""
-"The url of the Version Control System repository used to maintain this "
-"package.  Currently supported are Arch, Bzr (Bazaar), Cvs, Darcs, Git, Hg "
-"(Mercurial), Mtn (Monotone) and Svn (Subversion). Usually this field points "
-"to the latest version of the package, such as the main branch or the trunk."
+"The I<url> of the Version Control System repository used to maintain this "
+"package. Currently supported are B<Arch>, B<Bzr> (Bazaar), B<Cvs>, B<Darcs>, "
+"B<Git>, B<Hg> (Mercurial), B<Mtn> (Monotone) and B<Svn> (Subversion). "
+"Usually this field points to the latest version of the package, such as the "
+"main branch or the trunk."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:79
+#: deb-src-control.5:80
 #, fuzzy, no-wrap
 #| msgid "B<Bugs:> E<lt>urlE<gt>"
-msgid "B<Vcs-Browser:> E<lt>urlE<gt>"
+msgid "B<Vcs-Browser:>I< url>"
 msgstr "B<Bugs:> E<lt>urlE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:82
+#: deb-src-control.5:84
 msgid ""
-"The url of a webinterface to browse the Version Control System repository."
+"The I<url> of a webinterface to browse the Version Control System repository."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:87
+#: deb-src-control.5:89
 #, fuzzy
 #| msgid "The name of the distribution this package is originating from."
 msgid ""
@@ -1120,7 +1155,7 @@
 msgstr "El nombre de la distribución origen del paquete."
 
 #. type: Plain text
-#: deb-src-control.5:93
+#: deb-src-control.5:95
 #, fuzzy
 #| msgid ""
 #| "This is a general field that gives the package a category based on the "
@@ -1136,7 +1171,7 @@
 "«text», «x11» etc."
 
 #. type: Plain text
-#: deb-src-control.5:98
+#: deb-src-control.5:100
 #, fuzzy
 #| msgid ""
 #| "Sets the importance of this package in relation to the system as a "
@@ -1151,14 +1186,14 @@
 "prioridades comunes son «required», «standard», «optional», «extra» etc."
 
 #. type: TP
-#: deb-src-control.5:108
+#: deb-src-control.5:110
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Build-Depends:> E<lt>package listE<gt>"
+msgid "B<Build-Depends:>I< package-list>"
 msgstr "B<Depends:> E<lt>lista-de-paquetesE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:112
+#: deb-src-control.5:114
 #, fuzzy
 #| msgid ""
 #| "In the list of packages, the text indicating the current state of the "
@@ -1171,50 +1206,50 @@
 "seleccionado."
 
 #. type: TP
-#: deb-src-control.5:113
+#: deb-src-control.5:115
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Build-Depends-Indep:> E<lt>package listE<gt>"
+msgid "B<Build-Depends-Indep:>I< package-list>"
 msgstr "B<Depends:> E<lt>lista-de-paquetesE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:118
+#: deb-src-control.5:120
 msgid ""
-"Same as Build-Depends, but they are only needed when building the "
-"architecture independent packages. The Build-Depends are also installed in "
-"this case."
+"Same as B<Build-Depends>, but they are only needed when building the "
+"architecture independent packages. The B<Build-Depends> are also installed "
+"in this case."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:119
+#: deb-src-control.5:121
 #, fuzzy, no-wrap
 #| msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgid "B<Build-Conflicts:> E<lt>package listE<gt>"
+msgid "B<Build-Conflicts:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>lista-de-paquetesE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:123
+#: deb-src-control.5:125
 msgid ""
 "A list of packages that should not be installed when the package is build, "
 "for example because they interfere with the used build system."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:124
+#: deb-src-control.5:126
 #, fuzzy, no-wrap
 #| msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgid "B<Build-Conflicts-Indep:> E<lt>package listE<gt>"
+msgid "B<Build-Conflicts-Indep:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>lista-de-paquetesE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:128
+#: deb-src-control.5:130
 msgid ""
-"Same as Build-Conflicts, but only when building the architecture independent "
-"packages."
+"Same as B<Build-Conflicts>, but only when building the architecture "
+"independent packages."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:139
+#: deb-src-control.5:141
 #, fuzzy
 #| msgid ""
 #| "The syntax of B<Depends>, B<Pre-Depends>, B<Recommends> and B<Suggests> "
@@ -1241,7 +1276,7 @@
 "entre paréntesis."
 
 #. type: Plain text
-#: deb-src-control.5:148
+#: deb-src-control.5:150
 msgid ""
 "The syntax of the B<Build-Conflicts> and B<Build-Conflicts-Indep> fields is "
 "a list of comma-separated package names, where the comma is read as an \"AND"
@@ -1251,7 +1286,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:154
+#: deb-src-control.5:156
 #, fuzzy
 #| msgid ""
 #| "A version number may start with a `E<gt>E<gt>', in which case any later "
@@ -1274,7 +1309,7 @@
 "o igual que, «E<lt>=» para menor o igual y «=» para igual que."
 
 #. type: Plain text
-#: deb-src-control.5:158
+#: deb-src-control.5:160
 msgid ""
 "A architecture specification consists of one or more architecture names, "
 "separated by whitespace. Exclamation marks may be prepended to each of the "
@@ -1282,7 +1317,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:163
+#: deb-src-control.5:165
 msgid ""
 "Note that dependencies on packages in the B<build-essential> set can be "
 "omitted and that declaring build conflicts against them is impossible. A "
@@ -1290,59 +1325,61 @@
 msgstr ""
 
 #. type: SH
-#: deb-src-control.5:165
+#: deb-src-control.5:167
 #, fuzzy, no-wrap
 #| msgid "OPTIONAL FIELDS"
 msgid "BINARY FIELDS"
 msgstr "CAMPOS OPCIONALES"
 
 #. type: Plain text
-#: deb-src-control.5:174
+#: deb-src-control.5:176
 msgid ""
 "Note that the B<Priority>, B<Section> and B<Homepage> fields can also be in "
 "a binary paragraph to override the global value from the source package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:175
+#: deb-src-control.5:177
 #, fuzzy, no-wrap
 #| msgid "B<Package:> E<lt>package nameE<gt>"
-msgid "B<Package:> E<lt>binary package nameE<gt> (required)"
+msgid "B<Package:> I<binary-package-name> (required)"
 msgstr "B<Package:> E<lt>nombre-del-paqueteE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:179
+#: deb-src-control.5:181
 msgid ""
 "This field is used to name the binary package name. The same restrictions as "
 "to a source package name apply."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:180
+#: deb-src-control.5:182
 #, fuzzy, no-wrap
 #| msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgid "B<Architecture:> E<lt>arch|all|anyE<gt> (required)"
+msgid "B<Architecture:> I<arch>|B<all>|B<any> (required)"
 msgstr "B<Architecture:> E<lt>arch|allE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:190
+#: deb-src-control.5:195
 msgid ""
 "The architecture specifies on which type of hardware this package runs. For "
 "packages that run on all architectures, use the B<any> value. For packages "
 "that are architecture independent, such as shell and Perl scripts or "
 "documentation, use the B<all> value. To restrict the packages to a certain "
-"set of architectures, specify the architecture names, separated by a space."
+"set of architectures, specify the architecture names, separated by a space. "
+"It's also possible to put architecture wildcards in that list (see B<dpkg-"
+"architecture>(1)  for more information about them)."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:191
+#: deb-src-control.5:196
 #, fuzzy, no-wrap
 #| msgid "B<Package:> E<lt>package nameE<gt>"
-msgid "B<Package-Type:> E<lt>deb|udebE<gt>"
+msgid "B<Package-Type:> B<deb>|B<udeb>"
 msgstr "B<Package:> E<lt>nombre-del-paqueteE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:196
+#: deb-src-control.5:201
 msgid ""
 "This field defines the type of the package. \"udeb\" is for size-constrained "
 "packages used by the debian installer. \"deb\" is the default value, it's "
@@ -1350,49 +1387,42 @@
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:214
-#, fuzzy, no-wrap
-#| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
-msgstr "B<Source:> E<lt>nombre-del-código-fuenteE<gt>"
-
-#. type: TP
-#: deb-src-control.5:220
+#: deb-src-control.5:225
 #, fuzzy, no-wrap
 #| msgid "B<Description:> E<lt>short descriptionE<gt>"
-msgid "B<Description:> E<lt>short descriptionE<gt> (required)"
+msgid "B<Description:> I<short-description> (required)"
 msgstr "B<Description:> E<lt>descripción-cortaE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:227
+#: deb-src-control.5:232
 msgid ""
 "These fields are described in the B<deb-control>(5)  manual page, as they "
 "are copied literally to the control file of the binary package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:243
+#: deb-src-control.5:248
 #, fuzzy, no-wrap
 #| msgid "B<Replaces:> E<lt>package listE<gt>"
-msgid "B<Enhances:> E<lt>package listE<gt>"
+msgid "B<Enhances:>I< package-list>"
 msgstr "B<Replaces:> E<lt>lista-de-paquetesE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:265
+#: deb-src-control.5:270
 msgid ""
 "These fields declare relationships between packages. They are discussed in "
 "the B<deb-control>(5)  manpage and in the B<debian-policy> package."
 msgstr ""
 
 #. type: SH
-#: deb-src-control.5:266
+#: deb-src-control.5:271
 #, fuzzy, no-wrap
 #| msgid "REQUIRED FIELDS"
 msgid "USER-DEFINED FIELDS"
 msgstr "CAMPOS OBLIGATORIOS"
 
 #. type: Plain text
-#: deb-src-control.5:281
+#: deb-src-control.5:286
 msgid ""
 "It is allowed to add additional user-defined fields to the control file. The "
 "tools will ignore these fields. If you want the fields to be copied over to "
@@ -1409,7 +1439,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:299
+#: deb-src-control.5:304
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -1424,11 +1454,11 @@
 "Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
-" libselinux1-dev (E<gt>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]\n"
+" libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:318
+#: deb-src-control.5:323
 #, no-wrap
 msgid ""
 "Package: dpkg-dev\n"
@@ -1437,8 +1467,8 @@
 "Architecture: all\n"
 "# this is a custom field in the binary package\n"
 "XB-Mentoring-Contact: Raphael Hertzog E<lt>hertzog@debian.orgE<gt>\n"
-"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2), bzip2, lzma,\n"
-" patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
+"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2),\n"
+" bzip2, lzma, patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
 "Recommends: gcc | c-compiler, build-essential\n"
 "Suggests: gnupg, debian-keyring\n"
 "Conflicts: dpkg-cross (E<lt>E<lt> 2.0.0), devscripts (E<lt>E<lt> 2.10.26)\n"
@@ -1452,7 +1482,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:325
+#: deb-src-control.5:330
 #, fuzzy
 #| msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
 msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
@@ -1465,10 +1495,12 @@
 msgstr "deb-split"
 
 #. type: TH
-#: deb-split.5:1
-#, no-wrap
-msgid "2010-01-28"
-msgstr "28 de enero del 2010"
+#: deb-split.5:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 dpkg-vendor.1:1 start-stop-daemon.8:1
+#, fuzzy, no-wrap
+#| msgid "2010-03-07"
+msgid "2011-07-04"
+msgstr "7 de Marzo de 2010"
 
 #. type: Plain text
 #: deb-split.5:4
@@ -1497,28 +1529,76 @@
 "versión 1.15.6 de dpkg)."
 
 #. type: Plain text
-#: deb-split.5:21
+#: deb-split.5:15
 msgid ""
 "The first member is named B<debian-split> and contains a series of lines, "
-"separated by newlines. Currently seven lines are present.  The first is the "
-"format version number, B<2.1> at the time this manual page was written. The "
-"second is the package name. The third is the package version. The fourth is "
-"the md5sum of the package.  The fifth is the total size of the package. The "
-"sixth is the maximum part size. The seventh is the current part number, "
-"followed by a slash and the total amount of parts (as in \\(oq1/10\\(cq)."
-msgstr ""
-"El primer miembro se llama B<debian-split>, y contiene un conjunto de líneas "
-"separadas por saltos de línea. A día de hoy hay siete líneas. La primera es "
-"el número de versión de formato, B<2.1> en el momento de escribir esta "
-"página de manual. El segundo es el nombre del paquete. El tercero es la "
-"versión del paquete. El cuarto es la suma de control md5 del paquete. El "
-"quinto es el tamaño total del paquete. El sexto es el tamaño máximo de una "
-"parte. El séptimo es el número de la parte actual, seguido de una barra "
-"invertida y el número total de las partes (por ejemplo, \\(oq1/10\\(cq)."
+"separated by newlines. Currently eight lines are present:"
+msgstr ""
+
+#. type: IP
+#: deb-split.5:15 deb-split.5:18 deb-split.5:20 deb-split.5:22 deb-split.5:24
+#: deb-split.5:26 deb-split.5:28 deb-split.5:31 dpkg-gensymbols.1:20
+#: dpkg-gensymbols.1:22 dpkg-gensymbols.1:24 dpkg-gensymbols.1:26
+#: dpkg-gensymbols.1:311 dpkg-gensymbols.1:317 dpkg-gensymbols.1:351
+#: dpkg-gensymbols.1:355 dpkg-gensymbols.1:358
+#, no-wrap
+msgid "\\(bu"
+msgstr "\\(bu"
+
+#. type: Plain text
+#: deb-split.5:18
+msgid ""
+"The format version number, B<2.1> at the time this manual page was written."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:20
+#, fuzzy
+#| msgid "The source package version."
+msgid "The package name."
+msgstr "La versión del paquete fuente."
+
+#. type: Plain text
+#: deb-split.5:22
+#, fuzzy
+#| msgid "The source package version."
+msgid "The package version."
+msgstr "La versión del paquete fuente."
 
-# type: Plain text
 #. type: Plain text
 #: deb-split.5:24
+#, fuzzy
+#| msgid "The source package version."
+msgid "The md5sum of the package."
+msgstr "La versión del paquete fuente."
+
+#. type: Plain text
+#: deb-split.5:26
+#, fuzzy
+#| msgid "The header line above the list of packages."
+msgid "The total size of the package."
+msgstr "La línea de cabecera encima de la lista de paquetes."
+
+#. type: Plain text
+#: deb-split.5:28
+msgid "The maximum part size."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:31
+msgid ""
+"The current part number, followed by a slash and the total amount of parts "
+"(as in \\(oq1/10\\(cq)."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:33
+msgid "The package architecture (since dpkg 1.16.1)."
+msgstr ""
+
+# type: Plain text
+#. type: Plain text
+#: deb-split.5:36
 msgid ""
 "Programs which read multi-part archives should be prepared for additional "
 "lines to be present, and should ignore these if this is the case."
@@ -1527,7 +1607,7 @@
 "en caso de encontrar nuevas líneas, e ignorarlas en caso de aparecer."
 
 #. type: Plain text
-#: deb-split.5:29
+#: deb-split.5:41
 msgid ""
 "If the version 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 "
@@ -1540,19 +1620,29 @@
 "(excepto al final), como se describe más abajo."
 
 #. type: Plain text
-#: deb-split.5:32
+#: deb-split.5:44
+#, fuzzy
+#| msgid ""
+#| "The second, last required member is named B<data.>N, where N denotes the "
+#| "part number. It contains the raw part data."
 msgid ""
-"The second, last required member is named B<data.>N, where N denotes the "
-"part number. It contains the raw part data."
+"The second, last required member is named B<data.>I<N>, where I<N> denotes "
+"the part number. It contains the raw part data."
 msgstr ""
 "El segundo y último miembro obligatorio se llama B<data.>N. «N» simboliza el "
 "número de la parte y contiene los datos no procesados de la parte."
 
 #. type: Plain text
-#: deb-split.5:37
+#: deb-split.5:49
+#, fuzzy
+#| msgid ""
+#| "These members must occur in this exact order. Current implementations "
+#| "should ignore any additional members after B<data.>N.  Further members "
+#| "may be defined in the future, and (if possible) will be placed after "
+#| "these two."
 msgid ""
 "These members must occur in this exact order. Current implementations should "
-"ignore any additional members after B<data.>N.  Further members may be "
+"ignore any additional members after B<data.>I<N>.  Further members may be "
 "defined in the future, and (if possible) will be placed after these two."
 msgstr ""
 "Estos miembros deben aparecer en este orden. Las implementaciones actuales "
@@ -1561,7 +1651,7 @@
 "de éstos dos."
 
 #. type: Plain text
-#: deb-split.5:39
+#: deb-split.5:51
 msgid "B<deb>(5), B<dpkg-split>(1)."
 msgstr "B<deb>(5), B<dpkg-split>(1)."
 
@@ -1571,13 +1661,6 @@
 msgid "deb-version"
 msgstr "deb-version"
 
-#. type: TH
-#: deb-version.5:5 dpkg-distaddfile.1:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-name.1:6
-#, no-wrap
-msgid "2008-08-18"
-msgstr "18 de Agosto de 2008"
-
 #. type: Plain text
 #: deb-version.5:8
 msgid "deb-version - Debian package version number format"
@@ -1585,7 +1668,9 @@
 
 #. type: Plain text
 #: deb-version.5:11
-msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+#, fuzzy
+#| msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgid "[I<epoch>B<:>]I<upstream-version>[B<->I<debian-revision>]"
 msgstr "[ I<epoch>:] I<versión-autor-original> [-I<revisión-debian> ]"
 
 #. type: Plain text
@@ -1605,9 +1690,14 @@
 
 #. type: Plain text
 #: deb-version.5:20
+#, fuzzy
+#| msgid ""
+#| "This is a single (generally small) unsigned integer.  It may be omitted, "
+#| "in which case zero is assumed.  If it is omitted then the "
+#| "I<upstream_version> may not contain any colons."
 msgid ""
 "This is a single (generally small) unsigned integer.  It may be omitted, in "
-"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"which case zero is assumed.  If it is omitted then the I<upstream-version> "
 "may not contain any colons."
 msgstr ""
 "Es un sólo entero sin signo (generalmente pequeño). Se puede omitir, en cuyo "
@@ -1627,8 +1717,9 @@
 
 #. type: TP
 #: deb-version.5:24
-#, no-wrap
-msgid "I<upstream_version>"
+#, fuzzy, no-wrap
+#| msgid "I<upstream_version>"
+msgid "I<upstream-version>"
 msgstr "I<versión-autor-original>"
 
 #. type: Plain text
@@ -1650,9 +1741,14 @@
 
 #. type: Plain text
 #: deb-version.5:39
+#, fuzzy
+#| msgid ""
+#| "The comparison behavior of the package management system with respect to "
+#| "the I<upstream_version> is described below.  The I<upstream_version> "
+#| "portion of the version number is mandatory."
 msgid ""
 "The comparison behavior of the package management system with respect to the "
-"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"I<upstream-version> is described below. The I<upstream-version> portion of "
 "the version number is mandatory."
 msgstr ""
 "El funcionamiento del proceso de comparación del sistema de paquetes "
@@ -1661,10 +1757,17 @@
 
 #. type: Plain text
 #: deb-version.5:48
+#, fuzzy
+#| msgid ""
+#| "The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") "
+#| "and the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, "
+#| "colon, tilde) and should start with a digit.  If there is no "
+#| "I<debian_revision> then hyphens are not allowed; if there is no I<epoch> "
+#| "then colons are not allowed."
 msgid ""
-"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"The I<upstream-version> may contain only alphanumerics (\"A-Za-z0-9\") and "
 "the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
-"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"tilde) and should start with a digit.  If there is no I<debian-revision> "
 "then hyphens are not allowed; if there is no I<epoch> then colons are not "
 "allowed."
 msgstr ""
@@ -1676,17 +1779,24 @@
 
 #. type: TP
 #: deb-version.5:48
-#, no-wrap
-msgid "I<debian_revision>"
+#, fuzzy, no-wrap
+#| msgid "I<debian_revision>"
+msgid "I<debian-revision>"
 msgstr "I<revisión-debian>"
 
 #. type: Plain text
 #: deb-version.5:57
+#, fuzzy
+#| msgid ""
+#| "This part of the version number specifies the version of the Debian "
+#| "package based on the upstream version.  It may contain only alphanumerics "
+#| "and the characters B<+> B<.> B<~> (plus, full stop, tilde) and is "
+#| "compared in the same way as the I<upstream_version> is."
 msgid ""
 "This part of the version number specifies the version of the Debian package "
 "based on the upstream version.  It may contain only alphanumerics and the "
 "characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
-"same way as the I<upstream_version> is."
+"same way as the I<upstream-version> is."
 msgstr ""
 "Esta parte del número de versión define la versión del paquete de Debian en "
 "base a la versión del desarrollador original. Sólo puede contener caracteres "
@@ -1696,8 +1806,15 @@
 
 #. type: Plain text
 #: deb-version.5:64
+#, fuzzy
+#| msgid ""
+#| "It is optional; if it isn't present then the I<upstream_version> may not "
+#| "contain a hyphen.  This format represents the case where a piece of "
+#| "software was written specifically to be turned into a Debian package, and "
+#| "so there is only one \"debianisation\" of it and therefore no revision "
+#| "indication is required."
 msgid ""
-"It is optional; if it isn't present then the I<upstream_version> may not "
+"It is optional; if it isn't present then the I<upstream-version> may not "
 "contain a hyphen.  This format represents the case where a piece of software "
 "was written specifically to be turned into a Debian package, and so there is "
 "only one \"debianisation\" of it and therefore no revision indication is "
@@ -1710,20 +1827,31 @@
 
 #. type: Plain text
 #: deb-version.5:68
+#, fuzzy
+#| msgid ""
+#| "It is conventional to restart the I<debian_revision> at '1' each time "
+#| "time the I<upstream_version> is increased."
 msgid ""
-"It is conventional to restart the I<debian_revision> at '1' each time time "
-"the I<upstream_version> is increased."
+"It is conventional to restart the I<debian-revision> at '1' each time time "
+"the I<upstream-version> is increased."
 msgstr ""
 "Por lo general la I<revisón-debian> se reinicia con «1» cada vez que crece "
 "la I<versión-autor-original>."
 
 #. type: Plain text
 #: deb-version.5:76
+#, fuzzy
+#| msgid ""
+#| "Dpkg will break the version number apart at the last hyphen in the string "
+#| "(if there is one) to determine the I<upstream_version> and "
+#| "I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
+#| "than the presence of one (but note that the I<debian_revision> is the "
+#| "least significant part of the version number)."
 msgid ""
 "Dpkg will break the version number apart at the last hyphen in the string "
-"(if there is one) to determine the I<upstream_version> and "
-"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
-"than the presence of one (but note that the I<debian_revision> is the least "
+"(if there is one) to determine the I<upstream-version> and I<debian-"
+"revision>. The absence of a I<debian-revision> compares earlier than the "
+"presence of one (but note that the I<debian-revision> is the least "
 "significant part of the version number)."
 msgstr ""
 "Dpkg separará el número de versión en el último guión en la cadena (si hay "
@@ -1740,8 +1868,12 @@
 
 #. type: Plain text
 #: deb-version.5:80
+#, fuzzy
+#| msgid ""
+#| "The I<upstream_version> and I<debian_revision> parts are compared by the "
+#| "package management system using the same algorithm:"
 msgid ""
-"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"The I<upstream-version> and I<debian-revision> parts are compared by the "
 "package management system using the same algorithm:"
 msgstr ""
 "Las partes I<revisión-autor-original> y I<revisión-debian> se comparan con "
@@ -1837,11 +1969,11 @@
 msgstr "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
 
 #. type: SH
-#: deb-version.5:120 dpkg.1:797 dpkg-buildpackage.1:256 dpkg-distaddfile.1:47
-#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
+#: deb-version.5:120 dpkg.1:783 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:460
 #: dpkg-maintscript-helper.1:128 dpkg-parsechangelog.1:123
-#: dpkg-shlibdeps.1:331 dpkg-source.1:706 dselect.1:458
-#: start-stop-daemon.8:294 update-alternatives.8:493
+#: dpkg-shlibdeps.1:329 dpkg-source.1:730 dselect.1:451
+#: start-stop-daemon.8:323 update-alternatives.8:494
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTORES"
@@ -1852,18 +1984,18 @@
 msgstr "Copyright \\(co 1996,1997,1998 Ian Jackson y Christian Schwarz"
 
 #. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:262
+#: deb-version.5:124 dpkg-buildpackage.1:263
 msgid "Copyright \\(co 2007 Frank Lichtenheld"
 msgstr "Copyright \\(co 2007 Frank Lichtenheld"
 
 #. type: Plain text
-#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:125
-#: dpkg-buildpackage.1:266 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
-#: dpkg-deb.1:256 dpkg-divert.8:139 dpkg-genchanges.1:154
-#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-maintscript-helper.1:139
-#: dpkg-mergechangelogs.1:71 dpkg-name.1:107 dpkg-parsechangelog.1:131
-#: dpkg-query.1:211 dpkg-shlibdeps.1:341 dpkg-source.1:714 dpkg-split.1:233
-#: dpkg-statoverride.8:92 dpkg-vendor.1:53 update-alternatives.8:500
+#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:273
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:269 dpkg-divert.8:139 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:464 dpkg-maintscript-helper.1:139
+#: dpkg-mergechangelogs.1:71 dpkg-name.1:108 dpkg-parsechangelog.1:131
+#: dpkg-query.1:219 dpkg-shlibdeps.1:339 dpkg-source.1:738 dpkg-split.1:227
+#: dpkg-statoverride.8:91 dpkg-vendor.1:53 update-alternatives.8:501
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO WARRANTY."
@@ -1877,12 +2009,6 @@
 msgid "deb-old"
 msgstr "deb-old"
 
-#. type: TH
-#: deb-old.5:1
-#, no-wrap
-msgid "2006-02-28"
-msgstr "28 de Febrero de 2006"
-
 #. type: Plain text
 #: deb-old.5:4
 msgid "deb-old - old style Debian binary package format"
@@ -1982,12 +2108,6 @@
 msgstr "deb-override"
 
 #. type: TH
-#: deb-override.5:15
-#, no-wrap
-msgid "2007-03-07"
-msgstr "7 de Marzo de 2007"
-
-#. type: TH
 #: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
 #: deb-symbols.5:2 deb-triggers.5:1 dpkg-architecture.1:1
 #: dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1
@@ -2198,7 +2318,9 @@
 
 #. type: Plain text
 #: deb-shlibs.5:34
-msgid "[I<type:>] I<library> I<version> I<dependencies>"
+#, fuzzy
+#| msgid "[I<type:>] I<library> I<version> I<dependencies>"
+msgid "[I<type>B<:>] I<library> I<version> I<dependencies>"
 msgstr "[I<tipo:>] I<biblioteca> I<versión> I<dependencias>"
 
 #. type: Plain text
@@ -2218,8 +2340,8 @@
 msgstr "Consulte el Manual de Normas de Debian para más detalles."
 
 #. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:728 dpkg-architecture.1:263
-#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:458
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:714 dpkg-architecture.1:262
+#: dpkg-divert.8:91 dpkg-name.1:65 update-alternatives.8:459
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "EJEMPLOS"
@@ -2611,11 +2733,11 @@
 "se asume un valor vacío."
 
 #. type: SH
-#: deb-substvars.5:145 dpkg.1:641 dpkg-architecture.1:285 dpkg.cfg.5:12
-#: dpkg-buildflags.1:103 dpkg-distaddfile.1:39 dpkg-divert.8:122
+#: deb-substvars.5:145 dpkg.1:627 dpkg-architecture.1:284 dpkg.cfg.5:12
+#: dpkg-buildflags.1:121 dpkg-distaddfile.1:39 dpkg-divert.8:122
 #: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
-#: dpkg-split.1:212 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:361
+#: dpkg-split.1:206 dpkg-statoverride.8:74 dselect.cfg.5:12
+#: update-alternatives.8:360
 #, no-wrap
 msgid "FILES"
 msgstr "FICHEROS"
@@ -2632,15 +2754,15 @@
 msgstr "Lista de variables a sustituir y valores."
 
 #. type: SH
-#: deb-substvars.5:150 dpkg.1:794 dpkg-buildpackage.1:244 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:698 dpkg-split.1:197 dselect.1:436
-#: update-alternatives.8:485
+#: deb-substvars.5:150 dpkg.1:780 dpkg-buildpackage.1:244 dpkg-deb.1:238
+#: dpkg-name.1:86 dpkg-source.1:722 dpkg-split.1:199 dselect.1:429
+#: update-alternatives.8:486
 #, no-wrap
 msgid "BUGS"
 msgstr "FALLOS"
 
 #. type: Plain text
-#: deb-substvars.5:153 dpkg-source.1:701
+#: deb-substvars.5:153 dpkg-source.1:725
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -2658,27 +2780,27 @@
 "(1), B<dpkg-source>(1)."
 
 #. type: SH
-#: deb-substvars.5:161 dpkg-architecture.1:304 dpkg.cfg.5:19
-#: dpkg-buildflags.1:120 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
-#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:103
-#: dpkg-query.1:206 dpkg-scansources.1:77 dpkg-split.1:229
-#: dpkg-statoverride.8:88 dpkg-vendor.1:48 dselect.cfg.5:19
+#: deb-substvars.5:161 dpkg-architecture.1:303 dpkg.cfg.5:19
+#: dpkg-buildflags.1:266 dpkg-checkbuilddeps.1:40 dpkg-deb.1:265
+#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:104
+#: dpkg-query.1:214 dpkg-scansources.1:76 dpkg-split.1:223
+#: dpkg-statoverride.8:87 dpkg-vendor.1:48 dselect.cfg.5:19
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: deb-substvars.5:163 dpkg-buildpackage.1:258 dpkg-distaddfile.1:49
-#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:708
-#: dpkg-split.1:231
+#: deb-substvars.5:163 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
+#: dpkg-deb.1:267 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:331 dpkg-source.1:732
+#: dpkg-split.1:225
 msgid "Copyright \\(co 1995-1996 Ian Jackson"
 msgstr "Copyright \\(co 1995-1996 Ian Jackson"
 
 #. type: Plain text
-#: deb-substvars.5:165 dpkg-buildpackage.1:260 dpkg-distaddfile.1:51
+#: deb-substvars.5:165 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
 #: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
-#: dpkg-shlibdeps.1:335 dpkg-source.1:710 dpkg-statoverride.8:90
+#: dpkg-shlibdeps.1:333 dpkg-source.1:734 dpkg-statoverride.8:89
 msgid "Copyright \\(co 2000 Wichert Akkerman"
 msgstr "Copyright \\(co 2000 Wichert Akkerman"
 
@@ -2688,12 +2810,6 @@
 msgid "deb-symbols"
 msgstr "deb-symbols"
 
-#. type: TH
-#: deb-symbols.5:2
-#, no-wrap
-msgid "2007-07-16"
-msgstr "16 de Julio de 2007"
-
 #. type: Plain text
 #: deb-symbols.5:5
 msgid "deb-symbols - Debian's extended shared library information file"
@@ -2717,12 +2833,16 @@
 
 #. type: Plain text
 #: deb-symbols.5:14
-msgid "E<lt>library sonameE<gt> E<lt>main dependency templateE<gt>"
+#, fuzzy
+#| msgid "E<lt>library sonameE<gt> E<lt>main dependency templateE<gt>"
+msgid "I<library-soname main-dependency-template>"
 msgstr "E<lt>soname-bibliotecaE<gt> E<lt>plantilla-dependencia-principalE<gt>"
 
 #. type: Plain text
 #: deb-symbols.5:16
-msgid "[ | E<lt>alternative dependency templateE<gt> ]"
+#, fuzzy
+#| msgid "[ | E<lt>alternative dependency templateE<gt> ]"
+msgid "[ | I<alternative-dependency-template> ]"
 msgstr "[ | E<lt>plantilla-dependencia-alternativaE<gt> ]"
 
 #. type: Plain text
@@ -2732,25 +2852,37 @@
 
 #. type: Plain text
 #: deb-symbols.5:20
-msgid "[ * E<lt>field-nameE<gt>: E<lt>field valueE<gt> ]"
+#, fuzzy
+#| msgid "[ * E<lt>field-nameE<gt>: E<lt>field valueE<gt> ]"
+msgid "[ * I<field-name>: I<field-value> ]"
 msgstr "[ * E<lt>nombre-campoE<gt>: E<lt>valor-campoE<gt> ]"
 
 #. type: Plain text
 #: deb-symbols.5:23
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "[ ... ]\n"
+#| " E<lt>symbolE<gt> E<lt>minimal versionE<gt>[ E<lt>id of dependency templateE<gt> ]\n"
 msgid ""
 "[ ... ]\n"
-" E<lt>symbolE<gt> E<lt>minimal versionE<gt>[ E<lt>id of dependency templateE<gt> ]\n"
+" I<symbol> I<minimal-version>[ I<id-of-dependency-template> ]\n"
 msgstr ""
 "[ ... ]\n"
 " E<lt>símboloE<gt> E<lt>versión-mínimaE<gt>[ E<lt>identificador-plantilla-dependenciaE<gt> ]\n"
 
 #. type: Plain text
 #: deb-symbols.5:29
-msgid ""
-"The I<library soname> is exactly the value of the SONAME field as exported "
-"by B<objdump>(1). A I<dependency template> is a dependency where I<#MINVER#> "
-"is dynamically replaced either by a version check like \"(E<gt>= I<minimal "
+#, fuzzy
+#| msgid ""
+#| "The I<library soname> is exactly the value of the SONAME field as "
+#| "exported by B<objdump>(1). A I<dependency template> is a dependency where "
+#| "I<#MINVER#> is dynamically replaced either by a version check like "
+#| "\"(E<gt>= I<minimal version>)\" or by nothing (if an unversioned "
+#| "dependency is deemed sufficient)."
+msgid ""
+"The I<library-soname> is exactly the value of the SONAME field as exported "
+"by B<objdump>(1). A I<dependency-template> is a dependency where I<#MINVER#> "
+"is dynamically replaced either by a version check like \"(E<gt>= I<minimal-"
 "version>)\" or by nothing (if an unversioned dependency is deemed "
 "sufficient)."
 msgstr ""
@@ -2763,11 +2895,19 @@
 
 #. type: Plain text
 #: deb-symbols.5:36
+#, fuzzy
+#| msgid ""
+#| "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> "
+#| "being \"Base\" if the library is not versioned) is associated to a "
+#| "I<minimal version> of its dependency template (the main dependency "
+#| "template is used if I<id of dependency template> is not present). The "
+#| "first alternative dependency template is numbered 1, the second one 2, "
+#| "etc."
 msgid ""
 "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> being "
-"\"Base\" if the library is not versioned) is associated to a I<minimal "
+"\"Base\" if the library is not versioned) is associated to a I<minimal-"
 "version> of its dependency template (the main dependency template is used if "
-"I<id of dependency template> is not present). The first alternative "
+"I<id-of-dependency-template> is not present). The first alternative "
 "dependency template is numbered 1, the second one 2, etc."
 msgstr ""
 "Cada I<símbolo> exportado (listado como I<nombre>@I<versión>, siendo "
@@ -2779,12 +2919,20 @@
 
 #. type: Plain text
 #: deb-symbols.5:43
+#, fuzzy
+#| msgid ""
+#| "Each entry for a library can also have some fields of meta-information.  "
+#| "Those fields are stored on lines starting with an asterisk. Currently, "
+#| "the only valid field is I<Build-Depends-Package>, it indicates the name "
+#| "of the \"-dev\" package associated to the library and is used by dpkg-"
+#| "shlibdeps to make sure that the dependency generated is at least as "
+#| "strict as the corresponding build dependency."
 msgid ""
 "Each entry for a library can also have some fields of meta-information.  "
 "Those fields are stored on lines starting with an asterisk. Currently, the "
 "only valid field is I<Build-Depends-Package>, it indicates the name of the "
-"\"-dev\" package associated to the library and is used by dpkg-shlibdeps to "
-"make sure that the dependency generated is at least as strict as the "
+"\"-dev\" package associated to the library and is used by B<dpkg-shlibdeps> "
+"to make sure that the dependency generated is at least as strict as the "
 "corresponding build dependency."
 msgstr ""
 "Cada entrada para una biblioteca puede tener también campos de meta-"
@@ -2862,12 +3010,6 @@
 msgid "deb-triggers"
 msgstr "deb-triggers"
 
-#. type: TH
-#: deb-triggers.5:1 dpkg-trigger.1:1
-#, no-wrap
-msgid "2009-03-15"
-msgstr "15 de Marzo de 2009"
-
 #. type: Plain text
 #: deb-triggers.5:4
 msgid "deb-triggers - package triggers"
@@ -2911,28 +3053,57 @@
 msgstr "B<interest> I<nombre-disparador>"
 
 #. type: Plain text
-#: deb-triggers.5:27
+#: deb-triggers.5:26
+#, fuzzy
+#| msgid "B<interest> I<trigger-name>"
+msgid "B<interest-noawait> I<trigger-name>"
+msgstr "B<interest> I<nombre-disparador>"
+
+#. type: Plain text
+#: deb-triggers.5:33
+#, fuzzy
+#| msgid ""
+#| "Specifies that the package is interested in the named trigger. All "
+#| "triggers in which a package is interested must be listed using this "
+#| "directive in the triggers control file."
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file."
+"triggers control file. The \"noawait\" variant does not put the triggering "
+"packages in triggers-awaited state. This should be used when the "
+"functionality provided by the trigger is not crucial."
 msgstr ""
 "Define que el paquete tiene un interés en el disparador nombrado. Todos los "
 "disparadores por los que un paquete tiene interés se deben listar usando "
 "esta directiva en el fichero de control de disparadores."
 
 #. type: Plain text
-#: deb-triggers.5:31
+#: deb-triggers.5:37
 msgid "B<activate> I<trigger-name>"
 msgstr "B<activate> I<nombre-disparador>"
 
 #. type: Plain text
-#: deb-triggers.5:37
+#: deb-triggers.5:41
+#, fuzzy
+#| msgid "B<activate> I<trigger-name>"
+msgid "B<activate-noawait> I<trigger-name>"
+msgstr "B<activate> I<nombre-disparador>"
+
+#. type: Plain text
+#: deb-triggers.5:50
+#, fuzzy
+#| msgid ""
+#| "Arranges that changes to this package's state will activate the specified "
+#| "trigger. The trigger will be activated at the start of the following "
+#| "operations: unpack, configure, remove (including for the benefit of a "
+#| "conflicting package), purge and deconfigure."
 msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure."
+"conflicting package), purge and deconfigure.  The \"noawait\" variant does "
+"not put the triggering packages in triggers-awaited state. This should be "
+"used when the functionality provided by the trigger is not crucial."
 msgstr ""
 "Especifica que el disparador definido se activará si el estado de este "
 "paquete cambia. El disparador se activará al inicio de las siguientes "
@@ -2940,7 +3111,7 @@
 "paquete conflictivo), purge y deconfigure."
 
 #. type: Plain text
-#: deb-triggers.5:45
+#: deb-triggers.5:58
 msgid ""
 "If this package disappears during the unpacking of another package the "
 "trigger will be activated when the disappearance is noted towards the end of "
@@ -2956,7 +3127,7 @@
 "versiones nuevas y viejas del paquete."
 
 #. type: Plain text
-#: deb-triggers.5:48
+#: deb-triggers.5:61
 msgid ""
 "Unknown directives are an error which will prevent installation of the "
 "package."
@@ -2965,7 +3136,16 @@
 "paquete."
 
 #. type: Plain text
-#: deb-triggers.5:52
+#: deb-triggers.5:66
+msgid ""
+"The \"-noawait\" variants are only supported by dpkg 1.16.1 or newer, and "
+"will lead to errors if used with an older dpkg. It is thus recommended to "
+"add a \"Pre-Depends: dpkg (E<gt>= 1.16.1)\" to any package that wish to use "
+"those directives."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.5:70
 msgid ""
 "B<dpkg-trigger>(1), B<dpkg>(1), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
 msgstr ""
@@ -2978,13 +3158,6 @@
 msgstr "dpkg"
 
 #. type: TH
-#: dpkg.1:1
-#, fuzzy, no-wrap
-#| msgid "2009-02-27"
-msgid "2011-02-05"
-msgstr "27 de Febrero de 2009"
-
-#. type: TH
 #: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
 #: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-query.1:1
 #: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.cfg.5:1
@@ -2999,7 +3172,9 @@
 
 #. type: Plain text
 #: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
+#, fuzzy
+#| msgid "B<dpkg> [I<options>] I<action>"
+msgid "B<dpkg> [I<option>...] I<action>"
 msgstr "B<dpkg> [I<opciones>] I<acción>"
 
 #. type: SH
@@ -3048,51 +3223,24 @@
 "u otra su comportamiento."
 
 #. type: Plain text
-#: dpkg.1:31
-msgid ""
-"B<dpkg> can 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 puede usar B<dpkg> como una interfaz a B<dpkg-deb>(1). Si el primero "
-"encuentra alguna de las opciones del segundo, se limita a invocarlo con esos "
-"mismos parámetros:"
-
-#. type: Plain text
-#: dpkg.1:40
-#, no-wrap
+#: dpkg.1:33
 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>, y\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 "Consulte B<dpkg-deb>(1) si desea más información sobre estas acciones."
+"B<dpkg> can also be used as a front-end to B<dpkg-deb>(1) and B<dpkg-query>"
+"(1). The list of supported actions can be found later on in the B<ACTIONS> "
+"section. If any such action is encountered B<dpkg> just runs B<dpkg-deb> or "
+"B<dpkg-query> with the parameters given to it, but no specific options are "
+"currently passed to them, to use any such option the back-ends need to be "
+"called directly."
+msgstr ""
 
 #. type: SH
-#: dpkg.1:43
+#: dpkg.1:34
 #, no-wrap
 msgid "INFORMATION ABOUT PACKAGES"
 msgstr "INFORMACIÓN SOBRE PAQUETES"
 
 #. type: Plain text
-#: dpkg.1:48
+#: dpkg.1:39
 msgid ""
 "B<dpkg> maintains some usable information about available packages. The "
 "information is divided in three classes: B<states>, B<selection states> and "
@@ -3104,41 +3252,41 @@
 "modifican principalmente con B<dselect>."
 
 #. type: SS
-#: dpkg.1:48
+#: dpkg.1:39
 #, no-wrap
 msgid "PACKAGE STATES"
 msgstr "ESTADOS DEL PAQUETE"
 
 #. type: TP
-#: dpkg.1:49
+#: dpkg.1:40
 #, no-wrap
 msgid "B<not-installed>"
 msgstr "B<not-installed>"
 
 #. type: Plain text
-#: dpkg.1:52
+#: dpkg.1:43
 msgid "The package is not installed on your system."
 msgstr "El paquete no está instalado en el sistema."
 
 #. type: TP
-#: dpkg.1:52
+#: dpkg.1:43
 #, no-wrap
 msgid "B<config-files>"
 msgstr "B<config-files>"
 
 #. type: Plain text
-#: dpkg.1:55
+#: dpkg.1:46
 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: TP
-#: dpkg.1:55
+#: dpkg.1:46
 #, no-wrap
 msgid "B<half-installed>"
 msgstr "B<half-installed>"
 
 #. type: Plain text
-#: dpkg.1:59
+#: dpkg.1:50
 msgid ""
 "The installation of the package has been started, but not completed for some "
 "reason."
@@ -3146,24 +3294,24 @@
 "Se inició la instalación del paquete, pero no se completó por alguna razón."
 
 #. type: TP
-#: dpkg.1:59
+#: dpkg.1:50
 #, no-wrap
 msgid "B<unpacked>"
 msgstr "B<unpacked>"
 
 #. type: Plain text
-#: dpkg.1:62
+#: dpkg.1:53
 msgid "The package is unpacked, but not configured."
 msgstr "El paquete está descomprimido, pero no configurado."
 
 #. type: TP
-#: dpkg.1:62
+#: dpkg.1:53
 #, no-wrap
 msgid "B<half-configured>"
 msgstr "B<half-configured>"
 
 #. type: Plain text
-#: dpkg.1:66
+#: dpkg.1:57
 msgid ""
 "The package is unpacked and configuration has been started, but not yet "
 "completed for some reason."
@@ -3172,63 +3320,63 @@
 "finalizó por alguna razón."
 
 #. type: TP
-#: dpkg.1:66
+#: dpkg.1:57
 #, no-wrap
 msgid "B<triggers-awaited>"
 msgstr "B<triggers-awaited>"
 
 #. type: Plain text
-#: dpkg.1:69
+#: dpkg.1:60
 msgid "The package awaits trigger processing by another package."
 msgstr "El paquete aguarda al proceso de los disparadores de otro paquete."
 
 #. type: TP
-#: dpkg.1:69
+#: dpkg.1:60
 #, no-wrap
 msgid "B<triggers-pending>"
 msgstr "B<triggers-pending>"
 
 #. type: Plain text
-#: dpkg.1:72
+#: dpkg.1:63
 msgid "The package has been triggered."
 msgstr "Los disparadores del paquete se han activado."
 
 #. type: TP
-#: dpkg.1:72
+#: dpkg.1:63
 #, no-wrap
 msgid "B<installed>"
 msgstr "B<installed>"
 
 #. type: Plain text
-#: dpkg.1:75
+#: dpkg.1:66
 msgid "The package is unpacked and configured OK."
 msgstr "El paquete está correctamente desempaquetado y configurado."
 
 #. type: SS
-#: dpkg.1:75
+#: dpkg.1:66
 #, no-wrap
 msgid "PACKAGE SELECTION STATES"
 msgstr "ESTADOS DE SELECCIÓN DEL PAQUETE"
 
 #. type: TP
-#: dpkg.1:76
+#: dpkg.1:67
 #, no-wrap
 msgid "B<install>"
 msgstr "B<install>"
 
 #. type: Plain text
-#: dpkg.1:79
+#: dpkg.1:70
 msgid "The package is selected for installation."
 msgstr "El paquete se ha seleccionado para su instalación."
 
 #. type: TP
-#: dpkg.1:79
+#: dpkg.1:70
 #, no-wrap
 msgid "B<hold>"
 msgstr "B<hold>"
 
 #. type: Plain text
-#: dpkg.1:83
+#: dpkg.1:74
 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>."
@@ -3237,13 +3385,13 @@
 "que se le fuerce a ello con la opción B<--force-hold>."
 
 #. type: TP
-#: dpkg.1:83
+#: dpkg.1:74
 #, no-wrap
 msgid "B<deinstall>"
 msgstr "B<deinstall>"
 
 #. type: Plain text
-#: dpkg.1:87
+#: dpkg.1:78
 msgid ""
 "The package is selected for deinstallation (i.e. we want to remove all "
 "files, except configuration files)."
@@ -3252,13 +3400,13 @@
 "borrar todo excepto los ficheros de configuración)."
 
 #. type: TP
-#: dpkg.1:87
+#: dpkg.1:78
 #, no-wrap
 msgid "B<purge>"
 msgstr "B<purge>"
 
 #. type: Plain text
-#: dpkg.1:91
+#: dpkg.1:82
 msgid ""
 "The package is selected to be purged (i.e. we want to remove everything from "
 "system directories, even configuration files)."
@@ -3268,19 +3416,19 @@
 "configuración)."
 
 #. type: SS
-#: dpkg.1:91
+#: dpkg.1:82
 #, no-wrap
 msgid "PACKAGE FLAGS"
 msgstr "INDICADORES DEL PAQUETE"
 
 #. type: TP
-#: dpkg.1:92
+#: dpkg.1:83
 #, no-wrap
 msgid "B<reinst-required>"
 msgstr "B<reinst-required>"
 
 #. type: Plain text
-#: dpkg.1:97
+#: dpkg.1:88
 msgid ""
 "A package marked B<reinst-required> is broken and requires reinstallation. "
 "These packages cannot be removed, unless forced with option B<--force-remove-"
@@ -3291,38 +3439,43 @@
 "acción con la opción B<--force-remove-reinstreq>."
 
 #. type: SH
-#: dpkg.1:98
+#: dpkg.1:89 dselect.1:120
 #, no-wrap
 msgid "ACTIONS"
 msgstr "ACCIONES"
 
 #. type: TP
-#: dpkg.1:99
-#, no-wrap
-msgid "B<-i>, B<--install> I<package_file>..."
+#: dpkg.1:90
+#, fuzzy, no-wrap
+#| msgid "B<-i>, B<--install> I<package_file>..."
+msgid "B<-i>, B<--install> I<package-file>..."
 msgstr "B<-i>, B<--install> I<fichero-paquete>..."
 
 #. type: Plain text
-#: dpkg.1:103
+#: dpkg.1:94
+#, fuzzy
+#| msgid ""
+#| "Install the package. If B<--recursive> or B<-R> option is specified, "
+#| "I<package_file> must refer to a directory instead."
 msgid ""
 "Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"I<package-file> must refer to a directory instead."
 msgstr ""
 "Instala el paquete. Si se especifica la opción B<--recursive> o B<-R>, el "
 "I<fichero-paquete> debe ser un directorio."
 
 #. type: Plain text
-#: dpkg.1:105
+#: dpkg.1:96
 msgid "Installation consists of the following steps:"
 msgstr "La instalación consiste de los siguientes pasos:"
 
 #. type: Plain text
-#: dpkg.1:108
+#: dpkg.1:99
 msgid "B<1.> Extract the control files of the new package."
 msgstr "B<1.> Extracción de los ficheros de control del paquete nuevo."
 
 #. type: Plain text
-#: dpkg.1:112
+#: dpkg.1:103
 msgid ""
 "B<2.> If another version of the same package was installed before the new "
 "installation, execute I<prerm> script of the old package."
@@ -3331,14 +3484,14 @@
 "script I<prerm> (pre-eliminación) del antiguo paquete."
 
 #. type: Plain text
-#: dpkg.1:115
+#: dpkg.1:106
 msgid "B<3.> Run I<preinst> script, if provided by the package."
 msgstr ""
 "B<3.> Ejecución del script I<preinst> (pre-instalación) del paquete, de "
 "existir."
 
 #. type: Plain text
-#: dpkg.1:119
+#: dpkg.1:110
 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."
@@ -3347,7 +3500,7 @@
 "de seguridad de los antiguos para su restauración en caso de fallo."
 
 #. type: Plain text
-#: dpkg.1:126
+#: dpkg.1:117
 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 "
@@ -3361,7 +3514,7 @@
 "que se borran los antiguos."
 
 #. type: Plain text
-#: dpkg.1:130
+#: dpkg.1:121
 msgid ""
 "B<6.> Configure the package. See B<--configure> for detailed information "
 "about how this is done."
@@ -3370,28 +3523,33 @@
 "proceso, consulte B<--configure>."
 
 #. type: TP
-#: dpkg.1:130
-#, no-wrap
-msgid "B<--unpack >I<package_file>..."
+#: dpkg.1:121
+#, fuzzy, no-wrap
+#| msgid "B<--unpack >I<package_file>..."
+msgid "B<--unpack >I<package-file>..."
 msgstr "B<--unpack >I<fichero-paquete> ..."
 
 #. type: Plain text
-#: dpkg.1:135
+#: dpkg.1:126
+#, 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 ""
 "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."
+"option is specified, I<package-file> must refer to a directory instead."
 msgstr ""
 "Desempaqueta el paquete, pero no lo configura. Si se introducen las opciones "
 "B<--recursive> o B<-R> el I<fichero-paquete> debe ser un directorio."
 
 #. type: TP
-#: dpkg.1:135
+#: dpkg.1:126
 #, no-wrap
 msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<--configure >I<paquete>...|B<-a>|B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:140
+#: dpkg.1:131
 msgid ""
 "Configure a package which has been unpacked but not yet configured.  If B<-"
 "a> or B<--pending> is given instead of I<package>, all unpacked but "
@@ -3402,7 +3560,7 @@
 "configurarán todos los paquetes desempaquetados pero no configurados."
 
 #. type: Plain text
-#: dpkg.1:144
+#: dpkg.1:135
 msgid ""
 "To reconfigure a package which has already been configured, try the B<dpkg-"
 "reconfigure>(8)  command instead."
@@ -3411,12 +3569,12 @@
 "reconfigure>(8)."
 
 #. type: Plain text
-#: dpkg.1:146
+#: dpkg.1:137
 msgid "Configuring consists of the following steps:"
 msgstr "La configuración consiste de los siguientes pasos:"
 
 #. type: Plain text
-#: dpkg.1:151
+#: dpkg.1:142
 msgid ""
 "B<1.> Unpack the conffiles, and at the same time back up the old conffiles, "
 "so that they can be restored if something goes wrong."
@@ -3426,20 +3584,20 @@
 "de fallo."
 
 #. type: Plain text
-#: dpkg.1:154
+#: dpkg.1:145
 msgid "B<2.> Run I<postinst> script, if provided by the package."
 msgstr ""
 "B<2.> Ejecución del script I<postinst> (post-instalación) del paquete, si "
 "existe."
 
 #. type: TP
-#: dpkg.1:154
+#: dpkg.1:145
 #, no-wrap
 msgid "B<--triggers-only> I<package>...|B<-a>|B<--pending>"
 msgstr "B<--triggers-only> I<paquete>...|B<-a>|B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:161
+#: dpkg.1:152
 msgid ""
 "Processes only triggers. All pending triggers will be processed. If package "
 "names are supplied only those packages' triggers will be processed, exactly "
@@ -3454,13 +3612,13 @@
 "más tarde ejecutando B<dpkg --configure --pending>."
 
 #. type: TP
-#: dpkg.1:161
+#: dpkg.1:152
 #, no-wrap
 msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr "B<-r>, B<--remove>, B<-P>, B<--purge >I<paquete>...|B<-a>|B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:178
+#: dpkg.1:169
 msgid ""
 "Remove an installed package. B<-r> or B<--remove> remove everything except "
 "conffiles. This may avoid having to reconfigure the package if it is "
@@ -3493,33 +3651,33 @@
 "los ficheros de configuración escritos en los directorios «home/» de usuario."
 
 #. type: Plain text
-#: dpkg.1:180
+#: dpkg.1:171
 msgid "Removing of a package consists of the following steps:"
 msgstr "La eliminación de un paquete consiste de los siguientes pasos:"
 
 #. type: Plain text
-#: dpkg.1:183
+#: dpkg.1:174
 msgid "B<1.> Run I<prerm> script"
 msgstr "B<1.> Ejecución del script I<prerm>."
 
 #. type: Plain text
-#: dpkg.1:186
+#: dpkg.1:177
 msgid "B<2.> Remove the installed files"
 msgstr "B<2.> Eliminación de los ficheros instalados."
 
 #. type: Plain text
-#: dpkg.1:189
+#: dpkg.1:180
 msgid "B<3.> Run I<postrm> script"
 msgstr "B<3.> Ejecución del script I<postrm>."
 
 #. type: TP
-#: dpkg.1:190
+#: dpkg.1:181
 #, no-wrap
 msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<--update-avail>, B<--merge-avail> I<fichero-Packages>"
 
 #. type: Plain text
-#: dpkg.1:199
+#: dpkg.1:190
 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 "
@@ -3535,7 +3693,7 @@
 "paquetes disponibles en I</var/lib/dpkg/available>."
 
 #. type: Plain text
-#: dpkg.1:204
+#: dpkg.1:195
 msgid ""
 "A simpler one-shot command to retrieve and update the I<available> file is "
 "B<dselect update>. Note that this file is mostly useless if you don't use "
@@ -3549,30 +3707,36 @@
 "disponibles."
 
 #. type: TP
-#: dpkg.1:204
-#, no-wrap
-msgid "B<-A>, B<--record-avail> I<package_file>..."
+#: dpkg.1:195
+#, fuzzy, no-wrap
+#| msgid "B<-A>, B<--record-avail> I<package_file>..."
+msgid "B<-A>, B<--record-avail> I<package-file>..."
 msgstr "B<-A>, B<--record-avail> I<fichero-paquete>..."
 
 #. type: Plain text
-#: dpkg.1:210
+#: dpkg.1:201
+#, 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."
 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."
+"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 ""
 "Actualiza la lista de paquetes disponibles de B<dpkg> y B<dselect> con la "
 "información del I<fichero-paquete>. Si se usa B<--recursive> o B<-R>, el "
 "I<fichero-paquete> debe ser un directorio."
 
 #. type: TP
-#: dpkg.1:210
+#: dpkg.1:201
 #, no-wrap
 msgid "B<--forget-old-unavail>"
 msgstr "B<--forget-old-unavail>"
 
 #. type: Plain text
-#: dpkg.1:214
+#: dpkg.1:205
 msgid ""
 "Now B<obsolete> and a no-op as B<dpkg> will automatically forget uninstalled "
 "unavailable packages."
@@ -3581,24 +3745,24 @@
 "los paquetes desinstalados no disponibles."
 
 #. type: TP
-#: dpkg.1:214
+#: dpkg.1:205
 #, no-wrap
 msgid "B<--clear-avail>"
 msgstr "B<--clear-avail>"
 
 #. type: Plain text
-#: dpkg.1:217
+#: dpkg.1:208
 msgid "Erase the existing information about what packages are available."
 msgstr "Elimina la información sobre qué paquetes están disponibles."
 
 #. type: TP
-#: dpkg.1:217
+#: dpkg.1:208
 #, no-wrap
 msgid " B<-C>, B<--audit>"
 msgstr " B<-C>, B<--audit>"
 
 #. type: Plain text
-#: dpkg.1:222
+#: dpkg.1:213
 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."
@@ -3607,13 +3771,13 @@
 "programa B<dpkg> sugerirá qué hacer con ellos para hacerlos funcionar."
 
 #. type: TP
-#: dpkg.1:222
+#: dpkg.1:213
 #, no-wrap
 msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr "B<--get-selections> [I<patrón-nombre-paquete>...]"
 
 #. type: Plain text
-#: dpkg.1:227
+#: dpkg.1:218
 msgid ""
 "Get list of package selections, and write it to stdout. Without a pattern, "
 "non-installed packages (i.e. those which have been previously purged)  will "
@@ -3624,18 +3788,24 @@
 "es, previamente purgados) ."
 
 #. type: TP
-#: dpkg.1:227 update-alternatives.8:300
+#: dpkg.1:218 update-alternatives.8:299
 #, no-wrap
 msgid "B<--set-selections>"
 msgstr "B<--set-selections>"
 
 #. type: Plain text
-#: dpkg.1:233
+#: dpkg.1:224
+#, 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."
 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 format 'I<package> I<state>', where state is one of B<install>, B<hold>, "
+"B<deinstall> or B<purge>. Blank lines and comment lines beginning with '#' "
+"are also permitted."
 msgstr ""
 "Define las selecciones de paquetes usando un fichero introducido por la "
 "entrada estándar. Este fichero debería tener el formato «E<lt>paqueteE<gt> "
@@ -3644,13 +3814,13 @@
 "por «#»."
 
 #. type: TP
-#: dpkg.1:233
+#: dpkg.1:224
 #, no-wrap
 msgid "B<--clear-selections>"
 msgstr "B<--clear-selections>"
 
 #. type: Plain text
-#: dpkg.1:238
+#: dpkg.1:229
 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 "
@@ -3662,13 +3832,13 @@
 "selections»."
 
 #. type: TP
-#: dpkg.1:238
+#: dpkg.1:229
 #, no-wrap
 msgid "B<--yet-to-unpack>"
 msgstr "B<--yet-to-unpack>"
 
 #. type: Plain text
-#: dpkg.1:242
+#: dpkg.1:233
 msgid ""
 "Searches for packages selected for installation, but which for some reason "
 "still haven't been installed."
@@ -3677,13 +3847,13 @@
 "razón todavía no se han instalado."
 
 #. type: TP
-#: dpkg.1:243
+#: dpkg.1:234
 #, no-wrap
 msgid "B<--print-architecture>"
 msgstr "B<--print-architecture>"
 
 #. type: Plain text
-#: dpkg.1:246
+#: dpkg.1:237
 msgid ""
 "Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr ""
@@ -3691,13 +3861,13 @@
 "«i386»)."
 
 #. type: TP
-#: dpkg.1:246
+#: dpkg.1:237
 #, no-wrap
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<--compare-versions >I<ver1 op ver2>"
 
 #. type: Plain text
-#: dpkg.1:257
+#: dpkg.1:248
 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 "
@@ -3719,18 +3889,24 @@
 "B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 
 #. type: TP
-#: dpkg.1:257
-#, no-wrap
-msgid "B<--command-fd >I<E<lt>nE<gt>>"
+#: dpkg.1:248
+#, fuzzy, no-wrap
+#| msgid "B<--command-fd >I<E<lt>nE<gt>>"
+msgid "B<--command-fd >I<n>"
 msgstr "B<--command-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:262
-msgid ""
-"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and through this file "
-"descriptor, are not reset for subsequent commands executed during the same "
-"run."
+#: dpkg.1:253
+#, fuzzy
+#| msgid ""
+#| "Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. "
+#| "Note: additional options set on the command line, and through this file "
+#| "descriptor, are not reset for subsequent commands executed during the "
+#| "same run."
+msgid ""
+"Accept a series of commands on input file descriptor I<n>. Note: additional "
+"options set on the command line, and through this file descriptor, are not "
+"reset for subsequent commands executed during the same run."
 msgstr ""
 "Acepta una serie de órdenes en el descriptor de fichero B<E<lt>nE<gt>>. "
 "Nota: las opciones adicionales introducidas desde la línea de órdenes y "
@@ -3738,72 +3914,72 @@
 "llamadas efectuadas en la misma ejecución."
 
 #. type: TP
-#: dpkg.1:262 dpkg-architecture.1:61 dpkg-buildflags.1:71 dpkg-divert.8:71
-#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
-#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
+#: dpkg.1:253 dpkg-architecture.1:60 dpkg-buildflags.1:89 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:66 dpkg-statoverride.8:44
+#: dpkg-vendor.1:28 dselect.1:113 update-alternatives.8:316
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 #. type: Plain text
-#: dpkg.1:265
+#: dpkg.1:256
 msgid "Display a brief help message."
 msgstr "Muestra un resumen de las instrucciones de uso."
 
 #. type: TP
-#: dpkg.1:265
+#: dpkg.1:256
 #, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--force-help>"
 
 #. type: Plain text
-#: dpkg.1:268
+#: dpkg.1:259
 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:268
+#: dpkg.1:259
 #, no-wrap
 msgid "B<-Dh>, B<--debug=help>"
 msgstr "B<-Dh>, B<--debug=help>"
 
 #. type: Plain text
-#: dpkg.1:271
+#: dpkg.1:262
 msgid "Give help about debugging options."
 msgstr "Muestra la ayuda de las opciones de depuración."
 
 #. type: TP
-#: dpkg.1:271 dpkg-architecture.1:64 dpkg-buildflags.1:74
+#: dpkg.1:262 dpkg-architecture.1:63 dpkg-buildflags.1:92
 #: dpkg-buildpackage.1:226 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
-#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
-#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
-#: dpkg-shlibdeps.1:220 dpkg-source.1:93 dpkg-split.1:130
-#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
-#: update-alternatives.8:320
+#: dpkg-deb.1:175 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:113 dpkg-scanpackages.1:99 dpkg-scansources.1:68
+#: dpkg-shlibdeps.1:218 dpkg-source.1:99 dpkg-split.1:129
+#: dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:116
+#: update-alternatives.8:319
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg.1:274
+#: dpkg.1:265
 msgid "Display B<dpkg> version information."
 msgstr "Muestra la versión de B<dpkg>."
 
 #. type: TP
-#: dpkg.1:274
+#: dpkg.1:265
 #, no-wrap
 msgid "B<dpkg-deb actions>"
 msgstr "B<dpkg-deb actions>"
 
 #. type: Plain text
-#: dpkg.1:277
+#: dpkg.1:268
 msgid "See B<dpkg-deb>(1) for more information about the following actions."
 msgstr ""
 "Consulte B<dpkg-deb>(1) para más información sobre las siguientes acciones."
 
 #. type: Plain text
-#: dpkg.1:297
+#: dpkg.1:288
 #, no-wrap
 msgid ""
 "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
@@ -3844,19 +4020,19 @@
 "    Muestra información sobre el paquete.\n"
 
 #. type: TP
-#: dpkg.1:299
+#: dpkg.1:290
 #, no-wrap
 msgid "B<dpkg-query actions>"
 msgstr "B<dpkg-query-actions>"
 
 #. type: Plain text
-#: dpkg.1:302
+#: dpkg.1:293
 msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr ""
 "Consulte B<dpkg-query>(1) para más información sobre las siguientes acciones:"
 
 #. type: Plain text
-#: dpkg.1:317
+#: dpkg.1:308
 #, no-wrap
 msgid ""
 "B<-l>, B<--list> I<package-name-pattern>...\n"
@@ -3887,20 +4063,20 @@
 "    deberían usar B<apt-cache show> I<paquete>.\n"
 
 #. type: SH
-#: dpkg.1:319 dpkg-architecture.1:68 dpkg-buildpackage.1:50
-#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
+#: dpkg.1:310 dpkg-architecture.1:67 dpkg-buildpackage.1:50
+#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:179
 #: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
-#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
-#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
-#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
-#: start-stop-daemon.8:100 update-alternatives.8:324
+#: dpkg-gensymbols.1:369 dpkg-mergechangelogs.1:27 dpkg-name.1:30
+#: dpkg-parsechangelog.1:15 dpkg-query.1:117 dpkg-scanpackages.1:71
+#: dpkg-scansources.1:44 dpkg-shlibdeps.1:106 dpkg-split.1:133
+#: dpkg-statoverride.8:51 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:36
+#: start-stop-daemon.8:103 update-alternatives.8:323
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPCIONES"
 
 #. type: Plain text
-#: dpkg.1:325
+#: dpkg.1:316
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg> or the files on the configuration "
@@ -3915,26 +4091,26 @@
 "guiones al principio) o bien un comentario (si empieza con B<#>)."
 
 #. type: TP
-#: dpkg.1:326
+#: dpkg.1:317
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<número>"
 
 #. type: Plain text
-#: dpkg.1:329
+#: dpkg.1:320
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
 "Modifica cuántos errores llevan a B<dpkg> a interrumpir el proceso. El valor "
 "por omisión es 50."
 
 #. type: TP
-#: dpkg.1:329
+#: dpkg.1:320
 #, no-wrap
 msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>, B<--auto-deconfigure>"
 
 #. type: Plain text
-#: dpkg.1:335
+#: dpkg.1:326
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -3946,13 +4122,13 @@
 "paquete eliminado."
 
 #. type: TP
-#: dpkg.1:335
+#: dpkg.1:326
 #, 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:341
+#: dpkg.1:332
 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 "
@@ -3964,7 +4140,7 @@
 "Dh> o B<--debug=help> muestran estos valores."
 
 #. type: Plain text
-#: dpkg.1:356
+#: dpkg.1:347
 #, fuzzy, no-wrap
 #| msgid ""
 #| "    number  description\n"
@@ -4013,13 +4189,13 @@
 "  2000   Montañas de parrafadas (perjudica la salud)\n"
 
 #. type: TP
-#: dpkg.1:356
+#: dpkg.1:347
 #, 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>"
 
 #. type: Plain text
-#: dpkg.1:363
+#: dpkg.1:354
 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<--"
@@ -4032,7 +4208,7 @@
 "describe. Las cosas marcadas con (*) se fuerzan por omisión."
 
 #. type: Plain text
-#: dpkg.1:367
+#: dpkg.1:358
 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 "
@@ -4043,12 +4219,12 @@
 "funcionamiento.>"
 
 #. type: Plain text
-#: dpkg.1:370
+#: dpkg.1:361
 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:373
+#: dpkg.1:364
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
@@ -4057,7 +4233,7 @@
 "nueva instalada."
 
 #. type: Plain text
-#: dpkg.1:380
+#: dpkg.1:371
 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 "
@@ -4072,7 +4248,7 @@
 "su sistema por completo. Úselo con cuidado.>"
 
 #. type: Plain text
-#: dpkg.1:384
+#: dpkg.1:375
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
@@ -4081,13 +4257,13 @@
 "configurados sobre los que depende el paquete."
 
 #. type: Plain text
-#: dpkg.1:387
+#: dpkg.1:378
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr ""
 "B<hold>: Procesa los paquetes incluso si están marcados con «hold» (retener)."
 
 #. type: Plain text
-#: dpkg.1:392
+#: dpkg.1:383
 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 "
@@ -4098,7 +4274,7 @@
 "partes del paquete quedasen en el sistema, de las que B<dpkg> se olvidaría."
 
 #. type: Plain text
-#: dpkg.1:397
+#: dpkg.1:388
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -4110,12 +4286,12 @@
 "absoluto así que use esta opción con cuidado."
 
 #. type: Plain text
-#: dpkg.1:400
+#: dpkg.1:391
 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:403
+#: dpkg.1:394
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
@@ -4123,12 +4299,12 @@
 "dependencias."
 
 #. type: Plain text
-#: dpkg.1:406
+#: dpkg.1:397
 msgid "B<breaks>: Install, even if this would break another package."
 msgstr "B<breaks>: Instala, aunque suponga romper otro paquete."
 
 #. type: Plain text
-#: dpkg.1:410
+#: dpkg.1:401
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
@@ -4137,7 +4313,7 @@
 "opción es peligrosa dado que generalmente sobreescribirá algunos ficheros."
 
 #. type: Plain text
-#: dpkg.1:415
+#: dpkg.1:406
 msgid ""
 "B<confmiss>: Always install a missing conffile. This is dangerous, since it "
 "means not preserving a change (removing) made to the file."
@@ -4147,7 +4323,7 @@
 "al fichero."
 
 #. type: Plain text
-#: dpkg.1:420
+#: dpkg.1:411
 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 "
@@ -4159,7 +4335,7 @@
 "predefinida."
 
 #. type: Plain text
-#: dpkg.1:425
+#: dpkg.1:416
 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 "
@@ -4171,7 +4347,7 @@
 "predefinida."
 
 #. type: Plain text
-#: dpkg.1:431
+#: dpkg.1:422
 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 "
@@ -4185,7 +4361,7 @@
 "la decisión final."
 
 #. type: Plain text
-#: dpkg.1:438
+#: dpkg.1:429
 msgid ""
 "B<confask>: If a conffile has been modified always offer to replace it with "
 "the version in the package, even if the version in the package did not "
@@ -4200,20 +4376,20 @@
 "usará esta para tomar la decisión final."
 
 #. type: Plain text
-#: dpkg.1:441
+#: dpkg.1:432
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
 "B<overwrite>: Sobreescribe un fichero de un paquete con un fichero de otro."
 
 #. type: Plain text
-#: dpkg.1:444
+#: dpkg.1:435
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 "B<overwrite-dir>: Sobreescribe un directorio de un paquete con un fichero de "
 "otro."
 
 #. type: Plain text
-#: dpkg.1:447
+#: dpkg.1:438
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
@@ -4221,7 +4397,7 @@
 "una no desviada."
 
 #. type: Plain text
-#: dpkg.1:455
+#: dpkg.1:446
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking. Currently "
 "this implies not performing file system syncs before file renames, which is "
@@ -4239,7 +4415,7 @@
 "fallos severos del sistema."
 
 #. type: Plain text
-#: dpkg.1:461
+#: dpkg.1:452
 msgid ""
 "I<Note>: For ext4, the main offender, consider using instead the mount "
 "option B<nodelalloc>, which will fix both the performance degradation and "
@@ -4255,7 +4431,7 @@
 "sincronización antes de los renombres atómicos."
 
 #. type: Plain text
-#: dpkg.1:464
+#: dpkg.1:455
 msgid ""
 "I<Warning: Using this option might improve performance at the cost of losing "
 "data, use with care.>"
@@ -4264,7 +4440,7 @@
 "pérdida de datos. Úselo con cuidado.>"
 
 #. type: Plain text
-#: dpkg.1:467
+#: dpkg.1:458
 #, fuzzy
 #| msgid "B<architecture>: Process even packages with the wrong architecture."
 msgid "B<architecture>: Process even packages with wrong or no architecture."
@@ -4273,7 +4449,16 @@
 "arquitectura adecuada."
 
 #. type: Plain text
-#: dpkg.1:470
+#: dpkg.1:461
+#, fuzzy
+#| msgid "B<architecture>: Process even packages with the wrong architecture."
+msgid "B<bad-version>: Process even packages with wrong versions."
+msgstr ""
+"B<architecture>: Continua el proceso, incluso si los paquetes no son de la "
+"arquitectura adecuada."
+
+#. type: Plain text
+#: dpkg.1:464
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -4281,26 +4466,26 @@
 "bastante posible que haya problemas."
 
 #. type: Plain text
-#: dpkg.1:473
+#: dpkg.1:467
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
 "B<not-root>: Intenta la (des)instalación incluso si no es el usuario «root»."
 
 #. type: Plain text
-#: dpkg.1:476
+#: dpkg.1:470
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 "B<bad-verify>: Instala un paquete aunque falle la comprobación de "
 "autenticidad."
 
 #. type: TP
-#: dpkg.1:477
+#: dpkg.1:471
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<paquete>,..."
 
 #. type: Plain text
-#: dpkg.1:481
+#: dpkg.1:475
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
@@ -4310,42 +4495,13 @@
 "interrumpir el proceso)."
 
 #. type: TP
-#: dpkg.1:481
-#, no-wrap
-msgid "B<--new>, B<--old>"
-msgstr "B<--new>, B<--old>"
-
-#. type: Plain text
-#: dpkg.1:485
-msgid ""
-"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
-msgstr ""
-"Selecciona el formato nuevo o antiguo de paquete. Es una opción de B<dpkg-"
-"deb>(1)."
-
-#. type: TP
-#: dpkg.1:485 dpkg-deb.1:209
-#, no-wrap
-msgid "B<--nocheck>"
-msgstr "B<--nocheck>"
-
-#. type: Plain text
-#: dpkg.1:489
-msgid ""
-"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 al construir el "
-"paquete. Es una opción de B<dpkg-deb>(1)."
-
-#. type: TP
-#: dpkg.1:489
+#: dpkg.1:475
 #, 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:494
+#: dpkg.1:480
 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 "
@@ -4356,7 +4512,7 @@
 "cambios reales."
 
 #. type: Plain text
-#: dpkg.1:499
+#: dpkg.1:485
 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 "
@@ -4369,13 +4525,13 @@
 "--no-act, ¡aunque probablemente usted esperaba que no hiciera nada!)."
 
 #. type: TP
-#: dpkg.1:499
+#: dpkg.1:485
 #, no-wrap
 msgid "B<-R>, B<--recursive>"
 msgstr "B<-R>, B<--recursive>"
 
 #. type: Plain text
-#: dpkg.1:505
+#: dpkg.1:491
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -4387,13 +4543,13 @@
 "B<--unpack> y B<--avail>."
 
 #. type: TP
-#: dpkg.1:505
+#: dpkg.1:491
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg.1:509
+#: dpkg.1:495
 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>."
@@ -4402,14 +4558,14 @@
 "Es un alias de B<--refuse-downgrade>."
 
 #. type: TP
-#: dpkg.1:509 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
-#: dpkg-query.1:112 dpkg-shlibdeps.1:213 dpkg-trigger.1:39
+#: dpkg.1:495 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
+#: dpkg-query.1:118 dpkg-shlibdeps.1:211 dpkg-trigger.1:39
 #, no-wrap
 msgid "B<--admindir=>I<dir>"
 msgstr "B<--admindir=>I<directorio>"
 
 #. type: Plain text
-#: dpkg.1:514
+#: dpkg.1:500
 msgid ""
 "Change default administrative directory, which contains many files that give "
 "information about status of installed or uninstalled packages, etc.  "
@@ -4420,13 +4576,13 @@
 "no instalados, etc. (Por omisión, I</var/lib/dpkg>)."
 
 #. type: TP
-#: dpkg.1:514
+#: dpkg.1:500
 #, no-wrap
 msgid "B<--instdir=>I<dir>"
 msgstr "B<--instdir=>I<directorio>"
 
 #. type: Plain text
-#: dpkg.1:521
+#: dpkg.1:507
 msgid ""
 "Change default installation directory which refers to the directory where "
 "packages are to be installed. B<instdir> is also the directory passed to "
@@ -4440,13 +4596,13 @@
 "I</>)."
 
 #. type: TP
-#: dpkg.1:521
+#: dpkg.1:507
 #, no-wrap
 msgid "B<--root=>I<dir>"
 msgstr "B<--root=>I<directorio>"
 
 #. type: Plain text
-#: dpkg.1:525
+#: dpkg.1:511
 msgid ""
 "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 "var/lib/dpkg>."
@@ -4455,13 +4611,13 @@
 "I<dir>B</var/lib/dpkg> a B<admindir>."
 
 #. type: TP
-#: dpkg.1:525
+#: dpkg.1:511
 #, no-wrap
 msgid "B<-O>, B<--selected-only>"
 msgstr "B<-O>, B<--selected-only>"
 
 #. type: Plain text
-#: dpkg.1:531
+#: dpkg.1:517
 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 "
@@ -4473,13 +4629,13 @@
 "borra uno, éste se marcará para su desinstalación."
 
 #. type: TP
-#: dpkg.1:531
+#: dpkg.1:517
 #, no-wrap
 msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E>, B<--skip-same-version>"
 
 #. type: Plain text
-#: dpkg.1:535
+#: dpkg.1:521
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
@@ -4488,17 +4644,17 @@
 "instalada."
 
 #. type: Plain text
-#: dpkg.1:537
+#: dpkg.1:523
 msgid "B<--pre-invoke=>I<command>"
 msgstr "B<--pre-invoke=>I<orden>"
 
 #. type: Plain text
-#: dpkg.1:539
+#: dpkg.1:525
 msgid "B<--post-invoke=>I<command>"
 msgstr "B<--post-invoke=>I<orden>"
 
 #. type: Plain text
-#: dpkg.1:548
+#: dpkg.1:534
 msgid ""
 "Set an invoke hook I<command> to be run via ``sh -c'' before or after the "
 "dpkg run for the I<unpack>, I<configure>, I<install>, I<triggers-only>, "
@@ -4519,17 +4675,17 @@
 "cual puede ejecutar más órdenes encadenadas que las esperadas."
 
 #. type: Plain text
-#: dpkg.1:551
+#: dpkg.1:537
 msgid "B<--path-exclude=>I<glob-pattern>"
 msgstr "B<--path-exclude=>I<comodín>"
 
 #. type: Plain text
-#: dpkg.1:553
+#: dpkg.1:539
 msgid "B<--path-include=>I<glob-pattern>"
 msgstr "B<--path-include=>I<comodín>"
 
 #. type: Plain text
-#: dpkg.1:556
+#: dpkg.1:542
 msgid ""
 "Set I<glob-pattern> as a path filter, either by excluding or re-including "
 "previously excluded paths matching the specified patterns during install."
@@ -4539,7 +4695,7 @@
 "patrones definidos durante la instalación."
 
 #. type: Plain text
-#: dpkg.1:559
+#: dpkg.1:545
 msgid ""
 "I<Warning: take into account that depending on the excluded paths you might "
 "completely break your system, use with caution.>"
@@ -4548,7 +4704,7 @@
 "dejar su sistema inutilizable, úselo con precuación.>"
 
 #. type: Plain text
-#: dpkg.1:569
+#: dpkg.1:555
 msgid ""
 "The glob patterns use the same wildcards used in the shell, were '*' matches "
 "any sequence of characters, including the empty string and also '/'. For "
@@ -4573,7 +4729,7 @@
 "de desempaquetado."
 
 #. type: Plain text
-#: dpkg.1:572
+#: dpkg.1:558
 msgid ""
 "This can be used to remove all paths except some particular ones; a typical "
 "case is:"
@@ -4582,7 +4738,7 @@
 "particular; un típico uso es:"
 
 #. type: Plain text
-#: dpkg.1:576
+#: dpkg.1:562
 #, no-wrap
 msgid ""
 "B<--path-exclude=/usr/share/doc/*>\n"
@@ -4592,14 +4748,14 @@
 "B<--path-include=/usr/share/doc/*/copyright>\n"
 
 #. type: Plain text
-#: dpkg.1:579
+#: dpkg.1:565
 msgid "to remove all documentation files except the copyright files."
 msgstr ""
 "para eliminar todos los ficheros de documentación a excepción de los "
 "ficheros de derechos de autor."
 
 #. type: Plain text
-#: dpkg.1:583
+#: dpkg.1:569
 msgid ""
 "These two options can be specified multiple times, and interleaved with each "
 "other. Both are processed in the given order, with the last rule that "
@@ -4610,13 +4766,13 @@
 "nombre de fichero realiza la decisión."
 
 #. type: TP
-#: dpkg.1:584
+#: dpkg.1:570
 #, no-wrap
 msgid "B<--status-fd >I<n>"
 msgstr "B<--status-fd >I<n>"
 
 #. type: Plain text
-#: dpkg.1:590
+#: dpkg.1:576
 msgid ""
 "Send machine-readable package status and progress information to file "
 "descriptor I<n>. This option can be specified multiple times. The "
@@ -4628,52 +4784,52 @@
 "línea, en una de las siguientes formas."
 
 #. type: TP
-#: dpkg.1:591
+#: dpkg.1:577
 #, no-wrap
 msgid "B<status: >I<package>B<: >I<status>"
 msgstr "B<status: >I<paquete>B<: >I<estado>"
 
 #. type: Plain text
-#: dpkg.1:594
+#: dpkg.1:580
 msgid "Package status changed; I<status> is as in the status file."
 msgstr ""
 "El estado del paquete ha cambiado; el I<estado> es el que aparece en el "
 "fichero de estado."
 
 #. type: TP
-#: dpkg.1:594
+#: dpkg.1:580
 #, no-wrap
 msgid "B<status: >I<package>B< : error : >I<extended-error-message>"
 msgstr "B<status: >I<paquete>B< : error : >I<mensaje-de-fallo-detallado>"
 
 #. type: Plain text
-#: dpkg.1:598
+#: dpkg.1:584
 msgid ""
 "An error occurred. Any possible newlines in I<extended-error-message> will "
 "be converted to spaces before output."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:598
+#: dpkg.1:584
 #, no-wrap
 msgid "B<status: >I<file>B< : conffile-prompt : '>I<real-old>B<' '>I<real-new>B<' >I<useredited>B< >I<distedited>"
 msgstr "B<status: >I<fichero>B< : conffile-prompt : '>I<real-old>B<' '>I<real-new>B<' >I<edición-usuario>B< >I<edición-distribución>"
 
 #. type: Plain text
-#: dpkg.1:601
+#: dpkg.1:587
 msgid "User is being asked a conffile question."
 msgstr ""
 "El usuario tiene que responder a una pregunta de un fichero de configuración "
 "«conffile»."
 
 #. type: TP
-#: dpkg.1:601
+#: dpkg.1:587
 #, no-wrap
 msgid "B<processing: >I<stage>B<: >I<package>"
 msgstr "B<processing: >I<etapa>B<: >I<paquete>"
 
 #. type: Plain text
-#: dpkg.1:606
+#: dpkg.1:592
 msgid ""
 "Sent just before a processing stage starts. I<stage> is one of B<upgrade>, "
 "B<install> (both sent before unpacking), B<configure>, B<trigproc>, "
@@ -4684,14 +4840,14 @@
 "B<configure>, B<trigproc>, B<disappear>, B<remove> o B<purge>."
 
 #. type: TP
-#: dpkg.1:607
+#: dpkg.1:593
 #, fuzzy, no-wrap
 #| msgid "B<--post-invoke=>I<command>"
 msgid "B<--status-logger>=I<command>"
 msgstr "B<--post-invoke=>I<orden>"
 
 #. type: Plain text
-#: dpkg.1:612
+#: dpkg.1:598
 #, fuzzy
 #| msgid ""
 #| "Send machine-readable package status and progress information to file "
@@ -4709,23 +4865,34 @@
 "línea, en una de las siguientes formas."
 
 #. type: TP
-#: dpkg.1:613
+#: dpkg.1:599
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<fichero>"
 
 #. type: Plain text
-#: dpkg.1:625
+#: dpkg.1:611
+#, 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."
 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."
+"I<state> I<pkg> I<installed-version>' for status change updates; `YYYY-MM-DD "
+"HH:MM:SS I<action> I<pkg> I<installed-version> I<available-version>' for "
+"actions where I<action> is one of B<install>, B<upgrade>, B<remove>, "
+"B<purge>; and `YYYY-MM-DD HH:MM:SS conffile I<filename> I<decision>' for "
+"conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 "Registrar los cambios de estado y acciones en el I<fichero>, en lugar del "
 "predefinido, I</var/log/dpkg.log>. Se usará el último fichero introducido en "
@@ -4739,24 +4906,24 @@
 "en los que la I<E<lt>decisiónE<gt>> es o «install» o «keep»."
 
 #. type: TP
-#: dpkg.1:625
+#: dpkg.1:611
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--no-debsig>"
 
 #. type: Plain text
-#: dpkg.1:628
+#: dpkg.1:614
 msgid "Do not try to verify package signatures."
 msgstr "No intenta verificar las firmas de los paquetes."
 
 #. type: TP
-#: dpkg.1:628
+#: dpkg.1:614
 #, no-wrap
 msgid "B<--no-triggers>"
 msgstr "B<--no-triggers>"
 
 #. type: Plain text
-#: dpkg.1:637
+#: dpkg.1:623
 msgid ""
 "Do not run any triggers in this run (activations will still be recorded).  "
 "If used with B<--configure> I<package> or B<--triggers-only> I<package> then "
@@ -4774,42 +4941,42 @@
 "configure --pending>."
 
 #. type: TP
-#: dpkg.1:637
+#: dpkg.1:623
 #, no-wrap
 msgid "B<--triggers>"
 msgstr "B<--triggers>"
 
 #. type: Plain text
-#: dpkg.1:640
+#: dpkg.1:626
 msgid "Cancels a previous B<--no-triggers>."
 msgstr "Cancela un B<--no-triggers> previo."
 
 #. type: Plain text
-#: dpkg.1:642 dpkg.cfg.5:16
+#: dpkg.1:628 dpkg.cfg.5:16
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.1:645
+#: dpkg.1:631
 msgid "Configuration file with default options."
 msgstr "El fichero de configuración con las opciones predefinidas."
 
 #. type: TP
-#: dpkg.1:645
+#: dpkg.1:631
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/log/dpkg.log>"
 
 #. type: Plain text
-#: dpkg.1:649
+#: dpkg.1:635
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 "El fichero de registro predefinido (consulte I</etc/dpkg/dpkg.cfg>(5) y la "
 "opción B<--log>)."
 
 #. type: Plain text
-#: dpkg.1:652
+#: dpkg.1:638
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
@@ -4819,24 +4986,24 @@
 "ubicación de estos ficheros."
 
 #. type: TP
-#: dpkg.1:652
+#: dpkg.1:638
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg.1:655
+#: dpkg.1:641
 msgid "List of available packages."
 msgstr "Lista de paquetes disponibles."
 
 #. type: TP
-#: dpkg.1:655
+#: dpkg.1:641
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 #. type: Plain text
-#: dpkg.1:661
+#: dpkg.1:647
 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, "
@@ -4848,7 +5015,7 @@
 "SOBRE PAQUETES>."
 
 #. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:650
 msgid ""
 "The status file is backed up daily in I</var/backups>. It can be useful if "
 "it's lost or corrupted due to filesystems troubles."
@@ -4858,7 +5025,7 @@
 "con el sistema de ficheros."
 
 #. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:653
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
@@ -4867,57 +5034,57 @@
 "B<deb>(5) para más información sobre éstos:"
 
 #. type: TP
-#: dpkg.1:667
+#: dpkg.1:653
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 #. type: TP
-#: dpkg.1:669
+#: dpkg.1:655
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 #. type: TP
-#: dpkg.1:671
+#: dpkg.1:657
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 #. type: TP
-#: dpkg.1:673
+#: dpkg.1:659
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 #. type: TP
-#: dpkg.1:675
+#: dpkg.1:661
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 #. type: TP
-#: dpkg.1:677
+#: dpkg.1:663
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 #. type: SH
-#: dpkg.1:680 dpkg-buildflags.1:110 dpkg-buildpackage.1:230 dpkg-deb.1:219
-#: dpkg-divert.8:112 dpkg-query.1:196 dpkg-statoverride.8:69 dpkg-trigger.1:60
-#: dpkg-vendor.1:42 dselect.1:430 update-alternatives.8:355
+#: dpkg.1:666 dpkg-buildflags.1:128 dpkg-buildpackage.1:230 dpkg-deb.1:232
+#: dpkg-divert.8:112 dpkg-query.1:204 dpkg-statoverride.8:68 dpkg-trigger.1:60
+#: dpkg-vendor.1:42 dselect.1:423 update-alternatives.8:354
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "ENTORNO"
 
 #. type: TP
-#: dpkg.1:681 dselect.1:431
+#: dpkg.1:667 dselect.1:424
 #, no-wrap
 msgid "B<HOME>"
 msgstr "B<HOME>"
 
 #. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:671
 msgid ""
 "If set, B<dpkg> will use it as the directory from which to read the user "
 "specific configuration file."
@@ -4926,13 +5093,13 @@
 "de configuración específico del usuario."
 
 #. type: TP
-#: dpkg.1:685 dpkg-deb.1:220
+#: dpkg.1:671 dpkg-deb.1:233
 #, no-wrap
 msgid "B<TMPDIR>"
 msgstr "B<TMPDIR>"
 
 #. type: Plain text
-#: dpkg.1:689
+#: dpkg.1:675
 msgid ""
 "If set, B<dpkg> will use it as the directory in which to create temporary "
 "files and directories."
@@ -4941,38 +5108,38 @@
 "directorios temporales."
 
 #. type: TP
-#: dpkg.1:689
+#: dpkg.1:675
 #, no-wrap
 msgid "B<PAGER>"
 msgstr "B<PAGER>"
 
 #. type: Plain text
-#: dpkg.1:692
+#: dpkg.1:678
 msgid "The program B<dpkg> will execute when displaying the conffiles."
 msgstr ""
 "El programa que B<dpkg> ejecutará al mostrar los ficheros de configuración "
 "«conffiles»."
 
 #. type: TP
-#: dpkg.1:692
+#: dpkg.1:678
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 #. type: Plain text
-#: dpkg.1:695
+#: dpkg.1:681
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
 "El programa que B<dpkg> ejecutará al iniciar un nuevo intérprete de órdenes."
 
 #. type: TP
-#: dpkg.1:695 dpkg-query.1:201
+#: dpkg.1:681 dpkg-query.1:209
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 #. type: Plain text
-#: dpkg.1:699
+#: dpkg.1:685
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
@@ -4981,13 +5148,13 @@
 "información. Por ahora sólo la usa la opción «-l»."
 
 #. type: TP
-#: dpkg.1:699
+#: dpkg.1:685
 #, no-wrap
 msgid "B<DPKG_SHELL_REASON>"
 msgstr "B<DPKG_SHELL_REASON>"
 
 #. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:689
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Current valid value: B<conffile-prompt>."
@@ -4997,13 +5164,13 @@
 "válido actualmente es B<conffile-prompt>."
 
 #. type: TP
-#: dpkg.1:703
+#: dpkg.1:689
 #, no-wrap
 msgid "B<DPKG_CONFFILE_OLD>"
 msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. type: Plain text
-#: dpkg.1:707
+#: dpkg.1:693
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the old conffile."
@@ -5013,13 +5180,13 @@
 "ruta al fichero de configuración antiguo."
 
 #. type: TP
-#: dpkg.1:707
+#: dpkg.1:693
 #, no-wrap
 msgid "B<DPKG_CONFFILE_NEW>"
 msgstr "B<DPKG_CONFFILE_NEW>"
 
 #. type: Plain text
-#: dpkg.1:711
+#: dpkg.1:697
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the new conffile."
@@ -5029,13 +5196,13 @@
 "ruta al fichero de configuración «conffile» nuevo."
 
 #. type: TP
-#: dpkg.1:711
+#: dpkg.1:697
 #, no-wrap
 msgid "B<DPKG_RUNNING_VERSION>"
 msgstr "B<DPKG_RUNNING_VERSION>"
 
 #. type: Plain text
-#: dpkg.1:715
+#: dpkg.1:701
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the version of "
 "the currently running B<dpkg> instance."
@@ -5044,13 +5211,13 @@
 "la versión en ejecución de B<dpkg>."
 
 #. type: TP
-#: dpkg.1:715 dpkg-divert.8:117
+#: dpkg.1:701 dpkg-divert.8:117
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
 msgstr "B<DPKG_MAINTSCRIPT_PACKAGE>"
 
 #. type: Plain text
-#: dpkg.1:719
+#: dpkg.1:705
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the package name "
 "being handled."
@@ -5059,13 +5226,13 @@
 "nombre del paquete manipulado."
 
 #. type: TP
-#: dpkg.1:719
+#: dpkg.1:705
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_ARCH>"
 msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
 
 #. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:709
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the architecture "
 "the package got built for."
@@ -5074,13 +5241,13 @@
 "la arquitectura de paquete para la cual se compiló."
 
 #. type: TP
-#: dpkg.1:723
+#: dpkg.1:709
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_NAME>"
 msgstr "B<DPKG_MAINTSCRIPT_NAME>"
 
 #. type: Plain text
-#: dpkg.1:727
+#: dpkg.1:713
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the name of the "
 "script running (preinst, postinst, prerm, postrm)."
@@ -5090,51 +5257,51 @@
 "«postrm»)."
 
 #. type: Plain text
-#: dpkg.1:730
+#: dpkg.1:716
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr "Para listar los paquetes con el editor B<vi>(1) en su nombre:"
 
 #. type: Plain text
-#: dpkg.1:732
+#: dpkg.1:718
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 
 #. type: Plain text
-#: dpkg.1:735
+#: dpkg.1:721
 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 dos paquetes:"
 
 #. type: Plain text
-#: dpkg.1:737
+#: dpkg.1:723
 #, 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:740
+#: dpkg.1:726
 msgid "To search the listing of packages yourself:"
 msgstr "Para buscar personalmente en la lista de paquetes:"
 
 #. type: Plain text
-#: dpkg.1:742
+#: dpkg.1:728
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "     B<less /var/lib/dpkg/available>\n"
 
 #. type: Plain text
-#: dpkg.1:745
+#: dpkg.1:731
 msgid "To remove an installed elvis package:"
 msgstr "Para borrar un paquete instalado llamado elvis:"
 
 #. type: Plain text
-#: dpkg.1:747
+#: dpkg.1:733
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "     B<dpkg -r elvis>\n"
 
 #. type: Plain text
-#: dpkg.1:752
+#: dpkg.1:738
 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\":"
@@ -5144,7 +5311,7 @@
 "sección «editors»:"
 
 #. type: Plain text
-#: dpkg.1:755
+#: dpkg.1:741
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     B<cd /cdrom/pool/main/v/vim>\n"
@@ -5157,24 +5324,24 @@
 "     B<dpkg -i vim_4.5-3.deb>\n"
 
 #. type: Plain text
-#: dpkg.1:758
+#: dpkg.1:744
 msgid "To make a local copy of the package selection states:"
 msgstr "Para hacer una copia local de las selecciones de estados de paquetes:"
 
 #. type: Plain text
-#: dpkg.1:760
+#: dpkg.1:746
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr "     B< dpkg --get-selections E<gt>mis-selecciones>\n"
 
 #. type: Plain text
-#: dpkg.1:764
+#: dpkg.1:750
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr "Podría copiar este fichero a otra máquina e instalarlo allí con:"
 
 #. type: Plain text
-#: dpkg.1:767
+#: dpkg.1:753
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -5184,7 +5351,7 @@
 "     B<dpkg --set-selections E<lt>mis-selecciones>\n"
 
 #. type: Plain text
-#: dpkg.1:773
+#: dpkg.1:759
 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 "
@@ -5197,7 +5364,7 @@
 "ejecute B<apt-get dselect-upgrade>."
 
 #. type: Plain text
-#: dpkg.1:776
+#: dpkg.1:762
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
@@ -5206,13 +5373,13 @@
 "modificar los estados de selección de los paquetes."
 
 #. type: SH
-#: dpkg.1:778
+#: dpkg.1:764
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr "FUNCIONALIDAD ADICIONAL"
 
 #. type: Plain text
-#: dpkg.1:781
+#: dpkg.1:767
 msgid ""
 "Additional functionality can be gained by installing any of the following "
 "packages: B<apt>, B<aptitude> and B<debsums>."
@@ -5221,7 +5388,7 @@
 "paquetes: I<apt>, I<aptitude> y I<debsums>."
 
 #. type: Plain text
-#: dpkg.1:793
+#: dpkg.1:779
 msgid ""
 "B<aptitude>(1), B<apt>(1), 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)."
@@ -5230,13 +5397,13 @@
 "B<deb>(5), B<deb-control>(5), B<dpkg.cfg>(5), y B<dpkg-reconfigure>(8)."
 
 #. type: Plain text
-#: dpkg.1:796
+#: dpkg.1:782
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr ""
 "Habitualmente, la opción B<--no-act> da menos información de la que necesita."
 
 #. type: Plain text
-#: dpkg.1:799 dpkg.cfg.5:22
+#: dpkg.1:785 dpkg.cfg.5:22
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
 "contributed to B<dpkg>."
@@ -5250,12 +5417,6 @@
 msgid "dpkg-architecture"
 msgstr "dpkg-architecture"
 
-#. type: TH
-#: dpkg-architecture.1:1
-#, no-wrap
-msgid "2009-08-15"
-msgstr "15 de Agosto de 2009"
-
 #. type: Plain text
 #: dpkg-architecture.1:4
 msgid ""
@@ -5265,12 +5426,14 @@
 "construcción de paquetes"
 
 #. type: Plain text
-#: dpkg-architecture.1:9
-msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
+#: dpkg-architecture.1:8
+#, fuzzy
+#| msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
+msgid "B<dpkg-architecture> [I<option>...] [I<command>]"
 msgstr "B<dpkg-architecture> [I<opciones>] [I<órdenes>]"
 
 #. type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg-architecture.1:13
 msgid ""
 "dpkg-architecture does provide a facility to determine and set the build and "
 "host architecture for package building."
@@ -5279,7 +5442,7 @@
 "construcción y de la máquina anfitrión para la construcción de un paquete."
 
 #. type: Plain text
-#: dpkg-architecture.1:17
+#: dpkg-architecture.1:16
 msgid ""
 "The build architecture is always determined by an external call to B<dpkg>"
 "(1), and can not be set at the command line."
@@ -5288,7 +5451,7 @@
 "externa a B<dpkg>(1), y no se puede definir en la línea de órdenes."
 
 #. type: Plain text
-#: dpkg-architecture.1:26
+#: dpkg-architecture.1:25
 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 "
@@ -5307,22 +5470,22 @@
 "no encaja con la opción predefinida."
 
 #. type: SH
-#: dpkg-architecture.1:27 dpkg-buildflags.1:34 dpkg-deb.1:28 dpkg-divert.8:24
-#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
-#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
-#: update-alternatives.8:203
+#: dpkg-architecture.1:26 dpkg-buildflags.1:45 dpkg-deb.1:27 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:18 dpkg-split.1:31 dpkg-statoverride.8:23
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:34
+#: update-alternatives.8:202
 #, no-wrap
 msgid "COMMANDS"
 msgstr "ÓRDENES"
 
 #. type: TP
-#: dpkg-architecture.1:28
+#: dpkg-architecture.1:27
 #, no-wrap
 msgid "B<-l>"
 msgstr "B<-l>"
 
 #. type: Plain text
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 msgid ""
 "Print the environment variables, one each line, in the format "
 "I<VARIABLE=value>. This is the default action."
@@ -5331,13 +5494,13 @@
 "I<VARIABLE=valor>. Esta es la acción predefinida."
 
 #. type: TP
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 #, no-wrap
 msgid "B<-e>I<debian-architecture>"
 msgstr "B<-e>I<debian-architecture>"
 
 #. type: Plain text
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 msgid ""
 "Check for equality of architecture. By default I<debian-architecture> is "
 "compared against the current Debian architecture, being the host.  This "
@@ -5351,13 +5514,13 @@
 "contrario."
 
 #. type: TP
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 #, no-wrap
 msgid "B<-i>I<architecture-wildcard>"
 msgstr "B<-i>I<comodín-arquitectura>"
 
 #. type: Plain text
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 msgid ""
 "Check for identity of architecture by expanding I<architecture-wildcard> as "
 "an architecture wildcard and comparing against the current Debian "
@@ -5370,24 +5533,24 @@
 "coincide, y de 1 en caso contrario."
 
 #. type: TP
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 #, no-wrap
 msgid "B<-q>I<variable-name>"
 msgstr "B<-q>I<nombre-variable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 msgid "Print the value of a single variable."
 msgstr "Muestra el valor de una única variable."
 
 #. type: TP
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 #, no-wrap
 msgid "B<-s>"
 msgstr "B<-s>"
 
 #. type: Plain text
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 msgid ""
 "Print an export command. This can be used to set the environment variables "
 "using eval."
@@ -5396,26 +5559,26 @@
 "entorno mediante eval."
 
 #. type: TP
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 #, no-wrap
 msgid "B<-u>"
 msgstr "B<-u>"
 
 #. type: Plain text
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 "Muestra una orden similar a B<-s>, pero para eliminar la definición "
 "(«unset») de todas las variables."
 
 #. type: TP
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 #, no-wrap
 msgid "B<-c>I< command>"
 msgstr "B<-c>I< orden>"
 
 #. type: Plain text
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 msgid ""
 "Execute a I<command> in an environment which has all variables set to the "
 "determined value."
@@ -5424,70 +5587,70 @@
 "valor predefinido."
 
 #. type: TP
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 #, no-wrap
 msgid "B<-L>"
 msgstr "B<-L>"
 
 #. type: Plain text
-#: dpkg-architecture.1:61
+#: dpkg-architecture.1:60
 msgid "Print a list of valid architecture names."
 msgstr "Muestra una lista de nombres de arquitectura válidos."
 
 #. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildflags.1:74 dpkg-buildpackage.1:226
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-architecture.1:63 dpkg-buildflags.1:92 dpkg-buildpackage.1:226
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:175
 #: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
-#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:93
-#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
-#: update-alternatives.8:320
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-name.1:61
+#: dpkg-parsechangelog.1:36 dpkg-query.1:113 dpkg-scanpackages.1:99
+#: dpkg-scansources.1:68 dpkg-shlibdeps.1:218 dpkg-source.1:99
+#: dpkg-split.1:129 dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31
+#: update-alternatives.8:319
 msgid "Show the usage message and exit."
 msgstr "Muestra el modo de uso y termina."
 
 #. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildflags.1:77 dpkg-buildpackage.1:229
-#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-architecture.1:66 dpkg-buildflags.1:95 dpkg-buildpackage.1:229
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:178
 #: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
-#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
-#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:96
-#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
-#: update-alternatives.8:323
+#: dpkg-gensymbols.1:449 dpkg-mergechangelogs.1:44 dpkg-name.1:64
+#: dpkg-parsechangelog.1:39 dpkg-query.1:116 dpkg-scanpackages.1:102
+#: dpkg-scansources.1:70 dpkg-shlibdeps.1:221 dpkg-source.1:102
+#: dpkg-split.1:132 dpkg-statoverride.8:50 dpkg-trigger.1:37 dpkg-vendor.1:34
+#: update-alternatives.8:322
 msgid "Show the version and exit."
 msgstr "Muestra la versión y termina."
 
 #. type: TP
-#: dpkg-architecture.1:69
+#: dpkg-architecture.1:68
 #, no-wrap
 msgid "B<-a>I<debian-architecture>"
 msgstr "B<-a>I<debian-architecture>"
 
 #. type: Plain text
-#: dpkg-architecture.1:72
+#: dpkg-architecture.1:71
 msgid "Set the Debian architecture."
 msgstr "Define la arquitectura de Debian."
 
 #. type: TP
-#: dpkg-architecture.1:72 dpkg-buildpackage.1:110
+#: dpkg-architecture.1:71 dpkg-buildpackage.1:110
 #, no-wrap
 msgid "B<-t>I<gnu-system-type>"
 msgstr "B<-t>I<tipo-sistema-gnu>"
 
 #. type: Plain text
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 msgid "Set the GNU system type."
 msgstr "Define el tipo de sistema GNU."
 
 #. type: TP
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 #, no-wrap
 msgid "B<-f>"
 msgstr "B<-f>"
 
 #. type: Plain text
-#: dpkg-architecture.1:82
+#: dpkg-architecture.1:81
 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 "
@@ -5503,41 +5666,41 @@
 "(1))."
 
 #. type: SH
-#: dpkg-architecture.1:83
+#: dpkg-architecture.1:82
 #, no-wrap
 msgid "TERMS"
 msgstr "TÉRMINOS"
 
 #. type: IP
-#: dpkg-architecture.1:84
+#: dpkg-architecture.1:83
 #, no-wrap
 msgid "build machine"
 msgstr "máquina de construcción"
 
 #. type: Plain text
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 msgid "The machine the package is built on."
 msgstr "La máquina en la que se construye el paquete."
 
 #. type: IP
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 #, no-wrap
 msgid "host machine"
 msgstr "máquina anfitrión"
 
 #. type: Plain text
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 msgid "The machine the package is built for."
 msgstr "La máquina para la cual se construye el paquete."
 
 #. type: IP
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 #, no-wrap
 msgid "Debian architecture"
 msgstr "Arquitectura de Debian"
 
 #. type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 msgid ""
 "The Debian architecture string, which specifies the binary tree in the "
 "\\s-1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
@@ -5546,13 +5709,13 @@
 "el archivo \\s-1FTP\\s0. Ejemplos: i386, sparc, hurd-i386."
 
 #. type: IP
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 #, no-wrap
 msgid "architecture wildcard"
 msgstr "comodín de arquitectura"
 
 #. type: Plain text
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 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>-"
@@ -5563,13 +5726,13 @@
 "E<lt>kernelE<gt>-E<lt>cpuE<gt>. Ejemplos: linux-any, any-i386, hurd-any."
 
 #. type: IP
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 #, no-wrap
 msgid "\\s-1GNU\\s0 system type"
 msgstr "tipo de sistema \\s-1GNU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:99
+#: dpkg-architecture.1:98
 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, "
@@ -5580,114 +5743,114 @@
 "gnu, sparc-linux-gnu, i386-gnu, x86_64-netbsd."
 
 #. type: SH
-#: dpkg-architecture.1:100
+#: dpkg-architecture.1:99
 #, no-wrap
 msgid "VARIABLES"
 msgstr "VARIABLES"
 
 #. type: Plain text
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr "Las siguientes variables se definen mediante B<dpkg-architecture>:"
 
 #. type: IP
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 msgid "The Debian architecture of the build machine."
 msgstr "La arquitectura de Debian de la máquina de construcción."
 
 #. type: IP
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 #, 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:105
 msgid "The Debian system name of the build machine."
 msgstr "El nombre del sistema Debian de la máquina de construcción."
 
 #. type: IP
-#: dpkg-architecture.1:106
+#: dpkg-architecture.1:105
 #, 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:107
 msgid "The Debian cpu name of the build machine."
 msgstr "El nombre de Debian del procesador de la máquina de construcción."
 
 #. type: IP
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 msgid "The pointer size of the build machine (in bits)."
 msgstr "El tamaño del puntero de la máquina de construcción, en bits."
 
 #. type: IP
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 msgid "The endianness of the build machine (little / big)."
 msgstr ""
 "El nivel de «endianización» de la máquina de construcción, «little» o «big»."
 
 #. type: IP
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr "La parte \\s-1CPU\\s0 de \\s-1DEB_BUILD_GNU_TYPE\\s0."
 
 #. type: IP
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr "La parte de «System» de \\s-1DEB_BUILD_GNU_TYPE\\s0."
 
 #. type: IP
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr "El tipo de sistema \\s-1GNU\\s0 de la máquina de construcción."
 
 #. type: IP
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 #, fuzzy, no-wrap
 #| msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgid "\\s-1DEB_BUILD_MULTIARCH\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 #, fuzzy
 #| msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgid ""
@@ -5696,102 +5859,102 @@
 msgstr "El tipo de sistema \\s-1GNU\\s0 de la máquina de construcción."
 
 #. type: IP
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr "\\s-1DEB_HOST_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 msgid "The Debian architecture of the host machine."
 msgstr "La arquitectura de Debian de la máquina anfitrión."
 
 #. type: IP
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_OS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 msgid "The Debian system name of the host machine."
 msgstr "El nombre de sistema Debian de la máquina anfitrión."
 
 #. type: IP
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 msgid "The Debian cpu name of the host machine."
 msgstr "El nombre del procesador Debian de la máquina anfitrión."
 
 #. type: IP
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_BITS\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_BITS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 msgid "The pointer size of the host machine (in bits)."
 msgstr "El tamaño del puntero de la máquina anfitrión, en bits."
 
 #. type: IP
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_ENDIAN\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_ENDIAN\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 msgid "The endianness of the host machine (little / big)."
 msgstr "El nivel de «endianización» de la máquina anfitrión, «little» o «big»."
 
 #. type: IP
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr "\\s-1DEB_HOST_GNU_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr "La parte de \\s-1CPU\\s0 de \\s-1DEB_HOST_GNU_TYPE\\s0."
 
 #. type: IP
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr "La parte de «System» de \\s-1DEB_HOST_GNU_TYPE\\s0."
 
 #. type: IP
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr "\\s-1DEB_HOST_GNU_TYPE\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgstr "El tipo de sistema \\s-1GNU\\s0 de la máquina anfitrión."
 
 #. type: IP
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 #, fuzzy, no-wrap
 #| msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgid "\\s-1DEB_HOST_MULTIARCH\\s0"
 msgstr "\\s-1DEB_HOST_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:140
+#: dpkg-architecture.1:139
 #, fuzzy
 #| msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgid ""
@@ -5800,13 +5963,13 @@
 msgstr "El tipo de sistema \\s-1GNU\\s0 de la máquina anfitrión."
 
 #. type: SH
-#: dpkg-architecture.1:141
+#: dpkg-architecture.1:140
 #, no-wrap
 msgid "DEBIAN/RULES"
 msgstr "DEBIAN/RULES"
 
 #. type: Plain text
-#: dpkg-architecture.1:149
+#: dpkg-architecture.1:148
 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 "
@@ -5824,12 +5987,12 @@
 "construcción para varias arquitecturas."
 
 #. type: Plain text
-#: dpkg-architecture.1:152 dpkg-architecture.1:169
+#: dpkg-architecture.1:151 dpkg-architecture.1:168
 msgid "Instead of:"
 msgstr "En lugar de:"
 
 #. type: Plain text
-#: dpkg-architecture.1:156
+#: dpkg-architecture.1:155
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5839,12 +6002,12 @@
 "configure $(\\s-1ARCH\\s0)-linux\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:159
+#: dpkg-architecture.1:158
 msgid "please use the following:"
 msgstr "use lo siguiente:"
 
 #. type: Plain text
-#: dpkg-architecture.1:163
+#: dpkg-architecture.1:162
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
@@ -5854,13 +6017,13 @@
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:165
+#: dpkg-architecture.1:164
 #, 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:175
+#: dpkg-architecture.1:174
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5874,18 +6037,18 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:178
+#: dpkg-architecture.1:177
 msgid "please use:"
 msgstr "use:"
 
 #. type: Plain text
-#: dpkg-architecture.1:181
+#: dpkg-architecture.1:180
 #, 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:185
+#: dpkg-architecture.1:184
 #, no-wrap
 msgid ""
 "ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
@@ -5897,7 +6060,7 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:189
+#: dpkg-architecture.1:188
 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."
@@ -5906,7 +6069,7 @@
 "«DEB_HOST_ARCH_OS» o «DEB_HOST_ARCH_CPU»."
 
 #. type: Plain text
-#: dpkg-architecture.1:194
+#: dpkg-architecture.1:193
 msgid ""
 "In general, calling dpkg in the rules file to get architecture information "
 "is deprecated (unless you want to provide backward compatibility, see "
@@ -5920,13 +6083,13 @@
 "arquitecturas de Debian que no encajan con el nombre de un procesador."
 
 #. type: SH
-#: dpkg-architecture.1:195
+#: dpkg-architecture.1:194
 #, no-wrap
 msgid "BACKWARD COMPATIBILITY"
 msgstr "COMPATIBILIDAD CON VERSIONES ANTERIORES"
 
 #. type: Plain text
-#: dpkg-architecture.1:199
+#: dpkg-architecture.1:198
 msgid ""
 "The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced in dpkg-"
 "dev 1.15.4. Using them in I<debian/rules> thus requires a build-dependency "
@@ -5937,7 +6100,7 @@
 "una dependencia de construcción sobre dpkg-dev (E<gt>= 1.15.4)."
 
 #. type: Plain text
-#: dpkg-architecture.1:204
+#: dpkg-architecture.1:203
 msgid ""
 "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in dpkg-"
 "dev 1.13.2. Before this I<debian/rules> files tended to check the values of "
@@ -5950,7 +6113,7 @@
 "susceptibles de haber cambiado."
 
 #. type: Plain text
-#: dpkg-architecture.1:209
+#: dpkg-architecture.1:208
 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 "
@@ -5963,7 +6126,7 @@
 "anteriores de dpkg-dev:"
 
 #. type: Plain text
-#: dpkg-architecture.1:213
+#: dpkg-architecture.1:212
 #, no-wrap
 msgid ""
 "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
@@ -5973,7 +6136,7 @@
 "DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:227
+#: dpkg-architecture.1:226
 #, no-wrap
 msgid ""
 "# Take account of old dpkg-architecture output.\n"
@@ -6005,12 +6168,12 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:230
+#: dpkg-architecture.1:229
 msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
 msgstr "Y de forma parecida con «DEB_BUILD_ARCH_CPU» y «DEB_BUILD_ARCH_OS»."
 
 #. type: Plain text
-#: dpkg-architecture.1:233
+#: dpkg-architecture.1:232
 msgid ""
 "If you still wish to support versions of dpkg-dev that did not include "
 "B<dpkg-architecture>, the following does the job:"
@@ -6019,7 +6182,7 @@
 "architecture>, puede usar lo siguiente:"
 
 #. type: Plain text
-#: dpkg-architecture.1:243
+#: dpkg-architecture.1:242
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
@@ -6041,7 +6204,7 @@
 "DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:248
+#: dpkg-architecture.1:247
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
@@ -6055,7 +6218,7 @@
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:252
+#: dpkg-architecture.1:251
 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."
@@ -6065,7 +6228,7 @@
 "architecture."
 
 #. type: Plain text
-#: dpkg-architecture.1:259
+#: dpkg-architecture.1:258
 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 "
@@ -6083,7 +6246,7 @@
 "compilación nativa)."
 
 #. type: Plain text
-#: dpkg-architecture.1:262
+#: dpkg-architecture.1:261
 msgid ""
 "The B<-e> and B<-i> options were only introduced in relatively recent "
 "versions of B<dpkg-architecture> (since dpkg 1.13.13)."
@@ -6092,7 +6255,7 @@
 "architecture> (a partir de la versión 1.13.13 de dpkg)."
 
 #. type: Plain text
-#: dpkg-architecture.1:266
+#: dpkg-architecture.1:265
 msgid ""
 "B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
 "architecture>. Other examples:"
@@ -6101,33 +6264,33 @@
 "architecture>. Otros ejemplos:"
 
 #. type: Plain text
-#: dpkg-architecture.1:268
+#: dpkg-architecture.1:267
 msgid "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 msgstr "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 
 #. type: Plain text
-#: dpkg-architecture.1:270
+#: dpkg-architecture.1:269
 msgid "eval \\`dpkg-architecture -u\\`"
 msgstr "eval \\`dpkg-architecture -u\\`"
 
 #. type: Plain text
-#: dpkg-architecture.1:273
+#: dpkg-architecture.1:272
 msgid ""
 "Check if an architecture is equal to the current architecture or a given one:"
 msgstr "Revisa si una arquitectura equivale a la arquitectura actual o dada:"
 
 #. type: Plain text
-#: dpkg-architecture.1:275
+#: dpkg-architecture.1:274
 msgid "dpkg-architecture -elinux-alpha"
 msgstr "dpkg-architecture -elinux-alpha"
 
 #. type: Plain text
-#: dpkg-architecture.1:277
+#: dpkg-architecture.1:276
 msgid "dpkg-architecture -amips -elinux-mips"
 msgstr "dpkg-architecture -amips -elinux-mips"
 
 #. type: Plain text
-#: dpkg-architecture.1:280
+#: dpkg-architecture.1:279
 msgid ""
 "Check if the current architecture or an architecture provided with -a are "
 "Linux systems:"
@@ -6136,57 +6299,62 @@
 "Linux:"
 
 #. type: Plain text
-#: dpkg-architecture.1:282
+#: dpkg-architecture.1:281
 msgid "dpkg-architecture -ilinux-any"
 msgstr "dpkg-architecture -ilinux-any"
 
 #. type: Plain text
-#: dpkg-architecture.1:284
+#: dpkg-architecture.1:283
 msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr "dpkg-architecture -ai386 -ilinux-any"
 
 #. type: Plain text
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
+#, fuzzy
+#| msgid ""
+#| "All these files have to be present for B<dpkg-architecture> to work. "
+#| "Their location can be overridden at runtime with the environment variable "
+#| "DPKG_DATADIR."
 msgid ""
 "All these files have to be present for B<dpkg-architecture> to work. Their "
 "location can be overridden at runtime with the environment variable "
-"DPKG_DATADIR."
+"B<DPKG_DATADIR>."
 msgstr ""
 "Todos los ficheros deben estar presentes para que B<dpkg-architecture> "
 "funcione. Puede sobreescribir la ubicación en tiempo de ejecución mediante "
 "la variable de entorno «DPKG_DATADIR»."
 
 #. type: TP
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 #, no-wrap
 msgid "I</usr/share/dpkg/cputable>"
 msgstr "I</usr/share/dpkg/cputable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 msgid "Table of known CPU names and mapping to their GNU name."
 msgstr "Tabla de nombres de CPU conocidos y su correlación con su nombre GNU."
 
 #. type: TP
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 #, no-wrap
 msgid "I</usr/share/dpkg/ostable>"
 msgstr "I</usr/share/dpkg/ostable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 msgid "Table of known operating system names and mapping to their GNU name."
 msgstr ""
 "Tabla de sistemas operativos conocidos y su correlación con su nombre GNU."
 
 #. type: TP
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 #, no-wrap
 msgid "I</usr/share/dpkg/triplettable>"
 msgstr "I</usr/share/dpkg/triplettable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:299
+#: dpkg-architecture.1:298
 msgid ""
 "Mapping between Debian architecture triplets and Debian architecture names."
 msgstr ""
@@ -6194,12 +6362,12 @@
 "arquitectura de Debian."
 
 #. type: Plain text
-#: dpkg-architecture.1:303
+#: dpkg-architecture.1:302
 msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 msgstr "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 
 #. type: Plain text
-#: dpkg-architecture.1:308
+#: dpkg-architecture.1:307
 msgid ""
 "B<dpkg-architecture> and this man page were initially written by Marcus "
 "Brinkmann E<lt>brinkmd@debian.orgE<gt>."
@@ -6214,7 +6382,7 @@
 msgstr "dpkg.cfg"
 
 #. type: TH
-#: dpkg.cfg.5:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1
 #, no-wrap
 msgid "2009-09-05"
 msgstr "5 de Septiembre de 2009"
@@ -6250,7 +6418,7 @@
 msgstr "I<~/.dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:214 dpkg-statoverride.8:87
+#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:222 dpkg-statoverride.8:86
 msgid "B<dpkg>(1)."
 msgstr "B<dpkg>(1)."
 
@@ -6260,6 +6428,13 @@
 msgid "dpkg-buildflags"
 msgstr "dpkg-buildflags"
 
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+#| msgid "2010-03-07"
+msgid "2011-09-13"
+msgstr "7 de Marzo de 2010"
+
 #. type: Plain text
 #: dpkg-buildflags.1:4
 msgid "dpkg-buildflags - returns build flags to use during package build"
@@ -6269,7 +6444,9 @@
 
 #. type: Plain text
 #: dpkg-buildflags.1:8
-msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+#, fuzzy
+#| msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgid "B<dpkg-buildflags> [I<option>...] [I<command>]"
 msgstr "B<dpkg-buildflags> [I<opción>...] I<orden>"
 
 #. type: Plain text
@@ -6323,45 +6500,109 @@
 msgstr "3."
 
 #. type: Plain text
-#: dpkg-buildflags.1:22
-msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+#: dpkg-buildflags.1:23
+#, fuzzy
+#| msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+msgid ""
+"temporarily by the user with environment variables (see section "
+"B<ENVIRONMENT>);"
+msgstr ""
+"Temporalmente con variables de entorno (consulte la sección B<ENTORNO>)."
+
+#. type: IP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "4."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+#, fuzzy
+#| msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+msgid ""
+"dynamically by the package maintainer with environment variables set via "
+"B<debian/rules> (see section B<ENVIRONMENT>)."
 msgstr ""
 "Temporalmente con variables de entorno (consulte la sección B<ENTORNO>)."
 
 #. type: Plain text
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 msgid "The configuration files can contain two types of directives:"
 msgstr "Los ficheros de configuración pueden contener dos tipos de directivas:"
 
 #. type: TP
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 #, no-wrap
 msgid "B<SET>I< flag value>"
 msgstr "B<SET>I< opción valor>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
 msgid "Override the flag named I<flag> to have the value I<value>."
 msgstr "Sustituye la opción llamada I<opción> con el valor I<valor>."
 
 #. type: TP
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
+#, fuzzy, no-wrap
+#| msgid "B<SET>I< flag value>"
+msgid "B<STRIP>I< flag value>"
+msgstr "B<SET>I< opción valor>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:34
+#, fuzzy
+#| msgid "Override the flag named I<flag> to have the value I<value>."
+msgid ""
+"Strip from the flag named I<flag> all the build flags listed in I<value>."
+msgstr "Sustituye la opción llamada I<opción> con el valor I<valor>."
+
+#. type: TP
+#: dpkg-buildflags.1:34
 #, no-wrap
 msgid "B<APPEND>I< flag value>"
 msgstr "B<APPEND>I< opción valor>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:31
-msgid ""
-"Extend the flag named I<flag> with the options given in I<value>.  A space "
-"is prepended to the appended value if the flag's current value is non-empty."
+#: dpkg-buildflags.1:38
+#, fuzzy
+#| msgid ""
+#| "Extend the flag named I<flag> with the options given in I<value>.  A "
+#| "space is prepended to the appended value if the flag's current value is "
+#| "non-empty."
+msgid ""
+"Extend the flag named I<flag> by appending the options given in I<value>.  A "
+"space is prepended to the appended value if the flag's current value is non-"
+"empty."
 msgstr ""
 "Extiende la opción llamada I<opción> con las opciones dadas en I<valor>. Se "
 "prefijará un espacio al valor añadido si el valor actual de la opción no "
 "está vacío."
 
+#. type: TP
+#: dpkg-buildflags.1:38
+#, fuzzy, no-wrap
+#| msgid "B<APPEND>I< flag value>"
+msgid "B<PREPEND>I< flag value>"
+msgstr "B<APPEND>I< opción valor>"
+
 #. type: Plain text
-#: dpkg-buildflags.1:34
+#: dpkg-buildflags.1:42
+#, fuzzy
+#| msgid ""
+#| "Extend the flag named I<flag> with the options given in I<value>.  A "
+#| "space is prepended to the appended value if the flag's current value is "
+#| "non-empty."
+msgid ""
+"Extend the flag named I<flag> by prepending the options given in I<value>.  "
+"A space is appended to the prepended value if the flag's current value is "
+"non-empty."
+msgstr ""
+"Extiende la opción llamada I<opción> con las opciones dadas en I<valor>. Se "
+"prefijará un espacio al valor añadido si el valor actual de la opción no "
+"está vacío."
+
+#. type: Plain text
+#: dpkg-buildflags.1:45
 msgid ""
 "The configuration files can contain comments on lines starting with a hash "
 "(#). Empty lines are also ignored."
@@ -6370,13 +6611,28 @@
 "empiecen con «#». También se ignoran líneas vacías."
 
 #. type: TP
-#: dpkg-buildflags.1:35
+#: dpkg-buildflags.1:46
+#, fuzzy, no-wrap
+#| msgid "B<--debug>"
+msgid "B<--dump>"
+msgstr "B<--debug>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:51
+msgid ""
+"Print to standard output all compilation flags and their values. It prints "
+"one flag per line separated from its value by an equal sign "
+"(\"I<flag>=I<value>\"). This is the default action."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:51
 #, no-wrap
 msgid "B<--list>"
 msgstr "B<--list>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 msgid ""
 "Print the list of flags supported by the current vendor (one per line). See "
 "the B<SUPPORTED FLAGS> section for more information about them."
@@ -6386,19 +6642,28 @@
 "ACEPTADAS>."
 
 #. type: TP
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 #, no-wrap
 msgid "B<--export=>I<format>"
 msgstr "B<--export=>I<format>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
+#, fuzzy
+#| msgid ""
+#| "Print to standard output shell (if I<format> is B<sh>) or make (if "
+#| "I<format> is B<make>) commands that can be used to export all the "
+#| "compilation flags in the environment. If the I<format> value is not "
+#| "given, B<sh> is assumed. Only compilation flags starting with an upper "
+#| "case character are included, others are assumed to not be suitable for "
+#| "the environment."
 msgid ""
 "Print to standard output shell (if I<format> is B<sh>) or make (if I<format> "
 "is B<make>) commands that can be used to export all the compilation flags in "
-"the environment. If the I<format> value is not given, B<sh> is assumed. Only "
-"compilation flags starting with an upper case character are included, others "
-"are assumed to not be suitable for the environment."
+"the environment. If I<format> is B<configure> then the output can be used on "
+"a B<./configure> command-line. If the I<format> value is not given, B<sh> is "
+"assumed. Only compilation flags starting with an upper case character are "
+"included, others are assumed to not be suitable for the environment."
 msgstr ""
 "Muestra por la salida del intérprete de órdenes estándar (si I<format> es "
 "B<sh>) o make (si I<format> es B<make>) las órdenes que se pueden usar para "
@@ -6408,13 +6673,13 @@
 "adecuados para el entorno."
 
 #. type: TP
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 #, no-wrap
 msgid "B<--get>I< flag>"
 msgstr "B<--get>I< opción>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 msgid ""
 "Print the value of the flag on standard output. Exits with 0 if the flag is "
 "known otherwise exits with 1."
@@ -6423,13 +6688,13 @@
 "la opción es conocida, y el valor 1 en caso contrario."
 
 #. type: TP
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 #, no-wrap
 msgid "B<--origin>I< flag>"
 msgstr "B<--origin>I< opción>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:57
+#: dpkg-buildflags.1:75
 msgid ""
 "Print the origin of the value that is returned by B<--get>. Exits with 0 if "
 "the flag is known otherwise exits with 1. The origin can be one of the "
@@ -6440,69 +6705,69 @@
 "cualquiera de las siguientes opciones:"
 
 #. type: TP
-#: dpkg-buildflags.1:58
+#: dpkg-buildflags.1:76
 #, no-wrap
 msgid "B<vendor>"
 msgstr "B<vendor>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 msgid "the original flag set by the vendor is returned;"
 msgstr "Devuelve la opción originalmente definida por el proveedor;"
 
 #. type: TP
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 #, no-wrap
 msgid "B<system>"
 msgstr "B<system>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 msgid "the flag is set/modified by a system-wide configuration;"
 msgstr ""
 "La opción está definida o modificada por una configuración que afecta a todo "
 "el sistema;"
 
 #. type: TP
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 #, no-wrap
 msgid "B<user>"
 msgstr "B<user>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 msgid "the flag is set/modified by a user-specific configuration;"
 msgstr ""
 "La opción esta definida o modificada por una configuración específica del "
 "usuario;"
 
 #. type: TP
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 #, no-wrap
 msgid "B<env>"
 msgstr "B<env>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:70
+#: dpkg-buildflags.1:88
 msgid "the flag is set/modified by an environment-specific configuration."
 msgstr ""
 "La opción esta definida o modificado por una configuración específica del "
 "entorno."
 
 #. type: SH
-#: dpkg-buildflags.1:78
+#: dpkg-buildflags.1:96
 #, no-wrap
 msgid "SUPPORTED FLAGS"
 msgstr "OPCIONES ACEPTADAS"
 
 #. type: TP
-#: dpkg-buildflags.1:79
+#: dpkg-buildflags.1:97
 #, no-wrap
 msgid "B<CFLAGS>"
 msgstr "B<CFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 msgid ""
 "Options for the C compiler. The default value set by the vendor includes I<-"
 "g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
@@ -6514,46 +6779,46 @@
 "B<DEB_BUILD_OPTIONS> define I<noopt>)."
 
 #. type: TP
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 #, no-wrap
 msgid "B<CPPFLAGS>"
 msgstr "B<CPPFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 msgid "Options for the C preprocessor. Default value: empty."
 msgstr "Opciones para el preprocesador C. Valor por omisión: vacío."
 
 #. type: TP
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 #, no-wrap
 msgid "B<CXXFLAGS>"
 msgstr "B<CXXFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 msgid "Options for the C++ compiler. Same as B<CFLAGS>."
 msgstr "Opciones para el compilador C++. Idéntica a B<CFLAGS>."
 
 #. type: TP
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 #, no-wrap
 msgid "B<FFLAGS>"
 msgstr "B<FFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
 msgstr "Opciones para el compilador Fortran. Idéntica a B<CFLAGS>."
 
 #. type: TP
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 #, no-wrap
 msgid "B<LDFLAGS>"
 msgstr "B<LDFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:102
+#: dpkg-buildflags.1:120
 msgid ""
 "Options passed to the compiler when linking executables or shared objects "
 "(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
@@ -6564,35 +6829,53 @@
 "B<-Wl> y «B<,>» de estas opciones). Valor por omisión: vacío."
 
 #. type: TP
-#: dpkg-buildflags.1:104
+#: dpkg-buildflags.1:122
 #, no-wrap
 msgid "B</etc/dpkg/buildflags.conf>"
 msgstr "B</etc/dpkg/buildflags.conf>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 msgid "System wide configuration file."
 msgstr "Fichero de configuración de todo el sistema."
 
 #. type: TP
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 #, no-wrap
 msgid "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or B<$HOME/.config/dpkg/buildflags.conf>"
 msgstr "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> o B<$HOME/.config/dpkg/buildflags.conf>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:110
+#: dpkg-buildflags.1:128
 msgid "User configuration file."
 msgstr "Fichero de configuración del usuario."
 
+#. type: Plain text
+#: dpkg-buildflags.1:135
+msgid ""
+"There are 2 sets of environment variables doing the same operations, the "
+"first one (DEB_I<flag>_I<op>) should never be used within B<debian/rules>. "
+"It's meant for any user that wants to rebuild the source package with "
+"different build flags. The second set (DEB_I<flag>_MAINT_I<op>) should only "
+"be used in B<debian/rules> by package maintainers to change the resulting "
+"build flags."
+msgstr ""
+
 #. type: TP
-#: dpkg-buildflags.1:111
+#: dpkg-buildflags.1:135
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_SET>"
 msgstr "B<DEB_>I<opción>B<_SET>"
 
+#. type: TQ
+#: dpkg-buildflags.1:137
+#, fuzzy, no-wrap
+#| msgid "B<DEB_>I<flag>B<_SET>"
+msgid "B<DEB_>I<flag>B<_MAINT_SET>"
+msgstr "B<DEB_>I<opción>B<_SET>"
+
 #. type: Plain text
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
 msgid ""
 "This variable can be used to force the value returned for the given I<flag>."
 msgstr ""
@@ -6600,13 +6883,47 @@
 "dada."
 
 #. type: TP
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
+#, fuzzy, no-wrap
+#| msgid "B<DEB_>I<flag>B<_SET>"
+msgid "B<DEB_>I<flag>B<_STRIP>"
+msgstr "B<DEB_>I<opción>B<_SET>"
+
+#. type: TQ
+#: dpkg-buildflags.1:143
+#, fuzzy, no-wrap
+#| msgid "B<DEB_>I<flag>B<_SET>"
+msgid "B<DEB_>I<flag>B<_MAINT_STRIP>"
+msgstr "B<DEB_>I<opción>B<_SET>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:148
+#, fuzzy
+#| msgid ""
+#| "This variable can be used to append supplementary options to the value "
+#| "returned for the given I<flag>."
+msgid ""
+"This variable can be used to provide a space separated list of options that "
+"will be stripped from the set of flags returned for the given I<flag>."
+msgstr ""
+"Esta variable se puede usar para añadir opciones adicionales al valor "
+"devuelto por la I<opción> dada."
+
+#. type: TP
+#: dpkg-buildflags.1:148
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_APPEND>"
 msgstr "B<DEB_>I<opción>B<_APPEND>"
 
+#. type: TQ
+#: dpkg-buildflags.1:150
+#, fuzzy, no-wrap
+#| msgid "B<DEB_>I<flag>B<_APPEND>"
+msgid "B<DEB_>I<flag>B<_MAINT_APPEND>"
+msgstr "B<DEB_>I<opción>B<_APPEND>"
+
 #. type: Plain text
-#: dpkg-buildflags.1:119
+#: dpkg-buildflags.1:154
 msgid ""
 "This variable can be used to append supplementary options to the value "
 "returned for the given I<flag>."
@@ -6614,27 +6931,263 @@
 "Esta variable se puede usar para añadir opciones adicionales al valor "
 "devuelto por la I<opción> dada."
 
-#. type: Plain text
-#: dpkg-buildflags.1:122 dpkg-maintscript-helper.1:130
-msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
-msgstr "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+#. type: TP
+#: dpkg-buildflags.1:154
+#, fuzzy, no-wrap
+#| msgid "B<DEB_>I<flag>B<_APPEND>"
+msgid "B<DEB_>I<flag>B<_PREPEND>"
+msgstr "B<DEB_>I<opción>B<_APPEND>"
 
-#. type: TH
-#: dpkg-buildpackage.1:1
-#, no-wrap
-msgid "dpkg-buildpackage"
-msgstr "dpkg-buildpackage"
+#. type: TQ
+#: dpkg-buildflags.1:156
+#, fuzzy, no-wrap
+#| msgid "B<DEB_>I<flag>B<_APPEND>"
+msgid "B<DEB_>I<flag>B<_MAINT_PREPEND>"
+msgstr "B<DEB_>I<opción>B<_APPEND>"
 
 #. type: Plain text
-#: dpkg-buildpackage.1:4
-msgid "dpkg-buildpackage - build binary or source packages from sources"
-msgstr ""
-"dpkg-buildpackage - Construcción de paquetes binarios o fuente a partir de "
-"las fuentes"
+#: dpkg-buildflags.1:160
+#, fuzzy
+#| msgid ""
+#| "This variable can be used to append supplementary options to the value "
+#| "returned for the given I<flag>."
+msgid ""
+"This variable can be used to prepend supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+"Esta variable se puede usar para añadir opciones adicionales al valor "
+"devuelto por la I<opción> dada."
+
+#. type: TP
+#: dpkg-buildflags.1:160
+#, fuzzy, no-wrap
+#| msgid "B<DEB_>I<flag>B<_SET>"
+msgid "B<DEB_BUILD_MAINT_OPTIONS>"
+msgstr "B<DEB_>I<opción>B<_SET>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:165
+msgid ""
+"This variable can be used to disable/enable various hardening build flags "
+"through the B<hardening> option. See the B<HARDENING> section for details."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:166
+#, fuzzy, no-wrap
+#| msgid "WARNING"
+msgid "HARDENING"
+msgstr "AVISO"
+
+#. type: Plain text
+#: dpkg-buildflags.1:171
+msgid ""
+"Several compile-time options (detailed below) can be used to help harden a "
+"resulting binary against memory corruption attacks, or provide additional "
+"warning messages during compilation. Except as noted below, these are "
+"enabled by default for architectures that support them."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:177
+msgid ""
+"Each hardening feature can be enabled and disabled in the "
+"B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value with "
+"the \"+\" and \"-\" modifier. For example, to enable the \"pie\" feature and "
+"disable the \"fortify\" feature you can do this in B<debian/rules>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:179
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:183
+msgid ""
+"The special feature B<all> can be used to enable or disable all hardening "
+"features at the same time. Thus disabling everything and enabling only "
+"\"format\" and \"fortify\" can be achieved with:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:185
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:186
+#, fuzzy, no-wrap
+#| msgid "B<Format>"
+msgid "B<format>"
+msgstr "B<Format>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:198
+msgid ""
+"This setting (enabled by default) adds B<-Wformat -Wformat-security -"
+"Werror=format-security> to B<CFLAGS> and B<CXXFLAGS>. This will warn about "
+"improper format string uses, and will fail when format functions are used in "
+"a way that that represent possible security problems. At present, this warns "
+"about calls to B<printf> and B<scanf> functions where the format string is "
+"not a string literal and there are no format arguments, as in B<printf(foo);"
+"> instead of B<printf(\"%s\", foo);> This may be a security hole if the "
+"format string came from untrusted input and contains \"%n\"."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:199
+#, no-wrap
+msgid "B<fortify>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:210
+msgid ""
+"This setting (enabled by default) adds B<-D_FORTIFY_SOURCE=2> to "
+"B<CPPFLAGS>. During code generation the compiler knows a great deal of "
+"information about buffer sizes (where possible), and attempts to replace "
+"insecure unlimited length buffer function calls with length-limited ones. "
+"This is especially useful for old, crufty code.  Additionally, format "
+"strings in writable memory that contain '%n' are blocked. If an application "
+"depends on such a format string, it will need to be worked around."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:213
+msgid ""
+"Note that for this option to have any effect, the source must also be "
+"compiled with B<-O1> or higher."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:213
+#, no-wrap
+msgid "B<stackprotector>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:222
+msgid ""
+"This setting (enabled by default) adds B<-fstack-protector --param=ssp-"
+"buffer-size=4> to B<CFLAGS> and B<CXXFLAGS>. This adds safety checks against "
+"stack overwrites. This renders many potential code injection attacks into "
+"aborting situations. In the best case this turns code injection "
+"vulnerabilities into denial of service or into non-issues (depending on the "
+"application)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:226
+msgid ""
+"This feature requires linking against glibc (or another provider of "
+"B<__stack_chk_fail>), so needs to be disabled when building with B<-"
+"nostdlib> or B<-ffreestanding> or similar."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:227
+#, fuzzy, no-wrap
+#| msgid "B<regex>"
+msgid "B<relro>"
+msgstr "B<regex>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:235
+msgid ""
+"This setting (enabled by default) adds B<-Wl,-z,relro> to B<LDFLAGS>.  "
+"During program load, several ELF memory sections need to be written to by "
+"the linker. This flags the loader to turn these sections read-only before "
+"turning over control to the program. Most notably this prevents GOT "
+"overwrite attacks."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:236
+#, no-wrap
+msgid "B<bindnow>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:243
+msgid ""
+"This setting (disabled by default) adds B<-Wl,-z,now> to B<LDFLAGS>. During "
+"program load, all dynamic symbols are resolved, allowing for the entire PLT "
+"to be marked read-only (due to B<relro> above)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:244
+#, no-wrap
+msgid "B<pie>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:256
+msgid ""
+"This setting (disabled by default) adds B<-fPIE> to B<CFLAGS> and "
+"B<CXXFLAGS>, and B<-fPIE -pie> to B<LDFLAGS>. Position Independent "
+"Executable are needed to take advantage of Address Space Layout "
+"Randomization, supported by some kernel versions. While ASLR can already be "
+"enforced for data areas in the stack and heap (brk and mmap), the code areas "
+"must be compiled as position-independent. Shared libraries already do this (-"
+"fPIC), so they gain ASLR automatically, but binary .text regions need to be "
+"build PIE to gain ASLR. When this happens, ROP (Return Oriented Programming) "
+"attacks are much harder since there are no static locations to bounce off of "
+"during a memory corruption attack."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:259
+msgid ""
+"This is not compatible with B<-fPIC> so care must be taken when building "
+"shared objects."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:265
+msgid ""
+"Additionally, since PIE is implemented via a general register, some "
+"architectures (most notably i386) can see performance losses of up to 15% in "
+"very text-segment-heavy application workloads; most workloads see less than "
+"1%. Architectures with more general registers (e.g. amd64)  do not see as "
+"high a worst-case penalty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:268
+#, fuzzy
+#| msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2010-2011 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
+
+#. type: Plain text
+#: dpkg-buildflags.1:270
+#, fuzzy
+#| msgid "Copyright \\(co 2001 Joey Hess"
+msgid "Copyright \\(co 2011 Kees Cook"
+msgstr "Copyright \\(co 2001 Joey Hess"
+
+#. type: TH
+#: dpkg-buildpackage.1:1
+#, no-wrap
+msgid "dpkg-buildpackage"
+msgstr "dpkg-buildpackage"
+
+#. type: Plain text
+#: dpkg-buildpackage.1:4
+msgid "dpkg-buildpackage - build binary or source packages from sources"
+msgstr ""
+"dpkg-buildpackage - Construcción de paquetes binarios o fuente a partir de "
+"las fuentes"
 
 #. type: Plain text
 #: dpkg-buildpackage.1:8
-msgid "B<dpkg-buildpackage> [I<options>]"
+#, fuzzy
+#| msgid "B<dpkg-buildpackage> [I<options>]"
+msgid "B<dpkg-buildpackage> [I<option>...]"
 msgstr "B<dpkg-buildpackage> [I<opciones>]"
 
 #. type: Plain text
@@ -6720,6 +7273,13 @@
 
 #. type: Plain text
 #: dpkg-buildpackage.1:36
+#, fuzzy
+#| msgid ""
+#| "It calls B<debian/rules> B<build> followed by B<fakeroot debian/rules> "
+#| "I<binary-target> (unless a source-only build has been requested with B<-"
+#| "S>). Note that I<binary-target> is either B<binary> (default case, or if "
+#| "B<-b> is specified)  or B<binary-arch> (if B<-B> is specified) or "
+#| "B<binary-indep> (if B<-A> is specified)."
 msgid ""
 "It calls B<debian/rules> B<build> followed by B<fakeroot debian/rules> "
 "I<binary-target> (unless a source-only build has been requested with B<-S>). "
@@ -6933,7 +7493,7 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:96 dpkg-genchanges.1:49 dpkg-gencontrol.1:38
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 #, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<-v>I<versión>"
@@ -7035,7 +7595,7 @@
 "omisión."
 
 #. type: TP
-#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:427
+#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:432
 #, no-wrap
 msgid "B<-d>"
 msgstr "B<-d>"
@@ -7244,8 +7804,8 @@
 msgstr "B<--admindir> I<directorio>"
 
 #. type: Plain text
-#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:116
-#: dpkg-shlibdeps.1:217 dpkg-trigger.1:43
+#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:122
+#: dpkg-shlibdeps.1:215 dpkg-trigger.1:43
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
 "lib/dpkg>."
@@ -7255,18 +7815,23 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:223 dpkg-checkbuilddeps.1:33 dpkg-distaddfile.1:32
-#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
-#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
-#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:90 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-deb.1:172 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
+#: dpkg-gensymbols.1:443 dpkg-name.1:58 dpkg-parsechangelog.1:33
+#: dpkg-query.1:110 dpkg-scanpackages.1:96 dpkg-shlibdeps.1:215
+#: dpkg-source.1:96 dpkg-split.1:126 dpkg-trigger.1:31
 #, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr "B<-h>, B<--help>"
 
 #. type: Plain text
 #: dpkg-buildpackage.1:234
+#, fuzzy
+#| msgid ""
+#| "Even if B<dpkg-buildpackage> export some variables, B<debian/rules> "
+#| "should not rely on their presence and should instead use the respective "
+#| "interface to retrieve the needed values."
 msgid ""
-"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"Even if B<dpkg-buildpackage> exports some variables, B<debian/rules> should "
 "not rely on their presence and should instead use the respective interface "
 "to retrieve the needed values."
 msgstr ""
@@ -7294,19 +7859,16 @@
 #. type: SS
 #: dpkg-buildpackage.1:238
 #, no-wrap
-msgid "Compiler flags"
-msgstr "Opciones de compilación"
+msgid "Compiler flags are no longer exported"
+msgstr ""
 
 #. type: Plain text
 #: dpkg-buildpackage.1:243
 msgid ""
-"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
-"environment variables are set to the values that B<dpkg-buildflags> "
-"returned. See its manual page for more information."
-msgstr ""
-"Las variables de entorno B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> y "
-"B<LDFLAGS> se define con los valores que devuelve B<dpkg-buildflags>. Para "
-"más información consulte su página de manual."
+"Between versions 1.14.17 and 1.16.1, B<dpkg-buildpackage> exported compiler "
+"flags (B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS>) with "
+"values as returned by B<dpkg-buildflags>. This is no longer the case."
+msgstr ""
 
 #. type: Plain text
 #: dpkg-buildpackage.1:248
@@ -7319,16 +7881,20 @@
 "root> y la I<orden-para-firmar>."
 
 #. type: Plain text
-#: dpkg-buildpackage.1:255
+#: dpkg-buildpackage.1:256
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
+#| "B<fakeroot>(1), B<gpg>(1)."
 msgid ""
-"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
-"B<fakeroot>(1), B<gpg>(1)."
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
+"genchanges>(1), B<fakeroot>(1), B<gpg>(1)."
 msgstr ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
 "B<fakeroot>(1), B<gpg>(1)."
 
 #. type: Plain text
-#: dpkg-buildpackage.1:264 dpkg-source.1:712
+#: dpkg-buildpackage.1:265
 msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
 
@@ -7338,12 +7904,6 @@
 msgid "dpkg-checkbuilddeps"
 msgstr "dpkg-checkbuilddeps"
 
-#. type: TH
-#: dpkg-checkbuilddeps.1:1
-#, no-wrap
-msgid "2009-11-21"
-msgstr "21 de Noviembre de 2009"
-
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:4
 msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
@@ -7352,7 +7912,9 @@
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:9
-msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+#, fuzzy
+#| msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgid "B<dpkg-checkbuilddeps> [I<option>...] [I<control-file>]"
 msgstr "B<dpkg-checkbuilddeps> [I<opciones>] [I<fichero-control>]"
 
 #. type: Plain text
@@ -7369,8 +7931,12 @@
 
 #. type: Plain text
 #: 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."
 msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
+"By default, B<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 se puede especificar un fichero "
@@ -7424,7 +7990,9 @@
 
 #. type: Plain text
 #: dpkg-distaddfile.1:8
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+#, fuzzy
+#| msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+msgid "B<dpkg-distaddfile> [I<option>...]I< filename section priority>"
 msgstr "B<dpkg-distaddfile> [I<opciones>]I< fichero sección prioridad>"
 
 #. type: Plain text
@@ -7489,12 +8057,6 @@
 msgid "dpkg-deb"
 msgstr "dpkg-deb"
 
-#. type: TH
-#: dpkg-deb.1:1 dpkg-query.1:1 dselect.1:1
-#, no-wrap
-msgid "2010-03-07"
-msgstr "7 de Marzo de 2010"
-
 #. type: Plain text
 #: dpkg-deb.1:4
 msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
@@ -7503,12 +8065,14 @@
 "Debian"
 
 #. type: Plain text
-#: dpkg-deb.1:9
-msgid "B<dpkg-deb> [I<options>] I<command>"
+#: dpkg-deb.1:8
+#, fuzzy
+#| msgid "B<dpkg-deb> [I<options>] I<command>"
+msgid "B<dpkg-deb> [I<option>...] I<command>"
 msgstr "B<dpkg-deb> [I<opciones>] I<orden>"
 
 #. type: Plain text
-#: dpkg-deb.1:13
+#: dpkg-deb.1:12
 msgid ""
 "B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr ""
@@ -7516,12 +8080,12 @@
 "Debian."
 
 #. type: Plain text
-#: dpkg-deb.1:17
+#: dpkg-deb.1:16
 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-deb.1:27
+#: dpkg-deb.1:26
 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> "
@@ -7532,13 +8096,13 @@
 "B<dpkg-deb>, y lo ejecutará por usted."
 
 #. type: TP
-#: dpkg-deb.1:29
+#: dpkg-deb.1:28
 #, no-wrap
 msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
 msgstr "B<-b>, B<--build> I<directorio> [I<archivo>|I<directorio>]"
 
 #. type: Plain text
-#: dpkg-deb.1:41
+#: dpkg-deb.1:40
 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 "
@@ -7554,7 +8118,7 @@
 "el área de la información de control del paquete binario."
 
 #. type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-deb.1:52
 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 "
@@ -7570,7 +8134,7 @@
 "control B<DEBIAN>."
 
 #. type: Plain text
-#: dpkg-deb.1:60
+#: dpkg-deb.1:59
 msgid ""
 "If no I<archive> is specified then B<dpkg-deb> will write the package into "
 "the file I<directory>B<.deb>."
@@ -7579,12 +8143,12 @@
 "fichero I<directorio>B<.deb>."
 
 #. type: Plain text
-#: dpkg-deb.1:62
+#: dpkg-deb.1:61
 msgid "If the archive to be created already exists it will be overwritten."
 msgstr "Si el archivo a crear ya existe se sobreescribirá."
 
 #. type: Plain text
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 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 "
@@ -7602,18 +8166,18 @@
 "del paquete para así determinar qué nombre de archivo usar."
 
 #. type: TP
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 #, no-wrap
 msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr "B<-I>, B<--info> I<archivo> [I<fichero-de-control> ..]"
 
 #. type: Plain text
-#: dpkg-deb.1:81
+#: dpkg-deb.1:80
 msgid "Provides information about a binary package archive."
 msgstr "Ofrece información acerca del paquete binario."
 
 #. type: Plain text
-#: dpkg-deb.1:86
+#: dpkg-deb.1:85
 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."
@@ -7622,7 +8186,7 @@
 "los contenidos del paquete así como del fichero de control."
 
 #. type: Plain text
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 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 "
@@ -7636,13 +8200,13 @@
 "con el estado de salida 2."
 
 #. type: TP
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 #, no-wrap
 msgid "B<-W>, B<--show> I<archive>"
 msgstr "B<-W>, B<--show> I<archivo>"
 
 #. type: Plain text
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 msgid ""
 "Provides information about a binary package archive in the format specified "
 "by the B<--showformat> argument. The default format displays the package's "
@@ -7653,19 +8217,19 @@
 "paquete y la versión en una sola línea, separados por un tabulado."
 
 #. type: TP
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 #, no-wrap
 msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr "B<-f>, B<--field> I<archivo> [I<campo-del-fichero-control> ...]"
 
 #. type: Plain text
-#: dpkg-deb.1:104
+#: dpkg-deb.1:103
 msgid "Extracts control file information from a binary package archive."
 msgstr ""
 "Extrae información del fichero de control del fichero de un paquete binario."
 
 #. type: Plain text
-#: dpkg-deb.1:108
+#: dpkg-deb.1:107
 msgid ""
 "If no B<control-file-field>s are specified then it will print the whole "
 "control file."
@@ -7674,7 +8238,7 @@
 "fichero de control."
 
 #. type: Plain text
-#: dpkg-deb.1:117
+#: dpkg-deb.1:116
 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-"
@@ -7687,20 +8251,20 @@
 "nombre del campo (más dos puntos y un espacio)."
 
 #. type: Plain text
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 msgid "No errors are reported for fields requested but not found."
 msgstr ""
 "No se informa de ningún error para los campos solicitados pero no "
 "encontrados."
 
 #. type: TP
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 #, no-wrap
 msgid "B<-c>, B<--contents> I<archive>"
 msgstr "B<-c>, B<--contents> I<archivo>"
 
 #. type: Plain text
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 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 "
@@ -7712,13 +8276,13 @@
 "listado informativo de B<tar>."
 
 #. type: TP
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 #, no-wrap
 msgid "B<-x>, B<--extract> I<archive directory>"
 msgstr "B<-x>, B<--extract> I<directorio-archivo>"
 
 #. type: Plain text
-#: dpkg-deb.1:129
+#: dpkg-deb.1:128
 msgid ""
 "Extracts the filesystem tree from a package archive into the specified "
 "directory."
@@ -7727,7 +8291,7 @@
 "directorio especificado."
 
 #. type: Plain text
-#: dpkg-deb.1:135
+#: dpkg-deb.1:134
 msgid ""
 "Note that extracting a package to the root directory will I<not> result in a "
 "correct installation! Use B<dpkg> to install packages."
@@ -7736,7 +8300,7 @@
 "paquete en el directorio raíz! Use B<dpkg> para instalar paquetes."
 
 #. type: Plain text
-#: dpkg-deb.1:139
+#: dpkg-deb.1:138
 msgid ""
 "I<directory> (but not its parents) will be created if necessary, and its "
 "permissions modified to match the contents of the package."
@@ -7745,45 +8309,84 @@
 "modificando sus permisos de acuerdo a los contenidos del paquete."
 
 #. type: TP
-#: dpkg-deb.1:139
+#: dpkg-deb.1:138
 #, no-wrap
 msgid "B<-X>, B<--vextract> I<archive directory>"
 msgstr "B<-X>, B<--vextract> I<directorio-archivo>"
 
 #. type: Plain text
-#: dpkg-deb.1:144
+#: dpkg-deb.1:145
+#, fuzzy
+#| msgid ""
+#| "Is like B<--extract> (B<-x>)  but prints a listing of the files extracted "
+#| "as it goes."
 msgid ""
-"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
-"it goes."
+"Is like B<--extract> (B<-x>)  with B<--verbose> (B<-v>)  which prints a "
+"listing of the files extracted as it goes."
 msgstr ""
 "Similar a B<--extract> (B<-x>), pero muestra una lista de ficheros a medida "
 "que se extraen."
 
 #. type: TP
-#: dpkg-deb.1:144
+#: dpkg-deb.1:145
+#, fuzzy, no-wrap
+#| msgid "B<-x>, B<--extract> I<archive directory>"
+msgid "B<-R>, B<--raw-extract> I<archive directory>"
+msgstr "B<-x>, B<--extract> I<directorio-archivo>"
+
+#. type: Plain text
+#: dpkg-deb.1:150
+#, fuzzy
+#| msgid ""
+#| "Extracts the filesystem tree from a package archive into the specified "
+#| "directory."
+msgid ""
+"Extracts the filesystem tree from a package archive into a specified "
+"directory, and the control information files into a DEBIAN subdirectory of "
+"the specified directory."
+msgstr ""
+"Extrae el árbol del sistema de ficheros del archivo de paquetes al "
+"directorio especificado."
+
+#. type: Plain text
+#: dpkg-deb.1:152 dpkg-deb.1:172
+msgid ""
+"The target directory (but not its parents) will be created if necessary."
+msgstr ""
+"El directorio de destino (pero no los directorios padre) se creará de ser "
+"necesario."
+
+#. type: TP
+#: dpkg-deb.1:152
 #, no-wrap
 msgid "B<--fsys-tarfile> I<archive>"
 msgstr "B<--fsys-tarfile> I<archivo>"
 
 #. type: Plain text
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
+#, 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."
 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."
+"to extract a particular file from a package archive.  The input archive will "
+"always be processed sequentially."
 msgstr ""
 "Extrae los datos del árbol de sistema de ficheros de un paquete binario, "
 "enviándolo por la salida estándar en formato B<tar>. Se puede usar junto con "
 "B<tar> para extraer un fichero específico del archivo de paquetes."
 
 #. type: TP
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
 #, no-wrap
 msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<-e>, B<--control> I<archivo> [I<directorio>]"
 
 #. type: Plain text
-#: dpkg-deb.1:156
+#: dpkg-deb.1:165
 msgid ""
 "Extracts the control information files from a package archive into the "
 "specified directory."
@@ -7792,7 +8395,7 @@
 "directorio especificado."
 
 #. type: Plain text
-#: dpkg-deb.1:160
+#: dpkg-deb.1:169
 msgid ""
 "If no directory is specified then a subdirectory B<DEBIAN> in the current "
 "directory is used."
@@ -7800,22 +8403,14 @@
 "Si no se especifica ningún directorio, se usará el subdirectorio B<DEBIAN> "
 "del directorio actual."
 
-#. type: Plain text
-#: dpkg-deb.1:163
-msgid ""
-"The target directory (but not its parents) will be created if necessary."
-msgstr ""
-"El directorio de destino (pero no los directorios padre) se creará de ser "
-"necesario."
-
 #. type: TP
-#: dpkg-deb.1:171
+#: dpkg-deb.1:180
 #, no-wrap
 msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-deb.1:176 dpkg-query.1:121
+#: dpkg-deb.1:185 dpkg-query.1:127
 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."
@@ -7825,7 +8420,7 @@
 "listado."
 
 #. type: Plain text
-#: dpkg-deb.1:185
+#: dpkg-deb.1:194
 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 "
@@ -7840,33 +8435,39 @@
 "explicación de la opción B<--showformat> en B<dpkg-query> (1)."
 
 #. type: Plain text
-#: dpkg-deb.1:187
+#: dpkg-deb.1:196
 msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
 msgstr "El valor predefinido de este campo es «${Package}\\et${Version}\\en»."
 
 #. type: TP
-#: dpkg-deb.1:187
-#, no-wrap
-msgid "B<-z>I<compress_level>"
+#: dpkg-deb.1:196
+#, fuzzy, no-wrap
+#| msgid "B<-z>I<compress_level>"
+msgid "B<-z>I<compress-level>"
 msgstr "B<-z>I<compress_level>"
 
 #. type: Plain text
-#: dpkg-deb.1:191
+#: dpkg-deb.1:200
+#, fuzzy
+#| msgid ""
+#| "Specify which compression level to pass to the compressor backend "
+#| "program, when building a package."
 msgid ""
-"Specify which compression level to pass to the compressor backend program, "
-"when building a package."
+"Specify which compression level to use on the compressor backend, when "
+"building a package (default is 9 for gzip and bzip2, 6 for xz and lzma)."
 msgstr ""
 "Define el nivel de compresión a introducir al programa de compresión externo "
 "al construir un paquete."
 
 #. type: TP
-#: dpkg-deb.1:191
-#, no-wrap
-msgid "B<-Z>I<compress_type>"
+#: dpkg-deb.1:200
+#, fuzzy, no-wrap
+#| msgid "B<-Z>I<compress_type>"
+msgid "B<-Z>I<compress-type>"
 msgstr "B<-Z>I<compress_type>"
 
 #. type: Plain text
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 msgid ""
 "Specify which compression type to use when building a package. Allowed "
 "values are I<gzip>, I<xz>, I<bzip2>, I<lzma>, and I<none> (default is "
@@ -7877,13 +8478,13 @@
 "valor predefinido es I<gzip>."
 
 #. type: TP
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 #, no-wrap
 msgid "B<--new>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 msgid ""
 "Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
@@ -7891,13 +8492,13 @@
 "el comportamiento por omisión."
 
 #. type: TP
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 #, no-wrap
 msgid "B<--old>"
 msgstr "B<--old>"
 
 #. type: Plain text
-#: dpkg-deb.1:209
+#: dpkg-deb.1:218
 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 "
@@ -7911,8 +8512,14 @@
 "(septiembre 1995) analizarán, la cual se distribuyó sólo para sistemas i386 "
 "en formato «a.out.»"
 
+#. type: TP
+#: dpkg-deb.1:218
+#, no-wrap
+msgid "B<--nocheck>"
+msgstr "B<--nocheck>"
+
 #. type: Plain text
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224
 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."
@@ -7922,18 +8529,31 @@
 "importa lo mal que esté."
 
 #. type: TP
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224 start-stop-daemon.8:255
+#, no-wrap
+msgid "B<-v>, B<--verbose>"
+msgstr "B<-v>, B<--verbose>"
+
+#. type: Plain text
+#: dpkg-deb.1:228
+msgid ""
+"Enables verbose output. This currently only affects B<--extract> making it "
+"behave like B<--vextract>."
+msgstr ""
+
+#. type: TP
+#: dpkg-deb.1:228
 #, no-wrap
 msgid "B<-D>, B<--debug>"
 msgstr "B<-D>, B<--debug>"
 
 #. type: Plain text
-#: dpkg-deb.1:218
+#: dpkg-deb.1:231
 msgid "Enables debugging output. This is not very interesting."
 msgstr "Activa los mensajes de depuración. No son muy interesantes."
 
 #. type: Plain text
-#: dpkg-deb.1:224
+#: dpkg-deb.1:237
 msgid ""
 "If set, B<dpkg-deb> will use it as the directory in which to create "
 "temporary files and directories."
@@ -7942,7 +8562,7 @@
 "ficheros temporales y directorios."
 
 #. type: Plain text
-#: dpkg-deb.1:230
+#: dpkg-deb.1:243
 msgid ""
 "B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
 msgstr ""
@@ -7950,7 +8570,7 @@
 "debería."
 
 #. type: Plain text
-#: dpkg-deb.1:238
+#: dpkg-deb.1:251
 msgid ""
 "There is no authentication on B<.deb> files; in fact, there isn't even a "
 "straightforward checksum.  (Higher level tools like APT support "
@@ -7966,7 +8586,7 @@
 "una compatibilidad directa con estos procesos."
 
 #. type: Plain text
-#: dpkg-deb.1:245
+#: dpkg-deb.1:258
 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 "
@@ -7977,7 +8597,7 @@
 "paquete se ejecuten y que se registren los contenidos y estado el de éste."
 
 #. type: Plain text
-#: dpkg-deb.1:251
+#: dpkg-deb.1:264
 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)."
 
@@ -7987,13 +8607,6 @@
 msgid "dpkg-divert"
 msgstr "dpkg-divert"
 
-#. type: TH
-#: dpkg-divert.8:1
-#, fuzzy, no-wrap
-#| msgid "2010-10-10"
-msgid "2010-10-12"
-msgstr "10 de Octubre del 2010"
-
 #. type: Plain text
 #: dpkg-divert.8:4
 msgid "dpkg-divert - override a package's version of a file"
@@ -8001,7 +8614,9 @@
 
 #. type: Plain text
 #: dpkg-divert.8:9
-msgid "B<dpkg-divert> [I<options>] I<command>"
+#, fuzzy
+#| msgid "B<dpkg-divert> [I<options>] I<command>"
+msgid "B<dpkg-divert> [I<option>...] I<command>"
 msgstr "B<dpkg-divert> [I<opciones>] I<orden>"
 
 #. type: Plain text
@@ -8045,7 +8660,7 @@
 msgstr "Añade una redirección para el I<fichero>."
 
 #. type: TP
-#: dpkg-divert.8:28 dpkg-statoverride.8:36
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
 #, no-wrap
 msgid "B<--remove>I< file>"
 msgstr "B<--remove>I< fichero>"
@@ -8094,7 +8709,8 @@
 msgstr "Muestra el nombre real del fichero redirigido."
 
 #. type: TP
-#: dpkg-divert.8:43 dpkg-statoverride.8:53 update-alternatives.8:329
+#: dpkg-divert.8:43 dpkg-statoverride.8:52 dselect.1:44
+#: update-alternatives.8:328
 #, no-wrap
 msgid "B<--admindir>I< directory>"
 msgstr "B<--admindir>I< directorio>"
@@ -8158,7 +8774,7 @@
 "a excepción de I<paquete>."
 
 #. type: TP
-#: dpkg-divert.8:61 dpkg-statoverride.8:65 update-alternatives.8:351
+#: dpkg-divert.8:61 dpkg-statoverride.8:64 update-alternatives.8:350
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
@@ -8203,10 +8819,15 @@
 
 #. type: Plain text
 #: dpkg-divert.8:82
-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."
+#, 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 ""
+"When adding, default is B<--local> and B<--divert> I<original>B<.distrib>. "
+"When removing, B<--package> or B<--local> and B<--divert> must match if "
+"specified."
 msgstr ""
 "Al añadir redirecciones por omisión se usa B<--local> y B<--divert> "
 "I<E<lt>originalE<gt>.distrib>. Al eliminar, B<--package> o B<--local> y B<--"
@@ -8284,15 +8905,15 @@
 msgstr "dpkg-divert --package wibble --rename --remove /usr/bin/ejemplo"
 
 #. type: TP
-#: dpkg-divert.8:113 dpkg-query.1:197 dpkg-statoverride.8:70 dpkg-trigger.1:61
-#: update-alternatives.8:356
+#: dpkg-divert.8:113 dpkg-query.1:205 dpkg-statoverride.8:69 dpkg-trigger.1:61
+#: update-alternatives.8:355
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_LIBDIR>"
 msgid "B<DPKG_ADMINDIR>"
 msgstr "B<DPKG_LIBDIR>"
 
 #. type: Plain text
-#: dpkg-divert.8:117 dpkg-query.1:201 dpkg-statoverride.8:74 dpkg-trigger.1:65
+#: dpkg-divert.8:117 dpkg-query.1:209 dpkg-statoverride.8:73 dpkg-trigger.1:65
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the dpkg data directory."
@@ -8301,7 +8922,7 @@
 #. type: Plain text
 #: dpkg-divert.8:121
 msgid ""
-"If set and the I<--local> and I<--package> options have not been specified, "
+"If set and the B<--local> and B<--package> options have not been specified, "
 "B<dpkg-divert> will use it as the package name."
 msgstr ""
 
@@ -8332,7 +8953,7 @@
 "la extensión I<-old> antes de reemplazarlo con uno nuevo."
 
 #. type: Plain text
-#: dpkg-divert.8:137 update-alternatives.8:495
+#: dpkg-divert.8:137 update-alternatives.8:496
 msgid "Copyright \\(co 1995 Ian Jackson"
 msgstr "Copyright \\(co 1995 Ian Jackson"
 
@@ -8349,7 +8970,9 @@
 
 #. type: Plain text
 #: dpkg-genchanges.1:8
-msgid "B<dpkg-genchanges> [I<options>]"
+#, fuzzy
+#| msgid "B<dpkg-genchanges> [I<options>]"
+msgid "B<dpkg-genchanges> [I<option>...]"
 msgstr "B<dpkg-genchanges> [I<opciones>]"
 
 #. type: Plain text
@@ -8470,13 +9093,13 @@
 "cambios del árbol de fuentes."
 
 #. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:121
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:127
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr "B<-V>I<nombre>B<=>I<valor>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-source.1:131
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
@@ -8485,8 +9108,8 @@
 "(5) para más información acerca de la sustitución de la salida."
 
 #. type: TP
-#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:169
+#: dpkg-source.1:131
 #, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<-T>I<fichero-variables-sust>"
@@ -8508,29 +9131,29 @@
 "sustitución de varios ficheros."
 
 #. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:131
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:137
 #, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<campo>B<=>I<valor>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 msgid "Override or add an output control file field."
 msgstr "Sobreescribe o añade un campo en el fichero de control de salida."
 
 #. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 #, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<-U>I<campo>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:137
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:143
 msgid "Remove an output control file field."
 msgstr "Elimina un campo del fichero de control de salida."
 
 #. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:98
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:104
 #, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "B<-c>I<fichero-control>"
@@ -8546,7 +9169,7 @@
 
 #. type: TP
 #: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr "B<-l>I<fichero-cambios>"
@@ -8571,14 +9194,14 @@
 
 #. type: TP
 #: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr "B<-F>I<formato-registro-cambios>"
 
 #. type: Plain text
 #: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 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 "
@@ -8606,7 +9229,7 @@
 "tamaños y sumas de verificación en el fichero B<.changes>)."
 
 #. type: TP
-#: dpkg-genchanges.1:123 dpkg-gensymbols.1:416
+#: dpkg-genchanges.1:123 dpkg-gensymbols.1:421
 #, no-wrap
 msgid "B<-q>"
 msgstr "B<-q>"
@@ -8645,7 +9268,9 @@
 
 #. type: Plain text
 #: dpkg-gencontrol.1:8
-msgid "B<dpkg-gencontrol> [I<options>]"
+#, fuzzy
+#| msgid "B<dpkg-gencontrol> [I<options>]"
+msgid "B<dpkg-gencontrol> [I<option>...]"
 msgstr "B<dpkg-gencontrol> [I<opciones>]"
 
 #. type: Plain text
@@ -8732,7 +9357,7 @@
 "leer variables de sustitución de varios ficheros."
 
 #. type: TP
-#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:368
+#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:373
 #, no-wrap
 msgid "B<-p>I<package>"
 msgstr "B<-p>I<paquete>"
@@ -8808,7 +9433,7 @@
 "ruta predefinida del fichero de salida."
 
 #. type: TP
-#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:386 dpkg-shlibdeps.1:152
+#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:391 dpkg-shlibdeps.1:150
 #, no-wrap
 msgid "B<-O>"
 msgstr "B<-O>"
@@ -8851,7 +9476,7 @@
 "binarios cuyos ficheros de control genera."
 
 #. type: Plain text
-#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:339
+#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:337
 msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 
@@ -8861,12 +9486,6 @@
 msgid "dpkg-gensymbols"
 msgstr "dpkg-gensymbols"
 
-#. type: TH
-#: dpkg-gensymbols.1:2
-#, no-wrap
-msgid "2009-08-07"
-msgstr "7 de Agosto de 2009"
-
 #. type: Plain text
 #: dpkg-gensymbols.1:5
 msgid ""
@@ -8878,7 +9497,9 @@
 
 #. type: Plain text
 #: dpkg-gensymbols.1:9
-msgid "B<dpkg-gensymbols> [I<options>]"
+#, fuzzy
+#| msgid "B<dpkg-gensymbols> [I<options>]"
+msgid "B<dpkg-gensymbols> [I<option>...]"
 msgstr "B<dpkg-gensymbols> [I<opciones>]"
 
 #. type: Plain text
@@ -8907,14 +9528,6 @@
 "proporcionados por el desarrollador. Busca los siguientes ficheros, usando "
 "el primero que encuentra."
 
-#. type: IP
-#: dpkg-gensymbols.1:20 dpkg-gensymbols.1:22 dpkg-gensymbols.1:24
-#: dpkg-gensymbols.1:26 dpkg-gensymbols.1:306 dpkg-gensymbols.1:312
-#: dpkg-gensymbols.1:346 dpkg-gensymbols.1:350 dpkg-gensymbols.1:353
-#, no-wrap
-msgid "\\(bu"
-msgstr "\\(bu"
-
 #. type: Plain text
 #: dpkg-gensymbols.1:22
 msgid "debian/I<package>.symbols.I<arch>"
@@ -9016,14 +9629,23 @@
 "desaparezcan así que, idealmente, el parche sólo debería añadir líneas "
 "nuevas."
 
+#. type: Plain text
+#: dpkg-gensymbols.1:64
+msgid ""
+"Note that you can put comments in symbols files: any line with '#' as the "
+"first character is a comment except if it starts with '#include' (see "
+"section B<Using includes>). Lines starting with '#MISSING:' are special "
+"comments documenting symbols that have disappeared."
+msgstr ""
+
 #. type: SS
-#: dpkg-gensymbols.1:59
+#: dpkg-gensymbols.1:64
 #, no-wrap
 msgid "Using #PACKAGE# substitution"
 msgstr "Usar la sustitución de #PACKAGE#"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 msgid ""
 "In some rare cases, the name of the library varies between architectures.  "
 "To avoid hardcoding the name of the package in the symbols file, you can use "
@@ -9039,13 +9661,13 @@
 "aparecerá en un fichero «symbols» contenido en un paquete binario."
 
 #. type: SS
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 #, no-wrap
 msgid "Using symbol tags"
 msgstr "Usar etiquetas de símbolos"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:74
+#: dpkg-gensymbols.1:79
 msgid ""
 "Symbol tagging is useful for marking symbols that are special in some way.  "
 "Any symbol can have an arbitrary number of tags associated with it. While "
@@ -9061,7 +9683,7 @@
 "estándar de símbolos> para una referencia de estas etiquetas."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:86
+#: dpkg-gensymbols.1:91
 msgid ""
 "Tag specification comes right before the symbol name (no whitespace is "
 "allowed in between). It always starts with an opening bracket B<(>, ends "
@@ -9090,7 +9712,7 @@
 "espacio."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:90
+#: dpkg-gensymbols.1:95
 #, no-wrap
 msgid ""
 " (tag1=i am marked|tag name with space)\"tagged quoted symbol\"@Base 1.0\n"
@@ -9103,7 +9725,7 @@
 " símbolo_sin_etiquetar@Base 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:96
+#: dpkg-gensymbols.1:101
 msgid ""
 "The first symbol in the example is named I<tagged quoted symbol> and has two "
 "tags: I<tag1> with value I<i am marked> and I<tag name with space> that has "
@@ -9119,7 +9741,7 @@
 "sin etiquetar."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 msgid ""
 "Since symbol tags are an extension of the I<deb-symbols(5)> format, they can "
 "only be part of the symbols files used in source packages (those files "
@@ -9145,19 +9767,19 @@
 "a medida que se cargan."
 
 #. type: SS
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 #, no-wrap
 msgid "Standard symbol tags"
 msgstr "Etiquetas de símbolo estándar"
 
 #. type: TP
-#: dpkg-gensymbols.1:109
+#: dpkg-gensymbols.1:114
 #, no-wrap
 msgid "B<optional>"
 msgstr "B<optional>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:119
+#: dpkg-gensymbols.1:124
 msgid ""
 "A symbol marked as optional can disappear from the library at any time and "
 "that will never cause B<dpkg-gensymbols> to fail. However, disappeared "
@@ -9179,7 +9801,7 @@
 "actualizara a un estado «existente» sin modificar la versión mínima."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 msgid ""
 "This tag is useful for symbols which are private where their disappearance "
 "do not cause ABI breakage. For example, most of C++ template instantiations "
@@ -9196,13 +9818,13 @@
 "opcional."
 
 #. type: TP
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 #, no-wrap
 msgid "B<arch=>I<architecture list>"
 msgstr "B<arch=>I<lista-de-arquitecturas>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:137
+#: dpkg-gensymbols.1:142
 msgid ""
 "This tag allows one to restrict the set of architectures where the symbol is "
 "supposed to exist. When the symbols list is updated with the symbols "
@@ -9231,7 +9853,7 @@
 "pero no se toma como un nuevo símbolo."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:143
+#: dpkg-gensymbols.1:148
 msgid ""
 "When operating in the default non-template mode, among arch-specific symbols "
 "only those that match the current host architecture are written to the "
@@ -9246,7 +9868,7 @@
 "arquitecturas alternativas) siempre se escribirán al fichero «symbols»."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:149
+#: dpkg-gensymbols.1:154
 msgid ""
 "The format of I<architecture list> is the same as the one used in the "
 "I<Build-Depends> field of I<debian/control> (except the enclosing square "
@@ -9261,7 +9883,7 @@
 "amd64 y ia64, mientras que el segundo en todos menos armel."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid ""
 " (arch=alpha amd64 kfreebsd-amd64 ia64)a_64bit_specific_symbol@Base 1.0\n"
@@ -9271,13 +9893,13 @@
 " (arch=!armel)símbolo_que_armel_no_tiene@Base 1.0\n"
 
 #. type: TP
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid "B<ignore-blacklist>"
 msgstr "B<ignore-blacklist>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:160
+#: dpkg-gensymbols.1:165
 msgid ""
 "dpkg-gensymbols has an internal blacklist of symbols that should not appear "
 "in symbols files as they are usually only side-effects of implementation "
@@ -9294,13 +9916,13 @@
 "necesario con alguna cadena de herramientas de bajo nivel como libgcc."
 
 #. type: TP
-#: dpkg-gensymbols.1:160 dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:165 dpkg-gensymbols.1:202
 #, no-wrap
 msgid "B<c++>"
 msgstr "B<c++>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:164
+#: dpkg-gensymbols.1:169
 msgid ""
 "Denotes I<c++> symbol pattern. See B<Using symbol patterns> subsection below."
 msgstr ""
@@ -9308,13 +9930,13 @@
 "patrones de símbolos>."
 
 #. type: TP
-#: dpkg-gensymbols.1:164 dpkg-gensymbols.1:228
+#: dpkg-gensymbols.1:169 dpkg-gensymbols.1:233
 #, no-wrap
 msgid "B<symver>"
 msgstr "B<symver>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:168
+#: dpkg-gensymbols.1:173
 msgid ""
 "Denotes I<symver> (symbol version) symbol pattern. See B<Using symbol "
 "patterns> subsection below."
@@ -9323,13 +9945,13 @@
 "sub-sección a continuación B<Usar patrones de símbolos>."
 
 #. type: TP
-#: dpkg-gensymbols.1:168 dpkg-gensymbols.1:253
+#: dpkg-gensymbols.1:173 dpkg-gensymbols.1:258
 #, no-wrap
 msgid "B<regex>"
 msgstr "B<regex>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 msgid ""
 "Denotes I<regex> symbol pattern. See B<Using symbol patterns> subsection "
 "below."
@@ -9338,13 +9960,13 @@
 "sección a continuación B<Usar patrones de símbolos>."
 
 #. type: SS
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 #, no-wrap
 msgid "Using symbol patterns"
 msgstr "Usar patrones de símbolos."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:180
+#: dpkg-gensymbols.1:185
 msgid ""
 "Unlike a standard symbol specification, a pattern may cover multiple real "
 "symbols from the library. B<dpkg-gensymbols> will attempt to match each "
@@ -9363,7 +9985,7 @@
 "los patrones encaja, el símbolo se considerará nuevo."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:188
+#: dpkg-gensymbols.1:193
 msgid ""
 "A pattern is considered lost if it does not match any symbol in the library. "
 "By default this will trigger a B<dpkg-gensymbols> failure under I<-c1> or "
@@ -9384,7 +10006,7 @@
 "anterior B<Etiquetas de símbolo estándar>."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:195
+#: dpkg-gensymbols.1:200
 msgid ""
 "Patterns are an extension of the I<deb-symbols(5)> format hence they are "
 "only valid in symbol file templates. Pattern specification syntax is not any "
@@ -9401,14 +10023,14 @@
 "una etiqueta especial."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:202
 msgid "At the moment, B<dpkg-gensymbols> supports three basic pattern types:"
 msgstr ""
 "A día de hoy, B<dpkg-gensymbols> es compatible con tres tipos de patrones "
 "básicos:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:209
+#: dpkg-gensymbols.1:214
 msgid ""
 "This pattern is denoted by the I<c++> tag. It matches only C++ symbols by "
 "their demangled symbol name (as emitted by B<c++filt>(1) utility). This "
@@ -9435,7 +10057,7 @@
 "con un único patrón I<c++>:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:215
+#: dpkg-gensymbols.1:220
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -9449,7 +10071,7 @@
 " [...]\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:217
+#: dpkg-gensymbols.1:222
 msgid ""
 "The demangled name above can be obtained by executing the following command:"
 msgstr ""
@@ -9457,13 +10079,13 @@
 "siguiente orden:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:219
+#: dpkg-gensymbols.1:224
 #, no-wrap
 msgid " $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt\n"
 msgstr " $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:227
+#: dpkg-gensymbols.1:232
 msgid ""
 "Please note that while mangled name is unique in the library by definition, "
 "this is not necessarily true for demangled names. A couple of distinct real "
@@ -9483,7 +10105,7 @@
 "deberían degradar la calidad del fichero de símbolos."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:234
+#: dpkg-gensymbols.1:239
 msgid ""
 "This pattern is denoted by the I<symver> tag. Well maintained libraries have "
 "versioned symbols where each version corresponds to the upstream version "
@@ -9497,7 +10119,7 @@
 "particular. Por ejemplo:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:241
+#: dpkg-gensymbols.1:246
 #, no-wrap
 msgid ""
 "libc.so.6 libc6 #MINVER#\n"
@@ -9513,7 +10135,7 @@
 " access@GLIBC_2.0 2.2\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:247
+#: dpkg-gensymbols.1:252
 msgid ""
 "All symbols associated with versions GLIBC_2.0 and GLIBC_2.7 will lead to "
 "minimal version of 2.0 and 2.7 respectively with the exception of the symbol "
@@ -9529,7 +10151,7 @@
 "sobre los patrones."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:252
+#: dpkg-gensymbols.1:257
 msgid ""
 "Please note that while old style wildcard patterns (denoted by \"*@version\" "
 "in the symbol name field) are still supported, they have been deprecated by "
@@ -9544,7 +10166,7 @@
 "optional)GLIBC_2.0 2.0» si desea el mismo comportamiento."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:260
+#: dpkg-gensymbols.1:265
 msgid ""
 "Regular expression patterns are denoted by the I<regex> tag. They match by "
 "the perl regular expression specified in the symbol name field. A regular "
@@ -9559,7 +10181,7 @@
 "cualquier parte de la cadena real del símbolo I<nombre@versión>. Por ejemplo:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:265
+#: dpkg-gensymbols.1:270
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -9571,7 +10193,7 @@
 " (regex|optional)\"private\" 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:270
+#: dpkg-gensymbols.1:275
 msgid ""
 "Symbols like \"mystack_new@Base\", \"mystack_push@Base\", \"mystack_pop@Base"
 "\" etc.  will be matched by the first pattern while e.g. "
@@ -9586,7 +10208,7 @@
 "de este patrón la etiqueta I<optional>."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:275
+#: dpkg-gensymbols.1:280
 msgid ""
 "Basic patterns listed above can be combined where it makes sense. In that "
 "case, they are processed in the order in which the tags are specified. For "
@@ -9597,7 +10219,7 @@
 "ambos"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:278
+#: dpkg-gensymbols.1:283
 #, no-wrap
 msgid ""
 " (c++|regex)\"^NSA::ClassA::Private::privmethod\\ed\\e(int\\e)@Base\" 1.0\n"
@@ -9607,7 +10229,7 @@
 " (regex|c++)N3NSA6ClassA7Private11privmethod\\edEi@Base 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:288
+#: dpkg-gensymbols.1:293
 msgid ""
 "will match symbols \"_ZN3NSA6ClassA7Private11privmethod1Ei@Base\" and "
 "\"_ZN3NSA6ClassA7Private11privmethod2Ei@Base\". When matching the first "
@@ -9631,7 +10253,7 @@
 "encajaría con ningún patrón porque no es un símbolo válido de C++."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:294
+#: dpkg-gensymbols.1:299
 msgid ""
 "In general, all patterns are divided into two groups: aliases (basic I<c++> "
 "and I<symver>) and generic patterns (I<regex>, all combinations of multiple "
@@ -9647,7 +10269,7 @@
 "Debido a ello, se recomienda no abusar de los patrones genéricos."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 msgid ""
 "When multiple patterns match the same real symbol, aliases (first I<c++>, "
 "then I<symver>) are preferred over generic patterns. Generic patterns are "
@@ -9664,13 +10286,13 @@
 "basados en el orden alfanumérico de sus nombres."
 
 #. type: SS
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 #, no-wrap
 msgid "Using includes"
 msgstr "Usar «include»"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:306
+#: dpkg-gensymbols.1:311
 msgid ""
 "When the set of exported symbols differ between architectures, it may become "
 "inefficient to use a single symbol file. In those cases, an include "
@@ -9681,7 +10303,7 @@
 "estos casos, una directiva «include» puede ser útil de un par de maneras:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:310
+#: dpkg-gensymbols.1:315
 msgid ""
 "You can factorize the common part in some external file and include that "
 "file in your I<package>.symbols.I<arch> file by using an include directive "
@@ -9692,25 +10314,33 @@
 "«include» como esta:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:312
+#: dpkg-gensymbols.1:317
 msgid "#include \"I<packages>.symbols.common\""
 msgstr "#include \"I<packages>.symbols.common\""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:314
+#: dpkg-gensymbols.1:319
 msgid "The include directive may also be tagged like any symbol:"
 msgstr ""
 "Al igual que con cualquier símbolo, puede etiquetar la directiva «include»:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:316
-msgid "(tag|..|tagN)#include \"file_to_include\""
+#: dpkg-gensymbols.1:321
+#, fuzzy
+#| msgid "(tag|..|tagN)#include \"file_to_include\""
+msgid "(tag|..|tagN)#include \"file-to-include\""
 msgstr "(etiqueta|..|etiquetaN)#include \"fichero-para-include\""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:321
-msgid ""
-"As a result, all symbols included from I<file_to_include> will be considered "
+#: dpkg-gensymbols.1:326
+#, fuzzy
+#| msgid ""
+#| "As a result, all symbols included from I<file_to_include> will be "
+#| "considered to be tagged with I<tag> .. I<tagN> by default. You can use "
+#| "this feature to create a common I<package>.symbols file which includes "
+#| "architecture specific symbol files:"
+msgid ""
+"As a result, all symbols included from I<file-to-include> will be considered "
 "to be tagged with I<tag> .. I<tagN> by default. You can use this feature to "
 "create a common I<package>.symbols file which includes architecture specific "
 "symbol files:"
@@ -9721,7 +10351,7 @@
 "symbols, que incluye ficheros de símbolos específicos a la arquitectura."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:326
+#: dpkg-gensymbols.1:331
 #, no-wrap
 msgid ""
 "  common_symbol1@Base 1.0\n"
@@ -9735,7 +10365,7 @@
 "  common_symbol2@Base 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:335
+#: dpkg-gensymbols.1:340
 msgid ""
 "The symbols files are read line by line, and include directives are "
 "processed as soon as they are encountered. This means that the content of "
@@ -9757,7 +10387,7 @@
 "ninguna de las etiquetas heredadas."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:340
+#: dpkg-gensymbols.1:345
 msgid ""
 "An included file can repeat the header line containing the SONAME of the "
 "library. In that case, it overrides any header line previously read.  "
@@ -9771,7 +10401,7 @@
 "realizar esto:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid ""
 "#include \"libsomething1.symbols.common\"\n"
@@ -9781,19 +10411,19 @@
 " arch_specific_symbol@Base 1.0\n"
 
 #. type: SS
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid "Good library management"
 msgstr "Buena gestión de bibliotecas"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:346
+#: dpkg-gensymbols.1:351
 msgid "A well-maintained library has the following features:"
 msgstr ""
 "Una biblioteca mantenida adecuadamente tiene las siguientes características:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:350
+#: dpkg-gensymbols.1:355
 msgid ""
 "its API is stable (public symbols are never dropped, only new public symbols "
 "are added) and changes in incompatible ways only when the SONAME changes;"
@@ -9803,7 +10433,7 @@
 "incompatibilidad sólo cuando el «SONAME» cambia;"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:353
+#: dpkg-gensymbols.1:358
 msgid ""
 "ideally, it uses symbol versioning to achieve ABI stability despite internal "
 "changes and API extension;"
@@ -9812,7 +10442,7 @@
 "ABI, a pesar de cambios internos y la extensión de la API;"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:356
+#: dpkg-gensymbols.1:361
 msgid ""
 "it doesn't export private symbols (such symbols can be tagged optional as "
 "workaround)."
@@ -9821,7 +10451,7 @@
 "opcionales para evitar un problema)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:364
+#: dpkg-gensymbols.1:369
 msgid ""
 "While maintaining the symbols file, it's easy to notice appearance and "
 "disappearance of symbols. But it's more difficult to catch incompatible API "
@@ -9841,18 +10471,18 @@
 "arreglo específico de Debian."
 
 #. type: TP
-#: dpkg-gensymbols.1:365
+#: dpkg-gensymbols.1:370
 #, no-wrap
 msgid "B<-P>I<package-build-dir>"
 msgstr "B<-P>I<directorio-compilación-paquete>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:368
+#: dpkg-gensymbols.1:373
 msgid "Scan I<package-build-dir> instead of debian/tmp."
 msgstr "Analiza I<directorio-compilación-paquete> en lugar de «debian/tmp»."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 msgid ""
 "Define the package name. Required if more than one binary package is listed "
 "in debian/control (or if there's no debian/control file)."
@@ -9861,7 +10491,7 @@
 "binario en «debian/control» (o si no existe ningún fichero «debian/control»)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 msgid ""
 "Define the package version. Defaults to the version extracted from debian/"
 "changelog. Required if called outside of a source package tree."
@@ -9871,13 +10501,13 @@
 "del paquete fuente."
 
 #. type: TP
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 #, no-wrap
 msgid "B<-e>I<library-file>"
 msgstr "B<-e>I<fichero-biblioteca>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 msgid ""
 "Only analyze libraries explicitly listed instead of finding all public "
 "libraries. You can use a regular expression in I<library-file> to match "
@@ -9890,13 +10520,13 @@
 "argumento (de otra forma, necesita varias B<-e>)."
 
 #. type: TP
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 #, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<-I>I<nombre-fichero>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:386
+#: dpkg-gensymbols.1:391
 msgid ""
 "Use I<filename> as reference file to generate the symbols file that is "
 "integrated in the package itself."
@@ -9905,7 +10535,7 @@
 "«symbols» integrado en el mismo paquete."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 msgid ""
 "Print the generated symbols file to standard output, rather than being "
 "stored in the package build tree."
@@ -9914,13 +10544,13 @@
 "almacenarlo en el árbol de construcción del paquete."
 
 #. type: TP
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 #, no-wrap
 msgid "B<-O>I<filename>"
 msgstr "B<-O>I<fichero>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 msgid ""
 "Store the generated symbols file as I<filename>. If I<filename> is pre-"
 "existing, its content is used as basis for the generated symbols file.  You "
@@ -9933,13 +10563,13 @@
 "coincida con una versión más reciente de la biblioteca del autor original."
 
 #. type: TP
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 #, no-wrap
 msgid "B<-t>"
 msgstr "B<-t>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 msgid ""
 "Write the symbol file in template mode rather than the format compatible "
 "with I<deb-symbols(5)>. The main difference is that in the template mode "
@@ -9959,13 +10589,13 @@
 "todos los símbolos en el modo plantilla."
 
 #. type: TP
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 #, no-wrap
 msgid "B<-c>I<[0-4]>"
 msgstr "B<-c>I<[0-4]>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:413
+#: dpkg-gensymbols.1:418
 msgid ""
 "Define the checks to do when comparing the generated symbols file with the "
 "template file used as starting point. By default the level is 1. Increasing "
@@ -9983,7 +10613,7 @@
 "El nivel 4 falla si se han introducido bibliotecas nuevas."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:416
+#: dpkg-gensymbols.1:421
 msgid ""
 "This value can be overridden by the environment variable "
 "DPKG_GENSYMBOLS_CHECK_LEVEL."
@@ -9992,7 +10622,7 @@
 "«DPKG_GENSYMBOLS_CHECK_LEVEL»."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 msgid ""
 "Keep quiet and never generate a diff between generated symbols file and the "
 "template file used as starting point or show any warnings about new/lost "
@@ -10006,13 +10636,13 @@
 "(consulte la opción I<-c>)."
 
 #. type: TP
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 #, no-wrap
 msgid "B<-a>I<arch>"
 msgstr "B<-a>I<arquitectura>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:427
+#: dpkg-gensymbols.1:432
 msgid ""
 "Assume I<arch> as host architecture when processing symbol files. Use this "
 "option to generate a symbol file or diff for any architecture provided its "
@@ -10024,7 +10654,7 @@
 "disponibles."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 msgid ""
 "Enable debug mode. Numerous messages are displayed to explain what B<dpkg-"
 "gensymbols> does."
@@ -10033,13 +10663,13 @@
 "las acciones de B<dpkg-gensymbols>."
 
 #. type: TP
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 #, no-wrap
 msgid "B<-V>"
 msgstr "B<-V>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:438
+#: dpkg-gensymbols.1:443
 msgid ""
 "Enable verbose mode. The generated symbols file contains deprecated symbols "
 "as comments. Furthermore in template mode, pattern symbols are followed by "
@@ -10051,27 +10681,27 @@
 "coinciden con el patrón."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:447
+#: dpkg-gensymbols.1:452
 msgid "B<http://people.redhat.com/drepper/symbol-versioning>"
 msgstr "B<http://people.redhat.com/drepper/symbol-versioning>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:449
+#: dpkg-gensymbols.1:454
 msgid "B<http://people.redhat.com/drepper/goodpractice.pdf>"
 msgstr "B<http://people.redhat.com/drepper/goodpractice.pdf>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:451
+#: dpkg-gensymbols.1:456
 msgid "B<http://people.redhat.com/drepper/dsohowto.pdf>"
 msgstr "B<http://people.redhat.com/drepper/dsohowto.pdf>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:454
+#: dpkg-gensymbols.1:459
 msgid "B<deb-symbols>(5), B<dpkg-shlibdeps>(1)."
 msgstr "B<deb-symbols>(5), B<dpkg-shlibdeps>(1)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:457
+#: dpkg-gensymbols.1:462
 msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
 
@@ -10081,12 +10711,6 @@
 msgid "dpkg-maintscript-helper"
 msgstr "dpkg-maintscript-helper"
 
-#. type: TH
-#: dpkg-maintscript-helper.1:1
-#, no-wrap
-msgid "2010-04-16"
-msgstr "16 de Abril de 2010"
-
 #. type: Plain text
 #: dpkg-maintscript-helper.1:4
 msgid ""
@@ -10098,9 +10722,13 @@
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:8
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-maintscript-helper> I<command> [I<parameters>...] -- I<maint-"
+#| "script-parameters>"
 msgid ""
-"B<dpkg-maintscript-helper> I<command> [I<parameters>...] -- I<maint-script-"
-"parameters>"
+"B<dpkg-maintscript-helper> I<command> [I<parameter>...] B<--> I<maint-script-"
+"parameter>..."
 msgstr ""
 "B<dpkg-maintscript-helper> I<orden> [I<parámetros>...] -- I<parámetros-"
 "script-mantenedor>"
@@ -10137,13 +10765,21 @@
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:27
+#, fuzzy
+#| msgid ""
+#| "Many of those tasks require coordinated actions from several maintainer "
+#| "scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
+#| "the same call simply needs to be put in all scripts and the program will "
+#| "automatically adapt its behaviour based on the environment variable "
+#| "DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you "
+#| "have to forward after a double dash."
 msgid ""
 "Many of those tasks require coordinated actions from several maintainer "
 "scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
 "the same call simply needs to be put in all scripts and the program will "
 "automatically adapt its behaviour based on the environment variable "
-"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
-"to forward after a double dash."
+"B<DPKG_MAINTSCRIPT_NAME> and on the maintainer scripts arguments that you "
+"have to forward after a double dash."
 msgstr ""
 "Muchas de estas tareas requieren la ejecución coordinada de varios scripts "
 "de mantenedor (B<preinst>, B<postinst>, B<prerm>, B<postrm>). Para evitar "
@@ -10393,8 +11029,9 @@
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:118
-#, no-wrap
-msgid "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
+#, fuzzy, no-wrap
+#| msgid "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
+msgid "    B<Pre-Depends:> dpkg (E<gt>= 1.15.7.2)\n"
 msgstr "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
 
 #. type: Plain text
@@ -10412,10 +11049,14 @@
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:127
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
+#| "        dpkg-maintscript-helper E<lt>commandE<gt> ...\n"
+#| "    fi\n"
 msgid ""
-"    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
-"        dpkg-maintscript-helper E<lt>commandE<gt> ...\n"
+"    if dpkg-maintscript-helper supports I<command>; then\n"
+"        dpkg-maintscript-helper I<command> ...\n"
 "    fi\n"
 msgstr ""
 "    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
@@ -10423,6 +11064,11 @@
 "    fi\n"
 
 #. type: Plain text
+#: dpkg-maintscript-helper.1:130
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+
+#. type: Plain text
 #: dpkg-maintscript-helper.1:132
 msgid "Copyright \\(co 2008 Joey Hess"
 msgstr "Copyright \\(co 2008 Joey Hess"
@@ -10443,12 +11089,6 @@
 msgid "dpkg-mergechangelogs"
 msgstr "dpkg-mergechangelogs"
 
-#. type: TH
-#: dpkg-mergechangelogs.1:1
-#, no-wrap
-msgid "2010-04-18"
-msgstr "18 de Abril de 2010"
-
 #. type: Plain text
 #: dpkg-mergechangelogs.1:4
 msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
@@ -10611,21 +11251,32 @@
 
 #. type: Plain text
 #: dpkg-name.1:15
-msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+#, fuzzy
+#| msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+msgid "B<dpkg-name> [I<option>...] [B<-->] I<file>..."
 msgstr "B<dpkg-name> [I<opciones>] [B<-->] I<ficheros>"
 
 #. type: Plain text
-#: dpkg-name.1:28
+#: dpkg-name.1:29
+#, 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>."
+#| "E<lt>package_typeE<gt>> 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. The I<E<lt>package_typeE<gt>> part comes from that field if "
+#| "present or fallbacks to B<deb>."
 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>."
-"E<lt>package_typeE<gt>> 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. "
-"The I<E<lt>package_typeE<gt>> part comes from that field if present or "
-"fallbacks to B<deb>."
+"package name consists of I<package>B<_>I<version>B<_>I<architecture>B<."
+">I<package-type> as specified in the control file of the package. The "
+"I<version> part of the filename consists of the upstream version information "
+"optionally followed by a hyphen and the revision information. The I<package-"
+"type> part comes from that field if present or fallbacks to B<deb>."
 msgstr ""
 "Esta pagina de manual documenta el uso de B<dpkg-name>, que ofrece una forma "
 "sencilla de renombrar paquetes de B<Debian> a sus nombres completos de "
@@ -10638,37 +11289,37 @@
 "de ese campo, de existir. De no ser así, se usará B<deb> por omisión."
 
 #. type: TP
-#: dpkg-name.1:30
+#: dpkg-name.1:31
 #, no-wrap
 msgid "B<-a>, B<--no-architecture>"
 msgstr "B<-a>, B<--no-architecture>"
 
 #. type: Plain text
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 msgid "The destination filename will not have the architecture information."
 msgstr ""
 "El nombre del fichero de destino no incluirá información sobre la "
 "arquitectura."
 
 #. type: TP
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 #, no-wrap
 msgid "B<-k>, B<--symlink>"
 msgstr "B<-k>, B<--symlink>"
 
 #. type: Plain text
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 msgid "Create a symlink, instead of moving."
 msgstr "Crea un enlace simbólico en vez de mover el fichero."
 
 #. type: TP
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 #, no-wrap
 msgid "B<-o>, B<--overwrite>"
 msgstr "B<-o>, B<--overwrite>"
 
 #. type: Plain text
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 msgid ""
 "Existing files will be overwritten if they have the same name as the "
 "destination filename."
@@ -10677,24 +11328,35 @@
 "fichero de destino."
 
 #. type: TP
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 #, no-wrap
 msgid "B<-s>, B<--subdir> [I<dir>]"
 msgstr "B<-s>, B<--subdir> [I<directorio>]"
 
 #. type: Plain text
-#: dpkg-name.1:52
+#: dpkg-name.1:53
+#, 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."
 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 package. The target directory will be `unstable/binary-I<architecture>/"
+"I<section>'. 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 `I<section>/binary-I<architecture>'. 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 ""
 "Los ficheros se moverán al subdirectorio definido. Si existe el directorio "
 "dado como argumento, los ficheros se moverán al directorio definido. De otra "
@@ -10709,13 +11371,13 @@
 "esta opción con cuidado, es algo delicada."
 
 #. type: TP
-#: dpkg-name.1:52
+#: dpkg-name.1:53
 #, no-wrap
 msgid "B<-c>, B<--create-dir>"
 msgstr "B<-c>, B<--create-dir>"
 
 #. type: Plain text
-#: dpkg-name.1:57
+#: dpkg-name.1:58
 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.>"
@@ -10725,19 +11387,19 @@
 "con cuidado.>"
 
 #. type: TP
-#: dpkg-name.1:60
+#: dpkg-name.1:61
 #, no-wrap
 msgid "B<-v>, B<--version>"
 msgstr "B<-v>, B<--version>"
 
 #. type: TP
-#: dpkg-name.1:65
+#: dpkg-name.1:66
 #, no-wrap
 msgid "B<dpkg-name bar-foo.deb>"
 msgstr "B<dpkg-name bar-foo.deb>"
 
 #. type: Plain text
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 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 "
@@ -10748,13 +11410,13 @@
 "deb»)."
 
 #. type: TP
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 #, 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:75
+#: dpkg-name.1:76
 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 "
@@ -10765,13 +11427,13 @@
 "nombres sin información de arquitectura."
 
 #. type: TP
-#: dpkg-name.1:75
+#: dpkg-name.1:76
 #, 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:81
+#: dpkg-name.1:82
 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.>"
@@ -10781,23 +11443,30 @@
 "esto.>"
 
 #. type: TP
-#: dpkg-name.1:81
+#: dpkg-name.1:82
 #, 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:84
+#: dpkg-name.1:85
 msgid "This can be used when building new packages."
 msgstr "Puede utilizar esto al construir paquetes nuevos."
 
 #. type: Plain text
-#: dpkg-name.1:94
+#: dpkg-name.1:95
+#, 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."
 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 "
+"I<package>B<_>I<version>B<_>I<architecture>B<.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 "
@@ -10807,7 +11476,7 @@
 "aunque otras herramientas de instalación podrían depender de esta estructura."
 
 #. type: Plain text
-#: dpkg-name.1:102
+#: dpkg-name.1:103
 msgid ""
 "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
 "B<xargs>(1)."
@@ -10816,7 +11485,7 @@
 "B<xargs>(1)."
 
 #. type: Plain text
-#: dpkg-name.1:105
+#: dpkg-name.1:106
 msgid "Copyright \\(co 1995,1996 Erick Branderhorst"
 msgstr "Copyright \\(co 1995,1996 Erick Branderhorst"
 
@@ -10826,12 +11495,6 @@
 msgid "dpkg-parsechangelog"
 msgstr "dpkg-parsechangelog"
 
-#. type: TH
-#: dpkg-parsechangelog.1:1
-#, no-wrap
-msgid "2009-05-19"
-msgstr "19 de Junio de 2009"
-
 #. type: Plain text
 #: dpkg-parsechangelog.1:4
 msgid "dpkg-parsechangelog - parse Debian changelog files"
@@ -10840,7 +11503,9 @@
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:8
-msgid "B<dpkg-parsechangelog> [I<options>]"
+#, fuzzy
+#| msgid "B<dpkg-parsechangelog> [I<options>]"
+msgid "B<dpkg-parsechangelog> [I<option>...]"
 msgstr "B<dpkg-parsechangelog> [I<opciones>]"
 
 #. type: Plain text
@@ -10913,26 +11578,30 @@
 
 #. type: TP
 #: dpkg-parsechangelog.1:54
-#, no-wrap
-msgid "B<Source:> E<lt>pkg nameE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Source:> E<lt>pkg nameE<gt>"
+msgid "B<Source:>I< pkg-name>"
 msgstr "B<Source:> E<lt>nombre-paqueteE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:56
-#, no-wrap
-msgid "B<Version:> E<lt>versionE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Version:> E<lt>versionE<gt>"
+msgid "B<Version:>I< version>"
 msgstr "B<Version:> E<lt>versiónE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:58
-#, no-wrap
-msgid "B<Distribution:> E<lt>target distributionE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Distribution:> E<lt>target distributionE<gt>"
+msgid "B<Distribution:>I< target-distribution>"
 msgstr "B<Distribution:> E<lt>distribución-destinoE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:60
-#, no-wrap
-msgid "B<Urgency:> E<lt>urgencyE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Urgency:> E<lt>urgencyE<gt>"
+msgid "B<Urgency:>I< urgency>"
 msgstr "B<Urgency:> E<lt>urgenciaE<gt>"
 
 #. type: Plain text
@@ -10943,20 +11612,23 @@
 
 #. type: TP
 #: dpkg-parsechangelog.1:63
-#, no-wrap
-msgid "B<Maintainer:> E<lt>authorE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Maintainer:> E<lt>authorE<gt>"
+msgid "B<Maintainer:>I< author>"
 msgstr "B<Maintainer:> E<lt>autorE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:65
-#, no-wrap
-msgid "B<Date:> E<lt>dateE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Date:> E<lt>dateE<gt>"
+msgid "B<Date:>I< date>"
 msgstr "B<Date:> E<lt>fechaE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:67
-#, no-wrap
-msgid "B<Closes:> E<lt>bug numberE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Closes:> E<lt>bug numberE<gt>"
+msgid "B<Closes:>I< bug-number>"
 msgstr "B<Closes:> E<lt>número-fallo-BTSE<gt>"
 
 #. type: Plain text
@@ -10966,8 +11638,9 @@
 
 #. type: TP
 #: dpkg-parsechangelog.1:70
-#, no-wrap
-msgid "B<Changes:> E<lt>changelog entriesE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Changes:> E<lt>changelog entriesE<gt>"
+msgid "B<Changes:>I< changelog-entries>"
 msgstr "B<Changes:> E<lt>entradas-registro-cambiosE<gt>"
 
 #. type: Plain text
@@ -11074,7 +11747,7 @@
 "principio (o el final si el I<número> es menor que 0)."
 
 #. type: TP
-#: dpkg-parsechangelog.1:104 update-alternatives.8:269
+#: dpkg-parsechangelog.1:104 update-alternatives.8:268
 #, no-wrap
 msgid "B<--all>"
 msgstr "B<--all>"
@@ -11307,38 +11980,50 @@
 msgstr "B<-s>, B<--status> I<nombre-paquete>..."
 
 #. type: Plain text
-#: dpkg-query.1:78
+#: dpkg-query.1:79
+#, fuzzy
+#| msgid ""
+#| "Report status of specified package. This just displays the entry in the "
+#| "installed package status database."
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"installed package status database. When multiple I<package-name> are listed, "
+"the requested status entries are separated by an empty line."
 msgstr ""
 "Informa del estado del paquete definido. Esto sólo muestra la entrada de los "
 "paquetes con el estado de instalado en la base de datos."
 
 #. type: TP
-#: dpkg-query.1:78
+#: dpkg-query.1:79
 #, no-wrap
 msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<-L>, B<--listfiles> I<nombre-paquete>..."
 
 #. type: Plain text
-#: dpkg-query.1:83
-msgid ""
-"List files installed to your system from I<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+#: dpkg-query.1:85
+#, fuzzy
+#| msgid ""
+#| "List files installed to your system from I<package-name>.  However, note "
+#| "that files created by package-specific installation-scripts are not "
+#| "listed."
+msgid ""
+"List files installed to your system from I<package-name>. When multiple "
+"I<package-name> are listed, the requested lists of files are separated by an "
+"empty line. However, note that files created by package-specific "
+"installation-scripts are not listed."
 msgstr ""
 "Lista los ficheros que I<nombre-paquete> creó en el sistema. Por otra parte, "
 "tenga en cuenta que los ficheros creados por los scripts de instalación "
 "específicos del paquete no aparecerán."
 
 #. type: TP
-#: dpkg-query.1:83
+#: dpkg-query.1:85
 #, no-wrap
 msgid "B<-c>, B<--control-path> I<package-name> [I<control-file>]"
 msgstr "B<-c>, B<--control-path> I<nombre-paquete> [I<fichero-control>]"
 
 #. type: Plain text
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 msgid ""
 "List paths for control files installed to your system from I<package-name>.  "
 "If I<control-file> is specified then only list the path for that control "
@@ -11356,17 +12041,23 @@
 "arquitectura."
 
 #. type: TP
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 #, no-wrap
 msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr "B<-S>, B<--search> I<patrón-búsqueda-fichero>..."
 
 #. type: Plain text
-#: dpkg-query.1:97
-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."
+#: dpkg-query.1:99
+#, 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."
+msgid ""
+"Search for packages that own files corresponding to the given pattern.  "
+"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 ""
 "Busca un fichero entre los paquetes instalados. Puede usar todos los "
 "comodines estándar de intérprete de órdenes en el patrón. Esta orden no "
@@ -11374,18 +12065,41 @@
 "paquete, ni tampoco alternativas."
 
 #. type: TP
-#: dpkg-query.1:97
+#: dpkg-query.1:99
 #, no-wrap
 msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr "B<-p>, B<--print-avail> I<nombre-paquete>..."
 
 #. type: Plain text
-#: dpkg-query.1:104
+#: dpkg-query.1:105
+#, fuzzy
+#| msgid ""
+#| "Display details about I<package-name>, as found in I</var/lib/dpkg/"
+#| "available>. Users of APT-based frontends should use B<apt-cache show> "
+#| "I<package-name> instead as the I<available> file is only kept up-to-date "
+#| "when using B<dselect>."
 msgid ""
 "Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>. Users of APT-based frontends should use B<apt-cache show> "
-"I<package-name> instead as the I<available> file is only kept up-to-date "
-"when using B<dselect>."
+"available>. When multiple I<package-name> are listed, the requested "
+"I<available> entries are separated by an empty line."
+msgstr ""
+"Muestra detalles de I<nombre-paquete>, tal y como aparece en I</var/lib/dpkg/"
+"available>. Los usuarios de interfaces de usuario basados en APT deberían "
+"usar B<apt-cache show> I<nombre-paquete>, ya que el fichero I<available> "
+"sólo se encuentra al día si usa dselect."
+
+#. type: Plain text
+#: dpkg-query.1:110
+#, fuzzy
+#| msgid ""
+#| "Display details about I<package-name>, as found in I</var/lib/dpkg/"
+#| "available>. Users of APT-based frontends should use B<apt-cache show> "
+#| "I<package-name> instead as the I<available> file is only kept up-to-date "
+#| "when using B<dselect>."
+msgid ""
+"Users of APT-based frontends should use B<apt-cache show> I<package-name> "
+"instead as the I<available> file is only kept up-to-date when using "
+"B<dselect>."
 msgstr ""
 "Muestra detalles de I<nombre-paquete>, tal y como aparece en I</var/lib/dpkg/"
 "available>. Los usuarios de interfaces de usuario basados en APT deberían "
@@ -11393,18 +12107,18 @@
 "sólo se encuentra al día si usa dselect."
 
 #. type: TP
-#: dpkg-query.1:116
+#: dpkg-query.1:122
 #, no-wrap
 msgid "B<-f>, B<--showformat=>I<format>"
 msgstr "B<-f>, B<--showformat=>I<formato>"
 
 #. type: Plain text
-#: dpkg-query.1:123
+#: dpkg-query.1:129
 msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
 msgstr "En la cadena de formato, \\(lqB<\\e>\\(rq introduce escapes:"
 
 #. type: Plain text
-#: dpkg-query.1:128
+#: dpkg-query.1:134
 #, no-wrap
 msgid ""
 "    B<\\en>  newline\n"
@@ -11416,7 +12130,7 @@
 "    B<\\et>  tabulación\n"
 
 #. type: Plain text
-#: dpkg-query.1:133
+#: dpkg-query.1:139
 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<"
@@ -11427,7 +12141,7 @@
 "para \\(lqB<\\e>\\(rq and \\(lqB<$>\\(rq."
 
 #. type: Plain text
-#: dpkg-query.1:141
+#: dpkg-query.1:147
 msgid ""
 "Package information can be included by inserting variable references to "
 "package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
@@ -11444,8 +12158,42 @@
 "se guardan los campos internos o campos contenidos en el paquete binario):"
 
 #. type: Plain text
-#: dpkg-query.1:176
-#, no-wrap
+#: dpkg-query.1:182
+#, fuzzy, no-wrap
+#| msgid ""
+#| "    B<Architecture>\n"
+#| "    B<Bugs>\n"
+#| "    B<Conffiles> (internal)\n"
+#| "    B<Config-Version> (internal)\n"
+#| "    B<Conflicts>\n"
+#| "    B<Breaks>\n"
+#| "    B<Depends>\n"
+#| "    B<Description>\n"
+#| "    B<Enhances>\n"
+#| "    B<Essential>\n"
+#| "    B<Filename> (internal, dselect related)\n"
+#| "    B<Homepage>\n"
+#| "    B<Installed-Size>\n"
+#| "    B<MD5sum> (internal, dselect related)\n"
+#| "    B<MSDOS-Filename> (internal, dselect related)\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> (obsolete)\n"
+#| "    B<Section>\n"
+#| "    B<Size> (internal, dselect related)\n"
+#| "    B<Source>\n"
+#| "    B<Status> (internal)\n"
+#| "    B<Suggests>\n"
+#| "    B<Tag> (usually not in the .deb but in APT's Packages files)\n"
+#| "    B<Triggers-Awaited> (internal)\n"
+#| "    B<Triggers-Pending> (internal)\n"
+#| "    B<Version>\n"
 msgid ""
 "    B<Architecture>\n"
 "    B<Bugs>\n"
@@ -11457,11 +12205,11 @@
 "    B<Description>\n"
 "    B<Enhances>\n"
 "    B<Essential>\n"
-"    B<Filename> (internal, dselect related)\n"
+"    B<Filename> (internal, front-end related)\n"
 "    B<Homepage>\n"
 "    B<Installed-Size>\n"
-"    B<MD5sum> (internal, dselect related)\n"
-"    B<MSDOS-Filename> (internal, dselect related)\n"
+"    B<MD5sum> (internal, front-end related)\n"
+"    B<MSDOS-Filename> (internal, front-end related)\n"
 "    B<Maintainer>\n"
 "    B<Origin>\n"
 "    B<Package>\n"
@@ -11472,11 +12220,11 @@
 "    B<Replaces>\n"
 "    B<Revision> (obsolete)\n"
 "    B<Section>\n"
-"    B<Size> (internal, dselect related)\n"
+"    B<Size> (internal, front-end related)\n"
 "    B<Source>\n"
 "    B<Status> (internal)\n"
 "    B<Suggests>\n"
-"    B<Tag> (usually not in the .deb but in APT's Packages files)\n"
+"    B<Tag> (usually not in the .deb but in the repository Packages files)\n"
 "    B<Triggers-Awaited> (internal)\n"
 "    B<Triggers-Pending> (internal)\n"
 "    B<Version>\n"
@@ -11517,7 +12265,7 @@
 "    B<Version>\n"
 
 #. type: Plain text
-#: dpkg-query.1:184
+#: dpkg-query.1:190
 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 "
@@ -11532,37 +12280,39 @@
 "responsable de dpkg y la versión instalada ejecute lo siguiente:"
 
 #. type: Plain text
-#: dpkg-query.1:187
+#: dpkg-query.1:193
 #, no-wrap
 msgid "  B<dpkg-query -W -f=\\(aq${Package} ${Version}\\et${Maintainer}\\en\\(aq dpkg>\n"
 msgstr "  B<dpkg-query -W -f=\\(aq${Package} ${Version}\\et${Maintainer}\\en\\(aq dpkg>\n"
 
 #. type: SH
-#: dpkg-query.1:189 dpkg-split.1:180 start-stop-daemon.8:256
-#: update-alternatives.8:375
+#: dpkg-query.1:195 dpkg-split.1:179 start-stop-daemon.8:259
+#: update-alternatives.8:374
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "ESTADOS DE SALIDA"
 
-#. type: IP
-#: dpkg-query.1:190 update-alternatives.8:376
+#. type: TP
+#: dpkg-query.1:196 dpkg-split.1:180 start-stop-daemon.8:260
+#: start-stop-daemon.8:289 update-alternatives.8:375
 #, no-wrap
-msgid "0"
-msgstr "0"
+msgid "B<0>"
+msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:192
+#: dpkg-query.1:199
 msgid "The requested query was successfully performed."
 msgstr "La consulta requerida se ejecutó con éxito."
 
-#. type: IP
-#: dpkg-query.1:192
+#. type: TP
+#: dpkg-query.1:199 dpkg-split.1:186 start-stop-daemon.8:270
+#: start-stop-daemon.8:292
 #, no-wrap
-msgid "1"
-msgstr "1"
+msgid "B<1>"
+msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:195
+#: dpkg-query.1:203
 msgid ""
 "Problems were encountered while parsing the command line or performing the "
 "query, including no file or package being found (except for --control-path)."
@@ -11572,7 +12322,7 @@
 "paquete (a excepción de «--control-path»)."
 
 #. type: Plain text
-#: dpkg-query.1:205
+#: dpkg-query.1:213
 msgid ""
 "This setting influences the output of the B<--list> option by changing the "
 "width of its output."
@@ -11581,7 +12331,7 @@
 "salida."
 
 #. type: Plain text
-#: dpkg-query.1:208
+#: dpkg-query.1:216
 msgid "Copyright \\(co 2001 Wichert Akkerman"
 msgstr "Copyright \\(co 2001 Wichert Akkerman"
 
@@ -11591,28 +12341,26 @@
 msgid "dpkg-scanpackages"
 msgstr "dpkg-scanpackages"
 
-#. type: TH
-#: dpkg-scanpackages.1:15 dpkg-scansources.1:1
-#, no-wrap
-msgid "2009-10-01"
-msgstr "1 de Octubre de 2009"
-
 #. type: Plain text
 #: dpkg-scanpackages.1:18
 msgid "dpkg-scanpackages - create Packages index files"
 msgstr "dpkg-scanpackages - Creación de ficheros de índice «Packages»"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:27
+#: dpkg-scanpackages.1:26
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+#| "prefix>]] B<E<gt>> I<Packages>"
 msgid ""
-"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scanpackages> [I<option>...] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
 "B<dpkg-scanpackages> [I<opciones>] I<directorio-binario> [I<fichero-"
 "anulación> [I<prefijo-ruta>]] B<E<gt>> I<Packages>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:40
+#: dpkg-scanpackages.1:39
 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 "
@@ -11629,7 +12377,7 @@
 "crear un directorio local con paquetes a instalar en una o varias máquinas."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:52
+#: 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<bzip2>(1)  (generating a "
@@ -11644,7 +12392,7 @@
 "ficheros locales (por ejemplo, B<file://> sources)."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:59
+#: 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 "
@@ -11658,7 +12406,7 @@
 "«Packages» empezará por esta cadena de caracteres."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-scanpackages.1:63
 msgid ""
 "I<overridefile> is the name of a file to read which contains information "
 "about how the package fits into the distribution (it can be a compressed "
@@ -11669,7 +12417,7 @@
 "comprimido); consulte B<deb-override>(5)."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-scanpackages.1:66
 msgid ""
 "I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
@@ -11677,7 +12425,7 @@
 "«Filename»."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:71
+#: dpkg-scanpackages.1:70
 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 "
@@ -11688,35 +12436,35 @@
 "arquitectura, sólo se usará el primero."
 
 #. type: TP
-#: dpkg-scanpackages.1:73
+#: dpkg-scanpackages.1:72
 #, no-wrap
 msgid "B<-t>, B<--type> I<type>"
 msgstr "B<-t>, B<--type> I<tipo>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 msgid "Scan for *.I<type> packages, instead of *.deb."
 msgstr "Busca paquetes «*.I<tipo>» en vez de «*.deb»."
 
 #. type: TP
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 #, no-wrap
 msgid "B<-u>, B<--udeb>"
 msgstr "B<-u>, B<--udeb>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:79
+#: dpkg-scanpackages.1:78
 msgid "B<Obsolete> alias for B<-tudeb>."
 msgstr "Alias B<obsoleto> para B<-tudeb>."
 
 #. type: IP
-#: dpkg-scanpackages.1:79 dpkg-scansources.1:50
+#: dpkg-scanpackages.1:78 dpkg-scansources.1:49
 #, no-wrap
 msgid "B<-e>, B<--extra-override> I<file>"
 msgstr "B<-e>, B<--extra-override> I<fichero>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:85 dpkg-scansources.1:55
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:54
 msgid ""
 "Scan I<file> to find supplementary overrides (the file can be compressed). "
 "See B<deb-extra-override>(5)  for more information on its format."
@@ -11726,13 +12474,13 @@
 "información acerca del formato."
 
 #. type: TP
-#: dpkg-scanpackages.1:85
+#: dpkg-scanpackages.1:84
 #, no-wrap
 msgid "B<-a>, B<--arch> I<arch>"
 msgstr "B<-a>, B<--arch> I<arquitectura>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 msgid ""
 "Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
 "scanning for all debs."
@@ -11741,24 +12489,24 @@
 "buscar todos los «.deb»."
 
 #. type: TP
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 #, no-wrap
 msgid "B<-m>, B<--multiversion>"
 msgstr "B<-m>, B<--multiversion>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 msgid "Include all found packages in the output."
 msgstr "Incluye en la salida todos los paquetes encontrados."
 
 #. type: TP
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 #, no-wrap
 msgid "B<-M>, B<--medium> I<id-string>"
 msgstr "B<-M>, B<--medium> I<cadena-identificación>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:97
+#: dpkg-scanpackages.1:96
 msgid ""
 "Add an X-Medium field containing the value I<id-string>. This field is "
 "required if you want to generate B<Packages.cd> files for use by the multicd "
@@ -11769,13 +12517,13 @@
 "B<Packages.cd> para su uso a través del método «multicd» de dselect."
 
 #. type: SH
-#: dpkg-scanpackages.1:104 update-alternatives.8:447
+#: dpkg-scanpackages.1:103 update-alternatives.8:448
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr "DIAGNÓSTICOS"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:110
+#: dpkg-scanpackages.1:109
 msgid ""
 "B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
 "warns about packages that are in the wrong subdirectory, are duplicated, "
@@ -11789,7 +12537,7 @@
 "sustitución del responsable del paquete que no tiene efecto."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:116
+#: dpkg-scanpackages.1:115
 msgid ""
 "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<deb-extra-override>(5), "
 "B<dpkg-scansources>(1)."
@@ -11809,16 +12557,20 @@
 msgstr "dpkg-scansources - Creación de ficheros de índice «Sources»"
 
 #. type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-scansources.1:12
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+#| "prefix>]] B<E<gt>> I<Sources>"
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scansources> [I<option>...] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
 "B<dpkg-scansources> [I<opciones>] I<directorio-binario> [I<fichero-override> "
 "[I<prefijo-ruta>]] B<E<gt>> I<Sources>"
 
 #. type: Plain text
-#: dpkg-scansources.1:18
+#: dpkg-scansources.1:17
 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."
@@ -11828,7 +12580,7 @@
 "la salida estándar."
 
 #. type: Plain text
-#: dpkg-scansources.1:29
+#: dpkg-scansources.1:28
 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> "
@@ -11852,7 +12604,7 @@
 "modifica la información sobre el mantenedor. Esto puede cambiar en un futuro."
 
 #. type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-scansources.1:32
 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 "
@@ -11864,7 +12616,7 @@
 "Debian."
 
 #. type: Plain text
-#: dpkg-scansources.1:44
+#: dpkg-scansources.1:43
 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 "
@@ -11877,13 +12629,13 @@
 "excepción de ficheros locales (por ejemplo, B<file://> sources)."
 
 #. type: IP
-#: dpkg-scansources.1:46
+#: dpkg-scansources.1:45
 #, no-wrap
 msgid "B<-n>, B<--no-sort>"
 msgstr "B<-n>, B<--no-sort>"
 
 #. type: Plain text
-#: dpkg-scansources.1:49
+#: dpkg-scansources.1:48
 msgid ""
 "Don't sort the index records. Normally they are sorted by source package "
 "name."
@@ -11892,13 +12644,13 @@
 "por el nombre de los paquetes fuente."
 
 #. type: IP
-#: dpkg-scansources.1:55
+#: dpkg-scansources.1:54
 #, no-wrap
 msgid "B<-s>, B<--source-override> I<file>"
 msgstr "B<-s>, B<--source-override> I<fichero>"
 
 #. type: Plain text
-#: dpkg-scansources.1:59
+#: dpkg-scansources.1:58
 msgid ""
 "Use I<file> as the source override file (the file can be compressed).  The "
 "default is the name of the override file you specified with I<.src> appended."
@@ -11908,7 +12660,7 @@
 "anteriormente."
 
 #. type: Plain text
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 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 "
@@ -11924,23 +12676,23 @@
 "fuentes tiene preferencia."
 
 #. type: IP
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 #. type: Plain text
-#: dpkg-scansources.1:67
+#: dpkg-scansources.1:66
 msgid "Turn debugging on."
 msgstr "Activa la depuración."
 
 #. type: Plain text
-#: dpkg-scansources.1:76
+#: dpkg-scansources.1:75
 msgid "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 msgstr "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 
 #. type: Plain text
-#: dpkg-scansources.1:78
+#: dpkg-scansources.1:77
 msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 
@@ -11950,14 +12702,6 @@
 msgid "dpkg-shlibdeps"
 msgstr "dpkg-shlibdeps"
 
-#. type: TH
-#: dpkg-shlibdeps.1:1 dpkg-source.1:2 start-stop-daemon.8:1
-#: update-alternatives.8:8
-#, fuzzy, no-wrap
-#| msgid "2010-03-07"
-msgid "2011-03-04"
-msgstr "7 de Marzo de 2010"
-
 #. type: Plain text
 #: dpkg-shlibdeps.1:4
 msgid "dpkg-shlibdeps - generate shared library substvar dependencies"
@@ -11966,21 +12710,31 @@
 "sustitución de variables"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:10
-msgid ""
-"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
+#: dpkg-shlibdeps.1:8
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> "
+#| "[I<options>]"
+msgid "B<dpkg-shlibdeps> [I<option>...] [B<-e>]I<executable> [I<option>...]"
 msgstr ""
 "B<dpkg-shlibdeps> [I<opciones>] I<ejecutable>|B<-e>I<ejecutable> "
 "[I<opciones>]"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:24
+#: dpkg-shlibdeps.1:22
+#, 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."
 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."
+"other variables starting with B<shlibs:> are removed from the file."
 msgstr ""
 "B<dpkg-shlibdeps> calcula las dependencias de bibliotecas compartidas de los "
 "ejecutables suministrados en sus argumentos. Las dependencias se añaden al "
@@ -11990,7 +12744,7 @@
 "I<shlibs:> se elimina del fichero."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 msgid ""
 "B<dpkg-shlibdeps> has two possible sources of information to generate "
 "dependency information. Either I<symbols> files or I<shlibs> files. For each "
@@ -12019,13 +12773,13 @@
 ">I<library-file> para conocer el paquete que proporciona la biblioteca."
 
 #. type: SS
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 #, no-wrap
 msgid "Symbols files"
 msgstr "Ficheros de símbolos"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 msgid ""
 "Symbols files contain finer-grained dependency information by providing the "
 "minimum dependency for each symbol that the library exports. The script "
@@ -12039,13 +12793,13 @@
 "la primera coincidencia):"
 
 #. type: IP
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 #, no-wrap
 msgid "debian/*/DEBIAN/symbols"
 msgstr "debian/*/DEBIAN/symbols"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are generated by B<dpkg-gensymbols>(1).  "
@@ -12061,19 +12815,19 @@
 "de otros paquetes binarios."
 
 #. type: IP
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols.I<arch>"
 msgstr "/etc/dpkg/symbols/I<paquete>.symbols.I<arquitectura>"
 
 #. type: IP
-#: dpkg-shlibdeps.1:61
+#: dpkg-shlibdeps.1:59
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols"
 msgstr "/etc/dpkg/symbols/I<paquete>.symbols"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 msgid ""
 "Per-system overriding shared library dependency information.  I<arch> is the "
 "architecture of the current system (obtained by B<dpkg-architecture -"
@@ -12084,13 +12838,13 @@
 "B<dpkg-architecture - qDEB_HOST_ARCH>)."
 
 #. type: IP
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> symbols\\(rq"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:68 dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:66 dpkg-shlibdeps.1:100
 #, fuzzy
 #| msgid ""
 #| "Package-provided shared library dependency information.  Unless "
@@ -12104,7 +12858,7 @@
 "dpkg»."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:75
+#: dpkg-shlibdeps.1:73
 msgid ""
 "While scanning the symbols used by all binaries, B<dpkg-shlibdeps> remembers "
 "the (biggest) minimal version needed for each library. At the end of the "
@@ -12118,7 +12872,7 @@
 "precisa)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 msgid ""
 "As a safe-guard measure, a symbols file can provide a I<Build-Depends-"
 "Package> meta-information field and B<dpkg-shlibdeps> will extract the "
@@ -12133,13 +12887,13 @@
 "que la versión mínima calculada en el análisis de símbolos."
 
 #. type: SS
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 #, no-wrap
 msgid "Shlibs files"
 msgstr "Ficheros «shlibs»"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:86
+#: dpkg-shlibdeps.1:84
 msgid ""
 "Shlibs files associate directly a library to a dependency (without looking "
 "at the symbols). It's thus often stronger than really needed but very safe "
@@ -12150,7 +12904,7 @@
 "pero sencillo y seguro de manipular."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 msgid ""
 "The dependencies for a library are looked up in several places. The first "
 "file providing information for the library of interest is used:"
@@ -12159,39 +12913,39 @@
 "el primer fichero que proporcione información de la biblioteca relevante."
 
 #. type: IP
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 #, no-wrap
 msgid "debian/shlibs.local"
 msgstr "debian/shlibs.local"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 msgid "Package-local overriding shared library dependency information."
 msgstr ""
 "Información acerca de redefinición de dependencias de bibliotecas "
 "compartidas específicas al paquete local."
 
 #. type: IP
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 #, no-wrap
 msgid "/etc/dpkg/shlibs.override"
 msgstr "/etc/dpkg/shlibs.override"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 msgid "Per-system overriding shared library dependency information."
 msgstr ""
 "Información acerca de redefinición de dependencias de bibliotecas "
 "compartidas para cada sistema."
 
 #. type: IP
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 #, no-wrap
 msgid "debian/*/DEBIAN/shlibs"
 msgstr "debian/*/DEBIAN/shlibs"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are only used if the library is found in a "
@@ -12205,26 +12959,26 @@
 "«shlibs» de otros paquetes binarios."
 
 #. type: IP
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> shlibs\\(rq"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:100
 #, no-wrap
 msgid "/etc/dpkg/shlibs.default"
 msgstr "/etc/dpkg/shlibs.default"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:104
+#: dpkg-shlibdeps.1:102
 msgid "Per-system default shared library dependency information."
 msgstr ""
 "Información del sistema acerca de las dependencias predefinidas de "
 "bibliotecas compartidas."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:108
+#: dpkg-shlibdeps.1:106
 msgid ""
 "The extracted dependencies are then directly used (except if they are "
 "filtered out because they have been identified as duplicate, or as weaker "
@@ -12235,7 +12989,7 @@
 "débiles que otra dependencia)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 msgid ""
 "B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
 "as if they'd been supplied as B<-e>I<executable>."
@@ -12245,13 +12999,13 @@
 "con B<-e>I<ejecutable>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 #, no-wrap
 msgid "B<-e>I<executable>"
 msgstr "B<-e>I<ejecutable>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 msgid ""
 "Include dependencies appropriate for the shared libraries required by "
 "I<executable>."
@@ -12260,13 +13014,13 @@
 "por el I<ejecutable>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 #, no-wrap
 msgid "B<-d>I<dependencyfield>"
 msgstr "B<-d>I<campo-dependencias>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:123
+#: dpkg-shlibdeps.1:121
 msgid ""
 "Add dependencies to be added to the control file dependency field "
 "I<dependencyfield>.  (The dependencies for this field are placed in the "
@@ -12277,7 +13031,7 @@
 "dependencias>)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:133
+#: dpkg-shlibdeps.1:131
 msgid ""
 "The B<-d>I<dependencyfield> option takes effect for all executables after "
 "the option, until the next B<-d>I<dependencyfield>.  The default "
@@ -12288,7 +13042,7 @@
 "omisión el I<campo-dependencias> es B<Depends>."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 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>, "
@@ -12303,13 +13057,13 @@
 "aquél que contenga las dependencias más importantes."
 
 #. type: TP
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 #, no-wrap
 msgid "B<-p>I<varnameprefix>"
 msgstr "B<-p>I<prefijo-de-variable>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:152
+#: dpkg-shlibdeps.1:150
 msgid ""
 "Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
 ">.  Likewise, any existing substitution variables starting with "
@@ -12322,7 +13076,7 @@
 "de B<shlibs:>) se eliminará del fichero de sustitución de variables."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 msgid ""
 "Print substitution variable settings to standard output, rather than being "
 "added to the substitution variables file (B<debian/substvars> by default)."
@@ -12332,13 +13086,13 @@
 "omisión B<debian/substvars>)."
 
 #. type: TP
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 #, no-wrap
 msgid "B<-t>I<type>"
 msgstr "B<-t>I<tipo>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 msgid ""
 "Prefer shared library dependency information tagged for the given package "
 "type. If no tagged information is available, falls back to untagged "
@@ -12354,13 +13108,13 @@
 "nombre del tipo, dos puntos, y un espacio."
 
 #. type: TP
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 #, no-wrap
 msgid "B<-L>I<localshlibsfile>"
 msgstr "B<-L>I<fichero-shlibs-local>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:171
+#: dpkg-shlibdeps.1:169
 msgid ""
 "Read overriding shared library dependency information from "
 "I<localshlibsfile> instead of B<debian/shlibs.local>."
@@ -12370,7 +13124,7 @@
 "shlibs.local>."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 msgid ""
 "Write substitution variables in I<substvarsfile>; the default is B<debian/"
 "substvars>."
@@ -12379,13 +13133,13 @@
 "por omisión B<debian/substvars>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 #, no-wrap
 msgid "B<-v>"
 msgstr "B<-v>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 msgid ""
 "Enable verbose mode. Numerous messages are displayed to explain what B<dpkg-"
 "shlibdeps> does."
@@ -12394,13 +13148,13 @@
 "acciones de B<dpkg-shlindeps>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 #, no-wrap
 msgid "B<-x>I<package>"
 msgstr "B<-x>I<paquete>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 msgid ""
 "Exclude the package from the generated dependencies. This is useful to avoid "
 "self-dependencies for packages which provide ELF binaries (executables or "
@@ -12413,13 +13167,13 @@
 "paquete. Esta opción se puede usar varias veces para excluir varios paquetes."
 
 #. type: TP
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 #, no-wrap
 msgid "B<-S>I<pkgbuilddir>"
 msgstr "B<-S>I<directorio-compilación-paquete>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 msgid ""
 "Look into I<pkgbuilddir> first when trying to find a library. This is useful "
 "when the source package builds multiple flavors of the same library and you "
@@ -12435,13 +13189,13 @@
 "paquetes binarios."
 
 #. type: TP
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 #, no-wrap
 msgid "B<--ignore-missing-info>"
 msgstr "B<--ignore-missing-info>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 msgid ""
 "Do not fail if dependency information can't be found for a shared library.  "
 "Usage of this option is discouraged, all libraries should provide dependency "
@@ -12455,13 +13209,13 @@
 "paquetes no los usan actualmente."
 
 #. type: TP
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 #, no-wrap
 msgid "B<--warnings=>I<value>"
 msgstr "B<--warnings=>I<valor>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:213
+#: dpkg-shlibdeps.1:211
 msgid ""
 "I<value> is a bit field defining the set of warnings that can be emitted by "
 "B<dpkg-shlibdeps>.  Bit 0 (value=1) enables the warning \"symbol I<sym> used "
@@ -12480,13 +13234,13 @@
 "último. Defina el I<valor> con 7 si desea que todos los avisos estén activos."
 
 #. type: SH
-#: dpkg-shlibdeps.1:224
+#: dpkg-shlibdeps.1:222
 #, no-wrap
 msgid "WARNINGS"
 msgstr "ADVERTENCIAS"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 msgid ""
 "Since B<dpkg-shlibdeps> analyzes the set of symbols used by each binary of "
 "the generated package, it is able to emit warnings in several cases. They "
@@ -12502,13 +13256,13 @@
 "aparecer, por orden de importancia decreciente."
 
 #. type: TP
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 #, no-wrap
 msgid "B<symbol>I< sym>B< used by >I<binary>B< found in none of the libraries.>"
 msgstr "B<symbol>I< sym>B< used by >I<binary>B< found in none of the libraries.>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a library and it needs to be linked "
@@ -12521,13 +13275,13 @@
 "(opción B<-l>I<biblioteca> del enlazador)."
 
 #. type: TP
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 #, no-wrap
 msgid "I<binary>B< contains an unresolvable reference to symbol >I<sym>B<: it's probably a plugin>"
 msgstr "I<binary>B< contains an unresolvable reference to symbol >I<sym>B<: it's probably a plugin>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a plugin and the symbol is probably "
@@ -12553,13 +13307,13 @@
 "y precisa un arreglo."
 
 #. type: TP
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 #, no-wrap
 msgid "B<dependency on >I<library>B< could be avoided if >I<binaries>B< were not uselessly linked against it (they use none of its symbols).>"
 msgstr "B<dependency on >I<library>B< could be avoided if >I<binaries>B< were not uselessly linked against it (they use none of its symbols).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 msgid ""
 "None of the I<binaries> that are linked with I<library> use any of the "
 "symbols provided by the library. By fixing all the binaries, you would avoid "
@@ -12572,13 +13326,13 @@
 "también para otra biblioteca que sí la usa)."
 
 #. type: TP
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 #, no-wrap
 msgid "I<binary>B< shouldn't be linked with >I<library>B< (it uses none of its symbols).>"
 msgstr "I<binary>B< shouldn't be linked with >I<library>B< (it uses none of its symbols).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 msgid ""
 "The I<binary> is linked to a library that it doesn't need. It's not a "
 "problem but some small performance improvements in binary load time can be "
@@ -12593,13 +13347,13 @@
 "revisión global de todos los binarios."
 
 #. type: SH
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 #, no-wrap
 msgid "ERRORS"
 msgstr "FALLOS"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 msgid ""
 "B<dpkg-shlibdeps> will fail if it can't find a public library used by a "
 "binary or if this library has no associated dependency information (either "
@@ -12615,13 +13369,27 @@
 "debería tener un «SONAME», y por ello no necesita información de versión."
 
 #. type: TP
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 #, no-wrap
 msgid "B<couldn't find library >I<library-soname>B< needed by >I<binary>B< (its RPATH is '>I<rpath>B<')>"
 msgstr "B<couldn't find library >I<library-soname>B< needed by >I<binary>B< (its RPATH is '>I<rpath>B<')>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:287
+#: dpkg-shlibdeps.1:285
+#, fuzzy
+#| msgid ""
+#| "The I<binary> uses a library called I<library-soname> but B<dpkg-"
+#| "shlibdeps> has been unable to find the library.  B<dpkg-shlibdeps> "
+#| "creates a list of directories to check as following: directories listed "
+#| "in the RPATH of the binary, directories listed in /etc/ld.so.conf, "
+#| "directories listed in the LD_LIBRARY_PATH environment variable, and "
+#| "standard public directories (/lib, /usr/lib, /lib32, /usr/lib32, /lib64, /"
+#| "usr/lib64). Then it checks those directories in the package's build tree "
+#| "of the binary being analyzed, in the packages's build trees indicated "
+#| "with the -S command-line option, in other packages's build trees that "
+#| "contains a DEBIAN/shlibs or DEBIAN/symbols file and finally in the root "
+#| "directory.  If the library is not found in any of those directories, then "
+#| "you get this error."
 msgid ""
 "The I<binary> uses a library called I<library-soname> but B<dpkg-shlibdeps> "
 "has been unable to find the library.  B<dpkg-shlibdeps> creates a list of "
@@ -12630,8 +13398,8 @@
 "LD_LIBRARY_PATH environment variable, and standard public directories (/"
 "lib, /usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks those "
 "directories in the package's build tree of the binary being analyzed, in the "
-"packages's build trees indicated with the -S command-line option, in other "
-"packages's build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
+"packages' build trees indicated with the -S command-line option, in other "
+"packages' build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
 "and finally in the root directory.  If the library is not found in any of "
 "those directories, then you get this error."
 msgstr ""
@@ -12650,7 +13418,7 @@
 "directorios."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 msgid ""
 "If the library not found is in a private directory of the same package, then "
 "you want to add the directory to LD_LIBRARY_PATH. If it's in another binary "
@@ -12665,13 +13433,13 @@
 "contiene el directorio adecuado, en caso de ser un directorio privado."
 
 #. type: TP
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 #, no-wrap
 msgid "B<no dependency information found for >I<library-file>B< (used by >I<binary>B<).>"
 msgstr "B<no dependency information found for >I<library-file>B< (used by >I<binary>B<).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:306
+#: dpkg-shlibdeps.1:304
 msgid ""
 "The library needed by I<binary> has been found by B<dpkg-shlibdeps> in "
 "I<library-file> but B<dpkg-shlibdeps> has been unable to find any dependency "
@@ -12690,7 +13458,7 @@
 "DEBIAN/»)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:320
+#: dpkg-shlibdeps.1:318
 msgid ""
 "This failure can be caused by a bad or missing shlibs or symbols file in the "
 "package of the library. It might also happen if the library is built within "
@@ -12716,7 +13484,7 @@
 "limpiar el «RPATH» del binario para evitar problemas."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:326
+#: dpkg-shlibdeps.1:324
 msgid ""
 "Calling B<dpkg-shlibdeps> in verbose mode (-v) will provide much more "
 "information about where it tried to find the dependency information. This "
@@ -12727,12 +13495,12 @@
 "útil si no entiende porque muestra este fallo."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:330
+#: dpkg-shlibdeps.1:328
 msgid "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 msgstr "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:337
+#: dpkg-shlibdeps.1:335
 msgid "Copyright \\(co 2006 Frank Lichtenheld"
 msgstr "Copyright \\(co 2006 Frank Lichtenheld"
 
@@ -12749,17 +13517,19 @@
 "dpkg-source - Herramienta de manipulación de paquetes fuente de Debian «.dsc»"
 
 #. type: Plain text
-#: dpkg-source.1:10
-msgid "B<dpkg-source> [I<options>] I<command>"
+#: dpkg-source.1:9
+#, fuzzy
+#| msgid "B<dpkg-source> [I<options>] I<command>"
+msgid "B<dpkg-source> [I<option>...] I<command>"
 msgstr "B<dpkg-source> [I<opciones>] I<orden>"
 
 #. type: Plain text
-#: dpkg-source.1:14
+#: dpkg-source.1:13
 msgid "B<dpkg-source> packs and unpacks Debian source archives."
 msgstr "B<dpkg-source> empaqueta y desempaqueta archivos de fuentes de Debian."
 
 #. type: Plain text
-#: dpkg-source.1:18
+#: dpkg-source.1:17
 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 "
@@ -12770,13 +13540,13 @@
 "separado."
 
 #. type: TP
-#: dpkg-source.1:20
+#: dpkg-source.1:19
 #, no-wrap
 msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr "B<-x >I<fichero>B<.dsc >[I<directorio-salida>]"
 
 #. type: Plain text
-#: dpkg-source.1:30
+#: dpkg-source.1:29
 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 "
@@ -12793,7 +13563,7 @@
 "directorio llamado I<fuente>-I<versión> dentro del directorio actual."
 
 #. type: Plain text
-#: dpkg-source.1:36
+#: dpkg-source.1:35
 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 "
@@ -12804,7 +13574,7 @@
 "directorio que el fichero B<.dsc>."
 
 #. type: Plain text
-#: dpkg-source.1:44
+#: dpkg-source.1:43
 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 "
@@ -12821,7 +13591,7 @@
 "todos los ficheros y directorios heredarán el grupo al que pertenece."
 
 #. type: Plain text
-#: dpkg-source.1:49
+#: dpkg-source.1:48
 msgid ""
 "If the source package uses a non-standard format (currently this means all "
 "formats except \"1.0\"), its name will be stored in B<debian/source/format> "
@@ -12834,13 +13604,13 @@
 "por omisión."
 
 #. type: TP
-#: dpkg-source.1:50
+#: dpkg-source.1:49
 #, no-wrap
 msgid "B<-b> I<directory> [I<format-specific-parameters>]"
 msgstr "B<-b> I<directorio> [I<parámetros-específicos-formato>]"
 
 #. type: Plain text
-#: dpkg-source.1:57
+#: dpkg-source.1:56
 msgid ""
 "Build a source package. The first non-option argument is taken as the name "
 "of the directory containing the debianized source tree (i.e. with a debian "
@@ -12856,10 +13626,19 @@
 "construcción del paquete."
 
 #. type: Plain text
-#: dpkg-source.1:66
+#: dpkg-source.1:65
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-source> will build the source package with the first format found "
+#| "in this ordered list: the format indicated with the I<--format> command-"
+#| "line option, the format indicated in B<debian/source/format>, \"1.0\". "
+#| "The fallback to \"1.0\" is deprecated and will be removed at some point "
+#| "in the future, you should always document the desired source format in "
+#| "B<debian/source/format>. See section B<SOURCE PACKAGE FORMATS> for an "
+#| "extensive description of the various source package formats."
 msgid ""
 "B<dpkg-source> will build the source package with the first format found in "
-"this ordered list: the format indicated with the I<--format> command-line "
+"this ordered list: the format indicated with the I<--format> command line "
 "option, the format indicated in B<debian/source/format>, \"1.0\". The "
 "fallback to \"1.0\" is deprecated and will be removed at some point in the "
 "future, you should always document the desired source format in B<debian/"
@@ -12876,14 +13655,14 @@
 "fuente."
 
 #. type: TP
-#: dpkg-source.1:67
+#: dpkg-source.1:66
 #, no-wrap
 msgid "B<--print-format> I<directory>"
 msgstr "B<--print-format> I<directorio>"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:72
+#: dpkg-source.1:71
 msgid ""
 "Print the source format that would be used to build the source package if "
 "B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -12894,20 +13673,28 @@
 "los mismos parámetros)."
 
 #. type: TP
-#: dpkg-source.1:73
+#: dpkg-source.1:72
 #, no-wrap
 msgid "B<--before-build> I<directory>"
 msgstr "B<--before-build> I<directorio>"
 
 #. type: Plain text
 #: dpkg-source.1:81
-msgid ""
-"This command should be called before any build of the package (B<dpkg-"
-"buildpackage> calls it very early even before B<debian/rules clean>). This "
-"command should be idempotent and can be called multiple times. Not all "
-"source formats implement something in this hook, and those that do usually "
-"prepare the source tree for the build for example by ensuring that the "
-"Debian patches are applied."
+#, fuzzy
+#| msgid ""
+#| "This command should be called before any build of the package (B<dpkg-"
+#| "buildpackage> calls it very early even before B<debian/rules clean>). "
+#| "This command should be idempotent and can be called multiple times. Not "
+#| "all source formats implement something in this hook, and those that do "
+#| "usually prepare the source tree for the build for example by ensuring "
+#| "that the Debian patches are applied."
+msgid ""
+"Run the corresponding hook of the source package format. This hook is called "
+"before any build of the package (B<dpkg-buildpackage> calls it very early "
+"even before B<debian/rules clean>). This command is idempotent and can be "
+"called multiple times. Not all source formats implement something in this "
+"hook, and those that do usually prepare the source tree for the build for "
+"example by ensuring that the Debian patches are applied."
 msgstr ""
 "Se debería invocar esta orden antes de construir un paquete (B<dpkg-"
 "buildpackage> lo invoca muy temprano en el proceso, incluso antes que "
@@ -12925,12 +13712,19 @@
 
 #. type: Plain text
 #: dpkg-source.1:89
-msgid ""
-"This command should be called after any build of the package (B<dpkg-"
-"buildpackage> calls it last). This command should be idempotent and can be "
-"called multiple times. Not all source formats implement something in this "
-"hook, and those that do usually use it to undo what B<--before-build> has "
-"done."
+#, fuzzy
+#| msgid ""
+#| "This command should be called after any build of the package (B<dpkg-"
+#| "buildpackage> calls it last). This command should be idempotent and can "
+#| "be called multiple times. Not all source formats implement something in "
+#| "this hook, and those that do usually use it to undo what B<--before-"
+#| "build> has done."
+msgid ""
+"Run the corresponding hook of the source package format. This hook is called "
+"after any build of the package (B<dpkg-buildpackage> calls it last). This "
+"command is idempotent and can be called multiple times. Not all source "
+"formats implement something in this hook, and those that do usually use it "
+"to undo what B<--before-build> has done."
 msgstr ""
 "Se debería invocar esta orden después de construir un paquete (B<dpkg-"
 "buildpackage> lo invoca en último lugar). Esta orden debería ser "
@@ -12938,14 +13732,29 @@
 "fuentes implementan algo en este «hook», y aquellos que lo hacen lo usan "
 "habitualmente para deshacer lo que B<--before-build> ha hecho."
 
+#. type: TP
+#: dpkg-source.1:90
+#, fuzzy, no-wrap
+#| msgid "B<--print-format> I<directory>"
+msgid "B<--commit> [I<directory>] ..."
+msgstr "B<--print-format> I<directorio>"
+
+#. type: Plain text
+#: dpkg-source.1:95
+msgid ""
+"Record changes in the source tree unpacked in I<directory>. This command can "
+"take supplementary parameters depending on the source format.  It will error "
+"out for formats where this operation doesn't mean anything."
+msgstr ""
+
 #. type: SH
-#: dpkg-source.1:97
+#: dpkg-source.1:103
 #, no-wrap
 msgid "GENERIC BUILD OPTIONS"
 msgstr "OPCIONES GENÉRICAS DE CONSTRUCCIÓN"
 
 #. type: Plain text
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 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 "
@@ -12957,7 +13766,7 @@
 "árbol de fuentes."
 
 #. type: Plain text
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 msgid ""
 "Specifies the change log file to read information from. The default is "
 "B<debian/changelog>.  If given with relative pathname this is interpreted "
@@ -12968,13 +13777,13 @@
 "interpretan empezando en el directorio superior del árbol de fuentes."
 
 #. type: TP
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 #, no-wrap
 msgid "B<--format=>I<value>"
 msgstr "B<--format=>I<valor>"
 
 #. type: Plain text
-#: dpkg-source.1:121
+#: dpkg-source.1:127
 msgid ""
 "Use the given format for building the source package. It does override any "
 "format given in B<debian/source/format>."
@@ -12983,7 +13792,7 @@
 "sobreescribe cualquier formato presente enB<debian/source/format>."
 
 #. type: Plain text
-#: dpkg-source.1:131
+#: dpkg-source.1:137
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is to not read "
 "any file. This option can be used multiple times to read substitution "
@@ -12994,13 +13803,13 @@
 "leer variables de sustitución de varios ficheros."
 
 #. type: TP
-#: dpkg-source.1:137
+#: dpkg-source.1:143
 #, no-wrap
 msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
 msgstr "B<-Z>I<compression>, B<--compression>=I<compresión>"
 
 #. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 msgid ""
 "Specify the compression to use for created files (tarballs and diffs).  Note "
 "that this option will not cause existing tarballs to be recompressed, it "
@@ -13015,30 +13824,35 @@
 "por omisión. La compatibilidad con I<xz> es posible desde dpkg-dev 1.15.5."
 
 #. type: TP
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 #, no-wrap
 msgid "B<-z>I<level>, B<--compression-level>=I<level>"
 msgstr "B<-z>I<level>, B<--compression-level>=I<nivel>"
 
 #. type: Plain text
-#: dpkg-source.1:151
+#: dpkg-source.1:157
+#, fuzzy
+#| msgid ""
+#| "Compression level to use. As with B<-Z> it only affects newly created "
+#| "files. Supported values are: I<1> to I<9>, I<best>, and I<fast>.  I<9> is "
+#| "the default."
 msgid ""
 "Compression level to use. As with B<-Z> it only affects newly created files. "
-"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  I<9> is the "
-"default."
+"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  The default is "
+"I<9> for gzip and bzip2, I<6> for xz and lzma."
 msgstr ""
 "El nivel de compresión a usar. Al igual que B<-Z>, sólo afecta a los "
 "ficheros nuevos. Los valores permitidos son de I<1> a I<9>, I<best>, y "
 "I<fast>. I<9> se usa por omisión."
 
 #. type: TP
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 #, no-wrap
 msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
 msgstr "B<-i>[I<expresión-regular>], B<--diff-ignore>[=I<expresión-regular>]"
 
 #. type: Plain text
-#: dpkg-source.1:163
+#: dpkg-source.1:169
 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 "
@@ -13063,7 +13877,7 @@
 "sólo se tendrá en cuenta la última."
 
 #. type: Plain text
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 msgid ""
 "This is very helpful in cutting out extraneous files that get included in "
 "the diff, e.g. if you maintain your source in a revision control system and "
@@ -13087,19 +13901,26 @@
 "ejemplo, '(^|/)', '($|/)')."
 
 #. type: TP
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 #, no-wrap
 msgid "B<--extend-diff-ignore>=I<regexp>"
 msgstr "B<--extend-diff-ignore>=I<expresión-regular>"
 
 #. type: Plain text
-#: dpkg-source.1:180
-msgid ""
-"The perl regular expression specified will extend the default regular "
-"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
-"default regexp.  This option is convenient to use in B<debian/source/"
-"options> to exclude some auto-generated files from the automatic patch "
-"generation."
+#: dpkg-source.1:186
+#, fuzzy
+#| msgid ""
+#| "The perl regular expression specified will extend the default regular "
+#| "expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
+#| "default regexp.  This option is convenient to use in B<debian/source/"
+#| "options> to exclude some auto-generated files from the automatic patch "
+#| "generation."
+msgid ""
+"The perl regular expression specified will extend the default value of B<--"
+"diff-ignore> and its current value (if set). It does this by concatenating "
+"\"B<|>I<regexp>\" to the existing value.  This option is convenient to use "
+"in B<debian/source/options> to exclude some auto-generated files from the "
+"automatic patch generation."
 msgstr ""
 "La expresión regular de perl definida extenderá la expresión regular "
 "predefinida asociada a B<-i>, concatenando «B<|>I<regexp>» a la expresión "
@@ -13108,13 +13929,13 @@
 "la generación automática de parches."
 
 #. type: TP
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 #, no-wrap
 msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
 msgstr "B<-I>[I<patrón-fichero>], B<--tar-ignore>[=I<patrón-fichero>]"
 
 #. type: Plain text
-#: dpkg-source.1:189
+#: dpkg-source.1:195
 msgid ""
 "If this option is specified, the pattern will be passed to B<tar>(1)'s --"
 "exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -13129,7 +13950,7 @@
 "listar varios patrones a excluir."
 
 #. type: Plain text
-#: dpkg-source.1:194
+#: dpkg-source.1:200
 msgid ""
 "B<-I> by itself adds default --exclude options that will filter out control "
 "files and directories of the most common revision control systems, backup "
@@ -13141,7 +13962,7 @@
 "directorios de salida de construcción de Libtool."
 
 #. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:212
 msgid ""
 "B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
 "different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -13163,7 +13984,7 @@
 "html#wildcards para una completa documentación."
 
 #. type: Plain text
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 msgid ""
 "The default regexp and patterns for both options can be seen in the output "
 "of the B<--help> command."
@@ -13172,42 +13993,42 @@
 "opciones en la salida de la orden B<--help>."
 
 #. type: SH
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 #, no-wrap
 msgid "GENERIC EXTRACT OPTIONS"
 msgstr "OPCIONES DE EXTRACCIÓN GENÉRICAS"
 
 #. type: TP
-#: dpkg-source.1:210
+#: dpkg-source.1:216
 #, no-wrap
 msgid "B<--no-copy>"
 msgstr "B<--no-copy>"
 
 #. type: Plain text
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 msgid "Do not copy original tarballs near the extracted source package."
 msgstr ""
 "No copia los ficheros tar originales cerca del paquete fuente extraído."
 
 #. type: TP
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 #, no-wrap
 msgid "B<--no-check>"
 msgstr "B<--no-check>"
 
 #. type: Plain text
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 msgid "Do not check signatures and checksums before unpacking."
 msgstr "No revisa las firmas y sumas de control antes de desempaquetar."
 
 #. type: TP
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 #, no-wrap
 msgid "B<--require-valid-signature>"
 msgstr "B<--require-valid-signature>"
 
 #. type: Plain text
-#: dpkg-source.1:224
+#: dpkg-source.1:230
 msgid ""
 "Refuse to unpack the source package if it doesn't contain an OpenPGP "
 "signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -13222,13 +14043,13 @@
 "gpg> y I</usr/share/keyrings/debian-maintainers.gpg>. "
 
 #. type: SH
-#: dpkg-source.1:225
+#: dpkg-source.1:231
 #, no-wrap
 msgid "SOURCE PACKAGE FORMATS"
 msgstr "FORMATOS DE PAQUETE FUENTE"
 
 #. type: Plain text
-#: dpkg-source.1:230
+#: dpkg-source.1:236
 msgid ""
 "If you don't know what source format to use, you should probably pick either "
 "\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
@@ -13240,13 +14061,13 @@
 "dentro del proyecto Debian."
 
 #. type: SS
-#: dpkg-source.1:231
+#: dpkg-source.1:237
 #, no-wrap
 msgid "Format: 1.0"
 msgstr "Formato: 1.0"
 
 #. type: Plain text
-#: dpkg-source.1:235
+#: dpkg-source.1:241
 msgid ""
 "A source package in this format consists either of a B<.orig.tar.gz> "
 "associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -13257,12 +14078,12 @@
 "paquete se considera I<native>)."
 
 #. type: Plain text
-#: dpkg-source.1:237 dpkg-source.1:405 dpkg-source.1:566 dpkg-source.1:605
+#: dpkg-source.1:243 dpkg-source.1:411 dpkg-source.1:586 dpkg-source.1:625
 msgid "B<Extracting>"
 msgstr "B<Extracción>"
 
 #. type: Plain text
-#: dpkg-source.1:247
+#: dpkg-source.1:253
 msgid ""
 "Extracting a native package is a simple extraction of the single tarball in "
 "the target directory. Extracting a non-native package is done by first "
@@ -13285,12 +14106,12 @@
 "sistema)."
 
 #. type: Plain text
-#: dpkg-source.1:249 dpkg-source.1:433 dpkg-source.1:577 dpkg-source.1:610
+#: dpkg-source.1:255 dpkg-source.1:439 dpkg-source.1:597 dpkg-source.1:630
 msgid "B<Building>"
 msgstr "B<Construcción>"
 
 #. type: Plain text
-#: dpkg-source.1:255
+#: dpkg-source.1:261
 msgid ""
 "Building a native package is just creating a single tarball with the source "
 "directory. Building a non-native package involves extracting the original "
@@ -13304,13 +14125,13 @@
 "orig»."
 
 #. type: TP
-#: dpkg-source.1:256
+#: dpkg-source.1:262
 #, no-wrap
 msgid "B<Build options (with -b):>"
 msgstr "B<Opciones de construcción (con -b):>"
 
 #. type: Plain text
-#: dpkg-source.1:269
+#: dpkg-source.1:275
 msgid ""
 "If a second non-option argument is supplied it should be the name of the "
 "original source directory or tarfile or the empty string if the package is a "
@@ -13328,7 +14149,7 @@
 "argumentos B<-sX>."
 
 #. type: Plain text
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 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<-"
@@ -13339,13 +14160,13 @@
 "B<-sP>, B<-sK>, B<-sU> y B<-sR> en su lugar."
 
 #. type: TP
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 #, no-wrap
 msgid "B<-sk>"
 msgstr "B<-sk>"
 
 #. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:290
 msgid ""
 "Specifies to expect the original source as a tarfile, by default "
 "I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>.  It will leave "
@@ -13360,25 +14181,25 @@
 "I<directorio>B<.orig> para la generación del «diff»."
 
 #. type: TP
-#: dpkg-source.1:284 dpkg-source.1:353
+#: dpkg-source.1:290 dpkg-source.1:359
 #, no-wrap
 msgid "B<-sp>"
 msgstr "B<-sp>"
 
 #. type: Plain text
-#: dpkg-source.1:289
+#: dpkg-source.1:295
 msgid "Like B<-sk> but will remove the directory again afterwards."
 msgstr ""
 "Idéntica a B<-sk>, a diferencia de que eliminará el directorio al finalizar."
 
 #. type: TP
-#: dpkg-source.1:289 dpkg-source.1:359
+#: dpkg-source.1:295 dpkg-source.1:365
 #, no-wrap
 msgid "B<-su>"
 msgstr "B<-su>"
 
 #. type: Plain text
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 msgid ""
 "Specifies that 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 "
@@ -13389,26 +14210,26 @@
 "un fichero de fuentes nuevo a partir de él."
 
 #. type: TP
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 #, no-wrap
 msgid "B<-sr>"
 msgstr "B<-sr>"
 
 #. type: Plain text
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr ""
 "Idéntica a B<-su>, a diferencia de que eliminará el directorio después de su "
 "uso."
 
 #. type: TP
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 #, no-wrap
 msgid "B<-ss>"
 msgstr "B<-ss>"
 
 #. type: Plain text
-#: dpkg-source.1:310
+#: dpkg-source.1:316
 msgid ""
 "Specifies that the original source is available both as a directory and as a "
 "tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -13422,13 +14243,13 @@
 "fuente inválido."
 
 #. type: TP
-#: dpkg-source.1:310 dpkg-source.1:362
+#: dpkg-source.1:316 dpkg-source.1:368
 #, no-wrap
 msgid "B<-sn>"
 msgstr "B<-sn>"
 
 #. type: Plain text
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 msgid ""
 "Specifies to not look for any original source, and to not generate a diff.  "
 "The second argument, if supplied, must be the empty string. This is used for "
@@ -13441,13 +14262,13 @@
 "por separado, y por tanto carecen de ficheros «diff» «debianizantes»."
 
 #. type: TP
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 #, no-wrap
 msgid "B<-sa> or B<-sA>"
 msgstr "B<-sa> or B<-sA>"
 
 #. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:348
 msgid ""
 "Specifies to 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 "
@@ -13474,13 +14295,13 @@
 "un error si se definió B<-sa>. B<-sA> es la opción predefinida."
 
 #. type: TP
-#: dpkg-source.1:342 dpkg-source.1:525
+#: dpkg-source.1:348 dpkg-source.1:541
 #, no-wrap
 msgid "B<--abort-on-upstream-changes>"
 msgstr "B<--abort-on-upstream-changes>"
 
 #. type: Plain text
-#: dpkg-source.1:348
+#: dpkg-source.1:354
 msgid ""
 "The process fails if the generated diff contains changes to files outside of "
 "the debian sub-directory. This option is not allowed in B<debian/source/"
@@ -13492,18 +14313,18 @@
 "options>."
 
 #. type: TP
-#: dpkg-source.1:349
+#: dpkg-source.1:355
 #, no-wrap
 msgid "B<Extract options (with -x):>"
 msgstr "B<Opciones de extracción (con -x):>"
 
 #. type: Plain text
-#: dpkg-source.1:353
+#: dpkg-source.1:359
 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:359
+#: dpkg-source.1:365
 msgid ""
 "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 "
@@ -13516,12 +14337,12 @@
 "omisión>)."
 
 #. type: Plain text
-#: dpkg-source.1:362
+#: dpkg-source.1:368
 msgid "Unpacks the original source tree."
 msgstr "Desempaqueta el árbol de fuentes original."
 
 #. type: Plain text
-#: dpkg-source.1:367
+#: dpkg-source.1:373
 msgid ""
 "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 "
@@ -13532,7 +14353,7 @@
 "actual es eliminado."
 
 #. type: Plain text
-#: dpkg-source.1:372
+#: dpkg-source.1:378
 msgid ""
 "All the B<-s>I<X> options are mutually exclusive. If you specify more than "
 "one only the last one will be used."
@@ -13541,25 +14362,25 @@
 "una, sólo se usará la última."
 
 #. type: TP
-#: dpkg-source.1:372 dpkg-source.1:535
+#: dpkg-source.1:378 dpkg-source.1:555
 #, no-wrap
 msgid "B<--skip-debianization>"
 msgstr "B<--skip-debianization>"
 
 #. type: Plain text
-#: dpkg-source.1:375
+#: dpkg-source.1:381
 msgid "Skips application of the debian diff on top of the upstream sources."
 msgstr ""
 "Omite la aplicación del «diff» de debian con las fuentes del autor original."
 
 #. type: SS
-#: dpkg-source.1:376
+#: dpkg-source.1:382
 #, no-wrap
 msgid "Format: 2.0"
 msgstr "Formato: 2.0"
 
 #. type: Plain text
-#: dpkg-source.1:380
+#: dpkg-source.1:386
 msgid ""
 "Also known as wig&pen. This format is not recommended for wide-spread usage, "
 "the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -13570,7 +14391,7 @@
 "especificación de un formato de paquete fuente de nueva generación."
 
 #. type: Plain text
-#: dpkg-source.1:385
+#: dpkg-source.1:391
 msgid ""
 "The behaviour of this format is the same as the \"3.0 (quilt)\" format "
 "except that it doesn't use an explicit list of patches. All files in "
@@ -13584,7 +14405,7 @@
 "extracción."
 
 #. type: Plain text
-#: dpkg-source.1:388
+#: dpkg-source.1:394
 msgid ""
 "When building a new source package, any change to the upstream source is "
 "stored in a patch named B<zz_debian-diff-auto>."
@@ -13593,13 +14414,13 @@
 "guardan en un parche llamado B<zz_debian-diff-auto>."
 
 #. type: SS
-#: dpkg-source.1:389
+#: dpkg-source.1:395
 #, no-wrap
 msgid "Format: 3.0 (native)"
 msgstr "Formato: 3.0 (nativo)"
 
 #. type: Plain text
-#: dpkg-source.1:395
+#: dpkg-source.1:401
 msgid ""
 "This format is an extension of the native package format as defined in the "
 "1.0 format. It supports all compression methods and will ignore by default "
@@ -13613,13 +14434,13 @@
 "predefinido asociado a la opción B<-I> en la salida de B<--help>)."
 
 #. type: SS
-#: dpkg-source.1:396
+#: dpkg-source.1:402
 #, no-wrap
 msgid "Format: 3.0 (quilt)"
 msgstr "Format: 3.0 (quilt)"
 
 #. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:409
 msgid ""
 "A source package in this format contains at least an original tarball (B<."
 "orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -13634,7 +14455,7 @@
 "I<componente> sólo puede contener caracteres alfanuméricos y guiones («-»)."
 
 #. type: Plain text
-#: dpkg-source.1:414
+#: dpkg-source.1:420
 msgid ""
 "The main original tarball is extracted first, then all additional original "
 "tarballs are extracted in subdirectories named after the I<component> part "
@@ -13654,7 +14475,7 @@
 "externos a ese directorio (consulte la opción B<--include-binaries>)."
 
 #. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:432
 msgid ""
 "All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
 "series> are then applied.  If the former file is used and the latter one "
@@ -13680,7 +14501,7 @@
 "encontrar tales opciones, y cabe que la construcción falle."
 
 #. type: Plain text
-#: dpkg-source.1:428
+#: dpkg-source.1:434
 msgid ""
 "Similarly to quilt's default behaviour, the patches can remove files too."
 msgstr ""
@@ -13689,7 +14510,7 @@
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:431
+#: dpkg-source.1:437
 msgid ""
 "The file B<.pc/applied-patches> is created if some patches have been applied "
 "during the extraction."
@@ -13699,16 +14520,29 @@
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:443
+#: dpkg-source.1:451
+#, fuzzy
+#| msgid ""
+#| "All original tarballs found in the current directory are extracted in a "
+#| "temporary directory by following the same logic as for the unpack, the "
+#| "debian directory is copied over in the temporary directory, and all "
+#| "patches except the automatic patch (B<debian-changes->I<version> or "
+#| "B<debian-changes>, depending on B<--single-debian-patch>) are applied. "
+#| "The temporary directory is compared to the source package directory and "
+#| "the diff (if non-empty) is stored in the automatic patch.  If the "
+#| "automatic patch is created/deleted, it's added/removed from the series "
+#| "file and from the quilt metadata."
 msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
 "except the automatic patch (B<debian-changes->I<version> or B<debian-"
 "changes>, depending on B<--single-debian-patch>) are applied. The temporary "
-"directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in the automatic patch.  If the automatic patch is created/"
-"deleted, it's added/removed from the series file and from the quilt metadata."
+"directory is compared to the source package directory. When the diff is non-"
+"empty, the build fails unless B<--single-debian-patch> or B<--auto-commit> "
+"has been used, in which case the diff is stored in the automatic patch.  If "
+"the automatic patch is created/deleted, it's added/removed from the series "
+"file and from the quilt metadata."
 msgstr ""
 "Todos los archivos tar original encontrados en el directorio actual se "
 "extraen a un directorio temporal siguiendo la misma lógica para "
@@ -13722,7 +14556,7 @@
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:451
+#: dpkg-source.1:459
 msgid ""
 "Any change on a binary file is not representable in a diff and will thus "
 "lead to a failure unless the maintainer deliberately decided to include that "
@@ -13740,7 +14574,7 @@
 "source/include-binaries>."
 
 #. type: Plain text
-#: dpkg-source.1:454
+#: dpkg-source.1:462
 msgid ""
 "The updated debian directory and the list of modified binaries is then used "
 "to generate the debian tarball."
@@ -13749,7 +14583,7 @@
 "«debian» modificado y la lista de binarios modificados."
 
 #. type: Plain text
-#: dpkg-source.1:460
+#: dpkg-source.1:468
 msgid ""
 "The automatically generated diff doesn't include changes on VCS specific "
 "files as well as many temporary files (see default value associated to B<-i> "
@@ -13764,19 +14598,28 @@
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:474
-msgid ""
-"Note: B<dpkg-source> expects the source tree to have all patches listed in "
-"the series file applied when you generate the source package.  This is not "
-"the case when the source tree has been obtained by unpacking a source "
-"package using the Format: 1.0 for instance. To mitigate the problem, B<dpkg-"
-"source> will apply the patches by itself if it believes that they have not "
-"yet been applied. To detect this situation, it uses the following heuristic: "
-"it finds the list of supposedly unapplied patches (they are listed in the "
-"B<series> file but not in B<.pc/applied-patches>), and if the first patch in "
-"that set can be applied without errors, it will apply them all.  The option "
-"B<--no-preparation> can be used to disable this behaviour. This operation is "
-"usually done as part of the B<--prepare-build> command."
+#: dpkg-source.1:477
+#, fuzzy
+#| msgid ""
+#| "Note: B<dpkg-source> expects the source tree to have all patches listed "
+#| "in the series file applied when you generate the source package.  This is "
+#| "not the case when the source tree has been obtained by unpacking a source "
+#| "package using the Format: 1.0 for instance. To mitigate the problem, "
+#| "B<dpkg-source> will apply the patches by itself if it believes that they "
+#| "have not yet been applied. To detect this situation, it uses the "
+#| "following heuristic: it finds the list of supposedly unapplied patches "
+#| "(they are listed in the B<series> file but not in B<.pc/applied-"
+#| "patches>), and if the first patch in that set can be applied without "
+#| "errors, it will apply them all.  The option B<--no-preparation> can be "
+#| "used to disable this behaviour. This operation is usually done as part of "
+#| "the B<--prepare-build> command."
+msgid ""
+"Note: B<dpkg-source> B<--before-build> (and B<-b>) will ensure that all "
+"patches listed in the series file are applied so that a package build always "
+"has all patches applied. It does this by finding unapplied patches (they are "
+"listed in the B<series> file but not in B<.pc/applied-patches>), and if the "
+"first patch in that set can be applied without errors, it will apply them "
+"all. The option B<--no-preparation> can be used to disable this behavior."
 msgstr ""
 "Nota: B<dpkg-source> espera que el árbol de fuentes contenga todos los "
 "parches listados en el fichero «series» aplicado al generar el paquete "
@@ -13792,19 +14635,45 @@
 "B<--prepare-build>."
 
 #. type: Plain text
-#: dpkg-source.1:476 dpkg-source.1:547 dpkg-source.1:586
+#: dpkg-source.1:480
+#, fuzzy
+#| msgid "B<debian/changelog>"
+msgid "B<Recording changes>"
+msgstr "B<debian/changelog>"
+
+#. type: TP
+#: dpkg-source.1:480
+#, fuzzy, no-wrap
+#| msgid "B<-c>, B<--control-path> I<package-name> [I<control-file>]"
+msgid "B<--commit> [I<directory>] [I<patch-name>] [I<patch-file>]"
+msgstr "B<-c>, B<--control-path> I<nombre-paquete> [I<fichero-control>]"
+
+#. type: Plain text
+#: dpkg-source.1:490
+msgid ""
+"Generates a patch corresponding to the local changes that are not managed by "
+"the quilt patch system and integrates it in the patch system under the name "
+"I<patch-name>. If the name is missing, it will be asked interactively. If "
+"I<patch-file> is given, it is used as the patch corresponding to the local "
+"changes to integrate. This is mainly useful after a build failure that pre-"
+"generated this file. Once integrated, an editor is launched so that you can "
+"edit the meta-information in the patch header."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:493 dpkg-source.1:567 dpkg-source.1:606
 msgid "B<Build options>"
 msgstr "B<Opciones de construcción>"
 
 #. type: TP
-#: dpkg-source.1:476
+#: dpkg-source.1:493
 #, no-wrap
 msgid "B<--allow-version-of-quilt-db=>I<version>"
 msgstr "B<--allow-version-of-quilt-db=>I<versión>"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 msgid ""
 "Allow B<dpkg-source> to build the source package if the version of the quilt "
 "metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -13820,13 +14689,13 @@
 "version>."
 
 #. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 #, no-wrap
 msgid "B<--include-removal>"
 msgstr "B<--include-removal>"
 
 #. type: Plain text
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 msgid ""
 "Do not ignore removed files and include them in the automatically generated "
 "patch."
@@ -13835,24 +14704,24 @@
 "automáticamente."
 
 #. type: TP
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 #, no-wrap
 msgid "B<--include-timestamp>"
 msgstr "B<--include-timestamp>"
 
 #. type: Plain text
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 msgid "Include timestamp in the automatically generated patch."
 msgstr "Incluye la marca temporal en el parche generado automáticamente."
 
 #. type: TP
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 #, no-wrap
 msgid "B<--include-binaries>"
 msgstr "B<--include-binaries>"
 
 #. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 msgid ""
 "Add all modified binaries in the debian tarball. Also add them to B<debian/"
 "source/include-binaries>: they will be added by default in subsequent builds "
@@ -13864,13 +14733,13 @@
 "necesaria."
 
 #. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 #, no-wrap
 msgid "B<--no-preparation>"
 msgstr "B<--no-preparation>"
 
 #. type: Plain text
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 msgid ""
 "Do not try to prepare the build tree by applying patches which are "
 "apparently unapplied."
@@ -13879,22 +14748,33 @@
 "supuestamente sin aplicar."
 
 #. type: TP
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 #, no-wrap
 msgid "B<--single-debian-patch>"
 msgstr "B<--single-debian-patch>"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:510
+#: dpkg-source.1:528
+#, fuzzy
+#| msgid ""
+#| "Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
+#| "changes->I<version> for the name of the automatic patch generated during "
+#| "build. This option is particularly useful when the package is maintained "
+#| "in a VCS and a patch set can't reliably be generated. Instead the current "
+#| "diff with upstream should be stored in a single patch. When using this "
+#| "option, it is recommended to create a debian/source/patch-header file "
+#| "explaining how the Debian changes can be best reviewed, for example in "
+#| "the VCS that is used."
 msgid ""
 "Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
 "changes->I<version> for the name of the automatic patch generated during "
 "build. This option is particularly useful when the package is maintained in "
 "a VCS and a patch set can't reliably be generated. Instead the current diff "
-"with upstream should be stored in a single patch. When using this option, it "
-"is recommended to create a debian/source/patch-header file explaining how "
-"the Debian changes can be best reviewed, for example in the VCS that is used."
+"with upstream should be stored in a single patch. The option would be put in "
+"B<debian/source/local-options> and would be accompanied by a B<debian/source/"
+"local-patch-header> file explaining how the Debian changes can be best "
+"reviewed, for example in the VCS that is used."
 msgstr ""
 "Usa B<debian/patches/debian-changes> en lugar de B<debian/patches/debian-"
 "changes->I<version> para el nombre del parche generado automáticamente "
@@ -13906,13 +14786,13 @@
 "uso."
 
 #. type: TP
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 #, no-wrap
 msgid "B<--create-empty-orig>"
 msgstr "B<--create-empty-orig>"
 
 #. type: Plain text
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 msgid ""
 "Automatically create the main original tarball as empty if it's missing and "
 "if there are supplementary original tarballs. This option is meant to be "
@@ -13926,20 +14806,27 @@
 "«principales»."
 
 #. type: TP
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 #, no-wrap
 msgid "B<--unapply-patches>"
 msgstr "B<--unapply-patches>"
 
 #. type: Plain text
-#: dpkg-source.1:525
-msgid ""
-"Unapply the patches in the B<--after-build> hook. This is mainly useful when "
-"you build your package directly in a VCS that contains unpatched upstream "
-"source and where you want to keep the tree unpatched even after a package "
-"build. This option is usually put in B<debian/source/local-options> (it's "
-"not allowed in B<debian/source/options> so that all generated source "
-"packages have the same behaviour by default)."
+#: dpkg-source.1:541
+#, fuzzy
+#| msgid ""
+#| "Unapply the patches in the B<--after-build> hook. This is mainly useful "
+#| "when you build your package directly in a VCS that contains unpatched "
+#| "upstream source and where you want to keep the tree unpatched even after "
+#| "a package build. This option is usually put in B<debian/source/local-"
+#| "options> (it's not allowed in B<debian/source/options> so that all "
+#| "generated source packages have the same behaviour by default)."
+msgid ""
+"Unapply the patches in the B<--after-build> hook. You usually don't need "
+"this option as dpkg-source will automatically unapply the patches if it did "
+"apply them during B<--before-build>. This option is only allowed in B<debian/"
+"source/local-options> so that all generated source packages have the same "
+"behavior by default."
 msgstr ""
 "No aplica o elimina los cambios de los parches en el «hook» B<--after-"
 "build>. Esto es útil principalmente cuando construye su paquete directamente "
@@ -13951,7 +14838,7 @@
 "comportamiento por omisión)."
 
 #. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:548
 msgid ""
 "The process fails if an automatic patch has been generated. This option can "
 "be used to ensure that all changes were properly recorded in separate quilt "
@@ -13964,63 +14851,81 @@
 "opción no se permite en B<debian/source/options> pero se puede usar en "
 "B<debian/source/local-options>."
 
+#. type: TP
+#: dpkg-source.1:548
+#, fuzzy, no-wrap
+#| msgid "B<--no-act>"
+msgid "B<--auto-commit>"
+msgstr "B<--no-act>"
+
+#. type: Plain text
+#: dpkg-source.1:552
+msgid ""
+"The process doesn't fail if an automatic patch has been generated, instead "
+"it's immediately recorded in the quilt series."
+msgstr ""
+
 #. type: Plain text
-#: dpkg-source.1:535
+#: dpkg-source.1:555
 msgid "B<Extract options>"
 msgstr "B<Opciones de extracción>"
 
 #. type: Plain text
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 msgid "Skips extraction of the debian tarball on top of the upstream sources."
 msgstr ""
 "Omite la extracción del archivo tar «debian» sobre las fuente del autor "
 "original."
 
 #. type: TP
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 #, no-wrap
 msgid "B<--skip-patches>"
 msgstr "B<--skip-patches>"
 
 #. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:561
 msgid "Do not apply patches at the end of the extraction."
 msgstr "No aplica los parches al finalizar la extracción."
 
 #. type: SS
-#: dpkg-source.1:542
+#: dpkg-source.1:562
 #, no-wrap
 msgid "Format: 3.0 (custom)"
 msgstr "Formato: 3.0 (custom)"
 
 #. type: Plain text
-#: dpkg-source.1:545
+#: dpkg-source.1:565
+#, fuzzy
+#| msgid ""
+#| "This format is particular. It doesn't represent a real source package "
+#| "format but can be used to create source packages with arbitrary files."
 msgid ""
-"This format is particular. It doesn't represent a real source package format "
+"This format is special. It doesn't represent a real source package format "
 "but can be used to create source packages with arbitrary files."
 msgstr ""
 "Este formato es especial. No representa ningún formato de paquete fuente "
 "real, pero se puede usar para crear paquetes fuente con ficheros arbitrarios."
 
 #. type: Plain text
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 msgid ""
 "All non-option arguments are taken as files to integrate in the generated "
-"source package. They must exist and are preferrably in the current "
-"directory. At least one file must be given."
+"source package. They must exist and are preferably in the current directory. "
+"At least one file must be given."
 msgstr ""
 "Todos los argumentos que no son opciones se toman como ficheros a integrar "
 "en el paquete fuente generado. Deben existir, a ser posible en el directorio "
 "actual. Debe introducir al menos un fichero."
 
 #. type: TP
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 #, no-wrap
 msgid "B<--target-format=>I<value>"
 msgstr "B<--target-format=>I<valor>"
 
 #. type: Plain text
-#: dpkg-source.1:556
+#: dpkg-source.1:576
 msgid ""
 "B<Required>. Defines the real format of the generated source package.  The "
 "generated .dsc file will contain this value in its I<Format> field and not "
@@ -14031,18 +14936,18 @@
 "(custom)»."
 
 #. type: SS
-#: dpkg-source.1:557
+#: dpkg-source.1:577
 #, no-wrap
 msgid "Format: 3.0 (git)"
 msgstr "Format: 3.0 (git)"
 
 #. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:579
 msgid "This format is experimental."
 msgstr "Este formato es experimental."
 
 #. type: Plain text
-#: dpkg-source.1:564
+#: dpkg-source.1:584
 msgid ""
 "A source package in this format consists of a single bundle of a git "
 "repository B<.git> to hold the source of a package.  There may also be a B<."
@@ -14054,7 +14959,7 @@
 "superficial («shallow»)."
 
 #. type: Plain text
-#: dpkg-source.1:570
+#: dpkg-source.1:590
 msgid ""
 "The bundle is cloned as a git repository to the target directory.  If there "
 "is a gitshallow file, it is installed as `.git/shallow` inside the cloned "
@@ -14065,12 +14970,12 @@
 "repositorio git clonado."
 
 #. type: Plain text
-#: dpkg-source.1:575
+#: dpkg-source.1:595
 msgid ""
 "Note that by default the new repository will have the same branch checked "
 "out that was checked out in the original source. (Typically \"master\", but "
-"it could be anything.) Any other branches will be available, under as "
-"`remotes/origin/`"
+"it could be anything.) Any other branches will be available under `remotes/"
+"origin/`."
 msgstr ""
 "Tenga en cuenta que, por omisión, el nuevo repositorio tendrá un «checkout» "
 "de la misma rama de la que se realizó el «checkout» de la fuente original. "
@@ -14078,7 +14983,7 @@
 "demás ramas estarán disponibles bajo «remotes/origin/»."
 
 #. type: Plain text
-#: dpkg-source.1:580 dpkg-source.1:613
+#: dpkg-source.1:600 dpkg-source.1:633
 msgid ""
 "Before going any further, some checks are done to ensure that we don't have "
 "any non-ignored uncommitted changes."
@@ -14087,7 +14992,7 @@
 "queden cambios no ignorados a remitir al repositorio mediante «commit»."
 
 #. type: Plain text
-#: dpkg-source.1:584
+#: dpkg-source.1:604
 msgid ""
 "B<git-bundle>(1) is used to generate a bundle of the git repository.  By "
 "default, all branches and tags in the repository are included in the bundle."
@@ -14097,13 +15002,13 @@
 "el repositorio."
 
 #. type: TP
-#: dpkg-source.1:586
+#: dpkg-source.1:606
 #, no-wrap
 msgid "B<--git-ref=>I<ref>"
 msgstr "B<--git-ref=>I<ref>"
 
 #. type: Plain text
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 msgid ""
 "Allows specifying a git ref to include in the git bundle. Use disables the "
 "default behavior of including all branches and tags. May be specified "
@@ -14122,13 +15027,13 @@
 "ref=^private»."
 
 #. type: TP
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 #, no-wrap
 msgid "B<--git-depth=>I<number>"
 msgstr "B<--git-depth=>I<number>"
 
 #. type: Plain text
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 msgid ""
 "Creates a shallow clone with a history truncated to the specified number of "
 "revisions."
@@ -14137,13 +15042,13 @@
 "definido de revisiones."
 
 #. type: SS
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 #, no-wrap
 msgid "Format: 3.0 (bzr)"
 msgstr "Format: 3.0 (bzr)"
 
 #. type: Plain text
-#: dpkg-source.1:603
+#: dpkg-source.1:623
 msgid ""
 "This format is experimental. It generates a single tarball containing the "
 "bzr repository."
@@ -14152,7 +15057,7 @@
 "repositorio bzr."
 
 #. type: Plain text
-#: dpkg-source.1:608
+#: dpkg-source.1:628
 msgid ""
 "The tarball is unpacked and then bzr is used to checkout the current branch."
 msgstr ""
@@ -14160,7 +15065,7 @@
 "«checkout» de la rama actual."
 
 #. type: Plain text
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 msgid ""
 "Then the VCS specific part of the source directory is copied over to a "
 "temporary directory. Before this temporary directory is packed in a tarball, "
@@ -14172,19 +15077,19 @@
 "limpieza, para así ahorrar espacio."
 
 #. type: SH
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 #, no-wrap
 msgid "WARNINGS AND ERRORS"
 msgstr "AVISOS Y ERRORES"
 
 #. type: SS
-#: dpkg-source.1:618
+#: dpkg-source.1:638
 #, no-wrap
 msgid "no source format specified in debian/source/format"
 msgstr "no se definió ningún formato de fuentes en «debian/source/format»"
 
 #. type: Plain text
-#: dpkg-source.1:624
+#: dpkg-source.1:644
 msgid ""
 "The file B<debian/source/format> should always exist and indicate the "
 "desired source format. For backwards compatibility, format \"1.0\" is "
@@ -14199,7 +15104,7 @@
 "falle cuando no encuentre ese fichero."
 
 #. type: Plain text
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 msgid ""
 "The rationale is that format \"1.0\" is no longer the recommended format, "
 "you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
@@ -14214,13 +15119,13 @@
 "B<debian/source/format>."
 
 #. type: SS
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 #, no-wrap
 msgid "the diff modifies the following upstream files"
 msgstr "el diff modifica los siguientes ficheros de la fuente original"
 
 #. type: Plain text
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 msgid ""
 "When using source format \"1.0\" it is usually a bad idea to modify upstream "
 "files directly as the changes end up hidden and mostly undocumented in the ."
@@ -14236,13 +15141,13 @@
 "formato «3.0 (quilt)», que ofrece esto de forma nativa."
 
 #. type: SS
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 #, no-wrap
 msgid "cannot represent change to I<file>"
 msgstr "no se pueden representar los cambios al I<fichero>"
 
 #. type: Plain text
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 msgid ""
 "Changes to upstream sources are usually stored with patch files, but not all "
 "changes can be represented with patches: they can only alter the content of "
@@ -14258,13 +15163,13 @@
 "error."
 
 #. type: SS
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 #, no-wrap
 msgid "newly created empty file I<file> will not be represented in diff"
 msgstr "el fichero vacío I<fichero> recientemente creado no estará representado en el «diff»"
 
 #. type: Plain text
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 msgid ""
 "Empty files can't be created with patch files. Thus this change is not "
 "recorded in the source package and you are warned about it."
@@ -14273,19 +15178,19 @@
 "cambio no se registra en el paquete fuente, está usted avisado."
 
 #. type: SS
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 #, no-wrap
 msgid "executable mode I<perms> of I<file> will not be represented in diff"
 msgstr "los I<permisos> de modo de ejecución del I<fichero> no se representarán en el «diff»"
 
 #. type: SS
-#: dpkg-source.1:647
+#: dpkg-source.1:667
 #, no-wrap
 msgid "special mode I<perms> of I<file> will not be represented in diff"
 msgstr "los I<permisos> de modo especial del I<fichero> no se representarán en el «diff»"
 
 #. type: Plain text
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 msgid ""
 "Patch files do not record permissions of files and thus modified permissions "
 "are not stored in the source package. This warning reminds you of that fact."
@@ -14295,19 +15200,19 @@
 "de recordatorio."
 
 #. type: SH
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 #, no-wrap
 msgid "FILE FORMATS"
 msgstr "FORMATOS DE FICHERO"
 
 #. type: SS
-#: dpkg-source.1:652
+#: dpkg-source.1:672
 #, no-wrap
 msgid "debian/source/format"
 msgstr "debian/source/format"
 
 #. type: Plain text
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 msgid ""
 "This file contains on a single line the format that should be used to build "
 "the source package (possible formats are described above). No leading or "
@@ -14318,13 +15223,13 @@
 "anterior). No se permiten espacios vacíos al principio o final de la línea."
 
 #. type: SS
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 #, no-wrap
 msgid "debian/source/include-binaries"
 msgstr "debian/source/include-binaries"
 
 #. type: Plain text
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 msgid ""
 "This file contains a list of binary files (one per line) that should be "
 "included in the debian tarball. Leading and trailing spaces are stripped.  "
@@ -14337,13 +15242,13 @@
 "comentarios, y por tanto, se omiten. Se ignorarán líneas vacías."
 
 #. type: SS
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 #, no-wrap
 msgid "debian/source/options"
 msgstr "debian/source/options"
 
 #. type: Plain text
-#: dpkg-source.1:666
+#: dpkg-source.1:686
 msgid ""
 "This file contains a list of long options that should be automatically "
 "prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -14356,7 +15261,7 @@
 "compression> y B<--compression-level> son adecuadas con este fichero."
 
 #. type: Plain text
-#: dpkg-source.1:672
+#: dpkg-source.1:692
 msgid ""
 "Each option should be put on a separate line. Empty lines and lines starting "
 "with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -14372,14 +15277,22 @@
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:678
-#, no-wrap
+#: dpkg-source.1:700
+#, fuzzy, no-wrap
+#| msgid ""
+#| "  # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
+#| "  compression = \"bzip2\"\n"
+#| "  compression-level = 9\n"
+#| "  # use debian/patches/debian-changes as automatic patch\n"
+#| "  single-debian-patch\n"
 msgid ""
 "  # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
 "  compression = \"bzip2\"\n"
 "  compression-level = 9\n"
 "  # use debian/patches/debian-changes as automatic patch\n"
 "  single-debian-patch\n"
+"  # ignore changes on config.{sub,guess}\n"
+"  extend-diff-ignore = \"(^|/)(config.sub|config.guess)$\"\n"
 msgstr ""
 "  # permite a dpkg-source crear un debian.tar.bz2 con la máxima compresión\n"
 "  compression = \"bzip2\"\n"
@@ -14388,7 +15301,7 @@
 "  single-debian-patch\n"
 
 #. type: Plain text
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 msgid ""
 "Note: B<format> options are not accepted in this file, you should use "
 "B<debian/source/format> instead."
@@ -14397,13 +15310,13 @@
 "usar B<debian/source/format> en su lugar."
 
 #. type: SS
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 #, no-wrap
 msgid "debian/source/local-options"
 msgstr "debian/source/local-options"
 
 #. type: Plain text
-#: dpkg-source.1:686
+#: dpkg-source.1:708
 msgid ""
 "Exactly like B<debian/source/options> except that the file is not included "
 "in the generated source package. It can be useful to store a preference tied "
@@ -14416,29 +15329,41 @@
 "versiones dónde el paquete es mantenido."
 
 #. type: SS
-#: dpkg-source.1:686
+#: dpkg-source.1:708
+#, fuzzy, no-wrap
+#| msgid "debian/source/patch-header"
+msgid "debian/source/local-patch-header"
+msgstr "debian/source/patch-header"
+
+#. type: SS
+#: dpkg-source.1:709
 #, no-wrap
 msgid "debian/source/patch-header"
 msgstr "debian/source/patch-header"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:689
+#: dpkg-source.1:713
+#, fuzzy
+#| msgid ""
+#| "Free form text that is put on top of the automatic patch generated in "
+#| "formats \"2.0\" or \"3.0 (quilt)\"."
 msgid ""
 "Free form text that is put on top of the automatic patch generated in "
-"formats \"2.0\" or \"3.0 (quilt)\"."
+"formats \"2.0\" or \"3.0 (quilt)\". B<local-patch-header> is not included in "
+"the generated source package while B<patch-header> is."
 msgstr ""
 "Texto con formato libre que se inserta al inicio del parche automático con "
 "los formatos «2.0» o «3.0 quilt)»."
 
 #. type: SS
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 #, no-wrap
 msgid "debian/patches/series"
 msgstr "debian/patches/series"
 
 #. type: Plain text
-#: dpkg-source.1:698
+#: dpkg-source.1:722
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
@@ -14460,34 +15385,37 @@
 "comentario hasta el final de la línea)."
 
 #. type: Plain text
-#: dpkg-source.1:705
+#: dpkg-source.1:729
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 
+#. type: Plain text
+#: dpkg-source.1:736
+#, fuzzy
+#| msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2008-2011 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
+
 #. type: TH
 #: dpkg-split.1:2
 #, no-wrap
 msgid "dpkg-split"
 msgstr "dpkg-split"
 
-#. type: TH
-#: dpkg-split.1:2 dpkg-statoverride.8:1
-#, no-wrap
-msgid "2009-06-26"
-msgstr "26 de Junio de 2009"
-
 #. type: Plain text
 #: dpkg-split.1:5
 msgid "dpkg-split - Debian package archive split/join tool"
 msgstr "dpkg-split - Herramienta para separar y unir paquetes Debian"
 
 #. type: Plain text
-#: dpkg-split.1:10
-msgid "B<dpkg-split> [I<options>] I<command>"
+#: dpkg-split.1:9
+#, fuzzy
+#| msgid "B<dpkg-split> [I<options>] I<command>"
+msgid "B<dpkg-split> [I<option>...] I<command>"
 msgstr "B<dpkg-split> [I<opciones>] I<orden>"
 
 #. type: Plain text
-#: dpkg-split.1:16
+#: dpkg-split.1:15
 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 "
@@ -14498,7 +15426,7 @@
 "dispositivos de poca capacidad, como disquetes."
 
 #. type: Plain text
-#: dpkg-split.1:20
+#: dpkg-split.1:19
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
@@ -14507,7 +15435,7 @@
 "info>."
 
 #. type: Plain text
-#: dpkg-split.1:28
+#: dpkg-split.1:27
 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 "
@@ -14520,7 +15448,7 @@
 "discard> permiten administrar la cola."
 
 #. type: Plain text
-#: dpkg-split.1:31
+#: dpkg-split.1:30
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
@@ -14529,18 +15457,18 @@
 "informativos por la salida estándar, que se pueden ignorar sin ningún riesgo."
 
 #. type: TP
-#: dpkg-split.1:33
+#: dpkg-split.1:32
 #, no-wrap
 msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
 msgstr "B<-s>, B<--split> I<paquete-completo> [I<prefix>]"
 
 #. type: Plain text
-#: dpkg-split.1:36
+#: dpkg-split.1:35
 msgid "Splits a single Debian binary package into several parts."
 msgstr "Divide un único paquete binario de Debian en varias partes."
 
 #. type: Plain text
-#: dpkg-split.1:44
+#: dpkg-split.1:43
 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 "
@@ -14551,7 +15479,7 @@
 "(ambos en decimal)."
 
 #. type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 msgid ""
 "If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
 "including directory, with any trailing B<.deb> removed."
@@ -14561,13 +15489,13 @@
 "deb>."
 
 #. type: TP
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 #, no-wrap
 msgid "B<-j>, B<--join> I<part>..."
 msgstr "B<-j>, B<--join> I<parte>..."
 
 #. type: Plain text
-#: dpkg-split.1:56
+#: dpkg-split.1:55
 msgid ""
 "Joins the parts of a package file together, reassembling the original file "
 "as it was before it was split."
@@ -14576,7 +15504,7 @@
 "originalmente."
 
 #. type: Plain text
-#: dpkg-split.1:60
+#: dpkg-split.1:59
 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 "
@@ -14587,7 +15515,7 @@
 "no necesariamente en orden."
 
 #. type: Plain text
-#: dpkg-split.1:65
+#: dpkg-split.1:64
 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 "
@@ -14598,25 +15526,30 @@
 "misma invocación de B<dpkg-split --split>."
 
 #. type: Plain text
-#: dpkg-split.1:67
+#: dpkg-split.1:66
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 "El nombre de las partes carece de importancia para el proceso de unión."
 
 #. type: Plain text
-#: dpkg-split.1:70
-msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
+#: dpkg-split.1:69
+#, fuzzy
+#| msgid ""
+#| "By default the output file is called I<package>B<->I<version>B<.deb>."
+msgid ""
+"By default the output file is called I<package>B<_>I<version>B<_>I<arch>B<."
+"deb>."
 msgstr ""
 "Por omisión el fichero resultante se llama I<paquete>B<->I<versión>B<.deb>."
 
 #. type: TP
-#: dpkg-split.1:71
+#: dpkg-split.1:70
 #, no-wrap
 msgid "B<-I>, B<--info> I<part>..."
 msgstr "B<-I>, B<--info> I<parte>..."
 
 #. type: Plain text
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -14628,20 +15561,20 @@
 "estándar)."
 
 #. type: TP
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 #, no-wrap
 msgid "B<-a>, B<--auto -o> I<complete-output part>"
 msgstr "B<-a>, B<--auto -o> I<salida-completa parte>"
 
 #. type: Plain text
-#: dpkg-split.1:79
+#: dpkg-split.1:78
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 "Posiciona las partes en la cola automáticamente, y une nuevamente el "
 "paquete, si es posible."
 
 #. type: Plain text
-#: dpkg-split.1:84
+#: dpkg-split.1:83
 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."
@@ -14651,7 +15584,7 @@
 "paquete."
 
 #. type: Plain text
-#: dpkg-split.1:91
+#: dpkg-split.1:90
 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 "
@@ -14662,7 +15595,7 @@
 "no existe, aunque esto no es un error)."
 
 #. type: Plain text
-#: dpkg-split.1:97
+#: dpkg-split.1:96
 msgid ""
 "If not then the I<part> is copied into the queue and I<complete-output> is "
 "not created."
@@ -14671,17 +15604,23 @@
 "completa>."
 
 #. type: Plain text
-#: dpkg-split.1:104
+#: dpkg-split.1:103
+#, 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."
 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."
+"with status B<1>; if some other trouble occurs then it will exit with status "
+"B<2>."
 msgstr ""
 "Si la I<parte> no es una parte del paquete binario, 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-split.1:111
+#: dpkg-split.1:110
 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 "
@@ -14692,18 +15631,18 @@
 "sabría que fichero esperar)."
 
 #. type: TP
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 #, no-wrap
 msgid "B<-l>, B<--listq>"
 msgstr "B<-l>, B<--listq>"
 
 #. type: Plain text
-#: dpkg-split.1:114
+#: dpkg-split.1:113
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr "Lista los contenidos de la cola de paquetes cuyas partes unir."
 
 #. type: Plain text
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 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 "
@@ -14714,13 +15653,13 @@
 "guardados en ésta."
 
 #. type: TP
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 #, no-wrap
 msgid "B<-d>, B<--discard> [I<package>...]"
 msgstr "B<-d>, B<--discard> [I<paquete>...]"
 
 #. type: Plain text
-#: dpkg-split.1:122
+#: dpkg-split.1:121
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
@@ -14729,7 +15668,7 @@
 "paquete para su unión con otras."
 
 #. type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:126
 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."
@@ -14738,13 +15677,13 @@
 "especifica alguno sólo se eliminan las partes de los paquetes relevantes."
 
 #. type: TP
-#: dpkg-split.1:135
+#: dpkg-split.1:134
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr "B<--depotdir>I< directorio>"
 
 #. type: Plain text
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 msgid ""
 "Specifies an alternative directory for the queue of parts awaiting automatic "
 "reassembly. The default is B</var/lib/dpkg>."
@@ -14753,13 +15692,13 @@
 "cola esperando para ser unidas. Por omisión es B</var/lib/dpkg>."
 
 #. type: TP
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 #, no-wrap
 msgid "B<-S>, B<--partsize> I<kibibytes>"
 msgstr "B<-S>, B<--partsize> I<kibibytes>"
 
 #. type: Plain text
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 msgid ""
 "Specifies the maximum part size when splitting, in kibibytes (1024 bytes). "
 "The default is 450 KiB."
@@ -14768,18 +15707,18 @@
 "omisión es 450Kb."
 
 #. type: TP
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 #, no-wrap
 msgid "B<-o>, B<--output> I<complete-output>"
 msgstr "B<-o>, B<--output> I<complete-output>"
 
 #. type: Plain text
-#: dpkg-split.1:147
+#: dpkg-split.1:146
 msgid "Specifies the output file name for a reassembly."
 msgstr "Especifica el nombre del fichero generado por la unión de las partes."
 
 #. type: Plain text
-#: dpkg-split.1:152
+#: dpkg-split.1:151
 msgid ""
 "This overrides the default for a manual reassembly (B<--join>)  and is "
 "mandatory for an automatic queue-or-reassemble (B<--auto>)."
@@ -14788,13 +15727,13 @@
 "obligatorio con el modo automático (B<--auto>)."
 
 #. type: TP
-#: dpkg-split.1:152
+#: dpkg-split.1:151
 #, no-wrap
 msgid "B<-Q>, B<--npquiet>"
 msgstr "B<-Q>, B<--npquiet>"
 
 #. type: Plain text
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 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 "
@@ -14807,13 +15746,13 @@
 "separar y unir paquetes sin producir mensajes poco informativos."
 
 #. type: TP
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 #, no-wrap
 msgid "B<--msdos>"
 msgstr "B<--msdos>"
 
 #. type: Plain text
-#: dpkg-split.1:168
+#: dpkg-split.1:167
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
@@ -14821,7 +15760,7 @@
 "sean compatibles con msdos."
 
 #. type: Plain text
-#: dpkg-split.1:174
+#: dpkg-split.1:173
 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 "
@@ -14833,7 +15772,7 @@
 "resto de caracteres."
 
 #. type: Plain text
-#: dpkg-split.1:179
+#: dpkg-split.1:178
 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."
@@ -14843,46 +15782,56 @@
 
 #. type: Plain text
 #: dpkg-split.1:186
+#, 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."
 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."
+"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 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
-#: dpkg-split.1:192
+#: dpkg-split.1:193
+#, fuzzy
+#| msgid ""
+#| "An exit status of 1 occurs only with B<--auto> and indicates that the "
+#| "I<part> file was not a binary package part."
 msgid ""
-"An exit status of 1 occurs only with B<--auto> and indicates that the "
-"I<part> file was not a binary package part."
+"Only occurs with B<--auto> and indicates that the I<part> file was not a "
+"binary package part."
 msgstr ""
 "Se devuelve un estado de salida 1 sólo al usar la opción B<--auto>, e indica "
 "que la I<parte> no era parte de un paquete binario."
 
+#. type: TP
+#: dpkg-split.1:193 start-stop-daemon.8:275 update-alternatives.8:378
+#, no-wrap
+msgid "B<2>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-split.1:196
-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."
+#: dpkg-split.1:198
+#, 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."
+msgid ""
+"Some kind of trouble happened, 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 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 dañado, un uso incorrecto del programa o algún otro problema."
 
 #. type: Plain text
-#: dpkg-split.1:201
-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."
-
-#. type: Plain text
-#: dpkg-split.1:204
+#: dpkg-split.1:202
 msgid ""
 "Full details of the packages in the queue are impossible to get without "
 "digging into the queue directory yourself."
@@ -14891,7 +15840,7 @@
 "sin investigar directamente la cola."
 
 #. type: Plain text
-#: dpkg-split.1:207
+#: dpkg-split.1:205
 msgid ""
 "There is no easy way to test whether a file that may be a binary package "
 "part is one."
@@ -14899,32 +15848,21 @@
 "No existe una manera sencilla de comprobar si el fichero que puede ser parte "
 "de un paquete binario es realmente uno."
 
-#. type: Plain text
-#: dpkg-split.1:211
-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 éste no esta "
-"presente en las partes generadas."
-
 #. type: TP
-#: dpkg-split.1:213
+#: dpkg-split.1:207
 #, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "I</var/lib/dpkg/parts>"
 
 #. type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:211
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
 "El directorio por omisión donde las partes esperan para la unión automática."
 
 #. type: Plain text
-#: dpkg-split.1:222
+#: dpkg-split.1:216
 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 "
@@ -14936,7 +15874,7 @@
 "del fichero."
 
 #. type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:222
 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)."
 
@@ -14958,12 +15896,14 @@
 msgstr "dpkg-statoverride - Sustitución del propietario y modo de ficheros"
 
 #. type: Plain text
-#: dpkg-statoverride.8:9
-msgid "B<dpkg-statoverride> [I<options>] I<command>"
+#: dpkg-statoverride.8:8
+#, fuzzy
+#| msgid "B<dpkg-statoverride> [I<options>] I<command>"
+msgid "B<dpkg-statoverride> [I<option>...] I<command>"
 msgstr "B<dpkg-statoverride> [I<opciones>] I<orden>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:19
+#: dpkg-statoverride.8:18
 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' "
@@ -14981,7 +15921,7 @@
 "sólo sean ejecutables por un grupo en concreto."
 
 #. type: Plain text
-#: dpkg-statoverride.8:23
+#: dpkg-statoverride.8:22
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
@@ -14991,13 +15931,13 @@
 "excepciones."
 
 #. type: TP
-#: dpkg-statoverride.8:25
+#: dpkg-statoverride.8:24
 #, no-wrap
 msgid "B<--add>I< user group mode file>"
 msgstr "B<--add>I< usuario grupo modo fichero>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:33
+#: dpkg-statoverride.8:32
 msgid ""
 "Add an override for I<file>. I<file> does not need to exist when this "
 "command is used; the override will be stored and used later.  Users and "
@@ -15013,7 +15953,7 @@
 "sistema octal."
 
 #. type: Plain text
-#: dpkg-statoverride.8:36
+#: dpkg-statoverride.8:35
 msgid ""
 "If --update is specified and I<file> exists, it is immediately set to the "
 "new owner and mode."
@@ -15022,7 +15962,7 @@
 "inmediatamente el nuevo propietario y modo."
 
 #. type: Plain text
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 msgid ""
 "Remove an override for I<file>, the status of I<file> is left unchanged by "
 "this command."
@@ -15031,13 +15971,13 @@
 "del B<fichero>."
 
 #. type: TP
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 #, no-wrap
 msgid "B<--list> [I<glob-pattern>]"
 msgstr "B<--list> [I<comodín>]"
 
 #. type: Plain text
-#: dpkg-statoverride.8:45
+#: 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 "
@@ -15049,7 +15989,7 @@
 "código de salida de 1."
 
 #. type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:56
 msgid ""
 "Change the I<directory> of the dpkg database where the statoverride file is "
 "also stored. Defaults to I</var/lib/dpkg>."
@@ -15059,13 +15999,13 @@
 "var/lib/dpkg»."
 
 #. type: TP
-#: dpkg-statoverride.8:57 update-alternatives.8:337
+#: dpkg-statoverride.8:56 update-alternatives.8:336
 #, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:61
+#: 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."
@@ -15074,13 +16014,13 @@
 "necesario para poder modificar una sustitución existente."
 
 #. type: TP
-#: dpkg-statoverride.8:61
+#: dpkg-statoverride.8:60
 #, no-wrap
 msgid "B<--update>"
 msgstr "B<--update>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:65
+#: dpkg-statoverride.8:64
 msgid ""
 "Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
@@ -15088,18 +16028,18 @@
 "existir."
 
 #. type: Plain text
-#: dpkg-statoverride.8:68
+#: dpkg-statoverride.8:67
 msgid "Be less verbose about what we do."
 msgstr "Reduce el nivel de información de las acciones tomadas."
 
 #. type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:75
 #, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr "I</var/lib/dpkg/statoverride>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:80
 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 "
@@ -15110,7 +16050,7 @@
 "otros ficheros importantes para dpkg como «status» o «available»."
 
 #. type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:83
 msgid ""
 "Note: B<dpkg-statoverride> preserves the old copy of this file, with "
 "extension \"-old\", before replacing it with the new one."
@@ -15181,11 +16121,17 @@
 
 #. type: Plain text
 #: dpkg-trigger.1:31
+#, fuzzy
+#| msgid ""
+#| "Check if the running B<dpkg> supports triggers (usually called from a "
+#| "postinst). Will exit 0 if a triggers-capable B<dpkg> has run, or 1 with "
+#| "an error message to stderr if not. Normally, however, it is better just "
+#| "to activate the desired trigger with B<dpkg-trigger>."
 msgid ""
 "Check if the running B<dpkg> supports triggers (usually called from a "
-"postinst). Will exit 0 if a triggers-capable B<dpkg> has run, or 1 with an "
-"error message to stderr if not. Normally, however, it is better just to "
-"activate the desired trigger with B<dpkg-trigger>."
+"postinst). Will exit B<0> if a triggers-capable B<dpkg> has run, or B<1> "
+"with an error message to stderr if not. Normally, however, it is better just "
+"to activate the desired trigger with B<dpkg-trigger>."
 msgstr ""
 "Revisa si la versión de B<dpkg> en ejecución es compatible con disparadores "
 "(habitualmente invocados mediante una post-instalación). Cierra con 0 si "
@@ -15201,9 +16147,15 @@
 
 #. type: Plain text
 #: dpkg-trigger.1:49
+#, fuzzy
+#| msgid ""
+#| "Override trigger awaiter (normally set by B<dpkg> through the "
+#| "DPKG_MAINTSCRIPT_PACKAGE environment variable of the maintainer scripts, "
+#| "naming the package to which the script belongs, and this will be used by "
+#| "default)."
 msgid ""
 "Override trigger awaiter (normally set by B<dpkg> through the "
-"DPKG_MAINTSCRIPT_PACKAGE environment variable of the maintainer scripts, "
+"B<DPKG_MAINTSCRIPT_PACKAGE> environment variable of the maintainer scripts, "
 "naming the package to which the script belongs, and this will be used by "
 "default)."
 msgstr ""
@@ -15244,7 +16196,7 @@
 msgstr "Realiza un simulacro sin cambios en el sistema."
 
 #. type: Plain text
-#: dpkg-trigger.1:68
+#: dpkg-trigger.1:69
 msgid ""
 "B<dpkg>(1), B<deb-triggers>(5), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
 msgstr ""
@@ -15256,12 +16208,6 @@
 msgid "dpkg-vendor"
 msgstr "dpkg-vendor"
 
-#. type: TH
-#: dpkg-vendor.1:1
-#, no-wrap
-msgid "2009-05-10"
-msgstr "10 de Abril de 2009"
-
 #. type: Plain text
 #: dpkg-vendor.1:4
 msgid "dpkg-vendor - queries information about distribution vendors"
@@ -15292,8 +16238,12 @@
 
 #. type: Plain text
 #: dpkg-vendor.1:19
+#, fuzzy
+#| msgid ""
+#| "Exits with 0 if the current vendor is I<vendor>. Otherwise exits with non-"
+#| "zero."
 msgid ""
-"Exits with 0 if the current vendor is I<vendor>. Otherwise exits with non-"
+"Exits with B<0> if the current vendor is I<vendor>. Otherwise exits with non-"
 "zero."
 msgstr ""
 "Finaliza con 0 si I<proveedor> es el proveedor actual. De no ser así, "
@@ -15307,8 +16257,13 @@
 
 #. type: Plain text
 #: dpkg-vendor.1:24
+#, fuzzy
+#| msgid ""
+#| "Exits with 0 if the current vendor distribution is a derivative of "
+#| "I<vendor>, otherwise exits with non-zero. It uses the \"Parent\" field to "
+#| "browse all ancestors of the current vendor."
 msgid ""
-"Exits with 0 if the current vendor distribution is a derivative of "
+"Exits with B<0> if the current vendor distribution is a derivative of "
 "I<vendor>, otherwise exits with non-zero. It uses the \"Parent\" field to "
 "browse all ancestors of the current vendor."
 msgstr ""
@@ -15339,9 +16294,13 @@
 
 #. type: Plain text
 #: dpkg-vendor.1:41
+#, fuzzy
+#| msgid ""
+#| "Assumes the current vendor is I<vendor> instead of discovering it with "
+#| "the DEB_VENDOR environment variable or B</etc/dpkg/origins/default>."
 msgid ""
 "Assumes the current vendor is I<vendor> instead of discovering it with the "
-"DEB_VENDOR environment variable or B</etc/dpkg/origins/default>."
+"B<DEB_VENDOR> environment variable or B</etc/dpkg/origins/default>."
 msgstr ""
 "Supone que el proveedor actual es I<proveedor>, en lugar de definirlo con la "
 "variable de entorno «DEB_VENDOR» o B</etc/dpkg/origins/default>."
@@ -15362,7 +16321,7 @@
 "se definirá leyendo B</etc/dpkg/origins/default>."
 
 #. type: Plain text
-#: dpkg-vendor.1:50 update-alternatives.8:497
+#: dpkg-vendor.1:50 update-alternatives.8:498
 msgid "Copyright \\(co 2009 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2009 Rapha\\[:e]l Hertzog"
 
@@ -15378,20 +16337,14 @@
 msgstr "dselect - Interfaz para la gestión de paquetes de Debian"
 
 #. type: Plain text
-#: dselect.1:16
-msgid ""
-"B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--version>] "
-"[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 ""
-"B<dselect> [B<--admindir> I<E<lt>directorioE<gt>>] [B<--help>] [B<--"
-"version>] [B<--expert>] [B<--debug>|B<-D>I<E<lt>ficheroE<gt>>] "
-"[I<E<lt>acciónE<gt>>] [B<--colour>|B<--color> I<parte-pantalla:>[I<primer-"
-"plano>],[I<fondo>][I<:attr>[I<+attr+..>]]]"
+#: dselect.1:8
+#, fuzzy
+#| msgid "B<dpkg> [I<options>] I<action>"
+msgid "B<dselect> [I<option>...] [I<action>]"
+msgstr "B<dpkg> [I<opciones>] I<acción>"
 
 #. type: Plain text
-#: dselect.1:25
+#: dselect.1:17
 #, no-wrap
 msgid ""
 "B<dselect>\n"
@@ -15412,7 +16365,7 @@
 " - Instalar paquetes nuevos o actualizarlos a nuevas versiones\n"
 
 #. type: Plain text
-#: dselect.1:37
+#: dselect.1:29
 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 "
@@ -15436,11 +16389,18 @@
 "I<apt>, proporcionado por el paquete B<apt>."
 
 #. type: Plain text
-#: dselect.1:43
+#: dselect.1:35
+#, 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."
 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 "
+"argument, then that action is started immediately. Several command line "
 "parameters are still available to modify the running behaviour of B<dselect> "
 "or show additional information about the program."
 msgstr ""
@@ -15451,12 +16411,20 @@
 "información adicional acerca del programa."
 
 #. type: Plain text
-#: dselect.1:51
+#: dselect.1:43
+#, fuzzy
+#| msgid ""
+#| "All options can be specified both on the commandline and in the "
+#| "B<dselect> configuration file I</etc/dpkg/dselect.cfg> or the files on "
+#| "the configuration directory I</etc/dpkg/dpkg.cfg.d/>. 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<#>)."
 msgid ""
-"All options can be specified both on the commandline and in the B<dselect> "
+"All options can be specified both on the command line and in the B<dselect> "
 "configuration file I</etc/dpkg/dselect.cfg> or the files on the "
-"configuration directory I</etc/dpkg/dpkg.cfg.d/>. Each line in the "
-"configuration file is either an option (exactly the same as the commandline "
+"configuration directory I</etc/dpkg/dselect.cfg.d/>. 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 se pueden definir en la línea de órdenes y en el fichero "
@@ -15465,14 +16433,8 @@
 "misma que en la línea de órdenes pero sin guiones precedentes) o un "
 "comentario (si este comienza con un B<#>)."
 
-#. type: TP
-#: dselect.1:52
-#, no-wrap
-msgid "B<--admindir>I< E<lt>directoryE<gt>>"
-msgstr "B<--admindir>I< E<lt>directorioE<gt>>"
-
 #. type: Plain text
-#: dselect.1:57
+#: dselect.1:49
 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 "
@@ -15483,26 +16445,30 @@
 "normales no se  debería cambiar."
 
 #. type: TP
-#: dselect.1:57
-#, no-wrap
-msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
+#: dselect.1:49
+#, fuzzy, no-wrap
+#| msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
+msgid "B<--debug>I< file >|I< >B<-D>I<file>"
 msgstr "B<--debug>I< E<lt>ficheroE<gt> >|I< >B<-D>I<E<lt>ficheroE<gt>>"
 
 #. type: Plain text
-#: dselect.1:60
-msgid "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+#: dselect.1:52
+#, fuzzy
+#| msgid ""
+#| "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+msgid "Turn on debugging. Debugging information is sent to I<file>."
 msgstr ""
 "Activa la depuración de fallos. Esta información se envía al "
 "I<E<lt>ficheroE<gt>>."
 
 #. type: TP
-#: dselect.1:60
+#: dselect.1:52
 #, no-wrap
 msgid "B<--expert>"
 msgstr "B<--expert>"
 
 #. type: Plain text
-#: dselect.1:64
+#: dselect.1:56
 msgid ""
 "Turns on expert mode, i.e. doesn't display possibly annoying help messages."
 msgstr ""
@@ -15510,13 +16476,13 @@
 "posiblemente molestos."
 
 #. type: TP
-#: dselect.1:64
+#: dselect.1:56
 #, no-wrap
 msgid "B<--colour>|B<--color> I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]"
 msgstr "B<--colour>|B<--color> I<parte-de-pantalla:>[I<primer-plano>],[I<fondo>][I<:attr>[I<+attr+..>]]"
 
 #. type: Plain text
-#: dselect.1:71
+#: dselect.1:63
 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>). "
@@ -15530,57 +16496,57 @@
 "(desde arriba hacia abajo) son:"
 
 #. type: TP
-#: dselect.1:72
+#: dselect.1:64
 #, no-wrap
 msgid "B<title>"
 msgstr "B<title>"
 
 #. type: Plain text
-#: dselect.1:75
+#: dselect.1:67
 msgid "The screen title."
 msgstr "El título de la pantalla."
 
 #. type: TP
-#: dselect.1:75
+#: dselect.1:67
 #, no-wrap
 msgid "B<listhead>"
 msgstr "B<listhead>"
 
 #. type: Plain text
-#: dselect.1:78
+#: dselect.1:70
 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
+#: dselect.1:70
 #, no-wrap
 msgid "B<list>"
 msgstr "B<list>"
 
 #. type: Plain text
-#: dselect.1:81
+#: dselect.1:73
 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
+#: dselect.1:73
 #, no-wrap
 msgid "B<listsel>"
 msgstr "B<listsel>"
 
 #. type: Plain text
-#: dselect.1:84
+#: dselect.1:76
 msgid "The selected item in the list."
 msgstr "El elemento seleccionado en la lista."
 
 #. type: TP
-#: dselect.1:84
+#: dselect.1:76
 #, no-wrap
 msgid "B<pkgstate>"
 msgstr "B<pkgstate>"
 
 #. type: Plain text
-#: dselect.1:88
+#: dselect.1:80
 msgid ""
 "In the list of packages, the text indicating the current state of each "
 "package."
@@ -15589,13 +16555,13 @@
 "paquete."
 
 #. type: TP
-#: dselect.1:88
+#: dselect.1:80
 #, no-wrap
 msgid "B<pkgstatesel>"
 msgstr "B<pkgstatesel>"
 
 #. type: Plain text
-#: dselect.1:92
+#: dselect.1:84
 msgid ""
 "In the list of packages, the text indicating the current state of the "
 "currently selected package."
@@ -15604,75 +16570,75 @@
 "seleccionado."
 
 #. type: TP
-#: dselect.1:92
+#: dselect.1:84
 #, no-wrap
 msgid "B<infohead>"
 msgstr "B<infohead>"
 
 #. type: Plain text
-#: dselect.1:95
+#: dselect.1:87
 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
+#: dselect.1:87
 #, no-wrap
 msgid "B<infodesc>"
 msgstr "B<infodesc>"
 
 #. type: Plain text
-#: dselect.1:98
+#: dselect.1:90
 msgid "The package's short description."
 msgstr "La descripción corta del paquete."
 
 #. type: TP
-#: dselect.1:98
+#: dselect.1:90
 #, no-wrap
 msgid "B<info>"
 msgstr "B<info>"
 
 #. type: Plain text
-#: dselect.1:101
+#: dselect.1:93
 msgid "Used to display package info such as the package's description."
 msgstr ""
 "Se usa para mostrar la información del paquete así como su descripción."
 
 #. type: TP
-#: dselect.1:101
+#: dselect.1:93
 #, no-wrap
 msgid "B<infofoot>"
 msgstr "B<infofoot>"
 
 #. type: Plain text
-#: dselect.1:104
+#: dselect.1:96
 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
+#: dselect.1:96
 #, no-wrap
 msgid "B<query>"
 msgstr "B<query>"
 
 #. type: Plain text
-#: dselect.1:107
+#: dselect.1:99
 msgid "Used to display query lines"
 msgstr "Se usa para mostrar líneas de consulta."
 
 #. type: TP
-#: dselect.1:107
+#: dselect.1:99
 #, no-wrap
 msgid "B<helpscreen>"
 msgstr "B<helpscreen>"
 
 #. type: Plain text
-#: dselect.1:110
+#: dselect.1:102
 msgid "Color of help screens."
 msgstr "Color de las pantallas de ayuda."
 
 #. type: Plain text
-#: dselect.1:115
+#: dselect.1:107
 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, "
@@ -15684,7 +16650,7 @@
 "estándar de colores de la biblioteca curses."
 
 #. type: Plain text
-#: dselect.1:121
+#: dselect.1:113
 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 "
@@ -15699,50 +16665,55 @@
 "underline, reverse, blink, bright, dim, bold."
 
 #. type: Plain text
-#: dselect.1:124
+#: dselect.1:116
 msgid "Print a brief help text and exit successfully."
 msgstr "Muestra un breve texto de ayuda y cierra con éxito."
 
 #. type: Plain text
-#: dselect.1:127
+#: dselect.1:119
 msgid "Print version information and exit successfully."
 msgstr "Muestra la información de versión del programa y cierra con éxito."
 
-#. type: SH
-#: dselect.1:128
-#, no-wrap
-msgid "USAGE"
-msgstr "MODO DE USO"
-
 #. type: Plain text
-#: dselect.1:133
+#: dselect.1:126
+#, fuzzy
+#| msgid ""
+#| "When B<dselect> is started interactively, it prompts the user with a menu "
+#| "of available actions:"
 msgid ""
-"When B<dselect> is started interactively, it prompts the user with a menu of "
-"available actions:"
+"When B<dselect> is started it can perform the following actions, either "
+"directly if it was specified on the command line or by prompting the user "
+"with a menu of available actions if running interactively:"
 msgstr ""
 "Cuando B<dselect> se inicia interactivamente muestra al usuario un menú con "
 "las siguientes opciones disponibles:"
 
 #. type: SS
-#: dselect.1:133
+#: dselect.1:126
 #, no-wrap
 msgid "access"
 msgstr "access"
 
 #. type: Plain text
-#: dselect.1:135
+#: dselect.1:128
 msgid "Choose and configure an access method to access package repositories."
 msgstr ""
 "Selección y configuración de un método de acceso para acceder a los "
 "repositorios de paquetes."
 
 #. type: Plain text
-#: dselect.1:141
-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."
+#: dselect.1:134
+#, 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."
+msgid ""
+"By default, B<dselect> provides several methods such as I<cdrom>, "
+"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount>, "
+"I<floppy> or I<ftp>, but other packages may provide additional methods, eg. "
+"the I<apt> access method provided by the B<apt> package."
 msgstr ""
 "Por omisión, B<dselect> ofrece varios métodos tales como I<floppy> "
 "(disquete), I<harddisk> (disco duro) o I<cdrom>, aunque otros paquetes "
@@ -15751,23 +16722,23 @@
 "paquete B<dpkg-multicd>."
 
 #. type: Plain text
-#: dselect.1:143
+#: dselect.1:136
 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:144
+#: dselect.1:137
 #, no-wrap
 msgid "update"
 msgstr "update"
 
 #. type: Plain text
-#: dselect.1:146
+#: dselect.1:139
 msgid "Refresh the available packages database."
 msgstr "Actualiza la lista disponible de paquetes."
 
 #. type: Plain text
-#: dselect.1:153
+#: dselect.1:146
 msgid ""
 "Retrieves a list of available package versions from the package repository, "
 "configured for the current access method, and update the dpkg database. The "
@@ -15783,7 +16754,7 @@
 "programa B<dpkg-scanpackages(1)>."
 
 #. type: Plain text
-#: dselect.1:156
+#: dselect.1:149
 msgid ""
 "Details of the update action depend on the access method's implementation.  "
 "Normally the process is straightforward and requires no user interaction."
@@ -15793,19 +16764,19 @@
 "intervernción del usuario."
 
 #. type: SS
-#: dselect.1:157
+#: dselect.1:150
 #, no-wrap
 msgid "select"
 msgstr "select"
 
 #. type: Plain text
-#: dselect.1:159
+#: dselect.1:152
 msgid "View or manage package selections and dependencies."
 msgstr ""
 "Examina o gestiona la selección de paquetes y sus respectivas dependencias."
 
 #. type: Plain text
-#: dselect.1:165
+#: dselect.1:158
 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 "
@@ -15821,7 +16792,7 @@
 "dependencia o que entran en conflicto."
 
 #. type: Plain text
-#: dselect.1:172
+#: dselect.1:165
 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 "
@@ -15839,7 +16810,7 @@
 "conflictos sin resolver."
 
 #. type: Plain text
-#: dselect.1:175
+#: dselect.1:168
 msgid ""
 "The use of the interactive package selections management screen is explained "
 "in more detail below."
@@ -15848,18 +16819,18 @@
 "de selección de paquetes."
 
 #. type: SS
-#: dselect.1:176
+#: dselect.1:169
 #, no-wrap
 msgid "install"
 msgstr "install"
 
 #. type: Plain text
-#: dselect.1:178
+#: dselect.1:171
 msgid "Installs selected packages."
 msgstr "Instala los paquetes seleccionados."
 
 #. type: Plain text
-#: dselect.1:184
+#: dselect.1:177
 msgid ""
 "The configured access method will fetch installable or upgradable packages "
 "from the relevant repositories and install these using B<dpkg>.  Depending "
@@ -15875,7 +16846,7 @@
 "eliminación."
 
 #. type: Plain text
-#: dselect.1:192
+#: dselect.1:185
 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 "
@@ -15896,7 +16867,7 @@
 "instalados."
 
 #. type: Plain text
-#: dselect.1:199
+#: dselect.1:192
 msgid ""
 "Details of the install action depend on the access method's implementation.  "
 "The user's attention and input may be required during installation, "
@@ -15912,61 +16883,61 @@
 ">, permitiendo así una instalación más flexible o incluso más automatizada."
 
 #. type: SS
-#: dselect.1:200
+#: dselect.1:193
 #, no-wrap
 msgid "config"
 msgstr "config"
 
 #. type: Plain text
-#: dselect.1:202
+#: dselect.1:195
 msgid "Configures any previously installed, but not fully configured packages."
 msgstr ""
 "Configura cualquier paquete previamente instalado, pero no configurado "
 "totalmente."
 
 #. type: SS
-#: dselect.1:203
+#: dselect.1:196
 #, no-wrap
 msgid "remove"
 msgstr "remove"
 
 #. type: Plain text
-#: dselect.1:205
+#: dselect.1:198
 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 su eliminación."
 
 #. type: SS
-#: dselect.1:206
+#: dselect.1:199
 #, no-wrap
 msgid "quit"
 msgstr "quit"
 
 #. type: Plain text
-#: dselect.1:208
+#: dselect.1:201
 msgid "Quit B<dselect>"
 msgstr "Salir de B<dselect>"
 
 #. type: Plain text
-#: dselect.1:210
+#: dselect.1:203
 msgid "Exits the program with zero (successful) errorcode."
 msgstr "Termina el programa con éxito (el código de error devuelto es 0)."
 
 #. type: SH
-#: dselect.1:212
+#: dselect.1:205
 #, no-wrap
 msgid "Package selections management"
 msgstr "Manipulación de selecciones de paquetes"
 
 #. type: SS
-#: dselect.1:214
+#: dselect.1:207
 #, no-wrap
 msgid "Introduction"
 msgstr "Introducción"
 
 #. type: Plain text
-#: dselect.1:230
+#: dselect.1:223
 msgid ""
 "B<dselect> directly exposes the administrator to some of the complexities "
 "involved with managing large sets of packages with many interdependencies. "
@@ -15992,7 +16963,7 @@
 "consulte la página de manual de B<dpkg(8)> y el Manual de Normas de Debian."
 
 #. type: Plain text
-#: dselect.1:236
+#: dselect.1:229
 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> "
@@ -16007,13 +16978,13 @@
 "cualquier momento pulsando la tecla B<«?»>."
 
 #. type: SS
-#: dselect.1:237
+#: dselect.1:230
 #, no-wrap
 msgid "Screen layout"
 msgstr "Disposición de la pantalla"
 
 #. type: Plain text
-#: dselect.1:245
+#: dselect.1:238
 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 "
@@ -16030,7 +17001,7 @@
 "la parte superior de la pantalla. El tipo de detalle mostrado puede variar."
 
 #. type: Plain text
-#: dselect.1:248
+#: dselect.1:241
 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."
@@ -16040,13 +17011,13 @@
 "simétricamente."
 
 #. type: SS
-#: dselect.1:249
+#: dselect.1:242
 #, no-wrap
 msgid "Package details view"
 msgstr "Detalles de la vista de paquetes."
 
 #. type: Plain text
-#: dselect.1:258
+#: dselect.1:251
 #, no-wrap
 msgid ""
 "The package details view by default shows the extended package description\n"
@@ -16066,7 +17037,7 @@
 " - La información de control de la versión disponible\n"
 
 #. type: Plain text
-#: dselect.1:262
+#: dselect.1:255
 msgid ""
 "In a dependency resolution screen, there is also the possibility of viewing "
 "the specific unresolved depends or conflicts related to the package and "
@@ -16077,13 +17048,13 @@
 "relacionados con el paquete que causa los problemas."
 
 #. type: SS
-#: dselect.1:263
+#: dselect.1:256
 #, no-wrap
 msgid "Packages status list"
 msgstr "Lista de estado de los paquetes"
 
 #. type: Plain text
-#: dselect.1:268
+#: dselect.1:261
 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 "
@@ -16095,7 +17066,7 @@
 "datos de paquetes disponibles."
 
 #. type: Plain text
-#: dselect.1:276
+#: dselect.1:269
 msgid ""
 "For every package, the list shows the package's status, priority, section, "
 "installed and available versions, the package name and its short "
@@ -16112,7 +17083,7 @@
 "breve es la opción predefinido."
 
 #. type: Plain text
-#: dselect.1:282
+#: dselect.1:275
 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 "
@@ -16126,7 +17097,7 @@
 "selecciones del usuario."
 
 #. type: Plain text
-#: dselect.1:300
+#: dselect.1:293
 #, no-wrap
 msgid ""
 "These are the meanings of the shorthand package status indicator codes:\n"
@@ -16169,13 +17140,13 @@
 "  B<n>       El paquete es nuevo y aún no se ha marcado.\n"
 
 #. type: SS
-#: dselect.1:301
+#: dselect.1:294
 #, no-wrap
 msgid "Cursor and screen movement"
 msgstr "Movimiento del cursor y de la pantalla"
 
 #. type: Plain text
-#: dselect.1:306
+#: dselect.1:299
 msgid ""
 "The package selection list and the dependency conflict resolution screens "
 "can be navigated using motion commands mapped to the following keys:"
@@ -16184,7 +17155,7 @@
 "dependencias y conflictos se pueden explorar usando las siguientes teclas:"
 
 #. type: Plain text
-#: dselect.1:323
+#: dselect.1:316
 #, no-wrap
 msgid ""
 "  B<p, Up, k>           move cursor bar up\n"
@@ -16222,13 +17193,13 @@
 "  B<^f>                 Exhibe un carácter hacia la derecha.\n"
 
 #. type: SS
-#: dselect.1:324
+#: dselect.1:317
 #, no-wrap
 msgid "Searching and sorting"
 msgstr "Buscar y ordenar"
 
 #. type: Plain text
-#: dselect.1:338
+#: dselect.1:331
 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 "
@@ -16252,7 +17223,7 @@
 "continuará la búsqueda desde ese punto."
 
 #. type: Plain text
-#: dselect.1:345
+#: dselect.1:338
 #, no-wrap
 msgid ""
 "The list sort order can be varied by pressing\n"
@@ -16270,7 +17241,7 @@
 " sección+prioridad disponible+sección    estado+sección\n"
 
 #. type: Plain text
-#: dselect.1:348
+#: dselect.1:341
 msgid ""
 "Where not listed above explicitly, alphabetic order is used as the final "
 "subordering sort key."
@@ -16279,13 +17250,13 @@
 "orden alfabético."
 
 #. type: SS
-#: dselect.1:349
+#: dselect.1:342
 #, no-wrap
 msgid "Altering selections"
 msgstr "Modificar selecciones."
 
 #. type: Plain text
-#: dselect.1:358
+#: dselect.1:351
 #, no-wrap
 msgid ""
 "The requested selection state of individual packages may be\n"
@@ -16305,7 +17276,7 @@
 "  B<_>            Elimina y borra los ficheros de configuración.\n"
 
 #. type: Plain text
-#: dselect.1:362
+#: dselect.1:355
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -16316,7 +17287,7 @@
 "resolución de dependencias. Esta pantalla se explicará en detalle más abajo."
 
 #. type: Plain text
-#: dselect.1:367
+#: dselect.1:360
 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 "
@@ -16328,7 +17299,7 @@
 "lista."
 
 #. type: Plain text
-#: dselect.1:373
+#: dselect.1:366
 msgid ""
 "Proper care should be taken when altering large groups of selections, "
 "because this can instantaneously create large numbers of unresolved depends "
@@ -16343,13 +17314,13 @@
 "sólo son útiles las operaciones de retención «hold» y «unhold»."
 
 #. type: SS
-#: dselect.1:374
+#: dselect.1:367
 #, no-wrap
 msgid "Resolving depends and conflicts"
 msgstr "Resolver problemas de dependencias y conflictos"
 
 #. type: Plain text
-#: dselect.1:379
+#: dselect.1:372
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -16361,7 +17332,7 @@
 "informativa."
 
 #. type: Plain text
-#: dselect.1:386
+#: dselect.1:379
 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 "
@@ -16377,7 +17348,7 @@
 "de dependencia o conflictos que causa el paquete seleccionado."
 
 #. type: Plain text
-#: dselect.1:392
+#: dselect.1:385
 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, "
@@ -16392,7 +17363,7 @@
 "Habitualmente, lo mejor es seguir las sugerencias que B<dselect> presenta."
 
 #. type: Plain text
-#: dselect.1:400
+#: dselect.1:393
 msgid ""
 "The listed packages' selection state may be reverted to the original "
 "settings, as they were before the unresolved depends or conflicts were "
@@ -16410,13 +17381,13 @@
 "con los valores automáticos de las sugerencias."
 
 #. type: SS
-#: dselect.1:401
+#: dselect.1:394
 #, no-wrap
 msgid "Establishing the requested selections"
 msgstr "Establecer las selecciones solicitadas"
 
 #. type: Plain text
-#: dselect.1:408
+#: dselect.1:401
 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 "
@@ -16430,7 +17401,7 @@
 "de resolución de dependencias."
 
 #. type: Plain text
-#: dselect.1:414
+#: dselect.1:407
 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 "
@@ -16443,7 +17414,7 @@
 "Generalmente, no se debería hacer esto a menos que sepa lo que está haciendo."
 
 #. type: Plain text
-#: dselect.1:421
+#: dselect.1:414
 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 "
@@ -16458,7 +17429,7 @@
 "definida."
 
 #. type: Plain text
-#: dselect.1:428
+#: dselect.1:421
 msgid ""
 "If you mistakenly establish some settings and wish to revert all the "
 "selections to what is currently installed on the system, press the B<'C'> "
@@ -16473,7 +17444,7 @@
 "usuario pulsó B<Intro> por error."
 
 #. type: Plain text
-#: dselect.1:435
+#: dselect.1:428
 msgid ""
 "If set, B<dselect> will use it as the directory from which to read the user "
 "specific configuration file."
@@ -16482,7 +17453,7 @@
 "fichero de configuración específico del usuario."
 
 #. type: Plain text
-#: dselect.1:441
+#: dselect.1:434
 msgid ""
 "The B<dselect> package selection interface is confusing to some new users.  "
 "Reportedly, it even makes seasoned kernel developers cry."
@@ -16492,22 +17463,22 @@
 "lágrimas a experimentados desarrolladores del núcleo."
 
 #. type: Plain text
-#: dselect.1:443
+#: dselect.1:436
 msgid "The documentation is lacking."
 msgstr "La documentación está incompleta."
 
 #. type: Plain text
-#: dselect.1:445
+#: dselect.1:438
 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:447
+#: dselect.1:440
 msgid "The visible list of available packages cannot be reduced."
 msgstr "La lista de paquetes disponibles no se puede reducir."
 
 #. type: Plain text
-#: dselect.1:451
+#: dselect.1:444
 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, "
@@ -16518,12 +17489,12 @@
 "roto, es mucho más flexible que los métodos de acceso integrados."
 
 #. type: Plain text
-#: dselect.1:457
+#: dselect.1:450
 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:462
+#: dselect.1:455
 msgid ""
 "B<dselect> was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list "
 "of contributors may be found in 'dselect --version'."
@@ -16532,7 +17503,7 @@
 "una lista completa de contribuyentes con «dselect --version»."
 
 #. type: Plain text
-#: dselect.1:465
+#: dselect.1:458
 msgid ""
 "This manual page was written by Juho Vuori E<lt>javuori@cc.helsinki.fiE<gt>, "
 "Josip Rodin and Joost kooij."
@@ -16546,6 +17517,13 @@
 msgid "dselect.cfg"
 msgstr "dselect.cfg"
 
+#. type: TH
+#: dselect.cfg.5:1
+#, fuzzy, no-wrap
+#| msgid "2009-02-27"
+msgid "2011-07-03"
+msgstr "27 de Febrero de 2009"
+
 #. type: Plain text
 #: dselect.cfg.5:4
 msgid "dselect.cfg - dselect configuration file"
@@ -16553,9 +17531,16 @@
 
 #. type: Plain text
 #: dselect.cfg.5:11
+#, fuzzy
+#| 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. Quotes "
+#| "surrounding option values are stripped. Comments are allowed by starting "
+#| "a line with a hash sign (\"B<#>\")."
 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 "
+"option which is exactly the same as a normal command line option for dselect "
 "except for the leading dashes which are not used here. Quotes surrounding "
 "option values are stripped. Comments are allowed by starting a line with a "
 "hash sign (\"B<#>\")."
@@ -16607,12 +17592,14 @@
 msgstr "start-stop-daemon - Detiene y arranca demonios del sistema"
 
 #. type: Plain text
-#: start-stop-daemon.8:9
-msgid "B<start-stop-daemon> [I<options>] I<command>"
+#: start-stop-daemon.8:8
+#, fuzzy
+#| msgid "B<start-stop-daemon> [I<options>] I<command>"
+msgid "B<start-stop-daemon> [I<option>...] I<command>"
 msgstr "B<start-stop-daemon> [I<opciones>] I<orden>"
 
 #. type: Plain text
-#: start-stop-daemon.8:15
+#: start-stop-daemon.8:14
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
 "system-level processes.  Using one of the matching options, B<start-stop-"
@@ -16624,7 +17611,7 @@
 "en ejecución."
 
 #. type: Plain text
-#: start-stop-daemon.8:34
+#: start-stop-daemon.8:33
 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 "
@@ -16646,13 +17633,13 @@
 "necesiten sobrevivir a un B<--stop>."
 
 #. type: TP
-#: start-stop-daemon.8:36
+#: start-stop-daemon.8:35
 #, no-wrap
 msgid "B<-S>, B<--start> [B<-->] I<arguments>"
 msgstr "B<-S>, B<--start> [B<-->] I<argumentos>"
 
 #. type: Plain text
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 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<--"
@@ -16669,13 +17656,13 @@
 "B<--> se introduce sin modificación alguna al programa que se va a ejecutar."
 
 #. type: TP
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 #, no-wrap
 msgid "B<-K>, B<--stop>"
 msgstr "B<-K>, B<--stop>"
 
 #. type: Plain text
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
 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 "
@@ -16692,52 +17679,66 @@
 "comprobará que el proceso o los procesos han terminado."
 
 #. type: TP
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
+#, fuzzy, no-wrap
+#| msgid "B<-K>, B<--stop>"
+msgid "B<-T>, B<--status>"
+msgstr "B<-K>, B<--stop>"
+
+#. type: Plain text
+#: start-stop-daemon.8:74
+msgid ""
+"Check for the existence of a specified process, and returns an exit status "
+"code, according to the LSB Init Script Actions."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:74
 #, no-wrap
 msgid "B<-H>, B<--help>"
 msgstr "B<-H>, B<--help>"
 
 #. type: Plain text
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 msgid "Show usage information and exit."
 msgstr "Muestra la información de uso y termina."
 
 #. type: TP
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 #, no-wrap
 msgid "B<-V>, B<--version>"
 msgstr "B<-V>, B<--version>"
 
 #. type: Plain text
-#: start-stop-daemon.8:77
+#: start-stop-daemon.8:80
 msgid "Show the program version and exit."
 msgstr "Muestra la versión y termina."
 
 #. type: SH
-#: start-stop-daemon.8:78
+#: start-stop-daemon.8:81
 #, no-wrap
 msgid "MATCHING OPTIONS"
 msgstr "OPCIONES DE BÚSQUEDA"
 
 #. type: TP
-#: start-stop-daemon.8:79
+#: start-stop-daemon.8:82
 #, no-wrap
 msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgstr "B<-p>, B<--pidfile> I<fichero-pid>"
 
 #. type: Plain text
-#: start-stop-daemon.8:83
+#: start-stop-daemon.8:86
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr "Comprueba si un proceso ha creado el fichero I<fichero-pid>."
 
 #. type: TP
-#: start-stop-daemon.8:83
+#: start-stop-daemon.8:86
 #, no-wrap
 msgid "B<-x>, B<--exec> I<executable>"
 msgstr "B<-x>, B<--exec> I<ejecutable>"
 
 #. type: Plain text
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
@@ -16746,13 +17747,13 @@
 ">I<pid>B</exe>)."
 
 #. type: TP
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 #, 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:93
+#: start-stop-daemon.8:96
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
@@ -16761,13 +17762,13 @@
 ">I<pid>B</stat>)."
 
 #. type: TP
-#: start-stop-daemon.8:93
+#: start-stop-daemon.8:96
 #, no-wrap
 msgid "B<-u>, B<--user> I<username>|I<uid>"
 msgstr "B<-u>, B<--user> I<nombre-usuario>|I<uid>"
 
 #. type: Plain text
-#: start-stop-daemon.8:99
+#: start-stop-daemon.8:102
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
@@ -16775,24 +17776,24 @@
 "usuario> o I<uid>."
 
 #. type: TP
-#: start-stop-daemon.8:101
+#: start-stop-daemon.8:104
 #, no-wrap
 msgid "B<-g>, B<--group> I<group>|I<gid>"
 msgstr "B<-g>, B<--group> I<grupo>|I<gid>"
 
 #. type: Plain text
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:107
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr "Pasa a I<grupo> o I<gid> cuando comienza el proceso."
 
 #. type: TP
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:107
 #, no-wrap
 msgid "B<-s>, B<--signal> I<signal>"
 msgstr "B<-s>, B<--signal> I<señal>"
 
 #. type: Plain text
-#: start-stop-daemon.8:109
+#: start-stop-daemon.8:112
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default TERM)."
@@ -16801,13 +17802,13 @@
 "(TERM por omisión)."
 
 #. type: TP
-#: start-stop-daemon.8:109
+#: start-stop-daemon.8:112
 #, 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
-#: start-stop-daemon.8:119
+#: start-stop-daemon.8:122
 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 "
@@ -16820,7 +17821,7 @@
 "decisión determinada por I<acción-programada>."
 
 #. type: Plain text
-#: start-stop-daemon.8:130
+#: start-stop-daemon.8:133
 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 "
@@ -16831,7 +17832,7 @@
 "donde I<señal> es la señal definida con B<--signal>."
 
 #. type: Plain text
-#: start-stop-daemon.8:146
+#: start-stop-daemon.8:149
 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 "
@@ -16847,7 +17848,7 @@
 "acción programada indefinidamente si es necesario."
 
 #. type: Plain text
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 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, "
@@ -16859,13 +17860,13 @@
 "signal> no se tendrá en cuenta."
 
 #. type: TP
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 #, no-wrap
 msgid "B<-a>, B<--startas> I<pathname>"
 msgstr "B<-a>, B<--startas> I<nombre-ruta>"
 
 #. type: Plain text
-#: start-stop-daemon.8:164
+#: start-stop-daemon.8:167
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
@@ -16874,13 +17875,13 @@
 "define, se usarán los argumentos dados con B<--exec>."
 
 #. type: TP
-#: start-stop-daemon.8:164
+#: start-stop-daemon.8:167
 #, no-wrap
 msgid "B<-t>, B<--test>"
 msgstr "B<-t>, B<--test>"
 
 #. type: Plain text
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
@@ -16889,37 +17890,38 @@
 "no hace nada."
 
 #. type: TP
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 #, no-wrap
 msgid "B<-o>, B<--oknodo>"
 msgstr "B<-o>, B<--oknodo>"
 
 #. type: Plain text
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 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 (o se vayan a realizar) "
 "ninguna acción."
 
 #. type: TP
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 #, no-wrap
 msgid "B<-q>, B<--quiet>"
 msgstr "B<-q>, B<--quiet>"
 
 #. type: Plain text
-#: start-stop-daemon.8:174
+#: start-stop-daemon.8:177
 msgid "Do not print informational messages; only display error messages."
 msgstr "No muestra mensajes informativos, sólo muestra mensajes de error."
 
 #. type: TP
-#: start-stop-daemon.8:174
-#, no-wrap
-msgid "B<-c>, B<--chuid> I<username>|I<uid>"
+#: start-stop-daemon.8:177
+#, fuzzy, no-wrap
+#| msgid "B<-c>, B<--chuid> I<username>|I<uid>"
+msgid "B<-c>, B<--chuid> I<username>|I<uid>[B<:>I<group>|I<gid>]"
 msgstr "B<-c>, B<--chuid> I<nombre-usuario>|I<uid>"
 
 #. type: Plain text
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 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 "
@@ -16938,13 +17940,13 @@
 "los que el usuario no es miembro (como el grupo B<nobody>)."
 
 #. type: TP
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 #, no-wrap
 msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<-r>, B<--chroot> I<directorio-raíz>"
 
 #. type: Plain text
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
@@ -16954,13 +17956,13 @@
 "chroot."
 
 #. type: TP
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 #, no-wrap
 msgid "B<-d>, B<--chdir> I<path>"
 msgstr "B<-d>, B<--chdir> I<ruta>"
 
 #. type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 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-"
@@ -16972,13 +17974,13 @@
 "proceso."
 
 #. type: TP
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 #, no-wrap
 msgid "B<-b>, B<--background>"
 msgstr "B<-b>, B<--background>"
 
 #. type: Plain text
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 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 "
@@ -16997,24 +17999,24 @@
 "no si es posible añadir el código para que lo hagan por sí mismos."
 
 #. type: TP
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 #, no-wrap
 msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr "B<-N>, B<--nicelevel> I<entero>"
 
 #. type: Plain text
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 msgid "This alters the priority of the process before starting it."
 msgstr "Altera la prioridad del proceso antes de iniciarlo."
 
 #. type: TP
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 #, no-wrap
 msgid "B<-P>, B<--procsched> I<policy>B<:>I<priority>"
 msgstr "B<-P>, B<--procsched> I<directriz>B<:>I<prioridad>"
 
 #. type: Plain text
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 msgid ""
 "This alters the process scheduler policy and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -17027,13 +18029,13 @@
 "es 0. Las directrices compatibles son B<other>, B<fifo> y B<rr>."
 
 #. type: TP
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 #, no-wrap
 msgid "B<-I>, B<--iosched> I<class>B<:>I<priority>"
 msgstr "B<-I>, B<--iosched> I<clase>B<:>I<prioridad>"
 
 #. type: Plain text
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 msgid ""
 "This alters the IO scheduler class and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -17049,24 +18051,24 @@
 "time>. "
 
 #. type: TP
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 #, no-wrap
 msgid "B<-k>, B<--umask> I<mask>"
 msgstr "B<-k>, B<--umask> I<mask>"
 
 #. type: Plain text
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 msgid "This sets the umask of the process before starting it."
 msgstr "Define el umask del proceso antes de iniciarlo."
 
 #. type: TP
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 #, no-wrap
 msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-m>, B<--make-pidfile>"
 
 #. type: Plain text
-#: start-stop-daemon.8:252
+#: start-stop-daemon.8:255
 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<--"
@@ -17085,37 +18087,77 @@
 "principal. Por esto es útil sólo cuando se combina con la opción B<--"
 "background>."
 
+#. type: Plain text
+#: start-stop-daemon.8:258
+msgid "Print verbose informational messages."
+msgstr "Muestra mensajes informativos detallados."
+
+#. type: Plain text
+#: start-stop-daemon.8:270
+msgid ""
+"The requested action was performed. If B<--oknodo> was specified, it's also "
+"possible that nothing had to be done.  This can happen when B<--start> was "
+"specified and a matching process was already running, or when B<--stop> was "
+"specified and there were no matching processes."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:275
+msgid "If B<--oknodo> was not specified and nothing was done."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:283
+msgid ""
+"If B<--stop> and B<--retry> were specified, but the end of the schedule was "
+"reached and the processes were still running."
+msgstr ""
+
 #. type: TP
-#: start-stop-daemon.8:252
+#: start-stop-daemon.8:283 start-stop-daemon.8:295
 #, no-wrap
-msgid "B<-v>, B<--verbose>"
-msgstr "B<-v>, B<--verbose>"
+msgid "B<3>"
+msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:255
-msgid "Print verbose informational messages."
-msgstr "Muestra mensajes informativos detallados."
+#: start-stop-daemon.8:286
+msgid "Any other error."
+msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:272
+#: start-stop-daemon.8:289
 msgid ""
-"B<start-stop-daemon> returns 0 if the requested action was performed, or if "
-"B<--oknodo> is specified and either B<--start> was specified and a matching "
-"process was already running, or B<--stop> was specified and there were no "
-"matching processes. If B<--oknodo> was not specified and nothing was done, 1 "
-"is returned. If B<--stop> and B<--retry> were specified, but the end of the "
-"schedule was reached and the processes were still running, the error value "
-"is 2. For all other errors, the status is 3."
-msgstr ""
-"B<start-stop-daemon> devuelve 0 si la acción requerida tuvo éxito, o si se "
-"define B<--oknodo> y si se definió o bien B<--start>, existiendo un proceso "
-"cuyo nombre coincide, o B<--stop> y si no existe un proceso que coincida. "
-"Devuelve 1 si se especificó B<--oknodo> pero nada ocurrió. Devuelve 2 si se "
-"especificaron B<--stop> y B<--retry>, y la acción programada se ejecutó y "
-"los procesos aún se estaban ejecutando. Devuelve 3 para los demás errores."
+"When using the B<--status> command, the following status codes are returned:"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:292
+msgid "Program is running."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:295
+msgid "Program is not running and the pid file exists."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:298
+msgid "Program is not running."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:298
+#, no-wrap
+msgid "B<4>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:301
+msgid "Unable to determine program status."
+msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:276
+#: start-stop-daemon.8:305
 msgid ""
 "Start the B<food> daemon, unless one is already running (a process named "
 "food, running as user food, with pid in food.pid):"
@@ -17124,36 +18166,36 @@
 "llamado «food», ejecutándose como usuario «food», y con pid en «food.pid»):"
 
 #. type: Plain text
-#: start-stop-daemon.8:279
+#: start-stop-daemon.8:308
 #, no-wrap
 msgid "start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon\n"
 msgstr "start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:282
+#: start-stop-daemon.8:311
 msgid "Send B<SIGTERM> to B<food> and wait up to 5 seconds for it to stop:"
 msgstr "Envía B<SIGTERM> a B<food> y espera 5 segundos para su finalización:"
 
 #. type: Plain text
-#: start-stop-daemon.8:285
+#: start-stop-daemon.8:314
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5\n"
 msgstr "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:288
+#: start-stop-daemon.8:317
 msgid "Demonstration of a custom schedule for stopping B<food>:"
 msgstr ""
 "Un ejemplo de una acción programada personalizada para detener B<food>: "
 
 #. type: Plain text
-#: start-stop-daemon.8:291
+#: start-stop-daemon.8:320
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5\n"
 msgstr "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:297
+#: start-stop-daemon.8:326
 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>."
@@ -17162,7 +18204,7 @@
 "una versión previa de Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 
 #. type: Plain text
-#: start-stop-daemon.8:299
+#: start-stop-daemon.8:328
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -17185,12 +18227,14 @@
 "predefinidas"
 
 #. type: Plain text
-#: update-alternatives.8:16
-msgid "B<update-alternatives> [I<options>] I<command>"
+#: update-alternatives.8:15
+#, fuzzy
+#| msgid "B<update-alternatives> [I<options>] I<command>"
+msgid "B<update-alternatives> [I<option>...] I<command>"
 msgstr "B<update-alternatives> [I<opciones>] I<orden>"
 
 #. type: Plain text
-#: update-alternatives.8:21
+#: update-alternatives.8:20
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
@@ -17199,7 +18243,7 @@
 "los enlaces simbólicos que conforman el sistema de alternativas de Debian."
 
 #. type: Plain text
-#: update-alternatives.8:29
+#: update-alternatives.8:28
 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 "
@@ -17216,7 +18260,7 @@
 "definido ninguna preferencia."
 
 #. type: Plain text
-#: update-alternatives.8:51
+#: update-alternatives.8:50
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -17242,7 +18286,7 @@
 "explícitamente."
 
 #. type: Plain text
-#: update-alternatives.8:61
+#: update-alternatives.8:60
 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> "
@@ -17259,7 +18303,7 @@
 "directorio I</etc>: el FHS (q.v.) da razones de por qué esto es bueno."
 
 #. type: Plain text
-#: update-alternatives.8:73
+#: update-alternatives.8:72
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -17275,7 +18319,7 @@
 "de los paquetes de Debian."
 
 #. type: Plain text
-#: update-alternatives.8:92
+#: update-alternatives.8:91
 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>"
@@ -17296,7 +18340,7 @@
 "I<enlaces>."
 
 #. type: Plain text
-#: update-alternatives.8:101
+#: 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 "
@@ -17313,7 +18357,7 @@
 "sistema."
 
 #. type: Plain text
-#: update-alternatives.8:110
+#: 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 "
@@ -17328,7 +18372,7 @@
 "pasará automáticamente a modo manual."
 
 #. type: Plain text
-#: update-alternatives.8:117
+#: 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 "
@@ -17339,15 +18383,24 @@
 "alternativa con la prioridad más alta."
 
 #. type: Plain text
-#: update-alternatives.8:134
+#: update-alternatives.8:133
+#, 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 "
+#| "alternative name. The current choice is marked with a '*'.  You will then "
+#| "be prompted for your choice regarding this link group.  Depending on the "
+#| "choice made, the link group might no longer be in I<auto> mode. You will "
+#| "need to use the I<--auto> option in order to return to the automatic mode "
+#| "(or you can rerun I<--config> and select the entry marked as automatic)."
 msgid ""
-"When using the I<--config> option, B<update-alternatives> will list all of "
+"When using the B<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master "
 "alternative name. The current choice is marked with a '*'.  You will then be "
 "prompted for your choice regarding this link group.  Depending on the choice "
 "made, the link group might no longer be in I<auto> mode. You will need to "
-"use the I<--auto> option in order to return to the automatic mode (or you "
-"can rerun I<--config> and select the entry marked as automatic)."
+"use the B<--auto> option in order to return to the automatic mode (or you "
+"can rerun B<--config> and select the entry marked as automatic)."
 msgstr ""
 "El uso de la opción I<--config> hace que B<update-alternatives> muestre "
 "todas las elecciones dentro del grupo de enlaces que tienen como maestro a "
@@ -17358,16 +18411,20 @@
 "para devolver el grupo de enlaces al estado automático."
 
 #. type: Plain text
-#: update-alternatives.8:138
+#: update-alternatives.8:137
+#, fuzzy
+#| msgid ""
+#| "If you want to configure non-interactively you can use the I<--set> "
+#| "option instead (see below)."
 msgid ""
-"If you want to configure non-interactively you can use the I<--set> option "
+"If you want to configure non-interactively you can use the B<--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 (véase más abajo)."
 
 #. type: Plain text
-#: update-alternatives.8:149
+#: update-alternatives.8:148
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "In other words, the usage of B<update-alternatives> is B<mandatory> for all "
@@ -17381,13 +18438,13 @@
 "B<update-alternatives>."
 
 #. type: SH
-#: update-alternatives.8:150
+#: update-alternatives.8:149
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr "TERMINOLOGÍA"
 
 #. type: Plain text
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
@@ -17397,13 +18454,13 @@
 "específicos ayudará a entender su funcionamiento."
 
 #. type: TP
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 #, no-wrap
 msgid "generic name (or alternative link)"
 msgstr "nombre genérico (o enlace alternativo)"
 
 #. type: Plain text
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
 "to one of a number of files of similar function."
@@ -17412,24 +18469,24 @@
 "hace referencia a uno de los posibles ficheros con una función similar."
 
 #. type: TP
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 #, no-wrap
 msgid "alternative name"
 msgstr "nombre de la alternativa"
 
 #. type: Plain text
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 msgid "The name of a symbolic link in the alternatives directory."
 msgstr "El nombre de un enlace simbólico en el directorio de alternativas."
 
 #. type: TP
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 #, no-wrap
 msgid "alternative (or alternative path)"
 msgstr "alternativa (o ruta alternativa)"
 
 #. type: Plain text
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 msgid ""
 "The name of a specific file in the filesystem, which may be made accessible "
 "via a generic name using the alternatives system."
@@ -17438,25 +18495,25 @@
 "acceder a través de un nombre genérico usando el sistema de alternativas."
 
 #. type: TP
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 #, no-wrap
 msgid "alternatives directory"
 msgstr "directorio de alternativas"
 
 #. type: Plain text
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 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>."
 
 #. type: TP
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 #, no-wrap
 msgid "administrative directory"
 msgstr "directorio administrativo"
 
 #. type: Plain text
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
 "alternatives>' state information."
@@ -17465,26 +18522,26 @@
 "alternatives>, por omisión es I</var/lib/dpkg/alternatives>."
 
 #. type: TP
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 #, no-wrap
 msgid "link group"
 msgstr "grupo de enlaces"
 
 #. type: Plain text
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr ""
 "Un conjunto de enlaces relacionados con el objetivo de que se actualicen "
 "como grupo."
 
 #. type: TP
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 #, no-wrap
 msgid "master link"
 msgstr "enlace maestro"
 
 #. type: Plain text
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 msgid ""
 "The alternative link in a link group which determines how the other links in "
 "the group are configured."
@@ -17493,13 +18550,13 @@
 "configuran el resto de los enlaces del grupo."
 
 #. type: TP
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 #, no-wrap
 msgid "slave link"
 msgstr "enlace esclavo"
 
 #. type: Plain text
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 msgid ""
 "An alternative link in a link group which is controlled by the setting of "
 "the master link."
@@ -17507,13 +18564,13 @@
 "Un enlace alternativo en un grupo de enlaces definido por el enlace maestro."
 
 #. type: TP
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 #, no-wrap
 msgid "automatic mode"
 msgstr "modo automático"
 
 #. type: Plain text
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 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 "
@@ -17524,13 +18581,13 @@
 "la mayor prioridad en ese grupo."
 
 #. type: TP
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 #, no-wrap
 msgid "manual mode"
 msgstr "modo manual"
 
 #. type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:201
 msgid ""
 "When a link group is in manual mode, the alternatives system will not make "
 "any changes to the system administrator's settings."
@@ -17539,13 +18596,13 @@
 "alternativas no hará ningún cambio en la configuración del administrador."
 
 #. type: TP
-#: update-alternatives.8:204
+#: update-alternatives.8:203
 #, no-wrap
 msgid "B<--install> I<link name path priority> [B<--slave> I<link name path>]..."
 msgstr "B<--install> I<enlace nombre ruta prioridad> [B<--slave> I<enlace nombre ruta>] ..."
 
 #. type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:222
 msgid ""
 "Add a group of alternatives to the system.  I<link> is the generic name for "
 "the master link, I<name> is the name of its symlink in the alternatives "
@@ -17573,7 +18630,7 @@
 "un enlace alternativo nunca se eliminará a menos que se use B<--force>."
 
 #. type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 msgid ""
 "If the alternative name specified exists already in the alternatives "
 "system's records, the information supplied will be added as a new set of "
@@ -17592,29 +18649,33 @@
 "actualizarán para apuntar a las nuevas alternativas."
 
 #. type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr "B<--set> I<nombre ruta>"
 
 #. type: Plain text
-#: update-alternatives.8:243
+#: update-alternatives.8:242
+#, 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."
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
-"I<--config> but is non-interactive and thus scriptable."
+"B<--config> but is non-interactive and thus scriptable."
 msgstr ""
 "Define la I<ruta> del programa como alternativa para I<nombre>. Equivale a "
 "I<--config> pero no es interactivo, de modo que permite su inclusión en "
 "scripts."
 
 #. type: TP
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr "B<--remove> I<nombre ruta>"
 
 #. type: Plain text
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 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 "
@@ -17635,13 +18696,13 @@
 "enlace, sólo se elimina la información acerca de la alternativa."
 
 #. type: TP
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr "B<--remove-all> I<nombre>"
 
 #. type: Plain text
-#: update-alternatives.8:269
+#: update-alternatives.8:268
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
@@ -17650,7 +18711,7 @@
 "I<nombre> es un nombre en el directorio de alternativas."
 
 #. type: Plain text
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 msgid ""
 "Call B<--config> on all alternatives. It can be usefully combined with B<--"
 "skip-auto> to review and configure all alternatives which are not configured "
@@ -17666,13 +18727,13 @@
 "force --all>."
 
 #. type: TP
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 #, no-wrap
 msgid "B<--auto> I<name>"
 msgstr "B<--auto> I<nombre>"
 
 #. type: Plain text
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 msgid ""
 "Switch the link group behind the alternative for I<name> to automatic mode.  "
 "In the process, the master symlink and its slaves are updated to point to "
@@ -17683,13 +18744,13 @@
 "actualizarán para apuntar a la alternativa instalada con una prioridad mayor."
 
 #. type: TP
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 #, no-wrap
 msgid "B<--display> I<name>"
 msgstr "B<--display> I<nombre>"
 
 #. type: Plain text
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 msgid ""
 "Display information about the link group.  Information displayed includes "
 "the group's mode (auto or manual), which alternative the master link "
@@ -17704,13 +18765,13 @@
 "sistema."
 
 #. type: TP
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 #, no-wrap
 msgid "B<--get-selections>"
 msgstr "B<--get-selections>"
 
 #. type: Plain text
-#: update-alternatives.8:300
+#: update-alternatives.8:299
 msgid ""
 "List all master alternative names (those controlling a link group)  and "
 "their status. Each line contains up to 3 fields (separated by one or more "
@@ -17727,7 +18788,7 @@
 "ya que es un nombre de fichero)."
 
 #. type: Plain text
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 msgid ""
 "Read configuration of alternatives on standard input in the format generated "
 "by B<update-alternatives --get-selections> and reconfigure them accordingly."
@@ -17737,13 +18798,13 @@
 "apropiadamente."
 
 #. type: TP
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 #, no-wrap
 msgid "B<--query> I<name>"
 msgstr "B<--query> I<nombre>"
 
 #. type: Plain text
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 msgid ""
 "Display information about the link group like --display does, but in a "
 "machine parseable way (see section B<QUERY FORMAT> below)."
@@ -17753,24 +18814,24 @@
 "B<FORMATO DE CONSULTA> más abajo)."
 
 #. type: TP
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 #, no-wrap
 msgid "B<--list> I<name>"
 msgstr "B<--list> I<name>"
 
 #. type: Plain text
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 msgid "Display all targets of the link group."
 msgstr "Muestra todos los objetivos del grupo de enlaces."
 
 #. type: TP
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 #, no-wrap
 msgid "B<--config> I<name>"
 msgstr "B<--config> I<nombre>"
 
 #. type: Plain text
-#: update-alternatives.8:317
+#: update-alternatives.8:316
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated."
@@ -17780,13 +18841,13 @@
 "actualizará."
 
 #. type: TP
-#: update-alternatives.8:325
+#: update-alternatives.8:324
 #, no-wrap
 msgid "B<--altdir>I< directory>"
 msgstr "B<--altdir> I<directorio>"
 
 #. type: Plain text
-#: update-alternatives.8:329
+#: update-alternatives.8:328
 msgid ""
 "Specifies the alternatives directory, when this is to be different from the "
 "default."
@@ -17795,7 +18856,7 @@
 "omisión."
 
 #. type: Plain text
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 msgid ""
 "Specifies the administrative directory, when this is to be different from "
 "the default."
@@ -17804,13 +18865,13 @@
 "omisión."
 
 #. type: TP
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 #, no-wrap
 msgid "B<--log>I< file>"
 msgstr "B<--log=>I<fichero>"
 
 #. type: Plain text
-#: update-alternatives.8:337
+#: update-alternatives.8:336
 msgid ""
 "Specifies the log file, when this is to be different from the default (/var/"
 "log/alternatives.log)."
@@ -17819,22 +18880,26 @@
 "por omisión («/var/log/alternativas.log»)."
 
 #. type: Plain text
-#: update-alternatives.8:341
+#: update-alternatives.8:340
+#, fuzzy
+#| msgid ""
+#| "Let B<update-alternatives> replace any real file that is installed where "
+#| "an alternative link has to be installed."
 msgid ""
-"Let B<update-alternatives> replace any real file that is installed where an "
-"alternative link has to be installed."
+"Let B<update-alternatives> replace or drop any real file that is installed "
+"where an alternative link has to be installed or removed."
 msgstr ""
 "Deja que B<update-alternatives> reemplace cualquier fichero real instalado "
 "en la misma ubicación que la de un enlace alternativo."
 
 #. type: TP
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 #, no-wrap
 msgid "B<--skip-auto>"
 msgstr "B<--skip-auto>"
 
 #. type: Plain text
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 msgid ""
 "Skip configuration prompt for alternatives which are properly configured in "
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
@@ -17844,38 +18909,38 @@
 "config> o B<--all>."
 
 #. type: TP
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 #, no-wrap
 msgid "B<--verbose>"
 msgstr "B<--verbose>"
 
 #. type: Plain text
-#: update-alternatives.8:351
+#: update-alternatives.8:350
 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
-#: update-alternatives.8:354
+#: update-alternatives.8:353
 msgid "Don't generate any comments unless errors occur."
 msgstr "No genera ningún comentario a menos que ocurra algún error."
 
 #. type: Plain text
-#: update-alternatives.8:360
+#: update-alternatives.8:359
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the base administrative directory."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:362
+#: update-alternatives.8:361
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr "I</etc/alternatives/>"
 
 #. type: Plain text
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
@@ -17884,13 +18949,13 @@
 "B<--altdir>."
 
 #. type: TP
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 #, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "I</var/lib/dpkg/alternatives/>"
 
 #. type: Plain text
-#: update-alternatives.8:374
+#: update-alternatives.8:373
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
@@ -17903,14 +18968,8 @@
 msgid "The requested action was successfully performed."
 msgstr "La acción requerida finalizó con éxito."
 
-#. type: IP
-#: update-alternatives.8:378
-#, no-wrap
-msgid "2"
-msgstr "2"
-
 #. type: Plain text
-#: update-alternatives.8:381
+#: update-alternatives.8:382
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
@@ -17919,15 +18978,21 @@
 "acción requerida."
 
 #. type: SH
-#: update-alternatives.8:382
+#: update-alternatives.8:383
 #, no-wrap
 msgid "QUERY FORMAT"
 msgstr "FORMATO DE CONSULTA"
 
 #. type: Plain text
-#: update-alternatives.8:387
+#: update-alternatives.8:388
+#, fuzzy
+#| msgid ""
+#| "The B<update-alternatives> I<--query> format is using an RFC822-like flat "
+#| "format. It's made of I<n> + 1 blocks where I<n> is the number of "
+#| "alternatives available in the queried link group. The first block "
+#| "contains the following fields:"
 msgid ""
-"The B<update-alternatives> I<--query> format is using an RFC822-like flat "
+"The B<update-alternatives --query> format is using an RFC822-like flat "
 "format. It's made of I<n> + 1 blocks where I<n> is the number of "
 "alternatives available in the queried link group. The first block contains "
 "the following fields:"
@@ -17938,35 +19003,38 @@
 "primer bloque contiene los siguientes campos:"
 
 #. type: TP
-#: update-alternatives.8:387
-#, no-wrap
-msgid "B<Link:> E<lt>linkE<gt>"
+#: update-alternatives.8:388
+#, fuzzy, no-wrap
+#| msgid "B<Link:> E<lt>linkE<gt>"
+msgid "B<Link:>I< link>"
 msgstr "B<Link:> E<lt>enlaceE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 msgid "The generic name of the alternative."
 msgstr "El nombre genérico de la alternativa."
 
 #. type: TP
-#: update-alternatives.8:390
-#, no-wrap
-msgid "B<Status:> E<lt>statusE<gt>"
+#: update-alternatives.8:391
+#, fuzzy, no-wrap
+#| msgid "B<Status:> E<lt>statusE<gt>"
+msgid "B<Status:>I< status>"
 msgstr "B<Status:> E<lt>estadoE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr "El estado de la alternativa (B<auto> o B<manual>)."
 
 #. type: TP
-#: update-alternatives.8:393
-#, no-wrap
-msgid "B<Best:> E<lt>best choiceE<gt>"
+#: update-alternatives.8:394
+#, fuzzy, no-wrap
+#| msgid "B<Best:> E<lt>best choiceE<gt>"
+msgid "B<Best:>I< best-choice>"
 msgstr "B<Best:> E<lt>mejor-opciónE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
@@ -17975,13 +19043,14 @@
 "existen alternativas disponibles."
 
 #. type: TP
-#: update-alternatives.8:397
-#, no-wrap
-msgid "B<Value:> E<lt>currently selected alternativeE<gt> "
+#: update-alternatives.8:398
+#, fuzzy, no-wrap
+#| msgid "B<Value:> E<lt>currently selected alternativeE<gt> "
+msgid "B<Value:>I< currently-selected-alternative>"
 msgstr "B<Value:> E<lt>alternativa seleccionadaE<gt> "
 
 #. type: Plain text
-#: update-alternatives.8:401
+#: update-alternatives.8:402
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
@@ -17990,41 +19059,44 @@
 "el valor mágico B<none> (ninguno). Se usa si el enlace no existe."
 
 #. type: TP
-#: update-alternatives.8:402
+#: update-alternatives.8:403
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr "Los siguientes bloques describen las alternativas disponibles en el grupo de enlaces consultado:"
 
 #. type: TP
-#: update-alternatives.8:404
-#, no-wrap
-msgid "B<Alternative:> E<lt>path of this alternativeE<gt>"
+#: update-alternatives.8:405
+#, fuzzy, no-wrap
+#| msgid "B<Alternative:> E<lt>path of this alternativeE<gt>"
+msgid "B<Alternative:>I< path-of-this-alternative>"
 msgstr "B<Alternative:> E<lt>ruta a esta alternativaE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 msgid "Path to this block's alternative."
 msgstr "Ruta a la alternativa de este bloque."
 
 #. type: TP
-#: update-alternatives.8:407
-#, no-wrap
-msgid "B<Priority:> E<lt>priority valueE<gt>"
+#: update-alternatives.8:408
+#, fuzzy, no-wrap
+#| msgid "B<Priority:> E<lt>priority valueE<gt>"
+msgid "B<Priority:>I< priority-value>"
 msgstr "B<Priority: >E<lt>prioridadE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 msgid "Value of the priority of this alternative."
 msgstr "Valor de la prioridad de esta alternativa."
 
 #. type: TP
-#: update-alternatives.8:410
-#, no-wrap
-msgid "B<Slaves:> E<lt>list of slavesE<gt>"
+#: update-alternatives.8:411
+#, fuzzy, no-wrap
+#| msgid "B<Slaves:> E<lt>list of slavesE<gt>"
+msgid "B<Slaves:>I< list-of-slaves>"
 msgstr "B<Slaves:> E<lt>lista de esclavosE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:416
+#: update-alternatives.8:417
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -18037,13 +19109,13 @@
 "alternativa esclava, otro espacio, y la ruta a la alternativa esclava."
 
 #. type: TP
-#: update-alternatives.8:417
+#: update-alternatives.8:418
 #, no-wrap
 msgid "B<Example>"
 msgstr "B<Ejemplo>"
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:426
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
@@ -18059,7 +19131,7 @@
 "Value: /usr/bin/vim.gtk\n"
 
 #. type: Plain text
-#: update-alternatives.8:430
+#: update-alternatives.8:431
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -18073,7 +19145,7 @@
 " editor.1.gz /usr/share/man/man1/ed.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:446
 #, no-wrap
 msgid ""
 "Alternative: /usr/bin/vim.gtk\n"
@@ -18107,9 +19179,16 @@
 " editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:457
+#: update-alternatives.8:458
+#, fuzzy
+#| msgid ""
+#| "With I<--verbose> 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."
 msgid ""
-"With I<--verbose> B<update-alternatives> chatters incessantly about its "
+"With B<--verbose> 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; "
@@ -18123,7 +19202,7 @@
 "un fallo."
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:464
 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 "
@@ -18135,21 +19214,25 @@
 "se usa, incluyendo enlaces para el programa y la página del manual asociada."
 
 #. type: Plain text
-#: update-alternatives.8:466
+#: update-alternatives.8:467
+#, fuzzy
+#| msgid ""
+#| "To display the available packages which provide B<vi> and the current "
+#| "setting for it, use the I<--display> action:"
 msgid ""
 "To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
+"setting for it, use the B<--display> action:"
 msgstr ""
 "Para mostrar los paquetes disponibles que proporcionan B<vi> y su "
 "configuración actual, use la opción I<--display:>"
 
 #. type: Plain text
-#: update-alternatives.8:469
+#: update-alternatives.8:470
 msgid "B<update-alternatives --display vi>"
 msgstr "B<update-alternatives --display vi>"
 
 #. type: Plain text
-#: update-alternatives.8:473
+#: update-alternatives.8:474
 msgid ""
 "To choose a particular B<vi> implementation, use this command as root and "
 "then select a number from the list:"
@@ -18158,12 +19241,12 @@
 "como el usuario «root» y seleccione un número de la lista:"
 
 #. type: Plain text
-#: update-alternatives.8:476
+#: update-alternatives.8:477
 msgid "B<update-alternatives --config vi>"
 msgstr "B<update-alternatives --config vi>"
 
 #. type: Plain text
-#: update-alternatives.8:480
+#: update-alternatives.8:481
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
@@ -18172,12 +19255,12 @@
 "haga como administrador:"
 
 #. type: Plain text
-#: update-alternatives.8:483
+#: update-alternatives.8:484
 msgid "B<update-alternatives --auto vi>"
 msgstr "B<update-alternatives --auto vi>"
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:488
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
 msgstr ""
@@ -18185,7 +19268,7 @@
 "fallos de Debian."
 
 #. type: Plain text
-#: update-alternatives.8:492
+#: update-alternatives.8:493
 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 "
@@ -18196,7 +19279,7 @@
 "implementación o bien en la documentación. Le rogamos que informe de ello."
 
 #. type: Plain text
-#: update-alternatives.8:503
+#: update-alternatives.8:504
 msgid ""
 "This manual page is copyright 1997,1998 Charles Briscoe-Smith and others."
 msgstr ""
@@ -18204,7 +19287,7 @@
 "Smith y otros, 1997,1998."
 
 #. type: Plain text
-#: update-alternatives.8:506
+#: update-alternatives.8:507
 msgid ""
 "This is free documentation; see the GNU General Public Licence version 2 or "
 "later for copying conditions. There is NO WARRANTY."
@@ -18213,10 +19296,242 @@
 "General GNU para condiciones de copia. NO hay ninguna garantía."
 
 #. type: Plain text
-#: update-alternatives.8:509
+#: update-alternatives.8:510
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, el estándar de la jerarquía del sistema de ficheros."
 
+#~ msgid "2009-02-27"
+#~ msgstr "27 de Febrero de 2009"
+
+#, fuzzy
+#~| msgid "2009-02-27"
+#~ msgid "2011-04-29"
+#~ msgstr "27 de Febrero de 2009"
+
+#~ msgid "2006-02-28"
+#~ msgstr "28 de Febrero de 2006"
+
+#~ msgid "2007-03-07"
+#~ msgstr "7 de Marzo de 2007"
+
+#~ msgid "2007-07-16"
+#~ msgstr "16 de Julio de 2007"
+
+#~ msgid "2009-03-15"
+#~ msgstr "15 de Marzo de 2009"
+
+#, fuzzy
+#~| msgid "2009-02-27"
+#~ msgid "2011-04-27"
+#~ msgstr "27 de Febrero de 2009"
+
+#, fuzzy
+#~| msgid "2009-02-27"
+#~ msgid "2011-07-07"
+#~ msgstr "27 de Febrero de 2009"
+
+#~ msgid "2010-04-18"
+#~ msgstr "18 de Abril de 2010"
+
+#, fuzzy
+#~| msgid "User configuration file."
+#~ msgid "Package maintainer configuration file."
+#~ msgstr "Fichero de configuración del usuario."
+
+#~ msgid "2010-07-29"
+#~ msgstr "29 de julio del 2010"
+
+#~ msgid "B<Package:> E<lt>package nameE<gt>"
+#~ msgstr "B<Package:> E<lt>nombre-del-paqueteE<gt>"
+
+#, fuzzy
+#~| msgid "2010-01-28"
+#~ msgid "2010-11-22"
+#~ msgstr "28 de enero del 2010"
+
+#, fuzzy
+#~| msgid "B<Source:> E<lt>source nameE<gt>"
+#~ msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
+#~ msgstr "B<Source:> E<lt>nombre-del-código-fuenteE<gt>"
+
+#~ msgid "2010-01-28"
+#~ msgstr "28 de enero del 2010"
+
+#~ msgid ""
+#~ "The first member is named B<debian-split> and contains a series of lines, "
+#~ "separated by newlines. Currently seven lines are present.  The first is "
+#~ "the format version number, B<2.1> at the time this manual page was "
+#~ "written. The second is the package name. The third is the package "
+#~ "version. The fourth is the md5sum of the package.  The fifth is the total "
+#~ "size of the package. The sixth is the maximum part size. The seventh is "
+#~ "the current part number, followed by a slash and the total amount of "
+#~ "parts (as in \\(oq1/10\\(cq)."
+#~ msgstr ""
+#~ "El primer miembro se llama B<debian-split>, y contiene un conjunto de "
+#~ "líneas separadas por saltos de línea. A día de hoy hay siete líneas. La "
+#~ "primera es el número de versión de formato, B<2.1> en el momento de "
+#~ "escribir esta página de manual. El segundo es el nombre del paquete. El "
+#~ "tercero es la versión del paquete. El cuarto es la suma de control md5 "
+#~ "del paquete. El quinto es el tamaño total del paquete. El sexto es el "
+#~ "tamaño máximo de una parte. El séptimo es el número de la parte actual, "
+#~ "seguido de una barra invertida y el número total de las partes (por "
+#~ "ejemplo, \\(oq1/10\\(cq)."
+
+#~ msgid "2008-08-18"
+#~ msgstr "18 de Agosto de 2008"
+
+#~ msgid ""
+#~ "B<dpkg> can 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 puede usar B<dpkg> como una interfaz a B<dpkg-deb>(1). Si el "
+#~ "primero encuentra alguna de las opciones del segundo, se limita a "
+#~ "invocarlo con esos mismos parámetros:"
+
+#~ 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>, y\n"
+#~ "    B<--fsys-tarfile>.\n"
+
+#~ msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+#~ msgstr ""
+#~ "Consulte B<dpkg-deb>(1) si desea más información sobre estas acciones."
+
+#~ msgid "B<--new>, B<--old>"
+#~ msgstr "B<--new>, B<--old>"
+
+#~ msgid ""
+#~ "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
+#~ msgstr ""
+#~ "Selecciona el formato nuevo o antiguo de paquete. Es una opción de B<dpkg-"
+#~ "deb>(1)."
+
+#~ msgid ""
+#~ "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 al construir el "
+#~ "paquete. Es una opción de B<dpkg-deb>(1)."
+
+#~ msgid "2009-08-15"
+#~ msgstr "15 de Agosto de 2009"
+
+#~ msgid "Compiler flags"
+#~ msgstr "Opciones de compilación"
+
+#~ msgid ""
+#~ "The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
+#~ "environment variables are set to the values that B<dpkg-buildflags> "
+#~ "returned. See its manual page for more information."
+#~ msgstr ""
+#~ "Las variables de entorno B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> y "
+#~ "B<LDFLAGS> se define con los valores que devuelve B<dpkg-buildflags>. "
+#~ "Para más información consulte su página de manual."
+
+#~ msgid "2009-11-21"
+#~ msgstr "21 de Noviembre de 2009"
+
+#~ msgid "2010-03-07"
+#~ msgstr "7 de Marzo de 2010"
+
+#, fuzzy
+#~| msgid "2010-10-10"
+#~ msgid "2010-10-12"
+#~ msgstr "10 de Octubre del 2010"
+
+#~ msgid "2009-08-07"
+#~ msgstr "7 de Agosto de 2009"
+
+#~ msgid "2010-04-16"
+#~ msgstr "16 de Abril de 2010"
+
+#~ msgid "2009-05-19"
+#~ msgstr "19 de Junio de 2009"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2009-10-01"
+#~ msgstr "1 de Octubre de 2009"
+
+#~ msgid "2009-06-26"
+#~ msgstr "26 de Junio de 2009"
+
+#~ 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 ""
+#~ "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 éste no "
+#~ "esta presente en las partes generadas."
+
+#~ msgid "2009-05-10"
+#~ msgstr "10 de Abril de 2009"
+
+#~ msgid ""
+#~ "B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--"
+#~ "version>] [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 ""
+#~ "B<dselect> [B<--admindir> I<E<lt>directorioE<gt>>] [B<--help>] [B<--"
+#~ "version>] [B<--expert>] [B<--debug>|B<-D>I<E<lt>ficheroE<gt>>] "
+#~ "[I<E<lt>acciónE<gt>>] [B<--colour>|B<--color> I<parte-pantalla:>[I<primer-"
+#~ "plano>],[I<fondo>][I<:attr>[I<+attr+..>]]]"
+
+#~ msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+#~ msgstr "B<--admindir>I< E<lt>directorioE<gt>>"
+
+#~ msgid "USAGE"
+#~ msgstr "MODO DE USO"
+
+#~ msgid ""
+#~ "B<start-stop-daemon> returns 0 if the requested action was performed, or "
+#~ "if B<--oknodo> is specified and either B<--start> was specified and a "
+#~ "matching process was already running, or B<--stop> was specified and "
+#~ "there were no matching processes. If B<--oknodo> was not specified and "
+#~ "nothing was done, 1 is returned. If B<--stop> and B<--retry> were "
+#~ "specified, but the end of the schedule was reached and the processes were "
+#~ "still running, the error value is 2. For all other errors, the status is "
+#~ "3."
+#~ msgstr ""
+#~ "B<start-stop-daemon> devuelve 0 si la acción requerida tuvo éxito, o si "
+#~ "se define B<--oknodo> y si se definió o bien B<--start>, existiendo un "
+#~ "proceso cuyo nombre coincide, o B<--stop> y si no existe un proceso que "
+#~ "coincida. Devuelve 1 si se especificó B<--oknodo> pero nada ocurrió. "
+#~ "Devuelve 2 si se especificaron B<--stop> y B<--retry>, y la acción "
+#~ "programada se ejecutó y los procesos aún se estaban ejecutando. Devuelve "
+#~ "3 para los demás errores."
+
+#~ msgid "2"
+#~ msgstr "2"
+
 #~ msgid ""
 #~ "An error occurred. Unfortunately at the time of writing I<extended-error-"
 #~ "message> can contain newlines, although in locales where the translators "
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/fr.add /home/vorlon/devel/multiarch/dpkg-debian/man/po/fr.add
--- dpkg/man/po/fr.add	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/fr.add	2012-06-07 10:11:09.426073000 -0700
@@ -2,5 +2,5 @@
 .SH TRADUCTION
 Ariel VARDI <ariel.vardi@freesbee.fr>, 2002.
 Philippe Batailler, 2006.
-Nicolas Franois, 2006.
-Veuillez signaler toute erreur  <debian\-l10n\-french@lists.debian.org>.
+Nicolas François, 2006.
+Veuillez signaler toute erreur à <debian\-l10n\-french@lists.debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/fr.po /home/vorlon/devel/multiarch/dpkg-debian/man/po/fr.po
--- dpkg/man/po/fr.po	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/fr.po	2012-06-07 10:11:09.426073000 -0700
@@ -4,19 +4,19 @@
 # Philippe Batailler <philippe.batailler@free.fr>, 2005, 2006.
 # Nicolas François <nicolas.francois@centraliens.net>, 2006, 2007.
 # Florent USSEIL <swiip81@free.fr>, 2008.
-# Christian Perrier <bubulle@debian.org>, 2009, 2010.
+# Christian Perrier <bubulle@debian.org>, 2009, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2011-04-01 22:07+0300\n"
-"PO-Revision-Date: 2010-11-26 07:15+0100\n"
+"POT-Creation-Date: 2011-11-25 11:22+0100\n"
+"PO-Revision-Date: 2011-07-31 22:04+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: TH
@@ -26,10 +26,18 @@
 msgstr "deb"
 
 #. type: TH
-#: deb.5:1
-#, no-wrap
-msgid "2009-02-27"
-msgstr "27-02-2009"
+#: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-version.5:5 deb-old.5:1
+#: deb-override.5:15 deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg-buildpackage.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-trigger.1:1
+#: dselect.1:1 update-alternatives.8:8
+#, fuzzy, no-wrap
+#| msgid "2011-07-04"
+msgid "2011-08-14"
+msgstr "07-04-2011"
 
 #. type: TH
 #: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-split.5:1 deb-version.5:5
@@ -100,15 +108,15 @@
 #: deb.5:6 deb-control.5:10 deb-src-control.5:10 deb-split.5:6
 #: deb-version.5:11 deb-old.5:8 deb-override.5:22 deb-extra-override.5:8
 #: deb-shlibs.5:20 deb-substvars.5:9 deb-symbols.5:9 deb-triggers.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildflags.1:9
+#: dpkg.1:19 dpkg-architecture.1:10 dpkg.cfg.5:5 dpkg-buildflags.1:9
 #: 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-deb.1:9 dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
 #: dpkg-gensymbols.1:10 dpkg-maintscript-helper.1:15 dpkg-mergechangelogs.1:9
 #: dpkg-name.1:16 dpkg-parsechangelog.1:9 dpkg-query.1:9
-#: dpkg-scanpackages.1:28 dpkg-scansources.1:14 dpkg-shlibdeps.1:11
-#: dpkg-source.1:11 dpkg-split.1:11 dpkg-statoverride.8:10 dpkg-trigger.1:12
-#: dpkg-vendor.1:9 dselect.1:17 dselect.cfg.5:5 start-stop-daemon.8:10
-#: update-alternatives.8:17
+#: dpkg-scanpackages.1:27 dpkg-scansources.1:13 dpkg-shlibdeps.1:9
+#: dpkg-source.1:10 dpkg-split.1:10 dpkg-statoverride.8:9 dpkg-trigger.1:12
+#: dpkg-vendor.1:9 dselect.1:9 dselect.cfg.5:5 start-stop-daemon.8:9
+#: update-alternatives.8:16
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
@@ -262,15 +270,15 @@
 "une incrémentation du numéro majeur de version."
 
 #. type: SH
-#: deb.5:79 deb-control.5:269 deb-src-control.5:322 deb-split.5:37
+#: deb.5:79 deb-control.5:271 deb-src-control.5:327 deb-split.5:49
 #: deb-version.5:116 deb-old.5:51 deb-override.5:62 deb-extra-override.5:37
-#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:49
-#: dpkg.1:782 dpkg-architecture.1:300 dpkg.cfg.5:23 dpkg-buildpackage.1:249
-#: dpkg-deb.1:246 dpkg-divert.8:132 dpkg-gensymbols.1:445 dpkg-name.1:95
-#: dpkg-query.1:212 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:701 dpkg-split.1:223
-#: dpkg-statoverride.8:85 dpkg-trigger.1:66 dselect.1:452 dselect.cfg.5:23
-#: update-alternatives.8:507
+#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:67
+#: dpkg.1:768 dpkg-architecture.1:299 dpkg.cfg.5:23 dpkg-buildpackage.1:249
+#: dpkg-deb.1:259 dpkg-divert.8:132 dpkg-gensymbols.1:450 dpkg-name.1:96
+#: dpkg-query.1:220 dpkg-scanpackages.1:110 dpkg-scansources.1:71
+#: dpkg-shlibdeps.1:324 dpkg-source.1:725 dpkg-split.1:217
+#: dpkg-statoverride.8:84 dpkg-trigger.1:66 dselect.1:445 dselect.cfg.5:23
+#: update-alternatives.8:508
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
@@ -286,12 +294,6 @@
 msgid "deb-control"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-control.5:3 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
-#, no-wrap
-msgid "2010-07-29"
-msgstr "29-07-2010"
-
 #. type: Plain text
 #: deb-control.5:6
 msgid "deb-control - Debian packages' master control file format"
@@ -334,8 +336,8 @@
 #. type: TP
 #: deb-control.5:26
 #, no-wrap
-msgid "B<Package:> E<lt>package nameE<gt>"
-msgstr "B<Package:> E<lt>nom du paquetE<gt>"
+msgid "B<Package:>I< package-name>"
+msgstr "B<Package:>I< nom-du-paquet>"
 
 #. type: Plain text
 #: deb-control.5:30
@@ -349,8 +351,8 @@
 #. type: TP
 #: deb-control.5:30
 #, no-wrap
-msgid "B<Version:> E<lt>version stringE<gt>"
-msgstr "B<Version:> E<lt>chaîne pour la versionE<gt>"
+msgid "B<Version:>I< version-string>"
+msgstr "B<Version:> I<chaîne pour la version>"
 
 #. type: Plain text
 #: deb-control.5:37
@@ -368,8 +370,8 @@
 #. type: TP
 #: deb-control.5:37
 #, no-wrap
-msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgstr "B<Maintainer:> E<lt>nom adresseE<gt>"
+msgid "B<Maintainer:>I< fullname-email>"
+msgstr "B<Maintainer:> I< nom-complet-adresse-électronique>"
 
 #. type: Plain text
 #: deb-control.5:42
@@ -385,13 +387,13 @@
 #. type: TP
 #: deb-control.5:42
 #, no-wrap
-msgid "B<Description:> E<lt>short descriptionE<gt>"
-msgstr "B<Description:> E<lt>description courteE<gt>"
+msgid "B<Description:>I< short-description>"
+msgstr "B<Description:> I< description courte>"
 
 #. type: Plain text
 #: deb-control.5:45
-msgid "B< >E<lt>long descriptionE<gt>"
-msgstr "B< >E<lt>description longueE<gt>"
+msgid "B< >I<long-description>"
+msgstr "B< >I<description longue>"
 
 #. type: Plain text
 #: deb-control.5:51
@@ -415,10 +417,10 @@
 msgstr "CHAMPS OPTIONNELS"
 
 #. type: TP
-#: deb-control.5:53 deb-src-control.5:88
+#: deb-control.5:53 deb-src-control.5:90
 #, no-wrap
-msgid "B<Section:> E<lt>sectionE<gt>"
-msgstr "B<Section:> E<lt>sectionE<gt>"
+msgid "B<Section:>I< section>"
+msgstr "B<Section:> I< section>"
 
 #. type: Plain text
 #: deb-control.5:58
@@ -433,10 +435,10 @@
 "habituelles."
 
 #. type: TP
-#: deb-control.5:58 deb-src-control.5:94
+#: deb-control.5:58 deb-src-control.5:96
 #, no-wrap
-msgid "B<Priority:> E<lt>priorityE<gt>"
-msgstr "B<Priority:> E<lt>prioritéE<gt>"
+msgid "B<Priority:>I< priority>"
+msgstr "B<Priority:> I<priorité>"
 
 #. type: Plain text
 #: deb-control.5:62
@@ -449,7 +451,7 @@
 "priorités habituelles."
 
 #. type: Plain text
-#: deb-control.5:71 deb-src-control.5:107
+#: deb-control.5:71 deb-src-control.5:109
 msgid ""
 "In Debian, the B<Section> and B<Priority> fields have a defined set of "
 "accepted values based on the Policy Manual.  A list of these values can be "
@@ -460,20 +462,20 @@
 "une liste dans la version la plus récente du paquet B<debian-policy>."
 
 #. type: TP
-#: deb-control.5:71 deb-src-control.5:211
+#: deb-control.5:71 deb-src-control.5:216
 #, no-wrap
-msgid "B<Essential:> E<lt>yes|noE<gt>"
-msgstr "B<Essential:> E<lt>yes|noE<gt>"
+msgid "B<Essential:> B<yes>|B<no>"
+msgstr "B<Essential:> B<yes>|B<no>"
 
 #. type: Plain text
 #: deb-control.5:78
 msgid ""
-"This field is usually only needed when the answer is `yes'. It denotes a "
+"This field is usually only needed when the answer is B<yes>. It denotes a "
 "package that is required for proper operation of the system. Dpkg or any "
 "other installation tool will not allow an B<Essential> package to be removed "
 "(at least not without using one of the force options)."
 msgstr ""
-"On se sert habituellement de ce champ uniquement si la réponse est « yes ». "
+"On se sert habituellement de ce champ uniquement si la réponse est B<yes>. "
 "Il signifie que ce paquet est exigé pour un fonctionnement correct du "
 "système. Dpkg et les autres outils d'installation interdisent la suppression "
 "d'un paquet B<Essential> (du moins tant qu'une des options de forçage n'est "
@@ -482,8 +484,8 @@
 #. type: TP
 #: deb-control.5:78
 #, no-wrap
-msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgstr "B<Architecture:> E<lt>arch|allE<gt>"
+msgid "B<Architecture:> I<arch>|B<all>"
+msgstr "B<Architecture:> I<arch>|B<all>"
 
 #. type: Plain text
 #: deb-control.5:86
@@ -501,10 +503,10 @@
 "ainsi que la documentation sont dans ce cas."
 
 #. type: TP
-#: deb-control.5:86 deb-src-control.5:83
+#: deb-control.5:86 deb-src-control.5:85
 #, no-wrap
-msgid "B<Origin:> E<lt>nameE<gt>"
-msgstr "B<Origin:> E<lt>nomE<gt>"
+msgid "B<Origin:>I< name>"
+msgstr "B<Origin:> I< nom>"
 
 #. type: Plain text
 #: deb-control.5:89
@@ -514,39 +516,38 @@
 #. type: TP
 #: deb-control.5:89 deb-src-control.5:66
 #, no-wrap
-msgid "B<Bugs:> E<lt>urlE<gt>"
-msgstr "B<Bugs:> E<lt>URLE<gt>"
+msgid "B<Bugs:>I< url>"
+msgstr "B<Bugs:> I< URL>"
 
 #. type: Plain text
-#: deb-control.5:93
+#: deb-control.5:94
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian.org>."
 msgstr ""
-"URL du système de suivi de bogues (BTS) de ce paquet. Le format utilisé est "
-"B<E<lt>type_de_btsE<gt>://E<lt>adresse_du_btsE<gt>>, par exemple B<debbugs://"
+"I<url>URL du système de suivi de bogues (BTS) de ce paquet. Le format "
+"utilisé est I<type_de_bts>B<://>I<adresse_du_bts>, par exemple B<debbugs://"
 "bugs.debian.org>."
 
 #. type: TP
-#: deb-control.5:93 deb-src-control.5:62
+#: deb-control.5:94 deb-src-control.5:62
 #, no-wrap
-msgid "B<Homepage:> E<lt>urlE<gt>"
-msgstr "B<Homepage:> E<lt>URLE<gt>"
+msgid "B<Homepage:>I< url>"
+msgstr "B<Homepage:>I< URL>"
 
 #. type: Plain text
-#: deb-control.5:96 deb-src-control.5:65
-msgid "The upstream project home page URL."
-msgstr "URL de la page d'accueil du projet amont."
+#: deb-control.5:97
+msgid "The upstream project home page I<url>."
+msgstr "I<URL> de la page d'accueil du projet amont."
 
 #. type: TP
-#: deb-control.5:96 deb-src-control.5:217
+#: deb-control.5:97 deb-src-control.5:222
 #, no-wrap
-msgid "B<Tag:> E<lt>tag listE<gt>"
-msgstr "B<Tag:> E<lt>liste d'étiquettesE<gt>"
+msgid "B<Tag:>I< tag-list>"
+msgstr "B<Tag:> I<liste d'étiquettes>"
 
 #. type: Plain text
-#: deb-control.5:100
+#: deb-control.5:101
 msgid ""
 "List of tags describing the qualities of the package. The description and "
 "list of supported tags can be found in the B<debtags> package."
@@ -556,35 +557,34 @@
 "B<debtags>."
 
 #. type: TP
-#: deb-control.5:100
-#, fuzzy, no-wrap
-#| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt>"
-msgstr "B<Source:> E<lt>nom du sourceE<gt>"
+#: deb-control.5:101 deb-src-control.5:219
+#, no-wrap
+msgid "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>"
+msgstr "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>"
 
 #. type: Plain text
-#: deb-control.5:111
+#: deb-control.5:113
 msgid ""
 "This field is used to indicate how this package should behave on a multi-"
-"arch installations. The value `same' means that the package is co-"
+"arch installations. The value B<same> means that the package is co-"
 "installable with itself, but it must not be used to satisfy the dependency "
-"of any package of a different architecture from itself. The value `foreign' "
+"of any package of a different architecture from itself. The value B<foreign> "
 "means that the package is not co-installable with itself, but should be "
 "allowed to satisfy the dependency of a package of a different arch from "
-"itself. The value `allowed` allows reverse-dependencies to indicate in their "
-"Depends field that they need a package from a foreign architecture, but has "
-"no effect otherwise. This field should not be present in packages with the "
-"Architecture: all field."
+"itself. The value B<allowed> allows reverse-dependencies to indicate in "
+"their Depends field that they need a package from a foreign architecture, "
+"but has no effect otherwise. This field should not be present in packages "
+"with the B<Architecture: all> field."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:111
+#: deb-control.5:113
 #, no-wrap
-msgid "B<Source:> E<lt>source nameE<gt>"
-msgstr "B<Source:> E<lt>nom du sourceE<gt>"
+msgid "B<Source:>I< source-name>"
+msgstr "B<Source:>I< nom du source>"
 
 #. type: Plain text
-#: deb-control.5:115
+#: deb-control.5:117
 msgid ""
 "The name of the source package that this binary package came from, if "
 "different than the name of the package itself."
@@ -593,42 +593,42 @@
 "différence entre les deux noms."
 
 #. type: TP
-#: deb-control.5:116 deb-src-control.5:197
-#, fuzzy, no-wrap
-#| msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgid "B<Subarchitecture:> E<lt>valueE<gt>"
-msgstr "B<Architecture:> E<lt>arch|allE<gt>"
+#: deb-control.5:118 deb-src-control.5:202
+#, no-wrap
+msgid "B<Subarchitecture:>I< value>"
+msgstr "B<Subarchitecture:>I< valeur>"
 
 #. type: TP
-#: deb-control.5:119 deb-src-control.5:200
-#, fuzzy, no-wrap
-#| msgid "B<Version:> E<lt>versionE<gt>"
-msgid "B<Kernel-Version:> E<lt>valueE<gt>"
-msgstr "B<Version:> E<lt>versionE<gt>"
+#: deb-control.5:121 deb-src-control.5:205
+#, no-wrap
+msgid "B<Kernel-Version:>I< value>"
+msgstr "B<Kernel-Version:>I< valeur>"
 
 #. type: TP
-#: deb-control.5:122 deb-src-control.5:203
-#, fuzzy, no-wrap
-#| msgid "B<Date:> E<lt>dateE<gt>"
-msgid "B<Installer-Menu-Item:> E<lt>valueE<gt>"
-msgstr "B<Date:> E<lt>dateE<gt>"
+#: deb-control.5:124 deb-src-control.5:208
+#, no-wrap
+msgid "B<Installer-Menu-Item:>I< value>"
+msgstr "B<Installer-Menu-Item:>I< valeur>"
 
 #. type: Plain text
-#: deb-control.5:129 deb-src-control.5:210
+#: deb-control.5:131 deb-src-control.5:215
 msgid ""
 "These fields are used by the debian-installer and are usually not needed.  "
 "See /usr/share/doc/debian-installer/devel/modules.txt from the B<debian-"
 "installer> package for more details about them."
 msgstr ""
+"Ces champs sont utilisés par l'installateur et ne sont en général pas "
+"nécessaires. Veuillez consulter /usr/share/doc/debian-installer/devel/"
+"modules.txt  fourni avec le paquet B<debian-installer> pour plus de détails."
 
 #. type: TP
-#: deb-control.5:130 deb-src-control.5:228
+#: deb-control.5:132 deb-src-control.5:233
 #, no-wrap
-msgid "B<Depends:> E<lt>package listE<gt>"
-msgstr "B<Depends:> E<lt>liste de paquetE<gt>"
+msgid "B<Depends:>I< package-list>"
+msgstr "B<Depends:>I< liste de paquets>"
 
 #. type: Plain text
-#: deb-control.5:141
+#: deb-control.5:143
 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 "
@@ -649,13 +649,13 @@
 "« prerm » des paquets sont lancés avant ceux de leurs dépendances."
 
 #. type: TP
-#: deb-control.5:141 deb-src-control.5:231
+#: deb-control.5:143 deb-src-control.5:236
 #, no-wrap
-msgid "B<Pre-Depends:> E<lt>package listE<gt>"
-msgstr "B<Pre-Depends:> E<lt>liste de paquetE<gt>"
+msgid "B<Pre-Depends:>I< package-list>"
+msgstr "B<Pre-Depends:>I< liste de paquets>"
 
 #. type: Plain text
-#: deb-control.5:148
+#: deb-control.5:150
 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 "
@@ -667,13 +667,13 @@
 "« preinst »."
 
 #. type: TP
-#: deb-control.5:148 deb-src-control.5:234
+#: deb-control.5:150 deb-src-control.5:239
 #, no-wrap
-msgid "B<Recommends:> E<lt>package listE<gt>"
-msgstr "B<Recommends:> E<lt>liste de paquetE<gt>"
+msgid "B<Recommends:>I< package-list>"
+msgstr "B<Recommends:>I< liste de paquets>"
 
 #. type: Plain text
-#: deb-control.5:155
+#: deb-control.5:157
 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 "
@@ -685,13 +685,13 @@
 "répertoriés dans le champ B<Recommends.>"
 
 #. type: TP
-#: deb-control.5:155 deb-src-control.5:237
+#: deb-control.5:157 deb-src-control.5:242
 #, no-wrap
-msgid "B<Suggests:> E<lt>package listE<gt>"
-msgstr "B<Suggests:> E<lt>liste de paquetE<gt>"
+msgid "B<Suggests:>I< package-list>"
+msgstr "B<Suggests:>I<liste de paquets>"
 
 #. type: Plain text
-#: deb-control.5:160
+#: deb-control.5:162
 msgid ""
 "Lists packages that are related to this one and can perhaps enhance its "
 "usefulness, but without which installing this package is perfectly "
@@ -702,7 +702,7 @@
 "raisonnable."
 
 #. type: Plain text
-#: deb-control.5:172
+#: deb-control.5:174
 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 "
@@ -721,7 +721,7 @@
 "parenthèses."
 
 #. type: Plain text
-#: deb-control.5:178
+#: deb-control.5:180
 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 "
@@ -737,13 +737,13 @@
 "ou égal, « E<lt>= » pour inférieur ou égal, et « = » pour égal à."
 
 #. type: TP
-#: deb-control.5:178 deb-src-control.5:240
+#: deb-control.5:180 deb-src-control.5:245
 #, no-wrap
-msgid "B<Breaks:> E<lt>package listE<gt>"
-msgstr "B<Breaks:> E<lt>liste de paquetsE<gt>"
+msgid "B<Breaks:>I< package-list>"
+msgstr "B<Breaks:>I<liste de paquets>"
 
 #. type: Plain text
-#: deb-control.5:186
+#: deb-control.5:188
 msgid ""
 "Lists packages that this one breaks, for example by exposing bugs when the "
 "named packages rely on this one. The package maintenance software will not "
@@ -757,13 +757,13 @@
 "le champ B<Breaks>."
 
 #. type: TP
-#: deb-control.5:186 deb-src-control.5:249
+#: deb-control.5:188 deb-src-control.5:254
 #, no-wrap
-msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgstr "B<Conflicts:> E<lt>liste de paquetsE<gt>"
+msgid "B<Conflicts:>I< package-list>"
+msgstr "B<Conflicts:>I<liste de paquets>"
 
 #. type: Plain text
-#: deb-control.5:194
+#: deb-control.5:196
 msgid ""
 "Lists packages that conflict with this one, for example by containing files "
 "with the same names. The package maintenance software will not allow "
@@ -777,13 +777,13 @@
 "le nom de l'autre paquet."
 
 #. type: TP
-#: deb-control.5:194 deb-src-control.5:246
+#: deb-control.5:196 deb-src-control.5:251
 #, no-wrap
-msgid "B<Replaces:> E<lt>package listE<gt>"
-msgstr "B<Replaces:> E<lt>liste de paquetsE<gt>"
+msgid "B<Replaces:>I< package-list>"
+msgstr "B<Replaces:>I< liste de paquets>"
 
 #. type: Plain text
-#: deb-control.5:202
+#: deb-control.5:204
 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 "
@@ -796,13 +796,13 @@
 "possède aussi les mêmes fichiers que le paquet en conflit."
 
 #. type: TP
-#: deb-control.5:202 deb-src-control.5:252
+#: deb-control.5:204 deb-src-control.5:257
 #, no-wrap
-msgid "B<Provides:> E<lt>package listE<gt>"
-msgstr "B<Provides:>  E<lt>liste de paquetsE<gt>"
+msgid "B<Provides:>I< package-list>"
+msgstr "B<Provides:> I<liste de paquets>"
 
 #. type: Plain text
-#: deb-control.5:212
+#: deb-control.5:214
 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 "
@@ -823,7 +823,7 @@
 "à utiliser « | » comme séparateur de liste."
 
 #. type: Plain text
-#: deb-control.5:231
+#: deb-control.5:233
 msgid ""
 "The syntax of B<Breaks>, B<Conflicts>, B<Replaces> and B<Provides> is a list "
 "of package names, separated by commas (and optional whitespace).  In the "
@@ -838,14 +838,13 @@
 "ci-dessus dans les champs B<Breaks>, B<Conflicts> et B<Replaces>."
 
 #. type: TP
-#: deb-control.5:232 deb-src-control.5:255
-#, fuzzy, no-wrap
-#| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Built-Using:> E<lt>package listE<gt>"
-msgstr "B<Depends:> E<lt>liste de paquetE<gt>"
+#: deb-control.5:234 deb-src-control.5:260
+#, no-wrap
+msgid "B<Built-Using:>I< package-list>"
+msgstr "B<Built-Using:>I< liste de paquets>"
 
 #. type: Plain text
-#: deb-control.5:242
+#: deb-control.5:244
 msgid ""
 "This field lists extra source packages that were used during the build of "
 "this binary package.  This is an indication to the archive maintenance "
@@ -855,15 +854,23 @@
 "software is likely to refuse to accept an upload which declares a B<Built-"
 "Using> relationship which cannot be satisfied within the archive."
 msgstr ""
+"Ce champ affiche les paquets source supplémentaires utilisées lors de la "
+"construction du paquet binaire. Il permet d'indiquer aux logiciels de "
+"gestion de l'archive que des paquets source supplémentaires doivent être "
+"conservées tant que le paquet binaire est maintenu. Ce champ doit être une "
+"liste de paquets source avec des références strictes de version (=). "
+"Veuillez noter que les logiciels de gestion de l'archive risque de ne pas "
+"accepter un envoi qui déclare une relation B<Built-Using> qui ne peut pas "
+"être satisfaite dans l'archive."
 
 #. type: SH
-#: deb-control.5:243 deb-src-control.5:283 start-stop-daemon.8:273
+#: deb-control.5:245 deb-src-control.5:288 start-stop-daemon.8:302
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "EXEMPLE"
 
 #. type: Plain text
-#: deb-control.5:266
+#: deb-control.5:268
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -912,7 +919,7 @@
 " ralentissent cependant le programme.)\n"
 
 #. type: Plain text
-#: deb-control.5:274
+#: deb-control.5:276
 msgid ""
 "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr ""
@@ -920,25 +927,16 @@
 
 #. type: TH
 #: deb-src-control.5:3
-#, fuzzy, no-wrap
-#| msgid "deb-control"
+#, no-wrap
 msgid "deb-src-control"
-msgstr "deb-control"
-
-#. type: TH
-#: deb-src-control.5:3
-#, fuzzy, no-wrap
-#| msgid "2007-11-22"
-msgid "2010-11-22"
-msgstr "22-11-2007"
+msgstr "deb-src-control"
 
 #. type: Plain text
 #: deb-src-control.5:6
-#, fuzzy
-#| msgid "deb-control - Debian packages' master control file format"
 msgid "deb-src-control - Debian source packages' master control file format"
 msgstr ""
-"deb-control - Format du fichier principal de contrôle dans les paquets Debian"
+"deb-src-control - Format du fichier principal de contrôle dans les paquets "
+"Debian"
 
 #. type: Plain text
 #: deb-src-control.5:28
@@ -954,23 +952,35 @@
 "one space. The content of the multi-line fields is generally joined to a "
 "single line by the tools (except in the case of the B<Description> field, "
 "see below). To insert empty lines into a multi-line field, insert a dot "
-"after the space. The paragraphs are separated by an empty line. Lines "
-"starting with a B<'#'> are treated as comments."
+"after the space. Lines starting with a B<'#'> are treated as comments."
 msgstr ""
+"Chaque paquet source Debian contient un fichier « control » maître, qui "
+"contient au moins 2 paragraphes, séparés par une ligne vide. Le premier "
+"paragraphe donne toutes les informations à propos du paquet source en "
+"général et chaque paragraphe qui suit décrit exactement un paquet binaire. "
+"Chaque paragraphe contient au moins un champ. Un champ commence par le nomdu "
+"champ, par exemple B<Package> ou B<Section> (la casse n'est pas "
+"significative), suivi d'un caractère « deux-points », du contenu du champ et "
+"d'un retour à la ligne. Les champs multi-lignes sont aussi possibles, mais "
+"chaque ligne supplémentaire, qui ne comporte pas de nom de champ, doit "
+"commencer par au moins un espace. Le contenu des champs multi-lignes est en "
+"général réassemblé en une ligne unique par les outils (sauf pour le champ "
+"B<Description>, voir ci-dessous). Pour inclure des lignes vides dans un "
+"champ multi-lignes, il est nécessaire de mettre un point après l'espace "
+"initial. Les lignes commençant pas B<« # »> sont traitées comme des "
+"commentaires."
 
 #. type: SH
 #: deb-src-control.5:29
-#, fuzzy, no-wrap
-#| msgid "REQUIRED FIELDS"
+#, no-wrap
 msgid "SOURCE FIELDS"
-msgstr "LES CHAMPS EXIGÉS"
+msgstr "LES CHAMPS SOURCE"
 
 #. type: TP
 #: deb-src-control.5:30
-#, fuzzy, no-wrap
-#| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Source:> E<lt>source package nameE<gt> (required)"
-msgstr "B<Source:> E<lt>nom du sourceE<gt>"
+#, no-wrap
+msgid "B<Source:> I<source-package-name> (required)"
+msgstr "B<Source:> I<nom du paquet source> (requis)"
 
 #. type: Plain text
 #: deb-src-control.5:37
@@ -981,36 +991,35 @@
 "minus (-) signs, and periods (.). Package names must be at least two "
 "characters long and must start with an alphanumeric character."
 msgstr ""
+"La valeur de ce champ est le nom du paquet source et doit correspondre au "
+"nom du paquet source dans le fichier debian/changelog. Un nom de paquet doit "
+"être constitué uniquement de lettres minuscules (a-z), de chiffres (0-9), "
+"des caractères plus (+) et moins (-) et de points (.). Les noms de paquets "
+"doit comporter au moins deux caractères et doivent commencer par un "
+"caractère alphanumérique."
 
 #. type: TP
 #: deb-src-control.5:38
-#, fuzzy, no-wrap
-#| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgid "B<Maintainer:> E<lt>fullname emailE<gt> (required)"
-msgstr "B<Maintainer:> E<lt>nom adresseE<gt>"
+#, no-wrap
+msgid "B<Maintainer:> I<fullname-email> (required)"
+msgstr "B<Maintainer:> I<nom complet et adresse électronique> (requis)"
 
 #. type: Plain text
 #: deb-src-control.5:43
-#, fuzzy
-#| 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 "
-#| "the software that was packaged."
 msgid ""
 "Should be in the format \"Joe Bloggs E<lt>jbloggs@foo.comE<gt>\", and "
 "references the person who currently maintains the package, as opposed to the "
 "author of the software or the original packager."
 msgstr ""
 "Le format de ce champ sera « Jean Dupont E<lt>jdupont@foo.comE<gt> » ; et "
-"c'est bien sûr le créateur du paquet, par opposition à l'auteur du programme "
-"mis en paquet."
+"indique le créateur du paquet, par opposition à l'auteur du programme mis en "
+"paquet."
 
 #. type: TP
 #: deb-src-control.5:44
-#, fuzzy, no-wrap
-#| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgid "B<Uploaders:> E<lt>fullname emailE<gt>"
-msgstr "B<Maintainer:> E<lt>nom adresseE<gt>"
+#, no-wrap
+msgid "B<Uploaders:>I< fullname-email>"
+msgstr "B<Uploaders:>I< nom complet et adresse électronique>"
 
 #. type: Plain text
 #: deb-src-control.5:49
@@ -1019,13 +1028,15 @@
 "the same format as the Maintainer field. Multiple co-maintainers should be "
 "separated by a comma."
 msgstr ""
+"Affiche les noms et les adresses électroniques des co-responsables du "
+"paquet, au même format que le champ Maintainer. Des co-responsables "
+"multiples peuvent être séparés par une virgule."
 
 #. type: TP
 #: deb-src-control.5:50
-#, fuzzy, no-wrap
-#| msgid "B<Version:> E<lt>version stringE<gt>"
-msgid "B<Standards-Version:> E<lt>version stringE<gt>"
-msgstr "B<Version:> E<lt>chaîne pour la versionE<gt>"
+#, no-wrap
+msgid "B<Standards-Version:>I< version-string>"
+msgstr "B<Standards-Version:>I< chaîne de version>"
 
 #. type: Plain text
 #: deb-src-control.5:56
@@ -1034,13 +1045,15 @@
 "the Debian Policy Manual and referenced texts from the B<debian-policy> "
 "package) this package complies to."
 msgstr ""
+"Ce champ indique la version la plus récente des normes (constituées par la "
+"Charte Debian et les textes indiqués dans le paquet B<debian-policy>) "
+"auxquelles ce paquet se conforme."
 
 #. type: TP
 #: deb-src-control.5:57
-#, fuzzy, no-wrap
-#| msgid "B<Essential:> E<lt>yes|noE<gt>"
-msgid "B<DM-Upload-Allowed:> E<lt>yes|noE<gt>"
-msgstr "B<Essential:> E<lt>yes|noE<gt>"
+#, no-wrap
+msgid "B<DM-Upload-Allowed:> B<yes>|B<no>"
+msgstr "B<DM-Upload-Allowed:> B<yes>|B<no>"
 
 #. type: Plain text
 #: deb-src-control.5:61
@@ -1049,167 +1062,158 @@
 "Maintainers appearing in the Maintainer or Uploaders field. The default "
 "value is \"no\"."
 msgstr ""
+"Ce champ indique si un paquet peut être envoyé par les mainteneurs Debian "
+"qui sont indiqués dans le champ Maintainer ou le champ Uploaders. La valeur "
+"par défaut est « no »."
+
+#. type: Plain text
+#: deb-src-control.5:65
+msgid "The upstream project home page URL."
+msgstr "URL de la page d'accueil du projet amont."
 
 #. type: Plain text
 #: deb-src-control.5:71
-#, fuzzy
-#| msgid ""
-#| "The url of the bug tracking system for this package. The current used "
-#| "format is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://"
-#| "bugs.debian.org>."
-msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>. This field is usually not needed."
-msgstr ""
-"URL du système de suivi de bogues (BTS) de ce paquet. Le format utilisé est "
-"B<E<lt>type_de_btsE<gt>://E<lt>adresse_du_btsE<gt>>, par exemple B<debbugs://"
-"bugs.debian.org>."
+msgid ""
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian."
+"org>. This field is usually not needed."
+msgstr ""
+"Indique l'I<URL> du système de suivi de bogues (BTS) de ce paquet. Le format "
+"utilisé est I<type_de_bts>B<://>I<adresse_du_btsE>, par exemple B<debbugs://"
+"bugs.debian.org>. Ce champ est en général inutile."
 
 #. type: TP
 #: deb-src-control.5:72
-#, fuzzy, no-wrap
-#| msgid "B<Bugs:> E<lt>urlE<gt>"
-msgid "B<Vcs-*:> E<lt>urlE<gt>"
-msgstr "B<Bugs:> E<lt>URLE<gt>"
+#, no-wrap
+msgid "B<Vcs-*:>I< url>"
+msgstr "B<Vcs-*:>I< URL>"
 
 #. type: Plain text
-#: deb-src-control.5:78
+#: deb-src-control.5:79
 msgid ""
-"The url of the Version Control System repository used to maintain this "
-"package.  Currently supported are Arch, Bzr (Bazaar), Cvs, Darcs, Git, Hg "
-"(Mercurial), Mtn (Monotone) and Svn (Subversion). Usually this field points "
-"to the latest version of the package, such as the main branch or the trunk."
+"The I<url> of the Version Control System repository used to maintain this "
+"package. Currently supported are B<Arch>, B<Bzr> (Bazaar), B<Cvs>, B<Darcs>, "
+"B<Git>, B<Hg> (Mercurial), B<Mtn> (Monotone) and B<Svn> (Subversion). "
+"Usually this field points to the latest version of the package, such as the "
+"main branch or the trunk."
 msgstr ""
+"Ce champ indique l'I<URL> du système de gestion de version utilisé pour la "
+"gestion du paquet. Les systèmes gérés sont B<Arch>, B<Bzr> (Bazaar), B<Cvs>, "
+"B<Darcs>, B<Git>, B<Hg> (Mercurial), B<Mtn> (Monotone) et B<Svn> "
+"(Subversion). En général, ce champ fait référence à la dernière version du "
+"paquet, c'est à dire la branche principale ou le « trunk »."
 
 #. type: TP
-#: deb-src-control.5:79
-#, fuzzy, no-wrap
-#| msgid "B<Bugs:> E<lt>urlE<gt>"
-msgid "B<Vcs-Browser:> E<lt>urlE<gt>"
-msgstr "B<Bugs:> E<lt>URLE<gt>"
+#: deb-src-control.5:80
+#, no-wrap
+msgid "B<Vcs-Browser:>I< url>"
+msgstr "B<Vcs-Browser:>I< URL>"
 
 #. type: Plain text
-#: deb-src-control.5:82
+#: deb-src-control.5:84
 msgid ""
-"The url of a webinterface to browse the Version Control System repository."
+"The I<url> of a webinterface to browse the Version Control System repository."
 msgstr ""
+"indique l'I<URL> de l'interface web permettant de parcourir le dépôt du "
+"système de gestion de version."
 
 #. type: Plain text
-#: deb-src-control.5:87
-#, fuzzy
-#| msgid "The name of the distribution this package is originating from."
+#: deb-src-control.5:89
 msgid ""
 "The name of the distribution this package is originating from. This field is "
 "usually not needed."
-msgstr "Nom de la distribution dont ce paquet provient."
+msgstr ""
+"indique le nom de la distribution dont le paquet provient. Ce champ n'est "
+"souvent pas nécessaire."
 
 #. type: Plain text
-#: deb-src-control.5:93
-#, fuzzy
-#| 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', `text', `x11' etc."
+#: deb-src-control.5:95
 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\", \"text\", \"x11\", etc."
 msgstr ""
-"C'est un champ général qui indique la catégorie d'un paquet ; cette "
-"catégorie est fondée sur le programme que ce paquet installe. « Utils », "
-"« net », « mail », « text », « x11 », etc. représentent quelques catégories "
+"champ général qui indique la catégorie d'un paquet ; cette catégorie est "
+"fondée sur les programmes que ce paquet installe. « Utils », « net », "
+"« mail », « text », « x11 », etc. représentent quelques catégories "
 "habituelles."
 
 #. type: Plain text
-#: deb-src-control.5:98
-#, fuzzy
-#| msgid ""
-#| "Sets the importance of this package in relation to the system as a "
-#| "whole.  Common priorities are `required', `standard', `optional', `extra' "
-#| "etc."
+#: deb-src-control.5:100
 msgid ""
 "Sets the importance of this package in relation to the system as a whole.  "
 "Common priorities are \"required\", \"standard\", \"optional\", \"extra\", "
 "etc."
 msgstr ""
-"Définit l'importance du paquet à l'intérieur du système général. "
+"définit l'importance du paquet à l'intérieur du système général. "
 "« Required », « standard », « optional », « extra », etc. représentent des "
 "priorités habituelles."
 
 #. type: TP
-#: deb-src-control.5:108
-#, fuzzy, no-wrap
-#| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Build-Depends:> E<lt>package listE<gt>"
-msgstr "B<Depends:> E<lt>liste de paquetE<gt>"
+#: deb-src-control.5:110
+#, no-wrap
+msgid "B<Build-Depends:>I< package-list>"
+msgstr "B<Build-Depends:>I< liste de paquets>"
 
 #. type: Plain text
-#: deb-src-control.5:112
-#, fuzzy
-#| msgid ""
-#| "In the list of packages, the text indicating the current state of the "
-#| "currently selected package."
+#: deb-src-control.5:114
 msgid ""
 "A list of packages that need to be installed and configured to be able to "
 "build the source package."
 msgstr ""
-"Dans la liste des paquets, le texte qui indique l'état actuel du paquet "
-"sélectionné."
+"liste des paquets qu'il est nécessaire d'installer et configurer pour "
+"pouvoir construire le paquet source."
 
 #. type: TP
-#: deb-src-control.5:113
-#, fuzzy, no-wrap
-#| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Build-Depends-Indep:> E<lt>package listE<gt>"
-msgstr "B<Depends:> E<lt>liste de paquetE<gt>"
+#: deb-src-control.5:115
+#, no-wrap
+msgid "B<Build-Depends-Indep:>I< package-list>"
+msgstr "B<Build-Depends-Indep:>I< liste de paquets>"
 
 #. type: Plain text
-#: deb-src-control.5:118
+#: deb-src-control.5:120
 msgid ""
-"Same as Build-Depends, but they are only needed when building the "
-"architecture independent packages. The Build-Depends are also installed in "
-"this case."
+"Same as B<Build-Depends>, but they are only needed when building the "
+"architecture independent packages. The B<Build-Depends> are also installed "
+"in this case."
 msgstr ""
+"liste analogue à B<Build-Depends>, mais restreinte aux paquets nécessaires "
+"pour construire les paquets indépendants de l'architecture. Les paquets "
+"indiqués dans B<Build-Depends> sont alors aussi installés."
 
 #. type: TP
-#: deb-src-control.5:119
-#, fuzzy, no-wrap
-#| msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgid "B<Build-Conflicts:> E<lt>package listE<gt>"
-msgstr "B<Conflicts:> E<lt>liste de paquetsE<gt>"
+#: deb-src-control.5:121
+#, no-wrap
+msgid "B<Build-Conflicts:>I< package-list>"
+msgstr "B<Build-Conflicts:>I< liste de paquets>"
 
 #. type: Plain text
-#: deb-src-control.5:123
+#: deb-src-control.5:125
 msgid ""
 "A list of packages that should not be installed when the package is build, "
 "for example because they interfere with the used build system."
 msgstr ""
+"liste de paquets qui ne doivent pas être installés lorsque le paquet est "
+"construit, par exemple s'ils interfèrent avec le système de construction "
+"utilisé."
 
 #. type: TP
-#: deb-src-control.5:124
-#, fuzzy, no-wrap
-#| msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgid "B<Build-Conflicts-Indep:> E<lt>package listE<gt>"
-msgstr "B<Conflicts:> E<lt>liste de paquetsE<gt>"
+#: deb-src-control.5:126
+#, no-wrap
+msgid "B<Build-Conflicts-Indep:>I< package-list>"
+msgstr "B<Build-Conflicts-Indep:>I< liste de paquets>"
 
 #. type: Plain text
-#: deb-src-control.5:128
+#: deb-src-control.5:130
 msgid ""
-"Same as Build-Conflicts, but only when building the architecture independent "
-"packages."
+"Same as B<Build-Conflicts>, but only when building the architecture "
+"independent packages."
 msgstr ""
+"liste analogue à B<Build-Conflicts> mais restreinte à la construction des "
+"paquets indépendants de l'architecture."
 
 #. type: Plain text
-#: deb-src-control.5:139
-#, fuzzy
-#| 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 packages separated by vertical bar (or `pipe') symbols, `|'. The "
-#| "groups are separated by commas. Commas are to be read as `AND', and pipes "
-#| "as `OR', with pipes binding more tightly. Each package name is optionally "
-#| "followed by a version number specification in parentheses."
+#: deb-src-control.5:141
 msgid ""
 "The syntax of the B<Build-Depends> and B<Build-Depends-Indep> fields is a "
 "list of groups of alternative packages. Each group is a list of packages "
@@ -1219,17 +1223,17 @@
 "a version number specification in parentheses and an architecture "
 "specification in square brackets."
 msgstr ""
-"La syntaxe des champs B<Depends,> B<Pre-Depends,> B<Recommends,> et "
-"B<Suggests> est une liste de groupes contenant des paquets successifs. "
-"Chaque groupe est une liste de paquets séparés par une barre verticale (le "
-"symbole du tube) « | ». Les groupes sont séparés par des virgules. Une "
-"virgule représente un « ET » logique et une barre verticale représente un "
-"« OU » logique ; le tube représente un lien plus fort. Chaque élément est le "
-"nom d'un paquet suivi de façon optionnelle par un numéro de version entre "
-"parenthèses."
+"La syntaxe des champs B<Build-Depends> B<Build-Depends-Indep>est une liste "
+"de groupes contenant des paquets successifs. Chaque groupe est une liste de "
+"paquets séparés par une barre verticale (le symbole du tube) « | ». Les "
+"groupes sont séparés par des virgules. Une virgule représente un « ET » "
+"logique et une barre verticale représente un « OU » logique ; le tube "
+"représente un lien plus fort. Chaque élément est le nom d'un paquet suivi de "
+"façon optionnelle par un numéro de version entre parenthèses et une "
+"indication d'architecture entre accolades."
 
 #. type: Plain text
-#: deb-src-control.5:148
+#: deb-src-control.5:150
 msgid ""
 "The syntax of the B<Build-Conflicts> and B<Build-Conflicts-Indep> fields is "
 "a list of comma-separated package names, where the comma is read as an \"AND"
@@ -1237,17 +1241,15 @@
 "package name is optionally followed by a version number specification in "
 "parentheses and an architecture specification in square brackets."
 msgstr ""
+"La syntaxe des champs B<Build-Conflicts> B<Build-Conflicts-Indep>est une "
+"liste de paquets séparés par des virgules qui représentent le « ET » "
+"logique. L'indication de paquets alternatifs avec une barre verticale (le "
+"symbole du tube) « | » n'est pas prise en charge. Chaque om de paquet peut "
+"être suivi de façon optionnelle par un numéro de version entre parenthèses "
+"et une indication d'architecture entre accolades."
 
 #. type: Plain text
-#: deb-src-control.5:154
-#, fuzzy
-#| 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 "
-#| "(separated by a hyphen). Accepted version relationships are \"E<gt>E<gt>"
-#| "\" for greater than, \"E<lt>E<lt>\" for less than, \"E<gt>=\" for greater "
-#| "than or equal to, \"E<lt>=\" for less than or equal to, and \"=\" for "
-#| "equal to."
+#: deb-src-control.5:156
 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 "
@@ -1257,131 +1259,148 @@
 msgstr ""
 "Un numéro de version peut commencer par « E<gt>E<gt> », et dans ce cas toute "
 "version supérieure correspondra, et il peut indiquer (ou pas) le numéro de "
-"révision pour le paquet debian (les deux numéros étant séparés par un trait "
+"révision pour le paquet Debian (les deux numéros étant séparés par un trait "
 "d'union). Voici les relations acceptées pour les versions : « E<gt>E<gt> » "
 "pour supérieur à, « E<lt>E<lt> » pour inférieur à, « E<gt>= » pour supérieur "
 "ou égal, « E<lt>= » pour inférieur ou égal, et « = » pour égal à."
 
 #. type: Plain text
-#: deb-src-control.5:158
+#: deb-src-control.5:160
 msgid ""
 "A architecture specification consists of one or more architecture names, "
 "separated by whitespace. Exclamation marks may be prepended to each of the "
 "names, meaning \"NOT\"."
 msgstr ""
+"Une indication d'architecture consiste en un ou plusieurs noms "
+"d'architectures, séparés par des espaces. Un nom d'architecture peut être "
+"précédé d'un point d'eclamation qui correspond alors au « NON » logique."
 
 #. type: Plain text
-#: deb-src-control.5:163
+#: deb-src-control.5:165
 msgid ""
 "Note that dependencies on packages in the B<build-essential> set can be "
 "omitted and that declaring build conflicts against them is impossible. A "
 "list of these packages is in the build-essential package."
 msgstr ""
+"Veuillez noter que les dépendance que les paquets du jeu B<build-essential> "
+"peuvent être omises et qu'il n'est pas possible de déclarer des conflits "
+"avec ces paquets. La liste des paquets concernés est fournie par le paquet "
+"build-essential."
 
 #. type: SH
-#: deb-src-control.5:165
-#, fuzzy, no-wrap
-#| msgid "OPTIONAL FIELDS"
+#: deb-src-control.5:167
+#, no-wrap
 msgid "BINARY FIELDS"
-msgstr "CHAMPS OPTIONNELS"
+msgstr "CHAMPS BINAIRES"
 
 #. type: Plain text
-#: deb-src-control.5:174
+#: deb-src-control.5:176
 msgid ""
 "Note that the B<Priority>, B<Section> and B<Homepage> fields can also be in "
 "a binary paragraph to override the global value from the source package."
 msgstr ""
+"Veuillez noter que les champs B<Priority>, B<Section> and B<Homepage> "
+"peuvent être placés dans le paragraphe d'un paquet binaire et leur valeur "
+"remplace alors celle du paquet source."
 
 #. type: TP
-#: deb-src-control.5:175
-#, fuzzy, no-wrap
-#| msgid "B<Package:> E<lt>package nameE<gt>"
-msgid "B<Package:> E<lt>binary package nameE<gt> (required)"
-msgstr "B<Package:> E<lt>nom du paquetE<gt>"
+#: deb-src-control.5:177
+#, no-wrap
+msgid "B<Package:> I<binary-package-name> (required)"
+msgstr "B<Package:> I<nom du paquet binaire> (requis)"
 
 #. type: Plain text
-#: deb-src-control.5:179
+#: deb-src-control.5:181
 msgid ""
 "This field is used to name the binary package name. The same restrictions as "
 "to a source package name apply."
 msgstr ""
+"Ce champ sert à indiquer le nom du paquet binaire. Les restrictions sont les "
+"mêmes que celle des paquets source."
 
 #. type: TP
-#: deb-src-control.5:180
-#, fuzzy, no-wrap
-#| msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgid "B<Architecture:> E<lt>arch|all|anyE<gt> (required)"
-msgstr "B<Architecture:> E<lt>arch|allE<gt>"
+#: deb-src-control.5:182
+#, no-wrap
+msgid "B<Architecture:> I<arch>|B<all>|B<any> (required)"
+msgstr "B<Architecture:> I<arch>|B<all>|B<any> (requis)"
 
 #. type: Plain text
-#: deb-src-control.5:190
+#: deb-src-control.5:195
 msgid ""
 "The architecture specifies on which type of hardware this package runs. For "
 "packages that run on all architectures, use the B<any> value. For packages "
 "that are architecture independent, such as shell and Perl scripts or "
 "documentation, use the B<all> value. To restrict the packages to a certain "
-"set of architectures, specify the architecture names, separated by a space."
-msgstr ""
+"set of architectures, specify the architecture names, separated by a space. "
+"It's also possible to put architecture wildcards in that list (see B<dpkg-"
+"architecture>(1)  for more information about them)."
+msgstr ""
+"Ce champ indique l'architecture matérielle sur laquelle le paquet peut être "
+"utilisé. Les paquets qui peuvent être utilisés sur toute architecture "
+"doivent utiliser le champ B<any>. Les paquets indépendants de "
+"l'architecture, tels les scripts shell ou Perl ou la documentation utilisent "
+"la valeur B<all>. Pour restreindre un paquet à certaines architectures, "
+"leurs noms doivent être indiqués séparés par des espaces. Il est également "
+"possible d'utiliser des noms génériques d'architectures dans cette liste "
+"(voir B<dpkg-architecture>(1) pour plus d'informations sur ces architectures "
+"génériques)."
 
 #. type: TP
-#: deb-src-control.5:191
-#, fuzzy, no-wrap
-#| msgid "B<Package:> E<lt>package nameE<gt>"
-msgid "B<Package-Type:> E<lt>deb|udebE<gt>"
-msgstr "B<Package:> E<lt>nom du paquetE<gt>"
+#: deb-src-control.5:196
+#, no-wrap
+msgid "B<Package-Type:> B<deb>|B<udeb>"
+msgstr "B<Package-Type:> B<deb>|B<udeb>"
 
 #. type: Plain text
-#: deb-src-control.5:196
+#: deb-src-control.5:201
 msgid ""
 "This field defines the type of the package. \"udeb\" is for size-constrained "
 "packages used by the debian installer. \"deb\" is the default value, it's "
 "assumed if the field is absent. More types might be added in the future."
 msgstr ""
+"Ce champ indique le type de paquet. La valeur « udeb » est à utiliser pour "
+"les paquets à taille contrôlée utilisés par l'installateur Debian. La valeur "
+"« deb » est la valeur par défaut qui est utilisée si le champ n'est pas "
+"présent. De nouveaux types pourraient être ajoutés au fil du temps."
 
 #. type: TP
-#: deb-src-control.5:214
-#, fuzzy, no-wrap
-#| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
-msgstr "B<Source:> E<lt>nom du sourceE<gt>"
-
-#. type: TP
-#: deb-src-control.5:220
-#, fuzzy, no-wrap
-#| msgid "B<Description:> E<lt>short descriptionE<gt>"
-msgid "B<Description:> E<lt>short descriptionE<gt> (required)"
-msgstr "B<Description:> E<lt>description courteE<gt>"
+#: deb-src-control.5:225
+#, no-wrap
+msgid "B<Description:> I<short-description> (required)"
+msgstr "B<Description:> I<description courte> (requis)"
 
 #. type: Plain text
-#: deb-src-control.5:227
+#: deb-src-control.5:232
 msgid ""
 "These fields are described in the B<deb-control>(5)  manual page, as they "
 "are copied literally to the control file of the binary package."
 msgstr ""
+"Ces champs sont décrits dans la page de manuel de B<deb-control>(5), car ils "
+"sont copiés littéralement dans le fichier « control » du paquet binaire."
 
 #. type: TP
-#: deb-src-control.5:243
-#, fuzzy, no-wrap
-#| msgid "B<Replaces:> E<lt>package listE<gt>"
-msgid "B<Enhances:> E<lt>package listE<gt>"
-msgstr "B<Replaces:> E<lt>liste de paquetsE<gt>"
+#: deb-src-control.5:248
+#, no-wrap
+msgid "B<Enhances:>I< package-list>"
+msgstr "B<Enhances:>I< liste de paquets>"
 
 #. type: Plain text
-#: deb-src-control.5:265
+#: deb-src-control.5:270
 msgid ""
 "These fields declare relationships between packages. They are discussed in "
 "the B<deb-control>(5)  manpage and in the B<debian-policy> package."
 msgstr ""
+"Ces champs indiquent les relations entre les paquets. Ils sont détaillés "
+"dans la page de manuel B<deb-control>(5) et dans le paquet B<debian-policy>."
 
 #. type: SH
-#: deb-src-control.5:266
-#, fuzzy, no-wrap
-#| msgid "REQUIRED FIELDS"
+#: deb-src-control.5:271
+#, no-wrap
 msgid "USER-DEFINED FIELDS"
-msgstr "LES CHAMPS EXIGÉS"
+msgstr "LES CHAMPS UTILISATEUR"
 
 #. type: Plain text
-#: deb-src-control.5:281
+#: deb-src-control.5:286
 msgid ""
 "It is allowed to add additional user-defined fields to the control file. The "
 "tools will ignore these fields. If you want the fields to be copied over to "
@@ -1396,10 +1415,37 @@
 "changes file and will not appear in the binary or source package control "
 "files."
 msgstr ""
+"Il est possible d'ajouter des champs définis par l'utilisateur au fichier "
+"« control ». Les outils les ignoreront. Si ces champs doivent être copiés "
+"vers les fichiers créés, par exemple les paquets binaires, il est "
+"indispensable d'utiliser un schéma de nommage personnalisé : les champs "
+"doivent commencer par la lettre X suivie de l'un des lettres B, C ou S et "
+"d'un tiret. Si la lettre B est utilisée, le champ sera copié dans le fichier "
+"« control » du paquet binaire, voir B<deb-control>(5). Avec la lettre S, le "
+"champ sera copié dans le fichier « control » du paquet source créé par "
+"B<dpkg-source>(1). Enfin, la lettre C provoquera la recopie du champ dans le "
+"fichier de contrôle de l'envoi (« .changes »). Les préfixes X[BCS]- sont "
+"supprimés lors de ces recopies. Ainsi, un champ B<XC-Approved-By> apparaîtra "
+"sous le nom B<Approved-By> dans le fichier « changes » mais pas dans le "
+"fichier « control » du paquet binaire ni dans celui du paquet source."
 
 #. type: Plain text
-#: deb-src-control.5:299
-#, no-wrap
+#: deb-src-control.5:304
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# Comment\n"
+#| "Source: dpkg\n"
+#| "Section: admin\n"
+#| "Priority: required\n"
+#| "Maintainer: Dpkg Developers E<lt>debian-dpkg@lists.debian.orgE<gt>\n"
+#| "# this field is copied to the binary and source packages\n"
+#| "XBS-Upstream-Release-Status: stable\n"
+#| "Homepage: http://wiki.debian.org/Teams/Dpkg\n"
+#| "Vcs-Browser: http://git.debian.org/?p=dpkg/dpkg.git\n"
+#| "Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
+#| "Standards-Version: 3.7.3\n"
+#| "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
+#| " libselinux1-dev (E<gt>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]\n"
 msgid ""
 "# Comment\n"
 "Source: dpkg\n"
@@ -1413,12 +1459,44 @@
 "Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
-" libselinux1-dev (E<gt>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]\n"
+" libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
 msgstr ""
+"# Commentaire\n"
+"Source: dpkg\n"
+"Section: admin\n"
+"Priority: required\n"
+"Maintainer: Dpkg Developers E<lt>debian-dpkg@lists.debian.orgE<gt>\n"
+"# ce champ est copié dans les paquets source et binaires\n"
+"XBS-Upstream-Release-Status: stable\n"
+"Homepage: http://wiki.debian.org/Teams/Dpkg\n"
+"Vcs-Browser: http://git.debian.org/?p=dpkg/dpkg.git\n"
+"Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
+"Standards-Version: 3.7.3\n"
+"Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
+" libselinux1-dev (E<gt>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]\n"
 
 #. type: Plain text
-#: deb-src-control.5:318
-#, no-wrap
+#: deb-src-control.5:323
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: dpkg-dev\n"
+#| "Section: utils\n"
+#| "Priority: optional\n"
+#| "Architecture: all\n"
+#| "# this is a custom field in the binary package\n"
+#| "XB-Mentoring-Contact: Raphael Hertzog E<lt>hertzog@debian.orgE<gt>\n"
+#| "Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2), bzip2, lzma,\n"
+#| " patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
+#| "Recommends: gcc | c-compiler, build-essential\n"
+#| "Suggests: gnupg, debian-keyring\n"
+#| "Conflicts: dpkg-cross (E<lt>E<lt> 2.0.0), devscripts (E<lt>E<lt> 2.10.26)\n"
+#| "Replaces: manpages-pl (E<lt>= 20051117-1)\n"
+#| "Description: Debian package development tools\n"
+#| " This package provides the development tools (including dpkg-source)\n"
+#| " required to unpack, build and upload Debian source packages.\n"
+#| " .\n"
+#| " Most Debian source packages will require additional tools to build;\n"
+#| " for example, most packages need make and the C compiler gcc.\n"
 msgid ""
 "Package: dpkg-dev\n"
 "Section: utils\n"
@@ -1426,6 +1504,25 @@
 "Architecture: all\n"
 "# this is a custom field in the binary package\n"
 "XB-Mentoring-Contact: Raphael Hertzog E<lt>hertzog@debian.orgE<gt>\n"
+"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2),\n"
+" bzip2, lzma, patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
+"Recommends: gcc | c-compiler, build-essential\n"
+"Suggests: gnupg, debian-keyring\n"
+"Conflicts: dpkg-cross (E<lt>E<lt> 2.0.0), devscripts (E<lt>E<lt> 2.10.26)\n"
+"Replaces: manpages-pl (E<lt>= 20051117-1)\n"
+"Description: Debian package development tools\n"
+" This package provides the development tools (including dpkg-source)\n"
+" required to unpack, build and upload Debian source packages.\n"
+" .\n"
+" Most Debian source packages will require additional tools to build;\n"
+" for example, most packages need make and the C compiler gcc.\n"
+msgstr ""
+"Package: dpkg-dev\n"
+"Section: utils\n"
+"Priority: optional\n"
+"Architecture: all\n"
+"# champ personnalisé dans le paquet binaire\n"
+"XB-Mentoring-Contact: Raphael Hertzog E<lt>hertzog@debian.orgE<gt>\n"
 "Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2), bzip2, lzma,\n"
 " patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
 "Recommends: gcc | c-compiler, build-essential\n"
@@ -1438,14 +1535,11 @@
 " .\n"
 " Most Debian source packages will require additional tools to build;\n"
 " for example, most packages need make and the C compiler gcc.\n"
-msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:325
-#, fuzzy
-#| msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
+#: deb-src-control.5:330
 msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
-msgstr "B<deb-control>(5), B<deb>(5), B<dpkg>(1)."
+msgstr "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
 
 #. type: TH
 #: deb-split.5:1
@@ -1454,10 +1548,11 @@
 msgstr "deb-split"
 
 #. type: TH
-#: deb-split.5:1
+#: deb-split.5:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 dpkg-vendor.1:1 start-stop-daemon.8:1
 #, no-wrap
-msgid "2010-01-28"
-msgstr "28-01-2010"
+msgid "2011-07-04"
+msgstr "07-04-2011"
 
 #. type: Plain text
 #: deb-split.5:4
@@ -1486,28 +1581,75 @@
 "dpkg 1.15.6)."
 
 #. type: Plain text
-#: deb-split.5:21
+#: deb-split.5:15
 msgid ""
 "The first member is named B<debian-split> and contains a series of lines, "
-"separated by newlines. Currently seven lines are present.  The first is the "
-"format version number, B<2.1> at the time this manual page was written. The "
-"second is the package name. The third is the package version. The fourth is "
-"the md5sum of the package.  The fifth is the total size of the package. The "
-"sixth is the maximum part size. The seventh is the current part number, "
-"followed by a slash and the total amount of parts (as in \\(oq1/10\\(cq)."
-msgstr ""
-"Le premier membre est nommé B<debian-split> et contient une succession de "
-"lignes, séparées par des retours-chariot. Pour le moment, sept lignes sont "
-"présentes. La première est le numéro de version du format, B<2.1> à l'heure "
-"où ce document a été écrit. Le second est le nom du paquet. Le troisième est "
-"la version du paquet. Le quatrième est la somme MD5 du paquet. Le cinquième "
-"est la taille totale du paquet. Le sixième est la taille maximale d'une "
-"partie. Le septième est le numéro d'ordre de la partie concernée, suivi du "
-"caractère « / » et du nombre total de parties (de le forme \\(oq1/10\\(cq)."
+"separated by newlines. Currently eight lines are present:"
+msgstr ""
+"Le premier membre est appelé B<debians-split> et contient un ensemble de "
+"lignes, séparées par des retours à la ligne. Actuellement, huit lignes sont "
+"présentes :"
+
+#. type: IP
+#: deb-split.5:15 deb-split.5:18 deb-split.5:20 deb-split.5:22 deb-split.5:24
+#: deb-split.5:26 deb-split.5:28 deb-split.5:31 dpkg-gensymbols.1:20
+#: dpkg-gensymbols.1:22 dpkg-gensymbols.1:24 dpkg-gensymbols.1:26
+#: dpkg-gensymbols.1:311 dpkg-gensymbols.1:317 dpkg-gensymbols.1:351
+#: dpkg-gensymbols.1:355 dpkg-gensymbols.1:358
+#, no-wrap
+msgid "\\(bu"
+msgstr "\\(bu"
+
+#. type: Plain text
+#: deb-split.5:18
+msgid ""
+"The format version number, B<2.1> at the time this manual page was written."
+msgstr ""
+"Numéro de version du format, B<2.1> au moment de la rédaction de cette page "
+"de manuel."
+
+#. type: Plain text
+#: deb-split.5:20
+msgid "The package name."
+msgstr "Nom du paquet"
+
+#. type: Plain text
+#: deb-split.5:22
+msgid "The package version."
+msgstr "Version du paquet"
 
-# type: Plain text
 #. type: Plain text
 #: deb-split.5:24
+msgid "The md5sum of the package."
+msgstr "Somme de contrôle MD5 du paquet"
+
+#. type: Plain text
+#: deb-split.5:26
+msgid "The total size of the package."
+msgstr "Taille totale du paquet"
+
+#. type: Plain text
+#: deb-split.5:28
+msgid "The maximum part size."
+msgstr "Taille maximale d'un membre"
+
+#. type: Plain text
+#: deb-split.5:31
+msgid ""
+"The current part number, followed by a slash and the total amount of parts "
+"(as in \\(oq1/10\\(cq)."
+msgstr ""
+"Numéro du membre courant, suivi d'une barre oblique (/) et du nombre total "
+"de membres (par exemple \\(oq1/10\\(cq)."
+
+#. type: Plain text
+#: deb-split.5:33
+msgid "The package architecture (since dpkg 1.16.1)."
+msgstr "Architecture du paquet (depuis dpkg 1.16.1)"
+
+# type: Plain text
+#. type: Plain text
+#: deb-split.5:36
 msgid ""
 "Programs which read multi-part archives should be prepared for additional "
 "lines to be present, and should ignore these if this is the case."
@@ -1517,7 +1659,7 @@
 "existent)."
 
 #. type: Plain text
-#: deb-split.5:29
+#: deb-split.5:41
 msgid ""
 "If the version 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 "
@@ -1531,19 +1673,29 @@
 "l'archive (excepté à la fin de cette dernière), comme décrit ci-dessous."
 
 #. type: Plain text
-#: deb-split.5:32
+#: deb-split.5:44
+#, fuzzy
+#| msgid ""
+#| "The second, last required member is named B<data.>N, where N denotes the "
+#| "part number. It contains the raw part data."
 msgid ""
-"The second, last required member is named B<data.>N, where N denotes the "
-"part number. It contains the raw part data."
+"The second, last required member is named B<data.>I<N>, where I<N> denotes "
+"the part number. It contains the raw part data."
 msgstr ""
 "Le deuxième et dernier membre requis se nomme B<data.>N où N est le numéro "
 "de la partie. Il contient les données brutes de la partie."
 
 #. type: Plain text
-#: deb-split.5:37
+#: deb-split.5:49
+#, fuzzy
+#| msgid ""
+#| "These members must occur in this exact order. Current implementations "
+#| "should ignore any additional members after B<data.>N.  Further members "
+#| "may be defined in the future, and (if possible) will be placed after "
+#| "these two."
 msgid ""
 "These members must occur in this exact order. Current implementations should "
-"ignore any additional members after B<data.>N.  Further members may be "
+"ignore any additional members after B<data.>I<N>.  Further members may be "
 "defined in the future, and (if possible) will be placed after these two."
 msgstr ""
 "Ces membres doivent apparaître dans cet ordre exact. Les implémentations "
@@ -1552,7 +1704,7 @@
 "placés après les deux premiers."
 
 #. type: Plain text
-#: deb-split.5:39
+#: deb-split.5:51
 msgid "B<deb>(5), B<dpkg-split>(1)."
 msgstr "B<deb>(5), B<dpkg-split>(1)."
 
@@ -1562,13 +1714,6 @@
 msgid "deb-version"
 msgstr "deb-version"
 
-#. type: TH
-#: deb-version.5:5 dpkg-distaddfile.1:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-name.1:6
-#, no-wrap
-msgid "2008-08-18"
-msgstr "18-08-2008"
-
 #. type: Plain text
 #: deb-version.5:8
 msgid "deb-version - Debian package version number format"
@@ -1576,7 +1721,9 @@
 
 #. type: Plain text
 #: deb-version.5:11
-msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+#, fuzzy
+#| msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgid "[I<epoch>B<:>]I<upstream-version>[B<->I<debian-revision>]"
 msgstr "[ I<epoch>:] I<version_amont> [-I<révision_debian> ]"
 
 #. type: Plain text
@@ -1596,9 +1743,14 @@
 
 #. type: Plain text
 #: deb-version.5:20
+#, fuzzy
+#| msgid ""
+#| "This is a single (generally small) unsigned integer.  It may be omitted, "
+#| "in which case zero is assumed.  If it is omitted then the "
+#| "I<upstream_version> may not contain any colons."
 msgid ""
 "This is a single (generally small) unsigned integer.  It may be omitted, in "
-"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"which case zero is assumed.  If it is omitted then the I<upstream-version> "
 "may not contain any colons."
 msgstr ""
 "Ce nombre est un entier positif (usuellement petit). Il peut être omis (dans "
@@ -1618,8 +1770,9 @@
 
 #. type: TP
 #: deb-version.5:24
-#, no-wrap
-msgid "I<upstream_version>"
+#, fuzzy, no-wrap
+#| msgid "I<upstream_version>"
+msgid "I<upstream-version>"
 msgstr "I<upstream_version>"
 
 #. type: Plain text
@@ -1641,9 +1794,14 @@
 
 #. type: Plain text
 #: deb-version.5:39
+#, fuzzy
+#| msgid ""
+#| "The comparison behavior of the package management system with respect to "
+#| "the I<upstream_version> is described below.  The I<upstream_version> "
+#| "portion of the version number is mandatory."
 msgid ""
 "The comparison behavior of the package management system with respect to the "
-"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"I<upstream-version> is described below. The I<upstream-version> portion of "
 "the version number is mandatory."
 msgstr ""
 "Le principe de comparaison du système de gestion de paquet en ce qui "
@@ -1652,10 +1810,17 @@
 
 #. type: Plain text
 #: deb-version.5:48
+#, fuzzy
+#| msgid ""
+#| "The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") "
+#| "and the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, "
+#| "colon, tilde) and should start with a digit.  If there is no "
+#| "I<debian_revision> then hyphens are not allowed; if there is no I<epoch> "
+#| "then colons are not allowed."
 msgid ""
-"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"The I<upstream-version> may contain only alphanumerics (\"A-Za-z0-9\") and "
 "the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
-"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"tilde) and should start with a digit.  If there is no I<debian-revision> "
 "then hyphens are not allowed; if there is no I<epoch> then colons are not "
 "allowed."
 msgstr ""
@@ -1667,17 +1832,24 @@
 
 #. type: TP
 #: deb-version.5:48
-#, no-wrap
-msgid "I<debian_revision>"
+#, fuzzy, no-wrap
+#| msgid "I<debian_revision>"
+msgid "I<debian-revision>"
 msgstr "I<debian_revision>"
 
 #. type: Plain text
 #: deb-version.5:57
+#, fuzzy
+#| msgid ""
+#| "This part of the version number specifies the version of the Debian "
+#| "package based on the upstream version.  It may contain only alphanumerics "
+#| "and the characters B<+> B<.> B<~> (plus, full stop, tilde) and is "
+#| "compared in the same way as the I<upstream_version> is."
 msgid ""
 "This part of the version number specifies the version of the Debian package "
 "based on the upstream version.  It may contain only alphanumerics and the "
 "characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
-"same way as the I<upstream_version> is."
+"same way as the I<upstream-version> is."
 msgstr ""
 "Cette partie du numéro de version indique la version du paquet Debian à "
 "partir du numéro de la version amont. Elle ne doit contenir que des symboles "
@@ -1686,8 +1858,15 @@
 
 #. type: Plain text
 #: deb-version.5:64
+#, fuzzy
+#| msgid ""
+#| "It is optional; if it isn't present then the I<upstream_version> may not "
+#| "contain a hyphen.  This format represents the case where a piece of "
+#| "software was written specifically to be turned into a Debian package, and "
+#| "so there is only one \"debianisation\" of it and therefore no revision "
+#| "indication is required."
 msgid ""
-"It is optional; if it isn't present then the I<upstream_version> may not "
+"It is optional; if it isn't present then the I<upstream-version> may not "
 "contain a hyphen.  This format represents the case where a piece of software "
 "was written specifically to be turned into a Debian package, and so there is "
 "only one \"debianisation\" of it and therefore no revision indication is "
@@ -1701,20 +1880,31 @@
 
 #. type: Plain text
 #: deb-version.5:68
+#, fuzzy
+#| msgid ""
+#| "It is conventional to restart the I<debian_revision> at '1' each time "
+#| "time the I<upstream_version> is increased."
 msgid ""
-"It is conventional to restart the I<debian_revision> at '1' each time time "
-"the I<upstream_version> is increased."
+"It is conventional to restart the I<debian-revision> at '1' each time time "
+"the I<upstream-version> is increased."
 msgstr ""
 "Il est convenu de repartir à '1' pour la I<révision_debian> à chaque fois "
 "que la I<version_amont> est incrémentée."
 
 #. type: Plain text
 #: deb-version.5:76
+#, fuzzy
+#| msgid ""
+#| "Dpkg will break the version number apart at the last hyphen in the string "
+#| "(if there is one) to determine the I<upstream_version> and "
+#| "I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
+#| "than the presence of one (but note that the I<debian_revision> is the "
+#| "least significant part of the version number)."
 msgid ""
 "Dpkg will break the version number apart at the last hyphen in the string "
-"(if there is one) to determine the I<upstream_version> and "
-"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
-"than the presence of one (but note that the I<debian_revision> is the least "
+"(if there is one) to determine the I<upstream-version> and I<debian-"
+"revision>. The absence of a I<debian-revision> compares earlier than the "
+"presence of one (but note that the I<debian-revision> is the least "
 "significant part of the version number)."
 msgstr ""
 "Dpkg s'arrêtera au dernier signe moins (\"-\") du numéro de version (s'il y "
@@ -1731,8 +1921,12 @@
 
 #. type: Plain text
 #: deb-version.5:80
+#, fuzzy
+#| msgid ""
+#| "The I<upstream_version> and I<debian_revision> parts are compared by the "
+#| "package management system using the same algorithm:"
 msgid ""
-"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"The I<upstream-version> and I<debian-revision> parts are compared by the "
 "package management system using the same algorithm:"
 msgstr ""
 "Les parties I<version_amont> et I<revision_Debian> sont comparées par le "
@@ -1830,11 +2024,11 @@
 msgstr "B<deb-control>(5), B<deb>(5), B<dpkg>(1)."
 
 #. type: SH
-#: deb-version.5:120 dpkg.1:797 dpkg-buildpackage.1:256 dpkg-distaddfile.1:47
-#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
+#: deb-version.5:120 dpkg.1:783 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:460
 #: dpkg-maintscript-helper.1:128 dpkg-parsechangelog.1:123
-#: dpkg-shlibdeps.1:331 dpkg-source.1:706 dselect.1:458
-#: start-stop-daemon.8:294 update-alternatives.8:493
+#: dpkg-shlibdeps.1:329 dpkg-source.1:730 dselect.1:451
+#: start-stop-daemon.8:323 update-alternatives.8:494
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTEURS"
@@ -1845,18 +2039,18 @@
 msgstr "Copyright \\(co 1996,1997,1998 Ian Jackson et Christian Schwarz"
 
 #. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:262
+#: deb-version.5:124 dpkg-buildpackage.1:263
 msgid "Copyright \\(co 2007 Frank Lichtenheld"
 msgstr "Copyright \\(co 2007 Frank Lichtenheld"
 
 #. type: Plain text
-#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:125
-#: dpkg-buildpackage.1:266 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
-#: dpkg-deb.1:256 dpkg-divert.8:139 dpkg-genchanges.1:154
-#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-maintscript-helper.1:139
-#: dpkg-mergechangelogs.1:71 dpkg-name.1:107 dpkg-parsechangelog.1:131
-#: dpkg-query.1:211 dpkg-shlibdeps.1:341 dpkg-source.1:714 dpkg-split.1:233
-#: dpkg-statoverride.8:92 dpkg-vendor.1:53 update-alternatives.8:500
+#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:273
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:269 dpkg-divert.8:139 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:464 dpkg-maintscript-helper.1:139
+#: dpkg-mergechangelogs.1:71 dpkg-name.1:108 dpkg-parsechangelog.1:131
+#: dpkg-query.1:219 dpkg-shlibdeps.1:339 dpkg-source.1:738 dpkg-split.1:227
+#: dpkg-statoverride.8:91 dpkg-vendor.1:53 update-alternatives.8:501
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO WARRANTY."
@@ -1870,12 +2064,6 @@
 msgid "deb-old"
 msgstr "deb-old"
 
-#. type: TH
-#: deb-old.5:1
-#, no-wrap
-msgid "2006-02-28"
-msgstr "28-02-2006"
-
 #. type: Plain text
 #: deb-old.5:4
 msgid "deb-old - old style Debian binary package format"
@@ -1976,12 +2164,6 @@
 msgstr "deb-override"
 
 #. type: TH
-#: deb-override.5:15
-#, no-wrap
-msgid "2007-03-07"
-msgstr "07-03-2007"
-
-#. type: TH
 #: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
 #: deb-symbols.5:2 deb-triggers.5:1 dpkg-architecture.1:1
 #: dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1
@@ -2193,7 +2375,9 @@
 
 #. type: Plain text
 #: deb-shlibs.5:34
-msgid "[I<type:>] I<library> I<version> I<dependencies>"
+#, fuzzy
+#| msgid "[I<type:>] I<library> I<version> I<dependencies>"
+msgid "[I<type>B<:>] I<library> I<version> I<dependencies>"
 msgstr "[I<type:>] I<biblitohèque> I<version> I<dépendances>"
 
 #. type: Plain text
@@ -2213,8 +2397,8 @@
 msgstr "Lire la charte Debian pour plus d'informations."
 
 #. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:728 dpkg-architecture.1:263
-#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:458
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:714 dpkg-architecture.1:262
+#: dpkg-divert.8:91 dpkg-name.1:65 update-alternatives.8:459
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "EXEMPLES"
@@ -2604,11 +2788,11 @@
 "avertissement et une valeur nulle est assumée."
 
 #. type: SH
-#: deb-substvars.5:145 dpkg.1:641 dpkg-architecture.1:285 dpkg.cfg.5:12
-#: dpkg-buildflags.1:103 dpkg-distaddfile.1:39 dpkg-divert.8:122
+#: deb-substvars.5:145 dpkg.1:627 dpkg-architecture.1:284 dpkg.cfg.5:12
+#: dpkg-buildflags.1:121 dpkg-distaddfile.1:39 dpkg-divert.8:122
 #: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
-#: dpkg-split.1:212 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:361
+#: dpkg-split.1:206 dpkg-statoverride.8:74 dselect.cfg.5:12
+#: update-alternatives.8:360
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
@@ -2625,15 +2809,15 @@
 msgstr "La liste des variables de substitution et leurs valeurs."
 
 #. type: SH
-#: deb-substvars.5:150 dpkg.1:794 dpkg-buildpackage.1:244 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:698 dpkg-split.1:197 dselect.1:436
-#: update-alternatives.8:485
+#: deb-substvars.5:150 dpkg.1:780 dpkg-buildpackage.1:244 dpkg-deb.1:238
+#: dpkg-name.1:86 dpkg-source.1:722 dpkg-split.1:199 dselect.1:429
+#: update-alternatives.8:486
 #, no-wrap
 msgid "BUGS"
 msgstr "BOGUES"
 
 #. type: Plain text
-#: deb-substvars.5:153 dpkg-source.1:701
+#: deb-substvars.5:153 dpkg-source.1:725
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -2652,27 +2836,27 @@
 "(1), B<dpkg-source>(1)."
 
 #. type: SH
-#: deb-substvars.5:161 dpkg-architecture.1:304 dpkg.cfg.5:19
-#: dpkg-buildflags.1:120 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
-#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:103
-#: dpkg-query.1:206 dpkg-scansources.1:77 dpkg-split.1:229
-#: dpkg-statoverride.8:88 dpkg-vendor.1:48 dselect.cfg.5:19
+#: deb-substvars.5:161 dpkg-architecture.1:303 dpkg.cfg.5:19
+#: dpkg-buildflags.1:266 dpkg-checkbuilddeps.1:40 dpkg-deb.1:265
+#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:104
+#: dpkg-query.1:214 dpkg-scansources.1:76 dpkg-split.1:223
+#: dpkg-statoverride.8:87 dpkg-vendor.1:48 dselect.cfg.5:19
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 #. type: Plain text
-#: deb-substvars.5:163 dpkg-buildpackage.1:258 dpkg-distaddfile.1:49
-#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:708
-#: dpkg-split.1:231
+#: deb-substvars.5:163 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
+#: dpkg-deb.1:267 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:331 dpkg-source.1:732
+#: dpkg-split.1:225
 msgid "Copyright \\(co 1995-1996 Ian Jackson"
 msgstr "Copyright \\(co 1995-1996 Ian Jackson"
 
 #. type: Plain text
-#: deb-substvars.5:165 dpkg-buildpackage.1:260 dpkg-distaddfile.1:51
+#: deb-substvars.5:165 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
 #: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
-#: dpkg-shlibdeps.1:335 dpkg-source.1:710 dpkg-statoverride.8:90
+#: dpkg-shlibdeps.1:333 dpkg-source.1:734 dpkg-statoverride.8:89
 msgid "Copyright \\(co 2000 Wichert Akkerman"
 msgstr "Copyright \\(co 2000 Wichert Akkerman"
 
@@ -2682,12 +2866,6 @@
 msgid "deb-symbols"
 msgstr "deb-symbols"
 
-#. type: TH
-#: deb-symbols.5:2
-#, no-wrap
-msgid "2007-07-16"
-msgstr "16-07-2007"
-
 #. type: Plain text
 #: deb-symbols.5:5
 msgid "deb-symbols - Debian's extended shared library information file"
@@ -2710,12 +2888,16 @@
 
 #. type: Plain text
 #: deb-symbols.5:14
-msgid "E<lt>library sonameE<gt> E<lt>main dependency templateE<gt>"
+#, fuzzy
+#| msgid "E<lt>library sonameE<gt> E<lt>main dependency templateE<gt>"
+msgid "I<library-soname main-dependency-template>"
 msgstr "E<lt>bibliothèque sonameE<gt> E<lt>modèle principal de dépendanceE<gt>"
 
 #. type: Plain text
 #: deb-symbols.5:16
-msgid "[ | E<lt>alternative dependency templateE<gt> ]"
+#, fuzzy
+#| msgid "[ | E<lt>alternative dependency templateE<gt> ]"
+msgid "[ | I<alternative-dependency-template> ]"
 msgstr "[ | E<lt>modèle alternatif de dépendanceE<gt> ]"
 
 #. type: Plain text
@@ -2725,25 +2907,37 @@
 
 #. type: Plain text
 #: deb-symbols.5:20
-msgid "[ * E<lt>field-nameE<gt>: E<lt>field valueE<gt> ]"
+#, fuzzy
+#| msgid "[ * E<lt>field-nameE<gt>: E<lt>field valueE<gt> ]"
+msgid "[ * I<field-name>: I<field-value> ]"
 msgstr "[ * E<lt>nom-du-champE<gt>: E<lt>valeur du champE<gt> ]"
 
 #. type: Plain text
 #: deb-symbols.5:23
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "[ ... ]\n"
+#| " E<lt>symbolE<gt> E<lt>minimal versionE<gt>[ E<lt>id of dependency templateE<gt> ]\n"
 msgid ""
 "[ ... ]\n"
-" E<lt>symbolE<gt> E<lt>minimal versionE<gt>[ E<lt>id of dependency templateE<gt> ]\n"
+" I<symbol> I<minimal-version>[ I<id-of-dependency-template> ]\n"
 msgstr ""
 "[ ... ]\n"
 " E<lt>symboleE<gt> E<lt>version minimumE<gt>[ E<lt>id du modèle de dépendanceE<gt> ]\n"
 
 #. type: Plain text
 #: deb-symbols.5:29
-msgid ""
-"The I<library soname> is exactly the value of the SONAME field as exported "
-"by B<objdump>(1). A I<dependency template> is a dependency where I<#MINVER#> "
-"is dynamically replaced either by a version check like \"(E<gt>= I<minimal "
+#, fuzzy
+#| msgid ""
+#| "The I<library soname> is exactly the value of the SONAME field as "
+#| "exported by B<objdump>(1). A I<dependency template> is a dependency where "
+#| "I<#MINVER#> is dynamically replaced either by a version check like "
+#| "\"(E<gt>= I<minimal version>)\" or by nothing (if an unversioned "
+#| "dependency is deemed sufficient)."
+msgid ""
+"The I<library-soname> is exactly the value of the SONAME field as exported "
+"by B<objdump>(1). A I<dependency-template> is a dependency where I<#MINVER#> "
+"is dynamically replaced either by a version check like \"(E<gt>= I<minimal-"
 "version>)\" or by nothing (if an unversioned dependency is deemed "
 "sufficient)."
 msgstr ""
@@ -2755,11 +2949,19 @@
 
 #. type: Plain text
 #: deb-symbols.5:36
+#, fuzzy
+#| msgid ""
+#| "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> "
+#| "being \"Base\" if the library is not versioned) is associated to a "
+#| "I<minimal version> of its dependency template (the main dependency "
+#| "template is used if I<id of dependency template> is not present). The "
+#| "first alternative dependency template is numbered 1, the second one 2, "
+#| "etc."
 msgid ""
 "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> being "
-"\"Base\" if the library is not versioned) is associated to a I<minimal "
+"\"Base\" if the library is not versioned) is associated to a I<minimal-"
 "version> of its dependency template (the main dependency template is used if "
-"I<id of dependency template> is not present). The first alternative "
+"I<id-of-dependency-template> is not present). The first alternative "
 "dependency template is numbered 1, the second one 2, etc."
 msgstr ""
 "Chaque I<symbole> exporté (noté I<nom>@I<version>, avec I<version> qui "
@@ -2771,12 +2973,20 @@
 
 #. type: Plain text
 #: deb-symbols.5:43
+#, fuzzy
+#| msgid ""
+#| "Each entry for a library can also have some fields of meta-information.  "
+#| "Those fields are stored on lines starting with an asterisk. Currently, "
+#| "the only valid field is I<Build-Depends-Package>, it indicates the name "
+#| "of the \"-dev\" package associated to the library and is used by dpkg-"
+#| "shlibdeps to make sure that the dependency generated is at least as "
+#| "strict as the corresponding build dependency."
 msgid ""
 "Each entry for a library can also have some fields of meta-information.  "
 "Those fields are stored on lines starting with an asterisk. Currently, the "
 "only valid field is I<Build-Depends-Package>, it indicates the name of the "
-"\"-dev\" package associated to the library and is used by dpkg-shlibdeps to "
-"make sure that the dependency generated is at least as strict as the "
+"\"-dev\" package associated to the library and is used by B<dpkg-shlibdeps> "
+"to make sure that the dependency generated is at least as strict as the "
 "corresponding build dependency."
 msgstr ""
 "Chaque entrée pour une bibliothèque peut aussi avoir des champs de méta-"
@@ -2854,12 +3064,6 @@
 msgid "deb-triggers"
 msgstr "deb-triggers"
 
-#. type: TH
-#: deb-triggers.5:1 dpkg-trigger.1:1
-#, no-wrap
-msgid "2009-03-15"
-msgstr "15-03-2009"
-
 #. type: Plain text
 #: deb-triggers.5:4
 msgid "deb-triggers - package triggers"
@@ -2903,28 +3107,57 @@
 msgstr "B<interest> I<nom-action-différée>"
 
 #. type: Plain text
-#: deb-triggers.5:27
+#: deb-triggers.5:26
+#, fuzzy
+#| msgid "B<interest> I<trigger-name>"
+msgid "B<interest-noawait> I<trigger-name>"
+msgstr "B<interest> I<nom-action-différée>"
+
+#. type: Plain text
+#: deb-triggers.5:33
+#, fuzzy
+#| msgid ""
+#| "Specifies that the package is interested in the named trigger. All "
+#| "triggers in which a package is interested must be listed using this "
+#| "directive in the triggers control file."
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file."
+"triggers control file. The \"noawait\" variant does not put the triggering "
+"packages in triggers-awaited state. This should be used when the "
+"functionality provided by the trigger is not crucial."
 msgstr ""
 "Indique que le paquet est associé à une action différée. Toutes les actions "
 "différées associées au paquet doivent être listées en utilisant cette "
 "directive depuis le fichier de contrôle des actions différées."
 
 #. type: Plain text
-#: deb-triggers.5:31
+#: deb-triggers.5:37
 msgid "B<activate> I<trigger-name>"
 msgstr "B<activate> I<nom-action-différée>"
 
 #. type: Plain text
-#: deb-triggers.5:37
+#: deb-triggers.5:41
+#, fuzzy
+#| msgid "B<activate> I<trigger-name>"
+msgid "B<activate-noawait> I<trigger-name>"
+msgstr "B<activate> I<nom-action-différée>"
+
+#. type: Plain text
+#: deb-triggers.5:50
+#, fuzzy
+#| msgid ""
+#| "Arranges that changes to this package's state will activate the specified "
+#| "trigger. The trigger will be activated at the start of the following "
+#| "operations: unpack, configure, remove (including for the benefit of a "
+#| "conflicting package), purge and deconfigure."
 msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure."
+"conflicting package), purge and deconfigure.  The \"noawait\" variant does "
+"not put the triggering packages in triggers-awaited state. This should be "
+"used when the functionality provided by the trigger is not crucial."
 msgstr ""
 "Cette directive permet que tout changement dans l'état de ce paquet active "
 "l'action différée spécifiée. L'action différée sera activée au début des "
@@ -2932,7 +3165,7 @@
 "cas de remplacement par un paquet conflictuel), purge et déconfiguration."
 
 #. type: Plain text
-#: deb-triggers.5:45
+#: deb-triggers.5:58
 msgid ""
 "If this package disappears during the unpacking of another package the "
 "trigger will be activated when the disappearance is noted towards the end of "
@@ -2949,7 +3182,7 @@
 "activées."
 
 #. type: Plain text
-#: deb-triggers.5:48
+#: deb-triggers.5:61
 msgid ""
 "Unknown directives are an error which will prevent installation of the "
 "package."
@@ -2958,7 +3191,16 @@
 "paquet."
 
 #. type: Plain text
-#: deb-triggers.5:52
+#: deb-triggers.5:66
+msgid ""
+"The \"-noawait\" variants are only supported by dpkg 1.16.1 or newer, and "
+"will lead to errors if used with an older dpkg. It is thus recommended to "
+"add a \"Pre-Depends: dpkg (E<gt>= 1.16.1)\" to any package that wish to use "
+"those directives."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.5:70
 msgid ""
 "B<dpkg-trigger>(1), B<dpkg>(1), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
 msgstr ""
@@ -2971,13 +3213,6 @@
 msgstr "dpkg"
 
 #. type: TH
-#: dpkg.1:1
-#, fuzzy, no-wrap
-#| msgid "2009-02-27"
-msgid "2011-02-05"
-msgstr "27-02-2009"
-
-#. type: TH
 #: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
 #: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-query.1:1
 #: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.cfg.5:1
@@ -2992,7 +3227,9 @@
 
 #. type: Plain text
 #: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
+#, fuzzy
+#| msgid "B<dpkg> [I<options>] I<action>"
+msgid "B<dpkg> [I<option>...] I<action>"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: SH
@@ -3042,53 +3279,24 @@
 "l'action d'une manière ou d'une autre."
 
 #. type: Plain text
-#: dpkg.1:31
+#: dpkg.1:33
 msgid ""
-"B<dpkg> can 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."
+"B<dpkg> can also be used as a front-end to B<dpkg-deb>(1) and B<dpkg-query>"
+"(1). The list of supported actions can be found later on in the B<ACTIONS> "
+"section. If any such action is encountered B<dpkg> just runs B<dpkg-deb> or "
+"B<dpkg-query> with the parameters given to it, but no specific options are "
+"currently passed to them, to use any such option the back-ends need to be "
+"called directly."
 msgstr ""
-"Voyez B<dpkg-deb>(1) pour des renseignements supplémentaires sur ces actions."
 
 #. type: SH
-#: dpkg.1:43
+#: dpkg.1:34
 #, no-wrap
 msgid "INFORMATION ABOUT PACKAGES"
 msgstr "RENSEIGNEMENTS SUR LES PAQUETS"
 
 #. type: Plain text
-#: dpkg.1:48
+#: dpkg.1:39
 msgid ""
 "B<dpkg> maintains some usable information about available packages. The "
 "information is divided in three classes: B<states>, B<selection states> and "
@@ -3100,41 +3308,41 @@
 "dévolue à B<dselect>."
 
 #. type: SS
-#: dpkg.1:48
+#: dpkg.1:39
 #, no-wrap
 msgid "PACKAGE STATES"
 msgstr "ÉTATS DES PAQUETS"
 
 #. type: TP
-#: dpkg.1:49
+#: dpkg.1:40
 #, no-wrap
 msgid "B<not-installed>"
 msgstr "B<not-installed>"
 
 #. type: Plain text
-#: dpkg.1:52
+#: dpkg.1:43
 msgid "The package is not installed on your system."
 msgstr "Le paquet n'est pas installé sur le système."
 
 #. type: TP
-#: dpkg.1:52
+#: dpkg.1:43
 #, no-wrap
 msgid "B<config-files>"
 msgstr "B<config-files>"
 
 #. type: Plain text
-#: dpkg.1:55
+#: dpkg.1:46
 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: TP
-#: dpkg.1:55
+#: dpkg.1:46
 #, no-wrap
 msgid "B<half-installed>"
 msgstr "B<half-installed>"
 
 #. type: Plain text
-#: dpkg.1:59
+#: dpkg.1:50
 msgid ""
 "The installation of the package has been started, but not completed for some "
 "reason."
@@ -3143,24 +3351,24 @@
 "s'est pas terminée."
 
 #. type: TP
-#: dpkg.1:59
+#: dpkg.1:50
 #, no-wrap
 msgid "B<unpacked>"
 msgstr "B<unpacked>"
 
 #. type: Plain text
-#: dpkg.1:62
+#: dpkg.1:53
 msgid "The package is unpacked, but not configured."
 msgstr "Le paquet est dépaqueté mais n'est pas configuré."
 
 #. type: TP
-#: dpkg.1:62
+#: dpkg.1:53
 #, no-wrap
 msgid "B<half-configured>"
 msgstr "B<half-configured>"
 
 #. type: Plain text
-#: dpkg.1:66
+#: dpkg.1:57
 msgid ""
 "The package is unpacked and configuration has been started, but not yet "
 "completed for some reason."
@@ -3169,65 +3377,65 @@
 "quelconque raison, ne s'est pas terminée."
 
 #. type: TP
-#: dpkg.1:66
+#: dpkg.1:57
 #, no-wrap
 msgid "B<triggers-awaited>"
 msgstr "B<triggers-awaited>"
 
 #. type: Plain text
-#: dpkg.1:69
+#: dpkg.1:60
 msgid "The package awaits trigger processing by another package."
 msgstr ""
 "Le paquet attend l'exécution d'une action différée qui est à la charge d'un "
 "autre paquet."
 
 #. type: TP
-#: dpkg.1:69
+#: dpkg.1:60
 #, no-wrap
 msgid "B<triggers-pending>"
 msgstr "B<triggers-pending>"
 
 #. type: Plain text
-#: dpkg.1:72
+#: dpkg.1:63
 msgid "The package has been triggered."
 msgstr "Une action différée de ce paquet a été activée, il reste à l'exécuter."
 
 #. type: TP
-#: dpkg.1:72
+#: dpkg.1:63
 #, no-wrap
 msgid "B<installed>"
 msgstr "B<installed>"
 
 #. type: Plain text
-#: dpkg.1:75
+#: dpkg.1:66
 msgid "The package is unpacked and configured OK."
 msgstr "Le paquet est dépaqueté et correctement configuré."
 
 #. type: SS
-#: dpkg.1:75
+#: dpkg.1:66
 #, no-wrap
 msgid "PACKAGE SELECTION STATES"
 msgstr "ÉTATS DE LA SÉLECTION DES PAQUETS"
 
 #. type: TP
-#: dpkg.1:76
+#: dpkg.1:67
 #, no-wrap
 msgid "B<install>"
 msgstr "B<install>"
 
 #. type: Plain text
-#: dpkg.1:79
+#: dpkg.1:70
 msgid "The package is selected for installation."
 msgstr "Le paquet est sélectionné pour être installé."
 
 #. type: TP
-#: dpkg.1:79
+#: dpkg.1:70
 #, no-wrap
 msgid "B<hold>"
 msgstr "B<hold>"
 
 #. type: Plain text
-#: dpkg.1:83
+#: dpkg.1:74
 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>."
@@ -3236,13 +3444,13 @@
 "avec l'option de forçage B<--force-hold>."
 
 #. type: TP
-#: dpkg.1:83
+#: dpkg.1:74
 #, no-wrap
 msgid "B<deinstall>"
 msgstr "B<deinstall>"
 
 #. type: Plain text
-#: dpkg.1:87
+#: dpkg.1:78
 msgid ""
 "The package is selected for deinstallation (i.e. we want to remove all "
 "files, except configuration files)."
@@ -3251,13 +3459,13 @@
 "supprimer tous les fichiers à l'exception des fichiers de configuration)."
 
 #. type: TP
-#: dpkg.1:87
+#: dpkg.1:78
 #, no-wrap
 msgid "B<purge>"
 msgstr "B<purge>"
 
 #. type: Plain text
-#: dpkg.1:91
+#: dpkg.1:82
 msgid ""
 "The package is selected to be purged (i.e. we want to remove everything from "
 "system directories, even configuration files)."
@@ -3266,19 +3474,19 @@
 "dans les répertoire du système même les fichiers de configuration)."
 
 #. type: SS
-#: dpkg.1:91
+#: dpkg.1:82
 #, no-wrap
 msgid "PACKAGE FLAGS"
 msgstr "DRAPEAUX DES PAQUETS"
 
 #. type: TP
-#: dpkg.1:92
+#: dpkg.1:83
 #, no-wrap
 msgid "B<reinst-required>"
 msgstr "B<reinst-required>"
 
 #. type: Plain text
-#: dpkg.1:97
+#: dpkg.1:88
 msgid ""
 "A package marked B<reinst-required> is broken and requires reinstallation. "
 "These packages cannot be removed, unless forced with option B<--force-remove-"
@@ -3289,38 +3497,43 @@
 "soit lancé avec l'option de forçage B<--force-remove-reinstreq>."
 
 #. type: SH
-#: dpkg.1:98
+#: dpkg.1:89 dselect.1:120
 #, no-wrap
 msgid "ACTIONS"
 msgstr "ACTIONS"
 
 #. type: TP
-#: dpkg.1:99
-#, no-wrap
-msgid "B<-i>, B<--install> I<package_file>..."
+#: dpkg.1:90
+#, fuzzy, no-wrap
+#| msgid "B<-i>, B<--install> I<package_file>..."
+msgid "B<-i>, B<--install> I<package-file>..."
 msgstr "B<-i>, B<--install> I<fichier-paquet>..."
 
 #. type: Plain text
-#: dpkg.1:103
+#: dpkg.1:94
+#, fuzzy
+#| msgid ""
+#| "Install the package. If B<--recursive> or B<-R> option is specified, "
+#| "I<package_file> must refer to a directory instead."
 msgid ""
 "Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"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:105
+#: dpkg.1:96
 msgid "Installation consists of the following steps:"
 msgstr "L'installation comporte les étapes suivantes :"
 
 #. type: Plain text
-#: dpkg.1:108
+#: dpkg.1:99
 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:112
+#: dpkg.1:103
 msgid ""
 "B<2.> If another version of the same package was installed before the new "
 "installation, execute I<prerm> script of the old package."
@@ -3329,12 +3542,12 @@
 "exécution du script I<prerm> de l'ancien paquet."
 
 #. type: Plain text
-#: dpkg.1:115
+#: dpkg.1:106
 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:119
+#: dpkg.1:110
 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."
@@ -3343,7 +3556,7 @@
 "anciens de manière à pouvoir les restaurer si quelque chose tourne mal."
 
 #. type: Plain text
-#: dpkg.1:126
+#: dpkg.1:117
 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 "
@@ -3357,7 +3570,7 @@
 "supprimés."
 
 #. type: Plain text
-#: dpkg.1:130
+#: dpkg.1:121
 msgid ""
 "B<6.> Configure the package. See B<--configure> for detailed information "
 "about how this is done."
@@ -3366,28 +3579,33 @@
 "comment cela se passe."
 
 #. type: TP
-#: dpkg.1:130
-#, no-wrap
-msgid "B<--unpack >I<package_file>..."
+#: dpkg.1:121
+#, fuzzy, no-wrap
+#| msgid "B<--unpack >I<package_file>..."
+msgid "B<--unpack >I<package-file>..."
 msgstr "B<--unpack >I<fichier-paquet>..."
 
 #. type: Plain text
-#: dpkg.1:135
+#: dpkg.1:126
+#, 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 ""
 "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."
+"option is specified, I<package-file> must refer to a directory instead."
 msgstr ""
 "Dépaquète le paquet, mais ne configure rien. Si l'on donne l'option B<--"
 "recursive> ou B<-R>, I<fichier-paquet> doit alors indiquer un répertoire."
 
 #. type: TP
-#: dpkg.1:135
+#: dpkg.1:126
 #, no-wrap
 msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<--configure >I<paquet>...|B<-a>|B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:140
+#: dpkg.1:131
 msgid ""
 "Configure a package which has been unpacked but not yet configured.  If B<-"
 "a> or B<--pending> is given instead of I<package>, all unpacked but "
@@ -3398,7 +3616,7 @@
 "dépaquetés mais non configurés sont configurés."
 
 #. type: Plain text
-#: dpkg.1:144
+#: dpkg.1:135
 msgid ""
 "To reconfigure a package which has already been configured, try the B<dpkg-"
 "reconfigure>(8)  command instead."
@@ -3407,12 +3625,12 @@
 "la commande B<dpkg-reconfigure>(8)."
 
 #. type: Plain text
-#: dpkg.1:146
+#: dpkg.1:137
 msgid "Configuring consists of the following steps:"
 msgstr "La configuration comporte les étapes suivantes :"
 
 #. type: Plain text
-#: dpkg.1:151
+#: dpkg.1:142
 msgid ""
 "B<1.> Unpack the conffiles, and at the same time back up the old conffiles, "
 "so that they can be restored if something goes wrong."
@@ -3422,18 +3640,18 @@
 "restaurer si quelque chose se passe mal."
 
 #. type: Plain text
-#: dpkg.1:154
+#: dpkg.1:145
 msgid "B<2.> Run I<postinst> script, if provided by the package."
 msgstr "B<2.> Exécution du script B<postinst>, s'il est fourni par le paquet."
 
 #. type: TP
-#: dpkg.1:154
+#: dpkg.1:145
 #, no-wrap
 msgid "B<--triggers-only> I<package>...|B<-a>|B<--pending>"
 msgstr "B<--triggers-only> I<paquet> ...|B<-a> | B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:161
+#: dpkg.1:152
 msgid ""
 "Processes only triggers. All pending triggers will be processed. If package "
 "names are supplied only those packages' triggers will be processed, exactly "
@@ -3449,13 +3667,13 @@
 "corrigé plus tard en exécutant : B<dpkg --configure --pending>."
 
 #. type: TP
-#: dpkg.1:161
+#: dpkg.1:152
 #, no-wrap
 msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr "B<-r>, B<--remove>, B<-P>, B<--purge >I<paquet>...|B<-a>|B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:178
+#: dpkg.1:169
 msgid ""
 "Remove an installed package. B<-r> or B<--remove> remove everything except "
 "conffiles. This may avoid having to reconfigure the package if it is "
@@ -3488,33 +3706,33 @@
 "ceux existant dans les répertoires personnels des utilisateurs."
 
 #. type: Plain text
-#: dpkg.1:180
+#: dpkg.1:171
 msgid "Removing of a package consists of the following steps:"
 msgstr "La suppression d'un paquet comporte les étapes suivantes :"
 
 #. type: Plain text
-#: dpkg.1:183
+#: dpkg.1:174
 msgid "B<1.> Run I<prerm> script"
 msgstr "B<1.> Lancement du script I<prerm>"
 
 #. type: Plain text
-#: dpkg.1:186
+#: dpkg.1:177
 msgid "B<2.> Remove the installed files"
 msgstr "B<2.> Suppression des fichiers installés"
 
 #. type: Plain text
-#: dpkg.1:189
+#: dpkg.1:180
 msgid "B<3.> Run I<postrm> script"
 msgstr "B<3.> lancement du script I<postrm>"
 
 #. type: TP
-#: dpkg.1:190
+#: dpkg.1:181
 #, no-wrap
 msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<--update-avail>, B<--merge-avail> I<fichier-Paquets>"
 
 #. type: Plain text
-#: dpkg.1:199
+#: dpkg.1:190
 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 "
@@ -3532,7 +3750,7 @@
 "enregistrement des paquets disponibles dans I</var/lib/dpkg/available>."
 
 #. type: Plain text
-#: dpkg.1:204
+#: dpkg.1:195
 msgid ""
 "A simpler one-shot command to retrieve and update the I<available> file is "
 "B<dselect update>. Note that this file is mostly useless if you don't use "
@@ -3546,17 +3764,23 @@
 "paquets disponibles."
 
 #. type: TP
-#: dpkg.1:204
-#, no-wrap
-msgid "B<-A>, B<--record-avail> I<package_file>..."
+#: dpkg.1:195
+#, fuzzy, no-wrap
+#| msgid "B<-A>, B<--record-avail> I<package_file>..."
+msgid "B<-A>, B<--record-avail> I<package-file>..."
 msgstr "B<-A>, B<--record-avail> I<fichier_paquet>..."
 
 #. type: Plain text
-#: dpkg.1:210
+#: dpkg.1:201
+#, 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."
 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."
+"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 ""
 "Met à jour l'information de B<dpkg> et de B<dselect> sur les paquets "
 "disponibles avec les informations qui proviennent de I<fichier-paquet>. Si "
@@ -3564,13 +3788,13 @@
 "un répertoire."
 
 #. type: TP
-#: dpkg.1:210
+#: dpkg.1:201
 #, no-wrap
 msgid "B<--forget-old-unavail>"
 msgstr "B<--forget-old-unavail>"
 
 #. type: Plain text
-#: dpkg.1:214
+#: dpkg.1:205
 msgid ""
 "Now B<obsolete> and a no-op as B<dpkg> will automatically forget uninstalled "
 "unavailable packages."
@@ -3579,24 +3803,24 @@
 "paquets désinstallés qui ne sont pas disponibles."
 
 #. type: TP
-#: dpkg.1:214
+#: dpkg.1:205
 #, no-wrap
 msgid "B<--clear-avail>"
 msgstr "B<--clear-avail>"
 
 #. type: Plain text
-#: dpkg.1:217
+#: dpkg.1:208
 msgid "Erase the existing information about what packages are available."
 msgstr "Efface les renseignements existants sur les paquets disponibles."
 
 #. type: TP
-#: dpkg.1:217
+#: dpkg.1:208
 #, no-wrap
 msgid " B<-C>, B<--audit>"
 msgstr "B<-C>, B<--audit>"
 
 #. type: Plain text
-#: dpkg.1:222
+#: dpkg.1:213
 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."
@@ -3605,13 +3829,13 @@
 "système. B<dpkg> suggère une manière de les faire fonctionner."
 
 #. type: TP
-#: dpkg.1:222
+#: dpkg.1:213
 #, no-wrap
 msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr "B<--get-selections> [I<motif-nom-paquet>...]"
 
 #. type: Plain text
-#: dpkg.1:227
+#: dpkg.1:218
 msgid ""
 "Get list of package selections, and write it to stdout. Without a pattern, "
 "non-installed packages (i.e. those which have been previously purged)  will "
@@ -3622,18 +3846,24 @@
 "ont été précédemment purgés) ne seront pas affichés."
 
 #. type: TP
-#: dpkg.1:227 update-alternatives.8:300
+#: dpkg.1:218 update-alternatives.8:299
 #, no-wrap
 msgid "B<--set-selections>"
 msgstr "B<--set-selections>"
 
 #. type: Plain text
-#: dpkg.1:233
+#: dpkg.1:224
+#, 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."
 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 format 'I<package> I<state>', where state is one of B<install>, B<hold>, "
+"B<deinstall> or B<purge>. Blank lines and comment lines beginning with '#' "
+"are also permitted."
 msgstr ""
 "modifie la liste des sélections des paquets en lisant un fichier sur "
 "l'entrée standard. Le format de ce fichier doit être de la forme "
@@ -3642,13 +3872,13 @@
 "débutant par « # » sont autorisées."
 
 #. type: TP
-#: dpkg.1:233
+#: dpkg.1:224
 #, no-wrap
 msgid "B<--clear-selections>"
 msgstr "B<--clear-selections>"
 
 #. type: Plain text
-#: dpkg.1:238
+#: dpkg.1:229
 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 "
@@ -3659,13 +3889,13 @@
 "ne sont pas affichés par --set-selections."
 
 #. type: TP
-#: dpkg.1:238
+#: dpkg.1:229
 #, no-wrap
 msgid "B<--yet-to-unpack>"
 msgstr "B<--yet-to-unpack>"
 
 #. type: Plain text
-#: dpkg.1:242
+#: dpkg.1:233
 msgid ""
 "Searches for packages selected for installation, but which for some reason "
 "still haven't been installed."
@@ -3674,25 +3904,25 @@
 "pour une raison quelconque, ne sont pas encore installés."
 
 #. type: TP
-#: dpkg.1:243
+#: dpkg.1:234
 #, no-wrap
 msgid "B<--print-architecture>"
 msgstr "B<--print-architecture>"
 
 #. type: Plain text
-#: dpkg.1:246
+#: dpkg.1:237
 msgid ""
 "Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr "Affiche l'architecture des paquets installés (par exemple, « i386 »)."
 
 #. type: TP
-#: dpkg.1:246
+#: dpkg.1:237
 #, no-wrap
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<--compare-versions >I<ver1 op ver2>"
 
 #. type: Plain text
-#: dpkg.1:257
+#: dpkg.1:248
 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 "
@@ -3715,18 +3945,24 @@
 "compatibilité avec la syntaxe du fichier de contrôle."
 
 #. type: TP
-#: dpkg.1:257
-#, no-wrap
-msgid "B<--command-fd >I<E<lt>nE<gt>>"
+#: dpkg.1:248
+#, fuzzy, no-wrap
+#| msgid "B<--command-fd >I<E<lt>nE<gt>>"
+msgid "B<--command-fd >I<n>"
 msgstr "B<--command-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:262
-msgid ""
-"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and through this file "
-"descriptor, are not reset for subsequent commands executed during the same "
-"run."
+#: dpkg.1:253
+#, fuzzy
+#| msgid ""
+#| "Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. "
+#| "Note: additional options set on the command line, and through this file "
+#| "descriptor, are not reset for subsequent commands executed during the "
+#| "same run."
+msgid ""
+"Accept a series of commands on input file descriptor I<n>. Note: additional "
+"options set on the command line, and through this file descriptor, are not "
+"reset for subsequent commands executed during the same run."
 msgstr ""
 "Cette action accepte une série de commandes sur le descripteur du fichier "
 "d'entrée B<E<lt>nE<gt>>. Note : des options supplémentaires définies sur la "
@@ -3734,73 +3970,73 @@
 "pour les commandes suivantes qui sont exécutées pendant la même séquence."
 
 #. type: TP
-#: dpkg.1:262 dpkg-architecture.1:61 dpkg-buildflags.1:71 dpkg-divert.8:71
-#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
-#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
+#: dpkg.1:253 dpkg-architecture.1:60 dpkg-buildflags.1:89 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:66 dpkg-statoverride.8:44
+#: dpkg-vendor.1:28 dselect.1:113 update-alternatives.8:316
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 #. type: Plain text
-#: dpkg.1:265
+#: dpkg.1:256
 msgid "Display a brief help message."
 msgstr "Affiche un court message d'aide."
 
 #. type: TP
-#: dpkg.1:265
+#: dpkg.1:256
 #, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--force-help>"
 
 #. type: Plain text
-#: dpkg.1:268
+#: dpkg.1:259
 msgid "Give help about the B<--force->I<thing> options."
 msgstr "Donne des renseignements sur les options B<--force->I<quelque-chose>."
 
 #. type: TP
-#: dpkg.1:268
+#: dpkg.1:259
 #, no-wrap
 msgid "B<-Dh>, B<--debug=help>"
 msgstr "B<-Dh>, B<--debug=help>"
 
 #. type: Plain text
-#: dpkg.1:271
+#: dpkg.1:262
 msgid "Give help about debugging options."
 msgstr "donne des renseignements sur les options de débogage."
 
 #. type: TP
-#: dpkg.1:271 dpkg-architecture.1:64 dpkg-buildflags.1:74
+#: dpkg.1:262 dpkg-architecture.1:63 dpkg-buildflags.1:92
 #: dpkg-buildpackage.1:226 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
-#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
-#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
-#: dpkg-shlibdeps.1:220 dpkg-source.1:93 dpkg-split.1:130
-#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
-#: update-alternatives.8:320
+#: dpkg-deb.1:175 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:113 dpkg-scanpackages.1:99 dpkg-scansources.1:68
+#: dpkg-shlibdeps.1:218 dpkg-source.1:99 dpkg-split.1:129
+#: dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:116
+#: update-alternatives.8:319
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg.1:274
+#: dpkg.1:265
 msgid "Display B<dpkg> version information."
 msgstr "Affiche la version de B<dpkg>."
 
 #. type: TP
-#: dpkg.1:274
+#: dpkg.1:265
 #, no-wrap
 msgid "B<dpkg-deb actions>"
 msgstr "B<dpkg-deb actions>"
 
 #. type: Plain text
-#: dpkg.1:277
+#: dpkg.1:268
 msgid "See B<dpkg-deb>(1) for more information about the following actions."
 msgstr ""
 "Voyez B<dpkg-deb>(1) pour des renseignements supplémentaires sur les actions "
 "suivantes."
 
 #. type: Plain text
-#: dpkg.1:297
+#: dpkg.1:288
 #, no-wrap
 msgid ""
 "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
@@ -3838,20 +4074,20 @@
 "    Affiche des renseignements sur un paquet.\n"
 
 #. type: TP
-#: dpkg.1:299
+#: dpkg.1:290
 #, no-wrap
 msgid "B<dpkg-query actions>"
 msgstr "B<dpkg-query actions>"
 
 #. type: Plain text
-#: dpkg.1:302
+#: dpkg.1:293
 msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr ""
 "Voyez B<dpkg-query>(1) pour davantage d'explications sur les actions "
 "suivantes."
 
 #. type: Plain text
-#: dpkg.1:317
+#: dpkg.1:308
 #, no-wrap
 msgid ""
 "B<-l>, B<--list> I<package-name-pattern>...\n"
@@ -3882,20 +4118,20 @@
 "    devraient plutôt utiliser B<apt-cache show> I<nom-du-paquet>.\n"
 
 #. type: SH
-#: dpkg.1:319 dpkg-architecture.1:68 dpkg-buildpackage.1:50
-#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
+#: dpkg.1:310 dpkg-architecture.1:67 dpkg-buildpackage.1:50
+#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:179
 #: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
-#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
-#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
-#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
-#: start-stop-daemon.8:100 update-alternatives.8:324
+#: dpkg-gensymbols.1:369 dpkg-mergechangelogs.1:27 dpkg-name.1:30
+#: dpkg-parsechangelog.1:15 dpkg-query.1:117 dpkg-scanpackages.1:71
+#: dpkg-scansources.1:44 dpkg-shlibdeps.1:106 dpkg-split.1:133
+#: dpkg-statoverride.8:51 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:36
+#: start-stop-daemon.8:103 update-alternatives.8:323
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPTIONS"
 
 #. type: Plain text
-#: dpkg.1:325
+#: dpkg.1:316
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg> or the files on the configuration "
@@ -3910,26 +4146,26 @@
 "commande mais sans tiret), soit un commentaire, commençant par B<#>."
 
 #. type: TP
-#: dpkg.1:326
+#: dpkg.1:317
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<nombre>"
 
 #. type: Plain text
-#: dpkg.1:329
+#: dpkg.1:320
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
 "Modifie le nombre d'erreurs au delà duquel B<dpkg> s'arrête. Il est par "
 "défaut égal à 50."
 
 #. type: TP
-#: dpkg.1:329
+#: dpkg.1:320
 #, no-wrap
 msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>, B<--auto-deconfigure>"
 
 #. type: Plain text
-#: dpkg.1:335
+#: dpkg.1:326
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -3941,13 +4177,13 @@
 "déconfiguration automatique du paquet qui dépendait du paquet supprimé."
 
 #. type: TP
-#: dpkg.1:335
+#: dpkg.1:326
 #, 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:341
+#: dpkg.1:332
 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 "
@@ -3959,7 +4195,7 @@
 "debug=help> affiche ces valeurs de débogage."
 
 #. type: Plain text
-#: dpkg.1:356
+#: dpkg.1:347
 #, fuzzy, no-wrap
 #| msgid ""
 #| "    number  description\n"
@@ -4013,13 +4249,13 @@
 " 2000   Quantité stupide de radotage\n"
 
 #. type: TP
-#: dpkg.1:356
+#: dpkg.1:347
 #, no-wrap
 msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--force->I<quelque-chose>, B<--no-force->I<quelque-chose>, B<--refuse->I<quelque-chose>"
 
 #. type: Plain text
-#: dpkg.1:363
+#: dpkg.1:354
 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<--"
@@ -4032,7 +4268,7 @@
 "décrit. Les actions marquées d'un (*) sont forcées par défaut."
 
 #. type: Plain text
-#: dpkg.1:367
+#: dpkg.1:358
 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 "
@@ -4043,12 +4279,12 @@
 "système entier.>"
 
 #. type: Plain text
-#: dpkg.1:370
+#: dpkg.1:361
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all> : Met en oeuvre (ou pas) toutes les options de forçage."
 
 #. type: Plain text
-#: dpkg.1:373
+#: dpkg.1:364
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
@@ -4057,7 +4293,7 @@
 "paquet est déjà installée."
 
 #. type: Plain text
-#: dpkg.1:380
+#: dpkg.1:371
 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 "
@@ -4073,7 +4309,7 @@
 "système inutilisable. N'utiliser qu'avec précaution.>"
 
 #. type: Plain text
-#: dpkg.1:384
+#: dpkg.1:375
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
@@ -4082,12 +4318,12 @@
 "configurés dont dépend le paquet en question."
 
 #. type: Plain text
-#: dpkg.1:387
+#: dpkg.1:378
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr "B<hold> : Traite même les paquets marqués « à garder » (« hold »)."
 
 #. type: Plain text
-#: dpkg.1:392
+#: dpkg.1:383
 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 "
@@ -4098,7 +4334,7 @@
 "paquet restent dans le système et soient oubliés par B<dpkg>."
 
 #. type: Plain text
-#: dpkg.1:397
+#: dpkg.1:388
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -4110,27 +4346,27 @@
 "utiliser cette option avec prudence."
 
 #. type: Plain text
-#: dpkg.1:400
+#: dpkg.1:391
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr ""
 "B<depends> : Change tous les problèmes de dépendance en avertissements."
 
 #. type: Plain text
-#: dpkg.1:403
+#: dpkg.1:394
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
 "B<depends-version> : Ignore les versions dans les questions de dépendance."
 
 #. type: Plain text
-#: dpkg.1:406
+#: dpkg.1:397
 msgid "B<breaks>: Install, even if this would break another package."
 msgstr ""
 "B<breaks>: Force l'installation, même si cela risque de casser un autre "
 "paquet."
 
 #. type: Plain text
-#: dpkg.1:410
+#: dpkg.1:401
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
@@ -4140,7 +4376,7 @@
 "certains fichiers."
 
 #. type: Plain text
-#: dpkg.1:415
+#: dpkg.1:406
 msgid ""
 "B<confmiss>: Always install a missing conffile. This is dangerous, since it "
 "means not preserving a change (removing) made to the file."
@@ -4150,7 +4386,7 @@
 "préservés (suppression)."
 
 #. type: Plain text
-#: dpkg.1:420
+#: dpkg.1:411
 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 "
@@ -4161,7 +4397,7 @@
 "est aussi présente, auquel cas l'action par défaut est choisie."
 
 #. type: Plain text
-#: dpkg.1:425
+#: dpkg.1:416
 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 "
@@ -4172,7 +4408,7 @@
 "auquel cas l'action par défaut est choisie."
 
 #. type: Plain text
-#: dpkg.1:431
+#: dpkg.1:422
 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 "
@@ -4186,7 +4422,7 @@
 "pour déterminer ce qu'il faut faire."
 
 #. type: Plain text
-#: dpkg.1:438
+#: dpkg.1:429
 msgid ""
 "B<confask>: If a conffile has been modified always offer to replace it with "
 "the version in the package, even if the version in the package did not "
@@ -4201,19 +4437,19 @@
 "l'action finalement utilisée."
 
 #. type: Plain text
-#: dpkg.1:441
+#: dpkg.1:432
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr "B<overwrite> : Remplace un fichier par un fichier d'un autre paquet."
 
 #. type: Plain text
-#: dpkg.1:444
+#: dpkg.1:435
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 "B<overwrite-dir> : Remplace un répertoire par un répertoire d'un autre "
 "paquet."
 
 #. type: Plain text
-#: dpkg.1:447
+#: dpkg.1:438
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
@@ -4221,7 +4457,7 @@
 "détournée."
 
 #. type: Plain text
-#: dpkg.1:455
+#: dpkg.1:446
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking. Currently "
 "this implies not performing file system syncs before file renames, which is "
@@ -4238,7 +4474,7 @@
 "fichiers de taille vide en cas d'interruption inopinée."
 
 #. type: Plain text
-#: dpkg.1:461
+#: dpkg.1:452
 msgid ""
 "I<Note>: For ext4, the main offender, consider using instead the mount "
 "option B<nodelalloc>, which will fix both the performance degradation and "
@@ -4254,7 +4490,7 @@
 "avant chaque renommage."
 
 #. type: Plain text
-#: dpkg.1:464
+#: dpkg.1:455
 msgid ""
 "I<Warning: Using this option might improve performance at the cost of losing "
 "data, use with care.>"
@@ -4264,14 +4500,21 @@
 "utiliser avec précautions.>"
 
 #. type: Plain text
-#: dpkg.1:467
+#: dpkg.1:458
 #, fuzzy
 #| msgid "B<architecture>: Process even packages with the wrong architecture."
 msgid "B<architecture>: Process even packages with wrong or no architecture."
 msgstr "B<architecture> : Traite même les paquets d'une autre architecture"
 
 #. type: Plain text
-#: dpkg.1:470
+#: dpkg.1:461
+#, fuzzy
+#| msgid "B<architecture>: Process even packages with the wrong architecture."
+msgid "B<bad-version>: Process even packages with wrong versions."
+msgstr "B<architecture> : Traite même les paquets d'une autre architecture"
+
+#. type: Plain text
+#: dpkg.1:464
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -4279,25 +4522,25 @@
 "qui va poser des problèmes."
 
 #. type: Plain text
-#: dpkg.1:473
+#: dpkg.1:467
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr "B<not-root> : Tente de (dés)installer même sans être root."
 
 #. type: Plain text
-#: dpkg.1:476
+#: dpkg.1:470
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 "B<bad-verify> : Installe un paquet même si la vérification de son "
 "authenticité a échoué."
 
 #. type: TP
-#: dpkg.1:477
+#: dpkg.1:471
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<paquet>,..."
 
 #. type: Plain text
-#: dpkg.1:481
+#: dpkg.1:475
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
@@ -4307,42 +4550,13 @@
 "que des avertissements)."
 
 #. type: TP
-#: dpkg.1:481
-#, no-wrap
-msgid "B<--new>, B<--old>"
-msgstr "B<--new>, B<--old>"
-
-#. type: Plain text
-#: dpkg.1:485
-msgid ""
-"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
-msgstr ""
-"Sélectionne soit l'ancien format des paquet binaires, soit le nouveau. C'est "
-"une option de B<dpkg-deb>(1)."
-
-#. type: TP
-#: dpkg.1:485 dpkg-deb.1:209
-#, no-wrap
-msgid "B<--nocheck>"
-msgstr "B<--nocheck>"
-
-#. type: Plain text
-#: dpkg.1:489
-msgid ""
-"Don't read or check contents of control file while building a package.  This "
-"is a B<dpkg-deb>(1) option."
-msgstr ""
-"Ne pas lire ni vérifier le contenu du fichier de contrôle pendant la "
-"construction d'un paquet. C'est une option de B<dpkg-deb>(1)."
-
-#. type: TP
-#: dpkg.1:489
+#: dpkg.1:475
 #, 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:494
+#: dpkg.1:480
 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 "
@@ -4353,7 +4567,7 @@
 "soit."
 
 #. type: Plain text
-#: dpkg.1:499
+#: dpkg.1:485
 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 "
@@ -4366,13 +4580,13 @@
 "le paquet --no-act, même si vous comptiez qu'elle ne ferait rien du tout."
 
 #. type: TP
-#: dpkg.1:499
+#: dpkg.1:485
 #, no-wrap
 msgid "B<-R>, B<--recursive>"
 msgstr "B<-R>, B<--recursive>"
 
 #. type: Plain text
-#: dpkg.1:505
+#: dpkg.1:491
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -4384,13 +4598,13 @@
 "install>, B<--unpack> et B<--avail>."
 
 #. type: TP
-#: dpkg.1:505
+#: dpkg.1:491
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg.1:509
+#: dpkg.1:495
 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>."
@@ -4399,14 +4613,14 @@
 "installée. C'est un alias pour B<--refuse-downgrade>."
 
 #. type: TP
-#: dpkg.1:509 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
-#: dpkg-query.1:112 dpkg-shlibdeps.1:213 dpkg-trigger.1:39
+#: dpkg.1:495 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
+#: dpkg-query.1:118 dpkg-shlibdeps.1:211 dpkg-trigger.1:39
 #, no-wrap
 msgid "B<--admindir=>I<dir>"
 msgstr "B<--admindir>=I<dir>"
 
 #. type: Plain text
-#: dpkg.1:514
+#: dpkg.1:500
 msgid ""
 "Change default administrative directory, which contains many files that give "
 "information about status of installed or uninstalled packages, etc.  "
@@ -4417,13 +4631,13 @@
 "ou non, etc. (Le répertoire par défaut étant I</var/lib/dpkg>)"
 
 #. type: TP
-#: dpkg.1:514
+#: dpkg.1:500
 #, no-wrap
 msgid "B<--instdir=>I<dir>"
 msgstr "B<--instdir=>I<repertoire>"
 
 #. type: Plain text
-#: dpkg.1:521
+#: dpkg.1:507
 msgid ""
 "Change default installation directory which refers to the directory where "
 "packages are to be installed. B<instdir> is also the directory passed to "
@@ -4437,13 +4651,13 @@
 "répertoire par défaut est I</>)."
 
 #. type: TP
-#: dpkg.1:521
+#: dpkg.1:507
 #, no-wrap
 msgid "B<--root=>I<dir>"
 msgstr "B<--root=>I<répertoire>"
 
 #. type: Plain text
-#: dpkg.1:525
+#: dpkg.1:511
 msgid ""
 "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 "var/lib/dpkg>."
@@ -4452,13 +4666,13 @@
 "I<dir>B</var/lib/dpkg>."
 
 #. type: TP
-#: dpkg.1:525
+#: dpkg.1:511
 #, no-wrap
 msgid "B<-O>, B<--selected-only>"
 msgstr "B<-O>, B<--selected-only>"
 
 #. type: Plain text
-#: dpkg.1:531
+#: dpkg.1:517
 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 "
@@ -4471,13 +4685,13 @@
 "marqué comme ayant été sélectionné pour une désinstallation."
 
 #. type: TP
-#: dpkg.1:531
+#: dpkg.1:517
 #, no-wrap
 msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E>, B<--skip-same-version>"
 
 #. type: Plain text
-#: dpkg.1:535
+#: dpkg.1:521
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
@@ -4485,17 +4699,17 @@
 "Ne pas installer le paquet si la même version du paquet est déjà installée."
 
 #. type: Plain text
-#: dpkg.1:537
+#: dpkg.1:523
 msgid "B<--pre-invoke=>I<command>"
 msgstr "B<--pre-invoke=>I<commande>"
 
 #. type: Plain text
-#: dpkg.1:539
+#: dpkg.1:525
 msgid "B<--post-invoke=>I<command>"
 msgstr "B<--post-invoke=>I<commande>"
 
 #. type: Plain text
-#: dpkg.1:548
+#: dpkg.1:534
 msgid ""
 "Set an invoke hook I<command> to be run via ``sh -c'' before or after the "
 "dpkg run for the I<unpack>, I<configure>, I<install>, I<triggers-only>, "
@@ -4518,17 +4732,17 @@
 "prévu."
 
 #. type: Plain text
-#: dpkg.1:551
+#: dpkg.1:537
 msgid "B<--path-exclude=>I<glob-pattern>"
 msgstr "B<--path-exclude=>I<motif-global>"
 
 #. type: Plain text
-#: dpkg.1:553
+#: dpkg.1:539
 msgid "B<--path-include=>I<glob-pattern>"
 msgstr "B<--path-include=>I<motif-global>"
 
 #. type: Plain text
-#: dpkg.1:556
+#: dpkg.1:542
 msgid ""
 "Set I<glob-pattern> as a path filter, either by excluding or re-including "
 "previously excluded paths matching the specified patterns during install."
@@ -4538,7 +4752,7 @@
 "pendant l'installation."
 
 #. type: Plain text
-#: dpkg.1:559
+#: dpkg.1:545
 msgid ""
 "I<Warning: take into account that depending on the excluded paths you might "
 "completely break your system, use with caution.>"
@@ -4547,7 +4761,7 @@
 "système. Ce réglage soit donc être utilisé avec précautions.>"
 
 #. type: Plain text
-#: dpkg.1:569
+#: dpkg.1:555
 msgid ""
 "The glob patterns use the same wildcards used in the shell, were '*' matches "
 "any sequence of characters, including the empty string and also '/'. For "
@@ -4573,7 +4787,7 @@
 "pourraient changer cela."
 
 #. type: Plain text
-#: dpkg.1:572
+#: dpkg.1:558
 msgid ""
 "This can be used to remove all paths except some particular ones; a typical "
 "case is:"
@@ -4582,7 +4796,7 @@
 "cas classique d'utilisation est :"
 
 #. type: Plain text
-#: dpkg.1:576
+#: dpkg.1:562
 #, no-wrap
 msgid ""
 "B<--path-exclude=/usr/share/doc/*>\n"
@@ -4592,14 +4806,14 @@
 "B<--path-include=/usr/share/doc/*/copyright>\n"
 
 #. type: Plain text
-#: dpkg.1:579
+#: dpkg.1:565
 msgid "to remove all documentation files except the copyright files."
 msgstr ""
 "qui permet de supprimer tous les fichiers de documentation sauf les fichiers "
 "de « copyright »."
 
 #. type: Plain text
-#: dpkg.1:583
+#: dpkg.1:569
 msgid ""
 "These two options can be specified multiple times, and interleaved with each "
 "other. Both are processed in the given order, with the last rule that "
@@ -4611,13 +4825,13 @@
 "utilisée."
 
 #. type: TP
-#: dpkg.1:584
+#: dpkg.1:570
 #, no-wrap
 msgid "B<--status-fd >I<n>"
 msgstr "B<--status-fd >I<n>"
 
 #. type: Plain text
-#: dpkg.1:590
+#: dpkg.1:576
 msgid ""
 "Send machine-readable package status and progress information to file "
 "descriptor I<n>. This option can be specified multiple times. The "
@@ -4629,51 +4843,51 @@
 "enregistrement par ligne, dans l'une des formes suivantes :"
 
 #. type: TP
-#: dpkg.1:591
+#: dpkg.1:577
 #, no-wrap
 msgid "B<status: >I<package>B<: >I<status>"
 msgstr "B<status: >I<paquet>B<: >I<status>"
 
 #. type: Plain text
-#: dpkg.1:594
+#: dpkg.1:580
 msgid "Package status changed; I<status> is as in the status file."
 msgstr ""
 "L'état du paquet a changé ; le I<status> est tel que dans le fichier d'état "
 "( «status file »)."
 
 #. type: TP
-#: dpkg.1:594
+#: dpkg.1:580
 #, no-wrap
 msgid "B<status: >I<package>B< : error : >I<extended-error-message>"
 msgstr "B<status: >I<paquet>B< : error : >I<message-d'erreur-complet>"
 
 #. type: Plain text
-#: dpkg.1:598
+#: dpkg.1:584
 msgid ""
 "An error occurred. Any possible newlines in I<extended-error-message> will "
 "be converted to spaces before output."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:598
+#: dpkg.1:584
 #, no-wrap
 msgid "B<status: >I<file>B< : conffile-prompt : '>I<real-old>B<' '>I<real-new>B<' >I<useredited>B< >I<distedited>"
 msgstr "B<status: >I<fichier>B< : conffile-prompt : '>I<real-old>B<' '>I<real-new>B<' >I<useredited>B< >I<distedited>"
 
 #. type: Plain text
-#: dpkg.1:601
+#: dpkg.1:587
 msgid "User is being asked a conffile question."
 msgstr ""
 "Une question pour un fichier de configuration va être posée à l'utilisateur."
 
 #. type: TP
-#: dpkg.1:601
+#: dpkg.1:587
 #, no-wrap
 msgid "B<processing: >I<stage>B<: >I<package>"
 msgstr "B<processing: >I<stage>B<: >I<paquet>"
 
 #. type: Plain text
-#: dpkg.1:606
+#: dpkg.1:592
 msgid ""
 "Sent just before a processing stage starts. I<stage> is one of B<upgrade>, "
 "B<install> (both sent before unpacking), B<configure>, B<trigproc>, "
@@ -4684,14 +4898,14 @@
 "B<configure>, B<trigproc>, B<disappear>, B<remove>, B<purge>."
 
 #. type: TP
-#: dpkg.1:607
+#: dpkg.1:593
 #, fuzzy, no-wrap
 #| msgid "B<--post-invoke=>I<command>"
 msgid "B<--status-logger>=I<command>"
 msgstr "B<--post-invoke=>I<commande>"
 
 #. type: Plain text
-#: dpkg.1:612
+#: dpkg.1:598
 #, fuzzy
 #| msgid ""
 #| "Send machine-readable package status and progress information to file "
@@ -4709,23 +4923,34 @@
 "enregistrement par ligne, dans l'une des formes suivantes :"
 
 #. type: TP
-#: dpkg.1:613
+#: dpkg.1:599
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<fichier>"
 
 #. type: Plain text
-#: dpkg.1:625
+#: dpkg.1:611
+#, 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."
 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."
+"I<state> I<pkg> I<installed-version>' for status change updates; `YYYY-MM-DD "
+"HH:MM:SS I<action> I<pkg> I<installed-version> I<available-version>' for "
+"actions where I<action> is one of B<install>, B<upgrade>, B<remove>, "
+"B<purge>; and `YYYY-MM-DD HH:MM:SS conffile I<filename> I<decision>' for "
+"conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 "Enregistre la modification de l'état, la mise à jour ou l'action sur "
 "I<fichier> au lieu de l'habituel I</var/log/dpkg.log>. Si cette option est "
@@ -4741,24 +4966,24 @@
 "soit keep."
 
 #. type: TP
-#: dpkg.1:625
+#: dpkg.1:611
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--no-debsig>"
 
 #. type: Plain text
-#: dpkg.1:628
+#: dpkg.1:614
 msgid "Do not try to verify package signatures."
 msgstr "Ne pas tenter de vérifier la signature des paquets."
 
 #. type: TP
-#: dpkg.1:628
+#: dpkg.1:614
 #, no-wrap
 msgid "B<--no-triggers>"
 msgstr "B<--no-triggers>"
 
 #. type: Plain text
-#: dpkg.1:637
+#: dpkg.1:623
 msgid ""
 "Do not run any triggers in this run (activations will still be recorded).  "
 "If used with B<--configure> I<package> or B<--triggers-only> I<package> then "
@@ -4776,42 +5001,42 @@
 "corrigé plus tard en exécutant B<dpkg --configure --pending>."
 
 #. type: TP
-#: dpkg.1:637
+#: dpkg.1:623
 #, no-wrap
 msgid "B<--triggers>"
 msgstr "B<--triggers>"
 
 #. type: Plain text
-#: dpkg.1:640
+#: dpkg.1:626
 msgid "Cancels a previous B<--no-triggers>."
 msgstr "Annule un précédent B<--no-triggers>."
 
 #. type: Plain text
-#: dpkg.1:642 dpkg.cfg.5:16
+#: dpkg.1:628 dpkg.cfg.5:16
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.1:645
+#: dpkg.1:631
 msgid "Configuration file with default options."
 msgstr "Fichier de configuration contenant les options par défaut."
 
 #. type: TP
-#: dpkg.1:645
+#: dpkg.1:631
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/log/dpkg.log>"
 
 #. type: Plain text
-#: dpkg.1:649
+#: dpkg.1:635
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 "Fichier journal standard. Voyez I</etc/dpkg/dpkg.cfg>(5) et l'option  B<--"
 "log>."
 
 #. type: Plain text
-#: dpkg.1:652
+#: dpkg.1:638
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
@@ -4821,24 +5046,24 @@
 "fichiers."
 
 #. type: TP
-#: dpkg.1:652
+#: dpkg.1:638
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg.1:655
+#: dpkg.1:641
 msgid "List of available packages."
 msgstr "Liste des paquets disponibles."
 
 #. type: TP
-#: dpkg.1:655
+#: dpkg.1:641
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 #. type: Plain text
-#: dpkg.1:661
+#: dpkg.1:647
 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, "
@@ -4850,7 +5075,7 @@
 "LES PAQUETS> pour des informations supplémentaires."
 
 #. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:650
 msgid ""
 "The status file is backed up daily in I</var/backups>. It can be useful if "
 "it's lost or corrupted due to filesystems troubles."
@@ -4860,7 +5085,7 @@
 "système de fichiers."
 
 #. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:653
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
@@ -4869,57 +5094,57 @@
 "des informations supplémentaires :"
 
 #. type: TP
-#: dpkg.1:667
+#: dpkg.1:653
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 #. type: TP
-#: dpkg.1:669
+#: dpkg.1:655
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 #. type: TP
-#: dpkg.1:671
+#: dpkg.1:657
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 #. type: TP
-#: dpkg.1:673
+#: dpkg.1:659
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 #. type: TP
-#: dpkg.1:675
+#: dpkg.1:661
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 #. type: TP
-#: dpkg.1:677
+#: dpkg.1:663
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 #. type: SH
-#: dpkg.1:680 dpkg-buildflags.1:110 dpkg-buildpackage.1:230 dpkg-deb.1:219
-#: dpkg-divert.8:112 dpkg-query.1:196 dpkg-statoverride.8:69 dpkg-trigger.1:60
-#: dpkg-vendor.1:42 dselect.1:430 update-alternatives.8:355
+#: dpkg.1:666 dpkg-buildflags.1:128 dpkg-buildpackage.1:230 dpkg-deb.1:232
+#: dpkg-divert.8:112 dpkg-query.1:204 dpkg-statoverride.8:68 dpkg-trigger.1:60
+#: dpkg-vendor.1:42 dselect.1:423 update-alternatives.8:354
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "ENVIRONNEMENT"
 
 #. type: TP
-#: dpkg.1:681 dselect.1:431
+#: dpkg.1:667 dselect.1:424
 #, no-wrap
 msgid "B<HOME>"
 msgstr "B<HOME>"
 
 #. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:671
 msgid ""
 "If set, B<dpkg> will use it as the directory from which to read the user "
 "specific configuration file."
@@ -4928,13 +5153,13 @@
 "lire le fichier de configuration propre à l'utilisateur."
 
 #. type: TP
-#: dpkg.1:685 dpkg-deb.1:220
+#: dpkg.1:671 dpkg-deb.1:233
 #, no-wrap
 msgid "B<TMPDIR>"
 msgstr "B<TMPDIR>"
 
 #. type: Plain text
-#: dpkg.1:689
+#: dpkg.1:675
 msgid ""
 "If set, B<dpkg> will use it as the directory in which to create temporary "
 "files and directories."
@@ -4943,39 +5168,39 @@
 "créer les fichiers et répertoire temporaires."
 
 #. type: TP
-#: dpkg.1:689
+#: dpkg.1:675
 #, no-wrap
 msgid "B<PAGER>"
 msgstr "B<PAGER>"
 
 #. type: Plain text
-#: dpkg.1:692
+#: dpkg.1:678
 msgid "The program B<dpkg> will execute when displaying the conffiles."
 msgstr ""
 "Cette option indique le programme exécuté par B<dpkg> quand il affiche les "
 "fichiers de configuration."
 
 #. type: TP
-#: dpkg.1:692
+#: dpkg.1:678
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 #. type: Plain text
-#: dpkg.1:695
+#: dpkg.1:681
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
 "Le programme exécuté par B<dpkg> quand il lance un nouvel interpréteur de "
 "commandes."
 
 #. type: TP
-#: dpkg.1:695 dpkg-query.1:201
+#: dpkg.1:681 dpkg-query.1:209
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 #. type: Plain text
-#: dpkg.1:699
+#: dpkg.1:685
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
@@ -4984,13 +5209,13 @@
 "formaté. Seule l'action B<-l> se sert actuellement de cette variable."
 
 #. type: TP
-#: dpkg.1:699
+#: dpkg.1:685
 #, no-wrap
 msgid "B<DPKG_SHELL_REASON>"
 msgstr "B<DPKG_SHELL_REASON>"
 
 #. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:689
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Current valid value: B<conffile-prompt>."
@@ -5000,13 +5225,13 @@
 "configuration. La valeur actuellement valable est : B<conffile-prompt>/"
 
 #. type: TP
-#: dpkg.1:703
+#: dpkg.1:689
 #, no-wrap
 msgid "B<DPKG_CONFFILE_OLD>"
 msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. type: Plain text
-#: dpkg.1:707
+#: dpkg.1:693
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the old conffile."
@@ -5016,13 +5241,13 @@
 "configuration. Elle contient le nom de l'ancien fichier de configuration."
 
 #. type: TP
-#: dpkg.1:707
+#: dpkg.1:693
 #, no-wrap
 msgid "B<DPKG_CONFFILE_NEW>"
 msgstr "B<DPKG_CONFFILE_NEW>"
 
 #. type: Plain text
-#: dpkg.1:711
+#: dpkg.1:697
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the new conffile."
@@ -5032,13 +5257,13 @@
 "configuration. Elle contient le nom du nouveau fichier de configuration."
 
 #. type: TP
-#: dpkg.1:711
+#: dpkg.1:697
 #, no-wrap
 msgid "B<DPKG_RUNNING_VERSION>"
 msgstr "B<DPKG_RUNNING_VERSION>"
 
 #. type: Plain text
-#: dpkg.1:715
+#: dpkg.1:701
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the version of "
 "the currently running B<dpkg> instance."
@@ -5048,13 +5273,13 @@
 "d'exécution."
 
 #. type: TP
-#: dpkg.1:715 dpkg-divert.8:117
+#: dpkg.1:701 dpkg-divert.8:117
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
 msgstr "B<DPKG_MAINTSCRIPT_PACKAGE>"
 
 #. type: Plain text
-#: dpkg.1:719
+#: dpkg.1:705
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the package name "
 "being handled."
@@ -5063,13 +5288,13 @@
 "variable contient le nom du paquet en cours de traitement."
 
 #. type: TP
-#: dpkg.1:719
+#: dpkg.1:705
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_ARCH>"
 msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
 
 #. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:709
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the architecture "
 "the package got built for."
@@ -5078,13 +5303,13 @@
 "variable contient l'architecture pour laquelle le paquet a été construit."
 
 #. type: TP
-#: dpkg.1:723
+#: dpkg.1:709
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_NAME>"
 msgstr "B<DPKG_MAINTSCRIPT_NAME>"
 
 #. type: Plain text
-#: dpkg.1:727
+#: dpkg.1:713
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the name of the "
 "script running (preinst, postinst, prerm, postrm)."
@@ -5094,52 +5319,52 @@
 "prerm, postrm)."
 
 #. type: Plain text
-#: dpkg.1:730
+#: dpkg.1:716
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr "Pour afficher les paquets liés au programme B<vi>(1) :"
 
 #. type: Plain text
-#: dpkg.1:732
+#: dpkg.1:718
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "    B<dpkg -l \\(aq*vi*\\(aq>\n"
 
 #. type: Plain text
-#: dpkg.1:735
+#: dpkg.1:721
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr ""
 "Pour voir les entrées de I</var/lib/dpkg/available> concernant deux paquets :"
 
 #. type: Plain text
-#: dpkg.1:737
+#: dpkg.1:723
 #, 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:740
+#: dpkg.1:726
 msgid "To search the listing of packages yourself:"
 msgstr "Pour rechercher vous-même dans la liste des paquets :"
 
 #. type: Plain text
-#: dpkg.1:742
+#: dpkg.1:728
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "    B<less /var/lib/dpkg/available>\n"
 
 #. type: Plain text
-#: dpkg.1:745
+#: dpkg.1:731
 msgid "To remove an installed elvis package:"
 msgstr "Pour supprimer le paquet installé elvis :"
 
 #. type: Plain text
-#: dpkg.1:747
+#: dpkg.1:733
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "    B<dpkg -r elvis>\n"
 
 #. type: Plain text
-#: dpkg.1:752
+#: dpkg.1:738
 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\":"
@@ -5149,7 +5374,7 @@
 "la section « editors » :"
 
 #. type: Plain text
-#: dpkg.1:755
+#: dpkg.1:741
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     B<cd /cdrom/pool/main/v/vim>\n"
@@ -5162,18 +5387,18 @@
 "     B<dpkg -i vim_4.5-3.deb>\n"
 
 #. type: Plain text
-#: dpkg.1:758
+#: dpkg.1:744
 msgid "To make a local copy of the package selection states:"
 msgstr "Pour faire une copie locale des états de sélection des paquets :"
 
 #. type: Plain text
-#: dpkg.1:760
+#: dpkg.1:746
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr "    B<dpkg --get-selections E<gt>myselections>\n"
 
 #. type: Plain text
-#: dpkg.1:764
+#: dpkg.1:750
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr ""
@@ -5181,7 +5406,7 @@
 "de cette manière :"
 
 #. type: Plain text
-#: dpkg.1:767
+#: dpkg.1:753
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -5191,7 +5416,7 @@
 "    B<dpkg --set-selections E<lt>myselections>\n"
 
 #. type: Plain text
-#: dpkg.1:773
+#: dpkg.1:759
 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 "
@@ -5204,7 +5429,7 @@
 "exemple, exécutez B<apt-get dselect-upgrade>."
 
 #. type: Plain text
-#: dpkg.1:776
+#: dpkg.1:762
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
@@ -5213,13 +5438,13 @@
 "aisée de modifier les états de sélection des paquets."
 
 #. type: SH
-#: dpkg.1:778
+#: dpkg.1:764
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr "FONCTIONNALITÉS SUPPLÉMENTAIRES"
 
 #. type: Plain text
-#: dpkg.1:781
+#: dpkg.1:767
 msgid ""
 "Additional functionality can be gained by installing any of the following "
 "packages: B<apt>, B<aptitude> and B<debsums>."
@@ -5228,7 +5453,7 @@
 "B<apt>, B<aptitude> et B<debsums>."
 
 #. type: Plain text
-#: dpkg.1:793
+#: dpkg.1:779
 msgid ""
 "B<aptitude>(1), B<apt>(1), 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)."
@@ -5237,12 +5462,12 @@
 "B<deb>(5), B<deb-control>(5), B<dpkg.cfg>(5) et B<dpkg-reconfigure>(8)."
 
 #. type: Plain text
-#: dpkg.1:796
+#: dpkg.1:782
 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: Plain text
-#: dpkg.1:799 dpkg.cfg.5:22
+#: dpkg.1:785 dpkg.cfg.5:22
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
 "contributed to B<dpkg>."
@@ -5256,12 +5481,6 @@
 msgid "dpkg-architecture"
 msgstr "dpkg-architecture"
 
-#. type: TH
-#: dpkg-architecture.1:1
-#, no-wrap
-msgid "2009-08-15"
-msgstr "15-08-2009"
-
 #. type: Plain text
 #: dpkg-architecture.1:4
 msgid ""
@@ -5271,12 +5490,14 @@
 "d'un paquet"
 
 #. type: Plain text
-#: dpkg-architecture.1:9
-msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
+#: dpkg-architecture.1:8
+#, fuzzy
+#| msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
+msgid "B<dpkg-architecture> [I<option>...] [I<command>]"
 msgstr "B<dpkg-architecture> [I<options>] [I<commandes>]"
 
 #. type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg-architecture.1:13
 msgid ""
 "dpkg-architecture does provide a facility to determine and set the build and "
 "host architecture for package building."
@@ -5285,7 +5506,7 @@
 "construction et l'architecture hôte pour la création d'un paquet."
 
 #. type: Plain text
-#: dpkg-architecture.1:17
+#: dpkg-architecture.1:16
 msgid ""
 "The build architecture is always determined by an external call to B<dpkg>"
 "(1), and can not be set at the command line."
@@ -5294,7 +5515,7 @@
 "à B<dpkg>(1). Elle ne peut pas être spécifiée en ligne de commande."
 
 #. type: Plain text
-#: dpkg-architecture.1:26
+#: dpkg-architecture.1:25
 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 "
@@ -5314,22 +5535,22 @@
 "pas à la valeur par défaut."
 
 #. type: SH
-#: dpkg-architecture.1:27 dpkg-buildflags.1:34 dpkg-deb.1:28 dpkg-divert.8:24
-#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
-#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
-#: update-alternatives.8:203
+#: dpkg-architecture.1:26 dpkg-buildflags.1:45 dpkg-deb.1:27 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:18 dpkg-split.1:31 dpkg-statoverride.8:23
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:34
+#: update-alternatives.8:202
 #, no-wrap
 msgid "COMMANDS"
 msgstr "COMMANDES"
 
 #. type: TP
-#: dpkg-architecture.1:28
+#: dpkg-architecture.1:27
 #, no-wrap
 msgid "B<-l>"
 msgstr "B<-l>"
 
 #. type: Plain text
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 msgid ""
 "Print the environment variables, one each line, in the format "
 "I<VARIABLE=value>. This is the default action."
@@ -5338,13 +5559,13 @@
 "I<VARIABLE=valeur>. C'est l'action par défaut."
 
 #. type: TP
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 #, no-wrap
 msgid "B<-e>I<debian-architecture>"
 msgstr "B<-e>I<architecture-debian>"
 
 #. type: Plain text
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 msgid ""
 "Check for equality of architecture. By default I<debian-architecture> is "
 "compared against the current Debian architecture, being the host.  This "
@@ -5358,13 +5579,13 @@
 "contraire."
 
 #. type: TP
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 #, no-wrap
 msgid "B<-i>I<architecture-wildcard>"
 msgstr "B<-i>I<architecture-joker>"
 
 #. type: Plain text
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 msgid ""
 "Check for identity of architecture by expanding I<architecture-wildcard> as "
 "an architecture wildcard and comparing against the current Debian "
@@ -5376,24 +5597,24 @@
 "de retour de 0 si l'architecture correspond et de 1 dans le cas contraire."
 
 #. type: TP
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 #, no-wrap
 msgid "B<-q>I<variable-name>"
 msgstr "B<-q>I<nom-de-variable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 msgid "Print the value of a single variable."
 msgstr "Affiche la valeur d'une seule variable."
 
 #. type: TP
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 #, no-wrap
 msgid "B<-s>"
 msgstr "B<-s>"
 
 #. type: Plain text
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 msgid ""
 "Print an export command. This can be used to set the environment variables "
 "using eval."
@@ -5402,26 +5623,26 @@
 "d'environnement avec « eval »."
 
 #. type: TP
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 #, no-wrap
 msgid "B<-u>"
 msgstr "B<-u>"
 
 #. type: Plain text
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 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:54
+#: dpkg-architecture.1:53
 #, no-wrap
 msgid "B<-c>I< command>"
 msgstr "B<-c> I<commande>"
 
 #. type: Plain text
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 msgid ""
 "Execute a I<command> in an environment which has all variables set to the "
 "determined value."
@@ -5430,70 +5651,70 @@
 "positionnées aux valeurs spécifiées."
 
 #. type: TP
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 #, no-wrap
 msgid "B<-L>"
 msgstr "B<-L>"
 
 #. type: Plain text
-#: dpkg-architecture.1:61
+#: dpkg-architecture.1:60
 msgid "Print a list of valid architecture names."
 msgstr "Affiche une liste des architectures valables."
 
 #. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildflags.1:74 dpkg-buildpackage.1:226
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-architecture.1:63 dpkg-buildflags.1:92 dpkg-buildpackage.1:226
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:175
 #: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
-#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:93
-#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
-#: update-alternatives.8:320
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-name.1:61
+#: dpkg-parsechangelog.1:36 dpkg-query.1:113 dpkg-scanpackages.1:99
+#: dpkg-scansources.1:68 dpkg-shlibdeps.1:218 dpkg-source.1:99
+#: dpkg-split.1:129 dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31
+#: update-alternatives.8:319
 msgid "Show the usage message and exit."
 msgstr "Affiche un message d'aide puis quitte."
 
 #. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildflags.1:77 dpkg-buildpackage.1:229
-#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-architecture.1:66 dpkg-buildflags.1:95 dpkg-buildpackage.1:229
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:178
 #: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
-#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
-#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:96
-#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
-#: update-alternatives.8:323
+#: dpkg-gensymbols.1:449 dpkg-mergechangelogs.1:44 dpkg-name.1:64
+#: dpkg-parsechangelog.1:39 dpkg-query.1:116 dpkg-scanpackages.1:102
+#: dpkg-scansources.1:70 dpkg-shlibdeps.1:221 dpkg-source.1:102
+#: dpkg-split.1:132 dpkg-statoverride.8:50 dpkg-trigger.1:37 dpkg-vendor.1:34
+#: update-alternatives.8:322
 msgid "Show the version and exit."
 msgstr "Affiche le numéro de version puis quitte."
 
 #. type: TP
-#: dpkg-architecture.1:69
+#: dpkg-architecture.1:68
 #, no-wrap
 msgid "B<-a>I<debian-architecture>"
 msgstr "B<-a>I<architecture-debian>"
 
 #. type: Plain text
-#: dpkg-architecture.1:72
+#: dpkg-architecture.1:71
 msgid "Set the Debian architecture."
 msgstr "Fixe l'architecture Debian."
 
 #. type: TP
-#: dpkg-architecture.1:72 dpkg-buildpackage.1:110
+#: dpkg-architecture.1:71 dpkg-buildpackage.1:110
 #, 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
+#: dpkg-architecture.1:74
 msgid "Set the GNU system type."
 msgstr "Fixe le type de système GNU."
 
 #. type: TP
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 #, no-wrap
 msgid "B<-f>"
 msgstr "B<-f>"
 
 #. type: Plain text
-#: dpkg-architecture.1:82
+#: dpkg-architecture.1:81
 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 "
@@ -5509,41 +5730,41 @@
 "buildpackage>(1))."
 
 #. type: SH
-#: dpkg-architecture.1:83
+#: dpkg-architecture.1:82
 #, no-wrap
 msgid "TERMS"
 msgstr "TERMINOLOGIE"
 
 #. type: IP
-#: dpkg-architecture.1:84
+#: dpkg-architecture.1:83
 #, no-wrap
 msgid "build machine"
 msgstr "Machine de construction"
 
 #. type: Plain text
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 msgid "The machine the package is built on."
 msgstr "Machine sur laquelle le paquet est construit."
 
 #. type: IP
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 #, no-wrap
 msgid "host machine"
 msgstr "Machine hôte"
 
 #. type: Plain text
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 msgid "The machine the package is built for."
 msgstr "Machine pour laquelle le paquet est construit."
 
 #. type: IP
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 #, no-wrap
 msgid "Debian architecture"
 msgstr "Architecture Debian"
 
 #. type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 msgid ""
 "The Debian architecture string, which specifies the binary tree in the "
 "\\s-1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
@@ -5552,13 +5773,13 @@
 "dans l'archive \\s-1FTP\\s0. Par exemple : i386, sparc, hurd-i386."
 
 #. type: IP
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 #, no-wrap
 msgid "architecture wildcard"
 msgstr "Architecture joker"
 
 #. type: Plain text
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 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>-"
@@ -5570,13 +5791,13 @@
 "hurd-any."
 
 #. type: IP
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 #, no-wrap
 msgid "\\s-1GNU\\s0 system type"
 msgstr "Type de système \\s-1GNU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:99
+#: dpkg-architecture.1:98
 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, "
@@ -5587,113 +5808,113 @@
 "linux-gnu, sparc-linux-gnu, i386-gnu, x86_64-netbsd."
 
 #. type: SH
-#: dpkg-architecture.1:100
+#: dpkg-architecture.1:99
 #, no-wrap
 msgid "VARIABLES"
 msgstr "VARIABLES D'ENVIRONNEMENT"
 
 #. type: Plain text
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 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:102
+#: dpkg-architecture.1:101
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 msgid "The Debian architecture of the build machine."
 msgstr "Architecture Debian de la machine de construction."
 
 #. type: IP
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 #, 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:105
 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:106
+#: dpkg-architecture.1:105
 #, 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:107
 msgid "The Debian cpu name of the build machine."
 msgstr "Nom de processeur Debian de la machine de construction."
 
 #. type: IP
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 msgid "The pointer size of the build machine (in bits)."
 msgstr "Taille de pointeur de la machine de construction (en bits)."
 
 #. type: IP
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 msgid "The endianness of the build machine (little / big)."
 msgstr "« Endianness» de la machine de construction (little ou big)."
 
 #. type: IP
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr "Partie \\s-1CPU\\s0 de \\s-1DEB_BUILD_GNU_TYPE\\s0."
 
 #. type: IP
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 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:116
+#: dpkg-architecture.1:115
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 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:118
+#: dpkg-architecture.1:117
 #, fuzzy, no-wrap
 #| msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgid "\\s-1DEB_BUILD_MULTIARCH\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 #, fuzzy
 #| msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgid ""
@@ -5702,102 +5923,102 @@
 msgstr "Type de système \\s-1GNU\\s0 de la machine de construction."
 
 #. type: IP
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr "\\s-1DEB_HOST_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 msgid "The Debian architecture of the host machine."
 msgstr "Architecture Debian de la machine hôte."
 
 #. type: IP
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_OS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 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:125
+#: dpkg-architecture.1:124
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 msgid "The Debian cpu name of the host machine."
 msgstr "Nom du processeur Debian de la machine hôte."
 
 #. type: IP
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_BITS\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_BITS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 msgid "The pointer size of the host machine (in bits)."
 msgstr "Taille de pointeur de la machine hôte (en bits)."
 
 #. type: IP
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_ENDIAN\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_ENDIAN\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 msgid "The endianness of the host machine (little / big)."
 msgstr "« Endianess » de la machine hôte (little ou big)."
 
 #. type: IP
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr "\\s-1DEB_HOST_GNU_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 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:133
+#: dpkg-architecture.1:132
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr "Partie « système » de \\s-1DEB_HOST_GNU_TYPE\\s0."
 
 #. type: IP
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr "\\s-1DEB_HOST_GNU_TYPE\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 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:137
+#: dpkg-architecture.1:136
 #, fuzzy, no-wrap
 #| msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgid "\\s-1DEB_HOST_MULTIARCH\\s0"
 msgstr "\\s-1DEB_HOST_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:140
+#: dpkg-architecture.1:139
 #, fuzzy
 #| msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgid ""
@@ -5806,13 +6027,13 @@
 msgstr "Type de système \\s-1GNU\\s0 de la machine hôte."
 
 #. type: SH
-#: dpkg-architecture.1:141
+#: dpkg-architecture.1:140
 #, no-wrap
 msgid "DEBIAN/RULES"
 msgstr "DEBIAN/RULES"
 
 #. type: Plain text
-#: dpkg-architecture.1:149
+#: dpkg-architecture.1:148
 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 "
@@ -5830,12 +6051,12 @@
 "des compilations croisées de votre paquet :"
 
 #. type: Plain text
-#: dpkg-architecture.1:152 dpkg-architecture.1:169
+#: dpkg-architecture.1:151 dpkg-architecture.1:168
 msgid "Instead of:"
 msgstr "Au lieu de :"
 
 #. type: Plain text
-#: dpkg-architecture.1:156
+#: dpkg-architecture.1:155
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5845,12 +6066,12 @@
 "configure $(\\s-1ARCH\\s0)-linux\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:159
+#: dpkg-architecture.1:158
 msgid "please use the following:"
 msgstr "Veuillez utiliser :"
 
 #. type: Plain text
-#: dpkg-architecture.1:163
+#: dpkg-architecture.1:162
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
@@ -5860,13 +6081,13 @@
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:165
+#: dpkg-architecture.1:164
 #, 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:175
+#: dpkg-architecture.1:174
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5880,18 +6101,18 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:178
+#: dpkg-architecture.1:177
 msgid "please use:"
 msgstr "Veuillez utiliser :"
 
 #. type: Plain text
-#: dpkg-architecture.1:181
+#: dpkg-architecture.1:180
 #, 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:185
+#: dpkg-architecture.1:184
 #, no-wrap
 msgid ""
 "ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
@@ -5903,7 +6124,7 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:189
+#: dpkg-architecture.1:188
 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."
@@ -5912,7 +6133,7 @@
 "système, utilisez les variables DEB_HOST_ARCH_CPU ou DEB_HOST_ARCH_OS."
 
 #. type: Plain text
-#: dpkg-architecture.1:194
+#: dpkg-architecture.1:193
 msgid ""
 "In general, calling dpkg in the rules file to get architecture information "
 "is deprecated (unless you want to provide backward compatibility, see "
@@ -5926,13 +6147,13 @@
 "aucun nom de processeur."
 
 #. type: SH
-#: dpkg-architecture.1:195
+#: dpkg-architecture.1:194
 #, no-wrap
 msgid "BACKWARD COMPATIBILITY"
 msgstr "COMPATIBILITÉ ARRIÈRE"
 
 #. type: Plain text
-#: dpkg-architecture.1:199
+#: dpkg-architecture.1:198
 msgid ""
 "The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced in dpkg-"
 "dev 1.15.4. Using them in I<debian/rules> thus requires a build-dependency "
@@ -5943,7 +6164,7 @@
 "une dépendance de construction sur dpkg-dev (E<gt>= 1.15.4) est nécessaire."
 
 #. type: Plain text
-#: dpkg-architecture.1:204
+#: dpkg-architecture.1:203
 msgid ""
 "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in dpkg-"
 "dev 1.13.2. Before this I<debian/rules> files tended to check the values of "
@@ -5956,7 +6177,7 @@
 "tendance à varier dans le temps."
 
 #. type: Plain text
-#: dpkg-architecture.1:209
+#: dpkg-architecture.1:208
 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 "
@@ -5969,7 +6190,7 @@
 "dpkg-dev en utilisant le code suivant :"
 
 #. type: Plain text
-#: dpkg-architecture.1:213
+#: dpkg-architecture.1:212
 #, no-wrap
 msgid ""
 "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
@@ -5979,7 +6200,7 @@
 "DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:227
+#: dpkg-architecture.1:226
 #, no-wrap
 msgid ""
 "# Take account of old dpkg-architecture output.\n"
@@ -6011,12 +6232,12 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:230
+#: dpkg-architecture.1:229
 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:233
+#: dpkg-architecture.1:232
 msgid ""
 "If you still wish to support versions of dpkg-dev that did not include "
 "B<dpkg-architecture>, the following does the job:"
@@ -6025,7 +6246,7 @@
 "architecture>, vous pouvez utiliser :"
 
 #. type: Plain text
-#: dpkg-architecture.1:243
+#: dpkg-architecture.1:242
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
@@ -6047,7 +6268,7 @@
 "DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:248
+#: dpkg-architecture.1:247
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
@@ -6061,7 +6282,7 @@
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:252
+#: dpkg-architecture.1:251
 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."
@@ -6070,7 +6291,7 @@
 "Ces valeurs par défaut seront écrasées si dpkg-architecture est utilisé."
 
 #. type: Plain text
-#: dpkg-architecture.1:259
+#: dpkg-architecture.1:258
 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 "
@@ -6087,7 +6308,7 @@
 "compatible avec les anciennes compilations natives)."
 
 #. type: Plain text
-#: dpkg-architecture.1:262
+#: dpkg-architecture.1:261
 msgid ""
 "The B<-e> and B<-i> options were only introduced in relatively recent "
 "versions of B<dpkg-architecture> (since dpkg 1.13.13)."
@@ -6096,7 +6317,7 @@
 "B<dpkg-architecture> (depuis la version 1.13.13 de dpkg)."
 
 #. type: Plain text
-#: dpkg-architecture.1:266
+#: dpkg-architecture.1:265
 msgid ""
 "B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
 "architecture>. Other examples:"
@@ -6105,17 +6326,17 @@
 "architecture>. Voici d'autres exemples :"
 
 #. type: Plain text
-#: dpkg-architecture.1:268
+#: dpkg-architecture.1:267
 msgid "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 msgstr "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 
 #. type: Plain text
-#: dpkg-architecture.1:270
+#: dpkg-architecture.1:269
 msgid "eval \\`dpkg-architecture -u\\`"
 msgstr "eval \\`dpkg-architecture -u\\`"
 
 #. type: Plain text
-#: dpkg-architecture.1:273
+#: dpkg-architecture.1:272
 msgid ""
 "Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
@@ -6123,17 +6344,17 @@
 "celle spécifiée :"
 
 #. type: Plain text
-#: dpkg-architecture.1:275
+#: dpkg-architecture.1:274
 msgid "dpkg-architecture -elinux-alpha"
 msgstr "dpkg-architecture -elinux-alpha"
 
 #. type: Plain text
-#: dpkg-architecture.1:277
+#: dpkg-architecture.1:276
 msgid "dpkg-architecture -amips -elinux-mips"
 msgstr "dpkg-architecture -amips -elinux-mips"
 
 #. type: Plain text
-#: dpkg-architecture.1:280
+#: dpkg-architecture.1:279
 msgid ""
 "Check if the current architecture or an architecture provided with -a are "
 "Linux systems:"
@@ -6142,58 +6363,63 @@
 "un système Linux :"
 
 #. type: Plain text
-#: dpkg-architecture.1:282
+#: dpkg-architecture.1:281
 msgid "dpkg-architecture -ilinux-any"
 msgstr "dpkg-architecture -ilinux-any"
 
 #. type: Plain text
-#: dpkg-architecture.1:284
+#: dpkg-architecture.1:283
 msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr "dpkg-architecture -ai386 -ilinux-any"
 
 #. type: Plain text
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
+#, fuzzy
+#| msgid ""
+#| "All these files have to be present for B<dpkg-architecture> to work. "
+#| "Their location can be overridden at runtime with the environment variable "
+#| "DPKG_DATADIR."
 msgid ""
 "All these files have to be present for B<dpkg-architecture> to work. Their "
 "location can be overridden at runtime with the environment variable "
-"DPKG_DATADIR."
+"B<DPKG_DATADIR>."
 msgstr ""
 "Tous ces fichiers sont nécessaires afin que B<dpkg-architecture> puisse "
 "fonctionner. Leurs emplacements peuvent être modifiés lors du traitement via "
 "la variable d'environnement DPKG_DATADIR."
 
 #. type: TP
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 #, no-wrap
 msgid "I</usr/share/dpkg/cputable>"
 msgstr "I</usr/share/dpkg/cputable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 msgid "Table of known CPU names and mapping to their GNU name."
 msgstr "Table des noms de processeurs connus et liaison avec leur nom GNU."
 
 #. type: TP
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 #, no-wrap
 msgid "I</usr/share/dpkg/ostable>"
 msgstr "I</usr/share/dpkg/ostable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 msgid "Table of known operating system names and mapping to their GNU name."
 msgstr ""
 "Table des noms des systèmes d'exploitation connus et liaison avec leurs noms "
 "GNU."
 
 #. type: TP
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 #, no-wrap
 msgid "I</usr/share/dpkg/triplettable>"
 msgstr "I</usr/share/dpkg/triplettable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:299
+#: dpkg-architecture.1:298
 msgid ""
 "Mapping between Debian architecture triplets and Debian architecture names."
 msgstr ""
@@ -6201,12 +6427,12 @@
 "architectures Debian."
 
 #. type: Plain text
-#: dpkg-architecture.1:303
+#: dpkg-architecture.1:302
 msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 msgstr "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 
 #. type: Plain text
-#: dpkg-architecture.1:308
+#: dpkg-architecture.1:307
 msgid ""
 "B<dpkg-architecture> and this man page were initially written by Marcus "
 "Brinkmann E<lt>brinkmd@debian.orgE<gt>."
@@ -6221,7 +6447,7 @@
 msgstr "dpkg.cfg"
 
 #. type: TH
-#: dpkg.cfg.5:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1
 #, no-wrap
 msgid "2009-09-05"
 msgstr "05-09-2009"
@@ -6257,7 +6483,7 @@
 msgstr "I<~/.dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:214 dpkg-statoverride.8:87
+#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:222 dpkg-statoverride.8:86
 msgid "B<dpkg>(1)."
 msgstr "B<dpkg>(1)."
 
@@ -6267,6 +6493,13 @@
 msgid "dpkg-buildflags"
 msgstr "dpkg-buildflags"
 
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+#| msgid "2011-07-04"
+msgid "2011-09-13"
+msgstr "07-04-2011"
+
 #. type: Plain text
 #: dpkg-buildflags.1:4
 msgid "dpkg-buildflags - returns build flags to use during package build"
@@ -6276,7 +6509,9 @@
 
 #. type: Plain text
 #: dpkg-buildflags.1:8
-msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+#, fuzzy
+#| msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgid "B<dpkg-buildflags> [I<option>...] [I<command>]"
 msgstr "B<dpkg-buildflags> [I<option>...] I<commande>"
 
 #. type: Plain text
@@ -6330,47 +6565,112 @@
 msgstr "3."
 
 #. type: Plain text
-#: dpkg-buildflags.1:22
-msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+#: dpkg-buildflags.1:23
+#, fuzzy
+#| msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+msgid ""
+"temporarily by the user with environment variables (see section "
+"B<ENVIRONMENT>);"
 msgstr ""
 "temporairement avec des variables d'environnemenet (voir B<VARIABLES "
 "D'ENVIRONNEMENT>)."
 
+#. type: IP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "4."
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:26
+#, fuzzy
+#| msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+msgid ""
+"dynamically by the package maintainer with environment variables set via "
+"B<debian/rules> (see section B<ENVIRONMENT>)."
+msgstr ""
+"temporairement avec des variables d'environnemenet (voir B<VARIABLES "
+"D'ENVIRONNEMENT>)."
+
+#. type: Plain text
+#: dpkg-buildflags.1:28
 msgid "The configuration files can contain two types of directives:"
 msgstr ""
 "Les fichiers de configuration peuvent contenir deux types de directives :"
 
 #. type: TP
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 #, no-wrap
 msgid "B<SET>I< flag value>"
 msgstr "B<SET>I< drapeau valeur>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
 msgid "Override the flag named I<flag> to have the value I<value>."
 msgstr "Remplace le drapeau I<drapeau> par la valeur I<valeur>."
 
 #. type: TP
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
+#, fuzzy, no-wrap
+#| msgid "B<SET>I< flag value>"
+msgid "B<STRIP>I< flag value>"
+msgstr "B<SET>I< drapeau valeur>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:34
+#, fuzzy
+#| msgid "Override the flag named I<flag> to have the value I<value>."
+msgid ""
+"Strip from the flag named I<flag> all the build flags listed in I<value>."
+msgstr "Remplace le drapeau I<drapeau> par la valeur I<valeur>."
+
+#. type: TP
+#: dpkg-buildflags.1:34
 #, no-wrap
 msgid "B<APPEND>I< flag value>"
 msgstr "B<APPEND>I< drapeau valeur>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:31
-msgid ""
-"Extend the flag named I<flag> with the options given in I<value>.  A space "
-"is prepended to the appended value if the flag's current value is non-empty."
+#: dpkg-buildflags.1:38
+#, fuzzy
+#| msgid ""
+#| "Extend the flag named I<flag> with the options given in I<value>.  A "
+#| "space is prepended to the appended value if the flag's current value is "
+#| "non-empty."
+msgid ""
+"Extend the flag named I<flag> by appending the options given in I<value>.  A "
+"space is prepended to the appended value if the flag's current value is non-"
+"empty."
+msgstr ""
+"Étend le drapeau I<drapeau> avec les options indiquées dans I<valeur>. Un "
+"espace est ajouté au début de ce qui est ajouté si la valeur actuelle du "
+"drapeau n'est pas vide."
+
+#. type: TP
+#: dpkg-buildflags.1:38
+#, fuzzy, no-wrap
+#| msgid "B<APPEND>I< flag value>"
+msgid "B<PREPEND>I< flag value>"
+msgstr "B<APPEND>I< drapeau valeur>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:42
+#, fuzzy
+#| msgid ""
+#| "Extend the flag named I<flag> with the options given in I<value>.  A "
+#| "space is prepended to the appended value if the flag's current value is "
+#| "non-empty."
+msgid ""
+"Extend the flag named I<flag> by prepending the options given in I<value>.  "
+"A space is appended to the prepended value if the flag's current value is "
+"non-empty."
 msgstr ""
 "Étend le drapeau I<drapeau> avec les options indiquées dans I<valeur>. Un "
 "espace est ajouté au début de ce qui est ajouté si la valeur actuelle du "
 "drapeau n'est pas vide."
 
 #. type: Plain text
-#: dpkg-buildflags.1:34
+#: dpkg-buildflags.1:45
 msgid ""
 "The configuration files can contain comments on lines starting with a hash "
 "(#). Empty lines are also ignored."
@@ -6379,13 +6679,28 @@
 "lignes commençant par un dièse (#). Les lignes vides sont également ignorées."
 
 #. type: TP
-#: dpkg-buildflags.1:35
+#: dpkg-buildflags.1:46
+#, fuzzy, no-wrap
+#| msgid "B<--debug>"
+msgid "B<--dump>"
+msgstr "B<--debug>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:51
+msgid ""
+"Print to standard output all compilation flags and their values. It prints "
+"one flag per line separated from its value by an equal sign "
+"(\"I<flag>=I<value>\"). This is the default action."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:51
 #, no-wrap
 msgid "B<--list>"
 msgstr "B<--list>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 msgid ""
 "Print the list of flags supported by the current vendor (one per line). See "
 "the B<SUPPORTED FLAGS> section for more information about them."
@@ -6394,19 +6709,28 @@
 "Voir la section B<DRAPEAUX GÉRÉS> pour plus d'informations sur chacun d'eux."
 
 #. type: TP
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 #, no-wrap
 msgid "B<--export=>I<format>"
 msgstr "B<--export=>I<format>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
+#, fuzzy
+#| msgid ""
+#| "Print to standard output shell (if I<format> is B<sh>) or make (if "
+#| "I<format> is B<make>) commands that can be used to export all the "
+#| "compilation flags in the environment. If the I<format> value is not "
+#| "given, B<sh> is assumed. Only compilation flags starting with an upper "
+#| "case character are included, others are assumed to not be suitable for "
+#| "the environment."
 msgid ""
 "Print to standard output shell (if I<format> is B<sh>) or make (if I<format> "
 "is B<make>) commands that can be used to export all the compilation flags in "
-"the environment. If the I<format> value is not given, B<sh> is assumed. Only "
-"compilation flags starting with an upper case character are included, others "
-"are assumed to not be suitable for the environment."
+"the environment. If I<format> is B<configure> then the output can be used on "
+"a B<./configure> command-line. If the I<format> value is not given, B<sh> is "
+"assumed. Only compilation flags starting with an upper case character are "
+"included, others are assumed to not be suitable for the environment."
 msgstr ""
 "Affiche sur la sortie standard, les commandes shell (si I<format> est B<sh>) "
 "ou make (si I<format> est B<make>) qui permettent d'exporter tous les "
@@ -6415,13 +6739,13 @@
 "majuscule sont inclus, les autres étant supposés inadaptés à l'environnement."
 
 #. type: TP
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 #, no-wrap
 msgid "B<--get>I< flag>"
 msgstr "B<--get>I< drapeau>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 msgid ""
 "Print the value of the flag on standard output. Exits with 0 if the flag is "
 "known otherwise exits with 1."
@@ -6430,13 +6754,13 @@
 "sortie 0 si le drapeau est connu et 1 s'il est inconnu."
 
 #. type: TP
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 #, no-wrap
 msgid "B<--origin>I< flag>"
 msgstr "B<--origin>I< drapeau>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:57
+#: dpkg-buildflags.1:75
 msgid ""
 "Print the origin of the value that is returned by B<--get>. Exits with 0 if "
 "the flag is known otherwise exits with 1. The origin can be one of the "
@@ -6447,67 +6771,67 @@
 "des valeurs suivantes :"
 
 #. type: TP
-#: dpkg-buildflags.1:58
+#: dpkg-buildflags.1:76
 #, no-wrap
 msgid "B<vendor>"
 msgstr "B<vendor>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 msgid "the original flag set by the vendor is returned;"
 msgstr "le drapeau défini à l'origine par l'éditeur est renvoyé ;"
 
 #. type: TP
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 #, no-wrap
 msgid "B<system>"
 msgstr "B<system>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 msgid "the flag is set/modified by a system-wide configuration;"
 msgstr "le drapeau est placé ou modifié par un réglage système ;"
 
 #. type: TP
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 #, no-wrap
 msgid "B<user>"
 msgstr "B<user>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 msgid "the flag is set/modified by a user-specific configuration;"
 msgstr ""
 "le drapeau est placé ou modifié par une configuration spécifique à "
 "l'utilisateur ;"
 
 #. type: TP
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 #, no-wrap
 msgid "B<env>"
 msgstr "B<env>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:70
+#: dpkg-buildflags.1:88
 msgid "the flag is set/modified by an environment-specific configuration."
 msgstr ""
 "le drapeau est placé ou modifié par une configuration spécifique dans "
 "l'environnement."
 
 #. type: SH
-#: dpkg-buildflags.1:78
+#: dpkg-buildflags.1:96
 #, no-wrap
 msgid "SUPPORTED FLAGS"
 msgstr "DRAPEAUX GÉRÉS"
 
 #. type: TP
-#: dpkg-buildflags.1:79
+#: dpkg-buildflags.1:97
 #, no-wrap
 msgid "B<CFLAGS>"
 msgstr "B<CFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 msgid ""
 "Options for the C compiler. The default value set by the vendor includes I<-"
 "g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
@@ -6518,110 +6842,396 @@
 "O0> si la variables d'environnement B<DEB_BUILD_OPTIONS> contient I<noopt>)."
 
 #. type: TP
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 #, no-wrap
 msgid "B<CPPFLAGS>"
 msgstr "B<CPPFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 msgid "Options for the C preprocessor. Default value: empty."
 msgstr "Options du préprocesseur C. Valeur par défaut : aucune."
 
 #. type: TP
-#: dpkg-buildflags.1:88
-#, no-wrap
-msgid "B<CXXFLAGS>"
-msgstr "B<CXXFLAGS>"
+#: dpkg-buildflags.1:106
+#, no-wrap
+msgid "B<CXXFLAGS>"
+msgstr "B<CXXFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:109
+msgid "Options for the C++ compiler. Same as B<CFLAGS>."
+msgstr "Options du compilateur C++. Analogue à B<CFLAGS>."
+
+#. type: TP
+#: dpkg-buildflags.1:109
+#, no-wrap
+msgid "B<FFLAGS>"
+msgstr "B<FFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:112
+msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
+msgstr "Options du compilateur Fortran. Analogue à B<CFLAGS>."
+
+#. type: TP
+#: dpkg-buildflags.1:112
+#, no-wrap
+msgid "B<LDFLAGS>"
+msgstr "B<LDFLAGS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:120
+msgid ""
+"Options passed to the compiler when linking executables or shared objects "
+"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
+"from these options). Default value: empty."
+msgstr ""
+"Options passées au compilateur lors du processus de liaison des exécutables "
+"ou des objets partagés (si le linker est appelé directement, alors B<-Wl> et "
+"B<,> doivent être retirés de ces options). Valeur par défaut: aucune."
+
+#. type: TP
+#: dpkg-buildflags.1:122
+#, no-wrap
+msgid "B</etc/dpkg/buildflags.conf>"
+msgstr "B</etc/dpkg/buildflags.conf>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:125
+msgid "System wide configuration file."
+msgstr "Fichier de configuration pour l'ensemble du système."
+
+#. type: TP
+#: dpkg-buildflags.1:125
+#, no-wrap
+msgid "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or B<$HOME/.config/dpkg/buildflags.conf>"
+msgstr "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> ou B<$HOME/.config/dpkg/buildflags.conf>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:128
+msgid "User configuration file."
+msgstr "Fichier de configuration propre à l'utilisateur"
+
+#. type: Plain text
+#: dpkg-buildflags.1:135
+msgid ""
+"There are 2 sets of environment variables doing the same operations, the "
+"first one (DEB_I<flag>_I<op>) should never be used within B<debian/rules>. "
+"It's meant for any user that wants to rebuild the source package with "
+"different build flags. The second set (DEB_I<flag>_MAINT_I<op>) should only "
+"be used in B<debian/rules> by package maintainers to change the resulting "
+"build flags."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:135
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_SET>"
+msgstr "B<DEB_>I<drapeau>B<_SET>"
+
+#. type: TQ
+#: dpkg-buildflags.1:137
+#, fuzzy, no-wrap
+#| msgid "B<DEB_>I<flag>B<_SET>"
+msgid "B<DEB_>I<flag>B<_MAINT_SET>"
+msgstr "B<DEB_>I<drapeau>B<_SET>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:141
+msgid ""
+"This variable can be used to force the value returned for the given I<flag>."
+msgstr ""
+"Cette variable permet de forcer la valeur renvoyée pour le I<drapeau> "
+"indiqué."
+
+#. type: TP
+#: dpkg-buildflags.1:141
+#, fuzzy, no-wrap
+#| msgid "B<DEB_>I<flag>B<_SET>"
+msgid "B<DEB_>I<flag>B<_STRIP>"
+msgstr "B<DEB_>I<drapeau>B<_SET>"
+
+#. type: TQ
+#: dpkg-buildflags.1:143
+#, fuzzy, no-wrap
+#| msgid "B<DEB_>I<flag>B<_SET>"
+msgid "B<DEB_>I<flag>B<_MAINT_STRIP>"
+msgstr "B<DEB_>I<drapeau>B<_SET>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:148
+#, fuzzy
+#| msgid ""
+#| "This variable can be used to append supplementary options to the value "
+#| "returned for the given I<flag>."
+msgid ""
+"This variable can be used to provide a space separated list of options that "
+"will be stripped from the set of flags returned for the given I<flag>."
+msgstr ""
+"Cette variable permet d'ajouter des options à la valeur renvoyée pour le "
+"I<drapeau> indiqué."
+
+#. type: TP
+#: dpkg-buildflags.1:148
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_APPEND>"
+msgstr "B<DEB_>I<drapeau>B<_APPEND>"
+
+#. type: TQ
+#: dpkg-buildflags.1:150
+#, fuzzy, no-wrap
+#| msgid "B<DEB_>I<flag>B<_APPEND>"
+msgid "B<DEB_>I<flag>B<_MAINT_APPEND>"
+msgstr "B<DEB_>I<drapeau>B<_APPEND>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:154
+msgid ""
+"This variable can be used to append supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+"Cette variable permet d'ajouter des options à la valeur renvoyée pour le "
+"I<drapeau> indiqué."
+
+#. type: TP
+#: dpkg-buildflags.1:154
+#, fuzzy, no-wrap
+#| msgid "B<DEB_>I<flag>B<_APPEND>"
+msgid "B<DEB_>I<flag>B<_PREPEND>"
+msgstr "B<DEB_>I<drapeau>B<_APPEND>"
+
+#. type: TQ
+#: dpkg-buildflags.1:156
+#, fuzzy, no-wrap
+#| msgid "B<DEB_>I<flag>B<_APPEND>"
+msgid "B<DEB_>I<flag>B<_MAINT_PREPEND>"
+msgstr "B<DEB_>I<drapeau>B<_APPEND>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:160
+#, fuzzy
+#| msgid ""
+#| "This variable can be used to append supplementary options to the value "
+#| "returned for the given I<flag>."
+msgid ""
+"This variable can be used to prepend supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+"Cette variable permet d'ajouter des options à la valeur renvoyée pour le "
+"I<drapeau> indiqué."
+
+#. type: TP
+#: dpkg-buildflags.1:160
+#, fuzzy, no-wrap
+#| msgid "B<DEB_>I<flag>B<_SET>"
+msgid "B<DEB_BUILD_MAINT_OPTIONS>"
+msgstr "B<DEB_>I<drapeau>B<_SET>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:165
+msgid ""
+"This variable can be used to disable/enable various hardening build flags "
+"through the B<hardening> option. See the B<HARDENING> section for details."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:166
+#, fuzzy, no-wrap
+#| msgid "WARNING"
+msgid "HARDENING"
+msgstr "AVERTISSEMENT"
+
+#. type: Plain text
+#: dpkg-buildflags.1:171
+msgid ""
+"Several compile-time options (detailed below) can be used to help harden a "
+"resulting binary against memory corruption attacks, or provide additional "
+"warning messages during compilation. Except as noted below, these are "
+"enabled by default for architectures that support them."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:177
+msgid ""
+"Each hardening feature can be enabled and disabled in the "
+"B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value with "
+"the \"+\" and \"-\" modifier. For example, to enable the \"pie\" feature and "
+"disable the \"fortify\" feature you can do this in B<debian/rules>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:179
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:183
+msgid ""
+"The special feature B<all> can be used to enable or disable all hardening "
+"features at the same time. Thus disabling everything and enabling only "
+"\"format\" and \"fortify\" can be achieved with:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:185
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:186
+#, fuzzy, no-wrap
+#| msgid "B<Format>"
+msgid "B<format>"
+msgstr "B<Format>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:91
-msgid "Options for the C++ compiler. Same as B<CFLAGS>."
-msgstr "Options du compilateur C++. Analogue à B<CFLAGS>."
+#: dpkg-buildflags.1:198
+msgid ""
+"This setting (enabled by default) adds B<-Wformat -Wformat-security -"
+"Werror=format-security> to B<CFLAGS> and B<CXXFLAGS>. This will warn about "
+"improper format string uses, and will fail when format functions are used in "
+"a way that that represent possible security problems. At present, this warns "
+"about calls to B<printf> and B<scanf> functions where the format string is "
+"not a string literal and there are no format arguments, as in B<printf(foo);"
+"> instead of B<printf(\"%s\", foo);> This may be a security hole if the "
+"format string came from untrusted input and contains \"%n\"."
+msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:199
 #, no-wrap
-msgid "B<FFLAGS>"
-msgstr "B<FFLAGS>"
+msgid "B<fortify>"
+msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:94
-msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
-msgstr "Options du compilateur Fortran. Analogue à B<CFLAGS>."
+#: dpkg-buildflags.1:210
+msgid ""
+"This setting (enabled by default) adds B<-D_FORTIFY_SOURCE=2> to "
+"B<CPPFLAGS>. During code generation the compiler knows a great deal of "
+"information about buffer sizes (where possible), and attempts to replace "
+"insecure unlimited length buffer function calls with length-limited ones. "
+"This is especially useful for old, crufty code.  Additionally, format "
+"strings in writable memory that contain '%n' are blocked. If an application "
+"depends on such a format string, it will need to be worked around."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:213
+msgid ""
+"Note that for this option to have any effect, the source must also be "
+"compiled with B<-O1> or higher."
+msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:213
 #, no-wrap
-msgid "B<LDFLAGS>"
-msgstr "B<LDFLAGS>"
+msgid "B<stackprotector>"
+msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:102
+#: dpkg-buildflags.1:222
 msgid ""
-"Options passed to the compiler when linking executables or shared objects "
-"(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
-"from these options). Default value: empty."
+"This setting (enabled by default) adds B<-fstack-protector --param=ssp-"
+"buffer-size=4> to B<CFLAGS> and B<CXXFLAGS>. This adds safety checks against "
+"stack overwrites. This renders many potential code injection attacks into "
+"aborting situations. In the best case this turns code injection "
+"vulnerabilities into denial of service or into non-issues (depending on the "
+"application)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:226
+msgid ""
+"This feature requires linking against glibc (or another provider of "
+"B<__stack_chk_fail>), so needs to be disabled when building with B<-"
+"nostdlib> or B<-ffreestanding> or similar."
 msgstr ""
-"Options passées au compilateur lors du processus de liaison des exécutables "
-"ou des objets partagés (si le linker est appelé directement, alors B<-Wl> et "
-"B<,> doivent être retirés de ces options). Valeur par défaut: aucune."
 
 #. type: TP
-#: dpkg-buildflags.1:104
-#, no-wrap
-msgid "B</etc/dpkg/buildflags.conf>"
-msgstr "B</etc/dpkg/buildflags.conf>"
+#: dpkg-buildflags.1:227
+#, fuzzy, no-wrap
+#| msgid "B<regex>"
+msgid "B<relro>"
+msgstr "B<regex>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:107
-msgid "System wide configuration file."
-msgstr "Fichier de configuration pour l'ensemble du système."
+#: dpkg-buildflags.1:235
+msgid ""
+"This setting (enabled by default) adds B<-Wl,-z,relro> to B<LDFLAGS>.  "
+"During program load, several ELF memory sections need to be written to by "
+"the linker. This flags the loader to turn these sections read-only before "
+"turning over control to the program. Most notably this prevents GOT "
+"overwrite attacks."
+msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:236
 #, no-wrap
-msgid "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or B<$HOME/.config/dpkg/buildflags.conf>"
-msgstr "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> ou B<$HOME/.config/dpkg/buildflags.conf>"
+msgid "B<bindnow>"
+msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:110
-msgid "User configuration file."
-msgstr "Fichier de configuration propre à l'utilisateur"
+#: dpkg-buildflags.1:243
+msgid ""
+"This setting (disabled by default) adds B<-Wl,-z,now> to B<LDFLAGS>. During "
+"program load, all dynamic symbols are resolved, allowing for the entire PLT "
+"to be marked read-only (due to B<relro> above)."
+msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:111
+#: dpkg-buildflags.1:244
 #, no-wrap
-msgid "B<DEB_>I<flag>B<_SET>"
-msgstr "B<DEB_>I<drapeau>B<_SET>"
+msgid "B<pie>"
+msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:256
 msgid ""
-"This variable can be used to force the value returned for the given I<flag>."
+"This setting (disabled by default) adds B<-fPIE> to B<CFLAGS> and "
+"B<CXXFLAGS>, and B<-fPIE -pie> to B<LDFLAGS>. Position Independent "
+"Executable are needed to take advantage of Address Space Layout "
+"Randomization, supported by some kernel versions. While ASLR can already be "
+"enforced for data areas in the stack and heap (brk and mmap), the code areas "
+"must be compiled as position-independent. Shared libraries already do this (-"
+"fPIC), so they gain ASLR automatically, but binary .text regions need to be "
+"build PIE to gain ASLR. When this happens, ROP (Return Oriented Programming) "
+"attacks are much harder since there are no static locations to bounce off of "
+"during a memory corruption attack."
 msgstr ""
-"Cette variable permet de forcer la valeur renvoyée pour le I<drapeau> "
-"indiqué."
 
-#. type: TP
-#: dpkg-buildflags.1:115
-#, no-wrap
-msgid "B<DEB_>I<flag>B<_APPEND>"
-msgstr "B<DEB_>I<drapeau>B<_APPEND>"
+#. type: Plain text
+#: dpkg-buildflags.1:259
+msgid ""
+"This is not compatible with B<-fPIC> so care must be taken when building "
+"shared objects."
+msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:119
+#: dpkg-buildflags.1:265
 msgid ""
-"This variable can be used to append supplementary options to the value "
-"returned for the given I<flag>."
+"Additionally, since PIE is implemented via a general register, some "
+"architectures (most notably i386) can see performance losses of up to 15% in "
+"very text-segment-heavy application workloads; most workloads see less than "
+"1%. Architectures with more general registers (e.g. amd64)  do not see as "
+"high a worst-case penalty."
 msgstr ""
-"Cette variable permet d'ajouter des options à la valeur renvoyée pour le "
-"I<drapeau> indiqué."
 
 #. type: Plain text
-#: dpkg-buildflags.1:122 dpkg-maintscript-helper.1:130
-msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
-msgstr "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+#: dpkg-buildflags.1:268
+#, fuzzy
+#| msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2010-2011 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
+
+#. type: Plain text
+#: dpkg-buildflags.1:270
+#, fuzzy
+#| msgid "Copyright \\(co 2001 Joey Hess"
+msgid "Copyright \\(co 2011 Kees Cook"
+msgstr "Copyright \\(co 2001 Joey Hess"
 
 #. type: TH
 #: dpkg-buildpackage.1:1
@@ -6638,7 +7248,9 @@
 
 #. type: Plain text
 #: dpkg-buildpackage.1:8
-msgid "B<dpkg-buildpackage> [I<options>]"
+#, fuzzy
+#| msgid "B<dpkg-buildpackage> [I<options>]"
+msgid "B<dpkg-buildpackage> [I<option>...]"
 msgstr "B<dpkg-buildpackage> [I<options>]"
 
 #. type: Plain text
@@ -6724,6 +7336,13 @@
 
 #. type: Plain text
 #: dpkg-buildpackage.1:36
+#, fuzzy
+#| msgid ""
+#| "It calls B<debian/rules> B<build> followed by B<fakeroot debian/rules> "
+#| "I<binary-target> (unless a source-only build has been requested with B<-"
+#| "S>). Note that I<binary-target> is either B<binary> (default case, or if "
+#| "B<-b> is specified)  or B<binary-arch> (if B<-B> is specified) or "
+#| "B<binary-indep> (if B<-A> is specified)."
 msgid ""
 "It calls B<debian/rules> B<build> followed by B<fakeroot debian/rules> "
 "I<binary-target> (unless a source-only build has been requested with B<-S>). "
@@ -6936,7 +7555,7 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:96 dpkg-genchanges.1:49 dpkg-gencontrol.1:38
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 #, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<-v>I<version>"
@@ -7034,7 +7653,7 @@
 "cas de problèmes. Ceci est le comportement par défaut."
 
 #. type: TP
-#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:427
+#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:432
 #, no-wrap
 msgid "B<-d>"
 msgstr "B<-d>"
@@ -7248,8 +7867,8 @@
 msgstr "B<--admindir >I<rép>"
 
 #. type: Plain text
-#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:116
-#: dpkg-shlibdeps.1:217 dpkg-trigger.1:43
+#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:122
+#: dpkg-shlibdeps.1:215 dpkg-trigger.1:43
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
 "lib/dpkg>."
@@ -7259,18 +7878,23 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:223 dpkg-checkbuilddeps.1:33 dpkg-distaddfile.1:32
-#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
-#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
-#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:90 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-deb.1:172 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
+#: dpkg-gensymbols.1:443 dpkg-name.1:58 dpkg-parsechangelog.1:33
+#: dpkg-query.1:110 dpkg-scanpackages.1:96 dpkg-shlibdeps.1:215
+#: dpkg-source.1:96 dpkg-split.1:126 dpkg-trigger.1:31
 #, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr "B<-h>, B<--help>"
 
 #. type: Plain text
 #: dpkg-buildpackage.1:234
+#, fuzzy
+#| msgid ""
+#| "Even if B<dpkg-buildpackage> export some variables, B<debian/rules> "
+#| "should not rely on their presence and should instead use the respective "
+#| "interface to retrieve the needed values."
 msgid ""
-"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"Even if B<dpkg-buildpackage> exports some variables, B<debian/rules> should "
 "not rely on their presence and should instead use the respective interface "
 "to retrieve the needed values."
 msgstr ""
@@ -7298,20 +7922,16 @@
 #. type: SS
 #: dpkg-buildpackage.1:238
 #, no-wrap
-msgid "Compiler flags"
-msgstr "Drapeaux de compilation"
+msgid "Compiler flags are no longer exported"
+msgstr ""
 
 #. type: Plain text
 #: dpkg-buildpackage.1:243
 msgid ""
-"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
-"environment variables are set to the values that B<dpkg-buildflags> "
-"returned. See its manual page for more information."
-msgstr ""
-"Les variables d'environnement B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> "
-"et B<LDFLAGS> prennent les valeurs renvoyées par B<dpkg-buildflags>. "
-"Veuillez consulter la page de manuel de ce programme pour plus "
-"d'informations."
+"Between versions 1.14.17 and 1.16.1, B<dpkg-buildpackage> exported compiler "
+"flags (B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS>) with "
+"values as returned by B<dpkg-buildflags>. This is no longer the case."
+msgstr ""
 
 #. type: Plain text
 #: dpkg-buildpackage.1:248
@@ -7324,16 +7944,20 @@
 "I<commande-de-signature>."
 
 #. type: Plain text
-#: dpkg-buildpackage.1:255
+#: dpkg-buildpackage.1:256
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
+#| "B<fakeroot>(1), B<gpg>(1)."
 msgid ""
-"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
-"B<fakeroot>(1), B<gpg>(1)."
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
+"genchanges>(1), B<fakeroot>(1), B<gpg>(1)."
 msgstr ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
 "B<fakeroot>(1), B<gpg>(1)."
 
 #. type: Plain text
-#: dpkg-buildpackage.1:264 dpkg-source.1:712
+#: dpkg-buildpackage.1:265
 msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
 
@@ -7343,12 +7967,6 @@
 msgid "dpkg-checkbuilddeps"
 msgstr "dpkg-checkbuilddeps"
 
-#. type: TH
-#: dpkg-checkbuilddeps.1:1
-#, no-wrap
-msgid "2009-11-21"
-msgstr "21-11-2009"
-
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:4
 msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
@@ -7358,7 +7976,9 @@
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:9
-msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+#, fuzzy
+#| msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgid "B<dpkg-checkbuilddeps> [I<option>...] [I<control-file>]"
 msgstr "B<dpkg-checkbuilddeps> [I<options>] [I<fichier-control>]"
 
 #. type: Plain text
@@ -7375,8 +7995,12 @@
 
 #. type: Plain text
 #: 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."
 msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
+"By default, B<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 "
@@ -7430,7 +8054,9 @@
 
 #. type: Plain text
 #: dpkg-distaddfile.1:8
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+#, fuzzy
+#| msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+msgid "B<dpkg-distaddfile> [I<option>...]I< filename section priority>"
 msgstr "B<dpkg-distaddfile> [I<options>]I< fichier section priorité>"
 
 #. type: Plain text
@@ -7495,12 +8121,6 @@
 msgid "dpkg-deb"
 msgstr "dpkg-deb"
 
-#. type: TH
-#: dpkg-deb.1:1 dpkg-query.1:1 dselect.1:1
-#, no-wrap
-msgid "2010-03-07"
-msgstr "07-03-2010"
-
 #. type: Plain text
 #: dpkg-deb.1:4
 msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
@@ -7508,12 +8128,14 @@
 "dpkg-deb - outil pour la manipulation des archives (.deb) des paquets Debian"
 
 #. type: Plain text
-#: dpkg-deb.1:9
-msgid "B<dpkg-deb> [I<options>] I<command>"
+#: dpkg-deb.1:8
+#, fuzzy
+#| msgid "B<dpkg-deb> [I<options>] I<command>"
+msgid "B<dpkg-deb> [I<option>...] I<command>"
 msgstr "B<dpkg-deb> [I<options>] I<commande>"
 
 #. type: Plain text
-#: dpkg-deb.1:13
+#: dpkg-deb.1:12
 msgid ""
 "B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr ""
@@ -7521,12 +8143,12 @@
 "renseignements sur les archives Debian"
 
 #. type: Plain text
-#: dpkg-deb.1:17
+#: dpkg-deb.1:16
 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-deb.1:27
+#: dpkg-deb.1:26
 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> "
@@ -7536,13 +8158,13 @@
 "de B<dpkg-deb>. B<dpkg> comprend que B<dpkg-deb> est appelé et le lance."
 
 #. type: TP
-#: dpkg-deb.1:29
+#: dpkg-deb.1:28
 #, no-wrap
 msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
 msgstr "B<-b>, B<--build> I<répertoire> [I<archive>|I<répertoire>]"
 
 #. type: Plain text
-#: dpkg-deb.1:41
+#: dpkg-deb.1:40
 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 "
@@ -7558,7 +8180,7 @@
 "binaire."
 
 #. type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-deb.1:52
 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 "
@@ -7573,7 +8195,7 @@
 "fichiers qu'il trouve dans le répertoire de contrôle B<DEBIAN>."
 
 #. type: Plain text
-#: dpkg-deb.1:60
+#: dpkg-deb.1:59
 msgid ""
 "If no I<archive> is specified then B<dpkg-deb> will write the package into "
 "the file I<directory>B<.deb>."
@@ -7582,12 +8204,12 @@
 "I<répertoire>B<.deb>."
 
 #. type: Plain text
-#: dpkg-deb.1:62
+#: dpkg-deb.1:61
 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-deb.1:78
+#: dpkg-deb.1:77
 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 "
@@ -7605,18 +8227,18 @@
 "du paquet pour connaître le nom de fichier à utiliser)."
 
 #. type: TP
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 #, no-wrap
 msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr "B<-I>, B<--info> I<archive> [I<nom-fichier-control>...]"
 
 #. type: Plain text
-#: dpkg-deb.1:81
+#: dpkg-deb.1:80
 msgid "Provides information about a binary package archive."
 msgstr "Donne des renseignements sur une archive de paquet binaire."
 
 #. type: Plain text
-#: dpkg-deb.1:86
+#: dpkg-deb.1:85
 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."
@@ -7625,7 +8247,7 @@
 "du paquet ainsi que son fichier « control » sont affichés."
 
 #. type: Plain text
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 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 "
@@ -7638,13 +8260,13 @@
 "code égal à 2."
 
 #. type: TP
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 #, no-wrap
 msgid "B<-W>, B<--show> I<archive>"
 msgstr "B<-W>, B<--show> I<archive>"
 
 #. type: Plain text
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 msgid ""
 "Provides information about a binary package archive in the format specified "
 "by the B<--showformat> argument. The default format displays the package's "
@@ -7656,20 +8278,20 @@
 "tabulation."
 
 #. type: TP
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 #, no-wrap
 msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr "B<-f>, B<--field> I<archive> [I<nom-du-champ-de-control>...]"
 
 #. type: Plain text
-#: dpkg-deb.1:104
+#: dpkg-deb.1:103
 msgid "Extracts control file information from a binary package archive."
 msgstr ""
 "Extrait les renseignements du fichier « control » de l'archive du paquet "
 "binaire."
 
 #. type: Plain text
-#: dpkg-deb.1:108
+#: dpkg-deb.1:107
 msgid ""
 "If no B<control-file-field>s are specified then it will print the whole "
 "control file."
@@ -7678,7 +8300,7 @@
 "« control » est affiché en entier."
 
 #. type: Plain text
-#: dpkg-deb.1:117
+#: dpkg-deb.1:116
 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-"
@@ -7691,18 +8313,18 @@
 "champ (puis par un « deux-points » et une espace)."
 
 #. type: Plain text
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 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: TP
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 #, no-wrap
 msgid "B<-c>, B<--contents> I<archive>"
 msgstr "B<-c>, B<--contents> I<archive>"
 
 #. type: Plain text
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 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 "
@@ -7713,13 +8335,13 @@
 "d'énumération verbeuse."
 
 #. type: TP
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 #, no-wrap
 msgid "B<-x>, B<--extract> I<archive directory>"
 msgstr "B<-x>, B<--extract> I<archive répertoire>"
 
 #. type: Plain text
-#: dpkg-deb.1:129
+#: dpkg-deb.1:128
 msgid ""
 "Extracts the filesystem tree from a package archive into the specified "
 "directory."
@@ -7728,7 +8350,7 @@
 "spécifié."
 
 #. type: Plain text
-#: dpkg-deb.1:135
+#: dpkg-deb.1:134
 msgid ""
 "Note that extracting a package to the root directory will I<not> result in a "
 "correct installation! Use B<dpkg> to install packages."
@@ -7738,7 +8360,7 @@
 "l'installation des paquets."
 
 #. type: Plain text
-#: dpkg-deb.1:139
+#: dpkg-deb.1:138
 msgid ""
 "I<directory> (but not its parents) will be created if necessary, and its "
 "permissions modified to match the contents of the package."
@@ -7747,32 +8369,71 @@
 "ses permissions sont modifiées pour correspondre au cnotenu du paquet."
 
 #. type: TP
-#: dpkg-deb.1:139
+#: dpkg-deb.1:138
 #, no-wrap
 msgid "B<-X>, B<--vextract> I<archive directory>"
 msgstr "B<-X>, B<--vextract> I<archive répertoire>"
 
 #. type: Plain text
-#: dpkg-deb.1:144
+#: dpkg-deb.1:145
+#, fuzzy
+#| msgid ""
+#| "Is like B<--extract> (B<-x>)  but prints a listing of the files extracted "
+#| "as it goes."
 msgid ""
-"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
-"it goes."
+"Is like B<--extract> (B<-x>)  with B<--verbose> (B<-v>)  which prints a "
+"listing of the files extracted as it goes."
 msgstr ""
 "Comme B<--extract> (B<-x>), mais affiche la liste des fichiers au fur et à "
 "mesure qu'ils sont extraits."
 
 #. type: TP
-#: dpkg-deb.1:144
+#: dpkg-deb.1:145
+#, fuzzy, no-wrap
+#| msgid "B<-x>, B<--extract> I<archive directory>"
+msgid "B<-R>, B<--raw-extract> I<archive directory>"
+msgstr "B<-x>, B<--extract> I<archive répertoire>"
+
+#. type: Plain text
+#: dpkg-deb.1:150
+#, fuzzy
+#| msgid ""
+#| "Extracts the filesystem tree from a package archive into the specified "
+#| "directory."
+msgid ""
+"Extracts the filesystem tree from a package archive into a specified "
+"directory, and the control information files into a DEBIAN subdirectory of "
+"the specified directory."
+msgstr ""
+"Extrait l'arborescence des fichiers d'un paquet archive dans le répertoire "
+"spécifié."
+
+#. type: Plain text
+#: dpkg-deb.1:152 dpkg-deb.1:172
+msgid ""
+"The target directory (but not its parents) will be created if necessary."
+msgstr ""
+"Le répertoire cible est créé si nécessaire (mais pas ses répertoires "
+"parents)."
+
+#. type: TP
+#: dpkg-deb.1:152
 #, no-wrap
 msgid "B<--fsys-tarfile> I<archive>"
 msgstr "B<--fsys-tarfile> I<archive>"
 
 #. type: Plain text
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
+#, 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."
 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."
+"to extract a particular file from a package archive.  The input archive will "
+"always be processed sequentially."
 msgstr ""
 "Extrait les données de l'arborescence d'un paquet binaire et les envoie sur "
 "la sortie standard dans le format propre à la commande B<tar>. En combinant "
@@ -7780,13 +8441,13 @@
 "précis d'une archive de paquet."
 
 #. type: TP
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
 #, no-wrap
 msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<-e>, B<--control> I<archive> [I<répertoire>]"
 
 #. type: Plain text
-#: dpkg-deb.1:156
+#: dpkg-deb.1:165
 msgid ""
 "Extracts the control information files from a package archive into the "
 "specified directory."
@@ -7795,7 +8456,7 @@
 "spécifié."
 
 #. type: Plain text
-#: dpkg-deb.1:160
+#: dpkg-deb.1:169
 msgid ""
 "If no directory is specified then a subdirectory B<DEBIAN> in the current "
 "directory is used."
@@ -7803,22 +8464,14 @@
 "Quand aucun répertoire n'est précisé, on utilise un sous-répertoire "
 "B<DEBIAN> du répertoire actuel."
 
-#. type: Plain text
-#: dpkg-deb.1:163
-msgid ""
-"The target directory (but not its parents) will be created if necessary."
-msgstr ""
-"Le répertoire cible est créé si nécessaire (mais pas ses répertoires "
-"parents)."
-
 #. type: TP
-#: dpkg-deb.1:171
+#: dpkg-deb.1:180
 #, no-wrap
 msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-deb.1:176 dpkg-query.1:121
+#: dpkg-deb.1:185 dpkg-query.1:127
 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."
@@ -7827,7 +8480,7 @@
 "format sera utilisé pour chaque paquet listé."
 
 #. type: Plain text
-#: dpkg-deb.1:185
+#: dpkg-deb.1:194
 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 "
@@ -7843,33 +8496,39 @@
 "showformat>."
 
 #. type: Plain text
-#: dpkg-deb.1:187
+#: dpkg-deb.1:196
 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-deb.1:187
-#, no-wrap
-msgid "B<-z>I<compress_level>"
+#: dpkg-deb.1:196
+#, fuzzy, no-wrap
+#| msgid "B<-z>I<compress_level>"
+msgid "B<-z>I<compress-level>"
 msgstr "B<-z>I<niveau_compression>"
 
 #. type: Plain text
-#: dpkg-deb.1:191
+#: dpkg-deb.1:200
+#, fuzzy
+#| msgid ""
+#| "Specify which compression level to pass to the compressor backend "
+#| "program, when building a package."
 msgid ""
-"Specify which compression level to pass to the compressor backend program, "
-"when building a package."
+"Specify which compression level to use on the compressor backend, when "
+"building a package (default is 9 for gzip and bzip2, 6 for xz and lzma)."
 msgstr ""
 "Indique le niveau de compression à fournir au logiciel de compression appelé "
 "en sous-main lors de la compression du paquet."
 
 #. type: TP
-#: dpkg-deb.1:191
-#, no-wrap
-msgid "B<-Z>I<compress_type>"
+#: dpkg-deb.1:200
+#, fuzzy, no-wrap
+#| msgid "B<-Z>I<compress_type>"
+msgid "B<-Z>I<compress-type>"
 msgstr "B<-Z>I<type_compression>"
 
 #. type: Plain text
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 msgid ""
 "Specify which compression type to use when building a package. Allowed "
 "values are I<gzip>, I<xz>, I<bzip2>, I<lzma>, and I<none> (default is "
@@ -7880,13 +8539,13 @@
 "I<bzip2>, I<lzma> et I<none> (aucune compression)."
 
 #. type: TP
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 #, no-wrap
 msgid "B<--new>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 msgid ""
 "Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
@@ -7894,13 +8553,13 @@
 "C'est le comportement par défaut."
 
 #. type: TP
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 #, no-wrap
 msgid "B<--old>"
 msgstr "B<--old>"
 
 #. type: Plain text
-#: dpkg-deb.1:209
+#: dpkg-deb.1:218
 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 "
@@ -7913,8 +8572,14 @@
 "ê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: TP
+#: dpkg-deb.1:218
+#, no-wrap
+msgid "B<--nocheck>"
+msgstr "B<--nocheck>"
+
 #. type: Plain text
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224
 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."
@@ -7924,18 +8589,31 @@
 "archive, aussi défectueuse soit-elle."
 
 #. type: TP
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224 start-stop-daemon.8:255
+#, no-wrap
+msgid "B<-v>, B<--verbose>"
+msgstr "B<-v>, B<--verbose>"
+
+#. type: Plain text
+#: dpkg-deb.1:228
+msgid ""
+"Enables verbose output. This currently only affects B<--extract> making it "
+"behave like B<--vextract>."
+msgstr ""
+
+#. type: TP
+#: dpkg-deb.1:228
 #, no-wrap
 msgid "B<-D>, B<--debug>"
 msgstr "B<-D>, B<--debug>"
 
 #. type: Plain text
-#: dpkg-deb.1:218
+#: dpkg-deb.1:231
 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-deb.1:224
+#: dpkg-deb.1:237
 msgid ""
 "If set, B<dpkg-deb> will use it as the directory in which to create "
 "temporary files and directories."
@@ -7944,13 +8622,13 @@
 "créer les fichiers et répertoire temporaires."
 
 #. type: Plain text
-#: dpkg-deb.1:230
+#: dpkg-deb.1:243
 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."
 
 #. type: Plain text
-#: dpkg-deb.1:238
+#: dpkg-deb.1:251
 msgid ""
 "There is no authentication on B<.deb> files; in fact, there isn't even a "
 "straightforward checksum.  (Higher level tools like APT support "
@@ -7966,7 +8644,7 @@
 "géré par les outils de plus bas niveau."
 
 #. type: Plain text
-#: dpkg-deb.1:245
+#: dpkg-deb.1:258
 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 "
@@ -7978,7 +8656,7 @@
 "enregistrés."
 
 #. type: Plain text
-#: dpkg-deb.1:251
+#: dpkg-deb.1:264
 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)."
 
@@ -7988,13 +8666,6 @@
 msgid "dpkg-divert"
 msgstr "dpkg-divert"
 
-#. type: TH
-#: dpkg-divert.8:1
-#, fuzzy, no-wrap
-#| msgid "2010-10-10"
-msgid "2010-10-12"
-msgstr "10-10-2010"
-
 #. type: Plain text
 #: dpkg-divert.8:4
 msgid "dpkg-divert - override a package's version of a file"
@@ -8003,7 +8674,9 @@
 
 #. type: Plain text
 #: dpkg-divert.8:9
-msgid "B<dpkg-divert> [I<options>] I<command>"
+#, fuzzy
+#| msgid "B<dpkg-divert> [I<options>] I<command>"
+msgid "B<dpkg-divert> [I<option>...] I<command>"
 msgstr "B<dpkg-divert> [I<options>] I<commande>"
 
 #. type: Plain text
@@ -8045,7 +8718,7 @@
 msgstr "Ajouter un détournement pour le I<fichier>."
 
 #. type: TP
-#: dpkg-divert.8:28 dpkg-statoverride.8:36
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
 #, no-wrap
 msgid "B<--remove>I< file>"
 msgstr "B<--remove>I< fichier>"
@@ -8094,7 +8767,8 @@
 msgstr "Afficher le vrai nom d'un fichier détourné."
 
 #. type: TP
-#: dpkg-divert.8:43 dpkg-statoverride.8:53 update-alternatives.8:329
+#: dpkg-divert.8:43 dpkg-statoverride.8:52 dselect.1:44
+#: update-alternatives.8:328
 #, no-wrap
 msgid "B<--admindir>I< directory>"
 msgstr "B<--admindir>I< répertoire>"
@@ -8158,7 +8832,7 @@
 "I<paquet>."
 
 #. type: TP
-#: dpkg-divert.8:61 dpkg-statoverride.8:65 update-alternatives.8:351
+#: dpkg-divert.8:61 dpkg-statoverride.8:64 update-alternatives.8:350
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
@@ -8202,10 +8876,15 @@
 
 #. type: Plain text
 #: dpkg-divert.8:82
-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."
+#, 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 ""
+"When adding, default is B<--local> and B<--divert> I<original>B<.distrib>. "
+"When removing, B<--package> or B<--local> and B<--divert> must match if "
+"specified."
 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> "
@@ -8283,15 +8962,15 @@
 msgstr "dpkg-divert --package wibble --rename --remove /usr/bin/example"
 
 #. type: TP
-#: dpkg-divert.8:113 dpkg-query.1:197 dpkg-statoverride.8:70 dpkg-trigger.1:61
-#: update-alternatives.8:356
+#: dpkg-divert.8:113 dpkg-query.1:205 dpkg-statoverride.8:69 dpkg-trigger.1:61
+#: update-alternatives.8:355
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_MAINTSCRIPT_ARCH>"
 msgid "B<DPKG_ADMINDIR>"
 msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
 
 #. type: Plain text
-#: dpkg-divert.8:117 dpkg-query.1:201 dpkg-statoverride.8:74 dpkg-trigger.1:65
+#: dpkg-divert.8:117 dpkg-query.1:209 dpkg-statoverride.8:73 dpkg-trigger.1:65
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the dpkg data directory."
@@ -8300,7 +8979,7 @@
 #. type: Plain text
 #: dpkg-divert.8:121
 msgid ""
-"If set and the I<--local> and I<--package> options have not been specified, "
+"If set and the B<--local> and B<--package> options have not been specified, "
 "B<dpkg-divert> will use it as the package name."
 msgstr ""
 
@@ -8331,7 +9010,7 @@
 "l'extension « -old », avant de la remplacer par la nouvelle."
 
 #. type: Plain text
-#: dpkg-divert.8:137 update-alternatives.8:495
+#: dpkg-divert.8:137 update-alternatives.8:496
 msgid "Copyright \\(co 1995 Ian Jackson"
 msgstr "Copyright \\(co 1995 Ian Jackson"
 
@@ -8348,7 +9027,9 @@
 
 #. type: Plain text
 #: dpkg-genchanges.1:8
-msgid "B<dpkg-genchanges> [I<options>]"
+#, fuzzy
+#| msgid "B<dpkg-genchanges> [I<options>]"
+msgid "B<dpkg-genchanges> [I<option>...]"
 msgstr "B<dpkg-genchanges> [I<options>]"
 
 #. type: Plain text
@@ -8469,13 +9150,13 @@
 "source."
 
 #. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:121
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:127
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr "B<-V>I<nom>B<=>I<valeur>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-source.1:131
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
@@ -8484,8 +9165,8 @@
 "pour une discussion sur la valeur de substitution."
 
 #. type: TP
-#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:169
+#: dpkg-source.1:131
 #, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<-T>I<fichier/substvars>"
@@ -8507,29 +9188,29 @@
 "fichiers."
 
 #. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:131
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:137
 #, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<champ>B<=>I<valeur>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 msgid "Override or add an output control file field."
 msgstr "Remplace ou ajoute en sortie un champ dans le fichier de contrôle."
 
 #. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 #, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<-U>I<champ>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:137
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:143
 msgid "Remove an output control file field."
 msgstr "Supprime en sortie un champ dans le fichier de contrôle."
 
 #. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:98
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:104
 #, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "B<-c>I<fichier/control>"
@@ -8545,7 +9226,7 @@
 
 #. type: TP
 #: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr "B<-l>I<fichier/changelog>"
@@ -8570,14 +9251,14 @@
 
 #. type: TP
 #: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr "B<-F>I<format-du-changelog>"
 
 #. type: Plain text
 #: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 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 "
@@ -8606,7 +9287,7 @@
 "B<.changes.)>"
 
 #. type: TP
-#: dpkg-genchanges.1:123 dpkg-gensymbols.1:416
+#: dpkg-genchanges.1:123 dpkg-gensymbols.1:421
 #, no-wrap
 msgid "B<-q>"
 msgstr "B<-q>"
@@ -8645,7 +9326,9 @@
 
 #. type: Plain text
 #: dpkg-gencontrol.1:8
-msgid "B<dpkg-gencontrol> [I<options>]"
+#, fuzzy
+#| msgid "B<dpkg-gencontrol> [I<options>]"
+msgid "B<dpkg-gencontrol> [I<option>...]"
 msgstr "B<dpkg-gencontrol> [I<options>]"
 
 #. type: Plain text
@@ -8733,7 +9416,7 @@
 "fichiers."
 
 #. type: TP
-#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:368
+#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:373
 #, no-wrap
 msgid "B<-p>I<package>"
 msgstr "B<-p>I<paquet>"
@@ -8810,7 +9493,7 @@
 "défaut pour le fichier de sortie."
 
 #. type: TP
-#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:386 dpkg-shlibdeps.1:152
+#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:391 dpkg-shlibdeps.1:150
 #, no-wrap
 msgid "B<-O>"
 msgstr "B<-O>"
@@ -8853,7 +9536,7 @@
 "paquets binaires à partir des fichiers « control » qu'il crée."
 
 #. type: Plain text
-#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:339
+#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:337
 msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 
@@ -8863,12 +9546,6 @@
 msgid "dpkg-gensymbols"
 msgstr "dpkg-gensymbols"
 
-#. type: TH
-#: dpkg-gensymbols.1:2
-#, no-wrap
-msgid "2009-08-07"
-msgstr "07-08-2009"
-
 #. type: Plain text
 #: dpkg-gensymbols.1:5
 msgid ""
@@ -8880,7 +9557,9 @@
 
 #. type: Plain text
 #: dpkg-gensymbols.1:9
-msgid "B<dpkg-gensymbols> [I<options>]"
+#, fuzzy
+#| msgid "B<dpkg-gensymbols> [I<options>]"
+msgid "B<dpkg-gensymbols> [I<option>...]"
 msgstr "B<dpkg-gensymbols> [I<options>]"
 
 #. type: Plain text
@@ -8909,14 +9588,6 @@
 "de symboles fournis par le responsable. Il recherche les fichiers suivants "
 "(en utilisant le premier trouvé) :"
 
-#. type: IP
-#: dpkg-gensymbols.1:20 dpkg-gensymbols.1:22 dpkg-gensymbols.1:24
-#: dpkg-gensymbols.1:26 dpkg-gensymbols.1:306 dpkg-gensymbols.1:312
-#: dpkg-gensymbols.1:346 dpkg-gensymbols.1:350 dpkg-gensymbols.1:353
-#, no-wrap
-msgid "\\(bu"
-msgstr "\\(bu"
-
 #. type: Plain text
 #: dpkg-gensymbols.1:22
 msgid "debian/I<package>.symbols.I<arch>"
@@ -9019,14 +9690,23 @@
 "contrôler qu'il est correct. Les symboles publics sont supposés ne jamais "
 "disparaître et le correctif ne devrait donc qu'ajouter des lignes."
 
+#. type: Plain text
+#: dpkg-gensymbols.1:64
+msgid ""
+"Note that you can put comments in symbols files: any line with '#' as the "
+"first character is a comment except if it starts with '#include' (see "
+"section B<Using includes>). Lines starting with '#MISSING:' are special "
+"comments documenting symbols that have disappeared."
+msgstr ""
+
 #. type: SS
-#: dpkg-gensymbols.1:59
+#: dpkg-gensymbols.1:64
 #, no-wrap
 msgid "Using #PACKAGE# substitution"
 msgstr "Utilisation du remplacement de #PACKAGE#"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 msgid ""
 "In some rare cases, the name of the library varies between architectures.  "
 "To avoid hardcoding the name of the package in the symbols file, you can use "
@@ -9042,13 +9722,13 @@
 "fichier de symboles d'un paquet binaire."
 
 #. type: SS
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 #, no-wrap
 msgid "Using symbol tags"
 msgstr "Utilisation des étiquettes de symboles"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:74
+#: dpkg-gensymbols.1:79
 msgid ""
 "Symbol tagging is useful for marking symbols that are special in some way.  "
 "Any symbol can have an arbitrary number of tags associated with it. While "
@@ -9065,7 +9745,7 @@
 "standard de symboles> pour une référence complète à propos de ces étiquettes."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:86
+#: dpkg-gensymbols.1:91
 msgid ""
 "Tag specification comes right before the symbol name (no whitespace is "
 "allowed in between). It always starts with an opening bracket B<(>, ends "
@@ -9093,7 +9773,7 @@
 "symbole, qui s'arrête alors au premier espace."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:90
+#: dpkg-gensymbols.1:95
 #, no-wrap
 msgid ""
 " (tag1=i am marked|tag name with space)\"tagged quoted symbol\"@Base 1.0\n"
@@ -9105,7 +9785,7 @@
 " symbole_non_étiqueté@Base 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:96
+#: dpkg-gensymbols.1:101
 msgid ""
 "The first symbol in the example is named I<tagged quoted symbol> and has two "
 "tags: I<tag1> with value I<i am marked> and I<tag name with space> that has "
@@ -9120,7 +9800,7 @@
 "symbole est un exemple de symbole normal sans étiquette."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 msgid ""
 "Since symbol tags are an extension of the I<deb-symbols(5)> format, they can "
 "only be part of the symbols files used in source packages (those files "
@@ -9146,19 +9826,19 @@
 "dans leur forme d'origine."
 
 #. type: SS
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 #, no-wrap
 msgid "Standard symbol tags"
 msgstr "Étiquettes standard de symboles"
 
 #. type: TP
-#: dpkg-gensymbols.1:109
+#: dpkg-gensymbols.1:114
 #, no-wrap
 msgid "B<optional>"
 msgstr "B<optional>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:119
+#: dpkg-gensymbols.1:124
 msgid ""
 "A symbol marked as optional can disappear from the library at any time and "
 "that will never cause B<dpkg-gensymbols> to fail. However, disappeared "
@@ -9180,7 +9860,7 @@
 "existant (« existing »), sans modification de sa version minimale."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 msgid ""
 "This tag is useful for symbols which are private where their disappearance "
 "do not cause ABI breakage. For example, most of C++ template instantiations "
@@ -9196,13 +9876,13 @@
 "optionnel."
 
 #. type: TP
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 #, no-wrap
 msgid "B<arch=>I<architecture list>"
 msgstr "B<arch=>I<liste d'architectures>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:137
+#: dpkg-gensymbols.1:142
 msgid ""
 "This tag allows one to restrict the set of architectures where the symbol is "
 "supposed to exist. When the symbols list is updated with the symbols "
@@ -9231,7 +9911,7 @@
 "aspirine peut être nécessaire après la lecture de ce paragraphe)"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:143
+#: dpkg-gensymbols.1:148
 msgid ""
 "When operating in the default non-template mode, among arch-specific symbols "
 "only those that match the current host architecture are written to the "
@@ -9247,7 +9927,7 @@
 "le mode « modèle »."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:149
+#: dpkg-gensymbols.1:154
 msgid ""
 "The format of I<architecture list> is the same as the one used in the "
 "I<Build-Depends> field of I<debian/control> (except the enclosing square "
@@ -9262,7 +9942,7 @@
 "et ia64, mais le second uniquement sur armel."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid ""
 " (arch=alpha amd64 kfreebsd-amd64 ia64)a_64bit_specific_symbol@Base 1.0\n"
@@ -9272,13 +9952,13 @@
 " (arch=!armel)un_symbole_inexistant_sur_armel@Base 1.0\n"
 
 #. type: TP
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid "B<ignore-blacklist>"
 msgstr "B<ignore-blacklist>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:160
+#: dpkg-gensymbols.1:165
 msgid ""
 "dpkg-gensymbols has an internal blacklist of symbols that should not appear "
 "in symbols files as they are usually only side-effects of implementation "
@@ -9296,13 +9976,13 @@
 "certaines bibliothèques de bas niveau telles que libgcc."
 
 #. type: TP
-#: dpkg-gensymbols.1:160 dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:165 dpkg-gensymbols.1:202
 #, no-wrap
 msgid "B<c++>"
 msgstr "B<c++>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:164
+#: dpkg-gensymbols.1:169
 msgid ""
 "Denotes I<c++> symbol pattern. See B<Using symbol patterns> subsection below."
 msgstr ""
@@ -9310,26 +9990,26 @@
 "canevas de symboles> plus loin."
 
 #. type: TP
-#: dpkg-gensymbols.1:164 dpkg-gensymbols.1:228
+#: dpkg-gensymbols.1:169 dpkg-gensymbols.1:233
 #, no-wrap
 msgid "B<symver>"
 msgstr "B<symver>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:168
+#: dpkg-gensymbols.1:173
 msgid ""
 "Denotes I<symver> (symbol version) symbol pattern. See B<Using symbol "
 "patterns> subsection below."
 msgstr "Indique un motif de symbole I<symver> (version de symbole)."
 
 #. type: TP
-#: dpkg-gensymbols.1:168 dpkg-gensymbols.1:253
+#: dpkg-gensymbols.1:173 dpkg-gensymbols.1:258
 #, no-wrap
 msgid "B<regex>"
 msgstr "B<regex>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 msgid ""
 "Denotes I<regex> symbol pattern. See B<Using symbol patterns> subsection "
 "below."
@@ -9338,13 +10018,13 @@
 "la sous-section B<Utilisation des motifs de symboles> plus loin."
 
 #. type: SS
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 #, no-wrap
 msgid "Using symbol patterns"
 msgstr "Utilisation des motifs de symboles"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:180
+#: dpkg-gensymbols.1:185
 msgid ""
 "Unlike a standard symbol specification, a pattern may cover multiple real "
 "symbols from the library. B<dpkg-gensymbols> will attempt to match each "
@@ -9363,7 +10043,7 @@
 "correspond, le symbole sera considéré comme nouveau."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:188
+#: dpkg-gensymbols.1:193
 msgid ""
 "A pattern is considered lost if it does not match any symbol in the library. "
 "By default this will trigger a B<dpkg-gensymbols> failure under I<-c1> or "
@@ -9386,7 +10066,7 @@
 "standard de symboles> pour plus d'informations."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:195
+#: dpkg-gensymbols.1:200
 msgid ""
 "Patterns are an extension of the I<deb-symbols(5)> format hence they are "
 "only valid in symbol file templates. Pattern specification syntax is not any "
@@ -9403,12 +10083,12 @@
 "usuellement marqué avec une étiquette spéciale."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:202
 msgid "At the moment, B<dpkg-gensymbols> supports three basic pattern types:"
 msgstr "Actuellement, B<dpkg-gensymbols> gères trois type de base de motifs :"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:209
+#: dpkg-gensymbols.1:214
 msgid ""
 "This pattern is denoted by the I<c++> tag. It matches only C++ symbols by "
 "their demangled symbol name (as emitted by B<c++filt>(1) utility). This "
@@ -9436,7 +10116,7 @@
 "être indiqués avec le même motif I<c++> :"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:215
+#: dpkg-gensymbols.1:220
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -9450,19 +10130,19 @@
 " [...]\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:217
+#: dpkg-gensymbols.1:222
 msgid ""
 "The demangled name above can be obtained by executing the following command:"
 msgstr "Le nom complet ci-dessus peut être obtenu avec la commande suivante :"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:219
+#: dpkg-gensymbols.1:224
 #, no-wrap
 msgid " $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt\n"
 msgstr " $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:227
+#: dpkg-gensymbols.1:232
 msgid ""
 "Please note that while mangled name is unique in the library by definition, "
 "this is not necessarily true for demangled names. A couple of distinct real "
@@ -9483,7 +10163,7 @@
 "fichier de symboles."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:234
+#: dpkg-gensymbols.1:239
 msgid ""
 "This pattern is denoted by the I<symver> tag. Well maintained libraries have "
 "versioned symbols where each version corresponds to the upstream version "
@@ -9497,7 +10177,7 @@
 "symbole associée à la version spécifique. Par exemple :"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:241
+#: dpkg-gensymbols.1:246
 #, no-wrap
 msgid ""
 "libc.so.6 libc6 #MINVER#\n"
@@ -9513,7 +10193,7 @@
 " access@GLIBC_2.0 2.2\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:247
+#: dpkg-gensymbols.1:252
 msgid ""
 "All symbols associated with versions GLIBC_2.0 and GLIBC_2.7 will lead to "
 "minimal version of 2.0 and 2.7 respectively with the exception of the symbol "
@@ -9529,7 +10209,7 @@
 "prennent le pas sur les motifs."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:252
+#: dpkg-gensymbols.1:257
 msgid ""
 "Please note that while old style wildcard patterns (denoted by \"*@version\" "
 "in the symbol name field) are still supported, they have been deprecated by "
@@ -9545,7 +10225,7 @@
 "recherché."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:260
+#: dpkg-gensymbols.1:265
 msgid ""
 "Regular expression patterns are denoted by the I<regex> tag. They match by "
 "the perl regular expression specified in the symbol name field. A regular "
@@ -9561,7 +10241,7 @@
 "exemple :"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:265
+#: dpkg-gensymbols.1:270
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -9573,7 +10253,7 @@
 " (regex|optional)\"private\" 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:270
+#: dpkg-gensymbols.1:275
 msgid ""
 "Symbols like \"mystack_new@Base\", \"mystack_push@Base\", \"mystack_pop@Base"
 "\" etc.  will be matched by the first pattern while e.g. "
@@ -9589,7 +10269,7 @@
 "I<optional> depuis le motif."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:275
+#: dpkg-gensymbols.1:280
 msgid ""
 "Basic patterns listed above can be combined where it makes sense. In that "
 "case, they are processed in the order in which the tags are specified. For "
@@ -9600,7 +10280,7 @@
 "Par exemple, les deux motifs"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:278
+#: dpkg-gensymbols.1:283
 #, no-wrap
 msgid ""
 " (c++|regex)\"^NSA::ClassA::Private::privmethod\\ed\\e(int\\e)@Base\" 1.0\n"
@@ -9610,7 +10290,7 @@
 " (regex|c++)N3NSA6ClassA7Private11privmethod\\edEi@Base 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:288
+#: dpkg-gensymbols.1:293
 msgid ""
 "will match symbols \"_ZN3NSA6ClassA7Private11privmethod1Ei@Base\" and "
 "\"_ZN3NSA6ClassA7Private11privmethod2Ei@Base\". When matching the first "
@@ -9637,7 +10317,7 @@
 "de traduire du Klingon !)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:294
+#: dpkg-gensymbols.1:299
 msgid ""
 "In general, all patterns are divided into two groups: aliases (basic I<c++> "
 "and I<symver>) and generic patterns (I<regex>, all combinations of multiple "
@@ -9653,7 +10333,7 @@
 "il est déconseillé d'abuser des motifs génériques."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 msgid ""
 "When multiple patterns match the same real symbol, aliases (first I<c++>, "
 "then I<symver>) are preferred over generic patterns. Generic patterns are "
@@ -9671,13 +10351,13 @@
 "fichiers de différences d'après l'ordre alphabético-numérique de leur nom."
 
 #. type: SS
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 #, no-wrap
 msgid "Using includes"
 msgstr "Utilisation des inclusions"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:306
+#: dpkg-gensymbols.1:311
 msgid ""
 "When the set of exported symbols differ between architectures, it may become "
 "inefficient to use a single symbol file. In those cases, an include "
@@ -9688,7 +10368,7 @@
 "ces cas, une directive d'inclusion peut devenir utile dans certains cas."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:310
+#: dpkg-gensymbols.1:315
 msgid ""
 "You can factorize the common part in some external file and include that "
 "file in your I<package>.symbols.I<arch> file by using an include directive "
@@ -9699,26 +10379,34 @@
 "directive « include » utilisée de la manière suivante :"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:312
+#: dpkg-gensymbols.1:317
 msgid "#include \"I<packages>.symbols.common\""
 msgstr "#include \"I<paquets>.symbols.common\""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:314
+#: dpkg-gensymbols.1:319
 msgid "The include directive may also be tagged like any symbol:"
 msgstr ""
 "La directive d'inclusion peut également être étiquetée comme tout autre "
 "symbole :"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:316
-msgid "(tag|..|tagN)#include \"file_to_include\""
+#: dpkg-gensymbols.1:321
+#, fuzzy
+#| msgid "(tag|..|tagN)#include \"file_to_include\""
+msgid "(tag|..|tagN)#include \"file-to-include\""
 msgstr "(etiquette|..|etiquetteN)#include \"fichier_a_incllure\""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:321
+#: dpkg-gensymbols.1:326
+#, fuzzy
+#| msgid ""
+#| "As a result, all symbols included from I<file_to_include> will be "
+#| "considered to be tagged with I<tag> .. I<tagN> by default. You can use "
+#| "this feature to create a common I<package>.symbols file which includes "
+#| "architecture specific symbol files:"
 msgid ""
-"As a result, all symbols included from I<file_to_include> will be considered "
+"As a result, all symbols included from I<file-to-include> will be considered "
 "to be tagged with I<tag> .. I<tagN> by default. You can use this feature to "
 "create a common I<package>.symbols file which includes architecture specific "
 "symbol files:"
@@ -9729,7 +10417,7 @@
 "spécifiques des architectures :"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:326
+#: dpkg-gensymbols.1:331
 #, no-wrap
 msgid ""
 "  common_symbol1@Base 1.0\n"
@@ -9743,7 +10431,7 @@
 "  symbole_commun2@Base 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:335
+#: dpkg-gensymbols.1:340
 msgid ""
 "The symbols files are read line by line, and include directives are "
 "processed as soon as they are encountered. This means that the content of "
@@ -9765,7 +10453,7 @@
 "permettant de remplacer une de ses étiquettes héritées."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:340
+#: dpkg-gensymbols.1:345
 msgid ""
 "An included file can repeat the header line containing the SONAME of the "
 "library. In that case, it overrides any header line previously read.  "
@@ -9778,7 +10466,7 @@
 "tête. Une façon de le faire est la méthode suivante :"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid ""
 "#include \"libsomething1.symbols.common\"\n"
@@ -9788,18 +10476,18 @@
 " symboles_specifique_architecture@Base 1.0\n"
 
 #. type: SS
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid "Good library management"
 msgstr "Bonnes pratiques de gestion des bibliothèques"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:346
+#: dpkg-gensymbols.1:351
 msgid "A well-maintained library has the following features:"
 msgstr "une bibliothèque bien maintenue offre les possibilités suivantes :"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:350
+#: dpkg-gensymbols.1:355
 msgid ""
 "its API is stable (public symbols are never dropped, only new public symbols "
 "are added) and changes in incompatible ways only when the SONAME changes;"
@@ -9810,7 +10498,7 @@
 "incompatibilité doivent être combinés avec un changement de SONAME ;"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:353
+#: dpkg-gensymbols.1:358
 msgid ""
 "ideally, it uses symbol versioning to achieve ABI stability despite internal "
 "changes and API extension;"
@@ -9820,7 +10508,7 @@
 "internes et l'extension de son API ;"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:356
+#: dpkg-gensymbols.1:361
 msgid ""
 "it doesn't export private symbols (such symbols can be tagged optional as "
 "workaround)."
@@ -9829,7 +10517,7 @@
 "symboles peuvent être étiquetés comme optionnels)"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:364
+#: dpkg-gensymbols.1:369
 msgid ""
 "While maintaining the symbols file, it's easy to notice appearance and "
 "disappearance of symbols. But it's more difficult to catch incompatible API "
@@ -9849,18 +10537,18 @@
 "Debian."
 
 #. type: TP
-#: dpkg-gensymbols.1:365
+#: dpkg-gensymbols.1:370
 #, no-wrap
 msgid "B<-P>I<package-build-dir>"
 msgstr "B<-P>I<répertoire-construction-paquet>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:368
+#: dpkg-gensymbols.1:373
 msgid "Scan I<package-build-dir> instead of debian/tmp."
 msgstr "Analyse de I<répertoire-construction-paquet>, plutôt que debian/tmp."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 msgid ""
 "Define the package name. Required if more than one binary package is listed "
 "in debian/control (or if there's no debian/control file)."
@@ -9869,7 +10557,7 @@
 "dans debian/control (ou s'il n'y a pas de fichier debian/control)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 msgid ""
 "Define the package version. Defaults to the version extracted from debian/"
 "changelog. Required if called outside of a source package tree."
@@ -9879,13 +10567,13 @@
 "dehors de l'arborescence source d'un paquet."
 
 #. type: TP
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 #, no-wrap
 msgid "B<-e>I<library-file>"
 msgstr "B<-e>I<fichier-bibliothèque>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 msgid ""
 "Only analyze libraries explicitly listed instead of finding all public "
 "libraries. You can use a regular expression in I<library-file> to match "
@@ -9899,13 +10587,13 @@
 "plusieurs paramètres B<-e> sont nécessaires)."
 
 #. type: TP
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 #, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<-I>I<nom-de-fichier>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:386
+#: dpkg-gensymbols.1:391
 msgid ""
 "Use I<filename> as reference file to generate the symbols file that is "
 "integrated in the package itself."
@@ -9914,7 +10602,7 @@
 "de symboles à intégrer dans le paquet lui-même."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 msgid ""
 "Print the generated symbols file to standard output, rather than being "
 "stored in the package build tree."
@@ -9923,13 +10611,13 @@
 "l'écrire dans l'arborescence source du paquet."
 
 #. type: TP
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 #, no-wrap
 msgid "B<-O>I<filename>"
 msgstr "B<-O>I<nom-de-fichier>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 msgid ""
 "Store the generated symbols file as I<filename>. If I<filename> is pre-"
 "existing, its content is used as basis for the generated symbols file.  You "
@@ -9943,13 +10631,13 @@
 "bibliothèque."
 
 #. type: TP
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 #, no-wrap
 msgid "B<-t>"
 msgstr "B<-t>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 msgid ""
 "Write the symbol file in template mode rather than the format compatible "
 "with I<deb-symbols(5)>. The main difference is that in the template mode "
@@ -9969,13 +10657,13 @@
 "la création d'un modèle de fichier de symboles."
 
 #. type: TP
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 #, no-wrap
 msgid "B<-c>I<[0-4]>"
 msgstr "B<-c>I<[0-4]>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:413
+#: dpkg-gensymbols.1:418
 msgid ""
 "Define the checks to do when comparing the generated symbols file with the "
 "template file used as starting point. By default the level is 1. Increasing "
@@ -9995,7 +10683,7 @@
 "ajoutées."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:416
+#: dpkg-gensymbols.1:421
 msgid ""
 "This value can be overridden by the environment variable "
 "DPKG_GENSYMBOLS_CHECK_LEVEL."
@@ -10004,7 +10692,7 @@
 "d'environnement DPKG_GENSYMBOLS_CHECK_LEVEL."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 msgid ""
 "Keep quiet and never generate a diff between generated symbols file and the "
 "template file used as starting point or show any warnings about new/lost "
@@ -10019,13 +10707,13 @@
 "l'option I<-c>)."
 
 #. type: TP
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 #, no-wrap
 msgid "B<-a>I<arch>"
 msgstr "B<-a>I<arch>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:427
+#: dpkg-gensymbols.1:432
 msgid ""
 "Assume I<arch> as host architecture when processing symbol files. Use this "
 "option to generate a symbol file or diff for any architecture provided its "
@@ -10037,7 +10725,7 @@
 "fichiers binaires correspondants soient déjà disponibles."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 msgid ""
 "Enable debug mode. Numerous messages are displayed to explain what B<dpkg-"
 "gensymbols> does."
@@ -10046,13 +10734,13 @@
 "que B<dpkg-gensymbols> fait."
 
 #. type: TP
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 #, no-wrap
 msgid "B<-V>"
 msgstr "B<-V>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:438
+#: dpkg-gensymbols.1:443
 msgid ""
 "Enable verbose mode. The generated symbols file contains deprecated symbols "
 "as comments. Furthermore in template mode, pattern symbols are followed by "
@@ -10064,27 +10752,27 @@
 "correspondent au motif."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:447
+#: dpkg-gensymbols.1:452
 msgid "B<http://people.redhat.com/drepper/symbol-versioning>"
 msgstr "B<http://people.redhat.com/drepper/symbol-versioning>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:449
+#: dpkg-gensymbols.1:454
 msgid "B<http://people.redhat.com/drepper/goodpractice.pdf>"
 msgstr "B<http://people.redhat.com/drepper/goodpractice.pdf>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:451
+#: dpkg-gensymbols.1:456
 msgid "B<http://people.redhat.com/drepper/dsohowto.pdf>"
 msgstr "B<http://people.redhat.com/drepper/dsohowto.pdf>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:454
+#: dpkg-gensymbols.1:459
 msgid "B<deb-symbols>(5), B<dpkg-shlibdeps>(1)."
 msgstr "B<deb-symbols>(5), B<dpkg-shlibdeps>(1)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:457
+#: dpkg-gensymbols.1:462
 msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
 
@@ -10094,12 +10782,6 @@
 msgid "dpkg-maintscript-helper"
 msgstr "dpkg-maintscript-helper"
 
-#. type: TH
-#: dpkg-maintscript-helper.1:1
-#, no-wrap
-msgid "2010-04-16"
-msgstr "16-04-2010"
-
 #. type: Plain text
 #: dpkg-maintscript-helper.1:4
 msgid ""
@@ -10111,9 +10793,13 @@
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:8
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-maintscript-helper> I<command> [I<parameters>...] -- I<maint-"
+#| "script-parameters>"
 msgid ""
-"B<dpkg-maintscript-helper> I<command> [I<parameters>...] -- I<maint-script-"
-"parameters>"
+"B<dpkg-maintscript-helper> I<command> [I<parameter>...] B<--> I<maint-script-"
+"parameter>..."
 msgstr ""
 "B<dpkg-maintscript-helper> I<commande> [I<paramètres>...] -- I<paramètres-"
 "script-responsable>"
@@ -10152,13 +10838,21 @@
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:27
+#, fuzzy
+#| msgid ""
+#| "Many of those tasks require coordinated actions from several maintainer "
+#| "scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
+#| "the same call simply needs to be put in all scripts and the program will "
+#| "automatically adapt its behaviour based on the environment variable "
+#| "DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you "
+#| "have to forward after a double dash."
 msgid ""
 "Many of those tasks require coordinated actions from several maintainer "
 "scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
 "the same call simply needs to be put in all scripts and the program will "
 "automatically adapt its behaviour based on the environment variable "
-"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
-"to forward after a double dash."
+"B<DPKG_MAINTSCRIPT_NAME> and on the maintainer scripts arguments that you "
+"have to forward after a double dash."
 msgstr ""
 "La plupart de ces tâches nécessitent la coordination de plusieurs script du "
 "responsable (B<preinst>, B<postinst>, B<prerm>, B<postrm>). Pour éviter des "
@@ -10407,8 +11101,9 @@
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:118
-#, no-wrap
-msgid "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
+#, fuzzy, no-wrap
+#| msgid "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
+msgid "    B<Pre-Depends:> dpkg (E<gt>= 1.15.7.2)\n"
 msgstr "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
 
 #. type: Plain text
@@ -10426,10 +11121,14 @@
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:127
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
+#| "        dpkg-maintscript-helper E<lt>commandE<gt> ...\n"
+#| "    fi\n"
 msgid ""
-"    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
-"        dpkg-maintscript-helper E<lt>commandE<gt> ...\n"
+"    if dpkg-maintscript-helper supports I<command>; then\n"
+"        dpkg-maintscript-helper I<command> ...\n"
 "    fi\n"
 msgstr ""
 "    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
@@ -10437,6 +11136,11 @@
 "    fi\n"
 
 #. type: Plain text
+#: dpkg-maintscript-helper.1:130
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+
+#. type: Plain text
 #: dpkg-maintscript-helper.1:132
 msgid "Copyright \\(co 2008 Joey Hess"
 msgstr "Copyright \\(co 2008 Joey Hess"
@@ -10457,12 +11161,6 @@
 msgid "dpkg-mergechangelogs"
 msgstr "dpkg-mergechangelogs"
 
-#. type: TH
-#: dpkg-mergechangelogs.1:1
-#, no-wrap
-msgid "2010-04-18"
-msgstr "18-04-2010"
-
 #. type: Plain text
 #: dpkg-mergechangelogs.1:4
 msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
@@ -10624,21 +11322,32 @@
 
 #. type: Plain text
 #: dpkg-name.1:15
-msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+#, fuzzy
+#| msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+msgid "B<dpkg-name> [I<option>...] [B<-->] I<file>..."
 msgstr "B<dpkg-name> [I<options>] [B<-->] I<fichiers>"
 
 #. type: Plain text
-#: dpkg-name.1:28
+#: dpkg-name.1:29
+#, 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>."
+#| "E<lt>package_typeE<gt>> 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. The I<E<lt>package_typeE<gt>> part comes from that field if "
+#| "present or fallbacks to B<deb>."
 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>."
-"E<lt>package_typeE<gt>> 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. "
-"The I<E<lt>package_typeE<gt>> part comes from that field if present or "
-"fallbacks to B<deb>."
+"package name consists of I<package>B<_>I<version>B<_>I<architecture>B<."
+">I<package-type> as specified in the control file of the package. The "
+"I<version> part of the filename consists of the upstream version information "
+"optionally followed by a hyphen and the revision information. The I<package-"
+"type> part comes from that field if present or fallbacks to B<deb>."
 msgstr ""
 "Cette page de manuel documente le programme B<dpkg-name> qui fournit une "
 "façon simple de redonner aux paquets B<Debian> leur nom complet. Ce nom "
@@ -10651,35 +11360,35 @@
 "provient de ce champ s'il existe. La valeur par défault étant B<deb>."
 
 #. type: TP
-#: dpkg-name.1:30
+#: dpkg-name.1:31
 #, no-wrap
 msgid "B<-a>, B<--no-architecture>"
 msgstr "B<-a>, B<--no-architecture>"
 
 #. type: Plain text
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 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:33
+#: dpkg-name.1:34
 #, no-wrap
 msgid "B<-k>, B<--symlink>"
 msgstr "B<-k>, B<--symlink>"
 
 #. type: Plain text
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 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:36
+#: dpkg-name.1:37
 #, no-wrap
 msgid "B<-o>, B<--overwrite>"
 msgstr "B<-o>, B<--overwrite>"
 
 #. type: Plain text
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 msgid ""
 "Existing files will be overwritten if they have the same name as the "
 "destination filename."
@@ -10688,24 +11397,35 @@
 "destination."
 
 #. type: TP
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 #, no-wrap
 msgid "B<-s>, B<--subdir> [I<dir>]"
 msgstr "B<-s>, B<--subdir> [I<rep>]"
 
 #. type: Plain text
-#: dpkg-name.1:52
+#: dpkg-name.1:53
+#, 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."
 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 package. The target directory will be `unstable/binary-I<architecture>/"
+"I<section>'. 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 `I<section>/binary-I<architecture>'. 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 ""
 "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, "
@@ -10718,13 +11438,13 @@
 "« no-section ». Utilisez cette option avec soin : elle est compliquée."
 
 #. type: TP
-#: dpkg-name.1:52
+#: dpkg-name.1:53
 #, no-wrap
 msgid "B<-c>, B<--create-dir>"
 msgstr "B<-c>, B<--create-dir>"
 
 #. type: Plain text
-#: dpkg-name.1:57
+#: dpkg-name.1:58
 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.>"
@@ -10734,19 +11454,19 @@
 "soin.>"
 
 #. type: TP
-#: dpkg-name.1:60
+#: dpkg-name.1:61
 #, no-wrap
 msgid "B<-v>, B<--version>"
 msgstr "B<-v>, B<--version>"
 
 #. type: TP
-#: dpkg-name.1:65
+#: dpkg-name.1:66
 #, no-wrap
 msgid "B<dpkg-name bar-foo.deb>"
 msgstr "B<dpkg-name bar-foo.deb>"
 
 #. type: Plain text
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 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 "
@@ -10757,13 +11477,13 @@
 "de contrôle de « bar-foo.deb »."
 
 #. type: TP
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 #, 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:75
+#: dpkg-name.1:76
 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 "
@@ -10774,13 +11494,13 @@
 "extension « deb », mais supprime l'information sur l'architecture."
 
 #. type: TP
-#: dpkg-name.1:75
+#: dpkg-name.1:76
 #, 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:81
+#: dpkg-name.1:82
 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.>"
@@ -10789,25 +11509,32 @@
 "ne possèdent pas d'informations sur la section. B<Ne faites pas ça !>"
 
 #. type: TP
-#: dpkg-name.1:81
+#: dpkg-name.1:82
 #, 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:84
+#: dpkg-name.1:85
 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."
 
 #. type: Plain text
-#: dpkg-name.1:94
+#: dpkg-name.1:95
+#, 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."
 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 "
+"I<package>B<_>I<version>B<_>I<architecture>B<.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 "
@@ -10817,7 +11544,7 @@
 "d'autres systèmes d'installation aient besoin de cette organisation."
 
 #. type: Plain text
-#: dpkg-name.1:102
+#: dpkg-name.1:103
 msgid ""
 "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
 "B<xargs>(1)."
@@ -10826,21 +11553,15 @@
 "B<xargs>(1)."
 
 #. type: Plain text
-#: dpkg-name.1:105
+#: dpkg-name.1:106
 msgid "Copyright \\(co 1995,1996 Erick Branderhorst"
 msgstr "Copyright \\(co 1995,1996 Erick Branderhorst"
 
 #. type: TH
 #: dpkg-parsechangelog.1:1
 #, no-wrap
-msgid "dpkg-parsechangelog"
-msgstr "dpkg-parsechangelog"
-
-#. type: TH
-#: dpkg-parsechangelog.1:1
-#, no-wrap
-msgid "2009-05-19"
-msgstr "19-05-2009"
+msgid "dpkg-parsechangelog"
+msgstr "dpkg-parsechangelog"
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:4
@@ -10849,7 +11570,9 @@
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:8
-msgid "B<dpkg-parsechangelog> [I<options>]"
+#, fuzzy
+#| msgid "B<dpkg-parsechangelog> [I<options>]"
+msgid "B<dpkg-parsechangelog> [I<option>...]"
 msgstr "B<dpkg-parsechangelog> [I<options>]"
 
 #. type: Plain text
@@ -10923,26 +11646,30 @@
 
 #. type: TP
 #: dpkg-parsechangelog.1:54
-#, no-wrap
-msgid "B<Source:> E<lt>pkg nameE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Source:> E<lt>pkg nameE<gt>"
+msgid "B<Source:>I< pkg-name>"
 msgstr "B<Source:> E<lt>nom du paquetE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:56
-#, no-wrap
-msgid "B<Version:> E<lt>versionE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Version:> E<lt>versionE<gt>"
+msgid "B<Version:>I< version>"
 msgstr "B<Version:> E<lt>versionE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:58
-#, no-wrap
-msgid "B<Distribution:> E<lt>target distributionE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Distribution:> E<lt>target distributionE<gt>"
+msgid "B<Distribution:>I< target-distribution>"
 msgstr "B<Distribution:> E<lt>distribution cibleE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:60
-#, no-wrap
-msgid "B<Urgency:> E<lt>urgencyE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Urgency:> E<lt>urgencyE<gt>"
+msgid "B<Urgency:>I< urgency>"
 msgstr "B<Urgency:> E<lt>prioritéE<gt>"
 
 #. type: Plain text
@@ -10952,20 +11679,23 @@
 
 #. type: TP
 #: dpkg-parsechangelog.1:63
-#, no-wrap
-msgid "B<Maintainer:> E<lt>authorE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Maintainer:> E<lt>authorE<gt>"
+msgid "B<Maintainer:>I< author>"
 msgstr "B<Maintainer:> E<lt>auteurE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:65
-#, no-wrap
-msgid "B<Date:> E<lt>dateE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Date:> E<lt>dateE<gt>"
+msgid "B<Date:>I< date>"
 msgstr "B<Date:> E<lt>dateE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:67
-#, no-wrap
-msgid "B<Closes:> E<lt>bug numberE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Closes:> E<lt>bug numberE<gt>"
+msgid "B<Closes:>I< bug-number>"
 msgstr "B<Closes:> E<lt>Numéro de bogueE<gt>"
 
 #. type: Plain text
@@ -10975,8 +11705,9 @@
 
 #. type: TP
 #: dpkg-parsechangelog.1:70
-#, no-wrap
-msgid "B<Changes:> E<lt>changelog entriesE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Changes:> E<lt>changelog entriesE<gt>"
+msgid "B<Changes:>I< changelog-entries>"
 msgstr "B<Changes:> E<lt>entrées du fichier des changementsE<gt>"
 
 #. type: Plain text
@@ -11083,7 +11814,7 @@
 "si le I<nombre> est inférieure à 0)."
 
 #. type: TP
-#: dpkg-parsechangelog.1:104 update-alternatives.8:269
+#: dpkg-parsechangelog.1:104 update-alternatives.8:268
 #, no-wrap
 msgid "B<--all>"
 msgstr "B<--all>"
@@ -11316,38 +12047,50 @@
 msgstr "B<-s>, B<--status> I<nom-paquet> ..."
 
 #. type: Plain text
-#: dpkg-query.1:78
+#: dpkg-query.1:79
+#, fuzzy
+#| msgid ""
+#| "Report status of specified package. This just displays the entry in the "
+#| "installed package status database."
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"installed package status database. When multiple I<package-name> are listed, "
+"the requested status entries are separated by an empty line."
 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."
 
 #. type: TP
-#: dpkg-query.1:78
+#: dpkg-query.1:79
 #, no-wrap
 msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<-L>, B<--listfiles> I<nom-paquet>..."
 
 #. type: Plain text
-#: dpkg-query.1:83
-msgid ""
-"List files installed to your system from I<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+#: dpkg-query.1:85
+#, fuzzy
+#| msgid ""
+#| "List files installed to your system from I<package-name>.  However, note "
+#| "that files created by package-specific installation-scripts are not "
+#| "listed."
+msgid ""
+"List files installed to your system from I<package-name>. When multiple "
+"I<package-name> are listed, the requested lists of files are separated by an "
+"empty line. However, note that files created by package-specific "
+"installation-scripts are not listed."
 msgstr ""
 "Affiche la liste des fichiers du I<nom-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-query.1:83
+#: dpkg-query.1:85
 #, no-wrap
 msgid "B<-c>, B<--control-path> I<package-name> [I<control-file>]"
 msgstr "B<-c>, B<--control-path> I<nom-paquet> [I<fichier-contrôle>]"
 
 #. type: Plain text
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 msgid ""
 "List paths for control files installed to your system from I<package-name>.  "
 "If I<control-file> is specified then only list the path for that control "
@@ -11365,17 +12108,23 @@
 "mises en place ou si les défauts actuels d'architecture sont résolus."
 
 #. type: TP
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 #, no-wrap
 msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr "B<-S>, B<--search> I<motif-de-nom-a-rechercher>..."
 
 #. type: Plain text
-#: dpkg-query.1:97
-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."
+#: dpkg-query.1:99
+#, 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."
+msgid ""
+"Search for packages that own files corresponding to the given pattern.  "
+"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 ""
 "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 "
@@ -11383,18 +12132,41 @@
 "responsable de paquet, ni les alternatives."
 
 #. type: TP
-#: dpkg-query.1:97
+#: dpkg-query.1:99
 #, no-wrap
 msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr "B<-p>, B<--print-avail> I<nom-paquet>..."
 
 #. type: Plain text
-#: dpkg-query.1:104
+#: dpkg-query.1:105
+#, fuzzy
+#| msgid ""
+#| "Display details about I<package-name>, as found in I</var/lib/dpkg/"
+#| "available>. Users of APT-based frontends should use B<apt-cache show> "
+#| "I<package-name> instead as the I<available> file is only kept up-to-date "
+#| "when using B<dselect>."
 msgid ""
 "Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>. Users of APT-based frontends should use B<apt-cache show> "
-"I<package-name> instead as the I<available> file is only kept up-to-date "
-"when using B<dselect>."
+"available>. When multiple I<package-name> are listed, the requested "
+"I<available> entries are separated by an empty line."
+msgstr ""
+"Affiche les détails relatifs à I<nom-paquet>, tels que présents dans I</var/"
+"lib/dpkg/available>. Les utilisateurs des outils basés sur APT devraient "
+"plutôt utiliser la commande B<apt-cache show> I<nom-paquet> car le fichier "
+"I<available> n'est tenu à jour que lorsque B<dselect> est utilisé."
+
+#. type: Plain text
+#: dpkg-query.1:110
+#, fuzzy
+#| msgid ""
+#| "Display details about I<package-name>, as found in I</var/lib/dpkg/"
+#| "available>. Users of APT-based frontends should use B<apt-cache show> "
+#| "I<package-name> instead as the I<available> file is only kept up-to-date "
+#| "when using B<dselect>."
+msgid ""
+"Users of APT-based frontends should use B<apt-cache show> I<package-name> "
+"instead as the I<available> file is only kept up-to-date when using "
+"B<dselect>."
 msgstr ""
 "Affiche les détails relatifs à I<nom-paquet>, tels que présents dans I</var/"
 "lib/dpkg/available>. Les utilisateurs des outils basés sur APT devraient "
@@ -11402,18 +12174,18 @@
 "I<available> n'est tenu à jour que lorsque B<dselect> est utilisé."
 
 #. type: TP
-#: dpkg-query.1:116
+#: dpkg-query.1:122
 #, no-wrap
 msgid "B<-f>, B<--showformat=>I<format>"
 msgstr "B<-f>, B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-query.1:123
+#: dpkg-query.1:129
 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-query.1:128
+#: dpkg-query.1:134
 #, no-wrap
 msgid ""
 "    B<\\en>  newline\n"
@@ -11425,7 +12197,7 @@
 "    B<\\et>  tabulation\n"
 
 #. type: Plain text
-#: dpkg-query.1:133
+#: dpkg-query.1:139
 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<"
@@ -11436,7 +12208,7 @@
 "\\(rq."
 
 #. type: Plain text
-#: dpkg-query.1:141
+#: dpkg-query.1:147
 msgid ""
 "Package information can be included by inserting variable references to "
 "package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
@@ -11454,8 +12226,42 @@
 "conservés avec le paquet binaire le sont) :"
 
 #. type: Plain text
-#: dpkg-query.1:176
-#, no-wrap
+#: dpkg-query.1:182
+#, fuzzy, no-wrap
+#| msgid ""
+#| "    B<Architecture>\n"
+#| "    B<Bugs>\n"
+#| "    B<Conffiles> (internal)\n"
+#| "    B<Config-Version> (internal)\n"
+#| "    B<Conflicts>\n"
+#| "    B<Breaks>\n"
+#| "    B<Depends>\n"
+#| "    B<Description>\n"
+#| "    B<Enhances>\n"
+#| "    B<Essential>\n"
+#| "    B<Filename> (internal, dselect related)\n"
+#| "    B<Homepage>\n"
+#| "    B<Installed-Size>\n"
+#| "    B<MD5sum> (internal, dselect related)\n"
+#| "    B<MSDOS-Filename> (internal, dselect related)\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> (obsolete)\n"
+#| "    B<Section>\n"
+#| "    B<Size> (internal, dselect related)\n"
+#| "    B<Source>\n"
+#| "    B<Status> (internal)\n"
+#| "    B<Suggests>\n"
+#| "    B<Tag> (usually not in the .deb but in APT's Packages files)\n"
+#| "    B<Triggers-Awaited> (internal)\n"
+#| "    B<Triggers-Pending> (internal)\n"
+#| "    B<Version>\n"
 msgid ""
 "    B<Architecture>\n"
 "    B<Bugs>\n"
@@ -11467,11 +12273,11 @@
 "    B<Description>\n"
 "    B<Enhances>\n"
 "    B<Essential>\n"
-"    B<Filename> (internal, dselect related)\n"
+"    B<Filename> (internal, front-end related)\n"
 "    B<Homepage>\n"
 "    B<Installed-Size>\n"
-"    B<MD5sum> (internal, dselect related)\n"
-"    B<MSDOS-Filename> (internal, dselect related)\n"
+"    B<MD5sum> (internal, front-end related)\n"
+"    B<MSDOS-Filename> (internal, front-end related)\n"
 "    B<Maintainer>\n"
 "    B<Origin>\n"
 "    B<Package>\n"
@@ -11482,11 +12288,11 @@
 "    B<Replaces>\n"
 "    B<Revision> (obsolete)\n"
 "    B<Section>\n"
-"    B<Size> (internal, dselect related)\n"
+"    B<Size> (internal, front-end related)\n"
 "    B<Source>\n"
 "    B<Status> (internal)\n"
 "    B<Suggests>\n"
-"    B<Tag> (usually not in the .deb but in APT's Packages files)\n"
+"    B<Tag> (usually not in the .deb but in the repository Packages files)\n"
 "    B<Triggers-Awaited> (internal)\n"
 "    B<Triggers-Pending> (internal)\n"
 "    B<Version>\n"
@@ -11526,7 +12332,7 @@
 "    B<Version>\n"
 
 #. type: Plain text
-#: dpkg-query.1:184
+#: dpkg-query.1:190
 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 "
@@ -11541,37 +12347,39 @@
 "le nom du responsable de dpkg et la version installée, exécutez par exemple :"
 
 #. type: Plain text
-#: dpkg-query.1:187
+#: dpkg-query.1:193
 #, no-wrap
 msgid "  B<dpkg-query -W -f=\\(aq${Package} ${Version}\\et${Maintainer}\\en\\(aq dpkg>\n"
 msgstr "  B<dpkg-query -W -f=\\(aq${Package} ${Version}\\et${Maintainer}\\en\\(aq dpkg>\n"
 
 #. type: SH
-#: dpkg-query.1:189 dpkg-split.1:180 start-stop-daemon.8:256
-#: update-alternatives.8:375
+#: dpkg-query.1:195 dpkg-split.1:179 start-stop-daemon.8:259
+#: update-alternatives.8:374
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "CODE DE SORTIE"
 
-#. type: IP
-#: dpkg-query.1:190 update-alternatives.8:376
+#. type: TP
+#: dpkg-query.1:196 dpkg-split.1:180 start-stop-daemon.8:260
+#: start-stop-daemon.8:289 update-alternatives.8:375
 #, no-wrap
-msgid "0"
-msgstr "0"
+msgid "B<0>"
+msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:192
+#: dpkg-query.1:199
 msgid "The requested query was successfully performed."
 msgstr "La requête demandée s'est correctement déroulée."
 
-#. type: IP
-#: dpkg-query.1:192
+#. type: TP
+#: dpkg-query.1:199 dpkg-split.1:186 start-stop-daemon.8:270
+#: start-stop-daemon.8:292
 #, no-wrap
-msgid "1"
-msgstr "1"
+msgid "B<1>"
+msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:195
+#: dpkg-query.1:203
 msgid ""
 "Problems were encountered while parsing the command line or performing the "
 "query, including no file or package being found (except for --control-path)."
@@ -11581,7 +12389,7 @@
 "fichier ou de paquet (sauf pour --control-path)."
 
 #. type: Plain text
-#: dpkg-query.1:205
+#: dpkg-query.1:213
 msgid ""
 "This setting influences the output of the B<--list> option by changing the "
 "width of its output."
@@ -11590,7 +12398,7 @@
 "d'affichage."
 
 #. type: Plain text
-#: dpkg-query.1:208
+#: dpkg-query.1:216
 msgid "Copyright \\(co 2001 Wichert Akkerman"
 msgstr "Copyright \\(co 2001 Wichert Akkerman"
 
@@ -11600,28 +12408,26 @@
 msgid "dpkg-scanpackages"
 msgstr "dpkg-scanpackages"
 
-#. type: TH
-#: dpkg-scanpackages.1:15 dpkg-scansources.1:1
-#, no-wrap
-msgid "2009-10-01"
-msgstr "01-10-2009"
-
 #. type: Plain text
 #: dpkg-scanpackages.1:18
 msgid "dpkg-scanpackages - create Packages index files"
 msgstr "dpkg-scanpackages - créer des fichiers d'index de paquets."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:27
+#: dpkg-scanpackages.1:26
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+#| "prefix>]] B<E<gt>> I<Packages>"
 msgid ""
-"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scanpackages> [I<option>...] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
 "B<dpkg-scanpackages> [I<options>] I<rep-de-binaires> [I<fichier-override> "
 "[I<chemin-à-préfixer>]] B<E<gt>> I<Packages>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:40
+#: dpkg-scanpackages.1:39
 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 "
@@ -11639,7 +12445,7 @@
 "servir soi-même de B<dpkg-scanpackages>."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:52
+#: 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<bzip2>(1)  (generating a "
@@ -11654,7 +12460,7 @@
 "B<file://>)."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:59
+#: 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 "
@@ -11668,7 +12474,7 @@
 "chaîne."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-scanpackages.1:63
 msgid ""
 "I<overridefile> is the name of a file to read which contains information "
 "about how the package fits into the distribution (it can be a compressed "
@@ -11679,7 +12485,7 @@
 "être compressé) ; voir B<deb-override>(5)."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-scanpackages.1:66
 msgid ""
 "I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
@@ -11687,7 +12493,7 @@
 "« Filename »."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:71
+#: dpkg-scanpackages.1:70
 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 "
@@ -11698,35 +12504,35 @@
 "l'architecture, seul le premier trouvé est utilisé."
 
 #. type: TP
-#: dpkg-scanpackages.1:73
+#: dpkg-scanpackages.1:72
 #, no-wrap
 msgid "B<-t>, B<--type> I<type>"
 msgstr "B<-t>, B<--type> I<type>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 msgid "Scan for *.I<type> packages, instead of *.deb."
 msgstr "Recherche des fichiers *.I<type>, plutôt que I<*.deb>."
 
 #. type: TP
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 #, no-wrap
 msgid "B<-u>, B<--udeb>"
 msgstr "B<-u>, B<--udeb>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:79
+#: dpkg-scanpackages.1:78
 msgid "B<Obsolete> alias for B<-tudeb>."
 msgstr "Alias B<obsolete> pour B<-tudeb>."
 
 #. type: IP
-#: dpkg-scanpackages.1:79 dpkg-scansources.1:50
+#: dpkg-scanpackages.1:78 dpkg-scansources.1:49
 #, no-wrap
 msgid "B<-e>, B<--extra-override> I<file>"
 msgstr "B<-e>, B<--extra-override> I<fichier>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:85 dpkg-scansources.1:55
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:54
 msgid ""
 "Scan I<file> to find supplementary overrides (the file can be compressed). "
 "See B<deb-extra-override>(5)  for more information on its format."
@@ -11736,13 +12542,13 @@
 "d'information sur le format utilisé."
 
 #. type: TP
-#: dpkg-scanpackages.1:85
+#: dpkg-scanpackages.1:84
 #, no-wrap
 msgid "B<-a>, B<--arch> I<arch>"
 msgstr "B<-a>, B<--arch> I<arch>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 msgid ""
 "Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
 "scanning for all debs."
@@ -11751,24 +12557,24 @@
 "de rechercher tous les fichiers debs."
 
 #. type: TP
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 #, no-wrap
 msgid "B<-m>, B<--multiversion>"
 msgstr "B<-m>, B<--multiversion>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 msgid "Include all found packages in the output."
 msgstr "Affiche tous les paquets trouvés en sortie."
 
 #. type: TP
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 #, no-wrap
 msgid "B<-M>, B<--medium> I<id-string>"
 msgstr "B<-M>, B<--medium> I<id-chaîne>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:97
+#: dpkg-scanpackages.1:96
 msgid ""
 "Add an X-Medium field containing the value I<id-string>. This field is "
 "required if you want to generate B<Packages.cd> files for use by the multicd "
@@ -11779,13 +12585,13 @@
 "à être utilisés avec la méthode multicd de dselect."
 
 #. type: SH
-#: dpkg-scanpackages.1:104 update-alternatives.8:447
+#: dpkg-scanpackages.1:103 update-alternatives.8:448
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSTICS"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:110
+#: dpkg-scanpackages.1:109
 msgid ""
 "B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
 "warns about packages that are in the wrong subdirectory, are duplicated, "
@@ -11800,7 +12606,7 @@
 "s'appliquer."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:116
+#: dpkg-scanpackages.1:115
 msgid ""
 "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<deb-extra-override>(5), "
 "B<dpkg-scansources>(1)."
@@ -11820,16 +12626,20 @@
 msgstr "dpkg-scansources - créer des fichiers d'index de sources"
 
 #. type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-scansources.1:12
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+#| "prefix>]] B<E<gt>> I<Sources>"
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scansources> [I<option>...] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
 "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-scansources.1:18
+#: dpkg-scansources.1:17
 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."
@@ -11839,7 +12649,7 @@
 "sources Debian, qui est envoyé sur la sortie standard."
 
 #. type: Plain text
-#: dpkg-scansources.1:29
+#: dpkg-scansources.1:28
 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> "
@@ -11862,7 +12672,7 @@
 "I<.dsc> pour modifier l'information sur le responsable. Ceci pourra changer."
 
 #. type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-scansources.1:32
 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 "
@@ -11874,7 +12684,7 @@
 "racine de l'archive Debian."
 
 #. type: Plain text
-#: dpkg-scansources.1:44
+#: dpkg-scansources.1:43
 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 "
@@ -11887,13 +12697,13 @@
 "pour les accès locaux (c'est-à-dire les sources B<file://>)."
 
 #. type: IP
-#: dpkg-scansources.1:46
+#: dpkg-scansources.1:45
 #, no-wrap
 msgid "B<-n>, B<--no-sort>"
 msgstr "B<-n>, B<--no-sort>"
 
 #. type: Plain text
-#: dpkg-scansources.1:49
+#: dpkg-scansources.1:48
 msgid ""
 "Don't sort the index records. Normally they are sorted by source package "
 "name."
@@ -11902,13 +12712,13 @@
 "du nom du paquet source."
 
 #. type: IP
-#: dpkg-scansources.1:55
+#: dpkg-scansources.1:54
 #, no-wrap
 msgid "B<-s>, B<--source-override> I<file>"
 msgstr "B<-s>, B<--source-override> I<fichier>"
 
 #. type: Plain text
-#: dpkg-scansources.1:59
+#: dpkg-scansources.1:58
 msgid ""
 "Use I<file> as the source override file (the file can be compressed).  The "
 "default is the name of the override file you specified with I<.src> appended."
@@ -11918,7 +12728,7 @@
 "ajoutée l'extension I<.src>."
 
 #. type: Plain text
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 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 "
@@ -11934,23 +12744,23 @@
 "sources est prioritaire pour fixer la section."
 
 #. type: IP
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 #. type: Plain text
-#: dpkg-scansources.1:67
+#: dpkg-scansources.1:66
 msgid "Turn debugging on."
 msgstr "Active le débogage."
 
 #. type: Plain text
-#: dpkg-scansources.1:76
+#: dpkg-scansources.1:75
 msgid "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 msgstr "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 
 #. type: Plain text
-#: dpkg-scansources.1:78
+#: dpkg-scansources.1:77
 msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 
@@ -11960,14 +12770,6 @@
 msgid "dpkg-shlibdeps"
 msgstr "dpkg-shlibdeps"
 
-#. type: TH
-#: dpkg-shlibdeps.1:1 dpkg-source.1:2 start-stop-daemon.8:1
-#: update-alternatives.8:8
-#, fuzzy, no-wrap
-#| msgid "2010-03-07"
-msgid "2011-03-04"
-msgstr "07-03-2010"
-
 #. type: Plain text
 #: dpkg-shlibdeps.1:4
 msgid "dpkg-shlibdeps - generate shared library substvar dependencies"
@@ -11976,20 +12778,30 @@
 "bibliothèques partagées"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:10
-msgid ""
-"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
+#: dpkg-shlibdeps.1:8
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> "
+#| "[I<options>]"
+msgid "B<dpkg-shlibdeps> [I<option>...] [B<-e>]I<executable> [I<option>...]"
 msgstr ""
 "B<dpkg-shlibdeps> [I<options>] I<exécutable>|B<-e>I<exécutable> [I<options>]"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:24
+#: dpkg-shlibdeps.1:22
+#, 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."
 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."
+"other variables starting with B<shlibs:> are removed from the file."
 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 "
@@ -11999,7 +12811,7 @@
 "fichier."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 msgid ""
 "B<dpkg-shlibdeps> has two possible sources of information to generate "
 "dependency information. Either I<symbols> files or I<shlibs> files. For each "
@@ -12029,13 +12841,13 @@
 "bibliothèque."
 
 #. type: SS
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 #, no-wrap
 msgid "Symbols files"
 msgstr "Fichiers symboles"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 msgid ""
 "Symbols files contain finer-grained dependency information by providing the "
 "minimum dependency for each symbol that the library exports. The script "
@@ -12049,13 +12861,13 @@
 "premier trouvé est utilisé) :"
 
 #. type: IP
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 #, no-wrap
 msgid "debian/*/DEBIAN/symbols"
 msgstr "debian/*/DEBIAN/symbols"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are generated by B<dpkg-gensymbols>(1).  "
@@ -12071,19 +12883,19 @@
 "binaires."
 
 #. type: IP
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols.I<arch>"
 msgstr "/etc/dpkg/symbols/I<paquet>.symbols.I<architecture>"
 
 #. type: IP
-#: dpkg-shlibdeps.1:61
+#: dpkg-shlibdeps.1:59
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols"
 msgstr "/etc/dpkg/symbols/I<paquet>.symbols"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 msgid ""
 "Per-system overriding shared library dependency information.  I<arch> is the "
 "architecture of the current system (obtained by B<dpkg-architecture -"
@@ -12094,13 +12906,13 @@
 "architecture -qDEB_HOST_ARCH>)."
 
 #. type: IP
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> symbols\\(rq"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:68 dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:66 dpkg-shlibdeps.1:100
 #, fuzzy
 #| msgid ""
 #| "Package-provided shared library dependency information.  Unless "
@@ -12114,7 +12926,7 @@
 "défaut « /var/lib/dpkg »."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:75
+#: dpkg-shlibdeps.1:73
 msgid ""
 "While scanning the symbols used by all binaries, B<dpkg-shlibdeps> remembers "
 "the (biggest) minimal version needed for each library. At the end of the "
@@ -12128,7 +12940,7 @@
 "l'information des fichiers I<symbols> soit exacte)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 msgid ""
 "As a safe-guard measure, a symbols file can provide a I<Build-Depends-"
 "Package> meta-information field and B<dpkg-shlibdeps> will extract the "
@@ -12143,13 +12955,13 @@
 "minimale calculée par l'examen des symboles."
 
 #. type: SS
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 #, no-wrap
 msgid "Shlibs files"
 msgstr "Fichiers Shlibs"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:86
+#: dpkg-shlibdeps.1:84
 msgid ""
 "Shlibs files associate directly a library to a dependency (without looking "
 "at the symbols). It's thus often stronger than really needed but very safe "
@@ -12160,7 +12972,7 @@
 "dont on aurait besoin mais il reste très sûr et facile à manipuler."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 msgid ""
 "The dependencies for a library are looked up in several places. The first "
 "file providing information for the library of interest is used:"
@@ -12170,39 +12982,39 @@
 "utilisé :"
 
 #. type: IP
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 #, no-wrap
 msgid "debian/shlibs.local"
 msgstr "debian/shlibs.local"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 msgid "Package-local overriding shared library dependency information."
 msgstr ""
 "Fichier particulier à un paquet remplaçant les informations qui concernent "
 "les dépendances envers des bibliothèques partagées."
 
 #. type: IP
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 #, no-wrap
 msgid "/etc/dpkg/shlibs.override"
 msgstr "/etc/dpkg/shlibs.override"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 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: IP
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 #, no-wrap
 msgid "debian/*/DEBIAN/shlibs"
 msgstr "debian/*/DEBIAN/shlibs"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are only used if the library is found in a "
@@ -12216,26 +13028,26 @@
 "paquets binaires."
 
 #. type: IP
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> shlibs\\(rq"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:100
 #, no-wrap
 msgid "/etc/dpkg/shlibs.default"
 msgstr "/etc/dpkg/shlibs.default"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:104
+#: dpkg-shlibdeps.1:102
 msgid "Per-system default shared library dependency information."
 msgstr ""
 "Fichier système par défaut concernant les informations de dépendance envers "
 "des bibliothèques partagées."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:108
+#: dpkg-shlibdeps.1:106
 msgid ""
 "The extracted dependencies are then directly used (except if they are "
 "filtered out because they have been identified as duplicate, or as weaker "
@@ -12246,7 +13058,7 @@
 "d'un niveau plus faible qu'une autre dépendance)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 msgid ""
 "B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
 "as if they'd been supplied as B<-e>I<executable>."
@@ -12255,13 +13067,13 @@
 "exécutables, comme si on avait simplement donné B<-e>I<exécutable>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 #, no-wrap
 msgid "B<-e>I<executable>"
 msgstr "B<-e>I<exécutable>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 msgid ""
 "Include dependencies appropriate for the shared libraries required by "
 "I<executable>."
@@ -12270,13 +13082,13 @@
 "partagées que demande I<exécutable>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 #, no-wrap
 msgid "B<-d>I<dependencyfield>"
 msgstr "B<-d>I<champ-dépendance>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:123
+#: dpkg-shlibdeps.1:121
 msgid ""
 "Add dependencies to be added to the control file dependency field "
 "I<dependencyfield>.  (The dependencies for this field are placed in the "
@@ -12287,7 +13099,7 @@
 "dans la variable B<shlibs:>I<champ-dépendance>.)"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:133
+#: dpkg-shlibdeps.1:131
 msgid ""
 "The B<-d>I<dependencyfield> option takes effect for all executables after "
 "the option, until the next B<-d>I<dependencyfield>.  The default "
@@ -12298,7 +13110,7 @@
 "I<champ-dépendance> vaut B<Depends>."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 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>, "
@@ -12313,13 +13125,13 @@
 "sauf celui qui représente les dépendances les plus importantes."
 
 #. type: TP
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 #, no-wrap
 msgid "B<-p>I<varnameprefix>"
 msgstr "B<-p>I<préfixe-pour-le-nom-des-variables>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:152
+#: dpkg-shlibdeps.1:150
 msgid ""
 "Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
 ">.  Likewise, any existing substitution variables starting with "
@@ -12332,7 +13144,7 @@
 "lieu de B<shlibs:>) est enlevée du fichier de substitution des variables."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 msgid ""
 "Print substitution variable settings to standard output, rather than being "
 "added to the substitution variables file (B<debian/substvars> by default)."
@@ -12342,13 +13154,13 @@
 "variables qui est par défaut debian/substvars."
 
 #. type: TP
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 #, no-wrap
 msgid "B<-t>I<type>"
 msgstr "B<-t>I<type>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 msgid ""
 "Prefer shared library dependency information tagged for the given package "
 "type. If no tagged information is available, falls back to untagged "
@@ -12363,13 +13175,13 @@
 "préfixant par le nom du type, un deux-points et une espace."
 
 #. type: TP
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 #, no-wrap
 msgid "B<-L>I<localshlibsfile>"
 msgstr "B<-L>I<fichier-local-shlibs>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:171
+#: dpkg-shlibdeps.1:169
 msgid ""
 "Read overriding shared library dependency information from "
 "I<localshlibsfile> instead of B<debian/shlibs.local>."
@@ -12379,7 +13191,7 @@
 "shlibs.local>."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 msgid ""
 "Write substitution variables in I<substvarsfile>; the default is B<debian/"
 "substvars>."
@@ -12388,13 +13200,13 @@
 "par défaut est B<debian/substvars>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 #, no-wrap
 msgid "B<-v>"
 msgstr "B<-v>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 msgid ""
 "Enable verbose mode. Numerous messages are displayed to explain what B<dpkg-"
 "shlibdeps> does."
@@ -12403,13 +13215,13 @@
 "que B<dpkg-shlibdeps> fait."
 
 #. type: TP
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 #, no-wrap
 msgid "B<-x>I<package>"
 msgstr "B<-x>I<package>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 msgid ""
 "Exclude the package from the generated dependencies. This is useful to avoid "
 "self-dependencies for packages which provide ELF binaries (executables or "
@@ -12423,13 +13235,13 @@
 "plusieurs paquets."
 
 #. type: TP
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 #, no-wrap
 msgid "B<-S>I<pkgbuilddir>"
 msgstr "B<-S>I<pkgbuilddir>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 msgid ""
 "Look into I<pkgbuilddir> first when trying to find a library. This is useful "
 "when the source package builds multiple flavors of the same library and you "
@@ -12445,13 +13257,13 @@
 "avant les répertoires d'autres paquets binaires."
 
 #. type: TP
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 #, no-wrap
 msgid "B<--ignore-missing-info>"
 msgstr "B<--ignore-missing-info>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 msgid ""
 "Do not fail if dependency information can't be found for a shared library.  "
 "Usage of this option is discouraged, all libraries should provide dependency "
@@ -12465,13 +13277,13 @@
 "si elles ne sont pas encore utilisées par d'autres paquets."
 
 #. type: TP
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 #, no-wrap
 msgid "B<--warnings=>I<value>"
 msgstr "B<--warnings=>I<valeur>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:213
+#: dpkg-shlibdeps.1:211
 msgid ""
 "I<value> is a bit field defining the set of warnings that can be emitted by "
 "B<dpkg-shlibdeps>.  Bit 0 (value=1) enables the warning \"symbol I<sym> used "
@@ -12493,13 +13305,13 @@
 "soient actifs."
 
 #. type: SH
-#: dpkg-shlibdeps.1:224
+#: dpkg-shlibdeps.1:222
 #, no-wrap
 msgid "WARNINGS"
 msgstr "AVERTISSEMENTS"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 msgid ""
 "Since B<dpkg-shlibdeps> analyzes the set of symbols used by each binary of "
 "the generated package, it is able to emit warnings in several cases. They "
@@ -12515,13 +13327,13 @@
 "décroissant, voici les différents avertissements que vous pouvez rencontrer :"
 
 #. type: TP
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 #, no-wrap
 msgid "B<symbol>I< sym>B< used by >I<binary>B< found in none of the libraries.>"
 msgstr "B<symbole>I< sym>B< utilisé par >I<binaire>B< trouvé dans aucune des bibliothèques.>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a library and it needs to be linked "
@@ -12534,13 +13346,13 @@
 "construction (l'option B<-l>I<bibliothèque> de l'éditeur de liens)."
 
 #. type: TP
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 #, no-wrap
 msgid "I<binary>B< contains an unresolvable reference to symbol >I<sym>B<: it's probably a plugin>"
 msgstr "I<binary>B< contient une référence non résolue au symbole >I<sym>B<: il s'agit probablement d'un greffon (plugin)>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a plugin and the symbol is probably "
@@ -12566,13 +13378,13 @@
 "trouve. Dans ce cas, la bibliothèque est incorrecte et doit être corrigée."
 
 #. type: TP
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 #, no-wrap
 msgid "B<dependency on >I<library>B< could be avoided if >I<binaries>B< were not uselessly linked against it (they use none of its symbols).>"
 msgstr "B<la dépendance sur la> I<bibliothèque> B<pourrait être évitée si> I<les binaires>B< inutiles n'étaient pas liés à celle-ci (ils n'utilisent aucun de ses symboles).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 msgid ""
 "None of the I<binaries> that are linked with I<library> use any of the "
 "symbols provided by the library. By fixing all the binaries, you would avoid "
@@ -12585,13 +13397,13 @@
 "liée à une autre bibliothèque qui est elle réellement utilisée)."
 
 #. type: TP
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 #, no-wrap
 msgid "I<binary>B< shouldn't be linked with >I<library>B< (it uses none of its symbols).>"
 msgstr "I<le binaire>B< ne devrait pas être lié avec la >I<bibliothèque>B< (il ne fait usage d'aucun de ses symboles).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 msgid ""
 "The I<binary> is linked to a library that it doesn't need. It's not a "
 "problem but some small performance improvements in binary load time can be "
@@ -12607,13 +13419,13 @@
 "contrôle qu'au niveau global sur tous les binaires analysés."
 
 #. type: SH
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 #, no-wrap
 msgid "ERRORS"
 msgstr "ERREURS"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 msgid ""
 "B<dpkg-shlibdeps> will fail if it can't find a public library used by a "
 "binary or if this library has no associated dependency information (either "
@@ -12630,13 +13442,27 @@
 "version."
 
 #. type: TP
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 #, no-wrap
 msgid "B<couldn't find library >I<library-soname>B< needed by >I<binary>B< (its RPATH is '>I<rpath>B<')>"
 msgstr "B<impossible de trouver la bibliothèque >I<library-soname> B<demandée par le> I<binaire> B<(son RPATH est '>I<rpath>B<')>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:287
+#: dpkg-shlibdeps.1:285
+#, fuzzy
+#| msgid ""
+#| "The I<binary> uses a library called I<library-soname> but B<dpkg-"
+#| "shlibdeps> has been unable to find the library.  B<dpkg-shlibdeps> "
+#| "creates a list of directories to check as following: directories listed "
+#| "in the RPATH of the binary, directories listed in /etc/ld.so.conf, "
+#| "directories listed in the LD_LIBRARY_PATH environment variable, and "
+#| "standard public directories (/lib, /usr/lib, /lib32, /usr/lib32, /lib64, /"
+#| "usr/lib64). Then it checks those directories in the package's build tree "
+#| "of the binary being analyzed, in the packages's build trees indicated "
+#| "with the -S command-line option, in other packages's build trees that "
+#| "contains a DEBIAN/shlibs or DEBIAN/symbols file and finally in the root "
+#| "directory.  If the library is not found in any of those directories, then "
+#| "you get this error."
 msgid ""
 "The I<binary> uses a library called I<library-soname> but B<dpkg-shlibdeps> "
 "has been unable to find the library.  B<dpkg-shlibdeps> creates a list of "
@@ -12645,8 +13471,8 @@
 "LD_LIBRARY_PATH environment variable, and standard public directories (/"
 "lib, /usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks those "
 "directories in the package's build tree of the binary being analyzed, in the "
-"packages's build trees indicated with the -S command-line option, in other "
-"packages's build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
+"packages' build trees indicated with the -S command-line option, in other "
+"packages' build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
 "and finally in the root directory.  If the library is not found in any of "
 "those directories, then you get this error."
 msgstr ""
@@ -12665,7 +13491,7 @@
 "alors ce message d'erreur est obtenu."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 msgid ""
 "If the library not found is in a private directory of the same package, then "
 "you want to add the directory to LD_LIBRARY_PATH. If it's in another binary "
@@ -12681,13 +13507,13 @@
 "c'est aussi un répertoire privé."
 
 #. type: TP
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 #, no-wrap
 msgid "B<no dependency information found for >I<library-file>B< (used by >I<binary>B<).>"
 msgstr "B<aucune information de dépendance trouvé pour> I<la bibliothèque> B<(utilisée par le> I<binaire>B<).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:306
+#: dpkg-shlibdeps.1:304
 msgid ""
 "The library needed by I<binary> has been found by B<dpkg-shlibdeps> in "
 "I<library-file> but B<dpkg-shlibdeps> has been unable to find any dependency "
@@ -12705,7 +13531,7 @@
 "différents arbres des paquets construits (debian/*/DEBIAN/)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:320
+#: dpkg-shlibdeps.1:318
 msgid ""
 "This failure can be caused by a bad or missing shlibs or symbols file in the "
 "package of the library. It might also happen if the library is built within "
@@ -12732,7 +13558,7 @@
 "problèmes."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:326
+#: dpkg-shlibdeps.1:324
 msgid ""
 "Calling B<dpkg-shlibdeps> in verbose mode (-v) will provide much more "
 "information about where it tried to find the dependency information. This "
@@ -12744,12 +13570,12 @@
 "obtenez cette erreur."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:330
+#: dpkg-shlibdeps.1:328
 msgid "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 msgstr "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:337
+#: dpkg-shlibdeps.1:335
 msgid "Copyright \\(co 2006 Frank Lichtenheld"
 msgstr "Copyright \\(co 2006 Frank Lichtenheld"
 
@@ -12765,17 +13591,19 @@
 msgstr "dpkg-source - outil de manipulation des paquets sources Debian (.dsc)."
 
 #. type: Plain text
-#: dpkg-source.1:10
-msgid "B<dpkg-source> [I<options>] I<command>"
+#: dpkg-source.1:9
+#, fuzzy
+#| msgid "B<dpkg-source> [I<options>] I<command>"
+msgid "B<dpkg-source> [I<option>...] I<command>"
 msgstr "B<dpkg-source> [I<options>] I<commande>"
 
 #. type: Plain text
-#: dpkg-source.1:14
+#: dpkg-source.1:13
 msgid "B<dpkg-source> packs and unpacks Debian source archives."
 msgstr "B<dpkg-source> empaquete ou dépaquete une archive source Debian."
 
 #. type: Plain text
-#: dpkg-source.1:18
+#: dpkg-source.1:17
 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 "
@@ -12786,13 +13614,13 @@
 "argument séparé."
 
 #. type: TP
-#: dpkg-source.1:20
+#: dpkg-source.1:19
 #, no-wrap
 msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr "B<-x >I<fichier>B<.dsc> [I<répertoire-de-sortie>]"
 
 #. type: Plain text
-#: dpkg-source.1:30
+#: dpkg-source.1:29
 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 "
@@ -12809,7 +13637,7 @@
 "répertoire I<source>-I<version> du répertoire courant."
 
 #. type: Plain text
-#: dpkg-source.1:36
+#: dpkg-source.1:35
 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 "
@@ -12820,7 +13648,7 @@
 "que le fichier B<.dsc>."
 
 #. type: Plain text
-#: dpkg-source.1:44
+#: dpkg-source.1:43
 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 "
@@ -12838,7 +13666,7 @@
 "hériteront du système de propriété de ce groupe."
 
 #. type: Plain text
-#: dpkg-source.1:49
+#: dpkg-source.1:48
 msgid ""
 "If the source package uses a non-standard format (currently this means all "
 "formats except \"1.0\"), its name will be stored in B<debian/source/format> "
@@ -12851,13 +13679,13 @@
 "utilise le même format par défaut."
 
 #. type: TP
-#: dpkg-source.1:50
+#: dpkg-source.1:49
 #, no-wrap
 msgid "B<-b> I<directory> [I<format-specific-parameters>]"
 msgstr "B<-b> I<répertoire> [I<paramètres-dans-un-format-spécifique>]"
 
 #. type: Plain text
-#: dpkg-source.1:57
+#: dpkg-source.1:56
 msgid ""
 "Build a source package. The first non-option argument is taken as the name "
 "of the directory containing the debianized source tree (i.e. with a debian "
@@ -12872,10 +13700,19 @@
 "construire le paquet, d'autres paramètres peuvent être acceptés."
 
 #. type: Plain text
-#: dpkg-source.1:66
+#: dpkg-source.1:65
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-source> will build the source package with the first format found "
+#| "in this ordered list: the format indicated with the I<--format> command-"
+#| "line option, the format indicated in B<debian/source/format>, \"1.0\". "
+#| "The fallback to \"1.0\" is deprecated and will be removed at some point "
+#| "in the future, you should always document the desired source format in "
+#| "B<debian/source/format>. See section B<SOURCE PACKAGE FORMATS> for an "
+#| "extensive description of the various source package formats."
 msgid ""
 "B<dpkg-source> will build the source package with the first format found in "
-"this ordered list: the format indicated with the I<--format> command-line "
+"this ordered list: the format indicated with the I<--format> command line "
 "option, the format indicated in B<debian/source/format>, \"1.0\". The "
 "fallback to \"1.0\" is deprecated and will be removed at some point in the "
 "future, you should always document the desired source format in B<debian/"
@@ -12892,13 +13729,13 @@
 "différents formats de paquet source."
 
 #. type: TP
-#: dpkg-source.1:67
+#: dpkg-source.1:66
 #, no-wrap
 msgid "B<--print-format> I<directory>"
 msgstr "B<--print-format> I<répertoire>"
 
 #. type: Plain text
-#: dpkg-source.1:72
+#: dpkg-source.1:71
 msgid ""
 "Print the source format that would be used to build the source package if "
 "B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -12909,20 +13746,28 @@
 "et avec les mêmes options)."
 
 #. type: TP
-#: dpkg-source.1:73
+#: dpkg-source.1:72
 #, no-wrap
 msgid "B<--before-build> I<directory>"
 msgstr "B<--before-build> I<répertoire>"
 
 #. type: Plain text
 #: dpkg-source.1:81
-msgid ""
-"This command should be called before any build of the package (B<dpkg-"
-"buildpackage> calls it very early even before B<debian/rules clean>). This "
-"command should be idempotent and can be called multiple times. Not all "
-"source formats implement something in this hook, and those that do usually "
-"prepare the source tree for the build for example by ensuring that the "
-"Debian patches are applied."
+#, fuzzy
+#| msgid ""
+#| "This command should be called before any build of the package (B<dpkg-"
+#| "buildpackage> calls it very early even before B<debian/rules clean>). "
+#| "This command should be idempotent and can be called multiple times. Not "
+#| "all source formats implement something in this hook, and those that do "
+#| "usually prepare the source tree for the build for example by ensuring "
+#| "that the Debian patches are applied."
+msgid ""
+"Run the corresponding hook of the source package format. This hook is called "
+"before any build of the package (B<dpkg-buildpackage> calls it very early "
+"even before B<debian/rules clean>). This command is idempotent and can be "
+"called multiple times. Not all source formats implement something in this "
+"hook, and those that do usually prepare the source tree for the build for "
+"example by ensuring that the Debian patches are applied."
 msgstr ""
 "Cette commande doit être utilisée avant toute construction du paquet (B<dpkg-"
 "buildpackage> l'utilise très tôt, avant même B<debian/rules clean>). Elle "
@@ -12939,12 +13784,19 @@
 
 #. type: Plain text
 #: dpkg-source.1:89
-msgid ""
-"This command should be called after any build of the package (B<dpkg-"
-"buildpackage> calls it last). This command should be idempotent and can be "
-"called multiple times. Not all source formats implement something in this "
-"hook, and those that do usually use it to undo what B<--before-build> has "
-"done."
+#, fuzzy
+#| msgid ""
+#| "This command should be called after any build of the package (B<dpkg-"
+#| "buildpackage> calls it last). This command should be idempotent and can "
+#| "be called multiple times. Not all source formats implement something in "
+#| "this hook, and those that do usually use it to undo what B<--before-"
+#| "build> has done."
+msgid ""
+"Run the corresponding hook of the source package format. This hook is called "
+"after any build of the package (B<dpkg-buildpackage> calls it last). This "
+"command is idempotent and can be called multiple times. Not all source "
+"formats implement something in this hook, and those that do usually use it "
+"to undo what B<--before-build> has done."
 msgstr ""
 "Cette commande doit être utilisée après toute construction du paquet (B<dpkg-"
 "buildpackage> l'utilise en dernier). Elle doit être « idempotent » et peut "
@@ -12952,14 +13804,29 @@
 "ce branchement et ceux qui le font s'en servent pour défaire ce qui a été "
 "fait par B<--before-build>.."
 
+#. type: TP
+#: dpkg-source.1:90
+#, fuzzy, no-wrap
+#| msgid "B<--print-format> I<directory>"
+msgid "B<--commit> [I<directory>] ..."
+msgstr "B<--print-format> I<répertoire>"
+
+#. type: Plain text
+#: dpkg-source.1:95
+msgid ""
+"Record changes in the source tree unpacked in I<directory>. This command can "
+"take supplementary parameters depending on the source format.  It will error "
+"out for formats where this operation doesn't mean anything."
+msgstr ""
+
 #. type: SH
-#: dpkg-source.1:97
+#: dpkg-source.1:103
 #, no-wrap
 msgid "GENERIC BUILD OPTIONS"
 msgstr "OPTIONS DE CONSTRUCTION GÉNÉRIQUES"
 
 #. type: Plain text
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 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 "
@@ -12971,7 +13838,7 @@
 "plus élevé de l'arborescence source."
 
 #. type: Plain text
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 msgid ""
 "Specifies the change log file to read information from. The default is "
 "B<debian/changelog>.  If given with relative pathname this is interpreted "
@@ -12983,13 +13850,13 @@
 "plus élevé de l'arborescence source."
 
 #. type: TP
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 #, no-wrap
 msgid "B<--format=>I<value>"
 msgstr "B<--format=>I<valeur>"
 
 #. type: Plain text
-#: dpkg-source.1:121
+#: dpkg-source.1:127
 msgid ""
 "Use the given format for building the source package. It does override any "
 "format given in B<debian/source/format>."
@@ -12998,7 +13865,7 @@
 "remplace le format indiqué dans B<debian/source/format>."
 
 #. type: Plain text
-#: dpkg-source.1:131
+#: dpkg-source.1:137
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is to not read "
 "any file. This option can be used multiple times to read substitution "
@@ -13009,13 +13876,13 @@
 "lire des variables de substitution depuis plusieurs fichiers."
 
 #. type: TP
-#: dpkg-source.1:137
+#: dpkg-source.1:143
 #, no-wrap
 msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
 msgstr "B<-Z>I<compression>, B<--compression>=I<compression>"
 
 #. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 msgid ""
 "Specify the compression to use for created files (tarballs and diffs).  Note "
 "that this option will not cause existing tarballs to be recompressed, it "
@@ -13031,30 +13898,35 @@
 "depuis dpkg-dev 1.15.5."
 
 #. type: TP
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 #, no-wrap
 msgid "B<-z>I<level>, B<--compression-level>=I<level>"
 msgstr "B<-z>I<niveau>, B<--compression-level>=I<niveau>"
 
 #. type: Plain text
-#: dpkg-source.1:151
+#: dpkg-source.1:157
+#, fuzzy
+#| msgid ""
+#| "Compression level to use. As with B<-Z> it only affects newly created "
+#| "files. Supported values are: I<1> to I<9>, I<best>, and I<fast>.  I<9> is "
+#| "the default."
 msgid ""
 "Compression level to use. As with B<-Z> it only affects newly created files. "
-"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  I<9> is the "
-"default."
+"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  The default is "
+"I<9> for gzip and bzip2, I<6> for xz and lzma."
 msgstr ""
 "Niveau de compression à utiliser. Comme avec B<-Z> cela ne concerne que les "
 "fichiers nouvellement créés. Les valeurs prises possibles sont les "
 "suivantes : I<1> à I<9>, I<best>, et I<fast>. I<9> est la valeur par défaut."
 
 #. type: TP
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 #, no-wrap
 msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
 msgstr "B<-i>[I<expr. rat.>], B<--diff-ignore>[=I<expr. rat.>]"
 
 #. type: Plain text
-#: dpkg-source.1:163
+#: dpkg-source.1:169
 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 "
@@ -13079,7 +13951,7 @@
 "prise en compte."
 
 #. type: Plain text
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 msgid ""
 "This is very helpful in cutting out extraneous files that get included in "
 "the diff, e.g. if you maintain your source in a revision control system and "
@@ -13103,19 +13975,26 @@
 "exemple'(^|/)', '($|/)')."
 
 #. type: TP
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 #, no-wrap
 msgid "B<--extend-diff-ignore>=I<regexp>"
 msgstr "B<--extend-diff-ignore>=I<expr.rat.>"
 
 #. type: Plain text
-#: dpkg-source.1:180
-msgid ""
-"The perl regular expression specified will extend the default regular "
-"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
-"default regexp.  This option is convenient to use in B<debian/source/"
-"options> to exclude some auto-generated files from the automatic patch "
-"generation."
+#: dpkg-source.1:186
+#, fuzzy
+#| msgid ""
+#| "The perl regular expression specified will extend the default regular "
+#| "expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
+#| "default regexp.  This option is convenient to use in B<debian/source/"
+#| "options> to exclude some auto-generated files from the automatic patch "
+#| "generation."
+msgid ""
+"The perl regular expression specified will extend the default value of B<--"
+"diff-ignore> and its current value (if set). It does this by concatenating "
+"\"B<|>I<regexp>\" to the existing value.  This option is convenient to use "
+"in B<debian/source/options> to exclude some auto-generated files from the "
+"automatic patch generation."
 msgstr ""
 "L'expression rationnelle Perl indiquée complétera celle associée à B<-i> en "
 "concaténant \"B<|>I<expr.rat.> à l'expression rationnelle par défaut. Cette "
@@ -13123,13 +14002,13 @@
 "fichiers auto-créés de la création automatique de correctifs."
 
 #. type: TP
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 #, no-wrap
 msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
 msgstr "B<-I>[I<motif-fichier>], B<--tar-ignore>[=I<motif-fichier>]"
 
 #. type: Plain text
-#: dpkg-source.1:189
+#: dpkg-source.1:195
 msgid ""
 "If this option is specified, the pattern will be passed to B<tar>(1)'s --"
 "exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -13143,7 +14022,7 @@
 "peut répéter cette option pour exclure plusieurs fichiers."
 
 #. type: Plain text
-#: dpkg-source.1:194
+#: dpkg-source.1:200
 msgid ""
 "B<-I> by itself adds default --exclude options that will filter out control "
 "files and directories of the most common revision control systems, backup "
@@ -13155,7 +14034,7 @@
 "répertoires utilisés par Libtool."
 
 #. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:212
 msgid ""
 "B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
 "different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -13178,7 +14057,7 @@
 "complète."
 
 #. type: Plain text
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 msgid ""
 "The default regexp and patterns for both options can be seen in the output "
 "of the B<--help> command."
@@ -13187,43 +14066,43 @@
 "peuvent être trouvés dans la sortie de la commande B<--help>."
 
 #. type: SH
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 #, no-wrap
 msgid "GENERIC EXTRACT OPTIONS"
 msgstr "LES OPTIONS GENERIQUES POUR EXTRACTION"
 
 #. type: TP
-#: dpkg-source.1:210
+#: dpkg-source.1:216
 #, no-wrap
 msgid "B<--no-copy>"
 msgstr "B<--no-copy>"
 
 #. type: Plain text
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 msgid "Do not copy original tarballs near the extracted source package."
 msgstr ""
 "Ne pas copier l'archive d'origine près de l'extraction du paquet source."
 
 #. type: TP
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 #, no-wrap
 msgid "B<--no-check>"
 msgstr "B<--no-check>"
 
 #. type: Plain text
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 msgid "Do not check signatures and checksums before unpacking."
 msgstr ""
 "Ne vérifie pas les signatures et les sommes de contrôle avant de dépaqueter."
 
 #. type: TP
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 #, no-wrap
 msgid "B<--require-valid-signature>"
 msgstr "B<--require-valid-signature>"
 
 #. type: Plain text
-#: dpkg-source.1:224
+#: dpkg-source.1:230
 msgid ""
 "Refuse to unpack the source package if it doesn't contain an OpenPGP "
 "signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -13238,13 +14117,13 @@
 "keyring.gpg> et I</usr/share/keyrings/debian-maintainers.gpg>)."
 
 #. type: SH
-#: dpkg-source.1:225
+#: dpkg-source.1:231
 #, no-wrap
 msgid "SOURCE PACKAGE FORMATS"
 msgstr "FORMATS DE PAQUET SOURCE"
 
 #. type: Plain text
-#: dpkg-source.1:230
+#: dpkg-source.1:236
 msgid ""
 "If you don't know what source format to use, you should probably pick either "
 "\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
@@ -13256,13 +14135,13 @@
 "formats dans Debian."
 
 #. type: SS
-#: dpkg-source.1:231
+#: dpkg-source.1:237
 #, no-wrap
 msgid "Format: 1.0"
 msgstr "Format: 1.0"
 
 #. type: Plain text
-#: dpkg-source.1:235
+#: dpkg-source.1:241
 msgid ""
 "A source package in this format consists either of a B<.orig.tar.gz> "
 "associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -13273,12 +14152,12 @@
 "natif I<\"native\">)."
 
 #. type: Plain text
-#: dpkg-source.1:237 dpkg-source.1:405 dpkg-source.1:566 dpkg-source.1:605
+#: dpkg-source.1:243 dpkg-source.1:411 dpkg-source.1:586 dpkg-source.1:625
 msgid "B<Extracting>"
 msgstr "B<Extracting>"
 
 #. type: Plain text
-#: dpkg-source.1:247
+#: dpkg-source.1:253
 msgid ""
 "Extracting a native package is a simple extraction of the single tarball in "
 "the target directory. Extracting a non-native package is done by first "
@@ -13300,12 +14179,12 @@
 "supprimer de fichiers (les fichiers vides seront laissé là)."
 
 #. type: Plain text
-#: dpkg-source.1:249 dpkg-source.1:433 dpkg-source.1:577 dpkg-source.1:610
+#: dpkg-source.1:255 dpkg-source.1:439 dpkg-source.1:597 dpkg-source.1:630
 msgid "B<Building>"
 msgstr "B<Construction>"
 
 #. type: Plain text
-#: dpkg-source.1:255
+#: dpkg-source.1:261
 msgid ""
 "Building a native package is just creating a single tarball with the source "
 "directory. Building a non-native package involves extracting the original "
@@ -13319,13 +14198,13 @@
 "répertoire \".orig\"."
 
 #. type: TP
-#: dpkg-source.1:256
+#: dpkg-source.1:262
 #, no-wrap
 msgid "B<Build options (with -b):>"
 msgstr "B<Options de construction (avec -b):>"
 
 #. type: Plain text
-#: dpkg-source.1:269
+#: dpkg-source.1:275
 msgid ""
 "If a second non-option argument is supplied it should be the name of the "
 "original source directory or tarfile or the empty string if the package is a "
@@ -13344,7 +14223,7 @@
 "sX>."
 
 #. type: Plain text
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 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<-"
@@ -13355,13 +14234,13 @@
 "les options B<-sA>, B<-sP>, B<-sK>, B<-sU> et B<-sR.>"
 
 #. type: TP
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 #, no-wrap
 msgid "B<-sk>"
 msgstr "B<-sk>"
 
 #. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:290
 msgid ""
 "Specifies to expect the original source as a tarfile, by default "
 "I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>.  It will leave "
@@ -13376,24 +14255,24 @@
 "I<répertoire>B<.orig> pour la génération du fichier diff."
 
 #. type: TP
-#: dpkg-source.1:284 dpkg-source.1:353
+#: dpkg-source.1:290 dpkg-source.1:359
 #, no-wrap
 msgid "B<-sp>"
 msgstr "B<-sp>"
 
 #. type: Plain text
-#: dpkg-source.1:289
+#: dpkg-source.1:295
 msgid "Like B<-sk> but will remove the directory again afterwards."
 msgstr "Comme B<-sk> mais supprimera le répertoire à nouveau par la suite."
 
 #. type: TP
-#: dpkg-source.1:289 dpkg-source.1:359
+#: dpkg-source.1:295 dpkg-source.1:365
 #, no-wrap
 msgid "B<-su>"
 msgstr "B<-su>"
 
 #. type: Plain text
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 msgid ""
 "Specifies that 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 "
@@ -13404,24 +14283,24 @@
 "source> crée une nouvelle archive du source d'origine."
 
 #. type: TP
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 #, no-wrap
 msgid "B<-sr>"
 msgstr "B<-sr>"
 
 #. type: Plain text
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr "Comme B<-su> mais supprimera ce répertoire après utilisation."
 
 #. type: TP
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 #, no-wrap
 msgid "B<-ss>"
 msgstr "B<-ss>"
 
 #. type: Plain text
-#: dpkg-source.1:310
+#: dpkg-source.1:316
 msgid ""
 "Specifies that the original source is available both as a directory and as a "
 "tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -13435,13 +14314,13 @@
 "« tar » ne correspondent pas, une mauvaise archive source en résulte."
 
 #. type: TP
-#: dpkg-source.1:310 dpkg-source.1:362
+#: dpkg-source.1:316 dpkg-source.1:368
 #, no-wrap
 msgid "B<-sn>"
 msgstr "B<-sn>"
 
 #. type: Plain text
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 msgid ""
 "Specifies to not look for any original source, and to not generate a diff.  "
 "The second argument, if supplied, must be the empty string. This is used for "
@@ -13454,13 +14333,13 @@
 "distincte et donc pas de fichier « diff » de debianisation."
 
 #. type: TP
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 #, no-wrap
 msgid "B<-sa> or B<-sA>"
 msgstr "B<-sa> or B<-sA>"
 
 #. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:348
 msgid ""
 "Specifies to 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 "
@@ -13490,13 +14369,13 @@
 "défaut est B<-sA>."
 
 #. type: TP
-#: dpkg-source.1:342 dpkg-source.1:525
+#: dpkg-source.1:348 dpkg-source.1:541
 #, no-wrap
 msgid "B<--abort-on-upstream-changes>"
 msgstr "B<--abort-on-upstream-changes>"
 
 #. type: Plain text
-#: dpkg-source.1:348
+#: dpkg-source.1:354
 msgid ""
 "The process fails if the generated diff contains changes to files outside of "
 "the debian sub-directory. This option is not allowed in B<debian/source/"
@@ -13508,20 +14387,20 @@
 "dans B<debian/source/local-options>."
 
 #. type: TP
-#: dpkg-source.1:349
+#: dpkg-source.1:355
 #, no-wrap
 msgid "B<Extract options (with -x):>"
 msgstr "B<options d'extractions (avec -x):>"
 
 #. type: Plain text
-#: dpkg-source.1:353
+#: dpkg-source.1:359
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 "Dans tous ces cas, l'arborescence existante des sources d'origine est "
 "supprimée."
 
 #. type: Plain text
-#: dpkg-source.1:359
+#: dpkg-source.1:365
 msgid ""
 "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 "
@@ -13535,12 +14414,12 @@
 "défaut>)."
 
 #. type: Plain text
-#: dpkg-source.1:362
+#: dpkg-source.1:368
 msgid "Unpacks the original source tree."
 msgstr "Dépaquetage de l'arborescence du répertoire source d'origine."
 
 #. type: Plain text
-#: dpkg-source.1:367
+#: dpkg-source.1:373
 msgid ""
 "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 "
@@ -13551,7 +14430,7 @@
 "présente dans le répertoire courant, elle est toujours supprimée."
 
 #. type: Plain text
-#: dpkg-source.1:372
+#: dpkg-source.1:378
 msgid ""
 "All the B<-s>I<X> options are mutually exclusive. If you specify more than "
 "one only the last one will be used."
@@ -13560,26 +14439,26 @@
 "plusieurs, seule la dernière sera prise en compte."
 
 #. type: TP
-#: dpkg-source.1:372 dpkg-source.1:535
+#: dpkg-source.1:378 dpkg-source.1:555
 #, no-wrap
 msgid "B<--skip-debianization>"
 msgstr "B<--skip-debianization>"
 
 #. type: Plain text
-#: dpkg-source.1:375
+#: dpkg-source.1:381
 msgid "Skips application of the debian diff on top of the upstream sources."
 msgstr ""
 "Passe l'étape d'application du fichier de différences Debian aux sources "
 "amont."
 
 #. type: SS
-#: dpkg-source.1:376
+#: dpkg-source.1:382
 #, no-wrap
 msgid "Format: 2.0"
 msgstr "Format: 2.0"
 
 #. type: Plain text
-#: dpkg-source.1:380
+#: dpkg-source.1:386
 msgid ""
 "Also known as wig&pen. This format is not recommended for wide-spread usage, "
 "the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -13591,7 +14470,7 @@
 "de paquet source."
 
 #. type: Plain text
-#: dpkg-source.1:385
+#: dpkg-source.1:391
 msgid ""
 "The behaviour of this format is the same as the \"3.0 (quilt)\" format "
 "except that it doesn't use an explicit list of patches. All files in "
@@ -13605,7 +14484,7 @@
 "de l'extraction."
 
 #. type: Plain text
-#: dpkg-source.1:388
+#: dpkg-source.1:394
 msgid ""
 "When building a new source package, any change to the upstream source is "
 "stored in a patch named B<zz_debian-diff-auto>."
@@ -13615,13 +14494,13 @@
 "B<zz_debian-diff-auto>."
 
 #. type: SS
-#: dpkg-source.1:389
+#: dpkg-source.1:395
 #, no-wrap
 msgid "Format: 3.0 (native)"
 msgstr "Format: 3.0 (native)"
 
 #. type: Plain text
-#: dpkg-source.1:395
+#: dpkg-source.1:401
 msgid ""
 "This format is an extension of the native package format as defined in the "
 "1.0 format. It supports all compression methods and will ignore by default "
@@ -13635,13 +14514,13 @@
 "help>)."
 
 #. type: SS
-#: dpkg-source.1:396
+#: dpkg-source.1:402
 #, no-wrap
 msgid "Format: 3.0 (quilt)"
 msgstr "Format: 3.0 (quilt)"
 
 #. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:409
 msgid ""
 "A source package in this format contains at least an original tarball (B<."
 "orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -13657,7 +14536,7 @@
 "tirets (« - »)."
 
 #. type: Plain text
-#: dpkg-source.1:414
+#: dpkg-source.1:420
 msgid ""
 "The main original tarball is extracted first, then all additional original "
 "tarballs are extracted in subdirectories named after the I<component> part "
@@ -13677,7 +14556,7 @@
 "include-binaries>)."
 
 #. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:432
 msgid ""
 "All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
 "series> are then applied.  If the former file is used and the latter one "
@@ -13704,7 +14583,7 @@
 "options, et la construction est susceptible d'échouer."
 
 #. type: Plain text
-#: dpkg-source.1:428
+#: dpkg-source.1:434
 msgid ""
 "Similarly to quilt's default behaviour, the patches can remove files too."
 msgstr ""
@@ -13712,7 +14591,7 @@
 "aussi supprimer des fichiers."
 
 #. type: Plain text
-#: dpkg-source.1:431
+#: dpkg-source.1:437
 msgid ""
 "The file B<.pc/applied-patches> is created if some patches have been applied "
 "during the extraction."
@@ -13721,16 +14600,29 @@
 "appliqués au cours de l'extraction."
 
 #. type: Plain text
-#: dpkg-source.1:443
+#: dpkg-source.1:451
+#, fuzzy
+#| msgid ""
+#| "All original tarballs found in the current directory are extracted in a "
+#| "temporary directory by following the same logic as for the unpack, the "
+#| "debian directory is copied over in the temporary directory, and all "
+#| "patches except the automatic patch (B<debian-changes->I<version> or "
+#| "B<debian-changes>, depending on B<--single-debian-patch>) are applied. "
+#| "The temporary directory is compared to the source package directory and "
+#| "the diff (if non-empty) is stored in the automatic patch.  If the "
+#| "automatic patch is created/deleted, it's added/removed from the series "
+#| "file and from the quilt metadata."
 msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
 "except the automatic patch (B<debian-changes->I<version> or B<debian-"
 "changes>, depending on B<--single-debian-patch>) are applied. The temporary "
-"directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in the automatic patch.  If the automatic patch is created/"
-"deleted, it's added/removed from the series file and from the quilt metadata."
+"directory is compared to the source package directory. When the diff is non-"
+"empty, the build fails unless B<--single-debian-patch> or B<--auto-commit> "
+"has been used, in which case the diff is stored in the automatic patch.  If "
+"the automatic patch is created/deleted, it's added/removed from the series "
+"file and from the quilt metadata."
 msgstr ""
 "Les originaux de toutes les archives tar trouvées dans le répertoire courant "
 "sont extraits dans un répertoire temporaire en suivant la même logique que "
@@ -13742,7 +14634,7 @@
 "est ajouté ou supprimé dans le fichier series et les méta-données de quilt."
 
 #. type: Plain text
-#: dpkg-source.1:451
+#: dpkg-source.1:459
 msgid ""
 "Any change on a binary file is not representable in a diff and will thus "
 "lead to a failure unless the maintainer deliberately decided to include that "
@@ -13760,7 +14652,7 @@
 "include-binaries>."
 
 #. type: Plain text
-#: dpkg-source.1:454
+#: dpkg-source.1:462
 msgid ""
 "The updated debian directory and the list of modified binaries is then used "
 "to generate the debian tarball."
@@ -13769,7 +14661,7 @@
 "ensuite utilisés pour recréer l'archive tar debian."
 
 #. type: Plain text
-#: dpkg-source.1:460
+#: dpkg-source.1:468
 msgid ""
 "The automatically generated diff doesn't include changes on VCS specific "
 "files as well as many temporary files (see default value associated to B<-i> "
@@ -13783,19 +14675,28 @@
 "de la génération automatique du patch."
 
 #. type: Plain text
-#: dpkg-source.1:474
-msgid ""
-"Note: B<dpkg-source> expects the source tree to have all patches listed in "
-"the series file applied when you generate the source package.  This is not "
-"the case when the source tree has been obtained by unpacking a source "
-"package using the Format: 1.0 for instance. To mitigate the problem, B<dpkg-"
-"source> will apply the patches by itself if it believes that they have not "
-"yet been applied. To detect this situation, it uses the following heuristic: "
-"it finds the list of supposedly unapplied patches (they are listed in the "
-"B<series> file but not in B<.pc/applied-patches>), and if the first patch in "
-"that set can be applied without errors, it will apply them all.  The option "
-"B<--no-preparation> can be used to disable this behaviour. This operation is "
-"usually done as part of the B<--prepare-build> command."
+#: dpkg-source.1:477
+#, fuzzy
+#| msgid ""
+#| "Note: B<dpkg-source> expects the source tree to have all patches listed "
+#| "in the series file applied when you generate the source package.  This is "
+#| "not the case when the source tree has been obtained by unpacking a source "
+#| "package using the Format: 1.0 for instance. To mitigate the problem, "
+#| "B<dpkg-source> will apply the patches by itself if it believes that they "
+#| "have not yet been applied. To detect this situation, it uses the "
+#| "following heuristic: it finds the list of supposedly unapplied patches "
+#| "(they are listed in the B<series> file but not in B<.pc/applied-"
+#| "patches>), and if the first patch in that set can be applied without "
+#| "errors, it will apply them all.  The option B<--no-preparation> can be "
+#| "used to disable this behaviour. This operation is usually done as part of "
+#| "the B<--prepare-build> command."
+msgid ""
+"Note: B<dpkg-source> B<--before-build> (and B<-b>) will ensure that all "
+"patches listed in the series file are applied so that a package build always "
+"has all patches applied. It does this by finding unapplied patches (they are "
+"listed in the B<series> file but not in B<.pc/applied-patches>), and if the "
+"first patch in that set can be applied without errors, it will apply them "
+"all. The option B<--no-preparation> can be used to disable this behavior."
 msgstr ""
 "Note : B<dpkg-source> s'attend à ce que l'arbre source ait toutes les "
 "corrections d'appliquées lorsque vous créez le paquet source. Ce n'est pas "
@@ -13811,19 +14712,45 @@
 "cadre de l'utilisation de la commande B<--prepare-build>."
 
 #. type: Plain text
-#: dpkg-source.1:476 dpkg-source.1:547 dpkg-source.1:586
+#: dpkg-source.1:480
+#, fuzzy
+#| msgid "B<debian/changelog>"
+msgid "B<Recording changes>"
+msgstr "B<debian/changelog>"
+
+#. type: TP
+#: dpkg-source.1:480
+#, fuzzy, no-wrap
+#| msgid "B<-c>, B<--control-path> I<package-name> [I<control-file>]"
+msgid "B<--commit> [I<directory>] [I<patch-name>] [I<patch-file>]"
+msgstr "B<-c>, B<--control-path> I<nom-paquet> [I<fichier-contrôle>]"
+
+#. type: Plain text
+#: dpkg-source.1:490
+msgid ""
+"Generates a patch corresponding to the local changes that are not managed by "
+"the quilt patch system and integrates it in the patch system under the name "
+"I<patch-name>. If the name is missing, it will be asked interactively. If "
+"I<patch-file> is given, it is used as the patch corresponding to the local "
+"changes to integrate. This is mainly useful after a build failure that pre-"
+"generated this file. Once integrated, an editor is launched so that you can "
+"edit the meta-information in the patch header."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:493 dpkg-source.1:567 dpkg-source.1:606
 msgid "B<Build options>"
 msgstr "B<Options de construction>"
 
 #. type: TP
-#: dpkg-source.1:476
+#: dpkg-source.1:493
 #, no-wrap
 msgid "B<--allow-version-of-quilt-db=>I<version>"
 msgstr "B<--allow-version-of-quilt-db=>I<version>"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 msgid ""
 "Allow B<dpkg-source> to build the source package if the version of the quilt "
 "metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -13831,20 +14758,20 @@
 "compatible with the version 2 that B<dpkg-source> currently supports. The "
 "version of the quilt metadata is stored in B<.pc/.version>."
 msgstr ""
-"Autotide B<dpkg-source> à construire le fichier si la version des méta-"
+"Autorise B<dpkg-source> à construire le fichier si la version des méta-"
 "données de quilt est celle indiquée, même si B<dpkg-source> n'en n'a pas "
 "connaissance. En fait, cela indique que la version indiquée des méta-données "
 "de quilt est compatible avec la version 2 que B<dpkg-source> gère. La "
 "version des méta-données de quilt est conservée dans B<.pc/.version>."
 
 #. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 #, no-wrap
 msgid "B<--include-removal>"
 msgstr "B<--include-removal>"
 
 #. type: Plain text
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 msgid ""
 "Do not ignore removed files and include them in the automatically generated "
 "patch."
@@ -13853,24 +14780,24 @@
 "modification généré automatiquement."
 
 #. type: TP
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 #, no-wrap
 msgid "B<--include-timestamp>"
 msgstr "B<--include-timestamp>"
 
 #. type: Plain text
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 msgid "Include timestamp in the automatically generated patch."
 msgstr "Inclure la date dans le patch généré automatiquement."
 
 #. type: TP
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 #, no-wrap
 msgid "B<--include-binaries>"
 msgstr "B<--include-binaries>"
 
 #. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 msgid ""
 "Add all modified binaries in the debian tarball. Also add them to B<debian/"
 "source/include-binaries>: they will be added by default in subsequent builds "
@@ -13882,13 +14809,13 @@
 "nécessaire."
 
 #. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 #, no-wrap
 msgid "B<--no-preparation>"
 msgstr "B<--no-preparation>"
 
 #. type: Plain text
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 msgid ""
 "Do not try to prepare the build tree by applying patches which are "
 "apparently unapplied."
@@ -13897,22 +14824,33 @@
 "correctifs qui ne lui sont apparemment pas appliqués."
 
 #. type: TP
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 #, no-wrap
 msgid "B<--single-debian-patch>"
 msgstr "B<--single-debian-patch>"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:510
+#: dpkg-source.1:528
+#, fuzzy
+#| msgid ""
+#| "Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
+#| "changes->I<version> for the name of the automatic patch generated during "
+#| "build. This option is particularly useful when the package is maintained "
+#| "in a VCS and a patch set can't reliably be generated. Instead the current "
+#| "diff with upstream should be stored in a single patch. When using this "
+#| "option, it is recommended to create a debian/source/patch-header file "
+#| "explaining how the Debian changes can be best reviewed, for example in "
+#| "the VCS that is used."
 msgid ""
 "Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
 "changes->I<version> for the name of the automatic patch generated during "
 "build. This option is particularly useful when the package is maintained in "
 "a VCS and a patch set can't reliably be generated. Instead the current diff "
-"with upstream should be stored in a single patch. When using this option, it "
-"is recommended to create a debian/source/patch-header file explaining how "
-"the Debian changes can be best reviewed, for example in the VCS that is used."
+"with upstream should be stored in a single patch. The option would be put in "
+"B<debian/source/local-options> and would be accompanied by a B<debian/source/"
+"local-patch-header> file explaining how the Debian changes can be best "
+"reviewed, for example in the VCS that is used."
 msgstr ""
 "Utilise B<debian/patches/debian-changes> au lieu de B<debian/patches/debian-"
 "changes->I<version> comme nom du correctif automatiquement créé au cours de "
@@ -13926,13 +14864,13 @@
 "versions utilisé."
 
 #. type: TP
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 #, no-wrap
 msgid "B<--create-empty-orig>"
 msgstr "B<--create-empty-orig>"
 
 #. type: Plain text
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 msgid ""
 "Automatically create the main original tarball as empty if it's missing and "
 "if there are supplementary original tarballs. This option is meant to be "
@@ -13945,20 +14883,27 @@
 "sources amont et qu'il n'existe pas de logiciel « principal »."
 
 #. type: TP
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 #, no-wrap
 msgid "B<--unapply-patches>"
 msgstr "B<--unapply-patches>"
 
 #. type: Plain text
-#: dpkg-source.1:525
-msgid ""
-"Unapply the patches in the B<--after-build> hook. This is mainly useful when "
-"you build your package directly in a VCS that contains unpatched upstream "
-"source and where you want to keep the tree unpatched even after a package "
-"build. This option is usually put in B<debian/source/local-options> (it's "
-"not allowed in B<debian/source/options> so that all generated source "
-"packages have the same behaviour by default)."
+#: dpkg-source.1:541
+#, fuzzy
+#| msgid ""
+#| "Unapply the patches in the B<--after-build> hook. This is mainly useful "
+#| "when you build your package directly in a VCS that contains unpatched "
+#| "upstream source and where you want to keep the tree unpatched even after "
+#| "a package build. This option is usually put in B<debian/source/local-"
+#| "options> (it's not allowed in B<debian/source/options> so that all "
+#| "generated source packages have the same behaviour by default)."
+msgid ""
+"Unapply the patches in the B<--after-build> hook. You usually don't need "
+"this option as dpkg-source will automatically unapply the patches if it did "
+"apply them during B<--before-build>. This option is only allowed in B<debian/"
+"source/local-options> so that all generated source packages have the same "
+"behavior by default."
 msgstr ""
 "Retire les correctifs dans le point d'entrée B<--after-build>. Cette option "
 "est principalement utile lorsque le paquet est construit directement depuis "
@@ -13969,7 +14914,7 @@
 "afin que tous les paquets source créés aient le même comportement par défaut."
 
 #. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:548
 msgid ""
 "The process fails if an automatic patch has been generated. This option can "
 "be used to ensure that all changes were properly recorded in separate quilt "
@@ -13982,39 +14927,57 @@
 "paquet source. Elle n'est pas autorisée dans B<debian/source/options> mais "
 "peut prendre place dans B<debian/source/local-options>."
 
+#. type: TP
+#: dpkg-source.1:548
+#, fuzzy, no-wrap
+#| msgid "B<--no-act>"
+msgid "B<--auto-commit>"
+msgstr "B<--no-act>"
+
+#. type: Plain text
+#: dpkg-source.1:552
+msgid ""
+"The process doesn't fail if an automatic patch has been generated, instead "
+"it's immediately recorded in the quilt series."
+msgstr ""
+
 #. type: Plain text
-#: dpkg-source.1:535
+#: dpkg-source.1:555
 msgid "B<Extract options>"
 msgstr "B<Options d'extraction>"
 
 #. type: Plain text
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 msgid "Skips extraction of the debian tarball on top of the upstream sources."
 msgstr ""
 "Passe l'étape d'extraction de l'archive tar debian par dessus les sources "
 "amont"
 
 #. type: TP
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 #, no-wrap
 msgid "B<--skip-patches>"
 msgstr "B<--skip-patches>"
 
 #. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:561
 msgid "Do not apply patches at the end of the extraction."
 msgstr "Ne pas appliquer des correctifs à la fin de l'extraction."
 
 #. type: SS
-#: dpkg-source.1:542
+#: dpkg-source.1:562
 #, no-wrap
 msgid "Format: 3.0 (custom)"
 msgstr "Format: 3.0 (custom)"
 
 #. type: Plain text
-#: dpkg-source.1:545
+#: dpkg-source.1:565
+#, fuzzy
+#| msgid ""
+#| "This format is particular. It doesn't represent a real source package "
+#| "format but can be used to create source packages with arbitrary files."
 msgid ""
-"This format is particular. It doesn't represent a real source package format "
+"This format is special. It doesn't represent a real source package format "
 "but can be used to create source packages with arbitrary files."
 msgstr ""
 "Ce format est particulier. Il ne représente pas un réel format de paquet "
@@ -14022,24 +14985,24 @@
 "fichiers arbitraires."
 
 #. type: Plain text
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 msgid ""
 "All non-option arguments are taken as files to integrate in the generated "
-"source package. They must exist and are preferrably in the current "
-"directory. At least one file must be given."
+"source package. They must exist and are preferably in the current directory. "
+"At least one file must be given."
 msgstr ""
 "Tous les arguments qui ne sont pas des options sont pris pour des fichiers à "
 "intégrer dans le paquet source généré. Ils doivent exister et être de "
 "préférence dans le répertoire courant. Au moins un fichier doit être donné."
 
 #. type: TP
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 #, no-wrap
 msgid "B<--target-format=>I<value>"
 msgstr "B<--target-format=>I<valeur>"
 
 #. type: Plain text
-#: dpkg-source.1:556
+#: dpkg-source.1:576
 msgid ""
 "B<Required>. Defines the real format of the generated source package.  The "
 "generated .dsc file will contain this value in its I<Format> field and not "
@@ -14050,18 +15013,18 @@
 "(custom)\"."
 
 #. type: SS
-#: dpkg-source.1:557
+#: dpkg-source.1:577
 #, no-wrap
 msgid "Format: 3.0 (git)"
 msgstr "Format: 3.0 (git)"
 
 #. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:579
 msgid "This format is experimental."
 msgstr "Ce format est expérimental."
 
 #. type: Plain text
-#: dpkg-source.1:564
+#: dpkg-source.1:584
 msgid ""
 "A source package in this format consists of a single bundle of a git "
 "repository B<.git> to hold the source of a package.  There may also be a B<."
@@ -14073,7 +15036,7 @@
 "« shallow »."
 
 #. type: Plain text
-#: dpkg-source.1:570
+#: dpkg-source.1:590
 msgid ""
 "The bundle is cloned as a git repository to the target directory.  If there "
 "is a gitshallow file, it is installed as `.git/shallow` inside the cloned "
@@ -14084,12 +15047,12 @@
 "shallow » dans le dépôt git cloné."
 
 #. type: Plain text
-#: dpkg-source.1:575
+#: dpkg-source.1:595
 msgid ""
 "Note that by default the new repository will have the same branch checked "
 "out that was checked out in the original source. (Typically \"master\", but "
-"it could be anything.) Any other branches will be available, under as "
-"`remotes/origin/`"
+"it could be anything.) Any other branches will be available under `remotes/"
+"origin/`."
 msgstr ""
 "Veuillez noter que, par défaut, le nouveau dépôt aura la même branche "
 "récupérée que celle qui était récupérée dans les sources d'origine (souvent "
@@ -14097,7 +15060,7 @@
 "branches seront disponibles sous « remotes/origin »."
 
 #. type: Plain text
-#: dpkg-source.1:580 dpkg-source.1:613
+#: dpkg-source.1:600 dpkg-source.1:633
 msgid ""
 "Before going any further, some checks are done to ensure that we don't have "
 "any non-ignored uncommitted changes."
@@ -14106,7 +15069,7 @@
 "s'assurer qu'il n'existe aucun changement non-soumis et à ne pas ignorer."
 
 #. type: Plain text
-#: dpkg-source.1:584
+#: dpkg-source.1:604
 msgid ""
 "B<git-bundle>(1) is used to generate a bundle of the git repository.  By "
 "default, all branches and tags in the repository are included in the bundle."
@@ -14116,13 +15079,13 @@
 "ensemble."
 
 #. type: TP
-#: dpkg-source.1:586
+#: dpkg-source.1:606
 #, no-wrap
 msgid "B<--git-ref=>I<ref>"
 msgstr "B<--git-ref=>I<réf>"
 
 #. type: Plain text
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 msgid ""
 "Allows specifying a git ref to include in the git bundle. Use disables the "
 "default behavior of including all branches and tags. May be specified "
@@ -14143,13 +15106,13 @@
 "git-ref=--all -- git-ref=^private."
 
 #. type: TP
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 #, no-wrap
 msgid "B<--git-depth=>I<number>"
 msgstr "B<--git-depth=>I<nombre>"
 
 #. type: Plain text
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 msgid ""
 "Creates a shallow clone with a history truncated to the specified number of "
 "revisions."
@@ -14158,13 +15121,13 @@
 "révisions."
 
 #. type: SS
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 #, no-wrap
 msgid "Format: 3.0 (bzr)"
 msgstr "Format: 3.0 (bzr)"
 
 #. type: Plain text
-#: dpkg-source.1:603
+#: dpkg-source.1:623
 msgid ""
 "This format is experimental. It generates a single tarball containing the "
 "bzr repository."
@@ -14173,7 +15136,7 @@
 "correspondant."
 
 #. type: Plain text
-#: dpkg-source.1:608
+#: dpkg-source.1:628
 msgid ""
 "The tarball is unpacked and then bzr is used to checkout the current branch."
 msgstr ""
@@ -14181,7 +15144,7 @@
 "branche courante."
 
 #. type: Plain text
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 msgid ""
 "Then the VCS specific part of the source directory is copied over to a "
 "temporary directory. Before this temporary directory is packed in a tarball, "
@@ -14193,19 +15156,19 @@
 "effectuées pour économiser de l'espace."
 
 #. type: SH
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 #, no-wrap
 msgid "WARNINGS AND ERRORS"
 msgstr "AVERTISSEMENTS ET ERREURS"
 
 #. type: SS
-#: dpkg-source.1:618
+#: dpkg-source.1:638
 #, no-wrap
 msgid "no source format specified in debian/source/format"
 msgstr "aucun format source indiqué dans debian/source/format"
 
 #. type: Plain text
-#: dpkg-source.1:624
+#: dpkg-source.1:644
 msgid ""
 "The file B<debian/source/format> should always exist and indicate the "
 "desired source format. For backwards compatibility, format \"1.0\" is "
@@ -14221,7 +15184,7 @@
 "d'une mention explicite de format."
 
 #. type: Plain text
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 msgid ""
 "The rationale is that format \"1.0\" is no longer the recommended format, "
 "you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
@@ -14237,13 +15200,13 @@
 "format>."
 
 #. type: SS
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 #, no-wrap
 msgid "the diff modifies the following upstream files"
 msgstr "le fichier de différences modifie les fichiers amont suivants"
 
 #. type: Plain text
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 msgid ""
 "When using source format \"1.0\" it is usually a bad idea to modify upstream "
 "files directly as the changes end up hidden and mostly undocumented in the ."
@@ -14260,13 +15223,13 @@
 "format « 3.0 (quilt) » qui permet ces opérations de manière native."
 
 #. type: SS
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 #, no-wrap
 msgid "cannot represent change to I<file>"
 msgstr "impossible d'identifier les changements de I<fichier>"
 
 #. type: Plain text
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 msgid ""
 "Changes to upstream sources are usually stored with patch files, but not all "
 "changes can be represented with patches: they can only alter the content of "
@@ -14282,13 +15245,13 @@
 "répertoire), ce message d'erreur s'affichera."
 
 #. type: SS
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 #, no-wrap
 msgid "newly created empty file I<file> will not be represented in diff"
 msgstr "le fichier I<fichier>, nouvellement créé, ne sera pas représenté dans le fichier de différences"
 
 #. type: Plain text
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 msgid ""
 "Empty files can't be created with patch files. Thus this change is not "
 "recorded in the source package and you are warned about it."
@@ -14298,19 +15261,19 @@
 "qui provoque cet avertissement."
 
 #. type: SS
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 #, no-wrap
 msgid "executable mode I<perms> of I<file> will not be represented in diff"
 msgstr "le mode exécutable I<permissions> de I<fichier> ne sera pas représenté dans le fichier de différences"
 
 #. type: SS
-#: dpkg-source.1:647
+#: dpkg-source.1:667
 #, no-wrap
 msgid "special mode I<perms> of I<file> will not be represented in diff"
 msgstr "le mode spécial I<permissions> de I<fichier> ne sera pas représenté dans le fichier de différences"
 
 #. type: Plain text
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 msgid ""
 "Patch files do not record permissions of files and thus modified permissions "
 "are not stored in the source package. This warning reminds you of that fact."
@@ -14320,19 +15283,19 @@
 "paquet source, ce qui provoque cet avertissement."
 
 #. type: SH
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 #, no-wrap
 msgid "FILE FORMATS"
 msgstr "FORMATS DE FICHIERS"
 
 #. type: SS
-#: dpkg-source.1:652
+#: dpkg-source.1:672
 #, no-wrap
 msgid "debian/source/format"
 msgstr "debian/source/format"
 
 #. type: Plain text
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 msgid ""
 "This file contains on a single line the format that should be used to build "
 "the source package (possible formats are described above). No leading or "
@@ -14343,13 +15306,13 @@
 "pas contenir d'espaces avant ou après l'indication du format."
 
 #. type: SS
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 #, no-wrap
 msgid "debian/source/include-binaries"
 msgstr "debian/source/include-binaries"
 
 #. type: Plain text
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 msgid ""
 "This file contains a list of binary files (one per line) that should be "
 "included in the debian tarball. Leading and trailing spaces are stripped.  "
@@ -14362,13 +15325,13 @@
 "commentaires et sont ignorées, ainsi que les lignes vides."
 
 #. type: SS
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 #, no-wrap
 msgid "debian/source/options"
 msgstr "debian/source/options"
 
 #. type: Plain text
-#: dpkg-source.1:666
+#: dpkg-source.1:686
 msgid ""
 "This file contains a list of long options that should be automatically "
 "prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -14381,7 +15344,7 @@
 "compression-level> conviennent bien pour ce fichier."
 
 #. type: Plain text
-#: dpkg-source.1:672
+#: dpkg-source.1:692
 msgid ""
 "Each option should be put on a separate line. Empty lines and lines starting "
 "with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -14397,14 +15360,22 @@
 "donnée. Voici un exemple d'un tel fichier :"
 
 #. type: Plain text
-#: dpkg-source.1:678
-#, no-wrap
+#: dpkg-source.1:700
+#, fuzzy, no-wrap
+#| msgid ""
+#| "  # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
+#| "  compression = \"bzip2\"\n"
+#| "  compression-level = 9\n"
+#| "  # use debian/patches/debian-changes as automatic patch\n"
+#| "  single-debian-patch\n"
 msgid ""
 "  # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
 "  compression = \"bzip2\"\n"
 "  compression-level = 9\n"
 "  # use debian/patches/debian-changes as automatic patch\n"
 "  single-debian-patch\n"
+"  # ignore changes on config.{sub,guess}\n"
+"  extend-diff-ignore = \"(^|/)(config.sub|config.guess)$\"\n"
 msgstr ""
 "  # autoriser dpkg-source à créer un fichier debian.tar.bz2 avec la compression maximale\n"
 "  compression = \"bzip2\"\n"
@@ -14413,7 +15384,7 @@
 "  single-debian-patch\n"
 
 #. type: Plain text
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 msgid ""
 "Note: B<format> options are not accepted in this file, you should use "
 "B<debian/source/format> instead."
@@ -14422,13 +15393,13 @@
 "devriez utiliser B<debian/source/format> à la place."
 
 #. type: SS
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 #, no-wrap
 msgid "debian/source/local-options"
 msgstr "debian/source/local-options"
 
 #. type: Plain text
-#: dpkg-source.1:686
+#: dpkg-source.1:708
 msgid ""
 "Exactly like B<debian/source/options> except that the file is not included "
 "in the generated source package. It can be useful to store a preference tied "
@@ -14441,29 +15412,41 @@
 "source est géré."
 
 #. type: SS
-#: dpkg-source.1:686
+#: dpkg-source.1:708
+#, fuzzy, no-wrap
+#| msgid "debian/source/patch-header"
+msgid "debian/source/local-patch-header"
+msgstr "debian/source/patch-header"
+
+#. type: SS
+#: dpkg-source.1:709
 #, no-wrap
 msgid "debian/source/patch-header"
 msgstr "debian/source/patch-header"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:689
+#: dpkg-source.1:713
+#, fuzzy
+#| msgid ""
+#| "Free form text that is put on top of the automatic patch generated in "
+#| "formats \"2.0\" or \"3.0 (quilt)\"."
 msgid ""
 "Free form text that is put on top of the automatic patch generated in "
-"formats \"2.0\" or \"3.0 (quilt)\"."
+"formats \"2.0\" or \"3.0 (quilt)\". B<local-patch-header> is not included in "
+"the generated source package while B<patch-header> is."
 msgstr ""
 "Texte en format libre qui sera ajouté au correctif automatique créé dans les "
 "formats « 2.0 » et « 3.0 (quilt) »."
 
 #. type: SS
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 #, no-wrap
 msgid "debian/patches/series"
 msgstr "debian/patches/series"
 
 #. type: Plain text
-#: dpkg-source.1:698
+#: dpkg-source.1:722
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
@@ -14486,34 +15469,37 @@
 "ligne)."
 
 #. type: Plain text
-#: dpkg-source.1:705
+#: dpkg-source.1:729
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 
+#. type: Plain text
+#: dpkg-source.1:736
+#, fuzzy
+#| msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2008-2011 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
+
 #. type: TH
 #: dpkg-split.1:2
 #, no-wrap
 msgid "dpkg-split"
 msgstr "dpkg-split"
 
-#. type: TH
-#: dpkg-split.1:2 dpkg-statoverride.8:1
-#, no-wrap
-msgid "2009-06-26"
-msgstr "26-06-2009"
-
 #. type: Plain text
 #: dpkg-split.1:5
 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:10
-msgid "B<dpkg-split> [I<options>] I<command>"
+#: dpkg-split.1:9
+#, fuzzy
+#| msgid "B<dpkg-split> [I<options>] I<command>"
+msgid "B<dpkg-split> [I<option>...] I<command>"
 msgstr "B<dpkg-split> [I<options>] I<commande>"
 
 #. type: Plain text
-#: dpkg-split.1:16
+#: dpkg-split.1:15
 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 "
@@ -14525,7 +15511,7 @@
 "les disquettes."
 
 #. type: Plain text
-#: dpkg-split.1:20
+#: dpkg-split.1:19
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
@@ -14534,7 +15520,7 @@
 "B<--info>."
 
 #. type: Plain text
-#: dpkg-split.1:28
+#: dpkg-split.1:27
 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 "
@@ -14547,7 +15533,7 @@
 "listq> et B<--discard> permettent la gestion de cette file."
 
 #. type: Plain text
-#: dpkg-split.1:31
+#: dpkg-split.1:30
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
@@ -14557,18 +15543,18 @@
 "tranquillement ignorés."
 
 #. type: TP
-#: dpkg-split.1:33
+#: dpkg-split.1:32
 #, no-wrap
 msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
 msgstr "B<-s>, B<--split> I<archive-complète> [I<préfixe>]"
 
 #. type: Plain text
-#: dpkg-split.1:36
+#: dpkg-split.1:35
 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:44
+#: dpkg-split.1:43
 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 "
@@ -14579,7 +15565,7 @@
 "(les deux sont des décimaux)."
 
 #. type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 msgid ""
 "If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
 "including directory, with any trailing B<.deb> removed."
@@ -14588,13 +15574,13 @@
 "est utilisé, en incluant le répertoire et en supprimant tout B<.deb> restant."
 
 #. type: TP
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 #, no-wrap
 msgid "B<-j>, B<--join> I<part>..."
 msgstr "B<-j>, B<--join> I<partie>..."
 
 #. type: Plain text
-#: dpkg-split.1:56
+#: dpkg-split.1:55
 msgid ""
 "Joins the parts of a package file together, reassembling the original file "
 "as it was before it was split."
@@ -14603,7 +15589,7 @@
 "tel qu'il était avant la décomposition."
 
 #. type: Plain text
-#: dpkg-split.1:60
+#: dpkg-split.1:59
 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 "
@@ -14614,7 +15600,7 @@
 "fois dans la liste des arguments ; mais il est inutile de les ordonner."
 
 #. type: Plain text
-#: dpkg-split.1:65
+#: dpkg-split.1:64
 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 "
@@ -14626,26 +15612,31 @@
 "B<dpkg-split --split>."
 
 #. type: Plain text
-#: dpkg-split.1:67
+#: dpkg-split.1:66
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 "Les parties des noms ne sont pas significatives pour le processus de "
 "recomposition."
 
 #. type: Plain text
-#: dpkg-split.1:70
-msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
+#: dpkg-split.1:69
+#, fuzzy
+#| msgid ""
+#| "By default the output file is called I<package>B<->I<version>B<.deb>."
+msgid ""
+"By default the output file is called I<package>B<_>I<version>B<_>I<arch>B<."
+"deb>."
 msgstr ""
 "Par défaut, le fichier produit s'appelle : I<paquet>B<->I<version>B<.deb>."
 
 #. type: TP
-#: dpkg-split.1:71
+#: dpkg-split.1:70
 #, no-wrap
 msgid "B<-I>, B<--info> I<part>..."
 msgstr "B<-I>, B<--info> I<partie>..."
 
 #. type: Plain text
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -14656,20 +15647,20 @@
 "le disent aussi sur la sortie standard."
 
 #. type: TP
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 #, no-wrap
 msgid "B<-a>, B<--auto -o> I<complete-output part>"
 msgstr "B<-a>, B<--auto -o> I<fichier-complet partie>"
 
 #. type: Plain text
-#: dpkg-split.1:79
+#: dpkg-split.1:78
 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:84
+#: dpkg-split.1:83
 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."
@@ -14678,7 +15669,7 @@
 "même paquet qui se trouvent (si elles existent) dans la file."
 
 #. type: Plain text
-#: dpkg-split.1:91
+#: dpkg-split.1:90
 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 "
@@ -14690,7 +15681,7 @@
 "erreur)."
 
 #. type: Plain text
-#: dpkg-split.1:97
+#: dpkg-split.1:96
 msgid ""
 "If not then the I<part> is copied into the queue and I<complete-output> is "
 "not created."
@@ -14699,17 +15690,23 @@
 "fichier I<fichier-complet> n'est pas créé."
 
 #. type: Plain text
-#: dpkg-split.1:104
+#: dpkg-split.1:103
+#, 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."
 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."
+"with status B<1>; if some other trouble occurs then it will exit with status "
+"B<2>."
 msgstr ""
 "Quand la partie I<part> n'appartient pas à un paquet binaire décomposé, "
 "B<dpkg-split> se termine avec un code de sortie égal à 1 ; s'il y a une "
 "autre erreur, c'est un code de sortie égal à 2."
 
 #. type: Plain text
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 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 "
@@ -14720,18 +15717,18 @@
 "fichier attendre."
 
 #. type: TP
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 #, no-wrap
 msgid "B<-l>, B<--listq>"
 msgstr "B<-l>, B<--listq>"
 
 #. type: Plain text
-#: dpkg-split.1:114
+#: dpkg-split.1:113
 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:118
+#: dpkg-split.1:117
 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 "
@@ -14742,13 +15739,13 @@
 "d'octets conservés."
 
 #. type: TP
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 #, no-wrap
 msgid "B<-d>, B<--discard> [I<package>...]"
 msgstr "B<-d>, B<--discard> [I<paquet>...]"
 
 #. type: Plain text
-#: dpkg-split.1:122
+#: dpkg-split.1:121
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
@@ -14757,7 +15754,7 @@
 "en attente des autres parties composant le paquet."
 
 #. type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:126
 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."
@@ -14766,13 +15763,13 @@
 "donné, seules les parties de ce paquet sont détruites."
 
 #. type: TP
-#: dpkg-split.1:135
+#: dpkg-split.1:134
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr "B<--depotdir>I< répertoire>"
 
 #. type: Plain text
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 msgid ""
 "Specifies an alternative directory for the queue of parts awaiting automatic "
 "reassembly. The default is B</var/lib/dpkg>."
@@ -14782,13 +15779,13 @@
 "var/lib/dpkg>."
 
 #. type: TP
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 #, no-wrap
 msgid "B<-S>, B<--partsize> I<kibibytes>"
 msgstr "B<-S>, B<--partsize> I<kibi-octets>"
 
 #. type: Plain text
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 msgid ""
 "Specifies the maximum part size when splitting, in kibibytes (1024 bytes). "
 "The default is 450 KiB."
@@ -14797,18 +15794,18 @@
 "d'une décomposition. Par défaut, la taille maximum est de 450 Kio."
 
 #. type: TP
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 #, no-wrap
 msgid "B<-o>, B<--output> I<complete-output>"
 msgstr "B<-o>, B<--output> I<fichier-complet>"
 
 #. type: Plain text
-#: dpkg-split.1:147
+#: dpkg-split.1:146
 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:152
+#: dpkg-split.1:151
 msgid ""
 "This overrides the default for a manual reassembly (B<--join>)  and is "
 "mandatory for an automatic queue-or-reassemble (B<--auto>)."
@@ -14818,13 +15815,13 @@
 "en file automatiques (B<--auto>)."
 
 #. type: TP
-#: dpkg-split.1:152
+#: dpkg-split.1:151
 #, no-wrap
 msgid "B<-Q>, B<--npquiet>"
 msgstr "B<-Q>, B<--npquiet>"
 
 #. type: Plain text
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 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 "
@@ -14839,20 +15836,20 @@
 "décomposés."
 
 #. type: TP
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 #, no-wrap
 msgid "B<--msdos>"
 msgstr "B<--msdos>"
 
 #. type: Plain text
-#: dpkg-split.1:168
+#: dpkg-split.1:167
 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:174
+#: dpkg-split.1:173
 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 "
@@ -14864,7 +15861,7 @@
 "caractères sont abandonnés."
 
 #. type: Plain text
-#: dpkg-split.1:179
+#: dpkg-split.1:178
 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."
@@ -14874,10 +15871,14 @@
 
 #. type: Plain text
 #: dpkg-split.1:186
+#, 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."
 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."
+"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 code de sortie égal à 0 signifie que la décomposition demandée, la "
 "recomposition ou bien toute autre commande a réussi. Les commandes B<--info> "
@@ -14885,36 +15886,42 @@
 "paquet binaire."
 
 #. type: Plain text
-#: dpkg-split.1:192
+#: dpkg-split.1:193
+#, fuzzy
+#| msgid ""
+#| "An exit status of 1 occurs only with B<--auto> and indicates that the "
+#| "I<part> file was not a binary package part."
 msgid ""
-"An exit status of 1 occurs only with B<--auto> and indicates that the "
-"I<part> file was not a binary package part."
+"Only occurs with B<--auto> and indicates that the I<part> file was not a "
+"binary package part."
 msgstr ""
 "Un code de sortie égal à 1 ne peut apparaître qu'avec l'action B<--auto> et "
 "signale que le fichier I<partie> n'est pas une partie d'un paquet binaire."
 
+#. type: TP
+#: dpkg-split.1:193 start-stop-daemon.8:275 update-alternatives.8:378
+#, no-wrap
+msgid "B<2>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-split.1:196
-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."
+#: dpkg-split.1:198
+#, 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."
+msgid ""
+"Some kind of trouble happened, 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 ""
 "Un code de sortie égal à 2 signale des problèmes, comme l'échec d'un appel "
 "système, ou un fichier qui, bien que ressemblant à une partie de fichier, "
 "est défectueux, ou bien une erreur d'utilisation, etc."
 
 #. type: Plain text
-#: dpkg-split.1:201
-msgid ""
-"B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
-"of Debian packages."
-msgstr ""
-"B<dpkg-split> utilise des conventions plutôt périmées pour les noms des "
-"paquets Debian."
-
-#. type: Plain text
-#: dpkg-split.1:204
+#: dpkg-split.1:202
 msgid ""
 "Full details of the packages in the queue are impossible to get without "
 "digging into the queue directory yourself."
@@ -14923,7 +15930,7 @@
 "la file à moins d'aller voir soi-même dans le répertoire de la file."
 
 #. type: Plain text
-#: dpkg-split.1:207
+#: dpkg-split.1:205
 msgid ""
 "There is no easy way to test whether a file that may be a binary package "
 "part is one."
@@ -14931,25 +15938,14 @@
 "On ne peut pas facilement savoir si un fichier est vraiment la partie d'un "
 "paquet binaire ou non."
 
-#. type: Plain text
-#: dpkg-split.1:211
-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 ""
-"L'architecture n'est pas indiquée dans l'en-tête des fichiers ; elle l'est "
-"seulement dans les informations de contrôle du paquet binaire ; et elle "
-"n'est pas présente dans les fichiers produits."
-
 #. type: TP
-#: dpkg-split.1:213
+#: dpkg-split.1:207
 #, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "I</var/lib/dpkg/parts>"
 
 #. type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:211
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
@@ -14957,7 +15953,7 @@
 "recomposition automatique."
 
 #. type: Plain text
-#: dpkg-split.1:222
+#: dpkg-split.1:216
 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 "
@@ -14969,7 +15965,7 @@
 "fichier."
 
 #. type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:222
 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)."
 
@@ -14991,12 +15987,14 @@
 msgstr "dpkg-statoverride - annuler la propriété et le mode des fichiers"
 
 #. type: Plain text
-#: dpkg-statoverride.8:9
-msgid "B<dpkg-statoverride> [I<options>] I<command>"
+#: dpkg-statoverride.8:8
+#, fuzzy
+#| msgid "B<dpkg-statoverride> [I<options>] I<command>"
+msgid "B<dpkg-statoverride> [I<option>...] I<command>"
 msgstr "B<dpkg-statoverride> [I<options>] I<commande>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:19
+#: dpkg-statoverride.8:18
 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' "
@@ -15014,7 +16012,7 @@
 "« setuid », ou pour les rendre exécutables seulement par un groupe donné."
 
 #. type: Plain text
-#: dpkg-statoverride.8:23
+#: dpkg-statoverride.8:22
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
@@ -15024,13 +16022,13 @@
 "listage des dérogations."
 
 #. type: TP
-#: dpkg-statoverride.8:25
+#: dpkg-statoverride.8:24
 #, no-wrap
 msgid "B<--add>I< user group mode file>"
 msgstr "B<--add>I< utilisateur groupe mode fichier>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:33
+#: dpkg-statoverride.8:32
 msgid ""
 "Add an override for I<file>. I<file> does not need to exist when this "
 "command is used; the override will be stored and used later.  Users and "
@@ -15046,7 +16044,7 @@
 "B<#0> ou B<#65534>). Le I<mode> doit être indiqué en numérotation octale."
 
 #. type: Plain text
-#: dpkg-statoverride.8:36
+#: dpkg-statoverride.8:35
 msgid ""
 "If --update is specified and I<file> exists, it is immediately set to the "
 "new owner and mode."
@@ -15055,7 +16053,7 @@
 "nouveau propriétaire et un nouveau mode."
 
 #. type: Plain text
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 msgid ""
 "Remove an override for I<file>, the status of I<file> is left unchanged by "
 "this command."
@@ -15064,13 +16062,13 @@
 "est inchangé."
 
 #. type: TP
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 #, no-wrap
 msgid "B<--list> [I<glob-pattern>]"
 msgstr "B<--list> [I<exp-reg>]"
 
 #. type: Plain text
-#: dpkg-statoverride.8:45
+#: 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 "
@@ -15082,7 +16080,7 @@
 "statoverride> se termine avec un code de sortie égal à 1."
 
 #. type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:56
 msgid ""
 "Change the I<directory> of the dpkg database where the statoverride file is "
 "also stored. Defaults to I</var/lib/dpkg>."
@@ -15091,13 +16089,13 @@
 "fichier statoverride. La valeur par défaut est I</var/lib/dpkg>."
 
 #. type: TP
-#: dpkg-statoverride.8:57 update-alternatives.8:337
+#: dpkg-statoverride.8:56 update-alternatives.8:336
 #, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:61
+#: 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."
@@ -15106,13 +16104,13 @@
 "C'est nécessaire pour annuler une précédente dérogation."
 
 #. type: TP
-#: dpkg-statoverride.8:61
+#: dpkg-statoverride.8:60
 #, no-wrap
 msgid "B<--update>"
 msgstr "B<--update>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:65
+#: dpkg-statoverride.8:64
 msgid ""
 "Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
@@ -15120,18 +16118,18 @@
 "fichier existe."
 
 #. type: Plain text
-#: dpkg-statoverride.8:68
+#: dpkg-statoverride.8:67
 msgid "Be less verbose about what we do."
 msgstr "Moins de bavardage sur ce qui est fait."
 
 #. type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:75
 #, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr "I</var/lib/dpkg/statoverride>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:80
 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 "
@@ -15142,7 +16140,7 @@
 "fichiers importants comme « status » ou « available »."
 
 #. type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:83
 msgid ""
 "Note: B<dpkg-statoverride> preserves the old copy of this file, with "
 "extension \"-old\", before replacing it with the new one."
@@ -15212,11 +16210,17 @@
 
 #. type: Plain text
 #: dpkg-trigger.1:31
+#, fuzzy
+#| msgid ""
+#| "Check if the running B<dpkg> supports triggers (usually called from a "
+#| "postinst). Will exit 0 if a triggers-capable B<dpkg> has run, or 1 with "
+#| "an error message to stderr if not. Normally, however, it is better just "
+#| "to activate the desired trigger with B<dpkg-trigger>."
 msgid ""
 "Check if the running B<dpkg> supports triggers (usually called from a "
-"postinst). Will exit 0 if a triggers-capable B<dpkg> has run, or 1 with an "
-"error message to stderr if not. Normally, however, it is better just to "
-"activate the desired trigger with B<dpkg-trigger>."
+"postinst). Will exit B<0> if a triggers-capable B<dpkg> has run, or B<1> "
+"with an error message to stderr if not. Normally, however, it is better just "
+"to activate the desired trigger with B<dpkg-trigger>."
 msgstr ""
 "Vérifie si B<dpkg> sait gérer les actions différées (généralement appelées "
 "depuis un script de post-installation). Retourne en sortie 0 si c'est le "
@@ -15232,9 +16236,15 @@
 
 #. type: Plain text
 #: dpkg-trigger.1:49
+#, fuzzy
+#| msgid ""
+#| "Override trigger awaiter (normally set by B<dpkg> through the "
+#| "DPKG_MAINTSCRIPT_PACKAGE environment variable of the maintainer scripts, "
+#| "naming the package to which the script belongs, and this will be used by "
+#| "default)."
 msgid ""
 "Override trigger awaiter (normally set by B<dpkg> through the "
-"DPKG_MAINTSCRIPT_PACKAGE environment variable of the maintainer scripts, "
+"B<DPKG_MAINTSCRIPT_PACKAGE> environment variable of the maintainer scripts, "
 "naming the package to which the script belongs, and this will be used by "
 "default)."
 msgstr ""
@@ -15276,7 +16286,7 @@
 msgstr "Teste uniquement, n'apporte aucun changement."
 
 #. type: Plain text
-#: dpkg-trigger.1:68
+#: dpkg-trigger.1:69
 msgid ""
 "B<dpkg>(1), B<deb-triggers>(5), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
 msgstr ""
@@ -15288,12 +16298,6 @@
 msgid "dpkg-vendor"
 msgstr "dpkg-vendor"
 
-#. type: TH
-#: dpkg-vendor.1:1
-#, no-wrap
-msgid "2009-05-10"
-msgstr "10-05-2009"
-
 #. type: Plain text
 #: dpkg-vendor.1:4
 msgid "dpkg-vendor - queries information about distribution vendors"
@@ -15325,8 +16329,12 @@
 
 #. type: Plain text
 #: dpkg-vendor.1:19
+#, fuzzy
+#| msgid ""
+#| "Exits with 0 if the current vendor is I<vendor>. Otherwise exits with non-"
+#| "zero."
 msgid ""
-"Exits with 0 if the current vendor is I<vendor>. Otherwise exits with non-"
+"Exits with B<0> if the current vendor is I<vendor>. Otherwise exits with non-"
 "zero."
 msgstr ""
 "Retourne 0 si l'éditeur est I<éditeur>. Retourne une valeur non nulle dans "
@@ -15340,8 +16348,13 @@
 
 #. type: Plain text
 #: dpkg-vendor.1:24
+#, fuzzy
+#| msgid ""
+#| "Exits with 0 if the current vendor distribution is a derivative of "
+#| "I<vendor>, otherwise exits with non-zero. It uses the \"Parent\" field to "
+#| "browse all ancestors of the current vendor."
 msgid ""
-"Exits with 0 if the current vendor distribution is a derivative of "
+"Exits with B<0> if the current vendor distribution is a derivative of "
 "I<vendor>, otherwise exits with non-zero. It uses the \"Parent\" field to "
 "browse all ancestors of the current vendor."
 msgstr ""
@@ -15372,9 +16385,13 @@
 
 #. type: Plain text
 #: dpkg-vendor.1:41
+#, fuzzy
+#| msgid ""
+#| "Assumes the current vendor is I<vendor> instead of discovering it with "
+#| "the DEB_VENDOR environment variable or B</etc/dpkg/origins/default>."
 msgid ""
 "Assumes the current vendor is I<vendor> instead of discovering it with the "
-"DEB_VENDOR environment variable or B</etc/dpkg/origins/default>."
+"B<DEB_VENDOR> environment variable or B</etc/dpkg/origins/default>."
 msgstr ""
 "Suppose que l'éditeur actuel est I<éditeur> au lieu d'utiliser la variable "
 "DEB_VENDOR ou B</etc/dpkg/origins/default>."
@@ -15395,7 +16412,7 @@
 "le contenu du fichier B</etc/dpkg/origins/default> est utilisé."
 
 #. type: Plain text
-#: dpkg-vendor.1:50 update-alternatives.8:497
+#: dpkg-vendor.1:50 update-alternatives.8:498
 msgid "Copyright \\(co 2009 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2009 Rapha\\[:e]l Hertzog"
 
@@ -15411,20 +16428,14 @@
 msgstr "dselect - Interface de gestion de paquets Debian."
 
 #. type: Plain text
-#: dselect.1:16
-msgid ""
-"B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--version>] "
-"[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 ""
-"B<dselect> [B<--admindir> I<E<lt>répertoireE<gt>>] [B<--help>] [B<--"
-"version>] [B<--expert>] [B<--debug>|B<-D>I<E<lt>fichierE<gt>>] "
-"[I<E<lt>actionE<gt>>] [B<--colour>|B<--color> I<partie-écran:>[I<avant-"
-"plan>],[I<arrière-plan>][I<:attr>[I<+attr+..>]]]"
+#: dselect.1:8
+#, fuzzy
+#| msgid "B<dpkg> [I<options>] I<action>"
+msgid "B<dselect> [I<option>...] [I<action>]"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
-#: dselect.1:25
+#: dselect.1:17
 #, no-wrap
 msgid ""
 "B<dselect>\n"
@@ -15442,7 +16453,7 @@
 " - Installer de nouveaux paquets ou mettre à jour vers de nouvelles versions.\n"
 
 #. type: Plain text
-#: dselect.1:37
+#: dselect.1:29
 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 "
@@ -15466,11 +16477,18 @@
 "méthode d'accès recommandée est I<apt>, qui est fournie par le paquet B<apt>."
 
 #. type: Plain text
-#: dselect.1:43
+#: dselect.1:35
+#, 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."
 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 "
+"argument, then that action is started immediately. Several command line "
 "parameters are still available to modify the running behaviour of B<dselect> "
 "or show additional information about the program."
 msgstr ""
@@ -15482,12 +16500,20 @@
 "sur le programme."
 
 #. type: Plain text
-#: dselect.1:51
+#: dselect.1:43
+#, fuzzy
+#| msgid ""
+#| "All options can be specified both on the commandline and in the "
+#| "B<dselect> configuration file I</etc/dpkg/dselect.cfg> or the files on "
+#| "the configuration directory I</etc/dpkg/dpkg.cfg.d/>. 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<#>)."
 msgid ""
-"All options can be specified both on the commandline and in the B<dselect> "
+"All options can be specified both on the command line and in the B<dselect> "
 "configuration file I</etc/dpkg/dselect.cfg> or the files on the "
-"configuration directory I</etc/dpkg/dpkg.cfg.d/>. Each line in the "
-"configuration file is either an option (exactly the same as the commandline "
+"configuration directory I</etc/dpkg/dselect.cfg.d/>. 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 ""
 "On peut spécifier une option à la fois sur la ligne de commande, dans le "
@@ -15496,14 +16522,8 @@
 "ligne 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
+#: dselect.1:49
 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 "
@@ -15514,26 +16534,30 @@
 "devrait pas avoir besoin de le modifier."
 
 #. type: TP
-#: dselect.1:57
-#, no-wrap
-msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
+#: dselect.1:49
+#, fuzzy, no-wrap
+#| msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
+msgid "B<--debug>I< file >|I< >B<-D>I<file>"
 msgstr "B<--debug>I< E<lt>fichierE<gt> >|I< >B<-D>I<E<lt>fichierE<gt>>"
 
 #. type: Plain text
-#: dselect.1:60
-msgid "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+#: dselect.1:52
+#, fuzzy
+#| msgid ""
+#| "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+msgid "Turn on debugging. Debugging information is sent to I<file>."
 msgstr ""
 "Activer le débogage. Les informations de débogage sont envoyées dans le "
 "I<E<lt>fichierE<gt>>."
 
 #. type: TP
-#: dselect.1:60
+#: dselect.1:52
 #, no-wrap
 msgid "B<--expert>"
 msgstr "B<--expert>"
 
 #. type: Plain text
-#: dselect.1:64
+#: dselect.1:56
 msgid ""
 "Turns on expert mode, i.e. doesn't display possibly annoying help messages."
 msgstr ""
@@ -15541,13 +16565,13 @@
 "ennuyeux."
 
 #. type: TP
-#: dselect.1:64
+#: dselect.1:56
 #, no-wrap
 msgid "B<--colour>|B<--color> I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]"
 msgstr "B<--colour>|B<--color> I<partie_écran:>[I<premier_plan>],[I<arrière_plan>][I<:attr>[I<+attr+..>]]"
 
 #. type: Plain text
-#: dselect.1:71
+#: dselect.1:63
 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>). "
@@ -15561,57 +16585,57 @@
 "parties de l'écran (de haut en bas) sont :"
 
 #. type: TP
-#: dselect.1:72
+#: dselect.1:64
 #, no-wrap
 msgid "B<title>"
 msgstr "B<title>"
 
 #. type: Plain text
-#: dselect.1:75
+#: dselect.1:67
 msgid "The screen title."
 msgstr "Le titre de l'écran."
 
 #. type: TP
-#: dselect.1:75
+#: dselect.1:67
 #, no-wrap
 msgid "B<listhead>"
 msgstr "B<listhead>"
 
 #. type: Plain text
-#: dselect.1:78
+#: dselect.1:70
 msgid "The header line above the list of packages."
 msgstr "La ligne d'en-tête au dessus de la liste de paquets."
 
 #. type: TP
-#: dselect.1:78
+#: dselect.1:70
 #, no-wrap
 msgid "B<list>"
 msgstr "B<list>"
 
 #. type: Plain text
-#: dselect.1:81
+#: dselect.1:73
 msgid "The scrolling list of packages (and also some help text)."
 msgstr "La liste déroulante de paquets (et de textes explicatifs)."
 
 #. type: TP
-#: dselect.1:81
+#: dselect.1:73
 #, no-wrap
 msgid "B<listsel>"
 msgstr "B<listsel>"
 
 #. type: Plain text
-#: dselect.1:84
+#: dselect.1:76
 msgid "The selected item in the list."
 msgstr "L'élément sélectionné dans la liste."
 
 #. type: TP
-#: dselect.1:84
+#: dselect.1:76
 #, no-wrap
 msgid "B<pkgstate>"
 msgstr "B<pkgstate>"
 
 #. type: Plain text
-#: dselect.1:88
+#: dselect.1:80
 msgid ""
 "In the list of packages, the text indicating the current state of each "
 "package."
@@ -15620,13 +16644,13 @@
 "paquet."
 
 #. type: TP
-#: dselect.1:88
+#: dselect.1:80
 #, no-wrap
 msgid "B<pkgstatesel>"
 msgstr "B<pkgstatesel>"
 
 #. type: Plain text
-#: dselect.1:92
+#: dselect.1:84
 msgid ""
 "In the list of packages, the text indicating the current state of the "
 "currently selected package."
@@ -15635,76 +16659,76 @@
 "sélectionné."
 
 #. type: TP
-#: dselect.1:92
+#: dselect.1:84
 #, no-wrap
 msgid "B<infohead>"
 msgstr "B<infohead>"
 
 #. type: Plain text
-#: dselect.1:95
+#: dselect.1:87
 msgid ""
 "The header line that displays the state of the currently selected package."
 msgstr "La ligne d'en-tête qui affiche l'état du paquet sélectionné."
 
 #. type: TP
-#: dselect.1:95
+#: dselect.1:87
 #, no-wrap
 msgid "B<infodesc>"
 msgstr "B<infodesc>"
 
 #. type: Plain text
-#: dselect.1:98
+#: dselect.1:90
 msgid "The package's short description."
 msgstr "La description courte du paquet."
 
 #. type: TP
-#: dselect.1:98
+#: dselect.1:90
 #, no-wrap
 msgid "B<info>"
 msgstr "B<info>"
 
 #. type: Plain text
-#: dselect.1:101
+#: dselect.1:93
 msgid "Used to display package info such as the package's description."
 msgstr ""
 "Utilisé pour afficher les informations sur le paquet, comme par exemple la "
 "description du paquet."
 
 #. type: TP
-#: dselect.1:101
+#: dselect.1:93
 #, no-wrap
 msgid "B<infofoot>"
 msgstr "B<infofoot>"
 
 #. type: Plain text
-#: dselect.1:104
+#: dselect.1:96
 msgid "The last line of the screen when selecting packages."
 msgstr "La dernière ligne de l'écran lors de la sélection des paquets."
 
 #. type: TP
-#: dselect.1:104
+#: dselect.1:96
 #, no-wrap
 msgid "B<query>"
 msgstr "B<query>"
 
 #. type: Plain text
-#: dselect.1:107
+#: dselect.1:99
 msgid "Used to display query lines"
 msgstr "Utilisé pour les lignes des recherches."
 
 #. type: TP
-#: dselect.1:107
+#: dselect.1:99
 #, no-wrap
 msgid "B<helpscreen>"
 msgstr "B<helpscreen>"
 
 #. type: Plain text
-#: dselect.1:110
+#: dselect.1:102
 msgid "Color of help screens."
 msgstr "La couleur des écrans d'aide."
 
 #. type: Plain text
-#: dselect.1:115
+#: dselect.1:107
 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, "
@@ -15716,7 +16740,7 @@
 "plan, ou les deux. Utilisez les noms standard de couleurs curses."
 
 #. type: Plain text
-#: dselect.1:121
+#: dselect.1:113
 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 "
@@ -15731,48 +16755,53 @@
 "normal, standout, underline, reverse, blink, bright, dim et bold."
 
 #. type: Plain text
-#: dselect.1:124
+#: dselect.1:116
 msgid "Print a brief help text and exit successfully."
 msgstr "Affiche une aide rapide et se termine normalement."
 
 #. type: Plain text
-#: dselect.1:127
+#: dselect.1:119
 msgid "Print version information and exit successfully."
 msgstr "Affiche la version et se termine normalement."
 
-#. type: SH
-#: dselect.1:128
-#, no-wrap
-msgid "USAGE"
-msgstr "UTILISATION"
-
 #. type: Plain text
-#: dselect.1:133
+#: dselect.1:126
+#, fuzzy
+#| msgid ""
+#| "When B<dselect> is started interactively, it prompts the user with a menu "
+#| "of available actions:"
 msgid ""
-"When B<dselect> is started interactively, it prompts the user with a menu of "
-"available actions:"
+"When B<dselect> is started it can perform the following actions, either "
+"directly if it was specified on the command line or by prompting the user "
+"with a menu of available actions if running interactively:"
 msgstr ""
 "Quand B<dselect> est démarré en mode interactif, un menu propose à "
 "l'utilisateur une liste d'actions :"
 
 #. type: SS
-#: dselect.1:133
+#: dselect.1:126
 #, no-wrap
 msgid "access"
 msgstr "Accéder (access)"
 
 #. type: Plain text
-#: dselect.1:135
+#: dselect.1:128
 msgid "Choose and configure an access method to access package repositories."
 msgstr "Choisir et configurer une méthode d'accès aux dépôts de paquets."
 
 #. type: Plain text
-#: dselect.1:141
-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."
+#: dselect.1:134
+#, 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."
+msgid ""
+"By default, B<dselect> provides several methods such as I<cdrom>, "
+"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount>, "
+"I<floppy> or I<ftp>, but other packages may provide additional methods, eg. "
+"the I<apt> access method provided by the B<apt> package."
 msgstr ""
 "Par défaut, B<dselect> fournit plusieurs méthodes telles que I<floppy> "
 "(disquette), I<harddisk> (disque dur) ou I<cdrom>, mais d'autres paquets "
@@ -15781,23 +16810,23 @@
 "B<dpkg-multicd>."
 
 #. type: Plain text
-#: dselect.1:143
+#: dselect.1:136
 msgid "The use of the I<apt> access method is strongly recommended."
 msgstr "L'utilisation de la méthode d'accès I<apt> est fortement conseillée."
 
 #. type: SS
-#: dselect.1:144
+#: dselect.1:137
 #, no-wrap
 msgid "update"
 msgstr "Mise à jour (update)"
 
 #. type: Plain text
-#: dselect.1:146
+#: dselect.1:139
 msgid "Refresh the available packages database."
 msgstr "Rafraîchir la liste des paquets disponibles."
 
 #. type: Plain text
-#: dselect.1:153
+#: dselect.1:146
 msgid ""
 "Retrieves a list of available package versions from the package repository, "
 "configured for the current access method, and update the dpkg database. The "
@@ -15813,7 +16842,7 @@
 "au programme B<dpkg-scanpackages>(1)."
 
 #. type: Plain text
-#: dselect.1:156
+#: dselect.1:149
 msgid ""
 "Details of the update action depend on the access method's implementation.  "
 "Normally the process is straightforward and requires no user interaction."
@@ -15823,18 +16852,18 @@
 "intervention de l'utilisateur."
 
 #. type: SS
-#: dselect.1:157
+#: dselect.1:150
 #, no-wrap
 msgid "select"
 msgstr "Sélectionner (select)"
 
 #. type: Plain text
-#: dselect.1:159
+#: dselect.1:152
 msgid "View or manage package selections and dependencies."
 msgstr "Voir ou gérer les paquets sélectionnés et les dépendances."
 
 #. type: Plain text
-#: dselect.1:165
+#: dselect.1:158
 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 "
@@ -15850,7 +16879,7 @@
 "vis des dépendances et des conflits entre paquets."
 
 #. type: Plain text
-#: dselect.1:172
+#: dselect.1:165
 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 "
@@ -15868,7 +16897,7 @@
 "qui ont créé les conflits ou dépendances non résolues."
 
 #. type: Plain text
-#: dselect.1:175
+#: dselect.1:168
 msgid ""
 "The use of the interactive package selections management screen is explained "
 "in more detail below."
@@ -15877,18 +16906,18 @@
 "de façon plus détaillée ci-dessous."
 
 #. type: SS
-#: dselect.1:176
+#: dselect.1:169
 #, no-wrap
 msgid "install"
 msgstr "Installer (install)"
 
 #. type: Plain text
-#: dselect.1:178
+#: dselect.1:171
 msgid "Installs selected packages."
 msgstr "Installer les paquets sélectionnés."
 
 #. type: Plain text
-#: dselect.1:184
+#: dselect.1:177
 msgid ""
 "The configured access method will fetch installable or upgradable packages "
 "from the relevant repositories and install these using B<dpkg>.  Depending "
@@ -15903,7 +16932,7 @@
 "paquets qui ont été marqués pour être retirés."
 
 #. type: Plain text
-#: dselect.1:192
+#: dselect.1:185
 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 "
@@ -15923,7 +16952,7 @@
 "B<reportbug>(1), si ce paquet est installé."
 
 #. type: Plain text
-#: dselect.1:199
+#: dselect.1:192
 msgid ""
 "Details of the install action depend on the access method's implementation.  "
 "The user's attention and input may be required during installation, "
@@ -15939,60 +16968,60 @@
 "d'installations plus flexibles ou même automatisées."
 
 #. type: SS
-#: dselect.1:200
+#: dselect.1:193
 #, no-wrap
 msgid "config"
 msgstr "Configurer (config)"
 
 #. type: Plain text
-#: dselect.1:202
+#: dselect.1:195
 msgid "Configures any previously installed, but not fully configured packages."
 msgstr ""
 "Configure les paquets déjà installés mais n'étant pas complètement installés."
 
 #. type: SS
-#: dselect.1:203
+#: dselect.1:196
 #, no-wrap
 msgid "remove"
 msgstr "Retirer (remove)"
 
 #. type: Plain text
-#: dselect.1:205
+#: dselect.1:198
 msgid "Removes or purges installed packages, that are marked for removal."
 msgstr ""
 "Retirer ou purger les paquets installés qui sont marqués comme étant à "
 "retirer."
 
 #. type: SS
-#: dselect.1:206
+#: dselect.1:199
 #, no-wrap
 msgid "quit"
 msgstr "Quitter (quit)"
 
 #. type: Plain text
-#: dselect.1:208
+#: dselect.1:201
 msgid "Quit B<dselect>"
 msgstr "Quitter B<dselect>"
 
 #. type: Plain text
-#: dselect.1:210
+#: dselect.1:203
 msgid "Exits the program with zero (successful) errorcode."
 msgstr "Quitte le programme avec un code d'erreur de 0 (succès)."
 
 #. type: SH
-#: dselect.1:212
+#: dselect.1:205
 #, no-wrap
 msgid "Package selections management"
 msgstr "Gestion des sélections de paquets"
 
 #. type: SS
-#: dselect.1:214
+#: dselect.1:207
 #, no-wrap
 msgid "Introduction"
 msgstr "Introduction"
 
 #. type: Plain text
-#: dselect.1:230
+#: dselect.1:223
 msgid ""
 "B<dselect> directly exposes the administrator to some of the complexities "
 "involved with managing large sets of packages with many interdependencies. "
@@ -16017,7 +17046,7 @@
 "policy>."
 
 #. type: Plain text
-#: dselect.1:236
+#: dselect.1:229
 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> "
@@ -16032,13 +17061,13 @@
 "d'aide peuvent être affichés à tout moment à l'aide de la touche « B<?> »."
 
 #. type: SS
-#: dselect.1:237
+#: dselect.1:230
 #, no-wrap
 msgid "Screen layout"
 msgstr "Disposition de l'écran"
 
 #. type: Plain text
-#: dselect.1:245
+#: dselect.1:238
 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 "
@@ -16055,7 +17084,7 @@
 "Le type de détail affiché peut varier."
 
 #. type: Plain text
-#: dselect.1:248
+#: dselect.1:241
 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."
@@ -16065,13 +17094,13 @@
 "paquets ou à un mode partagé équitablement."
 
 #. type: SS
-#: dselect.1:249
+#: dselect.1:242
 #, no-wrap
 msgid "Package details view"
 msgstr "Vue des détails d'un paquet"
 
 #. type: Plain text
-#: dselect.1:258
+#: dselect.1:251
 #, no-wrap
 msgid ""
 "The package details view by default shows the extended package description\n"
@@ -16088,7 +17117,7 @@
 " - les informations de contrôle de la version disponible\n"
 
 #. type: Plain text
-#: dselect.1:262
+#: dselect.1:255
 msgid ""
 "In a dependency resolution screen, there is also the possibility of viewing "
 "the specific unresolved depends or conflicts related to the package and "
@@ -16099,13 +17128,13 @@
 "du paquet dans la liste."
 
 #. type: SS
-#: dselect.1:263
+#: dselect.1:256
 #, no-wrap
 msgid "Packages status list"
 msgstr "Liste des états des paquets"
 
 #. type: Plain text
-#: dselect.1:268
+#: dselect.1:261
 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 "
@@ -16117,7 +17146,7 @@
 "paquets disponibles."
 
 #. type: Plain text
-#: dselect.1:276
+#: dselect.1:269
 msgid ""
 "For every package, the list shows the package's status, priority, section, "
 "installed and available versions, the package name and its short "
@@ -16134,7 +17163,7 @@
 "verbeux à un mode raccourci. Par défaut, l'état raccourci est utilisé."
 
 #. type: Plain text
-#: dselect.1:282
+#: dselect.1:275
 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 "
@@ -16148,7 +17177,7 @@
 "l'utilisateur."
 
 #. type: Plain text
-#: dselect.1:300
+#: dselect.1:293
 #, no-wrap
 msgid ""
 "These are the meanings of the shorthand package status indicator codes:\n"
@@ -16188,13 +17217,13 @@
 "  B<n>       nouveau paquet, n'a toujours pas été marqué.\n"
 
 #. type: SS
-#: dselect.1:301
+#: dselect.1:294
 #, no-wrap
 msgid "Cursor and screen movement"
 msgstr "Déplacement du curseur et de l'écran"
 
 #. type: Plain text
-#: dselect.1:306
+#: dselect.1:299
 msgid ""
 "The package selection list and the dependency conflict resolution screens "
 "can be navigated using motion commands mapped to the following keys:"
@@ -16204,7 +17233,7 @@
 "suivantes :"
 
 #. type: Plain text
-#: dselect.1:323
+#: dselect.1:316
 #, no-wrap
 msgid ""
 "  B<p, Up, k>           move cursor bar up\n"
@@ -16242,13 +17271,13 @@
 "  B<^f>                     déplace l'affichage d'un caractère vers la droite\n"
 
 #. type: SS
-#: dselect.1:324
+#: dselect.1:317
 #, no-wrap
 msgid "Searching and sorting"
 msgstr "Recherches et tris"
 
 #. type: Plain text
-#: dselect.1:338
+#: dselect.1:331
 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 "
@@ -16271,7 +17300,7 @@
 "atteint la fin de la liste, elle recommence au début."
 
 #. type: Plain text
-#: dselect.1:345
+#: dselect.1:338
 #, no-wrap
 msgid ""
 "The list sort order can be varied by pressing\n"
@@ -16287,7 +17316,7 @@
 " section+priorité  disponible+section   état+section\n"
 
 #. type: Plain text
-#: dselect.1:348
+#: dselect.1:341
 msgid ""
 "Where not listed above explicitly, alphabetic order is used as the final "
 "subordering sort key."
@@ -16296,13 +17325,13 @@
 "critère de tri."
 
 #. type: SS
-#: dselect.1:349
+#: dselect.1:342
 #, no-wrap
 msgid "Altering selections"
 msgstr "Modifier les sélections"
 
 #. type: Plain text
-#: dselect.1:358
+#: dselect.1:351
 #, no-wrap
 msgid ""
 "The requested selection state of individual packages may be\n"
@@ -16321,7 +17350,7 @@
 "  B<_>            retirer et supprimer la configuration\n"
 
 #. type: Plain text
-#: dselect.1:362
+#: dselect.1:355
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -16332,7 +17361,7 @@
 "des dépendances. Ceci sera décrit plus tard."
 
 #. type: Plain text
-#: dselect.1:367
+#: dselect.1:360
 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 "
@@ -16344,7 +17373,7 @@
 "la liste."
 
 #. type: Plain text
-#: dselect.1:373
+#: dselect.1:366
 msgid ""
 "Proper care should be taken when altering large groups of selections, "
 "because this can instantaneously create large numbers of unresolved depends "
@@ -16360,13 +17389,13 @@
 "garder » sont utiles pour les groupes."
 
 #. type: SS
-#: dselect.1:374
+#: dselect.1:367
 #, no-wrap
 msgid "Resolving depends and conflicts"
 msgstr "Résoudre les dépendances et les conflits"
 
 #. type: Plain text
-#: dselect.1:379
+#: dselect.1:372
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -16378,7 +17407,7 @@
 "temps."
 
 #. type: Plain text
-#: dselect.1:386
+#: dselect.1:379
 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 "
@@ -16395,7 +17424,7 @@
 "paquet sélectionné se trouve présent dans la liste."
 
 #. type: Plain text
-#: dselect.1:392
+#: dselect.1:385
 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, "
@@ -16410,7 +17439,7 @@
 "recommandé de suivre les suggestions de B<dselect>."
 
 #. type: Plain text
-#: dselect.1:400
+#: dselect.1:393
 msgid ""
 "The listed packages' selection state may be reverted to the original "
 "settings, as they were before the unresolved depends or conflicts were "
@@ -16427,13 +17456,13 @@
 "touche « B<U> » permet de rétablir les suggestions automatiques."
 
 #. type: SS
-#: dselect.1:401
+#: dselect.1:394
 #, no-wrap
 msgid "Establishing the requested selections"
 msgstr "Établir les sélections demandées"
 
 #. type: Plain text
-#: dselect.1:408
+#: dselect.1:401
 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 "
@@ -16448,7 +17477,7 @@
 "écran de résolution des dépendances."
 
 #. type: Plain text
-#: dselect.1:414
+#: dselect.1:407
 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 "
@@ -16462,7 +17491,7 @@
 "avez bien lu ce qu'il y a d'écrit."
 
 #. type: Plain text
-#: dselect.1:421
+#: dselect.1:414
 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 "
@@ -16476,7 +17505,7 @@
 "on peut complètement revenir à la dernière configuration établie."
 
 #. type: Plain text
-#: dselect.1:428
+#: dselect.1:421
 msgid ""
 "If you mistakenly establish some settings and wish to revert all the "
 "selections to what is currently installed on the system, press the B<'C'> "
@@ -16492,7 +17521,7 @@
 "accidentellement."
 
 #. type: Plain text
-#: dselect.1:435
+#: dselect.1:428
 msgid ""
 "If set, B<dselect> will use it as the directory from which to read the user "
 "specific configuration file."
@@ -16501,7 +17530,7 @@
 "le fichier de configuration propre à l'utilisateur."
 
 #. type: Plain text
-#: dselect.1:441
+#: dselect.1:434
 msgid ""
 "The B<dselect> package selection interface is confusing to some new users.  "
 "Reportedly, it even makes seasoned kernel developers cry."
@@ -16512,22 +17541,22 @@
 "dinosaures qui s'en servent encore)."
 
 #. type: Plain text
-#: dselect.1:443
+#: dselect.1:436
 msgid "The documentation is lacking."
 msgstr "La documentation manque."
 
 #. type: Plain text
-#: dselect.1:445
+#: dselect.1:438
 msgid "There is no help option in the main menu."
 msgstr "Il n'existe pas d'option d'aide dans le menu."
 
 #. type: Plain text
-#: dselect.1:447
+#: dselect.1:440
 msgid "The visible list of available packages cannot be reduced."
 msgstr "La liste visible des paquets disponibles ne peut pas être réduite."
 
 #. type: Plain text
-#: dselect.1:451
+#: dselect.1:444
 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, "
@@ -16539,12 +17568,12 @@
 "intégrée."
 
 #. type: Plain text
-#: dselect.1:457
+#: dselect.1:450
 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:462
+#: dselect.1:455
 msgid ""
 "B<dselect> was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list "
 "of contributors may be found in 'dselect --version'."
@@ -16553,7 +17582,7 @@
 "complète des contributeurs est affichée par « dselect --version »."
 
 #. type: Plain text
-#: dselect.1:465
+#: dselect.1:458
 msgid ""
 "This manual page was written by Juho Vuori E<lt>javuori@cc.helsinki.fiE<gt>, "
 "Josip Rodin and Joost kooij."
@@ -16567,6 +17596,13 @@
 msgid "dselect.cfg"
 msgstr "dselect.cfg"
 
+#. type: TH
+#: dselect.cfg.5:1
+#, fuzzy, no-wrap
+#| msgid "2009-02-27"
+msgid "2011-07-03"
+msgstr "27-02-2009"
+
 #. type: Plain text
 #: dselect.cfg.5:4
 msgid "dselect.cfg - dselect configuration file"
@@ -16574,9 +17610,16 @@
 
 #. type: Plain text
 #: dselect.cfg.5:11
+#, fuzzy
+#| 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. Quotes "
+#| "surrounding option values are stripped. Comments are allowed by starting "
+#| "a line with a hash sign (\"B<#>\")."
 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 "
+"option which is exactly the same as a normal command line option for dselect "
 "except for the leading dashes which are not used here. Quotes surrounding "
 "option values are stripped. Comments are allowed by starting a line with a "
 "hash sign (\"B<#>\")."
@@ -16628,12 +17671,14 @@
 msgstr "start-stop-daemon - lance ou arrête des démons système"
 
 #. type: Plain text
-#: start-stop-daemon.8:9
-msgid "B<start-stop-daemon> [I<options>] I<command>"
+#: start-stop-daemon.8:8
+#, fuzzy
+#| msgid "B<start-stop-daemon> [I<options>] I<command>"
+msgid "B<start-stop-daemon> [I<option>...] I<command>"
 msgstr "B<start-stop-daemon> [I<options>] I<commande>"
 
 #. type: Plain text
-#: start-stop-daemon.8:15
+#: start-stop-daemon.8:14
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
 "system-level processes.  Using one of the matching options, B<start-stop-"
@@ -16645,7 +17690,7 @@
 "processus en fonctionnement."
 
 #. type: Plain text
-#: start-stop-daemon.8:34
+#: start-stop-daemon.8:33
 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 "
@@ -16666,13 +17711,13 @@
 "nécessaired'indiquer un fichier pid (« pidfile »)."
 
 #. type: TP
-#: start-stop-daemon.8:36
+#: start-stop-daemon.8:35
 #, no-wrap
 msgid "B<-S>, B<--start> [B<-->] I<arguments>"
 msgstr "B<-S>, B<--start> [B<-->] I<paramètres>"
 
 #. type: Plain text
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 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<--"
@@ -16690,13 +17735,13 @@
 "tel quel au programme qui doit être lancé."
 
 #. type: TP
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 #, no-wrap
 msgid "B<-K>, B<--stop>"
 msgstr "B<-K>, B<--stop>"
 
 #. type: Plain text
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
 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 "
@@ -16713,53 +17758,67 @@
 "daemon> recherche si le processus ou les processus se sont bien terminés."
 
 #. type: TP
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
+#, fuzzy, no-wrap
+#| msgid "B<-K>, B<--stop>"
+msgid "B<-T>, B<--status>"
+msgstr "B<-K>, B<--stop>"
+
+#. type: Plain text
+#: start-stop-daemon.8:74
+msgid ""
+"Check for the existence of a specified process, and returns an exit status "
+"code, according to the LSB Init Script Actions."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:74
 #, no-wrap
 msgid "B<-H>, B<--help>"
 msgstr "B<-H>, B<--help>"
 
 #. type: Plain text
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 msgid "Show usage information and exit."
 msgstr "Affiche un message d'aide, puis quitte."
 
 #. type: TP
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 #, no-wrap
 msgid "B<-V>, B<--version>"
 msgstr "B<-V>, B<--version>"
 
 #. type: Plain text
-#: start-stop-daemon.8:77
+#: start-stop-daemon.8:80
 msgid "Show the program version and exit."
 msgstr "Affiche la version du programme et le copyright, puis quitte."
 
 #. type: SH
-#: start-stop-daemon.8:78
+#: start-stop-daemon.8:81
 #, no-wrap
 msgid "MATCHING OPTIONS"
 msgstr "OPTIONS DE CORRESPONDANCE"
 
 #. type: TP
-#: start-stop-daemon.8:79
+#: start-stop-daemon.8:82
 #, 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:83
+#: start-stop-daemon.8:86
 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:83
+#: start-stop-daemon.8:86
 #, no-wrap
 msgid "B<-x>, B<--exec> I<executable>"
 msgstr "B<-x>, B<--exec> I<exécutable>"
 
 #. type: Plain text
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
@@ -16768,13 +17827,13 @@
 "proc/>I<pid>B</exe>)."
 
 #. type: TP
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 #, no-wrap
 msgid "B<-n>, B<--name> I<process-name>"
 msgstr "B<-n>, B<--name> I<nomdeprocessus>"
 
 #. type: Plain text
-#: start-stop-daemon.8:93
+#: start-stop-daemon.8:96
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
@@ -16783,13 +17842,13 @@
 ">I<pid>B</stat>)."
 
 #. type: TP
-#: start-stop-daemon.8:93
+#: start-stop-daemon.8:96
 #, 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:99
+#: start-stop-daemon.8:102
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
@@ -16797,24 +17856,24 @@
 "I<nomdutilisateur> ou I<uid.>"
 
 #. type: TP
-#: start-stop-daemon.8:101
+#: start-stop-daemon.8:104
 #, 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:104
+#: start-stop-daemon.8:107
 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:104
+#: start-stop-daemon.8:107
 #, 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:112
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default TERM)."
@@ -16823,13 +17882,13 @@
 "arrêté (par défaut : TERM)."
 
 #. type: TP
-#: start-stop-daemon.8:109
+#: start-stop-daemon.8:112
 #, 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:119
+#: start-stop-daemon.8:122
 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 "
@@ -16843,7 +17902,7 @@
 "l'action-prévue."
 
 #. type: Plain text
-#: start-stop-daemon.8:130
+#: start-stop-daemon.8:133
 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 "
@@ -16854,7 +17913,7 @@
 "signal indiqué par B<--signal>."
 
 #. type: Plain text
-#: start-stop-daemon.8:146
+#: start-stop-daemon.8:149
 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 "
@@ -16870,7 +17929,7 @@
 "répéter constamment le reste de action-prévue, si nécessaire."
 
 #. type: Plain text
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 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, "
@@ -16882,13 +17941,13 @@
 "ignoré."
 
 #. type: TP
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 #, no-wrap
 msgid "B<-a>, B<--startas> I<pathname>"
 msgstr "I<-a>, B<--startas> I<chemin/nom>"
 
 #. type: Plain text
-#: start-stop-daemon.8:164
+#: start-stop-daemon.8:167
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
@@ -16897,13 +17956,13 @@
 "rien n'est précisé, c'est par défaut l'argument donné à B<--exec.>"
 
 #. type: TP
-#: start-stop-daemon.8:164
+#: start-stop-daemon.8:167
 #, no-wrap
 msgid "B<-t>, B<--test>"
 msgstr "B<-t>, B<--test>"
 
 #. type: Plain text
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
@@ -16912,39 +17971,40 @@
 "retour, mais ne fait rien."
 
 #. type: TP
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 #, no-wrap
 msgid "B<-o>, B<--oknodo>"
 msgstr "B<-o>, B<--oknodo>"
 
 #. type: Plain text
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 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:171
+#: start-stop-daemon.8:174
 #, no-wrap
 msgid "B<-q>, B<--quiet>"
 msgstr "B<-q>, B<--quiet>"
 
 #. type: Plain text
-#: start-stop-daemon.8:174
+#: start-stop-daemon.8:177
 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:174
-#, no-wrap
-msgid "B<-c>, B<--chuid> I<username>|I<uid>"
+#: start-stop-daemon.8:177
+#, fuzzy, no-wrap
+#| msgid "B<-c>, B<--chuid> I<username>|I<uid>"
+msgid "B<-c>, B<--chuid> I<username>|I<uid>[B<:>I<group>|I<gid>]"
 msgstr "B<-c>, B<--chuid> I<utilisateur>|I<uid>"
 
 #. type: Plain text
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 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 "
@@ -16967,13 +18027,13 @@
 "utilisateurs génériques comme B<nobody>)."
 
 #. type: TP
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 #, no-wrap
 msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<-r>, B<--chroot> I<root>"
 
 #. type: Plain text
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
@@ -16982,13 +18042,13 @@
 "Remarquez que le « pidfile » est aussi écrit après le changement de racine."
 
 #. type: TP
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 #, no-wrap
 msgid "B<-d>, B<--chdir> I<path>"
 msgstr "B<-d>, B<--chdir> I<path>"
 
 #. type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 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-"
@@ -17000,13 +18060,13 @@
 "répertoire racine avant de commencer le processus."
 
 #. type: TP
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 #, no-wrap
 msgid "B<-b>, B<--background>"
 msgstr "B<-b>, B<--background>"
 
 #. type: Plain text
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 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 "
@@ -17026,24 +18086,24 @@
 "adaptable pour leur ajouter cette fonctionnalité."
 
 #. type: TP
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 #, no-wrap
 msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr "B<-N>, B<--nicelevel> I<int>"
 
 #. type: Plain text
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 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:221
+#: start-stop-daemon.8:224
 #, no-wrap
 msgid "B<-P>, B<--procsched> I<policy>B<:>I<priority>"
 msgstr "B<-P>, B<--procsched> I<politique>B<:>I<priorité>"
 
 #. type: Plain text
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 msgid ""
 "This alters the process scheduler policy and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -17057,13 +18117,13 @@
 "gérées sont B<other>, B<fifo> et B<rr>."
 
 #. type: TP
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 #, no-wrap
 msgid "B<-I>, B<--iosched> I<class>B<:>I<priority>"
 msgstr "B<-I>, B<--iosched> I<classe>B<:>I<priorité>"
 
 #. type: Plain text
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 msgid ""
 "This alters the IO scheduler class and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -17079,25 +18139,25 @@
 "gérées sont B<idle>, B<best-effort> et B<real-time>."
 
 #. type: TP
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 #, no-wrap
 msgid "B<-k>, B<--umask> I<mask>"
 msgstr "B<-k>, B<--umask> I<mask>"
 
 #. type: Plain text
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 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:237
+#: start-stop-daemon.8:240
 #, no-wrap
 msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-m>, B<--make-pidfile>"
 
 #. type: Plain text
-#: start-stop-daemon.8:252
+#: start-stop-daemon.8:255
 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<--"
@@ -17116,39 +18176,77 @@
 "programme qui est exécuté se duplique. À cause de cela, cette option n'est "
 "habituellement utile que combinée avec l'option B<--background>."
 
+#. type: Plain text
+#: start-stop-daemon.8:258
+msgid "Print verbose informational messages."
+msgstr "Affiche des messages prolixes en renseignements."
+
+#. type: Plain text
+#: start-stop-daemon.8:270
+msgid ""
+"The requested action was performed. If B<--oknodo> was specified, it's also "
+"possible that nothing had to be done.  This can happen when B<--start> was "
+"specified and a matching process was already running, or when B<--stop> was "
+"specified and there were no matching processes."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:275
+msgid "If B<--oknodo> was not specified and nothing was done."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:283
+msgid ""
+"If B<--stop> and B<--retry> were specified, but the end of the schedule was "
+"reached and the processes were still running."
+msgstr ""
+
 #. type: TP
-#: start-stop-daemon.8:252
+#: start-stop-daemon.8:283 start-stop-daemon.8:295
 #, no-wrap
-msgid "B<-v>, B<--verbose>"
-msgstr "B<-v>, B<--verbose>"
+msgid "B<3>"
+msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:255
-msgid "Print verbose informational messages."
-msgstr "Affiche des messages prolixes en renseignements."
+#: start-stop-daemon.8:286
+msgid "Any other error."
+msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:272
+#: start-stop-daemon.8:289
 msgid ""
-"B<start-stop-daemon> returns 0 if the requested action was performed, or if "
-"B<--oknodo> is specified and either B<--start> was specified and a matching "
-"process was already running, or B<--stop> was specified and there were no "
-"matching processes. If B<--oknodo> was not specified and nothing was done, 1 "
-"is returned. If B<--stop> and B<--retry> were specified, but the end of the "
-"schedule was reached and the processes were still running, the error value "
-"is 2. For all other errors, the status is 3."
-msgstr ""
-"B<start-stop-daemon> renvoie 0 si l'action demandée a été effectuée, ou si "
-"B<--oknodo> est spécifié et aussi si B<--start> a été spécifié et qu'un "
-"processus de comparaison est déjà en cours d'exécution, ou si B<--stop> a "
-"été spécifié et qu'il n'y avait pas de processus correspondant. Si B<--"
-"oknodo> n'a pas été spécifié et rien n'a été fait, alors 1 est retourné. Si "
-"B<--stop> et B<--retry> ont été précisés, mais que l'ordonnanceur a atteint "
-"la fin du calendrier en ayant toujours le processus en cours d'exécution, la "
-"valeur d'erreur est 2. Pour toutes les autres erreurs, l'état est 3."
+"When using the B<--status> command, the following status codes are returned:"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:292
+msgid "Program is running."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:295
+msgid "Program is not running and the pid file exists."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:298
+msgid "Program is not running."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:298
+#, no-wrap
+msgid "B<4>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:301
+msgid "Unable to determine program status."
+msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:276
+#: start-stop-daemon.8:305
 msgid ""
 "Start the B<food> daemon, unless one is already running (a process named "
 "food, running as user food, with pid in food.pid):"
@@ -17158,36 +18256,36 @@
 "pid dans food.pid) :"
 
 #. type: Plain text
-#: start-stop-daemon.8:279
+#: start-stop-daemon.8:308
 #, no-wrap
 msgid "start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon\n"
 msgstr "start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:282
+#: start-stop-daemon.8:311
 msgid "Send B<SIGTERM> to B<food> and wait up to 5 seconds for it to stop:"
 msgstr ""
 "Envoie le signal B<SIGTERM> à B<food> et attend durant 5 secondes son arrêt :"
 
 #. type: Plain text
-#: start-stop-daemon.8:285
+#: start-stop-daemon.8:314
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5\n"
 msgstr "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:288
+#: start-stop-daemon.8:317
 msgid "Demonstration of a custom schedule for stopping B<food>:"
 msgstr "Démonstration d'un ordonnanceur personnalisé pour l'arrêt de B<food> :"
 
 #. type: Plain text
-#: start-stop-daemon.8:291
+#: start-stop-daemon.8:320
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5\n"
 msgstr "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:297
+#: start-stop-daemon.8:326
 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>."
@@ -17196,7 +18294,7 @@
 "d'une version faite par Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 
 #. type: Plain text
-#: start-stop-daemon.8:299
+#: start-stop-daemon.8:328
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -17219,12 +18317,14 @@
 "par défaut de certaines commandes"
 
 #. type: Plain text
-#: update-alternatives.8:16
-msgid "B<update-alternatives> [I<options>] I<command>"
+#: update-alternatives.8:15
+#, fuzzy
+#| msgid "B<update-alternatives> [I<options>] I<command>"
+msgid "B<update-alternatives> [I<option>...] I<command>"
 msgstr "B<update-alternatives> [I<options>] I<commande>"
 
 #. type: Plain text
-#: update-alternatives.8:21
+#: update-alternatives.8:20
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
@@ -17234,7 +18334,7 @@
 "« alternatives »."
 
 #. type: Plain text
-#: update-alternatives.8:29
+#: update-alternatives.8:28
 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 "
@@ -17252,7 +18352,7 @@
 "l'utilisateur n'a pas fait de choix précis."
 
 #. type: Plain text
-#: update-alternatives.8:51
+#: update-alternatives.8:50
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -17278,7 +18378,7 @@
 "explicitement de le faire."
 
 #. type: Plain text
-#: update-alternatives.8:61
+#: update-alternatives.8:60
 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> "
@@ -17295,7 +18395,7 @@
 "le FHS (lisez-le) donne de Bonnes Raisons de faire ainsi."
 
 #. type: Plain text
-#: update-alternatives.8:73
+#: update-alternatives.8:72
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -17310,7 +18410,7 @@
 "scripts B<postinst> (configure) et B<prerm> (install) des paquets Debian."
 
 #. type: Plain text
-#: update-alternatives.8:92
+#: update-alternatives.8:91
 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>"
@@ -17330,7 +18430,7 @@
 "secondaires associés composent un I<groupe> de I<liens.>"
 
 #. type: Plain text
-#: update-alternatives.8:101
+#: 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 "
@@ -17348,7 +18448,7 @@
 "(sauf si quelque chose est cassé)."
 
 #. type: Plain text
-#: update-alternatives.8:110
+#: 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 "
@@ -17363,7 +18463,7 @@
 "groupe en mode manuel."
 
 #. type: Plain text
-#: update-alternatives.8:117
+#: 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 "
@@ -17374,15 +18474,24 @@
 "celle qui possède la priorité la plus élevée."
 
 #. type: Plain text
-#: update-alternatives.8:134
+#: update-alternatives.8:133
+#, 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 "
+#| "alternative name. The current choice is marked with a '*'.  You will then "
+#| "be prompted for your choice regarding this link group.  Depending on the "
+#| "choice made, the link group might no longer be in I<auto> mode. You will "
+#| "need to use the I<--auto> option in order to return to the automatic mode "
+#| "(or you can rerun I<--config> and select the entry marked as automatic)."
 msgid ""
-"When using the I<--config> option, B<update-alternatives> will list all of "
+"When using the B<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master "
 "alternative name. The current choice is marked with a '*'.  You will then be "
 "prompted for your choice regarding this link group.  Depending on the choice "
 "made, the link group might no longer be in I<auto> mode. You will need to "
-"use the I<--auto> option in order to return to the automatic mode (or you "
-"can rerun I<--config> and select the entry marked as automatic)."
+"use the B<--auto> option in order to return to the automatic mode (or you "
+"can rerun B<--config> and select the entry marked as automatic)."
 msgstr ""
 "Quand l'option I<--config> est utilisée, B<update-alternatives> affiche "
 "toutes les possibilités du groupe pour lequel I<nom> est le lien principal. "
@@ -17393,16 +18502,20 @@
 "l'entrée marquée comme automatique)."
 
 #. type: Plain text
-#: update-alternatives.8:138
+#: update-alternatives.8:137
+#, fuzzy
+#| msgid ""
+#| "If you want to configure non-interactively you can use the I<--set> "
+#| "option instead (see below)."
 msgid ""
-"If you want to configure non-interactively you can use the I<--set> option "
+"If you want to configure non-interactively you can use the B<--set> option "
 "instead (see below)."
 msgstr ""
 "Si vous voulez configurer de manière non interactive, vous pouvez utiliser "
 "l'option I<--set> (voyez ci-dessous)."
 
 #. type: Plain text
-#: update-alternatives.8:149
+#: update-alternatives.8:148
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "In other words, the usage of B<update-alternatives> is B<mandatory> for all "
@@ -17416,13 +18529,13 @@
 "mécanisme offert par B<update-alternatives>."
 
 #. type: SH
-#: update-alternatives.8:150
+#: update-alternatives.8:149
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr "TERMINOLOGIE"
 
 #. type: Plain text
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
@@ -17431,13 +18544,13 @@
 "quelques termes qui faciliteront l'explication."
 
 #. type: TP
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 #, no-wrap
 msgid "generic name (or alternative link)"
 msgstr "nom générique (ou lien alternatif)"
 
 #. type: Plain text
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
 "to one of a number of files of similar function."
@@ -17447,24 +18560,24 @@
 "fonctions similaires."
 
 #. type: TP
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 #, no-wrap
 msgid "alternative name"
 msgstr "nom alternatif"
 
 #. type: Plain text
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 msgid "The name of a symbolic link in the alternatives directory."
 msgstr "Nom d'un lien symbolique dans le répertoire des alternatives."
 
 #. type: TP
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 #, no-wrap
 msgid "alternative (or alternative path)"
 msgstr "alternative (ou chemin alternatif)"
 
 #. type: Plain text
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 msgid ""
 "The name of a specific file in the filesystem, which may be made accessible "
 "via a generic name using the alternatives system."
@@ -17473,26 +18586,26 @@
 "accessible avec un nom génériques grâce au système d'alternatives."
 
 #. type: TP
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 #, no-wrap
 msgid "alternatives directory"
 msgstr "répertoire des alternatives "
 
 #. type: Plain text
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 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:173
+#: update-alternatives.8:172
 #, no-wrap
 msgid "administrative directory"
 msgstr "répertoire administratif"
 
 #. type: Plain text
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
 "alternatives>' state information."
@@ -17501,26 +18614,26 @@
 "alternatives.> Il s'agit par défaut de I</var/lib/dpkg/alternatives.>"
 
 #. type: TP
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 #, no-wrap
 msgid "link group"
 msgstr "groupe de liens"
 
 #. type: Plain text
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 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:183
+#: update-alternatives.8:182
 #, no-wrap
 msgid "master link"
 msgstr "lien principal"
 
 #. type: Plain text
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 msgid ""
 "The alternative link in a link group which determines how the other links in "
 "the group are configured."
@@ -17529,13 +18642,13 @@
 "comment sont configurés les autres liens du groupe."
 
 #. type: TP
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 #, no-wrap
 msgid "slave link"
 msgstr "lien secondaire (« slave »)"
 
 #. type: Plain text
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 msgid ""
 "An alternative link in a link group which is controlled by the setting of "
 "the master link."
@@ -17544,13 +18657,13 @@
 "principal."
 
 #. type: TP
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 #, no-wrap
 msgid "automatic mode"
 msgstr "mode automatique"
 
 #. type: Plain text
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 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 "
@@ -17561,13 +18674,13 @@
 "l'alternative possédant la priorité la plus élevée dans ce groupe."
 
 #. type: TP
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 #, no-wrap
 msgid "manual mode"
 msgstr "mode manuel "
 
 #. type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:201
 msgid ""
 "When a link group is in manual mode, the alternatives system will not make "
 "any changes to the system administrator's settings."
@@ -17576,13 +18689,13 @@
 "ne modifie pas le paramétrage de l'administrateur système."
 
 #. type: TP
-#: update-alternatives.8:204
+#: update-alternatives.8:203
 #, no-wrap
 msgid "B<--install> I<link name path priority> [B<--slave> I<link name path>]..."
 msgstr "B<--install> I<lien nom chemin priorité> [B<--slave> I<lien nom chemin>]..."
 
 #. type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:222
 msgid ""
 "Add a group of alternatives to the system.  I<link> is the generic name for "
 "the master link, I<name> is the name of its symlink in the alternatives "
@@ -17609,7 +18722,7 @@
 "conservé sauf si B<--force> est utilisé."
 
 #. type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 msgid ""
 "If the alternative name specified exists already in the alternatives "
 "system's records, the information supplied will be added as a new set of "
@@ -17629,29 +18742,33 @@
 "vers les alternatives nouvellement ajoutées."
 
 #. type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr "B<--set> I<nom chemin>"
 
 #. type: Plain text
-#: update-alternatives.8:243
+#: update-alternatives.8:242
+#, 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."
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
-"I<--config> but is non-interactive and thus scriptable."
+"B<--config> but is non-interactive and thus scriptable."
 msgstr ""
 "Ajoute le programme I<chemin> comme alternative pour I<nom>. C'est "
 "équivalent à I<--config> mais ce n'est pas interactif et on peut donc écrire "
 "un script."
 
 #. type: TP
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr "B<--remove> I<nom chemin>"
 
 #. type: Plain text
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 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 "
@@ -17672,13 +18789,13 @@
 "l'alternative sont supprimées."
 
 #. type: TP
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr "B<--remove-all> I<nom>"
 
 #. type: Plain text
-#: update-alternatives.8:269
+#: update-alternatives.8:268
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
@@ -17687,7 +18804,7 @@
 "I<nom> est un nom dans le répertoire des alternatives."
 
 #. type: Plain text
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 msgid ""
 "Call B<--config> on all alternatives. It can be usefully combined with B<--"
 "skip-auto> to review and configure all alternatives which are not configured "
@@ -17703,13 +18820,13 @@
 "--force --all>."
 
 #. type: TP
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 #, no-wrap
 msgid "B<--auto> I<name>"
 msgstr "B<--auto> I<nom>"
 
 #. type: Plain text
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 msgid ""
 "Switch the link group behind the alternative for I<name> to automatic mode.  "
 "In the process, the master symlink and its slaves are updated to point to "
@@ -17720,13 +18837,13 @@
 "et pointent vers les alternatives avec les priorités les plus élevées."
 
 #. type: TP
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 #, no-wrap
 msgid "B<--display> I<name>"
 msgstr "B<--display> I<nom>"
 
 #. type: Plain text
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 msgid ""
 "Display information about the link group.  Information displayed includes "
 "the group's mode (auto or manual), which alternative the master link "
@@ -17741,13 +18858,13 @@
 "qui possède la priorité la plus élevée."
 
 #. type: TP
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 #, no-wrap
 msgid "B<--get-selections>"
 msgstr "B<--get-selections>"
 
 #. type: Plain text
-#: update-alternatives.8:300
+#: update-alternatives.8:299
 msgid ""
 "List all master alternative names (those controlling a link group)  and "
 "their status. Each line contains up to 3 fields (separated by one or more "
@@ -17764,7 +18881,7 @@
 "qui peut contenir des espaces)."
 
 #. type: Plain text
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 msgid ""
 "Read configuration of alternatives on standard input in the format generated "
 "by B<update-alternatives --get-selections> and reconfigure them accordingly."
@@ -17774,13 +18891,13 @@
 "conséquence."
 
 #. type: TP
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 #, no-wrap
 msgid "B<--query> I<name>"
 msgstr "B<--query> I<nom>"
 
 #. type: Plain text
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 msgid ""
 "Display information about the link group like --display does, but in a "
 "machine parseable way (see section B<QUERY FORMAT> below)."
@@ -17790,24 +18907,24 @@
 "section B<FORMAT DE REQUÊTE> ci-dessous)."
 
 #. type: TP
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 #, no-wrap
 msgid "B<--list> I<name>"
 msgstr "B<--list> I<nom>"
 
 #. type: Plain text
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 msgid "Display all targets of the link group."
 msgstr "Affiche toutes les cibles du groupe de liens."
 
 #. type: TP
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 #, no-wrap
 msgid "B<--config> I<name>"
 msgstr "B<--config> I<nom>"
 
 #. type: Plain text
-#: update-alternatives.8:317
+#: update-alternatives.8:316
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated."
@@ -17817,13 +18934,13 @@
 "mis à jour."
 
 #. type: TP
-#: update-alternatives.8:325
+#: update-alternatives.8:324
 #, no-wrap
 msgid "B<--altdir>I< directory>"
 msgstr "B<--altdir>I< répertoire>"
 
 #. type: Plain text
-#: update-alternatives.8:329
+#: update-alternatives.8:328
 msgid ""
 "Specifies the alternatives directory, when this is to be different from the "
 "default."
@@ -17832,7 +18949,7 @@
 "défaut."
 
 #. type: Plain text
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 msgid ""
 "Specifies the administrative directory, when this is to be different from "
 "the default."
@@ -17841,13 +18958,13 @@
 "défaut."
 
 #. type: TP
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 #, no-wrap
 msgid "B<--log>I< file>"
 msgstr "B<--log>I< fichier>"
 
 #. type: Plain text
-#: update-alternatives.8:337
+#: update-alternatives.8:336
 msgid ""
 "Specifies the log file, when this is to be different from the default (/var/"
 "log/alternatives.log)."
@@ -17856,22 +18973,26 @@
 "par défaut (/var/log/alternatives.log)."
 
 #. type: Plain text
-#: update-alternatives.8:341
+#: update-alternatives.8:340
+#, fuzzy
+#| msgid ""
+#| "Let B<update-alternatives> replace any real file that is installed where "
+#| "an alternative link has to be installed."
 msgid ""
-"Let B<update-alternatives> replace any real file that is installed where an "
-"alternative link has to be installed."
+"Let B<update-alternatives> replace or drop any real file that is installed "
+"where an alternative link has to be installed or removed."
 msgstr ""
 "Autorise B<update-alternatives> à remplacer tout fichier installé à la place "
 "d'un lien d'alternative qui doit être créé."
 
 #. type: TP
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 #, no-wrap
 msgid "B<--skip-auto>"
 msgstr "B<--skip-auto>"
 
 #. type: Plain text
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 msgid ""
 "Skip configuration prompt for alternatives which are properly configured in "
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
@@ -17881,36 +19002,36 @@
 "config> ou B<--all>."
 
 #. type: TP
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 #, no-wrap
 msgid "B<--verbose>"
 msgstr "B<--verbose>"
 
 #. type: Plain text
-#: update-alternatives.8:351
+#: update-alternatives.8:350
 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:354
+#: update-alternatives.8:353
 msgid "Don't generate any comments unless errors occur."
 msgstr "Ne crée pas de commentaire à moins qu'une erreur ne survienne."
 
 #. type: Plain text
-#: update-alternatives.8:360
+#: update-alternatives.8:359
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the base administrative directory."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:362
+#: update-alternatives.8:361
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr "I</etc/alternatives/>"
 
 #. type: Plain text
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
@@ -17919,13 +19040,13 @@
 "l'option B<--altdir>."
 
 #. type: TP
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 #, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "I</var/lib/dpkg/alternatives/>"
 
 #. type: Plain text
-#: update-alternatives.8:374
+#: update-alternatives.8:373
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
@@ -17938,14 +19059,8 @@
 msgid "The requested action was successfully performed."
 msgstr "L'action demandée s'est correctement déroulée."
 
-#. type: IP
-#: update-alternatives.8:378
-#, no-wrap
-msgid "2"
-msgstr "2"
-
 #. type: Plain text
-#: update-alternatives.8:381
+#: update-alternatives.8:382
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
@@ -17954,15 +19069,21 @@
 "bien pendant l'exécution de l'action."
 
 #. type: SH
-#: update-alternatives.8:382
+#: update-alternatives.8:383
 #, no-wrap
 msgid "QUERY FORMAT"
 msgstr "FORMAT DE REQUÊTE"
 
 #. type: Plain text
-#: update-alternatives.8:387
+#: update-alternatives.8:388
+#, fuzzy
+#| msgid ""
+#| "The B<update-alternatives> I<--query> format is using an RFC822-like flat "
+#| "format. It's made of I<n> + 1 blocks where I<n> is the number of "
+#| "alternatives available in the queried link group. The first block "
+#| "contains the following fields:"
 msgid ""
-"The B<update-alternatives> I<--query> format is using an RFC822-like flat "
+"The B<update-alternatives --query> format is using an RFC822-like flat "
 "format. It's made of I<n> + 1 blocks where I<n> is the number of "
 "alternatives available in the queried link group. The first block contains "
 "the following fields:"
@@ -17973,35 +19094,38 @@
 "bloc contient les champs suivants :"
 
 #. type: TP
-#: update-alternatives.8:387
-#, no-wrap
-msgid "B<Link:> E<lt>linkE<gt>"
+#: update-alternatives.8:388
+#, fuzzy, no-wrap
+#| msgid "B<Link:> E<lt>linkE<gt>"
+msgid "B<Link:>I< link>"
 msgstr "B<Link:> E<lt>lienE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 msgid "The generic name of the alternative."
 msgstr "Nom générique de l'alternative."
 
 #. type: TP
-#: update-alternatives.8:390
-#, no-wrap
-msgid "B<Status:> E<lt>statusE<gt>"
+#: update-alternatives.8:391
+#, fuzzy, no-wrap
+#| msgid "B<Status:> E<lt>statusE<gt>"
+msgid "B<Status:>I< status>"
 msgstr "B<Status:> E<lt>étatE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr "État de l'alternative (B<auto> ou B<manual>)."
 
 #. type: TP
-#: update-alternatives.8:393
-#, no-wrap
-msgid "B<Best:> E<lt>best choiceE<gt>"
+#: update-alternatives.8:394
+#, fuzzy, no-wrap
+#| msgid "B<Best:> E<lt>best choiceE<gt>"
+msgid "B<Best:>I< best-choice>"
 msgstr "B<Best:> E<lt>meilleur choixE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
@@ -18010,13 +19134,14 @@
 "présent si aucun alternative n'est disponible."
 
 #. type: TP
-#: update-alternatives.8:397
-#, no-wrap
-msgid "B<Value:> E<lt>currently selected alternativeE<gt> "
+#: update-alternatives.8:398
+#, fuzzy, no-wrap
+#| msgid "B<Value:> E<lt>currently selected alternativeE<gt> "
+msgid "B<Value:>I< currently-selected-alternative>"
 msgstr "B<Value:> E<lt>alternative actuellement choisieE<gt> "
 
 #. type: Plain text
-#: update-alternatives.8:401
+#: update-alternatives.8:402
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
@@ -18025,41 +19150,44 @@
 "spéciale B<none>, utilisée si le lien n'existe pas."
 
 #. type: TP
-#: update-alternatives.8:402
+#: update-alternatives.8:403
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr "Les autres blocs décrivent les alternatives disponibles dans le groupe de liens interrogé."
 
 #. type: TP
-#: update-alternatives.8:404
-#, no-wrap
-msgid "B<Alternative:> E<lt>path of this alternativeE<gt>"
+#: update-alternatives.8:405
+#, fuzzy, no-wrap
+#| msgid "B<Alternative:> E<lt>path of this alternativeE<gt>"
+msgid "B<Alternative:>I< path-of-this-alternative>"
 msgstr "B<Alternative:> E<lt>chemin de cette alternativeE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 msgid "Path to this block's alternative."
 msgstr "Chemin vers l'alternative de ce bloc"
 
 #. type: TP
-#: update-alternatives.8:407
-#, no-wrap
-msgid "B<Priority:> E<lt>priority valueE<gt>"
+#: update-alternatives.8:408
+#, fuzzy, no-wrap
+#| msgid "B<Priority:> E<lt>priority valueE<gt>"
+msgid "B<Priority:>I< priority-value>"
 msgstr "B<Priority:> E<lt>valeur de la prioritéE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 msgid "Value of the priority of this alternative."
 msgstr "Valeur de la priorité alternative."
 
 #. type: TP
-#: update-alternatives.8:410
-#, no-wrap
-msgid "B<Slaves:> E<lt>list of slavesE<gt>"
+#: update-alternatives.8:411
+#, fuzzy, no-wrap
+#| msgid "B<Slaves:> E<lt>list of slavesE<gt>"
+msgid "B<Slaves:>I< list-of-slaves>"
 msgstr "B<Replaces:> E<lt>liste des liens secondairesE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:416
+#: update-alternatives.8:417
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -18073,13 +19201,13 @@
 "l'alternative secondaire."
 
 #. type: TP
-#: update-alternatives.8:417
+#: update-alternatives.8:418
 #, no-wrap
 msgid "B<Example>"
 msgstr "B<Exemple>"
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:426
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
@@ -18095,7 +19223,7 @@
 "Value: /usr/bin/vim.gtk\n"
 
 #. type: Plain text
-#: update-alternatives.8:430
+#: update-alternatives.8:431
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -18109,7 +19237,7 @@
 " editor.1.gz /usr/share/man/man1/ed.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:446
 #, no-wrap
 msgid ""
 "Alternative: /usr/bin/vim.gtk\n"
@@ -18143,9 +19271,16 @@
 " editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:457
+#: update-alternatives.8:458
+#, fuzzy
+#| msgid ""
+#| "With I<--verbose> 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."
 msgid ""
-"With I<--verbose> B<update-alternatives> chatters incessantly about its "
+"With B<--verbose> 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; "
@@ -18159,7 +19294,7 @@
 "rapport de bogue."
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:464
 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 "
@@ -18172,21 +19307,25 @@
 "de manuel."
 
 #. type: Plain text
-#: update-alternatives.8:466
+#: update-alternatives.8:467
+#, fuzzy
+#| msgid ""
+#| "To display the available packages which provide B<vi> and the current "
+#| "setting for it, use the I<--display> action:"
 msgid ""
 "To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
+"setting for it, use the B<--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:469
+#: update-alternatives.8:470
 msgid "B<update-alternatives --display vi>"
 msgstr "B<update-alternatives --display vi>"
 
 #. type: Plain text
-#: update-alternatives.8:473
+#: update-alternatives.8:474
 msgid ""
 "To choose a particular B<vi> implementation, use this command as root and "
 "then select a number from the list:"
@@ -18195,12 +19334,12 @@
 "commande en tant que superutilisateur et choisir un nombre dans la liste :"
 
 #. type: Plain text
-#: update-alternatives.8:476
+#: update-alternatives.8:477
 msgid "B<update-alternatives --config vi>"
 msgstr "B<update-alternatives --config vi>"
 
 #. type: Plain text
-#: update-alternatives.8:480
+#: update-alternatives.8:481
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
@@ -18209,12 +19348,12 @@
 "commande en tant que super-utilisateur :"
 
 #. type: Plain text
-#: update-alternatives.8:483
+#: update-alternatives.8:484
 msgid "B<update-alternatives --auto vi>"
 msgstr "B<update-alternatives --auto vi>"
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:488
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
 msgstr ""
@@ -18222,7 +19361,7 @@
 "bogues de Debian."
 
 #. type: Plain text
-#: update-alternatives.8:492
+#: update-alternatives.8:493
 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 "
@@ -18233,7 +19372,7 @@
 "soit dans la documentation ; faites un rapport."
 
 #. type: Plain text
-#: update-alternatives.8:503
+#: update-alternatives.8:504
 msgid ""
 "This manual page is copyright 1997,1998 Charles Briscoe-Smith and others."
 msgstr ""
@@ -18241,7 +19380,7 @@
 "autres auteurs."
 
 #. type: Plain text
-#: update-alternatives.8:506
+#: update-alternatives.8:507
 msgid ""
 "This is free documentation; see the GNU General Public Licence version 2 or "
 "later for copying conditions. There is NO WARRANTY."
@@ -18250,10 +19389,259 @@
 "version 2 ou supérieure pour le copyright. Il n'y a PAS de garantie."
 
 #. type: Plain text
-#: update-alternatives.8:509
+#: update-alternatives.8:510
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, le standard pour l'organisation du système de fichiers."
 
+#~ msgid "2009-02-27"
+#~ msgstr "27-02-2009"
+
+#~ msgid "2011-04-29"
+#~ msgstr "29-04-2011"
+
+#~ msgid "2006-02-28"
+#~ msgstr "28-02-2006"
+
+#~ msgid "2007-03-07"
+#~ msgstr "07-03-2007"
+
+#~ msgid "2007-07-16"
+#~ msgstr "16-07-2007"
+
+#~ msgid "2009-03-15"
+#~ msgstr "15-03-2009"
+
+#, fuzzy
+#~| msgid "2009-02-27"
+#~ msgid "2011-04-27"
+#~ msgstr "27-02-2009"
+
+#, fuzzy
+#~| msgid "2009-02-27"
+#~ msgid "2011-07-07"
+#~ msgstr "27-02-2009"
+
+#~ msgid "2010-04-18"
+#~ msgstr "18-04-2010"
+
+#~ msgid "B<Build-Features:>I< features-list>"
+#~ msgstr "B<Build-Features:>I< liste de fonctionnalités>"
+
+#~ msgid ""
+#~ "A comma-separated list of names of build-time features that are supported "
+#~ "by the source package. Currently, the only supported feature is B<build-"
+#~ "arch>. It allows dpkg-buildpackage to call the I<build-arch> or I<build-"
+#~ "indep> targets in place of I<build>."
+#~ msgstr ""
+#~ "donne la liste des noms des fonctionnalités qui sont gérées par le paquet "
+#~ "source. À ce jour, la seule fonctionnalité gérée est B<build-arch>. Elle "
+#~ "permet à dpkg-buildpackage d'utiliser les cibles I<build-arch> ou I<build-"
+#~ "indep> à la place de I<build>"
+
+#, fuzzy
+#~| msgid "User configuration file."
+#~ msgid "Package maintainer configuration file."
+#~ msgstr "Fichier de configuration propre à l'utilisateur"
+
+#~ msgid "2010-07-29"
+#~ msgstr "29-07-2010"
+
+#~ msgid "B<Package:> E<lt>package nameE<gt>"
+#~ msgstr "B<Package:> E<lt>nom du paquetE<gt>"
+
+#, fuzzy
+#~| msgid "2007-11-22"
+#~ msgid "2010-11-22"
+#~ msgstr "22-11-2007"
+
+#, fuzzy
+#~| msgid "B<Source:> E<lt>source nameE<gt>"
+#~ msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
+#~ msgstr "B<Source:> E<lt>nom du sourceE<gt>"
+
+#~ msgid "2010-01-28"
+#~ msgstr "28-01-2010"
+
+#~ msgid ""
+#~ "The first member is named B<debian-split> and contains a series of lines, "
+#~ "separated by newlines. Currently seven lines are present.  The first is "
+#~ "the format version number, B<2.1> at the time this manual page was "
+#~ "written. The second is the package name. The third is the package "
+#~ "version. The fourth is the md5sum of the package.  The fifth is the total "
+#~ "size of the package. The sixth is the maximum part size. The seventh is "
+#~ "the current part number, followed by a slash and the total amount of "
+#~ "parts (as in \\(oq1/10\\(cq)."
+#~ msgstr ""
+#~ "Le premier membre est nommé B<debian-split> et contient une succession de "
+#~ "lignes, séparées par des retours-chariot. Pour le moment, sept lignes "
+#~ "sont présentes. La première est le numéro de version du format, B<2.1> à "
+#~ "l'heure où ce document a été écrit. Le second est le nom du paquet. Le "
+#~ "troisième est la version du paquet. Le quatrième est la somme MD5 du "
+#~ "paquet. Le cinquième est la taille totale du paquet. Le sixième est la "
+#~ "taille maximale d'une partie. Le septième est le numéro d'ordre de la "
+#~ "partie concernée, suivi du caractère « / » et du nombre total de parties "
+#~ "(de le forme \\(oq1/10\\(cq)."
+
+#~ msgid "2008-08-18"
+#~ msgstr "18-08-2008"
+
+#~ msgid ""
+#~ "B<dpkg> can 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 :"
+
+#~ 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"
+
+#~ 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."
+
+#~ msgid "B<--new>, B<--old>"
+#~ msgstr "B<--new>, B<--old>"
+
+#~ msgid ""
+#~ "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
+#~ msgstr ""
+#~ "Sélectionne soit l'ancien format des paquet binaires, soit le nouveau. "
+#~ "C'est une option de B<dpkg-deb>(1)."
+
+#~ msgid ""
+#~ "Don't read or check contents of control file while building a package.  "
+#~ "This is a B<dpkg-deb>(1) option."
+#~ msgstr ""
+#~ "Ne pas lire ni vérifier le contenu du fichier de contrôle pendant la "
+#~ "construction d'un paquet. C'est une option de B<dpkg-deb>(1)."
+
+#~ msgid "2009-08-15"
+#~ msgstr "15-08-2009"
+
+#~ msgid "Compiler flags"
+#~ msgstr "Drapeaux de compilation"
+
+#~ msgid ""
+#~ "The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
+#~ "environment variables are set to the values that B<dpkg-buildflags> "
+#~ "returned. See its manual page for more information."
+#~ msgstr ""
+#~ "Les variables d'environnement B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, "
+#~ "B<CPPFLAGS> et B<LDFLAGS> prennent les valeurs renvoyées par B<dpkg-"
+#~ "buildflags>. Veuillez consulter la page de manuel de ce programme pour "
+#~ "plus d'informations."
+
+#~ msgid "2009-11-21"
+#~ msgstr "21-11-2009"
+
+#~ msgid "2010-03-07"
+#~ msgstr "07-03-2010"
+
+#, fuzzy
+#~| msgid "2010-10-10"
+#~ msgid "2010-10-12"
+#~ msgstr "10-10-2010"
+
+#~ msgid "2009-08-07"
+#~ msgstr "07-08-2009"
+
+#~ msgid "2010-04-16"
+#~ msgstr "16-04-2010"
+
+#~ msgid "2009-05-19"
+#~ msgstr "19-05-2009"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2009-10-01"
+#~ msgstr "01-10-2009"
+
+#~ msgid "2009-06-26"
+#~ msgstr "26-06-2009"
+
+#~ msgid ""
+#~ "B<dpkg-split> uses some rather out-of-date conventions for the the "
+#~ "filenames of Debian packages."
+#~ msgstr ""
+#~ "B<dpkg-split> utilise des conventions plutôt périmées pour les noms des "
+#~ "paquets Debian."
+
+#~ 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 ""
+#~ "L'architecture n'est pas indiquée dans l'en-tête des fichiers ; elle "
+#~ "l'est seulement dans les informations de contrôle du paquet binaire ; et "
+#~ "elle n'est pas présente dans les fichiers produits."
+
+#~ msgid "2009-05-10"
+#~ msgstr "10-05-2009"
+
+#~ msgid ""
+#~ "B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--"
+#~ "version>] [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 ""
+#~ "B<dselect> [B<--admindir> I<E<lt>répertoireE<gt>>] [B<--help>] [B<--"
+#~ "version>] [B<--expert>] [B<--debug>|B<-D>I<E<lt>fichierE<gt>>] "
+#~ "[I<E<lt>actionE<gt>>] [B<--colour>|B<--color> I<partie-écran:>[I<avant-"
+#~ "plan>],[I<arrière-plan>][I<:attr>[I<+attr+..>]]]"
+
+#~ msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+#~ msgstr "B<--admindir>I< E<lt>répertoireE<gt>>"
+
+#~ msgid "USAGE"
+#~ msgstr "UTILISATION"
+
+#~ msgid ""
+#~ "B<start-stop-daemon> returns 0 if the requested action was performed, or "
+#~ "if B<--oknodo> is specified and either B<--start> was specified and a "
+#~ "matching process was already running, or B<--stop> was specified and "
+#~ "there were no matching processes. If B<--oknodo> was not specified and "
+#~ "nothing was done, 1 is returned. If B<--stop> and B<--retry> were "
+#~ "specified, but the end of the schedule was reached and the processes were "
+#~ "still running, the error value is 2. For all other errors, the status is "
+#~ "3."
+#~ msgstr ""
+#~ "B<start-stop-daemon> renvoie 0 si l'action demandée a été effectuée, ou "
+#~ "si B<--oknodo> est spécifié et aussi si B<--start> a été spécifié et "
+#~ "qu'un processus de comparaison est déjà en cours d'exécution, ou si B<--"
+#~ "stop> a été spécifié et qu'il n'y avait pas de processus correspondant. "
+#~ "Si B<--oknodo> n'a pas été spécifié et rien n'a été fait, alors 1 est "
+#~ "retourné. Si B<--stop> et B<--retry> ont été précisés, mais que "
+#~ "l'ordonnanceur a atteint la fin du calendrier en ayant toujours le "
+#~ "processus en cours d'exécution, la valeur d'erreur est 2. Pour toutes les "
+#~ "autres erreurs, l'état est 3."
+
+#~ msgid "2"
+#~ msgstr "2"
+
 #~ msgid ""
 #~ "An error occurred. Unfortunately at the time of writing I<extended-error-"
 #~ "message> can contain newlines, although in locales where the translators "
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/hu.add /home/vorlon/devel/multiarch/dpkg-debian/man/po/hu.add
--- dpkg/man/po/hu.add	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/hu.add	2012-06-07 10:11:09.426073000 -0700
@@ -1,3 +1,3 @@
 PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary
 .P
-Ford: SZERVC Attila
+Ford: SZERVÁC Attila
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/hu.po /home/vorlon/devel/multiarch/dpkg-debian/man/po/hu.po
--- dpkg/man/po/hu.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/hu.po	2012-06-07 10:11:09.426073000 -0700
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2011-04-01 22:07+0300\n"
+"POT-Creation-Date: 2011-11-25 11:22+0100\n"
 "PO-Revision-Date: 2010-03-07 22:17+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"
@@ -23,9 +23,16 @@
 msgstr ""
 
 #. type: TH
-#: deb.5:1
+#: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-version.5:5 deb-old.5:1
+#: deb-override.5:15 deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg-buildpackage.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-trigger.1:1
+#: dselect.1:1 update-alternatives.8:8
 #, fuzzy, no-wrap
-msgid "2009-02-27"
+msgid "2011-08-14"
 msgstr "2006-02-28"
 
 #. type: TH
@@ -97,15 +104,15 @@
 #: deb.5:6 deb-control.5:10 deb-src-control.5:10 deb-split.5:6
 #: deb-version.5:11 deb-old.5:8 deb-override.5:22 deb-extra-override.5:8
 #: deb-shlibs.5:20 deb-substvars.5:9 deb-symbols.5:9 deb-triggers.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildflags.1:9
+#: dpkg.1:19 dpkg-architecture.1:10 dpkg.cfg.5:5 dpkg-buildflags.1:9
 #: 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-deb.1:9 dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
 #: dpkg-gensymbols.1:10 dpkg-maintscript-helper.1:15 dpkg-mergechangelogs.1:9
 #: dpkg-name.1:16 dpkg-parsechangelog.1:9 dpkg-query.1:9
-#: dpkg-scanpackages.1:28 dpkg-scansources.1:14 dpkg-shlibdeps.1:11
-#: dpkg-source.1:11 dpkg-split.1:11 dpkg-statoverride.8:10 dpkg-trigger.1:12
-#: dpkg-vendor.1:9 dselect.1:17 dselect.cfg.5:5 start-stop-daemon.8:10
-#: update-alternatives.8:17
+#: dpkg-scanpackages.1:27 dpkg-scansources.1:13 dpkg-shlibdeps.1:9
+#: dpkg-source.1:10 dpkg-split.1:10 dpkg-statoverride.8:9 dpkg-trigger.1:12
+#: dpkg-vendor.1:9 dselect.1:9 dselect.cfg.5:5 start-stop-daemon.8:9
+#: update-alternatives.8:16
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "LEÍRÁS"
@@ -210,15 +217,15 @@
 msgstr ""
 
 #. type: SH
-#: deb.5:79 deb-control.5:269 deb-src-control.5:322 deb-split.5:37
+#: deb.5:79 deb-control.5:271 deb-src-control.5:327 deb-split.5:49
 #: deb-version.5:116 deb-old.5:51 deb-override.5:62 deb-extra-override.5:37
-#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:49
-#: dpkg.1:782 dpkg-architecture.1:300 dpkg.cfg.5:23 dpkg-buildpackage.1:249
-#: dpkg-deb.1:246 dpkg-divert.8:132 dpkg-gensymbols.1:445 dpkg-name.1:95
-#: dpkg-query.1:212 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:701 dpkg-split.1:223
-#: dpkg-statoverride.8:85 dpkg-trigger.1:66 dselect.1:452 dselect.cfg.5:23
-#: update-alternatives.8:507
+#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:67
+#: dpkg.1:768 dpkg-architecture.1:299 dpkg.cfg.5:23 dpkg-buildpackage.1:249
+#: dpkg-deb.1:259 dpkg-divert.8:132 dpkg-gensymbols.1:450 dpkg-name.1:96
+#: dpkg-query.1:220 dpkg-scanpackages.1:110 dpkg-scansources.1:71
+#: dpkg-shlibdeps.1:324 dpkg-source.1:725 dpkg-split.1:217
+#: dpkg-statoverride.8:84 dpkg-trigger.1:66 dselect.1:445 dselect.cfg.5:23
+#: update-alternatives.8:508
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "LÁSD MÉG"
@@ -235,13 +242,6 @@
 msgid "deb-control"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-control.5:3 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
-#, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-07-29"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-control.5:6
 msgid "deb-control - Debian packages' master control file format"
@@ -280,8 +280,8 @@
 
 #. type: TP
 #: deb-control.5:26
-#, no-wrap
-msgid "B<Package:> E<lt>package nameE<gt>"
+#, fuzzy, no-wrap
+msgid "B<Package:>I< package-name>"
 msgstr "B<Package:> E<lt>csomag névE<gt>"
 
 #. type: Plain text
@@ -295,8 +295,9 @@
 
 #. type: TP
 #: deb-control.5:30
-#, no-wrap
-msgid "B<Version:> E<lt>version stringE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Version:> E<lt>version stringE<gt>"
+msgid "B<Version:>I< version-string>"
 msgstr "B<Version:> E<lt>verzióE<gt>"
 
 #. type: Plain text
@@ -315,8 +316,9 @@
 
 #. type: TP
 #: deb-control.5:37
-#, no-wrap
-msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
+msgid "B<Maintainer:>I< fullname-email>"
 msgstr "B<Maintainer:> E<lt>teljes.név emailE<gt>"
 
 #. type: Plain text
@@ -331,13 +333,16 @@
 
 #. type: TP
 #: deb-control.5:42
-#, no-wrap
-msgid "B<Description:> E<lt>short descriptionE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Description:> E<lt>short descriptionE<gt>"
+msgid "B<Description:>I< short-description>"
 msgstr "B<Description:> E<lt>rövid leírásE<gt>"
 
 #. type: Plain text
 #: deb-control.5:45
-msgid "B< >E<lt>long descriptionE<gt>"
+#, fuzzy
+#| msgid "B< >E<lt>long descriptionE<gt>"
+msgid "B< >I<long-description>"
 msgstr "B< >E<lt>hosszú leírásE<gt>"
 
 #. type: Plain text
@@ -361,9 +366,10 @@
 msgstr "LEHETSÉGES MEZŐK"
 
 #. type: TP
-#: deb-control.5:53 deb-src-control.5:88
-#, no-wrap
-msgid "B<Section:> E<lt>sectionE<gt>"
+#: deb-control.5:53 deb-src-control.5:90
+#, fuzzy, no-wrap
+#| msgid "B<Section:> E<lt>sectionE<gt>"
+msgid "B<Section:>I< section>"
 msgstr "B<Section:> E<lt>szakaszE<gt>"
 
 #. type: Plain text
@@ -377,9 +383,10 @@
 "például ilyenekhez: `utils', `net', `mail', `text', `x11' stb."
 
 #. type: TP
-#: deb-control.5:58 deb-src-control.5:94
-#, no-wrap
-msgid "B<Priority:> E<lt>priorityE<gt>"
+#: deb-control.5:58 deb-src-control.5:96
+#, fuzzy, no-wrap
+#| msgid "B<Priority:> E<lt>priorityE<gt>"
+msgid "B<Priority:>I< priority>"
 msgstr "B<Priority:> E<lt>elsőbbségE<gt>"
 
 #. type: Plain text
@@ -392,7 +399,7 @@
 "`required', `standard', `optional', `extra' (kötelező, szokásos...) stb."
 
 #. type: Plain text
-#: deb-control.5:71 deb-src-control.5:107
+#: deb-control.5:71 deb-src-control.5:109
 #, fuzzy
 msgid ""
 "In Debian, the B<Section> and B<Priority> fields have a defined set of "
@@ -405,15 +412,22 @@
 "verziójában."
 
 #. type: TP
-#: deb-control.5:71 deb-src-control.5:211
-#, no-wrap
-msgid "B<Essential:> E<lt>yes|noE<gt>"
+#: deb-control.5:71 deb-src-control.5:216
+#, fuzzy, no-wrap
+#| msgid "B<Essential:> E<lt>yes|noE<gt>"
+msgid "B<Essential:> B<yes>|B<no>"
 msgstr "B<Essential:> E<lt>yes|noE<gt>"
 
 #. type: Plain text
 #: deb-control.5:78
+#, fuzzy
+#| 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 "
+#| "other installation tool will not allow an B<Essential> package to be "
+#| "removed (at least not without using one of the force options)."
 msgid ""
-"This field is usually only needed when the answer is `yes'. It denotes a "
+"This field is usually only needed when the answer is B<yes>. It denotes a "
 "package that is required for proper operation of the system. Dpkg or any "
 "other installation tool will not allow an B<Essential> package to be removed "
 "(at least not without using one of the force options)."
@@ -425,8 +439,9 @@
 
 #. type: TP
 #: deb-control.5:78
-#, no-wrap
-msgid "B<Architecture:> E<lt>arch|allE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Architecture:> E<lt>arch|allE<gt>"
+msgid "B<Architecture:> I<arch>|B<all>"
 msgstr "B<Architecture:> E<lt>arch|allE<gt>"
 
 #. type: Plain text
@@ -444,9 +459,9 @@
 "Perl parancsfájlok és dokumentációk."
 
 #. type: TP
-#: deb-control.5:86 deb-src-control.5:83
+#: deb-control.5:86 deb-src-control.5:85
 #, fuzzy, no-wrap
-msgid "B<Origin:> E<lt>nameE<gt>"
+msgid "B<Origin:>I< name>"
 msgstr "B<Source:> E<lt>forrás névE<gt>"
 
 #. type: Plain text
@@ -457,71 +472,71 @@
 #. type: TP
 #: deb-control.5:89 deb-src-control.5:66
 #, fuzzy, no-wrap
-msgid "B<Bugs:> E<lt>urlE<gt>"
+msgid "B<Bugs:>I< url>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:93
+#: deb-control.5:94
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian.org>."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:93 deb-src-control.5:62
+#: deb-control.5:94 deb-src-control.5:62
 #, fuzzy, no-wrap
-msgid "B<Homepage:> E<lt>urlE<gt>"
+msgid "B<Homepage:>I< url>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:96 deb-src-control.5:65
-msgid "The upstream project home page URL."
+#: deb-control.5:97
+msgid "The upstream project home page I<url>."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:96 deb-src-control.5:217
+#: deb-control.5:97 deb-src-control.5:222
 #, fuzzy, no-wrap
-msgid "B<Tag:> E<lt>tag listE<gt>"
+msgid "B<Tag:>I< tag-list>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:100
+#: deb-control.5:101
 msgid ""
 "List of tags describing the qualities of the package. The description and "
 "list of supported tags can be found in the B<debtags> package."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:100
+#: deb-control.5:101 deb-src-control.5:219
 #, fuzzy, no-wrap
 #| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt>"
+msgid "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>"
 msgstr "B<Source:> E<lt>forrás névE<gt>"
 
 #. type: Plain text
-#: deb-control.5:111
+#: deb-control.5:113
 msgid ""
 "This field is used to indicate how this package should behave on a multi-"
-"arch installations. The value `same' means that the package is co-"
+"arch installations. The value B<same> means that the package is co-"
 "installable with itself, but it must not be used to satisfy the dependency "
-"of any package of a different architecture from itself. The value `foreign' "
+"of any package of a different architecture from itself. The value B<foreign> "
 "means that the package is not co-installable with itself, but should be "
 "allowed to satisfy the dependency of a package of a different arch from "
-"itself. The value `allowed` allows reverse-dependencies to indicate in their "
-"Depends field that they need a package from a foreign architecture, but has "
-"no effect otherwise. This field should not be present in packages with the "
-"Architecture: all field."
+"itself. The value B<allowed> allows reverse-dependencies to indicate in "
+"their Depends field that they need a package from a foreign architecture, "
+"but has no effect otherwise. This field should not be present in packages "
+"with the B<Architecture: all> field."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:111
-#, no-wrap
-msgid "B<Source:> E<lt>source nameE<gt>"
+#: deb-control.5:113
+#, fuzzy, no-wrap
+#| msgid "B<Source:> E<lt>source nameE<gt>"
+msgid "B<Source:>I< source-name>"
 msgstr "B<Source:> E<lt>forrás névE<gt>"
 
 #. type: Plain text
-#: deb-control.5:115
+#: deb-control.5:117
 msgid ""
 "The name of the source package that this binary package came from, if "
 "different than the name of the package itself."
@@ -529,26 +544,26 @@
 "Annak a forrás csomagnak a neve, ahonnan e bináris is származik, ha eltér."
 
 #. type: TP
-#: deb-control.5:116 deb-src-control.5:197
+#: deb-control.5:118 deb-src-control.5:202
 #, fuzzy, no-wrap
 #| msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgid "B<Subarchitecture:> E<lt>valueE<gt>"
+msgid "B<Subarchitecture:>I< value>"
 msgstr "B<Architecture:> E<lt>arch|allE<gt>"
 
 #. type: TP
-#: deb-control.5:119 deb-src-control.5:200
+#: deb-control.5:121 deb-src-control.5:205
 #, fuzzy, no-wrap
-msgid "B<Kernel-Version:> E<lt>valueE<gt>"
+msgid "B<Kernel-Version:>I< value>"
 msgstr "B<Version:> E<lt>verzióE<gt>"
 
 #. type: TP
-#: deb-control.5:122 deb-src-control.5:203
+#: deb-control.5:124 deb-src-control.5:208
 #, fuzzy, no-wrap
-msgid "B<Installer-Menu-Item:> E<lt>valueE<gt>"
+msgid "B<Installer-Menu-Item:>I< value>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:129 deb-src-control.5:210
+#: deb-control.5:131 deb-src-control.5:215
 msgid ""
 "These fields are used by the debian-installer and are usually not needed.  "
 "See /usr/share/doc/debian-installer/devel/modules.txt from the B<debian-"
@@ -556,13 +571,14 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:130 deb-src-control.5:228
-#, no-wrap
-msgid "B<Depends:> E<lt>package listE<gt>"
+#: deb-control.5:132 deb-src-control.5:233
+#, fuzzy, no-wrap
+#| msgid "B<Depends:> E<lt>package listE<gt>"
+msgid "B<Depends:>I< package-list>"
 msgstr "B<Depends:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:141
+#: deb-control.5:143
 #, fuzzy
 msgid ""
 "List of packages that are required for this package to provide a non-trivial "
@@ -580,13 +596,14 @@
 "lefuttatja a postinst és prerm parancsfájlokat."
 
 #. type: TP
-#: deb-control.5:141 deb-src-control.5:231
-#, no-wrap
-msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+#: deb-control.5:143 deb-src-control.5:236
+#, fuzzy, no-wrap
+#| msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+msgid "B<Pre-Depends:>I< package-list>"
 msgstr "B<Pre-Depends:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:148
+#: deb-control.5:150
 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 "
@@ -597,13 +614,14 @@
 "előtti (preinst) parancsfájl lefuttatásához egy másik csomagot igényel "
 
 #. type: TP
-#: deb-control.5:148 deb-src-control.5:234
-#, no-wrap
-msgid "B<Recommends:> E<lt>package listE<gt>"
+#: deb-control.5:150 deb-src-control.5:239
+#, fuzzy, no-wrap
+#| msgid "B<Recommends:> E<lt>package listE<gt>"
+msgid "B<Recommends:>I< package-list>"
 msgstr "B<Recommends:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:155
+#: deb-control.5:157
 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 "
@@ -615,13 +633,14 @@
 "csomagok kijelölése nélkül telepít."
 
 #. type: TP
-#: deb-control.5:155 deb-src-control.5:237
-#, no-wrap
-msgid "B<Suggests:> E<lt>package listE<gt>"
+#: deb-control.5:157 deb-src-control.5:242
+#, fuzzy, no-wrap
+#| msgid "B<Suggests:> E<lt>package listE<gt>"
+msgid "B<Suggests:>I< package-list>"
 msgstr "B<Suggests:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:160
+#: deb-control.5:162
 msgid ""
 "Lists packages that are related to this one and can perhaps enhance its "
 "usefulness, but without which installing this package is perfectly "
@@ -631,7 +650,7 @@
 "mellőzhetők."
 
 #. type: Plain text
-#: deb-control.5:172
+#: deb-control.5:174
 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 "
@@ -647,7 +666,7 @@
 "kötésekkel. Minden csomagnevet a verziószám megadása követhet zárójelben."
 
 #. type: Plain text
-#: deb-control.5:178
+#: deb-control.5:180
 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 "
@@ -662,13 +681,13 @@
 "egyenlő, és \"=\" egyenlő."
 
 #. type: TP
-#: deb-control.5:178 deb-src-control.5:240
+#: deb-control.5:180 deb-src-control.5:245
 #, fuzzy, no-wrap
-msgid "B<Breaks:> E<lt>package listE<gt>"
+msgid "B<Breaks:>I< package-list>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:186
+#: deb-control.5:188
 #, fuzzy
 msgid ""
 "Lists packages that this one breaks, for example by exposing bugs when the "
@@ -681,13 +700,14 @@
 "csomag 1-1 B<Conflicts> mezőben hivatkozik egymásra."
 
 #. type: TP
-#: deb-control.5:186 deb-src-control.5:249
-#, no-wrap
-msgid "B<Conflicts:> E<lt>package listE<gt>"
+#: deb-control.5:188 deb-src-control.5:254
+#, fuzzy, no-wrap
+#| msgid "B<Conflicts:> E<lt>package listE<gt>"
+msgid "B<Conflicts:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:194
+#: deb-control.5:196
 msgid ""
 "Lists packages that conflict with this one, for example by containing files "
 "with the same names. The package maintenance software will not allow "
@@ -699,13 +719,14 @@
 "csomag 1-1 B<Conflicts> mezőben hivatkozik egymásra."
 
 #. type: TP
-#: deb-control.5:194 deb-src-control.5:246
-#, no-wrap
-msgid "B<Replaces:> E<lt>package listE<gt>"
+#: deb-control.5:196 deb-src-control.5:251
+#, fuzzy, no-wrap
+#| msgid "B<Replaces:> E<lt>package listE<gt>"
+msgid "B<Replaces:>I< package-list>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:202
+#: deb-control.5:204
 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 "
@@ -718,13 +739,14 @@
 "tartalmaz, mint az ütköző csomag."
 
 #. type: TP
-#: deb-control.5:202 deb-src-control.5:252
-#, no-wrap
-msgid "B<Provides:> E<lt>package listE<gt>"
+#: deb-control.5:204 deb-src-control.5:257
+#, fuzzy, no-wrap
+#| msgid "B<Provides:> E<lt>package listE<gt>"
+msgid "B<Provides:>I< package-list>"
 msgstr "B<Provides:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:212
+#: deb-control.5:214
 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 "
@@ -743,7 +765,7 @@
 "levelező-kiszolgálót egy `|'-kkal elválasztott listában."
 
 #. type: Plain text
-#: deb-control.5:231
+#: deb-control.5:233
 #, fuzzy
 #| msgid ""
 #| "The syntax of B<Conflicts>, B<Replaces> and B<Provides> is a list of "
@@ -763,14 +785,14 @@
 "mezőben, a vessző `VAGY'. A verzió szintén megadható a már ismert módon."
 
 #. type: TP
-#: deb-control.5:232 deb-src-control.5:255
+#: deb-control.5:234 deb-src-control.5:260
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Built-Using:> E<lt>package listE<gt>"
+msgid "B<Built-Using:>I< package-list>"
 msgstr "B<Depends:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:242
+#: deb-control.5:244
 msgid ""
 "This field lists extra source packages that were used during the build of "
 "this binary package.  This is an indication to the archive maintenance "
@@ -782,13 +804,13 @@
 msgstr ""
 
 #. type: SH
-#: deb-control.5:243 deb-src-control.5:283 start-stop-daemon.8:273
+#: deb-control.5:245 deb-src-control.5:288 start-stop-daemon.8:302
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "PÉLDA"
 
 #. type: Plain text
-#: deb-control.5:266
+#: deb-control.5:268
 #, fuzzy, no-wrap
 msgid ""
 "# Comment\n"
@@ -833,7 +855,7 @@
 " will run more slowly, however.)\n"
 
 #. type: Plain text
-#: deb-control.5:274
+#: deb-control.5:276
 #, fuzzy
 msgid ""
 "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
@@ -846,12 +868,6 @@
 msgid "deb-src-control"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-src-control.5:3
-#, fuzzy, no-wrap
-msgid "2010-11-22"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-src-control.5:6
 #, fuzzy
@@ -873,8 +889,7 @@
 "one space. The content of the multi-line fields is generally joined to a "
 "single line by the tools (except in the case of the B<Description> field, "
 "see below). To insert empty lines into a multi-line field, insert a dot "
-"after the space. The paragraphs are separated by an empty line. Lines "
-"starting with a B<'#'> are treated as comments."
+"after the space. Lines starting with a B<'#'> are treated as comments."
 msgstr ""
 
 #. type: SH
@@ -888,7 +903,7 @@
 #: deb-src-control.5:30
 #, fuzzy, no-wrap
 #| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Source:> E<lt>source package nameE<gt> (required)"
+msgid "B<Source:> I<source-package-name> (required)"
 msgstr "B<Source:> E<lt>forrás névE<gt>"
 
 #. type: Plain text
@@ -905,7 +920,7 @@
 #: deb-src-control.5:38
 #, fuzzy, no-wrap
 #| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgid "B<Maintainer:> E<lt>fullname emailE<gt> (required)"
+msgid "B<Maintainer:> I<fullname-email> (required)"
 msgstr "B<Maintainer:> E<lt>teljes.név emailE<gt>"
 
 #. type: Plain text
@@ -927,7 +942,7 @@
 #: deb-src-control.5:44
 #, fuzzy, no-wrap
 #| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgid "B<Uploaders:> E<lt>fullname emailE<gt>"
+msgid "B<Uploaders:>I< fullname-email>"
 msgstr "B<Maintainer:> E<lt>teljes.név emailE<gt>"
 
 #. type: Plain text
@@ -942,7 +957,7 @@
 #: deb-src-control.5:50
 #, fuzzy, no-wrap
 #| msgid "B<Version:> E<lt>version stringE<gt>"
-msgid "B<Standards-Version:> E<lt>version stringE<gt>"
+msgid "B<Standards-Version:>I< version-string>"
 msgstr "B<Version:> E<lt>verzióE<gt>"
 
 #. type: Plain text
@@ -957,7 +972,7 @@
 #: deb-src-control.5:57
 #, fuzzy, no-wrap
 #| msgid "B<Essential:> E<lt>yes|noE<gt>"
-msgid "B<DM-Upload-Allowed:> E<lt>yes|noE<gt>"
+msgid "B<DM-Upload-Allowed:> B<yes>|B<no>"
 msgstr "B<Essential:> E<lt>yes|noE<gt>"
 
 #. type: Plain text
@@ -969,49 +984,55 @@
 msgstr ""
 
 #. type: Plain text
+#: deb-src-control.5:65
+msgid "The upstream project home page URL."
+msgstr ""
+
+#. type: Plain text
 #: deb-src-control.5:71
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>. This field is usually not needed."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian."
+"org>. This field is usually not needed."
 msgstr ""
 
 #. type: TP
 #: deb-src-control.5:72
 #, fuzzy, no-wrap
-msgid "B<Vcs-*:> E<lt>urlE<gt>"
+msgid "B<Vcs-*:>I< url>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:78
+#: deb-src-control.5:79
 msgid ""
-"The url of the Version Control System repository used to maintain this "
-"package.  Currently supported are Arch, Bzr (Bazaar), Cvs, Darcs, Git, Hg "
-"(Mercurial), Mtn (Monotone) and Svn (Subversion). Usually this field points "
-"to the latest version of the package, such as the main branch or the trunk."
+"The I<url> of the Version Control System repository used to maintain this "
+"package. Currently supported are B<Arch>, B<Bzr> (Bazaar), B<Cvs>, B<Darcs>, "
+"B<Git>, B<Hg> (Mercurial), B<Mtn> (Monotone) and B<Svn> (Subversion). "
+"Usually this field points to the latest version of the package, such as the "
+"main branch or the trunk."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:79
+#: deb-src-control.5:80
 #, fuzzy, no-wrap
-msgid "B<Vcs-Browser:> E<lt>urlE<gt>"
+msgid "B<Vcs-Browser:>I< url>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:82
+#: deb-src-control.5:84
 msgid ""
-"The url of a webinterface to browse the Version Control System repository."
+"The I<url> of a webinterface to browse the Version Control System repository."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:87
+#: deb-src-control.5:89
 msgid ""
 "The name of the distribution this package is originating from. This field is "
 "usually not needed."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:93
+#: deb-src-control.5:95
 #, fuzzy
 #| msgid ""
 #| "This is a general field that gives the package a category based on the "
@@ -1026,7 +1047,7 @@
 "például ilyenekhez: `utils', `net', `mail', `text', `x11' stb."
 
 #. type: Plain text
-#: deb-src-control.5:98
+#: deb-src-control.5:100
 #, fuzzy
 #| msgid ""
 #| "Sets the importance of this package in relation to the system as a "
@@ -1041,64 +1062,64 @@
 "`required', `standard', `optional', `extra' (kötelező, szokásos...) stb."
 
 #. type: TP
-#: deb-src-control.5:108
+#: deb-src-control.5:110
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Build-Depends:> E<lt>package listE<gt>"
+msgid "B<Build-Depends:>I< package-list>"
 msgstr "B<Depends:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:112
+#: deb-src-control.5:114
 msgid ""
 "A list of packages that need to be installed and configured to be able to "
 "build the source package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:113
+#: deb-src-control.5:115
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Build-Depends-Indep:> E<lt>package listE<gt>"
+msgid "B<Build-Depends-Indep:>I< package-list>"
 msgstr "B<Depends:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:118
+#: deb-src-control.5:120
 msgid ""
-"Same as Build-Depends, but they are only needed when building the "
-"architecture independent packages. The Build-Depends are also installed in "
-"this case."
+"Same as B<Build-Depends>, but they are only needed when building the "
+"architecture independent packages. The B<Build-Depends> are also installed "
+"in this case."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:119
+#: deb-src-control.5:121
 #, fuzzy, no-wrap
 #| msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgid "B<Build-Conflicts:> E<lt>package listE<gt>"
+msgid "B<Build-Conflicts:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:123
+#: deb-src-control.5:125
 msgid ""
 "A list of packages that should not be installed when the package is build, "
 "for example because they interfere with the used build system."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:124
+#: deb-src-control.5:126
 #, fuzzy, no-wrap
 #| msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgid "B<Build-Conflicts-Indep:> E<lt>package listE<gt>"
+msgid "B<Build-Conflicts-Indep:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:128
+#: deb-src-control.5:130
 msgid ""
-"Same as Build-Conflicts, but only when building the architecture independent "
-"packages."
+"Same as B<Build-Conflicts>, but only when building the architecture "
+"independent packages."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:139
+#: deb-src-control.5:141
 #, fuzzy
 #| msgid ""
 #| "The syntax of B<Depends>, B<Pre-Depends>, B<Recommends> and B<Suggests> "
@@ -1123,7 +1144,7 @@
 "kötésekkel. Minden csomagnevet a verziószám megadása követhet zárójelben."
 
 #. type: Plain text
-#: deb-src-control.5:148
+#: deb-src-control.5:150
 msgid ""
 "The syntax of the B<Build-Conflicts> and B<Build-Conflicts-Indep> fields is "
 "a list of comma-separated package names, where the comma is read as an \"AND"
@@ -1133,7 +1154,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:154
+#: deb-src-control.5:156
 #, fuzzy
 #| msgid ""
 #| "A version number may start with a `E<gt>E<gt>', in which case any later "
@@ -1156,7 +1177,7 @@
 "egyenlő, és \"=\" egyenlő."
 
 #. type: Plain text
-#: deb-src-control.5:158
+#: deb-src-control.5:160
 msgid ""
 "A architecture specification consists of one or more architecture names, "
 "separated by whitespace. Exclamation marks may be prepended to each of the "
@@ -1164,7 +1185,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:163
+#: deb-src-control.5:165
 msgid ""
 "Note that dependencies on packages in the B<build-essential> set can be "
 "omitted and that declaring build conflicts against them is impossible. A "
@@ -1172,59 +1193,61 @@
 msgstr ""
 
 #. type: SH
-#: deb-src-control.5:165
+#: deb-src-control.5:167
 #, fuzzy, no-wrap
 #| msgid "OPTIONAL FIELDS"
 msgid "BINARY FIELDS"
 msgstr "LEHETSÉGES MEZŐK"
 
 #. type: Plain text
-#: deb-src-control.5:174
+#: deb-src-control.5:176
 msgid ""
 "Note that the B<Priority>, B<Section> and B<Homepage> fields can also be in "
 "a binary paragraph to override the global value from the source package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:175
+#: deb-src-control.5:177
 #, fuzzy, no-wrap
 #| msgid "B<Package:> E<lt>package nameE<gt>"
-msgid "B<Package:> E<lt>binary package nameE<gt> (required)"
+msgid "B<Package:> I<binary-package-name> (required)"
 msgstr "B<Package:> E<lt>csomag névE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:179
+#: deb-src-control.5:181
 msgid ""
 "This field is used to name the binary package name. The same restrictions as "
 "to a source package name apply."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:180
+#: deb-src-control.5:182
 #, fuzzy, no-wrap
 #| msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgid "B<Architecture:> E<lt>arch|all|anyE<gt> (required)"
+msgid "B<Architecture:> I<arch>|B<all>|B<any> (required)"
 msgstr "B<Architecture:> E<lt>arch|allE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:190
+#: deb-src-control.5:195
 msgid ""
 "The architecture specifies on which type of hardware this package runs. For "
 "packages that run on all architectures, use the B<any> value. For packages "
 "that are architecture independent, such as shell and Perl scripts or "
 "documentation, use the B<all> value. To restrict the packages to a certain "
-"set of architectures, specify the architecture names, separated by a space."
+"set of architectures, specify the architecture names, separated by a space. "
+"It's also possible to put architecture wildcards in that list (see B<dpkg-"
+"architecture>(1)  for more information about them)."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:191
+#: deb-src-control.5:196
 #, fuzzy, no-wrap
 #| msgid "B<Package:> E<lt>package nameE<gt>"
-msgid "B<Package-Type:> E<lt>deb|udebE<gt>"
+msgid "B<Package-Type:> B<deb>|B<udeb>"
 msgstr "B<Package:> E<lt>csomag névE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:196
+#: deb-src-control.5:201
 msgid ""
 "This field defines the type of the package. \"udeb\" is for size-constrained "
 "packages used by the debian installer. \"deb\" is the default value, it's "
@@ -1232,49 +1255,42 @@
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:214
-#, fuzzy, no-wrap
-#| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
-msgstr "B<Source:> E<lt>forrás névE<gt>"
-
-#. type: TP
-#: deb-src-control.5:220
+#: deb-src-control.5:225
 #, fuzzy, no-wrap
 #| msgid "B<Description:> E<lt>short descriptionE<gt>"
-msgid "B<Description:> E<lt>short descriptionE<gt> (required)"
+msgid "B<Description:> I<short-description> (required)"
 msgstr "B<Description:> E<lt>rövid leírásE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:227
+#: deb-src-control.5:232
 msgid ""
 "These fields are described in the B<deb-control>(5)  manual page, as they "
 "are copied literally to the control file of the binary package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:243
+#: deb-src-control.5:248
 #, fuzzy, no-wrap
 #| msgid "B<Replaces:> E<lt>package listE<gt>"
-msgid "B<Enhances:> E<lt>package listE<gt>"
+msgid "B<Enhances:>I< package-list>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:265
+#: deb-src-control.5:270
 msgid ""
 "These fields declare relationships between packages. They are discussed in "
 "the B<deb-control>(5)  manpage and in the B<debian-policy> package."
 msgstr ""
 
 #. type: SH
-#: deb-src-control.5:266
+#: deb-src-control.5:271
 #, fuzzy, no-wrap
 #| msgid "REQUIRED FIELDS"
 msgid "USER-DEFINED FIELDS"
 msgstr "KÖTELEZŐ MEZŐK"
 
 #. type: Plain text
-#: deb-src-control.5:281
+#: deb-src-control.5:286
 msgid ""
 "It is allowed to add additional user-defined fields to the control file. The "
 "tools will ignore these fields. If you want the fields to be copied over to "
@@ -1291,7 +1307,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:299
+#: deb-src-control.5:304
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -1306,11 +1322,11 @@
 "Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
-" libselinux1-dev (E<gt>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]\n"
+" libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:318
+#: deb-src-control.5:323
 #, no-wrap
 msgid ""
 "Package: dpkg-dev\n"
@@ -1319,8 +1335,8 @@
 "Architecture: all\n"
 "# this is a custom field in the binary package\n"
 "XB-Mentoring-Contact: Raphael Hertzog E<lt>hertzog@debian.orgE<gt>\n"
-"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2), bzip2, lzma,\n"
-" patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
+"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2),\n"
+" bzip2, lzma, patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
 "Recommends: gcc | c-compiler, build-essential\n"
 "Suggests: gnupg, debian-keyring\n"
 "Conflicts: dpkg-cross (E<lt>E<lt> 2.0.0), devscripts (E<lt>E<lt> 2.10.26)\n"
@@ -1334,7 +1350,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:325
+#: deb-src-control.5:330
 #, fuzzy
 msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
@@ -1346,10 +1362,10 @@
 msgstr "dpkg készlet"
 
 #. type: TH
-#: deb-split.5:1
+#: deb-split.5:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 dpkg-vendor.1:1 start-stop-daemon.8:1
 #, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-01-28"
+msgid "2011-07-04"
 msgstr "2006-02-28"
 
 # type: Plain text
@@ -1374,22 +1390,70 @@
 "file names might contain a trailing slash (since dpkg 1.15.6)."
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: deb-split.5:21
+#: deb-split.5:15
 msgid ""
 "The first member is named B<debian-split> and contains a series of lines, "
-"separated by newlines. Currently seven lines are present.  The first is the "
-"format version number, B<2.1> at the time this manual page was written. The "
-"second is the package name. The third is the package version. The fourth is "
-"the md5sum of the package.  The fifth is the total size of the package. The "
-"sixth is the maximum part size. The seventh is the current part number, "
-"followed by a slash and the total amount of parts (as in \\(oq1/10\\(cq)."
+"separated by newlines. Currently eight lines are present:"
+msgstr ""
+
+#. type: IP
+#: deb-split.5:15 deb-split.5:18 deb-split.5:20 deb-split.5:22 deb-split.5:24
+#: deb-split.5:26 deb-split.5:28 deb-split.5:31 dpkg-gensymbols.1:20
+#: dpkg-gensymbols.1:22 dpkg-gensymbols.1:24 dpkg-gensymbols.1:26
+#: dpkg-gensymbols.1:311 dpkg-gensymbols.1:317 dpkg-gensymbols.1:351
+#: dpkg-gensymbols.1:355 dpkg-gensymbols.1:358
+#, no-wrap
+msgid "\\(bu"
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:18
+msgid ""
+"The format version number, B<2.1> at the time this manual page was written."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:20
+msgid "The package name."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:22
+msgid "The package version."
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
 #: deb-split.5:24
+msgid "The md5sum of the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:26
+#, fuzzy
+msgid "The total size of the package."
+msgstr "Kiszedi az ellenőrző információs fájlt egy bináris csomagarchívumból"
+
+#. type: Plain text
+#: deb-split.5:28
+msgid "The maximum part size."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:31
+msgid ""
+"The current part number, followed by a slash and the total amount of parts "
+"(as in \\(oq1/10\\(cq)."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:33
+msgid "The package architecture (since dpkg 1.16.1)."
+msgstr ""
+
+# type: Plain text
+#. type: Plain text
+#: deb-split.5:36
 msgid ""
 "Programs which read multi-part archives should be prepared for additional "
 "lines to be present, and should ignore these if this is the case."
@@ -1397,7 +1461,7 @@
 
 # type: Plain text
 #. type: Plain text
-#: deb-split.5:29
+#: deb-split.5:41
 msgid ""
 "If the version 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 "
@@ -1405,25 +1469,23 @@
 "(except at the end), as described below."
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: deb-split.5:32
+#: deb-split.5:44
 msgid ""
-"The second, last required member is named B<data.>N, where N denotes the "
-"part number. It contains the raw part data."
+"The second, last required member is named B<data.>I<N>, where I<N> denotes "
+"the part number. It contains the raw part data."
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: deb-split.5:37
+#: deb-split.5:49
 msgid ""
 "These members must occur in this exact order. Current implementations should "
-"ignore any additional members after B<data.>N.  Further members may be "
+"ignore any additional members after B<data.>I<N>.  Further members may be "
 "defined in the future, and (if possible) will be placed after these two."
 msgstr ""
 
 #. type: Plain text
-#: deb-split.5:39
+#: deb-split.5:51
 #, fuzzy
 msgid "B<deb>(5), B<dpkg-split>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
@@ -1434,13 +1496,6 @@
 msgid "deb-version"
 msgstr "B<--version>"
 
-#. type: TH
-#: deb-version.5:5 dpkg-distaddfile.1:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-name.1:6
-#, fuzzy, no-wrap
-msgid "2008-08-18"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-version.5:8
 #, fuzzy
@@ -1449,7 +1504,7 @@
 
 #. type: Plain text
 #: deb-version.5:11
-msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgid "[I<epoch>B<:>]I<upstream-version>[B<->I<debian-revision>]"
 msgstr ""
 
 #. type: Plain text
@@ -1469,7 +1524,7 @@
 #: deb-version.5:20
 msgid ""
 "This is a single (generally small) unsigned integer.  It may be omitted, in "
-"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"which case zero is assumed.  If it is omitted then the I<upstream-version> "
 "may not contain any colons."
 msgstr ""
 
@@ -1484,7 +1539,7 @@
 #. type: TP
 #: deb-version.5:24
 #, fuzzy, no-wrap
-msgid "I<upstream_version>"
+msgid "I<upstream-version>"
 msgstr "B<--version>"
 
 #. type: Plain text
@@ -1502,16 +1557,16 @@
 #: deb-version.5:39
 msgid ""
 "The comparison behavior of the package management system with respect to the "
-"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"I<upstream-version> is described below. The I<upstream-version> portion of "
 "the version number is mandatory."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:48
 msgid ""
-"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"The I<upstream-version> may contain only alphanumerics (\"A-Za-z0-9\") and "
 "the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
-"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"tilde) and should start with a digit.  If there is no I<debian-revision> "
 "then hyphens are not allowed; if there is no I<epoch> then colons are not "
 "allowed."
 msgstr ""
@@ -1519,7 +1574,7 @@
 #. type: TP
 #: deb-version.5:48
 #, fuzzy, no-wrap
-msgid "I<debian_revision>"
+msgid "I<debian-revision>"
 msgstr "B<--version>"
 
 #. type: Plain text
@@ -1528,13 +1583,13 @@
 "This part of the version number specifies the version of the Debian package "
 "based on the upstream version.  It may contain only alphanumerics and the "
 "characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
-"same way as the I<upstream_version> is."
+"same way as the I<upstream-version> is."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:64
 msgid ""
-"It is optional; if it isn't present then the I<upstream_version> may not "
+"It is optional; if it isn't present then the I<upstream-version> may not "
 "contain a hyphen.  This format represents the case where a piece of software "
 "was written specifically to be turned into a Debian package, and so there is "
 "only one \"debianisation\" of it and therefore no revision indication is "
@@ -1544,17 +1599,17 @@
 #. type: Plain text
 #: deb-version.5:68
 msgid ""
-"It is conventional to restart the I<debian_revision> at '1' each time time "
-"the I<upstream_version> is increased."
+"It is conventional to restart the I<debian-revision> at '1' each time time "
+"the I<upstream-version> is increased."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:76
 msgid ""
 "Dpkg will break the version number apart at the last hyphen in the string "
-"(if there is one) to determine the I<upstream_version> and "
-"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
-"than the presence of one (but note that the I<debian_revision> is the least "
+"(if there is one) to determine the I<upstream-version> and I<debian-"
+"revision>. The absence of a I<debian-revision> compares earlier than the "
+"presence of one (but note that the I<debian-revision> is the least "
 "significant part of the version number)."
 msgstr ""
 
@@ -1567,7 +1622,7 @@
 #. type: Plain text
 #: deb-version.5:80
 msgid ""
-"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"The I<upstream-version> and I<debian-revision> parts are compared by the "
 "package management system using the same algorithm:"
 msgstr ""
 
@@ -1637,11 +1692,11 @@
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 #. type: SH
-#: deb-version.5:120 dpkg.1:797 dpkg-buildpackage.1:256 dpkg-distaddfile.1:47
-#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
+#: deb-version.5:120 dpkg.1:783 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:460
 #: dpkg-maintscript-helper.1:128 dpkg-parsechangelog.1:123
-#: dpkg-shlibdeps.1:331 dpkg-source.1:706 dselect.1:458
-#: start-stop-daemon.8:294 update-alternatives.8:493
+#: dpkg-shlibdeps.1:329 dpkg-source.1:730 dselect.1:451
+#: start-stop-daemon.8:323 update-alternatives.8:494
 #, fuzzy, no-wrap
 msgid "AUTHORS"
 msgstr "SZERZŐ"
@@ -1652,18 +1707,18 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:262
+#: deb-version.5:124 dpkg-buildpackage.1:263
 msgid "Copyright \\(co 2007 Frank Lichtenheld"
 msgstr ""
 
 #. type: Plain text
-#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:125
-#: dpkg-buildpackage.1:266 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
-#: dpkg-deb.1:256 dpkg-divert.8:139 dpkg-genchanges.1:154
-#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-maintscript-helper.1:139
-#: dpkg-mergechangelogs.1:71 dpkg-name.1:107 dpkg-parsechangelog.1:131
-#: dpkg-query.1:211 dpkg-shlibdeps.1:341 dpkg-source.1:714 dpkg-split.1:233
-#: dpkg-statoverride.8:92 dpkg-vendor.1:53 update-alternatives.8:500
+#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:273
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:269 dpkg-divert.8:139 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:464 dpkg-maintscript-helper.1:139
+#: dpkg-mergechangelogs.1:71 dpkg-name.1:108 dpkg-parsechangelog.1:131
+#: dpkg-query.1:219 dpkg-shlibdeps.1:339 dpkg-source.1:738 dpkg-split.1:227
+#: dpkg-statoverride.8:91 dpkg-vendor.1:53 update-alternatives.8:501
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
@@ -1680,12 +1735,6 @@
 msgid "deb-old"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-old.5:1
-#, no-wrap
-msgid "2006-02-28"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-old.5:4
 msgid "deb-old - old style Debian binary package format"
@@ -1764,12 +1813,6 @@
 msgstr "deb-control"
 
 #. type: TH
-#: deb-override.5:15
-#, fuzzy, no-wrap
-msgid "2007-03-07"
-msgstr "2006-02-28"
-
-#. type: TH
 #: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
 #: deb-symbols.5:2 deb-triggers.5:1 dpkg-architecture.1:1
 #: dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1
@@ -1941,7 +1984,7 @@
 
 #. type: Plain text
 #: deb-shlibs.5:34
-msgid "[I<type:>] I<library> I<version> I<dependencies>"
+msgid "[I<type>B<:>] I<library> I<version> I<dependencies>"
 msgstr ""
 
 #. type: Plain text
@@ -1958,8 +2001,8 @@
 msgstr ""
 
 #. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:728 dpkg-architecture.1:263
-#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:458
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:714 dpkg-architecture.1:262
+#: dpkg-divert.8:91 dpkg-name.1:65 update-alternatives.8:459
 #, fuzzy, no-wrap
 msgid "EXAMPLES"
 msgstr "PÉLDA"
@@ -2275,11 +2318,11 @@
 msgstr ""
 
 #. type: SH
-#: deb-substvars.5:145 dpkg.1:641 dpkg-architecture.1:285 dpkg.cfg.5:12
-#: dpkg-buildflags.1:103 dpkg-distaddfile.1:39 dpkg-divert.8:122
+#: deb-substvars.5:145 dpkg.1:627 dpkg-architecture.1:284 dpkg.cfg.5:12
+#: dpkg-buildflags.1:121 dpkg-distaddfile.1:39 dpkg-divert.8:122
 #: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
-#: dpkg-split.1:212 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:361
+#: dpkg-split.1:206 dpkg-statoverride.8:74 dselect.cfg.5:12
+#: update-alternatives.8:360
 #, no-wrap
 msgid "FILES"
 msgstr "FÁJLOK"
@@ -2296,15 +2339,15 @@
 msgstr ""
 
 #. type: SH
-#: deb-substvars.5:150 dpkg.1:794 dpkg-buildpackage.1:244 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:698 dpkg-split.1:197 dselect.1:436
-#: update-alternatives.8:485
+#: deb-substvars.5:150 dpkg.1:780 dpkg-buildpackage.1:244 dpkg-deb.1:238
+#: dpkg-name.1:86 dpkg-source.1:722 dpkg-split.1:199 dselect.1:429
+#: update-alternatives.8:486
 #, no-wrap
 msgid "BUGS"
 msgstr "HIBÁK"
 
 #. type: Plain text
-#: deb-substvars.5:153 dpkg-source.1:701
+#: deb-substvars.5:153 dpkg-source.1:725
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -2319,27 +2362,27 @@
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 #. type: SH
-#: deb-substvars.5:161 dpkg-architecture.1:304 dpkg.cfg.5:19
-#: dpkg-buildflags.1:120 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
-#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:103
-#: dpkg-query.1:206 dpkg-scansources.1:77 dpkg-split.1:229
-#: dpkg-statoverride.8:88 dpkg-vendor.1:48 dselect.cfg.5:19
+#: deb-substvars.5:161 dpkg-architecture.1:303 dpkg.cfg.5:19
+#: dpkg-buildflags.1:266 dpkg-checkbuilddeps.1:40 dpkg-deb.1:265
+#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:104
+#: dpkg-query.1:214 dpkg-scansources.1:76 dpkg-split.1:223
+#: dpkg-statoverride.8:87 dpkg-vendor.1:48 dselect.cfg.5:19
 #, no-wrap
 msgid "AUTHOR"
 msgstr "SZERZŐ"
 
 #. type: Plain text
-#: deb-substvars.5:163 dpkg-buildpackage.1:258 dpkg-distaddfile.1:49
-#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:708
-#: dpkg-split.1:231
+#: deb-substvars.5:163 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
+#: dpkg-deb.1:267 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:331 dpkg-source.1:732
+#: dpkg-split.1:225
 msgid "Copyright \\(co 1995-1996 Ian Jackson"
 msgstr ""
 
 #. type: Plain text
-#: deb-substvars.5:165 dpkg-buildpackage.1:260 dpkg-distaddfile.1:51
+#: deb-substvars.5:165 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
 #: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
-#: dpkg-shlibdeps.1:335 dpkg-source.1:710 dpkg-statoverride.8:90
+#: dpkg-shlibdeps.1:333 dpkg-source.1:734 dpkg-statoverride.8:89
 msgid "Copyright \\(co 2000 Wichert Akkerman"
 msgstr ""
 
@@ -2349,12 +2392,6 @@
 msgid "deb-symbols"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-symbols.5:2
-#, fuzzy, no-wrap
-msgid "2007-07-16"
-msgstr "2006-06-17"
-
 #. type: Plain text
 #: deb-symbols.5:5
 msgid "deb-symbols - Debian's extended shared library information file"
@@ -2374,12 +2411,12 @@
 
 #. type: Plain text
 #: deb-symbols.5:14
-msgid "E<lt>library sonameE<gt> E<lt>main dependency templateE<gt>"
+msgid "I<library-soname main-dependency-template>"
 msgstr ""
 
 #. type: Plain text
 #: deb-symbols.5:16
-msgid "[ | E<lt>alternative dependency templateE<gt> ]"
+msgid "[ | I<alternative-dependency-template> ]"
 msgstr ""
 
 #. type: Plain text
@@ -2389,7 +2426,7 @@
 
 #. type: Plain text
 #: deb-symbols.5:20
-msgid "[ * E<lt>field-nameE<gt>: E<lt>field valueE<gt> ]"
+msgid "[ * I<field-name>: I<field-value> ]"
 msgstr ""
 
 #. type: Plain text
@@ -2397,15 +2434,15 @@
 #, no-wrap
 msgid ""
 "[ ... ]\n"
-" E<lt>symbolE<gt> E<lt>minimal versionE<gt>[ E<lt>id of dependency templateE<gt> ]\n"
+" I<symbol> I<minimal-version>[ I<id-of-dependency-template> ]\n"
 msgstr ""
 
 #. type: Plain text
 #: deb-symbols.5:29
 msgid ""
-"The I<library soname> is exactly the value of the SONAME field as exported "
-"by B<objdump>(1). A I<dependency template> is a dependency where I<#MINVER#> "
-"is dynamically replaced either by a version check like \"(E<gt>= I<minimal "
+"The I<library-soname> is exactly the value of the SONAME field as exported "
+"by B<objdump>(1). A I<dependency-template> is a dependency where I<#MINVER#> "
+"is dynamically replaced either by a version check like \"(E<gt>= I<minimal-"
 "version>)\" or by nothing (if an unversioned dependency is deemed "
 "sufficient)."
 msgstr ""
@@ -2414,9 +2451,9 @@
 #: deb-symbols.5:36
 msgid ""
 "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> being "
-"\"Base\" if the library is not versioned) is associated to a I<minimal "
+"\"Base\" if the library is not versioned) is associated to a I<minimal-"
 "version> of its dependency template (the main dependency template is used if "
-"I<id of dependency template> is not present). The first alternative "
+"I<id-of-dependency-template> is not present). The first alternative "
 "dependency template is numbered 1, the second one 2, etc."
 msgstr ""
 
@@ -2426,8 +2463,8 @@
 "Each entry for a library can also have some fields of meta-information.  "
 "Those fields are stored on lines starting with an asterisk. Currently, the "
 "only valid field is I<Build-Depends-Package>, it indicates the name of the "
-"\"-dev\" package associated to the library and is used by dpkg-shlibdeps to "
-"make sure that the dependency generated is at least as strict as the "
+"\"-dev\" package associated to the library and is used by B<dpkg-shlibdeps> "
+"to make sure that the dependency generated is at least as strict as the "
 "corresponding build dependency."
 msgstr ""
 
@@ -2491,12 +2528,6 @@
 msgid "deb-triggers"
 msgstr "B<--version>"
 
-#. type: TH
-#: deb-triggers.5:1 dpkg-trigger.1:1
-#, fuzzy, no-wrap
-msgid "2009-03-15"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-triggers.5:4
 msgid "deb-triggers - package triggers"
@@ -2534,29 +2565,43 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:27
+#: deb-triggers.5:26
+msgid "B<interest-noawait> I<trigger-name>"
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.5:33
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file."
+"triggers control file. The \"noawait\" variant does not put the triggering "
+"packages in triggers-awaited state. This should be used when the "
+"functionality provided by the trigger is not crucial."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:31
+#: deb-triggers.5:37
 msgid "B<activate> I<trigger-name>"
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:37
+#: deb-triggers.5:41
+msgid "B<activate-noawait> I<trigger-name>"
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.5:50
 msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure."
+"conflicting package), purge and deconfigure.  The \"noawait\" variant does "
+"not put the triggering packages in triggers-awaited state. This should be "
+"used when the functionality provided by the trigger is not crucial."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:45
+#: deb-triggers.5:58
 msgid ""
 "If this package disappears during the unpacking of another package the "
 "trigger will be activated when the disappearance is noted towards the end of "
@@ -2566,14 +2611,23 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:48
+#: deb-triggers.5:61
 msgid ""
 "Unknown directives are an error which will prevent installation of the "
 "package."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:52
+#: deb-triggers.5:66
+msgid ""
+"The \"-noawait\" variants are only supported by dpkg 1.16.1 or newer, and "
+"will lead to errors if used with an older dpkg. It is thus recommended to "
+"add a \"Pre-Depends: dpkg (E<gt>= 1.16.1)\" to any package that wish to use "
+"those directives."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.5:70
 #, fuzzy
 msgid ""
 "B<dpkg-trigger>(1), B<dpkg>(1), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
@@ -2586,12 +2640,6 @@
 msgstr "dpkg-deb"
 
 #. type: TH
-#: dpkg.1:1
-#, fuzzy, no-wrap
-msgid "2011-02-05"
-msgstr "2006-02-28"
-
-#. type: TH
 #: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
 #: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-query.1:1
 #: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.cfg.5:1
@@ -2606,8 +2654,9 @@
 
 #. type: Plain text
 #: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
-msgstr ""
+#, fuzzy
+msgid "B<dpkg> [I<option>...] I<action>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: SH
 #: dpkg.1:9
@@ -2643,40 +2692,24 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:31
-msgid ""
-"B<dpkg> can 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
+#: dpkg.1:33
 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:42
-msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+"B<dpkg> can also be used as a front-end to B<dpkg-deb>(1) and B<dpkg-query>"
+"(1). The list of supported actions can be found later on in the B<ACTIONS> "
+"section. If any such action is encountered B<dpkg> just runs B<dpkg-deb> or "
+"B<dpkg-query> with the parameters given to it, but no specific options are "
+"currently passed to them, to use any such option the back-ends need to be "
+"called directly."
 msgstr ""
 
 #. type: SH
-#: dpkg.1:43
+#: dpkg.1:34
 #, no-wrap
 msgid "INFORMATION ABOUT PACKAGES"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:48
+#: dpkg.1:39
 msgid ""
 "B<dpkg> maintains some usable information about available packages. The "
 "information is divided in three classes: B<states>, B<selection states> and "
@@ -2684,173 +2717,173 @@
 msgstr ""
 
 #. type: SS
-#: dpkg.1:48
+#: dpkg.1:39
 #, no-wrap
 msgid "PACKAGE STATES"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:49
+#: dpkg.1:40
 #, no-wrap
 msgid "B<not-installed>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:52
+#: dpkg.1:43
 msgid "The package is not installed on your system."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:52
+#: dpkg.1:43
 #, no-wrap
 msgid "B<config-files>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:55
+#: dpkg.1:46
 msgid "Only the configuration files of the package exist on the system."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:55
+#: dpkg.1:46
 #, no-wrap
 msgid "B<half-installed>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:59
+#: dpkg.1:50
 msgid ""
 "The installation of the package has been started, but not completed for some "
 "reason."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:59
+#: dpkg.1:50
 #, no-wrap
 msgid "B<unpacked>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:62
+#: dpkg.1:53
 msgid "The package is unpacked, but not configured."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:62
+#: dpkg.1:53
 #, no-wrap
 msgid "B<half-configured>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:66
+#: dpkg.1:57
 msgid ""
 "The package is unpacked and configuration has been started, but not yet "
 "completed for some reason."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:66
+#: dpkg.1:57
 #, no-wrap
 msgid "B<triggers-awaited>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:69
+#: dpkg.1:60
 msgid "The package awaits trigger processing by another package."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:69
+#: dpkg.1:60
 #, no-wrap
 msgid "B<triggers-pending>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:72
+#: dpkg.1:63
 msgid "The package has been triggered."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:72
+#: dpkg.1:63
 #, no-wrap
 msgid "B<installed>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:75
+#: dpkg.1:66
 msgid "The package is unpacked and configured OK."
 msgstr ""
 
 #. type: SS
-#: dpkg.1:75
+#: dpkg.1:66
 #, no-wrap
 msgid "PACKAGE SELECTION STATES"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:76
+#: dpkg.1:67
 #, no-wrap
 msgid "B<install>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:79
+#: dpkg.1:70
 msgid "The package is selected for installation."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:79
+#: dpkg.1:70
 #, fuzzy, no-wrap
 msgid "B<hold>"
 msgstr "B<--old>"
 
 #. type: Plain text
-#: dpkg.1:83
+#: dpkg.1:74
 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:83
+#: dpkg.1:74
 #, no-wrap
 msgid "B<deinstall>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:87
+#: dpkg.1:78
 msgid ""
 "The package is selected for deinstallation (i.e. we want to remove all "
 "files, except configuration files)."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:87
+#: dpkg.1:78
 #, no-wrap
 msgid "B<purge>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:91
+#: dpkg.1:82
 msgid ""
 "The package is selected to be purged (i.e. we want to remove everything from "
 "system directories, even configuration files)."
 msgstr ""
 
 #. type: SS
-#: dpkg.1:91
+#: dpkg.1:82
 #, no-wrap
 msgid "PACKAGE FLAGS"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:92
+#: dpkg.1:83
 #, no-wrap
 msgid "B<reinst-required>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:97
+#: dpkg.1:88
 msgid ""
 "A package marked B<reinst-required> is broken and requires reinstallation. "
 "These packages cannot be removed, unless forced with option B<--force-remove-"
@@ -2858,56 +2891,56 @@
 msgstr ""
 
 #. type: SH
-#: dpkg.1:98
+#: dpkg.1:89 dselect.1:120
 #, fuzzy, no-wrap
 msgid "ACTIONS"
 msgstr "MŰVELETI LEHETŐSÉGEK"
 
 #. type: TP
-#: dpkg.1:99
+#: dpkg.1:90
 #, fuzzy, no-wrap
-msgid "B<-i>, B<--install> I<package_file>..."
+msgid "B<-i>, B<--install> I<package-file>..."
 msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
 
 #. type: Plain text
-#: dpkg.1:103
+#: dpkg.1:94
 msgid ""
 "Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"I<package-file> must refer to a directory instead."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:105
+#: dpkg.1:96
 msgid "Installation consists of the following steps:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:108
+#: dpkg.1:99
 #, 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:112
+#: dpkg.1:103
 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 ""
 
 #. type: Plain text
-#: dpkg.1:115
+#: dpkg.1:106
 msgid "B<3.> Run I<preinst> script, if provided by the package."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:119
+#: dpkg.1:110
 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:126
+#: dpkg.1:117
 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 "
@@ -2916,33 +2949,33 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:130
+#: dpkg.1:121
 msgid ""
 "B<6.> Configure the package. See B<--configure> for detailed information "
 "about how this is done."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:130
+#: dpkg.1:121
 #, fuzzy, no-wrap
-msgid "B<--unpack >I<package_file>..."
+msgid "B<--unpack >I<package-file>..."
 msgstr "B<Package:> E<lt>csomag névE<gt>"
 
 #. type: Plain text
-#: dpkg.1:135
+#: dpkg.1:126
 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."
+"option is specified, I<package-file> must refer to a directory instead."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:135
+#: dpkg.1:126
 #, no-wrap
 msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:140
+#: dpkg.1:131
 msgid ""
 "Configure a package which has been unpacked but not yet configured.  If B<-"
 "a> or B<--pending> is given instead of I<package>, all unpacked but "
@@ -2950,37 +2983,37 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:144
+#: dpkg.1:135
 msgid ""
 "To reconfigure a package which has already been configured, try the B<dpkg-"
 "reconfigure>(8)  command instead."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:146
+#: dpkg.1:137
 msgid "Configuring consists of the following steps:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:151
+#: dpkg.1:142
 msgid ""
 "B<1.> Unpack the conffiles, and at the same time back up the old conffiles, "
 "so that they can be restored if something goes wrong."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:154
+#: dpkg.1:145
 msgid "B<2.> Run I<postinst> script, if provided by the package."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:154
+#: dpkg.1:145
 #, no-wrap
 msgid "B<--triggers-only> I<package>...|B<-a>|B<--pending>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:161
+#: dpkg.1:152
 msgid ""
 "Processes only triggers. All pending triggers will be processed. If package "
 "names are supplied only those packages' triggers will be processed, exactly "
@@ -2990,13 +3023,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:161
+#: dpkg.1:152
 #, no-wrap
 msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:178
+#: dpkg.1:169
 msgid ""
 "Remove an installed package. B<-r> or B<--remove> remove everything except "
 "conffiles. This may avoid having to reconfigure the package if it is "
@@ -3014,33 +3047,33 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:180
+#: dpkg.1:171
 msgid "Removing of a package consists of the following steps:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:183
+#: dpkg.1:174
 msgid "B<1.> Run I<prerm> script"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:186
+#: dpkg.1:177
 msgid "B<2.> Remove the installed files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:189
+#: dpkg.1:180
 msgid "B<3.> Run I<postrm> script"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:190
+#: dpkg.1:181
 #, fuzzy, no-wrap
 msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 
 #. type: Plain text
-#: dpkg.1:199
+#: dpkg.1:190
 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 "
@@ -3051,7 +3084,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:204
+#: dpkg.1:195
 msgid ""
 "A simpler one-shot command to retrieve and update the I<available> file is "
 "B<dselect update>. Note that this file is mostly useless if you don't use "
@@ -3060,65 +3093,65 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:204
+#: dpkg.1:195
 #, fuzzy, no-wrap
-msgid "B<-A>, B<--record-avail> I<package_file>..."
+msgid "B<-A>, B<--record-avail> I<package-file>..."
 msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 
 #. type: Plain text
-#: dpkg.1:210
+#: dpkg.1:201
 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."
+"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:210
+#: dpkg.1:201
 #, no-wrap
 msgid "B<--forget-old-unavail>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:214
+#: dpkg.1:205
 msgid ""
 "Now B<obsolete> and a no-op as B<dpkg> will automatically forget uninstalled "
 "unavailable packages."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:214
+#: dpkg.1:205
 #, fuzzy, no-wrap
 msgid "B<--clear-avail>"
 msgstr "B<--old>"
 
 #. type: Plain text
-#: dpkg.1:217
+#: dpkg.1:208
 #, 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:217
+#: dpkg.1:208
 #, fuzzy, no-wrap
 msgid " B<-C>, B<--audit>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg.1:222
+#: dpkg.1:213
 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: TP
-#: dpkg.1:222
+#: dpkg.1:213
 #, fuzzy, no-wrap
 msgid "B<--get-selections> [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.1:227
+#: dpkg.1:218
 msgid ""
 "Get list of package selections, and write it to stdout. Without a pattern, "
 "non-installed packages (i.e. those which have been previously purged)  will "
@@ -3126,28 +3159,28 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:227 update-alternatives.8:300
+#: dpkg.1:218 update-alternatives.8:299
 #, fuzzy, no-wrap
 msgid "B<--set-selections>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg.1:233
+#: dpkg.1:224
 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 format 'I<package> I<state>', where state is one of B<install>, B<hold>, "
+"B<deinstall> or B<purge>. Blank lines and comment lines beginning with '#' "
+"are also permitted."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:233
+#: dpkg.1:224
 #, fuzzy, no-wrap
 msgid "B<--clear-selections>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg.1:238
+#: dpkg.1:229
 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 "
@@ -3155,38 +3188,38 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:238
+#: dpkg.1:229
 #, no-wrap
 msgid "B<--yet-to-unpack>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:242
+#: dpkg.1:233
 msgid ""
 "Searches for packages selected for installation, but which for some reason "
 "still haven't been installed."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:243
+#: dpkg.1:234
 #, fuzzy, no-wrap
 msgid "B<--print-architecture>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg.1:246
+#: dpkg.1:237
 msgid ""
 "Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:246
+#: dpkg.1:237
 #, no-wrap
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:257
+#: dpkg.1:248
 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 "
@@ -3199,82 +3232,81 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:257
+#: dpkg.1:248
 #, fuzzy, no-wrap
-msgid "B<--command-fd >I<E<lt>nE<gt>>"
+msgid "B<--command-fd >I<n>"
 msgstr "B<Section:> E<lt>szakaszE<gt>"
 
 #. type: Plain text
-#: dpkg.1:262
+#: dpkg.1:253
 msgid ""
-"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and through this file "
-"descriptor, are not reset for subsequent commands executed during the same "
-"run."
+"Accept a series of commands on input file descriptor I<n>. Note: additional "
+"options set on the command line, and through this file descriptor, are not "
+"reset for subsequent commands executed during the same run."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:262 dpkg-architecture.1:61 dpkg-buildflags.1:71 dpkg-divert.8:71
-#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
-#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
+#: dpkg.1:253 dpkg-architecture.1:60 dpkg-buildflags.1:89 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:66 dpkg-statoverride.8:44
+#: dpkg-vendor.1:28 dselect.1:113 update-alternatives.8:316
 #, fuzzy, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>, B<-h>"
 
 #. type: Plain text
-#: dpkg.1:265
+#: dpkg.1:256
 msgid "Display a brief help message."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:265
+#: dpkg.1:256
 #, fuzzy, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg.1:268
+#: dpkg.1:259
 msgid "Give help about the B<--force->I<thing> options."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:268
+#: dpkg.1:259
 #, fuzzy, no-wrap
 msgid "B<-Dh>, B<--debug=help>"
 msgstr "B<--debug>, B<-D>"
 
 #. type: Plain text
-#: dpkg.1:271
+#: dpkg.1:262
 msgid "Give help about debugging options."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:271 dpkg-architecture.1:64 dpkg-buildflags.1:74
+#: dpkg.1:262 dpkg-architecture.1:63 dpkg-buildflags.1:92
 #: dpkg-buildpackage.1:226 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
-#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
-#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
-#: dpkg-shlibdeps.1:220 dpkg-source.1:93 dpkg-split.1:130
-#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
-#: update-alternatives.8:320
+#: dpkg-deb.1:175 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:113 dpkg-scanpackages.1:99 dpkg-scansources.1:68
+#: dpkg-shlibdeps.1:218 dpkg-source.1:99 dpkg-split.1:129
+#: dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:116
+#: update-alternatives.8:319
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg.1:274
+#: dpkg.1:265
 #, fuzzy
 msgid "Display B<dpkg> version information."
 msgstr "Kiírja a B<dpkg-deb> verziószámát."
 
 #. type: TP
-#: dpkg.1:274
+#: dpkg.1:265
 #, no-wrap
 msgid "B<dpkg-deb actions>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:277
+#: dpkg.1:268
 #, fuzzy
 msgid "See B<dpkg-deb>(1) for more information about the following actions."
 msgstr ""
@@ -3282,7 +3314,7 @@
 "róluk."
 
 #. type: Plain text
-#: dpkg.1:297
+#: dpkg.1:288
 #, no-wrap
 msgid ""
 "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
@@ -3306,18 +3338,18 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:299
+#: dpkg.1:290
 #, no-wrap
 msgid "B<dpkg-query actions>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:302
+#: dpkg.1:293
 msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:317
+#: dpkg.1:308
 #, no-wrap
 msgid ""
 "B<-l>, B<--list> I<package-name-pattern>...\n"
@@ -3335,20 +3367,20 @@
 msgstr ""
 
 #. type: SH
-#: dpkg.1:319 dpkg-architecture.1:68 dpkg-buildpackage.1:50
-#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
+#: dpkg.1:310 dpkg-architecture.1:67 dpkg-buildpackage.1:50
+#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:179
 #: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
-#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
-#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
-#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
-#: start-stop-daemon.8:100 update-alternatives.8:324
+#: dpkg-gensymbols.1:369 dpkg-mergechangelogs.1:27 dpkg-name.1:30
+#: dpkg-parsechangelog.1:15 dpkg-query.1:117 dpkg-scanpackages.1:71
+#: dpkg-scansources.1:44 dpkg-shlibdeps.1:106 dpkg-split.1:133
+#: dpkg-statoverride.8:51 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:36
+#: start-stop-daemon.8:103 update-alternatives.8:323
 #, fuzzy, no-wrap
 msgid "OPTIONS"
 msgstr "MÁS LEHETŐSÉGEK"
 
 #. type: Plain text
-#: dpkg.1:325
+#: dpkg.1:316
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg> or the files on the configuration "
@@ -3358,24 +3390,24 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:326
+#: dpkg.1:317
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:329
+#: dpkg.1:320
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:329
+#: dpkg.1:320
 #, fuzzy, no-wrap
 msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: dpkg.1:335
+#: dpkg.1:326
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -3384,13 +3416,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:335
+#: dpkg.1:326
 #, no-wrap
 msgid "B<-D>I<octal>B<, --debug=>I<octal>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:341
+#: dpkg.1:332
 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 "
@@ -3398,7 +3430,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:356
+#: dpkg.1:347
 #, no-wrap
 msgid ""
 "    Number   Description\n"
@@ -3418,13 +3450,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:356
+#: dpkg.1:347
 #, no-wrap
 msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:363
+#: dpkg.1:354
 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<--"
@@ -3433,7 +3465,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:367
+#: dpkg.1:358
 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 "
@@ -3441,19 +3473,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:370
+#: dpkg.1:361
 msgid "B<all>: Turns on (or off) all force options."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:373
+#: dpkg.1:364
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:380
+#: dpkg.1:371
 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 "
@@ -3463,19 +3495,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:384
+#: dpkg.1:375
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:387
+#: dpkg.1:378
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:392
+#: dpkg.1:383
 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 "
@@ -3483,7 +3515,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:397
+#: dpkg.1:388
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -3491,37 +3523,37 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:400
+#: dpkg.1:391
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:403
+#: dpkg.1:394
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:406
+#: dpkg.1:397
 msgid "B<breaks>: Install, even if this would break another package."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:410
+#: dpkg.1:401
 msgid ""
 "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:415
+#: dpkg.1:406
 msgid ""
 "B<confmiss>: Always install a missing conffile. This is dangerous, since it "
 "means not preserving a change (removing) made to the file."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:420
+#: dpkg.1:411
 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 "
@@ -3529,7 +3561,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:425
+#: dpkg.1:416
 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 "
@@ -3537,7 +3569,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:431
+#: dpkg.1:422
 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 "
@@ -3546,7 +3578,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:438
+#: dpkg.1:429
 msgid ""
 "B<confask>: If a conffile has been modified always offer to replace it with "
 "the version in the package, even if the version in the package did not "
@@ -3556,23 +3588,23 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:441
+#: dpkg.1:432
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:444
+#: dpkg.1:435
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:447
+#: dpkg.1:438
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:455
+#: dpkg.1:446
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking. Currently "
 "this implies not performing file system syncs before file renames, which is "
@@ -3583,7 +3615,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:461
+#: dpkg.1:452
 msgid ""
 "I<Note>: For ext4, the main offender, consider using instead the mount "
 "option B<nodelalloc>, which will fix both the performance degradation and "
@@ -3593,79 +3625,59 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:464
+#: dpkg.1:455
 msgid ""
 "I<Warning: Using this option might improve performance at the cost of losing "
 "data, use with care.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:467
+#: dpkg.1:458
 msgid "B<architecture>: Process even packages with wrong or no architecture."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:470
+#: dpkg.1:461
+msgid "B<bad-version>: Process even packages with wrong versions."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.1:464
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:473
+#: dpkg.1:467
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:476
+#: dpkg.1:470
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:477
+#: dpkg.1:471
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:481
+#: dpkg.1:475
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:481
-#, fuzzy, no-wrap
-msgid "B<--new>, B<--old>"
-msgstr "B<--info>, B<-I>"
-
-#. type: Plain text
-#: dpkg.1:485
-msgid ""
-"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
-msgstr ""
-
-#. type: TP
-#: dpkg.1:485 dpkg-deb.1:209
-#, no-wrap
-msgid "B<--nocheck>"
-msgstr "B<--nocheck>"
-
-#. type: Plain text
-#: dpkg.1:489
-msgid ""
-"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:489
+#: dpkg.1:475
 #, no-wrap
 msgid "B<--no-act>, B<--dry-run>, B<--simulate>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:494
+#: dpkg.1:480
 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 "
@@ -3673,7 +3685,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:499
+#: dpkg.1:485
 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 "
@@ -3682,13 +3694,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:499
+#: dpkg.1:485
 #, fuzzy, no-wrap
 msgid "B<-R>, B<--recursive>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg.1:505
+#: dpkg.1:491
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -3696,27 +3708,27 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:505
+#: dpkg.1:491
 #, fuzzy, no-wrap
 msgid "B<-G>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg.1:509
+#: dpkg.1:495
 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.1:509 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
-#: dpkg-query.1:112 dpkg-shlibdeps.1:213 dpkg-trigger.1:39
+#: dpkg.1:495 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
+#: dpkg-query.1:118 dpkg-shlibdeps.1:211 dpkg-trigger.1:39
 #, no-wrap
 msgid "B<--admindir=>I<dir>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:514
+#: dpkg.1:500
 msgid ""
 "Change default administrative directory, which contains many files that give "
 "information about status of installed or uninstalled packages, etc.  "
@@ -3724,13 +3736,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:514
+#: dpkg.1:500
 #, fuzzy, no-wrap
 msgid "B<--instdir=>I<dir>"
 msgstr "B<--showformat=>I<formátum>"
 
 #. type: Plain text
-#: dpkg.1:521
+#: dpkg.1:507
 msgid ""
 "Change default installation directory which refers to the directory where "
 "packages are to be installed. B<instdir> is also the directory passed to "
@@ -3739,26 +3751,26 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:521
+#: dpkg.1:507
 #, fuzzy, no-wrap
 msgid "B<--root=>I<dir>"
 msgstr "B<--field>, B<-f>"
 
 #. type: Plain text
-#: dpkg.1:525
+#: dpkg.1:511
 msgid ""
 "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 "var/lib/dpkg>."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:525
+#: dpkg.1:511
 #, fuzzy, no-wrap
 msgid "B<-O>, B<--selected-only>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: dpkg.1:531
+#: dpkg.1:517
 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 "
@@ -3767,30 +3779,30 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:531
+#: dpkg.1:517
 #, fuzzy, no-wrap
 msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg.1:535
+#: dpkg.1:521
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:537
+#: dpkg.1:523
 msgid "B<--pre-invoke=>I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:539
+#: dpkg.1:525
 msgid "B<--post-invoke=>I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:548
+#: dpkg.1:534
 msgid ""
 "Set an invoke hook I<command> to be run via ``sh -c'' before or after the "
 "dpkg run for the I<unpack>, I<configure>, I<install>, I<triggers-only>, "
@@ -3803,31 +3815,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:551
+#: dpkg.1:537
 msgid "B<--path-exclude=>I<glob-pattern>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:553
+#: dpkg.1:539
 msgid "B<--path-include=>I<glob-pattern>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:556
+#: dpkg.1:542
 msgid ""
 "Set I<glob-pattern> as a path filter, either by excluding or re-including "
 "previously excluded paths matching the specified patterns during install."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:559
+#: dpkg.1:545
 msgid ""
 "I<Warning: take into account that depending on the excluded paths you might "
 "completely break your system, use with caution.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:569
+#: dpkg.1:555
 msgid ""
 "The glob patterns use the same wildcards used in the shell, were '*' matches "
 "any sequence of characters, including the empty string and also '/'. For "
@@ -3841,14 +3853,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:572
+#: dpkg.1:558
 msgid ""
 "This can be used to remove all paths except some particular ones; a typical "
 "case is:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:576
+#: dpkg.1:562
 #, no-wrap
 msgid ""
 "B<--path-exclude=/usr/share/doc/*>\n"
@@ -3856,12 +3868,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:579
+#: dpkg.1:565
 msgid "to remove all documentation files except the copyright files."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:583
+#: dpkg.1:569
 msgid ""
 "These two options can be specified multiple times, and interleaved with each "
 "other. Both are processed in the given order, with the last rule that "
@@ -3869,13 +3881,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:584
+#: dpkg.1:570
 #, no-wrap
 msgid "B<--status-fd >I<n>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:590
+#: dpkg.1:576
 msgid ""
 "Send machine-readable package status and progress information to file "
 "descriptor I<n>. This option can be specified multiple times. The "
@@ -3883,48 +3895,48 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:591
+#: dpkg.1:577
 #, no-wrap
 msgid "B<status: >I<package>B<: >I<status>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:594
+#: dpkg.1:580
 msgid "Package status changed; I<status> is as in the status file."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:594
+#: dpkg.1:580
 #, no-wrap
 msgid "B<status: >I<package>B< : error : >I<extended-error-message>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:598
+#: dpkg.1:584
 msgid ""
 "An error occurred. Any possible newlines in I<extended-error-message> will "
 "be converted to spaces before output."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:598
+#: dpkg.1:584
 #, no-wrap
 msgid "B<status: >I<file>B< : conffile-prompt : '>I<real-old>B<' '>I<real-new>B<' >I<useredited>B< >I<distedited>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:601
+#: dpkg.1:587
 msgid "User is being asked a conffile question."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:601
+#: dpkg.1:587
 #, no-wrap
 msgid "B<processing: >I<stage>B<: >I<package>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:606
+#: dpkg.1:592
 msgid ""
 "Sent just before a processing stage starts. I<stage> is one of B<upgrade>, "
 "B<install> (both sent before unpacking), B<configure>, B<trigproc>, "
@@ -3932,13 +3944,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:607
+#: dpkg.1:593
 #, no-wrap
 msgid "B<--status-logger>=I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:612
+#: dpkg.1:598
 msgid ""
 "Send machine-readable package status and progress information to the shell "
 "I<command>'s standard input. This option can be specified multiple times. "
@@ -3946,44 +3958,43 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:613
+#: dpkg.1:599
 #, fuzzy, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--licence>"
 
 #. type: Plain text
-#: dpkg.1:625
+#: dpkg.1:611
 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."
+"I<state> I<pkg> I<installed-version>' for status change updates; `YYYY-MM-DD "
+"HH:MM:SS I<action> I<pkg> I<installed-version> I<available-version>' for "
+"actions where I<action> is one of B<install>, B<upgrade>, B<remove>, "
+"B<purge>; and `YYYY-MM-DD HH:MM:SS conffile I<filename> I<decision>' for "
+"conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:625
+#: dpkg.1:611
 #, fuzzy, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg.1:628
+#: dpkg.1:614
 msgid "Do not try to verify package signatures."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:628
+#: dpkg.1:614
 #, fuzzy, no-wrap
 msgid "B<--no-triggers>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg.1:637
+#: dpkg.1:623
 msgid ""
 "Do not run any triggers in this run (activations will still be recorded).  "
 "If used with B<--configure> I<package> or B<--triggers-only> I<package> then "
@@ -3994,64 +4005,64 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:637
+#: dpkg.1:623
 #, fuzzy, no-wrap
 msgid "B<--triggers>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg.1:640
+#: dpkg.1:626
 msgid "Cancels a previous B<--no-triggers>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:642 dpkg.cfg.5:16
+#: dpkg.1:628 dpkg.cfg.5:16
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.1:645
+#: dpkg.1:631
 msgid "Configuration file with default options."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:645
+#: dpkg.1:631
 #, fuzzy, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.1:649
+#: dpkg.1:635
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:652
+#: dpkg.1:638
 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: TP
-#: dpkg.1:652
+#: dpkg.1:638
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:655
+#: dpkg.1:641
 msgid "List of available packages."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:655
+#: dpkg.1:641
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:661
+#: dpkg.1:647
 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, "
@@ -4059,268 +4070,268 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:650
 msgid ""
 "The status file is backed up daily in I</var/backups>. It can be useful if "
 "it's lost or corrupted due to filesystems troubles."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:653
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:667
+#: dpkg.1:653
 #, fuzzy, no-wrap
 msgid "I<control>"
 msgstr "kontroll"
 
 #. type: TP
-#: dpkg.1:669
+#: dpkg.1:655
 #, no-wrap
 msgid "I<conffiles>"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:671
+#: dpkg.1:657
 #, no-wrap
 msgid "I<preinst>"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:673
+#: dpkg.1:659
 #, no-wrap
 msgid "I<postinst>"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:675
+#: dpkg.1:661
 #, no-wrap
 msgid "I<prerm>"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:677
+#: dpkg.1:663
 #, no-wrap
 msgid "I<postrm>"
 msgstr ""
 
 #. type: SH
-#: dpkg.1:680 dpkg-buildflags.1:110 dpkg-buildpackage.1:230 dpkg-deb.1:219
-#: dpkg-divert.8:112 dpkg-query.1:196 dpkg-statoverride.8:69 dpkg-trigger.1:60
-#: dpkg-vendor.1:42 dselect.1:430 update-alternatives.8:355
+#: dpkg.1:666 dpkg-buildflags.1:128 dpkg-buildpackage.1:230 dpkg-deb.1:232
+#: dpkg-divert.8:112 dpkg-query.1:204 dpkg-statoverride.8:68 dpkg-trigger.1:60
+#: dpkg-vendor.1:42 dselect.1:423 update-alternatives.8:354
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr ""
 
 #. type: TP
-#: dpkg.1:681 dselect.1:431
+#: dpkg.1:667 dselect.1:424
 #, fuzzy, no-wrap
 msgid "B<HOME>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:671
 msgid ""
 "If set, B<dpkg> will use it as the directory from which to read the user "
 "specific configuration file."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:685 dpkg-deb.1:220
+#: dpkg.1:671 dpkg-deb.1:233
 #, no-wrap
 msgid "B<TMPDIR>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:689
+#: dpkg.1:675
 msgid ""
 "If set, B<dpkg> will use it as the directory in which to create temporary "
 "files and directories."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:689
+#: dpkg.1:675
 #, fuzzy, no-wrap
 msgid "B<PAGER>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg.1:692
+#: dpkg.1:678
 msgid "The program B<dpkg> will execute when displaying the conffiles."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:692
+#: dpkg.1:678
 #, no-wrap
 msgid "B<SHELL>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:695
+#: dpkg.1:681
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:695 dpkg-query.1:201
+#: dpkg.1:681 dpkg-query.1:209
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:699
+#: dpkg.1:685
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:699
+#: dpkg.1:685
 #, no-wrap
 msgid "B<DPKG_SHELL_REASON>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:689
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Current valid value: B<conffile-prompt>."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:703
+#: dpkg.1:689
 #, no-wrap
 msgid "B<DPKG_CONFFILE_OLD>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:707
+#: dpkg.1:693
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the old conffile."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:707
+#: dpkg.1:693
 #, no-wrap
 msgid "B<DPKG_CONFFILE_NEW>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:711
+#: dpkg.1:697
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the new conffile."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:711
+#: dpkg.1:697
 #, no-wrap
 msgid "B<DPKG_RUNNING_VERSION>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:715
+#: dpkg.1:701
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the version of "
 "the currently running B<dpkg> instance."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:715 dpkg-divert.8:117
+#: dpkg.1:701 dpkg-divert.8:117
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:719
+#: dpkg.1:705
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the package name "
 "being handled."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:719
+#: dpkg.1:705
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_ARCH>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:709
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the architecture "
 "the package got built for."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:723
+#: dpkg.1:709
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_NAME>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:727
+#: dpkg.1:713
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the name of the "
 "script running (preinst, postinst, prerm, postrm)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:730
+#: dpkg.1:716
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:732
+#: dpkg.1:718
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:735
+#: dpkg.1:721
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:737
+#: dpkg.1:723
 #, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:740
+#: dpkg.1:726
 msgid "To search the listing of packages yourself:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:742
+#: dpkg.1:728
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:745
+#: dpkg.1:731
 msgid "To remove an installed elvis package:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:747
+#: dpkg.1:733
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:752
+#: dpkg.1:738
 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: Plain text
-#: dpkg.1:755
+#: dpkg.1:741
 #, no-wrap
 msgid ""
 "     B<cd /media/cdrom/pool/main/v/vim>\n"
@@ -4328,24 +4339,24 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:758
+#: dpkg.1:744
 msgid "To make a local copy of the package selection states:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:760
+#: dpkg.1:746
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:764
+#: dpkg.1:750
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:767
+#: dpkg.1:753
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -4353,7 +4364,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:773
+#: dpkg.1:759
 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 "
@@ -4362,39 +4373,39 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:776
+#: dpkg.1:762
 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:778
+#: dpkg.1:764
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:781
+#: dpkg.1:767
 msgid ""
 "Additional functionality can be gained by installing any of the following "
 "packages: B<apt>, B<aptitude> and B<debsums>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:793
+#: dpkg.1:779
 msgid ""
 "B<aptitude>(1), B<apt>(1), 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.1:796
+#: dpkg.1:782
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:799 dpkg.cfg.5:22
+#: dpkg.1:785 dpkg.cfg.5:22
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
 "contributed to B<dpkg>."
@@ -4408,12 +4419,6 @@
 msgid "dpkg-architecture"
 msgstr ""
 
-#. type: TH
-#: dpkg-architecture.1:1
-#, fuzzy, no-wrap
-msgid "2009-08-15"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-architecture.1:4
 msgid ""
@@ -4421,26 +4426,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:9
-msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
-msgstr ""
+#: dpkg-architecture.1:8
+#, fuzzy
+msgid "B<dpkg-architecture> [I<option>...] [I<command>]"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg-architecture.1:13
 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:16
 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:25
 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 "
@@ -4452,35 +4458,35 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:27 dpkg-buildflags.1:34 dpkg-deb.1:28 dpkg-divert.8:24
-#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
-#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
-#: update-alternatives.8:203
+#: dpkg-architecture.1:26 dpkg-buildflags.1:45 dpkg-deb.1:27 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:18 dpkg-split.1:31 dpkg-statoverride.8:23
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:34
+#: update-alternatives.8:202
 #, no-wrap
 msgid "COMMANDS"
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:28
+#: dpkg-architecture.1:27
 #, fuzzy, no-wrap
 msgid "B<-l>"
 msgstr "B<--old>"
 
 #. type: Plain text
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 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:31
 #, no-wrap
 msgid "B<-e>I<debian-architecture>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 msgid ""
 "Check for equality of architecture. By default I<debian-architecture> is "
 "compared against the current Debian architecture, being the host.  This "
@@ -4489,13 +4495,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 #, no-wrap
 msgid "B<-i>I<architecture-wildcard>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 msgid ""
 "Check for identity of architecture by expanding I<architecture-wildcard> as "
 "an architecture wildcard and comparing against the current Debian "
@@ -4504,119 +4510,119 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 #, no-wrap
 msgid "B<-q>I<variable-name>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 msgid "Print the value of a single variable."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 #, fuzzy, no-wrap
 msgid "B<-s>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 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:50
 #, fuzzy, no-wrap
 msgid "B<-u>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 #, no-wrap
 msgid "B<-c>I< command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 msgid ""
 "Execute a I<command> in an environment which has all variables set to the "
 "determined value."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 #, fuzzy, no-wrap
 msgid "B<-L>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-architecture.1:61
+#: dpkg-architecture.1:60
 msgid "Print a list of valid architecture names."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildflags.1:74 dpkg-buildpackage.1:226
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-architecture.1:63 dpkg-buildflags.1:92 dpkg-buildpackage.1:226
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:175
 #: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
-#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:93
-#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
-#: update-alternatives.8:320
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-name.1:61
+#: dpkg-parsechangelog.1:36 dpkg-query.1:113 dpkg-scanpackages.1:99
+#: dpkg-scansources.1:68 dpkg-shlibdeps.1:218 dpkg-source.1:99
+#: dpkg-split.1:129 dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31
+#: update-alternatives.8:319
 msgid "Show the usage message and exit."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildflags.1:77 dpkg-buildpackage.1:229
-#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-architecture.1:66 dpkg-buildflags.1:95 dpkg-buildpackage.1:229
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:178
 #: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
-#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
-#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:96
-#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
-#: update-alternatives.8:323
+#: dpkg-gensymbols.1:449 dpkg-mergechangelogs.1:44 dpkg-name.1:64
+#: dpkg-parsechangelog.1:39 dpkg-query.1:116 dpkg-scanpackages.1:102
+#: dpkg-scansources.1:70 dpkg-shlibdeps.1:221 dpkg-source.1:102
+#: dpkg-split.1:132 dpkg-statoverride.8:50 dpkg-trigger.1:37 dpkg-vendor.1:34
+#: update-alternatives.8:322
 #, fuzzy
 msgid "Show the version and exit."
 msgstr "Kiírja a B<dpkg-deb> verziószámát."
 
 #. type: TP
-#: dpkg-architecture.1:69
+#: dpkg-architecture.1:68
 #, no-wrap
 msgid "B<-a>I<debian-architecture>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:72
+#: dpkg-architecture.1:71
 msgid "Set the Debian architecture."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:72 dpkg-buildpackage.1:110
+#: dpkg-architecture.1:71 dpkg-buildpackage.1:110
 #, no-wrap
 msgid "B<-t>I<gnu-system-type>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 msgid "Set the GNU system type."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 #, fuzzy, no-wrap
 msgid "B<-f>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-architecture.1:82
+#: dpkg-architecture.1:81
 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 "
@@ -4626,54 +4632,54 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:83
+#: dpkg-architecture.1:82
 #, no-wrap
 msgid "TERMS"
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:84
+#: dpkg-architecture.1:83
 #, no-wrap
 msgid "build machine"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 msgid "The machine the package is built on."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 #, no-wrap
 msgid "host machine"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 msgid "The machine the package is built for."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 #, fuzzy, no-wrap
 msgid "Debian architecture"
 msgstr "Debian Project"
 
 #. type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 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:90
 #, no-wrap
 msgid "architecture wildcard"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 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>-"
@@ -4681,13 +4687,13 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 #, no-wrap
 msgid "\\s-1GNU\\s0 system type"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:99
+#: dpkg-architecture.1:98
 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, "
@@ -4695,226 +4701,226 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:100
+#: dpkg-architecture.1:99
 #, no-wrap
 msgid "VARIABLES"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 msgid "The Debian architecture of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:106
+#: dpkg-architecture.1:105
 msgid "The Debian system name of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:106
+#: dpkg-architecture.1:105
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 msgid "The Debian cpu name of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 msgid "The pointer size of the build machine (in bits)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 msgid "The endianness of the build machine (little / big)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 #, no-wrap
 msgid "\\s-1DEB_BUILD_MULTIARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 msgid ""
 "The clarified \\s-1GNU\\s0 system type of the build machine, used for "
 "filesystem paths."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 msgid "The Debian architecture of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 msgid "The Debian system name of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 msgid "The Debian cpu name of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_BITS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 msgid "The pointer size of the host machine (in bits)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_ENDIAN\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 msgid "The endianness of the host machine (little / big)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 #, no-wrap
 msgid "\\s-1DEB_HOST_MULTIARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:140
+#: dpkg-architecture.1:139
 msgid ""
 "The clarified \\s-1GNU\\s0 system type of the host machine, used for "
 "filesystem paths."
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:141
+#: dpkg-architecture.1:140
 #, no-wrap
 msgid "DEBIAN/RULES"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:149
+#: dpkg-architecture.1:148
 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 "
@@ -4925,12 +4931,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:152 dpkg-architecture.1:169
+#: dpkg-architecture.1:151 dpkg-architecture.1:168
 msgid "Instead of:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:156
+#: dpkg-architecture.1:155
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -4938,12 +4944,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:159
+#: dpkg-architecture.1:158
 msgid "please use the following:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:163
+#: dpkg-architecture.1:162
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
@@ -4951,13 +4957,13 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:165
+#: dpkg-architecture.1:164
 #, 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:175
+#: dpkg-architecture.1:174
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -4967,18 +4973,18 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:178
+#: dpkg-architecture.1:177
 msgid "please use:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:181
+#: dpkg-architecture.1:180
 #, no-wrap
 msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:185
+#: dpkg-architecture.1:184
 #, no-wrap
 msgid ""
 "ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
@@ -4987,14 +4993,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:189
+#: dpkg-architecture.1:188
 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:194
+#: dpkg-architecture.1:193
 msgid ""
 "In general, calling dpkg in the rules file to get architecture information "
 "is deprecated (unless you want to provide backward compatibility, see "
@@ -5003,13 +5009,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:195
+#: dpkg-architecture.1:194
 #, no-wrap
 msgid "BACKWARD COMPATIBILITY"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:199
+#: dpkg-architecture.1:198
 msgid ""
 "The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced in dpkg-"
 "dev 1.15.4. Using them in I<debian/rules> thus requires a build-dependency "
@@ -5017,7 +5023,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:204
+#: dpkg-architecture.1:203
 msgid ""
 "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in dpkg-"
 "dev 1.13.2. Before this I<debian/rules> files tended to check the values of "
@@ -5026,7 +5032,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:209
+#: dpkg-architecture.1:208
 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 "
@@ -5035,7 +5041,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:213
+#: dpkg-architecture.1:212
 #, no-wrap
 msgid ""
 "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
@@ -5043,7 +5049,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:227
+#: dpkg-architecture.1:226
 #, no-wrap
 msgid ""
 "# Take account of old dpkg-architecture output.\n"
@@ -5062,19 +5068,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:230
+#: dpkg-architecture.1:229
 msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:233
+#: dpkg-architecture.1:232
 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:243
+#: dpkg-architecture.1:242
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
@@ -5088,7 +5094,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:248
+#: dpkg-architecture.1:247
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
@@ -5098,14 +5104,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:252
+#: dpkg-architecture.1:251
 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:259
+#: dpkg-architecture.1:258
 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 "
@@ -5116,113 +5122,113 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:262
+#: dpkg-architecture.1:261
 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:266
+#: dpkg-architecture.1:265
 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:268
+#: dpkg-architecture.1:267
 msgid "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:270
+#: dpkg-architecture.1:269
 #, fuzzy
 msgid "eval \\`dpkg-architecture -u\\`"
 msgstr "Debian Project"
 
 #. type: Plain text
-#: dpkg-architecture.1:273
+#: dpkg-architecture.1:272
 msgid ""
 "Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:275
+#: dpkg-architecture.1:274
 msgid "dpkg-architecture -elinux-alpha"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:277
+#: dpkg-architecture.1:276
 msgid "dpkg-architecture -amips -elinux-mips"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:280
+#: dpkg-architecture.1:279
 msgid ""
 "Check if the current architecture or an architecture provided with -a are "
 "Linux systems:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:282
+#: dpkg-architecture.1:281
 msgid "dpkg-architecture -ilinux-any"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:284
+#: dpkg-architecture.1:283
 msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 msgid ""
 "All these files have to be present for B<dpkg-architecture> to work. Their "
 "location can be overridden at runtime with the environment variable "
-"DPKG_DATADIR."
+"B<DPKG_DATADIR>."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 #, no-wrap
 msgid "I</usr/share/dpkg/cputable>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 msgid "Table of known CPU names and mapping to their GNU name."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 #, no-wrap
 msgid "I</usr/share/dpkg/ostable>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 msgid "Table of known operating system names and mapping to their GNU name."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 #, no-wrap
 msgid "I</usr/share/dpkg/triplettable>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:299
+#: dpkg-architecture.1:298
 msgid ""
 "Mapping between Debian architecture triplets and Debian architecture names."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:303
+#: dpkg-architecture.1:302
 #, 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-architecture.1:308
+#: dpkg-architecture.1:307
 msgid ""
 "B<dpkg-architecture> and this man page were initially written by Marcus "
 "Brinkmann E<lt>brinkmd@debian.orgE<gt>."
@@ -5235,7 +5241,7 @@
 msgstr "dpkg.cfg"
 
 #. type: TH
-#: dpkg.cfg.5:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1
 #, fuzzy, no-wrap
 msgid "2009-09-05"
 msgstr "2006-02-28"
@@ -5278,7 +5284,7 @@
 msgstr "I<~/.dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:214 dpkg-statoverride.8:87
+#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:222 dpkg-statoverride.8:86
 msgid "B<dpkg>(1)."
 msgstr "B<dpkg>(1)."
 
@@ -5288,6 +5294,12 @@
 msgid "dpkg-buildflags"
 msgstr ""
 
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+msgid "2011-09-13"
+msgstr "2006-02-28"
+
 #. type: Plain text
 #: dpkg-buildflags.1:4
 msgid "dpkg-buildflags - returns build flags to use during package build"
@@ -5296,7 +5308,7 @@
 #. type: Plain text
 #: dpkg-buildflags.1:8
 #, fuzzy
-msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgid "B<dpkg-buildflags> [I<option>...] [I<command>]"
 msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
@@ -5344,97 +5356,154 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:22
-msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+#: dpkg-buildflags.1:23
+msgid ""
+"temporarily by the user with environment variables (see section "
+"B<ENVIRONMENT>);"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "4."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid ""
+"dynamically by the package maintainer with environment variables set via "
+"B<debian/rules> (see section B<ENVIRONMENT>)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 msgid "The configuration files can contain two types of directives:"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 #, no-wrap
 msgid "B<SET>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
 msgid "Override the flag named I<flag> to have the value I<value>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
+#, no-wrap
+msgid "B<STRIP>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:34
+msgid ""
+"Strip from the flag named I<flag> all the build flags listed in I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
 #, no-wrap
 msgid "B<APPEND>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:31
+#: dpkg-buildflags.1:38
 msgid ""
-"Extend the flag named I<flag> with the options given in I<value>.  A space "
-"is prepended to the appended value if the flag's current value is non-empty."
+"Extend the flag named I<flag> by appending the options given in I<value>.  A "
+"space is prepended to the appended value if the flag's current value is non-"
+"empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:38
+#, no-wrap
+msgid "B<PREPEND>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:34
+#: dpkg-buildflags.1:42
+msgid ""
+"Extend the flag named I<flag> by prepending the options given in I<value>.  "
+"A space is appended to the prepended value if the flag's current value is "
+"non-empty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:45
 msgid ""
 "The configuration files can contain comments on lines starting with a hash "
 "(#). Empty lines are also ignored."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:35
+#: dpkg-buildflags.1:46
+#, fuzzy, no-wrap
+msgid "B<--dump>"
+msgstr "B<--debug>, B<-D>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:51
+msgid ""
+"Print to standard output all compilation flags and their values. It prints "
+"one flag per line separated from its value by an equal sign "
+"(\"I<flag>=I<value>\"). This is the default action."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:51
 #, fuzzy, no-wrap
 msgid "B<--list>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 msgid ""
 "Print the list of flags supported by the current vendor (one per line). See "
 "the B<SUPPORTED FLAGS> section for more information about them."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 #, fuzzy, no-wrap
 #| msgid "B<--showformat=>I<format>"
 msgid "B<--export=>I<format>"
 msgstr "B<--showformat=>I<formátum>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 msgid ""
 "Print to standard output shell (if I<format> is B<sh>) or make (if I<format> "
 "is B<make>) commands that can be used to export all the compilation flags in "
-"the environment. If the I<format> value is not given, B<sh> is assumed. Only "
-"compilation flags starting with an upper case character are included, others "
-"are assumed to not be suitable for the environment."
+"the environment. If I<format> is B<configure> then the output can be used on "
+"a B<./configure> command-line. If the I<format> value is not given, B<sh> is "
+"assumed. Only compilation flags starting with an upper case character are "
+"included, others are assumed to not be suitable for the environment."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 #, fuzzy, no-wrap
 msgid "B<--get>I< flag>"
 msgstr "B<--licence>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 msgid ""
 "Print the value of the flag on standard output. Exits with 0 if the flag is "
 "known otherwise exits with 1."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 #, fuzzy, no-wrap
 msgid "B<--origin>I< flag>"
 msgstr "B<--licence>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:57
+#: dpkg-buildflags.1:75
 msgid ""
 "Print the origin of the value that is returned by B<--get>. Exits with 0 if "
 "the flag is known otherwise exits with 1. The origin can be one of the "
@@ -5442,63 +5511,63 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:58
+#: dpkg-buildflags.1:76
 #, fuzzy, no-wrap
 msgid "B<vendor>"
 msgstr "B<--showformat=>I<formátum>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 msgid "the original flag set by the vendor is returned;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 #, fuzzy, no-wrap
 msgid "B<system>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 msgid "the flag is set/modified by a system-wide configuration;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 #, fuzzy, no-wrap
 msgid "B<user>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 msgid "the flag is set/modified by a user-specific configuration;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 #, fuzzy, no-wrap
 msgid "B<env>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:70
+#: dpkg-buildflags.1:88
 msgid "the flag is set/modified by an environment-specific configuration."
 msgstr ""
 
 #. type: SH
-#: dpkg-buildflags.1:78
+#: dpkg-buildflags.1:96
 #, no-wrap
 msgid "SUPPORTED FLAGS"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:79
+#: dpkg-buildflags.1:97
 #, no-wrap
 msgid "B<CFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 msgid ""
 "Options for the C compiler. The default value set by the vendor includes I<-"
 "g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
@@ -5506,46 +5575,46 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 #, no-wrap
 msgid "B<CPPFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 msgid "Options for the C preprocessor. Default value: empty."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 #, no-wrap
 msgid "B<CXXFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 msgid "Options for the C++ compiler. Same as B<CFLAGS>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 #, no-wrap
 msgid "B<FFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 #, no-wrap
 msgid "B<LDFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:102
+#: dpkg-buildflags.1:120
 msgid ""
 "Options passed to the compiler when linking executables or shared objects "
 "(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
@@ -5553,60 +5622,320 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:104
+#: dpkg-buildflags.1:122
 #, fuzzy, no-wrap
 #| msgid "I</etc/dpkg/dpkg.cfg>"
 msgid "B</etc/dpkg/buildflags.conf>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 #, fuzzy
 #| msgid "dselect.cfg - dselect configuration file"
 msgid "System wide configuration file."
 msgstr "dselect.cfg - dselect konfigurációs fájl"
 
 #. type: TP
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 #, no-wrap
 msgid "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or B<$HOME/.config/dpkg/buildflags.conf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:110
+#: dpkg-buildflags.1:128
 #, fuzzy
 #| msgid "dselect.cfg - dselect configuration file"
 msgid "User configuration file."
 msgstr "dselect.cfg - dselect konfigurációs fájl"
 
+#. type: Plain text
+#: dpkg-buildflags.1:135
+msgid ""
+"There are 2 sets of environment variables doing the same operations, the "
+"first one (DEB_I<flag>_I<op>) should never be used within B<debian/rules>. "
+"It's meant for any user that wants to rebuild the source package with "
+"different build flags. The second set (DEB_I<flag>_MAINT_I<op>) should only "
+"be used in B<debian/rules> by package maintainers to change the resulting "
+"build flags."
+msgstr ""
+
 #. type: TP
-#: dpkg-buildflags.1:111
+#: dpkg-buildflags.1:135
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_SET>"
 msgstr ""
 
+#. type: TQ
+#: dpkg-buildflags.1:137
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_SET>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
 msgid ""
 "This variable can be used to force the value returned for the given I<flag>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_STRIP>"
+msgstr ""
+
+#. type: TQ
+#: dpkg-buildflags.1:143
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_STRIP>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:148
+msgid ""
+"This variable can be used to provide a space separated list of options that "
+"will be stripped from the set of flags returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:148
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_APPEND>"
 msgstr ""
 
+#. type: TQ
+#: dpkg-buildflags.1:150
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_APPEND>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:119
+#: dpkg-buildflags.1:154
 msgid ""
 "This variable can be used to append supplementary options to the value "
 "returned for the given I<flag>."
 msgstr ""
 
+#. type: TP
+#: dpkg-buildflags.1:154
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_PREPEND>"
+msgstr ""
+
+#. type: TQ
+#: dpkg-buildflags.1:156
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_PREPEND>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:122 dpkg-maintscript-helper.1:130
-msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+#: dpkg-buildflags.1:160
+msgid ""
+"This variable can be used to prepend supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:160
+#, no-wrap
+msgid "B<DEB_BUILD_MAINT_OPTIONS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:165
+msgid ""
+"This variable can be used to disable/enable various hardening build flags "
+"through the B<hardening> option. See the B<HARDENING> section for details."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:166
+#, no-wrap
+msgid "HARDENING"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:171
+msgid ""
+"Several compile-time options (detailed below) can be used to help harden a "
+"resulting binary against memory corruption attacks, or provide additional "
+"warning messages during compilation. Except as noted below, these are "
+"enabled by default for architectures that support them."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:177
+msgid ""
+"Each hardening feature can be enabled and disabled in the "
+"B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value with "
+"the \"+\" and \"-\" modifier. For example, to enable the \"pie\" feature and "
+"disable the \"fortify\" feature you can do this in B<debian/rules>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:179
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:183
+msgid ""
+"The special feature B<all> can be used to enable or disable all hardening "
+"features at the same time. Thus disabling everything and enabling only "
+"\"format\" and \"fortify\" can be achieved with:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:185
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:186
+#, fuzzy, no-wrap
+msgid "B<format>"
+msgstr "B<--showformat=>I<formátum>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:198
+msgid ""
+"This setting (enabled by default) adds B<-Wformat -Wformat-security -"
+"Werror=format-security> to B<CFLAGS> and B<CXXFLAGS>. This will warn about "
+"improper format string uses, and will fail when format functions are used in "
+"a way that that represent possible security problems. At present, this warns "
+"about calls to B<printf> and B<scanf> functions where the format string is "
+"not a string literal and there are no format arguments, as in B<printf(foo);"
+"> instead of B<printf(\"%s\", foo);> This may be a security hole if the "
+"format string came from untrusted input and contains \"%n\"."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:199
+#, no-wrap
+msgid "B<fortify>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:210
+msgid ""
+"This setting (enabled by default) adds B<-D_FORTIFY_SOURCE=2> to "
+"B<CPPFLAGS>. During code generation the compiler knows a great deal of "
+"information about buffer sizes (where possible), and attempts to replace "
+"insecure unlimited length buffer function calls with length-limited ones. "
+"This is especially useful for old, crufty code.  Additionally, format "
+"strings in writable memory that contain '%n' are blocked. If an application "
+"depends on such a format string, it will need to be worked around."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:213
+msgid ""
+"Note that for this option to have any effect, the source must also be "
+"compiled with B<-O1> or higher."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:213
+#, no-wrap
+msgid "B<stackprotector>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:222
+msgid ""
+"This setting (enabled by default) adds B<-fstack-protector --param=ssp-"
+"buffer-size=4> to B<CFLAGS> and B<CXXFLAGS>. This adds safety checks against "
+"stack overwrites. This renders many potential code injection attacks into "
+"aborting situations. In the best case this turns code injection "
+"vulnerabilities into denial of service or into non-issues (depending on the "
+"application)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:226
+msgid ""
+"This feature requires linking against glibc (or another provider of "
+"B<__stack_chk_fail>), so needs to be disabled when building with B<-"
+"nostdlib> or B<-ffreestanding> or similar."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:227
+#, fuzzy, no-wrap
+msgid "B<relro>"
+msgstr "B<--new>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:235
+msgid ""
+"This setting (enabled by default) adds B<-Wl,-z,relro> to B<LDFLAGS>.  "
+"During program load, several ELF memory sections need to be written to by "
+"the linker. This flags the loader to turn these sections read-only before "
+"turning over control to the program. Most notably this prevents GOT "
+"overwrite attacks."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:236
+#, no-wrap
+msgid "B<bindnow>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:243
+msgid ""
+"This setting (disabled by default) adds B<-Wl,-z,now> to B<LDFLAGS>. During "
+"program load, all dynamic symbols are resolved, allowing for the entire PLT "
+"to be marked read-only (due to B<relro> above)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:244
+#, no-wrap
+msgid "B<pie>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:256
+msgid ""
+"This setting (disabled by default) adds B<-fPIE> to B<CFLAGS> and "
+"B<CXXFLAGS>, and B<-fPIE -pie> to B<LDFLAGS>. Position Independent "
+"Executable are needed to take advantage of Address Space Layout "
+"Randomization, supported by some kernel versions. While ASLR can already be "
+"enforced for data areas in the stack and heap (brk and mmap), the code areas "
+"must be compiled as position-independent. Shared libraries already do this (-"
+"fPIC), so they gain ASLR automatically, but binary .text regions need to be "
+"build PIE to gain ASLR. When this happens, ROP (Return Oriented Programming) "
+"attacks are much harder since there are no static locations to bounce off of "
+"during a memory corruption attack."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:259
+msgid ""
+"This is not compatible with B<-fPIC> so care must be taken when building "
+"shared objects."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:265
+msgid ""
+"Additionally, since PIE is implemented via a general register, some "
+"architectures (most notably i386) can see performance losses of up to 15% in "
+"very text-segment-heavy application workloads; most workloads see less than "
+"1%. Architectures with more general registers (e.g. amd64)  do not see as "
+"high a worst-case penalty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:268
+msgid "Copyright \\(co 2010-2011 Rapha\\[:e]l Hertzog"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:270
+msgid "Copyright \\(co 2011 Kees Cook"
 msgstr ""
 
 #. type: TH
@@ -5625,8 +5954,9 @@
 
 #. type: Plain text
 #: dpkg-buildpackage.1:8
-msgid "B<dpkg-buildpackage> [I<options>]"
-msgstr ""
+#, fuzzy
+msgid "B<dpkg-buildpackage> [I<option>...]"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
 #: dpkg-buildpackage.1:13
@@ -5881,7 +6211,7 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:96 dpkg-genchanges.1:49 dpkg-gencontrol.1:38
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 #, fuzzy, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<--version>"
@@ -5963,7 +6293,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:427
+#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:432
 #, fuzzy, no-wrap
 msgid "B<-d>"
 msgstr "B<--old>"
@@ -6146,8 +6476,8 @@
 msgstr "B<Section:> E<lt>szakaszE<gt>"
 
 #. type: Plain text
-#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:116
-#: dpkg-shlibdeps.1:217 dpkg-trigger.1:43
+#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:122
+#: dpkg-shlibdeps.1:215 dpkg-trigger.1:43
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
 "lib/dpkg>."
@@ -6155,10 +6485,10 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:223 dpkg-checkbuilddeps.1:33 dpkg-distaddfile.1:32
-#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
-#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
-#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:90 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-deb.1:172 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
+#: dpkg-gensymbols.1:443 dpkg-name.1:58 dpkg-parsechangelog.1:33
+#: dpkg-query.1:110 dpkg-scanpackages.1:96 dpkg-shlibdeps.1:215
+#: dpkg-source.1:96 dpkg-split.1:126 dpkg-trigger.1:31
 #, fuzzy, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr "B<--help>, B<-h>"
@@ -6166,7 +6496,7 @@
 #. type: Plain text
 #: dpkg-buildpackage.1:234
 msgid ""
-"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"Even if B<dpkg-buildpackage> exports some variables, B<debian/rules> should "
 "not rely on their presence and should instead use the respective interface "
 "to retrieve the needed values."
 msgstr ""
@@ -6188,15 +6518,15 @@
 #. type: SS
 #: dpkg-buildpackage.1:238
 #, no-wrap
-msgid "Compiler flags"
+msgid "Compiler flags are no longer exported"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-buildpackage.1:243
 msgid ""
-"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
-"environment variables are set to the values that B<dpkg-buildflags> "
-"returned. See its manual page for more information."
+"Between versions 1.14.17 and 1.16.1, B<dpkg-buildpackage> exported compiler "
+"flags (B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS>) with "
+"values as returned by B<dpkg-buildflags>. This is no longer the case."
 msgstr ""
 
 #. type: Plain text
@@ -6207,15 +6537,15 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildpackage.1:255
+#: dpkg-buildpackage.1:256
 #, fuzzy
 msgid ""
-"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
-"B<fakeroot>(1), B<gpg>(1)."
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
+"genchanges>(1), B<fakeroot>(1), B<gpg>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 #. type: Plain text
-#: dpkg-buildpackage.1:264 dpkg-source.1:712
+#: dpkg-buildpackage.1:265
 msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
 msgstr ""
 
@@ -6225,12 +6555,6 @@
 msgid "dpkg-checkbuilddeps"
 msgstr ""
 
-#. type: TH
-#: dpkg-checkbuilddeps.1:1
-#, fuzzy, no-wrap
-msgid "2009-11-21"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:4
 msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
@@ -6239,7 +6563,7 @@
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:9
 #, fuzzy
-msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgid "B<dpkg-checkbuilddeps> [I<option>...] [I<control-file>]"
 msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 
 #. type: Plain text
@@ -6253,7 +6577,7 @@
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:17
 msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
+"By default, B<debian/control> is read, but an alternate control filename may "
 "be specified on the command line."
 msgstr ""
 
@@ -6301,8 +6625,9 @@
 
 #. type: Plain text
 #: dpkg-distaddfile.1:8
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
-msgstr ""
+#, fuzzy
+msgid "B<dpkg-distaddfile> [I<option>...]I< filename section priority>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
 #: dpkg-distaddfile.1:13
@@ -6356,24 +6681,19 @@
 msgid "dpkg-deb"
 msgstr "dpkg-deb"
 
-#. type: TH
-#: dpkg-deb.1:1 dpkg-query.1:1 dselect.1:1
-#, fuzzy, no-wrap
-msgid "2010-03-07"
-msgstr "2006-02-28"
-
 #. 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 ""
+#: dpkg-deb.1:8
+#, fuzzy
+msgid "B<dpkg-deb> [I<option>...] I<command>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
-#: dpkg-deb.1:13
+#: dpkg-deb.1:12
 msgid ""
 "B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr ""
@@ -6381,14 +6701,14 @@
 "róluk."
 
 #. type: Plain text
-#: dpkg-deb.1:17
+#: dpkg-deb.1:16
 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-deb.1:27
+#: dpkg-deb.1:26
 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> "
@@ -6399,13 +6719,13 @@
 "fogja indítani."
 
 #. type: TP
-#: dpkg-deb.1:29
+#: dpkg-deb.1:28
 #, 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-deb.1:41
+#: dpkg-deb.1:40
 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 "
@@ -6420,7 +6740,7 @@
 "fájlok a bináris csomag ellenőrző információs területére kerülnek."
 
 #. type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-deb.1:52
 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 "
@@ -6434,7 +6754,7 @@
 "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:60
+#: dpkg-deb.1:59
 msgid ""
 "If no I<archive> is specified then B<dpkg-deb> will write the package into "
 "the file I<directory>B<.deb>."
@@ -6443,12 +6763,12 @@
 "fájlba készíti el."
 
 #. type: Plain text
-#: dpkg-deb.1:62
+#: dpkg-deb.1:61
 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-deb.1:78
+#: dpkg-deb.1:77
 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 "
@@ -6465,18 +6785,18 @@
 "ellenőrző fájlt a fájlnév meghatározásához)."
 
 #. type: TP
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 #, fuzzy, no-wrap
 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-deb.1:81
+#: dpkg-deb.1:80
 msgid "Provides information about a binary package archive."
 msgstr "Egy bináris csomagarchívumról ad információkat."
 
 #. type: Plain text
-#: dpkg-deb.1:86
+#: dpkg-deb.1:85
 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."
@@ -6485,7 +6805,7 @@
 "tartalmát"
 
 #. type: Plain text
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 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 "
@@ -6497,13 +6817,13 @@
 "stderr-re és kilép 2-es kóddal."
 
 #. type: TP
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 #, 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-deb.1:101
+#: dpkg-deb.1:100
 #, fuzzy
 msgid ""
 "Provides information about a binary package archive in the format specified "
@@ -6515,18 +6835,18 @@
 "és verzióját 1 sorban tabulátorral elválasztva."
 
 #. type: TP
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 #, 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-deb.1:104
+#: dpkg-deb.1:103
 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-deb.1:108
+#: dpkg-deb.1:107
 msgid ""
 "If no B<control-file-field>s are specified then it will print the whole "
 "control file."
@@ -6535,7 +6855,7 @@
 "fájlt."
 
 #. type: Plain text
-#: dpkg-deb.1:117
+#: dpkg-deb.1:116
 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-"
@@ -6547,18 +6867,18 @@
 "B<dpkg-deb> mezőnevükkel (és egy kettősponttal és szóközzel) azonosítja őket."
 
 #. type: Plain text
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 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:119
+#: dpkg-deb.1:118
 #, 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-deb.1:125
+#: dpkg-deb.1:124
 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 "
@@ -6568,13 +6888,13 @@
 "B<tar> részletes lista formátumban teszi meg ezt."
 
 #. type: TP
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 #, 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-deb.1:129
+#: dpkg-deb.1:128
 msgid ""
 "Extracts the filesystem tree from a package archive into the specified "
 "directory."
@@ -6582,7 +6902,7 @@
 "Kibontja egy csomag archívum fájlrendszer fáját egy megadott könyvtárba."
 
 #. type: Plain text
-#: dpkg-deb.1:135
+#: dpkg-deb.1:134
 msgid ""
 "Note that extracting a package to the root directory will I<not> result in a "
 "correct installation! Use B<dpkg> to install packages."
@@ -6591,7 +6911,7 @@
 "B<dpkg> vagy valamely felülete használható csomagok telepítésére."
 
 #. type: Plain text
-#: dpkg-deb.1:139
+#: dpkg-deb.1:138
 #, fuzzy
 msgid ""
 "I<directory> (but not its parents) will be created if necessary, and its "
@@ -6599,46 +6919,77 @@
 msgstr "Létrehozza a I<könyvtár>at (de szüleit nem), ha szükséges."
 
 #. type: TP
-#: dpkg-deb.1:139
+#: 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-deb.1:144
+#: dpkg-deb.1:145
 #, fuzzy
 msgid ""
-"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
-"it goes."
+"Is like B<--extract> (B<-x>)  with B<--verbose> (B<-v>)  which 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-deb.1:144
+#: dpkg-deb.1:145
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--raw-extract> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B<--control> I<archívum könyvtár>"
+
+#. type: Plain text
+#: dpkg-deb.1:150
+#, fuzzy
+#| msgid ""
+#| "Extracts the filesystem tree from a package archive into the specified "
+#| "directory."
+msgid ""
+"Extracts the filesystem tree from a package archive into a specified "
+"directory, and the control information files into a DEBIAN subdirectory of "
+"the specified directory."
+msgstr ""
+"Kibontja egy csomag archívum fájlrendszer fáját egy megadott könyvtárba."
+
+#. type: Plain text
+#: dpkg-deb.1:152 dpkg-deb.1:172
+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:152
 #, fuzzy, no-wrap
 msgid "B<--fsys-tarfile> I<archive>"
 msgstr "B<dpkg-deb --fsys-tarfile> I<archívum>"
 
 #. type: Plain text
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
+#, 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."
 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."
+"to extract a particular file from a package archive.  The input archive will "
+"always be processed sequentially."
 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:152
+#: dpkg-deb.1:161
 #, fuzzy, no-wrap
 msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<dpkg-deb> B<-e>|B<--control> I<archívum könyvtár>"
 
 #. type: Plain text
-#: dpkg-deb.1:156
+#: dpkg-deb.1:165
 msgid ""
 "Extracts the control information files from a package archive into the "
 "specified directory."
@@ -6647,7 +6998,7 @@
 "könyvtárba."
 
 #. type: Plain text
-#: dpkg-deb.1:160
+#: dpkg-deb.1:169
 msgid ""
 "If no directory is specified then a subdirectory B<DEBIAN> in the current "
 "directory is used."
@@ -6655,20 +7006,14 @@
 "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:163
-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:171
+#: dpkg-deb.1:180
 #, no-wrap
 msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<formátum>"
 
 #. type: Plain text
-#: dpkg-deb.1:176 dpkg-query.1:121
+#: dpkg-deb.1:185 dpkg-query.1:127
 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."
@@ -6677,7 +7022,7 @@
 "szöveg, melyet minden listázott csomag visszaad."
 
 #. type: Plain text
-#: dpkg-deb.1:185
+#: dpkg-deb.1:194
 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 "
@@ -6692,31 +7037,31 @@
 "query>(1) B<--showformat> lehetőségének magyarázatában található."
 
 #. type: Plain text
-#: dpkg-deb.1:187
+#: dpkg-deb.1:196
 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:187
-#, no-wrap
-msgid "B<-z>I<compress_level>"
-msgstr ""
+#: dpkg-deb.1:196
+#, fuzzy, no-wrap
+msgid "B<-z>I<compress-level>"
+msgstr "B<--field>, B<-f>"
 
 #. type: Plain text
-#: dpkg-deb.1:191
+#: dpkg-deb.1:200
 msgid ""
-"Specify which compression level to pass to the compressor backend program, "
-"when building a package."
+"Specify which compression level to use on the compressor backend, when "
+"building a package (default is 9 for gzip and bzip2, 6 for xz and lzma)."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:191
-#, no-wrap
-msgid "B<-Z>I<compress_type>"
-msgstr ""
+#: dpkg-deb.1:200
+#, fuzzy, no-wrap
+msgid "B<-Z>I<compress-type>"
+msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 msgid ""
 "Specify which compression type to use when building a package. Allowed "
 "values are I<gzip>, I<xz>, I<bzip2>, I<lzma>, and I<none> (default is "
@@ -6724,25 +7069,25 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 #, no-wrap
 msgid "B<--new>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 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:201
+#: dpkg-deb.1:210
 #, no-wrap
 msgid "B<--old>"
 msgstr "B<--old>"
 
 #. type: Plain text
-#: dpkg-deb.1:209
+#: dpkg-deb.1:218
 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 "
@@ -6755,8 +7100,14 @@
 "régebbi verziójú dpkg számára is érthető, mely csak i386 a.out-ként volt "
 "kiadva."
 
+#. type: TP
+#: dpkg-deb.1:218
+#, no-wrap
+msgid "B<--nocheck>"
+msgstr "B<--nocheck>"
+
 #. type: Plain text
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224
 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."
@@ -6766,31 +7117,44 @@
 "hibákat tartalmaz."
 
 #. type: TP
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224 start-stop-daemon.8:255
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--verbose>"
+msgstr "B<--version>"
+
+#. type: Plain text
+#: dpkg-deb.1:228
+msgid ""
+"Enables verbose output. This currently only affects B<--extract> making it "
+"behave like B<--vextract>."
+msgstr ""
+
+#. type: TP
+#: dpkg-deb.1:228
 #, fuzzy, no-wrap
 msgid "B<-D>, B<--debug>"
 msgstr "B<--debug>, B<-D>"
 
 #. type: Plain text
-#: dpkg-deb.1:218
+#: dpkg-deb.1:231
 msgid "Enables debugging output. This is not very interesting."
 msgstr "Hibajavító kimenet bekapcsolva. Nem túl érdekes."
 
 #. type: Plain text
-#: dpkg-deb.1:224
+#: dpkg-deb.1:237
 msgid ""
 "If set, B<dpkg-deb> will use it as the directory in which to create "
 "temporary files and directories."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:230
+#: dpkg-deb.1:243
 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-deb.1:238
+#: dpkg-deb.1:251
 msgid ""
 "There is no authentication on B<.deb> files; in fact, there isn't even a "
 "straightforward checksum.  (Higher level tools like APT support "
@@ -6800,7 +7164,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:245
+#: dpkg-deb.1:258
 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 "
@@ -6811,7 +7175,7 @@
 "csomagok szkriptjei lefussanak és állapotuk és tartalmuk rögzítésre kerüljön."
 
 #. type: Plain text
-#: dpkg-deb.1:251
+#: dpkg-deb.1:264
 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)."
 
@@ -6821,13 +7185,6 @@
 msgid "dpkg-divert"
 msgstr "dpkg-deb"
 
-#. type: TH
-#: dpkg-divert.8:1
-#, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-10-12"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-divert.8:4
 msgid "dpkg-divert - override a package's version of a file"
@@ -6835,8 +7192,9 @@
 
 #. type: Plain text
 #: dpkg-divert.8:9
-msgid "B<dpkg-divert> [I<options>] I<command>"
-msgstr ""
+#, fuzzy
+msgid "B<dpkg-divert> [I<option>...] I<command>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
 #: dpkg-divert.8:13
@@ -6869,7 +7227,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:28 dpkg-statoverride.8:36
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
 #, fuzzy, no-wrap
 msgid "B<--remove>I< file>"
 msgstr "B<--new>"
@@ -6915,7 +7273,8 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:43 dpkg-statoverride.8:53 update-alternatives.8:329
+#: dpkg-divert.8:43 dpkg-statoverride.8:52 dselect.1:44
+#: update-alternatives.8:328
 #, fuzzy, no-wrap
 msgid "B<--admindir>I< directory>"
 msgstr "B<Section:> E<lt>szakaszE<gt>"
@@ -6968,7 +7327,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:61 dpkg-statoverride.8:65 update-alternatives.8:351
+#: dpkg-divert.8:61 dpkg-statoverride.8:64 update-alternatives.8:350
 #, fuzzy, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--new>"
@@ -7011,9 +7370,9 @@
 #. type: Plain text
 #: dpkg-divert.8:82
 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 adding, default is B<--local> and B<--divert> I<original>B<.distrib>. "
+"When removing, B<--package> or B<--local> and B<--divert> must match if "
+"specified."
 msgstr ""
 
 #. type: Plain text
@@ -7074,14 +7433,14 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:113 dpkg-query.1:197 dpkg-statoverride.8:70 dpkg-trigger.1:61
-#: update-alternatives.8:356
+#: dpkg-divert.8:113 dpkg-query.1:205 dpkg-statoverride.8:69 dpkg-trigger.1:61
+#: update-alternatives.8:355
 #, no-wrap
 msgid "B<DPKG_ADMINDIR>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-divert.8:117 dpkg-query.1:201 dpkg-statoverride.8:74 dpkg-trigger.1:65
+#: dpkg-divert.8:117 dpkg-query.1:209 dpkg-statoverride.8:73 dpkg-trigger.1:65
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the dpkg data directory."
@@ -7090,7 +7449,7 @@
 #. type: Plain text
 #: dpkg-divert.8:121
 msgid ""
-"If set and the I<--local> and I<--package> options have not been specified, "
+"If set and the B<--local> and B<--package> options have not been specified, "
 "B<dpkg-divert> will use it as the package name."
 msgstr ""
 
@@ -7116,7 +7475,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-divert.8:137 update-alternatives.8:495
+#: dpkg-divert.8:137 update-alternatives.8:496
 msgid "Copyright \\(co 1995 Ian Jackson"
 msgstr ""
 
@@ -7133,8 +7492,9 @@
 
 #. type: Plain text
 #: dpkg-genchanges.1:8
-msgid "B<dpkg-genchanges> [I<options>]"
-msgstr ""
+#, fuzzy
+msgid "B<dpkg-genchanges> [I<option>...]"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
 #: dpkg-genchanges.1:16
@@ -7224,21 +7584,21 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:121
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:127
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-source.1:131
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:169
+#: dpkg-source.1:131
 #, fuzzy, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<--fsys-tarfile>"
@@ -7254,29 +7614,29 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:131
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:137
 #, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 msgid "Override or add an output control file field."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 #, fuzzy, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<--field>, B<-f>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:137
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:143
 msgid "Remove an output control file field."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:98
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:104
 #, fuzzy, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "B<--control>, B<-e>"
@@ -7290,7 +7650,7 @@
 
 #. type: TP
 #: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
@@ -7311,14 +7671,14 @@
 
 #. type: TP
 #: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 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 "
@@ -7340,7 +7700,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:123 dpkg-gensymbols.1:416
+#: dpkg-genchanges.1:123 dpkg-gensymbols.1:421
 #, fuzzy, no-wrap
 msgid "B<-q>"
 msgstr "B<--new>"
@@ -7373,8 +7733,9 @@
 
 #. type: Plain text
 #: dpkg-gencontrol.1:8
-msgid "B<dpkg-gencontrol> [I<options>]"
-msgstr ""
+#, fuzzy
+msgid "B<dpkg-gencontrol> [I<option>...]"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
 #: dpkg-gencontrol.1:14
@@ -7435,7 +7796,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:368
+#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:373
 #, no-wrap
 msgid "B<-p>I<package>"
 msgstr ""
@@ -7494,7 +7855,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:386 dpkg-shlibdeps.1:152
+#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:391 dpkg-shlibdeps.1:150
 #, fuzzy, no-wrap
 msgid "B<-O>"
 msgstr "B<--new>"
@@ -7528,7 +7889,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:339
+#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:337
 msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 msgstr ""
 
@@ -7538,12 +7899,6 @@
 msgid "dpkg-gensymbols"
 msgstr "deb-control"
 
-#. type: TH
-#: dpkg-gensymbols.1:2
-#, fuzzy, no-wrap
-msgid "2009-08-07"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-gensymbols.1:5
 msgid ""
@@ -7554,7 +7909,7 @@
 #. type: Plain text
 #: dpkg-gensymbols.1:9
 #, fuzzy
-msgid "B<dpkg-gensymbols> [I<options>]"
+msgid "B<dpkg-gensymbols> [I<option>...]"
 msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
@@ -7575,14 +7930,6 @@
 "found):"
 msgstr ""
 
-#. type: IP
-#: dpkg-gensymbols.1:20 dpkg-gensymbols.1:22 dpkg-gensymbols.1:24
-#: dpkg-gensymbols.1:26 dpkg-gensymbols.1:306 dpkg-gensymbols.1:312
-#: dpkg-gensymbols.1:346 dpkg-gensymbols.1:350 dpkg-gensymbols.1:353
-#, no-wrap
-msgid "\\(bu"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-gensymbols.1:22
 msgid "debian/I<package>.symbols.I<arch>"
@@ -7656,14 +8003,23 @@
 "patch should ideally only add new lines."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-gensymbols.1:64
+msgid ""
+"Note that you can put comments in symbols files: any line with '#' as the "
+"first character is a comment except if it starts with '#include' (see "
+"section B<Using includes>). Lines starting with '#MISSING:' are special "
+"comments documenting symbols that have disappeared."
+msgstr ""
+
 #. type: SS
-#: dpkg-gensymbols.1:59
+#: dpkg-gensymbols.1:64
 #, no-wrap
 msgid "Using #PACKAGE# substitution"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 msgid ""
 "In some rare cases, the name of the library varies between architectures.  "
 "To avoid hardcoding the name of the package in the symbols file, you can use "
@@ -7673,13 +8029,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 #, no-wrap
 msgid "Using symbol tags"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:74
+#: dpkg-gensymbols.1:79
 msgid ""
 "Symbol tagging is useful for marking symbols that are special in some way.  "
 "Any symbol can have an arbitrary number of tags associated with it. While "
@@ -7689,7 +8045,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:86
+#: dpkg-gensymbols.1:91
 msgid ""
 "Tag specification comes right before the symbol name (no whitespace is "
 "allowed in between). It always starts with an opening bracket B<(>, ends "
@@ -7705,7 +8061,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:90
+#: dpkg-gensymbols.1:95
 #, no-wrap
 msgid ""
 " (tag1=i am marked|tag name with space)\"tagged quoted symbol\"@Base 1.0\n"
@@ -7714,7 +8070,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:96
+#: dpkg-gensymbols.1:101
 msgid ""
 "The first symbol in the example is named I<tagged quoted symbol> and has two "
 "tags: I<tag1> with value I<i am marked> and I<tag name with space> that has "
@@ -7724,7 +8080,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 msgid ""
 "Since symbol tags are an extension of the I<deb-symbols(5)> format, they can "
 "only be part of the symbols files used in source packages (those files "
@@ -7739,19 +8095,19 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 #, no-wrap
 msgid "Standard symbol tags"
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:109
+#: dpkg-gensymbols.1:114
 #, fuzzy, no-wrap
 msgid "B<optional>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:119
+#: dpkg-gensymbols.1:124
 msgid ""
 "A symbol marked as optional can disappear from the library at any time and "
 "that will never cause B<dpkg-gensymbols> to fail. However, disappeared "
@@ -7764,7 +8120,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 msgid ""
 "This tag is useful for symbols which are private where their disappearance "
 "do not cause ABI breakage. For example, most of C++ template instantiations "
@@ -7774,13 +8130,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 #, fuzzy, no-wrap
 msgid "B<arch=>I<architecture list>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:137
+#: dpkg-gensymbols.1:142
 msgid ""
 "This tag allows one to restrict the set of architectures where the symbol is "
 "supposed to exist. When the symbols list is updated with the symbols "
@@ -7796,7 +8152,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:143
+#: dpkg-gensymbols.1:148
 msgid ""
 "When operating in the default non-template mode, among arch-specific symbols "
 "only those that match the current host architecture are written to the "
@@ -7806,7 +8162,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:149
+#: dpkg-gensymbols.1:154
 msgid ""
 "The format of I<architecture list> is the same as the one used in the "
 "I<Build-Depends> field of I<debian/control> (except the enclosing square "
@@ -7816,7 +8172,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid ""
 " (arch=alpha amd64 kfreebsd-amd64 ia64)a_64bit_specific_symbol@Base 1.0\n"
@@ -7824,13 +8180,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, fuzzy, no-wrap
 msgid "B<ignore-blacklist>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:160
+#: dpkg-gensymbols.1:165
 msgid ""
 "dpkg-gensymbols has an internal blacklist of symbols that should not appear "
 "in symbols files as they are usually only side-effects of implementation "
@@ -7841,51 +8197,51 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:160 dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:165 dpkg-gensymbols.1:202
 #, fuzzy, no-wrap
 msgid "B<c++>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:164
+#: dpkg-gensymbols.1:169
 msgid ""
 "Denotes I<c++> symbol pattern. See B<Using symbol patterns> subsection below."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:164 dpkg-gensymbols.1:228
+#: dpkg-gensymbols.1:169 dpkg-gensymbols.1:233
 #, fuzzy, no-wrap
 msgid "B<symver>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:168
+#: dpkg-gensymbols.1:173
 msgid ""
 "Denotes I<symver> (symbol version) symbol pattern. See B<Using symbol "
 "patterns> subsection below."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:168 dpkg-gensymbols.1:253
+#: dpkg-gensymbols.1:173 dpkg-gensymbols.1:258
 #, fuzzy, no-wrap
 msgid "B<regex>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 msgid ""
 "Denotes I<regex> symbol pattern. See B<Using symbol patterns> subsection "
 "below."
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 #, no-wrap
 msgid "Using symbol patterns"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:180
+#: dpkg-gensymbols.1:185
 msgid ""
 "Unlike a standard symbol specification, a pattern may cover multiple real "
 "symbols from the library. B<dpkg-gensymbols> will attempt to match each "
@@ -7897,7 +8253,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:188
+#: dpkg-gensymbols.1:193
 msgid ""
 "A pattern is considered lost if it does not match any symbol in the library. "
 "By default this will trigger a B<dpkg-gensymbols> failure under I<-c1> or "
@@ -7910,7 +8266,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:195
+#: dpkg-gensymbols.1:200
 msgid ""
 "Patterns are an extension of the I<deb-symbols(5)> format hence they are "
 "only valid in symbol file templates. Pattern specification syntax is not any "
@@ -7921,12 +8277,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:202
 msgid "At the moment, B<dpkg-gensymbols> supports three basic pattern types:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:209
+#: dpkg-gensymbols.1:214
 msgid ""
 "This pattern is denoted by the I<c++> tag. It matches only C++ symbols by "
 "their demangled symbol name (as emitted by B<c++filt>(1) utility). This "
@@ -7941,7 +8297,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:215
+#: dpkg-gensymbols.1:220
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -7951,19 +8307,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:217
+#: dpkg-gensymbols.1:222
 msgid ""
 "The demangled name above can be obtained by executing the following command:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:219
+#: dpkg-gensymbols.1:224
 #, no-wrap
 msgid " $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:227
+#: dpkg-gensymbols.1:232
 msgid ""
 "Please note that while mangled name is unique in the library by definition, "
 "this is not necessarily true for demangled names. A couple of distinct real "
@@ -7975,7 +8331,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:234
+#: dpkg-gensymbols.1:239
 msgid ""
 "This pattern is denoted by the I<symver> tag. Well maintained libraries have "
 "versioned symbols where each version corresponds to the upstream version "
@@ -7984,7 +8340,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:241
+#: dpkg-gensymbols.1:246
 #, no-wrap
 msgid ""
 "libc.so.6 libc6 #MINVER#\n"
@@ -7995,7 +8351,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:247
+#: dpkg-gensymbols.1:252
 msgid ""
 "All symbols associated with versions GLIBC_2.0 and GLIBC_2.7 will lead to "
 "minimal version of 2.0 and 2.7 respectively with the exception of the symbol "
@@ -8005,7 +8361,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:252
+#: dpkg-gensymbols.1:257
 msgid ""
 "Please note that while old style wildcard patterns (denoted by \"*@version\" "
 "in the symbol name field) are still supported, they have been deprecated by "
@@ -8015,7 +8371,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:260
+#: dpkg-gensymbols.1:265
 msgid ""
 "Regular expression patterns are denoted by the I<regex> tag. They match by "
 "the perl regular expression specified in the symbol name field. A regular "
@@ -8025,7 +8381,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:265
+#: dpkg-gensymbols.1:270
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -8034,7 +8390,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:270
+#: dpkg-gensymbols.1:275
 msgid ""
 "Symbols like \"mystack_new@Base\", \"mystack_push@Base\", \"mystack_pop@Base"
 "\" etc.  will be matched by the first pattern while e.g. "
@@ -8044,7 +8400,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:275
+#: dpkg-gensymbols.1:280
 msgid ""
 "Basic patterns listed above can be combined where it makes sense. In that "
 "case, they are processed in the order in which the tags are specified. For "
@@ -8052,7 +8408,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:278
+#: dpkg-gensymbols.1:283
 #, no-wrap
 msgid ""
 " (c++|regex)\"^NSA::ClassA::Private::privmethod\\ed\\e(int\\e)@Base\" 1.0\n"
@@ -8060,7 +8416,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:288
+#: dpkg-gensymbols.1:293
 msgid ""
 "will match symbols \"_ZN3NSA6ClassA7Private11privmethod1Ei@Base\" and "
 "\"_ZN3NSA6ClassA7Private11privmethod2Ei@Base\". When matching the first "
@@ -8075,7 +8431,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:294
+#: dpkg-gensymbols.1:299
 msgid ""
 "In general, all patterns are divided into two groups: aliases (basic I<c++> "
 "and I<symver>) and generic patterns (I<regex>, all combinations of multiple "
@@ -8085,7 +8441,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 msgid ""
 "When multiple patterns match the same real symbol, aliases (first I<c++>, "
 "then I<symver>) are preferred over generic patterns. Generic patterns are "
@@ -8096,13 +8452,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 #, no-wrap
 msgid "Using includes"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:306
+#: dpkg-gensymbols.1:311
 msgid ""
 "When the set of exported symbols differ between architectures, it may become "
 "inefficient to use a single symbol file. In those cases, an include "
@@ -8110,7 +8466,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:310
+#: dpkg-gensymbols.1:315
 msgid ""
 "You can factorize the common part in some external file and include that "
 "file in your I<package>.symbols.I<arch> file by using an include directive "
@@ -8118,31 +8474,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:312
+#: dpkg-gensymbols.1:317
 msgid "#include \"I<packages>.symbols.common\""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:314
+#: dpkg-gensymbols.1:319
 msgid "The include directive may also be tagged like any symbol:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:316
-msgid "(tag|..|tagN)#include \"file_to_include\""
+#: dpkg-gensymbols.1:321
+msgid "(tag|..|tagN)#include \"file-to-include\""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:321
+#: dpkg-gensymbols.1:326
 msgid ""
-"As a result, all symbols included from I<file_to_include> will be considered "
+"As a result, all symbols included from I<file-to-include> will be considered "
 "to be tagged with I<tag> .. I<tagN> by default. You can use this feature to "
 "create a common I<package>.symbols file which includes architecture specific "
 "symbol files:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:326
+#: dpkg-gensymbols.1:331
 #, no-wrap
 msgid ""
 "  common_symbol1@Base 1.0\n"
@@ -8152,7 +8508,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:335
+#: dpkg-gensymbols.1:340
 msgid ""
 "The symbols files are read line by line, and include directives are "
 "processed as soon as they are encountered. This means that the content of "
@@ -8165,7 +8521,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:340
+#: dpkg-gensymbols.1:345
 msgid ""
 "An included file can repeat the header line containing the SONAME of the "
 "library. In that case, it overrides any header line previously read.  "
@@ -8174,7 +8530,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid ""
 "#include \"libsomething1.symbols.common\"\n"
@@ -8182,39 +8538,39 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid "Good library management"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:346
+#: dpkg-gensymbols.1:351
 msgid "A well-maintained library has the following features:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:350
+#: dpkg-gensymbols.1:355
 msgid ""
 "its API is stable (public symbols are never dropped, only new public symbols "
 "are added) and changes in incompatible ways only when the SONAME changes;"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:353
+#: dpkg-gensymbols.1:358
 msgid ""
 "ideally, it uses symbol versioning to achieve ABI stability despite internal "
 "changes and API extension;"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:356
+#: dpkg-gensymbols.1:361
 msgid ""
 "it doesn't export private symbols (such symbols can be tagged optional as "
 "workaround)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:364
+#: dpkg-gensymbols.1:369
 msgid ""
 "While maintaining the symbols file, it's easy to notice appearance and "
 "disappearance of symbols. But it's more difficult to catch incompatible API "
@@ -8226,38 +8582,38 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:365
+#: dpkg-gensymbols.1:370
 #, fuzzy, no-wrap
 msgid "B<-P>I<package-build-dir>"
 msgstr "B<--field>, B<-f>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:368
+#: dpkg-gensymbols.1:373
 msgid "Scan I<package-build-dir> instead of debian/tmp."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 msgid ""
 "Define the package name. Required if more than one binary package is listed "
 "in debian/control (or if there's no debian/control file)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 msgid ""
 "Define the package version. Defaults to the version extracted from debian/"
 "changelog. Required if called outside of a source package tree."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 #, fuzzy, no-wrap
 msgid "B<-e>I<library-file>"
 msgstr "B<--fsys-tarfile>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 msgid ""
 "Only analyze libraries explicitly listed instead of finding all public "
 "libraries. You can use a regular expression in I<library-file> to match "
@@ -8266,33 +8622,33 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 #, fuzzy, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<--licence>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:386
+#: dpkg-gensymbols.1:391
 msgid ""
 "Use I<filename> as reference file to generate the symbols file that is "
 "integrated in the package itself."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 msgid ""
 "Print the generated symbols file to standard output, rather than being "
 "stored in the package build tree."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 #, fuzzy, no-wrap
 msgid "B<-O>I<filename>"
 msgstr "B<--licence>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 msgid ""
 "Store the generated symbols file as I<filename>. If I<filename> is pre-"
 "existing, its content is used as basis for the generated symbols file.  You "
@@ -8301,13 +8657,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 #, fuzzy, no-wrap
 msgid "B<-t>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 msgid ""
 "Write the symbol file in template mode rather than the format compatible "
 "with I<deb-symbols(5)>. The main difference is that in the template mode "
@@ -8319,13 +8675,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 #, fuzzy, no-wrap
 msgid "B<-c>I<[0-4]>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:413
+#: dpkg-gensymbols.1:418
 msgid ""
 "Define the checks to do when comparing the generated symbols file with the "
 "template file used as starting point. By default the level is 1. Increasing "
@@ -8336,14 +8692,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:416
+#: dpkg-gensymbols.1:421
 msgid ""
 "This value can be overridden by the environment variable "
 "DPKG_GENSYMBOLS_CHECK_LEVEL."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 msgid ""
 "Keep quiet and never generate a diff between generated symbols file and the "
 "template file used as starting point or show any warnings about new/lost "
@@ -8352,13 +8708,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 #, fuzzy, no-wrap
 msgid "B<-a>I<arch>"
 msgstr "B<Package:> E<lt>csomag névE<gt>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:427
+#: dpkg-gensymbols.1:432
 msgid ""
 "Assume I<arch> as host architecture when processing symbol files. Use this "
 "option to generate a symbol file or diff for any architecture provided its "
@@ -8366,20 +8722,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 msgid ""
 "Enable debug mode. Numerous messages are displayed to explain what B<dpkg-"
 "gensymbols> does."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 #, fuzzy, no-wrap
 msgid "B<-V>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:438
+#: dpkg-gensymbols.1:443
 msgid ""
 "Enable verbose mode. The generated symbols file contains deprecated symbols "
 "as comments. Furthermore in template mode, pattern symbols are followed by "
@@ -8387,28 +8743,28 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:447
+#: dpkg-gensymbols.1:452
 msgid "B<http://people.redhat.com/drepper/symbol-versioning>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:449
+#: dpkg-gensymbols.1:454
 msgid "B<http://people.redhat.com/drepper/goodpractice.pdf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:451
+#: dpkg-gensymbols.1:456
 msgid "B<http://people.redhat.com/drepper/dsohowto.pdf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:454
+#: dpkg-gensymbols.1:459
 #, fuzzy
 msgid "B<deb-symbols>(5), B<dpkg-shlibdeps>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:457
+#: dpkg-gensymbols.1:462
 msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
 msgstr ""
 
@@ -8418,12 +8774,6 @@
 msgid "dpkg-maintscript-helper"
 msgstr ""
 
-#. type: TH
-#: dpkg-maintscript-helper.1:1
-#, fuzzy, no-wrap
-msgid "2010-04-16"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-maintscript-helper.1:4
 msgid ""
@@ -8434,8 +8784,8 @@
 #. type: Plain text
 #: dpkg-maintscript-helper.1:8
 msgid ""
-"B<dpkg-maintscript-helper> I<command> [I<parameters>...] -- I<maint-script-"
-"parameters>"
+"B<dpkg-maintscript-helper> I<command> [I<parameter>...] B<--> I<maint-script-"
+"parameter>..."
 msgstr ""
 
 #. type: SH
@@ -8470,8 +8820,8 @@
 "scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
 "the same call simply needs to be put in all scripts and the program will "
 "automatically adapt its behaviour based on the environment variable "
-"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
-"to forward after a double dash."
+"B<DPKG_MAINTSCRIPT_NAME> and on the maintainer scripts arguments that you "
+"have to forward after a double dash."
 msgstr ""
 
 #. type: SH
@@ -8633,9 +8983,10 @@
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:118
-#, no-wrap
-msgid "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+msgid "    B<Pre-Depends:> dpkg (E<gt>= 1.15.7.2)\n"
+msgstr "B<Pre-Depends:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:123
@@ -8650,12 +9001,17 @@
 #: dpkg-maintscript-helper.1:127
 #, no-wrap
 msgid ""
-"    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
-"        dpkg-maintscript-helper E<lt>commandE<gt> ...\n"
+"    if dpkg-maintscript-helper supports I<command>; then\n"
+"        dpkg-maintscript-helper I<command> ...\n"
 "    fi\n"
 msgstr ""
 
 #. type: Plain text
+#: dpkg-maintscript-helper.1:130
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr ""
+
+#. type: Plain text
 #: dpkg-maintscript-helper.1:132
 msgid "Copyright \\(co 2008 Joey Hess"
 msgstr ""
@@ -8676,13 +9032,6 @@
 msgid "dpkg-mergechangelogs"
 msgstr "dpkg-deb"
 
-#. type: TH
-#: dpkg-mergechangelogs.1:1
-#, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-04-18"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-mergechangelogs.1:4
 msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
@@ -8808,106 +9157,104 @@
 
 #. type: Plain text
 #: dpkg-name.1:15
-msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
-msgstr ""
+#, fuzzy
+msgid "B<dpkg-name> [I<option>...] [B<-->] I<file>..."
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
-#: dpkg-name.1:28
+#: dpkg-name.1:29
 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>."
-"E<lt>package_typeE<gt>> 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. "
-"The I<E<lt>package_typeE<gt>> part comes from that field if present or "
-"fallbacks to B<deb>."
+"package name consists of I<package>B<_>I<version>B<_>I<architecture>B<."
+">I<package-type> as specified in the control file of the package. The "
+"I<version> part of the filename consists of the upstream version information "
+"optionally followed by a hyphen and the revision information. The I<package-"
+"type> part comes from that field if present or fallbacks to B<deb>."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:30
+#: dpkg-name.1:31
 #, fuzzy, no-wrap
 msgid "B<-a>, B<--no-architecture>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 msgid "The destination filename will not have the architecture information."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 #, fuzzy, no-wrap
 msgid "B<-k>, B<--symlink>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 msgid "Create a symlink, instead of moving."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 #, fuzzy, no-wrap
 msgid "B<-o>, B<--overwrite>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 msgid ""
 "Existing files will be overwritten if they have the same name as the "
 "destination filename."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 #, fuzzy, no-wrap
 msgid "B<-s>, B<--subdir> [I<dir>]"
 msgstr "B<--show>, B<-W>"
 
 #. type: Plain text
-#: dpkg-name.1:52
+#: dpkg-name.1:53
 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 package. The target directory will be `unstable/binary-I<architecture>/"
+"I<section>'. 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 `I<section>/binary-I<architecture>'. 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:52
+#: dpkg-name.1:53
 #, fuzzy, no-wrap
 msgid "B<-c>, B<--create-dir>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: dpkg-name.1:57
+#: dpkg-name.1:58
 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:60
+#: dpkg-name.1:61
 #, fuzzy, no-wrap
 msgid "B<-v>, B<--version>"
 msgstr "B<--version>"
 
 #. type: TP
-#: dpkg-name.1:65
+#: dpkg-name.1:66
 #, no-wrap
 msgid "B<dpkg-name bar-foo.deb>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 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 "
@@ -8915,13 +9262,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 #, no-wrap
 msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:75
+#: dpkg-name.1:76
 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 "
@@ -8929,41 +9276,41 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:75
+#: dpkg-name.1:76
 #, no-wrap
 msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:81
+#: dpkg-name.1:82
 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:81
+#: dpkg-name.1:82
 #, no-wrap
 msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:84
+#: dpkg-name.1:85
 msgid "This can be used when building new packages."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:94
+#: dpkg-name.1:95
 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 "
+"I<package>B<_>I<version>B<_>I<architecture>B<.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:102
+#: dpkg-name.1:103
 #, fuzzy
 msgid ""
 "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
@@ -8971,7 +9318,7 @@
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 #. type: Plain text
-#: dpkg-name.1:105
+#: dpkg-name.1:106
 msgid "Copyright \\(co 1995,1996 Erick Branderhorst"
 msgstr ""
 
@@ -8981,12 +9328,6 @@
 msgid "dpkg-parsechangelog"
 msgstr ""
 
-#. type: TH
-#: dpkg-parsechangelog.1:1
-#, fuzzy, no-wrap
-msgid "2009-05-19"
-msgstr "2006-06-17"
-
 #. type: Plain text
 #: dpkg-parsechangelog.1:4
 msgid "dpkg-parsechangelog - parse Debian changelog files"
@@ -8994,8 +9335,9 @@
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:8
-msgid "B<dpkg-parsechangelog> [I<options>]"
-msgstr ""
+#, fuzzy
+msgid "B<dpkg-parsechangelog> [I<option>...]"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:14
@@ -9052,25 +9394,25 @@
 #. type: TP
 #: dpkg-parsechangelog.1:54
 #, fuzzy, no-wrap
-msgid "B<Source:> E<lt>pkg nameE<gt>"
+msgid "B<Source:>I< pkg-name>"
 msgstr "B<Source:> E<lt>forrás névE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:56
 #, fuzzy, no-wrap
-msgid "B<Version:> E<lt>versionE<gt>"
+msgid "B<Version:>I< version>"
 msgstr "B<Version:> E<lt>verzióE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:58
 #, fuzzy, no-wrap
-msgid "B<Distribution:> E<lt>target distributionE<gt>"
+msgid "B<Distribution:>I< target-distribution>"
 msgstr "B<Description:> E<lt>rövid leírásE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:60
 #, fuzzy, no-wrap
-msgid "B<Urgency:> E<lt>urgencyE<gt>"
+msgid "B<Urgency:>I< urgency>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
@@ -9081,19 +9423,19 @@
 #. type: TP
 #: dpkg-parsechangelog.1:63
 #, fuzzy, no-wrap
-msgid "B<Maintainer:> E<lt>authorE<gt>"
+msgid "B<Maintainer:>I< author>"
 msgstr "B<Maintainer:> E<lt>teljes.név emailE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:65
 #, fuzzy, no-wrap
-msgid "B<Date:> E<lt>dateE<gt>"
+msgid "B<Date:>I< date>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:67
 #, fuzzy, no-wrap
-msgid "B<Closes:> E<lt>bug numberE<gt>"
+msgid "B<Closes:>I< bug-number>"
 msgstr "B<Source:> E<lt>forrás névE<gt>"
 
 #. type: Plain text
@@ -9104,7 +9446,7 @@
 #. type: TP
 #: dpkg-parsechangelog.1:70
 #, fuzzy, no-wrap
-msgid "B<Changes:> E<lt>changelog entriesE<gt>"
+msgid "B<Changes:>I< changelog-entries>"
 msgstr "B<Package:> E<lt>csomag névE<gt>"
 
 #. type: Plain text
@@ -9199,7 +9541,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-parsechangelog.1:104 update-alternatives.8:269
+#: dpkg-parsechangelog.1:104 update-alternatives.8:268
 #, fuzzy, no-wrap
 msgid "B<--all>"
 msgstr "B<--old>"
@@ -9380,33 +9722,36 @@
 msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
-#: dpkg-query.1:78
+#: dpkg-query.1:79
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"installed package status database. When multiple I<package-name> are listed, "
+"the requested status entries are separated by an empty line."
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:78
+#: dpkg-query.1:79
 #, 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-query.1:83
+#: dpkg-query.1:85
 msgid ""
-"List files installed to your system from I<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+"List files installed to your system from I<package-name>. When multiple "
+"I<package-name> are listed, the requested lists of files are separated by an "
+"empty line. However, note that files created by package-specific "
+"installation-scripts are not listed."
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:83
+#: dpkg-query.1:85
 #, fuzzy, no-wrap
 msgid "B<-c>, B<--control-path> I<package-name> [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-query.1:91
+#: dpkg-query.1:93
 msgid ""
 "List paths for control files installed to your system from I<package-name>.  "
 "If I<control-file> is specified then only list the path for that control "
@@ -9417,47 +9762,55 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 #, 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:97
+#: dpkg-query.1:99
 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."
+"Search for packages that own files corresponding to the given pattern.  "
+"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:97
+#: dpkg-query.1:99
 #, fuzzy, no-wrap
 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-query.1:104
+#: dpkg-query.1:105
 msgid ""
 "Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>. Users of APT-based frontends should use B<apt-cache show> "
-"I<package-name> instead as the I<available> file is only kept up-to-date "
-"when using B<dselect>."
+"available>. When multiple I<package-name> are listed, the requested "
+"I<available> entries are separated by an empty line."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.1:110
+msgid ""
+"Users of APT-based frontends should use B<apt-cache show> I<package-name> "
+"instead as the I<available> file is only kept up-to-date when using "
+"B<dselect>."
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:116
+#: dpkg-query.1:122
 #, fuzzy, no-wrap
 msgid "B<-f>, B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<formátum>"
 
 #. type: Plain text
-#: dpkg-query.1:123
+#: dpkg-query.1:129
 msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:128
+#: dpkg-query.1:134
 #, no-wrap
 msgid ""
 "    B<\\en>  newline\n"
@@ -9466,7 +9819,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:133
+#: dpkg-query.1:139
 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<"
@@ -9474,7 +9827,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:141
+#: dpkg-query.1:147
 msgid ""
 "Package information can be included by inserting variable references to "
 "package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
@@ -9485,7 +9838,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:176
+#: dpkg-query.1:182
 #, no-wrap
 msgid ""
 "    B<Architecture>\n"
@@ -9498,11 +9851,11 @@
 "    B<Description>\n"
 "    B<Enhances>\n"
 "    B<Essential>\n"
-"    B<Filename> (internal, dselect related)\n"
+"    B<Filename> (internal, front-end related)\n"
 "    B<Homepage>\n"
 "    B<Installed-Size>\n"
-"    B<MD5sum> (internal, dselect related)\n"
-"    B<MSDOS-Filename> (internal, dselect related)\n"
+"    B<MD5sum> (internal, front-end related)\n"
+"    B<MSDOS-Filename> (internal, front-end related)\n"
 "    B<Maintainer>\n"
 "    B<Origin>\n"
 "    B<Package>\n"
@@ -9513,18 +9866,18 @@
 "    B<Replaces>\n"
 "    B<Revision> (obsolete)\n"
 "    B<Section>\n"
-"    B<Size> (internal, dselect related)\n"
+"    B<Size> (internal, front-end related)\n"
 "    B<Source>\n"
 "    B<Status> (internal)\n"
 "    B<Suggests>\n"
-"    B<Tag> (usually not in the .deb but in APT's Packages files)\n"
+"    B<Tag> (usually not in the .deb but in the repository Packages files)\n"
 "    B<Triggers-Awaited> (internal)\n"
 "    B<Triggers-Pending> (internal)\n"
 "    B<Version>\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:184
+#: dpkg-query.1:190
 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 "
@@ -9534,51 +9887,53 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:187
+#: dpkg-query.1:193
 #, no-wrap
 msgid "  B<dpkg-query -W -f=\\(aq${Package} ${Version}\\et${Maintainer}\\en\\(aq dpkg>\n"
 msgstr ""
 
 #. type: SH
-#: dpkg-query.1:189 dpkg-split.1:180 start-stop-daemon.8:256
-#: update-alternatives.8:375
+#: dpkg-query.1:195 dpkg-split.1:179 start-stop-daemon.8:259
+#: update-alternatives.8:374
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr ""
 
-#. type: IP
-#: dpkg-query.1:190 update-alternatives.8:376
+#. type: TP
+#: dpkg-query.1:196 dpkg-split.1:180 start-stop-daemon.8:260
+#: start-stop-daemon.8:289 update-alternatives.8:375
 #, no-wrap
-msgid "0"
+msgid "B<0>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:192
+#: dpkg-query.1:199
 msgid "The requested query was successfully performed."
 msgstr ""
 
-#. type: IP
-#: dpkg-query.1:192
+#. type: TP
+#: dpkg-query.1:199 dpkg-split.1:186 start-stop-daemon.8:270
+#: start-stop-daemon.8:292
 #, no-wrap
-msgid "1"
+msgid "B<1>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:195
+#: dpkg-query.1:203
 msgid ""
 "Problems were encountered while parsing the command line or performing the "
 "query, including no file or package being found (except for --control-path)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:205
+#: dpkg-query.1:213
 msgid ""
 "This setting influences the output of the B<--list> option by changing the "
 "width of its output."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:208
+#: dpkg-query.1:216
 msgid "Copyright \\(co 2001 Wichert Akkerman"
 msgstr ""
 
@@ -9588,26 +9943,20 @@
 msgid "dpkg-scanpackages"
 msgstr ""
 
-#. type: TH
-#: dpkg-scanpackages.1:15 dpkg-scansources.1:1
-#, fuzzy, no-wrap
-msgid "2009-10-01"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-scanpackages.1:18
 msgid "dpkg-scanpackages - create Packages index files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:27
+#: dpkg-scanpackages.1:26
 msgid ""
-"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scanpackages> [I<option>...] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:40
+#: dpkg-scanpackages.1:39
 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 "
@@ -9618,7 +9967,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:52
+#: 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<bzip2>(1)  (generating a "
@@ -9628,7 +9977,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:59
+#: 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 "
@@ -9637,7 +9986,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-scanpackages.1:63
 msgid ""
 "I<overridefile> is the name of a file to read which contains information "
 "about how the package fits into the distribution (it can be a compressed "
@@ -9645,13 +9994,13 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-scanpackages.1:66
 msgid ""
 "I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:71
+#: dpkg-scanpackages.1:70
 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 "
@@ -9659,72 +10008,72 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:73
+#: dpkg-scanpackages.1:72
 #, fuzzy, no-wrap
 msgid "B<-t>, B<--type> I<type>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 msgid "Scan for *.I<type> packages, instead of *.deb."
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 #, fuzzy, no-wrap
 msgid "B<-u>, B<--udeb>"
 msgstr "B<--show>, B<-W>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:79
+#: dpkg-scanpackages.1:78
 msgid "B<Obsolete> alias for B<-tudeb>."
 msgstr ""
 
 #. type: IP
-#: dpkg-scanpackages.1:79 dpkg-scansources.1:50
+#: dpkg-scanpackages.1:78 dpkg-scansources.1:49
 #, fuzzy, no-wrap
 msgid "B<-e>, B<--extra-override> I<file>"
 msgstr "B<--help>, B<-h>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:85 dpkg-scansources.1:55
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:54
 msgid ""
 "Scan I<file> to find supplementary overrides (the file can be compressed). "
 "See B<deb-extra-override>(5)  for more information on its format."
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:85
+#: dpkg-scanpackages.1:84
 #, fuzzy, no-wrap
 msgid "B<-a>, B<--arch> I<arch>"
 msgstr "B<--show>, B<-W>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 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:89
+#: dpkg-scanpackages.1:88
 #, fuzzy, no-wrap
 msgid "B<-m>, B<--multiversion>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 msgid "Include all found packages in the output."
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 #, fuzzy, no-wrap
 msgid "B<-M>, B<--medium> I<id-string>"
 msgstr "B<--show>, B<-W>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:97
+#: dpkg-scanpackages.1:96
 msgid ""
 "Add an X-Medium field containing the value I<id-string>. This field is "
 "required if you want to generate B<Packages.cd> files for use by the multicd "
@@ -9732,13 +10081,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-scanpackages.1:104 update-alternatives.8:447
+#: dpkg-scanpackages.1:103 update-alternatives.8:448
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:110
+#: dpkg-scanpackages.1:109
 msgid ""
 "B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
 "warns about packages that are in the wrong subdirectory, are duplicated, "
@@ -9747,7 +10096,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:116
+#: dpkg-scanpackages.1:115
 #, fuzzy
 msgid ""
 "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<deb-extra-override>(5), "
@@ -9769,21 +10118,21 @@
 "róluk."
 
 #. type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-scansources.1:12
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scansources> [I<option>...] 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:17
 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:28
 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> "
@@ -9797,7 +10146,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-scansources.1:32
 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 "
@@ -9805,7 +10154,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:44
+#: dpkg-scansources.1:43
 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 "
@@ -9814,33 +10163,33 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-scansources.1:46
+#: dpkg-scansources.1:45
 #, fuzzy, no-wrap
 msgid "B<-n>, B<--no-sort>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: dpkg-scansources.1:49
+#: dpkg-scansources.1:48
 msgid ""
 "Don't sort the index records. Normally they are sorted by source package "
 "name."
 msgstr ""
 
 #. type: IP
-#: dpkg-scansources.1:55
+#: dpkg-scansources.1:54
 #, no-wrap
 msgid "B<-s>, B<--source-override> I<file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:59
+#: dpkg-scansources.1:58
 msgid ""
 "Use I<file> as the source override file (the file can be compressed).  The "
 "default is the name of the override file you specified with I<.src> appended."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 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 "
@@ -9850,24 +10199,24 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 #, fuzzy, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>, B<-D>"
 
 #. type: Plain text
-#: dpkg-scansources.1:67
+#: dpkg-scansources.1:66
 msgid "Turn debugging on."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:76
+#: dpkg-scansources.1:75
 #, fuzzy
 msgid "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 msgstr "B<dpkg>(1)."
 
 #. type: Plain text
-#: dpkg-scansources.1:78
+#: dpkg-scansources.1:77
 msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr ""
 
@@ -9877,36 +10226,29 @@
 msgid "dpkg-shlibdeps"
 msgstr "dpkg készlet"
 
-#. type: TH
-#: dpkg-shlibdeps.1:1 dpkg-source.1:2 start-stop-daemon.8:1
-#: update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2011-03-04"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-shlibdeps.1:4
 msgid "dpkg-shlibdeps - generate shared library substvar dependencies"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:10
-msgid ""
-"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
-msgstr ""
+#: dpkg-shlibdeps.1:8
+#, fuzzy
+msgid "B<dpkg-shlibdeps> [I<option>...] [B<-e>]I<executable> [I<option>...]"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:24
+#: dpkg-shlibdeps.1:22
 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."
+"other variables starting with B<shlibs:> are removed from the file."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 msgid ""
 "B<dpkg-shlibdeps> has two possible sources of information to generate "
 "dependency information. Either I<symbols> files or I<shlibs> files. For each "
@@ -9923,13 +10265,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 #, no-wrap
 msgid "Symbols files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 msgid ""
 "Symbols files contain finer-grained dependency information by providing the "
 "minimum dependency for each symbol that the library exports. The script "
@@ -9938,13 +10280,13 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 #, no-wrap
 msgid "debian/*/DEBIAN/symbols"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are generated by B<dpkg-gensymbols>(1).  "
@@ -9954,19 +10296,19 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols.I<arch>"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:61
+#: dpkg-shlibdeps.1:59
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 msgid ""
 "Per-system overriding shared library dependency information.  I<arch> is the "
 "architecture of the current system (obtained by B<dpkg-architecture -"
@@ -9974,20 +10316,20 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> symbols\\(rq"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:68 dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:66 dpkg-shlibdeps.1:100
 msgid ""
 "Package-provided shared library dependency information.  Unless overridden "
 "by --admindir, those files are located in /var/lib/dpkg."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:75
+#: dpkg-shlibdeps.1:73
 msgid ""
 "While scanning the symbols used by all binaries, B<dpkg-shlibdeps> remembers "
 "the (biggest) minimal version needed for each library. At the end of the "
@@ -9996,7 +10338,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 msgid ""
 "As a safe-guard measure, a symbols file can provide a I<Build-Depends-"
 "Package> meta-information field and B<dpkg-shlibdeps> will extract the "
@@ -10006,13 +10348,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 #, no-wrap
 msgid "Shlibs files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:86
+#: dpkg-shlibdeps.1:84
 msgid ""
 "Shlibs files associate directly a library to a dependency (without looking "
 "at the symbols). It's thus often stronger than really needed but very safe "
@@ -10020,42 +10362,42 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 msgid ""
 "The dependencies for a library are looked up in several places. The first "
 "file providing information for the library of interest is used:"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 #, no-wrap
 msgid "debian/shlibs.local"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 msgid "Package-local overriding shared library dependency information."
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 #, fuzzy, no-wrap
 msgid "/etc/dpkg/shlibs.override"
 msgstr "I</etc/dpkg/dselect.cfg>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 msgid "Per-system overriding shared library dependency information."
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 #, no-wrap
 msgid "debian/*/DEBIAN/shlibs"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are only used if the library is found in a "
@@ -10064,24 +10406,24 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> shlibs\\(rq"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:100
 #, fuzzy, no-wrap
 msgid "/etc/dpkg/shlibs.default"
 msgstr "I</etc/dpkg/dselect.cfg>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:104
+#: dpkg-shlibdeps.1:102
 msgid "Per-system default shared library dependency information."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:108
+#: dpkg-shlibdeps.1:106
 msgid ""
 "The extracted dependencies are then directly used (except if they are "
 "filtered out because they have been identified as duplicate, or as weaker "
@@ -10089,33 +10431,33 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 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:113
+#: dpkg-shlibdeps.1:111
 #, no-wrap
 msgid "B<-e>I<executable>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 msgid ""
 "Include dependencies appropriate for the shared libraries required by "
 "I<executable>."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 #, no-wrap
 msgid "B<-d>I<dependencyfield>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:123
+#: dpkg-shlibdeps.1:121
 msgid ""
 "Add dependencies to be added to the control file dependency field "
 "I<dependencyfield>.  (The dependencies for this field are placed in the "
@@ -10123,7 +10465,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:133
+#: dpkg-shlibdeps.1:131
 msgid ""
 "The B<-d>I<dependencyfield> option takes effect for all executables after "
 "the option, until the next B<-d>I<dependencyfield>.  The default "
@@ -10131,7 +10473,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 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>, "
@@ -10141,13 +10483,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 #, no-wrap
 msgid "B<-p>I<varnameprefix>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:152
+#: dpkg-shlibdeps.1:150
 msgid ""
 "Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
 ">.  Likewise, any existing substitution variables starting with "
@@ -10156,20 +10498,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 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:158
+#: dpkg-shlibdeps.1:156
 #, no-wrap
 msgid "B<-t>I<type>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 msgid ""
 "Prefer shared library dependency information tagged for the given package "
 "type. If no tagged information is available, falls back to untagged "
@@ -10179,46 +10521,46 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 #, no-wrap
 msgid "B<-L>I<localshlibsfile>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:171
+#: dpkg-shlibdeps.1:169
 msgid ""
 "Read overriding shared library dependency information from "
 "I<localshlibsfile> instead of B<debian/shlibs.local>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 msgid ""
 "Write substitution variables in I<substvarsfile>; the default is B<debian/"
 "substvars>."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 #, fuzzy, no-wrap
 msgid "B<-v>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 msgid ""
 "Enable verbose mode. Numerous messages are displayed to explain what B<dpkg-"
 "shlibdeps> does."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 #, fuzzy, no-wrap
 msgid "B<-x>I<package>"
 msgstr "B<Package:> E<lt>csomag névE<gt>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 msgid ""
 "Exclude the package from the generated dependencies. This is useful to avoid "
 "self-dependencies for packages which provide ELF binaries (executables or "
@@ -10227,13 +10569,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 #, fuzzy, no-wrap
 msgid "B<-S>I<pkgbuilddir>"
 msgstr "B<--field>, B<-f>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 msgid ""
 "Look into I<pkgbuilddir> first when trying to find a library. This is useful "
 "when the source package builds multiple flavors of the same library and you "
@@ -10243,13 +10585,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 #, no-wrap
 msgid "B<--ignore-missing-info>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 msgid ""
 "Do not fail if dependency information can't be found for a shared library.  "
 "Usage of this option is discouraged, all libraries should provide dependency "
@@ -10258,13 +10600,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 #, no-wrap
 msgid "B<--warnings=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:213
+#: dpkg-shlibdeps.1:211
 msgid ""
 "I<value> is a bit field defining the set of warnings that can be emitted by "
 "B<dpkg-shlibdeps>.  Bit 0 (value=1) enables the warning \"symbol I<sym> used "
@@ -10276,13 +10618,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-shlibdeps.1:224
+#: dpkg-shlibdeps.1:222
 #, no-wrap
 msgid "WARNINGS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 msgid ""
 "Since B<dpkg-shlibdeps> analyzes the set of symbols used by each binary of "
 "the generated package, it is able to emit warnings in several cases. They "
@@ -10292,13 +10634,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 #, no-wrap
 msgid "B<symbol>I< sym>B< used by >I<binary>B< found in none of the libraries.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a library and it needs to be linked "
@@ -10307,13 +10649,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 #, no-wrap
 msgid "I<binary>B< contains an unresolvable reference to symbol >I<sym>B<: it's probably a plugin>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a plugin and the symbol is probably "
@@ -10328,13 +10670,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 #, no-wrap
 msgid "B<dependency on >I<library>B< could be avoided if >I<binaries>B< were not uselessly linked against it (they use none of its symbols).>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 msgid ""
 "None of the I<binaries> that are linked with I<library> use any of the "
 "symbols provided by the library. By fixing all the binaries, you would avoid "
@@ -10343,13 +10685,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 #, no-wrap
 msgid "I<binary>B< shouldn't be linked with >I<library>B< (it uses none of its symbols).>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 msgid ""
 "The I<binary> is linked to a library that it doesn't need. It's not a "
 "problem but some small performance improvements in binary load time can be "
@@ -10359,13 +10701,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 #, no-wrap
 msgid "ERRORS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 msgid ""
 "B<dpkg-shlibdeps> will fail if it can't find a public library used by a "
 "binary or if this library has no associated dependency information (either "
@@ -10375,13 +10717,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 #, no-wrap
 msgid "B<couldn't find library >I<library-soname>B< needed by >I<binary>B< (its RPATH is '>I<rpath>B<')>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:287
+#: dpkg-shlibdeps.1:285
 msgid ""
 "The I<binary> uses a library called I<library-soname> but B<dpkg-shlibdeps> "
 "has been unable to find the library.  B<dpkg-shlibdeps> creates a list of "
@@ -10390,14 +10732,14 @@
 "LD_LIBRARY_PATH environment variable, and standard public directories (/"
 "lib, /usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks those "
 "directories in the package's build tree of the binary being analyzed, in the "
-"packages's build trees indicated with the -S command-line option, in other "
-"packages's build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
+"packages' build trees indicated with the -S command-line option, in other "
+"packages' build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
 "and finally in the root directory.  If the library is not found in any of "
 "those directories, then you get this error."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 msgid ""
 "If the library not found is in a private directory of the same package, then "
 "you want to add the directory to LD_LIBRARY_PATH. If it's in another binary "
@@ -10407,13 +10749,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 #, no-wrap
 msgid "B<no dependency information found for >I<library-file>B< (used by >I<binary>B<).>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:306
+#: dpkg-shlibdeps.1:304
 msgid ""
 "The library needed by I<binary> has been found by B<dpkg-shlibdeps> in "
 "I<library-file> but B<dpkg-shlibdeps> has been unable to find any dependency "
@@ -10424,7 +10766,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:320
+#: dpkg-shlibdeps.1:318
 msgid ""
 "This failure can be caused by a bad or missing shlibs or symbols file in the "
 "package of the library. It might also happen if the library is built within "
@@ -10439,7 +10781,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:326
+#: dpkg-shlibdeps.1:324
 msgid ""
 "Calling B<dpkg-shlibdeps> in verbose mode (-v) will provide much more "
 "information about where it tried to find the dependency information. This "
@@ -10447,13 +10789,13 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:330
+#: dpkg-shlibdeps.1:328
 #, fuzzy
 msgid "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:337
+#: dpkg-shlibdeps.1:335
 msgid "Copyright \\(co 2006 Frank Lichtenheld"
 msgstr ""
 
@@ -10472,12 +10814,13 @@
 "róluk."
 
 #. type: Plain text
-#: dpkg-source.1:10
-msgid "B<dpkg-source> [I<options>] I<command>"
-msgstr ""
+#: dpkg-source.1:9
+#, fuzzy
+msgid "B<dpkg-source> [I<option>...] I<command>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
-#: dpkg-source.1:14
+#: dpkg-source.1:13
 #, fuzzy
 msgid "B<dpkg-source> packs and unpacks Debian source archives."
 msgstr ""
@@ -10485,7 +10828,7 @@
 "róluk."
 
 #. type: Plain text
-#: dpkg-source.1:18
+#: dpkg-source.1:17
 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 "
@@ -10493,13 +10836,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:20
+#: dpkg-source.1:19
 #, no-wrap
 msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:30
+#: dpkg-source.1:29
 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 "
@@ -10510,7 +10853,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:36
+#: dpkg-source.1:35
 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 "
@@ -10518,7 +10861,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:44
+#: dpkg-source.1:43
 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 "
@@ -10529,7 +10872,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:49
+#: dpkg-source.1:48
 msgid ""
 "If the source package uses a non-standard format (currently this means all "
 "formats except \"1.0\"), its name will be stored in B<debian/source/format> "
@@ -10538,13 +10881,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:50
+#: dpkg-source.1:49
 #, fuzzy, no-wrap
 msgid "B<-b> I<directory> [I<format-specific-parameters>]"
 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:57
+#: dpkg-source.1:56
 msgid ""
 "Build a source package. The first non-option argument is taken as the name "
 "of the directory containing the debianized source tree (i.e. with a debian "
@@ -10554,10 +10897,10 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:66
+#: dpkg-source.1:65
 msgid ""
 "B<dpkg-source> will build the source package with the first format found in "
-"this ordered list: the format indicated with the I<--format> command-line "
+"this ordered list: the format indicated with the I<--format> command line "
 "option, the format indicated in B<debian/source/format>, \"1.0\". The "
 "fallback to \"1.0\" is deprecated and will be removed at some point in the "
 "future, you should always document the desired source format in B<debian/"
@@ -10566,13 +10909,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:67
+#: dpkg-source.1:66
 #, fuzzy, no-wrap
 msgid "B<--print-format> I<directory>"
 msgstr "B<Section:> E<lt>szakaszE<gt>"
 
 #. type: Plain text
-#: dpkg-source.1:72
+#: dpkg-source.1:71
 msgid ""
 "Print the source format that would be used to build the source package if "
 "B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -10580,7 +10923,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:73
+#: dpkg-source.1:72
 #, fuzzy, no-wrap
 msgid "B<--before-build> I<directory>"
 msgstr "B<Section:> E<lt>szakaszE<gt>"
@@ -10588,12 +10931,12 @@
 #. type: Plain text
 #: dpkg-source.1:81
 msgid ""
-"This command should be called before any build of the package (B<dpkg-"
-"buildpackage> calls it very early even before B<debian/rules clean>). This "
-"command should be idempotent and can be called multiple times. Not all "
-"source formats implement something in this hook, and those that do usually "
-"prepare the source tree for the build for example by ensuring that the "
-"Debian patches are applied."
+"Run the corresponding hook of the source package format. This hook is called "
+"before any build of the package (B<dpkg-buildpackage> calls it very early "
+"even before B<debian/rules clean>). This command is idempotent and can be "
+"called multiple times. Not all source formats implement something in this "
+"hook, and those that do usually prepare the source tree for the build for "
+"example by ensuring that the Debian patches are applied."
 msgstr ""
 
 #. type: TP
@@ -10605,21 +10948,35 @@
 #. type: Plain text
 #: dpkg-source.1:89
 msgid ""
-"This command should be called after any build of the package (B<dpkg-"
-"buildpackage> calls it last). This command should be idempotent and can be "
-"called multiple times. Not all source formats implement something in this "
-"hook, and those that do usually use it to undo what B<--before-build> has "
-"done."
+"Run the corresponding hook of the source package format. This hook is called "
+"after any build of the package (B<dpkg-buildpackage> calls it last). This "
+"command is idempotent and can be called multiple times. Not all source "
+"formats implement something in this hook, and those that do usually use it "
+"to undo what B<--before-build> has done."
+msgstr ""
+
+#. type: TP
+#: dpkg-source.1:90
+#, fuzzy, no-wrap
+msgid "B<--commit> [I<directory>] ..."
+msgstr "B<Section:> E<lt>szakaszE<gt>"
+
+#. type: Plain text
+#: dpkg-source.1:95
+msgid ""
+"Record changes in the source tree unpacked in I<directory>. This command can "
+"take supplementary parameters depending on the source format.  It will error "
+"out for formats where this operation doesn't mean anything."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:97
+#: dpkg-source.1:103
 #, no-wrap
 msgid "GENERIC BUILD OPTIONS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 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 "
@@ -10627,7 +10984,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 msgid ""
 "Specifies the change log file to read information from. The default is "
 "B<debian/changelog>.  If given with relative pathname this is interpreted "
@@ -10635,20 +10992,20 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 #, fuzzy, no-wrap
 msgid "B<--format=>I<value>"
 msgstr "B<--showformat=>I<formátum>"
 
 #. type: Plain text
-#: dpkg-source.1:121
+#: dpkg-source.1:127
 msgid ""
 "Use the given format for building the source package. It does override any "
 "format given in B<debian/source/format>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:131
+#: dpkg-source.1:137
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is to not read "
 "any file. This option can be used multiple times to read substitution "
@@ -10656,13 +11013,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:137
+#: dpkg-source.1:143
 #, no-wrap
 msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 msgid ""
 "Specify the compression to use for created files (tarballs and diffs).  Note "
 "that this option will not cause existing tarballs to be recompressed, it "
@@ -10672,27 +11029,27 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 #, no-wrap
 msgid "B<-z>I<level>, B<--compression-level>=I<level>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 msgid ""
 "Compression level to use. As with B<-Z> it only affects newly created files. "
-"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  I<9> is the "
-"default."
+"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  The default is "
+"I<9> for gzip and bzip2, I<6> for xz and lzma."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 #, no-wrap
 msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:163
+#: dpkg-source.1:169
 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 "
@@ -10706,7 +11063,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 msgid ""
 "This is very helpful in cutting out extraneous files that get included in "
 "the diff, e.g. if you maintain your source in a revision control system and "
@@ -10720,29 +11077,29 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 #, no-wrap
 msgid "B<--extend-diff-ignore>=I<regexp>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 msgid ""
-"The perl regular expression specified will extend the default regular "
-"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
-"default regexp.  This option is convenient to use in B<debian/source/"
-"options> to exclude some auto-generated files from the automatic patch "
-"generation."
+"The perl regular expression specified will extend the default value of B<--"
+"diff-ignore> and its current value (if set). It does this by concatenating "
+"\"B<|>I<regexp>\" to the existing value.  This option is convenient to use "
+"in B<debian/source/options> to exclude some auto-generated files from the "
+"automatic patch generation."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 #, no-wrap
 msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:189
+#: dpkg-source.1:195
 msgid ""
 "If this option is specified, the pattern will be passed to B<tar>(1)'s --"
 "exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -10752,7 +11109,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:194
+#: dpkg-source.1:200
 msgid ""
 "B<-I> by itself adds default --exclude options that will filter out control "
 "files and directories of the most common revision control systems, backup "
@@ -10760,7 +11117,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:212
 msgid ""
 "B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
 "different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -10773,48 +11130,48 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 msgid ""
 "The default regexp and patterns for both options can be seen in the output "
 "of the B<--help> command."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 #, fuzzy, no-wrap
 msgid "GENERIC EXTRACT OPTIONS"
 msgstr "MÁS LEHETŐSÉGEK"
 
 #. type: TP
-#: dpkg-source.1:210
+#: dpkg-source.1:216
 #, fuzzy, no-wrap
 msgid "B<--no-copy>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 msgid "Do not copy original tarballs near the extracted source package."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 #, fuzzy, no-wrap
 msgid "B<--no-check>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 msgid "Do not check signatures and checksums before unpacking."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 #, no-wrap
 msgid "B<--require-valid-signature>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:224
+#: dpkg-source.1:230
 msgid ""
 "Refuse to unpack the source package if it doesn't contain an OpenPGP "
 "signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -10824,13 +11181,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:225
+#: dpkg-source.1:231
 #, no-wrap
 msgid "SOURCE PACKAGE FORMATS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:230
+#: dpkg-source.1:236
 msgid ""
 "If you don't know what source format to use, you should probably pick either "
 "\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
@@ -10838,13 +11195,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:231
+#: dpkg-source.1:237
 #, no-wrap
 msgid "Format: 1.0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:235
+#: dpkg-source.1:241
 msgid ""
 "A source package in this format consists either of a B<.orig.tar.gz> "
 "associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -10852,12 +11209,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:237 dpkg-source.1:405 dpkg-source.1:566 dpkg-source.1:605
+#: dpkg-source.1:243 dpkg-source.1:411 dpkg-source.1:586 dpkg-source.1:625
 msgid "B<Extracting>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:247
+#: dpkg-source.1:253
 msgid ""
 "Extracting a native package is a simple extraction of the single tarball in "
 "the target directory. Extracting a non-native package is done by first "
@@ -10870,12 +11227,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:249 dpkg-source.1:433 dpkg-source.1:577 dpkg-source.1:610
+#: dpkg-source.1:255 dpkg-source.1:439 dpkg-source.1:597 dpkg-source.1:630
 msgid "B<Building>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:255
+#: dpkg-source.1:261
 msgid ""
 "Building a native package is just creating a single tarball with the source "
 "directory. Building a non-native package involves extracting the original "
@@ -10884,13 +11241,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:256
+#: dpkg-source.1:262
 #, no-wrap
 msgid "B<Build options (with -b):>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:269
+#: dpkg-source.1:275
 msgid ""
 "If a second non-option argument is supplied it should be the name of the "
 "original source directory or tarfile or the empty string if the package is a "
@@ -10901,7 +11258,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 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<-"
@@ -10909,13 +11266,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 #, fuzzy, no-wrap
 msgid "B<-sk>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:290
 msgid ""
 "Specifies to expect the original source as a tarfile, by default "
 "I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>.  It will leave "
@@ -10925,24 +11282,24 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:284 dpkg-source.1:353
+#: dpkg-source.1:290 dpkg-source.1:359
 #, fuzzy, no-wrap
 msgid "B<-sp>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-source.1:289
+#: dpkg-source.1:295
 msgid "Like B<-sk> but will remove the directory again afterwards."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:289 dpkg-source.1:359
+#: dpkg-source.1:295 dpkg-source.1:365
 #, fuzzy, no-wrap
 msgid "B<-su>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 msgid ""
 "Specifies that 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 "
@@ -10950,24 +11307,24 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 #, fuzzy, no-wrap
 msgid "B<-sr>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 #, fuzzy, no-wrap
 msgid "B<-ss>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-source.1:310
+#: dpkg-source.1:316
 msgid ""
 "Specifies that the original source is available both as a directory and as a "
 "tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -10976,13 +11333,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:310 dpkg-source.1:362
+#: dpkg-source.1:316 dpkg-source.1:368
 #, fuzzy, no-wrap
 msgid "B<-sn>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 msgid ""
 "Specifies to not look for any original source, and to not generate a diff.  "
 "The second argument, if supplied, must be the empty string. This is used for "
@@ -10991,13 +11348,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 #, fuzzy, no-wrap
 msgid "B<-sa> or B<-sA>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:348
 msgid ""
 "Specifies to 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 "
@@ -11013,13 +11370,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:342 dpkg-source.1:525
+#: dpkg-source.1:348 dpkg-source.1:541
 #, no-wrap
 msgid "B<--abort-on-upstream-changes>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:348
+#: dpkg-source.1:354
 msgid ""
 "The process fails if the generated diff contains changes to files outside of "
 "the debian sub-directory. This option is not allowed in B<debian/source/"
@@ -11027,18 +11384,18 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:349
+#: dpkg-source.1:355
 #, no-wrap
 msgid "B<Extract options (with -x):>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:353
+#: dpkg-source.1:359
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:359
+#: dpkg-source.1:365
 msgid ""
 "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 "
@@ -11047,12 +11404,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:362
+#: dpkg-source.1:368
 msgid "Unpacks the original source tree."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:367
+#: dpkg-source.1:373
 msgid ""
 "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 "
@@ -11060,31 +11417,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:372
+#: dpkg-source.1:378
 msgid ""
 "All the B<-s>I<X> options are mutually exclusive. If you specify more than "
 "one only the last one will be used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:372 dpkg-source.1:535
+#: dpkg-source.1:378 dpkg-source.1:555
 #, fuzzy, no-wrap
 msgid "B<--skip-debianization>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg-source.1:375
+#: dpkg-source.1:381
 msgid "Skips application of the debian diff on top of the upstream sources."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:376
+#: dpkg-source.1:382
 #, no-wrap
 msgid "Format: 2.0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:380
+#: dpkg-source.1:386
 msgid ""
 "Also known as wig&pen. This format is not recommended for wide-spread usage, "
 "the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -11092,7 +11449,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:385
+#: dpkg-source.1:391
 msgid ""
 "The behaviour of this format is the same as the \"3.0 (quilt)\" format "
 "except that it doesn't use an explicit list of patches. All files in "
@@ -11101,20 +11458,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:388
+#: dpkg-source.1:394
 msgid ""
 "When building a new source package, any change to the upstream source is "
 "stored in a patch named B<zz_debian-diff-auto>."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:389
+#: dpkg-source.1:395
 #, no-wrap
 msgid "Format: 3.0 (native)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:395
+#: dpkg-source.1:401
 msgid ""
 "This format is an extension of the native package format as defined in the "
 "1.0 format. It supports all compression methods and will ignore by default "
@@ -11123,13 +11480,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:396
+#: dpkg-source.1:402
 #, no-wrap
 msgid "Format: 3.0 (quilt)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:409
 msgid ""
 "A source package in this format contains at least an original tarball (B<."
 "orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -11139,7 +11496,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:414
+#: dpkg-source.1:420
 msgid ""
 "The main original tarball is extracted first, then all additional original "
 "tarballs are extracted in subdirectories named after the I<component> part "
@@ -11151,7 +11508,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:432
 msgid ""
 "All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
 "series> are then applied.  If the former file is used and the latter one "
@@ -11166,36 +11523,37 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:428
+#: dpkg-source.1:434
 msgid ""
 "Similarly to quilt's default behaviour, the patches can remove files too."
 msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:431
+#: dpkg-source.1:437
 msgid ""
 "The file B<.pc/applied-patches> is created if some patches have been applied "
 "during the extraction."
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:443
+#: dpkg-source.1:451
 msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
 "except the automatic patch (B<debian-changes->I<version> or B<debian-"
 "changes>, depending on B<--single-debian-patch>) are applied. The temporary "
-"directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in the automatic patch.  If the automatic patch is created/"
-"deleted, it's added/removed from the series file and from the quilt metadata."
+"directory is compared to the source package directory. When the diff is non-"
+"empty, the build fails unless B<--single-debian-patch> or B<--auto-commit> "
+"has been used, in which case the diff is stored in the automatic patch.  If "
+"the automatic patch is created/deleted, it's added/removed from the series "
+"file and from the quilt metadata."
 msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:451
+#: dpkg-source.1:459
 msgid ""
 "Any change on a binary file is not representable in a diff and will thus "
 "lead to a failure unless the maintainer deliberately decided to include that "
@@ -11206,14 +11564,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:454
+#: dpkg-source.1:462
 msgid ""
 "The updated debian directory and the list of modified binaries is then used "
 "to generate the debian tarball."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:460
+#: dpkg-source.1:468
 msgid ""
 "The automatically generated diff doesn't include changes on VCS specific "
 "files as well as many temporary files (see default value associated to B<-i> "
@@ -11222,35 +11580,53 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:477
+msgid ""
+"Note: B<dpkg-source> B<--before-build> (and B<-b>) will ensure that all "
+"patches listed in the series file are applied so that a package build always "
+"has all patches applied. It does this by finding unapplied patches (they are "
+"listed in the B<series> file but not in B<.pc/applied-patches>), and if the "
+"first patch in that set can be applied without errors, it will apply them "
+"all. The option B<--no-preparation> can be used to disable this behavior."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:480
+msgid "B<Recording changes>"
+msgstr ""
+
+#. type: TP
+#: dpkg-source.1:480
+#, fuzzy, no-wrap
+msgid "B<--commit> [I<directory>] [I<patch-name>] [I<patch-file>]"
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
+
+#. type: Plain text
+#: dpkg-source.1:490
 msgid ""
-"Note: B<dpkg-source> expects the source tree to have all patches listed in "
-"the series file applied when you generate the source package.  This is not "
-"the case when the source tree has been obtained by unpacking a source "
-"package using the Format: 1.0 for instance. To mitigate the problem, B<dpkg-"
-"source> will apply the patches by itself if it believes that they have not "
-"yet been applied. To detect this situation, it uses the following heuristic: "
-"it finds the list of supposedly unapplied patches (they are listed in the "
-"B<series> file but not in B<.pc/applied-patches>), and if the first patch in "
-"that set can be applied without errors, it will apply them all.  The option "
-"B<--no-preparation> can be used to disable this behaviour. This operation is "
-"usually done as part of the B<--prepare-build> command."
+"Generates a patch corresponding to the local changes that are not managed by "
+"the quilt patch system and integrates it in the patch system under the name "
+"I<patch-name>. If the name is missing, it will be asked interactively. If "
+"I<patch-file> is given, it is used as the patch corresponding to the local "
+"changes to integrate. This is mainly useful after a build failure that pre-"
+"generated this file. Once integrated, an editor is launched so that you can "
+"edit the meta-information in the patch header."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:476 dpkg-source.1:547 dpkg-source.1:586
+#: dpkg-source.1:493 dpkg-source.1:567 dpkg-source.1:606
 msgid "B<Build options>"
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:476
+#: dpkg-source.1:493
 #, fuzzy, no-wrap
 msgid "B<--allow-version-of-quilt-db=>I<version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 msgid ""
 "Allow B<dpkg-source> to build the source package if the version of the quilt "
 "metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -11260,37 +11636,37 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 #, fuzzy, no-wrap
 msgid "B<--include-removal>"
 msgstr "B<--old>"
 
 #. type: Plain text
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 msgid ""
 "Do not ignore removed files and include them in the automatically generated "
 "patch."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 #, no-wrap
 msgid "B<--include-timestamp>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 msgid "Include timestamp in the automatically generated patch."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 #, fuzzy, no-wrap
 msgid "B<--include-binaries>"
 msgstr "B<--licence>"
 
 #. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 msgid ""
 "Add all modified binaries in the debian tarball. Also add them to B<debian/"
 "source/include-binaries>: they will be added by default in subsequent builds "
@@ -11298,45 +11674,45 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 #, fuzzy, no-wrap
 msgid "B<--no-preparation>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 msgid ""
 "Do not try to prepare the build tree by applying patches which are "
 "apparently unapplied."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 #, fuzzy, no-wrap
 msgid "B<--single-debian-patch>"
 msgstr "B<--version>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 msgid ""
 "Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
 "changes->I<version> for the name of the automatic patch generated during "
 "build. This option is particularly useful when the package is maintained in "
 "a VCS and a patch set can't reliably be generated. Instead the current diff "
-"with upstream should be stored in a single patch. When using this option, it "
-"is recommended to create a debian/source/patch-header file explaining how "
-"the Debian changes can be best reviewed, for example in the VCS that is used."
+"with upstream should be stored in a single patch. The option would be put in "
+"B<debian/source/local-options> and would be accompanied by a B<debian/source/"
+"local-patch-header> file explaining how the Debian changes can be best "
+"reviewed, for example in the VCS that is used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 #, no-wrap
 msgid "B<--create-empty-orig>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 msgid ""
 "Automatically create the main original tarball as empty if it's missing and "
 "if there are supplementary original tarballs. This option is meant to be "
@@ -11345,24 +11721,23 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 #, fuzzy, no-wrap
 msgid "B<--unapply-patches>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-source.1:525
+#: dpkg-source.1:541
 msgid ""
-"Unapply the patches in the B<--after-build> hook. This is mainly useful when "
-"you build your package directly in a VCS that contains unpatched upstream "
-"source and where you want to keep the tree unpatched even after a package "
-"build. This option is usually put in B<debian/source/local-options> (it's "
-"not allowed in B<debian/source/options> so that all generated source "
-"packages have the same behaviour by default)."
+"Unapply the patches in the B<--after-build> hook. You usually don't need "
+"this option as dpkg-source will automatically unapply the patches if it did "
+"apply them during B<--before-build>. This option is only allowed in B<debian/"
+"source/local-options> so that all generated source packages have the same "
+"behavior by default."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:548
 msgid ""
 "The process fails if an automatic patch has been generated. This option can "
 "be used to ensure that all changes were properly recorded in separate quilt "
@@ -11370,56 +11745,69 @@
 "B<debian/source/options> but can be used in B<debian/source/local-options>."
 msgstr ""
 
+#. type: TP
+#: dpkg-source.1:548
+#, fuzzy, no-wrap
+msgid "B<--auto-commit>"
+msgstr "B<--nocheck>"
+
+#. type: Plain text
+#: dpkg-source.1:552
+msgid ""
+"The process doesn't fail if an automatic patch has been generated, instead "
+"it's immediately recorded in the quilt series."
+msgstr ""
+
 #. type: Plain text
-#: dpkg-source.1:535
+#: dpkg-source.1:555
 msgid "B<Extract options>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 msgid "Skips extraction of the debian tarball on top of the upstream sources."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 #, fuzzy, no-wrap
 msgid "B<--skip-patches>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:561
 msgid "Do not apply patches at the end of the extraction."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:542
+#: dpkg-source.1:562
 #, no-wrap
 msgid "Format: 3.0 (custom)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:545
+#: dpkg-source.1:565
 msgid ""
-"This format is particular. It doesn't represent a real source package format "
+"This format is special. It doesn't represent a real source package format "
 "but can be used to create source packages with arbitrary files."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 msgid ""
 "All non-option arguments are taken as files to integrate in the generated "
-"source package. They must exist and are preferrably in the current "
-"directory. At least one file must be given."
+"source package. They must exist and are preferably in the current directory. "
+"At least one file must be given."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 #, fuzzy, no-wrap
 msgid "B<--target-format=>I<value>"
 msgstr "B<--showformat=>I<formátum>"
 
 #. type: Plain text
-#: dpkg-source.1:556
+#: dpkg-source.1:576
 msgid ""
 "B<Required>. Defines the real format of the generated source package.  The "
 "generated .dsc file will contain this value in its I<Format> field and not "
@@ -11427,18 +11815,18 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:557
+#: dpkg-source.1:577
 #, no-wrap
 msgid "Format: 3.0 (git)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:579
 msgid "This format is experimental."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:564
+#: dpkg-source.1:584
 msgid ""
 "A source package in this format consists of a single bundle of a git "
 "repository B<.git> to hold the source of a package.  There may also be a B<."
@@ -11446,7 +11834,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:570
+#: dpkg-source.1:590
 msgid ""
 "The bundle is cloned as a git repository to the target directory.  If there "
 "is a gitshallow file, it is installed as `.git/shallow` inside the cloned "
@@ -11454,36 +11842,36 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:575
+#: dpkg-source.1:595
 msgid ""
 "Note that by default the new repository will have the same branch checked "
 "out that was checked out in the original source. (Typically \"master\", but "
-"it could be anything.) Any other branches will be available, under as "
-"`remotes/origin/`"
+"it could be anything.) Any other branches will be available under `remotes/"
+"origin/`."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:580 dpkg-source.1:613
+#: dpkg-source.1:600 dpkg-source.1:633
 msgid ""
 "Before going any further, some checks are done to ensure that we don't have "
 "any non-ignored uncommitted changes."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:584
+#: dpkg-source.1:604
 msgid ""
 "B<git-bundle>(1) is used to generate a bundle of the git repository.  By "
 "default, all branches and tags in the repository are included in the bundle."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:586
+#: dpkg-source.1:606
 #, fuzzy, no-wrap
 msgid "B<--git-ref=>I<ref>"
 msgstr "B<--showformat=>I<formátum>"
 
 #. type: Plain text
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 msgid ""
 "Allows specifying a git ref to include in the git bundle. Use disables the "
 "default behavior of including all branches and tags. May be specified "
@@ -11495,39 +11883,39 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 #, fuzzy, no-wrap
 msgid "B<--git-depth=>I<number>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 msgid ""
 "Creates a shallow clone with a history truncated to the specified number of "
 "revisions."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 #, no-wrap
 msgid "Format: 3.0 (bzr)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:603
+#: dpkg-source.1:623
 msgid ""
 "This format is experimental. It generates a single tarball containing the "
 "bzr repository."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:608
+#: dpkg-source.1:628
 msgid ""
 "The tarball is unpacked and then bzr is used to checkout the current branch."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 msgid ""
 "Then the VCS specific part of the source directory is copied over to a "
 "temporary directory. Before this temporary directory is packed in a tarball, "
@@ -11535,19 +11923,19 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 #, no-wrap
 msgid "WARNINGS AND ERRORS"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:618
+#: dpkg-source.1:638
 #, no-wrap
 msgid "no source format specified in debian/source/format"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:624
+#: dpkg-source.1:644
 msgid ""
 "The file B<debian/source/format> should always exist and indicate the "
 "desired source format. For backwards compatibility, format \"1.0\" is "
@@ -11557,7 +11945,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 msgid ""
 "The rationale is that format \"1.0\" is no longer the recommended format, "
 "you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
@@ -11567,13 +11955,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 #, no-wrap
 msgid "the diff modifies the following upstream files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 msgid ""
 "When using source format \"1.0\" it is usually a bad idea to modify upstream "
 "files directly as the changes end up hidden and mostly undocumented in the ."
@@ -11583,13 +11971,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 #, no-wrap
 msgid "cannot represent change to I<file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 msgid ""
 "Changes to upstream sources are usually stored with patch files, but not all "
 "changes can be represented with patches: they can only alter the content of "
@@ -11599,51 +11987,51 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 #, no-wrap
 msgid "newly created empty file I<file> will not be represented in diff"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 msgid ""
 "Empty files can't be created with patch files. Thus this change is not "
 "recorded in the source package and you are warned about it."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 #, no-wrap
 msgid "executable mode I<perms> of I<file> will not be represented in diff"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:647
+#: dpkg-source.1:667
 #, no-wrap
 msgid "special mode I<perms> of I<file> will not be represented in diff"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 msgid ""
 "Patch files do not record permissions of files and thus modified permissions "
 "are not stored in the source package. This warning reminds you of that fact."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 #, no-wrap
 msgid "FILE FORMATS"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:652
+#: dpkg-source.1:672
 #, no-wrap
 msgid "debian/source/format"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 msgid ""
 "This file contains on a single line the format that should be used to build "
 "the source package (possible formats are described above). No leading or "
@@ -11651,13 +12039,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 #, fuzzy, no-wrap
 msgid "debian/source/include-binaries"
 msgstr "B<--licence>"
 
 #. type: Plain text
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 msgid ""
 "This file contains a list of binary files (one per line) that should be "
 "included in the debian tarball. Leading and trailing spaces are stripped.  "
@@ -11666,13 +12054,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 #, fuzzy, no-wrap
 msgid "debian/source/options"
 msgstr "B<--licence>"
 
 #. type: Plain text
-#: dpkg-source.1:666
+#: dpkg-source.1:686
 msgid ""
 "This file contains a list of long options that should be automatically "
 "prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -11681,7 +12069,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:672
+#: dpkg-source.1:692
 msgid ""
 "Each option should be put on a separate line. Empty lines and lines starting "
 "with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -11690,9 +12078,8 @@
 "a file:"
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:678
+#: dpkg-source.1:700
 #, no-wrap
 msgid ""
 "  # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -11700,23 +12087,25 @@
 "  compression-level = 9\n"
 "  # use debian/patches/debian-changes as automatic patch\n"
 "  single-debian-patch\n"
+"  # ignore changes on config.{sub,guess}\n"
+"  extend-diff-ignore = \"(^|/)(config.sub|config.guess)$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 msgid ""
 "Note: B<format> options are not accepted in this file, you should use "
 "B<debian/source/format> instead."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 #, fuzzy, no-wrap
 msgid "debian/source/local-options"
 msgstr "B<--licence>"
 
 #. type: Plain text
-#: dpkg-source.1:686
+#: dpkg-source.1:708
 msgid ""
 "Exactly like B<debian/source/options> except that the file is not included "
 "in the generated source package. It can be useful to store a preference tied "
@@ -11725,27 +12114,33 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:686
+#: dpkg-source.1:708
+#, fuzzy, no-wrap
+msgid "debian/source/local-patch-header"
+msgstr "B<--licence>"
+
+#. type: SS
+#: dpkg-source.1:709
 #, fuzzy, no-wrap
 msgid "debian/source/patch-header"
 msgstr "B<--licence>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 msgid ""
 "Free form text that is put on top of the automatic patch generated in "
-"formats \"2.0\" or \"3.0 (quilt)\"."
+"formats \"2.0\" or \"3.0 (quilt)\". B<local-patch-header> is not included in "
+"the generated source package while B<patch-header> is."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 #, no-wrap
 msgid "debian/patches/series"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:698
+#: dpkg-source.1:722
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
@@ -11758,23 +12153,22 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:705
+#: dpkg-source.1:729
 #, fuzzy
 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:736
+msgid "Copyright \\(co 2008-2011 Rapha\\[:e]l Hertzog"
+msgstr ""
+
 #. type: TH
 #: dpkg-split.1:2
 #, fuzzy, no-wrap
 msgid "dpkg-split"
 msgstr "dpkg készlet"
 
-#. type: TH
-#: dpkg-split.1:2 dpkg-statoverride.8:1
-#, fuzzy, no-wrap
-msgid "2009-06-26"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-split.1:5
 #, fuzzy
@@ -11782,13 +12176,13 @@
 msgstr "dpkg-deb - Debian csomag archívum (.deb) kezelő eszköz"
 
 #. type: Plain text
-#: dpkg-split.1:10
+#: dpkg-split.1:9
 #, fuzzy
-msgid "B<dpkg-split> [I<options>] I<command>"
+msgid "B<dpkg-split> [I<option>...] I<command>"
 msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
-#: dpkg-split.1:16
+#: dpkg-split.1:15
 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 "
@@ -11796,14 +12190,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:20
+#: dpkg-split.1:19
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:28
+#: dpkg-split.1:27
 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 "
@@ -11812,25 +12206,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:31
+#: dpkg-split.1:30
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:33
+#: dpkg-split.1:32
 #, fuzzy, no-wrap
 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:36
+#: dpkg-split.1:35
 msgid "Splits a single Debian binary package into several parts."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:44
+#: dpkg-split.1:43
 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 "
@@ -11838,27 +12232,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 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:52
+#: dpkg-split.1:51
 #, fuzzy, no-wrap
 msgid "B<-j>, B<--join> I<part>..."
 msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
-#: dpkg-split.1:56
+#: dpkg-split.1:55
 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:60
+#: dpkg-split.1:59
 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 "
@@ -11866,7 +12260,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:65
+#: dpkg-split.1:64
 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 "
@@ -11874,23 +12268,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:67
+#: dpkg-split.1:66
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:70
-msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
+#: dpkg-split.1:69
+msgid ""
+"By default the output file is called I<package>B<_>I<version>B<_>I<arch>B<."
+"deb>."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:71
+#: dpkg-split.1:70
 #, 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
+#: dpkg-split.1:75
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -11898,25 +12294,25 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 #, no-wrap
 msgid "B<-a>, B<--auto -o> I<complete-output part>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:79
+#: dpkg-split.1:78
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:84
+#: dpkg-split.1:83
 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:91
+#: dpkg-split.1:90
 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 "
@@ -11924,21 +12320,22 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:97
+#: dpkg-split.1:96
 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:104
+#: dpkg-split.1:103
 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."
+"with status B<1>; if some other trouble occurs then it will exit with status "
+"B<2>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 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 "
@@ -11946,18 +12343,18 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 #, fuzzy, no-wrap
 msgid "B<-l>, B<--listq>"
 msgstr "B<--licence>"
 
 #. type: Plain text
-#: dpkg-split.1:114
+#: dpkg-split.1:113
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 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 "
@@ -11965,77 +12362,77 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 #, fuzzy, no-wrap
 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:122
+#: dpkg-split.1:121
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:126
 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: TP
-#: dpkg-split.1:135
+#: dpkg-split.1:134
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 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:140
+#: dpkg-split.1:139
 #, fuzzy, no-wrap
 msgid "B<-S>, B<--partsize> I<kibibytes>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 msgid ""
 "Specifies the maximum part size when splitting, in kibibytes (1024 bytes). "
 "The default is 450 KiB."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 #, no-wrap
 msgid "B<-o>, B<--output> I<complete-output>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:147
+#: dpkg-split.1:146
 msgid "Specifies the output file name for a reassembly."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:152
+#: dpkg-split.1:151
 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:152
+#: dpkg-split.1:151
 #, fuzzy, no-wrap
 msgid "B<-Q>, B<--npquiet>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 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 "
@@ -12044,19 +12441,19 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 #, fuzzy, no-wrap
 msgid "B<--msdos>"
 msgstr "B<--old>"
 
 #. type: Plain text
-#: dpkg-split.1:168
+#: dpkg-split.1:167
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:174
+#: dpkg-split.1:173
 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 "
@@ -12064,7 +12461,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:179
+#: dpkg-split.1:178
 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."
@@ -12073,69 +12470,59 @@
 #. type: Plain text
 #: dpkg-split.1:186
 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."
+"The requested split, merge, or other command succeeded.  B<--info> commands "
+"count as successful even if the files are not binary package parts."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:192
+#: dpkg-split.1:193
 msgid ""
-"An exit status of 1 occurs only with B<--auto> and indicates that the "
-"I<part> file was not a binary package part."
+"Only occurs with B<--auto> and indicates that the I<part> file was not a "
+"binary package part."
 msgstr ""
 
-#. type: Plain text
-#: dpkg-split.1:196
-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."
+#. type: TP
+#: dpkg-split.1:193 start-stop-daemon.8:275 update-alternatives.8:378
+#, no-wrap
+msgid "B<2>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:201
+#: dpkg-split.1:198
 msgid ""
-"B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
-"of Debian packages."
+"Some kind of trouble happened, 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 ""
 
 #. type: Plain text
-#: dpkg-split.1:204
+#: dpkg-split.1:202
 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:207
+#: dpkg-split.1:205
 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:211
-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 ""
-
 #. type: TP
-#: dpkg-split.1:213
+#: dpkg-split.1:207
 #, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:211
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:222
+#: dpkg-split.1:216
 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 "
@@ -12143,7 +12530,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:222
 #, 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)."
@@ -12166,12 +12553,13 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:9
-msgid "B<dpkg-statoverride> [I<options>] I<command>"
-msgstr ""
+#: dpkg-statoverride.8:8
+#, fuzzy
+msgid "B<dpkg-statoverride> [I<option>...] I<command>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:19
+#: dpkg-statoverride.8:18
 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' "
@@ -12182,20 +12570,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:23
+#: dpkg-statoverride.8:22
 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:25
+#: dpkg-statoverride.8:24
 #, no-wrap
 msgid "B<--add>I< user group mode file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:33
+#: dpkg-statoverride.8:32
 msgid ""
 "Add an override for I<file>. I<file> does not need to exist when this "
 "command is used; the override will be stored and used later.  Users and "
@@ -12205,27 +12593,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:36
+#: dpkg-statoverride.8:35
 msgid ""
 "If --update is specified and I<file> exists, it is immediately set to the "
 "new owner and mode."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 msgid ""
 "Remove an override for I<file>, the status of I<file> is left unchanged by "
 "this command."
 msgstr ""
 
 #. type: TP
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 #, no-wrap
 msgid "B<--list> [I<glob-pattern>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:45
+#: 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 "
@@ -12233,50 +12621,50 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:56
 msgid ""
 "Change the I<directory> of the dpkg database where the statoverride file is "
 "also stored. Defaults to I</var/lib/dpkg>."
 msgstr ""
 
 #. type: TP
-#: dpkg-statoverride.8:57 update-alternatives.8:337
+#: dpkg-statoverride.8:56 update-alternatives.8:336
 #, fuzzy, no-wrap
 msgid "B<--force>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:61
+#: 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:61
+#: dpkg-statoverride.8:60
 #, fuzzy, no-wrap
 msgid "B<--update>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:65
+#: 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:68
+#: dpkg-statoverride.8:67
 msgid "Be less verbose about what we do."
 msgstr ""
 
 #. type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:75
 #, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:80
 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 "
@@ -12284,7 +12672,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:83
 msgid ""
 "Note: B<dpkg-statoverride> preserves the old copy of this file, with "
 "extension \"-old\", before replacing it with the new one."
@@ -12346,9 +12734,9 @@
 #: dpkg-trigger.1:31
 msgid ""
 "Check if the running B<dpkg> supports triggers (usually called from a "
-"postinst). Will exit 0 if a triggers-capable B<dpkg> has run, or 1 with an "
-"error message to stderr if not. Normally, however, it is better just to "
-"activate the desired trigger with B<dpkg-trigger>."
+"postinst). Will exit B<0> if a triggers-capable B<dpkg> has run, or B<1> "
+"with an error message to stderr if not. Normally, however, it is better just "
+"to activate the desired trigger with B<dpkg-trigger>."
 msgstr ""
 
 #. type: TP
@@ -12361,7 +12749,7 @@
 #: dpkg-trigger.1:49
 msgid ""
 "Override trigger awaiter (normally set by B<dpkg> through the "
-"DPKG_MAINTSCRIPT_PACKAGE environment variable of the maintainer scripts, "
+"B<DPKG_MAINTSCRIPT_PACKAGE> environment variable of the maintainer scripts, "
 "naming the package to which the script belongs, and this will be used by "
 "default)."
 msgstr ""
@@ -12393,7 +12781,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-trigger.1:68
+#: dpkg-trigger.1:69
 #, fuzzy
 msgid ""
 "B<dpkg>(1), B<deb-triggers>(5), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
@@ -12405,12 +12793,6 @@
 msgid "dpkg-vendor"
 msgstr "dpkg-deb"
 
-#. type: TH
-#: dpkg-vendor.1:1
-#, fuzzy, no-wrap
-msgid "2009-05-10"
-msgstr "2006-06-17"
-
 #. type: Plain text
 #: dpkg-vendor.1:4
 msgid "dpkg-vendor - queries information about distribution vendors"
@@ -12439,7 +12821,7 @@
 #. type: Plain text
 #: dpkg-vendor.1:19
 msgid ""
-"Exits with 0 if the current vendor is I<vendor>. Otherwise exits with non-"
+"Exits with B<0> if the current vendor is I<vendor>. Otherwise exits with non-"
 "zero."
 msgstr ""
 
@@ -12452,7 +12834,7 @@
 #. type: Plain text
 #: dpkg-vendor.1:24
 msgid ""
-"Exits with 0 if the current vendor distribution is a derivative of "
+"Exits with B<0> if the current vendor distribution is a derivative of "
 "I<vendor>, otherwise exits with non-zero. It uses the \"Parent\" field to "
 "browse all ancestors of the current vendor."
 msgstr ""
@@ -12480,7 +12862,7 @@
 #: dpkg-vendor.1:41
 msgid ""
 "Assumes the current vendor is I<vendor> instead of discovering it with the "
-"DEB_VENDOR environment variable or B</etc/dpkg/origins/default>."
+"B<DEB_VENDOR> environment variable or B</etc/dpkg/origins/default>."
 msgstr ""
 
 #. type: TP
@@ -12497,7 +12879,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-vendor.1:50 update-alternatives.8:497
+#: dpkg-vendor.1:50 update-alternatives.8:498
 msgid "Copyright \\(co 2009 Rapha\\[:e]l Hertzog"
 msgstr ""
 
@@ -12514,16 +12896,13 @@
 msgstr "deb-control - Debian csomag fő kontroll fájl formátum"
 
 #. type: Plain text
-#: dselect.1:16
-msgid ""
-"B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--version>] "
-"[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 ""
+#: dselect.1:8
+#, fuzzy
+msgid "B<dselect> [I<option>...] [I<action>]"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
-#: dselect.1:25
+#: dselect.1:17
 #, no-wrap
 msgid ""
 "B<dselect>\n"
@@ -12536,7 +12915,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:37
+#: dselect.1:29
 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 "
@@ -12550,33 +12929,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:43
+#: dselect.1:35
 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 "
+"argument, then that action is started immediately. Several command line "
 "parameters are still available to modify the running behaviour of B<dselect> "
 "or show additional information about the program."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:51
+#: dselect.1:43
 msgid ""
-"All options can be specified both on the commandline and in the B<dselect> "
+"All options can be specified both on the command line and in the B<dselect> "
 "configuration file I</etc/dpkg/dselect.cfg> or the files on the "
-"configuration directory I</etc/dpkg/dpkg.cfg.d/>. Each line in the "
-"configuration file is either an option (exactly the same as the commandline "
+"configuration directory I</etc/dpkg/dselect.cfg.d/>. 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
-#: 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
+#: dselect.1:49
 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 "
@@ -12584,36 +12957,37 @@
 msgstr ""
 
 #. type: TP
-#: dselect.1:57
-#, no-wrap
-msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
-msgstr ""
+#: dselect.1:49
+#, fuzzy, no-wrap
+#| msgid "B<--debug>, B<-D>"
+msgid "B<--debug>I< file >|I< >B<-D>I<file>"
+msgstr "B<--debug>, B<-D>"
 
 #. type: Plain text
-#: dselect.1:60
-msgid "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+#: dselect.1:52
+msgid "Turn on debugging. Debugging information is sent to I<file>."
 msgstr ""
 
 #. type: TP
-#: dselect.1:60
+#: dselect.1:52
 #, fuzzy, no-wrap
 msgid "B<--expert>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dselect.1:64
+#: dselect.1:56
 msgid ""
 "Turns on expert mode, i.e. doesn't display possibly annoying help messages."
 msgstr ""
 
 #. type: TP
-#: dselect.1:64
+#: dselect.1:56
 #, no-wrap
 msgid "B<--colour>|B<--color> I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:71
+#: dselect.1:63
 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>). "
@@ -12622,144 +12996,144 @@
 msgstr ""
 
 #. type: TP
-#: dselect.1:72
+#: dselect.1:64
 #, no-wrap
 msgid "B<title>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:75
+#: dselect.1:67
 msgid "The screen title."
 msgstr ""
 
 #. type: TP
-#: dselect.1:75
+#: dselect.1:67
 #, no-wrap
 msgid "B<listhead>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:78
+#: dselect.1:70
 msgid "The header line above the list of packages."
 msgstr ""
 
 #. type: TP
-#: dselect.1:78
+#: dselect.1:70
 #, no-wrap
 msgid "B<list>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:81
+#: dselect.1:73
 msgid "The scrolling list of packages (and also some help text)."
 msgstr ""
 
 #. type: TP
-#: dselect.1:81
+#: dselect.1:73
 #, no-wrap
 msgid "B<listsel>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:84
+#: dselect.1:76
 msgid "The selected item in the list."
 msgstr ""
 
 #. type: TP
-#: dselect.1:84
+#: dselect.1:76
 #, no-wrap
 msgid "B<pkgstate>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:88
+#: dselect.1:80
 msgid ""
 "In the list of packages, the text indicating the current state of each "
 "package."
 msgstr ""
 
 #. type: TP
-#: dselect.1:88
+#: dselect.1:80
 #, no-wrap
 msgid "B<pkgstatesel>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:92
+#: dselect.1:84
 msgid ""
 "In the list of packages, the text indicating the current state of the "
 "currently selected package."
 msgstr ""
 
 #. type: TP
-#: dselect.1:92
+#: dselect.1:84
 #, fuzzy, no-wrap
 msgid "B<infohead>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dselect.1:95
+#: dselect.1:87
 msgid ""
 "The header line that displays the state of the currently selected package."
 msgstr ""
 
 #. type: TP
-#: dselect.1:95
+#: dselect.1:87
 #, fuzzy, no-wrap
 msgid "B<infodesc>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dselect.1:98
+#: dselect.1:90
 msgid "The package's short description."
 msgstr ""
 
 #. type: TP
-#: dselect.1:98
+#: dselect.1:90
 #, fuzzy, no-wrap
 msgid "B<info>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: dselect.1:101
+#: dselect.1:93
 msgid "Used to display package info such as the package's description."
 msgstr ""
 
 #. type: TP
-#: dselect.1:101
+#: dselect.1:93
 #, no-wrap
 msgid "B<infofoot>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:104
+#: dselect.1:96
 msgid "The last line of the screen when selecting packages."
 msgstr ""
 
 #. type: TP
-#: dselect.1:104
+#: dselect.1:96
 #, no-wrap
 msgid "B<query>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:107
+#: dselect.1:99
 msgid "Used to display query lines"
 msgstr ""
 
 #. type: TP
-#: dselect.1:107
+#: dselect.1:99
 #, no-wrap
 msgid "B<helpscreen>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:110
+#: dselect.1:102
 msgid "Color of help screens."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:115
+#: dselect.1:107
 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, "
@@ -12767,7 +13141,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:121
+#: dselect.1:113
 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 "
@@ -12777,66 +13151,61 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:124
+#: dselect.1:116
 msgid "Print a brief help text and exit successfully."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:127
+#: dselect.1:119
 msgid "Print version information and exit successfully."
 msgstr ""
 
-#. type: SH
-#: dselect.1:128
-#, no-wrap
-msgid "USAGE"
-msgstr ""
-
 #. type: Plain text
-#: dselect.1:133
+#: dselect.1:126
 msgid ""
-"When B<dselect> is started interactively, it prompts the user with a menu of "
-"available actions:"
+"When B<dselect> is started it can perform the following actions, either "
+"directly if it was specified on the command line or by prompting the user "
+"with a menu of available actions if running interactively:"
 msgstr ""
 
 #. type: SS
-#: dselect.1:133
+#: dselect.1:126
 #, no-wrap
 msgid "access"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:135
+#: dselect.1:128
 msgid "Choose and configure an access method to access package repositories."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:141
+#: dselect.1:134
 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."
+"By default, B<dselect> provides several methods such as I<cdrom>, "
+"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount>, "
+"I<floppy> or I<ftp>, but other packages may provide additional methods, eg. "
+"the I<apt> access method provided by the B<apt> package."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:143
+#: dselect.1:136
 msgid "The use of the I<apt> access method is strongly recommended."
 msgstr ""
 
 #. type: SS
-#: dselect.1:144
+#: dselect.1:137
 #, no-wrap
 msgid "update"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:146
+#: dselect.1:139
 msgid "Refresh the available packages database."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:153
+#: dselect.1:146
 msgid ""
 "Retrieves a list of available package versions from the package repository, "
 "configured for the current access method, and update the dpkg database. The "
@@ -12846,25 +13215,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:156
+#: dselect.1:149
 msgid ""
 "Details of the update action depend on the access method's implementation.  "
 "Normally the process is straightforward and requires no user interaction."
 msgstr ""
 
 #. type: SS
-#: dselect.1:157
+#: dselect.1:150
 #, fuzzy, no-wrap
 msgid "select"
 msgstr "dselect.cfg"
 
 #. type: Plain text
-#: dselect.1:159
+#: dselect.1:152
 msgid "View or manage package selections and dependencies."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:165
+#: dselect.1:158
 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 "
@@ -12874,7 +13243,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:172
+#: dselect.1:165
 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 "
@@ -12885,25 +13254,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:175
+#: dselect.1:168
 msgid ""
 "The use of the interactive package selections management screen is explained "
 "in more detail below."
 msgstr ""
 
 #. type: SS
-#: dselect.1:176
+#: dselect.1:169
 #, no-wrap
 msgid "install"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:178
+#: dselect.1:171
 msgid "Installs selected packages."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:184
+#: dselect.1:177
 msgid ""
 "The configured access method will fetch installable or upgradable packages "
 "from the relevant repositories and install these using B<dpkg>.  Depending "
@@ -12913,7 +13282,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:192
+#: dselect.1:185
 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 "
@@ -12925,7 +13294,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:199
+#: dselect.1:192
 msgid ""
 "Details of the install action depend on the access method's implementation.  "
 "The user's attention and input may be required during installation, "
@@ -12935,58 +13304,58 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:200
+#: dselect.1:193
 #, no-wrap
 msgid "config"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:202
+#: dselect.1:195
 msgid "Configures any previously installed, but not fully configured packages."
 msgstr ""
 
 #. type: SS
-#: dselect.1:203
+#: dselect.1:196
 #, no-wrap
 msgid "remove"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:205
+#: dselect.1:198
 msgid "Removes or purges installed packages, that are marked for removal."
 msgstr ""
 
 #. type: SS
-#: dselect.1:206
+#: dselect.1:199
 #, no-wrap
 msgid "quit"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:208
+#: dselect.1:201
 #, fuzzy
 msgid "Quit B<dselect>"
 msgstr "B<dselect>(1)."
 
 #. type: Plain text
-#: dselect.1:210
+#: dselect.1:203
 msgid "Exits the program with zero (successful) errorcode."
 msgstr ""
 
 #. type: SH
-#: dselect.1:212
+#: dselect.1:205
 #, no-wrap
 msgid "Package selections management"
 msgstr ""
 
 #. type: SS
-#: dselect.1:214
+#: dselect.1:207
 #, no-wrap
 msgid "Introduction"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:230
+#: dselect.1:223
 msgid ""
 "B<dselect> directly exposes the administrator to some of the complexities "
 "involved with managing large sets of packages with many interdependencies. "
@@ -13001,7 +13370,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:236
+#: dselect.1:229
 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> "
@@ -13011,13 +13380,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:237
+#: dselect.1:230
 #, no-wrap
 msgid "Screen layout"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:245
+#: dselect.1:238
 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 "
@@ -13028,20 +13397,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:248
+#: dselect.1:241
 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 ""
 
 #. type: SS
-#: dselect.1:249
+#: dselect.1:242
 #, no-wrap
 msgid "Package details view"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:258
+#: dselect.1:251
 #, no-wrap
 msgid ""
 "The package details view by default shows the extended package description\n"
@@ -13054,7 +13423,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:262
+#: dselect.1:255
 msgid ""
 "In a dependency resolution screen, there is also the possibility of viewing "
 "the specific unresolved depends or conflicts related to the package and "
@@ -13062,13 +13431,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:263
+#: dselect.1:256
 #, no-wrap
 msgid "Packages status list"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:268
+#: dselect.1:261
 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 "
@@ -13076,7 +13445,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:276
+#: dselect.1:269
 msgid ""
 "For every package, the list shows the package's status, priority, section, "
 "installed and available versions, the package name and its short "
@@ -13087,7 +13456,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:282
+#: dselect.1:275
 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 "
@@ -13096,7 +13465,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:300
+#: dselect.1:293
 #, no-wrap
 msgid ""
 "These are the meanings of the shorthand package status indicator codes:\n"
@@ -13119,20 +13488,20 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:301
+#: dselect.1:294
 #, no-wrap
 msgid "Cursor and screen movement"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:306
+#: dselect.1:299
 msgid ""
 "The package selection list and the dependency conflict resolution screens "
 "can be navigated using motion commands mapped to the following keys:"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:323
+#: dselect.1:316
 #, no-wrap
 msgid ""
 "  B<p, Up, k>           move cursor bar up\n"
@@ -13154,13 +13523,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:324
+#: dselect.1:317
 #, no-wrap
 msgid "Searching and sorting"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:338
+#: dselect.1:331
 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 "
@@ -13174,7 +13543,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:345
+#: dselect.1:338
 #, no-wrap
 msgid ""
 "The list sort order can be varied by pressing\n"
@@ -13186,20 +13555,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:348
+#: dselect.1:341
 msgid ""
 "Where not listed above explicitly, alphabetic order is used as the final "
 "subordering sort key."
 msgstr ""
 
 #. type: SS
-#: dselect.1:349
+#: dselect.1:342
 #, no-wrap
 msgid "Altering selections"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:358
+#: dselect.1:351
 #, no-wrap
 msgid ""
 "The requested selection state of individual packages may be\n"
@@ -13212,7 +13581,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:362
+#: dselect.1:355
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -13220,7 +13589,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:367
+#: dselect.1:360
 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 "
@@ -13228,7 +13597,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:373
+#: dselect.1:366
 msgid ""
 "Proper care should be taken when altering large groups of selections, "
 "because this can instantaneously create large numbers of unresolved depends "
@@ -13238,13 +13607,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:374
+#: dselect.1:367
 #, no-wrap
 msgid "Resolving depends and conflicts"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:379
+#: dselect.1:372
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -13252,7 +13621,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:386
+#: dselect.1:379
 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 "
@@ -13263,7 +13632,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:392
+#: dselect.1:385
 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, "
@@ -13273,7 +13642,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:400
+#: dselect.1:393
 msgid ""
 "The listed packages' selection state may be reverted to the original "
 "settings, as they were before the unresolved depends or conflicts were "
@@ -13284,13 +13653,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:401
+#: dselect.1:394
 #, no-wrap
 msgid "Establishing the requested selections"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:408
+#: dselect.1:401
 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 "
@@ -13300,7 +13669,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:414
+#: dselect.1:407
 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 "
@@ -13309,7 +13678,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:421
+#: dselect.1:414
 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 "
@@ -13319,7 +13688,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:428
+#: dselect.1:421
 msgid ""
 "If you mistakenly establish some settings and wish to revert all the "
 "selections to what is currently installed on the system, press the B<'C'> "
@@ -13329,36 +13698,36 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:435
+#: dselect.1:428
 msgid ""
 "If set, B<dselect> will use it as the directory from which to read the user "
 "specific configuration file."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:441
+#: dselect.1:434
 msgid ""
 "The B<dselect> package selection interface is confusing to some new users.  "
 "Reportedly, it even makes seasoned kernel developers cry."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:443
+#: dselect.1:436
 msgid "The documentation is lacking."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:445
+#: dselect.1:438
 msgid "There is no help option in the main menu."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:447
+#: dselect.1:440
 msgid "The visible list of available packages cannot be reduced."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:451
+#: dselect.1:444
 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, "
@@ -13366,19 +13735,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:457
+#: dselect.1:450
 msgid "B<dpkg>(1), B<apt-get>(8), B<sources.list>(5), B<deb>(5)."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:462
+#: dselect.1:455
 msgid ""
 "B<dselect> was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list "
 "of contributors may be found in 'dselect --version'."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:465
+#: dselect.1:458
 msgid ""
 "This manual page was written by Juho Vuori E<lt>javuori@cc.helsinki.fiE<gt>, "
 "Josip Rodin and Joost kooij."
@@ -13390,6 +13759,12 @@
 msgid "dselect.cfg"
 msgstr "dselect.cfg"
 
+#. type: TH
+#: dselect.cfg.5:1
+#, fuzzy, no-wrap
+msgid "2011-07-03"
+msgstr "2006-02-28"
+
 #. type: Plain text
 #: dselect.cfg.5:4
 msgid "dselect.cfg - dselect configuration file"
@@ -13405,7 +13780,7 @@
 #| "Comments are allowed by starting a line with a hash sign (\"B<#>\")."
 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 "
+"option which is exactly the same as a normal command line option for dselect "
 "except for the leading dashes which are not used here. Quotes surrounding "
 "option values are stripped. Comments are allowed by starting a line with a "
 "hash sign (\"B<#>\")."
@@ -13458,12 +13833,13 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:9
-msgid "B<start-stop-daemon> [I<options>] I<command>"
-msgstr ""
+#: start-stop-daemon.8:8
+#, fuzzy
+msgid "B<start-stop-daemon> [I<option>...] I<command>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
-#: start-stop-daemon.8:15
+#: start-stop-daemon.8:14
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
 "system-level processes.  Using one of the matching options, B<start-stop-"
@@ -13471,7 +13847,7 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:34
+#: start-stop-daemon.8:33
 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 "
@@ -13484,13 +13860,13 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:36
+#: start-stop-daemon.8:35
 #, fuzzy, no-wrap
 msgid "B<-S>, B<--start> [B<-->] I<arguments>"
 msgstr "B<--show>, B<-W>"
 
 #. type: Plain text
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 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<--"
@@ -13501,13 +13877,13 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 #, fuzzy, no-wrap
 msgid "B<-K>, B<--stop>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
 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 "
@@ -13518,115 +13894,128 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
+#, fuzzy, no-wrap
+msgid "B<-T>, B<--status>"
+msgstr "B<--info>, B<-I>"
+
+#. type: Plain text
+#: start-stop-daemon.8:74
+msgid ""
+"Check for the existence of a specified process, and returns an exit status "
+"code, according to the LSB Init Script Actions."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:74
 #, fuzzy, no-wrap
 msgid "B<-H>, B<--help>"
 msgstr "B<--help>, B<-h>"
 
 #. type: Plain text
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 msgid "Show usage information and exit."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 #, fuzzy, no-wrap
 msgid "B<-V>, B<--version>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: start-stop-daemon.8:77
+#: start-stop-daemon.8:80
 #, fuzzy
 msgid "Show the program version and exit."
 msgstr "Kiírja a B<dpkg-deb> verziószámát."
 
 #. type: SH
-#: start-stop-daemon.8:78
+#: start-stop-daemon.8:81
 #, fuzzy, no-wrap
 msgid "MATCHING OPTIONS"
 msgstr "MŰVELETI LEHETŐSÉGEK"
 
 #. type: TP
-#: start-stop-daemon.8:79
+#: start-stop-daemon.8:82
 #, no-wrap
 msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:83
+#: start-stop-daemon.8:86
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:83
+#: start-stop-daemon.8:86
 #, no-wrap
 msgid "B<-x>, B<--exec> I<executable>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 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:87
+#: start-stop-daemon.8:90
 #, no-wrap
 msgid "B<-n>, B<--name> I<process-name>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:93
+#: start-stop-daemon.8:96
 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:93
+#: start-stop-daemon.8:96
 #, no-wrap
 msgid "B<-u>, B<--user> I<username>|I<uid>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:99
+#: start-stop-daemon.8:102
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:101
+#: start-stop-daemon.8:104
 #, no-wrap
 msgid "B<-g>, B<--group> I<group>|I<gid>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:107
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:107
 #, fuzzy, no-wrap
 msgid "B<-s>, B<--signal> I<signal>"
 msgstr "B<--show>, B<-W>"
 
 #. type: Plain text
-#: start-stop-daemon.8:109
+#: start-stop-daemon.8:112
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default TERM)."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:109
+#: start-stop-daemon.8:112
 #, no-wrap
 msgid "B<-R>, B<--retry> I<timeout>|I<schedule>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:119
+#: start-stop-daemon.8:122
 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 "
@@ -13635,7 +14024,7 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:130
+#: start-stop-daemon.8:133
 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 "
@@ -13643,7 +14032,7 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:146
+#: start-stop-daemon.8:149
 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 "
@@ -13653,7 +14042,7 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 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, "
@@ -13661,61 +14050,61 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 #, 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:164
+#: start-stop-daemon.8:167
 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:164
+#: start-stop-daemon.8:167
 #, fuzzy, no-wrap
 msgid "B<-t>, B<--test>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 #, fuzzy, no-wrap
 msgid "B<-o>, B<--oknodo>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 #, fuzzy, no-wrap
 msgid "B<-q>, B<--quiet>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: start-stop-daemon.8:174
+#: start-stop-daemon.8:177
 msgid "Do not print informational messages; only display error messages."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:174
+#: start-stop-daemon.8:177
 #, fuzzy, no-wrap
-msgid "B<-c>, B<--chuid> I<username>|I<uid>"
+msgid "B<-c>, B<--chuid> I<username>|I<uid>[B<:>I<group>|I<gid>]"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 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 "
@@ -13728,26 +14117,26 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 #, fuzzy, no-wrap
 msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 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:198
+#: start-stop-daemon.8:201
 #, fuzzy, no-wrap
 msgid "B<-d>, B<--chdir> I<path>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 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-"
@@ -13755,13 +14144,13 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 #, fuzzy, no-wrap
 msgid "B<-b>, B<--background>"
 msgstr "B<--build>, B<-b>"
 
 #. type: Plain text
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 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 "
@@ -13773,24 +14162,24 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 #, no-wrap
 msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 msgid "This alters the priority of the process before starting it."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 #, no-wrap
 msgid "B<-P>, B<--procsched> I<policy>B<:>I<priority>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 msgid ""
 "This alters the process scheduler policy and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -13799,13 +14188,13 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 #, fuzzy, no-wrap
 msgid "B<-I>, B<--iosched> I<class>B<:>I<priority>"
 msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 
 #. type: Plain text
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 msgid ""
 "This alters the IO scheduler class and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -13815,24 +14204,24 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 #, fuzzy, no-wrap
 msgid "B<-k>, B<--umask> I<mask>"
 msgstr "B<--show>, B<-W>"
 
 #. type: Plain text
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 msgid "This sets the umask of the process before starting it."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 #, fuzzy, no-wrap
 msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<--help>, B<-h>"
 
 #. type: Plain text
-#: start-stop-daemon.8:252
+#: start-stop-daemon.8:255
 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<--"
@@ -13843,73 +14232,119 @@
 "useful when combined with the B<--background> option."
 msgstr ""
 
+#. type: Plain text
+#: start-stop-daemon.8:258
+msgid "Print verbose informational messages."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:270
+msgid ""
+"The requested action was performed. If B<--oknodo> was specified, it's also "
+"possible that nothing had to be done.  This can happen when B<--start> was "
+"specified and a matching process was already running, or when B<--stop> was "
+"specified and there were no matching processes."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:275
+msgid "If B<--oknodo> was not specified and nothing was done."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:283
+msgid ""
+"If B<--stop> and B<--retry> were specified, but the end of the schedule was "
+"reached and the processes were still running."
+msgstr ""
+
 #. type: TP
-#: start-stop-daemon.8:252
-#, fuzzy, no-wrap
-msgid "B<-v>, B<--verbose>"
-msgstr "B<--version>"
+#: start-stop-daemon.8:283 start-stop-daemon.8:295
+#, no-wrap
+msgid "B<3>"
+msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:255
-msgid "Print verbose informational messages."
+#: start-stop-daemon.8:286
+msgid "Any other error."
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:272
+#: start-stop-daemon.8:289
 msgid ""
-"B<start-stop-daemon> returns 0 if the requested action was performed, or if "
-"B<--oknodo> is specified and either B<--start> was specified and a matching "
-"process was already running, or B<--stop> was specified and there were no "
-"matching processes. If B<--oknodo> was not specified and nothing was done, 1 "
-"is returned. If B<--stop> and B<--retry> were specified, but the end of the "
-"schedule was reached and the processes were still running, the error value "
-"is 2. For all other errors, the status is 3."
+"When using the B<--status> command, the following status codes are returned:"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:292
+msgid "Program is running."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:295
+msgid "Program is not running and the pid file exists."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:298
+msgid "Program is not running."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:298
+#, no-wrap
+msgid "B<4>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:301
+msgid "Unable to determine program status."
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:276
+#: start-stop-daemon.8:305
 msgid ""
 "Start the B<food> daemon, unless one is already running (a process named "
 "food, running as user food, with pid in food.pid):"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:279
+#: start-stop-daemon.8:308
 #, no-wrap
 msgid "start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon\n"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:282
+#: start-stop-daemon.8:311
 msgid "Send B<SIGTERM> to B<food> and wait up to 5 seconds for it to stop:"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:285
+#: start-stop-daemon.8:314
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5\n"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:288
+#: start-stop-daemon.8:317
 msgid "Demonstration of a custom schedule for stopping B<food>:"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:291
+#: start-stop-daemon.8:320
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5\n"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:297
+#: start-stop-daemon.8:326
 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:299
+#: start-stop-daemon.8:328
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -13928,19 +14363,20 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:16
-msgid "B<update-alternatives> [I<options>] I<command>"
-msgstr ""
+#: update-alternatives.8:15
+#, fuzzy
+msgid "B<update-alternatives> [I<option>...] I<command>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
-#: update-alternatives.8:21
+#: update-alternatives.8:20
 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:29
+#: update-alternatives.8:28
 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 "
@@ -13951,7 +14387,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:51
+#: update-alternatives.8:50
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -13966,7 +14402,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:61
+#: update-alternatives.8:60
 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> "
@@ -13977,7 +14413,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:73
+#: update-alternatives.8:72
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -13987,7 +14423,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:92
+#: update-alternatives.8:91
 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>"
@@ -13999,7 +14435,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:101
+#: 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 "
@@ -14010,7 +14446,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:110
+#: 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 "
@@ -14020,7 +14456,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:117
+#: 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 "
@@ -14028,26 +14464,26 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:134
+#: update-alternatives.8:133
 msgid ""
-"When using the I<--config> option, B<update-alternatives> will list all of "
+"When using the B<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master "
 "alternative name. The current choice is marked with a '*'.  You will then be "
 "prompted for your choice regarding this link group.  Depending on the choice "
 "made, the link group might no longer be in I<auto> mode. You will need to "
-"use the I<--auto> option in order to return to the automatic mode (or you "
-"can rerun I<--config> and select the entry marked as automatic)."
+"use the B<--auto> option in order to return to the automatic mode (or you "
+"can rerun B<--config> and select the entry marked as automatic)."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:138
+#: update-alternatives.8:137
 msgid ""
-"If you want to configure non-interactively you can use the I<--set> option "
+"If you want to configure non-interactively you can use the B<--set> option "
 "instead (see below)."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:149
+#: update-alternatives.8:148
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "In other words, the usage of B<update-alternatives> is B<mandatory> for all "
@@ -14056,124 +14492,124 @@
 msgstr ""
 
 #. type: SH
-#: update-alternatives.8:150
+#: update-alternatives.8:149
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 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:155
+#: update-alternatives.8:154
 #, no-wrap
 msgid "generic name (or alternative link)"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 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:161
+#: update-alternatives.8:160
 #, no-wrap
 msgid "alternative name"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 msgid "The name of a symbolic link in the alternatives directory."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 #, no-wrap
 msgid "alternative (or alternative path)"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 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:168
+#: update-alternatives.8:167
 #, no-wrap
 msgid "alternatives directory"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 #, no-wrap
 msgid "administrative directory"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
 "alternatives>' state information."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 #, no-wrap
 msgid "link group"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 #, no-wrap
 msgid "master link"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 msgid ""
 "The alternative link in a link group which determines how the other links in "
 "the group are configured."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 #, no-wrap
 msgid "slave link"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 msgid ""
 "An alternative link in a link group which is controlled by the setting of "
 "the master link."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 #, no-wrap
 msgid "automatic mode"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 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 "
@@ -14181,26 +14617,26 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 #, no-wrap
 msgid "manual mode"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:201
 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: TP
-#: update-alternatives.8:204
+#: update-alternatives.8:203
 #, no-wrap
 msgid "B<--install> I<link name path priority> [B<--slave> I<link name path>]..."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:222
 msgid ""
 "Add a group of alternatives to the system.  I<link> is the generic name for "
 "the master link, I<name> is the name of its symlink in the alternatives "
@@ -14216,7 +14652,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 msgid ""
 "If the alternative name specified exists already in the alternatives "
 "system's records, the information supplied will be added as a new set of "
@@ -14228,26 +14664,26 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
-"I<--config> but is non-interactive and thus scriptable."
+"B<--config> but is non-interactive and thus scriptable."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 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 "
@@ -14260,20 +14696,20 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:269
+#: update-alternatives.8:268
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 msgid ""
 "Call B<--config> on all alternatives. It can be usefully combined with B<--"
 "skip-auto> to review and configure all alternatives which are not configured "
@@ -14283,13 +14719,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 #, fuzzy, no-wrap
 msgid "B<--auto> I<name>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 msgid ""
 "Switch the link group behind the alternative for I<name> to automatic mode.  "
 "In the process, the master symlink and its slaves are updated to point to "
@@ -14297,13 +14733,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 #, fuzzy, no-wrap
 msgid "B<--display> I<name>"
 msgstr "B<--licence>"
 
 #. type: Plain text
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 msgid ""
 "Display information about the link group.  Information displayed includes "
 "the group's mode (auto or manual), which alternative the master link "
@@ -14313,13 +14749,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 #, fuzzy, no-wrap
 msgid "B<--get-selections>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: update-alternatives.8:300
+#: update-alternatives.8:299
 msgid ""
 "List all master alternative names (those controlling a link group)  and "
 "their status. Each line contains up to 3 fields (separated by one or more "
@@ -14330,146 +14766,146 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 msgid ""
 "Read configuration of alternatives on standard input in the format generated "
 "by B<update-alternatives --get-selections> and reconfigure them accordingly."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 #, fuzzy, no-wrap
 msgid "B<--query> I<name>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 msgid ""
 "Display information about the link group like --display does, but in a "
 "machine parseable way (see section B<QUERY FORMAT> below)."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 #, fuzzy, no-wrap
 msgid "B<--list> I<name>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 msgid "Display all targets of the link group."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 #, fuzzy, no-wrap
 msgid "B<--config> I<name>"
 msgstr "B<--licence>"
 
 #. type: Plain text
-#: update-alternatives.8:317
+#: update-alternatives.8:316
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:325
+#: update-alternatives.8:324
 #, fuzzy, no-wrap
 msgid "B<--altdir>I< directory>"
 msgstr "B<Section:> E<lt>szakaszE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:329
+#: update-alternatives.8:328
 msgid ""
 "Specifies the alternatives directory, when this is to be different from the "
 "default."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 msgid ""
 "Specifies the administrative directory, when this is to be different from "
 "the default."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 #, fuzzy, no-wrap
 msgid "B<--log>I< file>"
 msgstr "B<--licence>"
 
 #. type: Plain text
-#: update-alternatives.8:337
+#: update-alternatives.8:336
 msgid ""
 "Specifies the log file, when this is to be different from the default (/var/"
 "log/alternatives.log)."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 msgid ""
-"Let B<update-alternatives> replace any real file that is installed where an "
-"alternative link has to be installed."
+"Let B<update-alternatives> replace or drop any real file that is installed "
+"where an alternative link has to be installed or removed."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 #, fuzzy, no-wrap
 msgid "B<--skip-auto>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 msgid ""
 "Skip configuration prompt for alternatives which are properly configured in "
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 #, fuzzy, no-wrap
 msgid "B<--verbose>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: update-alternatives.8:351
+#: update-alternatives.8:350
 msgid "Generate more comments about what B<update-alternatives> is doing."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:354
+#: update-alternatives.8:353
 msgid "Don't generate any comments unless errors occur."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:360
+#: update-alternatives.8:359
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the base administrative directory."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:362
+#: update-alternatives.8:361
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 #, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:374
+#: update-alternatives.8:373
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
@@ -14480,118 +14916,112 @@
 msgid "The requested action was successfully performed."
 msgstr ""
 
-#. type: IP
-#: update-alternatives.8:378
-#, no-wrap
-msgid "2"
-msgstr ""
-
 #. type: Plain text
-#: update-alternatives.8:381
+#: update-alternatives.8:382
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
 msgstr ""
 
 #. type: SH
-#: update-alternatives.8:382
+#: update-alternatives.8:383
 #, no-wrap
 msgid "QUERY FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:387
+#: update-alternatives.8:388
 msgid ""
-"The B<update-alternatives> I<--query> format is using an RFC822-like flat "
+"The B<update-alternatives --query> format is using an RFC822-like flat "
 "format. It's made of I<n> + 1 blocks where I<n> is the number of "
 "alternatives available in the queried link group. The first block contains "
 "the following fields:"
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:387
+#: update-alternatives.8:388
 #, fuzzy, no-wrap
-msgid "B<Link:> E<lt>linkE<gt>"
+msgid "B<Link:>I< link>"
 msgstr "B<Source:> E<lt>forrás névE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 msgid "The generic name of the alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 #, fuzzy, no-wrap
-msgid "B<Status:> E<lt>statusE<gt>"
+msgid "B<Status:>I< status>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 #, fuzzy, no-wrap
-msgid "B<Best:> E<lt>best choiceE<gt>"
+msgid "B<Best:>I< best-choice>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 #, fuzzy, no-wrap
-msgid "B<Value:> E<lt>currently selected alternativeE<gt> "
+msgid "B<Value:>I< currently-selected-alternative>"
 msgstr "B<Source:> E<lt>forrás névE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:401
+#: update-alternatives.8:402
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:402
+#: update-alternatives.8:403
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:404
+#: update-alternatives.8:405
 #, no-wrap
-msgid "B<Alternative:> E<lt>path of this alternativeE<gt>"
+msgid "B<Alternative:>I< path-of-this-alternative>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 msgid "Path to this block's alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 #, fuzzy, no-wrap
-msgid "B<Priority:> E<lt>priority valueE<gt>"
+msgid "B<Priority:>I< priority-value>"
 msgstr "B<Priority:> E<lt>elsőbbségE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 msgid "Value of the priority of this alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 #, fuzzy, no-wrap
-msgid "B<Slaves:> E<lt>list of slavesE<gt>"
+msgid "B<Slaves:>I< list-of-slaves>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:416
+#: update-alternatives.8:417
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -14600,13 +15030,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:417
+#: update-alternatives.8:418
 #, no-wrap
 msgid "B<Example>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:426
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
@@ -14617,7 +15047,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:430
+#: update-alternatives.8:431
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -14627,7 +15057,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:446
 #, no-wrap
 msgid ""
 "Alternative: /usr/bin/vim.gtk\n"
@@ -14647,9 +15077,9 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:457
+#: update-alternatives.8:458
 msgid ""
-"With I<--verbose> B<update-alternatives> chatters incessantly about its "
+"With B<--verbose> 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; "
@@ -14657,7 +15087,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:464
 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 "
@@ -14666,49 +15096,49 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:466
+#: update-alternatives.8:467
 msgid ""
 "To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
+"setting for it, use the B<--display> action:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:469
+#: update-alternatives.8:470
 msgid "B<update-alternatives --display vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:473
+#: update-alternatives.8:474
 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:476
+#: update-alternatives.8:477
 msgid "B<update-alternatives --config vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:480
+#: update-alternatives.8:481
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:483
+#: update-alternatives.8:484
 msgid "B<update-alternatives --auto vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:488
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:492
+#: update-alternatives.8:493
 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 "
@@ -14716,13 +15146,13 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:503
+#: update-alternatives.8:504
 msgid ""
 "This manual page is copyright 1997,1998 Charles Briscoe-Smith and others."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:506
+#: update-alternatives.8:507
 #, fuzzy
 msgid ""
 "This is free documentation; see the GNU General Public Licence version 2 or "
@@ -14734,11 +15164,127 @@
 "licenses/GPL> fájlt a részletekért."
 
 #. type: Plain text
-#: update-alternatives.8:509
+#: update-alternatives.8:510
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 
 #, fuzzy
+#~ msgid "2009-02-27"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2011-04-29"
+#~ msgstr "2006-02-28"
+
+#~ msgid "2006-02-28"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2007-03-07"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2007-07-16"
+#~ msgstr "2006-06-17"
+
+#, fuzzy
+#~ msgid "2009-03-15"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2011-04-27"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2011-07-07"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-04-18"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| msgid "dselect.cfg - dselect configuration file"
+#~ msgid "Package maintainer configuration file."
+#~ msgstr "dselect.cfg - dselect konfigurációs fájl"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-07-29"
+#~ msgstr "2006-02-28"
+
+#~ msgid "B<Package:> E<lt>package nameE<gt>"
+#~ msgstr "B<Package:> E<lt>csomag névE<gt>"
+
+#, fuzzy
+#~ msgid "2010-11-22"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| msgid "B<Source:> E<lt>source nameE<gt>"
+#~ msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
+#~ msgstr "B<Source:> E<lt>forrás névE<gt>"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-01-28"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2008-08-18"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "B<--new>, B<--old>"
+#~ msgstr "B<--info>, B<-I>"
+
+#, fuzzy
+#~ msgid "2009-08-15"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-11-21"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2010-03-07"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-10-12"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-08-07"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2010-04-16"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-05-19"
+#~ msgstr "2006-06-17"
+
+#, fuzzy
+#~ msgid "2009-10-01"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-06-26"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-05-10"
+#~ msgstr "2006-06-17"
+
+#, fuzzy
+#~ msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+#~ msgstr "B<Section:> E<lt>szakaszE<gt>"
+
+#, fuzzy
 #~ msgid "2009-03-08"
 #~ msgstr "2006-02-28"
 
@@ -14823,14 +15369,6 @@
 #~ msgstr "2006-02-28"
 
 #, fuzzy
-#~ msgid "B<-Z>I<compression>"
-#~ msgstr "B<--version>"
-
-#, fuzzy
-#~ msgid "B<-z>I<level>"
-#~ msgstr "B<--field>, B<-f>"
-
-#, fuzzy
 #~ msgid "2009-01-04"
 #~ msgstr "2006-02-28"
 
@@ -15062,9 +15600,6 @@
 #~ msgid "OTHER OPTIONS"
 #~ msgstr "MÁS LEHETŐSÉGEK"
 
-#~ msgid "B<--debug>, B<-D>"
-#~ msgstr "B<--debug>, B<-D>"
-
 #, fuzzy
 #~ msgid "B<-h, --help>"
 #~ msgstr "B<--help>, B<-h>"
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/ja.po /home/vorlon/devel/multiarch/dpkg-debian/man/po/ja.po
--- dpkg/man/po/ja.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/ja.po	2012-06-07 10:11:09.426073000 -0700
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2011-04-01 22:07+0300\n"
+"POT-Creation-Date: 2011-11-25 11:22+0100\n"
 "PO-Revision-Date: 2010-03-07 22:17+0100\n"
 "Last-Translator: KISE Hiroshi <kise@fuyuneko.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -22,10 +22,17 @@
 msgstr "deb"
 
 #. type: TH
-#: deb.5:1
+#: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-version.5:5 deb-old.5:1
+#: deb-override.5:15 deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg-buildpackage.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-trigger.1:1
+#: dselect.1:1 update-alternatives.8:8
 #, fuzzy, no-wrap
-msgid "2009-02-27"
-msgstr "2006-02-28"
+msgid "2011-08-14"
+msgstr "2006-04-09"
 
 #. type: TH
 #: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-split.5:1 deb-version.5:5
@@ -100,15 +107,15 @@
 #: deb.5:6 deb-control.5:10 deb-src-control.5:10 deb-split.5:6
 #: deb-version.5:11 deb-old.5:8 deb-override.5:22 deb-extra-override.5:8
 #: deb-shlibs.5:20 deb-substvars.5:9 deb-symbols.5:9 deb-triggers.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildflags.1:9
+#: dpkg.1:19 dpkg-architecture.1:10 dpkg.cfg.5:5 dpkg-buildflags.1:9
 #: 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-deb.1:9 dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
 #: dpkg-gensymbols.1:10 dpkg-maintscript-helper.1:15 dpkg-mergechangelogs.1:9
 #: dpkg-name.1:16 dpkg-parsechangelog.1:9 dpkg-query.1:9
-#: dpkg-scanpackages.1:28 dpkg-scansources.1:14 dpkg-shlibdeps.1:11
-#: dpkg-source.1:11 dpkg-split.1:11 dpkg-statoverride.8:10 dpkg-trigger.1:12
-#: dpkg-vendor.1:9 dselect.1:17 dselect.cfg.5:5 start-stop-daemon.8:10
-#: update-alternatives.8:17
+#: dpkg-scanpackages.1:27 dpkg-scansources.1:13 dpkg-shlibdeps.1:9
+#: dpkg-source.1:10 dpkg-split.1:10 dpkg-statoverride.8:9 dpkg-trigger.1:12
+#: dpkg-vendor.1:9 dselect.1:9 dselect.cfg.5:5 start-stop-daemon.8:9
+#: update-alternatives.8:16
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "説明"
@@ -247,15 +254,15 @@
 "は(こちらの可能性が高いが)メジャーバージョン番号を上げることになるであろう。"
 
 #. type: SH
-#: deb.5:79 deb-control.5:269 deb-src-control.5:322 deb-split.5:37
+#: deb.5:79 deb-control.5:271 deb-src-control.5:327 deb-split.5:49
 #: deb-version.5:116 deb-old.5:51 deb-override.5:62 deb-extra-override.5:37
-#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:49
-#: dpkg.1:782 dpkg-architecture.1:300 dpkg.cfg.5:23 dpkg-buildpackage.1:249
-#: dpkg-deb.1:246 dpkg-divert.8:132 dpkg-gensymbols.1:445 dpkg-name.1:95
-#: dpkg-query.1:212 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:701 dpkg-split.1:223
-#: dpkg-statoverride.8:85 dpkg-trigger.1:66 dselect.1:452 dselect.cfg.5:23
-#: update-alternatives.8:507
+#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:67
+#: dpkg.1:768 dpkg-architecture.1:299 dpkg.cfg.5:23 dpkg-buildpackage.1:249
+#: dpkg-deb.1:259 dpkg-divert.8:132 dpkg-gensymbols.1:450 dpkg-name.1:96
+#: dpkg-query.1:220 dpkg-scanpackages.1:110 dpkg-scansources.1:71
+#: dpkg-shlibdeps.1:324 dpkg-source.1:725 dpkg-split.1:217
+#: dpkg-statoverride.8:84 dpkg-trigger.1:66 dselect.1:445 dselect.cfg.5:23
+#: update-alternatives.8:508
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
@@ -271,13 +278,6 @@
 msgid "deb-control"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-control.5:3 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
-#, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-07-29"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-control.5:6
 msgid "deb-control - Debian packages' master control file format"
@@ -319,9 +319,9 @@
 
 #. type: TP
 #: deb-control.5:26
-#, no-wrap
-msgid "B<Package:> E<lt>package nameE<gt>"
-msgstr "B<Package:> E<lt>パッケージ名E<gt>"
+#, fuzzy, no-wrap
+msgid "B<Package:>I< package-name>"
+msgstr "B<--package>I< E<lt>packageE<gt>>"
 
 #. type: Plain text
 #: deb-control.5:30
@@ -334,8 +334,9 @@
 
 #. type: TP
 #: deb-control.5:30
-#, no-wrap
-msgid "B<Version:> E<lt>version stringE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Version:> E<lt>version stringE<gt>"
+msgid "B<Version:>I< version-string>"
 msgstr "B<Version:> E<lt>バージョン文字列E<gt>"
 
 #. type: Plain text
@@ -355,8 +356,9 @@
 
 #. type: TP
 #: deb-control.5:37
-#, no-wrap
-msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
+msgid "B<Maintainer:>I< fullname-email>"
 msgstr "B<Maintainer:> E<lt>名前 emailE<gt>"
 
 #. type: Plain text
@@ -372,13 +374,16 @@
 
 #. type: TP
 #: deb-control.5:42
-#, no-wrap
-msgid "B<Description:> E<lt>short descriptionE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Description:> E<lt>short descriptionE<gt>"
+msgid "B<Description:>I< short-description>"
 msgstr "B<Description:> E<lt>短い説明E<gt>"
 
 #. type: Plain text
 #: deb-control.5:45
-msgid "B< >E<lt>long descriptionE<gt>"
+#, fuzzy
+#| msgid "B< >E<lt>long descriptionE<gt>"
+msgid "B< >I<long-description>"
 msgstr "B< >E<lt>長い説明E<gt>"
 
 #. type: Plain text
@@ -401,9 +406,10 @@
 msgstr "オプションのフィールド"
 
 #. type: TP
-#: deb-control.5:53 deb-src-control.5:88
-#, no-wrap
-msgid "B<Section:> E<lt>sectionE<gt>"
+#: deb-control.5:53 deb-src-control.5:90
+#, fuzzy, no-wrap
+#| msgid "B<Section:> E<lt>sectionE<gt>"
+msgid "B<Section:>I< section>"
 msgstr "B<Section: >E<lt>セクションE<gt>"
 
 #. type: Plain text
@@ -418,9 +424,10 @@
 "`x11' などがある。"
 
 #. type: TP
-#: deb-control.5:58 deb-src-control.5:94
-#, no-wrap
-msgid "B<Priority:> E<lt>priorityE<gt>"
+#: deb-control.5:58 deb-src-control.5:96
+#, fuzzy, no-wrap
+#| msgid "B<Priority:> E<lt>priorityE<gt>"
+msgid "B<Priority:>I< priority>"
 msgstr "B<Priority:> E<lt>優先度E<gt>"
 
 #. type: Plain text
@@ -433,7 +440,7 @@
 "ては `required'、`standard'、`optional'、`extra' などがある。"
 
 #. type: Plain text
-#: deb-control.5:71 deb-src-control.5:107
+#: deb-control.5:71 deb-src-control.5:109
 #, fuzzy
 msgid ""
 "In Debian, the B<Section> and B<Priority> fields have a defined set of "
@@ -446,15 +453,22 @@
 "ジの中に含まれている。"
 
 #. type: TP
-#: deb-control.5:71 deb-src-control.5:211
-#, no-wrap
-msgid "B<Essential:> E<lt>yes|noE<gt>"
+#: deb-control.5:71 deb-src-control.5:216
+#, fuzzy, no-wrap
+#| msgid "B<Essential:> E<lt>yes|noE<gt>"
+msgid "B<Essential:> B<yes>|B<no>"
 msgstr "B<Essential:> E<lt>yes|noE<gt>"
 
 #. type: Plain text
 #: deb-control.5:78
+#, fuzzy
+#| 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 "
+#| "other installation tool will not allow an B<Essential> package to be "
+#| "removed (at least not without using one of the force options)."
 msgid ""
-"This field is usually only needed when the answer is `yes'. It denotes a "
+"This field is usually only needed when the answer is B<yes>. It denotes a "
 "package that is required for proper operation of the system. Dpkg or any "
 "other installation tool will not allow an B<Essential> package to be removed "
 "(at least not without using one of the force options)."
@@ -466,8 +480,9 @@
 
 #. type: TP
 #: deb-control.5:78
-#, no-wrap
-msgid "B<Architecture:> E<lt>arch|allE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Architecture:> E<lt>arch|allE<gt>"
+msgid "B<Architecture:> I<arch>|B<all>"
 msgstr "B<Architecture:> E<lt>arch|allE<gt>"
 
 #. type: Plain text
@@ -486,9 +501,9 @@
 "リプト、文書などは architecture が all となる。"
 
 #. type: TP
-#: deb-control.5:86 deb-src-control.5:83
+#: deb-control.5:86 deb-src-control.5:85
 #, fuzzy, no-wrap
-msgid "B<Origin:> E<lt>nameE<gt>"
+msgid "B<Origin:>I< name>"
 msgstr "B<Source:> E<lt>ソース名E<gt>"
 
 #. type: Plain text
@@ -499,71 +514,71 @@
 #. type: TP
 #: deb-control.5:89 deb-src-control.5:66
 #, fuzzy, no-wrap
-msgid "B<Bugs:> E<lt>urlE<gt>"
+msgid "B<Bugs:>I< url>"
 msgstr "B<Replaces:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-control.5:93
+#: deb-control.5:94
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian.org>."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:93 deb-src-control.5:62
+#: deb-control.5:94 deb-src-control.5:62
 #, fuzzy, no-wrap
-msgid "B<Homepage:> E<lt>urlE<gt>"
+msgid "B<Homepage:>I< url>"
 msgstr "B<Replaces:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-control.5:96 deb-src-control.5:65
-msgid "The upstream project home page URL."
+#: deb-control.5:97
+msgid "The upstream project home page I<url>."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:96 deb-src-control.5:217
+#: deb-control.5:97 deb-src-control.5:222
 #, fuzzy, no-wrap
-msgid "B<Tag:> E<lt>tag listE<gt>"
+msgid "B<Tag:>I< tag-list>"
 msgstr "B<Replaces:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-control.5:100
+#: deb-control.5:101
 msgid ""
 "List of tags describing the qualities of the package. The description and "
 "list of supported tags can be found in the B<debtags> package."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:100
+#: deb-control.5:101 deb-src-control.5:219
 #, fuzzy, no-wrap
 #| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt>"
+msgid "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>"
 msgstr "B<Source:> E<lt>ソース名E<gt>"
 
 #. type: Plain text
-#: deb-control.5:111
+#: deb-control.5:113
 msgid ""
 "This field is used to indicate how this package should behave on a multi-"
-"arch installations. The value `same' means that the package is co-"
+"arch installations. The value B<same> means that the package is co-"
 "installable with itself, but it must not be used to satisfy the dependency "
-"of any package of a different architecture from itself. The value `foreign' "
+"of any package of a different architecture from itself. The value B<foreign> "
 "means that the package is not co-installable with itself, but should be "
 "allowed to satisfy the dependency of a package of a different arch from "
-"itself. The value `allowed` allows reverse-dependencies to indicate in their "
-"Depends field that they need a package from a foreign architecture, but has "
-"no effect otherwise. This field should not be present in packages with the "
-"Architecture: all field."
+"itself. The value B<allowed> allows reverse-dependencies to indicate in "
+"their Depends field that they need a package from a foreign architecture, "
+"but has no effect otherwise. This field should not be present in packages "
+"with the B<Architecture: all> field."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:111
-#, no-wrap
-msgid "B<Source:> E<lt>source nameE<gt>"
+#: deb-control.5:113
+#, fuzzy, no-wrap
+#| msgid "B<Source:> E<lt>source nameE<gt>"
+msgid "B<Source:>I< source-name>"
 msgstr "B<Source:> E<lt>ソース名E<gt>"
 
 #. type: Plain text
-#: deb-control.5:115
+#: deb-control.5:117
 msgid ""
 "The name of the source package that this binary package came from, if "
 "different than the name of the package itself."
@@ -572,26 +587,26 @@
 "ナリパッケージの名前とソースパッケージの名前が違う時に使われる。"
 
 #. type: TP
-#: deb-control.5:116 deb-src-control.5:197
+#: deb-control.5:118 deb-src-control.5:202
 #, fuzzy, no-wrap
 #| msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgid "B<Subarchitecture:> E<lt>valueE<gt>"
+msgid "B<Subarchitecture:>I< value>"
 msgstr "B<Architecture:> E<lt>arch|allE<gt>"
 
 #. type: TP
-#: deb-control.5:119 deb-src-control.5:200
+#: deb-control.5:121 deb-src-control.5:205
 #, fuzzy, no-wrap
-msgid "B<Kernel-Version:> E<lt>valueE<gt>"
+msgid "B<Kernel-Version:>I< value>"
 msgstr "B<Version:> E<lt>バージョン文字列E<gt>"
 
 #. type: TP
-#: deb-control.5:122 deb-src-control.5:203
+#: deb-control.5:124 deb-src-control.5:208
 #, fuzzy, no-wrap
-msgid "B<Installer-Menu-Item:> E<lt>valueE<gt>"
+msgid "B<Installer-Menu-Item:>I< value>"
 msgstr "B<Replaces:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-control.5:129 deb-src-control.5:210
+#: deb-control.5:131 deb-src-control.5:215
 msgid ""
 "These fields are used by the debian-installer and are usually not needed.  "
 "See /usr/share/doc/debian-installer/devel/modules.txt from the B<debian-"
@@ -599,13 +614,14 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:130 deb-src-control.5:228
-#, no-wrap
-msgid "B<Depends:> E<lt>package listE<gt>"
+#: deb-control.5:132 deb-src-control.5:233
+#, fuzzy, no-wrap
+#| msgid "B<Depends:> E<lt>package listE<gt>"
+msgid "B<Depends:>I< package-list>"
 msgstr "B<Depends:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-control.5:141
+#: deb-control.5:143
 #, fuzzy
 msgid ""
 "List of packages that are required for this package to provide a non-trivial "
@@ -625,13 +641,14 @@
 "ジが prerm スクリプトを実行しようとする前に実行しようとする。"
 
 #. type: TP
-#: deb-control.5:141 deb-src-control.5:231
-#, no-wrap
-msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+#: deb-control.5:143 deb-src-control.5:236
+#, fuzzy, no-wrap
+#| msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+msgid "B<Pre-Depends:>I< package-list>"
 msgstr "B<Pre-Depends:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-control.5:148
+#: deb-control.5:150
 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 "
@@ -642,13 +659,14 @@
 "他のパッケージを preinst スクリプトで利用する場合に使われる。"
 
 #. type: TP
-#: deb-control.5:148 deb-src-control.5:234
-#, no-wrap
-msgid "B<Recommends:> E<lt>package listE<gt>"
+#: deb-control.5:150 deb-src-control.5:239
+#, fuzzy, no-wrap
+#| msgid "B<Recommends:> E<lt>package listE<gt>"
+msgid "B<Recommends:>I< package-list>"
 msgstr "B<Recommends:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-control.5:155
+#: deb-control.5:157
 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 "
@@ -660,13 +678,14 @@
 "とがある。"
 
 #. type: TP
-#: deb-control.5:155 deb-src-control.5:237
-#, no-wrap
-msgid "B<Suggests:> E<lt>package listE<gt>"
+#: deb-control.5:157 deb-src-control.5:242
+#, fuzzy, no-wrap
+#| msgid "B<Suggests:> E<lt>package listE<gt>"
+msgid "B<Suggests:>I< package-list>"
 msgstr "B<Suggests:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-control.5:160
+#: deb-control.5:162
 msgid ""
 "Lists packages that are related to this one and can perhaps enhance its "
 "usefulness, but without which installing this package is perfectly "
@@ -676,7 +695,7 @@
 "いパッケージのリスト。"
 
 #. type: Plain text
-#: deb-control.5:172
+#: deb-control.5:174
 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 "
@@ -693,7 +712,7 @@
 "バージョン番号の指定ができる。"
 
 #. type: Plain text
-#: deb-control.5:178
+#: deb-control.5:180
 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 "
@@ -708,13 +727,13 @@
 "じか新しい」、 \"E<lt>=\" 「同じか古い」、 \"=\" 「同じ」がある。"
 
 #. type: TP
-#: deb-control.5:178 deb-src-control.5:240
+#: deb-control.5:180 deb-src-control.5:245
 #, fuzzy, no-wrap
-msgid "B<Breaks:> E<lt>package listE<gt>"
+msgid "B<Breaks:>I< package-list>"
 msgstr "B<Replaces:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-control.5:186
+#: deb-control.5:188
 #, fuzzy
 msgid ""
 "Lists packages that this one breaks, for example by exposing bugs when the "
@@ -728,13 +747,14 @@
 "いを B<Conflicts> に書いておくべきである。"
 
 #. type: TP
-#: deb-control.5:186 deb-src-control.5:249
-#, no-wrap
-msgid "B<Conflicts:> E<lt>package listE<gt>"
+#: deb-control.5:188 deb-src-control.5:254
+#, fuzzy, no-wrap
+#| msgid "B<Conflicts:> E<lt>package listE<gt>"
+msgid "B<Conflicts:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-control.5:194
+#: deb-control.5:196
 msgid ""
 "Lists packages that conflict with this one, for example by containing files "
 "with the same names. The package maintenance software will not allow "
@@ -747,13 +767,14 @@
 "いを B<Conflicts> に書いておくべきである。"
 
 #. type: TP
-#: deb-control.5:194 deb-src-control.5:246
-#, no-wrap
-msgid "B<Replaces:> E<lt>package listE<gt>"
+#: deb-control.5:196 deb-src-control.5:251
+#, fuzzy, no-wrap
+#| msgid "B<Replaces:> E<lt>package listE<gt>"
+msgid "B<Replaces:>I< package-list>"
 msgstr "B<Replaces:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-control.5:202
+#: deb-control.5:204
 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 "
@@ -766,13 +787,14 @@
 "とで他のパッケージを強制的に削除することを指示するために使われる。"
 
 #. type: TP
-#: deb-control.5:202 deb-src-control.5:252
-#, no-wrap
-msgid "B<Provides:> E<lt>package listE<gt>"
+#: deb-control.5:204 deb-src-control.5:257
+#, fuzzy, no-wrap
+#| msgid "B<Provides:> E<lt>package listE<gt>"
+msgid "B<Provides:>I< package-list>"
 msgstr "B<Provides:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-control.5:212
+#: deb-control.5:214
 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 "
@@ -793,7 +815,7 @@
 "を使って列挙する必要もなくなる。"
 
 #. type: Plain text
-#: deb-control.5:231
+#: deb-control.5:233
 #, fuzzy
 #| msgid ""
 #| "The syntax of B<Conflicts>, B<Replaces> and B<Provides> is a list of "
@@ -814,14 +836,14 @@
 "ルドと同じ表記でバージョンも指定することができる。"
 
 #. type: TP
-#: deb-control.5:232 deb-src-control.5:255
+#: deb-control.5:234 deb-src-control.5:260
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Built-Using:> E<lt>package listE<gt>"
+msgid "B<Built-Using:>I< package-list>"
 msgstr "B<Depends:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-control.5:242
+#: deb-control.5:244
 msgid ""
 "This field lists extra source packages that were used during the build of "
 "this binary package.  This is an indication to the archive maintenance "
@@ -833,13 +855,13 @@
 msgstr ""
 
 #. type: SH
-#: deb-control.5:243 deb-src-control.5:283 start-stop-daemon.8:273
+#: deb-control.5:245 deb-src-control.5:288 start-stop-daemon.8:302
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "例"
 
 #. type: Plain text
-#: deb-control.5:266
+#: deb-control.5:268
 #, fuzzy, no-wrap
 msgid ""
 "# Comment\n"
@@ -884,7 +906,7 @@
 " will run more slowly, however).\n"
 
 #. type: Plain text
-#: deb-control.5:274
+#: deb-control.5:276
 #, fuzzy
 msgid ""
 "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
@@ -897,12 +919,6 @@
 msgid "deb-src-control"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-src-control.5:3
-#, fuzzy, no-wrap
-msgid "2010-11-22"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-src-control.5:6
 #, fuzzy
@@ -925,8 +941,7 @@
 "one space. The content of the multi-line fields is generally joined to a "
 "single line by the tools (except in the case of the B<Description> field, "
 "see below). To insert empty lines into a multi-line field, insert a dot "
-"after the space. The paragraphs are separated by an empty line. Lines "
-"starting with a B<'#'> are treated as comments."
+"after the space. Lines starting with a B<'#'> are treated as comments."
 msgstr ""
 
 #. type: SH
@@ -940,7 +955,7 @@
 #: deb-src-control.5:30
 #, fuzzy, no-wrap
 #| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Source:> E<lt>source package nameE<gt> (required)"
+msgid "B<Source:> I<source-package-name> (required)"
 msgstr "B<Source:> E<lt>ソース名E<gt>"
 
 #. type: Plain text
@@ -957,7 +972,7 @@
 #: deb-src-control.5:38
 #, fuzzy, no-wrap
 #| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgid "B<Maintainer:> E<lt>fullname emailE<gt> (required)"
+msgid "B<Maintainer:> I<fullname-email> (required)"
 msgstr "B<Maintainer:> E<lt>名前 emailE<gt>"
 
 #. type: Plain text
@@ -980,7 +995,7 @@
 #: deb-src-control.5:44
 #, fuzzy, no-wrap
 #| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgid "B<Uploaders:> E<lt>fullname emailE<gt>"
+msgid "B<Uploaders:>I< fullname-email>"
 msgstr "B<Maintainer:> E<lt>名前 emailE<gt>"
 
 #. type: Plain text
@@ -995,7 +1010,7 @@
 #: deb-src-control.5:50
 #, fuzzy, no-wrap
 #| msgid "B<Version:> E<lt>version stringE<gt>"
-msgid "B<Standards-Version:> E<lt>version stringE<gt>"
+msgid "B<Standards-Version:>I< version-string>"
 msgstr "B<Version:> E<lt>バージョン文字列E<gt>"
 
 #. type: Plain text
@@ -1010,7 +1025,7 @@
 #: deb-src-control.5:57
 #, fuzzy, no-wrap
 #| msgid "B<Essential:> E<lt>yes|noE<gt>"
-msgid "B<DM-Upload-Allowed:> E<lt>yes|noE<gt>"
+msgid "B<DM-Upload-Allowed:> B<yes>|B<no>"
 msgstr "B<Essential:> E<lt>yes|noE<gt>"
 
 #. type: Plain text
@@ -1022,49 +1037,55 @@
 msgstr ""
 
 #. type: Plain text
+#: deb-src-control.5:65
+msgid "The upstream project home page URL."
+msgstr ""
+
+#. type: Plain text
 #: deb-src-control.5:71
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>. This field is usually not needed."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian."
+"org>. This field is usually not needed."
 msgstr ""
 
 #. type: TP
 #: deb-src-control.5:72
 #, fuzzy, no-wrap
-msgid "B<Vcs-*:> E<lt>urlE<gt>"
+msgid "B<Vcs-*:>I< url>"
 msgstr "B<Replaces:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:78
+#: deb-src-control.5:79
 msgid ""
-"The url of the Version Control System repository used to maintain this "
-"package.  Currently supported are Arch, Bzr (Bazaar), Cvs, Darcs, Git, Hg "
-"(Mercurial), Mtn (Monotone) and Svn (Subversion). Usually this field points "
-"to the latest version of the package, such as the main branch or the trunk."
+"The I<url> of the Version Control System repository used to maintain this "
+"package. Currently supported are B<Arch>, B<Bzr> (Bazaar), B<Cvs>, B<Darcs>, "
+"B<Git>, B<Hg> (Mercurial), B<Mtn> (Monotone) and B<Svn> (Subversion). "
+"Usually this field points to the latest version of the package, such as the "
+"main branch or the trunk."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:79
+#: deb-src-control.5:80
 #, fuzzy, no-wrap
-msgid "B<Vcs-Browser:> E<lt>urlE<gt>"
+msgid "B<Vcs-Browser:>I< url>"
 msgstr "B<Replaces:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:82
+#: deb-src-control.5:84
 msgid ""
-"The url of a webinterface to browse the Version Control System repository."
+"The I<url> of a webinterface to browse the Version Control System repository."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:87
+#: deb-src-control.5:89
 msgid ""
 "The name of the distribution this package is originating from. This field is "
 "usually not needed."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:93
+#: deb-src-control.5:95
 #, fuzzy
 #| msgid ""
 #| "This is a general field that gives the package a category based on the "
@@ -1080,7 +1101,7 @@
 "`x11' などがある。"
 
 #. type: Plain text
-#: deb-src-control.5:98
+#: deb-src-control.5:100
 #, fuzzy
 #| msgid ""
 #| "Sets the importance of this package in relation to the system as a "
@@ -1095,14 +1116,14 @@
 "ては `required'、`standard'、`optional'、`extra' などがある。"
 
 #. type: TP
-#: deb-src-control.5:108
+#: deb-src-control.5:110
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Build-Depends:> E<lt>package listE<gt>"
+msgid "B<Build-Depends:>I< package-list>"
 msgstr "B<Depends:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:112
+#: deb-src-control.5:114
 #, fuzzy
 #| msgid ""
 #| "In the list of packages, the text indicating the current state of the "
@@ -1113,50 +1134,50 @@
 msgstr "パッケージリスト中、選択したパッケージの現在状況表示部"
 
 #. type: TP
-#: deb-src-control.5:113
+#: deb-src-control.5:115
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Build-Depends-Indep:> E<lt>package listE<gt>"
+msgid "B<Build-Depends-Indep:>I< package-list>"
 msgstr "B<Depends:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:118
+#: deb-src-control.5:120
 msgid ""
-"Same as Build-Depends, but they are only needed when building the "
-"architecture independent packages. The Build-Depends are also installed in "
-"this case."
+"Same as B<Build-Depends>, but they are only needed when building the "
+"architecture independent packages. The B<Build-Depends> are also installed "
+"in this case."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:119
+#: deb-src-control.5:121
 #, fuzzy, no-wrap
 #| msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgid "B<Build-Conflicts:> E<lt>package listE<gt>"
+msgid "B<Build-Conflicts:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:123
+#: deb-src-control.5:125
 msgid ""
 "A list of packages that should not be installed when the package is build, "
 "for example because they interfere with the used build system."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:124
+#: deb-src-control.5:126
 #, fuzzy, no-wrap
 #| msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgid "B<Build-Conflicts-Indep:> E<lt>package listE<gt>"
+msgid "B<Build-Conflicts-Indep:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:128
+#: deb-src-control.5:130
 msgid ""
-"Same as Build-Conflicts, but only when building the architecture independent "
-"packages."
+"Same as B<Build-Conflicts>, but only when building the architecture "
+"independent packages."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:139
+#: deb-src-control.5:141
 #, fuzzy
 #| msgid ""
 #| "The syntax of B<Depends>, B<Pre-Depends>, B<Recommends> and B<Suggests> "
@@ -1182,7 +1203,7 @@
 "バージョン番号の指定ができる。"
 
 #. type: Plain text
-#: deb-src-control.5:148
+#: deb-src-control.5:150
 msgid ""
 "The syntax of the B<Build-Conflicts> and B<Build-Conflicts-Indep> fields is "
 "a list of comma-separated package names, where the comma is read as an \"AND"
@@ -1192,7 +1213,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:154
+#: deb-src-control.5:156
 #, fuzzy
 #| msgid ""
 #| "A version number may start with a `E<gt>E<gt>', in which case any later "
@@ -1215,7 +1236,7 @@
 "じか新しい」、 \"E<lt>=\" 「同じか古い」、 \"=\" 「同じ」がある。"
 
 #. type: Plain text
-#: deb-src-control.5:158
+#: deb-src-control.5:160
 msgid ""
 "A architecture specification consists of one or more architecture names, "
 "separated by whitespace. Exclamation marks may be prepended to each of the "
@@ -1223,7 +1244,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:163
+#: deb-src-control.5:165
 msgid ""
 "Note that dependencies on packages in the B<build-essential> set can be "
 "omitted and that declaring build conflicts against them is impossible. A "
@@ -1231,59 +1252,61 @@
 msgstr ""
 
 #. type: SH
-#: deb-src-control.5:165
+#: deb-src-control.5:167
 #, fuzzy, no-wrap
 #| msgid "OPTIONAL FIELDS"
 msgid "BINARY FIELDS"
 msgstr "オプションのフィールド"
 
 #. type: Plain text
-#: deb-src-control.5:174
+#: deb-src-control.5:176
 msgid ""
 "Note that the B<Priority>, B<Section> and B<Homepage> fields can also be in "
 "a binary paragraph to override the global value from the source package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:175
+#: deb-src-control.5:177
 #, fuzzy, no-wrap
 #| msgid "B<Package:> E<lt>package nameE<gt>"
-msgid "B<Package:> E<lt>binary package nameE<gt> (required)"
+msgid "B<Package:> I<binary-package-name> (required)"
 msgstr "B<Package:> E<lt>パッケージ名E<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:179
+#: deb-src-control.5:181
 msgid ""
 "This field is used to name the binary package name. The same restrictions as "
 "to a source package name apply."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:180
+#: deb-src-control.5:182
 #, fuzzy, no-wrap
 #| msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgid "B<Architecture:> E<lt>arch|all|anyE<gt> (required)"
+msgid "B<Architecture:> I<arch>|B<all>|B<any> (required)"
 msgstr "B<Architecture:> E<lt>arch|allE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:190
+#: deb-src-control.5:195
 msgid ""
 "The architecture specifies on which type of hardware this package runs. For "
 "packages that run on all architectures, use the B<any> value. For packages "
 "that are architecture independent, such as shell and Perl scripts or "
 "documentation, use the B<all> value. To restrict the packages to a certain "
-"set of architectures, specify the architecture names, separated by a space."
+"set of architectures, specify the architecture names, separated by a space. "
+"It's also possible to put architecture wildcards in that list (see B<dpkg-"
+"architecture>(1)  for more information about them)."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:191
+#: deb-src-control.5:196
 #, fuzzy, no-wrap
 #| msgid "B<Package:> E<lt>package nameE<gt>"
-msgid "B<Package-Type:> E<lt>deb|udebE<gt>"
+msgid "B<Package-Type:> B<deb>|B<udeb>"
 msgstr "B<Package:> E<lt>パッケージ名E<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:196
+#: deb-src-control.5:201
 msgid ""
 "This field defines the type of the package. \"udeb\" is for size-constrained "
 "packages used by the debian installer. \"deb\" is the default value, it's "
@@ -1291,49 +1314,42 @@
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:214
-#, fuzzy, no-wrap
-#| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
-msgstr "B<Source:> E<lt>ソース名E<gt>"
-
-#. type: TP
-#: deb-src-control.5:220
+#: deb-src-control.5:225
 #, fuzzy, no-wrap
 #| msgid "B<Description:> E<lt>short descriptionE<gt>"
-msgid "B<Description:> E<lt>short descriptionE<gt> (required)"
+msgid "B<Description:> I<short-description> (required)"
 msgstr "B<Description:> E<lt>短い説明E<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:227
+#: deb-src-control.5:232
 msgid ""
 "These fields are described in the B<deb-control>(5)  manual page, as they "
 "are copied literally to the control file of the binary package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:243
+#: deb-src-control.5:248
 #, fuzzy, no-wrap
 #| msgid "B<Replaces:> E<lt>package listE<gt>"
-msgid "B<Enhances:> E<lt>package listE<gt>"
+msgid "B<Enhances:>I< package-list>"
 msgstr "B<Replaces:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:265
+#: deb-src-control.5:270
 msgid ""
 "These fields declare relationships between packages. They are discussed in "
 "the B<deb-control>(5)  manpage and in the B<debian-policy> package."
 msgstr ""
 
 #. type: SH
-#: deb-src-control.5:266
+#: deb-src-control.5:271
 #, fuzzy, no-wrap
 #| msgid "REQUIRED FIELDS"
 msgid "USER-DEFINED FIELDS"
 msgstr "必須フィールド"
 
 #. type: Plain text
-#: deb-src-control.5:281
+#: deb-src-control.5:286
 msgid ""
 "It is allowed to add additional user-defined fields to the control file. The "
 "tools will ignore these fields. If you want the fields to be copied over to "
@@ -1350,7 +1366,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:299
+#: deb-src-control.5:304
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -1365,11 +1381,11 @@
 "Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
-" libselinux1-dev (E<gt>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]\n"
+" libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:318
+#: deb-src-control.5:323
 #, no-wrap
 msgid ""
 "Package: dpkg-dev\n"
@@ -1378,8 +1394,8 @@
 "Architecture: all\n"
 "# this is a custom field in the binary package\n"
 "XB-Mentoring-Contact: Raphael Hertzog E<lt>hertzog@debian.orgE<gt>\n"
-"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2), bzip2, lzma,\n"
-" patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
+"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2),\n"
+" bzip2, lzma, patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
 "Recommends: gcc | c-compiler, build-essential\n"
 "Suggests: gnupg, debian-keyring\n"
 "Conflicts: dpkg-cross (E<lt>E<lt> 2.0.0), devscripts (E<lt>E<lt> 2.10.26)\n"
@@ -1393,7 +1409,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:325
+#: deb-src-control.5:330
 #, fuzzy
 msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
@@ -1405,11 +1421,11 @@
 msgstr "dpkg suite"
 
 #. type: TH
-#: deb-split.5:1
+#: deb-split.5:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 dpkg-vendor.1:1 start-stop-daemon.8:1
 #, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-01-28"
-msgstr "2006-02-28"
+msgid "2011-07-04"
+msgstr "2006-04-09"
 
 #. type: Plain text
 #: deb-split.5:4
@@ -1437,41 +1453,80 @@
 "る。"
 
 #. type: Plain text
-#: deb-split.5:21
-#, fuzzy
-#| 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 version number, B<2.0> at the time this manual page was written.  "
-#| "Programs which read new-format archives should be prepared for the minor "
-#| "number to be increased and new lines to be present, and should ignore "
-#| "these if this is the case."
+#: deb-split.5:15
 msgid ""
 "The first member is named B<debian-split> and contains a series of lines, "
-"separated by newlines. Currently seven lines are present.  The first is the "
-"format version number, B<2.1> at the time this manual page was written. The "
-"second is the package name. The third is the package version. The fourth is "
-"the md5sum of the package.  The fifth is the total size of the package. The "
-"sixth is the maximum part size. The seventh is the current part number, "
-"followed by a slash and the total amount of parts (as in \\(oq1/10\\(cq)."
+"separated by newlines. Currently eight lines are present:"
 msgstr ""
-"B<.deb> に含まれる第 1 のメンバーは B<debian-binary> という名称で、改行で区切"
-"られた数行から成る。現在は一行だけであり、deb 形式バージョン番号が与えられ"
-"る。このマニュアルが書かれた時点では B<2.0> である。新形式のアーカイブを読み"
-"込むプログラムは、マイナーバージョン番号が上がった場合や、新しい行が追加され"
-"ている場合を想定しておかなければならない。もし、これに該当する場合はこれらを"
-"無視すること。"
 
-# type: Plain text
+#. type: IP
+#: deb-split.5:15 deb-split.5:18 deb-split.5:20 deb-split.5:22 deb-split.5:24
+#: deb-split.5:26 deb-split.5:28 deb-split.5:31 dpkg-gensymbols.1:20
+#: dpkg-gensymbols.1:22 dpkg-gensymbols.1:24 dpkg-gensymbols.1:26
+#: dpkg-gensymbols.1:311 dpkg-gensymbols.1:317 dpkg-gensymbols.1:351
+#: dpkg-gensymbols.1:355 dpkg-gensymbols.1:358
+#, no-wrap
+msgid "\\(bu"
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:18
+msgid ""
+"The format version number, B<2.1> at the time this manual page was written."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:20
+#, fuzzy
+msgid "The package name."
+msgstr "パッケージの短い説明文"
+
+#. type: Plain text
+#: deb-split.5:22
+#, fuzzy
+msgid "The package version."
+msgstr "パッケージの短い説明文"
+
 #. type: Plain text
 #: deb-split.5:24
+#, fuzzy
+msgid "The md5sum of the package."
+msgstr "パッケージの短い説明文"
+
+#. type: Plain text
+#: deb-split.5:26
+#, fuzzy
+#| msgid "The header line above the list of packages."
+msgid "The total size of the package."
+msgstr "パッケージリストの上のヘッダライン"
+
+#. type: Plain text
+#: deb-split.5:28
+msgid "The maximum part size."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:31
+msgid ""
+"The current part number, followed by a slash and the total amount of parts "
+"(as in \\(oq1/10\\(cq)."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:33
+msgid "The package architecture (since dpkg 1.16.1)."
+msgstr ""
+
+# type: Plain text
+#. type: Plain text
+#: deb-split.5:36
 msgid ""
 "Programs which read multi-part archives should be prepared for additional "
 "lines to be present, and should ignore these if this is the case."
 msgstr ""
 
 #. type: Plain text
-#: deb-split.5:29
+#: deb-split.5:41
 #, fuzzy
 #| msgid ""
 #| "If the major number has changed, an incompatible change has been made and "
@@ -1490,24 +1545,24 @@
 "く)、プログラムは安全に実行を継続できる。これについては、以下で説明する。"
 
 #. type: Plain text
-#: deb-split.5:32
+#: deb-split.5:44
 #, fuzzy
 #| msgid ""
 #| "The third, last required member is named B<data.tar.gz>.  It contains the "
 #| "filesystem archive as a gzipped tar archive."
 msgid ""
-"The second, last required member is named B<data.>N, where N denotes the "
-"part number. It contains the raw part data."
+"The second, last required member is named B<data.>I<N>, where I<N> denotes "
+"the part number. It contains the raw part data."
 msgstr ""
 "最後の 3 番目に要請されるメンバーは B<data.tar.gz> というファイル名を持ち、"
 "ファイルシステムアーカイブを gzip 圧縮 tar 形式として含む。"
 
 #. type: Plain text
-#: deb-split.5:37
+#: deb-split.5:49
 #, fuzzy
 msgid ""
 "These members must occur in this exact order. Current implementations should "
-"ignore any additional members after B<data.>N.  Further members may be "
+"ignore any additional members after B<data.>I<N>.  Further members may be "
 "defined in the future, and (if possible) will be placed after these two."
 msgstr ""
 "これらのメンバーは上に示した順序で現れなければならない。将来、追加メンバーが"
@@ -1518,7 +1573,7 @@
 "`B<_>' で始まる名前を持てばよい。"
 
 #. type: Plain text
-#: deb-split.5:39
+#: deb-split.5:51
 #, fuzzy
 msgid "B<deb>(5), B<dpkg-split>(1)."
 msgstr ""
@@ -1531,13 +1586,6 @@
 msgid "deb-version"
 msgstr "B<--version>"
 
-#. type: TH
-#: deb-version.5:5 dpkg-distaddfile.1:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-name.1:6
-#, fuzzy, no-wrap
-msgid "2008-08-18"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-version.5:8
 #, fuzzy
@@ -1547,7 +1595,7 @@
 
 #. type: Plain text
 #: deb-version.5:11
-msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgid "[I<epoch>B<:>]I<upstream-version>[B<->I<debian-revision>]"
 msgstr ""
 
 #. type: Plain text
@@ -1567,7 +1615,7 @@
 #: deb-version.5:20
 msgid ""
 "This is a single (generally small) unsigned integer.  It may be omitted, in "
-"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"which case zero is assumed.  If it is omitted then the I<upstream-version> "
 "may not contain any colons."
 msgstr ""
 
@@ -1582,7 +1630,7 @@
 #. type: TP
 #: deb-version.5:24
 #, fuzzy, no-wrap
-msgid "I<upstream_version>"
+msgid "I<upstream-version>"
 msgstr "B<dpkg --version>"
 
 #. type: Plain text
@@ -1600,16 +1648,16 @@
 #: deb-version.5:39
 msgid ""
 "The comparison behavior of the package management system with respect to the "
-"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"I<upstream-version> is described below. The I<upstream-version> portion of "
 "the version number is mandatory."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:48
 msgid ""
-"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"The I<upstream-version> may contain only alphanumerics (\"A-Za-z0-9\") and "
 "the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
-"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"tilde) and should start with a digit.  If there is no I<debian-revision> "
 "then hyphens are not allowed; if there is no I<epoch> then colons are not "
 "allowed."
 msgstr ""
@@ -1617,7 +1665,7 @@
 #. type: TP
 #: deb-version.5:48
 #, fuzzy, no-wrap
-msgid "I<debian_revision>"
+msgid "I<debian-revision>"
 msgstr "B<--version>"
 
 #. type: Plain text
@@ -1626,13 +1674,13 @@
 "This part of the version number specifies the version of the Debian package "
 "based on the upstream version.  It may contain only alphanumerics and the "
 "characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
-"same way as the I<upstream_version> is."
+"same way as the I<upstream-version> is."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:64
 msgid ""
-"It is optional; if it isn't present then the I<upstream_version> may not "
+"It is optional; if it isn't present then the I<upstream-version> may not "
 "contain a hyphen.  This format represents the case where a piece of software "
 "was written specifically to be turned into a Debian package, and so there is "
 "only one \"debianisation\" of it and therefore no revision indication is "
@@ -1642,17 +1690,17 @@
 #. type: Plain text
 #: deb-version.5:68
 msgid ""
-"It is conventional to restart the I<debian_revision> at '1' each time time "
-"the I<upstream_version> is increased."
+"It is conventional to restart the I<debian-revision> at '1' each time time "
+"the I<upstream-version> is increased."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:76
 msgid ""
 "Dpkg will break the version number apart at the last hyphen in the string "
-"(if there is one) to determine the I<upstream_version> and "
-"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
-"than the presence of one (but note that the I<debian_revision> is the least "
+"(if there is one) to determine the I<upstream-version> and I<debian-"
+"revision>. The absence of a I<debian-revision> compares earlier than the "
+"presence of one (but note that the I<debian-revision> is the least "
 "significant part of the version number)."
 msgstr ""
 
@@ -1665,7 +1713,7 @@
 #. type: Plain text
 #: deb-version.5:80
 msgid ""
-"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"The I<upstream-version> and I<debian-revision> parts are compared by the "
 "package management system using the same algorithm:"
 msgstr ""
 
@@ -1735,11 +1783,11 @@
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 #. type: SH
-#: deb-version.5:120 dpkg.1:797 dpkg-buildpackage.1:256 dpkg-distaddfile.1:47
-#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
+#: deb-version.5:120 dpkg.1:783 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:460
 #: dpkg-maintscript-helper.1:128 dpkg-parsechangelog.1:123
-#: dpkg-shlibdeps.1:331 dpkg-source.1:706 dselect.1:458
-#: start-stop-daemon.8:294 update-alternatives.8:493
+#: dpkg-shlibdeps.1:329 dpkg-source.1:730 dselect.1:451
+#: start-stop-daemon.8:323 update-alternatives.8:494
 #, no-wrap
 msgid "AUTHORS"
 msgstr "著者"
@@ -1751,19 +1799,19 @@
 msgstr "Copyright (C) 1995 Ian Jackson."
 
 #. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:262
+#: deb-version.5:124 dpkg-buildpackage.1:263
 #, fuzzy
 msgid "Copyright \\(co 2007 Frank Lichtenheld"
 msgstr "Copyright 2000 Wichert Akkerman"
 
 #. type: Plain text
-#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:125
-#: dpkg-buildpackage.1:266 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
-#: dpkg-deb.1:256 dpkg-divert.8:139 dpkg-genchanges.1:154
-#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-maintscript-helper.1:139
-#: dpkg-mergechangelogs.1:71 dpkg-name.1:107 dpkg-parsechangelog.1:131
-#: dpkg-query.1:211 dpkg-shlibdeps.1:341 dpkg-source.1:714 dpkg-split.1:233
-#: dpkg-statoverride.8:92 dpkg-vendor.1:53 update-alternatives.8:500
+#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:273
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:269 dpkg-divert.8:139 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:464 dpkg-maintscript-helper.1:139
+#: dpkg-mergechangelogs.1:71 dpkg-name.1:108 dpkg-parsechangelog.1:131
+#: dpkg-query.1:219 dpkg-shlibdeps.1:339 dpkg-source.1:738 dpkg-split.1:227
+#: dpkg-statoverride.8:91 dpkg-vendor.1:53 update-alternatives.8:501
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
@@ -1778,12 +1826,6 @@
 msgid "deb-old"
 msgstr "deb-old"
 
-#. type: TH
-#: deb-old.5:1
-#, no-wrap
-msgid "2006-02-28"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-old.5:4
 msgid "deb-old - old style Debian binary package format"
@@ -1880,12 +1922,6 @@
 msgstr "dpkg-statoverride"
 
 #. type: TH
-#: deb-override.5:15
-#, fuzzy, no-wrap
-msgid "2007-03-07"
-msgstr "2006-04-09"
-
-#. type: TH
 #: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
 #: deb-symbols.5:2 deb-triggers.5:1 dpkg-architecture.1:1
 #: dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1
@@ -2091,7 +2127,7 @@
 
 #. type: Plain text
 #: deb-shlibs.5:34
-msgid "[I<type:>] I<library> I<version> I<dependencies>"
+msgid "[I<type>B<:>] I<library> I<version> I<dependencies>"
 msgstr ""
 
 #. type: Plain text
@@ -2108,8 +2144,8 @@
 msgstr ""
 
 #. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:728 dpkg-architecture.1:263
-#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:458
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:714 dpkg-architecture.1:262
+#: dpkg-divert.8:91 dpkg-name.1:65 update-alternatives.8:459
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "例"
@@ -2426,11 +2462,11 @@
 msgstr ""
 
 #. type: SH
-#: deb-substvars.5:145 dpkg.1:641 dpkg-architecture.1:285 dpkg.cfg.5:12
-#: dpkg-buildflags.1:103 dpkg-distaddfile.1:39 dpkg-divert.8:122
+#: deb-substvars.5:145 dpkg.1:627 dpkg-architecture.1:284 dpkg.cfg.5:12
+#: dpkg-buildflags.1:121 dpkg-distaddfile.1:39 dpkg-divert.8:122
 #: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
-#: dpkg-split.1:212 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:361
+#: dpkg-split.1:206 dpkg-statoverride.8:74 dselect.cfg.5:12
+#: update-alternatives.8:360
 #, no-wrap
 msgid "FILES"
 msgstr "ファイル"
@@ -2448,15 +2484,15 @@
 msgstr "使用できるパッケージの一覧。"
 
 #. type: SH
-#: deb-substvars.5:150 dpkg.1:794 dpkg-buildpackage.1:244 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:698 dpkg-split.1:197 dselect.1:436
-#: update-alternatives.8:485
+#: deb-substvars.5:150 dpkg.1:780 dpkg-buildpackage.1:244 dpkg-deb.1:238
+#: dpkg-name.1:86 dpkg-source.1:722 dpkg-split.1:199 dselect.1:429
+#: update-alternatives.8:486
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 #. type: Plain text
-#: deb-substvars.5:153 dpkg-source.1:701
+#: deb-substvars.5:153 dpkg-source.1:725
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -2473,11 +2509,11 @@
 "B<xargs>(1)."
 
 #. type: SH
-#: deb-substvars.5:161 dpkg-architecture.1:304 dpkg.cfg.5:19
-#: dpkg-buildflags.1:120 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
-#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:103
-#: dpkg-query.1:206 dpkg-scansources.1:77 dpkg-split.1:229
-#: dpkg-statoverride.8:88 dpkg-vendor.1:48 dselect.cfg.5:19
+#: deb-substvars.5:161 dpkg-architecture.1:303 dpkg.cfg.5:19
+#: dpkg-buildflags.1:266 dpkg-checkbuilddeps.1:40 dpkg-deb.1:265
+#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:104
+#: dpkg-query.1:214 dpkg-scansources.1:76 dpkg-split.1:223
+#: dpkg-statoverride.8:87 dpkg-vendor.1:48 dselect.cfg.5:19
 #, fuzzy, no-wrap
 msgid "AUTHOR"
 msgstr ""
@@ -2487,18 +2523,18 @@
 "著者"
 
 #. type: Plain text
-#: deb-substvars.5:163 dpkg-buildpackage.1:258 dpkg-distaddfile.1:49
-#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:708
-#: dpkg-split.1:231
+#: deb-substvars.5:163 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
+#: dpkg-deb.1:267 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:331 dpkg-source.1:732
+#: dpkg-split.1:225
 #, fuzzy
 msgid "Copyright \\(co 1995-1996 Ian Jackson"
 msgstr "Copyright (C) 1995 Ian Jackson."
 
 #. type: Plain text
-#: deb-substvars.5:165 dpkg-buildpackage.1:260 dpkg-distaddfile.1:51
+#: deb-substvars.5:165 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
 #: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
-#: dpkg-shlibdeps.1:335 dpkg-source.1:710 dpkg-statoverride.8:90
+#: dpkg-shlibdeps.1:333 dpkg-source.1:734 dpkg-statoverride.8:89
 #, fuzzy
 msgid "Copyright \\(co 2000 Wichert Akkerman"
 msgstr "Copyright 2000 Wichert Akkerman"
@@ -2509,12 +2545,6 @@
 msgid "deb-symbols"
 msgstr "deb-old"
 
-#. type: TH
-#: deb-symbols.5:2
-#, fuzzy, no-wrap
-msgid "2007-07-16"
-msgstr "2006-06-17"
-
 #. type: Plain text
 #: deb-symbols.5:5
 msgid "deb-symbols - Debian's extended shared library information file"
@@ -2534,12 +2564,12 @@
 
 #. type: Plain text
 #: deb-symbols.5:14
-msgid "E<lt>library sonameE<gt> E<lt>main dependency templateE<gt>"
+msgid "I<library-soname main-dependency-template>"
 msgstr ""
 
 #. type: Plain text
 #: deb-symbols.5:16
-msgid "[ | E<lt>alternative dependency templateE<gt> ]"
+msgid "[ | I<alternative-dependency-template> ]"
 msgstr ""
 
 #. type: Plain text
@@ -2549,23 +2579,24 @@
 
 #. type: Plain text
 #: deb-symbols.5:20
-msgid "[ * E<lt>field-nameE<gt>: E<lt>field valueE<gt> ]"
-msgstr ""
+#, fuzzy
+msgid "[ * I<field-name>: I<field-value> ]"
+msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
 #. type: Plain text
 #: deb-symbols.5:23
 #, no-wrap
 msgid ""
 "[ ... ]\n"
-" E<lt>symbolE<gt> E<lt>minimal versionE<gt>[ E<lt>id of dependency templateE<gt> ]\n"
+" I<symbol> I<minimal-version>[ I<id-of-dependency-template> ]\n"
 msgstr ""
 
 #. type: Plain text
 #: deb-symbols.5:29
 msgid ""
-"The I<library soname> is exactly the value of the SONAME field as exported "
-"by B<objdump>(1). A I<dependency template> is a dependency where I<#MINVER#> "
-"is dynamically replaced either by a version check like \"(E<gt>= I<minimal "
+"The I<library-soname> is exactly the value of the SONAME field as exported "
+"by B<objdump>(1). A I<dependency-template> is a dependency where I<#MINVER#> "
+"is dynamically replaced either by a version check like \"(E<gt>= I<minimal-"
 "version>)\" or by nothing (if an unversioned dependency is deemed "
 "sufficient)."
 msgstr ""
@@ -2574,9 +2605,9 @@
 #: deb-symbols.5:36
 msgid ""
 "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> being "
-"\"Base\" if the library is not versioned) is associated to a I<minimal "
+"\"Base\" if the library is not versioned) is associated to a I<minimal-"
 "version> of its dependency template (the main dependency template is used if "
-"I<id of dependency template> is not present). The first alternative "
+"I<id-of-dependency-template> is not present). The first alternative "
 "dependency template is numbered 1, the second one 2, etc."
 msgstr ""
 
@@ -2586,8 +2617,8 @@
 "Each entry for a library can also have some fields of meta-information.  "
 "Those fields are stored on lines starting with an asterisk. Currently, the "
 "only valid field is I<Build-Depends-Package>, it indicates the name of the "
-"\"-dev\" package associated to the library and is used by dpkg-shlibdeps to "
-"make sure that the dependency generated is at least as strict as the "
+"\"-dev\" package associated to the library and is used by B<dpkg-shlibdeps> "
+"to make sure that the dependency generated is at least as strict as the "
 "corresponding build dependency."
 msgstr ""
 
@@ -2651,12 +2682,6 @@
 msgid "deb-triggers"
 msgstr "B<--version>"
 
-#. type: TH
-#: deb-triggers.5:1 dpkg-trigger.1:1
-#, fuzzy, no-wrap
-msgid "2009-03-15"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-triggers.5:4
 msgid "deb-triggers - package triggers"
@@ -2695,29 +2720,45 @@
 msgstr "B<[--] >I<filename>"
 
 #. type: Plain text
-#: deb-triggers.5:27
+#: deb-triggers.5:26
+#, fuzzy
+msgid "B<interest-noawait> I<trigger-name>"
+msgstr "B<[--] >I<filename>"
+
+#. type: Plain text
+#: deb-triggers.5:33
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file."
+"triggers control file. The \"noawait\" variant does not put the triggering "
+"packages in triggers-awaited state. This should be used when the "
+"functionality provided by the trigger is not crucial."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:31
+#: deb-triggers.5:37
 msgid "B<activate> I<trigger-name>"
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:37
+#: deb-triggers.5:41
+#, fuzzy
+msgid "B<activate-noawait> I<trigger-name>"
+msgstr "B<[--] >I<filename>"
+
+#. type: Plain text
+#: deb-triggers.5:50
 msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure."
+"conflicting package), purge and deconfigure.  The \"noawait\" variant does "
+"not put the triggering packages in triggers-awaited state. This should be "
+"used when the functionality provided by the trigger is not crucial."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:45
+#: deb-triggers.5:58
 msgid ""
 "If this package disappears during the unpacking of another package the "
 "trigger will be activated when the disappearance is noted towards the end of "
@@ -2727,14 +2768,23 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:48
+#: deb-triggers.5:61
 msgid ""
 "Unknown directives are an error which will prevent installation of the "
 "package."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:52
+#: deb-triggers.5:66
+msgid ""
+"The \"-noawait\" variants are only supported by dpkg 1.16.1 or newer, and "
+"will lead to errors if used with an older dpkg. It is thus recommended to "
+"add a \"Pre-Depends: dpkg (E<gt>= 1.16.1)\" to any package that wish to use "
+"those directives."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.5:70
 #, fuzzy
 msgid ""
 "B<dpkg-trigger>(1), B<dpkg>(1), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
@@ -2747,12 +2797,6 @@
 msgstr "dpkg"
 
 #. type: TH
-#: dpkg.1:1
-#, fuzzy, no-wrap
-msgid "2011-02-05"
-msgstr "2006-02-28"
-
-#. type: TH
 #: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
 #: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-query.1:1
 #: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.cfg.5:1
@@ -2767,7 +2811,9 @@
 
 #. type: Plain text
 #: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
+#, fuzzy
+#| msgid "B<dpkg> [I<options>] I<action>"
+msgid "B<dpkg> [I<option>...] I<action>"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: SH
@@ -2818,51 +2864,24 @@
 "定し、オプションはそのアクションのふるまいを制御する。"
 
 #. type: Plain text
-#: dpkg.1:31
-msgid ""
-"B<dpkg> can 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> は B<dpkg-deb>(1) のフロントエンドとしても使うことができる。以"
-"下のアクションは B<dpkg-deb> のアクションであり、B<dpkg> にこれらを引き数とし"
-"て与えると、B<dpkg-deb> に同じ引き数を与えて起動する。"
-
-#. type: Plain text
-#: dpkg.1:40
-#, no-wrap
+#: dpkg.1:33
 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>,\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) にくわしい情報がある。"
+"B<dpkg> can also be used as a front-end to B<dpkg-deb>(1) and B<dpkg-query>"
+"(1). The list of supported actions can be found later on in the B<ACTIONS> "
+"section. If any such action is encountered B<dpkg> just runs B<dpkg-deb> or "
+"B<dpkg-query> with the parameters given to it, but no specific options are "
+"currently passed to them, to use any such option the back-ends need to be "
+"called directly."
+msgstr ""
 
 #. type: SH
-#: dpkg.1:43
+#: dpkg.1:34
 #, no-wrap
 msgid "INFORMATION ABOUT PACKAGES"
 msgstr "パッケージに関する情報"
 
 #. type: Plain text
-#: dpkg.1:48
+#: dpkg.1:39
 msgid ""
 "B<dpkg> maintains some usable information about available packages. The "
 "information is divided in three classes: B<states>, B<selection states> and "
@@ -2873,41 +2892,41 @@
 "に分類できる。これらの値は主に B<dselect> によって変更される。"
 
 #. type: SS
-#: dpkg.1:48
+#: dpkg.1:39
 #, no-wrap
 msgid "PACKAGE STATES"
 msgstr "パッケージ状態"
 
 #. type: TP
-#: dpkg.1:49
+#: dpkg.1:40
 #, no-wrap
 msgid "B<not-installed>"
 msgstr "B<not-installed>"
 
 #. type: Plain text
-#: dpkg.1:52
+#: dpkg.1:43
 msgid "The package is not installed on your system."
 msgstr "パッケージはシステムにインストールされていない。"
 
 #. type: TP
-#: dpkg.1:52
+#: dpkg.1:43
 #, no-wrap
 msgid "B<config-files>"
 msgstr "B<config-files>"
 
 #. type: Plain text
-#: dpkg.1:55
+#: dpkg.1:46
 msgid "Only the configuration files of the package exist on the system."
 msgstr "パッケージの設定ファイルだけが存在している。"
 
 #. type: TP
-#: dpkg.1:55
+#: dpkg.1:46
 #, no-wrap
 msgid "B<half-installed>"
 msgstr "B<half-installed>"
 
 #. type: Plain text
-#: dpkg.1:59
+#: dpkg.1:50
 msgid ""
 "The installation of the package has been started, but not completed for some "
 "reason."
@@ -2915,24 +2934,24 @@
 "パッケージのインストールは開始しているが、何らかの理由で完了していない。"
 
 #. type: TP
-#: dpkg.1:59
+#: dpkg.1:50
 #, no-wrap
 msgid "B<unpacked>"
 msgstr "B<unpacked>"
 
 #. type: Plain text
-#: dpkg.1:62
+#: dpkg.1:53
 msgid "The package is unpacked, but not configured."
 msgstr "パッケージは展開されたが、設定はされていない。"
 
 #. type: TP
-#: dpkg.1:62
+#: dpkg.1:53
 #, no-wrap
 msgid "B<half-configured>"
 msgstr "B<half-configured>"
 
 #. type: Plain text
-#: dpkg.1:66
+#: dpkg.1:57
 msgid ""
 "The package is unpacked and configuration has been started, but not yet "
 "completed for some reason."
@@ -2941,64 +2960,64 @@
 "い。"
 
 #. type: TP
-#: dpkg.1:66
+#: dpkg.1:57
 #, no-wrap
 msgid "B<triggers-awaited>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:69
+#: dpkg.1:60
 msgid "The package awaits trigger processing by another package."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:69
+#: dpkg.1:60
 #, no-wrap
 msgid "B<triggers-pending>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:72
+#: dpkg.1:63
 #, fuzzy
 msgid "The package has been triggered."
 msgstr "パッケージの展開と設定が完了している。"
 
 #. type: TP
-#: dpkg.1:72
+#: dpkg.1:63
 #, no-wrap
 msgid "B<installed>"
 msgstr "B<installed>"
 
 #. type: Plain text
-#: dpkg.1:75
+#: dpkg.1:66
 msgid "The package is unpacked and configured OK."
 msgstr "パッケージの展開と設定が完了している。"
 
 #. type: SS
-#: dpkg.1:75
+#: dpkg.1:66
 #, no-wrap
 msgid "PACKAGE SELECTION STATES"
 msgstr "パッケージ選択状態"
 
 #. type: TP
-#: dpkg.1:76
+#: dpkg.1:67
 #, no-wrap
 msgid "B<install>"
 msgstr "B<install>"
 
 #. type: Plain text
-#: dpkg.1:79
+#: dpkg.1:70
 msgid "The package is selected for installation."
 msgstr "パッケージはインストールするように選択されている。"
 
 #. type: TP
-#: dpkg.1:79
+#: dpkg.1:70
 #, no-wrap
 msgid "B<hold>"
 msgstr "B<hold>"
 
 #. type: Plain text
-#: dpkg.1:83
+#: dpkg.1:74
 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>."
@@ -3007,13 +3026,13 @@
 "い限り B<dpkg> で扱わないということである。"
 
 #. type: TP
-#: dpkg.1:83
+#: dpkg.1:74
 #, no-wrap
 msgid "B<deinstall>"
 msgstr "B<deinstall>"
 
 #. type: Plain text
-#: dpkg.1:87
+#: dpkg.1:78
 msgid ""
 "The package is selected for deinstallation (i.e. we want to remove all "
 "files, except configuration files)."
@@ -3022,13 +3041,13 @@
 "のファイルを削除したい)。"
 
 #. type: TP
-#: dpkg.1:87
+#: dpkg.1:78
 #, no-wrap
 msgid "B<purge>"
 msgstr "B<purge>"
 
 #. type: Plain text
-#: dpkg.1:91
+#: dpkg.1:82
 #, fuzzy
 #| msgid ""
 #| "The package is selected to be purged (i.e. we want to remove everything, "
@@ -3041,19 +3060,19 @@
 "イルを削除したい)。"
 
 #. type: SS
-#: dpkg.1:91
+#: dpkg.1:82
 #, no-wrap
 msgid "PACKAGE FLAGS"
 msgstr "パッケージフラグ"
 
 #. type: TP
-#: dpkg.1:92
+#: dpkg.1:83
 #, no-wrap
 msgid "B<reinst-required>"
 msgstr "B<reinst-required>"
 
 #. type: Plain text
-#: dpkg.1:97
+#: dpkg.1:88
 msgid ""
 "A package marked B<reinst-required> is broken and requires reinstallation. "
 "These packages cannot be removed, unless forced with option B<--force-remove-"
@@ -3064,39 +3083,43 @@
 "ケージは B<--force-reinstreq> で強制しない限り、削除することができない。"
 
 #. type: SH
-#: dpkg.1:98
+#: dpkg.1:89 dselect.1:120
 #, no-wrap
 msgid "ACTIONS"
 msgstr "アクション"
 
 #. type: TP
-#: dpkg.1:99
+#: dpkg.1:90
 #, fuzzy, no-wrap
-msgid "B<-i>, B<--install> I<package_file>..."
+msgid "B<-i>, B<--install> I<package-file>..."
 msgstr "B<dpkg -i> | B<--install> I<package_file>..."
 
 #. type: Plain text
-#: dpkg.1:103
+#: dpkg.1:94
+#, fuzzy
+#| msgid ""
+#| "Install the package. If B<--recursive> or B<-R> option is specified, "
+#| "I<package_file> must refer to a directory instead."
 msgid ""
 "Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"I<package-file> must refer to a directory instead."
 msgstr ""
 "指定したパッケージをインストールする。もし B<--recursive> または B<-R> オプ"
 "ションを指定する場合、I<package_file> に、参照するディレクトリを指定しなけれ"
 "ばならない。"
 
 #. type: Plain text
-#: dpkg.1:105
+#: dpkg.1:96
 msgid "Installation consists of the following steps:"
 msgstr "インストールは、以下の手順で構成されている。"
 
 #. type: Plain text
-#: dpkg.1:108
+#: dpkg.1:99
 msgid "B<1.> Extract the control files of the new package."
 msgstr "B<1.> インストールするパッケージの制御ファイルを取り出す。"
 
 #. type: Plain text
-#: dpkg.1:112
+#: dpkg.1:103
 msgid ""
 "B<2.> If another version of the same package was installed before the new "
 "installation, execute I<prerm> script of the old package."
@@ -3106,14 +3129,14 @@
 "クリプトを実行する。"
 
 #. type: Plain text
-#: dpkg.1:115
+#: dpkg.1:106
 msgid "B<3.> Run I<preinst> script, if provided by the package."
 msgstr ""
 "B<3.> もしパッケージが I<preinst> スクリプトを提供している場合、それを実行す"
 "る。"
 
 #. type: Plain text
-#: dpkg.1:119
+#: dpkg.1:110
 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."
@@ -3122,7 +3145,7 @@
 "ファイルを保存する。"
 
 #. type: Plain text
-#: dpkg.1:126
+#: dpkg.1:117
 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 "
@@ -3135,7 +3158,7 @@
 "いファイルが書き込まれるのと同時に古いファイルが削除されるためである。"
 
 #. type: Plain text
-#: dpkg.1:130
+#: dpkg.1:121
 msgid ""
 "B<6.> Configure the package. See B<--configure> for detailed information "
 "about how this is done."
@@ -3144,29 +3167,33 @@
 "の項にくわしい情報がある。"
 
 #. type: TP
-#: dpkg.1:130
+#: dpkg.1:121
 #, fuzzy, no-wrap
-msgid "B<--unpack >I<package_file>..."
+msgid "B<--unpack >I<package-file>..."
 msgstr "B<dpkg --unpack >I<package_file> ..."
 
 #. type: Plain text
-#: dpkg.1:135
+#: dpkg.1:126
+#, 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 ""
 "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."
+"option is specified, I<package-file> must refer to a directory instead."
 msgstr ""
 "パッケージを展開する、しかし設定はしない。もし B<--recursive> または B<-R> オ"
 "プションを指定する場合、I<Package_file> に、参照するディレクトリを指定しなけ"
 "ればならない。"
 
 #. type: TP
-#: dpkg.1:135
+#: dpkg.1:126
 #, fuzzy, no-wrap
 msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:140
+#: dpkg.1:131
 #, fuzzy
 #| msgid ""
 #| "Reconfigure an unpacked package. If B<-a> or B<--pending> is given "
@@ -3181,19 +3208,19 @@
 "場合、まだ設定されていない展開済みのすべてのパッケージを設定する。"
 
 #. type: Plain text
-#: dpkg.1:144
+#: dpkg.1:135
 msgid ""
 "To reconfigure a package which has already been configured, try the B<dpkg-"
 "reconfigure>(8)  command instead."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:146
+#: dpkg.1:137
 msgid "Configuring consists of the following steps:"
 msgstr "設定は、以下の手順で構成されている。"
 
 #. type: Plain text
-#: dpkg.1:151
+#: dpkg.1:142
 #, fuzzy
 msgid ""
 "B<1.> Unpack the conffiles, and at the same time back up the old conffiles, "
@@ -3203,20 +3230,20 @@
 "定ファイルを保存する。"
 
 #. type: Plain text
-#: dpkg.1:154
+#: dpkg.1:145
 msgid "B<2.> Run I<postinst> script, if provided by the package."
 msgstr ""
 "B<2.> もしパッケージが I<postinst> スクリプトを提供している場合、それを実行す"
 "る。"
 
 #. type: TP
-#: dpkg.1:154
+#: dpkg.1:145
 #, fuzzy, no-wrap
 msgid "B<--triggers-only> I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:161
+#: dpkg.1:152
 msgid ""
 "Processes only triggers. All pending triggers will be processed. If package "
 "names are supplied only those packages' triggers will be processed, exactly "
@@ -3226,13 +3253,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:161
+#: dpkg.1:152
 #, fuzzy, no-wrap
 msgid "B<-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:178
+#: dpkg.1:169
 #, fuzzy
 msgid ""
 "Remove an installed package. B<-r> or B<--remove> remove everything except "
@@ -3258,33 +3285,33 @@
 "持つすべての展開済みパッケージを、それぞれ remove または purge する。"
 
 #. type: Plain text
-#: dpkg.1:180
+#: dpkg.1:171
 msgid "Removing of a package consists of the following steps:"
 msgstr "パッケージの削除は以下の手順で構成されている。"
 
 #. type: Plain text
-#: dpkg.1:183
+#: dpkg.1:174
 msgid "B<1.> Run I<prerm> script"
 msgstr "B<1.> I<prerm> スクリプトを実行する。"
 
 #. type: Plain text
-#: dpkg.1:186
+#: dpkg.1:177
 msgid "B<2.> Remove the installed files"
 msgstr "B<2.> インストールしたファイルを削除する。"
 
 #. type: Plain text
-#: dpkg.1:189
+#: dpkg.1:180
 msgid "B<3.> Run I<postrm> script"
 msgstr "B<3.> I<postrm> スクリプトを実行する。"
 
 #. type: TP
-#: dpkg.1:190
+#: dpkg.1:181
 #, fuzzy, no-wrap
 msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
 
 #. type: Plain text
-#: dpkg.1:199
+#: dpkg.1:190
 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 "
@@ -3301,7 +3328,7 @@
 "available> に記録する。"
 
 #. type: Plain text
-#: dpkg.1:204
+#: dpkg.1:195
 msgid ""
 "A simpler one-shot command to retrieve and update the I<available> file is "
 "B<dselect update>. Note that this file is mostly useless if you don't use "
@@ -3310,17 +3337,22 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:204
+#: dpkg.1:195
 #, fuzzy, no-wrap
-msgid "B<-A>, B<--record-avail> I<package_file>..."
+msgid "B<-A>, B<--record-avail> I<package-file>..."
 msgstr "B<dpkg -A> | B<--record-avail> I<package_file> ..."
 
 #. type: Plain text
-#: dpkg.1:210
+#: dpkg.1:201
+#, 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."
 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."
+"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> または "
@@ -3328,37 +3360,37 @@
 "定しなければならない。"
 
 #. type: TP
-#: dpkg.1:210
+#: dpkg.1:201
 #, fuzzy, no-wrap
 msgid "B<--forget-old-unavail>"
 msgstr "B<dpkg --forget-old-unavail>"
 
 #. type: Plain text
-#: dpkg.1:214
+#: dpkg.1:205
 msgid ""
 "Now B<obsolete> and a no-op as B<dpkg> will automatically forget uninstalled "
 "unavailable packages."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:214
+#: dpkg.1:205
 #, fuzzy, no-wrap
 msgid "B<--clear-avail>"
 msgstr "B<dpkg --clear-avail>"
 
 #. type: Plain text
-#: dpkg.1:217
+#: dpkg.1:208
 msgid "Erase the existing information about what packages are available."
 msgstr "利用可能なパッケージの情報を消去する。"
 
 #. type: TP
-#: dpkg.1:217
+#: dpkg.1:208
 #, fuzzy, no-wrap
 msgid " B<-C>, B<--audit>"
 msgstr "B<-q>|B<--quiet>"
 
 #. type: Plain text
-#: dpkg.1:222
+#: dpkg.1:213
 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."
@@ -3367,13 +3399,13 @@
 "せるためにどうすればよいかを提案する。"
 
 #. type: TP
-#: dpkg.1:222
+#: dpkg.1:213
 #, fuzzy, no-wrap
 msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr "B<dpkg --get-selections> [I<package-name-pattern>...]"
 
 #. type: Plain text
-#: dpkg.1:227
+#: dpkg.1:218
 #, fuzzy
 msgid ""
 "Get list of package selections, and write it to stdout. Without a pattern, "
@@ -3384,18 +3416,24 @@
 "態のパッケージは表示されない。"
 
 #. type: TP
-#: dpkg.1:227 update-alternatives.8:300
+#: dpkg.1:218 update-alternatives.8:299
 #, fuzzy, no-wrap
 msgid "B<--set-selections>"
 msgstr "B<dpkg --set-selections>"
 
 #. type: Plain text
-#: dpkg.1:233
+#: dpkg.1:224
+#, 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."
 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 format 'I<package> I<state>', where state is one of B<install>, B<hold>, "
+"B<deinstall> or B<purge>. Blank lines and comment lines beginning with '#' "
+"are also permitted."
 msgstr ""
 "パッケージ選択リストを標準入力から読み込んで設定する。ファイルの形式は "
 "'E<lt>packageE<gt> E<lt>stateE<gt>' でなければならない。state は、install、"
@@ -3403,13 +3441,13 @@
 "ント行を使用してもよい。"
 
 #. type: TP
-#: dpkg.1:233
+#: dpkg.1:224
 #, fuzzy, no-wrap
 msgid "B<--clear-selections>"
 msgstr "B<dpkg --clear-selections>"
 
 #. type: Plain text
-#: dpkg.1:238
+#: dpkg.1:229
 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 "
@@ -3420,13 +3458,13 @@
 "selections の直前に使うためのものである。"
 
 #. type: TP
-#: dpkg.1:238
+#: dpkg.1:229
 #, fuzzy, no-wrap
 msgid "B<--yet-to-unpack>"
 msgstr "B<dpkg --yet-to-unpack>"
 
 #. type: Plain text
-#: dpkg.1:242
+#: dpkg.1:233
 msgid ""
 "Searches for packages selected for installation, but which for some reason "
 "still haven't been installed."
@@ -3435,25 +3473,25 @@
 "いパッケージを探す。"
 
 #. type: TP
-#: dpkg.1:243
+#: dpkg.1:234
 #, fuzzy, no-wrap
 msgid "B<--print-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg.1:246
+#: dpkg.1:237
 msgid ""
 "Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr "B<dpkg> のインストールするアーキテクチャ(例えば、\"i386\")を表示する。"
 
 #. type: TP
-#: dpkg.1:246
+#: dpkg.1:237
 #, fuzzy, no-wrap
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
 #. type: Plain text
-#: dpkg.1:257
+#: dpkg.1:248
 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 "
@@ -3473,90 +3511,89 @@
 "ルの文法との互換性のためだけに提供されている。"
 
 #. type: TP
-#: dpkg.1:257
+#: dpkg.1:248
 #, fuzzy, no-wrap
-msgid "B<--command-fd >I<E<lt>nE<gt>>"
+msgid "B<--command-fd >I<n>"
 msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:262
+#: dpkg.1:253
 #, fuzzy
 msgid ""
-"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and through this file "
-"descriptor, are not reset for subsequent commands executed during the same "
-"run."
+"Accept a series of commands on input file descriptor I<n>. Note: additional "
+"options set on the command line, and through this file descriptor, are not "
+"reset for subsequent commands executed during the same run."
 msgstr ""
 "ファイル記述子 B<E<lt>nE<gt>> から一連のコマンドをうけいれる。注意: 追加のオ"
 "プションはコマンドラインとこのファイル記述子を通じて指定でき、一回の実行を通"
 "じてそれらがリセットされることはない。"
 
 #. type: TP
-#: dpkg.1:262 dpkg-architecture.1:61 dpkg-buildflags.1:71 dpkg-divert.8:71
-#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
-#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
+#: dpkg.1:253 dpkg-architecture.1:60 dpkg-buildflags.1:89 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:66 dpkg-statoverride.8:44
+#: dpkg-vendor.1:28 dselect.1:113 update-alternatives.8:316
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 #. type: Plain text
-#: dpkg.1:265
+#: dpkg.1:256
 msgid "Display a brief help message."
 msgstr "簡単なオプション一覧を表示する。"
 
 #. type: TP
-#: dpkg.1:265
+#: dpkg.1:256
 #, fuzzy, no-wrap
 msgid "B<--force-help>"
 msgstr "B<dpkg --force-help>"
 
 #. type: Plain text
-#: dpkg.1:268
+#: dpkg.1:259
 msgid "Give help about the B<--force->I<thing> options."
 msgstr "B<--force->I<thing> オプション一覧を表示する。"
 
 #. type: TP
-#: dpkg.1:268
+#: dpkg.1:259
 #, fuzzy, no-wrap
 msgid "B<-Dh>, B<--debug=help>"
 msgstr "B<--debug>"
 
 #. type: Plain text
-#: dpkg.1:271
+#: dpkg.1:262
 msgid "Give help about debugging options."
 msgstr "デバッグ用オプション一覧を表示する。"
 
 #. type: TP
-#: dpkg.1:271 dpkg-architecture.1:64 dpkg-buildflags.1:74
+#: dpkg.1:262 dpkg-architecture.1:63 dpkg-buildflags.1:92
 #: dpkg-buildpackage.1:226 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
-#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
-#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
-#: dpkg-shlibdeps.1:220 dpkg-source.1:93 dpkg-split.1:130
-#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
-#: update-alternatives.8:320
+#: dpkg-deb.1:175 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:113 dpkg-scanpackages.1:99 dpkg-scansources.1:68
+#: dpkg-shlibdeps.1:218 dpkg-source.1:99 dpkg-split.1:129
+#: dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:116
+#: update-alternatives.8:319
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg.1:274
+#: dpkg.1:265
 msgid "Display B<dpkg> version information."
 msgstr "B<dpkg> のバージョン情報を表示する。"
 
 #. type: TP
-#: dpkg.1:274
+#: dpkg.1:265
 #, no-wrap
 msgid "B<dpkg-deb actions>"
 msgstr "B<dpkg-deb actions>"
 
 #. type: Plain text
-#: dpkg.1:277
+#: dpkg.1:268
 msgid "See B<dpkg-deb>(1) for more information about the following actions."
 msgstr "以下のアクションのくわしい情報は B<dpkg-deb>(1) を参照すること。"
 
 #. type: Plain text
-#: dpkg.1:297
+#: dpkg.1:288
 #, fuzzy, no-wrap
 msgid ""
 "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
@@ -3596,18 +3633,18 @@
 "    パッケージに含まれるファイルを展開し、ファイル名を表示する。\n"
 
 #. type: TP
-#: dpkg.1:299
+#: dpkg.1:290
 #, no-wrap
 msgid "B<dpkg-query actions>"
 msgstr "B<dpkg-query actions>"
 
 #. type: Plain text
-#: dpkg.1:302
+#: dpkg.1:293
 msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr "以下のアクションの詳細は、B<dpkg-query>(1) を参照すること。"
 
 #. type: Plain text
-#: dpkg.1:317
+#: dpkg.1:308
 #, fuzzy, no-wrap
 msgid ""
 "B<-l>, B<--list> I<package-name-pattern>...\n"
@@ -3635,20 +3672,20 @@
 "    I</var/lib/dpkg/available> にある I<package> の詳細情報を表示する。\n"
 
 #. type: SH
-#: dpkg.1:319 dpkg-architecture.1:68 dpkg-buildpackage.1:50
-#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
+#: dpkg.1:310 dpkg-architecture.1:67 dpkg-buildpackage.1:50
+#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:179
 #: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
-#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
-#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
-#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
-#: start-stop-daemon.8:100 update-alternatives.8:324
+#: dpkg-gensymbols.1:369 dpkg-mergechangelogs.1:27 dpkg-name.1:30
+#: dpkg-parsechangelog.1:15 dpkg-query.1:117 dpkg-scanpackages.1:71
+#: dpkg-scansources.1:44 dpkg-shlibdeps.1:106 dpkg-split.1:133
+#: dpkg-statoverride.8:51 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:36
+#: start-stop-daemon.8:103 update-alternatives.8:323
 #, no-wrap
 msgid "OPTIONS"
 msgstr "オプション"
 
 #. type: Plain text
-#: dpkg.1:325
+#: dpkg.1:316
 #, fuzzy
 #| msgid ""
 #| "All options can be specified both on the command line and in the B<dpkg> "
@@ -3668,24 +3705,24 @@
 "トである。"
 
 #. type: TP
-#: dpkg.1:326
+#: dpkg.1:317
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<number>"
 
 #. type: Plain text
-#: dpkg.1:329
+#: dpkg.1:320
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr "B<dpkg> の処理を中断させるエラー数を変更する。デフォルトは 50 である。"
 
 #. type: TP
-#: dpkg.1:329
+#: dpkg.1:320
 #, fuzzy, no-wrap
 msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 #. type: Plain text
-#: dpkg.1:335
+#: dpkg.1:326
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -3697,13 +3734,13 @@
 "依存しているパッケージの設定を取り消す。"
 
 #. type: TP
-#: dpkg.1:335
+#: dpkg.1:326
 #, fuzzy, 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:341
+#: dpkg.1:332
 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 "
@@ -3714,7 +3751,7 @@
 "るので注意すること)。B<-Dh> または B<--debug=help> はこれらの値を表示する。"
 
 #. type: Plain text
-#: dpkg.1:356
+#: dpkg.1:347
 #, fuzzy, no-wrap
 msgid ""
 "    Number   Description\n"
@@ -3745,13 +3782,13 @@
 " 2000   正気でないほどの大量の情報\n"
 
 #. type: TP
-#: dpkg.1:356
+#: dpkg.1:347
 #, fuzzy, 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:363
+#: dpkg.1:354
 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<--"
@@ -3764,7 +3801,7 @@
 "のは、デフォルトで強制実行される。"
 
 #. type: Plain text
-#: dpkg.1:367
+#: dpkg.1:358
 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 "
@@ -3775,12 +3812,12 @@
 "まうかもしれない。>"
 
 #. type: Plain text
-#: dpkg.1:370
+#: dpkg.1:361
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: 全ての強制オプションを指定する(または打ち消す)。"
 
 #. type: Plain text
-#: dpkg.1:373
+#: dpkg.1:364
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
@@ -3789,7 +3826,7 @@
 "指定したパッケージをインストールする。"
 
 #. type: Plain text
-#: dpkg.1:380
+#: dpkg.1:371
 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 "
@@ -3804,7 +3841,7 @@
 "すること。>"
 
 #. type: Plain text
-#: dpkg.1:384
+#: dpkg.1:375
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
@@ -3813,13 +3850,13 @@
 "まだ設定されていないパッケージも一緒に設定をする。"
 
 #. type: Plain text
-#: dpkg.1:387
+#: dpkg.1:378
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr ""
 "B<hold>: たとえ \"hold\" とマークされていても、そのパッケージの処理をする。"
 
 #. type: Plain text
-#: dpkg.1:392
+#: dpkg.1:383
 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 "
@@ -3830,7 +3867,7 @@
 "管理されないで残るなどの問題がおこるかもしれない。"
 
 #. type: Plain text
-#: dpkg.1:397
+#: dpkg.1:388
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -3842,23 +3879,23 @@
 "して削除すること。"
 
 #. type: Plain text
-#: dpkg.1:400
+#: dpkg.1:391
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr "B<depends>: すべての依存問題を警告に変える。"
 
 #. type: Plain text
-#: dpkg.1:403
+#: dpkg.1:394
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr "B<depends-version>: 依存関係の確認をするとき、バージョンを無視する。"
 
 #. type: Plain text
-#: dpkg.1:406
+#: dpkg.1:397
 msgid "B<breaks>: Install, even if this would break another package."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:410
+#: dpkg.1:401
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
@@ -3867,7 +3904,7 @@
 "ファイルを上書きすることになるため、危険である。"
 
 #. type: Plain text
-#: dpkg.1:415
+#: dpkg.1:406
 #, fuzzy
 msgid ""
 "B<confmiss>: Always install a missing conffile. This is dangerous, since it "
@@ -3877,7 +3914,7 @@
 "は、変更(ファイルを削除したこと)を保存しないため、危険である。"
 
 #. type: Plain text
-#: dpkg.1:420
+#: dpkg.1:411
 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 "
@@ -3888,7 +3925,7 @@
 "た場合は、デフォルトの動作が優先される。"
 
 #. type: Plain text
-#: dpkg.1:425
+#: dpkg.1:416
 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 "
@@ -3899,7 +3936,7 @@
 "デフォルトの動作が優先される。"
 
 #. type: Plain text
-#: dpkg.1:431
+#: dpkg.1:422
 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 "
@@ -3912,7 +3949,7 @@
 "されたオプションによって最終的な動作が決まる。"
 
 #. type: Plain text
-#: dpkg.1:438
+#: dpkg.1:429
 #, fuzzy
 #| msgid ""
 #| "B<confdef>: If a conffile has been modified always choose the default "
@@ -3932,21 +3969,21 @@
 "されたオプションによって最終的な動作が決まる。"
 
 #. type: Plain text
-#: dpkg.1:441
+#: dpkg.1:432
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
 "B<overwrite>: あるパッケージで提供されているファイルを、インストールするパッ"
 "ケージのファイルで上書きする。"
 
 #. type: Plain text
-#: dpkg.1:444
+#: dpkg.1:435
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 "B<overwrite-dir>: あるパッケージで提供されているディレクトリを、インストール"
 "するパッケージのファイルで上書きする。"
 
 #. type: Plain text
-#: dpkg.1:447
+#: dpkg.1:438
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
@@ -3954,7 +3991,7 @@
 "い)版のファイルで上書きする。"
 
 #. type: Plain text
-#: dpkg.1:455
+#: dpkg.1:446
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking. Currently "
 "this implies not performing file system syncs before file renames, which is "
@@ -3965,7 +4002,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:461
+#: dpkg.1:452
 msgid ""
 "I<Note>: For ext4, the main offender, consider using instead the mount "
 "option B<nodelalloc>, which will fix both the performance degradation and "
@@ -3975,14 +4012,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:464
+#: dpkg.1:455
 msgid ""
 "I<Warning: Using this option might improve performance at the cost of losing "
 "data, use with care.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:467
+#: dpkg.1:458
 #, fuzzy
 #| msgid "B<architecture>: Process even packages with the wrong architecture."
 msgid "B<architecture>: Process even packages with wrong or no architecture."
@@ -3990,7 +4027,15 @@
 "B<architecture>: パッケージが間違ったアーキテクチャ用であっても処理をする。"
 
 #. type: Plain text
-#: dpkg.1:470
+#: dpkg.1:461
+#, fuzzy
+#| msgid "B<architecture>: Process even packages with the wrong architecture."
+msgid "B<bad-version>: Process even packages with wrong versions."
+msgstr ""
+"B<architecture>: パッケージが間違ったアーキテクチャ用であっても処理をする。"
+
+#. type: Plain text
+#: dpkg.1:464
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -3998,25 +4043,25 @@
 "起きる可能性は高い。"
 
 #. type: Plain text
-#: dpkg.1:473
+#: dpkg.1:467
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
 "B<not-root>: root でないときでも、それをインストール(または削除)しようと試み"
 "る。"
 
 #. type: Plain text
-#: dpkg.1:476
+#: dpkg.1:470
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr "B<bad-verify>: 信頼性チェックに失敗してもインストールする。"
 
 #. type: TP
-#: dpkg.1:477
+#: dpkg.1:471
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<package>,..."
 
 #. type: Plain text
-#: dpkg.1:481
+#: dpkg.1:475
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
@@ -4025,53 +4070,24 @@
 "競合に対して警告メッセージを出して、アクションを実行する)。"
 
 #. type: TP
-#: dpkg.1:481
+#: dpkg.1:475
 #, fuzzy, no-wrap
-msgid "B<--new>, B<--old>"
-msgstr "B<--new> | B<--old>"
+msgid "B<--no-act>, B<--dry-run>, B<--simulate>"
+msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
 
 #. type: Plain text
-#: dpkg.1:485
+#: dpkg.1:480
 msgid ""
-"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
-msgstr ""
-"パッケージのフォーマットが新しいか古いかを指定する。これは B<dpkg-deb>(1) の"
-"オプションである。"
-
-#. type: TP
-#: dpkg.1:485 dpkg-deb.1:209
-#, no-wrap
-msgid "B<--nocheck>"
-msgstr "B<--nocheck>"
-
-#. type: Plain text
-#: dpkg.1:489
-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.1:489
-#, fuzzy, 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:494
-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."
+"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.1:499
+#: dpkg.1:485
 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 "
@@ -4085,13 +4101,13 @@
 "うことになる)。"
 
 #. type: TP
-#: dpkg.1:499
+#: dpkg.1:485
 #, fuzzy, no-wrap
 msgid "B<-R>, B<--recursive>"
 msgstr "B<-R> | B<--recursive>"
 
 #. type: Plain text
-#: dpkg.1:505
+#: dpkg.1:491
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -4102,13 +4118,13 @@
 "そして B<--avail> アクションとともに使うことができる。"
 
 #. type: TP
-#: dpkg.1:505
+#: dpkg.1:491
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg.1:509
+#: dpkg.1:495
 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>."
@@ -4117,14 +4133,14 @@
 "い。これは B<--refuse-downgrade> の別名である。"
 
 #. type: TP
-#: dpkg.1:509 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
-#: dpkg-query.1:112 dpkg-shlibdeps.1:213 dpkg-trigger.1:39
+#: dpkg.1:495 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
+#: dpkg-query.1:118 dpkg-shlibdeps.1:211 dpkg-trigger.1:39
 #, no-wrap
 msgid "B<--admindir=>I<dir>"
 msgstr "B<--admindir=>I<dir>"
 
 #. type: Plain text
-#: dpkg.1:514
+#: dpkg.1:500
 msgid ""
 "Change default administrative directory, which contains many files that give "
 "information about status of installed or uninstalled packages, etc.  "
@@ -4132,13 +4148,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:514
+#: dpkg.1:500
 #, fuzzy, no-wrap
 msgid "B<--instdir=>I<dir>"
 msgstr "B<--admindir=>I<dir>"
 
 #. type: Plain text
-#: dpkg.1:521
+#: dpkg.1:507
 #, fuzzy
 msgid ""
 "Change default installation directory which refers to the directory where "
@@ -4156,26 +4172,26 @@
 "B<instdir> を I<dir> に、B<admindir> を I<dir>B</var/lib/dpkg> に変更する。"
 
 #. type: TP
-#: dpkg.1:521
+#: dpkg.1:507
 #, fuzzy, no-wrap
 msgid "B<--root=>I<dir>"
 msgstr "B<--admindir=>I<dir>"
 
 #. type: Plain text
-#: dpkg.1:525
+#: dpkg.1:511
 msgid ""
 "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 "var/lib/dpkg>."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:525
+#: dpkg.1:511
 #, fuzzy, no-wrap
 msgid "B<-O>, B<--selected-only>"
 msgstr "B<-O> | B<--selected-only>"
 
 #. type: Plain text
-#: dpkg.1:531
+#: dpkg.1:517
 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 "
@@ -4187,13 +4203,13 @@
 "除されるのは、そのパッケージが削除されるよう選択されているということである。"
 
 #. type: TP
-#: dpkg.1:531
+#: dpkg.1:517
 #, fuzzy, no-wrap
 msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E> | B<--skip-same-version>"
 
 #. type: Plain text
-#: dpkg.1:535
+#: dpkg.1:521
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
@@ -4202,17 +4218,17 @@
 "い。"
 
 #. type: Plain text
-#: dpkg.1:537
+#: dpkg.1:523
 msgid "B<--pre-invoke=>I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:539
+#: dpkg.1:525
 msgid "B<--post-invoke=>I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:548
+#: dpkg.1:534
 msgid ""
 "Set an invoke hook I<command> to be run via ``sh -c'' before or after the "
 "dpkg run for the I<unpack>, I<configure>, I<install>, I<triggers-only>, "
@@ -4225,33 +4241,33 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:551
+#: dpkg.1:537
 #, fuzzy
 msgid "B<--path-exclude=>I<glob-pattern>"
 msgstr "B<--list> [I<E<lt>glob-patternE<gt>>]"
 
 #. type: Plain text
-#: dpkg.1:553
+#: dpkg.1:539
 #, fuzzy
 msgid "B<--path-include=>I<glob-pattern>"
 msgstr "B<--list> [I<E<lt>glob-patternE<gt>>]"
 
 #. type: Plain text
-#: dpkg.1:556
+#: dpkg.1:542
 msgid ""
 "Set I<glob-pattern> as a path filter, either by excluding or re-including "
 "previously excluded paths matching the specified patterns during install."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:559
+#: dpkg.1:545
 msgid ""
 "I<Warning: take into account that depending on the excluded paths you might "
 "completely break your system, use with caution.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:569
+#: dpkg.1:555
 msgid ""
 "The glob patterns use the same wildcards used in the shell, were '*' matches "
 "any sequence of characters, including the empty string and also '/'. For "
@@ -4265,14 +4281,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:572
+#: dpkg.1:558
 msgid ""
 "This can be used to remove all paths except some particular ones; a typical "
 "case is:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:576
+#: dpkg.1:562
 #, no-wrap
 msgid ""
 "B<--path-exclude=/usr/share/doc/*>\n"
@@ -4280,12 +4296,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:579
+#: dpkg.1:565
 msgid "to remove all documentation files except the copyright files."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:583
+#: dpkg.1:569
 msgid ""
 "These two options can be specified multiple times, and interleaved with each "
 "other. Both are processed in the given order, with the last rule that "
@@ -4293,13 +4309,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:584
+#: dpkg.1:570
 #, fuzzy, no-wrap
 msgid "B<--status-fd >I<n>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:590
+#: dpkg.1:576
 msgid ""
 "Send machine-readable package status and progress information to file "
 "descriptor I<n>. This option can be specified multiple times. The "
@@ -4307,48 +4323,48 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:591
+#: dpkg.1:577
 #, no-wrap
 msgid "B<status: >I<package>B<: >I<status>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:594
+#: dpkg.1:580
 msgid "Package status changed; I<status> is as in the status file."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:594
+#: dpkg.1:580
 #, no-wrap
 msgid "B<status: >I<package>B< : error : >I<extended-error-message>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:598
+#: dpkg.1:584
 msgid ""
 "An error occurred. Any possible newlines in I<extended-error-message> will "
 "be converted to spaces before output."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:598
+#: dpkg.1:584
 #, no-wrap
 msgid "B<status: >I<file>B< : conffile-prompt : '>I<real-old>B<' '>I<real-new>B<' >I<useredited>B< >I<distedited>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:601
+#: dpkg.1:587
 msgid "User is being asked a conffile question."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:601
+#: dpkg.1:587
 #, no-wrap
 msgid "B<processing: >I<stage>B<: >I<package>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:606
+#: dpkg.1:592
 msgid ""
 "Sent just before a processing stage starts. I<stage> is one of B<upgrade>, "
 "B<install> (both sent before unpacking), B<configure>, B<trigproc>, "
@@ -4356,13 +4372,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:607
+#: dpkg.1:593
 #, fuzzy, no-wrap
 msgid "B<--status-logger>=I<command>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:612
+#: dpkg.1:598
 msgid ""
 "Send machine-readable package status and progress information to the shell "
 "I<command>'s standard input. This option can be specified multiple times. "
@@ -4370,23 +4386,34 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:613
+#: dpkg.1:599
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: dpkg.1:625
+#: dpkg.1:611
+#, 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."
 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."
+"I<state> I<pkg> I<installed-version>' for status change updates; `YYYY-MM-DD "
+"HH:MM:SS I<action> I<pkg> I<installed-version> I<available-version>' for "
+"actions where I<action> is one of B<install>, B<upgrade>, B<remove>, "
+"B<purge>; and `YYYY-MM-DD HH:MM:SS conffile I<filename> I<decision>' for "
+"conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 "状態の変更やアクションの記録を、デフォルトの I</var/log/dpkg.log> から "
 "I<filename> に変更する。このオプションを複数回指定した場合は、最後のファイル"
@@ -4399,24 +4426,24 @@
 "変更で、I<E<lt>decisionE<gt>> は install か keep のどちらかである。"
 
 #. type: TP
-#: dpkg.1:625
+#: dpkg.1:611
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--no-debsig>"
 
 #. type: Plain text
-#: dpkg.1:628
+#: dpkg.1:614
 msgid "Do not try to verify package signatures."
 msgstr "パッケージの署名を確認しない。"
 
 #. type: TP
-#: dpkg.1:628
+#: dpkg.1:614
 #, fuzzy, no-wrap
 msgid "B<--no-triggers>"
 msgstr "B<--no-debsig>"
 
 #. type: Plain text
-#: dpkg.1:637
+#: dpkg.1:623
 msgid ""
 "Do not run any triggers in this run (activations will still be recorded).  "
 "If used with B<--configure> I<package> or B<--triggers-only> I<package> then "
@@ -4427,42 +4454,42 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:637
+#: dpkg.1:623
 #, fuzzy, no-wrap
 msgid "B<--triggers>"
 msgstr "B<--test>"
 
 #. type: Plain text
-#: dpkg.1:640
+#: dpkg.1:626
 msgid "Cancels a previous B<--no-triggers>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:642 dpkg.cfg.5:16
+#: dpkg.1:628 dpkg.cfg.5:16
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.1:645
+#: dpkg.1:631
 msgid "Configuration file with default options."
 msgstr "オプションのデフォルト値を記述する設定ファイル。"
 
 #. type: TP
-#: dpkg.1:645
+#: dpkg.1:631
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/log/dpkg.log>"
 
 #. type: Plain text
-#: dpkg.1:649
+#: dpkg.1:635
 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.1:652
+#: dpkg.1:638
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
@@ -4471,24 +4498,24 @@
 "するかについては、B<--admindir> オプションの項を参照すること。"
 
 #. type: TP
-#: dpkg.1:652
+#: dpkg.1:638
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg.1:655
+#: dpkg.1:641
 msgid "List of available packages."
 msgstr "使用できるパッケージの一覧。"
 
 #. type: TP
-#: dpkg.1:655
+#: dpkg.1:641
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 #. type: Plain text
-#: dpkg.1:661
+#: dpkg.1:647
 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, "
@@ -4499,14 +4526,14 @@
 "パッケージに関する情報>の項を参照すること。"
 
 #. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:650
 msgid ""
 "The status file is backed up daily in I</var/backups>. It can be useful if "
 "it's lost or corrupted due to filesystems troubles."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:653
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
@@ -4515,109 +4542,109 @@
 "に関するくわしい情報は、B<deb>(5) を参照すること。"
 
 #. type: TP
-#: dpkg.1:667
+#: dpkg.1:653
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 #. type: TP
-#: dpkg.1:669
+#: dpkg.1:655
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 #. type: TP
-#: dpkg.1:671
+#: dpkg.1:657
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 #. type: TP
-#: dpkg.1:673
+#: dpkg.1:659
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 #. type: TP
-#: dpkg.1:675
+#: dpkg.1:661
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 #. type: TP
-#: dpkg.1:677
+#: dpkg.1:663
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 #. type: SH
-#: dpkg.1:680 dpkg-buildflags.1:110 dpkg-buildpackage.1:230 dpkg-deb.1:219
-#: dpkg-divert.8:112 dpkg-query.1:196 dpkg-statoverride.8:69 dpkg-trigger.1:60
-#: dpkg-vendor.1:42 dselect.1:430 update-alternatives.8:355
+#: dpkg.1:666 dpkg-buildflags.1:128 dpkg-buildpackage.1:230 dpkg-deb.1:232
+#: dpkg-divert.8:112 dpkg-query.1:204 dpkg-statoverride.8:68 dpkg-trigger.1:60
+#: dpkg-vendor.1:42 dselect.1:423 update-alternatives.8:354
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "環境変数"
 
 #. type: TP
-#: dpkg.1:681 dselect.1:431
+#: dpkg.1:667 dselect.1:424
 #, fuzzy, no-wrap
 #| msgid "B<SHELL>"
 msgid "B<HOME>"
 msgstr "B<SHELL>"
 
 #. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:671
 msgid ""
 "If set, B<dpkg> will use it as the directory from which to read the user "
 "specific configuration file."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:685 dpkg-deb.1:220
+#: dpkg.1:671 dpkg-deb.1:233
 #, no-wrap
 msgid "B<TMPDIR>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:689
+#: dpkg.1:675
 msgid ""
 "If set, B<dpkg> will use it as the directory in which to create temporary "
 "files and directories."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:689
+#: dpkg.1:675
 #, fuzzy, no-wrap
 #| msgid "B<-G>"
 msgid "B<PAGER>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg.1:692
+#: dpkg.1:678
 #, fuzzy
 #| msgid "The program B<dpkg> will execute when starting a new shell."
 msgid "The program B<dpkg> will execute when displaying the conffiles."
 msgstr "B<dpkg> が新しいシェルを起動するときに、実際に起動するプログラム。"
 
 #. type: TP
-#: dpkg.1:692
+#: dpkg.1:678
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 #. type: Plain text
-#: dpkg.1:695
+#: dpkg.1:681
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr "B<dpkg> が新しいシェルを起動するときに、実際に起動するプログラム。"
 
 #. type: TP
-#: dpkg.1:695 dpkg-query.1:201
+#: dpkg.1:681 dpkg-query.1:209
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 #. type: Plain text
-#: dpkg.1:699
+#: dpkg.1:685
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
@@ -4626,145 +4653,145 @@
 "のみ参照されている。"
 
 #. type: TP
-#: dpkg.1:699
+#: dpkg.1:685
 #, no-wrap
 msgid "B<DPKG_SHELL_REASON>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:689
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Current valid value: B<conffile-prompt>."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:703
+#: dpkg.1:689
 #, no-wrap
 msgid "B<DPKG_CONFFILE_OLD>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:707
+#: dpkg.1:693
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the old conffile."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:707
+#: dpkg.1:693
 #, no-wrap
 msgid "B<DPKG_CONFFILE_NEW>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:711
+#: dpkg.1:697
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the new conffile."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:711
+#: dpkg.1:697
 #, no-wrap
 msgid "B<DPKG_RUNNING_VERSION>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:715
+#: dpkg.1:701
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the version of "
 "the currently running B<dpkg> instance."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:715 dpkg-divert.8:117
+#: dpkg.1:701 dpkg-divert.8:117
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
-#: dpkg.1:719
+#: dpkg.1:705
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the package name "
 "being handled."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:719
+#: dpkg.1:705
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_MAINTSCRIPT_ARCH>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:709
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the architecture "
 "the package got built for."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:723
+#: dpkg.1:709
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_MAINTSCRIPT_NAME>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
-#: dpkg.1:727
+#: dpkg.1:713
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the name of the "
 "script running (preinst, postinst, prerm, postrm)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:730
+#: dpkg.1:716
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr "B<vi>(1) エディタに関連のあるパッケージの一覧を表示する。"
 
 #. type: Plain text
-#: dpkg.1:732
+#: dpkg.1:718
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 
 #. type: Plain text
-#: dpkg.1:735
+#: dpkg.1:721
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr "2 つのパッケージの I</var/lib/dpkg/available> にある項目を表示する。"
 
 #. type: Plain text
-#: dpkg.1:737
+#: dpkg.1:723
 #, 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:740
+#: dpkg.1:726
 msgid "To search the listing of packages yourself:"
 msgstr "自分でパッケージのリストから検索する。"
 
 #. type: Plain text
-#: dpkg.1:742
+#: dpkg.1:728
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "     B<less /var/lib/dpkg/available>\n"
 
 #. type: Plain text
-#: dpkg.1:745
+#: dpkg.1:731
 msgid "To remove an installed elvis package:"
 msgstr "elvis パッケージを削除する。"
 
 #. type: Plain text
-#: dpkg.1:747
+#: dpkg.1:733
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "     B<dpkg -r elvis>\n"
 
 #. type: Plain text
-#: dpkg.1:752
+#: dpkg.1:738
 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\":"
@@ -4774,7 +4801,7 @@
 "セクションに属している。"
 
 #. type: Plain text
-#: dpkg.1:755
+#: dpkg.1:741
 #, fuzzy, no-wrap
 msgid ""
 "     B<cd /media/cdrom/pool/main/v/vim>\n"
@@ -4784,24 +4811,24 @@
 "     B<dpkg -i vim_4.5-3.deb>\n"
 
 #. type: Plain text
-#: dpkg.1:758
+#: dpkg.1:744
 msgid "To make a local copy of the package selection states:"
 msgstr "パッケージ選択状況のコピーを作成する。"
 
 #. type: Plain text
-#: dpkg.1:760
+#: dpkg.1:746
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr "     B<dpkg --get-selections E<gt>myselections>\n"
 
 #. type: Plain text
-#: dpkg.1:764
+#: dpkg.1:750
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr "このファイルをほかのコンピュータに転送して、インストールする。"
 
 #. type: Plain text
-#: dpkg.1:767
+#: dpkg.1:753
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -4811,7 +4838,7 @@
 "     B<dpkg --set-selections E<lt>myselections>\n"
 
 #. type: Plain text
-#: dpkg.1:773
+#: dpkg.1:759
 #, fuzzy
 msgid ""
 "Note that this will not actually install or remove anything, but just set "
@@ -4825,7 +4852,7 @@
 "B<dselect> を起動して、\"導入(Install)\" を選べばよい。"
 
 #. type: Plain text
-#: dpkg.1:776
+#: dpkg.1:762
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
@@ -4834,13 +4861,13 @@
 "ある。"
 
 #. type: SH
-#: dpkg.1:778
+#: dpkg.1:764
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr "機能の追加"
 
 #. type: Plain text
-#: dpkg.1:781
+#: dpkg.1:767
 #, fuzzy
 msgid ""
 "Additional functionality can be gained by installing any of the following "
@@ -4850,7 +4877,7 @@
 "加できる。"
 
 #. type: Plain text
-#: dpkg.1:793
+#: dpkg.1:779
 #, fuzzy
 msgid ""
 "B<aptitude>(1), B<apt>(1), B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), "
@@ -4860,12 +4887,12 @@
 "(5), B<dpkg.cfg>(5), B<dpkg-reconfigure>(8)."
 
 #. type: Plain text
-#: dpkg.1:796
+#: dpkg.1:782
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> の提供する情報はたいていの場合、不充分である。"
 
 #. type: Plain text
-#: dpkg.1:799 dpkg.cfg.5:22
+#: dpkg.1:785 dpkg.cfg.5:22
 #, fuzzy
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
@@ -4880,12 +4907,6 @@
 msgid "dpkg-architecture"
 msgstr "B<dpkg --print-architecture>"
 
-#. type: TH
-#: dpkg-architecture.1:1
-#, fuzzy, no-wrap
-msgid "2009-08-15"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-architecture.1:4
 msgid ""
@@ -4893,27 +4914,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:9
+#: dpkg-architecture.1:8
 #, fuzzy
-msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
+msgid "B<dpkg-architecture> [I<option>...] [I<command>]"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg-architecture.1:13
 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:16
 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:25
 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 "
@@ -4925,35 +4946,35 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:27 dpkg-buildflags.1:34 dpkg-deb.1:28 dpkg-divert.8:24
-#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
-#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
-#: update-alternatives.8:203
+#: dpkg-architecture.1:26 dpkg-buildflags.1:45 dpkg-deb.1:27 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:18 dpkg-split.1:31 dpkg-statoverride.8:23
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:34
+#: update-alternatives.8:202
 #, no-wrap
 msgid "COMMANDS"
 msgstr "コマンド"
 
 #. type: TP
-#: dpkg-architecture.1:28
+#: dpkg-architecture.1:27
 #, fuzzy, no-wrap
 msgid "B<-l>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 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:31
 #, fuzzy, no-wrap
 msgid "B<-e>I<debian-architecture>"
 msgstr "B<-a, --no-architecture>"
 
 #. type: Plain text
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 msgid ""
 "Check for equality of architecture. By default I<debian-architecture> is "
 "compared against the current Debian architecture, being the host.  This "
@@ -4962,13 +4983,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 #, fuzzy, no-wrap
 msgid "B<-i>I<architecture-wildcard>"
 msgstr "B<-a, --no-architecture>"
 
 #. type: Plain text
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 msgid ""
 "Check for identity of architecture by expanding I<architecture-wildcard> as "
 "an architecture wildcard and comparing against the current Debian "
@@ -4977,120 +4998,120 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 #, fuzzy, no-wrap
 msgid "B<-q>I<variable-name>"
 msgstr "B<[--] >I<filename>"
 
 #. type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 msgid "Print the value of a single variable."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 #, fuzzy, no-wrap
 msgid "B<-s>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 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:50
 #, fuzzy, no-wrap
 msgid "B<-u>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 #, no-wrap
 msgid "B<-c>I< command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 msgid ""
 "Execute a I<command> in an environment which has all variables set to the "
 "determined value."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 #, fuzzy, no-wrap
 msgid "B<-L>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-architecture.1:61
+#: dpkg-architecture.1:60
 msgid "Print a list of valid architecture names."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildflags.1:74 dpkg-buildpackage.1:226
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-architecture.1:63 dpkg-buildflags.1:92 dpkg-buildpackage.1:226
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:175
 #: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
-#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:93
-#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
-#: update-alternatives.8:320
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-name.1:61
+#: dpkg-parsechangelog.1:36 dpkg-query.1:113 dpkg-scanpackages.1:99
+#: dpkg-scansources.1:68 dpkg-shlibdeps.1:218 dpkg-source.1:99
+#: dpkg-split.1:129 dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31
+#: update-alternatives.8:319
 #, fuzzy
 msgid "Show the usage message and exit."
 msgstr "利用方法を表示して正常終了する。"
 
 #. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildflags.1:77 dpkg-buildpackage.1:229
-#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-architecture.1:66 dpkg-buildflags.1:95 dpkg-buildpackage.1:229
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:178
 #: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
-#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
-#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:96
-#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
-#: update-alternatives.8:323
+#: dpkg-gensymbols.1:449 dpkg-mergechangelogs.1:44 dpkg-name.1:64
+#: dpkg-parsechangelog.1:39 dpkg-query.1:116 dpkg-scanpackages.1:102
+#: dpkg-scansources.1:70 dpkg-shlibdeps.1:221 dpkg-source.1:102
+#: dpkg-split.1:132 dpkg-statoverride.8:50 dpkg-trigger.1:37 dpkg-vendor.1:34
+#: update-alternatives.8:322
 #, fuzzy
 msgid "Show the version and exit."
 msgstr "バージョン情報を出力して終了する。"
 
 #. type: TP
-#: dpkg-architecture.1:69
+#: dpkg-architecture.1:68
 #, fuzzy, no-wrap
 msgid "B<-a>I<debian-architecture>"
 msgstr "B<-a, --no-architecture>"
 
 #. type: Plain text
-#: dpkg-architecture.1:72
+#: dpkg-architecture.1:71
 msgid "Set the Debian architecture."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:72 dpkg-buildpackage.1:110
+#: dpkg-architecture.1:71 dpkg-buildpackage.1:110
 #, no-wrap
 msgid "B<-t>I<gnu-system-type>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 msgid "Set the GNU system type."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 #, fuzzy, no-wrap
 msgid "B<-f>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-architecture.1:82
+#: dpkg-architecture.1:81
 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 "
@@ -5100,54 +5121,54 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:83
+#: dpkg-architecture.1:82
 #, fuzzy, no-wrap
 msgid "TERMS"
 msgstr "注意"
 
 #. type: IP
-#: dpkg-architecture.1:84
+#: dpkg-architecture.1:83
 #, no-wrap
 msgid "build machine"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 msgid "The machine the package is built on."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 #, no-wrap
 msgid "host machine"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 msgid "The machine the package is built for."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 #, fuzzy, no-wrap
 msgid "Debian architecture"
 msgstr "Debian Project"
 
 #. type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 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:90
 #, no-wrap
 msgid "architecture wildcard"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 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>-"
@@ -5155,13 +5176,13 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 #, no-wrap
 msgid "\\s-1GNU\\s0 system type"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:99
+#: dpkg-architecture.1:98
 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, "
@@ -5169,226 +5190,226 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:100
+#: dpkg-architecture.1:99
 #, fuzzy, no-wrap
 msgid "VARIABLES"
 msgstr "環境変数"
 
 #. type: Plain text
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 msgid "The Debian architecture of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:106
+#: dpkg-architecture.1:105
 msgid "The Debian system name of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:106
+#: dpkg-architecture.1:105
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 msgid "The Debian cpu name of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 msgid "The pointer size of the build machine (in bits)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 msgid "The endianness of the build machine (little / big)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 #, no-wrap
 msgid "\\s-1DEB_BUILD_MULTIARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 msgid ""
 "The clarified \\s-1GNU\\s0 system type of the build machine, used for "
 "filesystem paths."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 msgid "The Debian architecture of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 msgid "The Debian system name of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 msgid "The Debian cpu name of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_BITS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 msgid "The pointer size of the host machine (in bits)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_ENDIAN\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 msgid "The endianness of the host machine (little / big)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 #, no-wrap
 msgid "\\s-1DEB_HOST_MULTIARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:140
+#: dpkg-architecture.1:139
 msgid ""
 "The clarified \\s-1GNU\\s0 system type of the host machine, used for "
 "filesystem paths."
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:141
+#: dpkg-architecture.1:140
 #, no-wrap
 msgid "DEBIAN/RULES"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:149
+#: dpkg-architecture.1:148
 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 "
@@ -5399,12 +5420,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:152 dpkg-architecture.1:169
+#: dpkg-architecture.1:151 dpkg-architecture.1:168
 msgid "Instead of:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:156
+#: dpkg-architecture.1:155
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5412,12 +5433,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:159
+#: dpkg-architecture.1:158
 msgid "please use the following:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:163
+#: dpkg-architecture.1:162
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
@@ -5425,13 +5446,13 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:165
+#: dpkg-architecture.1:164
 #, 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:175
+#: dpkg-architecture.1:174
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5441,18 +5462,18 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:178
+#: dpkg-architecture.1:177
 msgid "please use:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:181
+#: dpkg-architecture.1:180
 #, no-wrap
 msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:185
+#: dpkg-architecture.1:184
 #, no-wrap
 msgid ""
 "ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
@@ -5461,14 +5482,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:189
+#: dpkg-architecture.1:188
 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:194
+#: dpkg-architecture.1:193
 msgid ""
 "In general, calling dpkg in the rules file to get architecture information "
 "is deprecated (unless you want to provide backward compatibility, see "
@@ -5477,13 +5498,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:195
+#: dpkg-architecture.1:194
 #, no-wrap
 msgid "BACKWARD COMPATIBILITY"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:199
+#: dpkg-architecture.1:198
 msgid ""
 "The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced in dpkg-"
 "dev 1.15.4. Using them in I<debian/rules> thus requires a build-dependency "
@@ -5491,7 +5512,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:204
+#: dpkg-architecture.1:203
 msgid ""
 "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in dpkg-"
 "dev 1.13.2. Before this I<debian/rules> files tended to check the values of "
@@ -5500,7 +5521,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:209
+#: dpkg-architecture.1:208
 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 "
@@ -5509,7 +5530,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:213
+#: dpkg-architecture.1:212
 #, no-wrap
 msgid ""
 "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
@@ -5517,7 +5538,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:227
+#: dpkg-architecture.1:226
 #, no-wrap
 msgid ""
 "# Take account of old dpkg-architecture output.\n"
@@ -5536,19 +5557,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:230
+#: dpkg-architecture.1:229
 msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:233
+#: dpkg-architecture.1:232
 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:243
+#: dpkg-architecture.1:242
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
@@ -5562,7 +5583,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:248
+#: dpkg-architecture.1:247
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
@@ -5572,14 +5593,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:252
+#: dpkg-architecture.1:251
 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:259
+#: dpkg-architecture.1:258
 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 "
@@ -5590,113 +5611,113 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:262
+#: dpkg-architecture.1:261
 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:266
+#: dpkg-architecture.1:265
 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:268
+#: dpkg-architecture.1:267
 msgid "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:270
+#: dpkg-architecture.1:269
 #, fuzzy
 msgid "eval \\`dpkg-architecture -u\\`"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg-architecture.1:273
+#: dpkg-architecture.1:272
 msgid ""
 "Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:275
+#: dpkg-architecture.1:274
 msgid "dpkg-architecture -elinux-alpha"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:277
+#: dpkg-architecture.1:276
 msgid "dpkg-architecture -amips -elinux-mips"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:280
+#: dpkg-architecture.1:279
 msgid ""
 "Check if the current architecture or an architecture provided with -a are "
 "Linux systems:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:282
+#: dpkg-architecture.1:281
 msgid "dpkg-architecture -ilinux-any"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:284
+#: dpkg-architecture.1:283
 msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 msgid ""
 "All these files have to be present for B<dpkg-architecture> to work. Their "
 "location can be overridden at runtime with the environment variable "
-"DPKG_DATADIR."
+"B<DPKG_DATADIR>."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 #, fuzzy, no-wrap
 msgid "I</usr/share/dpkg/cputable>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 msgid "Table of known CPU names and mapping to their GNU name."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 #, fuzzy, no-wrap
 msgid "I</usr/share/dpkg/ostable>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 msgid "Table of known operating system names and mapping to their GNU name."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 #, fuzzy, no-wrap
 msgid "I</usr/share/dpkg/triplettable>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg-architecture.1:299
+#: dpkg-architecture.1:298
 msgid ""
 "Mapping between Debian architecture triplets and Debian architecture names."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:303
+#: dpkg-architecture.1:302
 #, 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-architecture.1:308
+#: dpkg-architecture.1:307
 msgid ""
 "B<dpkg-architecture> and this man page were initially written by Marcus "
 "Brinkmann E<lt>brinkmd@debian.orgE<gt>."
@@ -5709,7 +5730,7 @@
 msgstr "dpkg"
 
 #. type: TH
-#: dpkg.cfg.5:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1
 #, fuzzy, no-wrap
 msgid "2009-09-05"
 msgstr "2006-04-09"
@@ -5743,7 +5764,7 @@
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:214 dpkg-statoverride.8:87
+#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:222 dpkg-statoverride.8:86
 msgid "B<dpkg>(1)."
 msgstr "B<dpkg>(1)."
 
@@ -5753,6 +5774,12 @@
 msgid "dpkg-buildflags"
 msgstr "dpkg-scanpackages"
 
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+msgid "2011-09-13"
+msgstr "2006-04-09"
+
 #. type: Plain text
 #: dpkg-buildflags.1:4
 msgid "dpkg-buildflags - returns build flags to use during package build"
@@ -5761,7 +5788,7 @@
 #. type: Plain text
 #: dpkg-buildflags.1:8
 #, fuzzy
-msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgid "B<dpkg-buildflags> [I<option>...] [I<command>]"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
@@ -5810,98 +5837,156 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:22
-msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+#: dpkg-buildflags.1:23
+msgid ""
+"temporarily by the user with environment variables (see section "
+"B<ENVIRONMENT>);"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "4."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid ""
+"dynamically by the package maintainer with environment variables set via "
+"B<debian/rules> (see section B<ENVIRONMENT>)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 msgid "The configuration files can contain two types of directives:"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 #, no-wrap
 msgid "B<SET>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
 msgid "Override the flag named I<flag> to have the value I<value>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
+#, no-wrap
+msgid "B<STRIP>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:34
+msgid ""
+"Strip from the flag named I<flag> all the build flags listed in I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
 #, no-wrap
 msgid "B<APPEND>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:31
+#: dpkg-buildflags.1:38
+msgid ""
+"Extend the flag named I<flag> by appending the options given in I<value>.  A "
+"space is prepended to the appended value if the flag's current value is non-"
+"empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:38
+#, no-wrap
+msgid "B<PREPEND>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:42
 msgid ""
-"Extend the flag named I<flag> with the options given in I<value>.  A space "
-"is prepended to the appended value if the flag's current value is non-empty."
+"Extend the flag named I<flag> by prepending the options given in I<value>.  "
+"A space is appended to the prepended value if the flag's current value is "
+"non-empty."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:34
+#: dpkg-buildflags.1:45
 msgid ""
 "The configuration files can contain comments on lines starting with a hash "
 "(#). Empty lines are also ignored."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:35
+#: dpkg-buildflags.1:46
+#, fuzzy, no-wrap
+#| msgid "B<--debug>"
+msgid "B<--dump>"
+msgstr "B<--debug>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:51
+msgid ""
+"Print to standard output all compilation flags and their values. It prints "
+"one flag per line separated from its value by an equal sign "
+"(\"I<flag>=I<value>\"). This is the default action."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:51
 #, fuzzy, no-wrap
 #| msgid "B<list>"
 msgid "B<--list>"
 msgstr "B<list>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 msgid ""
 "Print the list of flags supported by the current vendor (one per line). See "
 "the B<SUPPORTED FLAGS> section for more information about them."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 #, fuzzy, no-wrap
 #| msgid "B<--showformat=>I<format>"
 msgid "B<--export=>I<format>"
 msgstr "B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 msgid ""
 "Print to standard output shell (if I<format> is B<sh>) or make (if I<format> "
 "is B<make>) commands that can be used to export all the compilation flags in "
-"the environment. If the I<format> value is not given, B<sh> is assumed. Only "
-"compilation flags starting with an upper case character are included, others "
-"are assumed to not be suitable for the environment."
+"the environment. If I<format> is B<configure> then the output can be used on "
+"a B<./configure> command-line. If the I<format> value is not given, B<sh> is "
+"assumed. Only compilation flags starting with an upper case character are "
+"included, others are assumed to not be suitable for the environment."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 #, fuzzy, no-wrap
 msgid "B<--get>I< flag>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 msgid ""
 "Print the value of the flag on standard output. Exits with 0 if the flag is "
 "known otherwise exits with 1."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 #, fuzzy, no-wrap
 msgid "B<--origin>I< flag>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:57
+#: dpkg-buildflags.1:75
 msgid ""
 "Print the origin of the value that is returned by B<--get>. Exits with 0 if "
 "the flag is known otherwise exits with 1. The origin can be one of the "
@@ -5909,64 +5994,64 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:58
+#: dpkg-buildflags.1:76
 #, fuzzy, no-wrap
 msgid "B<vendor>"
 msgstr "B<--admindir=>I<dir>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 msgid "the original flag set by the vendor is returned;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 #, fuzzy, no-wrap
 msgid "B<system>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 msgid "the flag is set/modified by a system-wide configuration;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 #, fuzzy, no-wrap
 #| msgid "B<query>"
 msgid "B<user>"
 msgstr "B<query>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 msgid "the flag is set/modified by a user-specific configuration;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 #, fuzzy, no-wrap
 msgid "B<env>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:70
+#: dpkg-buildflags.1:88
 msgid "the flag is set/modified by an environment-specific configuration."
 msgstr ""
 
 #. type: SH
-#: dpkg-buildflags.1:78
+#: dpkg-buildflags.1:96
 #, no-wrap
 msgid "SUPPORTED FLAGS"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:79
+#: dpkg-buildflags.1:97
 #, fuzzy, no-wrap
 msgid "B<CFLAGS>"
 msgstr "B<COLUMNS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 msgid ""
 "Options for the C compiler. The default value set by the vendor includes I<-"
 "g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
@@ -5974,46 +6059,46 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 #, no-wrap
 msgid "B<CPPFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 msgid "Options for the C preprocessor. Default value: empty."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 #, no-wrap
 msgid "B<CXXFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 msgid "Options for the C++ compiler. Same as B<CFLAGS>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 #, no-wrap
 msgid "B<FFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 #, no-wrap
 msgid "B<LDFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:102
+#: dpkg-buildflags.1:120
 msgid ""
 "Options passed to the compiler when linking executables or shared objects "
 "(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
@@ -6021,57 +6106,320 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:104
+#: dpkg-buildflags.1:122
 #, fuzzy, no-wrap
 #| msgid "I</etc/dpkg/dpkg.cfg>"
 msgid "B</etc/dpkg/buildflags.conf>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 msgid "System wide configuration file."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 #, no-wrap
 msgid "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or B<$HOME/.config/dpkg/buildflags.conf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:110
+#: dpkg-buildflags.1:128
 msgid "User configuration file."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-buildflags.1:135
+msgid ""
+"There are 2 sets of environment variables doing the same operations, the "
+"first one (DEB_I<flag>_I<op>) should never be used within B<debian/rules>. "
+"It's meant for any user that wants to rebuild the source package with "
+"different build flags. The second set (DEB_I<flag>_MAINT_I<op>) should only "
+"be used in B<debian/rules> by package maintainers to change the resulting "
+"build flags."
+msgstr ""
+
 #. type: TP
-#: dpkg-buildflags.1:111
+#: dpkg-buildflags.1:135
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_SET>"
 msgstr ""
 
+#. type: TQ
+#: dpkg-buildflags.1:137
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_SET>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
 msgid ""
 "This variable can be used to force the value returned for the given I<flag>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_STRIP>"
+msgstr ""
+
+#. type: TQ
+#: dpkg-buildflags.1:143
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_STRIP>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:148
+msgid ""
+"This variable can be used to provide a space separated list of options that "
+"will be stripped from the set of flags returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:148
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_APPEND>"
 msgstr ""
 
+#. type: TQ
+#: dpkg-buildflags.1:150
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_APPEND>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:119
+#: dpkg-buildflags.1:154
 msgid ""
 "This variable can be used to append supplementary options to the value "
 "returned for the given I<flag>."
 msgstr ""
 
+#. type: TP
+#: dpkg-buildflags.1:154
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_PREPEND>"
+msgstr ""
+
+#. type: TQ
+#: dpkg-buildflags.1:156
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_PREPEND>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:160
+msgid ""
+"This variable can be used to prepend supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:160
+#, no-wrap
+msgid "B<DEB_BUILD_MAINT_OPTIONS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:165
+msgid ""
+"This variable can be used to disable/enable various hardening build flags "
+"through the B<hardening> option. See the B<HARDENING> section for details."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:166
+#, fuzzy, no-wrap
+#| msgid "WARNING"
+msgid "HARDENING"
+msgstr "警告"
+
+#. type: Plain text
+#: dpkg-buildflags.1:171
+msgid ""
+"Several compile-time options (detailed below) can be used to help harden a "
+"resulting binary against memory corruption attacks, or provide additional "
+"warning messages during compilation. Except as noted below, these are "
+"enabled by default for architectures that support them."
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:122 dpkg-maintscript-helper.1:130
+#: dpkg-buildflags.1:177
+msgid ""
+"Each hardening feature can be enabled and disabled in the "
+"B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value with "
+"the \"+\" and \"-\" modifier. For example, to enable the \"pie\" feature and "
+"disable the \"fortify\" feature you can do this in B<debian/rules>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:179
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:183
+msgid ""
+"The special feature B<all> can be used to enable or disable all hardening "
+"features at the same time. Thus disabling everything and enabling only "
+"\"format\" and \"fortify\" can be achieved with:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:185
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:186
+#, fuzzy, no-wrap
+msgid "B<format>"
+msgstr "B<--showformat=>I<format>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:198
+msgid ""
+"This setting (enabled by default) adds B<-Wformat -Wformat-security -"
+"Werror=format-security> to B<CFLAGS> and B<CXXFLAGS>. This will warn about "
+"improper format string uses, and will fail when format functions are used in "
+"a way that that represent possible security problems. At present, this warns "
+"about calls to B<printf> and B<scanf> functions where the format string is "
+"not a string literal and there are no format arguments, as in B<printf(foo);"
+"> instead of B<printf(\"%s\", foo);> This may be a security hole if the "
+"format string came from untrusted input and contains \"%n\"."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:199
+#, no-wrap
+msgid "B<fortify>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:210
+msgid ""
+"This setting (enabled by default) adds B<-D_FORTIFY_SOURCE=2> to "
+"B<CPPFLAGS>. During code generation the compiler knows a great deal of "
+"information about buffer sizes (where possible), and attempts to replace "
+"insecure unlimited length buffer function calls with length-limited ones. "
+"This is especially useful for old, crufty code.  Additionally, format "
+"strings in writable memory that contain '%n' are blocked. If an application "
+"depends on such a format string, it will need to be worked around."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:213
+msgid ""
+"Note that for this option to have any effect, the source must also be "
+"compiled with B<-O1> or higher."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:213
+#, no-wrap
+msgid "B<stackprotector>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:222
+msgid ""
+"This setting (enabled by default) adds B<-fstack-protector --param=ssp-"
+"buffer-size=4> to B<CFLAGS> and B<CXXFLAGS>. This adds safety checks against "
+"stack overwrites. This renders many potential code injection attacks into "
+"aborting situations. In the best case this turns code injection "
+"vulnerabilities into denial of service or into non-issues (depending on the "
+"application)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:226
+msgid ""
+"This feature requires linking against glibc (or another provider of "
+"B<__stack_chk_fail>), so needs to be disabled when building with B<-"
+"nostdlib> or B<-ffreestanding> or similar."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:227
+#, fuzzy, no-wrap
+#| msgid "B<purge>"
+msgid "B<relro>"
+msgstr "B<purge>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:235
+msgid ""
+"This setting (enabled by default) adds B<-Wl,-z,relro> to B<LDFLAGS>.  "
+"During program load, several ELF memory sections need to be written to by "
+"the linker. This flags the loader to turn these sections read-only before "
+"turning over control to the program. Most notably this prevents GOT "
+"overwrite attacks."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:236
+#, no-wrap
+msgid "B<bindnow>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:243
+msgid ""
+"This setting (disabled by default) adds B<-Wl,-z,now> to B<LDFLAGS>. During "
+"program load, all dynamic symbols are resolved, allowing for the entire PLT "
+"to be marked read-only (due to B<relro> above)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:244
+#, no-wrap
+msgid "B<pie>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:256
+msgid ""
+"This setting (disabled by default) adds B<-fPIE> to B<CFLAGS> and "
+"B<CXXFLAGS>, and B<-fPIE -pie> to B<LDFLAGS>. Position Independent "
+"Executable are needed to take advantage of Address Space Layout "
+"Randomization, supported by some kernel versions. While ASLR can already be "
+"enforced for data areas in the stack and heap (brk and mmap), the code areas "
+"must be compiled as position-independent. Shared libraries already do this (-"
+"fPIC), so they gain ASLR automatically, but binary .text regions need to be "
+"build PIE to gain ASLR. When this happens, ROP (Return Oriented Programming) "
+"attacks are much harder since there are no static locations to bounce off of "
+"during a memory corruption attack."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:259
+msgid ""
+"This is not compatible with B<-fPIC> so care must be taken when building "
+"shared objects."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:265
+msgid ""
+"Additionally, since PIE is implemented via a general register, some "
+"architectures (most notably i386) can see performance losses of up to 15% in "
+"very text-segment-heavy application workloads; most workloads see less than "
+"1%. Architectures with more general registers (e.g. amd64)  do not see as "
+"high a worst-case penalty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:268
 #, fuzzy
-msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2010-2011 Rapha\\[:e]l Hertzog"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: Plain text
+#: dpkg-buildflags.1:270
+#, fuzzy
+msgid "Copyright \\(co 2011 Kees Cook"
 msgstr "Copyright 2001 Joey Hess"
 
 #. type: TH
@@ -6089,7 +6437,7 @@
 #. type: Plain text
 #: dpkg-buildpackage.1:8
 #, fuzzy
-msgid "B<dpkg-buildpackage> [I<options>]"
+msgid "B<dpkg-buildpackage> [I<option>...]"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
@@ -6348,7 +6696,7 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:96 dpkg-genchanges.1:49 dpkg-gencontrol.1:38
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 #, fuzzy, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<--version>"
@@ -6431,7 +6779,7 @@
 msgstr "dpkg-checkbuilddeps - ビルド依存と衝突のチェック"
 
 #. type: TP
-#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:427
+#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:432
 #, fuzzy, no-wrap
 msgid "B<-d>"
 msgstr "B<-B>"
@@ -6620,8 +6968,8 @@
 msgstr "B<--admindir=>I<dir>"
 
 #. type: Plain text
-#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:116
-#: dpkg-shlibdeps.1:217 dpkg-trigger.1:43
+#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:122
+#: dpkg-shlibdeps.1:215 dpkg-trigger.1:43
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
 "lib/dpkg>."
@@ -6631,10 +6979,10 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:223 dpkg-checkbuilddeps.1:33 dpkg-distaddfile.1:32
-#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
-#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
-#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:90 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-deb.1:172 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
+#: dpkg-gensymbols.1:443 dpkg-name.1:58 dpkg-parsechangelog.1:33
+#: dpkg-query.1:110 dpkg-scanpackages.1:96 dpkg-shlibdeps.1:215
+#: dpkg-source.1:96 dpkg-split.1:126 dpkg-trigger.1:31
 #, fuzzy, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr "B<-H>|B<--help>"
@@ -6642,7 +6990,7 @@
 #. type: Plain text
 #: dpkg-buildpackage.1:234
 msgid ""
-"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"Even if B<dpkg-buildpackage> exports some variables, B<debian/rules> should "
 "not rely on their presence and should instead use the respective interface "
 "to retrieve the needed values."
 msgstr ""
@@ -6664,15 +7012,15 @@
 #. type: SS
 #: dpkg-buildpackage.1:238
 #, no-wrap
-msgid "Compiler flags"
+msgid "Compiler flags are no longer exported"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-buildpackage.1:243
 msgid ""
-"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
-"environment variables are set to the values that B<dpkg-buildflags> "
-"returned. See its manual page for more information."
+"Between versions 1.14.17 and 1.16.1, B<dpkg-buildpackage> exported compiler "
+"flags (B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS>) with "
+"values as returned by B<dpkg-buildflags>. This is no longer the case."
 msgstr ""
 
 #. type: Plain text
@@ -6683,17 +7031,17 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildpackage.1:255
+#: dpkg-buildpackage.1:256
 #, fuzzy
 msgid ""
-"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
-"B<fakeroot>(1), B<gpg>(1)."
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
+"genchanges>(1), B<fakeroot>(1), B<gpg>(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-buildpackage.1:264 dpkg-source.1:712
+#: dpkg-buildpackage.1:265
 #, fuzzy
 msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
 msgstr "Copyright 2001 Joey Hess"
@@ -6704,12 +7052,6 @@
 msgid "dpkg-checkbuilddeps"
 msgstr "dpkg-checkbuilddeps"
 
-#. type: TH
-#: dpkg-checkbuilddeps.1:1
-#, fuzzy, no-wrap
-msgid "2009-11-21"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:4
 msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
@@ -6718,7 +7060,7 @@
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:9
 #, fuzzy
-msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgid "B<dpkg-checkbuilddeps> [I<option>...] [I<control-file>]"
 msgstr "B<dpkg-checkbuilddeps> B<-B> [I<コントロールファイル>]"
 
 #. type: Plain text
@@ -6735,8 +7077,12 @@
 
 #. type: Plain text
 #: 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."
 msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
+"By default, B<debian/control> is read, but an alternate control filename may "
 "be specified on the command line."
 msgstr ""
 "デフォルトでは、I<debian/control> が読まれるが、別のコントロールファイル名を"
@@ -6790,7 +7136,7 @@
 #. type: Plain text
 #: dpkg-distaddfile.1:8
 #, fuzzy
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+msgid "B<dpkg-distaddfile> [I<option>...]I< filename section priority>"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
@@ -6845,38 +7191,32 @@
 msgid "dpkg-deb"
 msgstr "dpkg-deb"
 
-#. type: TH
-#: dpkg-deb.1:1 dpkg-query.1:1 dselect.1:1
-#, fuzzy, no-wrap
-msgid "2010-03-07"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: 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
+#: dpkg-deb.1:8
 #, fuzzy
-msgid "B<dpkg-deb> [I<options>] I<command>"
+msgid "B<dpkg-deb> [I<option>...] I<command>"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
-#: dpkg-deb.1:13
+#: dpkg-deb.1:12
 msgid ""
 "B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr "B<dpkg-deb> は、Debian アーカイブの作成、展開、情報の表示をする。"
 
 #. type: Plain text
-#: dpkg-deb.1:17
+#: dpkg-deb.1:16
 msgid "Use B<dpkg> to install and remove packages from your system."
 msgstr ""
 "パッケージをシステムにインストールするときや削除するときには B<dpkg> を使うこ"
 "と。"
 
 #. type: Plain text
-#: dpkg-deb.1:27
+#: dpkg-deb.1:26
 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> "
@@ -6887,13 +7227,13 @@
 "deb> のオプションであると判断すると、 B<dpkg-deb> を起動する。"
 
 #. type: TP
-#: dpkg-deb.1:29
+#: dpkg-deb.1:28
 #, fuzzy, no-wrap
 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-deb.1:41
+#: dpkg-deb.1:40
 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 "
@@ -6909,7 +7249,7 @@
 "に置かれる。"
 
 #. type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-deb.1:52
 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 "
@@ -6924,7 +7264,7 @@
 "クする。"
 
 #. type: Plain text
-#: dpkg-deb.1:60
+#: dpkg-deb.1:59
 msgid ""
 "If no I<archive> is specified then B<dpkg-deb> will write the package into "
 "the file I<directory>B<.deb>."
@@ -6933,12 +7273,12 @@
 "I<directory>B<.deb> という名前で作成する。"
 
 #. type: Plain text
-#: dpkg-deb.1:62
+#: dpkg-deb.1:61
 msgid "If the archive to be created already exists it will be overwritten."
 msgstr "もし、すでにアーカイブが作成されて存在している場合、上書きする。"
 
 #. type: Plain text
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 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 "
@@ -6955,18 +7295,18 @@
 "調べるために、パッケージ制御ファイルを読んで解析する必要があるから)。"
 
 #. type: TP
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 #, 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-deb.1:81
+#: dpkg-deb.1:80
 msgid "Provides information about a binary package archive."
 msgstr "バイナリパッケージアーカイブの情報を表示する。"
 
 #. type: Plain text
-#: dpkg-deb.1:86
+#: dpkg-deb.1:85
 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."
@@ -6975,7 +7315,7 @@
 "ケージの中身の要約を表示する。"
 
 #. type: Plain text
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 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 "
@@ -6988,13 +7328,13 @@
 "了する。"
 
 #. type: TP
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 #, fuzzy, no-wrap
 msgid "B<-W>, B<--show> I<archive>"
 msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
 
 #. type: Plain text
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 #, fuzzy
 msgid ""
 "Provides information about a binary package archive in the format specified "
@@ -7006,18 +7346,18 @@
 "区切ったものである。"
 
 #. type: TP
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 #, 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
+#: dpkg-deb.1:103
 msgid "Extracts control file information from a binary package archive."
 msgstr "バイナリパッケージアーカイブから制御ファイル情報を取り出す。"
 
 #. type: Plain text
-#: dpkg-deb.1:108
+#: dpkg-deb.1:107
 msgid ""
 "If no B<control-file-field>s are specified then it will print the whole "
 "control file."
@@ -7025,7 +7365,7 @@
 "B<control-file-field> が指定されていない場合、制御ファイルすべてを表示する。"
 
 #. type: Plain text
-#: dpkg-deb.1:117
+#: dpkg-deb.1:116
 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-"
@@ -7037,18 +7377,18 @@
 "deb> は、それぞれの情報の前にフィールド名(そしてコロンと空白)を表示する。"
 
 #. type: Plain text
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 msgid "No errors are reported for fields requested but not found."
 msgstr "指定したフィールドがみつからない場合でもエラーを報告しない。"
 
 #. type: TP
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 #, fuzzy, no-wrap
 msgid "B<-c>, B<--contents> I<archive>"
 msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
 
 #. type: Plain text
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 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 "
@@ -7058,13 +7398,13 @@
 "のバージョンは、 B<tar> の冗長出力(-v オプション)をそのまま表示する。"
 
 #. type: TP
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 #, 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-deb.1:129
+#: dpkg-deb.1:128
 msgid ""
 "Extracts the filesystem tree from a package archive into the specified "
 "directory."
@@ -7073,7 +7413,7 @@
 "る。"
 
 #. type: Plain text
-#: dpkg-deb.1:135
+#: dpkg-deb.1:134
 msgid ""
 "Note that extracting a package to the root directory will I<not> result in a "
 "correct installation! Use B<dpkg> to install packages."
@@ -7083,7 +7423,7 @@
 "る。"
 
 #. type: Plain text
-#: dpkg-deb.1:139
+#: dpkg-deb.1:138
 #, fuzzy
 msgid ""
 "I<directory> (but not its parents) will be created if necessary, and its "
@@ -7093,46 +7433,80 @@
 "る。"
 
 #. type: TP
-#: dpkg-deb.1:139
+#: 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-deb.1:144
+#: dpkg-deb.1:145
 #, fuzzy
 msgid ""
-"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
-"it goes."
+"Is like B<--extract> (B<-x>)  with B<--verbose> (B<-v>)  which prints a "
+"listing of the files extracted as it goes."
 msgstr ""
 "B<--vextract> (B<-X>) は現在展開中のファイルを表示する。 B<--extract> (B<-"
 "x>) はエラーが発生しない限り何も表示しない。"
 
 #. type: TP
-#: dpkg-deb.1:144
+#: dpkg-deb.1:145
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--raw-extract> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
+
+#. type: Plain text
+#: dpkg-deb.1:150
+#, fuzzy
+#| msgid ""
+#| "Extracts the filesystem tree from a package archive into the specified "
+#| "directory."
+msgid ""
+"Extracts the filesystem tree from a package archive into a specified "
+"directory, and the control information files into a DEBIAN subdirectory of "
+"the specified directory."
+msgstr ""
+"パッケージアーカイブからファイルシステム木を、指定したディレクトリに展開す"
+"る。"
+
+#. type: Plain text
+#: dpkg-deb.1:152 dpkg-deb.1:172
+msgid ""
+"The target directory (but not its parents) will be created if necessary."
+msgstr ""
+"指定したディレクトリ(親やそれより上のディレクトリは含まない)は必要があれば作"
+"成される。"
+
+#. type: TP
+#: dpkg-deb.1:152
 #, fuzzy, no-wrap
 msgid "B<--fsys-tarfile> I<archive>"
 msgstr "B<dpkg-deb --fsys-tarfile> I<archive>"
 
 #. type: Plain text
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
+#, 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."
 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."
+"to extract a particular file from a package archive.  The input archive will "
+"always be processed sequentially."
 msgstr ""
 "バイナリパッケージからファイルシステム木を展開し、標準出力に B<tar> 形式で出"
 "力する。 B<tar> と共に使用することで、特定のファイルをパッケージアーカイブか"
 "ら取り出すことができる。"
 
 #. type: TP
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
 #, fuzzy, no-wrap
 msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
 
 #. type: Plain text
-#: dpkg-deb.1:156
+#: dpkg-deb.1:165
 msgid ""
 "Extracts the control information files from a package archive into the "
 "specified directory."
@@ -7140,7 +7514,7 @@
 "パッケージアーカイブから制御情報ファイルを指定したディレクトリに展開する。"
 
 #. type: Plain text
-#: dpkg-deb.1:160
+#: dpkg-deb.1:169
 msgid ""
 "If no directory is specified then a subdirectory B<DEBIAN> in the current "
 "directory is used."
@@ -7148,22 +7522,14 @@
 "もしディレクトリが指定されない場合、カレントディレクトリにある B<DEBIAN> サブ"
 "ディレクトリに展開する。"
 
-#. type: Plain text
-#: dpkg-deb.1:163
-msgid ""
-"The target directory (but not its parents) will be created if necessary."
-msgstr ""
-"指定したディレクトリ(親やそれより上のディレクトリは含まない)は必要があれば作"
-"成される。"
-
 #. type: TP
-#: dpkg-deb.1:171
+#: dpkg-deb.1:180
 #, no-wrap
 msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-deb.1:176 dpkg-query.1:121
+#: dpkg-deb.1:185 dpkg-query.1:127
 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."
@@ -7172,7 +7538,7 @@
 "文字列で、パッケージごとに出力される。"
 
 #. type: Plain text
-#: dpkg-deb.1:185
+#: dpkg-deb.1:194
 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 "
@@ -7187,33 +7553,33 @@
 "を参照すること。"
 
 #. type: Plain text
-#: dpkg-deb.1:187
+#: dpkg-deb.1:196
 msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
 msgstr ""
 "このフィールドのデフォルトのフォーマット文字列は \"${Package}\\et"
 "${Version}\\en\" である。"
 
 #. type: TP
-#: dpkg-deb.1:187
-#, no-wrap
-msgid "B<-z>I<compress_level>"
-msgstr ""
+#: dpkg-deb.1:196
+#, fuzzy, no-wrap
+msgid "B<-z>I<compress-level>"
+msgstr "B<-t>|B<--test>"
 
 #. type: Plain text
-#: dpkg-deb.1:191
+#: dpkg-deb.1:200
 msgid ""
-"Specify which compression level to pass to the compressor backend program, "
-"when building a package."
+"Specify which compression level to use on the compressor backend, when "
+"building a package (default is 9 for gzip and bzip2, 6 for xz and lzma)."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:191
+#: dpkg-deb.1:200
 #, fuzzy, no-wrap
-msgid "B<-Z>I<compress_type>"
+msgid "B<-Z>I<compress-type>"
 msgstr "B<-t>|B<--test>"
 
 #. type: Plain text
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 msgid ""
 "Specify which compression type to use when building a package. Allowed "
 "values are I<gzip>, I<xz>, I<bzip2>, I<lzma>, and I<none> (default is "
@@ -7221,13 +7587,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 #, no-wrap
 msgid "B<--new>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 msgid ""
 "Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
@@ -7235,13 +7601,13 @@
 "である。"
 
 #. type: TP
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 #, no-wrap
 msgid "B<--old>"
 msgstr "B<--old>"
 
 #. type: Plain text
-#: dpkg-deb.1:209
+#: dpkg-deb.1:218
 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 "
@@ -7254,8 +7620,14 @@
 "バージョン 0.93.76(1995 年 9 月)以前の dpkg で処理するためのパッケージを構築"
 "するときだけに使用される。"
 
+#. type: TP
+#: dpkg-deb.1:218
+#, no-wrap
+msgid "B<--nocheck>"
+msgstr "B<--nocheck>"
+
 #. type: Plain text
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224
 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."
@@ -7265,32 +7637,45 @@
 "とができる。"
 
 #. type: TP
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224 start-stop-daemon.8:255
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--verbose>"
+msgstr "B<-v>|B<--verbose>"
+
+#. type: Plain text
+#: dpkg-deb.1:228
+msgid ""
+"Enables verbose output. This currently only affects B<--extract> making it "
+"behave like B<--vextract>."
+msgstr ""
+
+#. type: TP
+#: dpkg-deb.1:228
 #, fuzzy, no-wrap
 msgid "B<-D>, B<--debug>"
 msgstr "B<--debug>"
 
 #. type: Plain text
-#: dpkg-deb.1:218
+#: dpkg-deb.1:231
 msgid "Enables debugging output. This is not very interesting."
 msgstr "デバッグ出力を有効にする。これはあまり役に立たない。"
 
 #. type: Plain text
-#: dpkg-deb.1:224
+#: dpkg-deb.1:237
 msgid ""
 "If set, B<dpkg-deb> will use it as the directory in which to create "
 "temporary files and directories."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:230
+#: dpkg-deb.1:243
 msgid ""
 "B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
 msgstr ""
 "B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> はうまく動作しない。"
 
 #. type: Plain text
-#: dpkg-deb.1:238
+#: dpkg-deb.1:251
 msgid ""
 "There is no authentication on B<.deb> files; in fact, there isn't even a "
 "straightforward checksum.  (Higher level tools like APT support "
@@ -7300,7 +7685,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:245
+#: dpkg-deb.1:258
 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 "
@@ -7311,7 +7696,7 @@
 "リプトを実行し、状態や内容を記録する、ということを確実に実行できる。"
 
 #. type: Plain text
-#: dpkg-deb.1:251
+#: dpkg-deb.1:264
 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)."
 
@@ -7321,13 +7706,6 @@
 msgid "dpkg-divert"
 msgstr "dpkg-divert"
 
-#. type: TH
-#: dpkg-divert.8:1
-#, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-10-12"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-divert.8:4
 msgid "dpkg-divert - override a package's version of a file"
@@ -7336,7 +7714,7 @@
 #. type: Plain text
 #: dpkg-divert.8:9
 #, fuzzy
-msgid "B<dpkg-divert> [I<options>] I<command>"
+msgid "B<dpkg-divert> [I<option>...] I<command>"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
@@ -7378,7 +7756,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:28 dpkg-statoverride.8:36
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
 #, fuzzy, no-wrap
 msgid "B<--remove>I< file>"
 msgstr "B<--remove>I< E<lt>fileE<gt>>"
@@ -7425,7 +7803,8 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:43 dpkg-statoverride.8:53 update-alternatives.8:329
+#: dpkg-divert.8:43 dpkg-statoverride.8:52 dselect.1:44
+#: update-alternatives.8:328
 #, fuzzy, no-wrap
 msgid "B<--admindir>I< directory>"
 msgstr "B<--admindir> I<directory>"
@@ -7491,7 +7870,7 @@
 "パッケージによって退避される。"
 
 #. type: TP
-#: dpkg-divert.8:61 dpkg-statoverride.8:65 update-alternatives.8:351
+#: dpkg-divert.8:61 dpkg-statoverride.8:64 update-alternatives.8:350
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
@@ -7538,10 +7917,15 @@
 
 #. type: Plain text
 #: dpkg-divert.8:82
-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."
+#, 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 ""
+"When adding, default is B<--local> and B<--divert> I<original>B<.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<--"
@@ -7617,15 +8001,15 @@
 msgstr "dpkg-divert --package wibble --rename --remove /usr/bin/example"
 
 #. type: TP
-#: dpkg-divert.8:113 dpkg-query.1:197 dpkg-statoverride.8:70 dpkg-trigger.1:61
-#: update-alternatives.8:356
+#: dpkg-divert.8:113 dpkg-query.1:205 dpkg-statoverride.8:69 dpkg-trigger.1:61
+#: update-alternatives.8:355
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_ADMINDIR>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
-#: dpkg-divert.8:117 dpkg-query.1:201 dpkg-statoverride.8:74 dpkg-trigger.1:65
+#: dpkg-divert.8:117 dpkg-query.1:209 dpkg-statoverride.8:73 dpkg-trigger.1:65
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the dpkg data directory."
@@ -7634,7 +8018,7 @@
 #. type: Plain text
 #: dpkg-divert.8:121
 msgid ""
-"If set and the I<--local> and I<--package> options have not been specified, "
+"If set and the B<--local> and B<--package> options have not been specified, "
 "B<dpkg-divert> will use it as the package name."
 msgstr ""
 
@@ -7666,7 +8050,7 @@
 "という名前をつけたファイルにコピーしておく。"
 
 #. type: Plain text
-#: dpkg-divert.8:137 update-alternatives.8:495
+#: dpkg-divert.8:137 update-alternatives.8:496
 #, fuzzy
 msgid "Copyright \\(co 1995 Ian Jackson"
 msgstr "Copyright (C) 1995 Ian Jackson."
@@ -7686,7 +8070,7 @@
 #. type: Plain text
 #: dpkg-genchanges.1:8
 #, fuzzy
-msgid "B<dpkg-genchanges> [I<options>]"
+msgid "B<dpkg-genchanges> [I<option>...]"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
@@ -7778,21 +8162,21 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:121
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:127
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-source.1:131
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:169
+#: dpkg-source.1:131
 #, fuzzy, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<--fsys-tarfile>"
@@ -7808,29 +8192,29 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:131
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:137
 #, 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:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 msgid "Override or add an output control file field."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 #, fuzzy, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<[--] >I<filename>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:137
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:143
 msgid "Remove an output control file field."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:98
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:104
 #, fuzzy, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "I<control>"
@@ -7844,7 +8228,7 @@
 
 #. type: TP
 #: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
@@ -7865,14 +8249,14 @@
 
 #. type: TP
 #: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 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 "
@@ -7894,7 +8278,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:123 dpkg-gensymbols.1:416
+#: dpkg-genchanges.1:123 dpkg-gensymbols.1:421
 #, fuzzy, no-wrap
 msgid "B<-q>"
 msgstr "B<-B>"
@@ -7928,7 +8312,7 @@
 #. type: Plain text
 #: dpkg-gencontrol.1:8
 #, fuzzy
-msgid "B<dpkg-gencontrol> [I<options>]"
+msgid "B<dpkg-gencontrol> [I<option>...]"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
@@ -7990,7 +8374,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:368
+#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:373
 #, fuzzy, no-wrap
 msgid "B<-p>I<package>"
 msgstr "B<--package>I< E<lt>packageE<gt>>"
@@ -8049,7 +8433,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:386 dpkg-shlibdeps.1:152
+#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:391 dpkg-shlibdeps.1:150
 #, fuzzy, no-wrap
 msgid "B<-O>"
 msgstr "B<-B>"
@@ -8083,7 +8467,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:339
+#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:337
 #, fuzzy
 msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 msgstr "Copyright 2001 Joey Hess"
@@ -8094,12 +8478,6 @@
 msgid "dpkg-gensymbols"
 msgstr "deb-old"
 
-#. type: TH
-#: dpkg-gensymbols.1:2
-#, fuzzy, no-wrap
-msgid "2009-08-07"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: dpkg-gensymbols.1:5
 msgid ""
@@ -8110,7 +8488,7 @@
 #. type: Plain text
 #: dpkg-gensymbols.1:9
 #, fuzzy
-msgid "B<dpkg-gensymbols> [I<options>]"
+msgid "B<dpkg-gensymbols> [I<option>...]"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
@@ -8131,14 +8509,6 @@
 "found):"
 msgstr ""
 
-#. type: IP
-#: dpkg-gensymbols.1:20 dpkg-gensymbols.1:22 dpkg-gensymbols.1:24
-#: dpkg-gensymbols.1:26 dpkg-gensymbols.1:306 dpkg-gensymbols.1:312
-#: dpkg-gensymbols.1:346 dpkg-gensymbols.1:350 dpkg-gensymbols.1:353
-#, no-wrap
-msgid "\\(bu"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-gensymbols.1:22
 msgid "debian/I<package>.symbols.I<arch>"
@@ -8212,14 +8582,23 @@
 "patch should ideally only add new lines."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-gensymbols.1:64
+msgid ""
+"Note that you can put comments in symbols files: any line with '#' as the "
+"first character is a comment except if it starts with '#include' (see "
+"section B<Using includes>). Lines starting with '#MISSING:' are special "
+"comments documenting symbols that have disappeared."
+msgstr ""
+
 #. type: SS
-#: dpkg-gensymbols.1:59
+#: dpkg-gensymbols.1:64
 #, no-wrap
 msgid "Using #PACKAGE# substitution"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 msgid ""
 "In some rare cases, the name of the library varies between architectures.  "
 "To avoid hardcoding the name of the package in the symbols file, you can use "
@@ -8229,13 +8608,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 #, no-wrap
 msgid "Using symbol tags"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:74
+#: dpkg-gensymbols.1:79
 msgid ""
 "Symbol tagging is useful for marking symbols that are special in some way.  "
 "Any symbol can have an arbitrary number of tags associated with it. While "
@@ -8245,7 +8624,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:86
+#: dpkg-gensymbols.1:91
 msgid ""
 "Tag specification comes right before the symbol name (no whitespace is "
 "allowed in between). It always starts with an opening bracket B<(>, ends "
@@ -8261,7 +8640,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:90
+#: dpkg-gensymbols.1:95
 #, no-wrap
 msgid ""
 " (tag1=i am marked|tag name with space)\"tagged quoted symbol\"@Base 1.0\n"
@@ -8270,7 +8649,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:96
+#: dpkg-gensymbols.1:101
 msgid ""
 "The first symbol in the example is named I<tagged quoted symbol> and has two "
 "tags: I<tag1> with value I<i am marked> and I<tag name with space> that has "
@@ -8280,7 +8659,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 msgid ""
 "Since symbol tags are an extension of the I<deb-symbols(5)> format, they can "
 "only be part of the symbols files used in source packages (those files "
@@ -8295,20 +8674,20 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 #, no-wrap
 msgid "Standard symbol tags"
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:109
+#: dpkg-gensymbols.1:114
 #, fuzzy, no-wrap
 #| msgid "B<not-installed>"
 msgid "B<optional>"
 msgstr "B<not-installed>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:119
+#: dpkg-gensymbols.1:124
 msgid ""
 "A symbol marked as optional can disappear from the library at any time and "
 "that will never cause B<dpkg-gensymbols> to fail. However, disappeared "
@@ -8321,7 +8700,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 msgid ""
 "This tag is useful for symbols which are private where their disappearance "
 "do not cause ABI breakage. For example, most of C++ template instantiations "
@@ -8331,13 +8710,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 #, fuzzy, no-wrap
 msgid "B<arch=>I<architecture list>"
 msgstr "B<-a, --no-architecture>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:137
+#: dpkg-gensymbols.1:142
 msgid ""
 "This tag allows one to restrict the set of architectures where the symbol is "
 "supposed to exist. When the symbols list is updated with the symbols "
@@ -8353,7 +8732,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:143
+#: dpkg-gensymbols.1:148
 msgid ""
 "When operating in the default non-template mode, among arch-specific symbols "
 "only those that match the current host architecture are written to the "
@@ -8363,7 +8742,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:149
+#: dpkg-gensymbols.1:154
 msgid ""
 "The format of I<architecture list> is the same as the one used in the "
 "I<Build-Depends> field of I<debian/control> (except the enclosing square "
@@ -8373,7 +8752,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid ""
 " (arch=alpha amd64 kfreebsd-amd64 ia64)a_64bit_specific_symbol@Base 1.0\n"
@@ -8381,13 +8760,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, fuzzy, no-wrap
 msgid "B<ignore-blacklist>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:160
+#: dpkg-gensymbols.1:165
 msgid ""
 "dpkg-gensymbols has an internal blacklist of symbols that should not appear "
 "in symbols files as they are usually only side-effects of implementation "
@@ -8398,52 +8777,52 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:160 dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:165 dpkg-gensymbols.1:202
 #, fuzzy, no-wrap
 msgid "B<c++>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:164
+#: dpkg-gensymbols.1:169
 msgid ""
 "Denotes I<c++> symbol pattern. See B<Using symbol patterns> subsection below."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:164 dpkg-gensymbols.1:228
+#: dpkg-gensymbols.1:169 dpkg-gensymbols.1:233
 #, fuzzy, no-wrap
 msgid "B<symver>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:168
+#: dpkg-gensymbols.1:173
 msgid ""
 "Denotes I<symver> (symbol version) symbol pattern. See B<Using symbol "
 "patterns> subsection below."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:168 dpkg-gensymbols.1:253
+#: dpkg-gensymbols.1:173 dpkg-gensymbols.1:258
 #, fuzzy, no-wrap
 #| msgid "B<purge>"
 msgid "B<regex>"
 msgstr "B<purge>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 msgid ""
 "Denotes I<regex> symbol pattern. See B<Using symbol patterns> subsection "
 "below."
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 #, no-wrap
 msgid "Using symbol patterns"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:180
+#: dpkg-gensymbols.1:185
 msgid ""
 "Unlike a standard symbol specification, a pattern may cover multiple real "
 "symbols from the library. B<dpkg-gensymbols> will attempt to match each "
@@ -8455,7 +8834,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:188
+#: dpkg-gensymbols.1:193
 msgid ""
 "A pattern is considered lost if it does not match any symbol in the library. "
 "By default this will trigger a B<dpkg-gensymbols> failure under I<-c1> or "
@@ -8468,7 +8847,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:195
+#: dpkg-gensymbols.1:200
 msgid ""
 "Patterns are an extension of the I<deb-symbols(5)> format hence they are "
 "only valid in symbol file templates. Pattern specification syntax is not any "
@@ -8479,12 +8858,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:202
 msgid "At the moment, B<dpkg-gensymbols> supports three basic pattern types:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:209
+#: dpkg-gensymbols.1:214
 msgid ""
 "This pattern is denoted by the I<c++> tag. It matches only C++ symbols by "
 "their demangled symbol name (as emitted by B<c++filt>(1) utility). This "
@@ -8499,7 +8878,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:215
+#: dpkg-gensymbols.1:220
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -8509,19 +8888,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:217
+#: dpkg-gensymbols.1:222
 msgid ""
 "The demangled name above can be obtained by executing the following command:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:219
+#: dpkg-gensymbols.1:224
 #, no-wrap
 msgid " $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:227
+#: dpkg-gensymbols.1:232
 msgid ""
 "Please note that while mangled name is unique in the library by definition, "
 "this is not necessarily true for demangled names. A couple of distinct real "
@@ -8533,7 +8912,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:234
+#: dpkg-gensymbols.1:239
 msgid ""
 "This pattern is denoted by the I<symver> tag. Well maintained libraries have "
 "versioned symbols where each version corresponds to the upstream version "
@@ -8542,7 +8921,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:241
+#: dpkg-gensymbols.1:246
 #, no-wrap
 msgid ""
 "libc.so.6 libc6 #MINVER#\n"
@@ -8553,7 +8932,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:247
+#: dpkg-gensymbols.1:252
 msgid ""
 "All symbols associated with versions GLIBC_2.0 and GLIBC_2.7 will lead to "
 "minimal version of 2.0 and 2.7 respectively with the exception of the symbol "
@@ -8563,7 +8942,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:252
+#: dpkg-gensymbols.1:257
 msgid ""
 "Please note that while old style wildcard patterns (denoted by \"*@version\" "
 "in the symbol name field) are still supported, they have been deprecated by "
@@ -8573,7 +8952,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:260
+#: dpkg-gensymbols.1:265
 msgid ""
 "Regular expression patterns are denoted by the I<regex> tag. They match by "
 "the perl regular expression specified in the symbol name field. A regular "
@@ -8583,7 +8962,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:265
+#: dpkg-gensymbols.1:270
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -8592,7 +8971,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:270
+#: dpkg-gensymbols.1:275
 msgid ""
 "Symbols like \"mystack_new@Base\", \"mystack_push@Base\", \"mystack_pop@Base"
 "\" etc.  will be matched by the first pattern while e.g. "
@@ -8602,7 +8981,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:275
+#: dpkg-gensymbols.1:280
 msgid ""
 "Basic patterns listed above can be combined where it makes sense. In that "
 "case, they are processed in the order in which the tags are specified. For "
@@ -8610,7 +8989,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:278
+#: dpkg-gensymbols.1:283
 #, no-wrap
 msgid ""
 " (c++|regex)\"^NSA::ClassA::Private::privmethod\\ed\\e(int\\e)@Base\" 1.0\n"
@@ -8618,7 +8997,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:288
+#: dpkg-gensymbols.1:293
 msgid ""
 "will match symbols \"_ZN3NSA6ClassA7Private11privmethod1Ei@Base\" and "
 "\"_ZN3NSA6ClassA7Private11privmethod2Ei@Base\". When matching the first "
@@ -8633,7 +9012,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:294
+#: dpkg-gensymbols.1:299
 msgid ""
 "In general, all patterns are divided into two groups: aliases (basic I<c++> "
 "and I<symver>) and generic patterns (I<regex>, all combinations of multiple "
@@ -8643,7 +9022,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 msgid ""
 "When multiple patterns match the same real symbol, aliases (first I<c++>, "
 "then I<symver>) are preferred over generic patterns. Generic patterns are "
@@ -8654,13 +9033,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 #, no-wrap
 msgid "Using includes"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:306
+#: dpkg-gensymbols.1:311
 msgid ""
 "When the set of exported symbols differ between architectures, it may become "
 "inefficient to use a single symbol file. In those cases, an include "
@@ -8668,7 +9047,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:310
+#: dpkg-gensymbols.1:315
 msgid ""
 "You can factorize the common part in some external file and include that "
 "file in your I<package>.symbols.I<arch> file by using an include directive "
@@ -8676,31 +9055,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:312
+#: dpkg-gensymbols.1:317
 msgid "#include \"I<packages>.symbols.common\""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:314
+#: dpkg-gensymbols.1:319
 msgid "The include directive may also be tagged like any symbol:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:316
-msgid "(tag|..|tagN)#include \"file_to_include\""
+#: dpkg-gensymbols.1:321
+msgid "(tag|..|tagN)#include \"file-to-include\""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:321
+#: dpkg-gensymbols.1:326
 msgid ""
-"As a result, all symbols included from I<file_to_include> will be considered "
+"As a result, all symbols included from I<file-to-include> will be considered "
 "to be tagged with I<tag> .. I<tagN> by default. You can use this feature to "
 "create a common I<package>.symbols file which includes architecture specific "
 "symbol files:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:326
+#: dpkg-gensymbols.1:331
 #, no-wrap
 msgid ""
 "  common_symbol1@Base 1.0\n"
@@ -8710,7 +9089,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:335
+#: dpkg-gensymbols.1:340
 msgid ""
 "The symbols files are read line by line, and include directives are "
 "processed as soon as they are encountered. This means that the content of "
@@ -8723,7 +9102,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:340
+#: dpkg-gensymbols.1:345
 msgid ""
 "An included file can repeat the header line containing the SONAME of the "
 "library. In that case, it overrides any header line previously read.  "
@@ -8732,7 +9111,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid ""
 "#include \"libsomething1.symbols.common\"\n"
@@ -8740,39 +9119,39 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid "Good library management"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:346
+#: dpkg-gensymbols.1:351
 msgid "A well-maintained library has the following features:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:350
+#: dpkg-gensymbols.1:355
 msgid ""
 "its API is stable (public symbols are never dropped, only new public symbols "
 "are added) and changes in incompatible ways only when the SONAME changes;"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:353
+#: dpkg-gensymbols.1:358
 msgid ""
 "ideally, it uses symbol versioning to achieve ABI stability despite internal "
 "changes and API extension;"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:356
+#: dpkg-gensymbols.1:361
 msgid ""
 "it doesn't export private symbols (such symbols can be tagged optional as "
 "workaround)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:364
+#: dpkg-gensymbols.1:369
 msgid ""
 "While maintaining the symbols file, it's easy to notice appearance and "
 "disappearance of symbols. But it's more difficult to catch incompatible API "
@@ -8784,39 +9163,39 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:365
+#: dpkg-gensymbols.1:370
 #, fuzzy, no-wrap
 msgid "B<-P>I<package-build-dir>"
 msgstr "B<[--] >I<filename>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:368
+#: dpkg-gensymbols.1:373
 #, fuzzy
 msgid "Scan I<package-build-dir> instead of debian/tmp."
 msgstr "B<-u> を指定した場合は、*.deb の代わりに *.udeb をスキャンする。"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 msgid ""
 "Define the package name. Required if more than one binary package is listed "
 "in debian/control (or if there's no debian/control file)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 msgid ""
 "Define the package version. Defaults to the version extracted from debian/"
 "changelog. Required if called outside of a source package tree."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 #, fuzzy, no-wrap
 msgid "B<-e>I<library-file>"
 msgstr "B<--fsys-tarfile>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 msgid ""
 "Only analyze libraries explicitly listed instead of finding all public "
 "libraries. You can use a regular expression in I<library-file> to match "
@@ -8825,33 +9204,33 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 #, fuzzy, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<[--] >I<filename>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:386
+#: dpkg-gensymbols.1:391
 msgid ""
 "Use I<filename> as reference file to generate the symbols file that is "
 "integrated in the package itself."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 msgid ""
 "Print the generated symbols file to standard output, rather than being "
 "stored in the package build tree."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 #, fuzzy, no-wrap
 msgid "B<-O>I<filename>"
 msgstr "B<[--] >I<filename>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 msgid ""
 "Store the generated symbols file as I<filename>. If I<filename> is pre-"
 "existing, its content is used as basis for the generated symbols file.  You "
@@ -8860,13 +9239,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 #, fuzzy, no-wrap
 msgid "B<-t>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 msgid ""
 "Write the symbol file in template mode rather than the format compatible "
 "with I<deb-symbols(5)>. The main difference is that in the template mode "
@@ -8878,13 +9257,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 #, fuzzy, no-wrap
 msgid "B<-c>I<[0-4]>"
 msgstr "B<--list> [I<E<lt>glob-patternE<gt>>]"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:413
+#: dpkg-gensymbols.1:418
 msgid ""
 "Define the checks to do when comparing the generated symbols file with the "
 "template file used as starting point. By default the level is 1. Increasing "
@@ -8895,14 +9274,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:416
+#: dpkg-gensymbols.1:421
 msgid ""
 "This value can be overridden by the environment variable "
 "DPKG_GENSYMBOLS_CHECK_LEVEL."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 msgid ""
 "Keep quiet and never generate a diff between generated symbols file and the "
 "template file used as starting point or show any warnings about new/lost "
@@ -8911,13 +9290,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 #, fuzzy, no-wrap
 msgid "B<-a>I<arch>"
 msgstr "B<-a, --no-architecture>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:427
+#: dpkg-gensymbols.1:432
 msgid ""
 "Assume I<arch> as host architecture when processing symbol files. Use this "
 "option to generate a symbol file or diff for any architecture provided its "
@@ -8925,21 +9304,21 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 msgid ""
 "Enable debug mode. Numerous messages are displayed to explain what B<dpkg-"
 "gensymbols> does."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 #, fuzzy, no-wrap
 #| msgid "B<-G>"
 msgid "B<-V>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:438
+#: dpkg-gensymbols.1:443
 msgid ""
 "Enable verbose mode. The generated symbols file contains deprecated symbols "
 "as comments. Furthermore in template mode, pattern symbols are followed by "
@@ -8947,22 +9326,22 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:447
+#: dpkg-gensymbols.1:452
 msgid "B<http://people.redhat.com/drepper/symbol-versioning>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:449
+#: dpkg-gensymbols.1:454
 msgid "B<http://people.redhat.com/drepper/goodpractice.pdf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:451
+#: dpkg-gensymbols.1:456
 msgid "B<http://people.redhat.com/drepper/dsohowto.pdf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:454
+#: dpkg-gensymbols.1:459
 #, fuzzy
 msgid "B<deb-symbols>(5), B<dpkg-shlibdeps>(1)."
 msgstr ""
@@ -8970,7 +9349,7 @@
 "B<xargs>(1)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:457
+#: dpkg-gensymbols.1:462
 #, fuzzy
 msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
 msgstr "Copyright 2001 Joey Hess"
@@ -8981,12 +9360,6 @@
 msgid "dpkg-maintscript-helper"
 msgstr ""
 
-#. type: TH
-#: dpkg-maintscript-helper.1:1
-#, fuzzy, no-wrap
-msgid "2010-04-16"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-maintscript-helper.1:4
 msgid ""
@@ -8997,8 +9370,8 @@
 #. type: Plain text
 #: dpkg-maintscript-helper.1:8
 msgid ""
-"B<dpkg-maintscript-helper> I<command> [I<parameters>...] -- I<maint-script-"
-"parameters>"
+"B<dpkg-maintscript-helper> I<command> [I<parameter>...] B<--> I<maint-script-"
+"parameter>..."
 msgstr ""
 
 #. type: SH
@@ -9033,8 +9406,8 @@
 "scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
 "the same call simply needs to be put in all scripts and the program will "
 "automatically adapt its behaviour based on the environment variable "
-"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
-"to forward after a double dash."
+"B<DPKG_MAINTSCRIPT_NAME> and on the maintainer scripts arguments that you "
+"have to forward after a double dash."
 msgstr ""
 
 #. type: SH
@@ -9197,9 +9570,10 @@
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:118
-#, no-wrap
-msgid "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+msgid "    B<Pre-Depends:> dpkg (E<gt>= 1.15.7.2)\n"
+msgstr "B<Pre-Depends:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:123
@@ -9214,12 +9588,18 @@
 #: dpkg-maintscript-helper.1:127
 #, no-wrap
 msgid ""
-"    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
-"        dpkg-maintscript-helper E<lt>commandE<gt> ...\n"
+"    if dpkg-maintscript-helper supports I<command>; then\n"
+"        dpkg-maintscript-helper I<command> ...\n"
 "    fi\n"
 msgstr ""
 
 #. type: Plain text
+#: dpkg-maintscript-helper.1:130
+#, fuzzy
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: Plain text
 #: dpkg-maintscript-helper.1:132
 #, fuzzy
 msgid "Copyright \\(co 2008 Joey Hess"
@@ -9243,13 +9623,6 @@
 msgid "dpkg-mergechangelogs"
 msgstr "B<dpkg> [I<options>] I<action>"
 
-#. type: TH
-#: dpkg-mergechangelogs.1:1
-#, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-04-18"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-mergechangelogs.1:4
 #, fuzzy
@@ -9379,22 +9752,20 @@
 #. type: Plain text
 #: dpkg-name.1:15
 #, fuzzy
-msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+msgid "B<dpkg-name> [I<option>...] [B<-->] I<file>..."
 msgstr "B<dpkg-divert> [I<options>] [B<--add>] I<E<lt>fileE<gt>>"
 
 #. type: Plain text
-#: dpkg-name.1:28
+#: dpkg-name.1:29
 #, 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>."
-"E<lt>package_typeE<gt>> 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. "
-"The I<E<lt>package_typeE<gt>> part comes from that field if present or "
-"fallbacks to B<deb>."
+"package name consists of I<package>B<_>I<version>B<_>I<architecture>B<."
+">I<package-type> as specified in the control file of the package. The "
+"I<version> part of the filename consists of the upstream version information "
+"optionally followed by a hyphen and the revision information. The I<package-"
+"type> part comes from that field if present or fallbacks to B<deb>."
 msgstr ""
 "このマニュアルページでは、B<dpkg-name> シェルスクリプトについて説明する。"
 "B<dpkg-name> シェルスクリプトは、B<Debian> パッケージを完全なパッケージ名に、"
@@ -9405,59 +9776,70 @@
 "る。"
 
 #. type: TP
-#: dpkg-name.1:30
+#: dpkg-name.1:31
 #, fuzzy, no-wrap
 msgid "B<-a>, B<--no-architecture>"
 msgstr "B<-a, --no-architecture>"
 
 #. type: Plain text
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 msgid "The destination filename will not have the architecture information."
 msgstr "変更後のファイル名にアーキテクチャ情報を含ませない。"
 
 #. type: TP
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 #, fuzzy, no-wrap
 msgid "B<-k>, B<--symlink>"
 msgstr "B<-k, --symlink>"
 
 #. type: Plain text
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 msgid "Create a symlink, instead of moving."
 msgstr "移動するかわりにシンボリックリンクを作る。"
 
 #. type: TP
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 #, fuzzy, no-wrap
 msgid "B<-o>, B<--overwrite>"
 msgstr "B<-o, --overwrite>"
 
 #. type: Plain text
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 msgid ""
 "Existing files will be overwritten if they have the same name as the "
 "destination filename."
 msgstr "変更後のファイル名と同名のファイルがあれば、それを上書きしてしまう。"
 
 #. type: TP
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 #, fuzzy, no-wrap
 msgid "B<-s>, B<--subdir> [I<dir>]"
 msgstr "B<-s, --subdir> [I<dir>]"
 
 #. type: Plain text
-#: dpkg-name.1:52
+#: dpkg-name.1:53
+#, 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."
 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 package. The target directory will be `unstable/binary-I<architecture>/"
+"I<section>'. 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 `I<section>/binary-I<architecture>'. 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 のセクションフィールドから得られたターゲットディレ"
@@ -9471,13 +9853,13 @@
 "介である。"
 
 #. type: TP
-#: dpkg-name.1:52
+#: dpkg-name.1:53
 #, fuzzy, no-wrap
 msgid "B<-c>, B<--create-dir>"
 msgstr "B<-c, --create-dir>"
 
 #. type: Plain text
-#: dpkg-name.1:57
+#: dpkg-name.1:58
 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.>"
@@ -9486,19 +9868,19 @@
 "リがなければ、自動的に作成される。B<このオプションを使う時は注意すること。>"
 
 #. type: TP
-#: dpkg-name.1:60
+#: dpkg-name.1:61
 #, fuzzy, no-wrap
 msgid "B<-v>, B<--version>"
 msgstr "B<-v, --version>"
 
 #. type: TP
-#: dpkg-name.1:65
+#: dpkg-name.1:66
 #, no-wrap
 msgid "B<dpkg-name bar-foo.deb>"
 msgstr "B<dpkg-name bar-foo.deb>"
 
 #. type: Plain text
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 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 "
@@ -9508,13 +9890,13 @@
 "(実際にどうなるかは `bar-foo.deb' の中の control の情報に依存する)"
 
 #. type: TP
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 #, 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:75
+#: dpkg-name.1:76
 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 "
@@ -9524,13 +9906,13 @@
 "name を使ってアーキテクチャ情報なしの名前に変更する。"
 
 #. type: TP
-#: dpkg-name.1:75
+#: dpkg-name.1:76
 #, 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:81
+#: dpkg-name.1:82
 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.>"
@@ -9539,23 +9921,30 @@
 "たのアーカイブはぐちゃぐちゃになってしまうだろう。B<やってはいけない!>"
 
 #. type: TP
-#: dpkg-name.1:81
+#: dpkg-name.1:82
 #, 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:84
+#: dpkg-name.1:85
 msgid "This can be used when building new packages."
 msgstr "これは新しいパッケージを作る時に使うことができる。"
 
 #. type: Plain text
-#: dpkg-name.1:94
+#: dpkg-name.1:95
+#, 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."
 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 "
+"I<package>B<_>I<version>B<_>I<architecture>B<.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>アーキテ"
@@ -9565,7 +9954,7 @@
 "ているインストールツールによっては影響があるかもしれない。"
 
 #. type: Plain text
-#: dpkg-name.1:102
+#: dpkg-name.1:103
 msgid ""
 "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
 "B<xargs>(1)."
@@ -9574,7 +9963,7 @@
 "B<xargs>(1)."
 
 #. type: Plain text
-#: dpkg-name.1:105
+#: dpkg-name.1:106
 #, fuzzy
 msgid "Copyright \\(co 1995,1996 Erick Branderhorst"
 msgstr "Copyright (C) 1995 Ian Jackson."
@@ -9585,12 +9974,6 @@
 msgid "dpkg-parsechangelog"
 msgstr "B<dpkg> [I<options>] I<action>"
 
-#. type: TH
-#: dpkg-parsechangelog.1:1
-#, fuzzy, no-wrap
-msgid "2009-05-19"
-msgstr "2006-05-10"
-
 #. type: Plain text
 #: dpkg-parsechangelog.1:4
 #, fuzzy
@@ -9600,7 +9983,7 @@
 #. type: Plain text
 #: dpkg-parsechangelog.1:8
 #, fuzzy
-msgid "B<dpkg-parsechangelog> [I<options>]"
+msgid "B<dpkg-parsechangelog> [I<option>...]"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
@@ -9658,25 +10041,25 @@
 #. type: TP
 #: dpkg-parsechangelog.1:54
 #, fuzzy, no-wrap
-msgid "B<Source:> E<lt>pkg nameE<gt>"
+msgid "B<Source:>I< pkg-name>"
 msgstr "B<Source:> E<lt>ソース名E<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:56
 #, fuzzy, no-wrap
-msgid "B<Version:> E<lt>versionE<gt>"
+msgid "B<Version:>I< version>"
 msgstr "B<Version:> E<lt>バージョン文字列E<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:58
 #, fuzzy, no-wrap
-msgid "B<Distribution:> E<lt>target distributionE<gt>"
+msgid "B<Distribution:>I< target-distribution>"
 msgstr "B<Description:> E<lt>短い説明E<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:60
 #, fuzzy, no-wrap
-msgid "B<Urgency:> E<lt>urgencyE<gt>"
+msgid "B<Urgency:>I< urgency>"
 msgstr "B<Replaces:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
@@ -9687,19 +10070,19 @@
 #. type: TP
 #: dpkg-parsechangelog.1:63
 #, fuzzy, no-wrap
-msgid "B<Maintainer:> E<lt>authorE<gt>"
+msgid "B<Maintainer:>I< author>"
 msgstr "B<Maintainer:> E<lt>名前 emailE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:65
 #, fuzzy, no-wrap
-msgid "B<Date:> E<lt>dateE<gt>"
+msgid "B<Date:>I< date>"
 msgstr "B<Replaces:> E<lt>パッケージリストE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:67
 #, fuzzy, no-wrap
-msgid "B<Closes:> E<lt>bug numberE<gt>"
+msgid "B<Closes:>I< bug-number>"
 msgstr "B<Source:> E<lt>ソース名E<gt>"
 
 #. type: Plain text
@@ -9710,7 +10093,7 @@
 #. type: TP
 #: dpkg-parsechangelog.1:70
 #, fuzzy, no-wrap
-msgid "B<Changes:> E<lt>changelog entriesE<gt>"
+msgid "B<Changes:>I< changelog-entries>"
 msgstr "B<Package:> E<lt>パッケージ名E<gt>"
 
 #. type: Plain text
@@ -9805,7 +10188,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-parsechangelog.1:104 update-alternatives.8:269
+#: dpkg-parsechangelog.1:104 update-alternatives.8:268
 #, no-wrap
 msgid "B<--all>"
 msgstr "B<--all>"
@@ -10008,39 +10391,46 @@
 msgstr "B<-s> | B<--status> I<package-name> ..."
 
 #. type: Plain text
-#: dpkg-query.1:78
+#: dpkg-query.1:79
+#, fuzzy
+#| msgid ""
+#| "Report status of specified package. This just displays the entry in the "
+#| "installed package status database."
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"installed package status database. When multiple I<package-name> are listed, "
+"the requested status entries are separated by an empty line."
 msgstr ""
 "指定したパッケージの状況を報告する。これは、インストール済みパッケージ状況"
 "データベースからの内容を表示しているだけである。"
 
 #. type: TP
-#: dpkg-query.1:78
+#: dpkg-query.1:79
 #, fuzzy, no-wrap
 msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<-L> | B<--listfiles> I<package-name> ..."
 
 #. type: Plain text
-#: dpkg-query.1:83
+#: dpkg-query.1:85
 #, fuzzy
 msgid ""
-"List files installed to your system from I<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+"List files installed to your system from I<package-name>. When multiple "
+"I<package-name> are listed, the requested lists of files are separated by an "
+"empty line. However, note that files created by package-specific "
+"installation-scripts are not listed."
 msgstr ""
 "B<package-name> によってインストールしたファイルを表示する。ただし、パッケー"
 "ジ付属のインストールスクリプトによって作成されたファイルは表示されないことに"
 "注意すること。"
 
 #. type: TP
-#: dpkg-query.1:83
+#: dpkg-query.1:85
 #, fuzzy, no-wrap
 msgid "B<-c>, B<--control-path> I<package-name> [I<control-file>]"
 msgstr "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
 
 #. type: Plain text
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 msgid ""
 "List paths for control files installed to your system from I<package-name>.  "
 "If I<control-file> is specified then only list the path for that control "
@@ -10051,17 +10441,23 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 #, fuzzy, no-wrap
 msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr "B<-S> | B<--search> I<filename-search-pattern> ..."
 
 #. type: Plain text
-#: dpkg-query.1:97
-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."
+#: dpkg-query.1:99
+#, 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."
+msgid ""
+"Search for packages that own files corresponding to the given pattern.  "
+"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 ""
 "指定したファイルがどのパッケージからインストールされたかを探す。パターンに"
 "は、標準的なシェルのすべてのワイルド文字を使用することができる。このコマンド"
@@ -10069,33 +10465,40 @@
 "ができない。"
 
 #. type: TP
-#: dpkg-query.1:97
+#: dpkg-query.1:99
 #, fuzzy, 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:104
+#: dpkg-query.1:105
 msgid ""
 "Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>. Users of APT-based frontends should use B<apt-cache show> "
-"I<package-name> instead as the I<available> file is only kept up-to-date "
-"when using B<dselect>."
+"available>. When multiple I<package-name> are listed, the requested "
+"I<available> entries are separated by an empty line."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.1:110
+msgid ""
+"Users of APT-based frontends should use B<apt-cache show> I<package-name> "
+"instead as the I<available> file is only kept up-to-date when using "
+"B<dselect>."
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:116
+#: dpkg-query.1:122
 #, fuzzy, no-wrap
 msgid "B<-f>, B<--showformat=>I<format>"
 msgstr "B<-f> | B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-query.1:123
+#: dpkg-query.1:129
 msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
 msgstr "フォーマット文字列中では、\\(lqB<\\e>\\(rq はエスケープ文字である:"
 
 #. type: Plain text
-#: dpkg-query.1:128
+#: dpkg-query.1:134
 #, no-wrap
 msgid ""
 "    B<\\en>  newline\n"
@@ -10107,7 +10510,7 @@
 "    B<\\et>  タブ\n"
 
 #. type: Plain text
-#: dpkg-query.1:133
+#: dpkg-query.1:139
 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<"
@@ -10117,7 +10520,7 @@
 "る。\\(lqB<\\e>\\(rq や \\(lqB<$>\\(rq のために有用である。"
 
 #. type: Plain text
-#: dpkg-query.1:141
+#: dpkg-query.1:147
 #, fuzzy
 msgid ""
 "Package information can be included by inserting variable references to "
@@ -10133,7 +10536,7 @@
 "以下の I<field> は認識される:"
 
 #. type: Plain text
-#: dpkg-query.1:176
+#: dpkg-query.1:182
 #, fuzzy, no-wrap
 msgid ""
 "    B<Architecture>\n"
@@ -10146,11 +10549,11 @@
 "    B<Description>\n"
 "    B<Enhances>\n"
 "    B<Essential>\n"
-"    B<Filename> (internal, dselect related)\n"
+"    B<Filename> (internal, front-end related)\n"
 "    B<Homepage>\n"
 "    B<Installed-Size>\n"
-"    B<MD5sum> (internal, dselect related)\n"
-"    B<MSDOS-Filename> (internal, dselect related)\n"
+"    B<MD5sum> (internal, front-end related)\n"
+"    B<MSDOS-Filename> (internal, front-end related)\n"
 "    B<Maintainer>\n"
 "    B<Origin>\n"
 "    B<Package>\n"
@@ -10161,11 +10564,11 @@
 "    B<Replaces>\n"
 "    B<Revision> (obsolete)\n"
 "    B<Section>\n"
-"    B<Size> (internal, dselect related)\n"
+"    B<Size> (internal, front-end related)\n"
 "    B<Source>\n"
 "    B<Status> (internal)\n"
 "    B<Suggests>\n"
-"    B<Tag> (usually not in the .deb but in APT's Packages files)\n"
+"    B<Tag> (usually not in the .deb but in the repository Packages files)\n"
 "    B<Triggers-Awaited> (internal)\n"
 "    B<Triggers-Pending> (internal)\n"
 "    B<Version>\n"
@@ -10200,7 +10603,7 @@
 "    B<Version>\n"
 
 #. type: Plain text
-#: dpkg-query.1:184
+#: dpkg-query.1:190
 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 "
@@ -10215,39 +10618,41 @@
 "を得るには、これを実行する:"
 
 #. type: Plain text
-#: dpkg-query.1:187
+#: dpkg-query.1:193
 #, fuzzy, no-wrap
 msgid "  B<dpkg-query -W -f=\\(aq${Package} ${Version}\\et${Maintainer}\\en\\(aq dpkg>\n"
 msgstr "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
 
 #. type: SH
-#: dpkg-query.1:189 dpkg-split.1:180 start-stop-daemon.8:256
-#: update-alternatives.8:375
+#: dpkg-query.1:195 dpkg-split.1:179 start-stop-daemon.8:259
+#: update-alternatives.8:374
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "終了ステータス"
 
-#. type: IP
-#: dpkg-query.1:190 update-alternatives.8:376
+#. type: TP
+#: dpkg-query.1:196 dpkg-split.1:180 start-stop-daemon.8:260
+#: start-stop-daemon.8:289 update-alternatives.8:375
 #, no-wrap
-msgid "0"
-msgstr "0"
+msgid "B<0>"
+msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:192
+#: dpkg-query.1:199
 #, fuzzy
 #| msgid "The requested action was successfully performed."
 msgid "The requested query was successfully performed."
 msgstr "リクエストされたアクションが正しく実行された。"
 
-#. type: IP
-#: dpkg-query.1:192
+#. type: TP
+#: dpkg-query.1:199 dpkg-split.1:186 start-stop-daemon.8:270
+#: start-stop-daemon.8:292
 #, no-wrap
-msgid "1"
+msgid "B<1>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:195
+#: dpkg-query.1:203
 #, fuzzy
 #| msgid ""
 #| "Problems were encountered whilst parsing the command line or performing "
@@ -10259,14 +10664,14 @@
 "コマンドラインの解釈を行うときか、アクションを実行するときに問題が起こった。"
 
 #. type: Plain text
-#: dpkg-query.1:205
+#: dpkg-query.1:213
 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:208
+#: dpkg-query.1:216
 #, fuzzy
 msgid "Copyright \\(co 2001 Wichert Akkerman"
 msgstr "Copyright 2000 Wichert Akkerman"
@@ -10277,12 +10682,6 @@
 msgid "dpkg-scanpackages"
 msgstr "dpkg-scanpackages"
 
-#. type: TH
-#: dpkg-scanpackages.1:15 dpkg-scansources.1:1
-#, fuzzy, no-wrap
-msgid "2009-10-01"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-scanpackages.1:18
 #, fuzzy
@@ -10290,17 +10689,17 @@
 msgstr "dpkg-scanpackages - Packages ファイルの作成"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:27
+#: dpkg-scanpackages.1:26
 #, fuzzy
 msgid ""
-"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scanpackages> [I<option>...] 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-scanpackages.1:40
+#: dpkg-scanpackages.1:39
 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 "
@@ -10318,7 +10717,7 @@
 "る。"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:52
+#: dpkg-scanpackages.1:51
 #, fuzzy
 msgid ""
 "B<Note:> If you want to access the generated Packages file with B<apt> you "
@@ -10332,7 +10731,7 @@
 "り B<file://> ソース)以外での非圧縮の Packages ファイルを無視する。"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:59
+#: 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 "
@@ -10345,7 +10744,7 @@
 "Filename フィールドはこの文字列で始まるからである。"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-scanpackages.1:63
 #, fuzzy
 #| msgid ""
 #| "I<overridefile> is the name of a file to read which contains information "
@@ -10359,7 +10758,7 @@
 "報を含んでいるファイルの名前である。以下を参照のこと。"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-scanpackages.1:66
 msgid ""
 "I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
@@ -10367,7 +10766,7 @@
 "る。"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:71
+#: dpkg-scanpackages.1:70
 #, fuzzy
 msgid ""
 "If more than one version of a package is found only the newest one is "
@@ -10380,73 +10779,73 @@
 "つかったパッケージすべてが出力に含まれる。"
 
 #. type: TP
-#: dpkg-scanpackages.1:73
+#: dpkg-scanpackages.1:72
 #, fuzzy, no-wrap
 msgid "B<-t>, B<--type> I<type>"
 msgstr "B<-t>|B<--test>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 #, fuzzy
 msgid "Scan for *.I<type> packages, instead of *.deb."
 msgstr "B<-u> を指定した場合は、*.deb の代わりに *.udeb をスキャンする。"
 
 #. type: TP
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 #, fuzzy, no-wrap
 msgid "B<-u>, B<--udeb>"
 msgstr "B<--show>, B<-W>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:79
+#: dpkg-scanpackages.1:78
 msgid "B<Obsolete> alias for B<-tudeb>."
 msgstr ""
 
 #. type: IP
-#: dpkg-scanpackages.1:79 dpkg-scansources.1:50
+#: dpkg-scanpackages.1:78 dpkg-scansources.1:49
 #, fuzzy, no-wrap
 msgid "B<-e>, B<--extra-override> I<file>"
 msgstr "B<-p>|B<--pidfile> I<pid-file>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:85 dpkg-scansources.1:55
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:54
 msgid ""
 "Scan I<file> to find supplementary overrides (the file can be compressed). "
 "See B<deb-extra-override>(5)  for more information on its format."
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:85
+#: dpkg-scanpackages.1:84
 #, fuzzy, no-wrap
 msgid "B<-a>, B<--arch> I<arch>"
 msgstr "B<-d>|B<--chdir> I<path>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 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:89
+#: dpkg-scanpackages.1:88
 #, fuzzy, no-wrap
 msgid "B<-m>, B<--multiversion>"
 msgstr "B<-V>|B<--version>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 msgid "Include all found packages in the output."
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 #, fuzzy, no-wrap
 msgid "B<-M>, B<--medium> I<id-string>"
 msgstr "B<-p>|B<--pidfile> I<pid-file>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:97
+#: dpkg-scanpackages.1:96
 msgid ""
 "Add an X-Medium field containing the value I<id-string>. This field is "
 "required if you want to generate B<Packages.cd> files for use by the multicd "
@@ -10454,7 +10853,7 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-scanpackages.1:104 update-alternatives.8:447
+#: dpkg-scanpackages.1:103 update-alternatives.8:448
 #, fuzzy, no-wrap
 msgid "DIAGNOSTICS"
 msgstr ""
@@ -10464,7 +10863,7 @@
 "診断メッセージ"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:110
+#: dpkg-scanpackages.1:109
 msgid ""
 "B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
 "warns about packages that are in the wrong subdirectory, are duplicated, "
@@ -10477,7 +10876,7 @@
 "警告もする。"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:116
+#: dpkg-scanpackages.1:115
 #, fuzzy
 msgid ""
 "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<deb-extra-override>(5), "
@@ -10497,24 +10896,24 @@
 msgstr "dpkg-scanpackages - Packages ファイルの作成"
 
 #. type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-scansources.1:12
 #, fuzzy
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scansources> [I<option>...] 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: Plain text
-#: dpkg-scansources.1:18
+#: dpkg-scansources.1:17
 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:28
 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> "
@@ -10528,7 +10927,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-scansources.1:32
 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 "
@@ -10536,7 +10935,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:44
+#: dpkg-scansources.1:43
 #, fuzzy
 msgid ""
 "B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
@@ -10549,33 +10948,33 @@
 "り B<file://> ソース)以外での非圧縮の Packages ファイルを無視する。"
 
 #. type: IP
-#: dpkg-scansources.1:46
+#: dpkg-scansources.1:45
 #, fuzzy, no-wrap
 msgid "B<-n>, B<--no-sort>"
 msgstr "B<-o>|B<--oknodo>"
 
 #. type: Plain text
-#: dpkg-scansources.1:49
+#: dpkg-scansources.1:48
 msgid ""
 "Don't sort the index records. Normally they are sorted by source package "
 "name."
 msgstr ""
 
 #. type: IP
-#: dpkg-scansources.1:55
+#: dpkg-scansources.1:54
 #, fuzzy, no-wrap
 msgid "B<-s>, B<--source-override> I<file>"
 msgstr "B<-p>|B<--pidfile> I<pid-file>"
 
 #. type: Plain text
-#: dpkg-scansources.1:59
+#: dpkg-scansources.1:58
 msgid ""
 "Use I<file> as the source override file (the file can be compressed).  The "
 "default is the name of the override file you specified with I<.src> appended."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 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 "
@@ -10585,24 +10984,24 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 #. type: Plain text
-#: dpkg-scansources.1:67
+#: dpkg-scansources.1:66
 msgid "Turn debugging on."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:76
+#: dpkg-scansources.1:75
 #, fuzzy
 msgid "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 msgstr "dpkg-scanpackages"
 
 #. type: Plain text
-#: dpkg-scansources.1:78
+#: dpkg-scansources.1:77
 msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr ""
 
@@ -10612,36 +11011,29 @@
 msgid "dpkg-shlibdeps"
 msgstr "dpkg-checkbuilddeps"
 
-#. type: TH
-#: dpkg-shlibdeps.1:1 dpkg-source.1:2 start-stop-daemon.8:1
-#: update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2011-03-04"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: dpkg-shlibdeps.1:4
 msgid "dpkg-shlibdeps - generate shared library substvar dependencies"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:10
-msgid ""
-"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
-msgstr ""
+#: dpkg-shlibdeps.1:8
+#, fuzzy
+msgid "B<dpkg-shlibdeps> [I<option>...] [B<-e>]I<executable> [I<option>...]"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:24
+#: dpkg-shlibdeps.1:22
 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."
+"other variables starting with B<shlibs:> are removed from the file."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 msgid ""
 "B<dpkg-shlibdeps> has two possible sources of information to generate "
 "dependency information. Either I<symbols> files or I<shlibs> files. For each "
@@ -10658,13 +11050,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 #, no-wrap
 msgid "Symbols files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 msgid ""
 "Symbols files contain finer-grained dependency information by providing the "
 "minimum dependency for each symbol that the library exports. The script "
@@ -10673,13 +11065,13 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 #, no-wrap
 msgid "debian/*/DEBIAN/symbols"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are generated by B<dpkg-gensymbols>(1).  "
@@ -10689,19 +11081,19 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols.I<arch>"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:61
+#: dpkg-shlibdeps.1:59
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 msgid ""
 "Per-system overriding shared library dependency information.  I<arch> is the "
 "architecture of the current system (obtained by B<dpkg-architecture -"
@@ -10709,20 +11101,20 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> symbols\\(rq"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:68 dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:66 dpkg-shlibdeps.1:100
 msgid ""
 "Package-provided shared library dependency information.  Unless overridden "
 "by --admindir, those files are located in /var/lib/dpkg."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:75
+#: dpkg-shlibdeps.1:73
 msgid ""
 "While scanning the symbols used by all binaries, B<dpkg-shlibdeps> remembers "
 "the (biggest) minimal version needed for each library. At the end of the "
@@ -10731,7 +11123,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 msgid ""
 "As a safe-guard measure, a symbols file can provide a I<Build-Depends-"
 "Package> meta-information field and B<dpkg-shlibdeps> will extract the "
@@ -10741,13 +11133,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 #, no-wrap
 msgid "Shlibs files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:86
+#: dpkg-shlibdeps.1:84
 msgid ""
 "Shlibs files associate directly a library to a dependency (without looking "
 "at the symbols). It's thus often stronger than really needed but very safe "
@@ -10755,42 +11147,42 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 msgid ""
 "The dependencies for a library are looked up in several places. The first "
 "file providing information for the library of interest is used:"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 #, no-wrap
 msgid "debian/shlibs.local"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 msgid "Package-local overriding shared library dependency information."
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 #, fuzzy, no-wrap
 msgid "/etc/dpkg/shlibs.override"
 msgstr "I</var/lib/dpkg/statoverride>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 msgid "Per-system overriding shared library dependency information."
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 #, no-wrap
 msgid "debian/*/DEBIAN/shlibs"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are only used if the library is found in a "
@@ -10799,24 +11191,24 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> shlibs\\(rq"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:100
 #, fuzzy, no-wrap
 msgid "/etc/dpkg/shlibs.default"
 msgstr "I</var/lib/dpkg/statoverride>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:104
+#: dpkg-shlibdeps.1:102
 msgid "Per-system default shared library dependency information."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:108
+#: dpkg-shlibdeps.1:106
 msgid ""
 "The extracted dependencies are then directly used (except if they are "
 "filtered out because they have been identified as duplicate, or as weaker "
@@ -10824,33 +11216,33 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 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:113
+#: dpkg-shlibdeps.1:111
 #, fuzzy, no-wrap
 msgid "B<-e>I<executable>"
 msgstr "B<-x>|B<--exec> I<executable>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 msgid ""
 "Include dependencies appropriate for the shared libraries required by "
 "I<executable>."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 #, no-wrap
 msgid "B<-d>I<dependencyfield>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:123
+#: dpkg-shlibdeps.1:121
 msgid ""
 "Add dependencies to be added to the control file dependency field "
 "I<dependencyfield>.  (The dependencies for this field are placed in the "
@@ -10858,7 +11250,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:133
+#: dpkg-shlibdeps.1:131
 msgid ""
 "The B<-d>I<dependencyfield> option takes effect for all executables after "
 "the option, until the next B<-d>I<dependencyfield>.  The default "
@@ -10866,7 +11258,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 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>, "
@@ -10876,13 +11268,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 #, no-wrap
 msgid "B<-p>I<varnameprefix>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:152
+#: dpkg-shlibdeps.1:150
 msgid ""
 "Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
 ">.  Likewise, any existing substitution variables starting with "
@@ -10891,20 +11283,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 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:158
+#: dpkg-shlibdeps.1:156
 #, fuzzy, no-wrap
 msgid "B<-t>I<type>"
 msgstr "B<-t>|B<--test>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 msgid ""
 "Prefer shared library dependency information tagged for the given package "
 "type. If no tagged information is available, falls back to untagged "
@@ -10914,46 +11306,46 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 #, no-wrap
 msgid "B<-L>I<localshlibsfile>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:171
+#: dpkg-shlibdeps.1:169
 msgid ""
 "Read overriding shared library dependency information from "
 "I<localshlibsfile> instead of B<debian/shlibs.local>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 msgid ""
 "Write substitution variables in I<substvarsfile>; the default is B<debian/"
 "substvars>."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 #, fuzzy, no-wrap
 msgid "B<-v>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 msgid ""
 "Enable verbose mode. Numerous messages are displayed to explain what B<dpkg-"
 "shlibdeps> does."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 #, fuzzy, no-wrap
 msgid "B<-x>I<package>"
 msgstr "B<--package>I< E<lt>packageE<gt>>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 msgid ""
 "Exclude the package from the generated dependencies. This is useful to avoid "
 "self-dependencies for packages which provide ELF binaries (executables or "
@@ -10962,13 +11354,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 #, fuzzy, no-wrap
 msgid "B<-S>I<pkgbuilddir>"
 msgstr "B<[--] >I<filename>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 msgid ""
 "Look into I<pkgbuilddir> first when trying to find a library. This is useful "
 "when the source package builds multiple flavors of the same library and you "
@@ -10978,13 +11370,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 #, no-wrap
 msgid "B<--ignore-missing-info>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 msgid ""
 "Do not fail if dependency information can't be found for a shared library.  "
 "Usage of this option is discouraged, all libraries should provide dependency "
@@ -10993,13 +11385,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 #, no-wrap
 msgid "B<--warnings=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:213
+#: dpkg-shlibdeps.1:211
 msgid ""
 "I<value> is a bit field defining the set of warnings that can be emitted by "
 "B<dpkg-shlibdeps>.  Bit 0 (value=1) enables the warning \"symbol I<sym> used "
@@ -11011,13 +11403,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-shlibdeps.1:224
+#: dpkg-shlibdeps.1:222
 #, fuzzy, no-wrap
 msgid "WARNINGS"
 msgstr "警告"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 msgid ""
 "Since B<dpkg-shlibdeps> analyzes the set of symbols used by each binary of "
 "the generated package, it is able to emit warnings in several cases. They "
@@ -11027,13 +11419,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 #, no-wrap
 msgid "B<symbol>I< sym>B< used by >I<binary>B< found in none of the libraries.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a library and it needs to be linked "
@@ -11042,13 +11434,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 #, no-wrap
 msgid "I<binary>B< contains an unresolvable reference to symbol >I<sym>B<: it's probably a plugin>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a plugin and the symbol is probably "
@@ -11063,13 +11455,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 #, no-wrap
 msgid "B<dependency on >I<library>B< could be avoided if >I<binaries>B< were not uselessly linked against it (they use none of its symbols).>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 msgid ""
 "None of the I<binaries> that are linked with I<library> use any of the "
 "symbols provided by the library. By fixing all the binaries, you would avoid "
@@ -11078,13 +11470,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 #, no-wrap
 msgid "I<binary>B< shouldn't be linked with >I<library>B< (it uses none of its symbols).>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 msgid ""
 "The I<binary> is linked to a library that it doesn't need. It's not a "
 "problem but some small performance improvements in binary load time can be "
@@ -11094,13 +11486,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 #, no-wrap
 msgid "ERRORS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 msgid ""
 "B<dpkg-shlibdeps> will fail if it can't find a public library used by a "
 "binary or if this library has no associated dependency information (either "
@@ -11110,13 +11502,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 #, no-wrap
 msgid "B<couldn't find library >I<library-soname>B< needed by >I<binary>B< (its RPATH is '>I<rpath>B<')>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:287
+#: dpkg-shlibdeps.1:285
 msgid ""
 "The I<binary> uses a library called I<library-soname> but B<dpkg-shlibdeps> "
 "has been unable to find the library.  B<dpkg-shlibdeps> creates a list of "
@@ -11125,14 +11517,14 @@
 "LD_LIBRARY_PATH environment variable, and standard public directories (/"
 "lib, /usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks those "
 "directories in the package's build tree of the binary being analyzed, in the "
-"packages's build trees indicated with the -S command-line option, in other "
-"packages's build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
+"packages' build trees indicated with the -S command-line option, in other "
+"packages' build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
 "and finally in the root directory.  If the library is not found in any of "
 "those directories, then you get this error."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 msgid ""
 "If the library not found is in a private directory of the same package, then "
 "you want to add the directory to LD_LIBRARY_PATH. If it's in another binary "
@@ -11142,13 +11534,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 #, no-wrap
 msgid "B<no dependency information found for >I<library-file>B< (used by >I<binary>B<).>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:306
+#: dpkg-shlibdeps.1:304
 msgid ""
 "The library needed by I<binary> has been found by B<dpkg-shlibdeps> in "
 "I<library-file> but B<dpkg-shlibdeps> has been unable to find any dependency "
@@ -11159,7 +11551,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:320
+#: dpkg-shlibdeps.1:318
 msgid ""
 "This failure can be caused by a bad or missing shlibs or symbols file in the "
 "package of the library. It might also happen if the library is built within "
@@ -11174,7 +11566,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:326
+#: dpkg-shlibdeps.1:324
 msgid ""
 "Calling B<dpkg-shlibdeps> in verbose mode (-v) will provide much more "
 "information about where it tried to find the dependency information. This "
@@ -11182,13 +11574,13 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:330
+#: dpkg-shlibdeps.1:328
 #, fuzzy
 msgid "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:337
+#: dpkg-shlibdeps.1:335
 #, fuzzy
 msgid "Copyright \\(co 2006 Frank Lichtenheld"
 msgstr "Copyright 2000 Wichert Akkerman"
@@ -11206,19 +11598,19 @@
 msgstr "B<dpkg-deb> は、Debian アーカイブの作成、展開、情報の表示をする。"
 
 #. type: Plain text
-#: dpkg-source.1:10
+#: dpkg-source.1:9
 #, fuzzy
-msgid "B<dpkg-source> [I<options>] I<command>"
+msgid "B<dpkg-source> [I<option>...] I<command>"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
-#: dpkg-source.1:14
+#: dpkg-source.1:13
 #, fuzzy
 msgid "B<dpkg-source> packs and unpacks Debian source archives."
 msgstr "B<dpkg-deb> は、Debian アーカイブの作成、展開、情報の表示をする。"
 
 #. type: Plain text
-#: dpkg-source.1:18
+#: dpkg-source.1:17
 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 "
@@ -11226,13 +11618,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:20
+#: dpkg-source.1:19
 #, no-wrap
 msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:30
+#: dpkg-source.1:29
 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 "
@@ -11243,7 +11635,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:36
+#: dpkg-source.1:35
 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 "
@@ -11251,7 +11643,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:44
+#: dpkg-source.1:43
 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 "
@@ -11262,7 +11654,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:49
+#: dpkg-source.1:48
 msgid ""
 "If the source package uses a non-standard format (currently this means all "
 "formats except \"1.0\"), its name will be stored in B<debian/source/format> "
@@ -11271,13 +11663,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:50
+#: dpkg-source.1:49
 #, fuzzy, no-wrap
 msgid "B<-b> I<directory> [I<format-specific-parameters>]"
 msgstr "B<dpkg-deb> B<-b>|B<--build> I<directory> [I<archive>|I<directory>]"
 
 #. type: Plain text
-#: dpkg-source.1:57
+#: dpkg-source.1:56
 msgid ""
 "Build a source package. The first non-option argument is taken as the name "
 "of the directory containing the debianized source tree (i.e. with a debian "
@@ -11287,10 +11679,10 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:66
+#: dpkg-source.1:65
 msgid ""
 "B<dpkg-source> will build the source package with the first format found in "
-"this ordered list: the format indicated with the I<--format> command-line "
+"this ordered list: the format indicated with the I<--format> command line "
 "option, the format indicated in B<debian/source/format>, \"1.0\". The "
 "fallback to \"1.0\" is deprecated and will be removed at some point in the "
 "future, you should always document the desired source format in B<debian/"
@@ -11299,13 +11691,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:67
+#: dpkg-source.1:66
 #, fuzzy, no-wrap
 msgid "B<--print-format> I<directory>"
 msgstr "B<--admindir> I<directory>"
 
 #. type: Plain text
-#: dpkg-source.1:72
+#: dpkg-source.1:71
 msgid ""
 "Print the source format that would be used to build the source package if "
 "B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -11313,7 +11705,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:73
+#: dpkg-source.1:72
 #, fuzzy, no-wrap
 msgid "B<--before-build> I<directory>"
 msgstr "B<--altdir> I<directory>"
@@ -11321,12 +11713,12 @@
 #. type: Plain text
 #: dpkg-source.1:81
 msgid ""
-"This command should be called before any build of the package (B<dpkg-"
-"buildpackage> calls it very early even before B<debian/rules clean>). This "
-"command should be idempotent and can be called multiple times. Not all "
-"source formats implement something in this hook, and those that do usually "
-"prepare the source tree for the build for example by ensuring that the "
-"Debian patches are applied."
+"Run the corresponding hook of the source package format. This hook is called "
+"before any build of the package (B<dpkg-buildpackage> calls it very early "
+"even before B<debian/rules clean>). This command is idempotent and can be "
+"called multiple times. Not all source formats implement something in this "
+"hook, and those that do usually prepare the source tree for the build for "
+"example by ensuring that the Debian patches are applied."
 msgstr ""
 
 #. type: TP
@@ -11338,21 +11730,35 @@
 #. type: Plain text
 #: dpkg-source.1:89
 msgid ""
-"This command should be called after any build of the package (B<dpkg-"
-"buildpackage> calls it last). This command should be idempotent and can be "
-"called multiple times. Not all source formats implement something in this "
-"hook, and those that do usually use it to undo what B<--before-build> has "
-"done."
+"Run the corresponding hook of the source package format. This hook is called "
+"after any build of the package (B<dpkg-buildpackage> calls it last). This "
+"command is idempotent and can be called multiple times. Not all source "
+"formats implement something in this hook, and those that do usually use it "
+"to undo what B<--before-build> has done."
+msgstr ""
+
+#. type: TP
+#: dpkg-source.1:90
+#, fuzzy, no-wrap
+msgid "B<--commit> [I<directory>] ..."
+msgstr "B<--admindir> I<directory>"
+
+#. type: Plain text
+#: dpkg-source.1:95
+msgid ""
+"Record changes in the source tree unpacked in I<directory>. This command can "
+"take supplementary parameters depending on the source format.  It will error "
+"out for formats where this operation doesn't mean anything."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:97
+#: dpkg-source.1:103
 #, no-wrap
 msgid "GENERIC BUILD OPTIONS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 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 "
@@ -11360,7 +11766,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 msgid ""
 "Specifies the change log file to read information from. The default is "
 "B<debian/changelog>.  If given with relative pathname this is interpreted "
@@ -11368,20 +11774,20 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 #, fuzzy, no-wrap
 msgid "B<--format=>I<value>"
 msgstr "B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-source.1:121
+#: dpkg-source.1:127
 msgid ""
 "Use the given format for building the source package. It does override any "
 "format given in B<debian/source/format>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:131
+#: dpkg-source.1:137
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is to not read "
 "any file. This option can be used multiple times to read substitution "
@@ -11389,13 +11795,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:137
+#: dpkg-source.1:143
 #, no-wrap
 msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 msgid ""
 "Specify the compression to use for created files (tarballs and diffs).  Note "
 "that this option will not cause existing tarballs to be recompressed, it "
@@ -11405,27 +11811,27 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 #, no-wrap
 msgid "B<-z>I<level>, B<--compression-level>=I<level>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 msgid ""
 "Compression level to use. As with B<-Z> it only affects newly created files. "
-"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  I<9> is the "
-"default."
+"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  The default is "
+"I<9> for gzip and bzip2, I<6> for xz and lzma."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 #, no-wrap
 msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:163
+#: dpkg-source.1:169
 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 "
@@ -11439,7 +11845,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 msgid ""
 "This is very helpful in cutting out extraneous files that get included in "
 "the diff, e.g. if you maintain your source in a revision control system and "
@@ -11453,29 +11859,29 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 #, no-wrap
 msgid "B<--extend-diff-ignore>=I<regexp>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 msgid ""
-"The perl regular expression specified will extend the default regular "
-"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
-"default regexp.  This option is convenient to use in B<debian/source/"
-"options> to exclude some auto-generated files from the automatic patch "
-"generation."
+"The perl regular expression specified will extend the default value of B<--"
+"diff-ignore> and its current value (if set). It does this by concatenating "
+"\"B<|>I<regexp>\" to the existing value.  This option is convenient to use "
+"in B<debian/source/options> to exclude some auto-generated files from the "
+"automatic patch generation."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 #, no-wrap
 msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:189
+#: dpkg-source.1:195
 msgid ""
 "If this option is specified, the pattern will be passed to B<tar>(1)'s --"
 "exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -11485,7 +11891,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:194
+#: dpkg-source.1:200
 msgid ""
 "B<-I> by itself adds default --exclude options that will filter out control "
 "files and directories of the most common revision control systems, backup "
@@ -11493,7 +11899,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:212
 msgid ""
 "B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
 "different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -11506,49 +11912,49 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 msgid ""
 "The default regexp and patterns for both options can be seen in the output "
 "of the B<--help> command."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 #, fuzzy, no-wrap
 msgid "GENERIC EXTRACT OPTIONS"
 msgstr "その他のオプション"
 
 #. type: TP
-#: dpkg-source.1:210
+#: dpkg-source.1:216
 #, fuzzy, no-wrap
 msgid "B<--no-copy>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 #, fuzzy
 msgid "Do not copy original tarballs near the extracted source package."
 msgstr "パッケージの短い説明文"
 
 #. type: TP
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 #, fuzzy, no-wrap
 msgid "B<--no-check>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 msgid "Do not check signatures and checksums before unpacking."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 #, no-wrap
 msgid "B<--require-valid-signature>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:224
+#: dpkg-source.1:230
 msgid ""
 "Refuse to unpack the source package if it doesn't contain an OpenPGP "
 "signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -11558,13 +11964,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:225
+#: dpkg-source.1:231
 #, fuzzy, no-wrap
 msgid "SOURCE PACKAGE FORMATS"
 msgstr "パッケージフラグ"
 
 #. type: Plain text
-#: dpkg-source.1:230
+#: dpkg-source.1:236
 msgid ""
 "If you don't know what source format to use, you should probably pick either "
 "\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
@@ -11572,13 +11978,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:231
+#: dpkg-source.1:237
 #, no-wrap
 msgid "Format: 1.0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:235
+#: dpkg-source.1:241
 msgid ""
 "A source package in this format consists either of a B<.orig.tar.gz> "
 "associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -11586,12 +11992,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:237 dpkg-source.1:405 dpkg-source.1:566 dpkg-source.1:605
+#: dpkg-source.1:243 dpkg-source.1:411 dpkg-source.1:586 dpkg-source.1:625
 msgid "B<Extracting>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:247
+#: dpkg-source.1:253
 msgid ""
 "Extracting a native package is a simple extraction of the single tarball in "
 "the target directory. Extracting a non-native package is done by first "
@@ -11604,12 +12010,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:249 dpkg-source.1:433 dpkg-source.1:577 dpkg-source.1:610
+#: dpkg-source.1:255 dpkg-source.1:439 dpkg-source.1:597 dpkg-source.1:630
 msgid "B<Building>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:255
+#: dpkg-source.1:261
 msgid ""
 "Building a native package is just creating a single tarball with the source "
 "directory. Building a non-native package involves extracting the original "
@@ -11618,13 +12024,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:256
+#: dpkg-source.1:262
 #, no-wrap
 msgid "B<Build options (with -b):>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:269
+#: dpkg-source.1:275
 msgid ""
 "If a second non-option argument is supplied it should be the name of the "
 "original source directory or tarfile or the empty string if the package is a "
@@ -11635,7 +12041,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 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<-"
@@ -11643,13 +12049,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 #, fuzzy, no-wrap
 msgid "B<-sk>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:290
 msgid ""
 "Specifies to expect the original source as a tarfile, by default "
 "I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>.  It will leave "
@@ -11659,24 +12065,24 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:284 dpkg-source.1:353
+#: dpkg-source.1:290 dpkg-source.1:359
 #, fuzzy, no-wrap
 msgid "B<-sp>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-source.1:289
+#: dpkg-source.1:295
 msgid "Like B<-sk> but will remove the directory again afterwards."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:289 dpkg-source.1:359
+#: dpkg-source.1:295 dpkg-source.1:365
 #, fuzzy, no-wrap
 msgid "B<-su>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 msgid ""
 "Specifies that 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 "
@@ -11684,24 +12090,24 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 #, fuzzy, no-wrap
 msgid "B<-sr>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 #, fuzzy, no-wrap
 msgid "B<-ss>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-source.1:310
+#: dpkg-source.1:316
 msgid ""
 "Specifies that the original source is available both as a directory and as a "
 "tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -11710,13 +12116,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:310 dpkg-source.1:362
+#: dpkg-source.1:316 dpkg-source.1:368
 #, fuzzy, no-wrap
 msgid "B<-sn>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 msgid ""
 "Specifies to not look for any original source, and to not generate a diff.  "
 "The second argument, if supplied, must be the empty string. This is used for "
@@ -11725,13 +12131,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 #, fuzzy, no-wrap
 msgid "B<-sa> or B<-sA>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:348
 msgid ""
 "Specifies to 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 "
@@ -11747,13 +12153,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:342 dpkg-source.1:525
+#: dpkg-source.1:348 dpkg-source.1:541
 #, no-wrap
 msgid "B<--abort-on-upstream-changes>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:348
+#: dpkg-source.1:354
 msgid ""
 "The process fails if the generated diff contains changes to files outside of "
 "the debian sub-directory. This option is not allowed in B<debian/source/"
@@ -11761,18 +12167,18 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:349
+#: dpkg-source.1:355
 #, no-wrap
 msgid "B<Extract options (with -x):>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:353
+#: dpkg-source.1:359
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:359
+#: dpkg-source.1:365
 msgid ""
 "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 "
@@ -11781,12 +12187,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:362
+#: dpkg-source.1:368
 msgid "Unpacks the original source tree."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:367
+#: dpkg-source.1:373
 msgid ""
 "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 "
@@ -11794,31 +12200,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:372
+#: dpkg-source.1:378
 msgid ""
 "All the B<-s>I<X> options are mutually exclusive. If you specify more than "
 "one only the last one will be used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:372 dpkg-source.1:535
+#: dpkg-source.1:378 dpkg-source.1:555
 #, fuzzy, no-wrap
 msgid "B<--skip-debianization>"
 msgstr "B<dpkg-deb actions>"
 
 #. type: Plain text
-#: dpkg-source.1:375
+#: dpkg-source.1:381
 msgid "Skips application of the debian diff on top of the upstream sources."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:376
+#: dpkg-source.1:382
 #, no-wrap
 msgid "Format: 2.0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:380
+#: dpkg-source.1:386
 msgid ""
 "Also known as wig&pen. This format is not recommended for wide-spread usage, "
 "the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -11826,7 +12232,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:385
+#: dpkg-source.1:391
 msgid ""
 "The behaviour of this format is the same as the \"3.0 (quilt)\" format "
 "except that it doesn't use an explicit list of patches. All files in "
@@ -11835,20 +12241,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:388
+#: dpkg-source.1:394
 msgid ""
 "When building a new source package, any change to the upstream source is "
 "stored in a patch named B<zz_debian-diff-auto>."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:389
+#: dpkg-source.1:395
 #, no-wrap
 msgid "Format: 3.0 (native)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:395
+#: dpkg-source.1:401
 msgid ""
 "This format is an extension of the native package format as defined in the "
 "1.0 format. It supports all compression methods and will ignore by default "
@@ -11857,13 +12263,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:396
+#: dpkg-source.1:402
 #, no-wrap
 msgid "Format: 3.0 (quilt)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:409
 msgid ""
 "A source package in this format contains at least an original tarball (B<."
 "orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -11873,7 +12279,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:414
+#: dpkg-source.1:420
 msgid ""
 "The main original tarball is extracted first, then all additional original "
 "tarballs are extracted in subdirectories named after the I<component> part "
@@ -11885,7 +12291,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:432
 msgid ""
 "All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
 "series> are then applied.  If the former file is used and the latter one "
@@ -11900,36 +12306,37 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:428
+#: dpkg-source.1:434
 msgid ""
 "Similarly to quilt's default behaviour, the patches can remove files too."
 msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:431
+#: dpkg-source.1:437
 msgid ""
 "The file B<.pc/applied-patches> is created if some patches have been applied "
 "during the extraction."
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:443
+#: dpkg-source.1:451
 msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
 "except the automatic patch (B<debian-changes->I<version> or B<debian-"
 "changes>, depending on B<--single-debian-patch>) are applied. The temporary "
-"directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in the automatic patch.  If the automatic patch is created/"
-"deleted, it's added/removed from the series file and from the quilt metadata."
+"directory is compared to the source package directory. When the diff is non-"
+"empty, the build fails unless B<--single-debian-patch> or B<--auto-commit> "
+"has been used, in which case the diff is stored in the automatic patch.  If "
+"the automatic patch is created/deleted, it's added/removed from the series "
+"file and from the quilt metadata."
 msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:451
+#: dpkg-source.1:459
 msgid ""
 "Any change on a binary file is not representable in a diff and will thus "
 "lead to a failure unless the maintainer deliberately decided to include that "
@@ -11940,14 +12347,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:454
+#: dpkg-source.1:462
 msgid ""
 "The updated debian directory and the list of modified binaries is then used "
 "to generate the debian tarball."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:460
+#: dpkg-source.1:468
 msgid ""
 "The automatically generated diff doesn't include changes on VCS specific "
 "files as well as many temporary files (see default value associated to B<-i> "
@@ -11956,36 +12363,54 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:477
+msgid ""
+"Note: B<dpkg-source> B<--before-build> (and B<-b>) will ensure that all "
+"patches listed in the series file are applied so that a package build always "
+"has all patches applied. It does this by finding unapplied patches (they are "
+"listed in the B<series> file but not in B<.pc/applied-patches>), and if the "
+"first patch in that set can be applied without errors, it will apply them "
+"all. The option B<--no-preparation> can be used to disable this behavior."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:480
+msgid "B<Recording changes>"
+msgstr ""
+
+#. type: TP
+#: dpkg-source.1:480
+#, fuzzy, no-wrap
+msgid "B<--commit> [I<directory>] [I<patch-name>] [I<patch-file>]"
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
+
+#. type: Plain text
+#: dpkg-source.1:490
 msgid ""
-"Note: B<dpkg-source> expects the source tree to have all patches listed in "
-"the series file applied when you generate the source package.  This is not "
-"the case when the source tree has been obtained by unpacking a source "
-"package using the Format: 1.0 for instance. To mitigate the problem, B<dpkg-"
-"source> will apply the patches by itself if it believes that they have not "
-"yet been applied. To detect this situation, it uses the following heuristic: "
-"it finds the list of supposedly unapplied patches (they are listed in the "
-"B<series> file but not in B<.pc/applied-patches>), and if the first patch in "
-"that set can be applied without errors, it will apply them all.  The option "
-"B<--no-preparation> can be used to disable this behaviour. This operation is "
-"usually done as part of the B<--prepare-build> command."
+"Generates a patch corresponding to the local changes that are not managed by "
+"the quilt patch system and integrates it in the patch system under the name "
+"I<patch-name>. If the name is missing, it will be asked interactively. If "
+"I<patch-file> is given, it is used as the patch corresponding to the local "
+"changes to integrate. This is mainly useful after a build failure that pre-"
+"generated this file. Once integrated, an editor is launched so that you can "
+"edit the meta-information in the patch header."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:476 dpkg-source.1:547 dpkg-source.1:586
+#: dpkg-source.1:493 dpkg-source.1:567 dpkg-source.1:606
 #, fuzzy
 msgid "B<Build options>"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: TP
-#: dpkg-source.1:476
+#: dpkg-source.1:493
 #, fuzzy, no-wrap
 msgid "B<--allow-version-of-quilt-db=>I<version>"
 msgstr "B<-v, --version>"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 msgid ""
 "Allow B<dpkg-source> to build the source package if the version of the quilt "
 "metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -11995,37 +12420,37 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 #, fuzzy, no-wrap
 msgid "B<--include-removal>"
 msgstr "B<dpkg --clear-avail>"
 
 #. type: Plain text
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 msgid ""
 "Do not ignore removed files and include them in the automatically generated "
 "patch."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 #, no-wrap
 msgid "B<--include-timestamp>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 msgid "Include timestamp in the automatically generated patch."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 #, fuzzy, no-wrap
 msgid "B<--include-binaries>"
 msgstr "B<infodesc>"
 
 #. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 msgid ""
 "Add all modified binaries in the debian tarball. Also add them to B<debian/"
 "source/include-binaries>: they will be added by default in subsequent builds "
@@ -12033,45 +12458,45 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 #, fuzzy, no-wrap
 msgid "B<--no-preparation>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 msgid ""
 "Do not try to prepare the build tree by applying patches which are "
 "apparently unapplied."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 #, fuzzy, no-wrap
 msgid "B<--single-debian-patch>"
 msgstr "B<dpkg-deb actions>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 msgid ""
 "Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
 "changes->I<version> for the name of the automatic patch generated during "
 "build. This option is particularly useful when the package is maintained in "
 "a VCS and a patch set can't reliably be generated. Instead the current diff "
-"with upstream should be stored in a single patch. When using this option, it "
-"is recommended to create a debian/source/patch-header file explaining how "
-"the Debian changes can be best reviewed, for example in the VCS that is used."
+"with upstream should be stored in a single patch. The option would be put in "
+"B<debian/source/local-options> and would be accompanied by a B<debian/source/"
+"local-patch-header> file explaining how the Debian changes can be best "
+"reviewed, for example in the VCS that is used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 #, no-wrap
 msgid "B<--create-empty-orig>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 msgid ""
 "Automatically create the main original tarball as empty if it's missing and "
 "if there are supplementary original tarballs. This option is meant to be "
@@ -12080,24 +12505,23 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 #, fuzzy, no-wrap
 msgid "B<--unapply-patches>"
 msgstr "B<--update>"
 
 #. type: Plain text
-#: dpkg-source.1:525
+#: dpkg-source.1:541
 msgid ""
-"Unapply the patches in the B<--after-build> hook. This is mainly useful when "
-"you build your package directly in a VCS that contains unpatched upstream "
-"source and where you want to keep the tree unpatched even after a package "
-"build. This option is usually put in B<debian/source/local-options> (it's "
-"not allowed in B<debian/source/options> so that all generated source "
-"packages have the same behaviour by default)."
+"Unapply the patches in the B<--after-build> hook. You usually don't need "
+"this option as dpkg-source will automatically unapply the patches if it did "
+"apply them during B<--before-build>. This option is only allowed in B<debian/"
+"source/local-options> so that all generated source packages have the same "
+"behavior by default."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:548
 msgid ""
 "The process fails if an automatic patch has been generated. This option can "
 "be used to ensure that all changes were properly recorded in separate quilt "
@@ -12105,56 +12529,69 @@
 "B<debian/source/options> but can be used in B<debian/source/local-options>."
 msgstr ""
 
+#. type: TP
+#: dpkg-source.1:548
+#, fuzzy, no-wrap
+msgid "B<--auto-commit>"
+msgstr "B<--nocheck>"
+
+#. type: Plain text
+#: dpkg-source.1:552
+msgid ""
+"The process doesn't fail if an automatic patch has been generated, instead "
+"it's immediately recorded in the quilt series."
+msgstr ""
+
 #. type: Plain text
-#: dpkg-source.1:535
+#: dpkg-source.1:555
 msgid "B<Extract options>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 msgid "Skips extraction of the debian tarball on top of the upstream sources."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 #, fuzzy, no-wrap
 msgid "B<--skip-patches>"
 msgstr "B<--update>"
 
 #. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:561
 msgid "Do not apply patches at the end of the extraction."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:542
+#: dpkg-source.1:562
 #, no-wrap
 msgid "Format: 3.0 (custom)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:545
+#: dpkg-source.1:565
 msgid ""
-"This format is particular. It doesn't represent a real source package format "
+"This format is special. It doesn't represent a real source package format "
 "but can be used to create source packages with arbitrary files."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 msgid ""
 "All non-option arguments are taken as files to integrate in the generated "
-"source package. They must exist and are preferrably in the current "
-"directory. At least one file must be given."
+"source package. They must exist and are preferably in the current directory. "
+"At least one file must be given."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 #, fuzzy, no-wrap
 msgid "B<--target-format=>I<value>"
 msgstr "B<--abort-after=>I<number>"
 
 #. type: Plain text
-#: dpkg-source.1:556
+#: dpkg-source.1:576
 msgid ""
 "B<Required>. Defines the real format of the generated source package.  The "
 "generated .dsc file will contain this value in its I<Format> field and not "
@@ -12162,18 +12599,18 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:557
+#: dpkg-source.1:577
 #, no-wrap
 msgid "Format: 3.0 (git)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:579
 msgid "This format is experimental."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:564
+#: dpkg-source.1:584
 msgid ""
 "A source package in this format consists of a single bundle of a git "
 "repository B<.git> to hold the source of a package.  There may also be a B<."
@@ -12181,7 +12618,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:570
+#: dpkg-source.1:590
 msgid ""
 "The bundle is cloned as a git repository to the target directory.  If there "
 "is a gitshallow file, it is installed as `.git/shallow` inside the cloned "
@@ -12189,36 +12626,36 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:575
+#: dpkg-source.1:595
 msgid ""
 "Note that by default the new repository will have the same branch checked "
 "out that was checked out in the original source. (Typically \"master\", but "
-"it could be anything.) Any other branches will be available, under as "
-"`remotes/origin/`"
+"it could be anything.) Any other branches will be available under `remotes/"
+"origin/`."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:580 dpkg-source.1:613
+#: dpkg-source.1:600 dpkg-source.1:633
 msgid ""
 "Before going any further, some checks are done to ensure that we don't have "
 "any non-ignored uncommitted changes."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:584
+#: dpkg-source.1:604
 msgid ""
 "B<git-bundle>(1) is used to generate a bundle of the git repository.  By "
 "default, all branches and tags in the repository are included in the bundle."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:586
+#: dpkg-source.1:606
 #, fuzzy, no-wrap
 msgid "B<--git-ref=>I<ref>"
 msgstr "B<--abort-after=>I<number>"
 
 #. type: Plain text
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 msgid ""
 "Allows specifying a git ref to include in the git bundle. Use disables the "
 "default behavior of including all branches and tags. May be specified "
@@ -12230,40 +12667,40 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 #, fuzzy, no-wrap
 #| msgid "B<--abort-after=>I<number>"
 msgid "B<--git-depth=>I<number>"
 msgstr "B<--abort-after=>I<number>"
 
 #. type: Plain text
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 msgid ""
 "Creates a shallow clone with a history truncated to the specified number of "
 "revisions."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 #, no-wrap
 msgid "Format: 3.0 (bzr)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:603
+#: dpkg-source.1:623
 msgid ""
 "This format is experimental. It generates a single tarball containing the "
 "bzr repository."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:608
+#: dpkg-source.1:628
 msgid ""
 "The tarball is unpacked and then bzr is used to checkout the current branch."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 msgid ""
 "Then the VCS specific part of the source directory is copied over to a "
 "temporary directory. Before this temporary directory is packed in a tarball, "
@@ -12271,19 +12708,19 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 #, no-wrap
 msgid "WARNINGS AND ERRORS"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:618
+#: dpkg-source.1:638
 #, no-wrap
 msgid "no source format specified in debian/source/format"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:624
+#: dpkg-source.1:644
 msgid ""
 "The file B<debian/source/format> should always exist and indicate the "
 "desired source format. For backwards compatibility, format \"1.0\" is "
@@ -12293,7 +12730,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 msgid ""
 "The rationale is that format \"1.0\" is no longer the recommended format, "
 "you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
@@ -12303,13 +12740,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 #, no-wrap
 msgid "the diff modifies the following upstream files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 msgid ""
 "When using source format \"1.0\" it is usually a bad idea to modify upstream "
 "files directly as the changes end up hidden and mostly undocumented in the ."
@@ -12319,13 +12756,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 #, no-wrap
 msgid "cannot represent change to I<file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 msgid ""
 "Changes to upstream sources are usually stored with patch files, but not all "
 "changes can be represented with patches: they can only alter the content of "
@@ -12335,51 +12772,51 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 #, no-wrap
 msgid "newly created empty file I<file> will not be represented in diff"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 msgid ""
 "Empty files can't be created with patch files. Thus this change is not "
 "recorded in the source package and you are warned about it."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 #, no-wrap
 msgid "executable mode I<perms> of I<file> will not be represented in diff"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:647
+#: dpkg-source.1:667
 #, no-wrap
 msgid "special mode I<perms> of I<file> will not be represented in diff"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 msgid ""
 "Patch files do not record permissions of files and thus modified permissions "
 "are not stored in the source package. This warning reminds you of that fact."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 #, fuzzy, no-wrap
 msgid "FILE FORMATS"
 msgstr "フォーマット"
 
 #. type: SS
-#: dpkg-source.1:652
+#: dpkg-source.1:672
 #, no-wrap
 msgid "debian/source/format"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 msgid ""
 "This file contains on a single line the format that should be used to build "
 "the source package (possible formats are described above). No leading or "
@@ -12387,13 +12824,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 #, fuzzy, no-wrap
 msgid "debian/source/include-binaries"
 msgstr "B<infodesc>"
 
 #. type: Plain text
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 msgid ""
 "This file contains a list of binary files (one per line) that should be "
 "included in the debian tarball. Leading and trailing spaces are stripped.  "
@@ -12402,13 +12839,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 #, fuzzy, no-wrap
 msgid "debian/source/options"
 msgstr "B<infodesc>"
 
 #. type: Plain text
-#: dpkg-source.1:666
+#: dpkg-source.1:686
 msgid ""
 "This file contains a list of long options that should be automatically "
 "prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -12417,7 +12854,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:672
+#: dpkg-source.1:692
 msgid ""
 "Each option should be put on a separate line. Empty lines and lines starting "
 "with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -12426,9 +12863,8 @@
 "a file:"
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:678
+#: dpkg-source.1:700
 #, no-wrap
 msgid ""
 "  # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -12436,23 +12872,25 @@
 "  compression-level = 9\n"
 "  # use debian/patches/debian-changes as automatic patch\n"
 "  single-debian-patch\n"
+"  # ignore changes on config.{sub,guess}\n"
+"  extend-diff-ignore = \"(^|/)(config.sub|config.guess)$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 msgid ""
 "Note: B<format> options are not accepted in this file, you should use "
 "B<debian/source/format> instead."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 #, fuzzy, no-wrap
 msgid "debian/source/local-options"
 msgstr "B<infodesc>"
 
 #. type: Plain text
-#: dpkg-source.1:686
+#: dpkg-source.1:708
 msgid ""
 "Exactly like B<debian/source/options> except that the file is not included "
 "in the generated source package. It can be useful to store a preference tied "
@@ -12461,27 +12899,33 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:686
+#: dpkg-source.1:708
+#, fuzzy, no-wrap
+msgid "debian/source/local-patch-header"
+msgstr "B<infodesc>"
+
+#. type: SS
+#: dpkg-source.1:709
 #, fuzzy, no-wrap
 msgid "debian/source/patch-header"
 msgstr "B<infodesc>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 msgid ""
 "Free form text that is put on top of the automatic patch generated in "
-"formats \"2.0\" or \"3.0 (quilt)\"."
+"formats \"2.0\" or \"3.0 (quilt)\". B<local-patch-header> is not included in "
+"the generated source package while B<patch-header> is."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 #, no-wrap
 msgid "debian/patches/series"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:698
+#: dpkg-source.1:722
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
@@ -12494,25 +12938,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:705
+#: dpkg-source.1:729
 #, fuzzy
 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:736
+#, fuzzy
+msgid "Copyright \\(co 2008-2011 Rapha\\[:e]l Hertzog"
+msgstr "Copyright 2001 Joey Hess"
+
 #. type: TH
 #: dpkg-split.1:2
 #, fuzzy, no-wrap
 msgid "dpkg-split"
 msgstr "dpkg suite"
 
-#. type: TH
-#: dpkg-split.1:2 dpkg-statoverride.8:1
-#, fuzzy, no-wrap
-msgid "2009-06-26"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-split.1:5
 #, fuzzy
@@ -12520,13 +12964,13 @@
 msgstr "dpkg-deb - Debian パッケージアーカイブ (.deb) 操作ツール"
 
 #. type: Plain text
-#: dpkg-split.1:10
+#: dpkg-split.1:9
 #, fuzzy
-msgid "B<dpkg-split> [I<options>] I<command>"
+msgid "B<dpkg-split> [I<option>...] I<command>"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
-#: dpkg-split.1:16
+#: dpkg-split.1:15
 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 "
@@ -12534,14 +12978,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:20
+#: dpkg-split.1:19
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:28
+#: dpkg-split.1:27
 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 "
@@ -12550,26 +12994,26 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:31
+#: dpkg-split.1:30
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:33
+#: dpkg-split.1:32
 #, fuzzy, no-wrap
 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:36
+#: dpkg-split.1:35
 #, fuzzy
 msgid "Splits a single Debian binary package into several parts."
 msgstr "deb-old - Debian バイナリパッケージ旧形式フォーマット"
 
 #. type: Plain text
-#: dpkg-split.1:44
+#: dpkg-split.1:43
 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 "
@@ -12577,27 +13021,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 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:52
+#: dpkg-split.1:51
 #, fuzzy, no-wrap
 msgid "B<-j>, B<--join> I<part>..."
 msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
 
 #. type: Plain text
-#: dpkg-split.1:56
+#: dpkg-split.1:55
 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:60
+#: dpkg-split.1:59
 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 "
@@ -12605,7 +13049,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:65
+#: dpkg-split.1:64
 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 "
@@ -12613,23 +13057,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:67
+#: dpkg-split.1:66
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:70
-msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
+#: dpkg-split.1:69
+msgid ""
+"By default the output file is called I<package>B<_>I<version>B<_>I<arch>B<."
+"deb>."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:71
+#: dpkg-split.1:70
 #, 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:76
+#: dpkg-split.1:75
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -12637,25 +13083,25 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 #, no-wrap
 msgid "B<-a>, B<--auto -o> I<complete-output part>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:79
+#: dpkg-split.1:78
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:84
+#: dpkg-split.1:83
 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:91
+#: dpkg-split.1:90
 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 "
@@ -12663,21 +13109,22 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:97
+#: dpkg-split.1:96
 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:104
+#: dpkg-split.1:103
 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."
+"with status B<1>; if some other trouble occurs then it will exit with status "
+"B<2>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 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 "
@@ -12685,18 +13132,18 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 #, fuzzy, no-wrap
 msgid "B<-l>, B<--listq>"
 msgstr "B<-l, --license>"
 
 #. type: Plain text
-#: dpkg-split.1:114
+#: dpkg-split.1:113
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 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 "
@@ -12704,77 +13151,77 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 #, fuzzy, no-wrap
 msgid "B<-d>, B<--discard> [I<package>...]"
 msgstr "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
 
 #. type: Plain text
-#: dpkg-split.1:122
+#: dpkg-split.1:121
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:126
 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: TP
-#: dpkg-split.1:135
+#: dpkg-split.1:134
 #, fuzzy, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr "B<--altdir> I<directory>"
 
 #. type: Plain text
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 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:140
+#: dpkg-split.1:139
 #, fuzzy, no-wrap
 msgid "B<-S>, B<--partsize> I<kibibytes>"
 msgstr "B<-a>|B<--startas> I<pathname>"
 
 #. type: Plain text
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 msgid ""
 "Specifies the maximum part size when splitting, in kibibytes (1024 bytes). "
 "The default is 450 KiB."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 #, no-wrap
 msgid "B<-o>, B<--output> I<complete-output>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:147
+#: dpkg-split.1:146
 msgid "Specifies the output file name for a reassembly."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:152
+#: dpkg-split.1:151
 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:152
+#: dpkg-split.1:151
 #, fuzzy, no-wrap
 msgid "B<-Q>, B<--npquiet>"
 msgstr "B<-q>|B<--quiet>"
 
 #. type: Plain text
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 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 "
@@ -12783,19 +13230,19 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 #, fuzzy, no-wrap
 msgid "B<--msdos>"
 msgstr "B<--old>"
 
 #. type: Plain text
-#: dpkg-split.1:168
+#: dpkg-split.1:167
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:174
+#: dpkg-split.1:173
 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 "
@@ -12803,7 +13250,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:179
+#: dpkg-split.1:178
 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."
@@ -12812,69 +13259,59 @@
 #. type: Plain text
 #: dpkg-split.1:186
 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."
+"The requested split, merge, or other command succeeded.  B<--info> commands "
+"count as successful even if the files are not binary package parts."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:192
+#: dpkg-split.1:193
 msgid ""
-"An exit status of 1 occurs only with B<--auto> and indicates that the "
-"I<part> file was not a binary package part."
+"Only occurs with B<--auto> and indicates that the I<part> file was not a "
+"binary package part."
 msgstr ""
 
-#. type: Plain text
-#: dpkg-split.1:196
-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."
+#. type: TP
+#: dpkg-split.1:193 start-stop-daemon.8:275 update-alternatives.8:378
+#, no-wrap
+msgid "B<2>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:201
+#: dpkg-split.1:198
 msgid ""
-"B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
-"of Debian packages."
+"Some kind of trouble happened, 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 ""
 
 #. type: Plain text
-#: dpkg-split.1:204
+#: dpkg-split.1:202
 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:207
+#: dpkg-split.1:205
 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:211
-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 ""
-
 #. type: TP
-#: dpkg-split.1:213
+#: dpkg-split.1:207
 #, fuzzy, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "I</var/lib/dpkg/status>"
 
 #. type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:211
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:222
+#: dpkg-split.1:216
 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 "
@@ -12882,7 +13319,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:222
 #, 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)."
@@ -12905,13 +13342,13 @@
 msgstr "dpkg-statoverride - ファイルの所有権やモードを変更する"
 
 #. type: Plain text
-#: dpkg-statoverride.8:9
+#: dpkg-statoverride.8:8
 #, fuzzy
-msgid "B<dpkg-statoverride> [I<options>] I<command>"
+msgid "B<dpkg-statoverride> [I<option>...] I<command>"
 msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:19
+#: dpkg-statoverride.8:18
 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' "
@@ -12928,7 +13365,7 @@
 "定のグループのみに実行許可を与えるようにしたりできる。"
 
 #. type: Plain text
-#: dpkg-statoverride.8:23
+#: dpkg-statoverride.8:22
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
@@ -12937,13 +13374,13 @@
 "る。 override を追加・削除・表示するという、3 つの基本機能がある。"
 
 #. type: TP
-#: dpkg-statoverride.8:25
+#: dpkg-statoverride.8:24
 #, 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:33
+#: dpkg-statoverride.8:32
 #, fuzzy
 msgid ""
 "Add an override for I<file>. I<file> does not need to exist when this "
@@ -12958,7 +13395,7 @@
 "`B<#>' 文字をつけた数字(例えば B<#0> とか B<#65534> とか)でも指定できる。"
 
 #. type: Plain text
-#: dpkg-statoverride.8:36
+#: dpkg-statoverride.8:35
 #, fuzzy
 msgid ""
 "If --update is specified and I<file> exists, it is immediately set to the "
@@ -12968,7 +13405,7 @@
 "ドを新しい値に変更する。"
 
 #. type: Plain text
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 #, fuzzy
 msgid ""
 "Remove an override for I<file>, the status of I<file> is left unchanged by "
@@ -12978,13 +13415,13 @@
 "ンドでは変化しない。"
 
 #. type: TP
-#: dpkg-statoverride.8:40
+#: 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:45
+#: 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 "
@@ -12995,7 +13432,7 @@
 "とつもなかった場合は、B<dpkg-statoverride> は終了コード 1 で終了する。"
 
 #. type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:56
 #, fuzzy
 msgid ""
 "Change the I<directory> of the dpkg database where the statoverride file is "
@@ -13005,13 +13442,13 @@
 "存される。デフォルトは I</var/lib/dpkg>。"
 
 #. type: TP
-#: dpkg-statoverride.8:57 update-alternatives.8:337
+#: dpkg-statoverride.8:56 update-alternatives.8:336
 #, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:61
+#: 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."
@@ -13020,13 +13457,13 @@
 "既存の override を変更する場合には、これを指定する必要がある。"
 
 #. type: TP
-#: dpkg-statoverride.8:61
+#: dpkg-statoverride.8:60
 #, no-wrap
 msgid "B<--update>"
 msgstr "B<--update>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:65
+#: dpkg-statoverride.8:64
 msgid ""
 "Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
@@ -13034,18 +13471,18 @@
 "る。"
 
 #. type: Plain text
-#: dpkg-statoverride.8:68
+#: dpkg-statoverride.8:67
 msgid "Be less verbose about what we do."
 msgstr "動作を無口に行う。"
 
 #. type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:75
 #, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr "I</var/lib/dpkg/statoverride>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:80
 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 "
@@ -13056,7 +13493,7 @@
 "しょに置かれる。"
 
 #. type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:83
 #, fuzzy
 msgid ""
 "Note: B<dpkg-statoverride> preserves the old copy of this file, with "
@@ -13121,9 +13558,9 @@
 #: dpkg-trigger.1:31
 msgid ""
 "Check if the running B<dpkg> supports triggers (usually called from a "
-"postinst). Will exit 0 if a triggers-capable B<dpkg> has run, or 1 with an "
-"error message to stderr if not. Normally, however, it is better just to "
-"activate the desired trigger with B<dpkg-trigger>."
+"postinst). Will exit B<0> if a triggers-capable B<dpkg> has run, or B<1> "
+"with an error message to stderr if not. Normally, however, it is better just "
+"to activate the desired trigger with B<dpkg-trigger>."
 msgstr ""
 
 #. type: TP
@@ -13136,7 +13573,7 @@
 #: dpkg-trigger.1:49
 msgid ""
 "Override trigger awaiter (normally set by B<dpkg> through the "
-"DPKG_MAINTSCRIPT_PACKAGE environment variable of the maintainer scripts, "
+"B<DPKG_MAINTSCRIPT_PACKAGE> environment variable of the maintainer scripts, "
 "naming the package to which the script belongs, and this will be used by "
 "default)."
 msgstr ""
@@ -13168,7 +13605,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-trigger.1:68
+#: dpkg-trigger.1:69
 #, fuzzy
 msgid ""
 "B<dpkg>(1), B<deb-triggers>(5), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
@@ -13180,12 +13617,6 @@
 msgid "dpkg-vendor"
 msgstr "dpkg-divert"
 
-#. type: TH
-#: dpkg-vendor.1:1
-#, fuzzy, no-wrap
-msgid "2009-05-10"
-msgstr "2006-05-10"
-
 #. type: Plain text
 #: dpkg-vendor.1:4
 msgid "dpkg-vendor - queries information about distribution vendors"
@@ -13214,7 +13645,7 @@
 #. type: Plain text
 #: dpkg-vendor.1:19
 msgid ""
-"Exits with 0 if the current vendor is I<vendor>. Otherwise exits with non-"
+"Exits with B<0> if the current vendor is I<vendor>. Otherwise exits with non-"
 "zero."
 msgstr ""
 
@@ -13227,7 +13658,7 @@
 #. type: Plain text
 #: dpkg-vendor.1:24
 msgid ""
-"Exits with 0 if the current vendor distribution is a derivative of "
+"Exits with B<0> if the current vendor distribution is a derivative of "
 "I<vendor>, otherwise exits with non-zero. It uses the \"Parent\" field to "
 "browse all ancestors of the current vendor."
 msgstr ""
@@ -13255,7 +13686,7 @@
 #: dpkg-vendor.1:41
 msgid ""
 "Assumes the current vendor is I<vendor> instead of discovering it with the "
-"DEB_VENDOR environment variable or B</etc/dpkg/origins/default>."
+"B<DEB_VENDOR> environment variable or B</etc/dpkg/origins/default>."
 msgstr ""
 
 #. type: TP
@@ -13272,7 +13703,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-vendor.1:50 update-alternatives.8:497
+#: dpkg-vendor.1:50 update-alternatives.8:498
 #, fuzzy
 msgid "Copyright \\(co 2009 Rapha\\[:e]l Hertzog"
 msgstr "Copyright 2001 Joey Hess"
@@ -13289,26 +13720,14 @@
 msgstr "dselect - Debian パッケージ管理フロントエンド"
 
 #. type: Plain text
-#: dselect.1:16
+#: dselect.1:8
 #, 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+..>]]]"
-msgid ""
-"B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--version>] "
-"[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 ""
-"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+..>]]]"
+#| msgid "B<dpkg> [I<options>] I<action>"
+msgid "B<dselect> [I<option>...] [I<action>]"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 #. type: Plain text
-#: dselect.1:25
+#: dselect.1:17
 #, no-wrap
 msgid ""
 "B<dselect>\n"
@@ -13326,7 +13745,7 @@
 " - 新規パッケージのインストールや新バージョンへの更新。\n"
 
 #. type: Plain text
-#: dselect.1:37
+#: dselect.1:29
 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 "
@@ -13348,11 +13767,18 @@
 "方式は、B<apt> パッケージで提供する I<apt> である。"
 
 #. type: Plain text
-#: dselect.1:43
+#: dselect.1:35
+#, 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."
 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 "
+"argument, then that action is started immediately. Several command line "
 "parameters are still available to modify the running behaviour of B<dselect> "
 "or show additional information about the program."
 msgstr ""
@@ -13362,7 +13788,7 @@
 "修正したり、プログラムの補足情報を示すことができる。"
 
 #. type: Plain text
-#: dselect.1:51
+#: dselect.1:43
 #, fuzzy
 #| msgid ""
 #| "All options can be specified both on the commandline and in the "
@@ -13371,10 +13797,10 @@
 #| "commandline option but without leading dashes) or a comment (if it starts "
 #| "with a B<#>)."
 msgid ""
-"All options can be specified both on the commandline and in the B<dselect> "
+"All options can be specified both on the command line and in the B<dselect> "
 "configuration file I</etc/dpkg/dselect.cfg> or the files on the "
-"configuration directory I</etc/dpkg/dpkg.cfg.d/>. Each line in the "
-"configuration file is either an option (exactly the same as the commandline "
+"configuration directory I</etc/dpkg/dselect.cfg.d/>. 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<dselect> の設定ファイル I</etc/dpkg/"
@@ -13382,14 +13808,8 @@
 "はコマンドラインオプションからダッシュを除いたもの) か、コメント (行が 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
+#: dselect.1:49
 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 "
@@ -13399,36 +13819,40 @@
 "リを変更する。デフォルトは I</var/lib/dpkg> で、通常変更する必要はない。"
 
 #. type: TP
-#: dselect.1:57
-#, no-wrap
-msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
+#: dselect.1:49
+#, fuzzy, no-wrap
+#| msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
+msgid "B<--debug>I< file >|I< >B<-D>I<file>"
 msgstr "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
 
 #. type: Plain text
-#: dselect.1:60
-msgid "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+#: dselect.1:52
+#, fuzzy
+#| msgid ""
+#| "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+msgid "Turn on debugging. Debugging information is sent to I<file>."
 msgstr "デバッグを有効にする。デバッグ情報は I<E<lt>fileE<gt>> に送られる。"
 
 #. type: TP
-#: dselect.1:60
+#: dselect.1:52
 #, no-wrap
 msgid "B<--expert>"
 msgstr "B<--expert>"
 
 #. type: Plain text
-#: dselect.1:64
+#: dselect.1:56
 msgid ""
 "Turns on expert mode, i.e. doesn't display possibly annoying help messages."
 msgstr "エキスパートモードを有効にする。つまり、うるさいヘルプを表示しない。"
 
 #. type: TP
-#: dselect.1:64
+#: dselect.1:56
 #, 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:63
 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>). "
@@ -13441,144 +13865,144 @@
 "の部位は次のとおり:"
 
 #. type: TP
-#: dselect.1:72
+#: dselect.1:64
 #, no-wrap
 msgid "B<title>"
 msgstr "B<title>"
 
 #. type: Plain text
-#: dselect.1:75
+#: dselect.1:67
 msgid "The screen title."
 msgstr "画面タイトル"
 
 #. type: TP
-#: dselect.1:75
+#: dselect.1:67
 #, no-wrap
 msgid "B<listhead>"
 msgstr "B<listhead>"
 
 #. type: Plain text
-#: dselect.1:78
+#: dselect.1:70
 msgid "The header line above the list of packages."
 msgstr "パッケージリストの上のヘッダライン"
 
 #. type: TP
-#: dselect.1:78
+#: dselect.1:70
 #, no-wrap
 msgid "B<list>"
 msgstr "B<list>"
 
 #. type: Plain text
-#: dselect.1:81
+#: dselect.1:73
 msgid "The scrolling list of packages (and also some help text)."
 msgstr "パッケージリストのスクロール領域 (ヘルプも表示する)"
 
 #. type: TP
-#: dselect.1:81
+#: dselect.1:73
 #, no-wrap
 msgid "B<listsel>"
 msgstr "B<listsel>"
 
 #. type: Plain text
-#: dselect.1:84
+#: dselect.1:76
 msgid "The selected item in the list."
 msgstr "リスト内の選択行"
 
 #. type: TP
-#: dselect.1:84
+#: dselect.1:76
 #, no-wrap
 msgid "B<pkgstate>"
 msgstr "B<pkgstate>"
 
 #. type: Plain text
-#: dselect.1:88
+#: dselect.1:80
 msgid ""
 "In the list of packages, the text indicating the current state of each "
 "package."
 msgstr "パッケージリスト中、パッケージの現在状況表示部"
 
 #. type: TP
-#: dselect.1:88
+#: dselect.1:80
 #, no-wrap
 msgid "B<pkgstatesel>"
 msgstr "B<pkgstatesel>"
 
 #. type: Plain text
-#: dselect.1:92
+#: dselect.1:84
 msgid ""
 "In the list of packages, the text indicating the current state of the "
 "currently selected package."
 msgstr "パッケージリスト中、選択したパッケージの現在状況表示部"
 
 #. type: TP
-#: dselect.1:92
+#: dselect.1:84
 #, no-wrap
 msgid "B<infohead>"
 msgstr "B<infohead>"
 
 #. type: Plain text
-#: dselect.1:95
+#: dselect.1:87
 msgid ""
 "The header line that displays the state of the currently selected package."
 msgstr "選択中パッケージの状況表示部のヘッダ行"
 
 #. type: TP
-#: dselect.1:95
+#: dselect.1:87
 #, no-wrap
 msgid "B<infodesc>"
 msgstr "B<infodesc>"
 
 #. type: Plain text
-#: dselect.1:98
+#: dselect.1:90
 msgid "The package's short description."
 msgstr "パッケージの短い説明文"
 
 #. type: TP
-#: dselect.1:98
+#: dselect.1:90
 #, no-wrap
 msgid "B<info>"
 msgstr "B<info>"
 
 #. type: Plain text
-#: dselect.1:101
+#: dselect.1:93
 msgid "Used to display package info such as the package's description."
 msgstr "パッケージの説明などのパッケージ情報表示部"
 
 #. type: TP
-#: dselect.1:101
+#: dselect.1:93
 #, no-wrap
 msgid "B<infofoot>"
 msgstr "B<infofoot>"
 
 #. type: Plain text
-#: dselect.1:104
+#: dselect.1:96
 msgid "The last line of the screen when selecting packages."
 msgstr "パッケージ選択時の画面最下行"
 
 #. type: TP
-#: dselect.1:104
+#: dselect.1:96
 #, no-wrap
 msgid "B<query>"
 msgstr "B<query>"
 
 #. type: Plain text
-#: dselect.1:107
+#: dselect.1:99
 msgid "Used to display query lines"
 msgstr "要求行表示部"
 
 #. type: TP
-#: dselect.1:107
+#: dselect.1:99
 #, no-wrap
 msgid "B<helpscreen>"
 msgstr "B<helpscreen>"
 
 #. type: Plain text
-#: dselect.1:110
+#: dselect.1:102
 msgid "Color of help screens."
 msgstr "ヘルプ画面の色"
 
 #. type: Plain text
-#: dselect.1:115
+#: dselect.1:107
 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, "
@@ -13588,7 +14012,7 @@
 "色、背景色あるいは両方を指定することができる。標準 curses 色名称を使用する。"
 
 #. type: Plain text
-#: dselect.1:121
+#: dselect.1:113
 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 "
@@ -13602,12 +14026,12 @@
 "reverse, blink, bright, dim, bold"
 
 #. type: Plain text
-#: dselect.1:124
+#: dselect.1:116
 msgid "Print a brief help text and exit successfully."
 msgstr "簡単なヘルプを表示し、正常終了する。"
 
 #. type: Plain text
-#: dselect.1:127
+#: dselect.1:119
 #, fuzzy
 msgid "Print version information and exit successfully."
 msgstr ""
@@ -13616,40 +14040,45 @@
 "#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
 "バージョン情報を表示して正常終了する。"
 
-#. type: SH
-#: dselect.1:128
-#, no-wrap
-msgid "USAGE"
-msgstr "使用方法"
-
 #. type: Plain text
-#: dselect.1:133
+#: dselect.1:126
+#, fuzzy
+#| msgid ""
+#| "When B<dselect> is started interactively, it prompts the user with a menu "
+#| "of available actions:"
 msgid ""
-"When B<dselect> is started interactively, it prompts the user with a menu of "
-"available actions:"
+"When B<dselect> is started it can perform the following actions, either "
+"directly if it was specified on the command line or by prompting the user "
+"with a menu of available actions if running interactively:"
 msgstr ""
 "B<dselect> を対話的に起動すると、以下の利用可能アクションのメニューをユーザに"
 "提示する。"
 
 #. type: SS
-#: dselect.1:133
+#: dselect.1:126
 #, no-wrap
 msgid "access"
 msgstr "access"
 
 #. type: Plain text
-#: dselect.1:135
+#: dselect.1:128
 msgid "Choose and configure an access method to access package repositories."
 msgstr ""
 "パッケージリポジトリにアクセスするための、アクセス方式を選択・設定する。"
 
 #. type: Plain text
-#: dselect.1:141
-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."
+#: dselect.1:134
+#, 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."
+msgid ""
+"By default, B<dselect> provides several methods such as I<cdrom>, "
+"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount>, "
+"I<floppy> or I<ftp>, but other packages may provide additional methods, eg. "
+"the I<apt> access method provided by the B<apt> package."
 msgstr ""
 "デフォルトでは B<dselect> は I<floppy>, I<harddisk>, I<cdrom> といった、いく"
 "つかの方式を提供する。しかし、他のパッケージが追加アクセス方式を提供すること"
@@ -13657,23 +14086,23 @@
 "I<multi_cd> は B<dpkg-multicd> で提供される。"
 
 #. type: Plain text
-#: dselect.1:143
+#: dselect.1:136
 msgid "The use of the I<apt> access method is strongly recommended."
 msgstr "I<apt> アクセス方式の使用を、強く推奨する。"
 
 #. type: SS
-#: dselect.1:144
+#: dselect.1:137
 #, no-wrap
 msgid "update"
 msgstr "update"
 
 #. type: Plain text
-#: dselect.1:146
+#: dselect.1:139
 msgid "Refresh the available packages database."
 msgstr "利用可能パッケージデータベースをリフレッシュする。"
 
 #. type: Plain text
-#: dselect.1:153
+#: dselect.1:146
 msgid ""
 "Retrieves a list of available package versions from the package repository, "
 "configured for the current access method, and update the dpkg database. The "
@@ -13688,7 +14117,7 @@
 "て、このファイルを生成することができる。"
 
 #. type: Plain text
-#: dselect.1:156
+#: dselect.1:149
 msgid ""
 "Details of the update action depend on the access method's implementation.  "
 "Normally the process is straightforward and requires no user interaction."
@@ -13697,18 +14126,18 @@
 "単純で、ユーザの入力を必要としない。"
 
 #. type: SS
-#: dselect.1:157
+#: dselect.1:150
 #, no-wrap
 msgid "select"
 msgstr "select"
 
 #. type: Plain text
-#: dselect.1:159
+#: dselect.1:152
 msgid "View or manage package selections and dependencies."
 msgstr "パッケージの選択や依存関係の表示・管理を行う。"
 
 #. type: Plain text
-#: dselect.1:165
+#: dselect.1:158
 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 "
@@ -13722,7 +14151,7 @@
 "て起こる他の依存・競合パッケージについても同様に追跡する。"
 
 #. type: Plain text
-#: dselect.1:172
+#: dselect.1:165
 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 "
@@ -13738,25 +14167,25 @@
 "返す。"
 
 #. type: Plain text
-#: dselect.1:175
+#: dselect.1:168
 msgid ""
 "The use of the interactive package selections management screen is explained "
 "in more detail below."
 msgstr "対話的なパッケージ選択管理画面の詳細な使い方を後述する。"
 
 #. type: SS
-#: dselect.1:176
+#: dselect.1:169
 #, no-wrap
 msgid "install"
 msgstr "install"
 
 #. type: Plain text
-#: dselect.1:178
+#: dselect.1:171
 msgid "Installs selected packages."
 msgstr "選択したパッケージをインストールする。"
 
 #. type: Plain text
-#: dselect.1:184
+#: dselect.1:177
 msgid ""
 "The configured access method will fetch installable or upgradable packages "
 "from the relevant repositories and install these using B<dpkg>.  Depending "
@@ -13770,7 +14199,7 @@
 "方式により、削除マークをつけたパッケージの削除を行う場合もある。"
 
 #. type: Plain text
-#: dselect.1:192
+#: dselect.1:185
 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 "
@@ -13788,7 +14217,7 @@
 "のこと。"
 
 #. type: Plain text
-#: dselect.1:199
+#: dselect.1:192
 msgid ""
 "Details of the install action depend on the access method's implementation.  "
 "The user's attention and input may be required during installation, "
@@ -13803,58 +14232,58 @@
 "可能である。"
 
 #. type: SS
-#: dselect.1:200
+#: dselect.1:193
 #, no-wrap
 msgid "config"
 msgstr "config"
 
 #. type: Plain text
-#: dselect.1:202
+#: dselect.1:195
 msgid "Configures any previously installed, but not fully configured packages."
 msgstr ""
 "すでにインストール済みだが、設定が完了していないパッケージの設定を行う。"
 
 #. type: SS
-#: dselect.1:203
+#: dselect.1:196
 #, no-wrap
 msgid "remove"
 msgstr "remove"
 
 #. type: Plain text
-#: dselect.1:205
+#: dselect.1:198
 msgid "Removes or purges installed packages, that are marked for removal."
 msgstr "削除マークをつけたインストール済みパッケージの、削除・完全削除を行う。"
 
 #. type: SS
-#: dselect.1:206
+#: dselect.1:199
 #, no-wrap
 msgid "quit"
 msgstr "quit"
 
 #. type: Plain text
-#: dselect.1:208
+#: dselect.1:201
 msgid "Quit B<dselect>"
 msgstr "B<dselect> を終了する。"
 
 #. type: Plain text
-#: dselect.1:210
+#: dselect.1:203
 msgid "Exits the program with zero (successful) errorcode."
 msgstr "エラーコード 0 (成功) でプログラムを終了する。"
 
 #. type: SH
-#: dselect.1:212
+#: dselect.1:205
 #, no-wrap
 msgid "Package selections management"
 msgstr "パッケージ選択管理"
 
 #. type: SS
-#: dselect.1:214
+#: dselect.1:207
 #, no-wrap
 msgid "Introduction"
 msgstr "入門"
 
 #. type: Plain text
-#: dselect.1:230
+#: dselect.1:223
 msgid ""
 "B<dselect> directly exposes the administrator to some of the complexities "
 "involved with managing large sets of packages with many interdependencies. "
@@ -13877,7 +14306,7 @@
 "ルを参照してほしい。"
 
 #. type: Plain text
-#: dselect.1:236
+#: dselect.1:229
 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> "
@@ -13891,13 +14320,13 @@
 "する。オンラインヘルプ画面は、いつでも B<'？'> キーで表示できる。"
 
 #. type: SS
-#: dselect.1:237
+#: dselect.1:230
 #, no-wrap
 msgid "Screen layout"
 msgstr "画面レイアウト"
 
 #. type: Plain text
-#: dselect.1:245
+#: dselect.1:238
 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 "
@@ -13913,7 +14342,7 @@
 "は、変更できる。"
 
 #. type: Plain text
-#: dselect.1:248
+#: dselect.1:241
 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."
@@ -13922,13 +14351,13 @@
 "大、画面の均等分割を切り替える。"
 
 #. type: SS
-#: dselect.1:249
+#: dselect.1:242
 #, no-wrap
 msgid "Package details view"
 msgstr "パッケージ詳細表示"
 
 #. type: Plain text
-#: dselect.1:258
+#: dselect.1:251
 #, no-wrap
 msgid ""
 "The package details view by default shows the extended package description\n"
@@ -13945,7 +14374,7 @@
 " - 利用可能バージョンのコントロール情報\n"
 
 #. type: Plain text
-#: dselect.1:262
+#: dselect.1:255
 msgid ""
 "In a dependency resolution screen, there is also the possibility of viewing "
 "the specific unresolved depends or conflicts related to the package and "
@@ -13955,13 +14384,13 @@
 "もに表示する可能性がある。"
 
 #. type: SS
-#: dselect.1:263
+#: dselect.1:256
 #, no-wrap
 msgid "Packages status list"
 msgstr "パッケージ状況リスト"
 
 #. type: Plain text
-#: dselect.1:268
+#: dselect.1:261
 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 "
@@ -13972,7 +14401,7 @@
 "ジデータベースが知っているパッケージが含まれる。"
 
 #. type: Plain text
-#: dselect.1:276
+#: dselect.1:269
 msgid ""
 "For every package, the list shows the package's status, priority, section, "
 "installed and available versions, the package name and its short "
@@ -13988,7 +14417,7 @@
 "替える。簡略表示がデフォルトである。"
 
 #. type: Plain text
-#: dselect.1:282
+#: dselect.1:275
 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 "
@@ -14000,7 +14429,7 @@
 "況を表し、その後の 2 つはユーザがセットした選択状況を表している。"
 
 #. type: Plain text
-#: dselect.1:300
+#: dselect.1:293
 #, no-wrap
 msgid ""
 "These are the meanings of the shorthand package status indicator codes:\n"
@@ -14040,13 +14469,13 @@
 "  B<n>       新規パッケージでまだマーク付けされていない\n"
 
 #. type: SS
-#: dselect.1:301
+#: dselect.1:294
 #, no-wrap
 msgid "Cursor and screen movement"
 msgstr "カーソルおよび画面移動"
 
 #. type: Plain text
-#: dselect.1:306
+#: dselect.1:299
 msgid ""
 "The package selection list and the dependency conflict resolution screens "
 "can be navigated using motion commands mapped to the following keys:"
@@ -14055,7 +14484,7 @@
 "操作できる。"
 
 #. type: Plain text
-#: dselect.1:323
+#: dselect.1:316
 #, no-wrap
 msgid ""
 "  B<p, Up, k>           move cursor bar up\n"
@@ -14093,13 +14522,13 @@
 "  B<^f>                 表示を 1 文字右にスクロール\n"
 
 #. type: SS
-#: dselect.1:324
+#: dselect.1:317
 #, no-wrap
 msgid "Searching and sorting"
 msgstr "検索と並べ替え"
 
 #. type: Plain text
-#: dselect.1:338
+#: dselect.1:331
 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 "
@@ -14121,7 +14550,7 @@
 "に戻る。"
 
 #. type: Plain text
-#: dselect.1:345
+#: dselect.1:338
 #, no-wrap
 msgid ""
 "The list sort order can be varied by pressing\n"
@@ -14138,20 +14567,20 @@
 " セクション+優先度  利用可能+セクション  状況+セクション\n"
 
 #. type: Plain text
-#: dselect.1:348
+#: dselect.1:341
 msgid ""
 "Where not listed above explicitly, alphabetic order is used as the final "
 "subordering sort key."
 msgstr "上記リストには明記していないが、最後にアルファベット順でソートされる。"
 
 #. type: SS
-#: dselect.1:349
+#: dselect.1:342
 #, no-wrap
 msgid "Altering selections"
 msgstr "選択の変更"
 
 #. type: Plain text
-#: dselect.1:358
+#: dselect.1:351
 #, no-wrap
 msgid ""
 "The requested selection state of individual packages may be\n"
@@ -14170,7 +14599,7 @@
 "  B<_>            削除して設定も消す\n"
 
 #. type: Plain text
-#: dselect.1:362
+#: dselect.1:355
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -14180,7 +14609,7 @@
 "決画面を提示する。これは後ほど説明する。"
 
 #. type: Plain text
-#: dselect.1:367
+#: dselect.1:360
 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 "
@@ -14191,7 +14620,7 @@
 "在のリストのソート順設定に依存する。"
 
 #. type: Plain text
-#: dselect.1:373
+#: dselect.1:366
 msgid ""
 "Proper care should be taken when altering large groups of selections, "
 "because this can instantaneously create large numbers of unresolved depends "
@@ -14205,13 +14634,13 @@
 "なのは、保留や保留解除の時ぐらいである。"
 
 #. type: SS
-#: dselect.1:374
+#: dselect.1:367
 #, no-wrap
 msgid "Resolving depends and conflicts"
 msgstr "依存・競合解決"
 
 #. type: Plain text
-#: dselect.1:379
+#: dselect.1:372
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -14221,7 +14650,7 @@
 "画面を表示する。初めての場合は、その前にヘルプ画面を表示する。"
 
 #. type: Plain text
-#: dselect.1:386
+#: dselect.1:379
 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 "
@@ -14236,7 +14665,7 @@
 "パッケージの依存や競合の原因を、デフォルトで表示する。"
 
 #. type: Plain text
-#: dselect.1:392
+#: dselect.1:385
 #, fuzzy
 msgid ""
 "When the sublist of packages is displayed initially, B<dselect> may have "
@@ -14251,7 +14680,7 @@
 "である。"
 
 #. type: Plain text
-#: dselect.1:400
+#: dselect.1:393
 msgid ""
 "The listed packages' selection state may be reverted to the original "
 "settings, as they were before the unresolved depends or conflicts were "
@@ -14266,13 +14695,13 @@
 "最終的に B<'U'> を押すことで、自動提案をセットすることができる。"
 
 #. type: SS
-#: dselect.1:401
+#: dselect.1:394
 #, no-wrap
 msgid "Establishing the requested selections"
 msgstr "選択要求の確定"
 
 #. type: Plain text
-#: dselect.1:408
+#: dselect.1:401
 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 "
@@ -14285,7 +14714,7 @@
 "だ未解決依存が存在する場合、 B<dselect> は依存関係解決画面を改めて表示する。"
 
 #. type: Plain text
-#: dselect.1:414
+#: dselect.1:407
 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 "
@@ -14297,7 +14726,7 @@
 "詳細を読んでいなければ、これをしないこと。"
 
 #. type: Plain text
-#: dselect.1:421
+#: dselect.1:414
 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 "
@@ -14310,7 +14739,7 @@
 "確定した選択に戻すことができる。"
 
 #. type: Plain text
-#: dselect.1:428
+#: dselect.1:421
 msgid ""
 "If you mistakenly establish some settings and wish to revert all the "
 "selections to what is currently installed on the system, press the B<'C'> "
@@ -14320,14 +14749,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:435
+#: dselect.1:428
 msgid ""
 "If set, B<dselect> will use it as the directory from which to read the user "
 "specific configuration file."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:441
+#: dselect.1:434
 msgid ""
 "The B<dselect> package selection interface is confusing to some new users.  "
 "Reportedly, it even makes seasoned kernel developers cry."
@@ -14336,22 +14765,22 @@
 "ころでは、経験を積んだカーネル開発者ですら、これを嘆いている。"
 
 #. type: Plain text
-#: dselect.1:443
+#: dselect.1:436
 msgid "The documentation is lacking."
 msgstr "文書が足りない。"
 
 #. type: Plain text
-#: dselect.1:445
+#: dselect.1:438
 msgid "There is no help option in the main menu."
 msgstr "メインメニューにヘルプオプションがない。"
 
 #. type: Plain text
-#: dselect.1:447
+#: dselect.1:440
 msgid "The visible list of available packages cannot be reduced."
 msgstr "利用可能パッケージのリスト表示を減らせない。"
 
 #. type: Plain text
-#: dselect.1:451
+#: dselect.1:444
 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, "
@@ -14362,12 +14791,12 @@
 "る。"
 
 #. type: Plain text
-#: dselect.1:457
+#: dselect.1:450
 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:462
+#: dselect.1:455
 #, fuzzy
 #| msgid ""
 #| "B<dselect> was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full "
@@ -14380,7 +14809,7 @@
 "プログラムへの全貢献者一覧は `dselect --license' で参照できる。"
 
 #. type: Plain text
-#: dselect.1:465
+#: dselect.1:458
 msgid ""
 "This manual page was written by Juho Vuori E<lt>javuori@cc.helsinki.fiE<gt>, "
 "Josip Rodin and Joost kooij."
@@ -14394,6 +14823,12 @@
 msgid "dselect.cfg"
 msgstr "dselect"
 
+#. type: TH
+#: dselect.cfg.5:1
+#, fuzzy, no-wrap
+msgid "2011-07-03"
+msgstr "2006-02-28"
+
 #. type: Plain text
 #: dselect.cfg.5:4
 msgid "dselect.cfg - dselect configuration file"
@@ -14403,7 +14838,7 @@
 #: 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 "
+"option which is exactly the same as a normal command line option for dselect "
 "except for the leading dashes which are not used here. Quotes surrounding "
 "option values are stripped. Comments are allowed by starting a line with a "
 "hash sign (\"B<#>\")."
@@ -14454,13 +14889,13 @@
 msgstr "start-stop-daemon - システムデーモンプログラムの起動、停止"
 
 #. type: Plain text
-#: start-stop-daemon.8:9
+#: start-stop-daemon.8:8
 #, fuzzy
-msgid "B<start-stop-daemon> [I<options>] I<command>"
+msgid "B<start-stop-daemon> [I<option>...] I<command>"
 msgstr "B<start-stop-daemon> B<-K>|B<--stop> I<options>"
 
 #. type: Plain text
-#: start-stop-daemon.8:15
+#: start-stop-daemon.8:14
 #, fuzzy
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
@@ -14472,7 +14907,7 @@
 "定することで、実行中のプロセスを見つけることができる。"
 
 #. type: Plain text
-#: start-stop-daemon.8:34
+#: start-stop-daemon.8:33
 #, fuzzy
 msgid ""
 "Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
@@ -14493,13 +14928,13 @@
 "子プロセスを持つデーモンには、 pidfile を指定しなければならない。"
 
 #. type: TP
-#: start-stop-daemon.8:36
+#: start-stop-daemon.8:35
 #, 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:53
+#: start-stop-daemon.8:52
 #, fuzzy
 msgid ""
 "Check for the existence of a specified process.  If such a process exists, "
@@ -14518,13 +14953,13 @@
 "ま引き渡される。"
 
 #. type: TP
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 #, fuzzy, no-wrap
 msgid "B<-K>, B<--stop>"
 msgstr "B<-o>|B<--oknodo>"
 
 #. type: Plain text
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
 #, fuzzy
 msgid ""
 "Checks for the existence of a specified process.  If such a process exists, "
@@ -14543,54 +14978,67 @@
 "を確認する。"
 
 #. type: TP
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
+#, fuzzy, no-wrap
+msgid "B<-T>, B<--status>"
+msgstr "B<-o>|B<--oknodo>"
+
+#. type: Plain text
+#: start-stop-daemon.8:74
+msgid ""
+"Check for the existence of a specified process, and returns an exit status "
+"code, according to the LSB Init Script Actions."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:74
 #, fuzzy, no-wrap
 msgid "B<-H>, B<--help>"
 msgstr "B<-H>|B<--help>"
 
 #. type: Plain text
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 #, fuzzy
 msgid "Show usage information and exit."
 msgstr "利用方法に関する情報を表示する。"
 
 #. type: TP
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 #, fuzzy, no-wrap
 msgid "B<-V>, B<--version>"
 msgstr "B<-V>|B<--version>"
 
 #. type: Plain text
-#: start-stop-daemon.8:77
+#: start-stop-daemon.8:80
 #, fuzzy
 msgid "Show the program version and exit."
 msgstr "バージョンと著作権に関する情報を表示する。"
 
 #. type: SH
-#: start-stop-daemon.8:78
+#: start-stop-daemon.8:81
 #, fuzzy, no-wrap
 msgid "MATCHING OPTIONS"
 msgstr "アクション・オプション"
 
 #. type: TP
-#: start-stop-daemon.8:79
+#: start-stop-daemon.8:82
 #, 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:83
+#: start-stop-daemon.8:86
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr "I<pid-file> で指定されるプロセス ID を持つプロセスを調べる。"
 
 #. type: TP
-#: start-stop-daemon.8:83
+#: start-stop-daemon.8:86
 #, fuzzy, no-wrap
 msgid "B<-x>, B<--exec> I<executable>"
 msgstr "B<-x>|B<--exec> I<executable>"
 
 #. type: Plain text
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
@@ -14598,13 +15046,13 @@
 "(B</proc/>I<pid>B</exe> により)指定された executable のプロセスを調べる。"
 
 #. type: TP
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 #, 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:93
+#: start-stop-daemon.8:96
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
@@ -14612,37 +15060,37 @@
 "(B</proc/>I<pid>B</stat> により) I<process-name> という名のプロセスを調べる。"
 
 #. type: TP
-#: start-stop-daemon.8:93
+#: start-stop-daemon.8:96
 #, 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:99
+#: start-stop-daemon.8:102
 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:101
+#: start-stop-daemon.8:104
 #, 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:104
+#: start-stop-daemon.8:107
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr "プロセスを開始する時点で、I<group> や I<gid> を変更する。"
 
 #. type: TP
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:107
 #, fuzzy, 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:112
 #, fuzzy
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
@@ -14652,13 +15100,13 @@
 "る (デフォルトは 15)。"
 
 #. type: TP
-#: start-stop-daemon.8:109
+#: start-stop-daemon.8:112
 #, 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:119
+#: start-stop-daemon.8:122
 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 "
@@ -14671,7 +15119,7 @@
 "が実行される。"
 
 #. type: Plain text
-#: start-stop-daemon.8:130
+#: start-stop-daemon.8:133
 #, fuzzy
 msgid ""
 "If I<timeout> is specified instead of I<schedule>, then the schedule "
@@ -14683,7 +15131,7 @@
 "指定されるシグナルである。"
 
 #. type: Plain text
-#: start-stop-daemon.8:146
+#: start-stop-daemon.8:149
 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 "
@@ -14698,7 +15146,7 @@
 "ことを意味する。"
 
 #. type: Plain text
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 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, "
@@ -14709,13 +15157,13 @@
 "れば、 B<--signal> で指定したシグナルは無視される。"
 
 #. type: TP
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 #, fuzzy, no-wrap
 msgid "B<-a>, B<--startas> I<pathname>"
 msgstr "B<-a>|B<--startas> I<pathname>"
 
 #. type: Plain text
-#: start-stop-daemon.8:164
+#: start-stop-daemon.8:167
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
@@ -14725,13 +15173,13 @@
 "トになる。"
 
 #. type: TP
-#: start-stop-daemon.8:164
+#: start-stop-daemon.8:167
 #, fuzzy, no-wrap
 msgid "B<-t>, B<--test>"
 msgstr "B<-t>|B<--test>"
 
 #. type: Plain text
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
@@ -14740,37 +15188,37 @@
 "の処理は行わない。"
 
 #. type: TP
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 #, fuzzy, no-wrap
 msgid "B<-o>, B<--oknodo>"
 msgstr "B<-o>|B<--oknodo>"
 
 #. type: Plain text
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
 "処理が何も行われない(又は、行なわれようともしなかった)場合、終了ステータス 1 "
 "のかわりに 0 を返す。"
 
 #. type: TP
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 #, fuzzy, no-wrap
 msgid "B<-q>, B<--quiet>"
 msgstr "B<-q>|B<--quiet>"
 
 #. type: Plain text
-#: start-stop-daemon.8:174
+#: start-stop-daemon.8:177
 msgid "Do not print informational messages; only display error messages."
 msgstr "参考情報を出力しない。エラーメッセージのみ表示。"
 
 #. type: TP
-#: start-stop-daemon.8:174
+#: start-stop-daemon.8:177
 #, fuzzy, no-wrap
-msgid "B<-c>, B<--chuid> I<username>|I<uid>"
+msgid "B<-c>, B<--chuid> I<username>|I<uid>[B<:>I<group>|I<gid>]"
 msgstr "B<-c>|B<--chuid> I<username>|I<uid>"
 
 #. type: Plain text
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 #, fuzzy
 msgid ""
 "Change to this username/uid before starting the process. You can also "
@@ -14792,13 +15240,13 @@
 "する場合にのみ使用する。"
 
 #. type: TP
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 #, fuzzy, no-wrap
 msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<-r>|B<--chroot> I<root>"
 
 #. type: Plain text
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
@@ -14807,13 +15255,13 @@
 "chroot 後に、書き出されることに注意すること。"
 
 #. type: TP
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 #, fuzzy, no-wrap
 msgid "B<-d>, B<--chdir> I<path>"
 msgstr "B<-d>|B<--chdir> I<path>"
 
 #. type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 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-"
@@ -14824,13 +15272,13 @@
 "stop-daemon は、プロセスを開始する前に root ディレクトリに chdir する。"
 
 #. type: TP
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 #, fuzzy, no-wrap
 msgid "B<-b>, B<--background>"
 msgstr "B<-b>|B<--background>"
 
 #. type: Plain text
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 #, fuzzy
 msgid ""
 "Typically used with programs that don't detach on their own. This option "
@@ -14850,24 +15298,24 @@
 "使用を意図している。"
 
 #. type: TP
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 #, fuzzy, no-wrap
 msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr "B<-N>|B<--nicelevel> I<int>"
 
 #. type: Plain text
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 msgid "This alters the priority of the process before starting it."
 msgstr "プロセスを開始する前にプロセスのプライオリティを変更する。"
 
 #. type: TP
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 #, no-wrap
 msgid "B<-P>, B<--procsched> I<policy>B<:>I<priority>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 msgid ""
 "This alters the process scheduler policy and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -14876,13 +15324,13 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 #, fuzzy, no-wrap
 msgid "B<-I>, B<--iosched> I<class>B<:>I<priority>"
 msgstr "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
 
 #. type: Plain text
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 msgid ""
 "This alters the IO scheduler class and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -14892,24 +15340,24 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 #, fuzzy, no-wrap
 msgid "B<-k>, B<--umask> I<mask>"
 msgstr "B<-k>|B<--umask> I<mask>"
 
 #. type: Plain text
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 msgid "This sets the umask of the process before starting it."
 msgstr "プロセスを開始する前にプロセスの umask を設定する。"
 
 #. type: TP
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 #, fuzzy, no-wrap
 msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-m>|B<--make-pidfile>"
 
 #. type: Plain text
-#: start-stop-daemon.8:252
+#: start-stop-daemon.8:255
 #, fuzzy
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
@@ -14928,66 +15376,112 @@
 "動作しない。このため、通常は B<--background> オプションと併用する場合にのみ有"
 "用である。"
 
-#. type: TP
-#: start-stop-daemon.8:252
-#, fuzzy, no-wrap
-msgid "B<-v>, B<--verbose>"
-msgstr "B<-v>|B<--verbose>"
-
 #. type: Plain text
-#: start-stop-daemon.8:255
+#: start-stop-daemon.8:258
 msgid "Print verbose informational messages."
 msgstr "詳しい情報を出力する。"
 
 #. type: Plain text
-#: start-stop-daemon.8:272
+#: start-stop-daemon.8:270
+msgid ""
+"The requested action was performed. If B<--oknodo> was specified, it's also "
+"possible that nothing had to be done.  This can happen when B<--start> was "
+"specified and a matching process was already running, or when B<--stop> was "
+"specified and there were no matching processes."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:275
+msgid "If B<--oknodo> was not specified and nothing was done."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:283
+msgid ""
+"If B<--stop> and B<--retry> were specified, but the end of the schedule was "
+"reached and the processes were still running."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:283 start-stop-daemon.8:295
+#, no-wrap
+msgid "B<3>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:286
+msgid "Any other error."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:289
 msgid ""
-"B<start-stop-daemon> returns 0 if the requested action was performed, or if "
-"B<--oknodo> is specified and either B<--start> was specified and a matching "
-"process was already running, or B<--stop> was specified and there were no "
-"matching processes. If B<--oknodo> was not specified and nothing was done, 1 "
-"is returned. If B<--stop> and B<--retry> were specified, but the end of the "
-"schedule was reached and the processes were still running, the error value "
-"is 2. For all other errors, the status is 3."
+"When using the B<--status> command, the following status codes are returned:"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:292
+msgid "Program is running."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:295
+msgid "Program is not running and the pid file exists."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:298
+msgid "Program is not running."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:298
+#, no-wrap
+msgid "B<4>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:276
+#: start-stop-daemon.8:301
+msgid "Unable to determine program status."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:305
 msgid ""
 "Start the B<food> daemon, unless one is already running (a process named "
 "food, running as user food, with pid in food.pid):"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:279
+#: start-stop-daemon.8:308
 #, no-wrap
 msgid "start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon\n"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:282
+#: start-stop-daemon.8:311
 msgid "Send B<SIGTERM> to B<food> and wait up to 5 seconds for it to stop:"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:285
+#: start-stop-daemon.8:314
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5\n"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:288
+#: start-stop-daemon.8:317
 msgid "Demonstration of a custom schedule for stopping B<food>:"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:291
+#: start-stop-daemon.8:320
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5\n"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:297
+#: start-stop-daemon.8:326
 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>."
@@ -14997,7 +15491,7 @@
 "成。"
 
 #. type: Plain text
-#: start-stop-daemon.8:299
+#: start-stop-daemon.8:328
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -15020,13 +15514,13 @@
 "する"
 
 #. type: Plain text
-#: update-alternatives.8:16
+#: update-alternatives.8:15
 #, fuzzy
-msgid "B<update-alternatives> [I<options>] I<command>"
+msgid "B<update-alternatives> [I<option>...] I<command>"
 msgstr "B<update-alternatives> [I<options>] B<--all>"
 
 #. type: Plain text
-#: update-alternatives.8:21
+#: update-alternatives.8:20
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
@@ -15035,7 +15529,7 @@
 "ンクを生成・削除・管理したり、リンクの情報を表示したりする。"
 
 #. type: Plain text
-#: update-alternatives.8:29
+#: update-alternatives.8:28
 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 "
@@ -15052,7 +15546,7 @@
 "抱えることになる。"
 
 #. type: Plain text
-#: update-alternatives.8:51
+#: update-alternatives.8:50
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -15076,7 +15570,7 @@
 "alternatives システムはその設定を変更しない。"
 
 #. type: Plain text
-#: update-alternatives.8:61
+#: update-alternatives.8:60
 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> "
@@ -15093,7 +15587,7 @@
 "る。"
 
 #. type: Plain text
-#: update-alternatives.8:73
+#: update-alternatives.8:72
 #, fuzzy
 msgid ""
 "When each package providing a file with a particular functionality is "
@@ -15108,7 +15602,7 @@
 "Debian パッケージの B<postinst> または B<prerm> スクリプトから呼び出される。"
 
 #. type: Plain text
-#: update-alternatives.8:92
+#: update-alternatives.8:91
 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>"
@@ -15127,7 +15621,7 @@
 "関連づけされた slave とは、 I<リンクグループ> を形成する。"
 
 #. type: Plain text
-#: update-alternatives.8:101
+#: update-alternatives.8:100
 #, fuzzy
 msgid ""
 "Each link group is, at any given time, in one of two modes: automatic or "
@@ -15144,7 +15638,7 @@
 "ステムはリンクを変更しない。システム管理者が行った決定がずっと保存される。"
 
 #. type: Plain text
-#: update-alternatives.8:110
+#: 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 "
@@ -15158,7 +15652,7 @@
 "モードに切り換わる。"
 
 #. type: Plain text
-#: update-alternatives.8:117
+#: 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 "
@@ -15169,16 +15663,16 @@
 "る選択肢になる。"
 
 #. type: Plain text
-#: update-alternatives.8:134
+#: update-alternatives.8:133
 #, fuzzy
 msgid ""
-"When using the I<--config> option, B<update-alternatives> will list all of "
+"When using the B<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master "
 "alternative name. The current choice is marked with a '*'.  You will then be "
 "prompted for your choice regarding this link group.  Depending on the choice "
 "made, the link group might no longer be in I<auto> mode. You will need to "
-"use the I<--auto> option in order to return to the automatic mode (or you "
-"can rerun I<--config> and select the entry marked as automatic)."
+"use the B<--auto> option in order to return to the automatic mode (or you "
+"can rerun B<--config> and select the entry marked as automatic)."
 msgstr ""
 "I<--config> オプションを用いると、 B<update-alternatives> は与えられた "
 "master リンクのリンクグループに対応する選択肢をすべてリストする。現在選択され"
@@ -15188,16 +15682,20 @@
 "は、 I<--auto> オプションを用いる必要がある。"
 
 #. type: Plain text
-#: update-alternatives.8:138
+#: update-alternatives.8:137
+#, fuzzy
+#| msgid ""
+#| "If you want to configure non-interactively you can use the I<--set> "
+#| "option instead (see below)."
 msgid ""
-"If you want to configure non-interactively you can use the I<--set> option "
+"If you want to configure non-interactively you can use the B<--set> option "
 "instead (see below)."
 msgstr ""
 "非対話的に設定をしたい場合は I<--set> オプションを代わりに使用する(以下を参"
 "照)。"
 
 #. type: Plain text
-#: update-alternatives.8:149
+#: update-alternatives.8:148
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "In other words, the usage of B<update-alternatives> is B<mandatory> for all "
@@ -15206,13 +15704,13 @@
 msgstr ""
 
 #. type: SH
-#: update-alternatives.8:150
+#: update-alternatives.8:149
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr "用語"
 
 #. type: Plain text
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
@@ -15221,13 +15719,13 @@
 "明し、動作の理解の助けとしたい。"
 
 #. type: TP
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 #, no-wrap
 msgid "generic name (or alternative link)"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
 "to one of a number of files of similar function."
@@ -15236,24 +15734,24 @@
 "つ複数のファイルのどれかひとつを参照する。"
 
 #. type: TP
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 #, fuzzy, no-wrap
 msgid "alternative name"
 msgstr "選択肢 (alternative)"
 
 #. type: Plain text
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 msgid "The name of a symbolic link in the alternatives directory."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 #, no-wrap
 msgid "alternative (or alternative path)"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 msgid ""
 "The name of a specific file in the filesystem, which may be made accessible "
 "via a generic name using the alternatives system."
@@ -15262,24 +15760,24 @@
 "らアクセスされるようにできる。"
 
 #. type: TP
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 #, no-wrap
 msgid "alternatives directory"
 msgstr "alternatives ディレクトリ"
 
 #. type: Plain text
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr "symlink を保持するディレクトリ。デフォルトは I</etc/alternatives>。"
 
 #. type: TP
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 #, no-wrap
 msgid "administrative directory"
 msgstr "administrative ディレクトリ"
 
 #. type: Plain text
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
 "alternatives>' state information."
@@ -15288,24 +15786,24 @@
 "lib/dpkg/alternatives>。"
 
 #. type: TP
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 #, no-wrap
 msgid "link group"
 msgstr "リンクグループ"
 
 #. type: Plain text
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr "関連する symlink のセット。グループごと更新するためのもの。"
 
 #. type: TP
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 #, no-wrap
 msgid "master link"
 msgstr "master リンク"
 
 #. type: Plain text
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 #, fuzzy
 msgid ""
 "The alternative link in a link group which determines how the other links in "
@@ -15314,13 +15812,13 @@
 "リンクグループに属するリンクで、グループの他のリンクの設定を決定するもの。"
 
 #. type: TP
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 #, no-wrap
 msgid "slave link"
 msgstr "slave リンク"
 
 #. type: Plain text
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 #, fuzzy
 msgid ""
 "An alternative link in a link group which is controlled by the setting of "
@@ -15329,13 +15827,13 @@
 "リンクグループに属するリンクで、 master リンクの設定によって制御されるもの。"
 
 #. type: TP
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 #, no-wrap
 msgid "automatic mode"
 msgstr "automatic モード"
 
 #. type: Plain text
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 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 "
@@ -15346,13 +15844,13 @@
 "整は alternatives システムが自動的に行う。"
 
 #. type: TP
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 #, no-wrap
 msgid "manual mode"
 msgstr "manual モード"
 
 #. type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:201
 msgid ""
 "When a link group is in manual mode, the alternatives system will not make "
 "any changes to the system administrator's settings."
@@ -15361,13 +15859,13 @@
 "管理者の設定を一切変更しない。"
 
 #. type: TP
-#: update-alternatives.8:204
+#: update-alternatives.8:203
 #, fuzzy, no-wrap
 msgid "B<--install> I<link name path priority> [B<--slave> I<link name path>]..."
 msgstr "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
 
 #. type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:222
 #, fuzzy
 msgid ""
 "Add a group of alternatives to the system.  I<link> is the generic name for "
@@ -15389,7 +15887,7 @@
 "と、それにに続く 3 つの引数のセットは、 0 個以上いくつでも指定してよい。"
 
 #. type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 #, fuzzy
 msgid ""
 "If the alternative name specified exists already in the alternatives "
@@ -15408,28 +15906,32 @@
 "ときには、 symlink は新たに追加された選択肢を参照するように更新される。"
 
 #. type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr "B<--set> I<name path>"
 
 #. type: Plain text
-#: update-alternatives.8:243
+#: update-alternatives.8:242
+#, 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."
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
-"I<--config> but is non-interactive and thus scriptable."
+"B<--config> but is non-interactive and thus scriptable."
 msgstr ""
 "プログラム I<path> を I<name> の選択肢として設定する。 I<--config> と同等だ"
 "が、こちらは非対話的であるため、スクリプト向けである。"
 
 #. type: TP
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr "B<--remove> I<name path>"
 
 #. type: Plain text
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 #, fuzzy
 msgid ""
 "Remove an alternative and all of its associated slave links.  I<name> is a "
@@ -15450,13 +15952,13 @@
 "の変更は行われない。その選択肢の情報が削除されるだけである。"
 
 #. type: TP
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr "B<--remove-all> I<name>"
 
 #. type: Plain text
-#: update-alternatives.8:269
+#: update-alternatives.8:268
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
@@ -15465,7 +15967,7 @@
 "は、alternative ディレクトリの名前である。"
 
 #. type: Plain text
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 msgid ""
 "Call B<--config> on all alternatives. It can be usefully combined with B<--"
 "skip-auto> to review and configure all alternatives which are not configured "
@@ -15475,13 +15977,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 #, fuzzy, no-wrap
 msgid "B<--auto> I<name>"
 msgstr "B<--auto> I<link>"
 
 #. type: Plain text
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 #, fuzzy
 msgid ""
 "Switch the link group behind the alternative for I<name> to automatic mode.  "
@@ -15493,13 +15995,13 @@
 "alterantive のうち、もっとも priority の高いものを参照するように更新される。"
 
 #. type: TP
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 #, fuzzy, no-wrap
 msgid "B<--display> I<name>"
 msgstr "B<--display> I<link>"
 
 #. type: Plain text
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 #, fuzzy
 msgid ""
 "Display information about the link group.  Information displayed includes "
@@ -15514,13 +16016,13 @@
 "トールされている選択肢のうち、もっとも priority の高いもの、である。"
 
 #. type: TP
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 #, fuzzy, no-wrap
 msgid "B<--get-selections>"
 msgstr "B<dpkg --set-selections>"
 
 #. type: Plain text
-#: update-alternatives.8:300
+#: update-alternatives.8:299
 msgid ""
 "List all master alternative names (those controlling a link group)  and "
 "their status. Each line contains up to 3 fields (separated by one or more "
@@ -15531,44 +16033,44 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 msgid ""
 "Read configuration of alternatives on standard input in the format generated "
 "by B<update-alternatives --get-selections> and reconfigure them accordingly."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 #, fuzzy, no-wrap
 msgid "B<--query> I<name>"
 msgstr "B<--auto> I<link>"
 
 #. type: Plain text
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 msgid ""
 "Display information about the link group like --display does, but in a "
 "machine parseable way (see section B<QUERY FORMAT> below)."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 #, fuzzy, no-wrap
 msgid "B<--list> I<name>"
 msgstr "B<--list> I<link>"
 
 #. type: Plain text
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 msgid "Display all targets of the link group."
 msgstr "リンクグループのすべてのターゲットを表示する。"
 
 #. type: TP
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 #, fuzzy, no-wrap
 msgid "B<--config> I<name>"
 msgstr "B<--config> I<link>"
 
 #. type: Plain text
-#: update-alternatives.8:317
+#: update-alternatives.8:316
 #, fuzzy
 msgid ""
 "Show available alternatives for a link group and allow the user to "
@@ -15578,33 +16080,33 @@
 "るようにする。リンクグループは更新され、 I<auto> モードではなくなる。"
 
 #. type: TP
-#: update-alternatives.8:325
+#: update-alternatives.8:324
 #, fuzzy, no-wrap
 msgid "B<--altdir>I< directory>"
 msgstr "B<--altdir> I<directory>"
 
 #. type: Plain text
-#: update-alternatives.8:329
+#: update-alternatives.8:328
 msgid ""
 "Specifies the alternatives directory, when this is to be different from the "
 "default."
 msgstr "alternatives ディレクトリをデフォルトから変えたいときに指定する。"
 
 #. type: Plain text
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 msgid ""
 "Specifies the administrative directory, when this is to be different from "
 "the default."
 msgstr "administrative ディレクトリをデフォルトから変えたいときに指定する。"
 
 #. type: TP
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 #, fuzzy, no-wrap
 msgid "B<--log>I< file>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: update-alternatives.8:337
+#: update-alternatives.8:336
 #, fuzzy
 msgid ""
 "Specifies the log file, when this is to be different from the default (/var/"
@@ -15612,59 +16114,59 @@
 msgstr "alternatives ディレクトリをデフォルトから変えたいときに指定する。"
 
 #. type: Plain text
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 msgid ""
-"Let B<update-alternatives> replace any real file that is installed where an "
-"alternative link has to be installed."
+"Let B<update-alternatives> replace or drop any real file that is installed "
+"where an alternative link has to be installed or removed."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 #, fuzzy, no-wrap
 msgid "B<--skip-auto>"
 msgstr "B<--update>"
 
 #. type: Plain text
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 msgid ""
 "Skip configuration prompt for alternatives which are properly configured in "
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 #, no-wrap
 msgid "B<--verbose>"
 msgstr "B<--verbose>"
 
 #. type: Plain text
-#: update-alternatives.8:351
+#: update-alternatives.8:350
 msgid "Generate more comments about what B<update-alternatives> is doing."
 msgstr ""
 "B<update-alternatives> が行っている作業に付いて、より詳細なコメントを生成す"
 "る。"
 
 #. type: Plain text
-#: update-alternatives.8:354
+#: update-alternatives.8:353
 #, fuzzy
 msgid "Don't generate any comments unless errors occur."
 msgstr "エラー以外のコメントを出さない。このオプションはまだ実装されていない。"
 
 #. type: Plain text
-#: update-alternatives.8:360
+#: update-alternatives.8:359
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the base administrative directory."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:362
+#: update-alternatives.8:361
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr "I</etc/alternatives/>"
 
 #. type: Plain text
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
@@ -15673,13 +16175,13 @@
 "きる。"
 
 #. type: TP
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 #, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "I</var/lib/dpkg/alternatives/>"
 
 #. type: Plain text
-#: update-alternatives.8:374
+#: update-alternatives.8:373
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
@@ -15692,14 +16194,8 @@
 msgid "The requested action was successfully performed."
 msgstr "リクエストされたアクションが正しく実行された。"
 
-#. type: IP
-#: update-alternatives.8:378
-#, no-wrap
-msgid "2"
-msgstr "2"
-
 #. type: Plain text
-#: update-alternatives.8:381
+#: update-alternatives.8:382
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
@@ -15707,104 +16203,104 @@
 "コマンドラインの解釈を行うときか、アクションを実行するときに問題が起こった。"
 
 #. type: SH
-#: update-alternatives.8:382
+#: update-alternatives.8:383
 #, fuzzy, no-wrap
 msgid "QUERY FORMAT"
 msgstr "フォーマット"
 
 #. type: Plain text
-#: update-alternatives.8:387
+#: update-alternatives.8:388
 msgid ""
-"The B<update-alternatives> I<--query> format is using an RFC822-like flat "
+"The B<update-alternatives --query> format is using an RFC822-like flat "
 "format. It's made of I<n> + 1 blocks where I<n> is the number of "
 "alternatives available in the queried link group. The first block contains "
 "the following fields:"
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:387
+#: update-alternatives.8:388
 #, fuzzy, no-wrap
-msgid "B<Link:> E<lt>linkE<gt>"
+msgid "B<Link:>I< link>"
 msgstr "B<Source:> E<lt>ソース名E<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 msgid "The generic name of the alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 #, fuzzy, no-wrap
-msgid "B<Status:> E<lt>statusE<gt>"
+msgid "B<Status:>I< status>"
 msgstr "B<Replaces:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 #, fuzzy, no-wrap
-msgid "B<Best:> E<lt>best choiceE<gt>"
+msgid "B<Best:>I< best-choice>"
 msgstr "B<Replaces:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 #, fuzzy, no-wrap
-msgid "B<Value:> E<lt>currently selected alternativeE<gt> "
+msgid "B<Value:>I< currently-selected-alternative>"
 msgstr "B<Source:> E<lt>ソース名E<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:401
+#: update-alternatives.8:402
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:402
+#: update-alternatives.8:403
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:404
+#: update-alternatives.8:405
 #, no-wrap
-msgid "B<Alternative:> E<lt>path of this alternativeE<gt>"
+msgid "B<Alternative:>I< path-of-this-alternative>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 msgid "Path to this block's alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 #, fuzzy, no-wrap
-msgid "B<Priority:> E<lt>priority valueE<gt>"
+msgid "B<Priority:>I< priority-value>"
 msgstr "B<Priority:> E<lt>優先度E<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 msgid "Value of the priority of this alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 #, fuzzy, no-wrap
-msgid "B<Slaves:> E<lt>list of slavesE<gt>"
+msgid "B<Slaves:>I< list-of-slaves>"
 msgstr "B<Replaces:> E<lt>パッケージリストE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:416
+#: update-alternatives.8:417
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -15813,13 +16309,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:417
+#: update-alternatives.8:418
 #, no-wrap
 msgid "B<Example>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:426
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
@@ -15830,7 +16326,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:430
+#: update-alternatives.8:431
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -15840,7 +16336,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:446
 #, no-wrap
 msgid ""
 "Alternative: /usr/bin/vim.gtk\n"
@@ -15860,10 +16356,10 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:457
+#: update-alternatives.8:458
 #, fuzzy
 msgid ""
-"With I<--verbose> B<update-alternatives> chatters incessantly about its "
+"With B<--verbose> 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; "
@@ -15875,7 +16371,7 @@
 "めばわかるはずである。もしわからなければ、バグとして報告して欲しい。"
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:464
 #, fuzzy
 msgid ""
 "There are several packages which provide a text editor compatible with "
@@ -15889,22 +16385,26 @@
 "ンクと、関連する man ページのリンクが含まれる。"
 
 #. type: Plain text
-#: update-alternatives.8:466
+#: update-alternatives.8:467
+#, fuzzy
+#| msgid ""
+#| "To display the available packages which provide B<vi> and the current "
+#| "setting for it, use the I<--display> action:"
 msgid ""
 "To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
+"setting for it, use the B<--display> action:"
 msgstr ""
 "B<vi> を提供するパッケージとその現在の設定を表示するには、 I<--display> アク"
 "ションを使う。"
 
 #. type: Plain text
-#: update-alternatives.8:469
+#: update-alternatives.8:470
 #, fuzzy
 msgid "B<update-alternatives --display vi>"
 msgstr "update-alternatives --display vi"
 
 #. type: Plain text
-#: update-alternatives.8:473
+#: update-alternatives.8:474
 msgid ""
 "To choose a particular B<vi> implementation, use this command as root and "
 "then select a number from the list:"
@@ -15913,13 +16413,13 @@
 "数字を選ぶ。"
 
 #. type: Plain text
-#: update-alternatives.8:476
+#: update-alternatives.8:477
 #, fuzzy
 msgid "B<update-alternatives --config vi>"
 msgstr "update-alternatives --config vi"
 
 #. type: Plain text
-#: update-alternatives.8:480
+#: update-alternatives.8:481
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
@@ -15928,13 +16428,13 @@
 "する。"
 
 #. type: Plain text
-#: update-alternatives.8:483
+#: update-alternatives.8:484
 #, fuzzy
 msgid "B<update-alternatives --auto vi>"
 msgstr "update-alternatives --auto vi"
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:488
 #, fuzzy
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
@@ -15943,7 +16443,7 @@
 "が無理なら、著者に直接電子メールで送って欲しい。"
 
 #. type: Plain text
-#: update-alternatives.8:492
+#: update-alternatives.8:493
 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 "
@@ -15953,13 +16453,13 @@
 "ば、実装か文書、どちらかのバグである。レポートをお願いしたい。"
 
 #. type: Plain text
-#: update-alternatives.8:503
+#: update-alternatives.8:504
 msgid ""
 "This manual page is copyright 1997,1998 Charles Briscoe-Smith and others."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:506
+#: update-alternatives.8:507
 #, fuzzy
 msgid ""
 "This is free documentation; see the GNU General Public Licence version 2 or "
@@ -15969,11 +16469,216 @@
 "for copying conditions. There is NO warranty."
 
 #. type: Plain text
-#: update-alternatives.8:509
+#: update-alternatives.8:510
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 
 #, fuzzy
+#~ msgid "2009-02-27"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2011-04-29"
+#~ msgstr "2006-02-28"
+
+#~ msgid "2006-02-28"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2007-03-07"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2007-07-16"
+#~ msgstr "2006-06-17"
+
+#, fuzzy
+#~ msgid "2009-03-15"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2011-04-27"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2011-07-07"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-04-18"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-07-29"
+#~ msgstr "2006-02-28"
+
+#~ msgid "B<Package:> E<lt>package nameE<gt>"
+#~ msgstr "B<Package:> E<lt>パッケージ名E<gt>"
+
+#, fuzzy
+#~ msgid "2010-11-22"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| msgid "B<Source:> E<lt>source nameE<gt>"
+#~ msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
+#~ msgstr "B<Source:> E<lt>ソース名E<gt>"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-01-28"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| 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 version number, B<2.0> at the time this manual page was written.  "
+#~| "Programs which read new-format archives should be prepared for the minor "
+#~| "number to be increased and new lines to be present, and should ignore "
+#~| "these if this is the case."
+#~ msgid ""
+#~ "The first member is named B<debian-split> and contains a series of lines, "
+#~ "separated by newlines. Currently seven lines are present.  The first is "
+#~ "the format version number, B<2.1> at the time this manual page was "
+#~ "written. The second is the package name. The third is the package "
+#~ "version. The fourth is the md5sum of the package.  The fifth is the total "
+#~ "size of the package. The sixth is the maximum part size. The seventh is "
+#~ "the current part number, followed by a slash and the total amount of "
+#~ "parts (as in \\(oq1/10\\(cq)."
+#~ msgstr ""
+#~ "B<.deb> に含まれる第 1 のメンバーは B<debian-binary> という名称で、改行で"
+#~ "区切られた数行から成る。現在は一行だけであり、deb 形式バージョン番号が与え"
+#~ "られる。このマニュアルが書かれた時点では B<2.0> である。新形式のアーカイブ"
+#~ "を読み込むプログラムは、マイナーバージョン番号が上がった場合や、新しい行が"
+#~ "追加されている場合を想定しておかなければならない。もし、これに該当する場合"
+#~ "はこれらを無視すること。"
+
+#, fuzzy
+#~ msgid "2008-08-18"
+#~ msgstr "2006-02-28"
+
+#~ msgid ""
+#~ "B<dpkg> can 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> は B<dpkg-deb>(1) のフロントエンドとしても使うことができる。"
+#~ "以下のアクションは B<dpkg-deb> のアクションであり、B<dpkg> にこれらを引き"
+#~ "数として与えると、B<dpkg-deb> に同じ引き数を与えて起動する。"
+
+#~ 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>,\n"
+#~ "    B<--fsys-tarfile>.\n"
+
+#~ msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+#~ msgstr "これらのアクションについては、B<dpkg-deb>(1) にくわしい情報がある。"
+
+#, fuzzy
+#~ msgid "B<--new>, B<--old>"
+#~ msgstr "B<--new> | B<--old>"
+
+#~ msgid ""
+#~ "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
+#~ msgstr ""
+#~ "パッケージのフォーマットが新しいか古いかを指定する。これは B<dpkg-deb>(1) "
+#~ "のオプションである。"
+
+#~ 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) のオプションである。"
+
+#, fuzzy
+#~ msgid "2009-08-15"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-11-21"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2010-03-07"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-10-12"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-08-07"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2010-04-16"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-05-19"
+#~ msgstr "2006-05-10"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#, fuzzy
+#~ msgid "2009-10-01"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-06-26"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-05-10"
+#~ msgstr "2006-05-10"
+
+#, 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+..>]]]"
+#~ msgid ""
+#~ "B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--"
+#~ "version>] [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 ""
+#~ "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+..>]]]"
+
+#~ msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+#~ msgstr "B<--admindir>I< E<lt>directoryE<gt>>"
+
+#~ msgid "USAGE"
+#~ msgstr "使用方法"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#, fuzzy
 #~ msgid "2009-03-08"
 #~ msgstr "2006-04-09"
 
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/pl.add /home/vorlon/devel/multiarch/dpkg-debian/man/po/pl.add
--- dpkg/man/po/pl.add	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/pl.add	2012-06-07 10:11:09.426073000 -0700
@@ -1,8 +1,8 @@
 PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary
-.SH "TUMACZE"
+.SH "TŁUMACZE"
 Piotr Roszatycki <dexter@debian.org>, 1999
 .br
-Bartosz Feski <fenio@debian.org>, 2004-2005
+Bartosz Feński <fenio@debian.org>, 2004-2005
 .br
 Robert Luberda <robert@debian.org>, 2006-2008
 .br
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/pl.po /home/vorlon/devel/multiarch/dpkg-debian/man/po/pl.po
--- dpkg/man/po/pl.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/pl.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.15.4\n"
-"POT-Creation-Date: 2011-04-01 22:07+0300\n"
+"POT-Creation-Date: 2011-11-25 11:22+0100\n"
 "PO-Revision-Date: 2010-03-07 22:18+0100\n"
 "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -24,10 +24,18 @@
 msgstr "deb"
 
 #. type: TH
-#: deb.5:1
-#, no-wrap
-msgid "2009-02-27"
-msgstr "2009-02-27"
+#: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-version.5:5 deb-old.5:1
+#: deb-override.5:15 deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg-buildpackage.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-trigger.1:1
+#: dselect.1:1 update-alternatives.8:8
+#, fuzzy, no-wrap
+#| msgid "2007-03-07"
+msgid "2011-08-14"
+msgstr "2007-03-07"
 
 #. type: TH
 #: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-split.5:1 deb-version.5:5
@@ -98,15 +106,15 @@
 #: deb.5:6 deb-control.5:10 deb-src-control.5:10 deb-split.5:6
 #: deb-version.5:11 deb-old.5:8 deb-override.5:22 deb-extra-override.5:8
 #: deb-shlibs.5:20 deb-substvars.5:9 deb-symbols.5:9 deb-triggers.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildflags.1:9
+#: dpkg.1:19 dpkg-architecture.1:10 dpkg.cfg.5:5 dpkg-buildflags.1:9
 #: 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-deb.1:9 dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
 #: dpkg-gensymbols.1:10 dpkg-maintscript-helper.1:15 dpkg-mergechangelogs.1:9
 #: dpkg-name.1:16 dpkg-parsechangelog.1:9 dpkg-query.1:9
-#: dpkg-scanpackages.1:28 dpkg-scansources.1:14 dpkg-shlibdeps.1:11
-#: dpkg-source.1:11 dpkg-split.1:11 dpkg-statoverride.8:10 dpkg-trigger.1:12
-#: dpkg-vendor.1:9 dselect.1:17 dselect.cfg.5:5 start-stop-daemon.8:10
-#: update-alternatives.8:17
+#: dpkg-scanpackages.1:27 dpkg-scansources.1:13 dpkg-shlibdeps.1:9
+#: dpkg-source.1:10 dpkg-split.1:10 dpkg-statoverride.8:9 dpkg-trigger.1:12
+#: dpkg-vendor.1:9 dselect.1:9 dselect.cfg.5:5 start-stop-daemon.8:9
+#: update-alternatives.8:16
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "OPIS"
@@ -263,15 +271,15 @@
 "głównej (major) wersji formatu pliku deb."
 
 #. type: SH
-#: deb.5:79 deb-control.5:269 deb-src-control.5:322 deb-split.5:37
+#: deb.5:79 deb-control.5:271 deb-src-control.5:327 deb-split.5:49
 #: deb-version.5:116 deb-old.5:51 deb-override.5:62 deb-extra-override.5:37
-#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:49
-#: dpkg.1:782 dpkg-architecture.1:300 dpkg.cfg.5:23 dpkg-buildpackage.1:249
-#: dpkg-deb.1:246 dpkg-divert.8:132 dpkg-gensymbols.1:445 dpkg-name.1:95
-#: dpkg-query.1:212 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:701 dpkg-split.1:223
-#: dpkg-statoverride.8:85 dpkg-trigger.1:66 dselect.1:452 dselect.cfg.5:23
-#: update-alternatives.8:507
+#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:67
+#: dpkg.1:768 dpkg-architecture.1:299 dpkg.cfg.5:23 dpkg-buildpackage.1:249
+#: dpkg-deb.1:259 dpkg-divert.8:132 dpkg-gensymbols.1:450 dpkg-name.1:96
+#: dpkg-query.1:220 dpkg-scanpackages.1:110 dpkg-scansources.1:71
+#: dpkg-shlibdeps.1:324 dpkg-source.1:725 dpkg-split.1:217
+#: dpkg-statoverride.8:84 dpkg-trigger.1:66 dselect.1:445 dselect.cfg.5:23
+#: update-alternatives.8:508
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "ZOBACZ TAKŻE"
@@ -287,13 +295,6 @@
 msgid "deb-control"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-control.5:3 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
-#, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-07-29"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-control.5:6
 msgid "deb-control - Debian packages' master control file format"
@@ -333,9 +334,10 @@
 
 #. type: TP
 #: deb-control.5:26
-#, no-wrap
-msgid "B<Package:> E<lt>package nameE<gt>"
-msgstr "B<Package:> E<lt>nazwa pakietuE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<--package>I< package>"
+msgid "B<Package:>I< package-name>"
+msgstr "B<--package>I< pakiet>"
 
 #. type: Plain text
 #: deb-control.5:30
@@ -348,8 +350,9 @@
 
 #. type: TP
 #: deb-control.5:30
-#, no-wrap
-msgid "B<Version:> E<lt>version stringE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Version:> E<lt>version stringE<gt>"
+msgid "B<Version:>I< version-string>"
 msgstr "B<Version:> E<lt>oznaczenie wersjiE<gt>"
 
 #. type: Plain text
@@ -367,8 +370,9 @@
 
 #. type: TP
 #: deb-control.5:37
-#, no-wrap
-msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
+msgid "B<Maintainer:>I< fullname-email>"
 msgstr "B<Maintainer:> E<lt>pełna-nazwa e-mailE<gt>"
 
 #. type: Plain text
@@ -384,13 +388,16 @@
 
 #. type: TP
 #: deb-control.5:42
-#, no-wrap
-msgid "B<Description:> E<lt>short descriptionE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Description:> E<lt>short descriptionE<gt>"
+msgid "B<Description:>I< short-description>"
 msgstr "B<Description:> E<lt>krótki opisE<gt>"
 
 #. type: Plain text
 #: deb-control.5:45
-msgid "B< >E<lt>long descriptionE<gt>"
+#, fuzzy
+#| msgid "B< >E<lt>long descriptionE<gt>"
+msgid "B< >I<long-description>"
 msgstr "B< >E<lt>długi opisE<gt>"
 
 #. type: Plain text
@@ -415,9 +422,10 @@
 msgstr "POLA NIEWYMAGANE"
 
 #. type: TP
-#: deb-control.5:53 deb-src-control.5:88
-#, no-wrap
-msgid "B<Section:> E<lt>sectionE<gt>"
+#: deb-control.5:53 deb-src-control.5:90
+#, fuzzy, no-wrap
+#| msgid "B<Section:> E<lt>sectionE<gt>"
+msgid "B<Section:>I< section>"
 msgstr "B<Section:> E<lt>sekcjaE<gt>"
 
 #. type: Plain text
@@ -432,9 +440,10 @@
 "\"utils\", \"net\", \"mail\", \"text\", \"x11\" itp."
 
 #. type: TP
-#: deb-control.5:58 deb-src-control.5:94
-#, no-wrap
-msgid "B<Priority:> E<lt>priorityE<gt>"
+#: deb-control.5:58 deb-src-control.5:96
+#, fuzzy, no-wrap
+#| msgid "B<Priority:> E<lt>priorityE<gt>"
+msgid "B<Priority:>I< priority>"
 msgstr "B<Priority:> E<lt>priorytetE<gt>"
 
 #. type: Plain text
@@ -448,7 +457,7 @@
 "\"optional\" (opcjonalny), \"extra\" (dodatkowy) itp."
 
 #. type: Plain text
-#: deb-control.5:71 deb-src-control.5:107
+#: deb-control.5:71 deb-src-control.5:109
 msgid ""
 "In Debian, the B<Section> and B<Priority> fields have a defined set of "
 "accepted values based on the Policy Manual.  A list of these values can be "
@@ -459,15 +468,22 @@
 "wartości można znaleźć w najnowszej wersji pakietu B<debian-policy>."
 
 #. type: TP
-#: deb-control.5:71 deb-src-control.5:211
-#, no-wrap
-msgid "B<Essential:> E<lt>yes|noE<gt>"
+#: deb-control.5:71 deb-src-control.5:216
+#, fuzzy, no-wrap
+#| msgid "B<Essential:> E<lt>yes|noE<gt>"
+msgid "B<Essential:> B<yes>|B<no>"
 msgstr "B<Essential:> E<lt>yes|noE<gt>"
 
 #. type: Plain text
 #: deb-control.5:78
+#, fuzzy
+#| 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 "
+#| "other installation tool will not allow an B<Essential> package to be "
+#| "removed (at least not without using one of the force options)."
 msgid ""
-"This field is usually only needed when the answer is `yes'. It denotes a "
+"This field is usually only needed when the answer is B<yes>. It denotes a "
 "package that is required for proper operation of the system. Dpkg or any "
 "other installation tool will not allow an B<Essential> package to be removed "
 "(at least not without using one of the force options)."
@@ -480,8 +496,9 @@
 
 #. type: TP
 #: deb-control.5:78
-#, no-wrap
-msgid "B<Architecture:> E<lt>arch|allE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Architecture:> E<lt>arch|allE<gt>"
+msgid "B<Architecture:> I<arch>|B<all>"
 msgstr "B<Architecture:> E<lt>architektura|allE<gt>"
 
 #. type: Plain text
@@ -500,9 +517,10 @@
 "dokumentację."
 
 #. type: TP
-#: deb-control.5:86 deb-src-control.5:83
-#, no-wrap
-msgid "B<Origin:> E<lt>nameE<gt>"
+#: deb-control.5:86 deb-src-control.5:85
+#, fuzzy, no-wrap
+#| msgid "B<Origin:> E<lt>nameE<gt>"
+msgid "B<Origin:>I< name>"
 msgstr "B<Origin:> E<lt>nazwaE<gt>"
 
 #. type: Plain text
@@ -512,40 +530,49 @@
 
 #. type: TP
 #: deb-control.5:89 deb-src-control.5:66
-#, no-wrap
-msgid "B<Bugs:> E<lt>urlE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Bugs:> E<lt>urlE<gt>"
+msgid "B<Bugs:>I< url>"
 msgstr "B<Bugs:> E<lt>urlE<gt>"
 
 #. type: Plain text
-#: deb-control.5:93
+#: deb-control.5:94
+#, fuzzy
+#| msgid ""
+#| "The url of the bug tracking system for this package. The current used "
+#| "format is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://"
+#| "bugs.debian.org>."
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian.org>."
 msgstr ""
 "URL systemu zgłaszania błędów dla tego pakietu. Obecnie używanym formatem "
 "jest is B<E<lt>typ_btsE<gt>://E<lt>adres_btsE<gt>>, na przykład: B<debbugs://"
 "bugs.debian.org>."
 
 #. type: TP
-#: deb-control.5:93 deb-src-control.5:62
-#, no-wrap
-msgid "B<Homepage:> E<lt>urlE<gt>"
+#: deb-control.5:94 deb-src-control.5:62
+#, fuzzy, no-wrap
+#| msgid "B<Homepage:> E<lt>urlE<gt>"
+msgid "B<Homepage:>I< url>"
 msgstr "B<Homepage:> E<lt>urlE<gt>"
 
 #. type: Plain text
-#: deb-control.5:96 deb-src-control.5:65
-msgid "The upstream project home page URL."
+#: deb-control.5:97
+#, fuzzy
+#| msgid "The upstream project home page URL."
+msgid "The upstream project home page I<url>."
 msgstr "URL do strony domowej projektu."
 
 #. type: TP
-#: deb-control.5:96 deb-src-control.5:217
-#, no-wrap
-msgid "B<Tag:> E<lt>tag listE<gt>"
+#: deb-control.5:97 deb-src-control.5:222
+#, fuzzy, no-wrap
+#| msgid "B<Tag:> E<lt>tag listE<gt>"
+msgid "B<Tag:>I< tag-list>"
 msgstr "B<Tag:> E<lt>lista znacznikówE<gt>"
 
 #. type: Plain text
-#: deb-control.5:100
+#: deb-control.5:101
 msgid ""
 "List of tags describing the qualities of the package. The description and "
 "list of supported tags can be found in the B<debtags> package."
@@ -554,35 +581,36 @@
 "znaczników można znaleźć w pakiecie B<debtags>."
 
 #. type: TP
-#: deb-control.5:100
+#: deb-control.5:101 deb-src-control.5:219
 #, fuzzy, no-wrap
 #| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt>"
+msgid "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>"
 msgstr "B<Source:> E<lt>nazwa źródłaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:111
+#: deb-control.5:113
 msgid ""
 "This field is used to indicate how this package should behave on a multi-"
-"arch installations. The value `same' means that the package is co-"
+"arch installations. The value B<same> means that the package is co-"
 "installable with itself, but it must not be used to satisfy the dependency "
-"of any package of a different architecture from itself. The value `foreign' "
+"of any package of a different architecture from itself. The value B<foreign> "
 "means that the package is not co-installable with itself, but should be "
 "allowed to satisfy the dependency of a package of a different arch from "
-"itself. The value `allowed` allows reverse-dependencies to indicate in their "
-"Depends field that they need a package from a foreign architecture, but has "
-"no effect otherwise. This field should not be present in packages with the "
-"Architecture: all field."
+"itself. The value B<allowed> allows reverse-dependencies to indicate in "
+"their Depends field that they need a package from a foreign architecture, "
+"but has no effect otherwise. This field should not be present in packages "
+"with the B<Architecture: all> field."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:111
-#, no-wrap
-msgid "B<Source:> E<lt>source nameE<gt>"
+#: deb-control.5:113
+#, fuzzy, no-wrap
+#| msgid "B<Source:> E<lt>source nameE<gt>"
+msgid "B<Source:>I< source-name>"
 msgstr "B<Source:> E<lt>nazwa źródłaE<gt>"
 
 #. type: Plain text
-#: deb-control.5:115
+#: deb-control.5:117
 msgid ""
 "The name of the source package that this binary package came from, if "
 "different than the name of the package itself."
@@ -591,28 +619,28 @@
 "binarny, jeżeli jest różna od nazwy tego pakietu binarnego."
 
 #. type: TP
-#: deb-control.5:116 deb-src-control.5:197
+#: deb-control.5:118 deb-src-control.5:202
 #, fuzzy, no-wrap
 #| msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgid "B<Subarchitecture:> E<lt>valueE<gt>"
+msgid "B<Subarchitecture:>I< value>"
 msgstr "B<Architecture:> E<lt>architektura|allE<gt>"
 
 #. type: TP
-#: deb-control.5:119 deb-src-control.5:200
+#: deb-control.5:121 deb-src-control.5:205
 #, fuzzy, no-wrap
 #| msgid "B<Version:> E<lt>versionE<gt>"
-msgid "B<Kernel-Version:> E<lt>valueE<gt>"
+msgid "B<Kernel-Version:>I< value>"
 msgstr "B<Version:> E<lt>wersjaE<gt>"
 
 #. type: TP
-#: deb-control.5:122 deb-src-control.5:203
+#: deb-control.5:124 deb-src-control.5:208
 #, fuzzy, no-wrap
 #| msgid "B<Date:> E<lt>dateE<gt>"
-msgid "B<Installer-Menu-Item:> E<lt>valueE<gt>"
+msgid "B<Installer-Menu-Item:>I< value>"
 msgstr "B<Date:> E<lt>dataE<gt>"
 
 #. type: Plain text
-#: deb-control.5:129 deb-src-control.5:210
+#: deb-control.5:131 deb-src-control.5:215
 msgid ""
 "These fields are used by the debian-installer and are usually not needed.  "
 "See /usr/share/doc/debian-installer/devel/modules.txt from the B<debian-"
@@ -620,14 +648,15 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:130 deb-src-control.5:228
-#, no-wrap
-msgid "B<Depends:> E<lt>package listE<gt>"
+#: deb-control.5:132 deb-src-control.5:233
+#, fuzzy, no-wrap
+#| msgid "B<Depends:> E<lt>package listE<gt>"
+msgid "B<Depends:>I< package-list>"
 msgstr "B<Depends:> E<lt>lista pakietówE<gt>"
 
 # check me!
 #. type: Plain text
-#: deb-control.5:141
+#: deb-control.5:143
 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 "
@@ -648,13 +677,14 @@
 "skryptami pakietów wymienionych w polu Depends:."
 
 #. type: TP
-#: deb-control.5:141 deb-src-control.5:231
-#, no-wrap
-msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+#: deb-control.5:143 deb-src-control.5:236
+#, fuzzy, no-wrap
+#| msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+msgid "B<Pre-Depends:>I< package-list>"
 msgstr "B<Pre-Depends:> E<lt>lista pakietówE<gt>"
 
 #. type: Plain text
-#: deb-control.5:148
+#: deb-control.5:150
 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 "
@@ -666,13 +696,14 @@
 "preinstalacyjnych."
 
 #. type: TP
-#: deb-control.5:148 deb-src-control.5:234
-#, no-wrap
-msgid "B<Recommends:> E<lt>package listE<gt>"
+#: deb-control.5:150 deb-src-control.5:239
+#, fuzzy, no-wrap
+#| msgid "B<Recommends:> E<lt>package listE<gt>"
+msgid "B<Recommends:>I< package-list>"
 msgstr "B<Recommends:> E<lt>lista pakietówE<gt>"
 
 #. type: Plain text
-#: deb-control.5:155
+#: deb-control.5:157
 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 "
@@ -684,13 +715,14 @@
 "wymienionych w polu B<Recommends>."
 
 #. type: TP
-#: deb-control.5:155 deb-src-control.5:237
-#, no-wrap
-msgid "B<Suggests:> E<lt>package listE<gt>"
+#: deb-control.5:157 deb-src-control.5:242
+#, fuzzy, no-wrap
+#| msgid "B<Suggests:> E<lt>package listE<gt>"
+msgid "B<Suggests:>I< package-list>"
 msgstr "B<Suggests:> E<lt>lista pakietówE<gt>"
 
 #. type: Plain text
-#: deb-control.5:160
+#: deb-control.5:162
 msgid ""
 "Lists packages that are related to this one and can perhaps enhance its "
 "usefulness, but without which installing this package is perfectly "
@@ -700,7 +732,7 @@
 "użyteczność, ale bez których pakiet może się obejść."
 
 #. type: Plain text
-#: deb-control.5:172
+#: deb-control.5:174
 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 "
@@ -717,7 +749,7 @@
 "nawie pakietu może opcjonalnie występować numer wersji podany w nawiasach."
 
 #. type: Plain text
-#: deb-control.5:178
+#: deb-control.5:180
 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 "
@@ -733,13 +765,14 @@
 "równy."
 
 #. type: TP
-#: deb-control.5:178 deb-src-control.5:240
-#, no-wrap
-msgid "B<Breaks:> E<lt>package listE<gt>"
+#: deb-control.5:180 deb-src-control.5:245
+#, fuzzy, no-wrap
+#| msgid "B<Breaks:> E<lt>package listE<gt>"
+msgid "B<Breaks:>I< package-list>"
 msgstr "B<Breaks:> E<lt>lista pakietówE<gt>"
 
 #. type: Plain text
-#: deb-control.5:186
+#: deb-control.5:188
 msgid ""
 "Lists packages that this one breaks, for example by exposing bugs when the "
 "named packages rely on this one. The package maintenance software will not "
@@ -752,13 +785,14 @@
 "problemu jest aktualizacja pakietu wymienionego w polu B<Breaks>."
 
 #. type: TP
-#: deb-control.5:186 deb-src-control.5:249
-#, no-wrap
-msgid "B<Conflicts:> E<lt>package listE<gt>"
+#: deb-control.5:188 deb-src-control.5:254
+#, fuzzy, no-wrap
+#| msgid "B<Conflicts:> E<lt>package listE<gt>"
+msgid "B<Conflicts:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>lista pakietówE<gt>"
 
 #. type: Plain text
-#: deb-control.5:194
+#: deb-control.5:196
 msgid ""
 "Lists packages that conflict with this one, for example by containing files "
 "with the same names. The package maintenance software will not allow "
@@ -772,13 +806,14 @@
 "wskazujące na drugi pakiet."
 
 #. type: TP
-#: deb-control.5:194 deb-src-control.5:246
-#, no-wrap
-msgid "B<Replaces:> E<lt>package listE<gt>"
+#: deb-control.5:196 deb-src-control.5:251
+#, fuzzy, no-wrap
+#| msgid "B<Replaces:> E<lt>package listE<gt>"
+msgid "B<Replaces:>I< package-list>"
 msgstr "B<Replaces:> E<lt>lista pakietówE<gt>"
 
 #. type: Plain text
-#: deb-control.5:202
+#: deb-control.5:204
 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 "
@@ -791,13 +826,14 @@
 "innego pakietu, jeżeli zawiera on pliki o takich samych nazwach."
 
 #. type: TP
-#: deb-control.5:202 deb-src-control.5:252
-#, no-wrap
-msgid "B<Provides:> E<lt>package listE<gt>"
+#: deb-control.5:204 deb-src-control.5:257
+#, fuzzy, no-wrap
+#| msgid "B<Provides:> E<lt>package listE<gt>"
+msgid "B<Provides:>I< package-list>"
 msgstr "B<Provides:> E<lt>lista pakietówE<gt>"
 
 #. type: Plain text
-#: deb-control.5:212
+#: deb-control.5:214
 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 "
@@ -818,7 +854,7 @@
 "rozdzielenia listy takich pakietów."
 
 #. type: Plain text
-#: deb-control.5:231
+#: deb-control.5:233
 #, fuzzy
 #| msgid ""
 #| "The syntax of B<Conflicts>, B<Replaces> and B<Provides> is a list of "
@@ -840,14 +876,14 @@
 "wyżej."
 
 #. type: TP
-#: deb-control.5:232 deb-src-control.5:255
+#: deb-control.5:234 deb-src-control.5:260
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Built-Using:> E<lt>package listE<gt>"
+msgid "B<Built-Using:>I< package-list>"
 msgstr "B<Depends:> E<lt>lista pakietówE<gt>"
 
 #. type: Plain text
-#: deb-control.5:242
+#: deb-control.5:244
 msgid ""
 "This field lists extra source packages that were used during the build of "
 "this binary package.  This is an indication to the archive maintenance "
@@ -859,13 +895,13 @@
 msgstr ""
 
 #. type: SH
-#: deb-control.5:243 deb-src-control.5:283 start-stop-daemon.8:273
+#: deb-control.5:245 deb-src-control.5:288 start-stop-daemon.8:302
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "PRZYKŁAD"
 
 #. type: Plain text
-#: deb-control.5:266
+#: deb-control.5:268
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -911,7 +947,7 @@
 " will run more slowly, however).\n"
 
 #. type: Plain text
-#: deb-control.5:274
+#: deb-control.5:276
 msgid ""
 "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr ""
@@ -924,13 +960,6 @@
 msgid "deb-src-control"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-src-control.5:3
-#, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-11-22"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-src-control.5:6
 #, fuzzy
@@ -952,8 +981,7 @@
 "one space. The content of the multi-line fields is generally joined to a "
 "single line by the tools (except in the case of the B<Description> field, "
 "see below). To insert empty lines into a multi-line field, insert a dot "
-"after the space. The paragraphs are separated by an empty line. Lines "
-"starting with a B<'#'> are treated as comments."
+"after the space. Lines starting with a B<'#'> are treated as comments."
 msgstr ""
 
 #. type: SH
@@ -967,7 +995,7 @@
 #: deb-src-control.5:30
 #, fuzzy, no-wrap
 #| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Source:> E<lt>source package nameE<gt> (required)"
+msgid "B<Source:> I<source-package-name> (required)"
 msgstr "B<Source:> E<lt>nazwa źródłaE<gt>"
 
 #. type: Plain text
@@ -984,7 +1012,7 @@
 #: deb-src-control.5:38
 #, fuzzy, no-wrap
 #| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgid "B<Maintainer:> E<lt>fullname emailE<gt> (required)"
+msgid "B<Maintainer:> I<fullname-email> (required)"
 msgstr "B<Maintainer:> E<lt>pełna-nazwa e-mailE<gt>"
 
 #. type: Plain text
@@ -1007,7 +1035,7 @@
 #: deb-src-control.5:44
 #, fuzzy, no-wrap
 #| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgid "B<Uploaders:> E<lt>fullname emailE<gt>"
+msgid "B<Uploaders:>I< fullname-email>"
 msgstr "B<Maintainer:> E<lt>pełna-nazwa e-mailE<gt>"
 
 #. type: Plain text
@@ -1022,7 +1050,7 @@
 #: deb-src-control.5:50
 #, fuzzy, no-wrap
 #| msgid "B<Version:> E<lt>version stringE<gt>"
-msgid "B<Standards-Version:> E<lt>version stringE<gt>"
+msgid "B<Standards-Version:>I< version-string>"
 msgstr "B<Version:> E<lt>oznaczenie wersjiE<gt>"
 
 #. type: Plain text
@@ -1037,7 +1065,7 @@
 #: deb-src-control.5:57
 #, fuzzy, no-wrap
 #| msgid "B<Essential:> E<lt>yes|noE<gt>"
-msgid "B<DM-Upload-Allowed:> E<lt>yes|noE<gt>"
+msgid "B<DM-Upload-Allowed:> B<yes>|B<no>"
 msgstr "B<Essential:> E<lt>yes|noE<gt>"
 
 #. type: Plain text
@@ -1049,6 +1077,11 @@
 msgstr ""
 
 #. type: Plain text
+#: deb-src-control.5:65
+msgid "The upstream project home page URL."
+msgstr "URL do strony domowej projektu."
+
+#. type: Plain text
 #: deb-src-control.5:71
 #, fuzzy
 #| msgid ""
@@ -1056,9 +1089,9 @@
 #| "format is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://"
 #| "bugs.debian.org>."
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>. This field is usually not needed."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian."
+"org>. This field is usually not needed."
 msgstr ""
 "URL systemu zgłaszania błędów dla tego pakietu. Obecnie używanym formatem "
 "jest is B<E<lt>typ_btsE<gt>://E<lt>adres_btsE<gt>>, na przykład: B<debbugs://"
@@ -1068,33 +1101,34 @@
 #: deb-src-control.5:72
 #, fuzzy, no-wrap
 #| msgid "B<Bugs:> E<lt>urlE<gt>"
-msgid "B<Vcs-*:> E<lt>urlE<gt>"
+msgid "B<Vcs-*:>I< url>"
 msgstr "B<Bugs:> E<lt>urlE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:78
+#: deb-src-control.5:79
 msgid ""
-"The url of the Version Control System repository used to maintain this "
-"package.  Currently supported are Arch, Bzr (Bazaar), Cvs, Darcs, Git, Hg "
-"(Mercurial), Mtn (Monotone) and Svn (Subversion). Usually this field points "
-"to the latest version of the package, such as the main branch or the trunk."
+"The I<url> of the Version Control System repository used to maintain this "
+"package. Currently supported are B<Arch>, B<Bzr> (Bazaar), B<Cvs>, B<Darcs>, "
+"B<Git>, B<Hg> (Mercurial), B<Mtn> (Monotone) and B<Svn> (Subversion). "
+"Usually this field points to the latest version of the package, such as the "
+"main branch or the trunk."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:79
+#: deb-src-control.5:80
 #, fuzzy, no-wrap
 #| msgid "B<Bugs:> E<lt>urlE<gt>"
-msgid "B<Vcs-Browser:> E<lt>urlE<gt>"
+msgid "B<Vcs-Browser:>I< url>"
 msgstr "B<Bugs:> E<lt>urlE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:82
+#: deb-src-control.5:84
 msgid ""
-"The url of a webinterface to browse the Version Control System repository."
+"The I<url> of a webinterface to browse the Version Control System repository."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:87
+#: deb-src-control.5:89
 #, fuzzy
 #| msgid "The name of the distribution this package is originating from."
 msgid ""
@@ -1103,7 +1137,7 @@
 msgstr "Nazwa dystrybucji, z której pochodzi pakiet."
 
 #. type: Plain text
-#: deb-src-control.5:93
+#: deb-src-control.5:95
 #, fuzzy
 #| msgid ""
 #| "This is a general field that gives the package a category based on the "
@@ -1119,7 +1153,7 @@
 "\"utils\", \"net\", \"mail\", \"text\", \"x11\" itp."
 
 #. type: Plain text
-#: deb-src-control.5:98
+#: deb-src-control.5:100
 #, fuzzy
 #| msgid ""
 #| "Sets the importance of this package in relation to the system as a "
@@ -1135,15 +1169,15 @@
 "\"optional\" (opcjonalny), \"extra\" (dodatkowy) itp."
 
 #. type: TP
-#: deb-src-control.5:108
+#: deb-src-control.5:110
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Build-Depends:> E<lt>package listE<gt>"
+msgid "B<Build-Depends:>I< package-list>"
 msgstr "B<Depends:> E<lt>lista pakietówE<gt>"
 
 #
 #. type: Plain text
-#: deb-src-control.5:112
+#: deb-src-control.5:114
 #, fuzzy
 #| msgid ""
 #| "In the list of packages, the text indicating the current state of the "
@@ -1155,50 +1189,50 @@
 "W liście pakietów - tekst oznaczający obecny stan podświetlonego pakietu."
 
 #. type: TP
-#: deb-src-control.5:113
+#: deb-src-control.5:115
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Build-Depends-Indep:> E<lt>package listE<gt>"
+msgid "B<Build-Depends-Indep:>I< package-list>"
 msgstr "B<Depends:> E<lt>lista pakietówE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:118
+#: deb-src-control.5:120
 msgid ""
-"Same as Build-Depends, but they are only needed when building the "
-"architecture independent packages. The Build-Depends are also installed in "
-"this case."
+"Same as B<Build-Depends>, but they are only needed when building the "
+"architecture independent packages. The B<Build-Depends> are also installed "
+"in this case."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:119
+#: deb-src-control.5:121
 #, fuzzy, no-wrap
 #| msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgid "B<Build-Conflicts:> E<lt>package listE<gt>"
+msgid "B<Build-Conflicts:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>lista pakietówE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:123
+#: deb-src-control.5:125
 msgid ""
 "A list of packages that should not be installed when the package is build, "
 "for example because they interfere with the used build system."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:124
+#: deb-src-control.5:126
 #, fuzzy, no-wrap
 #| msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgid "B<Build-Conflicts-Indep:> E<lt>package listE<gt>"
+msgid "B<Build-Conflicts-Indep:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>lista pakietówE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:128
+#: deb-src-control.5:130
 msgid ""
-"Same as Build-Conflicts, but only when building the architecture independent "
-"packages."
+"Same as B<Build-Conflicts>, but only when building the architecture "
+"independent packages."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:139
+#: deb-src-control.5:141
 #, fuzzy
 #| msgid ""
 #| "The syntax of B<Depends>, B<Pre-Depends>, B<Recommends> and B<Suggests> "
@@ -1224,7 +1258,7 @@
 "nawie pakietu może opcjonalnie występować numer wersji podany w nawiasach."
 
 #. type: Plain text
-#: deb-src-control.5:148
+#: deb-src-control.5:150
 msgid ""
 "The syntax of the B<Build-Conflicts> and B<Build-Conflicts-Indep> fields is "
 "a list of comma-separated package names, where the comma is read as an \"AND"
@@ -1234,7 +1268,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:154
+#: deb-src-control.5:156
 #, fuzzy
 #| msgid ""
 #| "A version number may start with a `E<gt>E<gt>', in which case any later "
@@ -1258,7 +1292,7 @@
 "równy."
 
 #. type: Plain text
-#: deb-src-control.5:158
+#: deb-src-control.5:160
 msgid ""
 "A architecture specification consists of one or more architecture names, "
 "separated by whitespace. Exclamation marks may be prepended to each of the "
@@ -1266,7 +1300,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:163
+#: deb-src-control.5:165
 msgid ""
 "Note that dependencies on packages in the B<build-essential> set can be "
 "omitted and that declaring build conflicts against them is impossible. A "
@@ -1274,59 +1308,61 @@
 msgstr ""
 
 #. type: SH
-#: deb-src-control.5:165
+#: deb-src-control.5:167
 #, fuzzy, no-wrap
 #| msgid "OPTIONAL FIELDS"
 msgid "BINARY FIELDS"
 msgstr "POLA NIEWYMAGANE"
 
 #. type: Plain text
-#: deb-src-control.5:174
+#: deb-src-control.5:176
 msgid ""
 "Note that the B<Priority>, B<Section> and B<Homepage> fields can also be in "
 "a binary paragraph to override the global value from the source package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:175
+#: deb-src-control.5:177
 #, fuzzy, no-wrap
 #| msgid "B<Package:> E<lt>package nameE<gt>"
-msgid "B<Package:> E<lt>binary package nameE<gt> (required)"
+msgid "B<Package:> I<binary-package-name> (required)"
 msgstr "B<Package:> E<lt>nazwa pakietuE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:179
+#: deb-src-control.5:181
 msgid ""
 "This field is used to name the binary package name. The same restrictions as "
 "to a source package name apply."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:180
+#: deb-src-control.5:182
 #, fuzzy, no-wrap
 #| msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgid "B<Architecture:> E<lt>arch|all|anyE<gt> (required)"
+msgid "B<Architecture:> I<arch>|B<all>|B<any> (required)"
 msgstr "B<Architecture:> E<lt>architektura|allE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:190
+#: deb-src-control.5:195
 msgid ""
 "The architecture specifies on which type of hardware this package runs. For "
 "packages that run on all architectures, use the B<any> value. For packages "
 "that are architecture independent, such as shell and Perl scripts or "
 "documentation, use the B<all> value. To restrict the packages to a certain "
-"set of architectures, specify the architecture names, separated by a space."
+"set of architectures, specify the architecture names, separated by a space. "
+"It's also possible to put architecture wildcards in that list (see B<dpkg-"
+"architecture>(1)  for more information about them)."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:191
+#: deb-src-control.5:196
 #, fuzzy, no-wrap
 #| msgid "B<Package:> E<lt>package nameE<gt>"
-msgid "B<Package-Type:> E<lt>deb|udebE<gt>"
+msgid "B<Package-Type:> B<deb>|B<udeb>"
 msgstr "B<Package:> E<lt>nazwa pakietuE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:196
+#: deb-src-control.5:201
 msgid ""
 "This field defines the type of the package. \"udeb\" is for size-constrained "
 "packages used by the debian installer. \"deb\" is the default value, it's "
@@ -1334,49 +1370,42 @@
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:214
-#, fuzzy, no-wrap
-#| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
-msgstr "B<Source:> E<lt>nazwa źródłaE<gt>"
-
-#. type: TP
-#: deb-src-control.5:220
+#: deb-src-control.5:225
 #, fuzzy, no-wrap
 #| msgid "B<Description:> E<lt>short descriptionE<gt>"
-msgid "B<Description:> E<lt>short descriptionE<gt> (required)"
+msgid "B<Description:> I<short-description> (required)"
 msgstr "B<Description:> E<lt>krótki opisE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:227
+#: deb-src-control.5:232
 msgid ""
 "These fields are described in the B<deb-control>(5)  manual page, as they "
 "are copied literally to the control file of the binary package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:243
+#: deb-src-control.5:248
 #, fuzzy, no-wrap
 #| msgid "B<Replaces:> E<lt>package listE<gt>"
-msgid "B<Enhances:> E<lt>package listE<gt>"
+msgid "B<Enhances:>I< package-list>"
 msgstr "B<Replaces:> E<lt>lista pakietówE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:265
+#: deb-src-control.5:270
 msgid ""
 "These fields declare relationships between packages. They are discussed in "
 "the B<deb-control>(5)  manpage and in the B<debian-policy> package."
 msgstr ""
 
 #. type: SH
-#: deb-src-control.5:266
+#: deb-src-control.5:271
 #, fuzzy, no-wrap
 #| msgid "REQUIRED FIELDS"
 msgid "USER-DEFINED FIELDS"
 msgstr "POLA WYMAGANE"
 
 #. type: Plain text
-#: deb-src-control.5:281
+#: deb-src-control.5:286
 msgid ""
 "It is allowed to add additional user-defined fields to the control file. The "
 "tools will ignore these fields. If you want the fields to be copied over to "
@@ -1393,7 +1422,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:299
+#: deb-src-control.5:304
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -1408,11 +1437,11 @@
 "Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
-" libselinux1-dev (E<gt>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]\n"
+" libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:318
+#: deb-src-control.5:323
 #, no-wrap
 msgid ""
 "Package: dpkg-dev\n"
@@ -1421,8 +1450,8 @@
 "Architecture: all\n"
 "# this is a custom field in the binary package\n"
 "XB-Mentoring-Contact: Raphael Hertzog E<lt>hertzog@debian.orgE<gt>\n"
-"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2), bzip2, lzma,\n"
-" patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
+"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2),\n"
+" bzip2, lzma, patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
 "Recommends: gcc | c-compiler, build-essential\n"
 "Suggests: gnupg, debian-keyring\n"
 "Conflicts: dpkg-cross (E<lt>E<lt> 2.0.0), devscripts (E<lt>E<lt> 2.10.26)\n"
@@ -1436,7 +1465,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:325
+#: deb-src-control.5:330
 #, fuzzy
 #| msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
 msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
@@ -1450,11 +1479,12 @@
 msgstr "deb-shlibs"
 
 #. type: TH
-#: deb-split.5:1
+#: deb-split.5:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 dpkg-vendor.1:1 start-stop-daemon.8:1
 #, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-01-28"
-msgstr "2006-02-28"
+#| msgid "2007-03-07"
+msgid "2011-07-04"
+msgstr "2007-03-07"
 
 #. type: Plain text
 #: deb-split.5:4
@@ -1485,41 +1515,87 @@
 "Nazwy plików mogą zawierać kończący znak ukośnika."
 
 #. type: Plain text
-#: deb-split.5:21
-#, fuzzy
-#| 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 version number, B<2.0> at the time this manual page was written.  "
-#| "Programs which read new-format archives should be prepared for the minor "
-#| "number to be increased and new lines to be present, and should ignore "
-#| "these if this is the case."
+#: deb-split.5:15
 msgid ""
 "The first member is named B<debian-split> and contains a series of lines, "
-"separated by newlines. Currently seven lines are present.  The first is the "
-"format version number, B<2.1> at the time this manual page was written. The "
-"second is the package name. The third is the package version. The fourth is "
-"the md5sum of the package.  The fifth is the total size of the package. The "
-"sixth is the maximum part size. The seventh is the current part number, "
-"followed by a slash and the total amount of parts (as in \\(oq1/10\\(cq)."
+"separated by newlines. Currently eight lines are present:"
 msgstr ""
-"Pierwszy składnik nazywa się B<debian-binary> i zawiera serię linii "
-"rozdzielonych znakami nowej linii. Obecnie plik ten zawiera tylko jedną "
-"linię - numer wersji formatu, który - w czasie pisania tej strony "
-"podręcznika - wynosił B<2.0>. Programy obsługujące archiwa w nowym formacie "
-"powinny być gotowe na obsłużenie zmiany liczby pobocznej (po kropce) oraz na "
-"obecność nowych linii, które powinny ignorować."
 
-# type: Plain text
+#. type: IP
+#: deb-split.5:15 deb-split.5:18 deb-split.5:20 deb-split.5:22 deb-split.5:24
+#: deb-split.5:26 deb-split.5:28 deb-split.5:31 dpkg-gensymbols.1:20
+#: dpkg-gensymbols.1:22 dpkg-gensymbols.1:24 dpkg-gensymbols.1:26
+#: dpkg-gensymbols.1:311 dpkg-gensymbols.1:317 dpkg-gensymbols.1:351
+#: dpkg-gensymbols.1:355 dpkg-gensymbols.1:358
+#, no-wrap
+msgid "\\(bu"
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:18
+msgid ""
+"The format version number, B<2.1> at the time this manual page was written."
+msgstr ""
+
+#
+#. type: Plain text
+#: deb-split.5:20
+#, fuzzy
+#| msgid "The source package version."
+msgid "The package name."
+msgstr "Wersja pakietu źródłowego"
+
+#
+#. type: Plain text
+#: deb-split.5:22
+#, fuzzy
+#| msgid "The source package version."
+msgid "The package version."
+msgstr "Wersja pakietu źródłowego"
+
+#
 #. type: Plain text
 #: deb-split.5:24
+#, fuzzy
+#| msgid "The source package version."
+msgid "The md5sum of the package."
+msgstr "Wersja pakietu źródłowego"
+
+#
+#. type: Plain text
+#: deb-split.5:26
+#, fuzzy
+#| msgid "The header line above the list of packages."
+msgid "The total size of the package."
+msgstr "Linia nagłówka nad listą pakietów."
+
+#. type: Plain text
+#: deb-split.5:28
+msgid "The maximum part size."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:31
+msgid ""
+"The current part number, followed by a slash and the total amount of parts "
+"(as in \\(oq1/10\\(cq)."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:33
+msgid "The package architecture (since dpkg 1.16.1)."
+msgstr ""
+
+# type: Plain text
+#. type: Plain text
+#: deb-split.5:36
 msgid ""
 "Programs which read multi-part archives should be prepared for additional "
 "lines to be present, and should ignore these if this is the case."
 msgstr ""
 
 #. type: Plain text
-#: deb-split.5:29
+#: deb-split.5:41
 #, fuzzy
 #| msgid ""
 #| "If the major number has changed, an incompatible change has been made and "
@@ -1539,20 +1615,20 @@
 "(chyba, że występuje on na końcu), tak jak to opisano poniżej."
 
 #. type: Plain text
-#: deb-split.5:32
+#: deb-split.5:44
 #, fuzzy
 #| msgid ""
 #| "The third, last required member is named B<data.tar.gz>.  It contains the "
 #| "filesystem archive as a gzipped tar archive."
 msgid ""
-"The second, last required member is named B<data.>N, where N denotes the "
-"part number. It contains the raw part data."
+"The second, last required member is named B<data.>I<N>, where I<N> denotes "
+"the part number. It contains the raw part data."
 msgstr ""
 "Trzeci, ostatni wymagany, członek nazywa się B<data.tar.gz>. Zawiera "
 "archiwum systemu plików w postaci spakowanego gzipem archiwum tar."
 
 #. type: Plain text
-#: deb-split.5:37
+#: deb-split.5:49
 #, fuzzy
 #| msgid ""
 #| "These members must occur in this exact order. Current implementations "
@@ -1563,7 +1639,7 @@
 #| "have names starting with an underscore, `B<_>'."
 msgid ""
 "These members must occur in this exact order. Current implementations should "
-"ignore any additional members after B<data.>N.  Further members may be "
+"ignore any additional members after B<data.>I<N>.  Further members may be "
 "defined in the future, and (if possible) will be placed after these two."
 msgstr ""
 "Składniki te muszą występować w tym powyższym porządku. Implementacje "
@@ -1576,7 +1652,7 @@
 
 #
 #. type: Plain text
-#: deb-split.5:39
+#: deb-split.5:51
 #, fuzzy
 #| msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgid "B<deb>(5), B<dpkg-split>(1)."
@@ -1588,13 +1664,6 @@
 msgid "deb-version"
 msgstr "deb-version"
 
-#. type: TH
-#: deb-version.5:5 dpkg-distaddfile.1:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-name.1:6
-#, no-wrap
-msgid "2008-08-18"
-msgstr "2008-08-18"
-
 #. type: Plain text
 #: deb-version.5:8
 msgid "deb-version - Debian package version number format"
@@ -1602,7 +1671,9 @@
 
 #. type: Plain text
 #: deb-version.5:11
-msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+#, fuzzy
+#| msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgid "[I<epoch>B<:>]I<upstream-version>[B<->I<debian-revision>]"
 msgstr "[ I<epoka>:] I<wersja_upstream> [-I<rewizja_debiana> ]"
 
 #. type: Plain text
@@ -1622,9 +1693,14 @@
 
 #. type: Plain text
 #: deb-version.5:20
+#, fuzzy
+#| msgid ""
+#| "This is a single (generally small) unsigned integer.  It may be omitted, "
+#| "in which case zero is assumed.  If it is omitted then the "
+#| "I<upstream_version> may not contain any colons."
 msgid ""
 "This is a single (generally small) unsigned integer.  It may be omitted, in "
-"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"which case zero is assumed.  If it is omitted then the I<upstream-version> "
 "may not contain any colons."
 msgstr ""
 "Jest to pojedyncza (typowo niewielka), liczba całkowita bez znaku. Może być "
@@ -1644,8 +1720,9 @@
 
 #. type: TP
 #: deb-version.5:24
-#, no-wrap
-msgid "I<upstream_version>"
+#, fuzzy, no-wrap
+#| msgid "I<upstream_version>"
+msgid "I<upstream-version>"
 msgstr "I<wersja_upstream> (wersja nadana przez autora)"
 
 #. type: Plain text
@@ -1667,9 +1744,14 @@
 
 #. type: Plain text
 #: deb-version.5:39
+#, fuzzy
+#| msgid ""
+#| "The comparison behavior of the package management system with respect to "
+#| "the I<upstream_version> is described below.  The I<upstream_version> "
+#| "portion of the version number is mandatory."
 msgid ""
 "The comparison behavior of the package management system with respect to the "
-"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"I<upstream-version> is described below. The I<upstream-version> portion of "
 "the version number is mandatory."
 msgstr ""
 "Poniżej opisane jest zachowanie systemu zarządzania pakietami podczas "
@@ -1678,10 +1760,17 @@
 
 #. type: Plain text
 #: deb-version.5:48
+#, fuzzy
+#| msgid ""
+#| "The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") "
+#| "and the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, "
+#| "colon, tilde) and should start with a digit.  If there is no "
+#| "I<debian_revision> then hyphens are not allowed; if there is no I<epoch> "
+#| "then colons are not allowed."
 msgid ""
-"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"The I<upstream-version> may contain only alphanumerics (\"A-Za-z0-9\") and "
 "the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
-"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"tilde) and should start with a digit.  If there is no I<debian-revision> "
 "then hyphens are not allowed; if there is no I<epoch> then colons are not "
 "allowed."
 msgstr ""
@@ -1693,17 +1782,24 @@
 
 #. type: TP
 #: deb-version.5:48
-#, no-wrap
-msgid "I<debian_revision>"
+#, fuzzy, no-wrap
+#| msgid "I<debian_revision>"
+msgid "I<debian-revision>"
 msgstr "I<rewizja_debiana>"
 
 #. type: Plain text
 #: deb-version.5:57
+#, fuzzy
+#| msgid ""
+#| "This part of the version number specifies the version of the Debian "
+#| "package based on the upstream version.  It may contain only alphanumerics "
+#| "and the characters B<+> B<.> B<~> (plus, full stop, tilde) and is "
+#| "compared in the same way as the I<upstream_version> is."
 msgid ""
 "This part of the version number specifies the version of the Debian package "
 "based on the upstream version.  It may contain only alphanumerics and the "
 "characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
-"same way as the I<upstream_version> is."
+"same way as the I<upstream-version> is."
 msgstr ""
 "Ta część numeru wersji określa wersję pakietu Debiana bazującego na tej "
 "samej wersji upstream. Może zawierać jedynie znaki alfanumeryczne oraz znaki "
@@ -1712,8 +1808,15 @@
 
 #. type: Plain text
 #: deb-version.5:64
+#, fuzzy
+#| msgid ""
+#| "It is optional; if it isn't present then the I<upstream_version> may not "
+#| "contain a hyphen.  This format represents the case where a piece of "
+#| "software was written specifically to be turned into a Debian package, and "
+#| "so there is only one \"debianisation\" of it and therefore no revision "
+#| "indication is required."
 msgid ""
-"It is optional; if it isn't present then the I<upstream_version> may not "
+"It is optional; if it isn't present then the I<upstream-version> may not "
 "contain a hyphen.  This format represents the case where a piece of software "
 "was written specifically to be turned into a Debian package, and so there is "
 "only one \"debianisation\" of it and therefore no revision indication is "
@@ -1727,20 +1830,31 @@
 
 #. type: Plain text
 #: deb-version.5:68
+#, fuzzy
+#| msgid ""
+#| "It is conventional to restart the I<debian_revision> at '1' each time "
+#| "time the I<upstream_version> is increased."
 msgid ""
-"It is conventional to restart the I<debian_revision> at '1' each time time "
-"the I<upstream_version> is increased."
+"It is conventional to restart the I<debian-revision> at '1' each time time "
+"the I<upstream-version> is increased."
 msgstr ""
 "Powszechnie przyjęte jest rozpoczynanie I<rewizji_debiana> od 1 za każdym "
 "razem, gdy I<wersja_upstream> się zwiększa."
 
 #. type: Plain text
 #: deb-version.5:76
+#, fuzzy
+#| msgid ""
+#| "Dpkg will break the version number apart at the last hyphen in the string "
+#| "(if there is one) to determine the I<upstream_version> and "
+#| "I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
+#| "than the presence of one (but note that the I<debian_revision> is the "
+#| "least significant part of the version number)."
 msgid ""
 "Dpkg will break the version number apart at the last hyphen in the string "
-"(if there is one) to determine the I<upstream_version> and "
-"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
-"than the presence of one (but note that the I<debian_revision> is the least "
+"(if there is one) to determine the I<upstream-version> and I<debian-"
+"revision>. The absence of a I<debian-revision> compares earlier than the "
+"presence of one (but note that the I<debian-revision> is the least "
 "significant part of the version number)."
 msgstr ""
 "Dpkg dzieli numer wersji na części względem ostatniego myślnika w napisie "
@@ -1757,8 +1871,12 @@
 
 #. type: Plain text
 #: deb-version.5:80
+#, fuzzy
+#| msgid ""
+#| "The I<upstream_version> and I<debian_revision> parts are compared by the "
+#| "package management system using the same algorithm:"
 msgid ""
-"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"The I<upstream-version> and I<debian-revision> parts are compared by the "
 "package management system using the same algorithm:"
 msgstr ""
 "System zarządzania pakietami porównuje I<wersję_upstream> oraz "
@@ -1854,11 +1972,11 @@
 msgstr "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
 
 #. type: SH
-#: deb-version.5:120 dpkg.1:797 dpkg-buildpackage.1:256 dpkg-distaddfile.1:47
-#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
+#: deb-version.5:120 dpkg.1:783 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:460
 #: dpkg-maintscript-helper.1:128 dpkg-parsechangelog.1:123
-#: dpkg-shlibdeps.1:331 dpkg-source.1:706 dselect.1:458
-#: start-stop-daemon.8:294 update-alternatives.8:493
+#: dpkg-shlibdeps.1:329 dpkg-source.1:730 dselect.1:451
+#: start-stop-daemon.8:323 update-alternatives.8:494
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTORZY"
@@ -1869,18 +1987,18 @@
 msgstr "Copyright \\(co 1996,1997,1998 Ian Jackson i Christian Schwarz"
 
 #. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:262
+#: deb-version.5:124 dpkg-buildpackage.1:263
 msgid "Copyright \\(co 2007 Frank Lichtenheld"
 msgstr "Copyright \\(co 2007 Frank Lichtenheld"
 
 #. type: Plain text
-#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:125
-#: dpkg-buildpackage.1:266 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
-#: dpkg-deb.1:256 dpkg-divert.8:139 dpkg-genchanges.1:154
-#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-maintscript-helper.1:139
-#: dpkg-mergechangelogs.1:71 dpkg-name.1:107 dpkg-parsechangelog.1:131
-#: dpkg-query.1:211 dpkg-shlibdeps.1:341 dpkg-source.1:714 dpkg-split.1:233
-#: dpkg-statoverride.8:92 dpkg-vendor.1:53 update-alternatives.8:500
+#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:273
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:269 dpkg-divert.8:139 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:464 dpkg-maintscript-helper.1:139
+#: dpkg-mergechangelogs.1:71 dpkg-name.1:108 dpkg-parsechangelog.1:131
+#: dpkg-query.1:219 dpkg-shlibdeps.1:339 dpkg-source.1:738 dpkg-split.1:227
+#: dpkg-statoverride.8:91 dpkg-vendor.1:53 update-alternatives.8:501
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO WARRANTY."
@@ -1895,12 +2013,6 @@
 msgid "deb-old"
 msgstr "deb-old"
 
-#. type: TH
-#: deb-old.5:1
-#, no-wrap
-msgid "2006-02-28"
-msgstr "2006-02-28"
-
 #
 #. type: Plain text
 #: deb-old.5:4
@@ -1999,12 +2111,6 @@
 msgstr "deb-override"
 
 #. type: TH
-#: deb-override.5:15
-#, no-wrap
-msgid "2007-03-07"
-msgstr "2007-03-07"
-
-#. type: TH
 #: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
 #: deb-symbols.5:2 deb-triggers.5:1 dpkg-architecture.1:1
 #: dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1
@@ -2216,7 +2322,7 @@
 #: deb-shlibs.5:34
 #, fuzzy
 #| msgid "[I<tag:>] I<library> I<version> I<dependencies>"
-msgid "[I<type:>] I<library> I<version> I<dependencies>"
+msgid "[I<type>B<:>] I<library> I<version> I<dependencies>"
 msgstr "[I<tag:>] I<biblioteka> I<wersja> I<zależności>"
 
 #. type: Plain text
@@ -2241,8 +2347,8 @@
 msgstr "Dalsze szczegóły można znaleźć w Zasadach polityki Debiana."
 
 #. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:728 dpkg-architecture.1:263
-#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:458
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:714 dpkg-architecture.1:262
+#: dpkg-divert.8:91 dpkg-name.1:65 update-alternatives.8:459
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "PRZYKŁADY"
@@ -2612,11 +2718,11 @@
 "ostrzeżenie i przyjmowana jest pusta wartość zmiennej."
 
 #. type: SH
-#: deb-substvars.5:145 dpkg.1:641 dpkg-architecture.1:285 dpkg.cfg.5:12
-#: dpkg-buildflags.1:103 dpkg-distaddfile.1:39 dpkg-divert.8:122
+#: deb-substvars.5:145 dpkg.1:627 dpkg-architecture.1:284 dpkg.cfg.5:12
+#: dpkg-buildflags.1:121 dpkg-distaddfile.1:39 dpkg-divert.8:122
 #: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
-#: dpkg-split.1:212 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:361
+#: dpkg-split.1:206 dpkg-statoverride.8:74 dselect.cfg.5:12
+#: update-alternatives.8:360
 #, no-wrap
 msgid "FILES"
 msgstr "PLIKI"
@@ -2633,15 +2739,15 @@
 msgstr "Lista zmiennych podstawiania i ich wartości."
 
 #. type: SH
-#: deb-substvars.5:150 dpkg.1:794 dpkg-buildpackage.1:244 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:698 dpkg-split.1:197 dselect.1:436
-#: update-alternatives.8:485
+#: deb-substvars.5:150 dpkg.1:780 dpkg-buildpackage.1:244 dpkg-deb.1:238
+#: dpkg-name.1:86 dpkg-source.1:722 dpkg-split.1:199 dselect.1:429
+#: update-alternatives.8:486
 #, no-wrap
 msgid "BUGS"
 msgstr "BŁĘDY"
 
 #. type: Plain text
-#: deb-substvars.5:153 dpkg-source.1:701
+#: deb-substvars.5:153 dpkg-source.1:725
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -2660,27 +2766,27 @@
 "(1), B<dpkg-source>(1)."
 
 #. type: SH
-#: deb-substvars.5:161 dpkg-architecture.1:304 dpkg.cfg.5:19
-#: dpkg-buildflags.1:120 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
-#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:103
-#: dpkg-query.1:206 dpkg-scansources.1:77 dpkg-split.1:229
-#: dpkg-statoverride.8:88 dpkg-vendor.1:48 dselect.cfg.5:19
+#: deb-substvars.5:161 dpkg-architecture.1:303 dpkg.cfg.5:19
+#: dpkg-buildflags.1:266 dpkg-checkbuilddeps.1:40 dpkg-deb.1:265
+#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:104
+#: dpkg-query.1:214 dpkg-scansources.1:76 dpkg-split.1:223
+#: dpkg-statoverride.8:87 dpkg-vendor.1:48 dselect.cfg.5:19
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: deb-substvars.5:163 dpkg-buildpackage.1:258 dpkg-distaddfile.1:49
-#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:708
-#: dpkg-split.1:231
+#: deb-substvars.5:163 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
+#: dpkg-deb.1:267 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:331 dpkg-source.1:732
+#: dpkg-split.1:225
 msgid "Copyright \\(co 1995-1996 Ian Jackson"
 msgstr "Copyright \\(co 1995-1996 Ian Jackson"
 
 #. type: Plain text
-#: deb-substvars.5:165 dpkg-buildpackage.1:260 dpkg-distaddfile.1:51
+#: deb-substvars.5:165 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
 #: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
-#: dpkg-shlibdeps.1:335 dpkg-source.1:710 dpkg-statoverride.8:90
+#: dpkg-shlibdeps.1:333 dpkg-source.1:734 dpkg-statoverride.8:89
 msgid "Copyright \\(co 2000 Wichert Akkerman"
 msgstr "Copyright \\(co 2000 Wichert Akkerman"
 
@@ -2690,12 +2796,6 @@
 msgid "deb-symbols"
 msgstr "deb-symbols"
 
-#. type: TH
-#: deb-symbols.5:2
-#, no-wrap
-msgid "2007-07-16"
-msgstr "2007-07-16"
-
 #. type: Plain text
 #: deb-symbols.5:5
 msgid "deb-symbols - Debian's extended shared library information file"
@@ -2719,12 +2819,16 @@
 
 #. type: Plain text
 #: deb-symbols.5:14
-msgid "E<lt>library sonameE<gt> E<lt>main dependency templateE<gt>"
+#, fuzzy
+#| msgid "E<lt>library sonameE<gt> E<lt>main dependency templateE<gt>"
+msgid "I<library-soname main-dependency-template>"
 msgstr "E<lt>soname bibliotekiE<gt> E<lt>szablon głównych zależnościE<gt>"
 
 #. type: Plain text
 #: deb-symbols.5:16
-msgid "[ | E<lt>alternative dependency templateE<gt> ]"
+#, fuzzy
+#| msgid "[ | E<lt>alternative dependency templateE<gt> ]"
+msgid "[ | I<alternative-dependency-template> ]"
 msgstr "[ | E<lt>alternatywny szablon zależnościE<gt> ]"
 
 #. type: Plain text
@@ -2734,25 +2838,37 @@
 
 #. type: Plain text
 #: deb-symbols.5:20
-msgid "[ * E<lt>field-nameE<gt>: E<lt>field valueE<gt> ]"
+#, fuzzy
+#| msgid "[ * E<lt>field-nameE<gt>: E<lt>field valueE<gt> ]"
+msgid "[ * I<field-name>: I<field-value> ]"
 msgstr "[ * E<lt>nazwa-polaE<gt>: E<lt>wartość polaE<gt> ]"
 
 #. type: Plain text
 #: deb-symbols.5:23
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "[ ... ]\n"
+#| " E<lt>symbolE<gt> E<lt>minimal versionE<gt>[ E<lt>id of dependency templateE<gt> ]\n"
 msgid ""
 "[ ... ]\n"
-" E<lt>symbolE<gt> E<lt>minimal versionE<gt>[ E<lt>id of dependency templateE<gt> ]\n"
+" I<symbol> I<minimal-version>[ I<id-of-dependency-template> ]\n"
 msgstr ""
 "[ ... ]\n"
 " E<lt>symbolE<gt> E<lt>minimalna wersjaE<gt>[ E<lt>id szablonu zależnościE<gt> ]\n"
 
 #. type: Plain text
 #: deb-symbols.5:29
-msgid ""
-"The I<library soname> is exactly the value of the SONAME field as exported "
-"by B<objdump>(1). A I<dependency template> is a dependency where I<#MINVER#> "
-"is dynamically replaced either by a version check like \"(E<gt>= I<minimal "
+#, fuzzy
+#| msgid ""
+#| "The I<library soname> is exactly the value of the SONAME field as "
+#| "exported by B<objdump>(1). A I<dependency template> is a dependency where "
+#| "I<#MINVER#> is dynamically replaced either by a version check like "
+#| "\"(E<gt>= I<minimal version>)\" or by nothing (if an unversioned "
+#| "dependency is deemed sufficient)."
+msgid ""
+"The I<library-soname> is exactly the value of the SONAME field as exported "
+"by B<objdump>(1). A I<dependency-template> is a dependency where I<#MINVER#> "
+"is dynamically replaced either by a version check like \"(E<gt>= I<minimal-"
 "version>)\" or by nothing (if an unversioned dependency is deemed "
 "sufficient)."
 msgstr ""
@@ -2764,11 +2880,19 @@
 
 #. type: Plain text
 #: deb-symbols.5:36
+#, fuzzy
+#| msgid ""
+#| "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> "
+#| "being \"Base\" if the library is not versioned) is associated to a "
+#| "I<minimal version> of its dependency template (the main dependency "
+#| "template is used if I<id of dependency template> is not present). The "
+#| "first alternative dependency template is numbered 1, the second one 2, "
+#| "etc."
 msgid ""
 "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> being "
-"\"Base\" if the library is not versioned) is associated to a I<minimal "
+"\"Base\" if the library is not versioned) is associated to a I<minimal-"
 "version> of its dependency template (the main dependency template is used if "
-"I<id of dependency template> is not present). The first alternative "
+"I<id-of-dependency-template> is not present). The first alternative "
 "dependency template is numbered 1, the second one 2, etc."
 msgstr ""
 "Z każdym wyeksportowanym I<symbolem> (wymienionym jako I<nazwa>@I<wersja>, "
@@ -2780,12 +2904,20 @@
 
 #. type: Plain text
 #: deb-symbols.5:43
+#, fuzzy
+#| msgid ""
+#| "Each entry for a library can also have some fields of meta-information.  "
+#| "Those fields are stored on lines starting with an asterisk. Currently, "
+#| "the only valid field is I<Build-Depends-Package>, it indicates the name "
+#| "of the \"-dev\" package associated to the library and is used by dpkg-"
+#| "shlibdeps to make sure that the dependency generated is at least as "
+#| "strict as the corresponding build dependency."
 msgid ""
 "Each entry for a library can also have some fields of meta-information.  "
 "Those fields are stored on lines starting with an asterisk. Currently, the "
 "only valid field is I<Build-Depends-Package>, it indicates the name of the "
-"\"-dev\" package associated to the library and is used by dpkg-shlibdeps to "
-"make sure that the dependency generated is at least as strict as the "
+"\"-dev\" package associated to the library and is used by B<dpkg-shlibdeps> "
+"to make sure that the dependency generated is at least as strict as the "
 "corresponding build dependency."
 msgstr ""
 "Każdy wpis dotyczący biblioteki może mieć także parę pól zawierających "
@@ -2864,13 +2996,6 @@
 msgid "deb-triggers"
 msgstr "deb-triggers"
 
-#. type: TH
-#: deb-triggers.5:1 dpkg-trigger.1:1
-#, fuzzy, no-wrap
-#| msgid "2009-08-16"
-msgid "2009-03-15"
-msgstr "2009-08-16"
-
 #. type: Plain text
 #: deb-triggers.5:4
 msgid "deb-triggers - package triggers"
@@ -2914,28 +3039,57 @@
 msgstr "B<interest> I<nazwa-wyzwalacza>"
 
 #. type: Plain text
-#: deb-triggers.5:27
+#: deb-triggers.5:26
+#, fuzzy
+#| msgid "B<interest> I<trigger-name>"
+msgid "B<interest-noawait> I<trigger-name>"
+msgstr "B<interest> I<nazwa-wyzwalacza>"
+
+#. type: Plain text
+#: deb-triggers.5:33
+#, fuzzy
+#| msgid ""
+#| "Specifies that the package is interested in the named trigger. All "
+#| "triggers in which a package is interested must be listed using this "
+#| "directive in the triggers control file."
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file."
+"triggers control file. The \"noawait\" variant does not put the triggering "
+"packages in triggers-awaited state. This should be used when the "
+"functionality provided by the trigger is not crucial."
 msgstr ""
 "Określa, że pakiet będzie uruchamiał nazwany wyzwalacz. Wszystkie wyzwalacze "
 "interesujące dla pakietu muszą być wymienione z użyciem tej dyrektywy w "
 "pliku kontrolnym triggers."
 
 #. type: Plain text
-#: deb-triggers.5:31
+#: deb-triggers.5:37
 msgid "B<activate> I<trigger-name>"
 msgstr "B<activate> I<nazwa-wyzwalacza>"
 
 #. type: Plain text
-#: deb-triggers.5:37
+#: deb-triggers.5:41
+#, fuzzy
+#| msgid "B<activate> I<trigger-name>"
+msgid "B<activate-noawait> I<trigger-name>"
+msgstr "B<activate> I<nazwa-wyzwalacza>"
+
+#. type: Plain text
+#: deb-triggers.5:50
+#, fuzzy
+#| msgid ""
+#| "Arranges that changes to this package's state will activate the specified "
+#| "trigger. The trigger will be activated at the start of the following "
+#| "operations: unpack, configure, remove (including for the benefit of a "
+#| "conflicting package), purge and deconfigure."
 msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure."
+"conflicting package), purge and deconfigure.  The \"noawait\" variant does "
+"not put the triggering packages in triggers-awaited state. This should be "
+"used when the functionality provided by the trigger is not crucial."
 msgstr ""
 "Powoduje, że zmiany stanu pakietu aktywują określony wyzwalacz. Aktywacja "
 "wyzwalacza nastąpi na początku następujących operacji: unpack, configure, "
@@ -2943,7 +3097,7 @@
 "deconfigure."
 
 #. type: Plain text
-#: deb-triggers.5:45
+#: deb-triggers.5:58
 msgid ""
 "If this package disappears during the unpacking of another package the "
 "trigger will be activated when the disappearance is noted towards the end of "
@@ -2959,14 +3113,23 @@
 "wyzwalacze wymienione zarówno w starej jak i w nowej wersji pakietu."
 
 #. type: Plain text
-#: deb-triggers.5:48
+#: deb-triggers.5:61
 msgid ""
 "Unknown directives are an error which will prevent installation of the "
 "package."
 msgstr "Nieznane dyrektywy są błędami uniemożliwiającymi instalację pakietu."
 
 #. type: Plain text
-#: deb-triggers.5:52
+#: deb-triggers.5:66
+msgid ""
+"The \"-noawait\" variants are only supported by dpkg 1.16.1 or newer, and "
+"will lead to errors if used with an older dpkg. It is thus recommended to "
+"add a \"Pre-Depends: dpkg (E<gt>= 1.16.1)\" to any package that wish to use "
+"those directives."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.5:70
 #, fuzzy
 #| msgid ""
 #| "B<dpkg-trigger>(1), B<dpkg>(1), B</usr/share/doc/dpkg/triggers.txt.gz>."
@@ -2982,13 +3145,6 @@
 msgstr "dpkg"
 
 #. type: TH
-#: dpkg.1:1
-#, fuzzy, no-wrap
-#| msgid "2009-02-27"
-msgid "2011-02-05"
-msgstr "2009-02-27"
-
-#. type: TH
 #: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
 #: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-query.1:1
 #: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.cfg.5:1
@@ -3005,7 +3161,9 @@
 #
 #. type: Plain text
 #: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
+#, fuzzy
+#| msgid "B<dpkg> [I<options>] I<action>"
+msgid "B<dpkg> [I<option>...] I<action>"
 msgstr "B<dpkg> [I<opcje>] I<działanie>"
 
 #. type: SH
@@ -3055,55 +3213,26 @@
 "oraz dodatkowych, nieobowiązkowych opcji. Parametr działanie określa, co "
 "B<dpkg> ma zrobić, a dodatkowe opcje modyfikują to działanie."
 
-#
-#. type: Plain text
-#: dpkg.1:31
-msgid ""
-"B<dpkg> can 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> może być także użyty jako nakładka na B<dpkg-deb>(1). Wymienione "
-"poniżej działania są działaniami programu B<dpkg-deb> i jeżeli zostaną "
-"użyte, to B<dpkg> uruchomi B<dpkg-deb>, przekazując mu odpowiednie parametry:"
-
 #. type: Plain text
-#: dpkg.1:40
-#, no-wrap
+#: dpkg.1:33
 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> oraz\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 "Działania te są opisane w osobnym podręczniku do B<dpkg-deb>(1)."
+"B<dpkg> can also be used as a front-end to B<dpkg-deb>(1) and B<dpkg-query>"
+"(1). The list of supported actions can be found later on in the B<ACTIONS> "
+"section. If any such action is encountered B<dpkg> just runs B<dpkg-deb> or "
+"B<dpkg-query> with the parameters given to it, but no specific options are "
+"currently passed to them, to use any such option the back-ends need to be "
+"called directly."
+msgstr ""
 
 #. type: SH
-#: dpkg.1:43
+#: dpkg.1:34
 #, no-wrap
 msgid "INFORMATION ABOUT PACKAGES"
 msgstr "INFORMACJE O PAKIETACH"
 
 #
 #. type: Plain text
-#: dpkg.1:48
+#: dpkg.1:39
 msgid ""
 "B<dpkg> maintains some usable information about available packages. The "
 "information is divided in three classes: B<states>, B<selection states> and "
@@ -3114,44 +3243,44 @@
 "Wartości te mogą zostać zmienione za pomocą programu B<dselect>."
 
 #. type: SS
-#: dpkg.1:48
+#: dpkg.1:39
 #, no-wrap
 msgid "PACKAGE STATES"
 msgstr "STAN BIEŻĄCY PAKIETÓW"
 
 #. type: TP
-#: dpkg.1:49
+#: dpkg.1:40
 #, no-wrap
 msgid "B<not-installed>"
 msgstr "B<not-installed (niezainstalowany)>"
 
 #
 #. type: Plain text
-#: dpkg.1:52
+#: dpkg.1:43
 msgid "The package is not installed on your system."
 msgstr "Pakiet nie jest zainstalowany w systemie."
 
 #. type: TP
-#: dpkg.1:52
+#: dpkg.1:43
 #, no-wrap
 msgid "B<config-files>"
 msgstr "B<config-files (pliki-konfiguracyjne)>"
 
 #
 #. type: Plain text
-#: dpkg.1:55
+#: dpkg.1:46
 msgid "Only the configuration files of the package exist on the system."
 msgstr "Tylko pliki konfiguracyjne pakietu zostały w systemie."
 
 #. type: TP
-#: dpkg.1:55
+#: dpkg.1:46
 #, no-wrap
 msgid "B<half-installed>"
 msgstr "B<half-installed (wpółzainstalowany)>"
 
 #
 #. type: Plain text
-#: dpkg.1:59
+#: dpkg.1:50
 msgid ""
 "The installation of the package has been started, but not completed for some "
 "reason."
@@ -3159,26 +3288,26 @@
 "Instalacja pakietu została rozpoczęta, ale niedokończona z pewnych powodów."
 
 #. type: TP
-#: dpkg.1:59
+#: dpkg.1:50
 #, no-wrap
 msgid "B<unpacked>"
 msgstr "B<unpacked (rozpakowany)>"
 
 #
 #. type: Plain text
-#: dpkg.1:62
+#: dpkg.1:53
 msgid "The package is unpacked, but not configured."
 msgstr "Pakiet jest rozpakowany, ale nie skonfigurowany."
 
 #. type: TP
-#: dpkg.1:62
+#: dpkg.1:53
 #, no-wrap
 msgid "B<half-configured>"
 msgstr "B<half-configured (wpółskonfigurowany)>"
 
 #
 #. type: Plain text
-#: dpkg.1:66
+#: dpkg.1:57
 msgid ""
 "The package is unpacked and configuration has been started, but not yet "
 "completed for some reason."
@@ -3187,65 +3316,65 @@
 "niedokończona z pewnych powodów."
 
 #. type: TP
-#: dpkg.1:66
+#: dpkg.1:57
 #, no-wrap
 msgid "B<triggers-awaited>"
 msgstr "B<triggers-awaited>"
 
 #. type: Plain text
-#: dpkg.1:69
+#: dpkg.1:60
 msgid "The package awaits trigger processing by another package."
 msgstr "Pakiet oczekuje przetworzenia wyzwalaczy przez inny pakiet."
 
 #. type: TP
-#: dpkg.1:69
+#: dpkg.1:60
 #, no-wrap
 msgid "B<triggers-pending>"
 msgstr "B<triggers-pending>"
 
 #. type: Plain text
-#: dpkg.1:72
+#: dpkg.1:63
 msgid "The package has been triggered."
 msgstr "Pakiet został pobudzony."
 
 #. type: TP
-#: dpkg.1:72
+#: dpkg.1:63
 #, no-wrap
 msgid "B<installed>"
 msgstr "B<installed (zainstalowany)>"
 
 #
 #. type: Plain text
-#: dpkg.1:75
+#: dpkg.1:66
 msgid "The package is unpacked and configured OK."
 msgstr "Pakiet jest rozpakowany i poprawnie skonfigurowany."
 
 #. type: SS
-#: dpkg.1:75
+#: dpkg.1:66
 #, no-wrap
 msgid "PACKAGE SELECTION STATES"
 msgstr "STAN WYBORU PAKIETÓW"
 
 #. type: TP
-#: dpkg.1:76
+#: dpkg.1:67
 #, no-wrap
 msgid "B<install>"
 msgstr "B<install (instalacja)>"
 
 #
 #. type: Plain text
-#: dpkg.1:79
+#: dpkg.1:70
 msgid "The package is selected for installation."
 msgstr "Pakiet został wybrany do zainstalowania."
 
 #. type: TP
-#: dpkg.1:79
+#: dpkg.1:70
 #, no-wrap
 msgid "B<hold>"
 msgstr "B<hold (wstrzymanie)>"
 
 #. type: Plain text
-#: dpkg.1:83
+#: dpkg.1:74
 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>."
@@ -3254,14 +3383,14 @@
 "chyba że użyje się opcji B<--force-hold>."
 
 #. type: TP
-#: dpkg.1:83
+#: dpkg.1:74
 #, no-wrap
 msgid "B<deinstall>"
 msgstr "B<deinstall (deinstalacja)>"
 
 #
 #. type: Plain text
-#: dpkg.1:87
+#: dpkg.1:78
 msgid ""
 "The package is selected for deinstallation (i.e. we want to remove all "
 "files, except configuration files)."
@@ -3270,14 +3399,14 @@
 "wszystkie pliki pakietu oprócz plików konfiguracyjnych)."
 
 #. type: TP
-#: dpkg.1:87
+#: dpkg.1:78
 #, no-wrap
 msgid "B<purge>"
 msgstr "B<purge (wyczyszczenie)>"
 
 #
 #. type: Plain text
-#: dpkg.1:91
+#: dpkg.1:82
 #, fuzzy
 #| msgid ""
 #| "The package is selected to be purged (i.e. we want to remove everything, "
@@ -3290,19 +3419,19 @@
 "wszystko, włącznie z plikami konfiguracyjnymi)."
 
 #. type: SS
-#: dpkg.1:91
+#: dpkg.1:82
 #, no-wrap
 msgid "PACKAGE FLAGS"
 msgstr "FLAGI PAKIETÓW"
 
 #. type: TP
-#: dpkg.1:92
+#: dpkg.1:83
 #, no-wrap
 msgid "B<reinst-required>"
 msgstr "B<reinst-required (konieczna-reinstalacja)>"
 
 #. type: Plain text
-#: dpkg.1:97
+#: dpkg.1:88
 msgid ""
 "A package marked B<reinst-required> is broken and requires reinstallation. "
 "These packages cannot be removed, unless forced with option B<--force-remove-"
@@ -3313,42 +3442,47 @@
 "B<--force-remove-reinstreq>."
 
 #. type: SH
-#: dpkg.1:98
+#: dpkg.1:89 dselect.1:120
 #, no-wrap
 msgid "ACTIONS"
 msgstr "AKCJE"
 
 #. type: TP
-#: dpkg.1:99
-#, no-wrap
-msgid "B<-i>, B<--install> I<package_file>..."
+#: dpkg.1:90
+#, fuzzy, no-wrap
+#| msgid "B<-i>, B<--install> I<package_file>..."
+msgid "B<-i>, B<--install> I<package-file>..."
 msgstr "B<-i>, B<--install> I<plik_pakietu>..."
 
 #
 #. type: Plain text
-#: dpkg.1:103
+#: dpkg.1:94
+#, fuzzy
+#| msgid ""
+#| "Install the package. If B<--recursive> or B<-R> option is specified, "
+#| "I<package_file> must refer to a directory instead."
 msgid ""
 "Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"I<package-file> must refer to a directory instead."
 msgstr ""
 "Instalacja pakiet. Jeśli została użyta opcja B<--recursive> lub B<-R>, "
 "I<plik_pakietu> musi oznaczać wybrany katalog."
 
 #
 #. type: Plain text
-#: dpkg.1:105
+#: dpkg.1:96
 msgid "Installation consists of the following steps:"
 msgstr "Instalacja składa się z następujących kroków:"
 
 #
 #. type: Plain text
-#: dpkg.1:108
+#: dpkg.1:99
 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:112
+#: dpkg.1:103
 msgid ""
 "B<2.> If another version of the same package was installed before the new "
 "installation, execute I<prerm> script of the old package."
@@ -3358,13 +3492,13 @@
 
 #
 #. type: Plain text
-#: dpkg.1:115
+#: dpkg.1:106
 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:119
+#: dpkg.1:110
 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."
@@ -3374,7 +3508,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:126
+#: dpkg.1:117
 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 "
@@ -3388,7 +3522,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:130
+#: dpkg.1:121
 msgid ""
 "B<6.> Configure the package. See B<--configure> for detailed information "
 "about how this is done."
@@ -3397,30 +3531,35 @@
 "opisie parametru B<--configure>."
 
 #. type: TP
-#: dpkg.1:130
-#, no-wrap
-msgid "B<--unpack >I<package_file>..."
+#: dpkg.1:121
+#, fuzzy, no-wrap
+#| msgid "B<--unpack >I<package_file>..."
+msgid "B<--unpack >I<package-file>..."
 msgstr "B<--unpack >I<plik_pakietu>..."
 
 #
 #. type: Plain text
-#: dpkg.1:135
+#: dpkg.1:126
+#, 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 ""
 "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."
+"option is specified, I<package-file> must refer to a directory instead."
 msgstr ""
 "Rozpakowanie pakietu, ale bez konfigurowania go. Jeśli została użyta opcja "
 "B<--recursive> lub B<-R>, I<plik_pakietu> musi oznaczać wybrany katalog."
 
 #. type: TP
-#: dpkg.1:135
+#: dpkg.1:126
 #, no-wrap
 msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<--configure >I<pakiet>...|B<-a>|B<--pending>"
 
 #
 #. type: Plain text
-#: dpkg.1:140
+#: dpkg.1:131
 #, fuzzy
 #| msgid ""
 #| "Reconfigure an unpacked package. If B<-a> or B<--pending> is given "
@@ -3436,7 +3575,7 @@
 "wszystkie pakiety rozpakowane, ale jeszcze nie skonfigurowane."
 
 #. type: Plain text
-#: dpkg.1:144
+#: dpkg.1:135
 msgid ""
 "To reconfigure a package which has already been configured, try the B<dpkg-"
 "reconfigure>(8)  command instead."
@@ -3444,13 +3583,13 @@
 
 #
 #. type: Plain text
-#: dpkg.1:146
+#: dpkg.1:137
 msgid "Configuring consists of the following steps:"
 msgstr "Konfigurowanie składa się z następujących kroków:"
 
 #
 #. type: Plain text
-#: dpkg.1:151
+#: dpkg.1:142
 msgid ""
 "B<1.> Unpack the conffiles, and at the same time back up the old conffiles, "
 "so that they can be restored if something goes wrong."
@@ -3460,18 +3599,18 @@
 
 #
 #. type: Plain text
-#: dpkg.1:154
+#: dpkg.1:145
 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:154
+#: dpkg.1:145
 #, no-wrap
 msgid "B<--triggers-only> I<package>...|B<-a>|B<--pending>"
 msgstr "B<--triggers-only> I<pakiet>...|B<-a>|B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:161
+#: dpkg.1:152
 msgid ""
 "Processes only triggers. All pending triggers will be processed. If package "
 "names are supplied only those packages' triggers will be processed, exactly "
@@ -3487,14 +3626,14 @@
 "--configure --pending>."
 
 #. type: TP
-#: dpkg.1:161
+#: dpkg.1:152
 #, no-wrap
 msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr "B<-r>, B<--remove>, B<-P>, B<--purge >I<pakiet>...|B<-a>|B<--pending>"
 
 #
 #. type: Plain text
-#: dpkg.1:178
+#: dpkg.1:169
 #, fuzzy
 #| msgid ""
 #| "Remove an installed package. B<-r> or B<--remove> remove everything "
@@ -3540,36 +3679,36 @@
 
 #
 #. type: Plain text
-#: dpkg.1:180
+#: dpkg.1:171
 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:183
+#: dpkg.1:174
 msgid "B<1.> Run I<prerm> script"
 msgstr "B<1.> Uruchomienie skryptu I<prerm>"
 
 #
 #. type: Plain text
-#: dpkg.1:186
+#: dpkg.1:177
 msgid "B<2.> Remove the installed files"
 msgstr "B<2.> Usunięcie zainstalowanych plików"
 
 #
 #. type: Plain text
-#: dpkg.1:189
+#: dpkg.1:180
 msgid "B<3.> Run I<postrm> script"
 msgstr "B<3.> Uruchomienie skryptu I<postrm>"
 
 #. type: TP
-#: dpkg.1:190
+#: dpkg.1:181
 #, no-wrap
 msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<--update-avail>, B<--merge-avail> I<plik-pakietów>"
 
 #. type: Plain text
-#: dpkg.1:199
+#: dpkg.1:190
 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 "
@@ -3587,7 +3726,7 @@
 "dpkg/available>."
 
 #. type: Plain text
-#: dpkg.1:204
+#: dpkg.1:195
 msgid ""
 "A simpler one-shot command to retrieve and update the I<available> file is "
 "B<dselect update>. Note that this file is mostly useless if you don't use "
@@ -3601,18 +3740,24 @@
 "określania dostępności pakietów."
 
 #. type: TP
-#: dpkg.1:204
-#, no-wrap
-msgid "B<-A>, B<--record-avail> I<package_file>..."
+#: dpkg.1:195
+#, fuzzy, no-wrap
+#| msgid "B<-A>, B<--record-avail> I<package_file>..."
+msgid "B<-A>, B<--record-avail> I<package-file>..."
 msgstr "B<-A>, B<--record-avail> I<plik_pakietu>..."
 
 #
 #. type: Plain text
-#: dpkg.1:210
+#: dpkg.1:201
+#, 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."
 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."
+"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 ""
 "Zaktualizowanie bazy danych programów B<dpkg> oraz B<dselect> o dostępnych "
 "pakietach, uwzględniając informacje zawarte w pakiecie I<plik_pakietu>. "
@@ -3620,13 +3765,13 @@
 "oznaczać wybrany katalog."
 
 #. type: TP
-#: dpkg.1:210
+#: dpkg.1:201
 #, no-wrap
 msgid "B<--forget-old-unavail>"
 msgstr "B<--forget-old-unavail>"
 
 #. type: Plain text
-#: dpkg.1:214
+#: dpkg.1:205
 msgid ""
 "Now B<obsolete> and a no-op as B<dpkg> will automatically forget uninstalled "
 "unavailable packages."
@@ -3635,26 +3780,26 @@
 "automatycznie zapomina o niezainstalowanych, niedostępnych pakietach."
 
 #. type: TP
-#: dpkg.1:214
+#: dpkg.1:205
 #, no-wrap
 msgid "B<--clear-avail>"
 msgstr "B<--clear-avail>"
 
 #
 #. type: Plain text
-#: dpkg.1:217
+#: dpkg.1:208
 msgid "Erase the existing information about what packages are available."
 msgstr "Skasowanie informacji o dostępnych pakietach."
 
 #. type: TP
-#: dpkg.1:217
+#: dpkg.1:208
 #, no-wrap
 msgid " B<-C>, B<--audit>"
 msgstr " B<-C>, B<--audit>"
 
 #
 #. type: Plain text
-#: dpkg.1:222
+#: dpkg.1:213
 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."
@@ -3663,14 +3808,14 @@
 "B<dpkg> zasugeruje, co można zrobić z tymi pakietami, aby w pełni działały."
 
 #. type: TP
-#: dpkg.1:222
+#: dpkg.1:213
 #, no-wrap
 msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr "B<--get-selections> [I<wzorzec-nazwy-pakietu>...]"
 
 #
 #. type: Plain text
-#: dpkg.1:227
+#: dpkg.1:218
 msgid ""
 "Get list of package selections, and write it to stdout. Without a pattern, "
 "non-installed packages (i.e. those which have been previously purged)  will "
@@ -3681,18 +3826,24 @@
 "uprzednio wyczyszczone) nie zostaną wyświetlone."
 
 #. type: TP
-#: dpkg.1:227 update-alternatives.8:300
+#: dpkg.1:218 update-alternatives.8:299
 #, no-wrap
 msgid "B<--set-selections>"
 msgstr "B<--set-selections>"
 
 #. type: Plain text
-#: dpkg.1:233
+#: dpkg.1:224
+#, 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."
 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 format 'I<package> I<state>', where state is one of B<install>, B<hold>, "
+"B<deinstall> or B<purge>. Blank lines and comment lines beginning with '#' "
+"are also permitted."
 msgstr ""
 "Ustawia wybór pakietów używając pliku przeczytanego ze standardowego "
 "wejścia. Plik ten powinien być w następującym formacie \"E<lt>pakietE<gt> "
@@ -3701,13 +3852,13 @@
 "od \"#\"."
 
 #. type: TP
-#: dpkg.1:233
+#: dpkg.1:224
 #, no-wrap
 msgid "B<--clear-selections>"
 msgstr "B<--clear-selections>"
 
 #. type: Plain text
-#: dpkg.1:238
+#: dpkg.1:229
 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 "
@@ -3719,14 +3870,14 @@
 "selections."
 
 #. type: TP
-#: dpkg.1:238
+#: dpkg.1:229
 #, no-wrap
 msgid "B<--yet-to-unpack>"
 msgstr "B<--yet-to-unpack>"
 
 #
 #. type: Plain text
-#: dpkg.1:242
+#: dpkg.1:233
 msgid ""
 "Searches for packages selected for installation, but which for some reason "
 "still haven't been installed."
@@ -3735,14 +3886,14 @@
 "powodów nie mogły zostać zainstalowane."
 
 #. type: TP
-#: dpkg.1:243
+#: dpkg.1:234
 #, no-wrap
 msgid "B<--print-architecture>"
 msgstr "B<--print-architecture>"
 
 #
 #. type: Plain text
-#: dpkg.1:246
+#: dpkg.1:237
 msgid ""
 "Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr ""
@@ -3750,13 +3901,13 @@
 "\"i386\")."
 
 #. type: TP
-#: dpkg.1:246
+#: dpkg.1:237
 #, no-wrap
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<--compare-versions >I<wersja1 op wersja2>"
 
 #. type: Plain text
-#: dpkg.1:257
+#: dpkg.1:248
 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 "
@@ -3778,13 +3929,14 @@
 "kontrolnym: B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 
 #. type: TP
-#: dpkg.1:257
-#, no-wrap
-msgid "B<--command-fd >I<E<lt>nE<gt>>"
+#: dpkg.1:248
+#, fuzzy, no-wrap
+#| msgid "B<--command-fd >I<E<lt>nE<gt>>"
+msgid "B<--command-fd >I<n>"
 msgstr "B<--command-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:262
+#: dpkg.1:253
 #, fuzzy
 #| msgid ""
 #| "Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. "
@@ -3792,10 +3944,9 @@
 #| "descriptor, are not reset for subsequent commands executed during the "
 #| "same run."
 msgid ""
-"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and through this file "
-"descriptor, are not reset for subsequent commands executed during the same "
-"run."
+"Accept a series of commands on input file descriptor I<n>. Note: additional "
+"options set on the command line, and through this file descriptor, are not "
+"reset for subsequent commands executed during the same run."
 msgstr ""
 "Wykonuje listę poleceń odczytywanych z deskryptora pliku I<E<lt>nE<gt>>. "
 "Uwaga: dodatkowe opcje ustawione w linii komend oraz przez polecenia "
@@ -3803,78 +3954,78 @@
 "wykonywanych podczas tego samego przebiegu."
 
 #. type: TP
-#: dpkg.1:262 dpkg-architecture.1:61 dpkg-buildflags.1:71 dpkg-divert.8:71
-#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
-#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
+#: dpkg.1:253 dpkg-architecture.1:60 dpkg-buildflags.1:89 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:66 dpkg-statoverride.8:44
+#: dpkg-vendor.1:28 dselect.1:113 update-alternatives.8:316
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 #
 #. type: Plain text
-#: dpkg.1:265
+#: dpkg.1:256
 msgid "Display a brief help message."
 msgstr "Wyświetlenie krótkiego komunikatu pomocy."
 
 #. type: TP
-#: dpkg.1:265
+#: dpkg.1:256
 #, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--force-help>"
 
 #
 #. type: Plain text
-#: dpkg.1:268
+#: dpkg.1:259
 msgid "Give help about the B<--force->I<thing> options."
 msgstr "Wyświetlenie opisu opcji B<--force->I<działanie>."
 
 #. type: TP
-#: dpkg.1:268
+#: dpkg.1:259
 #, no-wrap
 msgid "B<-Dh>, B<--debug=help>"
 msgstr "B<-Dh>, B<--debug=help>"
 
 #
 #. type: Plain text
-#: dpkg.1:271
+#: dpkg.1:262
 msgid "Give help about debugging options."
 msgstr "Wyświetlenie opisu opcji debuggera."
 
 #. type: TP
-#: dpkg.1:271 dpkg-architecture.1:64 dpkg-buildflags.1:74
+#: dpkg.1:262 dpkg-architecture.1:63 dpkg-buildflags.1:92
 #: dpkg-buildpackage.1:226 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
-#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
-#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
-#: dpkg-shlibdeps.1:220 dpkg-source.1:93 dpkg-split.1:130
-#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
-#: update-alternatives.8:320
+#: dpkg-deb.1:175 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:113 dpkg-scanpackages.1:99 dpkg-scansources.1:68
+#: dpkg-shlibdeps.1:218 dpkg-source.1:99 dpkg-split.1:129
+#: dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:116
+#: update-alternatives.8:319
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 #
 #. type: Plain text
-#: dpkg.1:274
+#: dpkg.1:265
 msgid "Display B<dpkg> version information."
 msgstr "Wyświetlenie informacji o wersji B<dpkg>."
 
 #. type: TP
-#: dpkg.1:274
+#: dpkg.1:265
 #, no-wrap
 msgid "B<dpkg-deb actions>"
 msgstr "B<akcje dpkg-deb>"
 
 #
 #. type: Plain text
-#: dpkg.1:277
+#: dpkg.1:268
 msgid "See B<dpkg-deb>(1) for more information about the following actions."
 msgstr ""
 "Proszę zajrzeć do B<dpkg-deb>(1), aby poznać pełny opis następujących "
 "działań."
 
 #. type: Plain text
-#: dpkg.1:297
+#: dpkg.1:288
 #, no-wrap
 msgid ""
 "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
@@ -3916,21 +4067,21 @@
 "     Podanie informacji o pakiecie.\n"
 
 #. type: TP
-#: dpkg.1:299
+#: dpkg.1:290
 #, no-wrap
 msgid "B<dpkg-query actions>"
 msgstr "B<akcje dpkg-query>"
 
 #
 #. type: Plain text
-#: dpkg.1:302
+#: dpkg.1:293
 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:317
+#: dpkg.1:308
 #, no-wrap
 msgid ""
 "B<-l>, B<--list> I<package-name-pattern>...\n"
@@ -3961,21 +4112,21 @@
 "    tej opcji.\n"
 
 #. type: SH
-#: dpkg.1:319 dpkg-architecture.1:68 dpkg-buildpackage.1:50
-#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
+#: dpkg.1:310 dpkg-architecture.1:67 dpkg-buildpackage.1:50
+#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:179
 #: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
-#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
-#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
-#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
-#: start-stop-daemon.8:100 update-alternatives.8:324
+#: dpkg-gensymbols.1:369 dpkg-mergechangelogs.1:27 dpkg-name.1:30
+#: dpkg-parsechangelog.1:15 dpkg-query.1:117 dpkg-scanpackages.1:71
+#: dpkg-scansources.1:44 dpkg-shlibdeps.1:106 dpkg-split.1:133
+#: dpkg-statoverride.8:51 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:36
+#: start-stop-daemon.8:103 update-alternatives.8:323
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPCJE"
 
 #
 #. type: Plain text
-#: dpkg.1:325
+#: dpkg.1:316
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg> or the files on the configuration "
@@ -3991,28 +4142,28 @@
 "się od B<#>)."
 
 #. type: TP
-#: dpkg.1:326
+#: dpkg.1:317
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<liczba>"
 
 #
 #. type: Plain text
-#: dpkg.1:329
+#: dpkg.1:320
 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:329
+#: dpkg.1:320
 #, no-wrap
 msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>, B<--auto-deconfigure>"
 
 #
 #. type: Plain text
-#: dpkg.1:335
+#: dpkg.1:326
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -4024,13 +4175,13 @@
 "pakietów, które są zależne od usuwanego."
 
 #. type: TP
-#: dpkg.1:335
+#: dpkg.1:326
 #, no-wrap
 msgid "B<-D>I<octal>B<, --debug=>I<octal>"
 msgstr "B<-D>I<ósemkowo>, B<--debug=>I<ósemkowo>"
 
 #. type: Plain text
-#: dpkg.1:341
+#: dpkg.1:332
 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 "
@@ -4042,7 +4193,7 @@
 "wartości."
 
 #. type: Plain text
-#: dpkg.1:356
+#: dpkg.1:347
 #, fuzzy, no-wrap
 #| msgid ""
 #| "    number  description\n"
@@ -4091,14 +4242,14 @@
 "      2000   Reszta szczegółowych informacji\n"
 
 #. type: TP
-#: dpkg.1:356
+#: dpkg.1:347
 #, no-wrap
 msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--force->I<działania>, B<--no-force->I<działania>, B<--refuse->I<działania>"
 
 #
 #. type: Plain text
-#: dpkg.1:363
+#: dpkg.1:354
 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<--"
@@ -4112,7 +4263,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:367
+#: dpkg.1:358
 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 "
@@ -4124,13 +4275,13 @@
 
 #
 #. type: Plain text
-#: dpkg.1:370
+#: dpkg.1:361
 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:373
+#: dpkg.1:364
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
@@ -4140,7 +4291,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:380
+#: dpkg.1:371
 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 "
@@ -4157,7 +4308,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:384
+#: dpkg.1:375
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
@@ -4167,7 +4318,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:387
+#: dpkg.1:378
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr ""
 "B<hold>: Działanie obejmie także pakiety oznaczone jako \"wstrzymane"
@@ -4175,7 +4326,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:392
+#: dpkg.1:383
 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 "
@@ -4186,7 +4337,7 @@
 "systemie, gdyż B<dpkg> zapomni o niej."
 
 #. type: Plain text
-#: dpkg.1:397
+#: dpkg.1:388
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -4199,14 +4350,14 @@
 
 #
 #. type: Plain text
-#: dpkg.1:400
+#: dpkg.1:391
 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:403
+#: dpkg.1:394
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
@@ -4214,13 +4365,13 @@
 "sprawdzaniu zależności."
 
 #. type: Plain text
-#: dpkg.1:406
+#: dpkg.1:397
 msgid "B<breaks>: Install, even if this would break another package."
 msgstr "B<breaks>: Instalacja, nawet jeśliby to popsuło inny pakiet."
 
 #
 #. type: Plain text
-#: dpkg.1:410
+#: dpkg.1:401
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
@@ -4230,7 +4381,7 @@
 "należy zachować ostrożność przy użyciu tej opcji."
 
 #. type: Plain text
-#: dpkg.1:415
+#: dpkg.1:406
 msgid ""
 "B<confmiss>: Always install a missing conffile. This is dangerous, since it "
 "means not preserving a change (removing) made to the file."
@@ -4240,7 +4391,7 @@
 "dokonanej na pliku (czyli jego usunięcia)."
 
 #. type: Plain text
-#: dpkg.1:420
+#: dpkg.1:411
 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 "
@@ -4251,7 +4402,7 @@
 "force-confdef>, co spowoduje wykonanie domyślnej akcji."
 
 #. type: Plain text
-#: dpkg.1:425
+#: dpkg.1:416
 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 "
@@ -4263,7 +4414,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:431
+#: dpkg.1:422
 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 "
@@ -4277,7 +4428,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:438
+#: dpkg.1:429
 #, fuzzy
 #| msgid ""
 #| "B<confdef>: If a conffile has been modified always choose the default "
@@ -4298,7 +4449,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:441
+#: dpkg.1:432
 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 "
@@ -4306,7 +4457,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:444
+#: dpkg.1:435
 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 "
@@ -4314,14 +4465,14 @@
 
 #
 #. type: Plain text
-#: dpkg.1:447
+#: dpkg.1:438
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
 "B<overwrite-diverted>: Nadpisanie plików ominiętych plikami nieominiętymi."
 
 #. type: Plain text
-#: dpkg.1:455
+#: dpkg.1:446
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking. Currently "
 "this implies not performing file system syncs before file renames, which is "
@@ -4332,7 +4483,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:461
+#: dpkg.1:452
 msgid ""
 "I<Note>: For ext4, the main offender, consider using instead the mount "
 "option B<nodelalloc>, which will fix both the performance degradation and "
@@ -4342,7 +4493,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:464
+#: dpkg.1:455
 msgid ""
 "I<Warning: Using this option might improve performance at the cost of losing "
 "data, use with care.>"
@@ -4350,14 +4501,22 @@
 
 #
 #. type: Plain text
-#: dpkg.1:467
+#: dpkg.1:458
 #, fuzzy
 #| msgid "B<architecture>: Process even packages with the wrong architecture."
 msgid "B<architecture>: Process even packages with wrong or no architecture."
 msgstr "B<architecture>: Działanie obejmie pakiety z niepoprawną architekturą."
 
+#
 #. type: Plain text
-#: dpkg.1:470
+#: dpkg.1:461
+#, fuzzy
+#| msgid "B<architecture>: Process even packages with the wrong architecture."
+msgid "B<bad-version>: Process even packages with wrong versions."
+msgstr "B<architecture>: Działanie obejmie pakiety z niepoprawną architekturą."
+
+#. type: Plain text
+#: dpkg.1:464
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -4365,28 +4524,28 @@
 "systemowej B<PATH>."
 
 #. type: Plain text
-#: dpkg.1:473
+#: dpkg.1:467
 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 "
 "administartora."
 
 #. type: Plain text
-#: dpkg.1:476
+#: dpkg.1:470
 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:477
+#: dpkg.1:471
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<pakiet>,..."
 
 #
 #. type: Plain text
-#: dpkg.1:481
+#: dpkg.1:475
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
@@ -4396,44 +4555,14 @@
 "tylko ostrzeżenie)."
 
 #. type: TP
-#: dpkg.1:481
-#, no-wrap
-msgid "B<--new>, B<--old>"
-msgstr "B<--new>, B<--old>"
-
-#
-#. type: Plain text
-#: dpkg.1:485
-msgid ""
-"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
-msgstr ""
-"Wybór pomiędzy nowym i starym formatem binarnym pakietu. Ta opcja jest "
-"przesłana do B<dpkg-deb>(1)."
-
-#. type: TP
-#: dpkg.1:485 dpkg-deb.1:209
-#, no-wrap
-msgid "B<--nocheck>"
-msgstr "B<--nocheck>"
-
-#. type: Plain text
-#: dpkg.1:489
-msgid ""
-"Don't read or check contents of control file while building a package.  This "
-"is a B<dpkg-deb>(1) option."
-msgstr ""
-"Brak sprawdzania zawartości pliku kontrolnego podczas budowania pakietu. Ta "
-"opcja jest przesłana do B<dpkg-deb>(1)."
-
-#. type: TP
-#: dpkg.1:489
+#: dpkg.1:475
 #, 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:494
+#: dpkg.1:480
 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 "
@@ -4444,7 +4573,7 @@
 "czegokolwiek."
 
 #. type: Plain text
-#: dpkg.1:499
+#: dpkg.1:485
 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 "
@@ -4458,14 +4587,14 @@
 "nie zrobi)."
 
 #. type: TP
-#: dpkg.1:499
+#: dpkg.1:485
 #, no-wrap
 msgid "B<-R>, B<--recursive>"
 msgstr "B<-R>, B<--recursive>"
 
 #
 #. type: Plain text
-#: dpkg.1:505
+#: dpkg.1:491
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -4476,14 +4605,14 @@
 "B<--install>, B<--unpack> oraz B<--avail>."
 
 #. type: TP
-#: dpkg.1:505
+#: dpkg.1:491
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 #
 #. type: Plain text
-#: dpkg.1:509
+#: dpkg.1:495
 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>."
@@ -4492,14 +4621,14 @@
 "Jest to dokładnie to samo, co B<--refuse-downgrade>."
 
 #. type: TP
-#: dpkg.1:509 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
-#: dpkg-query.1:112 dpkg-shlibdeps.1:213 dpkg-trigger.1:39
+#: dpkg.1:495 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
+#: dpkg-query.1:118 dpkg-shlibdeps.1:211 dpkg-trigger.1:39
 #, no-wrap
 msgid "B<--admindir=>I<dir>"
 msgstr "B<--admindir=>I<katalog>"
 
 #. type: Plain text
-#: dpkg.1:514
+#: dpkg.1:500
 msgid ""
 "Change default administrative directory, which contains many files that give "
 "information about status of installed or uninstalled packages, etc.  "
@@ -4510,14 +4639,14 @@
 "pakietów itp. (Wartość domyślna to I</var/lib/dpkg>)."
 
 #. type: TP
-#: dpkg.1:514
+#: dpkg.1:500
 #, no-wrap
 msgid "B<--instdir=>I<dir>"
 msgstr "B<--instdir=>I<katalog>"
 
 #
 #. type: Plain text
-#: dpkg.1:521
+#: dpkg.1:507
 msgid ""
 "Change default installation directory which refers to the directory where "
 "packages are to be installed. B<instdir> is also the directory passed to "
@@ -4531,13 +4660,13 @@
 "(Wartość domyślna to I</>)."
 
 #. type: TP
-#: dpkg.1:521
+#: dpkg.1:507
 #, no-wrap
 msgid "B<--root=>I<dir>"
 msgstr "B<--root=>I<katalog>"
 
 #. type: Plain text
-#: dpkg.1:525
+#: dpkg.1:511
 msgid ""
 "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 "var/lib/dpkg>."
@@ -4546,14 +4675,14 @@
 "I<katalog>B</var/lib/dpkg>."
 
 #. type: TP
-#: dpkg.1:525
+#: dpkg.1:511
 #, no-wrap
 msgid "B<-O>, B<--selected-only>"
 msgstr "B<-O>, B<--selected-only>"
 
 #
 #. type: Plain text
-#: dpkg.1:531
+#: dpkg.1:517
 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 "
@@ -4566,14 +4695,14 @@
 "wybrany do odinstalowania."
 
 #. type: TP
-#: dpkg.1:531
+#: dpkg.1:517
 #, no-wrap
 msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E>, B<--skip-same-version>"
 
 #
 #. type: Plain text
-#: dpkg.1:535
+#: dpkg.1:521
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
@@ -4582,17 +4711,17 @@
 "systemie."
 
 #. type: Plain text
-#: dpkg.1:537
+#: dpkg.1:523
 msgid "B<--pre-invoke=>I<command>"
 msgstr "B<--pre-invoke=>I<polecenie>"
 
 #. type: Plain text
-#: dpkg.1:539
+#: dpkg.1:525
 msgid "B<--post-invoke=>I<command>"
 msgstr "B<--post-invoke=>I<polecenie>"
 
 #. type: Plain text
-#: dpkg.1:548
+#: dpkg.1:534
 msgid ""
 "Set an invoke hook I<command> to be run via ``sh -c'' before or after the "
 "dpkg run for the I<unpack>, I<configure>, I<install>, I<triggers-only>, "
@@ -4614,35 +4743,35 @@
 "dodatkowych poleceń więcej razy niż oczekiwano."
 
 #. type: Plain text
-#: dpkg.1:551
+#: dpkg.1:537
 #, fuzzy
 #| msgid "B<--list>I< glob-pattern>"
 msgid "B<--path-exclude=>I<glob-pattern>"
 msgstr "B<--list>I< wzorzec-glob>"
 
 #. type: Plain text
-#: dpkg.1:553
+#: dpkg.1:539
 #, fuzzy
 #| msgid "B<--list>I< glob-pattern>"
 msgid "B<--path-include=>I<glob-pattern>"
 msgstr "B<--list>I< wzorzec-glob>"
 
 #. type: Plain text
-#: dpkg.1:556
+#: dpkg.1:542
 msgid ""
 "Set I<glob-pattern> as a path filter, either by excluding or re-including "
 "previously excluded paths matching the specified patterns during install."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:559
+#: dpkg.1:545
 msgid ""
 "I<Warning: take into account that depending on the excluded paths you might "
 "completely break your system, use with caution.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:569
+#: dpkg.1:555
 msgid ""
 "The glob patterns use the same wildcards used in the shell, were '*' matches "
 "any sequence of characters, including the empty string and also '/'. For "
@@ -4656,14 +4785,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:572
+#: dpkg.1:558
 msgid ""
 "This can be used to remove all paths except some particular ones; a typical "
 "case is:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:576
+#: dpkg.1:562
 #, no-wrap
 msgid ""
 "B<--path-exclude=/usr/share/doc/*>\n"
@@ -4671,12 +4800,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:579
+#: dpkg.1:565
 msgid "to remove all documentation files except the copyright files."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:583
+#: dpkg.1:569
 msgid ""
 "These two options can be specified multiple times, and interleaved with each "
 "other. Both are processed in the given order, with the last rule that "
@@ -4684,13 +4813,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:584
+#: dpkg.1:570
 #, no-wrap
 msgid "B<--status-fd >I<n>"
 msgstr "B<--status-fd >I<n>"
 
 #. type: Plain text
-#: dpkg.1:590
+#: dpkg.1:576
 msgid ""
 "Send machine-readable package status and progress information to file "
 "descriptor I<n>. This option can be specified multiple times. The "
@@ -4702,51 +4831,51 @@
 "form:"
 
 #. type: TP
-#: dpkg.1:591
+#: dpkg.1:577
 #, no-wrap
 msgid "B<status: >I<package>B<: >I<status>"
 msgstr "B<status: >I<pakiet>B<: >I<status>"
 
 #. type: Plain text
-#: dpkg.1:594
+#: dpkg.1:580
 msgid "Package status changed; I<status> is as in the status file."
 msgstr ""
 "Nastąpiła zmiana statusu pakietu, I<status> jest taki jak w pliku statusu "
 "pakietu."
 
 #. type: TP
-#: dpkg.1:594
+#: dpkg.1:580
 #, no-wrap
 msgid "B<status: >I<package>B< : error : >I<extended-error-message>"
 msgstr "B<status: >I<pakiet>B< : error : >I<rozszerzony-komunikat-błędu>"
 
 #. type: Plain text
-#: dpkg.1:598
+#: dpkg.1:584
 msgid ""
 "An error occurred. Any possible newlines in I<extended-error-message> will "
 "be converted to spaces before output."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:598
+#: dpkg.1:584
 #, no-wrap
 msgid "B<status: >I<file>B< : conffile-prompt : '>I<real-old>B<' '>I<real-new>B<' >I<useredited>B< >I<distedited>"
 msgstr "B<status: >I<plik>B< : conffile-prompt : '>I<prawdziwy-stary>B<' '>I<prawdziwy-nowy>B<' >I<zmiany-użytkownika>B< >I<zmiany-dystrybucyjne>"
 
 #. type: Plain text
-#: dpkg.1:601
+#: dpkg.1:587
 msgid "User is being asked a conffile question."
 msgstr ""
 "Użytkownikowi zostanie przedstawione pytanie odnośnie pliku konfiguracyjnego."
 
 #. type: TP
-#: dpkg.1:601
+#: dpkg.1:587
 #, no-wrap
 msgid "B<processing: >I<stage>B<: >I<package>"
 msgstr "B<processing: >I<etap>B<: >I<pakiet>"
 
 #. type: Plain text
-#: dpkg.1:606
+#: dpkg.1:592
 #, fuzzy
 #| msgid ""
 #| "Sent just before a processing stage starts. I<stage> is one of "
@@ -4762,14 +4891,14 @@
 "B<trigproc>, B<remove>, B<purge>."
 
 #. type: TP
-#: dpkg.1:607
+#: dpkg.1:593
 #, fuzzy, no-wrap
 #| msgid "B<--post-invoke=>I<command>"
 msgid "B<--status-logger>=I<command>"
 msgstr "B<--post-invoke=>I<polecenie>"
 
 #. type: Plain text
-#: dpkg.1:612
+#: dpkg.1:598
 #, fuzzy
 #| msgid ""
 #| "Send machine-readable package status and progress information to file "
@@ -4787,23 +4916,34 @@
 "form:"
 
 #. type: TP
-#: dpkg.1:613
+#: dpkg.1:599
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<nazwa-pliku>"
 
 #. type: Plain text
-#: dpkg.1:625
+#: dpkg.1:611
+#, 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."
 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."
+"I<state> I<pkg> I<installed-version>' for status change updates; `YYYY-MM-DD "
+"HH:MM:SS I<action> I<pkg> I<installed-version> I<available-version>' for "
+"actions where I<action> is one of B<install>, B<upgrade>, B<remove>, "
+"B<purge>; and `YYYY-MM-DD HH:MM:SS conffile I<filename> I<decision>' for "
+"conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 "Zapisuje informacje o zmianach stanu i akcjach do pliku logu I<nazwa-pliku>, "
 "zamiast do domyślnego pliku I</var/log/dpkg.log>. Jeżeli tę opcję podano "
@@ -4818,24 +4958,24 @@
 "install (instalacja nowej wersji), albo keep (zachowanie poprzedniej wersji)."
 
 #. type: TP
-#: dpkg.1:625
+#: dpkg.1:611
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--no-debsig>"
 
 #. type: Plain text
-#: dpkg.1:628
+#: dpkg.1:614
 msgid "Do not try to verify package signatures."
 msgstr "Nie próbuje weryfikować sygnatur pakietu."
 
 #. type: TP
-#: dpkg.1:628
+#: dpkg.1:614
 #, no-wrap
 msgid "B<--no-triggers>"
 msgstr "B<--no-triggers>"
 
 #. type: Plain text
-#: dpkg.1:637
+#: dpkg.1:623
 msgid ""
 "Do not run any triggers in this run (activations will still be recorded).  "
 "If used with B<--configure> I<package> or B<--triggers-only> I<package> then "
@@ -4853,42 +4993,42 @@
 "przez wywołanie: B<dpkg --configure --pending>."
 
 #. type: TP
-#: dpkg.1:637
+#: dpkg.1:623
 #, no-wrap
 msgid "B<--triggers>"
 msgstr "B<--triggers>"
 
 #. type: Plain text
-#: dpkg.1:640
+#: dpkg.1:626
 msgid "Cancels a previous B<--no-triggers>."
 msgstr "Anuluje poprzednie B<--no-triggers>."
 
 #. type: Plain text
-#: dpkg.1:642 dpkg.cfg.5:16
+#: dpkg.1:628 dpkg.cfg.5:16
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #
 #. type: Plain text
-#: dpkg.1:645
+#: dpkg.1:631
 msgid "Configuration file with default options."
 msgstr "Plik konfiguracyjny zawierający domyślne opcje."
 
 #. type: TP
-#: dpkg.1:645
+#: dpkg.1:631
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/log/dpkg.log>"
 
 #. type: Plain text
-#: dpkg.1:649
+#: dpkg.1:635
 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:652
+#: dpkg.1:638
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
@@ -4897,26 +5037,26 @@
 "katalogów. Opcja B<--admindir> może zmienić lokalizację tych plików."
 
 #. type: TP
-#: dpkg.1:652
+#: dpkg.1:638
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 #
 #. type: Plain text
-#: dpkg.1:655
+#: dpkg.1:641
 msgid "List of available packages."
 msgstr "Lista dostępnych pakietów."
 
 #. type: TP
-#: dpkg.1:655
+#: dpkg.1:641
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 #
 #. type: Plain text
-#: dpkg.1:661
+#: dpkg.1:647
 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, "
@@ -4927,7 +5067,7 @@
 "opisane w sekcji B<INFORMACJE O PAKIETACH>."
 
 #. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:650
 msgid ""
 "The status file is backed up daily in I</var/backups>. It can be useful if "
 "it's lost or corrupted due to filesystems troubles."
@@ -4938,7 +5078,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:653
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
@@ -4947,78 +5087,78 @@
 "nich można znaleźć w B<deb>(5)."
 
 #. type: TP
-#: dpkg.1:667
+#: dpkg.1:653
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 #. type: TP
-#: dpkg.1:669
+#: dpkg.1:655
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 #. type: TP
-#: dpkg.1:671
+#: dpkg.1:657
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 #. type: TP
-#: dpkg.1:673
+#: dpkg.1:659
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 #. type: TP
-#: dpkg.1:675
+#: dpkg.1:661
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 #. type: TP
-#: dpkg.1:677
+#: dpkg.1:663
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 #. type: SH
-#: dpkg.1:680 dpkg-buildflags.1:110 dpkg-buildpackage.1:230 dpkg-deb.1:219
-#: dpkg-divert.8:112 dpkg-query.1:196 dpkg-statoverride.8:69 dpkg-trigger.1:60
-#: dpkg-vendor.1:42 dselect.1:430 update-alternatives.8:355
+#: dpkg.1:666 dpkg-buildflags.1:128 dpkg-buildpackage.1:230 dpkg-deb.1:232
+#: dpkg-divert.8:112 dpkg-query.1:204 dpkg-statoverride.8:68 dpkg-trigger.1:60
+#: dpkg-vendor.1:42 dselect.1:423 update-alternatives.8:354
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "ŚRODOWISKO"
 
 #. type: TP
-#: dpkg.1:681 dselect.1:431
+#: dpkg.1:667 dselect.1:424
 #, fuzzy, no-wrap
 #| msgid "B<SHELL>"
 msgid "B<HOME>"
 msgstr "B<SHELL>"
 
 #. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:671
 msgid ""
 "If set, B<dpkg> will use it as the directory from which to read the user "
 "specific configuration file."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:685 dpkg-deb.1:220
+#: dpkg.1:671 dpkg-deb.1:233
 #, no-wrap
 msgid "B<TMPDIR>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:689
+#: dpkg.1:675
 msgid ""
 "If set, B<dpkg> will use it as the directory in which to create temporary "
 "files and directories."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:689
+#: dpkg.1:675
 #, fuzzy, no-wrap
 #| msgid "B<CPPFLAGS>"
 msgid "B<PAGER>"
@@ -5026,7 +5166,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:692
+#: dpkg.1:678
 #, fuzzy
 #| msgid "The program B<dpkg> will execute when starting a new shell."
 msgid "The program B<dpkg> will execute when displaying the conffiles."
@@ -5034,27 +5174,27 @@
 "Program uruchamiany przez B<dpkg>, gdy trzeba uruchomić nową sesję powłoki."
 
 #. type: TP
-#: dpkg.1:692
+#: dpkg.1:678
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 #
 #. type: Plain text
-#: dpkg.1:695
+#: dpkg.1:681
 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:695 dpkg-query.1:201
+#: dpkg.1:681 dpkg-query.1:209
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 #
 #. type: Plain text
-#: dpkg.1:699
+#: dpkg.1:685
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
@@ -5063,53 +5203,53 @@
 "sformatowanego tekstu. Obecnie używane tylko przez opcję -l."
 
 #. type: TP
-#: dpkg.1:699
+#: dpkg.1:685
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_RUNNING_VERSION>"
 msgid "B<DPKG_SHELL_REASON>"
 msgstr "B<DPKG_RUNNING_VERSION>"
 
 #. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:689
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Current valid value: B<conffile-prompt>."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:703
+#: dpkg.1:689
 #, no-wrap
 msgid "B<DPKG_CONFFILE_OLD>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:707
+#: dpkg.1:693
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the old conffile."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:707
+#: dpkg.1:693
 #, no-wrap
 msgid "B<DPKG_CONFFILE_NEW>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:711
+#: dpkg.1:697
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the new conffile."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:711
+#: dpkg.1:697
 #, no-wrap
 msgid "B<DPKG_RUNNING_VERSION>"
 msgstr "B<DPKG_RUNNING_VERSION>"
 
 #. type: Plain text
-#: dpkg.1:715
+#: dpkg.1:701
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the version of "
 "the currently running B<dpkg> instance."
@@ -5118,13 +5258,13 @@
 "wersja aktualnie uruchomionej instancji programu B<dpkg>."
 
 #. type: TP
-#: dpkg.1:715 dpkg-divert.8:117
+#: dpkg.1:701 dpkg-divert.8:117
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
 msgstr "B<DPKG_MAINTSCRIPT_PACKAGE>"
 
 #. type: Plain text
-#: dpkg.1:719
+#: dpkg.1:705
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the package name "
 "being handled."
@@ -5133,13 +5273,13 @@
 "przetwarzanego pakietu."
 
 #. type: TP
-#: dpkg.1:719
+#: dpkg.1:705
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_ARCH>"
 msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
 
 #. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:709
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the architecture "
 "the package got built for."
@@ -5148,14 +5288,14 @@
 "architektura dla której budowano pakiet."
 
 #. type: TP
-#: dpkg.1:723
+#: dpkg.1:709
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_MAINTSCRIPT_ARCH>"
 msgid "B<DPKG_MAINTSCRIPT_NAME>"
 msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
 
 #. type: Plain text
-#: dpkg.1:727
+#: dpkg.1:713
 #, fuzzy
 #| msgid ""
 #| "Defined by B<dpkg> on the maintainer script environment to the version of "
@@ -5169,60 +5309,60 @@
 
 #
 #. type: Plain text
-#: dpkg.1:730
+#: dpkg.1:716
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr "Wyświetlenie wszystkich pakietów związanych z edytorem B<vi>(1):"
 
 #
 #. type: Plain text
-#: dpkg.1:732
+#: dpkg.1:718
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "    B<dpkg -l \\(aq*vi*\\(aq>\n"
 
 #
 #. type: Plain text
-#: dpkg.1:735
+#: dpkg.1:721
 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:737
+#: dpkg.1:723
 #, 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:740
+#: dpkg.1:726
 msgid "To search the listing of packages yourself:"
 msgstr "Samodzielne przeszukanie informacji o pakietach:"
 
 #
 #. type: Plain text
-#: dpkg.1:742
+#: dpkg.1:728
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "     B<less /var/lib/dpkg/available>\n"
 
 #
 #. type: Plain text
-#: dpkg.1:745
+#: dpkg.1:731
 msgid "To remove an installed elvis package:"
 msgstr "Wykasowanie zainstalowanego pakietu elvis:"
 
 #
 #. type: Plain text
-#: dpkg.1:747
+#: dpkg.1:733
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "     B<dpkg -r elvis>\n"
 
 #
 #. type: Plain text
-#: dpkg.1:752
+#: dpkg.1:738
 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\":"
@@ -5232,7 +5372,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:755
+#: dpkg.1:741
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     B<cd /cdrom/pool/main/v/vim>\n"
@@ -5246,20 +5386,20 @@
 
 #
 #. type: Plain text
-#: dpkg.1:758
+#: dpkg.1:744
 msgid "To make a local copy of the package selection states:"
 msgstr "Aby stworzyć kopię lokalnie wybranych pakietów:"
 
 #
 #. type: Plain text
-#: dpkg.1:760
+#: dpkg.1:746
 #, 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:764
+#: dpkg.1:750
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr ""
@@ -5267,7 +5407,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:767
+#: dpkg.1:753
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -5278,7 +5418,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:773
+#: dpkg.1:759
 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 "
@@ -5293,7 +5433,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:776
+#: dpkg.1:762
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
@@ -5302,14 +5442,14 @@
 "możliwości zmiany ich stanu."
 
 #. type: SH
-#: dpkg.1:778
+#: dpkg.1:764
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr "DODATKOWA FUNKCJONALNOŚĆ"
 
 #
 #. type: Plain text
-#: dpkg.1:781
+#: dpkg.1:767
 msgid ""
 "Additional functionality can be gained by installing any of the following "
 "packages: B<apt>, B<aptitude> and B<debsums>."
@@ -5319,7 +5459,7 @@
 
 #
 #. type: Plain text
-#: dpkg.1:793
+#: dpkg.1:779
 msgid ""
 "B<aptitude>(1), B<apt>(1), 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)."
@@ -5329,12 +5469,12 @@
 
 #
 #. type: Plain text
-#: dpkg.1:796
+#: dpkg.1:782
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> podaje raczej zbyt mało pomocnych informacji."
 
 #. type: Plain text
-#: dpkg.1:799 dpkg.cfg.5:22
+#: dpkg.1:785 dpkg.cfg.5:22
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
 "contributed to B<dpkg>."
@@ -5348,13 +5488,6 @@
 msgid "dpkg-architecture"
 msgstr "dpkg-architecture"
 
-#. type: TH
-#: dpkg-architecture.1:1
-#, fuzzy, no-wrap
-#| msgid "2009-08-16"
-msgid "2009-08-15"
-msgstr "2009-08-16"
-
 #. type: Plain text
 #: dpkg-architecture.1:4
 msgid ""
@@ -5363,12 +5496,14 @@
 
 #
 #. type: Plain text
-#: dpkg-architecture.1:9
-msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
+#: dpkg-architecture.1:8
+#, fuzzy
+#| msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
+msgid "B<dpkg-architecture> [I<option>...] [I<command>]"
 msgstr "B<dpkg-architecture> [I<opcje>] [I<polecenia>]"
 
 #. type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg-architecture.1:13
 msgid ""
 "dpkg-architecture does provide a facility to determine and set the build and "
 "host architecture for package building."
@@ -5377,7 +5512,7 @@
 "budowania oraz architektury docelowej dla budowania pakietów."
 
 #. type: Plain text
-#: dpkg-architecture.1:17
+#: dpkg-architecture.1:16
 msgid ""
 "The build architecture is always determined by an external call to B<dpkg>"
 "(1), and can not be set at the command line."
@@ -5386,7 +5521,7 @@
 "może być ustawiona w linii poleceń."
 
 #. type: Plain text
-#: dpkg-architecture.1:26
+#: dpkg-architecture.1:25
 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 "
@@ -5406,22 +5541,22 @@
 "nie będą odpowiadały wartościom domyślnym."
 
 #. type: SH
-#: dpkg-architecture.1:27 dpkg-buildflags.1:34 dpkg-deb.1:28 dpkg-divert.8:24
-#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
-#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
-#: update-alternatives.8:203
+#: dpkg-architecture.1:26 dpkg-buildflags.1:45 dpkg-deb.1:27 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:18 dpkg-split.1:31 dpkg-statoverride.8:23
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:34
+#: update-alternatives.8:202
 #, no-wrap
 msgid "COMMANDS"
 msgstr "POLECENIA"
 
 #. type: TP
-#: dpkg-architecture.1:28
+#: dpkg-architecture.1:27
 #, no-wrap
 msgid "B<-l>"
 msgstr "B<-l>"
 
 #. type: Plain text
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 msgid ""
 "Print the environment variables, one each line, in the format "
 "I<VARIABLE=value>. This is the default action."
@@ -5430,13 +5565,13 @@
 "I<ZMIENNA=wartość>. Jest to domyślna akcja."
 
 #. type: TP
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 #, no-wrap
 msgid "B<-e>I<debian-architecture>"
 msgstr "B<-e>I<architektura-debiana>"
 
 #. type: Plain text
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 msgid ""
 "Check for equality of architecture. By default I<debian-architecture> is "
 "compared against the current Debian architecture, being the host.  This "
@@ -5450,13 +5585,13 @@
 "jeśli nie było dopasowania."
 
 #. type: TP
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 #, no-wrap
 msgid "B<-i>I<architecture-wildcard>"
 msgstr "B<-i>I<maska-architektury>"
 
 #. type: Plain text
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 msgid ""
 "Check for identity of architecture by expanding I<architecture-wildcard> as "
 "an architecture wildcard and comparing against the current Debian "
@@ -5469,24 +5604,24 @@
 "jeśli nie było dopasowania."
 
 #. type: TP
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 #, no-wrap
 msgid "B<-q>I<variable-name>"
 msgstr "B<-q>I<nazwa-zmiennej>"
 
 #. type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 msgid "Print the value of a single variable."
 msgstr "Wyświetla wartość pojedynczej zmiennej."
 
 #. type: TP
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 #, no-wrap
 msgid "B<-s>"
 msgstr "B<-s>"
 
 #. type: Plain text
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 msgid ""
 "Print an export command. This can be used to set the environment variables "
 "using eval."
@@ -5495,26 +5630,26 @@
 "środowiskowych za pomocą eval."
 
 #. type: TP
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 #, no-wrap
 msgid "B<-u>"
 msgstr "B<-u>"
 
 #. type: Plain text
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 "Wyświetla polecenie podobne do B<-s>, jednakże ze wszystkimi zmiennymi "
 "nieustawionymi."
 
 #. type: TP
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 #, no-wrap
 msgid "B<-c>I< command>"
 msgstr "B<-c>I< polecenie>"
 
 #. type: Plain text
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 msgid ""
 "Execute a I<command> in an environment which has all variables set to the "
 "determined value."
@@ -5523,71 +5658,71 @@
 "wyznaczone wartości. "
 
 #. type: TP
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 #, no-wrap
 msgid "B<-L>"
 msgstr "B<-L>"
 
 #. type: Plain text
-#: dpkg-architecture.1:61
+#: dpkg-architecture.1:60
 msgid "Print a list of valid architecture names."
 msgstr "Wyświetla listę poprawnych nazw architektur."
 
 #. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildflags.1:74 dpkg-buildpackage.1:226
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-architecture.1:63 dpkg-buildflags.1:92 dpkg-buildpackage.1:226
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:175
 #: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
-#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:93
-#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
-#: update-alternatives.8:320
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-name.1:61
+#: dpkg-parsechangelog.1:36 dpkg-query.1:113 dpkg-scanpackages.1:99
+#: dpkg-scansources.1:68 dpkg-shlibdeps.1:218 dpkg-source.1:99
+#: dpkg-split.1:129 dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31
+#: update-alternatives.8:319
 msgid "Show the usage message and exit."
 msgstr "Wyświetla informację o użytkowaniu i kończy działanie."
 
 #
 #. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildflags.1:77 dpkg-buildpackage.1:229
-#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-architecture.1:66 dpkg-buildflags.1:95 dpkg-buildpackage.1:229
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:178
 #: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
-#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
-#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:96
-#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
-#: update-alternatives.8:323
+#: dpkg-gensymbols.1:449 dpkg-mergechangelogs.1:44 dpkg-name.1:64
+#: dpkg-parsechangelog.1:39 dpkg-query.1:116 dpkg-scanpackages.1:102
+#: dpkg-scansources.1:70 dpkg-shlibdeps.1:221 dpkg-source.1:102
+#: dpkg-split.1:132 dpkg-statoverride.8:50 dpkg-trigger.1:37 dpkg-vendor.1:34
+#: update-alternatives.8:322
 msgid "Show the version and exit."
 msgstr "Wyświetla informację o wersji i pomyślnie kończy działanie."
 
 #. type: TP
-#: dpkg-architecture.1:69
+#: dpkg-architecture.1:68
 #, no-wrap
 msgid "B<-a>I<debian-architecture>"
 msgstr "B<-a>I<architektura-debiana>"
 
 #. type: Plain text
-#: dpkg-architecture.1:72
+#: dpkg-architecture.1:71
 msgid "Set the Debian architecture."
 msgstr "Ustawia architekturę Debiana."
 
 #. type: TP
-#: dpkg-architecture.1:72 dpkg-buildpackage.1:110
+#: dpkg-architecture.1:71 dpkg-buildpackage.1:110
 #, 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:74
 msgid "Set the GNU system type."
 msgstr "Ustawia typ systemu GNU."
 
 #. type: TP
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 #, no-wrap
 msgid "B<-f>"
 msgstr "B<-f>"
 
 #. type: Plain text
-#: dpkg-architecture.1:82
+#: dpkg-architecture.1:81
 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 "
@@ -5602,41 +5737,41 @@
 "głęboko w jakimś innym skrypcie (np. B<dpkg-buildpackage>(1))."
 
 #. type: SH
-#: dpkg-architecture.1:83
+#: dpkg-architecture.1:82
 #, no-wrap
 msgid "TERMS"
 msgstr "WARUNKI"
 
 #. type: IP
-#: dpkg-architecture.1:84
+#: dpkg-architecture.1:83
 #, no-wrap
 msgid "build machine"
 msgstr "maszyna budowania"
 
 #. type: Plain text
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 msgid "The machine the package is built on."
 msgstr "Rodzaj maszyny, na której pakiet jest budowany."
 
 #. type: IP
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 #, no-wrap
 msgid "host machine"
 msgstr "maszyna docelowa"
 
 #. type: Plain text
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 msgid "The machine the package is built for."
 msgstr "Rodzaj maszyny, dla której pakiet jest budowany."
 
 #. type: IP
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 #, no-wrap
 msgid "Debian architecture"
 msgstr "architektura Debiana"
 
 #. type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 msgid ""
 "The Debian architecture string, which specifies the binary tree in the "
 "\\s-1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
@@ -5645,13 +5780,13 @@
 "binarne w archiwum \\s-1FTP\\s0. Przykłady: i386, sparc, hurd-i386."
 
 #. type: IP
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 #, no-wrap
 msgid "architecture wildcard"
 msgstr "maska architektury"
 
 #. type: Plain text
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 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>-"
@@ -5663,13 +5798,13 @@
 "i386, hurd-any."
 
 #. type: IP
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 #, no-wrap
 msgid "\\s-1GNU\\s0 system type"
 msgstr "typ systemu \\s-1GNU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:99
+#: dpkg-architecture.1:98
 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, "
@@ -5680,115 +5815,115 @@
 "linux-gnu, i386-gnu, x86_64-netbsd."
 
 #. type: SH
-#: dpkg-architecture.1:100
+#: dpkg-architecture.1:99
 #, no-wrap
 msgid "VARIABLES"
 msgstr "ZMIENNE"
 
 #. type: Plain text
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 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:101
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 msgid "The Debian architecture of the build machine."
 msgstr "Architektura wg Debiana komputera, na którym budowany jest pakiet."
 
 #. type: IP
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 #, 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:105
 msgid "The Debian system name of the build machine."
 msgstr "Nazwa systemu wg Debiana komputera, na którym budowany jest pakiet."
 
 #. type: IP
-#: dpkg-architecture.1:106
+#: dpkg-architecture.1:105
 #, 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:107
 msgid "The Debian cpu name of the build machine."
 msgstr "Nazwa procesora wg Debiana komputera, na którym budowany jest pakiet."
 
 #. type: IP
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 msgid "The pointer size of the build machine (in bits)."
 msgstr "Rozmiar wskaźnika na komputerze budującym (w bitach)."
 
 #. type: IP
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 msgid "The endianness of the build machine (little / big)."
 msgstr "Kolejność bajtów (endian) na komputerze budującym (little / big)."
 
 #. type: IP
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 #, fuzzy
 #| msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
 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:114
+#: dpkg-architecture.1:113
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 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:116
+#: dpkg-architecture.1:115
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr "Typ systemu \\s-1GNU\\s0 komputera, na którym budowany jest pakiet."
 
 #. type: IP
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 #, fuzzy, no-wrap
 #| msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgid "\\s-1DEB_BUILD_MULTIARCH\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 #, fuzzy
 #| msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgid ""
@@ -5797,104 +5932,104 @@
 msgstr "Typ systemu \\s-1GNU\\s0 komputera, na którym budowany jest pakiet."
 
 #. type: IP
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr "\\s-1DEB_HOST_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 msgid "The Debian architecture of the host machine."
 msgstr "Architektura wg Debiana dla maszyny docelowej."
 
 #. type: IP
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_OS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 msgid "The Debian system name of the host machine."
 msgstr "Nazwa systemu wg Debiana dla maszyny docelowej."
 
 #. type: IP
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 msgid "The Debian cpu name of the host machine."
 msgstr "Nazwa procesora wg Debiana dla maszyny docelowej."
 
 #. type: IP
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 #, fuzzy, no-wrap
 #| msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgid "\\s-1DEB_HOST_ARCH_BITS\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_OS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 msgid "The pointer size of the host machine (in bits)."
 msgstr "Rozmiar wskaźnika na maszynie docelowej (w bitach)."
 
 #. type: IP
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 #, fuzzy, no-wrap
 #| msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgid "\\s-1DEB_HOST_ARCH_ENDIAN\\s0"
 msgstr "\\s-1DEB_HOST_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 msgid "The endianness of the host machine (little / big)."
 msgstr "Kolejność bajtów (endian) na maszynie docelowej (little / big)."
 
 #. type: IP
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr "\\s-1DEB_HOST_GNU_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr "Część dotycząca \\s-1CUP\\s0 z \\s-1DEB_HOST_GNU_TYPE\\s0."
 
 #. type: IP
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr "Część dotycząca systemu z \\s-1DEB_HOST_GNU_TYPE\\s0."
 
 #. type: IP
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr "\\s-1DEB_HOST_GNU_TYPE\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgstr "Typ systemu \\s-1GNU\\s0 dla maszyny docelowej."
 
 #. type: IP
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 #, fuzzy, no-wrap
 #| msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgid "\\s-1DEB_HOST_MULTIARCH\\s0"
 msgstr "\\s-1DEB_HOST_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:140
+#: dpkg-architecture.1:139
 #, fuzzy
 #| msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgid ""
@@ -5903,13 +6038,13 @@
 msgstr "Typ systemu \\s-1GNU\\s0 dla maszyny docelowej."
 
 #. type: SH
-#: dpkg-architecture.1:141
+#: dpkg-architecture.1:140
 #, no-wrap
 msgid "DEBIAN/RULES"
 msgstr "DEBIAN/RULES"
 
 #. type: Plain text
-#: dpkg-architecture.1:149
+#: dpkg-architecture.1:148
 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 "
@@ -5926,12 +6061,12 @@
 "pokazują, jak można polepszyć wsparcie dla kompilacji krzyżowej pakietu:"
 
 #. type: Plain text
-#: dpkg-architecture.1:152 dpkg-architecture.1:169
+#: dpkg-architecture.1:151 dpkg-architecture.1:168
 msgid "Instead of:"
 msgstr "Zamiast:"
 
 #. type: Plain text
-#: dpkg-architecture.1:156
+#: dpkg-architecture.1:155
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5941,12 +6076,12 @@
 "configure $(\\s-1ARCH\\s0)-linux\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:159
+#: dpkg-architecture.1:158
 msgid "please use the following:"
 msgstr "proszę używać:"
 
 #. type: Plain text
-#: dpkg-architecture.1:163
+#: dpkg-architecture.1:162
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
@@ -5956,13 +6091,13 @@
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:165
+#: dpkg-architecture.1:164
 #, 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:175
+#: dpkg-architecture.1:174
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5976,18 +6111,18 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:178
+#: dpkg-architecture.1:177
 msgid "please use:"
 msgstr "proszę używać:"
 
 #. type: Plain text
-#: dpkg-architecture.1:181
+#: dpkg-architecture.1:180
 #, 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:185
+#: dpkg-architecture.1:184
 #, no-wrap
 msgid ""
 "ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
@@ -5999,7 +6134,7 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:189
+#: dpkg-architecture.1:188
 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."
@@ -6008,7 +6143,7 @@
 "DEB_HOST_ARCH_CPU lub DEB_HOST_ARCH_OS."
 
 #. type: Plain text
-#: dpkg-architecture.1:194
+#: dpkg-architecture.1:193
 msgid ""
 "In general, calling dpkg in the rules file to get architecture information "
 "is deprecated (unless you want to provide backward compatibility, see "
@@ -6022,13 +6157,13 @@
 "równe nazwie procesora."
 
 #. type: SH
-#: dpkg-architecture.1:195
+#: dpkg-architecture.1:194
 #, no-wrap
 msgid "BACKWARD COMPATIBILITY"
 msgstr "KOMPATYBILNOŚĆ WSTECZNA"
 
 #. type: Plain text
-#: dpkg-architecture.1:199
+#: dpkg-architecture.1:198
 msgid ""
 "The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced in dpkg-"
 "dev 1.15.4. Using them in I<debian/rules> thus requires a build-dependency "
@@ -6039,7 +6174,7 @@
 "budowania dla dpkg-dev (E<gt>= 1.15.4)."
 
 #. type: Plain text
-#: dpkg-architecture.1:204
+#: dpkg-architecture.1:203
 msgid ""
 "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in dpkg-"
 "dev 1.13.2. Before this I<debian/rules> files tended to check the values of "
@@ -6052,7 +6187,7 @@
 "zostały zmienione."
 
 #. type: Plain text
-#: dpkg-architecture.1:209
+#: dpkg-architecture.1:208
 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 "
@@ -6065,7 +6200,7 @@
 "poprzednimi wersjami dpkg-dev, można użyć następującego kodu:"
 
 #. type: Plain text
-#: dpkg-architecture.1:213
+#: dpkg-architecture.1:212
 #, no-wrap
 msgid ""
 "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
@@ -6075,7 +6210,7 @@
 "DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:227
+#: dpkg-architecture.1:226
 #, no-wrap
 msgid ""
 "# Take account of old dpkg-architecture output.\n"
@@ -6107,12 +6242,12 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:230
+#: dpkg-architecture.1:229
 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:233
+#: dpkg-architecture.1:232
 msgid ""
 "If you still wish to support versions of dpkg-dev that did not include "
 "B<dpkg-architecture>, the following does the job:"
@@ -6121,7 +6256,7 @@
 "architecture>, to poniższy kod wykonuje to zadanie:"
 
 #. type: Plain text
-#: dpkg-architecture.1:243
+#: dpkg-architecture.1:242
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
@@ -6143,7 +6278,7 @@
 "DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:248
+#: dpkg-architecture.1:247
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
@@ -6157,7 +6292,7 @@
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:252
+#: dpkg-architecture.1:251
 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."
@@ -6166,7 +6301,7 @@
 "będą nadpisane przez dpkg-architecture, jeśli jest używane."
 
 #. type: Plain text
-#: dpkg-architecture.1:259
+#: dpkg-architecture.1:258
 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 "
@@ -6184,7 +6319,7 @@
 "zachować wsteczną zgodność z natywną kompilacją)."
 
 #. type: Plain text
-#: dpkg-architecture.1:262
+#: dpkg-architecture.1:261
 msgid ""
 "The B<-e> and B<-i> options were only introduced in relatively recent "
 "versions of B<dpkg-architecture> (since dpkg 1.13.13)."
@@ -6193,7 +6328,7 @@
 "architecture> (od wersji dpkg 1.13.13)."
 
 #. type: Plain text
-#: dpkg-architecture.1:266
+#: dpkg-architecture.1:265
 msgid ""
 "B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
 "architecture>. Other examples:"
@@ -6202,34 +6337,34 @@
 "architecture>. Inne przykłady:"
 
 #. type: Plain text
-#: dpkg-architecture.1:268
+#: dpkg-architecture.1:267
 msgid "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 msgstr "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 
 #. type: Plain text
-#: dpkg-architecture.1:270
+#: dpkg-architecture.1:269
 msgid "eval \\`dpkg-architecture -u\\`"
 msgstr "eval \\`dpkg-architecture -u\\`"
 
 #. type: Plain text
-#: dpkg-architecture.1:273
+#: dpkg-architecture.1:272
 msgid ""
 "Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
 "Sprawdzanie, czy architektura jest równa architekturze bieżącej lub podanej:"
 
 #. type: Plain text
-#: dpkg-architecture.1:275
+#: dpkg-architecture.1:274
 msgid "dpkg-architecture -elinux-alpha"
 msgstr "dpkg-architecture -elinux-alpha"
 
 #. type: Plain text
-#: dpkg-architecture.1:277
+#: dpkg-architecture.1:276
 msgid "dpkg-architecture -amips -elinux-mips"
 msgstr "dpkg-architecture -amips -elinux-mips"
 
 #. type: Plain text
-#: dpkg-architecture.1:280
+#: dpkg-architecture.1:279
 msgid ""
 "Check if the current architecture or an architecture provided with -a are "
 "Linux systems:"
@@ -6237,69 +6372,74 @@
 "Sprawdzanie, czy architektura bieżąca podana przez -a jest systemem Linuksa:"
 
 #. type: Plain text
-#: dpkg-architecture.1:282
+#: dpkg-architecture.1:281
 msgid "dpkg-architecture -ilinux-any"
 msgstr "dpkg-architecture -ilinux-any"
 
 #. type: Plain text
-#: dpkg-architecture.1:284
+#: dpkg-architecture.1:283
 msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr "dpkg-architecture -ai386 -ilinux-any"
 
 #. type: Plain text
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
+#, fuzzy
+#| msgid ""
+#| "All these files have to be present for B<dpkg-architecture> to work. "
+#| "Their location can be overridden at runtime with the environment variable "
+#| "DPKG_DATADIR."
 msgid ""
 "All these files have to be present for B<dpkg-architecture> to work. Their "
 "location can be overridden at runtime with the environment variable "
-"DPKG_DATADIR."
+"B<DPKG_DATADIR>."
 msgstr ""
 "Wszystkie te pliki muszą być obecne, aby B<dpkg-architecture> w ogóle "
 "działał. Ich położenie możnazmienić w czasie działania programu przez "
 "ustawienie zmiennej środowiskowej DPKG_DATADIR."
 
 #. type: TP
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 #, no-wrap
 msgid "I</usr/share/dpkg/cputable>"
 msgstr "I</usr/share/dpkg/cputable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 msgid "Table of known CPU names and mapping to their GNU name."
 msgstr "Tabela znanych nazw procesorów i ich mapowanie na nazwy GNU."
 
 #. type: TP
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 #, no-wrap
 msgid "I</usr/share/dpkg/ostable>"
 msgstr "I</usr/share/dpkg/ostable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 msgid "Table of known operating system names and mapping to their GNU name."
 msgstr ""
 "Tabela nazw znanych systemów operacyjnych i ich mapowanie na nazwy GNU."
 
 #. type: TP
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 #, no-wrap
 msgid "I</usr/share/dpkg/triplettable>"
 msgstr "I</usr/share/dpkg/triplettable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:299
+#: dpkg-architecture.1:298
 msgid ""
 "Mapping between Debian architecture triplets and Debian architecture names."
 msgstr ""
 "Mapowanie między trójkami architektur Debiana a nazwami architektur Debiana."
 
 #. type: Plain text
-#: dpkg-architecture.1:303
+#: dpkg-architecture.1:302
 msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 msgstr "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 
 #. type: Plain text
-#: dpkg-architecture.1:308
+#: dpkg-architecture.1:307
 msgid ""
 "B<dpkg-architecture> and this man page were initially written by Marcus "
 "Brinkmann E<lt>brinkmd@debian.orgE<gt>."
@@ -6314,7 +6454,7 @@
 msgstr "dpkg.cfg"
 
 #. type: TH
-#: dpkg.cfg.5:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1
 #, no-wrap
 msgid "2009-09-05"
 msgstr "2009-09-05"
@@ -6350,7 +6490,7 @@
 msgstr "I<~/.dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:214 dpkg-statoverride.8:87
+#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:222 dpkg-statoverride.8:86
 msgid "B<dpkg>(1)."
 msgstr "B<dpkg>(1)."
 
@@ -6361,6 +6501,13 @@
 msgid "dpkg-buildflags"
 msgstr "dpkg-buildpackage"
 
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+#| msgid "2007-03-07"
+msgid "2011-09-13"
+msgstr "2007-03-07"
+
 #. type: Plain text
 #: dpkg-buildflags.1:4
 msgid "dpkg-buildflags - returns build flags to use during package build"
@@ -6370,7 +6517,7 @@
 #: dpkg-buildflags.1:8
 #, fuzzy
 #| msgid "B<dpkg-trigger> [I<option>...] I<command>"
-msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgid "B<dpkg-buildflags> [I<option>...] [I<command>]"
 msgstr "B<dpkg-trigger> [I<opcja>...] I<polecenie>"
 
 #. type: Plain text
@@ -6419,106 +6566,170 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:22
+#: dpkg-buildflags.1:23
+#, fuzzy
+#| msgid ""
+#| "It prepares the build environment by setting various environment "
+#| "variables (see B<ENVIRONMENT VARIABLES>)."
+msgid ""
+"temporarily by the user with environment variables (see section "
+"B<ENVIRONMENT>);"
+msgstr ""
+"Przygotowuje środowisko budowania poprzez ustawienie różnych zmiennych "
+"środowiska (patrz B<ZMIENNE ŚRODOWISKA>)."
+
+#. type: IP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "4."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
 #, fuzzy
 #| msgid ""
 #| "It prepares the build environment by setting various environment "
 #| "variables (see B<ENVIRONMENT VARIABLES>)."
-msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+msgid ""
+"dynamically by the package maintainer with environment variables set via "
+"B<debian/rules> (see section B<ENVIRONMENT>)."
 msgstr ""
 "Przygotowuje środowisko budowania poprzez ustawienie różnych zmiennych "
 "środowiska (patrz B<ZMIENNE ŚRODOWISKA>)."
 
 #. type: Plain text
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 msgid "The configuration files can contain two types of directives:"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 #, no-wrap
 msgid "B<SET>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
 msgid "Override the flag named I<flag> to have the value I<value>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
+#, no-wrap
+msgid "B<STRIP>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:34
+msgid ""
+"Strip from the flag named I<flag> all the build flags listed in I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
 #, no-wrap
 msgid "B<APPEND>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:31
+#: dpkg-buildflags.1:38
 msgid ""
-"Extend the flag named I<flag> with the options given in I<value>.  A space "
-"is prepended to the appended value if the flag's current value is non-empty."
+"Extend the flag named I<flag> by appending the options given in I<value>.  A "
+"space is prepended to the appended value if the flag's current value is non-"
+"empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:38
+#, no-wrap
+msgid "B<PREPEND>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:34
+#: dpkg-buildflags.1:42
+msgid ""
+"Extend the flag named I<flag> by prepending the options given in I<value>.  "
+"A space is appended to the prepended value if the flag's current value is "
+"non-empty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:45
 msgid ""
 "The configuration files can contain comments on lines starting with a hash "
 "(#). Empty lines are also ignored."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:35
+#: dpkg-buildflags.1:46
+#, fuzzy, no-wrap
+#| msgid "B<--debug>"
+msgid "B<--dump>"
+msgstr "B<--debug>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:51
+msgid ""
+"Print to standard output all compilation flags and their values. It prints "
+"one flag per line separated from its value by an equal sign "
+"(\"I<flag>=I<value>\"). This is the default action."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:51
 #, fuzzy, no-wrap
 #| msgid "B<list>"
 msgid "B<--list>"
 msgstr "B<list>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 msgid ""
 "Print the list of flags supported by the current vendor (one per line). See "
 "the B<SUPPORTED FLAGS> section for more information about them."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 #, fuzzy, no-wrap
 #| msgid "B<--showformat=>I<format>"
 msgid "B<--export=>I<format>"
 msgstr "B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 msgid ""
 "Print to standard output shell (if I<format> is B<sh>) or make (if I<format> "
 "is B<make>) commands that can be used to export all the compilation flags in "
-"the environment. If the I<format> value is not given, B<sh> is assumed. Only "
-"compilation flags starting with an upper case character are included, others "
-"are assumed to not be suitable for the environment."
+"the environment. If I<format> is B<configure> then the output can be used on "
+"a B<./configure> command-line. If the I<format> value is not given, B<sh> is "
+"assumed. Only compilation flags starting with an upper case character are "
+"included, others are assumed to not be suitable for the environment."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 #, fuzzy, no-wrap
 #| msgid "B<--log>I< file>"
 msgid "B<--get>I< flag>"
 msgstr "B<--log>I< plik>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 msgid ""
 "Print the value of the flag on standard output. Exits with 0 if the flag is "
 "known otherwise exits with 1."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 #, fuzzy, no-wrap
 #| msgid "B<--log>I< file>"
 msgid "B<--origin>I< flag>"
 msgstr "B<--log>I< plik>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:57
+#: dpkg-buildflags.1:75
 msgid ""
 "Print the origin of the value that is returned by B<--get>. Exits with 0 if "
 "the flag is known otherwise exits with 1. The origin can be one of the "
@@ -6526,67 +6737,67 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:58
+#: dpkg-buildflags.1:76
 #, fuzzy, no-wrap
 #| msgid "B<--is>I< vendor>"
 msgid "B<vendor>"
 msgstr "B<--is>I< twórca>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 msgid "the original flag set by the vendor is returned;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 #, fuzzy, no-wrap
 #| msgid "B<-sr>"
 msgid "B<system>"
 msgstr "B<-sr>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 msgid "the flag is set/modified by a system-wide configuration;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 #, fuzzy, no-wrap
 #| msgid "B<query>"
 msgid "B<user>"
 msgstr "B<query>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 msgid "the flag is set/modified by a user-specific configuration;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 #, fuzzy, no-wrap
 #| msgid "B<-v>"
 msgid "B<env>"
 msgstr "B<-v>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:70
+#: dpkg-buildflags.1:88
 msgid "the flag is set/modified by an environment-specific configuration."
 msgstr ""
 
 #. type: SH
-#: dpkg-buildflags.1:78
+#: dpkg-buildflags.1:96
 #, no-wrap
 msgid "SUPPORTED FLAGS"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:79
+#: dpkg-buildflags.1:97
 #, no-wrap
 msgid "B<CFLAGS>"
 msgstr "B<CFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 msgid ""
 "Options for the C compiler. The default value set by the vendor includes I<-"
 "g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
@@ -6594,46 +6805,46 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 #, no-wrap
 msgid "B<CPPFLAGS>"
 msgstr "B<CPPFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 msgid "Options for the C preprocessor. Default value: empty."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 #, no-wrap
 msgid "B<CXXFLAGS>"
 msgstr "B<CXXFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 msgid "Options for the C++ compiler. Same as B<CFLAGS>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 #, no-wrap
 msgid "B<FFLAGS>"
 msgstr "B<FFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 #, no-wrap
 msgid "B<LDFLAGS>"
 msgstr "B<LDFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:102
+#: dpkg-buildflags.1:120
 msgid ""
 "Options passed to the compiler when linking executables or shared objects "
 "(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
@@ -6644,79 +6855,346 @@
 "i B<,> muszą być usunięte z tych opcji). Wartość domyślna: puste."
 
 #. type: TP
-#: dpkg-buildflags.1:104
+#: dpkg-buildflags.1:122
 #, fuzzy, no-wrap
 #| msgid "I</etc/dpkg/dpkg.cfg>"
 msgid "B</etc/dpkg/buildflags.conf>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 #, fuzzy
 #| msgid "dselect.cfg - dselect configuration file"
 msgid "System wide configuration file."
 msgstr "dselect.cfg - plik konfiguracyjny programu dselect "
 
 #. type: TP
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 #, no-wrap
 msgid "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or B<$HOME/.config/dpkg/buildflags.conf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:110
+#: dpkg-buildflags.1:128
 #, fuzzy
 #| msgid "dselect.cfg - dselect configuration file"
 msgid "User configuration file."
 msgstr "dselect.cfg - plik konfiguracyjny programu dselect "
 
+#. type: Plain text
+#: dpkg-buildflags.1:135
+msgid ""
+"There are 2 sets of environment variables doing the same operations, the "
+"first one (DEB_I<flag>_I<op>) should never be used within B<debian/rules>. "
+"It's meant for any user that wants to rebuild the source package with "
+"different build flags. The second set (DEB_I<flag>_MAINT_I<op>) should only "
+"be used in B<debian/rules> by package maintainers to change the resulting "
+"build flags."
+msgstr ""
+
 #. type: TP
-#: dpkg-buildflags.1:111
+#: dpkg-buildflags.1:135
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_SET>"
 msgstr ""
 
+#. type: TQ
+#: dpkg-buildflags.1:137
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_SET>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
 msgid ""
 "This variable can be used to force the value returned for the given I<flag>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_STRIP>"
+msgstr ""
+
+#. type: TQ
+#: dpkg-buildflags.1:143
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_STRIP>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:148
+msgid ""
+"This variable can be used to provide a space separated list of options that "
+"will be stripped from the set of flags returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:148
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_APPEND>"
 msgstr ""
 
+#. type: TQ
+#: dpkg-buildflags.1:150
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_APPEND>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:119
+#: dpkg-buildflags.1:154
 msgid ""
 "This variable can be used to append supplementary options to the value "
 "returned for the given I<flag>."
 msgstr ""
 
-#. type: Plain text
-#: dpkg-buildflags.1:122 dpkg-maintscript-helper.1:130
-#, fuzzy
-#| msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
-msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
-msgstr "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+#. type: TP
+#: dpkg-buildflags.1:154
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_PREPEND>"
+msgstr ""
 
-#. type: TH
-#: dpkg-buildpackage.1:1
+#. type: TQ
+#: dpkg-buildflags.1:156
 #, no-wrap
-msgid "dpkg-buildpackage"
-msgstr "dpkg-buildpackage"
+msgid "B<DEB_>I<flag>B<_MAINT_PREPEND>"
+msgstr ""
 
 #. type: Plain text
-#: dpkg-buildpackage.1:4
-msgid "dpkg-buildpackage - build binary or source packages from sources"
-msgstr "dpkg-buildpackage - buduje pakiety źródłowe lub binarne ze źródeł"
+#: dpkg-buildflags.1:160
+msgid ""
+"This variable can be used to prepend supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
 
-#
+#. type: TP
+#: dpkg-buildflags.1:160
+#, no-wrap
+msgid "B<DEB_BUILD_MAINT_OPTIONS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:165
+msgid ""
+"This variable can be used to disable/enable various hardening build flags "
+"through the B<hardening> option. See the B<HARDENING> section for details."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:166
+#, fuzzy, no-wrap
+#| msgid "WARNING"
+msgid "HARDENING"
+msgstr "UWAGA"
+
+#. type: Plain text
+#: dpkg-buildflags.1:171
+msgid ""
+"Several compile-time options (detailed below) can be used to help harden a "
+"resulting binary against memory corruption attacks, or provide additional "
+"warning messages during compilation. Except as noted below, these are "
+"enabled by default for architectures that support them."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:177
+msgid ""
+"Each hardening feature can be enabled and disabled in the "
+"B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value with "
+"the \"+\" and \"-\" modifier. For example, to enable the \"pie\" feature and "
+"disable the \"fortify\" feature you can do this in B<debian/rules>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:179
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:183
+msgid ""
+"The special feature B<all> can be used to enable or disable all hardening "
+"features at the same time. Thus disabling everything and enabling only "
+"\"format\" and \"fortify\" can be achieved with:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:185
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:186
+#, fuzzy, no-wrap
+#| msgid "B<Format>"
+msgid "B<format>"
+msgstr "B<Format>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:198
+msgid ""
+"This setting (enabled by default) adds B<-Wformat -Wformat-security -"
+"Werror=format-security> to B<CFLAGS> and B<CXXFLAGS>. This will warn about "
+"improper format string uses, and will fail when format functions are used in "
+"a way that that represent possible security problems. At present, this warns "
+"about calls to B<printf> and B<scanf> functions where the format string is "
+"not a string literal and there are no format arguments, as in B<printf(foo);"
+"> instead of B<printf(\"%s\", foo);> This may be a security hole if the "
+"format string came from untrusted input and contains \"%n\"."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:199
+#, no-wrap
+msgid "B<fortify>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:210
+msgid ""
+"This setting (enabled by default) adds B<-D_FORTIFY_SOURCE=2> to "
+"B<CPPFLAGS>. During code generation the compiler knows a great deal of "
+"information about buffer sizes (where possible), and attempts to replace "
+"insecure unlimited length buffer function calls with length-limited ones. "
+"This is especially useful for old, crufty code.  Additionally, format "
+"strings in writable memory that contain '%n' are blocked. If an application "
+"depends on such a format string, it will need to be worked around."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:213
+msgid ""
+"Note that for this option to have any effect, the source must also be "
+"compiled with B<-O1> or higher."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:213
+#, no-wrap
+msgid "B<stackprotector>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:222
+msgid ""
+"This setting (enabled by default) adds B<-fstack-protector --param=ssp-"
+"buffer-size=4> to B<CFLAGS> and B<CXXFLAGS>. This adds safety checks against "
+"stack overwrites. This renders many potential code injection attacks into "
+"aborting situations. In the best case this turns code injection "
+"vulnerabilities into denial of service or into non-issues (depending on the "
+"application)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:226
+msgid ""
+"This feature requires linking against glibc (or another provider of "
+"B<__stack_chk_fail>), so needs to be disabled when building with B<-"
+"nostdlib> or B<-ffreestanding> or similar."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:227
+#, fuzzy, no-wrap
+#| msgid "B<purge>"
+msgid "B<relro>"
+msgstr "B<purge (wyczyszczenie)>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:235
+msgid ""
+"This setting (enabled by default) adds B<-Wl,-z,relro> to B<LDFLAGS>.  "
+"During program load, several ELF memory sections need to be written to by "
+"the linker. This flags the loader to turn these sections read-only before "
+"turning over control to the program. Most notably this prevents GOT "
+"overwrite attacks."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:236
+#, no-wrap
+msgid "B<bindnow>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:243
+msgid ""
+"This setting (disabled by default) adds B<-Wl,-z,now> to B<LDFLAGS>. During "
+"program load, all dynamic symbols are resolved, allowing for the entire PLT "
+"to be marked read-only (due to B<relro> above)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:244
+#, no-wrap
+msgid "B<pie>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:256
+msgid ""
+"This setting (disabled by default) adds B<-fPIE> to B<CFLAGS> and "
+"B<CXXFLAGS>, and B<-fPIE -pie> to B<LDFLAGS>. Position Independent "
+"Executable are needed to take advantage of Address Space Layout "
+"Randomization, supported by some kernel versions. While ASLR can already be "
+"enforced for data areas in the stack and heap (brk and mmap), the code areas "
+"must be compiled as position-independent. Shared libraries already do this (-"
+"fPIC), so they gain ASLR automatically, but binary .text regions need to be "
+"build PIE to gain ASLR. When this happens, ROP (Return Oriented Programming) "
+"attacks are much harder since there are no static locations to bounce off of "
+"during a memory corruption attack."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:259
+msgid ""
+"This is not compatible with B<-fPIC> so care must be taken when building "
+"shared objects."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:265
+msgid ""
+"Additionally, since PIE is implemented via a general register, some "
+"architectures (most notably i386) can see performance losses of up to 15% in "
+"very text-segment-heavy application workloads; most workloads see less than "
+"1%. Architectures with more general registers (e.g. amd64)  do not see as "
+"high a worst-case penalty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:268
+#, fuzzy
+#| msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2010-2011 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
+
+#. type: Plain text
+#: dpkg-buildflags.1:270
+#, fuzzy
+#| msgid "Copyright \\(co 2001 Joey Hess"
+msgid "Copyright \\(co 2011 Kees Cook"
+msgstr "Copyright \\(co 2001 Joey Hess"
+
+#. type: TH
+#: dpkg-buildpackage.1:1
+#, no-wrap
+msgid "dpkg-buildpackage"
+msgstr "dpkg-buildpackage"
+
+#. type: Plain text
+#: dpkg-buildpackage.1:4
+msgid "dpkg-buildpackage - build binary or source packages from sources"
+msgstr "dpkg-buildpackage - buduje pakiety źródłowe lub binarne ze źródeł"
+
+#
 #. type: Plain text
 #: dpkg-buildpackage.1:8
-msgid "B<dpkg-buildpackage> [I<options>]"
+#, fuzzy
+#| msgid "B<dpkg-buildpackage> [I<options>]"
+msgid "B<dpkg-buildpackage> [I<option>...]"
 msgstr "B<dpkg-buildpackage> [I<opcje>]"
 
 #. type: Plain text
@@ -6808,6 +7286,13 @@
 
 #. type: Plain text
 #: dpkg-buildpackage.1:36
+#, fuzzy
+#| msgid ""
+#| "It calls B<debian/rules> B<build> followed by B<fakeroot debian/rules> "
+#| "I<binary-target> (unless a source-only build has been requested with B<-"
+#| "S>). Note that I<binary-target> is either B<binary> (default case, or if "
+#| "B<-b> is specified)  or B<binary-arch> (if B<-B> is specified) or "
+#| "B<binary-indep> (if B<-A> is specified)."
 msgid ""
 "It calls B<debian/rules> B<build> followed by B<fakeroot debian/rules> "
 "I<binary-target> (unless a source-only build has been requested with B<-S>). "
@@ -7020,7 +7505,7 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:96 dpkg-genchanges.1:49 dpkg-gencontrol.1:38
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 #, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<-v>I<wersja>"
@@ -7120,7 +7605,7 @@
 "jeżeli nie będą spełnione. Jest to zachowanie domyślne."
 
 #. type: TP
-#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:427
+#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:432
 #, no-wrap
 msgid "B<-d>"
 msgstr "B<-d>"
@@ -7337,8 +7822,8 @@
 
 #
 #. type: Plain text
-#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:116
-#: dpkg-shlibdeps.1:217 dpkg-trigger.1:43
+#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:122
+#: dpkg-shlibdeps.1:215 dpkg-trigger.1:43
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
 "lib/dpkg>."
@@ -7347,10 +7832,10 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:223 dpkg-checkbuilddeps.1:33 dpkg-distaddfile.1:32
-#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
-#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
-#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:90 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-deb.1:172 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
+#: dpkg-gensymbols.1:443 dpkg-name.1:58 dpkg-parsechangelog.1:33
+#: dpkg-query.1:110 dpkg-scanpackages.1:96 dpkg-shlibdeps.1:215
+#: dpkg-source.1:96 dpkg-split.1:126 dpkg-trigger.1:31
 #, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr "B<-h>, B<--help>"
@@ -7358,7 +7843,7 @@
 #. type: Plain text
 #: dpkg-buildpackage.1:234
 msgid ""
-"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"Even if B<dpkg-buildpackage> exports some variables, B<debian/rules> should "
 "not rely on their presence and should instead use the respective interface "
 "to retrieve the needed values."
 msgstr ""
@@ -7383,15 +7868,15 @@
 #. type: SS
 #: dpkg-buildpackage.1:238
 #, no-wrap
-msgid "Compiler flags"
-msgstr "Flagi kompilatora"
+msgid "Compiler flags are no longer exported"
+msgstr ""
 
 #. type: Plain text
 #: dpkg-buildpackage.1:243
 msgid ""
-"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
-"environment variables are set to the values that B<dpkg-buildflags> "
-"returned. See its manual page for more information."
+"Between versions 1.14.17 and 1.16.1, B<dpkg-buildpackage> exported compiler "
+"flags (B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS>) with "
+"values as returned by B<dpkg-buildflags>. This is no longer the case."
 msgstr ""
 
 #. type: Plain text
@@ -7405,16 +7890,20 @@
 
 #
 #. type: Plain text
-#: dpkg-buildpackage.1:255
+#: dpkg-buildpackage.1:256
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
+#| "B<fakeroot>(1), B<gpg>(1)."
 msgid ""
-"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
-"B<fakeroot>(1), B<gpg>(1)."
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
+"genchanges>(1), B<fakeroot>(1), B<gpg>(1)."
 msgstr ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
 "B<fakeroot>(1), B<gpg>(1)."
 
 #. type: Plain text
-#: dpkg-buildpackage.1:264 dpkg-source.1:712
+#: dpkg-buildpackage.1:265
 #, fuzzy
 #| msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
 msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
@@ -7426,13 +7915,6 @@
 msgid "dpkg-checkbuilddeps"
 msgstr "dpkg-checkbuilddeps"
 
-#. type: TH
-#: dpkg-checkbuilddeps.1:1
-#, fuzzy, no-wrap
-#| msgid "2007-11-19"
-msgid "2009-11-21"
-msgstr "2007-11-19"
-
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:4
 msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
@@ -7441,7 +7923,9 @@
 #
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:9
-msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+#, fuzzy
+#| msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgid "B<dpkg-checkbuilddeps> [I<option>...] [I<control-file>]"
 msgstr "B<dpkg-checkbuilddeps> [I<opcje>] [I<plik-kontrolny>]"
 
 #. type: Plain text
@@ -7457,8 +7941,12 @@
 
 #. type: Plain text
 #: 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."
 msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
+"By default, B<debian/control> is read, but an alternate control filename may "
 "be specified on the command line."
 msgstr ""
 "Domyślnie będzie czytany plik I<debian/control>, jednakże w linii poleceń "
@@ -7513,7 +8001,9 @@
 #
 #. type: Plain text
 #: dpkg-distaddfile.1:8
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+#, fuzzy
+#| msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+msgid "B<dpkg-distaddfile> [I<option>...]I< filename section priority>"
 msgstr "B<dpkg-distaddfile> [I<opcje>] I<plik sekcja priorytet>"
 
 #. type: Plain text
@@ -7579,13 +8069,6 @@
 msgid "dpkg-deb"
 msgstr "dpkg-deb"
 
-#. type: TH
-#: dpkg-deb.1:1 dpkg-query.1:1 dselect.1:1
-#, fuzzy, no-wrap
-#| msgid "2007-03-07"
-msgid "2010-03-07"
-msgstr "2007-03-07"
-
 #
 #. type: Plain text
 #: dpkg-deb.1:4
@@ -7594,13 +8077,15 @@
 
 #
 #. type: Plain text
-#: dpkg-deb.1:9
-msgid "B<dpkg-deb> [I<options>] I<command>"
+#: dpkg-deb.1:8
+#, fuzzy
+#| msgid "B<dpkg-deb> [I<options>] I<command>"
+msgid "B<dpkg-deb> [I<option>...] I<command>"
 msgstr "B<dpkg-deb> [I<opcje>] I<polecenie>"
 
 #
 #. type: Plain text
-#: dpkg-deb.1:13
+#: dpkg-deb.1:12
 msgid ""
 "B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr ""
@@ -7609,13 +8094,13 @@
 
 #
 #. type: Plain text
-#: dpkg-deb.1:17
+#: dpkg-deb.1:16
 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:26
 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> "
@@ -7627,14 +8112,14 @@
 
 #
 #. type: TP
-#: dpkg-deb.1:29
+#: dpkg-deb.1:28
 #, 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:40
 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 "
@@ -7649,7 +8134,7 @@
 "opisują właściwości pakietu."
 
 #. type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-deb.1:52
 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 "
@@ -7665,7 +8150,7 @@
 
 #
 #. type: Plain text
-#: dpkg-deb.1:60
+#: dpkg-deb.1:59
 msgid ""
 "If no I<archive> is specified then B<dpkg-deb> will write the package into "
 "the file I<directory>B<.deb>."
@@ -7675,12 +8160,12 @@
 
 #
 #. type: Plain text
-#: dpkg-deb.1:62
+#: dpkg-deb.1:61
 msgid "If the archive to be created already exists it will be overwritten."
 msgstr "Jeżeli taki pakiet już istnieje, to zostanie nadpisany."
 
 #. type: Plain text
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 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 "
@@ -7698,20 +8183,20 @@
 
 #
 #. type: TP
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 #, 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:80
 msgid "Provides information about a binary package archive."
 msgstr "Dostarcza informacji o pakiecie."
 
 #
 #. type: Plain text
-#: dpkg-deb.1:86
+#: dpkg-deb.1:85
 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."
@@ -7721,7 +8206,7 @@
 "kontrolnych."
 
 #. type: Plain text
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 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 "
@@ -7734,14 +8219,14 @@
 
 #
 #. type: TP
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 #, 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:100
 msgid ""
 "Provides information about a binary package archive in the format specified "
 "by the B<--showformat> argument. The default format displays the package's "
@@ -7753,20 +8238,20 @@
 
 #
 #. type: TP
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 #, 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:103
 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:107
 msgid ""
 "If no B<control-file-field>s are specified then it will print the whole "
 "control file."
@@ -7776,7 +8261,7 @@
 
 #
 #. type: Plain text
-#: dpkg-deb.1:117
+#: dpkg-deb.1:116
 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-"
@@ -7790,21 +8275,21 @@
 
 #
 #. type: Plain text
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 msgid "No errors are reported for fields requested but not found."
 msgstr ""
 "Dla nieodnalezionych pól kontrolnych nie są wyświetlane komunikaty błędów."
 
 #
 #. type: TP
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 #, 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:124
 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 "
@@ -7815,14 +8300,14 @@
 
 #
 #. type: TP
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 #, 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:128
 msgid ""
 "Extracts the filesystem tree from a package archive into the specified "
 "directory."
@@ -7830,7 +8315,7 @@
 
 #
 #. type: Plain text
-#: dpkg-deb.1:135
+#: dpkg-deb.1:134
 msgid ""
 "Note that extracting a package to the root directory will I<not> result in a "
 "correct installation! Use B<dpkg> to install packages."
@@ -7841,7 +8326,7 @@
 
 #
 #. type: Plain text
-#: dpkg-deb.1:139
+#: dpkg-deb.1:138
 msgid ""
 "I<directory> (but not its parents) will be created if necessary, and its "
 "permissions modified to match the contents of the package."
@@ -7852,35 +8337,73 @@
 
 #
 #. type: TP
-#: dpkg-deb.1:139
+#: 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:144
+#: dpkg-deb.1:145
+#, fuzzy
+#| msgid ""
+#| "Is like B<--extract> (B<-x>)  but prints a listing of the files extracted "
+#| "as it goes."
 msgid ""
-"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
-"it goes."
+"Is like B<--extract> (B<-x>)  with B<--verbose> (B<-v>)  which prints a "
+"listing of the files extracted as it goes."
 msgstr ""
 "Działa podobnie do B<--extract> (B<-x>), z tą różnicą, że wyświetla nazwy "
 "plików, które są rozpakowywane."
 
 #
 #. type: TP
-#: dpkg-deb.1:144
+#: dpkg-deb.1:145
+#, fuzzy, no-wrap
+#| msgid "B<-x>, B<--extract> I<archive directory>"
+msgid "B<-R>, B<--raw-extract> I<archive directory>"
+msgstr "B<-x>, B<--extract> I<katalog archiwum>"
+
+#
+#. type: Plain text
+#: dpkg-deb.1:150
+#, fuzzy
+#| msgid ""
+#| "Extracts the filesystem tree from a package archive into the specified "
+#| "directory."
+msgid ""
+"Extracts the filesystem tree from a package archive into a specified "
+"directory, and the control information files into a DEBIAN subdirectory of "
+"the specified directory."
+msgstr "Rozpakowuje zawartość archiwum do podanego I<katalogu>."
+
+#
+#. type: Plain text
+#: dpkg-deb.1:152 dpkg-deb.1:172
+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:152
 #, no-wrap
 msgid "B<--fsys-tarfile> I<archive>"
 msgstr "B<--fsys-tarfile> I<archiwum>"
 
 #
 #. type: Plain text
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
+#, 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."
 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."
+"to extract a particular file from a package archive.  The input archive will "
+"always be processed sequentially."
 msgstr ""
 "Rozpakowuje pliki z archiwum i wysyła je na standardowe wyjście w postaci "
 "formatu polecenia B<tar>. Gdy ta operacja zostanie połączona z B<tar>'em, "
@@ -7888,14 +8411,14 @@
 
 #
 #. type: TP
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
 #, no-wrap
 msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<-e>, B<--control> I<archiwum> [I<katalog>]"
 
 #
 #. type: Plain text
-#: dpkg-deb.1:156
+#: dpkg-deb.1:165
 msgid ""
 "Extracts the control information files from a package archive into the "
 "specified directory."
@@ -7903,7 +8426,7 @@
 
 #
 #. type: Plain text
-#: dpkg-deb.1:160
+#: dpkg-deb.1:169
 msgid ""
 "If no directory is specified then a subdirectory B<DEBIAN> in the current "
 "directory is used."
@@ -7911,21 +8434,14 @@
 "Jeśli I<katalog> nie został określony, pliki są rozpakowywane do podkatalogu "
 "B<DEBIAN> w katalogu bieżącym."
 
-#
-#. type: Plain text
-#: dpkg-deb.1:163
-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:171
+#: dpkg-deb.1:180
 #, no-wrap
 msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-deb.1:176 dpkg-query.1:121
+#: dpkg-deb.1:185 dpkg-query.1:127
 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."
@@ -7935,7 +8451,7 @@
 "wypisanego pakietu."
 
 #. type: Plain text
-#: dpkg-deb.1:185
+#: dpkg-deb.1:194
 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 "
@@ -7951,33 +8467,39 @@
 "query>(1)."
 
 #. type: Plain text
-#: dpkg-deb.1:187
+#: dpkg-deb.1:196
 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:187
-#, no-wrap
-msgid "B<-z>I<compress_level>"
+#: dpkg-deb.1:196
+#, fuzzy, no-wrap
+#| msgid "B<-z>I<compress_level>"
+msgid "B<-z>I<compress-level>"
 msgstr "B<-z>I<poziom_kompresji>"
 
 #. type: Plain text
-#: dpkg-deb.1:191
+#: dpkg-deb.1:200
+#, fuzzy
+#| msgid ""
+#| "Specify which compression level to pass to the compressor backend "
+#| "program, when building a package."
 msgid ""
-"Specify which compression level to pass to the compressor backend program, "
-"when building a package."
+"Specify which compression level to use on the compressor backend, when "
+"building a package (default is 9 for gzip and bzip2, 6 for xz and lzma)."
 msgstr ""
 "Określa poziom kompresji przekazywany do programu kompresującego podczas "
 "budowania pakietu."
 
 #. type: TP
-#: dpkg-deb.1:191
-#, no-wrap
-msgid "B<-Z>I<compress_type>"
+#: dpkg-deb.1:200
+#, fuzzy, no-wrap
+#| msgid "B<-Z>I<compress_type>"
+msgid "B<-Z>I<compress-type>"
 msgstr "B<-Z>I<typ_kompresji>"
 
 #. type: Plain text
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 #, fuzzy
 #| msgid ""
 #| "Specify which compression type to use when building a package. Allowed "
@@ -7992,13 +8514,13 @@
 "jest I<gzip>)."
 
 #. type: TP
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 #, no-wrap
 msgid "B<--new>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 msgid ""
 "Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
@@ -8006,13 +8528,13 @@
 "domyślna."
 
 #. type: TP
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 #, no-wrap
 msgid "B<--old>"
 msgstr "B<--old>"
 
 #. type: Plain text
-#: dpkg-deb.1:209
+#: dpkg-deb.1:218
 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 "
@@ -8025,9 +8547,15 @@
 "korzystania z wersji dpkg wcześniejszej niż 0.93.76 (wrzesień 1995), która "
 "była opublikowana jedynie dla i386 a.out."
 
+#. type: TP
+#: dpkg-deb.1:218
+#, no-wrap
+msgid "B<--nocheck>"
+msgstr "B<--nocheck>"
+
 #
 #. type: Plain text
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224
 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."
@@ -8037,19 +8565,32 @@
 "potrzeba."
 
 #. type: TP
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224 start-stop-daemon.8:255
+#, no-wrap
+msgid "B<-v>, B<--verbose>"
+msgstr "B<-v>, B<--verbose>"
+
+#. type: Plain text
+#: dpkg-deb.1:228
+msgid ""
+"Enables verbose output. This currently only affects B<--extract> making it "
+"behave like B<--vextract>."
+msgstr ""
+
+#. type: TP
+#: dpkg-deb.1:228
 #, no-wrap
 msgid "B<-D>, B<--debug>"
 msgstr "B<-D>, B<--debug>"
 
 #
 #. type: Plain text
-#: dpkg-deb.1:218
+#: dpkg-deb.1:231
 msgid "Enables debugging output. This is not very interesting."
 msgstr "Włącza opcję debugowania. Nie jest to zbyt interesujące."
 
 #. type: Plain text
-#: dpkg-deb.1:224
+#: dpkg-deb.1:237
 msgid ""
 "If set, B<dpkg-deb> will use it as the directory in which to create "
 "temporary files and directories."
@@ -8057,14 +8598,14 @@
 
 #
 #. type: Plain text
-#: dpkg-deb.1:230
+#: dpkg-deb.1:243
 msgid ""
 "B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
 msgstr ""
 "B<dpkg-deb -I> I<pakiet1>B<.deb> I<pakiet2>B<.deb> działa niepoprawnie."
 
 #. type: Plain text
-#: dpkg-deb.1:238
+#: dpkg-deb.1:251
 msgid ""
 "There is no authentication on B<.deb> files; in fact, there isn't even a "
 "straightforward checksum.  (Higher level tools like APT support "
@@ -8080,7 +8621,7 @@
 "wspierane przez narzędzia niższego poziomu.)"
 
 #. type: Plain text
-#: dpkg-deb.1:245
+#: dpkg-deb.1:258
 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 "
@@ -8092,7 +8633,7 @@
 
 #
 #. type: Plain text
-#: dpkg-deb.1:251
+#: dpkg-deb.1:264
 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)."
 
@@ -8102,13 +8643,6 @@
 msgid "dpkg-divert"
 msgstr "dpkg-divert"
 
-#. type: TH
-#: dpkg-divert.8:1
-#, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-10-12"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-divert.8:4
 msgid "dpkg-divert - override a package's version of a file"
@@ -8117,7 +8651,9 @@
 #
 #. type: Plain text
 #: dpkg-divert.8:9
-msgid "B<dpkg-divert> [I<options>] I<command>"
+#, fuzzy
+#| msgid "B<dpkg-divert> [I<options>] I<command>"
+msgid "B<dpkg-divert> [I<option>...] I<command>"
 msgstr "B<dpkg-divert> [I<opcje>] I<polecenie>"
 
 #. type: Plain text
@@ -8161,7 +8697,7 @@
 msgstr "Dodaje nadpisanie I<pliku>."
 
 #. type: TP
-#: dpkg-divert.8:28 dpkg-statoverride.8:36
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
 #, no-wrap
 msgid "B<--remove>I< file>"
 msgstr "B<--remove> I<plik>"
@@ -8210,7 +8746,8 @@
 msgstr "Wyświetla rzeczywistą nazwę nadpisanego pliku."
 
 #. type: TP
-#: dpkg-divert.8:43 dpkg-statoverride.8:53 update-alternatives.8:329
+#: dpkg-divert.8:43 dpkg-statoverride.8:52 dselect.1:44
+#: update-alternatives.8:328
 #, no-wrap
 msgid "B<--admindir>I< directory>"
 msgstr "B<--admindir>I< katalog>"
@@ -8273,7 +8810,7 @@
 "I<pakietu>."
 
 #. type: TP
-#: dpkg-divert.8:61 dpkg-statoverride.8:65 update-alternatives.8:351
+#: dpkg-divert.8:61 dpkg-statoverride.8:64 update-alternatives.8:350
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
@@ -8319,10 +8856,15 @@
 
 #. type: Plain text
 #: dpkg-divert.8:82
-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."
+#, 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 ""
+"When adding, default is B<--local> and B<--divert> I<original>B<.distrib>. "
+"When removing, B<--package> or B<--local> and B<--divert> must match if "
+"specified."
 msgstr ""
 "Podczas dodawania domyślnymi opcjami są B<--local> i B<--divert> "
 "I<E<lt>oryginalnyE<gt>.distrib>. Podczas usuwania B<--package> lub B<--"
@@ -8400,15 +8942,15 @@
 msgstr "dpkg-divert --package wibble --rename --remove /usr/bin/przykład"
 
 #. type: TP
-#: dpkg-divert.8:113 dpkg-query.1:197 dpkg-statoverride.8:70 dpkg-trigger.1:61
-#: update-alternatives.8:356
+#: dpkg-divert.8:113 dpkg-query.1:205 dpkg-statoverride.8:69 dpkg-trigger.1:61
+#: update-alternatives.8:355
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_MAINTSCRIPT_ARCH>"
 msgid "B<DPKG_ADMINDIR>"
 msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
 
 #. type: Plain text
-#: dpkg-divert.8:117 dpkg-query.1:201 dpkg-statoverride.8:74 dpkg-trigger.1:65
+#: dpkg-divert.8:117 dpkg-query.1:209 dpkg-statoverride.8:73 dpkg-trigger.1:65
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the dpkg data directory."
@@ -8417,7 +8959,7 @@
 #. type: Plain text
 #: dpkg-divert.8:121
 msgid ""
-"If set and the I<--local> and I<--package> options have not been specified, "
+"If set and the B<--local> and B<--package> options have not been specified, "
 "B<dpkg-divert> will use it as the package name."
 msgstr ""
 
@@ -8448,7 +8990,7 @@
 "kopię w pliku z rozszerzeniem \"-old\"."
 
 #. type: Plain text
-#: dpkg-divert.8:137 update-alternatives.8:495
+#: dpkg-divert.8:137 update-alternatives.8:496
 msgid "Copyright \\(co 1995 Ian Jackson"
 msgstr "Copyright \\(co 1995 Ian Jackson"
 
@@ -8466,7 +9008,9 @@
 #
 #. type: Plain text
 #: dpkg-genchanges.1:8
-msgid "B<dpkg-genchanges> [I<options>]"
+#, fuzzy
+#| msgid "B<dpkg-genchanges> [I<options>]"
+msgid "B<dpkg-genchanges> [I<option>...]"
 msgstr "B<dpkg-genchanges> [I<opcje>]"
 
 #. type: Plain text
@@ -8583,13 +9127,13 @@
 "zamiast pobierać te wartości z dziennika zmian z katalogu ze źródłami."
 
 #. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:121
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:127
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr "B<-V>I<nazwa>B<=>I<wartość>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-source.1:131
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
@@ -8598,8 +9142,8 @@
 "zmiennych wyjściowych znajduje się w B<deb-substvars>(5)."
 
 #. type: TP
-#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:169
+#: dpkg-source.1:131
 #, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<-T>I<plik_zmiennych_podst>"
@@ -8625,29 +9169,29 @@
 "nadpisze pole o tej samej nazwie."
 
 #. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:131
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:137
 #, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<pole>B<=>I<wartość>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 msgid "Override or add an output control file field."
 msgstr "Nadpisuje lub dodaje wyjściowe pole pliku kontrolnego."
 
 #. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 #, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<-U>I<pole>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:137
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:143
 msgid "Remove an output control file field."
 msgstr "Usuwa wyjściowe pole pliku kontrolnego."
 
 #. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:98
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:104
 #, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "B<-c>I<plik_kontrolny>"
@@ -8663,7 +9207,7 @@
 
 #. type: TP
 #: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr "B<-l>I<dziennik_zmian>"
@@ -8687,14 +9231,14 @@
 
 #. type: TP
 #: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr "B<-F>I<format_dziennika_zmian>"
 
 #. type: Plain text
 #: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 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 "
@@ -8723,7 +9267,7 @@
 "w pliku B<.changes>)."
 
 #. type: TP
-#: dpkg-genchanges.1:123 dpkg-gensymbols.1:416
+#: dpkg-genchanges.1:123 dpkg-gensymbols.1:421
 #, no-wrap
 msgid "B<-q>"
 msgstr "B<-q>"
@@ -8762,7 +9306,9 @@
 #
 #. type: Plain text
 #: dpkg-gencontrol.1:8
-msgid "B<dpkg-gencontrol> [I<options>]"
+#, fuzzy
+#| msgid "B<dpkg-gencontrol> [I<options>]"
+msgid "B<dpkg-gencontrol> [I<option>...]"
 msgstr "B<dpkg-gencontrol> [I<opcje>]"
 
 #. type: Plain text
@@ -8856,7 +9402,7 @@
 "nadpisze pole o tej samej nazwie."
 
 #. type: TP
-#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:368
+#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:373
 #, no-wrap
 msgid "B<-p>I<package>"
 msgstr "B<-p>I<pakiet>"
@@ -8932,7 +9478,7 @@
 "domyślnej lokalizacji pliku wynikowego."
 
 #. type: TP
-#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:386 dpkg-shlibdeps.1:152
+#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:391 dpkg-shlibdeps.1:150
 #, no-wrap
 msgid "B<-O>"
 msgstr "B<-O>"
@@ -8975,7 +9521,7 @@
 "binarnych generowanych z pliku kontrolnego."
 
 #. type: Plain text
-#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:339
+#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:337
 msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 
@@ -8986,13 +9532,6 @@
 msgid "dpkg-gensymbols"
 msgstr "deb-symbols"
 
-#. type: TH
-#: dpkg-gensymbols.1:2
-#, fuzzy, no-wrap
-#| msgid "2009-01-07"
-msgid "2009-08-07"
-msgstr "2009-01-07"
-
 #. type: Plain text
 #: dpkg-gensymbols.1:5
 #, fuzzy
@@ -9009,7 +9548,7 @@
 #: dpkg-gensymbols.1:9
 #, fuzzy
 #| msgid "B<dpkg-gencontrol> [I<options>]"
-msgid "B<dpkg-gensymbols> [I<options>]"
+msgid "B<dpkg-gensymbols> [I<option>...]"
 msgstr "B<dpkg-gencontrol> [I<opcje>]"
 
 #. type: Plain text
@@ -9030,14 +9569,6 @@
 "found):"
 msgstr ""
 
-#. type: IP
-#: dpkg-gensymbols.1:20 dpkg-gensymbols.1:22 dpkg-gensymbols.1:24
-#: dpkg-gensymbols.1:26 dpkg-gensymbols.1:306 dpkg-gensymbols.1:312
-#: dpkg-gensymbols.1:346 dpkg-gensymbols.1:350 dpkg-gensymbols.1:353
-#, no-wrap
-msgid "\\(bu"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-gensymbols.1:22
 #, fuzzy
@@ -9117,14 +9648,23 @@
 "patch should ideally only add new lines."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-gensymbols.1:64
+msgid ""
+"Note that you can put comments in symbols files: any line with '#' as the "
+"first character is a comment except if it starts with '#include' (see "
+"section B<Using includes>). Lines starting with '#MISSING:' are special "
+"comments documenting symbols that have disappeared."
+msgstr ""
+
 #. type: SS
-#: dpkg-gensymbols.1:59
+#: dpkg-gensymbols.1:64
 #, no-wrap
 msgid "Using #PACKAGE# substitution"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 msgid ""
 "In some rare cases, the name of the library varies between architectures.  "
 "To avoid hardcoding the name of the package in the symbols file, you can use "
@@ -9134,13 +9674,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 #, no-wrap
 msgid "Using symbol tags"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:74
+#: dpkg-gensymbols.1:79
 msgid ""
 "Symbol tagging is useful for marking symbols that are special in some way.  "
 "Any symbol can have an arbitrary number of tags associated with it. While "
@@ -9150,7 +9690,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:86
+#: dpkg-gensymbols.1:91
 msgid ""
 "Tag specification comes right before the symbol name (no whitespace is "
 "allowed in between). It always starts with an opening bracket B<(>, ends "
@@ -9166,7 +9706,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:90
+#: dpkg-gensymbols.1:95
 #, no-wrap
 msgid ""
 " (tag1=i am marked|tag name with space)\"tagged quoted symbol\"@Base 1.0\n"
@@ -9175,7 +9715,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:96
+#: dpkg-gensymbols.1:101
 msgid ""
 "The first symbol in the example is named I<tagged quoted symbol> and has two "
 "tags: I<tag1> with value I<i am marked> and I<tag name with space> that has "
@@ -9185,7 +9725,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 msgid ""
 "Since symbol tags are an extension of the I<deb-symbols(5)> format, they can "
 "only be part of the symbols files used in source packages (those files "
@@ -9200,20 +9740,20 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 #, no-wrap
 msgid "Standard symbol tags"
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:109
+#: dpkg-gensymbols.1:114
 #, fuzzy, no-wrap
 #| msgid "B<not-installed>"
 msgid "B<optional>"
 msgstr "B<not-installed (niezainstalowany)>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:119
+#: dpkg-gensymbols.1:124
 msgid ""
 "A symbol marked as optional can disappear from the library at any time and "
 "that will never cause B<dpkg-gensymbols> to fail. However, disappeared "
@@ -9226,7 +9766,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 msgid ""
 "This tag is useful for symbols which are private where their disappearance "
 "do not cause ABI breakage. For example, most of C++ template instantiations "
@@ -9236,14 +9776,14 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 #, fuzzy, no-wrap
 #| msgid "B<-a>I<architecture>"
 msgid "B<arch=>I<architecture list>"
 msgstr "B<-a>I<architektura>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:137
+#: dpkg-gensymbols.1:142
 msgid ""
 "This tag allows one to restrict the set of architectures where the symbol is "
 "supposed to exist. When the symbols list is updated with the symbols "
@@ -9259,7 +9799,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:143
+#: dpkg-gensymbols.1:148
 msgid ""
 "When operating in the default non-template mode, among arch-specific symbols "
 "only those that match the current host architecture are written to the "
@@ -9269,7 +9809,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:149
+#: dpkg-gensymbols.1:154
 msgid ""
 "The format of I<architecture list> is the same as the one used in the "
 "I<Build-Depends> field of I<debian/control> (except the enclosing square "
@@ -9279,7 +9819,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid ""
 " (arch=alpha amd64 kfreebsd-amd64 ia64)a_64bit_specific_symbol@Base 1.0\n"
@@ -9287,14 +9827,14 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, fuzzy, no-wrap
 #| msgid "B<--no-act>"
 msgid "B<ignore-blacklist>"
 msgstr "B<--no-act>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:160
+#: dpkg-gensymbols.1:165
 msgid ""
 "dpkg-gensymbols has an internal blacklist of symbols that should not appear "
 "in symbols files as they are usually only side-effects of implementation "
@@ -9305,54 +9845,54 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:160 dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:165 dpkg-gensymbols.1:202
 #, fuzzy, no-wrap
 #| msgid "B<-nc>"
 msgid "B<c++>"
 msgstr "B<-nc>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:164
+#: dpkg-gensymbols.1:169
 msgid ""
 "Denotes I<c++> symbol pattern. See B<Using symbol patterns> subsection below."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:164 dpkg-gensymbols.1:228
+#: dpkg-gensymbols.1:169 dpkg-gensymbols.1:233
 #, fuzzy, no-wrap
 #| msgid "B<-sr>"
 msgid "B<symver>"
 msgstr "B<-sr>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:168
+#: dpkg-gensymbols.1:173
 msgid ""
 "Denotes I<symver> (symbol version) symbol pattern. See B<Using symbol "
 "patterns> subsection below."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:168 dpkg-gensymbols.1:253
+#: dpkg-gensymbols.1:173 dpkg-gensymbols.1:258
 #, fuzzy, no-wrap
 #| msgid "B<purge>"
 msgid "B<regex>"
 msgstr "B<purge (wyczyszczenie)>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 msgid ""
 "Denotes I<regex> symbol pattern. See B<Using symbol patterns> subsection "
 "below."
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 #, no-wrap
 msgid "Using symbol patterns"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:180
+#: dpkg-gensymbols.1:185
 msgid ""
 "Unlike a standard symbol specification, a pattern may cover multiple real "
 "symbols from the library. B<dpkg-gensymbols> will attempt to match each "
@@ -9364,7 +9904,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:188
+#: dpkg-gensymbols.1:193
 msgid ""
 "A pattern is considered lost if it does not match any symbol in the library. "
 "By default this will trigger a B<dpkg-gensymbols> failure under I<-c1> or "
@@ -9377,7 +9917,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:195
+#: dpkg-gensymbols.1:200
 msgid ""
 "Patterns are an extension of the I<deb-symbols(5)> format hence they are "
 "only valid in symbol file templates. Pattern specification syntax is not any "
@@ -9388,12 +9928,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:202
 msgid "At the moment, B<dpkg-gensymbols> supports three basic pattern types:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:209
+#: dpkg-gensymbols.1:214
 msgid ""
 "This pattern is denoted by the I<c++> tag. It matches only C++ symbols by "
 "their demangled symbol name (as emitted by B<c++filt>(1) utility). This "
@@ -9408,7 +9948,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:215
+#: dpkg-gensymbols.1:220
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -9418,19 +9958,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:217
+#: dpkg-gensymbols.1:222
 msgid ""
 "The demangled name above can be obtained by executing the following command:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:219
+#: dpkg-gensymbols.1:224
 #, no-wrap
 msgid " $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:227
+#: dpkg-gensymbols.1:232
 msgid ""
 "Please note that while mangled name is unique in the library by definition, "
 "this is not necessarily true for demangled names. A couple of distinct real "
@@ -9442,7 +9982,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:234
+#: dpkg-gensymbols.1:239
 msgid ""
 "This pattern is denoted by the I<symver> tag. Well maintained libraries have "
 "versioned symbols where each version corresponds to the upstream version "
@@ -9451,7 +9991,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:241
+#: dpkg-gensymbols.1:246
 #, no-wrap
 msgid ""
 "libc.so.6 libc6 #MINVER#\n"
@@ -9462,7 +10002,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:247
+#: dpkg-gensymbols.1:252
 msgid ""
 "All symbols associated with versions GLIBC_2.0 and GLIBC_2.7 will lead to "
 "minimal version of 2.0 and 2.7 respectively with the exception of the symbol "
@@ -9472,7 +10012,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:252
+#: dpkg-gensymbols.1:257
 msgid ""
 "Please note that while old style wildcard patterns (denoted by \"*@version\" "
 "in the symbol name field) are still supported, they have been deprecated by "
@@ -9482,7 +10022,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:260
+#: dpkg-gensymbols.1:265
 msgid ""
 "Regular expression patterns are denoted by the I<regex> tag. They match by "
 "the perl regular expression specified in the symbol name field. A regular "
@@ -9492,7 +10032,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:265
+#: dpkg-gensymbols.1:270
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -9501,7 +10041,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:270
+#: dpkg-gensymbols.1:275
 msgid ""
 "Symbols like \"mystack_new@Base\", \"mystack_push@Base\", \"mystack_pop@Base"
 "\" etc.  will be matched by the first pattern while e.g. "
@@ -9511,7 +10051,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:275
+#: dpkg-gensymbols.1:280
 msgid ""
 "Basic patterns listed above can be combined where it makes sense. In that "
 "case, they are processed in the order in which the tags are specified. For "
@@ -9519,7 +10059,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:278
+#: dpkg-gensymbols.1:283
 #, no-wrap
 msgid ""
 " (c++|regex)\"^NSA::ClassA::Private::privmethod\\ed\\e(int\\e)@Base\" 1.0\n"
@@ -9527,7 +10067,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:288
+#: dpkg-gensymbols.1:293
 msgid ""
 "will match symbols \"_ZN3NSA6ClassA7Private11privmethod1Ei@Base\" and "
 "\"_ZN3NSA6ClassA7Private11privmethod2Ei@Base\". When matching the first "
@@ -9542,7 +10082,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:294
+#: dpkg-gensymbols.1:299
 msgid ""
 "In general, all patterns are divided into two groups: aliases (basic I<c++> "
 "and I<symver>) and generic patterns (I<regex>, all combinations of multiple "
@@ -9552,7 +10092,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 msgid ""
 "When multiple patterns match the same real symbol, aliases (first I<c++>, "
 "then I<symver>) are preferred over generic patterns. Generic patterns are "
@@ -9563,13 +10103,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 #, no-wrap
 msgid "Using includes"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:306
+#: dpkg-gensymbols.1:311
 msgid ""
 "When the set of exported symbols differ between architectures, it may become "
 "inefficient to use a single symbol file. In those cases, an include "
@@ -9577,7 +10117,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:310
+#: dpkg-gensymbols.1:315
 msgid ""
 "You can factorize the common part in some external file and include that "
 "file in your I<package>.symbols.I<arch> file by using an include directive "
@@ -9585,31 +10125,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:312
+#: dpkg-gensymbols.1:317
 msgid "#include \"I<packages>.symbols.common\""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:314
+#: dpkg-gensymbols.1:319
 msgid "The include directive may also be tagged like any symbol:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:316
-msgid "(tag|..|tagN)#include \"file_to_include\""
+#: dpkg-gensymbols.1:321
+msgid "(tag|..|tagN)#include \"file-to-include\""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:321
+#: dpkg-gensymbols.1:326
 msgid ""
-"As a result, all symbols included from I<file_to_include> will be considered "
+"As a result, all symbols included from I<file-to-include> will be considered "
 "to be tagged with I<tag> .. I<tagN> by default. You can use this feature to "
 "create a common I<package>.symbols file which includes architecture specific "
 "symbol files:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:326
+#: dpkg-gensymbols.1:331
 #, no-wrap
 msgid ""
 "  common_symbol1@Base 1.0\n"
@@ -9619,7 +10159,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:335
+#: dpkg-gensymbols.1:340
 msgid ""
 "The symbols files are read line by line, and include directives are "
 "processed as soon as they are encountered. This means that the content of "
@@ -9632,7 +10172,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:340
+#: dpkg-gensymbols.1:345
 msgid ""
 "An included file can repeat the header line containing the SONAME of the "
 "library. In that case, it overrides any header line previously read.  "
@@ -9641,7 +10181,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid ""
 "#include \"libsomething1.symbols.common\"\n"
@@ -9649,39 +10189,39 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid "Good library management"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:346
+#: dpkg-gensymbols.1:351
 msgid "A well-maintained library has the following features:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:350
+#: dpkg-gensymbols.1:355
 msgid ""
 "its API is stable (public symbols are never dropped, only new public symbols "
 "are added) and changes in incompatible ways only when the SONAME changes;"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:353
+#: dpkg-gensymbols.1:358
 msgid ""
 "ideally, it uses symbol versioning to achieve ABI stability despite internal "
 "changes and API extension;"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:356
+#: dpkg-gensymbols.1:361
 msgid ""
 "it doesn't export private symbols (such symbols can be tagged optional as "
 "workaround)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:364
+#: dpkg-gensymbols.1:369
 msgid ""
 "While maintaining the symbols file, it's easy to notice appearance and "
 "disappearance of symbols. But it's more difficult to catch incompatible API "
@@ -9693,42 +10233,42 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:365
+#: dpkg-gensymbols.1:370
 #, fuzzy, no-wrap
 #| msgid "B<-P>I<packagebuilddir>"
 msgid "B<-P>I<package-build-dir>"
 msgstr "B<-P>I<katalog_budowania_pakietu>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:368
+#: dpkg-gensymbols.1:373
 #, fuzzy
 #| msgid "Scan for *.I<type> packages, instead of *.deb."
 msgid "Scan I<package-build-dir> instead of debian/tmp."
 msgstr "Szukanie plików *.I<typ> zamiast *.deb."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 msgid ""
 "Define the package name. Required if more than one binary package is listed "
 "in debian/control (or if there's no debian/control file)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 msgid ""
 "Define the package version. Defaults to the version extracted from debian/"
 "changelog. Required if called outside of a source package tree."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 #, fuzzy, no-wrap
 #| msgid "B<-R>I<rules-file>"
 msgid "B<-e>I<library-file>"
 msgstr "B<-R>I<plik_rules>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 msgid ""
 "Only analyze libraries explicitly listed instead of finding all public "
 "libraries. You can use a regular expression in I<library-file> to match "
@@ -9737,21 +10277,21 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 #, fuzzy, no-wrap
 #| msgid "B<-n>I<filename>"
 msgid "B<-I>I<filename>"
 msgstr "B<-n>I<nazwa_pliku>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:386
+#: dpkg-gensymbols.1:391
 msgid ""
 "Use I<filename> as reference file to generate the symbols file that is "
 "integrated in the package itself."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 #, fuzzy
 #| msgid ""
 #| "Print the control file to standard output, rather than to B<debian/tmp/"
@@ -9766,14 +10306,14 @@
 "użyto B<-P>)."
 
 #. type: TP
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 #, fuzzy, no-wrap
 #| msgid "B<-n>I<filename>"
 msgid "B<-O>I<filename>"
 msgstr "B<-n>I<nazwa_pliku>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 msgid ""
 "Store the generated symbols file as I<filename>. If I<filename> is pre-"
 "existing, its content is used as basis for the generated symbols file.  You "
@@ -9782,14 +10322,14 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 #, fuzzy, no-wrap
 #| msgid "B<-tc>"
 msgid "B<-t>"
 msgstr "B<-tc>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 msgid ""
 "Write the symbol file in template mode rather than the format compatible "
 "with I<deb-symbols(5)>. The main difference is that in the template mode "
@@ -9801,14 +10341,14 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 #, fuzzy, no-wrap
 #| msgid "B<-I>I<[pattern]>"
 msgid "B<-c>I<[0-4]>"
 msgstr "B<-I>I<[wzorzec]>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:413
+#: dpkg-gensymbols.1:418
 msgid ""
 "Define the checks to do when comparing the generated symbols file with the "
 "template file used as starting point. By default the level is 1. Increasing "
@@ -9819,14 +10359,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:416
+#: dpkg-gensymbols.1:421
 msgid ""
 "This value can be overridden by the environment variable "
 "DPKG_GENSYMBOLS_CHECK_LEVEL."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 msgid ""
 "Keep quiet and never generate a diff between generated symbols file and the "
 "template file used as starting point or show any warnings about new/lost "
@@ -9835,14 +10375,14 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 #, fuzzy, no-wrap
 #| msgid "B<-a>I<architecture>"
 msgid "B<-a>I<arch>"
 msgstr "B<-a>I<architektura>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:427
+#: dpkg-gensymbols.1:432
 msgid ""
 "Assume I<arch> as host architecture when processing symbol files. Use this "
 "option to generate a symbol file or diff for any architecture provided its "
@@ -9850,7 +10390,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 #, fuzzy
 #| msgid ""
 #| "Enable verbose mode. Numerous messages are displayed to explain what "
@@ -9863,14 +10403,14 @@
 "tłumaczących działanie B<dpkg-shlibdeps>."
 
 #. type: TP
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 #, fuzzy, no-wrap
 #| msgid "B<-G>"
 msgid "B<-V>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:438
+#: dpkg-gensymbols.1:443
 msgid ""
 "Enable verbose mode. The generated symbols file contains deprecated symbols "
 "as comments. Furthermore in template mode, pattern symbols are followed by "
@@ -9878,30 +10418,30 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:447
+#: dpkg-gensymbols.1:452
 msgid "B<http://people.redhat.com/drepper/symbol-versioning>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:449
+#: dpkg-gensymbols.1:454
 msgid "B<http://people.redhat.com/drepper/goodpractice.pdf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:451
+#: dpkg-gensymbols.1:456
 msgid "B<http://people.redhat.com/drepper/dsohowto.pdf>"
 msgstr ""
 
 #
 #. type: Plain text
-#: dpkg-gensymbols.1:454
+#: dpkg-gensymbols.1:459
 #, fuzzy
 #| msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgid "B<deb-symbols>(5), B<dpkg-shlibdeps>(1)."
 msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:457
+#: dpkg-gensymbols.1:462
 #, fuzzy
 #| msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
@@ -9913,13 +10453,6 @@
 msgid "dpkg-maintscript-helper"
 msgstr ""
 
-#. type: TH
-#: dpkg-maintscript-helper.1:1
-#, fuzzy, no-wrap
-#| msgid "2009-08-16"
-msgid "2010-04-16"
-msgstr "2009-08-16"
-
 #. type: Plain text
 #: dpkg-maintscript-helper.1:4
 msgid ""
@@ -9930,8 +10463,8 @@
 #. type: Plain text
 #: dpkg-maintscript-helper.1:8
 msgid ""
-"B<dpkg-maintscript-helper> I<command> [I<parameters>...] -- I<maint-script-"
-"parameters>"
+"B<dpkg-maintscript-helper> I<command> [I<parameter>...] B<--> I<maint-script-"
+"parameter>..."
 msgstr ""
 
 #. type: SH
@@ -9966,8 +10499,8 @@
 "scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
 "the same call simply needs to be put in all scripts and the program will "
 "automatically adapt its behaviour based on the environment variable "
-"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
-"to forward after a double dash."
+"B<DPKG_MAINTSCRIPT_NAME> and on the maintainer scripts arguments that you "
+"have to forward after a double dash."
 msgstr ""
 
 #. type: SH
@@ -10130,9 +10663,10 @@
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:118
-#, no-wrap
-msgid "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+msgid "    B<Pre-Depends:> dpkg (E<gt>= 1.15.7.2)\n"
+msgstr "B<Pre-Depends:> E<lt>lista pakietówE<gt>"
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:123
@@ -10147,12 +10681,19 @@
 #: dpkg-maintscript-helper.1:127
 #, no-wrap
 msgid ""
-"    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
-"        dpkg-maintscript-helper E<lt>commandE<gt> ...\n"
+"    if dpkg-maintscript-helper supports I<command>; then\n"
+"        dpkg-maintscript-helper I<command> ...\n"
 "    fi\n"
 msgstr ""
 
 #. type: Plain text
+#: dpkg-maintscript-helper.1:130
+#, fuzzy
+#| msgid "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2008 Rapha\\[:e]l Hertzog"
+
+#. type: Plain text
 #: dpkg-maintscript-helper.1:132
 #, fuzzy
 #| msgid "Copyright \\(co 2001 Joey Hess"
@@ -10180,13 +10721,6 @@
 msgid "dpkg-mergechangelogs"
 msgstr "dpkg-parsechangelog"
 
-#. type: TH
-#: dpkg-mergechangelogs.1:1
-#, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-04-18"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-mergechangelogs.1:4
 #, fuzzy
@@ -10318,21 +10852,32 @@
 
 #. type: Plain text
 #: dpkg-name.1:15
-msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+#, fuzzy
+#| msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+msgid "B<dpkg-name> [I<option>...] [B<-->] I<file>..."
 msgstr "B<dpkg-name> [I<opcje>] [B<-->] I<pliki>"
 
 #. type: Plain text
-#: dpkg-name.1:28
+#: dpkg-name.1:29
+#, 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>."
+#| "E<lt>package_typeE<gt>> 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. The I<E<lt>package_typeE<gt>> part comes from that field if "
+#| "present or fallbacks to B<deb>."
 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>."
-"E<lt>package_typeE<gt>> 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. "
-"The I<E<lt>package_typeE<gt>> part comes from that field if present or "
-"fallbacks to B<deb>."
+"package name consists of I<package>B<_>I<version>B<_>I<architecture>B<."
+">I<package-type> as specified in the control file of the package. The "
+"I<version> part of the filename consists of the upstream version information "
+"optionally followed by a hyphen and the revision information. The I<package-"
+"type> part comes from that field if present or fallbacks to B<deb>."
 msgstr ""
 "Ta strona podręcznika dokumentuje program B<dpkg-name>, który dostarcza "
 "prostego sposobu na zmianę nazw pakietów B<Debiana> na pełne nazwy pakietów. "
@@ -10345,35 +10890,35 @@
 "odpowiedniego pola, jeśli jest obecne, lub jest równa B<deb>."
 
 #. type: TP
-#: dpkg-name.1:30
+#: dpkg-name.1:31
 #, no-wrap
 msgid "B<-a>, B<--no-architecture>"
 msgstr "B<-a>, B<--no-architecture>"
 
 #. type: Plain text
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 msgid "The destination filename will not have the architecture information."
 msgstr "Wynikowy plik nie będzie miał informacji o architekturze."
 
 #. type: TP
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 #, no-wrap
 msgid "B<-k>, B<--symlink>"
 msgstr "B<-k>, B<--symlink>"
 
 #. type: Plain text
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 msgid "Create a symlink, instead of moving."
 msgstr "Tworzy dowiązanie symboliczne, zamiast przenosić plik."
 
 #. type: TP
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 #, no-wrap
 msgid "B<-o>, B<--overwrite>"
 msgstr "B<-o>, B<--overwrite>"
 
 #. type: Plain text
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 msgid ""
 "Existing files will be overwritten if they have the same name as the "
 "destination filename."
@@ -10382,24 +10927,35 @@
 "plików wynikowych."
 
 #. type: TP
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 #, no-wrap
 msgid "B<-s>, B<--subdir> [I<dir>]"
 msgstr "B<-s>, B<--subdir> [I<katalog>]"
 
 #. type: Plain text
-#: dpkg-name.1:52
+#: dpkg-name.1:53
+#, 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."
 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 package. The target directory will be `unstable/binary-I<architecture>/"
+"I<section>'. 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 `I<section>/binary-I<architecture>'. 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 ""
 "Pliki będą przeniesione do podkatalogu. Jeśli istnieje katalog podany jako "
 "argument tej opcji, to pliki zostaną przeniesione do tego katalogu, w "
@@ -10414,13 +10970,13 @@
 "Proszę ostrożnie używać tej opcji, jest niechlujna."
 
 #. type: TP
-#: dpkg-name.1:52
+#: dpkg-name.1:53
 #, no-wrap
 msgid "B<-c>, B<--create-dir>"
 msgstr "B<-c>, B<--create-dir>"
 
 #. type: Plain text
-#: dpkg-name.1:57
+#: dpkg-name.1:58
 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.>"
@@ -10429,19 +10985,19 @@
 "istnieje, to zostanie utworzony. B<Proszę ostrożnie używać tej opcji.>"
 
 #. type: TP
-#: dpkg-name.1:60
+#: dpkg-name.1:61
 #, no-wrap
 msgid "B<-v>, B<--version>"
 msgstr "B<-v>, B<--version>"
 
 #. type: TP
-#: dpkg-name.1:65
+#: dpkg-name.1:66
 #, no-wrap
 msgid "B<dpkg-name bar-foo.deb>"
 msgstr "B<dpkg-name bar-foo.deb>"
 
 #. type: Plain text
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 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 "
@@ -10452,13 +11008,13 @@
 "pakietu \"bar-foo.deb\")."
 
 #. type: TP
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 #, 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:75
+#: dpkg-name.1:76
 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 "
@@ -10469,13 +11025,13 @@
 "niezawierające informacji o architekturze."
 
 #. type: TP
-#: dpkg-name.1:75
+#: dpkg-name.1:76
 #, 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:81
+#: dpkg-name.1:82
 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.>"
@@ -10484,23 +11040,30 @@
 "pakietów nie będzie miało informacji o sekcji. B<Nie rób tego>."
 
 #. type: TP
-#: dpkg-name.1:81
+#: dpkg-name.1:82
 #, 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:84
+#: dpkg-name.1:85
 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:94
+#: dpkg-name.1:95
+#, 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."
 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 "
+"I<package>B<_>I<version>B<_>I<architecture>B<.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 ""
 "Niektóre pakiety mają inną strukturę nazwy niż "
@@ -10512,7 +11075,7 @@
 
 #
 #. type: Plain text
-#: dpkg-name.1:102
+#: dpkg-name.1:103
 msgid ""
 "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
 "B<xargs>(1)."
@@ -10521,7 +11084,7 @@
 "B<xargs>(1)."
 
 #. type: Plain text
-#: dpkg-name.1:105
+#: dpkg-name.1:106
 msgid "Copyright \\(co 1995,1996 Erick Branderhorst"
 msgstr "Copyright \\(co 1995,1996 Erick Branderhorst"
 
@@ -10531,13 +11094,6 @@
 msgid "dpkg-parsechangelog"
 msgstr "dpkg-parsechangelog"
 
-#. type: TH
-#: dpkg-parsechangelog.1:1
-#, fuzzy, no-wrap
-#| msgid "2009-05-10"
-msgid "2009-05-19"
-msgstr "2009-05-10"
-
 #. type: Plain text
 #: dpkg-parsechangelog.1:4
 msgid "dpkg-parsechangelog - parse Debian changelog files"
@@ -10545,7 +11101,9 @@
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:8
-msgid "B<dpkg-parsechangelog> [I<options>]"
+#, fuzzy
+#| msgid "B<dpkg-parsechangelog> [I<options>]"
+msgid "B<dpkg-parsechangelog> [I<option>...]"
 msgstr "B<dpkg-parsechangelog> [I<opcje>]"
 
 #. type: Plain text
@@ -10618,26 +11176,30 @@
 
 #. type: TP
 #: dpkg-parsechangelog.1:54
-#, no-wrap
-msgid "B<Source:> E<lt>pkg nameE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Source:> E<lt>pkg nameE<gt>"
+msgid "B<Source:>I< pkg-name>"
 msgstr "B<Source:> E<lt>nazwa pakietuE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:56
-#, no-wrap
-msgid "B<Version:> E<lt>versionE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Version:> E<lt>versionE<gt>"
+msgid "B<Version:>I< version>"
 msgstr "B<Version:> E<lt>wersjaE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:58
-#, no-wrap
-msgid "B<Distribution:> E<lt>target distributionE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Distribution:> E<lt>target distributionE<gt>"
+msgid "B<Distribution:>I< target-distribution>"
 msgstr "B<Distribution:> E<lt>dystrybucja docelowaE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:60
-#, no-wrap
-msgid "B<Urgency:> E<lt>urgencyE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Urgency:> E<lt>urgencyE<gt>"
+msgid "B<Urgency:>I< urgency>"
 msgstr "B<Urgency:> E<lt>ważnośćE<gt>"
 
 #. type: Plain text
@@ -10648,20 +11210,23 @@
 
 #. type: TP
 #: dpkg-parsechangelog.1:63
-#, no-wrap
-msgid "B<Maintainer:> E<lt>authorE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Maintainer:> E<lt>authorE<gt>"
+msgid "B<Maintainer:>I< author>"
 msgstr "B<Maintainer:> E<lt>autorE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:65
-#, no-wrap
-msgid "B<Date:> E<lt>dateE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Date:> E<lt>dateE<gt>"
+msgid "B<Date:>I< date>"
 msgstr "B<Date:> E<lt>dataE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:67
-#, no-wrap
-msgid "B<Closes:> E<lt>bug numberE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Closes:> E<lt>bug numberE<gt>"
+msgid "B<Closes:>I< bug-number>"
 msgstr "B<Closes:> E<lt>number błęduE<gt>"
 
 #. type: Plain text
@@ -10671,8 +11236,9 @@
 
 #. type: TP
 #: dpkg-parsechangelog.1:70
-#, no-wrap
-msgid "B<Changes:> E<lt>changelog entriesE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Changes:> E<lt>changelog entriesE<gt>"
+msgid "B<Changes:>I< changelog-entries>"
 msgstr "B<Changes:> E<lt>wpisy dziennika zmianE<gt>"
 
 #. type: Plain text
@@ -10780,7 +11346,7 @@
 "jego końca, jeśli I<liczba> jest mniejsza od zera)."
 
 #. type: TP
-#: dpkg-parsechangelog.1:104 update-alternatives.8:269
+#: dpkg-parsechangelog.1:104 update-alternatives.8:268
 #, no-wrap
 msgid "B<--all>"
 msgstr "B<--all>"
@@ -11001,39 +11567,51 @@
 
 #
 #. type: Plain text
-#: dpkg-query.1:78
+#: dpkg-query.1:79
+#, fuzzy
+#| msgid ""
+#| "Report status of specified package. This just displays the entry in the "
+#| "installed package status database."
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"installed package status database. When multiple I<package-name> are listed, "
+"the requested status entries are separated by an empty line."
 msgstr ""
 "Podanie stanu pakietu o podanej nazwie. Polecenie po prostu wyświetli "
 "informacje, które znajdują się w bazie danych pakietów."
 
 #. type: TP
-#: dpkg-query.1:78
+#: dpkg-query.1:79
 #, no-wrap
 msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<-L>, B<--listfiles> I<nazwa-pakietu>..."
 
 #
 #. type: Plain text
-#: dpkg-query.1:83
-msgid ""
-"List files installed to your system from I<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+#: dpkg-query.1:85
+#, fuzzy
+#| msgid ""
+#| "List files installed to your system from I<package-name>.  However, note "
+#| "that files created by package-specific installation-scripts are not "
+#| "listed."
+msgid ""
+"List files installed to your system from I<package-name>. When multiple "
+"I<package-name> are listed, the requested lists of files are separated by an "
+"empty line. However, note that files created by package-specific "
+"installation-scripts are not listed."
 msgstr ""
 "Podanie listy plików zainstalowanych z B<nazwy-pakietu>. Jednakże pliki, "
 "które zostały utworzone przez skrypty instalacyjne pakietu, nie będą podane."
 
 #
 #. type: TP
-#: dpkg-query.1:83
+#: dpkg-query.1:85
 #, no-wrap
 msgid "B<-c>, B<--control-path> I<package-name> [I<control-file>]"
 msgstr "B<-c>, B<--control-path> I<nazwa-pakietu> [I<plik-kontrolny>]"
 
 #. type: Plain text
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 msgid ""
 "List paths for control files installed to your system from I<package-name>.  "
 "If I<control-file> is specified then only list the path for that control "
@@ -11051,18 +11629,24 @@
 "interfejsy lub zostaną rozwiązane bieżące niedostatki architektoniczne."
 
 #. type: TP
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 #, 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:97
-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."
+#: dpkg-query.1:99
+#, 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."
+msgid ""
+"Search for packages that own files corresponding to the given pattern.  "
+"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 ""
 "Szukanie pliku o podanym wzorcu pośród zainstalowanych pakietów. Wzorzec "
 "może zawierać zwykłe operatory powtórzenia. Polecenie to nie wyszuka "
@@ -11070,18 +11654,42 @@
 "wyświetli alternatyw."
 
 #. type: TP
-#: dpkg-query.1:97
+#: dpkg-query.1:99
 #, 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:104
+#: dpkg-query.1:105
+#, fuzzy
+#| msgid ""
+#| "Display details about I<package-name>, as found in I</var/lib/dpkg/"
+#| "available>. Users of APT-based frontends should use B<apt-cache show> "
+#| "I<package-name> instead as the I<available> file is only kept up-to-date "
+#| "when using B<dselect>."
 msgid ""
 "Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>. Users of APT-based frontends should use B<apt-cache show> "
-"I<package-name> instead as the I<available> file is only kept up-to-date "
-"when using B<dselect>."
+"available>. When multiple I<package-name> are listed, the requested "
+"I<available> entries are separated by an empty line."
+msgstr ""
+"Wyświetla szczegółowe informacje na temat pakietu I<nazwa-pakietu>, "
+"pochodzące z pliku I</var/lib/dpkg/available>. Użytkownicy nakładek opartych "
+"o APT powinni używać B<apt-cache show> I<package-name> zamiast tej opcji, "
+"ponieważ plik I<available> jest utrzymywany w aktualności jedynie przy "
+"użyciu B<dselect>."
+
+#. type: Plain text
+#: dpkg-query.1:110
+#, fuzzy
+#| msgid ""
+#| "Display details about I<package-name>, as found in I</var/lib/dpkg/"
+#| "available>. Users of APT-based frontends should use B<apt-cache show> "
+#| "I<package-name> instead as the I<available> file is only kept up-to-date "
+#| "when using B<dselect>."
+msgid ""
+"Users of APT-based frontends should use B<apt-cache show> I<package-name> "
+"instead as the I<available> file is only kept up-to-date when using "
+"B<dselect>."
 msgstr ""
 "Wyświetla szczegółowe informacje na temat pakietu I<nazwa-pakietu>, "
 "pochodzące z pliku I</var/lib/dpkg/available>. Użytkownicy nakładek opartych "
@@ -11090,18 +11698,18 @@
 "użyciu B<dselect>."
 
 #. type: TP
-#: dpkg-query.1:116
+#: dpkg-query.1:122
 #, no-wrap
 msgid "B<-f>, B<--showformat=>I<format>"
 msgstr "B<-f>, B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-query.1:123
+#: dpkg-query.1:129
 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:128
+#: dpkg-query.1:134
 #, no-wrap
 msgid ""
 "    B<\\en>  newline\n"
@@ -11113,7 +11721,7 @@
 "    B<\\et>  tabulacja\n"
 
 #. type: Plain text
-#: dpkg-query.1:133
+#: dpkg-query.1:139
 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<"
@@ -11124,7 +11732,7 @@
 "\\(rq oraz \\(lqB<$>\\(rq."
 
 #. type: Plain text
-#: dpkg-query.1:141
+#: dpkg-query.1:147
 msgid ""
 "Package information can be included by inserting variable references to "
 "package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
@@ -11141,8 +11749,42 @@
 "(trafiają tam tylko pola wewnętrzne lub pola zawarte w binarnym pakiecie):"
 
 #. type: Plain text
-#: dpkg-query.1:176
-#, no-wrap
+#: dpkg-query.1:182
+#, fuzzy, no-wrap
+#| msgid ""
+#| "    B<Architecture>\n"
+#| "    B<Bugs>\n"
+#| "    B<Conffiles> (internal)\n"
+#| "    B<Config-Version> (internal)\n"
+#| "    B<Conflicts>\n"
+#| "    B<Breaks>\n"
+#| "    B<Depends>\n"
+#| "    B<Description>\n"
+#| "    B<Enhances>\n"
+#| "    B<Essential>\n"
+#| "    B<Filename> (internal, dselect related)\n"
+#| "    B<Homepage>\n"
+#| "    B<Installed-Size>\n"
+#| "    B<MD5sum> (internal, dselect related)\n"
+#| "    B<MSDOS-Filename> (internal, dselect related)\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> (obsolete)\n"
+#| "    B<Section>\n"
+#| "    B<Size> (internal, dselect related)\n"
+#| "    B<Source>\n"
+#| "    B<Status> (internal)\n"
+#| "    B<Suggests>\n"
+#| "    B<Tag> (usually not in the .deb but in APT's Packages files)\n"
+#| "    B<Triggers-Awaited> (internal)\n"
+#| "    B<Triggers-Pending> (internal)\n"
+#| "    B<Version>\n"
 msgid ""
 "    B<Architecture>\n"
 "    B<Bugs>\n"
@@ -11154,11 +11796,11 @@
 "    B<Description>\n"
 "    B<Enhances>\n"
 "    B<Essential>\n"
-"    B<Filename> (internal, dselect related)\n"
+"    B<Filename> (internal, front-end related)\n"
 "    B<Homepage>\n"
 "    B<Installed-Size>\n"
-"    B<MD5sum> (internal, dselect related)\n"
-"    B<MSDOS-Filename> (internal, dselect related)\n"
+"    B<MD5sum> (internal, front-end related)\n"
+"    B<MSDOS-Filename> (internal, front-end related)\n"
 "    B<Maintainer>\n"
 "    B<Origin>\n"
 "    B<Package>\n"
@@ -11169,11 +11811,11 @@
 "    B<Replaces>\n"
 "    B<Revision> (obsolete)\n"
 "    B<Section>\n"
-"    B<Size> (internal, dselect related)\n"
+"    B<Size> (internal, front-end related)\n"
 "    B<Source>\n"
 "    B<Status> (internal)\n"
 "    B<Suggests>\n"
-"    B<Tag> (usually not in the .deb but in APT's Packages files)\n"
+"    B<Tag> (usually not in the .deb but in the repository Packages files)\n"
 "    B<Triggers-Awaited> (internal)\n"
 "    B<Triggers-Pending> (internal)\n"
 "    B<Version>\n"
@@ -11213,7 +11855,7 @@
 "    B<Version>\n"
 
 #. type: Plain text
-#: dpkg-query.1:184
+#: dpkg-query.1:190
 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 "
@@ -11229,39 +11871,41 @@
 "i zainstalowaną wersję tego pakietu, można uruchomić:"
 
 #. type: Plain text
-#: dpkg-query.1:187
+#: dpkg-query.1:193
 #, no-wrap
 msgid "  B<dpkg-query -W -f=\\(aq${Package} ${Version}\\et${Maintainer}\\en\\(aq dpkg>\n"
 msgstr "  B<dpkg-query -W -f=\\(aq${Package} ${Version}\\et${Maintainer}\\en\\(aq dpkg>\n"
 
 #. type: SH
-#: dpkg-query.1:189 dpkg-split.1:180 start-stop-daemon.8:256
-#: update-alternatives.8:375
+#: dpkg-query.1:195 dpkg-split.1:179 start-stop-daemon.8:259
+#: update-alternatives.8:374
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "KOD WYJŚCIA"
 
-#. type: IP
-#: dpkg-query.1:190 update-alternatives.8:376
+#. type: TP
+#: dpkg-query.1:196 dpkg-split.1:180 start-stop-daemon.8:260
+#: start-stop-daemon.8:289 update-alternatives.8:375
 #, no-wrap
-msgid "0"
-msgstr "0"
+msgid "B<0>"
+msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:192
+#: dpkg-query.1:199
 #, fuzzy
 #| msgid "The requested action was successfully performed."
 msgid "The requested query was successfully performed."
 msgstr "Akcja zakończyła się powodzeniem."
 
-#. type: IP
-#: dpkg-query.1:192
+#. type: TP
+#: dpkg-query.1:199 dpkg-split.1:186 start-stop-daemon.8:270
+#: start-stop-daemon.8:292
 #, no-wrap
-msgid "1"
+msgid "B<1>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:195
+#: dpkg-query.1:203
 #, fuzzy
 #| msgid ""
 #| "Problems were encountered whilst parsing the command line or performing "
@@ -11273,7 +11917,7 @@
 "Wystąpiły problemy podczas przetwarzania linii poleceń lub wykonywania akcji."
 
 #. type: Plain text
-#: dpkg-query.1:205
+#: dpkg-query.1:213
 msgid ""
 "This setting influences the output of the B<--list> option by changing the "
 "width of its output."
@@ -11281,7 +11925,7 @@
 "Zmienna ta wpływa na wyjście polecenia B<--list>, zmieniając jego szerokość."
 
 #. type: Plain text
-#: dpkg-query.1:208
+#: dpkg-query.1:216
 msgid "Copyright \\(co 2001 Wichert Akkerman"
 msgstr "Copyright \\(co 2001 Wichert Akkerman"
 
@@ -11291,29 +11935,26 @@
 msgid "dpkg-scanpackages"
 msgstr "dpkg-scanpackages"
 
-#. type: TH
-#: dpkg-scanpackages.1:15 dpkg-scansources.1:1
-#, fuzzy, no-wrap
-#| msgid "2007-10-08"
-msgid "2009-10-01"
-msgstr "2007-10-08"
-
 #. type: Plain text
 #: dpkg-scanpackages.1:18
 msgid "dpkg-scanpackages - create Packages index files"
 msgstr "dpkg-scanpackages - tworzy plik indeksowe Packages"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:27
+#: dpkg-scanpackages.1:26
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+#| "prefix>]] B<E<gt>> I<Packages>"
 msgid ""
-"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scanpackages> [I<option>...] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
 "B<dpkg-scanpackages> [I<opcje>] I<katalog_binarny> [I<plik_nadpisań> "
 "[I<prefiks_ścieżki>]] B<E<gt>> I<Packages>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:40
+#: dpkg-scanpackages.1:39
 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 "
@@ -11331,7 +11972,7 @@
 "grupie komputerów."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:52
+#: dpkg-scanpackages.1:51
 #, fuzzy
 #| msgid ""
 #| "B<Note:> If you want to access the generated Packages file with B<apt> "
@@ -11352,7 +11993,7 @@
 "z wyjątkiem lokalnego dostępu (tj. pochodzącego z B<file://>)."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:59
+#: 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 "
@@ -11365,7 +12006,7 @@
 "Filename w nowym pliku Packages będzie się zaczynać od tego łańcucha znaków."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-scanpackages.1:63
 #, fuzzy
 #| msgid ""
 #| "I<overridefile> is the name of a file to read which contains information "
@@ -11379,7 +12020,7 @@
 "tym, jak umiejscowić pakiet w dystrybucji; patrz B<deb-override>(5)."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-scanpackages.1:66
 msgid ""
 "I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
@@ -11387,7 +12028,7 @@
 "poprzedzał nazwy plików w polu Filename."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:71
+#: dpkg-scanpackages.1:70
 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 "
@@ -11399,35 +12040,35 @@
 "użyta pierwsza znaleziona wersja."
 
 #. type: TP
-#: dpkg-scanpackages.1:73
+#: dpkg-scanpackages.1:72
 #, no-wrap
 msgid "B<-t>, B<--type> I<type>"
 msgstr "B<-t>, B<--type> I<typ>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 msgid "Scan for *.I<type> packages, instead of *.deb."
 msgstr "Szukanie plików *.I<typ> zamiast *.deb."
 
 #. type: TP
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 #, no-wrap
 msgid "B<-u>, B<--udeb>"
 msgstr "B<-u>, B<--udeb>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:79
+#: dpkg-scanpackages.1:78
 msgid "B<Obsolete> alias for B<-tudeb>."
 msgstr "B<Przestarzały> alias dla B<-tudeb>."
 
 #. type: IP
-#: dpkg-scanpackages.1:79 dpkg-scansources.1:50
+#: dpkg-scanpackages.1:78 dpkg-scansources.1:49
 #, no-wrap
 msgid "B<-e>, B<--extra-override> I<file>"
 msgstr "B<-e>, B<--extra-override> I<plik>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:85 dpkg-scansources.1:55
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:54
 #, fuzzy
 #| msgid ""
 #| "Scan I<file> to find supplementary overrides. See B<deb-extra-override>"
@@ -11440,13 +12081,13 @@
 "B<deb-extra-override>(5), aby poznać pełny opis wymaganego formatu."
 
 #. type: TP
-#: dpkg-scanpackages.1:85
+#: dpkg-scanpackages.1:84
 #, no-wrap
 msgid "B<-a>, B<--arch> I<arch>"
 msgstr "B<-a>, B<--arch> I<architektura>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 #, fuzzy
 #| msgid ""
 #| "Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
@@ -11459,25 +12100,25 @@
 "wszystkich plików deb."
 
 #. type: TP
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 #, no-wrap
 msgid "B<-m>, B<--multiversion>"
 msgstr "B<-m>, B<--multiversion>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 msgid "Include all found packages in the output."
 msgstr "Wypisuje wszystkie znalezione pakiety."
 
 #. type: TP
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 #, fuzzy, no-wrap
 #| msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgid "B<-M>, B<--medium> I<id-string>"
 msgstr "B<-p>, B<--pidfile> I<pid-file>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:97
+#: dpkg-scanpackages.1:96
 msgid ""
 "Add an X-Medium field containing the value I<id-string>. This field is "
 "required if you want to generate B<Packages.cd> files for use by the multicd "
@@ -11485,13 +12126,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-scanpackages.1:104 update-alternatives.8:447
+#: dpkg-scanpackages.1:103 update-alternatives.8:448
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSTYKA"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:110
+#: dpkg-scanpackages.1:109
 msgid ""
 "B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
 "warns about packages that are in the wrong subdirectory, are duplicated, "
@@ -11506,7 +12147,7 @@
 
 #
 #. type: Plain text
-#: dpkg-scanpackages.1:116
+#: dpkg-scanpackages.1:115
 msgid ""
 "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<deb-extra-override>(5), "
 "B<dpkg-scansources>(1)."
@@ -11526,16 +12167,20 @@
 msgstr "dpkg-scanpackages - tworzy pliki indeksowe Sources"
 
 #. type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-scansources.1:12
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+#| "prefix>]] B<E<gt>> I<Sources>"
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scansources> [I<option>...] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
 "B<dpkg-scansources> [I<opcje>] I<katalog_binarny> [I<plik_nadpisań> "
 "[I<prefiks_ścieżki>]] B<E<gt>> I<Sources>"
 
 #. type: Plain text
-#: dpkg-scansources.1:18
+#: dpkg-scansources.1:17
 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."
@@ -11545,7 +12190,7 @@
 "następnie jest wypisywany na standardowe wyjście."
 
 #. type: Plain text
-#: dpkg-scansources.1:29
+#: dpkg-scansources.1:28
 #, fuzzy
 #| msgid ""
 #| "The I<override-file>, if given, is used to set priorities in the "
@@ -11579,7 +12224,7 @@
 "pakietu binarnego wymienionego w pliku I<.dsc>. Może się to zmienić."
 
 #. type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-scansources.1:32
 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 "
@@ -11591,7 +12236,7 @@
 "Debiana."
 
 #. type: Plain text
-#: dpkg-scansources.1:44
+#: dpkg-scansources.1:43
 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 "
@@ -11604,13 +12249,13 @@
 "pochodzącego z B<file://>)."
 
 #. type: IP
-#: dpkg-scansources.1:46
+#: dpkg-scansources.1:45
 #, no-wrap
 msgid "B<-n>, B<--no-sort>"
 msgstr "B<-n>, B<--no-sort>"
 
 #. type: Plain text
-#: dpkg-scansources.1:49
+#: dpkg-scansources.1:48
 msgid ""
 "Don't sort the index records. Normally they are sorted by source package "
 "name."
@@ -11619,13 +12264,13 @@
 "źródłowego."
 
 #. type: IP
-#: dpkg-scansources.1:55
+#: dpkg-scansources.1:54
 #, no-wrap
 msgid "B<-s>, B<--source-override> I<file>"
 msgstr "B<-s>, B<--source-override> I<plik>"
 
 #. type: Plain text
-#: dpkg-scansources.1:59
+#: dpkg-scansources.1:58
 #, fuzzy
 #| msgid ""
 #| "Use I<file> as the source override file. The default is the name of the "
@@ -11638,7 +12283,7 @@
 "pliku nadpisań z dołączonym rozszerzeniem I<.src>."
 
 #. type: Plain text
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 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 "
@@ -11653,23 +12298,23 @@
 "ustawiania sekcji nadpisanie źródeł ma większy priorytet."
 
 #. type: IP
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 #. type: Plain text
-#: dpkg-scansources.1:67
+#: dpkg-scansources.1:66
 msgid "Turn debugging on."
 msgstr "Włącza tryb debugowania."
 
 #. type: Plain text
-#: dpkg-scansources.1:76
+#: dpkg-scansources.1:75
 msgid "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 msgstr "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 
 #. type: Plain text
-#: dpkg-scansources.1:78
+#: dpkg-scansources.1:77
 msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 
@@ -11679,14 +12324,6 @@
 msgid "dpkg-shlibdeps"
 msgstr "dpkg-shlibdeps"
 
-#. type: TH
-#: dpkg-shlibdeps.1:1 dpkg-source.1:2 start-stop-daemon.8:1
-#: update-alternatives.8:8
-#, fuzzy, no-wrap
-#| msgid "2007-03-07"
-msgid "2011-03-04"
-msgstr "2007-03-07"
-
 #. type: Plain text
 #: dpkg-shlibdeps.1:4
 msgid "dpkg-shlibdeps - generate shared library substvar dependencies"
@@ -11694,21 +12331,31 @@
 "dpkg-shlibdeps - generowanie zależności podstawień współdzielonych bibliotek"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:10
-msgid ""
-"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
+#: dpkg-shlibdeps.1:8
+#, fuzzy
+#| msgid ""
+#| "B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> "
+#| "[I<options>]"
+msgid "B<dpkg-shlibdeps> [I<option>...] [B<-e>]I<executable> [I<option>...]"
 msgstr ""
 "B<dpkg-shlibdeps> [I<opcje>] I<plik_wykonywalny>|B<-e>I<plik_wykonywalny> "
 "[I<opcje>]"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:24
+#: dpkg-shlibdeps.1:22
+#, 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."
 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."
+"other variables starting with B<shlibs:> are removed from the file."
 msgstr ""
 "B<dpkg-shlibdeps> określa zależności podstawień współdzielonych bibliotek "
 "dla plików wykonywalnych podanych jako argumenty. Zależności te są dodawane "
@@ -11718,7 +12365,7 @@
 "usuwane z tego pliku."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 msgid ""
 "B<dpkg-shlibdeps> has two possible sources of information to generate "
 "dependency information. Either I<symbols> files or I<shlibs> files. For each "
@@ -11747,13 +12394,13 @@
 "biblioteki> w celu określenia pakietu dostarczającego daną bibliotekę."
 
 #. type: SS
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 #, no-wrap
 msgid "Symbols files"
 msgstr "Pliki symboli"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 msgid ""
 "Symbols files contain finer-grained dependency information by providing the "
 "minimum dependency for each symbol that the library exports. The script "
@@ -11766,13 +12413,13 @@
 "następujących miejscach (użyte jest pierwsze dopasowanie):"
 
 #. type: IP
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 #, no-wrap
 msgid "debian/*/DEBIAN/symbols"
 msgstr "debian/*/DEBIAN/symbols"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are generated by B<dpkg-gensymbols>(1).  "
@@ -11787,19 +12434,19 @@
 "nad plikami symboli z innych pakietów binarnych."
 
 #. type: IP
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols.I<arch>"
 msgstr "/etc/dpkg/symbols/I<pakiet>.symbols.I<arch>"
 
 #. type: IP
-#: dpkg-shlibdeps.1:61
+#: dpkg-shlibdeps.1:59
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols"
 msgstr "/etc/dpkg/symbols/I<pakiet>.symbols"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 msgid ""
 "Per-system overriding shared library dependency information.  I<arch> is the "
 "architecture of the current system (obtained by B<dpkg-architecture -"
@@ -11810,13 +12457,13 @@
 "(określoną przez B<dpkg-architecture -qDEB_HOST_ARCH>)."
 
 #. type: IP
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> symbols\\(rq"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:68 dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:66 dpkg-shlibdeps.1:100
 #, fuzzy
 #| msgid ""
 #| "Package-provided shared library dependency information.  Unless "
@@ -11830,7 +12477,7 @@
 "dpkg."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:75
+#: dpkg-shlibdeps.1:73
 msgid ""
 "While scanning the symbols used by all binaries, B<dpkg-shlibdeps> remembers "
 "the (biggest) minimal version needed for each library. At the end of the "
@@ -11844,7 +12491,7 @@
 "plików I<symbols> jest dokładna)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 msgid ""
 "As a safe-guard measure, a symbols file can provide a I<Build-Depends-"
 "Package> meta-information field and B<dpkg-shlibdeps> will extract the "
@@ -11859,13 +12506,13 @@
 "przeszukiwaniu symboli."
 
 #. type: SS
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 #, no-wrap
 msgid "Shlibs files"
 msgstr "Pliki \"shlibs\""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:86
+#: dpkg-shlibdeps.1:84
 msgid ""
 "Shlibs files associate directly a library to a dependency (without looking "
 "at the symbols). It's thus often stronger than really needed but very safe "
@@ -11876,7 +12523,7 @@
 "potrzebne, ale bardzo bezpieczne i łatwe w obsłudze."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 msgid ""
 "The dependencies for a library are looked up in several places. The first "
 "file providing information for the library of interest is used:"
@@ -11885,39 +12532,39 @@
 "pierwszy plik zawierający informacje dla danej biblioteki:"
 
 #. type: IP
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 #, no-wrap
 msgid "debian/shlibs.local"
 msgstr "debian/shlibs.local"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 msgid "Package-local overriding shared library dependency information."
 msgstr ""
 "Lokalne informacje z pakietu nadpisujące informacje o zależnościach "
 "bibliotek współdzielonych."
 
 #. type: IP
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 #, no-wrap
 msgid "/etc/dpkg/shlibs.override"
 msgstr "/etc/dpkg/shlibs.override"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 msgid "Per-system overriding shared library dependency information."
 msgstr ""
 "Informacje o zasięgu systemu, które nadpisują informacje o zależnościach "
 "bibliotek współdzielonych."
 
 #. type: IP
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 #, no-wrap
 msgid "debian/*/DEBIAN/shlibs"
 msgstr "debian/*/DEBIAN/shlibs"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are only used if the library is found in a "
@@ -11931,26 +12578,26 @@
 "\""
 
 #. type: IP
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> shlibs\\(rq"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:100
 #, no-wrap
 msgid "/etc/dpkg/shlibs.default"
 msgstr "/etc/dpkg/shlibs.default"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:104
+#: dpkg-shlibdeps.1:102
 msgid "Per-system default shared library dependency information."
 msgstr ""
 "Domyślna informacja o zależnościach bibliotek współdzielonych, o zakresie "
 "systemu."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:108
+#: dpkg-shlibdeps.1:106
 msgid ""
 "The extracted dependencies are then directly used (except if they are "
 "filtered out because they have been identified as duplicate, or as weaker "
@@ -11961,7 +12608,7 @@
 "zależność)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 msgid ""
 "B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
 "as if they'd been supplied as B<-e>I<executable>."
@@ -11970,13 +12617,13 @@
 "plików wykonywalnych, tak jakby były podane przez B<-e>I<plik_wykonywalny>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 #, no-wrap
 msgid "B<-e>I<executable>"
 msgstr "B<-e>I<plik_wykonywalny>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 msgid ""
 "Include dependencies appropriate for the shared libraries required by "
 "I<executable>."
@@ -11985,13 +12632,13 @@
 "przez I<plik_wykonywalny>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 #, no-wrap
 msgid "B<-d>I<dependencyfield>"
 msgstr "B<-d>I<pole_zależności>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:123
+#: dpkg-shlibdeps.1:121
 msgid ""
 "Add dependencies to be added to the control file dependency field "
 "I<dependencyfield>.  (The dependencies for this field are placed in the "
@@ -12002,7 +12649,7 @@
 "umieszczane w zmiennej B<shlibs:>I<pole_zależności>.)"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:133
+#: dpkg-shlibdeps.1:131
 msgid ""
 "The B<-d>I<dependencyfield> option takes effect for all executables after "
 "the option, until the next B<-d>I<dependencyfield>.  The default "
@@ -12013,7 +12660,7 @@
 "I<polem_zależności> jest B<Depends>."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 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>, "
@@ -12028,13 +12675,13 @@
 "najważniejsze zależności."
 
 #. type: TP
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 #, no-wrap
 msgid "B<-p>I<varnameprefix>"
 msgstr "B<-p>I<prefiks_nazw_zmiennych>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:152
+#: dpkg-shlibdeps.1:150
 msgid ""
 "Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
 ">.  Likewise, any existing substitution variables starting with "
@@ -12047,7 +12694,7 @@
 "zmiennych podstawiania."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 msgid ""
 "Print substitution variable settings to standard output, rather than being "
 "added to the substitution variables file (B<debian/substvars> by default)."
@@ -12057,13 +12704,13 @@
 "substvars>)."
 
 #. type: TP
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 #, no-wrap
 msgid "B<-t>I<type>"
 msgstr "B<-t>I<typ>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 msgid ""
 "Prefer shared library dependency information tagged for the given package "
 "type. If no tagged information is available, falls back to untagged "
@@ -12079,13 +12726,13 @@
 "znakami (spacjami)."
 
 #. type: TP
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 #, no-wrap
 msgid "B<-L>I<localshlibsfile>"
 msgstr "B<-L>I<lokalny_plik_shlibs>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:171
+#: dpkg-shlibdeps.1:169
 msgid ""
 "Read overriding shared library dependency information from "
 "I<localshlibsfile> instead of B<debian/shlibs.local>."
@@ -12094,7 +12741,7 @@
 "I<lokalnego_pliku_shlibs> zamiast B<debian/shlibs.local>."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 msgid ""
 "Write substitution variables in I<substvarsfile>; the default is B<debian/"
 "substvars>."
@@ -12103,13 +12750,13 @@
 "to B<debian/substvars>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 #, no-wrap
 msgid "B<-v>"
 msgstr "B<-v>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 msgid ""
 "Enable verbose mode. Numerous messages are displayed to explain what B<dpkg-"
 "shlibdeps> does."
@@ -12118,13 +12765,13 @@
 "tłumaczących działanie B<dpkg-shlibdeps>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 #, no-wrap
 msgid "B<-x>I<package>"
 msgstr "B<-x>I<pakiet>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 msgid ""
 "Exclude the package from the generated dependencies. This is useful to avoid "
 "self-dependencies for packages which provide ELF binaries (executables or "
@@ -12138,13 +12785,13 @@
 "wielokrotnie aby wyłączyć kilka pakietów."
 
 #. type: TP
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 #, no-wrap
 msgid "B<-S>I<pkgbuilddir>"
 msgstr "B<-S>I<katalog_budowania_pakietu>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 msgid ""
 "Look into I<pkgbuilddir> first when trying to find a library. This is useful "
 "when the source package builds multiple flavors of the same library and you "
@@ -12159,13 +12806,13 @@
 "tej samej kolejności przed katalogami innych pakietów binarnych."
 
 #. type: TP
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 #, no-wrap
 msgid "B<--ignore-missing-info>"
 msgstr "B<--ignore-missing-info>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 msgid ""
 "Do not fail if dependency information can't be found for a shared library.  "
 "Usage of this option is discouraged, all libraries should provide dependency "
@@ -12178,13 +12825,13 @@
 "symboli) - nawet jeśli nie są jeszcze używane przez inne pakiety."
 
 #. type: TP
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 #, no-wrap
 msgid "B<--warnings=>I<value>"
 msgstr "B<--warnings=>I<wartość>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:213
+#: dpkg-shlibdeps.1:211
 msgid ""
 "I<value> is a bit field defining the set of warnings that can be emitted by "
 "B<dpkg-shlibdeps>.  Bit 0 (value=1) enables the warning \"symbol I<sym> used "
@@ -12205,13 +12852,13 @@
 "ostrzeżeń."
 
 #. type: SH
-#: dpkg-shlibdeps.1:224
+#: dpkg-shlibdeps.1:222
 #, no-wrap
 msgid "WARNINGS"
 msgstr "UWAGI"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 msgid ""
 "Since B<dpkg-shlibdeps> analyzes the set of symbols used by each binary of "
 "the generated package, it is able to emit warnings in several cases. They "
@@ -12227,13 +12874,13 @@
 "malejącej ważności:"
 
 #. type: TP
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 #, no-wrap
 msgid "B<symbol>I< sym>B< used by >I<binary>B< found in none of the libraries.>"
 msgstr "B<w żadnej z bibliotek nie znaleziono symbolu>I< symb>B< używanego przez >I<plik_binarny>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a library and it needs to be linked "
@@ -12246,13 +12893,13 @@
 "(opcja B<-l>I<biblioteka> linkera)."
 
 #. type: TP
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 #, no-wrap
 msgid "I<binary>B< contains an unresolvable reference to symbol >I<sym>B<: it's probably a plugin>"
 msgstr "I<plik_binarny>B< zawiera nierozwiązywalne odniesienie do symbolu >I<sym>B<: prawdopodobnie jest to wtyczka>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a plugin and the symbol is probably "
@@ -12278,13 +12925,13 @@
 "zepsutą i należy ją naprawić."
 
 #. type: TP
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 #, no-wrap
 msgid "B<dependency on >I<library>B< could be avoided if >I<binaries>B< were not uselessly linked against it (they use none of its symbols).>"
 msgstr "B<można by uniknąć zależności od >I<biblioteki>B<, jeżeli nie byłoby niepotrzebnego linkowania >I<plików_binarnych>B< z nią (nie są używane żadne z tamtejszych symboli).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 msgid ""
 "None of the I<binaries> that are linked with I<library> use any of the "
 "symbols provided by the library. By fixing all the binaries, you would avoid "
@@ -12298,13 +12945,13 @@
 "używana)."
 
 #. type: TP
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 #, no-wrap
 msgid "I<binary>B< shouldn't be linked with >I<library>B< (it uses none of its symbols).>"
 msgstr "I<plik_binarny>B< nie powinien być linkowany z >I<biblioteką>B< (nie są używane żadne z tamtejszych symboli).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 msgid ""
 "The I<binary> is linked to a library that it doesn't need. It's not a "
 "problem but some small performance improvements in binary load time can be "
@@ -12320,13 +12967,13 @@
 "analizowanych plików."
 
 #. type: SH
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 #, no-wrap
 msgid "ERRORS"
 msgstr "BŁĘDY"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 msgid ""
 "B<dpkg-shlibdeps> will fail if it can't find a public library used by a "
 "binary or if this library has no associated dependency information (either "
@@ -12342,13 +12989,27 @@
 "wtyczki) nie powinny mieć SONAME i nie muszą być wersjonowane."
 
 #. type: TP
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 #, no-wrap
 msgid "B<couldn't find library >I<library-soname>B< needed by >I<binary>B< (its RPATH is '>I<rpath>B<')>"
 msgstr "B<nie można znaleźć biblioteki >I<soname-biblioteki>B< potrzebnej dla >I<pliku_binarnego>B< (RPATH to \">I<rpath>B<\")>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:287
+#: dpkg-shlibdeps.1:285
+#, fuzzy
+#| msgid ""
+#| "The I<binary> uses a library called I<library-soname> but B<dpkg-"
+#| "shlibdeps> has been unable to find the library.  B<dpkg-shlibdeps> "
+#| "creates a list of directories to check as following: directories listed "
+#| "in the RPATH of the binary, directories listed in /etc/ld.so.conf, "
+#| "directories listed in the LD_LIBRARY_PATH environment variable, and "
+#| "standard public directories (/lib, /usr/lib, /lib32, /usr/lib32, /lib64, /"
+#| "usr/lib64). Then it checks those directories in the package's build tree "
+#| "of the binary being analyzed, in the packages's build trees indicated "
+#| "with the -S command-line option, in other packages's build trees that "
+#| "contains a DEBIAN/shlibs or DEBIAN/symbols file and finally in the root "
+#| "directory.  If the library is not found in any of those directories, then "
+#| "you get this error."
 msgid ""
 "The I<binary> uses a library called I<library-soname> but B<dpkg-shlibdeps> "
 "has been unable to find the library.  B<dpkg-shlibdeps> creates a list of "
@@ -12357,8 +13018,8 @@
 "LD_LIBRARY_PATH environment variable, and standard public directories (/"
 "lib, /usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks those "
 "directories in the package's build tree of the binary being analyzed, in the "
-"packages's build trees indicated with the -S command-line option, in other "
-"packages's build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
+"packages' build trees indicated with the -S command-line option, in other "
+"packages' build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
 "and finally in the root directory.  If the library is not found in any of "
 "those directories, then you get this error."
 msgstr ""
@@ -12375,7 +13036,7 @@
 "nie zostanie odnaleziona w żadnym z tych katalogów, otrzymuje się ten błąd."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 msgid ""
 "If the library not found is in a private directory of the same package, then "
 "you want to add the directory to LD_LIBRARY_PATH. If it's in another binary "
@@ -12390,13 +13051,13 @@
 "zawiera odpowiedni katalog jeśli biblioteka także jest w katalogu prywatnym."
 
 #. type: TP
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 #, no-wrap
 msgid "B<no dependency information found for >I<library-file>B< (used by >I<binary>B<).>"
 msgstr "B<nie znaleziono informacji o zależnościach dla >I<plik-biblioteki>B< (używanego przez >I<plik-binarny>B<).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:306
+#: dpkg-shlibdeps.1:304
 msgid ""
 "The library needed by I<binary> has been found by B<dpkg-shlibdeps> in "
 "I<library-file> but B<dpkg-shlibdeps> has been unable to find any dependency "
@@ -12414,7 +13075,7 @@
 "różnych drzewach budowania pakietów (debian/*/DEBIAN/)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:320
+#: dpkg-shlibdeps.1:318
 msgid ""
 "This failure can be caused by a bad or missing shlibs or symbols file in the "
 "package of the library. It might also happen if the library is built within "
@@ -12441,7 +13102,7 @@
 "doprowadzić do porządku RPATH pliku binarnego."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:326
+#: dpkg-shlibdeps.1:324
 msgid ""
 "Calling B<dpkg-shlibdeps> in verbose mode (-v) will provide much more "
 "information about where it tried to find the dependency information. This "
@@ -12453,12 +13114,12 @@
 "jest ten błąd."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:330
+#: dpkg-shlibdeps.1:328
 msgid "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 msgstr "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:337
+#: dpkg-shlibdeps.1:335
 msgid "Copyright \\(co 2006 Frank Lichtenheld"
 msgstr "Copyright \\(co 2006 Frank Lichtenheld"
 
@@ -12475,18 +13136,20 @@
 "dpkg-source - narzędzia do zarządzania źródłowymi pakietami Debiana (.dsc)"
 
 #. type: Plain text
-#: dpkg-source.1:10
-msgid "B<dpkg-source> [I<options>] I<command>"
+#: dpkg-source.1:9
+#, fuzzy
+#| msgid "B<dpkg-source> [I<options>] I<command>"
+msgid "B<dpkg-source> [I<option>...] I<command>"
 msgstr "B<dpkg-source> [I<opcje>] I<polecenie>"
 
 #. type: Plain text
-#: dpkg-source.1:14
+#: dpkg-source.1:13
 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:18
+#: dpkg-source.1:17
 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 "
@@ -12496,13 +13159,13 @@
 "pozwalają również na podawanie wartości opcji jako oddzielnego parametru."
 
 #. type: TP
-#: dpkg-source.1:20
+#: dpkg-source.1:19
 #, 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:30
+#: dpkg-source.1:29
 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 "
@@ -12520,7 +13183,7 @@
 "katalogu roboczego."
 
 #. type: Plain text
-#: dpkg-source.1:36
+#: dpkg-source.1:35
 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 "
@@ -12530,7 +13193,7 @@
 "pliku kontrolnego; zakładane jest, że są one w tym samym katalogu co B<.dsc>."
 
 #. type: Plain text
-#: dpkg-source.1:44
+#: dpkg-source.1:43
 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 "
@@ -12548,7 +13211,7 @@
 "przejmą ustawienia grupy katalogu nadrzędnego."
 
 #. type: Plain text
-#: dpkg-source.1:49
+#: dpkg-source.1:48
 msgid ""
 "If the source package uses a non-standard format (currently this means all "
 "formats except \"1.0\"), its name will be stored in B<debian/source/format> "
@@ -12561,13 +13224,13 @@
 "źródłowego będzie domyślnie używany ten sam format."
 
 #. type: TP
-#: dpkg-source.1:50
+#: dpkg-source.1:49
 #, no-wrap
 msgid "B<-b> I<directory> [I<format-specific-parameters>]"
 msgstr "B<-b>, I<katalog> [I<parametry-zależne-od-formatu>]"
 
 #. type: Plain text
-#: dpkg-source.1:57
+#: dpkg-source.1:56
 msgid ""
 "Build a source package. The first non-option argument is taken as the name "
 "of the directory containing the debianized source tree (i.e. with a debian "
@@ -12582,7 +13245,7 @@
 "budowaniu pakietu, mogą być również akceptowane dodatkowe parametry."
 
 #. type: Plain text
-#: dpkg-source.1:66
+#: dpkg-source.1:65
 #, fuzzy
 #| msgid ""
 #| "B<dpkg-source> will build the source package with the first format that "
@@ -12592,7 +13255,7 @@
 #| "for an extensive description of the various source package formats."
 msgid ""
 "B<dpkg-source> will build the source package with the first format found in "
-"this ordered list: the format indicated with the I<--format> command-line "
+"this ordered list: the format indicated with the I<--format> command line "
 "option, the format indicated in B<debian/source/format>, \"1.0\". The "
 "fallback to \"1.0\" is deprecated and will be removed at some point in the "
 "future, you should always document the desired source format in B<debian/"
@@ -12606,14 +13269,14 @@
 "można znaleźć wyczerpujący opis różnych formatów pakietów źródłowych."
 
 #. type: TP
-#: dpkg-source.1:67
+#: dpkg-source.1:66
 #, fuzzy, no-wrap
 #| msgid "B<--admindir>I< directory>"
 msgid "B<--print-format> I<directory>"
 msgstr "B<--admindir>I< katalog>"
 
 #. type: Plain text
-#: dpkg-source.1:72
+#: dpkg-source.1:71
 msgid ""
 "Print the source format that would be used to build the source package if "
 "B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -12621,7 +13284,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:73
+#: dpkg-source.1:72
 #, fuzzy, no-wrap
 #| msgid "B<--depotdir>I< directory>"
 msgid "B<--before-build> I<directory>"
@@ -12630,12 +13293,12 @@
 #. type: Plain text
 #: dpkg-source.1:81
 msgid ""
-"This command should be called before any build of the package (B<dpkg-"
-"buildpackage> calls it very early even before B<debian/rules clean>). This "
-"command should be idempotent and can be called multiple times. Not all "
-"source formats implement something in this hook, and those that do usually "
-"prepare the source tree for the build for example by ensuring that the "
-"Debian patches are applied."
+"Run the corresponding hook of the source package format. This hook is called "
+"before any build of the package (B<dpkg-buildpackage> calls it very early "
+"even before B<debian/rules clean>). This command is idempotent and can be "
+"called multiple times. Not all source formats implement something in this "
+"hook, and those that do usually prepare the source tree for the build for "
+"example by ensuring that the Debian patches are applied."
 msgstr ""
 
 #. type: TP
@@ -12648,21 +13311,36 @@
 #. type: Plain text
 #: dpkg-source.1:89
 msgid ""
-"This command should be called after any build of the package (B<dpkg-"
-"buildpackage> calls it last). This command should be idempotent and can be "
-"called multiple times. Not all source formats implement something in this "
-"hook, and those that do usually use it to undo what B<--before-build> has "
-"done."
+"Run the corresponding hook of the source package format. This hook is called "
+"after any build of the package (B<dpkg-buildpackage> calls it last). This "
+"command is idempotent and can be called multiple times. Not all source "
+"formats implement something in this hook, and those that do usually use it "
+"to undo what B<--before-build> has done."
+msgstr ""
+
+#. type: TP
+#: dpkg-source.1:90
+#, fuzzy, no-wrap
+#| msgid "B<--admindir>I< directory>"
+msgid "B<--commit> [I<directory>] ..."
+msgstr "B<--admindir>I< katalog>"
+
+#. type: Plain text
+#: dpkg-source.1:95
+msgid ""
+"Record changes in the source tree unpacked in I<directory>. This command can "
+"take supplementary parameters depending on the source format.  It will error "
+"out for formats where this operation doesn't mean anything."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:97
+#: dpkg-source.1:103
 #, no-wrap
 msgid "GENERIC BUILD OPTIONS"
 msgstr "OGÓLNE OPCJE BUDOWANIA"
 
 #. type: Plain text
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 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 "
@@ -12673,7 +13351,7 @@
 "ona interpretowana od najwyższego poziomu katalogu drzewa ze źródłami."
 
 #. type: Plain text
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 msgid ""
 "Specifies the change log file to read information from. The default is "
 "B<debian/changelog>.  If given with relative pathname this is interpreted "
@@ -12684,13 +13362,13 @@
 "interpretowana od najwyższego poziomu katalogu drzewa ze źródłami."
 
 #. type: TP
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 #, no-wrap
 msgid "B<--format=>I<value>"
 msgstr "B<--format=>I<wartość>"
 
 #. type: Plain text
-#: dpkg-source.1:121
+#: dpkg-source.1:127
 #, fuzzy
 #| msgid ""
 #| "Try first the given format for building the source package. If used "
@@ -12705,7 +13383,7 @@
 "Nadpisuje to każdy format podany w pliku B<debian/source/format>."
 
 #. type: Plain text
-#: dpkg-source.1:131
+#: dpkg-source.1:137
 #, fuzzy
 #| msgid ""
 #| "Read substitution variables in I<substvarsfile>; the default is to not "
@@ -12719,13 +13397,13 @@
 "żadnego pliku."
 
 #. type: TP
-#: dpkg-source.1:137
+#: dpkg-source.1:143
 #, no-wrap
 msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 #, fuzzy
 #| msgid ""
 #| "Specify the compression to use for created files (tarballs and diffs).  "
@@ -12746,31 +13424,36 @@
 "jest wartością domyślną."
 
 #. type: TP
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 #, fuzzy, no-wrap
 #| msgid "B<-z>I<compress_level>"
 msgid "B<-z>I<level>, B<--compression-level>=I<level>"
 msgstr "B<-z>I<poziom_kompresji>"
 
 #. type: Plain text
-#: dpkg-source.1:151
+#: dpkg-source.1:157
+#, fuzzy
+#| msgid ""
+#| "Compression level to use. As with B<-Z> it only affects newly created "
+#| "files. Supported values are: I<1> to I<9>, I<best>, and I<fast>.  I<9> is "
+#| "the default."
 msgid ""
 "Compression level to use. As with B<-Z> it only affects newly created files. "
-"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  I<9> is the "
-"default."
+"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  The default is "
+"I<9> for gzip and bzip2, I<6> for xz and lzma."
 msgstr ""
 "Używany poziom kompresowania. Podobnie jak w wypadki B<-Z>, dotyczy tylko "
 "nowo tworzonych plików. Obsługiwane wartości: I<1> do I<9>, I<best> oraz "
 "I<fast>. I<9> jest wartością domyślną."
 
 #. type: TP
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 #, no-wrap
 msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:163
+#: dpkg-source.1:169
 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 "
@@ -12795,7 +13478,7 @@
 "uwagę."
 
 #. type: Plain text
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 msgid ""
 "This is very helpful in cutting out extraneous files that get included in "
 "the diff, e.g. if you maintain your source in a revision control system and "
@@ -12820,29 +13503,29 @@
 "\"($|/)\")."
 
 #. type: TP
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 #, no-wrap
 msgid "B<--extend-diff-ignore>=I<regexp>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 msgid ""
-"The perl regular expression specified will extend the default regular "
-"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
-"default regexp.  This option is convenient to use in B<debian/source/"
-"options> to exclude some auto-generated files from the automatic patch "
-"generation."
+"The perl regular expression specified will extend the default value of B<--"
+"diff-ignore> and its current value (if set). It does this by concatenating "
+"\"B<|>I<regexp>\" to the existing value.  This option is convenient to use "
+"in B<debian/source/options> to exclude some auto-generated files from the "
+"automatic patch generation."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 #, no-wrap
 msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:189
+#: dpkg-source.1:195
 msgid ""
 "If this option is specified, the pattern will be passed to B<tar>(1)'s --"
 "exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -12857,7 +13540,7 @@
 "wzorców wykluczeń."
 
 #. type: Plain text
-#: dpkg-source.1:194
+#: dpkg-source.1:200
 msgid ""
 "B<-I> by itself adds default --exclude options that will filter out control "
 "files and directories of the most common revision control systems, backup "
@@ -12869,7 +13552,7 @@
 "libtoola."
 
 #. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:212
 msgid ""
 "B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
 "different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -12892,7 +13575,7 @@
 "informacji."
 
 #. type: Plain text
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 msgid ""
 "The default regexp and patterns for both options can be seen in the output "
 "of the B<--help> command."
@@ -12901,43 +13584,43 @@
 "polecenia B<--help>."
 
 #. type: SH
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 #, no-wrap
 msgid "GENERIC EXTRACT OPTIONS"
 msgstr "OGÓLNE OPCJE ROZPAKOWYWANIA"
 
 #. type: TP
-#: dpkg-source.1:210
+#: dpkg-source.1:216
 #, no-wrap
 msgid "B<--no-copy>"
 msgstr "B<--no-copy>"
 
 #. type: Plain text
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 msgid "Do not copy original tarballs near the extracted source package."
 msgstr ""
 "Nie kopiuje oryginalnych archiwów obok rozpakowanego pakietu źródłowego."
 
 #. type: TP
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 #, no-wrap
 msgid "B<--no-check>"
 msgstr "B<--no-check>"
 
 #. type: Plain text
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 msgid "Do not check signatures and checksums before unpacking."
 msgstr ""
 "Bez weryfikacji podpisów i sprawdzania sum kontrolnych przed rozpakowaniem."
 
 #. type: TP
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 #, no-wrap
 msgid "B<--require-valid-signature>"
 msgstr "B<--require-valid-signature>"
 
 #. type: Plain text
-#: dpkg-source.1:224
+#: dpkg-source.1:230
 msgid ""
 "Refuse to unpack the source package if it doesn't contain an OpenPGP "
 "signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -12952,13 +13635,13 @@
 "I</usr/share/keyrings/debian-maintainers.gpg>)."
 
 #. type: SH
-#: dpkg-source.1:225
+#: dpkg-source.1:231
 #, no-wrap
 msgid "SOURCE PACKAGE FORMATS"
 msgstr "FORMATY PAKIETÓW ŹRÓDŁOWYCH"
 
 #. type: Plain text
-#: dpkg-source.1:230
+#: dpkg-source.1:236
 msgid ""
 "If you don't know what source format to use, you should probably pick either "
 "\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
@@ -12966,13 +13649,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:231
+#: dpkg-source.1:237
 #, no-wrap
 msgid "Format: 1.0"
 msgstr "Format: 1.0"
 
 #. type: Plain text
-#: dpkg-source.1:235
+#: dpkg-source.1:241
 msgid ""
 "A source package in this format consists either of a B<.orig.tar.gz> "
 "associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -12983,12 +13666,12 @@
 "gz> (w takim przypadku mówi się, że pakiet jest I<natywny>)."
 
 #. type: Plain text
-#: dpkg-source.1:237 dpkg-source.1:405 dpkg-source.1:566 dpkg-source.1:605
+#: dpkg-source.1:243 dpkg-source.1:411 dpkg-source.1:586 dpkg-source.1:625
 msgid "B<Extracting>"
 msgstr "B<Rozpakowywanie>"
 
 #. type: Plain text
-#: dpkg-source.1:247
+#: dpkg-source.1:253
 msgid ""
 "Extracting a native package is a simple extraction of the single tarball in "
 "the target directory. Extracting a non-native package is done by first "
@@ -13011,12 +13694,12 @@
 "długości)."
 
 #. type: Plain text
-#: dpkg-source.1:249 dpkg-source.1:433 dpkg-source.1:577 dpkg-source.1:610
+#: dpkg-source.1:255 dpkg-source.1:439 dpkg-source.1:597 dpkg-source.1:630
 msgid "B<Building>"
 msgstr "B<Budowanie>"
 
 #. type: Plain text
-#: dpkg-source.1:255
+#: dpkg-source.1:261
 msgid ""
 "Building a native package is just creating a single tarball with the source "
 "directory. Building a non-native package involves extracting the original "
@@ -13030,13 +13713,13 @@
 "pakietu źródłowego z katalogiem \".orig\"."
 
 #. type: TP
-#: dpkg-source.1:256
+#: dpkg-source.1:262
 #, no-wrap
 msgid "B<Build options (with -b):>"
 msgstr "B<Opcje budowania (z -b):>"
 
 #. type: Plain text
-#: dpkg-source.1:269
+#: dpkg-source.1:275
 msgid ""
 "If a second non-option argument is supplied it should be the name of the "
 "original source directory or tarfile or the empty string if the package is a "
@@ -13057,7 +13740,7 @@
 "oryginalnymi źródłami I<katalog>.orig."
 
 #. type: Plain text
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 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<-"
@@ -13068,13 +13751,13 @@
 "sP>, B<-sK>, B<-sU> i B<-sR>."
 
 #. type: TP
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 #, no-wrap
 msgid "B<-sk>"
 msgstr "B<-sk>"
 
 #. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:290
 msgid ""
 "Specifies to expect the original source as a tarfile, by default "
 "I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>.  It will leave "
@@ -13090,24 +13773,24 @@
 "różnic (diff)."
 
 #. type: TP
-#: dpkg-source.1:284 dpkg-source.1:353
+#: dpkg-source.1:290 dpkg-source.1:359
 #, no-wrap
 msgid "B<-sp>"
 msgstr "B<-sp>"
 
 #. type: Plain text
-#: dpkg-source.1:289
+#: dpkg-source.1:295
 msgid "Like B<-sk> but will remove the directory again afterwards."
 msgstr "Jak B<-sk>, ale ponownie usunie katalog po zakończeniu."
 
 #. type: TP
-#: dpkg-source.1:289 dpkg-source.1:359
+#: dpkg-source.1:295 dpkg-source.1:365
 #, no-wrap
 msgid "B<-su>"
 msgstr "B<-su>"
 
 #. type: Plain text
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 msgid ""
 "Specifies that 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 "
@@ -13118,24 +13801,24 @@
 "którego B<dpkg-source> utworzy nowe archiwum oryginalnych źródeł."
 
 #. type: TP
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 #, no-wrap
 msgid "B<-sr>"
 msgstr "B<-sr>"
 
 #. type: Plain text
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr "Jak B<-su>, jednakże usunie katalog po jego użyciu."
 
 #. type: TP
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 #, no-wrap
 msgid "B<-ss>"
 msgstr "B<-ss>"
 
 #. type: Plain text
-#: dpkg-source.1:310
+#: dpkg-source.1:316
 msgid ""
 "Specifies that the original source is available both as a directory and as a "
 "tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -13149,13 +13832,13 @@
 "zostanie wygenerowane niepoprawne archiwum źródłowe."
 
 #. type: TP
-#: dpkg-source.1:310 dpkg-source.1:362
+#: dpkg-source.1:316 dpkg-source.1:368
 #, no-wrap
 msgid "B<-sn>"
 msgstr "B<-sn>"
 
 #. type: Plain text
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 msgid ""
 "Specifies to not look for any original source, and to not generate a diff.  "
 "The second argument, if supplied, must be the empty string. This is used for "
@@ -13169,13 +13852,13 @@
 "(diff)."
 
 #. type: TP
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 #, no-wrap
 msgid "B<-sa> or B<-sA>"
 msgstr "B<-sa> lub B<-sA>"
 
 #. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:348
 msgid ""
 "Specifies to 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 "
@@ -13198,13 +13881,13 @@
 "źródłowego, po czym zostanie on usunięty (co jest równoważne B<-sr>)."
 
 #. type: TP
-#: dpkg-source.1:342 dpkg-source.1:525
+#: dpkg-source.1:348 dpkg-source.1:541
 #, no-wrap
 msgid "B<--abort-on-upstream-changes>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:348
+#: dpkg-source.1:354
 msgid ""
 "The process fails if the generated diff contains changes to files outside of "
 "the debian sub-directory. This option is not allowed in B<debian/source/"
@@ -13212,20 +13895,20 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:349
+#: dpkg-source.1:355
 #, no-wrap
 msgid "B<Extract options (with -x):>"
 msgstr "B<Opcje rozpakowywania (z -x):>"
 
 #. type: Plain text
-#: dpkg-source.1:353
+#: dpkg-source.1:359
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 "We wszystkich przypadkach, istniejące oryginalne drzewo ze źródłami będzie "
 "usunięte."
 
 #. type: Plain text
-#: dpkg-source.1:359
+#: dpkg-source.1:365
 msgid ""
 "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 "
@@ -13238,12 +13921,12 @@
 "(B<Jest to zachowanie domyślne>)."
 
 #. type: Plain text
-#: dpkg-source.1:362
+#: dpkg-source.1:368
 msgid "Unpacks the original source tree."
 msgstr "Rozpakowuje oryginalne drzewo źródeł programu."
 
 #. type: Plain text
-#: dpkg-source.1:367
+#: dpkg-source.1:373
 msgid ""
 "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 "
@@ -13254,7 +13937,7 @@
 "będzie usunięty z bieżącego katalogu."
 
 #. type: Plain text
-#: dpkg-source.1:372
+#: dpkg-source.1:378
 msgid ""
 "All the B<-s>I<X> options are mutually exclusive. If you specify more than "
 "one only the last one will be used."
@@ -13263,26 +13946,26 @@
 "podana więcej niż jedna, to zostanie użyta ostatnia z nich."
 
 #. type: TP
-#: dpkg-source.1:372 dpkg-source.1:535
+#: dpkg-source.1:378 dpkg-source.1:555
 #, no-wrap
 msgid "B<--skip-debianization>"
 msgstr "B<--skip-debianization>"
 
 #. type: Plain text
-#: dpkg-source.1:375
+#: dpkg-source.1:381
 msgid "Skips application of the debian diff on top of the upstream sources."
 msgstr ""
 "Pomija wykorzystanie różnic Debiana (debian diff) do nałożenia łatek na "
 "oryginalne źródła."
 
 #. type: SS
-#: dpkg-source.1:376
+#: dpkg-source.1:382
 #, no-wrap
 msgid "Format: 2.0"
 msgstr "Format: 2.0"
 
 #. type: Plain text
-#: dpkg-source.1:380
+#: dpkg-source.1:386
 msgid ""
 "Also known as wig&pen. This format is not recommended for wide-spread usage, "
 "the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -13293,7 +13976,7 @@
 "specyfikacją nowej generacji formatu pakietów źródłowych."
 
 #. type: Plain text
-#: dpkg-source.1:385
+#: dpkg-source.1:391
 msgid ""
 "The behaviour of this format is the same as the \"3.0 (quilt)\" format "
 "except that it doesn't use an explicit list of patches. All files in "
@@ -13306,7 +13989,7 @@
 "być prawidłowymi łatkami: są one nakładane podczas rozpakowywania."
 
 #. type: Plain text
-#: dpkg-source.1:388
+#: dpkg-source.1:394
 msgid ""
 "When building a new source package, any change to the upstream source is "
 "stored in a patch named B<zz_debian-diff-auto>."
@@ -13316,13 +13999,13 @@
 "nazwie B<zz_debian-diff-auto>."
 
 #. type: SS
-#: dpkg-source.1:389
+#: dpkg-source.1:395
 #, no-wrap
 msgid "Format: 3.0 (native)"
 msgstr "Format: 3.0 (native)"
 
 #. type: Plain text
-#: dpkg-source.1:395
+#: dpkg-source.1:401
 msgid ""
 "This format is an extension of the native package format as defined in the "
 "1.0 format. It supports all compression methods and will ignore by default "
@@ -13336,13 +14019,13 @@
 "wartości opcji B<-I> w informacjach uzyskiwanych poleceniem B<--help>)."
 
 #. type: SS
-#: dpkg-source.1:396
+#: dpkg-source.1:402
 #, no-wrap
 msgid "Format: 3.0 (quilt)"
 msgstr "Format: 3.0 (quilt)"
 
 #. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:409
 #, fuzzy
 #| msgid ""
 #| "A source package in this format contains at least an original tarball (B<."
@@ -13365,7 +14048,7 @@
 "oraz znaki myślnika (\"-\")."
 
 #. type: Plain text
-#: dpkg-source.1:414
+#: dpkg-source.1:420
 msgid ""
 "The main original tarball is extracted first, then all additional original "
 "tarballs are extracted in subdirectories named after the I<component> part "
@@ -13385,7 +14068,7 @@
 "B<--include-binaries>)."
 
 #. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:432
 msgid ""
 "All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
 "series> are then applied.  If the former file is used and the latter one "
@@ -13411,14 +14094,14 @@
 "prawdopodobnie się nie powiedzie."
 
 #. type: Plain text
-#: dpkg-source.1:428
+#: dpkg-source.1:434
 msgid ""
 "Similarly to quilt's default behaviour, the patches can remove files too."
 msgstr ""
 "Podobnie do domyślnego zachowania quilt, łatki mogą także usuwać pliki."
 
 #. type: Plain text
-#: dpkg-source.1:431
+#: dpkg-source.1:437
 #, fuzzy
 #| msgid ""
 #| "The file B<debian/patches/.dpkg-source-applied> is created if some "
@@ -13431,7 +14114,7 @@
 "plik B<debian/patches/.dpkg-source-applied>."
 
 #. type: Plain text
-#: dpkg-source.1:443
+#: dpkg-source.1:451
 #, fuzzy
 #| msgid ""
 #| "All original tarballs found in the current directory are extracted in a "
@@ -13452,9 +14135,11 @@
 "debian directory is copied over in the temporary directory, and all patches "
 "except the automatic patch (B<debian-changes->I<version> or B<debian-"
 "changes>, depending on B<--single-debian-patch>) are applied. The temporary "
-"directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in the automatic patch.  If the automatic patch is created/"
-"deleted, it's added/removed from the series file and from the quilt metadata."
+"directory is compared to the source package directory. When the diff is non-"
+"empty, the build fails unless B<--single-debian-patch> or B<--auto-commit> "
+"has been used, in which case the diff is stored in the automatic patch.  If "
+"the automatic patch is created/deleted, it's added/removed from the series "
+"file and from the quilt metadata."
 msgstr ""
 "Wszystkie oryginalne archiwa znalezione w bieżącym katalogu są rozpakowywane "
 "do katalogu tymczasowego w taki sam sposób jak dla unpack, następnie katalog "
@@ -13471,7 +14156,7 @@
 "binaries>."
 
 #. type: Plain text
-#: dpkg-source.1:451
+#: dpkg-source.1:459
 #, fuzzy
 #| msgid ""
 #| "All original tarballs found in the current directory are extracted in a "
@@ -13509,7 +14194,7 @@
 "binaries>."
 
 #. type: Plain text
-#: dpkg-source.1:454
+#: dpkg-source.1:462
 msgid ""
 "The updated debian directory and the list of modified binaries is then used "
 "to generate the debian tarball."
@@ -13518,7 +14203,7 @@
 "następnie używane do powtórnego wygenerowania archiwum debian."
 
 #. type: Plain text
-#: dpkg-source.1:460
+#: dpkg-source.1:468
 msgid ""
 "The automatically generated diff doesn't include changes on VCS specific "
 "files as well as many temporary files (see default value associated to B<-i> "
@@ -13533,7 +14218,7 @@
 "łatki."
 
 #. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:477
 #, fuzzy
 #| msgid ""
 #| "Note: B<dpkg-source> expects the source tree to have all patches listed "
@@ -13550,17 +14235,12 @@
 #| "patches have not been applied and will apply them all.  The option B<--no-"
 #| "preparation> can be used to disable this behaviour."
 msgid ""
-"Note: B<dpkg-source> expects the source tree to have all patches listed in "
-"the series file applied when you generate the source package.  This is not "
-"the case when the source tree has been obtained by unpacking a source "
-"package using the Format: 1.0 for instance. To mitigate the problem, B<dpkg-"
-"source> will apply the patches by itself if it believes that they have not "
-"yet been applied. To detect this situation, it uses the following heuristic: "
-"it finds the list of supposedly unapplied patches (they are listed in the "
-"B<series> file but not in B<.pc/applied-patches>), and if the first patch in "
-"that set can be applied without errors, it will apply them all.  The option "
-"B<--no-preparation> can be used to disable this behaviour. This operation is "
-"usually done as part of the B<--prepare-build> command."
+"Note: B<dpkg-source> B<--before-build> (and B<-b>) will ensure that all "
+"patches listed in the series file are applied so that a package build always "
+"has all patches applied. It does this by finding unapplied patches (they are "
+"listed in the B<series> file but not in B<.pc/applied-patches>), and if the "
+"first patch in that set can be applied without errors, it will apply them "
+"all. The option B<--no-preparation> can be used to disable this behavior."
 msgstr ""
 "Uwaga: B<dpkg-source> zakłada, że drzewo ze źródłami będzie mieć nałożone "
 "wszystkie łatki określone w pliku series podczas generowania pakietu "
@@ -13578,12 +14258,39 @@
 "wyłączyć to zachowanie."
 
 #. type: Plain text
-#: dpkg-source.1:476 dpkg-source.1:547 dpkg-source.1:586
+#: dpkg-source.1:480
+#, fuzzy
+#| msgid "B<debian/changelog>"
+msgid "B<Recording changes>"
+msgstr "B<debian/changelog>"
+
+#
+#. type: TP
+#: dpkg-source.1:480
+#, fuzzy, no-wrap
+#| msgid "B<-c>, B<--control-path> I<package-name> [I<control-file>]"
+msgid "B<--commit> [I<directory>] [I<patch-name>] [I<patch-file>]"
+msgstr "B<-c>, B<--control-path> I<nazwa-pakietu> [I<plik-kontrolny>]"
+
+#. type: Plain text
+#: dpkg-source.1:490
+msgid ""
+"Generates a patch corresponding to the local changes that are not managed by "
+"the quilt patch system and integrates it in the patch system under the name "
+"I<patch-name>. If the name is missing, it will be asked interactively. If "
+"I<patch-file> is given, it is used as the patch corresponding to the local "
+"changes to integrate. This is mainly useful after a build failure that pre-"
+"generated this file. Once integrated, an editor is launched so that you can "
+"edit the meta-information in the patch header."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:493 dpkg-source.1:567 dpkg-source.1:606
 msgid "B<Build options>"
 msgstr "B<Opcje budowania>"
 
 #. type: TP
-#: dpkg-source.1:476
+#: dpkg-source.1:493
 #, fuzzy, no-wrap
 #| msgid "B<--to> I<version>, B<-t>I<version>"
 msgid "B<--allow-version-of-quilt-db=>I<version>"
@@ -13591,7 +14298,7 @@
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 msgid ""
 "Allow B<dpkg-source> to build the source package if the version of the quilt "
 "metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -13601,13 +14308,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 #, no-wrap
 msgid "B<--include-removal>"
 msgstr "B<--include-removal>"
 
 #. type: Plain text
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 msgid ""
 "Do not ignore removed files and include them in the automatically generated "
 "patch."
@@ -13616,24 +14323,24 @@
 "generowanej łatki."
 
 #. type: TP
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 #, no-wrap
 msgid "B<--include-timestamp>"
 msgstr "B<--include-timestamp>"
 
 #. type: Plain text
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 msgid "Include timestamp in the automatically generated patch."
 msgstr "Włączenie czasu modyfikacji w automatycznie generowanej łatce."
 
 #. type: TP
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 #, no-wrap
 msgid "B<--include-binaries>"
 msgstr "B<--include-binaries>"
 
 #. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 msgid ""
 "Add all modified binaries in the debian tarball. Also add them to B<debian/"
 "source/include-binaries>: they will be added by default in subsequent builds "
@@ -13645,13 +14352,13 @@
 "już więcej potrzebna."
 
 #. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 #, no-wrap
 msgid "B<--no-preparation>"
 msgstr "B<--no-preparation>"
 
 #. type: Plain text
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 msgid ""
 "Do not try to prepare the build tree by applying patches which are "
 "apparently unapplied."
@@ -13660,33 +14367,33 @@
 "wyraźnie nie są nałożone."
 
 #. type: TP
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 #, fuzzy, no-wrap
 #| msgid "B<--skip-debianization>"
 msgid "B<--single-debian-patch>"
 msgstr "B<--skip-debianization>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 msgid ""
 "Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
 "changes->I<version> for the name of the automatic patch generated during "
 "build. This option is particularly useful when the package is maintained in "
 "a VCS and a patch set can't reliably be generated. Instead the current diff "
-"with upstream should be stored in a single patch. When using this option, it "
-"is recommended to create a debian/source/patch-header file explaining how "
-"the Debian changes can be best reviewed, for example in the VCS that is used."
+"with upstream should be stored in a single patch. The option would be put in "
+"B<debian/source/local-options> and would be accompanied by a B<debian/source/"
+"local-patch-header> file explaining how the Debian changes can be best "
+"reviewed, for example in the VCS that is used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 #, no-wrap
 msgid "B<--create-empty-orig>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 msgid ""
 "Automatically create the main original tarball as empty if it's missing and "
 "if there are supplementary original tarballs. This option is meant to be "
@@ -13695,25 +14402,24 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 #, fuzzy, no-wrap
 #| msgid "B<--skip-patches>"
 msgid "B<--unapply-patches>"
 msgstr "B<--skip-patches>"
 
 #. type: Plain text
-#: dpkg-source.1:525
+#: dpkg-source.1:541
 msgid ""
-"Unapply the patches in the B<--after-build> hook. This is mainly useful when "
-"you build your package directly in a VCS that contains unpatched upstream "
-"source and where you want to keep the tree unpatched even after a package "
-"build. This option is usually put in B<debian/source/local-options> (it's "
-"not allowed in B<debian/source/options> so that all generated source "
-"packages have the same behaviour by default)."
+"Unapply the patches in the B<--after-build> hook. You usually don't need "
+"this option as dpkg-source will automatically unapply the patches if it did "
+"apply them during B<--before-build>. This option is only allowed in B<debian/"
+"source/local-options> so that all generated source packages have the same "
+"behavior by default."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:548
 msgid ""
 "The process fails if an automatic patch has been generated. This option can "
 "be used to ensure that all changes were properly recorded in separate quilt "
@@ -13721,39 +14427,57 @@
 "B<debian/source/options> but can be used in B<debian/source/local-options>."
 msgstr ""
 
+#. type: TP
+#: dpkg-source.1:548
+#, fuzzy, no-wrap
+#| msgid "B<--no-act>"
+msgid "B<--auto-commit>"
+msgstr "B<--no-act>"
+
+#. type: Plain text
+#: dpkg-source.1:552
+msgid ""
+"The process doesn't fail if an automatic patch has been generated, instead "
+"it's immediately recorded in the quilt series."
+msgstr ""
+
 #. type: Plain text
-#: dpkg-source.1:535
+#: dpkg-source.1:555
 msgid "B<Extract options>"
 msgstr "B<Opcje rozpakowywania>"
 
 #. type: Plain text
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 msgid "Skips extraction of the debian tarball on top of the upstream sources."
 msgstr ""
 "Pomija rozpakowanie archiwum debian z włączeniem jego zawartości na "
 "oryginalne źródła."
 
 #. type: TP
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 #, no-wrap
 msgid "B<--skip-patches>"
 msgstr "B<--skip-patches>"
 
 #. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:561
 msgid "Do not apply patches at the end of the extraction."
 msgstr "Nie nakłada łatek po skończeniu rozpakowywania."
 
 #. type: SS
-#: dpkg-source.1:542
+#: dpkg-source.1:562
 #, no-wrap
 msgid "Format: 3.0 (custom)"
 msgstr "Format: 3.0 (custom)"
 
 #. type: Plain text
-#: dpkg-source.1:545
+#: dpkg-source.1:565
+#, fuzzy
+#| msgid ""
+#| "This format is particular. It doesn't represent a real source package "
+#| "format but can be used to create source packages with arbitrary files."
 msgid ""
-"This format is particular. It doesn't represent a real source package format "
+"This format is special. It doesn't represent a real source package format "
 "but can be used to create source packages with arbitrary files."
 msgstr ""
 "Ten format jest szczególny. Nie jest prawdziwym formatem pakietu źródłowego, "
@@ -13761,11 +14485,11 @@
 "pliki."
 
 #. type: Plain text
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 msgid ""
 "All non-option arguments are taken as files to integrate in the generated "
-"source package. They must exist and are preferrably in the current "
-"directory. At least one file must be given."
+"source package. They must exist and are preferably in the current directory. "
+"At least one file must be given."
 msgstr ""
 "Wszystkie argumenty nie będące opcjami są uważane za pliki, które mają być "
 "zintegrowane z generowanym pakietem źródłowym. Pliki te muszą istnieć i "
@@ -13773,13 +14497,13 @@
 "jeden plik."
 
 #. type: TP
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 #, no-wrap
 msgid "B<--target-format=>I<value>"
 msgstr "B<--target-format=>I<wartość>"
 
 #. type: Plain text
-#: dpkg-source.1:556
+#: dpkg-source.1:576
 msgid ""
 "B<Required>. Defines the real format of the generated source package.  The "
 "generated .dsc file will contain this value in its I<Format> field and not "
@@ -13790,19 +14514,19 @@
 "zamiast \"3.0 (custom)\"."
 
 #. type: SS
-#: dpkg-source.1:557
+#: dpkg-source.1:577
 #, fuzzy, no-wrap
 #| msgid "Format: 3.0 (quilt)"
 msgid "Format: 3.0 (git)"
 msgstr "Format: 3.0 (quilt)"
 
 #. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:579
 msgid "This format is experimental."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:564
+#: dpkg-source.1:584
 msgid ""
 "A source package in this format consists of a single bundle of a git "
 "repository B<.git> to hold the source of a package.  There may also be a B<."
@@ -13810,7 +14534,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:570
+#: dpkg-source.1:590
 msgid ""
 "The bundle is cloned as a git repository to the target directory.  If there "
 "is a gitshallow file, it is installed as `.git/shallow` inside the cloned "
@@ -13818,16 +14542,16 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:575
+#: dpkg-source.1:595
 msgid ""
 "Note that by default the new repository will have the same branch checked "
 "out that was checked out in the original source. (Typically \"master\", but "
-"it could be anything.) Any other branches will be available, under as "
-"`remotes/origin/`"
+"it could be anything.) Any other branches will be available under `remotes/"
+"origin/`."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:580 dpkg-source.1:613
+#: dpkg-source.1:600 dpkg-source.1:633
 msgid ""
 "Before going any further, some checks are done to ensure that we don't have "
 "any non-ignored uncommitted changes."
@@ -13836,21 +14560,21 @@
 "nie ma żadnych niezatwierdzonych zmian, które nie są ignorowane."
 
 #. type: Plain text
-#: dpkg-source.1:584
+#: dpkg-source.1:604
 msgid ""
 "B<git-bundle>(1) is used to generate a bundle of the git repository.  By "
 "default, all branches and tags in the repository are included in the bundle."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:586
+#: dpkg-source.1:606
 #, fuzzy, no-wrap
 #| msgid "B<--target=>I<target>"
 msgid "B<--git-ref=>I<ref>"
 msgstr "B<--target=>I<cel>"
 
 #. type: Plain text
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 msgid ""
 "Allows specifying a git ref to include in the git bundle. Use disables the "
 "default behavior of including all branches and tags. May be specified "
@@ -13862,28 +14586,28 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 #, fuzzy, no-wrap
 #| msgid "B<--abort-after=>I<number>"
 msgid "B<--git-depth=>I<number>"
 msgstr "B<--abort-after=>I<liczba>"
 
 #. type: Plain text
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 msgid ""
 "Creates a shallow clone with a history truncated to the specified number of "
 "revisions."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 #, fuzzy, no-wrap
 #| msgid "Format: 3.0 (quilt)"
 msgid "Format: 3.0 (bzr)"
 msgstr "Format: 3.0 (quilt)"
 
 #. type: Plain text
-#: dpkg-source.1:603
+#: dpkg-source.1:623
 #, fuzzy
 #| msgid ""
 #| "Those formats are experimental. They generate a single tarball containing "
@@ -13896,7 +14620,7 @@
 "odpowiednie repozytoria systemu kontroli wersji."
 
 #. type: Plain text
-#: dpkg-source.1:608
+#: dpkg-source.1:628
 #, fuzzy
 #| msgid ""
 #| "The tarball is unpacked and then the VCS is used to checkout the current "
@@ -13908,7 +14632,7 @@
 "pobrać aktualną gałąź kodu."
 
 #. type: Plain text
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 msgid ""
 "Then the VCS specific part of the source directory is copied over to a "
 "temporary directory. Before this temporary directory is packed in a tarball, "
@@ -13920,19 +14644,19 @@
 "zaoszczędzić miejsce."
 
 #. type: SH
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 #, no-wrap
 msgid "WARNINGS AND ERRORS"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:618
+#: dpkg-source.1:638
 #, no-wrap
 msgid "no source format specified in debian/source/format"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:624
+#: dpkg-source.1:644
 msgid ""
 "The file B<debian/source/format> should always exist and indicate the "
 "desired source format. For backwards compatibility, format \"1.0\" is "
@@ -13942,7 +14666,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 msgid ""
 "The rationale is that format \"1.0\" is no longer the recommended format, "
 "you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
@@ -13952,13 +14676,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 #, no-wrap
 msgid "the diff modifies the following upstream files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 msgid ""
 "When using source format \"1.0\" it is usually a bad idea to modify upstream "
 "files directly as the changes end up hidden and mostly undocumented in the ."
@@ -13968,13 +14692,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 #, no-wrap
 msgid "cannot represent change to I<file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 msgid ""
 "Changes to upstream sources are usually stored with patch files, but not all "
 "changes can be represented with patches: they can only alter the content of "
@@ -13984,51 +14708,51 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 #, no-wrap
 msgid "newly created empty file I<file> will not be represented in diff"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 msgid ""
 "Empty files can't be created with patch files. Thus this change is not "
 "recorded in the source package and you are warned about it."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 #, no-wrap
 msgid "executable mode I<perms> of I<file> will not be represented in diff"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:647
+#: dpkg-source.1:667
 #, no-wrap
 msgid "special mode I<perms> of I<file> will not be represented in diff"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 msgid ""
 "Patch files do not record permissions of files and thus modified permissions "
 "are not stored in the source package. This warning reminds you of that fact."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 #, no-wrap
 msgid "FILE FORMATS"
 msgstr "FORMATY PLIKÓW"
 
 #. type: SS
-#: dpkg-source.1:652
+#: dpkg-source.1:672
 #, no-wrap
 msgid "debian/source/format"
 msgstr "debian/source/format"
 
 #. type: Plain text
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 msgid ""
 "This file contains on a single line the format that should be used to build "
 "the source package (possible formats are described above). No leading or "
@@ -14039,13 +14763,13 @@
 "wyżej). Niedozwolone są początkowe i końcowe znaki spacji."
 
 #. type: SS
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 #, no-wrap
 msgid "debian/source/include-binaries"
 msgstr "debian/source/include-binaries"
 
 #. type: Plain text
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 msgid ""
 "This file contains a list of binary files (one per line) that should be "
 "included in the debian tarball. Leading and trailing spaces are stripped.  "
@@ -14058,14 +14782,14 @@
 "pomijane, puste linie są ignorowane."
 
 #. type: SS
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 #, fuzzy, no-wrap
 #| msgid "debian/source/format"
 msgid "debian/source/options"
 msgstr "debian/source/format"
 
 #. type: Plain text
-#: dpkg-source.1:666
+#: dpkg-source.1:686
 msgid ""
 "This file contains a list of long options that should be automatically "
 "prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -14074,7 +14798,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:672
+#: dpkg-source.1:692
 msgid ""
 "Each option should be put on a separate line. Empty lines and lines starting "
 "with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -14083,9 +14807,8 @@
 "a file:"
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:678
+#: dpkg-source.1:700
 #, no-wrap
 msgid ""
 "  # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -14093,24 +14816,26 @@
 "  compression-level = 9\n"
 "  # use debian/patches/debian-changes as automatic patch\n"
 "  single-debian-patch\n"
+"  # ignore changes on config.{sub,guess}\n"
+"  extend-diff-ignore = \"(^|/)(config.sub|config.guess)$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 msgid ""
 "Note: B<format> options are not accepted in this file, you should use "
 "B<debian/source/format> instead."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 #, fuzzy, no-wrap
 #| msgid "debian/source/format"
 msgid "debian/source/local-options"
 msgstr "debian/source/format"
 
 #. type: Plain text
-#: dpkg-source.1:686
+#: dpkg-source.1:708
 msgid ""
 "Exactly like B<debian/source/options> except that the file is not included "
 "in the generated source package. It can be useful to store a preference tied "
@@ -14119,28 +14844,35 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:686
+#: dpkg-source.1:708
+#, fuzzy, no-wrap
+#| msgid "debian/source/format"
+msgid "debian/source/local-patch-header"
+msgstr "debian/source/format"
+
+#. type: SS
+#: dpkg-source.1:709
 #, fuzzy, no-wrap
 #| msgid "debian/source/format"
 msgid "debian/source/patch-header"
 msgstr "debian/source/format"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 msgid ""
 "Free form text that is put on top of the automatic patch generated in "
-"formats \"2.0\" or \"3.0 (quilt)\"."
+"formats \"2.0\" or \"3.0 (quilt)\". B<local-patch-header> is not included in "
+"the generated source package while B<patch-header> is."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 #, no-wrap
 msgid "debian/patches/series"
 msgstr "debian/patches/series"
 
 #. type: Plain text
-#: dpkg-source.1:698
+#: dpkg-source.1:722
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
@@ -14163,22 +14895,23 @@
 
 #
 #. type: Plain text
-#: dpkg-source.1:705
+#: dpkg-source.1:729
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 
+#. type: Plain text
+#: dpkg-source.1:736
+#, fuzzy
+#| msgid "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2008-2011 Rapha\\[:e]l Hertzog"
+msgstr "Copyright \\(co 2008-2009 Rapha\\[:e]l Hertzog"
+
 #. type: TH
 #: dpkg-split.1:2
 #, no-wrap
 msgid "dpkg-split"
 msgstr "dpkg-split"
 
-#. type: TH
-#: dpkg-split.1:2 dpkg-statoverride.8:1
-#, no-wrap
-msgid "2009-06-26"
-msgstr "2009-06-26"
-
 #
 #. type: Plain text
 #: dpkg-split.1:5
@@ -14187,13 +14920,15 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:10
-msgid "B<dpkg-split> [I<options>] I<command>"
+#: dpkg-split.1:9
+#, fuzzy
+#| msgid "B<dpkg-split> [I<options>] I<command>"
+msgid "B<dpkg-split> [I<option>...] I<command>"
 msgstr "B<dpkg-split> [I<opcje>] I<polecenie>"
 
 #
 #. type: Plain text
-#: dpkg-split.1:16
+#: dpkg-split.1:15
 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 "
@@ -14205,7 +14940,7 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:20
+#: dpkg-split.1:19
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
@@ -14214,7 +14949,7 @@
 "info>."
 
 #. type: Plain text
-#: dpkg-split.1:28
+#: dpkg-split.1:27
 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 "
@@ -14228,7 +14963,7 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:31
+#: dpkg-split.1:30
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
@@ -14239,20 +14974,20 @@
 
 #
 #. type: TP
-#: dpkg-split.1:33
+#: dpkg-split.1:32
 #, 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:35
 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:43
 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 "
@@ -14264,7 +14999,7 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 msgid ""
 "If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
 "including directory, with any trailing B<.deb> removed."
@@ -14275,13 +15010,13 @@
 
 #
 #. type: TP
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 #, 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:55
 msgid ""
 "Joins the parts of a package file together, reassembling the original file "
 "as it was before it was split."
@@ -14290,7 +15025,7 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:60
+#: dpkg-split.1:59
 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 "
@@ -14302,7 +15037,7 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:65
+#: dpkg-split.1:64
 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 "
@@ -14314,27 +15049,32 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:67
+#: dpkg-split.1:66
 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
-msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
+#: dpkg-split.1:69
+#, fuzzy
+#| msgid ""
+#| "By default the output file is called I<package>B<->I<version>B<.deb>."
+msgid ""
+"By default the output file is called I<package>B<_>I<version>B<_>I<arch>B<."
+"deb>."
 msgstr "Domyślnie, odtworzony plik ma nazwę I<pakiet>B<->I<wersja>B<.deb>."
 
 #
 #. type: TP
-#: dpkg-split.1:71
+#: dpkg-split.1:70
 #, 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:75
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -14346,20 +15086,20 @@
 
 #
 #. type: TP
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 #, 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:78
 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:83
 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."
@@ -14368,7 +15108,7 @@
 "samego pakietu, które znajdują się w kolejce."
 
 #. type: Plain text
-#: dpkg-split.1:91
+#: dpkg-split.1:90
 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 "
@@ -14379,7 +15119,7 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:97
+#: dpkg-split.1:96
 msgid ""
 "If not then the I<part> is copied into the queue and I<complete-output> is "
 "not created."
@@ -14389,17 +15129,23 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:104
+#: dpkg-split.1:103
+#, 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."
 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."
+"with status B<1>; if some other trouble occurs then it will exit with status "
+"B<2>."
 msgstr ""
 "Jeśli plik I<część> nie jest częścią pakietu binarnego, B<dpkg-split> "
 "zakończy się i zwróci kod błędu 1, albo kod błędu 2 w przypadku wystąpienia "
 "innych problemów."
 
 #. type: Plain text
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 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 "
@@ -14410,20 +15156,20 @@
 "wyjściowego.)"
 
 #. type: TP
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 #, no-wrap
 msgid "B<-l>, B<--listq>"
 msgstr "B<-l>, B<--listq>"
 
 #
 #. type: Plain text
-#: dpkg-split.1:114
+#: dpkg-split.1:113
 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:117
 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 "
@@ -14434,14 +15180,14 @@
 
 #
 #. type: TP
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 #, 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:121
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
@@ -14449,7 +15195,7 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:126
 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."
@@ -14458,14 +15204,14 @@
 "jest podana, usuwane są tylko części podanego pakietu."
 
 #. type: TP
-#: dpkg-split.1:135
+#: dpkg-split.1:134
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr "B<--depotdir>I< katalog>"
 
 #
 #. type: Plain text
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 msgid ""
 "Specifies an alternative directory for the queue of parts awaiting automatic "
 "reassembly. The default is B</var/lib/dpkg>."
@@ -14474,13 +15220,13 @@
 "zrekonstruowania. Domyślnym jest B</var/lib/dpkg>."
 
 #. type: TP
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 #, no-wrap
 msgid "B<-S>, B<--partsize> I<kibibytes>"
 msgstr "B<-S>, B<--partsize> I<kibibajty>"
 
 #. type: Plain text
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 msgid ""
 "Specifies the maximum part size when splitting, in kibibytes (1024 bytes). "
 "The default is 450 KiB."
@@ -14489,20 +15235,20 @@
 "bajtów). Wartością domyślną jest 450 KiB."
 
 #. type: TP
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 #, 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:147
+#: dpkg-split.1:146
 msgid "Specifies the output file name for a reassembly."
 msgstr "Określenie nazwy pliku pełnego archiwum."
 
 #
 #. type: Plain text
-#: dpkg-split.1:152
+#: dpkg-split.1:151
 msgid ""
 "This overrides the default for a manual reassembly (B<--join>)  and is "
 "mandatory for an automatic queue-or-reassemble (B<--auto>)."
@@ -14511,14 +15257,14 @@
 "jest wymagana przy automatycznym odtwarzaniu pakietu (B<--auto>)."
 
 #. type: TP
-#: dpkg-split.1:152
+#: dpkg-split.1:151
 #, no-wrap
 msgid "B<-Q>, B<--npquiet>"
 msgstr "B<-Q>, B<--npquiet>"
 
 #
 #. type: Plain text
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 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 "
@@ -14531,14 +15277,14 @@
 "informacji przez programy takie jak B<dpkg>."
 
 #. type: TP
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 #, no-wrap
 msgid "B<--msdos>"
 msgstr "B<--msdos>"
 
 #
 #. type: Plain text
-#: dpkg-split.1:168
+#: dpkg-split.1:167
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
@@ -14547,7 +15293,7 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:174
+#: dpkg-split.1:173
 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 "
@@ -14558,7 +15304,7 @@
 "B<x>, a pozostałe znaki są pomijane."
 
 #. type: Plain text
-#: dpkg-split.1:179
+#: dpkg-split.1:178
 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."
@@ -14569,10 +15315,14 @@
 #
 #. type: Plain text
 #: dpkg-split.1:186
+#, 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."
 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."
+"The requested split, merge, or other command succeeded.  B<--info> commands "
+"count as successful even if the files are not binary package parts."
 msgstr ""
 "Kod błędu 0 oznacza, że żądana operacja dzielenia, łączenia czy jakakolwiek "
 "inna, zakończyła się sukcesem. Polecenie B<--info> kończy się sukcesem nawet "
@@ -14580,35 +15330,42 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:192
+#: dpkg-split.1:193
+#, fuzzy
+#| msgid ""
+#| "An exit status of 1 occurs only with B<--auto> and indicates that the "
+#| "I<part> file was not a binary package part."
 msgid ""
-"An exit status of 1 occurs only with B<--auto> and indicates that the "
-"I<part> file was not a binary package part."
+"Only occurs with B<--auto> and indicates that the I<part> file was not a "
+"binary package part."
 msgstr ""
 "Kod błędu 1 oznacza, że opcja B<--auto> została wykonana na pliku, który nie "
 "jest I<częścią> pakietu."
 
+#. type: TP
+#: dpkg-split.1:193 start-stop-daemon.8:275 update-alternatives.8:378
+#, no-wrap
+msgid "B<2>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-split.1:196
-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."
+#: dpkg-split.1:198
+#, 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."
+msgid ""
+"Some kind of trouble happened, 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 ""
 "Kod błędu 2 pojawia się przy różnego rodzaju problemach, takich jak błędy "
 "wywołania funkcji systemu, uszkodzenie plików części pakietu, czy innych "
 "wypadkach."
 
-#
-#. type: Plain text
-#: dpkg-split.1:201
-msgid ""
-"B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
-"of Debian packages."
-msgstr "B<dpkg-split> używa raczej starej konwencji nazw plików pakietów."
-
 #. type: Plain text
-#: dpkg-split.1:204
+#: dpkg-split.1:202
 msgid ""
 "Full details of the packages in the queue are impossible to get without "
 "digging into the queue directory yourself."
@@ -14618,7 +15375,7 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:207
+#: dpkg-split.1:205
 msgid ""
 "There is no easy way to test whether a file that may be a binary package "
 "part is one."
@@ -14626,27 +15383,15 @@
 "Nie ma prostego testu na sprawdzenie, czy dany plik jest na pewno częścią "
 "pakietu."
 
-#
-#. type: Plain text
-#: dpkg-split.1:211
-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 ""
-"Architektura nie jest określona w plikach części pakietu, jedynie w "
-"kontrolnych plikach całego pakietu, tak więc architektura nie jest częścią "
-"generowanej nazwy pliku."
-
 #. type: TP
-#: dpkg-split.1:213
+#: dpkg-split.1:207
 #, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "I</var/lib/dpkg/parts>"
 
 #
 #. type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:211
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
@@ -14655,7 +15400,7 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:222
+#: dpkg-split.1:216
 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 "
@@ -14666,7 +15411,7 @@
 
 #
 #. type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:222
 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)."
 
@@ -14689,12 +15434,14 @@
 
 #
 #. type: Plain text
-#: dpkg-statoverride.8:9
-msgid "B<dpkg-statoverride> [I<options>] I<command>"
+#: dpkg-statoverride.8:8
+#, fuzzy
+#| msgid "B<dpkg-statoverride> [I<options>] I<command>"
+msgid "B<dpkg-statoverride> [I<option>...] I<command>"
 msgstr "B<dpkg-statoverride> [I<opcje>] I<polecenie>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:19
+#: dpkg-statoverride.8:18
 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' "
@@ -14712,7 +15459,7 @@
 "pewną grupę użytkowników."
 
 #. type: Plain text
-#: dpkg-statoverride.8:23
+#: dpkg-statoverride.8:22
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
@@ -14722,13 +15469,13 @@
 "takich nadpisań."
 
 #. type: TP
-#: dpkg-statoverride.8:25
+#: dpkg-statoverride.8:24
 #, 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:33
+#: dpkg-statoverride.8:32
 msgid ""
 "Add an override for I<file>. I<file> does not need to exist when this "
 "command is used; the override will be stored and used later.  Users and "
@@ -14744,7 +15491,7 @@
 "ósemkowa."
 
 #. type: Plain text
-#: dpkg-statoverride.8:36
+#: dpkg-statoverride.8:35
 msgid ""
 "If --update is specified and I<file> exists, it is immediately set to the "
 "new owner and mode."
@@ -14753,20 +15500,20 @@
 "zostaną od razu ustawione."
 
 #. type: Plain text
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 msgid ""
 "Remove an override for I<file>, the status of I<file> is left unchanged by "
 "this command."
 msgstr "Usuwa nadpisanie I<pliku>. Polecenie to nie zmienia stanu I<pliku>."
 
 #. type: TP
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 #, no-wrap
 msgid "B<--list> [I<glob-pattern>]"
 msgstr "B<--list> [I<wzorzec-glob>]"
 
 #. type: Plain text
-#: dpkg-statoverride.8:45
+#: 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 "
@@ -14778,7 +15525,7 @@
 "statoverride> zakończy działanie z kodem błędu 1."
 
 #. type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:56
 msgid ""
 "Change the I<directory> of the dpkg database where the statoverride file is "
 "also stored. Defaults to I</var/lib/dpkg>."
@@ -14787,13 +15534,13 @@
 "statoverride. Domyślnie jest to I</var/lib/dpkg>."
 
 #. type: TP
-#: dpkg-statoverride.8:57 update-alternatives.8:337
+#: dpkg-statoverride.8:56 update-alternatives.8:336
 #, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:61
+#: 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."
@@ -14802,31 +15549,31 @@
 "tego zabroniły. Jest to potrzebne, aby nadpisać istniejące nadpisanie."
 
 #. type: TP
-#: dpkg-statoverride.8:61
+#: dpkg-statoverride.8:60
 #, no-wrap
 msgid "B<--update>"
 msgstr "B<--update>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:65
+#: 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:68
+#: 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:76
+#: dpkg-statoverride.8:75
 #, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr "I</var/lib/dpkg/statoverride>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:80
 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 "
@@ -14837,7 +15584,7 @@
 "takimi jak \"status\" lub \"available\"."
 
 #. type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:83
 msgid ""
 "Note: B<dpkg-statoverride> preserves the old copy of this file, with "
 "extension \"-old\", before replacing it with the new one."
@@ -14904,11 +15651,17 @@
 
 #. type: Plain text
 #: dpkg-trigger.1:31
+#, fuzzy
+#| msgid ""
+#| "Check if the running B<dpkg> supports triggers (usually called from a "
+#| "postinst). Will exit 0 if a triggers-capable B<dpkg> has run, or 1 with "
+#| "an error message to stderr if not. Normally, however, it is better just "
+#| "to activate the desired trigger with B<dpkg-trigger>."
 msgid ""
 "Check if the running B<dpkg> supports triggers (usually called from a "
-"postinst). Will exit 0 if a triggers-capable B<dpkg> has run, or 1 with an "
-"error message to stderr if not. Normally, however, it is better just to "
-"activate the desired trigger with B<dpkg-trigger>."
+"postinst). Will exit B<0> if a triggers-capable B<dpkg> has run, or B<1> "
+"with an error message to stderr if not. Normally, however, it is better just "
+"to activate the desired trigger with B<dpkg-trigger>."
 msgstr ""
 "Sprawdza czy uruchomione B<dpkg> obsługuje wyzwalacze (zwykle wywoływane ze "
 "skryptu postinst). Program kończy się z kodem 0, jeśli uruchamiane jest "
@@ -14924,9 +15677,15 @@
 
 #. type: Plain text
 #: dpkg-trigger.1:49
+#, fuzzy
+#| msgid ""
+#| "Override trigger awaiter (normally set by B<dpkg> through the "
+#| "DPKG_MAINTSCRIPT_PACKAGE environment variable of the maintainer scripts, "
+#| "naming the package to which the script belongs, and this will be used by "
+#| "default)."
 msgid ""
 "Override trigger awaiter (normally set by B<dpkg> through the "
-"DPKG_MAINTSCRIPT_PACKAGE environment variable of the maintainer scripts, "
+"B<DPKG_MAINTSCRIPT_PACKAGE> environment variable of the maintainer scripts, "
 "naming the package to which the script belongs, and this will be used by "
 "default)."
 msgstr ""
@@ -14968,7 +15727,7 @@
 msgstr " Tylko test - bez wykonywania żadnych zmian."
 
 #. type: Plain text
-#: dpkg-trigger.1:68
+#: dpkg-trigger.1:69
 #, fuzzy
 #| msgid ""
 #| "B<dpkg>(1), B<deb-triggers>(5), B</usr/share/doc/dpkg/triggers.txt.gz>."
@@ -14983,12 +15742,6 @@
 msgid "dpkg-vendor"
 msgstr "dpkg-vendor"
 
-#. type: TH
-#: dpkg-vendor.1:1
-#, no-wrap
-msgid "2009-05-10"
-msgstr "2009-05-10"
-
 #. type: Plain text
 #: dpkg-vendor.1:4
 msgid "dpkg-vendor - queries information about distribution vendors"
@@ -15019,8 +15772,12 @@
 
 #. type: Plain text
 #: dpkg-vendor.1:19
+#, fuzzy
+#| msgid ""
+#| "Exits with 0 if the current vendor is I<vendor>. Otherwise exits with non-"
+#| "zero."
 msgid ""
-"Exits with 0 if the current vendor is I<vendor>. Otherwise exits with non-"
+"Exits with B<0> if the current vendor is I<vendor>. Otherwise exits with non-"
 "zero."
 msgstr ""
 "Kończy się zwracając 0 jeśli aktualny twórca to I<twórca>. W przeciwnym "
@@ -15034,8 +15791,13 @@
 
 #. type: Plain text
 #: dpkg-vendor.1:24
+#, fuzzy
+#| msgid ""
+#| "Exits with 0 if the current vendor distribution is a derivative of "
+#| "I<vendor>, otherwise exits with non-zero. It uses the \"Parent\" field to "
+#| "browse all ancestors of the current vendor."
 msgid ""
-"Exits with 0 if the current vendor distribution is a derivative of "
+"Exits with B<0> if the current vendor distribution is a derivative of "
 "I<vendor>, otherwise exits with non-zero. It uses the \"Parent\" field to "
 "browse all ancestors of the current vendor."
 msgstr ""
@@ -15067,9 +15829,13 @@
 
 #. type: Plain text
 #: dpkg-vendor.1:41
+#, fuzzy
+#| msgid ""
+#| "Assumes the current vendor is I<vendor> instead of discovering it with "
+#| "the DEB_VENDOR environment variable or B</etc/dpkg/origins/default>."
 msgid ""
 "Assumes the current vendor is I<vendor> instead of discovering it with the "
-"DEB_VENDOR environment variable or B</etc/dpkg/origins/default>."
+"B<DEB_VENDOR> environment variable or B</etc/dpkg/origins/default>."
 msgstr ""
 "Przyjmuje, że aktualnym twórcą jest I<twórca>, zamiast określania tego przez "
 "zmienną środowiska DEB_VENDOR lub odczyt z B</etc/dpkg/origins/default>."
@@ -15090,7 +15856,7 @@
 "twórca zostanie określony poprzez odczytanie z B</etc/dpkg/origins/default>."
 
 #. type: Plain text
-#: dpkg-vendor.1:50 update-alternatives.8:497
+#: dpkg-vendor.1:50 update-alternatives.8:498
 msgid "Copyright \\(co 2009 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2009 Rapha\\[:e]l Hertzog"
 
@@ -15108,26 +15874,14 @@
 
 #
 #. type: Plain text
-#: dselect.1:16
+#: dselect.1:8
 #, 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+..>]]]"
-msgid ""
-"B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--version>] "
-"[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 ""
-"B<dselect> [B<--admindir> I<E<lt>katalogE<gt>>] [B<--help>] [B<--version>] "
-"[B<--licence>|B<--license>] [B<--expert>] [B<--debug>|B<-"
-"D>I<E<lt>plikE<gt>>] [I<E<lt>akcjaE<gt>>] [B<--colour>|B<--color> "
-"I<część_ekranu:>[I<pierwszoplan>],[I<tło>][I<:atr>[I<+atr+..>]]]"
+#| msgid "B<dpkg> [I<options>] I<action>"
+msgid "B<dselect> [I<option>...] [I<action>]"
+msgstr "B<dpkg> [I<opcje>] I<działanie>"
 
 #. type: Plain text
-#: dselect.1:25
+#: dselect.1:17
 #, no-wrap
 msgid ""
 "B<dselect>\n"
@@ -15147,7 +15901,7 @@
 " - zainstalować nowe pakiety lub zaktualizować pakiety do nowszych wersji.\n"
 
 #. type: Plain text
-#: dselect.1:37
+#: dselect.1:29
 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 "
@@ -15173,11 +15927,18 @@
 
 #
 #. type: Plain text
-#: dselect.1:43
+#: dselect.1:35
+#, 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."
 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 "
+"argument, then that action is started immediately. Several command line "
 "parameters are still available to modify the running behaviour of B<dselect> "
 "or show additional information about the program."
 msgstr ""
@@ -15190,12 +15951,20 @@
 
 #
 #. type: Plain text
-#: dselect.1:51
+#: dselect.1:43
+#, fuzzy
+#| msgid ""
+#| "All options can be specified both on the commandline and in the "
+#| "B<dselect> configuration file I</etc/dpkg/dselect.cfg> or the files on "
+#| "the configuration directory I</etc/dpkg/dpkg.cfg.d/>. 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<#>)."
 msgid ""
-"All options can be specified both on the commandline and in the B<dselect> "
+"All options can be specified both on the command line and in the B<dselect> "
 "configuration file I</etc/dpkg/dselect.cfg> or the files on the "
-"configuration directory I</etc/dpkg/dpkg.cfg.d/>. Each line in the "
-"configuration file is either an option (exactly the same as the commandline "
+"configuration directory I</etc/dpkg/dselect.cfg.d/>. 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 ""
 "Wszystkie opcje mogą być podane zarówno w linii poleceń, jak i w pliku "
@@ -15205,14 +15974,8 @@
 "poleceń, ale bez początkowych myślników), albo komentarzem (jeżeli zaczyna "
 "się od 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
+#: dselect.1:49
 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 "
@@ -15223,28 +15986,32 @@
 "zazwyczaj nie powinno być potrzeby zmieniania go na inny."
 
 #. type: TP
-#: dselect.1:57
-#, no-wrap
-msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
+#: dselect.1:49
+#, fuzzy, no-wrap
+#| msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
+msgid "B<--debug>I< file >|I< >B<-D>I<file>"
 msgstr "B<--debug>I< E<lt>plikE<gt> >|I< >B<-D>I<E<lt>plikE<gt>>"
 
 #
 #. type: Plain text
-#: dselect.1:60
-msgid "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+#: dselect.1:52
+#, fuzzy
+#| msgid ""
+#| "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+msgid "Turn on debugging. Debugging information is sent to I<file>."
 msgstr ""
 "Włącza opcję debuggera. Informacje debuggera są wysyłane do "
 "I<E<lt>plikuE<gt>>."
 
 #. type: TP
-#: dselect.1:60
+#: dselect.1:52
 #, no-wrap
 msgid "B<--expert>"
 msgstr "B<--expert>"
 
 #
 #. type: Plain text
-#: dselect.1:64
+#: dselect.1:56
 msgid ""
 "Turns on expert mode, i.e. doesn't display possibly annoying help messages."
 msgstr ""
@@ -15252,13 +16019,13 @@
 "informacji z pomocą."
 
 #. type: TP
-#: dselect.1:64
+#: dselect.1:56
 #, no-wrap
 msgid "B<--colour>|B<--color> I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]"
 msgstr "B<--colour>|B<--color> I<część_ekranu:>[I<pierwszoplan>],[I<tło>][I<:atr>[I<+atr+..>]]"
 
 #. type: Plain text
-#: dselect.1:71
+#: dselect.1:63
 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>). "
@@ -15271,76 +16038,76 @@
 "jakiejś części ekranu. Części ekranu są następujące (od góry do dołu):"
 
 #. type: TP
-#: dselect.1:72
+#: dselect.1:64
 #, no-wrap
 msgid "B<title>"
 msgstr "B<title>"
 
 #
 #. type: Plain text
-#: dselect.1:75
+#: dselect.1:67
 msgid "The screen title."
 msgstr "Tytuł ekranu."
 
 #. type: TP
-#: dselect.1:75
+#: dselect.1:67
 #, no-wrap
 msgid "B<listhead>"
 msgstr "B<listhead>"
 
 #
 #. type: Plain text
-#: dselect.1:78
+#: dselect.1:70
 msgid "The header line above the list of packages."
 msgstr "Linia nagłówka nad listą pakietów."
 
 #. type: TP
-#: dselect.1:78
+#: dselect.1:70
 #, no-wrap
 msgid "B<list>"
 msgstr "B<list>"
 
 #
 #. type: Plain text
-#: dselect.1:81
+#: dselect.1:73
 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:73
 #, no-wrap
 msgid "B<listsel>"
 msgstr "B<listsel>"
 
 #
 #. type: Plain text
-#: dselect.1:84
+#: dselect.1:76
 msgid "The selected item in the list."
 msgstr "Podświetlony element z listy."
 
 #. type: TP
-#: dselect.1:84
+#: dselect.1:76
 #, no-wrap
 msgid "B<pkgstate>"
 msgstr "B<pkgstate>"
 
 #
 #. type: Plain text
-#: dselect.1:88
+#: dselect.1:80
 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:80
 #, no-wrap
 msgid "B<pkgstatesel>"
 msgstr "B<pkgstatesel>"
 
 #
 #. type: Plain text
-#: dselect.1:92
+#: dselect.1:84
 msgid ""
 "In the list of packages, the text indicating the current state of the "
 "currently selected package."
@@ -15348,81 +16115,81 @@
 "W liście pakietów - tekst oznaczający obecny stan podświetlonego pakietu."
 
 #. type: TP
-#: dselect.1:92
+#: dselect.1:84
 #, no-wrap
 msgid "B<infohead>"
 msgstr "B<infohead>"
 
 #
 #. type: Plain text
-#: dselect.1:95
+#: dselect.1:87
 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:87
 #, no-wrap
 msgid "B<infodesc>"
 msgstr "B<infodesc>"
 
 #
 #. type: Plain text
-#: dselect.1:98
+#: dselect.1:90
 msgid "The package's short description."
 msgstr "Krótki opis pakietu."
 
 #. type: TP
-#: dselect.1:98
+#: dselect.1:90
 #, no-wrap
 msgid "B<info>"
 msgstr "B<info>"
 
 #
 #. type: Plain text
-#: dselect.1:101
+#: dselect.1:93
 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:93
 #, no-wrap
 msgid "B<infofoot>"
 msgstr "B<infofoot>"
 
 #
 #. type: Plain text
-#: dselect.1:104
+#: dselect.1:96
 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:96
 #, no-wrap
 msgid "B<query>"
 msgstr "B<query>"
 
 #
 #. type: Plain text
-#: dselect.1:107
+#: dselect.1:99
 msgid "Used to display query lines"
 msgstr "Używane do wyświetlania linii zapytań."
 
 #. type: TP
-#: dselect.1:107
+#: dselect.1:99
 #, no-wrap
 msgid "B<helpscreen>"
 msgstr "B<helpscreen>"
 
 #. type: Plain text
-#: dselect.1:110
+#: dselect.1:102
 msgid "Color of help screens."
 msgstr "Kolor ekranów pomocy."
 
 #
 #. type: Plain text
-#: dselect.1:115
+#: dselect.1:107
 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, "
@@ -15435,7 +16202,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:121
+#: dselect.1:113
 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 "
@@ -15452,52 +16219,57 @@
 
 #
 #. type: Plain text
-#: dselect.1:124
+#: dselect.1:116
 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: Plain text
-#: dselect.1:127
+#: dselect.1:119
 msgid "Print version information and exit successfully."
 msgstr "Wyświetla informację o wersji i pomyślnie kończy działanie."
 
-#. type: SH
-#: dselect.1:128
-#, no-wrap
-msgid "USAGE"
-msgstr "UŻYTKOWANIE"
-
 #
 #. type: Plain text
-#: dselect.1:133
+#: dselect.1:126
+#, fuzzy
+#| msgid ""
+#| "When B<dselect> is started interactively, it prompts the user with a menu "
+#| "of available actions:"
 msgid ""
-"When B<dselect> is started interactively, it prompts the user with a menu of "
-"available actions:"
+"When B<dselect> is started it can perform the following actions, either "
+"directly if it was specified on the command line or by prompting the user "
+"with a menu of available actions if running interactively:"
 msgstr ""
 "B<dselect> uruchomiony w trybie interakcyjnym wyświetla menu z następującymi "
 "akcjami:"
 
 #. type: SS
-#: dselect.1:133
+#: dselect.1:126
 #, no-wrap
 msgid "access"
 msgstr "access (dostęp)"
 
 #
 #. type: Plain text
-#: dselect.1:135
+#: dselect.1:128
 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:141
-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."
+#: dselect.1:134
+#, 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."
+msgid ""
+"By default, B<dselect> provides several methods such as I<cdrom>, "
+"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount>, "
+"I<floppy> or I<ftp>, but other packages may provide additional methods, eg. "
+"the I<apt> access method provided by the B<apt> package."
 msgstr ""
 "Domyślnie istnieje kilka metod, takich jak I<floppy> (dyskietka), "
 "I<harddisk> (dysk twardy) lub I<cdrom> (CD-ROM), ale inne pakiety mogą "
@@ -15506,23 +16278,23 @@
 
 #
 #. type: Plain text
-#: dselect.1:143
+#: dselect.1:136
 msgid "The use of the I<apt> access method is strongly recommended."
 msgstr "Zalecane jest używanie metody I<apt>."
 
 #. type: SS
-#: dselect.1:144
+#: dselect.1:137
 #, no-wrap
 msgid "update"
 msgstr "update (aktualizacja)"
 
 #. type: Plain text
-#: dselect.1:146
+#: dselect.1:139
 msgid "Refresh the available packages database."
 msgstr "Aktualizuje bazę dostępnych pakietów."
 
 #. type: Plain text
-#: dselect.1:153
+#: dselect.1:146
 msgid ""
 "Retrieves a list of available package versions from the package repository, "
 "configured for the current access method, and update the dpkg database. The "
@@ -15538,7 +16310,7 @@
 "scanpackages>(1)."
 
 #. type: Plain text
-#: dselect.1:156
+#: dselect.1:149
 msgid ""
 "Details of the update action depend on the access method's implementation.  "
 "Normally the process is straightforward and requires no user interaction."
@@ -15547,21 +16319,21 @@
 "proces jest bardzo prosty i nie wymaga interakcji z użytkownikiem."
 
 #. type: SS
-#: dselect.1:157
+#: dselect.1:150
 #, no-wrap
 msgid "select"
 msgstr "select (wybór)"
 
 #
 #. type: Plain text
-#: dselect.1:159
+#: dselect.1:152
 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:165
+#: dselect.1:158
 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 "
@@ -15576,7 +16348,7 @@
 "na pakiety zależne."
 
 #. type: Plain text
-#: dselect.1:172
+#: dselect.1:165
 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 "
@@ -15595,7 +16367,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:175
+#: dselect.1:168
 msgid ""
 "The use of the interactive package selections management screen is explained "
 "in more detail below."
@@ -15604,20 +16376,20 @@
 "szczegółowo wyjąśnione poniżej."
 
 #. type: SS
-#: dselect.1:176
+#: dselect.1:169
 #, no-wrap
 msgid "install"
 msgstr "install (instalacja)"
 
 #
 #. type: Plain text
-#: dselect.1:178
+#: dselect.1:171
 msgid "Installs selected packages."
 msgstr "Instaluje wybrane pakiety."
 
 #
 #. type: Plain text
-#: dselect.1:184
+#: dselect.1:177
 msgid ""
 "The configured access method will fetch installable or upgradable packages "
 "from the relevant repositories and install these using B<dpkg>.  Depending "
@@ -15632,7 +16404,7 @@
 "Niektóre metody dostępu również usuwają pakiety zaznaczone do usunięcia."
 
 #. type: Plain text
-#: dselect.1:192
+#: dselect.1:185
 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 "
@@ -15652,7 +16424,7 @@
 "jeżeli są zainstalowane."
 
 #. type: Plain text
-#: dselect.1:199
+#: dselect.1:192
 msgid ""
 "Details of the install action depend on the access method's implementation.  "
 "The user's attention and input may be required during installation, "
@@ -15667,62 +16439,62 @@
 "lub nawet w pełni automatyczną instalację pakietu."
 
 #. type: SS
-#: dselect.1:200
+#: dselect.1:193
 #, no-wrap
 msgid "config"
 msgstr "config (konfigurowanie)"
 
 #
 #. type: Plain text
-#: dselect.1:202
+#: dselect.1:195
 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:203
+#: dselect.1:196
 #, no-wrap
 msgid "remove"
 msgstr "remove (usuwanie)"
 
 #. type: Plain text
-#: dselect.1:205
+#: dselect.1:198
 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:206
+#: dselect.1:199
 #, no-wrap
 msgid "quit"
 msgstr "quit (wyjście)"
 
 #. type: Plain text
-#: dselect.1:208
+#: dselect.1:201
 msgid "Quit B<dselect>"
 msgstr "Wyjście z B<dselect>."
 
 #
 #. type: Plain text
-#: dselect.1:210
+#: dselect.1:203
 msgid "Exits the program with zero (successful) errorcode."
 msgstr "Wychodzi z programu z zerowym kodem błędu (pomyślnie)."
 
 #. type: SH
-#: dselect.1:212
+#: dselect.1:205
 #, no-wrap
 msgid "Package selections management"
 msgstr "Zarządzanie wyborem pakietów"
 
 #. type: SS
-#: dselect.1:214
+#: dselect.1:207
 #, no-wrap
 msgid "Introduction"
 msgstr "Wstęp"
 
 #. type: Plain text
-#: dselect.1:230
+#: dselect.1:223
 msgid ""
 "B<dselect> directly exposes the administrator to some of the complexities "
 "involved with managing large sets of packages with many interdependencies. "
@@ -15749,7 +16521,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:236
+#: dselect.1:229
 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> "
@@ -15764,13 +16536,13 @@
 "wyświetlone w dowolnym momencie przez wybranie klawisza B<\"?\">."
 
 #. type: SS
-#: dselect.1:237
+#: dselect.1:230
 #, no-wrap
 msgid "Screen layout"
 msgstr "Układ ekranu"
 
 #. type: Plain text
-#: dselect.1:245
+#: dselect.1:238
 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 "
@@ -15787,7 +16559,7 @@
 "informacji może być różny."
 
 #. type: Plain text
-#: dselect.1:248
+#: dselect.1:241
 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."
@@ -15797,13 +16569,13 @@
 "dzieli ekran na połowę."
 
 #. type: SS
-#: dselect.1:249
+#: dselect.1:242
 #, no-wrap
 msgid "Package details view"
 msgstr "Widok szczegółowych informacji o pakiecie"
 
 #. type: Plain text
-#: dselect.1:258
+#: dselect.1:251
 #, no-wrap
 msgid ""
 "The package details view by default shows the extended package description\n"
@@ -15824,7 +16596,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:262
+#: dselect.1:255
 msgid ""
 "In a dependency resolution screen, there is also the possibility of viewing "
 "the specific unresolved depends or conflicts related to the package and "
@@ -15835,13 +16607,13 @@
 "zależności, które spowodowały wylistowanie tego pakietu."
 
 #. type: SS
-#: dselect.1:263
+#: dselect.1:256
 #, no-wrap
 msgid "Packages status list"
 msgstr "Lista stanów pakietów"
 
 #. type: Plain text
-#: dselect.1:268
+#: dselect.1:261
 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 "
@@ -15853,7 +16625,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:276
+#: dselect.1:269
 msgid ""
 "For every package, the list shows the package's status, priority, section, "
 "installed and available versions, the package name and its short "
@@ -15872,7 +16644,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:282
+#: dselect.1:275
 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 "
@@ -15886,7 +16658,7 @@
 "wyborami dokonanymi przez użytkownika."
 
 #. type: Plain text
-#: dselect.1:300
+#: dselect.1:293
 #, no-wrap
 msgid ""
 "These are the meanings of the shorthand package status indicator codes:\n"
@@ -15926,14 +16698,14 @@
 "  B<n>       pakiet jest nowy i jeszcze nie był znaczony.\n"
 
 #. type: SS
-#: dselect.1:301
+#: dselect.1:294
 #, no-wrap
 msgid "Cursor and screen movement"
 msgstr "Przesuwanie kursora i ekranu"
 
 #
 #. type: Plain text
-#: dselect.1:306
+#: dselect.1:299
 msgid ""
 "The package selection list and the dependency conflict resolution screens "
 "can be navigated using motion commands mapped to the following keys:"
@@ -15942,7 +16714,7 @@
 "używając poleceń przypisanych do następujących klawiszy:"
 
 #. type: Plain text
-#: dselect.1:323
+#: dselect.1:316
 #, no-wrap
 msgid ""
 "  B<p, Up, k>           move cursor bar up\n"
@@ -15980,13 +16752,13 @@
 "  B<^f>                 przesunięcie ekranu o 1 znak w prawo\n"
 
 #. type: SS
-#: dselect.1:324
+#: dselect.1:317
 #, no-wrap
 msgid "Searching and sorting"
 msgstr "Wyszukiwanie i sortowanie"
 
 #. type: Plain text
-#: dselect.1:338
+#: dselect.1:331
 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 "
@@ -16009,7 +16781,7 @@
 "poszukiwanie jest kontynuowane od początku listy."
 
 #. type: Plain text
-#: dselect.1:345
+#: dselect.1:338
 #, no-wrap
 msgid ""
 "The list sort order can be varied by pressing\n"
@@ -16028,7 +16800,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:348
+#: dselect.1:341
 msgid ""
 "Where not listed above explicitly, alphabetic order is used as the final "
 "subordering sort key."
@@ -16037,13 +16809,13 @@
 "jest używany jako klucz podwyszukiwania."
 
 #. type: SS
-#: dselect.1:349
+#: dselect.1:342
 #, no-wrap
 msgid "Altering selections"
 msgstr "Zmienianie wyboru pakietów"
 
 #. type: Plain text
-#: dselect.1:358
+#: dselect.1:351
 #, no-wrap
 msgid ""
 "The requested selection state of individual packages may be\n"
@@ -16064,7 +16836,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:362
+#: dselect.1:355
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -16076,7 +16848,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:367
+#: dselect.1:360
 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 "
@@ -16087,7 +16859,7 @@
 "zależy od ustawień sortowania listy pakietów."
 
 #. type: Plain text
-#: dselect.1:373
+#: dselect.1:366
 msgid ""
 "Proper care should be taken when altering large groups of selections, "
 "because this can instantaneously create large numbers of unresolved depends "
@@ -16102,14 +16874,14 @@
 "w odniesieniu do grup pakietów."
 
 #. type: SS
-#: dselect.1:374
+#: dselect.1:367
 #, no-wrap
 msgid "Resolving depends and conflicts"
 msgstr "Rozwiązywanie zależności i konfliktów"
 
 #
 #. type: Plain text
-#: dselect.1:379
+#: dselect.1:372
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -16121,7 +16893,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:386
+#: dselect.1:379
 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 "
@@ -16140,7 +16912,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:392
+#: dselect.1:385
 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, "
@@ -16156,7 +16928,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:400
+#: dselect.1:393
 msgid ""
 "The listed packages' selection state may be reverted to the original "
 "settings, as they were before the unresolved depends or conflicts were "
@@ -16174,14 +16946,14 @@
 "ustawiane na sugerowane wartości."
 
 #. type: SS
-#: dselect.1:401
+#: dselect.1:394
 #, no-wrap
 msgid "Establishing the requested selections"
 msgstr "Ustanawianie żądanych wyborów pakietów"
 
 #
 #. type: Plain text
-#: dselect.1:408
+#: dselect.1:401
 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 "
@@ -16197,7 +16969,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:414
+#: dselect.1:407
 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 "
@@ -16211,7 +16983,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:421
+#: dselect.1:414
 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 "
@@ -16226,7 +16998,7 @@
 "ostatniego dobrego ustawienia."
 
 #. type: Plain text
-#: dselect.1:428
+#: dselect.1:421
 msgid ""
 "If you mistakenly establish some settings and wish to revert all the "
 "selections to what is currently installed on the system, press the B<'C'> "
@@ -16242,7 +17014,7 @@
 "przez pomyłkę."
 
 #. type: Plain text
-#: dselect.1:435
+#: dselect.1:428
 msgid ""
 "If set, B<dselect> will use it as the directory from which to read the user "
 "specific configuration file."
@@ -16250,7 +17022,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:441
+#: dselect.1:434
 msgid ""
 "The B<dselect> package selection interface is confusing to some new users.  "
 "Reportedly, it even makes seasoned kernel developers cry."
@@ -16260,24 +17032,24 @@
 
 #
 #. type: Plain text
-#: dselect.1:443
+#: dselect.1:436
 msgid "The documentation is lacking."
 msgstr "Dokumentacja jest wybrakowana."
 
 #
 #. type: Plain text
-#: dselect.1:445
+#: dselect.1:438
 msgid "There is no help option in the main menu."
 msgstr "Brak opcji \"pomoc\" w głównym menu."
 
 #
 #. type: Plain text
-#: dselect.1:447
+#: dselect.1:440
 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:451
+#: dselect.1:444
 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, "
@@ -16289,13 +17061,13 @@
 
 #
 #. type: Plain text
-#: dselect.1:457
+#: dselect.1:450
 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:462
+#: dselect.1:455
 #, fuzzy
 #| msgid ""
 #| "B<dselect> was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full "
@@ -16309,7 +17081,7 @@
 
 #
 #. type: Plain text
-#: dselect.1:465
+#: dselect.1:458
 msgid ""
 "This manual page was written by Juho Vuori E<lt>javuori@cc.helsinki.fiE<gt>, "
 "Josip Rodin and Joost kooij."
@@ -16323,6 +17095,13 @@
 msgid "dselect.cfg"
 msgstr "dselect.cfg"
 
+#. type: TH
+#: dselect.cfg.5:1
+#, fuzzy, no-wrap
+#| msgid "2009-02-27"
+msgid "2011-07-03"
+msgstr "2009-02-27"
+
 #. type: Plain text
 #: dselect.cfg.5:4
 msgid "dselect.cfg - dselect configuration file"
@@ -16330,9 +17109,16 @@
 
 #. type: Plain text
 #: dselect.cfg.5:11
+#, fuzzy
+#| 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. Quotes "
+#| "surrounding option values are stripped. Comments are allowed by starting "
+#| "a line with a hash sign (\"B<#>\")."
 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 "
+"option which is exactly the same as a normal command line option for dselect "
 "except for the leading dashes which are not used here. Quotes surrounding "
 "option values are stripped. Comments are allowed by starting a line with a "
 "hash sign (\"B<#>\")."
@@ -16387,13 +17173,15 @@
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:9
-msgid "B<start-stop-daemon> [I<options>] I<command>"
+#: start-stop-daemon.8:8
+#, fuzzy
+#| msgid "B<start-stop-daemon> [I<options>] I<command>"
+msgid "B<start-stop-daemon> [I<option>...] I<command>"
 msgstr "B<start-stop-daemon> [I<opcje>] I<polecenie>"
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:15
+#: start-stop-daemon.8:14
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
 "system-level processes.  Using one of the matching options, B<start-stop-"
@@ -16406,7 +17194,7 @@
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:34
+#: start-stop-daemon.8:33
 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 "
@@ -16429,14 +17217,14 @@
 
 #
 #. type: TP
-#: start-stop-daemon.8:36
+#: start-stop-daemon.8:35
 #, 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:53
+#: start-stop-daemon.8:52
 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<--"
@@ -16453,14 +17241,14 @@
 "podane tuż po opcji B<--> są przekazywane do wykonywanego polecenia."
 
 #. type: TP
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 #, no-wrap
 msgid "B<-K>, B<--stop>"
 msgstr "B<-K>, B<--stop>"
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
 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 "
@@ -16476,54 +17264,68 @@
 "B<--retry>, to B<start-stop-daemon> sprawdzi, czy proces(y) się zakończył(y)."
 
 #. type: TP
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
+#, fuzzy, no-wrap
+#| msgid "B<-K>, B<--stop>"
+msgid "B<-T>, B<--status>"
+msgstr "B<-K>, B<--stop>"
+
+#. type: Plain text
+#: start-stop-daemon.8:74
+msgid ""
+"Check for the existence of a specified process, and returns an exit status "
+"code, according to the LSB Init Script Actions."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:74
 #, no-wrap
 msgid "B<-H>, B<--help>"
 msgstr "B<-H>, B<--help>"
 
 #. type: Plain text
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 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:74
+#: start-stop-daemon.8:77
 #, no-wrap
 msgid "B<-V>, B<--version>"
 msgstr "B<-V>, B<--version>"
 
 #. type: Plain text
-#: start-stop-daemon.8:77
+#: start-stop-daemon.8:80
 msgid "Show the program version and exit."
 msgstr "Wyświetla informację o wersji programu i kończy działanie."
 
 #. type: SH
-#: start-stop-daemon.8:78
+#: start-stop-daemon.8:81
 #, no-wrap
 msgid "MATCHING OPTIONS"
 msgstr "OPCJE DOPASOWYWANIA"
 
 #. type: TP
-#: start-stop-daemon.8:79
+#: start-stop-daemon.8:82
 #, 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:83
+#: start-stop-daemon.8:86
 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:83
+#: start-stop-daemon.8:86
 #, no-wrap
 msgid "B<-x>, B<--exec> I<executable>"
 msgstr "B<-x>, B<--exec> I<plik_wykonywalny>"
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
@@ -16532,14 +17334,14 @@
 "opcji programu (sprawdzana jest zawartość B</proc/>I<pid>B</exe>)."
 
 #. type: TP
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 #, 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:93
+#: start-stop-daemon.8:96
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
@@ -16548,14 +17350,14 @@
 "proc/>I<pid>B</stat>)."
 
 #. type: TP
-#: start-stop-daemon.8:93
+#: start-stop-daemon.8:96
 #, 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:99
+#: start-stop-daemon.8:102
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
@@ -16563,25 +17365,25 @@
 "I<użytkownik> lub numerze I<uid>."
 
 #. type: TP
-#: start-stop-daemon.8:101
+#: start-stop-daemon.8:104
 #, 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:104
+#: start-stop-daemon.8:107
 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:104
+#: start-stop-daemon.8:107
 #, no-wrap
 msgid "B<-s>, B<--signal> I<signal>"
 msgstr "B<-s>, B<--signal> I<sygnał>"
 
 #. type: Plain text
-#: start-stop-daemon.8:109
+#: start-stop-daemon.8:112
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default TERM)."
@@ -16590,14 +17392,14 @@
 "zatrzymywanego procesu (domyślnie jest to TERM)."
 
 #. type: TP
-#: start-stop-daemon.8:109
+#: start-stop-daemon.8:112
 #, no-wrap
 msgid "B<-R>, B<--retry> I<timeout>|I<schedule>"
 msgstr "B<-R>, B<--retry> I<timeout>|I<plan-działania>"
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:119
+#: start-stop-daemon.8:122
 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 "
@@ -16612,7 +17414,7 @@
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:130
+#: start-stop-daemon.8:133
 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 "
@@ -16624,7 +17426,7 @@
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:146
+#: start-stop-daemon.8:149
 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 "
@@ -16641,7 +17443,7 @@
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 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, "
@@ -16653,14 +17455,14 @@
 "ignorowany."
 
 #. type: TP
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 #, 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:167
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
@@ -16670,14 +17472,14 @@
 "exec>."
 
 #. type: TP
-#: start-stop-daemon.8:164
+#: start-stop-daemon.8:167
 #, no-wrap
 msgid "B<-t>, B<--test>"
 msgstr "B<-t>, B<--test>"
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
@@ -16686,39 +17488,40 @@
 "odpowiedni kod błędu, jednakże opcja ta nie wykonuje żadnych operacji."
 
 #. type: TP
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 #, no-wrap
 msgid "B<-o>, B<--oknodo>"
 msgstr "B<-o>, B<--oknodo>"
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 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:174
 #, no-wrap
 msgid "B<-q>, B<--quiet>"
 msgstr "B<-q>, B<--quiet>"
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:174
+#: start-stop-daemon.8:177
 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
-#, no-wrap
-msgid "B<-c>, B<--chuid> I<username>|I<uid>"
+#: start-stop-daemon.8:177
+#, fuzzy, no-wrap
+#| msgid "B<-c>, B<--chuid> I<username>|I<uid>"
+msgid "B<-c>, B<--chuid> I<username>|I<uid>[B<:>I<group>|I<gid>]"
 msgstr "B<-c>, B<--chuid> I<użytkownik>|I<uid>"
 
 #. type: Plain text
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 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 "
@@ -16740,14 +17543,14 @@
 "jak B<nobody>)."
 
 #. type: TP
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 #, no-wrap
 msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<-r>, B<--chroot> I<root>"
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
@@ -16757,14 +17560,14 @@
 "po wykonaniu chroot."
 
 #. type: TP
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 #, no-wrap
 msgid "B<-d>, B<--chdir> I<path>"
 msgstr "B<-d>, B<--chdir> I<ścieżka>"
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 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-"
@@ -16777,14 +17580,14 @@
 "(root)."
 
 #. type: TP
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 #, no-wrap
 msgid "B<-b>, B<--background>"
 msgstr "B<-b>, B<--background>"
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 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 "
@@ -16804,25 +17607,25 @@
 "programu kodu uruchamiającego proces potomny."
 
 #. type: TP
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 #, no-wrap
 msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr "B<-N>, B<--nicelevel> I<liczba>"
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 msgid "This alters the priority of the process before starting it."
 msgstr "Zmienia priorytet uruchamianego procesu."
 
 #. type: TP
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 #, no-wrap
 msgid "B<-P>, B<--procsched> I<policy>B<:>I<priority>"
 msgstr "B<-P>, B<--procsched> I<polityka>B<:>I<priorytet>"
 
 #. type: Plain text
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 msgid ""
 "This alters the process scheduler policy and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -16836,13 +17639,13 @@
 
 #
 #. type: TP
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 #, no-wrap
 msgid "B<-I>, B<--iosched> I<class>B<:>I<priority>"
 msgstr "B<-I>, B<--iosched> I<klasa>B<:>I<priorytet>"
 
 #. type: Plain text
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 msgid ""
 "This alters the IO scheduler class and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -16858,25 +17661,25 @@
 "effort> oraz B<real-time>."
 
 #. type: TP
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 #, no-wrap
 msgid "B<-k>, B<--umask> I<mask>"
 msgstr "B<-k>, B<--umask> I<maska>"
 
 #. type: Plain text
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 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:237
+#: start-stop-daemon.8:240
 #, no-wrap
 msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-m>, B<--make-pidfile>"
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:252
+#: start-stop-daemon.8:255
 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<--"
@@ -16895,39 +17698,78 @@
 "utworzy proces potomny. Z tego powodu opcja jest użyteczna jedynie wraz z "
 "opcją B<--background>."
 
-#. type: TP
-#: start-stop-daemon.8:252
-#, no-wrap
-msgid "B<-v>, B<--verbose>"
-msgstr "B<-v>, B<--verbose>"
-
 #
 #. type: Plain text
-#: start-stop-daemon.8:255
+#: start-stop-daemon.8:258
 msgid "Print verbose informational messages."
 msgstr "Wyświetlane są dodatkowe komunikaty."
 
 #. type: Plain text
-#: start-stop-daemon.8:272
+#: start-stop-daemon.8:270
+msgid ""
+"The requested action was performed. If B<--oknodo> was specified, it's also "
+"possible that nothing had to be done.  This can happen when B<--start> was "
+"specified and a matching process was already running, or when B<--stop> was "
+"specified and there were no matching processes."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:275
+msgid "If B<--oknodo> was not specified and nothing was done."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:283
+msgid ""
+"If B<--stop> and B<--retry> were specified, but the end of the schedule was "
+"reached and the processes were still running."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:283 start-stop-daemon.8:295
+#, no-wrap
+msgid "B<3>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:286
+msgid "Any other error."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:289
 msgid ""
-"B<start-stop-daemon> returns 0 if the requested action was performed, or if "
-"B<--oknodo> is specified and either B<--start> was specified and a matching "
-"process was already running, or B<--stop> was specified and there were no "
-"matching processes. If B<--oknodo> was not specified and nothing was done, 1 "
-"is returned. If B<--stop> and B<--retry> were specified, but the end of the "
-"schedule was reached and the processes were still running, the error value "
-"is 2. For all other errors, the status is 3."
-msgstr ""
-"B<start-stop-daemon> zwraca 0, jeśli żądana akcja się powiodła lub gdy "
-"podano B<--oknodo> i albo podano także B<--start>, a odpowiadający proces "
-"już działał, albo podano B<--stop> i nie znaleziono odpowiadającego procesu. "
-"Jeśli nie podano B<--oknodo> i nic nie zrobiono, to zwracane jest 1. Jeśli "
-"podano B<--stop> i B<--retry> i cały plan działania został wykonany, a "
-"proces dalej działa, to kodem błędu jest 2. W razie innych błędów zwracane "
-"jest 3."
+"When using the B<--status> command, the following status codes are returned:"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:292
+msgid "Program is running."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:295
+msgid "Program is not running and the pid file exists."
+msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:276
+#: start-stop-daemon.8:298
+msgid "Program is not running."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:298
+#, no-wrap
+msgid "B<4>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:301
+msgid "Unable to determine program status."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:305
 msgid ""
 "Start the B<food> daemon, unless one is already running (a process named "
 "food, running as user food, with pid in food.pid):"
@@ -16936,35 +17778,35 @@
 "działający jako użytkownik food, z identyfikatorem procesu w pliku food.pid):"
 
 #. type: Plain text
-#: start-stop-daemon.8:279
+#: start-stop-daemon.8:308
 #, no-wrap
 msgid "start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon\n"
 msgstr "start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:282
+#: start-stop-daemon.8:311
 msgid "Send B<SIGTERM> to B<food> and wait up to 5 seconds for it to stop:"
 msgstr "Wyślij B<SIGTERM> do B<food> i czekaj do 5 sekund na jego zakończenie:"
 
 #. type: Plain text
-#: start-stop-daemon.8:285
+#: start-stop-daemon.8:314
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5\n"
 msgstr "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:288
+#: start-stop-daemon.8:317
 msgid "Demonstration of a custom schedule for stopping B<food>:"
 msgstr "Przykład własnego planu zatrzymywania B<food>:"
 
 #. type: Plain text
-#: start-stop-daemon.8:291
+#: start-stop-daemon.8:320
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5\n"
 msgstr "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:297
+#: start-stop-daemon.8:326
 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>."
@@ -16975,7 +17817,7 @@
 
 #
 #. type: Plain text
-#: start-stop-daemon.8:299
+#: start-stop-daemon.8:328
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -16998,12 +17840,14 @@
 "domyślne polecenia"
 
 #. type: Plain text
-#: update-alternatives.8:16
-msgid "B<update-alternatives> [I<options>] I<command>"
+#: update-alternatives.8:15
+#, fuzzy
+#| msgid "B<update-alternatives> [I<options>] I<command>"
+msgid "B<update-alternatives> [I<option>...] I<command>"
 msgstr "B<update-alternatives> [I<opcje>] I<polecenie>"
 
 #. type: Plain text
-#: update-alternatives.8:21
+#: update-alternatives.8:20
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
@@ -17013,7 +17857,7 @@
 "zarządza."
 
 #. type: Plain text
-#: update-alternatives.8:29
+#: update-alternatives.8:28
 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 "
@@ -17031,7 +17875,7 @@
 "uruchomić, jeżeli użytkownik nie określił swoich preferencji co do edytora."
 
 #. type: Plain text
-#: update-alternatives.8:51
+#: update-alternatives.8:50
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -17055,7 +17899,7 @@
 "zmieni, chyba że administrator każe mu tak zrobić."
 
 #. type: Plain text
-#: update-alternatives.8:61
+#: update-alternatives.8:60
 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> "
@@ -17072,7 +17916,7 @@
 "zrobić."
 
 #. type: Plain text
-#: update-alternatives.8:73
+#: update-alternatives.8:72
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -17087,7 +17931,7 @@
 "B<postinst> (configure) lub B<prerm> (install) w pakietach Debiana."
 
 #. type: Plain text
-#: update-alternatives.8:92
+#: update-alternatives.8:91
 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>"
@@ -17107,7 +17951,7 @@
 "podrzędne tworzą I<grupę> I<dowiązań>."
 
 #. type: Plain text
-#: update-alternatives.8:101
+#: 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 "
@@ -17123,7 +17967,7 @@
 "i zostawi wszystkie decyzje administratorowi systemu."
 
 #. type: Plain text
-#: update-alternatives.8:110
+#: 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 "
@@ -17138,7 +17982,7 @@
 "grupa ta automatycznie przejdzie w tryb ręczny."
 
 #. type: Plain text
-#: update-alternatives.8:117
+#: 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 "
@@ -17149,15 +17993,24 @@
 "priorytet."
 
 #. type: Plain text
-#: update-alternatives.8:134
+#: update-alternatives.8:133
+#, 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 "
+#| "alternative name. The current choice is marked with a '*'.  You will then "
+#| "be prompted for your choice regarding this link group.  Depending on the "
+#| "choice made, the link group might no longer be in I<auto> mode. You will "
+#| "need to use the I<--auto> option in order to return to the automatic mode "
+#| "(or you can rerun I<--config> and select the entry marked as automatic)."
 msgid ""
-"When using the I<--config> option, B<update-alternatives> will list all of "
+"When using the B<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master "
 "alternative name. The current choice is marked with a '*'.  You will then be "
 "prompted for your choice regarding this link group.  Depending on the choice "
 "made, the link group might no longer be in I<auto> mode. You will need to "
-"use the I<--auto> option in order to return to the automatic mode (or you "
-"can rerun I<--config> and select the entry marked as automatic)."
+"use the B<--auto> option in order to return to the automatic mode (or you "
+"can rerun B<--config> and select the entry marked as automatic)."
 msgstr ""
 "B<update-alternatives> użyte z opcją I<--config> wyświetli listę wszystkich "
 "alternatyw dla grupy dowiązań, dla której podana I<nazwa> jest nazwą "
@@ -17169,15 +18022,19 @@
 "jako automatyczną)."
 
 #. type: Plain text
-#: update-alternatives.8:138
+#: update-alternatives.8:137
+#, fuzzy
+#| msgid ""
+#| "If you want to configure non-interactively you can use the I<--set> "
+#| "option instead (see below)."
 msgid ""
-"If you want to configure non-interactively you can use the I<--set> option "
+"If you want to configure non-interactively you can use the B<--set> option "
 "instead (see below)."
 msgstr ""
 "Aby skonfigurować nieinteraktywnie, można użyć opcji I<--set> (patrz niżej)."
 
 #. type: Plain text
-#: update-alternatives.8:149
+#: update-alternatives.8:148
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "In other words, the usage of B<update-alternatives> is B<mandatory> for all "
@@ -17191,13 +18048,13 @@
 "alternatives>."
 
 #. type: SH
-#: update-alternatives.8:150
+#: update-alternatives.8:149
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr "TERMINOLOGIA"
 
 #. type: Plain text
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
@@ -17206,13 +18063,13 @@
 "podane są terminy, które pomogą je zrozumieć."
 
 #. type: TP
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 #, no-wrap
 msgid "generic name (or alternative link)"
 msgstr "nazwa ogólna (lub dowiązanie alternatywy)"
 
 #. type: Plain text
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
 "to one of a number of files of similar function."
@@ -17221,24 +18078,24 @@
 "do jednego z kilku plików o podobnej funkcjonalności."
 
 #. type: TP
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 #, no-wrap
 msgid "alternative name"
 msgstr "nazwa alternatywy"
 
 #. type: Plain text
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 msgid "The name of a symbolic link in the alternatives directory."
 msgstr "Nazwa dowiązania symbolicznego w katalogu alternatyw."
 
 #. type: TP
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 #, no-wrap
 msgid "alternative (or alternative path)"
 msgstr "alternatywa (lub ścieżka alternatywy)"
 
 #. type: Plain text
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 msgid ""
 "The name of a specific file in the filesystem, which may be made accessible "
 "via a generic name using the alternatives system."
@@ -17247,25 +18104,25 @@
 "być dostępny przez nazwę ogólną."
 
 #. type: TP
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 #, no-wrap
 msgid "alternatives directory"
 msgstr "katalog alternatyw"
 
 #. type: Plain text
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr ""
 "Katalog zawierający dowiązania symboliczne, domyślnie I</etc/alternatives>."
 
 #. type: TP
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 #, no-wrap
 msgid "administrative directory"
 msgstr "katalog administracyjny"
 
 #. type: Plain text
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
 "alternatives>' state information."
@@ -17274,24 +18131,24 @@
 "var/lib/dpkg/alternatives>."
 
 #. type: TP
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 #, no-wrap
 msgid "link group"
 msgstr "grupa dowiązań"
 
 #. type: Plain text
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr "Zbiór powiązanych dowiązań symbolicznych, zarządzany jako grupa."
 
 #. type: TP
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 #, no-wrap
 msgid "master link"
 msgstr "dowiązanie główne"
 
 #. type: Plain text
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 msgid ""
 "The alternative link in a link group which determines how the other links in "
 "the group are configured."
@@ -17300,13 +18157,13 @@
 "konfigurowania innych dowiązań z tej grupy."
 
 #. type: TP
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 #, no-wrap
 msgid "slave link"
 msgstr "dowiązanie podrzędne"
 
 #. type: Plain text
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 msgid ""
 "An alternative link in a link group which is controlled by the setting of "
 "the master link."
@@ -17315,13 +18172,13 @@
 "ustawienie głównego dowiązania."
 
 #. type: TP
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 #, no-wrap
 msgid "automatic mode"
 msgstr "tryb automatyczny"
 
 #. type: Plain text
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 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 "
@@ -17331,13 +18188,13 @@
 "że dowiązania z tej grupy wskazują na alternatywę o najwyższym priorytecie."
 
 #. type: TP
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 #, no-wrap
 msgid "manual mode"
 msgstr "tryb ręczny"
 
 #. type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:201
 msgid ""
 "When a link group is in manual mode, the alternatives system will not make "
 "any changes to the system administrator's settings."
@@ -17346,13 +18203,13 @@
 "w ustawieniach wprowadzonych przez administratora systemu."
 
 #. type: TP
-#: update-alternatives.8:204
+#: update-alternatives.8:203
 #, no-wrap
 msgid "B<--install> I<link name path priority> [B<--slave> I<link name path>]..."
 msgstr "B<--install> I<dowiązanie nazwa ścieżka priorytet> [B<--slave> I<dowiązanie nazwa ścieżka>]..."
 
 #. type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:222
 msgid ""
 "Add a group of alternatives to the system.  I<link> is the generic name for "
 "the master link, I<name> is the name of its symlink in the alternatives "
@@ -17380,7 +18237,7 @@
 "rzeczywisty plik, jest on zachowywany, chyba że użyta jest opcja B<--force>."
 
 #. type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 msgid ""
 "If the alternative name specified exists already in the alternatives "
 "system's records, the information supplied will be added as a new set of "
@@ -17399,29 +18256,33 @@
 "zaktualizowane tak, żeby prowadziły do nowo dodanych alternatyw."
 
 #. type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr "B<--set> I<nazwa ścieżka>"
 
 #. type: Plain text
-#: update-alternatives.8:243
+#: update-alternatives.8:242
+#, 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."
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
-"I<--config> but is non-interactive and thus scriptable."
+"B<--config> but is non-interactive and thus scriptable."
 msgstr ""
 "Ustawia program I<ścieżka> jako alternatywę dla I<nazwy>. Jest to "
 "nieinteraktywny, a więc możliwy do użycia w skryptach, odpowiednik opcji I<--"
 "config>."
 
 #. type: TP
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr "B<--remove> I<nazwa ścieżka>"
 
 #. type: Plain text
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 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 "
@@ -17444,13 +18305,13 @@
 "zostanie tylko usunięta informacja o alternatywie."
 
 #. type: TP
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr "B<--remove-all> I<nazwa>"
 
 #. type: Plain text
-#: update-alternatives.8:269
+#: update-alternatives.8:268
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
@@ -17459,7 +18320,7 @@
 "dowiązania podrzędne. I<nazwa> jest nazwą w katalogu alternatyw."
 
 #. type: Plain text
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 msgid ""
 "Call B<--config> on all alternatives. It can be usefully combined with B<--"
 "skip-auto> to review and configure all alternatives which are not configured "
@@ -17475,13 +18336,13 @@
 "all>."
 
 #. type: TP
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 #, no-wrap
 msgid "B<--auto> I<name>"
 msgstr "B<--auto> I<nazwa>"
 
 #. type: Plain text
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 msgid ""
 "Switch the link group behind the alternative for I<name> to automatic mode.  "
 "In the process, the master symlink and its slaves are updated to point to "
@@ -17492,13 +18353,13 @@
 "zaktualizowane tak, aby wskazywać na alternatywę o najwyższym priorytecie."
 
 #. type: TP
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 #, no-wrap
 msgid "B<--display> I<name>"
 msgstr "B<--display> I<nazwa>"
 
 #. type: Plain text
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 msgid ""
 "Display information about the link group.  Information displayed includes "
 "the group's mode (auto or manual), which alternative the master link "
@@ -17513,13 +18374,13 @@
 "priorytecie."
 
 #. type: TP
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 #, no-wrap
 msgid "B<--get-selections>"
 msgstr "B<--get-selections>"
 
 #. type: Plain text
-#: update-alternatives.8:300
+#: update-alternatives.8:299
 msgid ""
 "List all master alternative names (those controlling a link group)  and "
 "their status. Each line contains up to 3 fields (separated by one or more "
@@ -17535,7 +18396,7 @@
 "dla alternatywy (uwaga: jest to nazwa pliku i może zawierać znaki spacji)."
 
 #. type: Plain text
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 msgid ""
 "Read configuration of alternatives on standard input in the format generated "
 "by B<update-alternatives --get-selections> and reconfigure them accordingly."
@@ -17545,13 +18406,13 @@
 "rekonfiguruje."
 
 #. type: TP
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 #, no-wrap
 msgid "B<--query> I<name>"
 msgstr "B<--query> I<nazwa>"
 
 #. type: Plain text
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 msgid ""
 "Display information about the link group like --display does, but in a "
 "machine parseable way (see section B<QUERY FORMAT> below)."
@@ -17561,24 +18422,24 @@
 "B<FORMAT ZAPYTANIA>)."
 
 #. type: TP
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 #, no-wrap
 msgid "B<--list> I<name>"
 msgstr "B<--list> I<nazwa>"
 
 #. type: Plain text
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 msgid "Display all targets of the link group."
 msgstr "Wyświetla wszystkie cele w grupie dowiązań."
 
 #. type: TP
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 #, no-wrap
 msgid "B<--config> I<name>"
 msgstr "B<--config> I<nazwa>"
 
 #. type: Plain text
-#: update-alternatives.8:317
+#: update-alternatives.8:316
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated."
@@ -17588,33 +18449,33 @@
 "odpowiednio zaktualizowana."
 
 #. type: TP
-#: update-alternatives.8:325
+#: update-alternatives.8:324
 #, no-wrap
 msgid "B<--altdir>I< directory>"
 msgstr "B<--altdir>I< katalog>"
 
 #. type: Plain text
-#: update-alternatives.8:329
+#: update-alternatives.8:328
 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:333
+#: update-alternatives.8:332
 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:333
+#: update-alternatives.8:332
 #, no-wrap
 msgid "B<--log>I< file>"
 msgstr "B<--log>I< plik>"
 
 #. type: Plain text
-#: update-alternatives.8:337
+#: update-alternatives.8:336
 #, fuzzy
 #| msgid ""
 #| "Specifies the log file, when this is to be different from the default (/"
@@ -17626,22 +18487,26 @@
 "Określa plik dziennika, jeżeli ma być inny niż domyślny (/var/log/dpkg.log)."
 
 #. type: Plain text
-#: update-alternatives.8:341
+#: update-alternatives.8:340
+#, fuzzy
+#| msgid ""
+#| "Let B<update-alternatives> replace any real file that is installed where "
+#| "an alternative link has to be installed."
 msgid ""
-"Let B<update-alternatives> replace any real file that is installed where an "
-"alternative link has to be installed."
+"Let B<update-alternatives> replace or drop any real file that is installed "
+"where an alternative link has to be installed or removed."
 msgstr ""
 "Zezwala B<update-alternatives> na zastępowanie istniejących rzeczywistych "
 "plików tam, gdzie powinno być zainstalowane dowiązanie alternatywy."
 
 #. type: TP
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 #, no-wrap
 msgid "B<--skip-auto>"
 msgstr "B<--skip-auto>"
 
 #. type: Plain text
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 msgid ""
 "Skip configuration prompt for alternatives which are properly configured in "
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
@@ -17651,50 +18516,50 @@
 "all>."
 
 #. type: TP
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 #, no-wrap
 msgid "B<--verbose>"
 msgstr "B<--verbose>"
 
 #. type: Plain text
-#: update-alternatives.8:351
+#: update-alternatives.8:350
 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:354
+#: update-alternatives.8:353
 msgid "Don't generate any comments unless errors occur."
 msgstr "Nie wyświetla żadnych komentarzy, chyba że wystąpi błąd."
 
 #. type: Plain text
-#: update-alternatives.8:360
+#: update-alternatives.8:359
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the base administrative directory."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:362
+#: update-alternatives.8:361
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr "I</etc/alternatives/>"
 
 #. type: Plain text
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 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:368
+#: update-alternatives.8:367
 #, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "I</var/lib/dpkg/alternatives/>"
 
 #. type: Plain text
-#: update-alternatives.8:374
+#: update-alternatives.8:373
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
@@ -17705,14 +18570,8 @@
 msgid "The requested action was successfully performed."
 msgstr "Akcja zakończyła się powodzeniem."
 
-#. type: IP
-#: update-alternatives.8:378
-#, no-wrap
-msgid "2"
-msgstr "2"
-
 #. type: Plain text
-#: update-alternatives.8:381
+#: update-alternatives.8:382
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
@@ -17720,15 +18579,21 @@
 "Wystąpiły problemy podczas przetwarzania linii poleceń lub wykonywania akcji."
 
 #. type: SH
-#: update-alternatives.8:382
+#: update-alternatives.8:383
 #, no-wrap
 msgid "QUERY FORMAT"
 msgstr "FORMAT ZAPYTANIA"
 
 #. type: Plain text
-#: update-alternatives.8:387
+#: update-alternatives.8:388
+#, fuzzy
+#| msgid ""
+#| "The B<update-alternatives> I<--query> format is using an RFC822-like flat "
+#| "format. It's made of I<n> + 1 blocks where I<n> is the number of "
+#| "alternatives available in the queried link group. The first block "
+#| "contains the following fields:"
 msgid ""
-"The B<update-alternatives> I<--query> format is using an RFC822-like flat "
+"The B<update-alternatives --query> format is using an RFC822-like flat "
 "format. It's made of I<n> + 1 blocks where I<n> is the number of "
 "alternatives available in the queried link group. The first block contains "
 "the following fields:"
@@ -17739,35 +18604,38 @@
 "zapytanie. Pierwszy blok zawiera następujące pola:"
 
 #. type: TP
-#: update-alternatives.8:387
-#, no-wrap
-msgid "B<Link:> E<lt>linkE<gt>"
+#: update-alternatives.8:388
+#, fuzzy, no-wrap
+#| msgid "B<Link:> E<lt>linkE<gt>"
+msgid "B<Link:>I< link>"
 msgstr "B<Link:> E<lt>dowiązanieE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 msgid "The generic name of the alternative."
 msgstr "Nazwa ogólna alternatywy."
 
 #. type: TP
-#: update-alternatives.8:390
-#, no-wrap
-msgid "B<Status:> E<lt>statusE<gt>"
+#: update-alternatives.8:391
+#, fuzzy, no-wrap
+#| msgid "B<Status:> E<lt>statusE<gt>"
+msgid "B<Status:>I< status>"
 msgstr "B<Status:> E<lt>statusE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr "Status alternatywy (B<auto> lub B<manual>)."
 
 #. type: TP
-#: update-alternatives.8:393
-#, no-wrap
-msgid "B<Best:> E<lt>best choiceE<gt>"
+#: update-alternatives.8:394
+#, fuzzy, no-wrap
+#| msgid "B<Best:> E<lt>best choiceE<gt>"
+msgid "B<Best:>I< best-choice>"
 msgstr "B<Best:> E<lt>najlepszy wybórE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
@@ -17776,13 +18644,14 @@
 "jeśli nie ma dostępnych żadnych alternatyw."
 
 #. type: TP
-#: update-alternatives.8:397
-#, no-wrap
-msgid "B<Value:> E<lt>currently selected alternativeE<gt> "
+#: update-alternatives.8:398
+#, fuzzy, no-wrap
+#| msgid "B<Value:> E<lt>currently selected alternativeE<gt> "
+msgid "B<Value:>I< currently-selected-alternative>"
 msgstr "B<Value:> E<lt>aktualnie wybrana alternatywaE<gt> "
 
 #. type: Plain text
-#: update-alternatives.8:401
+#: update-alternatives.8:402
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
@@ -17791,41 +18660,44 @@
 "wartość B<none> - jest ona używana jeśli dowiązanie nie istnieje."
 
 #. type: TP
-#: update-alternatives.8:402
+#: update-alternatives.8:403
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr "Inne bloki opisują dostępne alternatywy w grupie dowiązań, do której odnosi się zapytanie:"
 
 #. type: TP
-#: update-alternatives.8:404
-#, no-wrap
-msgid "B<Alternative:> E<lt>path of this alternativeE<gt>"
+#: update-alternatives.8:405
+#, fuzzy, no-wrap
+#| msgid "B<Alternative:> E<lt>path of this alternativeE<gt>"
+msgid "B<Alternative:>I< path-of-this-alternative>"
 msgstr "B<Alternative:> E<lt>ścieżka alternatywyE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 msgid "Path to this block's alternative."
 msgstr "Ścieżka do alternatywy opisywanej w tym bloku."
 
 #. type: TP
-#: update-alternatives.8:407
-#, no-wrap
-msgid "B<Priority:> E<lt>priority valueE<gt>"
+#: update-alternatives.8:408
+#, fuzzy, no-wrap
+#| msgid "B<Priority:> E<lt>priority valueE<gt>"
+msgid "B<Priority:>I< priority-value>"
 msgstr "B<Priority:> E<lt>wartość priorytetuE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 msgid "Value of the priority of this alternative."
 msgstr "Wartość priorytetu alternatywy."
 
 #. type: TP
-#: update-alternatives.8:410
-#, no-wrap
-msgid "B<Slaves:> E<lt>list of slavesE<gt>"
+#: update-alternatives.8:411
+#, fuzzy, no-wrap
+#| msgid "B<Slaves:> E<lt>list of slavesE<gt>"
+msgid "B<Slaves:>I< list-of-slaves>"
 msgstr "B<Slaves:> E<lt>lista alternatyw podrzędnychE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:416
+#: update-alternatives.8:417
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -17839,13 +18711,13 @@
 "ścieżkę do alternatywy podrzędnej."
 
 #. type: TP
-#: update-alternatives.8:417
+#: update-alternatives.8:418
 #, no-wrap
 msgid "B<Example>"
 msgstr "B<Przykład>"
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:426
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
@@ -17861,7 +18733,7 @@
 "Value: /usr/bin/vim.gtk\n"
 
 #. type: Plain text
-#: update-alternatives.8:430
+#: update-alternatives.8:431
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -17875,7 +18747,7 @@
 " editor.1.gz /usr/share/man/man1/ed.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:446
 #, no-wrap
 msgid ""
 "Alternative: /usr/bin/vim.gtk\n"
@@ -17909,9 +18781,16 @@
 " editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:457
+#: update-alternatives.8:458
+#, fuzzy
+#| msgid ""
+#| "With I<--verbose> 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."
 msgid ""
-"With I<--verbose> B<update-alternatives> chatters incessantly about its "
+"With B<--verbose> 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; "
@@ -17925,7 +18804,7 @@
 "to jako błąd."
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:464
 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 "
@@ -17938,21 +18817,25 @@
 "dowiązania do samego programu i odpowiadających mu stron podręcznika."
 
 #. type: Plain text
-#: update-alternatives.8:466
+#: update-alternatives.8:467
+#, fuzzy
+#| msgid ""
+#| "To display the available packages which provide B<vi> and the current "
+#| "setting for it, use the I<--display> action:"
 msgid ""
 "To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
+"setting for it, use the B<--display> action:"
 msgstr ""
 "Aby wyświetlić listę dostępnych pakietów, które dostarczają B<vi> oraz jego "
 "bieżące ustawienie, należy użyć akcji I<--display>:"
 
 #. type: Plain text
-#: update-alternatives.8:469
+#: update-alternatives.8:470
 msgid "B<update-alternatives --display vi>"
 msgstr "B<update-alternatives --display vi>"
 
 #. type: Plain text
-#: update-alternatives.8:473
+#: update-alternatives.8:474
 msgid ""
 "To choose a particular B<vi> implementation, use this command as root and "
 "then select a number from the list:"
@@ -17961,12 +18844,12 @@
 "jako użytkownik root i wybrać liczbę z listy:"
 
 #. type: Plain text
-#: update-alternatives.8:476
+#: update-alternatives.8:477
 msgid "B<update-alternatives --config vi>"
 msgstr "B<update-alternatives --config vi>"
 
 #. type: Plain text
-#: update-alternatives.8:480
+#: update-alternatives.8:481
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
@@ -17975,12 +18858,12 @@
 "jako użytkownik root wykonać:"
 
 #. type: Plain text
-#: update-alternatives.8:483
+#: update-alternatives.8:484
 msgid "B<update-alternatives --auto vi>"
 msgstr "B<update-alternatives --auto vi>"
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:488
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
 msgstr ""
@@ -17988,7 +18871,7 @@
 "śledzenia błędów Debiana."
 
 #. type: Plain text
-#: update-alternatives.8:492
+#: update-alternatives.8:493
 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 "
@@ -17999,14 +18882,14 @@
 "znalezienia jakichkolwiek rozbieżności, prosimy o ich zgłoszenie."
 
 #. type: Plain text
-#: update-alternatives.8:503
+#: update-alternatives.8:504
 msgid ""
 "This manual page is copyright 1997,1998 Charles Briscoe-Smith and others."
 msgstr ""
 "Copyright tej strony podręcznika: 1997,1998 Charles Briscoe-Smith i inni."
 
 #. type: Plain text
-#: update-alternatives.8:506
+#: update-alternatives.8:507
 msgid ""
 "This is free documentation; see the GNU General Public Licence version 2 or "
 "later for copying conditions. There is NO WARRANTY."
@@ -18016,10 +18899,267 @@
 "Brak JAKIEJKOLWIEK gwarancji."
 
 #. type: Plain text
-#: update-alternatives.8:509
+#: update-alternatives.8:510
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS - standard hierarchii systemu plików."
 
+#~ msgid "2009-02-27"
+#~ msgstr "2009-02-27"
+
+#, fuzzy
+#~| msgid "2009-02-27"
+#~ msgid "2011-04-29"
+#~ msgstr "2009-02-27"
+
+#~ msgid "2006-02-28"
+#~ msgstr "2006-02-28"
+
+#~ msgid "2007-03-07"
+#~ msgstr "2007-03-07"
+
+#~ msgid "2007-07-16"
+#~ msgstr "2007-07-16"
+
+#, fuzzy
+#~| msgid "2009-08-16"
+#~ msgid "2009-03-15"
+#~ msgstr "2009-08-16"
+
+#, fuzzy
+#~| msgid "2009-02-27"
+#~ msgid "2011-04-27"
+#~ msgstr "2009-02-27"
+
+#, fuzzy
+#~| msgid "2009-02-27"
+#~ msgid "2011-07-07"
+#~ msgstr "2009-02-27"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-04-18"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| msgid "dselect.cfg - dselect configuration file"
+#~ msgid "Package maintainer configuration file."
+#~ msgstr "dselect.cfg - plik konfiguracyjny programu dselect "
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-07-29"
+#~ msgstr "2006-02-28"
+
+#~ msgid "B<Package:> E<lt>package nameE<gt>"
+#~ msgstr "B<Package:> E<lt>nazwa pakietuE<gt>"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-11-22"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| msgid "B<Source:> E<lt>source nameE<gt>"
+#~ msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
+#~ msgstr "B<Source:> E<lt>nazwa źródłaE<gt>"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-01-28"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| 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 version number, B<2.0> at the time this manual page was written.  "
+#~| "Programs which read new-format archives should be prepared for the minor "
+#~| "number to be increased and new lines to be present, and should ignore "
+#~| "these if this is the case."
+#~ msgid ""
+#~ "The first member is named B<debian-split> and contains a series of lines, "
+#~ "separated by newlines. Currently seven lines are present.  The first is "
+#~ "the format version number, B<2.1> at the time this manual page was "
+#~ "written. The second is the package name. The third is the package "
+#~ "version. The fourth is the md5sum of the package.  The fifth is the total "
+#~ "size of the package. The sixth is the maximum part size. The seventh is "
+#~ "the current part number, followed by a slash and the total amount of "
+#~ "parts (as in \\(oq1/10\\(cq)."
+#~ msgstr ""
+#~ "Pierwszy składnik nazywa się B<debian-binary> i zawiera serię linii "
+#~ "rozdzielonych znakami nowej linii. Obecnie plik ten zawiera tylko jedną "
+#~ "linię - numer wersji formatu, który - w czasie pisania tej strony "
+#~ "podręcznika - wynosił B<2.0>. Programy obsługujące archiwa w nowym "
+#~ "formacie powinny być gotowe na obsłużenie zmiany liczby pobocznej (po "
+#~ "kropce) oraz na obecność nowych linii, które powinny ignorować."
+
+#~ msgid "2008-08-18"
+#~ msgstr "2008-08-18"
+
+#
+#~ msgid ""
+#~ "B<dpkg> can 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> może być także użyty jako nakładka na B<dpkg-deb>(1). Wymienione "
+#~ "poniżej działania są działaniami programu B<dpkg-deb> i jeżeli zostaną "
+#~ "użyte, to B<dpkg> uruchomi B<dpkg-deb>, przekazując mu odpowiednie "
+#~ "parametry:"
+
+#~ 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> oraz\n"
+#~ "    B<--fsys-tarfile>.\n"
+
+#
+#~ 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)."
+
+#~ msgid "B<--new>, B<--old>"
+#~ msgstr "B<--new>, B<--old>"
+
+#
+#~ msgid ""
+#~ "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
+#~ msgstr ""
+#~ "Wybór pomiędzy nowym i starym formatem binarnym pakietu. Ta opcja jest "
+#~ "przesłana do B<dpkg-deb>(1)."
+
+#~ msgid ""
+#~ "Don't read or check contents of control file while building a package.  "
+#~ "This is a B<dpkg-deb>(1) option."
+#~ msgstr ""
+#~ "Brak sprawdzania zawartości pliku kontrolnego podczas budowania pakietu. "
+#~ "Ta opcja jest przesłana do B<dpkg-deb>(1)."
+
+#, fuzzy
+#~| msgid "2009-08-16"
+#~ msgid "2009-08-15"
+#~ msgstr "2009-08-16"
+
+#~ msgid "Compiler flags"
+#~ msgstr "Flagi kompilatora"
+
+#, fuzzy
+#~| msgid "2007-11-19"
+#~ msgid "2009-11-21"
+#~ msgstr "2007-11-19"
+
+#, fuzzy
+#~| msgid "2007-03-07"
+#~ msgid "2010-03-07"
+#~ msgstr "2007-03-07"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-10-12"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| msgid "2009-01-07"
+#~ msgid "2009-08-07"
+#~ msgstr "2009-01-07"
+
+#, fuzzy
+#~| msgid "2009-08-16"
+#~ msgid "2010-04-16"
+#~ msgstr "2009-08-16"
+
+#, fuzzy
+#~| msgid "2009-05-10"
+#~ msgid "2009-05-19"
+#~ msgstr "2009-05-10"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#, fuzzy
+#~| msgid "2007-10-08"
+#~ msgid "2009-10-01"
+#~ msgstr "2007-10-08"
+
+#~ msgid "2009-06-26"
+#~ msgstr "2009-06-26"
+
+#
+#~ msgid ""
+#~ "B<dpkg-split> uses some rather out-of-date conventions for the the "
+#~ "filenames of Debian packages."
+#~ msgstr "B<dpkg-split> używa raczej starej konwencji nazw plików pakietów."
+
+#
+#~ 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 ""
+#~ "Architektura nie jest określona w plikach części pakietu, jedynie w "
+#~ "kontrolnych plikach całego pakietu, tak więc architektura nie jest "
+#~ "częścią generowanej nazwy pliku."
+
+#~ msgid "2009-05-10"
+#~ msgstr "2009-05-10"
+
+#
+#, 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+..>]]]"
+#~ msgid ""
+#~ "B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--"
+#~ "version>] [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 ""
+#~ "B<dselect> [B<--admindir> I<E<lt>katalogE<gt>>] [B<--help>] [B<--"
+#~ "version>] [B<--licence>|B<--license>] [B<--expert>] [B<--debug>|B<-"
+#~ "D>I<E<lt>plikE<gt>>] [I<E<lt>akcjaE<gt>>] [B<--colour>|B<--color> "
+#~ "I<część_ekranu:>[I<pierwszoplan>],[I<tło>][I<:atr>[I<+atr+..>]]]"
+
+#~ msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+#~ msgstr "B<--admindir>I< E<lt>katalogE<gt>>"
+
+#~ msgid "USAGE"
+#~ msgstr "UŻYTKOWANIE"
+
+#~ msgid ""
+#~ "B<start-stop-daemon> returns 0 if the requested action was performed, or "
+#~ "if B<--oknodo> is specified and either B<--start> was specified and a "
+#~ "matching process was already running, or B<--stop> was specified and "
+#~ "there were no matching processes. If B<--oknodo> was not specified and "
+#~ "nothing was done, 1 is returned. If B<--stop> and B<--retry> were "
+#~ "specified, but the end of the schedule was reached and the processes were "
+#~ "still running, the error value is 2. For all other errors, the status is "
+#~ "3."
+#~ msgstr ""
+#~ "B<start-stop-daemon> zwraca 0, jeśli żądana akcja się powiodła lub gdy "
+#~ "podano B<--oknodo> i albo podano także B<--start>, a odpowiadający proces "
+#~ "już działał, albo podano B<--stop> i nie znaleziono odpowiadającego "
+#~ "procesu. Jeśli nie podano B<--oknodo> i nic nie zrobiono, to zwracane "
+#~ "jest 1. Jeśli podano B<--stop> i B<--retry> i cały plan działania został "
+#~ "wykonany, a proces dalej działa, to kodem błędu jest 2. W razie innych "
+#~ "błędów zwracane jest 3."
+
+#~ msgid "2"
+#~ msgstr "2"
+
 #~ msgid ""
 #~ "An error occurred. Unfortunately at the time of writing I<extended-error-"
 #~ "message> can contain newlines, although in locales where the translators "
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/po4a.cfg /home/vorlon/devel/multiarch/dpkg-debian/man/po/po4a.cfg
--- dpkg/man/po/po4a.cfg	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/po4a.cfg	2012-06-07 10:11:09.426073000 -0700
@@ -5,216 +5,133 @@
 [po4a_alias:man] man                                      \
                  opt_de:"-L ISO-8859-1     -A utf-8"      \
                  opt_es:"-L ISO-8859-1     -A utf-8"      \
-                 opt_fr:"-L ISO-8859-1"                   \
-                 opt_hu:"-L ISO-8859-2     -A ISO-8859-2" \
+                 opt_fr:"-L ISO-8859-1     -A utf-8"      \
+                 opt_hu:"-L ISO-8859-2     -A utf-8"      \
                  opt_ja:"-L euc-jp         -A utf-8"      \
-                 opt_pl:"-L ISO-8859-2"                   \
-                 opt_pt_BR:"-L ISO-8859-1"                \
-                 opt_ru:"-L koi8-r         -A koi8-r"     \
-                 opt_sv:"-L ISO-8859-1"
+                 opt_pl:"-L ISO-8859-2     -A utf-8"      \
+                 opt_pt_BR:"-L ISO-8859-1  -A utf-8"      \
+                 opt_ru:"-L koi8-r         -A utf-8"      \
+                 opt_sv:"-L ISO-8859-1     -A utf-8"
 
-[type:man] deb.5                      \
-           $lang:$(builddir)/$lang/deb.5                    \
+[type:man] deb.5 $lang:$lang/deb.5 \
            add_$lang:po/$lang.add
 
-
-[type:man] deb-control.5              \
-           $lang:$(builddir)/$lang/deb-control.5            \
+[type:man] deb-control.5 $lang:$lang/deb-control.5 \
            add_$lang:po/$lang.add
 
-
-[type:man] deb-src-control.5              \
-           $lang:$(builddir)/$lang/deb-src-control.5            \
+[type:man] deb-src-control.5 $lang:$lang/deb-src-control.5 \
            add_$lang:po/$lang.add
 
-
-[type:man] deb-split.5                                      \
-           $lang:$(builddir)/$lang/deb-split.5              \
+[type:man] deb-split.5 $lang:$lang/deb-split.5 \
            add_$lang:po/$lang.add
 
-
-[type:man] deb-version.5              \
-           $lang:$(builddir)/$lang/deb-version.5            \
+[type:man] deb-version.5 $lang:$lang/deb-version.5 \
            add_$lang:po/$lang.add
 
-
-[type:man] deb-old.5                  \
-           $lang:$(builddir)/$lang/deb-old.5                \
+[type:man] deb-old.5 $lang:$lang/deb-old.5 \
            add_$lang:po/$lang.add
 
-
-[type:man] deb-override.5             \
-           $lang:$(builddir)/$lang/deb-override.5           \
+[type:man] deb-override.5 $lang:$lang/deb-override.5 \
            add_$lang:po/$lang.add
 
-
-[type:man] deb-extra-override.5       \
-           $lang:$(builddir)/$lang/deb-extra-override.5     \
+[type:man] deb-extra-override.5 $lang:$lang/deb-extra-override.5 \
            add_$lang:po/$lang.add
 
-
-[type:man] deb-shlibs.5               \
-           $lang:$(builddir)/$lang/deb-shlibs.5             \
+[type:man] deb-shlibs.5 $lang:$lang/deb-shlibs.5 \
            add_$lang:po/$lang.add
 
-
-[type:man] deb-substvars.5            \
-           $lang:$(builddir)/$lang/deb-substvars.5          \
+[type:man] deb-substvars.5 $lang:$lang/deb-substvars.5 \
            add_$lang:po/$lang.add
 
-
-[type:man] deb-symbols.5              \
-           $lang:$(builddir)/$lang/deb-symbols.5            \
+[type:man] deb-symbols.5 $lang:$lang/deb-symbols.5 \
            add_$lang:po/$lang.add
 
-
-[type:man] deb-triggers.5             \
-           $lang:$(builddir)/$lang/deb-triggers.5           \
+[type:man] deb-triggers.5 $lang:$lang/deb-triggers.5 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg.1                     \
-           $lang:$(builddir)/$lang/dpkg.1                   \
+[type:man] dpkg.1 $lang:$lang/dpkg.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-architecture.1        \
-           $lang:$(builddir)/$lang/dpkg-architecture.1      \
+[type:man] dpkg-architecture.1 $lang:$lang/dpkg-architecture.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg.cfg.5                 \
-           $lang:$(builddir)/$lang/dpkg.cfg.5               \
+[type:man] dpkg.cfg.5 $lang:$lang/dpkg.cfg.5 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-buildflags.1          \
-           $lang:$(builddir)/$lang/dpkg-buildflags.1        \
+[type:man] dpkg-buildflags.1 $lang:$lang/dpkg-buildflags.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-buildpackage.1        \
-           $lang:$(builddir)/$lang/dpkg-buildpackage.1      \
+[type:man] dpkg-buildpackage.1 $lang:$lang/dpkg-buildpackage.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-checkbuilddeps.1      \
-           $lang:$(builddir)/$lang/dpkg-checkbuilddeps.1    \
+[type:man] dpkg-checkbuilddeps.1 $lang:$lang/dpkg-checkbuilddeps.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-distaddfile.1         \
-           $lang:$(builddir)/$lang/dpkg-distaddfile.1       \
+[type:man] dpkg-distaddfile.1 $lang:$lang/dpkg-distaddfile.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-deb.1                 \
-           $lang:$(builddir)/$lang/dpkg-deb.1               \
+[type:man] dpkg-deb.1 $lang:$lang/dpkg-deb.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-divert.8              \
-           $lang:$(builddir)/$lang/dpkg-divert.8            \
+[type:man] dpkg-divert.8 $lang:$lang/dpkg-divert.8 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-genchanges.1          \
-           $lang:$(builddir)/$lang/dpkg-genchanges.1        \
+[type:man] dpkg-genchanges.1 $lang:$lang/dpkg-genchanges.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-gencontrol.1          \
-           $lang:$(builddir)/$lang/dpkg-gencontrol.1        \
+[type:man] dpkg-gencontrol.1 $lang:$lang/dpkg-gencontrol.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-gensymbols.1         \
-           $lang:$(builddir)/$lang/dpkg-gensymbols.1        \
+[type:man] dpkg-gensymbols.1 $lang:$lang/dpkg-gensymbols.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-maintscript-helper.1  \
-           $lang:$(builddir)/$lang/dpkg-maintscript-helper.1 \
+[type:man] dpkg-maintscript-helper.1 $lang:$lang/dpkg-maintscript-helper.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-mergechangelogs.1     \
-           $lang:$(builddir)/$lang/dpkg-mergechangelogs.1   \
+[type:man] dpkg-mergechangelogs.1 $lang:$lang/dpkg-mergechangelogs.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-name.1                \
-           $lang:$(builddir)/$lang/dpkg-name.1              \
+[type:man] dpkg-name.1 $lang:$lang/dpkg-name.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-parsechangelog.1      \
-           $lang:$(builddir)/$lang/dpkg-parsechangelog.1    \
+[type:man] dpkg-parsechangelog.1 $lang:$lang/dpkg-parsechangelog.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-query.1               \
-           $lang:$(builddir)/$lang/dpkg-query.1             \
+[type:man] dpkg-query.1 $lang:$lang/dpkg-query.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-scanpackages.1        \
-           $lang:$(builddir)/$lang/dpkg-scanpackages.1      \
+[type:man] dpkg-scanpackages.1 $lang:$lang/dpkg-scanpackages.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-scansources.1         \
-           $lang:$(builddir)/$lang/dpkg-scansources.1       \
+[type:man] dpkg-scansources.1 $lang:$lang/dpkg-scansources.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-shlibdeps.1           \
-           $lang:$(builddir)/$lang/dpkg-shlibdeps.1         \
+[type:man] dpkg-shlibdeps.1 $lang:$lang/dpkg-shlibdeps.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-source.1              \
-           $lang:$(builddir)/$lang/dpkg-source.1            \
+[type:man] dpkg-source.1 $lang:$lang/dpkg-source.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-split.1               \
-           $lang:$(builddir)/$lang/dpkg-split.1             \
+[type:man] dpkg-split.1 $lang:$lang/dpkg-split.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-statoverride.8        \
-           $lang:$(builddir)/$lang/dpkg-statoverride.8      \
+[type:man] dpkg-statoverride.8 $lang:$lang/dpkg-statoverride.8 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-trigger.1             \
-           $lang:$(builddir)/$lang/dpkg-trigger.1           \
+[type:man] dpkg-trigger.1 $lang:$lang/dpkg-trigger.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dpkg-vendor.1              \
-           $lang:$(builddir)/$lang/dpkg-vendor.1            \
+[type:man] dpkg-vendor.1 $lang:$lang/dpkg-vendor.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dselect.1                  \
-           $lang:$(builddir)/$lang/dselect.1    \
+[type:man] dselect.1 $lang:$lang/dselect.1 \
            add_$lang:po/$lang.add
 
-
-[type:man] dselect.cfg.5              \
-           $lang:$(builddir)/$lang/dselect.cfg.5            \
+[type:man] dselect.cfg.5 $lang:$lang/dselect.cfg.5 \
            add_$lang:po/$lang.add
 
-
-[type:man] start-stop-daemon.8        \
-           $lang:$(builddir)/$lang/start-stop-daemon.8      \
+[type:man] start-stop-daemon.8 $lang:$lang/start-stop-daemon.8 \
            add_$lang:po/$lang.add
 
-
-[type:man] update-alternatives.8      \
-           $lang:$(builddir)/$lang/update-alternatives.8    \
+[type:man] update-alternatives.8 $lang:$lang/update-alternatives.8 \
            add_$lang:po/$lang.add
-
-
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/pt_BR.po /home/vorlon/devel/multiarch/dpkg-debian/man/po/pt_BR.po
--- dpkg/man/po/pt_BR.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/pt_BR.po	2012-06-07 10:11:09.426073000 -0700
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2011-04-01 22:07+0300\n"
+"POT-Creation-Date: 2011-11-25 11:22+0100\n"
 "PO-Revision-Date: 2010-03-07 22:18+0100\n"
 "Last-Translator: Andre Luis Lopes  <andrelop@debian.org>\n"
 "Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: TH
@@ -21,9 +21,16 @@
 msgstr ""
 
 #. type: TH
-#: deb.5:1
+#: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-version.5:5 deb-old.5:1
+#: deb-override.5:15 deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg-buildpackage.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-trigger.1:1
+#: dselect.1:1 update-alternatives.8:8
 #, fuzzy, no-wrap
-msgid "2009-02-27"
+msgid "2011-08-14"
 msgstr "2006-04-09"
 
 #. type: TH
@@ -95,18 +102,18 @@
 #: deb.5:6 deb-control.5:10 deb-src-control.5:10 deb-split.5:6
 #: deb-version.5:11 deb-old.5:8 deb-override.5:22 deb-extra-override.5:8
 #: deb-shlibs.5:20 deb-substvars.5:9 deb-symbols.5:9 deb-triggers.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildflags.1:9
+#: dpkg.1:19 dpkg-architecture.1:10 dpkg.cfg.5:5 dpkg-buildflags.1:9
 #: 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-deb.1:9 dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
 #: dpkg-gensymbols.1:10 dpkg-maintscript-helper.1:15 dpkg-mergechangelogs.1:9
 #: dpkg-name.1:16 dpkg-parsechangelog.1:9 dpkg-query.1:9
-#: dpkg-scanpackages.1:28 dpkg-scansources.1:14 dpkg-shlibdeps.1:11
-#: dpkg-source.1:11 dpkg-split.1:11 dpkg-statoverride.8:10 dpkg-trigger.1:12
-#: dpkg-vendor.1:9 dselect.1:17 dselect.cfg.5:5 start-stop-daemon.8:10
-#: update-alternatives.8:17
+#: dpkg-scanpackages.1:27 dpkg-scansources.1:13 dpkg-shlibdeps.1:9
+#: dpkg-source.1:10 dpkg-split.1:10 dpkg-statoverride.8:9 dpkg-trigger.1:12
+#: dpkg-vendor.1:9 dselect.1:9 dselect.cfg.5:5 start-stop-daemon.8:9
+#: update-alternatives.8:16
 #, no-wrap
 msgid "DESCRIPTION"
-msgstr "DESCRIO"
+msgstr "DESCRIÇÃO"
 
 #. type: Plain text
 #: deb.5:12
@@ -208,18 +215,18 @@
 msgstr ""
 
 #. type: SH
-#: deb.5:79 deb-control.5:269 deb-src-control.5:322 deb-split.5:37
+#: deb.5:79 deb-control.5:271 deb-src-control.5:327 deb-split.5:49
 #: deb-version.5:116 deb-old.5:51 deb-override.5:62 deb-extra-override.5:37
-#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:49
-#: dpkg.1:782 dpkg-architecture.1:300 dpkg.cfg.5:23 dpkg-buildpackage.1:249
-#: dpkg-deb.1:246 dpkg-divert.8:132 dpkg-gensymbols.1:445 dpkg-name.1:95
-#: dpkg-query.1:212 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:701 dpkg-split.1:223
-#: dpkg-statoverride.8:85 dpkg-trigger.1:66 dselect.1:452 dselect.cfg.5:23
-#: update-alternatives.8:507
+#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:67
+#: dpkg.1:768 dpkg-architecture.1:299 dpkg.cfg.5:23 dpkg-buildpackage.1:249
+#: dpkg-deb.1:259 dpkg-divert.8:132 dpkg-gensymbols.1:450 dpkg-name.1:96
+#: dpkg-query.1:220 dpkg-scanpackages.1:110 dpkg-scansources.1:71
+#: dpkg-shlibdeps.1:324 dpkg-source.1:725 dpkg-split.1:217
+#: dpkg-statoverride.8:84 dpkg-trigger.1:66 dselect.1:445 dselect.cfg.5:23
+#: update-alternatives.8:508
 #, no-wrap
 msgid "SEE ALSO"
-msgstr "VEJA TAMBM"
+msgstr "VEJA TAMBÉM"
 
 #. type: Plain text
 #: deb.5:82
@@ -232,12 +239,6 @@
 msgid "deb-control"
 msgstr "I<control>"
 
-#. type: TH
-#: deb-control.5:3 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
-#, fuzzy, no-wrap
-msgid "2010-07-29"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: deb-control.5:6
 msgid "deb-control - Debian packages' master control file format"
@@ -270,9 +271,9 @@
 
 #. type: TP
 #: deb-control.5:26
-#, no-wrap
-msgid "B<Package:> E<lt>package nameE<gt>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<Package:>I< package-name>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
 #: deb-control.5:30
@@ -283,9 +284,9 @@
 
 #. type: TP
 #: deb-control.5:30
-#, no-wrap
-msgid "B<Version:> E<lt>version stringE<gt>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<Version:>I< version-string>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
 #: deb-control.5:37
@@ -298,9 +299,9 @@
 
 #. type: TP
 #: deb-control.5:37
-#, no-wrap
-msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<Maintainer:>I< fullname-email>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
 #: deb-control.5:42
@@ -312,13 +313,13 @@
 
 #. type: TP
 #: deb-control.5:42
-#, no-wrap
-msgid "B<Description:> E<lt>short descriptionE<gt>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<Description:>I< short-description>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
 #: deb-control.5:45
-msgid "B< >E<lt>long descriptionE<gt>"
+msgid "B< >I<long-description>"
 msgstr ""
 
 #. type: Plain text
@@ -335,12 +336,12 @@
 #: deb-control.5:52
 #, fuzzy, no-wrap
 msgid "OPTIONAL FIELDS"
-msgstr "OPES"
+msgstr "OPÇÕES"
 
 #. type: TP
-#: deb-control.5:53 deb-src-control.5:88
+#: deb-control.5:53 deb-src-control.5:90
 #, no-wrap
-msgid "B<Section:> E<lt>sectionE<gt>"
+msgid "B<Section:>I< section>"
 msgstr ""
 
 #. type: Plain text
@@ -352,10 +353,10 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:58 deb-src-control.5:94
-#, no-wrap
-msgid "B<Priority:> E<lt>priorityE<gt>"
-msgstr ""
+#: deb-control.5:58 deb-src-control.5:96
+#, fuzzy, no-wrap
+msgid "B<Priority:>I< priority>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
 #: deb-control.5:62
@@ -365,7 +366,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:71 deb-src-control.5:107
+#: deb-control.5:71 deb-src-control.5:109
 msgid ""
 "In Debian, the B<Section> and B<Priority> fields have a defined set of "
 "accepted values based on the Policy Manual.  A list of these values can be "
@@ -373,15 +374,15 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:71 deb-src-control.5:211
+#: deb-control.5:71 deb-src-control.5:216
 #, no-wrap
-msgid "B<Essential:> E<lt>yes|noE<gt>"
+msgid "B<Essential:> B<yes>|B<no>"
 msgstr ""
 
 #. type: Plain text
 #: deb-control.5:78
 msgid ""
-"This field is usually only needed when the answer is `yes'. It denotes a "
+"This field is usually only needed when the answer is B<yes>. It denotes a "
 "package that is required for proper operation of the system. Dpkg or any "
 "other installation tool will not allow an B<Essential> package to be removed "
 "(at least not without using one of the force options)."
@@ -389,9 +390,9 @@
 
 #. type: TP
 #: deb-control.5:78
-#, no-wrap
-msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "B<Architecture:> I<arch>|B<all>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
 #: deb-control.5:86
@@ -404,9 +405,9 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:86 deb-src-control.5:83
+#: deb-control.5:86 deb-src-control.5:85
 #, fuzzy, no-wrap
-msgid "B<Origin:> E<lt>nameE<gt>"
+msgid "B<Origin:>I< name>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
@@ -417,95 +418,94 @@
 #. type: TP
 #: deb-control.5:89 deb-src-control.5:66
 #, no-wrap
-msgid "B<Bugs:> E<lt>urlE<gt>"
+msgid "B<Bugs:>I< url>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:93
+#: deb-control.5:94
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian.org>."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:93 deb-src-control.5:62
+#: deb-control.5:94 deb-src-control.5:62
 #, no-wrap
-msgid "B<Homepage:> E<lt>urlE<gt>"
+msgid "B<Homepage:>I< url>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:96 deb-src-control.5:65
-msgid "The upstream project home page URL."
+#: deb-control.5:97
+msgid "The upstream project home page I<url>."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:96 deb-src-control.5:217
+#: deb-control.5:97 deb-src-control.5:222
 #, no-wrap
-msgid "B<Tag:> E<lt>tag listE<gt>"
+msgid "B<Tag:>I< tag-list>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:100
+#: deb-control.5:101
 msgid ""
 "List of tags describing the qualities of the package. The description and "
 "list of supported tags can be found in the B<debtags> package."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:100
+#: deb-control.5:101 deb-src-control.5:219
 #, no-wrap
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt>"
+msgid "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>"
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:111
+#: deb-control.5:113
 msgid ""
 "This field is used to indicate how this package should behave on a multi-"
-"arch installations. The value `same' means that the package is co-"
+"arch installations. The value B<same> means that the package is co-"
 "installable with itself, but it must not be used to satisfy the dependency "
-"of any package of a different architecture from itself. The value `foreign' "
+"of any package of a different architecture from itself. The value B<foreign> "
 "means that the package is not co-installable with itself, but should be "
 "allowed to satisfy the dependency of a package of a different arch from "
-"itself. The value `allowed` allows reverse-dependencies to indicate in their "
-"Depends field that they need a package from a foreign architecture, but has "
-"no effect otherwise. This field should not be present in packages with the "
-"Architecture: all field."
+"itself. The value B<allowed> allows reverse-dependencies to indicate in "
+"their Depends field that they need a package from a foreign architecture, "
+"but has no effect otherwise. This field should not be present in packages "
+"with the B<Architecture: all> field."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:111
-#, no-wrap
-msgid "B<Source:> E<lt>source nameE<gt>"
-msgstr ""
+#: deb-control.5:113
+#, fuzzy, no-wrap
+msgid "B<Source:>I< source-name>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-control.5:115
+#: deb-control.5:117
 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:116 deb-src-control.5:197
+#: deb-control.5:118 deb-src-control.5:202
 #, fuzzy, no-wrap
-msgid "B<Subarchitecture:> E<lt>valueE<gt>"
+msgid "B<Subarchitecture:>I< value>"
 msgstr "B<--log=>I<filename>"
 
 #. type: TP
-#: deb-control.5:119 deb-src-control.5:200
+#: deb-control.5:121 deb-src-control.5:205
 #, fuzzy, no-wrap
-msgid "B<Kernel-Version:> E<lt>valueE<gt>"
+msgid "B<Kernel-Version:>I< value>"
 msgstr "B<--log=>I<filename>"
 
 #. type: TP
-#: deb-control.5:122 deb-src-control.5:203
+#: deb-control.5:124 deb-src-control.5:208
 #, fuzzy, no-wrap
-msgid "B<Installer-Menu-Item:> E<lt>valueE<gt>"
+msgid "B<Installer-Menu-Item:>I< value>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-control.5:129 deb-src-control.5:210
+#: deb-control.5:131 deb-src-control.5:215
 msgid ""
 "These fields are used by the debian-installer and are usually not needed.  "
 "See /usr/share/doc/debian-installer/devel/modules.txt from the B<debian-"
@@ -513,13 +513,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:130 deb-src-control.5:228
-#, no-wrap
-msgid "B<Depends:> E<lt>package listE<gt>"
-msgstr ""
+#: deb-control.5:132 deb-src-control.5:233
+#, fuzzy, no-wrap
+msgid "B<Depends:>I< package-list>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-control.5:141
+#: deb-control.5:143
 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 "
@@ -532,13 +532,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:141 deb-src-control.5:231
-#, no-wrap
-msgid "B<Pre-Depends:> E<lt>package listE<gt>"
-msgstr ""
+#: deb-control.5:143 deb-src-control.5:236
+#, fuzzy, no-wrap
+msgid "B<Pre-Depends:>I< package-list>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-control.5:148
+#: deb-control.5:150
 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 "
@@ -546,13 +546,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:148 deb-src-control.5:234
-#, no-wrap
-msgid "B<Recommends:> E<lt>package listE<gt>"
-msgstr ""
+#: deb-control.5:150 deb-src-control.5:239
+#, fuzzy, no-wrap
+msgid "B<Recommends:>I< package-list>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-control.5:155
+#: deb-control.5:157
 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 "
@@ -560,13 +560,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:155 deb-src-control.5:237
-#, no-wrap
-msgid "B<Suggests:> E<lt>package listE<gt>"
-msgstr ""
+#: deb-control.5:157 deb-src-control.5:242
+#, fuzzy, no-wrap
+msgid "B<Suggests:>I< package-list>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: deb-control.5:160
+#: deb-control.5:162
 msgid ""
 "Lists packages that are related to this one and can perhaps enhance its "
 "usefulness, but without which installing this package is perfectly "
@@ -574,7 +574,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:172
+#: deb-control.5:174
 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 "
@@ -585,7 +585,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:178
+#: deb-control.5:180
 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 "
@@ -595,13 +595,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:178 deb-src-control.5:240
-#, no-wrap
-msgid "B<Breaks:> E<lt>package listE<gt>"
-msgstr ""
+#: deb-control.5:180 deb-src-control.5:245
+#, fuzzy, no-wrap
+msgid "B<Breaks:>I< package-list>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: deb-control.5:186
+#: deb-control.5:188
 msgid ""
 "Lists packages that this one breaks, for example by exposing bugs when the "
 "named packages rely on this one. The package maintenance software will not "
@@ -610,13 +610,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:186 deb-src-control.5:249
-#, no-wrap
-msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgstr ""
+#: deb-control.5:188 deb-src-control.5:254
+#, fuzzy, no-wrap
+msgid "B<Conflicts:>I< package-list>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-control.5:194
+#: deb-control.5:196
 msgid ""
 "Lists packages that conflict with this one, for example by containing files "
 "with the same names. The package maintenance software will not allow "
@@ -625,13 +625,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:194 deb-src-control.5:246
-#, no-wrap
-msgid "B<Replaces:> E<lt>package listE<gt>"
-msgstr ""
+#: deb-control.5:196 deb-src-control.5:251
+#, fuzzy, no-wrap
+msgid "B<Replaces:>I< package-list>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: deb-control.5:202
+#: deb-control.5:204
 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 "
@@ -640,13 +640,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:202 deb-src-control.5:252
-#, no-wrap
-msgid "B<Provides:> E<lt>package listE<gt>"
-msgstr ""
+#: deb-control.5:204 deb-src-control.5:257
+#, fuzzy, no-wrap
+msgid "B<Provides:>I< package-list>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-control.5:212
+#: deb-control.5:214
 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 "
@@ -659,7 +659,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:231
+#: deb-control.5:233
 msgid ""
 "The syntax of B<Breaks>, B<Conflicts>, B<Replaces> and B<Provides> is a list "
 "of package names, separated by commas (and optional whitespace).  In the "
@@ -669,13 +669,13 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:232 deb-src-control.5:255
+#: deb-control.5:234 deb-src-control.5:260
 #, fuzzy, no-wrap
-msgid "B<Built-Using:> E<lt>package listE<gt>"
+msgid "B<Built-Using:>I< package-list>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-control.5:242
+#: deb-control.5:244
 msgid ""
 "This field lists extra source packages that were used during the build of "
 "this binary package.  This is an indication to the archive maintenance "
@@ -687,13 +687,13 @@
 msgstr ""
 
 #. type: SH
-#: deb-control.5:243 deb-src-control.5:283 start-stop-daemon.8:273
+#: deb-control.5:245 deb-src-control.5:288 start-stop-daemon.8:302
 #, fuzzy, no-wrap
 msgid "EXAMPLE"
 msgstr "EXEMPLOS"
 
 #. type: Plain text
-#: deb-control.5:266
+#: deb-control.5:268
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -719,7 +719,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-control.5:274
+#: deb-control.5:276
 #, fuzzy
 msgid ""
 "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
@@ -733,12 +733,6 @@
 msgid "deb-src-control"
 msgstr "I<control>"
 
-#. type: TH
-#: deb-src-control.5:3
-#, fuzzy, no-wrap
-msgid "2010-11-22"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: deb-src-control.5:6
 msgid "deb-src-control - Debian source packages' master control file format"
@@ -758,8 +752,7 @@
 "one space. The content of the multi-line fields is generally joined to a "
 "single line by the tools (except in the case of the B<Description> field, "
 "see below). To insert empty lines into a multi-line field, insert a dot "
-"after the space. The paragraphs are separated by an empty line. Lines "
-"starting with a B<'#'> are treated as comments."
+"after the space. Lines starting with a B<'#'> are treated as comments."
 msgstr ""
 
 #. type: SH
@@ -771,7 +764,7 @@
 #. type: TP
 #: deb-src-control.5:30
 #, fuzzy, no-wrap
-msgid "B<Source:> E<lt>source package nameE<gt> (required)"
+msgid "B<Source:> I<source-package-name> (required)"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
@@ -787,7 +780,7 @@
 #. type: TP
 #: deb-src-control.5:38
 #, fuzzy, no-wrap
-msgid "B<Maintainer:> E<lt>fullname emailE<gt> (required)"
+msgid "B<Maintainer:> I<fullname-email> (required)"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
@@ -801,7 +794,7 @@
 #. type: TP
 #: deb-src-control.5:44
 #, fuzzy, no-wrap
-msgid "B<Uploaders:> E<lt>fullname emailE<gt>"
+msgid "B<Uploaders:>I< fullname-email>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
@@ -815,7 +808,7 @@
 #. type: TP
 #: deb-src-control.5:50
 #, fuzzy, no-wrap
-msgid "B<Standards-Version:> E<lt>version stringE<gt>"
+msgid "B<Standards-Version:>I< version-string>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
@@ -829,7 +822,7 @@
 #. type: TP
 #: deb-src-control.5:57
 #, fuzzy, no-wrap
-msgid "B<DM-Upload-Allowed:> E<lt>yes|noE<gt>"
+msgid "B<DM-Upload-Allowed:> B<yes>|B<no>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
@@ -841,49 +834,55 @@
 msgstr ""
 
 #. type: Plain text
+#: deb-src-control.5:65
+msgid "The upstream project home page URL."
+msgstr ""
+
+#. type: Plain text
 #: deb-src-control.5:71
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>. This field is usually not needed."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian."
+"org>. This field is usually not needed."
 msgstr ""
 
 #. type: TP
 #: deb-src-control.5:72
 #, fuzzy, no-wrap
-msgid "B<Vcs-*:> E<lt>urlE<gt>"
+msgid "B<Vcs-*:>I< url>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-src-control.5:78
+#: deb-src-control.5:79
 msgid ""
-"The url of the Version Control System repository used to maintain this "
-"package.  Currently supported are Arch, Bzr (Bazaar), Cvs, Darcs, Git, Hg "
-"(Mercurial), Mtn (Monotone) and Svn (Subversion). Usually this field points "
-"to the latest version of the package, such as the main branch or the trunk."
+"The I<url> of the Version Control System repository used to maintain this "
+"package. Currently supported are B<Arch>, B<Bzr> (Bazaar), B<Cvs>, B<Darcs>, "
+"B<Git>, B<Hg> (Mercurial), B<Mtn> (Monotone) and B<Svn> (Subversion). "
+"Usually this field points to the latest version of the package, such as the "
+"main branch or the trunk."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:79
+#: deb-src-control.5:80
 #, fuzzy, no-wrap
-msgid "B<Vcs-Browser:> E<lt>urlE<gt>"
+msgid "B<Vcs-Browser:>I< url>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-src-control.5:82
+#: deb-src-control.5:84
 msgid ""
-"The url of a webinterface to browse the Version Control System repository."
+"The I<url> of a webinterface to browse the Version Control System repository."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:87
+#: deb-src-control.5:89
 msgid ""
 "The name of the distribution this package is originating from. This field is "
 "usually not needed."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:93
+#: deb-src-control.5:95
 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\", "
@@ -891,7 +890,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:98
+#: deb-src-control.5:100
 msgid ""
 "Sets the importance of this package in relation to the system as a whole.  "
 "Common priorities are \"required\", \"standard\", \"optional\", \"extra\", "
@@ -899,60 +898,60 @@
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:108
+#: deb-src-control.5:110
 #, fuzzy, no-wrap
-msgid "B<Build-Depends:> E<lt>package listE<gt>"
+msgid "B<Build-Depends:>I< package-list>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-src-control.5:112
+#: deb-src-control.5:114
 msgid ""
 "A list of packages that need to be installed and configured to be able to "
 "build the source package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:113
-#, no-wrap
-msgid "B<Build-Depends-Indep:> E<lt>package listE<gt>"
-msgstr ""
+#: deb-src-control.5:115
+#, fuzzy, no-wrap
+msgid "B<Build-Depends-Indep:>I< package-list>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-src-control.5:118
+#: deb-src-control.5:120
 msgid ""
-"Same as Build-Depends, but they are only needed when building the "
-"architecture independent packages. The Build-Depends are also installed in "
-"this case."
+"Same as B<Build-Depends>, but they are only needed when building the "
+"architecture independent packages. The B<Build-Depends> are also installed "
+"in this case."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:119
-#, no-wrap
-msgid "B<Build-Conflicts:> E<lt>package listE<gt>"
-msgstr ""
+#: deb-src-control.5:121
+#, fuzzy, no-wrap
+msgid "B<Build-Conflicts:>I< package-list>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-src-control.5:123
+#: deb-src-control.5:125
 msgid ""
 "A list of packages that should not be installed when the package is build, "
 "for example because they interfere with the used build system."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:124
-#, no-wrap
-msgid "B<Build-Conflicts-Indep:> E<lt>package listE<gt>"
-msgstr ""
+#: deb-src-control.5:126
+#, fuzzy, no-wrap
+msgid "B<Build-Conflicts-Indep:>I< package-list>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-src-control.5:128
+#: deb-src-control.5:130
 msgid ""
-"Same as Build-Conflicts, but only when building the architecture independent "
-"packages."
+"Same as B<Build-Conflicts>, but only when building the architecture "
+"independent packages."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:139
+#: deb-src-control.5:141
 msgid ""
 "The syntax of the B<Build-Depends> and B<Build-Depends-Indep> fields is a "
 "list of groups of alternative packages. Each group is a list of packages "
@@ -964,7 +963,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:148
+#: deb-src-control.5:150
 msgid ""
 "The syntax of the B<Build-Conflicts> and B<Build-Conflicts-Indep> fields is "
 "a list of comma-separated package names, where the comma is read as an \"AND"
@@ -974,7 +973,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:154
+#: deb-src-control.5:156
 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 "
@@ -984,7 +983,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:158
+#: deb-src-control.5:160
 msgid ""
 "A architecture specification consists of one or more architecture names, "
 "separated by whitespace. Exclamation marks may be prepended to each of the "
@@ -992,7 +991,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:163
+#: deb-src-control.5:165
 msgid ""
 "Note that dependencies on packages in the B<build-essential> set can be "
 "omitted and that declaring build conflicts against them is impossible. A "
@@ -1000,55 +999,57 @@
 msgstr ""
 
 #. type: SH
-#: deb-src-control.5:165
+#: deb-src-control.5:167
 #, fuzzy, no-wrap
 msgid "BINARY FIELDS"
-msgstr "OPES"
+msgstr "OPÇÕES"
 
 #. type: Plain text
-#: deb-src-control.5:174
+#: deb-src-control.5:176
 msgid ""
 "Note that the B<Priority>, B<Section> and B<Homepage> fields can also be in "
 "a binary paragraph to override the global value from the source package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:175
+#: deb-src-control.5:177
 #, fuzzy, no-wrap
-msgid "B<Package:> E<lt>binary package nameE<gt> (required)"
+msgid "B<Package:> I<binary-package-name> (required)"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-src-control.5:179
+#: deb-src-control.5:181
 msgid ""
 "This field is used to name the binary package name. The same restrictions as "
 "to a source package name apply."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:180
+#: deb-src-control.5:182
 #, no-wrap
-msgid "B<Architecture:> E<lt>arch|all|anyE<gt> (required)"
+msgid "B<Architecture:> I<arch>|B<all>|B<any> (required)"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:190
+#: deb-src-control.5:195
 msgid ""
 "The architecture specifies on which type of hardware this package runs. For "
 "packages that run on all architectures, use the B<any> value. For packages "
 "that are architecture independent, such as shell and Perl scripts or "
 "documentation, use the B<all> value. To restrict the packages to a certain "
-"set of architectures, specify the architecture names, separated by a space."
+"set of architectures, specify the architecture names, separated by a space. "
+"It's also possible to put architecture wildcards in that list (see B<dpkg-"
+"architecture>(1)  for more information about them)."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:191
+#: deb-src-control.5:196
 #, fuzzy, no-wrap
-msgid "B<Package-Type:> E<lt>deb|udebE<gt>"
+msgid "B<Package-Type:> B<deb>|B<udeb>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-src-control.5:196
+#: deb-src-control.5:201
 msgid ""
 "This field defines the type of the package. \"udeb\" is for size-constrained "
 "packages used by the debian installer. \"deb\" is the default value, it's "
@@ -1056,45 +1057,39 @@
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:214
-#, no-wrap
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
-msgstr ""
-
-#. type: TP
-#: deb-src-control.5:220
+#: deb-src-control.5:225
 #, fuzzy, no-wrap
-msgid "B<Description:> E<lt>short descriptionE<gt> (required)"
+msgid "B<Description:> I<short-description> (required)"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-src-control.5:227
+#: deb-src-control.5:232
 msgid ""
 "These fields are described in the B<deb-control>(5)  manual page, as they "
 "are copied literally to the control file of the binary package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:243
+#: deb-src-control.5:248
 #, fuzzy, no-wrap
-msgid "B<Enhances:> E<lt>package listE<gt>"
+msgid "B<Enhances:>I< package-list>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-src-control.5:265
+#: deb-src-control.5:270
 msgid ""
 "These fields declare relationships between packages. They are discussed in "
 "the B<deb-control>(5)  manpage and in the B<debian-policy> package."
 msgstr ""
 
 #. type: SH
-#: deb-src-control.5:266
+#: deb-src-control.5:271
 #, no-wrap
 msgid "USER-DEFINED FIELDS"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:281
+#: deb-src-control.5:286
 msgid ""
 "It is allowed to add additional user-defined fields to the control file. The "
 "tools will ignore these fields. If you want the fields to be copied over to "
@@ -1111,7 +1106,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:299
+#: deb-src-control.5:304
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -1126,11 +1121,11 @@
 "Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
-" libselinux1-dev (E<gt>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]\n"
+" libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:318
+#: deb-src-control.5:323
 #, no-wrap
 msgid ""
 "Package: dpkg-dev\n"
@@ -1139,8 +1134,8 @@
 "Architecture: all\n"
 "# this is a custom field in the binary package\n"
 "XB-Mentoring-Contact: Raphael Hertzog E<lt>hertzog@debian.orgE<gt>\n"
-"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2), bzip2, lzma,\n"
-" patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
+"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2),\n"
+" bzip2, lzma, patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
 "Recommends: gcc | c-compiler, build-essential\n"
 "Suggests: gnupg, debian-keyring\n"
 "Conflicts: dpkg-cross (E<lt>E<lt> 2.0.0), devscripts (E<lt>E<lt> 2.10.26)\n"
@@ -1154,7 +1149,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:325
+#: deb-src-control.5:330
 #, fuzzy
 msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
 msgstr ""
@@ -1168,9 +1163,10 @@
 msgstr "dpkg suite"
 
 #. type: TH
-#: deb-split.5:1
+#: deb-split.5:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 dpkg-vendor.1:1 start-stop-daemon.8:1
 #, fuzzy, no-wrap
-msgid "2010-01-28"
+msgid "2011-07-04"
 msgstr "2006-04-09"
 
 # type: Plain text
@@ -1195,22 +1191,72 @@
 "file names might contain a trailing slash (since dpkg 1.15.6)."
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: deb-split.5:21
+#: deb-split.5:15
 msgid ""
 "The first member is named B<debian-split> and contains a series of lines, "
-"separated by newlines. Currently seven lines are present.  The first is the "
-"format version number, B<2.1> at the time this manual page was written. The "
-"second is the package name. The third is the package version. The fourth is "
-"the md5sum of the package.  The fifth is the total size of the package. The "
-"sixth is the maximum part size. The seventh is the current part number, "
-"followed by a slash and the total amount of parts (as in \\(oq1/10\\(cq)."
+"separated by newlines. Currently eight lines are present:"
 msgstr ""
 
-# type: Plain text
+#. type: IP
+#: deb-split.5:15 deb-split.5:18 deb-split.5:20 deb-split.5:22 deb-split.5:24
+#: deb-split.5:26 deb-split.5:28 deb-split.5:31 dpkg-gensymbols.1:20
+#: dpkg-gensymbols.1:22 dpkg-gensymbols.1:24 dpkg-gensymbols.1:26
+#: dpkg-gensymbols.1:311 dpkg-gensymbols.1:317 dpkg-gensymbols.1:351
+#: dpkg-gensymbols.1:355 dpkg-gensymbols.1:358
+#, no-wrap
+msgid "\\(bu"
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:18
+msgid ""
+"The format version number, B<2.1> at the time this manual page was written."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:20
+#, fuzzy
+msgid "The package name."
+msgstr "O pacote está instalado e configurado."
+
+#. type: Plain text
+#: deb-split.5:22
+#, fuzzy
+msgid "The package version."
+msgstr "O pacote está selecionado para instalação."
+
 #. type: Plain text
 #: deb-split.5:24
+msgid "The md5sum of the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:26
+#, fuzzy
+msgid "The total size of the package."
+msgstr "Para procurar na lista de pacotes você mesmo:"
+
+#. type: Plain text
+#: deb-split.5:28
+msgid "The maximum part size."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:31
+msgid ""
+"The current part number, followed by a slash and the total amount of parts "
+"(as in \\(oq1/10\\(cq)."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:33
+msgid "The package architecture (since dpkg 1.16.1)."
+msgstr ""
+
+# type: Plain text
+#. type: Plain text
+#: deb-split.5:36
 msgid ""
 "Programs which read multi-part archives should be prepared for additional "
 "lines to be present, and should ignore these if this is the case."
@@ -1218,7 +1264,7 @@
 
 # type: Plain text
 #. type: Plain text
-#: deb-split.5:29
+#: deb-split.5:41
 msgid ""
 "If the version 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 "
@@ -1226,25 +1272,23 @@
 "(except at the end), as described below."
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: deb-split.5:32
+#: deb-split.5:44
 msgid ""
-"The second, last required member is named B<data.>N, where N denotes the "
-"part number. It contains the raw part data."
+"The second, last required member is named B<data.>I<N>, where I<N> denotes "
+"the part number. It contains the raw part data."
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: deb-split.5:37
+#: deb-split.5:49
 msgid ""
 "These members must occur in this exact order. Current implementations should "
-"ignore any additional members after B<data.>N.  Further members may be "
+"ignore any additional members after B<data.>I<N>.  Further members may be "
 "defined in the future, and (if possible) will be placed after these two."
 msgstr ""
 
 #. type: Plain text
-#: deb-split.5:39
+#: deb-split.5:51
 #, fuzzy
 msgid "B<deb>(5), B<dpkg-split>(1)."
 msgstr ""
@@ -1257,13 +1301,6 @@
 msgid "deb-version"
 msgstr "B<--version>"
 
-#. type: TH
-#: deb-version.5:5 dpkg-distaddfile.1:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-name.1:6
-#, fuzzy, no-wrap
-msgid "2008-08-18"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: deb-version.5:8
 msgid "deb-version - Debian package version number format"
@@ -1271,7 +1308,7 @@
 
 #. type: Plain text
 #: deb-version.5:11
-msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgid "[I<epoch>B<:>]I<upstream-version>[B<->I<debian-revision>]"
 msgstr ""
 
 #. type: Plain text
@@ -1291,7 +1328,7 @@
 #: deb-version.5:20
 msgid ""
 "This is a single (generally small) unsigned integer.  It may be omitted, in "
-"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"which case zero is assumed.  If it is omitted then the I<upstream-version> "
 "may not contain any colons."
 msgstr ""
 
@@ -1306,7 +1343,7 @@
 #. type: TP
 #: deb-version.5:24
 #, fuzzy, no-wrap
-msgid "I<upstream_version>"
+msgid "I<upstream-version>"
 msgstr "B<dpkg --version>"
 
 #. type: Plain text
@@ -1324,16 +1361,16 @@
 #: deb-version.5:39
 msgid ""
 "The comparison behavior of the package management system with respect to the "
-"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"I<upstream-version> is described below. The I<upstream-version> portion of "
 "the version number is mandatory."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:48
 msgid ""
-"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"The I<upstream-version> may contain only alphanumerics (\"A-Za-z0-9\") and "
 "the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
-"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"tilde) and should start with a digit.  If there is no I<debian-revision> "
 "then hyphens are not allowed; if there is no I<epoch> then colons are not "
 "allowed."
 msgstr ""
@@ -1341,7 +1378,7 @@
 #. type: TP
 #: deb-version.5:48
 #, fuzzy, no-wrap
-msgid "I<debian_revision>"
+msgid "I<debian-revision>"
 msgstr "B<--version>"
 
 #. type: Plain text
@@ -1350,13 +1387,13 @@
 "This part of the version number specifies the version of the Debian package "
 "based on the upstream version.  It may contain only alphanumerics and the "
 "characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
-"same way as the I<upstream_version> is."
+"same way as the I<upstream-version> is."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:64
 msgid ""
-"It is optional; if it isn't present then the I<upstream_version> may not "
+"It is optional; if it isn't present then the I<upstream-version> may not "
 "contain a hyphen.  This format represents the case where a piece of software "
 "was written specifically to be turned into a Debian package, and so there is "
 "only one \"debianisation\" of it and therefore no revision indication is "
@@ -1366,17 +1403,17 @@
 #. type: Plain text
 #: deb-version.5:68
 msgid ""
-"It is conventional to restart the I<debian_revision> at '1' each time time "
-"the I<upstream_version> is increased."
+"It is conventional to restart the I<debian-revision> at '1' each time time "
+"the I<upstream-version> is increased."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:76
 msgid ""
 "Dpkg will break the version number apart at the last hyphen in the string "
-"(if there is one) to determine the I<upstream_version> and "
-"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
-"than the presence of one (but note that the I<debian_revision> is the least "
+"(if there is one) to determine the I<upstream-version> and I<debian-"
+"revision>. The absence of a I<debian-revision> compares earlier than the "
+"presence of one (but note that the I<debian-revision> is the least "
 "significant part of the version number)."
 msgstr ""
 
@@ -1389,7 +1426,7 @@
 #. type: Plain text
 #: deb-version.5:80
 msgid ""
-"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"The I<upstream-version> and I<debian-revision> parts are compared by the "
 "package management system using the same algorithm:"
 msgstr ""
 
@@ -1461,11 +1498,11 @@
 "reconfigure>(8)"
 
 #. type: SH
-#: deb-version.5:120 dpkg.1:797 dpkg-buildpackage.1:256 dpkg-distaddfile.1:47
-#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
+#: deb-version.5:120 dpkg.1:783 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:460
 #: dpkg-maintscript-helper.1:128 dpkg-parsechangelog.1:123
-#: dpkg-shlibdeps.1:331 dpkg-source.1:706 dselect.1:458
-#: start-stop-daemon.8:294 update-alternatives.8:493
+#: dpkg-shlibdeps.1:329 dpkg-source.1:730 dselect.1:451
+#: start-stop-daemon.8:323 update-alternatives.8:494
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTORES"
@@ -1476,26 +1513,26 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:262
+#: deb-version.5:124 dpkg-buildpackage.1:263
 msgid "Copyright \\(co 2007 Frank Lichtenheld"
 msgstr ""
 
 #. type: Plain text
-#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:125
-#: dpkg-buildpackage.1:266 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
-#: dpkg-deb.1:256 dpkg-divert.8:139 dpkg-genchanges.1:154
-#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-maintscript-helper.1:139
-#: dpkg-mergechangelogs.1:71 dpkg-name.1:107 dpkg-parsechangelog.1:131
-#: dpkg-query.1:211 dpkg-shlibdeps.1:341 dpkg-source.1:714 dpkg-split.1:233
-#: dpkg-statoverride.8:92 dpkg-vendor.1:53 update-alternatives.8:500
+#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:273
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:269 dpkg-divert.8:139 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:464 dpkg-maintscript-helper.1:139
+#: dpkg-mergechangelogs.1:71 dpkg-name.1:108 dpkg-parsechangelog.1:131
+#: dpkg-query.1:219 dpkg-shlibdeps.1:339 dpkg-source.1:738 dpkg-split.1:227
+#: dpkg-statoverride.8:91 dpkg-vendor.1:53 update-alternatives.8:501
 #, fuzzy
 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 Licena Pblica Geral GNU verso 2 ou posterior para as "
-"condies de cpia. NO existe garantia."
+"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
 #: deb-old.5:1
@@ -1503,12 +1540,6 @@
 msgid "deb-old"
 msgstr ""
 
-#. type: TH
-#: deb-old.5:1
-#, fuzzy, no-wrap
-msgid "2006-02-28"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: deb-old.5:4
 msgid "deb-old - old style Debian binary package format"
@@ -1586,12 +1617,6 @@
 msgstr ""
 
 #. type: TH
-#: deb-override.5:15
-#, fuzzy, no-wrap
-msgid "2007-03-07"
-msgstr "2006-04-09"
-
-#. type: TH
 #: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
 #: deb-symbols.5:2 deb-triggers.5:1 dpkg-architecture.1:1
 #: dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1
@@ -1601,7 +1626,7 @@
 #: dpkg-statoverride.8:1 start-stop-daemon.8:1 update-alternatives.8:8
 #, no-wrap
 msgid "dpkg utilities"
-msgstr "utilitrios dpkg"
+msgstr "utilitários dpkg"
 
 #. type: Plain text
 #: deb-override.5:18
@@ -1762,7 +1787,7 @@
 
 #. type: Plain text
 #: deb-shlibs.5:34
-msgid "[I<type:>] I<library> I<version> I<dependencies>"
+msgid "[I<type>B<:>] I<library> I<version> I<dependencies>"
 msgstr ""
 
 #. type: Plain text
@@ -1779,8 +1804,8 @@
 msgstr ""
 
 #. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:728 dpkg-architecture.1:263
-#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:458
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:714 dpkg-architecture.1:262
+#: dpkg-divert.8:91 dpkg-name.1:65 update-alternatives.8:459
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "EXEMPLOS"
@@ -2096,11 +2121,11 @@
 msgstr ""
 
 #. type: SH
-#: deb-substvars.5:145 dpkg.1:641 dpkg-architecture.1:285 dpkg.cfg.5:12
-#: dpkg-buildflags.1:103 dpkg-distaddfile.1:39 dpkg-divert.8:122
+#: deb-substvars.5:145 dpkg.1:627 dpkg-architecture.1:284 dpkg.cfg.5:12
+#: dpkg-buildflags.1:121 dpkg-distaddfile.1:39 dpkg-divert.8:122
 #: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
-#: dpkg-split.1:212 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:361
+#: dpkg-split.1:206 dpkg-statoverride.8:74 dselect.cfg.5:12
+#: update-alternatives.8:360
 #, no-wrap
 msgid "FILES"
 msgstr "ARQUIVOS"
@@ -2115,18 +2140,18 @@
 #: deb-substvars.5:149
 #, fuzzy
 msgid "List of substitution variables and values."
-msgstr "Lista dos pacotes disponveis."
+msgstr "Lista dos pacotes disponíveis."
 
 #. type: SH
-#: deb-substvars.5:150 dpkg.1:794 dpkg-buildpackage.1:244 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:698 dpkg-split.1:197 dselect.1:436
-#: update-alternatives.8:485
+#: deb-substvars.5:150 dpkg.1:780 dpkg-buildpackage.1:244 dpkg-deb.1:238
+#: dpkg-name.1:86 dpkg-source.1:722 dpkg-split.1:199 dselect.1:429
+#: update-alternatives.8:486
 #, fuzzy, no-wrap
 msgid "BUGS"
 msgstr "BUGS"
 
 #. type: Plain text
-#: deb-substvars.5:153 dpkg-source.1:701
+#: deb-substvars.5:153 dpkg-source.1:725
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -2143,27 +2168,27 @@
 "reconfigure>(8)"
 
 #. type: SH
-#: deb-substvars.5:161 dpkg-architecture.1:304 dpkg.cfg.5:19
-#: dpkg-buildflags.1:120 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
-#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:103
-#: dpkg-query.1:206 dpkg-scansources.1:77 dpkg-split.1:229
-#: dpkg-statoverride.8:88 dpkg-vendor.1:48 dselect.cfg.5:19
+#: deb-substvars.5:161 dpkg-architecture.1:303 dpkg.cfg.5:19
+#: dpkg-buildflags.1:266 dpkg-checkbuilddeps.1:40 dpkg-deb.1:265
+#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:104
+#: dpkg-query.1:214 dpkg-scansources.1:76 dpkg-split.1:223
+#: dpkg-statoverride.8:87 dpkg-vendor.1:48 dselect.cfg.5:19
 #, fuzzy, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: deb-substvars.5:163 dpkg-buildpackage.1:258 dpkg-distaddfile.1:49
-#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:708
-#: dpkg-split.1:231
+#: deb-substvars.5:163 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
+#: dpkg-deb.1:267 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:331 dpkg-source.1:732
+#: dpkg-split.1:225
 msgid "Copyright \\(co 1995-1996 Ian Jackson"
 msgstr ""
 
 #. type: Plain text
-#: deb-substvars.5:165 dpkg-buildpackage.1:260 dpkg-distaddfile.1:51
+#: deb-substvars.5:165 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
 #: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
-#: dpkg-shlibdeps.1:335 dpkg-source.1:710 dpkg-statoverride.8:90
+#: dpkg-shlibdeps.1:333 dpkg-source.1:734 dpkg-statoverride.8:89
 msgid "Copyright \\(co 2000 Wichert Akkerman"
 msgstr ""
 
@@ -2173,12 +2198,6 @@
 msgid "deb-symbols"
 msgstr ""
 
-#. type: TH
-#: deb-symbols.5:2
-#, fuzzy, no-wrap
-msgid "2007-07-16"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: deb-symbols.5:5
 msgid "deb-symbols - Debian's extended shared library information file"
@@ -2198,12 +2217,12 @@
 
 #. type: Plain text
 #: deb-symbols.5:14
-msgid "E<lt>library sonameE<gt> E<lt>main dependency templateE<gt>"
+msgid "I<library-soname main-dependency-template>"
 msgstr ""
 
 #. type: Plain text
 #: deb-symbols.5:16
-msgid "[ | E<lt>alternative dependency templateE<gt> ]"
+msgid "[ | I<alternative-dependency-template> ]"
 msgstr ""
 
 #. type: Plain text
@@ -2213,23 +2232,24 @@
 
 #. type: Plain text
 #: deb-symbols.5:20
-msgid "[ * E<lt>field-nameE<gt>: E<lt>field valueE<gt> ]"
-msgstr ""
+#, fuzzy
+msgid "[ * I<field-name>: I<field-value> ]"
+msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
 #. type: Plain text
 #: deb-symbols.5:23
 #, no-wrap
 msgid ""
 "[ ... ]\n"
-" E<lt>symbolE<gt> E<lt>minimal versionE<gt>[ E<lt>id of dependency templateE<gt> ]\n"
+" I<symbol> I<minimal-version>[ I<id-of-dependency-template> ]\n"
 msgstr ""
 
 #. type: Plain text
 #: deb-symbols.5:29
 msgid ""
-"The I<library soname> is exactly the value of the SONAME field as exported "
-"by B<objdump>(1). A I<dependency template> is a dependency where I<#MINVER#> "
-"is dynamically replaced either by a version check like \"(E<gt>= I<minimal "
+"The I<library-soname> is exactly the value of the SONAME field as exported "
+"by B<objdump>(1). A I<dependency-template> is a dependency where I<#MINVER#> "
+"is dynamically replaced either by a version check like \"(E<gt>= I<minimal-"
 "version>)\" or by nothing (if an unversioned dependency is deemed "
 "sufficient)."
 msgstr ""
@@ -2238,9 +2258,9 @@
 #: deb-symbols.5:36
 msgid ""
 "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> being "
-"\"Base\" if the library is not versioned) is associated to a I<minimal "
+"\"Base\" if the library is not versioned) is associated to a I<minimal-"
 "version> of its dependency template (the main dependency template is used if "
-"I<id of dependency template> is not present). The first alternative "
+"I<id-of-dependency-template> is not present). The first alternative "
 "dependency template is numbered 1, the second one 2, etc."
 msgstr ""
 
@@ -2250,8 +2270,8 @@
 "Each entry for a library can also have some fields of meta-information.  "
 "Those fields are stored on lines starting with an asterisk. Currently, the "
 "only valid field is I<Build-Depends-Package>, it indicates the name of the "
-"\"-dev\" package associated to the library and is used by dpkg-shlibdeps to "
-"make sure that the dependency generated is at least as strict as the "
+"\"-dev\" package associated to the library and is used by B<dpkg-shlibdeps> "
+"to make sure that the dependency generated is at least as strict as the "
 "corresponding build dependency."
 msgstr ""
 
@@ -2315,12 +2335,6 @@
 msgid "deb-triggers"
 msgstr "B<--version>"
 
-#. type: TH
-#: deb-triggers.5:1 dpkg-trigger.1:1
-#, fuzzy, no-wrap
-msgid "2009-03-15"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: deb-triggers.5:4
 msgid "deb-triggers - package triggers"
@@ -2359,29 +2373,45 @@
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: deb-triggers.5:27
+#: deb-triggers.5:26
+#, fuzzy
+msgid "B<interest-noawait> I<trigger-name>"
+msgstr "B<--log=>I<filename>"
+
+#. type: Plain text
+#: deb-triggers.5:33
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file."
+"triggers control file. The \"noawait\" variant does not put the triggering "
+"packages in triggers-awaited state. This should be used when the "
+"functionality provided by the trigger is not crucial."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:31
+#: deb-triggers.5:37
 msgid "B<activate> I<trigger-name>"
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:37
+#: deb-triggers.5:41
+#, fuzzy
+msgid "B<activate-noawait> I<trigger-name>"
+msgstr "B<--log=>I<filename>"
+
+#. type: Plain text
+#: deb-triggers.5:50
 msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure."
+"conflicting package), purge and deconfigure.  The \"noawait\" variant does "
+"not put the triggering packages in triggers-awaited state. This should be "
+"used when the functionality provided by the trigger is not crucial."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:45
+#: deb-triggers.5:58
 msgid ""
 "If this package disappears during the unpacking of another package the "
 "trigger will be activated when the disappearance is noted towards the end of "
@@ -2391,14 +2421,23 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:48
+#: deb-triggers.5:61
 msgid ""
 "Unknown directives are an error which will prevent installation of the "
 "package."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:52
+#: deb-triggers.5:66
+msgid ""
+"The \"-noawait\" variants are only supported by dpkg 1.16.1 or newer, and "
+"will lead to errors if used with an older dpkg. It is thus recommended to "
+"add a \"Pre-Depends: dpkg (E<gt>= 1.16.1)\" to any package that wish to use "
+"those directives."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.5:70
 #, fuzzy
 msgid ""
 "B<dpkg-trigger>(1), B<dpkg>(1), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
@@ -2411,12 +2450,6 @@
 msgstr "dpkg"
 
 #. type: TH
-#: dpkg.1:1
-#, fuzzy, no-wrap
-msgid "2011-02-05"
-msgstr "2006-04-09"
-
-#. type: TH
 #: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
 #: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-query.1:1
 #: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.cfg.5:1
@@ -2428,18 +2461,20 @@
 #: dpkg.1:4
 #, fuzzy
 msgid "dpkg - package manager for Debian"
-msgstr "dpkg - um gerenciador de pacotes de nvel mdio para o Debian"
+msgstr "dpkg - um gerenciador de pacotes de nível médio para o Debian"
 
 #. type: Plain text
 #: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+#, fuzzy
+#| msgid "B<dpkg> [I<options>] I<action>"
+msgid "B<dpkg> [I<option>...] I<action>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: SH
 #: dpkg.1:9
 #, no-wrap
 msgid "WARNING"
-msgstr "ATENO"
+msgstr "ATENÇÃO"
 
 #. type: Plain text
 #: dpkg.1:13
@@ -2449,7 +2484,7 @@
 "line options and package states in more detail than that provided by B<dpkg "
 "--help>."
 msgstr ""
-"Este manual  elaborado para usurios que desejam compreender as opes da "
+"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>."
 
@@ -2461,12 +2496,12 @@
 "B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
 "when installing and removing packages are particularly inadequate."
 msgstr ""
-"Ele I<no> deve ser usado por mantenedores de pacotes que desejam "
-"compreender como o B<dpkg> instalar seus pacotes. As descries do que o "
-"B<dpkg> faz quando est instalando e removendo pacotes so particularmente "
-"inadequadas. Para informaes detalhadas a esse respeito, por favor, refira-"
-"se ao tpico I<Package Management System> do I<debian-faq> no sistema GNU "
-"Info. Para infomaes sobre a criao de pacotes Debian, veja o tpico "
+"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
@@ -2480,325 +2515,296 @@
 "tells B<dpkg> what to do and options control the behavior of the action in "
 "some way."
 msgstr ""
-"B<dpkg>  uma ferramenta de nvel mdio para instalar, criar, remover e "
-"gerenciar pacotes Debian. O front-end primrio e mais amigvel para o "
-"B<dpkg>  o B<dselect>(8). O prprio B<dpkg>  controlado inteiramente "
-"atravs de parmetros de linha de comando, que consistem exatamente de uma "
-"ao e zero ou mais opes. A ao-parmetro informa ao dpkg o que fazer e "
-"as opes controlam o comportamento da ao de alguma maneira."
+"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
-msgid ""
-"B<dpkg> can 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 ""
-"O B<dpkg> pode tambm ser usado como front-end para o B<dpkg-deb>.  A seguir "
-"esto as aes do B<dpkg-deb>, e se forem encontradas, o B<dpkg> apenas "
-"executa o B<dpkg-deb> com os parmetros dados a ele:"
-
-#. type: Plain text
-#: dpkg.1:40
-#, no-wrap
+#: dpkg.1:33
 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>, 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."
+"B<dpkg> can also be used as a front-end to B<dpkg-deb>(1) and B<dpkg-query>"
+"(1). The list of supported actions can be found later on in the B<ACTIONS> "
+"section. If any such action is encountered B<dpkg> just runs B<dpkg-deb> or "
+"B<dpkg-query> with the parameters given to it, but no specific options are "
+"currently passed to them, to use any such option the back-ends need to be "
+"called directly."
 msgstr ""
-"Por favor, refira-se a B<dpkg-deb>(1) para informaes sobre essas aes."
 
 #. type: SH
-#: dpkg.1:43
+#: dpkg.1:34
 #, no-wrap
 msgid "INFORMATION ABOUT PACKAGES"
-msgstr "INFORMAO SOBRE PACOTES"
+msgstr "INFORMAÇÃO SOBRE PACOTES"
 
 #. type: Plain text
-#: dpkg.1:48
+#: dpkg.1:39
 #, fuzzy
 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 ""
-"O B<dpkg> mantm algumas informaes sobre os pacotes disponveis. As "
-"informaes so divididas em trs grupos: B<estados>, B<estados de seleo> "
-"e B<sinalizadores>.  Esses valores so alterados principalmente com 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: SS
-#: dpkg.1:48
+#: dpkg.1:39
 #, no-wrap
 msgid "PACKAGE STATES"
 msgstr "ESTADOS DOS PACOTES"
 
 #. type: TP
-#: dpkg.1:49
+#: dpkg.1:40
 #, no-wrap
 msgid "B<not-installed>"
 msgstr "B<not-installed>"
 
 #. type: Plain text
-#: dpkg.1:52
+#: dpkg.1:43
 msgid "The package is not installed on your system."
-msgstr "O pacote no est instalado em seu sistema."
+msgstr "O pacote não está instalado em seu sistema."
 
 #. type: TP
-#: dpkg.1:52
+#: dpkg.1:43
 #, no-wrap
 msgid "B<config-files>"
 msgstr "B<config-files>"
 
 #. type: Plain text
-#: dpkg.1:55
+#: dpkg.1:46
 msgid "Only the configuration files of the package exist on the system."
-msgstr "Existem apenas os arquivos de configurao em seu sistema."
+msgstr "Existem apenas os arquivos de configuração em seu sistema."
 
 #. type: TP
-#: dpkg.1:55
+#: dpkg.1:46
 #, no-wrap
 msgid "B<half-installed>"
 msgstr "B<half-installed>"
 
 #. type: Plain text
-#: dpkg.1:59
+#: dpkg.1:50
 #, fuzzy
 msgid ""
 "The installation of the package has been started, but not completed for some "
 "reason."
 msgstr ""
-"A instalao do pacote foi iniciada, mas no completada por alguma razo."
+"A instalação do pacote foi iniciada, mas não completada por alguma razão."
 
 #. type: TP
-#: dpkg.1:59
+#: dpkg.1:50
 #, no-wrap
 msgid "B<unpacked>"
 msgstr "B<unpacked>"
 
 #. type: Plain text
-#: dpkg.1:62
+#: dpkg.1:53
 msgid "The package is unpacked, but not configured."
-msgstr "O pacote est descompactado, mas no configurado."
+msgstr "O pacote está descompactado, mas não configurado."
 
 #. type: TP
-#: dpkg.1:62
+#: dpkg.1:53
 #, no-wrap
 msgid "B<half-configured>"
 msgstr "B<half-configured>"
 
 #. type: Plain text
-#: dpkg.1:66
+#: dpkg.1:57
 #, fuzzy
 msgid ""
 "The package is unpacked and configuration has been started, but not yet "
 "completed for some reason."
 msgstr ""
-"O pacote est descompactado e sua configurao comeou, mas no foi "
-"completada por alguma razo."
+"O pacote está descompactado e sua configuração começou, mas não foi "
+"completada por alguma razão."
 
 #. type: TP
-#: dpkg.1:66
+#: dpkg.1:57
 #, no-wrap
 msgid "B<triggers-awaited>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:69
+#: dpkg.1:60
 msgid "The package awaits trigger processing by another package."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:69
+#: dpkg.1:60
 #, no-wrap
 msgid "B<triggers-pending>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:72
+#: dpkg.1:63
 #, fuzzy
 msgid "The package has been triggered."
-msgstr "O pacote est instalado e configurado."
+msgstr "O pacote está instalado e configurado."
 
 #. type: TP
-#: dpkg.1:72
+#: dpkg.1:63
 #, no-wrap
 msgid "B<installed>"
 msgstr "B<installed>"
 
 #. type: Plain text
-#: dpkg.1:75
+#: dpkg.1:66
 #, fuzzy
 msgid "The package is unpacked and configured OK."
-msgstr "O pacote est instalado e configurado."
+msgstr "O pacote está instalado e configurado."
 
 #. type: SS
-#: dpkg.1:75
+#: dpkg.1:66
 #, no-wrap
 msgid "PACKAGE SELECTION STATES"
-msgstr "ESTADOS DE SELEO DOS PACOTES"
+msgstr "ESTADOS DE SELEÇÃO DOS PACOTES"
 
 #. type: TP
-#: dpkg.1:76
+#: dpkg.1:67
 #, no-wrap
 msgid "B<install>"
 msgstr "B<install>"
 
 #. type: Plain text
-#: dpkg.1:79
+#: dpkg.1:70
 msgid "The package is selected for installation."
-msgstr "O pacote est selecionado para instalao."
+msgstr "O pacote está selecionado para instalação."
 
 #. type: TP
-#: dpkg.1:79
+#: dpkg.1:70
 #, no-wrap
 msgid "B<hold>"
 msgstr "B<hold>"
 
 #. type: Plain text
-#: dpkg.1:83
+#: dpkg.1:74
 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 ""
-"Um pacote marcado como B<hold> no  manipulado pelo B<dpkg>, a menos que "
-"ele seja forado a isso com a opo B<--force-hold>."
+"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:83
+#: dpkg.1:74
 #, no-wrap
 msgid "B<deinstall>"
 msgstr "B<deinstall>"
 
 #. type: Plain text
-#: dpkg.1:87
+#: dpkg.1:78
 #, fuzzy
 msgid ""
 "The package is selected for deinstallation (i.e. we want to remove all "
 "files, except configuration files)."
 msgstr ""
-"O pacote est selecionado para desinstalao (i.e. queremos remover todos os "
-"arquivos, exceto os arquivos de configurao)."
+"O pacote está selecionado para desinstalação (i.e. queremos remover todos os "
+"arquivos, exceto os arquivos de configuração)."
 
 #. type: TP
-#: dpkg.1:87
+#: dpkg.1:78
 #, no-wrap
 msgid "B<purge>"
 msgstr "B<purge>"
 
 #. type: Plain text
-#: dpkg.1:91
+#: dpkg.1:82
 #, fuzzy
 msgid ""
 "The package is selected to be purged (i.e. we want to remove everything from "
 "system directories, even configuration files)."
 msgstr ""
-"O pacote est selecionado para ser eliminado (i.e. queremos excluir tudo, "
-"at os arquivos de configurao)."
+"O pacote está selecionado para ser eliminado (i.e. queremos excluir tudo, "
+"até os arquivos de configuração)."
 
 #. type: SS
-#: dpkg.1:91
+#: dpkg.1:82
 #, no-wrap
 msgid "PACKAGE FLAGS"
 msgstr "SINALIZADORES DOS PACOTES"
 
 #. type: TP
-#: dpkg.1:92
+#: dpkg.1:83
 #, no-wrap
 msgid "B<reinst-required>"
 msgstr "B<reinst-required>"
 
 #. type: Plain text
-#: dpkg.1:97
+#: dpkg.1:88
 #, 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>."
 msgstr ""
-"Um pacote marcado como B<reinst-required> est quebrado e precisa ser "
-"reinstalado. Esses pacotes no podem ser removidos, a menos que isso seja "
-"forado com a opo B<--force-reinstreq>."
+"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:98
+#: dpkg.1:89 dselect.1:120
 #, no-wrap
 msgid "ACTIONS"
-msgstr "AES"
+msgstr "AÇÕES"
 
 #. type: TP
-#: dpkg.1:99
+#: dpkg.1:90
 #, fuzzy, no-wrap
-msgid "B<-i>, B<--install> I<package_file>..."
+msgid "B<-i>, B<--install> I<package-file>..."
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 #. type: Plain text
-#: dpkg.1:103
+#: dpkg.1:94
 #, fuzzy
 msgid ""
 "Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"I<package-file> must refer to a directory instead."
 msgstr ""
-"Instala o pacote. Se a opo B<--recursive> ou B<-R> for especificada, "
-"I<arquivo_do_pacote> precisa se referir a um diretrio."
+"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:105
+#: dpkg.1:96
 msgid "Installation consists of the following steps:"
-msgstr "A instalao consiste dos seguintes passos:"
+msgstr "A instalação consiste dos seguintes passos:"
 
 #. type: Plain text
-#: dpkg.1:108
+#: dpkg.1:99
 msgid "B<1.> Extract the control files of the new package."
-msgstr "B<1.> Os arquivos de controle do novo pacote so extrados."
+msgstr "B<1.> Os arquivos de controle do novo pacote são extraídos."
 
 #. type: Plain text
-#: dpkg.1:112
+#: dpkg.1:103
 #, 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."
 msgstr ""
-"B<2.> Se outra verso do mesmo pacote foi instalada antes da nova "
-"instalao,  executado o script I<prerm> do pacote antigo."
+"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:115
+#: dpkg.1:106
 msgid "B<3.> Run I<preinst> script, if provided by the package."
-msgstr "B<3.> O script I<preinst>, se houver no pacote,  executado."
+msgstr "B<3.> O script I<preinst>, se houver no pacote, é executado."
 
 #. type: Plain text
-#: dpkg.1:119
+#: dpkg.1:110
 #, 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."
 msgstr ""
-"B<4.> Os novos arquivos so descompactados, e ao mesmo tempo  feita uma "
-"cpia de segurana dos antigos, de forma que se algo sair errado, eles podem "
+"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:126
+#: dpkg.1:117
 #, fuzzy
 msgid ""
 "B<5.> If another version of the same package was installed before the new "
@@ -2806,93 +2812,93 @@
 "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.> Se estava instalada uma outra verso do mesmo pacote antes da nova "
-"instalao, 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 so gravados ao mesmo tempo que os antigos so removidos."
+"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:130
+#: dpkg.1:121
 #, fuzzy
 msgid ""
 "B<6.> Configure the package. See B<--configure> for detailed information "
 "about how this is done."
 msgstr ""
-"B<6.> O pacote  configurado. Veja B<--configure> para informaes "
-"detalhadas sobre como isso  feito."
+"B<6.> O pacote é configurado. Veja B<--configure> para informações "
+"detalhadas sobre como isso é feito."
 
 #. type: TP
-#: dpkg.1:130
+#: dpkg.1:121
 #, fuzzy, no-wrap
-msgid "B<--unpack >I<package_file>..."
+msgid "B<--unpack >I<package-file>..."
 msgstr "B<dpkg --unpack >I<arquivo_do_pacote> ..."
 
 #. type: Plain text
-#: dpkg.1:135
+#: dpkg.1:126
 #, 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."
+"option is specified, I<package-file> must refer to a directory instead."
 msgstr ""
-"Descompacta o pacote, mas no o configura. Se a opo B<--recursive> ou B<-"
-"R> for especificada, I<arquivo_do_pacote> precisa ento se referir a um "
-"diretrio."
+"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:135
+#: dpkg.1:126
 #, fuzzy, no-wrap
 msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg --configure >I<pacote> ... | B<-a> | B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:140
+#: dpkg.1:131
 #, fuzzy
 msgid ""
 "Configure a package which has been unpacked but not yet configured.  If B<-"
 "a> or B<--pending> is given instead of I<package>, all unpacked but "
 "unconfigured packages are configured."
 msgstr ""
-"Reconfigura um pacote descompactado.  Se for especificada a opo B<-a> ou "
-"B<--pending> ao invs de I<pacote>, todos os pacotes descompactados mas no "
-"configurados so configurados."
+"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:144
+#: dpkg.1:135
 msgid ""
 "To reconfigure a package which has already been configured, try the B<dpkg-"
 "reconfigure>(8)  command instead."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:146
+#: dpkg.1:137
 msgid "Configuring consists of the following steps:"
-msgstr "A configurao consiste dos seguintes passos:"
+msgstr "A configuração consiste dos seguintes passos:"
 
 #. type: Plain text
-#: dpkg.1:151
+#: dpkg.1:142
 #, fuzzy
 msgid ""
 "B<1.> Unpack the conffiles, and at the same time back up the old conffiles, "
 "so that they can be restored if something goes wrong."
 msgstr ""
-"B<1.> Os arquivos de configurao so descompactados, e ao mesmo tempo  "
-"feita uma cpia de segurana dos arquivos de configurao antigos, de forma "
+"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:154
+#: dpkg.1:145
 #, 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."
+msgstr "B<2.> O script I<postinst>, se existir no pacote, é executado."
 
 #. type: TP
-#: dpkg.1:154
+#: dpkg.1:145
 #, fuzzy, no-wrap
 msgid "B<--triggers-only> I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg --configure >I<pacote> ... | B<-a> | B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:161
+#: dpkg.1:152
 msgid ""
 "Processes only triggers. All pending triggers will be processed. If package "
 "names are supplied only those packages' triggers will be processed, exactly "
@@ -2902,13 +2908,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:161
+#: dpkg.1:152
 #, fuzzy, no-wrap
 msgid "B<-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:178
+#: dpkg.1:169
 #, fuzzy
 msgid ""
 "Remove an installed package. B<-r> or B<--remove> remove everything except "
@@ -2926,45 +2932,45 @@
 "files written to individual users' home directories."
 msgstr ""
 "Remove um pacote instalado.  B<-r> ou B<--remove> remove tudo, exceto os "
-"arquivos de configurao.  Isso pode evitar a necessidade de reconfigurar o "
-"pacote se ele for reinstalado depois. (os arquivos de configurao so 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 configurao. Se for dada a opo B<-"
-"a> ou B<--pending> ao invs do nome do pacote, ento todos os pacotes "
+"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>, so removidos ou eliminados (purge) "
+"arquivo I</var/lib/dpkg/status>, são removidos ou eliminados (purge) "
 "respectivamente."
 
 #. type: Plain text
-#: dpkg.1:180
+#: dpkg.1:171
 msgid "Removing of a package consists of the following steps:"
-msgstr "A remoo de um pacote consiste dos seguintes passos:"
+msgstr "A remoção de um pacote consiste dos seguintes passos:"
 
 #. type: Plain text
-#: dpkg.1:183
+#: dpkg.1:174
 #, fuzzy
 msgid "B<1.> Run I<prerm> script"
-msgstr "B<1.> O script I<prerm>  executado."
+msgstr "B<1.> O script I<prerm> é executado."
 
 #. type: Plain text
-#: dpkg.1:186
+#: dpkg.1:177
 #, fuzzy
 msgid "B<2.> Remove the installed files"
-msgstr "B<2.> Os arquivos instalados so removidos."
+msgstr "B<2.> Os arquivos instalados são removidos."
 
 #. type: Plain text
-#: dpkg.1:189
+#: dpkg.1:180
 msgid "B<3.> Run I<postrm> script"
-msgstr "B<3.> O script I<postrm>  executado."
+msgstr "B<3.> O script I<postrm> é executado."
 
 #. type: TP
-#: dpkg.1:190
+#: dpkg.1:181
 #, fuzzy, no-wrap
 msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<dpkg --update-avail> | B<--merge-avail> I<arquivo-Packages>"
 
 #. type: Plain text
-#: dpkg.1:199
+#: dpkg.1:190
 #, fuzzy
 msgid ""
 "Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
@@ -2974,16 +2980,16 @@
 "distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
 "record of available packages in I</var/lib/dpkg/available>."
 msgstr ""
-"Atualiza a idia do B<dpkg> e do B<dselect> de quais pacotes esto "
-"disponveis. Com a ao B<--merge-avail>, as informaes antigas so "
-"combinadas as informaes do I<arquivo-Packages>.  Com a ao B<--update-"
-"avail>, as informaes antigas so substitudas pelas do I<arquivo-"
-"Packages>. O I<arquivo-Packages> distribudo com o Debian  simplesmente "
-"nomeado I<Packages>. O B<dpkg> mantm seu registro dos pacotes disponveis "
+"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:204
+#: dpkg.1:195
 msgid ""
 "A simpler one-shot command to retrieve and update the I<available> file is "
 "B<dselect update>. Note that this file is mostly useless if you don't use "
@@ -2992,104 +2998,104 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:204
+#: dpkg.1:195
 #, fuzzy, no-wrap
-msgid "B<-A>, B<--record-avail> I<package_file>..."
+msgid "B<-A>, B<--record-avail> I<package-file>..."
 msgstr "B<dpkg -A> | B<--record-avail> I<arquivo_do_pacote> ..."
 
 #. type: Plain text
-#: dpkg.1:210
+#: dpkg.1:201
 #, 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."
+"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 ""
-"Atualiza a idia do B<dpkg> e do B<dselect> de quais pacotes esto "
-"disponveis com as informaes do pacote I<arquivo_do_pacote>. Se a opo "
-"B<--recursive> ou B<-R> for especificada, ento I<arquivo_do_pacote> deve se "
-"referir a um diretrio."
+"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:210
+#: dpkg.1:201
 #, fuzzy, no-wrap
 msgid "B<--forget-old-unavail>"
 msgstr "B<dpkg --forget-old-unavail>"
 
 #. type: Plain text
-#: dpkg.1:214
+#: dpkg.1:205
 msgid ""
 "Now B<obsolete> and a no-op as B<dpkg> will automatically forget uninstalled "
 "unavailable packages."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:214
+#: dpkg.1:205
 #, fuzzy, no-wrap
 msgid "B<--clear-avail>"
 msgstr "B<dpkg --clear-avail>"
 
 #. type: Plain text
-#: dpkg.1:217
+#: dpkg.1:208
 #, fuzzy
 msgid "Erase the existing information about what packages are available."
-msgstr "Apaga as informaes existentes sobre quais pacotes esto disponveis."
+msgstr "Apaga as informações existentes sobre quais pacotes estão disponíveis."
 
 #. type: TP
-#: dpkg.1:217
+#: dpkg.1:208
 #, fuzzy, no-wrap
 msgid " B<-C>, B<--audit>"
 msgstr "B<--quiet>"
 
 #. type: Plain text
-#: dpkg.1:222
+#: dpkg.1:213
 #, 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."
+"O B<dpkg> sugerirá o que fazer com eles para que funcionem."
 
 #. type: TP
-#: dpkg.1:222
+#: dpkg.1:213
 #, fuzzy, no-wrap
 msgid "B<--get-selections> [I<package-name-pattern>...]"
-msgstr "B<dpkg --get-selections> [I<padro>...]"
+msgstr "B<dpkg --get-selections> [I<padrão>...]"
 
 #. type: Plain text
-#: dpkg.1:227
+#: dpkg.1:218
 #, fuzzy
 msgid ""
 "Get list of package selections, and write it to stdout. Without a pattern, "
 "non-installed packages (i.e. those which have been previously purged)  will "
 "not be shown."
-msgstr "Obtm uma lista de seleo de pacotes e a escreve em stdout."
+msgstr "Obtém uma lista de seleção de pacotes e a escreve em stdout."
 
 #. type: TP
-#: dpkg.1:227 update-alternatives.8:300
+#: dpkg.1:218 update-alternatives.8:299
 #, fuzzy, no-wrap
 msgid "B<--set-selections>"
 msgstr "B<dpkg --set-selections>"
 
 #. type: Plain text
-#: dpkg.1:233
+#: dpkg.1:224
 #, 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 selees de pacotes usando o arquivo lido de stdin."
+"the format 'I<package> I<state>', where state is one of B<install>, B<hold>, "
+"B<deinstall> or B<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:233
+#: dpkg.1:224
 #, fuzzy, no-wrap
 msgid "B<--clear-selections>"
 msgstr "B<dpkg --set-selections>"
 
 #. type: Plain text
-#: dpkg.1:238
+#: dpkg.1:229
 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 "
@@ -3097,43 +3103,43 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:238
+#: dpkg.1:229
 #, fuzzy, no-wrap
 msgid "B<--yet-to-unpack>"
 msgstr "B<dpkg --yet-to-unpack>"
 
 #. type: Plain text
-#: dpkg.1:242
+#: dpkg.1:233
 #, fuzzy
 msgid ""
 "Searches for packages selected for installation, but which for some reason "
 "still haven't been installed."
 msgstr ""
-"Procura pacotes que foram selecionados para instalao, mas por alguma razo "
-"ainda no foram instalados."
+"Procura pacotes que foram selecionados para instalação, mas por alguma razão "
+"ainda não foram instalados."
 
 #. type: TP
-#: dpkg.1:243
+#: dpkg.1:234
 #, fuzzy, no-wrap
 msgid "B<--print-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg.1:246
+#: dpkg.1:237
 #, fuzzy
 msgid ""
 "Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr ""
-"Mostra a arquitetura alvo (por exemplo, \"i386\").  Essa opo usa o B<gcc>."
+"Mostra a arquitetura alvo (por exemplo, \"i386\").  Essa opção usa o B<gcc>."
 
 #. type: TP
-#: dpkg.1:246
+#: dpkg.1:237
 #, fuzzy, no-wrap
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
 #. type: Plain text
-#: dpkg.1:257
+#: dpkg.1:248
 #, fuzzy
 msgid ""
 "Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
@@ -3145,104 +3151,103 @@
 "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 nmeros de verso, onde I<op>  um operador binrio. O B<dpkg> "
-"retorna com successo (resultado zero) se a condio especificada for "
-"satisfeita e com falha (resultado no nulo) em caso contrrio. H dois "
+"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 verso como anterior a qualquer outra: "
-"B<lt le eq ne ge gt>.  Esses tratam a falta de uma verso como posterior a "
-"qualquer outra: B<lt-nl le-nl ge-nl gt-nl>.  Esses so providos apenas para "
+"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:257
+#: dpkg.1:248
 #, fuzzy, no-wrap
-msgid "B<--command-fd >I<E<lt>nE<gt>>"
+msgid "B<--command-fd >I<n>"
 msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:262
+#: dpkg.1:253
 #, fuzzy
 msgid ""
-"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and through this file "
-"descriptor, are not reset for subsequent commands executed during the same "
-"run."
-msgstr ""
-"Aceita uma srie de comandos no descritor de arquivo de entrada "
-"B<E<lt>nE<gt>>.  Nota: opes adicionais configuradas na linha de comando, e "
-"atravs do descritor de arquivo, no so redefinidas para comandos "
-"subseqentes usados durante a mesma execuo."
+"Accept a series of commands on input file descriptor I<n>. Note: additional "
+"options set on the command line, and through 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:262 dpkg-architecture.1:61 dpkg-buildflags.1:71 dpkg-divert.8:71
-#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
-#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
+#: dpkg.1:253 dpkg-architecture.1:60 dpkg-buildflags.1:89 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:66 dpkg-statoverride.8:44
+#: dpkg-vendor.1:28 dselect.1:113 update-alternatives.8:316
 #, fuzzy, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 #. type: Plain text
-#: dpkg.1:265
+#: dpkg.1:256
 msgid "Display a brief help message."
 msgstr "Exibe uma breve mensagem de ajuda."
 
 #. type: TP
-#: dpkg.1:265
+#: dpkg.1:256
 #, fuzzy, no-wrap
 msgid "B<--force-help>"
 msgstr "B<dpkg --force-help>"
 
 #. type: Plain text
-#: dpkg.1:268
+#: dpkg.1:259
 msgid "Give help about the B<--force->I<thing> options."
-msgstr "Ajuda com as opes B<--force->I<coisa>."
+msgstr "Ajuda com as opções B<--force->I<coisa>."
 
 #. type: TP
-#: dpkg.1:268
+#: dpkg.1:259
 #, fuzzy, no-wrap
 msgid "B<-Dh>, B<--debug=help>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg.1:271
+#: dpkg.1:262
 #, fuzzy
 msgid "Give help about debugging options."
-msgstr "Ajuda com as opes de depurao."
+msgstr "Ajuda com as opções de depuração."
 
 #. type: TP
-#: dpkg.1:271 dpkg-architecture.1:64 dpkg-buildflags.1:74
+#: dpkg.1:262 dpkg-architecture.1:63 dpkg-buildflags.1:92
 #: dpkg-buildpackage.1:226 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
-#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
-#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
-#: dpkg-shlibdeps.1:220 dpkg-source.1:93 dpkg-split.1:130
-#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
-#: update-alternatives.8:320
+#: dpkg-deb.1:175 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:113 dpkg-scanpackages.1:99 dpkg-scansources.1:68
+#: dpkg-shlibdeps.1:218 dpkg-source.1:99 dpkg-split.1:129
+#: dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:116
+#: update-alternatives.8:319
 #, fuzzy, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg.1:274
+#: dpkg.1:265
 msgid "Display B<dpkg> version information."
-msgstr "Exibe informao sobre a verso do B<dpkg>."
+msgstr "Exibe informação sobre a versão do B<dpkg>."
 
 #. type: TP
-#: dpkg.1:274
+#: dpkg.1:265
 #, fuzzy, no-wrap
 msgid "B<dpkg-deb actions>"
 msgstr "B<dpkg-deb-actions>"
 
 #. type: Plain text
-#: dpkg.1:277
+#: dpkg.1:268
 #, fuzzy
 msgid "See B<dpkg-deb>(1) for more information about the following actions."
-msgstr "Veja B<dpkg-deb>(1) para mais informaes sobre as seguintes aes."
+msgstr "Veja B<dpkg-deb>(1) para mais informações sobre as seguintes ações."
 
 #. type: Plain text
-#: dpkg.1:297
+#: dpkg.1:288
 #, fuzzy, no-wrap
 msgid ""
 "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
@@ -3264,36 +3269,36 @@
 "B<-I>, B<--info> I<archive> [I<control-file>...]\n"
 "    Show information about a package.\n"
 msgstr ""
-"B<dpkg -b> | B<--build> I<diretrio> [I<nome_de_arquivo>]\n"
+"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 contedo de um pacote deb.\n"
-"B<dpkg -e> | B<--control> I<nome_de_arquivo> [I<diretrio>]\n"
-"    Extrai informao de controle de um pacote.\n"
-"B<dpkg -x> | B<--extract> I<nome_de_arquivo diretrio>\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 informao sobre um pacote.\n"
-"B<dpkg -X> | B<--vextract> I<nome_de_arquivo> I<diretrio>\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:299
+#: dpkg.1:290
 #, fuzzy, no-wrap
 msgid "B<dpkg-query actions>"
 msgstr "B<dpkg-query-actions>"
 
 #. type: Plain text
-#: dpkg.1:302
+#: dpkg.1:293
 msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:317
+#: dpkg.1:308
 #, fuzzy, no-wrap
 msgid ""
 "B<-l>, B<--list> I<package-name-pattern>...\n"
@@ -3309,31 +3314,31 @@
 "    I</var/lib/dpkg/available>. Users of APT-based frontends\n"
 "    should use B<apt-cache show> I<package-name> instead.\n"
 msgstr ""
-"B<dpkg -l> | B<--list> I<padro-do-nome-do-pacote> ...    Lista os pacotes que combinam com o padro dado.\n"
+"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<padro-de-procura> ...\n"
-"    Procura por um nome de arquivo a partir dos pacotes instalados. Todos os caracteres curinga padres de shell podem ser usados no padro.\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: SH
-#: dpkg.1:319 dpkg-architecture.1:68 dpkg-buildpackage.1:50
-#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
+#: dpkg.1:310 dpkg-architecture.1:67 dpkg-buildpackage.1:50
+#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:179
 #: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
-#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
-#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
-#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
-#: start-stop-daemon.8:100 update-alternatives.8:324
+#: dpkg-gensymbols.1:369 dpkg-mergechangelogs.1:27 dpkg-name.1:30
+#: dpkg-parsechangelog.1:15 dpkg-query.1:117 dpkg-scanpackages.1:71
+#: dpkg-scansources.1:44 dpkg-shlibdeps.1:106 dpkg-split.1:133
+#: dpkg-statoverride.8:51 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:36
+#: start-stop-daemon.8:103 update-alternatives.8:323
 #, no-wrap
 msgid "OPTIONS"
-msgstr "OPES"
+msgstr "OPÇÕES"
 
 #. type: Plain text
-#: dpkg.1:325
+#: dpkg.1:316
 #, fuzzy
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
@@ -3342,31 +3347,31 @@
 "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 opes podem ser especificadas tanto na linha de comando quanto no "
-"arquivo de configurao do B<dpkg> chamado I</etc/dpkg/dpkg.cfg>. Cada linha "
-"no arquivo de configurao  uma opo (exatamente a mesma opo da linha de "
-"comando, mas sem os hfens)  ou um comentrio (se comear com uma B<#>)."
+"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:326
+#: dpkg.1:317
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
-msgstr "B<--abort-after=>I<nmero>"
+msgstr "B<--abort-after=>I<número>"
 
 #. type: Plain text
-#: dpkg.1:329
+#: dpkg.1:320
 #, fuzzy
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
-msgstr "Altera o nmero de erros aps os quais o dpkg abortar. O padro  50."
+msgstr "Altera o número de erros após os quais o dpkg abortará. O padrão é 50."
 
 #. type: TP
-#: dpkg.1:329
+#: dpkg.1:320
 #, fuzzy, no-wrap
 msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 #. type: Plain text
-#: dpkg.1:335
+#: dpkg.1:326
 #, fuzzy
 msgid ""
 "When a package is removed, there is a possibility that another installed "
@@ -3374,31 +3379,31 @@
 "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 opo, o pacote "
-"que depende do que foi removido ser automaticamente desconfigurado."
+"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:335
+#: dpkg.1:326
 #, fuzzy, 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:341
+#: dpkg.1:332
 #, 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 depurao.  I<octal>  formado por uma operao \"or\" bit-a-bit "
+"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 verses futuras).  B<-Dh> ou B<--debug=help> exibe esses "
+"alterados em versões futuras).  B<-Dh> ou B<--debug=help> exibe esses "
 "valores."
 
 #. type: Plain text
-#: dpkg.1:356
+#: dpkg.1:347
 #, fuzzy, no-wrap
 msgid ""
 "    Number   Description\n"
@@ -3416,26 +3421,26 @@
 "      1000   Lots of drivel about e.g. the dpkg/info dir\n"
 "      2000   Insane amounts of drivel\n"
 msgstr ""
-" nmero  descrio\n"
-"    1   Informao de progresso geralmente til\n"
-"    2   Invocao e estado dos scripts do mantenedor\n"
-"   10   Sada de cada arquivo processado\n"
-"  100   Muita sada de cada arquivo processado\n"
-"   20   Sada de cada arquivo de configurao\n"
-"  200   Muita sada de cada arquivo de configurao\n"
-"   40   Dependncias e conflitos\n"
-"  400   Muita sada de dependncias/conflitos\n"
-" 1000   Muita tagarelice sobre por exemplo o diretrio dpkg/info\n"
-" 2000   Quantidades insanas de sada.\n"
+" 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:356
+#: dpkg.1:347
 #, fuzzy, 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>"
 
 #. type: Plain text
-#: dpkg.1:363
+#: dpkg.1:354
 #, fuzzy
 msgid ""
 "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
@@ -3443,41 +3448,41 @@
 "force-help> displays a message describing them.  Things marked with (*) are "
 "forced by default."
 msgstr ""
-"Fora ou rejeita (B<no-force> e B<refuse> so a mesma coisa)  a fazer "
-"algumas coisas.  I<coisas>  uma lista separada por vrgulas de coisas "
+"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 (*) so foradas por padro."
+"Coisas marcadas com (*) são forçadas por padrão."
 
 #. type: Plain text
-#: dpkg.1:367
+#: dpkg.1:358
 #, 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<Ateno: A maior parte dessas opes devem ser usadas apenas por experts. "
-"Us-las sem o completo conhecimento de seus efeitos pode quebrar todo seu "
+"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:370
+#: dpkg.1:361
 #, fuzzy
 msgid "B<all>: Turns on (or off) all force options."
-msgstr "B<all>: Liga (ou desliga) todas as opes de fora."
+msgstr "B<all>: Liga (ou desliga) todas as opções de força."
 
 #. type: Plain text
-#: dpkg.1:373
+#: dpkg.1:364
 #, fuzzy
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
 msgstr ""
-"B<downgrade>(*): Instala um pacote, mesmo se uma verso mais nova j estiver "
+"B<downgrade>(*): Instala um pacote, mesmo se uma versão mais nova já estiver "
 "instalada."
 
 #. type: Plain text
-#: dpkg.1:380
+#: dpkg.1:371
 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 "
@@ -3487,22 +3492,22 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:384
+#: dpkg.1:375
 #, fuzzy
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
 msgstr ""
-"B<configure-any>: Configura tambm qualquer pacote descompactado de que o "
+"B<configure-any>: Configura também qualquer pacote descompactado de que o "
 "pacote atual dependa."
 
 #. type: Plain text
-#: dpkg.1:387
+#: dpkg.1:378
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr "B<hold>: Processa pacotes mesmo quando marcados com \"hold\"."
 
 #. type: Plain text
-#: dpkg.1:392
+#: dpkg.1:383
 #, fuzzy
 msgid ""
 "B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
@@ -3510,85 +3515,85 @@
 "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 reinstalao. Isso pode, por exemplo, fazer com que partes do "
-"pacote permaneam em seu sistema, que sero ento esquecidas pelo B<dpkg>."
+"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:397
+#: dpkg.1:388
 #, 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 contm geralmente comandos muito bsicos de Unix. Remov-"
-"los pode causar a parada de funcionamento de todo o sistema, ento use-a com "
+"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:400
+#: dpkg.1:391
 msgid "B<depends>: Turn all dependency problems into warnings."
-msgstr "B<depends>: Converte todos os problemas de dependncia em avisos."
+msgstr "B<depends>: Converte todos os problemas de dependência em avisos."
 
 #. type: Plain text
-#: dpkg.1:403
+#: dpkg.1:394
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
-"B<depends-version>: No verifica verses quando verificando dependncias."
+"B<depends-version>: Não verifica versões quando verificando dependências."
 
 #. type: Plain text
-#: dpkg.1:406
+#: dpkg.1:397
 msgid "B<breaks>: Install, even if this would break another package."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:410
+#: dpkg.1:401
 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 regravao de alguns arquivos."
+"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:415
+#: dpkg.1:406
 #, fuzzy
 msgid ""
 "B<confmiss>: Always install a missing conffile. This is dangerous, since it "
 "means not preserving a change (removing) made to the file."
 msgstr ""
-"B<confmiss>: Sempre instala um arquivo de configurao que falta. Isso  "
-"perigoso, j que significa que uma mudana (remoo) feita ao arquivo no "
-"ser preservada."
+"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:420
+#: dpkg.1:411
 #, 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."
 msgstr ""
-"B<confnew>: Se um arquivo de configurao foi modificado, sempre instala a "
-"nova verso sem perguntar, a menos que B<--force-confdef> tambm seja "
-"especificada, quando a ao padro  ento preferida."
+"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:425
+#: dpkg.1:416
 #, 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 configurao foi modificado, sempre mantm a "
-"verso antiga sem perguntar, a menos que B<--force-confdef> tambm seja "
-"especificada, quando a ao padro  ento preferida."
+"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:431
+#: dpkg.1:422
 #, fuzzy
 msgid ""
 "B<confdef>: If a conffile has been modified always choose the default "
@@ -3596,13 +3601,13 @@
 "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 configurao foi modificado, sempre escolhe a "
-"ao padro. Se no houver ao padro, ele ir parar e perguntar ao "
-"usurio, a menos que B<--force-confnew> ou B<--force-confold> tambm tenham "
-"sido dadas, quando ser ento usado isso para decidir a ao final."
+"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:438
+#: dpkg.1:429
 #, fuzzy
 msgid ""
 "B<confask>: If a conffile has been modified always offer to replace it with "
@@ -3611,33 +3616,33 @@
 "confold>, or B<--force-confdef> is also given, it will be used to decide the "
 "final action."
 msgstr ""
-"B<confdef>: Se um arquivo de configurao foi modificado, sempre escolhe a "
-"ao padro. Se no houver ao padro, ele ir parar e perguntar ao "
-"usurio, a menos que B<--force-confnew> ou B<--force-confold> tambm tenham "
-"sido dadas, quando ser ento usado isso para decidir a ao final."
+"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:441
+#: dpkg.1:432
 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:444
+#: dpkg.1:435
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
-"B<overwrite-dir> Sobrescreve um diretrio do pacote com arquivo de outro."
+"B<overwrite-dir> Sobrescreve um diretório do pacote com arquivo de outro."
 
 #. type: Plain text
-#: dpkg.1:447
+#: dpkg.1:438
 #, fuzzy
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
-"B<overwrite-diverted>: Sobrescreve um arquivo desviado com uma verso no "
+"B<overwrite-diverted>: Sobrescreve um arquivo desviado com uma versão não "
 "desviada."
 
 #. type: Plain text
-#: dpkg.1:455
+#: dpkg.1:446
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking. Currently "
 "this implies not performing file system syncs before file renames, which is "
@@ -3648,7 +3653,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:461
+#: dpkg.1:452
 msgid ""
 "I<Note>: For ext4, the main offender, consider using instead the mount "
 "option B<nodelalloc>, which will fix both the performance degradation and "
@@ -3658,21 +3663,28 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:464
+#: dpkg.1:455
 msgid ""
 "I<Warning: Using this option might improve performance at the cost of losing "
 "data, use with care.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:467
+#: dpkg.1:458
 #, fuzzy
 #| msgid "B<architecture>: Process even packages with the wrong architecture."
 msgid "B<architecture>: Process even packages with wrong or no architecture."
-msgstr "B<architecture>: Processa at pacotes com a arquitetura errada."
+msgstr "B<architecture>: Processa até pacotes com a arquitetura errada."
 
 #. type: Plain text
-#: dpkg.1:470
+#: dpkg.1:461
+#, fuzzy
+#| msgid "B<architecture>: Process even packages with the wrong architecture."
+msgid "B<bad-version>: Process even packages with wrong versions."
+msgstr "B<architecture>: Processa até pacotes com a arquitetura errada."
+
+#. type: Plain text
+#: dpkg.1:464
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -3680,82 +3692,51 @@
 "problemas."
 
 #. type: Plain text
-#: dpkg.1:473
+#: dpkg.1:467
 msgid "B<not-root>: Try to (de)install things even when not root."
-msgstr "B<not-root>: Tenta (des)instalar coisas mesmo no sendo root."
+msgstr "B<not-root>: Tenta (des)instalar coisas mesmo não sendo root."
 
 #. type: Plain text
-#: dpkg.1:476
+#: dpkg.1:470
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:477
+#: dpkg.1:471
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<pacote>,..."
 
 #. type: Plain text
-#: dpkg.1:481
+#: dpkg.1:475
 #, fuzzy
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
 msgstr ""
-"Ignora a verificao de dependncia dos pacotes especificados (atualmente, a "
-"verificao  feita, mas so apenas dados avisos sobre os conflitos, nada "
+"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:481
-#, fuzzy, no-wrap
-msgid "B<--new>, B<--old>"
-msgstr "B<--new> | B<--old>"
-
-#. type: Plain text
-#: dpkg.1:485
-#, fuzzy
-msgid ""
-"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
-msgstr ""
-"Seleciona o formato binrio novo ou antigo de pacote. Isto  uma opo do "
-"B<dpkg-deb>(1)."
-
-#. type: TP
-#: dpkg.1:485 dpkg-deb.1:209
-#, no-wrap
-msgid "B<--nocheck>"
-msgstr "B<--nocheck>"
-
-#. type: Plain text
-#: dpkg.1:489
-#, fuzzy
-msgid ""
-"Don't read or check contents of control file while building a package.  This "
-"is a B<dpkg-deb>(1) option."
-msgstr ""
-"No l ou verifica o contedo do arquivo de controle enquanto cria um "
-"pacote. Isto  uma opo do B<dpkg-deb>(1)."
-
-#. type: TP
-#: dpkg.1:489
+#: dpkg.1:475
 #, fuzzy, no-wrap
 msgid "B<--no-act>, B<--dry-run>, B<--simulate>"
 msgstr "B<--no-act>"
 
 #. type: Plain text
-#: dpkg.1:494
+#: dpkg.1:480
 #, 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."
 msgstr ""
-"Faz tudo que se espera que seja feito, mas no grava nenhuma alterao. Isso "
-" usado para ver o que acontece com a ao especificada, sem modificar nada."
+"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.1:499
+#: dpkg.1:485
 #, fuzzy
 msgid ""
 "Be sure to give B<--no-act> before the action-parameter, or you might end up "
@@ -3763,19 +3744,19 @@
 "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 ao-parmetro, ou voc pode "
-"obter resultados indesejveis.  (por exemplo, B<dpkg --purge foo --no-act> "
-"ir primeiro excluir (purge) o pacote foo e ento tentar excluir o pacote --"
-"no-act, apesar de que voc esperava que nada fosse feito)"
+"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:499
+#: dpkg.1:485
 #, fuzzy, no-wrap
 msgid "B<-R>, B<--recursive>"
 msgstr "B<-R> | B<--recursive>"
 
 #. type: Plain text
-#: dpkg.1:505
+#: dpkg.1:491
 #, fuzzy
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
@@ -3783,35 +3764,35 @@
 "B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
 msgstr ""
 "Manipula recursivamente todos os arquivos regulares que combinem com o "
-"padro B<*.deb> encontrados nos diretrios especificados e todos seus "
-"subdiretrios. Isso pode ser usado com as aes B<-i>, B<-A>, B<--install>, "
+"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:505
+#: dpkg.1:491
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg.1:509
+#: dpkg.1:495
 #, 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>."
 msgstr ""
-"No instala um pacote se uma nova verso do mesmo pacote j estiver "
-"instalada. Isso  um apelido de B<--refuse-downgrade.>"
+"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:509 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
-#: dpkg-query.1:112 dpkg-shlibdeps.1:213 dpkg-trigger.1:39
+#: dpkg.1:495 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
+#: dpkg-query.1:118 dpkg-shlibdeps.1:211 dpkg-trigger.1:39
 #, fuzzy, no-wrap
 msgid "B<--admindir=>I<dir>"
-msgstr "B<--admindir> I<diretrio>"
+msgstr "B<--admindir> I<diretório>"
 
 #. type: Plain text
-#: dpkg.1:514
+#: dpkg.1:500
 msgid ""
 "Change default administrative directory, which contains many files that give "
 "information about status of installed or uninstalled packages, etc.  "
@@ -3819,13 +3800,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:514
+#: dpkg.1:500
 #, fuzzy, no-wrap
 msgid "B<--instdir=>I<dir>"
-msgstr "B<--admindir> I<diretrio>"
+msgstr "B<--admindir> I<diretório>"
 
 #. type: Plain text
-#: dpkg.1:521
+#: dpkg.1:507
 #, fuzzy
 msgid ""
 "Change default installation directory which refers to the directory where "
@@ -3833,36 +3814,36 @@
 "B<chroot>(2) before running package's installation scripts, which means that "
 "the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgstr ""
-"Muda os diretrios padres.  O B<admindir> padro  I</var/lib/dpkg> e "
-"contm muitos arquivos que do informaes sobre o estado dos pacotes "
-"instalados ou no instalados, etc.  O B<instdir> padro  I</> e refere-se "
-"ao diretrio onde os pacotes devem ser instalados. B<instdir> tambm  o "
-"diretrio passado para B<chroot>(2) antes de executar os scripts de "
-"instalao do I<pacote>, o que significa que os scripts vem B<instdir> como "
-"o diretrio raiz.  Alterar B<root> modifica B<instdir> para I<dir> e "
+"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.1:521
+#: dpkg.1:507
 #, fuzzy, no-wrap
 msgid "B<--root=>I<dir>"
-msgstr "B<--admindir> I<diretrio>"
+msgstr "B<--admindir> I<diretório>"
 
 #. type: Plain text
-#: dpkg.1:525
+#: dpkg.1:511
 msgid ""
 "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 "var/lib/dpkg>."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:525
+#: dpkg.1:511
 #, fuzzy, no-wrap
 msgid "B<-O>, B<--selected-only>"
 msgstr "B<-O> | B<--selected-only>"
 
 #. type: Plain text
-#: dpkg.1:531
+#: dpkg.1:517
 #, fuzzy
 msgid ""
 "Only process the packages that are selected for installation. The actual "
@@ -3870,37 +3851,37 @@
 "example, when a package is removed, it will be marked selected for "
 "deinstallation."
 msgstr ""
-"Somente processa os pacotes selecionados para instalao. A marcao atual  "
+"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 "
-"instalao."
+"exemplo, quando um pacote é removido, ele será marcado como selecionado para "
+"instalação."
 
 #. type: TP
-#: dpkg.1:531
+#: dpkg.1:517
 #, fuzzy, no-wrap
 msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E> | B<--skip-same-version>"
 
 #. type: Plain text
-#: dpkg.1:535
+#: dpkg.1:521
 #, fuzzy
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
-msgstr "No instala o pacote se a mesma verso dele j estiver instalada."
+msgstr "Não instala o pacote se a mesma versão dele já estiver instalada."
 
 #. type: Plain text
-#: dpkg.1:537
+#: dpkg.1:523
 msgid "B<--pre-invoke=>I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:539
+#: dpkg.1:525
 msgid "B<--post-invoke=>I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:548
+#: dpkg.1:534
 msgid ""
 "Set an invoke hook I<command> to be run via ``sh -c'' before or after the "
 "dpkg run for the I<unpack>, I<configure>, I<install>, I<triggers-only>, "
@@ -3913,33 +3894,33 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:551
+#: dpkg.1:537
 #, fuzzy
 msgid "B<--path-exclude=>I<glob-pattern>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:553
+#: dpkg.1:539
 #, fuzzy
 msgid "B<--path-include=>I<glob-pattern>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:556
+#: dpkg.1:542
 msgid ""
 "Set I<glob-pattern> as a path filter, either by excluding or re-including "
 "previously excluded paths matching the specified patterns during install."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:559
+#: dpkg.1:545
 msgid ""
 "I<Warning: take into account that depending on the excluded paths you might "
 "completely break your system, use with caution.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:569
+#: dpkg.1:555
 msgid ""
 "The glob patterns use the same wildcards used in the shell, were '*' matches "
 "any sequence of characters, including the empty string and also '/'. For "
@@ -3953,14 +3934,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:572
+#: dpkg.1:558
 msgid ""
 "This can be used to remove all paths except some particular ones; a typical "
 "case is:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:576
+#: dpkg.1:562
 #, no-wrap
 msgid ""
 "B<--path-exclude=/usr/share/doc/*>\n"
@@ -3968,12 +3949,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:579
+#: dpkg.1:565
 msgid "to remove all documentation files except the copyright files."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:583
+#: dpkg.1:569
 msgid ""
 "These two options can be specified multiple times, and interleaved with each "
 "other. Both are processed in the given order, with the last rule that "
@@ -3981,13 +3962,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:584
+#: dpkg.1:570
 #, fuzzy, no-wrap
 msgid "B<--status-fd >I<n>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:590
+#: dpkg.1:576
 msgid ""
 "Send machine-readable package status and progress information to file "
 "descriptor I<n>. This option can be specified multiple times. The "
@@ -3995,48 +3976,48 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:591
+#: dpkg.1:577
 #, no-wrap
 msgid "B<status: >I<package>B<: >I<status>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:594
+#: dpkg.1:580
 msgid "Package status changed; I<status> is as in the status file."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:594
+#: dpkg.1:580
 #, no-wrap
 msgid "B<status: >I<package>B< : error : >I<extended-error-message>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:598
+#: dpkg.1:584
 msgid ""
 "An error occurred. Any possible newlines in I<extended-error-message> will "
 "be converted to spaces before output."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:598
+#: dpkg.1:584
 #, no-wrap
 msgid "B<status: >I<file>B< : conffile-prompt : '>I<real-old>B<' '>I<real-new>B<' >I<useredited>B< >I<distedited>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:601
+#: dpkg.1:587
 msgid "User is being asked a conffile question."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:601
+#: dpkg.1:587
 #, no-wrap
 msgid "B<processing: >I<stage>B<: >I<package>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:606
+#: dpkg.1:592
 msgid ""
 "Sent just before a processing stage starts. I<stage> is one of B<upgrade>, "
 "B<install> (both sent before unpacking), B<configure>, B<trigproc>, "
@@ -4044,13 +4025,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:607
+#: dpkg.1:593
 #, fuzzy, no-wrap
 msgid "B<--status-logger>=I<command>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:612
+#: dpkg.1:598
 msgid ""
 "Send machine-readable package status and progress information to the shell "
 "I<command>'s standard input. This option can be specified multiple times. "
@@ -4058,44 +4039,43 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:613
+#: dpkg.1:599
 #, fuzzy, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: dpkg.1:625
+#: dpkg.1:611
 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."
+"I<state> I<pkg> I<installed-version>' for status change updates; `YYYY-MM-DD "
+"HH:MM:SS I<action> I<pkg> I<installed-version> I<available-version>' for "
+"actions where I<action> is one of B<install>, B<upgrade>, B<remove>, "
+"B<purge>; and `YYYY-MM-DD HH:MM:SS conffile I<filename> I<decision>' for "
+"conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:625
+#: dpkg.1:611
 #, fuzzy, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg.1:628
+#: dpkg.1:614
 msgid "Do not try to verify package signatures."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:628
+#: dpkg.1:614
 #, fuzzy, no-wrap
 msgid "B<--no-triggers>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg.1:637
+#: dpkg.1:623
 msgid ""
 "Do not run any triggers in this run (activations will still be recorded).  "
 "If used with B<--configure> I<package> or B<--triggers-only> I<package> then "
@@ -4106,364 +4086,364 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:637
+#: dpkg.1:623
 #, fuzzy, no-wrap
 msgid "B<--triggers>"
 msgstr "B<--test>"
 
 #. type: Plain text
-#: dpkg.1:640
+#: dpkg.1:626
 msgid "Cancels a previous B<--no-triggers>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:642 dpkg.cfg.5:16
+#: dpkg.1:628 dpkg.cfg.5:16
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.1:645
+#: dpkg.1:631
 msgid "Configuration file with default options."
-msgstr "Arquivo de configurao com as opes padres."
+msgstr "Arquivo de configuração com as opções padrões."
 
 #. type: TP
-#: dpkg.1:645
+#: dpkg.1:631
 #, fuzzy, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg.1:649
+#: dpkg.1:635
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:652
+#: dpkg.1:638
 #, fuzzy
 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 ""
-"Os outros arquivos listados abaixo esto em seus diretrios padres, veja a "
-"opo B<--admindir> para ver como alterar a localizao desses arquivos."
+"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.1:652
+#: dpkg.1:638
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg.1:655
+#: dpkg.1:641
 msgid "List of available packages."
-msgstr "Lista dos pacotes disponveis."
+msgstr "Lista dos pacotes disponíveis."
 
 #. type: TP
-#: dpkg.1:655
+#: dpkg.1:641
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 #. type: Plain text
-#: dpkg.1:661
+#: dpkg.1:647
 #, 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 disponveis. Esse arquivo contm informao sobre se "
-"um pacote est marcado para remoo ou no, se est instalado ou no, etc. "
-"Veja a seo B<INFORMAO SOBRE PACOTES> para maiores informaes."
+"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.1:664
+#: dpkg.1:650
 msgid ""
 "The status file is backed up daily in I</var/backups>. It can be useful if "
 "it's lost or corrupted due to filesystems troubles."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:653
 #, fuzzy
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
 msgstr ""
-"Os seguintes arquivos so componentes de um pacote binrio. Veja B<deb>(5) "
-"para mais informaes sobre eles:"
+"Os seguintes arquivos são componentes de um pacote binário. Veja B<deb>(5) "
+"para mais informações sobre eles:"
 
 #. type: TP
-#: dpkg.1:667
+#: dpkg.1:653
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 #. type: TP
-#: dpkg.1:669
+#: dpkg.1:655
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 #. type: TP
-#: dpkg.1:671
+#: dpkg.1:657
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 #. type: TP
-#: dpkg.1:673
+#: dpkg.1:659
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 #. type: TP
-#: dpkg.1:675
+#: dpkg.1:661
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 #. type: TP
-#: dpkg.1:677
+#: dpkg.1:663
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 #. type: SH
-#: dpkg.1:680 dpkg-buildflags.1:110 dpkg-buildpackage.1:230 dpkg-deb.1:219
-#: dpkg-divert.8:112 dpkg-query.1:196 dpkg-statoverride.8:69 dpkg-trigger.1:60
-#: dpkg-vendor.1:42 dselect.1:430 update-alternatives.8:355
+#: dpkg.1:666 dpkg-buildflags.1:128 dpkg-buildpackage.1:230 dpkg-deb.1:232
+#: dpkg-divert.8:112 dpkg-query.1:204 dpkg-statoverride.8:68 dpkg-trigger.1:60
+#: dpkg-vendor.1:42 dselect.1:423 update-alternatives.8:354
 #, fuzzy, no-wrap
 msgid "ENVIRONMENT"
-msgstr "VARIVEIS DE AMBIENTE"
+msgstr "VARIÁVEIS DE AMBIENTE"
 
 #. type: TP
-#: dpkg.1:681 dselect.1:431
+#: dpkg.1:667 dselect.1:424
 #, fuzzy, no-wrap
 #| msgid "B<SHELL>"
 msgid "B<HOME>"
 msgstr "B<SHELL>"
 
 #. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:671
 msgid ""
 "If set, B<dpkg> will use it as the directory from which to read the user "
 "specific configuration file."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:685 dpkg-deb.1:220
+#: dpkg.1:671 dpkg-deb.1:233
 #, no-wrap
 msgid "B<TMPDIR>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:689
+#: dpkg.1:675
 msgid ""
 "If set, B<dpkg> will use it as the directory in which to create temporary "
 "files and directories."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:689
+#: dpkg.1:675
 #, fuzzy, no-wrap
 #| msgid "B<-G>"
 msgid "B<PAGER>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg.1:692
+#: dpkg.1:678
 #, fuzzy
 msgid "The program B<dpkg> will execute when displaying the conffiles."
 msgstr ""
-"O programa que o B<dpkg> executar quando estiver iniciando um novo shell."
+"O programa que o B<dpkg> executará quando estiver iniciando um novo shell."
 
 #. type: TP
-#: dpkg.1:692
+#: dpkg.1:678
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 #. type: Plain text
-#: dpkg.1:695
+#: dpkg.1:681
 #, 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."
+"O programa que o B<dpkg> executará quando estiver iniciando um novo shell."
 
 #. type: TP
-#: dpkg.1:695 dpkg-query.1:201
+#: dpkg.1:681 dpkg-query.1:209
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 #. type: Plain text
-#: dpkg.1:699
+#: dpkg.1:685
 #, fuzzy
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
 msgstr ""
-"Ajusta o nmero de colunas que o B<dpkg> deve usar quando estiver exibindo "
-"texto formatado. Atualmente s usado por -l."
+"Ajusta o número de colunas que o B<dpkg> deve usar quando estiver exibindo "
+"texto formatado. Atualmente só usado por -l."
 
 #. type: TP
-#: dpkg.1:699
+#: dpkg.1:685
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_OLD_CONFFILE>"
 msgid "B<DPKG_SHELL_REASON>"
 msgstr "B<DPKG_OLD_CONFFILE>"
 
 #. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:689
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Current valid value: B<conffile-prompt>."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:703
+#: dpkg.1:689
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_OLD_CONFFILE>"
 msgid "B<DPKG_CONFFILE_OLD>"
 msgstr "B<DPKG_OLD_CONFFILE>"
 
 #. type: Plain text
-#: dpkg.1:707
+#: dpkg.1:693
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the old conffile."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:707
+#: dpkg.1:693
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_OLD_CONFFILE>"
 msgid "B<DPKG_CONFFILE_NEW>"
 msgstr "B<DPKG_OLD_CONFFILE>"
 
 #. type: Plain text
-#: dpkg.1:711
+#: dpkg.1:697
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the new conffile."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:711
+#: dpkg.1:697
 #, no-wrap
 msgid "B<DPKG_RUNNING_VERSION>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:715
+#: dpkg.1:701
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the version of "
 "the currently running B<dpkg> instance."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:715 dpkg-divert.8:117
+#: dpkg.1:701 dpkg-divert.8:117
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
-#: dpkg.1:719
+#: dpkg.1:705
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the package name "
 "being handled."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:719
+#: dpkg.1:705
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_MAINTSCRIPT_ARCH>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:709
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the architecture "
 "the package got built for."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:723
+#: dpkg.1:709
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_MAINTSCRIPT_NAME>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
-#: dpkg.1:727
+#: dpkg.1:713
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the name of the "
 "script running (preinst, postinst, prerm, postrm)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:730
+#: dpkg.1:716
 #, fuzzy
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr "Para listar os pacotes relacionados com o editor vi:"
 
 #. type: Plain text
-#: dpkg.1:732
+#: dpkg.1:718
 #, fuzzy, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "B< dpkg -l '*vi*'>"
 
 #. type: Plain text
-#: dpkg.1:735
+#: dpkg.1:721
 #, 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.1:737
+#: dpkg.1:723
 #, fuzzy, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr "B< dpkg --print-avail elvis vim | less>"
 
 #. type: Plain text
-#: dpkg.1:740
+#: dpkg.1:726
 msgid "To search the listing of packages yourself:"
-msgstr "Para procurar na lista de pacotes voc mesmo:"
+msgstr "Para procurar na lista de pacotes você mesmo:"
 
 #. type: Plain text
-#: dpkg.1:742
+#: dpkg.1:728
 #, fuzzy, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "B< less /var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg.1:745
+#: dpkg.1:731
 msgid "To remove an installed elvis package:"
 msgstr "Para remover um pacote instalado elvis:"
 
 #. type: Plain text
-#: dpkg.1:747
+#: dpkg.1:733
 #, fuzzy, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "B< dpkg -r elvis>"
 
 #. type: Plain text
-#: dpkg.1:752
+#: dpkg.1:738
 #, 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 repositrio "
-"ou CDROM.  O arquivo \"available\" mostra que o pacote vim est na seo "
+"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.1:755
+#: dpkg.1:741
 #, fuzzy, no-wrap
 msgid ""
 "     B<cd /media/cdrom/pool/main/v/vim>\n"
@@ -4471,25 +4451,25 @@
 msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>"
 
 #. type: Plain text
-#: dpkg.1:758
+#: dpkg.1:744
 msgid "To make a local copy of the package selection states:"
-msgstr "Para fazer uma cpia local dos estados de seleo dos pacotes:"
+msgstr "Para fazer uma cópia local dos estados de seleção dos pacotes:"
 
 #. type: Plain text
-#: dpkg.1:760
+#: dpkg.1:746
 #, 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:764
+#: dpkg.1:750
 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:"
+"Você pode transferir esse arquivo para outro computador e instalá-lo com:"
 
 #. type: Plain text
-#: dpkg.1:767
+#: dpkg.1:753
 #, fuzzy, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -4497,7 +4477,7 @@
 msgstr "B< dpkg --set-selections E<lt>myselections>"
 
 #. type: Plain text
-#: dpkg.1:773
+#: dpkg.1:759
 #, fuzzy
 msgid ""
 "Note that this will not actually install or remove anything, but just set "
@@ -4505,35 +4485,35 @@
 "application to actually download and install the requested packages. For "
 "example, run B<apt-get dselect-upgrade>."
 msgstr ""
-"Note que isso no instalar nem remover nada, mas apenas ir configurar o "
-"estado de seleo dos pacotes requisitados.  Voc precisar de alguma outra "
-"aplicao para baixar e instalar os pacotes requisitados."
+"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: Plain text
-#: dpkg.1:776
+#: dpkg.1:762
 #, 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 seleo dos pacotes."
+"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:778
+#: dpkg.1:764
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:781
+#: dpkg.1:767
 msgid ""
 "Additional functionality can be gained by installing any of the following "
 "packages: B<apt>, B<aptitude> and B<debsums>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:793
+#: dpkg.1:779
 #, fuzzy
 msgid ""
 "B<aptitude>(1), B<apt>(1), B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), "
@@ -4543,19 +4523,19 @@
 "reconfigure>(8)"
 
 #. type: Plain text
-#: dpkg.1:796
+#: dpkg.1:782
 msgid "B<--no-act> usually gives less information than might be helpful."
-msgstr "B<--no-act> normalmente d menos informao do que seria til."
+msgstr "B<--no-act> normalmente dá menos informação do que seria útil."
 
 #. type: Plain text
-#: dpkg.1:799 dpkg.cfg.5:22
+#: dpkg.1:785 dpkg.cfg.5:22
 #, fuzzy
 msgid ""
 "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"
-"contriburam para o B<dpkg>.\n"
+"contribuíram para o B<dpkg>.\n"
 
 #. type: TH
 #: dpkg-architecture.1:1
@@ -4563,12 +4543,6 @@
 msgid "dpkg-architecture"
 msgstr "B<dpkg --print-architecture>"
 
-#. type: TH
-#: dpkg-architecture.1:1
-#, fuzzy, no-wrap
-msgid "2009-08-15"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: dpkg-architecture.1:4
 msgid ""
@@ -4576,27 +4550,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:9
+#: dpkg-architecture.1:8
 #, fuzzy
-msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<dpkg-architecture> [I<option>...] [I<command>]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg-architecture.1:13
 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:16
 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:25
 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 "
@@ -4608,35 +4582,35 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:27 dpkg-buildflags.1:34 dpkg-deb.1:28 dpkg-divert.8:24
-#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
-#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
-#: update-alternatives.8:203
+#: dpkg-architecture.1:26 dpkg-buildflags.1:45 dpkg-deb.1:27 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:18 dpkg-split.1:31 dpkg-statoverride.8:23
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:34
+#: update-alternatives.8:202
 #, no-wrap
 msgid "COMMANDS"
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:28
+#: dpkg-architecture.1:27
 #, fuzzy, no-wrap
 msgid "B<-l>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 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:31
 #, fuzzy, no-wrap
 msgid "B<-e>I<debian-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 msgid ""
 "Check for equality of architecture. By default I<debian-architecture> is "
 "compared against the current Debian architecture, being the host.  This "
@@ -4645,13 +4619,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 #, no-wrap
 msgid "B<-i>I<architecture-wildcard>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 msgid ""
 "Check for identity of architecture by expanding I<architecture-wildcard> as "
 "an architecture wildcard and comparing against the current Debian "
@@ -4660,118 +4634,118 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 #, fuzzy, no-wrap
 msgid "B<-q>I<variable-name>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 msgid "Print the value of a single variable."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 #, fuzzy, no-wrap
 msgid "B<-s>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 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:50
 #, fuzzy, no-wrap
 msgid "B<-u>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 #, no-wrap
 msgid "B<-c>I< command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 msgid ""
 "Execute a I<command> in an environment which has all variables set to the "
 "determined value."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 #, fuzzy, no-wrap
 msgid "B<-L>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-architecture.1:61
+#: dpkg-architecture.1:60
 msgid "Print a list of valid architecture names."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildflags.1:74 dpkg-buildpackage.1:226
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-architecture.1:63 dpkg-buildflags.1:92 dpkg-buildpackage.1:226
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:175
 #: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
-#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:93
-#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
-#: update-alternatives.8:320
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-name.1:61
+#: dpkg-parsechangelog.1:36 dpkg-query.1:113 dpkg-scanpackages.1:99
+#: dpkg-scansources.1:68 dpkg-shlibdeps.1:218 dpkg-source.1:99
+#: dpkg-split.1:129 dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31
+#: update-alternatives.8:319
 msgid "Show the usage message and exit."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildflags.1:77 dpkg-buildpackage.1:229
-#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-architecture.1:66 dpkg-buildflags.1:95 dpkg-buildpackage.1:229
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:178
 #: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
-#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
-#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:96
-#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
-#: update-alternatives.8:323
+#: dpkg-gensymbols.1:449 dpkg-mergechangelogs.1:44 dpkg-name.1:64
+#: dpkg-parsechangelog.1:39 dpkg-query.1:116 dpkg-scanpackages.1:102
+#: dpkg-scansources.1:70 dpkg-shlibdeps.1:221 dpkg-source.1:102
+#: dpkg-split.1:132 dpkg-statoverride.8:50 dpkg-trigger.1:37 dpkg-vendor.1:34
+#: update-alternatives.8:322
 msgid "Show the version and exit."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:69
+#: dpkg-architecture.1:68
 #, fuzzy, no-wrap
 msgid "B<-a>I<debian-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg-architecture.1:72
+#: dpkg-architecture.1:71
 msgid "Set the Debian architecture."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:72 dpkg-buildpackage.1:110
+#: dpkg-architecture.1:71 dpkg-buildpackage.1:110
 #, no-wrap
 msgid "B<-t>I<gnu-system-type>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 msgid "Set the GNU system type."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 #, fuzzy, no-wrap
 msgid "B<-f>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-architecture.1:82
+#: dpkg-architecture.1:81
 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 "
@@ -4781,54 +4755,54 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:83
+#: dpkg-architecture.1:82
 #, no-wrap
 msgid "TERMS"
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:84
+#: dpkg-architecture.1:83
 #, no-wrap
 msgid "build machine"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 msgid "The machine the package is built on."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 #, no-wrap
 msgid "host machine"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 msgid "The machine the package is built for."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 #, fuzzy, no-wrap
 msgid "Debian architecture"
 msgstr "Projeto Debian"
 
 #. type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 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:90
 #, no-wrap
 msgid "architecture wildcard"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 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>-"
@@ -4836,13 +4810,13 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 #, no-wrap
 msgid "\\s-1GNU\\s0 system type"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:99
+#: dpkg-architecture.1:98
 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, "
@@ -4850,226 +4824,226 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:100
+#: dpkg-architecture.1:99
 #, fuzzy, no-wrap
 msgid "VARIABLES"
-msgstr "VARIVEIS DE AMBIENTE"
+msgstr "VARIÁVEIS DE AMBIENTE"
 
 #. type: Plain text
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 msgid "The Debian architecture of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:106
+#: dpkg-architecture.1:105
 msgid "The Debian system name of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:106
+#: dpkg-architecture.1:105
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 msgid "The Debian cpu name of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 msgid "The pointer size of the build machine (in bits)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 msgid "The endianness of the build machine (little / big)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 #, no-wrap
 msgid "\\s-1DEB_BUILD_MULTIARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 msgid ""
 "The clarified \\s-1GNU\\s0 system type of the build machine, used for "
 "filesystem paths."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 msgid "The Debian architecture of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 msgid "The Debian system name of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 msgid "The Debian cpu name of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_BITS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 msgid "The pointer size of the host machine (in bits)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_ENDIAN\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 msgid "The endianness of the host machine (little / big)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 #, no-wrap
 msgid "\\s-1DEB_HOST_MULTIARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:140
+#: dpkg-architecture.1:139
 msgid ""
 "The clarified \\s-1GNU\\s0 system type of the host machine, used for "
 "filesystem paths."
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:141
+#: dpkg-architecture.1:140
 #, no-wrap
 msgid "DEBIAN/RULES"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:149
+#: dpkg-architecture.1:148
 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 "
@@ -5080,12 +5054,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:152 dpkg-architecture.1:169
+#: dpkg-architecture.1:151 dpkg-architecture.1:168
 msgid "Instead of:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:156
+#: dpkg-architecture.1:155
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5093,12 +5067,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:159
+#: dpkg-architecture.1:158
 msgid "please use the following:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:163
+#: dpkg-architecture.1:162
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
@@ -5106,13 +5080,13 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:165
+#: dpkg-architecture.1:164
 #, 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:175
+#: dpkg-architecture.1:174
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5122,18 +5096,18 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:178
+#: dpkg-architecture.1:177
 msgid "please use:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:181
+#: dpkg-architecture.1:180
 #, no-wrap
 msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:185
+#: dpkg-architecture.1:184
 #, no-wrap
 msgid ""
 "ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
@@ -5142,14 +5116,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:189
+#: dpkg-architecture.1:188
 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:194
+#: dpkg-architecture.1:193
 msgid ""
 "In general, calling dpkg in the rules file to get architecture information "
 "is deprecated (unless you want to provide backward compatibility, see "
@@ -5158,13 +5132,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:195
+#: dpkg-architecture.1:194
 #, no-wrap
 msgid "BACKWARD COMPATIBILITY"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:199
+#: dpkg-architecture.1:198
 msgid ""
 "The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced in dpkg-"
 "dev 1.15.4. Using them in I<debian/rules> thus requires a build-dependency "
@@ -5172,7 +5146,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:204
+#: dpkg-architecture.1:203
 msgid ""
 "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in dpkg-"
 "dev 1.13.2. Before this I<debian/rules> files tended to check the values of "
@@ -5181,7 +5155,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:209
+#: dpkg-architecture.1:208
 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 "
@@ -5190,7 +5164,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:213
+#: dpkg-architecture.1:212
 #, no-wrap
 msgid ""
 "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
@@ -5198,7 +5172,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:227
+#: dpkg-architecture.1:226
 #, no-wrap
 msgid ""
 "# Take account of old dpkg-architecture output.\n"
@@ -5217,19 +5191,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:230
+#: dpkg-architecture.1:229
 msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:233
+#: dpkg-architecture.1:232
 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:243
+#: dpkg-architecture.1:242
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
@@ -5243,7 +5217,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:248
+#: dpkg-architecture.1:247
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
@@ -5253,14 +5227,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:252
+#: dpkg-architecture.1:251
 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:259
+#: dpkg-architecture.1:258
 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 "
@@ -5271,112 +5245,112 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:262
+#: dpkg-architecture.1:261
 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:266
+#: dpkg-architecture.1:265
 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:268
+#: dpkg-architecture.1:267
 msgid "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:270
+#: dpkg-architecture.1:269
 #, fuzzy
 msgid "eval \\`dpkg-architecture -u\\`"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg-architecture.1:273
+#: dpkg-architecture.1:272
 msgid ""
 "Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:275
+#: dpkg-architecture.1:274
 msgid "dpkg-architecture -elinux-alpha"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:277
+#: dpkg-architecture.1:276
 msgid "dpkg-architecture -amips -elinux-mips"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:280
+#: dpkg-architecture.1:279
 msgid ""
 "Check if the current architecture or an architecture provided with -a are "
 "Linux systems:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:282
+#: dpkg-architecture.1:281
 msgid "dpkg-architecture -ilinux-any"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:284
+#: dpkg-architecture.1:283
 msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 msgid ""
 "All these files have to be present for B<dpkg-architecture> to work. Their "
 "location can be overridden at runtime with the environment variable "
-"DPKG_DATADIR."
+"B<DPKG_DATADIR>."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 #, fuzzy, no-wrap
 msgid "I</usr/share/dpkg/cputable>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 msgid "Table of known CPU names and mapping to their GNU name."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 #, fuzzy, no-wrap
 msgid "I</usr/share/dpkg/ostable>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 msgid "Table of known operating system names and mapping to their GNU name."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 #, fuzzy, no-wrap
 msgid "I</usr/share/dpkg/triplettable>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg-architecture.1:299
+#: dpkg-architecture.1:298
 msgid ""
 "Mapping between Debian architecture triplets and Debian architecture names."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:303
+#: dpkg-architecture.1:302
 msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:308
+#: dpkg-architecture.1:307
 msgid ""
 "B<dpkg-architecture> and this man page were initially written by Marcus "
 "Brinkmann E<lt>brinkmd@debian.orgE<gt>."
@@ -5389,7 +5363,7 @@
 msgstr "dpkg"
 
 #. type: TH
-#: dpkg.cfg.5:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1
 #, fuzzy, no-wrap
 msgid "2009-09-05"
 msgstr "2006-04-09"
@@ -5423,7 +5397,7 @@
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:214 dpkg-statoverride.8:87
+#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:222 dpkg-statoverride.8:86
 msgid "B<dpkg>(1)."
 msgstr ""
 
@@ -5431,7 +5405,13 @@
 #: dpkg-buildflags.1:1
 #, fuzzy, no-wrap
 msgid "dpkg-buildflags"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
+
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+msgid "2011-09-13"
+msgstr "2006-04-09"
 
 #. type: Plain text
 #: dpkg-buildflags.1:4
@@ -5441,8 +5421,8 @@
 #. type: Plain text
 #: dpkg-buildflags.1:8
 #, fuzzy
-msgid "B<dpkg-buildflags> [I<option>...] I<command>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<dpkg-buildflags> [I<option>...] [I<command>]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-buildflags.1:12
@@ -5489,96 +5469,153 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:22
-msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+#: dpkg-buildflags.1:23
+msgid ""
+"temporarily by the user with environment variables (see section "
+"B<ENVIRONMENT>);"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "4."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid ""
+"dynamically by the package maintainer with environment variables set via "
+"B<debian/rules> (see section B<ENVIRONMENT>)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 msgid "The configuration files can contain two types of directives:"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 #, no-wrap
 msgid "B<SET>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
 msgid "Override the flag named I<flag> to have the value I<value>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
+#, no-wrap
+msgid "B<STRIP>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:34
+msgid ""
+"Strip from the flag named I<flag> all the build flags listed in I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
 #, no-wrap
 msgid "B<APPEND>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:31
+#: dpkg-buildflags.1:38
 msgid ""
-"Extend the flag named I<flag> with the options given in I<value>.  A space "
-"is prepended to the appended value if the flag's current value is non-empty."
+"Extend the flag named I<flag> by appending the options given in I<value>.  A "
+"space is prepended to the appended value if the flag's current value is non-"
+"empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:38
+#, no-wrap
+msgid "B<PREPEND>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:34
+#: dpkg-buildflags.1:42
+msgid ""
+"Extend the flag named I<flag> by prepending the options given in I<value>.  "
+"A space is appended to the prepended value if the flag's current value is "
+"non-empty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:45
 msgid ""
 "The configuration files can contain comments on lines starting with a hash "
 "(#). Empty lines are also ignored."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:35
+#: dpkg-buildflags.1:46
+#, fuzzy, no-wrap
+msgid "B<--dump>"
+msgstr "B<--nocheck>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:51
+msgid ""
+"Print to standard output all compilation flags and their values. It prints "
+"one flag per line separated from its value by an equal sign "
+"(\"I<flag>=I<value>\"). This is the default action."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:51
 #, fuzzy, no-wrap
 msgid "B<--list>"
 msgstr "B<install>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 msgid ""
 "Print the list of flags supported by the current vendor (one per line). See "
 "the B<SUPPORTED FLAGS> section for more information about them."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 #, fuzzy, no-wrap
 msgid "B<--export=>I<format>"
-msgstr "B<--admindir> I<diretrio>"
+msgstr "B<--admindir> I<diretório>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 msgid ""
 "Print to standard output shell (if I<format> is B<sh>) or make (if I<format> "
 "is B<make>) commands that can be used to export all the compilation flags in "
-"the environment. If the I<format> value is not given, B<sh> is assumed. Only "
-"compilation flags starting with an upper case character are included, others "
-"are assumed to not be suitable for the environment."
+"the environment. If I<format> is B<configure> then the output can be used on "
+"a B<./configure> command-line. If the I<format> value is not given, B<sh> is "
+"assumed. Only compilation flags starting with an upper case character are "
+"included, others are assumed to not be suitable for the environment."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 #, fuzzy, no-wrap
 msgid "B<--get>I< flag>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 msgid ""
 "Print the value of the flag on standard output. Exits with 0 if the flag is "
 "known otherwise exits with 1."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 #, fuzzy, no-wrap
 msgid "B<--origin>I< flag>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:57
+#: dpkg-buildflags.1:75
 msgid ""
 "Print the origin of the value that is returned by B<--get>. Exits with 0 if "
 "the flag is known otherwise exits with 1. The origin can be one of the "
@@ -5586,63 +5623,63 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:58
+#: dpkg-buildflags.1:76
 #, fuzzy, no-wrap
 msgid "B<vendor>"
-msgstr "B<--admindir> I<diretrio>"
+msgstr "B<--admindir> I<diretório>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 msgid "the original flag set by the vendor is returned;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 #, fuzzy, no-wrap
 msgid "B<system>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 msgid "the flag is set/modified by a system-wide configuration;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 #, fuzzy, no-wrap
 msgid "B<user>"
 msgstr "B<--quiet>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 msgid "the flag is set/modified by a user-specific configuration;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 #, fuzzy, no-wrap
 msgid "B<env>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:70
+#: dpkg-buildflags.1:88
 msgid "the flag is set/modified by an environment-specific configuration."
 msgstr ""
 
 #. type: SH
-#: dpkg-buildflags.1:78
+#: dpkg-buildflags.1:96
 #, no-wrap
 msgid "SUPPORTED FLAGS"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:79
+#: dpkg-buildflags.1:97
 #, fuzzy, no-wrap
 msgid "B<CFLAGS>"
 msgstr "B<COLUMNS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 msgid ""
 "Options for the C compiler. The default value set by the vendor includes I<-"
 "g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
@@ -5650,46 +5687,46 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 #, no-wrap
 msgid "B<CPPFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 msgid "Options for the C preprocessor. Default value: empty."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 #, no-wrap
 msgid "B<CXXFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 msgid "Options for the C++ compiler. Same as B<CFLAGS>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 #, no-wrap
 msgid "B<FFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 #, no-wrap
 msgid "B<LDFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:102
+#: dpkg-buildflags.1:120
 msgid ""
 "Options passed to the compiler when linking executables or shared objects "
 "(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
@@ -5697,63 +5734,325 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:104
+#: dpkg-buildflags.1:122
 #, fuzzy, no-wrap
 #| msgid "I</etc/dpkg/dpkg.cfg>"
 msgid "B</etc/dpkg/buildflags.conf>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 msgid "System wide configuration file."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 #, no-wrap
 msgid "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or B<$HOME/.config/dpkg/buildflags.conf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:110
+#: dpkg-buildflags.1:128
 msgid "User configuration file."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-buildflags.1:135
+msgid ""
+"There are 2 sets of environment variables doing the same operations, the "
+"first one (DEB_I<flag>_I<op>) should never be used within B<debian/rules>. "
+"It's meant for any user that wants to rebuild the source package with "
+"different build flags. The second set (DEB_I<flag>_MAINT_I<op>) should only "
+"be used in B<debian/rules> by package maintainers to change the resulting "
+"build flags."
+msgstr ""
+
 #. type: TP
-#: dpkg-buildflags.1:111
+#: dpkg-buildflags.1:135
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_SET>"
 msgstr ""
 
+#. type: TQ
+#: dpkg-buildflags.1:137
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_SET>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
 msgid ""
 "This variable can be used to force the value returned for the given I<flag>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_STRIP>"
+msgstr ""
+
+#. type: TQ
+#: dpkg-buildflags.1:143
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_STRIP>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:148
+msgid ""
+"This variable can be used to provide a space separated list of options that "
+"will be stripped from the set of flags returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:148
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_APPEND>"
 msgstr ""
 
+#. type: TQ
+#: dpkg-buildflags.1:150
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_APPEND>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:119
+#: dpkg-buildflags.1:154
 msgid ""
 "This variable can be used to append supplementary options to the value "
 "returned for the given I<flag>."
 msgstr ""
 
+#. type: TP
+#: dpkg-buildflags.1:154
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_PREPEND>"
+msgstr ""
+
+#. type: TQ
+#: dpkg-buildflags.1:156
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_PREPEND>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:122 dpkg-maintscript-helper.1:130
-msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+#: dpkg-buildflags.1:160
+msgid ""
+"This variable can be used to prepend supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:160
+#, no-wrap
+msgid "B<DEB_BUILD_MAINT_OPTIONS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:165
+msgid ""
+"This variable can be used to disable/enable various hardening build flags "
+"through the B<hardening> option. See the B<HARDENING> section for details."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:166
+#, fuzzy, no-wrap
+#| msgid "WARNING"
+msgid "HARDENING"
+msgstr "ATENÇÃO"
+
+#. type: Plain text
+#: dpkg-buildflags.1:171
+msgid ""
+"Several compile-time options (detailed below) can be used to help harden a "
+"resulting binary against memory corruption attacks, or provide additional "
+"warning messages during compilation. Except as noted below, these are "
+"enabled by default for architectures that support them."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:177
+msgid ""
+"Each hardening feature can be enabled and disabled in the "
+"B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value with "
+"the \"+\" and \"-\" modifier. For example, to enable the \"pie\" feature and "
+"disable the \"fortify\" feature you can do this in B<debian/rules>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:179
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:183
+msgid ""
+"The special feature B<all> can be used to enable or disable all hardening "
+"features at the same time. Thus disabling everything and enabling only "
+"\"format\" and \"fortify\" can be achieved with:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:185
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:186
+#, fuzzy, no-wrap
+msgid "B<format>"
+msgstr "B<--abort-after=>I<número>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:198
+msgid ""
+"This setting (enabled by default) adds B<-Wformat -Wformat-security -"
+"Werror=format-security> to B<CFLAGS> and B<CXXFLAGS>. This will warn about "
+"improper format string uses, and will fail when format functions are used in "
+"a way that that represent possible security problems. At present, this warns "
+"about calls to B<printf> and B<scanf> functions where the format string is "
+"not a string literal and there are no format arguments, as in B<printf(foo);"
+"> instead of B<printf(\"%s\", foo);> This may be a security hole if the "
+"format string came from untrusted input and contains \"%n\"."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:199
+#, no-wrap
+msgid "B<fortify>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:210
+msgid ""
+"This setting (enabled by default) adds B<-D_FORTIFY_SOURCE=2> to "
+"B<CPPFLAGS>. During code generation the compiler knows a great deal of "
+"information about buffer sizes (where possible), and attempts to replace "
+"insecure unlimited length buffer function calls with length-limited ones. "
+"This is especially useful for old, crufty code.  Additionally, format "
+"strings in writable memory that contain '%n' are blocked. If an application "
+"depends on such a format string, it will need to be worked around."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:213
+msgid ""
+"Note that for this option to have any effect, the source must also be "
+"compiled with B<-O1> or higher."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:213
+#, no-wrap
+msgid "B<stackprotector>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:222
+msgid ""
+"This setting (enabled by default) adds B<-fstack-protector --param=ssp-"
+"buffer-size=4> to B<CFLAGS> and B<CXXFLAGS>. This adds safety checks against "
+"stack overwrites. This renders many potential code injection attacks into "
+"aborting situations. In the best case this turns code injection "
+"vulnerabilities into denial of service or into non-issues (depending on the "
+"application)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:226
+msgid ""
+"This feature requires linking against glibc (or another provider of "
+"B<__stack_chk_fail>), so needs to be disabled when building with B<-"
+"nostdlib> or B<-ffreestanding> or similar."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:227
+#, fuzzy, no-wrap
+#| msgid "B<purge>"
+msgid "B<relro>"
+msgstr "B<purge>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:235
+msgid ""
+"This setting (enabled by default) adds B<-Wl,-z,relro> to B<LDFLAGS>.  "
+"During program load, several ELF memory sections need to be written to by "
+"the linker. This flags the loader to turn these sections read-only before "
+"turning over control to the program. Most notably this prevents GOT "
+"overwrite attacks."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:236
+#, no-wrap
+msgid "B<bindnow>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:243
+msgid ""
+"This setting (disabled by default) adds B<-Wl,-z,now> to B<LDFLAGS>. During "
+"program load, all dynamic symbols are resolved, allowing for the entire PLT "
+"to be marked read-only (due to B<relro> above)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:244
+#, no-wrap
+msgid "B<pie>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:256
+msgid ""
+"This setting (disabled by default) adds B<-fPIE> to B<CFLAGS> and "
+"B<CXXFLAGS>, and B<-fPIE -pie> to B<LDFLAGS>. Position Independent "
+"Executable are needed to take advantage of Address Space Layout "
+"Randomization, supported by some kernel versions. While ASLR can already be "
+"enforced for data areas in the stack and heap (brk and mmap), the code areas "
+"must be compiled as position-independent. Shared libraries already do this (-"
+"fPIC), so they gain ASLR automatically, but binary .text regions need to be "
+"build PIE to gain ASLR. When this happens, ROP (Return Oriented Programming) "
+"attacks are much harder since there are no static locations to bounce off of "
+"during a memory corruption attack."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:259
+msgid ""
+"This is not compatible with B<-fPIC> so care must be taken when building "
+"shared objects."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:265
+msgid ""
+"Additionally, since PIE is implemented via a general register, some "
+"architectures (most notably i386) can see performance losses of up to 15% in "
+"very text-segment-heavy application workloads; most workloads see less than "
+"1%. Architectures with more general registers (e.g. amd64)  do not see as "
+"high a worst-case penalty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:268
+msgid "Copyright \\(co 2010-2011 Rapha\\[:e]l Hertzog"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:270
+msgid "Copyright \\(co 2011 Kees Cook"
 msgstr ""
 
 #. type: TH
 #: dpkg-buildpackage.1:1
 #, fuzzy, no-wrap
 msgid "dpkg-buildpackage"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-buildpackage.1:4
@@ -5763,8 +6062,8 @@
 #. type: Plain text
 #: dpkg-buildpackage.1:8
 #, fuzzy
-msgid "B<dpkg-buildpackage> [I<options>]"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<dpkg-buildpackage> [I<option>...]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-buildpackage.1:13
@@ -5963,13 +6262,13 @@
 #: dpkg-buildpackage.1:73
 #, fuzzy
 msgid "B<--target=>I<target>"
-msgstr "B<--abort-after=>I<nmero>"
+msgstr "B<--abort-after=>I<número>"
 
 #. type: Plain text
 #: dpkg-buildpackage.1:75
 #, fuzzy
 msgid "B<--target >I<target>"
-msgstr "B<--abort-after=>I<nmero>"
+msgstr "B<--abort-after=>I<número>"
 
 #. type: Plain text
 #: dpkg-buildpackage.1:77
@@ -6019,7 +6318,7 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:96 dpkg-genchanges.1:49 dpkg-gencontrol.1:38
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 #, fuzzy, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<--version>"
@@ -6101,7 +6400,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:427
+#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:432
 #, fuzzy, no-wrap
 msgid "B<-d>"
 msgstr "B<-G>"
@@ -6258,7 +6557,7 @@
 #: dpkg-buildpackage.1:209
 #, fuzzy, no-wrap
 msgid "B<--source-option=>I<opt>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-buildpackage.1:212
@@ -6280,11 +6579,11 @@
 #: dpkg-buildpackage.1:219
 #, fuzzy
 msgid "B<--admindir >I<dir>"
-msgstr "B<--admindir> I<diretrio>"
+msgstr "B<--admindir> I<diretório>"
 
 #. type: Plain text
-#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:116
-#: dpkg-shlibdeps.1:217 dpkg-trigger.1:43
+#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:122
+#: dpkg-shlibdeps.1:215 dpkg-trigger.1:43
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
 "lib/dpkg>."
@@ -6292,10 +6591,10 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:223 dpkg-checkbuilddeps.1:33 dpkg-distaddfile.1:32
-#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
-#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
-#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:90 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-deb.1:172 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
+#: dpkg-gensymbols.1:443 dpkg-name.1:58 dpkg-parsechangelog.1:33
+#: dpkg-query.1:110 dpkg-scanpackages.1:96 dpkg-shlibdeps.1:215
+#: dpkg-source.1:96 dpkg-split.1:126 dpkg-trigger.1:31
 #, fuzzy, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr "B<--help>"
@@ -6303,7 +6602,7 @@
 #. type: Plain text
 #: dpkg-buildpackage.1:234
 msgid ""
-"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"Even if B<dpkg-buildpackage> exports some variables, B<debian/rules> should "
 "not rely on their presence and should instead use the respective interface "
 "to retrieve the needed values."
 msgstr ""
@@ -6325,15 +6624,15 @@
 #. type: SS
 #: dpkg-buildpackage.1:238
 #, no-wrap
-msgid "Compiler flags"
+msgid "Compiler flags are no longer exported"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-buildpackage.1:243
 msgid ""
-"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
-"environment variables are set to the values that B<dpkg-buildflags> "
-"returned. See its manual page for more information."
+"Between versions 1.14.17 and 1.16.1, B<dpkg-buildpackage> exported compiler "
+"flags (B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS>) with "
+"values as returned by B<dpkg-buildflags>. This is no longer the case."
 msgstr ""
 
 #. type: Plain text
@@ -6344,17 +6643,17 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildpackage.1:255
+#: dpkg-buildpackage.1:256
 #, fuzzy
 msgid ""
-"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
-"B<fakeroot>(1), B<gpg>(1)."
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
+"genchanges>(1), B<fakeroot>(1), B<gpg>(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-buildpackage.1:264 dpkg-source.1:712
+#: dpkg-buildpackage.1:265
 msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
 msgstr ""
 
@@ -6364,12 +6663,6 @@
 msgid "dpkg-checkbuilddeps"
 msgstr ""
 
-#. type: TH
-#: dpkg-checkbuilddeps.1:1
-#, fuzzy, no-wrap
-msgid "2009-11-21"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:4
 msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
@@ -6378,8 +6671,8 @@
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:9
 #, fuzzy
-msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<dpkg-checkbuilddeps> [I<option>...] [I<control-file>]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:14
@@ -6392,7 +6685,7 @@
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:17
 msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
+"By default, B<debian/control> is read, but an alternate control filename may "
 "be specified on the command line."
 msgstr ""
 
@@ -6441,8 +6734,8 @@
 #. type: Plain text
 #: dpkg-distaddfile.1:8
 #, fuzzy
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<dpkg-distaddfile> [I<option>...]I< filename section priority>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-distaddfile.1:13
@@ -6496,37 +6789,31 @@
 msgid "dpkg-deb"
 msgstr "dpkg"
 
-#. type: TH
-#: dpkg-deb.1:1 dpkg-query.1:1 dselect.1:1
-#, fuzzy, no-wrap
-msgid "2010-03-07"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: dpkg-deb.1:4
 msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:9
+#: dpkg-deb.1:8
 #, fuzzy
-msgid "B<dpkg-deb> [I<options>] I<command>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<dpkg-deb> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
-#: dpkg-deb.1:13
+#: dpkg-deb.1:12
 #, fuzzy
 msgid ""
 "B<dpkg-deb> packs, unpacks and provides information about Debian archives."
-msgstr "Veja B<dpkg-deb>(1) para mais informaes sobre as seguintes aes."
+msgstr "Veja B<dpkg-deb>(1) para mais informações sobre as seguintes ações."
 
 #. type: Plain text
-#: dpkg-deb.1:17
+#: dpkg-deb.1:16
 msgid "Use B<dpkg> to install and remove packages from your system."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:27
+#: dpkg-deb.1:26
 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> "
@@ -6534,13 +6821,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:29
+#: dpkg-deb.1:28
 #, no-wrap
 msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:41
+#: dpkg-deb.1:40
 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 "
@@ -6550,7 +6837,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-deb.1:52
 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 "
@@ -6560,19 +6847,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:60
+#: dpkg-deb.1:59
 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-deb.1:62
+#: dpkg-deb.1:61
 msgid "If the archive to be created already exists it will be overwritten."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 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 "
@@ -6583,26 +6870,26 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 #, 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-deb.1:81
+#: dpkg-deb.1:80
 #, fuzzy
 msgid "Provides information about a binary package archive."
-msgstr "Apaga as informaes existentes sobre quais pacotes esto disponveis."
+msgstr "Apaga as informações existentes sobre quais pacotes estão disponíveis."
 
 #. type: Plain text
-#: dpkg-deb.1:86
+#: dpkg-deb.1:85
 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-deb.1:94
+#: dpkg-deb.1:93
 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 "
@@ -6611,13 +6898,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 #, fuzzy, no-wrap
 msgid "B<-W>, B<--show> I<archive>"
 msgstr "B<-R> | B<--recursive>"
 
 #. type: Plain text
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 msgid ""
 "Provides information about a binary package archive in the format specified "
 "by the B<--showformat> argument. The default format displays the package's "
@@ -6625,26 +6912,26 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 #, fuzzy, no-wrap
 msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 #. type: Plain text
-#: dpkg-deb.1:104
+#: dpkg-deb.1:103
 #, fuzzy
 msgid "Extracts control file information from a binary package archive."
-msgstr "B<1.> Os arquivos de controle do novo pacote so extrados."
+msgstr "B<1.> Os arquivos de controle do novo pacote são extraídos."
 
 #. type: Plain text
-#: dpkg-deb.1:108
+#: dpkg-deb.1:107
 msgid ""
 "If no B<control-file-field>s are specified then it will print the whole "
 "control file."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:117
+#: dpkg-deb.1:116
 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-"
@@ -6653,18 +6940,18 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 msgid "No errors are reported for fields requested but not found."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 #, fuzzy, no-wrap
 msgid "B<-c>, B<--contents> I<archive>"
 msgstr "B<--new> | B<--old>"
 
 #. type: Plain text
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 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 "
@@ -6672,100 +6959,115 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 #, fuzzy, no-wrap
 msgid "B<-x>, B<--extract> I<archive directory>"
-msgstr "B<--altdir> I<diretrio>"
+msgstr "B<--altdir> I<diretório>"
 
 #. type: Plain text
-#: dpkg-deb.1:129
+#: dpkg-deb.1:128
 msgid ""
 "Extracts the filesystem tree from a package archive into the specified "
 "directory."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:135
+#: dpkg-deb.1:134
 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-deb.1:139
+#: dpkg-deb.1:138
 msgid ""
 "I<directory> (but not its parents) will be created if necessary, and its "
 "permissions modified to match the contents of the package."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:139
+#: dpkg-deb.1:138
 #, fuzzy, no-wrap
 msgid "B<-X>, B<--vextract> I<archive directory>"
-msgstr "B<--altdir> I<diretrio>"
+msgstr "B<--altdir> I<diretório>"
 
 #. type: Plain text
-#: dpkg-deb.1:144
+#: dpkg-deb.1:145
 msgid ""
-"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
-"it goes."
+"Is like B<--extract> (B<-x>)  with B<--verbose> (B<-v>)  which prints a "
+"listing of the files extracted as it goes."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:144
+#: dpkg-deb.1:145
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--raw-extract> I<archive directory>"
+msgstr "B<--altdir> I<diretório>"
+
+#. type: Plain text
+#: dpkg-deb.1:150
+msgid ""
+"Extracts the filesystem tree from a package archive into a specified "
+"directory, and the control information files into a DEBIAN subdirectory of "
+"the specified directory."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-deb.1:152 dpkg-deb.1:172
+msgid ""
+"The target directory (but not its parents) will be created if necessary."
+msgstr ""
+
+#. type: TP
+#: dpkg-deb.1:152
 #, no-wrap
 msgid "B<--fsys-tarfile> I<archive>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
 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."
+"to extract a particular file from a package archive.  The input archive will "
+"always be processed sequentially."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
 #, fuzzy, no-wrap
 msgid "B<-e>, B<--control> I<archive> [I<directory>]"
-msgstr "B<--altdir> I<diretrio>"
+msgstr "B<--altdir> I<diretório>"
 
 #. type: Plain text
-#: dpkg-deb.1:156
+#: dpkg-deb.1:165
 msgid ""
 "Extracts the control information files from a package archive into the "
 "specified directory."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:160
+#: dpkg-deb.1:169
 msgid ""
 "If no directory is specified then a subdirectory B<DEBIAN> in the current "
 "directory is used."
 msgstr ""
 
-#. type: Plain text
-#: dpkg-deb.1:163
-msgid ""
-"The target directory (but not its parents) will be created if necessary."
-msgstr ""
-
 #. type: TP
-#: dpkg-deb.1:171
+#: dpkg-deb.1:180
 #, no-wrap
 msgid "B<--showformat=>I<format>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:176 dpkg-query.1:121
+#: dpkg-deb.1:185 dpkg-query.1:127
 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."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:185
+#: dpkg-deb.1:194
 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 "
@@ -6775,31 +7077,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:187
+#: dpkg-deb.1:196
 msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:187
-#, no-wrap
-msgid "B<-z>I<compress_level>"
-msgstr ""
+#: dpkg-deb.1:196
+#, fuzzy, no-wrap
+msgid "B<-z>I<compress-level>"
+msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: dpkg-deb.1:191
+#: dpkg-deb.1:200
 msgid ""
-"Specify which compression level to pass to the compressor backend program, "
-"when building a package."
+"Specify which compression level to use on the compressor backend, when "
+"building a package (default is 9 for gzip and bzip2, 6 for xz and lzma)."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:191
-#, no-wrap
-msgid "B<-Z>I<compress_type>"
-msgstr ""
+#: dpkg-deb.1:200
+#, fuzzy, no-wrap
+msgid "B<-Z>I<compress-type>"
+msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 msgid ""
 "Specify which compression type to use when building a package. Allowed "
 "values are I<gzip>, I<xz>, I<bzip2>, I<lzma>, and I<none> (default is "
@@ -6807,25 +7109,25 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 #, fuzzy, no-wrap
 msgid "B<--new>"
 msgstr "B<--test>"
 
 #. type: Plain text
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 msgid ""
 "Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 #, fuzzy, no-wrap
 msgid "B<--old>"
 msgstr "B<hold>"
 
 #. type: Plain text
-#: dpkg-deb.1:209
+#: dpkg-deb.1:218
 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 "
@@ -6833,39 +7135,58 @@
 "0.93.76 (September 1995), which was released as i386 a.out only."
 msgstr ""
 
+#. type: TP
+#: dpkg-deb.1:218
+#, no-wrap
+msgid "B<--nocheck>"
+msgstr "B<--nocheck>"
+
 #. type: Plain text
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224
 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:215
+#: dpkg-deb.1:224 start-stop-daemon.8:255
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--verbose>"
+msgstr "B<--verbose>"
+
+#. type: Plain text
+#: dpkg-deb.1:228
+msgid ""
+"Enables verbose output. This currently only affects B<--extract> making it "
+"behave like B<--vextract>."
+msgstr ""
+
+#. type: TP
+#: dpkg-deb.1:228
 #, fuzzy, no-wrap
 msgid "B<-D>, B<--debug>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-deb.1:218
+#: dpkg-deb.1:231
 msgid "Enables debugging output. This is not very interesting."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:224
+#: dpkg-deb.1:237
 msgid ""
 "If set, B<dpkg-deb> will use it as the directory in which to create "
 "temporary files and directories."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:230
+#: dpkg-deb.1:243
 msgid ""
 "B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:238
+#: dpkg-deb.1:251
 msgid ""
 "There is no authentication on B<.deb> files; in fact, there isn't even a "
 "straightforward checksum.  (Higher level tools like APT support "
@@ -6875,7 +7196,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:245
+#: dpkg-deb.1:258
 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 "
@@ -6883,7 +7204,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:251
+#: dpkg-deb.1:264
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr ""
 
@@ -6893,12 +7214,6 @@
 msgid "dpkg-divert"
 msgstr ""
 
-#. type: TH
-#: dpkg-divert.8:1
-#, fuzzy, no-wrap
-msgid "2010-10-12"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: dpkg-divert.8:4
 msgid "dpkg-divert - override a package's version of a file"
@@ -6907,8 +7222,8 @@
 #. type: Plain text
 #: dpkg-divert.8:9
 #, fuzzy
-msgid "B<dpkg-divert> [I<options>] I<command>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<dpkg-divert> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-divert.8:13
@@ -6941,7 +7256,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:28 dpkg-statoverride.8:36
+#: 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>>"
@@ -6987,10 +7302,11 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:43 dpkg-statoverride.8:53 update-alternatives.8:329
+#: dpkg-divert.8:43 dpkg-statoverride.8:52 dselect.1:44
+#: update-alternatives.8:328
 #, fuzzy, no-wrap
 msgid "B<--admindir>I< directory>"
-msgstr "B<--admindir> I<diretrio>"
+msgstr "B<--admindir> I<diretório>"
 
 #. type: Plain text
 #: dpkg-divert.8:46
@@ -7040,7 +7356,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:61 dpkg-statoverride.8:65 update-alternatives.8:351
+#: dpkg-divert.8:61 dpkg-statoverride.8:64 update-alternatives.8:350
 #, fuzzy, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
@@ -7083,9 +7399,9 @@
 #. type: Plain text
 #: dpkg-divert.8:82
 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 adding, default is B<--local> and B<--divert> I<original>B<.distrib>. "
+"When removing, B<--package> or B<--local> and B<--divert> must match if "
+"specified."
 msgstr ""
 
 #. type: Plain text
@@ -7146,15 +7462,15 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:113 dpkg-query.1:197 dpkg-statoverride.8:70 dpkg-trigger.1:61
-#: update-alternatives.8:356
+#: dpkg-divert.8:113 dpkg-query.1:205 dpkg-statoverride.8:69 dpkg-trigger.1:61
+#: update-alternatives.8:355
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_ADMINDIR>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
-#: dpkg-divert.8:117 dpkg-query.1:201 dpkg-statoverride.8:74 dpkg-trigger.1:65
+#: dpkg-divert.8:117 dpkg-query.1:209 dpkg-statoverride.8:73 dpkg-trigger.1:65
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the dpkg data directory."
@@ -7163,7 +7479,7 @@
 #. type: Plain text
 #: dpkg-divert.8:121
 msgid ""
-"If set and the I<--local> and I<--package> options have not been specified, "
+"If set and the B<--local> and B<--package> options have not been specified, "
 "B<dpkg-divert> will use it as the package name."
 msgstr ""
 
@@ -7189,7 +7505,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-divert.8:137 update-alternatives.8:495
+#: dpkg-divert.8:137 update-alternatives.8:496
 msgid "Copyright \\(co 1995 Ian Jackson"
 msgstr ""
 
@@ -7207,8 +7523,8 @@
 #. type: Plain text
 #: dpkg-genchanges.1:8
 #, fuzzy
-msgid "B<dpkg-genchanges> [I<options>]"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<dpkg-genchanges> [I<option>...]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-genchanges.1:16
@@ -7298,21 +7614,21 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:121
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:127
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-source.1:131
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:169
+#: dpkg-source.1:131
 #, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr ""
@@ -7328,29 +7644,29 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:131
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:137
 #, 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:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 msgid "Override or add an output control file field."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 #, fuzzy, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:137
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:143
 msgid "Remove an output control file field."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:98
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:104
 #, fuzzy, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "I<control>"
@@ -7364,7 +7680,7 @@
 
 #. type: TP
 #: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
@@ -7385,14 +7701,14 @@
 
 #. type: TP
 #: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 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 "
@@ -7414,7 +7730,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:123 dpkg-gensymbols.1:416
+#: dpkg-genchanges.1:123 dpkg-gensymbols.1:421
 #, fuzzy, no-wrap
 msgid "B<-q>"
 msgstr "B<-G>"
@@ -7448,8 +7764,8 @@
 #. type: Plain text
 #: dpkg-gencontrol.1:8
 #, fuzzy
-msgid "B<dpkg-gencontrol> [I<options>]"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<dpkg-gencontrol> [I<option>...]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-gencontrol.1:14
@@ -7510,7 +7826,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:368
+#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:373
 #, fuzzy, no-wrap
 msgid "B<-p>I<package>"
 msgstr "B<unpacked>"
@@ -7569,7 +7885,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:386 dpkg-shlibdeps.1:152
+#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:391 dpkg-shlibdeps.1:150
 #, fuzzy, no-wrap
 msgid "B<-O>"
 msgstr "B<-G>"
@@ -7603,7 +7919,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:339
+#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:337
 msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 msgstr ""
 
@@ -7613,12 +7929,6 @@
 msgid "dpkg-gensymbols"
 msgstr "I<control>"
 
-#. type: TH
-#: dpkg-gensymbols.1:2
-#, fuzzy, no-wrap
-msgid "2009-08-07"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: dpkg-gensymbols.1:5
 msgid ""
@@ -7629,8 +7939,8 @@
 #. type: Plain text
 #: dpkg-gensymbols.1:9
 #, fuzzy
-msgid "B<dpkg-gensymbols> [I<options>]"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<dpkg-gensymbols> [I<option>...]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-gensymbols.1:16
@@ -7650,14 +7960,6 @@
 "found):"
 msgstr ""
 
-#. type: IP
-#: dpkg-gensymbols.1:20 dpkg-gensymbols.1:22 dpkg-gensymbols.1:24
-#: dpkg-gensymbols.1:26 dpkg-gensymbols.1:306 dpkg-gensymbols.1:312
-#: dpkg-gensymbols.1:346 dpkg-gensymbols.1:350 dpkg-gensymbols.1:353
-#, no-wrap
-msgid "\\(bu"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-gensymbols.1:22
 msgid "debian/I<package>.symbols.I<arch>"
@@ -7731,14 +8033,23 @@
 "patch should ideally only add new lines."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-gensymbols.1:64
+msgid ""
+"Note that you can put comments in symbols files: any line with '#' as the "
+"first character is a comment except if it starts with '#include' (see "
+"section B<Using includes>). Lines starting with '#MISSING:' are special "
+"comments documenting symbols that have disappeared."
+msgstr ""
+
 #. type: SS
-#: dpkg-gensymbols.1:59
+#: dpkg-gensymbols.1:64
 #, no-wrap
 msgid "Using #PACKAGE# substitution"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 msgid ""
 "In some rare cases, the name of the library varies between architectures.  "
 "To avoid hardcoding the name of the package in the symbols file, you can use "
@@ -7748,13 +8059,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 #, no-wrap
 msgid "Using symbol tags"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:74
+#: dpkg-gensymbols.1:79
 msgid ""
 "Symbol tagging is useful for marking symbols that are special in some way.  "
 "Any symbol can have an arbitrary number of tags associated with it. While "
@@ -7764,7 +8075,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:86
+#: dpkg-gensymbols.1:91
 msgid ""
 "Tag specification comes right before the symbol name (no whitespace is "
 "allowed in between). It always starts with an opening bracket B<(>, ends "
@@ -7780,7 +8091,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:90
+#: dpkg-gensymbols.1:95
 #, no-wrap
 msgid ""
 " (tag1=i am marked|tag name with space)\"tagged quoted symbol\"@Base 1.0\n"
@@ -7789,7 +8100,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:96
+#: dpkg-gensymbols.1:101
 msgid ""
 "The first symbol in the example is named I<tagged quoted symbol> and has two "
 "tags: I<tag1> with value I<i am marked> and I<tag name with space> that has "
@@ -7799,7 +8110,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 msgid ""
 "Since symbol tags are an extension of the I<deb-symbols(5)> format, they can "
 "only be part of the symbols files used in source packages (those files "
@@ -7814,20 +8125,20 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 #, no-wrap
 msgid "Standard symbol tags"
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:109
+#: dpkg-gensymbols.1:114
 #, fuzzy, no-wrap
 #| msgid "B<not-installed>"
 msgid "B<optional>"
 msgstr "B<not-installed>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:119
+#: dpkg-gensymbols.1:124
 msgid ""
 "A symbol marked as optional can disappear from the library at any time and "
 "that will never cause B<dpkg-gensymbols> to fail. However, disappeared "
@@ -7840,7 +8151,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 msgid ""
 "This tag is useful for symbols which are private where their disappearance "
 "do not cause ABI breakage. For example, most of C++ template instantiations "
@@ -7850,13 +8161,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 #, fuzzy, no-wrap
 msgid "B<arch=>I<architecture list>"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:137
+#: dpkg-gensymbols.1:142
 msgid ""
 "This tag allows one to restrict the set of architectures where the symbol is "
 "supposed to exist. When the symbols list is updated with the symbols "
@@ -7872,7 +8183,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:143
+#: dpkg-gensymbols.1:148
 msgid ""
 "When operating in the default non-template mode, among arch-specific symbols "
 "only those that match the current host architecture are written to the "
@@ -7882,7 +8193,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:149
+#: dpkg-gensymbols.1:154
 msgid ""
 "The format of I<architecture list> is the same as the one used in the "
 "I<Build-Depends> field of I<debian/control> (except the enclosing square "
@@ -7892,7 +8203,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid ""
 " (arch=alpha amd64 kfreebsd-amd64 ia64)a_64bit_specific_symbol@Base 1.0\n"
@@ -7900,13 +8211,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, fuzzy, no-wrap
 msgid "B<ignore-blacklist>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:160
+#: dpkg-gensymbols.1:165
 msgid ""
 "dpkg-gensymbols has an internal blacklist of symbols that should not appear "
 "in symbols files as they are usually only side-effects of implementation "
@@ -7917,52 +8228,52 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:160 dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:165 dpkg-gensymbols.1:202
 #, fuzzy, no-wrap
 msgid "B<c++>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:164
+#: dpkg-gensymbols.1:169
 msgid ""
 "Denotes I<c++> symbol pattern. See B<Using symbol patterns> subsection below."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:164 dpkg-gensymbols.1:228
+#: dpkg-gensymbols.1:169 dpkg-gensymbols.1:233
 #, fuzzy, no-wrap
 msgid "B<symver>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:168
+#: dpkg-gensymbols.1:173
 msgid ""
 "Denotes I<symver> (symbol version) symbol pattern. See B<Using symbol "
 "patterns> subsection below."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:168 dpkg-gensymbols.1:253
+#: dpkg-gensymbols.1:173 dpkg-gensymbols.1:258
 #, fuzzy, no-wrap
 #| msgid "B<purge>"
 msgid "B<regex>"
 msgstr "B<purge>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 msgid ""
 "Denotes I<regex> symbol pattern. See B<Using symbol patterns> subsection "
 "below."
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 #, no-wrap
 msgid "Using symbol patterns"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:180
+#: dpkg-gensymbols.1:185
 msgid ""
 "Unlike a standard symbol specification, a pattern may cover multiple real "
 "symbols from the library. B<dpkg-gensymbols> will attempt to match each "
@@ -7974,7 +8285,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:188
+#: dpkg-gensymbols.1:193
 msgid ""
 "A pattern is considered lost if it does not match any symbol in the library. "
 "By default this will trigger a B<dpkg-gensymbols> failure under I<-c1> or "
@@ -7987,7 +8298,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:195
+#: dpkg-gensymbols.1:200
 msgid ""
 "Patterns are an extension of the I<deb-symbols(5)> format hence they are "
 "only valid in symbol file templates. Pattern specification syntax is not any "
@@ -7998,12 +8309,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:202
 msgid "At the moment, B<dpkg-gensymbols> supports three basic pattern types:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:209
+#: dpkg-gensymbols.1:214
 msgid ""
 "This pattern is denoted by the I<c++> tag. It matches only C++ symbols by "
 "their demangled symbol name (as emitted by B<c++filt>(1) utility). This "
@@ -8018,7 +8329,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:215
+#: dpkg-gensymbols.1:220
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -8028,19 +8339,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:217
+#: dpkg-gensymbols.1:222
 msgid ""
 "The demangled name above can be obtained by executing the following command:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:219
+#: dpkg-gensymbols.1:224
 #, no-wrap
 msgid " $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:227
+#: dpkg-gensymbols.1:232
 msgid ""
 "Please note that while mangled name is unique in the library by definition, "
 "this is not necessarily true for demangled names. A couple of distinct real "
@@ -8052,7 +8363,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:234
+#: dpkg-gensymbols.1:239
 msgid ""
 "This pattern is denoted by the I<symver> tag. Well maintained libraries have "
 "versioned symbols where each version corresponds to the upstream version "
@@ -8061,7 +8372,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:241
+#: dpkg-gensymbols.1:246
 #, no-wrap
 msgid ""
 "libc.so.6 libc6 #MINVER#\n"
@@ -8072,7 +8383,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:247
+#: dpkg-gensymbols.1:252
 msgid ""
 "All symbols associated with versions GLIBC_2.0 and GLIBC_2.7 will lead to "
 "minimal version of 2.0 and 2.7 respectively with the exception of the symbol "
@@ -8082,7 +8393,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:252
+#: dpkg-gensymbols.1:257
 msgid ""
 "Please note that while old style wildcard patterns (denoted by \"*@version\" "
 "in the symbol name field) are still supported, they have been deprecated by "
@@ -8092,7 +8403,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:260
+#: dpkg-gensymbols.1:265
 msgid ""
 "Regular expression patterns are denoted by the I<regex> tag. They match by "
 "the perl regular expression specified in the symbol name field. A regular "
@@ -8102,7 +8413,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:265
+#: dpkg-gensymbols.1:270
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -8111,7 +8422,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:270
+#: dpkg-gensymbols.1:275
 msgid ""
 "Symbols like \"mystack_new@Base\", \"mystack_push@Base\", \"mystack_pop@Base"
 "\" etc.  will be matched by the first pattern while e.g. "
@@ -8121,7 +8432,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:275
+#: dpkg-gensymbols.1:280
 msgid ""
 "Basic patterns listed above can be combined where it makes sense. In that "
 "case, they are processed in the order in which the tags are specified. For "
@@ -8129,7 +8440,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:278
+#: dpkg-gensymbols.1:283
 #, no-wrap
 msgid ""
 " (c++|regex)\"^NSA::ClassA::Private::privmethod\\ed\\e(int\\e)@Base\" 1.0\n"
@@ -8137,7 +8448,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:288
+#: dpkg-gensymbols.1:293
 msgid ""
 "will match symbols \"_ZN3NSA6ClassA7Private11privmethod1Ei@Base\" and "
 "\"_ZN3NSA6ClassA7Private11privmethod2Ei@Base\". When matching the first "
@@ -8152,7 +8463,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:294
+#: dpkg-gensymbols.1:299
 msgid ""
 "In general, all patterns are divided into two groups: aliases (basic I<c++> "
 "and I<symver>) and generic patterns (I<regex>, all combinations of multiple "
@@ -8162,7 +8473,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 msgid ""
 "When multiple patterns match the same real symbol, aliases (first I<c++>, "
 "then I<symver>) are preferred over generic patterns. Generic patterns are "
@@ -8173,13 +8484,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 #, no-wrap
 msgid "Using includes"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:306
+#: dpkg-gensymbols.1:311
 msgid ""
 "When the set of exported symbols differ between architectures, it may become "
 "inefficient to use a single symbol file. In those cases, an include "
@@ -8187,7 +8498,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:310
+#: dpkg-gensymbols.1:315
 msgid ""
 "You can factorize the common part in some external file and include that "
 "file in your I<package>.symbols.I<arch> file by using an include directive "
@@ -8195,31 +8506,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:312
+#: dpkg-gensymbols.1:317
 msgid "#include \"I<packages>.symbols.common\""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:314
+#: dpkg-gensymbols.1:319
 msgid "The include directive may also be tagged like any symbol:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:316
-msgid "(tag|..|tagN)#include \"file_to_include\""
+#: dpkg-gensymbols.1:321
+msgid "(tag|..|tagN)#include \"file-to-include\""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:321
+#: dpkg-gensymbols.1:326
 msgid ""
-"As a result, all symbols included from I<file_to_include> will be considered "
+"As a result, all symbols included from I<file-to-include> will be considered "
 "to be tagged with I<tag> .. I<tagN> by default. You can use this feature to "
 "create a common I<package>.symbols file which includes architecture specific "
 "symbol files:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:326
+#: dpkg-gensymbols.1:331
 #, no-wrap
 msgid ""
 "  common_symbol1@Base 1.0\n"
@@ -8229,7 +8540,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:335
+#: dpkg-gensymbols.1:340
 msgid ""
 "The symbols files are read line by line, and include directives are "
 "processed as soon as they are encountered. This means that the content of "
@@ -8242,7 +8553,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:340
+#: dpkg-gensymbols.1:345
 msgid ""
 "An included file can repeat the header line containing the SONAME of the "
 "library. In that case, it overrides any header line previously read.  "
@@ -8251,7 +8562,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid ""
 "#include \"libsomething1.symbols.common\"\n"
@@ -8259,39 +8570,39 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid "Good library management"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:346
+#: dpkg-gensymbols.1:351
 msgid "A well-maintained library has the following features:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:350
+#: dpkg-gensymbols.1:355
 msgid ""
 "its API is stable (public symbols are never dropped, only new public symbols "
 "are added) and changes in incompatible ways only when the SONAME changes;"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:353
+#: dpkg-gensymbols.1:358
 msgid ""
 "ideally, it uses symbol versioning to achieve ABI stability despite internal "
 "changes and API extension;"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:356
+#: dpkg-gensymbols.1:361
 msgid ""
 "it doesn't export private symbols (such symbols can be tagged optional as "
 "workaround)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:364
+#: dpkg-gensymbols.1:369
 msgid ""
 "While maintaining the symbols file, it's easy to notice appearance and "
 "disappearance of symbols. But it's more difficult to catch incompatible API "
@@ -8303,38 +8614,38 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:365
+#: dpkg-gensymbols.1:370
 #, fuzzy, no-wrap
 msgid "B<-P>I<package-build-dir>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:368
+#: dpkg-gensymbols.1:373
 msgid "Scan I<package-build-dir> instead of debian/tmp."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 msgid ""
 "Define the package name. Required if more than one binary package is listed "
 "in debian/control (or if there's no debian/control file)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 msgid ""
 "Define the package version. Defaults to the version extracted from debian/"
 "changelog. Required if called outside of a source package tree."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 #, fuzzy, no-wrap
 msgid "B<-e>I<library-file>"
 msgstr "I<control>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 msgid ""
 "Only analyze libraries explicitly listed instead of finding all public "
 "libraries. You can use a regular expression in I<library-file> to match "
@@ -8343,33 +8654,33 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 #, fuzzy, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:386
+#: dpkg-gensymbols.1:391
 msgid ""
 "Use I<filename> as reference file to generate the symbols file that is "
 "integrated in the package itself."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 msgid ""
 "Print the generated symbols file to standard output, rather than being "
 "stored in the package build tree."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 #, fuzzy, no-wrap
 msgid "B<-O>I<filename>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 msgid ""
 "Store the generated symbols file as I<filename>. If I<filename> is pre-"
 "existing, its content is used as basis for the generated symbols file.  You "
@@ -8378,13 +8689,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 #, fuzzy, no-wrap
 msgid "B<-t>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 msgid ""
 "Write the symbol file in template mode rather than the format compatible "
 "with I<deb-symbols(5)>. The main difference is that in the template mode "
@@ -8396,13 +8707,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 #, fuzzy, no-wrap
 msgid "B<-c>I<[0-4]>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:413
+#: dpkg-gensymbols.1:418
 msgid ""
 "Define the checks to do when comparing the generated symbols file with the "
 "template file used as starting point. By default the level is 1. Increasing "
@@ -8413,14 +8724,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:416
+#: dpkg-gensymbols.1:421
 msgid ""
 "This value can be overridden by the environment variable "
 "DPKG_GENSYMBOLS_CHECK_LEVEL."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 msgid ""
 "Keep quiet and never generate a diff between generated symbols file and the "
 "template file used as starting point or show any warnings about new/lost "
@@ -8429,13 +8740,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 #, fuzzy, no-wrap
 msgid "B<-a>I<arch>"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:427
+#: dpkg-gensymbols.1:432
 msgid ""
 "Assume I<arch> as host architecture when processing symbol files. Use this "
 "option to generate a symbol file or diff for any architecture provided its "
@@ -8443,21 +8754,21 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 msgid ""
 "Enable debug mode. Numerous messages are displayed to explain what B<dpkg-"
 "gensymbols> does."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 #, fuzzy, no-wrap
 #| msgid "B<-G>"
 msgid "B<-V>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:438
+#: dpkg-gensymbols.1:443
 msgid ""
 "Enable verbose mode. The generated symbols file contains deprecated symbols "
 "as comments. Furthermore in template mode, pattern symbols are followed by "
@@ -8465,22 +8776,22 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:447
+#: dpkg-gensymbols.1:452
 msgid "B<http://people.redhat.com/drepper/symbol-versioning>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:449
+#: dpkg-gensymbols.1:454
 msgid "B<http://people.redhat.com/drepper/goodpractice.pdf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:451
+#: dpkg-gensymbols.1:456
 msgid "B<http://people.redhat.com/drepper/dsohowto.pdf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:454
+#: dpkg-gensymbols.1:459
 #, fuzzy
 msgid "B<deb-symbols>(5), B<dpkg-shlibdeps>(1)."
 msgstr ""
@@ -8488,7 +8799,7 @@
 "reconfigure>(8)"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:457
+#: dpkg-gensymbols.1:462
 msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
 msgstr ""
 
@@ -8498,12 +8809,6 @@
 msgid "dpkg-maintscript-helper"
 msgstr ""
 
-#. type: TH
-#: dpkg-maintscript-helper.1:1
-#, fuzzy, no-wrap
-msgid "2010-04-16"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: dpkg-maintscript-helper.1:4
 msgid ""
@@ -8514,8 +8819,8 @@
 #. type: Plain text
 #: dpkg-maintscript-helper.1:8
 msgid ""
-"B<dpkg-maintscript-helper> I<command> [I<parameters>...] -- I<maint-script-"
-"parameters>"
+"B<dpkg-maintscript-helper> I<command> [I<parameter>...] B<--> I<maint-script-"
+"parameter>..."
 msgstr ""
 
 #. type: SH
@@ -8550,8 +8855,8 @@
 "scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
 "the same call simply needs to be put in all scripts and the program will "
 "automatically adapt its behaviour based on the environment variable "
-"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
-"to forward after a double dash."
+"B<DPKG_MAINTSCRIPT_NAME> and on the maintainer scripts arguments that you "
+"have to forward after a double dash."
 msgstr ""
 
 #. type: SH
@@ -8701,7 +9006,7 @@
 #, fuzzy, no-wrap
 #| msgid "INFORMATION ABOUT PACKAGES"
 msgid "INTEGRATION IN PACKAGES"
-msgstr "INFORMAO SOBRE PACOTES"
+msgstr "INFORMAÇÃO SOBRE PACOTES"
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:116
@@ -8715,7 +9020,7 @@
 #. type: Plain text
 #: dpkg-maintscript-helper.1:118
 #, no-wrap
-msgid "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
+msgid "    B<Pre-Depends:> dpkg (E<gt>= 1.15.7.2)\n"
 msgstr ""
 
 #. type: Plain text
@@ -8731,12 +9036,17 @@
 #: dpkg-maintscript-helper.1:127
 #, no-wrap
 msgid ""
-"    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
-"        dpkg-maintscript-helper E<lt>commandE<gt> ...\n"
+"    if dpkg-maintscript-helper supports I<command>; then\n"
+"        dpkg-maintscript-helper I<command> ...\n"
 "    fi\n"
 msgstr ""
 
 #. type: Plain text
+#: dpkg-maintscript-helper.1:130
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr ""
+
+#. type: Plain text
 #: dpkg-maintscript-helper.1:132
 msgid "Copyright \\(co 2008 Joey Hess"
 msgstr ""
@@ -8755,13 +9065,7 @@
 #: dpkg-mergechangelogs.1:1
 #, fuzzy, no-wrap
 msgid "dpkg-mergechangelogs"
-msgstr "B<dpkg> [I<opes>] I<ao>"
-
-#. type: TH
-#: dpkg-mergechangelogs.1:1
-#, fuzzy, no-wrap
-msgid "2010-04-18"
-msgstr "2006-04-09"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-mergechangelogs.1:4
@@ -8773,7 +9077,7 @@
 #, fuzzy
 msgid ""
 "B<dpkg-mergechangelogs> [I<option>...] I<old> I<new-a> I<new-b> [I<out>]"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-mergechangelogs.1:15
@@ -8824,7 +9128,7 @@
 #, fuzzy, no-wrap
 #| msgid "ACTIONS"
 msgid "LIMITATIONS"
-msgstr "AES"
+msgstr "AÇÕES"
 
 #. type: Plain text
 #: dpkg-mergechangelogs.1:50
@@ -8890,106 +9194,103 @@
 #. type: Plain text
 #: dpkg-name.1:15
 #, fuzzy
-msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
-msgstr "B<update-alternatives> [I<optes>] B<--auto> I<nome>"
+msgid "B<dpkg-name> [I<option>...] [B<-->] I<file>..."
+msgstr "B<update-alternatives> [I<optções>] B<--auto> I<nome>"
 
 #. type: Plain text
-#: dpkg-name.1:28
+#: dpkg-name.1:29
 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>."
-"E<lt>package_typeE<gt>> 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. "
-"The I<E<lt>package_typeE<gt>> part comes from that field if present or "
-"fallbacks to B<deb>."
+"package name consists of I<package>B<_>I<version>B<_>I<architecture>B<."
+">I<package-type> as specified in the control file of the package. The "
+"I<version> part of the filename consists of the upstream version information "
+"optionally followed by a hyphen and the revision information. The I<package-"
+"type> part comes from that field if present or fallbacks to B<deb>."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:30
+#: dpkg-name.1:31
 #, fuzzy, no-wrap
 msgid "B<-a>, B<--no-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 msgid "The destination filename will not have the architecture information."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 #, fuzzy, no-wrap
 msgid "B<-k>, B<--symlink>"
-msgstr "B<--display> I<ligao>"
+msgstr "B<--display> I<ligação>"
 
 #. type: Plain text
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 msgid "Create a symlink, instead of moving."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 #, fuzzy, no-wrap
 msgid "B<-o>, B<--overwrite>"
 msgstr "B<--verbose>"
 
 #. type: Plain text
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 msgid ""
 "Existing files will be overwritten if they have the same name as the "
 "destination filename."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 #, fuzzy, no-wrap
 msgid "B<-s>, B<--subdir> [I<dir>]"
-msgstr "B<--altdir> I<diretrio>"
+msgstr "B<--altdir> I<diretório>"
 
 #. type: Plain text
-#: dpkg-name.1:52
+#: dpkg-name.1:53
 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 package. The target directory will be `unstable/binary-I<architecture>/"
+"I<section>'. 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 `I<section>/binary-I<architecture>'. 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:52
+#: dpkg-name.1:53
 #, fuzzy, no-wrap
 msgid "B<-c>, B<--create-dir>"
 msgstr "B<--new> | B<--old>"
 
 #. type: Plain text
-#: dpkg-name.1:57
+#: dpkg-name.1:58
 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:60
+#: dpkg-name.1:61
 #, fuzzy, no-wrap
 msgid "B<-v>, B<--version>"
 msgstr "B<--version>"
 
 #. type: TP
-#: dpkg-name.1:65
+#: dpkg-name.1:66
 #, no-wrap
 msgid "B<dpkg-name bar-foo.deb>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 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 "
@@ -8997,13 +9298,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 #, no-wrap
 msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:75
+#: dpkg-name.1:76
 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 "
@@ -9011,48 +9312,48 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:75
+#: dpkg-name.1:76
 #, no-wrap
 msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:81
+#: dpkg-name.1:82
 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:81
+#: dpkg-name.1:82
 #, no-wrap
 msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:84
+#: dpkg-name.1:85
 msgid "This can be used when building new packages."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:94
+#: dpkg-name.1:95
 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 "
+"I<package>B<_>I<version>B<_>I<architecture>B<.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:102
+#: dpkg-name.1:103
 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-name.1:105
+#: dpkg-name.1:106
 msgid "Copyright \\(co 1995,1996 Erick Branderhorst"
 msgstr ""
 
@@ -9060,13 +9361,7 @@
 #: dpkg-parsechangelog.1:1
 #, fuzzy, no-wrap
 msgid "dpkg-parsechangelog"
-msgstr "B<dpkg> [I<opes>] I<ao>"
-
-#. type: TH
-#: dpkg-parsechangelog.1:1
-#, fuzzy, no-wrap
-msgid "2009-05-19"
-msgstr "2006-04-09"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:4
@@ -9076,8 +9371,8 @@
 #. type: Plain text
 #: dpkg-parsechangelog.1:8
 #, fuzzy
-msgid "B<dpkg-parsechangelog> [I<options>]"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<dpkg-parsechangelog> [I<option>...]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:14
@@ -9134,25 +9429,25 @@
 #. type: TP
 #: dpkg-parsechangelog.1:54
 #, fuzzy, no-wrap
-msgid "B<Source:> E<lt>pkg nameE<gt>"
+msgid "B<Source:>I< pkg-name>"
 msgstr "B<--log=>I<filename>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:56
 #, fuzzy, no-wrap
-msgid "B<Version:> E<lt>versionE<gt>"
+msgid "B<Version:>I< version>"
 msgstr "B<--log=>I<filename>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:58
 #, no-wrap
-msgid "B<Distribution:> E<lt>target distributionE<gt>"
+msgid "B<Distribution:>I< target-distribution>"
 msgstr ""
 
 #. type: TP
 #: dpkg-parsechangelog.1:60
 #, fuzzy, no-wrap
-msgid "B<Urgency:> E<lt>urgencyE<gt>"
+msgid "B<Urgency:>I< urgency>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
@@ -9163,19 +9458,19 @@
 #. type: TP
 #: dpkg-parsechangelog.1:63
 #, fuzzy, no-wrap
-msgid "B<Maintainer:> E<lt>authorE<gt>"
+msgid "B<Maintainer:>I< author>"
 msgstr "B<--log=>I<filename>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:65
 #, fuzzy, no-wrap
-msgid "B<Date:> E<lt>dateE<gt>"
+msgid "B<Date:>I< date>"
 msgstr "B<--log=>I<filename>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:67
 #, fuzzy, no-wrap
-msgid "B<Closes:> E<lt>bug numberE<gt>"
+msgid "B<Closes:>I< bug-number>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
@@ -9186,7 +9481,7 @@
 #. type: TP
 #: dpkg-parsechangelog.1:70
 #, no-wrap
-msgid "B<Changes:> E<lt>changelog entriesE<gt>"
+msgid "B<Changes:>I< changelog-entries>"
 msgstr ""
 
 #. type: Plain text
@@ -9271,7 +9566,7 @@
 #: dpkg-parsechangelog.1:100
 #, fuzzy, no-wrap
 msgid "B<--offset> I<number>, B<-o>I<number>"
-msgstr "B<--abort-after=>I<nmero>"
+msgstr "B<--abort-after=>I<número>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:104
@@ -9281,7 +9576,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-parsechangelog.1:104 update-alternatives.8:269
+#: dpkg-parsechangelog.1:104 update-alternatives.8:268
 #, fuzzy, no-wrap
 msgid "B<--all>"
 msgstr "B<--all>"
@@ -9335,7 +9630,7 @@
 #: dpkg-query.1:8
 #, fuzzy
 msgid "B<dpkg-query> [I<option>...] I<command>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-query.1:12
@@ -9348,7 +9643,7 @@
 #: dpkg-query.1:14
 #, fuzzy, no-wrap
 msgid "B<-l>, B<--list> [I<package-name-pattern>...]"
-msgstr "B<dpkg --get-selections> [I<padro>...]"
+msgstr "B<dpkg --get-selections> [I<padrão>...]"
 
 #. type: Plain text
 #: dpkg-query.1:24
@@ -9444,7 +9739,7 @@
 #: dpkg-query.1:67
 #, fuzzy, no-wrap
 msgid "B<-W>, B<--show> [I<package-name-pattern>...]"
-msgstr "B<dpkg --get-selections> [I<padro>...]"
+msgstr "B<dpkg --get-selections> [I<padrão>...]"
 
 #. type: Plain text
 #: dpkg-query.1:74
@@ -9463,33 +9758,36 @@
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 #. type: Plain text
-#: dpkg-query.1:78
+#: dpkg-query.1:79
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"installed package status database. When multiple I<package-name> are listed, "
+"the requested status entries are separated by an empty line."
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:78
+#: dpkg-query.1:79
 #, 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:83
+#: dpkg-query.1:85
 msgid ""
-"List files installed to your system from I<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+"List files installed to your system from I<package-name>. When multiple "
+"I<package-name> are listed, the requested lists of files are separated by an "
+"empty line. However, note that files created by package-specific "
+"installation-scripts are not listed."
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:83
+#: dpkg-query.1:85
 #, fuzzy, no-wrap
 msgid "B<-c>, B<--control-path> I<package-name> [I<control-file>]"
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 #. type: Plain text
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 msgid ""
 "List paths for control files installed to your system from I<package-name>.  "
 "If I<control-file> is specified then only list the path for that control "
@@ -9500,47 +9798,55 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 #, fuzzy, no-wrap
 msgid "B<-S>, B<--search> I<filename-search-pattern>..."
-msgstr "B<dpkg --get-selections> [I<padro>...]"
+msgstr "B<dpkg --get-selections> [I<padrão>...]"
 
 #. type: Plain text
-#: dpkg-query.1:97
+#: dpkg-query.1:99
 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."
+"Search for packages that own files corresponding to the given pattern.  "
+"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:97
+#: dpkg-query.1:99
 #, fuzzy, no-wrap
 msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 #. type: Plain text
-#: dpkg-query.1:104
+#: dpkg-query.1:105
 msgid ""
 "Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>. Users of APT-based frontends should use B<apt-cache show> "
-"I<package-name> instead as the I<available> file is only kept up-to-date "
-"when using B<dselect>."
+"available>. When multiple I<package-name> are listed, the requested "
+"I<available> entries are separated by an empty line."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.1:110
+msgid ""
+"Users of APT-based frontends should use B<apt-cache show> I<package-name> "
+"instead as the I<available> file is only kept up-to-date when using "
+"B<dselect>."
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:116
+#: dpkg-query.1:122
 #, no-wrap
 msgid "B<-f>, B<--showformat=>I<format>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:123
+#: dpkg-query.1:129
 msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:128
+#: dpkg-query.1:134
 #, no-wrap
 msgid ""
 "    B<\\en>  newline\n"
@@ -9549,7 +9855,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:133
+#: dpkg-query.1:139
 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<"
@@ -9557,7 +9863,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:141
+#: dpkg-query.1:147
 msgid ""
 "Package information can be included by inserting variable references to "
 "package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
@@ -9568,7 +9874,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:176
+#: dpkg-query.1:182
 #, no-wrap
 msgid ""
 "    B<Architecture>\n"
@@ -9581,11 +9887,11 @@
 "    B<Description>\n"
 "    B<Enhances>\n"
 "    B<Essential>\n"
-"    B<Filename> (internal, dselect related)\n"
+"    B<Filename> (internal, front-end related)\n"
 "    B<Homepage>\n"
 "    B<Installed-Size>\n"
-"    B<MD5sum> (internal, dselect related)\n"
-"    B<MSDOS-Filename> (internal, dselect related)\n"
+"    B<MD5sum> (internal, front-end related)\n"
+"    B<MSDOS-Filename> (internal, front-end related)\n"
 "    B<Maintainer>\n"
 "    B<Origin>\n"
 "    B<Package>\n"
@@ -9596,18 +9902,18 @@
 "    B<Replaces>\n"
 "    B<Revision> (obsolete)\n"
 "    B<Section>\n"
-"    B<Size> (internal, dselect related)\n"
+"    B<Size> (internal, front-end related)\n"
 "    B<Source>\n"
 "    B<Status> (internal)\n"
 "    B<Suggests>\n"
-"    B<Tag> (usually not in the .deb but in APT's Packages files)\n"
+"    B<Tag> (usually not in the .deb but in the repository Packages files)\n"
 "    B<Triggers-Awaited> (internal)\n"
 "    B<Triggers-Pending> (internal)\n"
 "    B<Version>\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:184
+#: dpkg-query.1:190
 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 "
@@ -9617,55 +9923,57 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:187
+#: dpkg-query.1:193
 #, no-wrap
 msgid "  B<dpkg-query -W -f=\\(aq${Package} ${Version}\\et${Maintainer}\\en\\(aq dpkg>\n"
 msgstr ""
 
 #. type: SH
-#: dpkg-query.1:189 dpkg-split.1:180 start-stop-daemon.8:256
-#: update-alternatives.8:375
+#: dpkg-query.1:195 dpkg-split.1:179 start-stop-daemon.8:259
+#: update-alternatives.8:374
 #, fuzzy, no-wrap
 msgid "EXIT STATUS"
-msgstr "STATUS DE SADA"
+msgstr "STATUS DE SAÍDA"
 
-#. type: IP
-#: dpkg-query.1:190 update-alternatives.8:376
-#, fuzzy, no-wrap
-msgid "0"
-msgstr "0"
+#. type: TP
+#: dpkg-query.1:196 dpkg-split.1:180 start-stop-daemon.8:260
+#: start-stop-daemon.8:289 update-alternatives.8:375
+#, no-wrap
+msgid "B<0>"
+msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:192
+#: dpkg-query.1:199
 #, fuzzy
 msgid "The requested query was successfully performed."
-msgstr "A ao requisitada foi completada com sucesso."
+msgstr "A ação requisitada foi completada com sucesso."
 
-#. type: IP
-#: dpkg-query.1:192
+#. type: TP
+#: dpkg-query.1:199 dpkg-split.1:186 start-stop-daemon.8:270
+#: start-stop-daemon.8:292
 #, no-wrap
-msgid "1"
+msgid "B<1>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:195
+#: dpkg-query.1:203
 #, fuzzy
 msgid ""
 "Problems were encountered while parsing the command line or performing the "
 "query, including no file or package being found (except for --control-path)."
 msgstr ""
 "Foram encontrados problemas quando analisando a linha de comando ou "
-"executando a ao."
+"executando a ação."
 
 #. type: Plain text
-#: dpkg-query.1:205
+#: dpkg-query.1:213
 msgid ""
 "This setting influences the output of the B<--list> option by changing the "
 "width of its output."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:208
+#: dpkg-query.1:216
 msgid "Copyright \\(co 2001 Wichert Akkerman"
 msgstr ""
 
@@ -9675,26 +9983,20 @@
 msgid "dpkg-scanpackages"
 msgstr ""
 
-#. type: TH
-#: dpkg-scanpackages.1:15 dpkg-scansources.1:1
-#, fuzzy, no-wrap
-msgid "2009-10-01"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: dpkg-scanpackages.1:18
 msgid "dpkg-scanpackages - create Packages index files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:27
+#: dpkg-scanpackages.1:26
 msgid ""
-"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scanpackages> [I<option>...] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:40
+#: dpkg-scanpackages.1:39
 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 "
@@ -9705,7 +10007,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:52
+#: 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<bzip2>(1)  (generating a "
@@ -9715,7 +10017,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:59
+#: 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 "
@@ -9724,7 +10026,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-scanpackages.1:63
 msgid ""
 "I<overridefile> is the name of a file to read which contains information "
 "about how the package fits into the distribution (it can be a compressed "
@@ -9732,13 +10034,13 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-scanpackages.1:66
 msgid ""
 "I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:71
+#: dpkg-scanpackages.1:70
 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 "
@@ -9746,72 +10048,72 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:73
+#: dpkg-scanpackages.1:72
 #, fuzzy, no-wrap
 msgid "B<-t>, B<--type> I<type>"
 msgstr "B<--test>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 msgid "Scan for *.I<type> packages, instead of *.deb."
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 #, fuzzy, no-wrap
 msgid "B<-u>, B<--udeb>"
 msgstr "B<--help>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:79
+#: dpkg-scanpackages.1:78
 msgid "B<Obsolete> alias for B<-tudeb>."
 msgstr ""
 
 #. type: IP
-#: dpkg-scanpackages.1:79 dpkg-scansources.1:50
+#: dpkg-scanpackages.1:78 dpkg-scansources.1:49
 #, fuzzy, no-wrap
 msgid "B<-e>, B<--extra-override> I<file>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:85 dpkg-scansources.1:55
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:54
 msgid ""
 "Scan I<file> to find supplementary overrides (the file can be compressed). "
 "See B<deb-extra-override>(5)  for more information on its format."
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:85
+#: dpkg-scanpackages.1:84
 #, fuzzy, no-wrap
 msgid "B<-a>, B<--arch> I<arch>"
-msgstr "B<--auto> I<ligao>"
+msgstr "B<--auto> I<ligação>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 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:89
+#: dpkg-scanpackages.1:88
 #, fuzzy, no-wrap
 msgid "B<-m>, B<--multiversion>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 msgid "Include all found packages in the output."
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 #, fuzzy, no-wrap
 msgid "B<-M>, B<--medium> I<id-string>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:97
+#: dpkg-scanpackages.1:96
 msgid ""
 "Add an X-Medium field containing the value I<id-string>. This field is "
 "required if you want to generate B<Packages.cd> files for use by the multicd "
@@ -9819,13 +10121,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-scanpackages.1:104 update-alternatives.8:447
+#: dpkg-scanpackages.1:103 update-alternatives.8:448
 #, fuzzy, no-wrap
 msgid "DIAGNOSTICS"
-msgstr "DIAGNSTICOS"
+msgstr "DIAGNÓSTICOS"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:110
+#: dpkg-scanpackages.1:109
 msgid ""
 "B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
 "warns about packages that are in the wrong subdirectory, are duplicated, "
@@ -9834,7 +10136,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:116
+#: dpkg-scanpackages.1:115
 #, fuzzy
 msgid ""
 "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<deb-extra-override>(5), "
@@ -9855,21 +10157,21 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-scansources.1:12
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scansources> [I<option>...] 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:17
 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:28
 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> "
@@ -9883,7 +10185,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-scansources.1:32
 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 "
@@ -9891,7 +10193,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:44
+#: dpkg-scansources.1:43
 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 "
@@ -9900,33 +10202,33 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-scansources.1:46
+#: dpkg-scansources.1:45
 #, fuzzy, no-wrap
 msgid "B<-n>, B<--no-sort>"
 msgstr "B<--new> | B<--old>"
 
 #. type: Plain text
-#: dpkg-scansources.1:49
+#: dpkg-scansources.1:48
 msgid ""
 "Don't sort the index records. Normally they are sorted by source package "
 "name."
 msgstr ""
 
 #. type: IP
-#: dpkg-scansources.1:55
+#: dpkg-scansources.1:54
 #, no-wrap
 msgid "B<-s>, B<--source-override> I<file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:59
+#: dpkg-scansources.1:58
 msgid ""
 "Use I<file> as the source override file (the file can be compressed).  The "
 "default is the name of the override file you specified with I<.src> appended."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 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 "
@@ -9936,18 +10238,18 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 #, fuzzy, no-wrap
 msgid "B<--debug>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-scansources.1:67
+#: dpkg-scansources.1:66
 msgid "Turn debugging on."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:76
+#: dpkg-scansources.1:75
 #, fuzzy
 msgid "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 msgstr ""
@@ -9955,7 +10257,7 @@
 "reconfigure>(8)"
 
 #. type: Plain text
-#: dpkg-scansources.1:78
+#: dpkg-scansources.1:77
 msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr ""
 
@@ -9965,36 +10267,29 @@
 msgid "dpkg-shlibdeps"
 msgstr "B<dpkg-deb-actions>"
 
-#. type: TH
-#: dpkg-shlibdeps.1:1 dpkg-source.1:2 start-stop-daemon.8:1
-#: update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2011-03-04"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: dpkg-shlibdeps.1:4
 msgid "dpkg-shlibdeps - generate shared library substvar dependencies"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:10
-msgid ""
-"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
-msgstr ""
+#: dpkg-shlibdeps.1:8
+#, fuzzy
+msgid "B<dpkg-shlibdeps> [I<option>...] [B<-e>]I<executable> [I<option>...]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:24
+#: dpkg-shlibdeps.1:22
 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."
+"other variables starting with B<shlibs:> are removed from the file."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 msgid ""
 "B<dpkg-shlibdeps> has two possible sources of information to generate "
 "dependency information. Either I<symbols> files or I<shlibs> files. For each "
@@ -10011,13 +10306,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 #, no-wrap
 msgid "Symbols files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 msgid ""
 "Symbols files contain finer-grained dependency information by providing the "
 "minimum dependency for each symbol that the library exports. The script "
@@ -10026,13 +10321,13 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 #, no-wrap
 msgid "debian/*/DEBIAN/symbols"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are generated by B<dpkg-gensymbols>(1).  "
@@ -10042,19 +10337,19 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols.I<arch>"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:61
+#: dpkg-shlibdeps.1:59
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 msgid ""
 "Per-system overriding shared library dependency information.  I<arch> is the "
 "architecture of the current system (obtained by B<dpkg-architecture -"
@@ -10062,20 +10357,20 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> symbols\\(rq"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:68 dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:66 dpkg-shlibdeps.1:100
 msgid ""
 "Package-provided shared library dependency information.  Unless overridden "
 "by --admindir, those files are located in /var/lib/dpkg."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:75
+#: dpkg-shlibdeps.1:73
 msgid ""
 "While scanning the symbols used by all binaries, B<dpkg-shlibdeps> remembers "
 "the (biggest) minimal version needed for each library. At the end of the "
@@ -10084,7 +10379,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 msgid ""
 "As a safe-guard measure, a symbols file can provide a I<Build-Depends-"
 "Package> meta-information field and B<dpkg-shlibdeps> will extract the "
@@ -10094,13 +10389,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 #, no-wrap
 msgid "Shlibs files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:86
+#: dpkg-shlibdeps.1:84
 msgid ""
 "Shlibs files associate directly a library to a dependency (without looking "
 "at the symbols). It's thus often stronger than really needed but very safe "
@@ -10108,42 +10403,42 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 msgid ""
 "The dependencies for a library are looked up in several places. The first "
 "file providing information for the library of interest is used:"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 #, no-wrap
 msgid "debian/shlibs.local"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 msgid "Package-local overriding shared library dependency information."
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 #, no-wrap
 msgid "/etc/dpkg/shlibs.override"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 msgid "Per-system overriding shared library dependency information."
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 #, no-wrap
 msgid "debian/*/DEBIAN/shlibs"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are only used if the library is found in a "
@@ -10152,24 +10447,24 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> shlibs\\(rq"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:100
 #, no-wrap
 msgid "/etc/dpkg/shlibs.default"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:104
+#: dpkg-shlibdeps.1:102
 msgid "Per-system default shared library dependency information."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:108
+#: dpkg-shlibdeps.1:106
 msgid ""
 "The extracted dependencies are then directly used (except if they are "
 "filtered out because they have been identified as duplicate, or as weaker "
@@ -10177,33 +10472,33 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 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:113
+#: dpkg-shlibdeps.1:111
 #, no-wrap
 msgid "B<-e>I<executable>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 msgid ""
 "Include dependencies appropriate for the shared libraries required by "
 "I<executable>."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 #, no-wrap
 msgid "B<-d>I<dependencyfield>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:123
+#: dpkg-shlibdeps.1:121
 msgid ""
 "Add dependencies to be added to the control file dependency field "
 "I<dependencyfield>.  (The dependencies for this field are placed in the "
@@ -10211,7 +10506,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:133
+#: dpkg-shlibdeps.1:131
 msgid ""
 "The B<-d>I<dependencyfield> option takes effect for all executables after "
 "the option, until the next B<-d>I<dependencyfield>.  The default "
@@ -10219,7 +10514,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 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>, "
@@ -10229,13 +10524,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 #, no-wrap
 msgid "B<-p>I<varnameprefix>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:152
+#: dpkg-shlibdeps.1:150
 msgid ""
 "Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
 ">.  Likewise, any existing substitution variables starting with "
@@ -10244,20 +10539,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 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:158
+#: dpkg-shlibdeps.1:156
 #, no-wrap
 msgid "B<-t>I<type>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 msgid ""
 "Prefer shared library dependency information tagged for the given package "
 "type. If no tagged information is available, falls back to untagged "
@@ -10267,46 +10562,46 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 #, no-wrap
 msgid "B<-L>I<localshlibsfile>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:171
+#: dpkg-shlibdeps.1:169
 msgid ""
 "Read overriding shared library dependency information from "
 "I<localshlibsfile> instead of B<debian/shlibs.local>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 msgid ""
 "Write substitution variables in I<substvarsfile>; the default is B<debian/"
 "substvars>."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 #, fuzzy, no-wrap
 msgid "B<-v>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 msgid ""
 "Enable verbose mode. Numerous messages are displayed to explain what B<dpkg-"
 "shlibdeps> does."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 #, fuzzy, no-wrap
 msgid "B<-x>I<package>"
 msgstr "B<unpacked>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 msgid ""
 "Exclude the package from the generated dependencies. This is useful to avoid "
 "self-dependencies for packages which provide ELF binaries (executables or "
@@ -10315,13 +10610,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 #, fuzzy, no-wrap
 msgid "B<-S>I<pkgbuilddir>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 msgid ""
 "Look into I<pkgbuilddir> first when trying to find a library. This is useful "
 "when the source package builds multiple flavors of the same library and you "
@@ -10331,13 +10626,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 #, no-wrap
 msgid "B<--ignore-missing-info>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 msgid ""
 "Do not fail if dependency information can't be found for a shared library.  "
 "Usage of this option is discouraged, all libraries should provide dependency "
@@ -10346,13 +10641,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 #, no-wrap
 msgid "B<--warnings=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:213
+#: dpkg-shlibdeps.1:211
 msgid ""
 "I<value> is a bit field defining the set of warnings that can be emitted by "
 "B<dpkg-shlibdeps>.  Bit 0 (value=1) enables the warning \"symbol I<sym> used "
@@ -10364,13 +10659,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-shlibdeps.1:224
+#: dpkg-shlibdeps.1:222
 #, fuzzy, no-wrap
 msgid "WARNINGS"
-msgstr "ATENO"
+msgstr "ATENÇÃO"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 msgid ""
 "Since B<dpkg-shlibdeps> analyzes the set of symbols used by each binary of "
 "the generated package, it is able to emit warnings in several cases. They "
@@ -10380,13 +10675,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 #, no-wrap
 msgid "B<symbol>I< sym>B< used by >I<binary>B< found in none of the libraries.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a library and it needs to be linked "
@@ -10395,13 +10690,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 #, no-wrap
 msgid "I<binary>B< contains an unresolvable reference to symbol >I<sym>B<: it's probably a plugin>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a plugin and the symbol is probably "
@@ -10416,13 +10711,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 #, no-wrap
 msgid "B<dependency on >I<library>B< could be avoided if >I<binaries>B< were not uselessly linked against it (they use none of its symbols).>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 msgid ""
 "None of the I<binaries> that are linked with I<library> use any of the "
 "symbols provided by the library. By fixing all the binaries, you would avoid "
@@ -10431,13 +10726,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 #, no-wrap
 msgid "I<binary>B< shouldn't be linked with >I<library>B< (it uses none of its symbols).>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 msgid ""
 "The I<binary> is linked to a library that it doesn't need. It's not a "
 "problem but some small performance improvements in binary load time can be "
@@ -10447,13 +10742,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 #, no-wrap
 msgid "ERRORS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 msgid ""
 "B<dpkg-shlibdeps> will fail if it can't find a public library used by a "
 "binary or if this library has no associated dependency information (either "
@@ -10463,13 +10758,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 #, no-wrap
 msgid "B<couldn't find library >I<library-soname>B< needed by >I<binary>B< (its RPATH is '>I<rpath>B<')>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:287
+#: dpkg-shlibdeps.1:285
 msgid ""
 "The I<binary> uses a library called I<library-soname> but B<dpkg-shlibdeps> "
 "has been unable to find the library.  B<dpkg-shlibdeps> creates a list of "
@@ -10478,14 +10773,14 @@
 "LD_LIBRARY_PATH environment variable, and standard public directories (/"
 "lib, /usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks those "
 "directories in the package's build tree of the binary being analyzed, in the "
-"packages's build trees indicated with the -S command-line option, in other "
-"packages's build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
+"packages' build trees indicated with the -S command-line option, in other "
+"packages' build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
 "and finally in the root directory.  If the library is not found in any of "
 "those directories, then you get this error."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 msgid ""
 "If the library not found is in a private directory of the same package, then "
 "you want to add the directory to LD_LIBRARY_PATH. If it's in another binary "
@@ -10495,13 +10790,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 #, no-wrap
 msgid "B<no dependency information found for >I<library-file>B< (used by >I<binary>B<).>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:306
+#: dpkg-shlibdeps.1:304
 msgid ""
 "The library needed by I<binary> has been found by B<dpkg-shlibdeps> in "
 "I<library-file> but B<dpkg-shlibdeps> has been unable to find any dependency "
@@ -10512,7 +10807,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:320
+#: dpkg-shlibdeps.1:318
 msgid ""
 "This failure can be caused by a bad or missing shlibs or symbols file in the "
 "package of the library. It might also happen if the library is built within "
@@ -10527,7 +10822,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:326
+#: dpkg-shlibdeps.1:324
 msgid ""
 "Calling B<dpkg-shlibdeps> in verbose mode (-v) will provide much more "
 "information about where it tried to find the dependency information. This "
@@ -10535,7 +10830,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:330
+#: dpkg-shlibdeps.1:328
 #, fuzzy
 msgid "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 msgstr ""
@@ -10543,7 +10838,7 @@
 "reconfigure>(8)"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:337
+#: dpkg-shlibdeps.1:335
 msgid "Copyright \\(co 2006 Frank Lichtenheld"
 msgstr ""
 
@@ -10559,18 +10854,18 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:10
+#: dpkg-source.1:9
 #, fuzzy
-msgid "B<dpkg-source> [I<options>] I<command>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<dpkg-source> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
-#: dpkg-source.1:14
+#: dpkg-source.1:13
 msgid "B<dpkg-source> packs and unpacks Debian source archives."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:18
+#: dpkg-source.1:17
 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 "
@@ -10578,13 +10873,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:20
+#: dpkg-source.1:19
 #, no-wrap
 msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:30
+#: dpkg-source.1:29
 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 "
@@ -10595,7 +10890,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:36
+#: dpkg-source.1:35
 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 "
@@ -10603,7 +10898,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:44
+#: dpkg-source.1:43
 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 "
@@ -10614,7 +10909,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:49
+#: dpkg-source.1:48
 msgid ""
 "If the source package uses a non-standard format (currently this means all "
 "formats except \"1.0\"), its name will be stored in B<debian/source/format> "
@@ -10623,13 +10918,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:50
+#: dpkg-source.1:49
 #, no-wrap
 msgid "B<-b> I<directory> [I<format-specific-parameters>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:57
+#: dpkg-source.1:56
 msgid ""
 "Build a source package. The first non-option argument is taken as the name "
 "of the directory containing the debianized source tree (i.e. with a debian "
@@ -10639,10 +10934,10 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:66
+#: dpkg-source.1:65
 msgid ""
 "B<dpkg-source> will build the source package with the first format found in "
-"this ordered list: the format indicated with the I<--format> command-line "
+"this ordered list: the format indicated with the I<--format> command line "
 "option, the format indicated in B<debian/source/format>, \"1.0\". The "
 "fallback to \"1.0\" is deprecated and will be removed at some point in the "
 "future, you should always document the desired source format in B<debian/"
@@ -10651,13 +10946,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:67
+#: dpkg-source.1:66
 #, fuzzy, no-wrap
 msgid "B<--print-format> I<directory>"
-msgstr "B<--admindir> I<diretrio>"
+msgstr "B<--admindir> I<diretório>"
 
 #. type: Plain text
-#: dpkg-source.1:72
+#: dpkg-source.1:71
 msgid ""
 "Print the source format that would be used to build the source package if "
 "B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -10665,46 +10960,60 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:73
+#: dpkg-source.1:72
 #, fuzzy, no-wrap
 msgid "B<--before-build> I<directory>"
-msgstr "B<--altdir> I<diretrio>"
+msgstr "B<--altdir> I<diretório>"
 
 #. type: Plain text
 #: dpkg-source.1:81
 msgid ""
-"This command should be called before any build of the package (B<dpkg-"
-"buildpackage> calls it very early even before B<debian/rules clean>). This "
-"command should be idempotent and can be called multiple times. Not all "
-"source formats implement something in this hook, and those that do usually "
-"prepare the source tree for the build for example by ensuring that the "
-"Debian patches are applied."
+"Run the corresponding hook of the source package format. This hook is called "
+"before any build of the package (B<dpkg-buildpackage> calls it very early "
+"even before B<debian/rules clean>). This command is idempotent and can be "
+"called multiple times. Not all source formats implement something in this "
+"hook, and those that do usually prepare the source tree for the build for "
+"example by ensuring that the Debian patches are applied."
 msgstr ""
 
 #. type: TP
 #: dpkg-source.1:82
 #, fuzzy, no-wrap
 msgid "B<--after-build> I<directory>"
-msgstr "B<--altdir> I<diretrio>"
+msgstr "B<--altdir> I<diretório>"
 
 #. type: Plain text
 #: dpkg-source.1:89
 msgid ""
-"This command should be called after any build of the package (B<dpkg-"
-"buildpackage> calls it last). This command should be idempotent and can be "
-"called multiple times. Not all source formats implement something in this "
-"hook, and those that do usually use it to undo what B<--before-build> has "
-"done."
+"Run the corresponding hook of the source package format. This hook is called "
+"after any build of the package (B<dpkg-buildpackage> calls it last). This "
+"command is idempotent and can be called multiple times. Not all source "
+"formats implement something in this hook, and those that do usually use it "
+"to undo what B<--before-build> has done."
+msgstr ""
+
+#. type: TP
+#: dpkg-source.1:90
+#, fuzzy, no-wrap
+msgid "B<--commit> [I<directory>] ..."
+msgstr "B<--admindir> I<diretório>"
+
+#. type: Plain text
+#: dpkg-source.1:95
+msgid ""
+"Record changes in the source tree unpacked in I<directory>. This command can "
+"take supplementary parameters depending on the source format.  It will error "
+"out for formats where this operation doesn't mean anything."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:97
+#: dpkg-source.1:103
 #, no-wrap
 msgid "GENERIC BUILD OPTIONS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 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 "
@@ -10712,7 +11021,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 msgid ""
 "Specifies the change log file to read information from. The default is "
 "B<debian/changelog>.  If given with relative pathname this is interpreted "
@@ -10720,20 +11029,20 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 #, fuzzy, no-wrap
 msgid "B<--format=>I<value>"
-msgstr "B<--abort-after=>I<nmero>"
+msgstr "B<--abort-after=>I<número>"
 
 #. type: Plain text
-#: dpkg-source.1:121
+#: dpkg-source.1:127
 msgid ""
 "Use the given format for building the source package. It does override any "
 "format given in B<debian/source/format>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:131
+#: dpkg-source.1:137
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is to not read "
 "any file. This option can be used multiple times to read substitution "
@@ -10741,13 +11050,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:137
+#: dpkg-source.1:143
 #, no-wrap
 msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 msgid ""
 "Specify the compression to use for created files (tarballs and diffs).  Note "
 "that this option will not cause existing tarballs to be recompressed, it "
@@ -10757,27 +11066,27 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 #, no-wrap
 msgid "B<-z>I<level>, B<--compression-level>=I<level>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 msgid ""
 "Compression level to use. As with B<-Z> it only affects newly created files. "
-"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  I<9> is the "
-"default."
+"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  The default is "
+"I<9> for gzip and bzip2, I<6> for xz and lzma."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 #, no-wrap
 msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:163
+#: dpkg-source.1:169
 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 "
@@ -10791,7 +11100,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 msgid ""
 "This is very helpful in cutting out extraneous files that get included in "
 "the diff, e.g. if you maintain your source in a revision control system and "
@@ -10805,29 +11114,29 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 #, no-wrap
 msgid "B<--extend-diff-ignore>=I<regexp>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 msgid ""
-"The perl regular expression specified will extend the default regular "
-"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
-"default regexp.  This option is convenient to use in B<debian/source/"
-"options> to exclude some auto-generated files from the automatic patch "
-"generation."
+"The perl regular expression specified will extend the default value of B<--"
+"diff-ignore> and its current value (if set). It does this by concatenating "
+"\"B<|>I<regexp>\" to the existing value.  This option is convenient to use "
+"in B<debian/source/options> to exclude some auto-generated files from the "
+"automatic patch generation."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 #, no-wrap
 msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:189
+#: dpkg-source.1:195
 msgid ""
 "If this option is specified, the pattern will be passed to B<tar>(1)'s --"
 "exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -10837,7 +11146,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:194
+#: dpkg-source.1:200
 msgid ""
 "B<-I> by itself adds default --exclude options that will filter out control "
 "files and directories of the most common revision control systems, backup "
@@ -10845,7 +11154,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:212
 msgid ""
 "B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
 "different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -10858,48 +11167,48 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 msgid ""
 "The default regexp and patterns for both options can be seen in the output "
 "of the B<--help> command."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 #, no-wrap
 msgid "GENERIC EXTRACT OPTIONS"
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:210
+#: dpkg-source.1:216
 #, fuzzy, no-wrap
 msgid "B<--no-copy>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 msgid "Do not copy original tarballs near the extracted source package."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 #, fuzzy, no-wrap
 msgid "B<--no-check>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 msgid "Do not check signatures and checksums before unpacking."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 #, no-wrap
 msgid "B<--require-valid-signature>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:224
+#: dpkg-source.1:230
 msgid ""
 "Refuse to unpack the source package if it doesn't contain an OpenPGP "
 "signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -10909,13 +11218,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:225
+#: dpkg-source.1:231
 #, fuzzy, no-wrap
 msgid "SOURCE PACKAGE FORMATS"
 msgstr "SINALIZADORES DOS PACOTES"
 
 #. type: Plain text
-#: dpkg-source.1:230
+#: dpkg-source.1:236
 msgid ""
 "If you don't know what source format to use, you should probably pick either "
 "\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
@@ -10923,13 +11232,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:231
+#: dpkg-source.1:237
 #, no-wrap
 msgid "Format: 1.0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:235
+#: dpkg-source.1:241
 msgid ""
 "A source package in this format consists either of a B<.orig.tar.gz> "
 "associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -10937,12 +11246,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:237 dpkg-source.1:405 dpkg-source.1:566 dpkg-source.1:605
+#: dpkg-source.1:243 dpkg-source.1:411 dpkg-source.1:586 dpkg-source.1:625
 msgid "B<Extracting>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:247
+#: dpkg-source.1:253
 msgid ""
 "Extracting a native package is a simple extraction of the single tarball in "
 "the target directory. Extracting a non-native package is done by first "
@@ -10955,12 +11264,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:249 dpkg-source.1:433 dpkg-source.1:577 dpkg-source.1:610
+#: dpkg-source.1:255 dpkg-source.1:439 dpkg-source.1:597 dpkg-source.1:630
 msgid "B<Building>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:255
+#: dpkg-source.1:261
 msgid ""
 "Building a native package is just creating a single tarball with the source "
 "directory. Building a non-native package involves extracting the original "
@@ -10969,13 +11278,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:256
+#: dpkg-source.1:262
 #, no-wrap
 msgid "B<Build options (with -b):>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:269
+#: dpkg-source.1:275
 msgid ""
 "If a second non-option argument is supplied it should be the name of the "
 "original source directory or tarfile or the empty string if the package is a "
@@ -10986,7 +11295,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 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<-"
@@ -10994,13 +11303,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 #, fuzzy, no-wrap
 msgid "B<-sk>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:290
 msgid ""
 "Specifies to expect the original source as a tarfile, by default "
 "I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>.  It will leave "
@@ -11010,24 +11319,24 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:284 dpkg-source.1:353
+#: dpkg-source.1:290 dpkg-source.1:359
 #, fuzzy, no-wrap
 msgid "B<-sp>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-source.1:289
+#: dpkg-source.1:295
 msgid "Like B<-sk> but will remove the directory again afterwards."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:289 dpkg-source.1:359
+#: dpkg-source.1:295 dpkg-source.1:365
 #, fuzzy, no-wrap
 msgid "B<-su>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 msgid ""
 "Specifies that 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 "
@@ -11035,24 +11344,24 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 #, fuzzy, no-wrap
 msgid "B<-sr>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 #, fuzzy, no-wrap
 msgid "B<-ss>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-source.1:310
+#: dpkg-source.1:316
 msgid ""
 "Specifies that the original source is available both as a directory and as a "
 "tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -11061,13 +11370,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:310 dpkg-source.1:362
+#: dpkg-source.1:316 dpkg-source.1:368
 #, fuzzy, no-wrap
 msgid "B<-sn>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 msgid ""
 "Specifies to not look for any original source, and to not generate a diff.  "
 "The second argument, if supplied, must be the empty string. This is used for "
@@ -11076,13 +11385,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 #, fuzzy, no-wrap
 msgid "B<-sa> or B<-sA>"
-msgstr "B<--list> I<ligao>"
+msgstr "B<--list> I<ligação>"
 
 #. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:348
 msgid ""
 "Specifies to 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 "
@@ -11098,13 +11407,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:342 dpkg-source.1:525
+#: dpkg-source.1:348 dpkg-source.1:541
 #, no-wrap
 msgid "B<--abort-on-upstream-changes>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:348
+#: dpkg-source.1:354
 msgid ""
 "The process fails if the generated diff contains changes to files outside of "
 "the debian sub-directory. This option is not allowed in B<debian/source/"
@@ -11112,18 +11421,18 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:349
+#: dpkg-source.1:355
 #, no-wrap
 msgid "B<Extract options (with -x):>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:353
+#: dpkg-source.1:359
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:359
+#: dpkg-source.1:365
 msgid ""
 "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 "
@@ -11132,12 +11441,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:362
+#: dpkg-source.1:368
 msgid "Unpacks the original source tree."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:367
+#: dpkg-source.1:373
 msgid ""
 "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 "
@@ -11145,31 +11454,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:372
+#: dpkg-source.1:378
 msgid ""
 "All the B<-s>I<X> options are mutually exclusive. If you specify more than "
 "one only the last one will be used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:372 dpkg-source.1:535
+#: dpkg-source.1:378 dpkg-source.1:555
 #, fuzzy, no-wrap
 msgid "B<--skip-debianization>"
 msgstr "B<dpkg-deb-actions>"
 
 #. type: Plain text
-#: dpkg-source.1:375
+#: dpkg-source.1:381
 msgid "Skips application of the debian diff on top of the upstream sources."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:376
+#: dpkg-source.1:382
 #, no-wrap
 msgid "Format: 2.0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:380
+#: dpkg-source.1:386
 msgid ""
 "Also known as wig&pen. This format is not recommended for wide-spread usage, "
 "the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -11177,7 +11486,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:385
+#: dpkg-source.1:391
 msgid ""
 "The behaviour of this format is the same as the \"3.0 (quilt)\" format "
 "except that it doesn't use an explicit list of patches. All files in "
@@ -11186,20 +11495,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:388
+#: dpkg-source.1:394
 msgid ""
 "When building a new source package, any change to the upstream source is "
 "stored in a patch named B<zz_debian-diff-auto>."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:389
+#: dpkg-source.1:395
 #, no-wrap
 msgid "Format: 3.0 (native)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:395
+#: dpkg-source.1:401
 msgid ""
 "This format is an extension of the native package format as defined in the "
 "1.0 format. It supports all compression methods and will ignore by default "
@@ -11208,13 +11517,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:396
+#: dpkg-source.1:402
 #, no-wrap
 msgid "Format: 3.0 (quilt)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:409
 msgid ""
 "A source package in this format contains at least an original tarball (B<."
 "orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -11224,7 +11533,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:414
+#: dpkg-source.1:420
 msgid ""
 "The main original tarball is extracted first, then all additional original "
 "tarballs are extracted in subdirectories named after the I<component> part "
@@ -11236,7 +11545,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:432
 msgid ""
 "All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
 "series> are then applied.  If the former file is used and the latter one "
@@ -11251,36 +11560,37 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:428
+#: dpkg-source.1:434
 msgid ""
 "Similarly to quilt's default behaviour, the patches can remove files too."
 msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:431
+#: dpkg-source.1:437
 msgid ""
 "The file B<.pc/applied-patches> is created if some patches have been applied "
 "during the extraction."
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:443
+#: dpkg-source.1:451
 msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
 "except the automatic patch (B<debian-changes->I<version> or B<debian-"
 "changes>, depending on B<--single-debian-patch>) are applied. The temporary "
-"directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in the automatic patch.  If the automatic patch is created/"
-"deleted, it's added/removed from the series file and from the quilt metadata."
+"directory is compared to the source package directory. When the diff is non-"
+"empty, the build fails unless B<--single-debian-patch> or B<--auto-commit> "
+"has been used, in which case the diff is stored in the automatic patch.  If "
+"the automatic patch is created/deleted, it's added/removed from the series "
+"file and from the quilt metadata."
 msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:451
+#: dpkg-source.1:459
 msgid ""
 "Any change on a binary file is not representable in a diff and will thus "
 "lead to a failure unless the maintainer deliberately decided to include that "
@@ -11291,14 +11601,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:454
+#: dpkg-source.1:462
 msgid ""
 "The updated debian directory and the list of modified binaries is then used "
 "to generate the debian tarball."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:460
+#: dpkg-source.1:468
 msgid ""
 "The automatically generated diff doesn't include changes on VCS specific "
 "files as well as many temporary files (see default value associated to B<-i> "
@@ -11307,36 +11617,54 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:477
+msgid ""
+"Note: B<dpkg-source> B<--before-build> (and B<-b>) will ensure that all "
+"patches listed in the series file are applied so that a package build always "
+"has all patches applied. It does this by finding unapplied patches (they are "
+"listed in the B<series> file but not in B<.pc/applied-patches>), and if the "
+"first patch in that set can be applied without errors, it will apply them "
+"all. The option B<--no-preparation> can be used to disable this behavior."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:480
+msgid "B<Recording changes>"
+msgstr ""
+
+#. type: TP
+#: dpkg-source.1:480
+#, fuzzy, no-wrap
+msgid "B<--commit> [I<directory>] [I<patch-name>] [I<patch-file>]"
+msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
+
+#. type: Plain text
+#: dpkg-source.1:490
 msgid ""
-"Note: B<dpkg-source> expects the source tree to have all patches listed in "
-"the series file applied when you generate the source package.  This is not "
-"the case when the source tree has been obtained by unpacking a source "
-"package using the Format: 1.0 for instance. To mitigate the problem, B<dpkg-"
-"source> will apply the patches by itself if it believes that they have not "
-"yet been applied. To detect this situation, it uses the following heuristic: "
-"it finds the list of supposedly unapplied patches (they are listed in the "
-"B<series> file but not in B<.pc/applied-patches>), and if the first patch in "
-"that set can be applied without errors, it will apply them all.  The option "
-"B<--no-preparation> can be used to disable this behaviour. This operation is "
-"usually done as part of the B<--prepare-build> command."
+"Generates a patch corresponding to the local changes that are not managed by "
+"the quilt patch system and integrates it in the patch system under the name "
+"I<patch-name>. If the name is missing, it will be asked interactively. If "
+"I<patch-file> is given, it is used as the patch corresponding to the local "
+"changes to integrate. This is mainly useful after a build failure that pre-"
+"generated this file. Once integrated, an editor is launched so that you can "
+"edit the meta-information in the patch header."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:476 dpkg-source.1:547 dpkg-source.1:586
+#: dpkg-source.1:493 dpkg-source.1:567 dpkg-source.1:606
 #, fuzzy
 msgid "B<Build options>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: TP
-#: dpkg-source.1:476
+#: dpkg-source.1:493
 #, fuzzy, no-wrap
 msgid "B<--allow-version-of-quilt-db=>I<version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 msgid ""
 "Allow B<dpkg-source> to build the source package if the version of the quilt "
 "metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -11346,37 +11674,37 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 #, fuzzy, no-wrap
 msgid "B<--include-removal>"
 msgstr "B<dpkg --clear-avail>"
 
 #. type: Plain text
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 msgid ""
 "Do not ignore removed files and include them in the automatically generated "
 "patch."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 #, no-wrap
 msgid "B<--include-timestamp>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 msgid "Include timestamp in the automatically generated patch."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 #, fuzzy, no-wrap
 msgid "B<--include-binaries>"
 msgstr "B<config-files>"
 
 #. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 msgid ""
 "Add all modified binaries in the debian tarball. Also add them to B<debian/"
 "source/include-binaries>: they will be added by default in subsequent builds "
@@ -11384,45 +11712,45 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 #, fuzzy, no-wrap
 msgid "B<--no-preparation>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 msgid ""
 "Do not try to prepare the build tree by applying patches which are "
 "apparently unapplied."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 #, fuzzy, no-wrap
 msgid "B<--single-debian-patch>"
 msgstr "B<dpkg-deb-actions>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 msgid ""
 "Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
 "changes->I<version> for the name of the automatic patch generated during "
 "build. This option is particularly useful when the package is maintained in "
 "a VCS and a patch set can't reliably be generated. Instead the current diff "
-"with upstream should be stored in a single patch. When using this option, it "
-"is recommended to create a debian/source/patch-header file explaining how "
-"the Debian changes can be best reviewed, for example in the VCS that is used."
+"with upstream should be stored in a single patch. The option would be put in "
+"B<debian/source/local-options> and would be accompanied by a B<debian/source/"
+"local-patch-header> file explaining how the Debian changes can be best "
+"reviewed, for example in the VCS that is used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 #, no-wrap
 msgid "B<--create-empty-orig>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 msgid ""
 "Automatically create the main original tarball as empty if it's missing and "
 "if there are supplementary original tarballs. This option is meant to be "
@@ -11431,24 +11759,23 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 #, fuzzy, no-wrap
 msgid "B<--unapply-patches>"
 msgstr "B<--test>"
 
 #. type: Plain text
-#: dpkg-source.1:525
+#: dpkg-source.1:541
 msgid ""
-"Unapply the patches in the B<--after-build> hook. This is mainly useful when "
-"you build your package directly in a VCS that contains unpatched upstream "
-"source and where you want to keep the tree unpatched even after a package "
-"build. This option is usually put in B<debian/source/local-options> (it's "
-"not allowed in B<debian/source/options> so that all generated source "
-"packages have the same behaviour by default)."
+"Unapply the patches in the B<--after-build> hook. You usually don't need "
+"this option as dpkg-source will automatically unapply the patches if it did "
+"apply them during B<--before-build>. This option is only allowed in B<debian/"
+"source/local-options> so that all generated source packages have the same "
+"behavior by default."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:548
 msgid ""
 "The process fails if an automatic patch has been generated. This option can "
 "be used to ensure that all changes were properly recorded in separate quilt "
@@ -11456,56 +11783,69 @@
 "B<debian/source/options> but can be used in B<debian/source/local-options>."
 msgstr ""
 
+#. type: TP
+#: dpkg-source.1:548
+#, fuzzy, no-wrap
+msgid "B<--auto-commit>"
+msgstr "B<--nocheck>"
+
+#. type: Plain text
+#: dpkg-source.1:552
+msgid ""
+"The process doesn't fail if an automatic patch has been generated, instead "
+"it's immediately recorded in the quilt series."
+msgstr ""
+
 #. type: Plain text
-#: dpkg-source.1:535
+#: dpkg-source.1:555
 msgid "B<Extract options>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 msgid "Skips extraction of the debian tarball on top of the upstream sources."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 #, fuzzy, no-wrap
 msgid "B<--skip-patches>"
 msgstr "B<--test>"
 
 #. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:561
 msgid "Do not apply patches at the end of the extraction."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:542
+#: dpkg-source.1:562
 #, no-wrap
 msgid "Format: 3.0 (custom)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:545
+#: dpkg-source.1:565
 msgid ""
-"This format is particular. It doesn't represent a real source package format "
+"This format is special. It doesn't represent a real source package format "
 "but can be used to create source packages with arbitrary files."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 msgid ""
 "All non-option arguments are taken as files to integrate in the generated "
-"source package. They must exist and are preferrably in the current "
-"directory. At least one file must be given."
+"source package. They must exist and are preferably in the current directory. "
+"At least one file must be given."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 #, fuzzy, no-wrap
 msgid "B<--target-format=>I<value>"
-msgstr "B<--abort-after=>I<nmero>"
+msgstr "B<--abort-after=>I<número>"
 
 #. type: Plain text
-#: dpkg-source.1:556
+#: dpkg-source.1:576
 msgid ""
 "B<Required>. Defines the real format of the generated source package.  The "
 "generated .dsc file will contain this value in its I<Format> field and not "
@@ -11513,18 +11853,18 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:557
+#: dpkg-source.1:577
 #, no-wrap
 msgid "Format: 3.0 (git)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:579
 msgid "This format is experimental."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:564
+#: dpkg-source.1:584
 msgid ""
 "A source package in this format consists of a single bundle of a git "
 "repository B<.git> to hold the source of a package.  There may also be a B<."
@@ -11532,7 +11872,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:570
+#: dpkg-source.1:590
 msgid ""
 "The bundle is cloned as a git repository to the target directory.  If there "
 "is a gitshallow file, it is installed as `.git/shallow` inside the cloned "
@@ -11540,36 +11880,36 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:575
+#: dpkg-source.1:595
 msgid ""
 "Note that by default the new repository will have the same branch checked "
 "out that was checked out in the original source. (Typically \"master\", but "
-"it could be anything.) Any other branches will be available, under as "
-"`remotes/origin/`"
+"it could be anything.) Any other branches will be available under `remotes/"
+"origin/`."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:580 dpkg-source.1:613
+#: dpkg-source.1:600 dpkg-source.1:633
 msgid ""
 "Before going any further, some checks are done to ensure that we don't have "
 "any non-ignored uncommitted changes."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:584
+#: dpkg-source.1:604
 msgid ""
 "B<git-bundle>(1) is used to generate a bundle of the git repository.  By "
 "default, all branches and tags in the repository are included in the bundle."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:586
+#: dpkg-source.1:606
 #, fuzzy, no-wrap
 msgid "B<--git-ref=>I<ref>"
-msgstr "B<--abort-after=>I<nmero>"
+msgstr "B<--abort-after=>I<número>"
 
 #. type: Plain text
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 msgid ""
 "Allows specifying a git ref to include in the git bundle. Use disables the "
 "default behavior of including all branches and tags. May be specified "
@@ -11581,40 +11921,40 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 #, fuzzy, no-wrap
 #| msgid "B<--abort-after=>I<number>"
 msgid "B<--git-depth=>I<number>"
-msgstr "B<--abort-after=>I<nmero>"
+msgstr "B<--abort-after=>I<número>"
 
 #. type: Plain text
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 msgid ""
 "Creates a shallow clone with a history truncated to the specified number of "
 "revisions."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 #, no-wrap
 msgid "Format: 3.0 (bzr)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:603
+#: dpkg-source.1:623
 msgid ""
 "This format is experimental. It generates a single tarball containing the "
 "bzr repository."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:608
+#: dpkg-source.1:628
 msgid ""
 "The tarball is unpacked and then bzr is used to checkout the current branch."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 msgid ""
 "Then the VCS specific part of the source directory is copied over to a "
 "temporary directory. Before this temporary directory is packed in a tarball, "
@@ -11622,19 +11962,19 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 #, no-wrap
 msgid "WARNINGS AND ERRORS"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:618
+#: dpkg-source.1:638
 #, no-wrap
 msgid "no source format specified in debian/source/format"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:624
+#: dpkg-source.1:644
 msgid ""
 "The file B<debian/source/format> should always exist and indicate the "
 "desired source format. For backwards compatibility, format \"1.0\" is "
@@ -11644,7 +11984,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 msgid ""
 "The rationale is that format \"1.0\" is no longer the recommended format, "
 "you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
@@ -11654,13 +11994,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 #, no-wrap
 msgid "the diff modifies the following upstream files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 msgid ""
 "When using source format \"1.0\" it is usually a bad idea to modify upstream "
 "files directly as the changes end up hidden and mostly undocumented in the ."
@@ -11670,13 +12010,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 #, no-wrap
 msgid "cannot represent change to I<file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 msgid ""
 "Changes to upstream sources are usually stored with patch files, but not all "
 "changes can be represented with patches: they can only alter the content of "
@@ -11686,51 +12026,51 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 #, no-wrap
 msgid "newly created empty file I<file> will not be represented in diff"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 msgid ""
 "Empty files can't be created with patch files. Thus this change is not "
 "recorded in the source package and you are warned about it."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 #, no-wrap
 msgid "executable mode I<perms> of I<file> will not be represented in diff"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:647
+#: dpkg-source.1:667
 #, no-wrap
 msgid "special mode I<perms> of I<file> will not be represented in diff"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 msgid ""
 "Patch files do not record permissions of files and thus modified permissions "
 "are not stored in the source package. This warning reminds you of that fact."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 #, no-wrap
 msgid "FILE FORMATS"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:652
+#: dpkg-source.1:672
 #, no-wrap
 msgid "debian/source/format"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 msgid ""
 "This file contains on a single line the format that should be used to build "
 "the source package (possible formats are described above). No leading or "
@@ -11738,13 +12078,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 #, fuzzy, no-wrap
 msgid "debian/source/include-binaries"
 msgstr "B<config-files>"
 
 #. type: Plain text
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 msgid ""
 "This file contains a list of binary files (one per line) that should be "
 "included in the debian tarball. Leading and trailing spaces are stripped.  "
@@ -11753,13 +12093,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 #, fuzzy, no-wrap
 msgid "debian/source/options"
 msgstr "B<config-files>"
 
 #. type: Plain text
-#: dpkg-source.1:666
+#: dpkg-source.1:686
 msgid ""
 "This file contains a list of long options that should be automatically "
 "prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -11768,7 +12108,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:672
+#: dpkg-source.1:692
 msgid ""
 "Each option should be put on a separate line. Empty lines and lines starting "
 "with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -11777,9 +12117,8 @@
 "a file:"
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:678
+#: dpkg-source.1:700
 #, no-wrap
 msgid ""
 "  # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -11787,23 +12126,25 @@
 "  compression-level = 9\n"
 "  # use debian/patches/debian-changes as automatic patch\n"
 "  single-debian-patch\n"
+"  # ignore changes on config.{sub,guess}\n"
+"  extend-diff-ignore = \"(^|/)(config.sub|config.guess)$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 msgid ""
 "Note: B<format> options are not accepted in this file, you should use "
 "B<debian/source/format> instead."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 #, fuzzy, no-wrap
 msgid "debian/source/local-options"
 msgstr "B<config-files>"
 
 #. type: Plain text
-#: dpkg-source.1:686
+#: dpkg-source.1:708
 msgid ""
 "Exactly like B<debian/source/options> except that the file is not included "
 "in the generated source package. It can be useful to store a preference tied "
@@ -11812,27 +12153,33 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:686
+#: dpkg-source.1:708
+#, fuzzy, no-wrap
+msgid "debian/source/local-patch-header"
+msgstr "B<config-files>"
+
+#. type: SS
+#: dpkg-source.1:709
 #, fuzzy, no-wrap
 msgid "debian/source/patch-header"
 msgstr "B<config-files>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 msgid ""
 "Free form text that is put on top of the automatic patch generated in "
-"formats \"2.0\" or \"3.0 (quilt)\"."
+"formats \"2.0\" or \"3.0 (quilt)\". B<local-patch-header> is not included in "
+"the generated source package while B<patch-header> is."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 #, no-wrap
 msgid "debian/patches/series"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:698
+#: dpkg-source.1:722
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
@@ -11845,38 +12192,37 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:705
+#: dpkg-source.1:729
 #, fuzzy
 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:736
+msgid "Copyright \\(co 2008-2011 Rapha\\[:e]l Hertzog"
+msgstr ""
+
 #. type: TH
 #: dpkg-split.1:2
 #, fuzzy, no-wrap
 msgid "dpkg-split"
 msgstr "dpkg suite"
 
-#. type: TH
-#: dpkg-split.1:2 dpkg-statoverride.8:1
-#, fuzzy, no-wrap
-msgid "2009-06-26"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: dpkg-split.1:5
 msgid "dpkg-split - Debian package archive split/join tool"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:10
+#: dpkg-split.1:9
 #, fuzzy
-msgid "B<dpkg-split> [I<options>] I<command>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<dpkg-split> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
-#: dpkg-split.1:16
+#: dpkg-split.1:15
 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 "
@@ -11884,14 +12230,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:20
+#: dpkg-split.1:19
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:28
+#: dpkg-split.1:27
 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 "
@@ -11900,25 +12246,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:31
+#: dpkg-split.1:30
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:33
+#: dpkg-split.1:32
 #, no-wrap
 msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:36
+#: dpkg-split.1:35
 msgid "Splits a single Debian binary package into several parts."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:44
+#: dpkg-split.1:43
 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 "
@@ -11926,27 +12272,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 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:52
+#: dpkg-split.1:51
 #, fuzzy, no-wrap
 msgid "B<-j>, B<--join> I<part>..."
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 #. type: Plain text
-#: dpkg-split.1:56
+#: dpkg-split.1:55
 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:60
+#: dpkg-split.1:59
 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 "
@@ -11954,7 +12300,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:65
+#: dpkg-split.1:64
 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 "
@@ -11962,23 +12308,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:67
+#: dpkg-split.1:66
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:70
-msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
+#: dpkg-split.1:69
+msgid ""
+"By default the output file is called I<package>B<_>I<version>B<_>I<arch>B<."
+"deb>."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:71
+#: dpkg-split.1:70
 #, 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:76
+#: dpkg-split.1:75
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -11986,25 +12334,25 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 #, no-wrap
 msgid "B<-a>, B<--auto -o> I<complete-output part>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:79
+#: dpkg-split.1:78
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:84
+#: dpkg-split.1:83
 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:91
+#: dpkg-split.1:90
 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 "
@@ -12012,21 +12360,22 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:97
+#: dpkg-split.1:96
 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:104
+#: dpkg-split.1:103
 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."
+"with status B<1>; if some other trouble occurs then it will exit with status "
+"B<2>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 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 "
@@ -12034,18 +12383,18 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 #, fuzzy, no-wrap
 msgid "B<-l>, B<--listq>"
 msgstr "B<--new> | B<--old>"
 
 #. type: Plain text
-#: dpkg-split.1:114
+#: dpkg-split.1:113
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 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 "
@@ -12053,77 +12402,77 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 #, fuzzy, no-wrap
 msgid "B<-d>, B<--discard> [I<package>...]"
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 #. type: Plain text
-#: dpkg-split.1:122
+#: dpkg-split.1:121
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:126
 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: TP
-#: dpkg-split.1:135
+#: dpkg-split.1:134
 #, fuzzy, no-wrap
 msgid "B<--depotdir>I< directory>"
-msgstr "B<--altdir> I<diretrio>"
+msgstr "B<--altdir> I<diretório>"
 
 #. type: Plain text
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 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:140
+#: dpkg-split.1:139
 #, fuzzy, no-wrap
 msgid "B<-S>, B<--partsize> I<kibibytes>"
 msgstr "B<--test>"
 
 #. type: Plain text
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 msgid ""
 "Specifies the maximum part size when splitting, in kibibytes (1024 bytes). "
 "The default is 450 KiB."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 #, no-wrap
 msgid "B<-o>, B<--output> I<complete-output>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:147
+#: dpkg-split.1:146
 msgid "Specifies the output file name for a reassembly."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:152
+#: dpkg-split.1:151
 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:152
+#: dpkg-split.1:151
 #, fuzzy, no-wrap
 msgid "B<-Q>, B<--npquiet>"
 msgstr "B<--quiet>"
 
 #. type: Plain text
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 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 "
@@ -12132,19 +12481,19 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 #, fuzzy, no-wrap
 msgid "B<--msdos>"
 msgstr "B<--verbose>"
 
 #. type: Plain text
-#: dpkg-split.1:168
+#: dpkg-split.1:167
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:174
+#: dpkg-split.1:173
 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 "
@@ -12152,7 +12501,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:179
+#: dpkg-split.1:178
 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."
@@ -12161,69 +12510,59 @@
 #. type: Plain text
 #: dpkg-split.1:186
 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."
+"The requested split, merge, or other command succeeded.  B<--info> commands "
+"count as successful even if the files are not binary package parts."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:192
+#: dpkg-split.1:193
 msgid ""
-"An exit status of 1 occurs only with B<--auto> and indicates that the "
-"I<part> file was not a binary package part."
+"Only occurs with B<--auto> and indicates that the I<part> file was not a "
+"binary package part."
 msgstr ""
 
-#. type: Plain text
-#: dpkg-split.1:196
-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."
+#. type: TP
+#: dpkg-split.1:193 start-stop-daemon.8:275 update-alternatives.8:378
+#, no-wrap
+msgid "B<2>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:201
+#: dpkg-split.1:198
 msgid ""
-"B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
-"of Debian packages."
+"Some kind of trouble happened, 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 ""
 
 #. type: Plain text
-#: dpkg-split.1:204
+#: dpkg-split.1:202
 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:207
+#: dpkg-split.1:205
 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:211
-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 ""
-
 #. type: TP
-#: dpkg-split.1:213
+#: dpkg-split.1:207
 #, fuzzy, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "I</var/lib/dpkg/status>"
 
 #. type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:211
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:222
+#: dpkg-split.1:216
 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 "
@@ -12231,7 +12570,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:222
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr ""
 
@@ -12253,13 +12592,13 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:9
+#: dpkg-statoverride.8:8
 #, fuzzy
-msgid "B<dpkg-statoverride> [I<options>] I<command>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<dpkg-statoverride> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:19
+#: dpkg-statoverride.8:18
 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' "
@@ -12270,20 +12609,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:23
+#: dpkg-statoverride.8:22
 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:25
+#: dpkg-statoverride.8:24
 #, no-wrap
 msgid "B<--add>I< user group mode file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:33
+#: dpkg-statoverride.8:32
 msgid ""
 "Add an override for I<file>. I<file> does not need to exist when this "
 "command is used; the override will be stored and used later.  Users and "
@@ -12293,27 +12632,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:36
+#: dpkg-statoverride.8:35
 msgid ""
 "If --update is specified and I<file> exists, it is immediately set to the "
 "new owner and mode."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 msgid ""
 "Remove an override for I<file>, the status of I<file> is left unchanged by "
 "this command."
 msgstr ""
 
 #. type: TP
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 #, fuzzy, no-wrap
 msgid "B<--list> [I<glob-pattern>]"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:45
+#: 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 "
@@ -12321,50 +12660,50 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:56
 msgid ""
 "Change the I<directory> of the dpkg database where the statoverride file is "
 "also stored. Defaults to I</var/lib/dpkg>."
 msgstr ""
 
 #. type: TP
-#: dpkg-statoverride.8:57 update-alternatives.8:337
+#: dpkg-statoverride.8:56 update-alternatives.8:336
 #, fuzzy, no-wrap
 msgid "B<--force>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:61
+#: 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:61
+#: dpkg-statoverride.8:60
 #, fuzzy, no-wrap
 msgid "B<--update>"
 msgstr "B<--test>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:65
+#: 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:68
+#: dpkg-statoverride.8:67
 msgid "Be less verbose about what we do."
 msgstr ""
 
 #. type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:75
 #, 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:80
 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 "
@@ -12372,7 +12711,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:83
 msgid ""
 "Note: B<dpkg-statoverride> preserves the old copy of this file, with "
 "extension \"-old\", before replacing it with the new one."
@@ -12393,13 +12732,13 @@
 #: dpkg-trigger.1:8
 #, fuzzy
 msgid "B<dpkg-trigger> [I<option>...] I<trigger-name>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-trigger.1:11
 #, fuzzy
 msgid "B<dpkg-trigger> [I<option>...] I<command>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 # type: Plain text
 #. type: Plain text
@@ -12434,9 +12773,9 @@
 #: dpkg-trigger.1:31
 msgid ""
 "Check if the running B<dpkg> supports triggers (usually called from a "
-"postinst). Will exit 0 if a triggers-capable B<dpkg> has run, or 1 with an "
-"error message to stderr if not. Normally, however, it is better just to "
-"activate the desired trigger with B<dpkg-trigger>."
+"postinst). Will exit B<0> if a triggers-capable B<dpkg> has run, or B<1> "
+"with an error message to stderr if not. Normally, however, it is better just "
+"to activate the desired trigger with B<dpkg-trigger>."
 msgstr ""
 
 #. type: TP
@@ -12449,7 +12788,7 @@
 #: dpkg-trigger.1:49
 msgid ""
 "Override trigger awaiter (normally set by B<dpkg> through the "
-"DPKG_MAINTSCRIPT_PACKAGE environment variable of the maintainer scripts, "
+"B<DPKG_MAINTSCRIPT_PACKAGE> environment variable of the maintainer scripts, "
 "naming the package to which the script belongs, and this will be used by "
 "default)."
 msgstr ""
@@ -12481,7 +12820,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-trigger.1:68
+#: dpkg-trigger.1:69
 #, fuzzy
 msgid ""
 "B<dpkg>(1), B<deb-triggers>(5), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
@@ -12493,12 +12832,6 @@
 msgid "dpkg-vendor"
 msgstr "I<control>"
 
-#. type: TH
-#: dpkg-vendor.1:1
-#, fuzzy, no-wrap
-msgid "2009-05-10"
-msgstr "2006-04-09"
-
 #. type: Plain text
 #: dpkg-vendor.1:4
 msgid "dpkg-vendor - queries information about distribution vendors"
@@ -12508,7 +12841,7 @@
 #: dpkg-vendor.1:8
 #, fuzzy
 msgid "B<dpkg-vendor> [I<option>...] I<command>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
 #: dpkg-vendor.1:13
@@ -12522,12 +12855,12 @@
 #: dpkg-vendor.1:15
 #, fuzzy, no-wrap
 msgid "B<--is>I< vendor>"
-msgstr "B<--admindir> I<diretrio>"
+msgstr "B<--admindir> I<diretório>"
 
 #. type: Plain text
 #: dpkg-vendor.1:19
 msgid ""
-"Exits with 0 if the current vendor is I<vendor>. Otherwise exits with non-"
+"Exits with B<0> if the current vendor is I<vendor>. Otherwise exits with non-"
 "zero."
 msgstr ""
 
@@ -12540,7 +12873,7 @@
 #. type: Plain text
 #: dpkg-vendor.1:24
 msgid ""
-"Exits with 0 if the current vendor distribution is a derivative of "
+"Exits with B<0> if the current vendor distribution is a derivative of "
 "I<vendor>, otherwise exits with non-zero. It uses the \"Parent\" field to "
 "browse all ancestors of the current vendor."
 msgstr ""
@@ -12549,7 +12882,7 @@
 #: dpkg-vendor.1:24
 #, fuzzy, no-wrap
 msgid "B<--query>I< field>"
-msgstr "B<--auto> I<ligao>"
+msgstr "B<--auto> I<ligação>"
 
 #. type: Plain text
 #: dpkg-vendor.1:28
@@ -12568,7 +12901,7 @@
 #: dpkg-vendor.1:41
 msgid ""
 "Assumes the current vendor is I<vendor> instead of discovering it with the "
-"DEB_VENDOR environment variable or B</etc/dpkg/origins/default>."
+"B<DEB_VENDOR> environment variable or B</etc/dpkg/origins/default>."
 msgstr ""
 
 #. type: TP
@@ -12585,7 +12918,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-vendor.1:50 update-alternatives.8:497
+#: dpkg-vendor.1:50 update-alternatives.8:498
 msgid "Copyright \\(co 2009 Rapha\\[:e]l Hertzog"
 msgstr ""
 
@@ -12601,16 +12934,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:16
-msgid ""
-"B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--version>] "
-"[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 ""
+#: dselect.1:8
+#, fuzzy
+#| msgid "B<dpkg> [I<options>] I<action>"
+msgid "B<dselect> [I<option>...] [I<action>]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
-#: dselect.1:25
+#: dselect.1:17
 #, no-wrap
 msgid ""
 "B<dselect>\n"
@@ -12623,7 +12954,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:37
+#: dselect.1:29
 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 "
@@ -12637,38 +12968,32 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:43
+#: dselect.1:35
 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 "
+"argument, then that action is started immediately. Several command line "
 "parameters are still available to modify the running behaviour of B<dselect> "
 "or show additional information about the program."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:51
+#: dselect.1:43
 #, fuzzy
 msgid ""
-"All options can be specified both on the commandline and in the B<dselect> "
+"All options can be specified both on the command line and in the B<dselect> "
 "configuration file I</etc/dpkg/dselect.cfg> or the files on the "
-"configuration directory I</etc/dpkg/dpkg.cfg.d/>. Each line in the "
-"configuration file is either an option (exactly the same as the commandline "
+"configuration directory I</etc/dpkg/dselect.cfg.d/>. 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 opes podem ser especificadas tanto na linha de comando quanto no "
-"arquivo de configurao do B<dpkg> chamado I</etc/dpkg/dpkg.cfg>. Cada linha "
-"no arquivo de configurao  uma opo (exatamente a mesma opo da linha de "
-"comando, mas sem os hfens)  ou um comentrio (se comear com uma B<#>)."
-
-#. type: TP
-#: dselect.1:52
-#, fuzzy, no-wrap
-msgid "B<--admindir>I< E<lt>directoryE<gt>>"
-msgstr "B<--admindir> I<diretrio>"
+"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: Plain text
-#: dselect.1:57
+#: dselect.1:49
 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 "
@@ -12676,36 +13001,36 @@
 msgstr ""
 
 #. type: TP
-#: dselect.1:57
-#, no-wrap
-msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
-msgstr ""
+#: dselect.1:49
+#, fuzzy, no-wrap
+msgid "B<--debug>I< file >|I< >B<-D>I<file>"
+msgstr "B<--new> | B<--old>"
 
 #. type: Plain text
-#: dselect.1:60
-msgid "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+#: dselect.1:52
+msgid "Turn on debugging. Debugging information is sent to I<file>."
 msgstr ""
 
 #. type: TP
-#: dselect.1:60
+#: dselect.1:52
 #, fuzzy, no-wrap
 msgid "B<--expert>"
 msgstr "B<--test>"
 
 #. type: Plain text
-#: dselect.1:64
+#: dselect.1:56
 msgid ""
 "Turns on expert mode, i.e. doesn't display possibly annoying help messages."
 msgstr ""
 
 #. type: TP
-#: dselect.1:64
+#: dselect.1:56
 #, no-wrap
 msgid "B<--colour>|B<--color> I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:71
+#: dselect.1:63
 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>). "
@@ -12714,146 +13039,146 @@
 msgstr ""
 
 #. type: TP
-#: dselect.1:72
+#: dselect.1:64
 #, fuzzy, no-wrap
 msgid "B<title>"
 msgstr "B<installed>"
 
 #. type: Plain text
-#: dselect.1:75
+#: dselect.1:67
 msgid "The screen title."
 msgstr ""
 
 #. type: TP
-#: dselect.1:75
+#: dselect.1:67
 #, fuzzy, no-wrap
 msgid "B<listhead>"
 msgstr "B<installed>"
 
 #. type: Plain text
-#: dselect.1:78
+#: dselect.1:70
 #, fuzzy
 msgid "The header line above the list of packages."
-msgstr "Para procurar na lista de pacotes voc mesmo:"
+msgstr "Para procurar na lista de pacotes você mesmo:"
 
 #. type: TP
-#: dselect.1:78
+#: dselect.1:70
 #, fuzzy, no-wrap
 msgid "B<list>"
 msgstr "B<install>"
 
 #. type: Plain text
-#: dselect.1:81
+#: dselect.1:73
 msgid "The scrolling list of packages (and also some help text)."
 msgstr ""
 
 #. type: TP
-#: dselect.1:81
+#: dselect.1:73
 #, fuzzy, no-wrap
 msgid "B<listsel>"
 msgstr "B<install>"
 
 #. type: Plain text
-#: dselect.1:84
+#: dselect.1:76
 msgid "The selected item in the list."
 msgstr ""
 
 #. type: TP
-#: dselect.1:84
+#: dselect.1:76
 #, fuzzy, no-wrap
 msgid "B<pkgstate>"
 msgstr "B<purge>"
 
 #. type: Plain text
-#: dselect.1:88
+#: dselect.1:80
 msgid ""
 "In the list of packages, the text indicating the current state of each "
 "package."
 msgstr ""
 
 #. type: TP
-#: dselect.1:88
+#: dselect.1:80
 #, no-wrap
 msgid "B<pkgstatesel>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:92
+#: dselect.1:84
 msgid ""
 "In the list of packages, the text indicating the current state of the "
 "currently selected package."
 msgstr ""
 
 #. type: TP
-#: dselect.1:92
+#: dselect.1:84
 #, fuzzy, no-wrap
 msgid "B<infohead>"
 msgstr "B<installed>"
 
 #. type: Plain text
-#: dselect.1:95
+#: dselect.1:87
 msgid ""
 "The header line that displays the state of the currently selected package."
 msgstr ""
 
 #. type: TP
-#: dselect.1:95
+#: dselect.1:87
 #, fuzzy, no-wrap
 msgid "B<infodesc>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dselect.1:98
+#: dselect.1:90
 #, fuzzy
 msgid "The package's short description."
-msgstr "O pacote est selecionado para instalao."
+msgstr "O pacote está selecionado para instalação."
 
 #. type: TP
-#: dselect.1:98
+#: dselect.1:90
 #, no-wrap
 msgid "B<info>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:101
+#: dselect.1:93
 msgid "Used to display package info such as the package's description."
 msgstr ""
 
 #. type: TP
-#: dselect.1:101
+#: dselect.1:93
 #, no-wrap
 msgid "B<infofoot>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:104
+#: dselect.1:96
 msgid "The last line of the screen when selecting packages."
 msgstr ""
 
 #. type: TP
-#: dselect.1:104
+#: dselect.1:96
 #, fuzzy, no-wrap
 msgid "B<query>"
 msgstr "B<--quiet>"
 
 #. type: Plain text
-#: dselect.1:107
+#: dselect.1:99
 msgid "Used to display query lines"
 msgstr ""
 
 #. type: TP
-#: dselect.1:107
+#: dselect.1:99
 #, fuzzy, no-wrap
 msgid "B<helpscreen>"
 msgstr "B<--help>"
 
 #. type: Plain text
-#: dselect.1:110
+#: dselect.1:102
 msgid "Color of help screens."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:115
+#: dselect.1:107
 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, "
@@ -12861,7 +13186,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:121
+#: dselect.1:113
 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 "
@@ -12871,67 +13196,62 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:124
+#: dselect.1:116
 msgid "Print a brief help text and exit successfully."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:127
+#: dselect.1:119
 msgid "Print version information and exit successfully."
 msgstr ""
 
-#. type: SH
-#: dselect.1:128
-#, no-wrap
-msgid "USAGE"
-msgstr ""
-
 #. type: Plain text
-#: dselect.1:133
+#: dselect.1:126
 msgid ""
-"When B<dselect> is started interactively, it prompts the user with a menu of "
-"available actions:"
+"When B<dselect> is started it can perform the following actions, either "
+"directly if it was specified on the command line or by prompting the user "
+"with a menu of available actions if running interactively:"
 msgstr ""
 
 #. type: SS
-#: dselect.1:133
+#: dselect.1:126
 #, no-wrap
 msgid "access"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:135
+#: dselect.1:128
 msgid "Choose and configure an access method to access package repositories."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:141
+#: dselect.1:134
 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."
+"By default, B<dselect> provides several methods such as I<cdrom>, "
+"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount>, "
+"I<floppy> or I<ftp>, but other packages may provide additional methods, eg. "
+"the I<apt> access method provided by the B<apt> package."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:143
+#: dselect.1:136
 msgid "The use of the I<apt> access method is strongly recommended."
 msgstr ""
 
 #. type: SS
-#: dselect.1:144
+#: dselect.1:137
 #, no-wrap
 msgid "update"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:146
+#: dselect.1:139
 #, fuzzy
 msgid "Refresh the available packages database."
-msgstr "Lista dos pacotes disponveis."
+msgstr "Lista dos pacotes disponíveis."
 
 #. type: Plain text
-#: dselect.1:153
+#: dselect.1:146
 msgid ""
 "Retrieves a list of available package versions from the package repository, "
 "configured for the current access method, and update the dpkg database. The "
@@ -12941,25 +13261,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:156
+#: dselect.1:149
 msgid ""
 "Details of the update action depend on the access method's implementation.  "
 "Normally the process is straightforward and requires no user interaction."
 msgstr ""
 
 #. type: SS
-#: dselect.1:157
+#: dselect.1:150
 #, no-wrap
 msgid "select"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:159
+#: dselect.1:152
 msgid "View or manage package selections and dependencies."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:165
+#: dselect.1:158
 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 "
@@ -12969,7 +13289,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:172
+#: dselect.1:165
 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 "
@@ -12980,25 +13300,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:175
+#: dselect.1:168
 msgid ""
 "The use of the interactive package selections management screen is explained "
 "in more detail below."
 msgstr ""
 
 #. type: SS
-#: dselect.1:176
+#: dselect.1:169
 #, fuzzy, no-wrap
 msgid "install"
 msgstr "B<install>"
 
 #. type: Plain text
-#: dselect.1:178
+#: dselect.1:171
 msgid "Installs selected packages."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:184
+#: dselect.1:177
 msgid ""
 "The configured access method will fetch installable or upgradable packages "
 "from the relevant repositories and install these using B<dpkg>.  Depending "
@@ -13008,7 +13328,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:192
+#: dselect.1:185
 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 "
@@ -13020,7 +13340,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:199
+#: dselect.1:192
 msgid ""
 "Details of the install action depend on the access method's implementation.  "
 "The user's attention and input may be required during installation, "
@@ -13030,57 +13350,57 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:200
+#: dselect.1:193
 #, no-wrap
 msgid "config"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:202
+#: dselect.1:195
 msgid "Configures any previously installed, but not fully configured packages."
 msgstr ""
 
 #. type: SS
-#: dselect.1:203
+#: dselect.1:196
 #, no-wrap
 msgid "remove"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:205
+#: dselect.1:198
 msgid "Removes or purges installed packages, that are marked for removal."
 msgstr ""
 
 #. type: SS
-#: dselect.1:206
+#: dselect.1:199
 #, no-wrap
 msgid "quit"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:208
+#: dselect.1:201
 msgid "Quit B<dselect>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:210
+#: dselect.1:203
 msgid "Exits the program with zero (successful) errorcode."
 msgstr ""
 
 #. type: SH
-#: dselect.1:212
+#: dselect.1:205
 #, no-wrap
 msgid "Package selections management"
 msgstr ""
 
 #. type: SS
-#: dselect.1:214
+#: dselect.1:207
 #, no-wrap
 msgid "Introduction"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:230
+#: dselect.1:223
 msgid ""
 "B<dselect> directly exposes the administrator to some of the complexities "
 "involved with managing large sets of packages with many interdependencies. "
@@ -13095,7 +13415,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:236
+#: dselect.1:229
 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> "
@@ -13105,13 +13425,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:237
+#: dselect.1:230
 #, no-wrap
 msgid "Screen layout"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:245
+#: dselect.1:238
 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 "
@@ -13122,20 +13442,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:248
+#: dselect.1:241
 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 ""
 
 #. type: SS
-#: dselect.1:249
+#: dselect.1:242
 #, no-wrap
 msgid "Package details view"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:258
+#: dselect.1:251
 #, no-wrap
 msgid ""
 "The package details view by default shows the extended package description\n"
@@ -13148,7 +13468,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:262
+#: dselect.1:255
 msgid ""
 "In a dependency resolution screen, there is also the possibility of viewing "
 "the specific unresolved depends or conflicts related to the package and "
@@ -13156,13 +13476,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:263
+#: dselect.1:256
 #, no-wrap
 msgid "Packages status list"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:268
+#: dselect.1:261
 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 "
@@ -13170,7 +13490,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:276
+#: dselect.1:269
 msgid ""
 "For every package, the list shows the package's status, priority, section, "
 "installed and available versions, the package name and its short "
@@ -13181,7 +13501,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:282
+#: dselect.1:275
 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 "
@@ -13190,7 +13510,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:300
+#: dselect.1:293
 #, no-wrap
 msgid ""
 "These are the meanings of the shorthand package status indicator codes:\n"
@@ -13213,20 +13533,20 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:301
+#: dselect.1:294
 #, no-wrap
 msgid "Cursor and screen movement"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:306
+#: dselect.1:299
 msgid ""
 "The package selection list and the dependency conflict resolution screens "
 "can be navigated using motion commands mapped to the following keys:"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:323
+#: dselect.1:316
 #, no-wrap
 msgid ""
 "  B<p, Up, k>           move cursor bar up\n"
@@ -13248,13 +13568,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:324
+#: dselect.1:317
 #, no-wrap
 msgid "Searching and sorting"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:338
+#: dselect.1:331
 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 "
@@ -13268,7 +13588,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:345
+#: dselect.1:338
 #, no-wrap
 msgid ""
 "The list sort order can be varied by pressing\n"
@@ -13280,20 +13600,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:348
+#: dselect.1:341
 msgid ""
 "Where not listed above explicitly, alphabetic order is used as the final "
 "subordering sort key."
 msgstr ""
 
 #. type: SS
-#: dselect.1:349
+#: dselect.1:342
 #, no-wrap
 msgid "Altering selections"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:358
+#: dselect.1:351
 #, no-wrap
 msgid ""
 "The requested selection state of individual packages may be\n"
@@ -13306,7 +13626,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:362
+#: dselect.1:355
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -13314,7 +13634,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:367
+#: dselect.1:360
 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 "
@@ -13322,7 +13642,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:373
+#: dselect.1:366
 msgid ""
 "Proper care should be taken when altering large groups of selections, "
 "because this can instantaneously create large numbers of unresolved depends "
@@ -13332,13 +13652,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:374
+#: dselect.1:367
 #, no-wrap
 msgid "Resolving depends and conflicts"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:379
+#: dselect.1:372
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -13346,7 +13666,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:386
+#: dselect.1:379
 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 "
@@ -13357,7 +13677,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:392
+#: dselect.1:385
 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, "
@@ -13367,7 +13687,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:400
+#: dselect.1:393
 msgid ""
 "The listed packages' selection state may be reverted to the original "
 "settings, as they were before the unresolved depends or conflicts were "
@@ -13378,13 +13698,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:401
+#: dselect.1:394
 #, no-wrap
 msgid "Establishing the requested selections"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:408
+#: dselect.1:401
 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 "
@@ -13394,7 +13714,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:414
+#: dselect.1:407
 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 "
@@ -13403,7 +13723,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:421
+#: dselect.1:414
 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 "
@@ -13413,7 +13733,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:428
+#: dselect.1:421
 msgid ""
 "If you mistakenly establish some settings and wish to revert all the "
 "selections to what is currently installed on the system, press the B<'C'> "
@@ -13423,37 +13743,37 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:435
+#: dselect.1:428
 msgid ""
 "If set, B<dselect> will use it as the directory from which to read the user "
 "specific configuration file."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:441
+#: dselect.1:434
 msgid ""
 "The B<dselect> package selection interface is confusing to some new users.  "
 "Reportedly, it even makes seasoned kernel developers cry."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:443
+#: dselect.1:436
 msgid "The documentation is lacking."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:445
+#: dselect.1:438
 msgid "There is no help option in the main menu."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:447
+#: dselect.1:440
 #, fuzzy
 msgid "The visible list of available packages cannot be reduced."
-msgstr "Lista dos pacotes disponveis."
+msgstr "Lista dos pacotes disponíveis."
 
 #. type: Plain text
-#: dselect.1:451
+#: dselect.1:444
 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, "
@@ -13461,19 +13781,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:457
+#: dselect.1:450
 msgid "B<dpkg>(1), B<apt-get>(8), B<sources.list>(5), B<deb>(5)."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:462
+#: dselect.1:455
 msgid ""
 "B<dselect> was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list "
 "of contributors may be found in 'dselect --version'."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:465
+#: dselect.1:458
 msgid ""
 "This manual page was written by Juho Vuori E<lt>javuori@cc.helsinki.fiE<gt>, "
 "Josip Rodin and Joost kooij."
@@ -13485,6 +13805,12 @@
 msgid "dselect.cfg"
 msgstr ""
 
+#. type: TH
+#: dselect.cfg.5:1
+#, fuzzy, no-wrap
+msgid "2011-07-03"
+msgstr "2006-04-09"
+
 #. type: Plain text
 #: dselect.cfg.5:4
 msgid "dselect.cfg - dselect configuration file"
@@ -13494,7 +13820,7 @@
 #: 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 "
+"option which is exactly the same as a normal command line option for dselect "
 "except for the leading dashes which are not used here. Quotes surrounding "
 "option values are stripped. Comments are allowed by starting a line with a "
 "hash sign (\"B<#>\")."
@@ -13525,7 +13851,7 @@
 "contributed to B<dselect>."
 msgstr ""
 "Veja B</usr/share/doc/dpkg/THANKS> para a lista de pessoas que\n"
-"contriburam para o B<dpkg>.\n"
+"contribuíram para o B<dpkg>.\n"
 
 #. type: Plain text
 #: dselect.cfg.5:24
@@ -13544,13 +13870,13 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:9
+#: start-stop-daemon.8:8
 #, fuzzy
-msgid "B<start-stop-daemon> [I<options>] I<command>"
-msgstr "B<dpkg> [I<opes>] I<ao>"
+msgid "B<start-stop-daemon> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 #. type: Plain text
-#: start-stop-daemon.8:15
+#: start-stop-daemon.8:14
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
 "system-level processes.  Using one of the matching options, B<start-stop-"
@@ -13558,7 +13884,7 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:34
+#: start-stop-daemon.8:33
 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 "
@@ -13571,13 +13897,13 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:36
+#: start-stop-daemon.8:35
 #, no-wrap
 msgid "B<-S>, B<--start> [B<-->] I<arguments>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 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<--"
@@ -13588,13 +13914,13 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 #, fuzzy, no-wrap
 msgid "B<-K>, B<--stop>"
 msgstr "B<--new> | B<--old>"
 
 #. type: Plain text
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
 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 "
@@ -13605,115 +13931,128 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
+#, fuzzy, no-wrap
+msgid "B<-T>, B<--status>"
+msgstr "B<--new> | B<--old>"
+
+#. type: Plain text
+#: start-stop-daemon.8:74
+msgid ""
+"Check for the existence of a specified process, and returns an exit status "
+"code, according to the LSB Init Script Actions."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:74
 #, fuzzy, no-wrap
 msgid "B<-H>, B<--help>"
 msgstr "B<--help>"
 
 #. type: Plain text
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 #, fuzzy
 msgid "Show usage information and exit."
-msgstr "Exibe informao sobre a verso do B<dpkg>."
+msgstr "Exibe informação sobre a versão do B<dpkg>."
 
 #. type: TP
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 #, fuzzy, no-wrap
 msgid "B<-V>, B<--version>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: start-stop-daemon.8:77
+#: start-stop-daemon.8:80
 msgid "Show the program version and exit."
 msgstr ""
 
 #. type: SH
-#: start-stop-daemon.8:78
+#: start-stop-daemon.8:81
 #, fuzzy, no-wrap
 msgid "MATCHING OPTIONS"
-msgstr "OPES COMUNS"
+msgstr "OPÇÕES COMUNS"
 
 #. type: TP
-#: start-stop-daemon.8:79
+#: start-stop-daemon.8:82
 #, fuzzy, no-wrap
 msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 #. type: Plain text
-#: start-stop-daemon.8:83
+#: start-stop-daemon.8:86
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:83
+#: start-stop-daemon.8:86
 #, no-wrap
 msgid "B<-x>, B<--exec> I<executable>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 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:87
+#: start-stop-daemon.8:90
 #, 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:93
+#: start-stop-daemon.8:96
 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:93
+#: start-stop-daemon.8:96
 #, no-wrap
 msgid "B<-u>, B<--user> I<username>|I<uid>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:99
+#: start-stop-daemon.8:102
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:101
+#: start-stop-daemon.8:104
 #, no-wrap
 msgid "B<-g>, B<--group> I<group>|I<gid>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:107
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:107
 #, 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:109
+#: start-stop-daemon.8:112
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default TERM)."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:109
+#: start-stop-daemon.8:112
 #, no-wrap
 msgid "B<-R>, B<--retry> I<timeout>|I<schedule>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:119
+#: start-stop-daemon.8:122
 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 "
@@ -13722,7 +14061,7 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:130
+#: start-stop-daemon.8:133
 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 "
@@ -13730,7 +14069,7 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:146
+#: start-stop-daemon.8:149
 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 "
@@ -13740,7 +14079,7 @@
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 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, "
@@ -13748,61 +14087,61 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 #, 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:164
+#: start-stop-daemon.8:167
 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:164
+#: start-stop-daemon.8:167
 #, fuzzy, no-wrap
 msgid "B<-t>, B<--test>"
 msgstr "B<--test>"
 
 #. type: Plain text
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 #, fuzzy, no-wrap
 msgid "B<-o>, B<--oknodo>"
 msgstr "B<--new> | B<--old>"
 
 #. type: Plain text
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 #, fuzzy, no-wrap
 msgid "B<-q>, B<--quiet>"
 msgstr "B<--quiet>"
 
 #. type: Plain text
-#: start-stop-daemon.8:174
+#: start-stop-daemon.8:177
 msgid "Do not print informational messages; only display error messages."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:174
+#: start-stop-daemon.8:177
 #, fuzzy, no-wrap
-msgid "B<-c>, B<--chuid> I<username>|I<uid>"
-msgstr "B<--altdir> I<diretrio>"
+msgid "B<-c>, B<--chuid> I<username>|I<uid>[B<:>I<group>|I<gid>]"
+msgstr "B<--altdir> I<diretório>"
 
 #. type: Plain text
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 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 "
@@ -13815,26 +14154,26 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 #, fuzzy, no-wrap
 msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<--new> | B<--old>"
 
 #. type: Plain text
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 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:198
+#: start-stop-daemon.8:201
 #, fuzzy, no-wrap
 msgid "B<-d>, B<--chdir> I<path>"
-msgstr "B<--altdir> I<diretrio>"
+msgstr "B<--altdir> I<diretório>"
 
 #. type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 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-"
@@ -13842,13 +14181,13 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 #, fuzzy, no-wrap
 msgid "B<-b>, B<--background>"
 msgstr "B<--new> | B<--old>"
 
 #. type: Plain text
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 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 "
@@ -13860,24 +14199,24 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 #, no-wrap
 msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 msgid "This alters the priority of the process before starting it."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 #, no-wrap
 msgid "B<-P>, B<--procsched> I<policy>B<:>I<priority>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 msgid ""
 "This alters the process scheduler policy and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -13886,13 +14225,13 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 #, fuzzy, no-wrap
 msgid "B<-I>, B<--iosched> I<class>B<:>I<priority>"
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 #. type: Plain text
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 msgid ""
 "This alters the IO scheduler class and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -13902,24 +14241,24 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 #, no-wrap
 msgid "B<-k>, B<--umask> I<mask>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 msgid "This sets the umask of the process before starting it."
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 #, fuzzy, no-wrap
 msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 #. type: Plain text
-#: start-stop-daemon.8:252
+#: start-stop-daemon.8:255
 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<--"
@@ -13930,73 +14269,119 @@
 "useful when combined with the B<--background> option."
 msgstr ""
 
+#. type: Plain text
+#: start-stop-daemon.8:258
+msgid "Print verbose informational messages."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:270
+msgid ""
+"The requested action was performed. If B<--oknodo> was specified, it's also "
+"possible that nothing had to be done.  This can happen when B<--start> was "
+"specified and a matching process was already running, or when B<--stop> was "
+"specified and there were no matching processes."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:275
+msgid "If B<--oknodo> was not specified and nothing was done."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:283
+msgid ""
+"If B<--stop> and B<--retry> were specified, but the end of the schedule was "
+"reached and the processes were still running."
+msgstr ""
+
 #. type: TP
-#: start-stop-daemon.8:252
-#, fuzzy, no-wrap
-msgid "B<-v>, B<--verbose>"
-msgstr "B<--verbose>"
+#: start-stop-daemon.8:283 start-stop-daemon.8:295
+#, no-wrap
+msgid "B<3>"
+msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:255
-msgid "Print verbose informational messages."
+#: start-stop-daemon.8:286
+msgid "Any other error."
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:272
+#: start-stop-daemon.8:289
 msgid ""
-"B<start-stop-daemon> returns 0 if the requested action was performed, or if "
-"B<--oknodo> is specified and either B<--start> was specified and a matching "
-"process was already running, or B<--stop> was specified and there were no "
-"matching processes. If B<--oknodo> was not specified and nothing was done, 1 "
-"is returned. If B<--stop> and B<--retry> were specified, but the end of the "
-"schedule was reached and the processes were still running, the error value "
-"is 2. For all other errors, the status is 3."
+"When using the B<--status> command, the following status codes are returned:"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:292
+msgid "Program is running."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:295
+msgid "Program is not running and the pid file exists."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:298
+msgid "Program is not running."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:298
+#, no-wrap
+msgid "B<4>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:301
+msgid "Unable to determine program status."
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:276
+#: start-stop-daemon.8:305
 msgid ""
 "Start the B<food> daemon, unless one is already running (a process named "
 "food, running as user food, with pid in food.pid):"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:279
+#: start-stop-daemon.8:308
 #, no-wrap
 msgid "start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon\n"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:282
+#: start-stop-daemon.8:311
 msgid "Send B<SIGTERM> to B<food> and wait up to 5 seconds for it to stop:"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:285
+#: start-stop-daemon.8:314
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5\n"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:288
+#: start-stop-daemon.8:317
 msgid "Demonstration of a custom schedule for stopping B<food>:"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:291
+#: start-stop-daemon.8:320
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5\n"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:297
+#: start-stop-daemon.8:326
 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:299
+#: start-stop-daemon.8:328
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -14013,26 +14398,26 @@
 msgid ""
 "update-alternatives - maintain symbolic links determining default commands"
 msgstr ""
-"update-alternatives - mantm ligaes simblicas determinando comandos "
-"padres"
+"update-alternatives - mantém ligações simbólicas determinando comandos "
+"padrões"
 
 #. type: Plain text
-#: update-alternatives.8:16
+#: update-alternatives.8:15
 #, fuzzy
-msgid "B<update-alternatives> [I<options>] I<command>"
-msgstr "B<update-alternatives> [I<optes>] B<--all>"
+msgid "B<update-alternatives> [I<option>...] I<command>"
+msgstr "B<update-alternatives> [I<optções>] B<--all>"
 
 #. type: Plain text
-#: update-alternatives.8:21
+#: update-alternatives.8:20
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
 msgstr ""
-"B<update-alternatives> cria, remove, mantm e exibe informao sobre sobre "
-"as ligaes simblicas que englobam o sistema de alternativas Debian."
+"B<update-alternatives> cria, remove, mantém e exibe informação sobre sobre "
+"as ligações simbólicas que englobam o sistema de alternativas Debian."
 
 #. type: Plain text
-#: update-alternatives.8:29
+#: update-alternatives.8:28
 #, fuzzy
 msgid ""
 "It is possible for several programs fulfilling the same or similar functions "
@@ -14042,17 +14427,17 @@
 "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 ""
-" possvel para diversos programas que executam as mesmas funes ou funes "
-"similares serem instalados em um nico sistema ao mesmo tempo.  Por exemplo, "
-"muitos sistemas possuem diversos editores de texto instalados. Isto d a "
-"possibilidade de escolha para os usurios do sistema, permitindo a cada "
-"usurio usar um editor diferente, caso desejado, mas faz com que seja "
-"difcil para um programa fazer uma boa escolha de um editor o qual invocar "
-"caso o usurio no tenha especificado um editor particular de sua "
-"preferncia."
+"É possível para diversos programas que executam as mesmas funções ou funções "
+"similares serem instalados em um único sistema ao mesmo tempo.  Por exemplo, "
+"muitos sistemas possuem diversos editores de texto instalados. Isto dá a "
+"possibilidade de escolha para os usuários do sistema, permitindo a cada "
+"usuário usar um editor diferente, caso desejado, mas faz com que seja "
+"difícil para um programa fazer uma boa escolha de um editor o qual invocar "
+"caso o usuário não tenha especificado um editor particular de sua "
+"preferência."
 
 #. type: Plain text
-#: update-alternatives.8:51
+#: update-alternatives.8:50
 #, fuzzy
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
@@ -14067,18 +14452,18 @@
 "to do so."
 msgstr ""
 "O sistema de alternativas Debian pretende solucinar este problema. Um nome "
-"genrico no sistema de arquivos  compartilhado por todos os arquivos "
+"genérico no sistema de arquivos é compartilhado por todos os arquivos "
 "provendo funcionalidade equivalente. O sistema de alternativas e o "
-"administrador do sistema juntos determinam qual arquivo atual  referenciado "
-"por esse nome genrico. Por exemplo, caso os editores de texto B<ed>(1)  e "
+"administrador do sistema juntos determinam qual arquivo atual é referenciado "
+"por esse nome genérico. Por exemplo, caso os editores de texto B<ed>(1)  e "
 "B<nvi>(1)  estejam ambos instalados no sistema, o sistema de alternativas "
-"far com que o nome genrico I</usr/bin/editor> refira-se a I</usr/bin/nvi> "
-"por padro. O administrador do sistema pode sobreescrever isto e fazer com "
-"que refira-se a I</usr/bin/ed> e o sistema de alternativas no ir alterar "
-"esta configurao at que explicitamente requisitado a faz-lo."
+"fará com que o nome genérico I</usr/bin/editor> refira-se a I</usr/bin/nvi> "
+"por padrão. O administrador do sistema pode sobreescrever isto e fazer com "
+"que refira-se a I</usr/bin/ed> e o sistema de alternativas não irá alterar "
+"esta configuração até que explicitamente requisitado a fazê-lo."
 
 #. type: Plain text
-#: update-alternatives.8:61
+#: update-alternatives.8:60
 #, fuzzy
 msgid ""
 "The generic name is not a direct symbolic link to the selected alternative.  "
@@ -14088,15 +14473,15 @@
 "confined within the I</etc> directory: the FHS (q.v.) gives reasons why this "
 "is a Good Thing."
 msgstr ""
-"O nome genrico no  uma ligao simblica direta para a alternativa "
-"selecionada. Ao invs disso,  uma ligao simblica para um nome no "
-"I<diretrio>, I<alternatives> o qual , por sua vez, uma ligao simblica "
-"para o arquivo atualmente referenciado. Isto  feito para que as mudanas do "
-"administrador do sistema possam ser confinadas dentro do diretrio I</etc> : "
-"a FHS (q.v.) d razes de porqu isto  um Boa Coisa."
+"O nome genérico não é uma ligação simbólica direta para a alternativa "
+"selecionada. Ao invés disso, é uma ligação simbólica para um nome no "
+"I<diretório>, I<alternatives> o qual é, por sua vez, uma ligação simbólica "
+"para o arquivo atualmente referenciado. Isto é feito para que as mudanças do "
+"administrador do sistema possam ser confinadas dentro do diretório I</etc> : "
+"a FHS (q.v.) dá razões de porquê isto é um Boa Coisa."
 
 #. type: Plain text
-#: update-alternatives.8:73
+#: update-alternatives.8:72
 #, fuzzy
 msgid ""
 "When each package providing a file with a particular functionality is "
@@ -14105,14 +14490,14 @@
 "alternatives> is usually called from the B<postinst> (configure) or B<prerm> "
 "(install) scripts in Debian packages."
 msgstr ""
-"Quando cada pacote provendo um arquivo com uma funcionalidade particular  "
-"instalado, modificdo ou removido o, B<update-alternatives>  chamado para "
-"atualizar a informao sobre este arqivo no sistema de alternativas.  "
-"B<update-alternatives>  geralmente chamado a partir de um script "
+"Quando cada pacote provendo um arquivo com uma funcionalidade particular é "
+"instalado, modificdo ou removido o, B<update-alternatives> é chamado para "
+"atualizar a informação sobre este arqivo no sistema de alternativas.  "
+"B<update-alternatives> é geralmente chamado a partir de um script "
 "B<postinst> ou B<prerm> em pacotes Debian."
 
 #. type: Plain text
-#: update-alternatives.8:92
+#: update-alternatives.8:91
 #, fuzzy
 msgid ""
 "It is often useful for a number of alternatives to be synchronised, so that "
@@ -14123,18 +14508,18 @@
 "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 ""
-"Isto  geralmente til para que diversas alternativas sejam sincronizadas, "
-"assim elas so modificadas como um grupo; por exemplo, quando diversas "
-"verses do editor B<vi>(1)  esto instaladas, a pgina de manual "
-"referenciada por I</usr/share/man/man1/vi.1> dever corresponder ao "
-"executvel referenciado por I</usr/bin/vi>.  B<update-alternatives> gerencia "
-"isso por meio de ligaes I<master> e I<slave> (mestre e escrado); quando o "
-"master  modificado, quaisquer slaves associados so tambm modificados.  "
-"Uma ligao master e seus slaves associados constituem uma A master link and "
-"its associated slaves make up a I<link> I<group>.  (ou ligao em grupo)."
+"Isto é geralmente útil para que diversas alternativas sejam sincronizadas, "
+"assim elas são modificadas como um grupo; por exemplo, quando diversas "
+"versões do editor B<vi>(1)  estão instaladas, a página de manual "
+"referenciada por I</usr/share/man/man1/vi.1> deverá corresponder ao "
+"executável referenciado por I</usr/bin/vi>.  B<update-alternatives> gerencia "
+"isso por meio de ligações I<master> e I<slave> (mestre e escrado); quando o "
+"master é modificado, quaisquer slaves associados são também modificados.  "
+"Uma ligação master e seus slaves associados constituem uma A master link and "
+"its associated slaves make up a I<link> I<group>.  (ou ligação em grupo)."
 
 #. type: Plain text
-#: update-alternatives.8:101
+#: update-alternatives.8:100
 #, fuzzy
 msgid ""
 "Each link group is, at any given time, in one of two modes: automatic or "
@@ -14144,15 +14529,15 @@
 "the choice of the administrator and avoid changing the links (except when "
 "something is broken)."
 msgstr ""
-"Cada ligao em grupo est, em um dado momento, em um de dois modos: "
-"automtico ou manual.  Quando um grupo est em modo automtico, o sistema de "
-"alternativas ir automaticamente decidir, a medida em que os pacotes so "
-"instalados e removidos, se ir atualizar e como atualizar as ligaes.  No "
-"modo manual, o sistema de alternativas no ir modificar as ligaes; ele "
-"deixar todas as decises para o administrador do sistema."
+"Cada ligação em grupo está, em um dado momento, em um de dois modos: "
+"automático ou manual.  Quando um grupo está em modo automático, o sistema de "
+"alternativas irá automaticamente decidir, a medida em que os pacotes são "
+"instalados e removidos, se irá atualizar e como atualizar as ligações.  No "
+"modo manual, o sistema de alternativas não irá modificar as ligações; ele "
+"deixará todas as decisões para o administrador do sistema."
 
 #. type: Plain text
-#: update-alternatives.8:110
+#: update-alternatives.8:109
 #, fuzzy
 msgid ""
 "Link groups are in automatic mode when they are first introduced to the "
@@ -14161,14 +14546,14 @@
 "on the changed link's group, and the group will automatically be switched to "
 "manual mode."
 msgstr ""
-"Ligaes em grupo esto em modo automtico quando as mesmas so introduzidas "
-"no sistema pela primeira vez. Caso o administrador do sistema faa mudanas "
-"configuraes automticas do sistema, isso ser vlido na prxima vez que o "
-"B<update-alternatives> for executado nas ligaes em grupo modificadas, e o "
-"grupo ir automaticamente ser modificado para o modo manual."
+"Ligações em grupo estão em modo automático quando as mesmas são introduzidas "
+"no sistema pela primeira vez. Caso o administrador do sistema faça mudanças "
+"configurações automáticas do sistema, isso será válido na próxima vez que o "
+"B<update-alternatives> for executado nas ligações em grupo modificadas, e o "
+"grupo irá automaticamente ser modificado para o modo manual."
 
 #. type: Plain text
-#: update-alternatives.8:117
+#: update-alternatives.8:116
 #, fuzzy
 msgid ""
 "Each alternative has a I<priority> associated with it.  When a link group is "
@@ -14176,40 +14561,40 @@
 "be those which have the highest priority."
 msgstr ""
 "Cada alternativa possui uma I<priority> (prioridade) associada a ela.  "
-"Quando uma ligao em grupo est em modo automtico, as alternativas "
-"apontadas por membros do grupo sero aquelas que possuem a maior prioridade."
+"Quando uma ligação em grupo está em modo automático, as alternativas "
+"apontadas por membros do grupo serão aquelas que possuem a maior prioridade."
 
 #. type: Plain text
-#: update-alternatives.8:134
+#: update-alternatives.8:133
 #, fuzzy
 msgid ""
-"When using the I<--config> option, B<update-alternatives> will list all of "
+"When using the B<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master "
 "alternative name. The current choice is marked with a '*'.  You will then be "
 "prompted for your choice regarding this link group.  Depending on the choice "
 "made, the link group might no longer be in I<auto> mode. You will need to "
-"use the I<--auto> option in order to return to the automatic mode (or you "
-"can rerun I<--config> and select the entry marked as automatic)."
+"use the B<--auto> option in order to return to the automatic mode (or you "
+"can rerun B<--config> and select the entry marked as automatic)."
 msgstr ""
-"Quando usando a opo I<--config> , o B<update-alternatives> listar todas "
-"as opes para a ligao em grupo da qual um dado I<name> (nome)  a ligao "
-"master.  Lhe ser ento questionado por cada uma das opes a usar para a "
-"ligao em grupo. Uma vez que voc faa uma mudana, a ligao em grupo no "
-"estar mais no modo I<auto> Voc precisar usar a opo I<--auto> para poder "
-"retornar ao estado automtico."
+"Quando usando a opção I<--config> , o B<update-alternatives> listará todas "
+"as opções para a ligação em grupo da qual um dado I<name> (nome) é a ligação "
+"master.  Lhe será então questionado por cada uma das opções a usar para a "
+"ligação em grupo. Uma vez que você faça uma mudança, a ligação em grupo não "
+"estará mais no modo I<auto> Você precisará usar a opção I<--auto> para poder "
+"retornar ao estado automático."
 
 #. type: Plain text
-#: update-alternatives.8:138
+#: update-alternatives.8:137
 #, fuzzy
 msgid ""
-"If you want to configure non-interactively you can use the I<--set> option "
+"If you want to configure non-interactively you can use the B<--set> option "
 "instead (see below)."
 msgstr ""
 "If you want to configure non-interactivily you can use the I<--set> option "
 "instead (see below)."
 
 #. type: Plain text
-#: update-alternatives.8:149
+#: update-alternatives.8:148
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "In other words, the usage of B<update-alternatives> is B<mandatory> for all "
@@ -14218,181 +14603,181 @@
 msgstr ""
 
 #. type: SH
-#: update-alternatives.8:150
+#: update-alternatives.8:149
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr "TERMINOLOGIA"
 
 #. type: Plain text
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
 msgstr ""
-"Uma vez que as atividades de B<update-alternatives> so bem envolvidas, "
-"alguns termos especficos ajudaro a explicar sua operao."
+"Uma vez que as atividades de B<update-alternatives> são bem envolvidas, "
+"alguns termos específicos ajudarão a explicar sua operação."
 
 #. type: TP
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 #, no-wrap
 msgid "generic name (or alternative link)"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 #, 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 ""
-"Um nome, como A name, like I</usr/bin/editor>, o qual refere-se, atravs do "
-"sistema de alternativas, a um ou a diversos arquivos de funo similar."
+"Um nome, como A name, like I</usr/bin/editor>, o qual refere-se, através do "
+"sistema de alternativas, a um ou a diversos arquivos de função similar."
 
 #. type: TP
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 #, fuzzy, no-wrap
 msgid "alternative name"
 msgstr "alternativa"
 
 #. type: Plain text
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 msgid "The name of a symbolic link in the alternatives directory."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 #, no-wrap
 msgid "alternative (or alternative path)"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 #, 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 ""
-"O nome de um arquivo especfico no sitema de arquivos, o qual pode ser "
-"acessado atravs de um nome genrico usando o sistema de alternativas."
+"O nome de um arquivo específico no sitema de arquivos, o qual pode ser "
+"acessado através de um nome genérico usando o sistema de alternativas."
 
 #. type: TP
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 #, no-wrap
 msgid "alternatives directory"
-msgstr "diretrio de alternativas"
+msgstr "diretório de alternativas"
 
 #. type: Plain text
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 #, fuzzy
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr ""
-"Um diretrio, por padro I</etc/alternatives>, contendo as ligaes "
-"simblicas."
+"Um diretório, por padrão I</etc/alternatives>, contendo as ligações "
+"simbólicas."
 
 #. type: TP
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 #, no-wrap
 msgid "administrative directory"
-msgstr "diretrio administrativo"
+msgstr "diretório administrativo"
 
 #. type: Plain text
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 #, fuzzy
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
 "alternatives>' state information."
 msgstr ""
-"Um diretrio, por padro I</var/lib/dpkg/alternatives>, contendo informao "
+"Um diretório, por padrão I</var/lib/dpkg/alternatives>, contendo informação "
 "de estado de B<update-alternatives>."
 
 #. type: TP
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 #, no-wrap
 msgid "link group"
-msgstr "ligao em grupo"
+msgstr "ligação em grupo"
 
 #. type: Plain text
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 #, fuzzy
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr ""
-"Um conjunto de ligaes simblicas relacionadas, com o intuito de serem "
+"Um conjunto de ligações simbólicas relacionadas, com o intuito de serem "
 "atualizadas em grupos."
 
 #. type: TP
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 #, no-wrap
 msgid "master link"
-msgstr "ligao mestre (master link)"
+msgstr "ligação mestre (master link)"
 
 #. type: Plain text
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 #, fuzzy
 msgid ""
 "The alternative link in a link group which determines how the other links in "
 "the group are configured."
 msgstr ""
-"A ligao em uma ligao em grupo que determina como as outras ligaes no "
-"grupo so configuradas."
+"A ligação em uma ligação em grupo que determina como as outras ligações no "
+"grupo são configuradas."
 
 #. type: TP
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 #, no-wrap
 msgid "slave link"
-msgstr "ligao escravo (slave link)"
+msgstr "ligação escravo (slave link)"
 
 #. type: Plain text
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 #, fuzzy
 msgid ""
 "An alternative link in a link group which is controlled by the setting of "
 "the master link."
 msgstr ""
-"Uma ligao em uma ligao em grupo que  controlada pela configurao de "
-"uma ligao mestre."
+"Uma ligação em uma ligação em grupo que é controlada pela configuração de "
+"uma ligação mestre."
 
 #. type: TP
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 #, no-wrap
 msgid "automatic mode"
-msgstr "modo automtico"
+msgstr "modo automático"
 
 #. type: Plain text
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 #, 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 ligao em grupo est em modo automtico, o sistema de "
-"alternativas certifica-se ed que as ligaes no grupo apontam para as "
+"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:197
+#: update-alternatives.8:196
 #, no-wrap
 msgid "manual mode"
 msgstr "modo manual"
 
 #. type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:201
 #, 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 ligao em grupo est em modo manual, o sistema de alternativas "
-"no far qualquer modificao nas configuraes do administrador do sistema."
+"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:204
+#: update-alternatives.8:203
 #, fuzzy, no-wrap
 msgid "B<--install> I<link name path priority> [B<--slave> I<link name path>]..."
-msgstr "B<--install> I<ligao genrico caminho pri> [B<--slave> I<sligao sgenrico scaminho>] ..."
+msgstr "B<--install> I<ligação genérico caminho pri> [B<--slave> I<sligação sgenérico scaminho>] ..."
 
 #. type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:222
 #, fuzzy
 msgid ""
 "Add a group of alternatives to the system.  I<link> is the generic name for "
@@ -14407,15 +14792,15 @@
 "displayed). If some real file is installed where an alternative link has to "
 "be installed, it is kept unless B<--force> is used."
 msgstr ""
-"Adiciona um grupo de alternativas para o sistema.  I<genrico>  o nome "
-"genrico para a ligao master, I<ligao>  o nome de sua ligao "
-"simblica, e I<caminho>  a alternativa sendo intruzida para a ligao "
-"mestre.  I<sgenrico>, I<sligao> e I<scaminho> so o nome genrco, ligao "
-"simblica e alternativa para uma ligao slave.  Zero ou mais opes B<--"
-"slave> , cada uma seguda por trs argumentos, podem ser especificadas."
+"Adiciona um grupo de alternativas para o sistema.  I<genérico> é o nome "
+"genérico para a ligação master, I<ligação> é o nome de sua ligação "
+"simbólica, e I<caminho> é a alternativa sendo intruzida para a ligação "
+"mestre.  I<sgenérico>, I<sligação> e I<scaminho> são o nome genérco, ligação "
+"simbólica e alternativa para uma ligação slave.  Zero ou mais opções B<--"
+"slave> , cada uma seguda por três argumentos, podem ser especificadas."
 
 #. type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 #, fuzzy
 msgid ""
 "If the alternative name specified exists already in the alternatives "
@@ -14426,36 +14811,36 @@
 "alternatives for this group, the symlinks will be updated to point to the "
 "newly added alternatives."
 msgstr ""
-"Caso a ligao master especificada j exista nos registros do sistema de "
-"alternativas, a informao fornecida ser adicionada como um novo conjunto "
+"Caso a ligação master especificada já exista nos registros do sistema de "
+"alternativas, a informação fornecida será adicionada como um novo conjunto "
 "de alternativas para o grupo. De outra forma, um novo grupo, definido para o "
-"modo automtico, ser adicionado com esta informao. Se o grupo est no "
-"modo automtico e a prioridade das novas alternativas adicionadas  maior do "
-"que qualquer outra alternativa instalada para este grupo, as ligaes "
-"simblicas sero atualizadas para apontar para as alternativas novas "
+"modo automático, será adicionado com esta informação. Se o grupo está no "
+"modo automático e a prioridade das novas alternativas adicionadas é maior do "
+"que qualquer outra alternativa instalada para este grupo, as ligações "
+"simbólicas serão atualizadas para apontar para as alternativas novas "
 "instaladas."
 
 #. type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
-"I<--config> but is non-interactive and thus scriptable."
+"B<--config> but is non-interactive and thus scriptable."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 #, fuzzy, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr "B<--remove> I<nome caminho>"
 
 #. type: Plain text
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 #, fuzzy
 msgid ""
 "Remove an alternative and all of its associated slave links.  I<name> is a "
@@ -14467,30 +14852,30 @@
 "correspondingly.  If the link is not currently pointing to I<path>, no links "
 "are changed; only the information about the alternative is removed."
 msgstr ""
-"Remove uma alternativa e todas as suas ligaes slaves associadas.  I<nome> "
-" o nome do diretrio de alternativas, e I<caminho>  o nome de arquivo "
-"absoluto ao qual I<nome> poder ser ligado. Caso I<nome> esteja ligado com "
-"I<caminho>, I<nome> ser atualizado para apontar para outra alternativa "
-"apropriada, ou removido caso no exista essa alternativa separada.  Ligaes "
-"slave associadas sero atualizadas ou removidas de acordo.  Caso a ligao "
-"no esteja atualmente apontando para I<caminho>, nenhuma ligao  "
-"modificada; somente a informao sobre a alternativa  removida."
+"Remove uma alternativa e todas as suas ligações slaves associadas.  I<nome> "
+"é o nome do diretório de alternativas, e I<caminho> é o nome de arquivo "
+"absoluto ao qual I<nome> poderá ser ligado. Caso I<nome> esteja ligado com "
+"I<caminho>, I<nome> será atualizado para apontar para outra alternativa "
+"apropriada, ou removido caso não exista essa alternativa separada.  Ligações "
+"slave associadas serão atualizadas ou removidas de acordo.  Caso a ligação "
+"não esteja atualmente apontando para I<caminho>, nenhuma ligação é "
+"modificada; somente a informação sobre a alternativa é removida."
 
 #. type: TP
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:269
+#: update-alternatives.8:268
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 msgid ""
 "Call B<--config> on all alternatives. It can be usefully combined with B<--"
 "skip-auto> to review and configure all alternatives which are not configured "
@@ -14500,31 +14885,31 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 #, fuzzy, no-wrap
 msgid "B<--auto> I<name>"
-msgstr "B<--auto> I<ligao>"
+msgstr "B<--auto> I<ligação>"
 
 #. type: Plain text
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 #, fuzzy
 msgid ""
 "Switch the link group behind the alternative for I<name> to automatic mode.  "
 "In the process, the master symlink and its slaves are updated to point to "
 "the highest priority installed alternatives."
 msgstr ""
-"Muda a ligao simblica master I<ligao> para o modo automtico. No "
-"processo a ligao simblica e seus slaves so atualizados para apontar para "
+"Muda a ligação simbólica master I<ligação> para o modo automático. No "
+"processo a ligação simbólica e seus slaves são atualizados para apontar para "
 "as alternativas instaladas de maior prioridade."
 
 #. type: TP
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 #, fuzzy, no-wrap
 msgid "B<--display> I<name>"
-msgstr "B<--display> I<ligao>"
+msgstr "B<--display> I<ligação>"
 
 #. type: Plain text
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 #, fuzzy
 msgid ""
 "Display information about the link group.  Information displayed includes "
@@ -14533,20 +14918,20 @@
 "corresponding slave alternatives), and the highest priority alternative "
 "currently installed."
 msgstr ""
-"Mostra informao sobre a ligao em grupo para qual cada I<ligao>  a "
-"ligao master.  A informao exibida inclui o modo do grupo (auto ou "
-"manual), para quais alternativas a ligao simblica aponta atualmente, "
-"quais outras alternativas esto disponveis (e suas alternativas slave "
+"Mostra informação sobre a ligação em grupo para qual cada I<ligação> é a "
+"ligação master.  A informação exibida inclui o modo do grupo (auto ou "
+"manual), para quais alternativas a ligação simbólica aponta atualmente, "
+"quais outras alternativas estão disponíveis (e suas alternativas slave "
 "correspondentes)  e a alternativa de maior prioridade instalada atualmente."
 
 #. type: TP
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 #, fuzzy, no-wrap
 msgid "B<--get-selections>"
 msgstr "B<dpkg --set-selections>"
 
 #. type: Plain text
-#: update-alternatives.8:300
+#: update-alternatives.8:299
 msgid ""
 "List all master alternative names (those controlling a link group)  and "
 "their status. Each line contains up to 3 fields (separated by one or more "
@@ -14557,292 +14942,286 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 msgid ""
 "Read configuration of alternatives on standard input in the format generated "
 "by B<update-alternatives --get-selections> and reconfigure them accordingly."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 #, fuzzy, no-wrap
 msgid "B<--query> I<name>"
-msgstr "B<--auto> I<ligao>"
+msgstr "B<--auto> I<ligação>"
 
 #. type: Plain text
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 msgid ""
 "Display information about the link group like --display does, but in a "
 "machine parseable way (see section B<QUERY FORMAT> below)."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 #, fuzzy, no-wrap
 msgid "B<--list> I<name>"
-msgstr "B<--list> I<ligao>"
+msgstr "B<--list> I<ligação>"
 
 #. type: Plain text
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 #, fuzzy
 msgid "Display all targets of the link group."
-msgstr "Exibe todos os alvos de uma ligao em grupo."
+msgstr "Exibe todos os alvos de uma ligação em grupo."
 
 #. type: TP
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 #, fuzzy, no-wrap
 msgid "B<--config> I<name>"
 msgstr "B<--config> I<link>"
 
 #. type: Plain text
-#: update-alternatives.8:317
+#: update-alternatives.8:316
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:325
+#: update-alternatives.8:324
 #, fuzzy, no-wrap
 msgid "B<--altdir>I< directory>"
-msgstr "B<--altdir> I<diretrio>"
+msgstr "B<--altdir> I<diretório>"
 
 #. type: Plain text
-#: update-alternatives.8:329
+#: update-alternatives.8:328
 #, fuzzy
 msgid ""
 "Specifies the alternatives directory, when this is to be different from the "
 "default."
 msgstr ""
-"Especifica o diretrio de alternativas, quando este est configurado para "
-"algo diferente do padro."
+"Especifica o diretório de alternativas, quando este está configurado para "
+"algo diferente do padrão."
 
 #. type: Plain text
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 #, fuzzy
 msgid ""
 "Specifies the administrative directory, when this is to be different from "
 "the default."
 msgstr ""
-"Especifica o dirtrio administrativo, quando este este configurado para algo "
-"diferente do padro."
+"Especifica o dirtório administrativo, quando este este configurado para algo "
+"diferente do padrão."
 
 #. type: TP
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 #, fuzzy, no-wrap
 msgid "B<--log>I< file>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: update-alternatives.8:337
+#: update-alternatives.8:336
 #, fuzzy
 msgid ""
 "Specifies the log file, when this is to be different from the default (/var/"
 "log/alternatives.log)."
 msgstr ""
-"Especifica o diretrio de alternativas, quando este est configurado para "
-"algo diferente do padro."
+"Especifica o diretório de alternativas, quando este está configurado para "
+"algo diferente do padrão."
 
 #. type: Plain text
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 msgid ""
-"Let B<update-alternatives> replace any real file that is installed where an "
-"alternative link has to be installed."
+"Let B<update-alternatives> replace or drop any real file that is installed "
+"where an alternative link has to be installed or removed."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 #, fuzzy, no-wrap
 msgid "B<--skip-auto>"
 msgstr "B<--test>"
 
 #. type: Plain text
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 msgid ""
 "Skip configuration prompt for alternatives which are properly configured in "
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 #, fuzzy, no-wrap
 msgid "B<--verbose>"
 msgstr "B<--verbose>"
 
 #. type: Plain text
-#: update-alternatives.8:351
+#: update-alternatives.8:350
 #, fuzzy
 msgid "Generate more comments about what B<update-alternatives> is doing."
-msgstr "Gera mais comentrios sobre o que B<update-alternatives> est fazendo."
+msgstr "Gera mais comentários sobre o que B<update-alternatives> está fazendo."
 
 #. type: Plain text
-#: update-alternatives.8:354
+#: update-alternatives.8:353
 #, fuzzy
 msgid "Don't generate any comments unless errors occur."
 msgstr ""
-"No gera comentrio algum a menos que ocorram erros. Esta opo ainda no "
-"est implementada."
+"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:360
+#: update-alternatives.8:359
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the base administrative directory."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:362
+#: update-alternatives.8:361
 #, fuzzy, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr "I</etc/alternatives/>"
 
 #. type: Plain text
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 #, fuzzy
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
 msgstr ""
-"O diretrio de alternativas padro. Pode ser sobreescrito pela opo B<--"
+"O diretório de alternativas padrão. Pode ser sobreescrito pela opção B<--"
 "altdir>"
 
 #. type: TP
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 #, fuzzy, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "I</var/lib/dpkg/alternatives/>"
 
 #. type: Plain text
-#: update-alternatives.8:374
+#: update-alternatives.8:373
 #, fuzzy
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
 msgstr ""
-"O diretrio de administrao padro. Pode ser sobreescrito pela opo B<--"
+"O diretório de administração padrão. Pode ser sobreescrito pela opção B<--"
 "admindir>"
 
 #. type: Plain text
 #: update-alternatives.8:378
 #, fuzzy
 msgid "The requested action was successfully performed."
-msgstr "A ao requisitada foi completada com sucesso."
-
-#. type: IP
-#: update-alternatives.8:378
-#, fuzzy, no-wrap
-msgid "2"
-msgstr "2"
+msgstr "A ação requisitada foi completada com sucesso."
 
 #. type: Plain text
-#: update-alternatives.8:381
+#: update-alternatives.8:382
 #, fuzzy
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
 msgstr ""
 "Foram encontrados problemas quando analisando a linha de comando ou "
-"executando a ao."
+"executando a ação."
 
 #. type: SH
-#: update-alternatives.8:382
+#: update-alternatives.8:383
 #, no-wrap
 msgid "QUERY FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:387
+#: update-alternatives.8:388
 msgid ""
-"The B<update-alternatives> I<--query> format is using an RFC822-like flat "
+"The B<update-alternatives --query> format is using an RFC822-like flat "
 "format. It's made of I<n> + 1 blocks where I<n> is the number of "
 "alternatives available in the queried link group. The first block contains "
 "the following fields:"
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:387
+#: update-alternatives.8:388
 #, fuzzy, no-wrap
-msgid "B<Link:> E<lt>linkE<gt>"
+msgid "B<Link:>I< link>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 msgid "The generic name of the alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 #, fuzzy, no-wrap
-msgid "B<Status:> E<lt>statusE<gt>"
+msgid "B<Status:>I< status>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 #, fuzzy, no-wrap
-msgid "B<Best:> E<lt>best choiceE<gt>"
+msgid "B<Best:>I< best-choice>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 #, no-wrap
-msgid "B<Value:> E<lt>currently selected alternativeE<gt> "
+msgid "B<Value:>I< currently-selected-alternative>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:401
+#: update-alternatives.8:402
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:402
+#: update-alternatives.8:403
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:404
+#: update-alternatives.8:405
 #, no-wrap
-msgid "B<Alternative:> E<lt>path of this alternativeE<gt>"
+msgid "B<Alternative:>I< path-of-this-alternative>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 msgid "Path to this block's alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 #, fuzzy, no-wrap
-msgid "B<Priority:> E<lt>priority valueE<gt>"
+msgid "B<Priority:>I< priority-value>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 msgid "Value of the priority of this alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 #, fuzzy, no-wrap
-msgid "B<Slaves:> E<lt>list of slavesE<gt>"
+msgid "B<Slaves:>I< list-of-slaves>"
 msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
-#: update-alternatives.8:416
+#: update-alternatives.8:417
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -14851,13 +15230,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:417
+#: update-alternatives.8:418
 #, no-wrap
 msgid "B<Example>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:426
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
@@ -14868,7 +15247,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:430
+#: update-alternatives.8:431
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -14878,7 +15257,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:446
 #, no-wrap
 msgid ""
 "Alternative: /usr/bin/vim.gtk\n"
@@ -14898,23 +15277,23 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:457
+#: update-alternatives.8:458
 #, fuzzy
 msgid ""
-"With I<--verbose> B<update-alternatives> chatters incessantly about its "
+"With B<--verbose> 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> fala sem parar sobre suas atividades em seu canal de "
-"sada padro. Caso um problema ocorra, B<update-alternatives> exibe "
-"mensagens de erro em seu canal de erros padro e retorna um estado de sada "
-"de 2.  Estes diagnsticos devem ser auto-explicativos; caso voc no pense "
+"saída padrão. Caso um problema ocorra, B<update-alternatives> exibe "
+"mensagens de erro em seu canal de erros padrão e retorna um estado de saída "
+"de 2.  Estes diagnósticos devem ser auto-explicativos; caso você não pense "
 "assim, por favor reporte isso com um bug."
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:464
 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 "
@@ -14923,88 +15302,244 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:466
+#: update-alternatives.8:467
 msgid ""
 "To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
+"setting for it, use the B<--display> action:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:469
+#: update-alternatives.8:470
 #, fuzzy
 msgid "B<update-alternatives --display vi>"
 msgstr "update-alternatives --display vi"
 
 #. type: Plain text
-#: update-alternatives.8:473
+#: update-alternatives.8:474
 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:476
+#: update-alternatives.8:477
 #, fuzzy
 msgid "B<update-alternatives --config vi>"
 msgstr "update-alternatives --config vi"
 
 #. type: Plain text
-#: update-alternatives.8:480
+#: update-alternatives.8:481
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:483
+#: update-alternatives.8:484
 #, fuzzy
 msgid "B<update-alternatives --auto vi>"
 msgstr "update-alternatives --auto vi"
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:488
 #, fuzzy
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
 msgstr ""
-"Caso voc encontre um bug, por favor reporte-o usando o sistema de "
-"gerenciamento de bugs Debian, ou, caso isso no seja possvel, envie um "
+"Caso você encontre um bug, por favor reporte-o usando o sistema de "
+"gerenciamento de bugs Debian, ou, caso isso não seja possível, envie um "
 "mensagem diretamente para o autor."
 
 #. type: Plain text
-#: update-alternatives.8:492
+#: update-alternatives.8:493
 #, 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 ""
-"Caso voc encontre qualquer discrepncia entre a operao de B<update-"
-"alternatives> e esta pgina de manual, isso  um bug, ou na implementao ou "
-"na documentao; por favor reporte isso."
+"Caso você encontre qualquer discrepância entre a operação de B<update-"
+"alternatives> e esta página de manual, isso é um bug, ou na implementação ou "
+"na documentação; por favor reporte isso."
 
 #. type: Plain text
-#: update-alternatives.8:503
+#: update-alternatives.8:504
 msgid ""
 "This manual page is copyright 1997,1998 Charles Briscoe-Smith and others."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:506
+#: update-alternatives.8:507
 #, fuzzy
 msgid ""
 "This is free documentation; 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 Licena Pblica Geral GNU verso 2 ou posterior para as "
-"condies de cpia. NO existe garantia."
+"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: Plain text
-#: update-alternatives.8:509
+#: update-alternatives.8:510
 #, fuzzy
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
-msgstr "B<ln>(1), FHS, o Padro da Hierarquia do Sistema de Arquivos."
+msgstr "B<ln>(1), FHS, o Padrão da Hierarquia do Sistema de Arquivos."
+
+#, fuzzy
+#~ msgid "2009-02-27"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2011-04-29"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2006-02-28"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2007-03-07"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2007-07-16"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2009-03-15"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2011-04-27"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2011-07-07"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2010-04-18"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2010-07-29"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2010-11-22"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2010-01-28"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2008-08-18"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg> can 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 ""
+#~ "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:"
+
+#~ 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>, e\n"
+#~ "    B<--fsys-tarfile>.\n"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "B<--new>, B<--old>"
+#~ msgstr "B<--new> | B<--old>"
+
+#, 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)."
+
+#, 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)."
+
+#, fuzzy
+#~ msgid "2009-08-15"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2009-11-21"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2010-03-07"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2010-10-12"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2009-08-07"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2010-04-16"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2009-05-19"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "0"
+#~ msgstr "0"
+
+#, fuzzy
+#~ msgid "2009-10-01"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2009-06-26"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "2009-05-10"
+#~ msgstr "2006-04-09"
+
+#, fuzzy
+#~ msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+#~ msgstr "B<--admindir> I<diretório>"
+
+#, fuzzy
+#~ msgid "2"
+#~ msgstr "2"
 
 #, fuzzy
 #~ msgid "2009-03-08"
@@ -15039,10 +15574,10 @@
 #~ msgstr "B<dpkg --licence> | B<dpkg --license>"
 
 #~ msgid "Display B<dpkg> licence."
-#~ msgstr "Exibe a licena do B<dpkg>."
+#~ msgstr "Exibe a licença do B<dpkg>."
 
 #~ msgid "ENVIRONMENT VARIABLES"
-#~ msgstr "VARIVEIS DE AMBIENTE"
+#~ msgstr "VARIÁVEIS DE AMBIENTE"
 
 #~ msgid "B<DPKG_NO_TSTP>"
 #~ msgstr "B<DPKG_NO_TSTP>"
@@ -15052,8 +15587,8 @@
 #~ "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 invs de suspender a si prprio, quando fazendo um escape "
+#~ "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."
 
 #, fuzzy
@@ -15109,14 +15644,6 @@
 #~ msgstr "2006-04-09"
 
 #, fuzzy
-#~ msgid "B<-Z>I<compression>"
-#~ msgstr "B<--version>"
-
-#, fuzzy
-#~ msgid "B<-z>I<level>"
-#~ msgstr "B<--log=>I<filename>"
-
-#, fuzzy
 #~ msgid "2009-01-04"
 #~ msgstr "2006-04-09"
 
@@ -15127,7 +15654,7 @@
 #, fuzzy
 #~ msgid "Forget about uninstalled unavailable packages."
 #~ msgstr ""
-#~ "Despreza informaes sobre pacotes no instalados e no disponveis."
+#~ "Despreza informações sobre pacotes não instalados e não disponíveis."
 
 #, fuzzy
 #~ msgid "install-info"
@@ -15147,7 +15674,7 @@
 
 #, fuzzy
 #~ msgid "B<--infodir=>I<infodir>"
-#~ msgstr "B<--admindir> I<diretrio>"
+#~ msgstr "B<--admindir> I<diretório>"
 
 #, fuzzy
 #~ msgid "B<--keep-old>"
@@ -15163,7 +15690,7 @@
 
 #, fuzzy
 #~ msgid "B<cleanup-info> [I<options>] [B<-->] [I<dirname>]"
-#~ msgstr "B<update-alternatives> [I<optes>] B<--auto> I<nome>"
+#~ msgstr "B<update-alternatives> [I<optções>] B<--auto> I<nome>"
 
 #, fuzzy
 #~ msgid "B<--unsafe>"
@@ -15174,10 +15701,10 @@
 #~ msgstr "2006-04-09"
 
 #~ msgid "generic name"
-#~ msgstr "nome genrico"
+#~ msgstr "nome genérico"
 
 #~ msgid "symlink"
-#~ msgstr "ligao simblica (symlink)"
+#~ msgstr "ligação simbólica (symlink)"
 
 #, fuzzy
 #~ msgid ""
@@ -15185,8 +15712,8 @@
 #~ "alternatives directory: one which the system administrator is expected to "
 #~ "adjust."
 #~ msgstr ""
-#~ "Sem nenhuma qualificao futura, esta significa uma ligao simblica no "
-#~ "diretrio de alternativas: o qual espera-se que o administrador do "
+#~ "Sem nenhuma qualificação futura, esta significa uma ligação simbólica no "
+#~ "diretório de alternativas: o qual espera-se que o administrador do "
 #~ "sistema ajuste."
 
 #, fuzzy
@@ -15242,9 +15769,9 @@
 #~ "conflicts are reported as `status: conffile-prompt: conffile : 'current-"
 #~ "conffile' 'new-conffile' useredited distedited'."
 #~ msgstr ""
-#~ "Envia a informao do estado do pacote para o descritor de arquivo "
-#~ "I<E<lt>nE<gt>>.  Isso pode ser dado mltiplas vezes. As atualizaes de "
-#~ "estado so da forma `status: E<lt>pkgE<gt>: E<lt>pkg qstateE<gt>'."
+#~ "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>'."
 
 #, fuzzy
 #~ msgid "2008-01-03"
@@ -15263,7 +15790,7 @@
 #~ "Don't actually do anything, just say what would be done.  This option is "
 #~ "not yet implemented."
 #~ msgstr ""
-#~ "No faz nada, soment diz o que seria feito. Esta opo ainda no est "
+#~ "Não faz nada, soment diz o que seria feito. Esta opção ainda não está "
 #~ "implementada."
 
 #, fuzzy
@@ -15275,7 +15802,7 @@
 #~ "contributed to B<dpkg>.\n"
 #~ msgstr ""
 #~ "Veja B</usr/share/doc/dpkg/THANKS> para a lista de pessoas que\n"
-#~ "contriburam para o B<dpkg>.\n"
+#~ "contribuíram para o B<dpkg>.\n"
 
 #, fuzzy
 #~ msgid "2007-08-31"
@@ -15290,9 +15817,9 @@
 #~ "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 Licena Pblica Geral GNU verso 2 ou posterior para as "
-#~ "condies de cpia. NO existe garantia."
+#~ "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."
 
 #~ msgid "B<dpkg -C> | B<--audit>"
 #~ msgstr "B<dpkg -C> | B<--audit>"
@@ -15318,9 +15845,9 @@
 #~ "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 Licena Pblica Geral GNU verso 2 ou posterior para as "
-#~ "condies de cpia. NO existe garantia."
+#~ "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."
 
 #, fuzzy
 #~ msgid ""
@@ -15328,9 +15855,9 @@
 #~ "GNU General Public Licence version 2 or later for copying conditions. "
 #~ "There is I<no> warranty."
 #~ msgstr ""
-#~ "Debian update-alternatives  copyright 1995 Ian Jackson.  Isso  software "
-#~ "livre; veja a Licena Pblica Geral GNU verso 2 ou posterior para as "
-#~ "condies de cpia. NO existe garantia."
+#~ "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."
 
 #, fuzzy
 #~ msgid ""
@@ -15338,9 +15865,9 @@
 #~ "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 Licena Pblica Geral GNU verso 2 ou posterior para as "
-#~ "condies de cpia. NO existe garantia."
+#~ "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."
 
 #, fuzzy
 #~ msgid ""
@@ -15348,16 +15875,16 @@
 #~ "free documentation; see the GNU General Public Licence version 2 or later "
 #~ "for copying conditions. There is NO WARRANTY."
 #~ msgstr ""
-#~ "Esta pgina de manual  copyright 1997/98 Charles Briscoe-Smith.  Isto  "
-#~ "documentao livre; veja a Licena Pblica Geral GNU verso 2 ou "
-#~ "posterior para condies de cpia. NO existe garantia."
+#~ "Esta página de manual é copyright 1997/98 Charles Briscoe-Smith.  Isto é "
+#~ "documentação livre; veja a Licença Pública Geral GNU versão 2 ou "
+#~ "posterior para condições de cópia. NÂO existe garantia."
 
 #, fuzzy
 #~ msgid ""
 #~ "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
 #~ "system."
 #~ msgstr ""
-#~ "Voc pode encontrar a GNU GPL em /usr/share/common-licenses/GPL em "
+#~ "Você pode encontrar a GNU GPL em /usr/share/common-licenses/GPL em "
 #~ "qualquer sistema Debian."
 
 #~ msgid "2006-04-09"
@@ -15385,7 +15912,7 @@
 
 #, fuzzy
 #~ msgid "Prints B<dpkg-deb>'s version number."
-#~ msgstr "Exibe informao sobre a verso do B<dpkg>."
+#~ msgstr "Exibe informação sobre a versão do B<dpkg>."
 
 #, fuzzy
 #~ msgid "B<--licence>"
@@ -15393,23 +15920,19 @@
 
 #, fuzzy
 #~ msgid "OTHER OPTIONS"
-#~ msgstr "OPES"
-
-#, fuzzy
-#~ msgid "B<--debug>, B<-D>"
-#~ msgstr "B<--new> | B<--old>"
+#~ msgstr "OPÇÕES"
 
 #, fuzzy
 #~ msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
-#~ msgstr "B<update-alternatives> [I<opes>] B<--remove> I<nome caminho>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--remove> I<nome caminho>"
 
 #, fuzzy
 #~ msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
-#~ msgstr "B<update-alternatives> [I<opes>] B<--list> I<nome>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--list> I<nome>"
 
 #, fuzzy
 #~ msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
-#~ msgstr "B<update-alternatives> [I<opes>] B<--remove> I<nome caminho>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--remove> I<nome caminho>"
 
 #, fuzzy
 #~ msgid "B<-h, --help>"
@@ -15417,11 +15940,11 @@
 
 #, fuzzy
 #~ msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
-#~ msgstr "B<dpkg --get-selections> [I<padro>...]"
+#~ msgstr "B<dpkg --get-selections> [I<padrão>...]"
 
 #, fuzzy
 #~ msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
-#~ msgstr "B<dpkg --get-selections> [I<padro>...]"
+#~ msgstr "B<dpkg --get-selections> [I<padrão>...]"
 
 #, fuzzy
 #~ msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
@@ -15445,15 +15968,15 @@
 
 #, fuzzy
 #~ msgid "Display licence and copyright information."
-#~ msgstr "Exibe informao sobre a verso do B<dpkg>."
+#~ msgstr "Exibe informação sobre a versão do B<dpkg>."
 
 #, fuzzy
 #~ msgid "Display version information."
-#~ msgstr "Exibe informao sobre a verso do B<dpkg>."
+#~ msgstr "Exibe informação sobre a versão do B<dpkg>."
 
 #, fuzzy
 #~ msgid "COMMON OPTIONS"
-#~ msgstr "OPES COMUNS"
+#~ msgstr "OPÇÕES COMUNS"
 
 #, fuzzy
 #~ msgid "B<-x>"
@@ -15465,9 +15988,9 @@
 #~ "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 Licena Pblica Geral GNU verso 2 ou posterior para as "
-#~ "condies de cpia. NO existe garantia."
+#~ "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."
 
 #, fuzzy
 #~ msgid "B<dpkg-split> B<-l>|B<--listq>"
@@ -15479,11 +16002,11 @@
 
 #, fuzzy
 #~ msgid "B<--listq>, B<-l>"
-#~ msgstr "B<--list> I<ligao>"
+#~ msgstr "B<--list> I<ligação>"
 
 #, fuzzy
 #~ msgid "B<--discard>, B<-d>"
-#~ msgstr "B<--display> I<ligao>"
+#~ msgstr "B<--display> I<ligação>"
 
 #, fuzzy
 #~ msgid "B<--npquiet>, B<-Q>"
@@ -15491,16 +16014,16 @@
 
 #, fuzzy
 #~ msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
-#~ msgstr "B<update-alternatives> [I<opes>] B<--remove> I<nome caminho>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--remove> I<nome caminho>"
 
 #, fuzzy
 #~ msgid ""
 #~ "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
-#~ msgstr "B<update-alternatives> [I<opes>] B<--list> I<nome>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--list> I<nome>"
 
 #, fuzzy
 #~ msgid "B<--admindir>"
-#~ msgstr "B<--admindir> I<diretrio>"
+#~ msgstr "B<--admindir> I<diretório>"
 
 #, fuzzy
 #~ msgid "B<-H>|B<--help>"
@@ -15510,23 +16033,23 @@
 #~ "B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
 #~ "priority> [B<--slave> I<genname symlink> I<altern>]..."
 #~ msgstr ""
-#~ "B<update-alternatives> [I<opes>] B<--install> I<ligao nome caminho "
-#~ "prioridade> [B<--slave> I<ligao nome> I<caminho>]..."
+#~ "B<update-alternatives> [I<opções>] B<--install> I<ligação nome caminho "
+#~ "prioridade> [B<--slave> I<ligação nome> I<caminho>]..."
 
 #~ msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
-#~ msgstr "B<update-alternatives> [I<opes>] B<--remove> I<nome caminho>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--remove> I<nome caminho>"
 
 #~ msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
 #~ msgstr "B<update-alternatives> [I<options>] B<--remove-all> I<nome>"
 
 #~ msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
-#~ msgstr "B<update-alternatives> [I<opes>] B<--display> I<nome>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--display> I<nome>"
 
 #~ msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
-#~ msgstr "B<update-alternatives> [I<opes>] B<--list> I<nome>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--list> I<nome>"
 
 #~ msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
-#~ msgstr "B<update-alternatives> [I<opes>] B<--config> I<nome>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--config> I<nome>"
 
 #, fuzzy
 #~ msgid ""
@@ -15534,14 +16057,14 @@
 #~ "perform any meaningful task.  Any number of the common options may be "
 #~ "specified together with any action."
 #~ msgstr ""
-#~ "Exatamente uma ao deve ser especificada se B<update-alternatives> est "
-#~ "prester a executar qualquer tarefa significante.  Qualquer nmero de "
-#~ "opes comuns podem ser especificadas juntas com qualquer ao."
+#~ "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."
 
 #, fuzzy
 #~ msgid "Tell which version of B<update-alternatives> this is."
 #~ msgstr ""
-#~ "Diz qual verso de B<update-alternatives>  essa (e d alguma informao "
+#~ "Diz qual versão de B<update-alternatives> é essa (e dá alguma informação "
 #~ "sobre o uso)."
 
 #, fuzzy
@@ -15549,8 +16072,8 @@
 #~ "Set by B<dpkg> to the filename of the old configuration file when you "
 #~ "start a shell to examine a changed configuration.  file."
 #~ msgstr ""
-#~ "Ajustado pelo B<dpkg> para o nome do arquivo de configurao antigo "
-#~ "quando voc inicia um shell para examinar um arquivo de configurao "
+#~ "Ajustado pelo B<dpkg> para o nome do arquivo de configuração antigo "
+#~ "quando você inicia um shell para examinar um arquivo de configuração "
 #~ "modificado."
 
 #, fuzzy
@@ -15562,9 +16085,9 @@
 #~ "Set by B<dpkg> to the filename of the newversion of a configuration file "
 #~ "when you start a shell to examine a changed configuration.  file."
 #~ msgstr ""
-#~ "Ajustado pelo B<dpkg> para o nome do arquivo de configurao da nova "
-#~ "verso quando voc inicia um shell para examinar um arquivo de "
-#~ "configurao modificado."
+#~ "Ajustado pelo B<dpkg> para o nome do arquivo de configuração da nova "
+#~ "versão quando você inicia um shell para examinar um arquivo de "
+#~ "configuração modificado."
 
 #, fuzzy
 #~ msgid ""
@@ -15572,7 +16095,7 @@
 #~ "to remove them."
 #~ msgstr ""
 #~ "B<auto-select>(*): Seleciona pacotes para serem instalados e tira a "
-#~ "seleo de pacotes a serem removidos."
+#~ "seleção de pacotes a serem removidos."
 
 #~ msgid "DPKG"
 #~ msgstr "DPKG"
@@ -15585,7 +16108,7 @@
 #~ "Give some usage information (and say which version of B<update-"
 #~ "alternatives> this is)."
 #~ msgstr ""
-#~ "Exibe informao de uso (e diz qual verso de B<update-alternatives>  "
+#~ "Exibe informação de uso (e diz qual versão de B<update-alternatives> é "
 #~ "essa)."
 
 #~ msgid "UPDATE-ALTERNATIVES"
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/ru.add /home/vorlon/devel/multiarch/dpkg-debian/man/po/ru.add
--- dpkg/man/po/ru.add	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/ru.add	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,5 @@
 PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary
-.SH 
-ף     <victor_v@permonline.ru>
-  : Alexey Mahotkin <alexm@hsys.msk.ru>.
-  <y_kozlov@chat.ru>.
+.SH ПЕРЕВОД
+Перевёл с английского Виктор Вислобоков <victor_v@permonline.ru>
+Обновление и корректура: Alexey Mahotkin <alexm@hsys.msk.ru>.
+Юрий Козлов <y_kozlov@chat.ru>.
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/ru.po /home/vorlon/devel/multiarch/dpkg-debian/man/po/ru.po
--- dpkg/man/po/ru.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/ru.po	2012-06-07 10:11:09.426073000 -0700
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2011-04-01 22:07+0300\n"
+"POT-Creation-Date: 2011-11-25 11:22+0100\n"
 "PO-Revision-Date: 2010-03-07 22:18+0100\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -23,9 +23,16 @@
 msgstr ""
 
 #. type: TH
-#: deb.5:1
+#: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-version.5:5 deb-old.5:1
+#: deb-override.5:15 deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg-buildpackage.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-trigger.1:1
+#: dselect.1:1 update-alternatives.8:8
 #, fuzzy, no-wrap
-msgid "2009-02-27"
+msgid "2011-08-14"
 msgstr "2006-02-28"
 
 #. type: TH
@@ -97,15 +104,15 @@
 #: deb.5:6 deb-control.5:10 deb-src-control.5:10 deb-split.5:6
 #: deb-version.5:11 deb-old.5:8 deb-override.5:22 deb-extra-override.5:8
 #: deb-shlibs.5:20 deb-substvars.5:9 deb-symbols.5:9 deb-triggers.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildflags.1:9
+#: dpkg.1:19 dpkg-architecture.1:10 dpkg.cfg.5:5 dpkg-buildflags.1:9
 #: 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-deb.1:9 dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
 #: dpkg-gensymbols.1:10 dpkg-maintscript-helper.1:15 dpkg-mergechangelogs.1:9
 #: dpkg-name.1:16 dpkg-parsechangelog.1:9 dpkg-query.1:9
-#: dpkg-scanpackages.1:28 dpkg-scansources.1:14 dpkg-shlibdeps.1:11
-#: dpkg-source.1:11 dpkg-split.1:11 dpkg-statoverride.8:10 dpkg-trigger.1:12
-#: dpkg-vendor.1:9 dselect.1:17 dselect.cfg.5:5 start-stop-daemon.8:10
-#: update-alternatives.8:17
+#: dpkg-scanpackages.1:27 dpkg-scansources.1:13 dpkg-shlibdeps.1:9
+#: dpkg-source.1:10 dpkg-split.1:10 dpkg-statoverride.8:9 dpkg-trigger.1:12
+#: dpkg-vendor.1:9 dselect.1:9 dselect.cfg.5:5 start-stop-daemon.8:9
+#: update-alternatives.8:16
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "ОПИСАНИЕ"
@@ -210,15 +217,15 @@
 msgstr ""
 
 #. type: SH
-#: deb.5:79 deb-control.5:269 deb-src-control.5:322 deb-split.5:37
+#: deb.5:79 deb-control.5:271 deb-src-control.5:327 deb-split.5:49
 #: deb-version.5:116 deb-old.5:51 deb-override.5:62 deb-extra-override.5:37
-#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:49
-#: dpkg.1:782 dpkg-architecture.1:300 dpkg.cfg.5:23 dpkg-buildpackage.1:249
-#: dpkg-deb.1:246 dpkg-divert.8:132 dpkg-gensymbols.1:445 dpkg-name.1:95
-#: dpkg-query.1:212 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:701 dpkg-split.1:223
-#: dpkg-statoverride.8:85 dpkg-trigger.1:66 dselect.1:452 dselect.cfg.5:23
-#: update-alternatives.8:507
+#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:67
+#: dpkg.1:768 dpkg-architecture.1:299 dpkg.cfg.5:23 dpkg-buildpackage.1:249
+#: dpkg-deb.1:259 dpkg-divert.8:132 dpkg-gensymbols.1:450 dpkg-name.1:96
+#: dpkg-query.1:220 dpkg-scanpackages.1:110 dpkg-scansources.1:71
+#: dpkg-shlibdeps.1:324 dpkg-source.1:725 dpkg-split.1:217
+#: dpkg-statoverride.8:84 dpkg-trigger.1:66 dselect.1:445 dselect.cfg.5:23
+#: update-alternatives.8:508
 #, fuzzy, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -239,13 +246,6 @@
 msgid "deb-control"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-control.5:3 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
-#, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-07-29"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-control.5:6
 msgid "deb-control - Debian packages' master control file format"
@@ -284,8 +284,8 @@
 
 #. type: TP
 #: deb-control.5:26
-#, no-wrap
-msgid "B<Package:> E<lt>package nameE<gt>"
+#, fuzzy, no-wrap
+msgid "B<Package:>I< package-name>"
 msgstr "B<Package:> E<lt>имя пакетаE<gt>"
 
 #. type: Plain text
@@ -299,8 +299,9 @@
 
 #. type: TP
 #: deb-control.5:30
-#, no-wrap
-msgid "B<Version:> E<lt>version stringE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Version:> E<lt>version stringE<gt>"
+msgid "B<Version:>I< version-string>"
 msgstr "B<Version:> E<lt>строка с версиейE<gt>"
 
 #. type: Plain text
@@ -320,8 +321,9 @@
 
 #. type: TP
 #: deb-control.5:37
-#, no-wrap
-msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
+msgid "B<Maintainer:>I< fullname-email>"
 msgstr "B<Maintainer:> E<lt>полное имя и адрес эл.почтыE<gt>"
 
 #. type: Plain text
@@ -337,13 +339,16 @@
 
 #. type: TP
 #: deb-control.5:42
-#, no-wrap
-msgid "B<Description:> E<lt>short descriptionE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Description:> E<lt>short descriptionE<gt>"
+msgid "B<Description:>I< short-description>"
 msgstr "B<Description:> E<lt>короткое описаниеE<gt>"
 
 #. type: Plain text
 #: deb-control.5:45
-msgid "B< >E<lt>long descriptionE<gt>"
+#, fuzzy
+#| msgid "B< >E<lt>long descriptionE<gt>"
+msgid "B< >I<long-description>"
 msgstr "B< >E<lt>длинное описаниеE<gt>"
 
 #. type: Plain text
@@ -369,9 +374,10 @@
 msgstr "НЕОБЯЗАТЕЛЬНЫЕ ПОЛЯ"
 
 #. type: TP
-#: deb-control.5:53 deb-src-control.5:88
-#, no-wrap
-msgid "B<Section:> E<lt>sectionE<gt>"
+#: deb-control.5:53 deb-src-control.5:90
+#, fuzzy, no-wrap
+#| msgid "B<Section:> E<lt>sectionE<gt>"
+msgid "B<Section:>I< section>"
 msgstr "B<Section:> E<lt>секцияE<gt>"
 
 #. type: Plain text
@@ -386,9 +392,10 @@
 "могут служить `utils', `net', `mail', `text', `x11' и т.д."
 
 #. type: TP
-#: deb-control.5:58 deb-src-control.5:94
-#, no-wrap
-msgid "B<Priority:> E<lt>priorityE<gt>"
+#: deb-control.5:58 deb-src-control.5:96
+#, fuzzy, no-wrap
+#| msgid "B<Priority:> E<lt>priorityE<gt>"
+msgid "B<Priority:>I< priority>"
 msgstr "B<Priority:> E<lt>приоритетE<gt>"
 
 #. type: Plain text
@@ -402,7 +409,7 @@
 "`extra' и т.д."
 
 #. type: Plain text
-#: deb-control.5:71 deb-src-control.5:107
+#: deb-control.5:71 deb-src-control.5:109
 #, fuzzy
 msgid ""
 "In Debian, the B<Section> and B<Priority> fields have a defined set of "
@@ -415,15 +422,22 @@
 "узнать из последней версии пакета B<debian-policy>."
 
 #. type: TP
-#: deb-control.5:71 deb-src-control.5:211
-#, no-wrap
-msgid "B<Essential:> E<lt>yes|noE<gt>"
+#: deb-control.5:71 deb-src-control.5:216
+#, fuzzy, no-wrap
+#| msgid "B<Essential:> E<lt>yes|noE<gt>"
+msgid "B<Essential:> B<yes>|B<no>"
 msgstr "B<Essential:> E<lt>yes|noE<gt>"
 
 #. type: Plain text
 #: deb-control.5:78
+#, fuzzy
+#| 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 "
+#| "other installation tool will not allow an B<Essential> package to be "
+#| "removed (at least not without using one of the force options)."
 msgid ""
-"This field is usually only needed when the answer is `yes'. It denotes a "
+"This field is usually only needed when the answer is B<yes>. It denotes a "
 "package that is required for proper operation of the system. Dpkg or any "
 "other installation tool will not allow an B<Essential> package to be removed "
 "(at least not without using one of the force options)."
@@ -435,8 +449,9 @@
 
 #. type: TP
 #: deb-control.5:78
-#, no-wrap
-msgid "B<Architecture:> E<lt>arch|allE<gt>"
+#, fuzzy, no-wrap
+#| msgid "B<Architecture:> E<lt>arch|allE<gt>"
+msgid "B<Architecture:> I<arch>|B<all>"
 msgstr "B<Architecture:> E<lt>архитектура|allE<gt>"
 
 #. type: Plain text
@@ -456,9 +471,9 @@
 "документацию."
 
 #. type: TP
-#: deb-control.5:86 deb-src-control.5:83
+#: deb-control.5:86 deb-src-control.5:85
 #, fuzzy, no-wrap
-msgid "B<Origin:> E<lt>nameE<gt>"
+msgid "B<Origin:>I< name>"
 msgstr "B<Source:> E<lt>имя архивов с исходникамиE<gt>"
 
 #. type: Plain text
@@ -469,71 +484,71 @@
 #. type: TP
 #: deb-control.5:89 deb-src-control.5:66
 #, fuzzy, no-wrap
-msgid "B<Bugs:> E<lt>urlE<gt>"
+msgid "B<Bugs:>I< url>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-control.5:93
+#: deb-control.5:94
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian.org>."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:93 deb-src-control.5:62
+#: deb-control.5:94 deb-src-control.5:62
 #, fuzzy, no-wrap
-msgid "B<Homepage:> E<lt>urlE<gt>"
+msgid "B<Homepage:>I< url>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-control.5:96 deb-src-control.5:65
-msgid "The upstream project home page URL."
+#: deb-control.5:97
+msgid "The upstream project home page I<url>."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:96 deb-src-control.5:217
+#: deb-control.5:97 deb-src-control.5:222
 #, fuzzy, no-wrap
-msgid "B<Tag:> E<lt>tag listE<gt>"
+msgid "B<Tag:>I< tag-list>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-control.5:100
+#: deb-control.5:101
 msgid ""
 "List of tags describing the qualities of the package. The description and "
 "list of supported tags can be found in the B<debtags> package."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:100
+#: deb-control.5:101 deb-src-control.5:219
 #, fuzzy, no-wrap
 #| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt>"
+msgid "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>"
 msgstr "B<Source:> E<lt>имя архивов с исходникамиE<gt>"
 
 #. type: Plain text
-#: deb-control.5:111
+#: deb-control.5:113
 msgid ""
 "This field is used to indicate how this package should behave on a multi-"
-"arch installations. The value `same' means that the package is co-"
+"arch installations. The value B<same> means that the package is co-"
 "installable with itself, but it must not be used to satisfy the dependency "
-"of any package of a different architecture from itself. The value `foreign' "
+"of any package of a different architecture from itself. The value B<foreign> "
 "means that the package is not co-installable with itself, but should be "
 "allowed to satisfy the dependency of a package of a different arch from "
-"itself. The value `allowed` allows reverse-dependencies to indicate in their "
-"Depends field that they need a package from a foreign architecture, but has "
-"no effect otherwise. This field should not be present in packages with the "
-"Architecture: all field."
+"itself. The value B<allowed> allows reverse-dependencies to indicate in "
+"their Depends field that they need a package from a foreign architecture, "
+"but has no effect otherwise. This field should not be present in packages "
+"with the B<Architecture: all> field."
 msgstr ""
 
 #. type: TP
-#: deb-control.5:111
-#, no-wrap
-msgid "B<Source:> E<lt>source nameE<gt>"
+#: deb-control.5:113
+#, fuzzy, no-wrap
+#| msgid "B<Source:> E<lt>source nameE<gt>"
+msgid "B<Source:>I< source-name>"
 msgstr "B<Source:> E<lt>имя архивов с исходникамиE<gt>"
 
 #. type: Plain text
-#: deb-control.5:115
+#: deb-control.5:117
 msgid ""
 "The name of the source package that this binary package came from, if "
 "different than the name of the package itself."
@@ -542,26 +557,26 @@
 "отличается от имени самого пакета."
 
 #. type: TP
-#: deb-control.5:116 deb-src-control.5:197
+#: deb-control.5:118 deb-src-control.5:202
 #, fuzzy, no-wrap
 #| msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgid "B<Subarchitecture:> E<lt>valueE<gt>"
+msgid "B<Subarchitecture:>I< value>"
 msgstr "B<Architecture:> E<lt>архитектура|allE<gt>"
 
 #. type: TP
-#: deb-control.5:119 deb-src-control.5:200
+#: deb-control.5:121 deb-src-control.5:205
 #, fuzzy, no-wrap
-msgid "B<Kernel-Version:> E<lt>valueE<gt>"
+msgid "B<Kernel-Version:>I< value>"
 msgstr "B<Version:> E<lt>строка с версиейE<gt>"
 
 #. type: TP
-#: deb-control.5:122 deb-src-control.5:203
+#: deb-control.5:124 deb-src-control.5:208
 #, fuzzy, no-wrap
-msgid "B<Installer-Menu-Item:> E<lt>valueE<gt>"
+msgid "B<Installer-Menu-Item:>I< value>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-control.5:129 deb-src-control.5:210
+#: deb-control.5:131 deb-src-control.5:215
 msgid ""
 "These fields are used by the debian-installer and are usually not needed.  "
 "See /usr/share/doc/debian-installer/devel/modules.txt from the B<debian-"
@@ -569,13 +584,14 @@
 msgstr ""
 
 #. type: TP
-#: deb-control.5:130 deb-src-control.5:228
-#, no-wrap
-msgid "B<Depends:> E<lt>package listE<gt>"
+#: deb-control.5:132 deb-src-control.5:233
+#, fuzzy, no-wrap
+#| msgid "B<Depends:> E<lt>package listE<gt>"
+msgid "B<Depends:>I< package-list>"
 msgstr "B<Depends:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-control.5:141
+#: deb-control.5:143
 #, fuzzy
 msgid ""
 "List of packages that are required for this package to provide a non-trivial "
@@ -595,13 +611,14 @@
 "системы скрипты prerm будут выполнены после скрипта prerm данного пакета."
 
 #. type: TP
-#: deb-control.5:141 deb-src-control.5:231
-#, no-wrap
-msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+#: deb-control.5:143 deb-src-control.5:236
+#, fuzzy, no-wrap
+#| msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+msgid "B<Pre-Depends:>I< package-list>"
 msgstr "B<Pre-Depends:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-control.5:148
+#: deb-control.5:150
 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 "
@@ -613,13 +630,14 @@
 "preinst."
 
 #. type: TP
-#: deb-control.5:148 deb-src-control.5:234
-#, no-wrap
-msgid "B<Recommends:> E<lt>package listE<gt>"
+#: deb-control.5:150 deb-src-control.5:239
+#, fuzzy, no-wrap
+#| msgid "B<Recommends:> E<lt>package listE<gt>"
+msgid "B<Recommends:>I< package-list>"
 msgstr "B<Recommends:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-control.5:155
+#: deb-control.5:157
 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 "
@@ -630,13 +648,14 @@
 "без пакетов, которые перечислены в поле B<Recommends>."
 
 #. type: TP
-#: deb-control.5:155 deb-src-control.5:237
-#, no-wrap
-msgid "B<Suggests:> E<lt>package listE<gt>"
+#: deb-control.5:157 deb-src-control.5:242
+#, fuzzy, no-wrap
+#| msgid "B<Suggests:> E<lt>package listE<gt>"
+msgid "B<Suggests:>I< package-list>"
 msgstr "B<Suggests:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-control.5:160
+#: deb-control.5:162
 msgid ""
 "Lists packages that are related to this one and can perhaps enhance its "
 "usefulness, but without which installing this package is perfectly "
@@ -646,7 +665,7 @@
 "но без которых данный пакет может прекрасно обойтись."
 
 #. type: Plain text
-#: deb-control.5:172
+#: deb-control.5:174
 #, fuzzy
 msgid ""
 "The syntax of B<Depends>, B<Pre-Depends>, B<Recommends> and B<Suggests> "
@@ -664,7 +683,7 @@
 "можно указать его версию."
 
 #. type: Plain text
-#: deb-control.5:178
+#: deb-control.5:180
 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 "
@@ -680,13 +699,13 @@
 "\"только версия, которая указана\"."
 
 #. type: TP
-#: deb-control.5:178 deb-src-control.5:240
+#: deb-control.5:180 deb-src-control.5:245
 #, fuzzy, no-wrap
-msgid "B<Breaks:> E<lt>package listE<gt>"
+msgid "B<Breaks:>I< package-list>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-control.5:186
+#: deb-control.5:188
 #, fuzzy
 msgid ""
 "Lists packages that this one breaks, for example by exposing bugs when the "
@@ -700,13 +719,14 @@
 "пакетов должен указать в строке B<Conflicts> имя другого."
 
 #. type: TP
-#: deb-control.5:186 deb-src-control.5:249
-#, no-wrap
-msgid "B<Conflicts:> E<lt>package listE<gt>"
+#: deb-control.5:188 deb-src-control.5:254
+#, fuzzy, no-wrap
+#| msgid "B<Conflicts:> E<lt>package listE<gt>"
+msgid "B<Conflicts:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-control.5:194
+#: deb-control.5:196
 msgid ""
 "Lists packages that conflict with this one, for example by containing files "
 "with the same names. The package maintenance software will not allow "
@@ -719,13 +739,14 @@
 "пакетов должен указать в строке B<Conflicts> имя другого."
 
 #. type: TP
-#: deb-control.5:194 deb-src-control.5:246
-#, no-wrap
-msgid "B<Replaces:> E<lt>package listE<gt>"
+#: deb-control.5:196 deb-src-control.5:251
+#, fuzzy, no-wrap
+#| msgid "B<Replaces:> E<lt>package listE<gt>"
+msgid "B<Replaces:>I< package-list>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-control.5:202
+#: deb-control.5:204
 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 "
@@ -739,13 +760,14 @@
 "устанавливаемый."
 
 #. type: TP
-#: deb-control.5:202 deb-src-control.5:252
-#, no-wrap
-msgid "B<Provides:> E<lt>package listE<gt>"
+#: deb-control.5:204 deb-src-control.5:257
+#, fuzzy, no-wrap
+#| msgid "B<Provides:> E<lt>package listE<gt>"
+msgid "B<Provides:>I< package-list>"
 msgstr "B<Provides:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-control.5:212
+#: deb-control.5:214
 #, fuzzy
 msgid ""
 "This is a list of virtual packages that this one provides. Usually this is "
@@ -767,7 +789,7 @@
 "сервера, список через `|' всех пакетов почтовых серверов."
 
 #. type: Plain text
-#: deb-control.5:231
+#: deb-control.5:233
 #, fuzzy
 #| msgid ""
 #| "The syntax of B<Conflicts>, B<Replaces> and B<Provides> is a list of "
@@ -788,14 +810,14 @@
 "указывать номер версии пакета (используя вышеописанный синтаксис)."
 
 #. type: TP
-#: deb-control.5:232 deb-src-control.5:255
+#: deb-control.5:234 deb-src-control.5:260
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Built-Using:> E<lt>package listE<gt>"
+msgid "B<Built-Using:>I< package-list>"
 msgstr "B<Depends:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-control.5:242
+#: deb-control.5:244
 msgid ""
 "This field lists extra source packages that were used during the build of "
 "this binary package.  This is an indication to the archive maintenance "
@@ -807,13 +829,13 @@
 msgstr ""
 
 #. type: SH
-#: deb-control.5:243 deb-src-control.5:283 start-stop-daemon.8:273
+#: deb-control.5:245 deb-src-control.5:288 start-stop-daemon.8:302
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "ПРИМЕР"
 
 #. type: Plain text
-#: deb-control.5:266
+#: deb-control.5:268
 #, fuzzy, no-wrap
 msgid ""
 "# Comment\n"
@@ -858,7 +880,7 @@
 " will run more slowly, however).\n"
 
 #. type: Plain text
-#: deb-control.5:274
+#: deb-control.5:276
 #, fuzzy
 msgid ""
 "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
@@ -871,12 +893,6 @@
 msgid "deb-src-control"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-src-control.5:3
-#, fuzzy, no-wrap
-msgid "2010-11-22"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-src-control.5:6
 #, fuzzy
@@ -898,8 +914,7 @@
 "one space. The content of the multi-line fields is generally joined to a "
 "single line by the tools (except in the case of the B<Description> field, "
 "see below). To insert empty lines into a multi-line field, insert a dot "
-"after the space. The paragraphs are separated by an empty line. Lines "
-"starting with a B<'#'> are treated as comments."
+"after the space. Lines starting with a B<'#'> are treated as comments."
 msgstr ""
 
 #. type: SH
@@ -913,7 +928,7 @@
 #: deb-src-control.5:30
 #, fuzzy, no-wrap
 #| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Source:> E<lt>source package nameE<gt> (required)"
+msgid "B<Source:> I<source-package-name> (required)"
 msgstr "B<Source:> E<lt>имя архивов с исходникамиE<gt>"
 
 #. type: Plain text
@@ -930,7 +945,7 @@
 #: deb-src-control.5:38
 #, fuzzy, no-wrap
 #| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgid "B<Maintainer:> E<lt>fullname emailE<gt> (required)"
+msgid "B<Maintainer:> I<fullname-email> (required)"
 msgstr "B<Maintainer:> E<lt>полное имя и адрес эл.почтыE<gt>"
 
 #. type: Plain text
@@ -953,7 +968,7 @@
 #: deb-src-control.5:44
 #, fuzzy, no-wrap
 #| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgid "B<Uploaders:> E<lt>fullname emailE<gt>"
+msgid "B<Uploaders:>I< fullname-email>"
 msgstr "B<Maintainer:> E<lt>полное имя и адрес эл.почтыE<gt>"
 
 #. type: Plain text
@@ -968,7 +983,7 @@
 #: deb-src-control.5:50
 #, fuzzy, no-wrap
 #| msgid "B<Version:> E<lt>version stringE<gt>"
-msgid "B<Standards-Version:> E<lt>version stringE<gt>"
+msgid "B<Standards-Version:>I< version-string>"
 msgstr "B<Version:> E<lt>строка с версиейE<gt>"
 
 #. type: Plain text
@@ -983,7 +998,7 @@
 #: deb-src-control.5:57
 #, fuzzy, no-wrap
 #| msgid "B<Essential:> E<lt>yes|noE<gt>"
-msgid "B<DM-Upload-Allowed:> E<lt>yes|noE<gt>"
+msgid "B<DM-Upload-Allowed:> B<yes>|B<no>"
 msgstr "B<Essential:> E<lt>yes|noE<gt>"
 
 #. type: Plain text
@@ -995,49 +1010,55 @@
 msgstr ""
 
 #. type: Plain text
+#: deb-src-control.5:65
+msgid "The upstream project home page URL."
+msgstr ""
+
+#. type: Plain text
 #: deb-src-control.5:71
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>. This field is usually not needed."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian."
+"org>. This field is usually not needed."
 msgstr ""
 
 #. type: TP
 #: deb-src-control.5:72
 #, fuzzy, no-wrap
-msgid "B<Vcs-*:> E<lt>urlE<gt>"
+msgid "B<Vcs-*:>I< url>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:78
+#: deb-src-control.5:79
 msgid ""
-"The url of the Version Control System repository used to maintain this "
-"package.  Currently supported are Arch, Bzr (Bazaar), Cvs, Darcs, Git, Hg "
-"(Mercurial), Mtn (Monotone) and Svn (Subversion). Usually this field points "
-"to the latest version of the package, such as the main branch or the trunk."
+"The I<url> of the Version Control System repository used to maintain this "
+"package. Currently supported are B<Arch>, B<Bzr> (Bazaar), B<Cvs>, B<Darcs>, "
+"B<Git>, B<Hg> (Mercurial), B<Mtn> (Monotone) and B<Svn> (Subversion). "
+"Usually this field points to the latest version of the package, such as the "
+"main branch or the trunk."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:79
+#: deb-src-control.5:80
 #, fuzzy, no-wrap
-msgid "B<Vcs-Browser:> E<lt>urlE<gt>"
+msgid "B<Vcs-Browser:>I< url>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:82
+#: deb-src-control.5:84
 msgid ""
-"The url of a webinterface to browse the Version Control System repository."
+"The I<url> of a webinterface to browse the Version Control System repository."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:87
+#: deb-src-control.5:89
 msgid ""
 "The name of the distribution this package is originating from. This field is "
 "usually not needed."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:93
+#: deb-src-control.5:95
 #, fuzzy
 #| msgid ""
 #| "This is a general field that gives the package a category based on the "
@@ -1053,7 +1074,7 @@
 "могут служить `utils', `net', `mail', `text', `x11' и т.д."
 
 #. type: Plain text
-#: deb-src-control.5:98
+#: deb-src-control.5:100
 #, fuzzy
 #| msgid ""
 #| "Sets the importance of this package in relation to the system as a "
@@ -1069,64 +1090,64 @@
 "`extra' и т.д."
 
 #. type: TP
-#: deb-src-control.5:108
+#: deb-src-control.5:110
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Build-Depends:> E<lt>package listE<gt>"
+msgid "B<Build-Depends:>I< package-list>"
 msgstr "B<Depends:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:112
+#: deb-src-control.5:114
 msgid ""
 "A list of packages that need to be installed and configured to be able to "
 "build the source package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:113
+#: deb-src-control.5:115
 #, fuzzy, no-wrap
 #| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Build-Depends-Indep:> E<lt>package listE<gt>"
+msgid "B<Build-Depends-Indep:>I< package-list>"
 msgstr "B<Depends:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:118
+#: deb-src-control.5:120
 msgid ""
-"Same as Build-Depends, but they are only needed when building the "
-"architecture independent packages. The Build-Depends are also installed in "
-"this case."
+"Same as B<Build-Depends>, but they are only needed when building the "
+"architecture independent packages. The B<Build-Depends> are also installed "
+"in this case."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:119
+#: deb-src-control.5:121
 #, fuzzy, no-wrap
 #| msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgid "B<Build-Conflicts:> E<lt>package listE<gt>"
+msgid "B<Build-Conflicts:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:123
+#: deb-src-control.5:125
 msgid ""
 "A list of packages that should not be installed when the package is build, "
 "for example because they interfere with the used build system."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:124
+#: deb-src-control.5:126
 #, fuzzy, no-wrap
 #| msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgid "B<Build-Conflicts-Indep:> E<lt>package listE<gt>"
+msgid "B<Build-Conflicts-Indep:>I< package-list>"
 msgstr "B<Conflicts:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:128
+#: deb-src-control.5:130
 msgid ""
-"Same as Build-Conflicts, but only when building the architecture independent "
-"packages."
+"Same as B<Build-Conflicts>, but only when building the architecture "
+"independent packages."
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:139
+#: deb-src-control.5:141
 #, fuzzy
 msgid ""
 "The syntax of the B<Build-Depends> and B<Build-Depends-Indep> fields is a "
@@ -1145,7 +1166,7 @@
 "можно указать его версию."
 
 #. type: Plain text
-#: deb-src-control.5:148
+#: deb-src-control.5:150
 msgid ""
 "The syntax of the B<Build-Conflicts> and B<Build-Conflicts-Indep> fields is "
 "a list of comma-separated package names, where the comma is read as an \"AND"
@@ -1155,7 +1176,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:154
+#: deb-src-control.5:156
 #, fuzzy
 #| msgid ""
 #| "A version number may start with a `E<gt>E<gt>', in which case any later "
@@ -1179,7 +1200,7 @@
 "\"только версия, которая указана\"."
 
 #. type: Plain text
-#: deb-src-control.5:158
+#: deb-src-control.5:160
 msgid ""
 "A architecture specification consists of one or more architecture names, "
 "separated by whitespace. Exclamation marks may be prepended to each of the "
@@ -1187,7 +1208,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:163
+#: deb-src-control.5:165
 msgid ""
 "Note that dependencies on packages in the B<build-essential> set can be "
 "omitted and that declaring build conflicts against them is impossible. A "
@@ -1195,59 +1216,61 @@
 msgstr ""
 
 #. type: SH
-#: deb-src-control.5:165
+#: deb-src-control.5:167
 #, fuzzy, no-wrap
 #| msgid "OPTIONAL FIELDS"
 msgid "BINARY FIELDS"
 msgstr "НЕОБЯЗАТЕЛЬНЫЕ ПОЛЯ"
 
 #. type: Plain text
-#: deb-src-control.5:174
+#: deb-src-control.5:176
 msgid ""
 "Note that the B<Priority>, B<Section> and B<Homepage> fields can also be in "
 "a binary paragraph to override the global value from the source package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:175
+#: deb-src-control.5:177
 #, fuzzy, no-wrap
 #| msgid "B<Package:> E<lt>package nameE<gt>"
-msgid "B<Package:> E<lt>binary package nameE<gt> (required)"
+msgid "B<Package:> I<binary-package-name> (required)"
 msgstr "B<Package:> E<lt>имя пакетаE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:179
+#: deb-src-control.5:181
 msgid ""
 "This field is used to name the binary package name. The same restrictions as "
 "to a source package name apply."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:180
+#: deb-src-control.5:182
 #, fuzzy, no-wrap
 #| msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgid "B<Architecture:> E<lt>arch|all|anyE<gt> (required)"
+msgid "B<Architecture:> I<arch>|B<all>|B<any> (required)"
 msgstr "B<Architecture:> E<lt>архитектура|allE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:190
+#: deb-src-control.5:195
 msgid ""
 "The architecture specifies on which type of hardware this package runs. For "
 "packages that run on all architectures, use the B<any> value. For packages "
 "that are architecture independent, such as shell and Perl scripts or "
 "documentation, use the B<all> value. To restrict the packages to a certain "
-"set of architectures, specify the architecture names, separated by a space."
+"set of architectures, specify the architecture names, separated by a space. "
+"It's also possible to put architecture wildcards in that list (see B<dpkg-"
+"architecture>(1)  for more information about them)."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:191
+#: deb-src-control.5:196
 #, fuzzy, no-wrap
 #| msgid "B<Package:> E<lt>package nameE<gt>"
-msgid "B<Package-Type:> E<lt>deb|udebE<gt>"
+msgid "B<Package-Type:> B<deb>|B<udeb>"
 msgstr "B<Package:> E<lt>имя пакетаE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:196
+#: deb-src-control.5:201
 msgid ""
 "This field defines the type of the package. \"udeb\" is for size-constrained "
 "packages used by the debian installer. \"deb\" is the default value, it's "
@@ -1255,49 +1278,42 @@
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:214
-#, fuzzy, no-wrap
-#| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
-msgstr "B<Source:> E<lt>имя архивов с исходникамиE<gt>"
-
-#. type: TP
-#: deb-src-control.5:220
+#: deb-src-control.5:225
 #, fuzzy, no-wrap
 #| msgid "B<Description:> E<lt>short descriptionE<gt>"
-msgid "B<Description:> E<lt>short descriptionE<gt> (required)"
+msgid "B<Description:> I<short-description> (required)"
 msgstr "B<Description:> E<lt>короткое описаниеE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:227
+#: deb-src-control.5:232
 msgid ""
 "These fields are described in the B<deb-control>(5)  manual page, as they "
 "are copied literally to the control file of the binary package."
 msgstr ""
 
 #. type: TP
-#: deb-src-control.5:243
+#: deb-src-control.5:248
 #, fuzzy, no-wrap
 #| msgid "B<Replaces:> E<lt>package listE<gt>"
-msgid "B<Enhances:> E<lt>package listE<gt>"
+msgid "B<Enhances:>I< package-list>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: deb-src-control.5:265
+#: deb-src-control.5:270
 msgid ""
 "These fields declare relationships between packages. They are discussed in "
 "the B<deb-control>(5)  manpage and in the B<debian-policy> package."
 msgstr ""
 
 #. type: SH
-#: deb-src-control.5:266
+#: deb-src-control.5:271
 #, fuzzy, no-wrap
 #| msgid "REQUIRED FIELDS"
 msgid "USER-DEFINED FIELDS"
 msgstr "ОБЯЗАТЕЛЬНЫЕ ПОЛЯ"
 
 #. type: Plain text
-#: deb-src-control.5:281
+#: deb-src-control.5:286
 msgid ""
 "It is allowed to add additional user-defined fields to the control file. The "
 "tools will ignore these fields. If you want the fields to be copied over to "
@@ -1314,7 +1330,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:299
+#: deb-src-control.5:304
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -1329,11 +1345,11 @@
 "Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
-" libselinux1-dev (E<gt>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]\n"
+" libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:318
+#: deb-src-control.5:323
 #, no-wrap
 msgid ""
 "Package: dpkg-dev\n"
@@ -1342,8 +1358,8 @@
 "Architecture: all\n"
 "# this is a custom field in the binary package\n"
 "XB-Mentoring-Contact: Raphael Hertzog E<lt>hertzog@debian.orgE<gt>\n"
-"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2), bzip2, lzma,\n"
-" patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
+"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2),\n"
+" bzip2, lzma, patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
 "Recommends: gcc | c-compiler, build-essential\n"
 "Suggests: gnupg, debian-keyring\n"
 "Conflicts: dpkg-cross (E<lt>E<lt> 2.0.0), devscripts (E<lt>E<lt> 2.10.26)\n"
@@ -1357,7 +1373,7 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-src-control.5:325
+#: deb-src-control.5:330
 #, fuzzy
 msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
@@ -1369,10 +1385,10 @@
 msgstr "комплект dpkg"
 
 #. type: TH
-#: deb-split.5:1
+#: deb-split.5:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 dpkg-vendor.1:1 start-stop-daemon.8:1
 #, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-01-28"
+msgid "2011-07-04"
 msgstr "2006-02-28"
 
 # type: Plain text
@@ -1397,22 +1413,72 @@
 "file names might contain a trailing slash (since dpkg 1.15.6)."
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: deb-split.5:21
+#: deb-split.5:15
 msgid ""
 "The first member is named B<debian-split> and contains a series of lines, "
-"separated by newlines. Currently seven lines are present.  The first is the "
-"format version number, B<2.1> at the time this manual page was written. The "
-"second is the package name. The third is the package version. The fourth is "
-"the md5sum of the package.  The fifth is the total size of the package. The "
-"sixth is the maximum part size. The seventh is the current part number, "
-"followed by a slash and the total amount of parts (as in \\(oq1/10\\(cq)."
+"separated by newlines. Currently eight lines are present:"
+msgstr ""
+
+#. type: IP
+#: deb-split.5:15 deb-split.5:18 deb-split.5:20 deb-split.5:22 deb-split.5:24
+#: deb-split.5:26 deb-split.5:28 deb-split.5:31 dpkg-gensymbols.1:20
+#: dpkg-gensymbols.1:22 dpkg-gensymbols.1:24 dpkg-gensymbols.1:26
+#: dpkg-gensymbols.1:311 dpkg-gensymbols.1:317 dpkg-gensymbols.1:351
+#: dpkg-gensymbols.1:355 dpkg-gensymbols.1:358
+#, no-wrap
+msgid "\\(bu"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
+#: deb-split.5:18
+msgid ""
+"The format version number, B<2.1> at the time this manual page was written."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:20
+#, fuzzy
+msgid "The package name."
+msgstr "Пакет распакован и успешно настроен."
+
+#. type: Plain text
+#: deb-split.5:22
+#, fuzzy
+msgid "The package version."
+msgstr "Пакет выбран для установки."
+
 #. type: Plain text
 #: deb-split.5:24
+msgid "The md5sum of the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:26
+#, fuzzy
+msgid "The total size of the package."
+msgstr "Вручную просмотреть список пакетов:"
+
+#. type: Plain text
+#: deb-split.5:28
+msgid "The maximum part size."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:31
+msgid ""
+"The current part number, followed by a slash and the total amount of parts "
+"(as in \\(oq1/10\\(cq)."
+msgstr ""
+
+#. type: Plain text
+#: deb-split.5:33
+msgid "The package architecture (since dpkg 1.16.1)."
+msgstr ""
+
+# type: Plain text
+#. type: Plain text
+#: deb-split.5:36
 msgid ""
 "Programs which read multi-part archives should be prepared for additional "
 "lines to be present, and should ignore these if this is the case."
@@ -1420,7 +1486,7 @@
 
 # type: Plain text
 #. type: Plain text
-#: deb-split.5:29
+#: deb-split.5:41
 msgid ""
 "If the version 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 "
@@ -1428,25 +1494,23 @@
 "(except at the end), as described below."
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: deb-split.5:32
+#: deb-split.5:44
 msgid ""
-"The second, last required member is named B<data.>N, where N denotes the "
-"part number. It contains the raw part data."
+"The second, last required member is named B<data.>I<N>, where I<N> denotes "
+"the part number. It contains the raw part data."
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: deb-split.5:37
+#: deb-split.5:49
 msgid ""
 "These members must occur in this exact order. Current implementations should "
-"ignore any additional members after B<data.>N.  Further members may be "
+"ignore any additional members after B<data.>I<N>.  Further members may be "
 "defined in the future, and (if possible) will be placed after these two."
 msgstr ""
 
 #. type: Plain text
-#: deb-split.5:39
+#: deb-split.5:51
 #, fuzzy
 msgid "B<deb>(5), B<dpkg-split>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
@@ -1457,13 +1521,6 @@
 msgid "deb-version"
 msgstr "B<dpkg --version>"
 
-#. type: TH
-#: deb-version.5:5 dpkg-distaddfile.1:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-name.1:6
-#, fuzzy, no-wrap
-msgid "2008-08-18"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-version.5:8
 #, fuzzy
@@ -1472,7 +1529,7 @@
 
 #. type: Plain text
 #: deb-version.5:11
-msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgid "[I<epoch>B<:>]I<upstream-version>[B<->I<debian-revision>]"
 msgstr ""
 
 #. type: Plain text
@@ -1492,7 +1549,7 @@
 #: deb-version.5:20
 msgid ""
 "This is a single (generally small) unsigned integer.  It may be omitted, in "
-"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"which case zero is assumed.  If it is omitted then the I<upstream-version> "
 "may not contain any colons."
 msgstr ""
 
@@ -1507,7 +1564,7 @@
 #. type: TP
 #: deb-version.5:24
 #, fuzzy, no-wrap
-msgid "I<upstream_version>"
+msgid "I<upstream-version>"
 msgstr "B<dpkg --version>"
 
 #. type: Plain text
@@ -1525,16 +1582,16 @@
 #: deb-version.5:39
 msgid ""
 "The comparison behavior of the package management system with respect to the "
-"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"I<upstream-version> is described below. The I<upstream-version> portion of "
 "the version number is mandatory."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:48
 msgid ""
-"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"The I<upstream-version> may contain only alphanumerics (\"A-Za-z0-9\") and "
 "the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
-"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"tilde) and should start with a digit.  If there is no I<debian-revision> "
 "then hyphens are not allowed; if there is no I<epoch> then colons are not "
 "allowed."
 msgstr ""
@@ -1542,7 +1599,7 @@
 #. type: TP
 #: deb-version.5:48
 #, fuzzy, no-wrap
-msgid "I<debian_revision>"
+msgid "I<debian-revision>"
 msgstr "B<config-files>"
 
 #. type: Plain text
@@ -1551,13 +1608,13 @@
 "This part of the version number specifies the version of the Debian package "
 "based on the upstream version.  It may contain only alphanumerics and the "
 "characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
-"same way as the I<upstream_version> is."
+"same way as the I<upstream-version> is."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:64
 msgid ""
-"It is optional; if it isn't present then the I<upstream_version> may not "
+"It is optional; if it isn't present then the I<upstream-version> may not "
 "contain a hyphen.  This format represents the case where a piece of software "
 "was written specifically to be turned into a Debian package, and so there is "
 "only one \"debianisation\" of it and therefore no revision indication is "
@@ -1567,17 +1624,17 @@
 #. type: Plain text
 #: deb-version.5:68
 msgid ""
-"It is conventional to restart the I<debian_revision> at '1' each time time "
-"the I<upstream_version> is increased."
+"It is conventional to restart the I<debian-revision> at '1' each time time "
+"the I<upstream-version> is increased."
 msgstr ""
 
 #. type: Plain text
 #: deb-version.5:76
 msgid ""
 "Dpkg will break the version number apart at the last hyphen in the string "
-"(if there is one) to determine the I<upstream_version> and "
-"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
-"than the presence of one (but note that the I<debian_revision> is the least "
+"(if there is one) to determine the I<upstream-version> and I<debian-"
+"revision>. The absence of a I<debian-revision> compares earlier than the "
+"presence of one (but note that the I<debian-revision> is the least "
 "significant part of the version number)."
 msgstr ""
 
@@ -1590,7 +1647,7 @@
 #. type: Plain text
 #: deb-version.5:80
 msgid ""
-"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"The I<upstream-version> and I<debian-revision> parts are compared by the "
 "package management system using the same algorithm:"
 msgstr ""
 
@@ -1660,11 +1717,11 @@
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 #. type: SH
-#: deb-version.5:120 dpkg.1:797 dpkg-buildpackage.1:256 dpkg-distaddfile.1:47
-#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
+#: deb-version.5:120 dpkg.1:783 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:460
 #: dpkg-maintscript-helper.1:128 dpkg-parsechangelog.1:123
-#: dpkg-shlibdeps.1:331 dpkg-source.1:706 dselect.1:458
-#: start-stop-daemon.8:294 update-alternatives.8:493
+#: dpkg-shlibdeps.1:329 dpkg-source.1:730 dselect.1:451
+#: start-stop-daemon.8:323 update-alternatives.8:494
 #, no-wrap
 msgid "AUTHORS"
 msgstr "АВТОРЫ"
@@ -1675,19 +1732,19 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:262
+#: deb-version.5:124 dpkg-buildpackage.1:263
 #, fuzzy
 msgid "Copyright \\(co 2007 Frank Lichtenheld"
 msgstr "Copyright 2001 Joey Hess"
 
 #. type: Plain text
-#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:125
-#: dpkg-buildpackage.1:266 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
-#: dpkg-deb.1:256 dpkg-divert.8:139 dpkg-genchanges.1:154
-#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-maintscript-helper.1:139
-#: dpkg-mergechangelogs.1:71 dpkg-name.1:107 dpkg-parsechangelog.1:131
-#: dpkg-query.1:211 dpkg-shlibdeps.1:341 dpkg-source.1:714 dpkg-split.1:233
-#: dpkg-statoverride.8:92 dpkg-vendor.1:53 update-alternatives.8:500
+#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:273
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:269 dpkg-divert.8:139 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:464 dpkg-maintscript-helper.1:139
+#: dpkg-mergechangelogs.1:71 dpkg-name.1:108 dpkg-parsechangelog.1:131
+#: dpkg-query.1:219 dpkg-shlibdeps.1:339 dpkg-source.1:738 dpkg-split.1:227
+#: dpkg-statoverride.8:91 dpkg-vendor.1:53 update-alternatives.8:501
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
@@ -1703,12 +1760,6 @@
 msgid "deb-old"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-old.5:1
-#, no-wrap
-msgid "2006-02-28"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-old.5:4
 msgid "deb-old - old style Debian binary package format"
@@ -1787,12 +1838,6 @@
 msgstr "deb-control"
 
 #. type: TH
-#: deb-override.5:15
-#, fuzzy, no-wrap
-msgid "2007-03-07"
-msgstr "2006-02-28"
-
-#. type: TH
 #: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
 #: deb-symbols.5:2 deb-triggers.5:1 dpkg-architecture.1:1
 #: dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1
@@ -1965,7 +2010,7 @@
 
 #. type: Plain text
 #: deb-shlibs.5:34
-msgid "[I<type:>] I<library> I<version> I<dependencies>"
+msgid "[I<type>B<:>] I<library> I<version> I<dependencies>"
 msgstr ""
 
 #. type: Plain text
@@ -1982,8 +2027,8 @@
 msgstr ""
 
 #. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:728 dpkg-architecture.1:263
-#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:458
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:714 dpkg-architecture.1:262
+#: dpkg-divert.8:91 dpkg-name.1:65 update-alternatives.8:459
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "ПРИМЕРЫ"
@@ -2299,11 +2344,11 @@
 msgstr ""
 
 #. type: SH
-#: deb-substvars.5:145 dpkg.1:641 dpkg-architecture.1:285 dpkg.cfg.5:12
-#: dpkg-buildflags.1:103 dpkg-distaddfile.1:39 dpkg-divert.8:122
+#: deb-substvars.5:145 dpkg.1:627 dpkg-architecture.1:284 dpkg.cfg.5:12
+#: dpkg-buildflags.1:121 dpkg-distaddfile.1:39 dpkg-divert.8:122
 #: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
-#: dpkg-split.1:212 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:361
+#: dpkg-split.1:206 dpkg-statoverride.8:74 dselect.cfg.5:12
+#: update-alternatives.8:360
 #, no-wrap
 msgid "FILES"
 msgstr "ФАЙЛЫ"
@@ -2321,15 +2366,15 @@
 msgstr "Список доступных пакетов."
 
 #. type: SH
-#: deb-substvars.5:150 dpkg.1:794 dpkg-buildpackage.1:244 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:698 dpkg-split.1:197 dselect.1:436
-#: update-alternatives.8:485
+#: deb-substvars.5:150 dpkg.1:780 dpkg-buildpackage.1:244 dpkg-deb.1:238
+#: dpkg-name.1:86 dpkg-source.1:722 dpkg-split.1:199 dselect.1:429
+#: update-alternatives.8:486
 #, no-wrap
 msgid "BUGS"
 msgstr "ОШИБКИ РЕАЛИЗАЦИИ"
 
 #. type: Plain text
-#: deb-substvars.5:153 dpkg-source.1:701
+#: deb-substvars.5:153 dpkg-source.1:725
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -2344,27 +2389,27 @@
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 #. type: SH
-#: deb-substvars.5:161 dpkg-architecture.1:304 dpkg.cfg.5:19
-#: dpkg-buildflags.1:120 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
-#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:103
-#: dpkg-query.1:206 dpkg-scansources.1:77 dpkg-split.1:229
-#: dpkg-statoverride.8:88 dpkg-vendor.1:48 dselect.cfg.5:19
+#: deb-substvars.5:161 dpkg-architecture.1:303 dpkg.cfg.5:19
+#: dpkg-buildflags.1:266 dpkg-checkbuilddeps.1:40 dpkg-deb.1:265
+#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:104
+#: dpkg-query.1:214 dpkg-scansources.1:76 dpkg-split.1:223
+#: dpkg-statoverride.8:87 dpkg-vendor.1:48 dselect.cfg.5:19
 #, no-wrap
 msgid "AUTHOR"
 msgstr "АВТОР"
 
 #. type: Plain text
-#: deb-substvars.5:163 dpkg-buildpackage.1:258 dpkg-distaddfile.1:49
-#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:708
-#: dpkg-split.1:231
+#: deb-substvars.5:163 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
+#: dpkg-deb.1:267 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:331 dpkg-source.1:732
+#: dpkg-split.1:225
 msgid "Copyright \\(co 1995-1996 Ian Jackson"
 msgstr ""
 
 #. type: Plain text
-#: deb-substvars.5:165 dpkg-buildpackage.1:260 dpkg-distaddfile.1:51
+#: deb-substvars.5:165 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
 #: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
-#: dpkg-shlibdeps.1:335 dpkg-source.1:710 dpkg-statoverride.8:90
+#: dpkg-shlibdeps.1:333 dpkg-source.1:734 dpkg-statoverride.8:89
 #, fuzzy
 msgid "Copyright \\(co 2000 Wichert Akkerman"
 msgstr "Copyright 2001 Joey Hess"
@@ -2375,12 +2420,6 @@
 msgid "deb-symbols"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-symbols.5:2
-#, fuzzy, no-wrap
-msgid "2007-07-16"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-symbols.5:5
 msgid "deb-symbols - Debian's extended shared library information file"
@@ -2400,12 +2439,12 @@
 
 #. type: Plain text
 #: deb-symbols.5:14
-msgid "E<lt>library sonameE<gt> E<lt>main dependency templateE<gt>"
+msgid "I<library-soname main-dependency-template>"
 msgstr ""
 
 #. type: Plain text
 #: deb-symbols.5:16
-msgid "[ | E<lt>alternative dependency templateE<gt> ]"
+msgid "[ | I<alternative-dependency-template> ]"
 msgstr ""
 
 #. type: Plain text
@@ -2415,23 +2454,24 @@
 
 #. type: Plain text
 #: deb-symbols.5:20
-msgid "[ * E<lt>field-nameE<gt>: E<lt>field valueE<gt> ]"
-msgstr ""
+#, fuzzy
+msgid "[ * I<field-name>: I<field-value> ]"
+msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
 #. type: Plain text
 #: deb-symbols.5:23
 #, no-wrap
 msgid ""
 "[ ... ]\n"
-" E<lt>symbolE<gt> E<lt>minimal versionE<gt>[ E<lt>id of dependency templateE<gt> ]\n"
+" I<symbol> I<minimal-version>[ I<id-of-dependency-template> ]\n"
 msgstr ""
 
 #. type: Plain text
 #: deb-symbols.5:29
 msgid ""
-"The I<library soname> is exactly the value of the SONAME field as exported "
-"by B<objdump>(1). A I<dependency template> is a dependency where I<#MINVER#> "
-"is dynamically replaced either by a version check like \"(E<gt>= I<minimal "
+"The I<library-soname> is exactly the value of the SONAME field as exported "
+"by B<objdump>(1). A I<dependency-template> is a dependency where I<#MINVER#> "
+"is dynamically replaced either by a version check like \"(E<gt>= I<minimal-"
 "version>)\" or by nothing (if an unversioned dependency is deemed "
 "sufficient)."
 msgstr ""
@@ -2440,9 +2480,9 @@
 #: deb-symbols.5:36
 msgid ""
 "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> being "
-"\"Base\" if the library is not versioned) is associated to a I<minimal "
+"\"Base\" if the library is not versioned) is associated to a I<minimal-"
 "version> of its dependency template (the main dependency template is used if "
-"I<id of dependency template> is not present). The first alternative "
+"I<id-of-dependency-template> is not present). The first alternative "
 "dependency template is numbered 1, the second one 2, etc."
 msgstr ""
 
@@ -2452,8 +2492,8 @@
 "Each entry for a library can also have some fields of meta-information.  "
 "Those fields are stored on lines starting with an asterisk. Currently, the "
 "only valid field is I<Build-Depends-Package>, it indicates the name of the "
-"\"-dev\" package associated to the library and is used by dpkg-shlibdeps to "
-"make sure that the dependency generated is at least as strict as the "
+"\"-dev\" package associated to the library and is used by B<dpkg-shlibdeps> "
+"to make sure that the dependency generated is at least as strict as the "
 "corresponding build dependency."
 msgstr ""
 
@@ -2517,12 +2557,6 @@
 msgid "deb-triggers"
 msgstr "B<dpkg --version>"
 
-#. type: TH
-#: deb-triggers.5:1 dpkg-trigger.1:1
-#, fuzzy, no-wrap
-msgid "2009-03-15"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-triggers.5:4
 msgid "deb-triggers - package triggers"
@@ -2561,29 +2595,45 @@
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: deb-triggers.5:27
+#: deb-triggers.5:26
+#, fuzzy
+msgid "B<interest-noawait> I<trigger-name>"
+msgstr "B<--log=>I<имя файла>"
+
+#. type: Plain text
+#: deb-triggers.5:33
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file."
+"triggers control file. The \"noawait\" variant does not put the triggering "
+"packages in triggers-awaited state. This should be used when the "
+"functionality provided by the trigger is not crucial."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:31
+#: deb-triggers.5:37
 msgid "B<activate> I<trigger-name>"
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:37
+#: deb-triggers.5:41
+#, fuzzy
+msgid "B<activate-noawait> I<trigger-name>"
+msgstr "B<--log=>I<имя файла>"
+
+#. type: Plain text
+#: deb-triggers.5:50
 msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure."
+"conflicting package), purge and deconfigure.  The \"noawait\" variant does "
+"not put the triggering packages in triggers-awaited state. This should be "
+"used when the functionality provided by the trigger is not crucial."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:45
+#: deb-triggers.5:58
 msgid ""
 "If this package disappears during the unpacking of another package the "
 "trigger will be activated when the disappearance is noted towards the end of "
@@ -2593,14 +2643,23 @@
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:48
+#: deb-triggers.5:61
 msgid ""
 "Unknown directives are an error which will prevent installation of the "
 "package."
 msgstr ""
 
 #. type: Plain text
-#: deb-triggers.5:52
+#: deb-triggers.5:66
+msgid ""
+"The \"-noawait\" variants are only supported by dpkg 1.16.1 or newer, and "
+"will lead to errors if used with an older dpkg. It is thus recommended to "
+"add a \"Pre-Depends: dpkg (E<gt>= 1.16.1)\" to any package that wish to use "
+"those directives."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.5:70
 #, fuzzy
 msgid ""
 "B<dpkg-trigger>(1), B<dpkg>(1), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
@@ -2613,12 +2672,6 @@
 msgstr "dpkg"
 
 #. type: TH
-#: dpkg.1:1
-#, fuzzy, no-wrap
-msgid "2011-02-05"
-msgstr "2006-02-28"
-
-#. type: TH
 #: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
 #: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-query.1:1
 #: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.cfg.5:1
@@ -2633,7 +2686,9 @@
 
 #. type: Plain text
 #: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
+#, fuzzy
+#| msgid "B<dpkg> [I<options>] I<action>"
+msgid "B<dpkg> [I<option>...] I<action>"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: SH
@@ -2683,53 +2738,24 @@
 "действия."
 
 #. type: Plain text
-#: dpkg.1:31
-#, fuzzy
+#: dpkg.1:33
 msgid ""
-"B<dpkg> can 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:"
+"B<dpkg> can also be used as a front-end to B<dpkg-deb>(1) and B<dpkg-query>"
+"(1). The list of supported actions can be found later on in the B<ACTIONS> "
+"section. If any such action is encountered B<dpkg> just runs B<dpkg-deb> or "
+"B<dpkg-query> with the parameters given to it, but no specific options are "
+"currently passed to them, to use any such option the back-ends need to be "
+"called directly."
 msgstr ""
-"B<dpkg> может также использоваться как интерфейс к B<dpkg-deb>. "
-"Нижеследующие действия являются действиями B<dpkg-deb>, и если они "
-"встречаются, то B<dpkg> просто запускает B<dpkg-deb> с указанными "
-"параметрами:"
-
-#. 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> и\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
+#: dpkg.1:34
 #, no-wrap
 msgid "INFORMATION ABOUT PACKAGES"
 msgstr "ИНФОРМАЦИЯ О ПАКЕТАХ"
 
 #. type: Plain text
-#: dpkg.1:48
+#: dpkg.1:39
 msgid ""
 "B<dpkg> maintains some usable information about available packages. The "
 "information is divided in three classes: B<states>, B<selection states> and "
@@ -2741,65 +2767,65 @@
 "изменяется с помощью B<dselect>."
 
 #. type: SS
-#: dpkg.1:48
+#: dpkg.1:39
 #, no-wrap
 msgid "PACKAGE STATES"
 msgstr "СОСТОЯНИЯ ПАКЕТА"
 
 #. type: TP
-#: dpkg.1:49
+#: dpkg.1:40
 #, no-wrap
 msgid "B<not-installed>"
 msgstr "B<not-installed>"
 
 #. type: Plain text
-#: dpkg.1:52
+#: dpkg.1:43
 msgid "The package is not installed on your system."
 msgstr "Пакет в системе не установлен."
 
 #. type: TP
-#: dpkg.1:52
+#: dpkg.1:43
 #, no-wrap
 msgid "B<config-files>"
 msgstr "B<config-files>"
 
 #. type: Plain text
-#: dpkg.1:55
+#: dpkg.1:46
 msgid "Only the configuration files of the package exist on the system."
 msgstr "В системе остались только конфигурационные файлы пакета."
 
 #. type: TP
-#: dpkg.1:55
+#: dpkg.1:46
 #, no-wrap
 msgid "B<half-installed>"
 msgstr "B<half-installed>"
 
 #. type: Plain text
-#: dpkg.1:59
+#: dpkg.1:50
 msgid ""
 "The installation of the package has been started, but not completed for some "
 "reason."
 msgstr "Установка пакета была запущена, но не закончена по какой-либо причине."
 
 #. type: TP
-#: dpkg.1:59
+#: dpkg.1:50
 #, no-wrap
 msgid "B<unpacked>"
 msgstr "B<unpacked>"
 
 #. type: Plain text
-#: dpkg.1:62
+#: dpkg.1:53
 msgid "The package is unpacked, but not configured."
 msgstr "Пакет распакован, но не настроен."
 
 #. type: TP
-#: dpkg.1:62
+#: dpkg.1:53
 #, no-wrap
 msgid "B<half-configured>"
 msgstr "B<half-configured>"
 
 #. type: Plain text
-#: dpkg.1:66
+#: dpkg.1:57
 msgid ""
 "The package is unpacked and configuration has been started, but not yet "
 "completed for some reason."
@@ -2808,64 +2834,64 @@
 "какой-либо причине."
 
 #. type: TP
-#: dpkg.1:66
+#: dpkg.1:57
 #, no-wrap
 msgid "B<triggers-awaited>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:69
+#: dpkg.1:60
 msgid "The package awaits trigger processing by another package."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:69
+#: dpkg.1:60
 #, no-wrap
 msgid "B<triggers-pending>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:72
+#: dpkg.1:63
 #, fuzzy
 msgid "The package has been triggered."
 msgstr "Пакет распакован и успешно настроен."
 
 #. type: TP
-#: dpkg.1:72
+#: dpkg.1:63
 #, no-wrap
 msgid "B<installed>"
 msgstr "B<installed>"
 
 #. type: Plain text
-#: dpkg.1:75
+#: dpkg.1:66
 msgid "The package is unpacked and configured OK."
 msgstr "Пакет распакован и успешно настроен."
 
 #. type: SS
-#: dpkg.1:75
+#: dpkg.1:66
 #, no-wrap
 msgid "PACKAGE SELECTION STATES"
 msgstr "ВЫБРАННЫЕ СОСТОЯНИЯ ПАКЕТА"
 
 #. type: TP
-#: dpkg.1:76
+#: dpkg.1:67
 #, no-wrap
 msgid "B<install>"
 msgstr "B<install>"
 
 #. type: Plain text
-#: dpkg.1:79
+#: dpkg.1:70
 msgid "The package is selected for installation."
 msgstr "Пакет выбран для установки."
 
 #. type: TP
-#: dpkg.1:79
+#: dpkg.1:70
 #, no-wrap
 msgid "B<hold>"
 msgstr "B<hold>"
 
 #. type: Plain text
-#: dpkg.1:83
+#: dpkg.1:74
 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>."
@@ -2874,13 +2900,13 @@
 "если не указан параметр B<--force-hold>."
 
 #. type: TP
-#: dpkg.1:83
+#: dpkg.1:74
 #, no-wrap
 msgid "B<deinstall>"
 msgstr "B<deinstall>"
 
 #. type: Plain text
-#: dpkg.1:87
+#: dpkg.1:78
 msgid ""
 "The package is selected for deinstallation (i.e. we want to remove all "
 "files, except configuration files)."
@@ -2889,13 +2915,13 @@
 "конфигурационных)."
 
 #. type: TP
-#: dpkg.1:87
+#: dpkg.1:78
 #, no-wrap
 msgid "B<purge>"
 msgstr "B<purge>"
 
 #. type: Plain text
-#: dpkg.1:91
+#: dpkg.1:82
 #, fuzzy
 #| msgid ""
 #| "The package is selected to be purged (i.e. we want to remove everything, "
@@ -2908,19 +2934,19 @@
 "включая конфигурационные)."
 
 #. type: SS
-#: dpkg.1:91
+#: dpkg.1:82
 #, no-wrap
 msgid "PACKAGE FLAGS"
 msgstr "ФЛАГИ ПАКЕТА"
 
 #. type: TP
-#: dpkg.1:92
+#: dpkg.1:83
 #, no-wrap
 msgid "B<reinst-required>"
 msgstr "B<reinst-required>"
 
 #. type: Plain text
-#: dpkg.1:97
+#: dpkg.1:88
 msgid ""
 "A package marked B<reinst-required> is broken and requires reinstallation. "
 "These packages cannot be removed, unless forced with option B<--force-remove-"
@@ -2931,38 +2957,42 @@
 "B<--force-reinstreq>."
 
 #. type: SH
-#: dpkg.1:98
+#: dpkg.1:89 dselect.1:120
 #, no-wrap
 msgid "ACTIONS"
 msgstr "ДЕЙСТВИЯ"
 
 #. type: TP
-#: dpkg.1:99
+#: dpkg.1:90
 #, fuzzy, no-wrap
-msgid "B<-i>, B<--install> I<package_file>..."
+msgid "B<-i>, B<--install> I<package-file>..."
 msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
 
 #. type: Plain text
-#: dpkg.1:103
+#: dpkg.1:94
+#, fuzzy
+#| msgid ""
+#| "Install the package. If B<--recursive> or B<-R> option is specified, "
+#| "I<package_file> must refer to a directory instead."
 msgid ""
 "Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"I<package-file> must refer to a directory instead."
 msgstr ""
 "Установить заданный пакет. Если указан параметр B<--recursive> или B<-R>, то "
 "вместо I<имени файла пакета> должен быть указан каталог."
 
 #. type: Plain text
-#: dpkg.1:105
+#: dpkg.1:96
 msgid "Installation consists of the following steps:"
 msgstr "Установка состоит из следующих шагов:"
 
 #. type: Plain text
-#: dpkg.1:108
+#: dpkg.1:99
 msgid "B<1.> Extract the control files of the new package."
 msgstr "B<1.> Извлечение управляющих файлов нового пакета."
 
 #. type: Plain text
-#: dpkg.1:112
+#: dpkg.1:103
 msgid ""
 "B<2.> If another version of the same package was installed before the new "
 "installation, execute I<prerm> script of the old package."
@@ -2971,12 +3001,12 @@
 "сценарий I<prerm> из старого пакета."
 
 #. type: Plain text
-#: dpkg.1:115
+#: dpkg.1:106
 msgid "B<3.> Run I<preinst> script, if provided by the package."
 msgstr "B<3.> Запускается сценарий I<preinst>, если он есть в пакете."
 
 #. type: Plain text
-#: dpkg.1:119
+#: dpkg.1:110
 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."
@@ -2985,7 +3015,7 @@
 "если что-то пойдет не так, можно было их восстановить."
 
 #. type: Plain text
-#: dpkg.1:126
+#: dpkg.1:117
 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 "
@@ -2998,7 +3028,7 @@
 "записываются в то же самое время, когда удаляются старые."
 
 #. type: Plain text
-#: dpkg.1:130
+#: dpkg.1:121
 msgid ""
 "B<6.> Configure the package. See B<--configure> for detailed information "
 "about how this is done."
@@ -3007,28 +3037,32 @@
 "подробная информация об этом шаге."
 
 #. type: TP
-#: dpkg.1:130
+#: dpkg.1:121
 #, fuzzy, no-wrap
-msgid "B<--unpack >I<package_file>..."
+msgid "B<--unpack >I<package-file>..."
 msgstr "B<dpkg --unpack >I<имя файла пакета>..."
 
 #. type: Plain text
-#: dpkg.1:135
+#: dpkg.1:126
+#, 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 ""
 "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."
+"option is specified, I<package-file> must refer to a directory instead."
 msgstr ""
 "Распаковать пакет, но не настраивать. Если указан параметр B<--recursive> "
 "или B<--R>, то вместо I<имени файла пакета> должен быть указан каталог."
 
 #. type: TP
-#: dpkg.1:135
+#: dpkg.1:126
 #, fuzzy, no-wrap
 msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg --configure >I<имя пакета> ... | B<-a> | B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:140
+#: dpkg.1:131
 #, fuzzy
 #| msgid ""
 #| "Reconfigure an unpacked package. If B<-a> or B<--pending> is given "
@@ -3044,19 +3078,19 @@
 "пакеты будут настроены."
 
 #. type: Plain text
-#: dpkg.1:144
+#: dpkg.1:135
 msgid ""
 "To reconfigure a package which has already been configured, try the B<dpkg-"
 "reconfigure>(8)  command instead."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:146
+#: dpkg.1:137
 msgid "Configuring consists of the following steps:"
 msgstr "Настройка состоит из следующих шагов:"
 
 #. type: Plain text
-#: dpkg.1:151
+#: dpkg.1:142
 #, fuzzy
 msgid ""
 "B<1.> Unpack the conffiles, and at the same time back up the old conffiles, "
@@ -3067,18 +3101,18 @@
 "пойдет не так."
 
 #. type: Plain text
-#: dpkg.1:154
+#: dpkg.1:145
 msgid "B<2.> Run I<postinst> script, if provided by the package."
 msgstr "B<2.> Запуск сценария I<postinst>, если он есть в пакете."
 
 #. type: TP
-#: dpkg.1:154
+#: dpkg.1:145
 #, fuzzy, no-wrap
 msgid "B<--triggers-only> I<package>...|B<-a>|B<--pending>"
 msgstr "B<dpkg --configure >I<имя пакета> ... | B<-a> | B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:161
+#: dpkg.1:152
 msgid ""
 "Processes only triggers. All pending triggers will be processed. If package "
 "names are supplied only those packages' triggers will be processed, exactly "
@@ -3088,13 +3122,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:161
+#: dpkg.1:152
 #, fuzzy, no-wrap
 msgid "B<-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:178
+#: dpkg.1:169
 #, fuzzy
 msgid ""
 "Remove an installed package. B<-r> or B<--remove> remove everything except "
@@ -3122,33 +3156,33 @@
 "удаляются или полностью очищаются."
 
 #. type: Plain text
-#: dpkg.1:180
+#: dpkg.1:171
 msgid "Removing of a package consists of the following steps:"
 msgstr "Удаление пакета состоит из следующих шагов:"
 
 #. type: Plain text
-#: dpkg.1:183
+#: dpkg.1:174
 msgid "B<1.> Run I<prerm> script"
 msgstr "B<1.> Запуск сценария I<prerm>"
 
 #. type: Plain text
-#: dpkg.1:186
+#: dpkg.1:177
 msgid "B<2.> Remove the installed files"
 msgstr "B<2.> Удаление установленных фалов"
 
 #. type: Plain text
-#: dpkg.1:189
+#: dpkg.1:180
 msgid "B<3.> Run I<postrm> script"
 msgstr "B<3.> Запуск сценария I<postrm>"
 
 #. type: TP
-#: dpkg.1:190
+#: dpkg.1:181
 #, fuzzy, no-wrap
 msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<dpkg --update-avail> | B<--merge-avail > I <файл Packages>"
 
 #. type: Plain text
-#: dpkg.1:199
+#: dpkg.1:190
 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 "
@@ -3165,7 +3199,7 @@
 "файле I</var/lib/dpkg/available>."
 
 #. type: Plain text
-#: dpkg.1:204
+#: dpkg.1:195
 msgid ""
 "A simpler one-shot command to retrieve and update the I<available> file is "
 "B<dselect update>. Note that this file is mostly useless if you don't use "
@@ -3174,54 +3208,59 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:204
+#: dpkg.1:195
 #, fuzzy, no-wrap
-msgid "B<-A>, B<--record-avail> I<package_file>..."
+msgid "B<-A>, B<--record-avail> I<package-file>..."
 msgstr "B<dpkg -A> | B<--record-avail> I<имя файла пакета> ..."
 
 #. type: Plain text
-#: dpkg.1:210
+#: dpkg.1:201
+#, 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."
 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."
+"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<имя файла пакета>. Если задан параметр B<--recursive> или B<-R>, то "
 "вместо I<имени файла пакета> должен быть указан каталог."
 
 #. type: TP
-#: dpkg.1:210
+#: dpkg.1:201
 #, fuzzy, no-wrap
 msgid "B<--forget-old-unavail>"
 msgstr "B<dpkg --forget-old-unavail>"
 
 #. type: Plain text
-#: dpkg.1:214
+#: dpkg.1:205
 msgid ""
 "Now B<obsolete> and a no-op as B<dpkg> will automatically forget uninstalled "
 "unavailable packages."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:214
+#: dpkg.1:205
 #, fuzzy, no-wrap
 msgid "B<--clear-avail>"
 msgstr "B<dpkg --clear-avail>"
 
 #. type: Plain text
-#: dpkg.1:217
+#: dpkg.1:208
 msgid "Erase the existing information about what packages are available."
 msgstr "Очистить имеющуюся информацию о том, какие пакеты доступны."
 
 #. type: TP
-#: dpkg.1:217
+#: dpkg.1:208
 #, fuzzy, no-wrap
 msgid " B<-C>, B<--audit>"
 msgstr "B<-q>|B<--quiet>"
 
 #. type: Plain text
-#: dpkg.1:222
+#: dpkg.1:213
 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."
@@ -3230,13 +3269,13 @@
 "посоветует, что делать, чтобы восстановить их работоспособность."
 
 #. type: TP
-#: dpkg.1:222
+#: dpkg.1:213
 #, fuzzy, no-wrap
 msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
 
 #. type: Plain text
-#: dpkg.1:227
+#: dpkg.1:218
 #, fuzzy
 msgid ""
 "Get list of package selections, and write it to stdout. Without a pattern, "
@@ -3246,18 +3285,24 @@
 "Получить список выбранных пакетов и вывести его в стандартный выходной поток."
 
 #. type: TP
-#: dpkg.1:227 update-alternatives.8:300
+#: dpkg.1:218 update-alternatives.8:299
 #, fuzzy, no-wrap
 msgid "B<--set-selections>"
 msgstr "B<dpkg --set-selections>"
 
 #. type: Plain text
-#: dpkg.1:233
+#: dpkg.1:224
+#, 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."
 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 format 'I<package> I<state>', where state is one of B<install>, B<hold>, "
+"B<deinstall> or B<purge>. Blank lines and comment lines beginning with '#' "
+"are also permitted."
 msgstr ""
 "Установить список выбранных пакетов, принимая его со стандартного ввода. "
 "Этот файл должен быть в формате 'E<lt>пакетE<gt> E<lt>состояниеE<gt>', где "
@@ -3265,13 +3310,13 @@
 "строки и строки комментариев (начинающиеся с #)."
 
 #. type: TP
-#: dpkg.1:233
+#: dpkg.1:224
 #, fuzzy, no-wrap
 msgid "B<--clear-selections>"
 msgstr "B<dpkg --set-selections>"
 
 #. type: Plain text
-#: dpkg.1:238
+#: dpkg.1:229
 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 "
@@ -3279,13 +3324,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:238
+#: dpkg.1:229
 #, fuzzy, no-wrap
 msgid "B<--yet-to-unpack>"
 msgstr "B<dpkg --yet-to-unpack>"
 
 #. type: Plain text
-#: dpkg.1:242
+#: dpkg.1:233
 msgid ""
 "Searches for packages selected for installation, but which for some reason "
 "still haven't been installed."
@@ -3294,13 +3339,13 @@
 "установленные."
 
 #. type: TP
-#: dpkg.1:243
+#: dpkg.1:234
 #, fuzzy, no-wrap
 msgid "B<--print-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg.1:246
+#: dpkg.1:237
 #, fuzzy
 msgid ""
 "Print architecture of packages B<dpkg> installs (for example, \"i386\")."
@@ -3309,13 +3354,13 @@
 "\"i386\")."
 
 #. type: TP
-#: dpkg.1:246
+#: dpkg.1:237
 #, fuzzy, no-wrap
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
 #. type: Plain text
-#: dpkg.1:257
+#: dpkg.1:248
 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 "
@@ -3337,19 +3382,18 @@
 "только для совместимости с синтаксисом файла control."
 
 #. type: TP
-#: dpkg.1:257
+#: dpkg.1:248
 #, fuzzy, no-wrap
-msgid "B<--command-fd >I<E<lt>nE<gt>>"
+msgid "B<--command-fd >I<n>"
 msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:262
+#: dpkg.1:253
 #, fuzzy
 msgid ""
-"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and through this file "
-"descriptor, are not reset for subsequent commands executed during the same "
-"run."
+"Accept a series of commands on input file descriptor I<n>. Note: additional "
+"options set on the command line, and through this file descriptor, are not "
+"reset for subsequent commands executed during the same run."
 msgstr ""
 "Принимает серию команд из входного файлового дескриптора B<E<lt>nE<gt>>. "
 "Замечание: дополнительные параметры, заданные в командной строке, а также "
@@ -3357,73 +3401,73 @@
 "далее в этом запуске."
 
 #. type: TP
-#: dpkg.1:262 dpkg-architecture.1:61 dpkg-buildflags.1:71 dpkg-divert.8:71
-#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
-#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
+#: dpkg.1:253 dpkg-architecture.1:60 dpkg-buildflags.1:89 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:66 dpkg-statoverride.8:44
+#: dpkg-vendor.1:28 dselect.1:113 update-alternatives.8:316
 #, fuzzy, no-wrap
 msgid "B<--help>"
 msgstr "B<dpkg --help>"
 
 #. type: Plain text
-#: dpkg.1:265
+#: dpkg.1:256
 msgid "Display a brief help message."
 msgstr "Вывести небольшую подсказку."
 
 #. type: TP
-#: dpkg.1:265
+#: dpkg.1:256
 #, fuzzy, no-wrap
 msgid "B<--force-help>"
 msgstr "B<dpkg --force-help>"
 
 #. type: Plain text
-#: dpkg.1:268
+#: dpkg.1:259
 msgid "Give help about the B<--force->I<thing> options."
 msgstr "Вывести подсказку о параметрах B<--force->I<что-нибудь>."
 
 #. type: TP
-#: dpkg.1:268
+#: dpkg.1:259
 #, fuzzy, no-wrap
 msgid "B<-Dh>, B<--debug=help>"
 msgstr "B<--no-debsig>"
 
 #. type: Plain text
-#: dpkg.1:271
+#: dpkg.1:262
 msgid "Give help about debugging options."
 msgstr "Вывести подсказку о параметрах отладки."
 
 #. type: TP
-#: dpkg.1:271 dpkg-architecture.1:64 dpkg-buildflags.1:74
+#: dpkg.1:262 dpkg-architecture.1:63 dpkg-buildflags.1:92
 #: dpkg-buildpackage.1:226 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
-#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
-#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
-#: dpkg-shlibdeps.1:220 dpkg-source.1:93 dpkg-split.1:130
-#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
-#: update-alternatives.8:320
+#: dpkg-deb.1:175 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:113 dpkg-scanpackages.1:99 dpkg-scansources.1:68
+#: dpkg-shlibdeps.1:218 dpkg-source.1:99 dpkg-split.1:129
+#: dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:116
+#: update-alternatives.8:319
 #, fuzzy, no-wrap
 msgid "B<--version>"
 msgstr "B<dpkg --version>"
 
 #. type: Plain text
-#: dpkg.1:274
+#: dpkg.1:265
 msgid "Display B<dpkg> version information."
 msgstr "Показать информацию о версии B<dpkg>."
 
 #. type: TP
-#: dpkg.1:274
+#: dpkg.1:265
 #, fuzzy, no-wrap
 msgid "B<dpkg-deb actions>"
 msgstr "B<dpkg-deb-actions>"
 
 #. type: Plain text
-#: dpkg.1:277
+#: dpkg.1:268
 msgid "See B<dpkg-deb>(1) for more information about the following actions."
 msgstr ""
 "Смотрите B<dpkg-deb>(1) для более подробной информации о нижеследующих "
 "действиях."
 
 #. type: Plain text
-#: dpkg.1:297
+#: dpkg.1:288
 #, fuzzy, no-wrap
 msgid ""
 "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
@@ -3464,20 +3508,20 @@
 "    Извлекает и выдает имена файлов, содержащиеся в пакете.\n"
 
 #. type: TP
-#: dpkg.1:299
+#: dpkg.1:290
 #, fuzzy, no-wrap
 msgid "B<dpkg-query actions>"
 msgstr "B<dpkg-query-actions>"
 
 #. type: Plain text
-#: dpkg.1:302
+#: dpkg.1:293
 msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr ""
 "Смотрите B<dpkg-query>(1) для более подробной информации о нижеследующих "
 "действиях."
 
 #. type: Plain text
-#: dpkg.1:317
+#: dpkg.1:308
 #, fuzzy, no-wrap
 msgid ""
 "B<-l>, B<--list> I<package-name-pattern>...\n"
@@ -3506,20 +3550,20 @@
 "    из файла I</var/lib/dpkg/available>.\n"
 
 #. type: SH
-#: dpkg.1:319 dpkg-architecture.1:68 dpkg-buildpackage.1:50
-#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
+#: dpkg.1:310 dpkg-architecture.1:67 dpkg-buildpackage.1:50
+#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:179
 #: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
-#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
-#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
-#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
-#: start-stop-daemon.8:100 update-alternatives.8:324
+#: dpkg-gensymbols.1:369 dpkg-mergechangelogs.1:27 dpkg-name.1:30
+#: dpkg-parsechangelog.1:15 dpkg-query.1:117 dpkg-scanpackages.1:71
+#: dpkg-scansources.1:44 dpkg-shlibdeps.1:106 dpkg-split.1:133
+#: dpkg-statoverride.8:51 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:36
+#: start-stop-daemon.8:103 update-alternatives.8:323
 #, no-wrap
 msgid "OPTIONS"
 msgstr "ПАРАМЕТРЫ"
 
 #. type: Plain text
-#: dpkg.1:325
+#: dpkg.1:316
 #, fuzzy
 #| msgid ""
 #| "All options can be specified both on the command line and in the B<dpkg> "
@@ -3540,13 +3584,13 @@
 "начинается с B<#>)."
 
 #. type: TP
-#: dpkg.1:326
+#: dpkg.1:317
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<число>"
 
 #. type: Plain text
-#: dpkg.1:329
+#: dpkg.1:320
 #, fuzzy
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
@@ -3554,13 +3598,13 @@
 "умолчанию 50."
 
 #. type: TP
-#: dpkg.1:329
+#: dpkg.1:320
 #, fuzzy, no-wrap
 msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 #. type: Plain text
-#: dpkg.1:335
+#: dpkg.1:326
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -3572,13 +3616,13 @@
 "автоматической деконфигурации пакета, который зависит от удаляемого пакета."
 
 #. type: TP
-#: dpkg.1:335
+#: dpkg.1:326
 #, fuzzy, 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:341
+#: dpkg.1:332
 #, fuzzy
 msgid ""
 "Switch debugging on. I<octal> is formed by bitwise-orring desired values "
@@ -3591,7 +3635,7 @@
 "эти отладочные значения."
 
 #. type: Plain text
-#: dpkg.1:356
+#: dpkg.1:347
 #, fuzzy, no-wrap
 msgid ""
 "    Number   Description\n"
@@ -3622,13 +3666,13 @@
 " 2000   Невероятное количество ерунды\n"
 
 #. type: TP
-#: dpkg.1:356
+#: dpkg.1:347
 #, fuzzy, 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:363
+#: dpkg.1:354
 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<--"
@@ -3642,7 +3686,7 @@
 "выполняются по умолчанию."
 
 #. type: Plain text
-#: dpkg.1:367
+#: dpkg.1:358
 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 "
@@ -3653,13 +3697,13 @@
 "работоспособность всей системы.>"
 
 #. type: Plain text
-#: dpkg.1:370
+#: dpkg.1:361
 #, fuzzy
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: Включить (или выключить) все принудительные параметры."
 
 #. type: Plain text
-#: dpkg.1:373
+#: dpkg.1:364
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
@@ -3668,7 +3712,7 @@
 "версия."
 
 #. type: Plain text
-#: dpkg.1:380
+#: dpkg.1:371
 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 "
@@ -3684,7 +3728,7 @@
 "Использовать осторожно.>"
 
 #. type: Plain text
-#: dpkg.1:384
+#: dpkg.1:375
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
@@ -3693,12 +3737,12 @@
 "пакеты, от которых зависит текущий пакет."
 
 #. type: Plain text
-#: dpkg.1:387
+#: dpkg.1:378
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr "B<hold>: Обрабатывать даже пакеты, помеченные как \"зафиксированные\"."
 
 #. type: Plain text
-#: dpkg.1:392
+#: dpkg.1:383
 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 "
@@ -3709,7 +3753,7 @@
 "пакета останутся в системе, а B<dpkg> про них забудет."
 
 #. type: Plain text
-#: dpkg.1:397
+#: dpkg.1:388
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -3721,24 +3765,24 @@
 "работоспособности системы, так что используйте данный параметр осторожно."
 
 #. type: Plain text
-#: dpkg.1:400
+#: dpkg.1:391
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr "B<depends>: Превратить проблемы с зависимостями в предупреждения."
 
 #. type: Plain text
-#: dpkg.1:403
+#: dpkg.1:394
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
 "B<depends-version>: Не обращать внимание на версии при проверке зависимостей."
 
 #. type: Plain text
-#: dpkg.1:406
+#: dpkg.1:397
 msgid "B<breaks>: Install, even if this would break another package."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:410
+#: dpkg.1:401
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
@@ -3747,7 +3791,7 @@
 "опасно, так как обычно приводит к перезаписи некоторых файлов."
 
 #. type: Plain text
-#: dpkg.1:415
+#: dpkg.1:406
 #, fuzzy
 msgid ""
 "B<confmiss>: Always install a missing conffile. This is dangerous, since it "
@@ -3757,7 +3801,7 @@
 "опасно, так как не будут сохранены изменения (удаление) файла."
 
 #. type: Plain text
-#: dpkg.1:420
+#: dpkg.1:411
 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 "
@@ -3768,7 +3812,7 @@
 "force-confdef>, при котором предпочтение отдаётся действию по умолчанию."
 
 #. type: Plain text
-#: dpkg.1:425
+#: dpkg.1:416
 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 "
@@ -3779,7 +3823,7 @@
 "confdef>, при котором предпочтение отдаётся действию по умолчанию."
 
 #. type: Plain text
-#: dpkg.1:431
+#: dpkg.1:422
 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 "
@@ -3793,7 +3837,7 @@
 "делать)."
 
 #. type: Plain text
-#: dpkg.1:438
+#: dpkg.1:429
 #, fuzzy
 #| msgid ""
 #| "B<confdef>: If a conffile has been modified always choose the default "
@@ -3814,19 +3858,19 @@
 "делать)."
 
 #. type: Plain text
-#: dpkg.1:441
+#: dpkg.1:432
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
 "B<overwrite>: Перезаписать файл из одного пакета файлом из другого пакета."
 
 #. type: Plain text
-#: dpkg.1:444
+#: dpkg.1:435
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 "B<overwrite-dir>: Перезаписать каталог из одного пакета файлом из другого."
 
 #. type: Plain text
-#: dpkg.1:447
+#: dpkg.1:438
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
@@ -3834,7 +3878,7 @@
 "(diverted) его неизменённой версией."
 
 #. type: Plain text
-#: dpkg.1:455
+#: dpkg.1:446
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking. Currently "
 "this implies not performing file system syncs before file renames, which is "
@@ -3845,7 +3889,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:461
+#: dpkg.1:452
 msgid ""
 "I<Note>: For ext4, the main offender, consider using instead the mount "
 "option B<nodelalloc>, which will fix both the performance degradation and "
@@ -3855,21 +3899,28 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:464
+#: dpkg.1:455
 msgid ""
 "I<Warning: Using this option might improve performance at the cost of losing "
 "data, use with care.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:467
+#: dpkg.1:458
 #, fuzzy
 #| msgid "B<architecture>: Process even packages with the wrong architecture."
 msgid "B<architecture>: Process even packages with wrong or no architecture."
 msgstr "B<architecture>: Обрабатывать даже пакеты с неправильной архитектурой."
 
 #. type: Plain text
-#: dpkg.1:470
+#: dpkg.1:461
+#, fuzzy
+#| msgid "B<architecture>: Process even packages with the wrong architecture."
+msgid "B<bad-version>: Process even packages with wrong versions."
+msgstr "B<architecture>: Обрабатывать даже пакеты с неправильной архитектурой."
+
+#. type: Plain text
+#: dpkg.1:464
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -3877,27 +3928,27 @@
 "возникнуть проблемы."
 
 #. type: Plain text
-#: dpkg.1:473
+#: dpkg.1:467
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
 "B<not-root>: Попытаться установить или удалить пакет, даже если не нет прав "
 "суперпользователя."
 
 #. type: Plain text
-#: dpkg.1:476
+#: dpkg.1:470
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 "B<bad-verify>: Устанавливать пакет, даже если он не прошёл проверку "
 "подлинности."
 
 #. type: TP
-#: dpkg.1:477
+#: dpkg.1:471
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<пакет>,..."
 
 #. type: Plain text
-#: dpkg.1:481
+#: dpkg.1:475
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
@@ -3907,42 +3958,13 @@
 "ничего более)."
 
 #. type: TP
-#: dpkg.1:481
-#, fuzzy, no-wrap
-msgid "B<--new>, B<--old>"
-msgstr "B<--new> | B<--old>"
-
-#. type: Plain text
-#: dpkg.1:485
-msgid ""
-"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
-msgstr ""
-"Выбрать, соответственно, новый или старый формат пакета. Это параметр "
-"программы B<dpkg-deb>(1)."
-
-#. type: TP
-#: dpkg.1:485 dpkg-deb.1:209
-#, no-wrap
-msgid "B<--nocheck>"
-msgstr "B<--nocheck>"
-
-#. type: Plain text
-#: dpkg.1:489
-msgid ""
-"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.1:489
+#: dpkg.1:475
 #, fuzzy, 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:494
+#: dpkg.1:480
 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 "
@@ -3953,7 +3975,7 @@
 "указанного действия, но при этом ничего не меняется."
 
 #. type: Plain text
-#: dpkg.1:499
+#: dpkg.1:485
 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 "
@@ -3966,13 +3988,13 @@
 "удалить пакет --no-act, хотя вы ожидали, что ничего выполнено не будет)"
 
 #. type: TP
-#: dpkg.1:499
+#: dpkg.1:485
 #, fuzzy, no-wrap
 msgid "B<-R>, B<--recursive>"
 msgstr "B<-R> | B<--recursive>"
 
 #. type: Plain text
-#: dpkg.1:505
+#: dpkg.1:491
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -3984,13 +4006,13 @@
 "B<--avail>."
 
 #. type: TP
-#: dpkg.1:505
+#: dpkg.1:491
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg.1:509
+#: dpkg.1:495
 #, fuzzy
 msgid ""
 "Don't install a package if a newer version of the same package is already "
@@ -4000,14 +4022,14 @@
 "Это синоним параметра B<--refuse-downgrade>."
 
 #. type: TP
-#: dpkg.1:509 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
-#: dpkg-query.1:112 dpkg-shlibdeps.1:213 dpkg-trigger.1:39
+#: dpkg.1:495 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
+#: dpkg-query.1:118 dpkg-shlibdeps.1:211 dpkg-trigger.1:39
 #, no-wrap
 msgid "B<--admindir=>I<dir>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:514
+#: dpkg.1:500
 msgid ""
 "Change default administrative directory, which contains many files that give "
 "information about status of installed or uninstalled packages, etc.  "
@@ -4015,13 +4037,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:514
+#: dpkg.1:500
 #, fuzzy, no-wrap
 msgid "B<--instdir=>I<dir>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:521
+#: dpkg.1:507
 #, fuzzy
 msgid ""
 "Change default installation directory which refers to the directory where "
@@ -4040,26 +4062,26 @@
 "-- в значение I<dir>B</var/lib/dpkg>."
 
 #. type: TP
-#: dpkg.1:521
+#: dpkg.1:507
 #, fuzzy, no-wrap
 msgid "B<--root=>I<dir>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: dpkg.1:525
+#: dpkg.1:511
 msgid ""
 "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 "var/lib/dpkg>."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:525
+#: dpkg.1:511
 #, fuzzy, no-wrap
 msgid "B<-O>, B<--selected-only>"
 msgstr "B<-O> | B<--selected-only>"
 
 #. type: Plain text
-#: dpkg.1:531
+#: dpkg.1:517
 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 "
@@ -4071,13 +4093,13 @@
 "Например, когда пакет удаляется, он будет помечен для удаления."
 
 #. type: TP
-#: dpkg.1:531
+#: dpkg.1:517
 #, fuzzy, no-wrap
 msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E> | B<--skip-same-version>"
 
 #. type: Plain text
-#: dpkg.1:535
+#: dpkg.1:521
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
@@ -4085,17 +4107,17 @@
 "Не устанавливать пакет, если та же версия этого пакета уже установлена."
 
 #. type: Plain text
-#: dpkg.1:537
+#: dpkg.1:523
 msgid "B<--pre-invoke=>I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:539
+#: dpkg.1:525
 msgid "B<--post-invoke=>I<command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:548
+#: dpkg.1:534
 msgid ""
 "Set an invoke hook I<command> to be run via ``sh -c'' before or after the "
 "dpkg run for the I<unpack>, I<configure>, I<install>, I<triggers-only>, "
@@ -4108,33 +4130,33 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:551
+#: dpkg.1:537
 #, fuzzy
 msgid "B<--path-exclude=>I<glob-pattern>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:553
+#: dpkg.1:539
 #, fuzzy
 msgid "B<--path-include=>I<glob-pattern>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:556
+#: dpkg.1:542
 msgid ""
 "Set I<glob-pattern> as a path filter, either by excluding or re-including "
 "previously excluded paths matching the specified patterns during install."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:559
+#: dpkg.1:545
 msgid ""
 "I<Warning: take into account that depending on the excluded paths you might "
 "completely break your system, use with caution.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:569
+#: dpkg.1:555
 msgid ""
 "The glob patterns use the same wildcards used in the shell, were '*' matches "
 "any sequence of characters, including the empty string and also '/'. For "
@@ -4148,14 +4170,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:572
+#: dpkg.1:558
 msgid ""
 "This can be used to remove all paths except some particular ones; a typical "
 "case is:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:576
+#: dpkg.1:562
 #, no-wrap
 msgid ""
 "B<--path-exclude=/usr/share/doc/*>\n"
@@ -4163,12 +4185,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:579
+#: dpkg.1:565
 msgid "to remove all documentation files except the copyright files."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:583
+#: dpkg.1:569
 msgid ""
 "These two options can be specified multiple times, and interleaved with each "
 "other. Both are processed in the given order, with the last rule that "
@@ -4176,13 +4198,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:584
+#: dpkg.1:570
 #, fuzzy, no-wrap
 msgid "B<--status-fd >I<n>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:590
+#: dpkg.1:576
 msgid ""
 "Send machine-readable package status and progress information to file "
 "descriptor I<n>. This option can be specified multiple times. The "
@@ -4190,48 +4212,48 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:591
+#: dpkg.1:577
 #, no-wrap
 msgid "B<status: >I<package>B<: >I<status>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:594
+#: dpkg.1:580
 msgid "Package status changed; I<status> is as in the status file."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:594
+#: dpkg.1:580
 #, no-wrap
 msgid "B<status: >I<package>B< : error : >I<extended-error-message>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:598
+#: dpkg.1:584
 msgid ""
 "An error occurred. Any possible newlines in I<extended-error-message> will "
 "be converted to spaces before output."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:598
+#: dpkg.1:584
 #, no-wrap
 msgid "B<status: >I<file>B< : conffile-prompt : '>I<real-old>B<' '>I<real-new>B<' >I<useredited>B< >I<distedited>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:601
+#: dpkg.1:587
 msgid "User is being asked a conffile question."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:601
+#: dpkg.1:587
 #, no-wrap
 msgid "B<processing: >I<stage>B<: >I<package>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:606
+#: dpkg.1:592
 msgid ""
 "Sent just before a processing stage starts. I<stage> is one of B<upgrade>, "
 "B<install> (both sent before unpacking), B<configure>, B<trigproc>, "
@@ -4239,13 +4261,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:607
+#: dpkg.1:593
 #, fuzzy, no-wrap
 msgid "B<--status-logger>=I<command>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg.1:612
+#: dpkg.1:598
 msgid ""
 "Send machine-readable package status and progress information to the shell "
 "I<command>'s standard input. This option can be specified multiple times. "
@@ -4253,24 +4275,23 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:613
+#: dpkg.1:599
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: dpkg.1:625
+#: dpkg.1:611
 #, 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."
+"I<state> I<pkg> I<installed-version>' for status change updates; `YYYY-MM-DD "
+"HH:MM:SS I<action> I<pkg> I<installed-version> I<available-version>' for "
+"actions where I<action> is one of B<install>, B<upgrade>, B<remove>, "
+"B<purge>; and `YYYY-MM-DD HH:MM:SS conffile I<filename> I<decision>' for "
+"conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 "Протоколировать изменения обновлений и действия в I<файл>, вместо файл по "
 "умолчанию I</var/log/dpkg.log>. Если этот параметр указан несколько раз, то "
@@ -4285,24 +4306,24 @@
 "где I<E<lt>decision> может быть install или keep."
 
 #. type: TP
-#: dpkg.1:625
+#: dpkg.1:611
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--no-debsig>"
 
 #. type: Plain text
-#: dpkg.1:628
+#: dpkg.1:614
 msgid "Do not try to verify package signatures."
 msgstr "Не пытаться проверять подпись пакета."
 
 #. type: TP
-#: dpkg.1:628
+#: dpkg.1:614
 #, fuzzy, no-wrap
 msgid "B<--no-triggers>"
 msgstr "B<--no-debsig>"
 
 #. type: Plain text
-#: dpkg.1:637
+#: dpkg.1:623
 msgid ""
 "Do not run any triggers in this run (activations will still be recorded).  "
 "If used with B<--configure> I<package> or B<--triggers-only> I<package> then "
@@ -4313,42 +4334,42 @@
 msgstr ""
 
 #. type: TP
-#: dpkg.1:637
+#: dpkg.1:623
 #, fuzzy, no-wrap
 msgid "B<--triggers>"
 msgstr "B<-t>|B<--test>"
 
 #. type: Plain text
-#: dpkg.1:640
+#: dpkg.1:626
 msgid "Cancels a previous B<--no-triggers>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:642 dpkg.cfg.5:16
+#: dpkg.1:628 dpkg.cfg.5:16
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.1:645
+#: dpkg.1:631
 msgid "Configuration file with default options."
 msgstr "Файл конфигурации с параметрами по умолчанию."
 
 #. type: TP
-#: dpkg.1:645
+#: dpkg.1:631
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/log/dpkg.log>"
 
 #. type: Plain text
-#: dpkg.1:649
+#: dpkg.1:635
 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.1:652
+#: dpkg.1:638
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
@@ -4357,24 +4378,24 @@
 "параметр B<admindir>, чтобы узнать, как изменить местоположение этих файлов."
 
 #. type: TP
-#: dpkg.1:652
+#: dpkg.1:638
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg.1:655
+#: dpkg.1:641
 msgid "List of available packages."
 msgstr "Список доступных пакетов."
 
 #. type: TP
-#: dpkg.1:655
+#: dpkg.1:641
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 #. type: Plain text
-#: dpkg.1:661
+#: dpkg.1:647
 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, "
@@ -4385,14 +4406,14 @@
 "B<ИНФОРМАЦИЯ О ПАКЕТАХ>, где приведена подробная информация."
 
 #. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:650
 msgid ""
 "The status file is backed up daily in I</var/backups>. It can be useful if "
 "it's lost or corrupted due to filesystems troubles."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:653
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
@@ -4401,109 +4422,109 @@
 "(5), где приведена подробная информация:"
 
 #. type: TP
-#: dpkg.1:667
+#: dpkg.1:653
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 #. type: TP
-#: dpkg.1:669
+#: dpkg.1:655
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 #. type: TP
-#: dpkg.1:671
+#: dpkg.1:657
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 #. type: TP
-#: dpkg.1:673
+#: dpkg.1:659
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 #. type: TP
-#: dpkg.1:675
+#: dpkg.1:661
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 #. type: TP
-#: dpkg.1:677
+#: dpkg.1:663
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 #. type: SH
-#: dpkg.1:680 dpkg-buildflags.1:110 dpkg-buildpackage.1:230 dpkg-deb.1:219
-#: dpkg-divert.8:112 dpkg-query.1:196 dpkg-statoverride.8:69 dpkg-trigger.1:60
-#: dpkg-vendor.1:42 dselect.1:430 update-alternatives.8:355
+#: dpkg.1:666 dpkg-buildflags.1:128 dpkg-buildpackage.1:230 dpkg-deb.1:232
+#: dpkg-divert.8:112 dpkg-query.1:204 dpkg-statoverride.8:68 dpkg-trigger.1:60
+#: dpkg-vendor.1:42 dselect.1:423 update-alternatives.8:354
 #, fuzzy, no-wrap
 msgid "ENVIRONMENT"
 msgstr "ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ"
 
 #. type: TP
-#: dpkg.1:681 dselect.1:431
+#: dpkg.1:667 dselect.1:424
 #, fuzzy, no-wrap
 #| msgid "B<SHELL>"
 msgid "B<HOME>"
 msgstr "B<SHELL>"
 
 #. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:671
 msgid ""
 "If set, B<dpkg> will use it as the directory from which to read the user "
 "specific configuration file."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:685 dpkg-deb.1:220
+#: dpkg.1:671 dpkg-deb.1:233
 #, no-wrap
 msgid "B<TMPDIR>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:689
+#: dpkg.1:675
 msgid ""
 "If set, B<dpkg> will use it as the directory in which to create temporary "
 "files and directories."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:689
+#: dpkg.1:675
 #, fuzzy, no-wrap
 #| msgid "B<-G>"
 msgid "B<PAGER>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg.1:692
+#: dpkg.1:678
 #, fuzzy
 msgid "The program B<dpkg> will execute when displaying the conffiles."
 msgstr "Программа, которую запустит B<dpkg> при старте новой оболочки."
 
 #. type: TP
-#: dpkg.1:692
+#: dpkg.1:678
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 #. type: Plain text
-#: dpkg.1:695
+#: dpkg.1:681
 #, fuzzy
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr "Программа, которую запустит B<dpkg> при старте новой оболочки."
 
 #. type: TP
-#: dpkg.1:695 dpkg-query.1:201
+#: dpkg.1:681 dpkg-query.1:209
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 #. type: Plain text
-#: dpkg.1:699
+#: dpkg.1:685
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
@@ -4513,150 +4534,150 @@
 "B<-l>."
 
 #. type: TP
-#: dpkg.1:699
+#: dpkg.1:685
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_OLD_CONFFILE>"
 msgid "B<DPKG_SHELL_REASON>"
 msgstr "B<DPKG_OLD_CONFFILE>"
 
 #. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:689
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Current valid value: B<conffile-prompt>."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:703
+#: dpkg.1:689
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_OLD_CONFFILE>"
 msgid "B<DPKG_CONFFILE_OLD>"
 msgstr "B<DPKG_OLD_CONFFILE>"
 
 #. type: Plain text
-#: dpkg.1:707
+#: dpkg.1:693
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the old conffile."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:707
+#: dpkg.1:693
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_OLD_CONFFILE>"
 msgid "B<DPKG_CONFFILE_NEW>"
 msgstr "B<DPKG_OLD_CONFFILE>"
 
 #. type: Plain text
-#: dpkg.1:711
+#: dpkg.1:697
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the new conffile."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:711
+#: dpkg.1:697
 #, no-wrap
 msgid "B<DPKG_RUNNING_VERSION>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:715
+#: dpkg.1:701
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the version of "
 "the currently running B<dpkg> instance."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:715 dpkg-divert.8:117
+#: dpkg.1:701 dpkg-divert.8:117
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
-#: dpkg.1:719
+#: dpkg.1:705
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the package name "
 "being handled."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:719
+#: dpkg.1:705
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_MAINTSCRIPT_ARCH>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:709
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the architecture "
 "the package got built for."
 msgstr ""
 
 #. type: TP
-#: dpkg.1:723
+#: dpkg.1:709
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_MAINTSCRIPT_NAME>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
-#: dpkg.1:727
+#: dpkg.1:713
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the name of the "
 "script running (preinst, postinst, prerm, postrm)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg.1:730
+#: dpkg.1:716
 #, fuzzy
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr "Показать список пакетов, относящихся к редактору vi:"
 
 #. type: Plain text
-#: dpkg.1:732
+#: dpkg.1:718
 #, fuzzy, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "B< dpkg -l \\(aq*vi*\\(aq>"
 
 #. type: Plain text
-#: dpkg.1:735
+#: dpkg.1:721
 #, 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.1:737
+#: dpkg.1:723
 #, fuzzy, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr "B< dpkg --print-avail elvis vim | less>"
 
 #. type: Plain text
-#: dpkg.1:740
+#: dpkg.1:726
 msgid "To search the listing of packages yourself:"
 msgstr "Вручную просмотреть список пакетов:"
 
 #. type: Plain text
-#: dpkg.1:742
+#: dpkg.1:728
 #, fuzzy, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "B< less /var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg.1:745
+#: dpkg.1:731
 msgid "To remove an installed elvis package:"
 msgstr "Удалить установленный пакет elvis:"
 
 #. type: Plain text
-#: dpkg.1:747
+#: dpkg.1:733
 #, fuzzy, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "B< dpkg -r elvis>"
 
 #. type: Plain text
-#: dpkg.1:752
+#: dpkg.1:738
 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\":"
@@ -4666,7 +4687,7 @@
 "\" (\"редакторы\"):"
 
 #. type: Plain text
-#: dpkg.1:755
+#: dpkg.1:741
 #, fuzzy, no-wrap
 msgid ""
 "     B<cd /media/cdrom/pool/main/v/vim>\n"
@@ -4674,18 +4695,18 @@
 msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>"
 
 #. type: Plain text
-#: dpkg.1:758
+#: dpkg.1:744
 msgid "To make a local copy of the package selection states:"
 msgstr "Получить локальную копию состояний выбранных пакетов:"
 
 #. type: Plain text
-#: dpkg.1:760
+#: dpkg.1:746
 #, 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:764
+#: dpkg.1:750
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr ""
@@ -4693,7 +4714,7 @@
 "помощью:"
 
 #. type: Plain text
-#: dpkg.1:767
+#: dpkg.1:753
 #, fuzzy, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -4701,7 +4722,7 @@
 msgstr "B< dpkg --set-selections E<lt>myselections>"
 
 #. type: Plain text
-#: dpkg.1:773
+#: dpkg.1:759
 #, fuzzy
 msgid ""
 "Note that this will not actually install or remove anything, but just set "
@@ -4715,7 +4736,7 @@
 "Например, запустите B<dselect> и выберите \"Установить\"."
 
 #. type: Plain text
-#: dpkg.1:776
+#: dpkg.1:762
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
@@ -4724,13 +4745,13 @@
 "выбранных пакетов."
 
 #. type: SH
-#: dpkg.1:778
+#: dpkg.1:764
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr "ДОПОЛНИТЕЛЬНАЯ ФУНКЦИОНАЛЬНОСТЬ"
 
 #. type: Plain text
-#: dpkg.1:781
+#: dpkg.1:767
 #, fuzzy
 msgid ""
 "Additional functionality can be gained by installing any of the following "
@@ -4740,7 +4761,7 @@
 "следующих пакетов: I<apt>, I<aptitude> и I<debsums>."
 
 #. type: Plain text
-#: dpkg.1:793
+#: dpkg.1:779
 #, fuzzy
 msgid ""
 "B<aptitude>(1), B<apt>(1), B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), "
@@ -4750,12 +4771,12 @@
 "(5), B<dpkg.cfg>(5) и B<dpkg-reconfigure>(8)."
 
 #. type: Plain text
-#: dpkg.1:796
+#: dpkg.1:782
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> обычно дает меньше информации, чем могло бы быть полезным."
 
 #. type: Plain text
-#: dpkg.1:799 dpkg.cfg.5:22
+#: dpkg.1:785 dpkg.cfg.5:22
 #, fuzzy
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
@@ -4770,12 +4791,6 @@
 msgid "dpkg-architecture"
 msgstr "B<dpkg --print-architecture>"
 
-#. type: TH
-#: dpkg-architecture.1:1
-#, fuzzy, no-wrap
-msgid "2009-08-15"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-architecture.1:4
 msgid ""
@@ -4783,27 +4798,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:9
+#: dpkg-architecture.1:8
 #, fuzzy
-msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
+msgid "B<dpkg-architecture> [I<option>...] [I<command>]"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg-architecture.1:13
 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:16
 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:25
 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 "
@@ -4815,35 +4830,35 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:27 dpkg-buildflags.1:34 dpkg-deb.1:28 dpkg-divert.8:24
-#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
-#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
-#: update-alternatives.8:203
+#: dpkg-architecture.1:26 dpkg-buildflags.1:45 dpkg-deb.1:27 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:18 dpkg-split.1:31 dpkg-statoverride.8:23
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:34
+#: update-alternatives.8:202
 #, no-wrap
 msgid "COMMANDS"
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:28
+#: dpkg-architecture.1:27
 #, fuzzy, no-wrap
 msgid "B<-l>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 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:31
 #, fuzzy, no-wrap
 msgid "B<-e>I<debian-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 msgid ""
 "Check for equality of architecture. By default I<debian-architecture> is "
 "compared against the current Debian architecture, being the host.  This "
@@ -4852,13 +4867,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 #, no-wrap
 msgid "B<-i>I<architecture-wildcard>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 msgid ""
 "Check for identity of architecture by expanding I<architecture-wildcard> as "
 "an architecture wildcard and comparing against the current Debian "
@@ -4867,119 +4882,119 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 #, fuzzy, no-wrap
 msgid "B<-q>I<variable-name>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 msgid "Print the value of a single variable."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 #, fuzzy, no-wrap
 msgid "B<-s>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 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:50
 #, fuzzy, no-wrap
 msgid "B<-u>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 #, no-wrap
 msgid "B<-c>I< command>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 msgid ""
 "Execute a I<command> in an environment which has all variables set to the "
 "determined value."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 #, fuzzy, no-wrap
 msgid "B<-L>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-architecture.1:61
+#: dpkg-architecture.1:60
 msgid "Print a list of valid architecture names."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildflags.1:74 dpkg-buildpackage.1:226
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-architecture.1:63 dpkg-buildflags.1:92 dpkg-buildpackage.1:226
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:175
 #: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
-#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:93
-#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
-#: update-alternatives.8:320
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-name.1:61
+#: dpkg-parsechangelog.1:36 dpkg-query.1:113 dpkg-scanpackages.1:99
+#: dpkg-scansources.1:68 dpkg-shlibdeps.1:218 dpkg-source.1:99
+#: dpkg-split.1:129 dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31
+#: update-alternatives.8:319
 msgid "Show the usage message and exit."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildflags.1:77 dpkg-buildpackage.1:229
-#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-architecture.1:66 dpkg-buildflags.1:95 dpkg-buildpackage.1:229
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:178
 #: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
-#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
-#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:96
-#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
-#: update-alternatives.8:323
+#: dpkg-gensymbols.1:449 dpkg-mergechangelogs.1:44 dpkg-name.1:64
+#: dpkg-parsechangelog.1:39 dpkg-query.1:116 dpkg-scanpackages.1:102
+#: dpkg-scansources.1:70 dpkg-shlibdeps.1:221 dpkg-source.1:102
+#: dpkg-split.1:132 dpkg-statoverride.8:50 dpkg-trigger.1:37 dpkg-vendor.1:34
+#: update-alternatives.8:322
 #, fuzzy
 msgid "Show the version and exit."
 msgstr "Выдать информацию о версии и завершить работу."
 
 #. type: TP
-#: dpkg-architecture.1:69
+#: dpkg-architecture.1:68
 #, fuzzy, no-wrap
 msgid "B<-a>I<debian-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg-architecture.1:72
+#: dpkg-architecture.1:71
 msgid "Set the Debian architecture."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:72 dpkg-buildpackage.1:110
+#: dpkg-architecture.1:71 dpkg-buildpackage.1:110
 #, no-wrap
 msgid "B<-t>I<gnu-system-type>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 msgid "Set the GNU system type."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 #, fuzzy, no-wrap
 msgid "B<-f>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-architecture.1:82
+#: dpkg-architecture.1:81
 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 "
@@ -4989,54 +5004,54 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:83
+#: dpkg-architecture.1:82
 #, no-wrap
 msgid "TERMS"
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:84
+#: dpkg-architecture.1:83
 #, no-wrap
 msgid "build machine"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 msgid "The machine the package is built on."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 #, no-wrap
 msgid "host machine"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 msgid "The machine the package is built for."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 #, fuzzy, no-wrap
 msgid "Debian architecture"
 msgstr "Проект Debian"
 
 #. type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 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:90
 #, no-wrap
 msgid "architecture wildcard"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 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>-"
@@ -5044,13 +5059,13 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 #, no-wrap
 msgid "\\s-1GNU\\s0 system type"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:99
+#: dpkg-architecture.1:98
 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, "
@@ -5058,226 +5073,226 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:100
+#: dpkg-architecture.1:99
 #, fuzzy, no-wrap
 msgid "VARIABLES"
 msgstr "ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ"
 
 #. type: Plain text
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 msgid "The Debian architecture of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:106
+#: dpkg-architecture.1:105
 msgid "The Debian system name of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:106
+#: dpkg-architecture.1:105
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 msgid "The Debian cpu name of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 msgid "The pointer size of the build machine (in bits)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 msgid "The endianness of the build machine (little / big)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 #, no-wrap
 msgid "\\s-1DEB_BUILD_MULTIARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 msgid ""
 "The clarified \\s-1GNU\\s0 system type of the build machine, used for "
 "filesystem paths."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 msgid "The Debian architecture of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 msgid "The Debian system name of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 msgid "The Debian cpu name of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_BITS\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 msgid "The pointer size of the host machine (in bits)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_ENDIAN\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 msgid "The endianness of the host machine (little / big)."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgstr ""
 
 #. type: IP
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 #, no-wrap
 msgid "\\s-1DEB_HOST_MULTIARCH\\s0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:140
+#: dpkg-architecture.1:139
 msgid ""
 "The clarified \\s-1GNU\\s0 system type of the host machine, used for "
 "filesystem paths."
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:141
+#: dpkg-architecture.1:140
 #, no-wrap
 msgid "DEBIAN/RULES"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:149
+#: dpkg-architecture.1:148
 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 "
@@ -5288,12 +5303,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:152 dpkg-architecture.1:169
+#: dpkg-architecture.1:151 dpkg-architecture.1:168
 msgid "Instead of:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:156
+#: dpkg-architecture.1:155
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5301,12 +5316,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:159
+#: dpkg-architecture.1:158
 msgid "please use the following:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:163
+#: dpkg-architecture.1:162
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
@@ -5314,13 +5329,13 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:165
+#: dpkg-architecture.1:164
 #, 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:175
+#: dpkg-architecture.1:174
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5330,18 +5345,18 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:178
+#: dpkg-architecture.1:177
 msgid "please use:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:181
+#: dpkg-architecture.1:180
 #, no-wrap
 msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:185
+#: dpkg-architecture.1:184
 #, no-wrap
 msgid ""
 "ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
@@ -5350,14 +5365,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:189
+#: dpkg-architecture.1:188
 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:194
+#: dpkg-architecture.1:193
 msgid ""
 "In general, calling dpkg in the rules file to get architecture information "
 "is deprecated (unless you want to provide backward compatibility, see "
@@ -5366,13 +5381,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-architecture.1:195
+#: dpkg-architecture.1:194
 #, no-wrap
 msgid "BACKWARD COMPATIBILITY"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:199
+#: dpkg-architecture.1:198
 msgid ""
 "The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced in dpkg-"
 "dev 1.15.4. Using them in I<debian/rules> thus requires a build-dependency "
@@ -5380,7 +5395,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:204
+#: dpkg-architecture.1:203
 msgid ""
 "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in dpkg-"
 "dev 1.13.2. Before this I<debian/rules> files tended to check the values of "
@@ -5389,7 +5404,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:209
+#: dpkg-architecture.1:208
 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 "
@@ -5398,7 +5413,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:213
+#: dpkg-architecture.1:212
 #, no-wrap
 msgid ""
 "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
@@ -5406,7 +5421,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:227
+#: dpkg-architecture.1:226
 #, no-wrap
 msgid ""
 "# Take account of old dpkg-architecture output.\n"
@@ -5425,19 +5440,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:230
+#: dpkg-architecture.1:229
 msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:233
+#: dpkg-architecture.1:232
 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:243
+#: dpkg-architecture.1:242
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
@@ -5451,7 +5466,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:248
+#: dpkg-architecture.1:247
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
@@ -5461,14 +5476,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:252
+#: dpkg-architecture.1:251
 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:259
+#: dpkg-architecture.1:258
 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 "
@@ -5479,113 +5494,113 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:262
+#: dpkg-architecture.1:261
 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:266
+#: dpkg-architecture.1:265
 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:268
+#: dpkg-architecture.1:267
 msgid "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:270
+#: dpkg-architecture.1:269
 #, fuzzy
 msgid "eval \\`dpkg-architecture -u\\`"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg-architecture.1:273
+#: dpkg-architecture.1:272
 msgid ""
 "Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:275
+#: dpkg-architecture.1:274
 msgid "dpkg-architecture -elinux-alpha"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:277
+#: dpkg-architecture.1:276
 msgid "dpkg-architecture -amips -elinux-mips"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:280
+#: dpkg-architecture.1:279
 msgid ""
 "Check if the current architecture or an architecture provided with -a are "
 "Linux systems:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:282
+#: dpkg-architecture.1:281
 msgid "dpkg-architecture -ilinux-any"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:284
+#: dpkg-architecture.1:283
 msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 msgid ""
 "All these files have to be present for B<dpkg-architecture> to work. Their "
 "location can be overridden at runtime with the environment variable "
-"DPKG_DATADIR."
+"B<DPKG_DATADIR>."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 #, fuzzy, no-wrap
 msgid "I</usr/share/dpkg/cputable>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 msgid "Table of known CPU names and mapping to their GNU name."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 #, fuzzy, no-wrap
 msgid "I</usr/share/dpkg/ostable>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 msgid "Table of known operating system names and mapping to their GNU name."
 msgstr ""
 
 #. type: TP
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 #, fuzzy, no-wrap
 msgid "I</usr/share/dpkg/triplettable>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg-architecture.1:299
+#: dpkg-architecture.1:298
 msgid ""
 "Mapping between Debian architecture triplets and Debian architecture names."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.1:303
+#: dpkg-architecture.1:302
 #, 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-architecture.1:308
+#: dpkg-architecture.1:307
 msgid ""
 "B<dpkg-architecture> and this man page were initially written by Marcus "
 "Brinkmann E<lt>brinkmd@debian.orgE<gt>."
@@ -5598,7 +5613,7 @@
 msgstr "dpkg"
 
 #. type: TH
-#: dpkg.cfg.5:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1
 #, fuzzy, no-wrap
 msgid "2009-09-05"
 msgstr "2006-02-28"
@@ -5632,7 +5647,7 @@
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:214 dpkg-statoverride.8:87
+#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:222 dpkg-statoverride.8:86
 #, fuzzy
 msgid "B<dpkg>(1)."
 msgstr "B<date>(1)."
@@ -5643,6 +5658,12 @@
 msgid "dpkg-buildflags"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+msgid "2011-09-13"
+msgstr "2006-02-28"
+
 #. type: Plain text
 #: dpkg-buildflags.1:4
 msgid "dpkg-buildflags - returns build flags to use during package build"
@@ -5651,7 +5672,7 @@
 #. type: Plain text
 #: dpkg-buildflags.1:8
 #, fuzzy
-msgid "B<dpkg-buildflags> [I<option>...] I<command>"
+msgid "B<dpkg-buildflags> [I<option>...] [I<command>]"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
@@ -5699,96 +5720,153 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:22
-msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
+#: dpkg-buildflags.1:23
+msgid ""
+"temporarily by the user with environment variables (see section "
+"B<ENVIRONMENT>);"
+msgstr ""
+
+#. type: IP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "4."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:26
+msgid ""
+"dynamically by the package maintainer with environment variables set via "
+"B<debian/rules> (see section B<ENVIRONMENT>)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:28
 msgid "The configuration files can contain two types of directives:"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 #, no-wrap
 msgid "B<SET>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
 msgid "Override the flag named I<flag> to have the value I<value>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
+#, no-wrap
+msgid "B<STRIP>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:34
+msgid ""
+"Strip from the flag named I<flag> all the build flags listed in I<value>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:34
 #, no-wrap
 msgid "B<APPEND>I< flag value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:31
+#: dpkg-buildflags.1:38
+msgid ""
+"Extend the flag named I<flag> by appending the options given in I<value>.  A "
+"space is prepended to the appended value if the flag's current value is non-"
+"empty."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:38
+#, no-wrap
+msgid "B<PREPEND>I< flag value>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:42
 msgid ""
-"Extend the flag named I<flag> with the options given in I<value>.  A space "
-"is prepended to the appended value if the flag's current value is non-empty."
+"Extend the flag named I<flag> by prepending the options given in I<value>.  "
+"A space is appended to the prepended value if the flag's current value is "
+"non-empty."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:34
+#: dpkg-buildflags.1:45
 msgid ""
 "The configuration files can contain comments on lines starting with a hash "
 "(#). Empty lines are also ignored."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:35
+#: dpkg-buildflags.1:46
+#, fuzzy, no-wrap
+msgid "B<--dump>"
+msgstr "B<--no-debsig>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:51
+msgid ""
+"Print to standard output all compilation flags and their values. It prints "
+"one flag per line separated from its value by an equal sign "
+"(\"I<flag>=I<value>\"). This is the default action."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:51
 #, fuzzy, no-wrap
 msgid "B<--list>"
 msgstr "B<install>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 msgid ""
 "Print the list of flags supported by the current vendor (one per line). See "
 "the B<SUPPORTED FLAGS> section for more information about them."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 #, fuzzy, no-wrap
 msgid "B<--export=>I<format>"
 msgstr "B<-r>|B<--chroot> I<root>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 msgid ""
 "Print to standard output shell (if I<format> is B<sh>) or make (if I<format> "
 "is B<make>) commands that can be used to export all the compilation flags in "
-"the environment. If the I<format> value is not given, B<sh> is assumed. Only "
-"compilation flags starting with an upper case character are included, others "
-"are assumed to not be suitable for the environment."
+"the environment. If I<format> is B<configure> then the output can be used on "
+"a B<./configure> command-line. If the I<format> value is not given, B<sh> is "
+"assumed. Only compilation flags starting with an upper case character are "
+"included, others are assumed to not be suitable for the environment."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 #, fuzzy, no-wrap
 msgid "B<--get>I< flag>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 msgid ""
 "Print the value of the flag on standard output. Exits with 0 if the flag is "
 "known otherwise exits with 1."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 #, fuzzy, no-wrap
 msgid "B<--origin>I< flag>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:57
+#: dpkg-buildflags.1:75
 msgid ""
 "Print the origin of the value that is returned by B<--get>. Exits with 0 if "
 "the flag is known otherwise exits with 1. The origin can be one of the "
@@ -5796,63 +5874,63 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:58
+#: dpkg-buildflags.1:76
 #, fuzzy, no-wrap
 msgid "B<vendor>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 msgid "the original flag set by the vendor is returned;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 #, fuzzy, no-wrap
 msgid "B<system>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 msgid "the flag is set/modified by a system-wide configuration;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 #, fuzzy, no-wrap
 msgid "B<user>"
 msgstr "B<purge>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 msgid "the flag is set/modified by a user-specific configuration;"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 #, fuzzy, no-wrap
 msgid "B<env>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:70
+#: dpkg-buildflags.1:88
 msgid "the flag is set/modified by an environment-specific configuration."
 msgstr ""
 
 #. type: SH
-#: dpkg-buildflags.1:78
+#: dpkg-buildflags.1:96
 #, no-wrap
 msgid "SUPPORTED FLAGS"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:79
+#: dpkg-buildflags.1:97
 #, fuzzy, no-wrap
 msgid "B<CFLAGS>"
 msgstr "B<COLUMNS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 msgid ""
 "Options for the C compiler. The default value set by the vendor includes I<-"
 "g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
@@ -5860,46 +5938,46 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 #, no-wrap
 msgid "B<CPPFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 msgid "Options for the C preprocessor. Default value: empty."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 #, no-wrap
 msgid "B<CXXFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 msgid "Options for the C++ compiler. Same as B<CFLAGS>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 #, no-wrap
 msgid "B<FFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 #, no-wrap
 msgid "B<LDFLAGS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:102
+#: dpkg-buildflags.1:120
 msgid ""
 "Options passed to the compiler when linking executables or shared objects "
 "(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
@@ -5907,57 +5985,320 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:104
+#: dpkg-buildflags.1:122
 #, fuzzy, no-wrap
 #| msgid "I</etc/dpkg/dpkg.cfg>"
 msgid "B</etc/dpkg/buildflags.conf>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 msgid "System wide configuration file."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 #, no-wrap
 msgid "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or B<$HOME/.config/dpkg/buildflags.conf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildflags.1:110
+#: dpkg-buildflags.1:128
 msgid "User configuration file."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-buildflags.1:135
+msgid ""
+"There are 2 sets of environment variables doing the same operations, the "
+"first one (DEB_I<flag>_I<op>) should never be used within B<debian/rules>. "
+"It's meant for any user that wants to rebuild the source package with "
+"different build flags. The second set (DEB_I<flag>_MAINT_I<op>) should only "
+"be used in B<debian/rules> by package maintainers to change the resulting "
+"build flags."
+msgstr ""
+
 #. type: TP
-#: dpkg-buildflags.1:111
+#: dpkg-buildflags.1:135
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_SET>"
 msgstr ""
 
+#. type: TQ
+#: dpkg-buildflags.1:137
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_SET>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
 msgid ""
 "This variable can be used to force the value returned for the given I<flag>."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:141
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_STRIP>"
+msgstr ""
+
+#. type: TQ
+#: dpkg-buildflags.1:143
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_STRIP>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:148
+msgid ""
+"This variable can be used to provide a space separated list of options that "
+"will be stripped from the set of flags returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:148
 #, no-wrap
 msgid "B<DEB_>I<flag>B<_APPEND>"
 msgstr ""
 
+#. type: TQ
+#: dpkg-buildflags.1:150
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_APPEND>"
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:119
+#: dpkg-buildflags.1:154
 msgid ""
 "This variable can be used to append supplementary options to the value "
 "returned for the given I<flag>."
 msgstr ""
 
+#. type: TP
+#: dpkg-buildflags.1:154
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_PREPEND>"
+msgstr ""
+
+#. type: TQ
+#: dpkg-buildflags.1:156
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_PREPEND>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:160
+msgid ""
+"This variable can be used to prepend supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:160
+#, no-wrap
+msgid "B<DEB_BUILD_MAINT_OPTIONS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:165
+msgid ""
+"This variable can be used to disable/enable various hardening build flags "
+"through the B<hardening> option. See the B<HARDENING> section for details."
+msgstr ""
+
+#. type: SH
+#: dpkg-buildflags.1:166
+#, fuzzy, no-wrap
+#| msgid "WARNING"
+msgid "HARDENING"
+msgstr "ПРЕДУПРЕЖДЕНИЕ"
+
+#. type: Plain text
+#: dpkg-buildflags.1:171
+msgid ""
+"Several compile-time options (detailed below) can be used to help harden a "
+"resulting binary against memory corruption attacks, or provide additional "
+"warning messages during compilation. Except as noted below, these are "
+"enabled by default for architectures that support them."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:177
+msgid ""
+"Each hardening feature can be enabled and disabled in the "
+"B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value with "
+"the \"+\" and \"-\" modifier. For example, to enable the \"pie\" feature and "
+"disable the \"fortify\" feature you can do this in B<debian/rules>:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:179
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:183
+msgid ""
+"The special feature B<all> can be used to enable or disable all hardening "
+"features at the same time. Thus disabling everything and enabling only "
+"\"format\" and \"fortify\" can be achieved with:"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:185
+#, no-wrap
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n"
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:186
+#, fuzzy, no-wrap
+msgid "B<format>"
+msgstr "B<--abort-after=>I<число>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:198
+msgid ""
+"This setting (enabled by default) adds B<-Wformat -Wformat-security -"
+"Werror=format-security> to B<CFLAGS> and B<CXXFLAGS>. This will warn about "
+"improper format string uses, and will fail when format functions are used in "
+"a way that that represent possible security problems. At present, this warns "
+"about calls to B<printf> and B<scanf> functions where the format string is "
+"not a string literal and there are no format arguments, as in B<printf(foo);"
+"> instead of B<printf(\"%s\", foo);> This may be a security hole if the "
+"format string came from untrusted input and contains \"%n\"."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:199
+#, no-wrap
+msgid "B<fortify>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:210
+msgid ""
+"This setting (enabled by default) adds B<-D_FORTIFY_SOURCE=2> to "
+"B<CPPFLAGS>. During code generation the compiler knows a great deal of "
+"information about buffer sizes (where possible), and attempts to replace "
+"insecure unlimited length buffer function calls with length-limited ones. "
+"This is especially useful for old, crufty code.  Additionally, format "
+"strings in writable memory that contain '%n' are blocked. If an application "
+"depends on such a format string, it will need to be worked around."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:213
+msgid ""
+"Note that for this option to have any effect, the source must also be "
+"compiled with B<-O1> or higher."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:213
+#, no-wrap
+msgid "B<stackprotector>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:222
+msgid ""
+"This setting (enabled by default) adds B<-fstack-protector --param=ssp-"
+"buffer-size=4> to B<CFLAGS> and B<CXXFLAGS>. This adds safety checks against "
+"stack overwrites. This renders many potential code injection attacks into "
+"aborting situations. In the best case this turns code injection "
+"vulnerabilities into denial of service or into non-issues (depending on the "
+"application)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:226
+msgid ""
+"This feature requires linking against glibc (or another provider of "
+"B<__stack_chk_fail>), so needs to be disabled when building with B<-"
+"nostdlib> or B<-ffreestanding> or similar."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:227
+#, fuzzy, no-wrap
+#| msgid "B<purge>"
+msgid "B<relro>"
+msgstr "B<purge>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:235
+msgid ""
+"This setting (enabled by default) adds B<-Wl,-z,relro> to B<LDFLAGS>.  "
+"During program load, several ELF memory sections need to be written to by "
+"the linker. This flags the loader to turn these sections read-only before "
+"turning over control to the program. Most notably this prevents GOT "
+"overwrite attacks."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:236
+#, no-wrap
+msgid "B<bindnow>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:243
+msgid ""
+"This setting (disabled by default) adds B<-Wl,-z,now> to B<LDFLAGS>. During "
+"program load, all dynamic symbols are resolved, allowing for the entire PLT "
+"to be marked read-only (due to B<relro> above)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.1:244
+#, no-wrap
+msgid "B<pie>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:256
+msgid ""
+"This setting (disabled by default) adds B<-fPIE> to B<CFLAGS> and "
+"B<CXXFLAGS>, and B<-fPIE -pie> to B<LDFLAGS>. Position Independent "
+"Executable are needed to take advantage of Address Space Layout "
+"Randomization, supported by some kernel versions. While ASLR can already be "
+"enforced for data areas in the stack and heap (brk and mmap), the code areas "
+"must be compiled as position-independent. Shared libraries already do this (-"
+"fPIC), so they gain ASLR automatically, but binary .text regions need to be "
+"build PIE to gain ASLR. When this happens, ROP (Return Oriented Programming) "
+"attacks are much harder since there are no static locations to bounce off of "
+"during a memory corruption attack."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:259
+msgid ""
+"This is not compatible with B<-fPIC> so care must be taken when building "
+"shared objects."
+msgstr ""
+
 #. type: Plain text
-#: dpkg-buildflags.1:122 dpkg-maintscript-helper.1:130
+#: dpkg-buildflags.1:265
+msgid ""
+"Additionally, since PIE is implemented via a general register, some "
+"architectures (most notably i386) can see performance losses of up to 15% in "
+"very text-segment-heavy application workloads; most workloads see less than "
+"1%. Architectures with more general registers (e.g. amd64)  do not see as "
+"high a worst-case penalty."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.1:268
 #, fuzzy
-msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgid "Copyright \\(co 2010-2011 Rapha\\[:e]l Hertzog"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: Plain text
+#: dpkg-buildflags.1:270
+#, fuzzy
+msgid "Copyright \\(co 2011 Kees Cook"
 msgstr "Copyright 2001 Joey Hess"
 
 #. type: TH
@@ -5974,7 +6315,7 @@
 #. type: Plain text
 #: dpkg-buildpackage.1:8
 #, fuzzy
-msgid "B<dpkg-buildpackage> [I<options>]"
+msgid "B<dpkg-buildpackage> [I<option>...]"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
@@ -6231,7 +6572,7 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:96 dpkg-genchanges.1:49 dpkg-gencontrol.1:38
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 #, fuzzy, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<-V>|B<--version>"
@@ -6314,7 +6655,7 @@
 msgstr "dpkg-checkbuilddeps -- проверяет сборочные зависимости и конфликты"
 
 #. type: TP
-#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:427
+#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:432
 #, fuzzy, no-wrap
 msgid "B<-d>"
 msgstr "B<-B>"
@@ -6497,8 +6838,8 @@
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:116
-#: dpkg-shlibdeps.1:217 dpkg-trigger.1:43
+#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:122
+#: dpkg-shlibdeps.1:215 dpkg-trigger.1:43
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
 "lib/dpkg>."
@@ -6506,10 +6847,10 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:223 dpkg-checkbuilddeps.1:33 dpkg-distaddfile.1:32
-#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
-#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
-#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:90 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-deb.1:172 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
+#: dpkg-gensymbols.1:443 dpkg-name.1:58 dpkg-parsechangelog.1:33
+#: dpkg-query.1:110 dpkg-scanpackages.1:96 dpkg-shlibdeps.1:215
+#: dpkg-source.1:96 dpkg-split.1:126 dpkg-trigger.1:31
 #, fuzzy, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr "B<-H>|B<--help>"
@@ -6517,7 +6858,7 @@
 #. type: Plain text
 #: dpkg-buildpackage.1:234
 msgid ""
-"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"Even if B<dpkg-buildpackage> exports some variables, B<debian/rules> should "
 "not rely on their presence and should instead use the respective interface "
 "to retrieve the needed values."
 msgstr ""
@@ -6539,15 +6880,15 @@
 #. type: SS
 #: dpkg-buildpackage.1:238
 #, no-wrap
-msgid "Compiler flags"
+msgid "Compiler flags are no longer exported"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-buildpackage.1:243
 msgid ""
-"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
-"environment variables are set to the values that B<dpkg-buildflags> "
-"returned. See its manual page for more information."
+"Between versions 1.14.17 and 1.16.1, B<dpkg-buildpackage> exported compiler "
+"flags (B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS>) with "
+"values as returned by B<dpkg-buildflags>. This is no longer the case."
 msgstr ""
 
 #. type: Plain text
@@ -6558,15 +6899,15 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-buildpackage.1:255
+#: dpkg-buildpackage.1:256
 #, fuzzy
 msgid ""
-"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
-"B<fakeroot>(1), B<gpg>(1)."
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
+"genchanges>(1), B<fakeroot>(1), B<gpg>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 #. type: Plain text
-#: dpkg-buildpackage.1:264 dpkg-source.1:712
+#: dpkg-buildpackage.1:265
 #, fuzzy
 msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
 msgstr "Copyright 2001 Joey Hess"
@@ -6577,12 +6918,6 @@
 msgid "dpkg-checkbuilddeps"
 msgstr "dpkg-checkbuilddeps"
 
-#. type: TH
-#: dpkg-checkbuilddeps.1:1
-#, fuzzy, no-wrap
-msgid "2009-11-21"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:4
 msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
@@ -6591,7 +6926,7 @@
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:9
 #, fuzzy
-msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgid "B<dpkg-checkbuilddeps> [I<option>...] [I<control-file>]"
 msgstr "B<dpkg-checkbuilddeps> -B<-B> [I<файл control>]"
 
 #. type: Plain text
@@ -6608,8 +6943,12 @@
 
 #. type: Plain text
 #: 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."
 msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
+"By default, B<debian/control> is read, but an alternate control filename may "
 "be specified on the command line."
 msgstr ""
 "По умолчанию читается I<debian/control>, но в командной строке можно задать "
@@ -6663,7 +7002,7 @@
 #. type: Plain text
 #: dpkg-distaddfile.1:8
 #, fuzzy
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+msgid "B<dpkg-distaddfile> [I<option>...]I< filename section priority>"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
@@ -6718,25 +7057,19 @@
 msgid "dpkg-deb"
 msgstr "dpkg"
 
-#. type: TH
-#: dpkg-deb.1:1 dpkg-query.1:1 dselect.1:1
-#, fuzzy, no-wrap
-msgid "2010-03-07"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-deb.1:4
 msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:9
+#: dpkg-deb.1:8
 #, fuzzy
-msgid "B<dpkg-deb> [I<options>] I<command>"
+msgid "B<dpkg-deb> [I<option>...] I<command>"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
-#: dpkg-deb.1:13
+#: dpkg-deb.1:12
 #, fuzzy
 msgid ""
 "B<dpkg-deb> packs, unpacks and provides information about Debian archives."
@@ -6745,12 +7078,12 @@
 "действиях."
 
 #. type: Plain text
-#: dpkg-deb.1:17
+#: dpkg-deb.1:16
 msgid "Use B<dpkg> to install and remove packages from your system."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:27
+#: dpkg-deb.1:26
 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> "
@@ -6758,13 +7091,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:29
+#: dpkg-deb.1:28
 #, no-wrap
 msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:41
+#: dpkg-deb.1:40
 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 "
@@ -6774,7 +7107,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-deb.1:52
 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 "
@@ -6784,19 +7117,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:60
+#: dpkg-deb.1:59
 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-deb.1:62
+#: dpkg-deb.1:61
 msgid "If the archive to be created already exists it will be overwritten."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 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 "
@@ -6807,26 +7140,26 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 #, 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
+#: dpkg-deb.1:80
 #, fuzzy
 msgid "Provides information about a binary package archive."
 msgstr "Очистить имеющуюся информацию о том, какие пакеты доступны."
 
 #. type: Plain text
-#: dpkg-deb.1:86
+#: dpkg-deb.1:85
 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-deb.1:94
+#: dpkg-deb.1:93
 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 "
@@ -6835,13 +7168,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 #, fuzzy, no-wrap
 msgid "B<-W>, B<--show> I<archive>"
 msgstr "B<-d>|B<--chdir> I<путь>"
 
 #. type: Plain text
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 msgid ""
 "Provides information about a binary package archive in the format specified "
 "by the B<--showformat> argument. The default format displays the package's "
@@ -6849,26 +7182,26 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 #, 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
+#: dpkg-deb.1:103
 #, fuzzy
 msgid "Extracts control file information from a binary package archive."
 msgstr "B<1.> Извлечение управляющих файлов нового пакета."
 
 #. type: Plain text
-#: dpkg-deb.1:108
+#: dpkg-deb.1:107
 msgid ""
 "If no B<control-file-field>s are specified then it will print the whole "
 "control file."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:117
+#: dpkg-deb.1:116
 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-"
@@ -6877,18 +7210,18 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 msgid "No errors are reported for fields requested but not found."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 #, fuzzy, no-wrap
 msgid "B<-c>, B<--contents> I<archive>"
 msgstr "B<--new> | B<--old>"
 
 #. type: Plain text
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 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 "
@@ -6896,100 +7229,115 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 #, fuzzy, no-wrap
 msgid "B<-x>, B<--extract> I<archive directory>"
 msgstr "B<-x>|B<--exec> I<исполняемый_файл>"
 
 #. type: Plain text
-#: dpkg-deb.1:129
+#: dpkg-deb.1:128
 msgid ""
 "Extracts the filesystem tree from a package archive into the specified "
 "directory."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:135
+#: dpkg-deb.1:134
 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-deb.1:139
+#: dpkg-deb.1:138
 msgid ""
 "I<directory> (but not its parents) will be created if necessary, and its "
 "permissions modified to match the contents of the package."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:139
+#: dpkg-deb.1:138
 #, no-wrap
 msgid "B<-X>, B<--vextract> I<archive directory>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:144
+#: dpkg-deb.1:145
+msgid ""
+"Is like B<--extract> (B<-x>)  with B<--verbose> (B<-v>)  which prints a "
+"listing of the files extracted as it goes."
+msgstr ""
+
+#. type: TP
+#: dpkg-deb.1:145
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--raw-extract> I<archive directory>"
+msgstr "B<-x>|B<--exec> I<исполняемый_файл>"
+
+#. type: Plain text
+#: dpkg-deb.1:150
+msgid ""
+"Extracts the filesystem tree from a package archive into a specified "
+"directory, and the control information files into a DEBIAN subdirectory of "
+"the specified directory."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-deb.1:152 dpkg-deb.1:172
 msgid ""
-"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
-"it goes."
+"The target directory (but not its parents) will be created if necessary."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:144
+#: dpkg-deb.1:152
 #, no-wrap
 msgid "B<--fsys-tarfile> I<archive>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
 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."
+"to extract a particular file from a package archive.  The input archive will "
+"always be processed sequentially."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
 #, fuzzy, no-wrap
 msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<-x>|B<--exec> I<исполняемый_файл>"
 
 #. type: Plain text
-#: dpkg-deb.1:156
+#: dpkg-deb.1:165
 msgid ""
 "Extracts the control information files from a package archive into the "
 "specified directory."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:160
+#: dpkg-deb.1:169
 msgid ""
-"If no directory is specified then a subdirectory B<DEBIAN> in the current "
-"directory is used."
-msgstr ""
-
-#. type: Plain text
-#: dpkg-deb.1:163
-msgid ""
-"The target directory (but not its parents) will be created if necessary."
+"If no directory is specified then a subdirectory B<DEBIAN> in the current "
+"directory is used."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:171
+#: dpkg-deb.1:180
 #, no-wrap
 msgid "B<--showformat=>I<format>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:176 dpkg-query.1:121
+#: dpkg-deb.1:185 dpkg-query.1:127
 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."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:185
+#: dpkg-deb.1:194
 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 "
@@ -6999,31 +7347,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:187
+#: dpkg-deb.1:196
 msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:187
-#, no-wrap
-msgid "B<-z>I<compress_level>"
-msgstr ""
+#: dpkg-deb.1:196
+#, fuzzy, no-wrap
+msgid "B<-z>I<compress-level>"
+msgstr "B<-t>|B<--test>"
 
 #. type: Plain text
-#: dpkg-deb.1:191
+#: dpkg-deb.1:200
 msgid ""
-"Specify which compression level to pass to the compressor backend program, "
-"when building a package."
+"Specify which compression level to use on the compressor backend, when "
+"building a package (default is 9 for gzip and bzip2, 6 for xz and lzma)."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:191
+#: dpkg-deb.1:200
 #, fuzzy, no-wrap
-msgid "B<-Z>I<compress_type>"
+msgid "B<-Z>I<compress-type>"
 msgstr "B<-t>|B<--test>"
 
 #. type: Plain text
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 msgid ""
 "Specify which compression type to use when building a package. Allowed "
 "values are I<gzip>, I<xz>, I<bzip2>, I<lzma>, and I<none> (default is "
@@ -7031,25 +7379,25 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 #, fuzzy, no-wrap
 msgid "B<--new>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 msgid ""
 "Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
 
 #. type: TP
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 #, fuzzy, no-wrap
 msgid "B<--old>"
 msgstr "B<hold>"
 
 #. type: Plain text
-#: dpkg-deb.1:209
+#: dpkg-deb.1:218
 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 "
@@ -7057,39 +7405,58 @@
 "0.93.76 (September 1995), which was released as i386 a.out only."
 msgstr ""
 
+#. type: TP
+#: dpkg-deb.1:218
+#, no-wrap
+msgid "B<--nocheck>"
+msgstr "B<--nocheck>"
+
 #. type: Plain text
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224
 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:215
+#: dpkg-deb.1:224 start-stop-daemon.8:255
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--verbose>"
+msgstr "B<-v>|B<--verbose>"
+
+#. type: Plain text
+#: dpkg-deb.1:228
+msgid ""
+"Enables verbose output. This currently only affects B<--extract> making it "
+"behave like B<--vextract>."
+msgstr ""
+
+#. type: TP
+#: dpkg-deb.1:228
 #, fuzzy, no-wrap
 msgid "B<-D>, B<--debug>"
 msgstr "B<--no-debsig>"
 
 #. type: Plain text
-#: dpkg-deb.1:218
+#: dpkg-deb.1:231
 msgid "Enables debugging output. This is not very interesting."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:224
+#: dpkg-deb.1:237
 msgid ""
 "If set, B<dpkg-deb> will use it as the directory in which to create "
 "temporary files and directories."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:230
+#: dpkg-deb.1:243
 msgid ""
 "B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:238
+#: dpkg-deb.1:251
 msgid ""
 "There is no authentication on B<.deb> files; in fact, there isn't even a "
 "straightforward checksum.  (Higher level tools like APT support "
@@ -7099,7 +7466,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:245
+#: dpkg-deb.1:258
 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 "
@@ -7107,7 +7474,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.1:251
+#: dpkg-deb.1:264
 #, 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)."
@@ -7118,13 +7485,6 @@
 msgid "dpkg-divert"
 msgstr ""
 
-#. type: TH
-#: dpkg-divert.8:1
-#, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-10-12"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-divert.8:4
 msgid "dpkg-divert - override a package's version of a file"
@@ -7133,7 +7493,7 @@
 #. type: Plain text
 #: dpkg-divert.8:9
 #, fuzzy
-msgid "B<dpkg-divert> [I<options>] I<command>"
+msgid "B<dpkg-divert> [I<option>...] I<command>"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
@@ -7167,7 +7527,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:28 dpkg-statoverride.8:36
+#: 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>>"
@@ -7213,7 +7573,8 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:43 dpkg-statoverride.8:53 update-alternatives.8:329
+#: dpkg-divert.8:43 dpkg-statoverride.8:52 dselect.1:44
+#: update-alternatives.8:328
 #, fuzzy, no-wrap
 msgid "B<--admindir>I< directory>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
@@ -7266,7 +7627,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:61 dpkg-statoverride.8:65 update-alternatives.8:351
+#: dpkg-divert.8:61 dpkg-statoverride.8:64 update-alternatives.8:350
 #, fuzzy, no-wrap
 msgid "B<--quiet>"
 msgstr "B<-q>|B<--quiet>"
@@ -7309,9 +7670,9 @@
 #. type: Plain text
 #: dpkg-divert.8:82
 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 adding, default is B<--local> and B<--divert> I<original>B<.distrib>. "
+"When removing, B<--package> or B<--local> and B<--divert> must match if "
+"specified."
 msgstr ""
 
 #. type: Plain text
@@ -7372,15 +7733,15 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-divert.8:113 dpkg-query.1:197 dpkg-statoverride.8:70 dpkg-trigger.1:61
-#: update-alternatives.8:356
+#: dpkg-divert.8:113 dpkg-query.1:205 dpkg-statoverride.8:69 dpkg-trigger.1:61
+#: update-alternatives.8:355
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_ADMINDIR>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
-#: dpkg-divert.8:117 dpkg-query.1:201 dpkg-statoverride.8:74 dpkg-trigger.1:65
+#: dpkg-divert.8:117 dpkg-query.1:209 dpkg-statoverride.8:73 dpkg-trigger.1:65
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the dpkg data directory."
@@ -7389,7 +7750,7 @@
 #. type: Plain text
 #: dpkg-divert.8:121
 msgid ""
-"If set and the I<--local> and I<--package> options have not been specified, "
+"If set and the B<--local> and B<--package> options have not been specified, "
 "B<dpkg-divert> will use it as the package name."
 msgstr ""
 
@@ -7415,7 +7776,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-divert.8:137 update-alternatives.8:495
+#: dpkg-divert.8:137 update-alternatives.8:496
 msgid "Copyright \\(co 1995 Ian Jackson"
 msgstr ""
 
@@ -7433,7 +7794,7 @@
 #. type: Plain text
 #: dpkg-genchanges.1:8
 #, fuzzy
-msgid "B<dpkg-genchanges> [I<options>]"
+msgid "B<dpkg-genchanges> [I<option>...]"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
@@ -7524,21 +7885,21 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:121
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:127
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-source.1:131
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:169
+#: dpkg-source.1:131
 #, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr ""
@@ -7554,29 +7915,29 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:131
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:137
 #, 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:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 msgid "Override or add an output control file field."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 #, fuzzy, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:137
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:143
 msgid "Remove an output control file field."
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:98
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:104
 #, fuzzy, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "I<control>"
@@ -7590,7 +7951,7 @@
 
 #. type: TP
 #: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
@@ -7611,14 +7972,14 @@
 
 #. type: TP
 #: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 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 "
@@ -7640,7 +8001,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-genchanges.1:123 dpkg-gensymbols.1:416
+#: dpkg-genchanges.1:123 dpkg-gensymbols.1:421
 #, fuzzy, no-wrap
 msgid "B<-q>"
 msgstr "B<-B>"
@@ -7674,7 +8035,7 @@
 #. type: Plain text
 #: dpkg-gencontrol.1:8
 #, fuzzy
-msgid "B<dpkg-gencontrol> [I<options>]"
+msgid "B<dpkg-gencontrol> [I<option>...]"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
@@ -7736,7 +8097,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:368
+#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:373
 #, fuzzy, no-wrap
 msgid "B<-p>I<package>"
 msgstr "B<unpacked>"
@@ -7795,7 +8156,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:386 dpkg-shlibdeps.1:152
+#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:391 dpkg-shlibdeps.1:150
 #, fuzzy, no-wrap
 msgid "B<-O>"
 msgstr "B<-B>"
@@ -7829,7 +8190,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:339
+#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:337
 #, fuzzy
 msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 msgstr "Copyright 2001 Joey Hess"
@@ -7840,12 +8201,6 @@
 msgid "dpkg-gensymbols"
 msgstr "deb-control"
 
-#. type: TH
-#: dpkg-gensymbols.1:2
-#, fuzzy, no-wrap
-msgid "2009-08-07"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-gensymbols.1:5
 msgid ""
@@ -7856,7 +8211,7 @@
 #. type: Plain text
 #: dpkg-gensymbols.1:9
 #, fuzzy
-msgid "B<dpkg-gensymbols> [I<options>]"
+msgid "B<dpkg-gensymbols> [I<option>...]"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
@@ -7877,14 +8232,6 @@
 "found):"
 msgstr ""
 
-#. type: IP
-#: dpkg-gensymbols.1:20 dpkg-gensymbols.1:22 dpkg-gensymbols.1:24
-#: dpkg-gensymbols.1:26 dpkg-gensymbols.1:306 dpkg-gensymbols.1:312
-#: dpkg-gensymbols.1:346 dpkg-gensymbols.1:350 dpkg-gensymbols.1:353
-#, no-wrap
-msgid "\\(bu"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-gensymbols.1:22
 msgid "debian/I<package>.symbols.I<arch>"
@@ -7958,14 +8305,23 @@
 "patch should ideally only add new lines."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-gensymbols.1:64
+msgid ""
+"Note that you can put comments in symbols files: any line with '#' as the "
+"first character is a comment except if it starts with '#include' (see "
+"section B<Using includes>). Lines starting with '#MISSING:' are special "
+"comments documenting symbols that have disappeared."
+msgstr ""
+
 #. type: SS
-#: dpkg-gensymbols.1:59
+#: dpkg-gensymbols.1:64
 #, no-wrap
 msgid "Using #PACKAGE# substitution"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 msgid ""
 "In some rare cases, the name of the library varies between architectures.  "
 "To avoid hardcoding the name of the package in the symbols file, you can use "
@@ -7975,13 +8331,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 #, no-wrap
 msgid "Using symbol tags"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:74
+#: dpkg-gensymbols.1:79
 msgid ""
 "Symbol tagging is useful for marking symbols that are special in some way.  "
 "Any symbol can have an arbitrary number of tags associated with it. While "
@@ -7991,7 +8347,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:86
+#: dpkg-gensymbols.1:91
 msgid ""
 "Tag specification comes right before the symbol name (no whitespace is "
 "allowed in between). It always starts with an opening bracket B<(>, ends "
@@ -8007,7 +8363,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:90
+#: dpkg-gensymbols.1:95
 #, no-wrap
 msgid ""
 " (tag1=i am marked|tag name with space)\"tagged quoted symbol\"@Base 1.0\n"
@@ -8016,7 +8372,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:96
+#: dpkg-gensymbols.1:101
 msgid ""
 "The first symbol in the example is named I<tagged quoted symbol> and has two "
 "tags: I<tag1> with value I<i am marked> and I<tag name with space> that has "
@@ -8026,7 +8382,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 msgid ""
 "Since symbol tags are an extension of the I<deb-symbols(5)> format, they can "
 "only be part of the symbols files used in source packages (those files "
@@ -8041,20 +8397,20 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 #, no-wrap
 msgid "Standard symbol tags"
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:109
+#: dpkg-gensymbols.1:114
 #, fuzzy, no-wrap
 #| msgid "B<not-installed>"
 msgid "B<optional>"
 msgstr "B<not-installed>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:119
+#: dpkg-gensymbols.1:124
 msgid ""
 "A symbol marked as optional can disappear from the library at any time and "
 "that will never cause B<dpkg-gensymbols> to fail. However, disappeared "
@@ -8067,7 +8423,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 msgid ""
 "This tag is useful for symbols which are private where their disappearance "
 "do not cause ABI breakage. For example, most of C++ template instantiations "
@@ -8077,13 +8433,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 #, fuzzy, no-wrap
 msgid "B<arch=>I<architecture list>"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:137
+#: dpkg-gensymbols.1:142
 msgid ""
 "This tag allows one to restrict the set of architectures where the symbol is "
 "supposed to exist. When the symbols list is updated with the symbols "
@@ -8099,7 +8455,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:143
+#: dpkg-gensymbols.1:148
 msgid ""
 "When operating in the default non-template mode, among arch-specific symbols "
 "only those that match the current host architecture are written to the "
@@ -8109,7 +8465,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:149
+#: dpkg-gensymbols.1:154
 msgid ""
 "The format of I<architecture list> is the same as the one used in the "
 "I<Build-Depends> field of I<debian/control> (except the enclosing square "
@@ -8119,7 +8475,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid ""
 " (arch=alpha amd64 kfreebsd-amd64 ia64)a_64bit_specific_symbol@Base 1.0\n"
@@ -8127,13 +8483,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, fuzzy, no-wrap
 msgid "B<ignore-blacklist>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:160
+#: dpkg-gensymbols.1:165
 msgid ""
 "dpkg-gensymbols has an internal blacklist of symbols that should not appear "
 "in symbols files as they are usually only side-effects of implementation "
@@ -8144,52 +8500,52 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:160 dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:165 dpkg-gensymbols.1:202
 #, fuzzy, no-wrap
 msgid "B<c++>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:164
+#: dpkg-gensymbols.1:169
 msgid ""
 "Denotes I<c++> symbol pattern. See B<Using symbol patterns> subsection below."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:164 dpkg-gensymbols.1:228
+#: dpkg-gensymbols.1:169 dpkg-gensymbols.1:233
 #, fuzzy, no-wrap
 msgid "B<symver>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:168
+#: dpkg-gensymbols.1:173
 msgid ""
 "Denotes I<symver> (symbol version) symbol pattern. See B<Using symbol "
 "patterns> subsection below."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:168 dpkg-gensymbols.1:253
+#: dpkg-gensymbols.1:173 dpkg-gensymbols.1:258
 #, fuzzy, no-wrap
 #| msgid "B<purge>"
 msgid "B<regex>"
 msgstr "B<purge>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 msgid ""
 "Denotes I<regex> symbol pattern. See B<Using symbol patterns> subsection "
 "below."
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 #, no-wrap
 msgid "Using symbol patterns"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:180
+#: dpkg-gensymbols.1:185
 msgid ""
 "Unlike a standard symbol specification, a pattern may cover multiple real "
 "symbols from the library. B<dpkg-gensymbols> will attempt to match each "
@@ -8201,7 +8557,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:188
+#: dpkg-gensymbols.1:193
 msgid ""
 "A pattern is considered lost if it does not match any symbol in the library. "
 "By default this will trigger a B<dpkg-gensymbols> failure under I<-c1> or "
@@ -8214,7 +8570,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:195
+#: dpkg-gensymbols.1:200
 msgid ""
 "Patterns are an extension of the I<deb-symbols(5)> format hence they are "
 "only valid in symbol file templates. Pattern specification syntax is not any "
@@ -8225,12 +8581,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:202
 msgid "At the moment, B<dpkg-gensymbols> supports three basic pattern types:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:209
+#: dpkg-gensymbols.1:214
 msgid ""
 "This pattern is denoted by the I<c++> tag. It matches only C++ symbols by "
 "their demangled symbol name (as emitted by B<c++filt>(1) utility). This "
@@ -8245,7 +8601,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:215
+#: dpkg-gensymbols.1:220
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -8255,19 +8611,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:217
+#: dpkg-gensymbols.1:222
 msgid ""
 "The demangled name above can be obtained by executing the following command:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:219
+#: dpkg-gensymbols.1:224
 #, no-wrap
 msgid " $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:227
+#: dpkg-gensymbols.1:232
 msgid ""
 "Please note that while mangled name is unique in the library by definition, "
 "this is not necessarily true for demangled names. A couple of distinct real "
@@ -8279,7 +8635,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:234
+#: dpkg-gensymbols.1:239
 msgid ""
 "This pattern is denoted by the I<symver> tag. Well maintained libraries have "
 "versioned symbols where each version corresponds to the upstream version "
@@ -8288,7 +8644,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:241
+#: dpkg-gensymbols.1:246
 #, no-wrap
 msgid ""
 "libc.so.6 libc6 #MINVER#\n"
@@ -8299,7 +8655,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:247
+#: dpkg-gensymbols.1:252
 msgid ""
 "All symbols associated with versions GLIBC_2.0 and GLIBC_2.7 will lead to "
 "minimal version of 2.0 and 2.7 respectively with the exception of the symbol "
@@ -8309,7 +8665,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:252
+#: dpkg-gensymbols.1:257
 msgid ""
 "Please note that while old style wildcard patterns (denoted by \"*@version\" "
 "in the symbol name field) are still supported, they have been deprecated by "
@@ -8319,7 +8675,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:260
+#: dpkg-gensymbols.1:265
 msgid ""
 "Regular expression patterns are denoted by the I<regex> tag. They match by "
 "the perl regular expression specified in the symbol name field. A regular "
@@ -8329,7 +8685,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:265
+#: dpkg-gensymbols.1:270
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -8338,7 +8694,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:270
+#: dpkg-gensymbols.1:275
 msgid ""
 "Symbols like \"mystack_new@Base\", \"mystack_push@Base\", \"mystack_pop@Base"
 "\" etc.  will be matched by the first pattern while e.g. "
@@ -8348,7 +8704,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:275
+#: dpkg-gensymbols.1:280
 msgid ""
 "Basic patterns listed above can be combined where it makes sense. In that "
 "case, they are processed in the order in which the tags are specified. For "
@@ -8356,7 +8712,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:278
+#: dpkg-gensymbols.1:283
 #, no-wrap
 msgid ""
 " (c++|regex)\"^NSA::ClassA::Private::privmethod\\ed\\e(int\\e)@Base\" 1.0\n"
@@ -8364,7 +8720,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:288
+#: dpkg-gensymbols.1:293
 msgid ""
 "will match symbols \"_ZN3NSA6ClassA7Private11privmethod1Ei@Base\" and "
 "\"_ZN3NSA6ClassA7Private11privmethod2Ei@Base\". When matching the first "
@@ -8379,7 +8735,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:294
+#: dpkg-gensymbols.1:299
 msgid ""
 "In general, all patterns are divided into two groups: aliases (basic I<c++> "
 "and I<symver>) and generic patterns (I<regex>, all combinations of multiple "
@@ -8389,7 +8745,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 msgid ""
 "When multiple patterns match the same real symbol, aliases (first I<c++>, "
 "then I<symver>) are preferred over generic patterns. Generic patterns are "
@@ -8400,13 +8756,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 #, no-wrap
 msgid "Using includes"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:306
+#: dpkg-gensymbols.1:311
 msgid ""
 "When the set of exported symbols differ between architectures, it may become "
 "inefficient to use a single symbol file. In those cases, an include "
@@ -8414,7 +8770,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:310
+#: dpkg-gensymbols.1:315
 msgid ""
 "You can factorize the common part in some external file and include that "
 "file in your I<package>.symbols.I<arch> file by using an include directive "
@@ -8422,31 +8778,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:312
+#: dpkg-gensymbols.1:317
 msgid "#include \"I<packages>.symbols.common\""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:314
+#: dpkg-gensymbols.1:319
 msgid "The include directive may also be tagged like any symbol:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:316
-msgid "(tag|..|tagN)#include \"file_to_include\""
+#: dpkg-gensymbols.1:321
+msgid "(tag|..|tagN)#include \"file-to-include\""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:321
+#: dpkg-gensymbols.1:326
 msgid ""
-"As a result, all symbols included from I<file_to_include> will be considered "
+"As a result, all symbols included from I<file-to-include> will be considered "
 "to be tagged with I<tag> .. I<tagN> by default. You can use this feature to "
 "create a common I<package>.symbols file which includes architecture specific "
 "symbol files:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:326
+#: dpkg-gensymbols.1:331
 #, no-wrap
 msgid ""
 "  common_symbol1@Base 1.0\n"
@@ -8456,7 +8812,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:335
+#: dpkg-gensymbols.1:340
 msgid ""
 "The symbols files are read line by line, and include directives are "
 "processed as soon as they are encountered. This means that the content of "
@@ -8469,7 +8825,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:340
+#: dpkg-gensymbols.1:345
 msgid ""
 "An included file can repeat the header line containing the SONAME of the "
 "library. In that case, it overrides any header line previously read.  "
@@ -8478,7 +8834,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid ""
 "#include \"libsomething1.symbols.common\"\n"
@@ -8486,39 +8842,39 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid "Good library management"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:346
+#: dpkg-gensymbols.1:351
 msgid "A well-maintained library has the following features:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:350
+#: dpkg-gensymbols.1:355
 msgid ""
 "its API is stable (public symbols are never dropped, only new public symbols "
 "are added) and changes in incompatible ways only when the SONAME changes;"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:353
+#: dpkg-gensymbols.1:358
 msgid ""
 "ideally, it uses symbol versioning to achieve ABI stability despite internal "
 "changes and API extension;"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:356
+#: dpkg-gensymbols.1:361
 msgid ""
 "it doesn't export private symbols (such symbols can be tagged optional as "
 "workaround)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:364
+#: dpkg-gensymbols.1:369
 msgid ""
 "While maintaining the symbols file, it's easy to notice appearance and "
 "disappearance of symbols. But it's more difficult to catch incompatible API "
@@ -8530,38 +8886,38 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:365
+#: dpkg-gensymbols.1:370
 #, fuzzy, no-wrap
 msgid "B<-P>I<package-build-dir>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:368
+#: dpkg-gensymbols.1:373
 msgid "Scan I<package-build-dir> instead of debian/tmp."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 msgid ""
 "Define the package name. Required if more than one binary package is listed "
 "in debian/control (or if there's no debian/control file)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 msgid ""
 "Define the package version. Defaults to the version extracted from debian/"
 "changelog. Required if called outside of a source package tree."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 #, fuzzy, no-wrap
 msgid "B<-e>I<library-file>"
 msgstr "I<control>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 msgid ""
 "Only analyze libraries explicitly listed instead of finding all public "
 "libraries. You can use a regular expression in I<library-file> to match "
@@ -8570,33 +8926,33 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 #, fuzzy, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:386
+#: dpkg-gensymbols.1:391
 msgid ""
 "Use I<filename> as reference file to generate the symbols file that is "
 "integrated in the package itself."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 msgid ""
 "Print the generated symbols file to standard output, rather than being "
 "stored in the package build tree."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 #, fuzzy, no-wrap
 msgid "B<-O>I<filename>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 msgid ""
 "Store the generated symbols file as I<filename>. If I<filename> is pre-"
 "existing, its content is used as basis for the generated symbols file.  You "
@@ -8605,13 +8961,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 #, fuzzy, no-wrap
 msgid "B<-t>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 msgid ""
 "Write the symbol file in template mode rather than the format compatible "
 "with I<deb-symbols(5)>. The main difference is that in the template mode "
@@ -8623,13 +8979,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 #, fuzzy, no-wrap
 msgid "B<-c>I<[0-4]>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:413
+#: dpkg-gensymbols.1:418
 msgid ""
 "Define the checks to do when comparing the generated symbols file with the "
 "template file used as starting point. By default the level is 1. Increasing "
@@ -8640,14 +8996,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:416
+#: dpkg-gensymbols.1:421
 msgid ""
 "This value can be overridden by the environment variable "
 "DPKG_GENSYMBOLS_CHECK_LEVEL."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 msgid ""
 "Keep quiet and never generate a diff between generated symbols file and the "
 "template file used as starting point or show any warnings about new/lost "
@@ -8656,13 +9012,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 #, fuzzy, no-wrap
 msgid "B<-a>I<arch>"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:427
+#: dpkg-gensymbols.1:432
 msgid ""
 "Assume I<arch> as host architecture when processing symbol files. Use this "
 "option to generate a symbol file or diff for any architecture provided its "
@@ -8670,21 +9026,21 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 msgid ""
 "Enable debug mode. Numerous messages are displayed to explain what B<dpkg-"
 "gensymbols> does."
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 #, fuzzy, no-wrap
 #| msgid "B<-G>"
 msgid "B<-V>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:438
+#: dpkg-gensymbols.1:443
 msgid ""
 "Enable verbose mode. The generated symbols file contains deprecated symbols "
 "as comments. Furthermore in template mode, pattern symbols are followed by "
@@ -8692,28 +9048,28 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:447
+#: dpkg-gensymbols.1:452
 msgid "B<http://people.redhat.com/drepper/symbol-versioning>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:449
+#: dpkg-gensymbols.1:454
 msgid "B<http://people.redhat.com/drepper/goodpractice.pdf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:451
+#: dpkg-gensymbols.1:456
 msgid "B<http://people.redhat.com/drepper/dsohowto.pdf>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:454
+#: dpkg-gensymbols.1:459
 #, fuzzy
 msgid "B<deb-symbols>(5), B<dpkg-shlibdeps>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:457
+#: dpkg-gensymbols.1:462
 #, fuzzy
 msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
 msgstr "Copyright 2001 Joey Hess"
@@ -8724,12 +9080,6 @@
 msgid "dpkg-maintscript-helper"
 msgstr ""
 
-#. type: TH
-#: dpkg-maintscript-helper.1:1
-#, fuzzy, no-wrap
-msgid "2010-04-16"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-maintscript-helper.1:4
 msgid ""
@@ -8740,8 +9090,8 @@
 #. type: Plain text
 #: dpkg-maintscript-helper.1:8
 msgid ""
-"B<dpkg-maintscript-helper> I<command> [I<parameters>...] -- I<maint-script-"
-"parameters>"
+"B<dpkg-maintscript-helper> I<command> [I<parameter>...] B<--> I<maint-script-"
+"parameter>..."
 msgstr ""
 
 #. type: SH
@@ -8776,8 +9126,8 @@
 "scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
 "the same call simply needs to be put in all scripts and the program will "
 "automatically adapt its behaviour based on the environment variable "
-"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
-"to forward after a double dash."
+"B<DPKG_MAINTSCRIPT_NAME> and on the maintainer scripts arguments that you "
+"have to forward after a double dash."
 msgstr ""
 
 #. type: SH
@@ -8940,9 +9290,10 @@
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:118
-#, no-wrap
-msgid "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "B<Pre-Depends:> E<lt>package listE<gt>"
+msgid "    B<Pre-Depends:> dpkg (E<gt>= 1.15.7.2)\n"
+msgstr "B<Pre-Depends:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:123
@@ -8957,12 +9308,18 @@
 #: dpkg-maintscript-helper.1:127
 #, no-wrap
 msgid ""
-"    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
-"        dpkg-maintscript-helper E<lt>commandE<gt> ...\n"
+"    if dpkg-maintscript-helper supports I<command>; then\n"
+"        dpkg-maintscript-helper I<command> ...\n"
 "    fi\n"
 msgstr ""
 
 #. type: Plain text
+#: dpkg-maintscript-helper.1:130
+#, fuzzy
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr "Copyright 2001 Joey Hess"
+
+#. type: Plain text
 #: dpkg-maintscript-helper.1:132
 #, fuzzy
 msgid "Copyright \\(co 2008 Joey Hess"
@@ -8986,13 +9343,6 @@
 msgid "dpkg-mergechangelogs"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
-#. type: TH
-#: dpkg-mergechangelogs.1:1
-#, fuzzy, no-wrap
-#| msgid "2006-02-28"
-msgid "2010-04-18"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-mergechangelogs.1:4
 msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
@@ -9121,106 +9471,103 @@
 #. type: Plain text
 #: dpkg-name.1:15
 #, fuzzy
-msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+msgid "B<dpkg-name> [I<option>...] [B<-->] I<file>..."
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
-#: dpkg-name.1:28
+#: dpkg-name.1:29
 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>."
-"E<lt>package_typeE<gt>> 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. "
-"The I<E<lt>package_typeE<gt>> part comes from that field if present or "
-"fallbacks to B<deb>."
+"package name consists of I<package>B<_>I<version>B<_>I<architecture>B<."
+">I<package-type> as specified in the control file of the package. The "
+"I<version> part of the filename consists of the upstream version information "
+"optionally followed by a hyphen and the revision information. The I<package-"
+"type> part comes from that field if present or fallbacks to B<deb>."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:30
+#: dpkg-name.1:31
 #, fuzzy, no-wrap
 msgid "B<-a>, B<--no-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 #. type: Plain text
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 msgid "The destination filename will not have the architecture information."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 #, fuzzy, no-wrap
 msgid "B<-k>, B<--symlink>"
 msgstr "B<dpkg --version>"
 
 #. type: Plain text
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 msgid "Create a symlink, instead of moving."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 #, fuzzy, no-wrap
 msgid "B<-o>, B<--overwrite>"
 msgstr "B<-o>|B<--oknodo>"
 
 #. type: Plain text
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 msgid ""
 "Existing files will be overwritten if they have the same name as the "
 "destination filename."
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 #, fuzzy, no-wrap
 msgid "B<-s>, B<--subdir> [I<dir>]"
 msgstr "B<-s>|B<--signal> I<сигнал>"
 
 #. type: Plain text
-#: dpkg-name.1:52
+#: dpkg-name.1:53
 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 package. The target directory will be `unstable/binary-I<architecture>/"
+"I<section>'. 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 `I<section>/binary-I<architecture>'. 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:52
+#: dpkg-name.1:53
 #, fuzzy, no-wrap
 msgid "B<-c>, B<--create-dir>"
 msgstr "B<-o>|B<--oknodo>"
 
 #. type: Plain text
-#: dpkg-name.1:57
+#: dpkg-name.1:58
 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:60
+#: dpkg-name.1:61
 #, fuzzy, no-wrap
 msgid "B<-v>, B<--version>"
 msgstr "B<dpkg --version>"
 
 #. type: TP
-#: dpkg-name.1:65
+#: dpkg-name.1:66
 #, no-wrap
 msgid "B<dpkg-name bar-foo.deb>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 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 "
@@ -9228,13 +9575,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 #, no-wrap
 msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:75
+#: dpkg-name.1:76
 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 "
@@ -9242,41 +9589,41 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-name.1:75
+#: dpkg-name.1:76
 #, no-wrap
 msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:81
+#: dpkg-name.1:82
 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:81
+#: dpkg-name.1:82
 #, no-wrap
 msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:84
+#: dpkg-name.1:85
 msgid "This can be used when building new packages."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-name.1:94
+#: dpkg-name.1:95
 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 "
+"I<package>B<_>I<version>B<_>I<architecture>B<.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:102
+#: dpkg-name.1:103
 #, fuzzy
 msgid ""
 "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
@@ -9284,7 +9631,7 @@
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 #. type: Plain text
-#: dpkg-name.1:105
+#: dpkg-name.1:106
 msgid "Copyright \\(co 1995,1996 Erick Branderhorst"
 msgstr ""
 
@@ -9294,12 +9641,6 @@
 msgid "dpkg-parsechangelog"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
-#. type: TH
-#: dpkg-parsechangelog.1:1
-#, fuzzy, no-wrap
-msgid "2009-05-19"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-parsechangelog.1:4
 msgid "dpkg-parsechangelog - parse Debian changelog files"
@@ -9308,7 +9649,7 @@
 #. type: Plain text
 #: dpkg-parsechangelog.1:8
 #, fuzzy
-msgid "B<dpkg-parsechangelog> [I<options>]"
+msgid "B<dpkg-parsechangelog> [I<option>...]"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
@@ -9366,25 +9707,25 @@
 #. type: TP
 #: dpkg-parsechangelog.1:54
 #, fuzzy, no-wrap
-msgid "B<Source:> E<lt>pkg nameE<gt>"
+msgid "B<Source:>I< pkg-name>"
 msgstr "B<Source:> E<lt>имя архивов с исходникамиE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:56
 #, fuzzy, no-wrap
-msgid "B<Version:> E<lt>versionE<gt>"
+msgid "B<Version:>I< version>"
 msgstr "B<Version:> E<lt>строка с версиейE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:58
 #, fuzzy, no-wrap
-msgid "B<Distribution:> E<lt>target distributionE<gt>"
+msgid "B<Distribution:>I< target-distribution>"
 msgstr "B<Description:> E<lt>короткое описаниеE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:60
 #, fuzzy, no-wrap
-msgid "B<Urgency:> E<lt>urgencyE<gt>"
+msgid "B<Urgency:>I< urgency>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
@@ -9395,19 +9736,19 @@
 #. type: TP
 #: dpkg-parsechangelog.1:63
 #, fuzzy, no-wrap
-msgid "B<Maintainer:> E<lt>authorE<gt>"
+msgid "B<Maintainer:>I< author>"
 msgstr "B<Maintainer:> E<lt>полное имя и адрес эл.почтыE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:65
 #, fuzzy, no-wrap
-msgid "B<Date:> E<lt>dateE<gt>"
+msgid "B<Date:>I< date>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:67
 #, fuzzy, no-wrap
-msgid "B<Closes:> E<lt>bug numberE<gt>"
+msgid "B<Closes:>I< bug-number>"
 msgstr "B<Source:> E<lt>имя архивов с исходникамиE<gt>"
 
 #. type: Plain text
@@ -9418,7 +9759,7 @@
 #. type: TP
 #: dpkg-parsechangelog.1:70
 #, fuzzy, no-wrap
-msgid "B<Changes:> E<lt>changelog entriesE<gt>"
+msgid "B<Changes:>I< changelog-entries>"
 msgstr "B<Package:> E<lt>имя пакетаE<gt>"
 
 #. type: Plain text
@@ -9513,7 +9854,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-parsechangelog.1:104 update-alternatives.8:269
+#: dpkg-parsechangelog.1:104 update-alternatives.8:268
 #, fuzzy, no-wrap
 msgid "B<--all>"
 msgstr "B<install>"
@@ -9696,33 +10037,36 @@
 msgstr "B<-a>|B<--startas> I<полное_имя>"
 
 #. type: Plain text
-#: dpkg-query.1:78
+#: dpkg-query.1:79
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"installed package status database. When multiple I<package-name> are listed, "
+"the requested status entries are separated by an empty line."
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:78
+#: dpkg-query.1:79
 #, fuzzy, no-wrap
 msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
 
 #. type: Plain text
-#: dpkg-query.1:83
+#: dpkg-query.1:85
 msgid ""
-"List files installed to your system from I<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+"List files installed to your system from I<package-name>. When multiple "
+"I<package-name> are listed, the requested lists of files are separated by an "
+"empty line. However, note that files created by package-specific "
+"installation-scripts are not listed."
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:83
+#: dpkg-query.1:85
 #, fuzzy, no-wrap
 msgid "B<-c>, B<--control-path> I<package-name> [I<control-file>]"
 msgstr "B<dpkg-checkbuilddeps> -B<-B> [I<файл control>]"
 
 #. type: Plain text
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 msgid ""
 "List paths for control files installed to your system from I<package-name>.  "
 "If I<control-file> is specified then only list the path for that control "
@@ -9733,47 +10077,55 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 #, fuzzy, no-wrap
 msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
 
 #. type: Plain text
-#: dpkg-query.1:97
+#: dpkg-query.1:99
 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."
+"Search for packages that own files corresponding to the given pattern.  "
+"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:97
+#: dpkg-query.1:99
 #, fuzzy, no-wrap
 msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr "B<-n>|B<--name> I<имя_процесса>"
 
 #. type: Plain text
-#: dpkg-query.1:104
+#: dpkg-query.1:105
 msgid ""
 "Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>. Users of APT-based frontends should use B<apt-cache show> "
-"I<package-name> instead as the I<available> file is only kept up-to-date "
-"when using B<dselect>."
+"available>. When multiple I<package-name> are listed, the requested "
+"I<available> entries are separated by an empty line."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.1:110
+msgid ""
+"Users of APT-based frontends should use B<apt-cache show> I<package-name> "
+"instead as the I<available> file is only kept up-to-date when using "
+"B<dselect>."
 msgstr ""
 
 #. type: TP
-#: dpkg-query.1:116
+#: dpkg-query.1:122
 #, fuzzy, no-wrap
 msgid "B<-f>, B<--showformat=>I<format>"
 msgstr "B<-r>|B<--chroot> I<root>"
 
 #. type: Plain text
-#: dpkg-query.1:123
+#: dpkg-query.1:129
 msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:128
+#: dpkg-query.1:134
 #, no-wrap
 msgid ""
 "    B<\\en>  newline\n"
@@ -9782,7 +10134,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:133
+#: dpkg-query.1:139
 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<"
@@ -9790,7 +10142,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:141
+#: dpkg-query.1:147
 msgid ""
 "Package information can be included by inserting variable references to "
 "package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
@@ -9801,7 +10153,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:176
+#: dpkg-query.1:182
 #, no-wrap
 msgid ""
 "    B<Architecture>\n"
@@ -9814,11 +10166,11 @@
 "    B<Description>\n"
 "    B<Enhances>\n"
 "    B<Essential>\n"
-"    B<Filename> (internal, dselect related)\n"
+"    B<Filename> (internal, front-end related)\n"
 "    B<Homepage>\n"
 "    B<Installed-Size>\n"
-"    B<MD5sum> (internal, dselect related)\n"
-"    B<MSDOS-Filename> (internal, dselect related)\n"
+"    B<MD5sum> (internal, front-end related)\n"
+"    B<MSDOS-Filename> (internal, front-end related)\n"
 "    B<Maintainer>\n"
 "    B<Origin>\n"
 "    B<Package>\n"
@@ -9829,18 +10181,18 @@
 "    B<Replaces>\n"
 "    B<Revision> (obsolete)\n"
 "    B<Section>\n"
-"    B<Size> (internal, dselect related)\n"
+"    B<Size> (internal, front-end related)\n"
 "    B<Source>\n"
 "    B<Status> (internal)\n"
 "    B<Suggests>\n"
-"    B<Tag> (usually not in the .deb but in APT's Packages files)\n"
+"    B<Tag> (usually not in the .deb but in the repository Packages files)\n"
 "    B<Triggers-Awaited> (internal)\n"
 "    B<Triggers-Pending> (internal)\n"
 "    B<Version>\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:184
+#: dpkg-query.1:190
 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 "
@@ -9850,51 +10202,53 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:187
+#: dpkg-query.1:193
 #, no-wrap
 msgid "  B<dpkg-query -W -f=\\(aq${Package} ${Version}\\et${Maintainer}\\en\\(aq dpkg>\n"
 msgstr ""
 
 #. type: SH
-#: dpkg-query.1:189 dpkg-split.1:180 start-stop-daemon.8:256
-#: update-alternatives.8:375
+#: dpkg-query.1:195 dpkg-split.1:179 start-stop-daemon.8:259
+#: update-alternatives.8:374
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr ""
 
-#. type: IP
-#: dpkg-query.1:190 update-alternatives.8:376
+#. type: TP
+#: dpkg-query.1:196 dpkg-split.1:180 start-stop-daemon.8:260
+#: start-stop-daemon.8:289 update-alternatives.8:375
 #, no-wrap
-msgid "0"
+msgid "B<0>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:192
+#: dpkg-query.1:199
 msgid "The requested query was successfully performed."
 msgstr ""
 
-#. type: IP
-#: dpkg-query.1:192
+#. type: TP
+#: dpkg-query.1:199 dpkg-split.1:186 start-stop-daemon.8:270
+#: start-stop-daemon.8:292
 #, no-wrap
-msgid "1"
+msgid "B<1>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:195
+#: dpkg-query.1:203
 msgid ""
 "Problems were encountered while parsing the command line or performing the "
 "query, including no file or package being found (except for --control-path)."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:205
+#: dpkg-query.1:213
 msgid ""
 "This setting influences the output of the B<--list> option by changing the "
 "width of its output."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-query.1:208
+#: dpkg-query.1:216
 #, fuzzy
 msgid "Copyright \\(co 2001 Wichert Akkerman"
 msgstr "Copyright 2001 Joey Hess"
@@ -9905,26 +10259,20 @@
 msgid "dpkg-scanpackages"
 msgstr ""
 
-#. type: TH
-#: dpkg-scanpackages.1:15 dpkg-scansources.1:1
-#, fuzzy, no-wrap
-msgid "2009-10-01"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-scanpackages.1:18
 msgid "dpkg-scanpackages - create Packages index files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:27
+#: dpkg-scanpackages.1:26
 msgid ""
-"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scanpackages> [I<option>...] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:40
+#: dpkg-scanpackages.1:39
 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 "
@@ -9935,7 +10283,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:52
+#: 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<bzip2>(1)  (generating a "
@@ -9945,7 +10293,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:59
+#: 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 "
@@ -9954,7 +10302,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-scanpackages.1:63
 msgid ""
 "I<overridefile> is the name of a file to read which contains information "
 "about how the package fits into the distribution (it can be a compressed "
@@ -9962,13 +10310,13 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-scanpackages.1:66
 msgid ""
 "I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:71
+#: dpkg-scanpackages.1:70
 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 "
@@ -9976,72 +10324,72 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:73
+#: dpkg-scanpackages.1:72
 #, fuzzy, no-wrap
 msgid "B<-t>, B<--type> I<type>"
 msgstr "B<-t>|B<--test>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 msgid "Scan for *.I<type> packages, instead of *.deb."
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 #, fuzzy, no-wrap
 msgid "B<-u>, B<--udeb>"
 msgstr "B<-q>|B<--quiet>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:79
+#: dpkg-scanpackages.1:78
 msgid "B<Obsolete> alias for B<-tudeb>."
 msgstr ""
 
 #. type: IP
-#: dpkg-scanpackages.1:79 dpkg-scansources.1:50
+#: dpkg-scanpackages.1:78 dpkg-scansources.1:49
 #, fuzzy, no-wrap
 msgid "B<-e>, B<--extra-override> I<file>"
 msgstr "B<-p>|B<--pidfile> I<pid-файл>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:85 dpkg-scansources.1:55
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:54
 msgid ""
 "Scan I<file> to find supplementary overrides (the file can be compressed). "
 "See B<deb-extra-override>(5)  for more information on its format."
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:85
+#: dpkg-scanpackages.1:84
 #, fuzzy, no-wrap
 msgid "B<-a>, B<--arch> I<arch>"
 msgstr "B<-d>|B<--chdir> I<путь>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 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:89
+#: dpkg-scanpackages.1:88
 #, fuzzy, no-wrap
 msgid "B<-m>, B<--multiversion>"
 msgstr "B<-V>|B<--version>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 msgid "Include all found packages in the output."
 msgstr ""
 
 #. type: TP
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 #, fuzzy, no-wrap
 msgid "B<-M>, B<--medium> I<id-string>"
 msgstr "B<-p>|B<--pidfile> I<pid-файл>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:97
+#: dpkg-scanpackages.1:96
 msgid ""
 "Add an X-Medium field containing the value I<id-string>. This field is "
 "required if you want to generate B<Packages.cd> files for use by the multicd "
@@ -10049,13 +10397,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-scanpackages.1:104 update-alternatives.8:447
+#: dpkg-scanpackages.1:103 update-alternatives.8:448
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:110
+#: dpkg-scanpackages.1:109
 msgid ""
 "B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
 "warns about packages that are in the wrong subdirectory, are duplicated, "
@@ -10064,7 +10412,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scanpackages.1:116
+#: dpkg-scanpackages.1:115
 #, fuzzy
 msgid ""
 "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<deb-extra-override>(5), "
@@ -10083,21 +10431,21 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-scansources.1:12
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scansources> [I<option>...] 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:17
 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:28
 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> "
@@ -10111,7 +10459,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-scansources.1:32
 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 "
@@ -10119,7 +10467,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:44
+#: dpkg-scansources.1:43
 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 "
@@ -10128,33 +10476,33 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-scansources.1:46
+#: dpkg-scansources.1:45
 #, fuzzy, no-wrap
 msgid "B<-n>, B<--no-sort>"
 msgstr "B<-o>|B<--oknodo>"
 
 #. type: Plain text
-#: dpkg-scansources.1:49
+#: dpkg-scansources.1:48
 msgid ""
 "Don't sort the index records. Normally they are sorted by source package "
 "name."
 msgstr ""
 
 #. type: IP
-#: dpkg-scansources.1:55
+#: dpkg-scansources.1:54
 #, fuzzy, no-wrap
 msgid "B<-s>, B<--source-override> I<file>"
 msgstr "B<-p>|B<--pidfile> I<pid-файл>"
 
 #. type: Plain text
-#: dpkg-scansources.1:59
+#: dpkg-scansources.1:58
 msgid ""
 "Use I<file> as the source override file (the file can be compressed).  The "
 "default is the name of the override file you specified with I<.src> appended."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 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 "
@@ -10164,24 +10512,24 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 #, fuzzy, no-wrap
 msgid "B<--debug>"
 msgstr "B<--no-debsig>"
 
 #. type: Plain text
-#: dpkg-scansources.1:67
+#: dpkg-scansources.1:66
 msgid "Turn debugging on."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-scansources.1:76
+#: dpkg-scansources.1:75
 #, fuzzy
 msgid "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 #. type: Plain text
-#: dpkg-scansources.1:78
+#: dpkg-scansources.1:77
 msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr ""
 
@@ -10191,36 +10539,29 @@
 msgid "dpkg-shlibdeps"
 msgstr "dpkg-checkbuilddeps"
 
-#. type: TH
-#: dpkg-shlibdeps.1:1 dpkg-source.1:2 start-stop-daemon.8:1
-#: update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2011-03-04"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-shlibdeps.1:4
 msgid "dpkg-shlibdeps - generate shared library substvar dependencies"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:10
-msgid ""
-"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
-msgstr ""
+#: dpkg-shlibdeps.1:8
+#, fuzzy
+msgid "B<dpkg-shlibdeps> [I<option>...] [B<-e>]I<executable> [I<option>...]"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:24
+#: dpkg-shlibdeps.1:22
 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."
+"other variables starting with B<shlibs:> are removed from the file."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 msgid ""
 "B<dpkg-shlibdeps> has two possible sources of information to generate "
 "dependency information. Either I<symbols> files or I<shlibs> files. For each "
@@ -10237,13 +10578,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 #, no-wrap
 msgid "Symbols files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 msgid ""
 "Symbols files contain finer-grained dependency information by providing the "
 "minimum dependency for each symbol that the library exports. The script "
@@ -10252,13 +10593,13 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 #, no-wrap
 msgid "debian/*/DEBIAN/symbols"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are generated by B<dpkg-gensymbols>(1).  "
@@ -10268,19 +10609,19 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols.I<arch>"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:61
+#: dpkg-shlibdeps.1:59
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 msgid ""
 "Per-system overriding shared library dependency information.  I<arch> is the "
 "architecture of the current system (obtained by B<dpkg-architecture -"
@@ -10288,20 +10629,20 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> symbols\\(rq"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:68 dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:66 dpkg-shlibdeps.1:100
 msgid ""
 "Package-provided shared library dependency information.  Unless overridden "
 "by --admindir, those files are located in /var/lib/dpkg."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:75
+#: dpkg-shlibdeps.1:73
 msgid ""
 "While scanning the symbols used by all binaries, B<dpkg-shlibdeps> remembers "
 "the (biggest) minimal version needed for each library. At the end of the "
@@ -10310,7 +10651,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 msgid ""
 "As a safe-guard measure, a symbols file can provide a I<Build-Depends-"
 "Package> meta-information field and B<dpkg-shlibdeps> will extract the "
@@ -10320,13 +10661,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 #, no-wrap
 msgid "Shlibs files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:86
+#: dpkg-shlibdeps.1:84
 msgid ""
 "Shlibs files associate directly a library to a dependency (without looking "
 "at the symbols). It's thus often stronger than really needed but very safe "
@@ -10334,42 +10675,42 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 msgid ""
 "The dependencies for a library are looked up in several places. The first "
 "file providing information for the library of interest is used:"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 #, no-wrap
 msgid "debian/shlibs.local"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 msgid "Package-local overriding shared library dependency information."
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 #, no-wrap
 msgid "/etc/dpkg/shlibs.override"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 msgid "Per-system overriding shared library dependency information."
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 #, no-wrap
 msgid "debian/*/DEBIAN/shlibs"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are only used if the library is found in a "
@@ -10378,24 +10719,24 @@
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> shlibs\\(rq"
 msgstr ""
 
 #. type: IP
-#: dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:100
 #, no-wrap
 msgid "/etc/dpkg/shlibs.default"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:104
+#: dpkg-shlibdeps.1:102
 msgid "Per-system default shared library dependency information."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:108
+#: dpkg-shlibdeps.1:106
 msgid ""
 "The extracted dependencies are then directly used (except if they are "
 "filtered out because they have been identified as duplicate, or as weaker "
@@ -10403,33 +10744,33 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 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:113
+#: dpkg-shlibdeps.1:111
 #, fuzzy, no-wrap
 msgid "B<-e>I<executable>"
 msgstr "B<-x>|B<--exec> I<исполняемый_файл>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 msgid ""
 "Include dependencies appropriate for the shared libraries required by "
 "I<executable>."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 #, no-wrap
 msgid "B<-d>I<dependencyfield>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:123
+#: dpkg-shlibdeps.1:121
 msgid ""
 "Add dependencies to be added to the control file dependency field "
 "I<dependencyfield>.  (The dependencies for this field are placed in the "
@@ -10437,7 +10778,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:133
+#: dpkg-shlibdeps.1:131
 msgid ""
 "The B<-d>I<dependencyfield> option takes effect for all executables after "
 "the option, until the next B<-d>I<dependencyfield>.  The default "
@@ -10445,7 +10786,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 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>, "
@@ -10455,13 +10796,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 #, no-wrap
 msgid "B<-p>I<varnameprefix>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:152
+#: dpkg-shlibdeps.1:150
 msgid ""
 "Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
 ">.  Likewise, any existing substitution variables starting with "
@@ -10470,20 +10811,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 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:158
+#: dpkg-shlibdeps.1:156
 #, fuzzy, no-wrap
 msgid "B<-t>I<type>"
 msgstr "B<-t>|B<--test>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 msgid ""
 "Prefer shared library dependency information tagged for the given package "
 "type. If no tagged information is available, falls back to untagged "
@@ -10493,46 +10834,46 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 #, no-wrap
 msgid "B<-L>I<localshlibsfile>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:171
+#: dpkg-shlibdeps.1:169
 msgid ""
 "Read overriding shared library dependency information from "
 "I<localshlibsfile> instead of B<debian/shlibs.local>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 msgid ""
 "Write substitution variables in I<substvarsfile>; the default is B<debian/"
 "substvars>."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 #, fuzzy, no-wrap
 msgid "B<-v>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 msgid ""
 "Enable verbose mode. Numerous messages are displayed to explain what B<dpkg-"
 "shlibdeps> does."
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 #, fuzzy, no-wrap
 msgid "B<-x>I<package>"
 msgstr "B<unpacked>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 msgid ""
 "Exclude the package from the generated dependencies. This is useful to avoid "
 "self-dependencies for packages which provide ELF binaries (executables or "
@@ -10541,13 +10882,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 #, fuzzy, no-wrap
 msgid "B<-S>I<pkgbuilddir>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 msgid ""
 "Look into I<pkgbuilddir> first when trying to find a library. This is useful "
 "when the source package builds multiple flavors of the same library and you "
@@ -10557,13 +10898,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 #, no-wrap
 msgid "B<--ignore-missing-info>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 msgid ""
 "Do not fail if dependency information can't be found for a shared library.  "
 "Usage of this option is discouraged, all libraries should provide dependency "
@@ -10572,13 +10913,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 #, no-wrap
 msgid "B<--warnings=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:213
+#: dpkg-shlibdeps.1:211
 msgid ""
 "I<value> is a bit field defining the set of warnings that can be emitted by "
 "B<dpkg-shlibdeps>.  Bit 0 (value=1) enables the warning \"symbol I<sym> used "
@@ -10590,13 +10931,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-shlibdeps.1:224
+#: dpkg-shlibdeps.1:222
 #, fuzzy, no-wrap
 msgid "WARNINGS"
 msgstr "ПРЕДУПРЕЖДЕНИЕ"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 msgid ""
 "Since B<dpkg-shlibdeps> analyzes the set of symbols used by each binary of "
 "the generated package, it is able to emit warnings in several cases. They "
@@ -10606,13 +10947,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 #, no-wrap
 msgid "B<symbol>I< sym>B< used by >I<binary>B< found in none of the libraries.>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a library and it needs to be linked "
@@ -10621,13 +10962,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 #, no-wrap
 msgid "I<binary>B< contains an unresolvable reference to symbol >I<sym>B<: it's probably a plugin>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a plugin and the symbol is probably "
@@ -10642,13 +10983,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 #, no-wrap
 msgid "B<dependency on >I<library>B< could be avoided if >I<binaries>B< were not uselessly linked against it (they use none of its symbols).>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 msgid ""
 "None of the I<binaries> that are linked with I<library> use any of the "
 "symbols provided by the library. By fixing all the binaries, you would avoid "
@@ -10657,13 +10998,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 #, no-wrap
 msgid "I<binary>B< shouldn't be linked with >I<library>B< (it uses none of its symbols).>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 msgid ""
 "The I<binary> is linked to a library that it doesn't need. It's not a "
 "problem but some small performance improvements in binary load time can be "
@@ -10673,13 +11014,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 #, no-wrap
 msgid "ERRORS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 msgid ""
 "B<dpkg-shlibdeps> will fail if it can't find a public library used by a "
 "binary or if this library has no associated dependency information (either "
@@ -10689,13 +11030,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 #, no-wrap
 msgid "B<couldn't find library >I<library-soname>B< needed by >I<binary>B< (its RPATH is '>I<rpath>B<')>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:287
+#: dpkg-shlibdeps.1:285
 msgid ""
 "The I<binary> uses a library called I<library-soname> but B<dpkg-shlibdeps> "
 "has been unable to find the library.  B<dpkg-shlibdeps> creates a list of "
@@ -10704,14 +11045,14 @@
 "LD_LIBRARY_PATH environment variable, and standard public directories (/"
 "lib, /usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks those "
 "directories in the package's build tree of the binary being analyzed, in the "
-"packages's build trees indicated with the -S command-line option, in other "
-"packages's build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
+"packages' build trees indicated with the -S command-line option, in other "
+"packages' build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
 "and finally in the root directory.  If the library is not found in any of "
 "those directories, then you get this error."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 msgid ""
 "If the library not found is in a private directory of the same package, then "
 "you want to add the directory to LD_LIBRARY_PATH. If it's in another binary "
@@ -10721,13 +11062,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 #, no-wrap
 msgid "B<no dependency information found for >I<library-file>B< (used by >I<binary>B<).>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:306
+#: dpkg-shlibdeps.1:304
 msgid ""
 "The library needed by I<binary> has been found by B<dpkg-shlibdeps> in "
 "I<library-file> but B<dpkg-shlibdeps> has been unable to find any dependency "
@@ -10738,7 +11079,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:320
+#: dpkg-shlibdeps.1:318
 msgid ""
 "This failure can be caused by a bad or missing shlibs or symbols file in the "
 "package of the library. It might also happen if the library is built within "
@@ -10753,7 +11094,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:326
+#: dpkg-shlibdeps.1:324
 msgid ""
 "Calling B<dpkg-shlibdeps> in verbose mode (-v) will provide much more "
 "information about where it tried to find the dependency information. This "
@@ -10761,13 +11102,13 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:330
+#: dpkg-shlibdeps.1:328
 #, fuzzy
 msgid "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:337
+#: dpkg-shlibdeps.1:335
 #, fuzzy
 msgid "Copyright \\(co 2006 Frank Lichtenheld"
 msgstr "Copyright 2001 Joey Hess"
@@ -10784,18 +11125,18 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:10
+#: dpkg-source.1:9
 #, fuzzy
-msgid "B<dpkg-source> [I<options>] I<command>"
+msgid "B<dpkg-source> [I<option>...] I<command>"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
-#: dpkg-source.1:14
+#: dpkg-source.1:13
 msgid "B<dpkg-source> packs and unpacks Debian source archives."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:18
+#: dpkg-source.1:17
 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 "
@@ -10803,13 +11144,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:20
+#: dpkg-source.1:19
 #, no-wrap
 msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:30
+#: dpkg-source.1:29
 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 "
@@ -10820,7 +11161,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:36
+#: dpkg-source.1:35
 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 "
@@ -10828,7 +11169,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:44
+#: dpkg-source.1:43
 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 "
@@ -10839,7 +11180,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:49
+#: dpkg-source.1:48
 msgid ""
 "If the source package uses a non-standard format (currently this means all "
 "formats except \"1.0\"), its name will be stored in B<debian/source/format> "
@@ -10848,13 +11189,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:50
+#: dpkg-source.1:49
 #, no-wrap
 msgid "B<-b> I<directory> [I<format-specific-parameters>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:57
+#: dpkg-source.1:56
 msgid ""
 "Build a source package. The first non-option argument is taken as the name "
 "of the directory containing the debianized source tree (i.e. with a debian "
@@ -10864,10 +11205,10 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:66
+#: dpkg-source.1:65
 msgid ""
 "B<dpkg-source> will build the source package with the first format found in "
-"this ordered list: the format indicated with the I<--format> command-line "
+"this ordered list: the format indicated with the I<--format> command line "
 "option, the format indicated in B<debian/source/format>, \"1.0\". The "
 "fallback to \"1.0\" is deprecated and will be removed at some point in the "
 "future, you should always document the desired source format in B<debian/"
@@ -10876,13 +11217,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:67
+#: dpkg-source.1:66
 #, fuzzy, no-wrap
 msgid "B<--print-format> I<directory>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg-source.1:72
+#: dpkg-source.1:71
 msgid ""
 "Print the source format that would be used to build the source package if "
 "B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -10890,7 +11231,7 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:73
+#: dpkg-source.1:72
 #, fuzzy, no-wrap
 msgid "B<--before-build> I<directory>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
@@ -10898,12 +11239,12 @@
 #. type: Plain text
 #: dpkg-source.1:81
 msgid ""
-"This command should be called before any build of the package (B<dpkg-"
-"buildpackage> calls it very early even before B<debian/rules clean>). This "
-"command should be idempotent and can be called multiple times. Not all "
-"source formats implement something in this hook, and those that do usually "
-"prepare the source tree for the build for example by ensuring that the "
-"Debian patches are applied."
+"Run the corresponding hook of the source package format. This hook is called "
+"before any build of the package (B<dpkg-buildpackage> calls it very early "
+"even before B<debian/rules clean>). This command is idempotent and can be "
+"called multiple times. Not all source formats implement something in this "
+"hook, and those that do usually prepare the source tree for the build for "
+"example by ensuring that the Debian patches are applied."
 msgstr ""
 
 #. type: TP
@@ -10915,21 +11256,35 @@
 #. type: Plain text
 #: dpkg-source.1:89
 msgid ""
-"This command should be called after any build of the package (B<dpkg-"
-"buildpackage> calls it last). This command should be idempotent and can be "
-"called multiple times. Not all source formats implement something in this "
-"hook, and those that do usually use it to undo what B<--before-build> has "
-"done."
+"Run the corresponding hook of the source package format. This hook is called "
+"after any build of the package (B<dpkg-buildpackage> calls it last). This "
+"command is idempotent and can be called multiple times. Not all source "
+"formats implement something in this hook, and those that do usually use it "
+"to undo what B<--before-build> has done."
+msgstr ""
+
+#. type: TP
+#: dpkg-source.1:90
+#, fuzzy, no-wrap
+msgid "B<--commit> [I<directory>] ..."
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
+#. type: Plain text
+#: dpkg-source.1:95
+msgid ""
+"Record changes in the source tree unpacked in I<directory>. This command can "
+"take supplementary parameters depending on the source format.  It will error "
+"out for formats where this operation doesn't mean anything."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:97
+#: dpkg-source.1:103
 #, no-wrap
 msgid "GENERIC BUILD OPTIONS"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 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 "
@@ -10937,7 +11292,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 msgid ""
 "Specifies the change log file to read information from. The default is "
 "B<debian/changelog>.  If given with relative pathname this is interpreted "
@@ -10945,20 +11300,20 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 #, fuzzy, no-wrap
 msgid "B<--format=>I<value>"
 msgstr "B<--abort-after=>I<число>"
 
 #. type: Plain text
-#: dpkg-source.1:121
+#: dpkg-source.1:127
 msgid ""
 "Use the given format for building the source package. It does override any "
 "format given in B<debian/source/format>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:131
+#: dpkg-source.1:137
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is to not read "
 "any file. This option can be used multiple times to read substitution "
@@ -10966,13 +11321,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:137
+#: dpkg-source.1:143
 #, no-wrap
 msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 msgid ""
 "Specify the compression to use for created files (tarballs and diffs).  Note "
 "that this option will not cause existing tarballs to be recompressed, it "
@@ -10982,27 +11337,27 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 #, no-wrap
 msgid "B<-z>I<level>, B<--compression-level>=I<level>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 msgid ""
 "Compression level to use. As with B<-Z> it only affects newly created files. "
-"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  I<9> is the "
-"default."
+"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  The default is "
+"I<9> for gzip and bzip2, I<6> for xz and lzma."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 #, no-wrap
 msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:163
+#: dpkg-source.1:169
 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 "
@@ -11016,7 +11371,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 msgid ""
 "This is very helpful in cutting out extraneous files that get included in "
 "the diff, e.g. if you maintain your source in a revision control system and "
@@ -11030,29 +11385,29 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 #, no-wrap
 msgid "B<--extend-diff-ignore>=I<regexp>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 msgid ""
-"The perl regular expression specified will extend the default regular "
-"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
-"default regexp.  This option is convenient to use in B<debian/source/"
-"options> to exclude some auto-generated files from the automatic patch "
-"generation."
+"The perl regular expression specified will extend the default value of B<--"
+"diff-ignore> and its current value (if set). It does this by concatenating "
+"\"B<|>I<regexp>\" to the existing value.  This option is convenient to use "
+"in B<debian/source/options> to exclude some auto-generated files from the "
+"automatic patch generation."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 #, no-wrap
 msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:189
+#: dpkg-source.1:195
 msgid ""
 "If this option is specified, the pattern will be passed to B<tar>(1)'s --"
 "exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -11062,7 +11417,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:194
+#: dpkg-source.1:200
 msgid ""
 "B<-I> by itself adds default --exclude options that will filter out control "
 "files and directories of the most common revision control systems, backup "
@@ -11070,7 +11425,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:212
 msgid ""
 "B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
 "different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -11083,48 +11438,48 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 msgid ""
 "The default regexp and patterns for both options can be seen in the output "
 "of the B<--help> command."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 #, no-wrap
 msgid "GENERIC EXTRACT OPTIONS"
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:210
+#: dpkg-source.1:216
 #, fuzzy, no-wrap
 msgid "B<--no-copy>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 msgid "Do not copy original tarballs near the extracted source package."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 #, fuzzy, no-wrap
 msgid "B<--no-check>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 msgid "Do not check signatures and checksums before unpacking."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 #, no-wrap
 msgid "B<--require-valid-signature>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:224
+#: dpkg-source.1:230
 msgid ""
 "Refuse to unpack the source package if it doesn't contain an OpenPGP "
 "signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -11134,13 +11489,13 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:225
+#: dpkg-source.1:231
 #, fuzzy, no-wrap
 msgid "SOURCE PACKAGE FORMATS"
 msgstr "ФЛАГИ ПАКЕТА"
 
 #. type: Plain text
-#: dpkg-source.1:230
+#: dpkg-source.1:236
 msgid ""
 "If you don't know what source format to use, you should probably pick either "
 "\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
@@ -11148,13 +11503,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:231
+#: dpkg-source.1:237
 #, no-wrap
 msgid "Format: 1.0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:235
+#: dpkg-source.1:241
 msgid ""
 "A source package in this format consists either of a B<.orig.tar.gz> "
 "associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -11162,12 +11517,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:237 dpkg-source.1:405 dpkg-source.1:566 dpkg-source.1:605
+#: dpkg-source.1:243 dpkg-source.1:411 dpkg-source.1:586 dpkg-source.1:625
 msgid "B<Extracting>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:247
+#: dpkg-source.1:253
 msgid ""
 "Extracting a native package is a simple extraction of the single tarball in "
 "the target directory. Extracting a non-native package is done by first "
@@ -11180,12 +11535,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:249 dpkg-source.1:433 dpkg-source.1:577 dpkg-source.1:610
+#: dpkg-source.1:255 dpkg-source.1:439 dpkg-source.1:597 dpkg-source.1:630
 msgid "B<Building>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:255
+#: dpkg-source.1:261
 msgid ""
 "Building a native package is just creating a single tarball with the source "
 "directory. Building a non-native package involves extracting the original "
@@ -11194,13 +11549,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:256
+#: dpkg-source.1:262
 #, no-wrap
 msgid "B<Build options (with -b):>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:269
+#: dpkg-source.1:275
 msgid ""
 "If a second non-option argument is supplied it should be the name of the "
 "original source directory or tarfile or the empty string if the package is a "
@@ -11211,7 +11566,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 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<-"
@@ -11219,13 +11574,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 #, fuzzy, no-wrap
 msgid "B<-sk>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:290
 msgid ""
 "Specifies to expect the original source as a tarfile, by default "
 "I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>.  It will leave "
@@ -11235,24 +11590,24 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:284 dpkg-source.1:353
+#: dpkg-source.1:290 dpkg-source.1:359
 #, fuzzy, no-wrap
 msgid "B<-sp>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-source.1:289
+#: dpkg-source.1:295
 msgid "Like B<-sk> but will remove the directory again afterwards."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:289 dpkg-source.1:359
+#: dpkg-source.1:295 dpkg-source.1:365
 #, fuzzy, no-wrap
 msgid "B<-su>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 msgid ""
 "Specifies that 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 "
@@ -11260,24 +11615,24 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 #, fuzzy, no-wrap
 msgid "B<-sr>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 #, fuzzy, no-wrap
 msgid "B<-ss>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-source.1:310
+#: dpkg-source.1:316
 msgid ""
 "Specifies that the original source is available both as a directory and as a "
 "tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -11286,13 +11641,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:310 dpkg-source.1:362
+#: dpkg-source.1:316 dpkg-source.1:368
 #, fuzzy, no-wrap
 msgid "B<-sn>"
 msgstr "B<-B>"
 
 #. type: Plain text
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 msgid ""
 "Specifies to not look for any original source, and to not generate a diff.  "
 "The second argument, if supplied, must be the empty string. This is used for "
@@ -11301,13 +11656,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 #, fuzzy, no-wrap
 msgid "B<-sa> or B<-sA>"
 msgstr "B<-t>|B<--test>"
 
 #. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:348
 msgid ""
 "Specifies to 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 "
@@ -11323,13 +11678,13 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:342 dpkg-source.1:525
+#: dpkg-source.1:348 dpkg-source.1:541
 #, no-wrap
 msgid "B<--abort-on-upstream-changes>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:348
+#: dpkg-source.1:354
 msgid ""
 "The process fails if the generated diff contains changes to files outside of "
 "the debian sub-directory. This option is not allowed in B<debian/source/"
@@ -11337,18 +11692,18 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:349
+#: dpkg-source.1:355
 #, no-wrap
 msgid "B<Extract options (with -x):>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:353
+#: dpkg-source.1:359
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:359
+#: dpkg-source.1:365
 msgid ""
 "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 "
@@ -11357,12 +11712,12 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:362
+#: dpkg-source.1:368
 msgid "Unpacks the original source tree."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:367
+#: dpkg-source.1:373
 msgid ""
 "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 "
@@ -11370,31 +11725,31 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:372
+#: dpkg-source.1:378
 msgid ""
 "All the B<-s>I<X> options are mutually exclusive. If you specify more than "
 "one only the last one will be used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:372 dpkg-source.1:535
+#: dpkg-source.1:378 dpkg-source.1:555
 #, fuzzy, no-wrap
 msgid "B<--skip-debianization>"
 msgstr "B<dpkg-deb-actions>"
 
 #. type: Plain text
-#: dpkg-source.1:375
+#: dpkg-source.1:381
 msgid "Skips application of the debian diff on top of the upstream sources."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:376
+#: dpkg-source.1:382
 #, no-wrap
 msgid "Format: 2.0"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:380
+#: dpkg-source.1:386
 msgid ""
 "Also known as wig&pen. This format is not recommended for wide-spread usage, "
 "the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -11402,7 +11757,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:385
+#: dpkg-source.1:391
 msgid ""
 "The behaviour of this format is the same as the \"3.0 (quilt)\" format "
 "except that it doesn't use an explicit list of patches. All files in "
@@ -11411,20 +11766,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:388
+#: dpkg-source.1:394
 msgid ""
 "When building a new source package, any change to the upstream source is "
 "stored in a patch named B<zz_debian-diff-auto>."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:389
+#: dpkg-source.1:395
 #, no-wrap
 msgid "Format: 3.0 (native)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:395
+#: dpkg-source.1:401
 msgid ""
 "This format is an extension of the native package format as defined in the "
 "1.0 format. It supports all compression methods and will ignore by default "
@@ -11433,13 +11788,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:396
+#: dpkg-source.1:402
 #, no-wrap
 msgid "Format: 3.0 (quilt)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:409
 msgid ""
 "A source package in this format contains at least an original tarball (B<."
 "orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -11449,7 +11804,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:414
+#: dpkg-source.1:420
 msgid ""
 "The main original tarball is extracted first, then all additional original "
 "tarballs are extracted in subdirectories named after the I<component> part "
@@ -11461,7 +11816,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:432
 msgid ""
 "All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
 "series> are then applied.  If the former file is used and the latter one "
@@ -11476,36 +11831,37 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:428
+#: dpkg-source.1:434
 msgid ""
 "Similarly to quilt's default behaviour, the patches can remove files too."
 msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:431
+#: dpkg-source.1:437
 msgid ""
 "The file B<.pc/applied-patches> is created if some patches have been applied "
 "during the extraction."
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:443
+#: dpkg-source.1:451
 msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
 "except the automatic patch (B<debian-changes->I<version> or B<debian-"
 "changes>, depending on B<--single-debian-patch>) are applied. The temporary "
-"directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in the automatic patch.  If the automatic patch is created/"
-"deleted, it's added/removed from the series file and from the quilt metadata."
+"directory is compared to the source package directory. When the diff is non-"
+"empty, the build fails unless B<--single-debian-patch> or B<--auto-commit> "
+"has been used, in which case the diff is stored in the automatic patch.  If "
+"the automatic patch is created/deleted, it's added/removed from the series "
+"file and from the quilt metadata."
 msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:451
+#: dpkg-source.1:459
 msgid ""
 "Any change on a binary file is not representable in a diff and will thus "
 "lead to a failure unless the maintainer deliberately decided to include that "
@@ -11516,14 +11872,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:454
+#: dpkg-source.1:462
 msgid ""
 "The updated debian directory and the list of modified binaries is then used "
 "to generate the debian tarball."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:460
+#: dpkg-source.1:468
 msgid ""
 "The automatically generated diff doesn't include changes on VCS specific "
 "files as well as many temporary files (see default value associated to B<-i> "
@@ -11532,36 +11888,54 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:477
+msgid ""
+"Note: B<dpkg-source> B<--before-build> (and B<-b>) will ensure that all "
+"patches listed in the series file are applied so that a package build always "
+"has all patches applied. It does this by finding unapplied patches (they are "
+"listed in the B<series> file but not in B<.pc/applied-patches>), and if the "
+"first patch in that set can be applied without errors, it will apply them "
+"all. The option B<--no-preparation> can be used to disable this behavior."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.1:480
+msgid "B<Recording changes>"
+msgstr ""
+
+#. type: TP
+#: dpkg-source.1:480
+#, fuzzy, no-wrap
+msgid "B<--commit> [I<directory>] [I<patch-name>] [I<patch-file>]"
+msgstr "B<dpkg-checkbuilddeps> -B<-B> [I<файл control>]"
+
+#. type: Plain text
+#: dpkg-source.1:490
 msgid ""
-"Note: B<dpkg-source> expects the source tree to have all patches listed in "
-"the series file applied when you generate the source package.  This is not "
-"the case when the source tree has been obtained by unpacking a source "
-"package using the Format: 1.0 for instance. To mitigate the problem, B<dpkg-"
-"source> will apply the patches by itself if it believes that they have not "
-"yet been applied. To detect this situation, it uses the following heuristic: "
-"it finds the list of supposedly unapplied patches (they are listed in the "
-"B<series> file but not in B<.pc/applied-patches>), and if the first patch in "
-"that set can be applied without errors, it will apply them all.  The option "
-"B<--no-preparation> can be used to disable this behaviour. This operation is "
-"usually done as part of the B<--prepare-build> command."
+"Generates a patch corresponding to the local changes that are not managed by "
+"the quilt patch system and integrates it in the patch system under the name "
+"I<patch-name>. If the name is missing, it will be asked interactively. If "
+"I<patch-file> is given, it is used as the patch corresponding to the local "
+"changes to integrate. This is mainly useful after a build failure that pre-"
+"generated this file. Once integrated, an editor is launched so that you can "
+"edit the meta-information in the patch header."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:476 dpkg-source.1:547 dpkg-source.1:586
+#: dpkg-source.1:493 dpkg-source.1:567 dpkg-source.1:606
 #, fuzzy
 msgid "B<Build options>"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: TP
-#: dpkg-source.1:476
+#: dpkg-source.1:493
 #, fuzzy, no-wrap
 msgid "B<--allow-version-of-quilt-db=>I<version>"
 msgstr "B<dpkg --version>"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 msgid ""
 "Allow B<dpkg-source> to build the source package if the version of the quilt "
 "metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -11571,37 +11945,37 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 #, fuzzy, no-wrap
 msgid "B<--include-removal>"
 msgstr "B<dpkg --clear-avail>"
 
 #. type: Plain text
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 msgid ""
 "Do not ignore removed files and include them in the automatically generated "
 "patch."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 #, no-wrap
 msgid "B<--include-timestamp>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 msgid "Include timestamp in the automatically generated patch."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 #, fuzzy, no-wrap
 msgid "B<--include-binaries>"
 msgstr "B<config-files>"
 
 #. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 msgid ""
 "Add all modified binaries in the debian tarball. Also add them to B<debian/"
 "source/include-binaries>: they will be added by default in subsequent builds "
@@ -11609,45 +11983,45 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 #, fuzzy, no-wrap
 msgid "B<--no-preparation>"
 msgstr "B<dpkg --version>"
 
 #. type: Plain text
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 msgid ""
 "Do not try to prepare the build tree by applying patches which are "
 "apparently unapplied."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 #, fuzzy, no-wrap
 msgid "B<--single-debian-patch>"
 msgstr "B<dpkg-deb-actions>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 msgid ""
 "Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
 "changes->I<version> for the name of the automatic patch generated during "
 "build. This option is particularly useful when the package is maintained in "
 "a VCS and a patch set can't reliably be generated. Instead the current diff "
-"with upstream should be stored in a single patch. When using this option, it "
-"is recommended to create a debian/source/patch-header file explaining how "
-"the Debian changes can be best reviewed, for example in the VCS that is used."
+"with upstream should be stored in a single patch. The option would be put in "
+"B<debian/source/local-options> and would be accompanied by a B<debian/source/"
+"local-patch-header> file explaining how the Debian changes can be best "
+"reviewed, for example in the VCS that is used."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 #, no-wrap
 msgid "B<--create-empty-orig>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 msgid ""
 "Automatically create the main original tarball as empty if it's missing and "
 "if there are supplementary original tarballs. This option is meant to be "
@@ -11656,24 +12030,23 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 #, fuzzy, no-wrap
 msgid "B<--unapply-patches>"
 msgstr "B<822-date>"
 
 #. type: Plain text
-#: dpkg-source.1:525
+#: dpkg-source.1:541
 msgid ""
-"Unapply the patches in the B<--after-build> hook. This is mainly useful when "
-"you build your package directly in a VCS that contains unpatched upstream "
-"source and where you want to keep the tree unpatched even after a package "
-"build. This option is usually put in B<debian/source/local-options> (it's "
-"not allowed in B<debian/source/options> so that all generated source "
-"packages have the same behaviour by default)."
+"Unapply the patches in the B<--after-build> hook. You usually don't need "
+"this option as dpkg-source will automatically unapply the patches if it did "
+"apply them during B<--before-build>. This option is only allowed in B<debian/"
+"source/local-options> so that all generated source packages have the same "
+"behavior by default."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:548
 msgid ""
 "The process fails if an automatic patch has been generated. This option can "
 "be used to ensure that all changes were properly recorded in separate quilt "
@@ -11681,56 +12054,69 @@
 "B<debian/source/options> but can be used in B<debian/source/local-options>."
 msgstr ""
 
+#. type: TP
+#: dpkg-source.1:548
+#, fuzzy, no-wrap
+msgid "B<--auto-commit>"
+msgstr "B<--nocheck>"
+
+#. type: Plain text
+#: dpkg-source.1:552
+msgid ""
+"The process doesn't fail if an automatic patch has been generated, instead "
+"it's immediately recorded in the quilt series."
+msgstr ""
+
 #. type: Plain text
-#: dpkg-source.1:535
+#: dpkg-source.1:555
 msgid "B<Extract options>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 msgid "Skips extraction of the debian tarball on top of the upstream sources."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 #, fuzzy, no-wrap
 msgid "B<--skip-patches>"
 msgstr "B<822-date>"
 
 #. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:561
 msgid "Do not apply patches at the end of the extraction."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:542
+#: dpkg-source.1:562
 #, no-wrap
 msgid "Format: 3.0 (custom)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:545
+#: dpkg-source.1:565
 msgid ""
-"This format is particular. It doesn't represent a real source package format "
+"This format is special. It doesn't represent a real source package format "
 "but can be used to create source packages with arbitrary files."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 msgid ""
 "All non-option arguments are taken as files to integrate in the generated "
-"source package. They must exist and are preferrably in the current "
-"directory. At least one file must be given."
+"source package. They must exist and are preferably in the current directory. "
+"At least one file must be given."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 #, fuzzy, no-wrap
 msgid "B<--target-format=>I<value>"
 msgstr "B<--abort-after=>I<число>"
 
 #. type: Plain text
-#: dpkg-source.1:556
+#: dpkg-source.1:576
 msgid ""
 "B<Required>. Defines the real format of the generated source package.  The "
 "generated .dsc file will contain this value in its I<Format> field and not "
@@ -11738,18 +12124,18 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:557
+#: dpkg-source.1:577
 #, no-wrap
 msgid "Format: 3.0 (git)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:579
 msgid "This format is experimental."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:564
+#: dpkg-source.1:584
 msgid ""
 "A source package in this format consists of a single bundle of a git "
 "repository B<.git> to hold the source of a package.  There may also be a B<."
@@ -11757,7 +12143,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:570
+#: dpkg-source.1:590
 msgid ""
 "The bundle is cloned as a git repository to the target directory.  If there "
 "is a gitshallow file, it is installed as `.git/shallow` inside the cloned "
@@ -11765,36 +12151,36 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:575
+#: dpkg-source.1:595
 msgid ""
 "Note that by default the new repository will have the same branch checked "
 "out that was checked out in the original source. (Typically \"master\", but "
-"it could be anything.) Any other branches will be available, under as "
-"`remotes/origin/`"
+"it could be anything.) Any other branches will be available under `remotes/"
+"origin/`."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:580 dpkg-source.1:613
+#: dpkg-source.1:600 dpkg-source.1:633
 msgid ""
 "Before going any further, some checks are done to ensure that we don't have "
 "any non-ignored uncommitted changes."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:584
+#: dpkg-source.1:604
 msgid ""
 "B<git-bundle>(1) is used to generate a bundle of the git repository.  By "
 "default, all branches and tags in the repository are included in the bundle."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:586
+#: dpkg-source.1:606
 #, fuzzy, no-wrap
 msgid "B<--git-ref=>I<ref>"
 msgstr "B<--abort-after=>I<число>"
 
 #. type: Plain text
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 msgid ""
 "Allows specifying a git ref to include in the git bundle. Use disables the "
 "default behavior of including all branches and tags. May be specified "
@@ -11806,40 +12192,40 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 #, fuzzy, no-wrap
 #| msgid "B<--abort-after=>I<number>"
 msgid "B<--git-depth=>I<number>"
 msgstr "B<--abort-after=>I<число>"
 
 #. type: Plain text
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 msgid ""
 "Creates a shallow clone with a history truncated to the specified number of "
 "revisions."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 #, no-wrap
 msgid "Format: 3.0 (bzr)"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:603
+#: dpkg-source.1:623
 msgid ""
 "This format is experimental. It generates a single tarball containing the "
 "bzr repository."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:608
+#: dpkg-source.1:628
 msgid ""
 "The tarball is unpacked and then bzr is used to checkout the current branch."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 msgid ""
 "Then the VCS specific part of the source directory is copied over to a "
 "temporary directory. Before this temporary directory is packed in a tarball, "
@@ -11847,19 +12233,19 @@
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 #, no-wrap
 msgid "WARNINGS AND ERRORS"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:618
+#: dpkg-source.1:638
 #, no-wrap
 msgid "no source format specified in debian/source/format"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:624
+#: dpkg-source.1:644
 msgid ""
 "The file B<debian/source/format> should always exist and indicate the "
 "desired source format. For backwards compatibility, format \"1.0\" is "
@@ -11869,7 +12255,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 msgid ""
 "The rationale is that format \"1.0\" is no longer the recommended format, "
 "you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
@@ -11879,13 +12265,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 #, no-wrap
 msgid "the diff modifies the following upstream files"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 msgid ""
 "When using source format \"1.0\" it is usually a bad idea to modify upstream "
 "files directly as the changes end up hidden and mostly undocumented in the ."
@@ -11895,13 +12281,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 #, no-wrap
 msgid "cannot represent change to I<file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 msgid ""
 "Changes to upstream sources are usually stored with patch files, but not all "
 "changes can be represented with patches: they can only alter the content of "
@@ -11911,51 +12297,51 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 #, no-wrap
 msgid "newly created empty file I<file> will not be represented in diff"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 msgid ""
 "Empty files can't be created with patch files. Thus this change is not "
 "recorded in the source package and you are warned about it."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 #, no-wrap
 msgid "executable mode I<perms> of I<file> will not be represented in diff"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:647
+#: dpkg-source.1:667
 #, no-wrap
 msgid "special mode I<perms> of I<file> will not be represented in diff"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 msgid ""
 "Patch files do not record permissions of files and thus modified permissions "
 "are not stored in the source package. This warning reminds you of that fact."
 msgstr ""
 
 #. type: SH
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 #, no-wrap
 msgid "FILE FORMATS"
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:652
+#: dpkg-source.1:672
 #, no-wrap
 msgid "debian/source/format"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 msgid ""
 "This file contains on a single line the format that should be used to build "
 "the source package (possible formats are described above). No leading or "
@@ -11963,13 +12349,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 #, fuzzy, no-wrap
 msgid "debian/source/include-binaries"
 msgstr "B<config-files>"
 
 #. type: Plain text
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 msgid ""
 "This file contains a list of binary files (one per line) that should be "
 "included in the debian tarball. Leading and trailing spaces are stripped.  "
@@ -11978,13 +12364,13 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 #, fuzzy, no-wrap
 msgid "debian/source/options"
 msgstr "B<config-files>"
 
 #. type: Plain text
-#: dpkg-source.1:666
+#: dpkg-source.1:686
 msgid ""
 "This file contains a list of long options that should be automatically "
 "prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -11993,7 +12379,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:672
+#: dpkg-source.1:692
 msgid ""
 "Each option should be put on a separate line. Empty lines and lines starting "
 "with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -12002,9 +12388,8 @@
 "a file:"
 msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:678
+#: dpkg-source.1:700
 #, no-wrap
 msgid ""
 "  # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -12012,23 +12397,25 @@
 "  compression-level = 9\n"
 "  # use debian/patches/debian-changes as automatic patch\n"
 "  single-debian-patch\n"
+"  # ignore changes on config.{sub,guess}\n"
+"  extend-diff-ignore = \"(^|/)(config.sub|config.guess)$\"\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 msgid ""
 "Note: B<format> options are not accepted in this file, you should use "
 "B<debian/source/format> instead."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 #, fuzzy, no-wrap
 msgid "debian/source/local-options"
 msgstr "B<config-files>"
 
 #. type: Plain text
-#: dpkg-source.1:686
+#: dpkg-source.1:708
 msgid ""
 "Exactly like B<debian/source/options> except that the file is not included "
 "in the generated source package. It can be useful to store a preference tied "
@@ -12037,27 +12424,33 @@
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:686
+#: dpkg-source.1:708
+#, fuzzy, no-wrap
+msgid "debian/source/local-patch-header"
+msgstr "B<config-files>"
+
+#. type: SS
+#: dpkg-source.1:709
 #, fuzzy, no-wrap
 msgid "debian/source/patch-header"
 msgstr "B<config-files>"
 
-# type: Plain text
 #. type: Plain text
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 msgid ""
 "Free form text that is put on top of the automatic patch generated in "
-"formats \"2.0\" or \"3.0 (quilt)\"."
+"formats \"2.0\" or \"3.0 (quilt)\". B<local-patch-header> is not included in "
+"the generated source package while B<patch-header> is."
 msgstr ""
 
 #. type: SS
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 #, no-wrap
 msgid "debian/patches/series"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:698
+#: dpkg-source.1:722
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
@@ -12070,36 +12463,36 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.1:705
+#: dpkg-source.1:729
 #, fuzzy
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
+#. type: Plain text
+#: dpkg-source.1:736
+#, fuzzy
+msgid "Copyright \\(co 2008-2011 Rapha\\[:e]l Hertzog"
+msgstr "Copyright 2001 Joey Hess"
+
 #. type: TH
 #: dpkg-split.1:2
 #, fuzzy, no-wrap
 msgid "dpkg-split"
 msgstr "комплект dpkg"
 
-#. type: TH
-#: dpkg-split.1:2 dpkg-statoverride.8:1
-#, fuzzy, no-wrap
-msgid "2009-06-26"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: dpkg-split.1:5
 msgid "dpkg-split - Debian package archive split/join tool"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:10
+#: dpkg-split.1:9
 #, fuzzy
-msgid "B<dpkg-split> [I<options>] I<command>"
+msgid "B<dpkg-split> [I<option>...] I<command>"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
-#: dpkg-split.1:16
+#: dpkg-split.1:15
 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 "
@@ -12107,14 +12500,14 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:20
+#: dpkg-split.1:19
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:28
+#: dpkg-split.1:27
 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 "
@@ -12123,25 +12516,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:31
+#: dpkg-split.1:30
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:33
+#: dpkg-split.1:32
 #, no-wrap
 msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:36
+#: dpkg-split.1:35
 msgid "Splits a single Debian binary package into several parts."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:44
+#: dpkg-split.1:43
 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 "
@@ -12149,27 +12542,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 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:52
+#: dpkg-split.1:51
 #, fuzzy, no-wrap
 msgid "B<-j>, B<--join> I<part>..."
 msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
 
 #. type: Plain text
-#: dpkg-split.1:56
+#: dpkg-split.1:55
 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:60
+#: dpkg-split.1:59
 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 "
@@ -12177,7 +12570,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:65
+#: dpkg-split.1:64
 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 "
@@ -12185,23 +12578,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:67
+#: dpkg-split.1:66
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:70
-msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
+#: dpkg-split.1:69
+msgid ""
+"By default the output file is called I<package>B<_>I<version>B<_>I<arch>B<."
+"deb>."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:71
+#: dpkg-split.1:70
 #, fuzzy, no-wrap
 msgid "B<-I>, B<--info> I<part>..."
 msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
 
 #. type: Plain text
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -12209,25 +12604,25 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 #, no-wrap
 msgid "B<-a>, B<--auto -o> I<complete-output part>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:79
+#: dpkg-split.1:78
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:84
+#: dpkg-split.1:83
 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:91
+#: dpkg-split.1:90
 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 "
@@ -12235,21 +12630,22 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:97
+#: dpkg-split.1:96
 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:104
+#: dpkg-split.1:103
 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."
+"with status B<1>; if some other trouble occurs then it will exit with status "
+"B<2>."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 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 "
@@ -12257,18 +12653,18 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 #, fuzzy, no-wrap
 msgid "B<-l>, B<--listq>"
 msgstr "B<-o>|B<--oknodo>"
 
 #. type: Plain text
-#: dpkg-split.1:114
+#: dpkg-split.1:113
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 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 "
@@ -12276,77 +12672,77 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 #, fuzzy, no-wrap
 msgid "B<-d>, B<--discard> [I<package>...]"
 msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
 
 #. type: Plain text
-#: dpkg-split.1:122
+#: dpkg-split.1:121
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:126
 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: TP
-#: dpkg-split.1:135
+#: dpkg-split.1:134
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 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:140
+#: dpkg-split.1:139
 #, fuzzy, no-wrap
 msgid "B<-S>, B<--partsize> I<kibibytes>"
 msgstr "B<-a>|B<--startas> I<полное_имя>"
 
 #. type: Plain text
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 msgid ""
 "Specifies the maximum part size when splitting, in kibibytes (1024 bytes). "
 "The default is 450 KiB."
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 #, no-wrap
 msgid "B<-o>, B<--output> I<complete-output>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:147
+#: dpkg-split.1:146
 msgid "Specifies the output file name for a reassembly."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:152
+#: dpkg-split.1:151
 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:152
+#: dpkg-split.1:151
 #, fuzzy, no-wrap
 msgid "B<-Q>, B<--npquiet>"
 msgstr "B<-q>|B<--quiet>"
 
 #. type: Plain text
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 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 "
@@ -12355,19 +12751,19 @@
 msgstr ""
 
 #. type: TP
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 #, no-wrap
 msgid "B<--msdos>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:168
+#: dpkg-split.1:167
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:174
+#: dpkg-split.1:173
 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 "
@@ -12375,7 +12771,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:179
+#: dpkg-split.1:178
 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."
@@ -12384,69 +12780,59 @@
 #. type: Plain text
 #: dpkg-split.1:186
 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."
+"The requested split, merge, or other command succeeded.  B<--info> commands "
+"count as successful even if the files are not binary package parts."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:192
+#: dpkg-split.1:193
 msgid ""
-"An exit status of 1 occurs only with B<--auto> and indicates that the "
-"I<part> file was not a binary package part."
+"Only occurs with B<--auto> and indicates that the I<part> file was not a "
+"binary package part."
 msgstr ""
 
-#. type: Plain text
-#: dpkg-split.1:196
-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."
+#. type: TP
+#: dpkg-split.1:193 start-stop-daemon.8:275 update-alternatives.8:378
+#, no-wrap
+msgid "B<2>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:201
+#: dpkg-split.1:198
 msgid ""
-"B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
-"of Debian packages."
+"Some kind of trouble happened, 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 ""
 
 #. type: Plain text
-#: dpkg-split.1:204
+#: dpkg-split.1:202
 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:207
+#: dpkg-split.1:205
 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:211
-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 ""
-
 #. type: TP
-#: dpkg-split.1:213
+#: dpkg-split.1:207
 #, fuzzy, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "I</var/lib/dpkg/status>"
 
 #. type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:211
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:222
+#: dpkg-split.1:216
 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 "
@@ -12454,7 +12840,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:222
 #, 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)."
@@ -12477,13 +12863,13 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:9
+#: dpkg-statoverride.8:8
 #, fuzzy
-msgid "B<dpkg-statoverride> [I<options>] I<command>"
+msgid "B<dpkg-statoverride> [I<option>...] I<command>"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:19
+#: dpkg-statoverride.8:18
 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' "
@@ -12494,20 +12880,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:23
+#: dpkg-statoverride.8:22
 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:25
+#: dpkg-statoverride.8:24
 #, no-wrap
 msgid "B<--add>I< user group mode file>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:33
+#: dpkg-statoverride.8:32
 msgid ""
 "Add an override for I<file>. I<file> does not need to exist when this "
 "command is used; the override will be stored and used later.  Users and "
@@ -12517,27 +12903,27 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:36
+#: dpkg-statoverride.8:35
 msgid ""
 "If --update is specified and I<file> exists, it is immediately set to the "
 "new owner and mode."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 msgid ""
 "Remove an override for I<file>, the status of I<file> is left unchanged by "
 "this command."
 msgstr ""
 
 #. type: TP
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 #, fuzzy, no-wrap
 msgid "B<--list> [I<glob-pattern>]"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:45
+#: 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 "
@@ -12545,50 +12931,50 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:56
 msgid ""
 "Change the I<directory> of the dpkg database where the statoverride file is "
 "also stored. Defaults to I</var/lib/dpkg>."
 msgstr ""
 
 #. type: TP
-#: dpkg-statoverride.8:57 update-alternatives.8:337
+#: dpkg-statoverride.8:56 update-alternatives.8:336
 #, fuzzy, no-wrap
 msgid "B<--force>"
 msgstr "B<--nocheck>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:61
+#: 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:61
+#: dpkg-statoverride.8:60
 #, fuzzy, no-wrap
 msgid "B<--update>"
 msgstr "B<822-date>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:65
+#: 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:68
+#: dpkg-statoverride.8:67
 msgid "Be less verbose about what we do."
 msgstr ""
 
 #. type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:75
 #, 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:80
 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 "
@@ -12596,7 +12982,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:83
 msgid ""
 "Note: B<dpkg-statoverride> preserves the old copy of this file, with "
 "extension \"-old\", before replacing it with the new one."
@@ -12658,9 +13044,9 @@
 #: dpkg-trigger.1:31
 msgid ""
 "Check if the running B<dpkg> supports triggers (usually called from a "
-"postinst). Will exit 0 if a triggers-capable B<dpkg> has run, or 1 with an "
-"error message to stderr if not. Normally, however, it is better just to "
-"activate the desired trigger with B<dpkg-trigger>."
+"postinst). Will exit B<0> if a triggers-capable B<dpkg> has run, or B<1> "
+"with an error message to stderr if not. Normally, however, it is better just "
+"to activate the desired trigger with B<dpkg-trigger>."
 msgstr ""
 
 #. type: TP
@@ -12673,7 +13059,7 @@
 #: dpkg-trigger.1:49
 msgid ""
 "Override trigger awaiter (normally set by B<dpkg> through the "
-"DPKG_MAINTSCRIPT_PACKAGE environment variable of the maintainer scripts, "
+"B<DPKG_MAINTSCRIPT_PACKAGE> environment variable of the maintainer scripts, "
 "naming the package to which the script belongs, and this will be used by "
 "default)."
 msgstr ""
@@ -12705,7 +13091,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-trigger.1:68
+#: dpkg-trigger.1:69
 #, fuzzy
 msgid ""
 "B<dpkg>(1), B<deb-triggers>(5), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
@@ -12714,14 +13100,8 @@
 #. type: TH
 #: dpkg-vendor.1:1
 #, fuzzy, no-wrap
-msgid "dpkg-vendor"
-msgstr "deb-control"
-
-#. type: TH
-#: dpkg-vendor.1:1
-#, fuzzy, no-wrap
-msgid "2009-05-10"
-msgstr "2006-02-28"
+msgid "dpkg-vendor"
+msgstr "deb-control"
 
 #. type: Plain text
 #: dpkg-vendor.1:4
@@ -12751,7 +13131,7 @@
 #. type: Plain text
 #: dpkg-vendor.1:19
 msgid ""
-"Exits with 0 if the current vendor is I<vendor>. Otherwise exits with non-"
+"Exits with B<0> if the current vendor is I<vendor>. Otherwise exits with non-"
 "zero."
 msgstr ""
 
@@ -12764,7 +13144,7 @@
 #. type: Plain text
 #: dpkg-vendor.1:24
 msgid ""
-"Exits with 0 if the current vendor distribution is a derivative of "
+"Exits with B<0> if the current vendor distribution is a derivative of "
 "I<vendor>, otherwise exits with non-zero. It uses the \"Parent\" field to "
 "browse all ancestors of the current vendor."
 msgstr ""
@@ -12792,7 +13172,7 @@
 #: dpkg-vendor.1:41
 msgid ""
 "Assumes the current vendor is I<vendor> instead of discovering it with the "
-"DEB_VENDOR environment variable or B</etc/dpkg/origins/default>."
+"B<DEB_VENDOR> environment variable or B</etc/dpkg/origins/default>."
 msgstr ""
 
 #. type: TP
@@ -12809,7 +13189,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dpkg-vendor.1:50 update-alternatives.8:497
+#: dpkg-vendor.1:50 update-alternatives.8:498
 #, fuzzy
 msgid "Copyright \\(co 2009 Rapha\\[:e]l Hertzog"
 msgstr "Copyright 2001 Joey Hess"
@@ -12827,16 +13207,14 @@
 msgstr "deb-control -- формат мастер файла control пакетов Debian"
 
 #. type: Plain text
-#: dselect.1:16
-msgid ""
-"B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--version>] "
-"[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 ""
+#: dselect.1:8
+#, fuzzy
+#| msgid "B<dpkg> [I<options>] I<action>"
+msgid "B<dselect> [I<option>...] [I<action>]"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
-#: dselect.1:25
+#: dselect.1:17
 #, no-wrap
 msgid ""
 "B<dselect>\n"
@@ -12849,7 +13227,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:37
+#: dselect.1:29
 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 "
@@ -12863,23 +13241,23 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:43
+#: dselect.1:35
 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 "
+"argument, then that action is started immediately. Several command line "
 "parameters are still available to modify the running behaviour of B<dselect> "
 "or show additional information about the program."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:51
+#: dselect.1:43
 #, fuzzy
 msgid ""
-"All options can be specified both on the commandline and in the B<dselect> "
+"All options can be specified both on the command line and in the B<dselect> "
 "configuration file I</etc/dpkg/dselect.cfg> or the files on the "
-"configuration directory I</etc/dpkg/dpkg.cfg.d/>. Each line in the "
-"configuration file is either an option (exactly the same as the commandline "
+"configuration directory I</etc/dpkg/dselect.cfg.d/>. 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 ""
 "Все параметры можно указывать как в командной строке, так и в "
@@ -12888,14 +13266,8 @@
 "командной строке, но без начальных дефисов), либо комментарием (если "
 "начинается с 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
+#: dselect.1:49
 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 "
@@ -12903,36 +13275,36 @@
 msgstr ""
 
 #. type: TP
-#: dselect.1:57
-#, no-wrap
-msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
-msgstr ""
+#: dselect.1:49
+#, fuzzy, no-wrap
+msgid "B<--debug>I< file >|I< >B<-D>I<file>"
+msgstr "B<--new> | B<--old>"
 
 #. type: Plain text
-#: dselect.1:60
-msgid "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+#: dselect.1:52
+msgid "Turn on debugging. Debugging information is sent to I<file>."
 msgstr ""
 
 #. type: TP
-#: dselect.1:60
+#: dselect.1:52
 #, no-wrap
 msgid "B<--expert>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:64
+#: dselect.1:56
 msgid ""
 "Turns on expert mode, i.e. doesn't display possibly annoying help messages."
 msgstr ""
 
 #. type: TP
-#: dselect.1:64
+#: dselect.1:56
 #, no-wrap
 msgid "B<--colour>|B<--color> I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:71
+#: dselect.1:63
 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>). "
@@ -12941,146 +13313,146 @@
 msgstr ""
 
 #. type: TP
-#: dselect.1:72
+#: dselect.1:64
 #, fuzzy, no-wrap
 msgid "B<title>"
 msgstr "B<installed>"
 
 #. type: Plain text
-#: dselect.1:75
+#: dselect.1:67
 msgid "The screen title."
 msgstr ""
 
 #. type: TP
-#: dselect.1:75
+#: dselect.1:67
 #, fuzzy, no-wrap
 msgid "B<listhead>"
 msgstr "B<installed>"
 
 #. type: Plain text
-#: dselect.1:78
+#: dselect.1:70
 #, fuzzy
 msgid "The header line above the list of packages."
 msgstr "Вручную просмотреть список пакетов:"
 
 #. type: TP
-#: dselect.1:78
+#: dselect.1:70
 #, fuzzy, no-wrap
 msgid "B<list>"
 msgstr "B<install>"
 
 #. type: Plain text
-#: dselect.1:81
+#: dselect.1:73
 msgid "The scrolling list of packages (and also some help text)."
 msgstr ""
 
 #. type: TP
-#: dselect.1:81
+#: dselect.1:73
 #, fuzzy, no-wrap
 msgid "B<listsel>"
 msgstr "B<install>"
 
 #. type: Plain text
-#: dselect.1:84
+#: dselect.1:76
 msgid "The selected item in the list."
 msgstr ""
 
 #. type: TP
-#: dselect.1:84
+#: dselect.1:76
 #, fuzzy, no-wrap
 msgid "B<pkgstate>"
 msgstr "B<purge>"
 
 #. type: Plain text
-#: dselect.1:88
+#: dselect.1:80
 msgid ""
 "In the list of packages, the text indicating the current state of each "
 "package."
 msgstr ""
 
 #. type: TP
-#: dselect.1:88
+#: dselect.1:80
 #, no-wrap
 msgid "B<pkgstatesel>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:92
+#: dselect.1:84
 msgid ""
 "In the list of packages, the text indicating the current state of the "
 "currently selected package."
 msgstr ""
 
 #. type: TP
-#: dselect.1:92
+#: dselect.1:84
 #, fuzzy, no-wrap
 msgid "B<infohead>"
 msgstr "B<installed>"
 
 #. type: Plain text
-#: dselect.1:95
+#: dselect.1:87
 msgid ""
 "The header line that displays the state of the currently selected package."
 msgstr ""
 
 #. type: TP
-#: dselect.1:95
+#: dselect.1:87
 #, fuzzy, no-wrap
 msgid "B<infodesc>"
 msgstr "B<--no-debsig>"
 
 #. type: Plain text
-#: dselect.1:98
+#: dselect.1:90
 #, fuzzy
 msgid "The package's short description."
 msgstr "Пакет выбран для установки."
 
 #. type: TP
-#: dselect.1:98
+#: dselect.1:90
 #, no-wrap
 msgid "B<info>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:101
+#: dselect.1:93
 msgid "Used to display package info such as the package's description."
 msgstr ""
 
 #. type: TP
-#: dselect.1:101
+#: dselect.1:93
 #, no-wrap
 msgid "B<infofoot>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:104
+#: dselect.1:96
 msgid "The last line of the screen when selecting packages."
 msgstr ""
 
 #. type: TP
-#: dselect.1:104
+#: dselect.1:96
 #, fuzzy, no-wrap
 msgid "B<query>"
 msgstr "B<purge>"
 
 #. type: Plain text
-#: dselect.1:107
+#: dselect.1:99
 msgid "Used to display query lines"
 msgstr ""
 
 #. type: TP
-#: dselect.1:107
+#: dselect.1:99
 #, no-wrap
 msgid "B<helpscreen>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:110
+#: dselect.1:102
 msgid "Color of help screens."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:115
+#: dselect.1:107
 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, "
@@ -13088,7 +13460,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:121
+#: dselect.1:113
 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 "
@@ -13098,68 +13470,63 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:124
+#: dselect.1:116
 msgid "Print a brief help text and exit successfully."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:127
+#: dselect.1:119
 #, fuzzy
 msgid "Print version information and exit successfully."
 msgstr "Выдать информацию о версии и завершить работу."
 
-#. type: SH
-#: dselect.1:128
-#, no-wrap
-msgid "USAGE"
-msgstr ""
-
 #. type: Plain text
-#: dselect.1:133
+#: dselect.1:126
 msgid ""
-"When B<dselect> is started interactively, it prompts the user with a menu of "
-"available actions:"
+"When B<dselect> is started it can perform the following actions, either "
+"directly if it was specified on the command line or by prompting the user "
+"with a menu of available actions if running interactively:"
 msgstr ""
 
 #. type: SS
-#: dselect.1:133
+#: dselect.1:126
 #, no-wrap
 msgid "access"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:135
+#: dselect.1:128
 msgid "Choose and configure an access method to access package repositories."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:141
+#: dselect.1:134
 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."
+"By default, B<dselect> provides several methods such as I<cdrom>, "
+"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount>, "
+"I<floppy> or I<ftp>, but other packages may provide additional methods, eg. "
+"the I<apt> access method provided by the B<apt> package."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:143
+#: dselect.1:136
 msgid "The use of the I<apt> access method is strongly recommended."
 msgstr ""
 
 #. type: SS
-#: dselect.1:144
+#: dselect.1:137
 #, no-wrap
 msgid "update"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:146
+#: dselect.1:139
 #, fuzzy
 msgid "Refresh the available packages database."
 msgstr "Список доступных пакетов."
 
 #. type: Plain text
-#: dselect.1:153
+#: dselect.1:146
 msgid ""
 "Retrieves a list of available package versions from the package repository, "
 "configured for the current access method, and update the dpkg database. The "
@@ -13169,25 +13536,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:156
+#: dselect.1:149
 msgid ""
 "Details of the update action depend on the access method's implementation.  "
 "Normally the process is straightforward and requires no user interaction."
 msgstr ""
 
 #. type: SS
-#: dselect.1:157
+#: dselect.1:150
 #, no-wrap
 msgid "select"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:159
+#: dselect.1:152
 msgid "View or manage package selections and dependencies."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:165
+#: dselect.1:158
 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 "
@@ -13197,7 +13564,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:172
+#: dselect.1:165
 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 "
@@ -13208,25 +13575,25 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:175
+#: dselect.1:168
 msgid ""
 "The use of the interactive package selections management screen is explained "
 "in more detail below."
 msgstr ""
 
 #. type: SS
-#: dselect.1:176
+#: dselect.1:169
 #, fuzzy, no-wrap
 msgid "install"
 msgstr "B<install>"
 
 #. type: Plain text
-#: dselect.1:178
+#: dselect.1:171
 msgid "Installs selected packages."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:184
+#: dselect.1:177
 msgid ""
 "The configured access method will fetch installable or upgradable packages "
 "from the relevant repositories and install these using B<dpkg>.  Depending "
@@ -13236,7 +13603,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:192
+#: dselect.1:185
 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 "
@@ -13248,7 +13615,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:199
+#: dselect.1:192
 msgid ""
 "Details of the install action depend on the access method's implementation.  "
 "The user's attention and input may be required during installation, "
@@ -13258,57 +13625,57 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:200
+#: dselect.1:193
 #, no-wrap
 msgid "config"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:202
+#: dselect.1:195
 msgid "Configures any previously installed, but not fully configured packages."
 msgstr ""
 
 #. type: SS
-#: dselect.1:203
+#: dselect.1:196
 #, no-wrap
 msgid "remove"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:205
+#: dselect.1:198
 msgid "Removes or purges installed packages, that are marked for removal."
 msgstr ""
 
 #. type: SS
-#: dselect.1:206
+#: dselect.1:199
 #, no-wrap
 msgid "quit"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:208
+#: dselect.1:201
 msgid "Quit B<dselect>"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:210
+#: dselect.1:203
 msgid "Exits the program with zero (successful) errorcode."
 msgstr ""
 
 #. type: SH
-#: dselect.1:212
+#: dselect.1:205
 #, no-wrap
 msgid "Package selections management"
 msgstr ""
 
 #. type: SS
-#: dselect.1:214
+#: dselect.1:207
 #, no-wrap
 msgid "Introduction"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:230
+#: dselect.1:223
 msgid ""
 "B<dselect> directly exposes the administrator to some of the complexities "
 "involved with managing large sets of packages with many interdependencies. "
@@ -13323,7 +13690,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:236
+#: dselect.1:229
 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> "
@@ -13333,13 +13700,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:237
+#: dselect.1:230
 #, no-wrap
 msgid "Screen layout"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:245
+#: dselect.1:238
 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 "
@@ -13350,20 +13717,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:248
+#: dselect.1:241
 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 ""
 
 #. type: SS
-#: dselect.1:249
+#: dselect.1:242
 #, no-wrap
 msgid "Package details view"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:258
+#: dselect.1:251
 #, no-wrap
 msgid ""
 "The package details view by default shows the extended package description\n"
@@ -13376,7 +13743,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:262
+#: dselect.1:255
 msgid ""
 "In a dependency resolution screen, there is also the possibility of viewing "
 "the specific unresolved depends or conflicts related to the package and "
@@ -13384,13 +13751,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:263
+#: dselect.1:256
 #, no-wrap
 msgid "Packages status list"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:268
+#: dselect.1:261
 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 "
@@ -13398,7 +13765,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:276
+#: dselect.1:269
 msgid ""
 "For every package, the list shows the package's status, priority, section, "
 "installed and available versions, the package name and its short "
@@ -13409,7 +13776,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:282
+#: dselect.1:275
 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 "
@@ -13418,7 +13785,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:300
+#: dselect.1:293
 #, no-wrap
 msgid ""
 "These are the meanings of the shorthand package status indicator codes:\n"
@@ -13441,20 +13808,20 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:301
+#: dselect.1:294
 #, no-wrap
 msgid "Cursor and screen movement"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:306
+#: dselect.1:299
 msgid ""
 "The package selection list and the dependency conflict resolution screens "
 "can be navigated using motion commands mapped to the following keys:"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:323
+#: dselect.1:316
 #, no-wrap
 msgid ""
 "  B<p, Up, k>           move cursor bar up\n"
@@ -13476,13 +13843,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:324
+#: dselect.1:317
 #, no-wrap
 msgid "Searching and sorting"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:338
+#: dselect.1:331
 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 "
@@ -13496,7 +13863,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:345
+#: dselect.1:338
 #, no-wrap
 msgid ""
 "The list sort order can be varied by pressing\n"
@@ -13508,20 +13875,20 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:348
+#: dselect.1:341
 msgid ""
 "Where not listed above explicitly, alphabetic order is used as the final "
 "subordering sort key."
 msgstr ""
 
 #. type: SS
-#: dselect.1:349
+#: dselect.1:342
 #, no-wrap
 msgid "Altering selections"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:358
+#: dselect.1:351
 #, no-wrap
 msgid ""
 "The requested selection state of individual packages may be\n"
@@ -13534,7 +13901,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:362
+#: dselect.1:355
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -13542,7 +13909,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:367
+#: dselect.1:360
 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 "
@@ -13550,7 +13917,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:373
+#: dselect.1:366
 msgid ""
 "Proper care should be taken when altering large groups of selections, "
 "because this can instantaneously create large numbers of unresolved depends "
@@ -13560,13 +13927,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:374
+#: dselect.1:367
 #, no-wrap
 msgid "Resolving depends and conflicts"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:379
+#: dselect.1:372
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -13574,7 +13941,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:386
+#: dselect.1:379
 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 "
@@ -13585,7 +13952,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:392
+#: dselect.1:385
 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, "
@@ -13595,7 +13962,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:400
+#: dselect.1:393
 msgid ""
 "The listed packages' selection state may be reverted to the original "
 "settings, as they were before the unresolved depends or conflicts were "
@@ -13606,13 +13973,13 @@
 msgstr ""
 
 #. type: SS
-#: dselect.1:401
+#: dselect.1:394
 #, no-wrap
 msgid "Establishing the requested selections"
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:408
+#: dselect.1:401
 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 "
@@ -13622,7 +13989,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:414
+#: dselect.1:407
 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 "
@@ -13631,7 +13998,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:421
+#: dselect.1:414
 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 "
@@ -13641,7 +14008,7 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:428
+#: dselect.1:421
 msgid ""
 "If you mistakenly establish some settings and wish to revert all the "
 "selections to what is currently installed on the system, press the B<'C'> "
@@ -13651,37 +14018,37 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:435
+#: dselect.1:428
 msgid ""
 "If set, B<dselect> will use it as the directory from which to read the user "
 "specific configuration file."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:441
+#: dselect.1:434
 msgid ""
 "The B<dselect> package selection interface is confusing to some new users.  "
 "Reportedly, it even makes seasoned kernel developers cry."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:443
+#: dselect.1:436
 msgid "The documentation is lacking."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:445
+#: dselect.1:438
 msgid "There is no help option in the main menu."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:447
+#: dselect.1:440
 #, fuzzy
 msgid "The visible list of available packages cannot be reduced."
 msgstr "Список доступных пакетов."
 
 #. type: Plain text
-#: dselect.1:451
+#: dselect.1:444
 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, "
@@ -13689,19 +14056,19 @@
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:457
+#: dselect.1:450
 msgid "B<dpkg>(1), B<apt-get>(8), B<sources.list>(5), B<deb>(5)."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:462
+#: dselect.1:455
 msgid ""
 "B<dselect> was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list "
 "of contributors may be found in 'dselect --version'."
 msgstr ""
 
 #. type: Plain text
-#: dselect.1:465
+#: dselect.1:458
 msgid ""
 "This manual page was written by Juho Vuori E<lt>javuori@cc.helsinki.fiE<gt>, "
 "Josip Rodin and Joost kooij."
@@ -13713,6 +14080,12 @@
 msgid "dselect.cfg"
 msgstr ""
 
+#. type: TH
+#: dselect.cfg.5:1
+#, fuzzy, no-wrap
+msgid "2011-07-03"
+msgstr "2006-02-28"
+
 #. type: Plain text
 #: dselect.cfg.5:4
 msgid "dselect.cfg - dselect configuration file"
@@ -13722,7 +14095,7 @@
 #: 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 "
+"option which is exactly the same as a normal command line option for dselect "
 "except for the leading dashes which are not used here. Quotes surrounding "
 "option values are stripped. Comments are allowed by starting a line with a "
 "hash sign (\"B<#>\")."
@@ -13774,13 +14147,13 @@
 "start-stop-daemon -- запускает и останавливает системные программы-демоны"
 
 #. type: Plain text
-#: start-stop-daemon.8:9
+#: start-stop-daemon.8:8
 #, fuzzy
-msgid "B<start-stop-daemon> [I<options>] I<command>"
+msgid "B<start-stop-daemon> [I<option>...] I<command>"
 msgstr "B<start-stop-daemon> B<-K>|B<--stop> I<параметры>"
 
 #. type: Plain text
-#: start-stop-daemon.8:15
+#: start-stop-daemon.8:14
 #, fuzzy
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
@@ -13793,7 +14166,7 @@
 "запущенных экземпляров процесса."
 
 #. type: Plain text
-#: start-stop-daemon.8:34
+#: start-stop-daemon.8:33
 #, fuzzy
 msgid ""
 "Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
@@ -13815,13 +14188,13 @@
 "указывать pidfile."
 
 #. type: TP
-#: start-stop-daemon.8:36
+#: start-stop-daemon.8:35
 #, 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:53
+#: start-stop-daemon.8:52
 #, fuzzy
 msgid ""
 "Check for the existence of a specified process.  If such a process exists, "
@@ -13840,13 +14213,13 @@
 "после B<-->, будут без изменений переданы запускаемой программе."
 
 #. type: TP
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 #, fuzzy, no-wrap
 msgid "B<-K>, B<--stop>"
 msgstr "B<-o>|B<--oknodo>"
 
 #. type: Plain text
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
 #, fuzzy
 msgid ""
 "Checks for the existence of a specified process.  If such a process exists, "
@@ -13865,54 +14238,67 @@
 "проверять, что процесс(ы) завершили работу."
 
 #. type: TP
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
+#, fuzzy, no-wrap
+msgid "B<-T>, B<--status>"
+msgstr "B<-o>|B<--oknodo>"
+
+#. type: Plain text
+#: start-stop-daemon.8:74
+msgid ""
+"Check for the existence of a specified process, and returns an exit status "
+"code, according to the LSB Init Script Actions."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:74
 #, fuzzy, no-wrap
 msgid "B<-H>, B<--help>"
 msgstr "B<-H>|B<--help>"
 
 #. type: Plain text
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 #, fuzzy
 msgid "Show usage information and exit."
 msgstr "Выдать подсказку и завершить работу."
 
 #. type: TP
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 #, fuzzy, no-wrap
 msgid "B<-V>, B<--version>"
 msgstr "B<-V>|B<--version>"
 
 #. type: Plain text
-#: start-stop-daemon.8:77
+#: start-stop-daemon.8:80
 #, fuzzy
 msgid "Show the program version and exit."
 msgstr "Выдать информацию о версии и завершить работу."
 
 #. type: SH
-#: start-stop-daemon.8:78
+#: start-stop-daemon.8:81
 #, fuzzy, no-wrap
 msgid "MATCHING OPTIONS"
 msgstr "ПАРАМЕТРЫ"
 
 #. type: TP
-#: start-stop-daemon.8:79
+#: start-stop-daemon.8:82
 #, 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:83
+#: start-stop-daemon.8:86
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr "Проверить какой процесс создал I<pid-файл>."
 
 #. type: TP
-#: start-stop-daemon.8:83
+#: start-stop-daemon.8:86
 #, fuzzy, no-wrap
 msgid "B<-x>, B<--exec> I<executable>"
 msgstr "B<-x>|B<--exec> I<исполняемый_файл>"
 
 #. type: Plain text
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
@@ -13921,13 +14307,13 @@
 "(согласно B</proc/>I<pid>B</exe>)."
 
 #. type: TP
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 #, fuzzy, no-wrap
 msgid "B<-n>, B<--name> I<process-name>"
 msgstr "B<-n>|B<--name> I<имя_процесса>"
 
 #. type: Plain text
-#: start-stop-daemon.8:93
+#: start-stop-daemon.8:96
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
@@ -13936,13 +14322,13 @@
 "stat>)."
 
 #. type: TP
-#: start-stop-daemon.8:93
+#: start-stop-daemon.8:96
 #, 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:99
+#: start-stop-daemon.8:102
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
@@ -13950,24 +14336,24 @@
 "I<имени_пользователя> или I<uid>."
 
 #. type: TP
-#: start-stop-daemon.8:101
+#: start-stop-daemon.8:104
 #, 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:104
+#: start-stop-daemon.8:107
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr "Изменить группу на I<группу> или I<gid> при запуске процесса."
 
 #. type: TP
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:107
 #, fuzzy, no-wrap
 msgid "B<-s>, B<--signal> I<signal>"
 msgstr "B<-s>|B<--signal> I<сигнал>"
 
 #. type: Plain text
-#: start-stop-daemon.8:109
+#: start-stop-daemon.8:112
 #, fuzzy
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
@@ -13977,13 +14363,13 @@
 "будет послан процессам для их останова (по умолчанию 15)."
 
 #. type: TP
-#: start-stop-daemon.8:109
+#: start-stop-daemon.8:112
 #, 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:119
+#: start-stop-daemon.8:122
 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 "
@@ -13997,7 +14383,7 @@
 "заданное в параметре I<затем>."
 
 #. type: Plain text
-#: start-stop-daemon.8:130
+#: start-stop-daemon.8:133
 #, fuzzy
 msgid ""
 "If I<timeout> is specified instead of I<schedule>, then the schedule "
@@ -14010,7 +14396,7 @@
 "signal>."
 
 #. type: Plain text
-#: start-stop-daemon.8:146
+#: start-stop-daemon.8:149
 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 "
@@ -14026,7 +14412,7 @@
 "вечно, если нужно."
 
 #. type: Plain text
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 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, "
@@ -14038,13 +14424,13 @@
 "игнорируется."
 
 #. type: TP
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 #, fuzzy, no-wrap
 msgid "B<-a>, B<--startas> I<pathname>"
 msgstr "B<-a>|B<--startas> I<полное_имя>"
 
 #. type: Plain text
-#: start-stop-daemon.8:164
+#: start-stop-daemon.8:167
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
@@ -14054,13 +14440,13 @@
 "параметра B<--exec>."
 
 #. type: TP
-#: start-stop-daemon.8:164
+#: start-stop-daemon.8:167
 #, fuzzy, no-wrap
 msgid "B<-t>, B<--test>"
 msgstr "B<-t>|B<--test>"
 
 #. type: Plain text
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
@@ -14069,37 +14455,37 @@
 "код завершения, но не выполнять эти действия."
 
 #. type: TP
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 #, fuzzy, no-wrap
 msgid "B<-o>, B<--oknodo>"
 msgstr "B<-o>|B<--oknodo>"
 
 #. type: Plain text
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
 "Возвращать код 0 вместо 1, если не было выполнено (или не должно было быть "
 "выполнено) никаких действий."
 
 #. type: TP
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 #, fuzzy, no-wrap
 msgid "B<-q>, B<--quiet>"
 msgstr "B<-q>|B<--quiet>"
 
 #. type: Plain text
-#: start-stop-daemon.8:174
+#: start-stop-daemon.8:177
 msgid "Do not print informational messages; only display error messages."
 msgstr "Не выдавать информационных сообщений; только сообщения об ошибках."
 
 #. type: TP
-#: start-stop-daemon.8:174
+#: start-stop-daemon.8:177
 #, fuzzy, no-wrap
-msgid "B<-c>, B<--chuid> I<username>|I<uid>"
+msgid "B<-c>, B<--chuid> I<username>|I<uid>[B<:>I<group>|I<gid>]"
 msgstr "B<-c>|B<--chuid> I<имя-пользователя>|I<uid>"
 
 #. type: Plain text
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 #, fuzzy
 msgid ""
 "Change to this username/uid before starting the process. You can also "
@@ -14120,13 +14506,13 @@
 "состоит (например, в случае с системным пользователем B<nobody>)."
 
 #. type: TP
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 #, fuzzy, no-wrap
 msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<-r>|B<--chroot> I<root>"
 
 #. type: Plain text
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
@@ -14135,13 +14521,13 @@
 "Заметим, что pid-файл будет создан после установки нового корневого каталога."
 
 #. type: TP
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 #, fuzzy, no-wrap
 msgid "B<-d>, B<--chdir> I<path>"
 msgstr "B<-d>|B<--chdir> I<путь>"
 
 #. type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 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-"
@@ -14153,13 +14539,13 @@
 "перед запуском процесса."
 
 #. type: TP
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 #, fuzzy, no-wrap
 msgid "B<-b>, B<--background>"
 msgstr "B<-b>|B<--background>"
 
 #. type: Plain text
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 #, fuzzy
 msgid ""
 "Typically used with programs that don't detach on their own. This option "
@@ -14180,24 +14566,24 @@
 "добавить в них код для этого."
 
 #. type: TP
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 #, fuzzy, no-wrap
 msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr "B<-N>|B<--nicelevel> I<int>"
 
 #. type: Plain text
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 msgid "This alters the priority of the process before starting it."
 msgstr "Этот параметр перед запуском изменяет приоритет процесса."
 
 #. type: TP
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 #, no-wrap
 msgid "B<-P>, B<--procsched> I<policy>B<:>I<priority>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 msgid ""
 "This alters the process scheduler policy and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -14206,13 +14592,13 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 #, fuzzy, no-wrap
 msgid "B<-I>, B<--iosched> I<class>B<:>I<priority>"
 msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
 
 #. type: Plain text
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 msgid ""
 "This alters the IO scheduler class and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -14222,25 +14608,25 @@
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 #, fuzzy, no-wrap
 msgid "B<-k>, B<--umask> I<mask>"
 msgstr "B<-s>|B<--signal> I<сигнал>"
 
 #. type: Plain text
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 #, fuzzy
 msgid "This sets the umask of the process before starting it."
 msgstr "Этот параметр перед запуском изменяет приоритет процесса."
 
 #. type: TP
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 #, fuzzy, no-wrap
 msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-m>|B<--make-pidfile>"
 
 #. type: Plain text
-#: start-stop-daemon.8:252
+#: start-stop-daemon.8:255
 #, fuzzy
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
@@ -14260,66 +14646,112 @@
 "выполняет fork(). Поэтому данный параметр обычно бывает полезен только при "
 "использовании вместе с параметром B<--background>."
 
-#. type: TP
-#: start-stop-daemon.8:252
-#, fuzzy, no-wrap
-msgid "B<-v>, B<--verbose>"
-msgstr "B<-v>|B<--verbose>"
-
 #. type: Plain text
-#: start-stop-daemon.8:255
+#: start-stop-daemon.8:258
 msgid "Print verbose informational messages."
 msgstr "Выдавать подробные информационные сообщения."
 
 #. type: Plain text
-#: start-stop-daemon.8:272
+#: start-stop-daemon.8:270
+msgid ""
+"The requested action was performed. If B<--oknodo> was specified, it's also "
+"possible that nothing had to be done.  This can happen when B<--start> was "
+"specified and a matching process was already running, or when B<--stop> was "
+"specified and there were no matching processes."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:275
+msgid "If B<--oknodo> was not specified and nothing was done."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:283
+msgid ""
+"If B<--stop> and B<--retry> were specified, but the end of the schedule was "
+"reached and the processes were still running."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:283 start-stop-daemon.8:295
+#, no-wrap
+msgid "B<3>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:286
+msgid "Any other error."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:289
 msgid ""
-"B<start-stop-daemon> returns 0 if the requested action was performed, or if "
-"B<--oknodo> is specified and either B<--start> was specified and a matching "
-"process was already running, or B<--stop> was specified and there were no "
-"matching processes. If B<--oknodo> was not specified and nothing was done, 1 "
-"is returned. If B<--stop> and B<--retry> were specified, but the end of the "
-"schedule was reached and the processes were still running, the error value "
-"is 2. For all other errors, the status is 3."
+"When using the B<--status> command, the following status codes are returned:"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:292
+msgid "Program is running."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:295
+msgid "Program is not running and the pid file exists."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:298
+msgid "Program is not running."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.8:298
+#, no-wrap
+msgid "B<4>"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:276
+#: start-stop-daemon.8:301
+msgid "Unable to determine program status."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.8:305
 msgid ""
 "Start the B<food> daemon, unless one is already running (a process named "
 "food, running as user food, with pid in food.pid):"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:279
+#: start-stop-daemon.8:308
 #, no-wrap
 msgid "start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon\n"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:282
+#: start-stop-daemon.8:311
 msgid "Send B<SIGTERM> to B<food> and wait up to 5 seconds for it to stop:"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:285
+#: start-stop-daemon.8:314
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5\n"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:288
+#: start-stop-daemon.8:317
 msgid "Demonstration of a custom schedule for stopping B<food>:"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:291
+#: start-stop-daemon.8:320
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5\n"
 msgstr ""
 
 #. type: Plain text
-#: start-stop-daemon.8:297
+#: start-stop-daemon.8:326
 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>."
@@ -14328,7 +14760,7 @@
 "на версии, сделанной Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 
 #. type: Plain text
-#: start-stop-daemon.8:299
+#: start-stop-daemon.8:328
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -14349,20 +14781,20 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:16
+#: update-alternatives.8:15
 #, fuzzy
-msgid "B<update-alternatives> [I<options>] I<command>"
+msgid "B<update-alternatives> [I<option>...] I<command>"
 msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 #. type: Plain text
-#: update-alternatives.8:21
+#: update-alternatives.8:20
 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:29
+#: update-alternatives.8:28
 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 "
@@ -14373,7 +14805,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:51
+#: update-alternatives.8:50
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -14388,7 +14820,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:61
+#: update-alternatives.8:60
 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> "
@@ -14399,7 +14831,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:73
+#: update-alternatives.8:72
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -14409,7 +14841,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:92
+#: update-alternatives.8:91
 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>"
@@ -14421,7 +14853,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:101
+#: 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 "
@@ -14432,7 +14864,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:110
+#: 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 "
@@ -14442,7 +14874,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:117
+#: 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 "
@@ -14450,26 +14882,26 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:134
+#: update-alternatives.8:133
 msgid ""
-"When using the I<--config> option, B<update-alternatives> will list all of "
+"When using the B<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master "
 "alternative name. The current choice is marked with a '*'.  You will then be "
 "prompted for your choice regarding this link group.  Depending on the choice "
 "made, the link group might no longer be in I<auto> mode. You will need to "
-"use the I<--auto> option in order to return to the automatic mode (or you "
-"can rerun I<--config> and select the entry marked as automatic)."
+"use the B<--auto> option in order to return to the automatic mode (or you "
+"can rerun B<--config> and select the entry marked as automatic)."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:138
+#: update-alternatives.8:137
 msgid ""
-"If you want to configure non-interactively you can use the I<--set> option "
+"If you want to configure non-interactively you can use the B<--set> option "
 "instead (see below)."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:149
+#: update-alternatives.8:148
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "In other words, the usage of B<update-alternatives> is B<mandatory> for all "
@@ -14478,124 +14910,124 @@
 msgstr ""
 
 #. type: SH
-#: update-alternatives.8:150
+#: update-alternatives.8:149
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 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:155
+#: update-alternatives.8:154
 #, no-wrap
 msgid "generic name (or alternative link)"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 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:161
+#: update-alternatives.8:160
 #, no-wrap
 msgid "alternative name"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 msgid "The name of a symbolic link in the alternatives directory."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 #, no-wrap
 msgid "alternative (or alternative path)"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 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:168
+#: update-alternatives.8:167
 #, no-wrap
 msgid "alternatives directory"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 #, no-wrap
 msgid "administrative directory"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
 "alternatives>' state information."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 #, no-wrap
 msgid "link group"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 #, no-wrap
 msgid "master link"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 msgid ""
 "The alternative link in a link group which determines how the other links in "
 "the group are configured."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 #, no-wrap
 msgid "slave link"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 msgid ""
 "An alternative link in a link group which is controlled by the setting of "
 "the master link."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 #, no-wrap
 msgid "automatic mode"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 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 "
@@ -14603,26 +15035,26 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 #, no-wrap
 msgid "manual mode"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:201
 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: TP
-#: update-alternatives.8:204
+#: update-alternatives.8:203
 #, no-wrap
 msgid "B<--install> I<link name path priority> [B<--slave> I<link name path>]..."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:222
 msgid ""
 "Add a group of alternatives to the system.  I<link> is the generic name for "
 "the master link, I<name> is the name of its symlink in the alternatives "
@@ -14638,7 +15070,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 msgid ""
 "If the alternative name specified exists already in the alternatives "
 "system's records, the information supplied will be added as a new set of "
@@ -14650,26 +15082,26 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
-"I<--config> but is non-interactive and thus scriptable."
+"B<--config> but is non-interactive and thus scriptable."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 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 "
@@ -14682,20 +15114,20 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 #, fuzzy, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: update-alternatives.8:269
+#: update-alternatives.8:268
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 msgid ""
 "Call B<--config> on all alternatives. It can be usefully combined with B<--"
 "skip-auto> to review and configure all alternatives which are not configured "
@@ -14705,13 +15137,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 #, fuzzy, no-wrap
 msgid "B<--auto> I<name>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 msgid ""
 "Switch the link group behind the alternative for I<name> to automatic mode.  "
 "In the process, the master symlink and its slaves are updated to point to "
@@ -14719,13 +15151,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 #, fuzzy, no-wrap
 msgid "B<--display> I<name>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 msgid ""
 "Display information about the link group.  Information displayed includes "
 "the group's mode (auto or manual), which alternative the master link "
@@ -14735,13 +15167,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 #, fuzzy, no-wrap
 msgid "B<--get-selections>"
 msgstr "B<dpkg --set-selections>"
 
 #. type: Plain text
-#: update-alternatives.8:300
+#: update-alternatives.8:299
 msgid ""
 "List all master alternative names (those controlling a link group)  and "
 "their status. Each line contains up to 3 fields (separated by one or more "
@@ -14752,146 +15184,146 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 msgid ""
 "Read configuration of alternatives on standard input in the format generated "
 "by B<update-alternatives --get-selections> and reconfigure them accordingly."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 #, fuzzy, no-wrap
 msgid "B<--query> I<name>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 msgid ""
 "Display information about the link group like --display does, but in a "
 "machine parseable way (see section B<QUERY FORMAT> below)."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 #, fuzzy, no-wrap
 msgid "B<--list> I<name>"
 msgstr "B<--new> | B<--old>"
 
 #. type: Plain text
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 msgid "Display all targets of the link group."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 #, fuzzy, no-wrap
 msgid "B<--config> I<name>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: update-alternatives.8:317
+#: update-alternatives.8:316
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:325
+#: update-alternatives.8:324
 #, fuzzy, no-wrap
 msgid "B<--altdir>I< directory>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
-#: update-alternatives.8:329
+#: update-alternatives.8:328
 msgid ""
 "Specifies the alternatives directory, when this is to be different from the "
 "default."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 msgid ""
 "Specifies the administrative directory, when this is to be different from "
 "the default."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 #, fuzzy, no-wrap
 msgid "B<--log>I< file>"
 msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
-#: update-alternatives.8:337
+#: update-alternatives.8:336
 msgid ""
 "Specifies the log file, when this is to be different from the default (/var/"
 "log/alternatives.log)."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 msgid ""
-"Let B<update-alternatives> replace any real file that is installed where an "
-"alternative link has to be installed."
+"Let B<update-alternatives> replace or drop any real file that is installed "
+"where an alternative link has to be installed or removed."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 #, fuzzy, no-wrap
 msgid "B<--skip-auto>"
 msgstr "B<822-date>"
 
 #. type: Plain text
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 msgid ""
 "Skip configuration prompt for alternatives which are properly configured in "
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 #, fuzzy, no-wrap
 msgid "B<--verbose>"
 msgstr "B<-v>|B<--verbose>"
 
 #. type: Plain text
-#: update-alternatives.8:351
+#: update-alternatives.8:350
 msgid "Generate more comments about what B<update-alternatives> is doing."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:354
+#: update-alternatives.8:353
 msgid "Don't generate any comments unless errors occur."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:360
+#: update-alternatives.8:359
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the base administrative directory."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:362
+#: update-alternatives.8:361
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 #, fuzzy, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "I</var/lib/dpkg/status>"
 
 #. type: Plain text
-#: update-alternatives.8:374
+#: update-alternatives.8:373
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
@@ -14902,118 +15334,112 @@
 msgid "The requested action was successfully performed."
 msgstr ""
 
-#. type: IP
-#: update-alternatives.8:378
-#, no-wrap
-msgid "2"
-msgstr ""
-
 #. type: Plain text
-#: update-alternatives.8:381
+#: update-alternatives.8:382
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
 msgstr ""
 
 #. type: SH
-#: update-alternatives.8:382
+#: update-alternatives.8:383
 #, no-wrap
 msgid "QUERY FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:387
+#: update-alternatives.8:388
 msgid ""
-"The B<update-alternatives> I<--query> format is using an RFC822-like flat "
+"The B<update-alternatives --query> format is using an RFC822-like flat "
 "format. It's made of I<n> + 1 blocks where I<n> is the number of "
 "alternatives available in the queried link group. The first block contains "
 "the following fields:"
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:387
+#: update-alternatives.8:388
 #, fuzzy, no-wrap
-msgid "B<Link:> E<lt>linkE<gt>"
+msgid "B<Link:>I< link>"
 msgstr "B<Source:> E<lt>имя архивов с исходникамиE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 msgid "The generic name of the alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 #, fuzzy, no-wrap
-msgid "B<Status:> E<lt>statusE<gt>"
+msgid "B<Status:>I< status>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 #, fuzzy, no-wrap
-msgid "B<Best:> E<lt>best choiceE<gt>"
+msgid "B<Best:>I< best-choice>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 #, fuzzy, no-wrap
-msgid "B<Value:> E<lt>currently selected alternativeE<gt> "
+msgid "B<Value:>I< currently-selected-alternative>"
 msgstr "B<Source:> E<lt>имя архивов с исходникамиE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:401
+#: update-alternatives.8:402
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:402
+#: update-alternatives.8:403
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:404
+#: update-alternatives.8:405
 #, no-wrap
-msgid "B<Alternative:> E<lt>path of this alternativeE<gt>"
+msgid "B<Alternative:>I< path-of-this-alternative>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 msgid "Path to this block's alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 #, fuzzy, no-wrap
-msgid "B<Priority:> E<lt>priority valueE<gt>"
+msgid "B<Priority:>I< priority-value>"
 msgstr "B<Priority:> E<lt>приоритетE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 msgid "Value of the priority of this alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 #, fuzzy, no-wrap
-msgid "B<Slaves:> E<lt>list of slavesE<gt>"
+msgid "B<Slaves:>I< list-of-slaves>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
 #. type: Plain text
-#: update-alternatives.8:416
+#: update-alternatives.8:417
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -15022,13 +15448,13 @@
 msgstr ""
 
 #. type: TP
-#: update-alternatives.8:417
+#: update-alternatives.8:418
 #, no-wrap
 msgid "B<Example>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:426
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
@@ -15039,7 +15465,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:430
+#: update-alternatives.8:431
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -15049,7 +15475,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:446
 #, no-wrap
 msgid ""
 "Alternative: /usr/bin/vim.gtk\n"
@@ -15069,9 +15495,9 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:457
+#: update-alternatives.8:458
 msgid ""
-"With I<--verbose> B<update-alternatives> chatters incessantly about its "
+"With B<--verbose> 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; "
@@ -15079,7 +15505,7 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:464
 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 "
@@ -15088,49 +15514,49 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:466
+#: update-alternatives.8:467
 msgid ""
 "To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
+"setting for it, use the B<--display> action:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:469
+#: update-alternatives.8:470
 msgid "B<update-alternatives --display vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:473
+#: update-alternatives.8:474
 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:476
+#: update-alternatives.8:477
 msgid "B<update-alternatives --config vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:480
+#: update-alternatives.8:481
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:483
+#: update-alternatives.8:484
 msgid "B<update-alternatives --auto vi>"
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:488
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:492
+#: update-alternatives.8:493
 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 "
@@ -15138,13 +15564,13 @@
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:503
+#: update-alternatives.8:504
 msgid ""
 "This manual page is copyright 1997,1998 Charles Briscoe-Smith and others."
 msgstr ""
 
 #. type: Plain text
-#: update-alternatives.8:506
+#: update-alternatives.8:507
 #, fuzzy
 msgid ""
 "This is free documentation; see the GNU General Public Licence version 2 or "
@@ -15155,11 +15581,168 @@
 "гарантий."
 
 #. type: Plain text
-#: update-alternatives.8:509
+#: update-alternatives.8:510
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 
 #, fuzzy
+#~ msgid "2009-02-27"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2011-04-29"
+#~ msgstr "2006-02-28"
+
+#~ msgid "2006-02-28"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2007-03-07"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2007-07-16"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-03-15"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2011-04-27"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2011-07-07"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-04-18"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-07-29"
+#~ msgstr "2006-02-28"
+
+#~ msgid "B<Package:> E<lt>package nameE<gt>"
+#~ msgstr "B<Package:> E<lt>имя пакетаE<gt>"
+
+#, fuzzy
+#~ msgid "2010-11-22"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| msgid "B<Source:> E<lt>source nameE<gt>"
+#~ msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
+#~ msgstr "B<Source:> E<lt>имя архивов с исходникамиE<gt>"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-01-28"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2008-08-18"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg> can 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> может также использоваться как интерфейс к B<dpkg-deb>. "
+#~ "Нижеследующие действия являются действиями B<dpkg-deb>, и если они "
+#~ "встречаются, то B<dpkg> просто запускает B<dpkg-deb> с указанными "
+#~ "параметрами:"
+
+#~ 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> и\n"
+#~ "    B<--fsys-tarfile>.\n"
+
+#~ msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+#~ msgstr "Все эти действия описаны в B<dpkg-deb>(1)."
+
+#, fuzzy
+#~ msgid "B<--new>, B<--old>"
+#~ msgstr "B<--new> | B<--old>"
+
+#~ msgid ""
+#~ "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
+#~ msgstr ""
+#~ "Выбрать, соответственно, новый или старый формат пакета. Это параметр "
+#~ "программы B<dpkg-deb>(1)."
+
+#~ msgid ""
+#~ "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)."
+
+#, fuzzy
+#~ msgid "2009-08-15"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-11-21"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2010-03-07"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~| msgid "2006-02-28"
+#~ msgid "2010-10-12"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-08-07"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2010-04-16"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-05-19"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-10-01"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-06-26"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "2009-05-10"
+#~ msgstr "2006-02-28"
+
+#, fuzzy
+#~ msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+#~ msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
+#, fuzzy
 #~ msgid "2009-03-08"
 #~ msgstr "2006-02-28"
 
@@ -15584,10 +16167,6 @@
 #~ msgstr "ПАРАМЕТРЫ"
 
 #, fuzzy
-#~ msgid "B<--debug>, B<-D>"
-#~ msgstr "B<--new> | B<--old>"
-
-#, fuzzy
 #~ msgid "B<-h, --help>"
 #~ msgstr "B<dpkg --help>"
 
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/sv.add /home/vorlon/devel/multiarch/dpkg-debian/man/po/sv.add
--- dpkg/man/po/sv.add	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/sv.add	2012-06-07 10:11:09.426073000 -0700
@@ -1,3 +1,3 @@
 PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary
-.SH "VERSTTNING"
+.SH "ÖVERSÄTTNING"
 Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/po/sv.po /home/vorlon/devel/multiarch/dpkg-debian/man/po/sv.po
--- dpkg/man/po/sv.po	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/po/sv.po	2012-06-07 10:11:09.426073000 -0700
@@ -1,12 +1,13 @@
 # Manual page for dpkg
-# Peter Krefting <peterk@debian.org>, 1999-2010.
-# Copyright 1999-2010 Software in the Public Interest
+# Copyright 1999-2011 Software in the Public Interest
+# Peter Krefting <peterk@debian.org>, 1999-2011, 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-01 22:07+0300\n"
-"PO-Revision-Date: 2010-11-25 10:41+0100\n"
+"POT-Creation-Date: 2011-11-25 11:22+0100\n"
+"PO-Revision-Date: 2011-09-14 07:40+0100\n"
 "Last-Translator: Peter Krefting <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "Language: sv\n"
@@ -21,10 +22,17 @@
 msgstr "deb"
 
 #. type: TH
-#: deb.5:1
+#: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-version.5:5 deb-old.5:1
+#: deb-override.5:15 deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg-buildpackage.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-gensymbols.1:2
+#: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-trigger.1:1
+#: dselect.1:1 update-alternatives.8:8
 #, no-wrap
-msgid "2009-02-27"
-msgstr "2009-02-27"
+msgid "2011-08-14"
+msgstr "2011-08-14"
 
 #. type: TH
 #: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-split.5:1 deb-version.5:5
@@ -95,15 +103,15 @@
 #: deb.5:6 deb-control.5:10 deb-src-control.5:10 deb-split.5:6
 #: deb-version.5:11 deb-old.5:8 deb-override.5:22 deb-extra-override.5:8
 #: deb-shlibs.5:20 deb-substvars.5:9 deb-symbols.5:9 deb-triggers.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildflags.1:9
+#: dpkg.1:19 dpkg-architecture.1:10 dpkg.cfg.5:5 dpkg-buildflags.1:9
 #: 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-deb.1:9 dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9
 #: dpkg-gensymbols.1:10 dpkg-maintscript-helper.1:15 dpkg-mergechangelogs.1:9
 #: dpkg-name.1:16 dpkg-parsechangelog.1:9 dpkg-query.1:9
-#: dpkg-scanpackages.1:28 dpkg-scansources.1:14 dpkg-shlibdeps.1:11
-#: dpkg-source.1:11 dpkg-split.1:11 dpkg-statoverride.8:10 dpkg-trigger.1:12
-#: dpkg-vendor.1:9 dselect.1:17 dselect.cfg.5:5 start-stop-daemon.8:10
-#: update-alternatives.8:17
+#: dpkg-scanpackages.1:27 dpkg-scansources.1:13 dpkg-shlibdeps.1:9
+#: dpkg-source.1:10 dpkg-split.1:10 dpkg-statoverride.8:9 dpkg-trigger.1:12
+#: dpkg-vendor.1:9 dselect.1:9 dselect.cfg.5:5 start-stop-daemon.8:9
+#: update-alternatives.8:16
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "BESKRIVNING"
@@ -249,15 +257,15 @@
 "understreck, eller (mer troligt) göra att huvudversionsnumret ökas."
 
 #. type: SH
-#: deb.5:79 deb-control.5:269 deb-src-control.5:322 deb-split.5:37
+#: deb.5:79 deb-control.5:271 deb-src-control.5:327 deb-split.5:49
 #: deb-version.5:116 deb-old.5:51 deb-override.5:62 deb-extra-override.5:37
-#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:49
-#: dpkg.1:782 dpkg-architecture.1:300 dpkg.cfg.5:23 dpkg-buildpackage.1:249
-#: dpkg-deb.1:246 dpkg-divert.8:132 dpkg-gensymbols.1:445 dpkg-name.1:95
-#: dpkg-query.1:212 dpkg-scanpackages.1:111 dpkg-scansources.1:72
-#: dpkg-shlibdeps.1:326 dpkg-source.1:701 dpkg-split.1:223
-#: dpkg-statoverride.8:85 dpkg-trigger.1:66 dselect.1:452 dselect.cfg.5:23
-#: update-alternatives.8:507
+#: deb-shlibs.5:61 deb-substvars.5:154 deb-symbols.5:61 deb-triggers.5:67
+#: dpkg.1:768 dpkg-architecture.1:299 dpkg.cfg.5:23 dpkg-buildpackage.1:249
+#: dpkg-deb.1:259 dpkg-divert.8:132 dpkg-gensymbols.1:450 dpkg-name.1:96
+#: dpkg-query.1:220 dpkg-scanpackages.1:110 dpkg-scansources.1:71
+#: dpkg-shlibdeps.1:324 dpkg-source.1:725 dpkg-split.1:217
+#: dpkg-statoverride.8:84 dpkg-trigger.1:66 dselect.1:445 dselect.cfg.5:23
+#: update-alternatives.8:508
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SE ÄVEN"
@@ -273,12 +281,6 @@
 msgid "deb-control"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-control.5:3 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
-#, no-wrap
-msgid "2010-07-29"
-msgstr "2010-07-29"
-
 #. type: Plain text
 #: deb-control.5:6
 msgid "deb-control - Debian packages' master control file format"
@@ -319,8 +321,8 @@
 #. type: TP
 #: deb-control.5:26
 #, no-wrap
-msgid "B<Package:> E<lt>package nameE<gt>"
-msgstr "B<Package:> E<lt>paketnamnE<gt>"
+msgid "B<Package:>I< package-name>"
+msgstr "B<Package:>I< paketnamn>"
 
 #. type: Plain text
 #: deb-control.5:30
@@ -334,8 +336,8 @@
 #. type: TP
 #: deb-control.5:30
 #, no-wrap
-msgid "B<Version:> E<lt>version stringE<gt>"
-msgstr "B<Version:> E<lt>versionssträngE<gt>"
+msgid "B<Version:>I< version-string>"
+msgstr "B<Version:>I< versionssträng>"
 
 #. type: Plain text
 #: deb-control.5:37
@@ -353,8 +355,8 @@
 #. type: TP
 #: deb-control.5:37
 #, no-wrap
-msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgstr "B<Maintainer:> E<lt>fullt-namn e-postE<gt>"
+msgid "B<Maintainer:>I< fullname-email>"
+msgstr "B<Maintainer:>I< fullt-namn e-post>"
 
 #. type: Plain text
 #: deb-control.5:42
@@ -370,13 +372,13 @@
 #. type: TP
 #: deb-control.5:42
 #, no-wrap
-msgid "B<Description:> E<lt>short descriptionE<gt>"
-msgstr "B<Description:> E<lt>kort beskrivningE<gt>"
+msgid "B<Description:>I< short-description>"
+msgstr "B<Description:>I< kort-beskrivning>"
 
 #. type: Plain text
 #: deb-control.5:45
-msgid "B< >E<lt>long descriptionE<gt>"
-msgstr "B< >E<lt>lång beskrivningE<gt>"
+msgid "B< >I<long-description>"
+msgstr "B< >I<lång-beskrivning>"
 
 #. type: Plain text
 #: deb-control.5:51
@@ -400,10 +402,10 @@
 msgstr "VALFRIA FÄLT"
 
 #. type: TP
-#: deb-control.5:53 deb-src-control.5:88
+#: deb-control.5:53 deb-src-control.5:90
 #, no-wrap
-msgid "B<Section:> E<lt>sectionE<gt>"
-msgstr "B<Section:> E<lt>sektionE<gt>"
+msgid "B<Section:>I< section>"
+msgstr "B<Section:>I< sektion>"
 
 #. type: Plain text
 #: deb-control.5:58
@@ -417,10 +419,10 @@
 "\", \"mail\", \"text\", \"x11\" osv."
 
 #. type: TP
-#: deb-control.5:58 deb-src-control.5:94
+#: deb-control.5:58 deb-src-control.5:96
 #, no-wrap
-msgid "B<Priority:> E<lt>priorityE<gt>"
-msgstr "B<Priority:> E<lt>prioritetE<gt>"
+msgid "B<Priority:>I< priority>"
+msgstr "B<Priority:>I< prioritet>"
 
 #. type: Plain text
 #: deb-control.5:62
@@ -433,7 +435,7 @@
 "\" (valfritt), \"extra\" (extra) osv."
 
 #. type: Plain text
-#: deb-control.5:71 deb-src-control.5:107
+#: deb-control.5:71 deb-src-control.5:109
 msgid ""
 "In Debian, the B<Section> and B<Priority> fields have a defined set of "
 "accepted values based on the Policy Manual.  A list of these values can be "
@@ -444,29 +446,29 @@
 "värden finns i den senaste versionen av paketet B<debian-policy>."
 
 #. type: TP
-#: deb-control.5:71 deb-src-control.5:211
+#: deb-control.5:71 deb-src-control.5:216
 #, no-wrap
-msgid "B<Essential:> E<lt>yes|noE<gt>"
-msgstr "B<Essential: >E<lt>yes|noE<gt>"
+msgid "B<Essential:> B<yes>|B<no>"
+msgstr "B<Essential:> B<yes>|B<no>"
 
 #. type: Plain text
 #: deb-control.5:78
 msgid ""
-"This field is usually only needed when the answer is `yes'. It denotes a "
+"This field is usually only needed when the answer is B<yes>. It denotes a "
 "package that is required for proper operation of the system. Dpkg or any "
 "other installation tool will not allow an B<Essential> package to be removed "
 "(at least not without using one of the force options)."
 msgstr ""
-"Fältet krävs normalt sett endast om svaret är \"yes\" (ja), och betecknar "
-"att paketet krävs för en korrekt installation av systemet. Dpkg och andra "
+"Fältet krävs normalt sett endast om svaret är B<yes> (ja), och betecknar att "
+"paketet krävs för en korrekt installation av systemet. Dpkg och andra "
 "installationsverktyg tillåter inte att ett paket märkt B<Essential> tas bort "
 "(åtminstone inte utan att använda en av de tvingande flaggorna)."
 
 #. type: TP
 #: deb-control.5:78
 #, no-wrap
-msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgstr "B<Architecture:> E<lt>arkitektur|allE<gt>"
+msgid "B<Architecture:> I<arch>|B<all>"
+msgstr "B<Architecture:> I<arkitektur>|B<all>"
 
 #. type: Plain text
 #: deb-control.5:86
@@ -483,10 +485,10 @@
 "arkitektur. Exempel på detta är skal- eller Perlskript och dokumentation."
 
 #. type: TP
-#: deb-control.5:86 deb-src-control.5:83
+#: deb-control.5:86 deb-src-control.5:85
 #, no-wrap
-msgid "B<Origin:> E<lt>nameE<gt>"
-msgstr "B<Origin:> E<lt>namnE<gt>"
+msgid "B<Origin:>I< name>"
+msgstr "B<Origin:>I< namn>"
 
 #. type: Plain text
 #: deb-control.5:89
@@ -496,39 +498,38 @@
 #. type: TP
 #: deb-control.5:89 deb-src-control.5:66
 #, no-wrap
-msgid "B<Bugs:> E<lt>urlE<gt>"
-msgstr "B<Bugs:> E<lt>urlE<gt>"
+msgid "B<Bugs:>I< url>"
+msgstr "B<Bugs:>I< url>"
 
 #. type: Plain text
-#: deb-control.5:93
+#: deb-control.5:94
 msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>."
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian.org>."
 msgstr ""
-"URL:en till felrapporteringssystemet för detta paket. Det nuvarande formatet "
-"är B<E<lt>systemtypE<gt>://E<lt>addressE<gt>>, till exempel B<debbugs://bugs."
+"I<URL>:en till felrapporteringssystemet för detta paket. Det nuvarande "
+"formatet är I<systemtyp>B<://>I<adress>, till exempel B<debbugs://bugs."
 "debian.org>."
 
 #. type: TP
-#: deb-control.5:93 deb-src-control.5:62
+#: deb-control.5:94 deb-src-control.5:62
 #, no-wrap
-msgid "B<Homepage:> E<lt>urlE<gt>"
-msgstr "B<Homepage:> E<lt>urlE<gt>"
+msgid "B<Homepage:>I< url>"
+msgstr "B<Homepage:>I< url>"
 
 #. type: Plain text
-#: deb-control.5:96 deb-src-control.5:65
-msgid "The upstream project home page URL."
-msgstr "URL till uppströmsprojektets hemsida."
+#: deb-control.5:97
+msgid "The upstream project home page I<url>."
+msgstr "URL till uppströmsprojektets hemside-I<url>."
 
 #. type: TP
-#: deb-control.5:96 deb-src-control.5:217
+#: deb-control.5:97 deb-src-control.5:222
 #, no-wrap
-msgid "B<Tag:> E<lt>tag listE<gt>"
-msgstr "B<Tag:> E<lt>lista med märkenE<gt>"
+msgid "B<Tag:>I< tag-list>"
+msgstr "B<Tag:>I< lista-med-märken>"
 
 #. type: Plain text
-#: deb-control.5:100
+#: deb-control.5:101
 msgid ""
 "List of tags describing the qualities of the package. The description and "
 "list of supported tags can be found in the B<debtags> package."
@@ -537,35 +538,44 @@
 "förteckning över kända märken finns i paketet B<debtags>."
 
 #. type: TP
-#: deb-control.5:100
-#, fuzzy, no-wrap
-#| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt>"
-msgstr "B<Source:> E<lt>källkodsnamnE<gt>"
+#: deb-control.5:101 deb-src-control.5:219
+#, no-wrap
+msgid "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>"
+msgstr "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>"
 
 #. type: Plain text
-#: deb-control.5:111
+#: deb-control.5:113
 msgid ""
 "This field is used to indicate how this package should behave on a multi-"
-"arch installations. The value `same' means that the package is co-"
+"arch installations. The value B<same> means that the package is co-"
 "installable with itself, but it must not be used to satisfy the dependency "
-"of any package of a different architecture from itself. The value `foreign' "
+"of any package of a different architecture from itself. The value B<foreign> "
 "means that the package is not co-installable with itself, but should be "
 "allowed to satisfy the dependency of a package of a different arch from "
-"itself. The value `allowed` allows reverse-dependencies to indicate in their "
-"Depends field that they need a package from a foreign architecture, but has "
-"no effect otherwise. This field should not be present in packages with the "
-"Architecture: all field."
-msgstr ""
+"itself. The value B<allowed> allows reverse-dependencies to indicate in "
+"their Depends field that they need a package from a foreign architecture, "
+"but has no effect otherwise. This field should not be present in packages "
+"with the B<Architecture: all> field."
+msgstr ""
+"Det här fältet används för att ange hur paketet skall fungera på en "
+"flerarkitektursinstallation. Värdet B<same> (samma) betyder att paket kan "
+"saminstalleras med sig självt, men kan inte användas för att uppfylla "
+"beroenden för paket med en annan arkitektur än sig självt. Värdet B<foreign> "
+"(främmande) betyder att paketet inte kan saminstalleras med sig självt, men "
+"att det kan användas för att uppfylla beroenden för paket med en annan "
+"arkitektur än sig självt. Värdet B<allowed> (tillåtet) tillåter att omvända "
+"beroenden kan ange i sina Depends-fält att de behöver ett paket från en "
+"främmande arkitektur, men har i övrigt ingen funktion. Fältet bör inte "
+"förekomma i paket med fältet B<Architecture: all>."
 
 #. type: TP
-#: deb-control.5:111
+#: deb-control.5:113
 #, no-wrap
-msgid "B<Source:> E<lt>source nameE<gt>"
-msgstr "B<Source:> E<lt>källkodsnamnE<gt>"
+msgid "B<Source:>I< source-name>"
+msgstr "B<Source:>I< källkodsnamn>"
 
 #. type: Plain text
-#: deb-control.5:115
+#: deb-control.5:117
 msgid ""
 "The name of the source package that this binary package came from, if "
 "different than the name of the package itself."
@@ -574,42 +584,42 @@
 "från namnet på själva paketet."
 
 #. type: TP
-#: deb-control.5:116 deb-src-control.5:197
-#, fuzzy, no-wrap
-#| msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgid "B<Subarchitecture:> E<lt>valueE<gt>"
-msgstr "B<Architecture:> E<lt>arkitektur|allE<gt>"
+#: deb-control.5:118 deb-src-control.5:202
+#, no-wrap
+msgid "B<Subarchitecture:>I< value>"
+msgstr "B<Subarchitecture:>I< värde>"
 
 #. type: TP
-#: deb-control.5:119 deb-src-control.5:200
-#, fuzzy, no-wrap
-#| msgid "B<Version:> E<lt>versionE<gt>"
-msgid "B<Kernel-Version:> E<lt>valueE<gt>"
-msgstr "B<Version:> E<lt>versionsE<gt>"
+#: deb-control.5:121 deb-src-control.5:205
+#, no-wrap
+msgid "B<Kernel-Version:>I< value>"
+msgstr "B<Kernel-Version:>I< värde>"
 
 #. type: TP
-#: deb-control.5:122 deb-src-control.5:203
-#, fuzzy, no-wrap
-#| msgid "B<Date:> E<lt>dateE<gt>"
-msgid "B<Installer-Menu-Item:> E<lt>valueE<gt>"
-msgstr "B<Date:> E<lt>datumE<gt>"
+#: deb-control.5:124 deb-src-control.5:208
+#, no-wrap
+msgid "B<Installer-Menu-Item:>I< value>"
+msgstr "B<Installer-Menu-Item:>I< värde>"
 
 #. type: Plain text
-#: deb-control.5:129 deb-src-control.5:210
+#: deb-control.5:131 deb-src-control.5:215
 msgid ""
 "These fields are used by the debian-installer and are usually not needed.  "
 "See /usr/share/doc/debian-installer/devel/modules.txt from the B<debian-"
 "installer> package for more details about them."
 msgstr ""
+"Dessa fält används av debian-installer och behövs normalt inte. Se /usr/"
+"share/doc/debian-installer/devel/modules.txt från paketet B<debian-"
+"installer> för mer information om dem."
 
 #. type: TP
-#: deb-control.5:130 deb-src-control.5:228
+#: deb-control.5:132 deb-src-control.5:233
 #, no-wrap
-msgid "B<Depends:> E<lt>package listE<gt>"
-msgstr "B<Depends:> E<lt>paketlistaE<gt>"
+msgid "B<Depends:>I< package-list>"
+msgstr "B<Depends:>I< paketlista>"
 
 #. type: Plain text
-#: deb-control.5:141
+#: deb-control.5:143
 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 "
@@ -630,13 +640,13 @@
 "Depends:-fält."
 
 #. type: TP
-#: deb-control.5:141 deb-src-control.5:231
+#: deb-control.5:143 deb-src-control.5:236
 #, no-wrap
-msgid "B<Pre-Depends:> E<lt>package listE<gt>"
-msgstr "B<Pre-Depends:> E<lt>paketlistaE<gt>"
+msgid "B<Pre-Depends:>I< package-list>"
+msgstr "B<Pre-Depends:>I< paketlista>"
 
 #. type: Plain text
-#: deb-control.5:148
+#: deb-control.5:150
 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 "
@@ -647,13 +657,13 @@
 "ett annat paket är installerat för sitt preinst-skript."
 
 #. type: TP
-#: deb-control.5:148 deb-src-control.5:234
+#: deb-control.5:150 deb-src-control.5:239
 #, no-wrap
-msgid "B<Recommends:> E<lt>package listE<gt>"
-msgstr "B<Recommends:> E<lt>paketlistaE<gt>"
+msgid "B<Recommends:>I< package-list>"
+msgstr "B<Recommends:>I< paketlista>"
 
 #. type: Plain text
-#: deb-control.5:155
+#: deb-control.5:157
 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 "
@@ -664,13 +674,13 @@
 "installerar ett paket utan de som listas i B<Recommends>-fältet."
 
 #. type: TP
-#: deb-control.5:155 deb-src-control.5:237
+#: deb-control.5:157 deb-src-control.5:242
 #, no-wrap
-msgid "B<Suggests:> E<lt>package listE<gt>"
-msgstr "B<Suggests:> E<lt>paketlistaE<gt>"
+msgid "B<Suggests:>I< package-list>"
+msgstr "B<Suggests:>I< paketlista>"
 
 #. type: Plain text
-#: deb-control.5:160
+#: deb-control.5:162
 msgid ""
 "Lists packages that are related to this one and can perhaps enhance its "
 "usefulness, but without which installing this package is perfectly "
@@ -681,7 +691,7 @@
 "paketet."
 
 #. type: Plain text
-#: deb-control.5:172
+#: deb-control.5:174
 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 "
@@ -691,15 +701,15 @@
 "version number specification in parentheses."
 msgstr ""
 "Syntaxen för fälten B<Depends>, B<Pre-Depends>, B<Recommends> och "
-"B<Suggests>är en lista med grupper av alternativa paket. Varje grupp "
+"B<Suggests> är en lista med grupper av alternativa paket. Varje grupp "
 "innehåller en lista med paket avdelade med ett vertikalstreck (rör) (\"|"
 "\").  Grupperna avdelas med kommatecken. Komma utläses som \"OCH\", och "
 "vertikalstrecken som \"ELLER\", där vertikalstrecken binder hårdare. Varje "
-"paketnummer kan eventuellt följas av en versionsnummerangivelse inom "
+"paketnamn kan eventuellt följas av en versionsnummerangivelse inom "
 "parenteser."
 
 #. type: Plain text
-#: deb-control.5:178
+#: deb-control.5:180
 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 "
@@ -715,13 +725,13 @@
 "\"=\" för lika med."
 
 #. type: TP
-#: deb-control.5:178 deb-src-control.5:240
+#: deb-control.5:180 deb-src-control.5:245
 #, no-wrap
-msgid "B<Breaks:> E<lt>package listE<gt>"
-msgstr "B<Breaks:> E<lt>paketlistaE<gt>"
+msgid "B<Breaks:>I< package-list>"
+msgstr "B<Breaks:>I< paketlista>"
 
 #. type: Plain text
-#: deb-control.5:186
+#: deb-control.5:188
 msgid ""
 "Lists packages that this one breaks, for example by exposing bugs when the "
 "named packages rely on this one. The package maintenance software will not "
@@ -734,13 +744,13 @@
 "genom att uppgradera paketen som namnges i ett B<Breaks>-fält."
 
 #. type: TP
-#: deb-control.5:186 deb-src-control.5:249
+#: deb-control.5:188 deb-src-control.5:254
 #, no-wrap
-msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgstr "B<Conflicts:> E<lt>paketlistaE<gt>"
+msgid "B<Conflicts:>I< package-list>"
+msgstr "B<Conflicts:>I< v>"
 
 #. type: Plain text
-#: deb-control.5:194
+#: deb-control.5:196
 msgid ""
 "Lists packages that conflict with this one, for example by containing files "
 "with the same names. The package maintenance software will not allow "
@@ -753,13 +763,13 @@
 "konflikt bör innehålla en B<Conflicts>-rad med varandras namn."
 
 #. type: TP
-#: deb-control.5:194 deb-src-control.5:246
+#: deb-control.5:196 deb-src-control.5:251
 #, no-wrap
-msgid "B<Replaces:> E<lt>package listE<gt>"
-msgstr "B<Replaces:> E<lt>paketlistaE<gt>"
+msgid "B<Replaces:>I< package-list>"
+msgstr "B<Replaces:>I< paketlista>"
 
 #. type: Plain text
-#: deb-control.5:202
+#: deb-control.5:204
 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 "
@@ -773,13 +783,13 @@
 "paketet det står i konflikt med."
 
 #. type: TP
-#: deb-control.5:202 deb-src-control.5:252
+#: deb-control.5:204 deb-src-control.5:257
 #, no-wrap
-msgid "B<Provides:> E<lt>package listE<gt>"
-msgstr "B<Provides:> E<lt>paketlistaE<gt>"
+msgid "B<Provides:>I< package-list>"
+msgstr "B<Provides:>I< paketlista>"
 
 #. type: Plain text
-#: deb-control.5:212
+#: deb-control.5:214
 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 "
@@ -800,7 +810,7 @@
 "och använda \"|\" för att dela av listan."
 
 #. type: Plain text
-#: deb-control.5:231
+#: deb-control.5:233
 msgid ""
 "The syntax of B<Breaks>, B<Conflicts>, B<Replaces> and B<Provides> is a list "
 "of package names, separated by commas (and optional whitespace).  In the "
@@ -810,19 +820,18 @@
 msgstr ""
 "Syntaxen för B<Breaks>, B<Conflicts>, B<Replaces> och B<Provides> är en "
 "lista över paketnamn avdelade med komman (och eventuella blanktecken). I "
-"fälten B<Breaks> och B<Conflicts> läses kommatecknet som \"ELLER\". En "
-"eventuellt versionsnumret kan även anges, med samma syntax som ovan för "
+"fälten B<Breaks> och B<Conflicts> läses kommatecknet som \"ELLER\". Ett "
+"eventuellt versionsnummer kan även anges, med samma syntax som ovan för "
 "fälten B<Breaks>, B<Conflicts> och B<Replaces>."
 
 #. type: TP
-#: deb-control.5:232 deb-src-control.5:255
-#, fuzzy, no-wrap
-#| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Built-Using:> E<lt>package listE<gt>"
-msgstr "B<Depends:> E<lt>paketlistaE<gt>"
+#: deb-control.5:234 deb-src-control.5:260
+#, no-wrap
+msgid "B<Built-Using:>I< package-list>"
+msgstr "B<Built-Using:>I< paketlista>"
 
 #. type: Plain text
-#: deb-control.5:242
+#: deb-control.5:244
 msgid ""
 "This field lists extra source packages that were used during the build of "
 "this binary package.  This is an indication to the archive maintenance "
@@ -832,15 +841,22 @@
 "software is likely to refuse to accept an upload which declares a B<Built-"
 "Using> relationship which cannot be satisfied within the archive."
 msgstr ""
+"Fältet visar ytterligare källkodspaket som användes när binärpaketet "
+"byggdes. Detta anger för hanteringsprogramvaran för arkivet att dessa "
+"ytterligare källkodspaket måste behållas så länge binärpaketet finns i "
+"arkivet. Fältet måste innehålla en lista med källkodspaket med strikta (=) "
+"versionsberoenden. Observera att hanteringsprogramvaran för arkivet troligen "
+"kommer att avvisa en insändning som deklarerar en B<Built-Using>-relation "
+"som inte kan uppfyllas inom arkivet."
 
 #. type: SH
-#: deb-control.5:243 deb-src-control.5:283 start-stop-daemon.8:273
+#: deb-control.5:245 deb-src-control.5:288 start-stop-daemon.8:302
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "EXEMPEL"
 
 #. type: Plain text
-#: deb-control.5:266
+#: deb-control.5:268
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -886,7 +902,7 @@
 " will run more slowly, however.)\n"
 
 #. type: Plain text
-#: deb-control.5:274
+#: deb-control.5:276
 msgid ""
 "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr ""
@@ -894,24 +910,14 @@
 
 #. type: TH
 #: deb-src-control.5:3
-#, fuzzy, no-wrap
-#| msgid "deb-control"
+#, no-wrap
 msgid "deb-src-control"
-msgstr "deb-control"
-
-#. type: TH
-#: deb-src-control.5:3
-#, fuzzy, no-wrap
-#| msgid "2007-11-22"
-msgid "2010-11-22"
-msgstr "2007-11-22"
+msgstr "deb-src-control"
 
 #. type: Plain text
 #: deb-src-control.5:6
-#, fuzzy
-#| msgid "deb-control - Debian packages' master control file format"
 msgid "deb-src-control - Debian source packages' master control file format"
-msgstr "deb-control - Debians filformat för paketstyrfiler"
+msgstr "deb-src-control - Debians filformat för källkodspakets huvudstyrfil"
 
 #. type: Plain text
 #: deb-src-control.5:28
@@ -927,23 +933,32 @@
 "one space. The content of the multi-line fields is generally joined to a "
 "single line by the tools (except in the case of the B<Description> field, "
 "see below). To insert empty lines into a multi-line field, insert a dot "
-"after the space. The paragraphs are separated by an empty line. Lines "
-"starting with a B<'#'> are treated as comments."
+"after the space. Lines starting with a B<'#'> are treated as comments."
 msgstr ""
+"Varje Debiankällkodspaket innehåller huvud-\"control\"-filen, vilken "
+"innehååller åtminstone två stycken, avdelade med en tomrad. Det första "
+"stycket innehåller all generell information om källkodspaketet, medan de "
+"följande styckena beskriver exakt ett binärpaket. Varje stycke består av "
+"åtminstone ett fält. Ett fält inleds med ett fältnamn, till exempel "
+"B<Package> eller B<Section> (skiftlägesokänsligt), följt av ett kolon, "
+"fältinnehållet och ett nyradstecken. Flerradiga fält är också tillåtna, men "
+"varje ytterligare rad som inte innehåller ett fältnamn, bör starta med minst "
+"ett blanksteg. Innehållet i flerradsfält slås normalt samman till en enda "
+"rad av verktygen (förutom i fallet fältet B<Description>, se nedan). För att "
+"sätta in tomma rader i ett flerradsfält, skriver du en punkt efter "
+"blanksteget. Rader som börjar med ett B<\"#\"> tolkas som kommentarer."
 
 #. type: SH
 #: deb-src-control.5:29
-#, fuzzy, no-wrap
-#| msgid "REQUIRED FIELDS"
+#, no-wrap
 msgid "SOURCE FIELDS"
-msgstr "NÖDVÄNDIGA FÄLT"
+msgstr "KÄLLKODSFÄLT"
 
 #. type: TP
 #: deb-src-control.5:30
-#, fuzzy, no-wrap
-#| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Source:> E<lt>source package nameE<gt> (required)"
-msgstr "B<Source:> E<lt>källkodsnamnE<gt>"
+#, no-wrap
+msgid "B<Source:> I<source-package-name> (required)"
+msgstr "B<Source:> I<källkodspaketnamn> (krävs)"
 
 #. type: Plain text
 #: deb-src-control.5:37
@@ -954,36 +969,34 @@
 "minus (-) signs, and periods (.). Package names must be at least two "
 "characters long and must start with an alphanumeric character."
 msgstr ""
+"Värdet på det här fältet är namnet på källkodspaketet, och måste motsvara "
+"namnet på källkodspaketet i filen debian/changelog. Paketnamnet måste bestå "
+"endast av små bokstäver (a-z), siffror (0-9), plus- (+) och minustecken (-) "
+"och punkt (.). Paketnamn måste vara minst två tecken långa och måste börja "
+"med ett alfanumeriskt tecken."
 
 #. type: TP
 #: deb-src-control.5:38
-#, fuzzy, no-wrap
-#| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgid "B<Maintainer:> E<lt>fullname emailE<gt> (required)"
-msgstr "B<Maintainer:> E<lt>fullt-namn e-postE<gt>"
+#, no-wrap
+msgid "B<Maintainer:> I<fullname-email> (required)"
+msgstr "B<Maintainer:> I<fullt-namn-epost> (krävs)"
 
 #. type: Plain text
 #: deb-src-control.5:43
-#, fuzzy
-#| 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 "
-#| "the software that was packaged."
 msgid ""
 "Should be in the format \"Joe Bloggs E<lt>jbloggs@foo.comE<gt>\", and "
 "references the person who currently maintains the package, as opposed to the "
 "author of the software or the original packager."
 msgstr ""
-"Skall vara på formatet \"Joe Bloggs E<lt>jbloggs@foo.comE<gt>\" och är "
-"normalt sett den person som skapat paketet, till skillnad från författaren "
-"av den programvara som paketerades."
+"Skall vara på formatet \"Joe Bloggs E<lt>jbloggs@foo.comE<gt>\" och "
+"refererar till den person som för närvarande underhåller paketet, till "
+"skillnad från författaren av den programvara som paketerats."
 
 #. type: TP
 #: deb-src-control.5:44
-#, fuzzy, no-wrap
-#| msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
-msgid "B<Uploaders:> E<lt>fullname emailE<gt>"
-msgstr "B<Maintainer:> E<lt>fullt-namn e-postE<gt>"
+#, no-wrap
+msgid "B<Uploaders:>I< fullname-email>"
+msgstr "B<Uploaders:>I< fullt-namn-epost>"
 
 #. type: Plain text
 #: deb-src-control.5:49
@@ -992,13 +1005,15 @@
 "the same format as the Maintainer field. Multiple co-maintainers should be "
 "separated by a comma."
 msgstr ""
+"Räknar upp namn och e-postadresser till med-underhållare av paketet, i samma "
+"format som fältet Maintainers. Flera med-underhållare bör avdelas med "
+"kommatecken."
 
 #. type: TP
 #: deb-src-control.5:50
-#, fuzzy, no-wrap
-#| msgid "B<Version:> E<lt>version stringE<gt>"
-msgid "B<Standards-Version:> E<lt>version stringE<gt>"
-msgstr "B<Version:> E<lt>versionssträngE<gt>"
+#, no-wrap
+msgid "B<Standards-Version:>I< version-string>"
+msgstr "B<Standards-Version:>I< versionssträng>"
 
 #. type: Plain text
 #: deb-src-control.5:56
@@ -1007,13 +1022,15 @@
 "the Debian Policy Manual and referenced texts from the B<debian-policy> "
 "package) this package complies to."
 msgstr ""
+"Dokumenterar den senaste versionen av standarddokumenten (vilka består av "
+"Debians policyhandbok och refererade texter i paketet B<debian-policy>) som "
+"paketet uppfyller."
 
 #. type: TP
 #: deb-src-control.5:57
-#, fuzzy, no-wrap
-#| msgid "B<Essential:> E<lt>yes|noE<gt>"
-msgid "B<DM-Upload-Allowed:> E<lt>yes|noE<gt>"
-msgstr "B<Essential: >E<lt>yes|noE<gt>"
+#, no-wrap
+msgid "B<DM-Upload-Allowed:> B<yes>|B<no>"
+msgstr "B<DM-Upload-Allowed:> B<yes>|B<no>"
 
 #. type: Plain text
 #: deb-src-control.5:61
@@ -1022,68 +1039,71 @@
 "Maintainers appearing in the Maintainer or Uploaders field. The default "
 "value is \"no\"."
 msgstr ""
+"Fältet anger om paketet kan sändas in av de Debianutvecklare som står "
+"beskrivna i fälten Maintainer och Uploaders. Standardvärdet är \"no\" (nej)."
+
+#. type: Plain text
+#: deb-src-control.5:65
+msgid "The upstream project home page URL."
+msgstr "URL till uppströmsprojektets hemsida."
 
 #. type: Plain text
 #: deb-src-control.5:71
-#, fuzzy
-#| msgid ""
-#| "The url of the bug tracking system for this package. The current used "
-#| "format is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://"
-#| "bugs.debian.org>."
-msgid ""
-"The url of the bug tracking system for this package. The current used format "
-"is B<E<lt>bts_typeE<gt>://E<lt>bts_addressE<gt>>, like B<debbugs://bugs."
-"debian.org>. This field is usually not needed."
-msgstr ""
-"URL:en till felrapporteringssystemet för detta paket. Det nuvarande formatet "
-"är B<E<lt>systemtypE<gt>://E<lt>addressE<gt>>, till exempel B<debbugs://bugs."
-"debian.org>."
+msgid ""
+"The I<url> of the bug tracking system for this package. The current used "
+"format is I<bts-type>B<://>I<bts-address>, like B<debbugs://bugs.debian."
+"org>. This field is usually not needed."
+msgstr ""
+"I<Url>:en till felrapporteringssystemet för detta paket. Det nuvarande "
+"formatet är I<systemtyp>://I<address>, till exempel B<debbugs://bugs.debian."
+"org>. Det här fältet är normalt sett inte nödvändigt."
 
 #. type: TP
 #: deb-src-control.5:72
-#, fuzzy, no-wrap
-#| msgid "B<Bugs:> E<lt>urlE<gt>"
-msgid "B<Vcs-*:> E<lt>urlE<gt>"
-msgstr "B<Bugs:> E<lt>urlE<gt>"
+#, no-wrap
+msgid "B<Vcs-*:>I< url>"
+msgstr "B<Vcs-*:>I< url>"
 
 #. type: Plain text
-#: deb-src-control.5:78
+#: deb-src-control.5:79
 msgid ""
-"The url of the Version Control System repository used to maintain this "
-"package.  Currently supported are Arch, Bzr (Bazaar), Cvs, Darcs, Git, Hg "
-"(Mercurial), Mtn (Monotone) and Svn (Subversion). Usually this field points "
-"to the latest version of the package, such as the main branch or the trunk."
+"The I<url> of the Version Control System repository used to maintain this "
+"package. Currently supported are B<Arch>, B<Bzr> (Bazaar), B<Cvs>, B<Darcs>, "
+"B<Git>, B<Hg> (Mercurial), B<Mtn> (Monotone) and B<Svn> (Subversion). "
+"Usually this field points to the latest version of the package, such as the "
+"main branch or the trunk."
 msgstr ""
+"I<Url>:en till versionshanteringsarkivet som används för att underhålla det "
+"här paketet. För närvarande stöds B<Arch>, B<Bzr> (Bazaar), B<Cvs>, "
+"B<Darcs>, B<Git>, B<Hg> (Mercurial), B<Mtn> (Monotone) och B<Svn> "
+"(Subversion). Fältet pekar normalt till den senaste versionen av paketet, "
+"såsom huvudgrenen (main eller trunk)."
 
 #. type: TP
-#: deb-src-control.5:79
-#, fuzzy, no-wrap
-#| msgid "B<Bugs:> E<lt>urlE<gt>"
-msgid "B<Vcs-Browser:> E<lt>urlE<gt>"
-msgstr "B<Bugs:> E<lt>urlE<gt>"
+#: deb-src-control.5:80
+#, no-wrap
+msgid "B<Vcs-Browser:>I< url>"
+msgstr "B<Vcs-Browser:>I< url>"
 
 #. type: Plain text
-#: deb-src-control.5:82
+#: deb-src-control.5:84
 msgid ""
-"The url of a webinterface to browse the Version Control System repository."
+"The I<url> of a webinterface to browse the Version Control System repository."
 msgstr ""
+"I<Url>:en till ett webbgränssnitt för att bläddra i "
+"versionshanteringsarkivet."
 
 #. type: Plain text
-#: deb-src-control.5:87
-#, fuzzy
-#| msgid "The name of the distribution this package is originating from."
+#: deb-src-control.5:89
 msgid ""
 "The name of the distribution this package is originating from. This field is "
 "usually not needed."
-msgstr "Namnet på den distribution paketet härstammar från."
+msgstr ""
+"Namnet på den distribution paketet härstammar från. Det här fältet är "
+"normalt sett inte nödvändigt."
 
 #. type: Plain text
-#: deb-src-control.5:93
-#, fuzzy
-#| 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', `text', `x11' etc."
+#: deb-src-control.5:95
 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\", "
@@ -1094,12 +1114,7 @@
 "\", \"mail\", \"text\", \"x11\" osv."
 
 #. type: Plain text
-#: deb-src-control.5:98
-#, fuzzy
-#| msgid ""
-#| "Sets the importance of this package in relation to the system as a "
-#| "whole.  Common priorities are `required', `standard', `optional', `extra' "
-#| "etc."
+#: deb-src-control.5:100
 msgid ""
 "Sets the importance of this package in relation to the system as a whole.  "
 "Common priorities are \"required\", \"standard\", \"optional\", \"extra\", "
@@ -1110,78 +1125,68 @@
 "\" (valfritt), \"extra\" (extra) osv."
 
 #. type: TP
-#: deb-src-control.5:108
-#, fuzzy, no-wrap
-#| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Build-Depends:> E<lt>package listE<gt>"
-msgstr "B<Depends:> E<lt>paketlistaE<gt>"
+#: deb-src-control.5:110
+#, no-wrap
+msgid "B<Build-Depends:>I< package-list>"
+msgstr "B<Build-Depends:>I< paketlista>"
 
 #. type: Plain text
-#: deb-src-control.5:112
-#, fuzzy
-#| msgid ""
-#| "In the list of packages, the text indicating the current state of the "
-#| "currently selected package."
+#: deb-src-control.5:114
 msgid ""
 "A list of packages that need to be installed and configured to be able to "
 "build the source package."
 msgstr ""
-"I listan över paket är det här texten som anger aktuellt tillstånd för det "
-"nu markerade paketet."
+"En lista över paket som måste installeras och konfigureras för att kunna "
+"bygga källkodspaketet."
 
 #. type: TP
-#: deb-src-control.5:113
-#, fuzzy, no-wrap
-#| msgid "B<Depends:> E<lt>package listE<gt>"
-msgid "B<Build-Depends-Indep:> E<lt>package listE<gt>"
-msgstr "B<Depends:> E<lt>paketlistaE<gt>"
+#: deb-src-control.5:115
+#, no-wrap
+msgid "B<Build-Depends-Indep:>I< package-list>"
+msgstr "B<Build-Depends-Indep:>I< paketlista>"
 
 #. type: Plain text
-#: deb-src-control.5:118
+#: deb-src-control.5:120
 msgid ""
-"Same as Build-Depends, but they are only needed when building the "
-"architecture independent packages. The Build-Depends are also installed in "
-"this case."
+"Same as B<Build-Depends>, but they are only needed when building the "
+"architecture independent packages. The B<Build-Depends> are also installed "
+"in this case."
 msgstr ""
+"Motsvarar B<Build-Depends>, men de behövs endast för att bygga de "
+"arkitekturoberoende paketen. B<Build-Depends> installeras också i detta fall."
 
 #. type: TP
-#: deb-src-control.5:119
-#, fuzzy, no-wrap
-#| msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgid "B<Build-Conflicts:> E<lt>package listE<gt>"
-msgstr "B<Conflicts:> E<lt>paketlistaE<gt>"
+#: deb-src-control.5:121
+#, no-wrap
+msgid "B<Build-Conflicts:>I< package-list>"
+msgstr "B<Build-Conflicts:>I< paketlista>"
 
 #. type: Plain text
-#: deb-src-control.5:123
+#: deb-src-control.5:125
 msgid ""
 "A list of packages that should not be installed when the package is build, "
 "for example because they interfere with the used build system."
 msgstr ""
+"En lista över paket som inte bör vara installerade när paketet byggs, till "
+"exempel på grund av att de stör byggsystemet som används."
 
 #. type: TP
-#: deb-src-control.5:124
-#, fuzzy, no-wrap
-#| msgid "B<Conflicts:> E<lt>package listE<gt>"
-msgid "B<Build-Conflicts-Indep:> E<lt>package listE<gt>"
-msgstr "B<Conflicts:> E<lt>paketlistaE<gt>"
+#: deb-src-control.5:126
+#, no-wrap
+msgid "B<Build-Conflicts-Indep:>I< package-list>"
+msgstr "B<Build-Conflicts-Indep:>I< paketlista>"
 
 #. type: Plain text
-#: deb-src-control.5:128
+#: deb-src-control.5:130
 msgid ""
-"Same as Build-Conflicts, but only when building the architecture independent "
-"packages."
+"Same as B<Build-Conflicts>, but only when building the architecture "
+"independent packages."
 msgstr ""
+"Motsvarar B<Build-Conflicts>, men endast när de arkitekturoberoende paketen "
+"byggs."
 
 #. type: Plain text
-#: deb-src-control.5:139
-#, fuzzy
-#| 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 packages separated by vertical bar (or `pipe') symbols, `|'. The "
-#| "groups are separated by commas. Commas are to be read as `AND', and pipes "
-#| "as `OR', with pipes binding more tightly. Each package name is optionally "
-#| "followed by a version number specification in parentheses."
+#: deb-src-control.5:141
 msgid ""
 "The syntax of the B<Build-Depends> and B<Build-Depends-Indep> fields is a "
 "list of groups of alternative packages. Each group is a list of packages "
@@ -1191,16 +1196,16 @@
 "a version number specification in parentheses and an architecture "
 "specification in square brackets."
 msgstr ""
-"Syntaxen för fälten B<Depends>, B<Pre-Depends>, B<Recommends> och "
-"B<Suggests>är en lista med grupper av alternativa paket. Varje grupp "
-"innehåller en lista med paket avdelade med ett vertikalstreck (rör) (\"|"
-"\").  Grupperna avdelas med kommatecken. Komma utläses som \"OCH\", och "
-"vertikalstrecken som \"ELLER\", där vertikalstrecken binder hårdare. Varje "
-"paketnummer kan eventuellt följas av en versionsnummerangivelse inom "
-"parenteser."
+"Syntaxen för fälten B<Build-Depends> och B<Build-Depends-Indep>-fälten är en "
+"lista med grupper av alternativa paket. Varje grupp innehåller en lista med "
+"paket avdelade med ett vertikalstreck (rör) (\"|\").  Grupperna avdelas med "
+"kommatecken. Komma utläses som \"OCH\", och vertikalstrecken som \"ELLER\", "
+"där vertikalstrecken binder hårdare. Varje paketnamn kan eventuellt följas "
+"av en versionsnummerangivelse inom parenteser och en arkitekturangivelse i "
+"hakparenteser."
 
 #. type: Plain text
-#: deb-src-control.5:148
+#: deb-src-control.5:150
 msgid ""
 "The syntax of the B<Build-Conflicts> and B<Build-Conflicts-Indep> fields is "
 "a list of comma-separated package names, where the comma is read as an \"AND"
@@ -1208,17 +1213,14 @@
 "package name is optionally followed by a version number specification in "
 "parentheses and an architecture specification in square brackets."
 msgstr ""
+"Syntaxen för fälten B<Build-Conflicts> och B<Build-Conflicts-Indep>-fälten "
+"är en kommaseparerad lista med paketnamn, där komma utläses som \"OCH\". Det "
+"är inte möjligt att ange alternativa paket med \"rör\". Varje paketnamn kan "
+"eventuellt följas av en versionsnummerangivelse inom parenteser och en "
+"arkitekturangivelse i hakparenteser."
 
 #. type: Plain text
-#: deb-src-control.5:154
-#, fuzzy
-#| 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 "
-#| "(separated by a hyphen). Accepted version relationships are \"E<gt>E<gt>"
-#| "\" for greater than, \"E<lt>E<lt>\" for less than, \"E<gt>=\" for greater "
-#| "than or equal to, \"E<lt>=\" for less than or equal to, and \"=\" for "
-#| "equal to."
+#: deb-src-control.5:156
 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 "
@@ -1234,125 +1236,138 @@
 "\"=\" för lika med."
 
 #. type: Plain text
-#: deb-src-control.5:158
+#: deb-src-control.5:160
 msgid ""
 "A architecture specification consists of one or more architecture names, "
 "separated by whitespace. Exclamation marks may be prepended to each of the "
 "names, meaning \"NOT\"."
 msgstr ""
+"En arkitekturangivelse består av ett eller flera arkitekturnamn, avdelade "
+"med blanktecken. Varje namn kan föregås av ett utropstecken, vilket betyder "
+"\"ICKE\"."
 
 #. type: Plain text
-#: deb-src-control.5:163
+#: deb-src-control.5:165
 msgid ""
 "Note that dependencies on packages in the B<build-essential> set can be "
 "omitted and that declaring build conflicts against them is impossible. A "
 "list of these packages is in the build-essential package."
 msgstr ""
+"Observera att beroenden på paket i B<build-essential>-uppsättningen kan "
+"utelämnas och att det är omöjligt att deklarera byggkonflikter mot dem. En "
+"lista över dessa paket finns i paketet build-essential."
 
 #. type: SH
-#: deb-src-control.5:165
-#, fuzzy, no-wrap
-#| msgid "OPTIONAL FIELDS"
+#: deb-src-control.5:167
+#, no-wrap
 msgid "BINARY FIELDS"
-msgstr "VALFRIA FÄLT"
+msgstr "BINÄRFÄLT"
 
 #. type: Plain text
-#: deb-src-control.5:174
+#: deb-src-control.5:176
 msgid ""
 "Note that the B<Priority>, B<Section> and B<Homepage> fields can also be in "
 "a binary paragraph to override the global value from the source package."
 msgstr ""
+"Observera att fälten B<Priority>, B<Section> och B<Homepage> även kan "
+"användas i de stycken som beskriver binärpaket för att överstyra de globala "
+"värdena för källkodspaketet."
 
 #. type: TP
-#: deb-src-control.5:175
-#, fuzzy, no-wrap
-#| msgid "B<Package:> E<lt>package nameE<gt>"
-msgid "B<Package:> E<lt>binary package nameE<gt> (required)"
-msgstr "B<Package:> E<lt>paketnamnE<gt>"
+#: deb-src-control.5:177
+#, no-wrap
+msgid "B<Package:> I<binary-package-name> (required)"
+msgstr "B<Package:> I<binärpaketnamn> (krävs)"
 
 #. type: Plain text
-#: deb-src-control.5:179
+#: deb-src-control.5:181
 msgid ""
 "This field is used to name the binary package name. The same restrictions as "
 "to a source package name apply."
 msgstr ""
+"Detta fält används för att namnge det binära paketet. Samma begränsningar "
+"gäller som för källkodspaketets namn."
 
 #. type: TP
-#: deb-src-control.5:180
-#, fuzzy, no-wrap
-#| msgid "B<Architecture:> E<lt>arch|allE<gt>"
-msgid "B<Architecture:> E<lt>arch|all|anyE<gt> (required)"
-msgstr "B<Architecture:> E<lt>arkitektur|allE<gt>"
+#: deb-src-control.5:182
+#, no-wrap
+msgid "B<Architecture:> I<arch>|B<all>|B<any> (required)"
+msgstr "B<Architecture:> I<arch>|B<all>|B<any> (krävs)"
 
 #. type: Plain text
-#: deb-src-control.5:190
+#: deb-src-control.5:195
 msgid ""
 "The architecture specifies on which type of hardware this package runs. For "
 "packages that run on all architectures, use the B<any> value. For packages "
 "that are architecture independent, such as shell and Perl scripts or "
 "documentation, use the B<all> value. To restrict the packages to a certain "
-"set of architectures, specify the architecture names, separated by a space."
-msgstr ""
+"set of architectures, specify the architecture names, separated by a space. "
+"It's also possible to put architecture wildcards in that list (see B<dpkg-"
+"architecture>(1)  for more information about them)."
+msgstr ""
+"Arkitekturen anger på vilken typ av maskinvara paketet körs. För paket som "
+"körs på alla arkitekturer används värdet B<any> (någon). För paket som är "
+"arkitekturoberoende, som skal- och Perlskript eller dokumentation, används "
+"värdet B<all> (alla). För att begränsa paket till en specifik uppsättning "
+"arkitekturer, anger du namnen på arkitekturerna avdelade med blanksteg. Det "
+"är även möjligt att ange arkitekturer med jokertecken i listan (se B<dpkg-"
+"architecture>(1) för mer information om dessa)."
 
 #. type: TP
-#: deb-src-control.5:191
-#, fuzzy, no-wrap
-#| msgid "B<Package:> E<lt>package nameE<gt>"
-msgid "B<Package-Type:> E<lt>deb|udebE<gt>"
-msgstr "B<Package:> E<lt>paketnamnE<gt>"
+#: deb-src-control.5:196
+#, no-wrap
+msgid "B<Package-Type:> B<deb>|B<udeb>"
+msgstr "B<Package-Type:> B<deb>|B<udeb>"
 
 #. type: Plain text
-#: deb-src-control.5:196
+#: deb-src-control.5:201
 msgid ""
 "This field defines the type of the package. \"udeb\" is for size-constrained "
 "packages used by the debian installer. \"deb\" is the default value, it's "
 "assumed if the field is absent. More types might be added in the future."
 msgstr ""
+"Detta fält anger paketets typ. \"udeb\" används för storleksbegränsade paket "
+"i debian-installer. \"deb\" är standardvärdet, och antas om fältet saknas. "
+"Fler typer kan komma att läggas till i framtiden."
 
 #. type: TP
-#: deb-src-control.5:214
-#, fuzzy, no-wrap
-#| msgid "B<Source:> E<lt>source nameE<gt>"
-msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
-msgstr "B<Source:> E<lt>källkodsnamnE<gt>"
-
-#. type: TP
-#: deb-src-control.5:220
-#, fuzzy, no-wrap
-#| msgid "B<Description:> E<lt>short descriptionE<gt>"
-msgid "B<Description:> E<lt>short descriptionE<gt> (required)"
-msgstr "B<Description:> E<lt>kort beskrivningE<gt>"
+#: deb-src-control.5:225
+#, no-wrap
+msgid "B<Description:> I<short-description> (required)"
+msgstr "B<Description:> I<kort-beskrivning> (krävs)"
 
 #. type: Plain text
-#: deb-src-control.5:227
+#: deb-src-control.5:232
 msgid ""
 "These fields are described in the B<deb-control>(5)  manual page, as they "
 "are copied literally to the control file of the binary package."
 msgstr ""
+"Dessa fält beskrivs i manualsidan B<deb-control>(5), eftersom de kopieras "
+"ordagrant till binärpaketets styrfil."
 
 #. type: TP
-#: deb-src-control.5:243
-#, fuzzy, no-wrap
-#| msgid "B<Replaces:> E<lt>package listE<gt>"
-msgid "B<Enhances:> E<lt>package listE<gt>"
-msgstr "B<Replaces:> E<lt>paketlistaE<gt>"
+#: deb-src-control.5:248
+#, no-wrap
+msgid "B<Enhances:>I< package-list>"
+msgstr "B<Enhances:>I< paketlista>"
 
 #. type: Plain text
-#: deb-src-control.5:265
+#: deb-src-control.5:270
 msgid ""
 "These fields declare relationships between packages. They are discussed in "
 "the B<deb-control>(5)  manpage and in the B<debian-policy> package."
 msgstr ""
+"Dessa fält anger relationer mellan paket. De diskuteras i manualsidan B<deb-"
+"control>(5) och i paketet B<debian-policy>."
 
 #. type: SH
-#: deb-src-control.5:266
-#, fuzzy, no-wrap
-#| msgid "REQUIRED FIELDS"
+#: deb-src-control.5:271
+#, no-wrap
 msgid "USER-DEFINED FIELDS"
-msgstr "NÖDVÄNDIGA FÄLT"
+msgstr "ANVÄNDARDEFINIERADE FÄLT"
 
 #. type: Plain text
-#: deb-src-control.5:281
+#: deb-src-control.5:286
 msgid ""
 "It is allowed to add additional user-defined fields to the control file. The "
 "tools will ignore these fields. If you want the fields to be copied over to "
@@ -1367,9 +1382,20 @@
 "changes file and will not appear in the binary or source package control "
 "files."
 msgstr ""
+"Det är möjligt att lägga till ytterligare användardefinierade fält i "
+"styrfilen. Verktygen ignorerar dessa fält. Om du vill att fälten skall "
+"kopieras över till utdatafilerna, som till exempel i binärpaketen, måste du "
+"använda en skräddarsydd namngivning: fälten måste starta med X, följt av ett "
+"eller flera av bokstäverna BCS och ett bindestreck. Om bokstaven B används "
+"kommer fältet att dyka upp i styrfilen i binärpaketet, se B<deb-control>(5), "
+"för bokstaven S i källkodspaketets styrfil som konstrueras av B<dpkg-source>"
+"(1) och för bokstaven C i styrfilen för insändning (.changes). Observera att "
+"X[BCS]-prefixen tas bort när fälten kopieras över till utdatafilerna. Fältet "
+"B<XC-Approved-By> visas som B<Approved-By> i changes-filen och visas inte i "
+"styrfilerna för binär- och källkodspaketen."
 
 #. type: Plain text
-#: deb-src-control.5:299
+#: deb-src-control.5:304
 #, no-wrap
 msgid ""
 "# Comment\n"
@@ -1384,11 +1410,24 @@
 "Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
-" libselinux1-dev (E<gt>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]\n"
+" libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
 msgstr ""
+"# Kommentar\n"
+"Source: dpkg\n"
+"Section: admin\n"
+"Priority: required\n"
+"Maintainer: Dpkg Developers E<lt>debian-dpkg@lists.debian.orgE<gt>\n"
+"# det här fältet kopieras till binär- och källkodspaketen\n"
+"XBS-Upstream-Release-Status: stable\n"
+"Homepage: http://wiki.debian.org/Teams/Dpkg\n"
+"Vcs-Browser: http://git.debian.org/?p=dpkg/dpkg.git\n"
+"Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
+"Standards-Version: 3.7.3\n"
+"Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
+" libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
 
 #. type: Plain text
-#: deb-src-control.5:318
+#: deb-src-control.5:323
 #, no-wrap
 msgid ""
 "Package: dpkg-dev\n"
@@ -1397,8 +1436,8 @@
 "Architecture: all\n"
 "# this is a custom field in the binary package\n"
 "XB-Mentoring-Contact: Raphael Hertzog E<lt>hertzog@debian.orgE<gt>\n"
-"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2), bzip2, lzma,\n"
-" patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
+"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2),\n"
+" bzip2, lzma, patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
 "Recommends: gcc | c-compiler, build-essential\n"
 "Suggests: gnupg, debian-keyring\n"
 "Conflicts: dpkg-cross (E<lt>E<lt> 2.0.0), devscripts (E<lt>E<lt> 2.10.26)\n"
@@ -1410,13 +1449,29 @@
 " Most Debian source packages will require additional tools to build;\n"
 " for example, most packages need make and the C compiler gcc.\n"
 msgstr ""
+"Package: dpkg-dev\n"
+"Section: utils\n"
+"Priority: optional\n"
+"Architecture: all\n"
+"# det här är ett skräddarsytt fält i binärpaketet\n"
+"XB-Mentoring-Contact: Raphael Hertzog E<lt>hertzog@debian.orgE<gt>\n"
+"Depends: dpkg (E<gt>= 1.14.6), perl5, perl-modules, cpio (E<gt>= 2.4.2-2),\n"
+" bzip2, lzma, patch (E<gt>= 2.2-1), make, binutils, libtimedate-perl\n"
+"Recommends: gcc | c-compiler, build-essential\n"
+"Suggests: gnupg, debian-keyring\n"
+"Conflicts: dpkg-cross (E<lt>E<lt> 2.0.0), devscripts (E<lt>E<lt> 2.10.26)\n"
+"Replaces: manpages-pl (E<lt>= 20051117-1)\n"
+"Description: Debian package development tools\n"
+" This package provides the development tools (including dpkg-source)\n"
+" required to unpack, build and upload Debian source packages.\n"
+" .\n"
+" Most Debian source packages will require additional tools to build;\n"
+" for example, most packages need make and the C compiler gcc.\n"
 
 #. type: Plain text
-#: deb-src-control.5:325
-#, fuzzy
-#| msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
+#: deb-src-control.5:330
 msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
-msgstr "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
+msgstr "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
 
 #. type: TH
 #: deb-split.5:1
@@ -1425,10 +1480,11 @@
 msgstr "deb-split"
 
 #. type: TH
-#: deb-split.5:1
+#: deb-split.5:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 dpkg-vendor.1:1 start-stop-daemon.8:1
 #, no-wrap
-msgid "2010-01-28"
-msgstr "2010-01-28"
+msgid "2011-07-04"
+msgstr "2011-07-04"
 
 #. type: Plain text
 #: deb-split.5:4
@@ -1455,27 +1511,72 @@
 "Filnamnen kan innehålla ett avslutande snedstreck (sedan dpkg 1.15.6)."
 
 #. type: Plain text
-#: deb-split.5:21
+#: deb-split.5:15
 msgid ""
 "The first member is named B<debian-split> and contains a series of lines, "
-"separated by newlines. Currently seven lines are present.  The first is the "
-"format version number, B<2.1> at the time this manual page was written. The "
-"second is the package name. The third is the package version. The fourth is "
-"the md5sum of the package.  The fifth is the total size of the package. The "
-"sixth is the maximum part size. The seventh is the current part number, "
-"followed by a slash and the total amount of parts (as in \\(oq1/10\\(cq)."
-msgstr ""
-"Den första posten i arkivet heter B<debian-split> och innehåller ett antal "
-"rader, avdelade med nyradstecken. För närvarande finns det sju rader. Den "
-"första raden är formatets versionsnummer, B<2.1> då manualsidan skrevs. Den "
-"andra raden är paketnamnet. Den tredje är paketversionen. Den fjärde är "
-"md5summan för paketet. Den femte är paketets totala storlek. Den sjätte är "
-"maximal storlek på delarna. Den sjunde är numret på den aktuella delen, "
-"följd av ett snedstreck och det totala antalet delar (som i \\(oq1/10\\(cq)."
+"separated by newlines. Currently eight lines are present:"
+msgstr ""
+"Den första posten heter B<debian-split> och innehåller en serie av rader, "
+"avdelade med nyradstecken. För närvarande finns åtta rader:"
+
+#. type: IP
+#: deb-split.5:15 deb-split.5:18 deb-split.5:20 deb-split.5:22 deb-split.5:24
+#: deb-split.5:26 deb-split.5:28 deb-split.5:31 dpkg-gensymbols.1:20
+#: dpkg-gensymbols.1:22 dpkg-gensymbols.1:24 dpkg-gensymbols.1:26
+#: dpkg-gensymbols.1:311 dpkg-gensymbols.1:317 dpkg-gensymbols.1:351
+#: dpkg-gensymbols.1:355 dpkg-gensymbols.1:358
+#, no-wrap
+msgid "\\(bu"
+msgstr "\\(bu"
+
+#. type: Plain text
+#: deb-split.5:18
+msgid ""
+"The format version number, B<2.1> at the time this manual page was written."
+msgstr "Formatets versionsnummer, B<2.1> då denna manualsida skrivs."
+
+#. type: Plain text
+#: deb-split.5:20
+msgid "The package name."
+msgstr "Paketets namn."
+
+#. type: Plain text
+#: deb-split.5:22
+msgid "The package version."
+msgstr "Paketets versionsnummer."
 
-# type: Plain text
 #. type: Plain text
 #: deb-split.5:24
+msgid "The md5sum of the package."
+msgstr "md5-kontrollsumman för paketet."
+
+#. type: Plain text
+#: deb-split.5:26
+msgid "The total size of the package."
+msgstr "Total storlek på paketet."
+
+#. type: Plain text
+#: deb-split.5:28
+msgid "The maximum part size."
+msgstr "Maximal storlek på en del."
+
+#. type: Plain text
+#: deb-split.5:31
+msgid ""
+"The current part number, followed by a slash and the total amount of parts "
+"(as in \\(oq1/10\\(cq)."
+msgstr ""
+"Nummer på aktuell del, följt av ett snedstreck och totalt antal delar (som i "
+"\\(oq1/10\\(cq)."
+
+#. type: Plain text
+#: deb-split.5:33
+msgid "The package architecture (since dpkg 1.16.1)."
+msgstr "Paketets arkitektur (sedan dpkg 1.16.1)."
+
+# type: Plain text
+#. type: Plain text
+#: deb-split.5:36
 msgid ""
 "Programs which read multi-part archives should be prepared for additional "
 "lines to be present, and should ignore these if this is the case."
@@ -1484,7 +1585,7 @@
 "är närvarande, och bör ignorera dessa om så är fallet."
 
 #. type: Plain text
-#: deb-split.5:29
+#: deb-split.5:41
 msgid ""
 "If the version 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 "
@@ -1497,28 +1598,28 @@
 "(förutom i slutet), enligt vad beskrivs nedan."
 
 #. type: Plain text
-#: deb-split.5:32
+#: deb-split.5:44
 msgid ""
-"The second, last required member is named B<data.>N, where N denotes the "
-"part number. It contains the raw part data."
+"The second, last required member is named B<data.>I<N>, where I<N> denotes "
+"the part number. It contains the raw part data."
 msgstr ""
-"Den andra och sista nödvändiga posten heter B<data.>, där N anger delnumret. "
-"Den innehåller rådata för delen."
+"Den andra och sista nödvändiga posten heter B<data.>I<N>, där I<N> anger "
+"delnumret. Den innehåller rådata för delen."
 
 #. type: Plain text
-#: deb-split.5:37
+#: deb-split.5:49
 msgid ""
 "These members must occur in this exact order. Current implementations should "
-"ignore any additional members after B<data.>N.  Further members may be "
+"ignore any additional members after B<data.>I<N>.  Further members may be "
 "defined in the future, and (if possible) will be placed after these two."
 msgstr ""
 "Dessa poster måste ligga i exakt denna ordning. Nuvarande implementationer "
-"bör ignorera eventuella ytterligare poster efter B<data.>N. Ytterligare "
+"bör ignorera eventuella ytterligare poster efter B<data.>I<N>. Ytterligare "
 "poster kan komma att definieras i framtiden, och kommer (om möjligt) "
 "placeras efter dessa två."
 
 #. type: Plain text
-#: deb-split.5:39
+#: deb-split.5:51
 msgid "B<deb>(5), B<dpkg-split>(1)."
 msgstr "B<deb>(5), B<dpkg-split>(1)."
 
@@ -1528,13 +1629,6 @@
 msgid "deb-version"
 msgstr "deb-version"
 
-#. type: TH
-#: deb-version.5:5 dpkg-distaddfile.1:1 dpkg-genchanges.1:1
-#: dpkg-gencontrol.1:1 dpkg-name.1:6
-#, no-wrap
-msgid "2008-08-18"
-msgstr "2008-08-18"
-
 #. type: Plain text
 #: deb-version.5:8
 msgid "deb-version - Debian package version number format"
@@ -1542,8 +1636,8 @@
 
 #. type: Plain text
 #: deb-version.5:11
-msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
-msgstr "[ I<epok>:] I<uppströmsversion> [-I<debianuppdatering> ]"
+msgid "[I<epoch>B<:>]I<upstream-version>[B<->I<debian-revision>]"
+msgstr "[I<epok>B<:>]I<uppströmsversion>[B<->I<debianuppdatering>]"
 
 #. type: Plain text
 #: deb-version.5:14
@@ -1564,11 +1658,11 @@
 #: deb-version.5:20
 msgid ""
 "This is a single (generally small) unsigned integer.  It may be omitted, in "
-"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"which case zero is assumed.  If it is omitted then the I<upstream-version> "
 "may not contain any colons."
 msgstr ""
 "Ett ensamt (vanligtvis litet) heltalsvärde större än noll. Det kan "
-"uteslutas, i så fall antas det vara noll. Om det utesluts an inte "
+"uteslutas, i så fall antas det vara noll. Om det utesluts kan inte "
 "I<uppströmsversion> innehålla kolontecken."
 
 #. type: Plain text
@@ -1585,8 +1679,8 @@
 #. type: TP
 #: deb-version.5:24
 #, no-wrap
-msgid "I<upstream_version>"
-msgstr "B<uppströmsversion>"
+msgid "I<upstream-version>"
+msgstr "I<uppströmsversion>"
 
 #. type: Plain text
 #: deb-version.5:34
@@ -1608,7 +1702,7 @@
 #: deb-version.5:39
 msgid ""
 "The comparison behavior of the package management system with respect to the "
-"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"I<upstream-version> is described below. The I<upstream-version> portion of "
 "the version number is mandatory."
 msgstr ""
 "Hur pakethanteraren jämför versionsnummer när det gäller I<uppströmsversion> "
@@ -1618,9 +1712,9 @@
 #. type: Plain text
 #: deb-version.5:48
 msgid ""
-"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"The I<upstream-version> may contain only alphanumerics (\"A-Za-z0-9\") and "
 "the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
-"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"tilde) and should start with a digit.  If there is no I<debian-revision> "
 "then hyphens are not allowed; if there is no I<epoch> then colons are not "
 "allowed."
 msgstr ""
@@ -1633,8 +1727,8 @@
 #. type: TP
 #: deb-version.5:48
 #, no-wrap
-msgid "I<debian_revision>"
-msgstr "B<debianuppdatering>"
+msgid "I<debian-revision>"
+msgstr "I<debianuppdatering>"
 
 #. type: Plain text
 #: deb-version.5:57
@@ -1642,7 +1736,7 @@
 "This part of the version number specifies the version of the Debian package "
 "based on the upstream version.  It may contain only alphanumerics and the "
 "characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
-"same way as the I<upstream_version> is."
+"same way as the I<upstream-version> is."
 msgstr ""
 "Denna del av versionsnumret anger versionen för Debianpaketet som baserats "
 "på uppströmsversionen. Den kan endast innehålla alfanumeriska tecken samt "
@@ -1652,7 +1746,7 @@
 #. type: Plain text
 #: deb-version.5:64
 msgid ""
-"It is optional; if it isn't present then the I<upstream_version> may not "
+"It is optional; if it isn't present then the I<upstream-version> may not "
 "contain a hyphen.  This format represents the case where a piece of software "
 "was written specifically to be turned into a Debian package, and so there is "
 "only one \"debianisation\" of it and therefore no revision indication is "
@@ -1667,8 +1761,8 @@
 #. type: Plain text
 #: deb-version.5:68
 msgid ""
-"It is conventional to restart the I<debian_revision> at '1' each time time "
-"the I<upstream_version> is increased."
+"It is conventional to restart the I<debian-revision> at '1' each time time "
+"the I<upstream-version> is increased."
 msgstr ""
 "Vanligtvis börjar I<debianuppdatering> om på \"1\" varje gång "
 "I<uppströmsversion> ökas."
@@ -1677,9 +1771,9 @@
 #: deb-version.5:76
 msgid ""
 "Dpkg will break the version number apart at the last hyphen in the string "
-"(if there is one) to determine the I<upstream_version> and "
-"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
-"than the presence of one (but note that the I<debian_revision> is the least "
+"(if there is one) to determine the I<upstream-version> and I<debian-"
+"revision>. The absence of a I<debian-revision> compares earlier than the "
+"presence of one (but note that the I<debian-revision> is the least "
 "significant part of the version number)."
 msgstr ""
 "Dpkg delar upp versionsnumret vid det sista bindestrecket i strängen (om "
@@ -1697,7 +1791,7 @@
 #. type: Plain text
 #: deb-version.5:80
 msgid ""
-"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"The I<upstream-version> and I<debian-revision> parts are compared by the "
 "package management system using the same algorithm:"
 msgstr ""
 "Pakethanteringssystemet använder samma algoritm för att jämföra "
@@ -1792,11 +1886,11 @@
 msgstr "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
 
 #. type: SH
-#: deb-version.5:120 dpkg.1:797 dpkg-buildpackage.1:256 dpkg-distaddfile.1:47
-#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:455
+#: deb-version.5:120 dpkg.1:783 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:460
 #: dpkg-maintscript-helper.1:128 dpkg-parsechangelog.1:123
-#: dpkg-shlibdeps.1:331 dpkg-source.1:706 dselect.1:458
-#: start-stop-daemon.8:294 update-alternatives.8:493
+#: dpkg-shlibdeps.1:329 dpkg-source.1:730 dselect.1:451
+#: start-stop-daemon.8:323 update-alternatives.8:494
 #, no-wrap
 msgid "AUTHORS"
 msgstr "FÖRFATTARE"
@@ -1807,18 +1901,18 @@
 msgstr "Upphovsrättsskyddat © 1996,1997,1998 Ian Jackson och Christian Schwarz"
 
 #. type: Plain text
-#: deb-version.5:124 dpkg-buildpackage.1:262
+#: deb-version.5:124 dpkg-buildpackage.1:263
 msgid "Copyright \\(co 2007 Frank Lichtenheld"
 msgstr "Upphovsrättsskyddat © 2007 Frank Lichtenheld"
 
 #. type: Plain text
-#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:125
-#: dpkg-buildpackage.1:266 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
-#: dpkg-deb.1:256 dpkg-divert.8:139 dpkg-genchanges.1:154
-#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:459 dpkg-maintscript-helper.1:139
-#: dpkg-mergechangelogs.1:71 dpkg-name.1:107 dpkg-parsechangelog.1:131
-#: dpkg-query.1:211 dpkg-shlibdeps.1:341 dpkg-source.1:714 dpkg-split.1:233
-#: dpkg-statoverride.8:92 dpkg-vendor.1:53 update-alternatives.8:500
+#: deb-version.5:126 deb-substvars.5:167 dpkg-buildflags.1:273
+#: dpkg-buildpackage.1:267 dpkg-checkbuilddeps.1:44 dpkg-distaddfile.1:53
+#: dpkg-deb.1:269 dpkg-divert.8:139 dpkg-genchanges.1:154
+#: dpkg-gencontrol.1:150 dpkg-gensymbols.1:464 dpkg-maintscript-helper.1:139
+#: dpkg-mergechangelogs.1:71 dpkg-name.1:108 dpkg-parsechangelog.1:131
+#: dpkg-query.1:219 dpkg-shlibdeps.1:339 dpkg-source.1:738 dpkg-split.1:227
+#: dpkg-statoverride.8:91 dpkg-vendor.1:53 update-alternatives.8:501
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO WARRANTY."
@@ -1832,12 +1926,6 @@
 msgid "deb-old"
 msgstr "deb-old"
 
-#. type: TH
-#: deb-old.5:1
-#, no-wrap
-msgid "2006-02-28"
-msgstr "2006-02-28"
-
 #. type: Plain text
 #: deb-old.5:4
 msgid "deb-old - old style Debian binary package format"
@@ -1935,12 +2023,6 @@
 msgstr "deb-override"
 
 #. type: TH
-#: deb-override.5:15
-#, no-wrap
-msgid "2007-03-07"
-msgstr "2007-03-07"
-
-#. type: TH
 #: deb-override.5:15 deb-extra-override.5:1 deb-shlibs.5:16 deb-substvars.5:2
 #: deb-symbols.5:2 deb-triggers.5:1 dpkg-architecture.1:1
 #: dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1
@@ -2142,8 +2224,8 @@
 
 #. type: Plain text
 #: deb-shlibs.5:34
-msgid "[I<type:>] I<library> I<version> I<dependencies>"
-msgstr "[I<typ:>] I<bibliotek> I<version> I<beroenden>"
+msgid "[I<type>B<:>] I<library> I<version> I<dependencies>"
+msgstr "[I<typ>B<:>] I<bibliotek> I<version> I<beroenden>"
 
 #. type: Plain text
 #: deb-shlibs.5:38
@@ -2162,8 +2244,8 @@
 msgstr "Se Debians policymanual för ytterligare detaljer."
 
 #. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:728 dpkg-architecture.1:263
-#: dpkg-divert.8:91 dpkg-name.1:64 update-alternatives.8:458
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:714 dpkg-architecture.1:262
+#: dpkg-divert.8:91 dpkg-name.1:65 update-alternatives.8:459
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "EXEMPEL"
@@ -2545,11 +2627,11 @@
 "genereras och ett tomt värde används."
 
 #. type: SH
-#: deb-substvars.5:145 dpkg.1:641 dpkg-architecture.1:285 dpkg.cfg.5:12
-#: dpkg-buildflags.1:103 dpkg-distaddfile.1:39 dpkg-divert.8:122
+#: deb-substvars.5:145 dpkg.1:627 dpkg-architecture.1:284 dpkg.cfg.5:12
+#: dpkg-buildflags.1:121 dpkg-distaddfile.1:39 dpkg-divert.8:122
 #: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
-#: dpkg-split.1:212 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:361
+#: dpkg-split.1:206 dpkg-statoverride.8:74 dselect.cfg.5:12
+#: update-alternatives.8:360
 #, no-wrap
 msgid "FILES"
 msgstr "FILER"
@@ -2566,15 +2648,15 @@
 msgstr "Lista över substitueringsvariabler och -värden."
 
 #. type: SH
-#: deb-substvars.5:150 dpkg.1:794 dpkg-buildpackage.1:244 dpkg-deb.1:225
-#: dpkg-name.1:85 dpkg-source.1:698 dpkg-split.1:197 dselect.1:436
-#: update-alternatives.8:485
+#: deb-substvars.5:150 dpkg.1:780 dpkg-buildpackage.1:244 dpkg-deb.1:238
+#: dpkg-name.1:86 dpkg-source.1:722 dpkg-split.1:199 dselect.1:429
+#: update-alternatives.8:486
 #, no-wrap
 msgid "BUGS"
 msgstr "PROGRAMFEL"
 
 #. type: Plain text
-#: deb-substvars.5:153 dpkg-source.1:701
+#: deb-substvars.5:153 dpkg-source.1:725
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -2592,27 +2674,27 @@
 "(1), B<dpkg-source>(1)."
 
 #. type: SH
-#: deb-substvars.5:161 dpkg-architecture.1:304 dpkg.cfg.5:19
-#: dpkg-buildflags.1:120 dpkg-checkbuilddeps.1:40 dpkg-deb.1:252
-#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:103
-#: dpkg-query.1:206 dpkg-scansources.1:77 dpkg-split.1:229
-#: dpkg-statoverride.8:88 dpkg-vendor.1:48 dselect.cfg.5:19
+#: deb-substvars.5:161 dpkg-architecture.1:303 dpkg.cfg.5:19
+#: dpkg-buildflags.1:266 dpkg-checkbuilddeps.1:40 dpkg-deb.1:265
+#: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:104
+#: dpkg-query.1:214 dpkg-scansources.1:76 dpkg-split.1:223
+#: dpkg-statoverride.8:87 dpkg-vendor.1:48 dselect.cfg.5:19
 #, no-wrap
 msgid "AUTHOR"
 msgstr "FÖRFATTARE"
 
 #. type: Plain text
-#: deb-substvars.5:163 dpkg-buildpackage.1:258 dpkg-distaddfile.1:49
-#: dpkg-deb.1:254 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:333 dpkg-source.1:708
-#: dpkg-split.1:231
+#: deb-substvars.5:163 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
+#: dpkg-deb.1:267 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:331 dpkg-source.1:732
+#: dpkg-split.1:225
 msgid "Copyright \\(co 1995-1996 Ian Jackson"
 msgstr "Upphovsrättsskyddat © 1995-1996 Ian Jackson"
 
 #. type: Plain text
-#: deb-substvars.5:165 dpkg-buildpackage.1:260 dpkg-distaddfile.1:51
+#: deb-substvars.5:165 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
 #: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
-#: dpkg-shlibdeps.1:335 dpkg-source.1:710 dpkg-statoverride.8:90
+#: dpkg-shlibdeps.1:333 dpkg-source.1:734 dpkg-statoverride.8:89
 msgid "Copyright \\(co 2000 Wichert Akkerman"
 msgstr "Upphovsrättsskyddat © 2000 Wichert Akkerman"
 
@@ -2622,12 +2704,6 @@
 msgid "deb-symbols"
 msgstr "deb-symbols"
 
-#. type: TH
-#: deb-symbols.5:2
-#, no-wrap
-msgid "2007-07-16"
-msgstr "2007-07-16"
-
 #. type: Plain text
 #: deb-symbols.5:5
 msgid "deb-symbols - Debian's extended shared library information file"
@@ -2649,13 +2725,13 @@
 
 #. type: Plain text
 #: deb-symbols.5:14
-msgid "E<lt>library sonameE<gt> E<lt>main dependency templateE<gt>"
-msgstr "E<lt>biblioteks-sonamnE<gt> E<lt>huvudberoendemallE<gt>"
+msgid "I<library-soname main-dependency-template>"
+msgstr "I<biblioteks-sonamn huvudberoendemall>"
 
 #. type: Plain text
 #: deb-symbols.5:16
-msgid "[ | E<lt>alternative dependency templateE<gt> ]"
-msgstr "[ | E<lt>alternativ beroendemallE<gt> ]"
+msgid "[ | I<alternative-dependency-template> ]"
+msgstr "[ | I<alternativ-beroendemall> ]"
 
 #. type: Plain text
 #: deb-symbols.5:18
@@ -2664,31 +2740,31 @@
 
 #. type: Plain text
 #: deb-symbols.5:20
-msgid "[ * E<lt>field-nameE<gt>: E<lt>field valueE<gt> ]"
-msgstr "[ * E<lt>fältnamnE<gt>: E<lt>fältvärdeE<gt> ]"
+msgid "[ * I<field-name>: I<field-value> ]"
+msgstr "[ * I<fältnamn>: I<fältvärde> ]"
 
 #. type: Plain text
 #: deb-symbols.5:23
 #, no-wrap
 msgid ""
 "[ ... ]\n"
-" E<lt>symbolE<gt> E<lt>minimal versionE<gt>[ E<lt>id of dependency templateE<gt> ]\n"
+" I<symbol> I<minimal-version>[ I<id-of-dependency-template> ]\n"
 msgstr ""
 "[ … ]\n"
-" E<lt>symbolE<gt> E<lt>minsta versionE<gt>[ E<lt>id för beroendemallE<gt> ]\n"
+" I<symbol> I<minsta-version>[ I<id för beroendemall> ]\n"
 
 #. type: Plain text
 #: deb-symbols.5:29
 msgid ""
-"The I<library soname> is exactly the value of the SONAME field as exported "
-"by B<objdump>(1). A I<dependency template> is a dependency where I<#MINVER#> "
-"is dynamically replaced either by a version check like \"(E<gt>= I<minimal "
+"The I<library-soname> is exactly the value of the SONAME field as exported "
+"by B<objdump>(1). A I<dependency-template> is a dependency where I<#MINVER#> "
+"is dynamically replaced either by a version check like \"(E<gt>= I<minimal-"
 "version>)\" or by nothing (if an unversioned dependency is deemed "
 "sufficient)."
 msgstr ""
 "I<Biblioteks-sonamn> är det exakta värdet från SONAME-fältet, som det "
 "exporteras från B<objdump>(1). En I<beroendemall> är ett beroende där "
-"I<#MINVER#> dynamiskt ersätts av en versionskontrollrad \"(E<gt>= I<minsta "
+"I<#MINVER#> dynamiskt ersätts av en versionskontrollrad \"(E<gt>= I<minsta-"
 "version>)\" eller av ingenting (om ett ej versionsstyrt beroende anses "
 "tillräckligt)."
 
@@ -2696,14 +2772,14 @@
 #: deb-symbols.5:36
 msgid ""
 "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> being "
-"\"Base\" if the library is not versioned) is associated to a I<minimal "
+"\"Base\" if the library is not versioned) is associated to a I<minimal-"
 "version> of its dependency template (the main dependency template is used if "
-"I<id of dependency template> is not present). The first alternative "
+"I<id-of-dependency-template> is not present). The first alternative "
 "dependency template is numbered 1, the second one 2, etc."
 msgstr ""
 "Varje exporterad I<symbol> (anges som I<namn>@I<version>, där I<version> är "
-"\"Base\" om biblioteket inte är versionsstyrt) associeras med en I<minsta "
-"version> i sin beroendemall (huvudberoendemallen används om I<id för "
+"\"Base\" om biblioteket inte är versionsstyrt) associeras med en I<minsta-"
+"version> i sin beroendemall (huvudberoendemallen används om I<id-för-"
 "beroendemall> inte finns). Den första alternativa beroendemallen får nummer "
 "1, den andra 2, osv."
 
@@ -2713,15 +2789,15 @@
 "Each entry for a library can also have some fields of meta-information.  "
 "Those fields are stored on lines starting with an asterisk. Currently, the "
 "only valid field is I<Build-Depends-Package>, it indicates the name of the "
-"\"-dev\" package associated to the library and is used by dpkg-shlibdeps to "
-"make sure that the dependency generated is at least as strict as the "
+"\"-dev\" package associated to the library and is used by B<dpkg-shlibdeps> "
+"to make sure that the dependency generated is at least as strict as the "
 "corresponding build dependency."
 msgstr ""
 "Alla poster i ett bibliotek kan även innehålla några fält med "
 "metainformation. Dessa fält lagras på rader som börjar med en asterisk. För "
 "närvarande är det enda giltiga fältet I<Build-Depends-Package>, vilket anger "
-"namnet på det \"-dev\"-paket som hör till biblioteket, och används av dpkg-"
-"shlibdeps för att se till att det beroende som genereras är åtminstone lika "
+"namnet på det \"-dev\"-paket som hör till biblioteket, och används av B<dpkg-"
+"shlibdeps> för att se till att det beroende som genereras är åtminstone lika "
 "strikt som motsvarande byggberoende."
 
 #. type: SS
@@ -2792,12 +2868,6 @@
 msgid "deb-triggers"
 msgstr "deb-triggers"
 
-#. type: TH
-#: deb-triggers.5:1 dpkg-trigger.1:1
-#, no-wrap
-msgid "2009-03-15"
-msgstr "2009-03-15"
-
 #. type: Plain text
 #: deb-triggers.5:4
 msgid "deb-triggers - package triggers"
@@ -2841,36 +2911,55 @@
 msgstr "B<interest> I<utlösarnamn>"
 
 #. type: Plain text
-#: deb-triggers.5:27
+#: deb-triggers.5:26
+msgid "B<interest-noawait> I<trigger-name>"
+msgstr "B<interest-noawait> I<utlösarnamn>"
+
+#. type: Plain text
+#: deb-triggers.5:33
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file."
+"triggers control file. The \"noawait\" variant does not put the triggering "
+"packages in triggers-awaited state. This should be used when the "
+"functionality provided by the trigger is not crucial."
 msgstr ""
 "Anger att paketet är intresserat av den namngivna utlösaren. Alla utlösare "
 "som ett paket är intresserat av måste listas genom att använda detta "
-"direktiv i utlösar-styrfilen."
+"direktiv i utlösar-styrfilen. Varianten \"noawait\" sätter inte det "
+"utlösande paketet i avvaktande tillstånd. Detta bör användas när "
+"funktionaliteten som tillhandahålls av utlösaren inte är avgörande."
 
 #. type: Plain text
-#: deb-triggers.5:31
+#: deb-triggers.5:37
 msgid "B<activate> I<trigger-name>"
 msgstr "B<activate> I<utlösarnamn>"
 
 #. type: Plain text
-#: deb-triggers.5:37
+#: deb-triggers.5:41
+msgid "B<activate-noawait> I<trigger-name>"
+msgstr "B<activate-noawait> I<utlösarnamn>"
+
+#. type: Plain text
+#: deb-triggers.5:50
 msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure."
+"conflicting package), purge and deconfigure.  The \"noawait\" variant does "
+"not put the triggering packages in triggers-awaited state. This should be "
+"used when the functionality provided by the trigger is not crucial."
 msgstr ""
 "Gör så att ändringar av detta pakets tillstånd aktiverar den angivna "
 "utlösaren. Utlösaren aktiveras när en av följande operationer påbörjas: "
 "uppackning, konfigurering, borttagning (också när det tas bort till fördel "
 "av ett paket det står i konflikt med), rensning och avkonfigurering."
+"Varianten \"noawait\" sätter inte de utlösande paketen i avvaktande "
+"tillstånd. Detta bör användas när funktionaliteten som tillhandahålls av "
+"utlösaren inte är avgörande."
 
 #. type: Plain text
-#: deb-triggers.5:45
+#: deb-triggers.5:58
 msgid ""
 "If this package disappears during the unpacking of another package the "
 "trigger will be activated when the disappearance is noted towards the end of "
@@ -2885,7 +2974,7 @@
 "som omnämns i gamla och nya versioner av paketet att aktiveras."
 
 #. type: Plain text
-#: deb-triggers.5:48
+#: deb-triggers.5:61
 msgid ""
 "Unknown directives are an error which will prevent installation of the "
 "package."
@@ -2893,7 +2982,20 @@
 "Okända direktiv är ett fel som förhindrar paketet från att installeras."
 
 #. type: Plain text
-#: deb-triggers.5:52
+#: deb-triggers.5:66
+msgid ""
+"The \"-noawait\" variants are only supported by dpkg 1.16.1 or newer, and "
+"will lead to errors if used with an older dpkg. It is thus recommended to "
+"add a \"Pre-Depends: dpkg (E<gt>= 1.16.1)\" to any package that wish to use "
+"those directives."
+msgstr ""
+"Varianterna med \"-noawait\" stöds endast av dpkg 1.16.1 och senare, och "
+"kommer leda till fel om de används med äldre versioner av dpkg. Det "
+"rekommenderas därför att du lägger till ett \"Pre-Depends: dpkg (E<gt>= "
+"1.16.1)\" till eventuella paket som vill använda dessa direktiv."
+
+#. type: Plain text
+#: deb-triggers.5:70
 msgid ""
 "B<dpkg-trigger>(1), B<dpkg>(1), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
 msgstr ""
@@ -2906,13 +3008,6 @@
 msgstr "dpkg"
 
 #. type: TH
-#: dpkg.1:1
-#, fuzzy, no-wrap
-#| msgid "2009-02-27"
-msgid "2011-02-05"
-msgstr "2009-02-27"
-
-#. type: TH
 #: dpkg.1:1 dpkg.cfg.5:1 dpkg-buildflags.1:1 dpkg-deb.1:1
 #: dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1 dpkg-query.1:1
 #: dpkg-trigger.1:1 dpkg-vendor.1:1 dselect.cfg.5:1
@@ -2927,8 +3022,8 @@
 
 #. type: Plain text
 #: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
-msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
+msgid "B<dpkg> [I<option>...] I<action>"
+msgstr "B<dpkg> [I<flagga>...] I<åtgärd>"
 
 #. type: SH
 #: dpkg.1:9
@@ -2976,51 +3071,30 @@
 "flaggorna styr på vilket sätt åtgärden skall utföras."
 
 #. type: Plain text
-#: dpkg.1:31
-msgid ""
-"B<dpkg> can 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>(1). 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 parametrar som angivits:"
-
-#. type: Plain text
-#: dpkg.1:40
-#, no-wrap
+#: dpkg.1:33
 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."
+"B<dpkg> can also be used as a front-end to B<dpkg-deb>(1) and B<dpkg-query>"
+"(1). The list of supported actions can be found later on in the B<ACTIONS> "
+"section. If any such action is encountered B<dpkg> just runs B<dpkg-deb> or "
+"B<dpkg-query> with the parameters given to it, but no specific options are "
+"currently passed to them, to use any such option the back-ends need to be "
+"called directly."
+msgstr ""
+"B<dpkg> kan också användas som ett skal runt B<dpkg-deb>(1) och B<dpkg-query>"
+"(1). En förteckning över tillgängliga åtgärder beskrivs nedan i stycket "
+"B<ÅTGÄRDER>. Om B<dpkg> upptäcker en sådan åtgärd anropas bara B<dpkg-dpkg> "
+"eller B<dpkg-query> med de givna flaggorna, men inga specifika flaggor sänds "
+"direkt till dem, för att använda sådana flaggor måste bakgrundsprogrammen "
+"anropas direkt."
 
 #. type: SH
-#: dpkg.1:43
+#: dpkg.1:34
 #, no-wrap
 msgid "INFORMATION ABOUT PACKAGES"
 msgstr "INFORMATION OM PAKET"
 
 #. type: Plain text
-#: dpkg.1:48
+#: dpkg.1:39
 msgid ""
 "B<dpkg> maintains some usable information about available packages. The "
 "information is divided in three classes: B<states>, B<selection states> and "
@@ -3032,41 +3106,41 @@
 "B<dselect>."
 
 #. type: SS
-#: dpkg.1:48
+#: dpkg.1:39
 #, no-wrap
 msgid "PACKAGE STATES"
 msgstr "PAKETTILLSTÅND"
 
 #. type: TP
-#: dpkg.1:49
+#: dpkg.1:40
 #, no-wrap
 msgid "B<not-installed>"
 msgstr "B<ej installerat>"
 
 #. type: Plain text
-#: dpkg.1:52
+#: dpkg.1:43
 msgid "The package is not installed on your system."
 msgstr "Paketet är inte installerat på ditt system."
 
 #. type: TP
-#: dpkg.1:52
+#: dpkg.1:43
 #, no-wrap
 msgid "B<config-files>"
 msgstr "B<konfigurationsfiler>"
 
 #. type: Plain text
-#: dpkg.1:55
+#: dpkg.1:46
 msgid "Only the configuration files of the package exist on the system."
 msgstr "Endast konfigurationsfilerna för paketet finns på systemet."
 
 #. type: TP
-#: dpkg.1:55
+#: dpkg.1:46
 #, no-wrap
 msgid "B<half-installed>"
 msgstr "B<halvt installerat>"
 
 #. type: Plain text
-#: dpkg.1:59
+#: dpkg.1:50
 msgid ""
 "The installation of the package has been started, but not completed for some "
 "reason."
@@ -3074,24 +3148,24 @@
 "Installationen av paketet har påbörjats, men av någon orsak inte slutförts."
 
 #. type: TP
-#: dpkg.1:59
+#: dpkg.1:50
 #, no-wrap
 msgid "B<unpacked>"
 msgstr "B<uppackat>"
 
 #. type: Plain text
-#: dpkg.1:62
+#: dpkg.1:53
 msgid "The package is unpacked, but not configured."
 msgstr "Paketet är uppackat, men inte konfigurerat."
 
 #. type: TP
-#: dpkg.1:62
+#: dpkg.1:53
 #, no-wrap
 msgid "B<half-configured>"
 msgstr "B<halvt konfigurerat>"
 
 #. type: Plain text
-#: dpkg.1:66
+#: dpkg.1:57
 msgid ""
 "The package is unpacked and configuration has been started, but not yet "
 "completed for some reason."
@@ -3100,63 +3174,63 @@
 "inte slutförts."
 
 #. type: TP
-#: dpkg.1:66
+#: dpkg.1:57
 #, no-wrap
 msgid "B<triggers-awaited>"
 msgstr "B<väntar på utlösare>"
 
 #. type: Plain text
-#: dpkg.1:69
+#: dpkg.1:60
 msgid "The package awaits trigger processing by another package."
 msgstr "Paketet väntar på hantering av utlösare av ett annat paket."
 
 #. type: TP
-#: dpkg.1:69
+#: dpkg.1:60
 #, no-wrap
 msgid "B<triggers-pending>"
 msgstr "B<utlösare väntar>"
 
 #. type: Plain text
-#: dpkg.1:72
+#: dpkg.1:63
 msgid "The package has been triggered."
 msgstr "Paketet har utlösts."
 
 #. type: TP
-#: dpkg.1:72
+#: dpkg.1:63
 #, no-wrap
 msgid "B<installed>"
 msgstr "B<installerat>"
 
 #. type: Plain text
-#: dpkg.1:75
+#: dpkg.1:66
 msgid "The package is unpacked and configured OK."
 msgstr "Paketet är uppackat och korrekt inställt."
 
 #. type: SS
-#: dpkg.1:75
+#: dpkg.1:66
 #, no-wrap
 msgid "PACKAGE SELECTION STATES"
 msgstr "MARKERINGSTILLSTÅND FÖR PAKET"
 
 #. type: TP
-#: dpkg.1:76
+#: dpkg.1:67
 #, no-wrap
 msgid "B<install>"
 msgstr "B<installera>"
 
 #. type: Plain text
-#: dpkg.1:79
+#: dpkg.1:70
 msgid "The package is selected for installation."
 msgstr "Paketet är markerat för installation."
 
 #. type: TP
-#: dpkg.1:79
+#: dpkg.1:70
 #, no-wrap
 msgid "B<hold>"
 msgstr "B<håll>"
 
 #. type: Plain text
-#: dpkg.1:83
+#: dpkg.1:74
 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>."
@@ -3165,13 +3239,13 @@
 "det framtvingas med flaggan B<--force-hold>."
 
 #. type: TP
-#: dpkg.1:83
+#: dpkg.1:74
 #, no-wrap
 msgid "B<deinstall>"
 msgstr "B<ta bort>"
 
 #. type: Plain text
-#: dpkg.1:87
+#: dpkg.1:78
 msgid ""
 "The package is selected for deinstallation (i.e. we want to remove all "
 "files, except configuration files)."
@@ -3180,13 +3254,13 @@
 "förutom konfigurationsfilerna)."
 
 #. type: TP
-#: dpkg.1:87
+#: dpkg.1:78
 #, no-wrap
 msgid "B<purge>"
 msgstr "B<rensa>"
 
 #. type: Plain text
-#: dpkg.1:91
+#: dpkg.1:82
 msgid ""
 "The package is selected to be purged (i.e. we want to remove everything from "
 "system directories, even configuration files)."
@@ -3195,19 +3269,19 @@
 "systemkataloger, även konfigurationsfiler)."
 
 #. type: SS
-#: dpkg.1:91
+#: dpkg.1:82
 #, no-wrap
 msgid "PACKAGE FLAGS"
 msgstr "PAKETFLAGGOR"
 
 #. type: TP
-#: dpkg.1:92
+#: dpkg.1:83
 #, no-wrap
 msgid "B<reinst-required>"
 msgstr "B<ominstallation krävs>"
 
 #. type: Plain text
-#: dpkg.1:97
+#: dpkg.1:88
 msgid ""
 "A package marked B<reinst-required> is broken and requires reinstallation. "
 "These packages cannot be removed, unless forced with option B<--force-remove-"
@@ -3218,38 +3292,38 @@
 "med flaggan B<--force-remove-reinstreq>."
 
 #. type: SH
-#: dpkg.1:98
+#: dpkg.1:89 dselect.1:120
 #, no-wrap
 msgid "ACTIONS"
 msgstr "ÅTGÄRDER"
 
 #. type: TP
-#: dpkg.1:99
+#: dpkg.1:90
 #, no-wrap
-msgid "B<-i>, B<--install> I<package_file>..."
+msgid "B<-i>, B<--install> I<package-file>..."
 msgstr "B<-i>, B<--install> I<paketfil>..."
 
 #. type: Plain text
-#: dpkg.1:103
+#: dpkg.1:94
 msgid ""
 "Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"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:105
+#: dpkg.1:96
 msgid "Installation consists of the following steps:"
 msgstr "Installationen består av följande steg:"
 
 #. type: Plain text
-#: dpkg.1:108
+#: dpkg.1:99
 msgid "B<1.> Extract the control files of the new package."
 msgstr "B<1.> Extrahera styrfilerna ur paketet."
 
 #. type: Plain text
-#: dpkg.1:112
+#: dpkg.1:103
 msgid ""
 "B<2.> If another version of the same package was installed before the new "
 "installation, execute I<prerm> script of the old package."
@@ -3258,12 +3332,12 @@
 "nyinstallationen exekveras I<prerm>-skriptet för det gamla paketet."
 
 #. type: Plain text
-#: dpkg.1:115
+#: dpkg.1:106
 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:119
+#: dpkg.1:110
 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."
@@ -3272,7 +3346,7 @@
 "filerna så att de kan återställas om någonting går fel."
 
 #. type: Plain text
-#: dpkg.1:126
+#: dpkg.1:117
 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 "
@@ -3285,7 +3359,7 @@
 "eftersom de nya filerna skrivs samtidigt som de gamla tas bort."
 
 #. type: Plain text
-#: dpkg.1:130
+#: dpkg.1:121
 msgid ""
 "B<6.> Configure the package. See B<--configure> for detailed information "
 "about how this is done."
@@ -3294,28 +3368,28 @@
 "hur man gör det."
 
 #. type: TP
-#: dpkg.1:130
+#: dpkg.1:121
 #, no-wrap
-msgid "B<--unpack >I<package_file>..."
+msgid "B<--unpack >I<package-file>..."
 msgstr "B<--unpack >I<paketfil> ..."
 
 #. type: Plain text
-#: dpkg.1:135
+#: dpkg.1:126
 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."
+"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:135
+#: dpkg.1:126
 #, no-wrap
 msgid "B<--configure >I<package>...|B<-a>|B<--pending>"
 msgstr "B<--configure >I<paket>...|B<-a>|B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:140
+#: dpkg.1:131
 msgid ""
 "Configure a package which has been unpacked but not yet configured.  If B<-"
 "a> or B<--pending> is given instead of I<package>, all unpacked but "
@@ -3326,7 +3400,7 @@
 "som har packats upp men ännu inte konfigurerats."
 
 #. type: Plain text
-#: dpkg.1:144
+#: dpkg.1:135
 msgid ""
 "To reconfigure a package which has already been configured, try the B<dpkg-"
 "reconfigure>(8)  command instead."
@@ -3335,12 +3409,12 @@
 "använda kommandot B<dpkg-reconfigure(8)>."
 
 #. type: Plain text
-#: dpkg.1:146
+#: dpkg.1:137
 msgid "Configuring consists of the following steps:"
 msgstr "Konfigurering består av följande steg:"
 
 #. type: Plain text
-#: dpkg.1:151
+#: dpkg.1:142
 msgid ""
 "B<1.> Unpack the conffiles, and at the same time back up the old conffiles, "
 "so that they can be restored if something goes wrong."
@@ -3349,18 +3423,18 @@
 "gamla konfigurationsfilerna så att de kan återställas om någonting går fel."
 
 #. type: Plain text
-#: dpkg.1:154
+#: dpkg.1:145
 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:154
+#: dpkg.1:145
 #, no-wrap
 msgid "B<--triggers-only> I<package>...|B<-a>|B<--pending>"
 msgstr "B<--triggers-only> I<paket>...|B<-a>|B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:161
+#: dpkg.1:152
 msgid ""
 "Processes only triggers. All pending triggers will be processed. If package "
 "names are supplied only those packages' triggers will be processed, exactly "
@@ -3375,13 +3449,13 @@
 "Detta kan rättas senare genom att köra: B<dpkg --configure --pending>."
 
 #. type: TP
-#: dpkg.1:161
+#: dpkg.1:152
 #, no-wrap
 msgid "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 msgstr "B<-r>, B<--remove>, B<-P>, B<--purge >I<paket>...|B<-a>|B<--pending>"
 
 #. type: Plain text
-#: dpkg.1:178
+#: dpkg.1:169
 msgid ""
 "Remove an installed package. B<-r> or B<--remove> remove everything except "
 "conffiles. This may avoid having to reconfigure the package if it is "
@@ -3413,33 +3487,33 @@
 "som skrivs i enstaka användares hemkataloger."
 
 #. type: Plain text
-#: dpkg.1:180
+#: dpkg.1:171
 msgid "Removing of a package consists of the following steps:"
 msgstr "Borttagning av ett paket består av följande steg:"
 
 #. type: Plain text
-#: dpkg.1:183
+#: dpkg.1:174
 msgid "B<1.> Run I<prerm> script"
 msgstr "B<1.> Kör I<prerm>-skriptet"
 
 #. type: Plain text
-#: dpkg.1:186
+#: dpkg.1:177
 msgid "B<2.> Remove the installed files"
 msgstr "B<2.> Ta bort de installerade filerna"
 
 #. type: Plain text
-#: dpkg.1:189
+#: dpkg.1:180
 msgid "B<3.> Run I<postrm> script"
 msgstr "B<3.> Kör I<postrm>-skriptet"
 
 #. type: TP
-#: dpkg.1:190
+#: dpkg.1:181
 #, no-wrap
 msgid "B<--update-avail>, B<--merge-avail> I<Packages-file>"
 msgstr "B<--update-avail>, B<--merge-avail> I<Packages-fil>"
 
 #. type: Plain text
-#: dpkg.1:199
+#: dpkg.1:190
 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 "
@@ -3456,7 +3530,7 @@
 "behåller sin lista över tillgängliga paket i I</var/lib/dpkg/available>."
 
 #. type: Plain text
-#: dpkg.1:204
+#: dpkg.1:195
 msgid ""
 "A simpler one-shot command to retrieve and update the I<available> file is "
 "B<dselect update>. Note that this file is mostly useless if you don't use "
@@ -3469,30 +3543,30 @@
 "system för att hålla reda på tillgängliga paket."
 
 #. type: TP
-#: dpkg.1:204
+#: dpkg.1:195
 #, no-wrap
-msgid "B<-A>, B<--record-avail> I<package_file>..."
+msgid "B<-A>, B<--record-avail> I<package-file>..."
 msgstr "B<-A>, B<--record-avail> I<paketfil> ..."
 
 #. type: Plain text
-#: dpkg.1:210
+#: dpkg.1:201
 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."
+"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 ""
 "Uppdatera B<dpkg>s och B<dselect>s lista över vilka paket som finns "
 "tillgängliga med information från paketet I<paketfil>. Om flaggan B<--"
 "recursive> eller B<-R> anges måste I<paketfil> istället vara en katalog."
 
 #. type: TP
-#: dpkg.1:210
+#: dpkg.1:201
 #, no-wrap
 msgid "B<--forget-old-unavail>"
 msgstr "B<--forget-old-unavail>"
 
 #. type: Plain text
-#: dpkg.1:214
+#: dpkg.1:205
 msgid ""
 "Now B<obsolete> and a no-op as B<dpkg> will automatically forget uninstalled "
 "unavailable packages."
@@ -3501,24 +3575,24 @@
 "automatiskt glömmer ej installerade och ej tillgängliga paket."
 
 #. type: TP
-#: dpkg.1:214
+#: dpkg.1:205
 #, no-wrap
 msgid "B<--clear-avail>"
 msgstr "B<--clear-avail>"
 
 #. type: Plain text
-#: dpkg.1:217
+#: dpkg.1:208
 msgid "Erase the existing information about what packages are available."
 msgstr "Radera existerande information om vilka paket som är tillgängliga."
 
 #. type: TP
-#: dpkg.1:217
+#: dpkg.1:208
 #, no-wrap
 msgid " B<-C>, B<--audit>"
 msgstr " B<-C>, B<--audit>"
 
 #. type: Plain text
-#: dpkg.1:222
+#: dpkg.1:213
 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."
@@ -3527,13 +3601,13 @@
 "kommer att föreslå vad som behöver göras för att få dem att fungera."
 
 #. type: TP
-#: dpkg.1:222
+#: dpkg.1:213
 #, no-wrap
 msgid "B<--get-selections> [I<package-name-pattern>...]"
 msgstr "B<--get-selections> [I<paketnamnsmönster>...]"
 
 #. type: Plain text
-#: dpkg.1:227
+#: dpkg.1:218
 msgid ""
 "Get list of package selections, and write it to stdout. Without a pattern, "
 "non-installed packages (i.e. those which have been previously purged)  will "
@@ -3544,32 +3618,32 @@
 "visas om inte ett mönster anges."
 
 #. type: TP
-#: dpkg.1:227 update-alternatives.8:300
+#: dpkg.1:218 update-alternatives.8:299
 #, no-wrap
 msgid "B<--set-selections>"
 msgstr "B<--set-selections>"
 
 #. type: Plain text
-#: dpkg.1:233
+#: dpkg.1:224
 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 format 'I<package> I<state>', where state is one of B<install>, B<hold>, "
+"B<deinstall> or B<purge>. Blank lines and comment lines beginning with '#' "
+"are also permitted."
 msgstr ""
 "Sätt paketvalslistan med den fil som läses från standard in. Filen måste "
-"vara på formatet \"E<lt>paketE<gt> E<lt>statusE<gt>\", där status är en av "
-"install, hold, deinstall eller purge. Tomrader och kommentarsrader som "
+"vara på formatet \"I<paket> I<status>\", där status är en av B<install>, "
+"B<hold>, B<deinstall> eller B<purge>. Tomrader och kommentarsrader som "
 "börjar med \"#\" är också tillåtna."
 
 #. type: TP
-#: dpkg.1:233
+#: dpkg.1:224
 #, no-wrap
 msgid "B<--clear-selections>"
 msgstr "B<--clear-selections>"
 
 #. type: Plain text
-#: dpkg.1:238
+#: dpkg.1:229
 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 "
@@ -3581,13 +3655,13 @@
 "selections."
 
 #. type: TP
-#: dpkg.1:238
+#: dpkg.1:229
 #, no-wrap
 msgid "B<--yet-to-unpack>"
 msgstr "B<--yet-to-unpack>"
 
 #. type: Plain text
-#: dpkg.1:242
+#: dpkg.1:233
 msgid ""
 "Searches for packages selected for installation, but which for some reason "
 "still haven't been installed."
@@ -3596,26 +3670,26 @@
 "ännu inte har installerats."
 
 #. type: TP
-#: dpkg.1:243
+#: dpkg.1:234
 #, no-wrap
 msgid "B<--print-architecture>"
 msgstr "B<--print-architecture>"
 
 #. type: Plain text
-#: dpkg.1:246
+#: dpkg.1:237
 msgid ""
 "Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr ""
 "Visa arkitektur för paketen B<dpkg> installerar (till exempel \"i386\")."
 
 #. type: TP
-#: dpkg.1:246
+#: dpkg.1:237
 #, no-wrap
 msgid "B<--compare-versions >I<ver1 op ver2>"
 msgstr "B<--compare-versions >I<ver1 op ver2>"
 
 #. type: Plain text
-#: dpkg.1:257
+#: dpkg.1:248
 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 "
@@ -3636,89 +3710,88 @@
 "styrfilssyntaxen: B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 
 #. type: TP
-#: dpkg.1:257
+#: dpkg.1:248
 #, no-wrap
-msgid "B<--command-fd >I<E<lt>nE<gt>>"
-msgstr "B<--command-fd >I<E<lt>nE<gt>>"
+msgid "B<--command-fd >I<n>"
+msgstr "B<--command-fd >I<n>"
 
 #. type: Plain text
-#: dpkg.1:262
+#: dpkg.1:253
 msgid ""
-"Accept a series of commands on input file descriptor I<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and through this file "
-"descriptor, are not reset for subsequent commands executed during the same "
-"run."
+"Accept a series of commands on input file descriptor I<n>. Note: additional "
+"options set on the command line, and through this file descriptor, are not "
+"reset for subsequent commands executed during the same run."
 msgstr ""
-"Läser en följd av kommandon från indatafilhandtag I<E<lt>nE<gt>>. Observera: "
+"Läser en följd av kommandon från indatafilhandtag I<n>. Observera: "
 "ytterligare flaggor som sätts på kommandoraden, och genom filhandtaget, "
 "återställs inte för kommandon som körs i en följd under samma körning."
 
 #. type: TP
-#: dpkg.1:262 dpkg-architecture.1:61 dpkg-buildflags.1:71 dpkg-divert.8:71
-#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:67 dpkg-statoverride.8:45
-#: dpkg-vendor.1:28 dselect.1:121 update-alternatives.8:317
+#: dpkg.1:253 dpkg-architecture.1:60 dpkg-buildflags.1:89 dpkg-divert.8:71
+#: dpkg-mergechangelogs.1:38 dpkg-scansources.1:66 dpkg-statoverride.8:44
+#: dpkg-vendor.1:28 dselect.1:113 update-alternatives.8:316
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 #. type: Plain text
-#: dpkg.1:265
+#: dpkg.1:256
 msgid "Display a brief help message."
 msgstr "Visar en kortfattad hjälptext."
 
 #. type: TP
-#: dpkg.1:265
+#: dpkg.1:256
 #, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--force-help>"
 
 #. type: Plain text
-#: dpkg.1:268
+#: dpkg.1:259
 msgid "Give help about the B<--force->I<thing> options."
 msgstr "Get hjälp om B<--force->I<nånting>-flaggorna."
 
 #. type: TP
-#: dpkg.1:268
+#: dpkg.1:259
 #, no-wrap
 msgid "B<-Dh>, B<--debug=help>"
 msgstr "B<-Dh>, B<--debug=help>"
 
 #. type: Plain text
-#: dpkg.1:271
+#: dpkg.1:262
 msgid "Give help about debugging options."
 msgstr "Ger hjälp om felsökningsflaggorna."
 
 #. type: TP
-#: dpkg.1:271 dpkg-architecture.1:64 dpkg-buildflags.1:74
+#: dpkg.1:262 dpkg-architecture.1:63 dpkg-buildflags.1:92
 #: dpkg-buildpackage.1:226 dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35
-#: dpkg-deb.1:166 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
-#: dpkg-query.1:107 dpkg-scanpackages.1:100 dpkg-scansources.1:69
-#: dpkg-shlibdeps.1:220 dpkg-source.1:93 dpkg-split.1:130
-#: dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:124
-#: update-alternatives.8:320
+#: dpkg-deb.1:175 dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-parsechangelog.1:36
+#: dpkg-query.1:113 dpkg-scanpackages.1:99 dpkg-scansources.1:68
+#: dpkg-shlibdeps.1:218 dpkg-source.1:99 dpkg-split.1:129
+#: dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31 dselect.1:116
+#: update-alternatives.8:319
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: Plain text
-#: dpkg.1:274
+#: dpkg.1:265
 msgid "Display B<dpkg> version information."
 msgstr "Visar B<dpkg>s versionsinformation."
 
 #. type: TP
-#: dpkg.1:274
+#: dpkg.1:265
 #, no-wrap
 msgid "B<dpkg-deb actions>"
 msgstr "B<dpkg-deb-åtgärder>"
 
 #. type: Plain text
-#: dpkg.1:277
+#: dpkg.1:268
 msgid "See B<dpkg-deb>(1) for more information about the following actions."
 msgstr "Se B<dpkg-deb>(1) för ytterligare information om följande åtgärder:"
 
 #. type: Plain text
-#: dpkg.1:297
+#: dpkg.1:288
 #, no-wrap
 msgid ""
 "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
@@ -3758,18 +3831,18 @@
 "    Visa information om ett paket.\n"
 
 #. type: TP
-#: dpkg.1:299
+#: dpkg.1:290
 #, no-wrap
 msgid "B<dpkg-query actions>"
 msgstr "B<dpkg-query-åtgärder>"
 
 #. type: Plain text
-#: dpkg.1:302
+#: dpkg.1:293
 msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr "Se B<dpkg-query>(1) för ytterligare information om följande åtgärder:"
 
 #. type: Plain text
-#: dpkg.1:317
+#: dpkg.1:308
 #, no-wrap
 msgid ""
 "B<-l>, B<--list> I<package-name-pattern>...\n"
@@ -3797,20 +3870,20 @@
 "    Visa detaljer om I<paketnamn>, som i I</var/lib/dpkg/available/>.    De som använder APT-baserade skal bör i stället använda    B<apt-cache show> I<paketnamn>.\n"
 
 #. type: SH
-#: dpkg.1:319 dpkg-architecture.1:68 dpkg-buildpackage.1:50
-#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:170
+#: dpkg.1:310 dpkg-architecture.1:67 dpkg-buildpackage.1:50
+#: dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27 dpkg-deb.1:179
 #: dpkg-divert.8:42 dpkg-genchanges.1:17 dpkg-gencontrol.1:37
-#: dpkg-gensymbols.1:364 dpkg-mergechangelogs.1:27 dpkg-name.1:29
-#: dpkg-parsechangelog.1:15 dpkg-query.1:111 dpkg-scanpackages.1:72
-#: dpkg-scansources.1:45 dpkg-shlibdeps.1:108 dpkg-split.1:134
-#: dpkg-statoverride.8:52 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:44
-#: start-stop-daemon.8:100 update-alternatives.8:324
+#: dpkg-gensymbols.1:369 dpkg-mergechangelogs.1:27 dpkg-name.1:30
+#: dpkg-parsechangelog.1:15 dpkg-query.1:117 dpkg-scanpackages.1:71
+#: dpkg-scansources.1:44 dpkg-shlibdeps.1:106 dpkg-split.1:133
+#: dpkg-statoverride.8:51 dpkg-trigger.1:38 dpkg-vendor.1:35 dselect.1:36
+#: start-stop-daemon.8:103 update-alternatives.8:323
 #, no-wrap
 msgid "OPTIONS"
 msgstr "FLAGGOR"
 
 #. type: Plain text
-#: dpkg.1:325
+#: dpkg.1:316
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg> or the files on the configuration "
@@ -3826,24 +3899,24 @@
 "börjar med ett B<#>)."
 
 #. type: TP
-#: dpkg.1:326
+#: dpkg.1:317
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<antal>"
 
 #. type: Plain text
-#: dpkg.1:329
+#: dpkg.1:320
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr "Ställer in efter hur många fel B<dpkg> skall avbryta. Förvalet är 50."
 
 #. type: TP
-#: dpkg.1:329
+#: dpkg.1:320
 #, no-wrap
 msgid "B<-B>, B<--auto-deconfigure>"
 msgstr "B<-B>, B<--auto-deconfigure>"
 
 #. type: Plain text
-#: dpkg.1:335
+#: dpkg.1:326
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -3855,13 +3928,13 @@
 "borttagna paketet automatiskt att avkonfigureras."
 
 #. type: TP
-#: dpkg.1:335
+#: dpkg.1:326
 #, no-wrap
 msgid "B<-D>I<octal>B<, --debug=>I<octal>"
 msgstr "B<-D>I<oktalvärde>B<, --debug=>I<oktalvärde>"
 
 #. type: Plain text
-#: dpkg.1:341
+#: dpkg.1:332
 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 "
@@ -3873,23 +3946,8 @@
 "dessa felsökningsvärden."
 
 #. type: Plain text
-#: dpkg.1:356
-#, 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"
-#| "     10000   Trigger activation and processing\n"
-#| "     20000   Lots of output regarding triggers\n"
-#| "     40000   Silly amounts of output regarding triggers\n"
-#| "      1000   Lots of drivel about e.g. the dpkg/info dir\n"
-#| "      2000   Insane amounts of drivel\n"
+#: dpkg.1:347
+#, no-wrap
 msgid ""
 "    Number   Description\n"
 "         1   Generally helpful progress information\n"
@@ -3906,7 +3964,7 @@
 "      1000   Lots of drivel about e.g. the dpkg/info dir\n"
 "      2000   Insane amounts of drivel\n"
 msgstr ""
-"    tal   beskrivning\n"
+"    Tal   Beskrivning\n"
 "      1   Allmänt hjälpsam förloppsinformation\n"
 "      2   Anrop och status för utvecklarskript\n"
 "     10   Utdata för varje fil som hanteras\n"
@@ -3922,13 +3980,13 @@
 "   2000   Knäppa mängder pladder\n"
 
 #. type: TP
-#: dpkg.1:356
+#: dpkg.1:347
 #, no-wrap
 msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--force->I<saker> | B<--no-force->I<saker> | B<--refuse->I<saker>"
 
 #. type: Plain text
-#: dpkg.1:363
+#: dpkg.1:354
 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<--"
@@ -3941,7 +3999,7 @@
 "är tvingade som förval."
 
 #. type: Plain text
-#: dpkg.1:367
+#: dpkg.1:358
 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 "
@@ -3952,12 +4010,12 @@
 "du förstöra din systeminstallation.>"
 
 #. type: Plain text
-#: dpkg.1:370
+#: dpkg.1:361
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: Slår på (eller av) alla tvingande flaggor."
 
 #. type: Plain text
-#: dpkg.1:373
+#: dpkg.1:364
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
@@ -3966,7 +4024,7 @@
 "installerad."
 
 #. type: Plain text
-#: dpkg.1:380
+#: dpkg.1:371
 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 "
@@ -3981,7 +4039,7 @@
 "instabilt. Använd med tillförsikt.>"
 
 #. type: Plain text
-#: dpkg.1:384
+#: dpkg.1:375
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
@@ -3990,12 +4048,12 @@
 "på vilka det aktuella paketet beror."
 
 #. type: Plain text
-#: dpkg.1:387
+#: dpkg.1:378
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr "B<hold>: Hantera även \"håll\"-markerade paket."
 
 #. type: Plain text
-#: dpkg.1:392
+#: dpkg.1:383
 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 "
@@ -4006,7 +4064,7 @@
 "delar av paketet blir kvar på systemet, men glöms bort av B<dpkg>."
 
 #. type: Plain text
-#: dpkg.1:397
+#: dpkg.1:388
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -4018,24 +4076,24 @@
 "fungera, så använd med tillförsikt."
 
 #. type: Plain text
-#: dpkg.1:400
+#: dpkg.1:391
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr "B<depends>: Gör alla beroendeproblem till varningar."
 
 #. type: Plain text
-#: dpkg.1:403
+#: dpkg.1:394
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
 "B<depends-version>: Ignorera versionsnummer när beroenden kontrolleras."
 
 #. type: Plain text
-#: dpkg.1:406
+#: dpkg.1:397
 msgid "B<breaks>: Install, even if this would break another package."
 msgstr "B<breaks>: Installera, även om det skulle förstöra ett annat paket."
 
 #. type: Plain text
-#: dpkg.1:410
+#: dpkg.1:401
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
@@ -4045,7 +4103,7 @@
 "filer skrivs över."
 
 #. type: Plain text
-#: dpkg.1:415
+#: dpkg.1:406
 msgid ""
 "B<confmiss>: Always install a missing conffile. This is dangerous, since it "
 "means not preserving a change (removing) made to the file."
@@ -4054,7 +4112,7 @@
 "farligt, eftersom det inte bibehåller ändringar (raderingar) av filer."
 
 #. type: Plain text
-#: dpkg.1:420
+#: dpkg.1:411
 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 "
@@ -4065,7 +4123,7 @@
 "det förvalda alternativet kommer att utföras."
 
 #. type: Plain text
-#: dpkg.1:425
+#: dpkg.1:416
 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 "
@@ -4076,7 +4134,7 @@
 "det förvalda alternativet kommer att utföras."
 
 #. type: Plain text
-#: dpkg.1:431
+#: dpkg.1:422
 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 "
@@ -4089,7 +4147,7 @@
 "också angetts, i så fall används den för att bestämma vad som skall utföras."
 
 #. type: Plain text
-#: dpkg.1:438
+#: dpkg.1:429
 msgid ""
 "B<confask>: If a conffile has been modified always offer to replace it with "
 "the version in the package, even if the version in the package did not "
@@ -4104,17 +4162,17 @@
 "utföras."
 
 #. type: Plain text
-#: dpkg.1:441
+#: dpkg.1:432
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr "B<overwrite>: Skriv över ett pakets filer med ett annats."
 
 #. type: Plain text
-#: dpkg.1:444
+#: dpkg.1:435
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr "B<overwrite-dir> Skriv över ett pakets kataloger med ett annats filer."
 
 #. type: Plain text
-#: dpkg.1:447
+#: dpkg.1:438
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
@@ -4122,7 +4180,7 @@
 "version."
 
 #. type: Plain text
-#: dpkg.1:455
+#: dpkg.1:446
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking. Currently "
 "this implies not performing file system syncs before file renames, which is "
@@ -4139,7 +4197,7 @@
 "tvära systemkrascher."
 
 #. type: Plain text
-#: dpkg.1:461
+#: dpkg.1:452
 msgid ""
 "I<Note>: For ext4, the main offender, consider using instead the mount "
 "option B<nodelalloc>, which will fix both the performance degradation and "
@@ -4154,7 +4212,7 @@
 "inte utför synkronisering före atomära namnbyten."
 
 #. type: Plain text
-#: dpkg.1:464
+#: dpkg.1:455
 msgid ""
 "I<Warning: Using this option might improve performance at the cost of losing "
 "data, use with care.>"
@@ -4163,14 +4221,19 @@
 "dataförluster, använd med tillförsikt.>"
 
 #. type: Plain text
-#: dpkg.1:467
-#, fuzzy
-#| msgid "B<architecture>: Process even packages with the wrong architecture."
+#: dpkg.1:458
 msgid "B<architecture>: Process even packages with wrong or no architecture."
-msgstr "B<architecture>: Hantera även paket med fel maskinvaruarkitektur."
+msgstr ""
+"B<architecture>: Hantera även paket med fel eller saknad "
+"maskinvaruarkitektur."
 
 #. type: Plain text
-#: dpkg.1:470
+#: dpkg.1:461
+msgid "B<bad-version>: Process even packages with wrong versions."
+msgstr "B<bad-version>: Hantera även paket med fel versioner."
+
+#. type: Plain text
+#: dpkg.1:464
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -4178,25 +4241,25 @@
 "troliga."
 
 #. type: Plain text
-#: dpkg.1:473
+#: dpkg.1:467
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr "B<not-root>: Försök (av)installera saker även utan att vara root."
 
 #. type: Plain text
-#: dpkg.1:476
+#: dpkg.1:470
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 "B<bad-verify>: Installera ett paket även om det inte går att verifiera dess "
 "äkthet."
 
 #. type: TP
-#: dpkg.1:477
+#: dpkg.1:471
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<paket>,..."
 
 #. type: Plain text
-#: dpkg.1:481
+#: dpkg.1:475
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
@@ -4205,42 +4268,13 @@
 "kontrollen, men det ges endast varningar, ingenting annat)."
 
 #. type: TP
-#: dpkg.1:481
-#, no-wrap
-msgid "B<--new>, B<--old>"
-msgstr "B<--new>, B<--old>"
-
-#. type: Plain text
-#: dpkg.1:485
-msgid ""
-"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
-msgstr ""
-"Välj det nya eller gamla binärpaketformatet. Detta är en flagga till B<dpkg-"
-"deb>(1)."
-
-#. type: TP
-#: dpkg.1:485 dpkg-deb.1:209
-#, no-wrap
-msgid "B<--nocheck>"
-msgstr "B<--nocheck>"
-
-#. type: Plain text
-#: dpkg.1:489
-msgid ""
-"Don't read or check contents of control file while building a package.  This "
-"is a B<dpkg-deb>(1) option."
-msgstr ""
-"Varken läs eller kontrollera innehållet i control-filen när paket skapas. "
-"Detta är en flagga till B<dpkg-deb>(1)."
-
-#. type: TP
-#: dpkg.1:489
+#: dpkg.1:475
 #, 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:494
+#: dpkg.1:480
 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 "
@@ -4250,7 +4284,7 @@
 "för att se vad som skulle ha hänt med åtgärden utan att faktiskt ändra något."
 
 #. type: Plain text
-#: dpkg.1:499
+#: dpkg.1:485
 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 "
@@ -4263,13 +4297,13 @@
 "att du troligen förväntade dig att ingenting skulle utföras)"
 
 #. type: TP
-#: dpkg.1:499
+#: dpkg.1:485
 #, no-wrap
 msgid "B<-R>, B<--recursive>"
 msgstr "B<-R>, B<--recursive>"
 
 #. type: Plain text
-#: dpkg.1:505
+#: dpkg.1:491
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -4280,13 +4314,13 @@
 "tillsammans med B<-i>, B<-A>, B<--install>, B<--unpack> och B<--avail>."
 
 #. type: TP
-#: dpkg.1:505
+#: dpkg.1:491
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 #. type: Plain text
-#: dpkg.1:509
+#: dpkg.1:495
 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>."
@@ -4295,14 +4329,14 @@
 "installerat. Detta är ett alias för B<--refuse-downgrade>."
 
 #. type: TP
-#: dpkg.1:509 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
-#: dpkg-query.1:112 dpkg-shlibdeps.1:213 dpkg-trigger.1:39
+#: dpkg.1:495 dpkg-buildpackage.1:217 dpkg-checkbuilddeps.1:19
+#: dpkg-query.1:118 dpkg-shlibdeps.1:211 dpkg-trigger.1:39
 #, no-wrap
 msgid "B<--admindir=>I<dir>"
 msgstr "B<--admindir=>I<kat>"
 
 #. type: Plain text
-#: dpkg.1:514
+#: dpkg.1:500
 msgid ""
 "Change default administrative directory, which contains many files that give "
 "information about status of installed or uninstalled packages, etc.  "
@@ -4313,13 +4347,13 @@
 "(standardvärde är I</var/lib/dpkg>)"
 
 #. type: TP
-#: dpkg.1:514
+#: dpkg.1:500
 #, no-wrap
 msgid "B<--instdir=>I<dir>"
 msgstr "B<--instdir=>I<katalog>"
 
 #. type: Plain text
-#: dpkg.1:521
+#: dpkg.1:507
 msgid ""
 "Change default installation directory which refers to the directory where "
 "packages are to be installed. B<instdir> is also the directory passed to "
@@ -4332,13 +4366,13 @@
 "skripten ser B<instdir> som rotkatalog. (Förval är I</>)"
 
 #. type: TP
-#: dpkg.1:521
+#: dpkg.1:507
 #, no-wrap
 msgid "B<--root=>I<dir>"
 msgstr "B<--root=>I<katalog>"
 
 #. type: Plain text
-#: dpkg.1:525
+#: dpkg.1:511
 msgid ""
 "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 "var/lib/dpkg>."
@@ -4347,13 +4381,13 @@
 "B<administrationskatalog> till I<katalog>B</var/lib/dpkg>."
 
 #. type: TP
-#: dpkg.1:525
+#: dpkg.1:511
 #, no-wrap
 msgid "B<-O>, B<--selected-only>"
 msgstr "B<-O>, B<--selected-only>"
 
 #. type: Plain text
-#: dpkg.1:531
+#: dpkg.1:517
 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 "
@@ -4365,13 +4399,13 @@
 "kommer paket som tas bort att markeras för installation."
 
 #. type: TP
-#: dpkg.1:531
+#: dpkg.1:517
 #, no-wrap
 msgid "B<-E>, B<--skip-same-version>"
 msgstr "B<-E>, B<--skip-same-version>"
 
 #. type: Plain text
-#: dpkg.1:535
+#: dpkg.1:521
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
@@ -4379,17 +4413,17 @@
 "Installera inte paketet om samma version av paketet redan är installerat."
 
 #. type: Plain text
-#: dpkg.1:537
+#: dpkg.1:523
 msgid "B<--pre-invoke=>I<command>"
 msgstr "B<--pre-invoke=>I<kommando>"
 
 #. type: Plain text
-#: dpkg.1:539
+#: dpkg.1:525
 msgid "B<--post-invoke=>I<command>"
 msgstr "B<--post-invoke=>I<kommando>"
 
 #. type: Plain text
-#: dpkg.1:548
+#: dpkg.1:534
 msgid ""
 "Set an invoke hook I<command> to be run via ``sh -c'' before or after the "
 "dpkg run for the I<unpack>, I<configure>, I<install>, I<triggers-only>, "
@@ -4409,17 +4443,17 @@
 "körning, vilket kan göra att hakarna körs fler gånger än förväntat."
 
 #. type: Plain text
-#: dpkg.1:551
+#: dpkg.1:537
 msgid "B<--path-exclude=>I<glob-pattern>"
 msgstr "B<--path-exclude=>I<filnamnsmönster>"
 
 #. type: Plain text
-#: dpkg.1:553
+#: dpkg.1:539
 msgid "B<--path-include=>I<glob-pattern>"
 msgstr "B<--list>I<filnamnsmönster>"
 
 #. type: Plain text
-#: dpkg.1:556
+#: dpkg.1:542
 msgid ""
 "Set I<glob-pattern> as a path filter, either by excluding or re-including "
 "previously excluded paths matching the specified patterns during install."
@@ -4429,7 +4463,7 @@
 "mönstret under installationen."
 
 #. type: Plain text
-#: dpkg.1:559
+#: dpkg.1:545
 msgid ""
 "I<Warning: take into account that depending on the excluded paths you might "
 "completely break your system, use with caution.>"
@@ -4438,7 +4472,7 @@
 "sökvägar du exkluderar, så använd med tillförsikt.>"
 
 #. type: Plain text
-#: dpkg.1:569
+#: dpkg.1:555
 msgid ""
 "The glob patterns use the same wildcards used in the shell, were '*' matches "
 "any sequence of characters, including the empty string and also '/'. For "
@@ -4462,7 +4496,7 @@
 "ändringar kan komma att rätta detta."
 
 #. type: Plain text
-#: dpkg.1:572
+#: dpkg.1:558
 msgid ""
 "This can be used to remove all paths except some particular ones; a typical "
 "case is:"
@@ -4471,7 +4505,7 @@
 "ett typiskt användningsområde är:"
 
 #. type: Plain text
-#: dpkg.1:576
+#: dpkg.1:562
 #, no-wrap
 msgid ""
 "B<--path-exclude=/usr/share/doc/*>\n"
@@ -4481,13 +4515,13 @@
 "B<--path-include=/usr/share/doc/*/copyright>\n"
 
 #. type: Plain text
-#: dpkg.1:579
+#: dpkg.1:565
 msgid "to remove all documentation files except the copyright files."
 msgstr ""
 "för att ta bort alla dokumentationsfiler förutom upphovsrättsinformation."
 
 #. type: Plain text
-#: dpkg.1:583
+#: dpkg.1:569
 msgid ""
 "These two options can be specified multiple times, and interleaved with each "
 "other. Both are processed in the given order, with the last rule that "
@@ -4498,13 +4532,13 @@
 "som motsvarar ett filnamn som fäller avgörandet."
 
 #. type: TP
-#: dpkg.1:584
+#: dpkg.1:570
 #, no-wrap
 msgid "B<--status-fd >I<n>"
 msgstr "B<--status-fd >I<n>"
 
 #. type: Plain text
-#: dpkg.1:590
+#: dpkg.1:576
 msgid ""
 "Send machine-readable package status and progress information to file "
 "descriptor I<n>. This option can be specified multiple times. The "
@@ -4515,48 +4549,50 @@
 "i följande format:"
 
 #. type: TP
-#: dpkg.1:591
+#: dpkg.1:577
 #, no-wrap
 msgid "B<status: >I<package>B<: >I<status>"
 msgstr "B<status: >I<paket>B<: >I<status>"
 
 #. type: Plain text
-#: dpkg.1:594
+#: dpkg.1:580
 msgid "Package status changed; I<status> is as in the status file."
 msgstr "Paketstatus ändrad; I<status> är som i statusfilen."
 
 #. type: TP
-#: dpkg.1:594
+#: dpkg.1:580
 #, no-wrap
 msgid "B<status: >I<package>B< : error : >I<extended-error-message>"
 msgstr "B<status: >I<paket>B< : error : >I<utökat-felmeddelande>"
 
 #. type: Plain text
-#: dpkg.1:598
+#: dpkg.1:584
 msgid ""
 "An error occurred. Any possible newlines in I<extended-error-message> will "
 "be converted to spaces before output."
 msgstr ""
+"Ett fel uppstod. Eventuella nyradstecken i I<utökat-felmeddelanden> kommer "
+"ersättas med blanksteg innan de skrivs ut."
 
 #. type: TP
-#: dpkg.1:598
+#: dpkg.1:584
 #, no-wrap
 msgid "B<status: >I<file>B< : conffile-prompt : '>I<real-old>B<' '>I<real-new>B<' >I<useredited>B< >I<distedited>"
 msgstr "B<status: >I<fil>B< : conffile-prompt : '>I<riktig-gammal>B<' '>I<riktig-ny>B<' >I<användarredigerad>B< >I<distredigerad>"
 
 #. type: Plain text
-#: dpkg.1:601
+#: dpkg.1:587
 msgid "User is being asked a conffile question."
 msgstr "Användaren får en fråga om konfigurationsfiler."
 
 #. type: TP
-#: dpkg.1:601
+#: dpkg.1:587
 #, no-wrap
 msgid "B<processing: >I<stage>B<: >I<package>"
 msgstr "B<processing: >I<skede>B<: >I<paket>"
 
 #. type: Plain text
-#: dpkg.1:606
+#: dpkg.1:592
 msgid ""
 "Sent just before a processing stage starts. I<stage> is one of B<upgrade>, "
 "B<install> (both sent before unpacking), B<configure>, B<trigproc>, "
@@ -4567,77 +4603,69 @@
 "B<trigproc>, B<disappear>, B<remove>, B<purge>."
 
 #. type: TP
-#: dpkg.1:607
-#, fuzzy, no-wrap
-#| msgid "B<--post-invoke=>I<command>"
+#: dpkg.1:593
+#, no-wrap
 msgid "B<--status-logger>=I<command>"
-msgstr "B<--post-invoke=>I<kommando>"
+msgstr "B<--status-logger>=I<kommando>"
 
 #. type: Plain text
-#: dpkg.1:612
-#, fuzzy
-#| msgid ""
-#| "Send machine-readable package status and progress information to file "
-#| "descriptor I<n>. This option can be specified multiple times. The "
-#| "information is generally one record per line, in one of the following "
-#| "forms:"
+#: dpkg.1:598
 msgid ""
 "Send machine-readable package status and progress information to the shell "
 "I<command>'s standard input. This option can be specified multiple times. "
 "The output format used is the same as in B<--status-fd.>"
 msgstr ""
-"Sänd maskinläsbar paketstatus och förloppsinformation till filhandtag I<n>. "
-"Flaggan kan anges flera gånger. Informationen lagras vanligtvis rad för rad, "
-"i följande format:"
+"Sänd maskinläsbar paketstatus och förloppsinformation till skal-"
+"I<kommando>ts standard in. Flaggan kan anges flera gånger. Utdataformatet "
+"som används är detsamma som för B<--status-fd>."
 
 #. type: TP
-#: dpkg.1:613
+#: dpkg.1:599
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<filnamn>"
 
 #. type: Plain text
-#: dpkg.1:625
+#: dpkg.1:611
 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."
+"I<state> I<pkg> I<installed-version>' for status change updates; `YYYY-MM-DD "
+"HH:MM:SS I<action> I<pkg> I<installed-version> I<available-version>' for "
+"actions where I<action> is one of B<install>, B<upgrade>, B<remove>, "
+"B<purge>; and `YYYY-MM-DD HH:MM:SS conffile I<filename> I<decision>' for "
+"conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 "Logga statusändringsmeddelanden och kommandon till I<filnamn>, istället för "
 "förvalet I</var/log/dpkg.log>. Om flaggan ges flera gånger används det sista "
 "filnamnet. Loggmeddelanden är på formen \"ÅÅÅÅ-MM-DD HH:MM:SS status "
-"E<lt>tillståndE<gt> E<lt>paketE<gt> E<lt>installerad-versionE<gt>\" för "
-"statusändringar; \"ÅÅÅÅ-MM-DD HH:MM:SS E<lt>kommandoE<gt> E<lt>paketE<gt> "
-"E<lt>installerad-versionE<gt> E<lt>tillgänglig-versionE<gt>\" för kommandon "
-"där I<E<lt>kommandoE<gt>> är ett av install, upgrade, remove eller purge; "
-"samt \"ÅÅÅÅ-MM-DD HH:MM:SS conffile E<lt>filnamnE<gt> E<lt>valE<gt>\" för "
-"konfigurationsfilsändringar där I<E<lt>val> antingen är install eller keep."
+"I<tillstånd> I<paket> I<installerad-version>\" för statusändringar; \"ÅÅÅÅ-"
+"MM-DD HH:MM:SS I<åtgärd> I<paket> I<installerad-versiont> I<tillgänglig-"
+"version>\" för åtgärder där I<åtgärd> är ett av B<install>, B<upgrade>, "
+"B<remove>, B<purge>; samt \"ÅÅÅÅ-MM-DD HH:MM:SS conffile I<filnamn> I<val>\" "
+"för konfigurationsfilsändringar där I<val> antingen är B<install> eller "
+"B<keep>."
 
 #. type: TP
-#: dpkg.1:625
+#: dpkg.1:611
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--no-debsig>"
 
 #. type: Plain text
-#: dpkg.1:628
+#: dpkg.1:614
 msgid "Do not try to verify package signatures."
 msgstr "Försök inte verifiera paketsignaturer."
 
 #. type: TP
-#: dpkg.1:628
+#: dpkg.1:614
 #, no-wrap
 msgid "B<--no-triggers>"
 msgstr "B<--no-triggers>"
 
 #. type: Plain text
-#: dpkg.1:637
+#: dpkg.1:623
 msgid ""
 "Do not run any triggers in this run (activations will still be recorded).  "
 "If used with B<--configure> I<package> or B<--triggers-only> I<package> then "
@@ -4655,40 +4683,40 @@
 "att köra: B<dpkg --configure --pending>."
 
 #. type: TP
-#: dpkg.1:637
+#: dpkg.1:623
 #, no-wrap
 msgid "B<--triggers>"
 msgstr "B<--triggers>"
 
 #. type: Plain text
-#: dpkg.1:640
+#: dpkg.1:626
 msgid "Cancels a previous B<--no-triggers>."
 msgstr "Överstyr ett tidigare B<--no-triggers>."
 
 #. type: Plain text
-#: dpkg.1:642 dpkg.cfg.5:16
+#: dpkg.1:628 dpkg.cfg.5:16
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.1:645
+#: dpkg.1:631
 msgid "Configuration file with default options."
 msgstr "Konfigurationsfil med förvalda inställningar."
 
 #. type: TP
-#: dpkg.1:645
+#: dpkg.1:631
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/log/dpkg.log>"
 
 #. type: Plain text
-#: dpkg.1:649
+#: dpkg.1:635
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr "Förvald loggfil (se I</etc/dpkg/dpkg.cfg>(5) och flaggan B<--log>)."
 
 #. type: Plain text
-#: dpkg.1:652
+#: dpkg.1:638
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
@@ -4697,24 +4725,24 @@
 "admindir> för information om hur du ändrar placeringen av dessa filer."
 
 #. type: TP
-#: dpkg.1:652
+#: dpkg.1:638
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 #. type: Plain text
-#: dpkg.1:655
+#: dpkg.1:641
 msgid "List of available packages."
 msgstr "Lista över tillgängliga paket."
 
 #. type: TP
-#: dpkg.1:655
+#: dpkg.1:641
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 #. type: Plain text
-#: dpkg.1:661
+#: dpkg.1:647
 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, "
@@ -4725,7 +4753,7 @@
 "osv. Se sektionen B<INFORMATION OM PAKET> för ytterligare information."
 
 #. type: Plain text
-#: dpkg.1:664
+#: dpkg.1:650
 msgid ""
 "The status file is backed up daily in I</var/backups>. It can be useful if "
 "it's lost or corrupted due to filesystems troubles."
@@ -4735,7 +4763,7 @@
 "filsystemet."
 
 #. type: Plain text
-#: dpkg.1:667
+#: dpkg.1:653
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
@@ -4744,57 +4772,57 @@
 "ytterligare information om dem:"
 
 #. type: TP
-#: dpkg.1:667
+#: dpkg.1:653
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 #. type: TP
-#: dpkg.1:669
+#: dpkg.1:655
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 #. type: TP
-#: dpkg.1:671
+#: dpkg.1:657
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 #. type: TP
-#: dpkg.1:673
+#: dpkg.1:659
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 #. type: TP
-#: dpkg.1:675
+#: dpkg.1:661
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 #. type: TP
-#: dpkg.1:677
+#: dpkg.1:663
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 #. type: SH
-#: dpkg.1:680 dpkg-buildflags.1:110 dpkg-buildpackage.1:230 dpkg-deb.1:219
-#: dpkg-divert.8:112 dpkg-query.1:196 dpkg-statoverride.8:69 dpkg-trigger.1:60
-#: dpkg-vendor.1:42 dselect.1:430 update-alternatives.8:355
+#: dpkg.1:666 dpkg-buildflags.1:128 dpkg-buildpackage.1:230 dpkg-deb.1:232
+#: dpkg-divert.8:112 dpkg-query.1:204 dpkg-statoverride.8:68 dpkg-trigger.1:60
+#: dpkg-vendor.1:42 dselect.1:423 update-alternatives.8:354
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "MILJÖVARIABLER"
 
 #. type: TP
-#: dpkg.1:681 dselect.1:431
+#: dpkg.1:667 dselect.1:424
 #, no-wrap
 msgid "B<HOME>"
 msgstr "B<HOME>"
 
 #. type: Plain text
-#: dpkg.1:685
+#: dpkg.1:671
 msgid ""
 "If set, B<dpkg> will use it as the directory from which to read the user "
 "specific configuration file."
@@ -4803,13 +4831,13 @@
 "skall läsa den användarspecifika konfigurationsfilen."
 
 #. type: TP
-#: dpkg.1:685 dpkg-deb.1:220
+#: dpkg.1:671 dpkg-deb.1:233
 #, no-wrap
 msgid "B<TMPDIR>"
 msgstr "B<TMPDIR>"
 
 #. type: Plain text
-#: dpkg.1:689
+#: dpkg.1:675
 msgid ""
 "If set, B<dpkg> will use it as the directory in which to create temporary "
 "files and directories."
@@ -4818,36 +4846,36 @@
 "temporära filer och kataloger."
 
 #. type: TP
-#: dpkg.1:689
+#: dpkg.1:675
 #, no-wrap
 msgid "B<PAGER>"
 msgstr "B<PAGER>"
 
 #. type: Plain text
-#: dpkg.1:692
+#: dpkg.1:678
 msgid "The program B<dpkg> will execute when displaying the conffiles."
 msgstr ""
 "Programmet B<dpkg> kommer att exekveras för att visa konfigurationsfiler."
 
 #. type: TP
-#: dpkg.1:692
+#: dpkg.1:678
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 #. type: Plain text
-#: dpkg.1:695
+#: dpkg.1:681
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr "Programmet B<dpkg> kommer att exekveras när ett nytt skal startas."
 
 #. type: TP
-#: dpkg.1:695 dpkg-query.1:201
+#: dpkg.1:681 dpkg-query.1:209
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 #. type: Plain text
-#: dpkg.1:699
+#: dpkg.1:685
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
@@ -4856,13 +4884,13 @@
 "Används för närvarande enbart av -l."
 
 #. type: TP
-#: dpkg.1:699
+#: dpkg.1:685
 #, no-wrap
 msgid "B<DPKG_SHELL_REASON>"
 msgstr "B<DPKG_SHELL_REASON>"
 
 #. type: Plain text
-#: dpkg.1:703
+#: dpkg.1:689
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Current valid value: B<conffile-prompt>."
@@ -4872,13 +4900,13 @@
 "B<conffile-prompt>."
 
 #. type: TP
-#: dpkg.1:703
+#: dpkg.1:689
 #, no-wrap
 msgid "B<DPKG_CONFFILE_OLD>"
 msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. type: Plain text
-#: dpkg.1:707
+#: dpkg.1:693
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the old conffile."
@@ -4888,13 +4916,13 @@
 "konfigurationsfilen."
 
 #. type: TP
-#: dpkg.1:707
+#: dpkg.1:693
 #, no-wrap
 msgid "B<DPKG_CONFFILE_NEW>"
 msgstr "B<DPKG_CONFFILE_NEW>"
 
 #. type: Plain text
-#: dpkg.1:711
+#: dpkg.1:697
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation. Contains the path to the new conffile."
@@ -4904,13 +4932,13 @@
 "konfigurationsfilen."
 
 #. type: TP
-#: dpkg.1:711
+#: dpkg.1:697
 #, no-wrap
 msgid "B<DPKG_RUNNING_VERSION>"
 msgstr "B<DPKG_RUNNING_VERSION>"
 
 #. type: Plain text
-#: dpkg.1:715
+#: dpkg.1:701
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the version of "
 "the currently running B<dpkg> instance."
@@ -4919,13 +4947,13 @@
 "instans av B<dpkg> som körs för tillfället."
 
 #. type: TP
-#: dpkg.1:715 dpkg-divert.8:117
+#: dpkg.1:701 dpkg-divert.8:117
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_PACKAGE>"
 msgstr "B<DPKG_MAINTSCRIPT_PACKAGE>"
 
 #. type: Plain text
-#: dpkg.1:719
+#: dpkg.1:705
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the package name "
 "being handled."
@@ -4934,13 +4962,13 @@
 "hanteras."
 
 #. type: TP
-#: dpkg.1:719
+#: dpkg.1:705
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_ARCH>"
 msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
 
 #. type: Plain text
-#: dpkg.1:723
+#: dpkg.1:709
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the architecture "
 "the package got built for."
@@ -4949,13 +4977,13 @@
 "byggdes för."
 
 #. type: TP
-#: dpkg.1:723
+#: dpkg.1:709
 #, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_NAME>"
 msgstr "B<DPKG_MAINTSCRIPT_NAME>"
 
 #. type: Plain text
-#: dpkg.1:727
+#: dpkg.1:713
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the name of the "
 "script running (preinst, postinst, prerm, postrm)."
@@ -4964,52 +4992,52 @@
 "som körs (preinst, postinst, prerm, postrm)."
 
 #. type: Plain text
-#: dpkg.1:730
+#: dpkg.1:716
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr ""
 "För att lista paket relaterade till textredigeringsprogrammet B<vi>(1):"
 
 #. type: Plain text
-#: dpkg.1:732
+#: dpkg.1:718
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 
 #. type: Plain text
-#: dpkg.1:735
+#: dpkg.1:721
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr "För att se posterna i I</var/lib/dpkg/available> för två paket:"
 
 #. type: Plain text
-#: dpkg.1:737
+#: dpkg.1:723
 #, 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:740
+#: dpkg.1:726
 msgid "To search the listing of packages yourself:"
 msgstr "För att själv söka i paketlistan:"
 
 #. type: Plain text
-#: dpkg.1:742
+#: dpkg.1:728
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "     B<less /var/lib/dpkg/available>\n"
 
 #. type: Plain text
-#: dpkg.1:745
+#: dpkg.1:731
 msgid "To remove an installed elvis package:"
 msgstr "För att ta bort det installerade paketet elvis:"
 
 #. type: Plain text
-#: dpkg.1:747
+#: dpkg.1:733
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "     B<dpkg -r elvis>\n"
 
 #. type: Plain text
-#: dpkg.1:752
+#: dpkg.1:738
 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\":"
@@ -5019,31 +5047,28 @@
 "\"editors\":"
 
 #. type: Plain text
-#: dpkg.1:755
-#, fuzzy, no-wrap
-#| msgid ""
-#| "     B<cd /cdrom/pool/main/v/vim>\n"
-#| "     B<dpkg -i vim_4.5-3.deb>\n"
+#: dpkg.1:741
+#, no-wrap
 msgid ""
 "     B<cd /media/cdrom/pool/main/v/vim>\n"
 "     B<dpkg -i vim_4.5-3.deb>\n"
 msgstr ""
-"     B<cd /cdrom/pool/main/v/vim>\n"
+"     B<cd /media/cdrom/pool/main/v/vim>\n"
 "     B<dpkg -i vim_4.5-3.deb>\n"
 
 #. type: Plain text
-#: dpkg.1:758
+#: dpkg.1:744
 msgid "To make a local copy of the package selection states:"
 msgstr "För att göra en lokal kopia av paketmarkeringarna:"
 
 #. type: Plain text
-#: dpkg.1:760
+#: dpkg.1:746
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr "     B<dpkg --get-selections E<gt>mitturval>\n"
 
 #. type: Plain text
-#: dpkg.1:764
+#: dpkg.1:750
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr ""
@@ -5051,7 +5076,7 @@
 "skriva:"
 
 #. type: Plain text
-#: dpkg.1:767
+#: dpkg.1:753
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -5061,7 +5086,7 @@
 "     B<dpkg --set-selections E<lt>mitturval>\n"
 
 #. type: Plain text
-#: dpkg.1:773
+#: dpkg.1:759
 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 "
@@ -5074,7 +5099,7 @@
 "Till exempel kan du köra B<apt-get dselect-upgrade>."
 
 #. type: Plain text
-#: dpkg.1:776
+#: dpkg.1:762
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
@@ -5083,13 +5108,13 @@
 "ett bekvämare sätt att ändra paketmarkeringarna."
 
 #. type: SH
-#: dpkg.1:778
+#: dpkg.1:764
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr "YTTERLIGARE FUNKTIONER"
 
 #. type: Plain text
-#: dpkg.1:781
+#: dpkg.1:767
 msgid ""
 "Additional functionality can be gained by installing any of the following "
 "packages: B<apt>, B<aptitude> and B<debsums>."
@@ -5098,7 +5123,7 @@
 "paket: B<apt>, B<aptitude> och B<debsums>."
 
 #. type: Plain text
-#: dpkg.1:793
+#: dpkg.1:779
 msgid ""
 "B<aptitude>(1), B<apt>(1), 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)."
@@ -5107,12 +5132,12 @@
 "B<deb>(5), B<deb-control>(5), B<dpkg.cfg>(5) och B<dpkg-reconfigure>(8)."
 
 #. type: Plain text
-#: dpkg.1:796
+#: dpkg.1:782
 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: Plain text
-#: dpkg.1:799 dpkg.cfg.5:22
+#: dpkg.1:785 dpkg.cfg.5:22
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
 "contributed to B<dpkg>."
@@ -5126,12 +5151,6 @@
 msgid "dpkg-architecture"
 msgstr "dpkg-architecture"
 
-#. type: TH
-#: dpkg-architecture.1:1
-#, no-wrap
-msgid "2009-08-15"
-msgstr "2009-08-15"
-
 #. type: Plain text
 #: dpkg-architecture.1:4
 msgid ""
@@ -5139,12 +5158,12 @@
 msgstr "dpkg-architecture - ställ in och bestäm arkitektur för paket som byggs"
 
 #. type: Plain text
-#: dpkg-architecture.1:9
-msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
-msgstr "B<dpkg-architecture> [I<flaggor>] I<åtgärd>"
+#: dpkg-architecture.1:8
+msgid "B<dpkg-architecture> [I<option>...] [I<command>]"
+msgstr "B<dpkg-architecture> [I<flagga>...] [I<åtgärd>]"
 
 #. type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg-architecture.1:13
 msgid ""
 "dpkg-architecture does provide a facility to determine and set the build and "
 "host architecture for package building."
@@ -5153,7 +5172,7 @@
 "bygg- och värdarkitekturerna för att bygga paket."
 
 #. type: Plain text
-#: dpkg-architecture.1:17
+#: dpkg-architecture.1:16
 msgid ""
 "The build architecture is always determined by an external call to B<dpkg>"
 "(1), and can not be set at the command line."
@@ -5162,7 +5181,7 @@
 "inte ställas in på kommandoraden."
 
 #. type: Plain text
-#: dpkg-architecture.1:26
+#: dpkg-architecture.1:25
 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 "
@@ -5181,22 +5200,22 @@
 "inte överensstämmer med förvalet."
 
 #. type: SH
-#: dpkg-architecture.1:27 dpkg-buildflags.1:34 dpkg-deb.1:28 dpkg-divert.8:24
-#: dpkg-query.1:13 dpkg-source.1:19 dpkg-split.1:32 dpkg-statoverride.8:24
-#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:35
-#: update-alternatives.8:203
+#: dpkg-architecture.1:26 dpkg-buildflags.1:45 dpkg-deb.1:27 dpkg-divert.8:24
+#: dpkg-query.1:13 dpkg-source.1:18 dpkg-split.1:31 dpkg-statoverride.8:23
+#: dpkg-trigger.1:24 dpkg-vendor.1:14 start-stop-daemon.8:34
+#: update-alternatives.8:202
 #, no-wrap
 msgid "COMMANDS"
 msgstr "KOMMANDON"
 
 #. type: TP
-#: dpkg-architecture.1:28
+#: dpkg-architecture.1:27
 #, no-wrap
 msgid "B<-l>"
 msgstr "B<-l>"
 
 #. type: Plain text
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 msgid ""
 "Print the environment variables, one each line, in the format "
 "I<VARIABLE=value>. This is the default action."
@@ -5205,13 +5224,13 @@
 "förvald åtgärd."
 
 #. type: TP
-#: dpkg-architecture.1:32
+#: dpkg-architecture.1:31
 #, no-wrap
 msgid "B<-e>I<debian-architecture>"
 msgstr "B<-e>I<debianarkitektur>"
 
 #. type: Plain text
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 msgid ""
 "Check for equality of architecture. By default I<debian-architecture> is "
 "compared against the current Debian architecture, being the host.  This "
@@ -5224,13 +5243,13 @@
 "träff, 1 om det inte är en träff."
 
 #. type: TP
-#: dpkg-architecture.1:38
+#: dpkg-architecture.1:37
 #, no-wrap
 msgid "B<-i>I<architecture-wildcard>"
 msgstr "B<-i>I<arkitektursökmönster>"
 
 #. type: Plain text
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 msgid ""
 "Check for identity of architecture by expanding I<architecture-wildcard> as "
 "an architecture wildcard and comparing against the current Debian "
@@ -5243,24 +5262,24 @@
 "vid träff, 1 om inte träff."
 
 #. type: TP
-#: dpkg-architecture.1:44
+#: dpkg-architecture.1:43
 #, no-wrap
 msgid "B<-q>I<variable-name>"
 msgstr "B<-q>I<variabelnamn>"
 
 #. type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 msgid "Print the value of a single variable."
 msgstr "Skriv värdet på en enkel variabel."
 
 #. type: TP
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:46
 #, no-wrap
 msgid "B<-s>"
 msgstr "B<-s>"
 
 #. type: Plain text
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 msgid ""
 "Print an export command. This can be used to set the environment variables "
 "using eval."
@@ -5269,25 +5288,25 @@
 "med eval."
 
 #. type: TP
-#: dpkg-architecture.1:51
+#: dpkg-architecture.1:50
 #, no-wrap
 msgid "B<-u>"
 msgstr "B<-u>"
 
 #. type: Plain text
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 "Visar ett kommando liknande B<-s> som för att nollställa alla variabler."
 
 #. type: TP
-#: dpkg-architecture.1:54
+#: dpkg-architecture.1:53
 #, no-wrap
 msgid "B<-c>I< command>"
 msgstr "B<-c>I< kommando>"
 
 #. type: Plain text
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 msgid ""
 "Execute a I<command> in an environment which has all variables set to the "
 "determined value."
@@ -5296,70 +5315,70 @@
 "bestämda värdet."
 
 #. type: TP
-#: dpkg-architecture.1:58
+#: dpkg-architecture.1:57
 #, no-wrap
 msgid "B<-L>"
 msgstr "B<-L>"
 
 #. type: Plain text
-#: dpkg-architecture.1:61
+#: dpkg-architecture.1:60
 msgid "Print a list of valid architecture names."
 msgstr "Visa en lista över giltiga arkitekturnamn."
 
 #. type: Plain text
-#: dpkg-architecture.1:64 dpkg-buildflags.1:74 dpkg-buildpackage.1:226
-#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:166
+#: dpkg-architecture.1:63 dpkg-buildflags.1:92 dpkg-buildpackage.1:226
+#: dpkg-checkbuilddeps.1:36 dpkg-distaddfile.1:35 dpkg-deb.1:175
 #: dpkg-divert.8:74 dpkg-genchanges.1:134 dpkg-gencontrol.1:124
-#: dpkg-gensymbols.1:441 dpkg-mergechangelogs.1:41 dpkg-name.1:60
-#: dpkg-parsechangelog.1:36 dpkg-query.1:107 dpkg-scanpackages.1:100
-#: dpkg-scansources.1:69 dpkg-shlibdeps.1:220 dpkg-source.1:93
-#: dpkg-split.1:130 dpkg-statoverride.8:48 dpkg-trigger.1:34 dpkg-vendor.1:31
-#: update-alternatives.8:320
+#: dpkg-gensymbols.1:446 dpkg-mergechangelogs.1:41 dpkg-name.1:61
+#: dpkg-parsechangelog.1:36 dpkg-query.1:113 dpkg-scanpackages.1:99
+#: dpkg-scansources.1:68 dpkg-shlibdeps.1:218 dpkg-source.1:99
+#: dpkg-split.1:129 dpkg-statoverride.8:47 dpkg-trigger.1:34 dpkg-vendor.1:31
+#: update-alternatives.8:319
 msgid "Show the usage message and exit."
 msgstr "Visar hjälpskärm och avslutar."
 
 #. type: Plain text
-#: dpkg-architecture.1:67 dpkg-buildflags.1:77 dpkg-buildpackage.1:229
-#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:169
+#: dpkg-architecture.1:66 dpkg-buildflags.1:95 dpkg-buildpackage.1:229
+#: dpkg-checkbuilddeps.1:39 dpkg-distaddfile.1:38 dpkg-deb.1:178
 #: dpkg-divert.8:77 dpkg-genchanges.1:137 dpkg-gencontrol.1:127
-#: dpkg-gensymbols.1:444 dpkg-mergechangelogs.1:44 dpkg-name.1:63
-#: dpkg-parsechangelog.1:39 dpkg-query.1:110 dpkg-scanpackages.1:103
-#: dpkg-scansources.1:71 dpkg-shlibdeps.1:223 dpkg-source.1:96
-#: dpkg-split.1:133 dpkg-statoverride.8:51 dpkg-trigger.1:37 dpkg-vendor.1:34
-#: update-alternatives.8:323
+#: dpkg-gensymbols.1:449 dpkg-mergechangelogs.1:44 dpkg-name.1:64
+#: dpkg-parsechangelog.1:39 dpkg-query.1:116 dpkg-scanpackages.1:102
+#: dpkg-scansources.1:70 dpkg-shlibdeps.1:221 dpkg-source.1:102
+#: dpkg-split.1:132 dpkg-statoverride.8:50 dpkg-trigger.1:37 dpkg-vendor.1:34
+#: update-alternatives.8:322
 msgid "Show the version and exit."
 msgstr "Visar version och avslutar."
 
 #. type: TP
-#: dpkg-architecture.1:69
+#: dpkg-architecture.1:68
 #, no-wrap
 msgid "B<-a>I<debian-architecture>"
 msgstr "B<-a>I<debianarkitektur>"
 
 #. type: Plain text
-#: dpkg-architecture.1:72
+#: dpkg-architecture.1:71
 msgid "Set the Debian architecture."
 msgstr "Välj Debianarkitektur."
 
 #. type: TP
-#: dpkg-architecture.1:72 dpkg-buildpackage.1:110
+#: dpkg-architecture.1:71 dpkg-buildpackage.1:110
 #, no-wrap
 msgid "B<-t>I<gnu-system-type>"
 msgstr "B<-t>I<gnu-systemtyp>"
 
 #. type: Plain text
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 msgid "Set the GNU system type."
 msgstr "Välj GNU-systemtyp."
 
 #. type: TP
-#: dpkg-architecture.1:75
+#: dpkg-architecture.1:74
 #, no-wrap
 msgid "B<-f>"
 msgstr "B<-f>"
 
 #. type: Plain text
-#: dpkg-architecture.1:82
+#: dpkg-architecture.1:81
 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 "
@@ -5374,41 +5393,41 @@
 "djupt inuti ett annat skript (till exempel B<dpkg-buildpackage>(1))."
 
 #. type: SH
-#: dpkg-architecture.1:83
+#: dpkg-architecture.1:82
 #, no-wrap
 msgid "TERMS"
 msgstr "TERMINOLOGI"
 
 #. type: IP
-#: dpkg-architecture.1:84
+#: dpkg-architecture.1:83
 #, no-wrap
 msgid "build machine"
 msgstr "byggmaskin"
 
 #. type: Plain text
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 msgid "The machine the package is built on."
 msgstr "Maskinen paketet byggs på."
 
 #. type: IP
-#: dpkg-architecture.1:86
+#: dpkg-architecture.1:85
 #, no-wrap
 msgid "host machine"
 msgstr "värdmaskin"
 
 #. type: Plain text
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 msgid "The machine the package is built for."
 msgstr "Maskinen paketet byggs för."
 
 #. type: IP
-#: dpkg-architecture.1:88
+#: dpkg-architecture.1:87
 #, no-wrap
 msgid "Debian architecture"
 msgstr "Debianarkitektur"
 
 #. type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 msgid ""
 "The Debian architecture string, which specifies the binary tree in the "
 "\\s-1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
@@ -5417,13 +5436,13 @@
 "Exempel: i386, sparc, hurd-i386."
 
 #. type: IP
-#: dpkg-architecture.1:91
+#: dpkg-architecture.1:90
 #, no-wrap
 msgid "architecture wildcard"
 msgstr "arkitektursökmönster"
 
 #. type: Plain text
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 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>-"
@@ -5434,13 +5453,13 @@
 "E<lt>cpuE<gt>. Exempel: linux-any, any-i386, hurd-any."
 
 #. type: IP
-#: dpkg-architecture.1:95
+#: dpkg-architecture.1:94
 #, no-wrap
 msgid "\\s-1GNU\\s0 system type"
 msgstr "\\s-1GNU\\s0-systemtyp"
 
 #. type: Plain text
-#: dpkg-architecture.1:99
+#: dpkg-architecture.1:98
 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, "
@@ -5451,232 +5470,230 @@
 "i386-gnu, x86_64-netbsd."
 
 #. type: SH
-#: dpkg-architecture.1:100
+#: dpkg-architecture.1:99
 #, no-wrap
 msgid "VARIABLES"
 msgstr "VARIABLER"
 
 #. type: Plain text
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr "Följande variabler sätts av B<dpkg-architecture>:"
 
 #. type: IP
-#: dpkg-architecture.1:102
+#: dpkg-architecture.1:101
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 msgid "The Debian architecture of the build machine."
 msgstr "Debianarkitekturen för byggmaskinen."
 
 #. type: IP
-#: dpkg-architecture.1:104
+#: dpkg-architecture.1:103
 #, 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:105
 msgid "The Debian system name of the build machine."
 msgstr "Debiansystemnamnet för byggmaskinen."
 
 #. type: IP
-#: dpkg-architecture.1:106
+#: dpkg-architecture.1:105
 #, 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:107
 msgid "The Debian cpu name of the build machine."
 msgstr "Debian-processornamnet för byggmaskinen."
 
 #. type: IP
-#: dpkg-architecture.1:108
+#: dpkg-architecture.1:107
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_BITS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 msgid "The pointer size of the build machine (in bits)."
 msgstr "Pekarstorleken för byggmaskinen (i bitar)."
 
 #. type: IP
-#: dpkg-architecture.1:110
+#: dpkg-architecture.1:109
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_ENDIAN\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 msgid "The endianness of the build machine (little / big)."
 msgstr "Endian för byggmaskinen (little / big)."
 
 #. type: IP
-#: dpkg-architecture.1:112
+#: dpkg-architecture.1:111
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr "\\s-1CPU\\s0-delen av \\s-1DEB_BUILD_GNU_TYPE\\s0."
 
 #. type: IP
-#: dpkg-architecture.1:114
+#: dpkg-architecture.1:113
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr "Systemdelen av \\s-1DEB_BUILD_GNU_TYPE\\s0."
 
 #. type: IP
-#: dpkg-architecture.1:116
+#: dpkg-architecture.1:115
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:118
+#: dpkg-architecture.1:117
 msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr "\\s-1GNU\\s0-systemtypen för byggmaskinen."
 
 #. type: IP
-#: dpkg-architecture.1:118
-#, fuzzy, no-wrap
-#| msgid "\\s-1DEB_BUILD_ARCH\\s0"
+#: dpkg-architecture.1:117
+#, no-wrap
 msgid "\\s-1DEB_BUILD_MULTIARCH\\s0"
-msgstr "\\s-1DEB_BUILD_ARCH\\s0"
+msgstr "\\s-1DEB_BUILD_MULTIARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:121
-#, fuzzy
-#| msgid "The \\s-1GNU\\s0 system type of the build machine."
+#: dpkg-architecture.1:120
 msgid ""
 "The clarified \\s-1GNU\\s0 system type of the build machine, used for "
 "filesystem paths."
-msgstr "\\s-1GNU\\s0-systemtypen för byggmaskinen."
+msgstr ""
+"Den förtydligade \\s-1GNU\\s0-systemtypen för byggmaskinen, används för "
+"sökvägar i filsystemet."
 
 #. type: IP
-#: dpkg-architecture.1:121
+#: dpkg-architecture.1:120
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr "\\s-1DEB_HOST_ARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 msgid "The Debian architecture of the host machine."
 msgstr "Debianarkitekturen för värdmaskinen."
 
 #. type: IP
-#: dpkg-architecture.1:123
+#: dpkg-architecture.1:122
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_OS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 msgid "The Debian system name of the host machine."
 msgstr "Debiansystemnamnet för värdmaskinen."
 
 #. type: IP
-#: dpkg-architecture.1:125
+#: dpkg-architecture.1:124
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 msgid "The Debian cpu name of the host machine."
 msgstr "Debian-processornamnet för värdmaskinen."
 
 #. type: IP
-#: dpkg-architecture.1:127
+#: dpkg-architecture.1:126
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_BITS\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_BITS\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 msgid "The pointer size of the host machine (in bits)."
 msgstr "Pekarstorleken för värdmaskinen (i bitar)."
 
 #. type: IP
-#: dpkg-architecture.1:129
+#: dpkg-architecture.1:128
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_ENDIAN\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_ENDIAN\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 msgid "The endianness of the host machine (little / big)."
 msgstr "Endian för värdmaskinen (little / big)."
 
 #. type: IP
-#: dpkg-architecture.1:131
+#: dpkg-architecture.1:130
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr "\\s-1DEB_HOST_GNU_CPU\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr "\\s-1CPU\\s0-delen av \\s-1DEB_HOST_GNU_TYPE\\s0."
 
 #. type: IP
-#: dpkg-architecture.1:133
+#: dpkg-architecture.1:132
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr "Systemdelen av \\s-1DEB_HOST_GNU_TYPE\\s0."
 
 #. type: IP
-#: dpkg-architecture.1:135
+#: dpkg-architecture.1:134
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr "\\s-1DEB_HOST_GNU_TYPE\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:137
+#: dpkg-architecture.1:136
 msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgstr "\\s-1GNU\\s0-systemtypen för värdmaskinen."
 
 #. type: IP
-#: dpkg-architecture.1:137
-#, fuzzy, no-wrap
-#| msgid "\\s-1DEB_HOST_ARCH\\s0"
+#: dpkg-architecture.1:136
+#, no-wrap
 msgid "\\s-1DEB_HOST_MULTIARCH\\s0"
-msgstr "\\s-1DEB_HOST_ARCH\\s0"
+msgstr "\\s-1DEB_HOST_MULTIARCH\\s0"
 
 #. type: Plain text
-#: dpkg-architecture.1:140
-#, fuzzy
-#| msgid "The \\s-1GNU\\s0 system type of the host machine."
+#: dpkg-architecture.1:139
 msgid ""
 "The clarified \\s-1GNU\\s0 system type of the host machine, used for "
 "filesystem paths."
-msgstr "\\s-1GNU\\s0-systemtypen för värdmaskinen."
+msgstr ""
+"Den förtydligade \\s-1GNU\\s0-systemtypen för värdmaskinen, används för "
+"sökvägar i filsystemet."
 
 #. type: SH
-#: dpkg-architecture.1:141
+#: dpkg-architecture.1:140
 #, no-wrap
 msgid "DEBIAN/RULES"
 msgstr "DEBIAN/RULES"
 
 #. type: Plain text
-#: dpkg-architecture.1:149
+#: dpkg-architecture.1:148
 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 "
@@ -5693,12 +5710,12 @@
 "korskompilering i ditt paket:"
 
 #. type: Plain text
-#: dpkg-architecture.1:152 dpkg-architecture.1:169
+#: dpkg-architecture.1:151 dpkg-architecture.1:168
 msgid "Instead of:"
 msgstr "Istället för:"
 
 #. type: Plain text
-#: dpkg-architecture.1:156
+#: dpkg-architecture.1:155
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5708,12 +5725,12 @@
 "configure $(\\s-1ARCH\\s0)-linux\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:159
+#: dpkg-architecture.1:158
 msgid "please use the following:"
 msgstr "använder du följande:"
 
 #. type: Plain text
-#: dpkg-architecture.1:163
+#: dpkg-architecture.1:162
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
@@ -5723,13 +5740,13 @@
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:165
+#: dpkg-architecture.1:164
 #, 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:175
+#: dpkg-architecture.1:174
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -5743,18 +5760,18 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:178
+#: dpkg-architecture.1:177
 msgid "please use:"
 msgstr "använder du:"
 
 #. type: Plain text
-#: dpkg-architecture.1:181
+#: dpkg-architecture.1:180
 #, 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:185
+#: dpkg-architecture.1:184
 #, no-wrap
 msgid ""
 "ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
@@ -5766,7 +5783,7 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:189
+#: dpkg-architecture.1:188
 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."
@@ -5775,7 +5792,7 @@
 "DEB_HOST_ARCH_CPU eller DEB_HOST_ARCH_OS."
 
 #. type: Plain text
-#: dpkg-architecture.1:194
+#: dpkg-architecture.1:193
 msgid ""
 "In general, calling dpkg in the rules file to get architecture information "
 "is deprecated (unless you want to provide backward compatibility, see "
@@ -5789,13 +5806,13 @@
 "med namnet på processorn."
 
 #. type: SH
-#: dpkg-architecture.1:195
+#: dpkg-architecture.1:194
 #, no-wrap
 msgid "BACKWARD COMPATIBILITY"
 msgstr "BAKÅTKOMPATIBILITET"
 
 #. type: Plain text
-#: dpkg-architecture.1:199
+#: dpkg-architecture.1:198
 msgid ""
 "The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced in dpkg-"
 "dev 1.15.4. Using them in I<debian/rules> thus requires a build-dependency "
@@ -5806,7 +5823,7 @@
 "deklareras på dpkg-dev (E<gt>= 1.15.4)."
 
 #. type: Plain text
-#: dpkg-architecture.1:204
+#: dpkg-architecture.1:203
 msgid ""
 "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in dpkg-"
 "dev 1.13.2. Before this I<debian/rules> files tended to check the values of "
@@ -5819,7 +5836,7 @@
 "på sig."
 
 #. type: Plain text
-#: dpkg-architecture.1:209
+#: dpkg-architecture.1:208
 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 "
@@ -5832,7 +5849,7 @@
 "av dpkg-dev kan du använda följande kod:"
 
 #. type: Plain text
-#: dpkg-architecture.1:213
+#: dpkg-architecture.1:212
 #, no-wrap
 msgid ""
 "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
@@ -5842,7 +5859,7 @@
 "DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:227
+#: dpkg-architecture.1:226
 #, no-wrap
 msgid ""
 "# Take account of old dpkg-architecture output.\n"
@@ -5874,12 +5891,12 @@
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:230
+#: dpkg-architecture.1:229
 msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
 msgstr "Och på motsvarande sätt för DEB_BUILD_ARCH_CPU och DEB_BUILD_ARCH_OS."
 
 #. type: Plain text
-#: dpkg-architecture.1:233
+#: dpkg-architecture.1:232
 msgid ""
 "If you still wish to support versions of dpkg-dev that did not include "
 "B<dpkg-architecture>, the following does the job:"
@@ -5888,7 +5905,7 @@
 "architecture> fungerar följande:"
 
 #. type: Plain text
-#: dpkg-architecture.1:243
+#: dpkg-architecture.1:242
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
@@ -5910,7 +5927,7 @@
 "DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:248
+#: dpkg-architecture.1:247
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
@@ -5924,7 +5941,7 @@
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:252
+#: dpkg-architecture.1:251
 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."
@@ -5933,7 +5950,7 @@
 "Standardvariablerna kommer skrivas över om dpkg-architecture används."
 
 #. type: Plain text
-#: dpkg-architecture.1:259
+#: dpkg-architecture.1:258
 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 "
@@ -5950,7 +5967,7 @@
 "plattform)."
 
 #. type: Plain text
-#: dpkg-architecture.1:262
+#: dpkg-architecture.1:261
 msgid ""
 "The B<-e> and B<-i> options were only introduced in relatively recent "
 "versions of B<dpkg-architecture> (since dpkg 1.13.13)."
@@ -5959,7 +5976,7 @@
 "nyligen (sedan dpkg 1.13.13)."
 
 #. type: Plain text
-#: dpkg-architecture.1:266
+#: dpkg-architecture.1:265
 msgid ""
 "B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
 "architecture>. Other examples:"
@@ -5968,34 +5985,34 @@
 "architecture>. Andra exempel:"
 
 #. type: Plain text
-#: dpkg-architecture.1:268
+#: dpkg-architecture.1:267
 msgid "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 msgstr "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 
 #. type: Plain text
-#: dpkg-architecture.1:270
+#: dpkg-architecture.1:269
 msgid "eval \\`dpkg-architecture -u\\`"
 msgstr "eval \\`dpkg-architecture -u\\`"
 
 #. type: Plain text
-#: dpkg-architecture.1:273
+#: dpkg-architecture.1:272
 msgid ""
 "Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
 "Kontrollera om en arkitektur är samma som den nuvarande eller en given:"
 
 #. type: Plain text
-#: dpkg-architecture.1:275
+#: dpkg-architecture.1:274
 msgid "dpkg-architecture -elinux-alpha"
 msgstr "dpkg-architecture -elinux-alpha"
 
 #. type: Plain text
-#: dpkg-architecture.1:277
+#: dpkg-architecture.1:276
 msgid "dpkg-architecture -amips -elinux-mips"
 msgstr "dpkg-architecture -amips -elinux-mips"
 
 #. type: Plain text
-#: dpkg-architecture.1:280
+#: dpkg-architecture.1:279
 msgid ""
 "Check if the current architecture or an architecture provided with -a are "
 "Linux systems:"
@@ -6004,55 +6021,56 @@
 "Linuxsystem:"
 
 #. type: Plain text
-#: dpkg-architecture.1:282
+#: dpkg-architecture.1:281
 msgid "dpkg-architecture -ilinux-any"
 msgstr "dpkg-architecture -ilinux-any"
 
 #. type: Plain text
-#: dpkg-architecture.1:284
+#: dpkg-architecture.1:283
 msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr "dpkg-architecture -ai386 -ilinux-any"
 
 #. type: Plain text
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 msgid ""
 "All these files have to be present for B<dpkg-architecture> to work. Their "
 "location can be overridden at runtime with the environment variable "
-"DPKG_DATADIR."
+"B<DPKG_DATADIR>."
 msgstr ""
 "Alla dessa filer måste finnas för att B<dpkg-architecture> måste finnas. "
-"Deras placering kan överstyras vid körning med miljövariabeln DPKG_DATADIR."
+"Deras placering kan överstyras vid körning med miljövariabeln "
+"B<DPKG_DATADIR>."
 
 #. type: TP
-#: dpkg-architecture.1:289
+#: dpkg-architecture.1:288
 #, no-wrap
 msgid "I</usr/share/dpkg/cputable>"
 msgstr "I</usr/share/dpkg/cputable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 msgid "Table of known CPU names and mapping to their GNU name."
 msgstr "Tabell över kända processornamn och deras motsvarande GNU-namn."
 
 #. type: TP
-#: dpkg-architecture.1:292
+#: dpkg-architecture.1:291
 #, no-wrap
 msgid "I</usr/share/dpkg/ostable>"
 msgstr "I</usr/share/dpkg/ostable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 msgid "Table of known operating system names and mapping to their GNU name."
 msgstr "Tabell över kända operativsystemsnamn och deras motsvarande GNU-namn."
 
 #. type: TP
-#: dpkg-architecture.1:295
+#: dpkg-architecture.1:294
 #, no-wrap
 msgid "I</usr/share/dpkg/triplettable>"
 msgstr "I</usr/share/dpkg/triplettable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:299
+#: dpkg-architecture.1:298
 msgid ""
 "Mapping between Debian architecture triplets and Debian architecture names."
 msgstr ""
@@ -6060,12 +6078,12 @@
 "Debianarkitekturnamn."
 
 #. type: Plain text
-#: dpkg-architecture.1:303
+#: dpkg-architecture.1:302
 msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 msgstr "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 
 #. type: Plain text
-#: dpkg-architecture.1:308
+#: dpkg-architecture.1:307
 msgid ""
 "B<dpkg-architecture> and this man page were initially written by Marcus "
 "Brinkmann E<lt>brinkmd@debian.orgE<gt>."
@@ -6080,7 +6098,7 @@
 msgstr "dpkg.cfg"
 
 #. type: TH
-#: dpkg.cfg.5:1 dselect.cfg.5:1
+#: dpkg.cfg.5:1
 #, no-wrap
 msgid "2009-09-05"
 msgstr "2009-09-05"
@@ -6116,7 +6134,7 @@
 msgstr "I<~/.dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:214 dpkg-statoverride.8:87
+#: dpkg.cfg.5:24 dpkg-divert.8:134 dpkg-query.1:222 dpkg-statoverride.8:86
 msgid "B<dpkg>(1)."
 msgstr "B<dpkg>(1)."
 
@@ -6126,6 +6144,13 @@
 msgid "dpkg-buildflags"
 msgstr "dpkg-buildflags"
 
+#. type: TH
+#: dpkg-buildflags.1:1
+#, fuzzy, no-wrap
+#| msgid "2011-09-09"
+msgid "2011-09-13"
+msgstr "2011-09-09"
+
 #. type: Plain text
 #: dpkg-buildflags.1:4
 msgid "dpkg-buildflags - returns build flags to use during package build"
@@ -6134,8 +6159,8 @@
 
 #. type: Plain text
 #: dpkg-buildflags.1:8
-msgid "B<dpkg-buildflags> [I<option>...] I<command>"
-msgstr "B<dpkg-buildflags> [I<flaggor>...] I<kommando>"
+msgid "B<dpkg-buildflags> [I<option>...] [I<command>]"
+msgstr "B<dpkg-buildflags> [I<flagga>...] I<kommando>"
 
 #. type: Plain text
 #: dpkg-buildflags.1:12
@@ -6188,43 +6213,93 @@
 msgstr "3."
 
 #. type: Plain text
-#: dpkg-buildflags.1:22
-msgid "temporarily with environment variables (see section B<ENVIRONMENT>)."
-msgstr "temporärt med miljövariabler sätts (se stycket B<MILJÖ>)."
+#: dpkg-buildflags.1:23
+msgid ""
+"temporarily by the user with environment variables (see section "
+"B<ENVIRONMENT>);"
+msgstr "temporärt av användaren med miljövariabler (se stycket B<MILJÖ>)."
+
+#. type: IP
+#: dpkg-buildflags.1:23
+#, no-wrap
+msgid "4."
+msgstr "4."
+
+#. type: Plain text
+#: dpkg-buildflags.1:26
+msgid ""
+"dynamically by the package maintainer with environment variables set via "
+"B<debian/rules> (see section B<ENVIRONMENT>)."
+msgstr ""
+"dynamiskt av paketansvariga med miljövariabler som sätts via B<debian/rules> "
+"(se stycket B<MILJÖ>)."
 
 #. type: Plain text
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 msgid "The configuration files can contain two types of directives:"
 msgstr "Konfigurationsfilerna kan innehålla två sorters direktiv:"
 
 #. type: TP
-#: dpkg-buildflags.1:24
+#: dpkg-buildflags.1:28
 #, no-wrap
 msgid "B<SET>I< flag value>"
 msgstr "B<SET>I< flagga värde>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
 msgid "Override the flag named I<flag> to have the value I<value>."
 msgstr "Överstyr flaggan I<flagga> till att ha värdet I<värde>."
 
 #. type: TP
-#: dpkg-buildflags.1:27
+#: dpkg-buildflags.1:31
+#, no-wrap
+msgid "B<STRIP>I< flag value>"
+msgstr "B<STRIP>I< flagga värde>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:34
+msgid ""
+"Strip from the flag named I<flag> all the build flags listed in I<value>."
+msgstr ""
+"Ta bort alla flaggor som listas i I<värde> från flaggan som anges i "
+"I<flagga>."
+
+#. type: TP
+#: dpkg-buildflags.1:34
 #, no-wrap
 msgid "B<APPEND>I< flag value>"
 msgstr "B<APPEND>I< flagga värde>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:31
+#: dpkg-buildflags.1:38
+msgid ""
+"Extend the flag named I<flag> by appending the options given in I<value>.  A "
+"space is prepended to the appended value if the flag's current value is non-"
+"empty."
+msgstr ""
+"Utöka flaggan I<flagga> genom att lägga till alternativen som anges i "
+"I<värde>. Ett blanksteg läggs till före värdet om flaggans nuvarande värde "
+"inte är tomt."
+
+#. type: TP
+#: dpkg-buildflags.1:38
+#, no-wrap
+msgid "B<PREPEND>I< flag value>"
+msgstr "B<PREPEND>I< flagga värde>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:42
 msgid ""
-"Extend the flag named I<flag> with the options given in I<value>.  A space "
-"is prepended to the appended value if the flag's current value is non-empty."
+"Extend the flag named I<flag> by prepending the options given in I<value>.  "
+"A space is appended to the prepended value if the flag's current value is "
+"non-empty."
 msgstr ""
-"Utöka flaggan I<flagga> med alternativen som anges i I<värde>. Ett blanksteg "
-"läggs till före värdet om flaggans nuvarande värde inte är tomt."
+"Utöka flaggan I<flagga> genom att lägga till alternativen som anges i "
+"I<värde> först. Ett blanksteg läggs till efter värdet om flaggans nuvarande "
+"värde inte är tomt."
 
 #. type: Plain text
-#: dpkg-buildflags.1:34
+#: dpkg-buildflags.1:45
 msgid ""
 "The configuration files can contain comments on lines starting with a hash "
 "(#). Empty lines are also ignored."
@@ -6233,13 +6308,30 @@
 "nummertecken (#). Även tomma rader ignoreras."
 
 #. type: TP
-#: dpkg-buildflags.1:35
+#: dpkg-buildflags.1:46
+#, no-wrap
+msgid "B<--dump>"
+msgstr "B<--dump>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:51
+msgid ""
+"Print to standard output all compilation flags and their values. It prints "
+"one flag per line separated from its value by an equal sign "
+"(\"I<flag>=I<value>\"). This is the default action."
+msgstr ""
+"Skriv alla kompileringsflaggor och deras värde på standard ut. En flagga "
+"skrivs per rad, avdelade från sitt värde med ett likamedtecken "
+"(\"I<flagga>=I<värde>\"). Detta är standardåtgärden."
+
+#. type: TP
+#: dpkg-buildflags.1:51
 #, no-wrap
 msgid "B<--list>"
 msgstr "B<--list>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 msgid ""
 "Print the list of flags supported by the current vendor (one per line). See "
 "the B<SUPPORTED FLAGS> section for more information about them."
@@ -6248,34 +6340,36 @@
 "rad). Se stycket B<FLAGGOR SOM STÖDS> för mer information om dem."
 
 #. type: TP
-#: dpkg-buildflags.1:40
+#: dpkg-buildflags.1:56
 #, no-wrap
 msgid "B<--export=>I<format>"
 msgstr "B<--export=>I<format>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 msgid ""
 "Print to standard output shell (if I<format> is B<sh>) or make (if I<format> "
 "is B<make>) commands that can be used to export all the compilation flags in "
-"the environment. If the I<format> value is not given, B<sh> is assumed. Only "
-"compilation flags starting with an upper case character are included, others "
-"are assumed to not be suitable for the environment."
+"the environment. If I<format> is B<configure> then the output can be used on "
+"a B<./configure> command-line. If the I<format> value is not given, B<sh> is "
+"assumed. Only compilation flags starting with an upper case character are "
+"included, others are assumed to not be suitable for the environment."
 msgstr ""
 "Skriv skal- (om I<format> är B<sh>) eller make-kommandon (om I<format> är "
 "B<make>) som kan användas för att exportera alla kompileringsflaggor i "
-"miljön till standard ut. Om I<format> inte anges antas B<sh>. Endast "
+"miljön till standard ut. Om I<format> är B<configure> kan utdata användas på "
+"en B<./configure>-kommandorad. Om I<format> inte anges antas B<sh>. Endast "
 "kompileringsflaggor som börjar med en stor bokstav tas med, andra antas att "
 "inte vara lämpliga för miljön."
 
 #. type: TP
-#: dpkg-buildflags.1:48
+#: dpkg-buildflags.1:66
 #, no-wrap
 msgid "B<--get>I< flag>"
 msgstr "B<--get>I< flagga>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 msgid ""
 "Print the value of the flag on standard output. Exits with 0 if the flag is "
 "known otherwise exits with 1."
@@ -6284,13 +6378,13 @@
 "känd, om inte avslutar den med 1."
 
 #. type: TP
-#: dpkg-buildflags.1:52
+#: dpkg-buildflags.1:70
 #, no-wrap
 msgid "B<--origin>I< flag>"
 msgstr "B<--origin>I< flagga>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:57
+#: dpkg-buildflags.1:75
 msgid ""
 "Print the origin of the value that is returned by B<--get>. Exits with 0 if "
 "the flag is known otherwise exits with 1. The origin can be one of the "
@@ -6301,63 +6395,63 @@
 "värden:"
 
 #. type: TP
-#: dpkg-buildflags.1:58
+#: dpkg-buildflags.1:76
 #, no-wrap
 msgid "B<vendor>"
 msgstr "B<vendor>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 msgid "the original flag set by the vendor is returned;"
 msgstr "originalflagga satt av leverantören returneras;"
 
 #. type: TP
-#: dpkg-buildflags.1:61
+#: dpkg-buildflags.1:79
 #, no-wrap
 msgid "B<system>"
 msgstr "B<system>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 msgid "the flag is set/modified by a system-wide configuration;"
 msgstr "flaggan är satt/modifierad av systemkonfigurationen;"
 
 #. type: TP
-#: dpkg-buildflags.1:64
+#: dpkg-buildflags.1:82
 #, no-wrap
 msgid "B<user>"
 msgstr "B<user>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 msgid "the flag is set/modified by a user-specific configuration;"
 msgstr "flaggan är satt/modifierad av användarkonfigurationen;"
 
 #. type: TP
-#: dpkg-buildflags.1:67
+#: dpkg-buildflags.1:85
 #, no-wrap
 msgid "B<env>"
 msgstr "B<env>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:70
+#: dpkg-buildflags.1:88
 msgid "the flag is set/modified by an environment-specific configuration."
 msgstr "flaggan är satt/modifierad av en miljöspecifik konfiguration."
 
 #. type: SH
-#: dpkg-buildflags.1:78
+#: dpkg-buildflags.1:96
 #, no-wrap
 msgid "SUPPORTED FLAGS"
 msgstr "FLAGGOR SOM STÖDS"
 
 #. type: TP
-#: dpkg-buildflags.1:79
+#: dpkg-buildflags.1:97
 #, no-wrap
 msgid "B<CFLAGS>"
 msgstr "B<CFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 msgid ""
 "Options for the C compiler. The default value set by the vendor includes I<-"
 "g> and the default optimization level (I<-O2> usually, or I<-O0> if the "
@@ -6368,46 +6462,46 @@
 "I<-O0> om miljövariabeln B<DEB_BUILD_OPTIONS> definierar I<noopt>)."
 
 #. type: TP
-#: dpkg-buildflags.1:85
+#: dpkg-buildflags.1:103
 #, no-wrap
 msgid "B<CPPFLAGS>"
 msgstr "B<CPPFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 msgid "Options for the C preprocessor. Default value: empty."
 msgstr "Flaggor för C-förprocesseraren. Förvalt värde: tomt."
 
 #. type: TP
-#: dpkg-buildflags.1:88
+#: dpkg-buildflags.1:106
 #, no-wrap
 msgid "B<CXXFLAGS>"
 msgstr "B<CXXFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 msgid "Options for the C++ compiler. Same as B<CFLAGS>."
 msgstr "Flaggor för C++-kompilatorn. Samma som B<CFLAGS>."
 
 #. type: TP
-#: dpkg-buildflags.1:91
+#: dpkg-buildflags.1:109
 #, no-wrap
 msgid "B<FFLAGS>"
 msgstr "B<FFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 msgid "Options for the Fortran compiler. Same as B<CFLAGS>."
 msgstr "Flaggor för Fortrankompilatorn. Samma som B<CFLAGS>."
 
 #. type: TP
-#: dpkg-buildflags.1:94
+#: dpkg-buildflags.1:112
 #, no-wrap
 msgid "B<LDFLAGS>"
 msgstr "B<LDFLAGS>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:102
+#: dpkg-buildflags.1:120
 msgid ""
 "Options passed to the compiler when linking executables or shared objects "
 "(if the linker is called directly, then B<-Wl> and B<,> have to be stripped "
@@ -6418,60 +6512,416 @@
 "flaggor). Standardvärde: tomt."
 
 #. type: TP
-#: dpkg-buildflags.1:104
+#: dpkg-buildflags.1:122
 #, no-wrap
 msgid "B</etc/dpkg/buildflags.conf>"
 msgstr "B</etc/dpkg/buildflags.conf>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
 msgid "System wide configuration file."
 msgstr "Konfigurationsfil för hela systemet."
 
 #. type: TP
-#: dpkg-buildflags.1:107
+#: dpkg-buildflags.1:125
+#, no-wrap
+msgid "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or B<$HOME/.config/dpkg/buildflags.conf>"
+msgstr "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> eller B<$HOME/.config/dpkg/buildflags.conf>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:128
+msgid "User configuration file."
+msgstr "Användarens konfigurationsfil."
+
+#. type: Plain text
+#: dpkg-buildflags.1:135
+msgid ""
+"There are 2 sets of environment variables doing the same operations, the "
+"first one (DEB_I<flag>_I<op>) should never be used within B<debian/rules>. "
+"It's meant for any user that wants to rebuild the source package with "
+"different build flags. The second set (DEB_I<flag>_MAINT_I<op>) should only "
+"be used in B<debian/rules> by package maintainers to change the resulting "
+"build flags."
+msgstr ""
+"Det finns två uppsättningar miljövariabler som utför samma operationer, den "
+"första (DEB_I<flagga>_I<op>) bör aldrig användas inuti B<debian/rules>). Den "
+"är tänkt för användare som vill bygga om källkodspaketet med andra "
+"byggflaggor. Den andra uppsättningen (DEB_I<flagga>_MAINT_I<op>) bör endast "
+"användas i B<debian/rules> av paketansvariga för att ändra de slutgiltiga "
+"byggflaggorna."
+
+#. type: TP
+#: dpkg-buildflags.1:135
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_SET>"
+msgstr "B<DEB_>I<flagga>B<_SET>"
+
+#. type: TQ
+#: dpkg-buildflags.1:137
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_SET>"
+msgstr "B<DEB_>I<flagga>B<_MAINT_SET>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:141
+msgid ""
+"This variable can be used to force the value returned for the given I<flag>."
+msgstr ""
+"Denna variabel kan användas för att tvinga fram värdet som returneras för "
+"given I<flagga>."
+
+#. type: TP
+#: dpkg-buildflags.1:141
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_STRIP>"
+msgstr "B<DEB_>I<flagga>B<_STRIP>"
+
+#. type: TQ
+#: dpkg-buildflags.1:143
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_STRIP>"
+msgstr "B<DEB_>I<flagga>B<_MAINT_STRIP>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:148
+msgid ""
+"This variable can be used to provide a space separated list of options that "
+"will be stripped from the set of flags returned for the given I<flag>."
+msgstr ""
+"Denna variabel kan användas för att tillhandahålla en blankstegsavdelad "
+"lista med flaggor som kommer att tas bort från uppsättningen flaggor som ges "
+"för given I<flagga>."
+
+#. type: TP
+#: dpkg-buildflags.1:148
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_APPEND>"
+msgstr "B<DEB_>I<flagga>B<_APPEND>"
+
+#. type: TQ
+#: dpkg-buildflags.1:150
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_APPEND>"
+msgstr "B<DEB_>I<flagga>B<_MAINT_APPEND>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:154
+msgid ""
+"This variable can be used to append supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+"Denna variabel kan användas för att lägga till ytterligare flaggor till "
+"värdet som returneras för given I<flagga>."
+
+#. type: TP
+#: dpkg-buildflags.1:154
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_PREPEND>"
+msgstr "B<DEB_>I<flagga>B<_PREPEND>"
+
+#. type: TQ
+#: dpkg-buildflags.1:156
+#, no-wrap
+msgid "B<DEB_>I<flag>B<_MAINT_PREPEND>"
+msgstr "B<DEB_>I<flagga>B<_MAINT_PREPEND>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:160
+msgid ""
+"This variable can be used to prepend supplementary options to the value "
+"returned for the given I<flag>."
+msgstr ""
+"Denna variabel kan användas för att lägga till ytterligare flaggor först i "
+"värdet som returneras för given I<flagga>."
+
+#. type: TP
+#: dpkg-buildflags.1:160
+#, no-wrap
+msgid "B<DEB_BUILD_MAINT_OPTIONS>"
+msgstr "B<DEB_BUILD_MAINT_OPTIONS>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:165
+msgid ""
+"This variable can be used to disable/enable various hardening build flags "
+"through the B<hardening> option. See the B<HARDENING> section for details."
+msgstr ""
+"Den här variabeln kan användas för att slå av/på olika härdningsbyggflaggor "
+"genom alternativet B<hardening>. Se avsnittet B<HÄRDNING> för mer "
+"information."
+
+#. type: SH
+#: dpkg-buildflags.1:166
+#, no-wrap
+msgid "HARDENING"
+msgstr "HÄRDNING"
+
+#. type: Plain text
+#: dpkg-buildflags.1:171
+msgid ""
+"Several compile-time options (detailed below) can be used to help harden a "
+"resulting binary against memory corruption attacks, or provide additional "
+"warning messages during compilation. Except as noted below, these are "
+"enabled by default for architectures that support them."
+msgstr ""
+"Du kan använda flera kompileringsflaggor (se detaljer nedan) för att härda "
+"den färdiga binären mot minnesfördärvningsangrepp, eller för att ge "
+"ytterligare varningsmeddelanden under kompileringen. Förutom det som anges "
+"nedan aktiveras dessa som standard för arkitekturer som stöder dem."
+
+#. type: Plain text
+#: dpkg-buildflags.1:177
+msgid ""
+"Each hardening feature can be enabled and disabled in the "
+"B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value with "
+"the \"+\" and \"-\" modifier. For example, to enable the \"pie\" feature and "
+"disable the \"fortify\" feature you can do this in B<debian/rules>:"
+msgstr ""
+"Varje härdningsfunktion kan aktiveras och inaktiveras i miljövariabeln "
+"B<DEB_BUILD_MAINT_OPTIONS> värde B<hardening> med modifierarna \"+\" och \"-"
+"\". Du kan till exempel aktivera och funktionen \"pie\" och inaktivera "
+"funktionen \"fortify\" genom att ange detta i B<debian/rules>:"
+
+#. type: Plain text
+#: dpkg-buildflags.1:179
+#, fuzzy, no-wrap
+#| msgid "  export DEB_BUILD_MAINT_OPTIONS=\"hardening=+pie,-fortify\"\n"
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n"
+msgstr "  export DEB_BUILD_MAINT_OPTIONS=\"hardening=+pie,-fortify\"\n"
+
+#. type: Plain text
+#: dpkg-buildflags.1:183
+msgid ""
+"The special feature B<all> can be used to enable or disable all hardening "
+"features at the same time. Thus disabling everything and enabling only "
+"\"format\" and \"fortify\" can be achieved with:"
+msgstr ""
+"Den speciella funktionen B<all> kan användas för att aktivera eller "
+"inaktivera alla härdningsfunktioner samtidigt. Du kan till exempel "
+"inaktivera allt och endast aktivera \"format\" och \"fortify\" med:"
+
+#. type: Plain text
+#: dpkg-buildflags.1:185
+#, fuzzy, no-wrap
+#| msgid "  export DEB_BUILD_MAINT_OPTIONS=\"hardening=-all,+format,+fortify\"\n"
+msgid "  export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n"
+msgstr "  export DEB_BUILD_MAINT_OPTIONS=\"hardening=-all,+format,+fortify\"\n"
+
+#. type: TP
+#: dpkg-buildflags.1:186
+#, no-wrap
+msgid "B<format>"
+msgstr "B<format>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:198
+msgid ""
+"This setting (enabled by default) adds B<-Wformat -Wformat-security -"
+"Werror=format-security> to B<CFLAGS> and B<CXXFLAGS>. This will warn about "
+"improper format string uses, and will fail when format functions are used in "
+"a way that that represent possible security problems. At present, this warns "
+"about calls to B<printf> and B<scanf> functions where the format string is "
+"not a string literal and there are no format arguments, as in B<printf(foo);"
+"> instead of B<printf(\"%s\", foo);> This may be a security hole if the "
+"format string came from untrusted input and contains \"%n\"."
+msgstr ""
+"Inställningen (aktiverad som standard) lägger till B<-Wformat -Wformat-"
+"security -Werror=format-security> till B<CFLAGS> och B<CXXFLAGS>. Detta "
+"kommer att varna om olämplig användning av formatsträngar, och att "
+"misslyckas när formatfunktionerna används på ett sätt som representerar "
+"möjliga säkerhetsproblem. För närvarande varnar detta om anrop till "
+"funktionerna B<printf> och B<scanf> där formatsträngen inte är en fast "
+"sträng och när det inte finns några formatargument, som i B<printf(foo);> "
+"istället för B<printf(\"%s\", foo);> Detta kan vara ett säkerhetshål om "
+"formatsträngen kommer från en obetrodd källa och innehåller \"%n\"."
+
+#. type: TP
+#: dpkg-buildflags.1:199
+#, no-wrap
+msgid "B<fortify>"
+msgstr "B<fortify>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:210
+#, fuzzy
+#| msgid ""
+#| "This setting (enabled by default) adds B<-D_FORTIFY_SOURCE=2> to "
+#| "B<CFLAGS> and B<CXXFLAGS>. During code generation the compiler knows a "
+#| "great deal of information about buffer sizes (where possible), and "
+#| "attempts to replace insecure unlimited length buffer function calls with "
+#| "length-limited ones. This is especially useful for old, crufty code.  "
+#| "Additionally, format strings in writable memory that contain '%n' are "
+#| "blocked. If an application depends on such a format string, it will need "
+#| "to be worked around."
+msgid ""
+"This setting (enabled by default) adds B<-D_FORTIFY_SOURCE=2> to "
+"B<CPPFLAGS>. During code generation the compiler knows a great deal of "
+"information about buffer sizes (where possible), and attempts to replace "
+"insecure unlimited length buffer function calls with length-limited ones. "
+"This is especially useful for old, crufty code.  Additionally, format "
+"strings in writable memory that contain '%n' are blocked. If an application "
+"depends on such a format string, it will need to be worked around."
+msgstr ""
+"Inställningen (aktiverad som standard) lägger till  B<-D_FORTIFY_SOURCE=2> "
+"till B<CFLAGS>. Kompilatorn har under kodgenereringen kännedom om en hel del "
+"information om buffertstorlekar (där tillämpligt) och försöker ersätta "
+"osäkra funktionsanrop med obegränsade buffertlängder med längdbegränsade "
+"dito. Det här är speciellt användbart för gammal, skräpig kod. Dessutom "
+"blockeras formatsträngar i skrivbart minne som innehåller \"%n\". Om ett "
+"program är beroende av en sådan formatsträng måste det gås runt i kod."
+
+#. type: Plain text
+#: dpkg-buildflags.1:213
+msgid ""
+"Note that for this option to have any effect, the source must also be "
+"compiled with B<-O1> or higher."
+msgstr ""
+"Observera att, för att den här flaggan skall ha någon effekt, måste "
+"källkoden också kompileras med B<-O1> eller högre."
+
+#. type: TP
+#: dpkg-buildflags.1:213
+#, no-wrap
+msgid "B<stackprotector>"
+msgstr "B<stackprotector>"
+
+#. type: Plain text
+#: dpkg-buildflags.1:222
+msgid ""
+"This setting (enabled by default) adds B<-fstack-protector --param=ssp-"
+"buffer-size=4> to B<CFLAGS> and B<CXXFLAGS>. This adds safety checks against "
+"stack overwrites. This renders many potential code injection attacks into "
+"aborting situations. In the best case this turns code injection "
+"vulnerabilities into denial of service or into non-issues (depending on the "
+"application)."
+msgstr ""
+"Inställningen (aktiverad som standard) lägger till B<-fstack-protector --"
+"param=ssp-buffer-size=4> till B<CFLAGS> och B<CXXFLAGS>. Detta lägger till "
+"säkerhetskontroller mot stacköverskrivningar, vilket gör att många möjliga "
+"kodinjiceringsangrepp istället avbryter programmet. I det bästa fallet gör "
+"det kodinjiceringsangrepp till överbelastnignsangrepp eller icke-problem "
+"(beroende på programmet)."
+
+#. type: Plain text
+#: dpkg-buildflags.1:226
+msgid ""
+"This feature requires linking against glibc (or another provider of "
+"B<__stack_chk_fail>), so needs to be disabled when building with B<-"
+"nostdlib> or B<-ffreestanding> or similar."
+msgstr ""
+"Den här funktionen kräver länkning mot glibc (eller ett annat bibliotek som "
+"tillhandahåller B<__stack_chk_fail>), så det måste inaktiveras när du bygger "
+"med B<-nostdlib> eller B<-ffreestanding> eller liknande."
+
+#. type: TP
+#: dpkg-buildflags.1:227
 #, no-wrap
-msgid "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or B<$HOME/.config/dpkg/buildflags.conf>"
-msgstr "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> eller B<$HOME/.config/dpkg/buildflags.conf>"
+msgid "B<relro>"
+msgstr "B<relro>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:110
-msgid "User configuration file."
-msgstr "Användarens konfigurationsfil."
+#: dpkg-buildflags.1:235
+msgid ""
+"This setting (enabled by default) adds B<-Wl,-z,relro> to B<LDFLAGS>.  "
+"During program load, several ELF memory sections need to be written to by "
+"the linker. This flags the loader to turn these sections read-only before "
+"turning over control to the program. Most notably this prevents GOT "
+"overwrite attacks."
+msgstr ""
+"Inställningen (aktiverad som standard) lägger till B<-Wl,-z,relro> till "
+"B<LDFLAGS>. Vid inläsning av programmet måste länkaren skriva till flera ELF-"
+"minnessektioner. Den här inställningen flaggar till inläsaren att dessa "
+"sektioner skall göras skrivskyddade innan programmet får kontroll. Detta "
+"skyddar huvudsaklingen mot GOT-överskrivningsangrepp."
 
 #. type: TP
-#: dpkg-buildflags.1:111
+#: dpkg-buildflags.1:236
 #, no-wrap
-msgid "B<DEB_>I<flag>B<_SET>"
-msgstr "B<DEB_>I<flagga>B<_SET>"
+msgid "B<bindnow>"
+msgstr "B<bindnow>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:243
+#, fuzzy
+#| msgid ""
+#| "This setting (enabled by default) adds B<-Wl,-z,bindnow> to B<LDFLAGS>. "
+#| "During program load, all dynamic symbols are resolved, allowing for the "
+#| "entire PLT to be marked read-only (due to B<relro> above)."
 msgid ""
-"This variable can be used to force the value returned for the given I<flag>."
+"This setting (disabled by default) adds B<-Wl,-z,now> to B<LDFLAGS>. During "
+"program load, all dynamic symbols are resolved, allowing for the entire PLT "
+"to be marked read-only (due to B<relro> above)."
 msgstr ""
-"Denna variabel kan användas för att tvinga fram värdet som returneras för "
-"given I<flagga>."
+"Inställningen (aktiverad som standard) lägger till B<-Wl,-z,bindnow> till "
+"B<LDFLAGS>. Vid inläsning av programmet löses alla dynamiska symboler, "
+"vilket gör att hela PLT kan markeras som skrivskyddad (på grund av B<relro> "
+"ovan)."
 
 #. type: TP
-#: dpkg-buildflags.1:115
+#: dpkg-buildflags.1:244
 #, no-wrap
-msgid "B<DEB_>I<flag>B<_APPEND>"
-msgstr "B<DEB_>I<flagga>B<_APPEND>"
+msgid "B<pie>"
+msgstr "B<pie>"
 
 #. type: Plain text
-#: dpkg-buildflags.1:119
+#: dpkg-buildflags.1:256
 msgid ""
-"This variable can be used to append supplementary options to the value "
-"returned for the given I<flag>."
+"This setting (disabled by default) adds B<-fPIE> to B<CFLAGS> and "
+"B<CXXFLAGS>, and B<-fPIE -pie> to B<LDFLAGS>. Position Independent "
+"Executable are needed to take advantage of Address Space Layout "
+"Randomization, supported by some kernel versions. While ASLR can already be "
+"enforced for data areas in the stack and heap (brk and mmap), the code areas "
+"must be compiled as position-independent. Shared libraries already do this (-"
+"fPIC), so they gain ASLR automatically, but binary .text regions need to be "
+"build PIE to gain ASLR. When this happens, ROP (Return Oriented Programming) "
+"attacks are much harder since there are no static locations to bounce off of "
+"during a memory corruption attack."
 msgstr ""
-"Denna variabel kan användas för att lägga till ytterligare flaggor till "
-"värdet som returneras för given I<flagga>."
+"Inställningen (inaktiverad som standard) lägger till B<-fPIE> till B<CFLAGS> "
+"och B<CXXFLAGS>, samt B<-fPIE -pie> till B<LDFLAGS>. Positionsoberoende "
+"exekverbara program (PIE) behövs för att dra fördel av slumpmässig "
+"adressrymd (ASLR), vilket stöds av vissa versioner av kärnan. Medan ASLR "
+"redan kan användas för datautrymmen i stacken och heap:en (brk och mmap), "
+"måste kodområden först kompileras som positionsoberoende. Delade bibliotek "
+"gör redan detta (-fPI C), så de drar automatiskt fördel av ASLR medan "
+"binära .text-regioner måste byggas med PIE för att uppnå ASLR. När detta "
+"sker är ROP-angrepp (Return Oriented Programming) mycket svårare eftersom "
+"det inte finns några statiska platser att studsa från i ett "
+"minnesfördärvningsangrepp."
 
 #. type: Plain text
-#: dpkg-buildflags.1:122 dpkg-maintscript-helper.1:130
-msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
-msgstr "Upphovsrättsskyddat © 2010 Raphaël Hertzog"
+#: dpkg-buildflags.1:259
+msgid ""
+"This is not compatible with B<-fPIC> so care must be taken when building "
+"shared objects."
+msgstr ""
+"Detta är inte kompatibelt med B<-fPIC> så man måste vara försiktig när man "
+"bygger delade objekt."
+
+#. type: Plain text
+#: dpkg-buildflags.1:265
+msgid ""
+"Additionally, since PIE is implemented via a general register, some "
+"architectures (most notably i386) can see performance losses of up to 15% in "
+"very text-segment-heavy application workloads; most workloads see less than "
+"1%. Architectures with more general registers (e.g. amd64)  do not see as "
+"high a worst-case penalty."
+msgstr ""
+"Eftersom PIE i tillägg implementeras med ett generellt register kan vissa "
+"arkitekturer (huvudsakligen i386) se prestandaförluster upp till 15% i "
+"väldigt textsegment-tunga programs körning; de flesta körningar ser mindre "
+"än 1%. Arkitekturer med många generella register (t.ex amd64) ser inte en "
+"lika stor värsta falls-förlust."
+
+#. type: Plain text
+#: dpkg-buildflags.1:268
+msgid "Copyright \\(co 2010-2011 Rapha\\[:e]l Hertzog"
+msgstr "Upphovsrättsskyddat © 2010-2011 Raphaël Hertzog"
+
+#. type: Plain text
+#: dpkg-buildflags.1:270
+msgid "Copyright \\(co 2011 Kees Cook"
+msgstr "Upphovsrättsskyddat © 2011 Kees Cook"
 
 #. type: TH
 #: dpkg-buildpackage.1:1
@@ -6486,8 +6936,8 @@
 
 #. type: Plain text
 #: dpkg-buildpackage.1:8
-msgid "B<dpkg-buildpackage> [I<options>]"
-msgstr "B<dpkg-buildpackage> [I<flaggor>]"
+msgid "B<dpkg-buildpackage> [I<option>...]"
+msgstr "B<dpkg-buildpackage> [I<flagga>...]"
 
 #. type: Plain text
 #: dpkg-buildpackage.1:13
@@ -6778,7 +7228,7 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:96 dpkg-genchanges.1:49 dpkg-gencontrol.1:38
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 #, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<-v>I<version>"
@@ -6875,7 +7325,7 @@
 "Detta är standardbeteendet."
 
 #. type: TP
-#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:427
+#: dpkg-buildpackage.1:130 dpkg-gensymbols.1:432
 #, no-wrap
 msgid "B<-d>"
 msgstr "B<-d>"
@@ -7082,8 +7532,8 @@
 msgstr "B<--admindir> I<kat>"
 
 #. type: Plain text
-#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:116
-#: dpkg-shlibdeps.1:217 dpkg-trigger.1:43
+#: dpkg-buildpackage.1:222 dpkg-checkbuilddeps.1:23 dpkg-query.1:122
+#: dpkg-shlibdeps.1:215 dpkg-trigger.1:43
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
 "lib/dpkg>."
@@ -7091,10 +7541,10 @@
 
 #. type: TP
 #: dpkg-buildpackage.1:223 dpkg-checkbuilddeps.1:33 dpkg-distaddfile.1:32
-#: dpkg-deb.1:163 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
-#: dpkg-gensymbols.1:438 dpkg-name.1:57 dpkg-parsechangelog.1:33
-#: dpkg-query.1:104 dpkg-scanpackages.1:97 dpkg-shlibdeps.1:217
-#: dpkg-source.1:90 dpkg-split.1:127 dpkg-trigger.1:31
+#: dpkg-deb.1:172 dpkg-genchanges.1:131 dpkg-gencontrol.1:121
+#: dpkg-gensymbols.1:443 dpkg-name.1:58 dpkg-parsechangelog.1:33
+#: dpkg-query.1:110 dpkg-scanpackages.1:96 dpkg-shlibdeps.1:215
+#: dpkg-source.1:96 dpkg-split.1:126 dpkg-trigger.1:31
 #, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr "B<-h>, B<--help>"
@@ -7102,7 +7552,7 @@
 #. type: Plain text
 #: dpkg-buildpackage.1:234
 msgid ""
-"Even if B<dpkg-buildpackage> export some variables, B<debian/rules> should "
+"Even if B<dpkg-buildpackage> exports some variables, B<debian/rules> should "
 "not rely on their presence and should instead use the respective interface "
 "to retrieve the needed values."
 msgstr ""
@@ -7129,19 +7579,19 @@
 #. type: SS
 #: dpkg-buildpackage.1:238
 #, no-wrap
-msgid "Compiler flags"
-msgstr "Kompileringsflaggor"
+msgid "Compiler flags are no longer exported"
+msgstr "Kompileringsflaggor exporteras inte längre."
 
 #. type: Plain text
 #: dpkg-buildpackage.1:243
 msgid ""
-"The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
-"environment variables are set to the values that B<dpkg-buildflags> "
-"returned. See its manual page for more information."
-msgstr ""
-"Miljövariablerna B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> och "
-"B<LDFLAGS> sätts till de värden som B<dpkg-buildflags> returnerar. Se dess "
-"manualsida för ytterligare information."
+"Between versions 1.14.17 and 1.16.1, B<dpkg-buildpackage> exported compiler "
+"flags (B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS>) with "
+"values as returned by B<dpkg-buildflags>. This is no longer the case."
+msgstr ""
+"Mellan version 1.14.17 och 1.16.1 exporterade B<dpkg-buildpackage> "
+"kompilatorflaggor (B<CFLAGS>, B<CXXFLAGS>, B<CPPFLAGS> och B<LDFLAGS>) med "
+"värden enligt B<dpkg-buildflags>. Detta gäller inte längre."
 
 #. type: Plain text
 #: dpkg-buildpackage.1:248
@@ -7153,16 +7603,16 @@
 "inledande argument för, I<få-root-kommando> och I<signeringskommando>."
 
 #. type: Plain text
-#: dpkg-buildpackage.1:255
+#: dpkg-buildpackage.1:256
 msgid ""
-"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
-"B<fakeroot>(1), B<gpg>(1)."
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
+"genchanges>(1), B<fakeroot>(1), B<gpg>(1)."
 msgstr ""
-"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
-"B<fakeroot>(1), B<gpg>(1)."
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
+"genchanges>(1), B<fakeroot>(1), B<gpg>(1)."
 
 #. type: Plain text
-#: dpkg-buildpackage.1:264 dpkg-source.1:712
+#: dpkg-buildpackage.1:265
 msgid "Copyright \\(co 2008-2010 Rapha\\[:e]l Hertzog"
 msgstr "Upphovsrättsskyddat © 2008-2010 Raphaël Hertzog"
 
@@ -7172,12 +7622,6 @@
 msgid "dpkg-checkbuilddeps"
 msgstr "dpkg-checkbuilddeps"
 
-#. type: TH
-#: dpkg-checkbuilddeps.1:1
-#, no-wrap
-msgid "2009-11-21"
-msgstr "2009-11-21"
-
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:4
 msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
@@ -7185,8 +7629,8 @@
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:9
-msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
-msgstr "B<dpkg-checkbuilddeps> [I<flaggor>] [I<kontrollfil>]"
+msgid "B<dpkg-checkbuilddeps> [I<option>...] [I<control-file>]"
+msgstr "B<dpkg-checkbuilddeps> [I<flagga>...] [I<control-fil>]"
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:14
@@ -7202,11 +7646,11 @@
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:17
 msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
+"By default, B<debian/control> is read, but an alternate control filename may "
 "be specified on the command line."
 msgstr ""
-"Som standard läses I<debian/control>, men ett alternativt kontrollfilnamn "
-"kan anges på kommandoraden."
+"Som standard läses B<debian/control>, men ett alternativt styrfilnamn kan "
+"anges på kommandoraden."
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.1:27
@@ -7256,8 +7700,8 @@
 
 #. type: Plain text
 #: dpkg-distaddfile.1:8
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
-msgstr "B<dpkg-distaddfile> [I<flaggor>]I< filnamn sektion prioritet>"
+msgid "B<dpkg-distaddfile> [I<option>...]I< filename section priority>"
+msgstr "B<dpkg-distaddfile> [I<flagga>...]I< filnamn sektion prioritet>"
 
 #. type: Plain text
 #: dpkg-distaddfile.1:13
@@ -7322,24 +7766,18 @@
 msgid "dpkg-deb"
 msgstr "dpkg-deb"
 
-#. type: TH
-#: dpkg-deb.1:1 dpkg-query.1:1 dselect.1:1
-#, no-wrap
-msgid "2010-03-07"
-msgstr "2010-03-07"
-
 #. 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)"
 
 #. type: Plain text
-#: dpkg-deb.1:9
-msgid "B<dpkg-deb> [I<options>] I<command>"
-msgstr "B<dpkg-deb> [I<flaggor>] I<åtgärd>"
+#: dpkg-deb.1:8
+msgid "B<dpkg-deb> [I<option>...] I<command>"
+msgstr "B<dpkg-deb> [I<flagga>...] I<åtgärd>"
 
 #. type: Plain text
-#: dpkg-deb.1:13
+#: dpkg-deb.1:12
 msgid ""
 "B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr ""
@@ -7347,12 +7785,12 @@
 "Debianarkiv."
 
 #. type: Plain text
-#: dpkg-deb.1:17
+#: dpkg-deb.1:16
 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-deb.1:27
+#: dpkg-deb.1:26
 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> "
@@ -7363,13 +7801,13 @@
 "deb> och kör det åt dig."
 
 #. type: TP
-#: dpkg-deb.1:29
+#: dpkg-deb.1:28
 #, no-wrap
 msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
 msgstr "B<-b>, B<--build> I<katalog> [I<arkiv>|I<katalog>]"
 
 #. type: Plain text
-#: dpkg-deb.1:41
+#: dpkg-deb.1:40
 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 "
@@ -7384,7 +7822,7 @@
 "filerna läggas i binärpaketets styrinformationsområde."
 
 #. type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-deb.1:52
 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 "
@@ -7399,7 +7837,7 @@
 "styrinformationskatalogen B<DEBIAN>."
 
 #. type: Plain text
-#: dpkg-deb.1:60
+#: dpkg-deb.1:59
 msgid ""
 "If no I<archive> is specified then B<dpkg-deb> will write the package into "
 "the file I<directory>B<.deb>."
@@ -7408,12 +7846,12 @@
 "I<katalog>B<.deb>."
 
 #. type: Plain text
-#: dpkg-deb.1:62
+#: dpkg-deb.1:61
 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-deb.1:78
+#: dpkg-deb.1:77
 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 "
@@ -7431,18 +7869,18 @@
 "användas)."
 
 #. type: TP
-#: dpkg-deb.1:78
+#: dpkg-deb.1:77
 #, no-wrap
 msgid "B<-I>, B<--info> I<archive> [I<control-file-name>...]"
 msgstr "B<-I>, B<--info> I<arkiv> [I<control-filnamn> ...]"
 
 #. type: Plain text
-#: dpkg-deb.1:81
+#: dpkg-deb.1:80
 msgid "Provides information about a binary package archive."
 msgstr "Tillhandahåller information om ett binärt paketarkiv."
 
 #. type: Plain text
-#: dpkg-deb.1:86
+#: dpkg-deb.1:85
 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."
@@ -7451,7 +7889,7 @@
 "innehållet i paketet tillsammans med dess styrfil."
 
 #. type: Plain text
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 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 "
@@ -7464,13 +7902,13 @@
 "avslutar med felstatus 2."
 
 #. type: TP
-#: dpkg-deb.1:94
+#: dpkg-deb.1:93
 #, no-wrap
 msgid "B<-W>, B<--show> I<archive>"
 msgstr "B<-W>, B<--show> I<arkiv>"
 
 #. type: Plain text
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 msgid ""
 "Provides information about a binary package archive in the format specified "
 "by the B<--showformat> argument. The default format displays the package's "
@@ -7481,25 +7919,25 @@
 "rad, avdelade med tabulatortecken."
 
 #. type: TP
-#: dpkg-deb.1:101
+#: dpkg-deb.1:100
 #, no-wrap
 msgid "B<-f>, B<--field> I<archive> [I<control-field-name>...]"
 msgstr "B<-f>, B<--field> I<arkiv> [I<control-fältnamn> ...]"
 
 #. type: Plain text
-#: dpkg-deb.1:104
+#: dpkg-deb.1:103
 msgid "Extracts control file information from a binary package archive."
 msgstr "Extraherar styrfilsinformation från ett binärt paketarkiv."
 
 #. type: Plain text
-#: dpkg-deb.1:108
+#: dpkg-deb.1:107
 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-deb.1:117
+#: dpkg-deb.1:116
 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-"
@@ -7511,19 +7949,19 @@
 "deb> visa varje med ett inledande fältnamn (och ett kolon och mellanrum)."
 
 #. type: Plain text
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 msgid "No errors are reported for fields requested but not found."
 msgstr ""
 "Inga felmeddelande rapporteras för fält som efterfrågas men inte hittas."
 
 #. type: TP
-#: dpkg-deb.1:119
+#: dpkg-deb.1:118
 #, no-wrap
 msgid "B<-c>, B<--contents> I<archive>"
 msgstr "B<-c>, B<--contents> I<arkiv>"
 
 #. type: Plain text
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 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 "
@@ -7533,13 +7971,13 @@
 "närvarande i det format som genereras av B<tar>s pratsamma visning."
 
 #. type: TP
-#: dpkg-deb.1:125
+#: dpkg-deb.1:124
 #, no-wrap
 msgid "B<-x>, B<--extract> I<archive directory>"
 msgstr "B<-x>|B<--extract> I<arkivkatalog>"
 
 #. type: Plain text
-#: dpkg-deb.1:129
+#: dpkg-deb.1:128
 msgid ""
 "Extracts the filesystem tree from a package archive into the specified "
 "directory."
@@ -7547,7 +7985,7 @@
 "Extraherar filsystemsträdet från ett paketarkiv till den angivna katalogen."
 
 #. type: Plain text
-#: dpkg-deb.1:135
+#: dpkg-deb.1:134
 msgid ""
 "Note that extracting a package to the root directory will I<not> result in a "
 "correct installation! Use B<dpkg> to install packages."
@@ -7557,7 +7995,7 @@
 "paket."
 
 #. type: Plain text
-#: dpkg-deb.1:139
+#: dpkg-deb.1:138
 msgid ""
 "I<directory> (but not its parents) will be created if necessary, and its "
 "permissions modified to match the contents of the package."
@@ -7566,45 +8004,71 @@
 "behörighet kommer att ändras till att motsvara innehållet i paketet."
 
 #. type: TP
-#: dpkg-deb.1:139
+#: dpkg-deb.1:138
 #, no-wrap
 msgid "B<-X>, B<--vextract> I<archive directory>"
 msgstr "B<-C>|B<--vextract> I<arkivkatalog>"
 
 #. type: Plain text
-#: dpkg-deb.1:144
+#: dpkg-deb.1:145
+msgid ""
+"Is like B<--extract> (B<-x>)  with B<--verbose> (B<-v>)  which prints a "
+"listing of the files extracted as it goes."
+msgstr ""
+"Är som B<--extract> (B<-x>) med B<--verbose> (B<-v>) som visar en lista över "
+"filer som extraheras under tiden."
+
+#. type: TP
+#: dpkg-deb.1:145
+#, no-wrap
+msgid "B<-R>, B<--raw-extract> I<archive directory>"
+msgstr "B<-R>, B<--raw-extract> I<arkivkatalog>"
+
+#. type: Plain text
+#: dpkg-deb.1:150
+msgid ""
+"Extracts the filesystem tree from a package archive into a specified "
+"directory, and the control information files into a DEBIAN subdirectory of "
+"the specified directory."
+msgstr ""
+"Extraherar filsystemsträdet från ett paketarkiv till den angivna katalogen "
+"och kontrollinformationsfilerna till underkatalogen DEBIAN i den angivna "
+"katalogen."
+
+#. type: Plain text
+#: dpkg-deb.1:152 dpkg-deb.1:172
 msgid ""
-"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
-"it goes."
+"The target directory (but not its parents) will be created if necessary."
 msgstr ""
-"Är som B<--extract> (B<-x>) men visar en lista över filer som extraheras "
-"under tiden."
+"Målkatalogen (men inte dess föräldrar) kommer att skapas om nödvändigt."
 
 #. type: TP
-#: dpkg-deb.1:144
+#: dpkg-deb.1:152
 #, no-wrap
 msgid "B<--fsys-tarfile> I<archive>"
 msgstr "B<--fsys-tarfile> I<arkiv>"
 
 #. type: Plain text
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
 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."
+"to extract a particular file from a package archive.  The input archive will "
+"always be processed sequentially."
 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 det användas för "
-"att hämta ut en enskild fil från ett paketarkiv."
+"att hämta ut en enskild fil från ett paketarkiv. Indataarkiven behandlas "
+"alltid i den ordning de anges."
 
 #. type: TP
-#: dpkg-deb.1:152
+#: dpkg-deb.1:161
 #, no-wrap
 msgid "B<-e>, B<--control> I<archive> [I<directory>]"
 msgstr "B<-e>, B<--control> I<arkiv> [I<katalog>]"
 
 #. type: Plain text
-#: dpkg-deb.1:156
+#: dpkg-deb.1:165
 msgid ""
 "Extracts the control information files from a package archive into the "
 "specified directory."
@@ -7613,7 +8077,7 @@
 "katalogen."
 
 #. type: Plain text
-#: dpkg-deb.1:160
+#: dpkg-deb.1:169
 msgid ""
 "If no directory is specified then a subdirectory B<DEBIAN> in the current "
 "directory is used."
@@ -7621,21 +8085,14 @@
 "Om ingen katalog anges kommer en underkatalog vid namn B<DEBIAN> i den "
 "aktuella katalogen att användas."
 
-#. type: Plain text
-#: dpkg-deb.1:163
-msgid ""
-"The target directory (but not its parents) will be created if necessary."
-msgstr ""
-"Målkatalogen (men inte dess föräldrar) kommer att skapas om nödvändigt."
-
 #. type: TP
-#: dpkg-deb.1:171
+#: dpkg-deb.1:180
 #, no-wrap
 msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-deb.1:176 dpkg-query.1:121
+#: dpkg-deb.1:185 dpkg-query.1:127
 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."
@@ -7644,7 +8101,7 @@
 "Formatet är en sträng som matas ut för varje paket i listan."
 
 #. type: Plain text
-#: dpkg-deb.1:185
+#: dpkg-deb.1:194
 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 "
@@ -7659,33 +8116,33 @@
 "B<--showformat> i B<dpkg-query>(1)."
 
 #. type: Plain text
-#: dpkg-deb.1:187
+#: dpkg-deb.1:196
 msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
 msgstr "Förvalet för fältet är \"${Package}\\et${Version}\\en\"."
 
 #. type: TP
-#: dpkg-deb.1:187
+#: dpkg-deb.1:196
 #, no-wrap
-msgid "B<-z>I<compress_level>"
+msgid "B<-z>I<compress-level>"
 msgstr "B<-z>I<komprimeringsnivå>"
 
 #. type: Plain text
-#: dpkg-deb.1:191
+#: dpkg-deb.1:200
 msgid ""
-"Specify which compression level to pass to the compressor backend program, "
-"when building a package."
+"Specify which compression level to use on the compressor backend, when "
+"building a package (default is 9 for gzip and bzip2, 6 for xz and lzma)."
 msgstr ""
-"Ange vilken komprimeringsnivå som skall sändas till komprimeringsprogrammet "
-"när ett paket byggs."
+"Ange vilken komprimeringsnivå som skall användas i komprimeringsfunktionen "
+"när ett paket byggs (standard är 9 för gzip och bzip2, 6 för xz och lzma)."
 
 #. type: TP
-#: dpkg-deb.1:191
+#: dpkg-deb.1:200
 #, no-wrap
-msgid "B<-Z>I<compress_type>"
+msgid "B<-Z>I<compress-type>"
 msgstr "B<-Z>I<komprimeringstyp>"
 
 #. type: Plain text
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 msgid ""
 "Specify which compression type to use when building a package. Allowed "
 "values are I<gzip>, I<xz>, I<bzip2>, I<lzma>, and I<none> (default is "
@@ -7696,13 +8153,13 @@
 "I<gzip>)."
 
 #. type: TP
-#: dpkg-deb.1:196
+#: dpkg-deb.1:205
 #, no-wrap
 msgid "B<--new>"
 msgstr "B<--new>"
 
 #. type: Plain text
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 msgid ""
 "Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
@@ -7710,13 +8167,13 @@
 "förval."
 
 #. type: TP
-#: dpkg-deb.1:201
+#: dpkg-deb.1:210
 #, no-wrap
 msgid "B<--old>"
 msgstr "B<--old>"
 
 #. type: Plain text
-#: dpkg-deb.1:209
+#: dpkg-deb.1:218
 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 "
@@ -7729,8 +8186,14 @@
 "versioner av dpkg äldre än 0.93.76 (september 1995), vilka endast släpptes "
 "som i386-a.out."
 
+#. type: TP
+#: dpkg-deb.1:218
+#, no-wrap
+msgid "B<--nocheck>"
+msgstr "B<--nocheck>"
+
 #. type: Plain text
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224
 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."
@@ -7740,18 +8203,33 @@
 "här sätt."
 
 #. type: TP
-#: dpkg-deb.1:215
+#: dpkg-deb.1:224 start-stop-daemon.8:255
+#, no-wrap
+msgid "B<-v>, B<--verbose>"
+msgstr "B<-v>, B<--verbose>"
+
+#. type: Plain text
+#: dpkg-deb.1:228
+msgid ""
+"Enables verbose output. This currently only affects B<--extract> making it "
+"behave like B<--vextract>."
+msgstr ""
+"Aktiverar pratsam utdata. Påverkar för närvarande bara B<--extract>, vilket "
+"får det att bete sig som B<--vextract>."
+
+#. type: TP
+#: dpkg-deb.1:228
 #, no-wrap
 msgid "B<-D>, B<--debug>"
 msgstr "B<-D>, B<--debug>"
 
 #. type: Plain text
-#: dpkg-deb.1:218
+#: dpkg-deb.1:231
 msgid "Enables debugging output. This is not very interesting."
 msgstr "Aktiverar felsökningsutdata. Denna är inte speciellt intressant."
 
 #. type: Plain text
-#: dpkg-deb.1:224
+#: dpkg-deb.1:237
 msgid ""
 "If set, B<dpkg-deb> will use it as the directory in which to create "
 "temporary files and directories."
@@ -7760,13 +8238,13 @@
 "filer och kataloger skapas."
 
 #. type: Plain text
-#: dpkg-deb.1:230
+#: dpkg-deb.1:243
 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:238
+#: dpkg-deb.1:251
 msgid ""
 "There is no authentication on B<.deb> files; in fact, there isn't even a "
 "straightforward checksum.  (Higher level tools like APT support "
@@ -7781,7 +8259,7 @@
 "debian/rules. Filen stöds dock inte direkt av lågnivåverktygen.)"
 
 #. type: Plain text
-#: dpkg-deb.1:245
+#: dpkg-deb.1:258
 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 "
@@ -7793,7 +8271,7 @@
 "sparas."
 
 #. type: Plain text
-#: dpkg-deb.1:251
+#: dpkg-deb.1:264
 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)."
 
@@ -7803,13 +8281,6 @@
 msgid "dpkg-divert"
 msgstr "dpkg-divert"
 
-#. type: TH
-#: dpkg-divert.8:1
-#, fuzzy, no-wrap
-#| msgid "2010-10-10"
-msgid "2010-10-12"
-msgstr "2010-10-10"
-
 #. type: Plain text
 #: dpkg-divert.8:4
 msgid "dpkg-divert - override a package's version of a file"
@@ -7817,8 +8288,8 @@
 
 #. type: Plain text
 #: dpkg-divert.8:9
-msgid "B<dpkg-divert> [I<options>] I<command>"
-msgstr "B<dpkg-divert> [I<flaggor>] I<åtgärd>"
+msgid "B<dpkg-divert> [I<option>...] I<command>"
+msgstr "B<dpkg-divert> [I<flagga>...] I<åtgärd>"
 
 #. type: Plain text
 #: dpkg-divert.8:13
@@ -7860,7 +8331,7 @@
 msgstr "Lägg till en omdirigering för I<fil>."
 
 #. type: TP
-#: dpkg-divert.8:28 dpkg-statoverride.8:36
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
 #, no-wrap
 msgid "B<--remove>I< file>"
 msgstr "B<--remove>I< fil>"
@@ -7908,7 +8379,8 @@
 msgstr "Visa det riktiga namnet på en omdirigerad fil."
 
 #. type: TP
-#: dpkg-divert.8:43 dpkg-statoverride.8:53 update-alternatives.8:329
+#: dpkg-divert.8:43 dpkg-statoverride.8:52 dselect.1:44
+#: update-alternatives.8:328
 #, no-wrap
 msgid "B<--admindir>I< directory>"
 msgstr "B<--admindir>I< katalog>"
@@ -7969,7 +8441,7 @@
 "omdirigeras, dvs. I<fil> kommer omdirigeras för alla paket förutom I<paket>."
 
 #. type: TP
-#: dpkg-divert.8:61 dpkg-statoverride.8:65 update-alternatives.8:351
+#: dpkg-divert.8:61 dpkg-statoverride.8:64 update-alternatives.8:350
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
@@ -8015,13 +8487,13 @@
 #. type: Plain text
 #: dpkg-divert.8:82
 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 ""
-"Vid tillägg är standard B<--local> och B<--divert> I<E<lt>originalE<gt>."
-"distrib>. Vid borttagning måste B<--package> eller B<--local> och B<--"
-"divert> matcha om de anges."
+"When adding, default is B<--local> and B<--divert> I<original>B<.distrib>. "
+"When removing, B<--package> or B<--local> and B<--divert> must match if "
+"specified."
+msgstr ""
+"Vid tillägg är standard B<--local> och B<--divert> I<original>B<.distrib>. "
+"Vid borttagning måste B<--package> eller B<--local> och B<--divert> matcha "
+"om de anges."
 
 #. type: Plain text
 #: dpkg-divert.8:84
@@ -8094,26 +8566,29 @@
 msgstr "dpkg-divert --package wibble --rename --remove /usr/bin/exempel"
 
 #. type: TP
-#: dpkg-divert.8:113 dpkg-query.1:197 dpkg-statoverride.8:70 dpkg-trigger.1:61
-#: update-alternatives.8:356
-#, fuzzy, no-wrap
-#| msgid "B<DPKG_LIBDIR>"
+#: dpkg-divert.8:113 dpkg-query.1:205 dpkg-statoverride.8:69 dpkg-trigger.1:61
+#: update-alternatives.8:355
+#, no-wrap
 msgid "B<DPKG_ADMINDIR>"
-msgstr "B<DPKG_LIBDIR>"
+msgstr "B<DPKG_ADMINDIR>"
 
 #. type: Plain text
-#: dpkg-divert.8:117 dpkg-query.1:201 dpkg-statoverride.8:74 dpkg-trigger.1:65
+#: dpkg-divert.8:117 dpkg-query.1:209 dpkg-statoverride.8:73 dpkg-trigger.1:65
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the dpkg data directory."
 msgstr ""
+"Om satt, och flaggan B<--admindir> inte har angivits, används värdet som "
+"datakatalog för dpkg."
 
 #. type: Plain text
 #: dpkg-divert.8:121
 msgid ""
-"If set and the I<--local> and I<--package> options have not been specified, "
+"If set and the B<--local> and B<--package> options have not been specified, "
 "B<dpkg-divert> will use it as the package name."
 msgstr ""
+"Om satt, och flaggorna B<--local> och B<--package> inte har angivits, kommer "
+"B<dpkg-divert> använda det som paketnamn."
 
 #. type: TP
 #: dpkg-divert.8:123
@@ -8142,7 +8617,7 @@
 "filtillägget I<old>, innan den ersätter den med den nya."
 
 #. type: Plain text
-#: dpkg-divert.8:137 update-alternatives.8:495
+#: dpkg-divert.8:137 update-alternatives.8:496
 msgid "Copyright \\(co 1995 Ian Jackson"
 msgstr "Upphovsrättsskyddat © 1995 Ian Jackson."
 
@@ -8159,8 +8634,8 @@
 
 #. type: Plain text
 #: dpkg-genchanges.1:8
-msgid "B<dpkg-genchanges> [I<options>]"
-msgstr "B<dpkg-genchanges> [I<flaggor>]"
+msgid "B<dpkg-genchanges> [I<option>...]"
+msgstr "B<dpkg-genchanges> [I<flagga>...]"
 
 #. type: Plain text
 #: dpkg-genchanges.1:16
@@ -8273,13 +8748,13 @@
 "källkodsträdets changelog-fil."
 
 #. type: TP
-#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:121
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:41 dpkg-source.1:127
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr "B<-V>I<namn>B<=>I<värde>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:76 dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-source.1:131
 msgid ""
 "Set an output substitution variable.  See B<deb-substvars>(5) for a "
 "discussion of output substitution."
@@ -8288,8 +8763,8 @@
 "beskrivning av utdatasubstituering."
 
 #. type: TP
-#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:171
-#: dpkg-source.1:125
+#: dpkg-genchanges.1:76 dpkg-gencontrol.1:45 dpkg-shlibdeps.1:169
+#: dpkg-source.1:131
 #, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<-T>I<substvars-fil>"
@@ -8310,29 +8785,29 @@
 "substitutionsvariabler från flera filer."
 
 #. type: TP
-#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:131
+#: dpkg-genchanges.1:87 dpkg-gencontrol.1:53 dpkg-source.1:137
 #, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<fält>B<=>I<värde>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 msgid "Override or add an output control file field."
 msgstr "Ersätt eller lägg till ett fält i den genererade control-filen."
 
 #. type: TP
-#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:134
+#: dpkg-genchanges.1:90 dpkg-gencontrol.1:56 dpkg-source.1:140
 #, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<-U>I<fält>"
 
 #. type: Plain text
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:137
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:143
 msgid "Remove an output control file field."
 msgstr "Ta bort ett fält ur den genererade control-filen."
 
 #. type: TP
-#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:98
+#: dpkg-genchanges.1:93 dpkg-gencontrol.1:59 dpkg-source.1:104
 #, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "B<-c>I<control-fil>"
@@ -8348,7 +8823,7 @@
 
 #. type: TP
 #: dpkg-genchanges.1:98 dpkg-gencontrol.1:64 dpkg-parsechangelog.1:16
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr "B<-l>I<ändringsloggfil>"
@@ -8373,14 +8848,14 @@
 
 #. type: TP
 #: dpkg-genchanges.1:107 dpkg-gencontrol.1:73 dpkg-parsechangelog.1:21
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr "B<-F>I<ändringsloggformat>"
 
 #. type: Plain text
 #: dpkg-genchanges.1:112 dpkg-gencontrol.1:78 dpkg-parsechangelog.1:26
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 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 "
@@ -8408,7 +8883,7 @@
 "deras storlekar och kontrollsummor i B<.changes>-filen)."
 
 #. type: TP
-#: dpkg-genchanges.1:123 dpkg-gensymbols.1:416
+#: dpkg-genchanges.1:123 dpkg-gensymbols.1:421
 #, no-wrap
 msgid "B<-q>"
 msgstr "B<-q>"
@@ -8446,8 +8921,8 @@
 
 #. type: Plain text
 #: dpkg-gencontrol.1:8
-msgid "B<dpkg-gencontrol> [I<options>]"
-msgstr "B<dpkg-gencontrol> [I<flaggor>]"
+msgid "B<dpkg-gencontrol> [I<option>...]"
+msgstr "B<dpkg-gencontrol> [I<flagga>...]"
 
 #. type: Plain text
 #: dpkg-gencontrol.1:14
@@ -8532,7 +9007,7 @@
 "substitutionsvariabler från flera filer."
 
 #. type: TP
-#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:368
+#: dpkg-gencontrol.1:78 dpkg-gensymbols.1:373
 #, no-wrap
 msgid "B<-p>I<package>"
 msgstr "B<-p>I<paket>"
@@ -8605,7 +9080,7 @@
 "hjälp av B<du>), samt för att välja standardplacering av utdatafilen."
 
 #. type: TP
-#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:386 dpkg-shlibdeps.1:152
+#: dpkg-gencontrol.1:112 dpkg-gensymbols.1:391 dpkg-shlibdeps.1:150
 #, no-wrap
 msgid "B<-O>"
 msgstr "B<-O>"
@@ -8646,7 +9121,7 @@
 "filer det genererar här."
 
 #. type: Plain text
-#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:339
+#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:337
 msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 msgstr "Upphovsrättsskyddat © 2007-2008 Raphaël Hertzog"
 
@@ -8656,12 +9131,6 @@
 msgid "dpkg-gensymbols"
 msgstr "dpkg-gensymbols"
 
-#. type: TH
-#: dpkg-gensymbols.1:2
-#, no-wrap
-msgid "2009-08-07"
-msgstr "2009-08-07"
-
 #. type: Plain text
 #: dpkg-gensymbols.1:5
 msgid ""
@@ -8672,8 +9141,8 @@
 
 #. type: Plain text
 #: dpkg-gensymbols.1:9
-msgid "B<dpkg-gensymbols> [I<options>]"
-msgstr "B<dpkg-gensymbols> [I<flaggor>]"
+msgid "B<dpkg-gensymbols> [I<option>...]"
+msgstr "B<dpkg-gensymbols> [I<flagga>...]"
 
 #. type: Plain text
 #: dpkg-gensymbols.1:16
@@ -8700,14 +9169,6 @@
 "indata. Programmet söker efter följande filer (och använder den första det "
 "finner):"
 
-#. type: IP
-#: dpkg-gensymbols.1:20 dpkg-gensymbols.1:22 dpkg-gensymbols.1:24
-#: dpkg-gensymbols.1:26 dpkg-gensymbols.1:306 dpkg-gensymbols.1:312
-#: dpkg-gensymbols.1:346 dpkg-gensymbols.1:350 dpkg-gensymbols.1:353
-#, no-wrap
-msgid "\\(bu"
-msgstr "\\(bu"
-
 #. type: Plain text
 #: dpkg-gensymbols.1:22
 msgid "debian/I<package>.symbols.I<arch>"
@@ -8806,14 +9267,27 @@
 "att den är korrekt. Publicerade symboler bör inte försvinna, så patchen bör "
 "ideellt sett bara lägga till nya rader."
 
+#. type: Plain text
+#: dpkg-gensymbols.1:64
+msgid ""
+"Note that you can put comments in symbols files: any line with '#' as the "
+"first character is a comment except if it starts with '#include' (see "
+"section B<Using includes>). Lines starting with '#MISSING:' are special "
+"comments documenting symbols that have disappeared."
+msgstr ""
+"Obsevera att du kan skriva kommentarer i symbols-filer: alla rader med \"#\" "
+"som första tecken är kommentarer, såvida inte det börjar med \"#include"
+"\" (se stycket B<Använda inkluderingar>). Rader som börjar med \"#MISSING:\" "
+"är speciella kommentarer som dokumenterar symboler som har försvunnit."
+
 #. type: SS
-#: dpkg-gensymbols.1:59
+#: dpkg-gensymbols.1:64
 #, no-wrap
 msgid "Using #PACKAGE# substitution"
 msgstr "Använda #PACKAGE#-substituering"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 msgid ""
 "In some rare cases, the name of the library varies between architectures.  "
 "To avoid hardcoding the name of the package in the symbols file, you can use "
@@ -8829,13 +9303,13 @@
 "binärpaket."
 
 #. type: SS
-#: dpkg-gensymbols.1:67
+#: dpkg-gensymbols.1:72
 #, no-wrap
 msgid "Using symbol tags"
 msgstr "Använda symboltaggar"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:74
+#: dpkg-gensymbols.1:79
 msgid ""
 "Symbol tagging is useful for marking symbols that are special in some way.  "
 "Any symbol can have an arbitrary number of tags associated with it. While "
@@ -8850,7 +9324,7 @@
 "undersymbolen B<Standardsymboltaggar> för mer information om dessa taggar."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:86
+#: dpkg-gensymbols.1:91
 msgid ""
 "Tag specification comes right before the symbol name (no whitespace is "
 "allowed in between). It always starts with an opening bracket B<(>, ends "
@@ -8876,7 +9350,7 @@
 "blanksteget."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:90
+#: dpkg-gensymbols.1:95
 #, no-wrap
 msgid ""
 " (tag1=i am marked|tag name with space)\"tagged quoted symbol\"@Base 1.0\n"
@@ -8888,7 +9362,7 @@
 " ociterad_symbol@Bas 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:96
+#: dpkg-gensymbols.1:101
 msgid ""
 "The first symbol in the example is named I<tagged quoted symbol> and has two "
 "tags: I<tag1> with value I<i am marked> and I<tag name with space> that has "
@@ -8903,7 +9377,7 @@
 "ett exempel på en normal, otaggad symbol."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 msgid ""
 "Since symbol tags are an extension of the I<deb-symbols(5)> format, they can "
 "only be part of the symbols files used in source packages (those files "
@@ -8927,19 +9401,19 @@
 "sin originalform så som de lästes in."
 
 #. type: SS
-#: dpkg-gensymbols.1:108
+#: dpkg-gensymbols.1:113
 #, no-wrap
 msgid "Standard symbol tags"
 msgstr "Standardsymboltaggar"
 
 #. type: TP
-#: dpkg-gensymbols.1:109
+#: dpkg-gensymbols.1:114
 #, no-wrap
 msgid "B<optional>"
 msgstr "B<optional>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:119
+#: dpkg-gensymbols.1:124
 msgid ""
 "A symbol marked as optional can disappear from the library at any time and "
 "that will never cause B<dpkg-gensymbols> to fail. However, disappeared "
@@ -8961,7 +9435,7 @@
 "\") med den minsta tillgängliga versionen oförändrad."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 msgid ""
 "This tag is useful for symbols which are private where their disappearance "
 "do not cause ABI breakage. For example, most of C++ template instantiations "
@@ -8976,13 +9450,13 @@
 "anse som valfri."
 
 #. type: TP
-#: dpkg-gensymbols.1:124
+#: dpkg-gensymbols.1:129
 #, no-wrap
 msgid "B<arch=>I<architecture list>"
 msgstr "B<arch=>I<arkitekturlista>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:137
+#: dpkg-gensymbols.1:142
 msgid ""
 "This tag allows one to restrict the set of architectures where the symbol is "
 "supposed to exist. When the symbols list is updated with the symbols "
@@ -9009,7 +9483,7 @@
 "med i differensen på grund av denna ändring), men den anses inte som ny."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:143
+#: dpkg-gensymbols.1:148
 msgid ""
 "When operating in the default non-template mode, among arch-specific symbols "
 "only those that match the current host architecture are written to the "
@@ -9023,7 +9497,7 @@
 "arkitekturer) till symbolfilen i mall-läget."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:149
+#: dpkg-gensymbols.1:154
 msgid ""
 "The format of I<architecture list> is the same as the one used in the "
 "I<Build-Depends> field of I<debian/control> (except the enclosing square "
@@ -9038,7 +9512,7 @@
 "ia64, medan den andra tas med överallt förutom på armel."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid ""
 " (arch=alpha amd64 kfreebsd-amd64 ia64)a_64bit_specific_symbol@Base 1.0\n"
@@ -9048,13 +9522,13 @@
 " (arch=!armel)symbol_armel_inte_har@Base 1.0\n"
 
 #. type: TP
-#: dpkg-gensymbols.1:152
+#: dpkg-gensymbols.1:157
 #, no-wrap
 msgid "B<ignore-blacklist>"
 msgstr "B<ignore-blacklist>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:160
+#: dpkg-gensymbols.1:165
 msgid ""
 "dpkg-gensymbols has an internal blacklist of symbols that should not appear "
 "in symbols files as they are usually only side-effects of implementation "
@@ -9071,26 +9545,26 @@
 "verktygskedjebibliotek som libgcc."
 
 #. type: TP
-#: dpkg-gensymbols.1:160 dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:165 dpkg-gensymbols.1:202
 #, no-wrap
 msgid "B<c++>"
 msgstr "B<c++>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:164
+#: dpkg-gensymbols.1:169
 msgid ""
 "Denotes I<c++> symbol pattern. See B<Using symbol patterns> subsection below."
 msgstr ""
 "Betecknar I<c++>-symbolmönster. Se stycket B<Använda symbolmönster> nedan."
 
 #. type: TP
-#: dpkg-gensymbols.1:164 dpkg-gensymbols.1:228
+#: dpkg-gensymbols.1:169 dpkg-gensymbols.1:233
 #, no-wrap
 msgid "B<symver>"
 msgstr "B<symver>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:168
+#: dpkg-gensymbols.1:173
 msgid ""
 "Denotes I<symver> (symbol version) symbol pattern. See B<Using symbol "
 "patterns> subsection below."
@@ -9099,13 +9573,13 @@
 "symbolmönster> nedan."
 
 #. type: TP
-#: dpkg-gensymbols.1:168 dpkg-gensymbols.1:253
+#: dpkg-gensymbols.1:173 dpkg-gensymbols.1:258
 #, no-wrap
 msgid "B<regex>"
 msgstr "B<regex>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 msgid ""
 "Denotes I<regex> symbol pattern. See B<Using symbol patterns> subsection "
 "below."
@@ -9113,13 +9587,13 @@
 "Anger I<regex>-symbolmönstret. Se stycket I<Använda symbolmönster> nedan."
 
 #. type: SS
-#: dpkg-gensymbols.1:172
+#: dpkg-gensymbols.1:177
 #, no-wrap
 msgid "Using symbol patterns"
 msgstr "Använda symbolmönster"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:180
+#: dpkg-gensymbols.1:185
 msgid ""
 "Unlike a standard symbol specification, a pattern may cover multiple real "
 "symbols from the library. B<dpkg-gensymbols> will attempt to match each "
@@ -9138,7 +9612,7 @@
 "symbolen kommer den att tolkas som ny."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:188
+#: dpkg-gensymbols.1:193
 msgid ""
 "A pattern is considered lost if it does not match any symbol in the library. "
 "By default this will trigger a B<dpkg-gensymbols> failure under I<-c1> or "
@@ -9159,7 +9633,7 @@
 "ovan för mer information."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:195
+#: dpkg-gensymbols.1:200
 msgid ""
 "Patterns are an extension of the I<deb-symbols(5)> format hence they are "
 "only valid in symbol file templates. Pattern specification syntax is not any "
@@ -9176,13 +9650,13 @@
 "mönster normalt med en speciell tagg."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:197
+#: dpkg-gensymbols.1:202
 msgid "At the moment, B<dpkg-gensymbols> supports three basic pattern types:"
 msgstr ""
 "För närvarande stöder B<dpkg-gensymbols> tre grundläggande mönstertyper:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:209
+#: dpkg-gensymbols.1:214
 msgid ""
 "This pattern is denoted by the I<c++> tag. It matches only C++ symbols by "
 "their demangled symbol name (as emitted by B<c++filt>(1) utility). This "
@@ -9208,7 +9682,7 @@
 "ett enda I<c++>-mönster:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:215
+#: dpkg-gensymbols.1:220
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -9222,20 +9696,20 @@
 " [...]\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:217
+#: dpkg-gensymbols.1:222
 msgid ""
 "The demangled name above can be obtained by executing the following command:"
 msgstr ""
 "Det avmanglade namnet ovan kan hämtas genom att utföra följande kommando:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:219
+#: dpkg-gensymbols.1:224
 #, no-wrap
 msgid " $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt\n"
 msgstr " $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:227
+#: dpkg-gensymbols.1:232
 msgid ""
 "Please note that while mangled name is unique in the library by definition, "
 "this is not necessarily true for demangled names. A couple of distinct real "
@@ -9254,7 +9728,7 @@
 "inte sänka kvaliteten på symbolfilen."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:234
+#: dpkg-gensymbols.1:239
 msgid ""
 "This pattern is denoted by the I<symver> tag. Well maintained libraries have "
 "versioned symbols where each version corresponds to the upstream version "
@@ -9268,7 +9742,7 @@
 "Till exempel:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:241
+#: dpkg-gensymbols.1:246
 #, no-wrap
 msgid ""
 "libc.so.6 libc6 #MINVER#\n"
@@ -9284,7 +9758,7 @@
 " access@GLIBC_2.0 2.2\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:247
+#: dpkg-gensymbols.1:252
 msgid ""
 "All symbols associated with versions GLIBC_2.0 and GLIBC_2.7 will lead to "
 "minimal version of 2.0 and 2.7 respectively with the exception of the symbol "
@@ -9299,7 +9773,7 @@
 "mönstret, eftersom specifika symboler gäller före mönster."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:252
+#: dpkg-gensymbols.1:257
 msgid ""
 "Please note that while old style wildcard patterns (denoted by \"*@version\" "
 "in the symbol name field) are still supported, they have been deprecated by "
@@ -9314,7 +9788,7 @@
 "2.0\" om samma beteende behövs."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:260
+#: dpkg-gensymbols.1:265
 msgid ""
 "Regular expression patterns are denoted by the I<regex> tag. They match by "
 "the perl regular expression specified in the symbol name field. A regular "
@@ -9329,7 +9803,7 @@
 "symbolens I<namn@version>-sträng. Till exempel:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:265
+#: dpkg-gensymbols.1:270
 #, no-wrap
 msgid ""
 "libdummy.so.1 libdummy1 #MINVER#\n"
@@ -9341,7 +9815,7 @@
 " (regex|optional)\"private\" 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:270
+#: dpkg-gensymbols.1:275
 msgid ""
 "Symbols like \"mystack_new@Base\", \"mystack_push@Base\", \"mystack_pop@Base"
 "\" etc.  will be matched by the first pattern while e.g. "
@@ -9356,7 +9830,7 @@
 "att ärva I<optional>-taggen från mönstret."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:275
+#: dpkg-gensymbols.1:280
 msgid ""
 "Basic patterns listed above can be combined where it makes sense. In that "
 "case, they are processed in the order in which the tags are specified. For "
@@ -9366,7 +9840,7 @@
 "fall behandlas de i den ordning taggarna anges. Till exempel kommer både"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:278
+#: dpkg-gensymbols.1:283
 #, no-wrap
 msgid ""
 " (c++|regex)\"^NSA::ClassA::Private::privmethod\\ed\\e(int\\e)@Base\" 1.0\n"
@@ -9376,7 +9850,7 @@
 " (regex|c++)N3NSA6ClassA7Private11privmethod\\edEi@Base 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:288
+#: dpkg-gensymbols.1:293
 msgid ""
 "will match symbols \"_ZN3NSA6ClassA7Private11privmethod1Ei@Base\" and "
 "\"_ZN3NSA6ClassA7Private11privmethod2Ei@Base\". When matching the first "
@@ -9401,7 +9875,7 @@
 "av mönstrena eftersom det inte är en giltig C++-symbol."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:294
+#: dpkg-gensymbols.1:299
 msgid ""
 "In general, all patterns are divided into two groups: aliases (basic I<c++> "
 "and I<symver>) and generic patterns (I<regex>, all combinations of multiple "
@@ -9417,7 +9891,7 @@
 "använda för många generella mönster."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 msgid ""
 "When multiple patterns match the same real symbol, aliases (first I<c++>, "
 "then I<symver>) are preferred over generic patterns. Generic patterns are "
@@ -9434,13 +9908,13 @@
 "alfanumeriska sorteringsordningen av dess namn."
 
 #. type: SS
-#: dpkg-gensymbols.1:301
+#: dpkg-gensymbols.1:306
 #, no-wrap
 msgid "Using includes"
 msgstr "Använda inkluderingar"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:306
+#: dpkg-gensymbols.1:311
 msgid ""
 "When the set of exported symbols differ between architectures, it may become "
 "inefficient to use a single symbol file. In those cases, an include "
@@ -9451,7 +9925,7 @@
 "inkluderingsdirektiv vara nyttigt på flera sätt:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:310
+#: dpkg-gensymbols.1:315
 msgid ""
 "You can factorize the common part in some external file and include that "
 "file in your I<package>.symbols.I<arch> file by using an include directive "
@@ -9462,35 +9936,35 @@
 "inkluderingsdirektiv som detta:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:312
+#: dpkg-gensymbols.1:317
 msgid "#include \"I<packages>.symbols.common\""
 msgstr "#include \"I<paket>.symbols.common\""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:314
+#: dpkg-gensymbols.1:319
 msgid "The include directive may also be tagged like any symbol:"
 msgstr "Inkluderingsdirektivet kan även taggas som alla andra symboler:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:316
-msgid "(tag|..|tagN)#include \"file_to_include\""
-msgstr "(tag|..|tagN)#include \"fil_att_inkludera\""
+#: dpkg-gensymbols.1:321
+msgid "(tag|..|tagN)#include \"file-to-include\""
+msgstr "(tag|..|tagN)#include \"fil-att-inkludera\""
 
 #. type: Plain text
-#: dpkg-gensymbols.1:321
+#: dpkg-gensymbols.1:326
 msgid ""
-"As a result, all symbols included from I<file_to_include> will be considered "
+"As a result, all symbols included from I<file-to-include> will be considered "
 "to be tagged with I<tag> .. I<tagN> by default. You can use this feature to "
 "create a common I<package>.symbols file which includes architecture specific "
 "symbol files:"
 msgstr ""
-"Alla symboler som inkluderas från I<fil_att_inkludera> kommer att anses som "
+"Alla symboler som inkluderas från I<fil-att-inkludera> kommer att anses som "
 "standard vara taggade med I<tag> .. I<tagN>. Du kan använda denna funktion "
 "för att skapa en gemensam I<paket>.symbols-fil som inkluderar "
 "arkitekturspecifika filer:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:326
+#: dpkg-gensymbols.1:331
 #, no-wrap
 msgid ""
 "  common_symbol1@Base 1.0\n"
@@ -9504,7 +9978,7 @@
 "  gemensam_symbol2@Base 1.0\n"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:335
+#: dpkg-gensymbols.1:340
 msgid ""
 "The symbols files are read line by line, and include directives are "
 "processed as soon as they are encountered. This means that the content of "
@@ -9525,7 +9999,7 @@
 "taggar."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:340
+#: dpkg-gensymbols.1:345
 msgid ""
 "An included file can repeat the header line containing the SONAME of the "
 "library. In that case, it overrides any header line previously read.  "
@@ -9538,7 +10012,7 @@
 "Ett sätt att göra det är som följer:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid ""
 "#include \"libsomething1.symbols.common\"\n"
@@ -9548,18 +10022,18 @@
 " arkitekturspecifik_symbol@Base 1.0\n"
 
 #. type: SS
-#: dpkg-gensymbols.1:343
+#: dpkg-gensymbols.1:348
 #, no-wrap
 msgid "Good library management"
 msgstr "God hantering av bibliotek"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:346
+#: dpkg-gensymbols.1:351
 msgid "A well-maintained library has the following features:"
 msgstr "Ett välunderhållet bibliotek har följande funktioner:"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:350
+#: dpkg-gensymbols.1:355
 msgid ""
 "its API is stable (public symbols are never dropped, only new public symbols "
 "are added) and changes in incompatible ways only when the SONAME changes;"
@@ -9569,7 +10043,7 @@
 "ändras;"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:353
+#: dpkg-gensymbols.1:358
 msgid ""
 "ideally, it uses symbol versioning to achieve ABI stability despite internal "
 "changes and API extension;"
@@ -9578,7 +10052,7 @@
 "stabilitet trots interna ändringar och API-utökningar;"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:356
+#: dpkg-gensymbols.1:361
 msgid ""
 "it doesn't export private symbols (such symbols can be tagged optional as "
 "workaround)."
@@ -9587,7 +10061,7 @@
 "\"optional\" för att gå runt detta)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:364
+#: dpkg-gensymbols.1:369
 msgid ""
 "While maintaining the symbols file, it's easy to notice appearance and "
 "disappearance of symbols. But it's more difficult to catch incompatible API "
@@ -9605,18 +10079,18 @@
 "alltid är bättre att problemet rättas uppströms än specifikt i Debian."
 
 #. type: TP
-#: dpkg-gensymbols.1:365
+#: dpkg-gensymbols.1:370
 #, no-wrap
 msgid "B<-P>I<package-build-dir>"
 msgstr "B<-P>I<paketbyggkatalog>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:368
+#: dpkg-gensymbols.1:373
 msgid "Scan I<package-build-dir> instead of debian/tmp."
 msgstr "Sök I<paketbyggkatalog> istället för debian/tmp."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:372
+#: dpkg-gensymbols.1:377
 msgid ""
 "Define the package name. Required if more than one binary package is listed "
 "in debian/control (or if there's no debian/control file)."
@@ -9625,7 +10099,7 @@
 "control (eller om det inte finns någon debian/control-fil)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 msgid ""
 "Define the package version. Defaults to the version extracted from debian/"
 "changelog. Required if called outside of a source package tree."
@@ -9634,13 +10108,13 @@
 "changelog. Krävs om programmet anropas utanför ett källkodspaketträd."
 
 #. type: TP
-#: dpkg-gensymbols.1:376
+#: dpkg-gensymbols.1:381
 #, no-wrap
 msgid "B<-e>I<library-file>"
 msgstr "B<-e>I<biblioteksfil>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 msgid ""
 "Only analyze libraries explicitly listed instead of finding all public "
 "libraries. You can use a regular expression in I<library-file> to match "
@@ -9653,13 +10127,13 @@
 "flera B<-e>)."
 
 #. type: TP
-#: dpkg-gensymbols.1:382
+#: dpkg-gensymbols.1:387
 #, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<-I>I<filnamn>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:386
+#: dpkg-gensymbols.1:391
 msgid ""
 "Use I<filename> as reference file to generate the symbols file that is "
 "integrated in the package itself."
@@ -9668,7 +10142,7 @@
 "integreras i själva paketet."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 msgid ""
 "Print the generated symbols file to standard output, rather than being "
 "stored in the package build tree."
@@ -9677,13 +10151,13 @@
 "i paketets byggträd."
 
 #. type: TP
-#: dpkg-gensymbols.1:390
+#: dpkg-gensymbols.1:395
 #, no-wrap
 msgid "B<-O>I<filename>"
 msgstr "B<-O>I<filnamn>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 msgid ""
 "Store the generated symbols file as I<filename>. If I<filename> is pre-"
 "existing, its content is used as basis for the generated symbols file.  You "
@@ -9696,13 +10170,13 @@
 "symbolfil så att den motsvarar en nyare uppströmsversion av ditt bibliotek."
 
 #. type: TP
-#: dpkg-gensymbols.1:396
+#: dpkg-gensymbols.1:401
 #, no-wrap
 msgid "B<-t>"
 msgstr "B<-t>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 msgid ""
 "Write the symbol file in template mode rather than the format compatible "
 "with I<deb-symbols(5)>. The main difference is that in the template mode "
@@ -9721,13 +10195,13 @@
 "skrivs till symbolfilsmallen."
 
 #. type: TP
-#: dpkg-gensymbols.1:405
+#: dpkg-gensymbols.1:410
 #, no-wrap
 msgid "B<-c>I<[0-4]>"
 msgstr "B<-c>I<[0-4]>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:413
+#: dpkg-gensymbols.1:418
 msgid ""
 "Define the checks to do when comparing the generated symbols file with the "
 "template file used as starting point. By default the level is 1. Increasing "
@@ -9744,14 +10218,14 @@
 "bibliotek har introducerats."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:416
+#: dpkg-gensymbols.1:421
 msgid ""
 "This value can be overridden by the environment variable "
 "DPKG_GENSYMBOLS_CHECK_LEVEL."
 msgstr "Värdet kan överstyras med miljövariabeln DPKG_GENSYMBOLS_CHECK_LEVEL."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 msgid ""
 "Keep quiet and never generate a diff between generated symbols file and the "
 "template file used as starting point or show any warnings about new/lost "
@@ -9764,13 +10238,13 @@
 "bort informationsutdata, inte själva kontrolleran (se flaggan I<-c>)."
 
 #. type: TP
-#: dpkg-gensymbols.1:422
+#: dpkg-gensymbols.1:427
 #, no-wrap
 msgid "B<-a>I<arch>"
 msgstr "B<-a>I<arkitektur>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:427
+#: dpkg-gensymbols.1:432
 msgid ""
 "Assume I<arch> as host architecture when processing symbol files. Use this "
 "option to generate a symbol file or diff for any architecture provided its "
@@ -9781,7 +10255,7 @@
 "arkitektur så länge dess binärer är tillgängliga."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 msgid ""
 "Enable debug mode. Numerous messages are displayed to explain what B<dpkg-"
 "gensymbols> does."
@@ -9790,13 +10264,13 @@
 "B<dpkg-gensymbols> gör."
 
 #. type: TP
-#: dpkg-gensymbols.1:432
+#: dpkg-gensymbols.1:437
 #, no-wrap
 msgid "B<-V>"
 msgstr "B<-V>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:438
+#: dpkg-gensymbols.1:443
 msgid ""
 "Enable verbose mode. The generated symbols file contains deprecated symbols "
 "as comments. Furthermore in template mode, pattern symbols are followed by "
@@ -9808,27 +10282,27 @@
 "träffats av mönstret."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:447
+#: dpkg-gensymbols.1:452
 msgid "B<http://people.redhat.com/drepper/symbol-versioning>"
 msgstr "B<http://people.redhat.com/drepper/symbol-versioning>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:449
+#: dpkg-gensymbols.1:454
 msgid "B<http://people.redhat.com/drepper/goodpractice.pdf>"
 msgstr "B<http://people.redhat.com/drepper/goodpractice.pdf>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:451
+#: dpkg-gensymbols.1:456
 msgid "B<http://people.redhat.com/drepper/dsohowto.pdf>"
 msgstr "B<http://people.redhat.com/drepper/dsohowto.pdf>"
 
 #. type: Plain text
-#: dpkg-gensymbols.1:454
+#: dpkg-gensymbols.1:459
 msgid "B<deb-symbols>(5), B<dpkg-shlibdeps>(1)."
 msgstr "B<deb-symbols>(5), B<dpkg-shlibdeps>(1)."
 
 #. type: Plain text
-#: dpkg-gensymbols.1:457
+#: dpkg-gensymbols.1:462
 msgid "Copyright \\(co 2007-2009 Rapha\\[:e]l Hertzog"
 msgstr "Upphovsrättsskyddat © 2007-2009 Raphaël Hertzog"
 
@@ -9838,12 +10312,6 @@
 msgid "dpkg-maintscript-helper"
 msgstr "dpkg-maintscript-helper"
 
-#. type: TH
-#: dpkg-maintscript-helper.1:1
-#, no-wrap
-msgid "2010-04-16"
-msgstr "2010-04-16"
-
 #. type: Plain text
 #: dpkg-maintscript-helper.1:4
 msgid ""
@@ -9855,11 +10323,11 @@
 #. type: Plain text
 #: dpkg-maintscript-helper.1:8
 msgid ""
-"B<dpkg-maintscript-helper> I<command> [I<parameters>...] -- I<maint-script-"
-"parameters>"
+"B<dpkg-maintscript-helper> I<command> [I<parameter>...] B<--> I<maint-script-"
+"parameter>..."
 msgstr ""
-"B<dpkg-maintscript-helper> I<kommando> [I<flaggor>...] -- I<maint-script-"
-"flaggor>"
+"B<dpkg-maintscript-helper> I<kommando> [I<flagga>...] B<--> I<maint-script-"
+"flagga>..."
 
 #. type: SH
 #: dpkg-maintscript-helper.1:9
@@ -9897,14 +10365,14 @@
 "scripts (B<preinst>, B<postinst>, B<prerm>, B<postrm>). To avoid mistakes "
 "the same call simply needs to be put in all scripts and the program will "
 "automatically adapt its behaviour based on the environment variable "
-"DPKG_MAINTSCRIPT_NAME and on the maintainer scripts arguments that you have "
-"to forward after a double dash."
+"B<DPKG_MAINTSCRIPT_NAME> and on the maintainer scripts arguments that you "
+"have to forward after a double dash."
 msgstr ""
 "Många av dessa åtgärder kräver samordnade åtgärder från flera paketskript "
 "(B<preint>, B<postinst>, B<prerm>, B<postrm>). För att undvika misstag "
 "räcker det att lägga in ett och samma anrop i alla skript, varpå programmet "
-"anpassar sitt beteende beroende på miljövariabeln DPKG_MAINTSCRIPT_NAME och "
-"på paketskriptets parametrar, vilka du måste vidaresända efter dubbla "
+"anpassar sitt beteende beroende på miljövariabeln B<DPKG_MAINTSCRIPT_NAME> "
+"och på paketskriptets parametrar, vilka du måste vidaresända efter dubbla "
 "bindestreck."
 
 #. type: SH
@@ -10120,12 +10588,6 @@
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:116
-#, fuzzy
-#| msgid ""
-#| "Given that B<dpkg-maintscript-helper> is used in the B<preinst>, using it "
-#| "unconditionally requires a pre-dependency to ensure that the required "
-#| "version of dpkg has been configured before. The required version depends "
-#| "on the command used, for B<rm_conffile> and B<mv_conffile> it is 1.15.7.2:"
 msgid ""
 "Given that B<dpkg-maintscript-helper> is used in the B<preinst>, using it "
 "unconditionally requires a pre-dependency to ensure that the required "
@@ -10134,15 +10596,15 @@
 msgstr ""
 "Givet att B<dpkg-maintscript-helper> används i B<preinst> så innebär detta "
 "villkorslöst att ett förhandsberoende (\"pre-dependency\") krävs för att "
-"försäkra att den nödvändiga versionen av dpkg redan har konfigurerats. Den "
+"försäkra att den nödvändiga versionen av dpkg redan har packats upp. Den "
 "version som krävs beror på vilket kommando som används, för B<rm_conffile> "
 "och B<mv_conffile> är det 1.15.7.2:"
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:118
 #, no-wrap
-msgid "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
-msgstr "    Pre-Depends: dpkg (E<gt>= 1.15.7.2)\n"
+msgid "    B<Pre-Depends:> dpkg (E<gt>= 1.15.7.2)\n"
+msgstr "    B<Pre-Depends:> dpkg (E<gt>= 1.15.7.2)\n"
 
 #. type: Plain text
 #: dpkg-maintscript-helper.1:123
@@ -10161,15 +10623,20 @@
 #: dpkg-maintscript-helper.1:127
 #, no-wrap
 msgid ""
-"    if dpkg-maintscript-helper supports E<lt>commandE<gt>; then\n"
-"        dpkg-maintscript-helper E<lt>commandE<gt> ...\n"
+"    if dpkg-maintscript-helper supports I<command>; then\n"
+"        dpkg-maintscript-helper I<command> ...\n"
 "    fi\n"
 msgstr ""
-"    if dpkg-maintscript-helper supports E<lt>kommandoE<gt>; then\n"
-"        dpkg-maintscript-helper E<lt>kommandoE<gt> ...\n"
+"    if dpkg-maintscript-helper supports I<kommando>; then\n"
+"        dpkg-maintscript-helper I<kommando> ...\n"
 "    fi\n"
 
 #. type: Plain text
+#: dpkg-maintscript-helper.1:130
+msgid "Copyright \\(co 2010 Rapha\\[:e]l Hertzog"
+msgstr "Upphovsrättsskyddat © 2010 Raphaël Hertzog"
+
+#. type: Plain text
 #: dpkg-maintscript-helper.1:132
 msgid "Copyright \\(co 2008 Joey Hess"
 msgstr "Upphovsrättsskyddat © 2008 Joey Hess"
@@ -10190,12 +10657,6 @@
 msgid "dpkg-mergechangelogs"
 msgstr "dpkg-mergechangelogs"
 
-#. type: TH
-#: dpkg-mergechangelogs.1:1
-#, no-wrap
-msgid "2010-04-18"
-msgstr "2010-04-18"
-
 #. type: Plain text
 #: dpkg-mergechangelogs.1:4
 msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
@@ -10354,62 +10815,60 @@
 
 #. type: Plain text
 #: dpkg-name.1:15
-msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
-msgstr "B<dpkg-name> [I<flaggor>] [B<-->] I<filer>"
+msgid "B<dpkg-name> [I<option>...] [B<-->] I<file>..."
+msgstr "B<dpkg-name> [I<flagga>...] [B<-->] I<fil>..."
 
 #. type: Plain text
-#: dpkg-name.1:28
+#: dpkg-name.1:29
 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>."
-"E<lt>package_typeE<gt>> 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. "
-"The I<E<lt>package_typeE<gt>> part comes from that field if present or "
-"fallbacks to B<deb>."
+"package name consists of I<package>B<_>I<version>B<_>I<architecture>B<."
+">I<package-type> as specified in the control file of the package. The "
+"I<version> part of the filename consists of the upstream version information "
+"optionally followed by a hyphen and the revision information. The I<package-"
+"type> part comes from that field if present or fallbacks to B<deb>."
 msgstr ""
 "Manualsidan dokumenterar programmet B<dpkg-name>, vilket tillhandahåller ett "
 "enkelt sätt att byta namn på B<Debian>paket till deras fullständiga "
 "paketnamn. Ett fullständigt paketnamn består av "
-"I<E<lt>paketE<gt>_E<lt>versionE<gt>_E<lt>arkitekturE<gt>.E<lt>pakettypE<gt>> "
-"och anges av control-filen i paketet. I<E<lt>VersionE<gt>>-delen av "
-"filnamnet består av uppströmsversionsinformation och kan eventuellt följas "
-"av ett bindestreck och revisionsinformationen. I<E<lt>PakettypE<gt>>-delen "
-"kommer från fältet I<package_type> om det finns, annars B<deb>."
+"I<paket>B<_>I<version>B<_>I<arkitektur>B<.>I<pakettyp> och anges av control-"
+"filen i paketet. I<Version>-delen av filnamnet består av "
+"uppströmsversionsinformation och kan eventuellt följas av ett bindestreck "
+"och revisionsinformationen. I<Pakettyp>-delen kommer från fältet I<package-"
+"type> om det finns, annars B<deb>."
 
 #. type: TP
-#: dpkg-name.1:30
+#: dpkg-name.1:31
 #, no-wrap
 msgid "B<-a>, B<--no-architecture>"
 msgstr "B<-a>, B<--no-architecture>"
 
 #. type: Plain text
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 msgid "The destination filename will not have the architecture information."
 msgstr ""
 "Destinationsfilnamnet kommer inte att innehålla information om arkitektur."
 
 #. type: TP
-#: dpkg-name.1:33
+#: dpkg-name.1:34
 #, no-wrap
 msgid "B<-k>, B<--symlink>"
 msgstr "B<-k>, B<--symlink>"
 
 #. type: Plain text
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 msgid "Create a symlink, instead of moving."
 msgstr "Skapa en symbolisk länk istället för att flytta."
 
 #. type: TP
-#: dpkg-name.1:36
+#: dpkg-name.1:37
 #, no-wrap
 msgid "B<-o>, B<--overwrite>"
 msgstr "B<-o>, B<--overwrite>"
 
 #. type: Plain text
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 msgid ""
 "Existing files will be overwritten if they have the same name as the "
 "destination filename."
@@ -10418,43 +10877,42 @@
 "destinationsfilnamnet."
 
 #. type: TP
-#: dpkg-name.1:40
+#: dpkg-name.1:41
 #, no-wrap
 msgid "B<-s>, B<--subdir> [I<dir>]"
 msgstr "B<-s>, B<--subdir> [I<katalog>]"
 
 #. type: Plain text
-#: dpkg-name.1:52
+#: dpkg-name.1:53
 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 package. The target directory will be `unstable/binary-I<architecture>/"
+"I<section>'. 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 `I<section>/binary-I<architecture>'. 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 ""
 "Filerna kommer att flyttas till en underkatalog. Om katalogen i argumentet "
 "existerar kommer filerna att flyttas in i den katalogen, om inte kommer "
 "namnet på målkatalogen att hämtas från sektionsfältet i styrdelen av "
-"paketet. Målkatalogen kommer vara \"unstable/binary-E<lt>arkitekurE<gt>/"
-"E<lt>sektionE<gt>\". Om sektionen inte hittas i styrfilen antas \"no-section"
-"\", och i så fall, samt för sektionerna \"non-free\" och \"contrib\", är "
-"målkatalogen \"E<lt>sektionE<gt>/binary-E<lt>arkitekturE<gt>\". "
-"Sektionsfältet är inte nödvändigt, så flera paket hamnar i katalogen \"no-"
-"section\". Använd den här flaggan med tillförsikt, den kan vara rörig."
+"paketet. Målkatalogen kommer vara \"unstable/binary-I<arkitekur>I<sektion>"
+"\". Om sektionen inte hittas i styrfilen antas \"no-section\", och i så "
+"fall, samt för sektionerna \"non-free\" och \"contrib\", är målkatalogen "
+"\"I<sektion>/binary-I<arkitektur>\". Sektionsfältet är inte nödvändigt, så "
+"flera paket hamnar i katalogen \"no-section\". Använd den här flaggan med "
+"tillförsikt, den kan vara rörig."
 
 #. type: TP
-#: dpkg-name.1:52
+#: dpkg-name.1:53
 #, no-wrap
 msgid "B<-c>, B<--create-dir>"
 msgstr "B<-c>, B<--create-dir>"
 
 #. type: Plain text
-#: dpkg-name.1:57
+#: dpkg-name.1:58
 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.>"
@@ -10464,19 +10922,19 @@
 "försiktigt.>"
 
 #. type: TP
-#: dpkg-name.1:60
+#: dpkg-name.1:61
 #, no-wrap
 msgid "B<-v>, B<--version>"
 msgstr "B<-v>, B<--version>"
 
 #. type: TP
-#: dpkg-name.1:65
+#: dpkg-name.1:66
 #, no-wrap
 msgid "B<dpkg-name bar-foo.deb>"
 msgstr "B<dpkg-name bar-foo.deb>"
 
 #. type: Plain text
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 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 "
@@ -10487,13 +10945,13 @@
 "av \"bar-foo.deb\")."
 
 #. type: TP
-#: dpkg-name.1:70
+#: dpkg-name.1:71
 #, 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:75
+#: dpkg-name.1:76
 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 "
@@ -10504,13 +10962,13 @@
 "till namn utan arkitekturinformation."
 
 #. type: TP
-#: dpkg-name.1:75
+#: dpkg-name.1:76
 #, 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:81
+#: dpkg-name.1:82
 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.>"
@@ -10519,33 +10977,33 @@
 "eftersom många paket inte har någon sektionsinformation. B<Gör inte så här.>"
 
 #. type: TP
-#: dpkg-name.1:81
+#: dpkg-name.1:82
 #, 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:84
+#: dpkg-name.1:85
 msgid "This can be used when building new packages."
 msgstr "Kan användas när nya paket byggs."
 
 #. type: Plain text
-#: dpkg-name.1:94
+#: dpkg-name.1:95
 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 "
+"I<package>B<_>I<version>B<_>I<architecture>B<.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 ""
 "Vissa paket följer inte namnstrukturen "
-"E<lt>paketE<gt>_E<lt>versionE<gt>_E<lt>arckitekturE<gt>.deb. Paket vars namn "
-"ändrats med dpkg-name kommer följa denna struktur. Normalt påverkar detta "
-"inte hur B<dselect>(1)/B<dpkg>(1) installerar paket, men vissa andra "
+"I<paket>B<_>I<version>B<_>I<arkitektur>B<.deb>. Paket vars namn ändrats med "
+"dpkg-name kommer följa denna struktur. Normalt påverkar detta inte hur "
+"B<dselect>(1)/B<dpkg>(1) installerar paket, men vissa andra "
 "installationsverktyg kan vara beroende av denna namngivningsstruktur."
 
 #. type: Plain text
-#: dpkg-name.1:102
+#: dpkg-name.1:103
 msgid ""
 "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
 "B<xargs>(1)."
@@ -10554,7 +11012,7 @@
 "B<xargs>(1)."
 
 #. type: Plain text
-#: dpkg-name.1:105
+#: dpkg-name.1:106
 msgid "Copyright \\(co 1995,1996 Erick Branderhorst"
 msgstr "Upphovsrättsskyddat © 1995, 1996 Erick Branderhorst"
 
@@ -10564,12 +11022,6 @@
 msgid "dpkg-parsechangelog"
 msgstr "dpkg-parsechangelog"
 
-#. type: TH
-#: dpkg-parsechangelog.1:1
-#, no-wrap
-msgid "2009-05-19"
-msgstr "2009-05-19"
-
 #. type: Plain text
 #: dpkg-parsechangelog.1:4
 msgid "dpkg-parsechangelog - parse Debian changelog files"
@@ -10577,8 +11029,8 @@
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:8
-msgid "B<dpkg-parsechangelog> [I<options>]"
-msgstr "B<dpkg-parsechangelog> [I<flaggor>]"
+msgid "B<dpkg-parsechangelog> [I<option>...]"
+msgstr "B<dpkg-parsechangelog> [I<flagga>...]"
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:14
@@ -10649,26 +11101,26 @@
 #. type: TP
 #: dpkg-parsechangelog.1:54
 #, no-wrap
-msgid "B<Source:> E<lt>pkg nameE<gt>"
-msgstr "B<Source:> E<lt>paketnamnE<gt>"
+msgid "B<Source:>I< pkg-name>"
+msgstr "B<Source:> I<paketnamn>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:56
 #, no-wrap
-msgid "B<Version:> E<lt>versionE<gt>"
-msgstr "B<Version:> E<lt>versionsE<gt>"
+msgid "B<Version:>I< version>"
+msgstr "B<Version:> I<versions>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:58
 #, no-wrap
-msgid "B<Distribution:> E<lt>target distributionE<gt>"
-msgstr "B<Description:> E<lt>målutgåvaE<gt>"
+msgid "B<Distribution:>I< target-distribution>"
+msgstr "B<Distribution:> I<målutgåva>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:60
 #, no-wrap
-msgid "B<Urgency:> E<lt>urgencyE<gt>"
-msgstr "B<Urgency:> E<lt>brådskaE<gt>"
+msgid "B<Urgency:>I< urgency>"
+msgstr "B<Urgency:> I<brådska>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:63
@@ -10678,20 +11130,20 @@
 #. type: TP
 #: dpkg-parsechangelog.1:63
 #, no-wrap
-msgid "B<Maintainer:> E<lt>authorE<gt>"
-msgstr "B<Maintainer:> E<lt>författareE<gt>"
+msgid "B<Maintainer:>I< author>"
+msgstr "B<Maintainer:> I<författare>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:65
 #, no-wrap
-msgid "B<Date:> E<lt>dateE<gt>"
-msgstr "B<Date:> E<lt>datumE<gt>"
+msgid "B<Date:>I< date>"
+msgstr "B<Date:> I<datum>"
 
 #. type: TP
 #: dpkg-parsechangelog.1:67
 #, no-wrap
-msgid "B<Closes:> E<lt>bug numberE<gt>"
-msgstr "B<Closes:> E<lt>nummer på felrapportE<gt>"
+msgid "B<Closes:>I< bug-number>"
+msgstr "B<Closes:> I<nummer-på-felrapport>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:70
@@ -10701,8 +11153,8 @@
 #. type: TP
 #: dpkg-parsechangelog.1:70
 #, no-wrap
-msgid "B<Changes:> E<lt>changelog entriesE<gt>"
-msgstr "B<Changes:> E<lt>poster från ändringsloggenE<gt>"
+msgid "B<Changes:>I< changelog-entries>"
+msgstr "B<Changes:> I<posterfrån-ändringsloggen>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.1:77
@@ -10806,7 +11258,7 @@
 "är lägre än 0)."
 
 #. type: TP
-#: dpkg-parsechangelog.1:104 update-alternatives.8:269
+#: dpkg-parsechangelog.1:104 update-alternatives.8:268
 #, no-wrap
 msgid "B<--all>"
 msgstr "B<--all>"
@@ -10881,10 +11333,9 @@
 
 #. type: TP
 #: dpkg-query.1:14
-#, fuzzy, no-wrap
-#| msgid "B<-l>, B<--list> I<package-name-pattern>..."
+#, no-wrap
 msgid "B<-l>, B<--list> [I<package-name-pattern>...]"
-msgstr "B<-l>, B<--list> I<paketnamnsmönster> ..."
+msgstr "B<-l>, B<--list> [I<paketnamnsmönster> ...]"
 
 #. type: Plain text
 #: dpkg-query.1:24
@@ -11008,10 +11459,9 @@
 
 #. type: TP
 #: dpkg-query.1:67
-#, fuzzy, no-wrap
-#| msgid "B<-W>, B<--show> I<package-name-pattern>..."
+#, no-wrap
 msgid "B<-W>, B<--show> [I<package-name-pattern>...]"
-msgstr "B<-W>, B<--show> I<paketnamnsmönster> ..."
+msgstr "B<-W>, B<--show> [I<paketnamnsmönster> ...]"
 
 #. type: Plain text
 #: dpkg-query.1:74
@@ -11035,37 +11485,43 @@
 msgstr "B<-s>, B<--status> I<paketnamn> ..."
 
 #. type: Plain text
-#: dpkg-query.1:78
+#: dpkg-query.1:79
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"installed package status database. When multiple I<package-name> are listed, "
+"the requested status entries are separated by an empty line."
 msgstr ""
 "Rapportera status om det angivna paketet.  Detta alternativ visar helt "
-"enkelt posten i statusdatabasen för installerade paket."
+"enkelt posten i statusdatabasen för installerade paket. Om flera "
+"I<paketnamn> anges avdelas de efterfrågade statusposterna med en tomrad."
 
 #. type: TP
-#: dpkg-query.1:78
+#: dpkg-query.1:79
 #, no-wrap
 msgid "B<-L>, B<--listfiles> I<package-name>..."
 msgstr "B<-L>, B<--listfiles> I<paketnamn> ..."
 
 #. type: Plain text
-#: dpkg-query.1:83
+#: dpkg-query.1:85
 msgid ""
-"List files installed to your system from I<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+"List files installed to your system from I<package-name>. When multiple "
+"I<package-name> are listed, the requested lists of files are separated by an "
+"empty line. However, note that files created by package-specific "
+"installation-scripts are not listed."
 msgstr ""
-"Listar filer som installerats på ditt system från I<paketnamn>. Observera "
-"att filer som skapats av paketspecifika installationsskript inte visas"
+"Listar filer som installerats på ditt system från I<paketnamn>. Om flera "
+"I<paketnamn> anges avdelas den efterfrågade fillistan med en tomrad. "
+"Observera att filer som skapats av paketspecifika installationsskript inte "
+"visas"
 
 #. type: TP
-#: dpkg-query.1:83
+#: dpkg-query.1:85
 #, no-wrap
 msgid "B<-c>, B<--control-path> I<package-name> [I<control-file>]"
 msgstr "B<-c>, B<--control-path> I<paketnamn> [I<control-filnamn>]"
 
 #. type: Plain text
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 msgid ""
 "List paths for control files installed to your system from I<package-name>.  "
 "If I<control-file> is specified then only list the path for that control "
@@ -11082,55 +11538,64 @@
 "nuvarande arkitektoniska begränsningarna har lösts."
 
 #. type: TP
-#: dpkg-query.1:91
+#: dpkg-query.1:93
 #, no-wrap
 msgid "B<-S>, B<--search> I<filename-search-pattern>..."
 msgstr "B<-S>, B<--search> I<filnamnssökmönster> ..."
 
 #. type: Plain text
-#: dpkg-query.1:97
+#: dpkg-query.1:99
 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 ""
-"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 "
+"Search for packages that own files corresponding to the given pattern.  "
+"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 paket som äger filer som motsvarar det angivna mönstret. 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:97
+#: dpkg-query.1:99
 #, no-wrap
 msgid "B<-p>, B<--print-avail> I<package-name>..."
 msgstr "B<-p>, B<--print-avail> I<paketnamn>"
 
 #. type: Plain text
-#: dpkg-query.1:104
+#: dpkg-query.1:105
 msgid ""
 "Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>. Users of APT-based frontends should use B<apt-cache show> "
-"I<package-name> instead as the I<available> file is only kept up-to-date "
-"when using B<dselect>."
+"available>. When multiple I<package-name> are listed, the requested "
+"I<available> entries are separated by an empty line."
 msgstr ""
 "Visar information om I<paketnamn>, enligt vad som finns i I</var/lib/dpkg/"
-"available>. Använder du ett APT-baserat skal bör du istället använda B<apt-"
-"cache show> I<paketnamn>, då I<available>-filen endast àjourförs om "
-"B<dselect> används."
+"available>. Om flera I<paketnamn> anges avdelas de efterfrågade posterna ur "
+"I<available>-filen med en tomrad."
+
+#. type: Plain text
+#: dpkg-query.1:110
+msgid ""
+"Users of APT-based frontends should use B<apt-cache show> I<package-name> "
+"instead as the I<available> file is only kept up-to-date when using "
+"B<dselect>."
+msgstr ""
+"Använder du ett APT-baserat skal bör du istället använda B<apt-cache show> "
+"I<paketnamn>, då I<available>-filen endast àjourförs om B<dselect> används."
 
 #. type: TP
-#: dpkg-query.1:116
+#: dpkg-query.1:122
 #, no-wrap
 msgid "B<-f>, B<--showformat=>I<format>"
 msgstr "B<-f>, B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-query.1:123
+#: dpkg-query.1:129
 msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
 msgstr "I formatsträngen inleds följande styrsekvenser med \\(lqB<\\e>\\(rq:"
 
 #. type: Plain text
-#: dpkg-query.1:128
+#: dpkg-query.1:134
 #, no-wrap
 msgid ""
 "    B<\\en>  newline\n"
@@ -11142,7 +11607,7 @@
 "    B<\\et>  tabulator\n"
 
 #. type: Plain text
-#: dpkg-query.1:133
+#: dpkg-query.1:139
 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<"
@@ -11153,7 +11618,7 @@
 "och \\(lqB<$>\\(rq."
 
 #. type: Plain text
-#: dpkg-query.1:141
+#: dpkg-query.1:147
 msgid ""
 "Package information can be included by inserting variable references to "
 "package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
@@ -11170,7 +11635,7 @@
 "finns i binärpaketet hamnar där):"
 
 #. type: Plain text
-#: dpkg-query.1:176
+#: dpkg-query.1:182
 #, no-wrap
 msgid ""
 "    B<Architecture>\n"
@@ -11183,11 +11648,11 @@
 "    B<Description>\n"
 "    B<Enhances>\n"
 "    B<Essential>\n"
-"    B<Filename> (internal, dselect related)\n"
+"    B<Filename> (internal, front-end related)\n"
 "    B<Homepage>\n"
 "    B<Installed-Size>\n"
-"    B<MD5sum> (internal, dselect related)\n"
-"    B<MSDOS-Filename> (internal, dselect related)\n"
+"    B<MD5sum> (internal, front-end related)\n"
+"    B<MSDOS-Filename> (internal, front-end related)\n"
 "    B<Maintainer>\n"
 "    B<Origin>\n"
 "    B<Package>\n"
@@ -11198,11 +11663,11 @@
 "    B<Replaces>\n"
 "    B<Revision> (obsolete)\n"
 "    B<Section>\n"
-"    B<Size> (internal, dselect related)\n"
+"    B<Size> (internal, front-end related)\n"
 "    B<Source>\n"
 "    B<Status> (internal)\n"
 "    B<Suggests>\n"
-"    B<Tag> (usually not in the .deb but in APT's Packages files)\n"
+"    B<Tag> (usually not in the .deb but in the repository Packages files)\n"
 "    B<Triggers-Awaited> (internal)\n"
 "    B<Triggers-Pending> (internal)\n"
 "    B<Version>\n"
@@ -11217,11 +11682,11 @@
 "    B<Description>\n"
 "    B<Enhances>\n"
 "    B<Essential>\n"
-"    B<Filename> (internt, dselect-relaterat)\n"
+"    B<Filename> (internt, skalrelaterat)\n"
 "    B<Homepage>\n"
 "    B<Installed-Size>\n"
-"    B<MD5sum> (internt, dselect-relaterat)\n"
-"    B<MSDOS-Filename> (internt, dselect-relaterat)\n"
+"    B<MD5sum> (internt, skalrelaterat)\n"
+"    B<MSDOS-Filename> (internt, skalrelaterat)\n"
 "    B<Maintainer>\n"
 "    B<Origin>\n"
 "    B<Package>\n"
@@ -11232,15 +11697,15 @@
 "    B<Replaces>\n"
 "    B<Revision> (föråldrat)\n"
 "    B<Section>\n"
-"    B<Size>  (internt, dselect-relaterat)\n"
+"    B<Size>  (internt, skalrelaterat)\n"
 "    B<Source>\n"
 "    B<Status> (internt)\n"
 "    B<Suggests>\n"
-"    B<Tag> (normalt inte i .deb, utan i APTs Packages-filer)\n"
+"    B<Tag> (normalt inte i .deb, utan i arkivets Packages-filer)\n"
 "    B<Triggers-Awaited> (internt)    B<Triggers-Pending> (internt)    B<Version>\n"
 
 #. type: Plain text
-#: dpkg-query.1:184
+#: dpkg-query.1:190
 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 "
@@ -11255,37 +11720,39 @@
 "av dpkg och kan du köra:"
 
 #. type: Plain text
-#: dpkg-query.1:187
+#: dpkg-query.1:193
 #, no-wrap
 msgid "  B<dpkg-query -W -f=\\(aq${Package} ${Version}\\et${Maintainer}\\en\\(aq dpkg>\n"
 msgstr "  B<dpkg-query -W -f=\\(aq${Package} ${Version}\\et${Maintainer}\\en\\(aq dpkg>\n"
 
 #. type: SH
-#: dpkg-query.1:189 dpkg-split.1:180 start-stop-daemon.8:256
-#: update-alternatives.8:375
+#: dpkg-query.1:195 dpkg-split.1:179 start-stop-daemon.8:259
+#: update-alternatives.8:374
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "RETURVÄRDE"
 
-#. type: IP
-#: dpkg-query.1:190 update-alternatives.8:376
+#. type: TP
+#: dpkg-query.1:196 dpkg-split.1:180 start-stop-daemon.8:260
+#: start-stop-daemon.8:289 update-alternatives.8:375
 #, no-wrap
-msgid "0"
-msgstr "0"
+msgid "B<0>"
+msgstr "B<0>"
 
 #. type: Plain text
-#: dpkg-query.1:192
+#: dpkg-query.1:199
 msgid "The requested query was successfully performed."
 msgstr "Den önskade frågan utfördes utan fel."
 
-#. type: IP
-#: dpkg-query.1:192
+#. type: TP
+#: dpkg-query.1:199 dpkg-split.1:186 start-stop-daemon.8:270
+#: start-stop-daemon.8:292
 #, no-wrap
-msgid "1"
-msgstr "1"
+msgid "B<1>"
+msgstr "B<1>"
 
 #. type: Plain text
-#: dpkg-query.1:195
+#: dpkg-query.1:203
 msgid ""
 "Problems were encountered while parsing the command line or performing the "
 "query, including no file or package being found (except for --control-path)."
@@ -11295,7 +11762,7 @@
 "control-path)."
 
 #. type: Plain text
-#: dpkg-query.1:205
+#: dpkg-query.1:213
 msgid ""
 "This setting influences the output of the B<--list> option by changing the "
 "width of its output."
@@ -11304,7 +11771,7 @@
 "bredden på dess utdata."
 
 #. type: Plain text
-#: dpkg-query.1:208
+#: dpkg-query.1:216
 msgid "Copyright \\(co 2001 Wichert Akkerman"
 msgstr "Upphovsrättsskyddat © 2001 Wichert Akkerman"
 
@@ -11314,28 +11781,22 @@
 msgid "dpkg-scanpackages"
 msgstr "dpkg-scanpackages"
 
-#. type: TH
-#: dpkg-scanpackages.1:15 dpkg-scansources.1:1
-#, no-wrap
-msgid "2009-10-01"
-msgstr "2009-10-01"
-
 #. type: Plain text
 #: dpkg-scanpackages.1:18
 msgid "dpkg-scanpackages - create Packages index files"
 msgstr "dpkg-scanpackages - skapar indexfilerna Packages"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:27
+#: dpkg-scanpackages.1:26
 msgid ""
-"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scanpackages> [I<option>...] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
-"B<dpkg-scanpackages> [I<flaggor>] I<binärkatalog> [I<överstyrningsfil> "
+"B<dpkg-scanpackages> [I<flagga>...] I<binärkatalog> [I<överstyrningsfil> "
 "[I<sökvägsprefix>]] B<E<gt>> I<Packages>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:40
+#: dpkg-scanpackages.1:39
 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 "
@@ -11352,7 +11813,7 @@
 "på en klase maskiner."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:52
+#: 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<bzip2>(1)  (generating a "
@@ -11367,7 +11828,7 @@
 "källor)."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:59
+#: 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 "
@@ -11380,7 +11841,7 @@
 "filen kommer inledas med strängen."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-scanpackages.1:63
 msgid ""
 "I<overridefile> is the name of a file to read which contains information "
 "about how the package fits into the distribution (it can be a compressed "
@@ -11391,7 +11852,7 @@
 "en komprimerad fil); se B<deb-override>(5)."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-scanpackages.1:66
 msgid ""
 "I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
@@ -11399,7 +11860,7 @@
 "filnamnsfältet."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:71
+#: dpkg-scanpackages.1:70
 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 "
@@ -11410,35 +11871,35 @@
 "bara den första som hittas att användas."
 
 #. type: TP
-#: dpkg-scanpackages.1:73
+#: dpkg-scanpackages.1:72
 #, no-wrap
 msgid "B<-t>, B<--type> I<type>"
 msgstr "B<-t>, B<--test> I<typ>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 msgid "Scan for *.I<type> packages, instead of *.deb."
 msgstr "Sök efter *.I<typ>-paket, i stället för *.deb."
 
 #. type: TP
-#: dpkg-scanpackages.1:76
+#: dpkg-scanpackages.1:75
 #, no-wrap
 msgid "B<-u>, B<--udeb>"
 msgstr "B<-u>, B<--udeb>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:79
+#: dpkg-scanpackages.1:78
 msgid "B<Obsolete> alias for B<-tudeb>."
 msgstr "B<Föråldrat> alias till B<-tudeb>."
 
 #. type: IP
-#: dpkg-scanpackages.1:79 dpkg-scansources.1:50
+#: dpkg-scanpackages.1:78 dpkg-scansources.1:49
 #, no-wrap
 msgid "B<-e>, B<--extra-override> I<file>"
 msgstr "B<-e>, B<--extra-override> I<fil>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:85 dpkg-scansources.1:55
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:54
 msgid ""
 "Scan I<file> to find supplementary overrides (the file can be compressed). "
 "See B<deb-extra-override>(5)  for more information on its format."
@@ -11447,13 +11908,13 @@
 "komprimerad). Se B<deb-extra-override>(5) för mer information om dess format."
 
 #. type: TP
-#: dpkg-scanpackages.1:85
+#: dpkg-scanpackages.1:84
 #, no-wrap
 msgid "B<-a>, B<--arch> I<arch>"
 msgstr "B<-a>, B<--arch> I<arkitektur>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 msgid ""
 "Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
 "scanning for all debs."
@@ -11462,24 +11923,24 @@
 "istället för att söka efter alla deb-arkiv."
 
 #. type: TP
-#: dpkg-scanpackages.1:89
+#: dpkg-scanpackages.1:88
 #, no-wrap
 msgid "B<-m>, B<--multiversion>"
 msgstr "B<-m>, B<--multiversion>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 msgid "Include all found packages in the output."
 msgstr "Ta med alla paket som hittas i utdata."
 
 #. type: TP
-#: dpkg-scanpackages.1:92
+#: dpkg-scanpackages.1:91
 #, no-wrap
 msgid "B<-M>, B<--medium> I<id-string>"
 msgstr "B<-M>, B<--medium> I<idsträng>"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:97
+#: dpkg-scanpackages.1:96
 msgid ""
 "Add an X-Medium field containing the value I<id-string>. This field is "
 "required if you want to generate B<Packages.cd> files for use by the multicd "
@@ -11490,13 +11951,13 @@
 "dselect:s multicd-åtkomstmetod."
 
 #. type: SH
-#: dpkg-scanpackages.1:104 update-alternatives.8:447
+#: dpkg-scanpackages.1:103 update-alternatives.8:448
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSTIK"
 
 #. type: Plain text
-#: dpkg-scanpackages.1:110
+#: dpkg-scanpackages.1:109
 msgid ""
 "B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
 "warns about packages that are in the wrong subdirectory, are duplicated, "
@@ -11509,7 +11970,7 @@
 "substitueringar utan effekt skrivna av paketansvariga."
 
 #. type: Plain text
-#: dpkg-scanpackages.1:116
+#: dpkg-scanpackages.1:115
 msgid ""
 "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<deb-extra-override>(5), "
 "B<dpkg-scansources>(1)."
@@ -11529,16 +11990,16 @@
 msgstr "dpkg-scansources - skapar indexfilerna Sources"
 
 #. type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-scansources.1:12
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"B<dpkg-scansources> [I<option>...] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
-"B<dpkg-scansources> [I<flaggor>] I<binärkatalog> [I<överstyrningsfil> "
+"B<dpkg-scansources> [I<flagga>...] I<binärkatalog> [I<överstyrningsfil> "
 "[I<sökvägsprefix>]] B<E<gt>> I<Sources>"
 
 #. type: Plain text
-#: dpkg-scansources.1:18
+#: dpkg-scansources.1:17
 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."
@@ -11548,7 +12009,7 @@
 "standard ut."
 
 #. type: Plain text
-#: dpkg-scansources.1:29
+#: dpkg-scansources.1:28
 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> "
@@ -11572,7 +12033,7 @@
 "Detta kan komma att ändras."
 
 #. type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-scansources.1:32
 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 "
@@ -11583,7 +12044,7 @@
 "katalogfälten innehåller sökvägen från toppen av Debianarkivhierarkin."
 
 #. type: Plain text
-#: dpkg-scansources.1:44
+#: dpkg-scansources.1:43
 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 "
@@ -11596,13 +12057,13 @@
 "(dvs. B<file://>-källor)."
 
 #. type: IP
-#: dpkg-scansources.1:46
+#: dpkg-scansources.1:45
 #, no-wrap
 msgid "B<-n>, B<--no-sort>"
 msgstr "B<-n>, B<--no-sort>"
 
 #. type: Plain text
-#: dpkg-scansources.1:49
+#: dpkg-scansources.1:48
 msgid ""
 "Don't sort the index records. Normally they are sorted by source package "
 "name."
@@ -11611,13 +12072,13 @@
 "källkodspaketet."
 
 #. type: IP
-#: dpkg-scansources.1:55
+#: dpkg-scansources.1:54
 #, no-wrap
 msgid "B<-s>, B<--source-override> I<file>"
 msgstr "B<-s>, B<--source-override> I<fil>"
 
 #. type: Plain text
-#: dpkg-scansources.1:59
+#: dpkg-scansources.1:58
 msgid ""
 "Use I<file> as the source override file (the file can be compressed).  The "
 "default is the name of the override file you specified with I<.src> appended."
@@ -11627,7 +12088,7 @@
 "tillägget I<.src>."
 
 #. type: Plain text
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 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 "
@@ -11642,23 +12103,23 @@
 "filerna kommer källkodsöverstyrningsfilen först för att välja sektion."
 
 #. type: IP
-#: dpkg-scansources.1:65
+#: dpkg-scansources.1:64
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 #. type: Plain text
-#: dpkg-scansources.1:67
+#: dpkg-scansources.1:66
 msgid "Turn debugging on."
 msgstr "Slå på felsökning."
 
 #. type: Plain text
-#: dpkg-scansources.1:76
+#: dpkg-scansources.1:75
 msgid "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 msgstr "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 
 #. type: Plain text
-#: dpkg-scansources.1:78
+#: dpkg-scansources.1:77
 msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 
@@ -11668,34 +12129,24 @@
 msgid "dpkg-shlibdeps"
 msgstr "dpkg-shlibdeps"
 
-#. type: TH
-#: dpkg-shlibdeps.1:1 dpkg-source.1:2 start-stop-daemon.8:1
-#: update-alternatives.8:8
-#, fuzzy, no-wrap
-#| msgid "2010-03-07"
-msgid "2011-03-04"
-msgstr "2010-03-07"
-
 #. type: Plain text
 #: dpkg-shlibdeps.1:4
 msgid "dpkg-shlibdeps - generate shared library substvar dependencies"
 msgstr "dpkg-shlibdeps - skapar substvar-beroenden för delade bibliotek"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:10
-msgid ""
-"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
-msgstr ""
-"B<dpkg-shlibdeps> [I<flaggor>] I<programfil>|B<-e>I<programfil> [I<flaggor>]"
+#: dpkg-shlibdeps.1:8
+msgid "B<dpkg-shlibdeps> [I<option>...] [B<-e>]I<executable> [I<option>...]"
+msgstr "B<dpkg-shlibdeps> [I<flagga>...] [B<-e>]I<programfil> [I<flagga>...]"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:24
+#: dpkg-shlibdeps.1:22
 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."
+"other variables starting with B<shlibs:> are removed from the file."
 msgstr ""
 "B<dpkg-shlibdeps> beräknar beroenden mellan exekverbara filer som anges som "
 "argument och delade bibliotek. Beroendena läggs till i "
@@ -11704,7 +12155,7 @@
 "Alla andra variabler som börjar på I<shlibs:> tas bort ur filen."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 msgid ""
 "B<dpkg-shlibdeps> has two possible sources of information to generate "
 "dependency information. Either I<symbols> files or I<shlibs> files. For each "
@@ -11733,13 +12184,13 @@
 "för att slå upp vilket paket biblioteket kommer från."
 
 #. type: SS
-#: dpkg-shlibdeps.1:47
+#: dpkg-shlibdeps.1:45
 #, no-wrap
 msgid "Symbols files"
 msgstr "Symbolfiler"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 msgid ""
 "Symbols files contain finer-grained dependency information by providing the "
 "minimum dependency for each symbol that the library exports. The script "
@@ -11752,13 +12203,13 @@
 "platser (den första träffen används):"
 
 #. type: IP
-#: dpkg-shlibdeps.1:52
+#: dpkg-shlibdeps.1:50
 #, no-wrap
 msgid "debian/*/DEBIAN/symbols"
 msgstr "debian/*/DEBIAN/symbols"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are generated by B<dpkg-gensymbols>(1).  "
@@ -11772,19 +12223,19 @@
 "det byggträdet går före symbols-filer från andra binärpaket."
 
 #. type: IP
-#: dpkg-shlibdeps.1:60
+#: dpkg-shlibdeps.1:58
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols.I<arch>"
 msgstr "/etc/dpkg/symbols/I<package>.symbols.I<arkitektur>"
 
 #. type: IP
-#: dpkg-shlibdeps.1:61
+#: dpkg-shlibdeps.1:59
 #, no-wrap
 msgid "/etc/dpkg/symbols/I<package>.symbols"
 msgstr "/etc/dpkg/symbols/I<paket>.symbols"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 msgid ""
 "Per-system overriding shared library dependency information.  I<arch> is the "
 "architecture of the current system (obtained by B<dpkg-architecture -"
@@ -11795,26 +12246,22 @@
 "architecture -qDEB_HOST_ARCH>)."
 
 #. type: IP
-#: dpkg-shlibdeps.1:65
+#: dpkg-shlibdeps.1:63
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> symbols\\(rq"
-msgstr ""
+msgstr "Utdata från \\(rqB<dpkg-query --control-path> I<package> symbols\\(rq"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:68 dpkg-shlibdeps.1:102
-#, fuzzy
-#| msgid ""
-#| "Package-provided shared library dependency information.  Unless "
-#| "overridden, I<admindir> is /var/lib/dpkg."
+#: dpkg-shlibdeps.1:66 dpkg-shlibdeps.1:100
 msgid ""
 "Package-provided shared library dependency information.  Unless overridden "
 "by --admindir, those files are located in /var/lib/dpkg."
 msgstr ""
-"Paketlokal överstyrande beroendeinformation för delade bibliotek. Normalt är "
-"I<adminkat> /var/lib/dpkg."
+"Paketlokal överstyrande beroendeinformation för delade bibliotek. Filerna "
+"befinner sig i /var/lib/dpkg om inte överstyrt med --admindir."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:75
+#: dpkg-shlibdeps.1:73
 msgid ""
 "While scanning the symbols used by all binaries, B<dpkg-shlibdeps> remembers "
 "the (biggest) minimal version needed for each library. At the end of the "
@@ -11828,7 +12275,7 @@
 "I<symbols>-filerna är korrekt)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 msgid ""
 "As a safe-guard measure, a symbols file can provide a I<Build-Depends-"
 "Package> meta-information field and B<dpkg-shlibdeps> will extract the "
@@ -11843,13 +12290,13 @@
 "genom symbolerna."
 
 #. type: SS
-#: dpkg-shlibdeps.1:82
+#: dpkg-shlibdeps.1:80
 #, no-wrap
 msgid "Shlibs files"
 msgstr "Shlibs-filer"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:86
+#: dpkg-shlibdeps.1:84
 msgid ""
 "Shlibs files associate directly a library to a dependency (without looking "
 "at the symbols). It's thus often stronger than really needed but very safe "
@@ -11860,7 +12307,7 @@
 "men mycket säkert och enkelt att hantera."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 msgid ""
 "The dependencies for a library are looked up in several places. The first "
 "file providing information for the library of interest is used:"
@@ -11869,35 +12316,35 @@
 "innehåller information om det intressanta biblioteket används:"
 
 #. type: IP
-#: dpkg-shlibdeps.1:89
+#: dpkg-shlibdeps.1:87
 #, no-wrap
 msgid "debian/shlibs.local"
 msgstr "debian/shlibs.local"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 msgid "Package-local overriding shared library dependency information."
 msgstr "Paketlokal överstyrande beroendeinformation för delade bibliotek."
 
 #. type: IP
-#: dpkg-shlibdeps.1:91
+#: dpkg-shlibdeps.1:89
 #, no-wrap
 msgid "/etc/dpkg/shlibs.override"
 msgstr "/etc/dpkg/shlibs.override"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 msgid "Per-system overriding shared library dependency information."
 msgstr "Systemspecifik överstyrande beroendeinformation för delade bibliotek."
 
 #. type: IP
-#: dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:91
 #, no-wrap
 msgid "debian/*/DEBIAN/shlibs"
 msgstr "debian/*/DEBIAN/shlibs"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 msgid ""
 "Shared library information generated by the current build process that also "
 "invoked B<dpkg-shlibdeps>.  They are only used if the library is found in a "
@@ -11910,24 +12357,24 @@
 "byggträdet går före shlibs-filer från andra paket."
 
 #. type: IP
-#: dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:97
 #, no-wrap
 msgid "Output from \\(lqB<dpkg-query --control-path> I<package> shlibs\\(rq"
-msgstr ""
+msgstr "Utdata från \\(rqB<dpkg-query --control-path> I<package> shlibs\\(rq"
 
 #. type: IP
-#: dpkg-shlibdeps.1:102
+#: dpkg-shlibdeps.1:100
 #, no-wrap
 msgid "/etc/dpkg/shlibs.default"
 msgstr "/etc/dpkg/shlibs.default"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:104
+#: dpkg-shlibdeps.1:102
 msgid "Per-system default shared library dependency information."
 msgstr "Systemspecifik standardberoendeinformation för delade bibliotek."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:108
+#: dpkg-shlibdeps.1:106
 msgid ""
 "The extracted dependencies are then directly used (except if they are "
 "filtered out because they have been identified as duplicate, or as weaker "
@@ -11938,7 +12385,7 @@
 "beroende)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 msgid ""
 "B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
 "as if they'd been supplied as B<-e>I<executable>."
@@ -11947,13 +12394,13 @@
 "filer, precis som om de angivits som B<-e>I<programfil>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:113
+#: dpkg-shlibdeps.1:111
 #, no-wrap
 msgid "B<-e>I<executable>"
 msgstr "B<-e>I<programfil>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 msgid ""
 "Include dependencies appropriate for the shared libraries required by "
 "I<executable>."
@@ -11962,13 +12409,13 @@
 "I<programfil>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:115
 #, no-wrap
 msgid "B<-d>I<dependencyfield>"
 msgstr "B<-d>I<beroendefält>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:123
+#: dpkg-shlibdeps.1:121
 msgid ""
 "Add dependencies to be added to the control file dependency field "
 "I<dependencyfield>.  (The dependencies for this field are placed in the "
@@ -11979,7 +12426,7 @@
 ">I<beroendefält>.)"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:133
+#: dpkg-shlibdeps.1:131
 msgid ""
 "The B<-d>I<dependencyfield> option takes effect for all executables after "
 "the option, until the next B<-d>I<dependencyfield>.  The default "
@@ -11990,7 +12437,7 @@
 "B<Depends>."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 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>, "
@@ -12005,13 +12452,13 @@
 "viktigaste beroendena."
 
 #. type: TP
-#: dpkg-shlibdeps.1:141
+#: dpkg-shlibdeps.1:139
 #, no-wrap
 msgid "B<-p>I<varnameprefix>"
 msgstr "B<-p>I<variabelnamnsprefix>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:152
+#: dpkg-shlibdeps.1:150
 msgid ""
 "Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
 ">.  Likewise, any existing substitution variables starting with "
@@ -12024,7 +12471,7 @@
 "bort från substitueringsvariabelfilen."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 msgid ""
 "Print substitution variable settings to standard output, rather than being "
 "added to the substitution variables file (B<debian/substvars> by default)."
@@ -12034,13 +12481,13 @@
 "substvars>)."
 
 #. type: TP
-#: dpkg-shlibdeps.1:158
+#: dpkg-shlibdeps.1:156
 #, no-wrap
 msgid "B<-t>I<type>"
 msgstr "B<-t>I<typ>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 msgid ""
 "Prefer shared library dependency information tagged for the given package "
 "type. If no tagged information is available, falls back to untagged "
@@ -12054,13 +12501,13 @@
 "genom att inleda det med namnet på typen, ett kolon, samt blanktecken."
 
 #. type: TP
-#: dpkg-shlibdeps.1:165
+#: dpkg-shlibdeps.1:163
 #, no-wrap
 msgid "B<-L>I<localshlibsfile>"
 msgstr "B<-L>I<lokal-shlibs-fil>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:171
+#: dpkg-shlibdeps.1:169
 msgid ""
 "Read overriding shared library dependency information from "
 "I<localshlibsfile> instead of B<debian/shlibs.local>."
@@ -12069,7 +12516,7 @@
 "fil> i stället för B<debian/shlibs.local>."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 msgid ""
 "Write substitution variables in I<substvarsfile>; the default is B<debian/"
 "substvars>."
@@ -12078,13 +12525,13 @@
 "substvars>."
 
 #. type: TP
-#: dpkg-shlibdeps.1:177
+#: dpkg-shlibdeps.1:175
 #, no-wrap
 msgid "B<-v>"
 msgstr "B<-V>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 msgid ""
 "Enable verbose mode. Numerous messages are displayed to explain what B<dpkg-"
 "shlibdeps> does."
@@ -12093,13 +12540,13 @@
 "shlibs> håller på med."
 
 #. type: TP
-#: dpkg-shlibdeps.1:182
+#: dpkg-shlibdeps.1:180
 #, no-wrap
 msgid "B<-x>I<package>"
 msgstr "B<-x>I<paket>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 msgid ""
 "Exclude the package from the generated dependencies. This is useful to avoid "
 "self-dependencies for packages which provide ELF binaries (executables or "
@@ -12112,13 +12559,13 @@
 "samma paket. Flaggan kan användas flera gånger för att utesluta flera paket."
 
 #. type: TP
-#: dpkg-shlibdeps.1:189
+#: dpkg-shlibdeps.1:187
 #, no-wrap
 msgid "B<-S>I<pkgbuilddir>"
 msgstr "B<-S>I<paketbyggkatalog>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 msgid ""
 "Look into I<pkgbuilddir> first when trying to find a library. This is useful "
 "when the source package builds multiple flavors of the same library and you "
@@ -12133,13 +12580,13 @@
 "kataloger från andra binärpaket."
 
 #. type: TP
-#: dpkg-shlibdeps.1:196
+#: dpkg-shlibdeps.1:194
 #, no-wrap
 msgid "B<--ignore-missing-info>"
 msgstr "B<--ignore-missing-info>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 msgid ""
 "Do not fail if dependency information can't be found for a shared library.  "
 "Usage of this option is discouraged, all libraries should provide dependency "
@@ -12152,13 +12599,13 @@
 "andra paket."
 
 #. type: TP
-#: dpkg-shlibdeps.1:202
+#: dpkg-shlibdeps.1:200
 #, no-wrap
 msgid "B<--warnings=>I<value>"
 msgstr "B<--warnings=>I<värde>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:213
+#: dpkg-shlibdeps.1:211
 msgid ""
 "I<value> is a bit field defining the set of warnings that can be emitted by "
 "B<dpkg-shlibdeps>.  Bit 0 (value=1) enables the warning \"symbol I<sym> used "
@@ -12178,13 +12625,13 @@
 "alla varningar skall vara aktiva."
 
 #. type: SH
-#: dpkg-shlibdeps.1:224
+#: dpkg-shlibdeps.1:222
 #, no-wrap
 msgid "WARNINGS"
 msgstr "VARNINGAR"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 msgid ""
 "Since B<dpkg-shlibdeps> analyzes the set of symbols used by each binary of "
 "the generated package, it is able to emit warnings in several cases. They "
@@ -12199,13 +12646,13 @@
 "varningar du kan stöta på, i fallande allvarlighetsgrad:"
 
 #. type: TP
-#: dpkg-shlibdeps.1:232
+#: dpkg-shlibdeps.1:230
 #, no-wrap
 msgid "B<symbol>I< sym>B< used by >I<binary>B< found in none of the libraries.>"
 msgstr "B<symbolen> I<sym>B<, som används av> I<binär>B<, hittades inte i något av biblioteken.>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a library and it needs to be linked "
@@ -12217,13 +12664,13 @@
 "bibliotek under byggproceduren (länkarflaggan B<-l>I<bibliotek>)."
 
 #. type: TP
-#: dpkg-shlibdeps.1:238
+#: dpkg-shlibdeps.1:236
 #, no-wrap
 msgid "I<binary>B< contains an unresolvable reference to symbol >I<sym>B<: it's probably a plugin>"
 msgstr "I<binär> B<innehåller en referens till symbolen> I<sym> B<som inte kan kopplas; det är troligen ett insticksprogram>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 msgid ""
 "The indicated symbol has not been found in the libraries linked with the "
 "binary. The I<binary> is most likely a plugin and the symbol is probably "
@@ -12248,13 +12695,13 @@
 "hittar det. Om så är fallet är biblioteket trasigt och behöver fixas."
 
 #. type: TP
-#: dpkg-shlibdeps.1:251
+#: dpkg-shlibdeps.1:249
 #, no-wrap
 msgid "B<dependency on >I<library>B< could be avoided if >I<binaries>B< were not uselessly linked against it (they use none of its symbols).>"
 msgstr "B<Beroendet på> I<bibliotek> B<kunde undvikas om inte> I<binärer> B<meningslöst länkades mot det (de använder inga av dess symboler).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 msgid ""
 "None of the I<binaries> that are linked with I<library> use any of the "
 "symbols provided by the library. By fixing all the binaries, you would avoid "
@@ -12267,13 +12714,13 @@
 "beroende även genereras av ett annat bibliotek som faktiskt används)."
 
 #. type: TP
-#: dpkg-shlibdeps.1:257
+#: dpkg-shlibdeps.1:255
 #, no-wrap
 msgid "I<binary>B< shouldn't be linked with >I<library>B< (it uses none of its symbols).>"
 msgstr "I<binär> B<borde inte vara länkat mot> I<bibliotek> B<(inga av symbolerna används).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 msgid ""
 "The I<binary> is linked to a library that it doesn't need. It's not a "
 "problem but some small performance improvements in binary load time can be "
@@ -12288,13 +12735,13 @@
 "globalt på alla analyserade binärer."
 
 #. type: SH
-#: dpkg-shlibdeps.1:264
+#: dpkg-shlibdeps.1:262
 #, no-wrap
 msgid "ERRORS"
 msgstr "FELMEDDELANDEN"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 msgid ""
 "B<dpkg-shlibdeps> will fail if it can't find a public library used by a "
 "binary or if this library has no associated dependency information (either "
@@ -12311,13 +12758,13 @@
 "versionshanterat."
 
 #. type: TP
-#: dpkg-shlibdeps.1:271
+#: dpkg-shlibdeps.1:269
 #, no-wrap
 msgid "B<couldn't find library >I<library-soname>B< needed by >I<binary>B< (its RPATH is '>I<rpath>B<')>"
 msgstr "B<hittade inte biblioteket> I<bibliotek-sonamn> B<som behövs för> I<binär> B<(dess RPATH är \">I<rpath>B<\")>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:287
+#: dpkg-shlibdeps.1:285
 msgid ""
 "The I<binary> uses a library called I<library-soname> but B<dpkg-shlibdeps> "
 "has been unable to find the library.  B<dpkg-shlibdeps> creates a list of "
@@ -12326,8 +12773,8 @@
 "LD_LIBRARY_PATH environment variable, and standard public directories (/"
 "lib, /usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks those "
 "directories in the package's build tree of the binary being analyzed, in the "
-"packages's build trees indicated with the -S command-line option, in other "
-"packages's build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
+"packages' build trees indicated with the -S command-line option, in other "
+"packages' build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file "
 "and finally in the root directory.  If the library is not found in any of "
 "those directories, then you get this error."
 msgstr ""
@@ -12344,7 +12791,7 @@
 "felmeddelandet."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 msgid ""
 "If the library not found is in a private directory of the same package, then "
 "you want to add the directory to LD_LIBRARY_PATH. If it's in another binary "
@@ -12359,13 +12806,13 @@
 "som det också ligger i en privat katalog."
 
 #. type: TP
-#: dpkg-shlibdeps.1:293
+#: dpkg-shlibdeps.1:291
 #, no-wrap
 msgid "B<no dependency information found for >I<library-file>B< (used by >I<binary>B<).>"
 msgstr "B<hittade ingen beroendeinformation för> I<biblioteksfil> B<(använd av> I<binär>B<).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:306
+#: dpkg-shlibdeps.1:304
 msgid ""
 "The library needed by I<binary> has been found by B<dpkg-shlibdeps> in "
 "I<library-file> but B<dpkg-shlibdeps> has been unable to find any dependency "
@@ -12382,7 +12829,7 @@
 "olika paketens byggträd (debian/*/DEBIAN/)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:320
+#: dpkg-shlibdeps.1:318
 msgid ""
 "This failure can be caused by a bad or missing shlibs or symbols file in the "
 "package of the library. It might also happen if the library is built within "
@@ -12408,7 +12855,7 @@
 "problem."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:326
+#: dpkg-shlibdeps.1:324
 msgid ""
 "Calling B<dpkg-shlibdeps> in verbose mode (-v) will provide much more "
 "information about where it tried to find the dependency information. This "
@@ -12419,12 +12866,12 @@
 "vara användbart om du inte förstår varför du får felmeddelandet."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:330
+#: dpkg-shlibdeps.1:328
 msgid "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 msgstr "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:337
+#: dpkg-shlibdeps.1:335
 msgid "Copyright \\(co 2006 Frank Lichtenheld"
 msgstr "Upphovsrättsskyddat © 2006 Frank Lichtenheld"
 
@@ -12440,17 +12887,17 @@
 msgstr "dpkg-source - Verktyg för att manipulera Debiankällkodspaket (.dsc)"
 
 #. type: Plain text
-#: dpkg-source.1:10
-msgid "B<dpkg-source> [I<options>] I<command>"
-msgstr "B<dpkg-source> [I<flaggor>] I<åtgärd>"
+#: dpkg-source.1:9
+msgid "B<dpkg-source> [I<option>...] I<command>"
+msgstr "B<dpkg-source> [I<flagga>...] I<åtgärd>"
 
 #. type: Plain text
-#: dpkg-source.1:14
+#: dpkg-source.1:13
 msgid "B<dpkg-source> packs and unpacks Debian source archives."
 msgstr "B<dpkg-source> packar och packar upp Debiankällkodsarkiv."
 
 #. type: Plain text
-#: dpkg-source.1:18
+#: dpkg-source.1:17
 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 "
@@ -12460,13 +12907,13 @@
 "de tillåter inte att värdet på en flagga anges som ett separat argument."
 
 #. type: TP
-#: dpkg-source.1:20
+#: dpkg-source.1:19
 #, no-wrap
 msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr "B<-x >I<filnamn>B<.dsc >[I<utdatakatalog>]"
 
 #. type: Plain text
-#: dpkg-source.1:30
+#: dpkg-source.1:29
 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 "
@@ -12483,7 +12930,7 @@
 "den aktuella arbetskatalogen."
 
 #. type: Plain text
-#: dpkg-source.1:36
+#: dpkg-source.1:35
 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 "
@@ -12493,7 +12940,7 @@
 "från styrfilen; de antas vara i samma katalog som B<.dsc>-filen."
 
 #. type: Plain text
-#: dpkg-source.1:44
+#: dpkg-source.1:43
 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 "
@@ -12510,7 +12957,7 @@
 "kommer ärva dess gruppägarskap."
 
 #. type: Plain text
-#: dpkg-source.1:49
+#: dpkg-source.1:48
 msgid ""
 "If the source package uses a non-standard format (currently this means all "
 "formats except \"1.0\"), its name will be stored in B<debian/source/format> "
@@ -12523,13 +12970,13 @@
 "byggs på nytt."
 
 #. type: TP
-#: dpkg-source.1:50
+#: dpkg-source.1:49
 #, no-wrap
 msgid "B<-b> I<directory> [I<format-specific-parameters>]"
 msgstr "B<-b> I<katalog> [I<formatspecifika-flaggor>]"
 
 #. type: Plain text
-#: dpkg-source.1:57
+#: dpkg-source.1:56
 msgid ""
 "Build a source package. The first non-option argument is taken as the name "
 "of the directory containing the debianized source tree (i.e. with a debian "
@@ -12544,10 +12991,10 @@
 "ytterligare parametrar kanske godtas."
 
 #. type: Plain text
-#: dpkg-source.1:66
+#: dpkg-source.1:65
 msgid ""
 "B<dpkg-source> will build the source package with the first format found in "
-"this ordered list: the format indicated with the I<--format> command-line "
+"this ordered list: the format indicated with the I<--format> command line "
 "option, the format indicated in B<debian/source/format>, \"1.0\". The "
 "fallback to \"1.0\" is deprecated and will be removed at some point in the "
 "future, you should always document the desired source format in B<debian/"
@@ -12563,13 +13010,13 @@
 "KÄLLKODSPAKET> för en utförlig beskrivning av de olika källkodspaketformaten."
 
 #. type: TP
-#: dpkg-source.1:67
+#: dpkg-source.1:66
 #, no-wrap
 msgid "B<--print-format> I<directory>"
 msgstr "B<--print-format> I<katalog>"
 
 #. type: Plain text
-#: dpkg-source.1:72
+#: dpkg-source.1:71
 msgid ""
 "Print the source format that would be used to build the source package if "
 "B<dpkg-source -b >I<directory> was called (in the same conditions and with "
@@ -12580,7 +13027,7 @@
 "parametrar)."
 
 #. type: TP
-#: dpkg-source.1:73
+#: dpkg-source.1:72
 #, no-wrap
 msgid "B<--before-build> I<directory>"
 msgstr "B<--before-build> I<katalog>"
@@ -12588,19 +13035,19 @@
 #. type: Plain text
 #: dpkg-source.1:81
 msgid ""
-"This command should be called before any build of the package (B<dpkg-"
-"buildpackage> calls it very early even before B<debian/rules clean>). This "
-"command should be idempotent and can be called multiple times. Not all "
-"source formats implement something in this hook, and those that do usually "
-"prepare the source tree for the build for example by ensuring that the "
-"Debian patches are applied."
-msgstr ""
-"Kommandot bör anropas innan paketet byggs (B<dpkg-buildpakcage> anropar det "
-"väldigt tidigt, till och med före B<debian/rules clean>). Kommandot bör vara "
-"idempotent och kunna anropas flera gånger. Det är inte alla källkodsformat "
-"som implementerar något i den här kroken, och de som gör det förbereder "
-"oftast källkodsträdet för att byggas, till exempel genom att se till att "
-"Debianpatchar har applicerats."
+"Run the corresponding hook of the source package format. This hook is called "
+"before any build of the package (B<dpkg-buildpackage> calls it very early "
+"even before B<debian/rules clean>). This command is idempotent and can be "
+"called multiple times. Not all source formats implement something in this "
+"hook, and those that do usually prepare the source tree for the build for "
+"example by ensuring that the Debian patches are applied."
+msgstr ""
+"Kör motsvarande krok för källkodspaketformatet. Kroken anropas innan något "
+"från paketet byggs (B<dpkg-buildpakcage> anropar det väldigt tidigt, till "
+"och med före B<debian/rules clean>). Kommandot är idempotent och kan anropas "
+"flera gånger. Det är inte alla källkodsformat som implementerar något i den "
+"här kroken, och de som gör det förbereder oftast källkodsträdet för att "
+"byggas, till exempel genom att se till att Debianpatchar har applicerats."
 
 #. type: TP
 #: dpkg-source.1:82
@@ -12611,26 +13058,43 @@
 #. type: Plain text
 #: dpkg-source.1:89
 msgid ""
-"This command should be called after any build of the package (B<dpkg-"
-"buildpackage> calls it last). This command should be idempotent and can be "
-"called multiple times. Not all source formats implement something in this "
-"hook, and those that do usually use it to undo what B<--before-build> has "
-"done."
+"Run the corresponding hook of the source package format. This hook is called "
+"after any build of the package (B<dpkg-buildpackage> calls it last). This "
+"command is idempotent and can be called multiple times. Not all source "
+"formats implement something in this hook, and those that do usually use it "
+"to undo what B<--before-build> has done."
+msgstr ""
+"Kör motsvarande krok för källkodspaketformatet. Kroken anropas efter att "
+"allt från paketet byggts (B<dpkg-buildpakcage> anropar det sist). Kommandot "
+"är idempotent och kan anropas flera gånger. Det är inte alla källkodsformat "
+"som implementerar något i den här kroken, och de som gör det använder den "
+"normalt för att återställa det som B<--before-build> har gjort."
+
+#. type: TP
+#: dpkg-source.1:90
+#, no-wrap
+msgid "B<--commit> [I<directory>] ..."
+msgstr "B<--commit> [I<katalog>] ..."
+
+#. type: Plain text
+#: dpkg-source.1:95
+msgid ""
+"Record changes in the source tree unpacked in I<directory>. This command can "
+"take supplementary parameters depending on the source format.  It will error "
+"out for formats where this operation doesn't mean anything."
 msgstr ""
-"Kommandot bör anropas efter paketet har byggts (B<dpkg-buildpackage> anropar "
-"det sist). Kommandot bör vara idempotent och kunna anropas flera gånger. Det "
-"är inte alla källkodsformat som implementerar något i den här kroken, och de "
-"som gör det använder den normalt för att återställa det som B<--before-"
-"build> har gjort."
+"Spara ändringar i källkodsträdet som har packats upp i I<katalog>. Kommandot "
+"kan ta ytterligare parametrar beroende på källkodsformatet. Ett fel kommer "
+"rapporteras för format där operationen inte har någon betydelse."
 
 #. type: SH
-#: dpkg-source.1:97
+#: dpkg-source.1:103
 #, no-wrap
 msgid "GENERIC BUILD OPTIONS"
 msgstr "ALLMÄNNA BYGGFLAGGOR"
 
 #. type: Plain text
-#: dpkg-source.1:105
+#: dpkg-source.1:111
 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 "
@@ -12641,7 +13105,7 @@
 "källkodsträdets toppnivåkatalog."
 
 #. type: Plain text
-#: dpkg-source.1:112
+#: dpkg-source.1:118
 msgid ""
 "Specifies the change log file to read information from. The default is "
 "B<debian/changelog>.  If given with relative pathname this is interpreted "
@@ -12652,13 +13116,13 @@
 "källkodsträdets toppnivåkatalog."
 
 #. type: TP
-#: dpkg-source.1:117
+#: dpkg-source.1:123
 #, no-wrap
 msgid "B<--format=>I<value>"
 msgstr "B<--format=>I<värde>"
 
 #. type: Plain text
-#: dpkg-source.1:121
+#: dpkg-source.1:127
 msgid ""
 "Use the given format for building the source package. It does override any "
 "format given in B<debian/source/format>."
@@ -12667,7 +13131,7 @@
 "ett eventuellt format som anges i B<debian/source/format>."
 
 #. type: Plain text
-#: dpkg-source.1:131
+#: dpkg-source.1:137
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is to not read "
 "any file. This option can be used multiple times to read substitution "
@@ -12678,13 +13142,13 @@
 "substitueringsvariabler från flera filer."
 
 #. type: TP
-#: dpkg-source.1:137
+#: dpkg-source.1:143
 #, no-wrap
 msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
 msgstr "B<-Z>I<komprimering>, B<--compression>=I<komprimering>"
 
 #. type: Plain text
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 msgid ""
 "Specify the compression to use for created files (tarballs and diffs).  Note "
 "that this option will not cause existing tarballs to be recompressed, it "
@@ -12699,30 +13163,30 @@
 "från och med dpkg-dev 1.15.5."
 
 #. type: TP
-#: dpkg-source.1:145
+#: dpkg-source.1:151
 #, no-wrap
 msgid "B<-z>I<level>, B<--compression-level>=I<level>"
 msgstr "B<-z>I<nivå>, B<--compression-level>=I<nivå>"
 
 #. type: Plain text
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 msgid ""
 "Compression level to use. As with B<-Z> it only affects newly created files. "
-"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  I<9> is the "
-"default."
+"Supported values are: I<1> to I<9>, I<best>, and I<fast>.  The default is "
+"I<9> for gzip and bzip2, I<6> for xz and lzma."
 msgstr ""
 "Komprimeringsnivå att använda. Som med B<-Z> påverkas bara filer som "
 "nyskapas. Värden som stöds är: I<1> till I<9>, I<best> (bäst) och I<fast> "
-"(snabb). I<9> är förval."
+"(snabb). I<9> är förval för gzip och bzip2, I<6> för xz och lzma."
 
 #. type: TP
-#: dpkg-source.1:151
+#: dpkg-source.1:157
 #, no-wrap
 msgid "B<-i>[I<regexp>], B<--diff-ignore>[=I<regexp>]"
 msgstr "B<-i>[I<reg.uttr>], B<--diff-ignore>[=I<reg.uttr>]"
 
 #. type: Plain text
-#: dpkg-source.1:163
+#: dpkg-source.1:169
 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 "
@@ -12746,7 +13210,7 @@
 "som gäller."
 
 #. type: Plain text
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 msgid ""
 "This is very helpful in cutting out extraneous files that get included in "
 "the diff, e.g. if you maintain your source in a revision control system and "
@@ -12769,33 +13233,34 @@
 "'($|/)')."
 
 #. type: TP
-#: dpkg-source.1:173
+#: dpkg-source.1:179
 #, no-wrap
 msgid "B<--extend-diff-ignore>=I<regexp>"
 msgstr "B<--extend-diff-ignore>=I<reg.uttr>"
 
 #. type: Plain text
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 msgid ""
-"The perl regular expression specified will extend the default regular "
-"expression associated to B<-i> by concatenating \"B<|>I<regexp>\" to the "
-"default regexp.  This option is convenient to use in B<debian/source/"
-"options> to exclude some auto-generated files from the automatic patch "
-"generation."
-msgstr ""
-"Det reguljära uttrycket i perlformat som angavs utökar standarduttrycket för "
-"B<-i> genom att lägga till \"B<|>I<reg.uttry>\" efter standarduttrycket. "
-"Flaggan är nyttig för B<debian/source/options> för att exkludera en del "
-"automatiskt genererade filer från skapandet av automatiska patchar."
+"The perl regular expression specified will extend the default value of B<--"
+"diff-ignore> and its current value (if set). It does this by concatenating "
+"\"B<|>I<regexp>\" to the existing value.  This option is convenient to use "
+"in B<debian/source/options> to exclude some auto-generated files from the "
+"automatic patch generation."
+msgstr ""
+"Det reguljära uttrycket i perlformat som angavs utökar standardvärdet för "
+"B<--diff-ignore> och dess nuvarande värde (om satt). Det gör så genom att "
+"lägga till \"B<|>I<reg.uttry>\" efter standarduttrycket. Flaggan är nyttig "
+"för B<debian/source/options> för att exkludera en del automatiskt genererade "
+"filer från skapandet av automatiska patchar."
 
 #. type: TP
-#: dpkg-source.1:180
+#: dpkg-source.1:186
 #, no-wrap
 msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
 msgstr "B<-I>[I<filmönster>], B<--tar-ignore>[=I<filmönster>]"
 
 #. type: Plain text
-#: dpkg-source.1:189
+#: dpkg-source.1:195
 msgid ""
 "If this option is specified, the pattern will be passed to B<tar>(1)'s --"
 "exclude option when it is called to generate a .orig.tar or .tar file. For "
@@ -12810,7 +13275,7 @@
 "skall uteslutas."
 
 #. type: Plain text
-#: dpkg-source.1:194
+#: dpkg-source.1:200
 msgid ""
 "B<-I> by itself adds default --exclude options that will filter out control "
 "files and directories of the most common revision control systems, backup "
@@ -12821,7 +13286,7 @@
 "säkerhetskopior, växlingsfiler och Libtool-byggutdatakataloger."
 
 #. type: Plain text
-#: dpkg-source.1:206
+#: dpkg-source.1:212
 msgid ""
 "B<Note:> While they have similar purposes, B<-i> and B<-I> have very "
 "different syntax and semantics. B<-i> can only be specified once and takes a "
@@ -12843,7 +13308,7 @@
 "dokumentation."
 
 #. type: Plain text
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 msgid ""
 "The default regexp and patterns for both options can be seen in the output "
 "of the B<--help> command."
@@ -12852,42 +13317,42 @@
 "utdata för B<--help>-kommandot."
 
 #. type: SH
-#: dpkg-source.1:209
+#: dpkg-source.1:215
 #, no-wrap
 msgid "GENERIC EXTRACT OPTIONS"
 msgstr "ALLMÄNNA UPPACKNINGSFLAGGOR"
 
 #. type: TP
-#: dpkg-source.1:210
+#: dpkg-source.1:216
 #, no-wrap
 msgid "B<--no-copy>"
 msgstr "B<--no-copy>"
 
 #. type: Plain text
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 msgid "Do not copy original tarballs near the extracted source package."
 msgstr ""
 "Kopiera inte original-tarbollar i närheten av det uppackade källkodspaketet."
 
 #. type: TP
-#: dpkg-source.1:213
+#: dpkg-source.1:219
 #, no-wrap
 msgid "B<--no-check>"
 msgstr "B<--no-check>"
 
 #. type: Plain text
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 msgid "Do not check signatures and checksums before unpacking."
 msgstr "Kontrollera inte signaturer och kontrollsummor före uppackning."
 
 #. type: TP
-#: dpkg-source.1:216
+#: dpkg-source.1:222
 #, no-wrap
 msgid "B<--require-valid-signature>"
 msgstr "B<--require-valid-signature>"
 
 #. type: Plain text
-#: dpkg-source.1:224
+#: dpkg-source.1:230
 msgid ""
 "Refuse to unpack the source package if it doesn't contain an OpenPGP "
 "signature that can be verified either with the user's I<trustedkeys.gpg> "
@@ -12902,13 +13367,13 @@
 "share/keyrings/debian-maintainers.gpg>)."
 
 #. type: SH
-#: dpkg-source.1:225
+#: dpkg-source.1:231
 #, no-wrap
 msgid "SOURCE PACKAGE FORMATS"
 msgstr "FORMAT PÅ KÄLLKODSPAKET"
 
 #. type: Plain text
-#: dpkg-source.1:230
+#: dpkg-source.1:236
 msgid ""
 "If you don't know what source format to use, you should probably pick either "
 "\"3.0 (quilt)\" or \"3.0 (native)\". See http://wiki.debian.org/Projects/"
@@ -12920,13 +13385,13 @@
 "i produktion i Debian."
 
 #. type: SS
-#: dpkg-source.1:231
+#: dpkg-source.1:237
 #, no-wrap
 msgid "Format: 1.0"
 msgstr "Format: 1.0"
 
 #. type: Plain text
-#: dpkg-source.1:235
+#: dpkg-source.1:241
 msgid ""
 "A source package in this format consists either of a B<.orig.tar.gz> "
 "associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -12937,12 +13402,12 @@
 "paketet vara I<eget>, \"I<native>\")."
 
 #. type: Plain text
-#: dpkg-source.1:237 dpkg-source.1:405 dpkg-source.1:566 dpkg-source.1:605
+#: dpkg-source.1:243 dpkg-source.1:411 dpkg-source.1:586 dpkg-source.1:625
 msgid "B<Extracting>"
 msgstr "B<Uppackning>"
 
 #. type: Plain text
-#: dpkg-source.1:247
+#: dpkg-source.1:253
 msgid ""
 "Extracting a native package is a simple extraction of the single tarball in "
 "the target directory. Extracting a non-native package is done by first "
@@ -12963,12 +13428,12 @@
 "det sättet), men kan inte ta bort filer (tomma filer kommer lämnas kvar)."
 
 #. type: Plain text
-#: dpkg-source.1:249 dpkg-source.1:433 dpkg-source.1:577 dpkg-source.1:610
+#: dpkg-source.1:255 dpkg-source.1:439 dpkg-source.1:597 dpkg-source.1:630
 msgid "B<Building>"
 msgstr "B<Bygga>"
 
 #. type: Plain text
-#: dpkg-source.1:255
+#: dpkg-source.1:261
 msgid ""
 "Building a native package is just creating a single tarball with the source "
 "directory. Building a non-native package involves extracting the original "
@@ -12982,13 +13447,13 @@
 "katalogen."
 
 #. type: TP
-#: dpkg-source.1:256
+#: dpkg-source.1:262
 #, no-wrap
 msgid "B<Build options (with -b):>"
 msgstr "B<Byggflaggor (med -b):>"
 
 #. type: Plain text
-#: dpkg-source.1:269
+#: dpkg-source.1:275
 msgid ""
 "If a second non-option argument is supplied it should be the name of the "
 "original source directory or tarfile or the empty string if the package is a "
@@ -13006,7 +13471,7 @@
 "flaggorna."
 
 #. type: Plain text
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 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<-"
@@ -13017,13 +13482,13 @@
 "B<-sR> anges i stället."
 
 #. type: TP
-#: dpkg-source.1:275
+#: dpkg-source.1:281
 #, no-wrap
 msgid "B<-sk>"
 msgstr "B<-sk>"
 
 #. type: Plain text
-#: dpkg-source.1:284
+#: dpkg-source.1:290
 msgid ""
 "Specifies to expect the original source as a tarfile, by default "
 "I<package>B<_>I<upstream-version>B<.orig.tar.>I<extension>.  It will leave "
@@ -13038,24 +13503,24 @@
 "i I<katalog>B<.orig> för att generera diffen."
 
 #. type: TP
-#: dpkg-source.1:284 dpkg-source.1:353
+#: dpkg-source.1:290 dpkg-source.1:359
 #, no-wrap
 msgid "B<-sp>"
 msgstr "B<-sp>"
 
 #. type: Plain text
-#: dpkg-source.1:289
+#: dpkg-source.1:295
 msgid "Like B<-sk> but will remove the directory again afterwards."
 msgstr "Som B<-sk>, men tar bort katalogen igen efteråt."
 
 #. type: TP
-#: dpkg-source.1:289 dpkg-source.1:359
+#: dpkg-source.1:295 dpkg-source.1:365
 #, no-wrap
 msgid "B<-su>"
 msgstr "B<-su>"
 
 #. type: Plain text
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 msgid ""
 "Specifies that 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 "
@@ -13066,24 +13531,24 @@
 "originalkällkodsarkiv från den."
 
 #. type: TP
-#: dpkg-source.1:297
+#: dpkg-source.1:303
 #, no-wrap
 msgid "B<-sr>"
 msgstr "B<-sr>"
 
 #. type: Plain text
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 msgid "Like B<-su> but will remove that directory after it has been used."
 msgstr "Som B<-su>, men tar bort katalogen när den har använts."
 
 #. type: TP
-#: dpkg-source.1:302
+#: dpkg-source.1:308
 #, no-wrap
 msgid "B<-ss>"
 msgstr "B<-ss>"
 
 #. type: Plain text
-#: dpkg-source.1:310
+#: dpkg-source.1:316
 msgid ""
 "Specifies that the original source is available both as a directory and as a "
 "tarfile. dpkg-source will use the directory to create the diff, but the "
@@ -13097,13 +13562,13 @@
 "källkodsarkiv att skapas."
 
 #. type: TP
-#: dpkg-source.1:310 dpkg-source.1:362
+#: dpkg-source.1:316 dpkg-source.1:368
 #, no-wrap
 msgid "B<-sn>"
 msgstr "B<-sn>"
 
 #. type: Plain text
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 msgid ""
 "Specifies to not look for any original source, and to not generate a diff.  "
 "The second argument, if supplied, must be the empty string. This is used for "
@@ -13116,13 +13581,13 @@
 "separat uppströmskällkod och därför inte har någon debianiseringsdiff."
 
 #. type: TP
-#: dpkg-source.1:316
+#: dpkg-source.1:322
 #, no-wrap
 msgid "B<-sa> or B<-sA>"
 msgstr "B<-sa> eller B<-sA>"
 
 #. type: Plain text
-#: dpkg-source.1:342
+#: dpkg-source.1:348
 msgid ""
 "Specifies to 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 "
@@ -13147,13 +13612,13 @@
 "B<-sA> är standard."
 
 #. type: TP
-#: dpkg-source.1:342 dpkg-source.1:525
+#: dpkg-source.1:348 dpkg-source.1:541
 #, no-wrap
 msgid "B<--abort-on-upstream-changes>"
 msgstr "B<--abort-on-upstream-changes>"
 
 #. type: Plain text
-#: dpkg-source.1:348
+#: dpkg-source.1:354
 msgid ""
 "The process fails if the generated diff contains changes to files outside of "
 "the debian sub-directory. This option is not allowed in B<debian/source/"
@@ -13164,18 +13629,18 @@
 "source/options>, men kan användas i B<debian/source/local-options>."
 
 #. type: TP
-#: dpkg-source.1:349
+#: dpkg-source.1:355
 #, no-wrap
 msgid "B<Extract options (with -x):>"
 msgstr "B<Extraheringsflaggor (med -x):>"
 
 #. type: Plain text
-#: dpkg-source.1:353
+#: dpkg-source.1:359
 msgid "In all cases any existing original source tree will be removed."
 msgstr "Oavsett kommer ett befintligt källkodsträd att tas bort."
 
 #. type: Plain text
-#: dpkg-source.1:359
+#: dpkg-source.1:365
 msgid ""
 "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 "
@@ -13188,12 +13653,12 @@
 "(B<Detta är standard.>)"
 
 #. type: Plain text
-#: dpkg-source.1:362
+#: dpkg-source.1:368
 msgid "Unpacks the original source tree."
 msgstr "Packar upp originalkällkodsträdet."
 
 #. type: Plain text
-#: dpkg-source.1:367
+#: dpkg-source.1:373
 msgid ""
 "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 "
@@ -13204,7 +13669,7 @@
 "katalogen tas fortfarande bort."
 
 #. type: Plain text
-#: dpkg-source.1:372
+#: dpkg-source.1:378
 msgid ""
 "All the B<-s>I<X> options are mutually exclusive. If you specify more than "
 "one only the last one will be used."
@@ -13213,24 +13678,24 @@
 "kommer endast den sista att användas."
 
 #. type: TP
-#: dpkg-source.1:372 dpkg-source.1:535
+#: dpkg-source.1:378 dpkg-source.1:555
 #, no-wrap
 msgid "B<--skip-debianization>"
 msgstr "B<--skip-debianization>"
 
 #. type: Plain text
-#: dpkg-source.1:375
+#: dpkg-source.1:381
 msgid "Skips application of the debian diff on top of the upstream sources."
 msgstr "Hoppas över att tillämpa debian-diffen ovanpå uppströmskällkoden."
 
 #. type: SS
-#: dpkg-source.1:376
+#: dpkg-source.1:382
 #, no-wrap
 msgid "Format: 2.0"
 msgstr "Format: 2.0"
 
 #. type: Plain text
-#: dpkg-source.1:380
+#: dpkg-source.1:386
 msgid ""
 "Also known as wig&pen. This format is not recommended for wide-spread usage, "
 "the format \"3.0 (quilt)\" replaces it. Wig&pen was the first specification "
@@ -13241,7 +13706,7 @@
 "specifikationen av en ny generation av källkodspaketformat."
 
 #. type: Plain text
-#: dpkg-source.1:385
+#: dpkg-source.1:391
 msgid ""
 "The behaviour of this format is the same as the \"3.0 (quilt)\" format "
 "except that it doesn't use an explicit list of patches. All files in "
@@ -13254,7 +13719,7 @@
 "måste vara giltiga patchar: de appliceras när paketet packas upp."
 
 #. type: Plain text
-#: dpkg-source.1:388
+#: dpkg-source.1:394
 msgid ""
 "When building a new source package, any change to the upstream source is "
 "stored in a patch named B<zz_debian-diff-auto>."
@@ -13263,13 +13728,13 @@
 "uppströmskällkoden att lagras i en patch som kallas B<zz_debian-diff-auto>."
 
 #. type: SS
-#: dpkg-source.1:389
+#: dpkg-source.1:395
 #, no-wrap
 msgid "Format: 3.0 (native)"
 msgstr "Format: 3.0 (eget)"
 
 #. type: Plain text
-#: dpkg-source.1:395
+#: dpkg-source.1:401
 msgid ""
 "This format is an extension of the native package format as defined in the "
 "1.0 format. It supports all compression methods and will ignore by default "
@@ -13282,13 +13747,13 @@
 "(se standardvärdet som är knutet till flaggan B<-i> i texten för B<--help>)."
 
 #. type: SS
-#: dpkg-source.1:396
+#: dpkg-source.1:402
 #, no-wrap
 msgid "Format: 3.0 (quilt)"
 msgstr "Format: 3.0 (quilt)"
 
 #. type: Plain text
-#: dpkg-source.1:403
+#: dpkg-source.1:409
 msgid ""
 "A source package in this format contains at least an original tarball (B<."
 "orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) and a "
@@ -13304,7 +13769,7 @@
 "\")."
 
 #. type: Plain text
-#: dpkg-source.1:414
+#: dpkg-source.1:420
 msgid ""
 "The main original tarball is extracted first, then all additional original "
 "tarballs are extracted in subdirectories named after the I<component> part "
@@ -13324,7 +13789,7 @@
 "binaries>)."
 
 #. type: Plain text
-#: dpkg-source.1:426
+#: dpkg-source.1:432
 msgid ""
 "All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
 "series> are then applied.  If the former file is used and the latter one "
@@ -13350,7 +13815,7 @@
 "bygget kommer troligen att misslyckas."
 
 #. type: Plain text
-#: dpkg-source.1:428
+#: dpkg-source.1:434
 msgid ""
 "Similarly to quilt's default behaviour, the patches can remove files too."
 msgstr ""
@@ -13358,7 +13823,7 @@
 "fungerar."
 
 #. type: Plain text
-#: dpkg-source.1:431
+#: dpkg-source.1:437
 msgid ""
 "The file B<.pc/applied-patches> is created if some patches have been applied "
 "during the extraction."
@@ -13366,28 +13831,32 @@
 "Filen B<.pc/applied-patchers> skapas om patchar tillämpades vid uppackningen."
 
 #. type: Plain text
-#: dpkg-source.1:443
+#: dpkg-source.1:451
 msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
 "except the automatic patch (B<debian-changes->I<version> or B<debian-"
 "changes>, depending on B<--single-debian-patch>) are applied. The temporary "
-"directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in the automatic patch.  If the automatic patch is created/"
-"deleted, it's added/removed from the series file and from the quilt metadata."
+"directory is compared to the source package directory. When the diff is non-"
+"empty, the build fails unless B<--single-debian-patch> or B<--auto-commit> "
+"has been used, in which case the diff is stored in the automatic patch.  If "
+"the automatic patch is created/deleted, it's added/removed from the series "
+"file and from the quilt metadata."
 msgstr ""
 "Alla original-tarbollar som finns i den aktuella katalogen packas upp i en "
 "temporär katalog med samma logik som i uppackningen, debian-katalogen "
 "kopieras över i den temporära katalogen och alla patchar, förutom den "
 "automatiska patchen (B<debian-changes>I<version> eller B<debian-changes>, "
 "beroende på B<--single-debian-patch>) tillämpas. Temporärkatalogen jämförs "
-"därefter mot källkodskatalogen och diffen (om den inte är tom) lagras i "
-"denautomatiska patchen. Om den automatiska patchen skapas/tas bort, läggs "
-"den till/tas bort från series-filen och från quilt-metadata."
+"därefter mot källkodskatalogen. Om diffen inte är tom misslyckas bygget, "
+"såvida inte B<--single-debian-patch> eller B<--auto-commit> använts, i "
+"vilket fall diffen lagras i den automatiska patchen. Om den automatiska "
+"patchen skapas/tas bort, läggs den till/tas bort från series-filen och från "
+"quilt-metadata."
 
 #. type: Plain text
-#: dpkg-source.1:451
+#: dpkg-source.1:459
 msgid ""
 "Any change on a binary file is not representable in a diff and will thus "
 "lead to a failure unless the maintainer deliberately decided to include that "
@@ -13404,7 +13873,7 @@
 "de inte har vitlistats i B<debian/source/include-binaries>."
 
 #. type: Plain text
-#: dpkg-source.1:454
+#: dpkg-source.1:462
 msgid ""
 "The updated debian directory and the list of modified binaries is then used "
 "to generate the debian tarball."
@@ -13413,7 +13882,7 @@
 "används sedan för att skapa debian-tarbollen."
 
 #. type: Plain text
-#: dpkg-source.1:460
+#: dpkg-source.1:468
 msgid ""
 "The automatically generated diff doesn't include changes on VCS specific "
 "files as well as many temporary files (see default value associated to B<-i> "
@@ -13427,46 +13896,67 @@
 "den automatiska patchen skapas."
 
 #. type: Plain text
-#: dpkg-source.1:474
+#: dpkg-source.1:477
+msgid ""
+"Note: B<dpkg-source> B<--before-build> (and B<-b>) will ensure that all "
+"patches listed in the series file are applied so that a package build always "
+"has all patches applied. It does this by finding unapplied patches (they are "
+"listed in the B<series> file but not in B<.pc/applied-patches>), and if the "
+"first patch in that set can be applied without errors, it will apply them "
+"all. The option B<--no-preparation> can be used to disable this behavior."
+msgstr ""
+"Observera: B<dpkg-source> B<--before-build> (och B<-b>) ser till att alla  "
+"patchar som anges i seriefilen tillämpas så att paketbygget alltid har alla "
+"patchar tillämpade. Detta görs genom att hitta alla icke-tillämpade patchar "
+"(som anges i filen B<series> men inte i B<.pc/applied-patches>), och om den "
+"första patchen i listan kan tillämpas utan fel kommer samtliga att "
+"tillämpas. Flaggan B<--no-preparation> kan användas för att slå av detta "
+"beteende."
+
+#. type: Plain text
+#: dpkg-source.1:480
+msgid "B<Recording changes>"
+msgstr "B<Lagra ändringar>"
+
+#. type: TP
+#: dpkg-source.1:480
+#, no-wrap
+msgid "B<--commit> [I<directory>] [I<patch-name>] [I<patch-file>]"
+msgstr "B<--commit> [I<katalog>] [I<patchnamn>] [I<patch-fil>]"
+
+#. type: Plain text
+#: dpkg-source.1:490
 msgid ""
-"Note: B<dpkg-source> expects the source tree to have all patches listed in "
-"the series file applied when you generate the source package.  This is not "
-"the case when the source tree has been obtained by unpacking a source "
-"package using the Format: 1.0 for instance. To mitigate the problem, B<dpkg-"
-"source> will apply the patches by itself if it believes that they have not "
-"yet been applied. To detect this situation, it uses the following heuristic: "
-"it finds the list of supposedly unapplied patches (they are listed in the "
-"B<series> file but not in B<.pc/applied-patches>), and if the first patch in "
-"that set can be applied without errors, it will apply them all.  The option "
-"B<--no-preparation> can be used to disable this behaviour. This operation is "
-"usually done as part of the B<--prepare-build> command."
-msgstr ""
-"Observera: B<dpkg-source> förväntar att källkodspaketet har alla patchar som "
-"anges i seriefilen tillämpade när källkodspaketet genereras. Detta gäller "
-"inte när källkodsträdet har hämtats genom att packa upp ett källkodspaket "
-"med till exempel Format: 1.0. För att motverka detta problem kommer B<dpkg-"
-"source> självt att tillämpa patchar om det tror att de ännu inte har "
-"tillämpats. För att upptäcka om så är fallet används följande heuristik: om "
-"en lista över förmodligen ej applicerade patchar (de listas i B<series>-"
-"filen men inte i B<.pc/applied-patches>), och om den första patchen i listan "
-"kan tillämpas utan fel kommer samtliga att tillämpas. Flaggan B<--no-"
-"preparation> kan användas för att slå av detta beteende. Operationen utförs "
-"normalt som en del av kommandot B<--prepare-build>."
+"Generates a patch corresponding to the local changes that are not managed by "
+"the quilt patch system and integrates it in the patch system under the name "
+"I<patch-name>. If the name is missing, it will be asked interactively. If "
+"I<patch-file> is given, it is used as the patch corresponding to the local "
+"changes to integrate. This is mainly useful after a build failure that pre-"
+"generated this file. Once integrated, an editor is launched so that you can "
+"edit the meta-information in the patch header."
+msgstr ""
+"Skapar en patch som motsvarar de lokala ändringar som inte hanteras av quilt-"
+"patch-systemet och integrerar dem i patch-systemet under namnet "
+"I<patchnamn>. Om namnet saknas kommer programmet be om ett interaktivt. Om "
+"I<patch-fil> anges används den som patch som motsvarar de lokala ändringar "
+"som skall integreras. Detta är oftast användbart efter ett misslyckat bygge "
+"som skapat filen på förhand. När patchen är integrerad startas ett "
+"redigeringsprogram så att du kan ange metainformationen i patchhuvudet."
 
 #. type: Plain text
-#: dpkg-source.1:476 dpkg-source.1:547 dpkg-source.1:586
+#: dpkg-source.1:493 dpkg-source.1:567 dpkg-source.1:606
 msgid "B<Build options>"
 msgstr "B<Byggflaggor>"
 
 #. type: TP
-#: dpkg-source.1:476
+#: dpkg-source.1:493
 #, no-wrap
 msgid "B<--allow-version-of-quilt-db=>I<version>"
 msgstr "B<--allow-version-of-quilt-db=>I<version>"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 msgid ""
 "Allow B<dpkg-source> to build the source package if the version of the quilt "
 "metadata is the one specified, even if B<dpkg-source> doesn't know about it. "
@@ -13481,13 +13971,13 @@
 "lagras i B<.pc/.version>."
 
 #. type: TP
-#: dpkg-source.1:484
+#: dpkg-source.1:501
 #, no-wrap
 msgid "B<--include-removal>"
 msgstr "B<--include-removal>"
 
 #. type: Plain text
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 msgid ""
 "Do not ignore removed files and include them in the automatically generated "
 "patch."
@@ -13496,24 +13986,24 @@
 "patchen."
 
 #. type: TP
-#: dpkg-source.1:488
+#: dpkg-source.1:505
 #, no-wrap
 msgid "B<--include-timestamp>"
 msgstr "B<--include-timestamp>"
 
 #. type: Plain text
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 msgid "Include timestamp in the automatically generated patch."
 msgstr "Ta med tidsstämpel i den automatiskt genererade patchen."
 
 #. type: TP
-#: dpkg-source.1:491
+#: dpkg-source.1:508
 #, no-wrap
 msgid "B<--include-binaries>"
 msgstr "B<--include-binaries>"
 
 #. type: Plain text
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 msgid ""
 "Add all modified binaries in the debian tarball. Also add them to B<debian/"
 "source/include-binaries>: they will be added by default in subsequent builds "
@@ -13524,13 +14014,13 @@
 "följande byggen och du behöver inte längre ange den här flaggan."
 
 #. type: TP
-#: dpkg-source.1:496
+#: dpkg-source.1:513
 #, no-wrap
 msgid "B<--no-preparation>"
 msgstr "B<--no-preparation>"
 
 #. type: Plain text
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 msgid ""
 "Do not try to prepare the build tree by applying patches which are "
 "apparently unapplied."
@@ -13539,39 +14029,41 @@
 "verkar ha tillämpas för närvarande."
 
 #. type: TP
-#: dpkg-source.1:500
+#: dpkg-source.1:517
 #, no-wrap
 msgid "B<--single-debian-patch>"
 msgstr "B<--single-debian-patch>"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 msgid ""
 "Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
 "changes->I<version> for the name of the automatic patch generated during "
 "build. This option is particularly useful when the package is maintained in "
 "a VCS and a patch set can't reliably be generated. Instead the current diff "
-"with upstream should be stored in a single patch. When using this option, it "
-"is recommended to create a debian/source/patch-header file explaining how "
-"the Debian changes can be best reviewed, for example in the VCS that is used."
+"with upstream should be stored in a single patch. The option would be put in "
+"B<debian/source/local-options> and would be accompanied by a B<debian/source/"
+"local-patch-header> file explaining how the Debian changes can be best "
+"reviewed, for example in the VCS that is used."
 msgstr ""
 "Använd B<debian/patches/debian-changes> istället för B<debian/patches/debian-"
 "changes->I<version> som namn på den automatiska patch som genereras vid "
 "bygget. Denna flagga är speciellt nyttig när paketet hanteras i ett "
 "versionshanteringssystem och en patch inte kan skapas på ett pålitligt sätt. "
-"När den här flaggan används rekommenderar vi att du skapar en debian/source/"
-"patch-header-fil som förklarar hur Debianändringarna bäst kan ses, till "
-"exempel i det versionshanteringssystem som används."
+"Den aktuella diffen mot uppströms lagras istället i en ensam patch. Flaggan "
+"bör anges i B<debian/source/local-options> och följs av filen B<debian/"
+"source/local-patch-header> som beskricer hur Debianändringarna bäst kan ses, "
+"till exempel i det versionshanteringssystem som används."
 
 #. type: TP
-#: dpkg-source.1:510
+#: dpkg-source.1:528
 #, no-wrap
 msgid "B<--create-empty-orig>"
 msgstr "B<--create-empty-orig>"
 
 #. type: Plain text
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 msgid ""
 "Automatically create the main original tarball as empty if it's missing and "
 "if there are supplementary original tarballs. This option is meant to be "
@@ -13584,96 +14076,108 @@
 "inte finns något \"huvud\"-program."
 
 #. type: TP
-#: dpkg-source.1:516
+#: dpkg-source.1:534
 #, no-wrap
 msgid "B<--unapply-patches>"
 msgstr "B<--unapply-patches>"
 
 #. type: Plain text
-#: dpkg-source.1:525
+#: dpkg-source.1:541
 msgid ""
-"Unapply the patches in the B<--after-build> hook. This is mainly useful when "
-"you build your package directly in a VCS that contains unpatched upstream "
-"source and where you want to keep the tree unpatched even after a package "
-"build. This option is usually put in B<debian/source/local-options> (it's "
-"not allowed in B<debian/source/options> so that all generated source "
-"packages have the same behaviour by default)."
-msgstr ""
-"Ta bort patchar i kroken B<--after-build>. Flaggan är huvudsakligen "
-"användbar när du bygger direkt från ett versionshanteringssystem som "
-"innehåller opatchad uppströmskod och du vill hålla trädet opatchat även "
-"efter ett paketbygge. Flaggan läggs normalt i B<debian/source/local-options> "
-"(den är inte tillåten i B<debian/source/options> så att alla genererade "
-"källkodspaket som standard har samma beteende)."
+"Unapply the patches in the B<--after-build> hook. You usually don't need "
+"this option as dpkg-source will automatically unapply the patches if it did "
+"apply them during B<--before-build>. This option is only allowed in B<debian/"
+"source/local-options> so that all generated source packages have the same "
+"behavior by default."
+msgstr ""
+"Ta bort patchar i kroken B<--after-build>. Du behöver oftast inte ange "
+"flaggan eftersom dpkg-source automatiskt tar bort patchar om de tillämpades "
+"i B<--before-build>. Flaggan tillåts endast i B<debian/source/local-options> "
+"så att alla genererade källkodspaket som standard har samma beteende."
 
 #. type: Plain text
-#: dpkg-source.1:532
+#: dpkg-source.1:548
 msgid ""
 "The process fails if an automatic patch has been generated. This option can "
 "be used to ensure that all changes were properly recorded in separate quilt "
 "patches prior to the source package build. This option is not allowed in "
 "B<debian/source/options> but can be used in B<debian/source/local-options>."
 msgstr ""
-"Processen misslyckas om en automatisk patch har genererats. Flaggan kan "
-"användas för att se till att alla ändringar har lagrats undan korrekt i "
-"separata quilt-patchar innan källkodspaketet byggts. Flaggan tillåts inte i "
-"B<debian/source/options>, men kan användas i B<debian/source/local-options>."
+"Processen misslyckas om en automatisk patch har genererats. Flaggan kan "
+"användas för att se till att alla ändringar har lagrats undan korrekt i "
+"separata quilt-patchar innan källkodspaketet byggts. Flaggan tillåts inte i "
+"B<debian/source/options>, men kan användas i B<debian/source/local-options>."
+
+#. type: TP
+#: dpkg-source.1:548
+#, no-wrap
+msgid "B<--auto-commit>"
+msgstr "B<--auto-commit>"
+
+#. type: Plain text
+#: dpkg-source.1:552
+msgid ""
+"The process doesn't fail if an automatic patch has been generated, instead "
+"it's immediately recorded in the quilt series."
+msgstr ""
+"Processen misslyckas inte om en automatisk patch har skapats, den läggs "
+"istället direkt in i quilt-serien."
 
 #. type: Plain text
-#: dpkg-source.1:535
+#: dpkg-source.1:555
 msgid "B<Extract options>"
 msgstr "B<Extraheringsflaggor>"
 
 #. type: Plain text
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 msgid "Skips extraction of the debian tarball on top of the upstream sources."
 msgstr "Hoppas över att packa upp debian-tarbollen ovanpå uppströmskällkoden."
 
 #. type: TP
-#: dpkg-source.1:538
+#: dpkg-source.1:558
 #, no-wrap
 msgid "B<--skip-patches>"
 msgstr "B<--skip-patches>"
 
 #. type: Plain text
-#: dpkg-source.1:541
+#: dpkg-source.1:561
 msgid "Do not apply patches at the end of the extraction."
 msgstr "Applicera inte patchar i slutet av uppackningen."
 
 #. type: SS
-#: dpkg-source.1:542
+#: dpkg-source.1:562
 #, no-wrap
 msgid "Format: 3.0 (custom)"
 msgstr "Format: 3.0 (skräddarsytt)"
 
 #. type: Plain text
-#: dpkg-source.1:545
+#: dpkg-source.1:565
 msgid ""
-"This format is particular. It doesn't represent a real source package format "
+"This format is special. It doesn't represent a real source package format "
 "but can be used to create source packages with arbitrary files."
 msgstr ""
 "Detta formatet är speciellt. Det anger inte ett riktigt källkodspaketformat, "
 "utan kan användas för att skapa källkodspaket med godtyckliga filer."
 
 #. type: Plain text
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 msgid ""
 "All non-option arguments are taken as files to integrate in the generated "
-"source package. They must exist and are preferrably in the current "
-"directory. At least one file must be given."
+"source package. They must exist and are preferably in the current directory. "
+"At least one file must be given."
 msgstr ""
 "Alla argument som inte är flaggor tas som filer som skall integreras i det "
 "skapade källkodspaketet. De måste finnas, och helst i aktuell katalog. "
 "Åtminstone en fil måste anges."
 
 #. type: TP
-#: dpkg-source.1:551
+#: dpkg-source.1:571
 #, no-wrap
 msgid "B<--target-format=>I<value>"
 msgstr "B<--target-format=>I<värde>"
 
 #. type: Plain text
-#: dpkg-source.1:556
+#: dpkg-source.1:576
 msgid ""
 "B<Required>. Defines the real format of the generated source package.  The "
 "generated .dsc file will contain this value in its I<Format> field and not "
@@ -13684,18 +14188,18 @@
 "inte \"3.0 (custom)\"."
 
 #. type: SS
-#: dpkg-source.1:557
+#: dpkg-source.1:577
 #, no-wrap
 msgid "Format: 3.0 (git)"
 msgstr "Format: 3.0 (git)"
 
 #. type: Plain text
-#: dpkg-source.1:559
+#: dpkg-source.1:579
 msgid "This format is experimental."
 msgstr "Formatet är experimentellt."
 
 #. type: Plain text
-#: dpkg-source.1:564
+#: dpkg-source.1:584
 msgid ""
 "A source package in this format consists of a single bundle of a git "
 "repository B<.git> to hold the source of a package.  There may also be a B<."
@@ -13706,7 +14210,7 @@
 "innehåller revisioner för grunda git-kloner, kan även förekomma."
 
 #. type: Plain text
-#: dpkg-source.1:570
+#: dpkg-source.1:590
 msgid ""
 "The bundle is cloned as a git repository to the target directory.  If there "
 "is a gitshallow file, it is installed as `.git/shallow` inside the cloned "
@@ -13716,12 +14220,12 @@
 "finns installeras den som \".git/shallow\" i det klonade git-arkivet."
 
 #. type: Plain text
-#: dpkg-source.1:575
+#: dpkg-source.1:595
 msgid ""
 "Note that by default the new repository will have the same branch checked "
 "out that was checked out in the original source. (Typically \"master\", but "
-"it could be anything.) Any other branches will be available, under as "
-"`remotes/origin/`"
+"it could be anything.) Any other branches will be available under `remotes/"
+"origin/`."
 msgstr ""
 "Observera att det nya arkivet som standard kommer att ha samma gren "
 "utcheckad som den som var utcheckad i det ursprungliga källkodsträdet. "
@@ -13729,7 +14233,7 @@
 "kommer också att vara tillgängliga, under \"remotes/origin/\"."
 
 #. type: Plain text
-#: dpkg-source.1:580 dpkg-source.1:613
+#: dpkg-source.1:600 dpkg-source.1:633
 msgid ""
 "Before going any further, some checks are done to ensure that we don't have "
 "any non-ignored uncommitted changes."
@@ -13738,7 +14242,7 @@
 "till att vi inte har några ej ignorerade ej incheckade ändringar."
 
 #. type: Plain text
-#: dpkg-source.1:584
+#: dpkg-source.1:604
 msgid ""
 "B<git-bundle>(1) is used to generate a bundle of the git repository.  By "
 "default, all branches and tags in the repository are included in the bundle."
@@ -13747,13 +14251,13 @@
 "Som standard tas alla grenar och taggar i arkivet med i \"bundle\":n."
 
 #. type: TP
-#: dpkg-source.1:586
+#: dpkg-source.1:606
 #, no-wrap
 msgid "B<--git-ref=>I<ref>"
 msgstr "B<--git-ref=>I<ref>"
 
 #. type: Plain text
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 msgid ""
 "Allows specifying a git ref to include in the git bundle. Use disables the "
 "default behavior of including all branches and tags. May be specified "
@@ -13772,13 +14276,13 @@
 "och grenar, förutom grenen private, använd --git-ref=--all --git-ref=^private"
 
 #. type: TP
-#: dpkg-source.1:596
+#: dpkg-source.1:616
 #, no-wrap
 msgid "B<--git-depth=>I<number>"
 msgstr "B<--git-depth=>I<antal>"
 
 #. type: Plain text
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 msgid ""
 "Creates a shallow clone with a history truncated to the specified number of "
 "revisions."
@@ -13787,13 +14291,13 @@
 "revisioner."
 
 #. type: SS
-#: dpkg-source.1:600
+#: dpkg-source.1:620
 #, no-wrap
 msgid "Format: 3.0 (bzr)"
 msgstr "Format: 3.0 (bzr)"
 
 #. type: Plain text
-#: dpkg-source.1:603
+#: dpkg-source.1:623
 msgid ""
 "This format is experimental. It generates a single tarball containing the "
 "bzr repository."
@@ -13802,7 +14306,7 @@
 "innehåller bzr-arkivet."
 
 #. type: Plain text
-#: dpkg-source.1:608
+#: dpkg-source.1:628
 msgid ""
 "The tarball is unpacked and then bzr is used to checkout the current branch."
 msgstr ""
@@ -13810,7 +14314,7 @@
 "grenen."
 
 #. type: Plain text
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 msgid ""
 "Then the VCS specific part of the source directory is copied over to a "
 "temporary directory. Before this temporary directory is packed in a tarball, "
@@ -13821,19 +14325,19 @@
 "tarboll utförs viss städning för att spara plats."
 
 #. type: SH
-#: dpkg-source.1:617
+#: dpkg-source.1:637
 #, no-wrap
 msgid "WARNINGS AND ERRORS"
 msgstr "VARNINGAR OCH FELMEDDELANDEN"
 
 #. type: SS
-#: dpkg-source.1:618
+#: dpkg-source.1:638
 #, no-wrap
 msgid "no source format specified in debian/source/format"
 msgstr "källkodsformat ej angivet i debian/source/format"
 
 #. type: Plain text
-#: dpkg-source.1:624
+#: dpkg-source.1:644
 msgid ""
 "The file B<debian/source/format> should always exist and indicate the "
 "desired source format. For backwards compatibility, format \"1.0\" is "
@@ -13848,7 +14352,7 @@
 "inte finns."
 
 #. type: Plain text
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 msgid ""
 "The rationale is that format \"1.0\" is no longer the recommended format, "
 "you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
@@ -13863,13 +14367,13 @@
 "ange det explicit genom att skriva \"1.0\" i B<debian/source/format>."
 
 #. type: SS
-#: dpkg-source.1:630
+#: dpkg-source.1:650
 #, no-wrap
 msgid "the diff modifies the following upstream files"
 msgstr "diffen modifierar följande uppströmsfiler"
 
 #. type: Plain text
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 msgid ""
 "When using source format \"1.0\" it is usually a bad idea to modify upstream "
 "files directly as the changes end up hidden and mostly undocumented in the ."
@@ -13885,13 +14389,13 @@
 "\"3.0 (quilt)\" som låter dig göra det här automatiskt."
 
 #. type: SS
-#: dpkg-source.1:637
+#: dpkg-source.1:657
 #, no-wrap
 msgid "cannot represent change to I<file>"
 msgstr "kan inte representera ändringen för I<fil>"
 
 #. type: Plain text
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 msgid ""
 "Changes to upstream sources are usually stored with patch files, but not all "
 "changes can be represented with patches: they can only alter the content of "
@@ -13906,13 +14410,13 @@
 "katalog) får du det här felmeddelandet."
 
 #. type: SS
-#: dpkg-source.1:643
+#: dpkg-source.1:663
 #, no-wrap
 msgid "newly created empty file I<file> will not be represented in diff"
 msgstr "den tomma filen I<fil> som just skapats kommer inte representeras i diffen"
 
 #. type: Plain text
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 msgid ""
 "Empty files can't be created with patch files. Thus this change is not "
 "recorded in the source package and you are warned about it."
@@ -13921,19 +14425,19 @@
 "sparas i källkodspaketet och du får en varning om det."
 
 #. type: SS
-#: dpkg-source.1:646
+#: dpkg-source.1:666
 #, no-wrap
 msgid "executable mode I<perms> of I<file> will not be represented in diff"
 msgstr "exekveringsläge I<läge> på I<fil> kommer inte representeras i diffen"
 
 #. type: SS
-#: dpkg-source.1:647
+#: dpkg-source.1:667
 #, no-wrap
 msgid "special mode I<perms> of I<file> will not be represented in diff"
 msgstr "specialläget I<läge> på I<fil> kommer inte representeras i diffen"
 
 #. type: Plain text
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 msgid ""
 "Patch files do not record permissions of files and thus modified permissions "
 "are not stored in the source package. This warning reminds you of that fact."
@@ -13942,19 +14446,19 @@
 "källkodspaketet. Den här varningen påminner dig om detta."
 
 #. type: SH
-#: dpkg-source.1:651
+#: dpkg-source.1:671
 #, no-wrap
 msgid "FILE FORMATS"
 msgstr "FILFORMAT"
 
 #. type: SS
-#: dpkg-source.1:652
+#: dpkg-source.1:672
 #, no-wrap
 msgid "debian/source/format"
 msgstr "debian/source/format"
 
 #. type: Plain text
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 msgid ""
 "This file contains on a single line the format that should be used to build "
 "the source package (possible formats are described above). No leading or "
@@ -13965,13 +14469,13 @@
 "avslutande blanksteg tillåts."
 
 #. type: SS
-#: dpkg-source.1:656
+#: dpkg-source.1:676
 #, no-wrap
 msgid "debian/source/include-binaries"
 msgstr "debian/source/include-binaries"
 
 #. type: Plain text
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 msgid ""
 "This file contains a list of binary files (one per line) that should be "
 "included in the debian tarball. Leading and trailing spaces are stripped.  "
@@ -13983,13 +14487,13 @@
 "som börjar med \"#\" är kommentarer och hoppas över. Tomma rader ignoreras."
 
 #. type: SS
-#: dpkg-source.1:660
+#: dpkg-source.1:680
 #, no-wrap
 msgid "debian/source/options"
 msgstr "debian/source/options"
 
 #. type: Plain text
-#: dpkg-source.1:666
+#: dpkg-source.1:686
 msgid ""
 "This file contains a list of long options that should be automatically "
 "prepended to the set of command line options of a B<dpkg-source -b> or "
@@ -14002,7 +14506,7 @@
 "compression-level> är passande att lägga in i den  här filen."
 
 #. type: Plain text
-#: dpkg-source.1:672
+#: dpkg-source.1:692
 msgid ""
 "Each option should be put on a separate line. Empty lines and lines starting "
 "with \"#\" are ignored. The leading \"--\" should be stripped and short "
@@ -14016,7 +14520,7 @@
 "värdet. Här är ett exempel på en sådan fil:"
 
 #. type: Plain text
-#: dpkg-source.1:678
+#: dpkg-source.1:700
 #, no-wrap
 msgid ""
 "  # let dpkg-source create a debian.tar.bz2 with maximal compression\n"
@@ -14024,15 +14528,19 @@
 "  compression-level = 9\n"
 "  # use debian/patches/debian-changes as automatic patch\n"
 "  single-debian-patch\n"
+"  # ignore changes on config.{sub,guess}\n"
+"  extend-diff-ignore = \"(^|/)(config.sub|config.guess)$\"\n"
 msgstr ""
 "  # låt dpkg-source skapa en debian.tar.bz2 med maximal komprimering\n"
 "  compression = \"bzip2\"\n"
 "  compression-level = 9\n"
 "  # använd debian/patches/debian-changes som en automatisk patch\n"
 "  single-debian-patch\n"
+"  # ignorera ändringar i config.{sub,guess}\n"
+"  extend-diff-ignore = \"(^|/)(config.sub|config.guess)$\"\n"
 
 #. type: Plain text
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 msgid ""
 "Note: B<format> options are not accepted in this file, you should use "
 "B<debian/source/format> instead."
@@ -14041,13 +14549,13 @@
 "filen B<debian/source/format> istället."
 
 #. type: SS
-#: dpkg-source.1:681
+#: dpkg-source.1:703
 #, no-wrap
 msgid "debian/source/local-options"
 msgstr "debian/source/local-options"
 
 #. type: Plain text
-#: dpkg-source.1:686
+#: dpkg-source.1:708
 msgid ""
 "Exactly like B<debian/source/options> except that the file is not included "
 "in the generated source package. It can be useful to store a preference tied "
@@ -14059,29 +14567,37 @@
 "som gäller för paketansvariga eller VCS-systemet källkodspaketet hanteras i."
 
 #. type: SS
-#: dpkg-source.1:686
+#: dpkg-source.1:708
+#, no-wrap
+msgid "debian/source/local-patch-header"
+msgstr "debian/source/local-patch-header"
+
+#. type: SS
+#: dpkg-source.1:709
 #, no-wrap
 msgid "debian/source/patch-header"
 msgstr "debian/source/patch-header"
 
 # type: Plain text
 #. type: Plain text
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 msgid ""
 "Free form text that is put on top of the automatic patch generated in "
-"formats \"2.0\" or \"3.0 (quilt)\"."
+"formats \"2.0\" or \"3.0 (quilt)\". B<local-patch-header> is not included in "
+"the generated source package while B<patch-header> is."
 msgstr ""
 "Friformstext som läggs in på toppen av den automatiskt genererade patchen i "
-"formaten \"2.0\" eller \"3.0 (quilt)\"."
+"formaten \"2.0\" eller \"3.0 (quilt)\". B<local-patch-header> tas inte med i "
+"det genererade källkodspaketet medan B<patch-header> tas med."
 
 #. type: SS
-#: dpkg-source.1:689
+#: dpkg-source.1:713
 #, no-wrap
 msgid "debian/patches/series"
 msgstr "debian/patches/series"
 
 #. type: Plain text
-#: dpkg-source.1:698
+#: dpkg-source.1:722
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
@@ -14102,34 +14618,33 @@
 "anger början på en kommentar fram till slutet av raden)."
 
 #. type: Plain text
-#: dpkg-source.1:705
+#: dpkg-source.1:729
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 
+#. type: Plain text
+#: dpkg-source.1:736
+msgid "Copyright \\(co 2008-2011 Rapha\\[:e]l Hertzog"
+msgstr "Upphovsrättsskyddat © 2008-2011 Raphaël Hertzog"
+
 #. type: TH
 #: dpkg-split.1:2
 #, no-wrap
 msgid "dpkg-split"
 msgstr "dpkg-split"
 
-#. type: TH
-#: dpkg-split.1:2 dpkg-statoverride.8:1
-#, no-wrap
-msgid "2009-06-26"
-msgstr "2009-06-26"
-
 #. type: Plain text
 #: dpkg-split.1:5
 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:10
-msgid "B<dpkg-split> [I<options>] I<command>"
-msgstr "B<dpkg-split> [I<flaggor>] I<åtgärd>"
+#: dpkg-split.1:9
+msgid "B<dpkg-split> [I<option>...] I<command>"
+msgstr "B<dpkg-split> [I<flaggor>...] I<åtgärd>"
 
 #. type: Plain text
-#: dpkg-split.1:16
+#: dpkg-split.1:15
 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 "
@@ -14140,7 +14655,7 @@
 "media, till exempel disketter."
 
 #. type: Plain text
-#: dpkg-split.1:20
+#: dpkg-split.1:19
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
@@ -14149,7 +14664,7 @@
 "info>."
 
 #. type: Plain text
-#: dpkg-split.1:28
+#: dpkg-split.1:27
 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 "
@@ -14162,7 +14677,7 @@
 "listq> and B<--discard> gör det möjligt att hantera kön."
 
 #. type: Plain text
-#: dpkg-split.1:31
+#: dpkg-split.1:30
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
@@ -14171,18 +14686,18 @@
 "meddelanden på standard ut; dessa kan ignoreras."
 
 #. type: TP
-#: dpkg-split.1:33
+#: dpkg-split.1:32
 #, no-wrap
 msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
 msgstr "B<-s>, B<--split> I<helt-arkiv> [I<prefix>]"
 
 #. type: Plain text
-#: dpkg-split.1:36
+#: dpkg-split.1:35
 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:44
+#: dpkg-split.1:43
 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 "
@@ -14193,7 +14708,7 @@
 "decimalt)."
 
 #. type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 msgid ""
 "If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
 "including directory, with any trailing B<.deb> removed."
@@ -14202,13 +14717,13 @@
 "katalognamn, med den avslutande B<.deb> borttagen."
 
 #. type: TP
-#: dpkg-split.1:52
+#: dpkg-split.1:51
 #, no-wrap
 msgid "B<-j>, B<--join> I<part>..."
 msgstr "B<-j>, B<--join> I<del>..."
 
 #. type: Plain text
-#: dpkg-split.1:56
+#: dpkg-split.1:55
 msgid ""
 "Joins the parts of a package file together, reassembling the original file "
 "as it was before it was split."
@@ -14217,7 +14732,7 @@
 "den såg ut innan den delades."
 
 #. type: Plain text
-#: dpkg-split.1:60
+#: dpkg-split.1:59
 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 "
@@ -14228,7 +14743,7 @@
 "men de behöver inte listas i ordning."
 
 #. type: Plain text
-#: dpkg-split.1:65
+#: dpkg-split.1:64
 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 "
@@ -14239,23 +14754,26 @@
 "vid samma körning av B<dpkg-split --split>."
 
 #. type: Plain text
-#: dpkg-split.1:67
+#: dpkg-split.1:66
 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: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>."
+#: dpkg-split.1:69
+msgid ""
+"By default the output file is called I<package>B<_>I<version>B<_>I<arch>B<."
+"deb>."
+msgstr ""
+"Förvalt namn på utdatafilen är I<paket>B<_>I<version>B<_>I<ark>B<.deb>."
 
 #. type: TP
-#: dpkg-split.1:71
+#: dpkg-split.1:70
 #, no-wrap
 msgid "B<-I>, B<--info> I<part>..."
 msgstr "B<-I>, B<--info> I<del>..."
 
 #. type: Plain text
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -14266,18 +14784,18 @@
 "talar om detta (men fortfarande på standard ut)."
 
 #. type: TP
-#: dpkg-split.1:76
+#: dpkg-split.1:75
 #, no-wrap
 msgid "B<-a>, B<--auto -o> I<complete-output part>"
 msgstr "B<-a>, B<--auto -o>I< fullständig-utdata del>"
 
 #. type: Plain text
-#: dpkg-split.1:79
+#: dpkg-split.1:78
 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:84
+#: dpkg-split.1:83
 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."
@@ -14286,7 +14804,7 @@
 "(om sådana existerar) i kön av delar av paket."
 
 #. type: Plain text
-#: dpkg-split.1:91
+#: dpkg-split.1:90
 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 "
@@ -14298,7 +14816,7 @@
 "gjorde det)."
 
 #. type: Plain text
-#: dpkg-split.1:97
+#: dpkg-split.1:96
 msgid ""
 "If not then the I<part> is copied into the queue and I<complete-output> is "
 "not created."
@@ -14307,17 +14825,18 @@
 "inte."
 
 #. type: Plain text
-#: dpkg-split.1:104
+#: dpkg-split.1:103
 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."
+"with status B<1>; if some other trouble occurs then it will exit with status "
+"B<2>."
 msgstr ""
 "Om I<del> inte är en del av ett delat binärpaket kommer B<dpkg-split> att "
-"avsluta med returvärde 1; om något annat fel uppstår avslutar det med "
-"returvärde 2."
+"avsluta med returvärde B<1>; om något annat fel uppstår avslutar det med "
+"returvärde B<2>."
 
 #. type: Plain text
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 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 "
@@ -14328,18 +14847,18 @@
 "utdatafil som förväntades.)"
 
 #. type: TP
-#: dpkg-split.1:111
+#: dpkg-split.1:110
 #, no-wrap
 msgid "B<-l>, B<--listq>"
 msgstr "B<-l>, B<--listq>"
 
 #. type: Plain text
-#: dpkg-split.1:114
+#: dpkg-split.1:113
 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:118
+#: dpkg-split.1:117
 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 "
@@ -14349,13 +14868,13 @@
 "paketet, antal delar i kön, och det totala antalet byte som är lagrade i kön."
 
 #. type: TP
-#: dpkg-split.1:118
+#: dpkg-split.1:117
 #, no-wrap
 msgid "B<-d>, B<--discard> [I<package>...]"
 msgstr "B<-d>, B<--discard> [I<paket>...]"
 
 #. type: Plain text
-#: dpkg-split.1:122
+#: dpkg-split.1:121
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
@@ -14363,7 +14882,7 @@
 "Kastar bort delar från kön över de som väntar på återstående delar av paket."
 
 #. type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:126
 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."
@@ -14372,13 +14891,13 @@
 "de(t) paket som anges."
 
 #. type: TP
-#: dpkg-split.1:135
+#: dpkg-split.1:134
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr "B<--depotdir>I< katalog>"
 
 #. type: Plain text
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 msgid ""
 "Specifies an alternative directory for the queue of parts awaiting automatic "
 "reassembly. The default is B</var/lib/dpkg>."
@@ -14387,13 +14906,13 @@
 "sammanslagning. Förvalet är B</var/lib/dpkg>."
 
 #. type: TP
-#: dpkg-split.1:140
+#: dpkg-split.1:139
 #, no-wrap
 msgid "B<-S>, B<--partsize> I<kibibytes>"
 msgstr "B<-S>, B<--partsize> I<kibibyte>"
 
 #. type: Plain text
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 msgid ""
 "Specifies the maximum part size when splitting, in kibibytes (1024 bytes). "
 "The default is 450 KiB."
@@ -14401,18 +14920,18 @@
 "Anger maximal storlek vid delning, i kibibyte (1024 byte). Förval är 450 KiB."
 
 #. type: TP
-#: dpkg-split.1:144
+#: dpkg-split.1:143
 #, no-wrap
 msgid "B<-o>, B<--output> I<complete-output>"
 msgstr "B<-o>, B<--output> I<fullständig-utdata>"
 
 #. type: Plain text
-#: dpkg-split.1:147
+#: dpkg-split.1:146
 msgid "Specifies the output file name for a reassembly."
 msgstr "Anger filnamnet för utdata vid sammanslagning."
 
 #. type: Plain text
-#: dpkg-split.1:152
+#: dpkg-split.1:151
 msgid ""
 "This overrides the default for a manual reassembly (B<--join>)  and is "
 "mandatory for an automatic queue-or-reassemble (B<--auto>)."
@@ -14421,13 +14940,13 @@
 "krävs för automatisk köa-eller-sammanslå (B<--auto>)."
 
 #. type: TP
-#: dpkg-split.1:152
+#: dpkg-split.1:151
 #, no-wrap
 msgid "B<-Q>, B<--npquiet>"
 msgstr "B<-Q>, B<--npquiet>"
 
 #. type: Plain text
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 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 "
@@ -14441,19 +14960,19 @@
 "felaktiga meddelanden."
 
 #. type: TP
-#: dpkg-split.1:163
+#: dpkg-split.1:162
 #, no-wrap
 msgid "B<--msdos>"
 msgstr "B<--msdos>"
 
 #. type: Plain text
-#: dpkg-split.1:168
+#: dpkg-split.1:167
 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:174
+#: dpkg-split.1:173
 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 "
@@ -14464,7 +14983,7 @@
 "plustecken ersätts med B<x> och alla andra tecken kastas."
 
 #. type: Plain text
-#: dpkg-split.1:179
+#: dpkg-split.1:178
 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."
@@ -14475,45 +14994,40 @@
 #. type: Plain text
 #: dpkg-split.1:186
 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."
+"The requested split, merge, or other command succeeded.  B<--info> commands "
+"count as successful even if the files are not binary package parts."
 msgstr ""
-"Returvärdet 0 betyder att den efterfrågade funktionen (delning, "
-"sammanslagning eller annan) slutfördes lyckades. B<--info>-kommandon lyckas "
-"även om indatafilen inte är en del av ett binärpaket."
+"Den efterfrågade delningen, sammanslagningen eller annan åtgärd lyckades. "
+"B<--info>-kommandon lyckas även om indatafilen inte är en del av ett "
+"binärpaket."
 
 #. type: Plain text
-#: dpkg-split.1:192
+#: dpkg-split.1:193
 msgid ""
-"An exit status of 1 occurs only with B<--auto> and indicates that the "
-"I<part> file was not a binary package part."
+"Only occurs with B<--auto> and indicates that the I<part> file was not a "
+"binary package part."
 msgstr ""
-"Returvärdet 1 uppkommer endast med B<--auto> och anger att I<del>filen inte "
-"var en del av ett binärpaket."
+"Uppkommer endast med B<--auto> och anger att I<del>filen inte var en del av "
+"ett binärpaket."
 
-#. type: Plain text
-#: dpkg-split.1:196
-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 ""
-"Returvärdet 2 indikerar att något har gått fel, till exempel ett "
-"systemanrop, att en fil såg ut som en paketdel men var trasig, ett "
-"användningsfel, eller något annat problem."
+#. type: TP
+#: dpkg-split.1:193 start-stop-daemon.8:275 update-alternatives.8:378
+#, no-wrap
+msgid "B<2>"
+msgstr "B<2>"
 
 #. type: Plain text
-#: dpkg-split.1:201
+#: dpkg-split.1:198
 msgid ""
-"B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
-"of Debian packages."
+"Some kind of trouble happened, 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 ""
-"B<dpkg-split> använder några ganska gamla konventioner för filnamn på "
-"Debianpaket."
+"Något har gått fel, till exempel ett systemanrop, att en fil såg ut som en "
+"paketdel men var trasig, ett användningsfel, eller något annat problem."
 
 #. type: Plain text
-#: dpkg-split.1:204
+#: dpkg-split.1:202
 msgid ""
 "Full details of the packages in the queue are impossible to get without "
 "digging into the queue directory yourself."
@@ -14522,7 +15036,7 @@
 "katalogen."
 
 #. type: Plain text
-#: dpkg-split.1:207
+#: dpkg-split.1:205
 msgid ""
 "There is no easy way to test whether a file that may be a binary package "
 "part is one."
@@ -14530,32 +15044,21 @@
 "Det finns inget lätt sätta att testa om en fil som kan vara en del av ett "
 "binärpaket faktiskt är det."
 
-#. type: Plain text
-#: dpkg-split.1:211
-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 ""
-"Arkitekturen anges inte i delfilernas filhuvud, bara i kontrollinformationen "
-"i paketfilen som delarna innehåller, och den förekommer inte i de filnamn "
-"som genereras."
-
 #. type: TP
-#: dpkg-split.1:213
+#: dpkg-split.1:207
 #, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "B</var/lib/dpkg/parts>"
 
 #. type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:211
 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:222
+#: dpkg-split.1:216
 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 "
@@ -14566,7 +15069,7 @@
 "formatet på filnamnen litas på."
 
 #. type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:222
 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)."
 
@@ -14588,12 +15091,12 @@
 msgstr "dpkg-statoverride - överstyr ägarskap och läge för filer"
 
 #. type: Plain text
-#: dpkg-statoverride.8:9
-msgid "B<dpkg-statoverride> [I<options>] I<command>"
-msgstr "B<dpkg-statoverride> [I<flaggor>] I<åtgärd>"
+#: dpkg-statoverride.8:8
+msgid "B<dpkg-statoverride> [I<option>...] I<command>"
+msgstr "B<dpkg-statoverride> [I<flagga>...] I<åtgärd>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:19
+#: dpkg-statoverride.8:18
 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' "
@@ -14611,7 +15114,7 @@
 "specifik grupp."
 
 #. type: Plain text
-#: dpkg-statoverride.8:23
+#: dpkg-statoverride.8:22
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
@@ -14621,13 +15124,13 @@
 "och visa överstyrningar."
 
 #. type: TP
-#: dpkg-statoverride.8:25
+#: dpkg-statoverride.8:24
 #, no-wrap
 msgid "B<--add>I< user group mode file>"
 msgstr "B<--add>I< användare grupp läge fil>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:33
+#: dpkg-statoverride.8:32
 msgid ""
 "Add an override for I<file>. I<file> does not need to exist when this "
 "command is used; the override will be stored and used later.  Users and "
@@ -14642,7 +15145,7 @@
 "I<Läge> måste anges oktalt."
 
 #. type: Plain text
-#: dpkg-statoverride.8:36
+#: dpkg-statoverride.8:35
 msgid ""
 "If --update is specified and I<file> exists, it is immediately set to the "
 "new owner and mode."
@@ -14651,7 +15154,7 @@
 "den nya användaren och läget."
 
 #. type: Plain text
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 msgid ""
 "Remove an override for I<file>, the status of I<file> is left unchanged by "
 "this command."
@@ -14660,13 +15163,13 @@
 "kommando."
 
 #. type: TP
-#: dpkg-statoverride.8:40
+#: dpkg-statoverride.8:39
 #, no-wrap
 msgid "B<--list> [I<glob-pattern>]"
 msgstr "B<--list> [I<filnamnssökmönster>]"
 
 #. type: Plain text
-#: dpkg-statoverride.8:45
+#: 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 "
@@ -14678,7 +15181,7 @@
 "statoverride> avslutas med statuskod 1."
 
 #. type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:56
 msgid ""
 "Change the I<directory> of the dpkg database where the statoverride file is "
 "also stored. Defaults to I</var/lib/dpkg>."
@@ -14687,13 +15190,13 @@
 "Förval är I</var/lib/dpkg>."
 
 #. type: TP
-#: dpkg-statoverride.8:57 update-alternatives.8:337
+#: dpkg-statoverride.8:56 update-alternatives.8:336
 #, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:61
+#: 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."
@@ -14702,31 +15205,31 @@
 "det. Detta behövs för att överstyra en befintlig överstyrning."
 
 #. type: TP
-#: dpkg-statoverride.8:61
+#: dpkg-statoverride.8:60
 #, no-wrap
 msgid "B<--update>"
 msgstr "B<--update>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:65
+#: dpkg-statoverride.8:64
 msgid ""
 "Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
 "Försök att omedelbart ändra filen·om·den·finns till den nya ägaren och läget."
 
 #. type: Plain text
-#: dpkg-statoverride.8:68
+#: dpkg-statoverride.8:67
 msgid "Be less verbose about what we do."
 msgstr "Var mindre pratsom om vad som görs."
 
 #. type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:75
 #, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr "I</var/lib/dpkg/statoverride>"
 
 #. type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:80
 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 "
@@ -14737,7 +15240,7 @@
 "är viktiga för dpkg, som \"status\" och \"available\"."
 
 #. type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:83
 msgid ""
 "Note: B<dpkg-statoverride> preserves the old copy of this file, with "
 "extension \"-old\", before replacing it with the new one."
@@ -14805,14 +15308,15 @@
 #: dpkg-trigger.1:31
 msgid ""
 "Check if the running B<dpkg> supports triggers (usually called from a "
-"postinst). Will exit 0 if a triggers-capable B<dpkg> has run, or 1 with an "
-"error message to stderr if not. Normally, however, it is better just to "
-"activate the desired trigger with B<dpkg-trigger>."
+"postinst). Will exit B<0> if a triggers-capable B<dpkg> has run, or B<1> "
+"with an error message to stderr if not. Normally, however, it is better just "
+"to activate the desired trigger with B<dpkg-trigger>."
 msgstr ""
 "Se om den B<dpkg> som körs stöder utlösare (anropas vanligtvis från ett "
-"postinst-skript). Avslutar med 0 om en B<dpkg> med utlösarstöd har kört, "
-"eller 1 med ett felmeddelande på standard fel om inte. Det är dock normalt "
-"sett bättre att bara aktivera den önskade utlösaren med B<dpkg-trigger>."
+"postinst-skript). Avslutar med B<0> om en B<dpkg> med utlösarstöd har kört, "
+"eller B<1> med ett felmeddelande på standard fel om inte. Det är dock "
+"normalt sett bättre att bara aktivera den önskade utlösaren med B<dpkg-"
+"trigger>."
 
 #. type: TP
 #: dpkg-trigger.1:43
@@ -14824,12 +15328,12 @@
 #: dpkg-trigger.1:49
 msgid ""
 "Override trigger awaiter (normally set by B<dpkg> through the "
-"DPKG_MAINTSCRIPT_PACKAGE environment variable of the maintainer scripts, "
+"B<DPKG_MAINTSCRIPT_PACKAGE> environment variable of the maintainer scripts, "
 "naming the package to which the script belongs, and this will be used by "
 "default)."
 msgstr ""
 "Överstyr den som väntar på en utlösare (sätts vanligen av B<dpkg> genom "
-"miljövariabeln DPKG_MAINTSCRIPT_PACKAGE i utvecklarskript, för att namnge "
+"miljövariabeln B<DPKG_MAINTSCRIPT_PACKAGE> i utvecklarskript, för att namnge "
 "det paket som skriptet tillhör, och detta används som standard)."
 
 #. type: TP
@@ -14864,7 +15368,7 @@
 msgstr "Bara testa, ändra inte på någonting."
 
 #. type: Plain text
-#: dpkg-trigger.1:68
+#: dpkg-trigger.1:69
 msgid ""
 "B<dpkg>(1), B<deb-triggers>(5), B</usr/share/doc/dpkg-dev/triggers.txt.gz>."
 msgstr ""
@@ -14876,12 +15380,6 @@
 msgid "dpkg-vendor"
 msgstr "dpkg-vendor"
 
-#. type: TH
-#: dpkg-vendor.1:1
-#, no-wrap
-msgid "2009-05-10"
-msgstr "2009-05-10"
-
 #. type: Plain text
 #: dpkg-vendor.1:4
 msgid "dpkg-vendor - queries information about distribution vendors"
@@ -14912,11 +15410,11 @@
 #. type: Plain text
 #: dpkg-vendor.1:19
 msgid ""
-"Exits with 0 if the current vendor is I<vendor>. Otherwise exits with non-"
+"Exits with B<0> if the current vendor is I<vendor>. Otherwise exits with non-"
 "zero."
 msgstr ""
-"Avslutar med 0 om den aktuella återförsäljaren är I<återförsäljare>. I annat "
-"fall avslutas programmet med icke-noll."
+"Avslutar med B<0> om den aktuella återförsäljaren är I<återförsäljare>. I "
+"annat fall avslutas programmet med icke-noll."
 
 #. type: TP
 #: dpkg-vendor.1:19
@@ -14927,14 +15425,14 @@
 #. type: Plain text
 #: dpkg-vendor.1:24
 msgid ""
-"Exits with 0 if the current vendor distribution is a derivative of "
+"Exits with B<0> if the current vendor distribution is a derivative of "
 "I<vendor>, otherwise exits with non-zero. It uses the \"Parent\" field to "
 "browse all ancestors of the current vendor."
 msgstr ""
-"Avslutar med 0 om den aktuella återförsäljardistributionen är härledd från "
-"I<återförsäljare>. I annat fall avslutas programmet med icke-noll. Använder "
-"fältet \"Parent\" för att bläddra genom alla föräldrar till den aktuella "
-"återförsäljaren."
+"Avslutar med B<0> om den aktuella återförsäljardistributionen är härledd "
+"från I<återförsäljare>. I annat fall avslutas programmet med icke-noll. "
+"Använder fältet \"Parent\" för att bläddra genom alla föräldrar till den "
+"aktuella återförsäljaren."
 
 #. type: TP
 #: dpkg-vendor.1:24
@@ -14961,10 +15459,10 @@
 #: dpkg-vendor.1:41
 msgid ""
 "Assumes the current vendor is I<vendor> instead of discovering it with the "
-"DEB_VENDOR environment variable or B</etc/dpkg/origins/default>."
+"B<DEB_VENDOR> environment variable or B</etc/dpkg/origins/default>."
 msgstr ""
 "Anta att den aktuella återförsäljaren är I<återförsäljare> istället för att "
-"upptäcka det via miljövariabeln DEB_VENDOR eller B</etc/dpkg/origins/"
+"upptäcka det via miljövariabeln B<DEB_VENDOR> eller B</etc/dpkg/origins/"
 "default>."
 
 #. type: TP
@@ -14983,7 +15481,7 @@
 "återförsäljaren att identifieras genom att läsa B</etc/dpkg/origins/default>."
 
 #. type: Plain text
-#: dpkg-vendor.1:50 update-alternatives.8:497
+#: dpkg-vendor.1:50 update-alternatives.8:498
 msgid "Copyright \\(co 2009 Rapha\\[:e]l Hertzog"
 msgstr "Upphovsrättsskyddat © 2009 Raphaël Hertzog"
 
@@ -14999,20 +15497,12 @@
 msgstr "dselect - Debians pakethanteringsskal"
 
 #. type: Plain text
-#: dselect.1:16
-msgid ""
-"B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--version>] "
-"[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 ""
-"B<dselect> [B<--admindir> I<E<lt>katalogE<gt>>] [B<--help>] [B<--version>] "
-"[B<--expert>] [B<--debug>|B<-D>I<E<lt>filE<gt>>] [I<E<lt>handlingE<gt>>] "
-"[B<--colour>|B<--color> I<skärmdel>:[I<förgrund>],[I<bakgrund>][I<:attr>[I<"
-"+attr+..>]]]"
+#: dselect.1:8
+msgid "B<dselect> [I<option>...] [I<action>]"
+msgstr "B<dselect> [I<flagga>...] [I<åtgärd>]"
 
 #. type: Plain text
-#: dselect.1:25
+#: dselect.1:17
 #, no-wrap
 msgid ""
 "B<dselect>\n"
@@ -15032,7 +15522,7 @@
 " - Installera nya paket eller uppgradera till nyare versioner.\n"
 
 #. type: Plain text
-#: dselect.1:37
+#: dselect.1:29
 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 "
@@ -15055,11 +15545,11 @@
 "åtkomstmetoden är I<apt>, vilken tillhandahålls av paketet B<apt>."
 
 #. type: Plain text
-#: dselect.1:43
+#: dselect.1:35
 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 "
+"argument, then that action is started immediately. Several command line "
 "parameters are still available to modify the running behaviour of B<dselect> "
 "or show additional information about the program."
 msgstr ""
@@ -15070,12 +15560,12 @@
 "visa ytterligare information om programmet."
 
 #. type: Plain text
-#: dselect.1:51
+#: dselect.1:43
 msgid ""
-"All options can be specified both on the commandline and in the B<dselect> "
+"All options can be specified both on the command line and in the B<dselect> "
 "configuration file I</etc/dpkg/dselect.cfg> or the files on the "
-"configuration directory I</etc/dpkg/dpkg.cfg.d/>. Each line in the "
-"configuration file is either an option (exactly the same as the commandline "
+"configuration directory I</etc/dpkg/dselect.cfg.d/>. 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 ""
 "Alla flaggorna kan ges både på kommandoraden och i B<dselect>s "
@@ -15085,14 +15575,8 @@
 "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
+#: dselect.1:49
 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 "
@@ -15103,25 +15587,24 @@
 "behöva ändra det."
 
 #. type: TP
-#: dselect.1:57
+#: dselect.1:49
 #, no-wrap
-msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
-msgstr "B<--debug>I< E<lt>filE<gt> >|I< >B<-D>I<E<lt>filE<gt>>"
+msgid "B<--debug>I< file >|I< >B<-D>I<file>"
+msgstr "B<--debug>I< fil >|I< >B<-D>I<fil>"
 
 #. type: Plain text
-#: dselect.1:60
-msgid "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
-msgstr ""
-"Slå på felsökningsläge. Felsökningsinformation lagras i I<E<lt>filE<gt>>."
+#: dselect.1:52
+msgid "Turn on debugging. Debugging information is sent to I<file>."
+msgstr "Slå på felsökningsläge. Felsökningsinformation lagras i I<fil>."
 
 #. type: TP
-#: dselect.1:60
+#: dselect.1:52
 #, no-wrap
 msgid "B<--expert>"
 msgstr "B<--expert>"
 
 #. type: Plain text
-#: dselect.1:64
+#: dselect.1:56
 msgid ""
 "Turns on expert mode, i.e. doesn't display possibly annoying help messages."
 msgstr ""
@@ -15129,13 +15612,13 @@
 "irriterande."
 
 #. type: TP
-#: dselect.1:64
+#: dselect.1:56
 #, no-wrap
 msgid "B<--colour>|B<--color> I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]"
 msgstr "B<--colour>|B<--color> I<skärmdel>:[I<förgrund>],[I<bakgrund>][I<:attr>[I<+attr+..>]]"
 
 #. type: Plain text
-#: dselect.1:71
+#: dselect.1:63
 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>). "
@@ -15148,57 +15631,57 @@
 "skärmen. Skärmdelarna är, uppifrån och ner:"
 
 #. type: TP
-#: dselect.1:72
+#: dselect.1:64
 #, no-wrap
 msgid "B<title>"
 msgstr "B<title>"
 
 #. type: Plain text
-#: dselect.1:75
+#: dselect.1:67
 msgid "The screen title."
 msgstr "Skärmtiteln."
 
 #. type: TP
-#: dselect.1:75
+#: dselect.1:67
 #, no-wrap
 msgid "B<listhead>"
 msgstr "B<listhead>"
 
 #. type: Plain text
-#: dselect.1:78
+#: dselect.1:70
 msgid "The header line above the list of packages."
 msgstr "Huvudraden ovanför paketlistan."
 
 #. type: TP
-#: dselect.1:78
+#: dselect.1:70
 #, no-wrap
 msgid "B<list>"
 msgstr "B<list>"
 
 #. type: Plain text
-#: dselect.1:81
+#: dselect.1:73
 msgid "The scrolling list of packages (and also some help text)."
 msgstr "Den rullande paketlistan (och även viss hjälptext)."
 
 #. type: TP
-#: dselect.1:81
+#: dselect.1:73
 #, no-wrap
 msgid "B<listsel>"
 msgstr "B<listsel>"
 
 #. type: Plain text
-#: dselect.1:84
+#: dselect.1:76
 msgid "The selected item in the list."
 msgstr "Den valda posten i listan."
 
 #. type: TP
-#: dselect.1:84
+#: dselect.1:76
 #, no-wrap
 msgid "B<pkgstate>"
 msgstr "B<pkgstate>"
 
 #. type: Plain text
-#: dselect.1:88
+#: dselect.1:80
 msgid ""
 "In the list of packages, the text indicating the current state of each "
 "package."
@@ -15207,13 +15690,13 @@
 "paket."
 
 #. type: TP
-#: dselect.1:88
+#: dselect.1:80
 #, no-wrap
 msgid "B<pkgstatesel>"
 msgstr "B<pkgstatesel>"
 
 #. type: Plain text
-#: dselect.1:92
+#: dselect.1:84
 msgid ""
 "In the list of packages, the text indicating the current state of the "
 "currently selected package."
@@ -15222,75 +15705,75 @@
 "nu markerade paketet."
 
 #. type: TP
-#: dselect.1:92
+#: dselect.1:84
 #, no-wrap
 msgid "B<infohead>"
 msgstr "B<infohead>"
 
 #. type: Plain text
-#: dselect.1:95
+#: dselect.1:87
 msgid ""
 "The header line that displays the state of the currently selected package."
 msgstr ""
 "Huvudraden som visar information om tillståndet för det nu markerade paketet."
 
 #. type: TP
-#: dselect.1:95
+#: dselect.1:87
 #, no-wrap
 msgid "B<infodesc>"
 msgstr "B<infodesc>"
 
 #. type: Plain text
-#: dselect.1:98
+#: dselect.1:90
 msgid "The package's short description."
 msgstr "Paketets korta beskrivning."
 
 #. type: TP
-#: dselect.1:98
+#: dselect.1:90
 #, no-wrap
 msgid "B<info>"
 msgstr "B<info>"
 
 #. type: Plain text
-#: dselect.1:101
+#: dselect.1:93
 msgid "Used to display package info such as the package's description."
 msgstr "Används för att visa paketinformation, såsom paketets beskrivning."
 
 #. type: TP
-#: dselect.1:101
+#: dselect.1:93
 #, no-wrap
 msgid "B<infofoot>"
 msgstr "B<infofoot>"
 
 #. type: Plain text
-#: dselect.1:104
+#: dselect.1:96
 msgid "The last line of the screen when selecting packages."
 msgstr "Den sista raden på skärmen när paket väljs."
 
 #. type: TP
-#: dselect.1:104
+#: dselect.1:96
 #, no-wrap
 msgid "B<query>"
 msgstr "B<query>"
 
 #. type: Plain text
-#: dselect.1:107
+#: dselect.1:99
 msgid "Used to display query lines"
 msgstr "Används för att visa frågor."
 
 #. type: TP
-#: dselect.1:107
+#: dselect.1:99
 #, no-wrap
 msgid "B<helpscreen>"
 msgstr "B<helpscreen>"
 
 #. type: Plain text
-#: dselect.1:110
+#: dselect.1:102
 msgid "Color of help screens."
 msgstr "Färg på hjälpskärmar."
 
 #. type: Plain text
-#: dselect.1:115
+#: dselect.1:107
 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, "
@@ -15301,7 +15784,7 @@
 "inkompilerade färgerna. Använd de normala curses-namnen för färgerna."
 
 #. type: Plain text
-#: dselect.1:121
+#: dselect.1:113
 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 "
@@ -15316,73 +15799,69 @@
 "(omvänd), blink, bright (ljus), dim (mörk), bold (fet)"
 
 #. type: Plain text
-#: dselect.1:124
+#: dselect.1:116
 msgid "Print a brief help text and exit successfully."
 msgstr "Visar en kort hjälptext och ger lyckat avslut."
 
 #. type: Plain text
-#: dselect.1:127
+#: dselect.1:119
 msgid "Print version information and exit successfully."
 msgstr "Visar versionsinformation och ger lyckat avslut."
 
-#. type: SH
-#: dselect.1:128
-#, no-wrap
-msgid "USAGE"
-msgstr "ANVÄNDNING"
-
 #. type: Plain text
-#: dselect.1:133
+#: dselect.1:126
 msgid ""
-"When B<dselect> is started interactively, it prompts the user with a menu of "
-"available actions:"
-msgstr ""
-"När B<dselect> startas interaktivt visas en meny för användaren med "
-"tillgängliga handlingar:"
+"When B<dselect> is started it can perform the following actions, either "
+"directly if it was specified on the command line or by prompting the user "
+"with a menu of available actions if running interactively:"
+msgstr ""
+"När B<dselect> startas kan det utföra följande åtgärder, antingen direkt om "
+"de anges på kommandoraden eller genom att fråga användaren med en meny om "
+"det körs interaktivt:"
 
 #. type: SS
-#: dselect.1:133
+#: dselect.1:126
 #, no-wrap
 msgid "access"
 msgstr "Access (Åtkomst)"
 
 #. type: Plain text
-#: dselect.1:135
+#: dselect.1:128
 msgid "Choose and configure an access method to access package repositories."
 msgstr ""
 "Väljer och konfigurerar en \"åtkomstmetod\" för att komma åt paketsamlingen."
 
 #. type: Plain text
-#: dselect.1:141
+#: dselect.1:134
 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."
+"By default, B<dselect> provides several methods such as I<cdrom>, "
+"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount>, "
+"I<floppy> or I<ftp>, but other packages may provide additional methods, eg. "
+"the I<apt> access method provided by the B<apt> package."
 msgstr ""
-"Som standard ger B<dselect> flera olika metoder, såsom I<floppy> (diskett), "
-"I<harddisk> (hårddisk) och I<cdrom>, men andra paket du installerar kan "
-"tillhandahålla ytterligare metoder, t.ex ges åtkomstmetoden I<apt> av "
-"paketet B<apt> och I<multi_cd> av B<dpkg-multicd>."
+"Som standard ger B<dselect> flera olika metoder, såsom I<cdrom>, "
+"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount>, "
+"I<floppy> och I<ftp>, men andra paket du installerar kan tillhandahålla "
+"ytterligare metoder, t.ex ges åtkomstmetoden I<apt> av paketet B<apt>."
 
 #. type: Plain text
-#: dselect.1:143
+#: dselect.1:136
 msgid "The use of the I<apt> access method is strongly recommended."
 msgstr "Åtkomstmetoden I<apt> rekommenderas starkt."
 
 #. type: SS
-#: dselect.1:144
+#: dselect.1:137
 #, no-wrap
 msgid "update"
 msgstr "Update (Uppdatera)"
 
 #. type: Plain text
-#: dselect.1:146
+#: dselect.1:139
 msgid "Refresh the available packages database."
 msgstr "Uppdatera databasen med tillgängliga paket."
 
 #. type: Plain text
-#: dselect.1:153
+#: dselect.1:146
 msgid ""
 "Retrieves a list of available package versions from the package repository, "
 "configured for the current access method, and update the dpkg database. The "
@@ -15397,7 +15876,7 @@
 "underhåller samlingarna genom att använda programmet B<dpkg-scanpackages(1)>."
 
 #. type: Plain text
-#: dselect.1:156
+#: dselect.1:149
 msgid ""
 "Details of the update action depend on the access method's implementation.  "
 "Normally the process is straightforward and requires no user interaction."
@@ -15407,18 +15886,18 @@
 "interaktion med användaren."
 
 #. type: SS
-#: dselect.1:157
+#: dselect.1:150
 #, no-wrap
 msgid "select"
 msgstr "Select (Välj)"
 
 #. type: Plain text
-#: dselect.1:159
+#: dselect.1:152
 msgid "View or manage package selections and dependencies."
 msgstr "Visar eller väljer paketval och beroenden."
 
 #. type: Plain text
-#: dselect.1:165
+#: dselect.1:158
 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 "
@@ -15433,7 +15912,7 @@
 "beroende eller motstridiga paket."
 
 #. type: Plain text
-#: dselect.1:172
+#: dselect.1:165
 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 "
@@ -15450,7 +15929,7 @@
 "hanterade beroendena eller konflikterna uppstod till att börja med."
 
 #. type: Plain text
-#: dselect.1:175
+#: dselect.1:168
 msgid ""
 "The use of the interactive package selections management screen is explained "
 "in more detail below."
@@ -15459,18 +15938,18 @@
 "ytterligare detalj nedan."
 
 #. type: SS
-#: dselect.1:176
+#: dselect.1:169
 #, no-wrap
 msgid "install"
 msgstr "Install (Installera)"
 
 #. type: Plain text
-#: dselect.1:178
+#: dselect.1:171
 msgid "Installs selected packages."
 msgstr "Installerar valda paket."
 
 #. type: Plain text
-#: dselect.1:184
+#: dselect.1:177
 msgid ""
 "The configured access method will fetch installable or upgradable packages "
 "from the relevant repositories and install these using B<dpkg>.  Depending "
@@ -15485,7 +15964,7 @@
 "åtkomstmetoder kommer även ta bort paket som markerades för borttagning."
 
 #. type: Plain text
-#: dselect.1:192
+#: dselect.1:185
 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 "
@@ -15505,7 +15984,7 @@
 "installerade."
 
 #. type: Plain text
-#: dselect.1:199
+#: dselect.1:192
 msgid ""
 "Details of the install action depend on the access method's implementation.  "
 "The user's attention and input may be required during installation, "
@@ -15521,59 +16000,59 @@
 "automatiserad, installation och inställning."
 
 #. type: SS
-#: dselect.1:200
+#: dselect.1:193
 #, no-wrap
 msgid "config"
 msgstr "Config (Konfigurera)"
 
 #. type: Plain text
-#: dselect.1:202
+#: dselect.1:195
 msgid "Configures any previously installed, but not fully configured packages."
 msgstr ""
 "Konfigurera paket som tidigare installerats, men ej till fullo konfigurerats."
 
 #. type: SS
-#: dselect.1:203
+#: dselect.1:196
 #, no-wrap
 msgid "remove"
 msgstr "Remove (Radera)"
 
 #. type: Plain text
-#: dselect.1:205
+#: dselect.1:198
 msgid "Removes or purges installed packages, that are marked for removal."
 msgstr ""
 "Tar bort eller raderar helt installerade paket som markerats för borttagning."
 
 #. type: SS
-#: dselect.1:206
+#: dselect.1:199
 #, no-wrap
 msgid "quit"
 msgstr "Quit (Avsluta)"
 
 #. type: Plain text
-#: dselect.1:208
+#: dselect.1:201
 msgid "Quit B<dselect>"
 msgstr "Avslutar B<dselect>"
 
 #. type: Plain text
-#: dselect.1:210
+#: dselect.1:203
 msgid "Exits the program with zero (successful) errorcode."
 msgstr "Avslutar dselect med felkod noll (lyckat)."
 
 #. type: SH
-#: dselect.1:212
+#: dselect.1:205
 #, no-wrap
 msgid "Package selections management"
 msgstr "Paketvalshantering"
 
 #. type: SS
-#: dselect.1:214
+#: dselect.1:207
 #, no-wrap
 msgid "Introduction"
 msgstr "Introduktion"
 
 #. type: Plain text
-#: dselect.1:230
+#: dselect.1:223
 msgid ""
 "B<dselect> directly exposes the administrator to some of the complexities "
 "involved with managing large sets of packages with many interdependencies. "
@@ -15598,7 +16077,7 @@
 "policymanual."
 
 #. type: Plain text
-#: dselect.1:236
+#: dselect.1:229
 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> "
@@ -15612,13 +16091,13 @@
 "upp. Direkthjälpskärmarna kan när som helst nås via tangenten B<\"?\">."
 
 #. type: SS
-#: dselect.1:237
+#: dselect.1:230
 #, no-wrap
 msgid "Screen layout"
 msgstr "Skärmutseende"
 
 #. type: Plain text
-#: dselect.1:245
+#: dselect.1:238
 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 "
@@ -15634,7 +16113,7 @@
 "halvan. Vilken sorts detaljer som visas kan varieras."
 
 #. type: Plain text
-#: dselect.1:248
+#: dselect.1:241
 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."
@@ -15644,13 +16123,13 @@
 "stora delar."
 
 #. type: SS
-#: dselect.1:249
+#: dselect.1:242
 #, no-wrap
 msgid "Package details view"
 msgstr "Paketdetaljvy"
 
 #. type: Plain text
-#: dselect.1:258
+#: dselect.1:251
 #, no-wrap
 msgid ""
 "The package details view by default shows the extended package description\n"
@@ -15670,7 +16149,7 @@
 " - kontrollinformationen för den tillgängliga versionen\n"
 
 #. type: Plain text
-#: dselect.1:262
+#: dselect.1:255
 msgid ""
 "In a dependency resolution screen, there is also the possibility of viewing "
 "the specific unresolved depends or conflicts related to the package and "
@@ -15680,13 +16159,13 @@
 "otillfredsställda beroenden eller konflikter för paketet."
 
 #. type: SS
-#: dselect.1:263
+#: dselect.1:256
 #, no-wrap
 msgid "Packages status list"
 msgstr "Paketstatuslista"
 
 #. type: Plain text
-#: dselect.1:268
+#: dselect.1:261
 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 "
@@ -15697,7 +16176,7 @@
 "paket kända från databasen över tillgängliga paket."
 
 #. type: Plain text
-#: dselect.1:276
+#: dselect.1:269
 msgid ""
 "For every package, the list shows the package's status, priority, section, "
 "installed and available versions, the package name and its short "
@@ -15714,7 +16193,7 @@
 "förkortad, med den förkortade visningen som förval."
 
 #. type: Plain text
-#: dselect.1:282
+#: dselect.1:275
 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 "
@@ -15727,7 +16206,7 @@
 "beskriver valet som gjorts av användaren."
 
 #. type: Plain text
-#: dselect.1:300
+#: dselect.1:293
 #, no-wrap
 msgid ""
 "These are the meanings of the shorthand package status indicator codes:\n"
@@ -15768,13 +16247,13 @@
 "  B<n>       paketet är nytt och har ännu inte markerats\n"
 
 #. type: SS
-#: dselect.1:301
+#: dselect.1:294
 #, no-wrap
 msgid "Cursor and screen movement"
 msgstr "Markör- och skärmrörelser"
 
 #. type: Plain text
-#: dselect.1:306
+#: dselect.1:299
 msgid ""
 "The package selection list and the dependency conflict resolution screens "
 "can be navigated using motion commands mapped to the following keys:"
@@ -15783,7 +16262,7 @@
 "att använda rörelsekommandon kopplade till följande tangenter:"
 
 #. type: Plain text
-#: dselect.1:323
+#: dselect.1:316
 #, no-wrap
 msgid ""
 "  B<p, Up, k>           move cursor bar up\n"
@@ -15821,13 +16300,13 @@
 "  B<^f>                  panorera vy 1 tecken höger\n"
 
 #. type: SS
-#: dselect.1:324
+#: dselect.1:317
 #, no-wrap
 msgid "Searching and sorting"
 msgstr "Sökning och sortering"
 
 #. type: Plain text
-#: dselect.1:338
+#: dselect.1:331
 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 "
@@ -15850,7 +16329,7 @@
 "sökningen därifrån."
 
 #. type: Plain text
-#: dselect.1:345
+#: dselect.1:338
 #, no-wrap
 msgid ""
 "The list sort order can be varied by pressing\n"
@@ -15868,7 +16347,7 @@
 " sektion+prioritet  tillgänglig+sektion    status+sektion\n"
 
 #. type: Plain text
-#: dselect.1:348
+#: dselect.1:341
 msgid ""
 "Where not listed above explicitly, alphabetic order is used as the final "
 "subordering sort key."
@@ -15877,13 +16356,13 @@
 "sorteringsnyckeln."
 
 #. type: SS
-#: dselect.1:349
+#: dselect.1:342
 #, no-wrap
 msgid "Altering selections"
 msgstr "Ändra val"
 
 #. type: Plain text
-#: dselect.1:358
+#: dselect.1:351
 #, no-wrap
 msgid ""
 "The requested selection state of individual packages may be\n"
@@ -15903,7 +16382,7 @@
 "  B<_>            ta bort och radera konfiguration\n"
 
 #. type: Plain text
-#: dselect.1:362
+#: dselect.1:355
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -15914,7 +16393,7 @@
 "beroendelösningsskärm, vilken beskrivs ytterligare nedan."
 
 #. type: Plain text
-#: dselect.1:367
+#: dselect.1:360
 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 "
@@ -15925,7 +16404,7 @@
 "grupperas beror på vilken listordning som för tillfället används."
 
 #. type: Plain text
-#: dselect.1:373
+#: dselect.1:366
 msgid ""
 "Proper care should be taken when altering large groups of selections, "
 "because this can instantaneously create large numbers of unresolved depends "
@@ -15940,13 +16419,13 @@
 "praktiken är bara håll-kommandot och dess motsats användbara på grupper."
 
 #. type: SS
-#: dselect.1:374
+#: dselect.1:367
 #, no-wrap
 msgid "Resolving depends and conflicts"
 msgstr "Lösa beroenden och konflikter"
 
 #. type: Plain text
-#: dselect.1:379
+#: dselect.1:372
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -15957,7 +16436,7 @@
 "beroendelösningsskärm. Först visas dock en informativ hjälpskärm."
 
 #. type: Plain text
-#: dselect.1:386
+#: dselect.1:379
 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 "
@@ -15974,7 +16453,7 @@
 "paketet listas."
 
 #. type: Plain text
-#: dselect.1:392
+#: dselect.1:385
 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, "
@@ -15988,7 +16467,7 @@
 "är oftast bäst att följa upp de förslag B<dselect> ger."
 
 #. type: Plain text
-#: dselect.1:400
+#: dselect.1:393
 msgid ""
 "The listed packages' selection state may be reverted to the original "
 "settings, as they were before the unresolved depends or conflicts were "
@@ -16005,13 +16484,13 @@
 "återställs valen återigen till de automatiskt föreslagna värdena."
 
 #. type: SS
-#: dselect.1:401
+#: dselect.1:394
 #, no-wrap
 msgid "Establishing the requested selections"
 msgstr "Bekräfta de efterfrågade valen"
 
 #. type: Plain text
-#: dselect.1:408
+#: dselect.1:401
 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 "
@@ -16026,7 +16505,7 @@
 "gå till beroendelösningsskärmen."
 
 #. type: Plain text
-#: dselect.1:414
+#: dselect.1:407
 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 "
@@ -16039,7 +16518,7 @@
 "vanligtvis inte bör göras om man inte har läst det finstilta."
 
 #. type: Plain text
-#: dselect.1:421
+#: dselect.1:414
 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 "
@@ -16054,7 +16533,7 @@
 "inställningar."
 
 #. type: Plain text
-#: dselect.1:428
+#: dselect.1:421
 msgid ""
 "If you mistakenly establish some settings and wish to revert all the "
 "selections to what is currently installed on the system, press the B<'C'> "
@@ -16069,7 +16548,7 @@
 "tryckte på B<Enter>."
 
 #. type: Plain text
-#: dselect.1:435
+#: dselect.1:428
 msgid ""
 "If set, B<dselect> will use it as the directory from which to read the user "
 "specific configuration file."
@@ -16078,7 +16557,7 @@
 "användarspecifika konfigurationsfilen skall läsas."
 
 #. type: Plain text
-#: dselect.1:441
+#: dselect.1:434
 msgid ""
 "The B<dselect> package selection interface is confusing to some new users.  "
 "Reportedly, it even makes seasoned kernel developers cry."
@@ -16088,22 +16567,22 @@
 "kärnan att gråta."
 
 #. type: Plain text
-#: dselect.1:443
+#: dselect.1:436
 msgid "The documentation is lacking."
 msgstr "Dokumentationen har brister."
 
 #. type: Plain text
-#: dselect.1:445
+#: dselect.1:438
 msgid "There is no help option in the main menu."
 msgstr "Det finns inget hjälpalternativ i huvudmenyn."
 
 #. type: Plain text
-#: dselect.1:447
+#: dselect.1:440
 msgid "The visible list of available packages cannot be reduced."
 msgstr "Den synliga listan med tillgängliga paket kan inte förminskas."
 
 #. type: Plain text
-#: dselect.1:451
+#: dselect.1:444
 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, "
@@ -16114,12 +16593,12 @@
 "även mycket flexiblare än de inbyggda åtkomstmetoderna."
 
 #. type: Plain text
-#: dselect.1:457
+#: dselect.1:450
 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:462
+#: dselect.1:455
 msgid ""
 "B<dselect> was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list "
 "of contributors may be found in 'dselect --version'."
@@ -16128,7 +16607,7 @@
 "lista över bidragslämnare får du med \"dselect --version\"."
 
 #. type: Plain text
-#: dselect.1:465
+#: dselect.1:458
 msgid ""
 "This manual page was written by Juho Vuori E<lt>javuori@cc.helsinki.fiE<gt>, "
 "Josip Rodin and Joost kooij."
@@ -16142,6 +16621,12 @@
 msgid "dselect.cfg"
 msgstr "dselect.cfg"
 
+#. type: TH
+#: dselect.cfg.5:1
+#, no-wrap
+msgid "2011-07-03"
+msgstr "2011-07-03"
+
 #. type: Plain text
 #: dselect.cfg.5:4
 msgid "dselect.cfg - dselect configuration file"
@@ -16151,7 +16636,7 @@
 #: 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 "
+"option which is exactly the same as a normal command line option for dselect "
 "except for the leading dashes which are not used here. Quotes surrounding "
 "option values are stripped. Comments are allowed by starting a line with a "
 "hash sign (\"B<#>\")."
@@ -16203,12 +16688,12 @@
 msgstr "start-stop-daemon - startar och stoppar bakgrundsprocesser"
 
 #. type: Plain text
-#: start-stop-daemon.8:9
-msgid "B<start-stop-daemon> [I<options>] I<command>"
-msgstr "B<start-stop-daemon> [I<flaggor>] I<åtgärd>"
+#: start-stop-daemon.8:8
+msgid "B<start-stop-daemon> [I<option>...] I<command>"
+msgstr "B<start-stop-daemon> [I<flagga>...] I<åtgärd>"
 
 #. type: Plain text
-#: start-stop-daemon.8:15
+#: start-stop-daemon.8:14
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
 "system-level processes.  Using one of the matching options, B<start-stop-"
@@ -16219,7 +16704,7 @@
 "daemon> ställas in att hitta befintliga instanser av en körande process."
 
 #. type: Plain text
-#: start-stop-daemon.8:34
+#: start-stop-daemon.8:33
 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 "
@@ -16239,13 +16724,13 @@
 "som måste överleva en B<--stop>, måste du ange en pidfil."
 
 #. type: TP
-#: start-stop-daemon.8:36
+#: start-stop-daemon.8:35
 #, no-wrap
 msgid "B<-S>, B<--start> [B<-->] I<arguments>"
 msgstr "B<-S>, B<--start> [B<-->] I<argument>"
 
 #. type: Plain text
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 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<--"
@@ -16262,13 +16747,13 @@
 "programmet som startas."
 
 #. type: TP
-#: start-stop-daemon.8:53
+#: start-stop-daemon.8:52
 #, no-wrap
 msgid "B<-K>, B<--stop>"
 msgstr "B<-K>, B<--stop>"
 
 #. type: Plain text
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
 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 "
@@ -16284,52 +16769,67 @@
 "stop-daemon> kontrollera att processen har avslutats."
 
 #. type: TP
-#: start-stop-daemon.8:71
+#: start-stop-daemon.8:70
+#, no-wrap
+msgid "B<-T>, B<--status>"
+msgstr "B<-T>, B<--status>"
+
+#. type: Plain text
+#: start-stop-daemon.8:74
+msgid ""
+"Check for the existence of a specified process, and returns an exit status "
+"code, according to the LSB Init Script Actions."
+msgstr ""
+"Se om den angivna processen existerar, och returnerar en statuskod i "
+"enlighet med LBS Init Script Actions."
+
+#. type: TP
+#: start-stop-daemon.8:74
 #, no-wrap
 msgid "B<-H>, B<--help>"
 msgstr "B<-H>, B<--help>"
 
 #. type: Plain text
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 msgid "Show usage information and exit."
 msgstr "Visa hjälpskärm och avsluta."
 
 #. type: TP
-#: start-stop-daemon.8:74
+#: start-stop-daemon.8:77
 #, no-wrap
 msgid "B<-V>, B<--version>"
 msgstr "B<-V>, B<--version>"
 
 #. type: Plain text
-#: start-stop-daemon.8:77
+#: start-stop-daemon.8:80
 msgid "Show the program version and exit."
 msgstr "Visa programversion och avsluta."
 
 #. type: SH
-#: start-stop-daemon.8:78
+#: start-stop-daemon.8:81
 #, no-wrap
 msgid "MATCHING OPTIONS"
 msgstr "FLAGGOR FÖR SÖKNING"
 
 #. type: TP
-#: start-stop-daemon.8:79
+#: start-stop-daemon.8:82
 #, no-wrap
 msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgstr "B<-p>, B<--pidfile> I<pidfil>"
 
 #. type: Plain text
-#: start-stop-daemon.8:83
+#: start-stop-daemon.8:86
 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:83
+#: start-stop-daemon.8:86
 #, no-wrap
 msgid "B<-x>, B<--exec> I<executable>"
 msgstr "B<-x>, B<--exec> I<programfil>"
 
 #. type: Plain text
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
@@ -16338,13 +16838,13 @@
 ">I<pid>B</exe>)."
 
 #. type: TP
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:90
 #, no-wrap
 msgid "B<-n>, B<--name> I<process-name>"
 msgstr "B<-n>, B<--name> I<processnamn>"
 
 #. type: Plain text
-#: start-stop-daemon.8:93
+#: start-stop-daemon.8:96
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
@@ -16353,13 +16853,13 @@
 "stat>)."
 
 #. type: TP
-#: start-stop-daemon.8:93
+#: start-stop-daemon.8:96
 #, 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:99
+#: start-stop-daemon.8:102
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
@@ -16367,24 +16867,24 @@
 "eller I<användar-id>."
 
 #. type: TP
-#: start-stop-daemon.8:101
+#: start-stop-daemon.8:104
 #, 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:104
+#: start-stop-daemon.8:107
 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:104
+#: start-stop-daemon.8:107
 #, 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:112
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default TERM)."
@@ -16393,13 +16893,13 @@
 "processen som stoppas (förval är TERM)."
 
 #. type: TP
-#: start-stop-daemon.8:109
+#: start-stop-daemon.8:112
 #, 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:119
+#: start-stop-daemon.8:122
 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 "
@@ -16412,7 +16912,7 @@
 "avslutar kommer programmet utföra ytterligare kommandon enligt schemat."
 
 #. type: Plain text
-#: start-stop-daemon.8:130
+#: start-stop-daemon.8:133
 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 "
@@ -16423,7 +16923,7 @@
 "anges med B<--signal>."
 
 #. type: Plain text
-#: start-stop-daemon.8:146
+#: start-stop-daemon.8:149
 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 "
@@ -16439,7 +16939,7 @@
 "så behövs."
 
 #. type: Plain text
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 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, "
@@ -16450,13 +16950,13 @@
 "angiven med B<--signal> att ignoreras."
 
 #. type: TP
-#: start-stop-daemon.8:156
+#: start-stop-daemon.8:159
 #, 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:164
+#: start-stop-daemon.8:167
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
@@ -16465,13 +16965,13 @@
 "skall startas. Om den inte anges används argumentet som gavs till B<--exec>."
 
 #. type: TP
-#: start-stop-daemon.8:164
+#: start-stop-daemon.8:167
 #, no-wrap
 msgid "B<-t>, B<--test>"
 msgstr "B<-t>, B<--test>"
 
 #. type: Plain text
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
@@ -16480,36 +16980,37 @@
 "ingenting."
 
 #. type: TP
-#: start-stop-daemon.8:168
+#: start-stop-daemon.8:171
 #, no-wrap
 msgid "B<-o>, B<--oknodo>"
 msgstr "B<-o>, B<--oknodo>"
 
 #. type: Plain text
-#: start-stop-daemon.8:171
+#: start-stop-daemon.8:174
 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:171
+#: start-stop-daemon.8:174
 #, no-wrap
 msgid "B<-q>, B<--quiet>"
 msgstr "B<-q>, B<--quiet>"
 
 #. type: Plain text
-#: start-stop-daemon.8:174
+#: start-stop-daemon.8:177
 msgid "Do not print informational messages; only display error messages."
 msgstr "Skriv inte informationsmeddelanden; visa endast felmeddelanden."
 
 #. type: TP
-#: start-stop-daemon.8:174
-#, no-wrap
-msgid "B<-c>, B<--chuid> I<username>|I<uid>"
+#: start-stop-daemon.8:177
+#, fuzzy, no-wrap
+#| msgid "B<-c>, B<--chuid> I<username>|I<uid>"
+msgid "B<-c>, B<--chuid> I<username>|I<uid>[B<:>I<group>|I<gid>]"
 msgstr "B<-c>, B<--chuid> I<användarnamn>|I<användar-id>"
 
 #. type: Plain text
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 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 "
@@ -16532,13 +17033,13 @@
 "såsom B<nobody>)."
 
 #. type: TP
-#: start-stop-daemon.8:192
+#: start-stop-daemon.8:195
 #, no-wrap
 msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<-r>, B<--chroot> I<rot>"
 
 #. type: Plain text
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
@@ -16547,13 +17048,13 @@
 "pidfilen skrivs efter chroot har utförts."
 
 #. type: TP
-#: start-stop-daemon.8:198
+#: start-stop-daemon.8:201
 #, 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:206
+#: start-stop-daemon.8:209
 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-"
@@ -16564,13 +17065,13 @@
 "stop-daemon byta till rotkatalogen innan processen startas."
 
 #. type: TP
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:209
 #, no-wrap
 msgid "B<-b>, B<--background>"
 msgstr "B<-b>, B<--background>"
 
 #. type: Plain text
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 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 "
@@ -16590,24 +17091,24 @@
 "det på egen hand."
 
 #. type: TP
-#: start-stop-daemon.8:218
+#: start-stop-daemon.8:221
 #, no-wrap
 msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr "B<-N>, B<--nicelevel> I<heltal>"
 
 #. type: Plain text
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 msgid "This alters the priority of the process before starting it."
 msgstr "Ändrar prioriteten på processen innan den startas."
 
 #. type: TP
-#: start-stop-daemon.8:221
+#: start-stop-daemon.8:224
 #, no-wrap
 msgid "B<-P>, B<--procsched> I<policy>B<:>I<priority>"
 msgstr "B<-P>, B<--procsched> I<policy>B<:>I<prioritet>"
 
 #. type: Plain text
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 msgid ""
 "This alters the process scheduler policy and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -16620,13 +17121,13 @@
 "värdena B<other>, B<fifo> och B<rr> för I<policy>."
 
 #. type: TP
-#: start-stop-daemon.8:227
+#: start-stop-daemon.8:230
 #, no-wrap
 msgid "B<-I>, B<--iosched> I<class>B<:>I<priority>"
 msgstr "B<-I>, B<--iosched> I<klass>B<:>I<prioritet>"
 
 #. type: Plain text
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 msgid ""
 "This alters the IO scheduler class and priority of the process before "
 "starting it. The priority can be optionally specified by appending a B<:> "
@@ -16641,24 +17142,24 @@
 "B<best-effort> och B<real-time> för I<klass>."
 
 #. type: TP
-#: start-stop-daemon.8:234
+#: start-stop-daemon.8:237
 #, no-wrap
 msgid "B<-k>, B<--umask> I<mask>"
 msgstr "B<-k>, B<--umask> I<maskvärde>"
 
 #. type: Plain text
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 msgid "This sets the umask of the process before starting it."
 msgstr "Ställer in umaskvärdet på processen innan den startas."
 
 #. type: TP
-#: start-stop-daemon.8:237
+#: start-stop-daemon.8:240
 #, no-wrap
 msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-m>, B<--make-pidfile>"
 
 #. type: Plain text
-#: start-stop-daemon.8:252
+#: start-stop-daemon.8:255
 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<--"
@@ -16676,38 +17177,83 @@
 "programmet som startas förgrenar sig (fork) från sin huvudprocess. Därför är "
 "flaggan oftast bara användbar i samband med flaggan B<--background>."
 
+#. type: Plain text
+#: start-stop-daemon.8:258
+msgid "Print verbose informational messages."
+msgstr "Skriv ut pratsamma informationsmeddelanden."
+
+#. type: Plain text
+#: start-stop-daemon.8:270
+msgid ""
+"The requested action was performed. If B<--oknodo> was specified, it's also "
+"possible that nothing had to be done.  This can happen when B<--start> was "
+"specified and a matching process was already running, or when B<--stop> was "
+"specified and there were no matching processes."
+msgstr ""
+"Efterfrågad åtgärd utfördes. Om B<--oknodo> angavs är det även möjligt att "
+"ingenting behövde utföras. Det kan hända när B<--start> angavs och en "
+"motsvarande process redan körde, eller när B<--stop> angavs och det inte "
+"fanns någon motsvarande process."
+
+#. type: Plain text
+#: start-stop-daemon.8:275
+msgid "If B<--oknodo> was not specified and nothing was done."
+msgstr "Om B<--oknodo> inte angavs och ingenting gjordes."
+
+#. type: Plain text
+#: start-stop-daemon.8:283
+msgid ""
+"If B<--stop> and B<--retry> were specified, but the end of the schedule was "
+"reached and the processes were still running."
+msgstr ""
+"Om B<--stop> och B<--retry> angavs, men slutet på tidtabellen nåddes och "
+"processen fortfarande kördes."
+
 #. type: TP
-#: start-stop-daemon.8:252
+#: start-stop-daemon.8:283 start-stop-daemon.8:295
 #, no-wrap
-msgid "B<-v>, B<--verbose>"
-msgstr "B<-v>, B<--verbose>"
+msgid "B<3>"
+msgstr "B<3>"
 
 #. type: Plain text
-#: start-stop-daemon.8:255
-msgid "Print verbose informational messages."
-msgstr "Skriv ut pratsamma informationsmeddelanden."
+#: start-stop-daemon.8:286
+msgid "Any other error."
+msgstr "Alla andra fel."
 
 #. type: Plain text
-#: start-stop-daemon.8:272
+#: start-stop-daemon.8:289
 msgid ""
-"B<start-stop-daemon> returns 0 if the requested action was performed, or if "
-"B<--oknodo> is specified and either B<--start> was specified and a matching "
-"process was already running, or B<--stop> was specified and there were no "
-"matching processes. If B<--oknodo> was not specified and nothing was done, 1 "
-"is returned. If B<--stop> and B<--retry> were specified, but the end of the "
-"schedule was reached and the processes were still running, the error value "
-"is 2. For all other errors, the status is 3."
-msgstr ""
-"B<start-stop-deamon> returnerar 0 om kommandot som önskades utfördes, eller "
-"om B<--oknodo> angavs och antingen om B<--start> angavs och motsvarande "
-"process redan kördes, eller om B<--stop> angavs och ingen motsvarande "
-"process hittades. Om B<--oknodo> inte angavs och ingenting utfördes kommer 1 "
-"att returneras. Om B<--stop> och B<--retry> angavs men slutet på schemat "
-"nåddes och processer fortfarande kördes är felkoden 2. För alla andra fel är "
-"statusen 3."
+"When using the B<--status> command, the following status codes are returned:"
+msgstr "Med B<--status>-åtgärden returneras följande statuskoder:"
+
+#. type: Plain text
+#: start-stop-daemon.8:292
+msgid "Program is running."
+msgstr "Programmet kör."
+
+#. type: Plain text
+#: start-stop-daemon.8:295
+msgid "Program is not running and the pid file exists."
+msgstr "Programmet kör inte och pid-filen finns."
+
+#. type: Plain text
+#: start-stop-daemon.8:298
+msgid "Program is not running."
+msgstr "Programmet kör inte."
+
+#. type: TP
+#: start-stop-daemon.8:298
+#, no-wrap
+msgid "B<4>"
+msgstr "B<4>"
 
 #. type: Plain text
-#: start-stop-daemon.8:276
+#: start-stop-daemon.8:301
+msgid "Unable to determine program status."
+msgstr "Kan inte ta reda på programmets status."
+
+#. type: Plain text
+#: start-stop-daemon.8:305
 msgid ""
 "Start the B<food> daemon, unless one is already running (a process named "
 "food, running as user food, with pid in food.pid):"
@@ -16716,37 +17262,37 @@
 "namnet food, som körs som användaren food, med process-id i food.pid):"
 
 #. type: Plain text
-#: start-stop-daemon.8:279
+#: start-stop-daemon.8:308
 #, no-wrap
 msgid "start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon\n"
 msgstr "start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:282
+#: start-stop-daemon.8:311
 msgid "Send B<SIGTERM> to B<food> and wait up to 5 seconds for it to stop:"
 msgstr ""
 "Sänd B<SIGTERM> till B<food> och vänta upp till fem sekunder på att den "
 "skall avslutas:"
 
 #. type: Plain text
-#: start-stop-daemon.8:285
+#: start-stop-daemon.8:314
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5\n"
 msgstr "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:288
+#: start-stop-daemon.8:317
 msgid "Demonstration of a custom schedule for stopping B<food>:"
 msgstr "Demonstration av ett skräddarsytt schema för att avsluta B<food>:"
 
 #. type: Plain text
-#: start-stop-daemon.8:291
+#: start-stop-daemon.8:320
 #, no-wrap
 msgid "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5\n"
 msgstr "start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5\n"
 
 #. type: Plain text
-#: start-stop-daemon.8:297
+#: start-stop-daemon.8:326
 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>."
@@ -16755,7 +17301,7 @@
 "en tidigare version av Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 
 #. type: Plain text
-#: start-stop-daemon.8:299
+#: start-stop-daemon.8:328
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -16778,12 +17324,12 @@
 "standardkommandon"
 
 #. type: Plain text
-#: update-alternatives.8:16
-msgid "B<update-alternatives> [I<options>] I<command>"
-msgstr "B<update-alternatives> [I<flaggor>] I<åtgärd>"
+#: update-alternatives.8:15
+msgid "B<update-alternatives> [I<option>...] I<command>"
+msgstr "B<update-alternatives> [I<flagga>...] I<åtgärd>"
 
 #. type: Plain text
-#: update-alternatives.8:21
+#: update-alternatives.8:20
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
@@ -16792,7 +17338,7 @@
 "om de symboliska länkar som ingår i Debians alternativsystem."
 
 #. type: Plain text
-#: update-alternatives.8:29
+#: update-alternatives.8:28
 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 "
@@ -16810,7 +17356,7 @@
 "användare inte har gjort ett specifikt val."
 
 #. type: Plain text
-#: update-alternatives.8:51
+#: update-alternatives.8:50
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -16835,7 +17381,7 @@
 "göra det."
 
 #. type: Plain text
-#: update-alternatives.8:61
+#: update-alternatives.8:60
 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> "
@@ -16852,7 +17398,7 @@
 "detta är Bra."
 
 #. type: Plain text
-#: update-alternatives.8:73
+#: update-alternatives.8:72
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -16867,7 +17413,7 @@
 "(install) i Debianpaket."
 
 #. type: Plain text
-#: update-alternatives.8:92
+#: update-alternatives.8:91
 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>"
@@ -16886,7 +17432,7 @@
 "huvudlänk och dess anslutna slavar utgör en I<länkgrupp>."
 
 #. type: Plain text
-#: update-alternatives.8:101
+#: 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 "
@@ -16903,7 +17449,7 @@
 "länkarna (förutom om något är trasigt)."
 
 #. type: Plain text
-#: update-alternatives.8:110
+#: 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 "
@@ -16918,7 +17464,7 @@
 "manuellt läge."
 
 #. type: Plain text
-#: update-alternatives.8:117
+#: 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 "
@@ -16929,35 +17475,35 @@
 "vara den med den högsta prioriteten."
 
 #. type: Plain text
-#: update-alternatives.8:134
+#: update-alternatives.8:133
 msgid ""
-"When using the I<--config> option, B<update-alternatives> will list all of "
+"When using the B<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master "
 "alternative name. The current choice is marked with a '*'.  You will then be "
 "prompted for your choice regarding this link group.  Depending on the choice "
 "made, the link group might no longer be in I<auto> mode. You will need to "
-"use the I<--auto> option in order to return to the automatic mode (or you "
-"can rerun I<--config> and select the entry marked as automatic)."
+"use the B<--auto> option in order to return to the automatic mode (or you "
+"can rerun B<--config> and select the entry marked as automatic)."
 msgstr ""
 "När flaggan I<--config> används kommer B<update-alternatives> att visa alla "
 "val för länkgruppen där I<namn> är huvudalternativnamnet. Det aktuella valet "
 "är markerat med en \"*\". Du kommer därefter att få välja vad som skall "
 "göras med länkgruppen. Beroende på vad du väljer kommer längruppen inte "
-"längre att vara i I<auto>-läge. Du måste använda flaggan I<--auto> för att "
-"återgå till automatiskt läge (eller köra I<--config> på nytt och välja "
+"längre att vara i I<auto>-läge. Du måste använda flaggan B<--auto> för att "
+"återgå till automatiskt läge (eller köra B<--config> på nytt och välja "
 "alternativet som märkts som automatiskt)."
 
 #. type: Plain text
-#: update-alternatives.8:138
+#: update-alternatives.8:137
 msgid ""
-"If you want to configure non-interactively you can use the I<--set> option "
+"If you want to configure non-interactively you can use the B<--set> option "
 "instead (see below)."
 msgstr ""
-"Om du vill konfigurera icke-interaktivt kan du använda flaggan I<--set> i "
+"Om du vill konfigurera icke-interaktivt kan du använda flaggan B<--set> i "
 "stället (se nedan)."
 
 #. type: Plain text
-#: update-alternatives.8:149
+#: update-alternatives.8:148
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "In other words, the usage of B<update-alternatives> is B<mandatory> for all "
@@ -16970,13 +17516,13 @@
 "paket som inte använder B<update-alternatives>-mekanismen."
 
 #. type: SH
-#: update-alternatives.8:150
+#: update-alternatives.8:149
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr "TERMINOLOGI"
 
 #. type: Plain text
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
@@ -16985,13 +17531,13 @@
 "att förstå hur det fungerar genom att vi förklarar några specifika termer."
 
 #. type: TP
-#: update-alternatives.8:155
+#: update-alternatives.8:154
 #, no-wrap
 msgid "generic name (or alternative link)"
 msgstr "generiskt namn (eller alternativlänk)."
 
 #. type: Plain text
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
 "to one of a number of files of similar function."
@@ -17000,24 +17546,24 @@
 "på en av flera filer med liknande funktionalitet."
 
 #. type: TP
-#: update-alternatives.8:161
+#: update-alternatives.8:160
 #, no-wrap
 msgid "alternative name"
 msgstr "alternativnamn"
 
 #. type: Plain text
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 msgid "The name of a symbolic link in the alternatives directory."
 msgstr "Namnet på en symbolisk länk i alternativkatalogen."
 
 #. type: TP
-#: update-alternatives.8:164
+#: update-alternatives.8:163
 #, no-wrap
 msgid "alternative (or alternative path)"
 msgstr "alternativ (eller alternativsökväg)"
 
 #. type: Plain text
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 msgid ""
 "The name of a specific file in the filesystem, which may be made accessible "
 "via a generic name using the alternatives system."
@@ -17026,26 +17572,26 @@
 "generiskt namn med hjälp av alternativsystemet."
 
 #. type: TP
-#: update-alternatives.8:168
+#: update-alternatives.8:167
 #, no-wrap
 msgid "alternatives directory"
 msgstr "alternativkatalog"
 
 #. type: Plain text
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr ""
 "En katalog, som standard I</etc/alternatives>, som innehåller de symboliska "
 "länkarna."
 
 #. type: TP
-#: update-alternatives.8:173
+#: update-alternatives.8:172
 #, no-wrap
 msgid "administrative directory"
 msgstr "administrativ katalog"
 
 #. type: Plain text
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
 "alternatives>' state information."
@@ -17054,26 +17600,26 @@
 "tillståndsinformation för B<update-alternatives>."
 
 #. type: TP
-#: update-alternatives.8:180
+#: update-alternatives.8:179
 #, no-wrap
 msgid "link group"
 msgstr "länkgrupp"
 
 #. type: Plain text
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr ""
 "En uppsättning relaterade symboliska länkar, avsedda att uppdateras som en "
 "grupp."
 
 #. type: TP
-#: update-alternatives.8:183
+#: update-alternatives.8:182
 #, no-wrap
 msgid "master link"
 msgstr "huvudlänk"
 
 #. type: Plain text
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 msgid ""
 "The alternative link in a link group which determines how the other links in "
 "the group are configured."
@@ -17082,13 +17628,13 @@
 "gruppen ställs in."
 
 #. type: TP
-#: update-alternatives.8:187
+#: update-alternatives.8:186
 #, no-wrap
 msgid "slave link"
 msgstr "slavlänk"
 
 #. type: Plain text
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 msgid ""
 "An alternative link in a link group which is controlled by the setting of "
 "the master link."
@@ -17096,13 +17642,13 @@
 "En alternativlänk i en länkgrupp som styrs av hur huvudlänken ställs in."
 
 #. type: TP
-#: update-alternatives.8:191
+#: update-alternatives.8:190
 #, no-wrap
 msgid "automatic mode"
 msgstr "automatiskt läge"
 
 #. type: Plain text
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 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 "
@@ -17113,13 +17659,13 @@
 "lämpligt för gruppen."
 
 #. type: TP
-#: update-alternatives.8:197
+#: update-alternatives.8:196
 #, no-wrap
 msgid "manual mode"
 msgstr "manuellt läge"
 
 #. type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:201
 msgid ""
 "When a link group is in manual mode, the alternatives system will not make "
 "any changes to the system administrator's settings."
@@ -17128,13 +17674,13 @@
 "några ändringar till systemadministratörens inställningar."
 
 #. type: TP
-#: update-alternatives.8:204
+#: update-alternatives.8:203
 #, no-wrap
 msgid "B<--install> I<link name path priority> [B<--slave> I<link name path>]..."
 msgstr "B<--install> I<länk namn sökväg prioritet> [B<--slave> I<länk namn sökväg>]..."
 
 #. type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:222
 msgid ""
 "Add a group of alternatives to the system.  I<link> is the generic name for "
 "the master link, I<name> is the name of its symlink in the alternatives "
@@ -17160,7 +17706,7 @@
 "installeras behålls den såvida inte B<--force> används."
 
 #. type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 msgid ""
 "If the alternative name specified exists already in the alternatives "
 "system's records, the information supplied will be added as a new set of "
@@ -17179,28 +17725,28 @@
 "uppdateras så att de pekar på de nyligen tillagda alternativen."
 
 #. type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:233
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr "B<--set> I<namn sökväg>"
 
 #. type: Plain text
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
-"I<--config> but is non-interactive and thus scriptable."
+"B<--config> but is non-interactive and thus scriptable."
 msgstr ""
 "Sätt programmet I<sökväg> som ett alternativ till I<namn>. Detta motsvarar "
-"I<--config> men är icke-interaktivt och kan därmed användas i ett skript."
+"B<--config> men är icke-interaktivt och kan därmed användas i ett skript."
 
 #. type: TP
-#: update-alternatives.8:243
+#: update-alternatives.8:242
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr "B<--remove> I<namn sökväg>"
 
 #. type: Plain text
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 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 "
@@ -17222,13 +17768,13 @@
 "alternativet tas bort."
 
 #. type: TP
-#: update-alternatives.8:264
+#: update-alternatives.8:263
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr "B<--remove-all> I<namn>"
 
 #. type: Plain text
-#: update-alternatives.8:269
+#: update-alternatives.8:268
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
@@ -17237,7 +17783,7 @@
 "namn i alternativkatalogen."
 
 #. type: Plain text
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 msgid ""
 "Call B<--config> on all alternatives. It can be usefully combined with B<--"
 "skip-auto> to review and configure all alternatives which are not configured "
@@ -17252,13 +17798,13 @@
 "update-alternatives --force --all>."
 
 #. type: TP
-#: update-alternatives.8:276
+#: update-alternatives.8:275
 #, no-wrap
 msgid "B<--auto> I<name>"
 msgstr "B<--auto> I<namn>"
 
 #. type: Plain text
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 msgid ""
 "Switch the link group behind the alternative for I<name> to automatic mode.  "
 "In the process, the master symlink and its slaves are updated to point to "
@@ -17269,13 +17815,13 @@
 "uppdateras till att peka på det högst prioriterade installerade alternativet."
 
 #. type: TP
-#: update-alternatives.8:283
+#: update-alternatives.8:282
 #, no-wrap
 msgid "B<--display> I<name>"
 msgstr "B<--display> I<namn>"
 
 #. type: Plain text
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 msgid ""
 "Display information about the link group.  Information displayed includes "
 "the group's mode (auto or manual), which alternative the master link "
@@ -17290,13 +17836,13 @@
 "närvarande är installerat."
 
 #. type: TP
-#: update-alternatives.8:292
+#: update-alternatives.8:291
 #, no-wrap
 msgid "B<--get-selections>"
 msgstr "B<--get-selections>"
 
 #. type: Plain text
-#: update-alternatives.8:300
+#: update-alternatives.8:299
 msgid ""
 "List all master alternative names (those controlling a link group)  and "
 "their status. Each line contains up to 3 fields (separated by one or more "
@@ -17313,7 +17859,7 @@
 "därmed innehålla blanksteg)."
 
 #. type: Plain text
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 msgid ""
 "Read configuration of alternatives on standard input in the format generated "
 "by B<update-alternatives --get-selections> and reconfigure them accordingly."
@@ -17323,13 +17869,13 @@
 "motsvarande sätt."
 
 #. type: TP
-#: update-alternatives.8:305
+#: update-alternatives.8:304
 #, no-wrap
 msgid "B<--query> I<name>"
 msgstr "B<--query> I<namn>"
 
 #. type: Plain text
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 msgid ""
 "Display information about the link group like --display does, but in a "
 "machine parseable way (see section B<QUERY FORMAT> below)."
@@ -17338,24 +17884,24 @@
 "maskintolkbart sätt (se stycket B<FRÅGEFORMAT> nedan)."
 
 #. type: TP
-#: update-alternatives.8:310
+#: update-alternatives.8:309
 #, no-wrap
 msgid "B<--list> I<name>"
 msgstr "B<--list> I<namn>"
 
 #. type: Plain text
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 msgid "Display all targets of the link group."
 msgstr "Visar alla mål för länkgruppen."
 
 #. type: TP
-#: update-alternatives.8:313
+#: update-alternatives.8:312
 #, no-wrap
 msgid "B<--config> I<name>"
 msgstr "B<--config> I<namn>"
 
 #. type: Plain text
-#: update-alternatives.8:317
+#: update-alternatives.8:316
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated."
@@ -17364,20 +17910,20 @@
 "interaktivt välja vilken som skall användas. Länkgruppen uppdateras."
 
 #. type: TP
-#: update-alternatives.8:325
+#: update-alternatives.8:324
 #, no-wrap
 msgid "B<--altdir>I< directory>"
 msgstr "B<--altdir>I< katalog>"
 
 #. type: Plain text
-#: update-alternatives.8:329
+#: update-alternatives.8:328
 msgid ""
 "Specifies the alternatives directory, when this is to be different from the "
 "default."
 msgstr "Anger alternativkatalogen om detta inte skall vara standardvärdet."
 
 #. type: Plain text
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 msgid ""
 "Specifies the administrative directory, when this is to be different from "
 "the default."
@@ -17385,13 +17931,13 @@
 "Anger den administrativa katalogen om detta inte skall vara standardvärdet."
 
 #. type: TP
-#: update-alternatives.8:333
+#: update-alternatives.8:332
 #, no-wrap
 msgid "B<--log>I< file>"
 msgstr "B<--log> I<fil>"
 
 #. type: Plain text
-#: update-alternatives.8:337
+#: update-alternatives.8:336
 msgid ""
 "Specifies the log file, when this is to be different from the default (/var/"
 "log/alternatives.log)."
@@ -17400,22 +17946,22 @@
 "alternatives.log)."
 
 #. type: Plain text
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 msgid ""
-"Let B<update-alternatives> replace any real file that is installed where an "
-"alternative link has to be installed."
+"Let B<update-alternatives> replace or drop any real file that is installed "
+"where an alternative link has to be installed or removed."
 msgstr ""
-"Låt B<update-alternatives> ersätta en verklig fil som installerats där en "
-"alternativlänk måste installeras."
+"Låt B<update-alternatives> ersätta eller ta bort en verklig fil som "
+"installerats där en alternativlänk måste installeras eller tas bort."
 
 #. type: TP
-#: update-alternatives.8:341
+#: update-alternatives.8:340
 #, no-wrap
 msgid "B<--skip-auto>"
 msgstr "B<--skip-auto>"
 
 #. type: Plain text
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 msgid ""
 "Skip configuration prompt for alternatives which are properly configured in "
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
@@ -17425,36 +17971,38 @@
 "all>."
 
 #. type: TP
-#: update-alternatives.8:346
+#: update-alternatives.8:345
 #, no-wrap
 msgid "B<--verbose>"
 msgstr "B<--verbose>"
 
 #. type: Plain text
-#: update-alternatives.8:351
+#: update-alternatives.8:350
 msgid "Generate more comments about what B<update-alternatives> is doing."
 msgstr "Visa fler kommentarer om vad B<update-alternatives> gör."
 
 #. type: Plain text
-#: update-alternatives.8:354
+#: update-alternatives.8:353
 msgid "Don't generate any comments unless errors occur."
 msgstr "Skriv inte några kommentarer såvida det inte uppstår ett fel."
 
 #. type: Plain text
-#: update-alternatives.8:360
+#: update-alternatives.8:359
 msgid ""
 "If set and the B<--admindir> option has not been specified, it will be used "
 "as the base administrative directory."
 msgstr ""
+"Om satt och flaggan B<--admindir> inte har angivits används det som bas-"
+"administrativ katalog."
 
 #. type: TP
-#: update-alternatives.8:362
+#: update-alternatives.8:361
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr "I</etc/alternatives/>"
 
 #. type: Plain text
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
@@ -17462,13 +18010,13 @@
 "Den förvalda alternativkatalogen. Kan överstyras med flaggan B<--altdir>."
 
 #. type: TP
-#: update-alternatives.8:368
+#: update-alternatives.8:367
 #, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "I</var/lib/dpkg/alternatives/>"
 
 #. type: Plain text
-#: update-alternatives.8:374
+#: update-alternatives.8:373
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
@@ -17481,14 +18029,8 @@
 msgid "The requested action was successfully performed."
 msgstr "Den önskade funktionen utfördes utan fel."
 
-#. type: IP
-#: update-alternatives.8:378
-#, no-wrap
-msgid "2"
-msgstr "2"
-
 #. type: Plain text
-#: update-alternatives.8:381
+#: update-alternatives.8:382
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
@@ -17497,54 +18039,54 @@
 "utföras."
 
 #. type: SH
-#: update-alternatives.8:382
+#: update-alternatives.8:383
 #, no-wrap
 msgid "QUERY FORMAT"
 msgstr "FRÅGEFORMAT"
 
 #. type: Plain text
-#: update-alternatives.8:387
+#: update-alternatives.8:388
 msgid ""
-"The B<update-alternatives> I<--query> format is using an RFC822-like flat "
+"The B<update-alternatives --query> format is using an RFC822-like flat "
 "format. It's made of I<n> + 1 blocks where I<n> is the number of "
 "alternatives available in the queried link group. The first block contains "
 "the following fields:"
 msgstr ""
-"Formatet för B<update-alternatives> I<--query> använder ett RFC822-liknande "
+"Formatet för B<update-alternatives --query> använder ett RFC822-liknande "
 "platt format. Det består av I<n> + 1 block där I<n> är antalet tillgängliga "
 "alternativ i den efterfrågade länkgruppen. Det första blocket innehåller "
 "följande fält:"
 
 #. type: TP
-#: update-alternatives.8:387
+#: update-alternatives.8:388
 #, no-wrap
-msgid "B<Link:> E<lt>linkE<gt>"
-msgstr "B<Link:> E<lt>länkE<gt>"
+msgid "B<Link:>I< link>"
+msgstr "B<Link:>I< länk>"
 
 #. type: Plain text
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 msgid "The generic name of the alternative."
 msgstr "Generiskt namn för alternativet."
 
 #. type: TP
-#: update-alternatives.8:390
+#: update-alternatives.8:391
 #, no-wrap
-msgid "B<Status:> E<lt>statusE<gt>"
-msgstr "B<Status:> E<lt>statusE<gt>"
+msgid "B<Status:>I< status>"
+msgstr "B<Status:>I< status>"
 
 #. type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 msgid "The status of the alternative (B<auto> or B<manual>)."
 msgstr "Status för alternativet (B<auto> eller B<manual>)."
 
 #. type: TP
-#: update-alternatives.8:393
+#: update-alternatives.8:394
 #, no-wrap
-msgid "B<Best:> E<lt>best choiceE<gt>"
-msgstr "B<Best:> E<lt>bästa valE<gt>"
+msgid "B<Best:>I< best-choice>"
+msgstr "B<Best:>I< bästa-val>"
 
 #. type: Plain text
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 msgid ""
 "The path of the best alternative for this link group. Not present if there "
 "is no alternatives available."
@@ -17553,13 +18095,13 @@
 "alternativ är tillgängligt."
 
 #. type: TP
-#: update-alternatives.8:397
+#: update-alternatives.8:398
 #, no-wrap
-msgid "B<Value:> E<lt>currently selected alternativeE<gt> "
-msgstr "B<Value:> E<lt>för närvarande valt alternativE<gt> "
+msgid "B<Value:>I< currently-selected-alternative>"
+msgstr "B<Value:>I< för-närvarande-valt-alternativ>"
 
 #. type: Plain text
-#: update-alternatives.8:401
+#: update-alternatives.8:402
 msgid ""
 "The path of the currently selected alternative. It can also take the magic "
 "value B<none>. It is used if the link doesn't exist."
@@ -17568,41 +18110,41 @@
 "värdet B<none> (inget). Det används om det inte finns någon länk."
 
 #. type: TP
-#: update-alternatives.8:402
+#: update-alternatives.8:403
 #, no-wrap
 msgid "The other blocks describe the available alternatives in the queried link group:"
 msgstr "Övriga block beskriver tillgängliga alternativ i den efterfrågade länkgruppen:"
 
 #. type: TP
-#: update-alternatives.8:404
+#: update-alternatives.8:405
 #, no-wrap
-msgid "B<Alternative:> E<lt>path of this alternativeE<gt>"
-msgstr "B<Alternative:> E<lt>sökväg till alternativetE<gt>"
+msgid "B<Alternative:>I< path-of-this-alternative>"
+msgstr "B<Alternative:>I< sökväg-till-alternativet>"
 
 #. type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 msgid "Path to this block's alternative."
 msgstr "Sökväg till alternativet som beskrivs i blocket."
 
 #. type: TP
-#: update-alternatives.8:407
+#: update-alternatives.8:408
 #, no-wrap
-msgid "B<Priority:> E<lt>priority valueE<gt>"
-msgstr "B<Priority:> E<lt>prioritetsvärdeE<gt>"
+msgid "B<Priority:>I< priority-value>"
+msgstr "B<Priority:>I< prioritetsvärde>"
 
 #. type: Plain text
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 msgid "Value of the priority of this alternative."
 msgstr "Värdet för prioriteten på alternativet."
 
 #. type: TP
-#: update-alternatives.8:410
+#: update-alternatives.8:411
 #, no-wrap
-msgid "B<Slaves:> E<lt>list of slavesE<gt>"
-msgstr "B<Slaves:> E<lt>lista över slavarE<gt>"
+msgid "B<Slaves:>I< list-of-slaves>"
+msgstr "B<Slaves:>I< lista-över-slavar>"
 
 #. type: Plain text
-#: update-alternatives.8:416
+#: update-alternatives.8:417
 msgid ""
 "When this header is present, the B<next> lines hold all slave alternatives "
 "associated to the master link of the alternative. There is one slave per "
@@ -17616,13 +18158,13 @@
 "slavalternativet."
 
 #. type: TP
-#: update-alternatives.8:417
+#: update-alternatives.8:418
 #, no-wrap
 msgid "B<Example>"
 msgstr "B<Exempel>"
 
 #. type: Plain text
-#: update-alternatives.8:425
+#: update-alternatives.8:426
 #, no-wrap
 msgid ""
 "$ update-alternatives --query editor\n"
@@ -17638,7 +18180,7 @@
 "Value: /usr/bin/vim.gtk\n"
 
 #. type: Plain text
-#: update-alternatives.8:430
+#: update-alternatives.8:431
 #, no-wrap
 msgid ""
 "Alternative: /bin/ed\n"
@@ -17652,7 +18194,7 @@
 " editor.1.gz /usr/share/man/man1/ed.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:446
 #, no-wrap
 msgid ""
 "Alternative: /usr/bin/vim.gtk\n"
@@ -17686,22 +18228,22 @@
 " editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
 
 #. type: Plain text
-#: update-alternatives.8:457
+#: update-alternatives.8:458
 msgid ""
-"With I<--verbose> B<update-alternatives> chatters incessantly about its "
+"With B<--verbose> 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 ""
-"Med I<--verbose> kommer B<update-alternatives> att beskriva i det oändliga "
+"Med B<--verbose> kommer B<update-alternatives> att beskriva i det oändliga "
 "vad det gör på sin standard ut-kanal. Om ett fel uppstår skriver B<update-"
 "alternatives> ut felmeddelanden på sin standard fel-kanal och avslutar med "
 "felkoden 2. Diagnostikinformationen bör vara självförklarande, sänd in en "
 "felrapport om du inte tycker att den är det."
 
 #. type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:464
 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 "
@@ -17714,21 +18256,21 @@
 "manualsida."
 
 #. type: Plain text
-#: update-alternatives.8:466
+#: update-alternatives.8:467
 msgid ""
 "To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
+"setting for it, use the B<--display> action:"
 msgstr ""
 "För att visa vilka tillgängliga paket som tillhandahåller B<vi>, samt dess "
-"aktuella inställning, använd kommandot I<--display>:"
+"aktuella inställning, använd kommandot B<--display>:"
 
 #. type: Plain text
-#: update-alternatives.8:469
+#: update-alternatives.8:470
 msgid "B<update-alternatives --display vi>"
 msgstr "B<update-alternatives --display vi>"
 
 #. type: Plain text
-#: update-alternatives.8:473
+#: update-alternatives.8:474
 msgid ""
 "To choose a particular B<vi> implementation, use this command as root and "
 "then select a number from the list:"
@@ -17737,12 +18279,12 @@
 "root och välj sedan ett tal från listan:"
 
 #. type: Plain text
-#: update-alternatives.8:476
+#: update-alternatives.8:477
 msgid "B<update-alternatives --config vi>"
 msgstr "B<update-alternatives --config vi>"
 
 #. type: Plain text
-#: update-alternatives.8:480
+#: update-alternatives.8:481
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
@@ -17751,12 +18293,12 @@
 "detta som root:"
 
 #. type: Plain text
-#: update-alternatives.8:483
+#: update-alternatives.8:484
 msgid "B<update-alternatives --auto vi>"
 msgstr "B<update-alternatives --auto vi>"
 
 #. type: Plain text
-#: update-alternatives.8:487
+#: update-alternatives.8:488
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system."
 msgstr ""
@@ -17764,7 +18306,7 @@
 "felrapporteringssystem."
 
 #. type: Plain text
-#: update-alternatives.8:492
+#: update-alternatives.8:493
 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 "
@@ -17775,7 +18317,7 @@
 "eller i dokumentationen; rapportera det."
 
 #. type: Plain text
-#: update-alternatives.8:503
+#: update-alternatives.8:504
 msgid ""
 "This manual page is copyright 1997,1998 Charles Briscoe-Smith and others."
 msgstr ""
@@ -17783,7 +18325,7 @@
 "flera."
 
 #. type: Plain text
-#: update-alternatives.8:506
+#: update-alternatives.8:507
 msgid ""
 "This is free documentation; see the GNU General Public Licence version 2 or "
 "later for copying conditions. There is NO WARRANTY."
@@ -17792,10 +18334,237 @@
 "senare för kopieringsvillkor. Det finns INGEN GARANTI."
 
 #. type: Plain text
-#: update-alternatives.8:509
+#: update-alternatives.8:510
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, Filesystem Hierarchy Standard."
 
+#~ msgid "2009-02-27"
+#~ msgstr "2009-02-27"
+
+#~ msgid "2011-04-29"
+#~ msgstr "2011-04-29"
+
+#~ msgid "2006-02-28"
+#~ msgstr "2006-02-28"
+
+#~ msgid "2007-03-07"
+#~ msgstr "2007-03-07"
+
+#~ msgid "2007-07-16"
+#~ msgstr "2007-07-16"
+
+#~ msgid "2009-03-15"
+#~ msgstr "2009-03-15"
+
+#~ msgid "2011-04-27"
+#~ msgstr "2011-04-27"
+
+#~ msgid "2011-07-07"
+#~ msgstr "2011-07-07"
+
+#~ msgid "2010-04-18"
+#~ msgstr "2010-04-18"
+
+#~ msgid "2011-07-12"
+#~ msgstr "2011-07-12"
+
+#, fuzzy
+#~| msgid "User configuration file."
+#~ msgid "Package maintainer configuration file."
+#~ msgstr "Användarens konfigurationsfil."
+
+#~ msgid "2010-07-29"
+#~ msgstr "2010-07-29"
+
+#~ msgid "B<Package:> E<lt>package nameE<gt>"
+#~ msgstr "B<Package:> E<lt>paketnamnE<gt>"
+
+#, fuzzy
+#~| msgid "2007-11-22"
+#~ msgid "2010-11-22"
+#~ msgstr "2007-11-22"
+
+#, fuzzy
+#~| msgid "B<Source:> E<lt>source nameE<gt>"
+#~ msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
+#~ msgstr "B<Source:> E<lt>källkodsnamnE<gt>"
+
+#~ msgid "2010-01-28"
+#~ msgstr "2010-01-28"
+
+#~ msgid ""
+#~ "The first member is named B<debian-split> and contains a series of lines, "
+#~ "separated by newlines. Currently seven lines are present.  The first is "
+#~ "the format version number, B<2.1> at the time this manual page was "
+#~ "written. The second is the package name. The third is the package "
+#~ "version. The fourth is the md5sum of the package.  The fifth is the total "
+#~ "size of the package. The sixth is the maximum part size. The seventh is "
+#~ "the current part number, followed by a slash and the total amount of "
+#~ "parts (as in \\(oq1/10\\(cq)."
+#~ msgstr ""
+#~ "Den första posten i arkivet heter B<debian-split> och innehåller ett "
+#~ "antal rader, avdelade med nyradstecken. För närvarande finns det sju "
+#~ "rader. Den första raden är formatets versionsnummer, B<2.1> då "
+#~ "manualsidan skrevs. Den andra raden är paketnamnet. Den tredje är "
+#~ "paketversionen. Den fjärde är md5summan för paketet. Den femte är "
+#~ "paketets totala storlek. Den sjätte är maximal storlek på delarna. Den "
+#~ "sjunde är numret på den aktuella delen, följd av ett snedstreck och det "
+#~ "totala antalet delar (som i \\(oq1/10\\(cq)."
+
+#~ msgid "2008-08-18"
+#~ msgstr "2008-08-18"
+
+#~ msgid ""
+#~ "B<dpkg> can 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>(1). 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 parametrar som angivits:"
+
+#~ 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"
+
+#~ 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."
+
+#~ msgid "B<--new>, B<--old>"
+#~ msgstr "B<--new>, B<--old>"
+
+#~ msgid ""
+#~ "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
+#~ msgstr ""
+#~ "Välj det nya eller gamla binärpaketformatet. Detta är en flagga till "
+#~ "B<dpkg-deb>(1)."
+
+#~ msgid ""
+#~ "Don't read or check contents of control file while building a package.  "
+#~ "This is a B<dpkg-deb>(1) option."
+#~ msgstr ""
+#~ "Varken läs eller kontrollera innehållet i control-filen när paket skapas. "
+#~ "Detta är en flagga till B<dpkg-deb>(1)."
+
+#~ msgid "2009-08-15"
+#~ msgstr "2009-08-15"
+
+#~ msgid "Compiler flags"
+#~ msgstr "Kompileringsflaggor"
+
+#~ msgid ""
+#~ "The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
+#~ "environment variables are set to the values that B<dpkg-buildflags> "
+#~ "returned. See its manual page for more information."
+#~ msgstr ""
+#~ "Miljövariablerna B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> och "
+#~ "B<LDFLAGS> sätts till de värden som B<dpkg-buildflags> returnerar. Se "
+#~ "dess manualsida för ytterligare information."
+
+#~ msgid "2009-11-21"
+#~ msgstr "2009-11-21"
+
+#~ msgid "2010-03-07"
+#~ msgstr "2010-03-07"
+
+#, fuzzy
+#~| msgid "2010-10-10"
+#~ msgid "2010-10-12"
+#~ msgstr "2010-10-10"
+
+#~ msgid "2009-08-07"
+#~ msgstr "2009-08-07"
+
+#~ msgid "2010-04-16"
+#~ msgstr "2010-04-16"
+
+#~ msgid "2009-05-19"
+#~ msgstr "2009-05-19"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2009-10-01"
+#~ msgstr "2009-10-01"
+
+#~ msgid "2009-06-26"
+#~ msgstr "2009-06-26"
+
+#~ msgid ""
+#~ "B<dpkg-split> uses some rather out-of-date conventions for the the "
+#~ "filenames of Debian packages."
+#~ msgstr ""
+#~ "B<dpkg-split> använder några ganska gamla konventioner för filnamn på "
+#~ "Debianpaket."
+
+#~ 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 ""
+#~ "Arkitekturen anges inte i delfilernas filhuvud, bara i "
+#~ "kontrollinformationen i paketfilen som delarna innehåller, och den "
+#~ "förekommer inte i de filnamn som genereras."
+
+#~ msgid "2009-05-10"
+#~ msgstr "2009-05-10"
+
+#~ msgid ""
+#~ "B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--"
+#~ "version>] [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 ""
+#~ "B<dselect> [B<--admindir> I<E<lt>katalogE<gt>>] [B<--help>] [B<--"
+#~ "version>] [B<--expert>] [B<--debug>|B<-D>I<E<lt>filE<gt>>] "
+#~ "[I<E<lt>handlingE<gt>>] [B<--colour>|B<--color> I<skärmdel>:[I<förgrund>],"
+#~ "[I<bakgrund>][I<:attr>[I<+attr+..>]]]"
+
+#~ msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+#~ msgstr "B<--admindir>I< E<lt>katalogE<gt>>"
+
+#~ msgid "USAGE"
+#~ msgstr "ANVÄNDNING"
+
+#~ msgid ""
+#~ "B<start-stop-daemon> returns 0 if the requested action was performed, or "
+#~ "if B<--oknodo> is specified and either B<--start> was specified and a "
+#~ "matching process was already running, or B<--stop> was specified and "
+#~ "there were no matching processes. If B<--oknodo> was not specified and "
+#~ "nothing was done, 1 is returned. If B<--stop> and B<--retry> were "
+#~ "specified, but the end of the schedule was reached and the processes were "
+#~ "still running, the error value is 2. For all other errors, the status is "
+#~ "3."
+#~ msgstr ""
+#~ "B<start-stop-deamon> returnerar 0 om kommandot som önskades utfördes, "
+#~ "eller om B<--oknodo> angavs och antingen om B<--start> angavs och "
+#~ "motsvarande process redan kördes, eller om B<--stop> angavs och ingen "
+#~ "motsvarande process hittades. Om B<--oknodo> inte angavs och ingenting "
+#~ "utfördes kommer 1 att returneras. Om B<--stop> och B<--retry> angavs men "
+#~ "slutet på schemat nåddes och processer fortfarande kördes är felkoden 2. "
+#~ "För alla andra fel är statusen 3."
+
+#~ msgid "2"
+#~ msgstr "2"
+
 #~ msgid ""
 #~ "An error occurred. Unfortunately at the time of writing I<extended-error-"
 #~ "message> can contain newlines, although in locales where the translators "
diff -uNr --exclude .git --exclude .bzr dpkg/man/start-stop-daemon.8 /home/vorlon/devel/multiarch/dpkg-debian/man/start-stop-daemon.8
--- dpkg/man/start-stop-daemon.8	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/start-stop-daemon.8	2012-06-07 10:11:09.426073000 -0700
@@ -1,11 +1,10 @@
-.TH start\-stop\-daemon 8 "2011-04-28" "Debian Project" "dpkg utilities"
+.TH start\-stop\-daemon 8 "2011-07-04" "Debian Project" "dpkg utilities"
 .SH NAME
 start\-stop\-daemon \- start and stop system daemon programs
 .
 .SH SYNOPSIS
 .B start\-stop\-daemon
-.RI [ options ]
-.I command
+.RI [ option "...] " command
 .
 .SH DESCRIPTION
 .B start\-stop\-daemon
@@ -176,7 +175,7 @@
 .BR \-q ", " \-\-quiet
 Do not print informational messages; only display error messages.
 .TP
-.BR \-c ", " \-\-chuid " \fIusername\fR|\fIuid\fP"
+.BR \-c ", " \-\-chuid " \fIusername\fR|\fIuid\fP[\fB:\fP\fIgroup\fR|\fIgid\fP]"
 Change to this username/uid before starting the process. You can also
 specify a group by appending a
 .BR : ,
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/deb.5 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb.5
--- dpkg/man/sv/deb.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,65 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb 5 2011\-08\-14 Debianprojektet Debian
+.SH NAMN
+deb \- Debians binra paketformat
+.SH SYNOPS
+\fIfilnamn\fP\fB.deb\fP
+.SH BESKRIVNING
+\&\fB.deb\fP\-formatet r Debians binra paketformat. Det frsts av dpkg 0.93.76
+och senare, och genereras som frval av alla versioner av dpkg sedan 1.2.0,
+och alla i386/ELF\-versioner sedan 1.1.1elf.
+.PP
+Formatet som beskrivs hr anvnds sedan Debian 0.93; detaljer om det gamla
+formatet finns i \fBdeb\-old\fP(5).
+.SH FORMAT
+Filen r ett \fBar\fP\-arkiv med det magiska numret
+\fB!<arch>\fP. Filnamnen kan innehlla ett avslutande snedstreck.
+.PP
+De \fBtar\fP\-arkiv som tillts fr nrvarande r; den gamla stilens format
+(v7), fr\-POSIX\-ustar\-formatet, en delmngd av GNU\-formatet (endast de lnga
+skvgs\- och lnknamnen i den nya stilen, stds sedan dpkg 1.4.1.17), och
+POSIX\-ustar\-formatet (lnga namn stds sedan dpkg 1.15.0). Oknda
+tar\-typflaggor anses utgra fel.
+.PP
+Den frsta posten i arkivet heter \fBdebian\-binary\fP och innehller ett antal
+rader, avdelade med nyradstecken. Fr nrvarande finns endast en rad,
+formatets versionsnummer, \fB2.0\fP. Program som lser arkiv i det nya formatet
+br vara frberedda p att underversionsnumret kan komma att kas, och att
+nya rader kan frekomma, och skall i s fall ignorera dessa.
+.PP
+Om huvudversionsnumret har ndrats har en inkompatibel ndring infrts, och
+programmet skall avbrytas. Om s inte har gjorts, skall programmet kunna
+fortstta utan problem, svida det inte stter p en ovntad post i arkivet
+(frutom i slutet), enligt vad beskrivs nedan.
+.PP
+Den andra ndvndiga posten heter \fBcontrol.tar.gz\fP. Det r ett gzip\-packat
+tar\-arkiv som innehller paketets kontrollinformation, lagrade som ett antal
+vanliga filer, av vilka filen \fBcontrol\fP krvs och innehller grundlggande
+kontrollinformation. Tarbollen control kan eventuellt innehlla en post fr
+"\fB.\fP", den aktuella katalogen.
+.PP
+Den tredje och sista ndvndiga posten heter \fBdata.tar\fP. Den innehller
+filsystemet som ett tar\-arkiv, antingen okomprimerat (stds sedan dpkg
+1.10.24), eller komprimerat med gzip (med filslutet \fB.gz\fP), xz (med
+filslutet \fB.xz\fP, stds sedan dpkg 1.15.6), bzip2 (med filslutet \fB.bz2\fP,
+stds sedan dpkg 1.10.24) eller lzma (med filslutet \fB.lzma\fP, stds sedan
+dpkg 1.13.25).
+.PP
+Dessa poster mste ligga i exakt denna ordning. Nuvarande implementationer
+br ignorera eventuella ytterligare poster efter \fBdata.tar\fP. Ytterligare
+poster kan komma att definieras i framtiden, och kommer (om mjligt)
+placeras efter dessa tre. Eventuella ytterligare poster som kan komma att
+behva finnas fre \fBdata.tar\fP och som kan ignoreras av ldre program utan
+problem kommer att ha namn som brjar med understreck, "\fB_\fP".
+.PP
+Nya poster som inte kommer att kunna ignoreras utan problem kommer att
+lggas in fre \fBdata.tar\fP med namn som brjar med ngot annat n
+understreck, eller (mer troligt) gra att huvudversionsnumret kas.
+.SH "SE VEN"
+\fBdeb\-old\fP(5), \fBdpkg\-deb\fP(1), \fBdeb\-control\fP(5).
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/deb-control.5 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-control.5
--- dpkg/man/sv/deb-control.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-control.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,238 @@
+.\" Author: Raul Miller
+.\" Includes text from the debian Guidelines by Ian Jackson, Ian Murdock
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-control 5 2011\-08\-14 Debianprojektet Debian
+.SH NAMN
+deb\-control \- Debians filformat fr paketstyrfiler
+.
+.SH SYNOPS
+control
+.
+.SH BESKRIVNING
+Varje Debianpaket innehller huvudstyrfilen "control", vilken i sig
+innehller ett antal flt, eller kommentarer dr raderna inleds med
+\fB"#"\fP. Varje flt brjar med en etikett, ssom \fBPackage\fP eller \fBVersion\fP
+(skiftlgesoberoende), fljt av ett kolontecken och fltets kropp. Flt
+avdelas endast av fltetiketter. Med andra ord kan texten i flten spnna
+ver flera rader, men installationsverktygen kommer oftast att sl samman
+rader nr kroppen tolkas (frutom i fallet fr \fBDescription\fP\-fltet, se
+nedan).
+.
+.SH "NDVNDIGA FLT"
+.TP 
+\fBPackage:\fP\fI paketnamn\fP
+Vrdet p fltet bestmmer paketets namn, och anvnds av de flesta
+installationsverktygen fr att generera filnamnen.
+.TP 
+\fBVersion:\fP\fI versionsstrng\fP
+Vanligtvis r detta det ursprungliga paketets versionsnummer p den form
+programmets frfattare anvnder. Den kan ven innehlla ett
+Debianuppdateringsnummer (fr paket vars klla r utanfr Debian). Exakt
+format och sorteringsalgoritm beskrivs i \fBdeb\-version\fP(5).
+.TP 
+\fBMaintainer:\fP\fI fullt\-namn e\-post\fP
+Skall vara p formatet "Joe Bloggs <jbloggs@foo.com>" och r normalt
+sett den person som skapat paketet, till skillnad frn frfattaren av den
+programvara som paketerades.
+.TP 
+\fBDescription:\fP\fI kort\-beskrivning\fP
+\fB \fP\fIlng\-beskrivning\fP
+.br
+Formatet fr paketbeskrivningen r en kortfattad sammanfattning p den
+frsta raden (efter "Description"\-fltet). Fljande rader br anvndas fr
+en lngre, mer detaljerad beskrivning. Varje rad i den lgre beskrivningen
+mste inledas med ett blanksteg, och blanka rader i den lnga beskrivningen
+mste innehlla en ensam punkt (".") efter det inledande blanksteget.
+.
+.SH "VALFRIA FLT"
+.TP 
+\fBSection:\fP\fI sektion\fP
+Detta r ett generellt flt som ger paketet en kategori baserat p
+programvara som det installerar. Ngra vanliga sektioner r "utils", "net",
+"mail", "text", "x11" osv.
+.TP 
+\fBPriority:\fP\fI prioritet\fP
+Stller in hur viktigt paketet r jmfrt med systemet som enhet.  Vanliga
+prioriteter r "required" (ndvndig), "standard" (normal), "optional"
+(valfritt), "extra" (extra) osv.
+.LP
+I Debian har flten \fBSection\fP och \fBPriority\fP en definierad uppsttning
+accepterade vrden baserade p policymanualen. En frteckning ver dessa
+vrden finns i den senaste versionen av paketet \fBdebian\-policy\fP.
+.TP 
+\fBEssential:\fP \fByes\fP|\fBno\fP
+Fltet krvs normalt sett endast om svaret r \fByes\fP (ja), och betecknar att
+paketet krvs fr en korrekt installation av systemet. Dpkg och andra
+installationsverktyg tillter inte att ett paket mrkt \fBEssential\fP tas bort
+(tminstone inte utan att anvnda en av de tvingande flaggorna).
+.TP 
+\fBArchitecture:\fP \fIarkitektur\fP|\fBall\fP
+Arkitekturen anger vilken sorts maskinvara paketet kompilerades fr. Vanliga
+arkitekturer r "i386", "m68k", "sparc", "alpha", "powerpc" osv.  Observera
+att vrdet \fBall\fP r avsett fr paket som r oberoende av
+arkitektur. Exempel p detta r skal\- eller Perlskript och dokumentation.
+.TP 
+\fBOrigin:\fP\fI namn\fP
+Namnet p den distribution paketet hrstammar frn.
+.TP 
+\fBBugs:\fP\fI url\fP
+\fIURL\fP:en till felrapporteringssystemet fr detta paket. Det nuvarande
+formatet r \fIsystemtyp\fP\fB://\fP\fIadress\fP, till exempel
+\fBdebbugs://bugs.debian.org\fP.
+.TP 
+\fBHomepage:\fP\fI url\fP
+URL till uppstrmsprojektets hemside\-\fIurl\fP.
+.TP 
+\fBTag:\fP\fI lista\-med\-mrken\fP
+Lista ver mrken som beskriver paketets egenskaper. En beskrivningen och
+frteckning ver knda mrken finns i paketet \fBdebtags\fP.
+.TP 
+\fBMulti\-Arch:\fP \fBsame\fP|\fBforeign\fP|\fBallowed\fP
+Det hr fltet anvnds fr att ange hur paketet skall fungera p en
+flerarkitektursinstallation. Vrdet \fBsame\fP (samma) betyder att paket kan
+saminstalleras med sig sjlvt, men kan inte anvndas fr att uppfylla
+beroenden fr paket med en annan arkitektur n sig sjlvt. Vrdet \fBforeign\fP
+(frmmande) betyder att paketet inte kan saminstalleras med sig sjlvt, men
+att det kan anvndas fr att uppfylla beroenden fr paket med en annan
+arkitektur n sig sjlvt. Vrdet \fBallowed\fP (tilltet) tillter att omvnda
+beroenden kan ange i sina Depends\-flt att de behver ett paket frn en
+frmmande arkitektur, men har i vrigt ingen funktion. Fltet br inte
+frekomma i paket med fltet \fBArchitecture: all\fP.
+.TP 
+\fBSource:\fP\fI kllkodsnamn\fP
+Namnet p det kllkodspaket som binrpaketet kommer frn, om det skiljer sig
+frn namnet p sjlva paketet.
+
+.TP 
+.PD 0
+\fBSubarchitecture:\fP\fI vrde\fP
+.TP 
+.PD 0
+\fBKernel\-Version:\fP\fI vrde\fP
+.TP 
+.PD
+\fBInstaller\-Menu\-Item:\fP\fI vrde\fP
+Dessa flt anvnds av debian\-installer och behvs normalt inte. Se
+/usr/share/doc/debian\-installer/devel/modules.txt frn paketet
+\fBdebian\-installer\fP fr mer information om dem.
+
+.TP 
+\fBDepends:\fP\fI paketlista\fP
+Lista ver paket som krvs fr att paketet skall kunna tillhandahlla en
+icke\-trivial mngd funktionalitet. Pakethanteringsprogramvaran kommer inte
+tillta att ett paket installeras om paketen som listas i \fBDepends\fP\-fltet
+inte r installerade (tminstone inte utan att anvnda en av de tvingande
+flaggorna). Vid en installation krs postinst\-skripten i paketen i
+Depends:\-flten innan de paket som beror p dem. Under det omvnda
+frhllandet, en borttagning, krs prerm\-skriptet i ett paket innan de som
+finns i dess Depends:\-flt.
+.TP 
+\fBPre\-Depends:\fP\fI paketlista\fP
+Lista ver paket som mste vara installerade \fBoch\fP konfigurerade innan
+paketet kan installeras. Detta anvnds normalt i de fall paketet krver att
+ett annat paket r installerat fr sitt preinst\-skript.
+.TP 
+\fBRecommends:\fP\fI paketlista\fP
+Lista ver paket som br installeras tillsammans med paketet i de allra
+flesta fall.  Pakethanteringsprogramvaran kommer att varna anvndaren om man
+installerar ett paket utan de som listas i \fBRecommends\fP\-fltet.
+.TP 
+\fBSuggests:\fP\fI paketlista\fP
+Lista ver paket som r relaterade till paketet och som kanske kan gra det
+mer anvndbart, men utan vilka det fortfarande r rimligt att installera
+paketet.
+.LP
+Syntaxen fr flten \fBDepends\fP, \fBPre\-Depends\fP, \fBRecommends\fP och
+\fBSuggests\fP r en lista med grupper av alternativa paket. Varje grupp
+innehller en lista med paket avdelade med ett vertikalstreck (rr) ("|").
+Grupperna avdelas med kommatecken. Komma utlses som "OCH", och
+vertikalstrecken som "ELLER", dr vertikalstrecken binder hrdare. Varje
+paketnamn kan eventuellt fljas av en versionsnummerangivelse inom
+parenteser.
+.LP
+Ett versionsnummer kan brja med ">>", vilket betyder att vilken som
+helst senare version matchar, dr det r valfritt att ange
+Debianuppdateringen (avdelad med bindestreck).  Tilltna versionrelationer
+r ">>" fr strre n, "<<" fr mindre n, ">=" fr
+strre n eller lika med", "<=" fr mindre n eller lika med, och "="
+fr lika med.
+.TP 
+\fBBreaks:\fP\fI paketlista\fP
+Listar paket som frstrs av detta, till exempel genom att lyfta fram fel
+nr det namngivna paketet beror p detta. Pakethanteringsprogramvaran
+tillter inte att frstrda paket konfigureras; problemet lses vanligtvis
+genom att uppgradera paketen som namnges i ett \fBBreaks\fP\-flt.
+.TP 
+\fBConflicts:\fP\fI v\fP
+Listar paket som r i konflikt (krockar) med detta, till exempel genom att
+innehlla filer med samma namn. Pakethanteringsprogramvaran tillter inte
+tv sdana paket att vara installerade samtidigt. Tv paket med inbrdes
+konflikt br innehlla en \fBConflicts\fP\-rad med varandras namn.
+.TP 
+\fBReplaces:\fP\fI paketlista\fP
+Lista ver paket erstts av filer frn det hr paketet. Detta anvnds fr
+att mjliggra paket att skriva ver filer frn andra paket, och anvnds
+normalt sett tillsammans med \fBConflicts\fP\-fltet fr att tvinga fram
+borttagning av det andra paketet om ven det hr har de filer som finns i
+paketet det str i konflikt med.
+.TP 
+\fBProvides:\fP\fI paketlista\fP
+Detta r en lista av virtuella paket som tillhandahlls av detta. Normalt
+sett anvnds detta i de fall flera paket tillhandahller samma tjnst. Till
+exempel kan bde sendmail och exim fungera som e\-postserver, s de
+tillhandahller ett gemensamt paket ("mail\-transport\-agent") p vilket andra
+paket kan bero, vilket gr det mjligt fr sendmail eller exim att fungera
+som ett alternativ som tillfredsstller beroendet. Detta frhindrar att
+paket som beror p en e\-postserver mste knna till alla deras paketnamn och
+anvnda "|" fr att dela av listan.
+.LP
+Syntaxen fr \fBBreaks\fP, \fBConflicts\fP, \fBReplaces\fP och \fBProvides\fP r en
+lista ver paketnamn avdelade med komman (och eventuella blanktecken). I
+flten \fBBreaks\fP och \fBConflicts\fP lses kommatecknet som "ELLER". Ett
+eventuellt versionsnummer kan ven anges, med samma syntax som ovan fr
+flten \fBBreaks\fP, \fBConflicts\fP och \fBReplaces\fP.
+.
+.TP 
+\fBBuilt\-Using:\fP\fI paketlista\fP
+Fltet visar ytterligare kllkodspaket som anvndes nr binrpaketet
+byggdes. Detta anger fr hanteringsprogramvaran fr arkivet att dessa
+ytterligare kllkodspaket mste behllas s lnge binrpaketet finns i
+arkivet. Fltet mste innehlla en lista med kllkodspaket med strikta (=)
+versionsberoenden. Observera att hanteringsprogramvaran fr arkivet troligen
+kommer att avvisa en insndning som deklarerar en \fBBuilt\-Using\fP\-relation
+som inte kan uppfyllas inom arkivet.
+.
+.SH EXEMPEL
+.\" .RS
+.nf
+# Kommentar
+Package: grep
+Essential: yes
+Priority: required
+Section: base
+Maintainer: Wichert Akkerman <wakkerma@debian.org>
+Architecture: sparc
+Version: 2.4\-1
+Pre\-Depends: libc6 (>= 2.0.105)
+Provides: rgrep
+Conflicts: rgrep
+Description: GNU grep, egrep and fgrep.
+ The GNU family of grep utilities may be the "fastest grep in the west".
+ GNU grep is based on a fast lazy\-state deterministic matcher (about
+ twice as fast as stock Unix egrep) hybridized with a Boyer\-Moore\-Gosper
+ search for a fixed string that eliminates impossible text from being
+ considered by the full regexp matcher without necessarily having to
+ look at every character. The result is typically many times faster
+ than Unix grep or egrep. (Regular expressions containing backreferencing
+ will run more slowly, however.)
+.fi
+.\" .RE
+.
+.SH "SE VEN"
+\fBdeb\fP(5), \fBdeb\-version\fP(5), \fBdebtags\fP(1), \fBdpkg\fP(1), \fBdpkg\-deb\fP(1).
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/deb-extra-override.5 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-extra-override.5
--- dpkg/man/sv/deb-extra-override.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-extra-override.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,38 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-extra\-override 5 2009\-08\-16 Debianprojektet dpkg\-verktygen
+.SH NAMN
+deb\-extra\-override \- Debianarkivets extra verstyrningsfil
+.
+.SH SYNOPS
+override
+.
+.SH BESKRIVNING
+ven om det mesta av informationen om ett binr\-/kllkodspaket finns i
+control\-/.dsc\-filen s kan allt verstyras nr det exporteras till
+Packages\-/Sources\-filer. Den extra override\-filen innehller dessa
+verstyrningar.
+.PP
+Den extra override\-filen har ett enkelt blanksteg\-avdelat
+format. Kommentarer r tilltna (markeras med ett \fB#\fP).
+.PP
+.in +5
+\fIpaket\fP \fIfltnamn\fP \fIvrde\fP
+.in -5
+.PP
+\fIpaket\fP r namnet p binr\-/kllkodspaketet
+.PP
+\fIfltnamn\fP r namnet p fltet som skall verstyras. \fIvrde\fP r vrdet som
+skall lggas in i fltet. Det kan innehlla blanksteg d raden delas upp i
+maximalt tre kolumner vid tolkning.
+.PP
+De extra override\-filer som anvnds fr att skapa den officiella listan ver
+paket ("Packages") finns i \fIindices\fP\-katalogen p alla Debianspeglar.
+.
+.SH "SE VEN"
+\fBdpkg\-scanpackages\fP(1), \fBdpkg\-scansources\fP(1), \fBapt\-ftparchive\fP(1).
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/deb-old.5 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-old.5
--- dpkg/man/sv/deb-old.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-old.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,47 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-old 5 2011\-08\-14 Debianprojektet Debian
+.SH NAMN
+deb\-old \- Debians gamla binrpaketformat
+.
+.SH SYNOPS
+\fIfilnamn\fP\fB.deb\fP
+.
+.SH BESKRIVNING
+\&\fB.deb\fP\-formatet r Debians binra paketformat. Denna manualsida beskriver
+det \fBgamla\fP formatet som anvnds fre Debian 0.93. Se \fBdeb\fP(5) fr
+detaljerad information om det nya formatet.
+.
+.SH FORMAT
+Filen innehller tv rader av formatinformation som ASCII\-text, fljt av tv
+sammaslagna gzip\-packade ustar\-filer.
+.PP
+Den frsta raden i filen r formatversionsnumret utfyllt till tta siffror,
+och r \fB0.939000\fP fr alla arkiv i det gamla formatet.
+.PP
+Nsta rad r en decimalstrng (utan inledande nollor) som anger lngden p
+den frsta gzip\-packade tar\-filen.
+.PP
+Bda dessa rader avslutas med ett ensamt radbrytningstecken.
+.PP
+Den frsta tar\-filen innehller kontrollinformationen, lagrade som ett antal
+vanliga filer. Filen \fBcontrol\fP mste finnas, eftersom den innehller
+grundlggande kontrollinformation.
+.PP
+I vissa vldigt gamla arkiv kan filerna i kontroll\-tarfilen eventuellt ligga
+i en underkatalog vid namn \fBDEBIAN\fP. Om s r fallet kommer underkatalogen
+\fBDEBIAN\fP ven att finnas i kontroll\-tarfilen, och kontroll\-tarfilen kommer
+bara innehlla filer i den katalogen. Eventuellt kan kontroll\-tarfilen
+innehlla en post fr "\fB.\fP", det vill sga aktuell katalog.
+.PP
+Den andra gzip\-packade tar\-filen r filsystemsarkivet, vilken innehller
+skvgar relativt rotkatalogen fr systemet det skall installeras
+p. Skvgarna innehller inte inledande snedstreck.
+.
+.SH "SE VEN"
+\fBdeb\fP(5), \fBdpkg\-deb\fP(1), \fBdeb\-control\fP(5).
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/deb-override.5 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-override.5
--- dpkg/man/sv/deb-override.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-override.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,56 @@
+.\" This manpage is copyright (C) 1996 Michael Shields <shields@crosslink.net>.
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-override 5 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+deb\-override \- Debianarkivets verstyrningsfil
+.
+.SH SYNOPS
+override
+.
+.SH BESKRIVNING
+ven om huvuddelen av informationen om ett paket finns i kontrollfilen
+hanteras en del centralt av distributionstsarerna, snarare n av
+paketansvariga, fr att kunna bibehlla en global konsistens. Denna
+informationen finns i filen "override".
+.PP
+Filen override har ett enkelt blanksteg\-avdelat format. Kommentarer r
+tilltna (markeras med ett \fB#\fP).
+.PP
+.in +5
+\fIpaket\fP \fIprioritet\fP \fIsektion\fP [\fIansvariginfo\fP]
+.in -5
+.PP
+\fIpaket\fP r namnet p paketet. Poster i filen override fr paket som inte
+finns i trdet med binra paket ignoreras.
+.PP
+\fIprioritet\fP och \fIsektion\fP motsvarar respektive styrflt i
+\&.deb\-filen. Tilltna vrden beskrivs i Debians policydokument.
+.PP
+\fIansvariginfo\fP kan, om det anges, antingen vara namnet p en paketansvarig
+fr en ovillkorlig verstyrning, eller \fIgammal\-ansvarig\fP \fB=>\fP
+\fIny\-ansvarig\fP fr att utfra en substituering.
+.PP
+De override\-filer som anvnds fr att skapa den officiella listan ver paket
+("Packages") finns i \fIindices\fP\-katalogen p alla Debianspeglar.
+.
+.SH "SE VEN"
+\fBdpkg\-scanpackages\fP(1), \fBdpkg\-scansources\fP(1), \fBapt\-ftparchive\fP(1),
+\fB/usr/share/doc/debian\-policy/policy.html/index.html\fP.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/deb-shlibs.5 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-shlibs.5
--- dpkg/man/sv/deb-shlibs.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-shlibs.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,56 @@
+.\" Copyright © 1996 Michael Shields <shields@crosslink.net>
+.\" Copyright © 2008 Zack Weinberg <zackw@panix.com>
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-shlibs 5 2008\-02\-17 Debianprojektet dpkg\-verktygen
+.SH NAMN
+deb\-shlibs \- Debians informationsfil fr delade bibliotek
+.
+.SH BESKRIVNING
+.PP
+\fBshlibs\fP\-filer skapar en koppling mellan biblioteksnamn och versioner
+(\fIsonamn\fP) till beroenden som r lmpliga fr en paketstyrfil. Den har en
+post per rad. Blanka rader r \fBinte\fP tilltna. Rader som inleds med ett
+\fB#\fP\-tecken anses vara kommentarer, och ignoreras. Alla andra rader mste
+vara p formatet
+.IP
+[\fItyp\fP\fB:\fP] \fIbibliotek\fP \fIversion\fP \fIberoenden\fP
+.PP
+Flten \fIbibliotek\fP och \fIversion\fP avdelas med blanktecken medan fltet
+\fIberoenden\fP strcker sig till slutet av raden. Fltet \fItyp\fP r frivilligt
+och behvs vanligtvis inte.
+.PP
+Se Debians policymanual fr ytterligare detaljer.
+.
+.SH EXEMPEL
+.PP
+\fBshlibs\fP\-filen fr ett typiskt bibliotekspaket, som heter \fIlibcrunch1\fP och
+som innehller ett bibliotek vars sonamn r \fIlibcrunch.so.1\fP, kan se ut s
+hr:
+.IP
+libcrunch 1 libcrunch1 (>= 1.2\-1)
+.PP
+Fltet \fIberoenden\fP mste ange den senaste versionen av paketet som lade
+till nya symboler i biblioteket: i exemplet ovan lades nya symboler till i
+version 1.2 av \fIlibcrunch\fP. Det r inte den enda orsaken till att beroenden
+kan behva snvas in; terigen, se Debians policymanual fr detaljer.
+.
+.SH "SE VEN"
+\fBdpkg\-shlibdeps\fP(1), \fBdeb\-symbols\fP(5).
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/deb-split.5 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-split.5
--- dpkg/man/sv/deb-split.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-split.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,57 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-split 5 2011\-07\-04 Debianprojektet Debian
+.SH NAMN
+deb\-split \- Debians flerdelade binra paketformat
+.SH SYNOPS
+\fIfilnamn\fP\fB.deb\fP
+.SH BESKRIVNING
+Det flerdelade \fB.deb\fP\-formatet anvnds fr att dela stora paket i mindre
+delar fr att frenkla transport ver sm medier.
+.SH FORMAT
+Filen r ett \fBar\fP\-arkiv med det magiska numret
+\fB!<arch>\fP. Filnamnen kan innehlla ett avslutande snedstreck (sedan
+dpkg 1.15.6).
+.PP
+Den frsta posten heter \fBdebian\-split\fP och innehller en serie av rader,
+avdelade med nyradstecken. Fr nrvarande finns tta rader:
+.IP \(bu 4
+Formatets versionsnummer, \fB2.1\fP d denna manualsida skrivs.
+.IP \(bu
+Paketets namn.
+.IP \(bu
+Paketets versionsnummer.
+.IP \(bu
+md5\-kontrollsumman fr paketet.
+.IP \(bu
+Total storlek p paketet.
+.IP \(bu
+Maximal storlek p en del.
+.IP \(bu
+Nummer p aktuell del, fljt av ett snedstreck och totalt antal delar (som i
+\(oq1/10\(cq).
+.IP \(bu
+Paketets arkitektur (sedan dpkg 1.16.1).
+.PP
+Filer som lser flerdelade arkiv br vara beredda p att ytterligare rader
+r nrvarande, och br ignorera dessa om s r fallet.
+.PP
+Om versionsnumret har ndrats har en inkompatibel ndring infrts, och
+programmet skall avbrytas. Om s inte har gjorts, skall programmet kunna
+fortstta utan problem, svida det inte stter p en ovntad post i arkivet
+(frutom i slutet), enligt vad beskrivs nedan.
+.PP
+Den andra och sista ndvndiga posten heter \fBdata.\fP\fIN\fP, dr \fIN\fP anger
+delnumret. Den innehller rdata fr delen.
+.PP
+Dessa poster mste ligga i exakt denna ordning. Nuvarande implementationer
+br ignorera eventuella ytterligare poster efter \fBdata.\fP\fIN\fP. Ytterligare
+poster kan komma att definieras i framtiden, och kommer (om mjligt)
+placeras efter dessa tv.
+.SH "SE VEN"
+\fBdeb\fP(5), \fBdpkg\-split\fP(1).
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/deb-src-control.5 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-src-control.5
--- dpkg/man/sv/deb-src-control.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-src-control.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,303 @@
+.\" Author: Oxan van Leeuwen
+.\" Includes text from the deb-control manual page by Raul Miller
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-src\-control 5 2011\-08\-14 Debianprojektet Debian
+.SH NAMN
+deb\-src\-control \- Debians filformat fr kllkodspakets huvudstyrfil
+.
+.SH SYNOPS
+control
+.
+.SH BESKRIVNING
+Varje Debiankllkodspaket innehller huvud\-"control"\-filen, vilken
+innehller tminstone tv stycken, avdelade med en tomrad. Det frsta
+stycket innehller all generell information om kllkodspaketet, medan de
+fljande styckena beskriver exakt ett binrpaket. Varje stycke bestr av
+tminstone ett flt. Ett flt inleds med ett fltnamn, till exempel
+\fBPackage\fP eller \fBSection\fP (skiftlgesoknsligt), fljt av ett kolon,
+fltinnehllet och ett nyradstecken. Flerradiga flt r ocks tilltna, men
+varje ytterligare rad som inte innehller ett fltnamn, br starta med minst
+ett blanksteg. Innehllet i flerradsflt sls normalt samman till en enda
+rad av verktygen (frutom i fallet fltet \fBDescription\fP, se nedan). Fr att
+stta in tomma rader i ett flerradsflt, skriver du en punkt efter
+blanksteget. Rader som brjar med ett \fB"#"\fP tolkas som kommentarer.
+.
+.SH KLLKODSFLT
+.TP 
+\fBSource:\fP \fIkllkodspaketnamn\fP (krvs)
+Vrdet p det hr fltet r namnet p kllkodspaketet, och mste motsvara
+namnet p kllkodspaketet i filen debian/changelog. Paketnamnet mste best
+endast av sm bokstver (a\-z), siffror (0\-9), plus\- (+) och minustecken (\-)
+och punkt (.). Paketnamn mste vara minst tv tecken lnga och mste brja
+med ett alfanumeriskt tecken.
+
+.TP 
+\fBMaintainer:\fP \fIfullt\-namn\-epost\fP (krvs)
+Skall vara p formatet "Joe Bloggs <jbloggs@foo.com>" och refererar
+till den person som fr nrvarande underhller paketet, till skillnad frn
+frfattaren av den programvara som paketerats.
+
+.TP 
+\fBUploaders:\fP\fI fullt\-namn\-epost\fP
+Rknar upp namn och e\-postadresser till med\-underhllare av paketet, i samma
+format som fltet Maintainers. Flera med\-underhllare br avdelas med
+kommatecken.
+
+.TP 
+\fBStandards\-Version:\fP\fI versionsstrng\fP
+Dokumenterar den senaste versionen av standarddokumenten (vilka bestr av
+Debians policyhandbok och refererade texter i paketet \fBdebian\-policy\fP) som
+paketet uppfyller.
+
+.TP 
+\fBDM\-Upload\-Allowed:\fP \fByes\fP|\fBno\fP
+Fltet anger om paketet kan sndas in av de Debianutvecklare som str
+beskrivna i flten Maintainer och Uploaders. Standardvrdet r "no" (nej).
+
+.TP 
+\fBHomepage:\fP\fI url\fP
+URL till uppstrmsprojektets hemsida.
+
+.TP 
+\fBBugs:\fP\fI url\fP
+\fIUrl\fP:en till felrapporteringssystemet fr detta paket. Det nuvarande
+formatet r \fIsystemtyp\fP://\fIaddress\fP, till exempel
+\fBdebbugs://bugs.debian.org\fP. Det hr fltet r normalt sett inte
+ndvndigt.
+
+.TP 
+\fBVcs\-*:\fP\fI url\fP
+\fIUrl\fP:en till versionshanteringsarkivet som anvnds fr att underhlla det
+hr paketet. Fr nrvarande stds \fBArch\fP, \fBBzr\fP (Bazaar), \fBCvs\fP,
+\fBDarcs\fP, \fBGit\fP, \fBHg\fP (Mercurial), \fBMtn\fP (Monotone) och \fBSvn\fP
+(Subversion). Fltet pekar normalt till den senaste versionen av paketet,
+ssom huvudgrenen (main eller trunk).
+
+.TP 
+\fBVcs\-Browser:\fP\fI url\fP
+\fIUrl\fP:en till ett webbgrnssnitt fr att blddra i
+versionshanteringsarkivet.
+
+.TP 
+\fBOrigin:\fP\fI namn\fP
+Namnet p den distribution paketet hrstammar frn. Det hr fltet r
+normalt sett inte ndvndigt.
+
+.TP 
+\fBSection:\fP\fI sektion\fP
+Detta r ett generellt flt som ger paketet en kategori baserat p
+programvara som det installerar. Ngra vanliga sektioner r "utils", "net",
+"mail", "text", "x11" osv.
+
+.TP 
+\fBPriority:\fP\fI prioritet\fP
+Stller in hur viktigt paketet r jmfrt med systemet som enhet.  Vanliga
+prioriteter r "required" (ndvndig), "standard" (normal), "optional"
+(valfritt), "extra" (extra) osv.
+
+I Debian har flten \fBSection\fP och \fBPriority\fP en definierad uppsttning
+accepterade vrden baserade p policymanualen. En frteckning ver dessa
+vrden finns i den senaste versionen av paketet \fBdebian\-policy\fP.
+
+.TP 
+\fBBuild\-Depends:\fP\fI paketlista\fP
+En lista ver paket som mste installeras och konfigureras fr att kunna
+bygga kllkodspaketet.
+
+.TP 
+\fBBuild\-Depends\-Indep:\fP\fI paketlista\fP
+Motsvarar \fBBuild\-Depends\fP, men de behvs endast fr att bygga de
+arkitekturoberoende paketen. \fBBuild\-Depends\fP installeras ocks i detta
+fall.
+
+.TP 
+\fBBuild\-Conflicts:\fP\fI paketlista\fP
+En lista ver paket som inte br vara installerade nr paketet byggs, till
+exempel p grund av att de str byggsystemet som anvnds.
+
+.TP 
+\fBBuild\-Conflicts\-Indep:\fP\fI paketlista\fP
+Motsvarar \fBBuild\-Conflicts\fP, men endast nr de arkitekturoberoende paketen
+byggs.
+
+Syntaxen fr flten \fBBuild\-Depends\fP och \fBBuild\-Depends\-Indep\fP\-flten r en
+lista med grupper av alternativa paket. Varje grupp innehller en lista med
+paket avdelade med ett vertikalstreck (rr) ("|").  Grupperna avdelas med
+kommatecken. Komma utlses som "OCH", och vertikalstrecken som "ELLER", dr
+vertikalstrecken binder hrdare. Varje paketnamn kan eventuellt fljas av en
+versionsnummerangivelse inom parenteser och en arkitekturangivelse i
+hakparenteser.
+
+Syntaxen fr flten \fBBuild\-Conflicts\fP och \fBBuild\-Conflicts\-Indep\fP\-flten
+r en kommaseparerad lista med paketnamn, dr komma utlses som "OCH". Det
+r inte mjligt att ange alternativa paket med "rr". Varje paketnamn kan
+eventuellt fljas av en versionsnummerangivelse inom parenteser och en
+arkitekturangivelse i hakparenteser.
+
+Ett versionsnummer kan brja med ">>", vilket betyder att vilken som
+helst senare version matchar, dr det r valfritt att ange
+Debianuppdateringen (avdelad med bindestreck).  Tilltna versionrelationer
+r ">>" fr strre n, "<<" fr mindre n, ">=" fr
+strre n eller lika med", "<=" fr mindre n eller lika med, och "="
+fr lika med.
+
+En arkitekturangivelse bestr av ett eller flera arkitekturnamn, avdelade
+med blanktecken. Varje namn kan fregs av ett utropstecken, vilket betyder
+"ICKE".
+
+Observera att beroenden p paket i \fBbuild\-essential\fP\-uppsttningen kan
+utelmnas och att det r omjligt att deklarera byggkonflikter mot dem. En
+lista ver dessa paket finns i paketet build\-essential.
+
+
+.SH BINRFLT
+
+.LP
+Observera att flten \fBPriority\fP, \fBSection\fP och \fBHomepage\fP ven kan
+anvndas i de stycken som beskriver binrpaket fr att verstyra de globala
+vrdena fr kllkodspaketet.
+
+.TP 
+\fBPackage:\fP \fIbinrpaketnamn\fP (krvs)
+Detta flt anvnds fr att namnge det binra paketet. Samma begrnsningar
+gller som fr kllkodspaketets namn.
+
+.TP 
+\fBArchitecture:\fP \fIarch\fP|\fBall\fP|\fBany\fP (krvs)
+Arkitekturen anger p vilken typ av maskinvara paketet krs. Fr paket som
+krs p alla arkitekturer anvnds vrdet \fBany\fP (ngon). Fr paket som r
+arkitekturoberoende, som skal\- och Perlskript eller dokumentation, anvnds
+vrdet \fBall\fP (alla). Fr att begrnsa paket till en specifik uppsttning
+arkitekturer, anger du namnen p arkitekturerna avdelade med blanksteg. Det
+r ven mjligt att ange arkitekturer med jokertecken i listan (se
+\fBdpkg\-architecture\fP(1) fr mer information om dessa).
+
+.TP 
+\fBPackage\-Type:\fP \fBdeb\fP|\fBudeb\fP
+Detta flt anger paketets typ. "udeb" anvnds fr storleksbegrnsade paket i
+debian\-installer. "deb" r standardvrdet, och antas om fltet saknas. Fler
+typer kan komma att lggas till i framtiden.
+
+.TP 
+.PD 0
+\fBSubarchitecture:\fP\fI vrde\fP
+.TP 
+.PD 0
+\fBKernel\-Version:\fP\fI vrde\fP
+.TP 
+.PD 0
+\fBInstaller\-Menu\-Item:\fP\fI vrde\fP
+Dessa flt anvnds av debian\-installer och behvs normalt inte. Se
+/usr/share/doc/debian\-installer/devel/modules.txt frn paketet
+\fBdebian\-installer\fP fr mer information om dem.
+
+.TP 
+.PD 0
+\fBEssential:\fP \fByes\fP|\fBno\fP
+.TP 
+.PD 0
+\fBMulti\-Arch:\fP \fBsame\fP|\fBforeign\fP|\fBallowed\fP
+.TP 
+.PD 0
+\fBTag:\fP\fI lista\-med\-mrken\fP
+.TP 
+.PD 0
+\fBDescription:\fP \fIkort\-beskrivning\fP (krvs)
+Dessa flt beskrivs i manualsidan \fBdeb\-control\fP(5), eftersom de kopieras
+ordagrant till binrpaketets styrfil.
+
+.TP 
+.PD 0
+\fBDepends:\fP\fI paketlista\fP
+.TP 
+.PD 0
+\fBPre\-Depends:\fP\fI paketlista\fP
+.TP 
+.PD 0
+\fBRecommends:\fP\fI paketlista\fP
+.TP 
+.PD 0
+\fBSuggests:\fP\fI paketlista\fP
+.TP 
+.PD 0
+\fBBreaks:\fP\fI paketlista\fP
+.TP 
+.PD 0
+\fBEnhances:\fP\fI paketlista\fP
+.TP 
+.PD 0
+\fBReplaces:\fP\fI paketlista\fP
+.TP 
+.PD 0
+\fBConflicts:\fP\fI v\fP
+.TP 
+.PD 0
+\fBProvides:\fP\fI paketlista\fP
+.TP 
+.PD 0
+\fBBuilt\-Using:\fP\fI paketlista\fP
+.br
+Dessa flt anger relationer mellan paket. De diskuteras i manualsidan
+\fBdeb\-control\fP(5) och i paketet \fBdebian\-policy\fP.
+
+.SH "ANVNDARDEFINIERADE FLT"
+Det r mjligt att lgga till ytterligare anvndardefinierade flt i
+styrfilen. Verktygen ignorerar dessa flt. Om du vill att flten skall
+kopieras ver till utdatafilerna, som till exempel i binrpaketen, mste du
+anvnda en skrddarsydd namngivning: flten mste starta med X, fljt av ett
+eller flera av bokstverna BCS och ett bindestreck. Om bokstaven B anvnds
+kommer fltet att dyka upp i styrfilen i binrpaketet, se \fBdeb\-control\fP(5),
+fr bokstaven S i kllkodspaketets styrfil som konstrueras av
+\fBdpkg\-source\fP(1) och fr bokstaven C i styrfilen fr insndning
+(.changes). Observera att X[BCS]\-prefixen tas bort nr flten kopieras ver
+till utdatafilerna. Fltet \fBXC\-Approved\-By\fP visas som \fBApproved\-By\fP i
+changes\-filen och visas inte i styrfilerna fr binr\- och kllkodspaketen.
+
+
+.SH EXEMPEL
+.\" .RS
+.nf
+# Kommentar
+Source: dpkg
+Section: admin
+Priority: required
+Maintainer: Dpkg Developers <debian\-dpkg@lists.debian.org>
+# det hr fltet kopieras till binr\- och kllkodspaketen
+XBS\-Upstream\-Release\-Status: stable
+Homepage: http://wiki.debian.org/Teams/Dpkg
+Vcs\-Browser: http://git.debian.org/?p=dpkg/dpkg.git
+Vcs\-Git: git://git.debian.org/git/dpkg/dpkg.git
+Standards\-Version: 3.7.3
+Build\-Depends: pkg\-config, debhelper (>= 4.1.81),
+ libselinux1\-dev (>= 1.28\-4) [!linux\-any]
+
+Package: dpkg\-dev
+Section: utils
+Priority: optional
+Architecture: all
+# det hr r ett skrddarsytt flt i binrpaketet
+XB\-Mentoring\-Contact: Raphael Hertzog <hertzog@debian.org>
+Depends: dpkg (>= 1.14.6), perl5, perl\-modules, cpio (>= 2.4.2\-2),
+ bzip2, lzma, patch (>= 2.2\-1), make, binutils, libtimedate\-perl
+Recommends: gcc | c\-compiler, build\-essential
+Suggests: gnupg, debian\-keyring
+Conflicts: dpkg\-cross (<< 2.0.0), devscripts (<< 2.10.26)
+Replaces: manpages\-pl (<= 20051117\-1)
+Description: Debian package development tools
+ This package provides the development tools (including dpkg\-source)
+ required to unpack, build and upload Debian source packages.
+ .
+ Most Debian source packages will require additional tools to build;
+ for example, most packages need make and the C compiler gcc.
+.fi
+
+
+.\" .RE
+.SH "SE VEN"
+\fBdeb\-control\fP(5), \fBdeb\-version\fP(5), \fBdpkg\-source\fP(1)
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/deb-substvars.5 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-substvars.5
--- dpkg/man/sv/deb-substvars.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-substvars.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,142 @@
+.\" Authors: Ian Jackson
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-substvars 5 2009\-07\-15 Debianprojektet dpkg\-verktygen
+.SH NAMN
+deb\-substvars \- Debians kllkods\-substitueringsvariabler
+.
+.SH SYNOPS
+substvars
+.
+.SH BESKRIVNING
+Innan \fBdpkg\-source\fP, \fBdpkg\-gencontrol\fP och \fBdpkg\-genchanges\fP skriver sin
+kontrollinformation (till control\-filen i kllkodspaketet \fB.dsc\fP fr
+\fBdpkg\-source\fP och till standard ut fr \fBdpkg\-gencontrol\fP och
+\fBdpkg\-genchanges\fP) kommer de utfra viss variabelsubstituering p
+utdatafilen.
+
+En variabelsubstitution har formen \fB${\fP\fIvariabelnamn\fP\fB}\fP. Variabelnamn
+bestr av alfanumeriska tecken, bindestreck och kolon och brjar med ett
+alfanumeriskt tecken. Variabelsubstitueringar utfrs upprepade gnger tills
+det inte kvarstr ngra \- det resulterande innehllet i fltet lses av p
+nytt efter substitueringen fr att se om det behvs fler substitueringar.
+
+Nr alla substitueringar har utfrts erstts varje frekomst av strngen
+\fB${}\fP (som inte r en giltig substituering) med ett \fB$\fP\-tecken.
+
+Medan variabelsubstituering grs p alla flt i styrfilen r det ngra av
+flten som anvnds och behvs vid byggning innan substitueringen nnu har
+utfrts. Drfr gr det inte att anvnda variabler i flten \fBPackage\fP,
+\fBSource\fP och \fBArchitecture\fP.
+
+Variabelsubstituering sker ver innehllet i flten efter att de har
+tolkats, vilket innebr att om du vill att en variabel skall expanderas ver
+flera rader s behver du inte inkludera ett blanksteg efter
+nyradstecknet. Detta grs implicit nr fltet skrivs ut. Till exempel, om
+variablen \fB${Description}\fP stts till "foo r bar.${Newline}foo r bra."
+och du har fljande flt:
+
+ Description: programmet foo
+  ${Description}
+  .
+  Mer text.
+
+S blir resultatet:
+
+ Description: programmet foo
+  foo r bar.
+  foo r bra.
+  .
+  Mer text.
+
+Variabler kan sttas genom att anvnda kommandoradsflaggan \fB\-V\fP. De kan
+ven anges i filen \fBdebian/substvars\fP (eller vilken som helst annan fil som
+anges med flaggan \fB\-T\fP). Filen bestr av rader p formen
+\fInamn\fP\fB=\fP\fIvrde\fP. Avslutande blanksteg p en rad, blanka rader och rader
+som brjar med en \fB#\fP\-symbol (kommentarer) ignoreras.
+
+I tillgg r fljande standardvariabler tillgngliga:
+.TP 
+\fBArch\fP
+Den aktuella byggarkitekturen (frn \fBdpkg \-\-print\-architecture\fP).
+.TP 
+\fBsource:Version\fP
+Version fr kllkodspaketet.
+.TP 
+\fBsource:Upstream\-Version\fP
+Version p uppstrmskllkodspaketet, inklusive Debianversionens epok, om
+sdan finns.
+.TP 
+\fBbinary:Version\fP
+Den binra paketversionen (som kan avvika frn source:Version, till exempel
+i en binNMU).
+.TP 
+\fBSource\-Version\fP
+Versionen p kllkodspaketet (frn changelog\-filen). Variabeln \fBavrds\fP
+frn eftersom betydelsen skiljer sig frn funktionen, anvnd i stllet
+\fBsource:Version\fP eller \fBbinary:Version\fP allt eftersom vad som r lmpligt.
+.TP 
+\fBInstalled\-Size\fP
+Den totala storleken p paketets installerade filer. Vrdet kopieras in i
+motsvarande flt i kontrollfilen. Om du stller in det kommer det att
+erstta vrdet p fltet. Om variabeln inte r satt kommer
+\fBdpkg\-gencontrol\fP att anvnda \fBdu \-k debian/tmp\fP fr att hitta det
+frvalda vrdet.
+.TP 
+\fBExtra\-Size\fP
+Ytterligare diskutrymme som anvnds nr paketet installeras. Om vrdet r
+satt kommer dess vrde att lggas till \fBInstalled\-Size\fP\-variabelns vrde
+(oavsett om den satts explicit eller om det frvalda vrdet anvnds) innan
+det kopieras till kontrollfilens flt \fBInstalled\-Size\fP.
+.TP 
+\fBF:\fP\fIfltnamn\fP
+Vrdet p utdatafltet \fIfltnamn\fP (som mste anges med rtt form av stora
+och sm bokstver). Om du stter dessa variabler hnder ingenting frutom
+dr de explicit expanderats.
+.TP 
+\fBFormat\fP
+Formatet p filen \fB.changes\fP som skapats av denna version av
+kllkodspaketeringsskripten. Om du stter denna variabel kommer innehllet i
+\fBFormat\fP\-fltet i filen \fB.changes\fP ocks att ndras.
+.TP 
+\fBNewline\fP, \fBSpace\fP, \fBTab\fP
+Dessa variabler innehller motsvarande tecken (radbrytning, blanksteg,
+tabbsteg).
+.TP 
+\fBshlibs:\fP\fIberoendeflt\fP
+Variabelinstllningar p den hr formen skapas av \fBdpkg\-shlibdeps\fP.
+.TP 
+\fBdpkg:Upstream\-Version\fP
+Uppstrmsversionen av dpkg.
+.TP 
+\fBdpkg:Version\fP
+Fullstndig version av dpkg.
+.LP
+Om en variabel refereras till men inte definieras kommer en varning att
+genereras och ett tomt vrde anvnds.
+.
+.SH FILER
+.TP 
+\fBdebian/substvars\fP
+Lista ver substitueringsvariabler och \-vrden.
+.
+.SH PROGRAMFEL
+Tidpunkten p fltverstyrning intrffar jmfrt med instllning av vissa
+standardutdataflt r ganska frvirrad.
+
+.SH "SE VEN"
+\fBdpkg\fP(1), \fBdpkg\-genchanges\fP(1), \fBdpkg\-gencontrol\fP(1),
+\fBdpkg\-shlibdeps\fP(1), \fBdpkg\-source\fP(1).
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  1995\-1996 Ian Jackson
+.br
+Upphovsrttsskyddat  2000 Wichert Akkerman
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/deb-symbols.5 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-symbols.5
--- dpkg/man/sv/deb-symbols.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-symbols.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,70 @@
+.\" Author: Raphaël Hertzog
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-symbols 5 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+deb\-symbols \- Debians utkade informationsfil fr delade bibliotek
+.
+.SH SYNOPS
+symbols
+.
+.SH BESKRIVNING
+Formatet fr posterna med utkad beroendeinformation fr delade bibliotek i
+dessa filer r:
+.PP
+\fIbiblioteks\-sonamn huvudberoendemall\fP
+.br
+[ | \fIalternativ\-beroendemall\fP ]
+.br
+[ ? ]
+.br
+[ * \fIfltnamn\fP: \fIfltvrde\fP ]
+.br
+[ ? ]
+ \fIsymbol\fP \fIminsta\-version\fP[ \fIid fr beroendemall\fP ]
+.P
+\fIBiblioteks\-sonamn\fP r det exakta vrdet frn SONAME\-fltet, som det
+exporteras frn \fBobjdump\fP(1). En \fIberoendemall\fP r ett beroende dr
+\fI#MINVER#\fP dynamiskt erstts av en versionskontrollrad "(>=
+\fIminsta\-version\fP)" eller av ingenting (om ett ej versionsstyrt beroende
+anses tillrckligt).
+.P
+Varje exporterad \fIsymbol\fP (anges som \fInamn\fP@\fIversion\fP, dr \fIversion\fP r
+"Base" om biblioteket inte r versionsstyrt) associeras med en
+\fIminsta\-version\fP i sin beroendemall (huvudberoendemallen anvnds om
+\fIid\-fr\-beroendemall\fP inte finns). Den frsta alternativa beroendemallen
+fr nummer 1, den andra 2, osv.
+.P
+Alla poster i ett bibliotek kan ven innehlla ngra flt med
+metainformation. Dessa flt lagras p rader som brjar med en asterisk. Fr
+nrvarande r det enda giltiga fltet \fIBuild\-Depends\-Package\fP, vilket anger
+namnet p det "\-dev"\-paket som hr till biblioteket, och anvnds av
+\fBdpkg\-shlibdeps\fP fr att se till att det beroende som genereras r
+tminstone lika strikt som motsvarande byggberoende.
+.SH EXEMPEL
+.SS "Enkla symbolfiler"
+.PP
+libftp.so.3 libftp3 #MINVER#
+ DefaultNetbuf@Base 3.1\-1\-6
+ FtpAccess@Base 3.1\-1\-6
+ [?]
+.SS "Avancerad symbols\-fil"
+.PP
+libGL.so.1 libgl1
+.br
+| libgl1\-mesa\-glx #MINVER#
+.br
+* Build\-Depends\-Package: libgl1\-mesa\-dev
+ publicGlSymbol@Base 6.3\-1
+ [?]
+ implementationSpecificSymbol@Base 6.5.2\-7 1
+ [?]
+.SH "SE VEN"
+\fBhttp://wiki.debian.org/Projects/ImprovedDpkgShlibdeps\fP
+.br
+\fBdpkg\-shlibdeps\fP(1), \fBdpkg\-gensymbols\fP(1).
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/deb-triggers.5 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-triggers.5
--- dpkg/man/sv/deb-triggers.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-triggers.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,69 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-triggers 5 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+deb\-triggers \- utlsare fr paket
+.
+.SH SYNOPS
+utlsare
+.
+.SH BESKRIVNING
+Ett paket anger hur det frhller sig till en eller flera utlsare genom att
+ta med en fil \fItriggers\fP i sitt styrarkiv (dvs. \fIDEBIAN/triggers\fP nr
+paketet skapas).
+.PP
+Filen innehller direktiv, ett per rad. Inledande och avslutande blanktecken
+och allt efter det frsta \fB#\fP p en rad kommer att klippas bort och tomma
+rader ignoreras.
+.PP
+De styrdirektiv som fr nrvarande stds fr utlsare r:
+.PP
+.in +5
+\fBinterest\fP \fIutlsarnamn\fP
+.PP
+.in +5
+\fBinterest\-noawait\fP \fIutlsarnamn\fP
+.PP
+.in +5
+Anger att paketet r intresserat av den namngivna utlsaren. Alla utlsare
+som ett paket r intresserat av mste listas genom att anvnda detta
+direktiv i utlsar\-styrfilen. Varianten "noawait" stter inte det utlsande
+paketet i avvaktande tillstnd. Detta br anvndas nr funktionaliteten som
+tillhandahlls av utlsaren inte r avgrande.
+.PP
+.in +5
+\fBactivate\fP \fIutlsarnamn\fP
+.PP
+.in +5
+\fBactivate\-noawait\fP \fIutlsarnamn\fP
+.PP
+.in +5
+Gr s att ndringar av detta pakets tillstnd aktiverar den angivna
+utlsaren. Utlsaren aktiveras nr en av fljande operationer pbrjas:
+uppackning, konfigurering, borttagning (ocks nr det tas bort till frdel
+av ett paket det str i konflikt med), rensning och
+avkonfigurering.Varianten "noawait" stter inte de utlsande paketen i
+avvaktande tillstnd. Detta br anvndas nr funktionaliteten som
+tillhandahlls av utlsaren inte r avgrande.
+.PP
+.in +5
+Om paketet frsvinner nr ett annat paket packas upp kommer utlsaren att
+aktiveras nr frsvinnandet upptcks mot slutet av uppackningen. Hantering
+av utlsare, och en vergng frn "vntar p utlsare" till "installerat"
+orsakar inte aktiveringar. Nr det gller uppackning kommer bde utlsare
+som omnmns i gamla och nya versioner av paketet att aktiveras.
+.PP
+Oknda direktiv r ett fel som frhindrar paketet frn att installeras.
+.PP
+Varianterna med "\-noawait" stds endast av dpkg 1.16.1 och senare, och
+kommer leda till fel om de anvnds med ldre versioner av dpkg. Det
+rekommenderas drfr att du lgger till ett "Pre\-Depends: dpkg (>=
+1.16.1)" till eventuella paket som vill anvnda dessa direktiv.
+.
+.SH "SE VEN"
+\fBdpkg\-trigger\fP(1), \fBdpkg\fP(1), \fB/usr/share/doc/dpkg\-dev/triggers.txt.gz\fP.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/deb-version.5 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-version.5
--- dpkg/man/sv/deb-version.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/deb-version.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,110 @@
+.\" Includes text from the Debian Policy probably by Ian Jackson and others
+.\" The copyright given below is that of the whole policy, but probably
+.\" incomplete.
+.\" Conversion to roff by Frank Lichtenheld
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH deb\-version 5 2011\-08\-14 Debianprojektet Debian
+.SH NAMN
+deb\-version \- Format p versionsnummer fr Debianpaket
+.
+.SH SYNOPS
+[\fIepok\fP\fB:\fP]\fIuppstrmsversion\fP[\fB\-\fP\fIdebianuppdatering\fP]
+.SH BESKRIVNING
+Versionsnummer som anvnds fr Debians binr\- och kllkodspaket bestr av
+tre komponenter. De r:
+.TP 
+\fIepok\fP
+Ett ensamt (vanligtvis litet) heltalsvrde strre n noll. Det kan
+uteslutas, i s fall antas det vara noll. Om det utesluts kan inte
+\fIuppstrmsversion\fP innehlla kolontecken.
+.IP
+Fltet r till fr att rtta till fel i versionsnummer i tidigare versioner
+av paketet, samt attr hantera frndringar i paketets
+versionsnumreringssystem.
+.TP 
+\fIuppstrmsversion\fP
+Detta r huvuddelen av versionsnumret. Det r vanligtvis versionsnumret fr
+originalpaketet ("uppstrmspaketet") som \fI.deb\fP\-filen skapats frn, om ett
+sdant finns. Normalt anges det p samma form som anvnds av
+uppstrmsfrfattaren/frfattarna, men det kan behva formateras om fr att
+passa med pakethanterarens format och jmfrelsefunktion.
+.IP
+Hur pakethanteraren jmfr versionsnummer nr det gller \fIuppstrmsversion\fP
+beskrivs nedan. Fltet \fIuppstrmsversion\fP i versionsnumret kan inte
+utelmnas.
+.IP
+Fltet \fIuppstrmsversion\fP kan endast innehlla alfanumeriska tecken
+("A\-Za\-z0\-9") och tecknen \fB.\fP \fB+\fP \fB\-\fP \fB:\fP \fB~\fP (punkt, plus,
+bindestreck, kolon, tilde) och br inledas med en siffra. Om det inte finns
+ngon \fIdebianuppdatering\fP tillts inte bindestreck och om det inte finns
+ngon \fIepok\fP tillts inte kolontecken.
+.TP 
+\fIdebianuppdatering\fP
+Denna del av versionsnumret anger versionen fr Debianpaketet som baserats
+p uppstrmsversionen. Den kan endast innehlla alfanumeriska tecken samt
+tecknen \fB+\fP \fB.\fP \fB~\fP (plus, punkt, tilde) och jmfrs p samma stt som
+\fIuppstrmsversion\fP.
+.IP
+Fltet r valfritt \- om det inte anges s kan inte \fIuppstrmsversion\fP
+innehlla ngot bindestreck. I s fall anger versionsnumret att en
+programvara skrivits specifikt fr att gras till ett Debianpaket, och att
+det d endast finns en "debianisering" av det och att drfr behvs ingen
+uppdateringsinformation vid sidan av.
+.IP
+Vanligtvis brjar \fIdebianuppdatering\fP om p "1" varje gng
+\fIuppstrmsversion\fP kas.
+.IP
+Dpkg delar upp versionsnumret vid det sista bindestrecket i strngen (om
+sdant finns) fr att bestmma \fIuppstrmsversion\fP och
+\fIdebianuppdatering\fP. Om \fIdebianuppdatering\fP saknas rknas det som tidigare
+n om fltet existerar (men notera att \fIdebianuppdatering\fP r den minst
+signifikanta delen av versionsnumret).
+.SS Sorteringsalgoritm
+Pakethanteringssystemet anvnder samma algoritm fr att jmfra
+\fIuppstrmsversion\fP\- och \fIdebianuppdatering\fP\-delarna:
+.PP
+Strngarna jmfrs frn vnster till hger.
+.PP
+Frst bestms de inledande delar av varje strng som enbart bestr av tecken
+som inte r siffror. Dessa bda delar (av vilka den ena kan vara tom)
+jmfrs lexikalt. Om en skillnad upptcks returneras den. Den lexikala
+jmfrelsen jmfr ASCII\-vrden, modifierad s att alla bokstver sorteras
+fre alla icke\-bokstver och s att ett tilde sorteras fre allt, ven i
+slutet av delstrngen. Till exempel r fljande delstrngar sorterade: "~~",
+"~~a", "~", tomma delstrngen, "a".
+.PP
+Drefter bestms de inledande delar av varje strng som enbart bestr av
+siffror. De numeriska vrdena av dessa delar jmfrs och om en skillnad
+upptcks i jmfrelsen returneras den som resultat av jmfrelsen. Fr detta
+ndaml rknas en tom strng (vilket bara kan uppst i slutet av den ena
+eller bda versionsstrngarna som jmfrs) som noll.
+.PP
+Dessa bda steg (jmfra och ta bort inledande strngar med icke\-siffror och
+siffror) upprepas till en jmfrelse upptcks eller de bda strngarna tar
+slut.
+.PP
+Observera att epokfltet r till fr att kunna rtta till tidigare misstag i
+versionsnumreringen, och att hantera situationer dr
+versionsnumreringsmetoden ndras. Det r \fBinte\fP tnkt att hantera
+versionsnummer som innehller strngar av bokstver som
+pakethanteringssystemet inte kan tolka (till exempel "ALPHA" eller "Pre\-"),
+eller dumma sorteringsordningar.
+.SH VARNINGAR
+Tildetecknets och dess speciella sorteringsegenskaper introducerades i dpkg
+version 1.10 och vissa delar av dpkg\-dev fick inte std fr det frrn
+senare i 1.10.x\-serien.
+.SH "SE VEN"
+\fBdeb\-control\fP(5), \fBdeb\fP(5), \fBdpkg\fP(1)
+.SH FRFATTARE
+Upphovsrttsskyddat  1996,1997,1998 Ian Jackson och Christian Schwarz
+.br
+Upphovsrttsskyddat  2007 Frank Lichtenheld
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg.1
--- dpkg/man/sv/dpkg.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,749 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg 1 2011\-08\-14 Debianprojektet Dpkg\-sviten
+.SH NAMN
+dpkg \- en mellannivpakethanterare fr Debian
+.
+.SH SYNOPS
+\fBdpkg\fP [\fIflagga\fP...] \fItgrd\fP
+.
+.SH VARNING
+Manualen r avsedd fr anvndare som vill f en mer detaljerad frstelse
+fr \fBdpkg\fPs kommandoradsflaggor och pakettillstnd n vad som berttas med
+\fBdpkg \-\-help\fP.
+
+Den br \fIinte\fP anvndas av paketansvariga som vill lra sig hur \fBdpkg\fP
+kommer att installera deras paket. Beskrivningen ver vad \fBdpkg\fP gr nr
+paket installeras och tas bort r speciellt otillrckliga.
+.
+.SH BESKRIVNING
+\fBdpkg\fP r ett verktyg fr att installera, bygga, ta bort och hantera
+Debianpaket. Det primra och mer anvndarvnliga skalet runt \fBdpkg\fP r
+\fBaptitude\fP(1). \fBdpkg\fP kontrolleras helt och hllet via
+kommandoradsparametrar, vilka bestr av exakt en tgrd och noll eller fler
+flaggor. tgrdsparametern talar om fr dpkg vad som skall gras, och
+flaggorna styr p vilket stt tgrden skall utfras.
+
+\fBdpkg\fP kan ocks anvndas som ett skal runt \fBdpkg\-deb\fP(1) och
+\fBdpkg\-query\fP(1). En frteckning ver tillgngliga tgrder beskrivs nedan i
+stycket \fBTGRDER\fP. Om \fBdpkg\fP upptcker en sdan tgrd anropas bara
+\fBdpkg\-dpkg\fP eller \fBdpkg\-query\fP med de givna flaggorna, men inga specifika
+flaggor snds direkt till dem, fr att anvnda sdana flaggor mste
+bakgrundsprogrammen anropas direkt.
+.
+.SH "INFORMATION OM PAKET"
+\fBdpkg\fP upprtthller viss anvndbar information om tillgngliga
+paket. Informationen delas in i tre klasser: \fBtillstnd\fP,
+\fBmarkeringstillstnd\fP och \fBflaggor\fP. Dessa vrden r avsedda att
+huvudsakligen ndras via \fBdselect\fP.
+.SS PAKETTILLSTND
+.TP 
+\fBej installerat\fP
+Paketet r inte installerat p ditt system.
+.TP 
+\fBkonfigurationsfiler\fP
+Endast konfigurationsfilerna fr paketet finns p systemet.
+.TP 
+\fBhalvt installerat\fP
+Installationen av paketet har pbrjats, men av ngon orsak inte slutfrts.
+.TP 
+\fBuppackat\fP
+Paketet r uppackat, men inte konfigurerat.
+.TP 
+\fBhalvt konfigurerat\fP
+Paketet r uppackat och konfigurationen har pbrjats, men av ngon orsak
+inte slutfrts.
+.TP 
+\fBvntar p utlsare\fP
+Paketet vntar p hantering av utlsare av ett annat paket.
+.TP 
+\fButlsare vntar\fP
+Paketet har utlsts.
+.TP 
+\fBinstallerat\fP
+Paketet r uppackat och korrekt instllt.
+.SS "MARKERINGSTILLSTND FR PAKET"
+.TP 
+\fBinstallera\fP
+Paketet r markerat fr installation.
+.TP 
+\fBhll\fP
+Ett paket som r markerat med \fBhll\fP hanteras inte av \fBdpkg\fP svida inte
+det framtvingas med flaggan \fB\-\-force\-hold\fP.
+.TP 
+\fBta bort\fP
+Paketet r markerat fr avinstallation (dvs. vi vill ta bort alla filer
+frutom konfigurationsfilerna).
+.TP 
+\fBrensa\fP
+Paketet r markerat fr rensning (dvs. vi vill ta bort allting frn
+systemkataloger, ven konfigurationsfiler).
+.SS PAKETFLAGGOR
+.TP 
+\fBominstallation krvs\fP
+Ett paket markerat \fBominstallation krvs\fP r trasigt och krver
+ominstallation. Dessa paket kan inte tas bort, svida inte det framtvingas
+med flaggan \fB\-\-force\-remove\-reinstreq\fP.
+.
+.SH TGRDER
+.TP 
+\fB\-i\fP, \fB\-\-install\fP \fIpaketfil\fP...
+Installera paketet.  Om flaggan \fB\-\-recursive\fP eller \fB\-R\fP anges mste
+\fIpaketfil\fP istllet vara en katalog.
+
+Installationen bestr av fljande steg:
+.br
+
+\fB1.\fP Extrahera styrfilerna ur paketet.
+.br
+
+\fB2.\fP Om en annan version av samma paket redan fanns installerat vid
+nyinstallationen exekveras \fIprerm\fP\-skriptet fr det gamla paketet.
+.br
+
+\fB3.\fP Kr \fIpreinst\fP\-skriptet, om ett sdant medfljer paketet.
+.br
+
+\fB4.\fP Packa upp de nya filerna och skerhetskopiera samtidigt de gamla
+filerna s att de kan terstllas om ngonting gr fel.
+.br
+
+\fB5.\fP Om en annan version av samma paket redan fanns installerat vid
+nyinstallationen exekveras \fIpostrm\fP\-skriptet fr det gamla
+paketet. Observera att skriptet exekveras efter \fIpreinst\fP fr det nya
+paketet eftersom de nya filerna skrivs samtidigt som de gamla tas bort.
+.br
+
+\fB6.\fP Konfigurera paketet. Se \fB\-\-configure\fP fr detaljerad information om
+hur man gr det.
+.TP 
+\fB\-\-unpack \fP\fIpaketfil\fP ...
+Packa upp paketet, men konfigurera det inte. Om flaggan \fB\-\-recursive\fP eller
+\fB\-R\fP anges mste \fIpaketfil\fP istllet vara en katalog.
+.TP 
+\fB\-\-configure \fP\fIpaket\fP...|\fB\-a\fP|\fB\-\-pending\fP
+Konfigurera ett paket som har packats upp men nnu inte konfigurerats. Om
+\fB\-a\fP eller \fB\-\-pending\fP anges istllet fr \fIpaket\fP konfigureras alla paket
+som har packats upp men nnu inte konfigurerats.
+
+Fr att omkonfigurera ett paket som redan har konfigurerats kan du istllet
+anvnda kommandot \fBdpkg\-reconfigure(8)\fP.
+
+Konfigurering bestr av fljande steg:
+.br
+
+\fB1.\fP Packa upp konfigurationsfilerna och skerhetskopiera samtidigt de
+gamla konfigurationsfilerna s att de kan terstllas om ngonting gr fel.
+.br
+
+\fB2.\fP Kr \fIpostinst\fP\-skriptet, om ett sdant finns i paketet.
+.TP 
+\fB\-\-triggers\-only\fP \fIpaket\fP...|\fB\-a\fP|\fB\-\-pending\fP
+Hanterar bara utlsare. Alla avvaktande utlsare kommer att hanteras. Om
+paketnamn anges kommer endast dessa pakets utlsare att hanteras, precis en
+gng, om ndvndigt. Om du anvnder denna flagga kan det hnda att paket
+hamnar i felaktiga \fBvntar p utlsare\fP\- och \fButlsare
+vntar\fP\-tillstnd. Detta kan rttas senare genom att kra: \fBdpkg
+\-\-configure \-\-pending\fP.
+.TP 
+\fB\-r\fP, \fB\-\-remove\fP, \fB\-P\fP, \fB\-\-purge \fP\fIpaket\fP...|\fB\-a\fP|\fB\-\-pending\fP
+Ta bort ett installerat paket. \fB\-r\fP eller \fB\-\-remove\fP tar bort allting
+frutom konfigurationsfiler, vilket gr att du kan undvika att konfigurera
+om paketet om du senare installerar om det. (Konfigurationsfiler r de filer
+som listas i styrfilen \fIdebian/conffiles\fP). \fB\-P\fP eller \fB\-\-purge\fP tar bort
+allting, inklusive konfigurationsfiler. Om \fB\-a\fP eller \fB\-\-pending\fP anges
+istllet fr ett paketnamn kommer alla installerade uppackade paket som r
+markerade att tas bort eller rensas i filen \fI/var/lib/dpkg/status\fP att tas
+bort respektive rensas. Observera: fet r mjligt att \fBdpkg\fP inte knner
+till vissa konfigurationsfiler p grund av att de skapas och hanteras
+separat via konfigurationsskript. I s fall kommer inte \fBdpkg\fP sjlvt ta
+bort dem, utan paketets \fIpostrm\fP\-skript (som anropas av \fBdpkg\fP) mste ta
+hand om att de tas bort nr paketet tas bort med \fB\-\-purge\fP. Detta gller
+naturligtvis endast fr filer i systemkatalogerna, inte konfigurationsfiler
+som skrivs i enstaka anvndares hemkataloger.
+
+Borttagning av ett paket bestr av fljande steg:
+.br
+
+\fB1.\fP Kr \fIprerm\fP\-skriptet
+.br
+
+\fB2.\fP Ta bort de installerade filerna
+.br
+
+\fB3.\fP Kr \fIpostrm\fP\-skriptet
+.br
+.TP 
+\fB\-\-update\-avail\fP, \fB\-\-merge\-avail\fP \fIPackages\-fil\fP
+Uppdatera \fBdpkg\fPs och \fBdselect\fPs lista ver vilka paket som finns
+tillgngliga. Med \fB\-\-merge\-avail\fP kombineras den gamla informationen med
+informationen frn \fIPackages\-filen\fP. Med \fB\-\-update\-avail\fP erstts den
+gamla informationen med informationen frn
+\fIPackages\-filen\fP. \fIPackages\-filerna\fP som medfljer Debian heter helt
+enkelt \fIPackages\fP. \fBdpkg\fP behller sin lista ver tillgngliga paket i
+\fI/var/lib/dpkg/available\fP.
+
+Ett lttare enkelkommando fr att hmta och uppdater \fIavailable\fP\-filen r
+\fBdselect update\fP. Observera att den hr filen i huvudsak r ondig om du
+anvnder ett APT\-baserat skal istllet fr \fBdselect\fP: APT har ett eget
+system fr att hlla reda p tillgngliga paket.
+.TP 
+\fB\-A\fP, \fB\-\-record\-avail\fP \fIpaketfil\fP ...
+Uppdatera \fBdpkg\fPs och \fBdselect\fPs lista ver vilka paket som finns
+tillgngliga med information frn paketet \fIpaketfil\fP. Om flaggan
+\fB\-\-recursive\fP eller \fB\-R\fP anges mste \fIpaketfil\fP istllet vara en katalog.
+.TP 
+\fB\-\-forget\-old\-unavail\fP
+En numera \fBfrldrad\fP flagga som inte utfr ngonting, d \fBdpkg\fP
+automatiskt glmmer ej installerade och ej tillgngliga paket.
+.TP 
+\fB\-\-clear\-avail\fP
+Radera existerande information om vilka paket som r tillgngliga.
+.TP 
+ \fB\-C\fP, \fB\-\-audit\fP
+Sker efter paket som endast installerats delvis p ditt system. \fBdpkg\fP
+kommer att fresl vad som behver gras fr att f dem att fungera.
+.TP 
+\fB\-\-get\-selections\fP [\fIpaketnamnsmnster\fP...]
+Hmta en lista ver paketval och skriv den till standard ut. Paket som inte
+r installerats (dvs. de som tidigare helt har tagits bort) kommer inte att
+visas om inte ett mnster anges.
+.TP 
+\fB\-\-set\-selections\fP
+Stt paketvalslistan med den fil som lses frn standard in. Filen mste
+vara p formatet "\fIpaket\fP \fIstatus\fP", dr status r en av \fBinstall\fP,
+\fBhold\fP, \fBdeinstall\fP eller \fBpurge\fP. Tomrader och kommentarsrader som
+brjar med "#" r ocks tilltna.
+.TP 
+\fB\-\-clear\-selections\fP
+Stt det nskade tillstndete fr varje icke\-grundlggande paket till
+avinstallera. Detta r avsett att anvndas direkt fre \-\-set\-selections, fr
+att avinstallera alla paket som inte finns med i listan som anges av
+\-\-set\-selections.
+.TP 
+\fB\-\-yet\-to\-unpack\fP
+Sker efter paket som markerats fr installation men som av ngon anledning
+nnu inte har installerats.
+.TP 
+.TP 
+\fB\-\-print\-architecture\fP
+Visa arkitektur fr paketen \fBdpkg\fP installerar (till exempel "i386").
+.TP 
+\fB\-\-compare\-versions \fP\fIver1 op ver2\fP
+Jmfr versionsnummer, dr \fIop\fP r en binr operator. \fBdpkg\fP returnerar
+framgng (noll) om det angivna vrdet uppfylls, och misslyckande (icke\-noll)
+i annat fall. Det finns tv grupper operatorer, vilka endast skiljer sig i
+hur de hanterar nr \fIver1\fP eller \fIver2\fP r tom. Dessa hanterar tom version
+som om den r tidigare n alla andra versioner: \fBlt le eq ne ge gt\fP. Dessa
+hanterar tom version som om den r senare n alla andra versioner: \fBlt\-nl
+le\-nl ge\-nl gt\-nl\fP. Dessa tillhandahlls endast fr kompatibilitet med
+styrfilssyntaxen: \fB< << <= = >= >> >\fP.
+.TP 
+\fB\-\-command\-fd \fP\fIn\fP
+Lser en fljd av kommandon frn indatafilhandtag \fIn\fP. Observera:
+ytterligare flaggor som stts p kommandoraden, och genom filhandtaget,
+terstlls inte fr kommandon som krs i en fljd under samma krning.
+.TP 
+\fB\-\-help\fP
+Visar en kortfattad hjlptext.
+.TP 
+\fB\-\-force\-help\fP
+Get hjlp om \fB\-\-force\-\fP\fInnting\fP\-flaggorna.
+.TP 
+\fB\-Dh\fP, \fB\-\-debug=help\fP
+Ger hjlp om felskningsflaggorna.
+.TP 
+\fB\-\-version\fP
+Visar \fBdpkg\fPs versionsinformation.
+.TP 
+\fBdpkg\-deb\-tgrder\fP
+Se \fBdpkg\-deb\fP(1) fr ytterligare information om fljande tgrder:
+
+.nf
+\fB\-b\fP, \fB\-\-build\fP \fIkatalog\fP [\fIarkiv\fP|\fIfilnamn\fP]
+    Bygg ett deb\-paket.
+\fB\-c\fP, \fB\-\-contents\fP \fIarkiv\fP
+    Visar innehllet i ett deb\-paket.
+\fB\-e\fP, \fB\-\-control\fP \fIfilnamn\fP [\fIkatalog\fP]
+    Extraherar styrinformation frn ett paket.
+\fB\-x\fP, \fB\-\-extract\fP \fIarkivkatalog\fP
+    Extraherar filerna frn ett paket.
+\fB\-X\fP, \fB\-\-vextract\fP \fIarkivkatalog\fP
+    Extraherar och visar filnamnen i ett paket.
+\fB\-f\fP, \fB\-\-field\fP  \fIarkiv\fP [\fIcontrol\-flt\fP] ...
+    Visar flt frn paketets styrfil (control).
+\fB\-\-fsys\-tarfile\fP \fIarkiv\fP
+    Visar filsystems\-tarfilen i Debianpaketet.
+\fB\-I\fP | \fB\-\-info\fP \fIarkiv\fP [\fIcontrol\-fil\fP]
+    Visa information om ett paket.
+.fi
+
+.TP 
+\fBdpkg\-query\-tgrder\fP
+Se \fBdpkg\-query\fP(1) fr ytterligare information om fljande tgrder:
+
+.nf
+
+\fB\-l\fP, \fB\-\-list\fP \fIpaketnamnsmnster\fP ...
+    Lista paket som matchar det givna mnstret.
+\fB\-s\fP, \fB\-\-status\fP \fIpaketnamn\fP ...
+    Rapportera status om det angivna paketet.
+\fB\-L\fP, \fB\-\-listfiles\fP \fIpaketnamn\fP ...
+    Lista filer som installerats p ditt system frn \fIpaketnamn\fP.
+\fB\-S\fP, \fB\-\-search\fP \fIfilnamnsskmnster\fP ...
+    Sk efter filnamnet bland de installerade paketen.
+\fB\-p\fP, \fB\-\-print\-avail\fP \fIpaketnamn\fP
+    Visa detaljer om \fIpaketnamn\fP, som i \fI/var/lib/dpkg/available/\fP.    De som anvnder APT\-baserade skal br i stllet anvnda    \fBapt\-cache show\fP \fIpaketnamn\fP.
+.fi
+.
+.SH FLAGGOR
+Alla flaggorna kan ges bde p kommandoraden och i \fBdpkg\fPs
+konfigurationsfil \fI/etc/dpkg/dpkg.cfg\fP eller filerna i
+konfigurationskatalogen \fI/etc/dpkg/dpkg.cfg.d/\fP. En rad i
+konfigurationsfilen r antingen en flagga (precis samma som p
+kommandoraden, men utan inledande bindestreck) eller en kommentar (om den
+brjar med ett \fB#\fP).
+.br
+.TP 
+\fB\-\-abort\-after=\fP\fIantal\fP
+Stller in efter hur mnga fel \fBdpkg\fP skall avbryta. Frvalet r 50.
+.TP 
+\fB\-B\fP, \fB\-\-auto\-deconfigure\fP
+Nr ett paket tas bort r det mjligt att ett annat paket beror p det
+borttagna paketet. Om du anger flaggan kommer de paket som beror p det
+borttagna paketet automatiskt att avkonfigureras.
+.TP 
+\fB\-D\fP\fIoktalvrde\fP\fB, \-\-debug=\fP\fIoktalvrde\fP
+Aktiverar felskning. \fIoktalvrde\fPt skapas genom att utfra bitvis logisk
+"eller" av de nskade vrdena frn listan nedan (observera att dessa vrden
+kan ndras i framtida versioner). \fB\-Dh\fP eller \fB\-\-debug=help\fP visar dessa
+felskningsvrden.
+
+    Tal   Beskrivning
+      1   Allmnt hjlpsam frloppsinformation
+      2   Anrop och status fr utvecklarskript
+     10   Utdata fr varje fil som hanteras
+    100   Massvis med utdata fr varje fil som hanteras
+     20   Utdata fr varje konfigurationsfil
+    200   Massvis med utdata fr varje konfigurationsfil
+     40   Beroenden och konflikter
+    400   Massvis av beroende\-/konfliktutdata
+  10000   Aktivering och hantering av utlsare
+  20000   Massvis av utdata om utlsare
+  40000   Dumma mngder utdata om utlsare
+   1000   Massvis av pladder om bl.a dpkg/info\-katalogen
+   2000   Knppa mngder pladder
+.TP 
+\fB\-\-force\-\fP\fIsaker\fP | \fB\-\-no\-force\-\fP\fIsaker\fP | \fB\-\-refuse\-\fP\fIsaker\fP
+
+Tvinga eller vgra (\fBno\-force\fP och \fBrefuse\fP betyder detsamma) att gra
+vissa saker. \fIsaker\fP r en kommaavgrnsad lista med saker som anges
+nedan. \fB\-\-force\-help\fP visar en lista med beskrivningar. Saker som markeras
+med (*) r tvingade som frval.
+
+\fIVarning: Dessa flaggor r huvudsakligen avsedda att endast anvndas av
+experter. Om du anvnder dem utan att fullt ut frst vad de gr ut p kan
+du frstra din systeminstallation.\fP
+
+\fBall\fP: Slr p (eller av) alla tvingande flaggor.
+
+\fBdowngrade\fP(*): Installera ett paket ven om en nyare version redan r
+installerad.
+
+\fIVarning: Fr nrvarande undersker inte dpkg beroenden vid nedgradering
+och kommer drfr inte att varna dig om nedgraderingen bryter ett beroende
+fr ngot paket. Detta kan ha allvarliga sidoeffekter, genom att nedgradera
+grundlggande systemkomponenter kan du riskera att gra hela systemet
+instabilt. Anvnd med tillfrsikt.\fP
+
+\fBconfigure\-any\fP: Konfigurera ven alla uppackade men ej konfigurerade paket
+p vilka det aktuella paketet beror.
+
+\fBhold\fP: Hantera ven "hll"\-markerade paket.
+
+\fBremove\-reinstreq\fP: Ta bort ett paket ven om det r trasigt och markerat
+att vara i behov av ominstallation. Detta kan, till exempel, gra s att
+delar av paketet blir kvar p systemet, men glms bort av \fBdpkg\fP.
+
+\fBremove\-essential\fP: Ta bort paketet ven om det anses som viktigt
+(essential). Viktiga paket r huvudsakligen de mest grundlggande
+Unixkommandona. Om du tar bort dem kan det gra s att hela systemet slutar
+fungera, s anvnd med tillfrsikt.
+
+\fBdepends\fP: Gr alla beroendeproblem till varningar.
+
+\fBdepends\-version\fP: Ignorera versionsnummer nr beroenden kontrolleras.
+
+\fBbreaks\fP: Installera, ven om det skulle frstra ett annat paket.
+
+\fBconflicts\fP: Installera ven om paket som r i konflikt (krockar) med ett
+annat paket. Detta r farligt, eftersom det oftast leder till att vissa
+filer skrivs ver.
+
+\fBconfmiss\fP: Installera alltid saknade konfigurationsfiler. Detta r
+farligt, eftersom det inte bibehller ndringar (raderingar) av filer.
+
+\fBconfnew\fP: Installera alltid nya versioner av ndrade konfigurationsfiler
+utan att frga, svida inte \fB\-\-force\-confdef\fP ocks anges, i vilket fall
+det frvalda alternativet kommer att utfras.
+
+\fBconfold\fP: Installera aldrig nya versioner av ndrade konfigurationsfiler
+utan att frga, svida inte \fB\-\-force\-confdef\fP ocks anges, i vilket fall
+det frvalda alternativet kommer att utfras.
+
+\fBconfdef\fP: Utfr alltid frvalt alternativt fr ndrade
+konfigurationsfiler. Om inget frval har angivits kommer programmet stanna
+och frga anvndaren svida inte \fB\-\-force\-confnew\fP eller \fB\-\-force\-confold\fP
+ocks angetts, i s fall anvnds den fr att bestmma vad som skall utfras.
+
+\fBconfask\fP: Erbjud alltid att erstta en modifierad konfigurationsfil med
+versionen i paketet, ven om versionen i paketet inte ndrades. Om ngon av
+\fB\-\-force\-confmiss\fP, \fB\-\-force\-confnew\fP, \fB\-\-force\-confold\fP eller
+\fB\-\-force\-confdef\fP ocks angetts, s anvnds den fr att bestmma vad som
+skall utfras.
+
+\fBoverwrite\fP: Skriv ver ett pakets filer med ett annats.
+
+\fBoverwrite\-dir\fP Skriv ver ett pakets kataloger med ett annats filer.
+
+\fBoverwrite\-diverted\fP: Skriv ver en omdirigerad fil med en ej omdirigerad
+version.
+
+\fBunsafe\-io\fP: Utfr inte skra I/O\-operationer vid uppackning. Detta innebr
+fr nrvarande att filsystemssynkroniseringar inte utfrs innan namn p
+filer ndras, ngot som vi vet kan pverka prestanda betydligt negativt fr
+vissa filsystem, vilket tyvrr r samma system som behver sker I/O p
+grund av att de har ett otillfrlitligt beteende som orsakar tomma filer vid
+tvra systemkrascher.
+
+\fIObservera\fP: Fr ext4, den vrsta syndaren, kan det vara vrt att istllet
+anvnda monteringsflaggan \fBnodelalloc\fP, vilken bde korrigerar
+prestandafrlusten och dataskerhetsproblemen, det sistnmnda genom att inte
+lta filsystemet skapa tomma filer vid tvra krascher fr programvara som
+inte utfr synkronisering fre atomra namnbyten.
+
+\fIVarning: Den hr flaggan kan ge bttre prestanda p bekostnad av
+datafrluster, anvnd med tillfrsikt.\fP
+
+\fBarchitecture\fP: Hantera ven paket med fel eller saknad
+maskinvaruarkitektur.
+
+\fBbad\-version\fP: Hantera ven paket med fel versioner.
+
+\fBbad\-path\fP: Skvgen i \fBPATH\fP saknar viktiga program, s problem r
+troliga.
+
+\fBnot\-root\fP: Frsk (av)installera saker ven utan att vara root.
+
+\fBbad\-verify\fP: Installera ett paket ven om det inte gr att verifiera dess
+kthet.
+
+.TP 
+\fB\-\-ignore\-depends\fP=\fIpaket\fP,...
+Ignorera beroendekontroll fr angivna paket (i verkligheten utfrs
+kontrollen, men det ges endast varningar, ingenting annat).
+.TP 
+\fB\-\-no\-act\fP, \fB\-\-dry\-run\fP, \fB\-\-simulate\fP
+Gr allting som efterfrgas, men skriv inte ngra ndringar. Detta anvnds
+fr att se vad som skulle ha hnt med tgrden utan att faktiskt ndra
+ngot.
+
+Se till att du anger \fB\-\-no\-act\fP fre tgrdsflaggan, annars kan du f
+onskade biverkningar (t.ex s kommer \fBdpkg \-\-purge foo \-\-no\-act\fP frst att
+rensa ut paketet foo fr att sedan frska rensa ut paketet \-\-no\-act, trots
+att du troligen frvntade dig att ingenting skulle utfras)
+.TP 
+\fB\-R\fP, \fB\-\-recursive\fP
+Hantera alla vanliga filer som matchar skmnstret \fB*.deb\fP rekursivt i de
+kataloger som anges, med alla sina underkataloger. Flaggan kan anvndas
+tillsammans med \fB\-i\fP, \fB\-A\fP, \fB\-\-install\fP, \fB\-\-unpack\fP och \fB\-\-avail\fP.
+.TP 
+\fB\-G\fP
+Installera inte paketet om en nyare version av samma paket redan r
+installerat. Detta r ett alias fr \fB\-\-refuse\-downgrade\fP.
+.TP 
+\fB\-\-admindir=\fP\fIkat\fP
+ndra frvald administrationskatalog, vilken innehller flera filer som
+beskriver status fr installerade eller avinstallerade paket,
+osv. (standardvrde r \fI/var/lib/dpkg\fP)
+.TP 
+\fB\-\-instdir=\fP\fIkatalog\fP
+ndra standardinstallationskatalog, vilket anger katalogen dr paket skall
+installeras. \fBinstdir\fP r ven katalogen som skickas som argument till
+\fBchroot\fP(2) innan paketets installationsfiler krs, vilket betyder att
+skripten ser \fBinstdir\fP som rotkatalog. (Frval r \fI/\fP)
+.TP 
+\fB\-\-root=\fP\fIkatalog\fP
+Genom att ndra \fBrot\fP s ndras \fBinstallationskatalog\fP till \fIkatalog\fP och
+\fBadministrationskatalog\fP till \fIkatalog\fP\fB/var/lib/dpkg\fP.
+.TP 
+\fB\-O\fP, \fB\-\-selected\-only\fP
+Hantera endast paket som markerats fr installation. Sjlva markeringen
+utfrs med \fBdselect\fP eller av \fBdpkg\fP nr paketen hanteras. Till exempel
+kommer paket som tas bort att markeras fr installation.
+.TP 
+\fB\-E\fP, \fB\-\-skip\-same\-version\fP
+Installera inte paketet om samma version av paketet redan r installerat.
+.P
+\fB\-\-pre\-invoke=\fP\fIkommando\fP
+.br
+\fB\-\-post\-invoke=\fP\fIkommando\fP
+.RS
+Stter en anropshake \fIkommando\fP som krs via "sh \-c" fre eller efter dpkg
+krs fr tgrderna \fIunpack\fP, \fIconfigure\fP, \fIinstal\fP, \fItriggers\-only\fP,
+\fIremove\fP och \fIpurge\fP. Flaggan kan anges flera gnger. Ordningen p
+flaggorna som anges behlls och de som anges i konfigurationsfilen har
+fretrde. Miljvariabeln \fBDPKG_HOOK_ACTION\fP stts fr hakar i den
+nuvarande dpkg\-tgrden. Observera: Skal kan anropa dpkg flera gnger per
+krning, vilket kan gra att hakarna krs fler gnger n frvntat.
+.RE
+.P
+\fB\-\-path\-exclude=\fP\fIfilnamnsmnster\fP
+.br
+\fB\-\-list\fP\fIfilnamnsmnster\fP
+.RS
+Stt \fIfilnamnsmnster\fP som ett skvgsfilter, antingen genom att exkludera
+eller ter inkludera tidigare exkluderade skvgar som motsvarar det angivna
+mnstret under installationen.
+
+\fIVarning: tnk p att du kan totalt delgga ditt system, beroende p vilka
+skvgar du exkluderar, s anvnd med tillfrsikt.\fP
+
+Filnamnsmnstrena anvnder samma sorts jokertecken som skalet, dr "*"
+motsvarar en sekvens av valfritt antal tecken, inklusive den tomma strngen
+och ven "/". Till exempel p motsvarar \fI"/usr/*/READ*"\fP
+\fI"/usr/share/doc/paket/README"\fP. "?" motsvarar som vanligt ett ensamt
+tecken (ven hr ingr "/"). Och "[" inleder en teckenklass, som kan
+innehlla en lista ver tecken, intervall och komplement. Se \fBglob\fP(7) fr
+detaljerad information om filnamnsmnster. Observera: den nuvarande
+implementationen kan terinkludera fler kataloger och symboliska lnkar n
+ndvndigt, fr att vara p den skra sidan och undvika mjliga
+uppackningsfel, framtida ndringar kan komma att rtta detta.
+
+Detta kan anvndas fr att ta bort alla skvgar frutom ngra specifika;
+ett typiskt anvndningsomrde r:
+
+.nf
+\fB\-\-path\-exclude=/usr/share/doc/*\fP
+\fB\-\-path\-include=/usr/share/doc/*/copyright\fP
+.fi
+
+fr att ta bort alla dokumentationsfiler frutom upphovsrttsinformation.
+
+Dessa tv flaggor kan anges flera gnger, och kan interfolieras med
+varandra. De hanteras bda i den givna ordningen och det r den sista regeln
+som motsvarar ett filnamn som fller avgrandet.
+.RE
+.TP 
+\fB\-\-status\-fd \fP\fIn\fP
+Snd maskinlsbar paketstatus och frloppsinformation till filhandtag
+\fIn\fP. Flaggan kan anges flera gnger. Informationen lagras vanligtvis rad
+fr rad, i fljande format:
+.RS
+.TP 
+\fBstatus: \fP\fIpaket\fP\fB: \fP\fIstatus\fP
+Paketstatus ndrad; \fIstatus\fP r som i statusfilen.
+.TP 
+\fBstatus: \fP\fIpaket\fP\fB : error : \fP\fIutkat\-felmeddelande\fP
+Ett fel uppstod. Eventuella nyradstecken i \fIutkat\-felmeddelanden\fP kommer
+ersttas med blanksteg innan de skrivs ut.
+.TP 
+\fBstatus: \fP\fIfil\fP\fB : conffile\-prompt : '\fP\fIriktig\-gammal\fP\fB' '\fP\fIriktig\-ny\fP\fB' \fP\fIanvndarredigerad\fP\fB \fP\fIdistredigerad\fP
+Anvndaren fr en frga om konfigurationsfiler.
+.TP 
+\fBprocessing: \fP\fIskede\fP\fB: \fP\fIpaket\fP
+Snds precis innan ett hanteringsskede pbrjas. \fISkede\fP r ngot av
+\fBupgrade\fP, \fBinstall\fP (bda snds innan paketet packas upp), \fBconfigure\fP,
+\fBtrigproc\fP, \fBdisappear\fP, \fBremove\fP, \fBpurge\fP.
+.RE
+.TP 
+\fB\-\-status\-logger\fP=\fIkommando\fP
+Snd maskinlsbar paketstatus och frloppsinformation till
+skal\-\fIkommando\fPts standard in. Flaggan kan anges flera
+gnger. Utdataformatet som anvnds r detsamma som fr \fB\-\-status\-fd\fP.
+.RE
+.TP 
+\fB\-\-log=\fP\fIfilnamn\fP
+Logga statusndringsmeddelanden och kommandon till \fIfilnamn\fP, istllet fr
+frvalet \fI/var/log/dpkg.log\fP. Om flaggan ges flera gnger anvnds det sista
+filnamnet. Loggmeddelanden r p formen "\-MM\-DD HH:MM:SS status
+\fItillstnd\fP \fIpaket\fP \fIinstallerad\-version\fP" fr statusndringar;
+"\-MM\-DD HH:MM:SS \fItgrd\fP \fIpaket\fP \fIinstallerad\-versiont\fP
+\fItillgnglig\-version\fP" fr tgrder dr \fItgrd\fP r ett av \fBinstall\fP,
+\fBupgrade\fP, \fBremove\fP, \fBpurge\fP; samt "\-MM\-DD HH:MM:SS conffile
+\fIfilnamn\fP \fIval\fP" fr konfigurationsfilsndringar dr \fIval\fP antingen r
+\fBinstall\fP eller \fBkeep\fP.
+.TP 
+\fB\-\-no\-debsig\fP
+Frsk inte verifiera paketsignaturer.
+.TP 
+\fB\-\-no\-triggers\fP
+Utfr inte utlsare i denna krning (aktiveringar kommer fortfarande att
+antecknas). Om det anvnds tillsammans med \fB\-\-configure\fP \fIpaket\fP eller
+\fB\-\-triggers\-only\fP \fIpaket\fP kommer det namngivna paketets postinst
+fortfarande att kras ven om det enda som behvdes var en krning av
+utlsare. Om du anvnder denna flagga kan det hnda att paket hamnar i
+felaktiga \fBvntar p utlsare\fP\- och \fButlsare vntar\fP\-tillstnd. Detta kan
+rttas senare genom att kra: \fBdpkg \-\-configure \-\-pending\fP.
+.TP 
+\fB\-\-triggers\fP
+verstyr ett tidigare \fB\-\-no\-triggers\fP.
+.
+.SH FILER
+.TP 
+\fI/etc/dpkg/dpkg.cfg\fP
+Konfigurationsfil med frvalda instllningar.
+.TP 
+\fI/var/log/dpkg.log\fP
+Frvald loggfil (se \fI/etc/dpkg/dpkg.cfg\fP(5) och flaggan \fB\-\-log\fP).
+.P
+vriga filer som listas hr finns i sina frvalda kataloger, se flaggan
+\fB\-\-admindir\fP fr information om hur du ndrar placeringen av dessa filer.
+.TP 
+\fI/var/lib/dpkg/available\fP
+Lista ver tillgngliga paket.
+.TP 
+\fI/var/lib/dpkg/status\fP
+Status fr tillgngliga paket. Filen innehller information om huruvida ett
+paket r markerat fr borttagning eller ej, om det r installerat eller ej,
+osv. Se sektionen \fBINFORMATION OM PAKET\fP fr ytterligare information.
+
+Statusfilen skerhetskopieras dagligen i \fI/var/backups\fP. Det kan vara
+nyttigt om den gr frlorad eller skrivs snder p grund av problem med
+filsystemet.
+.P
+Fljande filer r komponenter i det binra paketet. Se \fBdeb\fP(5) fr
+ytterligare information om dem:
+.TP 
+\fIcontrol\fP
+.TP 
+\fIconffiles\fP
+.TP 
+\fIpreinst\fP
+.TP 
+\fIpostinst\fP
+.TP 
+\fIprerm\fP
+.TP 
+\fIpostrm\fP
+.
+.SH MILJVARIABLER
+.TP 
+\fBHOME\fP
+Om satt s kommer \fBdpkg\fP att anvnda det som den katalog frn vilken det
+skall lsa den anvndarspecifika konfigurationsfilen.
+.TP 
+\fBTMPDIR\fP
+Om satt s kommer \fBdpkg\fP att anvnda det som den katalog dr det skapar
+temporra filer och kataloger.
+.TP 
+\fBPAGER\fP
+Programmet \fBdpkg\fP kommer att exekveras fr att visa konfigurationsfiler.
+.TP 
+\fBSHELL\fP
+Programmet \fBdpkg\fP kommer att exekveras nr ett nytt skal startas.
+.TP 
+\fBCOLUMNS\fP
+Stter antalet kolumner \fBdpkg\fP skall anvnda nr formaterad text
+visas. Anvnds fr nrvarande enbart av \-l.
+.TP 
+\fBDPKG_SHELL_REASON\fP
+Definieras av \fBdpkg\fP i skalet som startas fr att underska situationen
+efter konfigurationsfilsfrgan. Tilltna vrden r fr nrvarande:
+\fBconffile\-prompt\fP.
+.TP 
+\fBDPKG_CONFFILE_OLD\fP
+Definieras av \fBdpkg\fP i skalet som startas fr att underska situationen
+efter konfigurationsfilsfrgan. Innehller skvgen till den gamla
+konfigurationsfilen.
+.TP 
+\fBDPKG_CONFFILE_NEW\fP
+Definieras av \fBdpkg\fP i skalet som startas fr att underska situationen
+efter konfigurationsfilsfrgan. Innehller skvgen till den nya
+konfigurationsfilen.
+.TP 
+\fBDPKG_RUNNING_VERSION\fP
+Definieras av \fBdpkg\fP i utvecklarskriptets milj till versionen av den
+instans av \fBdpkg\fP som krs fr tillfllet.
+.TP 
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP
+Definieras av \fBdpkg\fP i utvecklarskriptets milj till namnet p paketet som
+hanteras.
+.TP 
+\fBDPKG_MAINTSCRIPT_ARCH\fP
+Definieras av \fBdpkg\fP i utvecklarskriptets milj till arkitekturen paketet
+byggdes fr.
+.TP 
+\fBDPKG_MAINTSCRIPT_NAME\fP
+Definieras av \fBdpkg\fP i utvecklarskriptets milj till namnet p det skript
+som krs (preinst, postinst, prerm, postrm).
+.
+.SH EXEMPEL
+Fr att lista paket relaterade till textredigeringsprogrammet \fBvi\fP(1):
+.br
+     \fBdpkg \-l \(aq*vi*\(aq\fP
+.br
+
+Fr att se posterna i \fI/var/lib/dpkg/available\fP fr tv paket:
+.br
+     \fBdpkg \-\-print\-avail elvis vim | less\fP
+.br
+
+Fr att sjlv ska i paketlistan:
+.br
+     \fBless /var/lib/dpkg/available\fP
+.br
+
+Fr att ta bort det installerade paketet elvis:
+.br
+     \fBdpkg \-r elvis\fP
+.br
+
+Fr att installera ett paket mste du frst leta p det i ett arkiv eller p
+en cd\-rom. Filen "available" visar att vim\-paketet finns i sektionen
+"editors":
+.br
+     \fBcd /media/cdrom/pool/main/v/vim\fP
+     \fBdpkg \-i vim_4.5\-3.deb\fP
+.br
+
+Fr att gra en lokal kopia av paketmarkeringarna:
+.br
+     \fBdpkg \-\-get\-selections >mitturval\fP
+.br
+
+Du kan verfra filen till en annan dator och installera den dr genom att
+skriva:
+.br
+     \fBdpkg \-\-clear\-selections\fP
+     \fBdpkg \-\-set\-selections <mitturval\fP
+.br
+
+Observera att detta faktiskt inte kommer installera eller ta bort ngonting,
+utan bara stta valstatus p de efterfrgade paketen. Du mste anvnda ett
+annat program fr att faktiskt hmta och installera de efterfrgade
+paketen. Till exempel kan du kra \fBapt\-get dselect\-upgrade\fP.
+
+Fr normalt bruk kommer du att upptcka att \fBdselect\fP(1) tillhandahller
+ett bekvmare stt att ndra paketmarkeringarna.
+.br
+.
+.SH "YTTERLIGARE FUNKTIONER"
+Ytterligare funktioner kan erhllas genom att installera ngot av fljande
+paket: \fBapt\fP, \fBaptitude\fP och \fBdebsums\fP.
+.
+.SH "SE VEN"
+\fBaptitude\fP(1), \fBapt\fP(1), \fBdselect\fP(1), \fBdpkg\-deb\fP(1), \fBdpkg\-query\fP(1),
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg.cfg\fP(5) och \fBdpkg\-reconfigure\fP(8).
+.
+.SH PROGRAMFEL
+\fB\-\-no\-act\fP ger oftast mindre information n vad som vore hjlpsamt.
+.
+.SH FRFATTARE
+Se \fB/usr/share/doc/dpkg/THANKS\fP fr listan ver personer som har bidragit
+till \fBdpkg\fP.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-architecture.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-architecture.1
--- dpkg/man/sv/dpkg-architecture.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-architecture.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,310 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-architecture 1 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-architecture \- stll in och bestm arkitektur fr paket som byggs
+.
+.SH SYNOPS
+\fBdpkg\-architecture\fP [\fIflagga\fP...] [\fItgrd\fP]
+.PP
+.
+.SH BESKRIVNING
+dpkg\-architecture innehller en funktion fr att bestmma och stlla in
+bygg\- och vrdarkitekturerna fr att bygga paket.
+.PP
+Byggarkitekturen bestms alltid av ett externt anrop till \fBdpkg\fP(1) och kan
+inte stllas in p kommandoraden.
+.PP
+Du kan ange vrdarkitektur genom att ange en av, eller bda, flaggorna \fB\-a\fP
+och \fB\-t\fP. Frvalet bestms av ett externt anrop till \fBgcc\fP(1), eller r
+detsamma som byggarkitekturen varken \s-1CC\s0 eller gcc r
+tillgngliga. Det rcker att ange en av \fB\-a\fP och \fB\-t\fP, vrdet p den andra
+kommer stllas in till ett fungerande frval. Det r faktiskt oftast bttre
+att bara ange den ena eftersom \fBdpkg\-architecture\fP kommer varna dig om ditt
+val inte verensstmmer med frvalet.
+.
+.SH KOMMANDON
+.TP 
+\fB\-l\fP
+Skriv miljvariabler, en per rad, p formatet \fIVARIABEL=vrde\fP. Detta r
+frvald tgrd.
+.TP 
+\fB\-e\fP\fIdebianarkitektur\fP
+Kontrollera arkitektur fr likhet. Som standard jmfrs \fIdebianarkitektur\fP
+mot den aktuella Debianarkitekturen, som r vrd. tgrden expanderar inte
+jokertecken i arkitekturer. Kommandet avslutar med status 0 om det r en
+trff, 1 om det inte r en trff.
+.TP 
+\fB\-i\fP\fIarkitekturskmnster\fP
+Kontrollera identitet p arkitekturen genom att expandera
+\fIarkitekturskmnster\fP som ett arkitekturskmnster med jokertecken, och
+jmfra med den aktuella Debianarkitekturen. Kommandot avslutas med status 0
+vid trff, 1 om inte trff.
+.TP 
+\fB\-q\fP\fIvariabelnamn\fP
+Skriv vrdet p en enkel variabel.
+.TP 
+\fB\-s\fP
+Visar ett exportkommando. Detta kan anvndas fr att stta miljvariabler
+med eval.
+.TP 
+\fB\-u\fP
+Visar ett kommando liknande \fB\-s\fP som fr att nollstlla alla variabler.
+.TP 
+\fB\-c\fP\fI kommando\fP
+Exekvera ett \fIkommando\fP i en milj som har alla variabler satta till det
+bestmda vrdet.
+.TP 
+\fB\-L\fP
+Visa en lista ver giltiga arkitekturnamn.
+.TP 
+\fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH FLAGGOR
+.TP 
+\fB\-a\fP\fIdebianarkitektur\fP
+Vlj Debianarkitektur.
+.TP 
+\fB\-t\fP\fIgnu\-systemtyp\fP
+Vlj GNU\-systemtyp.
+.TP 
+\fB\-f\fP
+Vrden som stts av befintliga miljvariabler med samma namn som de som
+anvnds av skriptet anvnds (t.ex av \fBdpkg\-architecture\fP), svida inte
+denna tvingande flagga anges. Det gr det mjligt fr anvndaren att
+verstyra ett vrde ven om anropet till \fBdpkg\-architecture\fP r begravt
+djupt inuti ett annat skript (till exempel \fBdpkg\-buildpackage\fP(1)).
+.
+.SH TERMINOLOGI
+.IP byggmaskin 4
+Maskinen paketet byggs p.
+.IP vrdmaskin 4
+Maskinen paketet byggs fr.
+.IP Debianarkitektur 4
+Debianarkitekturstrngen, vilken anger binrtrdet i
+\-s1FT\s0\-arkivet. Exempel: i386, sparc, hurd\-i386.
+.IP arkitekturskmnster 4
+Ett arkitekturskmnster r en speciell arkitekturstrng som matchar alla
+kta arkitekturer som finns i den. Den genella formen r
+<krna>\-<cpu>. Exempel: linux\-any, any\-i386, hurd\-any.
+.IP \s-1GNU\s0\-systemtyp 4
+En arkitekturspecificeringsstrng bestr av tv delar, avdelade med
+bindestreck: processor och system. Exempel: i386\-linux\-gnu, sparc\-linux\-gnu,
+i386\-gnu, x86_64\-netbsd.
+.
+.SH VARIABLER
+Fljande variabler stts av \fBdpkg\-architecture\fP:
+.IP \s-1DEB_BUILD_ARCH\s0 4
+Debianarkitekturen fr byggmaskinen.
+.IP \s-1DEB_BUILD_ARCH_OS\s0 4
+Debiansystemnamnet fr byggmaskinen.
+.IP \s-1DEB_BUILD_ARCH_CPU\s0 4
+Debian\-processornamnet fr byggmaskinen.
+.IP \s-1DEB_BUILD_ARCH_BITS\s0 4
+Pekarstorleken fr byggmaskinen (i bitar).
+.IP \s-1DEB_BUILD_ARCH_ENDIAN\s0 4
+Endian fr byggmaskinen (little / big).
+.IP \s-1DEB_BUILD_GNU_CPU\s0 4
+\s-1CPU\s0\-delen av \s-1DEB_BUILD_GNU_TYPE\s0.
+.IP \s-1DEB_BUILD_GNU_SYSTEM\s0 4
+Systemdelen av \s-1DEB_BUILD_GNU_TYPE\s0.
+.IP \s-1DEB_BUILD_GNU_TYPE\s0 4
+\s-1GNU\s0\-systemtypen fr byggmaskinen.
+.IP \s-1DEB_BUILD_MULTIARCH\s0 4
+Den frtydligade \s-1GNU\s0\-systemtypen fr byggmaskinen, anvnds fr
+skvgar i filsystemet.
+.IP \s-1DEB_HOST_ARCH\s0 4
+Debianarkitekturen fr vrdmaskinen.
+.IP \s-1DEB_HOST_ARCH_OS\s0 4
+Debiansystemnamnet fr vrdmaskinen.
+.IP \s-1DEB_HOST_ARCH_CPU\s0 4
+Debian\-processornamnet fr vrdmaskinen.
+.IP \s-1DEB_HOST_ARCH_BITS\s0 4
+Pekarstorleken fr vrdmaskinen (i bitar).
+.IP \s-1DEB_HOST_ARCH_ENDIAN\s0 4
+Endian fr vrdmaskinen (little / big).
+.IP \s-1DEB_HOST_GNU_CPU\s0 4
+\s-1CPU\s0\-delen av \s-1DEB_HOST_GNU_TYPE\s0.
+.IP \s-1DEB_HOST_GNU_SYSTEM\s0 4
+Systemdelen av \s-1DEB_HOST_GNU_TYPE\s0.
+.IP \s-1DEB_HOST_GNU_TYPE\s0 4
+\s-1GNU\s0\-systemtypen fr vrdmaskinen.
+.IP \s-1DEB_HOST_MULTIARCH\s0 4
+Den frtydligade \s-1GNU\s0\-systemtypen fr vrdmaskinen, anvnds fr
+skvgar i filsystemet.
+.
+.SH DEBIAN/RULES
+Miljvariablerna som stts av \fBdpkg\-architecture\fP snds till
+\fIdebian/rules\fP som make\-variabler (se dokumentationen fr make). Du br
+dock inte bero p dem eftersom detta frhindrar manuella anrop till
+skriptet. Du br istllet alltid initiera dem med \fBdpkg\-architecture\fP med
+\-q\-flaggan. Hr r ngra exempel, vilka ven visar hur du kan frbttra
+stdet fr korskompilering i ditt paket:
+.PP
+
+Istllet fr:
+.IP
+.nf
+ARCH=\`dpkg \-\-print\-architecture\`
+configure $(\s-1ARCH\s0)\-linux
+.fi
+.PP
+anvnder du fljande:
+.IP
+.nf
+\&\s-1DEB_BUILD_GNU_TYPE\s0 := $(shell dpkg\-architecture \-qDEB_BUILD_GNU_TYPE)
+\&\s-1DEB_HOST_GNU_TYPE\s0 := $(shell dpkg\-architecture \-qDEB_HOST_GNU_TYPE)
+
+configure \-\-build=$(\s-1DEB_BUILD_GNU_TYPE\s0) \-\-host=$(\s-1DEB_HOST_GNU_TYPE\s0)
+.fi
+.PP
+
+Istllet fr:
+.IP
+.nf
+ARCH=\`dpkg \-\-print\-architecture\`
+ifeq ($(\s-1ARCH\s0),alpha)
+  ...
+endif
+.fi
+.PP
+anvnder du:
+.IP
+.nf
+\&\s-1DEB_HOST_ARCH\s0 := $(shell dpkg\-architecture \-qDEB_HOST_ARCH)
+
+ifeq ($(\s-1DEB_HOST_ARCH\s0),alpha)
+  ...
+endif
+.fi
+.PP
+eller, om du bara vill testa p processor\- eller OS\-typ, anvnd variablerna
+DEB_HOST_ARCH_CPU eller DEB_HOST_ARCH_OS.
+.PP
+Generellt rekommenderas det inte att anropa dpkg i rules\-filen fr att hmta
+information om arkitekturen (svida du inte vill tillhandahlla
+baktkompatibilitet, se nedan). Speciellt gr det inte att lita p flaggan
+\-\-print\-architecture eftersom vi har Debianarkitekturer som inte r
+identiskt med namnet p processorn.
+.
+.SH BAKTKOMPATIBILITET
+Variablerna DEB_*_ARCH_BITS och DEB_*_ARCH_ENDIAN introducerades i dpkg\-dev
+1.15.4. Om de anvnds i \fIdebian/rules\fP mste drfr ett byggberoende
+deklareras p dpkg\-dev (>= 1.15.4).
+.PP
+Variablerna DEB_HOST_ARCH_CPU och DEB_HOST_ARCH_OS introduceras i dpkg\-dev
+1.13.2. Tidigare sg \fIdebian/rules\fP\-filer oftast p innehllet i
+variablerna DEB_HOST_GNU_CPU och DEB_HOST_GNU_TYPE, vilka har kunnat ndra
+p sig.
+.PP
+Om \fIdebian/rules\fP ser p dessa variabler fr att vlja hur eller vad som
+skall kompileras br detta uppdateras till att anvnda de nya variablerna
+och vrdena. Om du vill bibehlla baktkompatibilitet med tidigare versioner
+av dpkg\-dev kan du anvnda fljande kod:
+.IP
+.nf
+DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_CPU 2>/dev/null)
+DEB_HOST_ARCH_OS := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_OS 2>/dev/null)
+
+# Ta gammalt utdataformat frn dpkg\-architecture i beaktning.
+ifeq ($(DEB_HOST_ARCH_CPU),)
+  DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_GNU_CPU)
+  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
+    DEB_HOST_ARCH_CPU := amd64
+  endif
+endif
+ifeq ($(DEB_HOST_ARCH_OS),)
+  DEB_HOST_ARCH_OS := $(subst \-gnu,,$(shell dpkg\-architecture \-qDEB_HOST_GNU_SYSTEM))
+  ifeq ($(DEB_HOST_ARCH_OS),gnu)
+    DEB_HOST_ARCH_OS := hurd
+  endif
+endif
+.fi
+.PP
+Och p motsvarande stt fr DEB_BUILD_ARCH_CPU och DEB_BUILD_ARCH_OS.
+.PP
+Om du fortfarande vill stda versioner av dpkg\-dev som inte innehll
+\fBdpkg\-architecture\fP fungerar fljande:
+.IP
+.nf
+\&\s-1DEB_BUILD_ARCH\s0 := $(shell dpkg \-\-print\-architecture)
+\&\s-1DEB_BUILD_GNU_CPU\s0 := $(patsubst hurd\-%,%,$(\s-1DEB_BUILD_ARCH\s0))
+ifeq ($(filter\-out hurd\-%,$(\s-1DEB_BUILD_ARCH\s0)),)
+  \s-1DEB_BUILD_GNU_SYSTEM\s0 := gnu
+else
+  \s-1DEB_BUILD_GNU_SYSTEM\s0 := linux\-gnu
+endif
+DEB_BUILD_GNU_TYPE=$(\s-1DEB_BUILD_GNU_CPU\s0)\-$(\s-1DEB_BUILD_GNU_SYSTEM\s0)
+
+\&\s-1DEB_HOST_ARCH\s0 := $(\s-1DEB_BUILD_ARCH\s0)
+\&\s-1DEB_HOST_GNU_CPU\s0 := $(\s-1DEB_BUILD_GNU_CPU\s0)
+\&\s-1DEB_HOST_GNU_SYSTEM\s0 := $(\s-1DEB_BUILD_GNU_SYSTEM\s0)
+\&\s-1DEB_HOST_GNU_TYPE\s0 := $(\s-1DEB_BUILD_GNU_TYPE\s0)
+.fi
+.PP
+Lgg in en delmngd av dessa rader verst i din
+debian/rules\-fil. Standardvariablerna kommer skrivas ver om
+dpkg\-architecture anvnds.
+.PP
+Du behver inte alla. Vlj en konsistent delmngd som innehller de vrden
+du anvnder i rules\-filen. Om du till exempel bara behver
+vrd\-Debianarkitekturen rcker det med "DEB_HOST_ARCH=\`dpkg
+\-\-print\-architecture\`" (ja, det r Debianarkitekturen p byggmaskinen, men
+kom ihg att vi bara frsker vara baktkompatibel med kompilering p samma
+plattform).
+.PP
+Flaggorna \fB\-e\fP och \fB\-i\fP introducerades i \fBdpkg\-architecture\fP relativt
+nyligen (sedan dpkg 1.13.13).
+.
+.SH EXEMPEL
+\fBdpkg\-architecture\fP godtar flaggan \fB\-a\fP och snder den vidare till
+\fBdpkg\-architecture\fP. Andra exempel:
+.IP
+CC=i386\-gnu\-gcc dpkg\-architecture \-c debian/rules build
+.IP
+eval \`dpkg\-architecture \-u\`
+.PP
+Kontrollera om en arkitektur r samma som den nuvarande eller en given:
+.IP
+dpkg\-architecture \-elinux\-alpha
+.IP
+dpkg\-architecture \-amips \-elinux\-mips
+.PP
+Se om den aktuella arkitekturen eller en arkitektur som anges med \-a r ett
+Linuxsystem:
+.IP
+dpkg\-architecture \-ilinux\-any
+.IP
+dpkg\-architecture \-ai386 \-ilinux\-any
+.
+.SH FILER
+Alla dessa filer mste finnas fr att \fBdpkg\-architecture\fP mste
+finnas. Deras placering kan verstyras vid krning med miljvariabeln
+\fBDPKG_DATADIR\fP.
+.TP 
+\fI/usr/share/dpkg/cputable\fP
+Tabell ver knda processornamn och deras motsvarande GNU\-namn.
+.TP 
+\fI/usr/share/dpkg/ostable\fP
+Tabell ver knda operativsystemsnamn och deras motsvarande GNU\-namn.
+.TP 
+\fI/usr/share/dpkg/triplettable\fP
+Tabell ver Debianarkitekturtripplar och deras motsvarande
+Debianarkitekturnamn.
+.
+.SH "SE VEN"
+\fBdpkg\-buildpackage\fP(1), \fBdpkg\-cross\fP(1).
+.
+.SH FRFATTARE
+\fBdpkg\-architecture\fP och denna manualsida skrevs ursprungligen av Markus
+Brinkmann <brinkmd@debian.org>.
+
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-buildflags.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-buildflags.1
--- dpkg/man/sv/dpkg-buildflags.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-buildflags.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,268 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-buildflags 1 2011\-09\-13 Debianprojektet Dpkg\-sviten
+.SH NAMN
+dpkg\-buildflags \- returnerar byggflaggor att anvnda fr att bygga paket
+.
+.SH SYNOPS
+\fBdpkg\-buildflags\fP [\fIflagga\fP...] \fIkommando\fP
+.
+.SH BESKRIVNING
+\fBdpkg\-buildflags\fP r ett verktyg fr att hmta kompileringsflaggor att
+anvnda fr att bygga Debianpaket.
+.
+De frvalda flaggorna anges av leverantren, men de kan utkas/verstyras p
+flera stt:
+.IP 1.
+p hela systemet med \fB/etc/dpkg/buildflags.conf\fP;
+.IP 2.
+fr den nuvarande anvndaren med \fB$XDG_CONFIG_HOME/dpkg/buildflags.conf\fP
+dr \fB$XDG_CONFIG_HOME\fP har standardvrdet \fB$HOME/.config\fP;
+.IP 3.
+temporrt av anvndaren med miljvariabler (se stycket \fBMILJ\fP).
+.IP 4.
+dynamiskt av paketansvariga med miljvariabler som stts via \fBdebian/rules\fP
+(se stycket \fBMILJ\fP).
+.P
+Konfigurationsfilerna kan innehlla tv sorters direktiv:
+.TP 
+\fBSET\fP\fI flagga vrde\fP
+verstyr flaggan \fIflagga\fP till att ha vrdet \fIvrde\fP.
+.TP 
+\fBSTRIP\fP\fI flagga vrde\fP
+Ta bort alla flaggor som listas i \fIvrde\fP frn flaggan som anges i
+\fIflagga\fP.
+.TP 
+\fBAPPEND\fP\fI flagga vrde\fP
+Utka flaggan \fIflagga\fP genom att lgga till alternativen som anges i
+\fIvrde\fP. Ett blanksteg lggs till fre vrdet om flaggans nuvarande vrde
+inte r tomt.
+.TP 
+\fBPREPEND\fP\fI flagga vrde\fP
+Utka flaggan \fIflagga\fP genom att lgga till alternativen som anges i
+\fIvrde\fP frst. Ett blanksteg lggs till efter vrdet om flaggans nuvarande
+vrde inte r tomt.
+.P
+Konfigurationsfilerna kan innehlla kommentarer p rader som brjar med ett
+nummertecken (#). ven tomma rader ignoreras.
+.SH KOMMANDON
+.TP 
+\fB\-\-dump\fP
+Skriv alla kompileringsflaggor och deras vrde p standard ut. En flagga
+skrivs per rad, avdelade frn sitt vrde med ett likamedtecken
+("\fIflagga\fP=\fIvrde\fP"). Detta r standardtgrden.
+.TP 
+\fB\-\-list\fP
+Skriv ut listan ver flaggor som stds av den aktuella leverantren (en per
+rad). Se stycket \fBFLAGGOR SOM STDS\fP fr mer information om dem.
+.TP 
+\fB\-\-export=\fP\fIformat\fP
+Skriv skal\- (om \fIformat\fP r \fBsh\fP) eller make\-kommandon (om \fIformat\fP r
+\fBmake\fP) som kan anvndas fr att exportera alla kompileringsflaggor i
+miljn till standard ut. Om \fIformat\fP r \fBconfigure\fP kan utdata anvndas p
+en \fB./configure\fP\-kommandorad. Om \fIformat\fP inte anges antas \fBsh\fP. Endast
+kompileringsflaggor som brjar med en stor bokstav tas med, andra antas att
+inte vara lmpliga fr miljn.
+.TP 
+\fB\-\-get\fP\fI flagga\fP
+Skriv ut vrdet p flaggan p standard ut. Avslutar med 0 om flaggan r
+knd, om inte avslutar den med 1.
+.TP 
+\fB\-\-origin\fP\fI flagga\fP
+Anger ursprunget till flaggan som returneras av \fB\-\-get\fP. Avslutar med 0 om
+flaggan r knd, om inte avslutar med 1. Ursprunget kan vara ett av fljande
+vrden:
+.RS
+.TP 
+\fBvendor\fP
+originalflagga satt av leverantren returneras;
+.TP 
+\fBsystem\fP
+flaggan r satt/modifierad av systemkonfigurationen;
+.TP 
+\fBuser\fP
+flaggan r satt/modifierad av anvndarkonfigurationen;
+.TP 
+\fBenv\fP
+flaggan r satt/modifierad av en miljspecifik konfiguration.
+.RE
+.TP 
+\fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH "FLAGGOR SOM STDS"
+.TP 
+\fBCFLAGS\fP
+Flaggor fr C\-kompilatorn. Standardvrdet som satts av leverantren
+innehller \fI\-g\fP och den frvalda optimeringsnivn (vanligtvis \fI\-O2\fP, eller
+\fI\-O0\fP om miljvariabeln \fBDEB_BUILD_OPTIONS\fP definierar \fInoopt\fP).
+.TP 
+\fBCPPFLAGS\fP
+Flaggor fr C\-frprocesseraren. Frvalt vrde: tomt.
+.TP 
+\fBCXXFLAGS\fP
+Flaggor fr C++\-kompilatorn. Samma som \fBCFLAGS\fP.
+.TP 
+\fBFFLAGS\fP
+Flaggor fr Fortrankompilatorn. Samma som \fBCFLAGS\fP.
+.TP 
+\fBLDFLAGS\fP
+Flaggor som snds till kompilatorn vid lnkning av binrer eller delade
+objekt (om lnkaren anropas direkt mste \fB\-Wl\fP och \fB,\fP tas bort frn dessa
+flaggor). Standardvrde: tomt.
+.
+.SH FILER
+.TP 
+\fB/etc/dpkg/buildflags.conf\fP
+Konfigurationsfil fr hela systemet.
+.TP 
+\fB$XDG_CONFIG_HOME/dpkg/buildflags.conf\fP eller \fB$HOME/.config/dpkg/buildflags.conf\fP
+Anvndarens konfigurationsfil.
+.SH MILJVARIABLER
+Det finns tv uppsttningar miljvariabler som utfr samma operationer, den
+frsta (DEB_\fIflagga\fP_\fIop\fP) br aldrig anvndas inuti \fBdebian/rules\fP). Den
+r tnkt fr anvndare som vill bygga om kllkodspaketet med andra
+byggflaggor. Den andra uppsttningen (DEB_\fIflagga\fP_MAINT_\fIop\fP) br endast
+anvndas i \fBdebian/rules\fP av paketansvariga fr att ndra de slutgiltiga
+byggflaggorna.
+.TP 
+\fBDEB_\fP\fIflagga\fP\fB_SET\fP
+.TQ
+\fBDEB_\fP\fIflagga\fP\fB_MAINT_SET\fP
+Denna variabel kan anvndas fr att tvinga fram vrdet som returneras fr
+given \fIflagga\fP.
+.TP 
+\fBDEB_\fP\fIflagga\fP\fB_STRIP\fP
+.TQ
+\fBDEB_\fP\fIflagga\fP\fB_MAINT_STRIP\fP
+Denna variabel kan anvndas fr att tillhandahlla en blankstegsavdelad
+lista med flaggor som kommer att tas bort frn uppsttningen flaggor som ges
+fr given \fIflagga\fP.
+.TP 
+\fBDEB_\fP\fIflagga\fP\fB_APPEND\fP
+.TQ
+\fBDEB_\fP\fIflagga\fP\fB_MAINT_APPEND\fP
+Denna variabel kan anvndas fr att lgga till ytterligare flaggor till
+vrdet som returneras fr given \fIflagga\fP.
+.TP 
+\fBDEB_\fP\fIflagga\fP\fB_PREPEND\fP
+.TQ
+\fBDEB_\fP\fIflagga\fP\fB_MAINT_PREPEND\fP
+Denna variabel kan anvndas fr att lgga till ytterligare flaggor frst i
+vrdet som returneras fr given \fIflagga\fP.
+.TP 
+\fBDEB_BUILD_MAINT_OPTIONS\fP
+Den hr variabeln kan anvndas fr att sl av/p olika hrdningsbyggflaggor
+genom alternativet \fBhardening\fP. Se avsnittet \fBHRDNING\fP fr mer
+information.
+.
+.SH HRDNING
+Du kan anvnda flera kompileringsflaggor (se detaljer nedan) fr att hrda
+den frdiga binren mot minnesfrdrvningsangrepp, eller fr att ge
+ytterligare varningsmeddelanden under kompileringen. Frutom det som anges
+nedan aktiveras dessa som standard fr arkitekturer som stder dem.
+.P
+Varje hrdningsfunktion kan aktiveras och inaktiveras i miljvariabeln
+\fBDEB_BUILD_MAINT_OPTIONS\fP vrde \fBhardening\fP med modifierarna "+" och
+"\-". Du kan till exempel aktivera och funktionen "pie" och inaktivera
+funktionen "fortify" genom att ange detta i \fBdebian/rules\fP:
+.P
+  export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,\-fortify
+.P
+Den speciella funktionen \fBall\fP kan anvndas fr att aktivera eller
+inaktivera alla hrdningsfunktioner samtidigt. Du kan till exempel
+inaktivera allt och endast aktivera "format" och "fortify" med:
+.P
+  export DEB_BUILD_MAINT_OPTIONS=hardening=\-all,+format,+fortify
+.
+.TP 
+\fBformat\fP
+Instllningen (aktiverad som standard) lgger till \fB\-Wformat
+\-Wformat\-security \-Werror=format\-security\fP till \fBCFLAGS\fP och
+\fBCXXFLAGS\fP. Detta kommer att varna om olmplig anvndning av
+formatstrngar, och att misslyckas nr formatfunktionerna anvnds p ett
+stt som representerar mjliga skerhetsproblem. Fr nrvarande varnar detta
+om anrop till funktionerna \fBprintf\fP och \fBscanf\fP dr formatstrngen inte r
+en fast strng och nr det inte finns ngra formatargument, som i
+\fBprintf(foo);\fP istllet fr \fBprintf("%s", foo);\fP Detta kan vara ett
+skerhetshl om formatstrngen kommer frn en obetrodd klla och innehller
+"%n".
+.
+.TP 
+\fBfortify\fP
+This setting (enabled by default) adds \fB\-D_FORTIFY_SOURCE=2\fP to
+\fBCPPFLAGS\fP. During code generation the compiler knows a great deal of
+information about buffer sizes (where possible), and attempts to replace
+insecure unlimited length buffer function calls with length\-limited
+ones. This is especially useful for old, crufty code.  Additionally, format
+strings in writable memory that contain '%n' are blocked. If an application
+depends on such a format string, it will need to be worked around.
+
+Observera att, fr att den hr flaggan skall ha ngon effekt, mste
+kllkoden ocks kompileras med \fB\-O1\fP eller hgre.
+.TP 
+\fBstackprotector\fP
+Instllningen (aktiverad som standard) lgger till \fB\-fstack\-protector
+\-\-param=ssp\-buffer\-size=4\fP till \fBCFLAGS\fP och \fBCXXFLAGS\fP. Detta lgger till
+skerhetskontroller mot stackverskrivningar, vilket gr att mnga mjliga
+kodinjiceringsangrepp istllet avbryter programmet. I det bsta fallet gr
+det kodinjiceringsangrepp till verbelastnignsangrepp eller icke\-problem
+(beroende p programmet).
+
+Den hr funktionen krver lnkning mot glibc (eller ett annat bibliotek som
+tillhandahller \fB__stack_chk_fail\fP), s det mste inaktiveras nr du bygger
+med \fB\-nostdlib\fP eller \fB\-ffreestanding\fP eller liknande.
+.
+.TP 
+\fBrelro\fP
+Instllningen (aktiverad som standard) lgger till \fB\-Wl,\-z,relro\fP till
+\fBLDFLAGS\fP. Vid inlsning av programmet mste lnkaren skriva till flera
+ELF\-minnessektioner. Den hr instllningen flaggar till inlsaren att dessa
+sektioner skall gras skrivskyddade innan programmet fr kontroll. Detta
+skyddar huvudsaklingen mot GOT\-verskrivningsangrepp.
+.
+.TP 
+\fBbindnow\fP
+This setting (disabled by default) adds \fB\-Wl,\-z,now\fP to \fBLDFLAGS\fP. During
+program load, all dynamic symbols are resolved, allowing for the entire PLT
+to be marked read\-only (due to \fBrelro\fP above).
+.
+.TP 
+\fBpie\fP
+Instllningen (inaktiverad som standard) lgger till \fB\-fPIE\fP till \fBCFLAGS\fP
+och \fBCXXFLAGS\fP, samt \fB\-fPIE \-pie\fP till \fBLDFLAGS\fP. Positionsoberoende
+exekverbara program (PIE) behvs fr att dra frdel av slumpmssig
+adressrymd (ASLR), vilket stds av vissa versioner av krnan. Medan ASLR
+redan kan anvndas fr datautrymmen i stacken och heap:en (brk och mmap),
+mste kodomrden frst kompileras som positionsoberoende. Delade bibliotek
+gr redan detta (\-fPI C), s de drar automatiskt frdel av ASLR medan binra
+\&.text\-regioner mste byggas med PIE fr att uppn ASLR. Nr detta sker r
+ROP\-angrepp (Return Oriented Programming) mycket svrare eftersom det inte
+finns ngra statiska platser att studsa frn i ett
+minnesfrdrvningsangrepp.
+
+Detta r inte kompatibelt med \fB\-fPIC\fP s man mste vara frsiktig nr man
+bygger delade objekt.
+
+Eftersom PIE i tillgg implementeras med ett generellt register kan vissa
+arkitekturer (huvudsakligen i386) se prestandafrluster upp till 15% i
+vldigt textsegment\-tunga programs krning; de flesta krningar ser mindre
+n 1%. Arkitekturer med mnga generella register (t.ex amd64) ser inte en
+lika stor vrsta falls\-frlust.
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  2010\-2011 Raphal Hertzog
+.sp
+Upphovsrttsskyddat  2011 Kees Cook
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-buildpackage.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-buildpackage.1
--- dpkg/man/sv/dpkg-buildpackage.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-buildpackage.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,238 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-buildpackage 1 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-buildpackage \- bygg binr\- eller kllkodspaket frn kllkod
+.
+.SH SYNOPS
+\fBdpkg\-buildpackage\fP [\fIflagga\fP...]
+.
+.SH BESKRIVNING
+\fBdpkg\-buildprogram\fP r ett program som automatiserar processen med att
+bygga ett Debianpaket. Det bestr av fljande steg:
+.IP \fB1.\fP 3
+Byggmiljn frbereds genom att diverse miljvariabler stts (se \fBMILJ\fP)
+och anropar \fBdpkg\-source \-\-before\-build\fP (svida inte \fB_T\fP eller
+\fB\-\-target\fP anvnds).
+.IP \fB2.\fP 3
+Byggberoenden och \-konflikter kontrolleras att de uppfylls (svida inte
+\fB\-d\fP anges).
+.IP \fB3.\fP 3
+Om ett specifikt ml har valts med flaggan \fB\-T\fP eller \fB\-\-target\fP anropas
+det mlet, varp programmet avslutas. I annat fall anropas \fBfakeroot
+debian/rules clean\fP fr att stda byggtrdet (svida inte \fB\-nc\fP anges).
+.IP \fB4.\fP 3
+\fBdpkg\-source \-b\fP anropas fr att skapa kllkodspaketet (svida inte ett
+bygge av enbart binrer har valts med \fB\-b\fP, \fB\-B\fP eller \fB\-A\fP).
+.IP \fB5.\fP 3
+\fBdebian/rules build\fP anropas, fljt av \fBfakeroot debian/rules\fP \fIbinrml\fP
+(svida inte ett bygge av enbart kllkod har valts med \fB\-S\fP). Observera att
+\fIbinrml\fP r ett av \fBbinary\fP (standardval, eller om \fB\-b\fP anges),
+\fBbinary\-arch\fP (om \fB\-B\fP anges) eller \fBbinary\-indep\fP (om \fB\-A\fP anges).
+.IP \fB6.\fP 3
+\fBgpg\fP anropas fr att signera \fB.dsc\fP\-filen (om sdan finns, svida inte
+\fB\-us\fP anges).
+.IP \fB7.\fP 3
+\fBdpkg\-genchanges\fP anropas fr att skapa en \fB.changes\fP\-fil. Mnga av
+flaggorna till \fBdpkg\-buildpackage\fP vidaresnds till \fBdpkg\-genchanges\fP.
+.IP \fB8.\fP 3
+\fBgpg\fP anropas fr att signera \fB.changes\fP\-filen (svida inte \fB\-uc\fP anges).
+.IP \fB9.\fP 3
+Om \fB\-tc\fP anges anropas \fBfakeroot debian/rules clean\fP ytterligare en
+gng. Till slut anropas \fBdpkg\-source \-\-after\-build\fP.
+.
+.SH FLAGGOR
+.TP 
+\fB\-b\fP
+Anger att enbart binra paket skall byggas, inga kllkodsfiler byggs
+och/eller distribueras. Snds vidare till \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-B\fP
+Anger att enbart binra paket skall byggas, begrnsat till
+arkitekturberoende paket. Snds vidare till \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-A\fP
+Anger att enbart binra paket skall byggas, begrnsat till
+arkitekturoberoende paket. Snds vidare till \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-S\fP
+Anger att enbart kllkodspaket skall byggas, inga binrpaket behver
+byggas. Snds vidare till \fBdpkg\-genchanges\fP.
+.TP 
+\fB\-F\fP
+Anger att ett normalt komplett bygge, binr\- och kllkodspaket, skall
+byggas. Detta r detsamma som standardlget om inga byggflaggor anges.
+.P
+\fB\-\-target=\fP\fIml\fP
+.br
+\fB\-\-target \fP\fIml\fP
+.br
+\fB\-T\fP\fIml\fP
+.RS
+Anropar \fBdebian/rules\fP \fIml\fP efter att ha konfigurerat byggmiljn, och
+avbryter byggprocessen eftert. Om \fB\-\-as\-root\fP ocks anges krs kommandot
+som root (se \fB\-r\fP). Observera att officiella ml som mste kras som root
+inte behver flaggan.
+.RE
+.TP 
+\fB\-\-as\-root\fP
+Endast meningsfull tillsammans med \fB\-\-target\fP. Krver att mlet krs med
+root\-behrighet.
+.P
+\fB\-si\fP
+.br
+\fB\-sa\fP
+.br
+\fB\-sd\fP
+.br
+\fB\-v\fP\fIversion\fP
+.br
+\fB\-C\fP\fIndringsbeskrivning\fP
+.br
+\fB\-m\fP\fIpaketansvarige\-adress\fP
+.br
+\fB\-e\fP\fIpaketansvarige\-adress\fP
+.RS
+Snds vidare utan ndringar till \fBdpkg\-genchanges\fP. Se dess manualsida.
+.RE
+.TP 
+\fB\-a\fP\fIarkitektur\fP
+Ange Debianarkitekturen vi bygger fr. Arkitekturen fr maskinen vi bygger
+p bestms automatiskt, och r ven standard fr vrdmaskinen.
+.TP 
+\fB\-t\fP\fIgnu\-systemtyp\fP
+Ange GNU\-systemtyp vi bygger fr. Den kan anvndas i stllet fr \-a eller
+som ett komplement fr att verstyra standard\-GNU\-systemtypen fr
+Debian\-mlarkitekturen.
+.TP 
+\fB\-j\fP\fIjobb\fP
+Antalet jobb som tillts att kras samtidigt, motsvarar \fBmake\fP(1)\-flaggan
+med samma namn. Lgger till sig sjlv i miljvariabeln MAKEFLAGS, vilket fr
+alla pfljande make\-anrop att rva flaggan. Lgger ven till flaggan
+\fBparallel=\fP\fIjobb\fP till miljvariabeln DEB_BUILD_OPTIONS, vilket gr det
+mjligt fr debian/rules\-filer att anvnda informationen fr egna
+ndaml. Vrdet \fBparallel=\fP\fIjobb\fP i miljvariabeln DEB_BUILD_OPTIONS
+kommer att verstyra vrdet fr \fB\-j\fP om den flaggan ges.
+.TP 
+\fB\-D\fP
+Kontrollera  byggberoenden och \-konflikter; avbryt om de inte
+uppfylls. Detta r standardbeteendet.
+.TP 
+\fB\-d\fP
+Kontrollera inte byggberoenden eller \-konflikter.
+.TP 
+\fB\-nc\fP
+Stda inte upp byggtrdet (implicerar \fB\-b\fP om inget annat har valts bland
+\fB\-B\fP, \fB\-A\fP eller \fB\-S\fP).
+.TP 
+\fB\-tc\fP
+Stda kllkodstrdet (anvnder \fIf\-root\-kommando\fP \fBdebian/rules clean\fP)
+efter att paketet har byggts.
+.TP 
+\fB\-r\fP\fIf\-root\-kommando\fP
+Nr \fBdpkg\-buildpackages\fP behver exekvera delar av byggprocessen som root
+stter den kommandot som skall exekveras efter \fIf\-root\-kommando\fP om ett
+sdant har angivits. Om inte kommer \fBfakeroot\fP att anvndas som standard,
+om kommandot existerar. \fIf\-root\-kommando\fP mste brja med namnet p det
+faktiska kommandot som skall anropas samt de parametrar det skall anropas
+med. \fIf\-root\-kommando\fP kan innehlla parametrar (de mste vara avdelade
+med blanksteg) men inga skalmetatecken. \fIf\-root\-kommando\fP kan typiskt vara
+\fBfakeroot\fP, \fBsudo\fP, \fBsuper\fP eller \fBreally\fP. \fBsu\fP r inte lmpligt
+eftersom det krver flaggan \fB\-c\fP fr att kra ett kommando och ven d kan
+det bara starta anvndarens skal med \fB\-c\fP istllet fr att snda flaggor
+individuellt till kommandot som skall startas.
+.TP 
+\fB\-R\fP\fIregelfil\fP
+Fr att bygga ett Debianpaket krs normalt kommandot \fBdebian/rules\fP med
+flera olika standardparametrar. Den hr flaggan gr det mjligt att anvnda
+ett annat programanrop fr att bygga paketet (det kan innehlla
+blankstegsavdelade parametrar). Den kan ven anvndas fr att exekvera
+standardregelfilen med ett annat make\-program (till exempel genom att
+anvnda \fB/usr/local/bin/make \-f debian/rules\fP som \fIregelfil\fP).
+.TP 
+\fB\-p\fP\fIsigneringskommando\fP
+Nr \fBdpkg\-buildpackage\fP mste exekvera GPG eller PGP fr att signera ett
+kllkodsstyrfil (\fB.dsc\fP) eller en \fB.changes\fP\-fil kr det
+\fIsigneringskommando\fP (det letar i \fBPATH\fP om s behvs) istllet fr
+\fBgpg\fP. \fIsigneringskommando\fP fr de argument \fBgpg\fP skulle ha ftt. Om
+\fIsigneringskommando\fP tar kommandon enligt GPG\- istllet fr PGP\-stil mste
+du ge flaggan \fB\-sgpg\fP. \fIsigneringskommando\fP fr inte innehlla blanksteg
+eller andra skalmetatecken.
+.TP 
+\fB\-k\fP\fInyckel\-id\fP
+Ange nyckel\-id att anvnda vid signering av paket.
+.TP 
+\fB\-us\fP
+Signera inte kllkodspaketet.
+.TP 
+\fB\-uc\fP
+Signera inte \fB.changes\fP\-filen.
+.P
+\fB\-i\fP[\fIreguljrt\-uttryck\fP]
+.br
+\fB\-I\fP\fI[mnster]\fP
+.br
+\fB\-s\fP[\fBnsAkurKUR\fP]
+.br
+\fB\-z\fP, \fB\-Z\fP
+.br
+.RS
+Snds vidare utan ndringar till \fBdpkg\-source\fP. Se dess manualsida.
+.RE
+.TP 
+\fB\-\-source\-option=\fP\fIval\fP
+Snd flaggan \fIval\fP till \fBdpkg\-source\fP.
+.TP 
+\fB\-\-changes\-option=\fP\fIval\fP
+Snder flaggan \fIval\fP till \fBdpkg\-genchanges\fP.
+.P
+\fB\-\-admindir=\fP\fIkat\fP
+.br
+\fB\-\-admindir\fP \fIkat\fP
+.RS
+ndra platsen fr \fBdpkg\fP\-databasen. Frval r \fI/var/lib/dpkg\fP.
+.RE
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH MILJVARIABLER
+ven om \fBdpkg\-buildpackage\fP exporterar ngra variabler br inte
+\fBdebian/rules\fP vara beroende av deras nrvaro och br istllet anvnda
+respektive grnssnitt fr att hmta de vrden som behvs.
+.SS "Variabler som stts av dpkg\-architecture"
+\fBdpkg\-architecture\fP anropas med flaggorna \fB\-a\fP och \fB\-t\fP
+vidaresnda. Variabler som skrivs ut via dess \fB\-s\fP\-flagga integreras i
+byggmiljn.
+.SS "Kompileringsflaggor exporteras inte lngre."
+Mellan version 1.14.17 och 1.16.1 exporterade \fBdpkg\-buildpackage\fP
+kompilatorflaggor (\fBCFLAGS\fP, \fBCXXFLAGS\fP, \fBCPPFLAGS\fP och \fBLDFLAGS\fP) med
+vrden enligt \fBdpkg\-buildflags\fP. Detta gller inte lngre.
+.
+.SH PROGRAMFEL
+Det borde vara mjligt att ange blanksteg och skalmetatecken i, och
+inledande argument fr, \fIf\-root\-kommando\fP och \fIsigneringskommando\fP.
+.
+.SH "SE VEN"
+\fBdpkg\-source\fP(1), \fBdpkg\-architecture\fP(1), \fBdpkg\-buildflags\fP(1),
+\fBdpkg\-genchanges\fP(1), \fBfakeroot\fP(1), \fBgpg\fP(1).
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  1995\-1996 Ian Jackson
+.br
+Upphovsrttsskyddat  2000 Wichert Akkerman
+.br
+Upphovsrttsskyddat  2007 Frank Lichtenheld
+.br
+Upphovsrttsskyddat  2008\-2010 Raphal Hertzog
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg.cfg.5 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg.cfg.5
--- dpkg/man/sv/dpkg.cfg.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg.cfg.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,31 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg.cfg 5 2009\-09\-05 Debianprojektet Dpkg\-sviten
+.SH NAMN
+dpkg.cfg \- instllningsfil fr dpkg
+.
+.SH BESKRIVNING
+Filen innehller frvalda instllningar fr dpkg. Varje rad bestr av en
+ensam flagga som r exakt densamma som en normal kommandoradsflagga fr
+dpkg, frutom de inledande bindestrecken vilka inte anvnds hr. Citattecken
+runt flaggvrden tas bort. Kommentarer r tilltna genom att inleda en rad
+med nummertecken ("\fB#\fP").
+.
+.SH FILER
+\fI/etc/dpkg/dpkg.cfg.d/[0\-9a\-zA\-Z_\-]*\fP
+.br
+\fI/etc/dpkg/dpkg.cfg\fP
+.br
+\fI~/.dpkg.cfg\fP
+.
+.SH FRFATTARE
+Se \fB/usr/share/doc/dpkg/THANKS\fP fr listan ver personer som har bidragit
+till \fBdpkg\fP.
+.
+.SH "SE VEN"
+\fBdpkg\fP(1).
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-checkbuilddeps.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-checkbuilddeps.1
--- dpkg/man/sv/dpkg-checkbuilddeps.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-checkbuilddeps.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,48 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-checkbuilddeps 1 2011\-07\-04 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-checkbuilddeps \- kontrollera byggberoenden och \-konflikter
+.
+.SH SYNOPS
+\fBdpkg\-checkbuilddeps\fP [\fIflagga\fP...] [\fIcontrol\-fil\fP]
+.
+.SH BESKRIVNING
+Detta program kontrollerar installerade paket p systemet mot byggberoenden
+och \-konflikter som listas i filen control. Om de inte uppfylls, visas de
+och programmet avslutas med en felstatus som inte r noll.
+.P
+Som standard lses \fBdebian/control\fP, men ett alternativt styrfilnamn kan
+anges p kommandoraden.
+.
+.SH FLAGGOR
+.TP 
+\fB\-\-admindir=\fP\fIkat\fP
+ndra platsen fr \fBdpkg\fP\-databasen. Frval r \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-B\fP
+Ignorera \fIBuild\-Depends\-Indep\fP\-rader. Anvnd om inga arkitekturoberoende
+paket skall byggas.
+.TP 
+\fB\-d\fP \fIbyggberoendestrng\fP
+.TP 
+\fB\-c\fP \fIbyggkonfliktstrng\fP
+Anvnd de angivna byggberoendena/\-konflikterna istllet fr de som str i
+filen \fIdebian/control\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  2001 Joey Hess
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-deb.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-deb.1
--- dpkg/man/sv/dpkg-deb.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-deb.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,200 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-deb 1 2011\-08\-14 Debianprojektet Dpkg\-sviten
+.SH NAMN
+dpkg\-deb \- Debians manipuleringsverktyg fr paketarkiv (.deb)
+.
+.SH SYNOPS
+\fBdpkg\-deb\fP [\fIflagga\fP...] \fItgrd\fP
+.
+.SH BESKRIVNING
+\fBdpkg\-deb\fP packar, packar upp och tillhandahller information om
+Debianarkiv.
+.PP
+Anvnd \fBdpkg\fP fr att installera och ta bort paket frn ditt system.
+.PP
+Du kan ven starta \fBdpkg\-deb\fP genom att anropa \fBdpkg\fP med de flaggor du
+vill snda till \fBdpkg\-deb\fP. \fBdpkg\fP kommer upptcka att du ville t
+\fBdpkg\-deb\fP och kr det t dig.
+.
+.SH KOMMANDON
+.TP 
+\fB\-b\fP, \fB\-\-build\fP \fIkatalog\fP [\fIarkiv\fP|\fIkatalog\fP]
+Skapar ett Debianarkiv frn filsystemstrdet som lagras i
+\fIkatalog\fP. \fIkatalog\fP mste innehlla underkatalogen \fBDEBIAN\fP, vilken
+innehller styrinformationsfiler ssom sjlv styrfilen control. Katalogen
+kommer \fIinte\fP att visas i binrpaketets filsystemsarkiv, utan istllet
+kommer filerna lggas i binrpaketets styrinformationsomrde.
+
+Svida du inte anger \fB\-\-nocheck\fP kommer dpkg\-deb att lsa \fBDEBIAN/control\fP
+och tolka den. Den kommer leta efter syntaxfel och andra problem, och visa
+namnet p det binrpaket som byggs. \fBdpkg\-deb\fP kommer ven att kontrollera
+behrigheten p paketskripten och andra filer som hittas i
+styrinformationskatalogen \fBDEBIAN\fP.
+
+Om inget \fIarkiv\fP anges kommer \fBdpkg\-deb\fP skriva paketet till filen
+\fIkatalog\fP\fB.deb\fP.
+
+Om arkivet som skall skapas redan finns kommer det skrivas ver.
+
+Om den andra argumentet r en katalog kommer \fBdpkg\-deb\fP skriva till filen
+\fIpaket\fP\fB_\fP\fIversion\fP\fB_\fP\fIarkitektur\fP\fB.deb\fP, eller
+\fIpaket\fP\fB_\fP\fIversion\fP\fB.deb\fP om det inte finns ngot \fBArchitecture\fP\-flt i
+styrfilen control. Nr en mlkatalog anges, istllet fr en fil, kan inte
+flaggan \fB\-\-nocheck\fP anvndas (eftersom \fBdpkg\-deb\fP mste lsa och tolka
+paketets styrfil control fr att ta reda p vilket filnamn som skall
+anvndas).
+.TP 
+\fB\-I\fP, \fB\-\-info\fP \fIarkiv\fP [\fIcontrol\-filnamn\fP ...]
+Tillhandahller information om ett binrt paketarkiv.
+
+Om inga \fIcontrol\-filnamn\fP anges kommer det att visa en sammanfattning av
+innehllet i paketet tillsammans med dess styrfil.
+
+Om ett eller flera \fIcontrol\-filnamn\fP anges kommer \fBdpkg\-deb\fP att skriva ut
+dem i den ordning de anges. Om ngra av komponenterna inte fanns kommer ett
+felmeddelande fr vart och ett skrivas ut p standard fel, och programmet
+avslutar med felstatus 2.
+.TP 
+\fB\-W\fP, \fB\-\-show\fP \fIarkiv\fP
+Ger information om ett binrt paketarkiv i det format som anges med flaggan
+\fB\-\-showformat\fP. Det frvalda formatet visar paketets namn och version p en
+rad, avdelade med tabulatortecken.
+.TP 
+\fB\-f\fP, \fB\-\-field\fP \fIarkiv\fP [\fIcontrol\-fltnamn\fP ...]
+Extraherar styrfilsinformation frn ett binrt paketarkiv.
+
+Om du inte anger ngra \fBstyrfilflt\fP visas hela styrfilen.
+
+Om ngra anges kommer \fBdpkg\-deb\fP att visa deras innehll, i den ordning de
+frekommer i styrfilen. Om mer n ett \fBstyrfilsflt\fP anges kommer
+\fBdpkg\-deb\fP visa varje med ett inledande fltnamn (och ett kolon och
+mellanrum).
+
+Inga felmeddelande rapporteras fr flt som efterfrgas men inte hittas.
+.TP 
+\fB\-c\fP, \fB\-\-contents\fP \fIarkiv\fP
+Visar innehller i filsystemstrdsarkivsdelen av paketarkivet. Det visas fr
+nrvarande i det format som genereras av \fBtar\fPs pratsamma visning.
+.TP 
+\fB\-x\fP|\fB\-\-extract\fP \fIarkivkatalog\fP
+Extraherar filsystemstrdet frn ett paketarkiv till den angivna katalogen.
+
+Observera att en extrahering av ett paket till rotkatalogen \fIinte\fP
+resulterar i en korrekt installation! Anvnd \fBdpkg\fP fr att installera
+paket.
+
+\fIkatalog\fP (men inte dess frldrar) kommer skapas om ndvndigt, och dess
+behrighet kommer att ndras till att motsvara innehllet i paketet.
+.TP 
+\fB\-C\fP|\fB\-\-vextract\fP \fIarkivkatalog\fP
+r som \fB\-\-extract\fP (\fB\-x\fP) med \fB\-\-verbose\fP (\fB\-v\fP) som visar en lista ver
+filer som extraheras under tiden.
+.TP 
+\fB\-R\fP, \fB\-\-raw\-extract\fP \fIarkivkatalog\fP
+Extraherar filsystemstrdet frn ett paketarkiv till den angivna katalogen
+och kontrollinformationsfilerna till underkatalogen DEBIAN i den angivna
+katalogen.
+
+Mlkatalogen (men inte dess frldrar) kommer att skapas om ndvndigt.
+.TP 
+\fB\-\-fsys\-tarfile\fP \fIarkiv\fP
+Extraherar filsystemstrdsdata frn ett binrt paket och snder det till
+standard ut i \fBtar\fP\-format. Tillsammans med \fBtar\fP(1) kan det anvndas fr
+att hmta ut en enskild fil frn ett paketarkiv. Indataarkiven behandlas
+alltid i den ordning de anges.
+.TP 
+\fB\-e\fP, \fB\-\-control\fP \fIarkiv\fP [\fIkatalog\fP]
+Extraherar styrinformationsfilerna frn paketarkivet till den angivna
+katalogen.
+
+Om ingen katalog anges kommer en underkatalog vid namn \fBDEBIAN\fP i den
+aktuella katalogen att anvndas.
+
+Mlkatalogen (men inte dess frldrar) kommer att skapas om ndvndigt.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH FLAGGOR
+.TP 
+\fB\-\-showformat=\fP\fIformat\fP
+Flaggan anvnds fr att ange formatet p utdata som skapas av
+\fB\-\-show\fP. Formatet r en strng som matas ut fr varje paket i listan.
+
+Strngen kan referera till statusflt p formen "${\fIfield\-name\fP}", en
+frteckning ver giltiga flt kan enkelt skapas genom att anvnda \fB\-I\fP p
+samma paket. En fullstndig frklaring av formateringsflaggorna (inklusive
+ersttningssekvenser och flttabulering) finns i frklaringen fr flaggan
+\fB\-\-showformat\fP i \fBdpkg\-query\fP(1).
+
+Frvalet fr fltet r "${Package}\et${Version}\en".
+.TP 
+\fB\-z\fP\fIkomprimeringsniv\fP
+Ange vilken komprimeringsniv som skall anvndas i komprimeringsfunktionen
+nr ett paket byggs (standard r 9 fr gzip och bzip2, 6 fr xz och lzma).
+.TP 
+\fB\-Z\fP\fIkomprimeringstyp\fP
+Ange vilken komprimeringstyp som skall anvndas nr ett paket
+byggs. Tilltna vrden r \fIgzip\fP, \fIxz\fP, \fIbzip2\fP, \fIlzma\fP och \fInone\fP
+(frval r \fIgzip\fP).
+.TP 
+\fB\-\-new\fP
+Frskrar att \fBdpkg\-deb\fP bygger ett arkiv i "nytt" format.  Detta r
+frval.
+.TP 
+\fB\-\-old\fP
+Tvingar \fBdpkg\-deb\fP att bygga ett arkiv i "gammalt" format. Det gamla
+arkivformatet r mer svrtolkat av icke\-Debianverktyg och r nu utgnget;
+dess enda anvndningsomrde r fr att bygga paket som skall tolkas av
+versioner av dpkg ldre n 0.93.76 (september 1995), vilka endast slpptes
+som i386\-a.out.
+.TP 
+\fB\-\-nocheck\fP
+Frhindrar \fBdpkg\-deb \-\-build s\fP normala tester p det freslagna innehllet
+i arkivet. Du kan bygga vilket arkiv du n vill, oavsett hur trasigt, p det
+hr stt.
+.TP 
+\fB\-v\fP, \fB\-\-verbose\fP
+Aktiverar pratsam utdata. Pverkar fr nrvarande bara \fB\-\-extract\fP, vilket
+fr det att bete sig som \fB\-\-vextract\fP.
+.TP 
+\fB\-D\fP, \fB\-\-debug\fP
+Aktiverar felskningsutdata. Denna r inte speciellt intressant.
+.
+.SH MILJVARIABLER
+.TP 
+\fBTMPDIR\fP
+Om satt s kommer \fBdpkg\-deb\fP att anvnda det som katalogen dr temporra
+filer och kataloger skapas.
+.
+.SH PROGRAMFEL
+\fBdpkg\-deb \-I\fP \fIpaket1\fP\fB.deb\fP \fIpaket2\fP\fB.deb\fP gr fel.
+
+Det finns inte ngon autentisering av \fB.deb\fP\-filer. Faktiskt finns det inte
+ens ngon enkel kontrollsumma. (Verktyg som arbetar p en hgre niv, som
+APT, stder autentisering av \fB.deb\fP\-paket som hmtas frn ett givet arkiv,
+och de flesta paket har nu fr tiden en md5sum\-kontrollfil som skapas av
+debian/rules. Filen stds dock inte direkt av lgnivverktygen.)
+
+Frsk inte anvnda bara \fBdpkg\-deb\fP fr att installera programvara! Du
+mste anvnda normala \fBdpkg\fP fr att se till att alla filer lggs p
+korrekt plats och att paketets skript krs och dess status och innehll
+sparas.
+.
+.SH "SE VEN"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\fP(1), \fBdselect\fP(1).
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  1995\-1996 Ian Jackson
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-distaddfile.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-distaddfile.1
--- dpkg/man/sv/dpkg-distaddfile.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-distaddfile.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,51 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-distaddfile 1 2011\-07\-04 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-distaddfile \- lgg till poster i debian/files
+.
+.SH SYNOPS
+\fBdpkg\-distaddfile\fP [\fIflagga\fP...]\fI filnamn sektion prioritet\fP
+.
+.SH BESKRIVNING
+\fBdpkg\-distaddfile\fP lgger till en post fr en namngiven fil i
+\fBdebian/files\fP.
+
+Det tar tre argument som inte r flaggor \- filnamn, sektion och prioritet
+fr \fB.changes\fP\-filen.
+
+Filnamnet anges relativt till katalogen dr \fBdpkg\-genchanges\fP frvntas
+finna filerna, normalt \fB..\fP, snarare n som en skvg relativ till den
+aktuella katalogen nr \fBdpkg\-distaddfile\fP krs.
+.
+.SH FLAGGOR
+.TP 
+\fB\-f\fP\fIfillisfile\fP
+Ls eller skriv listan ver filer som skall sndas in hr, istllet fr att
+anvnda \fBdebian/file\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH FILER
+.TP 
+\fBdebian/files\fP
+Listan ver genererade filer so ingr i insndningen som
+frbereds. \fBdpkg\-distaddfile\fP kan anvndas fr att lgga till ytterligare
+filer.
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  1995\-1996 Ian Jackson
+.br
+Upphovsrttsskyddat  2000 Wichert Akkerman
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-divert.8 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-divert.8
--- dpkg/man/sv/dpkg-divert.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-divert.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,146 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-divert 8 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-divert \- verstyr ett pakets version av en fil
+.
+.SH SYNOPS
+\fBdpkg\-divert\fP [\fIflagga\fP...] \fItgrd\fP
+.
+.SH BESKRIVNING
+\fBdpkg\-divert\fP r verktyget som anvnds fr att stlla in och uppdatera
+listan ver omdirigeringar.
+.PP
+Filen \fIdiversions\fP r ett stt att tvinga \fBdpkg\fP(1) att inte installera en
+fil p sin plats, utan p en \fIomdirigerad\fP plats. Omdirigeringar kan
+anvndas i skript i Debianpaket fr att flytta bort en fil nr den orsakar
+en konflikt. Systemadministratrer kan ocks anvnda det fr att verstyra
+ngra pakets konfigurationsfiler, eller nr ngra filer (som inte markerats
+som konfigurationsfiler) mste bibehllas av dpkg nr en nyare version av
+ett paket som innehller de filerna installeras.
+.sp
+.SH KOMMANDON
+.TP 
+[\fB\-\-add\fP] \fIfil\fP
+Lgg till en omdirigering fr \fIfil\fP.
+.TP 
+\fB\-\-remove\fP\fI fil\fP
+Ta bort en omdirigering fr \fIfil\fP.
+.TP 
+\fB\-\-list\fP\fI filnamnsmnster\fP
+Visa omdirigeringar som matchar \fIskmnster\fP.
+.TP 
+\fB\-\-listpackage\fP\fI fil\fP
+Visa namnet p paketet som omdirigerar \fIfil\fP. Svarar LOCAL om \fIfil\fP har
+omdirigerats lokalt och ingenting om \fIfil\fP inte r omdirigerad.
+.TP 
+\fB\-\-truename\fP\fI fil\fP
+Visa det riktiga namnet p en omdirigerad fil.
+.
+.SH FLAGGOR
+.TP 
+\fB\-\-admindir\fP\fI katalog\fP
+Stll dpkg:s datakatalog till \fIkatalog\fP (standard: \fI/var/lib/dpkg\fP).
+.TP 
+\fB\-\-divert\fP\fI omdirigera\-till\fP
+\fIomdirigera\-till\fP r platsen dr de versioner av \fIfil\fP som tillhandahlls
+av andra paket kommer omdirigeras till.
+.TP 
+\fB\-\-local\fP
+Anger att alla pakets versioner av denna fil skall omdirigeras. Det innebr
+att det inte finns ngra undantag, och att oavsett vilket paket som
+installeras s omdirigeras filen. Detta kan anvndas av en administratr fr
+att installera en lokalt modifierad version.
+.TP 
+\fB\-\-package\fP\fI paket\fP
+\fIpaket\fP r namnet p ett paket vars kopia av \fIfil\fP inte kommer att
+omdirigeras, dvs. \fIfil\fP kommer omdirigeras fr alla paket frutom \fIpaket\fP.
+.TP 
+\fB\-\-quiet\fP
+Tyst lge, dvs. ingen pratsam utdata.
+.TP 
+\fB\-\-rename\fP
+Flytta faktiskt filen t sidan (eller tillbaka). \fBdpkg\-divert\fP kommer att
+avbryta krningen om destinationsfilen redan existerar.
+.TP 
+\fB\-\-test\fP
+Testlge, dvs. utfr inga faktiska ndringar, bara visa vad som skulle
+hnda.
+.TP 
+\fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH ANTECKNINGAR
+Vid tillgg r standard \fB\-\-local\fP och \fB\-\-divert\fP
+\fIoriginal\fP\fB.distrib\fP. Vid borttagning mste \fB\-\-package\fP eller \fB\-\-local\fP
+och \fB\-\-divert\fP matcha om de anges.
+
+Kataloger kan inte omdirigeras med \fBdpkg\-divert\fP.
+
+Se upp nr du omdirigerar delade bibliotek. \fBldconfig\fP(8) skapar en
+symbolisk lnk baserad p DT_SONAME\-fltet som r inbyggt i
+biblioteket. Eftersom ldconfig inte fljer omdirigeringar (bara dpkg gr
+det) kan den symboliska lnken komma att peka p det omdirigerade
+biblioteket om ett omdirigerat bibliotek har samma SONAMN som det ej
+omdirigerade.
+.
+.SH EXEMPEL
+Fr att omdirigera alla exemplar av en \fI/usr/bin/exempel\fP till
+\fI/usr/bin/exempel.foo\fP, dvs. omdirigera samtliga paket som tillhandahller
+\fI/usr/bin/exempel\fP s att de installerar den som \fI/usr/bin/exempel.foo\fP,
+och utfr namnbytet om det behvs:
+.HP
+dpkg\-divert \-\-divert /usr/bin/exempel.foo \-\-rename /usr/bin/exempel
+.PP
+Fr att ta bort omdirigeringen:
+.HP
+dpkg\-divert \-\-rename \-\-remove /usr/bin/exempel
+
+.PP
+Fr att omdirigera samtliga paket som frsker installera
+\fI/usr/bin/exempel\fP till \fI/usr/bin/exempel.foo\fP, frutom i det egna paketet
+\fIwibble\fP:
+.HP
+dpkg\-divert \-\-package wibble \-\-divert /usr/bin/exempel.foo \-\-rename
+/usr/bin/exempel
+.PP
+Fr att ta bort omdirigeringen:
+.HP
+dpkg\-divert \-\-package wibble \-\-rename \-\-remove /usr/bin/exempel
+.
+.SH MILJVARIABLER
+.TP 
+\fBDPKG_ADMINDIR\fP
+Om satt, och flaggan \fB\-\-admindir\fP inte har angivits, anvnds vrdet som
+datakatalog fr dpkg.
+.TP 
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP
+Om satt, och flaggorna \fB\-\-local\fP och \fB\-\-package\fP inte har angivits, kommer
+\fBdpkg\-divert\fP anvnda det som paketnamn.
+.
+.SH FILER
+.TP 
+\fI/var/lib/dpkg/diversions\fP
+Filen som innehller den aktuella listan med systemets omdirigeringar. Den
+r placerad i dpkg:s administrativa katalog, tillsammans med andra filer som
+r viktiga fr dpkg, till exempel \fIstatus\fP och \fIavailable\fP.
+.br
+Observera: \fBdpkg\-divert\fP behller den gamla versionen av filen, med
+filtillgget \fIold\fP, innan den erstter den med den nya.
+.
+.SH "SE VEN"
+\fBdpkg\fP(1).
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  1995 Ian Jackson.
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-genchanges.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-genchanges.1
--- dpkg/man/sv/dpkg-genchanges.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-genchanges.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,129 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-genchanges 1 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-genchanges \- skapa .changes\-filer fr Debian
+.
+.SH SYNOPS
+\fBdpkg\-genchanges\fP [\fIflagga\fP...]
+.br
+.
+.SH BESKRIVNING
+\fBdpkg\-genchanges\fP lser information frn ett uppackat och byggt
+Debiankllkodstrd och frn de filer det har genererat, och genererar en
+styrfil fr insndning till Debian (\fB.changes\fP\-fil).
+.
+.SH FLAGGOR
+.TP 
+\fB\-b\fP, \fB\-B\fP, \fB\-A\fP
+Detta r ett rent binrbygge (inga kllkodsfiler skall inkluderas). Det r
+ingen skillnad mellan \fB\-b\fP, \fB\-B\fP och \fB\-A\fP, den \fB.changes\fP\-fil som skapas
+innehller alla filer som skapats av \fBbinary\-*\fP\-mlen i det byggda paketet.
+.TP 
+\fB\-S\fP
+Anger att endast kllkoden skall sndas in (inga binrpaket tas med).
+.PP
+Flaggorna \fB\-s\fP\fIx\fP styr huruvida det ursprungliga kllkodsarkivet skall
+inkluderas i insndningen om kllkod genereras (dvs. \fB\-b\fP eller \fB\-B\fP inte
+har anvnts).
+.TP 
+\fB\-si\fP
+Som standard, eller om den anges, kommer originalkllkoden endast att
+inkluderas om uppstrmsversionsnumret (versionsnumret utan epok och utan
+Debianuppdateringsnummer) skiljer sig frn uppstrmsversionsnumret i
+fregende ndringsloggspost.
+.TP 
+\fB\-sa\fP
+Bifogar alltid originalkllkoden.
+.TP 
+\fB\-sd\fP
+Bifogar inte originalkllkoden, utan enbart differensfilen.
+.fi
+.TP 
+\fB\-v\fP\fIversion\fP
+Anvnder information frn ndringsloggen fr alla versioner som r strikt
+senare n \fIversion\fP.
+.TP 
+\fB\-C\fP\fIndringsbeskrivning\fP
+Ls beskrivningen av ndringarna frn filen \fIndringsbeskrivning\fP istllet
+fr att anvnda information frn kllkodstrdets changelog\-fil.
+.TP 
+\fB\-m\fP\fIpaketansvarige\-adress\fP
+Anvnd \fIpaketansvarige\-adress\fP som namn och e\-postadress till ansvarig fr
+detta paket, istllet fr att anvnda informationen frn kllkodstrdets
+control\-fil.
+.TP 
+\fB\-e\fP\fIpaketansvarige\-adress\fP
+Anvnd \fIpaketansvarige\-adress\fP som namn och e\-postadress till ansvarig fr
+denna insndning, istllet fr att anvnda informationen frn
+kllkodstrdets changelog\-fil.
+.TP 
+\fB\-V\fP\fInamn\fP\fB=\fP\fIvrde\fP
+Stller in en utdatasubstitueringsvariabel. Se \fBdeb\-substvars\fP(5) fr en
+beskrivning av utdatasubstituering.
+.TP 
+\fB\-T\fP\fIsubstvars\-fil\fP
+Ls substitutionsvariabler frn \fIsubstvars\-fil\fP; standard r
+\fBdebian/substvars\fP. Ingen variabelsubstitution utfrs p ngot av flten i
+utdata, men om den speciella variabeln \fIFormat\fP anges kommer den verstyra
+fltet med samma namn. Flaggan kan anvndas flera gnger fr att lsa
+substitutionsvariabler frn flera filer.
+
+.TP 
+\fB\-D\fP\fIflt\fP\fB=\fP\fIvrde\fP
+Erstt eller lgg till ett flt i den genererade control\-filen.
+.TP 
+\fB\-U\fP\fIflt\fP
+Ta bort ett flt ur den genererade control\-filen.
+.TP 
+\fB\-c\fP\fIcontrol\-fil\fP
+Anger huvudkllkodskontrollfilen som information skall lsas
+frn. Standardvrdet r \fBdebian/control\fP.
+.TP 
+\fB\-l\fP\fIndringsloggfil\fP
+Anger ndringsloggfilen som information skall lsas frn. Standardvrdet r
+\fBdebian/changelog\fP.
+.TP 
+\fB\-f\fP\fIfillisfile\fP
+Lser listan ver filer som skall sndas in hrifrn, istllet fr att
+anvnda \fBdebian/files\fP.
+.TP 
+\fB\-F\fP\fIndringsloggformat\fP
+Anger format p ndringsloggen. Som standard lses formatet frn en speciell
+rad nra slutet av ndringsloggen, eller s anvnds Debians standardformat
+om ingen information hittas.
+.TP 
+\fB\-u\fP\fIinsndningskatalog\fP
+Se efter filer som skall sndas in i \fIinsndningskatalog\fP istllet fr
+\&\fB..\fP (\fBdpkg\-genchanges\fP mste kunna se dessa filer s att det kan lgga in
+deras storlekar och kontrollsummor i \fB.changes\fP\-filen).
+.TP 
+\fB\-q\fP
+\fBdpkg\-genchanges\fP kommer normalt att generera informativa meddelanden p
+standard fel, till exempel om hur mnga pakets kllkodsfiler snds in. \fB\-q\fP
+undertrycker dessa meddelanden.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH FILER
+.TP 
+\fBdebian/files\fP
+Listan ver genererade filer som r en del av den insndning som
+frbereds. \fBdpkg\-genchanges\fP lser data hr nr \fB.changes\fP\-filen skapas.
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  1995\-1996 Ian Jackson
+.br
+Upphovsrttsskyddat  2000 Wichert Akkerman
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-gencontrol.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-gencontrol.1
--- dpkg/man/sv/dpkg-gencontrol.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-gencontrol.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,129 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-gencontrol 1 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-gencontrol \- skapa Debians kontrollfiler
+.
+.SH SYNOPS
+\fBdpkg\-gencontrol\fP [\fIflagga\fP...]
+.
+.SH BESKRIVNING
+\fBdpkg\-gencontrol\fP lser information frn ett uppackat Debiankllkodstrd
+och genererar en binrpaketsstyrfil (som standard
+debian/tmp/DEBIAN/control). Relationsflten kommer att frenklas.
+.sp
+Flten \fIPre\-Depends\fP, \fIDepends\fP, \fIRecommends\fP och \fISuggests\fP frenklas
+drmed, i den fljden, genom att ta bort beroenden som programmet vet
+tillhandahlls av starkare beroenden som redan tolkats. Det kommer ven ta
+bort eventuella egenberoenden (programmet tar bort alla beroenden som r
+uppfyllda nr den nuvarande versionen av paketet r installerat). Logiskt
+behlls snittet av multipla beroenden p samma paket. Ordningsfljden mellan
+beroendena behlls s lngt som mjligt: om ett beroende mste tas bort p
+grund av att ett beroende terkommer senare i fltet kommer det nya
+beroendet att ta platsen frn det som ersattes.
+.sp
+vriga relationsflt (\fIEnhances\fP, \fIConflicts\fP, \fIBreaks\fP, \fIReplaces\fP och
+\fIProvides\fP) frenklas ven individuellt genom att berkna unionen av de
+olika beroendena nr ett paket frekommer flera gnger i samma flt.
+.sp
+\fBdpkg\-gencontrol\fP lgger dessutom till en post fr binrpaketet i
+\fBdebian/files\fP.
+.
+.SH FLAGGOR
+.TP 
+\fB\-v\fP\fIversion\fP
+Stter versionsnumret p binrpaketet som skall skapas.
+.TP 
+\fB\-V\fP\fInamn\fP\fB=\fP\fIvrde\fP
+Stller in en utdatasubstitueringsvariabel. Se \fBdeb\-substvars\fP(5) fr en
+beskrivning av utdatasubstituering.
+.TP 
+\fB\-T\fP\fIsubstvars\-fil\fP
+Ls substitutionsvariabler frn \fIsubstvars\-fil\fP; standard r
+\fBdebian/substvars\fP. Ingen variabelsubstitution utfrs p ngot av flten i
+utdata, men om den speciella variabeln \fIFormat\fP anges kommer den verstyra
+fltet med samma namn. Flaggan kan anvndas flera gnger fr att lsa
+substitutionsvariabler frn flera filer.
+.TP 
+\fB\-D\fP\fIflt\fP\fB=\fP\fIvrde\fP
+Erstt eller lgg till ett flt i den genererade control\-filen.
+.TP 
+\fB\-U\fP\fIflt\fP
+Ta bort ett flt ur den genererade control\-filen.
+.TP 
+\fB\-c\fP\fIcontrol\-fil\fP
+Anger huvudkllkodskontrollfilen som information skall lsas
+frn. Standardvrdet r \fBdebian/control\fP.
+.TP 
+\fB\-l\fP\fIndringsloggfil\fP
+Anger ndringsloggfilen som information skall lsas frn. Standardvrdet r
+\fBdebian/changelog\fP.
+.TP 
+\fB\-f\fP\fIfillisfile\fP
+Ls eller skriv listan ver filer som skall sndas in hr, istllet fr att
+anvnda \fBdebian/file\fP.
+.TP 
+\fB\-F\fP\fIndringsloggformat\fP
+Anger format p ndringsloggen. Som standard lses formatet frn en speciell
+rad nra slutet av ndringsloggen, eller s anvnds Debians standardformat
+om ingen information hittas.
+.TP 
+\fB\-p\fP\fIpaket\fP
+Skapa information fr det binra paketet \fIpaket\fP. Om kllkodens control\-fil
+bara innehller ett binrpaket behver inte flaggan anges. I alla andra fall
+r det ndvndigt att vlja vilket binrpakets information som skall skapas.
+.TP 
+\fB\-n\fP\fIfilnamn\fP
+Anta att filnamnet fr paketet skalla vara \fIfilnamn\fP istllet fr det
+normala paket_version_ark.deb\-filnamnet.
+.TP 
+\fB\-is\fP, \fB\-ip\fP, \fB\-isp\fP
+Dessa flaggor ignoreras fr kompatibilitet med ldre versioner av dpkg\-dev
+men avrds numera ifrn. De anvndes tidigare fr att tala om fr
+dpkg\-gencontrol att inkludera Section\- och Priority\-flten i
+control\-filen. Detta r numera standardbeteendet. Om du vill terskapa det
+gamla beteendet kan du anvnda flaggan \fB\-U\fP fr att ta bort flten frn
+control\-filen.
+.TP 
+\fB\-P\fP\fIpaketbyggkatalog\fP
+Talar om fr \fBdpkg\-source\fP att paketet byggs i \fIpaketbyggkatalog\fP i
+stllet fr \fBdebian/tmp\fP. Vrdet anvnds fr att bestmma standardvrdet
+fr substitueringsvariabeln och control\-filsfltet \fBInstalled\-Size\fP (med
+hjlp av \fBdu\fP), samt fr att vlja standardplacering av utdatafilen.
+.TP 
+\fB\-O\fP
+Skriv control\-filen p standard ut, i stllet fr till
+\fBdebian/tmp/DEBIAN/control\fP (eller \fIpaketbyggkatalog\fP\fB/DEBIAN/control\fP om
+\fB\-P\fP anvndes).
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH FILER
+.TP 
+\fBdebian/control\fP
+Huvudkllkodskontrollinformationsfil, vilken innehller versionsoberoende
+information om kllkodspaketet och de binrpaket som kan skapas frn det.
+.TP 
+\fBdebian/files\fP
+Listan ver genererade filer som ingr i insndningen som
+skapas. \fBdpkg\-gencontrol\fP lgger till de frutsatta filnamnen p
+binrpaketen vars control\-filer det genererar hr.
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  1995\-1996 Ian Jackson
+.br
+Upphovsrttsskyddat  2000 Wichert Akkerman
+.br
+Upphovsrttsskyddat  2007\-2008 Raphal Hertzog
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-gensymbols.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-gensymbols.1
--- dpkg/man/sv/dpkg-gensymbols.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-gensymbols.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,471 @@
+.\" Author: Raphaël Hertzog
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-gensymbols 1 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-gensymbols \- generera symbolfiler (information om delade bibliotek)
+.
+.SH SYNOPS
+\fBdpkg\-gensymbols\fP [\fIflagga\fP...]
+.
+.SH BESKRIVNING
+\fBdpkg\-gensymbols\fP sker genom en temporrt byggtrd (som standard
+debian/tmp) efter bibliotek och skapar en \fIsymbols\fP\-fil som beskriver
+dem. Denna fil kommer sedan, svida den inte r tom, att installeras i
+DEBIAN\-underkatalogen i byggtrdet s att den hamnar i styrinformationen i
+paketet.
+.P
+Nr dessa filer skapas, anvnds ett par symbolfiler frn paketansvariga som
+indata. Programmet sker efter fljande filer (och anvnder den frsta det
+finner):
+.IP \(bu 4
+debian/\fIpaket\fP.symbols.\fIarkitektur\fP
+.IP \(bu 4
+debian/symbols.\fIarkitektur\fP
+.IP \(bu 4
+debian/\fIpaket\fP.symbols
+.IP \(bu 4
+debian/symbols
+.P
+Dessa filer r i huvudsak intressanta fr att kunna tillhandahlla den
+minimala version associerad med varje symbol i biblioteken. Detta motsvarar
+normalt den frsta version av paketet som tillhandahll symbolen, men det
+kan manuellt inkrementeras av de ansvariga om symbolens ABI utkas med
+bibehllen baktkompatibilitet. Det r den ansvarigas ansvar att hlla dessa
+filer jourfrda och korrekta, men \fBdpkg\-gensymbols\fP kan hjlpa till.
+.P
+Nr den genererade symbolfilen skiljer sig mot den version som
+tillhandahllits av de paketansvariga kommer \fBdpkg\-gensymbols\fP att skriva
+ut en differens mellan de tv versionerna. Om ndringarna r fr stora
+kommer programmet dessutom att misslyckas (du kan justera hur stora
+ndringar du kan tolerera, se flaggan \fB\-c\fP).
+.SH "UNDERHLLA SYMBOLFILER"
+Symbolfilerna r bara riktigt nyttiga om de motsvarar hur paketet har
+utvecklats ver flera versioner. De paketansvariga mste drfr uppdatera
+dem varje gng en ny symbol lggs till s att dess associerade minimala
+version motsvarar verkligheten. Fr att gra detta p ett riktigt stt finns
+det differensfiler i byggloggarna. I de flesta fall kan differensfilen
+appliceras direkt p filen debian/\fIpaket\fP. Med det i tanke s behvs det
+oftast ytterligare justeringar: det rekommenderas att skippa
+Debianrevisionen frn det minimala versionsnummer s att den
+baktanpassningar med ett lgre versionsnummer, men frn samma
+uppstrmsversion, fortfarande uppfyller de genererade beroendena. Om
+Debianrevisionen inte kan tas bort p grund av att en symbol faktiskt lades
+till av en Debianspecifik ndring s br ett "~" lggs till i slutet av
+versionen.
+.P
+Innan man applicerar en patch p symbolfilen br de ansvariga dubbelchecka
+att den r korrekt. Publicerade symboler br inte frsvinna, s patchen br
+ideellt sett bara lgga till nya rader.
+.P
+Obsevera att du kan skriva kommentarer i symbols\-filer: alla rader med "#"
+som frsta tecken r kommentarer, svida inte det brjar med "#include" (se
+stycket \fBAnvnda inkluderingar\fP). Rader som brjar med "#MISSING:" r
+speciella kommentarer som dokumenterar symboler som har frsvunnit.
+.SS "Anvnda #PACKAGE#\-substituering"
+.P
+I ngra sllsynta fall skiljer sig namnet p biblioteket mellan
+arkitekturer. Fr att undvika att hrdkoda namnet p paketet i symbolfilen
+kan du anvnda markren \fI#PACKAGE#\fP. Den erstts av det faktiska
+paketnamnet nr symbolfilen installeras. Till skillnad frn
+\fI#MINVER#\fP\-markren kommer \fI#PACKAGE#\fP aldrig att dyka upp i en symbolfil
+i ett binrpaket.
+.SS "Anvnda symboltaggar"
+.P
+Symboltaggning r nyttigt fr att markera symboler som r speciella p ngot
+stt. Alla symboler kan ha ett godtyckligt antal taggar associerade med
+sig. Medan alla taggar tolkas och lagras r det bara ett par av dem som
+frsts av \fBdpkg\-gensymbols\fP och som utlser specialhantering av
+symbolerna. Se undersymbolen \fBStandardsymboltaggar\fP fr mer information om
+dessa taggar.
+.P
+Taggarna anges precis fre symbolnamnet (inga blanksteg tillts mellan). Den
+brjar alltid med en vnsterparentes \fB(\fP, slutar med en hgerparentes \fB)\fP,
+och mste innehlla minst en tagg. Ytterligare taggar avdelas med tecknet
+\fB|\fP. En tagg kan ha ett vrde, vilket separeras frn taggnamnet med tecknet
+\fB=\fP. Taggnamn och vrden kan vara godtyckliga strngar, frutom att de inte
+kan innehlla de speciella tecknen \fB)\fP \fB|\fP \fB=\fP. Symbolnamn som fljer en
+taggangivelse kan, om s nskas, citeras med antingen \fB'\fP eller \fB"\fP fr
+att tillta blanksteg. Om inga taggar anges fr symbolen tolkas dock
+citattecken som en del av symbolnamnet, vilket fortstter till det frsta
+blanksteget.
+.P
+ (tag1=jag r markerad|taggnamn med blanksteg)"taggad citerad symbol"@Bas 1.0
+ (optional)taggad_ociterad_symbol@Bas 1.0 1
+ ociterad_symbol@Bas 1.0
+.P
+Den frsta symbolen i exemplet r heter \fItaggad citerad symbol\fP och har tv
+taggar: \fItag1\fP med vrdet \fIjag r markerad\fP och \fItaggnamn med blanksteg\fP
+som inte har ngot vrde. Den andra symbolen heter \fItaggad_ociterad_symbol\fP
+och r bara taggad med taggen som heter \fIoptional\fP. Den sista symbolen r
+ett exempel p en normal, otaggad symbol.
+.P
+Eftersom symboltaggar er en utkning av formatet i \fIdeb\-symbols(5)\fP kan de
+bara anvndas i symbolfiler i kllkodspaket (dessa filer r att anse som
+mallar som anvnds fr att bygga symbolfilerna som finns i
+binrpaketen). Nr \fBdpkg\-gensymbols\fP anropas utan flaggan \fI\-t\fP kommer det
+att mata ut symbolfiler kompatibla med \fIdeb\-symbols(5)\fP\-formatet: det
+hanterar symboler helt beroende p vad som beskrivs av standardtaggarna och
+tar bort alla taggar frn utdata. I mall\-lge (\fI\-t\fP) kommer dremot alla
+symboler och deras taggar (bde standard och oknda) att behllas i utdata
+och skrivas i sin originalform s som de lstes in.
+.SS Standardsymboltaggar
+.TP 
+\fBoptional\fP
+En symbol markerad som valfri (optional) kan frsvinna frn bibliotektet nr
+som helst och kommer aldrig gra s att \fBdpkg\-gensymbols\fP
+misslyckas. Frsvunna symboler kommer dock fortfarande visas som saknade
+(MISSING) i differensen fr varje ny paketversion. Detta beteende fungerar
+som en pminnelse fr de paketansvariga om att symbolen mste tas bort frn
+symbolfilen eller lggas tillbaka till biblioteket. Nr en valfri symbol som
+tidigare markerats som saknad (MISSING) pltsligt dyker upp igen i en senare
+version kommer den att uppgraderas tillbaka till befintligstatus
+("existing") med den minsta tillgngliga versionen ofrndrad.
+
+Taggen r anvndbar fr symboler som r privata och vars frsvinnande inte
+gr att ABI:et gr snder. De flesta C++\-mallinstansieringar faller till
+exempel in under denna kategori. Som andra taggar kan den hr ven ha ett
+godtyckligt vrde: det kan anvndas fr att indikera varfr symbolen r att
+anse som valfri.
+.TP 
+\fBarch=\fP\fIarkitekturlista\fP
+Denna tag gr det mjligt att begrnsa vilken uppsttning arkitekturer
+symbolen r tnkt att finnas fr. Nr symbollistan uppdateras med symboler
+som upptcks i biblioteket behandlas alla arkitekturspecifika symboler som
+inte gller den aktuella vrdarkitekturen som om de inte fanns. Om en
+arkitekturspecifik symbol som motsvarar den aktuella vrdarkitekturen inte
+existerar i biblioteket gller de vanliga reglerna fr saknade symboler, och
+kan f \fBdpkg\-gensymbols\fP att misslyckas.  andra sidan, om en
+arkitekturspecifik symbol hittas dr den inte var menad att finnas (d den
+aktuella vrdarkitekturen inte r listad i taggen), grs den
+arkitekturneutral (dvs. "arch"\-taggen tas bort och symbolen kommer finnas
+med i differensen p grund av denna ndring), men den anses inte som ny.
+
+I det vanliga icke\-mall\-lget skrivs endast de arkitekturspecifika symboler
+som motsvarar den aktuella vrdarkitekturen till symbolfilen.  andra sidan
+skrivs alla arkitekturspecifika symboler (inklusive de frn andra
+arkitekturer) till symbolfilen i mall\-lget.
+
+Formatet p \fIarkitekturlista\fP r detsamma som det som anvnds i
+\fIBuild\-Depends\fP\-fltet i \fIdebian/control\fP (bortsett frn de omslutande
+hakparenteserna []). Den frsta symbolen frn listan nedan, till exempel,
+kommer endast att tas med p arkitekturerna alpha, amd64, kfreebsd\-amd64 och
+ia64, medan den andra tas med verallt frutom p armel.
+
+ (arch=alpha amd64 kfreebsd\-amd64 ia64)en_64bit\-specifik_symbol@Base 1.0
+ (arch=!armel)symbol_armel_inte_har@Base 1.0
+.TP 
+\fBignore\-blacklist\fP
+dpkg\-gensymbols har en intern svartlista ver symboler som inte skall
+frekomma i symbolfiler eftersom de oftast bara r sidoeffekter frn
+implementationsdetaljer i verktygskedjan. Om du, av ngon orsak, verkligen
+vill att en av dessa symboler skall tas med i symbolfilen mste du tagga
+symbolen med \fBignore\-blacklist\fP. Det kan vara ndvndigt fr
+lgniv\-verktygskedjebibliotek som libgcc.
+.TP 
+\fBc++\fP
+Betecknar \fIc++\fP\-symbolmnster. Se stycket \fBAnvnda symbolmnster\fP nedan.
+.TP 
+\fBsymver\fP
+Anger \fIsymver\fP (symbolversion)\-symbolmnstret. Se stycket \fBAnvnda
+symbolmnster\fP nedan.
+.TP 
+\fBregex\fP
+Anger \fIregex\fP\-symbolmnstret. Se stycket \fIAnvnda symbolmnster\fP nedan.
+.SS "Anvnda symbolmnster"
+.P
+Till skillnad frn vanliga symbolspecifikationer kan ett mnster tcka flera
+faktiska symboler frn biblioteket. \fBdpkg\-gensymbols\fP kommer frska matcha
+varje mnster mot varje faktisk symbol som \fIinte\fP har en motsvarande
+specifik symbol definierad i symbolfilen. S fort det frsta mnster som
+motsvarar symbolen hittas kommer alla dess taggar och egenskaper att
+anvndas som en basspecifikation fr symbolen. Om inget mnster motsvarar
+symbolen kommer den att tolkas som ny.
+
+Ett mnster anses som tappat om det inte motsvarar ngra symboler i
+biblioteket. Som standard kommer detta f \fBdpkg\-genchanges\fP att misslyckas
+om \fI\-c1\fP eller hgre anges. Om ett sdant misslyckande inte r nskvrt kan
+mnstret dock mrkas med taggen \fIoptional\fP. Om mnstret d inte motsvarar
+ngonting kommer det bara dyka upp i differensen som saknas
+(MISSING). Mnstret kan dessutom, precis som andra symboler, begrnsas till
+specifika arkitekturer med hjlp av \fIarch\fP\-taggen. Se stycket
+\fBStandardsymboltaggar\fP ovan fr mer information.
+
+Mnster r en utkning av \fIdeb\-symbols(5)\fP\-formatet och r drfr endast
+tilltna i symbolfilmallar. Syntax fr angivelse av mnster skiljer sig inte
+frn den fr en specifik symbol. Symbolnamnsdelen av specifikationen
+fungerar dock som ett uttryck som skall jmfras mot \fInamn@version\fP fr den
+faktiska symbolen. Fr att skilja mellan olika sorters mnster, taggas
+mnster normalt med en speciell tagg.
+
+Fr nrvarande stder \fBdpkg\-gensymbols\fP tre grundlggande mnstertyper:
+.TP  3
+\fBc++\fP
+Detta mnster anges med taggen \fIc++\fP. Den matchar enbart C++\-symboler med
+deras avmanglade symbolnamn (som det skrivs ut av
+\fBc++filt\fP(1)\-verktyget). Det hr mnstret r vldigt nyttigt fr att matcha
+symboler vars manglade namn kan skilja sig mellan olika arkitekturer, medan
+deras avmanglade namn r desamma. En grupp dylika symboler r
+\fIicke\-virtuella "thunks"\fP som har arkitekturspecifika offsetvrden inbyggda
+i sina manglade namn. En vanlig instans av detta fall r en virtuell
+destruktr som under diamantarv behver en icke\-virtuell
+"thunk"\-symbol. ven om till exempel ZThn8_N3NSB6ClassDD1Ev@Base p
+32\-bitarsarkitekturer troligtvis r _ZThn16_N3NSB6ClassDD1Ev@Base
+p64\-bitarsarkitekturer, s kan de matchas med ett enda \fIc++\fP\-mnster:
+.RS
+.PP
+libdummy.so.1 libdummy1 #MINVER#
+ [...]
+ (c++)"non\-virtual thunk to NSB::ClassD::~ClassD()@Base" 1.0
+ [...]
+.P
+Det avmanglade namnet ovan kan hmtas genom att utfra fljande kommando:
+.PP
+ $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt
+.P
+Observera att ven om det manglade namnet per definition r unikt i
+biblioteket gller inte detta fr avmanglade namn. Flera distinkta verkliga
+symboler kan ha samma avmanglade namn. Det gller till exempel fr
+icke\-virtuella "thunk"\-symboler i konfigurationer med komplexa arv eller fr
+de flesta konstruktrer och destruktrer (eftersom g++ normalt genererar tv
+symboler fr dem). Eftersom dessa kollisioner sker p ABI\-nivn br de dock
+inte snka kvaliteten p symbolfilen.
+.RE
+.TP 
+\fBsymver\fP
+Detta mnster anges med taggen \fIsymver\fP. Vlunderhllna bibliotek har
+versionshanterade symboler dr varje version motsvarar uppstrmsversionen
+dr symbolen lades till. Om det r fallet kan du anvnda ett
+\fIsymver\fP\-mster fr att matcha alla symboler som matchar den specifika
+versionen. Till exempel:
+.RS
+.PP
+libc.so.6 libc6 #MINVER#
+ (symver)GLIBC_2.0 2.0
+ [...]
+ (symver)GLIBC_2.7 2.7
+ access@GLIBC_2.0 2.2
+.PP
+Alla symboler associerade med versionerna GLIBC_2.0 och GLIBC_2.7 kommer
+leda till den minimal version 2.0 respektive 2.7, med undantag av symbolen
+access@GLIBC_2.0. Den sistnmnda kommer leda till ett minsta beroende p
+libc6 version 2.2 trots att den motsvarar mnstret
+"(symver)GLIBC_2.0"\-mnstret, eftersom specifika symboler gller fre
+mnster.
+.P
+Observera att ven om den gamla sortens jokerteckenmnster (anges med
+"*@version" i symbolnamnfltet) fortfarande stds s rekommenderas de inte
+lngre i och med den nya sortens syntax "(symver|optional)version". Till
+exempel br "*@GLIBC_2.0 2.0" skrivas som "(symver|optional)GLIBC_2.0 2.0"
+om samma beteende behvs.
+.RE
+.TP 
+\fBregex\fP
+Mnster med reguljra uttryck anges med taggen \fIregex\fP. De matchar med det
+reguljra uttrycket p perl\-form som anges i symbolnamnsfltet. Ett
+reguljrt uttryck matchar som det str, glm drfr inte att inleda det med
+tecknet \fI^\fP, annars kommer det matcha godtycklig del av den verkliga
+symbolens \fInamn@version\fP\-strng. Till exempel:
+.RS
+.PP
+libdummy.so.1 libdummy1 #MINVER#
+ (regex)"^mystack_.*@Base$" 1.0
+ (regex|optional)"private" 1.0
+.P
+Symboler som "mystack_new@Base", "mystack_push@Base", "mystack_pop@Base"
+osv. kommer att trffas av det frsta mnstret medan t.ex
+"ng_mystack_new@Base" inte gr det. Det andra mnstret motsvarar alla
+symbolen som innehller strngen "private" i sina namn och trffar kommer
+att rva \fIoptional\fP\-taggen frn mnstret.
+.RE
+.P
+Grundlggande mnster som anges ovan kan kombineras dr det r vettigt. I s
+fall behandlas de i den ordning taggarna anges. Till exempel kommer bde
+.PP
+ (c++|regex)"^NSA::ClassA::Private::privmethod\ed\e(int\e)@Base" 1.0
+ (regex|c++)N3NSA6ClassA7Private11privmethod\edEi@Base 1.0
+.P
+att trffa symbolerna "_ZN3NSA6ClassA7Private11privmethod1Ei@Base" och
+"_ZN3NSA6ClassA7Private11privmethod2Ei@Base". Nr det frsta mnstret
+jmfrs avmanglas frst symbolen som en C++\-symbol, varefter det avmanglade
+namnet jmfrs med det reguljra uttrycket. Nr det andra mnstret jmfrs,
+ andra sidan, jmfrs det reguljra uttrycket mot det ra symbolnamnet,
+varefter symbolen testas fr att se om det r av C++\-typ genom att frska
+avmangla det. Om ett grundlggande mnster misslyckas kommer hela uttrycket
+att misslyckas. Drfr kommer, till exempel
+"__N3NSA6ClassA7Private11privmethod\edEi@Base" inte att trffas av ngot av
+mnstrena eftersom det inte r en giltig C++\-symbol.
+.P
+I allmnhet delas alla mnster in i tv grupper. alias (grundlggande \fIc++\fP
+och \fIsymver\fP) och generella mnster (\fIregex\fP, samtliga kombinationer av
+multipla grundlggande mnster). Det gr snabbt att trffa grundlggande
+aliasbaserade mnster (O(1)) medan generella mnster r O(N) (N \- antal
+generella mnster) fr varje symbol. Det rekommenderas drfr inte att
+anvnda fr mnga generella mnster.
+.P
+Nr flera mnster trffar samma verkliga symbol fredras alias (frst
+\fIc++\fP, sedan \fIsymver\fP) framfr generella mnster. Generella mnster
+trffas i den ordning de upptcktes i symbolfilmallen fram till den frsta
+lyckade trffen. Observera dock att manuell omsortering av poster i
+mallfilen inte rekommenderas d \fBdpkg\-gensymbols\fP genererar differensfiler
+baserad p den alfanumeriska sorteringsordningen av dess namn.
+.SS "Anvnda inkluderingar"
+.P
+Nr uppsttningen av exporterade symboler skiljer sig mellan arkitekturer
+kan det vara ineffektivt att anvnda en enda symbolfil. I dessa fall kan ett
+inkluderingsdirektiv vara nyttigt p flera stt:
+.IP \(bu 4
+Du kan faktorisera de gemensamma delarna i en extern fil och inkludera den
+filen i din \fIpaket\fP.symbols.\fIarkitektur\fP\-fil genom att anvnda ett
+inkluderingsdirektiv som detta:
+
+#include "\fIpaket\fP.symbols.common"
+.IP \(bu
+Inkluderingsdirektivet kan ven taggas som alla andra symboler:
+
+(tag|..|tagN)#include "fil\-att\-inkludera"
+
+Alla symboler som inkluderas frn \fIfil\-att\-inkludera\fP kommer att anses som
+standard vara taggade med \fItag\fP .. \fItagN\fP. Du kan anvnda denna funktion
+fr att skapa en gemensam \fIpaket\fP.symbols\-fil som inkluderar
+arkitekturspecifika filer:
+
+  gemensam_symbol1@Base 1.0
+ (arch=amd64 ia64 alpha)#include "paket.symbols.64bit"
+ (arch=!amd64 !ia64 !alpha)#include "paket.symbols.32bit"
+  gemensam_symbol2@Base 1.0
+.P
+Symbolfilerna lses radvis, och inkluderingsdirektiv utfrs s fort de
+upptcks. Det betyder att innehllet i den inkluderade filen kan verstyra
+allt innehll som frekom fre inkluderingsdirektivet och att innehll efter
+direktivet kan verstyra allt frn den inkluderade filen. Alla symboler
+(ven andra #include\-direktiv) i den inkluderade filen kan ange ytterligare
+taggar eller verstyra vrden fr de rvda taggarna i sin
+taggspecifikation. Det finns dock inte ngot stt fr en symbol att ta bort
+ngon av sina rvda taggar.
+.P
+En inkluderad fil kan repetera huvudraden som innehller SONAMNet fr
+biblioteket. I s fall verstyr den en eventuell huvudrad som lsts in
+tidigare. Det r vanligtvis dock bst att undvika att duplicera
+huvudrader. Ett stt att gra det r som fljer:
+.PP
+#include "libngonting1.symbols.common"
+ arkitekturspecifik_symbol@Base 1.0
+.SS "God hantering av bibliotek"
+.P
+Ett vlunderhllet bibliotek har fljande funktioner:
+.IP \(bu 4
+dess API r stabilt (publika symboler tas aldrig bort, endast nya publika
+symboler lggs till) och inkompatibla ndringar grs endast nr SONAMNet
+ndras;
+.IP \(bu 4
+ideellt anvnder det en versionhanterade symboler fr att upprtthlla
+ABI\-stabilitet trots interna ndringar och API\-utkningar;
+.IP \(bu 4
+det exporterar inte privata symboler (sdana symboler kan taggas med
+"optional" fr att g runt detta).
+.P
+Nr man underhller symbolfilen r det ltt att upptcka symboler som dyker
+upp och frsvinner. Det r svrare att upptcka inkompatibla API\- och
+ABI\-ndringar. Den paketansvarige br drfr noggrant lsa igenom
+uppstrmsndringsloggen fr fall d reglerna fr god hantering av bibliotek
+bryts. Om ett mjligt fel upptcks br uppstrmsfrfattaren meddelas, d det
+alltid r bttre att problemet rttas uppstrms n specifikt i Debian.
+.SH FLAGGOR
+.TP 
+\fB\-P\fP\fIpaketbyggkatalog\fP
+Sk \fIpaketbyggkatalog\fP istllet fr debian/tmp.
+.TP 
+\fB\-p\fP\fIpaket\fP
+Definiera paketnamnet. Krvs om mer n ett binrpaket listas i
+debian/control (eller om det inte finns ngon debian/control\-fil).
+.TP 
+\fB\-v\fP\fIversion\fP
+Definiera paketversion. Standardvrdet r versionen som hmtas frn
+debian/changelog. Krvs om programmet anropas utanfr ett kllkodspakettrd.
+.TP 
+\fB\-e\fP\fIbiblioteksfil\fP
+Analyserar endast bibliotek som listats explicit istllet fr att hitta alla
+publika bibliotek. Du kan anvnda ett reguljrt uttryck i \fIbiblioteksfil\fP
+fr att trffa multipla bibliotek med ett enda argument (annars behver du
+flera \fB\-e\fP).
+.TP 
+\fB\-I\fP\fIfilnamn\fP
+Anvnd \fIfilnamn\fP som referensfil fr att generera symbolfilen som
+integreras i sjlva paketet.
+.TP 
+\fB\-O\fP
+Skriv den genererade symbolfilen p standard ut, i stllet fr att lagra den
+i paketets byggtrd.
+.TP  
+\fB\-O\fP\fIfilnamn\fP
+Lagra den genererade symbolfilen som \fIfilnamn\fP. Om \fIfilnamn\fP redan
+existerar kommer dess innehll att anvndas som bas fr den genererade
+symbolfilen. Du kan anvnda den hr funktionen fr att uppdatera en
+symbolfil s att den motsvarar en nyare uppstrmsversion av ditt bibliotek.
+.TP 
+\fB\-t\fP
+Skriv symbolfilen i mall\-lge istllet fr i formatet kompatibelt med
+\fIdeb\-symbols(5)\fP. Huvudskillnaden r att symbolnamn och taggar skrivs i sin
+originalform i mall\-lget, till skillnad frn de efterbehandlade
+symbolnamnen med borttagna taggar som skrivs i det kompatibla
+lget. Dessutom kan vissa symboler uteslutas nr en vanlig
+\fIdeb\-symbols(5)\fP\-fil skrivs (i enlighet med tagghanteringsreglerna) medan
+alla symboler alltid skrivs till symbolfilsmallen.
+.TP 
+\fB\-c\fP\fI[0\-4]\fP
+Definiera vilka kontroller som skall utfras nr den genererade symbolfilen
+jmfrs med den mallfil som anvnds som startpunkt. Som standard r nivn
+1. Genom att ka nivn utfrs flera kontroller, inklusive alla kontroller p
+lgre niv. Niv 2 misslyckas om nya symboler har introducerats. Niv 3
+misslyckas om ngra bibliotek har frsvunnit. Niv 4 misslyckas om ngra
+bibliotek har introducerats.
+
+Vrdet kan verstyras med miljvariabeln DPKG_GENSYMBOLS_CHECK_LEVEL.
+.TP 
+\fB\-q\fP
+Hll tyst och generera aldrig en differens mellan den genererade symbolfilen
+och mallfilen som anvndes som startpunkt eller visa varningar om
+nya/frlorade bibliotek eller nya/frlorade symboler. Den hr flaggan tar
+endast bort informationsutdata, inte sjlva kontrolleran (se flaggan \fI\-c\fP).
+.TP 
+\fB\-a\fP\fIarkitektur\fP
+Anta \fIarkitektur\fP som vrdarkitektur vid hantering av symbolfiler. Anvnd
+den hr flaggan fr att generera en symbolfil eller differens fr valfri
+arkitektur s lnge dess binrer r tillgngliga.
+.TP 
+\fB\-d\fP
+Aktiverar felskningslge. Flera meddelanden visas fr att frklara vad
+\fBdpkg\-gensymbols\fP gr.
+.TP 
+\fB\-V\fP
+Aktivera pratsamt lge. Den genererade symbolfilen innehller ej lngre
+rekommenderade symboler som kommentarer. I mall\-lge fljs dessutom
+mnstersymboler av kommentarer som visar vilka verkliga symboler som har
+trffats av mnstret.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH "SE VEN"
+\fBhttp://people.redhat.com/drepper/symbol\-versioning\fP
+.br
+\fBhttp://people.redhat.com/drepper/goodpractice.pdf\fP
+.br
+\fBhttp://people.redhat.com/drepper/dsohowto.pdf\fP
+.br
+\fBdeb\-symbols\fP(5), \fBdpkg\-shlibdeps\fP(1).
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  2007\-2009 Raphal Hertzog
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-maintscript-helper.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-maintscript-helper.1
--- dpkg/man/sv/dpkg-maintscript-helper.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-maintscript-helper.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,146 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-maintscript\-helper 1 2011\-08\-14 Debianprojektet Dpkg\-sviten
+.SH NAMN
+dpkg\-maintscript\-helper \- gr runt knda dpkg\-begrnsningar i paketskript
+.
+.SH SYNOPS
+\fBdpkg\-maintscript\-helper\fP \fIkommando\fP [\fIflagga\fP...] \fB\-\-\fP
+\fImaint\-script\-flagga\fP...
+.
+.SH "KOMMANDON OCH PARAMETRAR"
+.P
+\fBrm_conffile\fP \fIkonffil\fP [\fIsenasteversion\fP [\fIpaket\fP]]
+.P
+\fBmv_conffile\fP \fIgammalkonffil\fP \fInykonffil\fP [\fIsenasteverison\fP [\fIpaket\fP]]
+.
+.SH BESKRIVNING
+.P
+Programmet skrevs fr att kras i paketskript fr att utfra en del tgrder
+som dpkg (nnu) inte sjlv kan hantera, antingen p grund av designval eller
+p grund av nuvarande begrnsningar.
+.P
+Mnga av dessa tgrder krver samordnade tgrder frn flera paketskript
+(\fBpreint\fP, \fBpostinst\fP, \fBprerm\fP, \fBpostrm\fP). Fr att undvika misstag
+rcker det att lgga in ett och samma anrop i alla skript, varp programmet
+anpassar sitt beteende beroende p miljvariabeln \fBDPKG_MAINTSCRIPT_NAME\fP
+och p paketskriptets parametrar, vilka du mste vidaresnda efter dubbla
+bindestreck.
+.
+.SH "KONFFIL\-RELATERADE TGRDER"
+.P
+Nr ett paket uppgraders kommer dpkg inte att automatiskt ta bort en konffil
+(en konfigurationsfil fr vilken dpkg skall behlla anvndarens ndringar)
+om den inte finns i den nya versionen. Det finns tv grundlggande skl till
+detta; den frsta r att konffilen kan ha tappats av misstag och nsta
+version kan komma att terstlla den, varp anvndaren inte vill tappa sina
+ndringar. Den andra r att fr att gra det mjligt fr paket att g ver
+frn en dpkg\-hanterad konffil till en fil som hanteras av paketets skript,
+vanligtvis genom ett verktyg som debconf eller ucf.
+.P
+Det innebr att, om paketet menar att byta namn eller ta bort en
+konfigurationsfil, s mste det gra s explicit, och d kan
+\fBdpkg\-maintscript\-helper\fP anvndas fr att implementera en elegant
+borttagning och flyttning av konffiler i paketscripten.
+.
+.SS "TA BORT EN KONFFIL"
+.P
+Om en konffil helt tas bort br den tas bort frn disk, svida inte
+anvndaren har modifierat den. Om det finns lokala ndringar br de
+bibehllas. Om paketuppgraderingen avbryts br inte konffilen som just blev
+frldras frsvinna.
+.P
+Allt detta implementeras genom att lgga in fljande skalkod i paketskripten
+\fBpreinst\fP, \fBpostinst\fP och \fBpostrm\fP:
+.P
+    dpkg\-maintscript\-helper rm_conffile \e
+        \fIkonffil\fP \fIsenasteversion\fP \fIpaket\fP \-\- "$@"
+.P
+\fIkonffil\fP r filnamnet p den konffil som skall tas bort. \fIsenasteversion\fP
+r den senaste versionen av paketet som innehll konffilen (eller den
+senaste versionen av paketet som inte tog hand om att ta bort den verblivna
+konffilen om detta inte omedelbart implementerades). Om \fIsenasteversion\fP r
+tomt eller inte angivits frsks operationen varje gng paketet
+uppgraderas. \fIpaket\fP r paketnamnet, det r frivilligt eftersom det faller
+tillbaka p $DPKG_MAINSTCRIPT_PACKAGE (variabeln stts av dpkg till namnet
+p det paket som behandlas). Alla paramerar till paketskriptet mste
+vidaresndas till programmet efter "\-\-".
+.P
+Aktuell implementation: i \fBpreinst\fP kontrolleras om konffilen ndrades och
+i s fall byts namnet p den till antingen \fIkonffil\fP\fB.dpkg\-remove\fP (om
+inte modifierad) eller till \fIkonffil\fP\fB.dpkg\-backup\fP (om modifierad). I
+\fBpostinst\fP byts namnet p den sistnmnda filen till \fIkonffil\fP\fB.dpkg\-bak\fP
+och behlls som referens om den innehller ndringar av anvndaren, medan
+den tidigare kommer att tas bort. Om paketuppgraderingen avbryts kommer
+\fBpostrm\fP att ominstallera den ursprungliga konffilen. Vid borttagning
+kommer \fBpostrm\fP ven att ta bort \fB.dpkg\-bak\fP\-filen som behllits fram till
+dess.
+.
+.SS "BYTA NAMN P EN KONFFIL"
+.P
+Om en konffil flyttas frn en plats till en annan mste du se till att du
+flyttar med eventuella ndringar gjorda av anvndaren. Detta kan frst verka
+vara en enkel ndring av \fBpreinst\fP\-skriptet, men det kommer leda till att
+anvndaren ombeds att godknna ndringar i konffilen fr dpkg, ven om denne
+inte r ansvarig fr dem.
+.P
+En elegant namnndring kan implementeras genom att lgga in fljande skalkod
+i paketskripten \fBpreinst\fP, \fBpostinst\fP och \fBpostrm\fP:
+.P
+    dpkg\-maintscript\-helper mv_conffile \e
+        \fIgammalkonffil\fP \fInykonffil\fP \fIsenasteversion\fP \fIpaket\fP \-\- "$@"
+.P
+\fIgammalkonffil\fP och \fInykonffil\fP r det gamla och nya namnet p konffilen
+vars namn skall bytas. \fIsenasteversion\fP r den senaste versionen av paketet
+som innehll konffilen med dess gamla namn. Om \fIsenasteversion\fP r tom
+eller inte har angivits kommer operationen att frskas varje gng paketet
+uppgraderas (observera: det r skrare att ange versionen och drmed endast
+utfra operationen en gng). \fIpaket\fP r paketnamnet, det r frivilligt
+eftersom det faller tillbaka p $DPKG_MAINSTCRIPT_PACKAGE (variabeln stts
+av dpkg till namnet p det paket som behandlas). Alla paramerar till
+paketskriptet mste vidaresndas till programmet efter "\-\-".
+.P
+Aktuell implementation: I \fBpreinst\fP kontrolleras om konffilen har ndrats,
+om ja lmnas den kvar p plats, annars byts namnet p den till
+\fIgammalkonffil\fP\fB.dpkg\-remove\fP. Vid konfigurering tar \fBpostinst\fP bort
+\fIgammalkonffil\fP\fB.dpkg\-remove\fP och byter namn p \fIgammalkonffil\fP till
+\fInykonffil\fP om \fIgammalkonffil\fP fortfarande finns. Vid avbruten
+uppgradering eller installation byter \fBpostrm\fP tillbaka namnet frn
+\fIgammalkonffil\fP\fB.dpkg\-remove\fP till \fIgammalkonffil\fP om s behvs.
+.
+.SH "INTEGRERA I PAKET"
+.P
+Givet att \fBdpkg\-maintscript\-helper\fP anvnds i \fBpreinst\fP s innebr detta
+villkorslst att ett frhandsberoende ("pre\-dependency") krvs fr att
+frskra att den ndvndiga versionen av dpkg redan har packats upp. Den
+version som krvs beror p vilket kommando som anvnds, fr \fBrm_conffile\fP
+och \fBmv_conffile\fP r det 1.15.7.2:
+.P
+    \fBPre\-Depends:\fP dpkg (>= 1.15.7.2)
+.P
+Men i mnga fall r operationen som utfrs av programmet inte kritiskt fr
+paketet, och istllet fr att anvnda ett frhandsberoende kan vi anropa
+programmet endast om vi vet att det ndvndiga kommandot stds av den nu
+installerade dpkg:
+.P
+    if dpkg\-maintscript\-helper supports \fIkommando\fP; then
+        dpkg\-maintscript\-helper \fIkommando\fP ...
+    fi
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  2010 Raphal Hertzog
+.br
+Upphovsrttsskyddat  2008 Joey Hess
+.br
+Upphovsrttsskyddat  2007 Guillem Jover
+.br
+Upphovsrttsskyddat  2005 Scott James Remnant
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-mergechangelogs.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-mergechangelogs.1
--- dpkg/man/sv/dpkg-mergechangelogs.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-mergechangelogs.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,76 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-mergechangelogs 1 2011\-08\-14 Debianprojektet Dpkg\-sviten
+.SH NAMN
+dpkg\-mergechangelogs \- trevgssammanslagning av Debianndringsloggar
+.
+.SH SYNOPS
+\fBdpkg\-mergechangelogs\fP [\fIflaggor\fP...] \fIgammal\fP \fIny\-a\fP \fIny\-b\fP [\fIut\fP]
+.
+.SH BESKRIVNING
+.P
+Programmet kommer anvnda de 3 angivna versionerna av Debianndringsloggen
+fr att skapa en sammanslagen ndringsloggfil. Den skapade ndringsloggen
+sparas i filen \fIut\fP eller skrivs ut p standard ut om den parametern inte
+anges.
+.P
+Enskilda poster identifieras av sitt versionsnummer och de antas inte st i
+konflikt med varandra, de sls helt enkelt ihop i rtt ordning (enligt
+minskade versionsnummer). Nr \fB\-\-merge\-prereleases\fP anvnds ignoreras
+versionsnumret efter det sista tilde\-tecknet, s att 1.0\-1~exp1 och
+1.0\-1~exp5 anges vara samma post. Nr samma versionsnummer r tillgnglig i
+bde \fIny\-a\fP och \fIny\-b\fP grs ett frsk p en vanlig radbaserad
+trevgssammanslagning (frutsatt att modulen Algorithm::Merge r tillgnglig
+\[em] den ingr i paketet libalgorithm\-merge\-perl \[em] om inte fr du en
+global konflikt p innehllet i posten).
+.
+.SH FLAGGOR
+.TP 
+\fB\-\-merge\-prereleases\fP, \fB\-m\fP
+Ignorera delen efter det sista tilde\-tecknet i versionsnumret vid
+versionsjmfrelse fr att ta reda p om tv poster anses vara densamma
+eller inte.
+.sp
+Det kan vara anvndarbart om du anvnder samma ndringsloggpost men kar
+versionsnumret med jmna mellanrum. Till exempel kanske du har 2.3\-1~exp1,
+2.3\-1~exp2, ... fram till den officiella utgvan 2.3\-1 och de har alla samma
+ndringsloggpost som har vxt fram ver tid.
+.TP 
+\fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH BEGRNSNINGAR
+.P
+Allt som inte tolkas av Dpkg::Changelog frsvinner under
+sammanslagningen. Det kan glla saker som vim\-lgesrader, kommentarer som
+inte skulle vara dr, osv.
+.
+.SH "INTEGRATION MED GIT"
+.P
+Om du vill anvnda det hr programmet fr att sl ihop Debianndringsloggar
+i ett Git\-arkiv mste du frst registrera en ny sammanslagningsdrivrutin
+(merge driver) i \fB.git/config\fP eller \fB~/.gitconfig\fP:
+.P
+ [merge "dpkg\-mergechangelogs"]
+     name = debian/changelog\-sammanslagningsdrivrutin
+     driver = dpkg\-mergechangelogs \-m %O %A %B %A
+.P
+Drefter mste du stlla in merge\-attributet p debian/changelog\-filen,
+antingen i \fB.gitattributes\fP i sjlv arkivet, eller i
+\&\fB.git/info/attributes\fP:
+.P
+ debian/changelog merge=dpkg\-mergechangelogs
+.SH FRFATTARE
+Upphovsrttsskyddat  2009\-2010 Raphal Hertzog
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-name.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-name.1
--- dpkg/man/sv/dpkg-name.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-name.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,100 @@
+.\" This is an -*- nroff -*- source file.
+.\" dpkg-name and this manpage are Copyright © 1995,1996 by Erick Branderhorst.
+.\"
+.\" This is free software; see the GNU General Public Licence version 2
+.\" or later for copying conditions.  There is NO warranty.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-name 1 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-name \- byt namnet p Debianpaket till det fullstndiga paketnamnet
+.
+.SH SYNOPS
+\fBdpkg\-name\fP [\fIflagga\fP...] [\fB\-\-\fP] \fIfil\fP...
+.
+.SH BESKRIVNING
+.PP
+Manualsidan dokumenterar programmet \fBdpkg\-name\fP, vilket tillhandahller ett
+enkelt stt att byta namn p \fBDebian\fPpaket till deras fullstndiga
+paketnamn. Ett fullstndigt paketnamn bestr av
+\fIpaket\fP\fB_\fP\fIversion\fP\fB_\fP\fIarkitektur\fP\fB.\fP\fIpakettyp\fP och anges av
+control\-filen i paketet. \fIVersion\fP\-delen av filnamnet bestr av
+uppstrmsversionsinformation och kan eventuellt fljas av ett bindestreck
+och revisionsinformationen. \fIPakettyp\fP\-delen kommer frn fltet
+\fIpackage\-type\fP om det finns, annars \fBdeb\fP.
+.
+.SH FLAGGOR
+.TP 
+\fB\-a\fP, \fB\-\-no\-architecture\fP
+Destinationsfilnamnet kommer inte att innehlla information om arkitektur.
+.TP 
+\fB\-k\fP, \fB\-\-symlink\fP
+Skapa en symbolisk lnk istllet fr att flytta.
+.TP 
+\fB\-o\fP, \fB\-\-overwrite\fP
+Befintliga filer kommer att skrivas ver om de har samma namn som
+destinationsfilnamnet.
+.TP 
+\fB\-s\fP, \fB\-\-subdir\fP [\fIkatalog\fP]
+Filerna kommer att flyttas till en underkatalog. Om katalogen i argumentet
+existerar kommer filerna att flyttas in i den katalogen, om inte kommer
+namnet p mlkatalogen att hmtas frn sektionsfltet i styrdelen av
+paketet. Mlkatalogen kommer vara
+"unstable/binary\-\fIarkitekur\fP\fIsektion\fP". Om sektionen inte hittas i
+styrfilen antas "no\-section", och i s fall, samt fr sektionerna "non\-free"
+och "contrib", r mlkatalogen
+"\fIsektion\fP/binary\-\fIarkitektur\fP". Sektionsfltet r inte ndvndigt, s
+flera paket hamnar i katalogen "no\-section". Anvnd den hr flaggan med
+tillfrsikt, den kan vara rrig.
+.TP 
+\fB\-c\fP, \fB\-\-create\-dir\fP
+Flaggan kan anvndas tillsammans med \-s\-flaggan. Om en mlkatalog inte
+existerar kommer den att skapas automatiskt. \fBAnvnd denna flagga
+frsiktigt.\fP
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-v\fP, \fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH EXEMPEL
+.TP 
+\fBdpkg\-name bar\-foo.deb\fP
+Filen "bar\-foo.deb" kommer att f det nya namnet bar\-foo_1.0\-2_i386.deb
+eller ngot liknande (beroende p vilken information som hittas i styrdelen
+av "bar\-foo.deb").
+.TP 
+\fBfind /root/debian/ \-name \(aq*.deb\(aq | xargs \-n 1 dpkg\-name \-a\fP
+Alla filer med ndelsen "deb" i katalogen /root/debian och dess
+underkataloger kommer att f sina namn ersatta med dpkg\-name, om s behvs,
+till namn utan arkitekturinformation.
+.TP 
+\fBfind \-name \(aq*.deb\(aq | xargs \-n 1 dpkg\-name \-a \-o \-s \-c\fP
+\fBGr inte s hr.\fP Ditt arkiv kommer att rras till helt och hllet
+eftersom mnga paket inte har ngon sektionsinformation. \fBGr inte s hr.\fP
+.TP 
+\fBdpkg \-\-build debian\-tmp && dpkg\-name \-o \-s .. debian\-tmp.deb\fP
+Kan anvndas nr nya paket byggs.
+.
+.SH PROGRAMFEL
+Vissa paket fljer inte namnstrukturen
+\fIpaket\fP\fB_\fP\fIversion\fP\fB_\fP\fIarkitektur\fP\fB.deb\fP. Paket vars namn ndrats med
+dpkg\-name kommer flja denna struktur. Normalt pverkar detta inte hur
+\fBdselect\fP(1)/\fBdpkg\fP(1) installerar paket, men vissa andra
+installationsverktyg kan vara beroende av denna namngivningsstruktur.
+.
+.SH "SE VEN"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\fP(1), \fBdpkg\-deb\fP(1), \fBfind\fP(1),
+\fBxargs\fP(1).
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  1995, 1996 Erick Branderhorst
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-parsechangelog.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-parsechangelog.1
--- dpkg/man/sv/dpkg-parsechangelog.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-parsechangelog.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,127 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-parsechangelog 1 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-parsechangelog \- tolka Debians ndringsloggar
+.
+.SH SYNOPS
+\fBdpkg\-parsechangelog\fP [\fIflagga\fP...]
+.
+.SH BESKRIVNING
+\fBdpkg\-parsechangelog\fP lser och tolkar ndringsloggen i ett uppackat
+Debiankllkodstrd och visar informationen i den p standard ut i en
+maskinlsbar form.
+.
+.SH FLAGGOR
+.TP 
+\fB\-l\fP\fIndringsloggfil\fP
+Anger ndringsloggfilen som information skall lsas frn. Standardvrdet r
+\fBdebian/changelog\fP.
+.TP 
+\fB\-F\fP\fIndringsloggformat\fP
+Anger format p ndringsloggen. Som standard lses formatet frn en speciell
+rad nra slutet av ndringsloggen, eller s anvnds Debians standardformat
+om ingen information hittas.
+.TP 
+\fB\-L\fP\fIbibliotekskatalog\fP
+Ange en ytterligare katalog att ska i efter parserskript. Katalogen sks
+genom innan standardkatalogerna, vilka fr nrvarande r
+\fB/usr/local/lib/dpkg/parsechangelog\fP och \fB/usr/lib/dpkg/parsechangelog\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.SS Parserflaggor
+Fljande flaggor kan anvndas fr att styra utdata frn ndringsloggparsern,
+t.ex. omfnget av poster eller formatet p utdata. De mste stdas av
+parserskriptet i frga. Se ven \fBVARNINGAR\fP.
+.TP 
+\fB\-\-format\fP \fIutdataformat\fP
+Vlj utdataformat. Stdda format r fr nrvarande \fIdpkg\fP och
+\fIrfc822\fP. \fIdpkg\fP r det klassiska utdataformatet (frn innan denna flagga
+var tillgnglig) och frvalet. Det bestr av ett stycke i Debians
+control\-format (se \fBdeb\-control\fP(5)). Om mer n en post nskas tas de
+flesta flt frn den senaste posten, frutom om annat anges:
+.RS
+.TP 
+\fBSource:\fP \fIpaketnamn\fP
+.TP 
+\fBVersion:\fP \fIversions\fP
+.TP 
+\fBDistribution:\fP \fImlutgva\fP
+.TP 
+\fBUrgency:\fP \fIbrdska\fP
+Hgsta brdskan av alla de inkluderade posterna anvnds.
+.TP 
+\fBMaintainer:\fP \fIfrfattare\fP
+.TP 
+\fBDate:\fP \fIdatum\fP
+.TP 
+\fBCloses:\fP \fInummer\-p\-felrapport\fP
+Closes\-fltet i alla inkluderade poster sls samman.
+.TP 
+\fBChanges:\fP \fIposterfrn\-ndringsloggen\fP
+Texten i alla ndringsloggposter sls samman. Fr att gra fltet till
+giltigt flerradsflt i Debian\-control\-format erstts tomma rader med en
+ensam punkt och alla rader fr ett teckens indrag. Exakt innehll beror p
+formatet p ndringsloggen.
+.RE
+.IP
+Ytterligare anvndardefinierade flt kan finnas.
+.IP
+\fBrfc822\fP\-formatet anvnder samma flt, men ger ett separat stycke fr varje
+ndringsloggspost s att all metadata fr varje post behlls.
+.TP 
+\fB\-\-since\fP \fIversion\fP, \fB\-s\fP\fIversion\fP,\fB \-v\fP\fIversion\fP
+ta med alla poster efter \fIversion\fP.
+.TP 
+\fB\-\-until\fP \fIversion\fP, \fB\-u\fP\fIversion\fP
+ta med alla ndringar fre \fIversion\fP.
+.TP 
+\fB\-\-from\fP \fIversion\fP, \fB\-f\fP\fIversion\fP
+ta med alla ndringar frn och med \fIversion\fP.
+.TP 
+\fB\-\-to\fP \fIversion\fP, \fB\-t\fP\fIversion\fP
+ta med alla ndringar till och med \fIversion\fP.
+.TP 
+\fB\-\-count\fP \fIantal\fP, \fB\-c\fP\fIantal\fP, \fB\-n\fP\fIantal\fP
+ta med \fIantal\fP ndringar frn brjan (eller slutet om \fIantal\fP r lgre n
+0).
+.TP 
+\fB\-\-offset\fP \fIantal\fP, \fB\-o\fP\fIantal\fP
+ndra startpunkt fr \-\-count, rknat frn brjan (eller slutet om \fIantal\fP
+r lgre n 0).
+.TP 
+\fB\-\-all\fP
+ta med alla ndringar. Observera: vriga flaggor har ingen effekt nr denna
+anvnds.
+.
+.SH VARNINGAR
+De olika \fBparserflaggorna\fP, bortsett \-v, stds enbart i \fBdpkg\fP version
+1.14.16 och senare. Tredjepartsparsrar fr andra ndringsloggformat n
+\fIdebian\fP kanske inte stder alla flaggor.
+.
+.SH FILER
+.TP 
+\fBdebian/changelog\fP
+ndringsloggsfilen, anvnds fr att hmta versionsberoende information om
+kllkodspaketet, till exempel brdska och utgva fr en insndning,
+ndringarna som utfrts sedan en specifik version och sjlva versionsnumret
+p kllkoden.
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  1995\-1996 Ian Jackson
+.br
+Upphovsrttsskyddat  2000 Wichert Akkerman
+.br
+Upphovsrttsskyddat  2007, 2008 Frank Lichtenheld
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-query.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-query.1
--- dpkg/man/sv/dpkg-query.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-query.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,219 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-query 1 2011\-08\-14 Debianprojektet Dpkg\-sviten
+.SH NAMN
+dpkg\-query \- ett verktyg fr att frga dpkg\-databasen
+.
+.SH SYNOPS
+\fBdpkg\-query\fP [\fIflaggor\fP...] \fItgrd\fP
+.
+.SH BESKRIVNING
+\fBdpkg\-query\fP r ett verktyg fr att visa information om paket i
+\fBdpkg\fP\-databasen.
+.
+.SH KOMMANDON
+.TP 
+\fB\-l\fP, \fB\-\-list\fP [\fIpaketnamnsmnster\fP ...]
+Lista paket som matchar det givna mnstret. Om inget \fIpaketnamnsmnster\fP
+anges listas alla paket i \fI/var/lib/dpkg/status\fP, frutom de paket som
+markerats som ej installerade (dvs. de som tidigare har helt tagits
+bort). Skalets normala jokertecken tillts i \fIpaketnamnsmnster\fP. Observera
+att du sannolikt mste skriva \fIpaketnamnsmnster\fP inom citationstecken fr
+att frhindra att skalet expanderar filnamnet. Till exempel kommer fljande
+lista alla paket vars namn brjar p "libc6":
+
+.nf
+  \fBdpkg\-query \-l \(aqlibc6*\(aq\fP
+.fi
+
+De frsta tre kolumnerna i utdata visar nskad tgrd, paketstatus och fel,
+i den ordningen.
+
+nskad tgrd
+.nf
+  u = Oknd
+  i = Installera
+  h = Hll
+  r = Ta bort
+  p = Rensa
+.fi
+
+Paketstatus:
+.nf
+  n = Ej installerat
+  c = Konfigurationsfiler
+  H = Halvinstallerat
+  U = Uppackat
+  F = Halvkonfigurerat
+  W = Utlsare vntad
+  t = Utlsare frestende
+  i = Installerad
+.fi
+
+Felflaggor:
+.nf
+  <tom> = (ingen)
+  R = Ominstallation krvs
+.fi
+
+En versal status\- eller felbokstav anger att paketet troligen kommer orsaka
+allvarliga problem. Se \fBdpkg\fP(1) fr information om status och flaggor
+ovan.
+
+Utdataformatet fr den hr flaggan kan inte justeras, men varieras
+automatiskt fr att passa terminalbredden. Det r avsett fr mnskliga
+lsare, och r inte enkelt maskinlsbart. Se \fB\-W\fP (\fB\-\-show\fP) och
+\fB\-\-showformat\fP fr hur du konfigurerar utdataformatet.
+.TP 
+\fB\-W\fP, \fB\-\-show\fP [\fIpaketnamnsmnster\fP ...]
+Precis som flaggan \fB\-\-list\fP kommer att paket som matchar det givna mnstret
+att visas. Utdatat kan dock skrddarsys med flaggan
+\fB\-\-showformat\fP. Standardutdataformatet r en rad per paket som trffas, dr
+varje rad innehller namn och installerad version av paketet, avdelat med
+ett tabulatortecken.
+.TP 
+\fB\-s\fP, \fB\-\-status\fP \fIpaketnamn\fP ...
+Rapportera status om det angivna paketet.  Detta alternativ visar helt
+enkelt posten i statusdatabasen fr installerade paket. Om flera
+\fIpaketnamn\fP anges avdelas de efterfrgade statusposterna med en tomrad.
+.TP 
+\fB\-L\fP, \fB\-\-listfiles\fP \fIpaketnamn\fP ...
+Listar filer som installerats p ditt system frn \fIpaketnamn\fP. Om flera
+\fIpaketnamn\fP anges avdelas den efterfrgade fillistan med en
+tomrad. Observera att filer som skapats av paketspecifika
+installationsskript inte visas
+.TP 
+\fB\-c\fP, \fB\-\-control\-path\fP \fIpaketnamn\fP [\fIcontrol\-filnamn\fP]
+Visar skvgarna till control\-filerna som installerats p ditt system fr
+\fIpaketnamn\fP. Om \fIcontrol\-fil\fP anges visas endast skvgen fr den
+control\-filen, om den finns. \fBVarning\fP: kommandot r halvppet, det br
+anvndas endast som en sista desperat tgrd om det inte finns ngot annat
+grnssnitt. Det kan avrdas frn senare om bttre grnssnitt eller de
+nuvarande arkitektoniska begrnsningarna har lsts.
+.TP 
+\fB\-S\fP, \fB\-\-search\fP \fIfilnamnsskmnster\fP ...
+Sk efter paket som ger filer som motsvarar det angivna mnstret. Alla
+skalets vanliga jokertecken kan anvndas i mnstret. Kommandot kommer inte
+att visa extrafiler som skapas av paketskript, ej heller kommer det att visa
+alternativ.
+.TP 
+\fB\-p\fP, \fB\-\-print\-avail\fP \fIpaketnamn\fP
+Visar information om \fIpaketnamn\fP, enligt vad som finns i
+\fI/var/lib/dpkg/available\fP. Om flera \fIpaketnamn\fP anges avdelas de
+efterfrgade posterna ur \fIavailable\fP\-filen med en tomrad.
+
+Anvnder du ett APT\-baserat skal br du istllet anvnda \fBapt\-cache show\fP
+\fIpaketnamn\fP, d \fIavailable\fP\-filen endast jourfrs om \fBdselect\fP anvnds.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH FLAGGOR
+.TP 
+\fB\-\-admindir=\fP\fIkat\fP
+ndra platsen fr \fBdpkg\fP\-databasen. Frval r \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-f\fP, \fB\-\-showformat=\fP\fIformat\fP
+Flaggan anvnds fr att ange formatet p utdata som skapas av
+\fB\-\-show\fP. Formatet r en strng som matas ut fr varje paket i listan.
+
+I formatstrngen inleds fljande styrsekvenser med \(lq\fB\e\fP\(rq:
+
+.nf
+    \fB\en\fP  radmatning
+    \fB\er\fP  vagnretur
+    \fB\et\fP  tabulator
+.fi
+
+\(lq\fB\e\fP\(rq fre ett annat tecken undertrycken en speciell betydelse fr
+det efterfljande tecknet, vilket r kan anvndas fr \(lq\fB\e\fP\(rq och
+\(lq\fB$\fP\(rq.
+
+Paketinformation kan lggas in genom att stta in variabelreferenser till
+paketflt, p syntaxen \(lq\fB${\fP\fIfield\fP[\fB;\fP\fIwidth\fP]\fB}\fP\(rq. Flt skrivs
+hgerjusterade svida inte bredden r negativ i vilket fall vnsterjustering
+kommer att anvndas. Fljande \fIflt\fP stds, men de r inte ndvndigtvis
+tillgngliga i statusfilen (endast interna flt och flt som finns i
+binrpaketet hamnar dr):
+
+.nf
+    \fBArchitecture\fP
+    \fBBugs\fP
+    \fBConffiles\fP (internt)
+    \fBConfig\-Version\fP (internt)
+    \fBConflicts\fP
+    \fBBreaks\fP
+    \fBDepends\fP
+    \fBDescription\fP
+    \fBEnhances\fP
+    \fBEssential\fP
+    \fBFilename\fP (internt, skalrelaterat)
+    \fBHomepage\fP
+    \fBInstalled\-Size\fP
+    \fBMD5sum\fP (internt, skalrelaterat)
+    \fBMSDOS\-Filename\fP (internt, skalrelaterat)
+    \fBMaintainer\fP
+    \fBOrigin\fP
+    \fBPackage\fP
+    \fBPre\-Depends\fP
+    \fBPriority\fP
+    \fBProvides\fP
+    \fBRecommends\fP
+    \fBReplaces\fP
+    \fBRevision\fP (frldrat)
+    \fBSection\fP
+    \fBSize\fP  (internt, skalrelaterat)
+    \fBSource\fP
+    \fBStatus\fP (internt)
+    \fBSuggests\fP
+    \fBTag\fP (normalt inte i .deb, utan i arkivets Packages\-filer)
+    \fBTriggers\-Awaited\fP (internt)    \fBTriggers\-Pending\fP (internt)    \fBVersion\fP
+.fi
+
+Standardformatet r \(lq\fB${Package}\et${Version}\en\fP\(rq. Alla andra flt
+som finns i statusfilen (ven anvndardefinierade flt) kan ocks hmtas. De
+visas dock som de r, ingen konvertering eller felkorrigering grs p
+dem. Fr att hmta namnet p paketansvarig och installerad version av dpkg
+och kan du kra:
+
+.nf
+  \fBdpkg\-query \-W \-f=\(aq${Package} ${Version}\et${Maintainer}\en\(aq dpkg\fP
+.fi
+.
+.SH RETURVRDE
+.TP 
+\fB0\fP
+Den nskade frgan utfrdes utan fel.
+.TP 
+\fB1\fP
+Problem uppstod vid tolkning av kommandoraden eller nr frgan skulle
+utfras, till exempel att ingen fil eller paket hittades (frutom fr
+\-\-control\-path).
+.
+.SH MILJVARIABLER
+.TP 
+\fBDPKG_ADMINDIR\fP
+Om satt, och flaggan \fB\-\-admindir\fP inte har angivits, anvnds vrdet som
+datakatalog fr dpkg.
+.TP 
+\fBCOLUMNS\fP
+Instllningen pverkar utdata frn kommandot \fB\-\-list\fP genom att ndra
+bredden p dess utdata.
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  2001 Wichert Akkerman
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.
+.SH "SE VEN"
+\fBdpkg\fP(1).
+
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-scanpackages.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-scanpackages.1
--- dpkg/man/sv/dpkg-scanpackages.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-scanpackages.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,98 @@
+.\" Copyright © 1996 Michael Shields <shields@crosslink.net>
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-scanpackages 1 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-scanpackages \- skapar indexfilerna Packages
+.
+.SH SYNOPS
+\fBdpkg\-scanpackages\fP [\fIflagga\fP...] \fIbinrkatalog\fP [\fIverstyrningsfil\fP
+[\fIskvgsprefix\fP]] \fB>\fP \fIPackages\fP
+.
+.SH BESKRIVNING
+\fBdpkg\-scanpackages\fP gr genom ett trd av Debianbinrpaket och skapar en
+Packages\-fil, som \fBapt\fP(8), \fBdselect\fP(8) osv. anvnder fr att bertta fr
+anvndaren vilka paket som kan installeras. Dessa Packages\-filer r desamma
+som de som finns p Debianarkivspeglar och cd\-rom:ar. Du kan anvnda
+\fBdpkg\-scanpackages\fP sjlv fr att skapa en katalog med lokala paket att
+installera p en klase maskiner.
+.PP
+\fBObservera:\fP Om du vill lsa den skapade Packages\-filen med \fBapt\fP mste du
+antagligen komprimera filen med \fBbzip2\fP(1) (vilket skapar filen
+Packages.bz2) eller \fBgzip\fP(1) (vilket skapar filen Packages.gz). apt
+ignorerar okomprimerade Packages\-filer, frutom vid lokal tkomst
+(dvs. \fBfile://\fP\-kllor).
+.PP
+\fIbinrkatalog\fP r namnet p trdet med binrpaketen som skall hanteras
+(till exempel \fBcontrib/binary\-i386\fP). Det r bst att skapa den relativt
+till roten p Debianarkivet eftersom all filnamnsflt i den skapade
+Packages\-filen kommer inledas med strngen.
+.PP
+\fIverstyrningsfil\fP r namnet p en fil som skall lsas in och som
+innehller information om hur paketet passar in i distributionen (kan vara
+en komprimerad fil); se \fBdeb\-override\fP(5).
+.PP
+\fIskvgsprefix\fP r en frivillig strng som lggs till i brjan i
+filnamnsfltet.
+.PP
+Om mer n en version av ett paket upptcks kommer endast den senaste att tas
+med i utdata. Om de har samma version och bara skiljer i arkitektur kommer
+bara den frsta som hittas att anvndas.
+.
+.SH FLAGGOR
+.TP 
+\fB\-t\fP, \fB\-\-test\fP \fItyp\fP
+Sk efter *.\fItyp\fP\-paket, i stllet fr *.deb.
+.TP 
+\fB\-u\fP, \fB\-\-udeb\fP
+\fBFrldrat\fP alias till \fB\-tudeb\fP.
+.TP 
+\fB\-e\fP, \fB\-\-extra\-override\fP \fIfil\fP
+Ls \fIfil\fP fr att hitta ytterligare verstyrningar (filen kan vara
+komprimerad). Se \fBdeb\-extra\-override\fP(5) fr mer information om dess
+format.
+.TP 
+\fB\-a\fP, \fB\-\-arch\fP \fIarkitektur\fP
+Anvnd ett mnster som bestr av \fI*_all.deb\fP och \fI*_arkitektur.deb\fP
+istllet fr att ska efter alla deb\-arkiv.
+.TP 
+\fB\-m\fP, \fB\-\-multiversion\fP
+Ta med alla paket som hittas i utdata.
+.TP 
+\fB\-M\fP, \fB\-\-medium\fP \fIidstrng\fP
+Lgg till ett X\-Medium\-flt som innehller vrdet \fIidstrng\fP. Fltet r
+ndvndigt om du vill generera \fBPackages.cd\fP\-filer som kan anvndas med
+dselect:s multicd\-tkomstmetod.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH DIAGNOSTIK
+\fBdpkg\-scanpackages\fP skriver ut de vanliga sjlvfrklarande felen. Det
+varnar ven om paket ligger i fel katalog har dubbletter, har ett
+Filename\-flt i sin control\-fil, saknas frn verstyrningsfilen, eller har
+substitueringar utan effekt skrivna av paketansvariga.
+.
+.SH "SE VEN"
+\fBdpkg\fP(1), \fBdselect\fP(1), \fBdeb\-override\fP(5), \fBdeb\-extra\-override\fP(5),
+\fBdpkg\-scansources\fP(1).
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-scansources.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-scansources.1
--- dpkg/man/sv/dpkg-scansources.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-scansources.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,73 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-scansources 1 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-scansources \- skapar indexfilerna Sources
+.
+.SH SYNOPS
+\fBdpkg\-scansources\fP [\fIflagga\fP...] \fIbinrkatalog\fP [\fIverstyrningsfil\fP
+[\fIskvgsprefix\fP]] \fB>\fP \fISources\fP
+.
+.SH BESKRIVNING
+\fBdpkg\-scansources\fP sker genom den givna \fIbinrkatalogen\fP efter
+\&\fI.dsc\fP\-filer. De anvnds fr att skapa ett Debiankllkodsindex, vilket
+skrivs p standard ut.
+.PP
+\fIverstyrningsfil\fPen, om den anges, anvnds fr att stlla in prioriteter i
+de skapade indexposterna, samt fr att erstta flt de paketansvariga ger i
+\&\fI.dsc\fP\-filerna. Filen kan vara komprimerad. Se \fBdeb\-override\fP(5) fr en
+beskrivning av formatet fr denna fil. \s-1Obs!\s0 Eftersom
+verstyrningsfilen indexerar per binrpaket, inte kllkodspaket, uppstr det
+ett problem hr. Nuvarande implementation anvnder den hgsta prioriteten av
+samtliga binrpaket som skapas av en \fI.dsc\fP\-fil som prioritet fr
+kllkodspaketet, och verstyrningsposten fr det frsta binrpaket som
+listas i \fI.dsc\fP\-filen fr att erstta information frn
+paketansvariga. Detta kan komma att ndras.
+.PP
+\fIskvgsprefix\fP lggs, om den anges, till i brjan av katalogfltet i det
+skapade kllkodsindexet. Du anvnder det normalt till att gra s att
+katalogflten innehller skvgen frn toppen av Debianarkivhierarkin.
+.
+.PP
+\fBObservera:\fP Om du vill lsa den skapade Sources\-filen med \fBapt\fP(8) mste
+du antagligen komprimera filen med \fBgzip\fP(1) (vilket skapar filen
+Sources.gz). apt ignorerar okomprimerade Sources\-filer, frutom vid lokal
+tkomst (dvs. \fBfile://\fP\-kllor).
+.
+.SH FLAGGOR
+.IP "\fB\-n\fP, \fB\-\-no\-sort\fP" 4
+Sortera inte indexposterna. De sorteras normalt efter namn p
+kllkodspaketet.
+.TP 
+.IP "\fB\-e\fP, \fB\-\-extra\-override\fP \fIfil\fP" 4
+Ls \fIfil\fP fr att hitta ytterligare verstyrningar (filen kan vara
+komprimerad). Se \fBdeb\-extra\-override\fP(5) fr mer information om dess
+format.
+.IP "\fB\-s\fP, \fB\-\-source\-override\fP \fIfil\fP" 4
+Anvnd \fIfil\fP som verstyrningsfil fr kllkoden (filen kan vara
+komprimerad). Standardnamnet r namnet p den verstyrningsfil du angav, med
+tillgget \fI.src\fP.
+.sp
+Kllkodsverstyrningsfilen har ett annat format n
+binrverstyrningsfilen. Den innehller endast tv flt avdelade med
+blanktecken, dr det frsta r namnet p kllkodspaketet och det andra r
+sektionen. Tomma rader och kommentarer ignoreras p vanligt stt. Om ett
+paket specificeras i bda filerna kommer kllkodsverstyrningsfilen frst
+fr att vlja sektion.
+.IP \fB\-\-debug\fP 4
+Sl p felskning.
+.IP \fB\-\-help\fP 4
+Visar hjlpskrm och avslutar.
+.IP \fB\-\-version\fP 4
+Visar version och avslutar.
+.
+.SH "SE VEN"
+\fBdeb\-override\fP(5), \fBdeb\-extra\-override\fP(5), \fBdpkg\-scanpackages\fP(1).
+.
+.SH FRFATTARE
+Roderick Schertler <roderick@argon.org>
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-shlibdeps.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-shlibdeps.1
--- dpkg/man/sv/dpkg-shlibdeps.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-shlibdeps.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,284 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-shlibdeps 1 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-shlibdeps \- skapar substvar\-beroenden fr delade bibliotek
+.
+.SH SYNOPS
+\fBdpkg\-shlibdeps\fP [\fIflagga\fP...] [\fB\-e\fP]\fIprogramfil\fP [\fIflagga\fP...]
+.
+.SH BESKRIVNING
+\fBdpkg\-shlibdeps\fP berknar beroenden mellan exekverbara filer som anges som
+argument och delade bibliotek. Beroendena lggs till i
+substitueringsvariabelfilen \fBdebian/substvars\fP som variabler med namnen
+\fBshlibs:\fP\fIberoendeflt\fP dr \fIberoendeeflt\fP r ett
+beroendefltsnamn. Alla andra variabler som brjar p \fIshlibs:\fP tas bort ur
+filen.
+.P
+\fBdpkg\-shlibdeps\fP kan generera beroendeinformation frn tv
+informationskllor, antingen filen \fIsymbols\fP eller filen \fIshlibs\fP. Fr
+varje binrfil som analyseras av \fBdpkg\-shlibdeps\fP tas en lista fram ver
+vilka bibliotek de r lnkade mot. Programmet slr sedan upp varje bibliotek
+i filen \fIsymbols\fP, eller i filen \fIshlibs\fP (om den frstnmnda inte
+existerar eller om debian/shlibs.local innehller ett relevant
+beroende). ). De bda filerna skall tillhandahllas av bibliotekspaketet och
+borde drfr vara tillgngliga som /var/lib/dpkg/info/\fIpaket\fP.\fIsymbols\fP
+eller /var/lib/dpkg/info/\fIpaket\fP.\fIshlibs\fP. Paketnamnet identifieras i tv
+steg: biblioteksfilen lokaliseras p systemet (genom att sl upp i de
+kataloger \fBld.so\fP skulle anvnt), och drefter anvnds \fBdpkg \-S\fP
+\fIbiblioteksfil\fP fr att sl upp vilket paket biblioteket kommer frn.
+.SS Symbolfiler
+Symbolfiler innehller mer finkornig beroendeinformation genom att ange det
+minsta beroendet fr varje symbol som exporteras av biblioteket. Skriptet
+frsker hitta de symboler som r associerade med ett bibliotek p fljande
+platser (den frsta trffen anvnds):
+.IP debian/*/DEBIAN/symbols
+Information om delade bibliotek som skapats av den aktuella byggproceduren
+som ocks anropade \fBdpkg\-shlibdeps\fP. De genereras av
+\fBdpkg\-gensymbols\fP(1). De anvnds endast om biblioteket finns i paketets
+byggrd. Filen symbols i det byggtrdet gr fre symbols\-filer frn andra
+binrpaket.
+.IP /etc/dpkg/symbols/\fIpackage\fP.symbols.\fIarkitektur\fP
+.IP /etc/dpkg/symbols/\fIpaket\fP.symbols
+verstyrningsfil fr beroendeinformation fr delade bibliotek, per
+system. \fIarkitektur\fP r det aktuella systemets arkitektur (hmtas frn
+\fBdpkg\-architecture \-qDEB_HOST_ARCH\fP).
+.IP "Utdata frn \(rq\fBdpkg\-query \-\-control\-path\fP \fIpackage\fP symbols\(rq"
+Paketlokal verstyrande beroendeinformation fr delade bibliotek. Filerna
+befinner sig i /var/lib/dpkg om inte verstyrt med \-\-admindir.
+.P
+\fBdpkg\-shlibs\fP kommer ihg den (strsta) minimala version som behvs av
+varje bibliotek nr den sker genom de symboler som anvnds av alla
+binrfilerna. Nr proceduren r avslutad kan den visa det minsta beroende
+som behvs av alla bibliotek som anvnds (s tillvida informationen i
+\fIsymbols\fP\-filerna r korrekt).
+.P
+Som en skerhetstgrd kan en symbols\-fil innehlla metainformationsfltet
+\fIBuild\-Depends\-Package\fP, varp \fBdpkg\-shlibdeps\fP hmtar vilken minsta
+version som behvs fr paketet ur Build\-Depends\-fltet och anvnder denna
+version om den r hgre n den minsta version som berknats genom att ska
+genom symbolerna.
+.SS Shlibs\-filer
+Shlibs\-filer associerar ett bibliotek direkt till ett beroende (utan att se
+p symbolerna). Det r drfr oftare starkare n vad som egentligen behvs,
+men mycket skert och enkelt att hantera.
+.P
+Beroenden fr ett bibliotek sls upp p flera platser. Den frsta filen som
+innehller information om det intressanta biblioteket anvnds:
+.IP debian/shlibs.local
+Paketlokal verstyrande beroendeinformation fr delade bibliotek.
+.IP /etc/dpkg/shlibs.override
+Systemspecifik verstyrande beroendeinformation fr delade bibliotek.
+.IP debian/*/DEBIAN/shlibs
+Information om delade bibliotek som skapats av den aktuella byggproceduren
+som ocks anropade \fBdpkg\-shlibdeps\fP. De genereras av
+\fBdpkg\-gensymbols\fP(1). De anvnds bara om biblioteket finns i paketets
+byggtrd. Filen shlibs i byggtrdet gr fre shlibs\-filer frn andra paket.
+.IP "Utdata frn \(rq\fBdpkg\-query \-\-control\-path\fP \fIpackage\fP shlibs\(rq"
+Paketlokal verstyrande beroendeinformation fr delade bibliotek. Filerna
+befinner sig i /var/lib/dpkg om inte verstyrt med \-\-admindir.
+.IP /etc/dpkg/shlibs.default
+Systemspecifik standardberoendeinformation fr delade bibliotek.
+.P
+De utkade beroendena anvnds sedan direkt (frutom om de filtrerats bort
+fr att de identifierats som dubbletter, eller svagare n ett annat
+beroende).
+.SH FLAGGOR
+\fBdpkg\-shlibdeps\fP tolkar argument som inte r flaggor som namn p krbara
+filer, precis som om de angivits som \fB\-e\fP\fIprogramfil\fP.
+.TP 
+\fB\-e\fP\fIprogramfil\fP
+Ta med beroenden som r passar fr delade bibliotek som krvs fr
+\fIprogramfil\fP.
+.TP 
+\fB\-d\fP\fIberoendeflt\fP
+Lgg till beroenden som skall lggas till till control\-filens beroendeflt
+\fIberoendeflt\fP. (Beroenden fr detta flt lggs in i variabeln
+\fBshlibs:\fP\fIberoendeflt\fP.)
+
+Flaggan \fB\-d\fP\fIberoendeflt\fP gller fr samtliga binrer efter flaggan, fram
+till nsta \fB\-d\fP\fIberoendeflt\fP. Standardvrdet fr \fIberoendeflt\fP r
+\fBDepends\fP.
+
+Om samma katalogpost (eller en uppsttning alternativ) frekommer i mer n
+ett av de knda beroendefltnamnen \fBPre\-Depends\fP, \fBDepends\fP,
+\fBRecommends\fP, \fBEnhances\fP eller \fBSuggests\fP s kommer \fBdpkg\-shlibdeps\fP att
+automatiskt ta bort beroendet frn samtliga flt frutom det som anger de
+viktigaste beroendena.
+.TP 
+\fB\-p\fP\fIvariabelnamnsprefix\fP
+Inled substitueringsvariabler med \fIvariabelnamnsprefix\fP\fB:\fP i stllet fr
+\fBshlibs:\fP. P samma stt kommer befintliga substitueringsvariabler som
+inleds med \fIvariabelnamnsprefix\fP\fB:\fP (i stllet fr \fBshlibs:\fP) att tas
+bort frn substitueringsvariabelfilen.
+.TP 
+\fB\-O\fP
+Skriv substitueringsvariabelinstllningar p standard ut, i stllet fr att
+frska lgga till dem i substitueringsvariabelfilen (som standard
+\fBdebian/substvars\fP).
+.TP 
+\fB\-t\fP\fItyp\fP
+Fredra information om delade bibliotek som mrkts fr den givna
+pakettypen. Om det inte finns ngon mrkt information anvnds
+omrkt. Standardpakettypen r "deb". Beroendeinformation fr delade
+bibliotek mrks fr en given typ genom att inleda det med namnet p typen,
+ett kolon, samt blanktecken.
+.TP 
+\fB\-L\fP\fIlokal\-shlibs\-fil\fP
+Ls verstyrande beroendeinformation om delade bibliotek frn
+\fIlokal\-shlibs\-fil\fP i stllet fr \fBdebian/shlibs.local\fP.
+.TP 
+\fB\-T\fP\fIsubstvars\-fil\fP
+Skriv substitueringsvariabler i \fIsubstvars\-fil\fP; standard r
+\fBdebian/substvars\fP.
+.TP 
+\fB\-V\fP
+Aktiverar pratsamt lge. Flera meddelanden visas fr att frklara vad
+\fBdpkg\-shlibs\fP hller p med.
+.TP 
+\fB\-x\fP\fIpaket\fP
+Uteslut paketet frn de genererade beroendena. Flaggan r anvndbar fr att
+undvika sjlvberoenden fr paket som innehller ELF\-binrer (exekverbara
+eller biblioteksinsticksprogram) som anvnder ett bibliotek som ligger i
+samma paket. Flaggan kan anvndas flera gnger fr att utesluta flera paket.
+.TP 
+\fB\-S\fP\fIpaketbyggkatalog\fP
+Se frst i \fIpaketbyggkatalog\fP vid frsk att hitta ett
+bibliotek. Anvndbart nr kllkodspaketet bygger flera varianter av samma
+bibliotek och du vill se till att du fr beroendet frn ett givet
+binrpaket. Flaggan kan inte anvndas flera gnger: kataloger sks efter i
+samma ordning fre kataloger frn andra binrpaket.
+.TP 
+\fB\-\-ignore\-missing\-info\fP
+Misslyckas inte om det inte upptcks ngon beroendeinformation fr ett delat
+bibliotek. Alla bibliotek br tillhandahlla beroendeinformation (antingen
+med shlibs\-filer eller med symbols\-filer), ven om de nnu inte anvnds av
+andra paket.
+.TP 
+\fB\-\-warnings=\fP\fIvrde\fP
+\fIVrde\fP r ett bitflt som anger de varningar som kan ges av
+\fBdpkg\-shlibdeps\fP. Bit 0 (vrde=1) aktiverar varningen "symbolen \fIsym\fP, som
+anvnds av \fIbinr\fP, hittades inte i ngot av biblioteken", bit 1 (vrde=2)
+aktiverar varningen "beroendet p \fIbibliotekt\fP kunde undvikas" och bit 2
+(vrde=4) aktiverar varningen "\fIbinr\fP borde inte vara lnkat mot
+\fIbibliotek\fP". Standard fr \fIvrde\fP r 3: de frsta tv varningarna r
+aktiva som standard, men inte den sista. Stt \fIvrde\fP till 7 om du vill att
+alla varningar skall vara aktiva.
+.TP 
+\fB\-\-admindir=\fP\fIkat\fP
+ndra platsen fr \fBdpkg\fP\-databasen. Frval r \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH VARNINGAR
+Eftersom \fBdpkg\-shlibdeps\fP analyserar mngden symboler som anvnds av varje
+binrfil i det genererade paketet, kan det i flera fall skriva ut
+varningsmeddelanden. De visar p saker som kan frbttras i paketet. I de
+flesta fall gller frbttringarna direkt uppstrmskllkoden. Hr r de
+varningar du kan stta p, i fallande allvarlighetsgrad:
+.TP 
+\fBsymbolen\fP \fIsym\fP\fB, som anvnds av\fP \fIbinr\fP\fB, hittades inte i ngot av biblioteken.\fP
+Den omnmnda symbolen hittades inte i biblioteken som lnkas mot
+binren. \fIBinr\fP r antagligen ett bibliotek och mste lnkas mot ett annat
+bibliotek under byggproceduren (lnkarflaggan \fB\-l\fP\fIbibliotek\fP).
+.TP 
+\fIbinr\fP \fBinnehller en referens till symbolen\fP \fIsym\fP \fBsom inte kan kopplas; det r troligen ett insticksprogram\fP
+Den angivna symbolen hittades inte i biblioteken som lnkats mot
+binren. \fIBinr\fP r antagligen ett insticksprogram och symbolen
+tillhandahlls av programmet som lser in det. I teorin har inte
+insticksprogram ngot SONAMN, men den hr binren har ett och drmed kunde
+det inte tydligt identifieras som insticksprogram. Det faktum att binren
+befinner sig i en icke\-offentlig katalog r dock en stark indikation p att
+det inte r ett vanligt delat bibliotek. Om binren faktiskt r ett
+insticksprogram kan du ignorera varningen. Det r dock alltid mjligt att
+det r ett riktigt bibliotek och att program som lnker det anvnder en
+RPATH s att den dynamiska lnkaren hittar det. Om s r fallet r
+biblioteket trasigt och behver fixas.
+.TP 
+\fBBeroendet p\fP \fIbibliotek\fP \fBkunde undvikas om inte\fP \fIbinrer\fP \fBmeningslst lnkades mot det (de anvnder inga av dess symboler).\fP
+Ingen av \fIbinrer\fPna som lnkas mot \fIbibliotek\fP anvnder ngon av
+symbolerna som tillhandahlls av biblioteket. Genom att rtta alla binrer
+kan du undvika beroendet som gller detta bibliotek (svida inte samma
+beroende ven genereras av ett annat bibliotek som faktiskt anvnds).
+.TP 
+\fIbinr\fP \fBborde inte vara lnkat mot\fP \fIbibliotek\fP \fB(inga av symbolerna anvnds).\fP
+\fIBinr\fP lnkar mot ett bibliotek den inte behver. Det r inte ett problem,
+Men genom att inte lnka biblioteket mot binren kan man uppn en mindre
+prestandafrbttring. Varningen kontrollerar samma information som den
+fregende, men gr det fr varje binr istllet fr att utfra kontrollen
+globalt p alla analyserade binrer.
+.SH FELMEDDELANDEN
+\fBdpkg\-shlibdeps\fP kommer att misslyckas om det inte hittar ett ppet
+bibliotek som en av binrerna anvnder, eller om biblioteket saknar
+associerad beroendeinformation (antingen en shlibs\-fil eller en
+symbols\-fil). Ett ppet bibliotek har ett SONAMN och r versionshanterad
+(libvadsomhelst.so.\fIX\fP). Ett privat bibliotek (till exempel ett
+insticksprogram) br inte ha ngot SONAMN och behver inte vara
+versionshanterat.
+.TP 
+\fBhittade inte biblioteket\fP \fIbibliotek\-sonamn\fP \fBsom behvs fr\fP \fIbinr\fP \fB(dess RPATH r "\fP\fIrpath\fP\fB")\fP
+\fIBinr\fP anvnder ett bibliotek som heter \fIbibliotek\-sonamn\fP, men
+\fBdpkg\-shlibdeps\fP kunde inte hitta biblioteket. \fBdpkg\-shlibdeps\fP skapar en
+lista ver kataloger det ser i p fljande stt: katalogerna som beskrivs i
+RPATH i binren, kataloger som beskrivs i /etc/ld.so.conf, kataloger i
+miljvariabeln LD_LIBRARY_PATH, och vanliga ppna kataloger (/lib, /usr/lib,
+/lib32, /usr/lib32, /lib64, /usr/lib64). Drefter ser det i motsvarande
+kataloger i byggtrdet fr paketet som innehller binren som analyseras, i
+paketbyggtrdet som anges med kommandoradsflaggan \-S, i andra pakets
+byggtrd som innehller en DEBIAN/shlibs\-fil och slutligen i
+rotkatalogen. Om biblioteket inte hittas i ngon av dessa kataloger fr du
+det hr felmeddelandet.
+
+Om biblioteket som inte hittades ligger i en privat katalog i samma paket
+br du lgga till katalogen i LD_LIBRARY_PATH. Om det finns i ett annat
+binrpaket som byggs br du se till att shlibs\- eller symbols\-filen fr
+paketet redan har skapats och att LD_LIBRARY_PATH innehller korrekt katalog
+som det ocks ligger i en privat katalog.
+.TP 
+\fBhittade ingen beroendeinformation fr\fP \fIbiblioteksfil\fP \fB(anvnd av\fP \fIbinr\fP\fB).\fP
+Biblioteket som behvs av \fIbinr\fP hittades i \fIbiblioteksfil\fP av
+\fBdpkg\-shlibdeps\fP, men \fBdpkg\-shlibdeps\fP kunde inte hitta ngon
+beroendeinformation fr biblioteket. Fr att hitta beroendet har det frskt
+koppla biblioteket mot ett Debianpaket med hjlp av \fBdpkg \-S\fP
+\fIbiblioteksfil\fP. Drefter sg det i motsvarande shlibs\- och symbols\-filer i
+/var/lib/dpkg/info/, samt i de olika paketens byggtrd (debian/*/DEBIAN/).
+
+Det hr felet kan orsakas av felaktiga eller saknade shlibs\- eller
+symbols\-filer i bibliotekets paket. Det kan ven intrffa om biblioteket
+byggts i samma kllkodspaket och om shlibs\-filen nnu inte har skapats (d
+mste du fixa debian/rules s att det skapar shlibs\-filen innan det anropar
+\fBdpkg\-shlibdeps\fP). Felaktig RPATH kan ocks leda till att biblioteket
+hittas under ett icke\-kanoniskt namn (till exempel:
+/usr/lib/openoffice.org/../lib/libssl.so.9.8 istllet fr
+/usr/lib/libssl.so.0.9.8) som inte associeras till ngot paket,
+\fBdpkg\-shlibdeps\fP frsker g runt detta genom att falla tillbaka p ett
+kanoniskt namn (med \fBrealpath\fP(3)), men det fungerar kanske inte
+alltid. Det r alltid bst att stda upp RPATH i binren fr att undvika
+problem.
+
+Om du anropar \fBdpkg\-shlibdeps\fP i pratsamt lge (\-v) kommer det ge mycket
+mer information om var det frskte hitta beroendeinformationen. Det kan
+vara anvndbart om du inte frstr varfr du fr felmeddelandet.
+.SH "SE VEN"
+\fBdeb\-shlibs\fP(5), \fBdeb\-symbols\fP(5), \fBdpkg\-gensymbols\fP(1).
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  1995\-1996 Ian Jackson
+.br
+Upphovsrttsskyddat  2000 Wichert Akkerman
+.br
+Upphovsrttsskyddat  2006 Frank Lichtenheld
+.br
+Upphovsrttsskyddat  2007\-2008 Raphal Hertzog
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-source.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-source.1
--- dpkg/man/sv/dpkg-source.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-source.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,669 @@
+.\" Authors: Ian Jackson, Raphaël Hertzog
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-source 1 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-source \- Verktyg fr att manipulera Debiankllkodspaket (.dsc)
+.
+.SH SYNOPS
+\fBdpkg\-source\fP [\fIflagga\fP...] \fItgrd\fP
+.
+.SH BESKRIVNING
+\fBdpkg\-source\fP packar och packar upp Debiankllkodsarkiv.
+
+Inga av dessa kommandon tillter att flera flaggor kombineras till ett, och
+de tillter inte att vrdet p en flagga anges som ett separat argument.
+.
+.SH KOMMANDON
+.TP 
+\fB\-x \fP\fIfilnamn\fP\fB.dsc \fP[\fIutdatakatalog\fP]
+Extrahera ett kllkodspaket. Ett argument som inte r en flagga mste anges,
+namnet p debiankllkodsstyrfilen (\fB.dsc\fP). Ett valfritt andra argument som
+inte r en flagga kan anges fr att bestmma vilken katalog kllkoden skall
+packas upp i, det fr inte existera. Om du inte anger ngon utdatakatalog
+extraheras kllkodspaketet till en katalog som heter \fIkllkod\fP\-\fIversion\fP i
+den aktuella arbetskatalogen.
+
+\fBdpkg\-source\fP lser namnen p de vriga filer som ingr i kllkodspaketet
+frn styrfilen; de antas vara i samma katalog som \fB.dsc\fP\-filen.
+
+Filerna i det extraherade paketet kommer att ha behrighet och gare satta
+till det som kunde frvntas om filerna och katalogerna bara hade skapats \-
+kataloger och krbara filer kommer ha 0777 och enkla filer 0666, bda
+modifierade av uppackarens umask; om frldrakatalogen r setgid kommer de
+extraherade katalogerna ocks att vara det, och samtliga filer och kataloger
+kommer rva dess gruppgarskap.
+
+Om kllkoden anvnder ett annat format n standardformatet (gller fr
+nrvarande alla format frutom "1.0"), kommer dess namn att lagras som
+\fBdebian/source/format\fP s att det anvnds som standard nr kllkodspaketet
+byggs p nytt.
+
+.TP 
+\fB\-b\fP \fIkatalog\fP [\fIformatspecifika\-flaggor\fP]
+Bygg ett kllkodpaket. Det frsta argumentet som inte r en flagga tas som
+namn p katalogen som innehller det debianiserade kllkodstrdet (dvs. med
+underkatalogen "debian" och kanske ndringar p originalfilerna). Beroende
+p vilket kllkodspaketformat som anvnds fr att bygga formatet kan
+ytterligare parametrar kanske godtas.
+
+\fBdpkg\-source\fP kommer bygga kllkodspaketet med det frsta format som
+fungerar frn denna lista i denna ordning: formatet som anges med
+kommandoradsflaggan \fI\-\-format\fP, formatet som anges i
+\fIdebian/source/format\fP, "1.0". Standardvrdet "1.0" rekommenderas ej och
+kommer att tas bort en gng i framtiden, du br alltid dokumentera det
+nskade kllkodsformatet i \fBdebian/source/format\fP. Se avsnittet \fBFORMAT P
+KLLKODSPAKET\fP fr en utfrlig beskrivning av de olika
+kllkodspaketformaten.
+
+.TP 
+\fB\-\-print\-format\fP \fIkatalog\fP
+Visa formatet som skulle anvndas fr att bygga kllkodspaketet om
+\fBdpkg\-source \-b\fP \fIkatalog\fP skulle kras (under samma frhllanden och med
+samma parametrar).
+
+.TP 
+\fB\-\-before\-build\fP \fIkatalog\fP
+Kr motsvarande krok fr kllkodspaketformatet. Kroken anropas innan ngot
+frn paketet byggs (\fBdpkg\-buildpakcage\fP anropar det vldigt tidigt, till
+och med fre \fBdebian/rules clean\fP). Kommandot r idempotent och kan anropas
+flera gnger. Det r inte alla kllkodsformat som implementerar ngot i den
+hr kroken, och de som gr det frbereder oftast kllkodstrdet fr att
+byggas, till exempel genom att se till att Debianpatchar har applicerats.
+
+.TP 
+\fB\-\-after\-build\fP \fIkatalog\fP
+Kr motsvarande krok fr kllkodspaketformatet. Kroken anropas efter att
+allt frn paketet byggts (\fBdpkg\-buildpakcage\fP anropar det sist). Kommandot
+r idempotent och kan anropas flera gnger. Det r inte alla kllkodsformat
+som implementerar ngot i den hr kroken, och de som gr det anvnder den
+normalt fr att terstlla det som \fB\-\-before\-build\fP har gjort.
+
+.TP 
+\fB\-\-commit\fP [\fIkatalog\fP] ...
+Spara ndringar i kllkodstrdet som har packats upp i \fIkatalog\fP. Kommandot
+kan ta ytterligare parametrar beroende p kllkodsformatet. Ett fel kommer
+rapporteras fr format dr operationen inte har ngon betydelse.
+
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH "ALLMNNA BYGGFLAGGOR"
+.TP 
+\fB\-c\fP\fIcontrol\-fil\fP
+Anger huvudkllkodsstyrfil som information skall lsas frn. Standardvrde
+r \fBdebian/control\fP. Om ett relativt skvgsnamn anges tolkas det frn
+kllkodstrdets toppnivkatalog.
+.TP 
+\fB\-l\fP\fIndringsloggfil\fP
+Anger ndringsloggsfil som information skall lsas frn. Standardvrde r
+\fBdebian/changelog\fP. Om ett relativt skvgsnamn anges tolkas det frn
+kllkodstrdets toppnivkatalog.
+.TP 
+\fB\-F\fP\fIndringsloggformat\fP
+Anger format p ndringsloggen. Som standard lses formatet frn en speciell
+rad nra slutet av ndringsloggen, eller s anvnds Debians standardformat
+om ingen information hittas.
+.TP 
+\fB\-\-format=\fP\fIvrde\fP
+Anvnd det givna formatet fr att bygga kllkodspaketet. Det verstyr inte
+ett eventuellt format som anges i \fBdebian/source/format\fP.
+.TP 
+\fB\-V\fP\fInamn\fP\fB=\fP\fIvrde\fP
+Stller in en utdatasubstitueringsvariabel. Se \fBdeb\-substvars\fP(5) fr en
+beskrivning av utdatasubstituering.
+.TP 
+\fB\-T\fP\fIsubstvars\-fil\fP
+Ls substitueringsvariabler frn \fIsubstvarfil\fP; standardvrde r att inte
+lsa ngon fil.Flaggan kan anvndas flera gnger fr att lsa
+substitueringsvariabler frn flera filer.
+.TP 
+\fB\-D\fP\fIflt\fP\fB=\fP\fIvrde\fP
+Erstt eller lgg till ett flt i den genererade control\-filen.
+.TP 
+\fB\-U\fP\fIflt\fP
+Ta bort ett flt ur den genererade control\-filen.
+.TP 
+\fB\-Z\fP\fIkomprimering\fP, \fB\-\-compression\fP=\fIkomprimering\fP
+Anger vilken komprimering som skall anvndas fr de skapade filerna
+(tar\-bollar och diffar). Observera att flaggan inte gr att befintliga
+tar\-bollar packas om, utan enbart pverkar nya filer. Vrden som stds r:
+\fIgzip\fP, \fIbzip2\fP, \fIlzma\fP samt \fIxz\fP. \fIgzip\fP r frvalet. Std fr \fIxz\fP
+finns bara frn och med dpkg\-dev 1.15.5.
+.TP 
+\fB\-z\fP\fIniv\fP, \fB\-\-compression\-level\fP=\fIniv\fP
+Komprimeringsniv att anvnda. Som med \fB\-Z\fP pverkas bara filer som
+nyskapas. Vrden som stds r: \fI1\fP till \fI9\fP, \fIbest\fP (bst) och \fIfast\fP
+(snabb). \fI9\fP r frval fr gzip och bzip2, \fI6\fP fr xz och lzma.
+.TP 
+\fB\-i\fP[\fIreg.uttr\fP], \fB\-\-diff\-ignore\fP[=\fIreg.uttr\fP]
+Du kan ange ett reguljrt uttryck i perlformat fr att matcha filer som du
+vill skall filtreras ut ur listan ver filer fr diffen. (Listan skapas av
+ett find\-kommando.) (Om kllkodspaketet byggs som ett version 3\-paket med
+ett VCS kan detta anvndas fr att ignorera ndringar som inte har checkats
+in p de angivna filerna. \-i.* kommer att ignorera samtliga.) \fB\-i\fP ensamt
+aktiverar funktionen, med ett standardvrde som filtrerar ut styrfiler och
+kataloger frn de flesta vanliga versionshanteringssystem, skerhetskopior,
+vxlingsfiler och Libtool\-byggutdatakataloger. Endast ett reguljrt kan vara
+aktivt, om du anger flera \fB\-i\fP\-flaggor r det den sista p kommandoraden
+som gller.
+
+Flaggan r mycket anvndbar fr att utesluta extrafiler som kommer med i
+diffen, t.ex om du underhller din kllkod i ett versionshanteringssystem
+och vill anvnda en utcheckning fr att bygga ett kllkodspaket utan att ta
+med de ytterligare filer och det normalt innehller (t.ex CVS/, .cvsignore,
+\&.svn/). Det frvalda reguljra uttrycket tcker redan in mnga av dessa, men
+om du ndrar det, kom ihg att det som standard kan trffa alla delar av
+filnamnet. S, om du trffa bara brjan av ett filnamn eller hela filnamn
+mste du sjlv lgga till de frankringar som r ndvndiga (t.ex '(^|/)',
+\&'($|/)').
+.TP 
+\fB\-\-extend\-diff\-ignore\fP=\fIreg.uttr\fP
+Det reguljra uttrycket i perlformat som angavs utkar standardvrdet fr
+\fB\-\-diff\-ignore\fP och dess nuvarande vrde (om satt). Det gr s genom att
+lgga till "\fB|\fP\fIreg.uttry\fP" efter standarduttrycket. Flaggan r nyttig fr
+\fBdebian/source/options\fP fr att exkludera en del automatiskt genererade
+filer frn skapandet av automatiska patchar.
+.TP 
+\fB\-I\fP[\fIfilmnster\fP], \fB\-\-tar\-ignore\fP[=\fIfilmnster\fP]
+Om flaggan anges kommer filnamnet att sndas vidare till \fBtar\fP(1):s
+\-\-exclude\-flagga nr det anropas fr att skapa en .orig.tar.gz eller
+\&.tar.gz\-fil. Till exempel kommer \-ICVS att hoppa ver CVS\-kataloger nr
+tar.gz\-filen skapas. Flaggan kan upprepas flera gnger fr att lista flera
+filnamn som skall uteslutas.
+
+\fB\-i\fP ensamt aktiverar funktionen, med ett standardvrde som filtrerar ut
+styrfiler och kataloger frn de flesta vanliga versionshanteringssystem,
+skerhetskopior, vxlingsfiler och Libtool\-byggutdatakataloger.
+.PP
+\fBObservera:\fP ven om de anvnds till liknande ndaml, s har \fB\-i\fP och
+\fB\-I\fP vldigt olika syntax och semantik. \fB\-i\fP kan endast anges en gng och
+tar ett perl\-kompatibelt reguljrt uttryck, vilket matchas mot den kompletta
+relativa skvgen fr varje fil. \fB\-I\fP kan anges flera gnger och tar ett
+filnamnsskmnster med skaljokertecken. Mnstret matchas mot den kompletta
+relativa skvgen, men ven individuellt mot varje komponent i skvgen. Den
+exakta semantiken fr tar:s \-\-exclude\-flagga r ngot komplicerad, se
+http://www.gnu.org/software/tar/manual/tar.html#wildcards fr fullstndig
+dokumentation.
+
+Frvalt reguljrt uttryck och skmnster fr de bgge flaggorna kan ses i
+utdata fr \fB\-\-help\fP\-kommandot.
+.SH "ALLMNNA UPPACKNINGSFLAGGOR"
+.TP 
+\fB\-\-no\-copy\fP
+Kopiera inte original\-tarbollar i nrheten av det uppackade kllkodspaketet.
+.TP 
+\fB\-\-no\-check\fP
+Kontrollera inte signaturer och kontrollsummor fre uppackning.
+.TP 
+\fB\-\-require\-valid\-signature\fP
+Vgra packa upp kllkodspaketet om det inte innehller en OpenPGP\-signatur
+som kan verifieras antingen med anvndarens \fItrustedkeys.gpg\fP\-nyckelring,
+en av de sljarspecifka nyckelringarna, eller en av de officiella
+Debiannyckelringarna (\fI/usr/share/keyrings/debian\-keyring.gpg\fP och
+\fI/usr/share/keyrings/debian\-maintainers.gpg\fP).
+
+.SH "FORMAT P KLLKODSPAKET"
+Om du inte vet vilket kllkodspaketformat du skall anvnda, br du
+antagligen vlja antingen "3.0 (quilt)" eller "3.0 (native)". Se
+http://wiki.debian.org/Projects/DebSrc3.0 fr information om hur dessa
+format stts i produktion i Debian.
+
+.SS "Format: 1.0"
+Ett kllkodspaket i detta format bestr antingen av en \fB.orig.tar.gz\fP,
+frbunden med en \fB.diff.gz\fP, eller en ensam \fB.tar.gz\fP (i s fall anses
+paketet vara \fIeget\fP, "\fInative\fP").
+
+\fBUppackning\fP
+
+Att packa upp ett Debianeget paket innebr att packa upp den ensamma
+tarbollen i mlkatalogen. Att packa upp ett icke\-eget paket innebr att
+frst packa upp \fI.orig.tar.gz\fP\-filen och sedan genom att tillmpa patchen
+som finns i \fB.diff.gz\fP\-filen. Tidsstmplarna fr alla filer nollstlls till
+den tidpunkt d kllkodspaketet extraherades (vilket undviker
+tidsstmpelfrskjutningar som kunde leda till problem nr autogenererade
+filer patchas). Diffen kan skapa nya filer (hela debian\-katalogen skapas p
+det sttet), men kan inte ta bort filer (tomma filer kommer lmnas kvar).
+
+\fBBygga\fP
+
+Att bygga ett Debianeget paket innebr bara att skapa en ensam tarboll med
+kllkodskatalogen. Att bygga ett icke\-eget paket innefattar att extrahera
+original\-tarbollen i en separat ".orig"\-katalog och skapa \fB.diff.gz\fP\-filen
+p nytt genom att jmfra kllkodspaketets \fIkatalog\fP med .orig\-katalogen.
+
+.TP 
+\fBByggflaggor (med \-b):\fP
+.PP
+Om ett andra argument som inte r en flagga anges skall det vara namnet p
+originalkllkodskatalogen eller \-tarfilen eller den tomma strngen om
+paketet r Debianspecifikt och drfr inte har ngra
+Debianiserings\-diffar. Om inget andra argument anges kommer \fBdpkg\-source\fP
+att leta efter originalkllkodstarfilen
+\fIpaket\fP\fB_\fP\fIuppstrmsversion\fP\fB.orig.tar.gz\fP eller
+originalkllkodskatalogen \fIpaket\fP\fB.orig\fP beroende p \fB\-sX\fP\-flaggorna.
+
+\fB\-sa\fP, \fB\-sp\fP, \fB\-sk\fP, \fB\-su\fP och \fB\-sr\fP skriver inte ver befintliga
+tar\-filer och kataloger. Om det nskas br  \fB\-sA\fP, \fB\-sP\fP, \fB\-sK\fP, \fB\-sU\fP
+och \fB\-sR\fP anges i stllet.
+.TP 
+\fB\-sk\fP
+Anger att den ursprungliga kllkoden r en tar\-fil, som standard
+\fIpaket\fP\fB_\fP\fIuppstrmsversion\fP\fB.orig.tar.\fP\fIfilndelse\fP. Den kommer lta
+originalkllkodsfilen ligga kvar som en tarfil, eller kopiera den till den
+aktuella katalogen om den inte redan r dr. Tarbollen kommer att packas upp
+i \fIkatalog\fP\fB.orig\fP fr att generera diffen.
+.TP 
+\fB\-sp\fP
+Som \fB\-sk\fP, men tar bort katalogen igen eftert.
+.TP 
+\fB\-su\fP
+Anger att originalkllkoden r en katalog, som standard
+\fIpaket\fP\fB\-\fP\fIuppstrmsversion\fP\fB.orig\fP och att \fBdpkg\-source\fP skall skapa
+ett nytt originalkllkodsarkiv frn den.
+.TP 
+\fB\-sr\fP
+Som \fB\-su\fP, men tar bort katalogen nr den har anvnts.
+.TP 
+\fB\-ss\fP
+Anger att originalkllkoden finns bde som en katalog och en
+tar\-fil. Katalogen kommer att anvndas av dpkg\-source fr att skapa diffen,
+men tarfilen fr att skapa \fB.dsc\fP\-filen. Flaggan mste anvndas med
+tillfrsikt \- om katalogen och tarfilen inte stmmer verens kommer ett
+trasigt kllkodsarkiv att skapas.
+.TP 
+\fB\-sn\fP
+Anger att dpkg\-source inte skall leta efter ngot kllkodsarkiv och att
+ingen diff skall skapas. Det andra argumentet, om det anges, mste vara den
+tomma strngen. Flaggan anvnds fr Debianspecifika paket som inte har en
+separat uppstrmskllkod och drfr inte har ngon debianiseringsdiff.
+.TP 
+\fB\-sa\fP eller \fB\-sA\fP
+Anger att originalkllkoden finns som en katalog eller en tarfil \- det andra
+argumentet, om det anges, kan vara det ena eller det andra, eller den tomma
+strngen (motsvarar att anvnda \fB\-sn\fP). Om en tarfil hittas kommer
+programmet att packa upp den fr att skapa en diff och ta bort den eftert
+(motsvarar \fB\-sp\fP). Om en katalog hittas kommer den att packas fr att skapa
+originalkllkoden och ta bort den eftert (motsvarar \fB\-sn\fP). Om bda hittas
+kommer \fBdpkg\-source\fP att ignorera katalogen, och skriva ver den om \fB\-sA\fP
+angavs (detta motsvarar \fB\-sP\fP) eller ge ett felmeddelande om \fB\-sa\fP
+angavs. \fB\-sA\fP r standard.
+.TP 
+\fB\-\-abort\-on\-upstream\-changes\fP
+Processen misslyckas om den genererade diffen innehller ndringar av filer
+utanfr underkatalogen debian. Den hr flaggan tillts inte i
+\fBdebian/source/options\fP, men kan anvndas i \fBdebian/source/local\-options\fP.
+
+.TP 
+\fBExtraheringsflaggor (med \-x):\fP
+.PP
+Oavsett kommer ett befintligt kllkodstrd att tas bort.
+.TP 
+\fB\-sp\fP
+Anvnds nr originalkllkoden som extraheras (om sdan finns) skall lmnas
+kvar som en tarfil. Om den inte redan finns i den aktuella katalogen, eller
+om en befintlig men annan fil finns dr, kommer den att kopieras
+dit. (\fBDetta r standard.\fP)
+.TP 
+\fB\-su\fP
+Packar upp originalkllkodstrdet.
+.TP 
+\fB\-sn\fP
+Frskrar att originalkllkoden varken kopieras till en aktuella katalogen
+eller packas upp. Eventuella originalkllkodstrd som finns i den aktuella
+katalogen tas fortfarande bort.
+.PP
+Alla \fB\-s\fP\fIX\fP\-flaggor r msesidigt uteslutande. Om du anger mer n en
+kommer endast den sista att anvndas.
+.TP 
+\fB\-\-skip\-debianization\fP
+Hoppas ver att tillmpa debian\-diffen ovanp uppstrmskllkoden.
+.
+.SS "Format: 2.0"
+ven knt som wig&pen. Detta format rekommenderas inte fr allmn
+anvndning, formatet "3.0 (quilt)" erstter det. Wig&pen var den frsta
+specifikationen av en ny generation av kllkodspaketformat.
+
+Beteendet fr detta format r detsamma som fr "3.0 (quilt)"\-formatet,
+frutom att det inte anvnder en explicit frteckning patchar. Alla filer i
+\fBdebian/patches/\fP som motsvarar det Perl\-reguljra uttrycket \fB[\ew\-]+\fP
+mste vara giltiga patchar: de appliceras nr paketet packas upp.
+
+Nr du bygger ett nytt kllkodspaket kommer eventuella ndringar p
+uppstrmskllkoden att lagras i en patch som kallas \fBzz_debian\-diff\-auto\fP.
+.
+.SS "Format: 3.0 (eget)"
+Detta format r en utkning av det egna paketformatet som anges av
+1.0\-formatet. Det stder alla komprimeringsmetoder och kommer att som
+standard ignorera alla VCS\-specifika filer och kataloger, samt mnga
+temporrfiler (se standardvrdet som r knutet till flaggan \fB\-i\fP i texten
+fr \fB\-\-help\fP).
+.
+.SS "Format: 3.0 (quilt)"
+Ett kllkodspaket i detta format innehller tminstone en original\-tarboll
+(\fB.orig.tar.\fP\fIext\fP, dr \fIext\fP kan vara \fBgz\fP, \fBbz2\fP, \fBlzma\fP eller
+\fBxz\fP) och en Debiantarboll (\fB.debian.tar.\fP\fIext\fP). Den kan ven innehlla
+ytterligare original\-tarbollar
+(\fB.orig\-\fP\fIkomponent\fP\fB.tar.\fP\fIext\fP). \fIkomponent\fP kan endast innehlla
+alfanumeriska tecken och bindestreck ("\-").
+.PP
+\fBUppackning\fP
+.PP
+Huvud\-originaltarbollen packas upp frst, drefter packas alla ytterligare
+originaltarbollar upp i underkataloger med namn efter \fIkomponent\fP\-delen i
+sitt filnamn (eventuella redan befintliga kataloger
+erstts). Debian\-tarbollen packas sedan upp ovanp kllkodskatalogen efter
+att en redan befintlig \fBdebian\fP\-katalog har tagits bort frst. Observera
+att debian\-tarbollen mste best av en \fBdebian\fP\-underkatalog, men att den
+ven kan innehlla binrfiler utanfr den katalogen (se flaggan
+\fB\-\-include\-binaries\fP).
+.PP
+Alla patchar listade i \fBdebian/patches/debian.series\fP eller
+\fBdebian/patches/series\fP tillmpas sedan. Om den frstnmnda filen anvnds
+och den sistnmnda inte existerar (eller r en symbolisk lnk), kommer den
+senare att ersttas av en symbolisk lnk till den frsta. Tanken r att gra
+det enklare att anvnda quilt till att hantera patchuppsttningen. Observera
+att, ven om \fBdpkg\-source\fP korrekt tolkar series\-filer som anvnder
+explicita flaggor till patch\-programmet (lagrade p kommandoraden efter
+patch\-filnamnet och ett eller flera blanksteg), s ignoreras dessa flaggor
+och det frvntar sig att patchar kan tillmpas med flaggan \fB\-p1\fP till
+\fBpatch\fP. Det kommer drfr visa en varning sdana flaggor upptcks, och
+bygget kommer troligen att misslyckas.
+.PP
+Patchar kan ven ta bort filer, p ungfr samma stt som quilt normalt
+fungerar.
+.PP
+Filen \fB.pc/applied\-patchers\fP skapas om patchar tillmpades vid
+uppackningen.
+.PP
+\fBBygga\fP
+.PP
+Alla original\-tarbollar som finns i den aktuella katalogen packas upp i en
+temporr katalog med samma logik som i uppackningen, debian\-katalogen
+kopieras ver i den temporra katalogen och alla patchar, frutom den
+automatiska patchen (\fBdebian\-changes\fP\fIversion\fP eller \fBdebian\-changes\fP,
+beroende p \fB\-\-single\-debian\-patch\fP) tillmpas. Temporrkatalogen jmfrs
+drefter mot kllkodskatalogen. Om diffen inte r tom misslyckas bygget,
+svida inte \fB\-\-single\-debian\-patch\fP eller \fB\-\-auto\-commit\fP anvnts, i
+vilket fall diffen lagras i den automatiska patchen. Om den automatiska
+patchen skapas/tas bort, lggs den till/tas bort frn series\-filen och frn
+quilt\-metadata.
+
+Eventuella ndringar p binrfiler kan inte representeras i en diff och
+kommer drmed att leda till ett felmeddelande, svida inte paketansvariga
+medvetet vljer att inkludera den modifierade binrfilen i debian\-tarbollen
+(genom att lista den i \fBdebian/source/include\-binaries\fP). Byggningen kommer
+ven att misslyckas om binrfiler upptcks i debian\-underkatalogen, svida
+de inte har vitlistats i \fBdebian/source/include\-binaries\fP.
+
+Den uppdaterade debiankatalogen, och listan ver modifierade binrer,
+anvnds sedan fr att skapa debian\-tarbollen.
+
+Den automatiskt genererade diff\-filen innehller inte ndringar fr
+VCS\-specifika filer eller fr mnga temporra filer (se standardvrdet som
+r knutet till flaggan \fB\-i\fP i texten fr \fB\-\-help\fP). Detta gller speciellt
+katalogen \fB.pc\fP som anvnds av quilt, katalogen kommer att ignoreras nr
+den automatiska patchen skapas.
+
+Observera: \fBdpkg\-source\fP \fB\-\-before\-build\fP (och \fB\-b\fP) ser till att alla
+patchar som anges i seriefilen tillmpas s att paketbygget alltid har alla
+patchar tillmpade. Detta grs genom att hitta alla icke\-tillmpade patchar
+(som anges i filen \fBseries\fP men inte i \fB.pc/applied\-patches\fP), och om den
+frsta patchen i listan kan tillmpas utan fel kommer samtliga att
+tillmpas. Flaggan \fB\-\-no\-preparation\fP kan anvndas fr att sl av detta
+beteende.
+
+.PP
+\fBLagra ndringar\fP
+.TP 
+\fB\-\-commit\fP [\fIkatalog\fP] [\fIpatchnamn\fP] [\fIpatch\-fil\fP]
+Skapar en patch som motsvarar de lokala ndringar som inte hanteras av
+quilt\-patch\-systemet och integrerar dem i patch\-systemet under namnet
+\fIpatchnamn\fP. Om namnet saknas kommer programmet be om ett interaktivt. Om
+\fIpatch\-fil\fP anges anvnds den som patch som motsvarar de lokala ndringar
+som skall integreras. Detta r oftast anvndbart efter ett misslyckat bygge
+som skapat filen p frhand. Nr patchen r integrerad startas ett
+redigeringsprogram s att du kan ange metainformationen i patchhuvudet.
+
+.PP
+\fBByggflaggor\fP
+.TP 
+\fB\-\-allow\-version\-of\-quilt\-db=\fP\fIversion\fP
+Tillt \fBdpkg\-source\fP att bygga kllkodspaketet om versionen av
+quilt\-metadata r den som angavs, ven om \fBdpkg\-source\fP inte knner till
+den. Det betyder att den givna versionen av quilt\-metadata r kompatibel med
+version 2 som \fBdpkg\-source\fP fr nrvarande stder. Versionen av
+quilt\-metadata lagras i \fB.pc/.version\fP.
+.TP 
+\fB\-\-include\-removal\fP
+Ignorera inte borttagna filer och ta med dem i den automatiskt genererade
+patchen.
+.TP 
+\fB\-\-include\-timestamp\fP
+Ta med tidsstmpel i den automatiskt genererade patchen.
+.TP 
+\fB\-\-include\-binaries\fP
+Lgg till alla modifierade binrer i debian\-tarbollen. Lgg ven till dem i
+\fBdebian/source/include\-binaries\fP: de kommer att lggas till som standard i
+fljande byggen och du behver inte lngre ange den hr flaggan.
+.TP 
+\fB\-\-no\-preparation\fP
+Frsk inte att frbereda byggtrdet genom att tillmpa patchar som inte
+verkar ha tillmpas fr nrvarande.
+.TP 
+\fB\-\-single\-debian\-patch\fP
+Anvnd \fBdebian/patches/debian\-changes\fP istllet fr
+\fBdebian/patches/debian\-changes\-\fP\fIversion\fP som namn p den automatiska
+patch som genereras vid bygget. Denna flagga r speciellt nyttig nr paketet
+hanteras i ett versionshanteringssystem och en patch inte kan skapas p ett
+plitligt stt. Den aktuella diffen mot uppstrms lagras istllet i en ensam
+patch. Flaggan br anges i \fBdebian/source/local\-options\fP och fljs av filen
+\fBdebian/source/local\-patch\-header\fP som beskricer hur Debianndringarna bst
+kan ses, till exempel i det versionshanteringssystem som anvnds.
+.TP 
+\fB\-\-create\-empty\-orig\fP
+Skapa huvud\-originaltarbollen som tom automatiskt om den saknas och om det
+finns supplement\-originaltarbollar. Flaggan r tnkt att anvndas nr
+kllkodspaketet bara r en samling av flera uppstrmsprogram och dr det
+inte finns ngot "huvud"\-program.
+.TP 
+\fB\-\-unapply\-patches\fP
+Ta bort patchar i kroken \fB\-\-after\-build\fP. Du behver oftast inte ange
+flaggan eftersom dpkg\-source automatiskt tar bort patchar om de tillmpades
+i \fB\-\-before\-build\fP. Flaggan tillts endast i \fBdebian/source/local\-options\fP
+s att alla genererade kllkodspaket som standard har samma beteende.
+.TP 
+\fB\-\-abort\-on\-upstream\-changes\fP
+Processen misslyckas om en automatisk patch har genererats. Flaggan kan
+anvndas fr att se till att alla ndringar har lagrats undan korrekt i
+separata quilt\-patchar innan kllkodspaketet byggts. Flaggan tillts inte i
+\fBdebian/source/options\fP, men kan anvndas i \fBdebian/source/local\-options\fP.
+.TP 
+\fB\-\-auto\-commit\fP
+Processen misslyckas inte om en automatisk patch har skapats, den lggs
+istllet direkt in i quilt\-serien.
+
+.PP
+\fBExtraheringsflaggor\fP
+.TP 
+\fB\-\-skip\-debianization\fP
+Hoppas ver att packa upp debian\-tarbollen ovanp uppstrmskllkoden.
+.TP 
+\fB\-\-skip\-patches\fP
+Applicera inte patchar i slutet av uppackningen.
+.
+.SS "Format: 3.0 (skrddarsytt)"
+Detta formatet r speciellt. Det anger inte ett riktigt kllkodspaketformat,
+utan kan anvndas fr att skapa kllkodspaket med godtyckliga filer.
+.PP
+\fBByggflaggor\fP
+.PP
+Alla argument som inte r flaggor tas som filer som skall integreras i det
+skapade kllkodspaketet. De mste finnas, och helst i aktuell
+katalog. tminstone en fil mste anges.
+.TP 
+\fB\-\-target\-format=\fP\fIvrde\fP
+\fBKrvs\fP. Anger det riktiga formatet p det genererade kllkodspaketet. Den
+skapade .dsc\-filen kommer innehlla detta vrde i sitt \fIFormat\fP\-flt och
+inte "3.0 (custom)".
+.
+.SS "Format: 3.0 (git)"
+Formatet r experimentellt.
+.PP
+Ett kllkodspaket i detta format bestr av en ensam "bundle" frn ett
+git\-arkiv \fB.git\fP, vilket innehller paketets kllkod. Filen \fB.gitshallow\fP,
+som innehller revisioner fr grunda git\-kloner, kan ven frekomma.
+.PP
+\fBUppackning\fP
+.PP
+"Bundle":n klonas som ett git\-arkiv till mlkatalogen. Om filen gitshallow
+finns installeras den som ".git/shallow" i det klonade git\-arkivet.
+.PP
+Observera att det nya arkivet som standard kommer att ha samma gren
+utcheckad som den som var utcheckad i det ursprungliga
+kllkodstrdet. (Typiskt "master", men kan vara vad som helst.) Eventuella
+andra grenar kommer ocks att vara tillgngliga, under "remotes/origin/".
+.PP
+\fBBygga\fP
+.PP
+Innan uppackningen fortstter kommer en del tester att utfras fr att se
+till att vi inte har ngra ej ignorerade ej incheckade ndringar.
+.PP
+\fBgit\-bundle\fP(1) anvnds fr att generera en "bundle" frn git\-arkivet. Som
+standard tas alla grenar och taggar i arkivet med i "bundle":n.
+.PP
+\fBByggflaggor\fP
+.TP 
+\fB\-\-git\-ref=\fP\fIref\fP
+Gr det mjligt att ange en git\-referens som skall tas med i "bundle":n. Om
+den anges verstyr den standardbeteendet som r att ta med alla grenar och
+taggar. Kan anges flera gnger. \fIref\fP kan vara namnet p en gren eller tagg
+som skall tas med. Den kan ven vara vilken som helst annan parameter som
+kan sndas med till \fBgit\-rev\-list\fP(1). Fr att, till exempel, endast ta med
+grenen "master", angnd \-\-git\-ref=master. Fr att ta med alla taggar och
+grenar, frutom grenen private, anvnd \-\-git\-ref=\-\-all \-\-git\-ref=^private
+.TP 
+\fB\-\-git\-depth=\fP\fIantal\fP
+Skapar en grund klon med en historik som r avhuggen vid det angivna antalet
+revisioner.
+.SS "Format: 3.0 (bzr)"
+Detta format r experimentellt. Det genererar en ensam tarboll som
+innehller bzr\-arkivet.
+.PP
+\fBUppackning\fP
+.PP
+Tarbollen packas upp och bzr anvnds sedan fr att hmta ut den aktuella
+grenen.
+.PP
+\fBBygga\fP
+.PP
+Innan uppackningen fortstter kommer en del tester att utfras fr att se
+till att vi inte har ngra ej ignorerade ej incheckade ndringar.
+.PP
+De VCS\-specifika delarna av kllkodskatalogen kommer drefter att kopieras
+ver till en temporr katalog. Innan den temporra katalogen packas i en
+tarboll utfrs viss stdning fr att spara plats.
+.SH "VARNINGAR OCH FELMEDDELANDEN"
+.SS "kllkodsformat ej angivet i debian/source/format"
+Filen \fBdebian/source/format\fP br alltid finnas och ange det nskade
+kllkodsformatet. Fr baktkompatibilitet antar formatet "1.0" om filen inte
+finns, men du br inte frlita dig p detta: vid ngon punkt i framtiden
+kommer dpkg\-source att justeras s att det misslyckas om filen inte finns.
+
+Resonemanget bakom detta r att formatet "1.0" inte lngre r det
+rekommenderade formatet, du br normalt vlja ett av de nyare formaten ("3.0
+(quilt)", "3.0 (native)"), men \fBdpkg\-source\fP gr inte detta automatiskt t
+dig. Om du vill fortstta anvnda det gamla formatet br du ange det
+explicit genom att skriva "1.0" i \fBdebian/source/format\fP.
+.SS "diffen modifierar fljande uppstrmsfiler"
+Nr du anvnder kllkodsformatet "1.0" r det oftast inte ngon bra id att
+modifiera uppstrmsfiler direkt eftersom ndringarna dljs och i huvudsak r
+odokumenterade i diff.gz\-filen. Du br istllet spara dina ndringar som
+patchar i debian\-katalogen och applicera dem nr paketet skall byggas. Fr
+att undvika den hr komplexiteten kan du ven anvnda formatet "3.0 (quilt)"
+som lter dig gra det hr automatiskt.
+.SS "kan inte representera ndringen fr \fIfil\fP"
+ndringar p uppstrmsfiler sparas normalt som patchfiler, men inte alla
+ndringar kan representeras med patchar: de kan endast ndra innehllet i
+vanliga textfiler. Om du frsker erstta en fil med ngot som har en annan
+typ (till exempel erstta en vanlig fil med en symbolisk lnk eller en
+katalog) fr du det hr felmeddelandet.
+.SS "den tomma filen \fIfil\fP som just skapats kommer inte representeras i diffen"
+Tomma filer kan inte skapas med patchfiler. ndringen kommer drmed inte att
+sparas i kllkodspaketet och du fr en varning om det.
+.SS "exekveringslge \fIlge\fP p \fIfil\fP kommer inte representeras i diffen"
+.SS "speciallget \fIlge\fP p \fIfil\fP kommer inte representeras i diffen"
+Patchfiler beskriver inte lget p filer och ndrade lgen sparas inte i
+kllkodspaketet. Den hr varningen pminner dig om detta.
+.SH FILFORMAT
+.SS debian/source/format
+Filen innehller p en ensam rad det format som skall anvndas fr att bygga
+kllkodspaketet (mjliga format beskrivs ovan). Varken ledande eller
+avslutande blanksteg tillts.
+.SS debian/source/include\-binaries
+Filen innehller en frteckning ver binrfiler (en per rad) som skall tas
+med i debian\-tarbollen. Inledande och avslutande blanksteg tas bort. Rader
+som brjar med "#" r kommentarer och hoppas ver. Tomma rader ignoreras.
+.SS debian/source/options
+Filen innehller en lista ver lnga flaggor som automatiskt stts in fre
+kommandoradsflaggorna som anges i ett anrop til \fBdpkg\-source \-b\fP eller
+\fBdpkg\-source \-\-print\-format\fP. Flaggor som \fB\-\-compression\fP och
+\fB\-\-compression\-level\fP r passande att lgga in i den  hr filen.
+.P
+Ange varje flagga p en egen rad. Tomma rader och rader som brjar med "#"
+ignoreras. Inledande "\-\-" skall tas bort och korta flaggor r inte
+tilltna. Blanksteg tillts runt "="\-tecknet och citattecken tillts runt
+vrdet. Hr r ett exempel p en sdan fil:
+.P
+  # lt dpkg\-source skapa en debian.tar.bz2 med maximal komprimering
+  compression = "bzip2"
+  compression\-level = 9
+  # anvnd debian/patches/debian\-changes som en automatisk patch
+  single\-debian\-patch
+  # ignorera ndringar i config.{sub,guess}
+  extend\-diff\-ignore = "(^|/)(config.sub|config.guess)$"
+.P
+Observera: \fBformat\fP\-flaggor tillts inte i den hr filen, du br anvnda
+filen \fBdebian/source/format\fP istllet.
+.SS debian/source/local\-options
+Precis som \fBdebian/source/options\fP frutom att filen inte inkluderas i det
+genererade kllkodspaketet. Det kan vara anvndbart fr att spara ett val
+som gller fr paketansvariga eller VCS\-systemet kllkodspaketet hanteras i.
+.SS debian/source/local\-patch\-header
+.SS debian/source/patch\-header
+Friformstext som lggs in p toppen av den automatiskt genererade patchen i
+formaten "2.0" eller "3.0 (quilt)". \fBlocal\-patch\-header\fP tas inte med i det
+genererade kllkodspaketet medan \fBpatch\-header\fP tas med.
+.SS debian/patches/series
+Listar alla patchar som mste tillmpas (i den givna ordningen) ovanp
+uppstrmskllkodspaketet. Inledande och avslutande blanksteg tas bort. Rader
+som brjar med "#" r kommentarer och ignoreras. Tomma rader ignoreras. De
+rader som r kvar inleds med filnamnet p en patchfil (relativt till
+\fBdebian/patches/\fP\-katalogen) upp till det frsta blankstegstecknet eller
+slutet p raden. Valfria flaggor till quilt kan flja fram till slutet av
+raden eller det frsta "#" som fljer p ett eller flera blanksteg (vilket
+anger brjan p en kommentar fram till slutet av raden).
+.SH PROGRAMFEL
+Tidpunkten p fltverstyrning intrffar jmfrt med instllning av vissa
+standardutdataflt r ganska frvirrad.
+.SH "SE VEN"
+\fBdpkg\-deb\fP(1), \fBdpkg\fP(1), \fBdselect\fP(1).
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  1995\-1996 Ian Jackson
+.br
+Upphovsrttsskyddat  2000 Wichert Akkerman
+.br
+Upphovsrttsskyddat  2008\-2011 Raphal Hertzog
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-split.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-split.1
--- dpkg/man/sv/dpkg-split.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-split.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,178 @@
+.\" Authors: Ian Jackson
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-split 1 2011\-07\-04 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-split \- Verktyg fr att dela/sl ihop Debianpaket
+.
+.SH SYNOPS
+\fBdpkg\-split\fP [\fIflaggor\fP...] \fItgrd\fP
+.
+.SH BESKRIVNING
+\fBdpkg\-split\fP delar upp binra Debianpaketfiler i mindre delar och slr
+samman dem igen, fr att gra det mjligt att lagra stora paketfiler p sm
+media, till exempel disketter.
+
+Programmet kan kras manuellt med flaggorna \fB\-\-split\fP, \fB\-\-join\fP och
+\fB\-\-info\fP.
+
+Det har ven ett automatiskt lge, vilket aktiveras med flaggan \fB\-\-auto\fP. I
+det lget hanterar det en k av delar som setts men nnu inte terstllts,
+och terstller en paketfil nr den sett alla dess delar. Flaggorna
+\fB\-\-listq\fP and \fB\-\-discard\fP gr det mjligt att hantera kn.
+
+Alla funktioner fr uppdelning, sammanslagning och kande visar informativa
+meddelanden p standard ut; dessa kan ignoreras.
+.
+.SH KOMMANDON
+.TP 
+\fB\-s\fP, \fB\-\-split\fP \fIhelt\-arkiv\fP [\fIprefix\fP]
+Delar ett ensamt binrt Debianpaket i flera delar.
+
+Delarna namnges som \fIprefix\fP\fB.\fP\fIN\fP\fBof\fP\fIM\fP\fB.deb\fP dr \fIN\fP r numret p
+delen, rknat frn 1, och \fIM\fP r det totala antalet delar (bda angivna
+decimalt).
+
+Om inget \fIprefix\fP ges tas filnamnet fr \fIhelt\-arkiv\fP, inklusive
+katalognamn, med den avslutande \fB.deb\fP borttagen.
+.TP 
+\fB\-j\fP, \fB\-\-join\fP \fIdel\fP...
+Slr samman de olika paketdelarna, och terskapar den ursprungliga filen som
+den sg ut innan den delades.
+
+Delfilerna som ges som argument mste alla vara delar av exakt samma
+ursprungliga binrfil. Varje mste finnas exakt en gng i argumentlistan,
+men de behver inte listas i ordning.
+
+Delarna mste naturligtvis alla ha genererats med samma delstorlek nr
+uppdelningen skedde, vilket betyder att de vanligtvis mste ha genererats
+vid samma krning av \fBdpkg\-split \-\-split\fP.
+
+Delarnas filnamn r inte signifikanta fr sammanslagningsproceduren.
+
+Frvalt namn p utdatafilen r \fIpaket\fP\fB_\fP\fIversion\fP\fB_\fP\fIark\fP\fB.deb\fP.
+
+.TP 
+\fB\-I\fP, \fB\-\-info\fP \fIdel\fP...
+Skriver ut information, i mnniskolsbar form, om delfilerna som
+anges. Argument som inte r delar av binrpaket resulterar i ett meddelande
+som talar om detta (men fortfarande p standard ut).
+.TP 
+\fB\-a\fP, \fB\-\-auto \-o\fP\fI fullstndig\-utdata del\fP
+Ka automatiskt delarna och terskapa paketet om mjligt.
+
+Den \fIdel\fP som anges undersks och jmfrs med andra delar av samma paket
+(om sdana existerar) i kn av delar av paket.
+
+Om alla delar av ett paket av vilket \fIdel\fP r en del av r tillgngliga
+kommer paketet att terskapas och skrivas till \fIfullstndig\-utdata\fP (vilken
+vanligtvis inte redan br existera, ven om det inte vore ett fel om det
+gjorde det).
+
+Om inte kommer \fIdel\fP att kopieras till kn och \fIfullstndig\-utdata\fP skapas
+inte.
+
+Om \fIdel\fP inte r en del av ett delat binrpaket kommer \fBdpkg\-split\fP att
+avsluta med returvrde \fB1\fP; om ngot annat fel uppstr avslutar det med
+returvrde \fB2\fP.
+
+Flaggan \fB\-\-output\fP eller \fB\-o\fP mste ges d \fB\-\-auto\fPanvnds.  (Om detta
+inte vore ett krav skulle det anropande programmet inte veta vilken
+utdatafil som frvntades.)
+.TP 
+\fB\-l\fP, \fB\-\-listq\fP
+Listar innehllet i kn ver paket att terstlla.
+
+Fr varje paketfil fr vilken delar finns i kn visas i utdata namnet p
+paketet, antal delar i kn, och det totala antalet byte som r lagrade i
+kn.
+.TP 
+\fB\-d\fP, \fB\-\-discard\fP [\fIpaket\fP...]
+Kastar bort delar frn kn ver de som vntar p terstende delar av paket.
+
+Om inget \fIpaket\fP anges tms kn helt; om paket anges kastas bara delar fr
+de(t) paket som anges.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH FLAGGOR
+.TP 
+\fB\-\-depotdir\fP\fI katalog\fP
+Anger en alternativ katalog fr kn av delar som vntar p automatisk
+sammanslagning. Frvalet r \fB/var/lib/dpkg\fP.
+.TP 
+\fB\-S\fP, \fB\-\-partsize\fP \fIkibibyte\fP
+Anger maximal storlek vid delning, i kibibyte (1024 byte). Frval r 450
+KiB.
+.TP 
+\fB\-o\fP, \fB\-\-output\fP \fIfullstndig\-utdata\fP
+Anger filnamnet fr utdata vid sammanslagning.
+
+Anvnds istllet fr frvalet vid manuell sammanslagning (\fB\-\-join\fP) och
+krvs fr automatisk ka\-eller\-sammansl (\fB\-\-auto\fP).
+.TP 
+\fB\-Q\fP, \fB\-\-npquiet\fP
+Vid automatisk ka\-eller\-sammansl skriver \fBdpkg\-split\fP normalt ett
+meddelande om den matas med en \fIdel\fP som inte r en binr paketdel. Denna
+flagga undertrycker meddelandet, vilket gr det mjligt fr program ssom
+\fBdpkg\fP att hantera bde delade och odelade paket utan att producera
+felaktiga meddelanden.
+.TP 
+\fB\-\-msdos\fP
+Tvingar utdatafilnamn skapade av \fB\-\-split\fP att vara msdos\-kompatibla.
+
+Misshandlar prefixet \- antingen frvalet taget frn indatafilnamnet, eller
+det som angetts som argument: alfanumeriska tecken grs till gemener,
+plustecken erstts med \fBx\fP och alla andra tecken kastas.
+
+Resultatet trunkeras s lngt som mjligt, och filnamn p formen
+\fIprefixN\fP\fBof\fP\fIM\fP\fB.deb\fP genereras.
+.
+.SH RETURVRDE
+.TP 
+\fB0\fP
+Den efterfrgade delningen, sammanslagningen eller annan tgrd
+lyckades. \fB\-\-info\fP\-kommandon lyckas ven om indatafilen inte r en del av
+ett binrpaket.
+.TP 
+\fB1\fP
+Uppkommer endast med \fB\-\-auto\fP och anger att \fIdel\fPfilen inte var en del av
+ett binrpaket.
+.TP 
+\fB2\fP
+Ngot har gtt fel, till exempel ett systemanrop, att en fil sg ut som en
+paketdel men var trasig, ett anvndningsfel, eller ngot annat problem.
+.
+.SH PROGRAMFEL
+Kompletta detaljer fr paket i kn kan inte fs utan att sjlv grva i
+k\-katalogen.
+
+Det finns inget ltt stta att testa om en fil som kan vara en del av ett
+binrpaket faktiskt r det.
+.
+.SH FILER
+.TP 
+\fB/var/lib/dpkg/parts\fP
+Frvald k\-katalog fr delfiler som vntar p automatisk sammanslagning.
+
+Filnamnen som anvnds i katalogen r i ett internt format fr \fBdpkg\-split\fP
+och r knappast anvndbara fr andra program, och hur som helst kan inte
+formatet p filnamnen litas p.
+.
+.SH "SE VEN"
+\fBdeb\fP(5), \fBdeb\-control\fP(5), \fBdpkg\-deb\fP(1), \fBdpkg\fP(1).
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  1995\-1996 Ian Jackson
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-statoverride.8 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-statoverride.8
--- dpkg/man/sv/dpkg-statoverride.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-statoverride.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,96 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-statoverride 8 2011\-07\-04 Debianprojektet dpkg\-verktygen
+.SH NAMN
+dpkg\-statoverride \- verstyr garskap och lge fr filer
+.
+.SH SYNOPS
+\fBdpkg\-statoverride\fP [\fIflagga\fP...] \fItgrd\fP
+.
+.SH BESKRIVNING
+"\fBstat\-verstyrningar\fP" r ett stt att tala om fr \fBdpkg\fP(1) att en annan
+gare eller ett annat lge skall anvndas fr en fil r ett paket
+installeras. (Observera att ordet "fil" anvnds hr, men att det kan vara
+alla sorters filsystemsobjekt som hanteras av dpkg, till exempel kataloger,
+enheter osv.). Detta kan anvndas fr att tvinga program som normalt r
+setuid att installeras som en setuid\-flagga, eller bara exekverbar av en
+specifik grupp.
+.P
+\fBdpkg\-statoverride\fP r ett verktyg fr att hantera listan ver
+stat\-verstyrningar. Det har tre grundlggande funktioner: lgga till, ta
+bort och visa verstyrningar.
+.
+.SH KOMMANDON
+.TP 
+\fB\-\-add\fP\fI anvndare grupp lge fil\fP
+Lgg till en verstyrning fr \fIfil\fP. \fIFil\fP behver inte existera nr
+kommandot krs; verstyrningen kommer lagras och anvndas senare. Anvndare
+och grupper kan anges med namn (till exempel \fBroot\fP eller \fBnobody\fP), eller
+med deras nummer med ett "\fB#\fP" (till exempel \fB#0\fP eller
+\fB#65534\fP). \fILge\fP mste anges oktalt.
+
+Om \-\-update anges och \fIfil\fP existerar kommer den omedelbart att sttas till
+den nya anvndaren och lget.
+.TP 
+\fB\-\-remove\fP\fI fil\fP
+Ta bort en verstyrning fr \fIfil\fP, status fr \fIfil\fP ndras inte av detta
+kommando.
+.TP 
+\fB\-\-list\fP [\fIfilnamnsskmnster\fP]
+Visa alla verstyrningar. Om ett skmnster anges kommer utdata att
+begrnsas till verstyrningar som motsvarar mnstret. Om det inte finns
+ngra verstyrningar, eller inga motsvarar mnstret, kommer
+\fBdpkg\-statoverride\fP avslutas med statuskod 1.
+.TP 
+\fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH FLAGGOR
+.TP 
+\fB\-\-admindir\fP\fI katalog\fP
+ndra \fIkatalog\fP fr dpkg\-databasen dr statoverride\-filen ocks
+lagras. Frval r \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-\-force\fP
+Tvinga ett kommando, ven om en skerhetskontroll annars skulle frhindra
+det. Detta behvs fr att verstyra en befintlig verstyrning.
+.TP 
+\fB\-\-update\fP
+Frsk att omedelbart ndra filenomdenfinns till den nya garen och
+lget.
+.TP 
+\fB\-\-quiet\fP
+Var mindre pratsom om vad som grs.
+.
+.SH MILJVARIABLER
+.TP 
+\fBDPKG_ADMINDIR\fP
+Om satt, och flaggan \fB\-\-admindir\fP inte har angivits, anvnds vrdet som
+datakatalog fr dpkg.
+.
+.SH FILER
+.TP 
+\fI/var/lib/dpkg/statoverride\fP
+Fil som innehller den aktuella listan ver statverstyrningar p
+systemet. Den finns i dpkg:s administrationskatalog, tillsammans med andra
+filer som r viktiga fr dpkg, som "status" och "available".
+.br
+Observera: \fBdpkg\-statoverride\fP bevarar den gamla upplagan av filen, med
+tillgget "\-old" innan den erstts med den nya.
+.
+.SH "SE VEN"
+\fBdpkg\fP(1).
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  2000 Wichert Akkerman
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-trigger.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-trigger.1
--- dpkg/man/sv/dpkg-trigger.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-trigger.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,71 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-trigger 1 2011\-08\-14 Debianprojektet Dpkg\-sviten
+.SH NAMN
+dpkg\-trigger \- ett verktyg fr paketutlsare
+.
+.SH SYNOPS
+\fBdpkg\-trigger\fP [\fIflaggor\fP...] \fIutlsarnamn\fP
+.br
+\fBdpkg\-trigger\fP [\fIflaggor\fP...] \fIkommando\fP
+.
+.SH BESKRIVNING
+\fBdpkg\-trigger\fP r ett verktyg fr att explicit aktivera utlsare och fr
+att testa om de stds av den krande \fBdpkg\fP.
+.PP
+Det kan anvndas av utvecklarskript i komplexa och villkorliga situationer
+dr filutlsare, eller det deklarativa \fBactivate\fP\-direktivet i
+utlsarstyrfilen inte kan uttrycka det som behvs. Det kan ven anvndas fr
+test och av systemadministratrer (men observera att utlsarna inte kommer
+att faktiskt kras av \fBdpkg\-trigger\fP).
+.PP
+Oknda utlsarnamnsyntaxer r ett fel fr \fBdpkg\-trigger\fP.
+.
+.SH KOMMANDON
+.TP 
+\fB\-\-check\-supported\fP
+Se om den \fBdpkg\fP som krs stder utlsare (anropas vanligtvis frn ett
+postinst\-skript). Avslutar med \fB0\fP om en \fBdpkg\fP med utlsarstd har krt,
+eller \fB1\fP med ett felmeddelande p standard fel om inte. Det r dock
+normalt sett bttre att bara aktivera den nskade utlsaren med
+\fBdpkg\-trigger\fP.
+.TP 
+\fB\-h\fP, \fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH FLAGGOR
+.TP 
+\fB\-\-admindir=\fP\fIkat\fP
+ndra platsen fr \fBdpkg\fP\-databasen. Frval r \fI/var/lib/dpkg\fP.
+.TP 
+\fB\-\-by\-package=\fP\fIpaket\fP
+verstyr den som vntar p en utlsare (stts vanligen av \fBdpkg\fP genom
+miljvariabeln \fBDPKG_MAINTSCRIPT_PACKAGE\fP i utvecklarskript, fr att namnge
+det paket som skriptet tillhr, och detta anvnds som standard).
+.TP 
+\fB\-\-no\-await\fP
+Denna flagga gr s att det anropade paketet T (om det finns) inte behver
+vnta p hantering av utlsaren; det/de intresserade paketet/paketen I
+kommer inte lggas till T:s vntelista fr hantering av utlsare och T:s
+status ndras inte. T kan anses vara installerat ven om I kanske nnu inte
+har hanterat utlsaren.
+.TP 
+\fB\-\-no\-act\fP
+Bara testa, ndra inte p ngonting.
+.
+.SH MILJVARIABLER
+.TP 
+\fBDPKG_ADMINDIR\fP
+Om satt, och flaggan \fB\-\-admindir\fP inte har angivits, anvnds vrdet som
+datakatalog fr dpkg.
+.
+.SH "SE VEN"
+\fBdpkg\fP(1), \fBdeb\-triggers\fP(5), \fB/usr/share/doc/dpkg\-dev/triggers.txt.gz\fP.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dpkg-vendor.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-vendor.1
--- dpkg/man/sv/dpkg-vendor.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dpkg-vendor.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,61 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dpkg\-vendor 1 2011\-07\-04 Debianprojektet Dpkg\-sviten
+.SH NAMN
+dpkg\-vendor \- frgar efter information om distributionsterfrsljare
+.
+.SH SYNOPS
+\fBdpkg\-vendor\fP [\fIflaggor\fP...] \fItgrd\fP
+.
+.SH BESKRIVNING
+\fBdpkg\-vendor\fP r ett verktyg fr att frga efter terfrsljare som finns i
+\fI/etc/dpkg/origins\fP. \fB/etc/dpkg/origins/default\fP innehller information om
+den aktuella terfrsljaren.
+.
+.SH KOMMANDON
+.TP 
+\fB\-\-is\fP\fI terfrsljare\fP
+Avslutar med \fB0\fP om den aktuella terfrsljaren r \fIterfrsljare\fP. I
+annat fall avslutas programmet med icke\-noll.
+.TP 
+\fB\-\-derives\-from\fP\fI terfrsljare\fP
+Avslutar med \fB0\fP om den aktuella terfrsljardistributionen r hrledd
+frn \fIterfrsljare\fP. I annat fall avslutas programmet med
+icke\-noll. Anvnder fltet "Parent" fr att blddra genom alla frldrar
+till den aktuella terfrsljaren.
+.TP 
+\fB\-\-query\fP \fIflt\fP
+Skriver vrdet fr det terfrsljarspecifika fltet \fIflt\fP fr den
+aktuella terfrsljaren p standard ut.
+.TP 
+\fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH FLAGGOR
+.TP 
+\fB\-\-vendor\fP\fI terfrsljare\fP
+Anta att den aktuella terfrsljaren r \fIterfrsljare\fP istllet fr att
+upptcka det via miljvariabeln \fBDEB_VENDOR\fP eller
+\fB/etc/dpkg/origins/default\fP.
+.
+.SH MILJVARIABLER
+.TP 
+\fBDEB_VENDOR\fP
+Instllningen anger den aktuella terfrsljaren. Om den inte r satt kommer
+terfrsljaren att identifieras genom att lsa
+\fB/etc/dpkg/origins/default\fP.
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  2009 Raphal Hertzog
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dselect.1 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dselect.1
--- dpkg/man/sv/dselect.1	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dselect.1	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,442 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dselect 1 2011\-08\-14 Debianprojektet Debian
+.SH NAMN
+dselect \- Debians pakethanteringsskal
+.
+.SH SYNOPS
+\fBdselect\fP [\fIflagga\fP...] [\fItgrd\fP]
+.
+.SH BESKRIVNING
+\fBdselect\fP
+r ett av det primra anvndargrnssnitten fr att hantera paket p ett
+Debiansystem. I \fBdselect\fPs huvudmeny kan systemadministratren:
+ \- Uppdatera listan ver tillgngliga paketversioner,
+ \- Visa status fr installerade och tillgngliga paket,
+ \- ndra paketval och hantera beroenden,
+ \- Installera nya paket eller uppgradera till nyare versioner.
+.PP
+\fBdselect\fP arbetar som ett skal runt \fBdpkg\fP(1), Debians
+lgnivpakethanteringsverktyg. Det har en fullskrmspaketvalshanterare som
+hanterar beroenden och konflikter mellan paket. Nr det krs med
+administratrsbehrighet kan paket installeras, uppgraderas och tas
+bort. Olika tkomstmetoder kan konfigureras fr att hmta tillgnglig
+information om paketversioner och installerbara paket frn
+paketsamlingar. Beroende p tkomstmetoden kan dessa samlingar vara ppna
+arkivservrar p Internet, lokala arkivservrar eller finnas p cd\-rom. Den
+rekommenderade tkomstmetoden r \fIapt\fP, vilken tillhandahlls av paketet
+\fBapt\fP.
+.PP
+Vanligtvis anropas \fBdselect\fP utan parametrar. En interaktiv meny visas d,
+vilken ger anvndaren ett antal handlingsmjligheter. Om en handling ges som
+kommandoradsflagga startas denna med en gng. Flera kommandoradsflaggor
+finns nd att tillg fr att frndra hur \fBdselect\fP arbetar eller fr att
+visa ytterligare information om programmet.
+.
+.SH FLAGGOR
+Alla flaggorna kan ges bde p kommandoraden och i \fBdselect\fPs
+konfigurationsfil \fI/etc/dpkg/dselect.cfg\fP eller filerna i
+konfigurationskatalogen \fI/etc/dpkg/dpkg.cfg.d/\fP. En rad i
+konfigurationsfilen r antingen en flagga (precis samma som p
+kommandoraden, men utan inledande bindestreck) eller en kommentar (om den
+brjar med ett \fB#\fP).
+.br
+.TP 
+\fB\-\-admindir\fP\fI katalog\fP
+ndrar namnet p katalogen dr dpkg letar efter filerna "status",
+"available" m.fl. Frval r \fI/var/lib/dpkg\fP och du br normalt sett inte
+behva ndra det.
+.TP 
+\fB\-\-debug\fP\fI fil \fP|\fI \fP\fB\-D\fP\fIfil\fP
+Sl p felskningslge. Felskningsinformation lagras i \fIfil\fP.
+.TP 
+\fB\-\-expert\fP
+Slr p expertlge, dvs. visar inte hjlpmeddelanden som kanske kan vara
+irriterande.
+.TP 
+\fB\-\-colour\fP|\fB\-\-color\fP \fIskrmdel\fP:[\fIfrgrund\fP],[\fIbakgrund\fP][\fI:attr\fP[\fI+attr+..\fP]]
+Stller in skrmfrger. Detta fungerar bara om din skrm kan visa
+frger. Flaggan kan anvndas flera gnger (och fungerar bst i
+\fIdselect.cfg\fP). Varje anvndning ndrar frgen (och kanske andra attribut)
+fr en del av skrmen. Skrmdelarna r, uppifrn och ner:
+.RS
+.TP 
+\fBtitle\fP
+Skrmtiteln.
+.TP 
+\fBlisthead\fP
+Huvudraden ovanfr paketlistan.
+.TP 
+\fBlist\fP
+Den rullande paketlistan (och ven viss hjlptext).
+.TP 
+\fBlistsel\fP
+Den valda posten i listan.
+.TP 
+\fBpkgstate\fP
+I listan ver paket r det hr texten som anger aktuellt tillstnd fr varje
+paket.
+.TP 
+\fBpkgstatesel\fP
+I listan ver paket r det hr texten som anger aktuellt tillstnd fr det
+nu markerade paketet.
+.TP 
+\fBinfohead\fP
+Huvudraden som visar information om tillstndet fr det nu markerade
+paketet.
+.TP 
+\fBinfodesc\fP
+Paketets korta beskrivning.
+.TP 
+\fBinfo\fP
+Anvnds fr att visa paketinformation, ssom paketets beskrivning.
+.TP 
+\fBinfofoot\fP
+Den sista raden p skrmen nr paket vljs.
+.TP 
+\fBquery\fP
+Anvnds fr att visa frgor.
+.TP 
+\fBhelpscreen\fP
+Frg p hjlpskrmar.
+.RE
+.P
+Efter skrmdelen fljer ett kolon och frgangivelsen. Du kan ange antingen
+frgrundsfrgen, bakgrundsfrgen eller bda tv, vilka kommer att erstta de
+inkompilerade frgerna. Anvnd de normala curses\-namnen fr frgerna.
+.P
+Du kan ven ange ytterligare ett kolon efter frgangivelsen och dr ge
+attribut. Detta r en lista med ett eller flera attribut, avdelade med
+plustecken ("+"). Tillgngliga attribut r (alla fungerar inte p alla
+terminaler): normal, standout (uthvd), underline (understruken), reverse
+(omvnd), blink, bright (ljus), dim (mrk), bold (fet)
+.TP 
+\fB\-\-help\fP
+Visar en kort hjlptext och ger lyckat avslut.
+.TP 
+\fB\-\-version\fP
+Visar versionsinformation och ger lyckat avslut.
+.
+.SH TGRDER
+Nr \fBdselect\fP startas kan det utfra fljande tgrder, antingen direkt om
+de anges p kommandoraden eller genom att frga anvndaren med en meny om
+det krs interaktivt:
+.SS "Access (tkomst)"
+Vljer och konfigurerar en "tkomstmetod" fr att komma t paketsamlingen.
+.sp
+Som standard ger \fBdselect\fP flera olika metoder, ssom \fIcdrom\fP,
+\fImulti_cd\fP, \fInfs\fP, \fImulti_nfs\fP, \fIharddisk\fP, \fImounted\fP, \fImulti_mount\fP,
+\fIfloppy\fP och \fIftp\fP, men andra paket du installerar kan tillhandahlla
+ytterligare metoder, t.ex ges tkomstmetoden \fIapt\fP av paketet \fBapt\fP.
+.sp
+tkomstmetoden \fIapt\fP rekommenderas starkt.
+.sp
+.SS "Update (Uppdatera)"
+Uppdatera databasen med tillgngliga paket.
+.sp
+Hmtar en lista ver tillgngliga paket frn paketsamlingen som
+konfigurerats fr den aktuella tkomstmetoden, och uppdaterar dpkg:s
+databas. Paketlistor finns normalt p paketsamlingarna i filer vid namn
+\fBPackages\fP eller \fBPackages.gz\fP. Dessa filer kan genereras av de som
+underhller samlingarna genom att anvnda programmet
+\fBdpkg\-scanpackages(1)\fP.
+.sp
+Vilka detaljer som ges om uppdateringen beror p hur tkomstmetoden r
+implementerad. Normalt r processen sjlvfrklarande och behver ingen
+interaktion med anvndaren.
+.sp
+.SS "Select (Vlj)"
+Visar eller vljer paketval och beroenden.
+.sp
+Detta r \fBdselect\fPs huvudfunktion.  P valskrmen kan anvndaren titta p
+en lista ver samtliga tillgngliga och installerade paket. Nr det krs med
+administratrsbehrighet r det ven mjligt att interaktivt ndra paketets
+valstatus. \fBdselect\fP sprar vilken inverkning dessa ndringar fr p
+beroende eller motstridiga paket.
+.sp
+Nr en konflikt eller ett misslyckat beroende upptcks visas en delskrm med
+mjlighet att lsa beroendet. P denna skrm visas en lista ver motstridiga
+eller beroende paket, och fr varje paket som listas visas dess
+orsak. Anvndaren kan applicera de av \fBdselect\fP rekommenderade ndringarna,
+sjlv ndra dem, eller backa alla ndringar, inklusive de som gjorde att de
+ej hanterade beroendena eller konflikterna uppstod till att brja med.
+.sp
+Anvndningen av den interaktiva paketvalshanterarskrmen beskrivs i
+ytterligare detalj nedan.
+.sp
+.SS "Install (Installera)"
+Installerar valda paket.
+.sp
+Den valda tkomstmetoden hmtar installerbara eller uppgraderbara paket frn
+relevanta paketsamlingar och installerar dem med \fBdpkg\fP. Beroende p hur
+tkomstmetoden implementerats hmtas antingen alla paket innan
+installationen, eller s hmtas de nr s r ndvndigt. Ngra
+tkomstmetoder kommer ven ta bort paket som markerades fr borttagning.
+.sp
+Om ett fel uppstod under installationen r rekommenderas det vanligen att
+kra installationen p nytt. I de flesta fall kommer problemet frsvinna
+eller lsas. Om problemet kvarstr eller den installation som genomfrdes
+var felaktig, ber vi dig underska orsaken och omstndigheterna och
+rapportera ett fel i Debians felrapporteringssystem. Instruktioner om hur du
+gr det finns p http://bugs.debian.org/ eller genom att lsa
+dokumentationen fr \fBbug\fP(1) eller \fBreportbug\fP(1), om dessa r
+installerade.
+.sp
+Detaljerna fr hur installationen genomfrs beror p hur tkomstmetoden r
+implementerad. Uppmrksamhet och indata frn anvndaren kan behvas under
+installation, konfiguration eller borttagning av paket, beroende p hur
+utvecklarskripten i paketen ser ut. Vissa paket anvnder
+\fBdebconf\fP(1)\-biblioteket, vilket mjliggr mer flexibel, eller till och med
+automatiserad, installation och instllning.
+.sp
+.SS "Config (Konfigurera)"
+Konfigurera paket som tidigare installerats, men ej till fullo
+konfigurerats.
+.sp
+.SS "Remove (Radera)"
+Tar bort eller raderar helt installerade paket som markerats fr
+borttagning.
+.sp
+.SS "Quit (Avsluta)"
+Avslutar \fBdselect\fP
+.sp
+Avslutar dselect med felkod noll (lyckat).
+.sp
+.
+.SH Paketvalshantering
+.sp
+.SS Introduktion
+.sp
+\fBdselect\fP utstter direkt administratren fr delar av den komplexitet det
+innebr att hantera stora mngder paket med mnga inbrdes beroenden. Fr en
+anvndare som inte r nra frtrogen med koncepten och hur Debians
+pakethanteringssystem fungerar kan det te sig rtt s vervldigande. Trots
+att \fBdselect\fPs mlsttning r att frenkla administration och hantering av
+paket r det bara en del av helheten, och kan inte antas vara ett
+tillrckligt substitut fr administratrsfrdighet och
+\-frstelse. Anvndaren r tvungen att ha kunskap om det underliggande
+paketsystemet i Debian. Om tvivel freligger, konsultera manualsidan
+\fBdpkg\fP(1) och Debians policymanual.
+.sp
+S lnge inte \fBdselect\fP krs i expert\- eller direktlge visas en hjlpskrm
+frst nr val grs i menyn.  Anvndaren rekommenderas \fI det bestmdaste\fP
+att studera all information som finns i direkthjlpskrmarna nr de dyker
+upp. Direkthjlpskrmarna kan nr som helst ns via tangenten \fB"?"\fP.
+.sp
+.SS Skrmutseende
+.sp
+Valskrmen r normalt delat i en vre och en nedre halva. Den vre halvan
+visar en lista ver paket; en markeringsrad kan vlja paket individuellt
+eller i grupp (nr tillmpligt) genom att vlja en grupprubrik. Den nedre
+halvan av skrmen visar detaljer om det paket som just nu visas i den vre
+halvan. Vilken sorts detaljer som visas kan varieras.
+.sp
+Genom att trycka \fB"I"\fP vxlas vyn mellan en fullskrmsvisning av
+paketlistan, en frstorad vy fr paketdetaljer, eller en skrm med tv lika
+stora delar.
+.sp
+.SS Paketdetaljvy
+.sp
+Paketdetaljvyn visar normalt den utkade paketbeskrivningen fr det paket
+som just nu r markerat i paketvallistan.
+Vilken sorts detaljer som visas kan vxlas genom att trycka p \fB"i"\fP,
+vilken vxlar mellan:
+ \- den utkade beskrivningen
+ \- kontrollinformationen fr den installerade versionen
+ \- kontrollinformationen fr den tillgngliga versionen
+.sp
+I en beroendelsningsskrm r det ven mjligt att visa specifika
+otillfredsstllda beroenden eller konflikter fr paketet.
+.sp
+.SS Paketstatuslista
+.sp
+Huvudvalskrmen visar en lista ver samtliga paket som r knda fr Debians
+pakethanteringssystem, vilket inbegriper paket installerade p systemet och
+paket knda frn databasen ver tillgngliga paket.
+.sp
+Fr varje paket visar listan paketets status, prioritet, avdelning,
+installerade och tillgngliga versioner, paketets namn och dess korta
+beskrivning, allt p en rad. Genom att trycka p tangenten \fB"V"\fP sls
+visningen av den installerade och den aktiva versionen p och av. Genom att
+trycka p tangenten \fB"v"\fP vxlas paketstatusvisningen mellan ordrik och
+frkortad, med den frkortade visningen som frval.
+.sp
+Den frkortade statusindikeringen bestr av fyra delar: en felflagga, vilken
+normalt skall vara blank, aktuell status, senast vald status och nu vald
+status. De frsta tv anger paketets faktiska status, det andra paret
+beskriver valet som gjorts av anvndaren.
+.sp
+Detta r vad de olika paketstatusindikatorerna i det frkortade lget
+betyder:
+ Felflagga:
+  \fItom\fP     inget fel
+  \fBR\fP       allvarligt fel, krver ominstallation
+ Installerad status:
+  \fItom\fP     ej installerat
+  \fB*\fP       helt installerat och konfigurerat
+  \fB\-\fP       ej installerat, men konfigurationsfiler kan kvarst
+  \fBU\fP       uppackat men nnu ej konfigurerat
+  \fBC\fP       halvkonfigurerat (ett fel uppstod)
+  \fBI\fP       halvinstallerat (ett fel uppstod)
+ Aktuella och begrda val:
+  \fB*\fP       markerat fr installation eller uppgradering
+  \fB\-\fP       markerat fr borttagning, konfigurationsfiler lmnas kvar
+  \fB=\fP       hll: paketet kommer inte att rras alls
+  \fB_\fP       markerat fr borttagning, tar ven bort konfiguration
+  \fBn\fP       paketet r nytt och har nnu inte markerats
+.sp
+.SS "Markr\- och skrmrrelser"
+.sp
+Paketvallistan och beroendekonfliktslsningnskrmarna kan navigeras genom
+att anvnda rrelsekommandon kopplade till fljande tangenter:
+.br
+  \fBp, Upp, k\fP           flytta markeringsrad upp
+  \fBn, Ned, j\fP           flytta markeringsrad ned
+  \fBP, Pgup, Baksteg\fP    rulla lista 1 sida upp
+  \fBN, Pgdn, Mellanslag\fP rulla lista 1 sida ned
+  \fB^p\fP                  rulla lista 1 rad upp
+  \fB^n\fP                  rulla lista 1 rad ned
+  \fBt, Home\fP             hoppa till listans brjan
+  \fBe, End\fP              hoppa till listans slut
+  \fBu\fP                   rulla info 1 sida upp
+  \fBd\fP                   rulla info 1 sida ned
+  \fB^u\fP                  rulla info 1 rad upp
+  \fB^d\fP                  rulla info 1 rad ned
+  \fBB, Vnsterpil\fP       panorera vy 1/3 skrm vnster
+  \fBF, Hgerpil\fP         panorera vy 1/3 skrm hger
+  \fB^b\fP                  panorera vy 1 tecken vnster
+  \fB^f\fP                  panorera vy 1 tecken hger
+.sp
+.SS "Skning och sortering"
+.sp
+Det gr att ska i paketlistan efter paketnamn. Detta grs genom att trycka
+\fB"/"\fP och ange en enkel skstrng. Strngen tolkas som ett reguljrt
+uttryck enligt \fBregex\fP(7). Om du lgger till \fB"/d"\fP till skuttrycket
+kommer dselect ven ska beskrivningar. Om du lgger till \fB"/i"\fP kommer
+skningen att ignorera skillnader mellan gemener och versaler. Du kan
+kombinera dessa bda suffix s hr: \fB"/id"\fP. Skningen kan upprepas genom
+att trycka p \fB"n"\fP eller \fB"\e"\fP tills det nskade paketet hittas. Om
+skningen nr slutet p listan hoppar den till brjan och fortstter
+skningen drifrn.
+.sp
+Listans sorteringsordning kan ndras genom att trycka p tangenterna
+\fB"o"\fP och \fB"O"\fP upprepade gnger.
+Fljande nio sorteringsordningar kan vljas:
+ alfabetisk         tillgnglig            status
+ prioritet+sektion  tillgnglig+prioritet  status+prioritet
+ sektion+prioritet  tillgnglig+sektion    status+sektion
+.br
+Nr det inte anges explicit ovan anvnds alfabetisk ordning som den slutliga
+sorteringsnyckeln.
+.sp
+.SS "ndra val"
+.sp
+Den begrda valstatusen fr varje individuellt paket kan ndras med fljande
+kommandon:
+  \fB+, Insert\fP    installera eller uppgradera
+  \fB=, H\fP         hll i aktuellt tillstnd och version
+  \fB:, G\fP         avbryt hll: uppgradera eller lmna oinstallerad
+  \fB\-, Delete\fP    ta bort, men lmna kvar konfiguration
+  \fB_\fP            ta bort och radera konfiguration
+.sp
+Nr ndringar som fr en eller flera otillfredsstllda beroenden eller
+konflikter till fljd grs, frgar \fBdselect\fP anvndaren med en
+beroendelsningsskrm, vilken beskrivs ytterligare nedan.
+.sp
+Det r ven mjligt att applicera dessa kommandon p grupper av paketval,
+genom att peka markeringsraden p en grupprubrik. Exakt hur paketen
+grupperas beror p vilken listordning som fr tillfllet anvnds.
+.sp
+Ndvndiga frsiktighetstgrder br tas nr ndringar grs p stora
+gruppmarkeringar, eftersom det med en gng kan ge stora mngder
+otillfredsstllda beroenden eller konflikter, vilka alla kommer att visas p
+en beroendelsningsskrm, vilket gr dem mycket svra att hantera. I
+praktiken r bara hll\-kommandot och dess motsats anvndbara p grupper.
+.sp
+.SS "Lsa beroenden och konflikter"
+.sp
+Nr ndringar som fr en eller flera otillfredsstllda beroenden eller
+konflikter till fljd grs, frgar \fBdselect\fP anvndaren med en
+beroendelsningsskrm. Frst visas dock en informativ hjlpskrm.
+.sp
+vre halvan av skrmen listar alla paket som har otillfredsstllda beroenden
+eller konflikter som ett resultat av ndringen som efterfrgas, samt alla
+paket vars installation kan lsa ngot av dessa beroenden, eller vars
+borttagning kan lsa ngon av konflikterna. Den nedre halvan visar som
+frval de beroenden eller konflikter som leder till att det markerade
+paketet listas.
+.sp
+Redan d paketunderlistan frn brjan visas kan \fBdselect\fP ha satt
+efterfrgad valstatus fr ngra av de listade paketen, fr att lsa de
+beroenden eller konflikter som fick beroendelsningsskrmen att visas. Det
+r oftast bst att flja upp de frslag \fBdselect\fP ger.
+.sp
+De listade paketens valstatus kan terstllas till ursprungsinstllningarna,
+ssom de var innan de otillfredsstllda beroendena eller konflikterna
+skapades, genom att trycka p tangenten \fB"R"\fP. Genom att trycka p \fB"D"\fP
+terstlls de freslagna lsningarna, men ndringen som fick skrmen att
+visas behlls i den status de valdes. Slutligen, genom att trycka \fB"U"\fP
+terstlls valen terigen till de automatiskt freslagna vrdena.
+.sp
+.SS "Bekrfta de efterfrgade valen"
+.sp
+Genom att trycka \fBEnter\fP godtas den vid tillfllet instllda uppsttningen
+val. Om \fBdselect\fP inte upptcker ngra otillfredsstllda beroenden som
+fljd av de efterfrgade valen kommer de nya valen att lagras. Om det
+dremot finns ngra otillfredsstllda beroenden kommer \fBdselect\fP terigen
+g till beroendelsningsskrmen.
+.sp
+Fr att ndra en uppsttning val som skapar otillfredsstllda beroenden
+eller konflikter, och tvinga \fBdselect\fP att godta dem trycker du p
+\fB"Q"\fP\-tangenten. Detta stller ovillkorligen in de val anvndaren gjort,
+vilket vanligtvis inte br gras om man inte har lst det finstilta.
+.sp
+Motsatt effekt, att backa ut frn valndringar och terg till fregende
+vallista, kan fs genom att trycka p tangenterna \fB"X"\fP eller
+\fBEscape\fP. Genom att upprepade gnger trycka dessa tangenter, kan eventuella
+skadliga paketval backas ut helt och hllet fr att terg till senast
+etablerade instllningar.
+.sp
+Om du av misstag vljer ngra instllningar och vill terstlla alla val
+till det som fr nrvarande r installerat p systemet trycker du p knappen
+\fB"C"\fP. Det motsvarar p ett ungefr att anvnda kommandot "avbryt hll" p
+alla paket, men det ger en tydligare panikknapp om anvndaren av misstag
+tryckte p \fBEnter\fP.
+.sp
+.
+.SH MILJVARIABLER
+.TP 
+\fBHOME\fP
+Om satt kommer \fBdselect\fP att anvnda det som katalogen frn vilket den
+anvndarspecifika konfigurationsfilen skall lsas.
+.
+.SH PROGRAMFEL
+Paketvalsgrnssnittet i \fBdselect\fP r frvirrande fr en del nya
+anvndare. Det har rapporterats att det till och med kan f erfarna
+utvecklare av krnan att grta.
+.sp
+Dokumentationen har brister.
+.sp
+Det finns inget hjlpalternativ i huvudmenyn.
+.sp
+Den synliga listan med tillgngliga paket kan inte frminskas.
+.sp
+De inbyggda tkomstmetoderna kan inte lngre n nuvarande
+kvalitetsstandard. Anvnd tkomstmetoden som ges av apt, den r inte bara
+inte trasig, utan ven mycket flexiblare n de inbyggda tkomstmetoderna.
+.
+.SH "SE VEN"
+\fBdpkg\fP(1), \fBapt\-get\fP(8), \fBsources.list\fP(5), \fBdeb\fP(5).
+.
+.SH FRFATTARE
+\fBdselect\fP skrevs av Ian Jackson (ijackson@gnu.ai.mit.edu). En komplett
+lista ver bidragslmnare fr du med "dselect \-\-version".
+.br
+Manualsidan skrevs av Juho Vuori <javuori@cc.helsinki.fi>, Josip
+Rodin och Joost Kooij.
+
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/dselect.cfg.5 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dselect.cfg.5
--- dpkg/man/sv/dselect.cfg.5	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/dselect.cfg.5	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,31 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH dselect.cfg 5 2011\-07\-03 Debianprojektet Dpkg\-sviten
+.SH NAMN
+dselect.cfg \- instllningsfil fr dselect
+.
+.SH BESKRIVNING
+Filen innehller frvalda instllningar fr dselect. Varje rad bestr av en
+ensam flagga som r exakt densamma som en normal kommandoradsflagga fr
+dselect, frutom de inledande bindestrecken vilka inte anvnds
+hr. Citattecken runt flaggvrden tas bort. Kommentarer r tilltna genom
+att inleda en rad med nummertecken ("\fB#\fP").
+.
+.SH FILER
+\fI/etc/dpkg/dselect.cfg.d/[0\-9a\-zA\-Z_\-]*\fP
+.br
+\fI/etc/dpkg/dselect.cfg\fP
+.br
+\fI~/.dselect.cfg\fP
+.
+.SH FRFATTARE
+Se \fB/usr/share/doc/dpkg/THANKS\fP fr listan ver personer som har bidragit
+till \fBdselect\fP .
+.
+.SH "SE VEN"
+\fBdselect\fP(1).
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/start-stop-daemon.8 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/start-stop-daemon.8
--- dpkg/man/sv/start-stop-daemon.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/start-stop-daemon.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,240 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH start\-stop\-daemon 8 2011\-07\-04 Debianprojektet dpkg\-verktygen
+.SH NAMN
+start\-stop\-daemon \- startar och stoppar bakgrundsprocesser
+.
+.SH SYNOPS
+\fBstart\-stop\-daemon\fP [\fIflagga\fP...] \fItgrd\fP
+.
+.SH BESKRIVNING
+\fBstart\-stop\-daemon\fP anvnds fr att kontrollera hur processer p systemniv
+skapas och avslutas. Med hjlp av en av skflaggorna kan
+\fBstart\-stop\-daemon\fP stllas in att hitta befintliga instanser av en krande
+process.
+.PP
+Observera att om inte \fB\-\-pidfile\fP anges kommer \fBstart\-stop\-daemon\fP att
+jobba p ett stt som liknar \fBkillall(1).\fP \fBstart\-stop\-daemon\fP kommer att
+ska i processtabellen efter processer med motsvarande namn p processen,
+anvndar\-id och/eller grupp\-id (om sdant anges). Alla processer som stmmer
+verens kommer tillsndas signalen TERM (eller den som anges med \fB\-\-signal\fP
+eller \fB\-\-retry\fP) om \fB\-\-stop\fP anges. Fr processer som har lnglivade barn
+som mste verleva en \fB\-\-stop\fP, mste du ange en pidfil.
+.
+.SH KOMMANDON
+.TP 
+\fB\-S\fP, \fB\-\-start\fP [\fB\-\-\fP] \fIargument\fP
+Se om en angiven process existerar, och om s r fallet gr
+\fBstart\-stop\-daemon\fP ingenting och avslutar med status 1 (0 om \fB\-\-oknodo\fP
+anges). Om en sdan process inte existerar startas en instans, antingen med
+programfilen som anges med \fB\-\-exec\fP eller, om den anges, med
+\fB\-\-startas\fP. Eventuella argument som ges efter \fB\-\-\fP p kommandoraden
+skickas utan ndring till programmet som startas.
+.TP 
+\fB\-K\fP, \fB\-\-stop\fP
+Testa om den angivna processen existerar. Om s r fallet snder
+\fBstart\-stop\-daemon\fP den signal som anges av \fB\-\-signal\fP till processen, och
+avslutar med status 0. Om processen inte finns avslutar \fBstart\-stop\-daemon\fP
+med status 1 (0 om \fB\-\-oknodo\fP anges). Om \fB\-\-retry\fP anges kommer
+\fBstart\-stop\-daemon\fP kontrollera att processen har avslutats.
+.TP 
+\fB\-T\fP, \fB\-\-status\fP
+Se om den angivna processen existerar, och returnerar en statuskod i
+enlighet med LBS Init Script Actions.
+.TP 
+\fB\-H\fP, \fB\-\-help\fP
+Visa hjlpskrm och avsluta.
+.TP 
+\fB\-V\fP, \fB\-\-version\fP
+Visa programversion och avsluta.
+.
+.SH "FLAGGOR FR SKNING"
+.TP 
+\fB\-p\fP, \fB\-\-pidfile\fP \fIpidfil\fP
+Sk efter processer vars process\-id anges i \fIpidfil\fP.
+.TP 
+\fB\-x\fP, \fB\-\-exec\fP \fIprogramfil\fP
+Sk efter processer som r instanser av programfilen (enligt
+\fB/proc/\fP\fIpid\fP\fB/exe\fP).
+.TP 
+\fB\-n\fP, \fB\-\-name\fP \fIprocessnamn\fP
+Sk efter processer med namnet \fIprocessnamn\fP (enligt
+\fB/proc/\fP\fIpid\fP\fB/stat\fP).
+.TP 
+\fB\-u\fP, \fB\-\-user\fP \fIanvndarnamn\fP|\fIanvndar\-id\fP
+Sk efter processer som gs av den anvndare som anges med \fIanvndarnamn\fP
+eller \fIanvndar\-id\fP.
+.
+.SH FLAGGOR
+.TP 
+\fB\-g\fP, \fB\-\-group\fP \fIgrupp\fP|\fIgrupp\-id\fP
+Byt till \fIgrupp\fP eller \fIgrupp\-id\fP nr processen startas.
+.TP 
+\fB\-s\fP, \fB\-\-signal\fP \fIsignal\fP
+Tillsammans med \fB\-\-stop\fP anger detta den signal som skall sndas till
+processen som stoppas (frval r TERM).
+.TP 
+\fB\-R\fP, \fB\-\-retry\fP \fItidsgrns\fP|\fIschema\fP
+Tillsammans med \fB\-\-stop\fP anger detta att \fBstart\-stop\-daemon\fP skall
+kontrollera att processen avslutas. Den testar flera gnger efter matchande
+processer som krs, tills ingen lngre finns kvar. Om processerna inte
+avslutar kommer programmet utfra ytterligare kommandon enligt schemat.
+
+Om \fItidsgrns\fP anges istllet fr \fIschema\fP kommer schemat
+\fIsignal\fP\fB/\fP\fItimeout\fP\fB/KILL/\fP\fItimeout\fP att anvndas, dr \fIsignal\fP r
+den signal som anges med \fB\-\-signal\fP.
+
+\fIschema\fP r den lista med tminstone tv poster avdelade med snedstreck
+(\fB/\fP); varje post r antingen \fB\-\fP\fIsignalnummer\fP eller
+[\fB\-\fP]\fIsignalnamn\fP, vilket betyder att signalen skall sndas, eller
+\fItimeout\fP, vilket anger det antal sekunder programmet skall vnta p att
+processen avslutar, eller \fBforever\fP, vilket betyder att resten av schemat
+skall repetera fr evigt om s behvs.
+
+Om slutet p schemat ns och \fBforever\fP inte anges kommer
+\fBstart\-stop\-daemon\fP avslutas med felkod 2. Om ett schema anges kommer
+eventuell signal angiven med \fB\-\-signal\fP att ignoreras.
+.TP 
+\fB\-a\fP, \fB\-\-startas\fP \fIskvg\fP
+Tillsammans med \fB\-\-start\fP anger detta att processen som anges med \fIskvg\fP
+skall startas. Om den inte anges anvnds argumentet som gavs till \fB\-\-exec\fP.
+.TP 
+\fB\-t\fP, \fB\-\-test\fP
+Skriver ut vad som skulle ha utfrts och stter returvrdet, men utfr
+ingenting.
+.TP 
+\fB\-o\fP, \fB\-\-oknodo\fP
+Returnerar felstatus 0 i stllet fr 1 om ingen tgrd utfrs/skulle
+utfrts.
+.TP 
+\fB\-q\fP, \fB\-\-quiet\fP
+Skriv inte informationsmeddelanden; visa endast felmeddelanden.
+.TP 
+\fB\-c\fP, \fB\-\-chuid\fP \fIusername\fP|\fIuid\fP[\fB:\fP\fIgroup\fP|\fIgid\fP]
+Byt till anvndarnamnet/anvndar\-id:t innan processen startas. Du kan ven
+ange en grupp genom att lgga till ett kolontecken, \fB:\fP, fljt av
+gruppnamnet eller grupp\-id p samma stt som du skull gjort till
+"chown"\-kommandot (\fIanvndare\fP\fB:\fP\fIgrupp\fP). Om du anger en anvndare utan
+att ange en grupp kommer anvndarens primra grupp\-id att anvndas. Nr du
+anvnder alternativet mste du ha i tanke att ven bde primr\- och
+tillggsgrupp stts, ven om \fB\-\-group\fP\-flaggan inte
+anges. \fB\-\-group\fP\-flaggan r bara till fr grupper som anvndaren normalt
+inte r en medlem i (t.ex fr att lgga till gruppmedlemskap fr enskilda
+processer fr standardanvndare ssom \fBnobody\fP).
+.TP 
+\fB\-r\fP, \fB\-\-chroot\fP \fIrot\fP
+Byt katalog och rot till \fBrot\fP innan processen startas. Observera att ven
+pidfilen skrivs efter chroot har utfrts.
+.TP 
+\fB\-d\fP, \fB\-\-chdir\fP \fIskvg\fP
+Byt katalog till \fIskvg\fP innan processen startas. Detta grs efter byte av
+rot om \fB\-r\fP|\fB\-\-chroot\fP\-flaggan anges. Om flaggan inte anges kommer
+start\-stop\-daemon byta till rotkatalogen innan processen startas.
+.TP 
+\fB\-b\fP, \fB\-\-background\fP
+Anvnds typiskt med program som inte kopplar loss sig av sig sjlva. Flagga
+tvingar \fBstart\-stop\-daemon\fP att frgrena sig (fork) innan processen
+startar, och tvinga den grenen att kra i bakgrunden. \fBVARNING:
+start\-stop\-daemon\fP kan inte kontrollera felstatus fr processer som av
+\fBngon som helst\fP anledning misslyckas med att exekvera. Detta r en sista
+utvg, och r endast avsett fr program som det antingen inte r ngon
+mening att frgrena p egen hand, eller dr det inte r mjligt att lgga
+till kod fr det p egen hand.
+.TP 
+\fB\-N\fP, \fB\-\-nicelevel\fP \fIheltal\fP
+ndrar prioriteten p processen innan den startas.
+.TP 
+\fB\-P\fP, \fB\-\-procsched\fP \fIpolicy\fP\fB:\fP\fIprioritet\fP
+ndrar processschemalggarens policy och prioritet fr processen innan den
+startas. Prioriteten r valfri och anges genom att lgga till ett \fB:\fP fljt
+av vrdet. Standardvrdet fr \fIprioritet\fP r 0. Fr nrvarande stds
+vrdena \fBother\fP, \fBfifo\fP och \fBrr\fP fr \fIpolicy\fP.
+.TP 
+\fB\-I\fP, \fB\-\-iosched\fP \fIklass\fP\fB:\fP\fIprioritet\fP
+ndrar I/O\-schemalggarens klass och \-prioritet fr processen innan den
+startas. Prioriteten r valfri och anges genom att lgga till ett \fB:\fP fljt
+av vrdet. Standardvrdet fr \fIprioritet\fP r 4, svida inte \fIklass\fP r
+\fBidle\fP, d r \fIprioritet\fP alltid 7. Fr nrvarande stds vrdena \fBidle\fP,
+\fBbest\-effort\fP och \fBreal\-time\fP fr \fIklass\fP.
+.TP 
+\fB\-k\fP, \fB\-\-umask\fP \fImaskvrde\fP
+Stller in umaskvrdet p processen innan den startas.
+.TP 
+\fB\-m\fP, \fB\-\-make\-pidfile\fP
+Anvnds nr ett program som inte skapar sin egen pidfil startas. Flaggan
+kommer att f \fBstart\-stop\-daemon\fP att skapa filen som anges med
+\fB\-\-pidfile\fP och lgga process\-id i den precis innan processen
+startas. Observera att den inte kommer att tas bort nr programmet
+stoppas. \fBOBSERVERA:\fP Funktionen kanske inte alltid fungerar. Framfrallt
+inte nr programmet som startas frgrenar sig (fork) frn sin
+huvudprocess. Drfr r flaggan oftast bara anvndbar i samband med flaggan
+\fB\-\-background\fP.
+.TP 
+\fB\-v\fP, \fB\-\-verbose\fP
+Skriv ut pratsamma informationsmeddelanden.
+.
+.SH RETURVRDE
+.TP 
+\fB0\fP
+Efterfrgad tgrd utfrdes. Om \fB\-\-oknodo\fP angavs r det ven mjligt att
+ingenting behvde utfras. Det kan hnda nr \fB\-\-start\fP angavs och en
+motsvarande process redan krde, eller nr \fB\-\-stop\fP angavs och det inte
+fanns ngon motsvarande process.
+.TP 
+\fB1\fP
+Om \fB\-\-oknodo\fP inte angavs och ingenting gjordes.
+.TP 
+\fB2\fP
+Om \fB\-\-stop\fP och \fB\-\-retry\fP angavs, men slutet p tidtabellen nddes och
+processen fortfarande krdes.
+.TP 
+\fB3\fP
+Alla andra fel.
+.PP
+Med \fB\-\-status\fP\-tgrden returneras fljande statuskoder:
+.TP 
+\fB0\fP
+Programmet kr.
+.TP 
+\fB1\fP
+Programmet kr inte och pid\-filen finns.
+.TP 
+\fB3\fP
+Programmet kr inte.
+.TP 
+\fB4\fP
+Kan inte ta reda p programmets status.
+.
+.SH EXEMPEL
+Starta serverprocessen \fBfood\fP, svida inte en redan kr (en process med
+namnet food, som krs som anvndaren food, med process\-id i food.pid):
+.IP
+.nf
+start\-stop\-daemon \-\-start \-\-oknodo \-\-user food \-\-name food \-\-pidfile /var/run/food.pid \-\-startas /usr/sbin/food \-\-chuid food \-\- \-\-daemon
+.fi
+.PP
+Snd \fBSIGTERM\fP till \fBfood\fP och vnta upp till fem sekunder p att den
+skall avslutas:
+.IP
+.nf
+start\-stop\-daemon \-\-stop \-\-oknodo \-\-user food \-\-name food \-\-pidfile /var/run/food.pid \-\-retry 5
+.fi
+.PP
+Demonstration av ett skrddarsytt schema fr att avsluta \fBfood\fP:
+.IP
+.nf
+start\-stop\-daemon \-\-stop \-\-oknodo \-\-user food \-\-name food \-\-pidfile /var/run/food.pid \-\-retry=TERM/30/KILL/5
+.fi
+.PP
+.
+.SH FRFATTARE
+Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>, baserat p
+en tidigare version av Ian Jackson <ian@chiark.greenend.org.uk>.
+
+Manualsida av Klee Dienes <klee@mit.edu>, delvis omformaterad av Ian
+Jackson, versatt av Peter Krefting <peterk@debian.org>.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/sv/update-alternatives.8 /home/vorlon/devel/multiarch/dpkg-debian/man/sv/update-alternatives.8
--- dpkg/man/sv/update-alternatives.8	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/sv/update-alternatives.8	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,409 @@
+.\" update\-alternatives.8
+.\" This man page is copyright 1997 Charles Briscoe-Smith
+.\" This is free documentation; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published
+.\" by the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.  There is NO WARRANTY.  You can
+.\" find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH update\-alternatives 8 2011\-08\-14 Debianprojektet dpkg\-verktygen
+.SH NAMN
+update\-alternatives \- underhller symboliska lnkar fr att bestmma
+standardkommandon
+.
+.SH SYNOPS
+\fBupdate\-alternatives\fP [\fIflagga\fP...] \fItgrd\fP
+.
+.SH BESKRIVNING
+\fBupdate\-alternatives\fP skapar, tar bort, underhller och visar information
+om de symboliska lnkar som ingr i Debians alternativsystem.
+.PP
+Det r mjligt fr flera kommandon som tillhandahller identisk eller
+liknande funktionalitet att vara installerade p ett system samtidigt. Till
+exempel har mnga system flera textredigeringsprogram installerade
+samtidigt, vilket ger anvndarna p systemet valmjligheter, var och en kan
+anvnda olika textredigeringsprogram om de s nskar, men det gr det svrt
+fr ett program att gra ett bra val av textredigerare att anropa om en
+anvndare inte har gjort ett specifikt val.
+.PP
+Debians alternativsystem frsker lsa detta problem. Ett generiskt namn i
+filsystemet delas av alla filer som tillhandahller utbytbar
+funktionalitet. Alternativsystemet och systemadministratren anger
+tillsammans vilken specifik fil som skall refereras av sitt generiska
+namn. Till exempel kan alternativsystemet lta det generiska namnet
+\fI/usr/bin/editor\fP att peka mot \fI/usr/bin/nvi\fP som standard om bde
+textredigeringsprogrammet \fBed\fP(1) och \fBnvi\fP(1) bda r installerade p
+systemet. Systemadministratren kan verstyra detta och lta det peka p
+\fI/usr/bin/ed\fP istllet, och alternativsystemet kommer inte ndra denna
+instllning frrn det ombeds att gra det.
+.PP
+Det generiska namnet r inte en direkt symbolisk lnk till det valda
+alternativet. Istllet r det en symbolisk lnk till ett namn i katalogen
+\fIalternatives\fP, vilket i sin tur r en symbolisk lnk till den faktiska fil
+det pekar mot. Detta grs s att systemadministratrens ndringar kan
+begrnsas till katalogen \fI/etc\fP: FHS (se detta) ger orsaker till varfr
+detta r Bra.
+.PP
+Nr ett paket som tillhandahller en fil med en specifik funktionalitet
+installeras, ndras eller tas bort, anropas \fBupdate\-alternatives\fP fr att
+uppdatera information om filen i alternativsystemet. \fBupdate\-alternatives\fP
+anropas normalt frn \fBpostinst\fP\- (configure) eller \fBprerm\fP\-skripten
+(install) i Debianpaket.
+.PP
+Det r ofta lmpligt fr ett antal alternativ att vara synkroniserade, s
+att de ndras i grupp. Till exempel, om det r flera versioner av
+textredigeraren \fBvi\fP(1) installerade br manualsidan som refereras till av
+\fI/usr/share/man/man1/vi.1\fP motsvara den binr som refereras till av
+\fI/usr/bin/vi\fP. \fBupdate\-alternatives\fP hanterar detta genom \fIhuvud\fP\- och
+\fIslav\fP\-lnkar. Nr huvudlnken uppdateras ndras ven anslutna
+slavlnkar. En huvudlnk och dess anslutna slavar utgr en \fIlnkgrupp\fP.
+.PP
+En lnkgrupp kan vid varje given tidpunkt vara i ett av tv lgen:
+automatisk eller manuell. Nr en grupp r i automatiskt lge kommer
+alternativsystemet automatiskt att bestmma nr och hur lnkar skall
+uppdateras d paket installeras eller tas bort. I manuellt lge kommer
+alternativsystemet att behlla administratrens val och undvika att ndra
+lnkarna (frutom om ngot r trasigt).
+.PP
+Lnkgrupper r i automatiskt lge nr de frst introduceras p systemet. Om
+systemadministratren gr ndringar till systemets automatiska instllningar
+kommer detta att noteras nsta gng \fBupdate\-alternatives\fP krs p den
+ndrade lnkens grupp och gruppen kommer automatiskt att vxlas till
+manuellt lge.
+.PP
+Varje alternativ har en \fIprioritet\fP kopplad till sig. Nr en lnkgrupp r i
+automatiskt lge kommer det alternativ som medlemmar i gruppen pekar mot
+vara den med den hgsta prioriteten.
+.PP
+Nr flaggan \fI\-\-config\fP anvnds kommer \fBupdate\-alternatives\fP att visa alla
+val fr lnkgruppen dr \fInamn\fP r huvudalternativnamnet. Det aktuella valet
+r markerat med en "*". Du kommer drefter att f vlja vad som skall gras
+med lnkgruppen. Beroende p vad du vljer kommer lngruppen inte lngre att
+vara i \fIauto\fP\-lge. Du mste anvnda flaggan \fB\-\-auto\fP fr att terg till
+automatiskt lge (eller kra \fB\-\-config\fP p nytt och vlja alternativet som
+mrkts som automatiskt).
+.PP
+Om du vill konfigurera icke\-interaktivt kan du anvnda flaggan \fB\-\-set\fP i
+stllet (se nedan).
+.PP
+Olika paket som tillhandahller samma fil mste gra s i
+\fBsamfrstnd\fP. Det betyder att det r ett \fBkrav\fP att alla involverade
+paket anvnder sig av \fBupdate\-alternatives\fP. Det r inte mjligt att
+verstyra en fil ett paket som inte anvnder
+\fBupdate\-alternatives\fP\-mekanismen.
+.
+.SH TERMINOLOGI
+Efter \fBupdate\-alternatives\fP aktiviteter r ganska komplexa blir det enklare
+att frst hur det fungerar genom att vi frklarar ngra specifika termer.
+.TP 
+generiskt namn (eller alternativlnk).
+Ett namn, till exempel \fI/usr/bin/editor\fP, som via alternativsystemet pekar
+p en av flera filer med liknande funktionalitet.
+.TP 
+alternativnamn
+Namnet p en symbolisk lnk i alternativkatalogen.
+.TP 
+alternativ (eller alternativskvg)
+Namnet p en specifik fil i filsystemet, som kan vara tillgnglig via ett
+generiskt namn med hjlp av alternativsystemet.
+.TP 
+alternativkatalog
+En katalog, som standard \fI/etc/alternatives\fP, som innehller de symboliska
+lnkarna.
+.TP 
+administrativ katalog
+En katalog, som standard \fI/var/lib/dpkg/alternatives\fP, som innehller
+tillstndsinformation fr \fBupdate\-alternatives\fP.
+.TP 
+lnkgrupp
+En uppsttning relaterade symboliska lnkar, avsedda att uppdateras som en
+grupp.
+.TP 
+huvudlnk
+Alternativlnken i en lnkgrupp som bestmmer hur de andra lnkarna i
+gruppen stlls in.
+.TP 
+slavlnk
+En alternativlnk i en lnkgrupp som styrs av hur huvudlnken stlls in.
+.TP 
+automatiskt lge
+Nr en lnkgrupp r i automatiskt lge frskrar alternativsystemet att
+lnkarna i gruppen pekar p det hgstprioriterade alternativet som r
+lmpligt fr gruppen.
+.TP 
+manuellt lge
+Nr en grupp r i manuellt lge kommer inte alternativsystemet att utfra
+ngra ndringar till systemadministratrens instllningar.
+.
+.SH KOMMANDON
+.TP 
+\fB\-\-install\fP \fIlnk namn skvg prioritet\fP [\fB\-\-slave\fP \fIlnk namn skvg\fP]...
+Lgg till en grupp med alternativ till systemet. \fIlnk\fP r det generiska
+namnet fr huvudlnken, \fInamn\fP r namnet p dess symboliska lnk i
+alternativkatalogen och \fIskvg\fP r alternativet som introduceras fr
+huvudlnken. Argumenten efter \fB\-\-slave\fP r det generiska namnet, namnet p
+den symboliska lnken i alternativkatalogen och alternativet fr
+slavlnken. Noll eller flera \fB\-\-slave\fP\-flaggor kan anges, dr alla fljs av
+tre argument. Observera att om ett slavalternativ inte finns kommer
+motsvarande slavlnk helt enkelt inte att installeras (en varning kommer
+fortfarande att visas). Om en verklig fil r installerad dr en
+alternativlnk mste installeras behlls den svida inte \fB\-\-force\fP anvnds.
+.IP
+Om det angivna alternativnamnet redan finns i alternativsystemets databas
+kommer informationen som anges att lggas in som en ny uppsttning av
+alternativ fr gruppen. Om inte kommer en ny grupp, instlld p automatiskt
+lge, att lggas till med given information. Om gruppen r i automatiskt
+lge och det alternativ som lggs in har hgre prioritet n alla andra
+installerade alternativ fr gruppen kommer de symboliska lnkarna att
+uppdateras s att de pekar p de nyligen tillagda alternativen.
+.TP 
+\fB\-\-set\fP \fInamn skvg\fP
+Stt programmet \fIskvg\fP som ett alternativ till \fInamn\fP. Detta motsvarar
+\fB\-\-config\fP men r icke\-interaktivt och kan drmed anvndas i ett skript.
+.TP 
+\fB\-\-remove\fP \fInamn skvg\fP
+Ta bort ett alternativ och alla dess anknutna slavlnkar. \fInamn\fP r ett
+namn i alternativkatalogen och \fIskvg\fP r ett absolut filnamn till vilket
+\fInamn\fP kunde lnkas. Om \fInamn\fP faktiskt r lnkat till \fIskvg\fP kommer
+\fInamn\fP att uppdateras till att peka p ett annat lmpligt alternativ (och
+gruppen stlls tillbaka till automatiskt lge), eller att tas bort om det
+inte finns ngot alternativ kvar. Anknutna slavlnkar kommer uppdateras
+eller tas bort p motsvarande vis. Om lnken inte fr tillfllet pekar p
+\fIskvg\fP kommer inga lnkar att uppdateras, endast informationen om
+alternativet tas bort.
+.TP 
+\fB\-\-remove\-all\fP \fInamn\fP
+Tar bort alla alternativ och alla deras anslutna slavlnkar. \fInamn\fP r ett
+namn i alternativkatalogen.
+.TP 
+\fB\-\-all\fP
+Anropar \fB\-\-config\fP p alla alternativ. Kan med framgng kombineras med
+\fB\-\-skip\-auto\fP fr att g igenom och konfigurera alla alternativ som inte r
+stllda i automatiskt lge. Trasiga alternativ visas ocks. Ett enkelt stt
+att fixa alla trasiga alternativ r drmed att anropa \fByes \[aq]\[aq] |
+update\-alternatives \-\-force \-\-all\fP.
+.TP 
+\fB\-\-auto\fP \fInamn\fP
+Stll in lnkgruppen bakom alternativet fr \fInamn\fP till automatiskt
+lge. Detta fr till fljd att den huvudsakliga symboliska lnken och dess
+slavar uppdateras till att peka p det hgst prioriterade installerade
+alternativet.
+.TP 
+\fB\-\-display\fP \fInamn\fP
+Visa information om lnkgruppen. Information som visas r gruppens lge
+(automatiskt eller manuellt), vilket alternativ den huvudsakliga lnken just
+nu pekar p, vilka andra alternativ som r tillgngliga (och deras
+motsvarande slavalternativ), samt det hgst prioriterade alternativ som fr
+nrvarande r installerat.
+.TP 
+\fB\-\-get\-selections\fP
+Visa alla huvudalternativnamn (de som styr en lnkgrupp) och deras
+status. Varje rad innehller upp till tre flt (avdelade med ett eller flera
+blanksteg). Det frsta fltet r alternativnamnet, det andra r status
+(antingen "auto" eller "manuell"), och det sista innehller det nuvarande
+valet fr alternativet (observera: detta r ett filnamn och kan drmed
+innehlla blanksteg).
+.TP 
+\fB\-\-set\-selections\fP
+Ls en alternativkonfiguration frn standard in p formatet som skapas av
+\fBupdate\-alternatives \-\-get\-selections\fP och konfigurera om dem p
+motsvarande stt.
+.TP 
+\fB\-\-query\fP \fInamn\fP
+Visa information om lnkgruppen p samma stt som \-\-display, men i ett
+maskintolkbart stt (se stycket \fBFRGEFORMAT\fP nedan).
+.TP 
+\fB\-\-list\fP \fInamn\fP
+Visar alla ml fr lnkgruppen.
+.TP 
+\fB\-\-config\fP \fInamn\fP
+Visa tillgngliga alternativ fr en lnkgrupp och lt anvndaren att
+interaktivt vlja vilken som skall anvndas. Lnkgruppen uppdateras.
+.TP 
+\fB\-\-help\fP
+Visar hjlpskrm och avslutar.
+.TP 
+\fB\-\-version\fP
+Visar version och avslutar.
+.
+.SH FLAGGOR
+.TP 
+\fB\-\-altdir\fP\fI katalog\fP
+Anger alternativkatalogen om detta inte skall vara standardvrdet.
+.TP 
+\fB\-\-admindir\fP\fI katalog\fP
+Anger den administrativa katalogen om detta inte skall vara standardvrdet.
+.TP 
+\fB\-\-log\fP \fIfil\fP
+Anger loggfilen, om det skall vara en annan n standard
+(/var/log/alternatives.log).
+.TP 
+\fB\-\-force\fP
+Lt \fBupdate\-alternatives\fP erstta eller ta bort en verklig fil som
+installerats dr en alternativlnk mste installeras eller tas bort.
+.TP 
+\fB\-\-skip\-auto\fP
+Hoppa ver konfigureringsfrgor fr alternativ som r korrekt konfigurerade
+i automatiskt lge. Denna flagga r endast relevant fr \fB\-\-config\fP och
+\fB\-\-all\fP.
+.TP 
+\fB\-\-verbose\fP
+Visa fler kommentarer om vad \fBupdate\-alternatives\fP gr.
+.TP 
+\fB\-\-quiet\fP
+Skriv inte ngra kommentarer svida det inte uppstr ett fel.
+.
+.SH MILJVARIABLER
+.TP 
+\fBDPKG_ADMINDIR\fP
+Om satt och flaggan \fB\-\-admindir\fP inte har angivits anvnds det som
+bas\-administrativ katalog.
+.
+.SH FILER
+.TP 
+\fI/etc/alternatives/\fP
+Den frvalda alternativkatalogen. Kan verstyras med flaggan \fB\-\-altdir\fP.
+.TP 
+\fI/var/lib/dpkg/alternatives/\fP
+Den frvalda administrativa katalogen. Kan verstyras med flaggan
+\fB\-\-admindir\fP.
+.
+.SH RETURVRDE
+.TP 
+\fB0\fP
+Den nskade funktionen utfrdes utan fel.
+.TP 
+\fB2\fP
+Problem uppstod vid tolkning av kommandoraden eller nr funktionen skulle
+utfras.
+.
+.SH FRGEFORMAT
+Formatet fr \fBupdate\-alternatives \-\-query\fP anvnder ett RFC822\-liknande
+platt format. Det bestr av \fIn\fP + 1 block dr \fIn\fP r antalet tillgngliga
+alternativ i den efterfrgade lnkgruppen. Det frsta blocket innehller
+fljande flt:
+.TP 
+\fBLink:\fP\fI lnk\fP
+Generiskt namn fr alternativet.
+.TP 
+\fBStatus:\fP\fI status\fP
+Status fr alternativet (\fBauto\fP eller \fBmanual\fP).
+.TP 
+\fBBest:\fP\fI bsta\-val\fP
+Skvgen till det bsta alternativet i lnkgruppen. Tas inte med om inget
+alternativ r tillgngligt.
+.TP 
+\fBValue:\fP\fI fr\-nrvarande\-valt\-alternativ\fP
+Skvgen till det fr nrvarande valda alternativet. Kan ven ta det magiska
+vrdet \fBnone\fP (inget). Det anvnds om det inte finns ngon lnk.
+.TP 
+.TP 
+vriga block beskriver tillgngliga alternativ i den efterfrgade lnkgruppen:
+.TP 
+\fBAlternative:\fP\fI skvg\-till\-alternativet\fP
+Skvg till alternativet som beskrivs i blocket.
+.TP 
+\fBPriority:\fP\fI prioritetsvrde\fP
+Vrdet fr prioriteten p alternativet.
+.TP 
+\fBSlaves:\fP\fI lista\-ver\-slavar\fP
+Nr denna rubrik r tillgnglig innehller \fBnext\fP\-raderna alla
+slavalternativ som kopplas till huvudlnken fr alternativet. Varje rad
+beskriver en slag. Varje rad innehller ett blanksteg, det generiska namnet
+p slavalternativet, ytterligare ett blanksteg, och skvgen till
+slavalternativet.
+.
+.TP 
+\fBExempel\fP
+.nf
+$ update\-alternatives \-\-query editor
+Link: editor
+Status: auto
+Best: /usr/bin/vim.gtk
+Value: /usr/bin/vim.gtk
+
+Alternative: /bin/ed
+Priority: \-100
+Slaves:
+ editor.1.gz /usr/share/man/man1/ed.1.gz
+
+Alternative: /usr/bin/vim.gtk
+Priority: 50
+Slaves:
+ editor.1.gz /usr/share/man/man1/vim.1.gz
+ editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz
+ editor.pl.ISO8859\-2.1.gz /usr/share/man/pl.ISO8859\-2/man1/vim.1.gz
+ editor.it.ISO8859\-1.1.gz /usr/share/man/it.ISO8859\-1/man1/vim.1.gz
+ editor.pl.UTF\-8.1.gz /usr/share/man/pl.UTF\-8/man1/vim.1.gz
+ editor.it.1.gz /usr/share/man/it/man1/vim.1.gz
+ editor.fr.UTF\-8.1.gz /usr/share/man/fr.UTF\-8/man1/vim.1.gz
+ editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz
+ editor.it.UTF\-8.1.gz /usr/share/man/it.UTF\-8/man1/vim.1.gz
+ editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz
+ editor.fr.ISO8859\-1.1.gz /usr/share/man/fr.ISO8859\-1/man1/vim.1.gz
+.fi
+.
+.SH DIAGNOSTIK
+Med \fB\-\-verbose\fP kommer \fBupdate\-alternatives\fP att beskriva i det ondliga
+vad det gr p sin standard ut\-kanal. Om ett fel uppstr skriver
+\fBupdate\-alternatives\fP ut felmeddelanden p sin standard fel\-kanal och
+avslutar med felkoden 2. Diagnostikinformationen br vara sjlvfrklarande,
+snd in en felrapport om du inte tycker att den r det.
+.
+.SH EXEMPEL
+Det r flera paket som tillhandahller en textredigerare kompatibel med
+\fBvi\fP, till exempel \fBnvi\fP och \fBvim\fP. Vilken bestms via lnkgruppen \fBvi\fP,
+vilken innehller lnkar bde fr sjlva programmet och dessa anknutna
+manualsida.
+.PP
+Fr att visa vilka tillgngliga paket som tillhandahller \fBvi\fP, samt dess
+aktuella instllning, anvnd kommandot \fB\-\-display\fP:
+.RS
+.PP
+\fBupdate\-alternatives \-\-display vi\fP
+.RE
+.PP
+Fr att vlja en specifik implementation av \fBvi\fP, utfr detta kommando som
+root och vlj sedan ett tal frn listan:
+.RS
+.PP
+\fBupdate\-alternatives \-\-config vi\fP
+.RE
+.PP
+Fr att terg till att \fBvi\fP\-implementationen vljs automatiskt, utfr
+detta som root:
+.RS
+.PP
+\fBupdate\-alternatives \-\-auto vi\fP
+.RE
+.
+.SH PROGRAMFEL
+Om du hittar ett fel ber vi dig rapportera det via Debians
+felrapporteringssystem.
+.PP
+Om du hittar ngra diskrepanser mellan vad \fBupdate\-alternatives\fP gr och
+vad som str i manualsidan s r detta ett fel, antingen i implementationen
+eller i dokumentationen; rapportera det.
+.
+.SH FRFATTARE
+Upphovsrttsskyddat  1995 Ian Jackson.
+.br
+Upphovsrttsskyddat  2009 Raphal Hertzog
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.PP
+Manualsidan r upphovsrttsskyddad  1997,1998 Charles Briscoe\-Smith med
+flera.
+.sp
+Detta r fri programvara; se GNU General Public License version 2 eller
+senare fr kopieringsvillkor. Det finns INGEN GARANTI.
+.
+.SH "SE VEN"
+\fBln\fP(1), FHS, Filesystem Hierarchy Standard.
+.SH "VERSTTNING"
+Peter Krefting och Daniel Nylander.
diff -uNr --exclude .git --exclude .bzr dpkg/man/update-alternatives.8 /home/vorlon/devel/multiarch/dpkg-debian/man/update-alternatives.8
--- dpkg/man/update-alternatives.8	2011-06-15 14:02:04.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/man/update-alternatives.8	2012-06-07 10:11:09.426073000 -0700
@@ -5,14 +5,13 @@
 .\" by the Free Software Foundation; either version 2 of the License, or
 .\" (at your option) any later version.  There is NO WARRANTY.  You can
 .\" find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
-.TH update\-alternatives 8 "2011-04-28" "Debian Project" "dpkg utilities"
+.TH update\-alternatives 8 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 update\-alternatives \- maintain symbolic links determining default commands
 .
 .SH SYNOPSIS
 .B update\-alternatives
-.RI [ options ]
-.I command
+.RI [ option "...] " command
 .
 .SH DESCRIPTION
 .B update\-alternatives
@@ -116,7 +115,7 @@
 will be those which have the highest priority.
 .PP
 When using the
-.I \-\-config
+.B \-\-config
 option,
 .B update\-alternatives
 will list all of the choices for the link group
@@ -127,13 +126,13 @@
 Depending on the choice made, the link group might no longer be in
 .I auto
 mode. You will need to use the
-.I \-\-auto
+.B \-\-auto
 option in order to return to the automatic mode (or you can rerun
-.I \-\-config
+.B \-\-config
 and select the entry marked as automatic).
 .PP
 If you want to configure non-interactively you can use the
-.I \-\-set
+.B \-\-set
 option instead (see below).
 .PP
 Different packages providing the same file need to do so
@@ -238,7 +237,7 @@
 as alternative for
 .I name.
 This is equivalent to
-.IB \-\-config
+.B \-\-config
 but is non-interactive and thus scriptable.
 .TP
 \fB\-\-remove\fR \fIname path\fR
@@ -272,7 +271,7 @@
 \fB\-\-skip\-auto\fP to review and configure all alternatives which are
 not configured in automatic mode. Broken alternatives are also displayed.
 Thus a simple way to fix all broken alternatives is to call
-\fByes \[aq]\[aq] | update-alternatives \-\-force \-\-all\fR.
+\fByes \[aq]\[aq] | update\-alternatives \-\-force \-\-all\fR.
 .TP
 \fB\-\-auto\fR \fIname\fR
 Switch the link group behind the alternative for
@@ -300,7 +299,7 @@
 .TP
 \fB\-\-set\-selections\fR
 Read configuration of alternatives on standard input in the format
-generated by \fBupdate-alternatives \-\-get\-selections\fR and reconfigure
+generated by \fBupdate\-alternatives \-\-get\-selections\fR and reconfigure
 them accordingly.
 .TP
 \fB\-\-query\fR \fIname\fR
@@ -336,8 +335,8 @@
 (/var/log/alternatives.log).
 .TP
 .BI \-\-force
-Let \fBupdate-alternatives\fR replace any real file that is installed
-where an alternative link has to be installed.
+Let \fBupdate\-alternatives\fR replace or drop any real file that is installed
+where an alternative link has to be installed or removed.
 .TP
 .BI \-\-skip\-auto
 Skip configuration prompt for alternatives which are properly configured
@@ -382,35 +381,35 @@
 or performing the action.
 .
 .SH "QUERY FORMAT"
-The \fBupdate\-alternatives\fP \fI\-\-query\fP format is using an
+The \fBupdate\-alternatives \-\-query\fP format is using an
 RFC822-like flat format. It's made of \fIn\fP + 1 blocks where \fIn\fP is
 the number of alternatives available in the queried link group. The first
 block contains the following fields:
 .TP
-.BR Link: " <link>"
+.BI Link: " link"
 The generic name of the alternative.
 .TP
-.BR Status: " <status>"
+.BI Status: " status"
 The status of the alternative (\fBauto\fR or \fBmanual\fR).
 .TP
-.BR Best: " <best choice>"
+.BI Best: " best-choice"
 The path of the best alternative for this link group. Not present if
 there is no alternatives available.
 .TP
-.BR Value: " <currently selected alternative> "
+.BI Value: " currently-selected-alternative"
 The path of the currently selected alternative. It can also take the magic
 value \fBnone\fR. It is used if the link doesn't exist.
 .TP
 .TP
 The other blocks describe the available alternatives in the queried link group:
 .TP
-.BR Alternative: " <path of this alternative>"
+.BI Alternative: " path-of-this-alternative"
 Path to this block's alternative.
 .TP
-.BR Priority: " <priority value>"
+.BI Priority: " priority-value"
 Value of the priority of this alternative.
 .TP
-.BR Slaves: " <list of slaves>"
+.BI Slaves: " list-of-slaves"
 When this header is present, the \fBnext\fR lines hold all slave alternatives
 associated to the master link of the alternative. There is one slave per
 line. Each line contains one space, the generic name of the slave
@@ -447,7 +446,7 @@
 .fi
 .
 .SH DIAGNOSTICS
-With \fI\-\-verbose\fR
+With \fB\-\-verbose\fR
 .B update\-alternatives
 chatters incessantly about its activities on its standard output channel.
 If problems occur,
@@ -464,7 +463,7 @@
 program itself and the associated manpage.
 .PP
 To display the available packages which provide \fBvi\fP and the current
-setting for it, use the \fI\-\-display\fP action:
+setting for it, use the \fB\-\-display\fP action:
 .RS
 .PP
 .B update\-alternatives \-\-display vi
Binary files dpkg/po/ast.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/ast.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/ast.po /home/vorlon/devel/multiarch/dpkg-debian/po/ast.po
--- dpkg/po/ast.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/ast.po	2012-06-07 10:11:09.426073000 -0700
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.14.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2009-11-14 17:43+0100\n"
 "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
 "com>\n"
@@ -24,7 +24,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "nun se puede abrir el ficheru fonte `%.250s'"
@@ -46,71 +46,77 @@
 msgid "ar member file (%s)"
 msgstr "falló al criar el ficheru tmpfile (data)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "falló en buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "falló en buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "llectura insuficiente en buffer_copy (%s)"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "falló al executar tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "nun se pudo executar %s"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: descompresión"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compresión"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: fallu internu de gzip: `%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: fallu internu de gzip: `%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: fallu internu de gzip: `%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: fallu internu de gzip: `%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: fallu internu de gzip: `%s'"
@@ -125,31 +131,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: fallu internu de bzip2: `%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: fallu internu de bzip2: `%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: fallu internu de bzip2: `%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: fallu internu de bzip2: `%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -158,7 +164,7 @@
 "el direutoriu d'anovaciones contién el ficheru '%.250s', y el so nome ye "
 "enforma grande (llonxitú=%d, max=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -166,101 +172,101 @@
 "el direutoriu d'anovaciones contién el ficheros con nomes de llonxitudes "
 "diferentes (%d y %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "nun puede desaminase'l direutoriu d'anovaciones `%.255s'"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "fallu al desaniciar el ficheru d'anovación incorporáu %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "nun puede crease '%.255s'"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "nun puede enllenase %.250s con rellenu"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "nun puede facese `flush' %.250s tres del rellenu"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "nun puede tornase al entamu de %.250s dempués del rellenu"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "nun pue abrise un ficheru temporal pa vsnprintf"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr ""
 "nun puede abrise/criase'l ficheru de bloquéu de la base de datos d'estáu"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "nun tien permisu pa bloquiar la base de datos d'estáu de dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "nun puede bloquiase la base de datos d'estáu de dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "la operación solicitada precisa privilexos de superusuariu"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "nun puede accedese al área d'estáu de dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 "la operación precisa accesu de llectura y escritura al área d'estáu de dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "fallu al desaniciar el mio propiu ficheru d'anovación %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "nun puede escribise l'estáu actual de '%.250s'"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "nun pue facese'l vaciáu del estáu actual de '%.250s'"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "nun pue tronzase pa l'estau actualizau de `%.250s'"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "nun pue sincronizase l'estau actualizau de `%.250s'"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "nun pue zarrase l'estau actualizau de `%.250s'"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "nun pue instalase l'estau actualizau de `%.250s'"
@@ -282,71 +288,73 @@
 msgid "unable to open directory '%s'"
 msgstr "nun se puede abrir el ficheru fonte `%.250s'"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "nun se puede abrir el ficheru fonte `%.250s'"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "nun se puede abrir el ficheru fonte `%.250s'"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "nun pue escosase vsnprintf"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "falló escribir los detalles de `%.50s' a `%.250s'"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "falló abrir `%s' pa escribir la información de %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "nun pue afitase'l buffering nel ficheru d'estáu"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "falló escribir el rexistru %s tocante a `%.50s' a `%.250s'"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "falló vaciar la información %s a `%.250s'"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "falló fsync la información %s a `%.250s'"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "falló zarrar `%.250s' tres d'escribir la información %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "falló enllazar `%.250s' con `%.250s' como copia de seguridá de la info %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "falló instalar `%.250s' como `%.250s' conteniendo la información %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -355,7 +363,7 @@
 "%s: error fatal non recuperable, encaboxando:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -367,13 +375,13 @@
 "%s: error fatal non recuperable, encaboxando:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "memoria escosada pa una nueva entrada de reorganización"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -382,33 +390,33 @@
 "%s: fallu al reorganizar:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: ¡¡abondos fallos añeraos durante la recuperación de error!!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "memoria escosada pa una nueva entrada de reorganización"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 "memoria escosada pa la entrada de reorganización nueva con munchos argumentos"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s: fallu al reorganizar: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: fallu al reorganizar: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: fallu internu: %s\n"
@@ -424,99 +432,99 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "nun s'almite `%.*s' pa %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "basura dempués de %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "nome de paquete inválidu (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "campu de detalles `%s' de ficheru ermu"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "campu de detalles de ficheru `%s' non permitíu nel ficheru d'estáu"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "abondos valores nel campu de detalles de ficheru `%s'\n"
 "(comparáu con otros)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "insuficiente númberu de valores nel campu de detalles de ficheru `%s'\n"
 "(comparáu con otros)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "yes/no en campu booleanu"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "pallabra en campu «prioridá»"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "el valor pal campu `status' nun ta permitíu nesti contestu"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "primer pallabra (necesaria) nel campu `status'"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "segunda pallabra (fallu) nel campu `status'"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "tercer pallabra d'estáu nel campu `status'"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "fallu na cadena `Version' `%.250s': %.250s"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "Usóse un campu `Revision' o `Package-Revision' obsoletu"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "el valor del campu `config-version' nun se permite nesti contestu"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "fallu na cadena Config-Version `%.250s': %.250s"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "el valor de `conffiles' tien una llinia mal formateada `%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "una llinia del valor de `conffiles' nun entama con espaciu `%c'"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "el direutoriu root o null ta llistau como conffile"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -524,12 +532,12 @@
 "nel campu `%s', falta el nome de paquete, o alcontróse basoria en cuenta'l "
 "nome"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "campu `%s', nome de paquete inválidu `%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -538,7 +546,7 @@
 "campu `%s', referencia a `%.255s':\n"
 " rellación de versión errónea %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -547,7 +555,7 @@
 "el campu `%s', referencia a `%.255s':\n"
 " `%c' ta anticuáu, use `%c=' o `%c%c' en cuenta"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -557,11 +565,11 @@
 " concasamientu esautu implicitu nel númberu de versión, úfrese usar `=' en "
 "cuenta"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Namái puen usase versiones esautes pa Provides"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -571,56 +579,56 @@
 " el valor de versión entama con un non-alfanuméricu, úfrese amestar un "
 "espaciu"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "el campu `%s', referencia a `%.255s': la versión contien `%c'"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "el campu `%s', referencia a `%.255s': versión nun terminada"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "el campu `%s', referencia a `%.255s': error na versión: %.255s"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "campu `%s', error de sintaxis tres la referencia al paquete `%.255s'"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "nun s'almiten alternatives (`|') nel campu %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "el valor pal campu `triggers-pending' nun ta permitíu nesti contestu"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "nome illegal pa l'activador de pendientes `%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "activador de pendientes `%.255s' duplicáu"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "el valor pal campu `triggers-awaited' nun ta permitíu nesti contestu"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "nome de paquete illegal nel disparador esperáu `%.255s': %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "paquete de disparador esperáu duplicáu `%.255s'"
@@ -677,7 +685,7 @@
 msgid "unable to write to status fd %d"
 msgstr "nun puede escribise l'estáu fd %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "realloc failed (%zu bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -688,8 +696,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "falló en realloc (%zu bytes)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "falló al asignar memoria"
 
@@ -723,205 +731,211 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "nun puede afitase l'atributu close-on-exec pa `%.250s'"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "fallu de configuración: %s necesita un valor"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "falló al abrir el ficheru de configuración '%.255s' pa llectura: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "opción `%s' desconocida"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "la opción --%s lleva un parámetru"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "la opción --%s nun lleva parámetros"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "fallu de llectura nel ficheru de configuración `%.250s'"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "fallu al zarrar el ficheru de configuración `%.250s'"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "fallu al zarrar el ficheru de configuración `%.250s'"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "opción --%s desconocida"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "la opción --%s lleva un parámetru"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "la opción --%s nun lleva parámetros"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "opción -%c desconocía"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "la opción -%c lleva un parámetru"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "la opción -%c nun lleva parámetros"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "opción obsoleta '--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "aiciones en conflictu -%c (--%s) y -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "valor duplicáu pal campu `%s'"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "nome de campu definíu pol usuariu `%.*s' enforma curtiu"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "valor duplicáu pal campu definíu pol usuariu `%.*s'"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Campu `Configured-Version' pa un paquete con Status non afayaízu"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "el paquete tien l'estáu %s pero los disparadores tán n'espera"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 "el paquete tien l'estáu «triggers-awaited» pero nun hai dengún disparador "
 "n'espera"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "el paquete tien l'estáu %s pero los disparadores tán pendientes"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 "el paquete tien l'estáu «triggers-pending» pero nun hai disparadores "
 "pendientes"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "Paquete que nun tando instaláu tien conffiles, escaecémonos d'ellos"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "fallá al abrir el ficheru d'información del paquete `%.255s' pa lleer"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "nun puede executase stat sobro'l ficheru `%.255s'"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "nun puede executase mmap sobro'l ficheru `%.255s'"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "nun puede executase stat sobro'l ficheru `%.255s'"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "falló al zarrar dempués de la llectura: `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF dempués del nome del campu `%.*s'"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "nueva llinia dientro del nome del campu `%.*s'"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "EOF de MSDOS (^Z) dientro del nome del campu `%.*s'"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "el nome del campu `%.*s' tien de tar siguíu por dos puntos"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF enantes del valor del campu `%.*s' (falta nueva llinia final)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 "caráuter EOF de MSDOS dientro del valor del campu `%.*s' (¿falta nueva "
 "llinia?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "nueva llinia dientro del nome del campu `%.*s'"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF durante'l valor del campu `%.*s' (falta nueva llinia)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 "alcontráronse delles entraes d'información de paquetes, namái se permite una"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "falló al zarrar dempués de la llectura: `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "nun hai denguna información de paquetes en `%.255s'"
@@ -950,68 +964,68 @@
 "%s, en ficheru '%.255s' cerca de llinia %d:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "nun pue ser una cadena erma"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "tien d'entamar con un carauter alfanumbéricu"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "el caráuter `%c' nun ta permitíu (namái se permiten lletres, díxitos "
 "carauteres `%s')"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<dengún>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "la cadena de versión ta erma"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "la cadena de versión tien espacios nel so interior"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "la época na versión nun ye un númberu"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "nun hai res tres los dos puntos nel númberu de versión"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "nun hai res tres los dos puntos nel númberu de versión"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "nun hai res tres los dos puntos nel númberu de versión"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "falta %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "valor ermu pa %s"
@@ -1030,51 +1044,51 @@
 msgid "(no description available)"
 msgstr "(ensin descripción disponible)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "nun se pudo inorar la señal %s enantes d'executar el script %.250s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "fallu al non remanar la señal %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (subprocesu): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "falló en `fork'"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "el subprocesu %s devolvió el códigu de salida d'error %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "el `wait' de %s falló"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "el soprocesu %s terminóse pola señal (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", volcáu de «core»"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "el soprocesu %s falló con códigu d'estáu d'espera %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "el `wait' de %s falló"
@@ -1098,69 +1112,61 @@
 "fallu de sintaxis nel ficheru de disparadores dereferenciaos '%.250s' nel "
 "carauter '%s'%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr ""
 "nun puede abrise/criase'l ficheru de bloquéu de los disparadores `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "disparáu"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr ""
 "nun puede facese `stat' sobro'l ficheru dereferenciáu de disparadores `"
 "%.250s'"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "nun puede abrise'l ficheru de disparadores dereferenciáu `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 "nun puede abrise/criase'l nuevu ficheru de disparadores dereferenciáu `"
 "%.250s'"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "fallu al lleer los disparadores del ficheru dereferenciáu `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr ""
 "nun puede abrise'l nuevu ficheru dereferenciáu de disparadores `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr ""
 "nun puede zarrase'l nuevu ficheru dereferenciáu de disparadores `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr ""
 "nun puede instalase'l nuevu ficheru dereferenciáu de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "nun se permiten nomes de disparadores ermos"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "el nome del disparador contién carauteres inválidos"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1169,19 +1175,19 @@
 "síntaxis desconocida o inválida nel nome del disparador `%.250s' (nel "
 "disparador interesáu pal paquete `%.250s')"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr ""
 "nun puede abrise'l nuevu ficheru de llista d'intereses de disparadores `"
 "%.250s'"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "nun puede rebobinase'l ficheru d'intereses de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1190,39 +1196,45 @@
 "fallu sintácticu nel ficheru d'intereses del disparador `%.250s'; nome de "
 "paquete illegal `%.250s': %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "nun puede crease un nuevu ficheru d'intereses de disparadores `%.250s'"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr ""
 "nun puede escribise un nuevu ficheru d'intereses de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "nun puede zarrase'l nuevu disparador del ficheru `%.250s'"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "nun puede zarrase'l nuevu disparador del ficheru `%.250s'"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "nun puede zarrase'l nuevu disparador del ficheru `%.250s'"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr ""
 "nun puede instalase un nuevu ficheru d'intereses de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "nun se puede desaniciar `%.250s'"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "nun puede crease un nuevu ficheru d'intereses de disparadores `%.250s'"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "nun puede zarrase'l nuevu disparador del ficheru `%.250s'"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1230,47 +1242,47 @@
 "interés de disparador de ficheru duplicáu pal ficheru `%.250s' y el paquete `"
 "%.250s'"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "nun pudo criase'l nuevu ficheru de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "nun pudo escribise'l nuevu ficheru de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "nun pudo zarrase'l nuevu ficheru de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "nun pudo zarrase'l nuevu ficheru de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "nun pudo zarrase'l nuevu ficheru de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "nun puede instalase'l nuevu ficheru de disparadores como `%.250s'"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "nun puede lleese'l nuevu ficheru de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "error sintáuticu nel ficheru de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1279,7 +1291,7 @@
 "el ficheru de rexistros de disparadores menciona un nome de paquete illegal `"
 "%.250s' (nel ficheru `%.250s'): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1288,32 +1300,40 @@
 "ficheru de disparadores ci `%.250s' contién una síntaxis de disparador "
 "illegal nel nome de disparador `%.250s': %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "nun puede abrise'l ficheru de disparadores ci `%.250s'"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 "el ficheru ci d'activadores contién una sintaxis de directiva desconocida"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "el ficheru ci d'activadores contién la directiva desconocida `%.250s'"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "nun pue criase'l direutoriu d'estau d'activadores `%.250s'"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 "nun pue afitase'l propietariu del direutoriu d'estau d'activadores `%.250s'"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "nun se permiten nomes de disparadores ermos"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "el nome del disparador contién carauteres inválidos"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1338,7 +1358,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "error al lleer del tubu de dpkg-deb"
 
@@ -1357,12 +1377,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "error al afitar el propietariu de l'enllaz simbólicu `%.255s'"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "error al afitar el propietariu de `%.255s'"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "error al afitar los permisos de `%.255s'"
@@ -1422,17 +1442,27 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "l'archivu contenía un oxetu `%.255s' de triba desconocía 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat file '%s'"
+msgstr "nun se puede facer `stat' sobre'l nome antiguu `%s': %s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Reemplazando los ficheros del paquete antiguu %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Reemplazaos polos ficheros del paquete instalau %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1441,94 +1471,99 @@
 "tentando sobreescribir el direutoriu `%.250s' del paquete %.250s con un non "
 "direutoriu"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "tentando sobreescribir `%.250s', que tamién ta nel paquete %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "imposible criar `%.255s' (mientres se procesab `%.255s')"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "mandase de dpkg-deb demientres `%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "error al zarrar/escribir `%.255s'"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "error al criar el tubu `%.255s'"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "error al criar el preséu `%.255s'"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "error al criar l'enllaz duru `%.255s'"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "error al criar l'enllaz simbólicu `%.255s'"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "error al criar el direutoriu `%.255s'"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "nun pue apartase `%.255s' pa instalar la versión nueva"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "nun pue lleese l'enllaz `%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "nun pue facese enllaz simbólicu de seguridá pa `%.255s'"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "nun pue camudase'l dueñu de l'enllaz simbólicu de seguridá pa `%.255s'"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "nun pue facese l'enllaz de seguridá de `%.255s' enantes d'instalar la "
 "versión nueva"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "nun pue instalase la versión nueva de `%.255s'"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "nun puede crease '%.255s'"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "nun puede desfacese'l búfer `%.255s'"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1537,7 +1572,7 @@
 "inorando el problema de dependencies con %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1546,7 +1581,7 @@
 "valorando la desconfiguración del paquete\n"
 " esencial %s, p'activar %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1555,7 +1590,7 @@
 "dpkg: non, %s ye esencial, nun va desconfigurase\n"
 " col envís d'activar %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1564,28 +1599,28 @@
 "dpkg: non, nun pue continuase con %s (--auto-deconfigure aidará):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "eliminación de %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "instalación de %.250s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: albidrando desconfigurar %s, que frañaríase por %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: sí, desconfigurarase %s (frañáu por %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1594,11 +1629,11 @@
 "dpkg: tocante a %s que contién %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "escaeciendo'l frañamientu, ¡pue siguise lo mesmo!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1607,27 +1642,27 @@
 "instalar %.250s frañaría %.250s, y la\n"
 " desconfiguración ta torgada (--auto-deconfigure pue aidar)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "instalar %.250s frañaría software esistente"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: albidrando quitar %s en favor de %s ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s nun ta correutamente instaláu - escaeciendo lo que depende d'el.\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: quitar %s pue dar problemes, porque ufre %s ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1636,108 +1671,110 @@
 "dpkg: el paquete %s requier reinstalación, pero va desaniciase de toes "
 "maneres, como tu pidiste.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: el paquete %s requier reinstalación, nun va quitase.\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: sí, quitarase %s en favor de %s.\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "conflictu ente paquetes - nun s'instala %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "escaeciendo'l conflictu, ¡pue siguise igual!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive necesita polo menos un argumentu camín"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "falló la execución de find pa --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "falló facer fdopen nel tubu de find"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "error al lleer el tubu de find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "error al zarrar el tubu de find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find pa --recursive devolvió l'error nun remanao %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "guetao, pero nun s'alcontraron paquetes (ficheros que concasen *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s necesita d'argumentu polo menos un ficheru d'archivu de paquete"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Seleicionando el paquete enantes deseleicionáu %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Saltando'l paquete deseleicionáu %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "La versión %.250s de %.250s ya ta instalada, saltando.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "desactualizando %.250s de %.250s a %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "Nun va desactualizase %.250s de la versión %.250s a la %.250s, saltando.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1746,39 +1783,39 @@
 "nun pue quitase la nueva versión instalada de `%.250s' pa reinstalar la "
 "copia de seguridá"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "nun pue restaurase la versión de seguridá de `%.250s'"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "nun pue restaurase la versión de seguridá de `%.250s'"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "nun pue quitase la nueva versión instalada de `%.250s'"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "nun pue quitase la nueva versión estrayía de `%.250s'"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "nun s'atopó l'estau del nuevu ficheru config dist `%.250s'"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "nun s'atopó l'estau del ficheru config `%.250s' instaláu actualmente"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1789,58 +1826,58 @@
 "El ficheru de configuración `%s', nun esiste nel sistema.\n"
 "Instalando el ficheru de config nuevu como se pidiera.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: falló desaniciar la copia antigua '%.250s': %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: falló renomar '%.250s' como '%.250s': %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: falló al desaniciar '%.250s': %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 #| msgid "%s: failed to remove old distrib version '%.250s': %s"
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: falló desaniciar la versión vieya de la distribución '%.250s': %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: falló desaniciar '%.250s' (enantes de sobreescribir): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: falló enllazar '%.250s' a '%.250s': %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Instalando la versión nueva del ficheru de configuración %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "nun pue instalase `%.250s' como `%.250s'"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "nun ta instaláu dengún paquete nomáu `%s', nun pue configurase"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "el paquete %.250s yá ta instaláu y configuráu"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1849,7 +1886,7 @@
 "el paquete %.250s nun ta preparáu pa configurase\n"
 " nun pue configurase (estau actual `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1858,11 +1895,11 @@
 "dpkg: problemes de dependencies torguen la configuración de %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemes de dependencies - déxase ensin configurar"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1872,7 +1909,7 @@
 "pidió:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1880,12 +1917,12 @@
 "El paquete ta nun estáu enforma gafientu - habría que\n"
 " reinstalalu enantes de tentar la configuración."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Configurando %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1894,7 +1931,7 @@
 "%s: nun pue sabese l'estáu del ficheru config '%s'\n"
 " (= `%s'): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1903,7 +1940,7 @@
 "%s: el ficheru config '%s' ye un enllaz circular\n"
 " (= '%s')"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1912,7 +1949,7 @@
 "%s: nun pue lleese l'enllaz al ficheru conf '%s'\n"
 " (= '%s'): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1921,34 +1958,34 @@
 "%s: el ficheru conf '%.250s' apunta a un nome dexeneráu\n"
 " ('%s' ye enllaz simbólicu a '%s')"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: el ficheru conf '%.250s' nun ye un simple ficheru o enllaz (= '%s')"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "hash md5"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: nun pue abrise'l ficheru conf %s pa facer hash: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "En acabando, escribir `exit'.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1957,12 +1994,12 @@
 "\n"
 "Ficheru de configuración `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (daveres `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1973,7 +2010,7 @@
 " ==> Ficheru nel sistema criau por vusté o por un script.\n"
 " ==> Ficheru tamién nel paquete sirvíu pol mantenedor.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1982,7 +2019,7 @@
 "\n"
 "     Nun modificáu dende la instalación.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1991,7 +2028,7 @@
 "\n"
 " ==> Modificáu (por vusté o un script) dende la instalación.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -2000,37 +2037,37 @@
 "\n"
 " ==> Desaniciáu (por vusté o un script) dende la instalación.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> El distribuidor del paquete ufre una versión actualizada.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     La versión del paquete ye la mesma que la cabera instalada.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Usando un ficheru nuevu como se pidiera.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Usando l'actual ficheru antiguu como se pidiera.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Guardando l'antiguu ficheru config como predetermináu.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Usando'l nuevu ficheru config como predetermináu.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2045,166 +2082,168 @@
 "      D     : amosar les diferencies ente les versiones\n"
 "      Z     : mandar esti procesu a segundu planu pa esaminar la situación\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " L'aición predeterminada ye conservar la versión actual.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " L'aición predeterminada ye instalar la versión nueva.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[predeterminao=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[predeterminao=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[ensin predetermín]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "error al escribir en stderr, descubiertu enantes del prompt del ficheru conf"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "error de llectura na entrada estándar nel prompt del ficheru conf"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF na entrada estándar nel prompt del ficheru conf"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s depende de %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s pre-depende de %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s encamienta %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s suxier %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s fraña %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s hai conflictu con %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s meyora %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s va desaniciase.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s va deconfigurase.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s va instalase, pero ye la versión %.250s.\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s ta instaláu, pero ye la versión %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s ta desempaquetáu, pero nunca nun se configuró.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s ta desempaquetáu, pero ye la versión %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  la cabera versión configurada de %.250s ye la %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s ye %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s ufre %.250s pero va desaniciase.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s ufre %.250s pero va desconfigurase.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s ufre %.250s pero ye %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s nun ta instaláu.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versión %.250s) va instalase.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versión %.250s) ta presente y %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s ufre %.250s y va instalase.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s ufre %.250s y ta presente y %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Type dpkg-trigger --help for help about this utility."
+msgid "Use --help for help about diverting files."
+msgstr "Escriba dpkg-trigger --help pa obtener aida d'esta ferramienta."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versión %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2219,8 +2258,8 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2232,7 +2271,7 @@
 "o\n"
 "posterior pa les condiciones de copia. Nun hai DENGUNA garantía.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2242,7 +2281,7 @@
 "Emplegu: %s [<opción> ...] <orde>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2254,7 +2293,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "Usage: %s [<option> ...] <command>\n"
@@ -2327,7 +2366,7 @@
 "Los scripts preinst o postrm de los paquetes deberíen especificar siempres --"
 "package y --divert.\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2336,19 +2375,13 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat file '%s'"
-msgstr "nun se puede facer `stat' sobre'l nome antiguu `%s': %s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error checking `%s': %s"
 msgid "error checking '%s'"
 msgstr "error comprobando `%s': %s"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2357,144 +2390,144 @@
 "renomar obliga a sobreescribir `%s' con\n"
 "un ficheru distintu `%s', nun se permite."
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "nun se puede abrir el ficheru fonte `%.250s'"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "cannot stat new name `%s': %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "nun se puede facer `stat' sobre'l nome nuevu `%s': %s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 #| msgid "rename: remove duplicate old link `%s': %s"
 msgid "rename: remove duplicate old link '%s'"
 msgstr "rename: desaniciar enllaz antiguu duplicáu `%s': %s"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "nun se puede abrir el ficheru fonte `%.250s'"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "local diversion of %s"
 msgstr "esviación llocal a: %s\n"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "local diversion of %s to %s"
 msgstr "esviación llocal a: %s\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "diversion of %s by %s"
 msgstr "esviáu por %s a: %s\n"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "diversion of %s to %s by %s"
 msgstr "esviáu por %s a: %s\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "any diversion of %s"
 msgstr "esviación llocal a: %s\n"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "any diversion of %s to %s"
 msgstr "esviáu por %s a: %s\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "cannot open GPL file"
 msgid "cannot create new %s file"
 msgstr "nun puede abrise'l ficheru GPL"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "nun pue escosase vsnprintf"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 #| msgid "remove old diversions-old: %s"
 msgid "error removing old diversions-old"
 msgstr "desaniciar diversions-old antiguu: %s"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "fallu al crear el nuevu ficheru statoverride-old: %s"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "fallu al instalar el nuevu statoverride: %s"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s necesites un parámetru"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "el nome de ficheru «%s» nun ye un allugamientu absolutu"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "el ficheru nun pue contener saltos de llinia"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Nun puen esviase direutorios"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "Nun puen esviase direutorios"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "Dexando `%s'"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' entra en conflictu con `%s'"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "Amestando `%s'"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
 msgstr "Nun hai un esvíu `%s', dengunu desaniciáu"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2505,7 +2538,7 @@
 "  al desaniciar `%s'\n"
 "  alcontróse `%s'"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2516,17 +2549,17 @@
 "  al desaniciar `%s'\n"
 "  alcontróse `%s'"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "Desaniciando `%s'"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "el nome de paquete nun puede tener saltos de llinia"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "«divert-to» nun puede tener saltos de llinia"
 
@@ -2611,8 +2644,8 @@
 "dselect o dpkg --configure --pending (o dpkg --triggers-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s nun toma dengún argumentu"
@@ -2704,7 +2737,7 @@
 msgid "--compare-versions bad relation"
 msgstr "mala relación de --compare-versions"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "dpkg: la versión `%s' tien una mala sintaxis: %s\n"
@@ -2758,12 +2791,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "avisu, saltando'l problema por tar activao --force: "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "nun pue abrise'l ficheru de llista de ficheros del paquete `%.250s'"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2772,41 +2805,41 @@
 "falta'l ficheru de llista de ficheros del paquete `%.250s', suponse qu'el "
 "paquete nun tien dengún ficheru instaláu actualmente."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "nun pue abrise'l ficheru de llista de ficheros del paquete '%.250s'"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "llista de ficheros del paquete `%.250s'"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "el ficheru de llista de ficheros del paquete '%.250s' contién una llinia "
 "final erma"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "el ficheru de llista de ficheros del paquete `%.250s' contién un nome de "
 "ficheru vacíu"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "error al zarrar el ficheru de llista de ficheros del paquete `%.250s'"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Lleendo la base de datos ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2814,34 +2847,34 @@
 msgstr[0] "%d ficheros y direutorios instalaos actualmente.)\n"
 msgstr[1] "%d ficheros y direutorios instalaos actualmente.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 "nun pue criase'l ficheru de llista de ficheros actualizao del paquete %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 "fallu d'escritura nel ficheru de llista de ficheros actualizao del paquete %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "fallu al volcar la llista de ficheros actualizada del paquete %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "fallu al sincronizar la llista de ficheros actualizada del paquete %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "fallu al zarrar la llista de ficheros actualizada del paquete %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "fallu al instalar la llista de ficheros actualizada del paquete %s"
@@ -2880,7 +2913,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "dpkg - fallu: la variable d'ambiente PATH nun s'estableció.\n"
 
 #: src/help.c:129
@@ -2912,7 +2945,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2924,65 +2957,65 @@
 msgstr "fallu al facer chroot a `%.250s'"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "falló al camudar al direutoriu `%.255s'"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "nun se pudieron establecer permisos d'execución en `%.250s'"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "nun pue efeutuase setenv pal programa de caltenimientu"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "script %s instaláu"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "nun se pudo facer stat de %s `%.250s'"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "script %s nuevu"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "script %s vieyu"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "nun pudo facese stat de %s '%.250s': %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - probando'l script del paquete nuevu nel so sitiu...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "nun hai un script na versión nueva del paquete - colando"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... paez que too foi bien.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "nun puede crease '%.255s'"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2991,7 +3024,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "nun puede comprobase la esistencia de `%.250s'"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "nun puede lleese'l direutoriu `info'"
 
@@ -3058,7 +3091,7 @@
 "-Dh|--debug=help Aida sobre la depuración.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -3218,7 +3251,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr "Use `dselect' o 'aptitude' pa una xestión de paquetes más amigable.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3270,30 +3303,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3302,103 +3339,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "problemes de dependencies - nun se desinstala"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "problemes de dependencies - nun se desinstala"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "nun pue efeutuase setenv pal programa de caltenimientu"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "fallu de llectura nel ficheru de configuración `%.250s'"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3406,7 +3443,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3414,41 +3451,41 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug necesita un númberu octal como parámetru"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nome de paquete ermu na llista de --ignore-depends separtaos por coma `"
 "%.250s'"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends necesita un nome de paquete llegal.\n"
 "`%.250s' no lo es; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "enteru inválidu pa --%s: `%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "estáu"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3457,7 +3494,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3465,12 +3502,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opción «force/refuse» desconocía `%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "opción force/refuse obsoleta '%s'\n"
@@ -3493,8 +3530,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperáu enantes del fin de la llinia %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "necesítase una opción d'aición"
 
@@ -3661,92 +3698,92 @@
 msgid "passed\n"
 msgstr "correuto\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "falló al criar nome de direutoriu temporal"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "el paquete %s tien demasiaos pares Conflictu/Reemplaza"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "la versión antigua del paquete tien un nome de ficheru d'información\n"
 "llarguísimu qu'entama per `%.250s'"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "nun puede desaniciase'l ficheru d'información obsoletu `%.250s'"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 "nun puede instalase'l (supuestamente) nuevu ficheru d'información `%.250s'"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "nun puede abrise'l direutoriu de control temporal"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "el paquete contién un nome de ficheru d'información llarguísimu\n"
 "(entama con `%.50s')"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "la información de control del paquete contién el direutoriu `%.250s'"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "package control info rmdir of `%.250s' didn't say not a dir"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "el paquete %s contién list como ficheru d'información"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 "nun puede instalase'l nuevu ficheru d'información `%.250s' como `%.250s'"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "nun se puede desaniciar el ficheru d'información de control `%.250s'"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "nun se puede acceder al ficheru"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "falló al criar nome de direutoriu temporal"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "llonxitú de la información de control"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Rexistrada la información sobro %s a partir de %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "l'arquitectura del paquete (%s) nun correspuende cola del sistema (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3755,101 +3792,101 @@
 "dpkg: tocante a %s que contién %s, problema de predependencia:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "problema de predependencia - nun s'instala %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "descartando problema de predependencia!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Tresnando pa trocar %s %s (usando %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Desempaquetando %s (de %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "el nome del conffile (qu'entama por `%.250s')\n"
 "ye abondu llargu (>%d carauteres)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "error de llectura en %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "fallu al zarrar %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "fallu intentando abrir %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Desconfigurando %s, pa poder desaniciar %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Desconfigurando %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Desempaquetando'l troquéu de %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "fallu al lleer la salida de tar de dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "sistema de ficheros del archivu-tar dañado - archivu de paquete frañáu"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: zapea dables ceros finales"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "nun pudo efeutuase stat al fichero antiguu '%.250s' polo que nun se "
 "desaniciará: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "nun puede desaniciase'l direutoriu antiguu '%.250s': %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr "el conffile antiguu '%.250s' yera un direutoriu ermu (y desanicióse)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "nun puede efeutuase `stat' otru ficheru nuevu `%.250s'"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3858,12 +3895,12 @@
 "el ficheru antiguu '%.250s' ye'l mesmu que dellos de los nuevos ficheros! "
 "(tantu '%.250s' como '%.250s')"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "nun se puede %s el ficheru antiguu '%.250s': %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Note la desaparición de %s, que trocóse ensembre.)\n"
@@ -4035,7 +4072,7 @@
 "  -f|--showformat=<formatu>   Usa un formatu alternativu pa --show.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -4057,6 +4094,10 @@
 "  alliniaránse a la drecha a menos que'l anchor seya negativu, nesi\n"
 "  casu alliniaránse a la esquierda.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4117,7 +4158,7 @@
 msgid "Removing %s ...\n"
 msgstr "Desinstalando %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4126,42 +4167,43 @@
 "al desinstalar %.250s, nun se puede desaniciar el direutoriu '%.250s': %s - "
 "¿el direutoriu puede ser un puntu de montaxe?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "nun se puede desaniciar `%.250s'"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "nun puede crease '%.255s'"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "al desinstalar %.250s, el direutoriu '%.250s' nun ta ermu, nun se desanicia"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "nun se puede desaniciar `%.250s'"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Purgando ficheros de configuración de %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr ""
 "nun se puede desaniciar el ficheru de configuración antiguu `%.250s' (= `"
 "%.250s')"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 "nun puede lleese'l direutoriu del ficheru de configuración `%.250s'\n"
 "(a partir de `%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
@@ -4169,11 +4211,11 @@
 "%.250s'\n"
 "(de `%.250s')"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "nun puede desaniciase la llista de ficheros antigua"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "nun puede desaniciase'l script postrm antiguu"
 
@@ -4216,7 +4258,11 @@
 msgid "read error on standard input"
 msgstr "fallu de llectura na entrada estándar"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4226,7 +4272,7 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4237,7 +4283,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -4266,56 +4312,56 @@
 "  --help amuesa esti mensaxe d'aida.\n"
 "  --version amuesa la versión.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "tarazando la cabera /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "fallu al abrir el nuevu ficheru statoverride: %s"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "fallu al desaniciar statoverride-old: %s"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "fallu al crear el nuevu ficheru statoverride-old: %s"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "fallu al instalar el nuevu statoverride: %s"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add necesita cuatro argumentos"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, fuzzy, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr "pero especificóse--force, poro, va ignorase"
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, fuzzy, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Yá existe una redefinición pa «%s», "
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, fuzzy, c-format
 msgid "--update given but %s does not exist"
 msgstr "avisu: diose --update pero nun esiste %s"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Nun existe una redefinición."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 #, fuzzy
 msgid "--update is useless for --remove"
 msgstr "avisu: --update ye inútil pa --remove"
@@ -4382,16 +4428,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "multiples statusoverides presentes pal ficheru '%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Escriba dpkg-trigger --help pa obtener aida d'esta ferramienta."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Ferramienta de disparadores de Debian `%s'\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4402,7 +4448,7 @@
 "             %s [<opciones> ...] <orde>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4415,7 +4461,7 @@
 "disparadores.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4438,21 +4484,21 @@
 "  --no-act                         Namái prebar, nun camudar ren realmente.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: el direutoriu de datos de disparadores entá nun se crió\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: entá nun esisten rexistros de disparadores\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "dpkg-trigger toma namás un argumento"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4462,13 +4508,13 @@
 "dpkg-trigger ha llamase dende un programa d'un desendolcador (o cola opción "
 "--by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: nome de paquete esperáu illegal `%.250s': %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "nome de disparador inválidu `%.250s': %.250s"
@@ -4502,33 +4548,34 @@
 msgstr "Procesando disparadores pa %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s necesita esautamente un ficheru de Paquetes como argumentu"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "nun puede accedese al área d'estáu de dpkg pa un anovamientu\n"
 "de `available'"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "l'anovamientu de `available' requier accesu d' escritura al área d'estáu\n"
 "de dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Trocando información de paquetes disponibles, usando %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Anovando información de paquetes disponibles, usando %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4536,7 +4583,7 @@
 msgstr[0] "La información sobro %d paquete(s) anovóse.\n"
 msgstr[1] "La información sobro %d paquete(s) anovóse.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4655,8 +4702,8 @@
 msgstr[1] ""
 "dpkg-deb: nun tendránse en cuenta %d avisos sobro los ficheros de control\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necesites un directoriu como parámetru"
@@ -4690,26 +4737,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: construyendo'l paquete `%s' en `%s'.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "falló al criar el ficheru temporal (data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "estaya de control"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "falló al desaniciar el ficheru temporal (data), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4726,20 +4773,20 @@
 msgid "error writing `%s'"
 msgstr "fallu al escribir `%s'"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "ente númberos"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "falló al escribir el nome del ficheru na tubería de tar (data)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<compress> dende tar -cf"
 
@@ -4757,78 +4804,78 @@
 msgid "error reading %s from file %.255s"
 msgstr "fallu al lleer %s del ficheru %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "falló al lleer el ficheru `%.255s'"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "falló al efeutuar `fstat' sobro'l ficheru"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "el ficheru nun tien dengún puntu nel númberu de versión"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "el ficheru nun tien carauteres de nueva llinia na cabecera"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "el ficheru `%.250s' ta frañáu - númberu de parte erróneu"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "el ficheru `%.250s' nun ye un ficheru binariu de debian"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "el ficheru nun tien dengún puntu nel númberu de versión"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "el ficheru nun tien carauteres de nueva llinia na cabecera"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "el ficheru nun tien dengún puntu nel númberu de versión"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "nun s'entiende la versión %.250s del ficheru, fáigase un\n"
 "dpkg-deb más modernu"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "sáltase l'elementu de %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "el ficheru `%.250s' contién un miembru %.*s inintelixible, abandonu"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "el ficheru `%.250s' contién dos miembros de control, abandonu"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4840,23 +4887,23 @@
 " paquete debian nuevu, versión %s.\n"
 " tamañu %ld bytes: ficheru de control= %zi bytes.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "el ficheru tien una llonxitú de control mal formada `%s'"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "sáltase l'elementu de %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4868,7 +4915,7 @@
 " paquete debian antiguu, versión %s.\n"
 " tamañu %ld bytes: ficheru de control= %zi, ficheru principal= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4877,49 +4924,50 @@
 "dpkg-deb: el ficheru tien pinta de ser un ficheru que foi frañáu\n"
 "dpkg-deb     al ser tresferíu en mou ASCII\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' nun ye un ficheru en formatu debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "falló al escribir a la tubería na copia"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "falló al zarrar la tubería na copia"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "datos"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "falló al camudar al direutoriu"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "falló al crear direutoriu"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "falló al camudar a un direutoriu dempués de crialu"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "falló al camudar al direutoriu"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<descompresión>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "apegar"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s necesita un nome de ficheru .deb como argumentu"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4928,39 +4976,39 @@
 "--%s necesita un direutoriu de destín.\n"
 "¿A lo meyor lo que quier facer ye dpkg --install?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s toma como muncho dos argumentos (.deb y direutoriu)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s toma namái un argumentu (ficheru .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "falló al camudar a `/' pa llimpieza"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
 msgid "control file '%s'"
 msgstr "nun se puede facer `stat' sobre'l nome antiguu `%s': %s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: `%.255s' nun contién dengún componente de control `%.255s'\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "l'apertura del componente `%.255s' (dientro de %.255s)\n"
 "falló de mou inesperáu"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, fuzzy, c-format
 #| msgid "One requested control component is missing"
 msgid "%d requested control component is missing"
@@ -4968,59 +5016,59 @@
 msgstr[0] "Falta una de les componentes de control solicitaes"
 msgstr[1] "Falta una de les componentes de control solicitaes"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "nun se puede desaminar el direutoriu `%.255s'"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "nun puede efeutuase `stat' sobro `%.255s' (en `%.255s')"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "nun puede abrise `%.255s' (en `%.255s')"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "falló al lleer `%.255s' (en `%.255s')"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bytes, %5d llinies  %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     nun ye un ficheru planu   %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(¡nun hai dengún ficheru `control' nel ficheru de control!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "nun puede abrise'l componente `control'"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "falló durante la llectura de la componente `control'"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "error al zarrar el tubu de find"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Fallu nel formatu"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents toma esautamente un argumentu"
 
@@ -5030,7 +5078,19 @@
 msgstr "Versión `%s' del sistema de xestión de paquetes de Debian `%s'.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -5041,6 +5101,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -5059,7 +5121,7 @@
 "ficheros.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -5072,11 +5134,12 @@
 "<ccampo> ye'l nome d'un campu nel ficheru de `control' principal.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5100,7 +5163,7 @@
 "«gzip», «bzip2», «none» (ninguna)\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5114,7 +5177,7 @@
 "de paquetes fácil d'usar. Avisu: ¡los paquetes que desempaquetes con\n"
 "«dpkg-deb --extract» nun s'instalarán bien!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5123,17 +5186,17 @@
 "deb;\n"
 "Escribi dpkg --help pa obtener aida sobre instalar y desinstalar paquetes."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "enteru inválidu pa --%s: `%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "enteru inválidu pa --%s: `%.250s'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "¡triba de compresión «%s» desconocía!"
@@ -5154,7 +5217,7 @@
 msgstr ""
 "el ficheru `%.250s' ta frañáu - falta una nueva llinia dempués de %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "fallu al lleer %.250s"
@@ -5252,55 +5315,61 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "el ficheru `%.250s' ta frañáu - númberu de parte erróneu"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "nome paquete"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "el ficheru `%.250s' ta frañáu - maxa errónea al final de\n"
 "la segunda testera"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "el ficheru `%.250s' ta frañáu - el segundu miembru nun ye un miembru\n"
 "de datos"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "el ficheru `%.250s' ta frañáu - númberu enquivocáu de partes pa los\n"
 "tamaños conseñaos"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "el ficheru `%.250s' ta frañáu - el tamañu ta enquivocáu pol\n"
 "númberu de parte conseñáu"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "nun puede efeutuase `stat' sobro'l ficheru parte `%.250s'"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "el ficheru `%.250s' ta frañáu - enforma curtiu"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "nun puede abrise'l ficheru parte d'archivu `%.250s'"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "el ficheru `%.250s' nun ye una parte d'archivu"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5320,6 +5389,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5343,12 +5413,19 @@
 "(cachu usáu): %lu bytes\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<desconocíu>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s requier ún o más argumentos de ficheru de partes"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "el ficheru `%s' nun ye una parte d'archivu\n"
@@ -5383,7 +5460,7 @@
 msgid "split package part"
 msgstr "Poniendo paquete %s xuntu dende %d partes:"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "fecho\n"
@@ -5436,17 +5513,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Opciones:\n"
 "   --depotdir <direutoriu>      Utiliza <direutoriu> en cuenta de %s/%s.\n"
@@ -5458,20 +5544,29 @@
 "\n"
 "Estáu de salida: 0 = OK;  1 = -a nun ye una parte;  2 = ¡problemes!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Escriba dpkg-split --help pa tener aida."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fin de ficheru inesperáu en %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "el tamañu de la parte ye abondo grande o nun ye positivu"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -5583,25 +5678,25 @@
 msgid "Deleted %s.\n"
 msgstr "Desinstaláu %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "nun se puede abrir el ficheru fonte `%.250s'"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "nun se puede facer `stat' sobre'l ficheru fonte"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "el ficheru fonte `%.250s' nun ye un ficheru normal"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d parts: "
 msgid "Splitting package %s into %d part: "
@@ -5609,17 +5704,17 @@
 msgstr[0] "Poniendo paquete %s xuntu dende %d partes:"
 msgstr[1] "Poniendo paquete %s xuntu dende %d partes:"
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split necesita un nome de ficheru fonte como argumentu"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "--split toma como muncho un nome de ficheru fonte y un prefixo de destín"
@@ -5784,134 +5879,95 @@
 "  --help amuesa esti mensaxe d'aida.\n"
 "  --version amuesa la versión.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 #, fuzzy
 #| msgid "parse error"
 msgid "error"
 msgstr "parse error"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "avisu"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat %s: %s"
-msgstr "nun se puede facer `stat' sobre'l nome antiguu `%s': %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "llecturaenllaz(%s) falló: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, fuzzy, c-format
 #| msgid "two commands specified: %s and --%s"
 msgid "two commands specified: --%s and --%s"
 msgstr "especificáronse dos órdenes: %s y --%s"
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
 #| msgid "cannot open diversions: %s"
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "fallu al abrir ficheru de desvíos: %s"
 
-#: utils/update-alternatives.c:395
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "readlink(%s) failed: %s"
-msgid "scan of %s failed: %s"
-msgstr "llecturaenllaz(%s) falló: %s"
-
-#: utils/update-alternatives.c:420
-#, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "fallu al executar %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "nun pue facese de %s un enllaz simbólicu a %s: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "nun pue instalase %s como %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "nun se puede desaniciar %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 #| msgid "unexpected end of file in %s while trying to read %s"
 msgid "unexpected end of file while trying to read %s"
 msgstr "fin de ficheru inesperáu en %s al lleer %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "mientres se lleía %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 #| msgid "unexpected end of file in %s while trying to read %s"
 msgid "line not terminated while trying to read %s"
 msgstr "fin de ficheru inesperáu en %s al lleer %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s corrompíu: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "los saltos de llinia tan torgaos nos ficheros update-alternatives (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "mientres s'escribía %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "nome esclavu"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "esclavu duplicáu `%s'"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "enllaz esclavu"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "l'enllaz esclavu ye'l mesmu que'l principal %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "enllaz esclavu duplicáu `%s'"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "ficheru mayestru"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "camín duplicáu %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5920,94 +5976,78 @@
 "L'alternativa %s (parte del grupu d'enllaz %s), nun s'atopó. Desaniciándola "
 "de la llista d'alternatives."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "prioridá"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "ficheru esclavu"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "prioridá de %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "nun se puede lleer %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "estáu"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "estáu inválidu"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 #, fuzzy
 msgid "master link"
 msgstr "ficheru mayestru"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "nun se puede zarrar %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "descartando enllaz esclavu pervieyu %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "nun se puede escribir %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "mou auto"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "mou manual"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, fuzzy, c-format
 msgid "  link currently points to %s"
 msgstr " l'enllaz apunta anguaño a %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 #, fuzzy
 msgid "  link currently absent"
 msgstr " nun hai enllaz"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "%s - priority %s"
 msgid "%s - priority %d"
 msgstr "%s - prioridá %s"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr " esclavu %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Anguaño la «meyor» versión ye %s."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Nun hai denguna versión disponible."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, fuzzy, c-format
 #| msgid "There are %s choices for the alternative %s (providing %s)."
 msgid "There is %d choice for the alternative %s (providing %s)."
@@ -6015,40 +6055,40 @@
 msgstr[0] "Hai %s eleiciones pa l'alternativa %s (proporcionando %s)."
 msgstr[1] "Hai %s eleiciones pa l'alternativa %s (proporcionando %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Seleición"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Camín"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Prioridá"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Estáu"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Calcar enter para dexar el valor por omisión[*], o escribir el númberu de "
 "seleición: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "nun se troca %s con un enllaz."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -6057,99 +6097,154 @@
 "saltu criando %s porque'l ficheru asociáu %s (del grupu enllaz %s) nun "
 "esiste."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "nun se troca %s con un enllaz."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Llamada %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Alternativa %s ensin camudar porque la eleición %s nun ta disponible."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Nun s'alcuentra una alternativa %s."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 #| msgid "unexpected end of file in %s while trying to read %s"
 msgid "line too long or not terminated while trying to read %s"
 msgstr "fin de ficheru inesperáu en %s al lleer %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "renomando enllaz %s de %s a %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "renomando enllaz esclavu %s de %s a %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "el nome alternativu (%s) nun puede tener '/' y espacios."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "l'enllaz alternativu, nun ye absolutu y tendría de ser: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "el camín alternativu nun ye absolutu y tendría de ser: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "alternativu %s nun puede ser mayestru: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "enllaz alternativu %s ta disponible y remanáu por %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "camín alternativu %s nun esiste"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "alternativu %s nun puede ser esclavu de %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "alternativu %s nun puede ser mayestru: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "enllaz alternativu %s ta disponible y remanáu por %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "argumentu `%s' desconocíu"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necesita <enllaz> <nome> <camín> <prioridá>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<link> y <path> nun pueden ser lo mesmo"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "el valor de prioridá tien que ser un enteru"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s necesita <nome> <camín>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s necesita <nome>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "sólo se puede usar --slave con --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necesita <enllaz> <nome> <camín>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "el nome %s ye a la vez principal y esclavu"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "l'enllaz %s ye a la vez principal y esclavu"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s necesita un parámetru <file>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opción `%s' desconocida"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 #, fuzzy
 #| msgid ""
 #| "need --display, --query, --list, --get-selections, --config,--set, --set-"
@@ -6161,68 +6256,23 @@
 "necesito --display, --query, --list, --get-selections, --config,--set, --set-"
 "selections, --install, --remove, --all, --remove-all ó --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "alternativu %s nun puede ser mayestru: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "enllaz alternativu %s ta disponible y remanáu por %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "l'enllaz alternativu, nun ye absolutu y tendría de ser: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "el camín alternativu nun ye absolutu y tendría de ser: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "camín alternativu %s nun esiste"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "el nome alternativu (%s) nun puede tener '/' y espacios."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "ye un mayestru alternativu."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "ye esclavu de %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "alternativu %s nun puede ser esclavu de %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "fallu de llectura na entrada estándar"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "nun hai alternatives pa %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6234,48 +6284,48 @@
 "Camudóse %s (manualmente o por un programa). Camudando pa facer sólo "
 "anovamientos manuales."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "configurando la escoyeta automática de %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "alternativa %s pa %s nun ta rexistrada, nun se desaniciará."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Nun hai dengún programa qu'apurra %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Ren que configurar."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Hai namái una alternativa nel grupu enllaz %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "alternativa %s pa %s nun ta rexistrada, nun se desaniciará."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "desaniciando l'alternativa escoyida a mano, camudando %s a mou automáticu"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "tán deshabilitaos los anovamientos automáticos de %s, nun se va tocar."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6283,23 +6333,67 @@
 "pa volver a facer anovamientos automáticos usa `update-alternatives --auto "
 "%s'."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "Usando %s pa proveer %s (%s) en %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, fuzzy, c-format
 #| msgid "There is only one alternative in link group %s: %s"
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr "Hai namái una alternativa nel grupu enllaz %s: %s"
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
+#~ msgid "it is a master alternative."
+#~ msgstr "ye un mayestru alternativu."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "ye esclavu de %s"
+
+#, fuzzy
+#~| msgid "cannot stat old name `%s': %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "nun se puede facer `stat' sobre'l nome antiguu `%s': %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "llecturaenllaz(%s) falló: %s"
+
+#, fuzzy
+#~| msgid "readlink(%s) failed: %s"
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "llecturaenllaz(%s) falló: %s"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "fallu al executar %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "nun pue facese de %s un enllaz simbólicu a %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "nun pue instalase %s como %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "mientres s'escribía %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "nun se puede lleer %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "nun se puede zarrar %s: %s"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "nun se puede escribir %s: %s"
+
 #, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6615,9 +6709,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "sáltase l'elementu de %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "falló al executar tar"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "falló al criar nome de direutoriu temporal"
diff -uNr --exclude .git --exclude .bzr dpkg/po/boldquot.sed /home/vorlon/devel/multiarch/dpkg-debian/po/boldquot.sed
--- dpkg/po/boldquot.sed	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/boldquot.sed	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,10 @@
+s/"\([^"]*\)"/“\1”/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“”/""/g
+s/“/“[1m/g
+s/”/[0m”/g
+s/‘/‘[1m/g
+s/’/[0m’/g
Binary files dpkg/po/bs.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/bs.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/bs.po /home/vorlon/devel/multiarch/dpkg-debian/po/bs.po
--- dpkg/po/bs.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/bs.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2009-11-14 17:44+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -22,7 +22,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr ""
@@ -42,71 +42,76 @@
 msgid "ar member file (%s)"
 msgstr ""
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, c-format
+msgid "failed to seek %s"
+msgstr ""
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr ""
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr ""
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr ""
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr ""
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr ""
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr ""
@@ -121,135 +126,135 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr ""
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr ""
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
 "max=%d)"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr ""
 
 #  Now that we have verified everything its time to actually
 #  * build something. Lets start by making the ar-wrapper.
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 msgid "dpkg status database"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr ""
@@ -269,118 +274,120 @@
 msgid "unable to open directory '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr ""
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr ""
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr ""
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr ""
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr ""
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr ""
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr ""
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 msgid "out of memory for new error context"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, c-format
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr "upozorenje"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr "upozorenje"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr ""
@@ -395,184 +402,184 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr ""
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr ""
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr ""
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr ""
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr ""
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " bad version relationship %c%c"
 msgstr ""
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " `%c' is obsolete, use `%c=' or `%c%c' instead"
 msgstr ""
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " implicit exact match on version number, suggest using `=' instead"
 msgstr ""
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr ""
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr ""
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr ""
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr ""
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr ""
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr ""
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr ""
@@ -626,7 +633,7 @@
 msgid "unable to write to status fd %d"
 msgstr ""
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, c-format
 msgid "malloc failed (%zu bytes)"
 msgstr ""
@@ -636,8 +643,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr ""
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr ""
 
@@ -670,199 +677,204 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr ""
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr ""
 "\n"
 "Konfiguracijska datoteka `%s'"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr ""
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr ""
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr ""
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr ""
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr ""
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr ""
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr ""
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr ""
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr ""
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, c-format
 msgid "reading package info file '%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr ""
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr ""
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
 #, c-format
-msgid "EOF during value of field `%.*s' (missing final newline)"
+msgid "blank line in value of field '%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:434
-msgid "several package info entries found, only one allowed"
+#: lib/dpkg/parse.c:461
+#, c-format
+msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
+#: lib/dpkg/parse.c:546
+msgid "several package info entries found, only one allowed"
 msgstr ""
 
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr ""
@@ -881,61 +893,61 @@
 " %.255s"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "mora počinjati sa alfanumeričkim znakom"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 msgctxt "version"
 msgid "<none>"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 msgid "invalid character in version number"
 msgstr "broj verzije"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr ""
@@ -954,50 +966,50 @@
 msgid "(no description available)"
 msgstr ""
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr ""
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr ""
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr ""
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr ""
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr ""
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, c-format
 msgid "subprocess %s was interrupted"
 msgstr ""
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, c-format
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr ""
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ""
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr ""
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr ""
@@ -1017,196 +1029,202 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 msgid "triggers area"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr ""
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
 #, c-format
-msgid "unable to install new trigger interest file `%.250s'"
+msgid "cannot remove `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr ""
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr ""
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1231,7 +1249,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr ""
 
@@ -1250,12 +1268,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr ""
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr ""
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr ""
@@ -1306,339 +1324,353 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr ""
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr ""
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr ""
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, fuzzy, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Ažurirani instalirani paketi"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
 "nondirectory"
 msgstr ""
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr ""
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr ""
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr ""
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr ""
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr ""
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr ""
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr ""
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr ""
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr ""
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr ""
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr ""
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr ""
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
 " package %s, to enable %s."
 msgstr ""
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable %s.\n"
 msgstr ""
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr ""
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr ""
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr ""
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr ""
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr ""
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "requested.\n"
 msgstr ""
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr ""
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr ""
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr ""
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr ""
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr ""
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr ""
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr ""
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr ""
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
+#: src/archives.c:1367
 #, c-format
-msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1359
+#: src/archives.c:1371
 #, c-format
-msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr ""
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr ""
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
 "of backup copy"
 msgstr ""
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr ""
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr ""
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr ""
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr ""
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr ""
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1646,147 +1678,147 @@
 "Installing new config file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr ""
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr ""
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr ""
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr ""
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
 " cannot configure (current status `%.250s')"
 msgstr ""
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
 "%s"
 msgstr ""
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
 "%s"
 msgstr ""
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
 msgstr ""
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr ""
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
 " (= '%s'): %s"
 msgstr ""
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
 " (= '%s')"
 msgstr ""
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
 " (= '%s'): %s"
 msgstr ""
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
 " ('%s' is a symlink to '%s')"
 msgstr ""
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr ""
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr ""
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Ukucajte `exit' kada završite.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1795,12 +1827,12 @@
 "\n"
 "Konfiguracijska datoteka `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr ""
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1808,58 +1840,58 @@
 " ==> File also in package provided by package maintainer.\n"
 msgstr ""
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
 "     Not modified since installation.\n"
 msgstr ""
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
 " ==> Modified (by you or by a script) since installation.\n"
 msgstr ""
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
 " ==> Deleted (by you or by a script) since installation.\n"
 msgstr ""
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr ""
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr ""
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr ""
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr ""
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1869,157 +1901,157 @@
 "      Z     : start a shell to examine the situation\n"
 msgstr ""
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr ""
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr ""
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr ""
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr ""
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr ""
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr ""
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr ""
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, fuzzy, c-format
 msgid "%s depends on %s"
 msgstr "zavisi o"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, fuzzy, c-format
 msgid "%s pre-depends on %s"
 msgstr "unaprijed zavisi o"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, fuzzy, c-format
 msgid "%s recommends %s"
 msgstr "preporučuje"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, fuzzy, c-format
 msgid "%s suggests %s"
 msgstr "predlaže"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr ""
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, fuzzy, c-format
 msgid "%s conflicts with %s"
 msgstr "sukobljava se sa"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, fuzzy, c-format
 msgid "%s enhances %s"
 msgstr "poboljšava"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr ""
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr ""
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr ""
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr ""
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr ""
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr ""
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr ""
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr ""
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+msgid "Use --help for help about diverting files."
 msgstr ""
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2027,7 +2059,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debianov `%s' program za rukovanje paketima."
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2035,8 +2067,8 @@
 "Copyright (C) 2010 Guillem Jover.\n"
 msgstr ""
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2050,7 +2082,7 @@
 "ili kasniju za uslove kopiranja.  NEMA garancije.  Pogledajte\n"
 "dselect --licence za detalje.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2058,7 +2090,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2070,7 +2102,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2088,7 +2120,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2097,24 +2129,19 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr ""
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr ""
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2124,122 +2151,122 @@
 "\n"
 "Konfiguracijska datoteka `%s'"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr ""
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr ""
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, c-format
 msgid "unable to remove copied source file '%s'"
 msgstr ""
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr ""
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr ""
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr ""
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr ""
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 msgid "any diversion of %s"
 msgstr "Debianov `%s' program za rukovanje paketima."
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr ""
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr ""
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr ""
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr ""
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr ""
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr ""
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr ""
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr ""
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr ""
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr ""
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr ""
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr ""
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2247,7 +2274,7 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2255,16 +2282,16 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr ""
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr ""
 
@@ -2328,8 +2355,8 @@
 msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr ""
@@ -2411,7 +2438,7 @@
 msgid "--compare-versions bad relation"
 msgstr ""
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr ""
@@ -2457,80 +2484,80 @@
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
 "currently installed."
 msgstr ""
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr ""
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, c-format
 msgid "reading files list for package '%.250s'"
 msgstr ""
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr ""
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2568,7 +2595,7 @@
 msgstr ""
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr ""
 
 #: src/help.c:129
@@ -2597,7 +2624,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 msgid "unable to setenv for subprocesses"
 msgstr ""
 
@@ -2607,65 +2634,65 @@
 msgstr ""
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr ""
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr ""
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr ""
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr ""
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr ""
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr ""
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr ""
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr ""
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr ""
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr ""
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr ""
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2674,7 +2701,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr ""
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr ""
 
@@ -2714,7 +2741,7 @@
 "\n"
 msgstr ""
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -2793,7 +2820,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -2834,30 +2861,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -2866,95 +2897,95 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 msgid "Turn all dependency problems into warnings"
 msgstr ""
 
-#: src/main.c:263
+#: src/main.c:265
 msgid "Turn dependency version problems into warnings"
 msgstr ""
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 msgid "Invocation and status of maintainer scripts"
 msgstr ""
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 msgid "Output for each configuration file"
 msgstr ""
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2962,7 +2993,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -2970,35 +3001,35 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr ""
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3007,7 +3038,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3015,12 +3046,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr ""
@@ -3043,8 +3074,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr ""
 
@@ -3200,192 +3231,192 @@
 msgid "passed\n"
 msgstr ""
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr ""
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr ""
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr ""
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr ""
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr ""
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr ""
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr ""
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 msgid "package control information extraction"
 msgstr ""
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr ""
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr ""
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
 "%s"
 msgstr ""
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr ""
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr ""
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr ""
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr ""
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr ""
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr ""
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr ""
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr ""
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr ""
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr ""
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr ""
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr ""
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr ""
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
 "'%.250s')"
 msgstr ""
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr ""
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
@@ -3530,7 +3561,7 @@
 "\n"
 msgstr ""
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3544,6 +3575,10 @@
 "  case left alignment will be used.\n"
 msgstr ""
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3594,53 +3629,53 @@
 msgid "Removing %s ...\n"
 msgstr ""
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
 "may be a mount point?"
 msgstr ""
 
-#: src/remove.c:281 src/remove.c:361
+#: src/remove.c:289
 #, c-format
-msgid "cannot remove `%.250s'"
+msgid "unable to securely remove '%.250s'"
 msgstr ""
 
-#: src/remove.c:284
+#: src/remove.c:361
 #, c-format
-msgid "unable to securely remove '%.250s'"
+msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 
-#: src/remove.c:345
+#: src/remove.c:383
 #, c-format
-msgid "while removing %.250s, directory '%.250s' not empty so not removed."
+msgid "cannot remove '%.250s'"
 msgstr ""
 
-#: src/remove.c:384
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr ""
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr ""
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr ""
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr ""
 
@@ -3683,14 +3718,18 @@
 msgid "read error on standard input"
 msgstr ""
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 msgstr ""
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -3701,7 +3740,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -3714,52 +3753,52 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr ""
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr ""
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr ""
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr ""
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr ""
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr ""
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr ""
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr ""
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr ""
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr ""
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr ""
 
@@ -3823,16 +3862,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr ""
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debianov `%s' program za rukovanje paketima."
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -3840,7 +3879,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -3849,7 +3888,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -3863,30 +3902,30 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr ""
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr ""
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr ""
@@ -3916,35 +3955,35 @@
 
 #: src/update.c:52
 #, c-format
-msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr ""
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr ""
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr ""
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4053,8 +4092,8 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
@@ -4086,22 +4125,22 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, c-format
 msgid "failed to make temporary file (%s)"
 msgstr ""
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 msgid "control member"
 msgstr ""
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, c-format
 msgid "failed to unlink temporary file (%s), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, c-format
 msgid "failed to rewind temporary file (%s)"
 msgstr ""
@@ -4116,18 +4155,18 @@
 msgid "error writing `%s'"
 msgstr ""
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 msgid "data member"
 msgstr "broj verzije"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, c-format
 msgid "failed to write filename to tar pipe (%s)"
 msgstr ""
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4145,165 +4184,166 @@
 msgid "error reading %s from file %.255s"
 msgstr ""
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 msgid "archive magic version number"
 msgstr "broj verzije"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 msgid "archive member header"
 msgstr ""
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, c-format
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr ""
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 msgid "archive information header member"
 msgstr ""
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr ""
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr ""
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, c-format
 msgid "skipped archive member data from %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, c-format
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, c-format
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
 " size %jd bytes: control archive= %jd bytes.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, c-format
 msgid "archive has malformatted control member size '%s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, c-format
 msgid "skipped archive control member data from %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
 " size %jd bytes: control archive= %jd, main archive= %jd.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, 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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr ""
 
-#: dpkg-deb/extract.c:289
-msgid "failed to create directory"
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
 msgstr ""
 
-#: dpkg-deb/extract.c:291
-msgid "failed to chdir to directory after creating it"
+#: dpkg-deb/extract.c:310
+msgid "failed to create directory"
 msgstr ""
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
+#: dpkg-deb/extract.c:312
+msgid "failed to chdir to directory after creating it"
 msgstr ""
 
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr ""
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr ""
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr ""
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
 "Perhaps you should be using dpkg --install ?"
 msgstr ""
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr ""
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr ""
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr ""
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -4313,75 +4353,75 @@
 "\n"
 "Konfiguracijska datoteka `%s'"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr ""
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, c-format
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr ""
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr ""
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Greška u formatu"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr ""
 
@@ -4402,11 +4442,13 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4415,11 +4457,12 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4432,7 +4475,7 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4441,23 +4484,23 @@
 "unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
 msgstr ""
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr ""
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr ""
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr ""
@@ -4477,7 +4520,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr ""
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr ""
@@ -4562,53 +4605,58 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr ""
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+msgid "package architecture"
+msgstr ""
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr ""
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr ""
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -4619,12 +4667,17 @@
 "\n"
 msgstr ""
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr ""
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr ""
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr ""
@@ -4654,7 +4707,7 @@
 msgid "split package part"
 msgstr ""
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "urađeno\n"
@@ -4703,28 +4756,36 @@
 "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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr ""
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr ""
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr ""
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -4833,42 +4894,42 @@
 msgid "Deleted %s.\n"
 msgstr ""
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr ""
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr ""
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr ""
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr ""
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 
@@ -4936,477 +4997,436 @@
 "  --version                show the version.\n"
 msgstr ""
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr ""
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "upozorenje"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr ""
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, c-format
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Configuration file `%s'"
+msgid "unable to remove '%s'"
 msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, c-format
 msgid "duplicate slave name %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr ""
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr ""
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
-#, c-format
-msgid "priority of %s: %s"
-msgstr ""
-
 #: utils/update-alternatives.c:1244
 #, c-format
-msgid "unable to read %s: %s"
+msgid "priority of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr ""
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr ""
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr ""
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Debianov `%s' program za rukovanje paketima."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr ""
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "Opis"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
 #, c-format
-msgid "unknown argument `%s'"
+msgid "alternative name (%s) must not contain '/' and spaces."
 msgstr ""
 
-#: utils/update-alternatives.c:2063
-msgid "--install needs <link> <name> <path> <priority>"
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
-msgid "<link> and <path> can't be the same"
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
-msgid "priority must be an integer"
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
 #, c-format
-msgid "--%s needs <name> <path>"
+msgid "alternative link %s is already managed by %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2241
 #, c-format
-msgid "--%s needs <name>"
+msgid "alternative path %s doesn't exist."
 msgstr ""
 
-#: utils/update-alternatives.c:2108
-msgid "--slave only allowed with --install"
+#: utils/update-alternatives.c:2254
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
 msgstr ""
 
-#: utils/update-alternatives.c:2110
-msgid "--slave needs <link> <name> <path>"
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2278
 #, c-format
-msgid "name %s is both primary and slave"
+msgid "alternative link %s is already managed by %s (slave of %s)."
 msgstr ""
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2324
 #, c-format
-msgid "link %s is both primary and slave"
+msgid "unknown argument `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2142
-#, c-format
-msgid "--%s needs a <file> argument"
+#: utils/update-alternatives.c:2343
+msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: utils/update-alternatives.c:2168
-#, c-format
-msgid "unknown option `%s'"
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
+msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2173
-msgid ""
-"need --display, --query, --list, --get-selections, --config, --set, --set-"
-"selections, --install, --remove, --all, --remove-all or --auto"
+#: utils/update-alternatives.c:2349
+msgid "priority must be an integer"
 msgstr ""
 
-#: utils/update-alternatives.c:2215
+#: utils/update-alternatives.c:2362
 #, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
+msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
+#: utils/update-alternatives.c:2376
 #, c-format
-msgid "alternative link %s is already managed by %s."
+msgid "--%s needs <name>"
 msgstr ""
 
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
+#: utils/update-alternatives.c:2388
+msgid "--slave only allowed with --install"
 msgstr ""
 
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
+#: utils/update-alternatives.c:2390
+msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2239
+#: utils/update-alternatives.c:2399
 #, c-format
-msgid "alternative path %s doesn't exist."
+msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
+#: utils/update-alternatives.c:2402
 #, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
+msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
+#: utils/update-alternatives.c:2422
+#, c-format
+msgid "--%s needs a <file> argument"
 msgstr ""
 
-#: utils/update-alternatives.c:2257
+#: utils/update-alternatives.c:2448
 #, c-format
-msgid "it is a slave of %s"
+msgid "unknown option `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
+#: utils/update-alternatives.c:2453
+msgid ""
+"need --display, --query, --list, --get-selections, --config, --set, --set-"
+"selections, --install, --remove, --all, --remove-all or --auto"
 msgstr ""
 
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr ""
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
 "updates only."
 msgstr ""
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr ""
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr ""
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
Binary files dpkg/po/ca.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/ca.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/ca.po /home/vorlon/devel/multiarch/dpkg-debian/po/ca.po
--- dpkg/po/ca.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/ca.po	2012-06-07 10:11:09.426073000 -0700
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.15.8.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-10-24 14:39+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -25,7 +25,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "no es pot escriure el fitxer «%.250s»"
@@ -47,71 +47,77 @@
 msgstr "no s'ha pogut fer «fstat» del fitxer membre d'ar (%s)"
 
 # Açò que he escrit té sentit? jm
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "no s'ha pogut llegir de la còpia del búfer per a %s"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "no s'ha pogut escriure a la còpia del búfer per a %s"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "llegida curta de la còpia del búfer per a %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "no s'ha pogut executar tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "no es pot executar %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: descompressió"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compressió"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: s'ha produït un error al vincular l'entrada al flux gzip"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: s'ha produït un error de lectura intern de gzip: «%s»"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: s'ha produït un error d'escriptura intern de gzip"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: s'ha produït un error al vincluar la sortida al flux gzip"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: s'ha produït un error de lectura intern de gzip"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: s'ha produït un error d'escriptura intern de gzip: «%s»"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: s'ha produït un error d'escriptura intern de gzip: «%s»"
@@ -126,31 +132,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: s'ha produït un error de lectura intern de bzip2: «%s»"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: s'ha produït un error d'escriptura intern de bzip2"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: s'ha produït un error al vincluar la sortida al flux bzip2"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: s'ha produït un error de lectura intern de bzip2"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: s'ha produït un error d'escrptura intern de bzip2: «%s»"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "error inesperat de bzip2"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -159,7 +165,7 @@
 "el directori d'actualitzacions conté el fitxer «%.250s», amb un nom massa "
 "gran (longitud=%d, màx=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -167,101 +173,101 @@
 "el directori d'actualitzacions conté fitxers amb noms de diferents longituds "
 "(%d i %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "no es pot analitzar el directori d'actualitzacions «%.255s»"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "no s'ha pogut eliminar el fitxer d'actualització incorporat %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "no es pot crear «%.255s»"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "no es pot emplenar %.250s"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "no es pot fer «flush» en %.250s després del farciment"
 
 # FIXME original
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "no es pot tornar al principi de %.250s després del farciment"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "no es pot obrir el fitxer de blocatge %s per comprovar"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr ""
 "no es pot obrir/crear el fitxer de blocatge de la base de dades d'estat"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "no teniu permís per a blocar la base de dades d'estat del dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "no es pot blocar la base de dades d'estat del dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "la operació soŀlicitada requereix privilegis de superusuari"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "no es pot accedir a l'àrea d'estat del dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 "l'operació requereix accés de lectura i escriptura a l'àrea d'estat del dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "no s'ha pogut esborrar el nostre propi fitxer d'actualització %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "no es pot escriure l'estat d'actualització de «%.250s»"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "no es pot fer «flush» amb l'estat d'actualització de «%.250s»"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "no es pot truncar l'estat actualitzat de «%.250s»"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "no es pot fer «fsync» sobre l'estat d'actualització de «%.250s»"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "no es pot tancar l'estat d'actualització de «%.250s»"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "no es pot instaŀlar l'estat actualització de «%.250s»"
@@ -286,77 +292,79 @@
 msgid "unable to open directory '%s'"
 msgstr "no es pot obrir el fitxer «%s»"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "no es pot obrir el fitxer «%s»"
 
 # No es pot sincronitzar, o no es pot fer «sync»? jm
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "no es pot fer «sync» sobre el fitxer «%s»"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "no es pot tancar el fitxer «%s»"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "no s'han pogut escriure els detalls de «%.50s» a «%.250s»"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "no s'ha pogut obrir «%s» per a escriure %s a la base de dades"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr ""
 "no es pot establir emmagatzemament intermedi al fitxer de la base de dades %s"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr ""
 "no s'ha pogut escriure el registre de la base de dades %s sobre «%.50s» a "
 "«%.250s»"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "no s'ha pogut fer «flush» de la base de dades %s en «%.250s»"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "no s'ha pogut fer «fsync» sobre la base de dades %s a «%.250s»"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "no s'ha pogut tancar «%.250s» després d'escriure la base de dades %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "no s'ha pogut enllaçar «%.250s» amb «%.250s» com a còpia de seguretat de la "
 "base de dades %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 "no s'ha pogut instaŀlar «%.250s» com a «%.250s» amb la base de dades %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -365,7 +373,7 @@
 "%s: s'ha produït un error greu irrecuperable, s'esta abortant:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -377,13 +385,13 @@
 "%s: s'ha produït un error greu irrecuperable, s'esta abortant:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "memòria exhaurida per a una entrada nova de neteja"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -392,32 +400,32 @@
 "%s: s'ha produït un error en netejar:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: s'han produït massa errors niuats durant la recuperació!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "memòria exhaurida per a una entrada nova de neteja"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "memòria exhaurida per a una entrada nova de neteja amb massa arguments"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: error closing %s: %s"
 msgid "%s: error: %s\n"
 msgstr "%s: s'ha produït un error en tancar %s: %s"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: avís: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: s'ha produït l'error intern «%s»\n"
@@ -433,98 +441,98 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "no s'admet «%.*s» per a %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "brossa després de %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "el nom del paquet és invàlid (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "camp de detalls «%s» del fitxer buit"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "camp de detalls del fitxer «%s» no permés al fitxer d'estat"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "massa valors en el camp de detalls del fitxer «%s» (comparat amb d'altres)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "nom de valors insuficient en el camp dels detalls de fitxer «%s» (comparat "
 "amb d'altres)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "sí/no en un camp booleà"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "paraula al camp «priority»"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "el valor pel camp «status» no està permés en aquest context"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "primera paraula (de requeriment) al camp «status»"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "segona paraula (d'error) al camp «status»"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "tercera paraula (d'estat) al camp «status»"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "error en la cadena Version «%.250s»"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "S'ha utilitzat un camp «Revision» o «Package-Revision» obsolet"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "en aquest context no es permet un valor pel camp «config-version»"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "error en la cadena Config-Version «%.250s»"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "el valor de «conffiles» té una línia amb format erroni «%.*s»"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 "el valor de «conffiles» conté una línia que comença amb un caràcter «%c» que "
 "no és un espai"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "s'ha indicat com conffile el directori arrel o un directori nul"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -532,12 +540,12 @@
 "En el camp «%s», manca un nom de paquet, o s'ha trobat brutícia on "
 "s'esperava un nom de paquet"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "camp «%s», nom de paquet invàlid «%.255s»: %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -546,7 +554,7 @@
 "el camp «%s», fa referència a «%.255s»:\n"
 " la relació de versió %c%c és errònia"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -555,7 +563,7 @@
 "camp «%s», referència a «%.255s»:\n"
 " «%c» està obsolet, useu «%c=» o «%c%c»"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -565,11 +573,11 @@
 " coincidència implícita en el número exacte de versió, se suggereix emprar "
 "«=»"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Només podeu emprar versions exactes per a Provides"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -579,56 +587,56 @@
 " el valor de versió comença amb un caràcter no alfanumèric, se suggereix "
 "afegir un espai"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "camp «%s», referència a «%.255s»: la versió conté un «%c»"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "camp «%s», referència a «%.255s»: versió no terminada"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "camp «%s», referència a «%.255s»: error en la versió"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr ""
 "camp «%s», error de sintaxi després de la referència al paquet «%.255s»"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "no s'admeten alternatives («|») en el camp %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "en aquest context no es permet un valor pel camp «triggers-pending»"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "el nom de l'activador pendent «%.255s» és iŀlegal: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "l'activador pendent «%.255s» és duplicat"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "el valor pel camp «triggers-awaited» no està permés en aquest context"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "el nom del paquet al activador esperat «%.255s» és iŀlegal: %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "el paquet de l'activador esperat «%.255s» és duplicat"
@@ -685,7 +693,7 @@
 msgid "unable to write to status fd %d"
 msgstr "no es pot escriure al descriptor de fitxer d'estat %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "realloc failed (%zu bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -696,8 +704,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "ha fallat el «realloc» (%zu octets)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "no s'ha pogut assignar memòria"
 
@@ -731,203 +739,209 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "no es pot establir l'atribut close-on-exec per a «%.250s»"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "error de configuració: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "no s'ha pogut obrir per lectura el fitxer de configuració «%.255s»: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "cometes desequilibrades a «%s»"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "l'opció «%s» és desconeguda"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "l'opció «%s» necessita un paràmetre"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "l'opció «%s» no porta paràmetres"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "error de lectura al fitxer de configuració «%.250s»"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "s'ha produït un error en tancar el fitxer de configuració «%.250s»"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "s'ha produït un error en obrir el directori de configuració «%.250s»"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "l'opció --%s és desconeguda"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "l'opció --%s té un paràmetre"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "l'opció --%s no porta paràmetres"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "l'opció -%c és desconeguda"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "l'opció -%c té un paràmetre"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "l'opció -%c no porta paràmetres"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "l'opció «--%s» és obsoleta\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "accions en conflicte -%c (--%s) i -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "valor duplicat en el camp «%s»"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "el nom de camp definit per l'usuari «%.*s» és massa curt"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "valor duplicat pel camp definit per l'usuari «%.*s»"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "camp «Configured-Version» per a un paquet amb Status no apropiat"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "el paquet té l'estat %s però s'esperen activadors"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "el paquet té l'estat triggers-awaited però no s'espera cap activador"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "el paquet té estat %s però els activadors són pendents"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 "el paquet té l'estat triggers-pending però no hi ha cap activador pendent"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "Paquet que no estant instaŀlat té conffiles, ens n'oblidem"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr ""
 "s'ha produït un error en obrir per a lectura el fitxer d'informació del "
 "paquet «%.255s»"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "no es pot executar «stat» sobre el fitxer «%.255s»"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "no es pot executar «mmap» sobre el fitxer «%.255s»"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "no es pot executar «stat» sobre el fitxer «%.255s»"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "s'ha produït un error en tancar després de la lectura: «%.255s»"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF després del nom del camp «%.*s»"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "línia nova dins del nom del camp «%.*s»"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "EOF d'MSDOS (^Z) dins del nom del camp «%.*s»"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "el nom del camp «%.*s» ha d'estar seguit per dos punts"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF abans del valor del camp «%.*s» (manca una línia nova al final)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 "caràcter EOF d'MSDOS dins del valor del camp «%.*s» (manca una línia nova?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "línia nova dins del nom del camp «%.*s»"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF durant el valor del camp «%.*s» (manca una línia nova al final)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 "s'han trobat diverses entrades d'informació de paquets, només se'n permet una"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "s'ha produït un error en tancar després de la lectura: «%.255s»"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "no hi ha informació de paquets en «%.255s»"
@@ -956,64 +970,64 @@
 "%s, al fitxer «%.255s» prop de la línia %d:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "no pot ser una cadena buida"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "ha de començar amb un caràcter alfanumèric"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "el caràcter «%c» no està permès (només s'admeten lletres, dígits i caràcters "
 "«%s»"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<cap>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "la cadena de versió està buida"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "la cadena de versió té espais"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "l'època en la versió no és un número"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "no hi ha res darrere dels dos punts al número de versió"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "caràcter invàlid al número de versió"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "caràcter invàlid al número de revisió"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "manca %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "valor buit per a %s"
@@ -1032,52 +1046,52 @@
 msgid "(no description available)"
 msgstr "(no hi ha cap descripció disponible)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "no es pot descartar el senyal %s abans d'executar %.250s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "s'ha produït un error en desassignar el senyal %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (subprocés): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "ha fallat el «fork»"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "el subprocés %s retornà el codi d'eixida d'error %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "el «wait» per al subprocés %s ha fallat"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "el subprocés %s ha estat finalitzat pel senyal (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", s'ha generat un fitxer «core»"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "el subprocés %s ha fallat amb codi d'estat en espera %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "el «wait» per al subprocés %s ha fallat"
@@ -1100,62 +1114,54 @@
 msgstr ""
 "error de sintaxi al fitxer d'activadors ajornats «%.250s» al caràcter «%s»%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "no es pot obrir el fitxer de blocatge d'activadors «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "activat"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "no es pot fer «stat» sobre el fitxer d'activadors ajornats «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "no es pot obrir el fitxer d'activadors ajornats «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "no es pot obrir/crear el fitxer d'activadors ajornats nou «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr ""
 "s'ha produït un error en llegir el fitxer d'activadors ajornats «%.255s»"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "no es pot escriure el fitxer d'activadors ajornats nou «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "no es pot tancar el fitxer d'activadors ajornats nou «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "no es pot instaŀlar el fitxer d'activadors ajornats nou «%.250s»"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "no es permeten els noms d'activador buits"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "el nom de l'activador conté un caràcter invàlid"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1164,17 +1170,17 @@
 "la sintaxi del nom de l'activador «%.250s» és invàlida o desconeguda (als "
 "activadors interessants per al paquet «%.250s»"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "no es pot obrir el fitxer d'activadors interessants «%.250s»"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "no es pot fer «rewind» al fitxer d'activadors interessants «%.250s»"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1183,38 +1189,44 @@
 "error de sintaxi al fitxer d'activadors interessants «%.250s»; el nom del "
 "paquet «%.250s» és iŀlegal: %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "no es pot crear el fitxer d'activadors interessants nou «%.250s»"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "no es pot escriure el fitxer d'activadors interessants «%.250s»"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr ""
 "no es pot fer «flush» del fitxer d'activadors interessants nou «%.250s»"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "no es pot fer «sync» del fitxer d'activadors interessants nou «%.250s»"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "no es pot tancar el fitxer d'activadors interessants nou «%.250s»"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "no es pot instaŀlar el fitxer d'activadors interessants nou «%.255s»"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "no es pot esborrar «%.250s»"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "no es pot crear el fitxer d'activadors interessants nou «%.250s»"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "no es pot tancar el fitxer d'activadors interessants nou «%.250s»"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1222,48 +1234,48 @@
 "hi ha un fitxer d'activadors interessants duplicat per al fitxer «%.250s» i "
 "el paquet «%.250s»"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "no es pot crear el fitxer d'activadors de fitxer nou «%.250s»"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "no es pot escriure el fitxer d'activadors de fitxer nou «%.250s»"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "no es pot fer «flush» del fitxer d'activadors de fitxer nou «%.250s»"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "no es pot fer «sync» del fitxer d'activadors de fitxer nou «%.250s»"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "no es pot tancar el fitxer d'activadors de fitxer nou «%.250s»"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr ""
 "no es pot instaŀlar el fitxer d'activadors de fitxer nou com a «%.250s»"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "no es pot llegir el fitxer d'activadors de fitxer «%.250s»"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "error de sintaxi al fitxer d'activadors de fitxer «%.250s»"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1272,7 +1284,7 @@
 "el registre d'activadors de fitxer menciona el nom de paquet iŀlegal "
 "«%.250s» (per l'interés en el fitxer «%.250s»): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1281,36 +1293,44 @@
 "el fitxer d'informació de control dels galets «%.250s» conté sintàxi "
 "d'activador iŀlegal al nom d'activador «%.250s»: %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr ""
 "no es pot obrir el fitxer d'informació de control dels activadors «%.250s»"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 "el fitxer d'informació de control dels activadors conté sintaxi de directiva "
 "desconeguda"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 "el fitxer d'informació de control dels activadors conté la directiva "
 "desconeguda «%.250s»"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "no es pot crear el directorio d'estat dels activadors «%.250s»"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 "no es pot establir el propietari del directori d'estat d'activadors «%.250s»"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "no es permeten els noms d'activador buits"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "el nom de l'activador conté un caràcter invàlid"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1335,7 +1355,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "s'ha produït un error en formatar la cadena a una variable varbuf"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "s'ha produït un error en llegir des d'un conducte de dpkg-deb"
 
@@ -1355,12 +1375,12 @@
 msgstr ""
 "s'ha produït un error en establir el propietari de l'enllaç simbòlic «%.255s»"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "s'ha produït un error en establir el propietari de «%.255s»"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "s'ha produït un error en establir els permisos de «%.255s»"
@@ -1423,17 +1443,26 @@
 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:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "no es pot fer «stat» sobre el fitxer «%s»"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "S'està reemplaçant fitxers del paquet antic %s…\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Reemplaçat pels fitxers al paquet instaŀlat %s…\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1442,99 +1471,104 @@
 "s'està intentant sobreescriure el directori «%.250s» del paquet %.250s "
 "%.250s amb un no directori"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "s'està intentant sobreescriure «%.250s», que també està en el paquet %.250s "
 "%.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "no s'ha pogut crear «%.255s» (en processar «%.255s»)"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "rerefons dpkg-deb durant «%.255s»"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "s'ha produït un error en tancar/escriure «%.255s»"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "s'ha produït un error en crear el conducte «%.255s»"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "s'ha produït un error en crear el dispositiu «%.255s»"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "s'ha produït un error en crear l'enllaç dur «%.255s»"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, 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:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "s'ha produït un error en crear el directori «%.255s»"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "no es pot moure «%.255s» per a instaŀlar una versió nova"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "no es pot llegir l'enllaç «%.255s»"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, 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:830
+#: src/archives.c:841
 #, 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:835
+#: src/archives.c:846
 #, 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'instaŀlar la "
 "versió nova"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "no es pot instaŀlar una versió nova de «%.255s»"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "no es pot obrir «%.255s»"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "no es pot fer «sync» al fitxer «%.255s»"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1543,7 +1577,7 @@
 "no es tindrà en compte el problema de dependència amb %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1552,7 +1586,7 @@
 "es considera la desconfiguració del paquet\n"
 " essencial %s, per a habilitar %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1561,7 +1595,7 @@
 "dpkg: no, %s és essencial, no serà desconfigurat\n"
 " per a habilitar %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1570,29 +1604,29 @@
 "dpkg: no, no es pot continuar amb %s (--auto-deconfigure ajudarà):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "supressió de %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "instaŀlació de «%.255s»"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 "dpkg: es considera la desinstaŀlació de %s, que seria trencat per %s…\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: sí, es desconfigurarà %s (trencat per %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1601,11 +1635,11 @@
 "dpkg: referent a %s que conté %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "s'ignorarà el trencament, es pot procedir igualment!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1614,31 +1648,31 @@
 "instaŀlar %.250s trencaria %.250s, i\n"
 " la deconfiguració no és permesa (--auto-deconfigure podria ajudar)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "la instaŀlació del paquet %.250s trencaria el programari existent"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: es considera la desinstaŀlació de %s en favor de %s…\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s no està correctament instaŀlat - no es tindrà en compte cap dependència "
 "d'aquest.\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: poden haver-hi problemes en desinstaŀlar %s, donat que proveeix a %s "
 "…\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1647,109 +1681,111 @@
 "dpkg: el paquet %s requereix ser reinstaŀlat, però es desinstaŀlarà tal i "
 "com heu demanat.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: el paquet %s requereix ser reinstaŀlat, no es desinstaŀlarà.\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: sí, es desinstaŀlarà %s en favor de %s.\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "paquets en conflicte - no s'instaŀlarà %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "s'ignorarà el conflicte, es pot procedir igualment!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive necessita almenys un camí com a argument"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "«find» per a --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "no s'ha pogut fer «fdopen» al conducte de find"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "s'ha produït un error en llegir el conducte de find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "s'ha produït un error en tancar el conducte de find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "La recerca emprant --recursive ha tornat l'eixida no gestionada %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 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:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s necessita almenys un paquet arxiu com a argument"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<eixida estàndard>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<error estàndard>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "S'està seleccionant el paquet %s prèviament no seleccionat.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "S'està ometent el paquet no seleccionat %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "La versió %.250s de %.250s ja és instaŀlada, es descarta.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "s'està desactualitzant %.250s de %.250s a %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "No es desactualitzarà %.250s de la versió %.250s a la %.250s, es descarta.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1758,37 +1794,37 @@
 "no es pot esborrar la versió acabada d'instaŀlar de «%.250s» per a permetre "
 "la reinstaŀlació de la còpia de seguretat"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "no es pot restablir la versió de la còpia de seguretat de «%.250s»"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "no es pot suprimir la còpia de seguretat de «%.250s»"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "no es pot suprimir la versió acabada d'instaŀlar de «%.250s»"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "no es pot suprimir la versió acabada d'extraure de «%.250s»"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "no es pot fer «stat» sobre el conffile de nova distribució «%.250s»"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "no es pot fer «stat» sobre el conffile «%.250s» actualment instaŀlat"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1799,7 +1835,7 @@
 "El conffile «%s» no existeix en el sistema.\n"
 "S'està instaŀlant el conffile nou tal i com heu demanat.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: no s'ha pogut esborrar l'antiga còpia de seguretat «%.250s»: %s"
@@ -1809,53 +1845,53 @@
 # van més amb reanomena, i el GNOME ho està seguint.
 # Anem amb «canviar el nom», val? jm
 # Fins on jo veig, el Nautilus diu això, en octubre de 2010…
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: no s'ha pogut canviar el nom de «%.250s» a «%.250s»: %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: no s'ha pogut esborrar «%s»: %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 "%s: no s'ha pogut esborrar la versió de l'antiga distribució «%.250s»: %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: no s'ha pogut esborrar «%.250s» (abans de sobreescriure): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: no s'ha pogut enllaçar «%.250s» a «%.250s»: %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "S'està instaŀlant una versió nova del fitxer de configuració %s…\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "no es pot instaŀlar «%.250s» com a «%.250s»"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "no hi ha instaŀlat cap paquet anomenat «%s», no es pot configurar"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "el paquet %.250s ja està instaŀlat i configurat"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1864,7 +1900,7 @@
 "el paquet %.250s no està llest per a configurar-se\n"
 " no es pot configurar (estat actual «%.250s»)"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1873,11 +1909,11 @@
 "dpkg: problemes de dependències impedeixen la configuració de %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemes de dependències - es deixa sense configurar"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1887,7 +1923,7 @@
 "heu demanat:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1895,12 +1931,12 @@
 "El paquet està en un greu estat d'inconsistència - heu de\n"
 " reinstaŀlar-lo abans d'intentar la seva configuració."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "S'està configurant %s (%s)…\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1909,7 +1945,7 @@
 "%s: no es pot fer «stat» sobre el fitxer de configuració «%s»\n"
 " (= «%s»): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1918,7 +1954,7 @@
 "%s: el fitxer de configuració «%s» és un enllaç circular\n"
 " (= «%s»)"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1927,7 +1963,7 @@
 "%s: no es pot llegir el valor de l'enllaç simbòlic del conffile «%s»\n"
 " (= «%s»): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1936,35 +1972,35 @@
 "%s: el conffile «%.250s» apunta a un nom de fitxer corrupte\n"
 " («%s» és un enllaç simbòlic a «%s»)"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: el conffile «%.250s» no és un fitxer normal o un enllaç simbòlic (= «%s»)"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "suma md5"
 
 # FIXME hash. Cal traduir-ho. jm
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: no es pot obrir el conffile %s pel «hash»: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Escriviu «exit» quan acabeu.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1973,12 +2009,12 @@
 "\n"
 "Fitxer de configuració «%s»"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " («%s» actualment)"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1989,7 +2025,7 @@
 " ==> Fitxer en el sistema creat per vosaltres o per alguna seqüència.\n"
 " ==> Fitxer també en el paquet proveït pel mantenidor.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1998,7 +2034,7 @@
 "\n"
 "     No modificat des de la instaŀlació.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2008,7 +2044,7 @@
 " ==> Modificat (per vosaltres o per alguna seqüència) des de la "
 "instaŀlació.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -2017,38 +2053,38 @@
 "\n"
 " ==> Suprimit (per vosaltres o per alguna seqüència) des de la instaŀlació.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> El distribuïdor del paquet ha publicat una versió actualitzada.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr ""
 "     La versió del paquet és la mateixa que la de l'última instaŀlació.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> S'emprarà el fitxer nou tal i com heu demanat.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> S'emprarà el fitxer antic tal i com heu demanat.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Es manté el fitxer de configuració antic per defecte.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> S'emprarà el fitxer de configuració nou per defecte.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2063,159 +2099,161 @@
 "      D    : mostra les diferències entre versions\n"
 "      Z    : executa un intèrpret d'ordres per a examinar la situació\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " L'acció per defecte és conservar la versió actual.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " L'acció per defecte és instaŀlar la versió nova.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[per defecte=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[per defecte=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[no hi ha opció per defecte]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "error a l'escriure l'eixida d'error, s'ha descobert abans de preguntar sobre "
 "conffiles"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "error de lectura en l'entrada estàndard al preguntar sobre conffiles"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF en l'entrada estàndard al preguntar sobre conffiles"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s depèn de %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s pre-depèn de %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s recomana %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s suggereix %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s trenca %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s entra en conflicte amb %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s millora %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s serà desinstaŀlat.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s serà desconfigurat.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "   %.250s serà instaŀlat, però té una versió %.250s.\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s està instaŀlat, però té una versió %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, 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:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s està desempaquetat, però té una versió %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  la darrera versió configurada de %.250s és la %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s és %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s proveeix %.250s però serà desinstaŀlat.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s proveeix %.250s però serà desconfigurat.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s proveeix %.250s però és %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s no està instaŀlat.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versió %.250s) serà instaŀlat.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versió %.250s) és present i %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s proveeix %.250s y serà instaŀlat.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s proveeix %.250s i és present i %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "Empreu --help per a obtenir ajuda sobre la consulta de paquets."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2223,7 +2261,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versió %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2234,8 +2272,8 @@
 "Copyright © 2000, 2001 Wichert Akkerman.\n"
 "Copyright © 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2245,7 +2283,7 @@
 "Això és programari lliure, vegeu la Llicència Pública General GNU versió 2\n"
 "o posterior per a les condicions de còpia. No hi ha CAP garantia.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2255,7 +2293,7 @@
 "Forma d'ús: %s [<opció> …] <ordre>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2274,7 +2312,7 @@
 "  --truename <fitxer>      retorna el fitxer desviat.\n"
 
 # Move the file aside (or back) ? -- Jordà
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2304,7 +2342,7 @@
 "  --version                mostra la versió.\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2319,17 +2357,12 @@
 "Els scripts de preinst/postrm sempre haurien d'especificar --package i --"
 "divert.\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "no es pot fer «stat» sobre el fitxer «%s»"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "s'ha produït un error en comprovar «%s»"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2338,130 +2371,130 @@
 "el canvi de nom implica sobreescriure «%s» amb\n"
 "  el fitxer diferent «%s», no és permés"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "no es pot escriure el fitxer «%.250s»"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "còpia de fitxer"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "no es pot canviar el nom de «%s» a «%s»"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "canvi de nom: suprimeix l'enllaç vell duplicat «%s»"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "no es pot obrir el fitxer font «%.250s»"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "desviació local de %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "desviació local de %s cap a %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "desviació de %s per %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "desviació de %s cap a %s per %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "qualsevol desviació de %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "qualsevol desviació de %s cap a: %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "no es pot crear un fitxer %s nou"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "no es pot fer «flush» sobre el fitxer «%s»"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "s'ha produït un error en suprimir l'antic diversions-old"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "s'ha produït un error en crear el nou diversions-old"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "s'ha produït un error en instaŀlar les noves desviacions"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s necessita un sol paràmetre"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "el nom de fitxer «%s» no és absolut"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "el fitxer no pot contenir línies noves"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "No es poden desviar directoris"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "no es pot desviar el fitxer «%s» cap a ell mateix"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "S'està deixant «%s»\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "«%s» té un conflicte amb «%s»"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "S'està afegint «%s»\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "No hi ha cap desviació «%s», no s'ha suprimit.\n"
 
 # Discrepància? -- Jordà
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2473,7 +2506,7 @@
 "  s'ha trobat «%s»"
 
 # Discrepància? -- Jordà
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2484,16 +2517,16 @@
 "  en suprimir «%s»\n"
 "  s'ha trobat «%s»"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "S'està suprimint «%s»\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "el paquet no pot contenir línies noves"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "la desviació no pot contenir línies noves"
 
@@ -2577,8 +2610,8 @@
 "dselect o dpkg --configure --pending (o dpkg --triggers-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s no accepta cap argument"
@@ -2674,7 +2707,7 @@
 msgid "--compare-versions bad relation"
 msgstr "relació dolenta de --compare-versions"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "la versió «%s» té una sintaxi incorrecta: %s"
@@ -2731,12 +2764,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "no es tindrà en compte el problema per estar activa una opció --force:"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "no es pot obrir el fitxer de la llista de fitxers del paquet «%.250s»"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2745,85 +2778,85 @@
 "manca el fitxer de la llista de fitxers del paquet «%.250s», s'assumirà que "
 "el paquet no té cap fitxer actualment instaŀlat."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr ""
 "no es pot fer «stat» sobre el fitxer de la llista de fitxers del paquet "
 "«%.250s»"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "el fitxer de la llista de fitxers del paquet «%.250s»"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "el fitxer de la llista de fitxers del paquet «%.250s» manca una línea nova "
 "al final"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "el fitxer de la llista de fitxers del paquet «%.250s» conté un nom de fitxer "
 "buit"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 "s'ha produït un error en tancar el fitxer de la llista de fitxers del paquet "
 "«%.250s»"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(S'està llegint la base de dades… "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "hi ha %d fitxer o directori instaŀlat actualment.)\n"
 msgstr[1] "hi ha %d fitxers i directoris instaŀlats actualment.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 "no es pot crear un fitxer de nlist de fitxers actuaŀlitzats del paquet %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 "no es pot escriure al fitxer de la llista de fitxers actualitzats del paquet "
 "%s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 "no es pot fer «flush» sobre el fitxer de nlist de fitxers actualitzats del "
 "paquet %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 "no es pot fer «sync» sobre el fitxer de nlist de fitxers actualitzats del "
 "paquet %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 "no es pot tancar el fitxer de nlist de fitxers actualitzats del paquet %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2862,7 +2895,9 @@
 msgstr "instaŀlat"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "error: PATH no està establert."
 
 #: src/help.c:129
@@ -2904,7 +2939,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2916,66 +2951,66 @@
 msgstr "no s'ha pogut fer «chroot» a «%.250s»"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "s'ha produït un error en canviar al directori «%.255s»"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "no es poden establir els permisos d'execució en «%.250s»"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "no es pot fer «setenv» per al script del mantenidor"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "s'ha instaŀlat el script %s"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "no es pot fer «stat» sobre %s «%.250s»"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "seqüència %s nova"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "seqüència de «%s» antiga"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "no es pot fer «stat» sobre %s «%.250s»: %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - s'està provant la seqüència del paquet nou en el seu lloc…\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr ""
 "no hi ha cap seqüència en la versió nova del paquet - s'està abandonant"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: … sembla que ha anat bé.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "no es pot esborrar «%.255s» de forma segura"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2984,7 +3019,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "no es pot comprovar l'existència de «%.250s»"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "no es pot llegir el directori «info»"
 
@@ -3065,7 +3100,7 @@
 "  -Dh|--debug=help                     Mostra l'ajuda sobre la depuració.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3206,7 +3241,7 @@
 "Empreu «dselect» o «aptitude» si voleu un programa de gestió de paquets més "
 "amigable.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3259,30 +3294,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3291,103 +3330,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "problemes de dependències - no es desinstaŀla"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "problemes de dependències - no es desinstaŀla"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "no es pot fer «setenv» per al script del mantenidor"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "error de lectura al fitxer de configuració «%.250s»"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3395,7 +3434,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3403,41 +3442,41 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug requereix d'un número octal com a paràmetre"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nom de paquet buit en la llista de --ignore-depends separats per coma "
 "«%.250s»"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends necessita un nom de paquet legal. «%.250s» no ho és; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "enter invàlid per a --%s: «%.250s»"
 
 # hook -> lligam, segons el Termcat. jm
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "s'ha produït un error en executar el lligam «%s», codi d'eixida %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "estat"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3446,7 +3485,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3454,12 +3493,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "l'opció de forçat/refusat «%.*s» és desconeguda"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "l'opció de forçat/refusat «%s» és obsoleta\n"
@@ -3482,8 +3521,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperat abans de la fi de la línia %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "es necessita una opció d'acció"
 
@@ -3648,91 +3687,91 @@
 msgid "passed\n"
 msgstr "correcte\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "no s'ha pogut crear el directori temporal"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "el paquet %s té massa parelles de Conflicts/Replaces"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "la versió antiga del paquet té un nom de fitxer d'informació llarguíssim que "
 "comença per «%.250s»"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "no es pot esborrar el fitxer d'info. obsolet «%.250s»"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "no es pot instaŀlar el (suposat) fitxer d'info. nou «%.250s»"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "no es pot obrir el directori de control temporal"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "el paquet conté un nom de fitxer d'info. llarguíssim (comença per «%.50s»)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "la info. de control del paquet conté el directori «%.250s»"
 
 # Què collons vol dir això, i què collons vol dir la traducció?! jm
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "a l'esborrar el directori «%.250s» amb la informació de control del paquet "
 "ocorregué un error diferent com de no ser un directori"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "el paquet %s conté «list» com a fitxer d'informació"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "no es pot instaŀlar el fitxer d'info. nou «%.250s» com a «%.250s»"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "no es pot eliminar el fitxer d'info. de control «%.250s»"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "no es pot accedir a l'arxiu"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "no s'ha pogut crear el directori temporal"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "longitud de la informació de control"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "S'ha registrat la informació sobre %s a partir de %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "l'arquitectura del paquet (%s) no correspon amb la del sistema (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3741,102 +3780,102 @@
 "dpkg: referent a %s que conté %s, problema de predependència:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "problema de predependència - no s'instaŀlarà %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "s'està ignorant el problema de predependència!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "S'està preparant per a reemplaçar %s %s (fent servir %s)…\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "S'està desempaquetant %s (de %s)…\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "el nom del conffile (que comença per «%.250s») és massa llarg (>%d caràcters)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "error de lectura en %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "s'ha produït un error en tancar %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "s'ha produït un error en intentar obrir %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "S'està desconfigurant %s, per a permetre la supressió de %s…\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "S'està desconfigurant %s…\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "S'està desempaquetant el reemplaçament de %.250s…\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "extracció de camps de dpkg-deb"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "s'ha produït un error en llegir l'eixida tar de dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "sistema de fitxers de l'arxiu tar corrupte - arxiu del paquet corrupte"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: esborra possibles zeros finals"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "no es pot fer «stat» sobre el fitxer antic «%.250s» així doncs no "
 "s'eliminarà: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "no es pot esborrar el directori antic «%.250s»: %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr "el conffile «%.250s» era un directori buit (i s'ha eliminat)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "no es pot fer «stat» sobre el fitxer nou «%.250s»"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3845,12 +3884,12 @@
 "el fitxer antic «%.250s» és igual que diversos fitxers nous! («%.250s» i "
 "«%.250s»)"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "no es pot esborrar el fitxer antic «%.250s» de format segura: %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Noteu la desaparició de %s, que ha estat completament reemplaçat.)\n"
@@ -4035,7 +4074,7 @@
 "                                   a --show.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -4058,6 +4097,10 @@
 "  dreta a menys que l'amplada siga negativa, en aquest cas s'utilitzarà\n"
 "  alineació a l'esquerra. \n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Empreu --help per a obtenir ajuda sobre la consulta de paquets."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4119,7 +4162,7 @@
 msgid "Removing %s ...\n"
 msgstr "S'està desinstaŀlant %s…\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4128,52 +4171,53 @@
 "al desinstaŀlar %.250s, no es pot esborrar el directori «%.250s»: %s - el "
 "directori podria ser un punt de muntatge?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "no es pot esborrar «%.250s»"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "no es pot esborrar «%.250s» de forma segura"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "al desinstaŀlar %.250s, el directori «%.250s» no està buit, no s'esborra."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "no es pot esborrar «%.250s»"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "S'estan purgant els fitxers de configuració de %s…\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr ""
 "no es pot eliminar el fitxer de configuració antic «%.250s» (= «%.250s»)"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 "no es pot llegir el directori del fitxer de configuració «%.250s» (a partir "
 "de «%.250s»)"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "no es pot eliminar l'antiga còpia de seguretat del fitxer de configuració "
 "«%.250s» (de «%.250s»)"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "no es pot eliminar la llista de fitxers antiga"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "no es pot eliminar la seqüència postrm antiga"
 
@@ -4220,7 +4264,13 @@
 msgid "read error on standard input"
 msgstr "error de lectura en l'entrada estàndard"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "Empreu --help per a obtenir ajuda sobre la consulta de paquets."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4229,7 +4279,7 @@
 "Copyright © 2000, 2001 Wichert Akkerman.\n"
 "Copyright © 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4247,7 +4297,7 @@
 "                             dades.\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4270,31 +4320,31 @@
 "  --help                   mostra aquest missatge d'ajuda.\n"
 "  --version                mostra la versió.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "s'està suprimint la / de davant"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "no s'ha pogut obrir el nou fitxer de statoverride"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "s'ha produït un error en suprimir statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "s'ha produït un error en crear el nou statoverride-old"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "s'ha produït un error en instaŀlar el nou statoverride"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add necessita quatre arguments"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4304,22 +4354,22 @@
 "s'ignorarà."
 
 # Override -> substitució? -- Jordà
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Ja existeix una substitució per a «%s», s'està avortant."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "s'ha donat --update però %s no existeix"
 
 # Override -> substitució? -- Jordà
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "No hi ha cap substitució present."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "no té sentit utilitzar --update amb --remove"
 
@@ -4384,17 +4434,17 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "hi ha múltiples statusovverrides per al fitxer «%.250s»"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
 "Executeu dpkg-trigger --help per a obtenir-ne ajuda sobre aquesta utilitat."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Utilitat de consulta d'activadors %s de Debian versió %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4405,7 +4455,7 @@
 "            %s [<opcions> …] <ordre>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4419,7 +4469,7 @@
 "\n"
 
 # trigger awaiter? WTF! jm
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4441,21 +4491,21 @@
 "  --no-act                        Només comprova, no canvies res.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: encara no s'ha creat el directori de dades dels activadors\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: encara no existeixen els registres dels activadors\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "només pren un argument, el nom de l'activador"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4465,13 +4515,13 @@
 "s'ha d'executar dpkg-trigger des d'un script de mantenidor (o amb una opció "
 "--by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: el nom de paquet esperat «%.255s» és iŀlegal: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "el nom d'activador «%.250s» és invàlid: %.250s»"
@@ -4505,42 +4555,43 @@
 msgstr "S'estan processant els activadors per a %s…\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s necessita exactament un fitxer Packages com a argument"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "no es pot accedir a l'àrea d'estat de dpkg per a una actualització de "
 "«available»"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "l'actualització d'«available» requereix accés d'escriptura a l'àrea d'estat "
 "de dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr ""
 "S'està reemplaçant la informació de paquets disponibles, fent servir %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr ""
 "S'està actualitzant la informació de paquets disponibles, fent servir %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "S'ha actualitzat la informació sobre %d paquet\n"
 msgstr[1] "S'ha actualitzat la informació sobre %d paquets.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4656,8 +4707,8 @@
 msgstr[0] "s'omet %d avís sobre els fitxers de control\n"
 msgstr[1] "s'ometen %d avisos sobre els fitxers de control\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necessita un <directori> com a paràmetre"
@@ -4691,26 +4742,26 @@
 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:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "s'ha produït un error en crear el fitxer temporal (data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "àrea de control"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "s'ha produït un error en esborrar el fitxer temporal (data), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4727,21 +4778,21 @@
 msgid "error writing `%s'"
 msgstr "s'ha produït un error en escriure «%s»"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "entre números"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr ""
 "s'ha produït un error en escriure el nom del fitxer al conducte de tar (data)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<compress> des de tar -cf"
 
@@ -4759,78 +4810,78 @@
 msgid "error reading %s from file %.255s"
 msgstr "s'ha produït un error en llegir %s del fitxer %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "s'ha produït un error en llegir l'arxiu «%.255s»"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "s'ha produït un error en fer «fstat» sobre l'arxiu"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "l'arxiu no té cap punt en el número de versió"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "l'arxiu no té caràcters de línia nova en la capçalera"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "el fitxer «%.250s» està corromput - número de part erroni"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "el fitxer «%.250s» no és un arxiu binari de debian (proveu amb el dpkg-"
 "split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "l'arxiu no té cap punt en el número de versió"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "l'arxiu no té caràcters de línia nova en la capçalera"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "l'arxiu no té cap punt en el número de versió"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 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:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "s'omet l'element de %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "el fitxer «%.250s» conté un element %.*s ininteŀligible, s'abandona"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "el fitxer «%.250s» conté dos elements de control, s'abandona"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4842,24 +4893,24 @@
 " paquet de debian nou, versió %s.\n"
 " mida %ld octets: arxiu de control= %zi octets.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
 # FIXME original
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "l'arxiu té una longitud de control mal formatada «%s»"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "s'omet l'element de %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4871,7 +4922,7 @@
 " paquet debian antic, versió %s.\n"
 " mida %ld octets: arxiu de control= %zi, arxiu principal= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4880,49 +4931,50 @@
 "dpkg-deb: el fitxer sembla ser un arxiu que ha estat corromput\n"
 "dpkg-deb     al ser descarregat en mode ASCII\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "«%.255s» no és un arxiu amb el format debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 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:267
+#: dpkg-deb/extract.c:268
 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:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "dades"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "no s'ha pogut canviar al directori"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "no s'ha pogut crear el directori"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 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:293
-msgid "failed to chdir to directory"
-msgstr "no s'ha pogut canviar al directori"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<descompressió>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "enganxa"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s necessita un nom de fitxer .deb com a argument"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4931,98 +4983,98 @@
 "--%s necessita un directori de destí.\n"
 "Potser voleu fer dpkg --install?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s només pren un argument (fitxer .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "no s'ha pogut canviar a «/» per a la neteja"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "no es pot fer «stat» sobre el fitxer «%s»"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: «%.255s» no conté cap component de control  «%.255s»\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "l'obertura del component «%.255s» (dins de %.255s) ha fallat de forma "
 "inesperada"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "Manca el component de control requerit %d"
 msgstr[1] "Manquen els components de control requerits %d"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "no es pot examinar el directori «%.255s»"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "no es pot fer «stat» sobre «%.255s» (en «%.255s»)"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "no es pot obrir «%.255s» (en «%.255s»)"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "s'ha produït un error en llegir «%.255s» (en «%.255s»)"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld octets, %5d línies  %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     no és un fitxer normal   %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(no hi ha cap fitxer «control» en l'arxiu de control!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "no s'ha pogut obrir el component «control»"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "no s'ha pogut llegir el component «control»"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "s'ha produït un error en tancar el component «%s»"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Error en el format"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents pren exactament un argument"
 
@@ -5032,7 +5084,19 @@
 msgstr "Rerefons d'arxius de paquets «%s» de Debian versió %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -5043,6 +5107,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -5060,7 +5126,7 @@
 "                                     fitxers.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -5073,11 +5139,27 @@
 "<campc> és el nom d'un camp en el fitxer de «control» principal.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5102,7 +5184,7 @@
 "                             Tipus permesos: gzip, xz, bzip2, lzma, none.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5116,7 +5198,7 @@
 "amigable.  Els paquets desempaquetats fent servir «dpkg-deb --extract»\n"
 "estaran instaŀlats incorrectament!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5126,17 +5208,17 @@
 "Escriviu dpkg --help per a obtindre ajuda a sobre de com instaŀlar i "
 "desinstaŀlar paquets."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "enter invàlid per a -%c: «%.250s»"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "nivell de compressió invàlid per a -%c: %ld"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "el tipus de compressió «%s» és desconegut!"
@@ -5157,7 +5239,7 @@
 msgstr ""
 "el fitxer «%.250s» està corromput - manca una línia nova després de %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "s'ha produït un error al llegir %.250s"
@@ -5256,55 +5338,61 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "el fitxer «%.250s» està corromput - número de part erroni"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "nom del paquet"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "el fitxer «%.250s» està corromput - màgia errònia al final de la segona "
 "capçalera"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "el fitxer «%.250s» està corromput - el segon element no és un element de "
 "dades"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "el fitxer «%.250s» està corromput - número equivocat de parts per a les "
 "mides indicades"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "el fitxer «%.250s» està corromput - la mida està equivocada pel número de "
 "part indicada"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "no es pot fer «stat» sobre el fitxer part «%.250s»"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "el fitxer «%.250s» està corromput - massa curt"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "no es pot obrir el fitxer part d'arxiu «%.250s»"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "el fitxer «%.250s» no és una part d'arxiu"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5324,6 +5412,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5347,12 +5436,19 @@
 "        (porció usada):              %lu octets\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<desconegut>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s requereix un o més fitxers part com a arguments"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "el fitxer «%s» no és una part d'arxiu\n"
@@ -5387,7 +5483,7 @@
 msgid "split package part"
 msgstr "S'està assemblant el paquet %s amb %d part: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "fet\n"
@@ -5439,17 +5535,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Opcions:\n"
 "  --depotdir <directori>           Empra <directori> en comptes de %s/%s.\n"
@@ -5461,20 +5566,29 @@
 "\n"
 "Estat d'eixida: 0 = OK;  1 = -a no és una part;  2 = problemes!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Executeu dpkg-split --help per a obtenir-ne ajuda."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "s'ha trobat una fi de fitxer inesperada en %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "la mida de la part és massa gran o no és positiva"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -5586,27 +5700,27 @@
 msgid "Deleted %s.\n"
 msgstr "S'ha eliminat %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "extracció de camps de dpkg-deb"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "no es pot obrir el fitxer font «%.250s»"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "no es pot fer «stat» sobre el fitxer font"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "el fitxer font «%.250s» no és un fitxer normal"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5615,17 +5729,17 @@
 msgstr[0] "S'està assemblant el paquet %s amb %d part: "
 msgstr[1] "S'està assemblant el paquet %s amb %d parts: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split necessita un nom de fitxer font com a argument"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split pren com molt un nom de fitxer font i un prefix de destí"
 
@@ -5797,126 +5911,91 @@
 "  --help                   mostra aquest missatge d'ajuda.\n"
 "  --version                mostra la versió.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "s'ha produït un error"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "avís"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "no es pot fer «stat» sobre «%s»: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "ha fallat «readlink(%s)»: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "s'ha especificat dos ordres: --%s i --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "no es pot afegir a %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "ha fallat l'anàlisi de %s: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "no s'ha pogut executar %s: %s"
-
-#: utils/update-alternatives.c:503
-#, c-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"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "no es pot instaŀlar %s com a %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "no es pot suprimir %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "fi de fitxer inesperada en llegir %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "mentre es llegia %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "la línia no estava terminada en llegir %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s està corromput: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 "les línies noves no estan permesos als fitxers d'update-alternatives (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "en escriure %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "nom de l'esclau"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "esclau duplicat %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "enllaç esclau"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "l'enllaç esclau és el mateix que l'enllaç principal %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "enllaç esclau duplicat %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "fitxer mestre"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "camí duplicat %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5925,130 +6004,115 @@
 "l'alternativa %s (part del grup d'enllaços %s) no existeix. S'està suprimint "
 "de la llista d'alternatives."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "prioritat"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "fitxer esclau"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "prioritat de %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "no es pot llegir %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "estat"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "l'estat és invàlid"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "enllaç mestre"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "no es pot tancar %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "s'està descartant l'enllaç esclau obsolet %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "no es pot escriure %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "mode automàtic"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "mode manual"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "  l'enllaç apunta actualment cap a %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "  l'enllaç està actualment absent"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - prioritat %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  esclau %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Actualment la «millor» versió és «%s»."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "No hi ha cap versió disponible."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "Hi ha %d possibilitat per a l'alternativa %s (que proveeix %s)."
 msgstr[1] "Hi ha %d possibilitats per a l'alternativa %s (que proveeix %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Selecció"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Camí"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Prioritat"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Estat"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Premeu retorn per a mantenir l'opció per defecte[*], o introduïu un número "
 "de selecció: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "no es reemplaça %s amb un enllaç."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "no es pot instaŀlar la selecció %s desconeguda"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -6057,99 +6121,154 @@
 "s'omet la creació de %s perquè el fitxer associat «%s» (del grup d'enllaços "
 "%s) no existeix."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "no es reemplaça %s amb un enllaç."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Crida a %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 "No s'ha canviat l'alternativa %s perquè la selecció %s no és disponible."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "S'omet l'alternativa desconeguda %s."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "línia massa llarga o no terminada en llegir %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "S'omet la línia invàlida: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "S'està canviant el nom de l'enllaç %s de %s a %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "S'està canviant el nom de l'enllaç esclau %s de %s a %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "el nom de l'alternativa (%s) no pot contenir «/» o espais."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "l'enllaç d'alternativa no és absolut com ho hauria de ser: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "el camí de l'alternativa no és absolut com ho hauria de ser: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "l'alternativa %s no pot ser mestra: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "l'enllaç d'alternativa %s ja està gestionat per %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "el camí de l'alternativa %s no existeix."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "l'alternativa %s no pot ser esclava de %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "l'alternativa %s no pot ser mestra: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "l'enllaç d'alternativa %s ja està gestionat per %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "l'argument «%s» és desconegut"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necessita <enllaç> <nom> <camí> <prioritat>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<enllaç> i <camí> no poden ser el mateix"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "la prioritat ha de ser un enter"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s necessita <nom> <camí>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s necessita <nom>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave només es pot especificar junt amb --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necessita <enllaç> <nom> <camí>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "el nom %s és alhora primari i esclau"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "l'enllaç %s és alhora primari i esclau"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s necessita un argument <fitxer>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "l'opció «%s» és desconeguda"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -6157,68 +6276,23 @@
 "es necessita --display, --query, --list, --get-selections, --config, --set, "
 "--set-selections, --install, --remove, --all, --remove-all o --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "l'alternativa %s no pot ser mestra: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "l'enllaç d'alternativa %s ja està gestionat per %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "l'enllaç d'alternativa no és absolut com ho hauria de ser: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "el camí de l'alternativa no és absolut com ho hauria de ser: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "el camí de l'alternativa %s no existeix."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "el nom de l'alternativa (%s) no pot contenir «/» o espais."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "és una alternativa mestra."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "és un esclau de %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "l'alternativa %s no pot ser esclava de %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<entrada estàndard>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "no hi ha alternatives per a %s."
 
 # A coreutils, dangling symlink -> enllaç trencat. jm
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s és trencat, s'actualitzarà amb la millor selecció."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6230,50 +6304,50 @@
 "%s ha estat modificat (manualment o per alguna seqüència). S'està canviant a "
 "modificacions manuals únicament."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "s'està configurant la selecció automàtica de %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "l'alternativa %s per a %s no està registrada, no s'estableix."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "No hi ha cap programa que proveeixi %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "No hi ha res a configurar."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Només hi ha una alternativa al grup d'enllaços %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "l'alternativa %s per a %s no està registrada, no es suprimeix."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "s'està suprimint l'alternativa seleccionada manualment - s'està canviant %s "
 "a mode automàtic"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr ""
 "les actualitacions automàtiques de %s estan desactivades, no hi haurà canvis."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6281,12 +6355,12 @@
 "per tornar a activar les actualitzacions automàtiques, utilitzeu «update-"
 "alternatives --auto %s»."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "s'està emprant %s per a proveir %s (%s) a «%s»."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
@@ -6294,13 +6368,49 @@
 "s'està forçant la reinstaŀlació de l'alternativa %s perquè el grup "
 "d'enllaços %s és trencat."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "l'alternativa actual %s és desconeguda, s'està canviant a %s per al grup "
 "d'enllaços %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "és una alternativa mestra."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "és un esclau de %s"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "no es pot fer «stat» sobre «%s»: %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "ha fallat «readlink(%s)»: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "ha fallat l'anàlisi de %s: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "no s'ha pogut executar %s: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "no es pot fer l'enllaç simbòlic de %s a %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "no es pot instaŀlar %s com a %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "en escriure %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "no es pot llegir %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "no es pot tancar %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "no es pot escriure %s: %s"
+
 # 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.
@@ -6580,9 +6690,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "s'omet l'àrea de control de %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "no s'ha pogut executar tar"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "no s'ha pogut crear un directori temporal"
 
diff -uNr --exclude .git --exclude .bzr dpkg/po/ChangeLog.old /home/vorlon/devel/multiarch/dpkg-debian/po/ChangeLog.old
--- dpkg/po/ChangeLog.old	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/ChangeLog.old	2012-06-07 10:11:09.426073000 -0700
@@ -1152,7 +1152,7 @@
 
 	* ro.po: Fixed some consitency issues;
 	"conffiles" is no longer translated;
-	doublechecked for existance of writings without diacritics;
+	doublechecked for existence of writings without diacritics;
 	translation still at 742t.
 
 2006-05-15  Peter Karlsson  <peterk@debian.org>
@@ -1715,7 +1715,7 @@
 2005-01-11  Scott James Remnant  <scott@netsplit.com>
 
 	* LINGUAS: Rather than just listing the language codes on one
-	line, put each on its own line with a preceeding comment giving
+	line, put each on its own line with a preceding comment giving
 	the English name for the language, the current translator's
 	name in their preferred form and a contact e-mail address.
 
Binary files dpkg/po/cs.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/cs.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/cs.po /home/vorlon/devel/multiarch/dpkg-debian/po/cs.po
--- dpkg/po/cs.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/cs.po	2012-06-07 10:11:09.426073000 -0700
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-11-27 13:20+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -26,7 +26,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "nelze zapsat soubor „%s“"
@@ -47,71 +47,77 @@
 msgid "ar member file (%s)"
 msgstr "selhalo volání fstat na souboru %s, který je součástí ar"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "chyba čtení v buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "chyba zápisu v buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "zkrácené čtení v buffer_copy (%s)"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "nelze spustit tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "nelze spustit %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekomprese"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: komprese"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: chyba navázání vstupu na proud gzipu"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: vnitřní chyba gzipu při čtení: „%s“"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: vnitřní chyba gzipu při zápisu"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: chyba navázání výstupu na proud gzipu"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: vnitřní chyba gzipu při čtení"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: vnitřní chyba gzipu při zápisu: „%s“"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: vnitřní chyba gzipu při zápisu: %s"
@@ -126,31 +132,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: vnitřní chyba bzipu2 při čtení: „%s“"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: vnitřní chyba bzipu2 při zápisu"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: chyba navázání výstupu na proud bzipu2"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: vnitřní chyba bzipu2 při čtení"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: vnitřní chyba bzipu2 při zápisu: „%s“"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "neočekávaná chyba bzip2"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -159,105 +165,105 @@
 "adresář s aktualizacemi obsahuje soubor „%.250s“, jehož název je příliš "
 "dlouhý (%d, max=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 "adresář s aktualizacemi obsahuje soubory s různou délkou názvů (%d i %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "nelze zjistit obsah adresáře s aktualizacemi „%.255s“"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "selhalo odstranění spojeného aktualizačního souboru %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "nelze vytvořit „%.255s“"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "nelze dorovnat %.250s"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "nelze vyprázdnit %.250s"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "nelze se přesunout na začátek %.250s"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "nelze otevřít zámkový soubor %s pro test"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "zámek stavové databáze nelze otevřít nebo vytvořit"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "nemáte právo k uzamčení stavové databáze dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "stavovou databázi dpkg nelze uzamknout"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "požadovaná operace vyžaduje superuživatelská práva"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "ke stavové oblasti dpkg nelze přistoupit"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "operace požaduje zápisová práva do stavové oblasti dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "nepodařilo se odstranit svůj vlastní soubor s aktualizacemi %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "nelze zapsat změněný stav balíku „%.250s“"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "nelze vyprázdnit aktualizovaný stav „%.250s“"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "nelze zkrátit pro aktualizovaný stav „%.250s“"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "nelze synchronizovat aktualizovaný stav „%.250s“"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "nelze uzavřít změněný stav balíku „%.250s“"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "nelze nainstalovat změněný stav balíku „%.250s“"
@@ -280,70 +286,72 @@
 msgid "unable to open directory '%s'"
 msgstr "nelze otevřít soubor „%s“"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "nelze otevřít soubor „%s“"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "nelze synchronizovat soubor „%s“"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "nelze zavřít soubor „%s“"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "selhalo zapsání podrobností o „%.50s“ do souboru „%.250s“"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "selhalo otevření „%s“ pro zapsání databáze %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "nelze nastavit bufferování na souboru databáze %s"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "selhalo zapsání %s záznamu o „%.50s“ do souboru „%.250s“"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "selhalo vyprázdnění databáze %s do souboru „%.250s“"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "selhal fsync databáze %s do souboru „%.250s“"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "selhalo zavření „%.250s“ po zapsání databáze %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "selhalo linkování „%.250s“ na „%.250s“ pro zálohu databáze %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "selhala instalace „%.250s“ jako „%.250s“ obsahující databázi %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -352,7 +360,7 @@
 "%s: neobnovitelná kritická chyba, přerušuji:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -364,13 +372,13 @@
 "%s: neobnovitelná kritická chyba, přerušuji:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "nedostatek paměti pro novou položku"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -379,32 +387,32 @@
 "%s: chyba při úklidu:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: příliš mnoho vnořených chyb během opravování chyb!!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "nedostatek paměti pro novou položku"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "nedostatek paměti pro novou položku s mnoha argumenty"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: error closing %s: %s"
 msgid "%s: error: %s\n"
 msgstr "%s: chyba při zavírání %s: %s"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: varování: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: vnitřní chyba: %s\n"
@@ -420,104 +428,104 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "„%.*s“ není v %s povoleno"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "nesmyslná data za %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "chybné jméno balíku (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "prázdné pole podrobností o souboru „%s“"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "pole podrobností o souboru „%s“ není ve stavovém souboru dovoleno"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "příliš mnoho hodnot v položce „%s“ (vzhledem k ostatním)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "příliš málo hodnot v položce „%s“ (vzhledem k ostatním)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "yes/no v dvouhodnotovém poli"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "slovo v poli „priority“"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "hodnota pole „status“ není v tomto místě přípustná"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "první slovo (want) v poli „status“"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "druhé slovo (error) v poli „status“"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "třetí slovo (status) v poli „status“"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "chyba v řetězci Version „%.250s“"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "použito zastaralé pole „Revision“ nebo „Package-Revision“"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "hodnota pole „config-version“ není v tomto místě přípustná"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "chyba v řetězci Config-Version „%.250s“"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "hodnota „conffiles“ obsahuje zkomolený řádek „%.*s“"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "hodnota „conffiles“ obsahuje řádek nezačínající mezerou „%c“"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "kořenový nebo prázdný adresář uveden jako conffile"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr "v poli „%s“ chybí jméno balíku, nebo místo něj obsahuje nesmysl"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "pole „%s“ obsahuje neplatné jméno balíku „%.255s“: %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -526,7 +534,7 @@
 "položka „%s“, odkaz na „%.255s“:\n"
 " chybný vztah mezi verzemi %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -535,7 +543,7 @@
 "položka „%s“, odkaz na „%.255s“:\n"
 " „%c“ je zastaralé, místo toho použijte „%c=“ nebo „%c%c“"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -544,11 +552,11 @@
 "položka „%s“, odkaz na „%.255s“:\n"
 " implicitní shoda s konkrétním číslem verze, doporučuji použít „=“"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "V poli Provides lze použít pouze přesné určení verse"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -557,55 +565,55 @@
 "položka „%s“, odkaz na „%.255s“:\n"
 " číslo verze nezačíná alfanumerickým znakem, doporučuji přidat mezeru"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "položka „%s“, odkaz na „%.255s“: verze obsahuje „%c“"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "položka „%s“, odkaz na „%.255s“: neurčitelná verze"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "položka „%s“, odkaz na „%.255s“: chyba ve verzi"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "položka „%s“, syntaktická chyba po referenci na balík „%.255s“"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternativy („|“) nejsou v položce %s povoleny"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "hodnota pole „triggers-pending“ není v tomto kontextu přípustná"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "nepovolené jméno nevyřízeného spouštěče „%.255s“: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "duplicitní nevyřízený spouštěč „%.255s“"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "hodnota položky „triggers-awaited“ není v tomto kontextu přípustná"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "nepovolené jméno balíku v očekávaném spouštěči „%.255s“: %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "duplicitní balík v seznamu očekávaných spouštěčů „%.255s“"
@@ -662,7 +670,7 @@
 msgid "unable to write to status fd %d"
 msgstr "nelze zapsat do popisovače souboru %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "realloc failed (%zu bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -673,8 +681,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc selhal (%zu bajtů)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "selhala alokace paměti"
 
@@ -707,201 +715,207 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "nelze nastavit příznak zavřít-při-spuštění pro „%.250s“"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "chyba konfigurace: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "selhalo otevření konfiguračního souboru „%.255s“ pro čtení: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "nevypárované uvozovky v „%s“"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "neznámá volba „%s“"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "„%s“ vyžaduje hodnotu"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "„%s“ musí být zadán bez argumentu"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "chyba při čtení konfiguračního souboru „%.255s“"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "chyba při zavírání konfiguračního souboru „%.255s“"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "chyba při otevírání konfiguračního adresáře „%s“"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "neznámý přepínač --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "přepínač --%s vyžaduje argument"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "přepínač --%s musí být zadán bez argumentu"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "neznámý přepínač -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "přepínač -%c vyžaduje argument"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "přepínač -%c musí být zadán bez argumentu"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "zastaralá volba `--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "odporující si akce -%c (--%s) a -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "zdvojená hodnota položky „%s“"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "jméno uživatelem definované položky „%.*s“ příliš krátké"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "zdvojená hodnota uživatelem definované položky „%.*s“"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Configured-Version pro balík s neodpovídajícím Stavem"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "balík je ve stavu %s, ale očekávají se spouštěče"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 "balík je ve stavu „čekání na spouštěče“, ale žádné spouštěče nejsou očekávány"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "balík je ve stavu %s, ale spouštěče zatím nejsou vyřízené"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 "balík je ve stavu „nevyřízené spouštěče“, ale všechny spouštěče jsou vyřízeny"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Balík je ve stavu nenainstalovaný a má konfigurační soubory, vypouštím je"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "nelze otevřít soubor „%.255s“ s informacemi o balíku pro čtení"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "nefunguje volání fstat na info soubor „%.255s“"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "nefunguje volání mmap na info soubor „%.255s“"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "nefunguje volání fstat na info soubor „%.255s“"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "po čtení zapomněl zavřít: „%.255s“"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "konec souboru za položkou „%.*s“"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "nový řádek v položce „%.*s“"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MS-DOS EOF (^Z) ve položce „%.*s“"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "jméno položky „%.*s“ musí být následováno dvojtečkou"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF před hodnotou v položce „%.*s“ (chybí závěrečný konec řádku)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "položka „%.*s“ obsahuje MSDOS EOF znaky (chybějící nový řádek?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "nový řádek v položce „%.*s“"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF při čtení položky „%.*s“ (chybějící závěrečný konec řádku)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "nalezeno několik info položek balíku, dovolena pouze jedna"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "po čtení zapomněl zavřít: „%.255s“"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "žádná informace o balíku v „%.255s“"
@@ -930,63 +944,63 @@
 "%s, v souboru „%.255s“ okolo řádku %d:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "nesmí být prázdný řetězec"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "musí začínat písmenem nebo číslicí"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "znak „%c“ není povolen - povolena jsou pouze písmena, čísla a znaky „%s“"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<žádná>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "prázdná verze"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "verze obsahuje mezery"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "epocha ve verzi není číslo"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "za dvojtečkou ve verzi nic nenásleduje"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "neplatný znak v číslu verze"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "neplatný znak v číslu revize"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "chybí %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "položka `%s' je prázdná"
@@ -1005,52 +1019,52 @@
 msgid "(no description available)"
 msgstr "(popis není k dispozici)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "nelze ignorovat signál %s před spuštěním %.250s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "chyba při odblokování signálu %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (podproces): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "fork selhal"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "podproces %s vrátil chybový status %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "čekání na podproces %s selhalo"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "podproces %s byl zabit signálem (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", core dumped"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "podproces %s vrátil čekací chybový status %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "čekání na podproces %s selhalo"
@@ -1072,61 +1086,53 @@
 msgstr ""
 "syntaktická chyba v souboru s odloženými spouštěči „%.250s“ na znaku „%s“%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "nelze otevřít/vytvořit zámek pro spouštěče (%.250s)"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "spouštěč aktivován"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "nelze zavolat stat na soubor s odloženými spouštěči „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "nelze otevřít soubor s odloženými spouštěči „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "nelze otevřít/vytvořit nový soubor s odloženými spouštěči „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "chyba při čtení souboru s odloženými spouštěči „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "nelze zapsat nový soubor s odloženými spouštěči „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "nelze zavřít nový soubor s odloženými spouštěči „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "nelze nainstalovat novou verzi souboru s odloženými spouštěči „%.250s“"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "prázdné názvy spouštěčů nejsou povoleny"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "název spouštěče obsahuje neplatný znak"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1135,17 +1141,17 @@
 "neplatná nebo neznámá syntaxe v názvu spouštěče „%.250s“ (v seznamu "
 "zajímavých spouštěčů balíku „%.250s“)"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "nelze otevřít soubor se seznamem zajímavých spouštěčů „%.250s“"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "selhalo přesunutí v souboru se zajímavými spouštěči „%.250s“"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1154,37 +1160,43 @@
 "chybná syntaxe v souboru se zajímavými spouštěči „%.250s“; neplatné jméno "
 "balíku „%.250s“: %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "nelze vytvořit nový soubor se zajímavými spouštěči „%.250s“"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "nelze zapsat nový soubor se zajímavými spouštěči „%.250s“"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "nelze vyprázdnit nový soubor se zajímavými spouštěči „%.250s“"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "nelze synchronizovat nový soubor se zajímavými spouštěči „%.250s“"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "nelze zavřít nový soubor se zajímavými spouštěči „%.250s“"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "nelze nainstalovat novou verzi souboru se zajímavými spouštěči„%.250s“"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "nelze odstranit „%.250s“"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "nelze vytvořit nový soubor se zajímavými spouštěči „%.250s“"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "nelze zavřít nový soubor se zajímavými spouštěči „%.250s“"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1192,47 +1204,47 @@
 "duplicitní zajímavý souborový spouštěč pro jméno souboru „%.250s“ a balík "
 "„%.250s“"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "nelze vytvořit nový soubor se souborovými spouštěči „%.250s“"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "nelze zapsat nový soubor se souborovými spouštěči „%.250s“"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "nelze vyprázdnit nový soubor se souborovými spouštěči „%.250s“"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "nelze synchronizovat nový soubor se souborovými spouštěči „%.250s“"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "nelze zavřít nový soubor se souborovými spouštěči „%.250s“"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "nelze instalovat nový soubor se souborovými spouštěči jako „%.250s“"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "nelze přečíst soubor se souborovými spouštěči „%.250s“"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "syntaktická chyba v souboru se souborovými spouštěči „%.250s“"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1241,7 +1253,7 @@
 "záznam souborového spouštěče obsahuje neplatné jméno balíku „%.250s“ (se "
 "zájmem na souboru „%.250s“): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1250,30 +1262,38 @@
 "ci soubor pro spouštěče „%.250s“ obsahuje neplatnou syntaxi ve jméně "
 "spouštěče „%.250s“: %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "nelze otevřít ci soubor pro spouštěče „%.250s“"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "ci soubor pro spouštěče obsahuje neznámou syntaxi direktivy"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "ci soubor pro spouštěče obsahuje neznámou direktivu „%.250s“"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "nelze vytvořit stavový adresář pro spouštěče (%.250s)"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "nelze nastavit vlastnictví stavového adresáře pro spouštěče (%.250s)"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "prázdné názvy spouštěčů nejsou povoleny"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "název spouštěče obsahuje neplatný znak"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1298,7 +1318,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "chyba formátování řetězce do proměnné varbuf"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "chyba při čtení z roury od dpkg-deb"
 
@@ -1317,12 +1337,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "chyba při nastavování vlastníka symbolického odkazu „%.255s“"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "chyba při nastavování vlastníka „%.255s“"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "chyba při nastavování práv „%.255s“"
@@ -1377,109 +1397,123 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "archiv obsahoval objekt „%.255s“ neznámého typu 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "nelze volat stat na soubor „%s“"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Nahrazuji soubory ve starém balíku %s …\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Nahrazen soubory v nainstalovaném balíku %s …\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
 "nondirectory"
 msgstr "zkouším přepsat adresář „%.250s“ v balíku %.250s %.250s neadresářem"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "zkouším přepsat soubor „%.250s“, který je také v balíku %.250s %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "nelze vytvořit „%.255s“ (při zpracování „%.255s“)"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "dpkg-deb během „%.255s“"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "chyba při uzavírání nebo zápisu „%.255s“"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "chyba při vytváření roury „%.255s“"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "chyba při vytváření spec. souboru „%.255s“"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "chyba při vytváření pevného odkazu „%.255s“"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "chyba při vytváření symbolického odkazu „%.255s“"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "chyba při vytváření adresáře „%.255s“"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "nelze odsunout „%.255s“ pro nainstalování nové verze"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "nelze přečíst odkaz „%.255s“"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "nelze vytvořit záložní symbolický odkaz pro „%.255s“"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, 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:835
+#: src/archives.c:846
 #, 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:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "nelze nainstalovat novou verzi „%.255s“"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "nelze otevřít „%.255s“"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "nelze synchronizovat soubor „%.255s“"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1488,7 +1522,7 @@
 "ignoruji problém se závislostmi akce „%s“:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1497,7 +1531,7 @@
 "zvažuji dekonfiguraci nezbytného balíku\n"
 " %s, což by umožnilo akci „%s“."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1506,7 +1540,7 @@
 "dpkg: ne, balík %s je nezbytný, neprovedu jeho dekonfiguraci,\n"
 " která by umožnila akci „%s“.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1515,29 +1549,29 @@
 "dpkg: ne, nelze pokračovat s akcí „%s“ (pomůže --auto-deconfigure):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "odstranění %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "instalace %.250s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 "dpkg: zvažuji dekonfiguraci balíku %s, který by byl porušen akcí „%s“…\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: ano, dekonfiguruji %s (porušen balíkem %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1546,11 +1580,11 @@
 "dpkg: ohledně %s obsahující balík %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "ignoruji porušení, zkouším pokračovat!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1559,28 +1593,28 @@
 "instalace balíku %.250s by porušila balík %.250s a\n"
 " dekonfigurace není povolena (mohlo by pomoci --auto-deconfigure)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "instalace balíku %.250s by porušila stávající software"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1589,109 +1623,111 @@
 "dpkg: balík %s vyžaduje přeinstalaci, ale bude odstraněn podle vašeho "
 "požadavku.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "konflikt balíků - nebudu instalovat %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "ignoruji konflikt, zkouším pokračovat!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive vyžaduje alespoň jednu cestu"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "find pro dpkg --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "nelze provést fdopen na rouře od příkazu find"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "chyba při čtení z roury příkazu find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "chyba při zavírání roury od příkazu find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "hledání --recursive vrátilo neošetřenou chybu %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 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:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<standardní výstup>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<chybový výstup>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Instaluji balík %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Přeskakuji balík %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, 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:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "instaluji starší verzi %.250s z %.250s na %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "Odmítám instalovat starší verzi balíku %.250s, aktuální\n"
 "verze %.250s požadována instalace verze %.250s, přeskakuji.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1700,38 +1736,38 @@
 "nelze odstranit nově nainstalovanou verzi „%.250s“ aby se mohla "
 "přeinstalovat záložní kopie"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "nelze obnovit záložní verzi „%.250s“"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "nelze odstranit záložní kopii „%.250s“"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "nelze odstranit nově instalovanou verzi „%.250s“"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "nelze odstranit nově vytvořenou verzi „%.250s“"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr ""
 "nelze zjistit stav nového distribučního konfiguračního souboru „%.250s“"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "nelze zjistit stav aktuálního konfiguračního souboru „%.250s“"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1742,57 +1778,57 @@
 "Konfigurační soubor „%s“ ve vašem systému neexistuje.\n"
 "Podle vašeho požadavku nainstaluji nový.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: nepodařilo se odstranit záložní kopii „%.250s“: %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: nepodařilo se přejmenovat „%.250s“ na „%.250s“: %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: nepodařilo se odstranit „%.250s“: %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: nepodařilo se odstranit starou distribuční verzi „%.250s“: %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: nepodařilo se odstranit „%.250s“ (před přepsáním): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: nepodařilo se vytvořit odkaz „%.250s“ na „%.250s“: %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Instaluji novou verzi konfiguračního souboru %s …\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "nelze nainstalovat „%.250s“ jako „%.250s“"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "balík jména „%s“ není nainstalován, nelze zkonfigurovat"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "balík %.250s je již nainstalován a zkonfigurován"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1801,7 +1837,7 @@
 "balík %.250s není připraven ke konfiguraci\n"
 " nelze zkonfigurovat (současný stav „%.250s“)"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1810,11 +1846,11 @@
 "dpkg: nesplněné závislosti zamezily konfiguraci balíku %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "problém se závislostmi - nechávám nezkonfigurované"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1824,7 +1860,7 @@
 "požadavku:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1832,12 +1868,12 @@
 "Balík je ve velmi nekonzistentním stavu - před pokusem\n"
 "o konfiguraci by měl by být přeinstalován."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Nastavuji balík %s (%s) …\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1846,7 +1882,7 @@
 "%s: nelze zjistit stav konfiguračního souboru „%s“\n"
 " (= „%s“): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1855,7 +1891,7 @@
 "%s: konfigurační soubor „%s“ je cyklickým odkazem\n"
 " (= „%s“)"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1864,7 +1900,7 @@
 "%s: nelze provést readlink na konfiguračním souboru „%s“\n"
 " (= „%s“): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1873,35 +1909,35 @@
 "%s: konfigurační soubor „%.250s“ odkazuje na neplatné jméno\n"
 " („%s“ je symbolický odkaz na „%s“)"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: konfigurační soubor „%.250s“ není souborem ani symbolickým odkazem (= "
 "„%s“)"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: nelze otevřít konfigurační soubor %s pro hash: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Po skončení napište „exit“.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1910,12 +1946,12 @@
 "\n"
 "Konfigurační soubor „%s“"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (vlastně „%s“)"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1926,7 +1962,7 @@
 " ==> Soubor v systému byl vytvořen vámi nebo skriptem.\n"
 " ==> Tento soubor se také nachází v balíku.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1935,7 +1971,7 @@
 "\n"
 "     Nezměněn od doby instalace.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1944,7 +1980,7 @@
 "\n"
 " ==> Od doby instalace byl změněn (vámi nebo skriptem).\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1953,37 +1989,37 @@
 "\n"
 " ==> Od doby instalace byl smazán (vámi nebo skriptem).\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Distributor poskytl upravenou verzi.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Verze v balíku je stejná jako poslední nainstalovaná.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Používám nový soubor podle přání.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Používám starý soubor podle přání.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Ponechávám starý konfigurační soubor jako výchozí.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Používám nový konfigurační soubor jako výchozí.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1998,158 +2034,160 @@
 "        D    : zobrazit rozdíl mezi verzemi\n"
 "        Z    : spustit shell a prozkoumat situaci\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Výchozí akcí je ponechání současné verze.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Výchozí akcí je instalace nové verze.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[předvoleno=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[předvoleno=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[bez předvolby]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "chyba při zápisu na stderr, objeveno před otázkou na konfigurační soubory"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "chyba čtení na stdin při otázce na konfigurační soubory"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF na stdin při otázce na konfigurační soubor"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s závisí na %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s před-závisí na %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s doporučuje %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s navrhuje %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s porušuje %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s je v konfliktu s %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s rozšiřuje %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s bude odstraněn.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s bude dekonfigurován.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s je nainstalován, ale je verze %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, 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:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s je rozbalen, ale je verze %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s poslední zkonfigurovaná verze je %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s je %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s poskytuje %.250s, ale bude odstraněn.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s poskytuje %.250s, ale bude dekonfigurován.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s poskytuje %.250s, ale je %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr " %250s není nainstalován.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (verze %.250s) bude nainstalován.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (verze %.250s) je přítomný a %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s poskytuje %.250s a bude nainstalován.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s poskytuje %.250s a je přítomný a %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "Pro nápovědu o dotazování se na balíky použijte --help."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2157,7 +2195,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s verze %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2168,8 +2206,8 @@
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 "Copyright (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2180,7 +2218,7 @@
 "v Obecné veřejné licenci GNU (GNU General Public Licence) verze 2 nebo\n"
 "pozdější. Toto programové vybavení je absolutně bez záruky.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2190,7 +2228,7 @@
 "Použití: %s [<volba> …] <příkaz>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2209,7 +2247,7 @@
 "  --truename <soubor>      vrátí odkloněný soubor\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2239,7 +2277,7 @@
 "  --version                zobrazí verzi\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2253,17 +2291,12 @@
 "Před/poinstalační skripty balíku by měly vždy používat --package a --"
 "divert.\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "nelze volat stat na soubor „%s“"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "chyba při kontrole „%s“"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2272,129 +2305,129 @@
 "přejmenování znamená přepsání „%s“\n"
 "  souborem „%s“, což není povoleno"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "nelze zapsat soubor „%s“"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "kopie souboru"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "nelze přejmenovat „%s“ na „%s“"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "přejmenování: odstranění duplicitního starého odkazu „%s“"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "nelze otevřít zdrojový soubor „%.250s“"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "lokální odklonění %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "lokální odklonění %s do %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "odklonění %s balíkem %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "odklonění %s do %s balíkem %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "libovolné odklonění %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "libovolné odklonění %s do %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "nelze vytvořit nový soubor %s"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "nelze vyprázdnit soubor „%s“"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "chyba při odstranění starého souboru diversions-old"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "chyba při vytváření souboru statoverride-old"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "chyba při instalaci nových odklonění"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s vyžaduje jeden argument"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "název souboru „%s“ není absolutní"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "soubor nesmí obsahovat znaky nového řádku"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Nelze odklonit adresář"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "nelze odklonit soubor „%s“ sám na sebe"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "Opouštím „%s“\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "„%s“ koliduje s „%s“"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "Přidávám „%s“\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Odklonění „%s“ neexistuje, tedy nebylo odstraněno\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2405,7 +2438,7 @@
 "  při odstraňování „%s“\n"
 "  nalezeno „%s“"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2416,16 +2449,16 @@
 "  při odstraňování „%s“\n"
 "  nalezen „%s“"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "Odstraňuji „%s“\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "jméno balíku nemůže obsahovat znak nového řádku"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "kam-odklonit nemůže obsahovat znak nového řádku"
 
@@ -2506,8 +2539,8 @@
 "nebo příkazem dpkg --configure --pending (resp. dpkg --triggers-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s musí být zadán bez argumentu"
@@ -2600,7 +2633,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions špatná relace"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "verze „%s“ má špatnou syntaxi: %s"
@@ -2656,12 +2689,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "potlačuji problém, protože je nastaveno --force:"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "seznam souborů balíku „%.250s“ nelze otevřít"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2670,37 +2703,37 @@
 "seznam souborů balíku „%.250s“ chybí, předpokládám, že program nemá "
 "nainstalované žádné soubory."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "nelze zjistit stav seznamu souborů balíku „%.250s“"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "seznam souborů balíku „%.250s“"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "seznam souborů balíku „%.250s“ neobsahuje závěrečný nový řádek"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "seznam souborů balíku „%.250s“ obsahuje prázdné jméno souboru"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "chyba při zavírání seznamu souborů pro balík „%.250s“"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Čtu databázi … "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
@@ -2708,32 +2741,32 @@
 msgstr[1] "nyní jsou nainstalovány %d soubory a adresáře.)\n"
 msgstr[2] "nyní je nainstalováno %d souborů a adresářů.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "nelze vytvořit aktualizovaný seznam souborů balíku %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "nelze zapsat aktualizovaný seznam souborů balíku %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "nelze vyprázdnit seznam aktualizovaných souborů pro balík %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "nelze synchronizovat seznam aktualizovaných souborů pro balík %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "nelze uzavřít aktualizovaný seznam souborů balíku %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "nelze nainstalovat aktualizovaný seznam souborů balíku %s"
@@ -2771,7 +2804,9 @@
 msgstr "nainstalován"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "chyba: PATH není nastavena."
 
 #: src/help.c:129
@@ -2813,7 +2848,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2825,65 +2860,65 @@
 msgstr "chroot na „%.250s“ selhal"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "nelze změnit adresář na „%.255s“"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "nelze nastavit spustitelné právo na „%.250s“"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "nelze nastavit proměnné prostředí pro konfigurační skript"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "instalovaný %s skript"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "nelze zjistit stav %s „%.250s“"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "nový %s skript"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "starý %s skript"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "nelze zjistit stav %s „%.250s“: %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - zkouším raději skript z nově nainstalovaného balíku …\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "v nové verzi balíku není žádný skript - končím"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: … vypadá to, že se vše povedlo.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "nelze bezpečně odstranit „%.255s“"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2892,7 +2927,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "nelze zkontrolovat existenci „%.250s“"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "nelze přečíst adresář info"
 
@@ -2959,7 +2994,7 @@
 "  -Dh|--debug=help                 zobrazí nápovědu pro ladění\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3081,7 +3116,7 @@
 "Pro uživatelsky přívětivou správu balíků použijte „dselect“ nebo "
 "„aptitude“.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3130,30 +3165,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3162,103 +3201,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "problém se závislostmi - neodinstalovávám"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "problém se závislostmi - neodinstalovávám"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "nelze nastavit proměnné prostředí pro konfigurační skript"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "chyba při čtení konfiguračního souboru „%.255s“"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3266,7 +3305,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3274,37 +3313,37 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug vyžaduje oktalový parametr"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "prázdné jméno balíku v seznamu --ignore-depends „%.250s“"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends vyžaduje platné jméno balíku, což „%.250s“ není; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "neplatné číslo pro --%s: „%.250s“"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "chyba spouštění akce „%s“, návratový kód %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "stav"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3313,7 +3352,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3321,12 +3360,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "neznámá force/refuse volba „%.*s“"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "zastaralá force/refuse volba „%s“\n"
@@ -3349,8 +3388,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "neočekávaný konec souboru před koncem řádku %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "potřebuji zadat akci"
 
@@ -3514,86 +3553,86 @@
 msgid "passed\n"
 msgstr "úspěšná\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "nelze vytvořit dočasný adresář"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "balík %s má příliš mnoho dvojic Koliduje/Nahrazuje"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "stará verze balíku má příliš dlouhé jméno info souboru, který začíná „%.250s“"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "nelze odstranit starý info soubor „%.250s“"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "nelze instalovat nový info soubor „%.250s“"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "nelze otevřít dočasný kontrolní adresář"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr "balík obsahuje příliš dlouhé jméno info souboru (začíná „%.50s“)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "informace o balíku obsahují adresář „%.250s“"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "informace o balíku rmdir na „%.250s“ neřekl, že to není adresář"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "balík %s obsahoval seznam jako info soubor"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "nelze instalovat nový info soubor „%.250s“ jako „%.250s“"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "nelze odstranit control soubor „%.250s“"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "nelze přistoupit k archivu"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "nelze vytvořit dočasný adresář"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "délka kontrolní informace"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Zaznamenány informace o %s z %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "architektura balíku (%s) se neshoduje se systémem (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3602,102 +3641,102 @@
 "dpkg: dívám se na %s obsahující %s, před-závislostní problém:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "před-závislostní problém - neinstaluji %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "ignoruji před-závislostní problém!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Připravuji nahrazení %s %s (pomocí %s) …\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Rozbaluji %s (z %s) …\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "název konfiguračního souboru (počátek cesty „%.250s“) je příliš dlouhý (>%d "
 "znaků)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "chyba čtení v %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "chyba uzavření v %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "chyba při pokusu o otevření %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Dekonfiguruji %s, aby mohl být odstraněn %s …\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Dekonfiguruji %s …\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Rozbaluji náhradu %.250s …\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "dpkg-deb získání hodnoty pole"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "chyba při čtení tar výstupu z dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "poškozený systémový tar soubor - poškozený balík"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: ruším možné koncové nuly"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "nelze zjistit stav starého souboru „%.250s“, tudíž jej nemažu: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "nelze smazat starý adresář „%.250s“: %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "starý konfigurační soubor „%.250s“ byl prázdným adresářem a byl proto smazán"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "nelze zjistit stav nového souboru „%.250s“"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3706,12 +3745,12 @@
 "starý soubor „%.250s“ je stejný jako některé nové soubory! („%.250s“ i "
 "„%.250s“)"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "nelze bezpečně odstranit starý soubor „%.250s“: %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Poznamenávám zmizení balíku %s, který byl úplně nahrazen.)\n"
@@ -3889,7 +3928,7 @@
 "  -f|--showformat=<formát>   pro --show použije alternativní formát\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3909,6 +3948,10 @@
 "  odkazů na různá pole balíku dle vzoru ${proměnná[;šířka]}.\n"
 "  Pole budou zarovnaná napravo, záporná šířka je zarovná vlevo.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Pro nápovědu o dotazování se na balíky použijte --help."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3968,7 +4011,7 @@
 msgid "Removing %s ...\n"
 msgstr "Odinstalování balíku %s …\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3977,48 +4020,49 @@
 "při odstraňování %.250s nelze smazat adresář „%.250s“: %s - není tento "
 "adresář přípojným bodem?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "nelze odstranit „%.250s“"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "nelze bezpečně odstranit „%.250s“"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "při odstraňování %.250s není adresář „%.250s“ prázdný, proto nebude "
 "odstraněn."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "nelze odstranit „%.250s“"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Odstraňuji konfigurační soubory balíku %s …\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "nelze odstranit starý konfigurační soubor „%.250s“ (= „%.250s“)"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "nelze číst adresář konfiguračních souborů „%.250s“ (z „%.250s“)"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr "nelze odstranit starý konfigurační soubor „%.250s“ (z „%.250s“)"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "nelze odstranit starý seznam souborů"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "nelze odstranit starý postrm skript"
 
@@ -4061,7 +4105,13 @@
 msgid "read error on standard input"
 msgstr "chyba při čtení ze standardního vstupu"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "Pro nápovědu o dotazování se na balíky použijte --help."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4070,7 +4120,7 @@
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4087,7 +4137,7 @@
 "  --list [<vzor-glob>]     vypíše aktuální seznam přebitých souborů\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4107,52 +4157,52 @@
 "  --help                   zobrazí tuto nápovědu\n"
 "  --version                zobrazí verzi\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "odstraňuji koncové /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "nelze otevřít nový soubor statoverride"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "chyba při odstraňování souboru statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "chyba při vytváření nového souboru statoverride-old"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "chyba při instalaci nového souboru statoverride"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add vyžaduje čtyři argumenty"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr "Přepis „%s“ již existuje, ale kvůli --force jej budeme ignorovat."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Přepis „%s“ již existuje, přerušuji."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "bylo zadáno --update, ale %s neexistuje"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Žádné přebití neexistuje"
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "pro --remove je --update zbytečné"
 
@@ -4217,16 +4267,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "pro soubor „%.250s“ existuje více statusoverride"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Pro zobrazení nápovědy napište dpkg-trigger --help."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debian %s - nástroj pro práci se spouštěmi verze %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4237,7 +4287,7 @@
 "         %s [<volby> …] <příkaz>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4249,7 +4299,7 @@
 "  --check-supported           zkontroluje, zda dpkg podporuje spouštěče\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4270,21 +4320,21 @@
 "  --no-act                    pouze testuje, nic nemění\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: datový adresář pro spouštěče ještě není vytvořen\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: záznamy spouštěčů zatím neexistují\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "vyžaduje jeden parametr, název spouštěče"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4294,13 +4344,13 @@
 "dpkg-trigger musí být zavolán z konfiguračního skriptu (nebo s parametrem --"
 "by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: nedovolené jméno očekávajícího balíku „%.250s“: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "neplatné jméno spouštěče „%.250s“: %.250s"
@@ -4333,31 +4383,32 @@
 msgstr "Zpracování spouštěčů pro balík %s …\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s vyžaduje právě jedno jméno souboru Packages"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "nelze přistoupit ke stavové oblasti dpkg pro objemnou dostupnou aktualizaci"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "objemná dostupná aktualizace vyžaduje práva zápisu do stavové oblasti dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Nahrazuji informace o dostupných balících z %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Aktualizuji informace o dostupných balících z %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
@@ -4365,7 +4416,7 @@
 msgstr[1] "Byly aktualizovány informace o %d balících.\n"
 msgstr[2] "Byly aktualizovány informace o %d balících.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4478,8 +4529,8 @@
 msgstr[1] "ignoruji %d varování o kontrolních souborech\n"
 msgstr[2] "ignoruji %d varování o kontrolních souborech\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s vyžaduje jako argument <adresář>"
@@ -4511,26 +4562,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: vytvářím balík „%s“ v „%s“.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "selhalo vytvoření dočasného souboru (data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "kontrolní oblast"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "selhalo smazání dočasného souboru (data), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4547,20 +4598,20 @@
 msgid "error writing `%s'"
 msgstr "chyba při zápisu „%s“"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "mezi prvky"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "selhal zápis jména souboru do roury s tarem (data)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<komprese> z tar -cf"
 
@@ -4578,76 +4629,76 @@
 msgid "error reading %s from file %.255s"
 msgstr "chyba při čtení %s ze souboru %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "chyba při čtení archivu „%.255s“"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "na archivu selhalo volání fstat()"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "archiv nemá tečku v čísle verze"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "archiv v hlavičce neobsahuje nové řádky"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "soubor „%.250s“ je poškozen - špatné číslo části"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "soubor „%.250s“ není binárním balíkem (zkuste dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "archiv nemá tečku v čísle verze"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "archiv v hlavičce neobsahuje nové řádky"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "archiv nemá tečku v čísle verze"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 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:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "přeskočena část od %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "soubor „%.250s“ obsahuje nerozpoznanou část %.*s, vzdávám to"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "soubor „%.250s“ obsahuje dvě kontrolní části, vzdávám to"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4659,23 +4710,23 @@
 " nový formát balíku, verze %s.\n"
 " velikost %ld bajtů, řídící archiv= %zi bajtů.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "archiv má chybně formátovanou kontrolní délku „%s“"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "přeskočena část od %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4687,7 +4738,7 @@
 " starý debianí balík, verze %s.\n"
 " velikost %ld bajtů: kontrolní archiv= %zi, hlavní archiv= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4696,49 +4747,50 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "„%.255s“ nemá formát balíku debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "nelze zapisovat do roury během kopírování"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "nelze zavřít rouru během kopírování"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "nelze vstoupit do adresáře"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "nelze vytvořit adresář"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 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:293
-msgid "failed to chdir to directory"
-msgstr "nelze vstoupit do adresáře"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<dekomprese>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "paste"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s vyžaduje jméno .deb souboru"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4747,37 +4799,37 @@
 "--%s vyžaduje cílový adresář.\n"
 "Nechtěli jste použít dpkg --install ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s vyžaduje jen jeden parametr (jméno .deb souboru)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "nelze změnit adresář na „/“ pro úklid"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "nelze volat stat na soubor „%s“"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: „%.255s“ neobsahuje kontrolní část „%.255s“\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr "otevírání komponenty „%.255s“ (v %.255s) selhalo neočekávaným způsobem"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
@@ -4785,59 +4837,59 @@
 msgstr[1] "%d vyžadované kontrolní části chybí"
 msgstr[2] "%d vyžadovaných kontrolních částí chybí"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "nelze prohledat adresář „%.255s“"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "nelze volat stat na „%.255s“ (v „%.255s“)"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "nelze otevřít „%.255s“ (v „%.255s“)"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "selhalo čtení „%.255s“ (v „%.255s“)"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bajtů, %5d řádků   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     není prostý soubor        %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(v řídícím archivu chybí soubor „control“!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "nelze otevřít část „control“"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "chyba během čtení části „control“"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "chyba při zavírání komponenty „%s“"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Chyba ve formátu"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents vyžaduje právě jeden parametr"
 
@@ -4847,7 +4899,19 @@
 msgstr "Debian „%s“ - backend pro práci s archivy verze %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4858,6 +4922,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4873,7 +4939,7 @@
 "  --fsys-tarfile <deb>            vypíše tar se soubory\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4886,11 +4952,27 @@
 "<cpoložka> je název položky v hlavním souboru „control“.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4913,7 +4995,7 @@
 "                            povolené hodnoty: gzip, xz, bzip2, lzma, none\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4926,7 +5008,7 @@
 "přívětivější správu balíků „dselect“ či „aptitude“. Balíky rozbalené\n"
 "pomocí „dpkg-deb --extract“ nebudou správně nainstalované!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4934,17 +5016,17 @@
 "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:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "neplatné celé číslo pro --%c: „%.250s“"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "neplatná úroveň komprese pro --%c: %ld"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "neznámý typ komprese „%s“!"
@@ -4964,7 +5046,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "soubor „%.250s“ je poškozen - chybí nový řádek za %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "chyba při čtení %.250s"
@@ -5057,48 +5139,54 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "soubor „%.250s“ je poškozen - špatné číslo části"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "jméno balíku"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "soubor „%.250s“ je poškozen - špatné magické číslo na konci druhé hlavičky"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "soubor „%.250s“ je poškozen - druhý člen není částí dat"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr "soubor „%.250s“ je poškozen - chybný počet částí pro uvozené velikosti"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "soubor „%.250s“ je poškozen - chybná velikost uvozené části"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "nelze zjistit fstat části souboru „%.250s“"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "soubor „%.250s“ je poškozen - moc krátký"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "nelze otevřít část „%.250s“"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "soubor „%.250s“ není částí archivu"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5118,6 +5206,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5140,12 +5229,19 @@
 "    Velikost části (použitá část):  %lu bajtů\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<neznámo>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s vyžaduje jedno nebo více jmen částí souboru"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "soubor „%s“ není část archivu\n"
@@ -5181,7 +5277,7 @@
 msgid "split package part"
 msgstr "Sestavuji balík %s z %d části: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "hotovo\n"
@@ -5233,17 +5329,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Volby:\n"
 "  --depotdir <adresář>            místo %s/%s použije <adresář>\n"
@@ -5254,20 +5359,29 @@
 "\n"
 "Výstupní stavy: 0 = OK;  1 = -a a není částí;  2 = problémy!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Pro zobrazení nápovědy napište dpkg-split --help."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "neočekávaný konec souboru v %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "velikost části je buď příliš veliká, nebo nekladná"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "velikost části musí být alespoň %d KiB (kvůli hlavičce)"
@@ -5378,27 +5492,27 @@
 msgid "Deleted %s.\n"
 msgstr "Smazán %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "dpkg-deb získání hodnoty pole"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "nelze otevřít zdrojový soubor „%.250s“"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "nelze zavolat fstat na zdrojový soubor"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "zdrojový soubor „%.250s“ není obyčejným souborem"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5408,17 +5522,17 @@
 msgstr[1] "Sestavuji balík %s z %d částí: "
 msgstr[2] "Sestavuji balík %s z %d částí: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split vyžaduje jméno souboru"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split vyžaduje nejvýše jméno souboru a začátek cílové cesty"
 
@@ -5584,125 +5698,90 @@
 "  --help                   zobrazí tuto nápovědu\n"
 "  --version                zobrazí verzi\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "chyba"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "varování"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "nelze volat stat na %s: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "volání readlink(%s) selhalo: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "zadány dva příkazy: --%s a --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "nelze připojit k %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "procházení %s selhalo: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "nelze spustit %s: %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "nelze vytvořit symbolický odkaz %s na %s: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "nelze nainstalovat %s jako %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "nelze odstranit %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "neočekávaný konec souboru při pokusu o čtení %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "při čtení %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "neukončený řádek při pokusu o čtení %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s porušeno: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "nové řádky jsou v souborech update-alternatives zakázány (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "při zápisu %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "závislé jméno"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "duplicitní závislost %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "závislý odkaz"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "závislý odkaz je stejný jako hlavní odkaz %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "duplicitní závislý odkaz %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "hlavní soubor"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "duplicitní cesta %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5711,90 +5790,75 @@
 "alternativa %s (součást skupiny odkazů %s) neexistuje. Odstraňuji ze seznamu "
 "alternativ."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "priorita"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "závislý soubor"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "priorita %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "nelze číst %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "stav"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "neplatný stav"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "hlavní odkaz"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "nelze zavřít %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "zahazuji zastaralý závislý odkaz %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "nelze zapsat %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "automatický režim"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "ruční režim"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "  odkaz momentálně ukazuje na %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "  odkaz momentálně chybí"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - priorita %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  závislost %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Momentální „nejlepší“ verze je „%s“."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Nejsou k dispozici žádné verze."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
@@ -5802,38 +5866,38 @@
 msgstr[1] "Existují %d možnosti pro alternativu %s (poskytující %s)."
 msgstr[2] "Existuje %d možností pro alternativu %s (poskytující %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Výběr"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Cesta"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Priorita"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Stav"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr "Pro aktuální možnost[*] stiskněte enter, jinak zadejte číslo: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "nenahrazuji %s odkazem."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "nelze instalovat neznámou volbu %s"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -5842,98 +5906,153 @@
 "přeskakuji vytvoření %s, protože přidružený soubor %s (ze skupiny odkazů %s) "
 "neexistuje."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "nenahrazuji %s odkazem."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Volám %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Alternativa %s nebyla změněna, protože volba %s není dostupná."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Přeskočení neznámé alternativy %s."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "příliš dlouhý nebo neukončený řádek při pokusu o čtení %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Přeskočení neplatného řádku: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "přejmenovávám odkaz %s z %s na %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "přejmenovávám závislý odkaz %s z %s na %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "jméno alternativy (%s) nesmí obsahovat „/“ a mezery."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "alternativní odkaz není absolutní, jak by měl být: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "alternativní cesta není absolutní, jak by měla být: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "alternativa %s nemůže být hlavní: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "alternativní odkaz %s je již spravován pomocí %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "alternativní cesta %s neexistuje."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "alternativa %s nemůže být závislost %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "alternativa %s nemůže být hlavní: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "alternativní odkaz %s je již spravován pomocí %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "neznámý argument „%s“"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install vyžaduje <odkaz> <jméno> <cesta> <priorita>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<odkaz> a <cesta> nemohou být stejné"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "priorita musí být celé číslo"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s vyžaduje <jméno> <cesta>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s vyžaduje <jméno>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave je povoleno jen současně s --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave vyžaduje <odkaz> <jméno> <cesta>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "jméno %s je jak primární, tak závislé"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "odkaz %s je jak primární, tak závislý"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s vyžaduje argument <soubor>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "neznámá volba „%s“"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -5941,67 +6060,22 @@
 "vyžaduji --display, --query, --list, --get-selections, --config, --set, --"
 "set-selections, --install, --remove, --all, --remove-all nebo --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "alternativa %s nemůže být hlavní: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "alternativní odkaz %s je již spravován pomocí %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "alternativní odkaz není absolutní, jak by měl být: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "alternativní cesta není absolutní, jak by měla být: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "alternativní cesta %s neexistuje."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "jméno alternativy (%s) nesmí obsahovat „/“ a mezery."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "je to hlavní alternativa."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "je to závislost %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "alternativa %s nemůže být závislost %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<standardní vstup>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "pro %s neexistují žádné alternativy."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s není zakončený, bude nastaven na nejlepší možnost."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6012,48 +6086,48 @@
 msgstr ""
 "%s byl změněn (vámi nebo skriptem). Přepínám pouze na ruční aktualizace."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "nastavuji automatický výběr %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "alternativa %s pro %s není registrována, nenastavuji."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Neexistuje program poskytující %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Nic k nastavení."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Ve skupině odkazů %s je pouze jedna alternativa: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "alternativa %s pro %s není registrována, neodstraňuji."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "odstraňuji ručně zvolenou alternativu - přepínám %s do automatického režimu"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "automatické aktualizace %s jsou zakázány, ponechávám bez změn."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6061,24 +6135,60 @@
 "k automatickým aktualizacím se vrátíte příkazem „update-alternatives --auto "
 "%s“."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "používám %s pro poskytnutí %s (%s), %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 "vynucuji přeinstalaci alternativy %s, protože skupina odkazů %s je porušená."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "současná alternativa %s neexistuje, přepínám na %s pro skupinu odkazů %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "je to hlavní alternativa."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "je to závislost %s"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "nelze volat stat na %s: %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "volání readlink(%s) selhalo: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "procházení %s selhalo: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "nelze spustit %s: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "nelze vytvořit symbolický odkaz %s na %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "nelze nainstalovat %s jako %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "při zápisu %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "nelze číst %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "nelze zavřít %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "nelze zapsat %s: %s"
+
 #, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6332,9 +6442,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "přeskočena kontrolní oblast od %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "nelze spustit tar"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "nelze vytvořit dočasný adresář"
 
Binary files dpkg/po/da.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/da.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/da.po /home/vorlon/devel/multiarch/dpkg-debian/po/da.po
--- dpkg/po/da.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/da.po	2012-06-07 10:11:09.426073000 -0700
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: dpkg_1.10.19_da\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-10-14 01:13+0200\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -34,7 +34,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "kan ikke skrive filen '%s'"
@@ -55,71 +55,77 @@
 msgid "ar member file (%s)"
 msgstr "kunne ikke køre fstat på ar-medlemsfil (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "kunne ikke læse ved bufferkopiering for %s"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "kunne ikke skrive ved bufferkopiering for %s"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "løb tør under læsning i bufferkopiering for %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "kunne ikke køre tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "kunne ikke køre %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekomprimering"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: komprimering"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: fejl ved binding af inddata til gzip-strøm"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: intern gzip-læsefejl: '%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: intern gzip-skrivefejl"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: fejl ved binding af uddata til gzip-strøm"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: intern gzip-læsefejl"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: intern gzip-skrivefejl: '%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: intern gzip-skrivefejl: %s"
@@ -134,31 +140,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: intern bzip2-læsefejl: '%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: intern bzip2-skrivefejl"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: fejl ved binding af uddata til bzip2-strøm"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: intern bzip2-læsefejl"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: intern bzip2-skrivefejl: '%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "uventet bzip2-fejl"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -167,7 +173,7 @@
 "opdateringskataloget indeholder filen '%.250s', hvis navn er for langt "
 "(længde=%d, max=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -175,98 +181,98 @@
 "opdateringskataloget indeholder filer med forskellige navnelængder (både %d "
 "og %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "kan ikke gennemsøge opdateringskataloget '%.255s'"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "kunne ikke slette indlemmet opdateringsfil %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "kunne ikke oprette '%.255s'"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "kunne ikke efterfylde %.250s"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "kunne ikke tømme %.250s efter efterfyldningen"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "kunne ikke søge til starten af %.250s efter efterfyldningen"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "kan ikke åbne låsefil %s til test"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "kunne ikke åbne/oprette statusdatabasens låsefil"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "du har ikke rettigheder til at låse dpkg's statusdatabase"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "kunne ikke låse dpkg's statusdatabase"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "den ønskede handling kræver superbrugerrettigheder"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "kunne ikke tilgå dpkg-statusområdet"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "handling kræver læse/skriveadgang til dpkg-statusområdet"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "kunne ikke slette min egen opdateringsfil %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "kunne ikke skrive opdateret status for '%.250s'"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "kunne ikke tømme opdateret status for '%.250s'"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "kunne ikke klippe for opdateret status for '%.250s'"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "kunne ikke synkronisere opdateret status for '%.250s'"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "kunne ikke lukke opdateret status for '%.250s'"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "kunne ikke installere opdateret status for '%.250s'"
@@ -289,71 +295,73 @@
 msgid "unable to open directory '%s'"
 msgstr "kan ikke åbne filen '%s'"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "kan ikke åbne filen '%s'"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "kan ikke synkronisere filen '%s'"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "kan ikke lukke filen '%s'"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "kunne ikke skrive detaljerne om '%.50s' til '%.250s'"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "kunne ikke åbne '%s' for at skrive %s-database"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "kunne ikke aktivere mellemlagring for %s-databasefil"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "kunne ikke skrive %s-indgang om '%.50s' til '%.250s'"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "kunne ikke tømme %s-database til '%.250s'"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "kunne ikke synkronisere %s-database til '%.250s'"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "kunne ikke lukke '%.250s' efter skrivning af %s-database"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "kunne ikke lænke '%.250s' til '%.250s' til sikkerhedskopiering af %s-database"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "kunne ikke installere '%.250s' som '%.250s' indeholdende %s-database"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -362,7 +370,7 @@
 "%s: uløselig fatal fejl - afbryder:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -374,13 +382,13 @@
 "%s: uløselig fatal fejl - afbryder:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "løb tør for hukommelse til ny oprydningsindgang"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -389,32 +397,32 @@
 "%s: fejl under oprydning:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: for mange sammenflettede fejl under fejlopretning!!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "løb tør for hukommelse til ny oprydningsindgang"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "løb tør for hukommelse til ny oprydningsindgang med mange argumenter"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s: advarsel: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: advarsel: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: intern fejl: %s\n"
@@ -430,105 +438,105 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "'%.*s' ikke tilladt for %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "skrammel efter %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "ugyldigt pakkenavn (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "tomt fildetaljefelt '%s'"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "fildetaljefelt '%s' ikke tilladt i statusfil"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "for mange værdier i fildetaljefelt '%s' (sammenlignet med andre)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "for få værdier i fildetaljefelt '%s' (sammenlignet med andre)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "yes/no i boolsk felt"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "ord i 'priority'-felt"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "værdi i 'status'-feltet er ikke tilladt i denne sammenhæng"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "første (ønske) ord i 'status'-feltet"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "andet (fejl) ord i 'status'-feltet"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "tredje (status) ord i 'status'-feltet"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "fejl i Version-streng '%.250s'"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "forældet 'Revision'- eller 'Package-Revision'-felt blev brugt"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "værdien for 'config-version'-feltet er ikke tilladt i denne sammenhæng"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "fejl i Config-Version-streng '%.250s'"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "værdien for 'conffiles' har en linje med ugyldigt format '%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "værdien for 'conffiles' har en linje, der starter uden mellemrum '%c'"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "root- eller null-kataloget er nævnt i konfigurationsfil"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, 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"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "'%s'-felt, ugyldigt pakkenavn '%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -537,7 +545,7 @@
 "'%s'-felt, henvisning til '%.255s':\n"
 " ugyldig versionsrelation %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -546,7 +554,7 @@
 "'%s'-felt, henvisning til '%.255s':\n"
 " '%c' er forældet, brug '%c=' eller '%c%c' i stedet"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -555,11 +563,11 @@
 "'%s'-felt, henvisning til '%.255s':\n"
 " implicit nøjagtig match på versionsnummer, foreslår brug af '=' i stedet"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Kun eksakte versioner må benyttes til Provides"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -569,57 +577,57 @@
 " versionsværdien starter med ikke-alfanumerisk tegn, foreslår at tilføje et "
 "mellemrum"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "Feltet '%s', henvisning til '%.255s': version indeholder '%c'"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "Feltet '%s', henvisning til '%.255s': version uafsluttet"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "Feltet '%s', henvisning til '%.255s': fejl i version"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "Feltet '%s', syntaksfejl efter henvisning til pakken '%.255s'"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternativer ('|') tillades ikke i %s-feltet"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 "værdien for 'triggers-pending'-feltet er ikke tilladt i denne sammenhæng"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "ugyldigt navn på ventende udløser '%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "gentaget forestående udløser '%.255s'"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "værdien i 'triggers-awaited'-feltet er ikke tilladt i denne sammenhæng"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "ugyldigt pakkenavn i ventet udløser '%.255s': %s"
 
 # ???
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "gentaget ventet udløserpakke '%.255s'"
@@ -676,7 +684,7 @@
 msgid "unable to write to status fd %d"
 msgstr "kan ikke skrive til status-fd %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "malloc failed (%ld bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -688,8 +696,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "omallokering mislykkedes (%ld byte)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "kan ikke allokere hukommelse"
 
@@ -722,203 +730,209 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "kan ikke sætte flaget 'close-on-exec' for %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "konfigurationsfejl: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "kunne ikke åbne konfigurationsfil '%.255s' til læsning: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "ubalancerede anførselstegn i '%s'"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "ukendt tilvalg '%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "'%s' kræver en værdi"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "'%s' kan ikke have en værdi"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "læsefejl i konfigurationsfil '%.255s'"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "fejl ved lukning af konfigurationsfil '%.255s'"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "fejl ved åbning af konfigurationskatalog '%s'"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "ukendt tilvalg --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "tilvalget --%s kræver en værdi"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s tager ikke imod en værdi"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "ukendt tilvalg -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "tilvalget -%c kræver en værdi"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "tilvalget -%c tager ikke imod en værdi"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "forældet tilvalg '--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "modstridende handlinger -%c (--%s) and -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "værdi for '%s'-feltet optræder mere end én gang"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "for kort brugerbestemt feltnavn '%.*s'"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "værdi for brugerdefineret felt '%.*s' optræder mere end én gang"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr ""
 "Konfigureret version (Configured-Version) for pakke med upassende status"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "pakke har status %s, men der afventes udløsere"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "pakke har status triggers-awaited, men ingen udløsere afventes"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "pakke har status %s, men der er ventende udløsere"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "pakke har status triggers-pending, men ingen udløsere venter"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Pakke, der har status \"ikke-installeret\", har konfigurationsfiler. Glemmer "
 "disse"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "kunne ikke åbne pakkeinformationsfil '%.255s' for læsning"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "kunne ikke finde pakkeinformationsfil '%.255s'"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "kunne ikke køre 'mmap' på pakkeinformationsfil '%.255s'"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "kunne ikke finde pakkeinformationsfil '%.255s'"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "kunne ikke lukke efter læsning: '%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "slut-på-fil efter feltnavn '%.*s'"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "linjeskift i feltnavn '%.*s'"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS slut-på-fil (^Z) i feltnavn '%.*s'"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "feltnavn '%.*s' skal efterfølges af et kolon"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, 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)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, 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?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "linjeskift i feltnavn '%.*s'"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "slut-på-fil i værdien for felt '%.*s' (afsluttende linjeskift mangler)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "flere pakkeinformations-indgange fundet, kun én er tilladt"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "kunne ikke lukke efter læsning: '%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "ingen pakkeinformation i '%.255s'"
@@ -947,63 +961,63 @@
 "%s, i filen '%.255s' nær linje %d:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "må ikke være en tom streng"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "skal starte med alfanumerisk tegn"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, 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)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<ingen>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "versionsstreng er tom"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "versionsstreng indeholder mellemrum"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "epoke i version er ikke et tal"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "intet efter kolon i versionsnummer"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "ugyldigt tegn i versionsnummer"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "ugyldigt tegn i revisionsnummer"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "manglende %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "tom værdi for %s"
@@ -1022,52 +1036,52 @@
 msgid "(no description available)"
 msgstr "(ingen tilgængelig beskrivelse)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "kan ikke ignorere signal %s før kørsel af %.250s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "fejl ved blokering af signal %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (underproces): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "processpaltning mislykkedes"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "underproces %s returnerede afslutningsstatus %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "afventning af underprocessen %s mislykkedes"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "underproces %s dræbt af signal (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", core efterladt"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "underproces %s mislykkedes med ventestatuskode %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "afventning af underprocessen %s mislykkedes"
@@ -1088,61 +1102,53 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr "syntaksfejl i udløserudsættelsesfilen '%.250s' ved tegn '%s'%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "kan ikke åbne/oprette låsefilen '%.250s' til udløsere"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "udløst"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "kan ikke tilgå udløserudsættelsesfilen '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "kan ikke åbne udløserudsættelsesfilen '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "kan ikke åbne/oprette ny udløserudsættelsesfil '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "fejl ved læsning af udløserudsættelsesfilen '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "kan ikke skrive ny udløserudsættelsesfil '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "kan ikke lukke ny udløserudsættelsesfil '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "kan ikke installere ny udløserudsættelsesfil '%.250s'"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "tomme udløsernavne er ikke tilladt"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "udløsernavn indeholder ugyldigt tegn"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1151,17 +1157,17 @@
 "ugyldig eller ukendt syntaks i udløsernavn '%.250s' (i udløser-interesser "
 "for pakken '%.250s')"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "kunne ikke åbne udløser-interesselistefil '%.250s'"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "kunne ikke spole udløser-interessefil '%.250s' tilbage"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1170,85 +1176,91 @@
 "syntaksfejl i udløser-interessefil '%.250s'; ugyldigt pakkenavn '%.250s': "
 "%.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "kan ikke oprette ny udløser-interessefil '%.250s'"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "kan ikke skrive ny udløser-interessefil '%.250s'"
 
 # flush er normalt at tømme en buffer når der skrives filer
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "kan ikke tømme buffer til ny udløser-interessefil '%.250s'"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "kan ikke synkronisere ny udløser-interessefil '%.250s'"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "kan ikke lukke ny udløser-interessefil '%.250s'"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "kan ikke installere ny udløser-interessefil '%.250s'"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "kan ikke afinstallere '%.250s'"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "kan ikke oprette ny udløser-interessefil '%.250s'"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "kan ikke lukke ny udløser-interessefil '%.250s'"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 "gentaget fil-udløser-interesse for filnavnet '%.250s' og pakken '%.250s'"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "kan ikke oprette ny filudløserfil '%.250s'"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "kan ikke skrive ny filudløserfil '%.250s'"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "kan ikke tømme ny filudløserfil '%.250s'"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "kan ikke synkronisere ny filudløserfil '%.250s'"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "kan ikke lukke ny filudløserfil '%.250s'"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "kan ikke installere ny filudløserfil som '%.250s'"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "kan ikke læse filudløserfil '%.250s'"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "syntaksfejl i filudløserfil '%.250s'"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1257,7 +1269,7 @@
 "fortegnelsen af filudløsere nævner ugyldigt pakkenavn '%.250s' (til "
 "interesse i filen '%.250s'): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1266,30 +1278,38 @@
 "udløser-ci-fil '%.250s' indeholder ulovlig udløsersyntaks i udløsernavn "
 "'%.250s': %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "kan ikke åbne udløser-ci-fil '%.250s'"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "udløser-ci-fil indeholder ukendt direktivsyntaks"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "udløser-ci-fil indeholder ukendt direktiv '%.250s'"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "kan ikke oprette udløsertilstandskatalog '%.250s'"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "kan ikke ændre ejerskab for udløsertilstandskatalog '%.250s'"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "tomme udløsernavne er ikke tilladt"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "udløsernavn indeholder ugyldigt tegn"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1314,7 +1334,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "fejl ved formatering af streng ind i varbuf-variabel"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "fejl ved læsning fra datakanal for dpkg-deb"
 
@@ -1333,12 +1353,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "fejl under indstilling af ejerskab af symbolsk lænke '%.255s'"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "fejl ved indstilling af ejerskab for '%.255s'"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "fejl ved indstilling af filrettigheder for '%.255s'"
@@ -1396,17 +1416,26 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arkivet indeholdt objektet '%.255s' med ukendt type 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "kan ikke tilgå filen '%s'"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Erstatter filer i den gamle pakke %s...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Erstattet af filer i den installerede pakke %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1415,95 +1444,100 @@
 "forsøger at overskrive kataloget '%.250s' i pakken %.250s %.250s med ikke-"
 "katalog"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "forsøger at overskrive '%.250s', som også er i pakken %.250s %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "kan ikke oprette '%.255s' (under behandling af '%.255s')"
 
 # ?  Nå, det går nok...
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "backend dpkg-deb under '%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "fejl under lukning/skrivning '%.255s'"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "fejl under oprettelse af datakanal '%.255s'"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "fejl under oprettelse af enhed '%.255s'"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "fejl under oprettelse af hård lænke '%.255s'"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "fejl under oprettelse af symbolsk lænke '%.255s'"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "kunne ikke oprette kataloget '%.255s'"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, 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:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "kunne ikke læse lænken '%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "kunne ikke oprette sikkerhedskopi af symbolsk lænke for '%.255s'"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "kunne ikke ændre ejerskab af symbolsk lænke for '%.255s'"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, 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:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "kunne ikke installere ny version af '%.255s'"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "kan ikke åbne '%.255s'"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "kan ikke synkronisere fil '%.255s'"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1512,7 +1546,7 @@
 "ignorerer afhængighedsproblem med %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1521,7 +1555,7 @@
 "overvejer dekonfigurering af den essentielle\n"
 " pakke %s for at muliggøre %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1530,7 +1564,7 @@
 "dpkg: nej, %s er essentiel, vil ikke dekonfigurere\n"
 " den for at muliggøre %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1539,29 +1573,29 @@
 "dpkg: nej, kan ikke fortsætte med %s (--auto-deconfigure vil hjælpe):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "afinstallation af %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "installation af %.255s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 "dpkg: overvejer at dekonfigurere %s, som ville være i konflikt med %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: ja, vil afkonfigurere %s (i konflikt med %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1570,11 +1604,11 @@
 "dpkg: vedrørende %s, der indeholder %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "ignorerer skade, kan fortsætte alligevel!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1583,28 +1617,28 @@
 "installation af %.250s ville være i konflikt med %.250s, og\n"
 " dekonfiguration er ikke tilladt (--auto-deconfigure kan hjælpe)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 "installation af %.250s ville være i konflikt med eksisterende programmer"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1613,107 +1647,109 @@
 "dpkg: pakken %s kræver geninstallation, men afinstalleres efter dit ønske "
 "alligevel.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "modstridende pakker - installerer ikke %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "ignorerer konflikt, kan fortsætte alligevel!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive kræver mindst ét stiargument"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "find for dpkg --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "kunne ikke køre fdopen på datakanalen for find"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "fejl ved læsning af datakanal for find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "fejl ved lukning af datakanal for find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find for --recursive returnerede uforudset fejl %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "søgte, men fandt ingen pakker (filer, der matcher *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s kræver mindst én pakkearkivfil som argument"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<standard-uddata>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<standard-fejl>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Vælger tidligere fravalgt pakke %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Overspringer tidligere fravalgt pakke %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, 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:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "nedgraderer %.250s fra %.250s til %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, 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"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1722,37 +1758,37 @@
 "kunne ikke slette nyinstalleret version af '%.250s' for at tillade "
 "geninstallation af sikkerhedskopi"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "kunne ikke genskabe sikkerhedskopi-version af '%.250s'"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "kan ikke fjerne sikkerhedskopi af '%.250s'"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "kan ikke slette nyinstalleret version af '%.250s'"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "kan ikke slette nyudpakket version af '%.250s'"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "kan ikke tilgå ny distribueret konfigurationsfil '%.250s'"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "kan ikke tilgå den installerede medsendte konfigurationsfil '%.250s'"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1763,57 +1799,57 @@
 "Konfigurationsfilen '%s' eksisterer ikke på systemet.\n"
 "Installerer ny konfigurationsfil efter dit ønske.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: kunne ikke fjerne gammel sikkerhedskopi '%.250s': %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: kunne ikke omdøbe '%.250s' til '%.250s': %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: kunne ikke fjerne '%.250s': %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: kunne ikke fjerne tidligere distribueret version '%.250s': %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: kunne ikke fjerne '%.250s' (inden overskrivning): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: kunne ikke lænke '%.250s' til '%.250s': %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Installerer ny version af konfigurationsfil %s...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "kunne ikke installere '%.250s' som '%.250s'"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "ingen pakke med navnet '%s' installeret, kan ikke konfigurere"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "pakken %.250s er allerede installeret og konfigureret"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1822,7 +1858,7 @@
 "pakken %.250s ikke klar til konfiguration\n"
 " kan ikke konfigurere (nuværende status '%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1831,11 +1867,11 @@
 "dpkg: afhængighedsproblemer forhindrer konfiguration af %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "afhængighedsproblemer - efterlader den ukonfigureret"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1845,7 +1881,7 @@
 "ønskede:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1853,12 +1889,12 @@
 "Pakke er i en meget inkonsistent tilstand - du burde\n"
 " ominstallere den, før du forsøger konfiguration."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Sætter %s (%s) op...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1867,7 +1903,7 @@
 "%s: kan ikke tilgå konfigurationsfil '%s'\n"
 " (= '%s'): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1876,7 +1912,7 @@
 "%s: konfigurationsfil '%s' er en selvrefererende lænke\n"
 " (= '%s')"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1885,7 +1921,7 @@
 "%s: kan ikke læse lænken for konfigurationsfil '%s'\n"
 " (= '%s'): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1894,35 +1930,35 @@
 "%s: konfigurationsfil '%.250s' bliver til et degenereret filnavn\n"
 " ('%s' er symbolsk lænke til '%s')"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: konfigurationsfil '%.250s' er hverken en almindelig fil eller symbolsk "
 "lænke (= '%s')"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: kan ikke åbne konfigurationsfil %s til hashning: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Skriv 'exit', når du er færdig.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1931,12 +1967,12 @@
 "\n"
 "Konfigurationsfil '%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (faktisk '%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1947,7 +1983,7 @@
 " ==> Filen på systemet oprettet af dig eller af et script.\n"
 " ==> Filen er også i pakken fra pakkeadministratoren.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1956,7 +1992,7 @@
 "\n"
 "     Uændret siden installationen.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1965,7 +2001,7 @@
 "\n"
 " ==> Ændret (af dig eller af et script) siden installationen.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1974,37 +2010,37 @@
 "\n"
 " ==> Ændret (af dig eller af et script) siden installationen.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Pakkedistributør har frigivet en opdateret version.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Versionen i pakken er den samme som ved sidste installation.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Benytter ny fil efter dit ønske.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Benytter eksisterende gammel fil efter dit ønske.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Beholder gammel konfigurationsfil som standard.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Benytter ny konfigurationsfil som standard.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2019,158 +2055,160 @@
 "        D      : vis forskellen mellem versionerne\n"
 "        Z      : start en skal for at undersøge situationen\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Den forvalgte handling er at beholde den eksisterende version.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Den forvalgte handling er at installere en ny version.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[forvalgt=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[forvalgt=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[ingen forvalgt handling]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "fejl ved skrivning til standardfejl, opdaget inden konfigurationsfil-prompt"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "læsefejl på standard-ind ved konfigurationsfil-prompt"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "Slut-på-fil ved standard-ind ved konfigurationsfil-prompt"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s afhænger af %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s afhænger i forvejen af %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s anbefaler %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s foreslår %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s er i konflikt med %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s er i konflikt med %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s forbedrer %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s vil blive slettet.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s vil blive dekonfigureret.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s er installeret, men versionen er %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s er udpakket, men blev aldrig konfigureret.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s er udpakket, men versionen er %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s sidst konfigurerede version er %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s er %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s giver %.250s, men planlægges afinstalleret.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s giver %.250s, men planlægges dekonfigureret.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s giver %.250s, men er %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s er ikke installeret.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (version %.250s) vil blive installeret.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (version %.250s) er til stede og %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s giver %.250s og vil blive installeret.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s giver %.250s og er til stede og %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "Brug --help for at få hjælp om pakkeforespørgsel."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2178,7 +2216,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s version %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2189,8 +2227,8 @@
 "Ophavsret (C) 2000,2001 Wichert Akkerman.\n"
 "Ophavsret (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2200,7 +2238,7 @@
 "Dette er frit programmel; se GNU General Public License version 2 eller\n"
 "senere for kopieringsbetingelserne. Der er INGEN garanti.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2210,7 +2248,7 @@
 "Brug: %s [<tilvalg> ...] <kommando>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2229,7 +2267,7 @@
 "  --truename <fil>         returnér den omdirigerede fil.\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2259,7 +2297,7 @@
 "  --help                   vis denne hjælpebesked.\n"
 "  --version                vis versionen.\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2272,17 +2310,12 @@
 "Pakkepræinstallations- eller -postinstallationsscripter skal altid angive \n"
 "--package og --divert.\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "kan ikke tilgå filen '%s'"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "fejl under tjek af '%s'"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2291,131 +2324,131 @@
 "omdøbning medfører overskrivning af '%s' med\n"
 "  anden fil `%s', ikke tilladt"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "kan ikke skrive filen '%s'"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "filkopi"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "kan ikke omdøbe '%s' til '%s'"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "omdøb: fjern identisk gammel lænke '%s'"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "kunne ikke åbne kildefil '%.250s'"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "lokal omdirigering af %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "lokal omdirigering af %s til %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "omdirigering af %s gennem %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "omdirigeret af %s til %s gennem %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "enhver omdirigering af %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "enhver omdirigering af %s til %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "kan ikke oprette ny %s-fil"
 
 # bemærk at flush normalt dækker over at tømme en buffer (her til en fil)
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "kan ikke tømme til filen '%s'"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "fejl ved fjernelse af gammel diversions-old"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "fejl under oprettelse af ny diversions-old"
 
 # tror diversions er et filnavn
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "fejl under installation af ny diversions"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s kræver et enkelt parameter"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "filenavnet \"%s\" er ikke absolut"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "filen må ikke indeholde linjeskift"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Kan ikke omdirigere kataloger"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "kan ikke omdirigere filen '%s' til sig selv"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "Forlader '%s'\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "'%s' er i modstrid med '%s'"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "Tilføjer '%s'\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Ingen omdirigering '%s', ingen fjernet.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2426,7 +2459,7 @@
 "  under afinstallation af '%s'\n"
 "  fandt '%s'"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2437,16 +2470,16 @@
 "  under afinstallation af '%s'\n"
 "  fandt '%s'"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "Fjerner '%s'\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "pakke må ikke indeholde linjeskift"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "omrokér-til må ikke indeholde linjeskift"
 
@@ -2529,8 +2562,8 @@
 "eller dpkg --configure --pending (eller dpkg --triggers-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s tager ingen parametre"
@@ -2627,7 +2660,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions ugyldig relation"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "versionen '%s' har en ugyldig syntaks: %s"
@@ -2682,12 +2715,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "undertrykker problemet, fordi --force er givet:"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "kunne ikke åbne fillistefil for pakken '%.250s'"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2696,69 +2729,69 @@
 "fillistefilen for pakken '%.250s' mangler. Antager, at pakken ikke har nogen "
 "filer installeret."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "kan ikke tilgå fillistefil for pakken '%.250s'"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "filliste for pakken '%.250s'"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "fillistefilen for pakken '%.250s' mangler afsluttende linjeskift"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "fillistefilen for pakken '%.250s' indeholder tomt filnavn"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "fejl under lukning af fillistefil for pakken '%.250s'"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Læser database ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "%d fil eller katalog installeret i øjeblikket.)\n"
 msgstr[1] "%d filer og kataloger installeret i øjeblikket.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "kunne ikke oprette opdateret fillistefil for pakken %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "kunne ikke skrive til opdateret fillistefil for pakken %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "kunne ikke tømme opdateret fillistefil for pakken %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "kunne ikke synkronisere opdateret fillistefil for pakken %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "kunne ikke lukke opdateret fillistefil for pakken %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "kunne ikke installere opdaterede listefil for pakken %s"
@@ -2796,7 +2829,9 @@
 msgstr "installeret"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "fejl: PATH er ikke defineret."
 
 #: src/help.c:129
@@ -2837,7 +2872,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2849,65 +2884,65 @@
 msgstr "kunne ikke skifte filrod til '%.250s'"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "kunne ikke skifte katalog til '%.255s'"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "kunne ikke sætte eksekveringsrettigheder for '%.250s'"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "kan ikke setenv til vedligeholderscript"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "installerede %s-script"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "kunne ikke finde %s '%.250s'"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "nyt %s-script"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "gammelt %s-script"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "kunne ikke tilgå %s '%.250s': %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - forsøger i stedet script fra ny pakke...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "der er intet script i den nye version af pakken - giver op"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... det ser ud til, at alt gik o.k.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "kan ikke på sikker vis fjerne '%.255s'"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2916,7 +2951,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "kunne ikke tjekke eksistensen af '%.250s'"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "kan ikke læse info-katalog"
 
@@ -2985,7 +3020,7 @@
 "  -Dh|--debug=help                 Vis hjælp til fejlsøgning.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3115,7 +3150,7 @@
 msgstr ""
 "Brug 'dselect' eller 'aptitude' for en mere brugervenlig pakkehåndtering.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3164,30 +3199,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3196,103 +3235,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "afhængighedsproblemer - afinstallerer ikke"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "afhængighedsproblemer - afinstallerer ikke"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "kan ikke setenv til vedligeholderscript"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "læsefejl i konfigurationsfil '%.255s'"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3300,7 +3339,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3308,37 +3347,37 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug kræver et oktalt parameter"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "tomt pakkenavn i --ignore-depends kommasepareret liste '%.250s'"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends kræver et gyldigt pakkenavn. Det er '%.250s' ikke; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ugyldigt heltal for --%s: '%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "fejl ved tilbagekaldet '%s', fejlkode %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "status"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3347,7 +3386,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3355,12 +3394,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ukendt gennemtvingnings/afvisnings-tilvalg '%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "forældet gennemtvangs/afvisnings-tilvalg '%s'\n"
@@ -3383,8 +3422,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "uventet slut-på-fil før afslutningen af linje %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "kræver et handlingstilvalg"
 
@@ -3547,90 +3586,90 @@
 msgid "passed\n"
 msgstr "godkendt\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "kan ikke oprette midlertidigt katalog"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "pakken %s har for mange Conflicts/Replaces-par"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "den gamle version af pakken har et overdrevet langt filnavn, der starter med "
 "'%.250s'"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "kunne ikke slette forældet informationsfil '%.250s'"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "kunne ikke installere (antaget) ny informationsfil '%.250s'"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "kunne ikke åbne midlertidigt kontrolkatalog"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "pakken indeholder et overdrevet langt informationsfilnavn (starter med "
 "'%.50s')"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "pakkekontrolinformation indeholdt kataloget '%.250s'"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, 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 et katalog"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "pakken %s indeholdt en liste som informationsfil"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "kunne ikke installere ny informationsfil '%.250s' som '%.250s'"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "kunne ikke slette kontrolinformationsfilen '%.250s'"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "kan ikke tilgå arkivet"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "kan ikke oprette midlertidigt katalog"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "kontrolinformationslængde"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Gemte information om %s fra %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "pakkearkitekturen (%s) passer ikke til systemet (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3639,102 +3678,102 @@
 "dpkg: vedrørende %s, der indeholder %s, forhånds-afhængighedsproblem:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "forhåndsafhængighedsproblem - installerer ikke %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "ignorerer forhåndsafhængighedsproblem!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Gør klar til at erstatte %s %s (med %s)...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Udpakker %s (fra %s)...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, 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)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "læsefejl i %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "fejl under lukning af %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "fejl ved forsøg på at åbne %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Dekonfigurerer %s, så %s kan afinstalleres...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Dekonfigurerer %s...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Udpakker erstatning for %.250s...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "feltudtrækning til dpkg-deb"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "fejl ved læsning af dpkg-deb's tar-uddata"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "ødelagt filsystem-tarfil - ødelagt pakkearkiv"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: fjern mulige afsluttende nuller"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "kunne ikke tilgå den gamle fil '%.250s', så den slettes ikke: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "kan ikke slette gammelt katalog '%.250s': %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "gammel konfigurationsfil '%.250s' var et tomt katalog (og er nu blevet "
 "slettet)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "kunne ikke tilgå den anden ny fil '%.250s'"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3743,12 +3782,12 @@
 "den gamle fil '%.250s' er den samme som adskillige nye filer! (både %.250s' "
 "og'%.250s')"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "kan ikke på sikker vis fjerne den gamle fil '%.250s': %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
@@ -3951,7 +3990,7 @@
 "  --admindir=<katalog>                Brug <katalog> i stedet for %s\n"
 "  -f|--showformat=<format>            Brug alternativt format til --show\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3972,6 +4011,10 @@
 "  højrejusteret, medmindre bredden er negativ. I så fald benyttes\n"
 "  venstrejustering.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Brug --help for at få hjælp om pakkeforespørgsel."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4031,7 +4074,7 @@
 msgid "Removing %s ...\n"
 msgstr "Afinstallerer %s...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4040,49 +4083,50 @@
 "kunne ved afinstallation af %.250s ikke fjerne kataloget '%.250s': %s - kan "
 "kataloget være et monteringspunkt?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "kan ikke afinstallere '%.250s'"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "kan ikke på sikker vis fjerne '%.250s'"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "ved fjernelse af %.250s var kataloget '%.250s' ikke tomt - fjernes ikke."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "kan ikke afinstallere '%.250s'"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Udrenser konfigurationsfiler for %s...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "kan ikke slette gammel konfigurationsfil '%.250s' (= '%.250s')"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "kan ikke læse konfigurationsfils-kataloget %.250s' (fra '%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "kan ikke slette gammel sikkerhedskopi af konfigurationsfilen '%.250s' (fra "
 "'%.250s')"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "kan ikke slette gammel filliste"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "kan ikke slette gammelt 'postrm'-script"
 
@@ -4125,7 +4169,13 @@
 msgid "read error on standard input"
 msgstr "læsefejl fra standard-inddata"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "Brug --help for at få hjælp om pakkeforespørgsel."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4134,7 +4184,7 @@
 "Ophavsret (C) 2000, 2001 Wichert Akkerman.\n"
 "Ophavsret (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4151,7 +4201,7 @@
 "  --list [<glob-mønster>]  vis nuværende tilsidesættelser i databasen.\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4172,31 +4222,31 @@
 "  --help                   vis denne hjælpebesked.\n"
 "  --version                vis versionen.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "fjerner afsluttende /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "kan ikke åbne ny statoverride-fil"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "fejl under fjernelse af statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "fejl under oprettelse af ny statoverride-old"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "fejl under installation af ny statoverride"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add kræver fire parametre"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4204,21 +4254,21 @@
 msgstr ""
 "Der findes allerede en omgåelse for '%s', men denne ignoreres givet --force."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Der findes allerede en omgåelse for \"%s\", så afbryder."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "--update er givet, men %s findes ikke"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Der er ingen omgåelser."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update er nytteløs med --remove"
 
@@ -4283,16 +4333,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "der er flere statusomgåelser til stede for filen '%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Skriv dpkg-tigger --help for at få hjælp om dette værktøj."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Pakkeudløserværktøjet %s version %s til Debian.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4303,7 +4353,7 @@
 "      %s [<tilvalg> ...] <kommando>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4316,7 +4366,7 @@
 "udløsere.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4337,21 +4387,21 @@
 "  --no-act                         Test kun - lav ingen faktiske ændringer.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: datakatalog for udløsere endnu ikke oprettet\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: udløserfortegnelser findes endnu ikke\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "kræver et argument, udløsernavnet"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4361,13 +4411,13 @@
 "dpkg-trigger skal kaldes fra et vedligeholderscript (eller med tilvalget --"
 "by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: ugyldigt afventet pakkenavn '%.250s': %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "ugyldigt udløsernavn '%.250s': %.250s"
@@ -4400,37 +4450,38 @@
 msgstr "Behandler udløsere for %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s skal bruge netop én 'Packages'-fil som parameter"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr "kunne ikke tilgå dpkg's statusområde for rå tilgængelighedsopdatering"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "rå tilgængelighedsopdatering kræve skriveadgang til dpkg's statusområde"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Erstatter oplysninger om tilgængelige pakker via %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Opdaterer oplysninger om tilgængelige pakker via %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "Informationer om %d pakke blev opdateret.\n"
 msgstr[1] "Informationer om %d pakker blev opdateret.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4546,8 +4597,8 @@
 msgstr[0] "dpkg-deb: ignorerer %d advarsel om kontrolfiler\n"
 msgstr[1] "dpkg-deb: ignorerer %d advarsler om kontrolfiler\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s kræver en <katalog>-parameter"
@@ -4579,26 +4630,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: opbygger pakken '%s' i '%s'.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "kunne ikke oprette midlertidig fil (data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "kontrolområde"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "kunne ikke slette lænke til midlertidig fil (data), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4615,21 +4666,21 @@
 msgid "error writing `%s'"
 msgstr "fejl under skrivning af '%s'"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "mellem medlemmer"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "kunne ikke skrive filnavn til tar-datakanal (data)"
 
 # er ikke sikker på om compress kan oversættes her
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<komprimér> fra tar -cf"
 
@@ -4647,76 +4698,76 @@
 msgid "error reading %s from file %.255s"
 msgstr "kunne ikke læse %s fra filen %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "kunne ikke læse arkivet '%.255s'"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "kunne ikke køre 'fstat' på arkivet"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "arkivet har intet punktum i versionsnummer"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "arkivet har ingen linjeskift i hovedet"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "filen '%.250s' is ødelagt - ugyldigt delnummer"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "filen '%.250s' er ikke et binært debianarkiv (prøv dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "arkivet har intet punktum i versionsnummer"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "arkivet har ingen linjeskift i hovedet"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "arkivet har intet punktum i versionsnummer"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 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:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "sprang over medlemsdata fra %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "filen '%.250s' indeholder uforstået datamedlem %.*s. Opgiver"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "filen '%.250s' indeholder to kontrolmedlemmer. Opgiver"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4728,23 +4779,23 @@
 " ny debianpakke, version %s.\n"
 " størrelse %ld byte: kontrolarkiv= %zi byte.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "arkivet har forkert udformet kontrollængde '%s'"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "sprang over medlemsdata fra %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4756,7 +4807,7 @@
 " gammel debianpakke, version %s.\n"
 " størrelse %ld byte: kontrolarkiv= %zi, hovedarkiv= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4765,49 +4816,50 @@
 "dpkg-deb: filen ser ud til at være et arkiv, der er blevet\n"
 "dpkg-deb:    ødelagt af at blive nedhentet i ASCII-tilstand\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "'%.255s' er ikke et arkiv i debianformat"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "kunne ikke skrive til datakanal ved kopiering"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "kunne ikke lukke datakanal ved kopiering"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "kunne ikke skifte til katalog"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "kunne ikke oprette katalog"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "kunne ikke skifte til katalog efter at have oprettet den"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "kunne ikke skifte til katalog"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<dekomprimér>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "indsæt"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s kræver et .deb-filnavn som parameter"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4816,96 +4868,96 @@
 "--%s kræver et målkatalog.\n"
 "Måske skulle du bruge dpkg --install?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s tager højst to parametre (.deb og katalog)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s tager kun ét parameter(.deb-filnavn)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "kunne ikke skifte til kataloget '/' for at rydde op"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "kan ikke tilgå filen '%s'"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: '%.255s' indeholder ikke kontrolkomponenten '%.255s'\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr "åbning af komponent '%.255s' (i %.255s) mislykkedes på en uventet måde"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "%d ønsket kontrolkomponent mangler"
 msgstr[1] "%d ønskede kontrolkomponenter mangler"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "kunne ikke gennemsøge kataloget '%.255s'"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "kunne ikke finde '%.255s' (i '%.255s')"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "kunne ikke åbne '%.255s' (i '%.255s')"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "kunne ikke læse '%.255s' (i '%.255s')"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld byte, %5d linjer   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     ikke almindelig fil       %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(ingen 'control'-fil i kontrolarkivet!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "kunne ikke åbne komponenten 'control'"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "fejl under læsning af komponenten 'control'"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "fejl ved lukning af '%s'-komponenten"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Fejl i format"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents tager nøjagtig ét parameter"
 
@@ -4915,7 +4967,19 @@
 msgstr "Debian '%s' pakkearkivs-håndtering version %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4926,6 +4990,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4940,7 +5006,7 @@
 "  -X|--vextract <deb> <katalog>     Uddrag og vis filer.\n"
 "  --fsys-tarfile <deb>              Skriv filsystems-tar-fil.\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4953,11 +5019,27 @@
 "<cfelt> er navnet på et felt i hovedkontrolfilen.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4981,7 +5063,7 @@
 "none.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4994,7 +5076,7 @@
 "'dselect' eller 'aptitude' som brugervenlgit pakkehåndtering. Pakker, der\n"
 "pakkes ud med 'dpkg-deb --extract' bliver ikke installeret korrekt!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5002,17 +5084,17 @@
 "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:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "ugyldigt heltal for -%c: '%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "ugyldigt komprimeringsniveau for -%c: '%ld'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ukendt komprimeringstype '%s'!"
@@ -5032,7 +5114,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "filen '%.250s' er ødelagt - manglende linjeskift efter %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "fejl ved læsning af %.250s"
@@ -5127,50 +5209,56 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "filen '%.250s' is ødelagt - ugyldigt delnummer"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "pakkenavn"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "filen '%.250s' is ødelagt - ugyldigt magisk nummer i slutningen af andet "
 "hoved"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "filen '%.250s' is ødelagt - andet medlem er ikke datamedlem"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, 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"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "filen '%.250s' is ødelagt - størrelsen er forkert for nævnt delnummer"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "kunne ikke køre 'fstat' på delfil '%.250s'"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "filen '%.250s' er ødelagt - for kort"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "kan ikke åbne arkivdelfilen '%.250s'"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "filen '%.250s' er ikke en arkivdel"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5190,6 +5278,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5212,12 +5301,19 @@
 "    Delfilstørrelse (brugt andel):  %lu byte\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<ukendt>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s kræver ét eller flere delfilargumenter"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "filen '%s' er ingen arkivdel\n"
@@ -5252,7 +5348,7 @@
 msgid "split package part"
 msgstr "Samler pakken %s ud af %d del: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "færdig\n"
@@ -5305,17 +5401,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Tilvalg:\n"
 "  --depotdir <katalog>            Brug <katalog> i stedet for %s/%s.\n"
@@ -5328,20 +5433,29 @@
 "\n"
 "Afslutningsstatus: 0 = o.k.;  1 = -a er ikke en del;  2 = problemer!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Skriv \"dpkg-split --help\" for hjælp."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "uventet filafslutning i %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "delen er alt for stor, eller størrelsen er ikke positiv"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "delstørrelsen skal mindst være på %d KiB (for at få plads til hoved)"
@@ -5452,27 +5566,27 @@
 msgid "Deleted %s.\n"
 msgstr "Slettede %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "feltudtrækning til dpkg-deb"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "kunne ikke åbne kildefil '%.250s'"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "kunne ikke køre 'fstat' på kildefil"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "kildefil '%.250s' ikke en almindelig fil"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5481,17 +5595,17 @@
 msgstr[0] "Samler pakken %s ud af %d del: "
 msgstr[1] "Samler pakken %s ud af %d dele: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split kræver et kildefilnavns-parameter"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split tager højst ét kildefilnavn og målpræfiks"
 
@@ -5663,125 +5777,90 @@
 "  --help                   vis denne hjælpebesked.\n"
 "  --version                vis versionen.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "fejl"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "advarsel"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "kan ikke tilgå %s: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "readlink(%s) mislykkedes: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "to kommandoer angivet: --%s og --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "kan ikke føje til %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "skanning af %s mislykkedes: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "kunne ikke køre %s: %s"
-
-#: utils/update-alternatives.c:503
-#, c-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"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "kunne ikke installere %s som %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "kunne ikke fjerne %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "filen sluttede uventet ved forsøg på at læse %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "ved læsning af %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "linje ikke afsluttet ved forsøg på at læse %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s ødelagt: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "linjeskift er ikke tilladt i update-alternatives-filer (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "ved skrivning til %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "slavenavn"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "slaveduplet %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "slavelænke"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "slavelænke er den samme som hovedlænken %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "slavelænke-duplet %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "hovedfil"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "gentaget sti %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5790,130 +5869,115 @@
 "alternativet %s (del af lænkegruppe %s) findes ikke. Fjerner den fra listen "
 "over alternativer."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "prioritet"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "slavefil"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "prioritet for %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "kunne ikke læse %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "status"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "ugyldig status"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "hovedlænke"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "kunne ikke lukke %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "forkaster forældede slavelænke %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "kan ikke skrive %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "autotilstand"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "manuel tilstand"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "  lænken peger for øjeblikket på %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "  lænken findes ikke i øjeblikket"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - prioritet %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  slave %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Den 'bedste' aktuelle version er '%s'."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Ingen tilgængelige versioner."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "Der er %d valg for alternativet %s (giver %s)."
 msgstr[1] "Der er %d valg for alternativet %s (giver %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Valg"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Sti"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Prioritet"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Status"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Tryk retur for at beholde standardvalget[*], eller angiv nummeret på dit "
 "valg: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "erstatter ikke %s med en lænke."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "kan ikke installere ukendt valg %s"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -5922,98 +5986,153 @@
 "spring oprettelse af %s over, den da tilknyttede %s (for lænkegruppen %s) "
 "ikke findes."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "erstatter ikke %s med en lænke."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Kald %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Alternativ %s uændret, da valget %s ikke er tilgængeligt."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Overspring ukendt alternativ %s."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "linje for lang eller uafsluttet ved forsøg på at læse %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Spring ugyldig linje over: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "omdøber %s-lænke fra %s til %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "omdøber %s-slavelænke fra %s til %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "alternativnavnet (%s) må ikke indeholde '/' eller mellemrum."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "alternativ-lænke er ikke absolut, hvilket den burde være: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "alternativ-sti er ikke absolut, hvilket den burde være: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "anternativet %s kan ikke være hovedalternativ: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "alternativ-lænke %s håndteres allerede af %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "alternativ-sti %s findes ikke."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "alternativet %s kan ikke være slave for %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "anternativet %s kan ikke være hovedalternativ: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "alternativ-lænke %s håndteres allerede af %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "ukendt parameter '%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install kræver <lænke> <navn> <sti> <prioritet>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<lænke> og <sti> kan ikke være ens"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "prioritet skal være et heltal"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s kræver <navn> <sti>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s kræver <navn>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave er kun tilladt med --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave kræver <lænke> <navn> <sti>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "navnet %s er både primær og slave"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "lænken %s er både primær og slave"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s kræver et <fil>-argument"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "ukendt tilvalg '%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -6021,68 +6140,23 @@
 "kræver --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all eller --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "anternativet %s kan ikke være hovedalternativ: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "alternativ-lænke %s håndteres allerede af %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "alternativ-lænke er ikke absolut, hvilket den burde være: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "alternativ-sti er ikke absolut, hvilket den burde være: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "alternativ-sti %s findes ikke."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "alternativnavnet (%s) må ikke indeholde '/' eller mellemrum."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "dette er et hovedalternativ."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "det er en slave for %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "alternativet %s kan ikke være slave for %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<standard-inddata>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "ingen alternativer til %s."
 
 # ?
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s dingler, vil blive opdateret med bedste valg."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6094,48 +6168,48 @@
 "%s er blevet ændret (manuelt eller af et script). Skifter til manuelle "
 "opdateringer."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "sætter automatisk valg af %s op."
 
 # ikke sikker på hvad setting dækker over her
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "alternativet %s til %s er ikke registreret, sætter ikke."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Der er intet program, der giver %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Intet at konfigurere."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Der er kun et alternativ i lænkegruppen %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "alternativet %s til %s er ikke registreret, fjerner ikke."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr "fjerner manuelt valgt alternativ - skifter %s til automatisk tilstand"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "automatiske opdateringer af %s er deaktiveret, lader den være."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6143,23 +6217,59 @@
 "for at gå tilbage til automatiske opdateringer, skal du bruge 'update-"
 "alternatives --auto %s'."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "bruger %s til at give %s (%s) i %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 "tvinger ominstallation af alternativet %s, da lænkegruppen %s er ødelagt."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr "nuværende alternativ %s er ukendt, skifter til %s for lænkegruppen %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "dette er et hovedalternativ."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "det er en slave for %s"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "kan ikke tilgå %s: %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "readlink(%s) mislykkedes: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "skanning af %s mislykkedes: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "kunne ikke køre %s: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "kunne ikke gøre %s til en symbolsk lænke til %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "kunne ikke installere %s som %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "ved skrivning til %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "kunne ikke læse %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "kunne ikke lukke %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "kan ikke skrive %s: %s"
+
 #, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6455,9 +6565,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "sprang over kontrolområde fra %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "kunne ikke køre tar"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "kunne ikke oprette midlertidigt katalog"
 
Binary files dpkg/po/de.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/de.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/de.po /home/vorlon/devel/multiarch/dpkg-debian/po/de.po
--- dpkg/po/de.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/de.po	2012-06-07 10:11:09.426073000 -0700
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.16.1~\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-05-02 11:28+0200\n"
-"PO-Revision-Date: 2011-05-02 11:51+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
+"PO-Revision-Date: 2011-09-09 11:30+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -24,10 +24,10 @@
 #: lib/dpkg/ar.c:66
 #, c-format
 msgid "invalid character '%c' in archive '%.250s' member '%.16s' size"
-msgstr "ungültiges Zeichen »%c« in Größe von Archiv »%.250s«, Element »%.16s« "
+msgstr "ungültiges Zeichen »%c« in Größe von Archiv »%.250s«, Element »%.16s«"
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1114
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "Datei »%s« kann nicht geschrieben werden"
@@ -47,71 +47,76 @@
 msgid "ar member file (%s)"
 msgstr "ar-Element-Datei (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "Lesen aus Pufferkopie für %s fehlgeschlagen"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "Schreiben in Pufferkopie für %s fehlgeschlagen"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "nicht vollständig gelesen in Pufferkopie für %s"
 
-#: lib/dpkg/command.c:179 lib/dpkg/command.c:205 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:421
-#: src/processarc.c:817 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68 utils/update-alternatives.c:433
+#: lib/dpkg/buffer.c:288
+#, c-format
+msgid "failed to seek %s"
+msgstr "Positionierung von %s fehlgeschlagen"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "%s (%s) kann nicht ausgeführt werden"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: Dekomprimierung"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: Komprimierung"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: Fehler beim Binden der Eingabe an gzip-Datenstrom"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: interner gzip-Lesefehler: »%s«"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: interner gzip-Schreibfehler"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: Fehler beim Binden der Ausgabe an gzip-Datenstrom"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: interner gzip-Lesefehler"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: interner gzip-Schreibfehler: »%s«"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: interner gzip-Schreibfehler: %s"
@@ -126,31 +131,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: interner bzip2-Lesefehler: »%s«"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: interner bzip2-Schreibfehler"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: Fehler beim Binden der Ausgabe an gzip-Datenstrom"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: interner bzip2-Lesefehler"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: interner bzip2-Schreibfehler: »%s«"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "unerwarteter bzip2-Fehler"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -159,7 +164,7 @@
 "Das Updates-Verzeichnis enthält die Datei »%.250s«, deren Name zu lang ist "
 "(Länge=%d, Max=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -167,97 +172,97 @@
 "Das Updates-Verzeichnis enthält Dateien mit verschieden langen Namen (sowohl "
 "%d als auch %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "Updates-Verzeichnis »%.255s« kann nicht eingelesen werden"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "Löschen der eingebundenen Update-Datei %.255s fehlgeschlagen"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "»%.255s« kann nicht angelegt werden"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "%.250s kann nicht aufgefüllt werden"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "Pufferleerung von %.250s nach Auffüllen nicht möglich"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "Nach Auffüllen kann nicht zum Start von %.250s gesprungen werden"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "Sperrdatei %s kann nicht zum Testen geöffnet werden"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "Sperrdatei der Status-Datenbank kann nicht geöffnet/angelegt werden"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "Fehlende Rechte, um die dpkg-Status-Datenbank zu sperren"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 msgid "dpkg status database"
 msgstr "dpkg-Status-Datenbank"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "Angeforderte Operation benötigt Superuser-Rechte"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "Auf den Statusbereich von dpkg kann nicht zugegriffen werden"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "Operation benötigt Lese-/Schreibrechte für den Statusbereich von dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "Löschen der eigenen Update-Datei %.255s fehlgeschlagen"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "Aktualisierter Status von »%.250s« kann nicht geschrieben werden"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr ""
 "Puffer des aktualisierten Status von »%.250s« kann nicht geleert werden"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "Für aktualisierten Status von »%.250s« kann nicht abgeschnitten werden"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "Aktualisierter Status von »%.250s« kann nicht synchronisiert werden"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "Aktualisierter Status von »%.250s« kann nicht geschlossen werden"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "Aktualisierter Status von »%.250s« kann nicht installiert werden"
@@ -277,75 +282,75 @@
 msgid "unable to open directory '%s'"
 msgstr "Verzeichnis »%s« kann nicht geöffnet werden"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:204
-#: utils/update-alternatives.c:1253
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "Datei »%s« kann nicht geöffnet werden"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:188 utils/update-alternatives.c:1366
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "Datei »%s« kann nicht synchronisiert werden"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:190
-#: utils/update-alternatives.c:1274 utils/update-alternatives.c:1368
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "Datei »%s« kann nicht geschlossen werden"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "Schreiben der Details über »%.50s« nach »%.250s« fehlgeschlagen"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "Öffnen von »%s« zum Schreiben der %s-Datenbank fehlgeschlagen"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "Pufferung für die %s-Datenbankdatei kann nicht gesetzt werden"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "Schreiben des %s-Datensatzes über »%.50s« nach »%.250s« fehlgeschlagen"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "Zurückschreiben der %s-Datenbank nach »%.250s« fehlgeschlagen"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "Synchronisieren der %s-Datenbank nach »%.250s« fehlgeschlagen"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "Schließen von »%.250s« nach Schreiben der %s-Datenbank fehlgeschlagen"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "Verknüpfen von »%.250s« mit »%.250s« fehlgeschlagen (für Sicherheitskopie "
 "der %s-Datenbank)"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 "Installieren von »%.250s« als »%.250s« fehlgeschlagen (enthält %s-Datenbank)"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -354,7 +359,7 @@
 "%s: nicht behebbarer fataler Fehler, Abbruch:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
@@ -363,11 +368,11 @@
 "%s: außerhalb des Fehlerkontexts, Abbruch:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 msgid "out of memory for new error context"
 msgstr "Zu wenig Speicher für neuen Fehlerkontext"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -376,30 +381,30 @@
 "%s: Fehler beim Aufräumen:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, c-format
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "%s: zu viele verschachtelte Fehler während der Fehlerbehebung!!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "Zu wenig Speicher für neuen Aufräumeintrag"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "Zu wenig Speicher für neuen Aufräumeintrag mit vielen Argumenten"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, c-format
 msgid "%s: error: %s\n"
 msgstr "%s: Fehler: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: Warnung: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: interner Fehler: %s\n"
@@ -414,105 +419,105 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "»%.50s« ist nicht erlaubt für %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "Unsinn hinter %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "ungültiger Paketname (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "leeres Dateidetailfeld »%s«"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "Dateidetailfeld »%s« in Statusdatei nicht erlaubt"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "zu viele Werte in dem Dateidetailfeld »%s« (im Vergleich zu anderen)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "zu wenige Werte in dem Dateidetailfeld »%s« (im Vergleich zu anderen)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "yes/no in booleschem Feld"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "Wort im Feld »priority«"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "Wert für Feld »status« ist in diesem Kontext nicht erlaubt"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "erstes (Gewünscht-)Wort im Feld »status«"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "zweites (Fehler-)Wort im Feld »status«"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "drittes (Status-)Wort im Feld »status«"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "Fehler in Versionszeichenkette »%.250s«"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "veraltetes Feld »Revision« oder »Package-Revision« benutzt"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "Wert für Feld »config-version« ist in diesem Kontext nicht erlaubt"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "Fehler in der Config-Version-Zeichenkette »%.250s«"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "Wert für »conffiles« enthält falsch formatierte Zeile »%.*s«"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 "Wert für »conffiles« enthält Zeile, die mit Nicht-Leerzeichen »%c« beginnt"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "Wurzel- oder leeres Verzeichnis ist als Conffile aufgeführt"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr "Feld »%s«, fehlender Paketname oder Müll, wo Paketname erwartet wurde"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "Feld »%s«, ungültiger Paketname »%.255s«: %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -521,7 +526,7 @@
 "Feld »%s«, Referenz auf »%.255s«:\n"
 " fehlerhafte Versionsabhängigkeit %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -530,7 +535,7 @@
 "Feld »%s«, Referenz auf »%.255s«:\n"
 " »%c« ist veraltet, benutzen Sie stattdessen »%c=« oder »%c%c«"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -540,11 +545,11 @@
 " implizite exakte Übereinstimmung mit Versionsnummer, vielleicht stattdessen "
 "»=« benutzen"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Nur genaue Versionen können für »Provides« benutzt werden"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -554,56 +559,56 @@
 " Wert für Version beginnt mit nicht-alphanumerischem Zeichen, vielleicht ein "
 "Leerzeichen hinzufügen"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "Feld »%s«, Referenz auf »%.255s«: Version enthält »%c«"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "Feld »%s«, Referenz auf »%.255s«: Version nicht abgeschlossen"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "Feld »%s«, Referenz auf »%.255s«: Fehler in Version"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "Feld »%s«, Syntaxfehler nach Referenz zu Paket »%.255s«"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "Alternativen (»|«) sind im Feld %s nicht erlaubt"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "Wert für Feld »triggers-pending« ist in diesem Kontext nicht erlaubt"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "ungültiger anhängiger Triggername »%.255s«: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "doppelter anhängiger Trigger »%.255s«"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "Wert für Feld »triggers-awaited« ist in diesem Kontext nicht erlaubt"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "ungültiger Paketname in erwartetem Trigger »%.255s«: %s"
 
 # CHECKME: bezieht sich »awaited« auf »trigger« oder auf »package«?
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "doppeltes erwartetes Triggerpaket »%.255s«"
@@ -668,7 +673,7 @@
 msgstr "realloc fehlgeschlagen (%zu Byte)"
 
 #: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
-#: utils/update-alternatives.c:318 utils/update-alternatives.c:1067
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "Speicherzuweisung fehlgeschlagen"
 
@@ -701,200 +706,205 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "»close-on-exec«-Flag für »%.250s« kann nicht gesetzt werden"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "Konfigurationsfehler: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "Öffnen der Konfigurationsdatei »%.255s« zum Lesen fehlgeschlagen: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "unausgeglichene Anführungszeichen in »%s«"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "unbekannte Option »%s«"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "»%s« benötigt einen Wert"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "»%s« akzeptiert keine Werte"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "Lesefehler in Konfigurationsdatei »%.255s«"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "Fehler beim Schließen der Konfigurationsdatei »%.255s«"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "Fehler beim Öffnen des Konfigurationsverzeichnisses »%s«"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "unbekannte Option --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "Option --%s benötigt einen Wert"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "Option --%s akzeptiert keine Werte"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "unbekannte Option -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "Option -%c benötigt einen Wert"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "Option -%c akzeptiert keine Werte"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "veraltete Option »--%s«\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "Aktionen -%c (--%s) und -%c (--%s) stehen in Konflikt"
 
-#: lib/dpkg/parse.c:131
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "doppelter Wert für Feld »%s«"
 
-#: lib/dpkg/parse.c:143
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "benutzerdefinierter Feldname »%.*s« ist zu kurz"
 
-#: lib/dpkg/parse.c:149
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "doppelter Wert für benutzerdefiniertes Feld »%.*s«"
 
-#: lib/dpkg/parse.c:196
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Configured-Version für Paket mit unpassendem Status"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "Paket hat Status %s, aber Trigger werden erwartet"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "Paket hat Status »triggers-awaited«, erwartet aber keine Trigger"
 
-#: lib/dpkg/parse.c:217
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "Paket hat Status %s, aber Trigger sind anhängig"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "Paket hat Status »triggers-pending«, aber keine Trigger sind anhängig"
 
-#: lib/dpkg/parse.c:231
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "Paket mit dem Status »nicht installiert« hat Conffiles, vergesse sie"
 
-#: lib/dpkg/parse.c:338
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "Öffnen der Paket-Infodatei »%.255s« zum Lesen fehlgeschlagen"
 
-#: lib/dpkg/parse.c:343
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "Paket-Infodatei »%.255s« kann nicht mit stat abgefragt werden"
 
-#: lib/dpkg/parse.c:349
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "Paket-Infodatei »%.255s« kann nicht mit mmap geladen werden"
 
-#: lib/dpkg/parse.c:354
+#: lib/dpkg/parse.c:352
 #, c-format
 msgid "reading package info file '%.255s'"
 msgstr "Lesen der Paket-Infodatei »%.255s«"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "Schließen nach dem Lesen fehlgeschlagen: »%.255s«"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF nach Feldname »%.*s«"
 
-#: lib/dpkg/parse.c:393
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "Zeilenvorschub im Feldnamen »%.*s«"
 
-#: lib/dpkg/parse.c:396
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MS-DOS-EOF (^Z) im Feldnamen »%.*s«"
 
-#: lib/dpkg/parse.c:400
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "nach Feldname »%.*s« muss ein Doppelpunkt folgen"
 
-#: lib/dpkg/parse.c:409
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 "EOF vor einem Wert für das Feld »%.*s« (abschließender Zeilenvorschub fehlt)"
 
-#: lib/dpkg/parse.c:413
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 "MS-DOS-EOF-Zeichen im Wert des Feldes »%.*s« (fehlender Zeilenvorschub?)"
 
-#: lib/dpkg/parse.c:427
+#: lib/dpkg/parse.c:440
+#, c-format
+msgid "blank line in value of field '%.*s'"
+msgstr "Leerzeile im Wert des Feldnamen »%.*s«"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 "EOF im Wert des Feldes »%.*s« (fehlender abschließender Zeilenvorschub)"
 
-#: lib/dpkg/parse.c:444
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "mehrere Paketinfo-Einträge gefunden, nur einer erlaubt"
 
-#: lib/dpkg/parse.c:476
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "Schließen nach dem Lesen fehlgeschlagen: »%.255s«"
-
-#: lib/dpkg/parse.c:477
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "keine Paketinformationen in »%.255s«"
@@ -917,59 +927,59 @@
 "Parsen der Datei »%.255s«, nahe Zeile %d:\n"
 " %.255s"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "darf keine leere Zeichenkette sein"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 msgid "must start with an alphanumeric character"
 msgstr "muss mit alphanumerischem Zeichen beginnen"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "Zeichen »%c« nicht erlaubt (nur Buchstaben, Ziffern und die Zeichen »%s«)"
 
-#: lib/dpkg/parsehelp.c:180
+#: lib/dpkg/parsehelp.c:178
 msgctxt "version"
 msgid "<none>"
 msgstr "<keine>"
 
-#: lib/dpkg/parsehelp.c:197
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "Versionszeichenkette ist leer"
 
-#: lib/dpkg/parsehelp.c:211
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "Versionszeichenkette enthält Leerzeichen"
 
-#: lib/dpkg/parsehelp.c:216
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "Epoche in der Version ist keine Zahl"
 
-#: lib/dpkg/parsehelp.c:217
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "nichts hinter Doppelpunkt in Versionsnummer"
 
-#: lib/dpkg/parsehelp.c:250
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr "Versionsnummer beginnt nicht mit einer Ziffer"
 
-#: lib/dpkg/parsehelp.c:253
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "ungültiges Zeichen in Versionsnummer"
 
-#: lib/dpkg/parsehelp.c:257
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "ungültiges Zeichen in Revisionsnummer"
 
-#: lib/dpkg/parsehelp.c:323 lib/dpkg/parsehelp.c:336
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "%s fehlt"
 
-#: lib/dpkg/parsehelp.c:325 lib/dpkg/parsehelp.c:339
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "leerer Wert für %s"
@@ -988,50 +998,50 @@
 msgid "(no description available)"
 msgstr "(keine Beschreibung vorhanden)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "Signal %s kann vor Ausführung von %.250s nicht ignoriert werden"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "Fehler beim nicht-mehr-Abfangen des Signals %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (Unterprozess): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:430
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "fork fehlgeschlagen"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "Unterprozess %s gab den Fehlerwert %d zurück"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, c-format
 msgid "subprocess %s was interrupted"
 msgstr "Unterprozess %s wurde unterbrochen"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, c-format
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "Unterprozess %s wurde durch Signal (%s)%s getötet"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", Speicherabbild erzeugt"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "Unterprozess %s mit Warte-Statuswert %d fehlgeschlagen"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:437
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "Warten auf Unterprozess %s fehlgeschlagen"
@@ -1053,65 +1063,57 @@
 msgstr ""
 "Syntaxfehler in Datei zurückgestellter Trigger »%.250s« bei Zeichen »%s«%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "Trigger-Sperrdatei »%.250s« kann nicht geöffnet/angelegt werden"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 msgid "triggers area"
 msgstr "Triggerbereich"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr ""
 "Datei zurückgestellter Trigger »%.250s« kann nicht mit stat abgefragt werden"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "Datei zurückgestellter Trigger »%.250s« kann nicht geöffnet werden"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 "Neue Datei zurückgestellter Trigger »%.250s« kann nicht geöffnet/angelegt "
 "werden"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "Fehler beim Lesen der Datei zurückgestellter Trigger %.250s"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr ""
 "Neue Datei zurückgestellter Trigger »%.250s« kann nicht geschrieben werden"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr ""
 "Neue Datei zurückgestellter Trigger »%.250s« kann nicht geschlossen werden"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr ""
 "Neue Datei zurückgestellter Trigger »%.250s« kann nicht installiert werden"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "leere Triggernamen sind nicht erlaubt"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "Triggername enthält ungültiges Zeichen"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1120,17 +1122,17 @@
 "ungültige oder unbekannte Syntax in Triggername »%.250s« (in Trigger-"
 "Interessen für Paket »%.250s«)"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "Öffnen der Trigger-Interessen-Listendatei »%.250s« fehlgeschlagen"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "Zurücksetzen der Trigger-Interessendatei »%.250s« fehlgeschlagen"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1139,85 +1141,91 @@
 "Syntaxfehler in Trigger-Interessendatei »%.250s«; ungültiger Paketname "
 "»%.250s«: %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "Neue Trigger-Interessendatei »%.250s« kann nicht angelegt werden"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "Neue Trigger-Interessendatei »%.250s« kann nicht geschrieben werden"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr ""
 "Neue Trigger-Interessendatei »%.250s« kann nicht zurückgeschrieben werden"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "Neue Trigger-Interessendatei »%.250s« kann nicht synchronisiert werden"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "Neue Trigger-Interessendatei »%.250s« kann nicht geschlossen werden"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "Neue Trigger-Interessendatei »%.250s« kann nicht installiert werden"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "»%.250s« kann nicht entfernt werden"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "Neue Trigger-Interessendatei »%.250s« kann nicht angelegt werden"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "Neue Trigger-Interessendatei »%.250s« kann nicht geschlossen werden"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 "doppeltes Dateitrigger-Interesse für Dateiname »%.250s« und Paket »%.250s«"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "Neue Dateitrigger-Datei »%.250s« kann nicht angelegt werden"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "Neue Dateitrigger-Datei »%.250s« kann nicht geschrieben werden"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "Neue Dateitrigger-Datei »%.250s« kann nicht zurückgeschrieben werden"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "Neue Dateitrigger-Datei »%.250s« kann nicht synchronisiert werden"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "Neue Dateitrigger-Datei »%.250s« kann nicht geschlossen werden"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "Neue Dateitrigger-Datei kann nicht als »%.250s« installiert werden"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "Dateitrigger-Datei »%.250s« kann nicht gelesen werden"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "Syntaxfehler in Dateitrigger-Datei »%.250s«"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1226,7 +1234,7 @@
 "Dateitrigger-Datensatz erwähnt ungültigen Paketnamen »%.250s« (für Interesse "
 "an Datei »%.250s«): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1235,32 +1243,40 @@
 "ci-Triggerdatei »%.250s« enthält ungültige Triggersyntax im Triggernamen "
 "»%.250s«: %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "ci-Triggerdatei »%.250s« kann nicht geöffnet werden"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "ci-Triggerdatei enthält unbekannte Anweisungssyntax"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "ci-Triggerdatei enthält unbekannte Anweisung »%.250s«"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "Trigger-Statusverzeichnis »%.250s« kann nicht angelegt werden"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 "Eigentümer des Trigger-Statusverzeichnisses »%.250s« kann nicht gesetzt "
 "werden"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "leere Triggernamen sind nicht erlaubt"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "Triggername enthält ungültiges Zeichen"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1285,7 +1301,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "Fehler beim Formatieren von Zeichenkette in varbuf-Variable"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "Fehler beim Lesen aus der dpkg-deb-Pipe"
 
@@ -1305,12 +1321,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "Fehler beim Setzen des Eigentümers des symbolischen Linkss »%.255s«"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "Fehler beim Setzen des Eigentümers von »%.255s«"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "Fehler beim Setzen der Zugriffsrechte von »%.255s«"
@@ -1375,17 +1391,26 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "Archiv enthielt Objekt »%.255s« von unbekanntem Typ 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "»%s« kann nicht mit stat abgefragt werden"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Ersetzen der Dateien im alten Paket %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Ersetzt durch Dateien in installiertem Paket %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1394,101 +1419,106 @@
 "Versuch, Verzeichnis »%.250s« in Paket %.250s %.250s mit Nichtverzeichnis zu "
 "überschreiben"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "Versuch, »%.250s« zu überschreiben, welches auch in Paket %.250s %.250s ist"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr ""
 "»%.255s« konnte nicht angelegt werden (während der Verarbeitung von »%.255s«)"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "Backend dpkg-deb während »%.255s«"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "Fehler beim Schließen/Schreiben von »%.255s«"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "Fehler beim Anlegen der Pipe »%.255s«"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "Fehler beim Anlegen des Geräts »%.255s«"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "Fehler beim Anlegen des harten Links »%.255s«"
 
-#: src/archives.c:768 utils/update-alternatives.c:516
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "Fehler beim Anlegen des symbolischen Links »%.255s«"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "Fehler beim Anlegen des Verzeichnisses »%.255s«"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 "»%.255s« kann nicht aus dem Weg geräumt werden, um neue Version zu "
 "installieren"
 
-#: src/archives.c:823 utils/update-alternatives.c:304
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "Link »%.255s« kann nicht gelesen werden"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr "Größe des symbolischen Links »%.250s« wurde von %jd zu %zd geändert"
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 "Symbolischer Link zur Sicherung von »%.255s« kann nicht angelegt werden"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "Eigentümer des symbolischen Links zur Sicherung von »%.255s« kann nicht "
 "gesetzt werden"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "Link zur Sicherung von »%.255s« vor Installation der neuen Version kann "
 "nicht angelegt werden"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "Neue Version von »%.255s« kann nicht installiert werden"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "»%.255s« kann nicht geöffnet werden"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "Datei »%.255s« kann nicht synchronisiert werden"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1497,7 +1527,7 @@
 "Abhängigkeitsproblem mit %s wird ignoriert:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1506,7 +1536,7 @@
 "Dekonfiguration des essenziellen Paketes %s\n"
 "wird in Betracht gezogen, um %s zu ermöglichen."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1515,7 +1545,7 @@
 "dpkg: Nein, %s ist essenziell, es wird nicht dekonfiguriert werden,\n"
 " um %s zu ermöglichen.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1525,17 +1555,17 @@
 "helfen):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "Entfernen von %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "Installation von »%.250s«"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1543,12 +1573,12 @@
 "dpkg: Dekonfiguration von %s wird in Betracht gezogen, welches durch %s "
 "beschädigt würde ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: Ja, %s wird dekonfiguriert (beschädigt durch %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1557,11 +1587,11 @@
 "dpkg: Betreffend %s, welches %s enthält:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "Beschädigung wird ignoriert, es wird versucht, trotzdem fortzusetzen!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1570,30 +1600,30 @@
 "Installation von %.250s würde %.250s beschädigen, und\n"
 " Dekonfiguration ist nicht erlaubt (--auto-deconfigure könnte helfen)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "Installation von %.250s würde existierende Software beschädigen"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: Entfernen von %s zugunsten von %s wird in Betracht gezogen ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s ist nicht sauber installiert - alle Abhängigkeiten darauf werden "
 "ignoriert.\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: Es könnte Probleme geben, %s zu entfernen, da es %s bereitstellt ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1602,103 +1632,103 @@
 "dpkg: Paket %s erfordert Neuinstallation, wird aber wie gefordert trotzdem "
 "entfernt.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: Paket %s muss neu installiert werden, es wird nicht entfernt.\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: Ja, %s wird zugunsten von %s entfernt.\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "Kollidierende Pakete - %.250s wird nicht installiert"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "Kollision wird ignoriert, es wird versucht, trotzdem fortzusetzen!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive benötigt mindestens einen Pfad als Argument"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "find für dpkg --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "Öffnen der Pipe von find mit fdopen fehlgeschlagen"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "Fehler beim Lesen der Pipe von find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "Fehler beim Schließen der Pipe von find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "Suche für --recursive gab unbehandelten Fehler %i zurück"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "durchsucht, aber keine Pakete (auf *.deb passende Dateien) gefunden"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:315
-#: src/main.c:494 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
 #: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
-#: dpkg-split/queue.c:145 dpkg-split/queue.c:281
+#: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<Standardausgabe>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:179 dpkg-split/queue.c:219
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<Standardfehlerausgabe>"
 
-#: src/archives.c:1355
+#: src/archives.c:1367
 #, c-format
 msgid "Selecting previously unselected package %s.\n"
 msgstr "Vormals nicht ausgewähltes Paket %s wird gewählt.\n"
 
-#: src/archives.c:1359
+#: src/archives.c:1371
 #, c-format
 msgid "Skipping unselected package %s.\n"
 msgstr "Nicht ausgewähltes Paket %s wird übergangen.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Version %.250s von %.250s ist bereits installiert, wird übergangen.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr ""
 "Version %2$.250s des Paketes %1$.250s wird durch ältere Version %3$.250s "
 "ersetzt."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1734,18 +1764,18 @@
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "Soeben entpackte Version von »%.250s« kann nicht entfernt werden"
 
-#: src/configure.c:103
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "Neu verteiltes Conffile »%.250s« kann nicht mit stat abgefragt werden"
 
-#: src/configure.c:113
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 "Derzeit installiertes Conffile »%.250s« kann nicht mit stat abgefragt werden"
 
-#: src/configure.c:125
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1756,57 +1786,57 @@
 "Konfigurationsdatei »%s« existiert auf dem System nicht.\n"
 "Neue Konfigurationsdatei wird wie gefordert installiert.\n"
 
-#: src/configure.c:167
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: Löschen von alter Sicherung »%.250s« fehlgeschlagen: %s"
 
-#: src/configure.c:175
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: Umbenennen von »%.250s« in »%.250s« fehlgeschlagen: %s"
 
-#: src/configure.c:181
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: Entfernen von »%.250s« fehlgeschlagen: %s"
 
-#: src/configure.c:187
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: Löschen von alter verteilter Version »%.250s« fehlgeschlagen: %s"
 
-#: src/configure.c:191
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: Löschen von »%.250s« fehlgeschlagen (vor Überschreiben): %s"
 
-#: src/configure.c:195
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: Verknüpfen von »%.250s« mit »%.250s« fehlgeschlagen: %s"
 
-#: src/configure.c:199
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Neue Version der Konfigurationsdatei %s wird installiert ...\n"
 
-#: src/configure.c:205 utils/update-alternatives.c:523
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "»%.250s« kann nicht als »%.250s« installiert werden"
 
-#: src/configure.c:256
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "Kein Paket namens »%s« installiert, kann nicht konfiguriert werden"
 
-#: src/configure.c:259
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "Paket %.250s ist schon installiert und konfiguriert"
 
-#: src/configure.c:262
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1815,7 +1845,7 @@
 "Paket %.250s ist nicht bereit zur Konfiguration\n"
 " kann nicht konfiguriert werden (momentaner Status »%.250s«)"
 
-#: src/configure.c:293
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1824,11 +1854,11 @@
 "dpkg: Abhängigkeitsprobleme verhindern Konfiguration von %s:\n"
 "%s"
 
-#: src/configure.c:296
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert"
 
-#: src/configure.c:300
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1838,7 +1868,7 @@
 "konfiguriert:\n"
 "%s"
 
-#: src/configure.c:308
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1846,12 +1876,12 @@
 "Paket ist in einem sehr schlechten inkonsistenten Zustand - Sie sollten es\n"
 " nochmal installieren, bevor Sie die Konfiguration versuchen."
 
-#: src/configure.c:311
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "%s (%s) wird eingerichtet ...\n"
 
-#: src/configure.c:394
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1860,7 +1890,7 @@
 "%s: Konfigurationsdatei »%s« kann nicht mit stat abgefragt werden\n"
 " (= »%s«): %s"
 
-#: src/configure.c:407
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1869,7 +1899,7 @@
 "%s: Konfigurationsdatei »%s« ist eine zirkulärer Link\n"
 " (= »%s«)"
 
-#: src/configure.c:416
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1878,7 +1908,7 @@
 "%s: Ziel der Conffile »%s« kann nicht mit readlink ermittelt werden\n"
 " (= »%s«): %s"
 
-#: src/configure.c:438
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1887,36 +1917,36 @@
 "%s: Conffile »%.250s« ergibt einen degenerierten Dateinamen\n"
 " (»%s« ist ein symbolischer Link auf »%s«)"
 
-#: src/configure.c:454
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: Conffile »%.250s« ist keine gewöhnliche Datei oder symbolischer Link (= "
 "»%s«)"
 
-#: src/configure.c:480
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:486
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr ""
 "%s: Conffile %s kann nicht geöffnet werden, um die Prüfsumme zu berechnen: %s"
 
-#: src/configure.c:516 src/configure.c:520
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr "Conffile-Unterschied-Darsteller"
 
-#: src/configure.c:537
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Geben Sie »exit« ein, wenn Sie fertig sind.\n"
 
-#: src/configure.c:546 src/configure.c:550
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr "Conffile-Shell"
 
-#: src/configure.c:596
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1925,12 +1955,12 @@
 "\n"
 "Konfigurationsdatei »%s«"
 
-#: src/configure.c:598
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (eigentlich »%s«)"
 
-#: src/configure.c:602
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1941,7 +1971,7 @@
 " ==> Datei auf System wurde von Ihnen oder von einem Skript angelegt.\n"
 " ==> Datei auch in Paket vom Paket-Betreuer bereitgestellt.\n"
 
-#: src/configure.c:607
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1950,7 +1980,7 @@
 "\n"
 "     Nicht modifiziert seit der Installation.\n"
 
-#: src/configure.c:609
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1959,7 +1989,7 @@
 "\n"
 " ==> Modifiziert (von Ihnen oder von einem Skript) seit der Installation.\n"
 
-#: src/configure.c:610
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1968,38 +1998,38 @@
 "\n"
 " ==> Gelöscht (von Ihnen oder von einem Skript) seit der Installation.\n"
 
-#: src/configure.c:613
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Paketverteiler hat eine aktualisierte Version herausgegeben.\n"
 
-#: src/configure.c:614
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr ""
 "     Die Version im Paket ist dieselbe wie bei der letzten Installation.\n"
 
-#: src/configure.c:622
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Wie gefordert wird die neue Datei verwendet.\n"
 
-#: src/configure.c:626
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Wie gefordert wird die momentane alte Datei verwendet.\n"
 
-#: src/configure.c:635
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Alte Konfigurationsdatei wird als Vorgabe beibehalten.\n"
 
-#: src/configure.c:639
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Neue Konfigurationsdatei wird als Vorgabe verwendet.\n"
 
-#: src/configure.c:646
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2014,161 +2044,161 @@
 "       D     : Die Unterschiede zwischen den Versionen anzeigen\n"
 "       Z     : Eine Shell starten, um die Situation zu begutachten\n"
 
-#: src/configure.c:653
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Der Standardweg ist das Beibehalten der momentanen Version.\n"
 
-#: src/configure.c:655
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Der Standardweg ist die Installation der neuen Version.\n"
 
-#: src/configure.c:662
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[Vorgabe=N]"
 
-#: src/configure.c:663
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[Vorgabe=Y]"
 
-#: src/configure.c:664
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[Keine Vorgabe]"
 
-#: src/configure.c:667
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "Fehler beim Schreiben auf Standard-Fehlerausgabe, entdeckt vor Conffile-"
 "Eingabeaufforderung"
 
-#: src/configure.c:676
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr ""
 "Fehler beim Lesen von Standardeingabe an der Conffile-Eingabeaufforderung"
 
-#: src/configure.c:677
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF auf Standardeingabe an der Conffile-Eingabeaufforderung"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s hängt von %s ab"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s hängt (vorher) von %s ab"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s empfiehlt %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s schlägt %s vor"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s beschädigt %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s kollidiert mit %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s erweitert %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s soll entfernt werden.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s soll dekonfiguriert werden.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s ist installiert, ist aber Version %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s ist entpackt, wurde aber nie konfiguriert.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s ist entpackt, ist aber Version %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s letzte konfigurierte Version ist %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s ist %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s liefert %.250s, soll aber entfernt werden.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s liefert %.250s, soll aber dekonfiguriert werden.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s liefert %.250s, ist aber %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s ist nicht installiert.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (Version %.250s) soll installiert werden.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (Version %.250s) ist vorhanden und %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s liefert %.250s und wird installiert.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s liefert %.250s und ist vorhanden und %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr "Verwenden Sie --help für Hilfe zum Abfragen von Paketen."
+#: src/divertcmd.c:50
+msgid "Use --help for help about diverting files."
+msgstr "Verwenden Sie --help für Hilfe zum Umleiten von Dateien."
 
 #
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2176,7 +2206,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s Version %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2187,8 +2217,8 @@
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 "Copyright (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2199,7 +2229,7 @@
 "Version 2 oder höher für Kopierbedingungen. Es wird KEINE Haftung "
 "übernommen.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2209,7 +2239,7 @@
 "Aufruf: %s [<Option> ...] <Befehl>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2228,7 +2258,7 @@
 "  --truename <Datei>       die umgeleitete Datei zurückgeben.\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2260,7 +2290,7 @@
 "  --version                Version anzeigen.\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2273,20 +2303,12 @@
 "falls angegeben. Paket-preinst/postrm-Skripte sollten immer --package\n"
 "und --divert angeben.\n"
 
-#: src/divertcmd.c:149 utils/update-alternatives.c:293
-#: utils/update-alternatives.c:659 utils/update-alternatives.c:1182
-#: utils/update-alternatives.c:1244 utils/update-alternatives.c:1401
-#: utils/update-alternatives.c:1645
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "»%s« kann nicht mit stat abgefragt werden"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "Fehler beim Überprüfen von »%s«"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2295,127 +2317,127 @@
 "Umbenennen beinhaltet Überschreiben von »%s« mit\n"
 "  anderer Datei »%s«, nicht erlaubt"
 
-#: src/divertcmd.c:222 utils/update-alternatives.c:1333
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, c-format
 msgid "unable to create file '%s'"
 msgstr "Datei »%s« kann nicht angelegt werden"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "Dateikopie"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "»%s« kann nicht in »%s« umbenannt werden"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "rename: Entfernen des doppelten alten Links »%s«"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, c-format
 msgid "unable to remove copied source file '%s'"
 msgstr "Kopierte Quelldatei »%s« kann nicht entfernt werden"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "lokale Umleitung von %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "lokale Umleitung von %s zu %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "Umleitung von %s durch %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "Umleitung von %s zu %s durch %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "jede Umleitung von %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "jede Umleitung von %s zu %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "Neue %s-Datei kann nicht angelegt werden"
 
-#: src/divertcmd.c:374 src/statcmd.c:214 utils/update-alternatives.c:1364
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "Datei »%s« kann nicht zurückgeschrieben werden"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "Fehler beim Entfernen von alter diversions-old"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "Fehler beim Anlegen der neuen diversions-old"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "Fehler beim Installieren der neuen diversions"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s benötigt ein einzelnes Argument"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "Dateiname »%s« ist nicht absolut"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "Dateiname darf keine Zeilenvorschübe enthalten"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Verzeichnisse können nicht umgeleitet werden"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "Datei »%s« kann nicht auf sich selbst umgeleitet werden"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "»%s« wird beibehalten\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "»%s« kollidiert mit »%s«"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "»%s« wird hinzugefügt\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Keine Umleitung »%s«, keine entfernt.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2426,7 +2448,7 @@
 "  beim Entfernen von »%s«\n"
 "  »%s« gefunden"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2437,16 +2459,16 @@
 "  beim Entfernen von »%s«\n"
 "  »%s« gefunden"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "»%s« wird entfernt\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "Paketname darf keine Zeilenvorschübe enthalten"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "Name der Umleitung darf keine Zeilenvorschübe enthalten"
 
@@ -2532,8 +2554,8 @@
 "dpkg --configure --pending (oder dpkg --triggers-only) angefordert werden:\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:233
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s akzeptiert keine Argumente"
@@ -2628,7 +2650,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions fehlerhafte Beziehung"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "Version »%s« hat falsche Syntax: %s"
@@ -2680,12 +2702,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "Problem wird übergangen, weil --force angegeben ist: "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "Dateilisten-Datei des Paketes »%.250s« kann nicht geöffnet werden"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2694,77 +2716,77 @@
 "Dateilisten-Datei des Paketes »%.250s« fehlt, es wird angenommen,\n"
 "dass das Paket derzeit keine Dateien installiert hat."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr ""
 "Dateilisten-Datei des Paketes »%.250s« kann nicht mit stat abgefragt werden"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, c-format
 msgid "reading files list for package '%.250s'"
 msgstr "Lesen der Dateiliste des Paketes »%.250s«"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "Abschließender Zeilenvorschub fehlt in Dateilisten-Datei des Paketes »%.250s«"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "Dateilisten-Datei des Paketes »%.250s« enthält leeren Dateinamen"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "Fehler beim Schließen der Dateilisten-Datei des Paketes »%.250s«"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Lese Datenbank ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "%d Datei oder Verzeichnis ist derzeit installiert.)\n"
 msgstr[1] "%d Dateien und Verzeichnisse sind derzeit installiert.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 "Aktualisierte Dateilisten-Datei für Paket %s kann nicht angelegt werden"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 "Schreiben in aktualisierte Dateilisten-Datei für Paket %s fehlgeschlagen"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 "Leeren des Puffers der aktualisierten Dateilisten-Datei für Paket %s "
 "fehlgeschlagen"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 "Synchronisieren der aktualisierten Dateilisten-Datei für Paket %s "
 "fehlgeschlagen"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 "Schließen der aktualisierten Dateilisten-Datei für Paket %s fehlgeschlagen"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2804,8 +2826,8 @@
 msgstr "installiert"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
-msgstr "Fehler: PATH ist nicht gesetzt."
+msgid "PATH is not set."
+msgstr "PATH ist nicht gesetzt."
 
 #: src/help.c:129
 #, c-format
@@ -2852,66 +2874,66 @@
 msgstr "chroot nach »%.250s« fehlgeschlagen"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "Wechsel in das Verzeichnis »%.255s« fehlgeschlagen"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "Ausführrechte für »%.250s« können nicht gesetzt werden"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr ""
 "Umgebungsvariablen für Betreuerskript können nicht mit setenv gesetzt werden"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "installiertes %s-Skript"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "%s »%.250s« kann nicht mit stat abgefragt werden"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "neues %s-Skript"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "altes %s-Skript"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "%s »%.250s« kann nicht mit stat abgefragt werden: %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - stattdessen wird Skript aus dem neuen Paket probiert ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "Es gibt kein Skript in der neuen Version des Paketes - Abbruch"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... sieht so aus, als hätte das geklappt.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "»%.255s« kann nicht auf sichere Weise entfernt werden"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr "rm-Befehl zum Aufräumen"
 
@@ -2920,7 +2942,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "Die Existenz von »%.250s« kann nicht überprüft werden"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "Info-Verzeichnis kann nicht gelesen werden"
 
@@ -2996,7 +3018,7 @@
 "  -Dh|--debug=help                 Hilfe zum Debuggen anzeigen.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3132,7 +3154,7 @@
 "Benutzen Sie »dselect« oder »aptitude« für benutzerfreundliches "
 "Paketmanagement.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3153,73 +3175,73 @@
 "\n"
 "Optionen mit [*] geben viel aus - schicken Sie es durch »less« oder »more«!"
 
-#: src/main.c:220
+#: src/main.c:219
 msgid "Set all force options"
 msgstr "Alle Optionen zum Erzwingen setzen"
 
-#: src/main.c:222
+#: src/main.c:221
 msgid "Replace a package with a lower version"
 msgstr "Paket durch eine niedrigere Version ersetzen"
 
-#: src/main.c:224
+#: src/main.c:223
 msgid "Configure any package which may help this one"
 msgstr "Jedes Paket konfigurieren, das diesem helfen könnte"
 
-#: src/main.c:226
+#: src/main.c:225
 msgid "Process incidental packages even when on hold"
 msgstr "Nebensächliche Pakete bearbeiten, auch wenn auf »halten«"
 
-#: src/main.c:228
+#: src/main.c:227
 msgid "Try to (de)install things even when not root"
 msgstr ""
 "Dinge versuchen zu (de)installieren, selbst wenn\n"
 "                           nicht root"
 
-#: src/main.c:230
+#: src/main.c:229
 msgid "PATH is missing important programs, problems likely"
 msgstr "Wichtige Programme nicht in PATH, Probleme wahrsch."
 
-#: src/main.c:232
+#: src/main.c:231
 msgid "Install a package even if it fails authenticity check"
 msgstr ""
 "Paket installieren, selbst wenn Authentizitäts-\n"
 "                           überprüfung misslingt"
 
-#: src/main.c:234
+#: src/main.c:233
 msgid "Process even packages with wrong versions"
 msgstr "Selbst Pakete mit fehlerhafter Version bearbeiten"
 
-#: src/main.c:236
+#: src/main.c:235
 msgid "Overwrite a file from one package with another"
 msgstr "Datei eines anderen Pakets überschreiben"
 
-#: src/main.c:238
+#: src/main.c:237
 msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 "Umgeleitete Datei mit einer nicht umgeleiteten\n"
 "                           Version überschreiben"
 
-#: src/main.c:240
+#: src/main.c:239
 msgid "Overwrite one package's directory with another's file"
 msgstr ""
 "Verzeichnis eines Pakets mit Datei eines\n"
 "                           anderen überschreiben"
 
-#: src/main.c:242
+#: src/main.c:241
 msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 "Beim Entpacken keine sicheren Ein/Ausgabe-Operationen\n"
 "                           durchführen"
 
-#: src/main.c:244
+#: src/main.c:243
 msgid "Always use the new config files, don't prompt"
 msgstr "Immer neue Konf.-Dateien verwenden, nicht nachfragen"
 
-#: src/main.c:246
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr "Immer alte Konf.-Dateien verwenden, nicht nachfragen"
 
-#: src/main.c:249
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3233,101 +3255,101 @@
 "confold\n"
 "                           oder confnew ist auch angegeben."
 
-#: src/main.c:254
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr "Fehlende Konf.-Dateien immer installieren"
 
-#: src/main.c:256
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 "Anbieten, Konf.-Dateien durch nicht neue Versionen\n"
 "                           zu ersetzen"
 
-#: src/main.c:258
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 "Selbst Pakete mit falscher oder fehlender Architektur\n"
 "                           bearbeiten"
 
-#: src/main.c:260
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 "Installieren, selbst wenn es andere Pakete\n"
 "                           beschädigt"
 
-#: src/main.c:262
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr "Installation kollidierender Pakete erlauben"
 
-#: src/main.c:264
+#: src/main.c:263
 msgid "Turn all dependency problems into warnings"
 msgstr "Alle Abhängigkeitsprobleme in Warnungen umwandeln"
 
-#: src/main.c:266
+#: src/main.c:265
 msgid "Turn dependency version problems into warnings"
 msgstr "Versionsabhängigkeitsprobleme in Warnungen umwandeln"
 
-#: src/main.c:268
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr "Pakete entfernen, die Installation erfordern"
 
-#: src/main.c:270
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr "Ein essenzielles Paket entfernen"
 
-#: src/main.c:282
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr "Allgemein hilfreiche Fortschrittsinformationen"
 
-#: src/main.c:283
+#: src/main.c:282
 msgid "Invocation and status of maintainer scripts"
 msgstr "Aufruf und Status von Betreuer-Skripten"
 
-#: src/main.c:284
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr "Ausgaben zu jeder verarbeiteten Datei"
 
-#: src/main.c:285
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr "Viele Ausgaben zu jeder verarbeiteten Datei"
 
-#: src/main.c:286
+#: src/main.c:285
 msgid "Output for each configuration file"
 msgstr "Ausgaben zu jeder Konfigurationsdatei"
 
-#: src/main.c:287
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr "Viele Ausgaben zu jeder Konfigurationsdatei"
 
-#: src/main.c:288
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr "Abhängigkeiten und Kollisionen"
 
-#: src/main.c:289
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr "Viele Ausgaben zu Abhängigkeiten und Kollisionen"
 
-#: src/main.c:290
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr "Triggeraktivierung und -verarbeitung"
 
-#: src/main.c:291
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr "Viele Ausgaben bezüglich Trigger"
 
-#: src/main.c:292
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr "Alberne Mengen an Ausgaben bezüglich Trigger"
 
-#: src/main.c:293
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr "Viel Gefasel z.B. zum dpkg/info-Verzeichnis"
 
-#: src/main.c:294
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr "Irrsinnige Mengen von Gefasel"
 
-#: src/main.c:305
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3338,7 +3360,7 @@
 "\n"
 " Nummer  Ref. in Quelle   Beschreibung\n"
 
-#: src/main.c:312
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3349,37 +3371,37 @@
 "Debug-Optionen können durch bitweises Oder gemischt werden.\n"
 "Beachten Sie, dass sich die Werte und Bedeutungen ändern können.\n"
 
-#: src/main.c:320
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug benötigt ein oktales Argument"
 
-#: src/main.c:349
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "leerer Paketname in kommagetrennter --ignore-depends-Liste »%.250s«"
 
-#: src/main.c:355
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends benötigt einen gültigen Paketnamen. »%.250s« ist kein "
 "solcher; %s"
 
-#: src/main.c:372 src/main.c:382 src/main.c:650 dpkg-split/main.c:125
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ungültige Ganzzahl für --%s: »%.250s«"
 
-#: src/main.c:439
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "Fehler beim Ausführen des Hooks »%s«, Exitkode %d"
 
-#: src/main.c:466
+#: src/main.c:465
 msgid "status logger"
 msgstr "Statuslogger"
 
-#: src/main.c:481
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3394,7 +3416,7 @@
 "<Ding>,...\n"
 " Dinge erzwingen:\n"
 
-#: src/main.c:491
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3405,36 +3427,36 @@
 "WARNUNG - Anwenden der mit [!] markierten Optionen kann Ihre Installation\n"
 "schwer beschädigen. Mit [*] markierte Optionen sind per Vorgabe aktiviert.\n"
 
-#: src/main.c:505
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "unbekannte force/refuse-Option »%.*s«"
 
-#: src/main.c:514
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "veraltete force/refuse-Option »%s«\n"
 
-#: src/main.c:644
+#: src/main.c:643
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd akzeptiert ein Argument, nicht null"
 
-#: src/main.c:646
+#: src/main.c:645
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd akzeptiert nur ein Argument"
 
-#: src/main.c:652
+#: src/main.c:651
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "»%i« konnte nicht für Datenstrom geöffnet werden"
 
-#: src/main.c:677
+#: src/main.c:676
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "unerwartetes EOF vor Ende der Zeile %d"
 
-#: src/main.c:720 src/main.c:741 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:165
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "eine Aktions-Option wird benötigt"
 
@@ -3598,89 +3620,89 @@
 msgid "passed\n"
 msgstr "bestanden\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "Anlegen des temporären Verzeichnisses fehlgeschlagen"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "Paket %s hat zu viele Conflicts/Replaces-Paare"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "Alte Version des Paketes hat übermäßig langen Info-Dateinamen beginnend mit "
 "»%.250s«"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "Veraltete Info-Datei »%.250s« kann nicht entfernt werden"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "Neue (vermeintliche) Info-Datei »%.250s« kann nicht installiert werden"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "Temporäres Control-Verzeichnis kann nicht geöffnet werden"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "Paket enthält übermäßig langen Control-Info-Dateinamen (beginnend mit "
 "»%.50s«)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "Paket-Control-Info enthielt Verzeichnis »%.250s«"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "Paket-Control-Info rmdir von »%.250s« ergab nicht, dass dies kein "
 "Verzeichnis ist"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "Paket %s enthielt Liste als Info-Datei"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "Neue Info-Datei »%.250s« kann nicht als »%.250s« installiert werden"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "Die Control-Info-Datei »%.250s« kann nicht gelöscht werden"
 
-#: src/processarc.c:371
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "Auf das Archiv kann nicht zugegriffen werden"
 
-#: src/processarc.c:388 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "Anlegen des temporären Verzeichnisses fehlgeschlagen"
-
-#: src/processarc.c:422
+#: src/processarc.c:433
 msgid "package control information extraction"
 msgstr "Paket-control-Informationsextraktion"
 
-#: src/processarc.c:449
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Info über %s aus %s aufgezeichnet.\n"
 
-#: src/processarc.c:457
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "Paket-Architektur (%s) passt nicht zum System (%s)"
 
-#: src/processarc.c:508
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3689,100 +3711,100 @@
 "dpkg: Vor-Abhängigkeitsproblem betreffend %s, welches %s enthält:\n"
 "%s"
 
-#: src/processarc.c:511
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "Vor-Abhängigkeitsproblem - %.250s wird nicht installiert"
 
-#: src/processarc.c:512
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "Vor-Abhängigkeitsproblem wird ignoriert!"
 
-#: src/processarc.c:527
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Vorbereitung zum Ersetzen von %s %s (durch %s) ...\n"
 
-#: src/processarc.c:533
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Entpacken von %s (aus %s) ...\n"
 
-#: src/processarc.c:564
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "Name der Conffile (beginnend mit »%.250s«) ist zu lang (>%d Zeichen)"
 
-#: src/processarc.c:617 utils/update-alternatives.c:1916
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "Lesefehler in %.250s"
 
-#: src/processarc.c:619
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "Fehler beim Schließen von %.250s"
 
-#: src/processarc.c:621
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "Fehler beim Versuch, %.250s zu öffnen"
 
-#: src/processarc.c:656
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "De-konfigurieren von %s, um %s entfernen zu können ...\n"
 
-#: src/processarc.c:659
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "%s wird de-konfiguriert ...\n"
 
-#: src/processarc.c:733
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Ersatz für %.250s wird entpackt ...\n"
 
-#: src/processarc.c:818
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr "Paket-Dateisystemarchiv-Extraktion"
 
-#: src/processarc.c:832
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "Fehler beim Lesen der dpkg-deb-tar-Ausgabe"
 
-#: src/processarc.c:834
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "defektes Tar-Dateisystem - Paketarchiv ist defekt"
 
-#: src/processarc.c:837
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: Mögliche Nullen am Ende werden gelöscht"
 
-#: src/processarc.c:896
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "Alte Datei »%.250s« konnte nicht mit stat abgefragt werden, wird daher nicht "
 "gelöscht: %s"
 
-#: src/processarc.c:902
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "Altes Verzeichnis »%.250s« kann nicht gelöscht werden: %s"
 
-#: src/processarc.c:905
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "Altes Conffile »%.250s« war ein leeres Verzeichnis (und wurde jetzt gelöscht)"
 
-#: src/processarc.c:952
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "Andere neue Datei »%.250s« kann nicht mit stat abgefragt werden"
 
-#: src/processarc.c:963
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3791,12 +3813,12 @@
 "Alte Datei »%.250s« ist die gleiche wie mehrere neue Dateien! (sowohl "
 "»%.250s« als auch »%.250s«)"
 
-#: src/processarc.c:1002
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "Alte Datei »%.250s« kann nicht auf sichere Weise entfernt werden: %s"
 
-#: src/processarc.c:1183
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Verschwinden von %s wurde bemerkt, welches komplett ersetzt wurde.)\n"
@@ -3970,7 +3992,7 @@
 "verwenden.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3994,6 +4016,10 @@
 "  normalerweise rechtsbündig ausgerichtet; wenn die Breite negativ ist,\n"
 "  dann linksbündig.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Verwenden Sie --help für Hilfe zum Abfragen von Paketen."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4055,7 +4081,7 @@
 msgid "Removing %s ...\n"
 msgstr "Entfernen von %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4064,53 +4090,53 @@
 "Während des Entfernens von %.250s kann Verzeichnis »%.250s« nicht gelöscht "
 "werden: %s - Verzeichnis vielleicht ein Einhängepunkt?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "»%.250s« kann nicht entfernt werden"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "»%.250s« kann nicht auf sichere Weise entfernt werden"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "Während Entfernens von %.250s ist Verzeichnis »%.250s« nicht leer, wird "
 "daher nicht gelöscht."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, c-format
+msgid "cannot remove '%.250s'"
+msgstr "»%.250s« kann nicht entfernt werden"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Löschen der Konfigurationsdateien von %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr ""
 "Alte Konfigurationsdatei »%.250s« kann nicht entfernt werden (= »%.250s«)"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 "Konfigurationsdateien-Verzeichnis »%.250s« kann nicht gelesen werden (aus "
 "»%.250s«)"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "Alte Konfigurations-Sicherungsdatei »%.250s« kann nicht gelöscht werden (aus "
 "»%.250s«)"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "Alte Dateiliste kann nicht gelöscht werden"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "Altes postrm-Skript kann nicht gelöscht werden"
 
@@ -4153,7 +4179,14 @@
 msgid "read error on standard input"
 msgstr "Lesefehler auf der Standardeingabe"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+"Verwenden Sie --help, um zu erfahren, wie die Statusinformationen von "
+"Dateien\n"
+" überschrieben werden können."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4162,7 +4195,7 @@
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4179,7 +4212,7 @@
 "  --list [<Glob-Muster>]   aktuelle Overrides in der Datenbank auflisten.\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4201,31 +4234,31 @@
 "  --version                Version anzeigen.\n"
 "\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "Entfernen von abschließendem(n) /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "Neue statoverride-Datei kann nicht geöffnet werden"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "Fehler beim Entfernen von statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "Fehler beim Anlegen der neuen statoverride-old"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "Fehler beim Installieren der neuen statoverride"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add benötigt vier Argumente"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4234,21 +4267,21 @@
 "Ein Override für »%s« existiert bereits, wird aber ignoriert, da --force "
 "angegeben ist."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Ein Override für »%s« existiert bereits, Abbruch."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "--update angegeben, aber %s existiert nicht"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Kein Override vorhanden."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update ist sinnlos für --remove"
 
@@ -4312,16 +4345,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "Mehrere Status-Overrides für Datei »%.250s« vorhanden"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Geben Sie dpkg-trigger --help für Hilfe zu diesem Programm ein."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debian %s Paket-Trigger Hilfsprogramm Version %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4332,7 +4365,7 @@
 "        %s [<Optionen> ...] <Befehl>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4345,7 +4378,7 @@
 "                                     Trigger unterstützt.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4368,32 +4401,32 @@
 "  --no-act                         Nur testen - nichts tatsächlich ändern.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: Trigger-Datenverzeichnis noch nicht angelegt\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: Trigger-Datensätze existieren noch nicht\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "akzeptiert nur ein Argument, den Namen des Triggers"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 "Muss von einem Betreuerskript aufgerufen werden (oder mit einer --by-package "
 "Option)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "ungültiger Name des erwarteten Pakets »%.250s«: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "ungültiger Triggername »%.250s«: %.250s"
@@ -4427,43 +4460,43 @@
 
 #: src/update.c:52
 #, c-format
-msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s benötigt genau eine Packages-Datei als Argument"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "Für eine große Verfügbarkeits-Aktualisierung kann nicht auf den\n"
 "dpkg-Status-Bereich zugegriffen werden"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "Große Verfügbarkeits-Aktualisierung benötigt Schreibzugriff auf den dpkg-"
 "Status-Bereich"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr ""
 "Informationen über verfügbare Pakete werden unter Verwendung von %s "
 "ersetzt.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr ""
 "Informationen über verfügbare Pakete werden unter Verwendung von %s "
 "aktualisiert.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "Informationen über %d Paket wurden aktualisiert.\n"
 msgstr[1] "Informationen über %d Pakete wurden aktualisiert.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4580,8 +4613,8 @@
 msgstr[0] "%d Warnung wegen der control-Datei(en) wird ignoriert\n"
 msgstr[1] "%d Warnungen wegen der control-Datei(en) werden ignoriert\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2161
-#: utils/update-alternatives.c:2168
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s benötigt ein Verzeichnis als Argument"
@@ -4614,22 +4647,22 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: Paket »%s« wird in »%s« gebaut.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, c-format
 msgid "failed to make temporary file (%s)"
 msgstr "Erstellen von temporärer Datei fehlgeschlagen (%s)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 msgid "control member"
 msgstr "control-Element"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, c-format
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "unlink von temporärer Datei fehlgeschlagen (%s), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, c-format
 msgid "failed to rewind temporary file (%s)"
 msgstr "Zurücksetzen von temporärer Datei fehlgeschlagen (%s)"
@@ -4644,17 +4677,17 @@
 msgid "error writing `%s'"
 msgstr "Fehler beim Schreiben von »%s«"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 msgid "data member"
 msgstr "data-Element"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, c-format
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "Schreiben eines Dateinamens in tar-Pipe fehlgeschlagen (%s)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<Kompression> von tar -cf"
 
@@ -4672,67 +4705,67 @@
 msgid "error reading %s from file %.255s"
 msgstr "Fehler beim Lesen von %s aus Datei %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "Lesen von Archiv »%.255s« fehlgeschlagen"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "Abfragen des Archivs mit fstat fehlgeschlagen"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 msgid "archive magic version number"
 msgstr "magische Archiv-Versionsnummer"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 msgid "archive member header"
 msgstr "Archivelement-Kopfzeile"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, c-format
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "Datei »%.250s« ist defekt - falsche magische Archiv-Kopfzeile"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "Datei »%.250s« ist kein Debian-Binärarchiv (dpkg-split probieren?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 msgid "archive information header member"
 msgstr "Archiv-Informationskopfzeilen-Element"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "Archiv enthält keine Zeilenvorschübe in Kopfzeilen"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "Archiv enthält keinen Punkt in der Versionsnummer"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 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:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, c-format
 msgid "skipped archive member data from %s"
 msgstr "Archivelementdaten von %s ausgelassen"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, c-format
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "Archiv »%.250s« enthält nicht verstandene Datenelemente %.*s, Abbruch"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, c-format
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "Archiv »%.250s« enthält zwei Control-Elemente, Abbruch"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -4741,21 +4774,21 @@
 " neues Debian-Paket, Version %s.\n"
 " Größe %jd Byte: control-Archiv= %jd Byte.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr "Archiv-control-Elementgröße"
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, c-format
 msgid "archive has malformatted control member size '%s'"
 msgstr "Archiv enthält falsch formatierte control-Elementgröße »%s«"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, c-format
 msgid "skipped archive control member data from %s"
 msgstr "Archiv-control-Elementdaten von %s ausgelassen"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -4764,7 +4797,7 @@
 " altes Debian-Paket, Version %s.\n"
 " Größe %jd Byte: control-Archiv= %jd, Hauptarchiv= %jd.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4773,50 +4806,51 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "»%.255s« ist kein Archiv im Debian-Format"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "Schreiben in die Pipe beim Kopieren fehlgeschlagen"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "Schließen der Pipe beim Kopieren fehlgeschlagen"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "Wechsel in das Verzeichnis fehlgeschlagen"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "Anlegen eines Verzeichnisses fehlgeschlagen"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "Wechsel in das Verzeichnis nach dessen Erzeugung fehlgeschlagen"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "Wechsel in das Verzeichnis fehlgeschlagen"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<Dekompression>"
 
 # CHECKME
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "einfügen"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s benötigt einen .deb-Dateinamen als Argument"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4825,96 +4859,96 @@
 "--%s benötigt ein Zielverzeichnis.\n"
 "Vielleicht sollten Sie dpkg --install verwenden?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s akzeptiert nur ein Argument (.deb-Dateiname)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "Wechsel nach »/« zum Aufräumen fehlgeschlagen"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, c-format
 msgid "control file '%s'"
 msgstr "control-Datei »%s«"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: »%.255s« enthält keine control-Komponente »%.255s«\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "Öffnen der Komponente »%.255s« (in %.255s) in unerwarteter Weise "
 "fehlgeschlagen"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "%d benötigte control-Komponente fehlt"
 msgstr[1] "%d benötigte control-Komponente fehlen"
 
-#: dpkg-deb/info.c:141 utils/update-alternatives.c:408
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "Verzeichnis »%.255s« kann nicht durchsucht werden"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "»%.255s« kann nicht mit stat abgefragt werden (in »%.255s«)"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "»%.255s« kann nicht geöffnet werden (in »%.255s«)"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "Lesen von »%.255s« fehlgeschlagen (in »%.255s«)"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, c-format
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7jd Byte, %5d Zeilen   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     keine gewöhnliche Datei   %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(keine »control«-Datei im control-Archiv!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "Die »control«-Komponente konnte nicht geöffnet werden"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "Lesen der »control«-Komponente fehlgeschlagen"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "Fehler beim Schließen der Komponente »%s«"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Fehler im Format"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents akzeptiert genau ein Argument"
 
@@ -4936,6 +4970,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4948,10 +4984,11 @@
 "  -e|--control <Deb> [<Verz.>]     Control-Info extrahieren.\n"
 "  -x|--extract <Deb> <Verz.>       Dateien extrahieren.\n"
 "  -X|--vextract <Deb> <Verz.>      Dateien extrahieren und auflisten.\n"
+"  -R|--raw-extract <Deb> <Verz.>   Control-Info und Dateien extrahieren.\n"
 "  --fsys-tarfile <Deb>             Dateisystem-Tardatei ausgeben.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4964,11 +5001,12 @@
 "<CFeld> ist der Name eines Feldes aus der Haupt-»control«-Datei.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4983,6 +5021,7 @@
 "Optionen:\n"
 "  --showformat=<Format>            Alternatives Format für --show "
 "verwenden.\n"
+"  -v, --verbose                    Ausführliche Ausgaben einschalten.\n"
 "  -D                               Debug-Ausgaben einschalten.\n"
 "  --old, --new                     Archiv-Format auswählen.\n"
 "  --nocheck                        Control-Datei-Prüfung auslassen\n"
@@ -4994,7 +5033,7 @@
 "none.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5008,7 +5047,7 @@
 "die mit »dpkg-deb --extract« entpackt wurden, werden nicht korrekt "
 "installiert!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5016,17 +5055,17 @@
 "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:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "ungültige Ganzzahl für -%c: »%.250s«"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "ungültiger Kompressionslevel für --%c: »%ld«"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "unbekannter Komprimierungstyp »%s«!"
@@ -5046,7 +5085,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "Datei »%.250s« ist defekt - fehlender Zeilenvorschub nach %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:115
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "Fehler beim Lesen von %.250s"
@@ -5251,7 +5290,7 @@
 msgid "split package part"
 msgstr "Teil des aufgespaltenen Pakets"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:239
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "fertig\n"
@@ -5338,20 +5377,20 @@
 "  1 = mit --auto, Datei ist kein Teil\n"
 "  2 = Probleme\n"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Geben Sie dpkg-split --help für Hilfe ein."
 
-#: dpkg-split/main.c:116
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "Unerwartetes Dateiende in %.250s"
 
-#: dpkg-split/main.c:127
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "Teilgröße ist viel zu groß oder nicht positiv."
 
-#: dpkg-split/main.c:131
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "Teilgröße muss mindestens %d KiB sein (für die Kopfzeilen)"
@@ -5361,131 +5400,131 @@
 msgid "unable to read depot directory `%.250s'"
 msgstr "Depot-Verzeichnis »%.250s« kann nicht gelesen werden"
 
-#: dpkg-split/queue.c:135
+#: dpkg-split/queue.c:134
 msgid "--auto requires the use of the --output option"
 msgstr "--auto benötigt die Angabe der --output-Option"
 
-#: dpkg-split/queue.c:137
+#: dpkg-split/queue.c:136
 msgid "--auto requires exactly one part file argument"
 msgstr "--auto benötigt genau einen Teil-Dateinamen"
 
-#: dpkg-split/queue.c:141
+#: dpkg-split/queue.c:140
 #, c-format
 msgid "unable to read part file `%.250s'"
 msgstr "Teildatei »%.250s« kann nicht gelesen werden"
 
-#: dpkg-split/queue.c:144
+#: dpkg-split/queue.c:143
 #, c-format
 msgid "File `%.250s' is not part of a multipart archive.\n"
 msgstr "Datei »%.250s« ist kein Teil eines mehrteiligen Archivs.\n"
 
-#: dpkg-split/queue.c:180
+#: dpkg-split/queue.c:179
 #, c-format
 msgid "unable to reopen part file `%.250s'"
 msgstr "Teildatei »%.250s« kann nicht wieder geöffnet werden"
 
-#: dpkg-split/queue.c:183
+#: dpkg-split/queue.c:182
 #, c-format
 msgid "unable to open new depot file `%.250s'"
 msgstr "Neue Depot-Datei »%.250s« kann nicht geöffnet werden"
 
-#: dpkg-split/queue.c:185
+#: dpkg-split/queue.c:184
 msgid "extracting split part"
 msgstr "Extrahieren des abgespaltenen Teils"
 
-#: dpkg-split/queue.c:193
+#: dpkg-split/queue.c:192
 #, c-format
 msgid "unable to rename new depot file `%.250s' to `%.250s'"
 msgstr "Neue Depot-Datei »%.250s« kann nicht in »%.250s« umbenannt werden"
 
-#: dpkg-split/queue.c:197
+#: dpkg-split/queue.c:196
 #, c-format
 msgid "Part %d of package %s filed (still want "
 msgstr "Teil %d des Pakets %s abgelegt (benötige noch "
 
-#: dpkg-split/queue.c:201
+#: dpkg-split/queue.c:200
 msgid " and "
 msgstr " und "
 
-#: dpkg-split/queue.c:215
+#: dpkg-split/queue.c:214
 #, c-format
 msgid "unable to delete used-up depot file `%.250s'"
 msgstr "Aufgebrauchte Depotdatei »%.250s« kann nicht gelöscht werden"
 
-#: dpkg-split/queue.c:236
+#: dpkg-split/queue.c:235
 msgid "Junk files left around in the depot directory:\n"
 msgstr "Sinnlose Dateien im Depot-Verzeichnis übriggeblieben:\n"
 
-#: dpkg-split/queue.c:241 dpkg-split/queue.c:270
+#: dpkg-split/queue.c:240 dpkg-split/queue.c:269
 #, c-format
 msgid "unable to stat `%.250s'"
 msgstr "»%.250s« kann nicht mit stat abgefragt werden"
 
-#: dpkg-split/queue.c:244
+#: dpkg-split/queue.c:243
 #, c-format
 msgid " %s (%jd bytes)\n"
 msgstr " %s (%jd Byte)\n"
 
-#: dpkg-split/queue.c:246
+#: dpkg-split/queue.c:245
 #, c-format
 msgid " %s (not a plain file)\n"
 msgstr " %s (keine gewöhnliche Datei)\n"
 
-#: dpkg-split/queue.c:251
+#: dpkg-split/queue.c:250
 msgid "Packages not yet reassembled:\n"
 msgstr "Pakete noch nicht wieder zusammengefügt:\n"
 
-#: dpkg-split/queue.c:259
+#: dpkg-split/queue.c:258
 #, c-format
 msgid " Package %s: part(s) "
 msgstr "Paket %s: Teil(e) "
 
-#: dpkg-split/queue.c:272
+#: dpkg-split/queue.c:271
 #, c-format
 msgid "part file `%.250s' is not a plain file"
 msgstr "Teildatei »%.250s« ist keine gewöhnliche Datei"
 
-#: dpkg-split/queue.c:279
+#: dpkg-split/queue.c:278
 #, c-format
 msgid "(total %jd bytes)\n"
 msgstr "(insgesamt %jd Byte)\n"
 
-#: dpkg-split/queue.c:305
+#: dpkg-split/queue.c:304
 #, c-format
 msgid "unable to discard `%.250s'"
 msgstr "»%.250s« kann nicht verworfen werden"
 
-#: dpkg-split/queue.c:306
+#: dpkg-split/queue.c:305
 #, c-format
 msgid "Deleted %s.\n"
 msgstr "%s ist entfernt worden.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr "Paket-Feldwertextraktion"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "Quelldatei »%.250s« kann nicht geöffnet werden"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "Quelldatei kann nicht mit fstat abgefragt werden"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "Quelldatei »%.250s« ist keine gewöhnliche Datei"
 
-#: dpkg-split/split.c:152
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] "Paket %s wird in %d Teil aufgeteilt: "
 msgstr[1] "Paket %s wird in %d Teile aufgeteilt: "
 
-#: dpkg-split/split.c:195
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
@@ -5494,11 +5533,11 @@
 "die\n"
 "Versionsnummer muss außerordentlich lang sein, oder so. Abbruch.\n"
 
-#: dpkg-split/split.c:251
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split benötigt einen Quelldatei-Namen als Argument"
 
-#: dpkg-split/split.c:254
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "--split akzeptiert höchstens einen Quelldatei-Namen und ein Ziel-Präfix"
@@ -5620,79 +5659,79 @@
 msgid "warning"
 msgstr "Warnung"
 
-#: utils/update-alternatives.c:340
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "Zwei Befehle angegeben: --%s und --%s"
 
-#: utils/update-alternatives.c:371
+#: utils/update-alternatives.c:387
 #, c-format
 msgid "cannot append to '%s'"
 msgstr "An »%s« kann nicht angehängt werden"
 
-#: utils/update-alternatives.c:533
+#: utils/update-alternatives.c:556
 #, c-format
 msgid "unable to remove '%s'"
 msgstr "»%s« kann nicht entfernt werden"
 
-#: utils/update-alternatives.c:1071
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "unerwartetes Dateiende beim Versuch, %s zu lesen"
 
-#: utils/update-alternatives.c:1073
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "Beim Lesen von %s: %s"
 
-#: utils/update-alternatives.c:1079
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "Zeile nicht beendet beim Versuch, %s zu lesen"
 
-#: utils/update-alternatives.c:1097
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s defekt: %s"
 
-#: utils/update-alternatives.c:1110
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "Zeilenvorschübe sind in update-alternatives-Dateien (%s) verboten"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "Slave-Name"
 
-#: utils/update-alternatives.c:1131 utils/update-alternatives.c:2137
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, c-format
 msgid "duplicate slave name %s"
 msgstr "doppelter Slave-Name %s"
 
-#: utils/update-alternatives.c:1134
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "Slave-Link"
 
-#: utils/update-alternatives.c:1138
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "Slave-Link ist derselbe wie Haupt-Link %s"
 
-#: utils/update-alternatives.c:1145 utils/update-alternatives.c:2144
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "doppelter Slave-Link %s"
 
-#: utils/update-alternatives.c:1164
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "Master-Datei"
 
-#: utils/update-alternatives.c:1173
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "doppelter Pfad %s"
 
-#: utils/update-alternatives.c:1186
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5701,76 +5740,76 @@
 "Alternative %s (Teil der Link-Gruppe %s) existiert nicht.\n"
 "Sie wird aus der Liste der Alternativen entfernt."
 
-#: utils/update-alternatives.c:1189 utils/update-alternatives.c:1200
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "Priorität"
 
-#: utils/update-alternatives.c:1192 utils/update-alternatives.c:1209
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "Slave-Datei"
 
-#: utils/update-alternatives.c:1204
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "Priorität von %s: %s"
 
-#: utils/update-alternatives.c:1257
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "Status"
 
-#: utils/update-alternatives.c:1259
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "ungültiger Status"
 
-#: utils/update-alternatives.c:1264
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "Master-Link"
 
-#: utils/update-alternatives.c:1308
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "Veralteter Slave-Link %s wird verworfen (%s)."
 
-#: utils/update-alternatives.c:1462 utils/update-alternatives.c:1529
-#: utils/update-alternatives.c:2462
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "Auto-Modus"
 
-#: utils/update-alternatives.c:1462 utils/update-alternatives.c:1538
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "manueller Modus"
 
-#: utils/update-alternatives.c:1465
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "  Link verweist zur Zeit auf %s"
 
-#: utils/update-alternatives.c:1468
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "  Link zur Zeit nicht vorhanden"
 
-#: utils/update-alternatives.c:1472
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - Priorität %d"
 
-#: utils/update-alternatives.c:1475
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  Slave %s: %s"
 
-#: utils/update-alternatives.c:1482
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Gegenwärtig »beste« Version ist »%s«."
 
-#: utils/update-alternatives.c:1484
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Keine Versionen verfügbar."
 
 # CHECKME: bereitstellt oder bereitstellen?
-#: utils/update-alternatives.c:1513
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
@@ -5781,40 +5820,40 @@
 "Es gibt %d Auswahlmöglichkeiten für die Alternative %s (welche %s "
 "bereitstellen)."
 
-#: utils/update-alternatives.c:1520
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Auswahl"
 
-#: utils/update-alternatives.c:1521
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Pfad"
 
-#: utils/update-alternatives.c:1521
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Priorität"
 
-#: utils/update-alternatives.c:1521
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Status"
 
-#: utils/update-alternatives.c:1542
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Drücken Sie die Eingabetaste, um die aktuelle Wahl[*] beizubehalten,\n"
 "oder geben Sie die Auswahlnummer ein: "
 
-#: utils/update-alternatives.c:1658
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "%s wird nicht durch einen Link ersetzt."
 
-#: utils/update-alternatives.c:1671
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "Unbekannte Auswahl %s kann nicht installiert werden"
 
-#: utils/update-alternatives.c:1689
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -5823,98 +5862,149 @@
 "Erstellung von %s wird übersprungen, weil die zugehörige Datei %s (der Link-"
 "Gruppe %s) nicht existiert."
 
-#: utils/update-alternatives.c:1886 utils/update-alternatives.c:1892
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr "%s wird nicht entfernt, da sie kein Symlink ist."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "%s wird aufgerufen."
 
-#: utils/update-alternatives.c:1896
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Alternative %s nicht verändert, weil Auswahl %s nicht verfügbar ist."
 
-#: utils/update-alternatives.c:1900
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Unbekannte Alternative %s wird übersprungen."
 
-#: utils/update-alternatives.c:1922
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "Zeile zu lang oder nicht beendet beim Versuch, %s zu lesen"
 
-#: utils/update-alternatives.c:1935 utils/update-alternatives.c:1948
-#: utils/update-alternatives.c:1958
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Ungültige Zeile wird übersprungen: %s"
 
-#: utils/update-alternatives.c:1977
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "%s-Link wird von %s in %s umbenannt."
 
-#: utils/update-alternatives.c:2008
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "%s-Slave-Link wird von %s in %s umbenannt."
 
-#: utils/update-alternatives.c:2056
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "Alternativen-Name (%s) darf kein »/« oder Leerzeichen enthalten."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "Alternativen-Link ist nicht absolut wie er sein sollte: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "Alternativen-Pfad ist nicht absolut wie er sein sollte: %s"
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "Alternative %s kann kein Master sein: Sie ist ein Slave von %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "Alternativen-Link %s wird bereits von %s verwaltet."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "Alternativen-Pfad %s existiert nicht."
+
+#: utils/update-alternatives.c:2254
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr ""
+"Alternative %s kann kein Slave von %s sein: Sie ist eine Master-Alternative."
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "Alternative %s kann kein Slave von %s sein: Sie ist ein Slave von %s"
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "Alternativen-Link %s wird bereits von %s (Slave von %s) verwaltet."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "unbekanntes Argument »%s«"
 
-#: utils/update-alternatives.c:2075
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install benötigt <Link> <Name> <Pfad> <Priorität>"
 
-#: utils/update-alternatives.c:2078 utils/update-alternatives.c:2129
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<Link> und <Pfad> können nicht identisch sein"
 
-#: utils/update-alternatives.c:2081
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "Priorität muss eine Ganzzahl sein"
 
-#: utils/update-alternatives.c:2094
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s benötigt <Name> <Pfad>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s benötigt <Name>"
 
-#: utils/update-alternatives.c:2120
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave ist nur mit --install erlaubt"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave benötigt <Link> <Name> <Pfad>"
 
-#: utils/update-alternatives.c:2131
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "Name %s ist sowohl primär als auch slave"
 
-#: utils/update-alternatives.c:2134
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "Link %s ist sowohl primär als auch slave"
 
-#: utils/update-alternatives.c:2154
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s benötigt eine Datei als Argument"
 
-#: utils/update-alternatives.c:2180
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "unbekannte Option »%s«"
 
-#: utils/update-alternatives.c:2185
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -5923,66 +6013,22 @@
 "selections,\n"
 "--install, --remove, --all, --remove-all oder --auto wird benötigt"
 
-#: utils/update-alternatives.c:2227
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "Alternative %s kann kein Master sein: Sie ist ein Slave von %s"
-
-#: utils/update-alternatives.c:2238 utils/update-alternatives.c:2279
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "Alternativen-Link %s wird bereits von %s verwaltet."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2285
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "Alternativen-Link ist nicht absolut wie er sein sollte: %s"
-
-#: utils/update-alternatives.c:2247 utils/update-alternatives.c:2289
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "Alternativen-Pfad ist nicht absolut wie er sein sollte: %s"
-
-#: utils/update-alternatives.c:2251
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "Alternativen-Pfad %s existiert nicht"
-
-#: utils/update-alternatives.c:2255 utils/update-alternatives.c:2293
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "Alternativen-Name (%s) darf kein »/« oder Leerzeichen enthalten."
-
-#: utils/update-alternatives.c:2267
-msgid "it is a master alternative."
-msgstr "Sie ist eine Master-Alternative."
-
-#: utils/update-alternatives.c:2269
-#, c-format
-msgid "it is a slave of %s"
-msgstr "Sie ist ein Slave von %s"
-
-#: utils/update-alternatives.c:2271
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "Alternative %s kann kein Slave von %s sein: %s"
-
-#: utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<Standardeingabe>"
 
-#: utils/update-alternatives.c:2327 utils/update-alternatives.c:2330
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "Keine Alternativen für %s."
 
 # CHECKME: it -> »er« oder »sie« (Symlink oder Alternative)?
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s/%s ist freihängend, wird mit der besten Auswahl aktualisiert."
 
-#: utils/update-alternatives.c:2358
+#: utils/update-alternatives.c:2534
 #, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
@@ -5991,62 +6037,62 @@
 "%s/%s wurde geändert (manuell oder von einem Skript).\n"
 "Es wird zu ausschließlich manuellen Aktualisierungen umgeschaltet."
 
-#: utils/update-alternatives.c:2366
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "Automatische Auswahl von %s wird eingerichtet."
 
-#: utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "Alternative %s für %s ist nicht registriert, wird nicht gesetzt."
 
-#: utils/update-alternatives.c:2381 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Es gibt kein Programm, welches %s bereitstellt."
 
-#: utils/update-alternatives.c:2389 utils/update-alternatives.c:2399
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Nichts zu konfigurieren."
 
-#: utils/update-alternatives.c:2397
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Es gibt nur eine Alternative in Link-Gruppe %s: %s"
 
-#: utils/update-alternatives.c:2408
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "Alternative %s für %s ist nicht registriert, wird nicht entfernt."
 
-#: utils/update-alternatives.c:2416
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "Manuell ausgewählte Alternative wird entfernt - Umschaltung von %s in Auto-"
 "Modus"
 
-#: utils/update-alternatives.c:2441
+#: utils/update-alternatives.c:2617
 #, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr ""
 "Automatische Aktualisierungen von %s/%s sind deaktiviert, wird nicht "
 "verändert."
 
-#: utils/update-alternatives.c:2443
+#: utils/update-alternatives.c:2619
 #, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 "Um zu automatischen Aktualisierungen zurückzukehren,\n"
 "verwenden Sie »%s --auto %s«."
 
-#: utils/update-alternatives.c:2460
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "%s wird verwendet, um %s (%s) im %s bereitzustellen."
 
-#: utils/update-alternatives.c:2468
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
@@ -6054,12 +6100,18 @@
 "Neuinstallation der Alternative %s ist erzwungen, weil Linkgruppe %s defekt "
 "ist."
 
-#: utils/update-alternatives.c:2475
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "Aktuelle Alternative %s ist unbekannt, Linkgruppe %s wird zu %s umgeschaltet."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "Sie ist eine Master-Alternative."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "Sie ist ein Slave von %s"
+
 #~ msgid "cannot stat %s: %s"
 #~ msgstr "»%s« kann nicht mit stat abgefragt werden: %s"
 
@@ -6353,9 +6405,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "Control-Bereich von %s ausgelassen"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "Ausführen von tar fehlgeschlagen"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "Anlegen eines temporären Verzeichnisses fehlgeschlagen"
 
diff -uNr --exclude .git --exclude .bzr dpkg/po/dpkg.pot /home/vorlon/devel/multiarch/dpkg-debian/po/dpkg.pot
--- dpkg/po/dpkg.pot	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/dpkg.pot	2012-06-07 10:11:09.426073000 -0700
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.16.0\n"
+"Project-Id-Version: dpkg 1.16.1.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,7 +24,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr ""
@@ -44,71 +44,76 @@
 msgid "ar member file (%s)"
 msgstr ""
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, c-format
+msgid "failed to seek %s"
+msgstr ""
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr ""
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr ""
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr ""
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr ""
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr ""
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr ""
@@ -123,133 +128,133 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr ""
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr ""
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
 "max=%d)"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 msgid "dpkg status database"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr ""
@@ -269,118 +274,120 @@
 msgid "unable to open directory '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr ""
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr ""
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr ""
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr ""
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr ""
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr ""
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr ""
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 msgid "out of memory for new error context"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, c-format
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr ""
@@ -395,184 +402,184 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr ""
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr ""
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr ""
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr ""
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr ""
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " bad version relationship %c%c"
 msgstr ""
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " `%c' is obsolete, use `%c=' or `%c%c' instead"
 msgstr ""
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " implicit exact match on version number, suggest using `=' instead"
 msgstr ""
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr ""
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr ""
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr ""
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr ""
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr ""
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr ""
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr ""
@@ -626,7 +633,7 @@
 msgid "unable to write to status fd %d"
 msgstr ""
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, c-format
 msgid "malloc failed (%zu bytes)"
 msgstr ""
@@ -636,8 +643,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr ""
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr ""
 
@@ -670,197 +677,202 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr ""
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr ""
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr ""
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr ""
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr ""
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr ""
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr ""
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr ""
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr ""
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr ""
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr ""
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, c-format
 msgid "reading package info file '%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr ""
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr ""
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
 #, c-format
-msgid "EOF during value of field `%.*s' (missing final newline)"
+msgid "blank line in value of field '%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:434
-msgid "several package info entries found, only one allowed"
+#: lib/dpkg/parse.c:461
+#, c-format
+msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
+#: lib/dpkg/parse.c:546
+msgid "several package info entries found, only one allowed"
 msgstr ""
 
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr ""
@@ -879,58 +891,58 @@
 " %.255s"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 msgid "must start with an alphanumeric character"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 msgctxt "version"
 msgid "<none>"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr ""
@@ -949,50 +961,50 @@
 msgid "(no description available)"
 msgstr ""
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr ""
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr ""
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr ""
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr ""
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr ""
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, c-format
 msgid "subprocess %s was interrupted"
 msgstr ""
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, c-format
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr ""
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ""
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr ""
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr ""
@@ -1012,196 +1024,202 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 msgid "triggers area"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr ""
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
 #, c-format
-msgid "unable to install new trigger interest file `%.250s'"
+msgid "cannot remove `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr ""
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr ""
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1226,7 +1244,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr ""
 
@@ -1245,12 +1263,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr ""
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr ""
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr ""
@@ -1301,339 +1319,353 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr ""
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr ""
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr ""
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr ""
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
 "nondirectory"
 msgstr ""
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr ""
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr ""
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr ""
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr ""
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr ""
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr ""
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr ""
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr ""
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr ""
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr ""
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr ""
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr ""
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
 " package %s, to enable %s."
 msgstr ""
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable %s.\n"
 msgstr ""
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr ""
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr ""
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr ""
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr ""
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr ""
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "requested.\n"
 msgstr ""
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr ""
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr ""
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr ""
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr ""
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr ""
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr ""
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr ""
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr ""
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
+#: src/archives.c:1367
 #, c-format
-msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1359
+#: src/archives.c:1371
 #, c-format
-msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr ""
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr ""
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
 "of backup copy"
 msgstr ""
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr ""
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr ""
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr ""
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr ""
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr ""
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1641,159 +1673,159 @@
 "Installing new config file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr ""
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr ""
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr ""
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr ""
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
 " cannot configure (current status `%.250s')"
 msgstr ""
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
 "%s"
 msgstr ""
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
 "%s"
 msgstr ""
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
 msgstr ""
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr ""
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
 " (= '%s'): %s"
 msgstr ""
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
 " (= '%s')"
 msgstr ""
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
 " (= '%s'): %s"
 msgstr ""
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
 " ('%s' is a symlink to '%s')"
 msgstr ""
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr ""
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr ""
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr ""
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
 "Configuration file `%s'"
 msgstr ""
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr ""
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1801,58 +1833,58 @@
 " ==> File also in package provided by package maintainer.\n"
 msgstr ""
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
 "     Not modified since installation.\n"
 msgstr ""
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
 " ==> Modified (by you or by a script) since installation.\n"
 msgstr ""
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
 " ==> Deleted (by you or by a script) since installation.\n"
 msgstr ""
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr ""
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr ""
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr ""
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr ""
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1862,157 +1894,157 @@
 "      Z     : start a shell to examine the situation\n"
 msgstr ""
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr ""
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr ""
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr ""
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr ""
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr ""
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr ""
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr ""
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr ""
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr ""
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr ""
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr ""
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr ""
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr ""
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr ""
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr ""
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr ""
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr ""
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr ""
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr ""
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr ""
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr ""
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr ""
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+msgid "Use --help for help about diverting files."
 msgstr ""
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2020,7 +2052,7 @@
 msgid "Debian %s version %s.\n"
 msgstr ""
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2028,8 +2060,8 @@
 "Copyright (C) 2010 Guillem Jover.\n"
 msgstr ""
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2037,7 +2069,7 @@
 "later for copying conditions. There is NO warranty.\n"
 msgstr ""
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2045,7 +2077,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2057,7 +2089,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2075,7 +2107,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2084,144 +2116,139 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr ""
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr ""
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, c-format
 msgid "unable to create file '%s'"
 msgstr ""
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr ""
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr ""
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, c-format
 msgid "unable to remove copied source file '%s'"
 msgstr ""
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr ""
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr ""
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr ""
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr ""
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr ""
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr ""
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr ""
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr ""
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr ""
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr ""
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr ""
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr ""
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr ""
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr ""
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr ""
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr ""
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr ""
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2229,7 +2256,7 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2237,16 +2264,16 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr ""
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr ""
 
@@ -2310,8 +2337,8 @@
 msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr ""
@@ -2393,7 +2420,7 @@
 msgid "--compare-versions bad relation"
 msgstr ""
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr ""
@@ -2439,80 +2466,80 @@
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
 "currently installed."
 msgstr ""
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr ""
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, c-format
 msgid "reading files list for package '%.250s'"
 msgstr ""
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr ""
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2550,7 +2577,7 @@
 msgstr ""
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr ""
 
 #: src/help.c:129
@@ -2579,7 +2606,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 msgid "unable to setenv for subprocesses"
 msgstr ""
 
@@ -2589,65 +2616,65 @@
 msgstr ""
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr ""
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr ""
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr ""
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr ""
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr ""
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr ""
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr ""
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr ""
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr ""
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr ""
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr ""
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2656,7 +2683,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr ""
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr ""
 
@@ -2696,7 +2723,7 @@
 "\n"
 msgstr ""
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -2775,7 +2802,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -2816,30 +2843,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -2848,95 +2879,95 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 msgid "Turn all dependency problems into warnings"
 msgstr ""
 
-#: src/main.c:263
+#: src/main.c:265
 msgid "Turn dependency version problems into warnings"
 msgstr ""
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 msgid "Invocation and status of maintainer scripts"
 msgstr ""
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 msgid "Output for each configuration file"
 msgstr ""
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2944,7 +2975,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -2952,35 +2983,35 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr ""
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2989,7 +3020,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -2997,12 +3028,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr ""
@@ -3025,8 +3056,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr ""
 
@@ -3182,192 +3213,192 @@
 msgid "passed\n"
 msgstr ""
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr ""
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr ""
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr ""
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr ""
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr ""
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr ""
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr ""
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 msgid "package control information extraction"
 msgstr ""
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr ""
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr ""
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
 "%s"
 msgstr ""
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr ""
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr ""
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr ""
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr ""
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr ""
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr ""
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr ""
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr ""
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr ""
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr ""
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr ""
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr ""
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr ""
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
 "'%.250s')"
 msgstr ""
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr ""
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
@@ -3512,7 +3543,7 @@
 "\n"
 msgstr ""
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3526,6 +3557,10 @@
 "  case left alignment will be used.\n"
 msgstr ""
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3576,53 +3611,53 @@
 msgid "Removing %s ...\n"
 msgstr ""
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
 "may be a mount point?"
 msgstr ""
 
-#: src/remove.c:281 src/remove.c:361
+#: src/remove.c:289
 #, c-format
-msgid "cannot remove `%.250s'"
+msgid "unable to securely remove '%.250s'"
 msgstr ""
 
-#: src/remove.c:284
+#: src/remove.c:361
 #, c-format
-msgid "unable to securely remove '%.250s'"
+msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 
-#: src/remove.c:345
+#: src/remove.c:383
 #, c-format
-msgid "while removing %.250s, directory '%.250s' not empty so not removed."
+msgid "cannot remove '%.250s'"
 msgstr ""
 
-#: src/remove.c:384
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr ""
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr ""
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr ""
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr ""
 
@@ -3665,14 +3700,18 @@
 msgid "read error on standard input"
 msgstr ""
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 msgstr ""
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -3683,7 +3722,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -3696,52 +3735,52 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr ""
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr ""
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr ""
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr ""
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr ""
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr ""
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr ""
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr ""
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr ""
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr ""
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr ""
 
@@ -3805,16 +3844,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr ""
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr ""
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -3822,7 +3861,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -3831,7 +3870,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -3845,30 +3884,30 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr ""
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr ""
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr ""
@@ -3898,35 +3937,35 @@
 
 #: src/update.c:52
 #, c-format
-msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr ""
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr ""
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr ""
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4035,8 +4074,8 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
@@ -4068,22 +4107,22 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, c-format
 msgid "failed to make temporary file (%s)"
 msgstr ""
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 msgid "control member"
 msgstr ""
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, c-format
 msgid "failed to unlink temporary file (%s), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, c-format
 msgid "failed to rewind temporary file (%s)"
 msgstr ""
@@ -4098,17 +4137,17 @@
 msgid "error writing `%s'"
 msgstr ""
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 msgid "data member"
 msgstr ""
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, c-format
 msgid "failed to write filename to tar pipe (%s)"
 msgstr ""
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4126,237 +4165,238 @@
 msgid "error reading %s from file %.255s"
 msgstr ""
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 msgid "archive magic version number"
 msgstr ""
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 msgid "archive member header"
 msgstr ""
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, c-format
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr ""
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 msgid "archive information header member"
 msgstr ""
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr ""
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr ""
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, c-format
 msgid "skipped archive member data from %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, c-format
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, c-format
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
 " size %jd bytes: control archive= %jd bytes.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, c-format
 msgid "archive has malformatted control member size '%s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, c-format
 msgid "skipped archive control member data from %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
 " size %jd bytes: control archive= %jd, main archive= %jd.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, 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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr ""
 
-#: dpkg-deb/extract.c:289
-msgid "failed to create directory"
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
 msgstr ""
 
-#: dpkg-deb/extract.c:291
-msgid "failed to chdir to directory after creating it"
+#: dpkg-deb/extract.c:310
+msgid "failed to create directory"
 msgstr ""
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
+#: dpkg-deb/extract.c:312
+msgid "failed to chdir to directory after creating it"
 msgstr ""
 
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr ""
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr ""
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr ""
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
 "Perhaps you should be using dpkg --install ?"
 msgstr ""
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr ""
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr ""
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr ""
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, c-format
 msgid "control file '%s'"
 msgstr ""
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr ""
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, c-format
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr ""
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr ""
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr ""
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr ""
 
@@ -4377,11 +4417,13 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4390,11 +4432,12 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4407,7 +4450,7 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4416,23 +4459,23 @@
 "unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
 msgstr ""
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr ""
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr ""
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr ""
@@ -4452,7 +4495,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr ""
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr ""
@@ -4533,53 +4576,58 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr ""
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+msgid "package architecture"
+msgstr ""
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr ""
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr ""
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -4590,12 +4638,17 @@
 "\n"
 msgstr ""
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr ""
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr ""
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr ""
@@ -4625,7 +4678,7 @@
 msgid "split package part"
 msgstr ""
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr ""
@@ -4674,28 +4727,36 @@
 "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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr ""
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr ""
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr ""
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -4804,42 +4865,42 @@
 msgid "Deleted %s.\n"
 msgstr ""
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr ""
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr ""
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr ""
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr ""
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 
@@ -4907,476 +4968,430 @@
 "  --version                show the version.\n"
 msgstr ""
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr ""
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr ""
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr ""
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:395
+#: utils/update-alternatives.c:387
 #, c-format
-msgid "scan of %s failed: %s"
+msgid "cannot append to '%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:420
+#: utils/update-alternatives.c:556
 #, c-format
-msgid "failed to execute %s: %s"
+msgid "unable to remove '%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, c-format
 msgid "duplicate slave name %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr ""
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr ""
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
-#, c-format
-msgid "priority of %s: %s"
-msgstr ""
-
 #: utils/update-alternatives.c:1244
 #, c-format
-msgid "unable to read %s: %s"
+msgid "priority of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr ""
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr ""
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr ""
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr ""
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr ""
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
 #, c-format
-msgid "unknown argument `%s'"
+msgid "alternative name (%s) must not contain '/' and spaces."
 msgstr ""
 
-#: utils/update-alternatives.c:2063
-msgid "--install needs <link> <name> <path> <priority>"
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
-msgid "<link> and <path> can't be the same"
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
-msgid "priority must be an integer"
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
 #, c-format
-msgid "--%s needs <name> <path>"
+msgid "alternative link %s is already managed by %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2241
 #, c-format
-msgid "--%s needs <name>"
+msgid "alternative path %s doesn't exist."
 msgstr ""
 
-#: utils/update-alternatives.c:2108
-msgid "--slave only allowed with --install"
+#: utils/update-alternatives.c:2254
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
 msgstr ""
 
-#: utils/update-alternatives.c:2110
-msgid "--slave needs <link> <name> <path>"
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2278
 #, c-format
-msgid "name %s is both primary and slave"
+msgid "alternative link %s is already managed by %s (slave of %s)."
 msgstr ""
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2324
 #, c-format
-msgid "link %s is both primary and slave"
+msgid "unknown argument `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2142
-#, c-format
-msgid "--%s needs a <file> argument"
+#: utils/update-alternatives.c:2343
+msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: utils/update-alternatives.c:2168
-#, c-format
-msgid "unknown option `%s'"
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
+msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2173
-msgid ""
-"need --display, --query, --list, --get-selections, --config, --set, --set-"
-"selections, --install, --remove, --all, --remove-all or --auto"
+#: utils/update-alternatives.c:2349
+msgid "priority must be an integer"
 msgstr ""
 
-#: utils/update-alternatives.c:2215
+#: utils/update-alternatives.c:2362
 #, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
+msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
+#: utils/update-alternatives.c:2376
 #, c-format
-msgid "alternative link %s is already managed by %s."
+msgid "--%s needs <name>"
 msgstr ""
 
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
+#: utils/update-alternatives.c:2388
+msgid "--slave only allowed with --install"
 msgstr ""
 
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
+#: utils/update-alternatives.c:2390
+msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2239
+#: utils/update-alternatives.c:2399
 #, c-format
-msgid "alternative path %s doesn't exist."
+msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
+#: utils/update-alternatives.c:2402
 #, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
+msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
+#: utils/update-alternatives.c:2422
+#, c-format
+msgid "--%s needs a <file> argument"
 msgstr ""
 
-#: utils/update-alternatives.c:2257
+#: utils/update-alternatives.c:2448
 #, c-format
-msgid "it is a slave of %s"
+msgid "unknown option `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
+#: utils/update-alternatives.c:2453
+msgid ""
+"need --display, --query, --list, --get-selections, --config, --set, --set-"
+"selections, --install, --remove, --all, --remove-all or --auto"
 msgstr ""
 
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr ""
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
 "updates only."
 msgstr ""
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr ""
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr ""
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
Binary files dpkg/po/dz.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/dz.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/dz.po /home/vorlon/devel/multiarch/dpkg-debian/po/dz.po
--- dpkg/po/dz.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/dz.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dpkg po.pot\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2007-06-29 04:06+0530\n"
 "Last-Translator: Tshewang Norbu <bumthap2006@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -27,7 +27,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
@@ -47,71 +47,77 @@
 msgid "ar member file (%s)"
 msgstr "གནས་སྐབས་ཡིག་སྣོད་བཟོ་ནི་འཐུས་ཤོར་བྱུང་ཡོད་(གནད་སྡུད་)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "གནས་ཁོངས་འདྲ་བཤུས་ནང་ (%s)འཐུས་ཤོར་བྱུང་ཡོད།(_c)"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "གནས་ཁོངས་འདྲ་བཤུས་ནང་ (%s)འཐུས་ཤོར་བྱུང་ཡོད།(_c)"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "གནས་ཁོངས་འདྲ་བཤུས་ (%s) ནང་ལྷག་ནི་ཐུང་ཀུ།(_c)"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "ཊར་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "%s ལག་ལེན་འཐབ་མ་ཚུགས།"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: ཨེབ་བཙུགས་བཤོལ་ནི།"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: ཨེབ་བཙུགས།"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: ནང་འཁོད་ gzip འཛོལ་བ: `%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: ནང་འཁོད་ gzip འཛོལ་བ: `%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: ནང་འཁོད་ gzip འཛོལ་བ: `%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: ནང་འཁོད་ gzip འཛོལ་བ: `%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: ནང་འཁོད་ gzip འཛོལ་བ: `%s'"
@@ -126,31 +132,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: ནང་འཁོད་ bzip2 འཛོལ་བ: `%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: ནང་འཁོད་ bzip2 འཛོལ་བ: `%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: ནང་འཁོད་ bzip2 འཛོལ་བ: `%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: ནང་འཁོད་ bzip2 འཛོལ་བ: `%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -159,7 +165,7 @@
 "དུས་མཐུན་བཟོ་ཡོད་པའི་སྣོད་ཐོའི་ནང་ན་ ཡིག་སྣོད་ `%.250s' ག་གི་མིང་རིང་དྲགས་མི་(རིང་ཚད་=%d མང་"
 "མཐའ་=%d)འདི་ཡོདཔ་ཨིན།"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -167,100 +173,100 @@
 "དུས་མཐུན་བཟོ་ཡོད་མི་སྣོད་ཐོའི་ནང་ན་ ཡིག་སྣོད་ རིང་ཚད་མིང་སོ་སོ་འབད་མི་( %d དང་ %d གཉིས་ཆ་ར་)ཚུ་"
 "ཡོདཔ་ཨིན།"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "དུས་མཐོན་ཀྱི་སྣོད་ཐོ་ `%.255s' ཞིབ་ལྟ་འབད་མི་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "གཅིག་ཁར་སྡེབ་ཡོད་པའི་དུས་མཐུན་གྱི་ཡིག་སྣོད་ %.255s རྩ་བསྐྲད་གཏང་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "`%.255s' གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "%.250s བར་ཤབས་དང་ཅིག་ཁར་བཀང་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "%.250s འདི་བར་ཤབས་ཀྱི་ཤུལ་ལས་ངོས་སྙོམ་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "%.250s འདི་བར་ཤབས་ཀྱི་ཤུལ་ལས་འགོ་བཙུགས་ནི་འཚོལ་མ་ཙུགས།"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "vsnprintf གི་དོན་ལུ་ ཊི་ཨེམ་པི་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "གནས་ཚད་གནད་སྡུད་ཀྱི་གཞི་རྟེན་ལྡེ་མིག་ཡིག་སྣོད་ ཁ་ཕྱེ་/གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "ཁྱོད་ལུ་ཌི་པི་ཀེ་ཇི་གནས་ཚད་གནད་སྡུད་གཞི་རྟེན་ལྡེ་མིག་རྐྱབས་ནིའི་གནང་བ་མེད།"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "ཌི་པི་ཀེ་ཇི་གནས་ཚད་ཀྱི་གནད་སྡུད་གཞི་རྟེན་ལྡེ་མིག་རྐྱབས་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "ཞུ་བ་འབད་ཡོད་པའི་བཀོལ་སྤྱོད་པ་ལུ་ ལག་ལེན་པ་གཙོ་བོའི་ཁེ་དབང་དགོཔ་ཨིན།"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 "ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་ལུ་འཛུལ་སྤྱོད་འབད་ནིའི་དོན་ལས་བཀོལ་སྤྱོད་པ་ལུ་ ལྷག་/འབྲི་ནི་དགོཔ་ཨིན།"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "ང་རང་བདག་དབང་གི་དུས་མཐུན་ཡིག་སྣོད་ %.255s རྩ་བསྐྲད་གཏང་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr " `%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་པའི་གནས་ཚད་འབྲི་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr " `%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་པའི་གནས་ཚད་ངོས་སྙོམ་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr " `%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་པའི་གནས་ཚད་ཀྱི་དོན་ལུ་ཆུང་ཀུ་བཟོ་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr " `%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་པའི་གནས་ཚད་ཀྱི་དོན་ལུ་ ཨེཕ་མཉམ་འབྱུང་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr " `%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་པའི་གནས་ཚད་ཀྱི་དོན་ལུ་ ཁ་བསྡམ་མ་ཚུགས།"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr " `%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་པའི་གནས་ཚད་ཀྱི་དོན་ལུ་ གཞི་བཙུགས་འབད་མ་ཚུགས།"
@@ -281,93 +287,95 @@
 msgid "unable to open directory '%s'"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "vsnprintf ནང་ ངོས་སྙོམ་མ་ཚུགས།"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr " `%.50s' གི་རྒྱས་བཤད་ཚུ་ `%.250s' ལུ་འབྲི་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "%s བརྡ་དོན་འབྲི་ནིའི་དོན་ལུ་ `%s' ཁ་ཕྱེ་ནི་འཐུས་ཤོར་འབྱུང་ཡོད།"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "གནས་ཚད་ཡིག་སྣོད་གུ་ལུ་གནད་ཁོངས་ནང་གསོག་འཇོག་འབད་ནི་གཞི་སྒྲིག་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "`%.50s' གི་དྲན་ཐོ་ %s སྐོར་ལས་ `%.250s' ལུ་འབྲི་ནི་འཐུས་ཤོར་འབྱུང་ཡོད།"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "%s བརྡ་དོན་འདི་ `%.250s' ལུ་ངོས་སྙོམ་འབད་ནི་ལུ་འཐུས་ཤོར་འབྱུང་ཡོད།"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "%s བརྡ་དོན་འདི་ `%.250s' ལུ་ཨེཕ་མཉམ་འབྱུང་འབད་ནི་འཐུས་ཤོར་འབྱུང་ཡོད།"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr " `%.250s' འདི་ %s བརྡ་དོན་འབྲི་བའི་ཤུལ་ལས་ཁ་བསྡམ་ནི་འཐུས་ཤོར་འབྱུང་ཡོད།"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "%s བརྡ་དོན་གྱི་རྒྱབ་ཐག་གི་དོན་ལུ་ `%.250s' འདི་ `%.250s' ལུ་འབྲེལ་མཐུད་འབད་ནི་ལུ་འཐུས་ཤོར་འབྱུང་"
 "ཡོད།"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 " `%.250s' འདི་ `%.250s' ནང་ན་ %s བརྡ་དོན་ཡོད་མི་སྦེ་གཞི་བཙུགས་འབད་ནི་ལུ་འཐུས་ཤོར་འབྱུང་ཡོད།"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "གཙང་དག་བཟོ་ནིའི་ཐོ་བཀོད་གསརཔ་གི་དོན་ལུ་དྲན་ཚད་ལས་ཕྱི་ཁ།"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -376,32 +384,32 @@
 "%s: གཙང་དག་བཟོ་བའི་སྐབས་འཛོལ་བ:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: འཛོལ་བ་སླར་གསོ་འབད་བའི་སྐབས་འཛོལ་བ་སླ་བསྲེ་བསྲེཝ་ལེ་ཤ !!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "གཙང་དག་བཟོ་ནིའི་ཐོ་བཀོད་གསརཔ་གི་དོན་ལུ་དྲན་ཚད་ལས་ཕྱི་ཁ།"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "སྒྲུབ་རྟགས་ལེ་ཤ་དང་ཅིག་ཁར་གཙང་དག་བཟོ་ནིའི་ཐོ་བཀོད་གསརཔ་གི་དོན་ལུ་དྲན་ཚད་ལས་ཕྱི་ཁར།"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: error closing %s: %s"
 msgid "%s: error: %s\n"
 msgstr "%s: %s ཁ་བསྡམ་ནིའི་འཛོལ་བ: %s"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s:  %s འབྲིཝ་ད་འཛོལ་བ་: %s"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%d: ནང་འཁོད་འཛོལ་བ `%s'\n"
@@ -417,107 +425,107 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "`%.*s' འདི་ %s གི་དོན་ལུ་མི་ཆོག"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "%s གི་ཤུལ་ལས་མཁོ་མེད།"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "ནུས་མེད་ཐུམ་སྒྲིལ་མིང་ (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "ཡིག་སྣོད་སྟོངམ་རྒྱས་བཤད་ས་སྒོ་ `%s'"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "ཡིག་སྣོད་རྒྱས་བཤད་ས་སྒོ་ `%s' གནས་ཚད་ཡིག་སྣོད་ནང་ལུ་མི་ཆོག"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "ཡིག་སྣོད་རྒྱས་བཤད་ཀྱི་ས་སྒོ་ `%s' ནང་ལུ་གནས་གོང་ལེ་ཤ་ (གཞན་མི་ཚུ་ལུ་ག་བསྡུར་རྐྱབས་ད)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "ཡིག་སྣོད་རྒྱས་བཤད་ཀྱི་ས་སྒོ་ `%s' ནང་ལུ་གནས་གོང་ཉུང་སུ་(གཞན་མི་ཚུ་ལུ་ག་བསྡུར་རྐྱབས་ད)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "བུ་ལིན་ས་སྒོ་ནང་ལུ་ཨིན་/མེན།"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "མིང་ཚིག་འདི་ `གཙོ་རིམ' ས་སྒོ་ནང་།"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "འ་ནི་སྐབས་དོན་ནང་ལུ་ `གནས་ཚད་' ས་སྒོ་གི་དོན་ལུ་གནས་གོང་མ་ཆོགཔ་ཨིན། "
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "དང་པ་(དགོ་མི་)མིང་ཚིག་འདི་  `གནས་ཚད་' ས་སྒོ་ནང་།"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "གཉིས་པ་(འཛོལ་བ་)མིང་ཚིག་འདི་ `གནས་ཚད་' ས་སྒོ་ནང་། "
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "གསུམ་པ་(གནས་ཚད་)མིང་ཚིག་འདི་  `གནས་ཚད་' ས་སྒོ་ནང་།"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "འཛོལ་བ་ ཐོན་རིམ་ཡིག་རྒྱུན་ `%.250s': %.250s ནང་།"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "ཕན་མེད་  `བསྐྱར་སྦྱོང་' ཡང་ན་ `ཐུམ་སྒྲིལ་-བསྐྱར་སྦྱོང་' ས་སྒོ་ལག་ལེན་འཐབ་ཡོདཔ།"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "འ་ནི་སྐབས་དོན་ནང་ལུ་ `རིམ་སྒྲིག་-ཐོན་རིམ་' ས་སྒོ་མ་ཆོགཔ་ཨིན།"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "རིམ་སྒྲིག་-ཐོན་རིམ་ཡིག་རྒྱུན་ `%.250s' ནང་འཛོལ་བ: %.250s"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr " `conffiles' གི་དོན་ལུ་གནས་གོང་ལུ་བཟོ་ཉེས་གྱུར་གྱུར་བའི་གྲལ་ཐིག་ `%.*s' ཡོད།"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr " `conffiles' གི་དོན་ལུ་གནས་གོང་ལུ་གྲལ་ཐིག་ བར་སྟོང་-མེདཔ་ `%c' གི་འགོ་བཙུགས་མི་ཡོད།"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "རྩ་བ་ཡང་ན་སྟོང་ཆ་སྣོད་ཐོ་འདི་ ཀཱོནཕ་ཕ་ཡིལ་སྦེ་ཐོ་བཀོད་འབད་ཡོད།"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 "`%s' ས་སྒོ་ ཐུམ་སྒྲིལ་གྱི་མིང་རེ་བ་བསྐྱེད་ཡོད་ས་ལུ་ ཐུམ་སྒྲིལ་མིང་  ཡང་ན་ཕྱགས་ཉིག་ བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "`%s' ས་སྒོ་ ནུས་མེད་ཐུམ་སྒྲིལ་མིང་ `%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -526,7 +534,7 @@
 "`%s' ས་སྒོ་ གཞི་བསྟུན་  `%.255s' ལུ་:\n"
 "བྱང་ཉེས་ཐོན་རིམ་མཐུན་འབྲེལ་ %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -535,7 +543,7 @@
 "`%s' ས་སྒོ་ གཞི་བསྟུན་ `%.255s' ལུ་:\n"
 "`%c' ཕན་མེད་ཨིན། ཚབ་ལུ་ `%c=' ཡང་ན་ `%c%c' ལག་ལེན་འཐབ།"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -544,11 +552,11 @@
 "`%s' ས་སྒོ་ གཞི་བསྟུན་ `%.255s' ལུ་:\n"
 "བསམ་པའི་མཐུན་སྒྲིག་ཏག་ཏག་ཐོན་རིམ་གུ་ལུ། ཚབ་ལུ་ `=' ལག་ལེན་འཐབ་ནི་བསམ་འཆར་བཀོད།"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "ཐོན་རིམ་ཏག་ཏག་ཚུ་རྐྱངམ་ཅིག་ བྱིན་མི་ཚུའི་དོན་ལུ་ལག་ལེན་འཐབ་འོང་།"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -558,58 +566,58 @@
 "ཐོན་རིམ་གནས་གོང་འདི་ ཀ་ཁ་ཨང་ཡིག༌-མེད་མི་དང་ཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན། བར་སྟོང་ཅིག་ཁ་སྐོང་རྐྱབས་ནིའི་"
 "བསམ་འཆར་བཀོད།"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "`%s' ས་སྒོ་ `%.255s' ལུ་གཞི་བསྟུན:ཐོན་རིམ་ནང་ན་ `%c'ཡོད།"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "`%s' ས་སྒོ་ གཞི་བསྟུན་ `%.255s' ལུ་: ཐོན་རིམ་རྩ་གྲོལ་མ་གཏངམ།"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "`%s' ས་སྒོ་ གཞི་བསྟུན་ `%.255s' ལུ་: ཐོན་རིམ་: %.255s ནང་འཛོལ་བ།"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "`%s' ས་སྒོ་ ཐུམ་སྒྲིལ་ `%.255s' ལུ་གཞི་བསྟུན་གྱི་ཤུལ་ལས་ཚིག་སྦྱོར་གྱྀ་འཛོལ་བ།"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "སྤེལ་མ་ (`|') ཚུ་ %s ས་སྒོ་ནང་མི་ཆོག"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 #, fuzzy
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "འ་ནི་སྐབས་དོན་ནང་ལུ་ `རིམ་སྒྲིག་-ཐོན་རིམ་' ས་སྒོ་མ་ཆོགཔ་ཨིན།"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, fuzzy, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "`%s' ས་སྒོ་ ནུས་མེད་ཐུམ་སྒྲིལ་མིང་ `%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 #, fuzzy
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "འ་ནི་སྐབས་དོན་ནང་ལུ་ `གནས་ཚད་' ས་སྒོ་གི་དོན་ལུ་གནས་གོང་མ་ཆོགཔ་ཨིན། "
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, fuzzy, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "གྲལ་ཐིག་ %d གུ་ལུ་ཁྲིམས་འགལ་ཐུམ་སྒྲིལ་མིང་: %.250s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, fuzzy, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག"
@@ -666,7 +674,7 @@
 msgid "unable to write to status fd %d"
 msgstr " `%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་པའི་གནས་ཚད་འབྲི་མ་ཚུགས།"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 msgid "malloc failed (%zu bytes)"
 msgstr "རིའ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོདཔ་ (%ld བཱ་འིཊིསི)"
@@ -676,8 +684,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "རིའ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོདཔ་ (%ld བཱ་འིཊིསི)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 #, fuzzy
 msgid "failed to allocate memory"
 msgstr "སྣོད་ཐོ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
@@ -711,199 +719,205 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "%.250s གི་དོན་ལུ་ ལག་ལེན་འཐབ་ནིའི་-གུ་-ཁ་བསྡམ་ནི་ཟུར་རྟགས་གཞི་སྒྲིག་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "རིམ་སྒྲིག་འཛོལ་བ་: %s ལུ་གནས་གོང་ཅིག་དགོཔ་ཨིན།"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, fuzzy, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "ལྷག་ནིའི་དོན་ལས་རིམ་སྒྲིག་ཡིག་སྣོད་ `%.255s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "མ་ཤེས་པའི་གདམ་ཁ་ `%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "--%s གདམ་ཁ་གིས་གནས་གོང་ཅིག་འབགཔ་ཨིན།"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "--%s གདམ་ཁ་གིས་གནས་གོང་ཅིག་མི་འབག"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ `%.255s' ནང་ལུ་ལྷག་པའི་འཛོལ་བ།"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ `%.255s' ཁ་བསྡམ་ནིའི་འཛོལ་བ།"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ `%.255s' ཁ་བསྡམ་ནིའི་འཛོལ་བ།"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "མ་ཤེས་པའི་འཛོལ་བ --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s གདམ་ཁ་གིས་གནས་གོང་ཅིག་འབགཔ་ཨིན།"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s གདམ་ཁ་གིས་གནས་གོང་ཅིག་མི་འབག"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "མ་ཤེས་པའི་འཛོལ་བ་ -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c གདམ་ཁ་གིས་གནས་གོང་ཅིག་འབགཔ་ཨིན།"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c གདམ་ཁ་གིས་གནས་གོང་ཅིག་མི་འབག"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "ཉེན་བརྡ་:ཕན་མེད་གདམ་ཁ་ `--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "མི་མཐུན་པའི་བྱ་བ་-%c (--%s) and -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "`%s' ས་སྒོའི་དོན་ལུ་གནས་གོང་རྫུན་མ།"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "ལག་ལེན་པ་-ངེས་འཛིན་འབད་ཡོད་པའི་ས་སྒོའི་མིང་ `%.*s' ཐུང་དྲགས།"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "ལག་ལེན་པ་-ངེས་འཛིན་འབད་ཡོད་པའི་ས་སྒོ་ `%.*s' གི་དོན་ལུ་གནས་གོང་རྫུན་མ།"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "འོས་ལྡན་མིན་པའི་གནས་ཚད་དང་ཅིག་ཁར་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་རིམ་སྒྲིག་འབད་ཡོད་པའི་-ཐོན་རིམ།"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "གཞི་བཙུགས་མིན་པའི་གནས་ལུགས་ཀྱི་ཐུམ་སྒྲིལ་འདི་ལུ་ཀཱོན་ཕ་ཡིལ་ཚུ་ཡོད། འདི་ཚུ་བརྗེད་དོ།"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "ལྷག་ནིའི་དོན་ལུ་ ཐུམ་སྒྲིལ་བརྡ་དོན་ཡིག་སྣོད་ `%.255s' ཁ་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "ཐུམ་སྒྲིལ་བརྡ་དོན་ཡིག་སྣོད་ `%.255s' སིཊེཊི་འབད་མི་ཚུགས།"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "ཐུམ་སྒྲིལ་བརྡ་དོན་ཡིག་སྣོད་ `%.255s' ཨེམ་མེཔ་འབད་མི་ཚུགས།"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "ཐུམ་སྒྲིལ་བརྡ་དོན་ཡིག་སྣོད་ `%.255s' སིཊེཊི་འབད་མི་ཚུགས།"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "ལྷག་པའི་ཤུལ་མ་ཁ་བསྡམ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ: `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "ས་སྒོ་མིང་ `%.*s' གི་ཤུལ་མ་ ཨི་ཨོ་ཨེཕ།"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "ས་སྒོ་མིང་ `%.*s' ནང་གྲལ་ཐིག་གསརཔ།"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "ས་སྒོ་མིང་ `%.*s' ནང་ཨེམ་ཨེསི་ཌི་ཨོ་ཨེསི་ ཨི་ཨོ་ཨེཕ་ (^Z)"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "ས་སྒོ་མིང་ `%.*s' འདི་ཀོ་ལཱོན་གྱིས་རྗེས་སུ་འབྲང་དགོ"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 "ས་སྒོ་ `%.*s' གི་གནས་གོང་གི་ཧེ་མ་ཨི་ཨོ་ཨེཕ་(མཐའ་མཇུག་གི་གྲལ་ཐིག་གསརཔ་བརླག་སྟོར་ཞུགས་ཡོདཔ།)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "ས་སྒོ་ `%.*s' གི་གནས་གོང་ནང་ཨེམ་ཨེསི་ཌི་ཨོ་ཨེསི་ ཨི་ཨོ་ཨེཕ་ ཅར།"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "ས་སྒོ་མིང་ `%.*s' ནང་གྲལ་ཐིག་གསརཔ།"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "ས་སྒོ་ `%.*s' གི་གནས་གོང་སྐབས་ཨི་ཨོ་ཨེཕ་(མཐའ་མཇུག་གི་གྲལ་ཐིག་གསརཔ་བརླག་སྟོར་ཞུགས་ཡོདཔ།)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "ཐུམ་སྒྲིལ་གྱི་བརྡ་དོན་ཐོ་བཀོད་ལེ་ཤ་ཅིག་ཐོབ་ཡོད་ གཅིག་རྐྱངམ་ཅིག་འབད་ཆོག"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "ལྷག་པའི་ཤུལ་མ་ཁ་བསྡམ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ: `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "`%.255s' ནང་ཐུམ་སྒྲིལ་གྱི་བརྡ་དོན་མེད།"
@@ -922,66 +936,66 @@
 " %.255s"
 msgstr "%s  ཡིག་སྣོད་ `%.255s' ནང་ གྲལ་ཐིག་ %d གི་རྩ་བ།"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "ཡིག་རྒྱུན་སྟོངམ་མེནམ་འོང་།"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "ཀ་ཁ་ཨང་ཡིག་དང་ཅིག་ཁར་འགོ་བཙུགས་དགོ"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "ཡིག་འབྲུ་ `%c' མི་ཆོག་(ཡིག་གུ་ ཨང་ཡིག་ དང་ཡིག་འབྲུ་ `%s' ཚུ་རྐྱངམ་ཅིག)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<ཅི་མེད>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "ཐོན་རིམ་གྱི་ཡིག་རྒྱུན་འདི་སྟོངམ་ཨིན།"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "ཐོན་རིམ་གྱི་ཡིག་རྒྱུན་འདི་གིས་བར་སྟོང་ཚུ་གནས་འདྲེན་འབད་ཡོདཔ།"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "ཐོན་རིམ་ནང་གི་ཨི་པོཀ་འདི་ཨང་གྲངས་མེན།"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "ཐོན་རིམ་ཨང་ནང་གི་ཀོ་ལཱོན་གྱི་ཤུལ་ལས་ག་ནི་ཡང་མེདཔ།"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "ཐོན་རིམ་ཨང་ནང་གི་ཀོ་ལཱོན་གྱི་ཤུལ་ལས་ག་ནི་ཡང་མེདཔ།"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "ཐོན་རིམ་ཨང་ནང་གི་ཀོ་ལཱོན་གྱི་ཤུལ་ལས་ག་ནི་ཡང་མེདཔ།"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "%s བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "%s གི་དོན་ལུ་གནས་གོང་སྟོངམ།"
@@ -1000,51 +1014,51 @@
 msgid "(no description available)"
 msgstr "(འགྲེལ་བཤད་འཐོབ་ཚུགསཔ་མེད་)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "ཡིག་ཚུགས་གཡོག་མ་བཀོལ་བའི་ཧེ་མ་བརྡ་རྟགས་ %s སྣང་མེད་བཞག་མ་ཚུགས།"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "%s: %s བརྡ་རྟགས་མ་བཟུང་པར་བཞག་ནིའི་འཛོལ་བ།\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (ལས་སྦྱོར་ཡན་ལག): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "ཁ་སྤེལ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "ལས་སྦྱོར་ཡན་ལག་ %s སླར་ལོག་ཡོད་པའི་འཛོལ་བ་ གནས་ཚད་ %d ཕྱིར་ཐོན་འབདཝ་ཨིན།"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "%s གི་དོན་ལུ་བསྒུག་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "ལས་སྦྱོར་ཡན་ལག་ %s འདི་བརྡ་རྟགས་ (%s)%s གིས་གསད་ཡོདཔ།"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", ནང་རྙིང་བཀོག་བཞག་ཡོདཔ།"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "ལས་སྦྱོར་ཡན་ལག་ %s འདི་བསྒུག་ནིའི་གནས་ཚད་ཨང་རྟགས་ %d དང་ཅིག་ཁར་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "%s གི་དོན་ལུ་བསྒུག་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
@@ -1064,197 +1078,203 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, fuzzy, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 msgid "triggers area"
 msgstr "ཁ་བསྡམ་མ་ཚུགས་ %s: %s"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, fuzzy, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "གཞན་མི་ཡིག་སྣོད་གསརཔ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, fuzzy, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, fuzzy, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "དོས་ཁང་ཡིག་སྣོད་གསརཔ་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, fuzzy, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "ཡིག་སྣོད་ %.255s ལས་ %s ལྷགཔ་ད་འཛོལ་བ།"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, fuzzy, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "དོས་ཁང་ཡིག་སྣོད་གསརཔ་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, fuzzy, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "དོས་ཁང་ཡིག་སྣོད་གསརཔ་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, fuzzy, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "`%.255s' གི་ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, fuzzy, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "དོས་ཁང་ཡིག་སྣོད་གསརཔ་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, fuzzy, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "ཡན་ལག་ཡིག་སྣོད་ `%.250s' ལྷག་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:419
-#, fuzzy, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "གཞན་མི་ཡིག་སྣོད་གསརཔ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, fuzzy, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "གཞན་མི་ཡིག་སྣོད་གསརཔ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "གཞན་མི་ཡིག་སྣོད་གསརཔ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "གཞན་མི་ཡིག་སྣོད་གསརཔ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
+msgstr "`%.255s' གི་ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
+
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "`%.250s' རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
+
+#: lib/dpkg/triglib.c:360
+#, fuzzy, c-format
+msgid "unable to create new trigger interest file `%.250s'"
 msgstr "གཞན་མི་ཡིག་སྣོད་གསརཔ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:383
 #, fuzzy, c-format
-msgid "unable to install new trigger interest file `%.250s'"
-msgstr "`%.255s' གི་ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "གཞན་མི་ཡིག་སྣོད་གསརཔ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:456
 #, fuzzy, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr "བརྡ་དོན་ཡིག་སྣོད་ `%.250s' འདི་ `%.250s' སྦེ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, fuzzy, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "དོས་ཁང་ཡིག་སྣོད་གསརཔ་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, fuzzy, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "དོས་ཁང་ཡིག་སྣོད་གསརཔ་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "དོས་ཁང་ཡིག་སྣོད་གསརཔ་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "དོས་ཁང་ཡིག་སྣོད་གསརཔ་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "དོས་ཁང་ཡིག་སྣོད་གསརཔ་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, fuzzy, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "བརྡ་དོན་ཡིག་སྣོད་ `%.250s' འདི་ `%.250s' སྦེ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, fuzzy, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "ཡན་ལག་ཡིག་སྣོད་ `%.250s' ལྷག་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, fuzzy, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ `%.255s' ནང་ལུ་ལྷག་པའི་འཛོལ་བ།"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, fuzzy, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, fuzzy, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "དོས་ཁང་སྣོད་ཐོ་ `%.250s' ལྷག་མ་ཚུགས།"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, fuzzy, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "དོས་ཁང་སྣོད་ཐོ་ `%.250s' ལྷག་མ་ཚུགས།"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, fuzzy, c-format
 msgid "read error in `%.250s'"
@@ -1280,7 +1300,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "dpkg-deb རྒྱུད་དུང་ལས་ལྷག་ནི་འཛོལ་བ།"
 
@@ -1299,12 +1319,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "བརྡ་མཚོན་འབྲེལ་ལམ་ `%.255s' གི་བདག་པོ་གཞི་སྒྲིག་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "`%.255s' གི་བདག་པོ་གཞི་སྒྲིག་གི་འཛོལ་བ།"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "`%.255s' གི་གནང་བ་གཞི་སྒྲིག་གི་འཛོལ་བ།"
@@ -1363,17 +1383,27 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "ཡིག་མཛོད་ཀྱི་ནང་ན་དངོས་པོ་ `%.255s' མ་ཤེས་པའི་དབྱེ་བ་ 0x%x འདུག"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat file '%s'"
+msgstr "མིང་རྙིངམ་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས: %s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "ཐུམ་སྒྲིལ་ %s རྙིངམ་ནང་ལུ་ཡིག་སྣོད་ཚུ་ཚབ་བཙུགས་དོ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ %s ནང་ལུ་ཡིག་སྣོད་ཀྱིས་ཚབ་བཙུགས་ཡོད...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1382,92 +1412,97 @@
 "སྣོད་ཐོ་མིན་པ་དང་ཅིག་ཁར་ ཐུམ་སྒྲིལ་ %.250s ནང་ལུ་སྣོད་ཐོ་ `%.250s' ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་"
 "བསྐྱེད་དོ།"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "ཐུམ་སྒྲིལ་ %.250s ནང་ལུ་ཡང་ཡོད་མི་  `%.250s' ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "`%.255s' ལྷག་ནི་ལུ་འཐུས་ཤོར་འབྱུང་ཡོད་(`%.255s' ནང་ལུ་)"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "`%.255s' སྐབས་ dpkg-deb རྒྱབ་མཐའ་འབད།"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "`%.255s' ཁ་བསྡམ་ནི་/འབྲི་ནིའི་འཛོལ་བ།"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "རྒྱུད་དུང་ `%.255s' གསར་བསྐུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "ཐབས་འཕྲུལ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "ཧརཌི་ལིངཀ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "བརྡ་མཚོན་འབྲེལ་ལམ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "སྣོད་ཐོ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་ནིའི་དོན་ལས་  `%.255s' ཟུར་ཁ་བཤུད་མ་ཚུགས།"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "འབྲེལ་ལམ་ `%.255s' ལྷག་མ་ཚུགས།"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "`%.255s' གི་དོན་ལུ་རྒྱབ་ཐག་བརྡ་མཚོན་འབྲེལ་ལམ་བཟོ་མ་ཚུགས།"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "`%.255s' གི་དོན་ལུ་རྒྱབ་ཐག་བརྡ་མཚོན་འབྲེལ་ལམ་ཅའུན་འབད་མ་ཚུགས།"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་མ་འབད་བའི་ཧེ་མ་ `%.255s' གི་རྒྱབ་ཐག་འབྲེལ་ལམ་བཟོ་མ་ཚུགས།"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "`%.255s' གི་ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "`%.255s' གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "`%.255s' གནས་ཁོངས་མིན་པ་བཟོ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1476,7 +1511,7 @@
 "dpkg: ཉེན་བརྡ་ - %s གི་རྩ་བསྐྲད་དང་ཅིག་ཁར་རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་སྣང་མེད་བཞགཔ་ད:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, fuzzy, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1485,7 +1520,7 @@
 "dpkg: ཉེན་བརྡ་ - ཁག་ཆེ་བའི་ཐུམ་སྒྲིལ་ %s གི་རིམ་སྒྲིག་མི་འབད་ནི་ཆ་འཇོག་འབདཝ་དོ་\n"
 " %s རྩབསྐྲད་གཏང་ནི་ལྕོགས་ཅན་བཟོ་ནིའི་དོན་ལས།\n"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1494,7 +1529,7 @@
 "dpkg: མེད། %s འདི་ཁག་ཆེཝ་ཨིན། འདི་རིམ་སྒྲིག་འབད་འོང་\n"
 "  %s རྩབསྐྲད་གཏང་ནི་ལྕོགས་ཅན་བཟོ་ནིའི་དོན་ལས།\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1503,28 +1538,28 @@
 "dpkg: མེད། %s རྩ་བསྐྲད་གཏང་མི་ཚུགས་ (--auto-deconfigure གི་གྲོགས་རམ་འབད་འོང་):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, fuzzy, c-format
 msgid "removal of %.250s"
 msgstr "%.250s ནང་ལྷག་པའི་འཛོལ་བ།"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, fuzzy, c-format
 msgid "installation of %.250s"
 msgstr "`%.255s' གི་ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, fuzzy, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: %s གི་དོན་ལུ་ %s རྩ་བསྐྲད་གཏང་ནི་ཆ་འཇོག་འབད་དོ་ ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, fuzzy, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: ཨིན།  %sགི་དོན་ལུ་ %sརྩ་བསྐྲད་གཏང་འོང་།\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1533,40 +1568,40 @@
 "dpkg:  %s ནང་ན་ %s ཡོད་མི་གི་སྐོར་ལས་:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 #, fuzzy
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "dpkg: ཉེན་བརྡ་ - མི་མཐུན་པ་སྣང་མེད་བཞག་དོ། ག་དེ་སྦེ་རུང་འཕྲོ་མཐུད་འོང་ !\n"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: %s གི་དོན་ལུ་ %s རྩ་བསྐྲད་གཏང་ནི་ཆ་འཇོག་འབད་དོ་ ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s འདི་ལེ་ཤོམ་སྦེ་གཞི་བཙུགས་མ་འབད་བས་ - འདི་གུའི་རྟེན་འབྲེལ་ག་ཅི་འབད་རུང་སྣང་མེད་བཞག་དོ།\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: འདི་གིས་ %s བྱིནམ་ལས་ %s རྩ་བསྐྲད་གཏང་ནི་ལུ་དཀའ་ངལ་ཡོདཔ་འོང་ ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1575,108 +1610,110 @@
 "dpkg: ཐུམ་སྒྲིལ་ %s ལུ་ལོག་གཞི་བཙུགས་འབད་ནི་དགོཔ་ཨིན་ དེ་འབདཝ་ད་ཁྱོད་ཀྱིས་ཞུ་བ་འབད་དོ་བཟུམ་སྦེ་རྩ་"
 "བསྐྲད་གཏང་།\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: ཐུམ་སྒྲིལ་ %s ལུ་དགོཔ་ཨིན་ རྩ་བསྐྲད་མི་གཏང་།\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: ཨིན།  %sགི་དོན་ལུ་ %sརྩ་བསྐྲད་གཏང་འོང་།\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "མི་མུན་པའི་ཐུམ་སྒྲིལ་ཚུ་ -  %.250s གཞི་བཙུགས་མི་འབད།"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 #, fuzzy
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "dpkg: ཉེན་བརྡ་ - མི་མཐུན་པ་སྣང་མེད་བཞག་དོ། ག་དེ་སྦེ་རུང་འཕྲོ་མཐུད་འོང་ !\n"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive ལུ་ཉུང་མཐའ་འགྲུལ་ལམ་སྒྲུབ་རྟགས་གཅིག་དགོ"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "--recursive གི་དོན་ལུ་འཚོལ་ནི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "འཚོལ་ནིའི་རྒྱུད་དུང་ཨེཕ་ཌི་ཨོ་པཱན་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "འཚོལ་ནིའི་རྒྱུད་དུང་ལྷག་ནིའི་འཛོལ་བ།"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "འཚོལ་ནིའི་རྒྱུད་དུང་ཁ་བསྡམ་ནིའི་འཛོལ་བ།"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "--recursive གི་དོན་ལུ་འཚོལ་ནི་གིས་ལེགས་སྐྱོང་མ་འཐབ་པའི་འཛོལ་བ་ %i སླར་ལོག་འབད་ནུག"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "འཚོལ་ཞིབ་འབད་ཡོད་ དེ་འབདཝ་ད་ཐུམ་སྒྲིག་ཚུ་འཚོལ་མ་འཐོབ་(*.deb མཐུན་མི་ཡིག་སྣོད་ཚུ་)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s ལུ་ཉུང་མཐའ་ཐུམ་སྒྲིལ་ཡིག་མཛོད་ཡིག་སྣོད་ཀྱི་སྒྲུབ་རྟགས་གཅིག་དགོཔ་ཨིན།"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "ཧེ་མ་སེལ་འཐུ་མ་འབད་བའི་ཐུམ་སྒྲིལ་ %s སེལ་འཐུ་འབད་དོ།\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "སེལ་འཐུ་མ་འབད་བའི་ཐུམ་སྒྲིལ་ %s གོམ་འགྱོ་དོ།\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "%.250s གི་ཐོན་རིམ་ %.250s ཧེ་མ་ལས་རང་ཡོད་ གོམ་འགྱོ་དོ།\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s - ཉེན་བརྡ་:  %.250s འདི་  %.250s ལས་ %.250s ལུ་མར་སྐྱེད་འབད་དོ།\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "%.250s འདི་ཐོན་རིམ་ %.250s ལས་ %.250s ལུ་མར་སྐྱེད་མི་འབད་ གོམ་འགྱོ་དོ།\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1685,39 +1722,39 @@
 "གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད་པའི་ `%.250s' ཐོན་རིམ་འདི་རྒྱབ་ཐག་འདྲ་བཤུས་ཀྱི་ལོག་གཞི་བཙུགས་འབད་ནི་"
 "རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "`%.250s' གི་རྒྱབ་ཐག་ཐོན་རིམ་སོར་ཆུད་འབད་མི་ཚུགས།"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "`%.250s' གི་རྒྱབ་ཐག་ཐོན་རིམ་སོར་ཆུད་འབད་མི་ཚུགས།"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "`%.250s' གི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་འབད་བའི་ཐོན་རིམ་རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "`%.250s' གི་ཐོན་རིམ་གསརཔ་སྦེ་ཕྱིར་ཐོན་འབད་འབད་བའི་ཐོན་རིམ་རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "བགོ་བཀྲམ་རིམ་སྒྲིག་ཡིག་སྣོད་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད་པའི་རིམ་སྒྲིག་ཡིག་སྣོད་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1728,62 +1765,62 @@
 "རིམ་སྒྲིག་ཡིག་སྣོད་ `%s' རིམ་ལུགས་གུ་ལུ་མེད།\n"
 "ཁྱོད་ཀྱིས་ཞུ་བ་འབད་དོ་བཟུམ་སྦེ་རིམ་སྒྲིག་ཡིག་སྣོད་གསརཔ་གཞི་བཙུགས་འབད་དོ།\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "dpkg: %s: ཉེན་བརྡ་ -  `%.250s' རྒྱབ་ཐག་རྙིངམ་རྩ་བསྐྲད་གཏང་ནི་འཐུས་ཤོར་བྱུང་ཡོད་: %s\n"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 "dpkg: %s: ཉེན་བརྡ་ -  `%.250s' འདི་ `%.250s' ལུ་བསྐྱར་མིང་བཏགས་ནི་འཐུས་ཤོར་བྱུང་ཡོད་: %s\n"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s:ལག་ལེན་འཐབ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ  '%s %s'"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 "dpkg: %s: ཉེན་བརྡ་ - བགོ་བཀྲམ་ཐོན་རིམ་ `%.250s' རྙིངམ་རྩ་བསྐྲད་གཏང་ནི་འཐུས་ཤོར་བྱུང་ཡོད་: %s\n"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 "dpkg: %s: ཉེན་བརྡ་ -  `%.250s' (སླར་སྲུང་མ་འབད་བའི་ཧེ་མ་)རྩ་བསྐྲད་གཏང་ནི་འཐུས་ཤོར་བྱུང་ཡོད་: "
 "%s\n"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr ""
 "dpkg: %s: ཉེན་བརྡ་ -  `%.250s' འདི་ `%.250s' ལུ་འབྲེལ་མཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད་: %s\n"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ %s གི་ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་དོ་...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "`%.250s' འདི་ `%.250s' སྦེ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "`%s' སྦེ་མིང་བཏགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ག་ནི་ཡང་གཞི་བཙུགས་མ་འབད་ རིམ་སྒྲིག་འབད་མི་ཚུགས།"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "ཐུམ་སྒྲིལ་ %.250s འདི་ཧེ་མ་ལས་གཞི་བཙུགས་དང་རིམ་སྒྲིག་འབད་ཡོདཔ་ཨིན།"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1792,7 +1829,7 @@
 "ཐུམ་སྒྲིལ་ %.250s འདི་རིམ་སྒྲིག་གི་དོན་ལུ་གྲ་སྒྲིག་མེད།\n"
 " རིམ་སྒྲིག་འབད་མི་ཚུགས་(ད་ལྟའི་གནས་ཚད་ `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1801,11 +1838,11 @@
 "dpkg: རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་གྱིས་ %s གི་རིམ་སྒྲིག་སྔོན་བཀག་འབདཝ་ཨིན།:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་ཚུ་ - རིམ་སྒྲིག་མ་འབད་བར་བཞག་དོ།"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1814,7 +1851,7 @@
 "dpkg: %s: རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་ཚུ་ དེ་འབདཝ་ད་ ཁྱོད་ཀྱིས་ཞུ་བ་འབད་དོ་བཟུམ་སྦེ་རིམ་སྒྲིག་འབད་དོ་:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1822,12 +1859,12 @@
 "ཐུམ་སྒྲིལ་འདི་གནམ་མེད་ས་མེད་རིམ་མཐུན་མེད་པའི་གནས་ལུགས་ནང་ལུ་ཨིན་མས་ - ཁྱོད་ཀྱིས་\n"
 " རིམ་སྒྲིག་འབད་ནིའི་དཔའ་མ་བཅམ་པའི་ཧེ་མ་ལོག་འགོ་བཙུགས་དགོ"
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "%s (%s) གཞི་སྒྲིག་འབད་དོ་...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, fuzzy, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1836,7 +1873,7 @@
 "dpkg: %s: ཉེན་བརྡ་ - རིམ་སྒྲིག་ཡིག་སྣོད་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས།\n"
 " (= `%s'): %s\n"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, fuzzy, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1845,7 +1882,7 @@
 "dpkg: %s: ཉེན་བརྡ་ - རིམ་སྒྲིག་ཡིག་སྣོད་ `%s' འདི་ཐད་སྒོརམ་འབྲེལ་ལམ་ཅིག་ཨིན་\n"
 " (= `%s')\n"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, fuzzy, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1854,7 +1891,7 @@
 "dpkg: %s: ཉེན་བརྡ་ - རིམ་སྒྲིག་ཡིག་སྣོད་ `%s' ལྷག་ནིའི་འབྲེལ་ལམ་ཟབོ་མ་ཚུགས།\n"
 " (= `%s'): %s\n"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, fuzzy, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1864,35 +1901,35 @@
 "འབདཝ་ཨིན།\n"
 " (`%s' འདི་  `%s' ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཨིན་)\n"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, fuzzy, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "dpkg: %s: ཉེན་བརྡ་ - རིམ་སྒྲིག་ཡིག་སྣོད་ `%.250s' འདི་ཉག་རྐྱང་ཡིག་སྣོད་ཡང་ན་བརྡ་དོན་ (= `%s')"
 "ཨིན།\n"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "ཨེམ་ཌི་༥དྲྭ་རྟགས།"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "dpkg: %s: ཉེན་བརྡ་ - དྲྭ་རྟགས་ ཀྱི་དོན་ལུ་རིམ་སྒྲིག་ཡིག་སྣོད་ %s ཁ་ཕྱེ་མ་ཚུགས: %s\n"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "ཁྱོད་འབད་ཚར་བའི་སྐབས་ `exit' ཡིག་དཔར་རྐྱབས།\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1901,12 +1938,12 @@
 "\n"
 "རིམ་སྒྲིག་ཡིག་སྣོད་ `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (ངོ་མ་འབད་བ་ཅིན་ `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1917,7 +1954,7 @@
 " ==> ཡིག་སྣོད་གུའི་རིམ་ལུགས་འདི་ཁྱོད་ཀྱིས་ཡང་ན་ཡིག་ཚུགས་ཀྱིས་གསར་བསྐྲུན་འབད་ཡོད།\n"
 " ==> ཡིག་སྣོད་ཡང་ཐུམ་སྒྲིལ་འཛིན་སྐྱོང་པ་གིས་ཐུམ་སྒྲིལ་བྱིན་ཡོདཔ།\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1926,7 +1963,7 @@
 "\n"
 "     གཞི་བཙུགས་འབད་ཞིནམ་ལས་ལེགས་བཅོས་མ་འབད་བས།\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1935,7 +1972,7 @@
 "\n"
 " ==> (ཁྱོད་ཀྱིས་ཡང་ན་ཡིག་ཚུགས་ཀྱིས་)གཞི་བཙུགས་སྐབས་ལས་ལེགས་བཅོས་འབད་ཡོད།\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1944,37 +1981,37 @@
 "\n"
 " ==> (ཁྱོད་ཀྱིས་ཡང་ན་ཡིག་ཚུགས་གཅིག་གིས་)གཞི་བཙུགས་སྐབས་ལས་བཏོན་གཏང་ཡོདཔ།\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> ཐུམ་སྒྲིལ་བགོ་འགྲེམ་པ་གིས་དུས་མཐུན་བཟོ་ཡོད་པའི་ཐོན་རིམ་ཅིག་སྐྱེལ་འདྲེན་འབད་ནུག\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     ཐུམ་སྒྲིལ་ནང་གི་ཐོན་རིམ་འདི་མཇུག་ལུ་གཞི་བཙུགས་འབད་ཡོད་མི་དང་གཅིག་པ་ཨིན།\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> ཁྱོད་ཀྱི་ཞུ་བ་འབད་དོ་བཟུམ་སྦེ་ཡིག་སྣོད་གསརཔ་ལག་ལེན་འཐབ་དོ།\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> ཁྱོད་ཀྱི་ཞུ་བ་འབད་དོ་བཟུམ་སྦེ་ ད་ལྟོའི་ཡིག་སྣོད་རྙིངམ་ལག་ལེན་འཐབ་དོ།\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> རིམ་སྒྲིག་ཡིག་སྣོད་རྙིངམ་འདི་སྔོན་སྒྲིག་སྦེ་བཞག་དོ།\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> རིམ་སྒྲིག་ཡིག་སྣོད་འདི་སྔོན་སྒྲིག་སྦེ་ལག་ལེན་འཐབ་དོ།\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1989,165 +2026,166 @@
 "      D     : ཐོན་རིམ་ཚུའི་བར་གྱི་ཁྱད་པར་ཚུ་སྟོན།\n"
 "      Z     : དུས་སྐབས་འདི་བརྟག་དཔྱད་འབད་ནིའི་དོན་ལས་ལས་སྦྱོར་འདི་རྒྱབ་གཞི་བཟོ།\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr "སྔོན་སྒྲིག་གི་བྱ་བ་འདི་ཁྱོད་ཀྱི་ད་ལྟོའི་ཐོན་རིམ་བཞག་ནི་འདི་ཨིན།\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr "སྔོན་སྒྲིག་གི་བྱ་བ་འདི་ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་ནི་འདི་ཨིན།\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[སྔོན་སྒྲིག་=ཨེན་]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[སྔོན་སྒྲིག་=ཝའི]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[སྔོན་སྒྲིག་མེད]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "ཨེསི་ཊི་ཌི་ཨི་ཨར་ཨར་ལུ་འབྲིཝ་ད་འཛོལ་བ། རིམ་སྒྲིག་ཡིག་སྣོད་ནུས་སྤེལ་གྱི་ཧེ་མ་གསར་རྙེད་འབད་ཡོདཔ།"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ནུས་སྤེལ་ལུ་ཨེསི་ཊི་ཌི་ཨིན་གུ་ལྷག་པའི་འཛོལ་བ།"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ནུས་སྤེལ་ལུའི་ཨེསི་ཊི་ཌི་ཨིན་གུ་ཨི་ཨོ་ཨེཕ།"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s ལུ་རྟེནམ་ཨིན %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s ལུ་གུ་སྔོན་-རྟེནམ་ཨིན %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%sའོས་སྦྱོར་འབདཝ་ཨིན %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s བསམ་འཆར་བཀོདཔ་ཨིན %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s བར་མཚམས་ཚུ %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s དང་གཅིག་ཁར་མི་མཐུནམ་ཨིན %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr " %s གོང་སྤེལ་ཚུ %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s འདི་རྩ་བསྐྲད་གཏང་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s འདི་རིམ་སྒྲིག་མ་འབད་བར་བཞག་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s འདི་གཞི་བཙུགས་འབད་དགོཔ་ཨིན་། དེ་འབདཝ་ད་འདི་ཐོན་རིམ་ %.250s ཨིན།\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s འདི་བཤུབ་ཡོད། དེ་འབདཝ་ད་འདི་ཐོན་རིམ་ %.250s ཨིན།\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s འདི་བཤུབ་ཡོད། དེ་འབདཝ་ད་འདི་ནམ་ཡང་རིམ་སྒྲིག་མ་འབད་བས།\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s འདི་བཤུབ་ཡོད། དེ་འབདཝ་ད་འདི་ཐོན་རིམ་ %.250s ཨིན།\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s གིས་མཐའ་མཇུག་རིམ་སྒྲིག་འབད་མི་ཐོན་རིམ་འདི་ %.250s ཨིན།\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s འདི་ %s ཨིན།\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s གིས་ %.250s བྱིནམ་ཨིན་ དེ་འབདཝ་ད་འདི་རྩ་བསྐྲད་གཏང་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s གིས་ %.250s བྱིནམ་ཨིན་ དེ་འབདཝ་ད་འདི་རིམ་སྒྲིག་མ་འབད་བར་བཞག་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s གིས་ %.250s བྱིནམ་ཨིན་ དེ་འབདཝ་ད་འདི་ %s ཨིན།\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s འདི་གཞུ་བཙུགས་མ་འབད་བས།\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (ཐོན་རིམ་ %.250s) འདི་གཞི་བཙུགས་འབད་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, fuzzy, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (ཐོན་རིམ་ %.250s) འདི་ %sཨིན།\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s གིས་   %.250s བྱིནམ་ཨིན་ དེ་ལས་འདི་གཞི་བཙུགས་འབད་དགོ་ཨིན།\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, fuzzy, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "%.250s གིས་ %.250s བྱིནམ་ཨིན་ དེ་ལས་འདི་ %s ཨིན།\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+msgid "Use --help for help about diverting files."
+msgstr "དབྱེ་བ་ ཌི་པི་ཀེ་ཇི་-བཤག་ --གྲོགས་རམ་གྱི་དོན་ལུ་གྲོགས་རམ།"
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "ཌེ་བི་ཡཱན་ %s ཐོན་རིམ་ %s\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2162,8 +2200,8 @@
 "འདྲ་བཤུས་དབང་ཆ་ (C) ༡༩༩༥ ཨི་ཡན་ ཇེཀ་ཤན།\n"
 "འདྲ་བཤུས་དབང་ཆ་ (C) ༢༠༠༠ ༢༠༠༡ ཝི་ཅརཊི་ ཨཀ་ཀར་མཱན།"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2174,7 +2212,7 @@
 "འ་ནི་འདི་རང་དབང་མཉེན་ཆས་ཨིན། ཇི་ཨེན་ཡུ་ ཡོངས་ཁྱབ་མི་མང་ཆོག་ཐམ་ཐོན་རིམ་ ༢ ཡང་ན་\n"
 "ཤུལ་མམ་འདི་ གནས་སྟངས་ཚུ་འདྲ་བཤུས་རྐྱབས་ནིའི་དོན་ལུ་ བལྟ། ཉེན་ལེན་ག་ནི་ཡང་མེད།\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2184,7 +2222,7 @@
 "ལག་ལེན་: %s [<option> ...] <command>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2196,7 +2234,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -2240,7 +2278,7 @@
 "ཐུམ་སྒྲིལ་ པི་རིནསིཊི་/པོསི་ཊིརམ་ ཡིག་ཚུགས་ཚུ་གིས་ཨ་རྟག་རང་ --ཐུམ་སྒྲིལ་དང་ and --ཁ་ཕྱོགས་སྒྱུར་བ་ "
 "གསལ་བཀོད་འབད་དགོ།\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2249,19 +2287,13 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat file '%s'"
-msgstr "མིང་རྙིངམ་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས: %s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error checking `%s': %s"
 msgid "error checking '%s'"
 msgstr "`%s' ཞིབ་དཔྱད་འབད་ནིའི་འཛོལ་བ: %s"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2270,140 +2302,140 @@
 "བསྐྱར་མིང་བཏགས་ནི་འདི་ `%s' \n"
 "  ཡིག་སྣོད་ `%s' སོ་སོ་དང་དང་ཅིག་ཁར་ཚབ་སྲུང་འབད་ནི་དང་འབྲེལ་བ་འབདཝ་ཨིན། འབད་མི་ཆོག"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "cannot stat new name `%s': %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "མིང་གསརཔ་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས: %s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 #| msgid "rename: remove duplicate old link `%s': %s"
 msgid "rename: remove duplicate old link '%s'"
 msgstr "བསྐྱར་མིང་བཏགས་: འབྲེལ་ལམ་ `%s' རྙིངམ་རྫུན་མ་རྩ་བསྐྲད་གཏང་: %s"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 msgid "local diversion of %s"
 msgstr "ཉེ་གནས་སྦེ་ : %s ལུ་ཁ་ཕྱོགས་སྒྱུར་ཡོད།\n"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 msgid "local diversion of %s to %s"
 msgstr "ཉེ་གནས་སྦེ་ : %s ལུ་ཁ་ཕྱོགས་སྒྱུར་ཡོད།\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "diversion of %s by %s"
 msgstr "%s གིས་ཁ་སྒྱུར།"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "%s གིས་ : %s ལུ་ཁ་ཕྱོགས་སྒྱུར་ཡོདཔ་\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "any diversion of %s"
 msgstr "%s གིས་ཁ་སྒྱུར།"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 msgid "any diversion of %s to %s"
 msgstr "%s གིས་ : %s ལུ་ཁ་ཕྱོགས་སྒྱུར་ཡོདཔ་\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "cannot open GPL file"
 msgid "cannot create new %s file"
 msgstr "ཇི་པི་ཨེལ་ཡིག་སྣོད་ཁ་ཕྱེ་མི་ཚུགས།"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "vsnprintf ནང་ ངོས་སྙོམ་མ་ཚུགས།"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 #| msgid "remove old diversions-old: %s"
 msgid "error removing old diversions-old"
 msgstr "ཁ་སྒྱུར་རྙིངམ་-རྙིངམ་ རྩ་བསྐྲད་གཏང་: %s"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་-རྙིངམ་ གསརཔ་གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ་: %s"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་གསརཔ་གཞི་བཙུགས་འབདཝ་ད་འཛོལ་བ་: %s"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s་ལུ་སྒྲུབ་རྟགས་རྐྱང་པ་ཅིག་དགོཔ་འདུག"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "ཡིག་སྣོད་མིང་ \"%s\" འདི་ཡང་དག་མེན།"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "ཡིག་སྣོད་ཚུ་ནང་གྲལ་ཐིག་གསརཔ་ཚུ་མེདཔ་འོང་།"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "སྣོད་ཐོ་ཚུ་ཁ་ཕྱོགས་སྒྱུར་མི་ཚུགས།"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "སྣོད་ཐོ་ཚུ་ཁ་ཕྱོགས་སྒྱུར་མི་ཚུགས།"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "`%s' བཀོག་བཞག་དོ།"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' འདི་ `%s' དང་ཅིག་ཁར་རྡབ་འཁྲུག་བྱུངམ་ཨིན།"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "`%s' ཁ་སྐོང་རྐྱབས་དོ།"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
 msgstr "ཁ་སྒྱུར་ `%s' མེད། གཅིག་ཡང་རྩ་བསྐྲད་མ་གཏང་།"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2414,7 +2446,7 @@
 "   `%s'རྩ་བསྐྲད་གཏང་པའི་སྐབས་\n"
 "   `%s' འཐོབ་ཡོད།"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2425,17 +2457,17 @@
 "  `%s' རྩ་བསྐྲད་གཏང་པའི་སྐབས་\n"
 "  `%s' འཐོབ་ཡོད།"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "`%s' རྩ་བསྐྲད་གཏང་དོ།"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "ཐུམ་སྒྲིལ་ལུ་གྲལ་ཐིག་གསརཔ་མེདཔ་འོང་།"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "ལུ་-ཁ་ཕྱོགས་སྒྱུར་བ་འདི་ནང་ལུ་གྲལ་ཐིག་གསརཔ་ཚུ་མེདཔ་འོང་།"
 
@@ -2514,8 +2546,8 @@
 msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s གི་སྒྲུབ་རྟགས་གཅིག་ཡང་མི་འབག"
@@ -2607,7 +2639,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions བྱང་ཉེས་མཐུན་འབྲེལ།"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "ཐོན་རིམ་ ཨེ་ ལུ་ཚིག་སྦྱོར་བྱང་ཉེས་འདུག་: %s\n"
@@ -2666,12 +2698,12 @@
 "ནུག:\n"
 " "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, fuzzy, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2680,37 +2712,37 @@
 "dpkg: འཚུབ་ཅན་ཉེན་བརྡ་: ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་བརླག་སྟོར་ཞུགས་"
 "ནུག་ ཐུམ་སྒྲིལ་ལུ་ད་ལྟོ་གཞི་བཙུགས་འབད་མི་ཡིག་སྣོད་ཚུ་མེདཔ་སྦེ་ཚོད་དཔག་སྟེ།\n"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, fuzzy, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་བསྡམ་ད་འཛོལ་བ།"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(གནད་སྡུད་གཞི་རྟེན་ལྷག་དོ་..."
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2718,34 +2750,34 @@
 msgstr[0] "%d ཡིག་སྣོད་ཚུ་དང་སྣོད་ཐོ་ཚུ་ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད།)\n"
 msgstr[1] "%d ཡིག་སྣོད་ཚུ་དང་སྣོད་ཐོ་ཚུ་ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད།)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 "ཐུམ་སྒྲིལ་ %s གི་དོན་ལུ་དུས་མཐུན་བཟོ་ཡོད་པའི་ཐོ་ཡིག་ཡིག་སྣོད་གསར་བསྐྲུན་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "ཐུམ་སྒྲིལ་ %s གི་དོན་ལུ་དུས་མཐུན་བཟོ་ཡོད་པའི་ཐོ་ཡིག་ཡིག་སྣོད་ལུ་འབྲི་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "ཐུམ་སྒྲིལ་ %s གི་དོན་ལུ་དུས་མཐུན་བཟོ་ཡོད་པའི་ཐོ་ཡིག་ཡིག་སྣོད་ བཤལ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 "ཐུམ་སྒྲིལ་ %s གི་དོན་ལུ་དུས་མཐུན་བཟོ་ཡོད་པའི་ཐོ་ཡིག་ཡིག་སྣོད་ མཉམ་བྱུང་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "ཐུམ་སྒྲིལ་ %s གི་དོན་ལུ་དུས་མཐུན་བཟོ་ཡོད་པའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་བསྡམ་ནི་ལུ་འཐུས་ཤོརབྱུང་ཡོད།"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2787,7 +2819,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "dpkg - འཛོལ་བ: འགྲུལ་ལམ་འདི་གཞི་སྒྲིག་མ་འབད་བས།\n"
 
 #: src/help.c:129
@@ -2819,7 +2851,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "vsnprintf སི་ཊེཊི་འབད་མ་ཚུགས།"
@@ -2830,66 +2862,66 @@
 msgstr "`%.250s' ལུ་སི་ཨེཆ་རུཊི་ འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "`%.255s' ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "`%.250s' གུ་ལུ་ལག་ལེན་འཐབ་པའི་གནང་བ་གཞི་སྒྲིག་འབད་མ་ཚུགས།"
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "vsnprintf སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "%s ཡིག་ཚུགས་རྙིངམ།"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "%s `%.250s' སི་ཊེཊི་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "%s ཡིག་ཚུགས་གསརཔ།"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "%s ཡིག་ཚུགས་རྙིངམ།"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "%s `%.250s' སི་ཊེཊི་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - ཚབ་ལུ་ཐུམ་སྒྲིལ་གསརཔ་འདི་ལས་ཡིག་ཚུགས་འབད་རྩོལ་བསྐྱེད་དོ་...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོན་རིམ་གསརཔ་འདི་ནང་ལུ་ཡིག་ཚུགས་མེད།-བཀོག་བཞག་དོ།"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... འདི་བཏུབ་ཡར་སོངམ་བཟུམ་མཐོངམ་མས།\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "`%.255s' གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2898,7 +2930,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "`%.250s' གི་གནས་ས་ཞིབ་དཔྱད་འབད་མ་ཚུགས།"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "བརྡ་དོན་སྣོད་ཐོ་ལྷག་མི་ཚུགས།"
 
@@ -2965,7 +2997,7 @@
 "  -Dh|--debug=help                 རྐྱོན་སེལ་འབད་ནི་གུ་ལུ་གྲོགས་རམ་སྟོན།\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -3090,7 +3122,7 @@
 msgstr ""
 "ལག་ལེན་པ་-མཛའ་གྲོགས་ཐུམ་སྒྲིལ་འཛིན་སྐྱོང་པའི་དོན་ལུ་`dselect' ཡང་ན་ `aptitude' ལག་ལེན་འཐབ།\n"
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3142,30 +3174,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3174,102 +3210,102 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "རྟེན་འབམྲེལ་གྱྱི་དཀའ་ངལ་ཚུ་ - རྩ་བསྐྲད་མི་གཏང་།"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "རྟེན་འབམྲེལ་གྱྱི་དཀའ་ངལ་ཚུ་ - རྩ་བསྐྲད་མི་གཏང་།"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "vsnprintf སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ `%.255s' ནང་ལུ་ལྷག་པའི་འཛོལ་བ།"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3277,7 +3313,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3285,36 +3321,36 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--རྐྱེན་སེལ་ལུ་ཨོཀ་ཊཱལ་སྒྲུབ་རྟགས་གཅིག་དགོ"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "སྟོང་ཆ་ཐུམ་སྒྲིལ་མིང་འདི་ --སྣང་མེད་-རྟེན་འབྲེལ་གྱི་ ལྷོད་རྟགས་-སོ་སོ་འཕྱལ་འཕྱལཝ་ཐོ་ཡིག་ `%.250s' ནང་།"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--སྣང་མེད་བཞག་- རྟེན་འབྲེལ་ལུ་ཁྲིམས་ལྡན་ཐུམ་སྒྲིལ་མིང་གཅིག་དགོ `%.250s' iའདི་; %sམེན།"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s: `%.250s' གི་དོན་ལུ་ནུས་མེད་ཧྲིལ་ཨང་།"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3323,7 +3359,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3331,12 +3367,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "མ་ཤེས་པའི་བང་བཙོང་ནི་/ངོས་ལེན་མི་འབད་ནིའི་གདམ་ཁ་ `%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "ཉེན་བརྡ་: ཕན་མེད་བང་བཙོང་ནི་/ངོས་ལེན་མི་འབད་ནི་གདམ་ཁ་ `%s'\n"
@@ -3359,8 +3395,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "གྲལ་ཐིག་ %d གི་མཇུག་གི་ཧེ་མ་རེ་བ་མེད་པའི་ཨི་ཨོ་ཨེཕ།"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "བྱ་བའི་གདམ་ཁ་གཅིག་དགོ"
 
@@ -3525,89 +3561,89 @@
 msgid "passed\n"
 msgstr "རྩིས་སྤྲོད་འབད་ཡོདཔ།\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "གནས་སྐབས་སྣོད་ཐོ་མིང་བཟོ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "ཐུན་སྒྲིལ་%s་ལུ་མཐུན་པ་ལེ་ཤ/ཚབ་བཙུགས་ཟུང"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "`%.250s' འགོ་བཙུགས་པའི་སྐབས་ ཐུམ་སྒྲིལ་གི་ཐོན་རིམ་རྙིངམ་འདི་ལུ་གནམ་མེད་ས་མེད་རིངམ་བརྡ་དོན་ཡིག་སྣོད་"
 "མིང་འདུག"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "ཕན་མེད་བརྡ་དོན་ཡིག་སྣོད་`%.50s'རྩ་བསྐྲད་གཏང་མ་ཚུགས།"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "བརྡ་དོན་ཡིག་སྣོད་`%.50s'གསརཔ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "གནས་སྐབས་ཚད་འཛིན་སྣོད་ཐོ་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "ཐུམ་སྒྲིལ་གྱི་ནང་ན་ གནམ་མེད་ས་མེད་རིངམ་ཚད་འཛིན་བརྡ་དོན་ཡིག་སྣོད་མིང་འདུག་(`%.50s' འགོ་བཙུགས་དོ།)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "ཐུམ་སྒྲིལ་ཚད་འཛིན་བརྡ་དོན་གྱི་ནང་ན་སྣོད་ཐོ་ `%.250s' འདུག"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "`%.250s' གི་ཐུམ་སྒྲིལ་ཚད་འཛིན་བརྡ་དོན་ཨར་ཨེམ་སྣོད་ཐོ་གིས་སྣོད་ཐོ་མེན་ཟེར་མ་སླབ།"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr "dpkg: ཉེན་བརྡ་ - ཐུམ་སྒྲིལ་ %s ནང་ལུ་ཐོ་ཡིག་ བརྡ་དོན་ཡིག་སྣོད་སྦེ་ འདུག"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "བརྡ་དོན་ཡིག་སྣོད་ `%.250s' འདི་ `%.250s' སྦེ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "ཚད་འཛིན་བརྡ དོན་ཡིག་སྣོད་ `%.250s' བཏོན་གཏང་མ་ཚུགས།"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "ཡིག་མཛོད་འཛུལ་སྤྱོད་འབད་མི་ཚུགས།"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "གནས་སྐབས་སྣོད་ཐོ་མིང་བཟོ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "ཚད་འཛིན་བརྡ་དོན་རིང་ཚད།"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "%s གི་སྐོར་ལས་བརྡ་དོན་འདི་ %s ལས་དྲན་ཐོ་བཀོད་ཡོད།\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "ཐུམ་སྒྲིལ་གྱི་བཟོ་བཀོད(%s)འདི་རིམ་ལུགས་(%s)དང་མི་མཐུན་པས།"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3616,102 +3652,102 @@
 "dpkg: %s ནང་ན་ %s ཡོད་མིའི་སྐོར་ལས་ སྔོན་-རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "སྔོན་-རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་-  %.250s གཞི་བཙུགས་མི་འབ་དབས།"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr "dpkg: ཉེན་བརྡ་ - སྔོན་-རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་སྣང་མེད་བཞག་དོ!\n"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "%s %s ཚབ་བཙུགས་ནི་ལུ་གྲ་སྒྲིག་འབད་དོ་(%s ལག་ལེན་འཐབ་ཐོག་)...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "%s བཤུབ་དོ་(%s ལས་)...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "རིམ་སྒྲིག་ཡིག་སྣོད་ཀྱི་མིང་(`%.250s' འགོ་བཙུགས་དོ་) འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས་(>%d ཡིག་འབྲུ)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "%.250s ནང་ལྷག་པའི་འཛོལ་བ།"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "%.250s ཁ་བསྡམ་ད་འཛོལ་བ།"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "%.250s ཁ་ཕྱེ་ནིའ་འབད་རྩོལ་བསྐྱེདཔ་ད་འཛོལ་བ།"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, fuzzy, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "%s རིམ་སྒྲིག་མ་བཟོ་  %s རྩ་བསྐྲད་གཏང་ཚུགས་ནིའི་དོན་ལུ་...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, fuzzy, c-format
 msgid "De-configuring %s ...\n"
 msgstr "%s རྩ་བསྐྲད་གཏང་དོ་...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "ཚབ་མ་ %.250s བཤུབ་དོ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "dpkg-deb ཊར་ཨའུཊི་པུཏི་ ལྷག་པའི་སྐབས་འཛོལ་བ།"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "ངན་ཅན་བཟོ་ཡོད་པའི་ཡིག་སྣོད་རིམ་ལུགས་ཊར་ཡིག་སྣོད་ - ངན་ཅན་བཟོ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཡིག་མཛོད།"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: སྲིད་པའི་རྒྱབ་ལུས་ཀླད་ཀོར་ཚུ་ཛཔ་འབད།"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, fuzzy, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "dpkg: ཉེན་བརྡ་ - ཡིག་སྣོད་རྙིངམ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགསཔ་ལས་ འདི་བཏོན་མི་གཏང་: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "dpkg: ཉེན་བརྡ་ - སྣོད་ཐོ་རྙིངམ་ `%.250s': %s བཏོན་གཏང་མ་ཚུགས།\n"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, fuzzy, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "dpkg: ཉེན་བརྡ་ - རིམ་སྒྲིག་ཡིག་སྣོད་རྙིངམ་ `%.250s' འདི་སྣོད་ཐོ་སྟོངམ་ཅིག་ཨིན་(དེ་ལས་འདི་བཏོན་གཏང་"
 "ཡོད།)\n"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "གཞན་མི་ཡིག་སྣོད་གསརཔ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, fuzzy, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3720,12 +3756,12 @@
 "dpkg: ཉེན་བརྡ་ - ཡིག་སྣོད་རྙིངམ་ `%.250s' འདི་ཡིག་སྣོད་གསརཔ་ལེ་ཤ་ཅིག་དང་གཅིད་པ་ཨིན་པས་! (`"
 "%.250s' དང `%.250s' གཉིས་ཆ་རང་)\n"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "dpkg: ཉེན་བརྡ་ - ཡིག་སྣོད་རྙིངམ་ `%%.250s': %%s   %s འབད་མ་ཚུགས།\n"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(%s གི་ཡལ་མི་ ཆ་ཚང་སྦེ་ཚབ་བཙུགས་ཡོད་མི་ ག་ཅི་ཡང་མེད།)\n"
@@ -3895,7 +3931,7 @@
 "  -f|--རྩ་སྒྲིག་སྟོན་=<format>         --སྟོན་ ནིའི་དོན་ལུ་རྩ་སྒྲིག་སྤེལ་མ་ལག་ལེན་འཐབ།\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3917,6 +3953,10 @@
 "  རྒྱ་ཚད་འདི་མེད་ཆ་མེན་ཚུན་ས་སྒོ་འདི་ གཡས་-ཕྲང་འབད་འོང་\n"
 "  གཡོན་ཕྲང་སྒྲིག་ལག་ལེན་འཐབ་མི་གནད་དོན་ནང་ལུ།\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, fuzzy, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3978,7 +4018,7 @@
 msgid "Removing %s ...\n"
 msgstr "%s རྩ་བསྐྲད་གཏང་དོ་...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, fuzzy, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3987,48 +4027,49 @@
 "ཌི་པི་ཀེ་ཇི་ - ཉེན་བརྡ་:  %.250s རྩ་བསྐྲད་གཏང་པའི་སྐབས་  སྣོད་ཐོ་ `%.250s' རྩ་བསྐྲད་གཏང་མ་"
 "ཚུགས་: %s - སྣོད་ཐོ་འདི་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ཅིག་ཨིནམ་འོང་?\n"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "`%.250s' རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "%.250s གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "ཌི་པི་ཀེ་ཇི་ - ཉེན་བརྡ་: %.250s རྩ་བསྐྲད་གཏང་པའི་སྐབས་ སྣོད་ཐོ་ `%.250s' སྟོངམ་མེནམ་ལས་རྩ་བསྐྲད་"
 "མ་གཏང་།\n"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "`%.250s' རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "%s གི་དོན་ལུ་རིམ་སྒྲིག་ཡིག་སྣོད་ཕྱིར་བསྐྲད་གཏང་དོ་...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་`%.250s'(=་`%.250s') རྙིངམ་ རྩ་བསྐྲད་གཏང་མ་ཚུགས།"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ སྣོད་ཐོ་`%.250s'(`%.250s' ལས་)ལྷག་མ་ཚུགས།"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr "རྒྱབ་ཐག་རིམ་སྒྲིག་ཡིག་སྣོད་`%.250s' (`%.250s' གི་) རྙིངམ་རྩ་བསྐྲད་གཏང་མ་ཚུགས།"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "ཡིག་སྣོད་ཀྱི་ཐོ་ཡིག་རྙིངམ་རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "པོསིཊི་རིམ་ ཡིག་ཚུགས་རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
@@ -4071,7 +4112,11 @@
 msgid "read error on standard input"
 msgstr "ཚད་ལྡན་ཨིན་པུཊི་གུ་ལུ་ལྷག་པའི་འཛོལ་བ།"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4081,7 +4126,7 @@
 "འདྲ་བཤུས་དབང་ཆ་© ༡༩༩༥ ཨིཡན་ ཇེཀ་ཤན།\n"
 "འདྲ་བཤུས་དབང་ཆ་© ༢༠༠༠-༢༠༠༢ ཝི་ཅརཊི་ཨཀ་ཀར་མན།"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4092,7 +4137,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -4121,56 +4166,56 @@
 "  --གྲོགས་རམ་                   འ་ནི་གྲོགས་རམ་འཕྲིན་དོན་འདི་སྟོན།\n"
 "  --ཐོན་རིམ་                ཐོན་རིམ་འདི་སྟོན།\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "བཤུབ་ནི་རྒྱབ་ལུས་/"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་གསརཔ་ཁ་ཕྱེ་མ་ཚུགས་: %s"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་-རྙིངམ་རྩ་བསྐྲད་གཏངམ་ད་འཛོལ་བ་: %s"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་-རྙིངམ་ གསརཔ་གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ་: %s"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་གསརཔ་གཞི་བཙུགས་འབདཝ་ད་འཛོལ་བ་: %s"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--ཁ་སྐོང་རྐྱབས་ནི་ལུ་ སྒྲུབ་རྟགས་བཞི་དགོ"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, fuzzy, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr "དེ་འབདཝ་ད་ --བང་བཙོང་འདི་གསལ་བཀོད་འབད་ཡོདཔ་ལས་ སྣང་མེད་བཞག་འོང་།"
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, fuzzy, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "\"%s\" གི་དོན་ལུ་ཟུར་བཞག་འད་ཧེ་མ་ལས་རང་ཡོདཔ་ཨིན།"
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, fuzzy, c-format
 msgid "--update given but %s does not exist"
 msgstr "ཉེན་བརྡ་: --དུས་མཐུན་བྱིན་ཡོད་ དེ་འབདཝ་ད་  %s འདི་མེད།"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "ཟུར་བཞག་གཅིག་ཡང་མེད།"
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 #, fuzzy
 msgid "--update is useless for --remove"
 msgstr "ཉེན་བརྡ: --དུས་མཐུན་འདི་ --རྩ་བསྐྲད་ཀྱི་དོན་ལུ་ཁུངས་མེདཔ་ཨིན།"
@@ -4242,17 +4287,17 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ `%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "དབྱེ་བ་ ཌི་པི་ཀེ་ཇི་-བཤག་ --གྲོགས་རམ་གྱི་དོན་ལུ་གྲོགས་རམ།"
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "ཌི་བི་ཡཱན་ `%s' ཐུམ་སྒྲིལ་འཛིན་སྐྱོང་པའི་ལས་རིམ་འདྲི་དཔྱད་ལག་ཆས།\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4262,7 +4307,7 @@
 "ལག་ལེན་: %s [<option> ...] <command>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4271,7 +4316,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4285,31 +4330,31 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 #, fuzzy
 msgid "takes one argument, the trigger name"
 msgstr "--%s གིས་སྒྲུབ་རྟགས་གཅིག་རྐྱངམ་ཅིག་འབགཔ་ཨིན།(.deb ཡིག་སྣོད་མིང་)"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "`%s' ས་སྒོ་ ནུས་མེད་ཐུམ་སྒྲིལ་མིང་ `%.255s': %s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "`%s' ས་སྒོ་ ནུས་མེད་ཐུམ་སྒྲིལ་མིང་ `%.255s': %s"
@@ -4338,33 +4383,34 @@
 msgstr "%s གི་དོན་ལུ་རིམ་སྒྲིག་ཡིག་སྣོད་ཕྱིར་བསྐྲད་གཏང་དོ་...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s ལུ་ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད་སྒྲུབ་རྟགས་གཅིག་ཏག་ཏག་དགོཔ་ཨིན།"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "སྦུང་ཚད་ཅན་འཐོབ་ཚུགསཔ་ཡོད་མི་དུས་མཐུན་བཟོ་ཡོད་མི་འདི་གི་དོན་ལུ་ ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་ འཛུལ་"
 "སྤྱོད་འབད་མ་ཚུགས།"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "སྦུང་ཚད་ཅན་འཐོབ་ཚུགསཔ་ཡོད་མི་དུས་མཐུན་བཟོ་ཡོད་མི་འདི་ལུ་ ཌི་པི་ཀེ་ཇི་ གནས་ཚད་མངའ་ཁོངས་ལུ་འབྲི་ནིའི་"
 "འཛུལ་སྤྱོད་དགོཔ་ཨིན།"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "%s ལག་ལེན་འཐབ་ཐོག་ འཐོབ་ཚུགས་པའི་ཐུམ་སྒྲིལ་གྱི་བརྡ་དོན་ ཚབ་བཙུགས་དོ།\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "%s ལག་ལེན་འཐབ་ཐོག་ འཐོབ་ཚུགས་པའི་ཐུམ་སྒྲིལ་ཚུ་དུས་མཐུན་བཟོ་དོ།\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4372,7 +4418,7 @@
 msgstr[0] "%d ཐུམ་སྒྲིལ་(ཚུ་)གི་སྐོར་ལས་བརྡ་དོན་འདི་དུས་མཐུན་བཟོ་ཡོད།\n"
 msgstr[1] "%d ཐུམ་སྒྲིལ་(ཚུ་)གི་སྐོར་ལས་བརྡ་དོན་འདི་དུས་མཐུན་བཟོ་ཡོད།\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4487,8 +4533,8 @@
 msgstr[0] "ཌི་པི་ཀེ་ཇི་-ཌེབ་: ཚད་འཛིན་ཡིག་སྣོད་(ཚུ་)གི་སྐོར་ལས་ %d ཉེན་བརྡ་ཚུ་སྣང་མེད་བཞག་དོ།\n"
 msgstr[1] "ཌི་པི་ཀེ་ཇི་-ཌེབ་: ཚད་འཛིན་ཡིག་སྣོད་(ཚུ་)གི་སྐོར་ལས་ %d ཉེན་བརྡ་ཚུ་སྣང་མེད་བཞག་དོ།\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s ་ལུ་ <སྣོད་ཐོ་> སྒྲུབ་རྟགས་ཅིག་དགོཔ་འདུག"
@@ -4520,26 +4566,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "ཌི་པི་ཀེ་ཇི་-ཌེབ་: `%s' ནང་ལུ་ཐུམ་སྒྲིལ་ `%s' བཟོ་བརྩིགས་འབད་དོ།\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "གནས་སྐབས་ཡིག་སྣོད་བཟོ་ནི་འཐུས་ཤོར་བྱུང་ཡོད་(གནད་སྡུད་)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "ཚད་འཛིན་མངའ་ཁོངས།"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "གནས་སྐབས་ཡིག་སྣོད་ལུ་འབྲེལ་མཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད་(གནད་སྡུད་)   %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4555,20 +4601,20 @@
 msgid "error writing `%s'"
 msgstr "`%s' འབྲིཝ་ད་འཛོལ་བ།"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "འཐུས་མི་ཚུའི་བར་ན།"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "ཊར་རྒྱུད་དུང་ལུ་ཡིག་སྣོད་མིང་འབྲི་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ་(གནད་སྡུད)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4586,76 +4632,76 @@
 msgid "error reading %s from file %.255s"
 msgstr "ཡིག་སྣོད་ %.255s ལས་ %s ལྷགཔ་ད་འཛོལ་བ།"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "ཡིག་མཛོད་ `%.250s' ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "ཨེཕ་སི་ཊེཊི་ཡིག་མཛོད་འབད་ནི་ལུ་ཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "ཡིག་མཛོད་ལུ་ཐོན་རིམ་ཨང་ནང་ཚག་མེད།"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "ཡིག་མཛོད་ལུ་མགོ་ཡིག་ནང་གྲལ་ཐིག་གསརཔ་ཚུ་མེད།"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - ཡན་ལག་ཨང་བྱང་ཉེས།"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "ཡིག་སྣོད་ %.250s འདི་ ཌི་བི་ཡཱན་ཟུང་ལྡན་ཡིག་མཛོད་མེན་(ཌི་པི་ཀེ་ཇི་-བཤག་ནི་འབད་རྩོལ་བསྐྱེད?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "ཡིག་མཛོད་ལུ་ཐོན་རིམ་ཨང་ནང་ཚག་མེད།"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "ཡིག་མཛོད་ལུ་མགོ་ཡིག་ནང་གྲལ་ཐིག་གསརཔ་ཚུ་མེད།"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "ཡིག་མཛོད་ལུ་ཐོན་རིམ་ཨང་ནང་ཚག་མེད།"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "ཡིག་མཛོད་ཐོན་རིམ་ %.250s ཧ་མ་དགོ་  ཌི་པི་ཀེ་ཇི་-ཌེབ་ གསརཔ་ལེན།"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "%s ལས་གོམ་འགྱོ་ཡོད་པའི་འཐུས་མི་གནད་སྡུད།"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "ཡིག་སྣོད་ `%.250s' གི་ནང་ན་ཧ་མ་དགོ་བའི་གནད་སྡུད་འཐུས་མི་ %.*s འདུག་ བཀོག་བཀག་དོ་"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "ཡིག་སྣོད་ `%.250s' ནང་ན་ཚད་འཛིན་གྱི་འཐུས་མི་གཉིས་འདུག་ བཀོག་བཞག་དོ་"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4667,23 +4713,23 @@
 "ཌི་བི་ཡཱན་ཐུམ་སྒྲིལ་གསརཔ་ ཐོན་རིམ་ %s\n"
 "ཚད་ %ld བཱ་འིཊིསི་: ཚད་འཛིན་ཡིག་མཛོད་= %zi བཱ་འིཊིསི།\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "ཡིག་མཛོད་ཀྱིས་ཚད་འཛིན་རིང་ཚད་ `%s' བཟོ་ཉེས་གྱུར་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "%s ལས་གོམ་འགྱོ་ཡོད་པའི་འཐུས་མི་གནད་སྡུད།"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4695,7 +4741,7 @@
 "ཌི་བི་ཡཱན་ཐུམ་སྒྲིལ་རྙིངམ་ ཐོན་རིམ་ %s.\n"
 "ཚད་ %ld བཱ་འིཊིསི་: ཚད་འཛིན་ཡིག་མཛོད་= %zi  ཡིག་མཛོད་གཙོ་བོ་= %ld\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4705,51 +4751,52 @@
 "ཌི་པི་ཀེ་ཇི་-ཌེབ:   ཨེ་ཨེསི་སི་ཨའི་ཨའི་ཐབས་ལམ་ནང་ཕབ་ལེན་འབད་ཡོད་མི་གིས་ངན་ཅན་བཟོ་ཡོདཔ་བཟུམ་སབེ་"
 "མཐོངམ་མས།\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' འདི་ ཌི་བི་ཡཱན་རྩ་སྒྲིག་ཡིག་མཛོད་མེན་པས།"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "འདྲ་བཤུས་ནང་ལུ་རྒྱུད་དུང་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "འདྲ་བཤུས་ནང་ལུ་རྒྱུད་དུང་ཁ་བསྡམ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "གནད་སྡུད།"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "སྣོད་ཐོ་ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "སྣོད་ཐོ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "དེ་གསར་བསྐྲུན་འབད་བའི་ཤུལ་ལས་སྣོད་ཐོ་ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "སྣོད་ཐོ་ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s: ཨེབ་བཙུགས་བཤོལ་ནི།"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 #, fuzzy
 msgid "paste"
 msgstr "རྩིས་སྤྲོད་འབད་ཡོདཔ།\n"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s ལུ་ .deb ཡིག་སྣོད་མིང་གི་སྒྲུབ་རྟགས་ཅིག་དགོཔ་ཨིན།"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4758,39 +4805,39 @@
 "--%s ལུ་དམིགས་གཏད་ཀྱི་སྣོད་ཐོ་ཅིག་དགོ\n"
 "ཁྱོད་ཀྱིས་ ཌི་པི་ཀེ་ཇི་ --གཞི་བཙུགས་ ལག་ལེན་འཐབ་དགོཔ་འོང་?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s གིས་མང་མཐའ་སྒྲུབ་རྟགས་གཉིས་འབགཔ་ཨིན།(.deb དང་སྣོད་ཐོ་)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s གིས་སྒྲུབ་རྟགས་གཅིག་རྐྱངམ་ཅིག་འབགཔ་ཨིན།(.deb ཡིག་སྣོད་མིང་)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "གཙང་དག་བཟོ་ནིའི་དོན་ལུ་ སི་ཨེཆ་ཌི་ཨའི་ཨར་འདི་ `/' འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
 msgid "control file '%s'"
 msgstr "མིང་རྙིངམ་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས: %s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "ཌི་པི་ཀེ་ཇི་-ཌེབ་: `%.255s' ནང་ལུ་ཚད་འཛིན་ཆ་ཤས་ `%.255s' མེད།\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "ཁ་ཕྱེ་ཡོད་མི་ཆ་ཤས་ `%.255s' (%.255s ནང་ལུ་) འདི་ རེ་བ་མེད་པའི་ཐབས་ལམ་ཅིག་ནང་ལུ་འཐུས་ཤོར་"
 "འབྱུང་ཡོདཔ།"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, fuzzy, c-format
 #| msgid "One requested control component is missing"
 msgid "%d requested control component is missing"
@@ -4798,59 +4845,59 @@
 msgstr[0] "གཅིག་ཞུ་བ་འབད་མི་ཚད་འཛིན་ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 msgstr[1] "གཅིག་ཞུ་བ་འབད་མི་ཚད་འཛིན་ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "སྣོད་ཐོ་ `%.255s' ཞིབ་ལྟ་འབད་མི་ཚུགས།"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "cannot stat `%.255s' སི་ཊེཊི་འབད་མི་ཚུགས་(`%.255s' ནང་ལུ་)"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "`%.255s' ཁ་ཕྱེ་མི་ཚུགས་(`%.255s' ནང་ལུ་)"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "`%.255s' ལྷག་ནི་ལུ་འཐུས་ཤོར་འབྱུང་ཡོད་(`%.255s' ནང་ལུ་)"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld བཱ་འིཊིསི་ %5d གྲལ་ཐིག་ཚུ་   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     ཉག་རྐྱང་ཡིག་སྣོད་          %.255s མེན་པས\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(ཚད་འཛིན་ཡིག་མཛོད་ནང་ལུ་ `control' ཡིག་སྣོད་མེད་!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "`control' ཆ་ཤས་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "`control' ཆ་ཤས་ལྷག་པའི་སྐབས་འཐུས་ཤོར་འབྱུང་ཡོད།"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "འཚོལ་ནིའི་རྒྱུད་དུང་ཁ་བསྡམ་ནིའི་འཛོལ་བ།"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "རྩ་སྒྲིག་ནང་འཛོལ་བ།"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--ནང་དོན་གྱིས་སྒྲུབ་རྟགས་གཅིག་ཏག་ཏག་སྦེ་འབགཔ་ཨིན།"
 
@@ -4860,7 +4907,19 @@
 msgstr "ཌི་བི་ཡཱན་ `%s' ཐུམ་སྒྲིལ་ཡིག་མཛོད་ཀྱིས་ཐོན་རིམ་ %s རྒྱབ་མཐའ་འབད་ཡོད།\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4871,6 +4930,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4886,7 +4947,7 @@
 "  --ཨེཕ་ཨེསི་ཝའི་ཨེསི་-ཊར་ཡིག་སྣོད་ <deb>             ཨའུཊི་པུཊི་ཡིག་སྣོད་རིམ་ལུགས་ཊར་ཡིག་སྣོད།\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4899,11 +4960,12 @@
 "<cfield> འདི་`control' ཡིག་སྣོད་གཙོ་བོ་དེ་ནང་གི་ས་སྒོའི་མིང་ཨིན།\n"
 "\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4930,7 +4992,7 @@
 "མེད་\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4946,7 +5008,7 @@
 "བཤུབ་ནི་ཚུ་  `dpkg-deb --extract' ལག་ལེན་འཐབ་ཐོག་འབད་མི་འདི་གིས་ བདེན་མེད་སྦེ་གཞི་བཙུགས་"
 "འབད་འོང་!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4956,17 +5018,17 @@
 "དབྱེ་བ་ཌི་པི་ཀེ་ཇི་--གྲོགས་རམ་འདི་ ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་འབད་ནི་དང་གཞི་བཙུགས་མི་འབད་ནིའི་སྐོར་ལས་"
 "གྲོགས་རམ་གྱི་དོན་ལུ།"
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "--%s: `%.250s' གི་དོན་ལུ་ནུས་མེད་ཧྲིལ་ཨང་།"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "--%s: `%.250s' གི་དོན་ལུ་ནུས་མེད་ཧྲིལ་ཨང་།"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "མ་ཤེས་པའི་ཨེབ་བཙུགས་ཀྱི་དབྱེ་བ་ `%s'!"
@@ -4987,7 +5049,7 @@
 msgstr ""
 "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - `%.250s' གི་ཤུལ་ལས་གྲལ་ཐིག་གསརཔ་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "%.250s ལྷག་པའི་འཛོལ་བ།"
@@ -5078,51 +5140,56 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - ཡན་ལག་ཨང་བྱང་ཉེས།"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+msgid "package architecture"
+msgstr "(ཐུམ་སྒྲིལ:"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - མགོ་ཡིག་གཉིས་པའི་མཇུག་ལུ་མིང་འཕྲུལ་བྱང་ཉེས།"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - འཐུས་མི་གཉིས་པ་འདི་གནད་སྡུད་འཐུས་མི་མེན།"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - འདྲེན་རྟགས་ནང་བཙུགས་ཡོད་པའི་ཚད་ཚུའི་དོན་ལུ་ཡན་ལག་གི་ཨང་ཕྱི་"
 "འགྱུར།"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - ཚད་འདི་ འདྲེན་རྟགས་ནང་བཙུགས་ཡོད་པའི་ཡན་ལག་ཨང་གི་དོན་ལུ་"
 "ཕྱི་འགྱུར་ཨིན།"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "ཡན་ལག་ཡིག་སྣོད་ `%.250s' ཨེཕ་སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་པས་ -སྣ་མེད་ས་མེད་ཐུང་ཀུ།"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "ཡིག་མཛོད་ཡན་ལག་ཡིག་སྣོད་ `%.250s'  ཁ་ཕྱེ་མི་ཚུགས།"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "ཡིག་སྣོད་ `%.250s' འདི་ཡིག་མཛོད་ཡན་ལག་མེན།"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5142,6 +5209,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5164,12 +5232,19 @@
 "   ཡན་ལག་ཡིག་སྣོད་ཚད་ (ལག་ལེན་འཐབ་ཡོད་པའི་ཆ་ཤས་):  %lu བཱ་འིཊིསི།\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<མ་ཤེསཔ་>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--བརྡ་དོན་ལུ་ ཡན་ལག་ཡིག་སྣོད་ཀྱི་སྒྲུབ་རྟགས་གཅིག་ཡང་ན་ལེ་ཤ་ཅིག་དགོཔ་ཨིན།"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "ཡིག་སྣོད་ `%s' འདི་ཡིག་མཛོད་ཀྱི་ཡན་ལག་ཅིག་མེན།\n"
@@ -5203,7 +5278,7 @@
 msgid "split package part"
 msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ།"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "འབད་ཚར་\n"
@@ -5255,17 +5330,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 གི་ཚབ་ལུ་ལག་ལེན་"
@@ -5278,20 +5362,29 @@
 "\n"
 "ཕྱིར་ཐོན་གནས་ཚད་: ༠ = བཏུབ།  ༡ = -ཨེ་འདི་ཡན་ལག་ཅིག་མེན།  ༢ = དཀའ་ངལ!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "དབྱེ་བ་ ཌི་པི་ཀེ་ཇི་-བཤག་ --གྲོགས་རམ་གྱི་དོན་ལུ་གྲོགས་རམ།"
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "%.250s ནང་ལུ་ཡིག་སྣོད་ཀྱི་རེ་བ་མེད་པའི་མཇུག"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "ཡན་ལག་ཚད་འདི་སྣ་མེད་ས་མེད་རིང་བ་ཡང་འདི་ཡོད་ཆ་མེན་པས།"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, fuzzy, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "ཡན་ལག་ཚད་འདི་ཉུང་མཐའ་ %dk ཨིན་དགོ་(མགོ་ཡིག་གི་དོན་ལུ་འབད་བཅུག་ནིའི་དོན་ལས་)"
@@ -5402,42 +5495,42 @@
 msgid "Deleted %s.\n"
 msgstr "%s བཏོན་གཏང་ཡོདཔ།\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ ཨེཕ་སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' འདི་ཉག་རྐྱང་ཡིག་སྣོད་ཅིག་མེན།"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--བཤག་ནི་ལུ་ འབྱུང་ཁུངས་ཡིག་སྣོད་མིང་གི་སྒྲུབ་རྟགས་ཅིག་དགོཔ་ཨིན།"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--བཤག་ནི་འདི་གིས་ འབྱུང་ཁུངས་ཡིག་སྣོད་མིང་དང་འགྲོ་ཡུལ་སྔོན་ཚིག་མང་ཤོས་འབགཔ་ཨིན།"
 
@@ -5562,133 +5655,94 @@
 "  --གྲོགས་རམ་                   འ་ནི་གྲོགས་རམ་འཕྲིན་དོན་འདི་སྟོན།\n"
 "  --ཐོན་རིམ་                ཐོན་རིམ་འདི་སྟོན།\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 #, fuzzy
 #| msgid "parse error"
 msgid "error"
 msgstr "མིང་དཔྱད་འབད་ནིའི་འཛོལ་བ།"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "ཉེན་བརྡ།"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat %s: %s"
-msgstr "མིང་རྙིངམ་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, fuzzy, c-format
 #| msgid "two commands specified: %s and --%s"
 msgid "two commands specified: --%s and --%s"
 msgstr "བརྡ་བཀོད་གཉིས་གསལ་བཀོད་འབད་ཡོདཔ: %s དང་ --%s"
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
 #| msgid "%s: can't open %s: %s"
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "%s: %s ཁ་ཕྱེ་མི་ཚུགས་: %s"
 
-#: utils/update-alternatives.c:395
-#, fuzzy, c-format
-#| msgid "%s: copying %s to %s failed, giving up: %s"
-msgid "scan of %s failed: %s"
-msgstr "%s: %s འདི་ %s ལུ་འདྲ་བཤུས་རྐྱབས་ནི་འཐུས་ཤོར་འབྱུང་ཡོད། བཀོག་བཞག་དོ: %s "
-
-#: utils/update-alternatives.c:420
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "%s ལག་ལེན་འཐབ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "%s འདི་ %s ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཅིག་བཟོ་མ་ཚུགས: %s "
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "%s འདི་ %s སྦེ་གཞི་བཙུགས་འབད་མ་ཚུགས: %s "
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "%s རྩ་བསྐྲད་གཏང་མ་ཚུགས: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "%.255s ནང་གི་ %s ནང་ལུ་ཡིག་སྣོད་ཀྱི་རེ་བ་མེད་པའི་མཇུག"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "%s ལྷག: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "%.255s ནང་གི་ %s ནང་ལུ་ཡིག་སྣོད་ཀྱི་རེ་བ་མེད་པའི་མཇུག"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, fuzzy, c-format
 msgid "%s corrupt: %s"
 msgstr "ནང་འཁོད་ཀྱི་འཛོལ་བ: %s ངན་ཅན་བཟོ་ནི་: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "དུས་མཐུན་-སྤེལ་མའི་ཡིག་སྣོད་ཚུ་ (%s) ནང་ལུ་གྲལ་ཐིག་གསརཔ་ཚུ་བཀག་ཡོདཔ།"
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "%s:  %s འབྲིཝ་ད་འཛོལ་བ་: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "བྲན་གཡོག་ %s རྫུན་མ།"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 #, fuzzy
 msgid "slave link"
 msgstr "བྲན་གཡོག་འབྲེལ་ལམ་ %s རྫུན་མ།"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "འབྲན་གཡོག་འབྲེལ་ལམ་འདི་འབྲེལ་ལམ་གཙོ་བོ་ %s དང་ལྕོགས་རང་ཐད།"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "བྲན་གཡོག་འབྲེལ་ལམ་ %s རྫུན་མ།"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "འགྲུལ་ལམ་རྫུན་མ་ %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, fuzzy, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5696,234 +5750,268 @@
 msgstr ""
 "%s གི་དོན་ལུ་སྤེལ་མ་གིས་ འཚོལ་མ་འཐོབ་མི་ - %s ལུ་དཔགཔ་ཨིན། སྤེལ་མ་ཚུའི་ཐོ་ཡིག་ལས་རྩ་བསྐྲད་གཏང་དོ།"
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 #, fuzzy
 msgid "priority"
 msgstr "གཙོ་རིམ་ %s %s"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, fuzzy, c-format
 msgid "priority of %s: %s"
 msgstr "གཙོ་རིམ་ %s %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "རྩ་བསྐྲད་གཏང་མ་ཚུགས %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 #, fuzzy
 msgid "invalid status"
 msgstr "ནུས་མེད་དུས་མཐུནམ་བཟོ་ནི་ཐབས་ལམ"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 #, fuzzy
 msgid "master link"
 msgstr "བྲན་གཡོག་འབྲེལ་ལམ་ %s རྫུན་མ།"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "%s ཁ་བསྡམ་མ་ཚུགས་: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, fuzzy, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "ཕན་མེད་བྲན་གཡོག་འབྲེལ་ལམ་ %s (%s) བཏོན་བཀོག་དོ།"
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "%s: %s འབྲི།"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, fuzzy, c-format
 msgid "  link currently points to %s"
 msgstr "འབྲེལ་ལམ་འདི་ད་ལྟོ་ %s ལུ་དཔགཔ་ཨིན།"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 #, fuzzy
 msgid "  link currently absent"
 msgstr "འབྲེལ་ལམ་འདི་ད་ལྟོ་ཆད་ཨིན་པས།"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "%s - priority %s"
 msgid "%s - priority %d"
 msgstr "%s - གཙོ་རིམ་ %s"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr "བྲན་གཡོག་ %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "ད་ལྟོའི་ཐོན་རིམ་`དྲག་ཤོས་'འདི་ %s ཨིན།"
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "ཐོན་རིམ་ཚུ་ཐོབ་ཚུགསཔ་མེད།"
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "འགྲེལ་བཤད།"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 #, fuzzy
 msgid "Priority"
 msgstr "གཙོ་རིམ་ %s %s"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, fuzzy, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr "སྔོན་སྒྲིག་[*]བཞག་ནིའི་དོན་ལས་ལོག་ལྡེ་ཨེབ་ ཡང་ན་སེལ་འཐུའི་ཨང་ཡིག་དཔར་རྐྱབས:"
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "སྤེལ་མ་ `%s' འཚོལ་མ་འཐོབ།"
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "%.255s ནང་གི་ %s ནང་ལུ་ཡིག་སྣོད་ཀྱི་རེ་བ་མེད་པའི་མཇུག"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "%s འབྲེལ་ལམ་འདི་ %s ལས་ %s ལུ་བསྐྱར་མིང་བཏགས་དོ།"
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, fuzzy, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "%s བྲན་གཡོག་བྲན་ལམ་འདི་ %s ལས་ %s ལུ་བསྐྱར་མིང་བཏགས་དོ།"
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "%s:  %s གསར་བསྐྲུན་འབད་མི་ཚུགས་: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr ""
+
+#: utils/update-alternatives.c:2241
+#, fuzzy, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "ཉེན་བརྡ་: --དུས་མཐུན་བྱིན་ཡོད་ དེ་འབདཝ་ད་  %s འདི་མེད།"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "%s:  %s གསར་བསྐྲུན་འབད་མི་ཚུགས་: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "%s:  %s གསར་བསྐྲུན་འབད་མི་ཚུགས་: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "%s:  %s གསར་བསྐྲུན་འབད་མི་ཚུགས་: %s"
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "མ་ཤེས་པའི་སྒྲུབ་རྟགས་ `%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--གཞི་བཙུགས་ལུ་ <link> <name> <path> <priority> དགོཔ་ཨིན།"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "གཙོ་རིམ་འདི་ཧྲིལ་ཨང་ཅིག་ཨིན་དགོ"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s ལུ་ <name> <path> དགོཔ་ཨིན།"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s ལུ་ <name> དགོཔ་ཨིན།"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--བྲན་གཡོག་འདི་ --གཞི་བཙུགས་དང་ཅིག་ཁར་རྐྱངམ་ཅིག་འབད་ཆོགཔ་ཨིན།"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--བྲན་གཡོག་ལུ་ <link> <name> <path> དགོཔ་ཨིན།"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "མིང་  %s འདི་གཞི་རིམ་དང་བྲན་གཡོག་གཉིས་ཆ་རང་ཨིན།"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "འབྲེལ་ལམ་ %s འདི་ གཞི་རིམ་དང་བྲན་གཡོག་གཉིས་ཆ་རང་ཨིན།"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s་ལུ་སྒྲུབ་རྟགས་རྐྱང་པ་ཅིག་དགོཔ་འདུག"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "མ་ཤེས་པའི་གདམ་ཁ་ `%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -5932,67 +6020,23 @@
 "--བཀྲམ་སྟོན་ --རིམ་སྒྲིག་ --གཞི་སྒྲིག་ --གཞི་བཙུགས་ --རྩ་བསྐྲད་ --གེ་ར་ --གེ་ར་-རྩ་བསྐྲད་གཏང་ ཡང་"
 "ན་ --རང་བཞིན་ དགོཔ་ཨིན།"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "%s:  %s གསར་བསྐྲུན་འབད་མི་ཚུགས་: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr ""
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2239
-#, fuzzy, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "ཉེན་བརྡ་: --དུས་མཐུན་བྱིན་ཡོད་ དེ་འབདཝ་ད་  %s འདི་མེད།"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
-
-#: utils/update-alternatives.c:2257
-#, fuzzy, c-format
-msgid "it is a slave of %s"
-msgstr "བྲན་གཡོག་ %s: %s"
-
-#: utils/update-alternatives.c:2259
-#, fuzzy, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "%s:  %s གསར་བསྐྲུན་འབད་མི་ཚུགས་: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "ཚད་ལྡན་ཨིན་པུཊི་གུ་ལུ་ལྷག་པའི་འཛོལ་བ།"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, fuzzy, c-format
 msgid "no alternatives for %s."
 msgstr "%s གི་དོན་ལུ་སྤེལ་མ་ཚུ་མེད།"
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
@@ -6001,70 +6045,110 @@
 "%s འདི་བསྐྱུར་བཅོས་འབད་ཡོདཔ་ཨིན།(ལག་ཐོག་ལས་ཡང་ན་ཡགི་ཚུགས་ཅིག་གིས་སྦེ་)\n"
 "ལག་དེབ་ཀྱི་དུས་མཐུན་ཚུ་ལུ་རྐྱངམ་ཅིག་སུ་ཡུ་ཅིང་འབད་དོ།"
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, fuzzy, c-format
 msgid "setting up automatic selection of %s."
 msgstr "%s གི་རང་བཞིན་སེལ་འཐུ་གཞི་སྒྲིག་འབད་དོ།"
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "%s གི་དོན་ལུ་སྤེལ་མ་ %s འདི་ཐོ་བཀོད་མ་འབད་བས། རྩ་བསྐྲད་མི་གཏང་།"
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 " བྱིན་མི་ལས་རིམ་ %sའདི་མེད།\n"
 " རིམ་སྒྲིག་འབད་ནི་ག་ཅི་ཡང་མེད།\n"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "%s གི་དོན་ལུ་སྤེལ་མ་ %s འདི་ཐོ་བཀོད་མ་འབད་བས། རྩ་བསྐྲད་མི་གཏང་།"
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, fuzzy, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "ལག་ཐོག་ལས་སེལ་འཐུ་འབད་ཡོད་པའི་སྤེལ་མ་ - སུ་ཡི་ཅིང་འདི་རང་བཞིན་ཐབས་ལམ་ལུ་རྩ་བསྐྲད་གཏང་དོ།"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "%s གི་རང་བཞིན་དུས་མཐུན་ཚུ་ལྕོགས་མིན་བཟོ་ཡོད། ཁོ་རང་རྐྱངམ་ཅིག་བཞག་པའི་སྐབས།"
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr "རང་བཞིན་ཚུ་ལུ་སླར་ལོག་ནིའི་དོན་ལས་  `དུས་མཐུན་-སྤེལ་མ་ --རང་བཞིན %s' ལག་ལེན་འཐབ།"
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "`%s' བྱིན་ནིའི་དོན་ལས་ `%s' ལག་ལེན་འཐབ་དོ།"
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~ msgid "it is a slave of %s"
+#~ msgstr "བྲན་གཡོག་ %s: %s"
+
+#, fuzzy
+#~| msgid "cannot stat old name `%s': %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "མིང་རྙིངམ་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས: %s"
+
+#, fuzzy
+#~| msgid "%s: copying %s to %s failed, giving up: %s"
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "%s: %s འདི་ %s ལུ་འདྲ་བཤུས་རྐྱབས་ནི་འཐུས་ཤོར་འབྱུང་ཡོད། བཀོག་བཞག་དོ: %s "
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "%s ལག་ལེན་འཐབ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "%s འདི་ %s ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཅིག་བཟོ་མ་ཚུགས: %s "
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "%s འདི་ %s སྦེ་གཞི་བཙུགས་འབད་མ་ཚུགས: %s "
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "%s:  %s འབྲིཝ་ད་འཛོལ་བ་: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "རྩ་བསྐྲད་གཏང་མ་ཚུགས %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "%s ཁ་བསྡམ་མ་ཚུགས་: %s"
+
+#, fuzzy
+#~| msgid "write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "%s: %s འབྲི།"
+
+#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "%s འདི་ %s ལུ་བསྐྱར་མིང་བཏགས་མ་ཚུགས: %s "
@@ -6319,9 +6403,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "%s ལས་གོམ་འགྱོ་ཡོད་པའི་འཐུས་མི་གནད་སྡུད།"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "ཊར་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "གནས་སྐབས་སྣོད་ཐོ་མིང་བཟོ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
Binary files dpkg/po/el.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/el.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/el.po /home/vorlon/devel/multiarch/dpkg-debian/po/el.po
--- dpkg/po/el.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/el.po	2012-06-07 10:11:09.426073000 -0700
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: dpkg_po_el\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2008-08-31 21:09+0300\n"
 "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -32,7 +32,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "αδύνατο το άνοιγμα του αρχείου πηγής `%.250s'"
@@ -52,71 +52,77 @@
 msgid "ar member file (%s)"
 msgstr "απέτυχε η δημιουργία του προσωρινού αρχείου tmpfile (data)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "αποτυχία στο buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "αποτυχία στο buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "βραχεία ανάγνωση στην buffer_copy (%s)"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "απέτυχε η εκτέλεση της tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "αδύνατη η εκτέλεση %s"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: αποσυμπίεση"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: συμπίεση"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: εσωτερικό σφάλμα gzip: `%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: εσωτερικό σφάλμα gzip: `%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: εσωτερικό σφάλμα gzip: `%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: εσωτερικό σφάλμα gzip: `%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: εσωτερικό σφάλμα gzip: `%s'"
@@ -131,31 +137,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: εσωτερικό σφάλμα bzip2: `%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: εσωτερικό σφάλμα bzip2: `%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: εσωτερικό σφάλμα bzip2: `%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: εσωτερικό σφάλμα bzip2: `%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -164,7 +170,7 @@
 "ο κατάλογος ενημερώσεων περιέχει το αρχείο `%.250s' το όνομα του οποίου "
 "είναι πολύ μακρύ (μέγεθος=%d, μεγ=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -172,103 +178,103 @@
 "ο κατάλογος ενημερώσεων περιέχει αρχεία με διαφορετικά μεγέθη ονομάτων (και "
 "%d και %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "αδύνατη η σάρωση του καταλόγου ενημερώσεων `%.255s'"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "αποτυχία αφαίρεσης του συγχωνευμένου αρχείου ενημέρωσης %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "αδύνατη η δημιουργία `%.255s'"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "αδύνατο το γέμισμα %.250s με παραγέμιση"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "αδύνατο το καθάρισμα %.250s μετά από παραγέμιση"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "αδύνατο να ψάξω την αρχή του %.250s μετά το padding"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "αδύνατο το άνοιγμα του tmpfile για vsnprintf"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "αδύνατη το άνοιγμα ή η δημιουργία του κλειδώματος της βάσης κατάστασης"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 "δεν έχετε την άδεια για να ξεκλειδώσετε τη βάση δεδομένων κατάστασης dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "αδυναμία κλειδώματος βάσης δεδομένων κατάστασης dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "η ζητούμενη ενέργεια απαιτεί προνόμια υπερχρήστη"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "αδύνατη η πρόσβαση στην περιοχή κατάστασης dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 "η ενέργεια αυτή απαιτεί πρόσβαση ανάγνωσης/εγγραφής στην περιοχή κατάστασης "
 "dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "αποτυχία αφαίρεσης το δικό μου ενημερωτικό αρχείο %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "αδυναμία εγγραφής της ενημερωμένης κατάστασης του `%.250s'"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "αδυναμία καθαρισμού της ενημερωμένης κατάστασης του `%.250s'"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "αδύνατος ο ψαλιδισμός της ανανεωμένης κατάστασης του `%.250s'"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr ""
 "αδύνατος ο συγχρονισμός (fsync) της ανανεωμένης κατάστασης του `%.250s'"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "αδυναμία κλεισίματος της ενημερωμένης κατάστασης του `%.250s'"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "αδύνατη η εγκατάσταση της ενημερωμένης κατάστασης του `%.250s'"
@@ -289,93 +295,95 @@
 msgid "unable to open directory '%s'"
 msgstr "αδύνατο το άνοιγμα του αρχείου πηγής `%.250s'"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "αδύνατο το άνοιγμα του αρχείου πηγής `%.250s'"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "αδύνατο το άνοιγμα του αρχείου πηγής `%.250s'"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "αδύνατη η εκκένωση στο vnsprintf"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "αποτυχία εγγραφής λεπτομερειών του `%.50s' στο `%.250s'"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "αποτυχία ανοίγματος του `%s' για εγγραφή %s πληροφοριών"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "αδύνατος ο ορισμός του buffering στο αρχείο κατάστασης"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "αποτυχία εγγραφής %s καταχώρησης σχετικά με `%.50s' στο `%.250s'"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "αποτυχία καθαρισμού πληροφοριών %s στο `%.250s'"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "αποτυχία συγχρονισμού %s πληροφοριών στο `%.250s'"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "αποτυχία κλεισίματος του `%.250s' μετά την εγγραφή πληροφοριών %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "απέτυχε ο δεσμός του `%.250s' στο `%.250s' για αντίγραφο των πληροφοριών του "
 "%s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 "αποτυχία εγκατάστασης του `%.250s' ως `%.250s' που περιέχει πληροφορίες %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "η νέα εκκαθαριστική καταχώρηση βρέθηκε εκτός μνήμης"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -384,35 +392,35 @@
 "%s: σφάλμα κατά τον καθαρισμό:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: πάρα πολλά φωλιασμένα σφάλματα κατά την ανάκτηση σφαλμάτων !!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "η νέα εκκαθαριστική καταχώρηση βρέθηκε εκτός μνήμης"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "η νέα εκκαθαριστική καταχώρηση με αρκετά ορίσματα βρέθηκε εκτός μνήμης"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: σφάλμα κατά τον καθαρισμό:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr ""
 "%s: σφάλμα κατά τον καθαρισμό:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%d: εσωτερικό σφάλμα `%s'\n"
@@ -428,100 +436,100 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "`%.*s' δεν επιτρέπεται για %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "σκουπίδια μετά από %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "μη έγκυρο όνομα πακέτου (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "πεδίο `%s' λεπτομερειών κενού αρχείου"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr ""
 "το πεδίο `%s' λεπτομερειών αρχείου δεν επιτρέπεται στο αρχείο κατάστασης"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "πάρα πολλές τιμές στο πεδίο `%s' αρχείου λεπτομερειών (σε σύγκριση με άλλα)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "πολύ λίγες τιμές στο πεδίο `%s' αρχείου λεπτομερειών (σε σύγκριση με άλλα)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "ναι/όχι στο πεδίο boolean"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "λέξη στο πεδίο `προτεραιότητα' "
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr ""
 "η τιμή για το πεδίο `κατάστασης' δεν επιτρέπεται σε αυτά τα συμφραζόμενα"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "πρώτη (want) λέξη σε πεδίο `κατάστασης'"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "δεύτερη (error) λέξη σε πεδίο `κατάστασης'"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "τρίτη λέξη (κατάστασης) σε πεδίο `κατάστασης'"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "σφάλμα στο αλφαριθμητικό Έκδοση `%.250s': %.250s"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "χρησιμοποιήθηκε παρωχημένο πεδίο `Revision' ή `Package-Revision' "
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr ""
 "η τιμή για το πεδίο `config-version' δεν επιτρέπεται σε αυτά τα συμφραζόμενα"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "σφάλμα στη συμβολοσειρά Config-Version `%.250s': %.250s"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "η τιμή για το `conffiles' περιέχει κακοδιαμορφωμένη γραμμή `%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "η τιμή για το `conffiles' περιέχει γραμμή που ξεκινά χωρίς κενό `%c'"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "root ή null κατάλογος εμφανίζεται ως conffile"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -529,12 +537,12 @@
 "`πεδίο %s', λείπει το όνομα πακέτου, ή σκουπίδια εκεί που αναμένονταν το "
 "όνομα πακέτου"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "πεδίο `%s', μη έγκυρο όνομα πακέτου `%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -543,7 +551,7 @@
 "πεδίο `%s', αναφορά σε `%.255s':\n"
 " κακή σχέση έκδοσης %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -552,7 +560,7 @@
 "το πεδίο `%s', αναφορά σε `%.255s':\n"
 " `%c' είναι εκτός χρήσης, χρησιμοποιείστε `%c=' ή `%c%c'"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -561,11 +569,11 @@
 "πεδίο `%s', αναφορά σε `%.255s':\n"
 " απόλυτο ταίριασμα στον αριθμό έκδοσης, προτείνεται η χρήση `='"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Μόνο απόλυτες εκδόσεις μπορούν να χρησιμοποιηθούν για το Παρέχει"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -574,58 +582,58 @@
 "πεδίο `%s', αναφορά σε `%.255s':\n"
 " η τιμή έκδοσης ξεκινά με μη αλφαριθμητικό, πρόταση προσθήκης κενού"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "πεδίο `%s', αναφορά στο `%.255s': η έκδοση περιέχει `%c'"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "πεδίο `%s' field, αναφορά σε `%.255s': η έκδοση είναι μη τερματισμένη"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "πεδίο `%s', αναφορά στο `%.255s': σφάλμα στην έκδοση: %.255s"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "πεδίο `%s', συντακτικό σφάλμα μετά την αναφορά στο πακέτο `%.255s'"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "εναλλακτικά (`|') δεν επιτρέπονται στο πεδίο %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 "η τιμή για το πεδίο `triggers-pending' δεν επιτρέπεται σ' αυτό το πλαίσιο"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "μη έγκυρο όνομα trigger σε εκκρεμότητα `%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "διπλός εκκρεμής trigger  `%.255s'"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr ""
 "η τιμή για το πεδίο `triggers-awaited' δεν επιτρέπεται στο πλαίσιο αυτό"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "μη έγκυρο όνομα πακέτου για τον αναμενόμενο trigger `%.255s': %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "επαναλβανόμενο πακέτο με trigger σε αναμονή `%.255s'"
@@ -683,7 +691,7 @@
 msgid "unable to write to status fd %d"
 msgstr "αδυναμία εγγραφής της ενημερωμένης κατάστασης του `%.250s'"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "realloc failed (%zu bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -694,8 +702,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "η realloc απέτυχε (%zu bytes)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "αποτυχία ανάθεσης μνήμης"
 
@@ -728,205 +736,211 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "αδύνατο να τεθεί η σήμανση close-on-exec για το %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "σφάλμα ρυθμίσεων: το %s χρειάζεται μια τιμή"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, fuzzy, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "αποτυχία ανοίγματος αρχείου ρυθμίσεων `%.255s' για ανάγνωση"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "άγνωστη επιλογή `%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "--%s επιλογή παίρνει μια τιμή"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "--%s επιλογή δεν παίρνει τιμή"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "σφάλμα ανάγνωσης στο αρχείο ρυθμίσεων `%.255s'"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "σφάλμα κλεισίματος αρχείου ρυθμίσεων `%.255s'"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "σφάλμα κλεισίματος αρχείου ρυθμίσεων `%.255s'"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "άγνωστη επιλογή --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s επιλογή παίρνει μια τιμή"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s επιλογή δεν παίρνει τιμή"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "άγνωστη επιλογή -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c επιλογή παίρνει μια τιμή"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c επιλογή δεν παίρνει τιμή"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "Προειδοποίηση: επιλογή εκτός χρήσης `--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "συγκρουόμενες ενέργειες -%c (--%s) and -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "διπλή τιμή για το πεδίο `%s'"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "το προσδιορισμένο από το χρήστη όνομα πεδίου `%.*s' είναι πολύ μικρό"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "διπλασιασμός του καθοριζόμενου από το χρήστη πεδίο `%.*s'"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Ρυθμισμένη-Έκδοση για πακέτο με ακατάλληλη Κατάσταση"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "το πακέτο έχει κατάσταση %s αλλά αναμένονται ακόμα triggers"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 "το πακέτο έχει κατάσταση triggers-σε-αναμονή, αλλά δεν υπάρχουν τέτοιοι"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "το πακέτο έχει καθεστώς %s αλλά εκκρεμούν triggers"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 "το πακέτο έχει κατάσταση triggers-σε-εκκρεμότητα αλλά όχι δεν υπάρχουν "
 "τέτοιοι"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Πακέτο το οποίο στην κατάσταση μη εγκατεστημένο έχει ρυθμίσεις, ξέχασέ το"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "αποτυχία ανοίγματος αρχείου πληροφοριών πακέτου `%.255s' για ανάγνωση"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "αδύνατη η εύρεση κατάστασης του αρχείου πληροφοριών πακέτων `%.255s'"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr ""
 "αδύνατη η απεικόνιση στη μνήμη (mmap) του αρχείου πληροφοριών των πακέτων `"
 "%.255s'"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "αδύνατη η εύρεση κατάστασης του αρχείου πληροφοριών πακέτων `%.255s'"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "αποτυχία κλεισίματος μετά την ανάγνωση: `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "Το EOF μετά το όνομα πεδίου `%.*s'"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "νέα γραμμή στο όνομα πεδίου `%.*s'"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS EOF (^Z) στο όνομα πεδίου `%.*s'"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "το όνομα πεδίου `%.*s' πρέπει να ακολουθείται από άνω/κάτω τελεία"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF πριν από την τιμή του πεδίου `%.*s' (λείπει η τελική νέα γραμμή)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 "χαρακτήρας MSDOS EOF στην τιμή του πεδίου `%.*s' (λείπει η νέα γραμμή;)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "νέα γραμμή στο όνομα πεδίου `%.*s'"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF στη τιμή του πεδίου `%.*s' (λείπει η τελική νέα γραμμή)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "βρέθηκαν αρκετές εισαγωγές πληροφοριών πακέτου, μόνο μία επιτρέπεται"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "αποτυχία κλεισίματος μετά την ανάγνωση: `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "καμία πληροφορία πακέτου στο  `%.255s'"
@@ -945,68 +959,68 @@
 " %.255s"
 msgstr "προειδοποίηση, στο αρχείο `%.255s' κοντά στη γραμμή %d"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "μπορεί να μην είναι κενό αλφαριθμητικό"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "πρέπει να ξεκινά με αλφαριθμητικό"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "ο χαρακτήρας `%c' δεν επιτρέπεται (επιτρέπονται μόνο γράμματα, ψηφία και "
 "χαρακτήρες `%s')"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<κανένα>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "το αλφαριθμητικό της έκδοσης είναι κενό"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "η συμβολοσειρά έκδοσης περιέχει ενσωματωμένα κενά"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "η εποχή στην έκδοση δεν είναι αριθμός"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "δεν υπάρχει τίποτα μετά το κώλον (:) στον αριθμό έκδοσης"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "δεν υπάρχει τίποτα μετά το κώλον (:) στον αριθμό έκδοσης"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "δεν υπάρχει τίποτα μετά το κώλον (:) στον αριθμό έκδοσης"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "λείπει %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "κενή τιμή για το %s"
@@ -1025,51 +1039,51 @@
 msgid "(no description available)"
 msgstr "(χωρίς διαθέσιμη περιγραφή)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "αδύνατη η παράλειψη του %s πριν την εκτέλεση του σεναρίου"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "σφάλμα κατά την απελευθέρωση του σήματος %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (υποδιεργασία): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "αποτυχία διχάλωσης"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "η υποδιεργασία %s επέστρεψε κατάσταση λάθους %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "η αναμονή για %s απέτυχε"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "η υποδιεργασία %s σκοτώθηκε από το σήμα (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", core dumped"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "η υποδιεργασία %s απέτυχε με κωδικό κατάστασης αναμονής %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "η αναμονή για %s απέτυχε"
@@ -1092,66 +1106,58 @@
 "σφάλμα σύνταξης στους triggers καθυστερεί το αρχείο `%.250s' στον χαρακτήρα `"
 "%s'%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr ""
 "αδύναμία ανοίγματος/δημιουργίας του αρχείου κλειδώματος των trigger `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "triggered"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr ""
 "αδύνατος ο προσδιορισμός κατάστασης του αρχείου σε αναστολή λόγω trigger `"
 "%.250s'"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "αδύνατο το άνοιγμα του αρχείου σε αναστολή λόγω trigger `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 "αδύνατo το άνοιγμα/δημιουργία νέου αρχείου σε αναστολή λόγω trigger `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "σφάλμα ανάγνωσης του αρχείου σε αναστολή λόγω trigger `% 250s'"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "αδύνατη η εγγραφή του νέου σε αναστολή λόγω trigger αρχείου  `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "αδύνατο το κλείσιμο του νέου σε αναστολή λόγω trigger αρχείου `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr ""
 "αδύνατη η εγκατάσταση του νέου σε αναστολή λόγω trigger αρχείου `%.250s'"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "δεν επιτρέπονται κενά ονόματα trigger"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "το όνομα του trigger περιέχει μη έγκυρο χαρακτήρα"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1160,17 +1166,17 @@
 "μη έγκυρη ή άγνωστη σύνταξη στο όνομα του trigger `%.250s' (στον trigger "
 "interests για το πακέτο `%.250s')"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "αδύνατο το άνοιγμα αρχείου λίστας interest trigger `%.250s'"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "αδύνατη η επανατύλιξη αρχείου interest trigger `%.250s'"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1179,37 +1185,43 @@
 "σφάλμα σύνταξης στον trigger interest file `%.250s'. Μη νόμιμο όνομα πακέτου "
 "`% 250s': % 250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "αδύνατη η δημιουργία νέου αρχείου interest trigger `%.250s'"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "αδύνατη η εγγραφή νέου αρχείου trigger interest `%.250s'"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "αδύνατη η δημιουργία νέου αρχείου interest trigger `%.250s'"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "αδύνατη η δημιουργία νέου αρχείου interest trigger `%.250s'"
 
-#: lib/dpkg/triglib.c:442
-#, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "αδύνατη η δημιουργία νέου αρχείου interest trigger `%.250s'"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "αδύνατη η εγκατάσταση νέου αρχείου trigger interest `%.250s'"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "αδύνατη η αφαίρεση του `%.250s'"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "αδύνατη η δημιουργία νέου αρχείου interest trigger `%.250s'"
+
+#: lib/dpkg/triglib.c:383
+#, fuzzy, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "αδύνατη η δημιουργία νέου αρχείου interest trigger `%.250s'"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1217,47 +1229,47 @@
 "επαναλαμβανόμενο αρχείο trigger interest για το όνομα αρχείου `%.250s' και "
 "το πακέτο `%.250s'"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "αδύνατη η δημιουργία νέου αρχείου trigger `%.250s'"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "αδύνατη η εγγραφή νέου αρχείου trigger file `%.250s'"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "αδύνατη η δημιουργία νέου αρχείου trigger `%.250s'"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "αδύνατη η δημιουργία νέου αρχείου trigger `%.250s'"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "αδύνατη η δημιουργία νέου αρχείου trigger `%.250s'"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "αδύνατη η εγκατάσταση νέου αρχείου trigger file ως `%.250s'"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "αδύνατη η ανάγνωση του αρχείου triggers file `%.250s'"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "σφάλμα ανάγνωσης στο αρχείο των trigger αρχείου `%.250s'"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1266,7 +1278,7 @@
 "το record των trigger αρχείου αναφέρει αθέμιτο όνομα πακέτου `%.250s' (για "
 "interest στο αρχείο `%.250s'): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1275,32 +1287,40 @@
 "το αρχείο των triggers ci `%.250s' περιέχει μη θεμιτή σύνταξη trigger στο "
 "όνομα του trigger `%.250s': %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "αδύνατο το άνοιγμα του αρχείου triggers ci `%.250s'"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "το αρχείο των triggers ci περιέχει άγνωστη σύνταξη ντιρεκτίβας"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "triggers ci file περιέχει άγνωστη ντιρεκτίβα `%.250s'"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "αδύνατη η δημιουργία καταλόγου κατάστασης trigger `%.250s'"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 "αδύνατος ο καθορισμός της ιδιοκτησίας του καταλόγου κατάστασης trigger `"
 "%.250s'"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "δεν επιτρέπονται κενά ονόματα trigger"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "το όνομα του trigger περιέχει μη έγκυρο χαρακτήρα"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1325,7 +1345,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "σφάλμα από την ανάγνωση της σωλήνωσης του dpkg-deb"
 
@@ -1344,12 +1364,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "σφάλμα ρύθμισης ιδιοκτησίας του `%.255s'"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "σφάλμα ρύθμισης ιδιοκτησίας του `%.255s'"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "σφάλμα ορισμού  των δικαιωμάτων του `%.255s'"
@@ -1413,17 +1433,27 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "το αρχείο περιείχε το αντικείμενο `%.255s' άγνωστου τύπου 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat file '%s'"
+msgstr "αδυναμία προσδιορισμού κατάστασης του παλιού ονόματος `%s': %s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Αντικατάσταση αρχείων στο παλιό πακέτο %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Αντικατάσταση από αρχεία στο εγκατεστημένο πακέτο %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1432,96 +1462,101 @@
 "προσπάθεια αντικατάστασης του καταλόγου `%.250s' στο πακέτο %.250s με μη "
 "κατάλογο"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "προσπάθεια αντικατάστασης του `%.250s', που είναι επίσης στο πακέτο %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "απέτυχε η ανάγνωση `%.255s' (στο `%.255s')"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "backend dpkg-deb κατά το `%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "σφάλμα κλεισίματος/εγγραφής `%.255s'"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "σφάλμα δημιουργίας σωλήνωσης `%.255s'"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "σφάλμα κατά τη δημιουργία συσκευής `%.255s'"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "σφάλμα δημιουργίας συνδέσμου `%.255s'"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "σφάλμα δημιουργίας συμβολικού δεσμού `%.255s'"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "σφάλμα κατά τη δημιουργία καταλόγου `%.255s'"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 "αδύνατη η μετακίνηση του `%.255s' κατά μέρους για εγκατάσταση νέας έκδοσης"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "αδύνατη η ανάγνωση δεσμού `%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "αδυναμία δημιουργίας εφεδρικού δεσμού για `%.255s'"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "αδύνατη η αλλαγή ιδιοκτήτη του εφεδρικού δεσμού για το `%.255s'"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "αδυναμία δημιουργίας εφεδρικού δεσμού του `%.255s' πριν την εγκατάσταση νέας "
 "έκδοσης"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "αδύνατη η εγκατάσταση της νέας έκδοσης του `%.255s'"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "αδύνατη η δημιουργία `%.255s'"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "αδύνατη η αποδέσμευση `%.255s'"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1530,7 +1565,7 @@
 "dpkg: προειδοποίηση - αγνοείται το πρόβλημα εξάρτησης με το %s: \n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, fuzzy, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1539,7 +1574,7 @@
 "dpkg: προειδοποίηση - θεώρηση της απορρύθμισης του ουσιώδους\n"
 " πακέτου %s, για ενεργοποίηση του %s.\n"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1548,7 +1583,7 @@
 "dpkg: όχι,το %s είναι ουσιώδες, δε θα απορρυθμιστεί\n"
 " για να ενεργοποιηθεί το %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1558,17 +1593,17 @@
 "βοηθήσει):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "αφαίρεση του  %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "εγκατάσταση του %.250s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1576,12 +1611,12 @@
 "dpkg: εξετάζω την απορύθμιση του %s, το οποίο θα \"έσπαγε\" εξαιτίας του "
 "%s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: ναι, θα απορυθμίσω το %s (έχει \"σπάσει\" εξαιτίας του %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1590,14 +1625,14 @@
 "dpkg: σχετικά με το %s που περιέχει το %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 #, fuzzy
 msgid "ignoring breakage, may proceed anyway!"
 msgstr ""
 "dpkg: προειδοποίηση - θα αγνοηθεί η σύγκρουση, μπορεί να συνεχίσει έτσι κι "
 "αλλιώς !\n"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1607,31 +1642,31 @@
 " δεν επιτρέπεται η απορύθμιση (το όρισμα --auto-deconfigure πιθανά να "
 "βοηθήσει)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "η εγκατάσταση του  %.250s θα \"έσπαγε\" υπάρχον λογισμικό"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: θεωρώντας την αφαίρεση του %s για χάρη του %s ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "το %s δεν είναι κατάλληλα εγκατεστημένο - αγνοώντας όλες τις εξαρτήσεις "
 "του.\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: η αφαίρεση του %s μπορεί να δημιουργήσει προβλήματα καθώς παρέχει "
 "%s ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1639,110 +1674,112 @@
 msgstr ""
 "dpkg: το πακέτο %s απαιτεί επανεγκατάσταση αλλά θα αφαιρεθεί όπως ζητήσατε.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: το πακέτο %s απαιτεί επανεγκατάσταση, δε θα αφαιρεθεί.\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: θα μετακινηθεί το %s για χάρη του %s.\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "συγκρουόμενα πακέτα - δε γίνεται εγκατάσταση %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 #, fuzzy
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "dpkg: προειδοποίηση - θα αγνοηθεί η σύγκρουση, μπορεί να συνεχίσει !\n"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive χρειάζεται τουλάχιστον ένα όρισμα μονοπατιού"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "αδύνατη η εκτέλεση της find με --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "αδύνατο το άνοιγμα της σωλήνωσης της find"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "αδύνατη η ανάγνωση από τη σωλήνωση της find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "αδύνατο το κλείσιμο της σωλήνωσης της find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "η εκτέλεση της find με --recursive επέστρεψε απρόσμενο σφάλμα %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 "έγινε αναζήτηση, δε βρέθηκε κανένα πακέτα (αρχεία που ταιριάζουν *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s χρειάζεται τουλάχιστον ένα αρχείο πακέτου ως παράμετρο"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Επιλογή προηγούμενου απεπιλεγμένου πακέτου %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Παράλειψη απόεπιλεγμένου πακέτου %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Έκδοση %.250s του %.250s είναι ήδη εγκατεστημένη, παράβλεψη.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s - προειδοποίηση: υποβάθμιση του %.250s από %.250s σε %.250s.\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "Δε θα υποβαθμιστεί το %.250s από την έκδοση %.250s στην %.250s, παράλειψη.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1751,39 +1788,39 @@
 "αδύνατη η αφαίρεση της νεοεγκατεστημένης έκδοσης του `%.250s' για να "
 "επανεγκατασταθεί ένα εφεδρικό αντίγραφο"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "αδύνατη η ανάκτηση της εφεδρικής έκδοσης του `%.250s'"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "αδύνατη η ανάκτηση της εφεδρικής έκδοσης του `%.250s'"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "αδυναμία αφαίρεσης της νεο-εγκατεστημένης έκδοσης του`%.250s'"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "αδύνατη η αφαίρεση της νεοεξαχθείσας έκδοσης του`%.250s'"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "αδύνατη η εύρεση κατάστασης του νέου αρχείου ρυθμίσεων `%.250s'"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "αδύνατη η εύρεση κατάστασης του τρέχοντος αρχείου ρυθμίσεων`%.250s'"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1794,67 +1831,67 @@
 "Το αρχείο ρυθμίσεων `%s', δεν υπάρχει στο σύστημα.\n"
 "Εγκατάσταση νέου αρχείου config όπως ζητήσατε.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr ""
 "dpkg: %s: προειδοποίηση - αποτυχία αφαίρεσης του παλιού εφεδρικού αρχείου `"
 "%.250s': %s\n"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 "dpkg: %s: προειδοποίηση - αποτυχία μετονομασίας του `%.250s' σε `%.250s': "
 "%s\n"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: αποτυχία εκτέλεσης '%s %s'"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 "dpkg: %s: προειδοποίηση - αποτυχία αφαίρεσης παλιάς έκδοσης `%.250s': %s\n"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 "dpkg: %s: προειδοποίηση - αποτυχία αφαίρεσης του `%.250s' (πριν την "
 "αντικατάσταση): %s\n"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr ""
 "dpkg: %s: προειδοποίηση - αποτυχία δημιουργίας δεσμού `%.250s' προς `"
 "%.250s': %s\n"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Εγκατάσταση νέας έκδοσης του αρχείου ρυθμίσεων %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "αδύνατη η εγκατάσταση `%.250s' ως `%.250s'"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr ""
 "δεν είναι εγκατεστημένο κανένα πακέτο με όνομα `%s', δε γίνεται ρύθμιση"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "το πακέτο %.250s έχει ήδη εγκατεσταθεί και ρυθμιστεί"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1863,7 +1900,7 @@
 "το πακέτο %.250s δεν είναι έτοιμο για ρυθμίσεις\n"
 " αδύνατη η ρύθμιση (τωρινή κατάσταση `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1872,11 +1909,11 @@
 "dpkg: προβλήματα εξαρτήσεων εμποδίζουν τη ρύθμιση του %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "προβλήματα εξάρτησης - αφήνεται μη ρυθμισμένο"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1885,7 +1922,7 @@
 "dpkg: %s: προβλήματα εξαρτήσεων αλλά θα γίνει ρύθμιση όπως ζητήσατε:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1893,12 +1930,12 @@
 "Το πακέτο βρίσκεται σε πολύ κακή και ασυνεπή κατάσταση - θα πρέπει να το "
 "επανεγκαταστήσετε πριν προχωρήσετε στη ρύθμισή του."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Γίνεται εγκατάσταση %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, fuzzy, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1907,7 +1944,7 @@
 "dpkg: %s: προειδοποίηση - αδύνατη η stat του αρχείου ρυθμίσεων `%s'\n"
 " (= `%s'): %s\n"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, fuzzy, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1916,7 +1953,7 @@
 "dpkg: %s: προειδοποίηση - το αρχείο ρυθμίσεων `%s' είναι κυκλικός δεσμός\n"
 " (= `%s')\n"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, fuzzy, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1925,7 +1962,7 @@
 "dpkg: %s: προειδοποίηση - αδύνατη η ανάγνωση του `%s'\n"
 " (= `%s'): %s\n"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, fuzzy, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1935,37 +1972,37 @@
 "εκφυλισμένο όνομα\n"
 " (το `%s' είναι δεσμός στο `%s')\n"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, fuzzy, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "dpkg: %s: προειδοποίηση - το αρχείο ρυθμίσεων `%.250s' δεν είναι κοινό "
 "αρχείο ή δεσμός (= `%s')\n"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr ""
 "dpkg: %s: προειδοποίηση - αδύνατη το άνοιγμα του αρχείου ρυθμίσεων %s για "
 "hash: %s\n"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Πληκτρολογήστε `exit' όταν τελειώσετε.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1974,12 +2011,12 @@
 "\n"
 "Αρχείο ρυθμίσεων `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (στην πραγματικότητα `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1990,7 +2027,7 @@
 " ==> Το αρχείο στο σύστημα δημιουργήθηκε από εσάς ή από σενάριο.\n"
 " ==> Το αρχείο επίσης στο πακέτο χορηγήθηκε από το συντηρητή πακέτου.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1999,7 +2036,7 @@
 "\n"
 "     Δεν τροποποιήθηκε μετά την εγκατάσταση.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2008,7 +2045,7 @@
 "\n"
 " ==> Τροποποιήθηκε (από εσάς ή από σενάριο) μετά την εγκατάσταση.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -2017,39 +2054,39 @@
 "\n"
 " ==> Διαγράφηκε (από εσάς ή από κάποιο σενάριο) μετά την εγκατάσταση.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr ""
 " ==> Ο διανομέας του πακέτου έχει κυκλοφορήσει μια ανανεωμένη έκδοση.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr ""
 "     Η έκδοση στο πακέτο είναι η ίδια με της τελευταίας εγκατάστασης.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Γίνεται χρήση νέου αρχείου όπως ζητήσατε.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Γίνεται χρήση του τωρινού παλιού αρχείου όπως ζητήσατε.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Διατήρηση παλιού αρχείου ρυθμίσεων ως προεπιλογή.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Χρήση του νέου αρχείου ρυθμίσεων ως προεπιλογή.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2064,167 +2101,171 @@
 "      D     : εμφάνιση των διαφορών μεταξύ των εκδόσεων\n"
 "      Z     : η διεργασία εξέτασης της κατάστασης να τεθεί στο παρασκήνιο \n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Η προεπιλεγμένη ενέργεια είναι να κρατήσετε την τωρινή έκδοση.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Η προεπιλεγμένη ενέργεια είναι να εγκατασταθεί η νέα έκδοση.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[προεπιλογή=Ο]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[προεπιλογή=Ν]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[καμία προεπιλογή]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "σφάλμα κατά την εγγραφή στην stderr, ανιχνεύθηκε πριν την προτροπή για το "
 "αρχείο ρυθμίσεων"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "σφάλμα ανάγνωσης της stdin κατά την προτροπή για το αρχείο ρυθμίσεων"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "Τέλος αρχείου στην stdin κατά την προτροπή για το αρχείο ρυθμίσεων"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s εξαρτάται από %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s προεξαρτάται από %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s συνιστά το %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s προτείνει %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s \"σπάει\" το %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s συγκρούεται με %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s βελτιώνει %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s πρόκειται να αφαιρεθεί.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s πρόκειται να απορρυθμιστεί.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s πρόκειται να εγκατασταθεί, αλλά είναι έκδοση %.250s.\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s είναι εγκατεστημένο, αλλά είναι έκδοση %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s είναι αποσυμπιεσμένο αλλά δεν έχει ρυθμιστεί.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s είναι αποσυμπιεσμένο αλλά είναι έκδοση %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s τελευταία ρυθμισμένη έκδοση είναι %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s είναι %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s παρέχει %.250s αλλά πρόκειται να αφαιρεθεί.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s παρέχει %.250s αλλά πρόκειται να απορρυθμιστεί.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s παρέχει %.250s αλλά είναι %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s δεν έχει εγκατασταθεί.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (έκδοση %.250s) πρόκειται να εγκατασταθεί.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (έκδοση %.250s) είναι παρόν και %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s παρέχει %.250s και είναι προς εγκατάσταση.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "   %.250s παρέχει %.250s και είναι παρόν και %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Type dpkg-trigger --help for help about this utility."
+msgid "Use --help for help about diverting files."
 msgstr ""
+"Πληκτρολογήστε dpkg-trigger --help για βοήθεια σχετικά με αυτό το βοηθητικό "
+"πρόγραμμα."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s έκδοση %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2239,8 +2280,8 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2252,7 +2293,7 @@
 "ή\n"
 "μεταγενέστερη για συνθήκες αντιγραφής. Δεν υπάρχει ΚΑΜΙΑ εγγύηση.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2262,7 +2303,7 @@
 "Usage: %s [<option> ...] <command>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2274,7 +2315,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -2321,7 +2362,7 @@
 "Τα σενάρια preinst/postrm των πακέτων θα πρέπει πάντα να προσδιορίζουν τα --"
 "package και --divert.\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2330,19 +2371,13 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat file '%s'"
-msgstr "αδυναμία προσδιορισμού κατάστασης του παλιού ονόματος `%s': %s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error checking `%s': %s"
 msgid "error checking '%s'"
 msgstr "σφάλμα κατά τον έλεγχο `%s': %s"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2351,144 +2386,144 @@
 "η αλλαγή ονόματος περιλαμβάνει την υπεργραφή του `%s' με\n"
 "  το διαφορετικό αρχείο `%s', που δεν επιτρέπεται"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "αδύνατο το άνοιγμα του αρχείου πηγής `%.250s'"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "cannot stat new name `%s': %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "αδύνατος ο προσδιορισμός κατάστασης του νέου ονόματος `%s': %s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 #| msgid "rename: remove duplicate old link `%s': %s"
 msgid "rename: remove duplicate old link '%s'"
 msgstr "αλλαγή ονομασίας: απομάκρυνση του διπλού παλαιού συνδέσμου `%s': %s"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "αδύνατο το άνοιγμα του αρχείου πηγής `%.250s'"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "local diversion of %s"
 msgstr "τοπική εκτροπή σε: %s\n"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "local diversion of %s to %s"
 msgstr "τοπική εκτροπή σε: %s\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "diversion of %s by %s"
 msgstr "εκτροπή από %s σε: %s\n"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "diversion of %s to %s by %s"
 msgstr "εκτροπή από %s σε: %s\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "any diversion of %s"
 msgstr "τοπική εκτροπή σε: %s\n"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "any diversion of %s to %s"
 msgstr "εκτροπή από %s σε: %s\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "cannot open GPL file"
 msgid "cannot create new %s file"
 msgstr "αδυναμία ανοίγματος αρχείου GPL"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "αδύνατη η εκκένωση στο vnsprintf"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 #| msgid "remove old diversions-old: %s"
 msgid "error removing old diversions-old"
 msgstr "απομάκρυνση  παλιών diversions-old: %s"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "σφάλμα στη δημιουργία νέου αρχείου statoverride-old: %s"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "σφάλμα στην εγκατάσταση του νέου statoverride: %s"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s χρειάζεται μόνο ένα όρισμα"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "το όνομα αρχείου \"%s\" δεν είναι απόλυτο"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "το αρχείο δεν θα πρέπει να περιέχει καινούριες γραμμές"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "αδύνατη η εκτροπή των καταλόγων"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "αδύνατη η εκτροπή των καταλόγων"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "Αφήνω το `%s'"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' συγκρούεται με `%s'"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "Προσθήκη του `%s'"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
 msgstr "Καμμία εκτροπή του `%s', κανένα δεν απομακρύνθηκε"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2499,7 +2534,7 @@
 "  απομακρύνοντας το `%s'\n"
 "  βρέθηκε το`%s'"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2510,17 +2545,17 @@
 "  απομακρύνοντας το `%s'\n"
 "  βρέθηκε το `%s'"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "Αφαίρεση του `%s'"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "το πακέτο δεν θα πρέπει να περιέχει newlines"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "divert-to δεν θα πρέπει να περιέχει καινούριες γραμμές"
 
@@ -2603,8 +2638,8 @@
 "dselect ή dpkg --configure --pending (ή dpkg --triggers-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "η --%s δεν παίρνει ορίσματα"
@@ -2698,7 +2733,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions κακή συσχέτιση"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "dpkg: η έκδοση '%s' έχει κακή σύνταξη: %s\n"
@@ -2757,12 +2792,12 @@
 "dpkg - προειδοποίηση, το πρόβλημα παρακάμπτεται λόγω του --force enabled:\n"
 " "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "αδύνατο το άνοιγμα της λίστας αρχείων για το πακέτο `%.250s'"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, fuzzy, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2772,39 +2807,39 @@
 "`%.250s' δεν υπάρχει, θα υποθέσουμε ότι το πακέτο δεν έχει εγκατεστημένα\n"
 "αρχεία.\n"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "αδύνατο το άνοιγμα της λίστας αρχείων για το πακέτο `%.250s'"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "λίστα αρχείων για το πακέτο `%.250s'"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, fuzzy, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "σφάλμα κλεισίματος αρχείου λίστας αρχείων για το πακέτο `%.250s'"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Ανάγνωση βάσης δεδομένων ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2812,32 +2847,32 @@
 msgstr[0] "προς το παρόν εγκαταστάθηκαν %d αρχεία και κατάλογοι.)\n"
 msgstr[1] "προς το παρόν εγκαταστάθηκαν %d αρχεία και κατάλογοι.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "αδύνατη η δημιουργία ανανέωμένης λίστας αρχείων για το πακέτο %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "αποτυχία εγγραφής της ανανεωμένης λίστας αρχείων για το πακέτο %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "αποτυχία απόρριψης της ανανεωμένης λίστας αρχείων για το πακέτο %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "αποτυχία συγχρονισμού της ανανεωμένης λίστας αρχείων για το πακέτο %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "αποτυχία κλεισίματος της ανανεωμένης λίστας αρχείων για το πακέτο %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "αποτυχία εγκατάστασης της ανανεωμένης λίστας αρχείων για το πακέτο %s"
@@ -2876,7 +2911,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "dpkg - σφάλμα: το PATH δεν έχει οριστεί.\n"
 
 #: src/help.c:129
@@ -2908,7 +2943,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "αδύνατος ο ορισμός του setenv για το σενάριο συντήρησης (maint script)"
@@ -2919,66 +2954,66 @@
 msgstr "αποτυχία κατά το chroot στο `%.250s'"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "αποτυχία αλλαγής καταλόγου (chdir) στο `%.255s'"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "αδύνατος ο ορισμός άδειας εκτέλεσης στο `%.250s'"
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "αδύνατος ο ορισμός του setenv για το σενάριο συντήρησης (maint script)"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "παλιό σενάριο %s"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "αδύνατη η εύρεση κατάστασης του %s `%.250s'"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "νέο σενάριο %s "
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "παλιό σενάριο %s"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "αδύνατη η εύρεση κατάστασης του %s `%.250s'"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - δοκιμάζεται εναλλακτικά το σενάριο από το νέο πακέτο ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "δεν υπάρχει σενάριο στη νέα έκδοση του πακέτου - εγκατάλειψη"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... μάλλον επιτυχής..\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "αδύνατη η δημιουργία `%.255s'"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2987,7 +3022,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "αδύνατος ο έλεγχος ύπαρξης για το `%.250s'"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "αδύνατη η ανάγνωση πληροφοριών καταλόγου"
 
@@ -3063,7 +3098,7 @@
 "  -Dh|--debug=help                 Εμφάνιση βοήθειας για την αποσφαλμάτωση.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -3232,7 +3267,7 @@
 "Χρησιμοποιήστε τα `dselect' ή `aptitude' για φιλική προς τον χρήστη "
 "διαχείριση πακέτων.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3289,30 +3324,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3321,102 +3360,102 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "προβλήματα εξάρτησης - δε γίνεται αφαίρεση"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "προβλήματα εξάρτησης - δε γίνεται αφαίρεση"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "αδύνατος ο ορισμός του setenv για το σενάριο συντήρησης (maint script)"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "σφάλμα ανάγνωσης στο αρχείο ρυθμίσεων `%.255s'"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3424,7 +3463,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3432,39 +3471,39 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug απαιτεί ένα οκταδικό όρισμα"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "μη ορισμένο όνομα πακέτου στην χωρισμένη με κόμμα λίστα της --ignore-"
 "depends  `%.250s'"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "η --ignore-depends απαιτεί ένα έγκυρο όνομα πακέτου. Το `%.250s' δεν είναι. "
 "%s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "μη έγκυρος ακέραιος για --%s: `%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3473,7 +3512,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3481,12 +3520,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "άγνωστη επιλογή force/refuse `%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "Προειδοποίηση: παρωχημένη επιλογή force/refuse `%s'\n"
@@ -3509,8 +3548,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "απρόσμενο eof πριν το τέλος της γραμμής %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "χρειάζεται μια επιλογή ενέργειας"
 
@@ -3677,91 +3716,91 @@
 msgid "passed\n"
 msgstr "επιτυχής\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "απέτυχε η δημιουργία ονόματος προσωρινού καταλόγου "
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "το πακέτο %s έχει υπερβολικά πολλά ζεύγη Conflicts/Replaces"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "η παλιά έκδοση του πακέτου έχει υπερβολικά μεγάλο μήκος ονόματος αρχείου "
 "πληροφοριών`%.250s'"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "αδύνατη η διαγραφή του παρωχημένου αρχείου πληροφοριών `%.250s'"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "αδύνατη η εγκατάσταση (υποτιθέμενου) νέου αρχείου πληροφοριών `%.250s'"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "αδύνατο το άνοιγμα προσωρινού καταλόγου ελέγχου (control)"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "το πακέτο έχει υπερβολικά μεγάλο μήκος ονόματος αρχείου ελέγχου `%.250s'"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "οι πληροφορίες ελέγχου του πακέτου περιείχαν τον κατάλογο `%.250s'"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "δόθηκε rmdir του `%.250s' αλλά δεν δηλώθηκε ως μη κατάλογος"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr ""
 ";dpkg: προειδοποίηση - το πακέτο %s περιείχε λίστα ως αρχείο πληροφοριών"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "αδύνατη η εγκατάσταση νέου αρχείου πληροφοριών `%.250s' ως `%.250s'"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "αδύνατη η διαγραφή του αρχείου ελέγχου `%.250s'"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "αδύνατη η πρόσβαση στην αρχειοθήκη"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "απέτυχε η δημιουργία ονόματος προσωρινού καταλόγου "
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "έλεχγος μήκους πληροφοριών"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Καταγράφτηκαν πληροφορίες ελέγχου για το %s από %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr ""
 "η αρχιτεκτονική του πακέτου (%s) δεν ταιριάζει με αυτή του συστήματος (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3770,105 +3809,105 @@
 "dpkg: σχετικά με το %s που περιέχει %s, πρόβλημα προεξάρτησης:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "πρόβλημα προεξάρτησης - δε θα εγκατασταθεί %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr "dpkg: προειδοποίηση - αγνοείται το πρόβλημα προεξάρτησης !\n"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Προετοιμασία για αντικατάσταση %s %s (χρησιμοποιώντας το %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Γίνεται αποσυμπίεση %s (από %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "το όνομα του αρχείου ρυθμίσεων (από `%.250s') είναι πολύ μεγάλο (>%d "
 "χαρακτήρες)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "σφάλμα ανάγνωσης στο %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "σφάλμα κλεισίματος %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "σφάλμα κατά το άνοιγμα του %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Απορρύθμιση του %s, για να επιτραπεί η αφαίρεση του %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Απορρύθμιση του %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Αποσυμπίεση του αντικαταστάτη %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "σφάλμα κατά την ανάγνωση της εξόδου της tar από το dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "κατεστραμμένη αρχειοθήκη tar - κατεστραμμένη αρχειοθήκη πακέτου"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: διαγραφή πιθανών μηδενικών στο τέλος"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, fuzzy, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "dpkg: προειδοποίηση - αδύνατος ο προσδιορισμός της κατάστασης του παλιού "
 "αρχείου `%.250s' συνεπώς δεν διαγράφεται: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr ""
 "dpkg: προειδοποίηση - αδύνατη η διαγραφή του παλιού καταλόγου `%.250s': %s\n"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, fuzzy, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "dpkg: προειδοποίηση - το παλιό conffile `%.250s' ήταν ένας κενός κατάλογος "
 "(και τώρα έχει διαγραφεί)\n"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "αδύνατος ο προσδιορισμός κατάστασης άλλου καινούριου αρχείου `%.250s'"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, fuzzy, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3877,12 +3916,12 @@
 "dpkg: προειδοποίηση - το παλιό αρχείο `%.250s' είναι το ίδιο με αρκετά "
 "καινούρια αρχεία! (τόσο τα `% 250s' όσο και τα `% 250s')\n"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "dpkg: προειδοποίηση - αδύνατον να %s το παλιό αρχείο `%%.250s':%%s\n"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
@@ -4061,7 +4100,7 @@
 "επιλογή --show.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -4087,6 +4126,10 @@
 "οποία\n"
 "  περίπτωση θα χρησιμοποιηθεί στοίχιση στα αριστερά.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, fuzzy, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4149,7 +4192,7 @@
 msgid "Removing %s ...\n"
 msgstr "Αφαίρεση του %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, fuzzy, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4158,52 +4201,53 @@
 "dpkg - προειδοποίηση: κατά την αφαίρεση του %.250s, ήταν αδύνατη η αφαίρεση "
 "του καταλόγου `%.250s': %s - μήπως ο κατάλογος είναι σημείο επαφής;\n"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "αδύνατη η αφαίρεση του `%.250s'"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "αδύνατη η δημιουργία `%.255s'"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "dpkg - προειδοποίηση: κατά την αφαίρεση του %.250s, ο κατάλογος `%.250s' δεν "
 "είναι άδειος οπότε δεν αφαιρέθηκε.\n"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "αδύνατη η αφαίρεση του `%.250s'"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Διαγραφή των αρχείων ρυθμίσεων του %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "αδύνατη η διαγραφή παλιού αρχείου ρυθμίσεων του `%.250s' (= `%.250s')"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 "αδύνατη η ανάγνωση του καταλόγου των αρχείων ρυθμίσεων του `%.250s' (από `"
 "%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "αδύνατη η διαγραφή του παλιού αντιγράφου αρχείου ρυθμίσεων του `%.250s' (από "
 "`%.250s')"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "αδύνατη η διαγραφή της λίστας των παλιών αρχείων"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "αδύνατη η διαγραφή του παλιού σεναρίου postrm"
 
@@ -4246,7 +4290,11 @@
 msgid "read error on standard input"
 msgstr "σφάλμα ανάγνωσης στην πρότυπη είσοδο (stdin)"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4256,7 +4304,7 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4267,7 +4315,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -4299,56 +4347,56 @@
 "  --help                   εμφάνιση αυτού του μηνύματος βοήθειας.\n"
 "  --version                εμφάνιση της έκδοσης.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "αφαίρεση των περισσευούμενων /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "αδυναμία άνοιγματος νέου αρχείου statoverride: %s"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "σφάλμα στην αφαίρεση του statoverride-old: %s"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "σφάλμα στη δημιουργία νέου αρχείου statoverride-old: %s"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "σφάλμα στην εγκατάσταση του νέου statoverride: %s"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "η εντολή --add χρειάζεται τέσσερα ορίσματα"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, fuzzy, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr "αλλά έχει δοθεί η επιλογή --force οπότε θα αγνοηθεί."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, fuzzy, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Υπάρχει ήδη override για το \"%s\","
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, fuzzy, c-format
 msgid "--update given but %s does not exist"
 msgstr "προειδοποίηση: δόθηκε --update αλλά το %s δεν υπάρχει"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Δεν υπάρχει override."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 #, fuzzy
 msgid "--update is useless for --remove"
 msgstr "προειδοποίηση: το --update είναι άχρηστο για το --remove"
@@ -4421,18 +4469,18 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "αρχείο statoverride `%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
 "Πληκτρολογήστε dpkg-trigger --help για βοήθεια σχετικά με αυτό το βοηθητικό "
 "πρόγραμμα."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Βοηθητικό εργαλείο για τους trigger πακέτων του Debian %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4443,7 +4491,7 @@
 "       %s [<options> ...] <command>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4456,7 +4504,7 @@
 "υποστηρίζει triggers.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4481,22 +4529,22 @@
 "πραγματικότητα τίποτα.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: ο κατάλογος δεδομένων των triggers δεν έχει ακόμα δημιουργηθεί\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: αρχεία των trigger δεν υπάρχουν ακόμα\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 #, fuzzy
 msgid "takes one argument, the trigger name"
 msgstr "dpkg-trigger παίρνει ένα όρισμα, το όνομα του trigger"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4506,13 +4554,13 @@
 "το dpkg-trigger πρέπει να κληθεί από ένα σενάριο συντηρητή (ή με την επιλογή "
 "--by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: μη θεμιτό όνομα πακέτου σε αναμονή  `%.250s': %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "dpkg-trigger: μη έγκυρο όνομα trigger `%.250s': %.250s"
@@ -4546,33 +4594,34 @@
 msgstr "Επεξεργασία των trigger για %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "η --%s απαιτεί ακριβώς μία παράμετρο ένα αρχείο Packages"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "αδύνατη η πρόσβαση στο αρχείο κατάστασης του dpkg για μαζικές ανανεώσεις "
 "διαθεσιμότητας"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "οι μαζικές ανανεώσεις διαθεσιμότητας απαιτούν άδεια εγγραφής στο αρχείο "
 "κατάστασης"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Αντικατάσταση πληροφοριών διαθέσιμων πακέτων, με χρήση του %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Ανανέωση πληροφοριών διαθέσιμων πακέτων, με χρήση του %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4580,7 +4629,7 @@
 msgstr[0] "Ανανεώθηκαν οι πληροφορίες για %d πακέτα.\n"
 msgstr[1] "Ανανεώθηκαν οι πληροφορίες για %d πακέτα.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4701,8 +4750,8 @@
 msgstr[1] ""
 "dpkg-deb: παραλείπονται %d προειδοποιητικά μηνύματα για τα αρχεία control\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s χρειάζεται ένα όρισμα <directory>"
@@ -4735,26 +4784,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: δημιουργία πακέτου `%s' στο `%s'.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "απέτυχε η δημιουργία του προσωρινού αρχείου tmpfile (data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "έλεγχος περιοχής"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "απέτυχε η διαγραφή του προσωρινού αρχείου tmpfile (data), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4770,20 +4819,20 @@
 msgid "error writing `%s'"
 msgstr "σφάλμα κατά την εγγραφή `%s'"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "ανάμεσα στα μέλη"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "απέτυχε η εγγραφή του ονόματος αρχείου στη σωλήνωση της tar (data)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4801,79 +4850,79 @@
 msgid "error reading %s from file %.255s"
 msgstr "σφάλμα ανάγνωσης του %s από το αρχείο %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "αδύνατο το άνοιγμα της αρχειοθήκης `%.255s'"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "απέτυχε η fstat στην αρχειοθήκη"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "η αρχειοθήκη δεν έχει τελεία στον αριθμό έκδοσης"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "η αρχειοθήκη δεν έχει χαρακτήρες newline στην κεφαλίδα"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "το αρχείο `%.250s' είναι κατεστραμμένο - λάθος αριθμός τμήματος"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "το αρχείο `%.250s' δεν είναι αρχειοθήκη πακέτου debian (δοκιμάστε dpkg-"
 "split;)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "η αρχειοθήκη δεν έχει τελεία στον αριθμό έκδοσης"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "η αρχειοθήκη δεν έχει χαρακτήρες newline στην κεφαλίδα"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "η αρχειοθήκη δεν έχει τελεία στον αριθμό έκδοσης"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "μη κατανοητή η έκδοση της αρχειοθήκης %.250s, χρειάζεστε νεώτερο dpkg-deb"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "παραλείφθηκε μέλος δεδομένων από %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "το αρχείο `%.250s' περιέχει μη κατανοητά δεδομένα %.*s, εγκατάλειψη"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "το αρχείο `%.250s' περιέχει δύο μέλη control, εγκατάλειψη"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4885,23 +4934,23 @@
 " νέο πακέτο debian, έκδοση %s.\n"
 " μέγεθος %ld bytes: αρχειοθήκη control = %zi bytes.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "η αρχειοθήκη έχει κακοδιαμορφωμένο έλεγχο μήκους `%s'"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "παραλείφθηκε μέλος δεδομένων από %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4913,7 +4962,7 @@
 " παλιό πακέτο debian, έκδοση %s.\n"
 " μέγεθος %ld bytes: αρχειοθήκη control = %zi bytes, κυρίως αρχειοθήκη= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4922,51 +4971,52 @@
 "dpkg-deb: το αρχείο φαίνεται ως αρχειοθήκη που πιθανόν να έχει καταστραφεί\n"
 "dpkg-deb:    από μεταφόρτωση σε κατάσταση ASCII\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "το `%.255s' δεν είναι μια αρχειοθήκη debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "απέτυχε η εγγραφή στη σωλήνωση της copy"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "απέτυχε το κλείσιμο της σωλήνωσης της copy"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "δεδομένα"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "απέτυχε η αλλαγή καταλόγου (chdir)"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "απέτυχε η δημιουργία καταλόγου"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "απέτυχε η αλλαγή καταλόγου (chdir) μετά τη δημιουργία του"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "απέτυχε η αλλαγή καταλόγου (chdir)"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s: αποσυμπίεση"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 #, fuzzy
 msgid "paste"
 msgstr "επιτυχής\n"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "η --%s χρειάζεται ένα όρισμα ονόματος αρχείου .deb"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4975,38 +5025,38 @@
 "η --%s χρειάζεται έναν κατάλογο στόχο.\n"
 "Ίσως πρέπει να χρησιμοποιήσετε dpkg --install ;"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "η --%s παίρνει το πολύ δύο ορίσματα (.deb και κατάλογο)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "η --%s παίρνει μόνο ένα όρισμα (όνομα αρχείου .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "απέτυχε η αλλαγή καταλόγου στον '/' για τερματισμό"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
 msgid "control file '%s'"
 msgstr "αδυναμία προσδιορισμού κατάστασης του παλιού ονόματος `%s': %s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: το `%.255s' δεν περιέχει τμήμα ελέγχου `%.255s'\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "το άνοιγμα του τμήματος `%.255s' (στο %.255s) απέτυχε με απρόσμενο τρόπο"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, fuzzy, c-format
 #| msgid "One requested control component is missing"
 msgid "%d requested control component is missing"
@@ -5014,59 +5064,59 @@
 msgstr[0] "Δεν υπάρχει ένα τμήμα ελέγχου που ζητήθηκε"
 msgstr[1] "Δεν υπάρχει ένα τμήμα ελέγχου που ζητήθηκε"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "αδύνατη η ανίχνευση του καταλόγου `%.255s'"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "αδύνατη η εύρεση κατάστασης (stat) του `%.255s' (στο `%.255s')"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "αδύνατο το άνοιγμα του `%.255s' (στο `%.255s')"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "απέτυχε η ανάγνωση `%.255s' (στο `%.255s')"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bytes, %5d γραμμές   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     όχι απλό αρχείο           %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(δεν υπάρχει αρχείο `control' στην αρχειοθήκη ελέγχου)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "αδύνατο το άνοιγμα του τμήματος `control'"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "σφάλμα κατά την ανάγνωση από το τμήμα `control'"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "αδύνατο το κλείσιμο της σωλήνωσης της find"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Σφάλμα στη μορφοποίηση"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "η --contents παίρνει μόνο ένα όρισμα"
 
@@ -5076,7 +5126,19 @@
 msgstr "Backend έκδοση %s του αρχείου πακέτου του Debian `%s'.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -5087,6 +5149,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -5103,7 +5167,7 @@
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -5116,11 +5180,12 @@
 "<cfield> είναι το όνομα ενός πεδίου στο κύριο αρχείο `ελέγχου'.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5147,7 +5212,7 @@
 "lzma, καμμία.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5163,7 +5228,7 @@
 "που αποσυμπιέζονται με χρήση του `dpkg-deb --extract' δεν θα εγκατασταθούν  "
 "σωστά!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5172,17 +5237,17 @@
 "*.deb. Πληκτρολογήστε dpkg --help για βοήθεια σχετικά με εγκατάσταση και\n"
 "απεγκατάσταση πακέτων."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "μη έγκυρος ακέραιος για --%s: `%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "μη έγκυρος ακέραιος για --%s: `%.250s'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "άγνωστος τύπος συμπίεσης '%s'!"
@@ -5204,7 +5269,7 @@
 msgstr ""
 "το αρχείο `%.250s' είναι κατεστραμμένο - αγνοείται newline μετά το %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "σφάλμα κατά την ανάγνωση %.250s"
@@ -5298,55 +5363,59 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "το αρχείο `%.250s' είναι κατεστραμμένο - λάθος αριθμός τμήματος"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+msgid "package architecture"
+msgstr ""
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "το αρχείο `%.250s' είναι κατεστραμμένο - λάθος κωδικός magic στο τέλος της "
 "2ης κεφαλίδας"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "το αρχείο `%.250s' είναι κατεστραμμένο - το 2ο μέλος δεν είναι μέλος "
 "δεδομένων"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "το αρχείο `%.250s' είναι κατεστραμμένο - λάθος αριθμός τμημάτων για τα "
 "δοσμένα μεγέθη"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "το αρχείο `%.250s' είναι κατεστραμμένο - λάθος μέγεθος για συγκεκριμένο "
 "αριθμό τμήματος"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "αδύνατη η εκτέλεση της fstat στο αρχείο τμήματος `%.250s'"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "το αρχείο `%.250s' είναι αλλοιωμένο - πολύ βραχύ"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "αδύνατο το άνοιγμα του αρχείου τμήματος της αρχειοθήκης `%.250s'"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "το αρχείο `%.250s' δεν είναι τμήμα της αρχειοθήκης"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5366,6 +5435,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5388,12 +5458,19 @@
 "    Μέγεθος αρχείου τμήματος (σε χρήση):  %lu bytes\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<άγνωστο>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "η --info απαιτεί ένα ή περισσότερα αρχεία τμήματος ως παραμέτρους"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "το αρχείο `%s' δεν είναι τμήμα της αρχειοθήκης\n"
@@ -5427,7 +5504,7 @@
 msgid "split package part"
 msgstr "λείπει το πακέτο"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "έγινε\n"
@@ -5481,17 +5558,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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"
 "  --depotdir <directory>           Χρήση του καταλόγου <directory> αντί του "
@@ -5506,20 +5592,29 @@
 "\n"
 "Κατάσταση εξόδου: 0 = OK;  1 = -a δεν είναι ένα κομμάτι;  2 = πρόβλημα!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Δώστε dpkg-split --help για βοήθεια."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "απρόσμενο τέλος αρχείου στο %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "το μέγεθος του τμήματος είναι πολύ μεγάλο ή μη θετικό"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, fuzzy, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -5631,42 +5726,42 @@
 msgid "Deleted %s.\n"
 msgstr "Διεγράφη το %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "αδύνατο το άνοιγμα του αρχείου πηγής `%.250s'"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "αδύνατο η εύρεση κατάστασης του αρχείου πηγής"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "το αρχείο πηγής `%.250s' δεν είναι κοινό αρχείο"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "η --split χρειάζεται ένα όρισμα πηγαίου ονόματος αρχείου"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "η --split δέχεται το πολύ ένα όνομα αρχείου πηγής και ένα πρόθεμα προορισμού"
@@ -5839,132 +5934,93 @@
 "  --help                   εμφάνιση αυτού του μηνύματος βοήθειας.\n"
 "  --version                εμφάνιση της έκδοσης.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr ""
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 #, fuzzy
 msgid "warning"
 msgstr "εγκατάλειψη"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat %s: %s"
-msgstr "αδυναμία προσδιορισμού κατάστασης του παλιού ονόματος `%s': %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, fuzzy, c-format
 #| msgid "two commands specified: %s and --%s"
 msgid "two commands specified: --%s and --%s"
 msgstr "έχουν προσδιοριστεί δύο εντολές: %s και --%s"
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
 #| msgid "cannot open diversions: %s"
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "αδυναμία ανοίγματος εκτροπών: %s"
 
-#: utils/update-alternatives.c:395
-#, fuzzy, c-format
-#| msgid "%s: copying %s to %s failed, giving up: %s"
-msgid "scan of %s failed: %s"
-msgstr "%s: η αντιγραγή το %s σε %s απέτυχε, εγκαταλείπω: %s"
-
-#: utils/update-alternatives.c:420
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "αδύνατη η εκτέλεση του %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "αδύνατη η δημιουργία %s ενός συμβολικού δεσμού στο %s: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "αδύνατη η εγκατάσταση του %s ως %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "αδύνατη η αφαίρεση του  %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "απρόσμενο τέλος αρχείου του %s στο %.255s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "αδύνατη η ανάγνωση του %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "απρόσμενο τέλος αρχείου του %s στο %.255s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, fuzzy, c-format
 msgid "%s corrupt: %s"
 msgstr "εσωτερικό σφάλμα: %s corrupt: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "απαγορεύονται newlines στα αρχεία (%s) του update-alternatives."
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "σφάλμα εγγραφής στο stdout: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "επαναλαμβανόμενος δευτερεύων σύνδεσμος %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 #, fuzzy
 msgid "slave link"
 msgstr "επαναλαμβανόμενος δευτερεύων σύνδεσμος %s"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "ο δευτερεύων σύνδεσμος είναι ο ίδιος με τον πρωτεύοντα %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "επαναλαμβανόμενος δευτερεύων σύνδεσμος %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "επαναλαμβανόμενη διαδρομή %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, fuzzy, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5973,237 +6029,273 @@
 "Η εναλλακτική για το %s παραπέμπει στο %s - που δεν βρέθηκε.  Αφαίρεση από "
 "την λίστα των εναλλακτικών."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 #, fuzzy
 msgid "priority"
 msgstr "προτεραιότητα %s %s"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, fuzzy, c-format
 msgid "priority of %s: %s"
 msgstr "προτεραιότητα %s %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "αδύνατη η ανάγνωση του %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 #, fuzzy
 msgid "invalid status"
 msgstr "μη έγκυρη κατάσταση ενημέρωσης"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 #, fuzzy
 msgid "master link"
 msgstr "επαναλαμβανόμενος δευτερεύων σύνδεσμος %s"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "αδύνατο το κλείσιμο του %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, fuzzy, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "Αφαίρεση του παρωχημένου δευτερεύοντος συμβολικού συνδέσμου %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "αδύνατη η εγγραφή του %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, fuzzy, c-format
 msgid "  link currently points to %s"
 msgstr " ο σύνδεσμος παραπέμπει αυτή τη στιγμή στο %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 #, fuzzy
 msgid "  link currently absent"
 msgstr " ο σύνδεσμος απουσιάζει αυτή τη στιγμή"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "%s - priority %s"
 msgid "%s - priority %d"
 msgstr "%s - προτεραιότητα %s"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr " δευτερεύων %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Η τρέχουσα `βέλτιστη' έκδοση είναι %s."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Δεν υπάρχουν διαθέσιμες εκδόσεις."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "Περιγραφή"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 #, fuzzy
 msgid "Priority"
 msgstr "προτεραιότητα %s %s"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, fuzzy, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Πατήστε enter για να κρατήσετε την προκαθορισμένη[*], ή πληκτρολογήστε τον "
 "αριθμό της επιλογής σας: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Δεν μπορώ να βρω την εναλλκτική `%s'."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "απρόσμενο τέλος αρχείου του %s στο %.255s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "Μετονομασία %s συνδέσμου από %s σε %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, fuzzy, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr ""
 "Αλλαγή της ονομασίας του δευτερεύοντος συμβολικού συνδέσμου %s από %s σε %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr ""
+
+#: utils/update-alternatives.c:2241
+#, fuzzy, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "προειδοποίηση: δόθηκε --update αλλά το %s δεν υπάρχει"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr ""
+"Η εναλλακτική για το %s παραπέμπει στο %s - που δεν βρέθηκε.  Αφαίρεση από "
+"την λίστα των εναλλακτικών."
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr ""
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "άγνωστος όρισμα `%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "η εντολή --install χρειάζεται <link> <name> <path> <priority>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "η προτεραιότητα πρέπει να είναι ένας ακέραιος αριθμός"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s χρειάζεται <name> <path>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s χρειάζεται <name>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "η εντολή --slave επιτρέπεται μόνο με την --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "η εντολή --slave χρειάζεται <link> <name> <path>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "το όνομα %s είναι ταυτόχρονα και πρωτεύον και δευτερεύον"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "ο σύνδεσμος %s είναι ταυτόχρονα και πρωτεύων και δευτερεύων"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s χρειάζεται μόνο ένα όρισμα"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "άγνωστη επιλογή `%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -6212,67 +6304,23 @@
 "χρειάζεται μία από τις --display, --config, --set, --install, --remove, --"
 "all, --remove-all  ή --auto"
 
-#: utils/update-alternatives.c:2215
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr ""
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2239
-#, fuzzy, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "προειδοποίηση: δόθηκε --update αλλά το %s δεν υπάρχει"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
-
-#: utils/update-alternatives.c:2257
-#, fuzzy, c-format
-msgid "it is a slave of %s"
-msgstr " δευτερεύων %s: %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "σφάλμα ανάγνωσης στην πρότυπη είσοδο (stdin)"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, fuzzy, c-format
 msgid "no alternatives for %s."
 msgstr "Δεν υπάρχουν εναλλακτικές για το %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
@@ -6281,73 +6329,113 @@
 "Το %s έχει μεταβληθεί (είτε με το χέρι είτε από κάποιο σενάριο).\n"
 "Αλλαγή σε ενημερώσεις μόνο με το χέρι."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, fuzzy, c-format
 msgid "setting up automatic selection of %s."
 msgstr "Καθορισμός αυτόματης επιλογής για το %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "Η εναλλακτική %s για το %s δεν είναι καταγεγραμμένη, δεν αφαιρείται."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 "Δεν υπάρχει πρόγραμμα που να παρέχει το %s.\n"
 "Τίποτα προς ρύθμιση.\n"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "Η εναλλακτική %s για το %s δεν είναι καταγεγραμμένη, δεν αφαιρείται."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, fuzzy, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "Αφαίρεση της επιλεγμένης με το χέρι εναλλακτικής - αλλαγή στην αυτόματη "
 "κατάσταση"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "Οι αυτόματες ενημερώσεις του %s έχουν απενεργοποιηθεί, το αφήνω."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 "Για να επιστρέψετε σε αυτόματες ενημερώσεις χρησιμοποιήστε την εντολή "
 "`update-alternatives --auto %s'."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "Χρήσιμοποίηση του '%s' για παροχή του '%s'."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~ msgid "it is a slave of %s"
+#~ msgstr " δευτερεύων %s: %s"
+
+#, fuzzy
+#~| msgid "cannot stat old name `%s': %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "αδυναμία προσδιορισμού κατάστασης του παλιού ονόματος `%s': %s"
+
+#, fuzzy
+#~| msgid "%s: copying %s to %s failed, giving up: %s"
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "%s: η αντιγραγή το %s σε %s απέτυχε, εγκαταλείπω: %s"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "αδύνατη η εκτέλεση του %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "αδύνατη η δημιουργία %s ενός συμβολικού δεσμού στο %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "αδύνατη η εγκατάσταση του %s ως %s: %s"
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "σφάλμα εγγραφής στο stdout: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "αδύνατη η ανάγνωση του %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "αδύνατο το κλείσιμο του %s: %s"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "αδύνατη η εγγραφή του %s: %s"
+
+#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "Αδύνατη η μετονομασία του %s σε %s: %s"
@@ -6659,9 +6747,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "παραλείφθηκε μέλος δεδομένων από %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "απέτυχε η εκτέλεση της tar"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "απέτυχε η δημιουργία ονόματος προσωρινού καταλόγου "
diff -uNr --exclude .git --exclude .bzr dpkg/po/en@boldquot.header /home/vorlon/devel/multiarch/dpkg-debian/po/en@boldquot.header
--- dpkg/po/en@boldquot.header	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/en@boldquot.header	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,25 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#
diff -uNr --exclude .git --exclude .bzr dpkg/po/en@quot.header /home/vorlon/devel/multiarch/dpkg-debian/po/en@quot.header
--- dpkg/po/en@quot.header	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/en@quot.header	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,22 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
Binary files dpkg/po/eo.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/eo.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/eo.po /home/vorlon/devel/multiarch/dpkg-debian/po/eo.po
--- dpkg/po/eo.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/eo.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-12-20 01:47+0100\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <debian-l10n-esperanto@lists.debian.org>\n"
@@ -23,7 +23,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "maleblas skribi dosieron '%s'"
@@ -44,71 +44,77 @@
 msgid "ar member file (%s)"
 msgstr "malsukcesis apliki fstat al dosiero ano de ar (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "malsukcesis legi bufran kopion por %s"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "malsukcesis skribi bufran kopion por %s"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "bitoko legita en bufra kopio por %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "malsukceso dum lanĉo de tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "maleblas lanĉi %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: malkompaktigo"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: kompaktado"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: eraro dum kunligado de enigo al gzip-fluo"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: interna leg-eraro de gzip: '%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: interna skrib-eraro de gzip"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: eraro dum kunligado de eligo al gzip-fluo"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: interna leg-eraro de gzip"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: interna skrib-eraro de gzip: '%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: interna skrib-eraro de gzip: %s"
@@ -123,31 +129,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: interna leg-eraro de bzip2: '%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: interna skrib-eraro de bzip2"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: eraro dum kunligado de eligo al bzip2-fluo"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: interna leg-eraro de bzip2"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: interna skrib-eraro de bzip2: '%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "neatendita eraro de bzip2"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -156,7 +162,7 @@
 "ĝisdatiga dosierujo enhavas la dosieron '%.250s', kies nomo estas tro longa "
 "(longeco=%d, maks=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -164,98 +170,98 @@
 "ĝisdatiga dosierujo enhavas dosierojn kun malsamaj longecoj de nomoj (kaj %d "
 "kaj %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "ne eblas skani la ĝisdatigan dosierujon '%.255s'"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "malsukcesis forigi enkorpigitan ĝisdatigan dosieron %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "maleblas krei '%.255s'"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "maleblas plenigi %.250s per ŝtopado"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "maleblas elbufrigi %.250s post ŝtopado"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "maleblas retroiri al la komenco de %.250s post ŝtopado"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "maleblas malfermi ŝlos-dosieron %s por testado"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "maleblas malfermi/krei ŝlosdosieron de stato-datumbazo"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "vi ne havas permeson por malŝlosi la stato-datumbazon de dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "maleblas ŝlosi la stato-datumbazon de dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "la petita operacio postulas privilegion de superuzanto"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "maleblas aliri stat-areo de dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "la operacio postulas leg/skrib-aliron al la stat-areo de dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "malsukcesis forigi mian propran ĝisdatigan dosieron %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "maleblas skribi ĝisdatigitan staton de '%.250s'"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "maleblas elbufrigi la ĝisdatigitan staton de '%.250s'"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "maleblas distranĉi la ĝisdatigitan staton de '%.250s'"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "maleblas apliki 'fsync' al la ĝisdatigitan staton de '%.250s'"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "maleblas fermi la ĝisdatigitan staton de '%.250s'"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "maleblas instali la ĝisdatigitan staton de '%.250s'"
@@ -278,70 +284,72 @@
 msgid "unable to open directory '%s'"
 msgstr "maleblas malfermi la dosieron '%s'"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "maleblas malfermi la dosieron '%s'"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "maleblas sinkronigi dosieron '%s'"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "maleblas fermi dosieron '%s'"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "malsukcesis skribi la detalojn de '%.50s' al '%.250s'"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "malsukcesis malfermi '%s' por skribi datumbazon %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "maleblas ŝalti bufradon por datumbaza dosiero %s"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "malsukcesis skribi datumbazan registron %s je '%.50s' al '%.250s'"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "malsukcesis elbufrigi datumbazon %s al '%.250s'"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "malsukcesis 'fsync' datumbazon %s al '%.250s'"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "malsukcesis fermi '%.250s' post skribado de datumbazo %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "malsukcesis ligi '%.250s' al '%.250s' por sekurkopii datumbazon %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "malsukcesis instali '%.250s' kiel '%.250s' enhavantan datumbazon %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -350,7 +358,7 @@
 "%s: nerestarigebla gravega eraro, ni ĉesas:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -362,13 +370,13 @@
 "%s: nerestarigebla gravega eraro, ni ĉesas:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "mankas memoro por nova puriga enigaĵo"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -377,32 +385,32 @@
 "%s: eraro dum purigado de ĉio:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: tro multaj ingitaj eraroj dum restaŭrado de eraroj !!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "mankas memoro por nova puriga enigaĵo"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "mankas memoro por nova puriga enigaĵo kun multaj argumentoj"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s: averto: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: averto: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: interna eraro: %s\n"
@@ -418,107 +426,107 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "'%.*s' ne estas permesata por %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "rubaĵo post %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "malvalida pak-nomo (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "malplena kampo de dosier-detaloj '%s'"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "kampo de dosier-detaloj '%s' ne estas permesata en stat-dosiero"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "tro multaj valoroj en kampo de dosier-detaloj '%s' (kompare al aliaj)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "tro malmultaj valoroj en kampo de dosier-detaloj '%s' (kompare al aliaj)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "jes/ne en bulea kampo"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "vorto en kampo 'priority'"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "valoro por kampo 'status' ne estas permesata en tiu ĉi kunteksto"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "unua (volas) vorto en kampo 'status'"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "dua (eraro) vorto en kampo 'status'"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "tria (stato) vorto en kampo 'status'"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "eraro en ĉeno Version '%.250s'"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "malaktuala kampo 'Revision' aŭ 'Package-Revision' estis uzita"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr ""
 "valoro por kampo 'config-version' ne estas permesata en tiu ĉi kunteksto"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "eraro en ĉeno Config-Version '%.250s'"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "valoro por conffiles havas misformitan linion '%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "valoro por conffiles havas linion komencantan per ne-spaco '%c'"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "radika aŭ nula dosierujo estas listita kiel 'conffile'"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 "kampo '%s', mankanta pak-nomo, aŭ rubaĵo tie, kie pak-nomo estis atendita"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "kampo '%s', malvalida pak-nomo '%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -527,7 +535,7 @@
 "kampo '%s', referenco al '%.255s':\n"
 " malĝusta versio-rilato %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -536,7 +544,7 @@
 "kampo `%s', referenco al '%.255s':\n"
 " '%c' estas malaktuala, uzu '%c=' aŭ '%c%c' anstataŭe"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -545,11 +553,11 @@
 "kampo `%s', referenco al '%.255s':\n"
 " implicita ekzakta kongruo al versi-numero, ni sugestas uzon de '=' anstataŭe"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Nur ekzaktaj versioj povas esti uzataj por Provizas"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -558,57 +566,57 @@
 "kampo `%s', referenco al '%.255s':\n"
 " versio-valoro komencas per ne-alfanumero, ni sugestas aldonon de spaco"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "kampo '%s', referenco al '%.255s': la versio enhavas '%c'"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "kampo '%s', referenco al '%.255s': versio ne finigita"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "kampo '%s', referenco al '%.255s': eraro en versio"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "kampo '%s', sintaksa eraro post referenco al pako '%.255s'"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternativoj ('|') ne estas permesataj en kampo %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 "valoro por kampo 'triggers-pending' ne estas permesata en tiu ĉi kunteksto"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "malvalida nomo de pritraktota ekigilo '%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "ripetita pritraktota ekigilo '%.255s'"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr ""
 "valoro por kampo 'triggers-awaited' ne estas permesata en tiu ĉi kunteksto"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "malvalida pak-nomo en atendata ekigilo '%.255s': %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "ripetita atendata ekiga pako '%.255s'"
@@ -665,7 +673,7 @@
 msgid "unable to write to status fd %d"
 msgstr "maleblas skribi al stata fd %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "malloc failed (%ld bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -677,8 +685,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc malsukcesis (%ld bajtoj)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "malsukceso dum provo rezervi memoron"
 
@@ -711,198 +719,204 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "maleblas ŝalti flagojn 'close-on-exec' (fermi-je-plenumo) por %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "agorda eraro: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "malsukceso dum malfermo de agordo-dosiero '%.255s' por legi: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "ne spegulitaj citiloj en '%s'"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "nekonata elekteblo '%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "'%s' bezonas valoron"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "'%s' ne akceptas valoron"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "leg-eraro en agorda dosiero '%.255s'"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "eraro dum fermo de agordo-dosiero '%.255s'"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "eraro dum malfermo de agordo-dosierujo '%s'"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "nekonata elekteblo --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "elekteblo --%s postulas valoron"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "elekteblo --%s ne akceptas valoron"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "nekonata elekteblo -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "elekteblo -%c postulas valoron"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "elekteblo -%c ne akceptas valoron"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "malaktuala elekteblo '--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "konfliktantaj agoj -%c (--%s) kaj -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "ripetita valoro por kampo '%s'"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "kamp-nomo difinita de uzanto '%.*s' tro mallonga"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "ripetita valoro por la kampo difinita de uzanto '%.*s'"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "'Configured-Version' por pako kun maltaŭga 'Status'"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "pako havas staton %s sed ekigiloj estas atendataj"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "pako havas staton 'triggers-awaited' sed neniun atendatan ekigilon"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "paco havas staton %s sed ankoraŭ estas ekigiloj pritraktotaj"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "pako havas staton 'triggers-pending' sed neniun pritraktotan ekigilon"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "Pako kiu estas en stato ne-instalite havas conffiles, ni forlasas ilin"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "malsukceso dum malfermo de paka inform-dosiero '%.255s' por legi"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "ne eblas legi staton de paka inform-dosiero '%.255s'"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "ne eblas apliki 'mmap' je paka inform-dosiero '%.255s'"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "ne eblas legi staton de paka inform-dosiero '%.255s'"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "malsukceso dum malfermo post lego: '%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF post kampo-nomo '%.*s'"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "lini-fina signo en kampo nomo '%.*s'"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS EOF (^Z) en kampo nomo '%.*s'"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "kampo nomo '%.*s' devas esti sekvata de dupunkto"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF antaŭ valoro de kampo '%.*s' (mankas lini-fina signo)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "signo MSDOS EOF en valoro de kampo '%.*s' (ĉu mankas lini-fina signo?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "lini-fina signo en kampo nomo '%.*s'"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF en valoro de kampo '%.*s' (mankas lini-fina signo)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "pluraj pak-informaj enmetaĵoj estis trovitaj, nur unu estas permesate"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "malsukceso dum malfermo post lego: '%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "neniu pak-infomo en '%.255s'"
@@ -931,62 +945,62 @@
 "%s, en dosiero '%.255s' proksime de linio %d:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "ne povas esti malplena ĉeno"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "devas komenciĝi per alfanumera signo"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "signo '%c' ne estas permesate (nur literoj, ciferoj kaj signoj '%s')"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<nenio>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "versi-ĉeno estas malplena"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "versi-ĉeno havas enigitajn spacojn"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "POSIX-dato (epoch) en versio ne estas numero"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "nenio post dupunkto en versi-numero"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "malvalida signo en versi-numero"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "malvalida signo en revizi-numero"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "mankas %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "malplena valoro por %s"
@@ -1005,52 +1019,52 @@
 msgid "(no description available)"
 msgstr "(neniu priskribo disponeblas)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "maleblas ignori la signalon %s antaŭ ol plenumi %.250s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "eraro dum malkaptado de la signalo %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (subprocezo): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "disbranĉigo malsukcesis"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "la subprocezo %s liveris eraran elir-staton %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "atendo je subprocezo %s malsukcesis"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "la subprocezo %s estis ĉesigita de signalo (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", nekropsio"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "la subprocezo %s malsukcesis kun atenda stato-kodo %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "atendo je subprocezo %s malsukcesis"
@@ -1072,62 +1086,54 @@
 msgstr ""
 "sintaks-eraro en ekigiloj prokrastigis la dosieron '%.250s' ĉe signo '%s'%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "maleblas malfermi/krei ŝlos-dosieron de ekigiloj '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "ekigita"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "maleblas legi staton de dosiero prokrastita de ekigiloj '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "maleblas malfermi dosieron prokrastitan de ekigiloj '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 "maleblas malfermi/krei novan dosieron prokrastitan de ekigiloj '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "eraro dum lego de dosiero prokrastita de ekigiloj '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "maleblas skribi novan dosieron prokrastitan de ekigiloj '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "maleblas fermi novan dosieron prokrastitan de ekigiloj '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "maleblas instali novan dosieron prokrastitan de ekigiloj '%.250s'"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "malplenaj ekigilo-nomoj ne estas permesataj"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "ekigilo-nomo enhavas malvalidan signon"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1136,17 +1142,17 @@
 "malvalida aŭ nekonata sintakso en ekigilo-nomo '%.250s' (en ekigilaj "
 "interesoj por la pako '%.250s')"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "malsukceso dum malfermo de listdosiero de ekigil-intereso '%.250s'"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "malsukceso dum retroigo de dosiero de ekigil-intereso '%.250s'"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1155,84 +1161,90 @@
 "sintaksa eraro en dosiero de ekigil-intereso '%.250s'; malpermesata pak-nomo "
 "'%.250s': %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "maleblas krei novan dosieron de ekigil-intereso '%.250s'"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "maleblas skribi novan dosieron de ekigil-intereso '%.250s'"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "maleblas elbufrigi novan dosieron de ekigil-intereso '%.250s'"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "maleblas sinkronigi novan dosieron de ekigil-intereso '%.250s'"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "maleblas fermi novan dosieron de ekigil-intereso '%.250s'"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "maleblas instali novan dosieron de ekigil-intereso '%.250s'"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "ne eblas forigi '%.250s'"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "maleblas krei novan dosieron de ekigil-intereso '%.250s'"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "maleblas fermi novan dosieron de ekigil-intereso '%.250s'"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 "ripetita dosiera ekigil-intereso por dosiernomo '%.250s' kaj pako '%.250s'"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "maleblas krei novan dosier-ekigilan dosieron '%.250s'"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "maleblas skribi novan dosier-ekigilan dosieron '%.250s'"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "maleblas elbufrigi novan dosier-ekigilan dosieron '%.250s'"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "maleblas sinkronigi novan dosier-ekigilan dosieron '%.250s'"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "maleblas fermi novan dosier-ekigilan dosieron '%.250s'"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "maleblas instali novan dosier-ekigilan dosieron kiel '%.250s'"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "maleblas legi dosier-ekigilan dosieron '%.250s'"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "sintaksa eraro en dosier-ekigila dosiero '%.250s'"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1241,7 +1253,7 @@
 "dosier-ekigila registraĵo aludas malpermesatan pak-nomon '%.250s' (por "
 "intereso en la dosiero '%.250s'): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1250,30 +1262,38 @@
 "ekigila ci-dosiero '%.250s' enhavas malpermesata ekigila sintakso en ekigila "
 "nomo '%.250s': %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "maleblas malfermi ekigil-ci-dosieron '%.250s'"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "ekigil-ci-dosiero enhavas nekonatan sintakson de gvidlinioj"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "ekigil-ci-dosiero enhavas nekonatan gvidlinion '%.250s'"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "maleblas krei ekigil-statan dosierujon '%.250s'"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "maleblas difini posedon de ekigil-stata dosierujo '%.250s'"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "malplenaj ekigilo-nomoj ne estas permesataj"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "ekigilo-nomo enhavas malvalidan signon"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1298,7 +1318,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "eraro dum formado de ĉeno enen de variablo varbuf"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "eraro dum legado el dukto de dpkg-deb"
 
@@ -1318,12 +1338,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "eraro dum difino de posedo de simbola ligilo '%.255s'"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "eraro dum difino de posedo de '%.255s'"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "eraro dum difino de permesoj de '%.255s'"
@@ -1381,17 +1401,26 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arkivo enhavis objekton '%.255s' el nekonata tipo 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "ne eblas 'stat' dosieron '%s'"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Anstataŭigo de dosieroj en la malnova pako %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Anstataŭite per dosieroj en la instalita pako %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1400,93 +1429,98 @@
 "provo anstataŭigi la dosierujon '%.250s' en la pako %.250s %.250s kun ne-"
 "dosierujo"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "provo anstataŭigi '%.250s', kiu ankaŭ estas en la pako %.250s %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "maleblas krei '%.255s' (dum procezado de '%.255s')"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "subteni dpkg-deb dum '%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "eraro dum fermo/skribo de '%.255s'"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "eraro dum kreo de dukto '%.255s'"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "eraro dum kreo de aparato '%.255s'"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "eraro dum kreo de rekta ligilo '%.255s'"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "eraro dum kreo de simbola ligilo '%.255s'"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "eraro dum kreo de la dosierujo '%.255s'"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "maleblas puŝi aparte '%.255s' por instali novan version"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "maleblas legi ligilon '%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "maleblas fari sekurkopian simbolan ligilon por '%.255s'"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "maleblas uzi 'chwon' je sekurkopia simbola ligilo por '%.255s'"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "maleblas fari sekurkopian ligilon de '%.255s' antaŭ ol instali novan version"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "maleblas instali novan version de '%.255s'"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "maleblas malfermi '%.255s'"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "maleblas sinkronigi dosieron '%.255s'"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1495,7 +1529,7 @@
 "ni ignoras dependecan problemon kun %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1504,7 +1538,7 @@
 "ni konsideras malakomodadon de la esenca\n"
 " pako %s, por ebligi %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1513,7 +1547,7 @@
 "dpkg: ne, %s estas esenca, ĝi ne estos malakomodita\n"
 " por ebligi %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1522,28 +1556,28 @@
 "dpkg: ne, ne povas daŭrigi kun %s (--auto-deconfigure helpos):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "forigo de %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "instalo de %.250s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: ni konsideras malakomodadon de %s, kiu estus rompita de %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: jes, ni malakomodos %s (rompita de %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1552,11 +1586,11 @@
 "dpkg: prizorgo de %s enhavanta %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "ni ignoras rompaĵon, povas daŭrigi iel ajn!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1565,27 +1599,27 @@
 "instalado de %.250s povus rompi %.250s, kaj\n"
 " malakomodado ne estas permesata (--auto-deconfigure povus helpi)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "instalado de %.250s rompus ekzistantan programaron"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: ni konsideras forigi %s favore al %s ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s ne estas korekte instalita - ni ignoras iun ajn dependeco je ĝi.\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: eble okazos problemo forigante %s, ĉar ĝi provizas %s ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1594,106 +1628,108 @@
 "dpkg: la pako %s postulas reinstalon, sed eĉ tiel ni forigos ĝin laŭ via "
 "peto.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: la pako %s postulas reinstalon, ni ne forigos ĝin.\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: jes, ni forigos %s favore al %s.\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "konfliktantaj pakoj - ni ne instalos %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "ni ignoras konflikton, povas daŭrigi iel ajn!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive bezonas minimume unu voj-parametro"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "'find' por dpkg --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "malsukceso por uzi 'fdopen' je dukto de 'find'"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "eraro dum legado de dukto de 'find'"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "eraro dum fermo de dukto de 'find'"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "'find' por --recursive liveris netraktitan eraron %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "ni serĉis, sed trovis neniun pakon (dosierojn kongruantajn al *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s bezonas minimume unu pakan arkivan dosieran argumenton"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<norma eligo>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<norma eraro>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Ni elektas la antaŭe malelektitan pakon %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Ni preterpasas malelektitan pakon %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versio %.250s de %.250s jam estas instalita, ni preterpasas.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "ni retroigas %.250s de %.250s al %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "Ni ne retroigos %.250s de versio %.250s al %.250s, ni preterpasas.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1702,37 +1738,37 @@
 "maleblas forigi nove instalitan version de '%.250s' por ebligi reinstalon de "
 "sekurkopio"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "maleblas restarigi serkurkopian version de '%.250s'"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "maleblas forigi serkurkopion de '%.250s'"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "maleblas forigi nove instalitan version de '%.250s'"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "maleblas forigi nove eltiritan version de '%.250s'"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "maleblas 'stat' novan disigitan conffile '%.250s'"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "maleblas legi staton de la nune instalita conffile '%.250s'"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1743,57 +1779,57 @@
 "Akomoda dosiero '%s', ne ekzista en la sistemo.\n"
 "Ni instalas novan akomodan dosieron laŭ via peto.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: malsukceso dum forigo de malnova sekurkopio '%.250s': %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: malsukceso dum renomigo de '%.250s' al '%.250s': %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: malsukceso dum forigo de '%.250s': %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: malsukcesis forigi malnovan distribuitan version '%.250s': %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: malsukceso dum forigo de '%.250s' (antaŭ ol anstataŭigi): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s:malsukceso dum ligigo de '%.250s' al '%.250s': %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Instalado de nova versio de akomoda dosiero %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "maleblas instali '%.250s' kiel '%.250s'"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "neniu pako nomata '%s' estas instalita, ni ne povas akomodi"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "la pako %.250s jam estas instalita kaj akomodita"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1802,7 +1838,7 @@
 "la pako %.250s ne estas preta por akomodo\n"
 " ni ne povas akomodi (nuna stato '%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1811,11 +1847,11 @@
 "dpkg: dependecaj problemoj malebligas akomodadon de %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "dependecaj problemoj - ni lasas malakomodite"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1824,7 +1860,7 @@
 "dpkg: %s: dependecaj problemoj, tamen ni akomodas iel ajn laŭ via peto:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1832,12 +1868,12 @@
 "La pako estas en tre malbona malkohera stato - vi devus\n"
 " reinstali ĝin antaŭ ol provi akomodadon."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Ni alĝustigas %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1846,7 +1882,7 @@
 "%s: maleblas legi staton de akomoda dosiero '%s'\n"
 " (= `%s'): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1855,7 +1891,7 @@
 "%s: akomoda dosiero '%s' estas ringa (cirkla) ligilo\n"
 " (= `%s')"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1864,7 +1900,7 @@
 "%s: maleblas uzi readlink je conffile '%s'\n"
 " (= `%s'): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1873,33 +1909,33 @@
 "%s: conffile '%.250s' solvigas al degenerita dosiernomo\n"
 " (`%s' estas simbola ligo al `%s')"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr "%s: conffile '%.250s' ne estas plata dosiero aŭ simbola ligo (= '%s')"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: maleblas malfermi conffile %s por haketi: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Tajpu 'exit' kiam vi finos.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1908,12 +1944,12 @@
 "\n"
 "Akomoda dosiero `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (nune '%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1924,7 +1960,7 @@
 " ==> Dosiero en sistemo kreita de vi aŭ de skripto.\n"
 " ==> Dosiero ankaŭ en pako provizita de la pakzorganto.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1933,7 +1969,7 @@
 "\n"
 "     Ne modifite ekde la instalo.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1942,7 +1978,7 @@
 "\n"
 " ==> Modifite (de vi aŭ de skripto) ekde la instalo.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1951,37 +1987,37 @@
 "\n"
 " ==> Forigite (de vi aŭ de skripto) ekde la instalo.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> La pak-distribuanto lanĉis ĝisdatan version.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Versio en pako estas sama ol tiu de la lasta instalo.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Ni uzas novan dosieron laŭ via peto.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Ni uzas nunan malnovan dosieron laŭ via peto.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Ni tenas la malnovan agordo-dosieron kiel implicitan.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Ni uzas novan agordo-dosieron kiel implicitan.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1996,158 +2032,160 @@
 "      D     : montri la malsamojn inter la versioj\n"
 "      Z     : lanĉi ŝelon por kontroli la situacion\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " La implicita ago estas teni vian nunan version.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " La implicita ago estas instali la novan version.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[implicite=n]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[implicite=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[neniu implicitaĵo]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "eraro dum skribo al stderr, malkovrita antaŭ ol komandinvito de conffile"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "leg-eraro en stdin ĉe komandinvito de conffile"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF en stdin ĉe komandinvito de conffile"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s dependas je %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s antaŭdependas je %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s rekomendas %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s sugestas %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s rompas %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s konfliktas kun %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s plibonigas %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s estas forigota.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s estas malakomodota.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s estas instalota, sed ĝi estas versio %.250s.\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s estas instalita, sed ĝi estas versio %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s estas malpakita, sed ĝi neniam estis akomodata.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s estas malpakita, sed ĝi estas versio %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  lasta akomodita versio de %.250s estas %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s estas %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s provizas %.250s sed ĝi estas forigota.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s provizas %.250s sed ĝi estas malakomodota.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s provizas %.250s sed ĝi %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s ne estas instalita.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versio %.250s) estas instalota.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versio %.250s) ĉeestas kaj estas %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s provizas %.250s kaj ĝi estas instalota.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s provizas %.250s kaj ĉeestas kaj %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "Uzu --help por helpo pri postulantaj pakoj."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2155,7 +2193,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versio %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2166,8 +2204,8 @@
 "Kopirajto (C) 2000,2001 Wichert Akkerman.\n"
 "Kopirajto (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2178,7 +2216,7 @@
 "versio 2 aŭ\n"
 "posta por kopi-kondiĉoj. Estas NENIU garantio.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2188,7 +2226,7 @@
 "Uzado: %s [<elekteblo> ...] <komando>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2207,7 +2245,7 @@
 "  --truename <dosiero>     liveri la deturnitan dosieron.\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2239,7 +2277,7 @@
 "  --version                 montri la version.\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2251,17 +2289,12 @@
 "Dum forigado, --package aŭ --local kaj --divert devas kongrui se indikite.\n"
 "Skriptoj preint/postrm de la pako devos ĉiam indiki --package kaj --divert.\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "ne eblas 'stat' dosieron '%s'"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "eraro dum kontrolo de '%s'"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2270,129 +2303,129 @@
 "renomigo implicas anstataŭigon de '%s' per\n"
 "  malsama dosiero '%s', ne permesite"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "maleblas skribi dosieron '%s'"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "dosier-kopio"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "ne povas renomigi '%s' al '%s'"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "renomigi: forigi duobligitan malnovan ligon '%s'"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "maleblas malfermi la font-dosieron '%.250s'"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "loka deturno de: %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "loka deturno de: %s al %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "deturno de %s pro %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "deturno de %s al %s pro %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "iu ajn deturno de %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "iu ajn deturno de %s al %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "ne povas krei novan dosieron %s"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "maleblas elbufrigi dosieron '%s'"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "eraro dum forigo de malnova diversions-old"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "eraro dum kreado de nova diversions-old"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "eraro dum instalado de nova diversions"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s bezonas unuopan argumenton"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "la dosiernomo \"%s\" ne estas absoluta"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "dosiero ne povas enhavi novlini-signojn"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Ne eblas deturni dosierujojn"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "Ne eblas deturni dosieron '%s' al si mem"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "Ni lasas '%s'\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "'%s' kolizias kun '%s'"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "Aldonado de '%s'\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Neniu deturno '%s', neniu forigita.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2403,7 +2436,7 @@
 "  dum forigo de '%s'\n"
 "  trovite '%s'"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2414,16 +2447,16 @@
 "  dum forigo de '%s'\n"
 "  trovite '%s'"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "Forigado de '%s'\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "pako ne povas enhavi novlini-signojn"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "deturni-al ne povas enhavi novlini-signojn"
 
@@ -2505,8 +2538,8 @@
 "dselect aŭ 'dpkg --configure --pending' (aŭ 'dpkg --triggers-only'):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s postulas neniun argumenton"
@@ -2598,7 +2631,7 @@
 msgid "--compare-versions bad relation"
 msgstr "malĝusta rilato por --compare-versions"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "versio '%s' havas malĝustan sintakson: %s"
@@ -2653,12 +2686,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "preterpaso de problemo ĉar --force ebligis:"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "maleblas malfermi dosier-lista dosiero por la pako '%.250s'"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2667,70 +2700,70 @@
 "dosier-lista dosiero por la pako '%.250s' mankas, ni konjektas ke la pako "
 "havas neniun dosieron aktuale instalita."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "maleblas legi staton de dosier-lista dosiero por la pako '%.250s'"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "dosierlisto por pako '%.250s'"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "dosier-lista dosiero por la pako '%.250s' malhavas lastan linifinaĵon"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "dosier-lista dosiero por la pako '%.250s' enhavas malplenan dosiernomon"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "eraro dum fermo de dosier-lista dosiero por la pako '%.250s'"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Legado de datumbazo ..."
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "%d dosiero aŭ dosierujo aktuale instalita.)\n"
 msgstr[1] "%d dosieroj kaj dosierujoj aktuale instalitaj.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "maleblas krei ĝisdatan dosier-lista dosiero por la pako %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "malsukcesis skribi ĝisdatan dosier-listan dosieron por la pako %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "malsukcesis elbufrigi ĝisdatan dosier-listan dosieron por la pako %s "
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "malsukcesis sinkronigi ĝisdatan dosier-listan dosieron por la pako %s "
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "malsukcesis fermi ĝisdatan dosier-listan dosieron por la pako %s "
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "malsukcesis instali ĝisdatan dosier-listan dosieron por la pako %s "
@@ -2768,7 +2801,9 @@
 msgstr "instalita"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "eraro: PATH ne estas difinita."
 
 #: src/help.c:129
@@ -2810,7 +2845,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2822,65 +2857,65 @@
 msgstr "malsukceso por apliki 'chroot' al '%.250s'"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "malsukcesis per chdir al: '%.255s'"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "maleblas difini plenum-permesojn por '%.250s'"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "maleblas uzi 'setenv' por la skripto de pakzorganto"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "instalis skripton %s"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "maleblas legi staton de %s '%.250s'"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "nova skripto %s"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "malnova skripto %s"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "maleblas legi staton de %s '%.250s': %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - ni provas skripton el la nova pako anstataŭe ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "estas neniu skripto en la nova versio de la pako - ni rezignas"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... ŝajne sukcese.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "maleblas sekure forigi '%.255s'"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2889,7 +2924,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "maleblas kontroli ekziston de '%.250s'"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "ne povas legi informan dosierujon"
 
@@ -2958,7 +2993,7 @@
 "  -Dh|--debug=help                 Montri helpon je senerarigo.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3086,7 +3121,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr "Uzu 'deselect' aŭ 'aptitude' por uzant-faciliga pak-administrado.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3135,30 +3170,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3167,103 +3206,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "dependecaj problemoj - ni ne forigas"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "dependecaj problemoj - ni ne forigas"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "maleblas uzi 'setenv' por la skripto de pakzorganto"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "leg-eraro en agorda dosiero '%.255s'"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3271,7 +3310,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3279,37 +3318,37 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug postulas okuman argumenton"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "nula pak-nomo en komo-apartita listo '%.250s' por --ignore-depends"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends postulas validan pak-nomon. '%.250s' ne estas; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "malvalida entjero por --%s: '%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "eraro dum rulado de hoko '%s', elir-kodo %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "stato"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3318,7 +3357,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3326,12 +3365,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "nekonata perforta/rifuza elekteblo '%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "malaktuala perforta/rifuza elekteblo '%s'\n"
@@ -3354,8 +3393,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "ne atendita dosierfino antaŭ ol fino de linio %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "bezonas agan elekteblon"
 
@@ -3519,88 +3558,88 @@
 msgid "passed\n"
 msgstr "pasis\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "malsukceso dum kreo de provizora dosierujo"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "la pako %s havas tro multajn parojn Konfliktoj/Anstataŭoj"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "malnova versio de pako havas tro longan informan dosiernomon kiu startas je "
 "'%.250s'"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "maleblas forigi malaktualan inform-dosieron '%.250s'"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "maleblas instali la (supoze) novan inform-dosieron '%.250s'"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "maleblas malfermi provizoran reg-dosierujon"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "la pako enhavas tro longan reg-informan dosiernomon (kiu startas je '%.50s')"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "la pak-rega informo enhavis la dosierujon '%.250s'"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "rmdir de '%.250s' per pak-rega informo ne diris ke ne estas dosierujo"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "la pako %s enhavis liston kiel inform-dosieron"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "maleblas instali novan inform-dosieron '%.250s' kiel '%.250s'"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "maleblas forigi la reg-informan dosieron '%.250s'"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "ne povas atingi arkivon"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "malsukceso dum kreo de provizora dosierujo"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "longeco de reg-informaro"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Registrita informo pri %s el %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "la pak-arkitekturo (%s) ne kongruas al la sistemo (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3609,103 +3648,103 @@
 "dpkg: atentas %s, kiu enhavas %s, antaŭdependeca problemo:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "antaŭdependeca problemo - ni ne instalos %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "ignoro de dependeca problemo!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Ni prepariĝas por anstataŭi %s %s (uzante %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Elpakado de %s (el %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "nomo de conffile (komencante per '%.250s') estas tro longa (>%d signoj)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "leg-eraro en %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "eraro dum fermo de %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "eraro dum provo malfermi %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Malakomodado de %s, por ebligi forigon de %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Malakomodado de %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Elpakado de anstataŭanto %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "kamp-elprenado de dpkg-deb"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "eraro dum legado de eligo de dpkg-deb tar"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "misrompita dosiersistema tar-dosiero - misrompita pak-arkivo"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: forigi eblajn vostajn nulojn"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "ne eblis legi la staton de la malnova dosiero '%.250s', do ni forigas ĝin: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "maleblas forigi la malnovan dosierujon '%.250s': %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "la malnova conffile '%.250s' estis malplena dosierujo (kaj nun estas "
 "forigita)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "maleblas legi staton de alia nova dosiero '%.250s'"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3714,12 +3753,12 @@
 "la malnova dosiero '%.250s' estas la sama ol pluraj novaj dosieroj! (kaj "
 "'%.250s' kaj '%.250s')"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "maleblas sekure forigi la malnovan dosieron '%.250s': %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Ni rimarkas malaperon de %s, kiu estas entute anstataŭita.)\n"
@@ -3896,7 +3935,7 @@
 "  -f|--showformat=<formo>         Uzi alternativan formon por --show.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3920,6 +3959,10 @@
 "estos\n"
 "  uzata maldekstrigo.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Uzu --help por helpo pri postulantaj pakoj."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3978,7 +4021,7 @@
 msgid "Removing %s ...\n"
 msgstr "Forigado de %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3987,49 +4030,50 @@
 "dum forigo de %.250s, maleblis forigi la dosierujon '%.250s': %s - ĉu la "
 "dosierujo povus esti munt-punkto?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "ne eblas forigi '%.250s'"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "maleblas sekure forigi '%.250s'"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "dum forigo de %.250s, la dosierujo '%.250s' ne malplenis, do ĝi restis."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "ne eblas forigi '%.250s'"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Purigado de akomodaj dosieroj por %s...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "ne eblas forigi la malnovan akomodan dosieron '%.250s' (= '%.250s')"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "ne eblas legi la ujon de akomodo-dosiero '%.250s' (el '%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "ne eblas forigi la malnovan sekurkopian akomodo-dosieron '%.250s' (de "
 "'%.250s')"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "ne eblas forigi malnovan dosier-liston"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "ne eblas forigi malnovan skripton postrm"
 
@@ -4072,7 +4116,13 @@
 msgid "read error on standard input"
 msgstr "leg-eraro en la norma enigo"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "Uzu --help por helpo pri postulantaj pakoj."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4081,7 +4131,7 @@
 "Kopirajto (C) 2000, 2001 Wichert Akkerman.\n"
 "Kopirajto (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4098,7 +4148,7 @@
 "  --list [<glob-ŝablono>]  listigi nunajn preterpasojn en la datumbazo.\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4120,31 +4170,31 @@
 "  --help                   montri tiun ĉi help-mesaĝon.\n"
 "  --version                montri la version.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "apartigado de vosta /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "ne povas malfermi novan dosieron statoverride"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "eraro dum forigo de statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "eraro dum kreado de nova statoverride-old"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "eraro dum instalado de nova statoverride"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add bezonas kvar argumentojn"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4153,21 +4203,21 @@
 "Preterpaso por '%s' jam ekzistas, sed --force estas specifita, do ĝi estos "
 "preteratentita."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Preterpaso por \"%s\" jam ekzistas, ni ĉesigas."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "--update indikite sed %s ne ekzistas"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Neniu preterpaso ĉeestas."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update estas neutila por --remove"
 
@@ -4232,16 +4282,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "multoblaj 'statusoverride' ĉeestas por la dosiero '%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Tajpu dpkg-trigger --help por helpo pri tiu ĉi utilaĵo."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debiana pako %s ekigila utilaĵo, versio %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4252,7 +4302,7 @@
 "       %s [<elektebloj> ...] <komando>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4265,7 +4315,7 @@
 "ekigilojn.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4287,21 +4337,21 @@
 "  --no-act                         Simple testi - ne ŝanĝi ion ajn fakte.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: datumara dosierujo de ekigiloj ankoraŭ ne estas kreita\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: ekigilaj registraĵoj ankoraŭ ne ekzistas\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "prenas unu argumenton, la ekigil-nomon"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4311,13 +4361,13 @@
 "dpkg-trigger devas esti lanĉata el skripto de pakzorganto (aŭ kun elekteblo  "
 "--by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: malvalida atendata pak-nomo '%.250s': %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "malvalida ekigila nomo '%.250s': %.250s"
@@ -4350,37 +4400,38 @@
 msgstr "Procezado de ekigiloj por %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s bezonas precize unu argumenton por dosiero Packages"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr "maleblas atingi stat-areon de dpkg por ampleksa disponebla ĝisdatigo"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "ampleksa disponebla ĝisdatigo postulas skrib-rajton al la stat-areo de dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Ni anstataŭigas disponeblan pak-informaron, uzante %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Ni ĝisdatigas disponeblan pak-informaron, uzante %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "Informaro pri %d pako estis ĝisdatigata.\n"
 msgstr[1] "Informaro pri %d pakoj estis ĝisdatigata.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4495,8 +4546,8 @@
 msgstr[0] "preteratentas %d averton pri la reg-dosiero(j)\n"
 msgstr[1] "preteratentas %d avertojn pri la reg-dosiero(j)\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s bezonas argumenton <dosierujo>"
@@ -4529,26 +4580,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: konstruado de la pako '%s' en '%s'.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "malsukceso dum kreo de tmpfile (datumaro)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control"
 msgid "control member"
 msgstr "regado"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "malsukceso dum forigo de tmpfile (datumaro), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4565,20 +4616,20 @@
 msgid "error writing `%s'"
 msgstr "eraro dum skribo de '%s'"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "inter anoj"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "malsukceso dum skribo de dosiernomo al dukto de tar (datumaro)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<kompakti> el tar -cf"
 
@@ -4596,78 +4647,78 @@
 msgid "error reading %s from file %.255s"
 msgstr "eraro dum legado de %s el la dosiero %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "malsukceso dum lego de la arkivo '%.255s'"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "malsukceso dum apliko de fstat al arkivo"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "la arkivo havas neniun punkton en la versi-numero"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "la arkivo havas neniun novlinion en la datumkapo"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "la dosiero '%.250s' estas misrompita - neniu part-numero"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "la dosiero '%.250s' ne estas debiana duuma arkivo (ĉu provi dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "la arkivo havas neniun punkton en la versi-numero"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "la arkivo havas neniun novlinion en la datumkapo"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "la arkivo havas neniun punkton en la versi-numero"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "la arkiva versio %.250s ne estis komprenebla, akiru pli novan dpkg-deb"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "ni preterpasis datumaron de ano el %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
 "la dosiero '%.250s' enhavas nekompreneblan anon de datumaro %.*s, ni rezignas"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "ne dosiero '%.250s' enhavas du regadajn anojn, ni rezignas"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4679,23 +4730,23 @@
 " nova debiana pako, versio %s.\n"
 " grandeco %ld bajtoj: reg-arkivo= %zi bajtoj.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "la arkivo havas misformitan longecon de regado %s'"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "ni preterpasis datumaron de ano el %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4707,7 +4758,7 @@
 " malnova debiana pako, versio %s.\n"
 " grandeco %ld bajtoj: reg-dosiero= %zi, ĉefa arkivo= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4716,49 +4767,50 @@
 "dpkg-deb: la dosiero ŝajne povus esti arkivo kiu estis\n"
 "dpkg-deb:    misrompigita pro elŝuto laŭ reĝimo ASCII\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "'%.255s' ne estas debian-forma arkivo"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "malsukceso dum skribo al dukto je kopio"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "malsukceso dum fermo de dukto je kopio"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "datumaro"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "malsukceso dum atingo al dosierujo"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "malsukceso dum kreo de dosierujo"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "malsukceso dum atingo al dosierujo post krei ĝin"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "malsukceso dum atingo al dosierujo"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<malkompaktigo>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "alglui"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s bezonas argumenton kun dosiernomo .deb"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4767,96 +4819,96 @@
 "--%s bezonas celatan dosierujon.\n"
 "Eble vi devus uzi dpkg --install ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s prenas maksimume du argumentojn (.deb kaj dosierujon)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s prenas nur unu argumenton (dosiernomo .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "malsukceso dum provo atingi al '/' por purigado"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "ne eblas 'stat' dosieron '%s'"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: '%.255s' enhavas neniun regadan elementon '%.255s'\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr "malfermi elementon '%.255s' (en %.255s) malsukcesis neatendite"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "%d petita reg-elemento mankas"
 msgstr[1] "%d petitaj reg-elementoj mankas"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "ne povas skani la dosierujon '%.255s'"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "ne eblas legi la staton de '%.255s' (en '%.255s')"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "ne eblas malfermi '%.255s' (en '%.255s')"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "malsukceso dum lego de '%.255s' (en '%.255s')"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bajtoj, %5d linioj   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     ne estas ordinara dosiero          %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(neniu dosiero 'control' en regada arkivo!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "ne eblis malfermi la elementon 'control'"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "malsukceso dum lego de la elemento 'control'"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "eraro dum fermo de la elemento '%s'"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Eraro en la formo"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents prenas precize unu argumenton"
 
@@ -4866,7 +4918,19 @@
 msgstr "Debiana '%s' pak-arkiva bazprograma versio %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4877,6 +4941,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4892,7 +4958,7 @@
 "  --fsys-tarfile <deb>              Eligi dosiersisteman tar-dosieron.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4905,11 +4971,27 @@
 "<cfield> estas la nomo de kampo en la ĉefa dosiero 'control'.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4935,7 +5017,7 @@
 "none.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4948,7 +5030,7 @@
 "'dselect' aŭ 'aptitude' por uzant-faciliga pak-administrado. Pakoj\n"
 "elpakitaj uzante 'dpkg-deb --extract' estos malkorekte instalitaj !\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4956,17 +5038,17 @@
 "Tajpu dpkg-deb --help por helpo pri traktado de dosieroj *.deb;\n"
 "Tajpu dpkg --help por helpo pri instalo kaj malinstalo de pakoj."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "malvalida entjero por -%c: '%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "malvalida kompaktig-nivelo por -%c: %ld'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "nekonata kompaktig-tipo '%s'!"
@@ -4986,7 +5068,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "la dosiero '%.250s' estas misrompita - mankas novlinion post %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "eraro dum legado de %.250s"
@@ -5083,54 +5165,60 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "la dosiero '%.250s' estas misrompita - neniu part-numero"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "pak-nomo"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "la dosiero '%.250s' estas misrompita - malĝusta magiaĵo ĉe fino de dua "
 "datumkapo"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "la dosiero '%.250s' estas misrompita - dua ano ne estas ano de datumaro"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "la dosiero '%.250s' estas misrompita - malkorekta nombro da partoj por "
 "limigitaj grandecoj"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "la dosiero '%.250s' estas misrompita - grandeco estas malkorekta por "
 "limigita part-numero"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "maleblas legi staton de la part-dosiero '%.250s'"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "la dosiero '%.250s' estas misrompita - tro malgranda"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "ne eblas malfermi la arkiv-partan dosieron '%.250s'"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "la dosiero '%.250s' ne estas arkiv-parto"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5150,6 +5238,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5172,12 +5261,19 @@
 "    Part-dosiera grandeco (uzate):  %lu bajtoj\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<nekonate>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s postulas unu aŭ pli part-dosierajn argumentojn"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "la dosiero '%s' ne estas arkiv-parto\n"
@@ -5212,7 +5308,7 @@
 msgid "split package part"
 msgstr "Kunmetado de la pako %s el %d parto: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "farite\n"
@@ -5265,17 +5361,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Elektebloj:\n"
 "  --depotdir <dosierujo>           Uzi <dosieron> anstataŭ %s/%s.\n"
@@ -5287,20 +5392,29 @@
 "\n"
 "Elir-stato: 0 = Bone;  1 = -a ne estas parto;  2 = problemo!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Tajpu dpkg-split --help por helpo."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "neatendita dosierfino en %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "part-grandeco estas tro granda aŭ ĝi ne estas pozitiva"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "parto-grandeco devas esti minimume %d KiB (por ebligi datumkapon)"
@@ -5411,27 +5525,27 @@
 msgid "Deleted %s.\n"
 msgstr "Ni forigis %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "kamp-elprenado de dpkg-deb"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "maleblas malfermi la font-dosieron '%.250s'"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "maleblas legi staton de font-dosiero"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "la font-dosiero '%.250s' ne estas purteksta dosiero"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5440,17 +5554,17 @@
 msgstr[0] "Kunmetado de la pako %s el %d parto: "
 msgstr[1] "Kunmetado de la pako %s el %d partoj: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split bezonas argumenton pri fonta dosiernomo"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split prenas maksimume fontan dosiernomon kaj celan prefikson"
 
@@ -5624,125 +5738,90 @@
 "  --help                   montri tiun ĉi help-mesaĝon.\n"
 "  --version                montri la version.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "eraro"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "averto"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "ne povas 'stat' %s: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "readlink(%s) malsukcesis: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "du komandoj specifitaj: --%s kaj --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "ne eblas postmeti al %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "skanado de %s malsukcesis: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "malsukcesis lanĉi %s: %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "ne eblas igi %s simbolan ligon al %s: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "ne eblas instali %s kiel %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "ne eblas forigi %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "neatendita dosierfino dum provo legi %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "dum legado de %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "linio ne finigita dum provo legi %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s misrompita: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "novlinioj malpermesite en dosieroj update-alternatives (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "dum skribado al %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "sklava nomo"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "duobligita sklavo %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "sklava ligo"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "sklava ligo samas ol la ĉefa ligo %s "
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "duobligita sklavo ligo %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "mastra dosiero"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "duobligita vojo %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5751,130 +5830,115 @@
 "la alternativo %s (parto el ligo-grupo %s) ne ekzistas. Ni forigas el la "
 "listo de alternativoj."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "prioritato"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "sklava dosiero"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "prioritato de %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "ne eblas legi %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "stato"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "malvalida stato"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "mastra ligo"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "ne eblas fermi %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "forlaso de la malaktuala sklava ligo %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "ne povas skribi %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "aŭtomata reĝimo"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "permana reĝimo"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "  ligo nune kondukas al %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "  ligo nune malĉeestas"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - prioritato %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  sklavo %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Nune 'plejbona' versio estas '%s'."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Neniu versio disponeblas."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "Estas %d elekto por la alternativo %s (provizanta %s)."
 msgstr[1] "Estas %d elektoj por la alternativo %s (provizanta %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Elekto"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Vojo"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Prioritato"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Stato"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Premu la enigklavon por teni la nunan elekton[*], aŭ tajpu al elekto-"
 "numeron: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "ni ne anstataŭigas %s per ligo."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "ni ne povas instali la ne konatan elekton %s"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -5883,98 +5947,153 @@
 "preterpasi kreon de %s ĉar la koncerna dosiero %s (de ligo-grupo %s) ne "
 "ekzistas."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "ni ne anstataŭigas %s per ligo."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Voki %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Alternativo %s neŝanĝita ĉar elekto %s ne disponeblas."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Preterpasi nekonatan alternativon %s."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "linio tro longa aŭ ne finigita dum provo legi %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Ni preterlasas malvalidan linion: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "ni renomigas la ligon %s de %s al %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "ni renomigas la sklavan ligon %s de %s al %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "alternativa nomo (%s) ne devas enhavi '/' kaj spacojn."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "la alternativa ligo ne estas absoluta kiel ĝi devus esti: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "la alternativa vojo ne estas absoluta kiel ĝi devus esti: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "la alternativo %s ne povas esti mastra: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "la alternativa ligo %s jam estas zorgata de %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "la alternativa vojo %s ne ekzistas."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "alternativo %s ne povas esti sklavo de %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "la alternativo %s ne povas esti mastra: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "la alternativa ligo %s jam estas zorgata de %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "nekonata argumento '%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install bezonas <ligo> <nomo> <vojo> <prioritato>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<ligo> kaj <vojo> ne povas esti samaj"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "prioritato devas esti entjero"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s bezonas <nomo> <vojo>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s bezonas <nomo>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave nur permesite kun --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave bezonas <ligo> <nomo> <vojo>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "la nomo %s estas kaj mastra kaj sklava"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "la ligo %s estas kaj mastra kaj sklava"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s bezonas argumenton <dosiero>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "nekonata elekteblo '%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -5982,67 +6101,22 @@
 "bezonas --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all aŭ --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "la alternativo %s ne povas esti mastra: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "la alternativa ligo %s jam estas zorgata de %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "la alternativa ligo ne estas absoluta kiel ĝi devus esti: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "la alternativa vojo ne estas absoluta kiel ĝi devus esti: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "la alternativa vojo %s ne ekzistas."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "alternativa nomo (%s) ne devas enhavi '/' kaj spacojn."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "ĝi estas mastra alternativo."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "ĝi estas sklavo de %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "alternativo %s ne povas esti sklavo de %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<norma enigo>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "neniu alternativo por %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s \"balancas\", ĝi estos ĝisdatigata per plejbona elekto."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6054,60 +6128,60 @@
 "%s estas ŝanĝita (permane aŭ perskripte). Ni ŝaltas al nur permanaj "
 "ĝisdatigoj."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "preparado de aŭtomata elekto de %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "la alternativo %s por %s ne estas registrita, ni ne difinas ĝin."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Estas neniu programo kiu provizas %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Nenio por akomodi."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Estas nur unu alternativo en la ligo-grupo %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "la alternativo %s por %s ne estas registrita, ni ne forigas."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "permana forigado de elektita alternativo - ni ŝaltas %s al aŭtomata reĝimo"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "aŭtomataj ĝisdatigoj de %s estas malaktivitaj, ni lasas ĝin sola."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 "por retroiri al aŭtomataj ĝisdatigoj, uzu 'update-alternatives --auto %s'."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "ni uzas %s por provizi %s (%s) en %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
@@ -6115,11 +6189,47 @@
 "ni devigas reinstalon de la alternativo %s ĉar la ligo-grupo %s estas "
 "rompita."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr "nuna alternativo %s estas nekonata, ni ŝanĝas al %s por ligo-grupo %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "ĝi estas mastra alternativo."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "ĝi estas sklavo de %s"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "ne povas 'stat' %s: %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "readlink(%s) malsukcesis: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "skanado de %s malsukcesis: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "malsukcesis lanĉi %s: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "ne eblas igi %s simbolan ligon al %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "ne eblas instali %s kiel %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "dum skribado al %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "ne eblas legi %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "ne eblas fermi %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "ne povas skribi %s: %s"
+
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6369,9 +6479,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "preterpasis reg-areo el %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "malsukceso dum lanĉo de tar"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "malsukceso dum kreo de provizora dosierujo"
 
Binary files dpkg/po/es.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/es.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/es.po /home/vorlon/devel/multiarch/dpkg-debian/po/es.po
--- dpkg/po/es.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/es.po	2012-06-07 10:11:09.426073000 -0700
@@ -40,7 +40,7 @@
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.16.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-12-20 03:25+0100\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -93,7 +93,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "no se puede escribir el fichero `%s'"
@@ -114,71 +114,77 @@
 msgid "ar member file (%s)"
 msgstr "fallo al hacer «fstat» del fichero miembro «ar» (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "fallo al leer en buffer_copy para %s"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "fallo al escribir en buffer_copy para %s"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "lectura insuficiente en buffer_copy para %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "fallo al ejecutar tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "no se puede ejecutar %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: descompresión"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compresión"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: error al asociar la entrada a los datos gzip"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: error interno de lectura de gzip `%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: error interno de escritura de gzip"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: error al asociar la salida a los datos gzip<"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: error interno de lectura de gzip"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: error interno de escritura de gzip: `%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: error interno de escritura de gzip: %s"
@@ -193,32 +199,32 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: error interno de lectura de bzip2: `%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: error interno de escritura de bzip2"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: error al asociar la salida a los datos bzip2"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: error interno de lectura de bzip2"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: error interno de escritura de bzip2: `%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "se produjo un error inesperado de bzip2"
 
 # FIXME: Tell author to put `%.250s' on a separate line, since it's too long. sv
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -228,7 +234,7 @@
 "`%.250s',\n"
 "cuyo nombre es demasiado grande (longitud=%d, max=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -237,102 +243,102 @@
 "longitudes\n"
 "diferentes (%d y %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "no se puede examinar el directorio de actualizaciones `%.255s'"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "fallo al borrar el fichero de actualización incorporado %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "no se puede crear `%.255s'"
 
 # Ayuda: Mejor quedaría con palabras distintas para fill y padding. sv
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "no se puede llenar %.250s con relleno"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "no se puede efectuar `flush' %.250s tras el relleno"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "no se puede volver al comienzo de %.250s después del relleno"
 
 # "incapaz de..." queda demasiado literal. sv
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "no se puede abrir el fichero de bloqueo %s para hacer pruebas"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr ""
 "no se puede abrir/crear el fichero de bloqueo de la base de datos de estado"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "no tiene permiso para bloquear la base de datos de estado de dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "no se puede bloquear la base de datos de estado de dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "la operación solicitada precisa privilegios de superusuario"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "no se puede acceder al área de estado de dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 "la operación precisa acceso de lectura y escritura al área de estado de dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "fallo al borrar mi propio fichero de actualización %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "no se puede escribir el estado actualizado de `%.250s'"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "no se puede efectuar `flush' con el estado actualizado de `%.250s'"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "no se puede truncar el estado actualizado de `%.250s'"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "no se puede efectuar `fsync' en el estado actualizado de `%.250s'"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "no se puede cerrar el estado actualizado de `%.250s'"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "no se puede instalar el estado actualizado de `%.250s'"
@@ -356,76 +362,78 @@
 msgid "unable to open directory '%s'"
 msgstr "no se puede abrir el fichero `%s'"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "no se puede abrir el fichero `%s'"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "no se puede hacer «sync» del fichero `%s'"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "no se puede cerrar el fichero `%s'"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "fallo al escribir los detalles sobre `%.50s' a `%.250s'"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "fallo al abrir `%s' para escribir la base de datos %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr ""
 "no se puede establecer almacenamiento intermedio para el archivo de base de "
 "datos %s"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr ""
 "fallo al escribir el registro de base de datos %s sobre `%.50s' a `%.250s'"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "fallo al volcar la información de la base de datos %s en `%.250s'"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "fallo al efectuar `fsync' en la base de datos %s a `%.250s'"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "fallo al cerrar `%.250s' tras escribir en la base de datos %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "fallo al enlazar `%.250s' con `%.250s' para la copia de seguridad de la base "
 "de datos %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 "fallo al instalar `%.250s' como `%.250s' conteniendo la base de datos %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -434,7 +442,7 @@
 "%s: error fatal irrecuperable, abortando:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -446,13 +454,13 @@
 "%s: error fatal irrecuperable, abortando:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "memoria agotada para una nueva entrada de reorganización"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -461,35 +469,35 @@
 "%s: error al reorganizar:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr ""
 "dpkg: ¡¡demasiados errores anidados durante la recuperación de error!!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "memoria agotada para una nueva entrada de reorganización"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 "memoria agotada para la entrada de reorganización nueva con\n"
 "muchos argumentos"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: error closing %s: %s"
 msgid "%s: error: %s\n"
 msgstr "%s: error al cerrar %s: %s"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: aviso: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: error interno: %s\n"
@@ -505,99 +513,99 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "no se admite `%.*s' para %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "basura después de %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "nombre de paquete inválido (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "campo de detalles `%s' de fichero vacío"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "campo de detalles de fichero `%s' no permitido en el fichero de estado"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "demasiados valores en el campo de detalles de fichero `%s'\n"
 "(comparado con otros)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "insuficiente número de valores en el campo de detalles de fichero `%s'\n"
 "(comparado con otros)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "yes/no en campo booleano"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "palabra en campo «prioridad»"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "el valor para el campo `status' no está permitido en este contexto"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "primera palabra (necesaria) en el campo `status'"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "segunda palabra (error) en el campo `status'"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "tercera palabra de estado en el campo `status'"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "error en la cadena `Version' `%.250s'"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "Se ha utilizado un campo `Revision' o `Package-Revision' obsoleto"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "no se permite un valor para el campo `config-version' en este contexto"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "error en la cadena `Config-Version' `%.250s'"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "el valor de `conffiles' tiene una línea mal formateada `%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 "el valor de `conffiles' contiene una línea que comienza con un\n"
 " carácter `%c' que no es un espacio"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "se ha indicado como conffile el directorio raíz o un directorio vacío"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -605,12 +613,12 @@
 "En el campo `%s', falta un nombre de paquete, o se encontró basura\n"
 "donde se esperaba un nombre de paquete"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "campo `%s', nombre de paquete inválido `%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -619,7 +627,7 @@
 "campo `%s', referencia a `%.255s':\n"
 " relación de versión errónea %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -628,7 +636,7 @@
 "campo `%s', referencia a `%.255s':\n"
 " `%c' está obsoleto. Utilice en su lugar `%c=' o `%c%c'"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -638,11 +646,11 @@
 " coincidencia implícita en el número exacto de versión,\n"
 " se sugiere usar `=' en su lugar"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Solamente se pueden usar versiones exactas para Provides"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -652,57 +660,57 @@
 " el valor de versión comienza con un carácter no alfanumérico,\n"
 " se sugiere añadir un espacio"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "campo `%s', referencia a `%.255s': la versión contiene `%c'"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "campo `%s', referencia a `%.255s': versión incompleta"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "campo `%s', referencia a `%.255s': error en la versión"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "campo `%s', error de sintaxis tras la referencia al paquete `%.255s'"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "no se admiten alternativas (`|') en el campo %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 "no se permite un valor para el campo `triggers-pending' en este contexto"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "nombre de disparador pendiente inválido `%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "disparador pendiente duplicado `%.255s'"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr ""
 "el valor para el campo `triggers-awaited' no está permitido en este contexto"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "nombre de paquete ilegal en la disparador esperado `%.255s': %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "paquete de disparador esperado duplicado `%.255s'"
@@ -759,7 +767,7 @@
 msgid "unable to write to status fd %d"
 msgstr "no se puede escribir al descriptor de fichero de estado %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "realloc failed (%zu bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -770,8 +778,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "fallo en realloc (%zu bytes)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "fallo al asignar memoria"
 
@@ -806,170 +814,175 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "no se puede establecer el atributo close-on-exec para `%.250s'"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "error de configuración: %s: %d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "fallo al abrir el fichero de configuración `%.255s' para lectura: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "comillas no balanceadas en '%s'"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "opción `%s' desconocida"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "`%s' necesita un valor"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "`%s' no utiliza un valor"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "error de lectura en el fichero de configuración `%.255s'"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "error al cerrar el fichero de configuración `%.255s'"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "error al cerrar el directorio de configuración `%s'"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "opción --%s desconocida"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "la opción --%s lleva un parámetro"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "la opción --%s no lleva parámetros"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "opción -%c desconocida"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "la opción -%c lleva un parámetro"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "la opción -%c no lleva parámetros"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "opción obsoleta `--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "acciones en conflicto -%c (--%s) y -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "valor duplicado para el campo `%s'"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "nombre de campo definido por el usuario `%.*s' demasiado corto"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "valor duplicado para el campo definido por el usuario `%.*s'"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Campo `Configured-Version' para un paquete con Status no apropiado"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "el paquete tiene el estado %s pero los disparadores están en espera"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 "el paquete tiene el estado «triggers-awaited» pero no hay ningún disparador "
 "en espera"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "el paquete tiene estado %s pero los disparadores están pendientes"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 "el paquete tiene el estado «triggers-pending» pero no hay disparadores "
 "pendientes"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Paquete que no estando instalado tiene conffiles, nos olvidamos de ellos"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr ""
 "fallo al abrir el fichero de información del paquete `%.255s' para leer"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "no se puede ejecutar `stat' sobre el fichero `%.255s'"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "no se puede ejecutar `mmap' sobre el fichero `%.255s'"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "no se puede ejecutar `stat' sobre el fichero `%.255s'"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "fallo al cerrar después de la lectura: `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF después del nombre del campo `%.*s'"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "nueva línea dentro del nombre del campo `%.*s'"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "EOF de MSDOS (^Z) dentro del nombre del campo `%.*s'"
@@ -983,39 +996,40 @@
 # algo como "Package:" o "Priority:", está claro por el contexto
 # que se trata de : y no de .. por lo que no creo necesaria ninguna
 # aclaración adicional. sv
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "el nombre del campo `%.*s' debe estar seguido por dos puntos"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF antes del valor del campo `%.*s' (falta nueva línea final)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 "carácter EOF de MSDOS dentro del valor del campo `%.*s' (¿falta nueva línea?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "nueva línea dentro del nombre del campo `%.*s'"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF durante el valor del campo `%.*s' (falta nueva línea final)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 "se encontraron varias entradas de información de paquetes,\n"
 "sólo se permite una"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "fallo al cerrar después de la lectura: `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "no hay ninguna información de paquetes en `%.255s'"
@@ -1044,18 +1058,18 @@
 "%s, en el fichero `%.255s' cerca de la línea %d:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "no puede ser una cadena vacía"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "debe comenzar con un carácter alfanumérico"
 
 # FIXME: %s may not be translated. sv
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
@@ -1064,47 +1078,47 @@
 
 # FIXME: A translator comment should clarify about none's sex here. sv
 # Esto sale cuando no hay ninguna versión disponible.
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<ninguna>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "la cadena de versión está vacía"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "la cadena de versión tiene espacios en su interior"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "la época en la versión no es un número"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "no hay nada tras los dos puntos en el número de versión"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "carácter inválido en el número de versión"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "carácter inválido en el número de revisión"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "falta %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "valor vacío para %s"
@@ -1123,52 +1137,52 @@
 msgid "(no description available)"
 msgstr "(no hay ninguna descripción disponible)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "no se puede descartar la señal %s antes de ejecutar %.250s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "error al no manejar la señal %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (subproceso): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "fallo en `fork'"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "el subproceso %s devolvió el código de salida de error %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "falló la orden `wait' para el subproceso %s"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "el subproceso %s fue terminado por la señal (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", volcado de «core»"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "el subproceso %s falló con código de estado de espera %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "falló la orden `wait' para el subproceso %s"
@@ -1192,69 +1206,61 @@
 "error sintáctico en la lista dereferenciada de disparadores `%.250s' en el "
 "carácter `%s'%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr ""
 "no se puede abrir/crear el fichero de bloqueo de los disparadores `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "disparado"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr ""
 "no se puede efectuar `stat' sobre el fichero dereferenciado de disparadores `"
 "%.250s'"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "no se puede abrir el fichero de disparadores dereferenciado `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 "no se puede abrir/crear el nuevo fichero de disparadores dereferenciado `"
 "%.250s'"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "error al leer los disparadores del fichero dereferenciado `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr ""
 "no se puede abrir el nuevo fichero dereferenciado de disparadores `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr ""
 "no se puede cerrar el nuevo fichero dereferenciado de disparadores `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr ""
 "no se puede instalar el nuevo fichero dereferenciado de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "no se permiten nombres de disparadores vacíos"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "el nombre del disparador contiene caracteres inválidos"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1263,19 +1269,19 @@
 "sintaxis desconocida o inválida en el nombre del disparador `%.250s' (en el "
 "disparador interesado para el paquete `%.250s')"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr ""
 "no se puede abrir el nuevo fichero de lista de intereses de disparadores `"
 "%.250s'"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "no se puede rebobinar el fichero de intereses de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1284,44 +1290,50 @@
 "error sintáctico en el fichero de intereses del disparador `%.250s'; nombre "
 "de paquete ilegal `%.250s': %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr ""
-"no se puede crear un nuevo fichero de intereses de disparadores `%.250s'"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr ""
 "no se puede escribir el nuevo fichero de intereses de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr ""
 "no se puede volcar el nuevo fichero de intereses de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr ""
 "no se puede ejecutar «sync» sobre el nuevo fichero de intereses de "
 "disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
 msgstr ""
-"no se puede cerrar el nuevo fichero de intereses de disparadores `%.250s'"
+"no se puede instalar un nuevo fichero de intereses de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
 #, c-format
-msgid "unable to install new trigger interest file `%.250s'"
+msgid "cannot remove `%.250s'"
+msgstr "no se puede borrar `%.250s'"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
 msgstr ""
-"no se puede instalar un nuevo fichero de intereses de disparadores `%.250s'"
+"no se puede crear un nuevo fichero de intereses de disparadores `%.250s'"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr ""
+"no se puede cerrar el nuevo fichero de intereses de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1329,47 +1341,47 @@
 "interés de disparador de fichero duplicado para el fichero `%.250s' y el "
 "paquete `%.250s'"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "no se pudo crear el nuevo fichero de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "no se pudo escribir el nuevo fichero de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "no se pudo volcar el nuevo fichero de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "no se pudo hacer «sync» en el nuevo fichero de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "no se pudo cerrar el nuevo fichero de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "no se puede instalar el nuevo fichero de disparadores como `%.250s'"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "no se puede leer el fichero de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "error sintáctico en el fichero de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1378,7 +1390,7 @@
 "el fichero de registros de disparadores menciona un nombre de paquete ilegal "
 "`%.250s' (en el fichero `%.250s'): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1387,34 +1399,42 @@
 "fichero de disparadores ci `%.250s' contiene una sintaxis de disparador "
 "ilegal en el nombre de disparador `%.250s': %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "no se puede abrir el fichero de disparadores ci `%.250s'"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 "el fichero de disparadores ci contiene una sintaxis de directiva desconocida"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 "el fichero de disparadores ci contiene una directiva desconocida `%.250s'"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "no se puede crear el directorio de estado de disparadores `%.250s'"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 "no se puede establecer el propietario del directorio de estado de "
 "disparadores `%.250s'"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "no se permiten nombres de disparadores vacíos"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "el nombre del disparador contiene caracteres inválidos"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1439,7 +1459,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "error al formatear la cadena en una variable «varbuf»"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "error al leer de una tubería de dpkg-deb"
 
@@ -1459,12 +1479,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "error al establecer la propiedad del enlace simbólico `%.255s'"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "error al establecer el propietario de `%.255s'"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "error al establecer los permisos de `%.255s'"
@@ -1527,17 +1547,27 @@
 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:629
+# FIXME: Traducción de 'stat'
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "no se puede efectuar `stat' el fichero `%s'"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Reemplazando ficheros del paquete antiguo %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Reemplazado por ficheros en el paquete instalado %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1546,99 +1576,104 @@
 "intentando sobreescribir el directorio `%.250s' del paquete %.250s %.250s "
 "con un no directorio"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "intentando sobreescribir `%.250s', que está también en el paquete %.250s "
 "%.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "no se pudo crear `%.255s' (mientras se procesaba `%.255s')"
 
 # FIXME: It is not clear enough what the `%.255s' is about. sv
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "error en dpkg-deb durante `%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "error al cerrar/escribir `%.255s'"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "error al crear la tubería `%.255s'"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "error al crear el dispositivo `%.255s'"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "error al crear el enlace duro `%.255s'"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "error al crear el enlace simbólico `%.255s'"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "error al crear el directorio `%.255s'"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, 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:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "no se puede leer el enlace `%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "no se puede respaldar enlace simbólico para `%.255s'"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, 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:835
+#: src/archives.c:846
 #, 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:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "no se puede instalar una nueva versión de `%.255s'"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "no se puede abrir `%.255s'"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "no se puede hacer «sync» en el fichero `%.255s'"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1647,7 +1682,7 @@
 "no se tendrá en cuenta el problema de dependencia con %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1656,7 +1691,7 @@
 "considerando la desconfiguración del paquete\n"
 " esencial %s, para activar %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1665,7 +1700,7 @@
 "dpkg: no, %s es esencial, no será desconfigurado\n"
 " para activar %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1674,29 +1709,29 @@
 "dpkg: no, no se puede continuar con %s (--auto-deconfigure ayudará):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "la eliminación de %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "la instalación de `%.250s'"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 "dpkg: considerando la desconfiguración de %s, ya que lo rompería %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: sí, se desconfigurará %s (roto por %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1705,11 +1740,11 @@
 "dpkg: acerca de %s que contiene %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "ignorando la rotura, ¡puede procederse de todas maneras!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1718,17 +1753,17 @@
 "si se instalara %.250s se rompería %.250s, y \n"
 " no es posible desconfigurarlo (--auto-deconfigure puede ayudar)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "la instalación de %.250s rompería software existente"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
@@ -1736,12 +1771,12 @@
 " dependencia de él.\n"
 
 # provee/proporciona. ¿cuál es la diferencia? sv
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1750,92 +1785,94 @@
 "dpkg: el paquete %s requiere ser reinstalado, pero se desinstalará de todas "
 "formas tal como se solicita.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "paquetes en conflicto - no se instalará %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "no se tiene en cuenta el conflicto, ¡se procederá de todas maneras!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive necesita al menos una ruta como argumento"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "fallo al ejecutar `find' para dpkg --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "fallo al efectuar `fdopen' en la tubería de find"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "error al leer la tubería de find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "error al cerrar la tubería de find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, 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:1267
+#: src/archives.c:1279
 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:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<salida estándar>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<salida de error estándar>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Seleccionando el paquete %s previamente no seleccionado.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Omitiendo el paquete no seleccionado %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versión %.250s de %.250s ya instalada, omitiendo.\n"
@@ -1847,19 +1884,19 @@
 # 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:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "desactualizando %.250s de %.250s a %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "No se desactualizará %.250s de la versión %.250s a la %.250s, omitiendo.\n"
 
 # En este caso, no parece que se refiere a un paquete. sv
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1868,39 +1905,39 @@
 "no se puede borrar la versión recién instalada de `%.250s' para permitir\n"
 "la reinstalación de la copia de seguridad"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "no se puede restablecer la versión de respaldo de `%.250s'"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "no se puede borrar la copia de respaldo de `%.250s'"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "no se puede borrar la versión recién instalada de `%.250s'"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "no se puede borrar la versión recién extraída de `%.250s'"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr ""
 "no se puede efectuar `stat' sobre el nuevo conffile distribuido `%.250s'"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 "no se puede efectuar `stat' sobre el conffile `%.250s' actualmente instalado"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1911,57 +1948,57 @@
 "El conffile `%s' no existe en el sistema.\n"
 "Instalando el nuevo conffile tal y como se solicitó.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: fallo al borrar la copia de respaldo antigua `%.250s': %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: fallo al renombrar `%.250s' a `%.250s': %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: fallo al eliminar `%.250s': %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: fallo al borrar la versión de la distribución antigua `%.250s': %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: fallo al borrar `%.250s' (antes de sobreescribir): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: fallo al enlazar `%.250s' a `%.250s': %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Instalando una nueva versión del fichero de configuración %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "no se puede instalar `%.250s' como `%.250s'"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "no hay instalado ningún paquete llamado `%s', no se puede configurar"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "el paquete %.250s ya está instalado y configurado"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1970,7 +2007,7 @@
 "el paquete %.250s no está listo para configurarse\n"
 " no se puede configurar (estado actual `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1979,11 +2016,11 @@
 "dpkg: problemas de dependencias impiden la configuración de %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependencias - se deja sin configurar"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1993,7 +2030,7 @@
 " tal y como se solicitó:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -2001,12 +2038,12 @@
 "El paquete está en un estado grave de inconsistencia - debe reinstalarlo\n"
 " antes de intentar su configuración."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Configurando %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -2015,7 +2052,7 @@
 "%s: no se puede efectuar `stat' sobre el fichero de configuración `%s'\n"
 " (= `%s'): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -2024,7 +2061,7 @@
 "%s: el fichero de configuración `%s' es un enlace circular\n"
 " (= `%s')"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -2033,7 +2070,7 @@
 "%s: no se puede ejecutar «readlink» sobre el conffile `%s'\n"
 " (= `%s'): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -2042,35 +2079,35 @@
 "%s: el conffile `%.250s' apunta a un nombre de fichero degradado\n"
 " (`%s' es un enlace simbólico a `%s')"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: el conffile `%.250s' no es un fichero normal o un enlace simbólico (= `"
 "%s')"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "hash md5"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: no se puede abrir el conffile %s para el `hash': %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Escriba `exit' cuando termine.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -2079,12 +2116,12 @@
 "\n"
 "Fichero de configuración `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (`%s' realmente)"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -2095,7 +2132,7 @@
 " ==> Fichero en el sistema creado por usted o por algún script.\n"
 " ==> Fichero también en el paquete.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -2104,7 +2141,7 @@
 "\n"
 "     No modificado desde la instalación.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2113,7 +2150,7 @@
 "\n"
 " ==> Modificado (por usted o por un script) desde la instalación.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -2124,42 +2161,42 @@
 
 # Traducción de Tinguaro: El paquete posee una versión actualizada.
 # Pensarlo seriamente. sv
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr ""
 " ==> El distribuidor del paquete ha publicado una versión actualizada.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr ""
 "     La versión del paquete es la misma que la de la última instalación.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Se usará el fichero nuevo tal y como se solicitó.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Se usará el fichero actual (antiguo) como se pidió.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr ""
 " ==> Se conserva el fichero de configuración antiguo como predeterminado.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Se usará el nuevo fichero de configuración como predeterminado.\n"
 
 # Traducción de Tinguaro: "What would you like " -> "Seleccione una opción:"
 # Considerarlo seriamente. sv
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2174,159 +2211,161 @@
 "      D    : mostrar las diferencias entre versiones\n"
 "      Z    : ejecutar un intérprete de órdenes para examinar la situación\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " La acción por omisión es conservar la versión actual.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " La acción por omisión es instalar la nueva versión.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[por omisión=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[por omisión=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[no hay opción predeterminada]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "error al escribir en la salida de error estándar, se descubrió antes\n"
 "de preguntar sobre conffiles"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "error de lectura en la entrada estándar al preguntar sobre conffiles"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF en la entrada estándar al preguntar sobre conffiles"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s depende de %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s predepende de %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s recomienda %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s sugiere %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s rompe %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s entra en conflicto con %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s mejora %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s va a ser desinstalado.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s va a ser desconfigurado.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s está instalado, pero tiene versión %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, 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:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s está desempaquetado, pero tiene versión %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, 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:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s es %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, 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:378
+#: src/depcon.c:392
 #, 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:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s proporciona %.250s pero es %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s no está instalado.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versión %.250s) va a ser instalado.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versión %.250s) está presente y %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, 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:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s proporciona %.250s y está presente y %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "Utilice --help para obtener ayuda de la consulta de paquetes."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2334,7 +2373,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versión %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2345,8 +2384,8 @@
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 "Copyright (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2357,7 +2396,7 @@
 "2 o\n"
 "posterior para conocer las condiciones de copia. No hay NINGUNA garantía.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2367,7 +2406,7 @@
 "Modo de uso: %s [<opción> ...] <orden>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2386,7 +2425,7 @@
 "  --truename <fichero>      devuelve el fichero desviado.\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2418,7 +2457,7 @@
 "  --version                 muestra la versión.\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2433,18 +2472,12 @@
 "Los scripts preinst o postrm de los paquetes deberían siempre especificar\n"
 "--package y --divert.\n"
 
-# FIXME: Traducción de 'stat'
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "no se puede efectuar `stat' el fichero `%s'"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "error al comprobar `%s'"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2453,129 +2486,129 @@
 "renombrar obliga a sobreescribir `%s' con\n"
 "  un fichero distinto `%s', no está permitido."
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "no se puede escribir el fichero `%s'"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "copia de fichero"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "no se puede renombrar `%s' a `%s'"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "rename: eliminado enlace antiguo duplicado `%s'"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "no se puede abrir el fichero fuente `%.250s'"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "desviación local a %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "desviación local de %s a %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "desviación de %s por %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "desviación de %s a %s por %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "cualquier desviación de %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "cualquier desviación de %s a %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "no se puede crear el nuevo fichero %s"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "no se puede volcar el fichero `%s'"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "error al eliminar diversions-old antiguo"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "error al crear el nuevo fichero diversions-old"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "error al instalar las nuevas desviaciones"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s necesita un parámetro"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "el nombre de fichero «%s» no es una ubicación absoluta"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "el nombre de fichero no puede contener caracteres de línea"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "No se pueden desviar directorios"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "No se pueden desviar el fichero `%s' a sí mismo"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "Dejando `%s'\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' entra en conflicto con `%s'"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "Añadiendo `%s'\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "No hay un desvío para `%s', no se ha eliminado ninguno.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2586,7 +2619,7 @@
 "  cuando se eliminaba `%s'\n"
 "  se encontró `%s'"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2597,16 +2630,16 @@
 "  cuando se eliminaba `%s'\n"
 "  se encontró `%s'"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "Eliminando `%s'\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "el nombre de paquete no puede tener saltos de línea"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "«divert-to» no puede tener saltos de línea"
 
@@ -2693,8 +2726,8 @@
 "utilizando dselect o dpkg --configure --pending (o dpkg --triggers-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s no toma ningún argumento"
@@ -2790,7 +2823,7 @@
 msgid "--compare-versions bad relation"
 msgstr "relación --compare-versions errónea"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "la versión `%s' tiene una sintaxis errónea: %s"
@@ -2850,12 +2883,12 @@
 "sobreseyendo el problema porque está activa la opción --force:\n"
 " "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "no se puede abrir el fichero de lista de ficheros del paquete `%.250s'"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2864,64 +2897,64 @@
 "falta el fichero de lista de ficheros del paquete `%.250s', se supondrá que "
 "el paquete no tiene ningún fichero actualmente instalado."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr ""
 "no se puede ejecutar «stat» sobre el fichero de lista de ficheros del "
 "paquete `%.250s'"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "el fichero de lista de ficheros del paquete `%.250s'"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "falta un salto de línea nueva al final del fichero de lista de ficheros del "
 "paquete `%.250s' "
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "el fichero de lista de ficheros del paquete `%.250s'\n"
 "contiene un nombre de fichero vacío"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "error al cerrar el fichero de lista de ficheros del paquete `%.250s'"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Leyendo la base de datos ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "%d fichero o directorio instalado actualmente.)\n"
 msgstr[1] "%d ficheros o directorios instalados actualmente.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 "no se puede crear el fichero de lista de ficheros actualizado\n"
 "del paquete %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 "no se puede escribir en el fichero de lista de ficheros actualizado\n"
 "del paquete %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
@@ -2929,7 +2962,7 @@
 "actualizado\n"
 "del paquete %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
@@ -2937,14 +2970,14 @@
 "ficheros\n"
 "del paquete %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 "no se puede cerrar el fichero actualizado de lista de ficheros del\n"
 "paquete %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2984,7 +3017,9 @@
 msgstr "instalado"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "error: no se ha establecido el PATH."
 
 #: src/help.c:129
@@ -3026,7 +3061,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -3038,65 +3073,65 @@
 msgstr "fallo al efectuar `chroot' a `%.250s'"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "fallo al cambiar al directorio `%.255s'"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "no se pueden establecer los permisos de ejecución en `%.250s'"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "no se puede efectuar `setenv' para el script del desarrollador"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "instalado el script %s"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "no se puede efectuar `stat' sobre %s `%.250s'"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "script %s nuevo"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "script de `%s' antiguo"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "no se puede efectuar `stat' sobre %s `%.250s': %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - probando el script del nuevo paquete en su lugar...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "no hay ningún script en la nueva versión del paquete - abandono"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... parece que todo fue bien.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "no se puede borrar de forma segura `%.255s'"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -3105,7 +3140,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "no se puede comprobar la existencia de `%.250s'"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "no se puede leer el directorio `info'"
 
@@ -3181,7 +3216,7 @@
 "  -Dh|--debug=help                  Muestra la ayuda sobre depurar.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3321,7 +3356,7 @@
 msgstr ""
 "Utilice `dselect' o 'aptitude' para una gestión de paquetes más amigable.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3371,30 +3406,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3403,103 +3442,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "problemas de dependencias - no se desinstala"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "problemas de dependencias - no se desinstala"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "no se puede efectuar `setenv' para el script del desarrollador"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "error de lectura en el fichero de configuración `%.255s'"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3507,7 +3546,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3515,41 +3554,41 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug necesita un número octal como parámetro"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nombre de paquete vacío en la lista de --ignore-depends separados por coma `"
 "%.250s'"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends necesita un nombre de paquete legal.\n"
 "`%.250s' no lo es; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "entero inválido para --%s: `%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "error al ejecutar la llamada '%s', código de error %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "estado"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3558,7 +3597,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3566,12 +3605,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opción «force/refuse» desconocida `%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "opción «force/refuse» obsoleta `%s'\n"
@@ -3594,8 +3633,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes del fin de la línea %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "se necesita una opción de acción"
 
@@ -3760,95 +3799,95 @@
 msgid "passed\n"
 msgstr "correcto\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "fallo al crear directorio temporal"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "el paquete %s tiene demasiadas parejas de Conflictos/Reemplazos"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "la versión antigua del paquete tiene un nombre de fichero de información\n"
 "larguísimo que comienza por `%.250s'"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "no se puede borrar el fichero de información obsoleto `%.250s'"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 "no se puede instalar el (supuestamente) nuevo fichero de información `%.250s'"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "no se puede abrir el directorio de control temporal"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "el paquete contiene un nombre de fichero de información larguísimo\n"
 "(comienza con `%.50s')"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "la información de control del paquete contiene el directorio `%.250s'"
 
 # Este mensaje es realmente obtuso. Suerte que no sale nunca. sv
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "al borrar el directorio `%.250s' en la información de control del paquete\n"
 "ocurrió un error distinto de no ser un directorio"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "el paquete %s contiene `list' como fichero de información"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 "no se puede instalar el nuevo fichero de información `%.250s' como `%.250s'"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "no se puede borrar el fichero de información de control `%.250s'"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "no se puede acceder al archivo"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "fallo al crear directorio temporal"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "longitud de la información de control"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Registrada la información sobre %s a partir de %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr ""
 "la arquitectura del paquete (%s) no corresponde con la del sistema (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3857,106 +3896,106 @@
 "dpkg: acerca de %s que contiene %s, problema de predependencia:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "problema de predependencia - no se instala %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "¡descartando problema de predependencia!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Preparando para reemplazar %s %s (usando %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Desempaquetando %s (de %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "el nombre del conffile (que comienza por `%.250s')\n"
 "es demasiado largo (>%d caracteres)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "error de lectura en %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "error al cerrar %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "error intentando abrir %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Desconfigurando %s, para poder eliminar %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Desconfigurando %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Desempaquetando el reemplazo de %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "extracción de campos dpkg-deb"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "error al leer la salida de tar de dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "sistema de ficheros del archivo tar dañado - archivo de paquete dañado"
 
 # Please, que alguien me diga qué es eso de zap. sv
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: zapea posibles ceros finales"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "no se puede efectuar `stat' sobre el fichero antiguo `%.250s' por lo que no "
 "se borrará: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "no se puede borrar el directorio antiguo `%.250s': %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "el conffile antiguo `%.250s' era un directorio vacío (y ahora se ha "
 "eliminado)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "no se puede efectuar `stat' otro fichero nuevo `%.250s'"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3965,12 +4004,12 @@
 "¡el fichero antiguo `%.250s' es el mismo que algunos de los nuevos ficheros! "
 "(tanto `%.250s' como `%.250s')"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "no se puede borrar de forma segura el fichero antiguo `%.250s': %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Note la desaparición de %s, que ha sido completamente reemplazado.)\n"
@@ -4156,7 +4195,7 @@
 "  -f|--showformat=<formato>   Utiliza un formato alternativo para --show.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -4181,6 +4220,10 @@
 "  menos que el ancho sea negativo, en cuyo caso se alinearán a la "
 "izquierda.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Utilice --help para obtener ayuda de la consulta de paquetes."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4243,7 +4286,7 @@
 msgid "Removing %s ...\n"
 msgstr "Desinstalando %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4252,53 +4295,54 @@
 "al desinstalar %.250s, no se puede borrar el directorio `%.250s': %s - ¿el "
 "directorio puede ser un punto de montaje?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "no se puede borrar `%.250s'"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "no se puede borrar de forma segura `%.250s'"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "al desinstalar %.250s, el directorio %.250s' no está vacío, por lo que no se "
 "borra."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "no se puede borrar `%.250s'"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Purgando ficheros de configuración de %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr ""
 "no se puede borrar el fichero de configuración antiguo `%.250s' (= `%.250s')"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 "no se puede leer el directorio del fichero de configuración `%.250s'\n"
 "(a partir de `%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "no se puede borrar el antiguo fichero de configuración de respaldo `%.250s'\n"
 "(de `%.250s')"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "no se puede borrar la lista de ficheros antigua"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "no se puede borrar el script postrm antiguo"
 
@@ -4341,7 +4385,13 @@
 msgid "read error on standard input"
 msgstr "error de lectura en la entrada estándar"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "Utilice --help para obtener ayuda de la consulta de paquetes."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4350,7 +4400,7 @@
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4370,7 +4420,7 @@
 
 # NOTE: `override' se traduce como redefinición porque no se "anula" o
 # "hace caso omiso" de los valores de dpkg, se reemplazan por otros.
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4394,31 +4444,31 @@
 "  --version                 muestra la versión.\n"
 "\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "omitiendo «/» final"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "no se puedo abrir el nuevo fichero statoverride"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "error al eliminar statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "error al crear el nuevo fichero statoverride-old"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "error al instalar el nuevo statoverride"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add necesita cuatro parámetros"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4427,21 +4477,21 @@
 "Existe una redefinición para `%s' que la descarta, pero se ha especificado --"
 "force con lo que se ignorará."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Ya existe una redefinición para `%s', interrumpiendo."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "se ha utilizado --update pero no existe %s"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "No existe una redefinición."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "es inútil utilizar --update con --remove"
 
@@ -4507,16 +4557,16 @@
 msgstr ""
 "se encontraron múltiples definiciones statoverride para el fichero `%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Escriba dpkg-trigger --help para obtener ayuda de esta herramienta."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Herramienta de disparadores de Debian `%s' versión %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4527,7 +4577,7 @@
 "             %s [<opciones> ...] <orden>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4540,7 +4590,7 @@
 "soporta disparadores.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4563,21 +4613,21 @@
 "  --no-act                         Sólo probar, no cambiar nada realmente.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: el directorio de datos de disparadores aún no se ha creado\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: aún no existen registros de disparadores\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "toma solamente un argumento, el nombre del disparador"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4587,13 +4637,13 @@
 "dpkg-trigger debe llamarse desde un programa de un desarrollador (o con la "
 "opción --by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: nombre de paquete esperado ilegal `%.250s': %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "nombre de disparador inválido `%.250s': %.250s"
@@ -4626,41 +4676,42 @@
 msgstr "Procesando disparadores para %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s necesita exactamente un fichero de Paquetes como argumento"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "no se puede acceder al área de estado de dpkg para una actualización\n"
 "de `available'"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "la actualización de `available' requiere acceso de escritura al área de "
 "estado\n"
 "de dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Reemplazando información de paquetes disponibles, usando %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Actualizando información de paquetes disponibles, usando %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "Se actualizó la información sobre %d paquete.\n"
 msgstr[1] "Se actualizó la información sobre %d paquetes.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4780,8 +4831,8 @@
 msgstr[1] ""
 "no se tendrán en cuenta %d avisos sobre el/los fichero/s de control\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necesita un directorio como parámetro"
@@ -4816,26 +4867,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: construyendo el paquete `%s' en `%s'.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "fallo al crear el fichero temporal (data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "área de control"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "fallo al borrar el fichero temporal (data), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4852,20 +4903,20 @@
 msgid "error writing `%s'"
 msgstr "error al escribir `%s'"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "entre números"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "fallo al escribir el nombre del fichero en la tubería de tar (data)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<comprimir> desde tar -cf"
 
@@ -4883,79 +4934,79 @@
 msgid "error reading %s from file %.255s"
 msgstr "error al leer %s del fichero %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "fallo al leer el archivo `%.255s'"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "fallo al efectuar `fstat' sobre el archivo"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "el archivo no tiene ningún punto en el número de versión"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "el archivo no tiene caracteres de nueva línea en la cabecera"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "el fichero `%.250s' está dañado - número de parte erróneo"
 
 # FIXME: Comment about dpkg-split may be misleading.
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "el fichero `%.250s' no es un archivo binario de debian"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "el archivo no tiene ningún punto en el número de versión"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "el archivo no tiene caracteres de nueva línea en la cabecera"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "el archivo no tiene ningún punto en el número de versión"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "no se entiende la versión %.250s del archivo, consiga un\n"
 "dpkg-deb más moderno"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "se salta el elemento de %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "el fichero `%.250s' contiene un miembro %.*s ininteligible, abandono"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "el fichero `%.250s' contiene dos miembros de control, abandono"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4967,24 +5018,24 @@
 " paquete debian nuevo, versión %s.\n"
 " tamaño %ld bytes: archivo de control= %zi bytes.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
 # FIXME: ctrl is the same as `control'? sv
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "el archivo tiene una longitud de control mal formada `%s'"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "se salta el elemento de %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4996,7 +5047,7 @@
 " paquete debian antiguo, versión %s.\n"
 " tamaño %ld bytes: archivo de control= %zi, archivo principal= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -5005,50 +5056,51 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' no es un archivo en formato debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "fallo al escribir a la tubería en la copia"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "fallo al cerrar la tubería en la copia"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "datos"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "fallo al cambiar al directorio"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "fallo al crear directorio"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "fallo al cambiar a un directorio después de crearlo"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "fallo al cambiar al directorio"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<descompresión>"
 
 # TODO - revisar contexto
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "copiado"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s necesita un nombre de fichero .deb como argumento"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -5057,99 +5109,99 @@
 "--%s necesita un directorio de destino.\n"
 "¿A lo mejor lo que quiere hacer es dpkg --install?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s toma solamente un argumento (fichero .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "fallo al cambiar a `/' para limpieza"
 
 # FIXME: Traducción de 'stat'
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "no se puede efectuar `stat' el fichero `%s'"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: `%.255s' no contiene ningún componente de control `%.255s'\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "la apertura del componente `%.255s' (dentro de %.255s)\n"
 "falló de forma inesperada"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "falta %d componente de control solicitado"
 msgstr[1] "faltan %d componentes de control solicitados"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "no se puede examinar el directorio `%.255s'"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "no se puede efectuar `stat' sobre `%.255s' (en `%.255s')"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "no se puede abrir `%.255s' (en `%.255s')"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "fallo al leer `%.255s' (en `%.255s')"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bytes, %5d líneas  %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     no es un fichero normal   %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(¡no hay ningún fichero `control' en el archivo de control!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "no se puede abrir el componente `control'"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "fallo durante la lectura de la componente `control'"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "error al cerrar el componente `%s'"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Error en el formato"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents toma exactamente un argumento"
 
@@ -5160,7 +5212,19 @@
 msgstr "Versión `%s' del sistema de gestión de paquetes de Debian `%s'.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -5171,6 +5235,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -5189,7 +5255,7 @@
 "  --fsys-tarfile <deb>               Produce el archivo tar del sistema de\n"
 "                                     ficheros.\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -5201,11 +5267,27 @@
 "<cfichero> es el nombre de un componente de fichero administrativo.\n"
 "<ccampo> es el nombre de un campo en el fichero de `control' principal.\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5230,7 +5312,7 @@
 "                           «gzip», «xz,» «bzip2», «lzma», «none» (ninguno)\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5244,7 +5326,7 @@
 "de paquetes fácil de usar. Aviso: ¡los paquetes que desempaquete con\n"
 "«dpkg-deb --extract» no estarán instalados correctamente!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5253,17 +5335,17 @@
 "deb;\n"
 "Escriba dpkg --help para obtener ayuda sobre instalar y desinstalar paquetes."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "entero inválido para --%c: `%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "nivel de compresión inválido para --%c: %ld"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "¡tipo de compresión `%s' desconocido!"
@@ -5284,7 +5366,7 @@
 msgstr ""
 "el fichero `%.250s' está dañado - falta una nueva línea después de %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "error al leer %.250s"
@@ -5384,55 +5466,61 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "el fichero `%.250s' está dañado - número de parte erróneo"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "nombre de paquete"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "el fichero `%.250s' está dañado - magia errónea al final de\n"
 "la segunda cabecera"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "el fichero `%.250s' está dañado - el segundo miembro no es un miembro\n"
 "de datos"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "el fichero `%.250s' está dañado - número equivocado de partes para los\n"
 "tamaños indicados"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "el fichero `%.250s' está dañado - el tamaño está equivocado por el\n"
 "número de parte indicado"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "no se puede efectuar `stat' sobre el fichero parte `%.250s'"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "el fichero `%.250s' está dañado - demasiado corto"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "no se puede abrir el fichero parte de archivo `%.250s'"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "el fichero `%.250s' no es una parte de archivo"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5452,6 +5540,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5475,12 +5564,20 @@
 "        (porción utilizada):        %lu bytes\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+# Se refiere a la sección.
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<desconocida>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s requiere uno o más ficheros parte como argumentos"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "el fichero `%s' no es una parte de archivo\n"
@@ -5515,7 +5612,7 @@
 msgid "split package part"
 msgstr "Juntando el paquete %s desde %d parte: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "hecho\n"
@@ -5568,17 +5665,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Opciones:\n"
 "   --depotdir <directorio>         Utiliza <directorio> en lugar de %s/%s.\n"
@@ -5591,20 +5697,29 @@
 "\n"
 "Estado de salida: 0 = OK;  1 = -a no es una parte;  2 = ¡problemas!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Escriba dpkg-split --help para obtener ayuda."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fin de fichero inesperado en %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "el tamaño de la parte es demasiado grande o no es positivo"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -5716,27 +5831,27 @@
 msgid "Deleted %s.\n"
 msgstr "Desinstalado %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "extracción de campos dpkg-deb"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "no se puede abrir el fichero fuente `%.250s'"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "no se puede efectuar `stat' sobre el fichero fuente"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "el fichero fuente `%.250s' no es un fichero normal"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5745,17 +5860,17 @@
 msgstr[0] "Juntando el paquete %s desde %d parte: "
 msgstr[1] "Juntando el paquete %s desde %d partes: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split necesita un nombre de fichero fuente como argumento"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "--split toma como mucho un nombre de fichero fuente y un prefijo de destino"
@@ -5933,128 +6048,92 @@
 "  --version                 muestra la versión.\n"
 "\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "error"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "atención"
 
-# FIXME: Traducción de 'stat'
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "no se puede efectuar `stat' sobre `%s': %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "falló readlink(%s): %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "se han especificado dos órdenes: --%s y --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "no se puede añadir a %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "falló «scan» sobre %s: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "fallo al ejecutar %s: %s"
-
-#: utils/update-alternatives.c:503
-#, c-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"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "no se puede instalar %s como %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "no se puede eliminar %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "fin de fichero inesperado al intentar leer %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "mientras se leía %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "línea no terminada al intentar leer %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s dañado: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-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)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "al escribir %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "nombre de esclavo"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "esclavo duplicado `%s'"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "enlace esclavo"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "el enlace esclavo es el mismo que el principal %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "enlace esclavo duplicado `%s'"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "fichero maestro"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "ruta duplicada %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -6063,130 +6142,115 @@
 "no existe la alternativa %s (parte del grupo de enlaces %s). Eliminándola de "
 "la lista de alternativas."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "prioridad"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "fichero esclavo"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "prioridad de %s %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "no se puede leer %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "estado"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "estado inválido"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "enlace maestro"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "no se puede cerrar %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "descartando el enlace esclavo obsoleto %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "no se puede escribir %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "modo automático"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "modo manual"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr " el enlace apunta actualmente a %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr " no hay enlace actualmente"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - prioridad %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr " esclavo %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Actualmente la «mejor» versión es `%s'."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "No hay ninguna versión disponible."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "Existe %d opción para la alternativa %s (que provee %s)."
 msgstr[1] "Existen %d opcioens para la alternativa %s (que provee %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Selección"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Ruta"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Prioridad"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Estado"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Pulse <Intro> para mantener el valor por omisión [*] o pulse un número de "
 "selección: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "no se sustituirá %s por un enlace."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "no se puede instalar la opción desconocida %s"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -6195,99 +6259,154 @@
 "se omitió la creación de %s porque no existe el fichero asociado %s (del "
 "grupo de enlaces %s)."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "no se sustituirá %s por un enlace."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Llamada a %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 "No se modificó la alternativa %s porque la opción %s no está disponible."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Omitiendo la alternativa desconocida %s."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "línea demasiado larga o no terminada al intentar leer %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Omitiendo la línea inválida: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "renombrando el enlace %s de %s a %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "renombrando el enlace esclavo %s de %s a %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "el nombre alternativo (%s) no puede incluir «/» o espacios."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "el enlace alternativo no es absoluto como debería ser: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "la ruta alternativa no es absoluta como debería ser: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "la alternativa %s no puede ser el maestro: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "el enlace alternativo %s ya está gestionándose con %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "la ruta alternativa %s no existe."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "la alternativa %s no puede ser esclava de %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "la alternativa %s no puede ser el maestro: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "el enlace alternativo %s ya está gestionándose con %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "argumento `%s' desconocido"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necesita <enlace> <nombre> <ruta> <prioridad>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<enlace> y <ruta> no pueden ser iguales"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "el valor de prioridad debe ser un entero"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s necesita <nombre> <ruta>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s necesita <nombre>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "sólo se puede utilizar --slave con --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necesita <enlace> <nombre> <ruta>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "el nombre %s es al mismo tiempo principal y esclavo"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "el enlace %s es al mismo tiempo principal y esclavo"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s necesita un <archivo> como parámetro"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opción `%s' desconocida"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -6295,67 +6414,22 @@
 "necesito --display, --query, --list, --get-selections, --config, --set, --"
 "set-selections, --install, --remove, --all, --remove-all o --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "la alternativa %s no puede ser el maestro: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "el enlace alternativo %s ya está gestionándose con %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "el enlace alternativo no es absoluto como debería ser: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "la ruta alternativa no es absoluta como debería ser: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "la ruta alternativa %s no existe."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "el nombre alternativo (%s) no puede incluir «/» o espacios."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "es la alternativa maestra."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "es un esclavo de %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "la alternativa %s no puede ser esclava de %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<entrada estándar>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "no hay alternativas para %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s es un enlace colgado, será actualizado con la mejor opción."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6366,50 +6440,50 @@
 msgstr ""
 "están deshabilitadas las actualizaciones automáticas de %s, no se modificará."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "configurando la selección automática de %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "la alternativa %s para %s no está registrada, no se configurará."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "No hay un programa que provea %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Nada que configurar."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Sólo hay una alternativa en el grupo de enlaces %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "la alternativa %s para %s no está registrada, no se eliminará."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "eliminando la alternativa seleccionada manualmente, conmutando %s a modo "
 "automático"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr ""
 "están deshabilitadas las actualizaciones automáticas de %s, no se modificará."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6417,12 +6491,12 @@
 "para volver a hacer actualizaciones automáticas utilice «update-alternatives "
 "--auto %s»."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "utilizando %s para proveer %s (%s) en %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
@@ -6430,13 +6504,50 @@
 "forzando la reinstalación de la alternativa %s porque el grupo de enlaces %s "
 "está roto."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "no se conoce la alternativa actual %s, cambiando a %s para el grupo de "
 "enlaces %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "es la alternativa maestra."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "es un esclavo de %s"
+
+# FIXME: Traducción de 'stat'
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "no se puede efectuar `stat' sobre `%s': %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "falló readlink(%s): %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "falló «scan» sobre %s: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "fallo al ejecutar %s: %s"
+
+#~ 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"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "no se puede instalar %s como %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "al escribir %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "no se puede leer %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "no se puede cerrar %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "no se puede escribir %s: %s"
+
 #, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6712,9 +6823,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "se omite el área de control de %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "fallo al ejecutar tar"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "fallo al crear el directorio temporal"
 
Binary files dpkg/po/et.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/et.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/et.po /home/vorlon/devel/multiarch/dpkg-debian/po/et.po
--- dpkg/po/et.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/et.po	2012-06-07 10:11:09.426073000 -0700
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.14.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2007-07-12 22:06+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -25,7 +25,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
@@ -45,71 +45,77 @@
 msgid "ar member file (%s)"
 msgstr "tõrge toru loomisel"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "tõrge funktsioonis buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "tõrge funktsioonis buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "lühike lugemine funktsioonis buffer_copy (%s)"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "tõrge tar-i käivitamisel"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "faili %s pole võimalik luua: %s"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: lahtipakkimine"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: pakkimine"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: sisemine gzip viga: `%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: sisemine gzip viga: `%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: sisemine gzip viga: `%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: sisemine gzip viga: `%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: sisemine gzip viga: `%s'"
@@ -124,31 +130,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: sisemine bzip2 viga: `%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: sisemine bzip2 viga: `%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: sisemine bzip2 viga: `%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: sisemine bzip2 viga: `%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -157,106 +163,106 @@
 "uuenduste kataloog sisaldab faili `%.250s', mille nimi on liiga pikk (pikkus "
 "%d, suurim lubatud suurus on %d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "uuenduste kataloogi `%.255s' pole võimalik läbi vaadata"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "faili `%.255s' pole võimalik luua"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr ""
 
 # FIXME! kuidas peaks "control archive" tõlkima? hetkel on tõlgitud kui juhtarhiiv
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "tõrge tmpfile avamisel funktsioonis vsnprintf"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "sul pole õigust dpkg olekuandmebaasi lukustada"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "dpkg olekuandmebaasi pole võimalik lukustada"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "selle toimingu jaoks on vaja superkasutaja õiguseid"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "dpkg olekupiirkonnale pole võimalik ligi pääseda"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "operatsioon vajab olekupiirkonnas lugemis-/kirjutamisõigust"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "`%.250s' uuendatud olekut pole võimalik kirjutada"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "`%.250s' uuendatud olekut pole võimalik sulgeda"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "`%.250s' olekut pole võimalik uuendada"
@@ -277,91 +283,93 @@
 msgid "unable to open directory '%s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "tõrge puhvrite tühjendamisel funktsioonis vsnprintf"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "tõrge `%s' avamisel %s andmete kirjutamiseks"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "olekufailile pole võimalik puhverdamist määrata"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr ""
 "dpkg: %s: hoiatus - tõrge `%.250s' ümbernimetamisel nimega `%.250s': %s\n"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "tõrge faili %s omanike muutmisel: %s"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "tõrge faili %s omanike muutmisel: %s"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "tõrge `%s' avamisel %s andmete kirjutamiseks"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "dpkg: %s: hoiatus - tõrge `%.250s' ümbernimetamisel nimega `%.250s': %s\n"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 "dpkg: %s: hoiatus - tõrge `%.250s' ümbernimetamisel nimega `%.250s': %s\n"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 msgid "out of memory for new error context"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -370,34 +378,34 @@
 "%s: viga puhastamisel:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, c-format
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: viga puhastamisel:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr ""
 "%s: viga puhastamisel:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%d: sisemine viga `%s'\n"
@@ -413,188 +421,188 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "  %.250s pole paigaldatud.\n"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "vigane pakinimi (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "tühi faili üksikasjade väli `%s'"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "faili üksikasjade väli `%s' pole olekufailis lubatud"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr ""
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "selles kontekstis pole `status' välja väärtus lubatud"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "viga Version stringis `%.250s': %.250s"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr ""
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "selles kontekstis pole `config-version' välja väärtus lubatud"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "viga Config-Version stringis `%.250s': %.250s"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr ""
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "väli `%s', vigane pakinimi `%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " bad version relationship %c%c"
 msgstr ""
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " `%c' is obsolete, use `%c=' or `%c%c' instead"
 msgstr ""
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " implicit exact match on version number, suggest using `=' instead"
 msgstr ""
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr ""
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr ""
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr ""
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr ""
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr ""
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr ""
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 #, fuzzy
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "selles kontekstis pole `config-version' välja väärtus lubatud"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, fuzzy, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "väli `%s', vigane pakinimi `%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 #, fuzzy
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "selles kontekstis pole `status' välja väärtus lubatud"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, fuzzy, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "vigane pakinimi real %d: %.250s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, fuzzy, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "paki `%.250s' failide nimekiri"
@@ -651,7 +659,7 @@
 msgid "unable to write to status fd %d"
 msgstr "`%.250s' uuendatud olekut pole võimalik kirjutada"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 msgid "malloc failed (%zu bytes)"
 msgstr "tõrge realloc funktsioonis (%ld baiti)"
@@ -661,8 +669,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "tõrge realloc funktsioonis (%ld baiti)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 #, fuzzy
 msgid "failed to allocate memory"
 msgstr "tõrge kataloogi loomisel"
@@ -696,199 +704,205 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr ""
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "seadistuste viga: võtmel %s peab olema väärtus"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, fuzzy, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "tõrge seadistusfaili `%.255s' avamisel lugemiseks"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "tundmatu võti `%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "--%s võtmel peab olema määratud väärtus"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "--%s võtmel ei tohi väärtust olla määratud"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "viga seadistusfaili `%.255s' lugemisel"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "viga seadistusfaili `%.255s' sulgemisel"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "viga seadistusfaili `%.255s' sulgemisel"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "tundmatu võti --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s võtmel peab olema määratud väärtus"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s võtmel ei tohi väärtust olla määratud"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "tundmatu võti -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c võtmel peab olema määratud väärtus"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c võtmel ei tohi väärtust olla määratud"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "Hoiatus: aegunud võti `--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "vastuolulised tegevused -%c (--%s) ja -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "korduv välja `%s' väärtus"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "kasutaja poolt kirjeldatud välja `%.*s' nimi on liiga lühike"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "korduv kasutaja poolt kirjeldatud välja `%.*s' väärtus"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr ""
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "tõrge pakiandmete faili `%.255s' lugemiseks avamisel"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "error reading %s from file %.255s"
 msgid "reading package info file '%.255s'"
 msgstr "viga %s lugemisel failist %.255s"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "tõrge sulgemisel pärast lugemist: `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "faililõputunnus pärast kirje `%.*s' nime"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "reavahetus pärast kirje `%.*s' nime"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS-i faililõputunnus (^Z) välja `%.*s' nimes"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "väljanimele `%.*s' peab järgnema koolon"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "enne välja `%.*s' väärtust on faililõputunnus (puudub lõpu reavahetus)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 "välja `%.*s' väärtuses on MSDOS-i faililõputunnuse märk (puudub reavahetus?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "reavahetus pärast kirje `%.*s' nime"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "välja `%.*s' väärtuses on faililõputunnus (puudub lõpu reavahetus)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "tõrge sulgemisel pärast lugemist: `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr ""
@@ -907,66 +921,66 @@
 " %.255s"
 msgstr "%s faili `%.255s' %d. rea läheduses"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "ei tohi olla tühi string"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "peab algama tähe või numbriga"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "märk `%c' pole lubatud (ainult tähed, numbrid ja `%s' märgid)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<puudub>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "versioonistring puudub"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "versioonistring sisaldab tühikuid"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "versiooninumber lõpeb kooloniga"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "versiooninumber lõpeb kooloniga"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "versiooninumber lõpeb kooloniga"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "puudub %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr ""
@@ -985,51 +999,51 @@
 msgid "(no description available)"
 msgstr "(kirjeldus pole saadaval)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, fuzzy, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "viga `%s' kontrollimisel: %s"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (alamprotsess): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "tõrge fork() funktsioonis"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "alamprotsess %s tagastas lõpetamisel veakoodi %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "tõrge %s järel ootamisel"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "alamprotsess %s kõrvaldati signaaliga (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ""
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, fuzzy, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "alamprotsess %s tagastas lõpetamisel veakoodi %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "tõrge %s järel ootamisel"
@@ -1049,197 +1063,203 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, fuzzy, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 msgid "triggers area"
 msgstr "luku %s vabastamine pole võimalik: %s"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, fuzzy, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "osafaili `%.250s' olekut pole võimalik fstat funktsiooniga lugeda"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, fuzzy, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, fuzzy, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, fuzzy, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "viga %s lugemisel failist %.255s"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, fuzzy, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, fuzzy, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, fuzzy, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "failist `%.255s' pole võimalik uut versiooni paigaldada"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, fuzzy, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "paki `%.250s' failide nimekirja pole võimalik avada"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, fuzzy, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "tõrge arhiivi `%.255s' lugemisel"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:419
-#, fuzzy, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, fuzzy, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
+msgstr "failist `%.255s' pole võimalik uut versiooni paigaldada"
+
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "`%.250s' pole võimalik eemaldada"
+
+#: lib/dpkg/triglib.c:360
+#, fuzzy, c-format
+msgid "unable to create new trigger interest file `%.250s'"
 msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:383
 #, fuzzy, c-format
-msgid "unable to install new trigger interest file `%.250s'"
-msgstr "failist `%.255s' pole võimalik uut versiooni paigaldada"
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, fuzzy, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, fuzzy, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, fuzzy, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "failist `%.255s' pole võimalik uut versiooni paigaldada"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, fuzzy, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, fuzzy, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "viga seadistusfaili `%.255s' lugemisel"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, fuzzy, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, fuzzy, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "`%.250s' uuendatud olekut pole võimalik kirjutada"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, fuzzy, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "`%.250s' uuendatud olekut pole võimalik kirjutada"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, fuzzy, c-format
 msgid "read error in `%.250s'"
@@ -1264,7 +1284,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "viga dpkg-deb torust lugemisel"
 
@@ -1283,12 +1303,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "viga nimeviida `%.255s' omaniku seadmisel"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "viga `%.255s' omaniku sättimisel"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "viga `%.255s' pääsuõiguste sättimisel"
@@ -1339,162 +1359,177 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr ""
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "unable to read %s: %s"
+msgid "cannot stat file '%s'"
+msgstr "faili `%s' pole võimalik lugeda: %s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Failide asendamine vanas pakis %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Asendatud pakis %s olevate failidega ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
 "nondirectory"
 msgstr "`%.250s' proovitakse üle kirjutada, see on juba pakis %.250s"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "`%.250s' proovitakse üle kirjutada, see on juba pakis %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "taustaprotsess dpkg-deb failiga `%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "viga `%.255s' sulgemisel/kirjutamisel"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "viga toru `%.255s' loomisel"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "viga seadme `%.255s' loomisel"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "viga viida `%.255s' loomisel"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "viga nimeviida `%.255s' loomisel"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "viga kataloogi `%.255s' loomisel"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "viita `%.255s' pole võimalik lugeda"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 "failist `%.255s' pole võimalik enne uue versiooni paigaldamist varukoopia "
 "nimeviita luua"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "faili `%.255s' nimeviidale pole võimalik pääsuõigusi määrata (chown)"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "failist `%.255s' pole võimalik enne uue versiooni paigaldamist varukoopia "
 "viita luua"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "failist `%.255s' pole võimalik uut versiooni paigaldada"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "faili `%.255s' pole võimalik luua"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
 "%s"
 msgstr "dpkg: hoiatus - eelsõltuvuse probleemi eiramine!\n"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, fuzzy, c-format
 msgid ""
 "considering deconfiguration of essential\n"
 " package %s, to enable %s."
 msgstr "dpkg: %s eemaldamise otsustamine %s kasuks ...\n"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable %s.\n"
 msgstr ""
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, fuzzy, c-format
 msgid "removal of %.250s"
 msgstr "faili `%.250s' pole võimalik eemaldada"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, fuzzy, c-format
 msgid "installation of %.250s"
 msgstr "failist `%.255s' pole võimalik uut versiooni paigaldada"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, fuzzy, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: %s eemaldamise otsustamine %s kasuks ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, fuzzy, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: jah, %s eemaldatakse %s kasuks.\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1503,160 +1538,162 @@
 "dpkg: mis puudutab pakki %2$s sisaldavat faili %1$s:\n"
 "%3$s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 #, fuzzy
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "dpkg: hoiatus - vastuolu eiratakse, jätkamine on võimalik !\n"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: %s eemaldamise otsustamine %s kasuks ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s pole korralikult paigaldatud - kõiki selle sõltuvusi eiratakse.\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: %s eemaldamisega võib olla probleeme kuna see tagab %s ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "requested.\n"
 msgstr "dpkg: pakki %s ei eemaldata, see vajab taaspaigaldamist.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: pakki %s ei eemaldata, see vajab taaspaigaldamist.\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: jah, %s eemaldatakse %s kasuks.\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "vastuolulised pakid, %.250s jäetakse paigaldamata"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 #, fuzzy
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "dpkg: hoiatus - vastuolu eiratakse, jätkamine on võimalik !\n"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr ""
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "tõrge --recursive jaoks käsu `find' käivitamisel"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "tõrge käsu `find' toru avamisel funktsiooniga fdopen"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "viga find'i torust lugemisel"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "viga find'i toru sulgemisel"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 "--recursive jaoks kasutatav käsk `find' tagastas käsitlematu veakoodi %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s vajab argumendiks vähemalt ühte pakiarhiivi nime"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Varem valimata paki %s valimine.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Valimata paki %s vahelejätmine.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr ""
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s - hoiatus: paki %.250s versiooni alandamine %.250s -> %.250s.\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
 "of backup copy"
 msgstr ""
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr ""
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to make backup symlink for `%.255s'"
 msgid "unable to remove backup copy of '%.250s'"
@@ -1664,27 +1701,27 @@
 "failist `%.255s' pole võimalik enne uue versiooni paigaldamist varukoopia "
 "nimeviita luua"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr ""
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr ""
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1692,60 +1729,60 @@
 "Installing new config file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "dpkg: %s: hoiatus - tõrge vana varukoopia `%.250s' eemaldamisel: %s\n"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 "dpkg: %s: hoiatus - tõrge `%.250s' ümbernimetamisel nimega `%.250s': %s\n"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: tõrge '%s %s' kävitamisel"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "dpkg: %s: hoiatus - tõrge vana varukoopia `%.250s' eemaldamisel: %s\n"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 "dpkg: %s: hoiatus - tõrge `%.250s' eemaldamisel (enne ülekirjutamist): %s\n"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr ""
 "dpkg: %s: hoiatus - tõrge `%.250s' ümbernimetamisel nimega `%.250s': %s\n"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Seadistusfaili %s uue versiooni paigaldamine...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr ""
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "pakki `%s' pole paigaldatud ja seetõttu pole seda võimalik seadistada"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "pakk %.250s on juba paigaldatud ja seadistatud"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1754,7 +1791,7 @@
 "pakk %.250s pole seadistamiseks valmis\n"
 " seadistamine pole võimalik (hetkeolek `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1763,11 +1800,11 @@
 "dpkg: sõltuvusprobleemid takistavad %s seadistamist:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "sõltuvusprobleemid - jäetakse seadistamata"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1777,7 +1814,7 @@
 "ikkagi:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1785,66 +1822,66 @@
 "Pakk on väga halvas seisundis - enne seadistamist peaksid\n"
 " sa paki uuesti paigaldama."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Paki %s (%s) paikasättimine ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, fuzzy, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
 " (= '%s'): %s"
 msgstr "faili %s pole võimalik asukohale %s paigaldada: %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
 " (= '%s')"
 msgstr ""
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, fuzzy, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
 " (= '%s'): %s"
 msgstr "%s pole võimalik nimega %s ümber nimetada: %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
 " ('%s' is a symlink to '%s')"
 msgstr ""
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, fuzzy, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr "lähtefail `%.250s' pole lihtfail"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr ""
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "faili %s pole võimalik kirjutamiseks avada: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Kui valmis saad, sisesta `exit'.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1853,12 +1890,12 @@
 "\n"
 "Seadistusfail `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (tegelikult `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1869,7 +1906,7 @@
 " ==> Süsteemis olev fail on loodud Sinu poolt või mõne skripti poolt.\n"
 " ==> Samuti on fail olemas pakis, pakendatud paki haldaja poolt.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1878,7 +1915,7 @@
 "\n"
 "     Pole pärast viimast paigaldust muudetud.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1887,7 +1924,7 @@
 "\n"
 " ==> Muudetud paigalduste vahel (sinu või mõne skripti poolt).\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1896,38 +1933,38 @@
 "\n"
 " ==> Kustutatud paigalduste vahel (sinu või mõne skripti poolt).\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Paki distribuutor on pakiga kaasa pannud uuendatud versiooni.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr ""
 "     Pakis olev versioon on sama, mida kasutati viimasel paigaldusel.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Sinu nõudmisel kasutatakse uut faili.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Sinu nõudmisel kasutatakse praegust vana faili.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Sinu nõudmisel jäetakse vaikimisi vana seadistusfail alles.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Vaikimisi kasutatakse uut seadistusfaili.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1942,165 +1979,166 @@
 "      D      : versioonidevaheliste erinevuste näitamine\n"
 "      Z      : olukorra uurimiseks selle protsessi taustalesaatmine\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Vaikimisi toiming on praeguse versiooni säilitamine.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Vaikimisi toiming on uue versiooni paigaldamine.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[vaikimisi=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[vaikimisi=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr ""
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr ""
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr ""
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s sõltub pakist %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s eelsõltub pakist %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s soovitab pakki %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s vihjab pakile %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s lõhub paki %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s on vastuolus pakiga %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s täiustab pakki %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s on lahti pakitud, kuid seda pole kunagi seadistatud.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s on %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s tagab paki %.250s, kuid see on määratud eemaldamiseks.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s tagab %.250s, kuid on ühtlasi %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s pole paigaldatud.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  paigaldatakse %.250s (versioon %.250s).\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, fuzzy, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versioon %.250s) on %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s tagab %.250s ja see paigaldatakse.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, fuzzy, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s tagab %.250s ja on ühtlasi %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+msgid "Use --help for help about diverting files."
+msgstr "Abiteabe jaoks sisesta dpkg-split --help."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian'i %s versioon %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2115,8 +2153,8 @@
 "Autoriõigused (C) 1995 Ian Jackson.\n"
 "Autoriõigused (C) 2000,2001 Wichert Akkerman."
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2128,7 +2166,7 @@
 "Litsentsi - versiooni 2 või ükskõik millist hilisemat versiooni. Programmil\n"
 "pole MITTE MINGISUGUST garantiid.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2138,7 +2176,7 @@
 "Kasutamine: %s [<võti> ...] <käsk>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2150,7 +2188,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2168,7 +2206,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2177,156 +2215,150 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "unable to read %s: %s"
-msgid "cannot stat file '%s'"
-msgstr "faili `%s' pole võimalik lugeda: %s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error checking `%s': %s"
 msgid "error checking '%s'"
 msgstr "viga `%s' kontrollimisel: %s"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "rename: rename `%s' to `%s': %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "ümbernimetamine: `%s' ümbernimetamine nimega `%s': %s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 #| msgid "rename: remove duplicate old link `%s': %s"
 msgid "rename: remove duplicate old link '%s'"
 msgstr "ümbernimetamine: korduva vana viida `%s' eemaldamine: %s"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 msgid "local diversion of %s"
 msgstr "kohalik ümbersuunamine failile: %s\n"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 msgid "local diversion of %s to %s"
 msgstr "kohalik ümbersuunamine failile: %s\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 msgid "diversion of %s by %s"
 msgstr "paki %s diversioonid"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "paki %s diversioonid"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 msgid "any diversion of %s"
 msgstr "kohalik ümbersuunamine failile: %s\n"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 msgid "any diversion of %s to %s"
 msgstr "paki %s diversioonid"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "cannot open GPL file"
 msgid "cannot create new %s file"
 msgstr "GPL-faili pole võimalik avada"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "tõrge puhvrite tühjendamisel funktsioonis vsnprintf"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 msgid "error removing old diversions-old"
 msgstr "viga seadistusfaili `%.255s' lugemisel"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "viga seadistusfaili `%.255s' lugemisel"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "viga seadistusfaili `%.255s' lugemisel"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s vajab ainult ühte argumenti"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "failinimi \"%s\" pole absoluutne"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "fail ei tohi sisaldada reavahetusi"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr ""
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "faili `%.250s' pole võimalik eemaldada"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "Diversioon `%s' jäetakse puutumata"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "Diversiooni `%s' lisamine"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
 msgstr "Puudub diversioon `%s', midagi ei eemaldatud"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2334,7 +2366,7 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2342,17 +2374,17 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "Diversiooni `%s' eemaldamine"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "pakk ei tohi sisaldada reavahetusi"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr ""
 
@@ -2416,8 +2448,8 @@
 msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s ei vaja argumente"
@@ -2502,7 +2534,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions vigane suhe"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "dpkg: versioon '%s' on vigase süntaksiga: %s\n"
@@ -2553,12 +2585,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "paki `%.250s' failide nimekirja pole võimalik avada"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, fuzzy, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2567,37 +2599,37 @@
 "dpkg: tõsine hoiatus: pakil `%.250s' puudub failide nimekiri, oletatavalt "
 "pole pakil praegu ühtegi faili paigaldatud.\n"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "paki `%.250s' failide nimekirja pole võimalik avada"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "paki `%.250s' failide nimekiri"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, fuzzy, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "viga paki `%.250s' failide nimekirja sulgemisel"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Andmebaasi lugemine ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2605,32 +2637,32 @@
 msgstr[0] "hetkel on paigaldatud %d faili ja kataloogi.)\n"
 msgstr[1] "hetkel on paigaldatud %d faili ja kataloogi.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2668,7 +2700,7 @@
 msgstr "paigaldatud"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr ""
 
 #: src/help.c:129
@@ -2697,7 +2729,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "faili %s pole võimalik kirjutamiseks avada: %s"
@@ -2708,66 +2740,66 @@
 msgstr ""
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr ""
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "faili %s pole võimalik kirjutamiseks avada: %s"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "vana %s skript"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr ""
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "uus %s skript"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "vana %s skript"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "faili %s pole võimalik asukohale %s paigaldada: %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - selle asemel proovitakse uue paki skripti ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "paki uues versioonis pole skripti - rohkem ei proovita midagi"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr ""
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "faili `%.255s' pole võimalik luua"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2776,7 +2808,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "`%.250s' olemasolu pole võimalik kontrollida"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "andmekataloogi pole võimalik lugeda"
 
@@ -2816,7 +2848,7 @@
 "\n"
 msgstr ""
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -2909,7 +2941,7 @@
 "Kasutajasõbraliku pakihalduse jaoks kasuta programme `dselect' või "
 "`aptitude'.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -2964,30 +2996,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -2996,102 +3032,102 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "sõltuvusprobleemid - ei eemaldata"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "sõltuvusprobleemid - ei eemaldata"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "faili %s pole võimalik kirjutamiseks avada: %s"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "viga seadistusfaili `%.255s' lugemisel"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3099,7 +3135,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3107,35 +3143,35 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug võtmel peab olema kaheksandsüsteemi argument"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3144,7 +3180,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3152,12 +3188,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:511
+#: src/main.c:513
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "Hoiatus: aegunud võti `--%s'\n"
@@ -3180,8 +3216,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "tegevuse võti on vajalik"
 
@@ -3341,198 +3377,198 @@
 msgid "passed\n"
 msgstr "läbitud\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "tõrge kataloogi loomisel"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "pakil %s on liiga palju vastuolude/asenduste paare"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr ""
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "paki juhtandmed sisaldavad kataloogi `%.250s'"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr "Pakk `%s' ei sisalda ühtki faili (!)\n"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "arhiivile pole võimalik ligi pääseda"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "tõrge kataloogi loomisel"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "juhtandmete pikkus"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr ""
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "paki arhitektuur (%s) ei vasta süsteemile (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
 "%s"
 msgstr ""
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "eelsõltuvuse probleem - %.250s jäetakse paigaldamata"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr "dpkg: hoiatus - eelsõltuvuse probleemi eiramine!\n"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Ettevalmistused paki %s %s asendamiseks (%s abil) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Paki %s lahtipakkimine (failist %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "seadistusfaili nimi (algusega `%.250s') on liiga pikk (>%d märki)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr ""
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "viga %.250s sulgemisel"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr ""
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr ""
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, fuzzy, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Paki %s eemaldamine...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Paki %.250s asenduse lahtipakkimine ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "viga dpkg-deb tar väljundi lugemisel"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "vigase failisüsteemiga tar-fail - vigane pakiarhiiv"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr ""
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "dpkg: hoiatus - vana kataloogi `%.250s' pole võimalik kustutada: %s\n"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, fuzzy, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "dpkg: hoiatus - vana seadistusfail `%.250s' oli tühi kataloog (ja on "
 "nüüdseks kustutatud)\n"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
 "'%.250s')"
 msgstr ""
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "osafaili `%.250s' olekut pole võimalik fstat funktsiooniga lugeda"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
@@ -3696,7 +3732,7 @@
 "                                kasutamine.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3710,6 +3746,10 @@
 "  case left alignment will be used.\n"
 msgstr ""
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, fuzzy, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3772,55 +3812,56 @@
 msgid "Removing %s ...\n"
 msgstr "Paki %s eemaldamine...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
 "may be a mount point?"
 msgstr ""
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "`%.250s' pole võimalik eemaldada"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "faili `%.255s' pole võimalik luua"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "dpkg - hoiatus: %.250s eemaldamise järel pole kataloog `%.250s' tühi ja "
 "seetõttu seda ei kustutata.\n"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "`%.250s' pole võimalik eemaldada"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Paki %s seadistusfailide eemaldamine ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "vana seadistusfaili `%.250s' pole võimalik eemaldada (= `%.250s')"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "vanade failide nimekirja pole võimalik eemaldada"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "vana postrm skripti pole võimalik eemaldada"
 
@@ -3863,7 +3904,11 @@
 msgid "read error on standard input"
 msgstr "viga standardsisendist lugemisel"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -3873,7 +3918,7 @@
 "Autoriõigused (C) 1995 Ian Jackson.\n"
 "Autoriõigused (C) 2000-2002 Wichert Akkerman."
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -3884,7 +3929,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -3897,56 +3942,56 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "lõpus olev kaldkriips eemaldatakse"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "viga seadistusfaili `%.255s' lugemisel"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "viga seadistusfaili `%.255s' lugemisel"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "viga seadistusfaili `%.255s' lugemisel"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "viga seadistusfaili `%.255s' lugemisel"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add vajab nelja argumenti"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr ""
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr ""
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr ""
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr ""
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 #, fuzzy
 msgid "--update is useless for --remove"
 msgstr "hoiatus: --update on --remove puhul kasutu"
@@ -4017,17 +4062,17 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Abiteabe jaoks sisesta dpkg-split --help."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debiani pakihaldusprogrammi `%s' versioon %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4037,7 +4082,7 @@
 "Kasutamine: %s [<võti> ...] <käsk>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4046,7 +4091,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4060,31 +4105,31 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 #, fuzzy
 msgid "takes one argument, the trigger name"
 msgstr "--%s vajab ainult ühte argumenti (.deb failinimi)"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "väli `%s', vigane pakinimi `%.255s': %s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "väli `%s', vigane pakinimi `%.255s': %s"
@@ -4113,29 +4158,30 @@
 msgstr "Paki %s seadistusfailide eemaldamine ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s vajab argumendiks täpselt ühte Packages faili nime"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Saadaolevate pakkide andmete asendamine failist %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Saadaolevate pakkide andmete uuendamine failist %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4143,7 +4189,7 @@
 msgstr[0] "%d paki andmed uuendatud.\n"
 msgstr[1] "%d paki andmed uuendatud.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4254,8 +4300,8 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s vajab argumenti <kataloog>"
@@ -4287,22 +4333,22 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 msgid "failed to make temporary file (%s)"
 msgstr "tõrge toru loomisel"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 msgid "control member"
 msgstr ""
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "tõrge toru loomisel"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 msgid "failed to rewind temporary file (%s)"
 msgstr "tõrge toru loomisel"
@@ -4317,19 +4363,19 @@
 msgid "error writing `%s'"
 msgstr "viga `%s' kirjutamisel"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 msgid "data member"
 msgstr "versiooninumber"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write to pipe in copy"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "tõrge kopeerimise ajal torusse kirjutamisel"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4347,76 +4393,76 @@
 msgid "error reading %s from file %.255s"
 msgstr "viga %s lugemisel failist %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "tõrge arhiivi `%.255s' lugemisel"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "arhiivi versiooninumbris pole punkte"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "arhiivipäises pole reavahetusi"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "fail `%.250s' on rikutud - osa number on vigane"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "fail `%.250s' pole debiani binaararhiiv (võib-olla proovida dpkg-split'i?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "arhiivi versiooninumbris pole punkte"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "arhiivipäises pole reavahetusi"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "arhiivi versiooninumbris pole punkte"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, c-format
 msgid "skipped archive member data from %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "fail `%.250s' sisaldab kahte juhtliiget, annan alla"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "fail `%.250s' sisaldab kahte juhtliiget, annan alla"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4428,21 +4474,21 @@
 " uus debiani pakk, versioon %s.\n"
 " suurus: %ld baiti: juhtarhiiv= %zi baiti.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, c-format
 msgid "archive has malformatted control member size '%s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, c-format
 msgid "skipped archive control member data from %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4454,7 +4500,7 @@
 " vana debiani pakk, versioon %s.\n"
 " suurus: %ld baiti: juhtarhiiv= %zi baiti, põhiarhiiv= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4463,51 +4509,52 @@
 "dpkg-deb: fail paistab olevat arhiiv, mis on ASCII-režiimis\n"
 "dpkg-deb:    allalaadimise tõttu kahjustada saanud\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' pole debiani vormingus arhiiv"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "tõrge kopeerimise ajal torusse kirjutamisel"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "tõrge kopeerimise järel toru sulgemisel"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "andmed"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "tõrge kataloogi aktiveerimisel (chdir)"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "tõrge kataloogi loomisel"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "tõrge kataloogi aktiveerimisel (chdir) pärast selle loomist"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "tõrge kataloogi aktiveerimisel (chdir)"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s: lahtipakkimine"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 #, fuzzy
 msgid "paste"
 msgstr "läbitud\n"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s vajab argumendiks .deb failinime"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4516,96 +4563,96 @@
 "--%s jaoks peab olema määratud sihtkataloog.\n"
 "Võib-olla peaks sa kasutama käsku dpkg --install ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s vajab kõige rohkem kahte argumenti (.deb ja kataloog)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s vajab ainult ühte argumenti (.deb failinimi)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr ""
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
 msgid "control file '%s'"
 msgstr "faili `%s' pole võimalik lugeda: %s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr ""
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "kataloogi `%.255s' pole võimalik läbi vaadata"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld baiti, %5d rida   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     pole lihtfail             %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(juhtarhiivis puudub fail `control'!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "viga find'i toru sulgemisel"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Vormingu viga"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents vajab täpselt ühte argumenti"
 
@@ -4615,7 +4662,19 @@
 msgstr "Debiani `%s' pakiarhiivi taustaprogrammi versioon %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4626,6 +4685,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4644,7 +4705,7 @@
 "  --fsys-tarfile <deb>             Failisüsteemi tar-arhiivi väljastamine.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4657,11 +4718,12 @@
 "<jväli> on peamises `control' failis oleva välja nimi.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4686,7 +4748,7 @@
 "none.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4700,7 +4762,7 @@
 "kasutajasõbralikke pakihaldusvahendeid `dselect' või `aptitude'.  Pakkide\n"
 "lahtipakkimine `dpkg-deb --extract' abil ei ole korrektne paigaldamine!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4708,17 +4770,17 @@
 "Käsu dpkg-deb --help väljund räägib *.deb failidega ümberkäimisest;\n"
 "Käsu dpkg --help väljund räägib pakkide paigaldamisest ja eemaldamisest."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "väli `%s', vigane pakinimi `%.255s': %s"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr ""
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tundmatu pakkimisliik `%s'!"
@@ -4738,7 +4800,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr ""
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "viga %.250s lugemisel"
@@ -4826,53 +4888,59 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "fail `%.250s' on rikutud - osa number on vigane"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+msgid "package architecture"
+msgstr " (pakk: "
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "osafaili `%.250s' olekut pole võimalik fstat funktsiooniga lugeda"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "fail `%.250s' on rikutud - liiga lühike"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "arhiiviosa faili `%.250s' pole võimalik avada"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "fail `%.250s' pole arhiivi osa"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -4883,12 +4951,19 @@
 "\n"
 msgstr ""
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<tundmatu>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--debug võtmel peab olema kaheksandsüsteemi argument"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "fail `%s' pole arhiivi osa\n"
@@ -4922,7 +4997,7 @@
 msgid "split package part"
 msgstr "pakk puudub"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "valmis\n"
@@ -4971,28 +5046,36 @@
 "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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Abiteabe jaoks sisesta dpkg-split --help."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr ""
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr ""
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -5103,42 +5186,42 @@
 msgid "Deleted %s.\n"
 msgstr ""
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr ""
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "lähtefail `%.250s' pole lihtfail"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split vajab argumendiks lähtefaili nime"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 
@@ -5213,365 +5296,360 @@
 "  --version                show the version.\n"
 msgstr ""
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 #, fuzzy
 #| msgid "parse error"
 msgid "error"
 msgstr "parsimisviga"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "hoiatus"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "unable to read %s: %s"
-msgid "cannot stat %s: %s"
-msgstr "faili `%s' pole võimalik lugeda: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, fuzzy, c-format
 #| msgid "two commands specified: %s and --%s"
 msgid "two commands specified: --%s and --%s"
 msgstr "korraga on määratud kaks käsku: %s ja --%s"
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
 #| msgid "cannot open diversions: %s"
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "diversioone pole võimalik avada: %s"
 
-#: utils/update-alternatives.c:395
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "%s: copying %s to %s failed, giving up: %s"
-msgid "scan of %s failed: %s"
-msgstr "%s: tõrge %s kopeerimisel kataloogi %s, annan alla: %s"
-
-#: utils/update-alternatives.c:420
-#, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "tõrgi %s käivitamisel"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "nimeviita %s pole võimalik %s peale viitama panna: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "faili %s pole võimalik asukohale %s paigaldada: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "faili %s pole võimalik eemaldada: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "ootamatu %s lõpp failis %.255s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "faili `%s' pole võimalik lugeda: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "ootamatu %s lõpp failis %.255s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, fuzzy, c-format
 msgid "%s corrupt: %s"
 msgstr "sisemine viga: %s on rikutud: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "viga standardväljundisse kirjutamisel: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate value for `%s' field"
 msgid "duplicate slave name %s"
 msgstr "korduv välja `%s' väärtus"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr ""
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr ""
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 #, fuzzy
 msgid "priority"
 msgstr "%s - tähtsus %s"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, fuzzy, c-format
 msgid "priority of %s: %s"
 msgstr "%s - tähtsus %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "faili `%s' pole võimalik lugeda: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr ""
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "faili %s pole võimalik sulgeda: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "faili %s pole võimalik kirjutada: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, fuzzy, c-format
 msgid "  link currently points to %s"
 msgstr " viit osutab hetkel failile %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 #, fuzzy
 msgid "  link currently absent"
 msgstr " viit osutab hetkel failile %s"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "%s - priority %s"
 msgid "%s - priority %d"
 msgstr "%s - tähtsus %s"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr "faili %s pole võimalik sulgeda: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Käesolevaga on `parim' versioon %s."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Versioone pole saadaval."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "Kirjeldus"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, fuzzy, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Vaikimisi[*] valiku jaoks vajuta enter, oma valiku tegemiseks sisesta "
 "number: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Alternatiivi `%s' pole võimalik leida."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "ootamatu %s lõpp failis %.255s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "Viida %s ümbernimetamine nimest %s nimega %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, fuzzy, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "Viida %s ümbernimetamine nimest %s nimega %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr ""
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr ""
+
+#: utils/update-alternatives.c:2254
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr ""
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr ""
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "tundmatu argument `%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "tähtsus peab olema määratud täisarvuga"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s vajab argumente <nimi> <rada>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s vajab argumenti <nimi>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave on lubatud ainult koos võtmega --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave vajab argumente <viit> <nimi> <rada>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s vajab ainult ühte argumenti"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "tundmatu võti `%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -5580,139 +5658,131 @@
 "vaja on võtit --display, --config, --set, --install, --remove, --all, --"
 "remove-all või --auto"
 
-#: utils/update-alternatives.c:2215
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr ""
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr ""
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "viga standardsisendist lugemisel"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, fuzzy, c-format
 msgid "no alternatives for %s."
 msgstr "%s jaoks pole alternatiive."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
 "updates only."
 msgstr ""
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, fuzzy, c-format
 msgid "setting up automatic selection of %s."
 msgstr "Automaatse valiku seadmine %s jaoks."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "Alternatiivi %s pole %s jaoks registreeritud, ei eemalda."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 "Süsteemis pole ühtegi programmi, mis tagaks %s.\n"
 "Pole midagi seadistada.\n"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "Alternatiivi %s pole %s jaoks registreeritud, ei eemalda."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, fuzzy, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "Käsitsi valitud alternatiivi eemaldamine - lülitumine automaatrežiimile"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "Automaatsed uuendused on %s jaoks keelatud, jätan muutmata."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 "Automaatsetele uuendustele tagasilülitumiseks kasuta `update-alternatives --"
 "auto %s'."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "`%s' kasutamine `%s' tagamiseks."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~| msgid "unable to read %s: %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "faili `%s' pole võimalik lugeda: %s"
+
+#, fuzzy
+#~| msgid "%s: copying %s to %s failed, giving up: %s"
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "%s: tõrge %s kopeerimisel kataloogi %s, annan alla: %s"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "tõrgi %s käivitamisel"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "nimeviita %s pole võimalik %s peale viitama panna: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "faili %s pole võimalik asukohale %s paigaldada: %s"
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "viga standardväljundisse kirjutamisel: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "faili `%s' pole võimalik lugeda: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "faili %s pole võimalik sulgeda: %s"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "faili %s pole võimalik kirjutada: %s"
+
+#, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "lähtefaili `%.250s' pole võimalik avada"
 
@@ -5770,9 +5840,6 @@
 #~ msgid "version number"
 #~ msgstr "versiooninumber"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "tõrge tar-i käivitamisel"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "tõrge kataloogi loomisel"
Binary files dpkg/po/eu.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/eu.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/eu.po /home/vorlon/devel/multiarch/dpkg-debian/po/eu.po
--- dpkg/po/eu.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/eu.po	2012-06-07 10:11:09.426073000 -0700
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: dpkg_1.15.8.7_eu\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-12-16 19:28+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n"
@@ -26,7 +26,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "ezin da '%s' fitxategia idatzi"
@@ -47,71 +47,77 @@
 msgid "ar member file (%s)"
 msgstr "huts egin du ar-en fitxategiaren kideari (%s) fstat lantzean"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "huts egin du %s(r)en bufferraren kopia irakurtzea"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "huts egin du %s(r)en bufferraren kopia idaztean"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "%s(r)en bufferraren kopiaren irakurketa laburra"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "huts egin du tar exekutatzean"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "ezin da %s (%s) exekutatu"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: deskonpresioa"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: konpresioa"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: errorea sarrera gzip korrontearekin lotzean"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: gzip-en irakurketaren barneko errorea: '%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: gzip-en idazketaren barneko errorea"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: errorea irteera gzip korrontearekin lotzean"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: gzip-en irakurketaren barneko errorea"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: gzip-en idazketaren barneko errorea: '%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: gzip-en idazketaren barneko errorea: %s"
@@ -126,31 +132,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: bzip2-en irakurketaren barneko errorea: '%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: bzip2-en idazketaren barneko errorea"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: errorea irteera bzip2-ren korrontearekin lotzean"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: bzip2-en irakurketaren barneko errorea"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: bzip2-en idazketaren barneko errorea: '%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "ustekabeko bzip2 errorea"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -159,7 +165,7 @@
 "eguneratzeen direktorioak '%.250s' fitxategia dauka, eta izen hori luzeegia "
 "da (luzera=%d, geh.=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -167,98 +173,98 @@
 "eguneratzeen direktorioak luzera desberdineko izenak dituzten fitxategiak "
 "dauzka (%d eta %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "ezin da '%.255s' eguneratzeen direktorioa aztertu"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "huts egin du %.255s eguneratze fitxategi inkorporatua kentzean"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "ezin da '%.255s' sortu"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "ezin da bete %.250s betegarriarekin"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "ezin da %.250s hustu bete ondoren"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "ezin da joan %.250s(r)en hasierara bete ondoren"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "ezin da blokeoaren %s fitxategia ireki probatzeko"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "ezin da ireki/sortu egoeraren datu-basea blokeatzeko fitxategia"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "ez duzu baimenik dpkg egoeraren datu-basea blokeatzeko"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "ezin da blokeatu dpkg egoeraren datu-basea"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "eskatutako eragiketak supererabiltzailearen baimena behar du"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "ezin da sartu dpkg egoera eremuan"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "eragiketak dpkg egoera eremuan irakurri/idazteko sarbidea behar du"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "huts egin du nire %.255s eguneratze fitxategia kentzean"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "ezin da egoera eguneratua idatzi - '%.250s'"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "ezin da egoera eguneratua hustu - '%.250s'"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "ezin da egoera eguneratua trunkatu - '%.250s'"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "ezin da egoera eguneratua sinkronizatu - '%.250s'"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "ezin da egoera eguneratua itxi - '%.250s'"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "ezin da egoera eguneratua instalatu - '%.250s'"
@@ -281,74 +287,76 @@
 msgid "unable to open directory '%s'"
 msgstr "ezin da '%.250s' fitxategia ireki"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "ezin da '%.250s' fitxategia ireki"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "ezin da '%s' fitxategia sinkronizatu"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "ezin da '%s' fitxategia itxi"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "huts egin du '%.50s'(r)en xehetasunak '%.250s'(e)n idaztean"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "huts egin du '%s' irekitzean %s datu-basea idazteko"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "ezin da bufferrik ezarri %s datu-basearen fitxategian"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr ""
 "huts egin du %s datu-basearen erregistroa '%.50s'(r)i buruz idaztean - "
 "'%.250s'"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "huts egin du %s datu-basea hustean - '%.250s'"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "huts egin du %s datu-basea '%.250s'(r)ekin sinkronizatzean"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "huts egin du '%.250s' ixtean %s datu-basea idatzi ondoren"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "huts egin du '%.250s' eta '%.250s' estekatzean, %s datu-basearen babeskopia "
 "egiteko"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "huts egin du '%.250s' '%.250s' gisa instalatzean %s datu-basearekin"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -357,7 +365,7 @@
 "%s: errore konponezina, uzten:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -369,13 +377,13 @@
 "%s: errore konponezina, uzten:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "memoriarik ez garbiketa-sarrera berriarentzat"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -384,32 +392,32 @@
 "%s: errorea garbitzean:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: habiaratutako errore gehiegi errore konponketan!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "memoriarik ez garbiketa-sarrera berriarentzat"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "memoriarik ez argumentu ugaridun garbiketa-sarrerarentzat"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s: abisua: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: abisua: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: barneko errorea: %s\n"
@@ -425,98 +433,98 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "'%.*s' - ez du baimenik honetarako: %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "honen ondorengoak baztergarriak: %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "paketearen izena baliogabea (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "fitxategiaren xehetasunen '%s' eremua hutsik dago"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr ""
 "fitxategiaren xehetasunen '%s' eremua ez da onartzen egoeraren fitxategian"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "fitxategiaren xehetasunen '%s' eremuan balio gehiegi (beste batzuen aldean)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "fitxategiaren xehetasunen '%s' eremuan balio gutxiegi (beste batzuen aldean)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "bai/ez eremu boolearrean"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "'priority' eremuko hitza"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "'status' eremuko balioa ez da onartzen testuinguru honetan"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "'status' eremuko lehenengo hitza (nahia)"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "'status' eremuko bigarren hitza (errorea)"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "'status' eremuko hirugarren hitza (egoera)"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "errorea '%.250s' Version katean"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "'Revision' edo 'Package-Revision' eremu zaharkituak erabili dira"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "'config-version' eremuko balioa ez da onartzen testuinguru honetan"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "errorea '%.250s' Config-Version katean"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "'conffiles' balioak '%.*s' lerroa gaizki osatuta dauka"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 "'conffiles' balioko lerroa zuriunea ez den '%c' karakterearekin hasten da"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr ""
 "erroko direktorioa edo direktorio baliogabea conffile gisa zerrendatu da"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -524,12 +532,12 @@
 "'%s' eremua, paketearen izena falta da, edo zaborra dago paketearen izena "
 "espero zen lekuan"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "'%s' eremua, '%.255s' paketearen izen baliogabea: %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -538,7 +546,7 @@
 "'%s' eremua, honekiko erreferentzia: '%.255s':\n"
 " %c%c bertsio erlazio okerra"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -547,7 +555,7 @@
 "'%s' eremua, honekiko erreferentzia: '%.255s':\n"
 " '%c' zaharkitua dago; horren ordez, erabili '%c=' edo '%c%c'"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -557,11 +565,11 @@
 " balio zehatz inplizitua bertsio zenbakian; horren ordez '=' erabiltzea "
 "gomendatzen da"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Bertsio zehatzak bakarrik erabil daitezke Provides eremuan"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -571,56 +579,56 @@
 " bertsioaren balioa alfanumerikoa ez den batekin hasten da; zuriune bat "
 "gehitzea gomendatzen da"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "'%s' eremua, honekiko erreferentzia: '%.255s': bertsioak '%c' dauka"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "'%s' eremua, honekiko erreferentzia: '%.255s': bertsioa osatu gabe"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "'%s' eremua, erreferentzia: '%.255s': errorea bertsioan"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr ""
 "'%s' eremua, sintaxi errorea'%.255s' paketearen erreferentziaren ondoren"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "aukera alternatiborik ('|') ez da onartzen %s eremuan"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "'triggers-pending' eremuko balioa ez da onartzen testuinguru honetan"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "legezkanpoko burutu gabeko '%.255s' abiarazle-izena: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "bikoizturiko burutu gabeko '%.255s' abiarazlea"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "'triggers-awaited' eremuko balioa ez da onartzen testuinguru honetan"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "legezkanpoko pakete izena espero zen '%.255s' abiarazlean: %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "espero zen '%.255s' abiarazle paketea bikoiztuta"
@@ -677,7 +685,7 @@
 msgid "unable to write to status fd %d"
 msgstr "ezin da %d. fd-aren egoeran idatzi"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "malloc failed (%ld bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -689,8 +697,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc-ek huts egin du (%ld byte)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "huts egin du memoria esleitzean"
 
@@ -723,204 +731,210 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "ezin da ezarri close-on-exec bandera - %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "konfigurazioaren errorea: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr ""
 "huts egin du '%.255s' konfigurazioko fitxategia irekitzean irakurtzeko: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "parekatu gabeko komatxoak '%s'(e)n"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "'%s' aukera ezezaguna"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "'%s'(e)k balio bat behar du"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "'%s'(e)k ez du baliorik hartzen"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "irakurketaren errorea '%.255s' konfigurazioko fitxategian"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "errorea '%.255s' konfigurazioko fitxategia ixtean"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "errorea '%.255s' konfigurazioko fitxategia ixtean"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "--%s aukera ezezaguna"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s aukerak balio bat hartzen du"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s aukerak ez du baliorik hartzen"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "-%c aukera ezezaguna"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c aukerak balio bat hartzen du"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c aukerak ez du baliorik hartzen"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "aukera zaharkitua '--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "ekintza gatazkatsuak -%c (--%s) eta -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "balio bikoiztua '%s' eremuan"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "erabiltzaileak definitutako '%.*s' eremu izena laburregia da"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "balio bikoiztua erabiltzaileak definitutako '%.*s' eremuan"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Paketearen 'Configured-Version' egoera desegokiarekin"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "paketeak %s egoera zuen baina abiarazleak espero dira"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "paketeak 'triggers-awaited' egoera du baina ez zen abiarazlerik espero"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "paketeak %s egoera du baina abiarazleak falta dira"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "paketeak 'triggers-pending' egoera du baina ez da abiarazlerik falta"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Instalatu gabeko egoeran konfigurazioko fitxategiak dituen paketea: ahaztu "
 "egingo dira"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr ""
 "huts egin du '%.255s' paketearen informazio fitxategia irekitzean irakurtzeko"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "ezin da '%.255s' paketearen informazio fitxategian 'stat' egin"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "ezin da '%.255s' paketearen informazio fitxategian 'mmap' egin"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "ezin da '%.255s' paketearen informazio fitxategian 'stat' egin"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "huts egin du irakurri ondoren ixtean: '%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF '%.*s' eremu izenaren ondoren"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "lerro-jauzia '%.*s' eremu izenean"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS EOF (^Z) '%.*s' eremu izenean"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "'%.*s' eremu izenaren ondoren bi puntu behar dira"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF '%.*s' eremuko balioaren aurretik (amaierako lerro-jauzia falta)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "MSDOS EOF karakterea '%.*s' eremuko balioan (lerro-jauzia falta?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "lerro-jauzia '%.*s' eremu izenean"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF '%.*s' eremuko balioan (amaierako lerro-jauzia falta da)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 "paketearen informazio-sarrera bat baino gehiago dago; bat bakarrik onartzen "
 "da"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "huts egin du irakurri ondoren ixtean: '%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "paketearen informaziorik ez: '%.255s'"
@@ -949,62 +963,62 @@
 "%s, '%.255s' fitxategian %d. lerrotik gertu:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "baliteke kate hutsa ez izatea"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "alfazenbakizko batekin hasi behar du"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "'%c' karakterea ez da onartzen (letrak, digituak eta %s soilik)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<bat ere ez>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "bertsioaren katea hutsik dago"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "bertsioaren kateak zuriune kapsulatuak ditu"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "bertsioko aroa ez da zenbaki bat"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "ez dago ezer bi puntuen ondoren bertsio zenbakian"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "karaktere baliogabea bertsio zenbakian"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "karaktere baliogabea gainbegiraketaren zenbakian"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "%s falta da"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "%s: balio hutsa"
@@ -1023,52 +1037,52 @@
 msgid "(no description available)"
 msgstr "(azalpena ez dago erabilgarri)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "ezin zaio ezikusi egin %s seinaleari %.250s exekutatu aurretik"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "errorea %s seinalea harrapatu ez delako: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (azpiprozesua): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "huts egin du sardetzean"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "%s azpiprozesuak %d errorea eman du irteeran"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "huts egin du %s azpiprozesuari itxarotean"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "%s azpiprozesua hil du (%s)%s seinaleak"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", nukleoa iraulita"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "%s azpiprozesuak huts egin du itxaroteko %d egoera kodearekin"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "huts egin du %s azpiprozesuari itxarotean"
@@ -1092,62 +1106,54 @@
 "sintaxi-errorea baztertutako abiarazleen '%.250s' fitxategiko '%s'%s "
 "karakterean"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "ezin da '%.250s' abiarazleen blokeoko fitxategia ireki/sortu"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "abiarazita"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr ""
 "ezin da baztertutako abiarazleen '%.250s' fitxategiaren egoera eskuratu"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "ezin da baztertutako abiarazleen '%.250s' fitxategia ireki"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "ezin da baztertutako abiarazleen '%.250s' fitxategi berria ireki/sortu"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "errorea baztertutako abiarazleen '%.250s' fitxategia irakurtzean"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "ezin da baztertutako abiarazleen '%.250s' fitxategi berrian idatzi"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "ezin da baztertutako abiarazleen '%.250s' fitxategi berria itxi"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "ezin da baztertutako abiarazleen '%.250s' fitxategi berria instalatu"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "izen hutsa duten abiarazleak ez dira onartzen"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "abiarazlearen izenak karaktere baliogabea du"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1156,20 +1162,20 @@
 "'%.250s' abiarazlearen izenak sintaxi baliogabea edo ezezaguna du ('%.250s' "
 "paketearen abiarazlearen interesetan)"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr ""
 "huts egin du abiarazlearen intereseko '%.250s' zerrenda-fitxategia irekitzean"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr ""
 "huts egin du abiarazlearen intereseko '%.250s' zerrenda-fitxategia "
 "berrirakurtzean"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1178,38 +1184,44 @@
 "sintaxi-errorea abiarazlearen intereseko '%.250s' fitxategian; legezkanpoko "
 "'%.250s' pakete-izena: %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "ezin da abiarazlearen intereseko '%.250s' fitxategi berria sortu"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "ezin da abiarazlearen intereseko '%.250s' fitxategi berria idatzi"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "ezin da abiarazlearen intereseko '%.250s' fitxategi berria garbitu"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr ""
 "ezin da abiarazlearen intereseko '%.250s' fitxategi berria sinkronizatu"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "ezin da abiarazlearen intereseko '%.250s' fitxategi berria itxi"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "ezin da abiarazlearen intereseko '%.250s' fitxategi berria instalatu"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "ezin da '%.250s' kendu"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "ezin da abiarazlearen intereseko '%.250s' fitxategi berria sortu"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "ezin da abiarazlearen intereseko '%.250s' fitxategi berria itxi"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1217,47 +1229,47 @@
 "bikoiztutako abiarazlearen intereseko fitxategia '%.250s' fitxategi-izena "
 "eta'%.250s' paketearekin"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "ezin da abiarazleen '%.250s' fitxategi berria sortu"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "ezin da abiarazleen '%.250s' fitxategi berria idatzi"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "ezin da abiarazleen '%.250s' fitxategi berria garbitu"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "ezin da abiarazleen '%.250s' fitxategi berria sinkronizatu"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "ezin da abiarazleen '%.250s' fitxategi berria itxi"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "ezin da abiarazleen fitxategi berria '%.250s' gisa instalatu"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "ezin da abiarazleen '%.250s' fitxategia irakurri"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "sintaxi-errorea abiarazleen '%.250s' fitxategian"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1266,7 +1278,7 @@
 "abiarazleen fitxategiaren erregistroak legezkanpoko '%.250s' pakete-izena "
 "aipatzen du ('%.250s' fitxategiaren interesentzat): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1275,30 +1287,38 @@
 "abiarazleen '%.250s' ci fitxategiak legezkanpoko abiarazleen sintaxia du "
 "'%.250s' abiarazle-izenean: %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "ezin da abiarazleen '%.250s' ci fitxategia ireki"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "abiarazleen ci fitxategiak direktiba sintaxi ezezaguna du"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "abiarazleen ci fitxategiak '%.250s' direktiba ezezaguna du"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "ezin da sortu abiarazleen '%.250s' egoerako direktorioa"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "ezin da abiarazleen '%.250s' egoerako direktorioaren jabetza ezarri"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "izen hutsa duten abiarazleak ez dira onartzen"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "abiarazlearen izenak karaktere baliogabea du"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1323,7 +1343,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "errorea kateari formatua ematean varbuf aldagaian"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "errorea dpkg-deb kanalizaziotik irakurtzean"
 
@@ -1344,12 +1364,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "errorea '%.255s' esteka sinbolikoaren jabetza ezartzean"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "errorea jabetza ezartzean: '%.255s'"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "errorea baimenak ezartzean: '%.255s'"
@@ -1411,17 +1431,26 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "artxiboko '%.255s' objektua mota ezezagunekoa da: 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "ezin da'%s' fitxategia atzitu"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "%s pakete zaharreko fitxategiak ordezten...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Instalatutako %s paketeko fitxategiekin ordeztuta...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1430,94 +1459,99 @@
 "%2$.250s %3$.250s paketeko '%1$.250s' direktorioa direktorioa ez den batekin "
 "gainidazten saiatzen ari da"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "'%.250s' gainidazten saiatzen ari da; %.250s %.250s paketean ere badago"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "ezin da '%.255s' sortu ('%.255s' prozesatzean)"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "atzealdeko dpkg-deb-en iraupena: '%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "errorea '%.255s' ixtean/idaztean"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "errorea '%.255s' kanalizazioa sortzean"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "errorea '%.255s' gailua sortzean"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "errorea '%.255s' esteka gogorra sortzean"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "errorea '%.255s' esteka sinbolikoa sortzean"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "errorea '%.255s' direktorioa sortzean"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, 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:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "ezin da irakurri '%.255s' esteka"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "ezin da esteka sinbolikoaren babeskopia egin: '%.255s'"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "ezin da esteka sinbolikoaren babeskopiaren 'chown' egin: '%.255s'"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, 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'"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "ezin da '%.255s'(r)en bertsio berria instalatu"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "ezin da'%.255s' ireki"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "ezin da'%.255s' fitxategia sinkronizatu"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1526,7 +1560,7 @@
 "%s(r)en mendekotasunaren arazoari ezikusia egiten:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1535,7 +1569,7 @@
 "funtsezko %s paketearen konfigurazioa kentzea\n"
 "aztertzen, %s gaitzeko."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1544,7 +1578,7 @@
 "dpkg: ez, %s funtsezkoa da, ez da konfigurazioa kenduko\n"
 " %s gaitu ahal izateko.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1553,17 +1587,17 @@
 "dpkg: ez, ezin da %s(r)ekin aurrera jarraitu (ikus --auto-deconfigure):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "%.250s ezabatzea"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "%.250s instalatzea"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1571,12 +1605,12 @@
 "dpkg: %s(r)en konfigurazioa kentzea kontutan hartzen, zeinek %s(e)k apur "
 "dezakeen ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: bai, %s konfigurazioa kenduko da, (%s-ek apurtua).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1585,11 +1619,11 @@
 "dpkg: %2$s daukan %1$s(r)i dagokionez:\n"
 "%3$s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "apurketari ezikusi egin zaio, hala ere aurrera jarraitzen!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1599,29 +1633,29 @@
 " ez da baimentzen konfigurazioa kentzea (--auto-deconfigure lagungarri izan "
 "daiteke)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "%.250s instalatzeak instalatuta dagoen softwarea apurtu dezake"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: %s kentzea aztertzen, %s jartzeko...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s ez dago ondo instalatuta - mendekotasunei ezikusi egingo zaie.\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1630,107 +1664,109 @@
 "dpkg: %s paketea berriro instalatu behar da, baina kendu egingo da eskatu "
 "bezala.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "gatazkan dauden paketeak - %.250s ez da instalatuko"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "gatazkari ezikusi egin zaio, jarrai daiteke"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive: bide-izenaren argumentu bat behar du gutxienez"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "'find' dpkg --recursive komandoarentzako"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "huts egin du fdopen-ek find-en kanalizazioarekin"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "errorea find-en kanalizazioa irakurtzean"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "errorea find-en kanalizazioa ixtean"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "--recursive bilaketak kudeatu gabeko %i errorea itzuli du"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "bilatu bai, baina ez da paketerik aurkitu (*.deb fitxategiak)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s: paketearen fitxategiak argumentu bat behar du gutxienez"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<irteera estandarra>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<errore estandarra>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Aurrez ez hautatutako %s paketea hautatzen.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Hautapena kendutako %s paketea saltatzen.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, 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:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%.250s aurreko bertsiora itzultzen, %.250s-tik %.250s-ra."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, 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"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1739,38 +1775,38 @@
 "ezin da kendu instalatu berri den '%.250s' bertsioa babeskopia berriro "
 "instalatzea onartzeko"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "ezin da '%.250s'(r)en babeskopiaren bertsioa leheneratu"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "ezin da '%.250s'(r)en babeskopia kendu"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "ezin da '%.250s'(r)en instalatu berri den bertsioa kendu"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "ezin da '%.250s'(r)en erauzi berri den bertsioa kendu"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "ezin da banatutako '%.250s' konfigurazioko fitxategi berria analizatu"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 "ezin da unean instalatutako '%.250s' konfigurazioko fitxategi analizatu"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1781,57 +1817,57 @@
 "'%s' konfigurazioko fitxategia ez dago sisteman.\n"
 "Konfigurazioko fitxategi berria zuk eskatu bezala instalatzen.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: huts egin du '%.250s' babeskopia zaharra kentzean : %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: huts egin du '%.250s'-tik '%.250s'-ra izena aldatzean: %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: huts egin du '%.250s' ezabatzean: %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: huts egin du banatutako '%.250s' bertsio zaharra kentzean: %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: huts egin du '%.250s' kentzean (gainidatzi aurretik): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: huts egin du '%.250s'(e)tik '%.250s'(e)ra estekatzean: %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "%s konfigurazioko fitxategiaren bertsio berria instalatzen...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "ezin da '%.250s' instalatu '%.250s' gisa"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "'%s' izeneko paketerik ez dago instalatuta, ezin da konfiguratu"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "%.250s paketea instalatuta eta konfiguratuta dago lehendik ere"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1840,7 +1876,7 @@
 "%.250s paketea ez dago prest konfiguratzeko\n"
 " ezin da konfiguratu (uneko egoera: '%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1849,11 +1885,11 @@
 "dpkg: ezin da %s konfiguratu, mendekotasun arazoak direla eta:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "mendekotasun arazoak - konfiguratu gabe uzten ari da"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1862,7 +1898,7 @@
 "dpkg: %s: mendekotasun arazoak, baina eskatu bezala konfiguratuko da:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1870,12 +1906,12 @@
 "Paketearen egoera inkoherentea da - berriro instalatu\n"
 " behar duzu, konfiguratzen saiatu aurretik."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "%s (%s) konfiguratzen...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1884,7 +1920,7 @@
 "%s: ezin da atzitu '%s' konfigurazioko fitxategia\n"
 " (= '%s'): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1893,7 +1929,7 @@
 "%s: '%s' konfigurazioko fitxategia esteka zirkular bat da \n"
 " (= '%s')"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1902,7 +1938,7 @@
 "%s: ezin da '%s' konfigurazioko fitxategiko esteka irakurri\n"
 " (= '%s'): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1911,35 +1947,35 @@
 "%s: badirudi '%.250s' konf. fitxategia fitxategi-izen endekatua dela\n"
 " ('%s' '%s'(r)en esteka sinbolikoa da)"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: '%.250s' konf. fitxategia ez da fitxategi arrunta, ezta esteka "
 "sinbolikoa ere (= '%s')"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: ezin da %s konfigurazioko fitxategia ireki hash egiteko: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Idatzi 'exit' amaitutakoan.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1948,12 +1984,12 @@
 "\n"
 "'%s' konfigurazioko fitxategia"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (benetan '%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1964,7 +2000,7 @@
 " ==> Zuk edo script batek sortutako fitxategia.\n"
 " ==> Pakete-mantentzaileak paketearekin batera hornitutako fitxategia.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1973,7 +2009,7 @@
 "\n"
 "     Instalatu zenetik ez da aldatu.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1982,7 +2018,7 @@
 "\n"
 " ==> Instalatu zenetik aldatu da (zuk edo script batek).\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1991,37 +2027,37 @@
 "\n"
 " ==> Instalatu zenetik ezabatua (zuk edo script batek).\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Pakete banatzaileak bertsio eguneratu bat bidali du.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Paketeko bertsioa azken instalazioko bera da.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Fitxategi berri bat erabiltzen ari da, zuk eskatu bezala.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Uneko fitxategi zaharra erabiltzen ari da, zuk eskatu bezala.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Lehenespenez konfigurazioko fitxategi zaharra mantentzen.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Lehenespenez konfigurazioko fitxategi berria erabiltzen.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2036,159 +2072,161 @@
 "      D     : bertsioen arteko ezberdintasunak ikustea\n"
 "      Z     : shell-a abiaraztea egoera egoera aztertzeko\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Ekintza lehenetsia instalatuta dagoen bertsioa mantentzea da.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Ekintza lehenetsia bertsio berria instalatzea da.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[lehenetsia=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[lehenetsia=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[lehenespenik ez]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "errorea stderr-en idaztean, konfigurazioko fitxategiaren gonbitaren aurretik "
 "aurkitu da"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "irakurketa errorea stdin-en konfigurazioko fitxategiaren gonbitean"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF stdin-en konfigurazioko fitxategiaren gonbitean"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s paketea %s(r)en mendekoa da"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s paketea %s(r)en aurremendekoa da"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s(e)k %s gomendatzen du"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s(e)k %s iradokitzen du"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s(e)k %s hausten du"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s(e)k %s(r)ekin gatazkan dago"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s(e)k %s hobetzen du"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s kendu behar da.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s konfigurazioa kenduko da.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s instalatuta dago, baina bertsioa %.250s da.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, 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:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s deskonprimituta dago, baina bertsioa %.250s da.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s: azken konfiguratutako bertsioa %.250s da.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s %s da.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, 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:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s: %.250s hornitzen du, baina konfigurazioa kendu behar da.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s: %.250s hornitzen du, baina %s da.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s ez dago instalatuta.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (%.250s bertsioa) instalatu behar da.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (%.250s bertsioa) dago eta %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, 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:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s: %.250s hornitzen du, existitzen da eta %s da.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "Erabili --help paketeen kontsultari buruzko laguntza lortzeko."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2196,7 +2234,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s %s bertsioa.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2207,8 +2245,8 @@
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 "Copyright (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2219,7 +2257,7 @@
 "GNU Lizentzia Publiko Orokorraren 2 bertsioa edo berriagoa.\n"
 "EZ dago bermerik.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2229,7 +2267,7 @@
 "Erabilera: %s [<aukera> ...] <komandoa>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2250,7 +2288,7 @@
 "izena.\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2284,7 +2322,7 @@
 "  --version                        erakutsi bertsioa.\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2298,17 +2336,12 @@
 "Pakete preinst/postrm script-ak beti zehaztu behar dituzte --package eta --"
 "divert.\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "ezin da'%s' fitxategia atzitu"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "errorea '%s' egiaztatzean"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2317,129 +2350,129 @@
 "berrizendatzeak '%s' gainidaztea dakar\n"
 "  '%s' fitxategi ezberdinarekin, ez da onartzen"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "ezin da '%s' fitxategia idatzi"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "fitxategiaren kopia"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "ezin da '%s' izenez '%s'(e)ra aldatu"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "rename: kendu bikoiztutako '%s' esteka zaharra"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "ezin da iturburuko '%.250s' fitxategia ireki"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "'%s'(r)en desbideraketa lokala"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "'%s' lokalki hona desbideratuta: %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "%s %s(e)k desbideratuta"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "%3$s(e)k %1$s desbideratu du %2$s(e)ra"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "%s(r)en edozein desbideraketa"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "%s(r)en edozein desbideraketa %s(e)ra"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "ezin da %s fitxategi berria sortu"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "ezin da '%s' fitxategia garbitu"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "errorea diversions-old zaharra kentzean"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "errorea diversions-old berria sortzean"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "errorea desbiderapen berria instalatzean"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s aukerak argumentu bakar bat behar du"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "\"%s\" fitxategi-izena ez da absolutua"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "fitxategiak ezin du lerro-jauzirik eduki"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Ezin dira direktorioak desbideratu"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "ezin da '%s' fitxategia bere burura desbideratu"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "'%s' uzten\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "'%s'(e)k '%s'(r)ekin gatazkan dago"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "'%s' gehitzen\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Ez dago '%s' desbideraketarik, ez da ezabatuko\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2450,7 +2483,7 @@
 "  '%s' ezabatzean\n"
 "  '%s' aurkitu da"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2461,16 +2494,16 @@
 "  '%s' ezabatzean\n"
 "  '%s' aurkitu da"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "'%s' kentzen\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "paketeak ezin du lerro-jauzirik berririk eduki"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "'divert-to'-k ezin du lerro-jauzirik eduki"
 
@@ -2553,8 +2586,8 @@
 "dselect edo dpkg --configure --pending (edo dpkg --triggers-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s: ez du argumenturik hartzen"
@@ -2648,7 +2681,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions: okerreko erlazioa"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "%s bertsioak okerreko sintaxia du: %s"
@@ -2703,12 +2736,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "gainidazteko arazoa --force gaituta dagoelako:"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "ezin dira '%.250s' paketearen fitxategi-zerrendaren fitxategiak ireki"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2717,81 +2750,81 @@
 "'%.250s' paketearen fitxategi-zerrendaren fitxategiak falta dira, paketeak "
 "ez duela fitxategirik instalatuta ondorioztatuko da."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr ""
 "ezin da '%.250s' paketearen fitxategi-zerrendaren fitxategiaren egoera "
 "eskuratu"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "'%.250s' paketearen fitxategi-zerrenda"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "'%.250s' paketearen fitxategi-zerrendak amaierako lerro-jauzia falta du"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "'%.250s' paketearen fitxategi-zerrendaren fitxategiak fitxategiek izen hutsa "
 "daukate"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "errorea '%.250s' paketearen fitxategi-zerrendaren fitxategiak ixtean"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Datu-basea irakurtzen ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "fitxategi edo direktorio %d dago unean instalatuta).\n"
 msgstr[1] "%d fitxategi edo direktorio daude unean instalatuta).\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "ezin da %s paketearen fitxategi-zerrenda eguneratua sortu"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 "huts egin du %s paketearen fitxategi-zerrendaren fitxategi eguneratua "
 "idaztean"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 "huts egin du %s paketearen fitxategi-zerrendaren fitxategi eguneratua "
 "garbitzean"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 "huts egin du %s paketearen fitxategi-zerrendaren fitxategi eguneratua "
 "sinkronizatzean"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 "huts egin du %s paketearen fitxategi-zerrendaren fitxategi eguneratua ixtean"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2831,7 +2864,9 @@
 msgstr "instalatuta"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "errorea: PATH ez da ezarri."
 
 #: src/help.c:129
@@ -2873,7 +2908,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2885,65 +2920,65 @@
 msgstr "%.250s: huts egin du chroot egitean"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "huts egin du '%.255s' direktoriora aldatzean"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "ezin da exekutatzeko baimenik '%.250s'(e)n ezarri"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "ezin da 'setenv' erabili mantentzailearen script-arentzako"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "%s script-a instalatuta"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "ezin da %s '%.250s' atzitu"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "%s script berria"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "%s script zaharra"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "ezin da %s '%.250s' atzitu: %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - pakete berriaren script-arekin saiatzen...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "ez dago script-ik paketearen bertsio berrian - uzten ari da"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... badirudi dena ondo joan dela.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "ezin da '%.255s' segurtasunez kendu"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2952,7 +2987,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "ezin da '%.250s' badagoen begiratu"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "ezin da informazio-direktorioan irakurri"
 
@@ -3024,7 +3059,7 @@
 "  --force-help                             erakutsi behartzeko laguntza.\n"
 "  -Dh|--debug=help                    erakutsi arazketaren laguntza.\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3159,7 +3194,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr "Erabili 'dselect' edo 'aptitude' paketeak errazago kudeatzeko.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3209,30 +3244,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3241,103 +3280,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "mendekotasun arazoak - ez da kenduko"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "mendekotasun arazoak - ez da kenduko"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "ezin da 'setenv' erabili mantentzailearen script-arentzako"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "irakurketaren errorea '%.255s' konfigurazioko fitxategian"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3345,7 +3384,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3353,38 +3392,38 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug: argumentu zortzitar bat behar du"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "pakete-izen nulua --ignore-depends komaz bereizitako '%.250s' zerrendan"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends: legezko pakete izena behar du. '%.250s' ez da; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "baliogabeko osokoa --%s: '%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "errorea '%s' lotura exekutatzean, irteerako %d kodea"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "egoera"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3393,7 +3432,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3401,12 +3440,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "'%.*s' behartzeko/uko egiteko aukera ezezaguna"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "'%s' behartzeko/uko egiteko aukera zaharkitua\n"
@@ -3429,8 +3468,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "ustekabeko eof %d lerroa amaitu aurretik"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "ekintza-aukera bat behar da"
 
@@ -3596,90 +3635,90 @@
 msgid "passed\n"
 msgstr "gaindituta\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "ezin da aldi baterako direktorioa sortu"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "%s paketeak gatazka/ordezte bikote gehiegi ditu"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "pakete-bertsio zaharreko inf. fitxategiak izen luzeegia du;'%.250s' hasten da"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "ezin da '%.250s' informazio-fitxategi zaharkitua kendu"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "ezin da '%.250s' (ustezko) informazio-fitxategi berria instalatu"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "ezin da aldi baterako kontroleko direktorioa ireki"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "paketeak kontroleko informazio-fitxategi izen luzeegia dauka ('%.50s' hasten "
 "da)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "paketearen kontrol informazioak '%.250s' direktorioa zeukan"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "'%.250s' rmdir paketearen kontrol-informazioak ez du esaten direktorio bat "
 "ez denik"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "%s paketeak zerrenda informazio-fitxategi gisa zeukan"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "ezin da '%.250s' informazio fitxategi berria '%.250s' gisa instalatu"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "ezin da '%.250s' kontroleko informazio-fitxategia ezabatu"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "ezin da sartu artxiboan"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "ezin da aldi baterako direktorioa sortu"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "kontrol-informazioaren luzera"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "%s(r)i buruzko informazioa erregistratu da %s(e)tik.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "paketearen arkitektura (%s) ez dator bat sistemarekin (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3688,105 +3727,105 @@
 "dpkg: %2$s daukan %1$s: aurremendekotasun arazoa:\n"
 "%3$s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "aurremendekotasun arazoa: %.250s ez da instalatuko"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "aurremendekotasun arazoari ezikusi egingo zaio!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "%s %s ordezteko prestatzen (%s erabiliz) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "%s (%s) deskonprimitzen...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "konf. fitxategiaren izena ('%.250s' hasten dena) luzeegia da (>%d karaktere)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "%.250s: irakurketa-errorea"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "errorea %.250s ixtean"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "errorea %.250s irekitzen saiatzean"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "%s konfigurazioa kentzen, %s kendu ahal izateko...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "%s konfigurazioa kentzen...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "%.250s ordezpena deskonprimitzen...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "dpkg-deb eremuaren erausketa"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "errorea dpkg-deb tar irteera irakurtzean"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 "fitxategi-sistemaren tar fitxategia hondatu da - paketearen artxiboa "
 "hondatuta dago"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: kendu amaierako zero posibleak"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "ezin izan da '%.250s' fitxategi zaharraren egoera eskuratu, beraz ez da "
 "ezabatuko: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "ezin da '%.250s' direktorio zaharra ezabatu: %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "'%.250s' konf. fitxategi zaharra direktorio huts bat da (eta ezabatu egin da)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "ezin da beste '%.250s' fitxategiaren egoera eskuratu"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3795,12 +3834,12 @@
 "'%.250s' fitxategi zaharra zenbait fitxategi berrien berdina da (bai "
 "'%.250s' eta bai '%.250s')"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "ezin da '%.250s' fitxategi zaharra segurtasunez kendu: %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Kontuan hartu %s desagertu dela, guztiz ordeztu delako.)\n"
@@ -3980,7 +4019,7 @@
 "  -f|--showformat=<formatua>      Erabili beste formatu bat --show egiteko\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -4002,6 +4041,10 @@
 "  sintaxiarekin. Eremuak eskuinean lerrokatuko dira, zabalera negatiboa ez \n"
 "  bada. Negatiboa bada, aldiz, ezkerrean lerrokatuko dira.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Erabili --help paketeen kontsultari buruzko laguntza lortzeko."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4062,7 +4105,7 @@
 msgid "Removing %s ...\n"
 msgstr "%s kentzen...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4071,48 +4114,49 @@
 "%.250s kentzean, ezin da '%.250s' direktorioa kendu: %s - baliteke "
 "direktorioa muntatze puntua bat izatea ?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "ezin da '%.250s' kendu"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "ezin da '%.250s' segurtasunez kendu"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "%.250s kentzean, '%.250s' direktorioa ez dago hutsik, eta beraz ez da "
 "kenduko."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "ezin da '%.250s' kendu"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "%s: konfigurazio-fitxategiak purgatzen ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "ezin da '%.250s' konfigurazio-fitxategi zaharra kendu (= '%.250s')"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "ezin da '%.250s' konf. fitxategiaren direktorioa irakurri ('%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr "ezin da '%.250s' babeskopiako konf. fitxategi zaharra kendu ('%.250s')"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "ezin da fitxategi zaharren zerrenda kendu"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "ezin da postrm script zaharra kendu"
 
@@ -4155,7 +4199,13 @@
 msgid "read error on standard input"
 msgstr "irakurketa-errorea sarrera estandarrean"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "Erabili --help paketeen kontsultari buruzko laguntza lortzeko."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4164,7 +4214,7 @@
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4181,7 +4231,7 @@
 "  --list [<glob-pattern>]  zerrendatu uneko datu-baseko gainidazketak.\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4204,31 +4254,31 @@
 "  --help                   erakutsi laguntzaren mezu hau.\n"
 "  --version               erakutsi bertsioa.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "amaierako '/'-ak kentzen"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "ezin da statoverride fitxategi berria ireki"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "errorea statoverride-old kentzean"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "errorea statoverride-old berria sortzean"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "errorea statoverride berria instalatzean"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add aukerak lau argumentu behar ditu"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4237,21 +4287,21 @@
 "'%s'(r)en gainidazketa badago dagoeneko, baina --force ezarri denez, ezikusi "
 "egingo zaio."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "'%s'(r)en gainidazketa badago dagoeneko, abortatzen."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "--update eman da baina %s ez dago"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Ez dago gainidazketarik."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update ezin da --remove aukerarekin erabili"
 
@@ -4316,16 +4366,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "hainbat statusoverrides daude '%.250s' fitxategian"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Idatzi dpkg-trigger --help lanabes honen laguntza lortzeko."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debian %s pakeetearen abiarazlearen lanabesaren %s betsioa.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4336,7 +4386,7 @@
 "       %s [<aukerak> ...] <komandoa>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4349,7 +4399,7 @@
 "abiarazleak onartzen dituen.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4374,21 +4424,21 @@
 "aldatu.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: abiarazleen datuen direktorioa ez da oraindik sortu\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: abiarazlearen erregistrorik ez dago oraindik\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "argumentu bat hartzen du, abiarazlearen izena"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4398,13 +4448,13 @@
 "dpkg-trigger komandoari mantentzailearen script batek deitu behar dio (edo --"
 "by-package aukerarekin)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: legezkanpoko espero den '%.250s' pakete-izena: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "'%.250s' abiarazlearen izen baliogabea: %.250s"
@@ -4438,38 +4488,39 @@
 msgstr "%s(r)en abiarazleak prozesatzen ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s: paketeen fitxategiko argumentu bat behar du"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr "ezin da dpkg egoera-area atzitu eguneratze masiboa egiteko"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "eguneratze masiboa egiteko dpkg egoera eremuan idazteko baimena eduki behar "
 "da"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Pakete erabilgarrien informazioa ordezten, %s erabiliz.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Pakete erabilgarrien informazioa eguneratzen, %s erabiliz.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "Pakete %d-i buruzko informazioa eguneratu da.\n"
 msgstr[1] "%d paketeri buruzko informazioa eguneratu da.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4590,8 +4641,8 @@
 msgstr[0] "kontrol-fitxategiei buruzko abisu %d-i ezikusi egiten\n"
 msgstr[1] "kontrol-fitxategiei buruzko %d abisuei ezikusi egiten\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s aukerak <direktorio> argumentu bat behar du"
@@ -4624,26 +4675,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: '%s' paketea eraikitzen: '%s'.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "huts egin du aldi baterako fitxategia sortzean (datuak)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control"
 msgid "control member"
 msgstr "kontrola"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "huts egin du aldi baterako fitxategia desestekatzean (datuak), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4660,20 +4711,20 @@
 msgid "error writing `%s'"
 msgstr "errorea '%s' idaztean"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "kideen artean"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "huts egin du fitxategi izena tar kanalizazioan idaztean (datuak)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<konprimitua> tar -cf komandoarekin"
 
@@ -4691,78 +4742,78 @@
 msgid "error reading %s from file %.255s"
 msgstr "errorea %s irakurtzean %.255s fitxategitik"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "huts egin du '%.255s' artxiboa irakurtzean"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "fstat: huts egin du artxiboarekin"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "artxiboak ez du punturik bertsio-zenbakian"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "artxiboak ez du lerro-jauzirik goiburuan"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "'%.250s' fitxategia hondatuta dago - okerreko zati kopurua"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "'%.250s' fitxategia ez da debian-en artxibo bitarra (dpkg-split probatu "
 "nahi?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "artxiboak ez du punturik bertsio-zenbakian"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "artxiboak ez du lerro-jauzirik goiburuan"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "artxiboak ez du punturik bertsio-zenbakian"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "%.250s artxiboaren bertsioa ez da ulertzen, lortu dpkg-deb berriagoa"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "%s: kide-datuak saltatu dira"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "'%.250s' fitxategiak %.*s datu-kide ulertezina dauka, utzi egingo da"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "'%.250s' fitxategiak bi kontrol-kide dauzka, utzi egingo da"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4774,23 +4825,23 @@
 " debian pakete berria, %s bertsioa.\n"
 " tamaina: %ld byte; kontrol-artxiboa= %zi byte.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "artxiboak gaizki osatutako '%s' kontrol-luzera dauka"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "%s: kide-datuak saltatu dira"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4802,7 +4853,7 @@
 " debian pakete zaharra, %s bertsioa.\n"
 " tamaina: %ld byte; kontrol-artxiboa= %zi, artxibo nagusia= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4811,49 +4862,50 @@
 "dpkg-deb: badirudi fitxategia ASCII moduan deskargatu delako \n"
 "dpkg-deb:    hondatu den artxibo bat dela\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "'%.255s' ez da debian formatuko artxibo bat"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "huts egin du kanalizazioan idaztean kopian"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "huts egin du kanalizazioa ixtean kopian"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "datuak"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "huts egin du direktoriora chdir egitean"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "huts egin du direktorioa sortzean"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "huts egin du direktoriora chdir egitean, direktorioa sortu ondoren"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "huts egin du direktoriora chdir egitean"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<deskonprimitu>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "itsatsi"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s: .deb fitxategi-izen argumentu bat behar du"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4862,97 +4914,97 @@
 "--%s: helburu direktorio bat behar du.\n"
 "Beharbada dpkg --install erabili nahi zenuen?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s: argumentu bat bakarrik hartzen du (.deb fitxategi-izena)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "huts egin du chdir '/' egitean garbitzeko"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "ezin da'%s' fitxategia atzitu"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: '%.255s': ez dauka '%.255s' kontrol-osagairik\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, 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"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "Eskatutako kontrol osagai %d falta da"
 msgstr[1] "Eskatutako kontrol %d osagai falta dira"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "ezin da '%.255s' direktorioa aztertu"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "ezin da '%.255s' atzitu ('%.255s')"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "ezin da '%.255s' ireki ('%.255s')"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "ezin da '%.255s' irakurri ('%.255s')"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld byte, %5d lerro   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     ez da fitxategi arrunta   %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(ez dago 'control' fitxategirik kontrol-artxiboan!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "ezin izan da 'control' osagaia ireki"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "huts egin du 'control' osagaia irakurtzean"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "errorea '%s' osagaia ixtean"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Errorea formatuan"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents: argumentu bat hartzen du zehazki"
 
@@ -4962,7 +5014,19 @@
 msgstr "'%s' debian pakete-artxiboaren amaierako %s bertsioa.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4973,6 +5037,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4989,7 +5055,7 @@
 "                                      fitxategia.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -5002,11 +5068,27 @@
 "<cfield> 'control' fitxategi nagusiko eremuen izena da.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5030,7 +5112,7 @@
 "none\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5043,7 +5125,7 @@
 "'dselect' edo 'aptitude' paketeak errazago kudeatzeko. 'dpkg-deb --extract'\n"
 "erabiliz deskonprimitutako paketeak gaizki instalatuko dira!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5051,17 +5133,17 @@
 "Idatzi dpkg-deb --help *.deb fitxategiak manipulatzeko laguntza lortzeko;\n"
 "Idatzi dpkg --help paketeak instalatu eta desinstalatzeko laguntza lortzeko."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "-%c aukeraren osokoa baliogabea: '%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "-%c aukeraren konpresio-maila baliogabea: %ld'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "%s konpresio mota ezezaguna!"
@@ -5084,7 +5166,7 @@
 "'%.250s' fitxategia hondatuta dago - %.250s(r)en ondoren lerro-jauzia falta "
 "da"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "errorea %.250s irakurtzean"
@@ -5183,53 +5265,59 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "'%.250s' fitxategia hondatuta dago - okerreko zati kopurua"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "pakete-izena"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "'%.250s' fitxategia hondatuta dago - okerreko \"magic\" bigarren goiburuaren "
 "amaieran"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "'%.250s' fitxategia hondatuta dago - bigarren kidea ez da datu-kidea"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "'%.250s' fitxategia hondatuta dago - okerreko zati kopurua adierazitako "
 "tamainetan"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "'%.250s' fitxategia hondatuta dago - okerreko tamaina adierazitako zati "
 "zenbakian"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "ezin da fstat egin '%.250s' zati-fitxategian"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "'%.250s' fitxategia hondatuta dago - laburregia"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "ezin da '%.250s' artxiboko zati-fitxategia ireki"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "'%.250s' fitxategia ez da artxibo-zatia"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5249,6 +5337,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5272,12 +5361,19 @@
 "     (erabilitako zatia):        %lu byte\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<ezezaguna>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s(e)k zati-fitxategiko argumentu bat edo gehiago behar ditu"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "'%s' fitxategia ez da artxibo-zatia\n"
@@ -5312,7 +5408,7 @@
 msgid "split package part"
 msgstr "%s paketea batzen zati %detik: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "eginda\n"
@@ -5364,17 +5460,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Aukerak:\n"
 "   --depotdir <direktorioa>        <direktorioa> erabili %s/%s ordez\n"
@@ -5387,20 +5492,29 @@
 "\n"
 "Irteera egoera: 0 = Ados;  1 = -a ez da zatia;  2 = arazoak!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Idatzi dpkg-split --help laguntza lortzeko."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "ustekabeko fitxategi amaiera %.250s-en"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "zatiaren tamaina handiegia da, edo ez da positiboa"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "zatiaren tamainak %d KiB izan behar du gutxienez (goiburua onartzeko)"
@@ -5511,27 +5625,27 @@
 msgid "Deleted %s.\n"
 msgstr "%s ezabatu da.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "dpkg-deb eremuaren erausketa"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "ezin da iturburuko '%.250s' fitxategia ireki"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "ezin da fstat egin iturburuko fitxategian"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "helburuko '%.250s' fitxategia ez da fitxategi arrunta"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5540,17 +5654,17 @@
 msgstr[0] "%s paketea batzen zati %detik: "
 msgstr[1] "%s paketea batzen %d zatitatik: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split: iturburuko fitxategi-izena behar du argumentu gisa"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "--split: iturburuko fitxategi-izen bat eta helburuko aurrizki bat hartzen du "
@@ -5728,125 +5842,90 @@
 "  --help                   erakutsi laguntzaren mezu hau.\n"
 "  --version               erakutsi bertsioa.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "errorea"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "abisua"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "ezin da '%s' atzitu: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "readlink(%s)-ek huts egin du: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "bi komando zehaztu dira: --%s eta --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "ezin zaio %s(r)i erantsi: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "huts egin du %s eskaneatzean: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "huts egin du %s exekutatzean: %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "ezin da %s %s(e)ra estekatu: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "ezin da %s instalatu %s gisa: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "ezin da %s ezabatu: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "ustekabeko fitxategi amaiera %s irakurtzen saiatzean"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "%s irakurtzean: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "lerroa ez dago amaituta %s irakurtzen saiatzean"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s hondatuta dago: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives fitxategiak (%s) ezin du lerro-jauzirik eduki"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "%s idaztean: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "morroiaren izena"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "bikoiztutako %s morroia"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "morroiaren esteka"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "morroiaren esteka %s esteka nagusiaren berdina da"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "%s morroiaren esteka bikoiztuta"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "fitxategi maisua"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "%s bide-izena bikoiztuta"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5855,129 +5934,114 @@
 "%s(r)en alternatiba (esteken %s taldearen zati) ez da existitzen. "
 "Alternatiben zerrendatik kentzen."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "lehentasuna"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "morroiaren fitxategia"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "%s(r)en lehentasuna: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "ezin da %s irakurri: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "egoera"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "egoera baliogabea"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "esteka maisua"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "ezin da %s itxi: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "%s (%s) morroiaren esteka zaharkitua baztertzen."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "ezin da %s idatzi: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "modu automatikoa"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "eskuzko modua"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr " estekak unean %s(e)ra darama"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr " esteka ez dago une honetan"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - %d lehentasuna"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  %s morroia: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Uneko bertsio 'onena' %s da."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Ez dago bertsiorik eskuragarri."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "Aukera %d dago %s ordezteko (%s hornituz)."
 msgstr[1] "%d aukera daude %s ordezteko (%s hornituz)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Hautapena"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Bide-izena"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Lehentasuna"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Egoera"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Sakatu Sartu tekla hautapena mantentzeko[*], edo sakatu hautatze zenbakia: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "ez da %s esteka batekin ordeztuko."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "ezin da %s aukera ezezaguna instalatu"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -5986,99 +6050,154 @@
 "alde batera utziko da %s(r)en sorrera, esleitutako %s fitxategia (%s esteken "
 "taldekoa) ez delako existitzen."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "ez da %s esteka batekin ordeztuko."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Deitu %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "%s alternatiboa ez da aldatu %s hautapena ez baitago eskuragarri."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Utzi alde batera %s alternatiba ezezaguna."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "lerroa luzeegia da edo ez dago amaituta %s irakurtzen saiatzean"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Saltatu lerro baliogabea: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "%s esteka %s(e)tik %s(e)ra berrizendatzen."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "%s morroiaren esteka %s(e)tik %s(e)ra berrizendatzen."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "izen alternatiboak (%s) ezin du ez '/' ez zuriunerik izan."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "esteka alternatiboa ez da absolutua eta izan beharko zen: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "bide-izen alternatiboa ez da absolutua eta izan beharko zen: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "%s alternatiboa ezin da nagusia izan: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "%s esteka alternatiboa dagoeneko %s(e)k kudeatzen du"
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "%s bide-izen alternatiboa ez da existitzen."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "%s alternatiboa ezin da %s(r)en morroia izan: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "%s alternatiboa ezin da nagusia izan: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "%s esteka alternatiboa dagoeneko %s(e)k kudeatzen du"
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "'%s' argumentu ezezaguna"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 "--install aukerak <esteka> <izena> <bideizena> <lehentasuna> behar ditu"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<esteka> eta <bideizena> ezin dira berdina izan"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "lehentasuna osoko bat izan behar da"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s aukerak <izena> <bideizena> behar ditu"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s aukerak <izena> behar du"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave aukera --install aukerarekin soilik onartzen da"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave aukerak <esteka> <izena> <bideizena> behar ditu"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "%s izena bai nagusi bai morroia da"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "%s esteka bai nagusi bai morroia da"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s aukerak <fitxategia> argumentua behar du"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "'%s' aukera ezezaguna"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -6086,67 +6205,22 @@
 "--display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all edo --auto behar da"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "%s alternatiboa ezin da nagusia izan: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "%s esteka alternatiboa dagoeneko %s(e)k kudeatzen du"
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "esteka alternatiboa ez da absolutua eta izan beharko zen: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "bide-izen alternatiboa ez da absolutua eta izan beharko zen: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "%s bide-izen alternatiboa ez da existitzen."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "izen alternatiboak (%s) ezin du ez '/' ez zuriunerik izan."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "hau alternatiba nagusia da."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "%s(r)en morroia da"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "%s alternatiboa ezin da %s(r)en morroia izan: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<sarrera estandarra>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "ez dago %s(r)en alternatibarik."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s esekita dago, aukera onenarekin eguneratuko da."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6157,49 +6231,49 @@
 msgstr ""
 "%s aldatu egin da (eskuz edo script batez). Eskuzko eguneraketara aldatzen."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "%s(r)en hautapen automatikoa konfiguratzen"
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr ""
 "%2$s(r)en %1$s alternatiba ez dago erregistratuta, ez da ezartzen ari.."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Ez dago %s hornitzen duen programarik."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Ezer ez konfiguratzeko."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Alternatiba bat bakarrik dago %s esteken taldean: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "%2$s(r)en %1$s alternatiba ez dago erregistratuta, ez da kentzen ari."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "eskuz hautatutako alternatiba ezabatzen - %s modu automatikora aldatzen"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "%s(r)en eguneraketa automatikoak desgaituta daude, ez da ukituko."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6207,12 +6281,12 @@
 "eguneraketa automatikoetara itzultzeko erabili 'update-alternatives --auto "
 "%s'."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "%s erabiltzen %s (%s) hornitzeko %s(e)n."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
@@ -6220,13 +6294,49 @@
 "%s alternatibaren berrinstalazioa derrigortzen, %s esteken taldea hautsita "
 "dagoelako."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "uneko %s alternatiba ezezaguna da, %s(e)ra aldatzen %s esteken "
 "taldearentzako."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "hau alternatiba nagusia da."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "%s(r)en morroia da"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "ezin da '%s' atzitu: %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "readlink(%s)-ek huts egin du: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "huts egin du %s eskaneatzean: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "huts egin du %s exekutatzean: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "ezin da %s %s(e)ra estekatu: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "ezin da %s instalatu %s gisa: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "%s idaztean: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "ezin da %s irakurri: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "ezin da %s itxi: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "ezin da %s idatzi: %s"
+
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6479,9 +6589,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "%s: kontrolaren area saltatu egin da"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "huts egin du tar exekutatzean"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "huts egin du aldi baterako direktorioa sortzean"
 
Binary files dpkg/po/fr.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/fr.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/fr.po /home/vorlon/devel/multiarch/dpkg-debian/po/fr.po
--- dpkg/po/fr.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/fr.po	2012-06-07 10:11:09.426073000 -0700
@@ -5,15 +5,15 @@
 # Copyright (C) 2000, 2001, 2002 Martin Quinson <Martin.Quinson@tuxfamily.org>
 # Copyright (C) 2005-2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
 #
-# Christian Perrier <bubulle@debian.org>, 2005, 2006, 2008, 2009, 2010.
+# Christian Perrier <bubulle@debian.org>, 2005, 2006, 2008, 2009, 2010, 2011.
 # Frederic Bothamy <frederic.bothamy@free.fr>, 2006, 2007.
 # Florent USSEIL <swiip81@free.fr>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
-"PO-Revision-Date: 2010-11-26 07:07+0100\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
+"PO-Revision-Date: 2011-07-18 19:36+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -21,15 +21,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.2\n"
 
 #: lib/dpkg/ar.c:66
 #, c-format
 msgid "invalid character '%c' in archive '%.250s' member '%.16s' size"
-msgstr ""
+msgstr "invalid character '%c' in archive '%.250s' member '%.16s' size"
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "impossible d'écrire le fichier « %s »"
@@ -42,80 +42,85 @@
 #: lib/dpkg/ar.c:123
 #, c-format
 msgid "failed to fstat ar member file (%s)"
-msgstr "échec de « fstat » sur un membre d'un fichier ar (%s)"
+msgstr "échec de « fstat » sur un élément d'un fichier ar (%s)"
 
 #: lib/dpkg/ar.c:130
-#, fuzzy, c-format
-#| msgid "failed to fstat ar member file (%s)"
+#, c-format
 msgid "ar member file (%s)"
-msgstr "échec de « fstat » sur un membre d'un fichier ar (%s)"
+msgstr "élément d'un fichier ar (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "échec de lecture lors d'une copie de buffer pour %s"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "échec en écriture lors d'une copie de buffer pour %s"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "lecture courte (short read) lors d'une copie de buffer pour %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "impossible d'exécuter « tar »"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "impossible d'exécuter %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s : décompression"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s : compression"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 "%s : une erreur s'est produite en liant les données entrantes au flux gzip"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s : erreur de lecture interne de gzip : « %s »"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s : erreur d'écriture interne de gzip"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: erreur en liant la sortie au flux gzip"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s : erreur de lecture interne de gzip"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s : erreur d'écriture interne de gzip : « %s »"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s : erreur d'écriture interne de gzip : « %s »"
@@ -131,31 +136,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s : erreur de lecture interne de bzip2 : « %s »"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s : erreur d'écriture interne de bzip2"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: erreur en liant la sortie au flux bzip2"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s : erreur de lecture interne de bzip2"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s : erreur d'écriture interne de bzip2 : « %s »"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "erreur inattendue de bzip2"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -164,7 +169,7 @@
 "le répertoire des mises à jour contient un fichier « %.250s » dont le nom "
 "est trop long (longueur=%d, max=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -172,32 +177,32 @@
 "le répertoire des mises à jour contient des fichiers dont les noms sont de "
 "différentes longueurs (à la fois %d et %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "ne peut pas parcourir le répertoire de mises à jour « %.255s »"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "impossible de supprimer le fichier de mise à jour incorporé %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "impossible de créer « %.255s »"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "impossible de mettre en forme %.250s"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "vidage impossible de %.250s après la mise en forme"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "déplacement impossible au début de %.250s après la mise en forme"
@@ -214,166 +219,164 @@
 # triggers are awaited : actions différées à venir
 # triggers are pending : actions différées en attente
 # #######################################: lib/dpkg/dbmodify.c:161
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "impossible d'ouvrir le fichier de verrou %s pour tests"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr ""
 "impossible de créer/ouvrir le fichier verrou de la base de données d'état"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 "vous n'avez pas la permission de verrouiller la base de données d'état de "
 "dpkg"
 
-#: lib/dpkg/dbmodify.c:235
-#, fuzzy
-#| msgid "unable to lock dpkg status database"
+#: lib/dpkg/dbmodify.c:233
 msgid "dpkg status database"
-msgstr "impossible de verrouiller la base de données d'état"
+msgstr "base de données d'état de dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "l'opération demandée requiert les privilèges du superutilisateur"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "impossible d'accéder au répertoire administratif de dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 "opération demandant un accès en lecture-écriture au répertoire administratif "
 "de dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "échec de la suppression de mon propre fichier de mise à jour %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "impossible d'écrire le nouvel état de « %.250s »"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "impossible d'éliminer le nouvel état de « %.250s »"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "impossible de tronquer le nouvel état de « %.250s »"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "impossible de synchroniser le nouvel état de « %.250s »"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "impossible de fermer le nouvel état de « %.250s »"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "impossible d'installer le nouvel état de « %.250s »"
 
 #: lib/dpkg/dir.c:50
-#, fuzzy, c-format
-#| msgid "unable to read filedescriptor flags for %.250s"
+#, c-format
 msgid "unable to get file descriptor for directory '%s'"
-msgstr "impossible de lire les drapeaux de descripteur de fichier pour %.250s"
+msgstr ""
+"impossible d'obtenir le descripteur de fichier pour le répertoire « %s »"
 
 #: lib/dpkg/dir.c:54
-#, fuzzy, c-format
-#| msgid "unable to sync file '%s'"
+#, c-format
 msgid "unable to sync directory '%s'"
-msgstr "impossible de synchron « %.250s »"
+msgstr "impossible de synchroniser le répertoire « %s »"
 
 #: lib/dpkg/dir.c:69 lib/dpkg/dir.c:131
-#, fuzzy, c-format
-#| msgid "unable to open file '%s'"
+#, c-format
 msgid "unable to open directory '%s'"
-msgstr "impossible d'ouvrir le fichier « %s »"
+msgstr "impossible d'ouvrir le répertoire « %s »"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "impossible d'ouvrir le fichier « %s »"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "impossible de synchron « %.250s »"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "impossible de fermer le fichier « %s »"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "échec de l'écriture des détails de « %.50s » sur « %.250s »"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "impossible d'ouvrir « %s » pour écrire la base de données %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr ""
 "impossible de paramétrer la mise en tampon sur le fichier de base de données "
 "%s"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "échec de l'écriture de %s enregistrements de « %.50s » à « %.250s »"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "impossible de vider la base de données %s dans « %.250s »"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "échec de la synchronisation de la base de données %s avec « %.250s »"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr ""
 "échec de clôture de « %.250s » après l'écriture de la base de données %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "impossible de lier « %.250s » à « %.250s » pour la sauvegarde de la base de "
 "données %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 "échec de l'installation de « %.250s » comme « %.250s » contenant la base de "
 "données %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -382,25 +385,20 @@
 "%s : erreur fatale irréversible, abandon :\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
-#, fuzzy, c-format
-#| msgid ""
-#| "%s: unrecoverable fatal error, aborting:\n"
-#| " %s\n"
+#: lib/dpkg/ehandle.c:100
+#, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
-"%s : erreur fatale irréversible, abandon :\n"
+"%s : hors du contexte d'erreur, abandon :\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
-#, fuzzy
-#| msgid "out of memory for new cleanup entry"
+#: lib/dpkg/ehandle.c:120
 msgid "out of memory for new error context"
-msgstr "manque de mémoire pour une nouvelle entrée nettoyée"
+msgstr "manque de mémoire pour un nouveau contexte d'erreur"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -409,34 +407,32 @@
 "%s : erreur lors du nettoyage :\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
-#, fuzzy, c-format
-#| msgid "dpkg: too many nested errors during error recovery !!\n"
+#: lib/dpkg/ehandle.c:201
+#, c-format
 msgid "%s: too many nested errors during error recovery!!\n"
-msgstr "dpkg : trop d'erreurs imbriquées lors d'une réparation.\n"
+msgstr "%s : trop d'erreurs imbriquées lors d'une réparation.\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "manque de mémoire pour une nouvelle entrée nettoyée"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 "manque de mémoire pour une nouvelle entrée nettoyée avec beaucoup de "
 "paramètres"
 
-#: lib/dpkg/ehandle.c:350
-#, fuzzy, c-format
-#| msgid "%s: warning: %s\n"
+#: lib/dpkg/ehandle.c:352
+#, c-format
 msgid "%s: error: %s\n"
-msgstr "%s : avertissement : %s\n"
+msgstr "%s : erreur : %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s : avertissement : %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: erreur interne : %s\n"
@@ -447,104 +443,103 @@
 msgstr "%s est manquant"
 
 #: lib/dpkg/fields.c:49
-#, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
+#, c-format
 msgid "'%.50s' is not allowed for %s"
-msgstr "« %.*s » n'est pas autorisé pour %s"
+msgstr "« %.50s » n'est pas autorisé pour %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "ce qui suit %s est inutile"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "nom de paquet incorrect (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "champ  « %s » vide"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "champ « %s » non autorisé dans le fichier d'états"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "trop de valeurs dans le champ du fichier « %s » (par rapport aux autres)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "trop peu de valeurs dans le champ du fichier « %s » (par rapport aux autres)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "yes/no dans un champ booléen"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "mot dans le champ « priority »"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "valeur du champ « status » non autorisée dans ce contexte"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "premier mot (« want ») dans le champ « status »"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "deuxième mot (« error ») dans le champ « status »"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "troisième mot (« status ») dans le champ « status »"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "erreur dans la chaîne Version « %.250s »"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "utilisation d'un champ obsolète « Revision » ou « Package-Revision »"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "valeur du champ « config-version » interdite dans ce contexte"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "erreur dans la chaîne Config-Version « %.250s »"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr ""
 "la ligne contenant les fichiers de configuration (« conffiles ») est mal "
 "formée « %.*s »"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 "la ligne contenant les fichiers de configuration (« conffiles ») commence "
 "par le caractère« %c » (qui n'est pas blanc)"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "répertoire racine ou nul déclaré comme un « conffile »"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -552,12 +547,12 @@
 "champ « %s », nom de paquet manquant, ou absurdités à la place d'un nom de "
 "paquet"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "champ « %s », nom de paquet incorrect « %.255s » : %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -566,7 +561,7 @@
 "champ « %s », référence à « %.255s » :\n"
 " mauvaise relation entre versions %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -575,7 +570,7 @@
 "champ « %s », référence à « %.255s » :\n"
 " « %c » est obsolète, utiliser « %c= » ou « %c%c » à la place"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -585,11 +580,11 @@
 " correspondance exacte implicite pour le numéro de version, utilisez plutôt "
 "« = » à la place"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "On ne peut utiliser que des versions exactes dans le champ Provides"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -599,60 +594,60 @@
 " valeur de version commençant avec un caractère non-alphanumérique, ajoutez "
 "plutôt un espace"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "champ « %s », référence à « %.255s » : version contenant « %c »"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "champ « %s », référence à « %.255s » : version non terminée"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "champ « %s », référence à « %.255s » : erreur dans la version"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr ""
 "champ « %s », erreur de syntaxe après la référence au paquet « %.255s »"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternative (« | ») non autorisée dans le champ « %s »"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 "valeur du champ « action-différée-en-attente » (« triggers-pending ») "
 "interdite dans ce contexte"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "nom d'action différée illégal « %.255s » : %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "action différée en double « %.255s »"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr ""
 "valeur du champ de « action-différée-à-venir » (« triggers-awaited ») non "
 "autorisée dans ce contexte"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "nom de paquet illégal dans l'action différée « %.255s » : %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "action différée en double « %.255s »"
@@ -673,10 +668,9 @@
 msgstr "impossible de changer les permissions du fichier cible « %.250s »"
 
 #: lib/dpkg/file.c:85
-#, fuzzy, c-format
-#| msgid "unable to unlock %s: %s"
+#, c-format
 msgid "unable to unlock %s"
-msgstr "impossible de déverrouiller %s : %s"
+msgstr "impossible de déverrouiller %s"
 
 #: lib/dpkg/file.c:111
 #, c-format
@@ -684,17 +678,14 @@
 msgstr "impossible de vérifier l'état de verrouillage du fichier « %s »"
 
 #: lib/dpkg/file.c:146
-#, fuzzy, c-format
-#| msgid "status database area is locked by another process"
+#, c-format
 msgid "%s is locked by another process"
-msgstr ""
-"la zone de la base de données d'état est verrouillée par un autre processus"
+msgstr "%s est verrouillé par un autre processus"
 
 #: lib/dpkg/file.c:148
-#, fuzzy, c-format
-#| msgid "unable to unlock %s: %s"
+#, c-format
 msgid "unable to lock %s"
-msgstr "impossible de déverrouiller %s : %s"
+msgstr "impossible de déverrouiller %s"
 
 #: lib/dpkg/log.c:53
 #, c-format
@@ -710,19 +701,18 @@
 msgid "unable to write to status fd %d"
 msgstr "impossible d'écrire le descripteur de fichier d'état %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
-#, fuzzy, c-format
-#| msgid "realloc failed (%zu bytes)"
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
+#, c-format
 msgid "malloc failed (%zu bytes)"
-msgstr "échec de « realloc » (%zu octets)"
+msgstr "échec de « malloc » (%zu octets)"
 
 #: lib/dpkg/mlib.c:58
 #, c-format
 msgid "realloc failed (%zu bytes)"
 msgstr "échec de « realloc » (%zu octets)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "échec d'allocation mémoire"
 
@@ -755,298 +745,292 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "impossible de positionner le drapeau « close-on-exec » pour %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "erreur de configuration : %s:%d : %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "échec d'ouverture du fichier de configuration %.255s en lecture : %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "guillemets non appairés dans « %s »"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "option « %s » inconnue"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "« %s » a besoin d'une valeur"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "« %s » n'utilise pas de valeur"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "erreur de lecture sur le fichier de configuration « %.255s »"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "erreur lors de la fermeture du fichier de configuration « %.255s »"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "erreur lors de l'ouverture du répertoire de configuration « %s »"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "option --%s inconnue"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "l'option --%s prend une valeur en paramètre"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "l'option --%s ne prend pas de valeur en paramètre"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "option -%c inconnue"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "l'option -%c prend une valeur en paramètre"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "l'option -%c ne prend pas de valeur en paramètre"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "option obsolète « --%s »\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "actions conflictuelles -%c (--%s) et -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "valeur en double pour le champ « %s »"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "nom de champ « %.*s » défini par l'utilisateur trop court"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "valeur en double pour le champ « %.*s » défini par l'utilisateur"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "« Configured-Version » du paquet dans un état inapproprié"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "paquet dans l'état « %s » mais des actions différées sont à venir"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 "paquet dans l'état « actions-différées-à-venir » (« triggers-awaited ») mais "
 "aucune action différée n'est à venir"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "paquet dans l'état « %s » mais aucune action différée n'est en attente"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 "paquet dans l'état « actions-différées-en-attente » (« triggers-pending ») "
 "mais sans action différée en attente"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Paquet dans l'état « non-installé » possédant des fichiers de configuration, "
 "fichiers ignorés"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "la lecture du fichier « info » « %.255s » du paquet a échoué"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr ""
 "impossible de faire un « stat » sur le fichier d'info du paquet « %.255s »"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr ""
 "impossible de faire un « mmap » sur le fichier d'info du paquet « %.255s »"
 
-#: lib/dpkg/parse.c:344
-#, fuzzy, c-format
-#| msgid "can't stat package info file `%.255s'"
+#: lib/dpkg/parse.c:352
+#, c-format
 msgid "reading package info file '%.255s'"
-msgstr ""
-"impossible de faire un « stat » sur le fichier d'info du paquet « %.255s »"
+msgstr "lecteur du fichier d'informations de paquet « %.255s »"
+
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "échec de la fermeture après lecture : « %.255s »"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF après le nom de champ « %.*s »"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "saut de ligne dans le nom de champ « %.*s »"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "EOF de MSDOS (^Z) dans le nom de champ « %.*s »"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "le nom de champ « %.*s » doit être suivi de deux points (:)"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 "EOF avant la valeur du champ « %.*s » (il manque le saut de ligne final)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 "caractère EOF de MS-DOS dans la valeur du champ « %.*s » (manque-t-il un "
 "saut de ligne ?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "saut de ligne dans le nom de champ « %.*s »"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 "EOF dans la valeur du champ « %.*s » (il manque le saut de ligne final)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 "plusieurs entrées d'information de paquet trouvées, une seule est autorisée"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "échec de la fermeture après lecture : « %.255s »"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "pas d'information de paquet dans « %.255s »"
 
 #: lib/dpkg/parsehelp.c:45
-#, fuzzy, c-format
-#| msgid ""
-#| "%s, in file '%.255s' near line %d package '%.255s':\n"
-#| " "
+#, c-format
 msgid ""
 "parsing file '%.255s' near line %d package '%.255s':\n"
 " %.255s"
 msgstr ""
-"%s, dans le fichier '%.255s' vers la ligne %d paquet '%.255s':\n"
-" "
+"analyse du fichier '%.255s' vers la ligne %d paquet '%.255s' :\n"
+" %.255s "
 
 #: lib/dpkg/parsehelp.c:48
-#, fuzzy, c-format
-#| msgid ""
-#| "%s, in file '%.255s' near line %d:\n"
-#| " "
+#, c-format
 msgid ""
 "parsing file '%.255s' near line %d:\n"
 " %.255s"
 msgstr ""
-"%s, dans le fichier « %.255s » vers la ligne %d:\n"
-" "
+"analyse du fichier « %.255s » vers la ligne %d:\n"
+" %.255s "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "ne doit pas être une chaîne vide"
 
-#: lib/dpkg/parsehelp.c:129
-#, fuzzy
-#| msgid "must start with an alphanumeric"
+#: lib/dpkg/parsehelp.c:127
 msgid "must start with an alphanumeric character"
 msgstr "doit commencer par un caractère alphanumérique"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "caractère « %c » non autorisé (seuls les lettres, les chiffres et « %s » le "
 "sont)"
 
-#: lib/dpkg/parsehelp.c:198
-#, fuzzy
-#| msgid "<none>"
+#: lib/dpkg/parsehelp.c:178
 msgctxt "version"
 msgid "<none>"
-msgstr "<néant>"
+msgstr "<aucun>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "la chaîne de version est vide"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "la chaîne de version contient des espaces"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "l'époque (epoch) dans la version n'est pas un nombre"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "rien après les deux points (:) dans le numéro de la version"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
-msgstr ""
+msgstr "le numéro de version ne commence pas par un chiffre"
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "caractère non valable dans le numéro de version"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "caractère non valable dans le numéro de révision"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr " %s manque"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr " %s de valeur nulle"
@@ -1065,52 +1049,50 @@
 msgid "(no description available)"
 msgstr "(aucune description n'est disponible)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "impossible d'ignorer le signal %s avant l'exécution de %.250s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "erreur signal %s non-capturé : %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (sous-processus) : %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "échec de « fork »"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "le sous-processus %s a retourné une erreur de sortie d'état %d"
 
-#: lib/dpkg/subproc.c:127
-#, fuzzy, c-format
-#| msgid "wait for subprocess %s failed"
+#: lib/dpkg/subproc.c:128
+#, c-format
 msgid "subprocess %s was interrupted"
-msgstr "échec de l'attente du sous-processus %s"
+msgstr "interruption du sous-processus %s"
 
-#: lib/dpkg/subproc.c:129
-#, fuzzy, c-format
-#| msgid "subprocess %s killed by signal (%s)%s"
+#: lib/dpkg/subproc.c:130
+#, c-format
 msgid "subprocess %s was killed by signal (%s)%s"
-msgstr "sous-processus %s tué par le signal (%s)%s"
+msgstr "le sous-processus %s a été tué par le signal (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", informations de débogage écrites (« core dumped »)"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "le sous-processus %s a échoué avec le code d'état d'attente %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "échec de l'attente du sous-processus %s"
@@ -1134,68 +1116,58 @@
 "erreur de syntaxe dans le fichier des actions différées « %.255s » à la "
 "position « %s » %s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr ""
 "impossible d'ouvrir ou créer le verrou du fichier des actions différées "
 "« %.255s »"
 
-#: lib/dpkg/trigdeferred.l:140
-#, fuzzy
-#| msgid "triggered"
+#: lib/dpkg/trigdeferred.l:141
 msgid "triggers area"
-msgstr "différé"
+msgstr "zone des actions différées"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "impossible d'analyser le fichier des actions différées « %.255s »"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "impossible d'ouvrir le fichier des actions différées « %.255s »"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 "impossible d'ouvrir ou créer un nouveau fichier des actions différées "
 "« %.255s »"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "erreur de lecture du fichier des actions différées « %.255s »"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr ""
 "impossible d'enregistrer le nouveau fichier des actions différées « %.255s »"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr ""
 "impossible de fermer le nouveau fichier des actions différées « %.255s »"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr ""
 "impossible d'installer le nouveau fichier des actions différées « %.255s »"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "noms vides interdits pour les actions différées"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "nom d'action différée contenant un caractère invalide"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1204,20 +1176,20 @@
 "syntaxe inconnue ou invalide dans le nom de l'action différée "
 "« %.255s » ( dans les actions différées demandées par le paquet « %.255s »)"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr ""
 "impossible d'ouvrir le fichier liste des actions différées demandées par le "
 "paquet « %.255s »"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr ""
 "impossible de relire le fichier des actions différées demandées « %.255s »"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1226,49 +1198,55 @@
 "erreur de syntaxe dans le fichier des actions différées demandées "
 "« %.255s » ; nom du fichier « %.255s » illégal : %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr ""
-"impossible de créer un nouveau fichier des actions différées demandées "
-"« %.250s »"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr ""
 "impossible d'enregistrer un nouveau fichier des actions différées demandées "
 "« %.250s »"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr ""
 "impossible de vider le nouveau fichier des actions différées demandées "
 "« %.250s »"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr ""
 "impossible de synchroniser le nouveau fichier des actions différées "
 "demandées « %.250s »"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
 msgstr ""
-"impossible de fermer le nouveau fichier des actions différées demandées "
+"impossible d'installer une nouvelle version de fichier des actions différées "
+"demandées « %.255s »"
+
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "ne peut pas supprimer « %.250s »"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr ""
+"impossible de créer un nouveau fichier des actions différées demandées "
 "« %.250s »"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:383
 #, c-format
-msgid "unable to install new trigger interest file `%.250s'"
+msgid "unable to close new trigger interest file `%.250s'"
 msgstr ""
-"impossible d'installer une nouvelle version de fichier des actions différées "
-"demandées « %.255s »"
+"impossible de fermer le nouveau fichier des actions différées demandées "
+"« %.250s »"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1276,51 +1254,51 @@
 "fichier des actions différées demandées en double avec le nom « %.250s » "
 "pour le paquet « %.250s »"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "impossible de créer un nouveau fichier d'actions différées « %.250s »"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr ""
 "impossible d'enregistrer le nouveau fichier des actions différées « %.250s »"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "impossible de vider le nouveau fichier d'actions différées « %.250s »"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr ""
 "impossible de synchroniser le nouveau fichier d'actions différées « %.250s »"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "impossible de fermer le nouveau fichier d'actions différées « %.250s »"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr ""
 "impossible d'installer le nouveau fichier des actions différées comme "
 "« %.250s »"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "impossible de lire le fichier des actions différées « %.250s »"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "erreur de syntaxe dans le fichier des actions différées « %.255s »"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1329,7 +1307,7 @@
 "l'enregistrement du fichier des actions différées indique un nom de paquet "
 "illégal pour « %.250s » ( le nom du fichier est « %.250s » ) : %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1338,36 +1316,44 @@
 "le fichier CI des actions différées « %.250s » contient une syntaxe illégale "
 "dans l'action différée de nom « %.250s » : %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "impossible d'ouvrir le fichier CI des actions différées « %.250s »"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 "le fichier CI des actions différées contient une directive de syntaxe "
 "inconnue"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 "le fichier CI des actions différées contient la directive inconnue « %.250s »"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr ""
 "impossible de créer le répertoire d'état des actions différées « %.250s »"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 "impossible de positionner le propriétaire du répertoire d'état des actions "
 "différées « %.250s »"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "noms vides interdits pour les actions différées"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "nom d'action différée contenant un caractère invalide"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1392,7 +1378,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "erreur de formatage de la chaîne dans la variable varbuf"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "erreur de lecture du tube de dpkg-deb"
 
@@ -1412,12 +1398,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "erreur pendant la définition des droits du lien symbolique « %.255s »"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "erreur de paramétrage des droits de « %.255s »"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "erreur de paramétrage des permissions de « %.255s »"
@@ -1479,17 +1465,26 @@
 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:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "analyse impossible du fichier « %s »"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Remplacement de fichiers dans l'ancien paquet %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, 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:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1498,100 +1493,105 @@
 "tentative de remplacement du répertoire « %.250s » dans le paquet %.250s "
 "%.250s avec un élément de type différent"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "tentative de remplacement de « %.250s », qui appartient aussi au paquet "
 "%.250s %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "impossible de créer « %.255s » (pendant le traitement de « %.255s »)"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "backend dpkg-deb pendant « %.255s »"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "erreur pendant la fermeture/écriture de « %.255s »"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "erreur pendant la création du tube « %.255s »"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "erreur pendant la création du périphérique « %.255s »"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "erreur pendant la création du lien physique « %.255s »"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "erreur pendant la création du lien symbolique « %.255s »"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "erreur pendant la création du répertoire « %.255s »"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, 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:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "impossible de lire le lien « %.255s »"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, 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:830
+#: src/archives.c:841
 #, 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:835
+#: src/archives.c:846
 #, 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:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "impossible d'installer une nouvelle version de « %.255s »"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "impossible d'ouvrir « %.255s »"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "impossible de synchroniser le fichier « %.255s »"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1600,7 +1600,7 @@
 "problème de dépendance avec %s :\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1609,7 +1609,7 @@
 "tentative de déconfiguration du paquet essentiel\n"
 "%s pour activer %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1618,7 +1618,7 @@
 "dpkg : non, %s est essentiel, il ne sera pas déconfiguré\n"
 " pour autoriser %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1627,29 +1627,29 @@
 "dpkg : non, impossible d'effectuer %s (voir --auto-deconfigure) :\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "la suppression de %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "l'installation de %.250s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 "dpkg : tentative de déconfiguration de %s, qui serait cassé par %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg : oui, déconfiguration de %s (cassé par %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1658,11 +1658,11 @@
 "dpkg : concernant %s contenant %s :\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "problème ignoré, il est peut-être possible de continuer !"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1672,29 +1672,29 @@
 " et la déconfiguration n'est pas autorisée (--auto-deconfigure pourrait "
 "aider)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "l'installation de %.250s casserait un logiciel existant"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg : retirer %s en faveur de %s ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1703,108 +1703,110 @@
 "dpkg : le paquet %s requiert une réinstallation mais sera supprimé quand "
 "même, comme demandé.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "paquets en conflit - %.250s non installé"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "conflit ignoré, il est peut-être possible de continuer malgré tout."
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, 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:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "« find » pour dpkg --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "échec de « fdopen » sur le tube de « find »"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "erreur pendant la lecture sur le tube de « find »"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "erreur pendant la fermeture du tube de « find »"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, 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:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "recherché, mais aucun paquet trouvé (fichiers *.deb correspondant)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<sortie standard>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<erreur standard>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Sélection du paquet %s précédemment désélectionné.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Paquet désélectionné %s ignoré.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, 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:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "dégradation (« downgrade ») de %.250s depuis %.250s vers %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "Mise à jour de %.250s de la version %.250s vers l'ancienne %.250s ignorée.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1813,42 +1815,42 @@
 "impossible de supprimer la version nouvellement installée de « %.250s » pour "
 "permettre la réinstallation d'une copie de secours"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "impossible de réinstaller la copie de secours de « %.250s »"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "impossible de supprimer la copie de secours de « %.250s »"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr ""
 "impossible de supprimer la version nouvellement installée de « %.250s »"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "impossible de supprimer la version nouvellement extraite de « %.250s »"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr ""
 "impossible d'analyser le nouveau fichier de configuration « %.250s », fourni "
 "avec la distribution"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 "impossible d'analyser le fichier de configuration actuellement installé "
 "« %.250s »"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1859,60 +1861,60 @@
 "Le fichier de configuration « %s » n'existe pas sur le système.\n"
 "Installation d'un nouveau fichier de configuration comme demandé.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: n'a pas pu supprimer l'ancienne sauvegarde « %.250s » : %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: n'a pas pu renommer « %.250s » en « %.250s » : %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: impossible de supprimer « %.250s » : %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 "%s : échec de la suppression de la version de l'ancienne distribution "
 "« %.250s » : %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s : échec de la suppression de « %.250s » (avant remplacement) : %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s :échec de la liaison de « %.250s » à « %.250s » : %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr ""
 "Installation de la nouvelle version du fichier de configuration %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "impossible d'installer « %.250s » comme « %.250s »"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "aucun paquet nommé « %s » n'est installé, configuration impossible"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "le paquet %.250s est déjà installé et configuré"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1921,7 +1923,7 @@
 "le paquet %.250s n'est pas prêt pour la configuration\n"
 " configuration impossible (état actuel « %.250s »)"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1930,11 +1932,11 @@
 "dpkg : des problèmes de dépendances empêchent la configuration de %s :\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "problèmes de dépendances - laissé non configuré"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1943,7 +1945,7 @@
 "dpkg : %s : problèmes de dépendances, mais configuration comme demandé :\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1951,12 +1953,12 @@
 "Le paquet est dans un état vraiment incohérent - vous devriez\n"
 " le réinstaller avant de tenter de le configurer."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Paramétrage de %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1965,7 +1967,7 @@
 "%s : impossible d'analyser le fichier de  configuration « %s » (= « %s ») : "
 "%s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1973,7 +1975,7 @@
 msgstr ""
 "%s : le fichier de configuration « %s » est un lien circulaire (= « %s »)"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1982,7 +1984,7 @@
 "%s : impossible de lire le lien correspondant au fichier de configuration "
 "« %s » (= « %s ») : %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1991,36 +1993,36 @@
 "%s : le fichier de configuration « %.250s » est un nom de fichier dégénéré.\n"
 "(« %s » est un lien symbolique vers « %s »)"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s : le fichier de configuration « %.250s » n'est ni un vrai fichier ni un "
 "lien (= « %s »)"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr ""
 "%s : impossible d'ouvrir le fichier de configuration %s pour hachage : %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
-msgstr ""
+msgstr "visualisation des différences dans le fichier de configuration"
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Tapez « exit » lorsque vous aurez fini.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
-msgstr ""
+msgstr "processeur de commandes du fichier de configuration"
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -2029,12 +2031,12 @@
 "\n"
 "Fichier de configuration « %s »"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (en réalité « %s »)"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -2046,7 +2048,7 @@
 " ==> Fichier également présent dans le paquet fourni par le responsable du "
 "paquet.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -2055,7 +2057,7 @@
 "\n"
 "     Inchangé depuis l'installation.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2064,7 +2066,7 @@
 "\n"
 " ==> Modifié (par vous ou par un script) depuis l'installation.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -2073,43 +2075,43 @@
 "\n"
 " ==> Supprimé (par vous ou par un script) depuis l'installation.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Le distributeur du paquet a fourni une version mise à jour.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr ""
 "      La version du paquet est la même que celle de la précédente "
 "installation.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Utilisation d'un nouveau fichier comme demandé.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Utilisation de l'ancien fichier courant comme demandé.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr ""
 " ==> Conservation de l'ancien fichier de configuration comme fichier par "
 "défaut.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr ""
 " ==> Utilisation d'un nouveau fichier de configuration comme fichier par "
 "défaut.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2124,158 +2126,160 @@
 "      D     : afficher les différences entre les versions\n"
 "      Z     : suspendre ce processus pour examiner la situation\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " L'action par défaut garde votre version actuelle.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " L'action par défaut installe la nouvelle version.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[défaut=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[défaut=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[pas de choix par défaut]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "erreur d'écriture sur « stderr », constatée avant l'invite de configuration"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "erreur de lecture sur l'entrée standard à l'invite de configuration"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF sur l'entrée standard à l'invite de configuration"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s dépend de %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s pré-dépend de %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s recommande %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s suggère %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s casse (« breaks ») %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s entre en conflit avec %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s améliore %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s doit être supprimé.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s doit être déconfiguré.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s est installé, mais sa version est %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, 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:323
+#: src/depcon.c:337
 #, 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:329
+#: src/depcon.c:343
 #, 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:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s est %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s fournit %.250s mais doit être supprimé.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, 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:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s fournit %.250s mais est %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s n'est pas installé.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (version %.250s) doit être installé.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  « %.250s » (version « %.250s ») est présent ainsi que « %s ».\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s fournit %.250s et doit être installé.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  « %.250s » fournit « %.250s » et est présent ainsi de  « %s ».\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "Utiliser --help pour de l'aide sur la recherche de paquets."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2283,7 +2287,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s version %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2294,8 +2298,8 @@
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 "Copyright (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2306,7 +2310,7 @@
 "Public License » version 2 ou supérieure pour prendre connaissance des\n"
 "conditions de reproduction. AUCUNE garantie n'est offerte.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2316,7 +2320,7 @@
 "Syntaxe : %s [<option> ...] <commande>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2336,7 +2340,7 @@
 "  --truename <fichier>     affiche le nom du fichier détourné.\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2369,7 +2373,7 @@
 "  --version                afficher la version.\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2385,17 +2389,12 @@
 "spécifier\n"
 "--package et --divert.\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "analyse impossible du fichier « %s »"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "erreur lors de la vérification de « %s »"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2404,129 +2403,127 @@
 "le renommage implique l'écrasement de « %s » avec\n"
 "  un fichier différent « %s », ce n'est pas autorisé"
 
-#: src/divertcmd.c:222
-#, fuzzy, c-format
-#| msgid "unable to write file '%s'"
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
+#, c-format
 msgid "unable to create file '%s'"
-msgstr "impossible d'écrire le fichier « %s »"
+msgstr "impossible de créer le fichier « %s »"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "copie de fichier"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "impossible de renommer « %s » en « %s »"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "renommage : suppression de l'ancien lien dupliqué « %s »"
 
-#: src/divertcmd.c:261
-#, fuzzy, c-format
-#| msgid "unable to open source file `%.250s'"
+#: src/divertcmd.c:262
+#, c-format
 msgid "unable to remove copied source file '%s'"
-msgstr "impossible d'ouvrir le fichier source « %.250s »"
+msgstr "impossible de supprimer le fichier source copié « %s »"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "détournement local de %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "détournement local de %s en %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "détournement de %s par %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "détournement de %s en %s par %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "tout détournement de %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "tout détournement de %s en %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "impossible de créer un nouveau fichier %s"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "impossible de supprimer le fichier « %s »"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "erreur lors de la suppression de l'ancien fichier diversions-old"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "erreur pendant la création du nouveau fichier diversions-old"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "erreur d'installation des nouveaux détournements"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s demande un seul paramètre"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "le nom de fichier « %s » n'est pas absolu"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "le fichier ne doit pas contenir de retour chariot"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Impossible de détourner des répertoires"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "impossible de détourner le fichier $%s vers lui-même"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "Conservation de « %s »\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "« %s » entre en conflit avec « %s »"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "Ajout de « %s »\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Pas de détournement « %s », aucun supprimé.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2537,7 +2534,7 @@
 "  lors de la suppression de « %s »\n"
 "  « %s » trouvé"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2548,16 +2545,16 @@
 "  lors de la suppression de « %s »\n"
 "  « %s » trouvé"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "Suppression de « %s »\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "le paquet ne peut pas contenir de retour chariot"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "détournement-vers ne peut pas contenir de retour chariot"
 
@@ -2645,8 +2642,8 @@
 "( ou encore « dpkg --triggers-only » ) : \n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s ne prend pas de paramètre"
@@ -2661,8 +2658,6 @@
 "problèmes suivants.\n"
 
 #: src/enquiry.c:191
-#, fuzzy
-#| msgid "<unknown>"
 msgctxt "section"
 msgid "<unknown>"
 msgstr "<inconnu>"
@@ -2741,7 +2736,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions : mauvaise relation"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "mauvaise syntaxe de la version « %s » : %s"
@@ -2756,20 +2751,17 @@
 " %s\n"
 
 #: src/errors.c:68
-#, fuzzy, c-format
-#| msgid ""
-#| "dpkg: failed to allocate memory for new entry in list of failed packages."
+#, c-format
 msgid ""
 "%s: failed to allocate memory for new entry in list of failed packages: %s"
 msgstr ""
-"dpkg : impossible d'allouer de la mémoire pour une nouvelle entrée dans la "
-"liste des paquets en échec."
+"%s : impossible d'allouer de la mémoire pour une nouvelle entrée dans la "
+"liste des paquets en échec : %s"
 
 #: src/errors.c:79
-#, fuzzy, c-format
-#| msgid "dpkg: too many errors, stopping\n"
+#, c-format
 msgid "%s: too many errors, stopping\n"
-msgstr "dpkg : trop d'erreurs, arrêt\n"
+msgstr "%s : trop d'erreurs, arrêt\n"
 
 #: src/errors.c:87
 msgid "Errors were encountered while processing:\n"
@@ -2798,14 +2790,14 @@
 msgid "overriding problem because --force enabled:"
 msgstr "problème contourné par utilisation de --force :"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 "impossible d'ouvrir le fichier contenant la liste des fichiers du paquet "
 "« %.250s »"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2815,87 +2807,86 @@
 "manquant, il est considéré qu'aucun fichier du paquet n'est actuellement "
 "installé."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr ""
 "impossible d'ouvrir le fichier contenant la liste des fichiers du paquet "
 "« %.250s »"
 
-#: src/filesdb.c:329
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
+#: src/filesdb.c:330
+#, c-format
 msgid "reading files list for package '%.250s'"
-msgstr "liste des fichiers du paquet « %.250s »"
+msgstr "lecture de la liste des fichiers du paquet « %.250s »"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "la liste des fichiers pour le paquet « %.250s » n'a pas de retour à la ligne "
 "en fin de fichier"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "la liste des fichiers pour le paquet « %.250s » contient un nom de fichier "
 "vide"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 "erreur de fermeture du fichier contenant la liste des fichiers du paquet "
 "« %.250s »"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Lecture de la base de données... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "%d fichier et répertoire déjà installé.)\n"
 msgstr[1] "%d fichiers et répertoires déjà installés.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 "impossible de créer le fichier contenant la liste mise à jour des fichiers "
 "du paquet %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 "échec de l'écriture du fichier contenant la liste mise à jour des fichiers "
 "du paquet %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 "Impossible d'éliminer le fichier contenant la liste mise à jour des fichiers "
 "du paquet %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 "impossible de synchroniser le fichier contenant la liste mise à jour des "
 "fichiers du paquet %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 "impossible de fermer le fichier contenant la liste mise à jour des fichiers "
 "du paquet %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2936,7 +2927,9 @@
 msgstr "installé"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "erreur : la variable PATH n'est pas définie."
 
 #: src/help.c:129
@@ -2945,44 +2938,38 @@
 msgstr "« %s » introuvable dans la variable PATH ou non exécutable"
 
 #: src/help.c:138
-#, fuzzy, c-format
-#| msgid "'%s' not found in PATH or not executable."
+#, c-format
 msgid ""
 "%d expected program not found in PATH or not executable.\n"
 "%s"
 msgid_plural ""
 "%d expected programs not found in PATH or not executable.\n"
 "%s"
-msgstr[0] "« %s » introuvable dans la variable PATH ou non exécutable"
-msgstr[1] "« %s » introuvable dans la variable PATH ou non exécutable"
+msgstr[0] ""
+"%d programme attendu non trouvé dans la variable PATH ou non exécutable.\n"
+"%s"
+msgstr[1] ""
+"%d programmes attendus non trouvés dans la variable PATH ou non "
+"exécutables.\n"
+"%s"
 
 #: src/help.c:141
-#, fuzzy
-#| msgid ""
-#| "%d expected program not found in PATH or not executable.\n"
-#| "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /"
-#| "sbin."
-#| msgid_plural ""
-#| "%d expected programs not found in PATH or not executable.\n"
-#| "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /"
-#| "sbin."
 msgid ""
 "Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /"
 "sbin."
 msgstr ""
-"%d programme attendu introuvable dans la variable PATH ou non exécutable.\n"
 "Note : la variable PATH du superutilisateur doit normalement contenir /usr/"
 "local/sbin, /usr/sbin et /sbin."
 
 #: src/help.c:188
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
+"le répertoire d'administration (admindir) doit être sous le répertoire "
+"d'installation (instdir) pour que dpkg fonctionne correctement"
 
-#: src/help.c:190 src/main.c:746
-#, fuzzy
-#| msgid "unable to setenv for maintainer script"
+#: src/help.c:190 src/main.c:747
 msgid "unable to setenv for subprocesses"
-msgstr "impossible d'utiliser « setenv » pour le script du responsable"
+msgstr "impossible d'utiliser « setenv » pour les sous-processus"
 
 #: src/help.c:192
 #, c-format
@@ -2990,75 +2977,75 @@
 msgstr "impossible de changer de répertoire racine pour « %.250s »"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "impossible de changer de répertoire vers « %.255s »"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "impossible de paramétrer les permissions en exécution sur « %.250s »"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "impossible d'utiliser « setenv » pour le script du responsable"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "script %s installé"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "impossible d'analyser %s « %.250s »"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "nouveau script %s"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "ancien script %s"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "impossible d'analyser %s « %.250s » : %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr ""
 "dpkg - tentative d'exécution du script du nouveau paquet à la place ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "il n'y a pas de script dans cette nouvelle version du paquet - abandon"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg : ... on dirait que tout a fonctionné correctement.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "impossible de supprimer « %.255s » de façon sûre"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
-msgstr ""
+msgstr "commande rm pour le nettoyage"
 
 #: src/infodb.c:52
 #, c-format
 msgid "unable to check existence of `%.250s'"
 msgstr "impossible de vérifier l'existence de « %.250s »"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "ne peut pas lire le répertoire info"
 
@@ -3140,7 +3127,7 @@
 "  -Dh|--debug=help                   Afficher l'aide sur le débogage\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3282,7 +3269,7 @@
 "Utilisez « dselect » ou « aptitude » pour gérer les paquets de manière plus "
 "conviviale.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3309,57 +3296,70 @@
 
 #: src/main.c:219
 msgid "Set all force options"
-msgstr ""
+msgstr "Utiliser le forçage (force) pour toutes les options"
 
 #: src/main.c:221
 msgid "Replace a package with a lower version"
-msgstr ""
+msgstr "Remplacer un paquet par une version inférieure"
 
 #: src/main.c:223
 msgid "Configure any package which may help this one"
-msgstr ""
+msgstr "Configurer tout paquet qui pourrait être utile à celui-ci"
 
 #: src/main.c:225
 msgid "Process incidental packages even when on hold"
-msgstr ""
+msgstr "Traiter les paquets incidents même s'ils sont à garder (on hold)"
 
 #: src/main.c:227
 msgid "Try to (de)install things even when not root"
-msgstr ""
+msgstr "Tenter d'installer ou désinstaller même sans être le superutilisateur"
 
 #: src/main.c:229
 msgid "PATH is missing important programs, problems likely"
 msgstr ""
+"des programmes importants sont absents dans PATH, des problèmes sont à "
+"prévoir"
 
 #: src/main.c:231
 msgid "Install a package even if it fails authenticity check"
-msgstr ""
+msgstr "Installer un paquet même si le contrôle d'authenticité échoue"
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+#, fuzzy
+#| msgid "Process even packages with wrong or no architecture"
+msgid "Process even packages with wrong versions"
 msgstr ""
+"Traiter les paquets même sans architecture ou avec une architecture "
+"incorrecte"
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
+msgid "Overwrite a file from one package with another"
+msgstr "Écraser un fichier d'un paquet par celui d'un autre"
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Écraser un fichier détourné pour une version non détournée"
 
 #: src/main.c:239
+msgid "Overwrite one package's directory with another's file"
+msgstr "Écraser le répertoire d'un paquet par le fichier d'un autre"
+
+#: src/main.c:241
 msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
+"Ne pas effectuer d'opérations d'entrée/sortie sûres lors de la décompression"
 
-#: src/main.c:241
+#: src/main.c:243
 msgid "Always use the new config files, don't prompt"
 msgstr ""
+"Toujours utiliser les nouveaux fichiers de configuration, ne pas demander"
 
-#: src/main.c:243
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
+"Toujours utiliser les anciens fichiers de configuration, ne pas demander"
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3367,154 +3367,159 @@
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given"
 msgstr ""
-
-#: src/main.c:251
-msgid "Always install missing config files"
-msgstr ""
+"Choisir l'option par défaut pour les nouveaux fichiers de\n"
+"     si elle existe, ne pas demander. S'il n'existe pas\n"
+"     d'option par défaut, la question sera posée à moins\n"
+"     que l'une des options « confold » ou « confnew » ne soit\\      "
+"utilisée."
 
 #: src/main.c:253
-msgid "Offer to replace config files with no new versions"
-msgstr ""
+msgid "Always install missing config files"
+msgstr "Toujours installer les fichiers de configuration manquants"
 
 #: src/main.c:255
-msgid "Process even packages with wrong or no architecture"
+msgid "Offer to replace config files with no new versions"
 msgstr ""
+"Proposer de remplacer les fichiers de configuration sans nouvelles versions"
 
 #: src/main.c:257
-msgid "Install even if it would break another package"
+msgid "Process even packages with wrong or no architecture"
 msgstr ""
+"Traiter les paquets même sans architecture ou avec une architecture "
+"incorrecte"
 
 #: src/main.c:259
-msgid "Allow installation of conflicting packages"
-msgstr ""
+msgid "Install even if it would break another package"
+msgstr "Installer même si cela casse un autre paquet"
 
 #: src/main.c:261
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "problème de dépendance - suppression ignorée"
+msgid "Allow installation of conflicting packages"
+msgstr "Autoriser l'installation de paquets en conflit"
 
 #: src/main.c:263
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "problème de dépendance - suppression ignorée"
+msgid "Turn all dependency problems into warnings"
+msgstr "Changer tous les problèmes de dépendances en avertissements "
 
 #: src/main.c:265
-msgid "Remove packages which require installation"
+msgid "Turn dependency version problems into warnings"
 msgstr ""
+"Changer tous les problèmes de dépendances de versions en avertissements "
 
 #: src/main.c:267
+msgid "Remove packages which require installation"
+msgstr "Supprimer les paquets qui ont besoin d'installation"
+
+#: src/main.c:269
 msgid "Remove an essential package"
-msgstr ""
+msgstr "Supprimer un paquet essentiel"
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
-msgstr ""
+msgstr "Informations de progression en général utiles"
 
-#: src/main.c:280
-#, fuzzy
-#| msgid "unable to setenv for maintainer script"
+#: src/main.c:282
 msgid "Invocation and status of maintainer scripts"
-msgstr "impossible d'utiliser « setenv » pour le script du responsable"
+msgstr "Lancement et état des scripts de maintenance"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
-msgstr ""
+msgstr "Affichage de chaque fichier traité"
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
-msgstr ""
+msgstr "Affichage verbeux pour chaque fichier traité"
 
-#: src/main.c:283
-#, fuzzy
-#| msgid "read error in configuration file `%.255s'"
+#: src/main.c:285
 msgid "Output for each configuration file"
-msgstr "erreur de lecture sur le fichier de configuration « %.255s »"
+msgstr "Affichage pour chaque fichier de configuration"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
-msgstr ""
+msgstr "Affichage verbeux pour chaque fichier de configuration"
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
-msgstr ""
+msgstr "Dépendances et conflits"
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
-msgstr ""
+msgstr "Affichage verbeux pour les dépendances et conflits"
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
-msgstr ""
+msgstr "Activation et traitement des actions différées"
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
-msgstr ""
+msgstr "Affichage verbeux pour les actions différées"
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
-msgstr ""
+msgstr "Affichage délirant pour les actions différées"
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
-msgstr ""
+msgstr "Beaucoup de bruit à propos p.ex. du répertoire dpkg/info"
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
-msgstr ""
+msgstr "Bruit délirant (NdT : n'importe quoi)"
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
 "\n"
 " Number  Ref. in source   Description\n"
 msgstr ""
+"%s option de débogage, --debug=<octal> or -D<octal>:\n"
+"\n"
+" Nombre  Réf. ds source   Description\n"
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
 "Debugging options can be mixed using bitwise-or.\n"
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
+"\n"
+"Les options de débogage peuvent être combinées avec un « or » (bitwise-or).\n"
+"Noter que les valeurs et leur signification peuvent changer.\n"
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug requiert un paramètre octal"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nom de paquet vide dans la liste « %.250s » d'éléments séparés par des "
 "virgules de --ignore-depends"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends requiert un nom de paquet légal. « %.250s » ne l'est pas ; "
 "%s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "entier incorrect pour --%s « %.250s »"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "erreur à l'exécution du point d'entrée (hook) « %s », code d'erreur %d"
 
-#: src/main.c:463
-#, fuzzy
-#| msgid "status"
+#: src/main.c:465
 msgid "status logger"
-msgstr "état"
+msgstr "journalisation de l'état"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3522,21 +3527,34 @@
 "  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
 " Forcing things:\n"
 msgstr ""
+"options de forçage de %s - contrôle les actions en cas de problème:\n"
+"  avertir et continuer :  --force-<option>,<option>,...\n"
+"  arrêter sur erreur :    --refuse-<option>,<option>,... | --no-force-"
+"<option>,...\n"
+" Ce qui peut être forcé:\n"
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
 "WARNING - use of options marked [!] can seriously damage your installation.\n"
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
+"\n"
+"AVERTISSEMENT - les options marquées avec [!] can seriously damage your "
+"installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+"ATTENTION : utiliser une option marquée [!] peut sérieusement endommager "
+"votre\n"
+"installation.\n"
+"Les options de forçage marquées [*] sont activées par défaut.\n"
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "option de forçage/refus « %.*s » inconnue"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "option de forçage/refus « %s » obsolète\n"
@@ -3559,8 +3577,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "EOF inattendu avant la fin de la ligne %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "requiert une option d'action"
 
@@ -3693,7 +3711,7 @@
 
 #: src/processarc.c:99
 msgid "split package reassembly"
-msgstr ""
+msgstr "réassemblage d'un paquet tronçonné"
 
 #: src/processarc.c:108
 msgid "reassembled package file"
@@ -3706,7 +3724,7 @@
 
 #: src/processarc.c:139
 msgid "package signature verification"
-msgstr ""
+msgstr "contrôle de la signature du paquet"
 
 #: src/processarc.c:146
 #, c-format
@@ -3727,93 +3745,91 @@
 msgid "passed\n"
 msgstr "réussi\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "impossible de créer un répertoire temporaire"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "le paquet %s a trop de paires Conflicts/Replaces"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "l'ancienne version du paquet a un nom de fichier d'information commençant "
 "par « %.250s » trop long"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "impossible de supprimer le fichier info obsolète « %.250s »"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "impossible d'installer le (supposé) nouveau fichier info « %.250s »"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "impossible d'ouvrir le répertoire de contrôle temporaire"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "le paquet contient un nom de fichier de contrôle trop long (commençant par "
 "« %.50s »)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "l'information de contrôle du paquet contient le répertoire « %.250s »"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "l'information de contrôle du paquet « rmdir » de « %.250s » ne dit pas que "
 "ce n'est pas un répertoire"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "le paquet %s contient une liste comme fichier d'information"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 "impossible d'installer le nouveau fichier info « %.250s » comme « %.250s »"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "impossible de supprimer le fichier info de contrôle « %.250s »"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "ne peut pas accéder à l'archive"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "impossible de créer un répertoire temporaire"
-
-#: src/processarc.c:411
-#, fuzzy
-#| msgid "control information length"
+#: src/processarc.c:433
 msgid "package control information extraction"
-msgstr "longueur de l'information de contrôle"
+msgstr "extraction de l'information de contrôle du paquet"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Enregistrement de l'information sur %s de %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr ""
 "l'architecture du paquet (%s) ne correspond pas à celle du système (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3822,105 +3838,103 @@
 "dpkg : concernant %s contenant %s, problème de pré-dépendance :\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "problème de pré-dépendance - %.250s non installé"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "problème de pré-dépendance ignoré"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Préparation du remplacement de %s %s (en utilisant %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Dépaquetage de %s (à partir de %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "le nom du conffile (commençant par « %.250s ») est trop long (>%d caractères)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "erreur de lecture dans %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "erreur de fermeture de %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "erreur survenue en essayant d'ouvrir %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Déconfiguration de %s, pour pouvoir supprimer %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Déconfiguration de %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Dépaquetage de la mise à jour de %.250s ...\n"
 
-#: src/processarc.c:807
-#, fuzzy
-#| msgid "dpkg-deb field extraction"
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
-msgstr "extraction de champ par dpkg-deb"
+msgstr "extraction de l'archive du système de fichiers du paquet"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "erreur de lecture sur la sortie du « tar » de dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "archive du système de fichiers corrompue - archive du paquet corrompue"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr ""
 "dpkg-deb : suppression de possibles zéros finaux (i.e. de « trailing »)"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "impossible d'analyser l'ancien fichier « %.250s ». Il n'a donc pas été "
 "effacé : %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "impossible de supprimer l'ancien répertoire  « %.250s » : %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "l'ancien fichier de configuration « %.250s » était un répertoire vide et a "
 "été supprimé"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "impossible d'analyser un autre nouveau fichier « %.250s »"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3929,12 +3943,12 @@
 "l'ancien fichier « %.250s » est identique à plusieurs  nouveaux fichiers (à "
 "la fois « %.250s » et « %.250s »)"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "impossible de supprimer l'ancien fichier « %.250s » de façon sûre : %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(À noter la disparition de %s, qui a été complètement remplacé.)\n"
@@ -4000,10 +4014,9 @@
 "--search a besoin d'au moins un motif de nom de fichier comme paramètre"
 
 #: src/querycmd.c:350
-#, fuzzy, c-format
-#| msgid "No packages found matching %s.\n"
+#, c-format
 msgid "%s: no path found matching pattern %s.\n"
-msgstr "Aucun paquet ne correspond à %s.\n"
+msgstr "%s : aucun chemin ne correspond à %s.\n"
 
 #: src/querycmd.c:393
 #, c-format
@@ -4068,18 +4081,7 @@
 "version %s\n"
 
 #: src/querycmd.c:619
-#, fuzzy, c-format
-#| msgid ""
-#| "Commands:\n"
-#| "  -s|--status <package> ...        Display package status details.\n"
-#| "  -p|--print-avail <package> ...   Display available version details.\n"
-#| "  -L|--listfiles <package> ...     List files `owned' by package(s).\n"
-#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
-#| "  -W|--show <pattern> ...          Show information on package(s).\n"
-#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-#| "  -c|--control-path <package> [<file>]\n"
-#| "                                   Print path for package control file.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Commands:\n"
 "  -s|--status <package> ...        Display package status details.\n"
@@ -4094,7 +4096,7 @@
 msgstr ""
 "Commandes :\n"
 "  -s|--status <nom-de-paquet> ...      affiche l'état du paquet en détail\n"
-"  -p|--print-avail <nom-de-paquet> ... affiche les version disponibles en\n"
+"  -p|--print-avail <nom-de-paquet> ... affiche les versions disponibles en\n"
 "                                       détail.\n"
 "  -L|--listfiles <nom-de-paquet> ...   liste les fichiers « possédés » par\n"
 "                                       le(s) paquet(s).\n"
@@ -4122,7 +4124,7 @@
 "  --showformat=<format>     Utiliser un formatage alternatif pour --show\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -4145,6 +4147,10 @@
 "  taille spécifiée ne soit négative, auquel cas un alignement à gauche\n"
 "  sera appliqué.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Utiliser --help pour de l'aide sur la recherche de paquets."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4203,7 +4209,7 @@
 msgid "Removing %s ...\n"
 msgstr "Suppression de %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4212,54 +4218,55 @@
 "lors de la suppression de %.250s, impossible de retirer « %.250s » : %s - "
 "peut-être le répertoire est-il un point de montage ?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "ne peut pas supprimer « %.250s »"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "impossible de supprimer « %.255s » de façon sûre."
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "lors de la suppression de %.250s, le répertoire « %.250s » n'était pas vide, "
 "donc il n'a pas été supprimé."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "ne peut pas supprimer « %.250s »"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Purge des fichiers de configuration de %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr ""
 "ne peut pas supprimer l'ancien fichier de configuration « %.250s » (= "
 "« %.250s »)"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 "ne peut pas lire le répertoire du fichier de configuration « %.250s » (de "
 "« %.250s »)"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "ne peut pas supprimer l'ancien fichier de configuration de secours "
 "« %.250s » (de « %.250s »)"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "ne peut pas supprimer la liste des anciens fichiers"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "ne peut pas supprimer l'ancien script « postrm »"
 
@@ -4302,7 +4309,13 @@
 msgid "read error on standard input"
 msgstr "erreur de lecture sur l'entrée standard"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "Utiliser --help pour de l'aide sur la recherche de paquets."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4311,7 +4324,7 @@
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4329,7 +4342,7 @@
 "  --list [<motif>]         liste les dérogations (« overrides ») actuelles\n"
 "                           dans la base de données.\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4352,31 +4365,31 @@
 "  --help                   afficher ce message d'aide.\n"
 "  --version                afficher la version.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "suppression du / final"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "impossible d'ouvrir le nouveau fichier statoverride"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "erreur de suppression de statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "erreur pendant la création du nouveau statoverride-old"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "erreur d'installation du nouveau statoverride"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add a besoin de quatre paramètres"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4385,21 +4398,21 @@
 "Une dérogation (« override ») pour « %s » existe déjà mais --force a été "
 "spécifié. Il sera donc ignoré."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Une dérogation pour « %s » existe déjà, Abandon."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "--update spécifié, mais %s n'existe pas"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Pas de dérogation (« override ») présente."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update est inutile pour --remove"
 
@@ -4448,10 +4461,9 @@
 msgstr "échec de « fstat » sur l'ancien fichier des permissions (statoverride)"
 
 #: src/statdb.c:162
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
+#, c-format
 msgid "reading statoverride file '%.250s'"
-msgstr "le fichier des permissions « %.250s »"
+msgstr "lecture du fichier des permissions « %.250s »"
 
 #: src/statdb.c:169
 msgid "statoverride file is missing final newline"
@@ -4476,17 +4488,17 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "forçages d'état (statusoverrides) multiples pour le fichier « %.250s »"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Taper « dpkg-trigger --help » pour obtenir de l'aide."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr ""
 "Outil d'actions différées (« triggers ») du paquet Debian %s, version %s\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4497,7 +4509,7 @@
 "       %s [<options> ...] <commande>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4510,7 +4522,7 @@
 "                                   les actions différées (« triggers »).\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4534,41 +4546,36 @@
 "                                    aucun changement.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 "%s : répertoire pour les données d'actions différées (« triggers ») pas "
 "encore créé \n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 "%s : registre des actions différées (« triggers ») pas encore présent\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr ""
 "a besoin d'un seul paramètre , le nom de l'action différée (« trigger »)"
 
-#: src/trigcmd.c:211
-#, fuzzy
-#| msgid ""
-#| "dpkg-trigger must be called from a maintainer script (or with a --by-"
-#| "package option)"
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
-"« dpkg-trigger » doit être appelé depuis un script de mainteneur ( ou avec "
-"l'option « --by-package »)"
+"doit être appelé depuis un script du responsable (ou avec l'option « --by-"
+"package »)"
 
-#: src/trigcmd.c:216
-#, fuzzy, c-format
-#| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
+#: src/trigcmd.c:215
+#, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
-msgstr "« dpkg-trigger » : nom de paquet illégal « %.250s » : « %.250s »"
+msgstr "nom de paquet attendu illégal « %.250s » : « %.250s »"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "nom d'action différée non valable « %.250s » : « %.250s »"
@@ -4604,41 +4611,42 @@
 msgstr "Traitement des actions différées (« triggers ») pour « %s »...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s a besoin d'exactement un fichier « Packages »"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "impossible d'accéder à la zone des états de dpkg pour une mise à jour massive"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "une mise à jour massive requiert un accès en écriture dans la zone des états "
 "de dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr ""
 "Remplacement de l'information sur les paquets disponibles, en utilisant %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr ""
 "Mise à jour de l'information sur les paquets disponibles, en utilisant %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "L'information sur %d paquet a été mise à jour.\n"
 msgstr[1] "L'information sur %d paquets a été mise à jour.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4759,8 +4767,8 @@
 msgstr[0] "%d avertissement ignoré sur le(s) fichier(s) « control »\n"
 msgstr[1] "%d avertissements ignorés sur le(s) fichier(s) « control »\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s a besoin d'un paramètre <répertoire>"
@@ -4794,63 +4802,53 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb : construction du paquet « %s » dans « %s ».\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
-#, fuzzy, c-format
-#| msgid "failed to make tmpfile (data)"
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
+#, c-format
 msgid "failed to make temporary file (%s)"
-msgstr "échec de la création d'un fichier temporaire (« data »)"
+msgstr "échec de la création d'un fichier temporaire (%s)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
-#, fuzzy
-#| msgid "control area"
 msgid "control member"
-msgstr "zone de contrôle"
+msgstr "élément de contrôle"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
-#, fuzzy, c-format
-#| msgid "failed to unlink tmpfile (data), %s"
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
+#, c-format
 msgid "failed to unlink temporary file (%s), %s"
-msgstr "impossible de délier un fichier temporaire (« data »), %s"
+msgstr "impossible de délier un fichier temporaire (%s), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
-#, fuzzy, c-format
-#| msgid "failed to rewind tmpfile (data)"
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
+#, c-format
 msgid "failed to rewind temporary file (%s)"
-msgstr "échec de « rewind » sur un fichier temporaire (« data »)"
+msgstr "échec de « rewind » sur un fichier temporaire (%s)"
 
 #: dpkg-deb/build.c:494
-#, fuzzy, c-format
-#| msgid "failed to fstat ar member file (%s)"
+#, c-format
 msgid "failed to stat temporary file (%s)"
-msgstr "échec de « fstat » sur un membre d'un fichier ar (%s)"
+msgstr "échec de « stat » sur un fichier temporaire (%s)"
 
 #: dpkg-deb/build.c:498
 #, c-format
 msgid "error writing `%s'"
 msgstr "erreur lors de l'écriture de « %s »"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
-#, fuzzy
-#| msgid "between members"
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 msgid "data member"
-msgstr "entre éléments"
+msgstr "élément de données"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
-#, fuzzy, c-format
-#| msgid "failed to write filename to tar pipe (data)"
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
+#, c-format
 msgid "failed to write filename to tar pipe (%s)"
-msgstr ""
-"l'écriture d'un nom de fichier à travers un tube tar (« data ») a échoué"
+msgstr "l'écriture d'un nom de fichier à travers un tube tar (« %s ») a échoué"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<compress> depuis tar -cf"
 
 #: dpkg-deb/extract.c:61 dpkg-deb/extract.c:63
 msgid "shell command to move files"
-msgstr ""
+msgstr "processeur de commandes pour déplacer des fichiers"
 
 #: dpkg-deb/extract.c:70
 #, c-format
@@ -4862,122 +4860,106 @@
 msgid "error reading %s from file %.255s"
 msgstr "erreur de lecture de %s depuis le fichier %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "impossible de lire l'archive « %.255s »"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "échec de « fstat » sur l'archive"
 
-#: dpkg-deb/extract.c:130
-#, fuzzy
-#| msgid "archive has no dot in version number"
+#: dpkg-deb/extract.c:131
 msgid "archive magic version number"
-msgstr "l'archive n'a pas de point dans le numéro de la version"
+msgstr "numéro magique de version de l'archive"
 
-#: dpkg-deb/extract.c:142
-#, fuzzy
-#| msgid "archive has no newlines in header"
+#: dpkg-deb/extract.c:143
 msgid "archive member header"
-msgstr "l'archive n'a pas de saut de ligne dans l'en-tête"
+msgstr "en-tête de l'élément de l'archive"
 
-#: dpkg-deb/extract.c:147
-#, fuzzy, c-format
-#| msgid "file `%.250s' is corrupt - bad part number"
+#: dpkg-deb/extract.c:148
+#, c-format
 msgid "file '%.250s' is corrupt - bad archive header magic"
-msgstr "le fichier « %.250s » est corrompu - mauvais nombre de parties"
+msgstr ""
+"le fichier « %.250s » est corrompu - mauvais nombre magique d'en-tête "
+"d'archive"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "le fichier « %.250s » n'est pas une archive binaire Debian (essayer dpkg-"
 "split ?)"
 
-#: dpkg-deb/extract.c:158
-#, fuzzy
-#| msgid "archive has no dot in version number"
+#: dpkg-deb/extract.c:159
 msgid "archive information header member"
-msgstr "l'archive n'a pas de point dans le numéro de la version"
+msgstr "élément en-tête d'information de l'archive"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "l'archive n'a pas de saut de ligne dans l'en-tête"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "l'archive n'a pas de point dans le numéro de la version"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "version %.250s de l'archive non comprise, récupérer une version plus récente "
 "de dpkg-deb"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
-#, fuzzy, c-format
-#| msgid "skipped member data from %s"
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
+#, c-format
 msgid "skipped archive member data from %s"
-msgstr "données membres de %s ignorées"
+msgstr "élément de données d'archive ignorées dans %s"
 
-#: dpkg-deb/extract.c:193
-#, fuzzy, c-format
-#| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
+#: dpkg-deb/extract.c:194
+#, c-format
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
-"le fichier « %.250s » contient l'élément de données non compris (%.*s), "
-"abandon"
+"l'archive « %.250s » contient l'élément de données non compris %.*s, Abandon"
 
-#: dpkg-deb/extract.c:198
-#, fuzzy, c-format
-#| msgid "file `%.250s' contains two control members, giving up"
+#: dpkg-deb/extract.c:199
+#, c-format
 msgid "archive '%.250s' contains two control members, giving up"
-msgstr "le fichier « %.250s » contient deux éléments de contrôle, abandon"
+msgstr "l'archive « %.250s » contient deux éléments de contrôle. Abandon"
 
-#: dpkg-deb/extract.c:213
-#, fuzzy, c-format
-#| msgid ""
-#| " new debian package, version %s.\n"
-#| " size %ld bytes: control archive= %zi bytes.\n"
+#: dpkg-deb/extract.c:214
+#, c-format
 msgid ""
 " new debian package, version %s.\n"
 " size %jd bytes: control archive= %jd bytes.\n"
 msgstr ""
 " nouveau paquet Debian, version %s.\n"
-" taille %ld octets : archive de contrôle = %zi octets.\n"
+" taille %jd octets : archive de contrôle = %jd octets.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
-msgstr ""
+msgstr "taille de l'élément de contrôle de l'archive"
 
-#: dpkg-deb/extract.c:234
-#, fuzzy, c-format
-#| msgid "archive has malformatted control length `%s'"
+#: dpkg-deb/extract.c:235
+#, c-format
 msgid "archive has malformatted control member size '%s'"
-msgstr "l'archive possède une information de contrôle « %s » mal formée"
+msgstr ""
+"l'archive possède une information de contrôle de taille « %s » mal formée"
 
-#: dpkg-deb/extract.c:241
-#, fuzzy, c-format
-#| msgid "skipped member data from %s"
+#: dpkg-deb/extract.c:242
+#, c-format
 msgid "skipped archive control member data from %s"
-msgstr "données membres de %s ignorées"
+msgstr "données de l'élément de contrôle de l'archive dans %s ignorées"
 
-#: dpkg-deb/extract.c:245
-#, fuzzy, c-format
-#| msgid ""
-#| " old debian package, version %s.\n"
-#| " size %ld bytes: control archive= %zi, main archive= %ld.\n"
+#: dpkg-deb/extract.c:246
+#, c-format
 msgid ""
 " old debian package, version %s.\n"
 " size %jd bytes: control archive= %jd, main archive= %jd.\n"
 msgstr ""
 " ancien paquet Debian, version %s.\n"
-" taille %ld octets : archive de contrôle= %zi, archive principale= %ld.\n"
+" taille %jd octets : archive de contrôle= %jd, archive principale= %jd.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4986,49 +4968,50 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s » n'est pas une archive de format Debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "impossible d'écrire dans le tube pour copie"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "impossible de fermer le tube en copie"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "données"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "échec de « chdir » vers le répertoire"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "impossible de créer le répertoire"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 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:293
-msgid "failed to chdir to directory"
-msgstr "échec de « chdir » vers le répertoire"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<decompress>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "coller"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s a besoin d'un fichier .deb comme paramètre"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -5037,99 +5020,97 @@
 "--%s a besoin d'un répertoire cible.\n"
 "Peut-être devriez-vous utiliser dpkg --install ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s a besoin d'un seul paramètre (nom de fichier .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "échec de « chdir » vers « / » pour nettoyage"
 
-#: dpkg-deb/info.c:109
-#, fuzzy, c-format
-#| msgid "cannot stat file '%s'"
+#: dpkg-deb/info.c:106
+#, c-format
 msgid "control file '%s'"
-msgstr "analyse impossible du fichier « %s »"
+msgstr "fichier de contrôle « %s »"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr ""
 "dpkg-deb : « %.255s » ne contient pas de composant de contrôle « %.255s »\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "échec de l'ouverture du composant « %.255s » (dans %.255s) d'une manière "
 "inattendue"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "%d composant de contrôle nécessaire manque"
 msgstr[1] "%d composants de contrôle nécessaires manquent"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "ne peut pas parcourir le répertoire « %.255s »"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "ne peut pas analyser « %.255s » (dans « %.255s »)"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "ne peut pas ouvrir « %.255s » (dans « %.255s »)"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "échec de la lecture « %.255s » (dans « %.255s »)"
 
-#: dpkg-deb/info.c:167
-#, fuzzy, c-format
-#| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
+#: dpkg-deb/info.c:170
+#, c-format
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
-msgstr " %7ld octets, %5d lignes   %c  %-20.127s %.127s\n"
+msgstr " %7jd octets, %5d lignes   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     n'est pas un simple fichier          %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(pas de fichier « control » dans l'archive de contrôle !)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "ne peut pas ouvrir le composant « control »"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "échec survenu pendant la lecture du composant « control »"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "erreur pendant la fermeture du composant « %s »"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Erreur dans le format"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents prend exactement un paramètre"
 
@@ -5139,7 +5120,19 @@
 msgstr "Outil %s de gestion en arrière-plan des archives Debian, version %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -5150,6 +5143,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -5168,7 +5163,7 @@
 "   --fsys-tarfile <deb>              Restituer le système de fichiers\n"
 "                                     de l'archive tar.\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -5181,11 +5176,27 @@
 "<cfield> est le nom d'un champ dans le fichier « control » principal.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5209,7 +5220,7 @@
 "                         Valeurs possibles : gzip, xz, bzip2, lzma, none.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5224,7 +5235,7 @@
 "Les paquets dépaquetés en utilisant « dpkg-deb --extract » seront\n"
 "incorrectement installés.\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5234,17 +5245,17 @@
 "Taper dpkg --help pour obtenir une aide sur l'installation et la "
 "désinstallation des paquets."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "entier incorrect pour --%c ; « %.250s »"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "format de compression non valable pour -%c : %ld"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "type de compression %s inconnu"
@@ -5265,7 +5276,7 @@
 msgstr ""
 "le fichier « %.250s » est corrompu - saut de ligne après %.250s manquant"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "erreur de lecture sur %.250s"
@@ -5322,67 +5333,64 @@
 
 #: dpkg-split/info.c:134 dpkg-split/info.c:135
 msgid "archive total size"
-msgstr ""
+msgstr "taille totale de l'archive"
 
 #: dpkg-split/info.c:136 dpkg-split/info.c:137
-#, fuzzy
-#| msgid "part offset"
 msgid "archive part offset"
-msgstr "décalage de la partie"
+msgstr "décalage de la partie d'archive"
 
 #: dpkg-split/info.c:139
-#, fuzzy
-#| msgid "part numbers"
 msgid "archive part numbers"
-msgstr "numéros des parties"
+msgstr "numéros des parties d'archive"
 
 #: dpkg-split/info.c:142
-#, fuzzy, c-format
-#| msgid "file `%.250s' is corrupt - no slash between part numbers"
+#, c-format
 msgid "file '%.250s' is corrupt - no slash between archive part numbers"
 msgstr ""
 "le fichier « %.250s » est corrompu - pas de barre oblique entre les numéros "
-"de parties"
+"de parties d'archive"
 
 #: dpkg-split/info.c:145
-#, fuzzy
-#| msgid "number of parts"
 msgid "number of archive parts"
-msgstr "nombre de parties"
+msgstr "nombre de parties d'archive"
 
 #: dpkg-split/info.c:147
-#, fuzzy, c-format
-#| msgid "file '%.250s' is corrupt - bad number of parts"
+#, c-format
 msgid "file '%.250s' is corrupt - bad number of archive parts"
-msgstr "le fichier « %.250s » est corrompu - mauvais nombre de parties"
+msgstr ""
+"le fichier « %.250s » est corrompu - mauvais nombre de parties d'archive"
 
 #: dpkg-split/info.c:149
-#, fuzzy
-#| msgid "parts number"
 msgid "archive parts number"
-msgstr "numéro des parties"
+msgstr "numéro des parties d'archive"
 
 #: dpkg-split/info.c:151
-#, fuzzy, c-format
-#| msgid "file `%.250s' is corrupt - bad part number"
+#, c-format
 msgid "file '%.250s' is corrupt - bad archive part number"
-msgstr "le fichier « %.250s » est corrompu - mauvais nombre de parties"
+msgstr ""
+"le fichier « %.250s » est corrompu - mauvais nombre de parties d'archive"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "nom du paquet"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "le fichier « %.250s » est corrompu - mauvais « magic » à la fin de la "
 "section d'en-tête"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "le fichier « %.250s » est corrompu - le deuxième élément n'est pas un "
 "élément de données"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
@@ -5390,34 +5398,34 @@
 "tailles\n"
 "citées"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "le fichier « %.250s » est corrompu - mauvaise taille du nombre de parties "
 "citées"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "impossible d'exécuter « fstat » sur le fichier « %.250s »"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "le fichier « %.250s » est corrompu - trop court"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "ne peut pas ouvrir le fichier « %.250s » de l'archive"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "le fichier « %.250s » n'est pas une partie de l'archive"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5425,18 +5433,19 @@
 #| "    Part of package:                %s\n"
 #| "        ... version:                %s\n"
 #| "        ... MD5 checksum:           %s\n"
-#| "        ... length:                 %lu bytes\n"
-#| "        ... split every:            %lu bytes\n"
+#| "        ... length:                 %jd bytes\n"
+#| "        ... split every:            %jd bytes\n"
 #| "    Part number:                    %d/%d\n"
-#| "    Part length:                    %zi bytes\n"
-#| "    Part offset:                    %lu bytes\n"
-#| "    Part file size (used portion):  %lu bytes\n"
+#| "    Part length:                    %jd bytes\n"
+#| "    Part offset:                    %jd bytes\n"
+#| "    Part file size (used portion):  %jd bytes\n"
 #| "\n"
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5451,20 +5460,28 @@
 "    Partie du paquet :                             %s\n"
 "        ... version :                              %s\n"
 "        ... code de contrôle MD5 :                 %s\n"
-"        ... longueur :                             %lu octets\n"
-"        ... coupé tous les :                       %lu octets\n"
+"        ... longueur :                             %jd octets\n"
+"        ... coupé tous les :                       %jd octets\n"
 "    Numéro de partie :                             %d/%d\n"
-"    Longueur de la partie :                        %zi octets\n"
-"    Décalage de la partie :                        %lu octets\n"
-"    Taille du fichier (portion utilisée) :         %lu octets\n"
+"    Longueur de la partie :                        %jd octets\n"
+"    Décalage de la partie :                        %jd octets\n"
+"    Taille du fichier (portion utilisée) :         %jd octets\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgctxt "section"
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<inconnu>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s requiert un ou plusieurs fichiers de parties comme paramètres"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "le fichier « %s » n'est pas une partie d'archive\n"
@@ -5487,19 +5504,14 @@
 msgstr "impossible de (r)ouvrir le fichier d'entrée « %.250s »"
 
 #: dpkg-split/join.c:58
-#, fuzzy
-#| msgid "Skipping deselected package %s.\n"
 msgid "skipping split package header"
-msgstr "Paquet désélectionné %s ignoré.\n"
+msgstr "en-tête de paquet découpé ignoré"
 
 #: dpkg-split/join.c:59
-#, fuzzy
-#| msgid "Putting package %s together from %d part: "
-#| msgid_plural "Putting package %s together from %d parts: "
 msgid "split package part"
-msgstr "Assemblage du paquet %s à partir de %d partie :"
+msgstr "partie d'un paquet découpé"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "fait\n"
@@ -5554,17 +5566,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Options :\n"
 "   --depotdir <répertoire>  (par défaut %s %s)\n"
@@ -5576,20 +5597,29 @@
 "\n"
 "Code de sortie : 0 = OK ;  1 = -a n'est pas une partie ;  2 = problème !\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Taper dpkg-split --help pour obtenir de l'aide."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fin de fichier inattendue dans %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "taille de partie beaucoup trop grande ou négative"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -5630,7 +5660,7 @@
 
 #: dpkg-split/queue.c:184
 msgid "extracting split part"
-msgstr ""
+msgstr "extraction de la partie"
 
 #: dpkg-split/queue.c:192
 #, c-format
@@ -5662,10 +5692,9 @@
 msgstr "impossible d'analyser « %.250s »"
 
 #: dpkg-split/queue.c:243
-#, fuzzy, c-format
-#| msgid " %s (%lu bytes)\n"
+#, c-format
 msgid " %s (%jd bytes)\n"
-msgstr " %s (%lu octets)\n"
+msgstr " %s (%jd octets)\n"
 
 #: dpkg-split/queue.c:245
 #, c-format
@@ -5687,10 +5716,9 @@
 msgstr "le fichier partie « %.250s » n'est pas un simple fichier"
 
 #: dpkg-split/queue.c:278
-#, fuzzy, c-format
-#| msgid "(total %lu bytes)\n"
+#, c-format
 msgid "(total %jd bytes)\n"
-msgstr "(%lu octets au total)\n"
+msgstr "(%jd octets au total)\n"
 
 #: dpkg-split/queue.c:304
 #, c-format
@@ -5702,46 +5730,45 @@
 msgid "Deleted %s.\n"
 msgstr "%s supprimé.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
-#, fuzzy
-#| msgid "dpkg-deb field extraction"
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
-msgstr "extraction de champ par dpkg-deb"
+msgstr "extraction de la valeur du champ"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "impossible d'ouvrir le fichier source « %.250s »"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "impossible de « fstat » le fichier source"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "le fichier source « %.250s » n'est pas un simple fichier"
 
-#: dpkg-split/split.c:151
-#, fuzzy, c-format
-#| msgid "Putting package %s together from %d part: "
-#| msgid_plural "Putting package %s together from %d parts: "
+#: dpkg-split/split.c:153
+#, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
-msgstr[0] "Assemblage du paquet %s à partir de %d partie :"
-msgstr[1] "Assemblage du paquet %s à partir de %d parties :"
+msgstr[0] "Découpage du paquet %s en %d partie :"
+msgstr[1] "Découpage du paquet %s en %d parties :"
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
+"L'en-tête est trop long, ce qui rend la partie trop longue. Le nom du "
+"paquet\n"
+"ou le numéro de version doit être particulièrement long. Abandon.\n"
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split a besoin d'un nom de fichier source comme paramètre"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "--split prend au plus un nom de fichier source et un préfixe de destination"
@@ -5758,51 +5785,7 @@
 "Copyright (C) 2009-2010 Raphael Hertzog.\n"
 
 #: utils/update-alternatives.c:101
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [<option> ...] <command>\n"
-#| "\n"
-#| "Commands:\n"
-#| "  --install <link> <name> <path> <priority>\n"
-#| "    [--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"
-#| "  --auto <name>            switch the master link <name> to automatic "
-#| "mode.\n"
-#| "  --display <name>         display information about the <name> group.\n"
-#| "  --query <name>           machine parseable version of --display "
-#| "<name>.\n"
-#| "  --list <name>            display all targets of the <name> group.\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 %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"
-#| "  automatic mode.\n"
-#| "\n"
-#| "Options:\n"
-#| "  --altdir <directory>     change the alternatives directory.\n"
-#| "  --admindir <directory>   change the administrative directory.\n"
-#| "  --skip-auto              skip prompt for alternatives correctly "
-#| "configured\n"
-#| "                           in automatic mode (relevant for --config "
-#| "only)\n"
-#| "  --verbose                verbose operation, more output.\n"
-#| "  --quiet                  quiet operation, minimal output.\n"
-#| "  --help                   show this help message.\n"
-#| "  --version                show the version.\n"
+#, c-format
 msgid ""
 "Commands:\n"
 "  --install <link> <name> <path> <priority>\n"
@@ -5824,8 +5807,6 @@
 "  --all                    call --config on all alternatives.\n"
 "\n"
 msgstr ""
-"Syntaxe : %s [<option> ...] <commande>\n"
-"\n"
 "Commandes :\n"
 "  --install <lien> <nom> <chemin> <priorité>\n"
 "    [--slave <lien> <nom> <chemin>] ...\n"
@@ -5841,6 +5822,10 @@
 "  --query <nom>            version analysable automatiquement de --display "
 "<nom>.\n"
 "  --list <nom>             afficher toutes les cibles du groupe <nom>.\n"
+"  --get-selections         afficher les noms principaux d'alternatives et "
+"leur état.\n"
+"  --set-selections         lire l'état des alternatives depuis l'entrée "
+"standard.\n"
 "  --config <nom>           afficher l'alternative pour le groupe <nom> et "
 "demande à\n"
 "                           l'utilisateur de sélectionner celle qu'il veut "
@@ -5849,23 +5834,6 @@
 "<nom>.\n"
 "  --all                    exécuter --config pour toutes les alternatives.\n"
 "\n"
-"<lien> est le lien symbolique pointant vers %s/<nom>.\n"
-"  (par exemple, /usr/bin/pager)\n"
-"<nom> est le nom principal pour ce groupe de liens.\n"
-"  (par exemple, pager)\n"
-"<chemin> est l'emplacement de l'un des fichiers cibles alternatifs.\n"
-"  (par exemple, /usr/bin/less)\n"
-"<priorité> est un entier ; les options avec des nombres élevés ont une "
-"priorité\n"
-"  supérieure en mode automatique.\n"
-"\n"
-"Options :\n"
-"  --altdir <répertoire>    changer le répertoire d'alternatives.\n"
-"  --admindir <répertoire>  changer le répertoire d'administration.\n"
-"  --verbose                opération détaillée, plus d'affichage.\n"
-"  --quiet                  opération discrète, affichage minimal.\n"
-"  --help                   afficher ce message d'aide.\n"
-"  --version                afficher la version.\n"
 
 #: utils/update-alternatives.c:120
 #, c-format
@@ -5881,18 +5849,19 @@
 "  automatic mode.\n"
 "\n"
 msgstr ""
+"<lien> est le lien symbolique pointant vers %s/<nom>.\n"
+"  (par exemple, /usr/bin/pager)\n"
+"<nom> est le nom principal pour ce groupe de liens.\n"
+"  (par exemple, pager)\n"
+"<chemin> est l'emplacement de l'un des fichiers cibles alternatifs.\n"
+"  (par exemple, /usr/bin/less)\n"
+"<priorité> est un entier ; les options avec des nombres élevés ont une "
+"priorité\n"
+"  supérieure en mode automatique.\n"
+"\n"
 
 #: utils/update-alternatives.c:131
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  --admindir <directory>   set the directory with the statoverride file.\n"
-#| "  --update                 immediately update file permissions.\n"
-#| "  --force                  force an action even if a sanity check fails.\n"
-#| "  --quiet                  quiet operation, minimal output.\n"
-#| "  --help                   show this help message.\n"
-#| "  --version                show the version.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -5908,136 +5877,103 @@
 "  --version                show the version.\n"
 msgstr ""
 "Options :\n"
-"  --admindir <répertoire>  positionne le répertoire avec le fichier des\n"
-"                           permissions (statoverride).\n"
-"  --update                 mettre à jour le fichier des permissions\n"
-"                           immédiatement.\n"
-"  --force                  forcer une action si un contrôle de cohérence\n"
-"                           échoue.\n"
+"  --altdir <répertoire>    changer le répertoire d'alternatives.\n"
+"  --admindir <répertoire>  changer le répertoire d'administration.\n"
+"  --log <fichier>          nom du fichier de journalisation.\n"
+"  --force                  autoriser le remplacement de fichiers par"
+"\\                             des liens d'alternatives.\n"
+"  --skip-auto              ignorer la demande pour les alternatives\n"
+"                            correctement configurées en mode automatique\n"
+"                            (uniquement pertinent pour --config)\n"
+"  --verbose                opération détaillée, plus d'affichage.\n"
 "  --quiet                  opération discrète, affichage minimal.\n"
 "  --help                   afficher ce message d'aide.\n"
 "  --version                afficher la version.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "erreur"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "avertissement"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "analyse impossible de %s : %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "readlink(%s) a échoué : %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "deux commandes spécifiées : --%s et --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "impossible d'ajouter à %s : %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "échec de l'analyse de %s : %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "échec de l'exécution de %s : %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "impossible de faire de %s un lien symbolique vers %s : %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "impossible d'installer %s en tant que %s : %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "impossible de supprimer %s : %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "fin de fichier inattendue lors de la lecture de %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "lors de la lecture de %s : %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "ligne non terminée lors de la lecture de %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s corrompu : %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 "Les retours chariot sont interdits dans des fichiers update-alternatives (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "lors de l'écriture de %s : %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "nom du secondaire"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
-#, fuzzy, c-format
-#| msgid "duplicate slave %s"
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
+#, c-format
 msgid "duplicate slave name %s"
-msgstr "%s secondaire dupliqué"
+msgstr "%s est un nom secondaire dupliqué"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "lien secondaire"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "lien secondaire identique au lien principal %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "lien secondaire dupliqué %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "ficher maître"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "chemin dupliqué %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -6046,130 +5982,115 @@
 "l'alternative %s (qui fait partie du groupe de liens %s) n'a pas été "
 "trouvée. Suppression de la liste des alternatives."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "priorité"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "fichier secondaire"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "priorité de %s : %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "impossible de lire %s : %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "état"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "état non valable"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "lien maître"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "impossible de fermer %s : %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "abandon du lien secondaire obsolète %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "impossible d'écrire %s : %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "mode automatique"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "mode manuel"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr " le lien pointe actuellement sur %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr " le lien est actuellement absent"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - priorité %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr " lien secondaire %s : %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "La « meilleure » version actuelle est « %s »."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Aucune version disponible."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "Il existe %d choix pour l'alternative %s (qui fournit %s)."
 msgstr[1] "Il existe %d choix pour l'alternative %s (qui fournit %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Sélection"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Chemin"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Priorité"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "État"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Appuyez sur <Entrée> pour conserver la valeur par défaut[*] ou choisissez le "
 "numéro sélectionné :"
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "%s ne sera pas remplacé par un lien."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "impossible d'installer le choix inconnu %s"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -6178,99 +6099,157 @@
 "création de %s abandonnée car le fichier associé %s (du groupe de liens %s) "
 "n'existe pas."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "%s ne sera pas remplacé par un lien."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Appeler %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 "L'alternative %s n'a pas été modifiée car le choix %s n'est pas disponible."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Alternative inconnue « %s » ignorée."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "ligne trop longue ou non terminée lors de la lecture de %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Ligne non valable sautée : %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "Renommage du lien %s de %s en %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "Renommage du lien secondaire %s de %s vers %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+"le nom alternatif (%s) ne doit pas contenir le caractère « / » ou des "
+"espaces."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "le lien alternatif n'est pas absolu alors qu'il devrait l'être : %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "le chemin alternatif n'est pas absolu alors qu'il devrait l'être : %s"
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr ""
+"l'alternative %s ne peut pas être principale : elle est un secondaire de %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "le lien alternatif %s est déjà géré par %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "le chemin alternatif %s n'existe pas."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "l'alternative %s ne peut pas être secondaire de %s : %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: it is a slave of %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr ""
+"l'alternative %s ne peut pas être principale : elle est un secondaire de %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "le lien alternatif %s est déjà géré par %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "paramètre inconnu « %s »"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install a besoin de <lien> <nom> <chemin> <priorité>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<link> et <path> ne peuvent être les mêmes"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "la priorité doit être un entier"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s a besoin de <nom> <chemin>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s a besoin de <nom>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave n'est autorisé qu'avec --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave a besoin de <lien> <nom> <chemin>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "le nom %s est à la fois principal et secondaire"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "le lien %s est à la fois principal et secondaire"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s a besoin d'un paramètre <file>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "option « %s » inconnue"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -6278,137 +6257,82 @@
 "a besoin de --display, --query, --list, --get-selections, --config, --set, --"
 "set-selections, --install, --remove, --all, --remove-all ou --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "l'alternative %s ne peut pas être principale : %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "le lien alternatif %s est déjà géré par %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "le lien alternatif n'est pas absolu alors qu'il devrait l'être : %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "le chemin alternatif n'est pas absolu alors qu'il devrait l'être : %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "le chemin alternatif %s n'existe pas."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-"le nom alternatif (%s) ne doit pas contenir le caractère « / » ou des "
-"espaces."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "est une alternative principale"
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "c'est un lien secondaire de %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "l'alternative %s ne peut pas être secondaire de %s : %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<entrée standard>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "pas d'alternatives pour %s."
 
-#: utils/update-alternatives.c:2342
-#, fuzzy, c-format
-#| msgid "%s is dangling, it will be updated with best choice."
+#: utils/update-alternatives.c:2530
+#, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
-"%s pointe dans le vide et sera mis à jour avec le choix le plus adapté."
+"%s/%s pointe dans le vide et sera mis à jour avec le choix le plus adapté."
 
-#: utils/update-alternatives.c:2346
-#, fuzzy, c-format
-#| msgid ""
-#| "%s has been changed (manually or by a script). Switching to manual "
-#| "updates only."
+#: utils/update-alternatives.c:2534
+#, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
 "updates only."
 msgstr ""
-"%s a été changé (manuellement ou par un script). Bascule vers des mises à "
+"%s/%s a été changé (manuellement ou par un script). Bascule vers des mises à "
 "jour manuelles uniquement."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "configuration de la sélection automatique pour %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "l'alternative %s pour %s n'est pas enregistrée, pas de configuration."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Il n'existe aucun programme fournissant %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Rien à configurer."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Il n'existe qu'une « alternative » dans le groupe de liens %s : %s."
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "l'alternative %s pour %s n'est pas enregistrée, pas de suppression."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "suppression de l'alternative sélectionnée manuellement - bascule de %s vers "
 "le mode automatique"
 
-#: utils/update-alternatives.c:2429
-#, fuzzy, c-format
-#| msgid "automatic updates of %s are disabled, leaving it alone."
+#: utils/update-alternatives.c:2617
+#, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
-msgstr "les mises à jour automatiques de %s sont désactivées, conservation."
+msgstr "les mises à jour automatiques de %s/%s sont désactivées, conservation."
 
-#: utils/update-alternatives.c:2431
-#, fuzzy, c-format
-#| msgid "to return to automatic updates use `update-alternatives --auto %s'."
+#: utils/update-alternatives.c:2619
+#, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
-msgstr ""
-"pour revenir aux mises à jour automatiques, utilisez « update-alternatives --"
-"auto %s »."
+msgstr "pour revenir aux mises à jour automatiques, utiliser « %s --auto %s »."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "utilisation de « %s » pour fournir « %s » (%s) en %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
@@ -6416,13 +6340,49 @@
 "forçage de la réinstallation de l'alternative %s car le groupe de liens %s "
 "est cassé"
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "l'alternative actuelle %s est inconnue, bascule vers %s pour le groupe de "
 "liens %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "est une alternative principale"
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "c'est un lien secondaire de %s"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "analyse impossible de %s : %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "readlink(%s) a échoué : %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "échec de l'analyse de %s : %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "échec de l'exécution de %s : %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "impossible de faire de %s un lien symbolique vers %s : %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "impossible d'installer %s en tant que %s : %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "lors de l'écriture de %s : %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "impossible de lire %s : %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "impossible de fermer %s : %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "impossible d'écrire %s : %s"
+
 #, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6711,9 +6671,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "saut de la zone de contrôle à partir de %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "impossible d'exécuter « tar »"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "impossible de créer un répertoire temporaire"
 
diff -uNr --exclude .git --exclude .bzr dpkg/po/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/po/.gitignore
--- dpkg/po/.gitignore	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1,9 +0,0 @@
-*.gmo
-*.sin
-*.sed
-*.header
-Makefile.in.in
-Makevars.template
-POTFILES
-Rules-quot
-stamp-po
Binary files dpkg/po/gl.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/gl.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/gl.po /home/vorlon/devel/multiarch/dpkg-debian/po/gl.po
--- dpkg/po/gl.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/gl.po	2012-06-07 10:11:09.426073000 -0700
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2008-12-17 21:51+0100\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
@@ -26,7 +26,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "non se pode abrir o ficheiro orixe \"%.250s\""
@@ -46,71 +46,77 @@
 msgid "ar member file (%s)"
 msgstr "non se puido crear o ficheiro temporal (datos)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "fallo en buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "fallo en buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "lectura curta en buffer_copy (%s)"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "non se puido executar tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "non se pode executar %s"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: descompresión"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compresión"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: erro interno de gzip: \"%s\""
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: erro interno de gzip: \"%s\""
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: erro interno de gzip: \"%s\""
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: erro interno de gzip: \"%s\""
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: erro interno de gzip: \"%s\""
@@ -125,31 +131,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: erro interno de bzip2: \"%s\""
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: erro interno de bzip2: \"%s\""
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: erro interno de bzip2: \"%s\""
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: erro interno de bzip2: \"%s\""
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -158,7 +164,7 @@
 "o directorio de actualizacións contén o ficheiro \"%.250s\", que ten un nome "
 "longo de máis (lonxitude=%d, máx=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -166,101 +172,101 @@
 "o directorio de actualizacións contén ficheiros con nomes de lonxitudes "
 "diferentes (%d e %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "non se pode explorar o directorio de actualizacións \"%.255s\""
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "non se puido borrar o ficheiro de actualizacións incorporado %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "non se pode crear \"%.255s\""
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "non se pode encher %.250s con caracteres de recheo"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "non se pode baleirar %.250s despois do recheo"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "non se pode ir ao comezo de %.250s despois do recheo"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "non se pode abrir o ficheiro temporal para vsnprintf"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr ""
 "non se pode abrir/crear o ficheiro de bloqueo da base de datos de estado"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "non ten permisos para bloquear a base de datos de estado de dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "non se pode bloquear a base de datos de estado de dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "a operación solicitada precisa de privilexios de superusuario"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "non se pode acceder á área de estado de dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 "a operación precisa de acceso de lectura/escritura á área de estado de dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "non se puido eliminar o ficheiro de actualizacións %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "non se pode gravar o estado actualizado de \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "non se pode baleirar o buffer co estado actualizado de \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "non se pode truncar para o estado actualizado de \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "non se pode sincronizar o estado actualizado de \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "non se pode pechar o estado actualizado de \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "non se pode instalar o estado actualizado de \"%.250s\""
@@ -281,75 +287,77 @@
 msgid "unable to open directory '%s'"
 msgstr "non se pode abrir o ficheiro orixe \"%.250s\""
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "non se pode abrir o ficheiro orixe \"%.250s\""
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "non se pode abrir o ficheiro orixe \"%.250s\""
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "non se pode baleirar o buffer en vsnprintf"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "non se puideron gravar os detalles de \"%.50s\" en \"%.250s\""
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "non se puido abrir \"%s\" para gravar información de \"%s\""
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "non se pode establecer o buffer do ficheiro de estado"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "non se puido gravar o rexistro de \"%s\" sobre \"%.50s\" en \"%.250s\""
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "non se puido baleirar o buffer coa información de \"%s\" en \"%.250s\""
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "non se puido sincronizar a información de \"%s\" en \"%.250s\""
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr ""
 "non se puido pechar \"%.250s\" despois de gravar a información de \"%s\""
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "non se puido ligar \"%.250s\" a \"%.250s\" para copiar a información de \"%s"
 "\""
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 "non se puido instalar \"%.250s\" coma \"%.250s\" que contén información de "
 "\"%s\""
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -358,7 +366,7 @@
 "%s: erro fatal non recuperable, a abortar:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -370,13 +378,13 @@
 "%s: erro fatal non recuperable, a abortar:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "esgotouse a memoria para unha nova entrada de limpeza"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -385,36 +393,36 @@
 "%s: erro ao limpar:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: hai erros aniñados de máis durante a recuperación de erros\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "esgotouse a memoria para unha nova entrada de limpeza"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 "esgotouse a memoria para unha nova entrada de limpeza con argumentos de máis"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: erro ao limpar:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr ""
 "%s: erro ao limpar:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%d: erro interno \"%s\"\n"
@@ -430,102 +438,102 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "non se permite \"%.*s\" para %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "lixo despois de %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "nome de paquete non válido (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "campo de detalles de ficheiro \"%s\" baleiro"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr ""
 "non se permite o campo de detalles de ficheiro \"%s\" no ficheiro de estado"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "hai valores de máis no campo de detalles de ficheiro \"%s\" (comparado con "
 "outros)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "hai valores de menos no campo de detalles de ficheiro \"%s\" (comparado con "
 "outros)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "si/non nun campo booleano"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "palabra no campo \"priority\""
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "non se admite o valor do campo \"status\" neste contexto"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "primeira palabra (want) no campo \"status\""
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "segunda palabra (error) no campo \"status\""
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "terceira palabra (status) no campo \"status\""
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "erro na cadea do campo Version \"%.250s\": %.250s"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "emprégase un campo obsoleto \"Revision\" ou \"Package-Revision\""
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "non se admite o valor do campo \"config-version\" neste contexto"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "erro na cadea do campo Config-VErsion \"%.250s\": %.250s"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "o valor de \"conffiles\" ten unha liña mal formada \"%.*s\""
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 "o valor de \"conffiles\" ten unha liña que comeza por algo distinto dun "
 "espacio \"%c\""
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "lístase coma ficheiro de configuración o directorio raíz ou un nulo"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -533,12 +541,12 @@
 "campo \"%s\", falla o nome do paquete, ou hai lixo onde se esperaba o nome "
 "dun paquete"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "campo \"%s\", nome de paquete \"%.255s\" non válido: %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -547,7 +555,7 @@
 "campo \"%s\", referencia a \"%.255s\":\n"
 " relación de versións %c%c incorrecta"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -556,7 +564,7 @@
 "campo \"%s\", referencia a \"%.255s\":\n"
 " \"%c\" está obsoleto, empregue \"%c=\" ou \"%c%c\" no seu canto"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -565,11 +573,11 @@
 "campo \"%s\", referencia a \"%.255s\":\n"
 " coincidencia exacta implícita no número de versión, suxírese empregar \"=\""
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Só se poden empregar versións exactas no campo Provides"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -579,56 +587,56 @@
 " o valor da versión comeza por un carácter non alfanumérico, suxírese "
 "engadir un espazo"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "campo \"%s\", referencia a \"%.255s\": a versión contén \"%c\""
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "campo \"%s\", referencia a \"%.255s\": versión sen rematar"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "campo \"%s\", referencia a \"%.255s\": erro na versión: %.255s"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "campo \"%s\", erro de sintaxe trala referencia ao paquete \"%.255s\""
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "non se admiten alternativas (\"|\") no campo %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "non se admite o valor do campo \"triggers-pending\" neste contexto"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "nome de disparador pendente \"%.255s\" non válido: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "disparador pendente \"%.255s\" duplicado"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "non se admite o valor do campo \"triggers-awaited\" neste contexto"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "nome de paquete non válido no disparador en espera \"%.255s\": %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "paquete cun disparador en espera duplicado \"%.255s\""
@@ -688,7 +696,7 @@
 msgid "unable to write to status fd %d"
 msgstr "non se pode gravar o estado actualizado de \"%.250s\""
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "realloc failed (%zu bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -699,8 +707,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "a chamada a realloc fallou (%zu bytes)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "non se puido reservar memoria"
 
@@ -733,211 +741,217 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "non se puido establecer o modificador close-on-exec de %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "erro na configuración: %s precisa dun valor"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, fuzzy, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "non se puido abrir o ficheiro de configuración \"%.255s\" para lectura"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "opción \"%s\" descoñecida"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "a opción --%s toma un valor"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "a opción --%s non toma un valor"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "erro de lectura no ficheiro de configuración \"%.255s\""
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "erro ao pechar o ficheiro de configuración \"%.255s\""
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "erro ao pechar o ficheiro de configuración \"%.255s\""
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "opción --%s descoñecida"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "a opción --%s toma un valor"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "a opción --%s non toma un valor"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "opción -%c descoñecida"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "a opción -%c toma un valor"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "a opción -%c non toma un valor"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "Aviso: opción \"--%s\" obsoleta\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "as accións -%c (--%s) e -%c (--%s) teñen un conflicto"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "valor duplicado para o campo \"%s\""
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "o nome do campo definido polo usuario \"%.*s\" é curto de máis"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "valor duplicado para o campo definido polo usuario \"%.*s\""
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Configured-Version para un paquete con Status non apropiado"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "o paquete ten estado %s pero hai disparadores en espera"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 "o paquete ten estado triggers-awaited pero non hai disparadores en espera"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "o paquete ten estado %s pero hai disparadores pendentes"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 "o paquete ten estado triggers-pending pero non hai disparadores pendentes"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Un paquete en estado \"non instalado\" ten ficheiros de configuración; "
 "esquécense"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr ""
 "non se puido abrir o ficheiro de información de paquetes \"%.255s\" para "
 "lectura"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "non se atopou o ficheiro de información de paquetes \"%.255s\""
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr ""
 "non se pode facer mmap do ficheiro de información de paquetes \"%.255s\""
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "non se atopou o ficheiro de información de paquetes \"%.255s\""
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "non se puido pechar despois de ler: \"%.255s\""
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "fin de ficheiro tralo nome de campo \"%.*s\""
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "salto de liña no nome de campo \"%.*s\""
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "fin de ficheiro de MS-DOS (^Z) no nome de campo \"%.*s\""
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "o nome de campo \"%.*s\" debe ir seguido dun signo de dous puntos"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 "fin de ficheiro antes do valor do campo \"%.*s\" (falla o salto de liña "
 "final)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 "carácter de fin de ficheiro de MS-DOS no valor do campo \"%.*s\" (¿falla o "
 "salto de liña final?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "salto de liña no nome de campo \"%.*s\""
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 "fin de ficheiro no valor do campo \"%.*s\" (falla o salto de liña final)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 "atopáronse varias entradas de información do paquete, só se admite unha"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "non se puido pechar despois de ler: \"%.255s\""
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "non hai información de paquetes en \"%.255s\""
@@ -956,68 +970,68 @@
 " %.255s"
 msgstr "aviso, no ficheiro \"%.255s\" preto da liña %d"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "non pode ser unha cadea baleira"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "debe comezar por un carácter alfanumérico"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "non se admite o carácter \"%c\" (só se admiten letras, números e caracteres "
 "\"%s\")"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<ningún>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "a cadea de versión está baleira"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "a cadea de versión ten espazos"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "a época na versión non é un número"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "non hai hada despois dos dous puntos no número de versión"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "non hai hada despois dos dous puntos no número de versión"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "non hai hada despois dos dous puntos no número de versión"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "falla %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "valor baleiro para %s"
@@ -1036,51 +1050,51 @@
 msgid "(no description available)"
 msgstr "(non hai unha descrición dispoñible)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "non se pode ignorar o sinal %s antes de executar o script"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "erro ao des-capturar o sinal %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (subproceso): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "a chamada a fork fallou"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "o subproceso %s devolveu o estado de saída de erro %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "a espera de %s fallou"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "o subproceso %s morreu por un sinal (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", verqueuse a memoria"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "o subproceso %s fallou co código de estado de espera %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "a espera de %s fallou"
@@ -1104,66 +1118,58 @@
 "erro de sintaxe no ficheiro de disparadores pospostos \"%.250s\" no carácter "
 "\"%s\"%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr ""
 "non se pode abrir/crear o ficheiro de bloqueo de disparadores \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "disparado"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "non se atopou o ficheiro de disparadores pospostos \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "non se pode abrir o ficheiro de disparadores pospostos \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 "non se pode abrir/crear o novo ficheiro de disparadores pospostos \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "erro ao ler o ficheiro de disparadores pospostos \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr ""
 "non se pode gravar no novo ficheiro de disparadores pospostos \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr ""
 "non se pode pechar o novo ficheiro de disparadores pospostos \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr ""
 "non se pode instalar o novo ficheiro de disparadores pospostos \"%.250s\""
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "non se admiten disparadores con nomes en branco"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "o nome do disparador contén un carácter non válido"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1172,18 +1178,18 @@
 "sintaxe non válida ou descoñecida no nome do disparador \"%.250s\" (nos "
 "disparadores de interese para o paquete \"%.250s\")"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "non se pode abrir o ficheiro de disparadores de interese \"%.250s\""
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr ""
 "non se pode retroceder no ficheiro de disparadores de interese \"%.250s\""
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1192,43 +1198,49 @@
 "erro de sintaxe no ficheiro de disparadores de interese \"%.250s\"; nome de "
 "paquete \"%.250s\" non válido: %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr ""
-"non se pode crear o novo ficheiro de disparadores de interese \"%.250s\""
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr ""
 "non se pode gravar no novo ficheiro de disparadores de interese \"%.250s\""
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr ""
 "non se pode crear o novo ficheiro de disparadores de interese \"%.250s\""
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr ""
 "non se pode crear o novo ficheiro de disparadores de interese \"%.250s\""
 
-#: lib/dpkg/triglib.c:442
-#, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr ""
-"non se pode crear o novo ficheiro de disparadores de interese \"%.250s\""
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr ""
 "non se pode instalar o novo ficheiro de disparadores de interese \"%.250s\""
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "non se pode eliminar \"%.250s\""
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr ""
+"non se pode crear o novo ficheiro de disparadores de interese \"%.250s\""
+
+#: lib/dpkg/triglib.c:383
+#, fuzzy, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr ""
+"non se pode crear o novo ficheiro de disparadores de interese \"%.250s\""
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1236,53 +1248,53 @@
 "disparador de interese nun ficheiro duplicado para o ficheiro \"%.250s\" e o "
 "paquete \"%.250s\""
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr ""
 "non se pode crear o novo ficheiro de disparadores de ficheiro \"%.250s\""
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr ""
 "non se pode gravar no novo ficheiro de disparadores de ficheiro \"%.250s\""
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr ""
 "non se pode crear o novo ficheiro de disparadores de ficheiro \"%.250s\""
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr ""
 "non se pode crear o novo ficheiro de disparadores de ficheiro \"%.250s\""
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr ""
 "non se pode crear o novo ficheiro de disparadores de ficheiro \"%.250s\""
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr ""
 "non se pode instalar o novo ficheiro de disparadores de ficheiro \"%.250s\""
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "non se pode ler o ficheiro de disparadores de ficheiro \"%.250s\""
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "erro de sintaxe no ficheiro de disparadores de ficheiro \"%.250s\""
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1291,7 +1303,7 @@
 "o rexistro de disparadores de ficheiro menciona o paquete de nome non válido "
 "\"%.250s\" (para un interese no ficheiro \"%.250s\"): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1300,34 +1312,42 @@
 "o ficheiro ci de disparadores \"%.250s\" contén unha sintaxe de disparador "
 "non válida no nome de disparador \"%.250s\": %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "non se pode abrir o ficheiro ci de disparadores \"%.250s\""
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 "o ficheiro ci de disparadores contén unha sintaxe de directiva non coñecida"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 "o ficheiro ci de disparadores contén unha directiva descoñecida \"%.250s\""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "non se pode crear o directorio de estado dos disparadores \"%.250s\""
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 "non se pode establecer a propiedade do directorio de estado dos disparadores "
 "\"%.250s\""
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "non se admiten disparadores con nomes en branco"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "o nome do disparador contén un carácter non válido"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1352,7 +1372,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "erro ao ler da canle de dpkg-deb"
 
@@ -1371,12 +1391,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "erro ao establecer o propietario da ligazón simbólica \"%.255s\""
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "erro ao establecer o propietario de \"%.255s\""
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "erro ao establecer os permisos de \"%.255s\""
@@ -1436,17 +1456,27 @@
 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:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat file '%s'"
+msgstr "non se atopa o nome antigo \"%s\": %s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "A substituír os ficheiros do paquete antigo %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Substituíronse por ficheiros do paquete instalado %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1455,95 +1485,100 @@
 "téntase sobrescribir o directorio \"%.250s\" do paquete %.250s con algo que "
 "non é un directorio"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "téntase sobrescribir \"%.250s\", que tamén está no paquete %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "non se pode ler \"%.255s\" (en \"%.255s\")"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "back-end dpkg-deb durante \"%.255s\""
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "erro ao pechar ou gravar en \"%.255s\""
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "erro ao crear a canle \"%.255s\""
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "erro ao crear o dispositivo \"%.255s\""
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "erro ao crear a ligazón dura \"%.255s\""
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "erro ao crear a ligazón simbólica \"%.255s\""
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "erro ao crear o directorio \"%.255s\""
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, 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:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "non se pode ler a ligazón \"%.255s\""
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, 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:830
+#: src/archives.c:841
 #, 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:835
+#: src/archives.c:846
 #, 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:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "non se pode instalar unha nova versión de \"%.255s\""
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "non se pode crear \"%.255s\""
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "non se puido sacar do buffer \"%.255s\""
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1552,7 +1587,7 @@
 "dpkg: aviso - ignórase o problema de dependencias con %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, fuzzy, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1561,7 +1596,7 @@
 "dpkg: aviso - a considerar a desconfiguración do paquete esencial\n"
 " %s, para activar %s.\n"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1570,7 +1605,7 @@
 "dpkg: non, %s é esencial, non se ha desconfigurar para\n"
 " activar %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1579,29 +1614,29 @@
 "dpkg: non, non se pode continuar con %s (--auto-deconfigure ha axudar):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "eliminación de %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "instalación de %.250s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 "dpkg: a considerar a desconfiguración de %s, que había romper por %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: si, hase desconfigurar %s (roto por %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1610,12 +1645,12 @@
 "dpkg: respecto a %s que contén %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 #, fuzzy
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "dpkg: aviso - a ignorar a rotura, hase continuar igualmente\n"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1624,28 +1659,28 @@
 "a instalación de %.250s había romper %.250s, e\n"
 " non se permite a desconfiguración (--auto-deconfigure pode axudar)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "a instalación de %.250s había romper software existente"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1654,111 +1689,113 @@
 "dpkg: o paquete %s precisa dunha reinstalación, pero hase eliminar como "
 "pide.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "paquetes con conflictos - non se instala %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 #, fuzzy
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "dpkg: aviso - a ignorar o conflicto, hase continuar igualmente\n"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive precisa de alomenos un argumento de ruta"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "non se puido executar \"find\" para --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "non se puido abrir a canle de find"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "erro ao ler da canle de find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "erro ao pechar a canle de find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, 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:1267
+#: src/archives.c:1279
 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:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "A escoller o paquete %s anteriormente deseleccionado.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "A omitir o paquete deseleccionado %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, 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:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s - aviso: a desactualizar %.250s de %.250s a %.250s.\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, 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"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1767,40 +1804,40 @@
 "non se pode eliminar a versión recén instalada de \"%.250s\" para permitir a "
 "reinstalación da copia de seguridade"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "non se pode recuperar a copia de seguridade de \"%.250s\""
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "non se pode recuperar a copia de seguridade de \"%.250s\""
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "non se pode eliminar a versión recén instalada de \"%.250s\""
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "non se pode eliminar a versión recén extraída de \"%.250s\""
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "non se atopa o novo ficheiro de configuración \"%.250s\""
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 "non se atopa o ficheiro de configuración instalado actualmente \"%.250s\""
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1811,62 +1848,62 @@
 "O ficheiro de configuración \"%s\" non existe no seu sistema.\n"
 "A instalar o novo ficheiro de configuración pola súa petición.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "dpkg: %s: aviso - non se puido borrar a copia antiga \"%.250s\": %s\n"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 "dpkg: %s: aviso - non se puido cambiar o nome de \"%.250s\" a \"%.250s\": "
 "%s\n"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: non se puido executar \"%s %s\""
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 "dpkg: %s: aviso - non se puido borrar a versión antiga \"%.250s\": %s\n"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 "dpkg: %s: aviso - non se puido borrar \"%.250s\" (antes da sobrescritura): "
 "%s\n"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "dpkg: %s: aviso - non se puido ligar \"%.250s\" a \"%.250s\": %s\n"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "A instalar a nova versión do ficheiro de configuración %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "non se pode instalar \"%.250s\" coma \"%.250s\""
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "non hai ningún paquete chamado \"%s\", non se pode configurar"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "o paquete %.250s xa está instalado e configurado"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1875,7 +1912,7 @@
 "o paquete %.250s non está listo para a súa configuración\n"
 " non se pode configurar (estado actual \"%.250s\")"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1884,11 +1921,11 @@
 "dpkg: problemas de dependencias impiden a configuración de %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependencias - déixase sen configurar"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1898,7 +1935,7 @@
 "petición:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1906,12 +1943,12 @@
 "O paquete está nun estado moi inconsistente - debería\n"
 " reinstalalo antes de tentar a súa configuración."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "A configurar %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, fuzzy, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1920,7 +1957,7 @@
 "dpkg: %s: aviso - non se atopa o ficheiro de configuración \"%s\"\n"
 " (= \"%s\"): %s\n"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, fuzzy, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1930,7 +1967,7 @@
 "circular\n"
 " (= \"%s\")\n"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, fuzzy, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1940,7 +1977,7 @@
 "\"\n"
 " (= \"%s\"): %s\n"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, fuzzy, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1950,37 +1987,37 @@
 "de ficheiro dexenerado\n"
 " (\"%s\" é unha ligazón simbólica a \"%s\")\n"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, fuzzy, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "dpkg: %s: aviso - o ficheiro de configuración \"%.250s\" non é un ficheiro "
 "normal ou ligazón simbólica (= \"%s\")\n"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr ""
 "dpkg: %s: aviso - non se pode abrir o ficheiro de configuración %s para "
 "calcular o seu hash: %s\n"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Escriba \"exit\" cando teña rematado.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1989,12 +2026,12 @@
 "\n"
 "Ficheiro de configuración \"%s\""
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (realmente \"%s\")"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -2005,7 +2042,7 @@
 " ==> Hai un ficheiro no sistema creado por vostede ou un script.\n"
 " ==> Tamén hai un ficheiro no paquete fornecido polo mantedor do paquete.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -2014,7 +2051,7 @@
 "\n"
 "     Sen modificar trala instalación.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2023,7 +2060,7 @@
 "\n"
 " ==> Modificado (por vostede ou un script) trala instalación.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -2032,37 +2069,37 @@
 "\n"
 " ==> Borrado (por vostede ou un script) trala instalación.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> O distribuidor do paquete fornece unha versión actualizada.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     A versión do paquete é a mesma que a da última instalación.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Emprégase o novo ficheiro como solicitou.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Emprégase o ficheiro actual como solicitou.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Gárdase o ficheiro de configuración antigo por defecto.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Emprégase o novo ficheiro de configuración por defecto.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2077,169 +2114,171 @@
 "      D     : amosar as diferencias entre as versións\n"
 "      Z     : deixar este proceso no fondo para examinar a situación\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " A acción por defecto é gardar a versión actual.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " A acción por defecto é instalar a nova versión.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[por defecto=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[por defecto=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[non hai opción por defecto]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "erro ao gravar no erro estándar, descubriuse antes de preguntar polo "
 "ficheiro de configuración"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr ""
 "erro de lectura na entrada estándar na pregunta do ficheiro de configuración"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr ""
 "fin de ficheiro na entrada estándar na pregunta do ficheiro de configuración"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s depende de %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s pre-depende de %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s recomenda %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s suxire %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s rompe %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s ten conflictos con %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s mellora %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s hase eliminar.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s hase desconfigurar.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s está instalado, pero é a versión %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s está desempaquetado, pero non se configurou.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s está desempaquetado, pero é a versión %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s ten de última versión configurada %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s está %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s fornece %.250s pero hase eliminar.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s fornece %.250s pero hase desconfigurar.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s fornece %.250s pero está %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s non está instalado.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versión %.250s) hase instalar.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versión %.250s) está presente e %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s fornece %.250s e hase instalar.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s fornece %.250s e está presente e %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Type dpkg-trigger --help for help about this utility."
+msgid "Use --help for help about diverting files."
+msgstr "Escriba dpkg-trigger --help para obter axuda sobre esta utilidade."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "%s de Debian, versión %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2254,8 +2293,8 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2267,7 +2306,7 @@
 "versión\n"
 "2 ou unha posterior para as condicións de copia. NON hai garantía.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2277,7 +2316,7 @@
 "Emprego: %s [<opción> ...] <orde>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2289,7 +2328,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -2331,7 +2370,7 @@
 "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"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2340,19 +2379,13 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat file '%s'"
-msgstr "non se atopa o nome antigo \"%s\": %s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error checking `%s': %s"
 msgid "error checking '%s'"
 msgstr "erro ao comprobar \"%s\": %s"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2361,144 +2394,144 @@
 "o cambio de nome supón sobrescribir \"%s\" co\n"
 "  ficheiro diferente \"%s\", non se permite"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "non se pode abrir o ficheiro orixe \"%.250s\""
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "cannot stat new name `%s': %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "non se atopa o novo nome \"%s\": %s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 #| msgid "rename: remove duplicate old link `%s': %s"
 msgid "rename: remove duplicate old link '%s'"
 msgstr "rename: eliminación da ligazón antiga duplicada \"%s\": %s"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "non se pode abrir o ficheiro orixe \"%.250s\""
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "local diversion of %s"
 msgstr "desvío local a: %s\n"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "local diversion of %s to %s"
 msgstr "desvío local a: %s\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "diversion of %s by %s"
 msgstr "desvío feito por %s a: %s\n"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "diversion of %s to %s by %s"
 msgstr "desvío feito por %s a: %s\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "any diversion of %s"
 msgstr "desvío local a: %s\n"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "any diversion of %s to %s"
 msgstr "desvío feito por %s a: %s\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "cannot open GPL file"
 msgid "cannot create new %s file"
 msgstr "non se pode abrir o ficheiro GPL"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "non se pode baleirar o buffer en vsnprintf"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 #| msgid "remove old diversions-old: %s"
 msgid "error removing old diversions-old"
 msgstr "eliminación do antigo ficheiro diversions-old: %s"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "erro ao crear o novo ficheiro statoverride-old: %s"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "erro ao instalar o novo ficheiro statoverride: %s"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s precisa dun só argumento"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "o nome de ficheiro \"%s\" non é absoluto"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "o nome do ficheiro non pode conter saltos de liña"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Non se poden desviar directorios"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "Non se poden desviar directorios"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "Déixase \"%s\""
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "\"%s\" choca con \"%s\""
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "A engadir \"%s\""
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
 msgstr "Non existe o desvío \"%s\", non se eliminou ningún"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2509,7 +2542,7 @@
 "  ao eliminar \"%s\"\n"
 "  atopouse \"%s\""
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2520,17 +2553,17 @@
 "  ao eliminar \"%s\"\n"
 "  atopouse \"%s\""
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "A eliminar \"%s\""
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "o nome do paquete non pode conter saltos de liña"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "o destino do desvío non pode conter saltos de liña"
 
@@ -2616,8 +2649,8 @@
 "dselect ou dpkg --configure --pending (ou dpkg --triggers-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s non toma ningún argumento"
@@ -2708,7 +2741,7 @@
 msgid "--compare-versions bad relation"
 msgstr "relación incorrecta para --compare-versions"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "dpkg: a versión \"%s\" ten unha sintaxe incorrecta: %s\n"
@@ -2765,12 +2798,12 @@
 "dpkg - aviso, omítese o problema porque --force está activado:\n"
 " "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "non se puido abrir a lista de ficheiros do paquete \"%.250s\""
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, fuzzy, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2779,39 +2812,39 @@
 "dpkg: aviso grave: a lista de ficheiros do paquete \"%.250s\" non aparece, "
 "suponse que o paquete non ten ficheiros instalados actualmente.\n"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "non se puido abrir a lista de ficheiros do paquete \"%.250s\""
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "lista de ficheiros do paquete \"%.250s\""
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, fuzzy, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "erro ao pechar a lista de ficheiros do paquete \"%.250s\""
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(A ler a base de datos ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2819,34 +2852,34 @@
 msgstr[0] "hai %d ficheiros e directorios instalados actualmente.)\n"
 msgstr[1] "hai %d ficheiros e directorios instalados actualmente.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "non se pode crear a lista de ficheiros actualizada para o paquete %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "non se puido gravar a lista de ficheiros do paquete %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 "non se puido baleirar o buffer da lista de ficheiros actualizada do paquete "
 "%s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "non se puido sincronizar a lista de ficheiros do paquete %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "non se puido pechar a lista de ficheiros actualizada do paquete %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "non se puido instalar a lista de ficheiros actualizada do paquete %s"
@@ -2885,7 +2918,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "dpkg - erro: a variable de ambiente PATH non está establecida.\n"
 
 #: src/help.c:129
@@ -2917,7 +2950,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "non se pode modificar o ambiente para o script de mantedor"
@@ -2928,66 +2961,66 @@
 msgstr "non se puido facer chroot a \"%.250s\""
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "non se puido cambiar a \"%.255s\""
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "non se poden establecer permisos de execución en \"%.250s\""
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "non se pode modificar o ambiente para o script de mantedor"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "antigo script de %s"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "non se pode atopar o %s \"%s.250s\""
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "novo script de %s"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "antigo script de %s"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "non se pode atopar o %s \"%s.250s\""
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - próbase o script do novo paquete no seu canto ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "non hai un script na nova versión do paquete - abandónase"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... semella que iso foi ben.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "non se pode crear \"%.255s\""
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2996,7 +3029,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "non se pode comprobar a existencia de \"%.250s\""
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "non se pode ler o directorio de información"
 
@@ -3067,7 +3100,7 @@
 "  -Dh|--debug=help                     Axuda sobre a depuración.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -3229,7 +3262,7 @@
 "Empregue \"dselect\" ou \"aptitude\" para xestión de paquetes amigable co "
 "usuario.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3282,30 +3315,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3314,102 +3351,102 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "problemas de dependencias - non se elimina"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "problemas de dependencias - non se elimina"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "non se pode modificar o ambiente para o script de mantedor"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "erro de lectura no ficheiro de configuración \"%.255s\""
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3417,7 +3454,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3425,38 +3462,38 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug precisa dun argumento octal"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nome de paquete nulo na lista separada por comas de --ignore-depends \"%.250s"
 "\""
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends precisa dun nome válido de paquete. \"%.250s\" non o é; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "número enteiro non válido para --%s: \"%.250s\""
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3465,7 +3502,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3473,12 +3510,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opción de forzar/rexeitar \"%.*s\" descoñecida"
 
-#: src/main.c:511
+#: src/main.c:513
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "Aviso: opción de forzado/rexeitado \"%s\" obsoleta\n"
@@ -3501,8 +3538,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "fin de ficheiro inesperada antes da fin da liña %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "precísase dunha opción de acción"
 
@@ -3667,96 +3704,96 @@
 msgid "passed\n"
 msgstr "aprobado\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "non se puido crear un nome para o directorio temporal"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "o paquete %s ten demasiadas parellas Conflicts/Replaces"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "a antiga versión do paquete ten un nome de ficheiro de información longo de "
 "máis, que comeza por \"%.250s\""
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "non se pode eliminar o ficheiro de información obsoleto \"%.250s\""
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 "non se pode instalar o (suposto) novo ficheiro de información \"%.250s\""
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "non se pode abrir o directorio de control temporal"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "o paquete contén un nome de ficheiro de información de control longo de máis "
 "(que comeza por \"%.50s\")"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "a información de control do paquete contiña o directorio \"%.250s\""
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "a proba de borrar o ficheiro de control do paquete \"%.250s\" coma "
 "directorio non deu un erro por non ser un directorio"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr ""
 "dpkg: aviso - o paquete %s contiña unha lista coma ficheiro de información"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 "non se pode instalar o novo ficheiro de información \"%.250s\" coma \"%.250s"
 "\""
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "non se pode borrar o ficheiro de información de control \"%.250s\""
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "non se pode acceder ao arquivo"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "non se puido crear un nome para o directorio temporal"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "lonxitude da información de control"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Rexistrouse a información sobre %s de %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "a arquitectura do paquete (%s) non coincide co sistema (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3765,106 +3802,106 @@
 "dpkg: a propósito de %s que contén %s, problema de predependencias:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "problema de predependencias - non se instala %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr "dpkg: aviso - ignórase o problema de predependencias\n"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "A se preparar para substituír %s %s (emprégase %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "A desempaquetar %s (de %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "o nome do ficheiro de configuración (que comeza por \"%.250s\") é longo de "
 "máis (máis de %d caracteres)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "erro de lectura en %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "erro ao pechar %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "erro ao tentar abrir %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "A desconfigurar %s, para poder eliminar %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "A desconfigurar %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "A desempaquetar o %.250s substituto ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "erro ao ler a saída de tar de dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 "arquivo tar do sistema de ficheiros corrompido - arquivo de paquete "
 "corrompido"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: a borrar os posibles ceros finais"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, fuzzy, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "dpkg: aviso - non se pode atopar o ficheiro antigo \"%.250s\", así que non "
 "se borra: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "dpkg: aviso - non se pode borrar o directorio antigo \"%.250s\": %s\n"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, fuzzy, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "dpkg: aviso - o ficheiro de configuración antigo \"%.250s\" era un "
 "directorio baleiro (e borrouse agora)\n"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "non se atopou outro ficheiro novo \"%.250s\""
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, fuzzy, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3873,12 +3910,12 @@
 "dpkg: aviso - o ficheiro antigo \"%.250s\" é o mesmo que varios ficheiros "
 "novos (\"%.250s\" e \"%.250s\")\n"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "dpkg: aviso - non se pode %s o ficheiro antigo \"%%.250s\": %%s\n"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
@@ -4048,7 +4085,7 @@
 "  -f|--showformat=<formato>        Emprega outro formato para --show.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -4072,6 +4109,10 @@
 "sexa\n"
 "  negativa; neste caso hase empregar aliñamento á esquerda.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, fuzzy, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4132,7 +4173,7 @@
 msgid "Removing %s ...\n"
 msgstr "A eliminar %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, fuzzy, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4141,54 +4182,55 @@
 "dpkg - aviso: ao eliminar %s.250s non se puido borrar o directorio \"%.250s"
 "\": %s - o directorio pode ser un punto de montaxe\n"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "non se pode eliminar \"%.250s\""
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "non se pode crear \"%.255s\""
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "dpkg - aviso: ao eliminar %.250s o directorio \"%.250s\" non quedou baleiro "
 "polo que non se eliminou.\n"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "non se pode eliminar \"%.250s\""
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "A purgar os ficheiros de configuración de %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr ""
 "non se pode eliminar o antigo ficheiro de configuración \"%.250s\" (= "
 "\"%.250s\")"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 "non se pode ler o directorio de ficheiros de configuración \"%.250s\" (de "
 "\"%.250s\")"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "non se pode eliminar a copia do antigo ficheiro de configuración \"%.250s"
 "\" (de \"%.250s\")"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "non se pode eliminar a antiga lista de ficheirso"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "non se pode eliminar o antigo script de postrm"
 
@@ -4231,7 +4273,11 @@
 msgid "read error on standard input"
 msgstr "erro de lectura na entrada estándar"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4241,7 +4287,7 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4252,7 +4298,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -4281,56 +4327,56 @@
 "  --help                   amosa esta mensaxe de axuda.\n"
 "  --version                amosa a versión.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "omítese o \"/\" ao final"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "non se pode abrir o novo ficheiro statoverride: %s"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "erro ao eliminar o ficheiro statoverride-old: %s"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "erro ao crear o novo ficheiro statoverride-old: %s"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "erro ao instalar o novo ficheiro statoverride: %s"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add precisa de catro argumentos"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, fuzzy, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr "pero indicouse --force, así que se ha ignorar."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, fuzzy, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Xa existe unha substitución para \"%s\", "
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, fuzzy, c-format
 msgid "--update given but %s does not exist"
 msgstr "aviso: indicouse --update pero %s non existe"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Non hai unha substitución presente."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 #, fuzzy
 msgid "--update is useless for --remove"
 msgstr "aviso: --update é inútil con --remove"
@@ -4402,16 +4448,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "ficheiro \"statoverride\" \"%.250s\""
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Escriba dpkg-trigger --help para obter axuda sobre esta utilidade."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Utilidade de disparadores de paquetes %s de Debian.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4422,7 +4468,7 @@
 "         %s [<opcións> ...] <orde>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4435,7 +4481,7 @@
 "                                     ten soporte de disparadores.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4456,22 +4502,22 @@
 "  --no-act                    Só proba - non facer cambios en realidade.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: aínda non se creou o directorio de datos de disparadores\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: aínda non existen os rexistros de disparadores\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 #, fuzzy
 msgid "takes one argument, the trigger name"
 msgstr "dpkg-trigger toma só un argumento, o nome do disparador"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4481,13 +4527,13 @@
 "Débese chamar a dpkg-trigger desde un script de mantedor (ou cunha opción --"
 "by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: nome de paquete agardado \"%.250s\" non válido: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "dpkg-trigger: nome de disparador \"%.255s\" non válido: %.250s"
@@ -4520,33 +4566,34 @@
 msgstr "A procesar os disparadores de %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s precisa de exactamente un argumento de ficheiro Packages"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "non se pode acceder a área de estado de dpkg para actualizar os dispoñibles "
 "en bruto"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "a actualización en bruto de dispoñibles require acceso de escritura na área "
 "de estado de dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "A substituír a información de paquetes dispoñibles, empregando %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "A actualizar a información de paquetes dispoñibles, empregando %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4554,7 +4601,7 @@
 msgstr[0] "Actualizouse a información sobre %d paquete(s).\n"
 msgstr[1] "Actualizouse a información sobre %d paquete(s).\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4677,8 +4724,8 @@
 msgstr[0] "dpkg-deb: ignóranse %d avisos sobre o(s) ficheiros(s) de control\n"
 msgstr[1] "dpkg-deb: ignóranse %d avisos sobre o(s) ficheiros(s) de control\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s precisa dun argumento de directorio"
@@ -4712,26 +4759,26 @@
 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:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "non se puido crear o ficheiro temporal (datos)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "área de control"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "non se puido borrar o ficheiro temporal (datos), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4747,20 +4794,20 @@
 msgid "error writing `%s'"
 msgstr "erro ao gravar \"%s\""
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "entre membros"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "non se puido gravar o nome do ficheiro na canle de tar (datos)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4778,66 +4825,66 @@
 msgid "error reading %s from file %.255s"
 msgstr "erro ao ler %s do ficheiro %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "non se puido ler o arquivo \"%.255s\""
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "non se atopou o arquivo"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "o arquivo non ten un punto no número de versión"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "o arquivo non ten retornos de carro na cabeceira"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "o ficheiro \"%.250s\" está corrompido - número de parte incorrecto"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "o ficheiro \"%.250s\" non é un arquivo binario de Debian (probe dpkg-split)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "o arquivo non ten un punto no número de versión"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "o arquivo non ten retornos de carro na cabeceira"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "o arquivo non ten un punto no número de versión"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 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:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "omítense datos do membro de %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
@@ -4845,13 +4892,13 @@
 "o ficheiro \"%.250s\" contén o membro de datos %.*s que non se entende, "
 "déixase"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "o ficheiro \"%.250s\" contén dous membros de control, déixase"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4863,23 +4910,23 @@
 " novo paquete Debian, versión %s.\n"
 " tamaño %ld bytes: arquivo de control= %zi bytes.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "o arquivo ten unha lonxitude de control mal formatada \"%s\""
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "omítense datos do membro de %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4891,7 +4938,7 @@
 " antigo paquete Debian, versión %s.\n"
 " tamaño %ld bytes: arquivo de control= %zi, arquivo principal= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4900,51 +4947,52 @@
 "dpkg-deb: semella que o arquivo quedou corrompido\n"
 "dpkg-deb:    por se ter descargado en modo ASCII\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "\"%.255s\" non é un arquivo de formato Debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "non se puido gravar na canle da copia"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "non se puido pechar a canle da copia"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "datos"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "non se puido cambiar ao directorio"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "non se puido crear o directorio"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "non se puido cambiar ao directorio despois de o crear"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "non se puido cambiar ao directorio"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s: descompresión"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 #, fuzzy
 msgid "paste"
 msgstr "aprobado\n"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s precisa dun argumento de nome de ficheiro .deb"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4953,38 +5001,38 @@
 "--%s precisa dun directorio destino.\n"
 "¿Pode ser que teña que empregar dpkg --install?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s toma só un argumento (nome de ficheiro .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "non se puido cambiar a \"/\" para facer limpeza"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
 msgid "control file '%s'"
 msgstr "non se atopa o nome antigo \"%s\": %s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: \"%.255s\" non contén un compoñente de control \"%.255s\"\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "a apertura do compoñente \"%.255s\" (en %.255s) fallou dun xeito inesperado"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, fuzzy, c-format
 #| msgid "One requested control component is missing"
 msgid "%d requested control component is missing"
@@ -4992,59 +5040,59 @@
 msgstr[0] "Falla un compoñente de control solicitado"
 msgstr[1] "Falla un compoñente de control solicitado"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "non se pode explorar o directorio \"%.255s\""
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "non se atopa \"%.255s\" (en \"%.255s\")"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "non se pode abrir \"%.255s\" (en \"%.255s\")"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "non se pode ler \"%.255s\" (en \"%.255s\")"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bytes, %5d liñas   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     non é un ficheiro normal  %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(non hai un ficheiro \"control\" no arquivo de control)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "non se puido abrir o compoñente \"control\""
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "houbo un fallo durante a lectura do compoñente \"control\""
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "erro ao pechar a canle de find"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Erro no formato"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents toma exactamente un argumento"
 
@@ -5054,7 +5102,19 @@
 msgstr "Backend de arquivos de paquetes \"%s\" de Debian, versión %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -5065,6 +5125,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -5082,7 +5144,7 @@
 "ficheiros.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -5095,11 +5157,12 @@
 "<campoc> é o nome dun campo do ficheiro \"control\" principal.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5122,7 +5185,7 @@
 "                               Admítense: gzip, bzip2, lzma, none (ningún).\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5137,7 +5200,7 @@
 "Os paquetes que se descompriman con \"dpkg-deb --extract\" hanse instalar "
 "mal.\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5146,17 +5209,17 @@
 "Escriba dpkg --help para axuda sobre instalación e desinstalación de "
 "paquetes."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "número enteiro non válido para --%s: \"%.250s\""
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "número enteiro non válido para --%s: \"%.250s\""
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tipo de compresión \"%s\" descoñecido"
@@ -5180,7 +5243,7 @@
 "o ficheiro \"%.250s\" está corrompido - falla un retorno de carro tras "
 "\"%.250s\""
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "erro ao ler %.250s"
@@ -5277,55 +5340,59 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "o ficheiro \"%.250s\" está corrompido - número de parte incorrecto"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+msgid "package architecture"
+msgstr ""
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "o ficheiro \"%.250s\" está corrompido - número máxic incorrecto na fin da "
 "segunda cabeceira"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "o ficheiro \"%.250s\" está corrompido - o segundo membro non é un membro de "
 "datos"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "o ficheiro \"%.250s\" está corrompido - número de partes incorrecto para os "
 "tamaños citados"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "o ficheiro \"%.250s\" está corrompido - o tamaño é incorrecto para o número "
 "de parte citado"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "non se atopou o ficheiro de partes \"%.250s\""
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "o ficheiro \"%.250s\" está corrompido - curto de máis"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "non se pode abrir o ficheiro de partes do arquivo \"%.250s\""
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "o ficheiro \"%.250s\" non é unha parte do arquivo"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5345,6 +5412,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5367,12 +5435,19 @@
 "    Tamaño do ficheiro de partes:   %lu bytes\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<descoñecido>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--info precisa de un ou máis argumentos de ficheiros de partes"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "o ficheiro \"%s\" non é unha parte do arquivo\n"
@@ -5406,7 +5481,7 @@
 msgid "split package part"
 msgstr "falla o nome do paquete"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "rematado\n"
@@ -5459,17 +5534,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Opcións:\n"
 "  --depotdir <directorio>      Emprega o <directorio> no canto de %s/%s.\n"
@@ -5481,20 +5565,29 @@
 "\n"
 "Estado de saída: 0 = Ok;  1 = -a non é unha parte;  2 = ¡problemas!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Escriba dpkg-split --help para obter axuda."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fin de ficheiro inesperada en %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "o tamaño da parte é grande de máis ou non é positivo"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, fuzzy, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "o tamaño da parte debe ser alomenos %dk (para que caiba a cabeceira)"
@@ -5606,42 +5699,42 @@
 msgid "Deleted %s.\n"
 msgstr "Borrouse %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "non se pode abrir o ficheiro orixe \"%.250s\""
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "non se atopa o ficheiro de orixe"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "o ficheiro de orixe \"%.250s\" non é un ficheiro normal"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split precisa dun argumento de nome de ficheiro orixe"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split toma como moito un ficheiro orixe e un prefixo de destino"
 
@@ -5805,133 +5898,94 @@
 "  --help                   amosa esta mensaxe de axuda.\n"
 "  --version                amosa a versión.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr ""
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 #, fuzzy
 msgid "warning"
 msgstr "a abortar"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat %s: %s"
-msgstr "non se atopa o nome antigo \"%s\": %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, fuzzy, c-format
 #| msgid "two commands specified: %s and --%s"
 msgid "two commands specified: --%s and --%s"
 msgstr "especificáronse dúas ordes: %s e --%s"
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
 #| msgid "cannot open diversions: %s"
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "non se puido abrir o ficheiro de desvíos: %s"
 
-#: utils/update-alternatives.c:395
-#, fuzzy, c-format
-#| msgid "%s: copying %s to %s failed, giving up: %s"
-msgid "scan of %s failed: %s"
-msgstr "%s: fallou a copia de %s a %s, abórtase: %s"
-
-#: utils/update-alternatives.c:420
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "non se puido executar %s"
-
-#: utils/update-alternatives.c:503
-#, c-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"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "non se pode instalar %s coma %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "non se pode eliminar %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "fin de ficheiro inesperado en \"%s\" en %.255s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "non se pode ler %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "fin de ficheiro inesperado en \"%s\" en %.255s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, fuzzy, c-format
 msgid "%s corrupt: %s"
 msgstr "erro interno: %s está corrompido: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 "non se admiten saltos de liña nos ficheiros de update-alternatives (%s)"
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "erro ao gravar na saída estándar: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "escravo %s duplicado"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 #, fuzzy
 msgid "slave link"
 msgstr "ligazón escrava %s duplicada"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "a ligazón escrava é igual á ligazón principal %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "ligazón escrava %s duplicada"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "ruta %s duplicada"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, fuzzy, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5940,236 +5994,272 @@
 "A alternativa de %s apunta a %s, que non se atopou. Elimínase da lista de "
 "alternativas."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 #, fuzzy
 msgid "priority"
 msgstr "prioridade %s %s"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, fuzzy, c-format
 msgid "priority of %s: %s"
 msgstr "prioridade %s %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "non se pode ler %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 #, fuzzy
 msgid "invalid status"
 msgstr "modo de actualización non válido"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 #, fuzzy
 msgid "master link"
 msgstr "ligazón escrava %s duplicada"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "non se pode pechar %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, fuzzy, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "A descargar a ligazón escrava obsoleta %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "non se pode escribir en %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, fuzzy, c-format
 msgid "  link currently points to %s"
 msgstr " a ligazón apunta a %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 #, fuzzy
 msgid "  link currently absent"
 msgstr " a ligazón está ausente"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "%s - priority %s"
 msgid "%s - priority %d"
 msgstr "%s - prioridade %s"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr " escravo %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "A versión \"mellor\" actual é %s."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Non hia ningunha versión dispoñible."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "Descrición"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 #, fuzzy
 msgid "Priority"
 msgstr "prioridade %s %s"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, fuzzy, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Prema Intro para manter o valor por defecto[*] ou escriba o número da "
 "escolla: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Non se pode atopar a alternativa \"%s\"."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "fin de ficheiro inesperado en \"%s\" en %.255s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "A cambiar o nome da ligazón %s de %s a %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, fuzzy, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "A cambiar o nome da ligazón escrava %s de %s a %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr ""
+
+#: utils/update-alternatives.c:2241
+#, fuzzy, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "aviso: indicouse --update pero %s non existe"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr ""
+"A alternativa de %s apunta a %s, que non se atopou. Elimínase da lista de "
+"alternativas."
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr ""
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "argumento \"%s\" descoñecido"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install precisa dos argumentos de ligazón, nome, ruta e prioridade"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "a prioridade ten que ser un número enteiro"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s precisa dos argumentos de nome e ruta"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s precisa do argumento de nome"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "só se admite --slave con --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave precisa dos argumentos de ligazón, nome e ruta"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "o nome %s é primario e escravo ao mesmo tempo"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "a ligazón %s é primaria e escrava ao mesmo tempo"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s precisa dun só argumento"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opción \"%s\" descoñecida"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -6178,67 +6268,23 @@
 "precísase de --display, --config, --set, --install, --remove, --all, --"
 "remove-all ou -auto"
 
-#: utils/update-alternatives.c:2215
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr ""
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2239
-#, fuzzy, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "aviso: indicouse --update pero %s non existe"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
-
-#: utils/update-alternatives.c:2257
-#, fuzzy, c-format
-msgid "it is a slave of %s"
-msgstr " escravo %s: %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "erro de lectura na entrada estándar"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, fuzzy, c-format
 msgid "no alternatives for %s."
 msgstr "Non hai alternativas para %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
@@ -6247,73 +6293,113 @@
 "%s cambiou (manualmente ou mediante un script).\n"
 "Cámbiase a só actualizacións manuais."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, fuzzy, c-format
 msgid "setting up automatic selection of %s."
 msgstr "A establecer a selección automática de %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "A alternativa %s de %s non está rexistrada, non se elimina."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 "Só hai ningún programa que forneza %s.\n"
 "Non hai nada que configurar.\n"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "A alternativa %s de %s non está rexistrada, non se elimina."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, fuzzy, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "A eliminar a alternativa seleccionada manualmente - cámbiase a modo "
 "automático."
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "As actualizacións automáticas de %s están desactivadas, omítese."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 "Para voltar ás actualizacións automáticas empregue \"update-alternatives --"
 "auto %s\"."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "A empregar \"%s\" para fornecer \"%s\"."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~ msgid "it is a slave of %s"
+#~ msgstr " escravo %s: %s"
+
+#, fuzzy
+#~| msgid "cannot stat old name `%s': %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "non se atopa o nome antigo \"%s\": %s"
+
+#, fuzzy
+#~| msgid "%s: copying %s to %s failed, giving up: %s"
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "%s: fallou a copia de %s a %s, abórtase: %s"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "non se puido executar %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "non se pode converter %s nunha ligazón simbólica a %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "non se pode instalar %s coma %s: %s"
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "erro ao gravar na saída estándar: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "non se pode ler %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "non se pode pechar %s: %s"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "non se pode escribir en %s: %s"
+
+#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "non se pode cambiar o nome de %s a %s: %s"
@@ -6615,9 +6701,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "omítense datos do membro de %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "non se puido executar tar"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "non se puido crear un nome para o directorio temporal"
Binary files dpkg/po/hu.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/hu.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/hu.po /home/vorlon/devel/multiarch/dpkg-debian/po/hu.po
--- dpkg/po/hu.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/hu.po	2012-06-07 10:11:09.426073000 -0700
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2008-05-02 15:45+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: hu\n"
@@ -26,7 +26,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "e forrásfájl nem megnyitható: `%.250s'"
@@ -46,71 +46,77 @@
 msgid "ar member file (%s)"
 msgstr "tmpfájl létrehozása sikertelen (adat)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "hiba a pipába íráskor másolásnál"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "hiba a pipába íráskor másolásnál"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "hiba a tar futtatásakor"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "sikertelen futtatás: %s"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: kicsomagolás"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: tömörítés"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: belső gzip hiba: `%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: belső gzip hiba: `%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: belső gzip hiba: `%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: belső gzip hiba: `%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: belső gzip hiba: `%s'"
@@ -125,31 +131,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: belső bzip2 hiba: `%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: belső bzip2 hiba: `%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: belső bzip2 hiba: `%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: belső bzip2 hiba: `%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -157,105 +163,105 @@
 msgstr ""
 "Az updates könyvtárban lévő `%.250s' fájl neve túl hosszú (hossz=%d, max=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 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/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "nem tudom átnézni az updates könyvtárat: `%.255s'"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "nem tudom törölni a beépített %.255s fájlt"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "`%.255s' nem hozható létre"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "%.250s kitöltése behúzással sikertelen"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "%.250s feltöltése a behúzás után sikertelen"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "nem tudok %.250s elejére menni a behúzás után"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "nem nyitható tmpfile a vsnprintf-hez"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "a dpkg állapot adatbázis lezáró fájl kinyitása/lezárása sikertelen"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "nincs jogod lezárni a dpkg állapot adatbázist"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "a dpkg állapot adatbázis lezárása sikertelen"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "a kért művelet rendszergazda jogokat igényel"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "nem érem el a dpkg állapot területet"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "a művelet olvasás/írás jogot kér a dpkg állapot területhez"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "e frissítő fájlom törlése nem sikerült: %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "`%.250s' frissített állapotának írása sikertelen"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "`%.250s' frissített állapotának feltöltése sikertelen"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "`%.250s' frissített állapotának vágása sikertelen"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "`%.250s' frissített állapotának fsync-je sikertelen"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "`%.250s' frissített állapotának lezárása sikertelen"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "`%.250s' frissített állapotának telepítése sikertelen"
@@ -276,89 +282,91 @@
 msgid "unable to open directory '%s'"
 msgstr "e forrásfájl nem megnyitható: `%.250s'"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "e forrásfájl nem megnyitható: `%.250s'"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "e forrásfájl nem megnyitható: `%.250s'"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "nem lehet kiüríteni a vsnprintf-ben"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "`%.50s' részletei nem írhatók ide: `%.250s'"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "`%s' nem nyitható meg %s információ irására"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "a status fájlon a pufferelés beállítása sikertelen"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr ""
 "nem sikerült %s rekord kiírása a következőről: \"%.50s\" ide: \"%.250s\""
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "nem sikerült fsync-elni %s információt ide: \"%.250s\""
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "nem sikerült fsync-elni %s információt ide: \"%.250s\""
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "`%s' nem nyitható meg %s információ irására"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "dpkg: %s: figyelem - meghiúsult `%.250s' láncolása ide: `%.250s': %s\n"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "nem sikerült telepíteni `%.250s'-t `%.250s'-ként"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 msgid "out of memory for new error context"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -367,33 +375,33 @@
 "%s: hiba a tisztítás során:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: túl sok beágyazott hiba a hiba helyreállítása során!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: hibás feldolgozás: %s (--%s):\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: hiba %s írásakor: %s"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%d: belső `%s' hiba\n"
@@ -409,106 +417,106 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "`%.*s' tilos %s számára"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "szemét %s után"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "hibás csomagnév (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "üres `%s' fájl részletek mező"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "`%s' fájl részletek mező tilos az állapot fájlban"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "túl sok érték `%s' fájl részletek mezőben (más mezőkhöz képest)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "kevés érték `%s' fájl részletek mezőben (más mezőkhöz képest)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "yes/no a logikai mezőben"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "szó a `priority' mezőben"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "érték a `status' mezőben tilos e környezetben"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "1. (kért) szó a `status' mezőben"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "2. (hiba) szó a `status' mezőben"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "3. (állapot) word in `status' field"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "hiba a `%.250s' Verzió szövegben: %.250s"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "elavult `Revision' vagy `Package-Revision' mező"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "érték a `config-version' mezőben tilos e környezetben"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "hiba a `%.250s' Config-Version szövegben: %.250s"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "érték a `conffiles'-hoz rossz `%.*s' sort tartalmaz"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "érték a `conffiles'-hoz nem-szóköz `%c' karaktert tartalmaz"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "gyökér vagy üres könyvtár konffájlként listázva"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 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/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "`%s' mező, érvénytelen `%.255s' csomagnév: %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -517,7 +525,7 @@
 "`%s' mező, hivatkozás erre: `%.255s':\n"
 " rossz verzió reláció %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -526,7 +534,7 @@
 "`%s' mező, hivatkozás erre: `%.255s':\n"
 " `%c' elavult, használd a `%c='-t vagy `%c%c'-t"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -535,11 +543,11 @@
 "`%s' mező, hivatkozás erre: `%.255s':\n"
 " valójában pontos verzióra hivatkozik, `=' javasolt"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Csak pontos verziók használhatók a Provides mezőhöz"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -548,58 +556,58 @@
 "`%s' mező, hivatkozás erre: `%.255s':\n"
 " a verzió érték nem-alfanumerikussal kezdődik, szóköz javasolt"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "`%s' mező, hivatkozás erre: `%.255s': a verzió `%c'-t tartalmaz"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "`%s' mező, hivatkozás erre: `%.255s': lezáratlan verzió"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "`%s' mező, hivatkozás erre: `%.255s': hibás verzió: %.255s"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "`%s' mező, nyelvtani hiba e csomaghivatkozás után: `%.255s'"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternatíva (`|') tilos e mezőben: %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 #, fuzzy
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "érték a `config-version' mezőben tilos e környezetben"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, fuzzy, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "`%s' mező, érvénytelen `%.255s' csomagnév: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 #, fuzzy
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "érték a `status' mezőben tilos e környezetben"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, fuzzy, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "rossz csomagnév a %d. sorban: %.250s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, fuzzy, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "fájllista e csomaghoz: `%.250s'"
@@ -656,7 +664,7 @@
 msgid "unable to write to status fd %d"
 msgstr "`%.250s' frissített állapotának írása sikertelen"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "realloc failed (%zu bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -667,8 +675,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc hiba (%zu bájt)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 #, fuzzy
 msgid "failed to allocate memory"
 msgstr "sikertelen könyvtár létrehozás"
@@ -702,198 +710,204 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr ""
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "beállítási hiba: %s egy értéket vár"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, fuzzy, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "meghiúsult az alábbi beállító fájl megnyitása olvasásra: `%.255s'"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "ismeretlen `%s' lehetőség"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "A --%s opció értéket vár"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "A --%s opció nem vár értéket"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "beállító fájl olvasási hiba: `%.255s'"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "hiba e beállító fájl lezárásakor: `%.255s'"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "hiba e beállító fájl lezárásakor: `%.255s'"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "ismeretlen lehetőség -- %s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "A --%s opció értéket vár"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "A --%s opció nem vár értéket"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "ismeretlen lehetőség -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "A -%c opció értéket vár"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "A -%c opció nem vár értéket"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "Figyelem: elavult lehetőség `--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "ütköző műveletek -%c (--%s) and -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "kettős érték e mezőben: `%s'"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "a felhasználó által megnevezett `%.*s' mező túl rövid"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "kettős érték e felhasználói mezőben: `%.*s'"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Configured-Version van hibás állapotú csomaghoz"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "nem-telepített csomaghoz konfigurációs fájlok vannak, elfelejtem őket"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "nem tudtam megnyitni `%.255s' csomag info fájlt olvasásra"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "nem lelem `%.255s' csomag info fájlt"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "nem tudom mmapolni `%.255s' csomag info fájlt"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "nem lelem `%.255s' csomag info fájlt"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "sikertelen lezárás olvasás után: `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF e mező után: `%.*s'"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "új sor e mezőben: `%.*s'"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS EOF (^Z) e mezőben: `%.*s'"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "`%.*s' mezőnév után : kell"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF e mező értéke előtt: `%.*s' (hiányzó lezáró új sor)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "MSDOS EOF e mező értékében: `%.*s' (hiányzó új sor?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "új sor e mezőben: `%.*s'"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF e mező értékében: `%.*s' (hiányzó lezáró új sor)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "több csomaginfó bejegyzés létezik, csak 1 lehet"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "sikertelen lezárás olvasás után: `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "nem találok csomag infót ebben: `%.255s'"
@@ -912,67 +926,67 @@
 " %.255s"
 msgstr "%s, e fájl `%.255s' %d. soránál"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "nem lehet üres szöveg"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "alfanumerikussal kell kezdődnie"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, 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)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<nincs>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "a verzió helye üres"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "a verziószámban szóközök vannak"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "hiányzó szám a verzióban"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "nincs semmi a : után a verziószámban"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "nincs semmi a : után a verziószámban"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "nincs semmi a : után a verziószámban"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "hiányzik: %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "üres érték ehhez: %s"
@@ -991,51 +1005,51 @@
 msgid "(no description available)"
 msgstr "(nincs leírás)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "nem tudom eldobni a %s jelet a szkript futtatása előtt"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "hiba a %s jel elengedésekor: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (alfolyamat): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "fork hiba"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "%s alfolyamat %d hibakóddal kilépett"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "%s kódra várakozás meghiúsult"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "%s alfolyamat megölve, a halált okozó jel: (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ""
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "%s alfolyamat meghiúsult %d állapot kódra várva"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "%s kódra várakozás meghiúsult"
@@ -1055,197 +1069,203 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, fuzzy, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "e forrásfájl nem megnyitható: `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 msgid "triggers area"
 msgstr "nem tudom kioldani %s-t: %s"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, fuzzy, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "nem találom a másik `%.250s' új fájlt"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, fuzzy, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "e forrásfájl nem megnyitható: `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, fuzzy, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "sikertelen az új raktár fájl megnyitása: `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, fuzzy, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "hibás %s olvasás e fájlból: %.255s"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, fuzzy, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "sikertelen az új raktár fájl megnyitása: `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, fuzzy, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "sikertelen az új raktár fájl megnyitása: `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, fuzzy, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "nem tudom telepíteni `%.255s' új verzióját"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, fuzzy, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "sikertelen az új raktár fájl megnyitása: `%.250s'"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, fuzzy, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "`%.250s' rész fájl nem olvasható"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:419
-#, fuzzy, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "nem találom a másik `%.250s' új fájlt"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, fuzzy, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "nem találom a másik `%.250s' új fájlt"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "nem találom a másik `%.250s' új fájlt"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "nem találom a másik `%.250s' új fájlt"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
+msgstr "nem tudom telepíteni `%.255s' új verzióját"
+
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "nem törölhető: `%.250s'"
+
+#: lib/dpkg/triglib.c:360
+#, fuzzy, c-format
+msgid "unable to create new trigger interest file `%.250s'"
 msgstr "nem találom a másik `%.250s' új fájlt"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:383
 #, fuzzy, c-format
-msgid "unable to install new trigger interest file `%.250s'"
-msgstr "nem tudom telepíteni `%.255s' új verzióját"
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "nem találom a másik `%.250s' új fájlt"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:456
 #, fuzzy, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr "nem tudom telepíteni az új `%.250s' info fájlt, mint `%.250s'"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, fuzzy, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "sikertelen az új raktár fájl megnyitása: `%.250s'"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, fuzzy, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "sikertelen az új raktár fájl megnyitása: `%.250s'"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "sikertelen az új raktár fájl megnyitása: `%.250s'"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "sikertelen az új raktár fájl megnyitása: `%.250s'"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "sikertelen az új raktár fájl megnyitása: `%.250s'"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, fuzzy, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "nem tudom telepíteni az új `%.250s' info fájlt, mint `%.250s'"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, fuzzy, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "`%.250s' rész fájl nem olvasható"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, fuzzy, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "beállító fájl olvasási hiba: `%.255s'"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, fuzzy, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "e forrásfájl nem megnyitható: `%.250s'"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, fuzzy, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "`%.250s' raktár könyvtár nem olvasható"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, fuzzy, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "`%.250s' raktár könyvtár nem olvasható"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, fuzzy, c-format
 msgid "read error in `%.250s'"
@@ -1270,7 +1290,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "hiba a dpkg-deb cső olvasásakor"
 
@@ -1289,12 +1309,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "hiba az alábbi jlánc tulajdonosának beállításakor: `%.255s'"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "nem sikerült beállítani `%.255s' tulajdonosát"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "nem sikerült beállítani `%.255s' jogait"
@@ -1349,17 +1369,27 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "az archívum `%.255s' objektuma ismeretlen 0x%x típusú"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat file '%s'"
+msgstr "a régi `%s' név nem található: %s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Fájlok cseréje a régi %s csomagban...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, 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:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1367,94 +1397,99 @@
 msgstr ""
 "`%.250s' könyvtár felülírási kísérlete a csomagban: %.250s más fájltípussal"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "`%.250s' felülírási kísérlete, mely az alábbi csomagban is szerepel: %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "`%.255s' olvasási hiba (itt: `%.255s')"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "háttér dpkg-deb `%.255s' során"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "hiba az alábbi lezárásakor/írásakor: `%.255s'"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "hiba az alábbi cső létrehozásakor: `%.255s'"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "hiba az alábbi eszköz létrehozásakor: `%.255s'"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "hiba az alábbi merev lánc létrehozásakor: `%.255s'"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "hiba az alábbi jelképes lánc létrehozásakor: `%.255s'"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "hiba az alábbi könyvtár létrehozásakor: `%.255s'"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, 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:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "meghiúsult e lánc olvasása: `%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, 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"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "nem tudom telepíteni `%.255s' új verzióját"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "`%.255s' nem hozható létre"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "e forrásfájl nem megnyitható: `%.250s'"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1464,7 +1499,7 @@
 "függőségi gondokat:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, fuzzy, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1473,7 +1508,7 @@
 "dpkg: figyelem - egy lényeges csomag: %s dekonfigurálását\n"
 " választottad %s eltávolításáért.\n"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1482,7 +1517,7 @@
 "dpkg: nem, %s lényeges, nem dekonfigurálom\n"
 " %s eltávolításáért.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1491,28 +1526,28 @@
 "dpkg: nem, nem tudom törölni %s-t (--auto-deconfigure segít):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, fuzzy, c-format
 msgid "removal of %.250s"
 msgstr "olvasási hiba itt: %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, fuzzy, c-format
 msgid "installation of %.250s"
 msgstr "nem tudom telepíteni `%.255s' új verzióját"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, fuzzy, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: %s törlése %s javára...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, fuzzy, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: igen, törlöm %s-t %s javára.\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1521,148 +1556,150 @@
 "dpkg: %s miatt %s-t is tartalmazza:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 #, fuzzy
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "dpkg: figyelem - az ütközések figyelmen kívül hagyásával folytatom !\n"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "requested.\n"
 msgstr "dpkg %s újratelepítést kíván, de kérésedre törlöm.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "ütköző csomagok - nem telepítem %.250s-t"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 #, fuzzy
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "dpkg: figyelem - az ütközések figyelmen kívül hagyásával folytatom !\n"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, 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:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "find futtatása a --recursive-hoz sikertelen"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "sikertelen fdopen a find csőhöz"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "hiba a find cső olvasásakor"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "hiba a find cső lezárásakor"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, 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:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "kerestem, de nem leltem csomagokat (*.deb fájlokat)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Új csomag kiválasztása: %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Kijelöletlen %s csomag átugrása.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, 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:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s - figyelem: %.250s öregbítése innen: %.250s ide: %.250s.\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, 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"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1671,39 +1708,39 @@
 "nem lehet törölni `%.250s' újonnan telepített verzióját a biztonsági másolat "
 "újratelepítéséhez"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "nem lehet visszaállítani \"%.250s\" mentett változatát"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "nem lehet visszaállítani \"%.250s\" mentett változatát"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "nem tudom eltávolítani `%.250s' újonnan-telepített verzióját"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "nem tudom eltávolítani `%.250s' újonnan-kicsomagolt verzióját"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "nem érhető el az új terjesztési beállítófájl: %.250s"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "nem érhető el a jelenleg telepített beállítófájl: %.250s"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1714,60 +1751,60 @@
 "Nincs `%s' beállító fájl a rendszeren.\n"
 "Kérésedre újat telepítek.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "dpkg: %s: figyelem - a régi `%.250s' mentés törlése meghiúsult: %s\n"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 "dpkg: %s: figyelem - nem sikerült átnevezni `%.250s'-t erre: `%.250s': %s\n"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: sikertelen gzip %s futtatás"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "dpkg: %s: figyelem - a régi `%.250s' mentés törlése meghiúsult: %s\n"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 "dpkg: %s: figyelem - nem sikerült `%.250s' eltávolítása (felülírás előtt): "
 "%s\n"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "dpkg: %s: figyelem - meghiúsult `%.250s' láncolása ide: `%.250s': %s\n"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Új beállító fájl telepítése %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "nem sikerült telepíteni `%.250s'-t `%.250s'-ként"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "nincs `%s' csomag telepítve, így nem beállítható"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "A(z) %.250s csomag már települt és be van állítva"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1776,7 +1813,7 @@
 "A(z) %.250s csomag nem beállítható\n"
 " (jelenlegi állapota: `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1785,11 +1822,11 @@
 "dpkg: függőségi gondok miatt nem beállítható e csomag: %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "függőségi hibák - e csomag beállítatlan maradt"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1798,7 +1835,7 @@
 "dpkg: %s: függőségi hibák, mégis konfigurálom, mert ezt akartad:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1806,12 +1843,12 @@
 "E csomag nagyon rossz, következetlen állapotban van - újra kell \n"
 " telepítened a beállítás előtt."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Beállítás: %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, fuzzy, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1820,7 +1857,7 @@
 "dpkg: %s: figyelem - nem lelem e beállítófájlt: `%s'\n"
 " (= `%s'): %s\n"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, fuzzy, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1829,7 +1866,7 @@
 "dpkg: %s: figyelem - `%s' beállítófájl egy körkörös lánc\n"
 " (= `%s')\n"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, fuzzy, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1838,7 +1875,7 @@
 "dpkg: %s: figyelem - nem lelem e beállítófájlt: `%s'\n"
 " (= `%s'): %s\n"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, fuzzy, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1847,34 +1884,34 @@
 "dpkg: %s: figyelem - `%.250s' konffájl nem-eredeti fájlnevet old fel\n"
 " (`%s' jlánc ide: `%s')\n"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, fuzzy, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "dpkg: %s: figyelem - `%.250s' konffájl nem sima fájl vagy jlánc (= `%s')\n"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "nem tudom megnyitni %s-t írásra: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Írd be az `exit'-et, ha kész vagy.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1883,12 +1920,12 @@
 "\n"
 "Beállító fájl: `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (jelenleg `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1899,7 +1936,7 @@
 " ==> A rendszeren lévő fájlt Te, vagy egy másik parancsfájl írta.\n"
 " ==> A fájl a karbantartó által készített csomagban is létezik.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1908,7 +1945,7 @@
 "\n"
 "     Nem módosult a telepítés óta.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1917,7 +1954,7 @@
 "\n"
 " ==> Módosítottad (Te vagy egy parancsfájl) a telepítés óta.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1926,37 +1963,37 @@
 "\n"
 " ==> Törölted (Te, vagy egy parancsfájl) a telepítés óta.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> A csomag terjesztője frissített.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     A csomagban lévő változat megfelel a legutóbb telepítettnek\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Kérésedre az új fájlt használom.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Kérésedre a mostani régi fájlt használom.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr "==> Régi fájl megtartása alapértelmezettként.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Új fájl használata alapértelmezettként.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1971,165 +2008,166 @@
 "      D     : különbségek megtekintése\n"
 "      Z     : a kérdés háttérbe rakása a mérlegelésig\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Az alapművelet a jelenlegi változatod megtartása.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Az alapművelet az új változat telepítése.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[alapművelet=N:nem]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[alapművelet=Y:igen]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[nincs alapművelet]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr ""
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr ""
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, fuzzy, c-format
 msgid "%s depends on %s"
 msgstr " függőségek: "
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, fuzzy, c-format
 msgid "%s pre-depends on %s"
 msgstr " elő-függőségek: "
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, fuzzy, c-format
 msgid "%s recommends %s"
 msgstr " ajánlások:"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, fuzzy, c-format
 msgid "%s suggests %s"
 msgstr " tippek:"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, fuzzy, c-format
 msgid "%s breaks %s"
 msgstr "%s (alfolyamat): %s\n"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, fuzzy, c-format
 msgid "%s conflicts with %s"
 msgstr " ütközések:"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, fuzzy, c-format
 msgid "%s enhances %s"
 msgstr " kiterjeszti "
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s eltávolításra jelölt.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s dekonfigurálásra jelölt.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s telepített, de verziója %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, 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:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s kibontva, de verziója %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s legutolsó beállított verziója %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, 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:378
+#: src/depcon.c:392
 #, 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:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s adja %.250s-t de %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s nincs telepítve.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (%.250s verzió) telepítésre jelölt.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, fuzzy, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (%.250s verzió) %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, 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:520
+#: src/depcon.c:537
 #, fuzzy, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s adja %.250s-t és %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+msgid "Use --help for help about diverting files."
+msgstr "A dpkg-split --help parancs segít"
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s %s verzió.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2144,8 +2182,8 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2156,7 +2194,7 @@
 "Ez egy Szabad Szoftver; l. a GNU General Public Licence 2-es vagy nagyobb\n"
 "változatát a másolási feltételekért. NINCS garancia.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2166,7 +2204,7 @@
 "Használat: %s [<opció> ...] <parancs>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2178,7 +2216,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -2211,7 +2249,7 @@
 "  --help                   e súgó üzenet mutatása.\n"
 "  --version                verzió mutatása.\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2220,19 +2258,13 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat file '%s'"
-msgstr "a régi `%s' név nem található: %s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error checking `%s': %s"
 msgid "error checking '%s'"
 msgstr "hiba `%s' ellenőrzésekor: %s"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2241,140 +2273,140 @@
 "átnevezés `%s' felülírásával járna\n"
 "  `%s' eltérő fájllal, ez nem engedélyezett"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "e forrásfájl nem megnyitható: `%.250s'"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "cannot stat new name `%s': %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "az új `%s' név nem behatárolható: %s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 #| msgid "rename: remove duplicate old link `%s': %s"
 msgid "rename: remove duplicate old link '%s'"
 msgstr "átnevezés: kettős régi `%s' lánc törlése: %s"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "e forrásfájl nem megnyitható: `%.250s'"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 msgid "local diversion of %s"
 msgstr "helyben eltérítve ide: %s\n"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 msgid "local diversion of %s to %s"
 msgstr "helyben eltérítve ide: %s\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "diversion of %s by %s"
 msgstr "%s általi eltérítések"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "eltérítve %s által ide: %s\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "any diversion of %s"
 msgstr "%s általi eltérítések"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 msgid "any diversion of %s to %s"
 msgstr "eltérítve %s által ide: %s\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "cannot open GPL file"
 msgid "cannot create new %s file"
 msgstr "a GPL fájl nem nyitható meg"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "nem lehet kiüríteni a vsnprintf-ben"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 #| msgid "remove old diversions-old: %s"
 msgid "error removing old diversions-old"
 msgstr "régi diversions-old eltávoltása: %s"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "hiba az új statoverride-old létrehozásakor: %s"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "hiba az új statoverride telepítésekor: %s"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s 1 argumentumot vár"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "\"%s\" fájlnév nem abszolút"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "fájl nem tartalmazhat újsorokat"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Könyvtárak eltérítése sikertelen"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "Könyvtárak eltérítése sikertelen"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "`%s' elhagyása"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' ütközik ezzel: `%s'"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "`%s' hozzáadása"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
 msgstr "Nincs `%s' eltérítés, nem volt eltávolítás"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2385,7 +2417,7 @@
 "  `%s' eltávolításakor\n"
 "  `%s'-t találtam"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2396,17 +2428,17 @@
 "  `%s' eltávolításakor\n"
 "  `%s'-t találtam"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "%s eltávolítása"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "csomag nem tartalmazhat újsorokat"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "divert-to nem tartalmazhat újsorokat"
 
@@ -2484,8 +2516,8 @@
 msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s nem vár argumentumot"
@@ -2576,7 +2608,7 @@
 msgid "--compare-versions bad relation"
 msgstr "rossz --compare-versions reláció"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "az a verzió nyelvtana hibás: %s\n"
@@ -2634,12 +2666,12 @@
 "dpkg - figyelem, felülbírálom a hibát, mivel a --force érvényes:\n"
 " "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "nem tudom megnyitni a fájllista fájlt e csomaghoz: `%.250s'"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, fuzzy, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2648,70 +2680,70 @@
 "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:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "nem tudom megnyitni a fájllista fájlt e csomaghoz: `%.250s'"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "fájllista e csomaghoz: `%.250s'"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, fuzzy, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "nem sikerült lezárni a fájllista fájlt e csomaghoz: `%.250s'"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Adatbázis olvasása ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "Most %d fájl és könyvtár telepített.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "nem sikerült friss fájllista fájlt létrehozni csomaghoz: %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "sikertelen írás a friss fájllista fájlba e csomaghoz: %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "nem sikerült kiüríteni a frissített fájllista fájlt e csomaghoz: %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, 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"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "nem sikerült bezárni a frissített fájllista fájlt e csomaghoz: %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "nem sikerült telepíteni a frissített fájllista fájlt e csomaghoz: %s"
@@ -2751,7 +2783,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "dpkg - hiba: a PATH változó nincs beállítva.\n"
 
 #: src/help.c:129
@@ -2783,7 +2815,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "nem lehet stat-olni a vsnprintf-ben"
@@ -2794,66 +2826,66 @@
 msgstr "meghiúsult a chroot ide: `%.250s'"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "sikertelen chdir ide: `%.255s'"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "`%.250s' futtatási jogainak beállítása sikertelen"
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "nem lehet stat-olni a vsnprintf-ben"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "régi %s szkript"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "nem lelem %s `%.250s'-t"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "új %s szkript"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "régi %s szkript"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "nem lelem %s `%.250s'-t"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - inkább megnézem az új csomag szkriptjét ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "nincs új szkript a csomag új változatában - feladom"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... úgy fest, rendben ment.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "`%.255s' nem hozható létre"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2862,7 +2894,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "nem ellenőrizhető `%.250s' léte"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "az info könyvtár nem olvasható"
 
@@ -2929,7 +2961,7 @@
 "  -Dh|--debug=help                 Súgó mutatása hibakereséskor.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -3054,7 +3086,7 @@
 msgstr ""
 "Használd a `aptitude' (vagy `dselect') felhasználó-barát csomag-kezelőket\n"
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3106,30 +3138,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3138,102 +3174,102 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "függőségek vannak - nem törlöm"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "függőségek vannak - nem törlöm"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "nem lehet stat-olni a vsnprintf-ben"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "beállító fájl olvasási hiba: `%.255s'"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3241,7 +3277,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3249,37 +3285,37 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "a --debug egy oktális argumentumot igényel"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nincs csomagnév az --ignore-depends vesszővel elválasztott listájában: `"
 "%.250s'"
 
-#: src/main.c:352
+#: src/main.c:354
 #, 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:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "érvénytelem egész a --%s számára: `%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3288,7 +3324,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3296,12 +3332,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ismeretlen `%.*s' kényszerítő/elutasító opció"
 
-#: src/main.c:511
+#: src/main.c:513
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "Figyelem: elavult `--%s' kényszerítő/elutasító opció\n"
@@ -3324,8 +3360,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "váratlan eof e sor vége előtt: %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "egy művelet opciót igényel"
 
@@ -3487,187 +3523,187 @@
 msgid "passed\n"
 msgstr ""
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "hiba az átmeneti könyvtárnév létrehozásakor"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr ""
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, 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'"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "nem tudom eltávolítani az elavult `%.250s' info fájlt"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "nem tudom telepíteni az (állítólagos) új `%.250s' info fájlt"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "nem tudom megnyitni az átmeneti ellenőrző könyvtárat"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr "a csomagban túl hosszú control info fájlnév van (kezdete: `%.50s')"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr ""
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr "dpkg: figyelem - %s csomag listát tartalmazott info fájlként"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "nem tudom telepíteni az új `%.250s' info fájlt, mint `%.250s'"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "nem tudom törölni `%.250s' kontroll info fájlt"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "az archívum nem elérhető"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "hiba az átmeneti könyvtárnév létrehozásakor"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "ellenőrző információ hossz"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "%s információit rögzítettem innen: %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "a csomag géptípusa (%s) eltér a rendszertől (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
 "%s"
 msgstr ""
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "elő-függőségi gond - %.250s nem települ"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr "dpkg: figyelem - elő-függőségi gondok átlépése !\n"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "%s %s cseréjének előkészítése (e csomaggal: %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Kicsomagolás: %s innen: %s ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "a konffájl neve (kezdete: `%.250s') túl hosszú (>%d karakter)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "olvasási hiba itt: %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "hiba %.250s bezárásakor"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "hiba %.250s megnyitásakor"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, fuzzy, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "%s dekonfigurálása, így %s eltávolíthatóvá válik...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, fuzzy, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Eltávolítás: %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Csere kicsomagolása: %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "hiba a dpkg-deb tar kimenet olvasásakor"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "hibás fájlrendszer tarfájl -- hibás csomag archívum"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: lehetséges vezető 0-ák levágása"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, fuzzy, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "dpkg: figyelem - nem lelem a régi fájlt: `%.250s' így nem törlöm: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "dpkg: figyelem - nem törölhető a régi könyvtár: `%.250s': %s\n"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, fuzzy, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "dpkg: figyelem - a régi konffájl: `%.250s' egy üres könyvtár volt (ezt most "
 "törlöm)\n"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "nem találom a másik `%.250s' új fájlt"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, fuzzy, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3676,12 +3712,12 @@
 "dpkg: figyelem - `%.250s' régi fájl új fájlokkal egyezik!  (`%.250s' és `"
 "%.250s')"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "dpkg: figyelem - nem tudom %s a régi fájlt `%%.250s': %%s\n"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
@@ -3847,7 +3883,7 @@
 "  -f|--showformat=<forma>          Más forma a --show opcióhoz.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3868,6 +3904,10 @@
 "  által. A mezők jobbra igazítottak, ha a szélesség negatív, akkor\n"
 "  balra.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, fuzzy, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3928,7 +3968,7 @@
 msgid "Removing %s ...\n"
 msgstr "Eltávolítás: %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, fuzzy, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3937,48 +3977,49 @@
 "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:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "nem törölhető: `%.250s'"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "%.250s létrehozása sikertelen"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 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:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "nem törölhető: `%.250s'"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "%s beállító fájlok törlése ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "nem tudom törölni a régi `%.250s' (= `%.250s') konfig fájlt"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "olvashatatlan `%.250s' konfig fájl könyvtár (innen: `%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr "`%.250s' (ezé: `%.250s') régi mentett konfig fájl eltávolíthatatlan"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "nem tudom törölni a régi fájl listát"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "nem tudom törölni a régi postrm szkriptet"
 
@@ -4021,7 +4062,11 @@
 msgid "read error on standard input"
 msgstr "olvasási hiba a szabvány bemeneten"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4031,7 +4076,7 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4042,7 +4087,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -4070,56 +4115,56 @@
 "  --help                   e súgó üzenet mutatása.\n"
 "  --version                verzió mutatása.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "/ leszedése"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "nem megnyitható új statoverride fájl: %s"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "hiba a statoverride-old törlésekor: %s"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "hiba az új statoverride-old létrehozásakor: %s"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "hiba az új statoverride telepítésekor: %s"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "a --add 4 argumentumot vár"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, fuzzy, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr "de --force miatt figyelmen kívül hagyom"
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, fuzzy, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "\"%s\" egy felülbírálása már létezik, "
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, fuzzy, c-format
 msgid "--update given but %s does not exist"
 msgstr "figyelem: --update megadva, de %s nem létezik"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Nincs felülbírálás."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 #, fuzzy
 msgid "--update is useless for --remove"
 msgstr "figyelem: a --update értelmetlen --remove esetén"
@@ -4191,17 +4236,17 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "statoverride fájl: `%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "A dpkg-split --help parancs segít"
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debian `%s' csomagkezelő program lekérdező eszköz\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4211,7 +4256,7 @@
 "Használat: %s [<opció> ...] <parancs>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4220,7 +4265,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4234,31 +4279,31 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 #, fuzzy
 msgid "takes one argument, the trigger name"
 msgstr "--%s csak 1 argumentumot fogad (.deb fájlnév)"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "`%s' mező, érvénytelen `%.255s' csomagnév: %s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "`%s' mező, érvénytelen `%.255s' csomagnév: %s"
@@ -4287,39 +4332,40 @@
 msgstr "%s beállító fájlok törlése ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s pontosan 1 Packages fájl argumentumot vár"
 
-#: src/update.c:61
+#: src/update.c:62
 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"
 
-#: src/update.c:63
+#: src/update.c:64
 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"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Az elérhető (available) csomagok listájának cseréje ezzel: %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Az elérhető (available) csomagok listájának frissítése ezzel: %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "%d csomag információja frissült.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4434,8 +4480,8 @@
 msgid_plural "ignoring %d warnings about the control file(s)\n"
 msgstr[0] "dpkg-deb: %d figyelmeztetés átlépése az ellenőrző fájl(ok)ról\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s egy <könyvtár> argumentumot vár"
@@ -4467,26 +4513,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: `%s' csomag építése itt: `%s'.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "tmpfájl létrehozása sikertelen (adat)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "ellenőrző terület"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "tmpfájl elláncolása sikertelen (adat), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4502,20 +4548,20 @@
 msgid "error writing `%s'"
 msgstr "hiba `%s' írásakor"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "tagok közt"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "fájlnév írás a tar csőbe (adatok) meghiúsult"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4533,76 +4579,76 @@
 msgid "error reading %s from file %.255s"
 msgstr "hibás %s olvasás e fájlból: %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "sikertelen archívum olvasás: `%.255s'"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "sikertelen archívum fstat"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "nincs . az archívum verziószámában"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "nincs újsor az archívum fejlécében"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "Az alábbi fájl: `%.250s' sérült - rossz részszám"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "`%.250s' nem egy Debian bináris archívum (dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "nincs . az archívum verziószámában"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "nincs újsor az archívum fejlécében"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "nincs . az archívum verziószámában"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 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:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "kihagyott tag adat innen: %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "A(z) `%.250s' fájl érthetetlen %.*s adattagot tartalmaz, feladom"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "A(z) `%.250s' fájl 2 ellenőrző tagot tartalmaz, feladom"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4614,23 +4660,23 @@
 " új Debian csomag, %s verzió.\n"
 " méret: %ld bájt: ellenőrző archívum= %zi bájt.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "az archívum `%s' ellenőrző hossza rossz"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "kihagyott tag adat innen: %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4642,7 +4688,7 @@
 " 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:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4651,50 +4697,51 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' nem Debian archívum"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "hiba a pipába íráskor másolásnál"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "pipa bezárás hiba a másoláskor"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "adatok"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "hiba a könyvtárváltáskor"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "sikertelen könyvtár létrehozás"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 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:293
-msgid "failed to chdir to directory"
-msgstr "hiba a könyvtárváltáskor"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s: kicsomagolás"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr ""
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s egy .deb fájlnév argumentmot vár"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4703,97 +4750,97 @@
 "--%s egy célkönyvtárat igényel.\n"
 "Lehet, hogy a dpkg --install-t kell használnod ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s csak 1 argumentumot fogad (.deb fájlnév)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "nem tudok a /-re váltani a tisztításhoz"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
 msgid "control file '%s'"
 msgstr "a régi `%s' név nem található: %s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: `%.255s' nem tartalmaz `%.255s' ellenőrző összetevőt\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, 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"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, fuzzy, c-format
 #| msgid "One requested control component is missing"
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "1 kért ellenőrző összetevő hiányzik"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "`%.255s' könyvtár nem nézhető át"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "`%.255s' nem található (ebben: `%.255s')"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "`%.255s' nem nyitható meg (ebben: `%.255s')"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "`%.255s' olvasási hiba (itt: `%.255s')"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bájt, %5d sor   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     nem sima fájl             %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(nincs `control' fájl az ellenőrző archívumban!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "a `control' összetevő nem nyitható meg"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "hiba a `control' összetevő olvasásakor"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "hiba a find cső lezárásakor"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Hibás forma"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "a --contents 1 argumentumot vár"
 
@@ -4803,7 +4850,19 @@
 msgstr "Debian `%s' csomag archívum háttér %s változat .\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4814,6 +4873,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4829,7 +4890,7 @@
 "  --fsys-tarfile <deb>              fájlrendszer tarfájl kiírása.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4842,11 +4903,12 @@
 "A <cfield> Egy a fő `control' fájlban használt mező neve.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4870,7 +4932,7 @@
 "                                     Lehetőségek: gzip, bzip2, lzma, nincs.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4884,7 +4946,7 @@
 "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"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4892,17 +4954,17 @@
 "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:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "érvénytelem egész a --%s számára: `%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "érvénytelem egész a --%s számára: `%.250s'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ismeretlen tömörítés: `%s'!"
@@ -4922,7 +4984,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "E fájl: `%.250s' hibás - hiányzó új sor ezután: %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "olvasási hiba: %.250s"
@@ -5010,48 +5072,53 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "Az alábbi fájl: `%.250s' sérült - rossz részszám"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+msgid "package architecture"
+msgstr " (csomag: "
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr "Az alábbi fájl: `%.250s' sérült - rossz varázs a második fejléc végén"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "Az alábbi fájl: `%.250s' sérült - a második tag nem adattag"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, 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"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "Az alábbi fájl: `%.250s' sérült - a méret rossz az idézett részszámhoz"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "`%.250s' rész fájl fstat sikertelen"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "E fájl: `%.250s' hibás - túl rövid"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "nem megnyitható archívum rész fájl: `%.250s'"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "A `%.250s' fájl nem egy archívum rész"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5071,6 +5138,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5093,12 +5161,19 @@
 "    Részfájl mérete (használt darab):  %lu bytes\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<ismeretlen>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "a --info egy vagy több részfájl argumentumot vár"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "A `%s' fájl nem egy archívum rész\n"
@@ -5131,7 +5206,7 @@
 msgid "split package part"
 msgstr "hiányzó csomag"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "kész\n"
@@ -5183,17 +5258,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Lehetőségek:\n"
 "  --depotdir <könyvtár> (alapértelmezett: %s/%s)\n"
@@ -5205,20 +5289,29 @@
 "\n"
 "Kilépési állapot: 0 = OK;  1 = -a nem egy rész;  2 = Baj van!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "A dpkg-split --help parancs segít"
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "váratlan fájl vége jel itt: %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "a rész mérete bőven túl vagy nem pozitív"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, fuzzy, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "a rész mérete legalább %dk kell legyen (a fejléchez)"
@@ -5329,41 +5422,41 @@
 msgid "Deleted %s.\n"
 msgstr "%s törölve.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "e forrásfájl nem megnyitható: `%.250s'"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "forrás fájl fstat sikertelen"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "`%.250s' forrás fájl nem sima fájl"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "a --split egy forrás fájlnév argumentumot vár"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "a --split egy forrás fájlnevet és cél előtagot fogad"
 
@@ -5453,133 +5546,94 @@
 "  --help                   e súgó üzenet mutatása.\n"
 "  --version                verzió mutatása.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 #, fuzzy
 #| msgid "parse error"
 msgid "error"
 msgstr "elemzési hiba"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "figyelj!"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat %s: %s"
-msgstr "a régi `%s' név nem található: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, fuzzy, c-format
 #| msgid "two commands specified: %s and --%s"
 msgid "two commands specified: --%s and --%s"
 msgstr "2 parancs megadva: %s és --%s"
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
 #| msgid "%s: can't open %s: %s"
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "%s: %s nem nyitható meg: %s"
 
-#: utils/update-alternatives.c:395
-#, fuzzy, c-format
-#| msgid "%s: copying %s to %s failed, giving up: %s"
-msgid "scan of %s failed: %s"
-msgstr "%s: %s másolása ide: %s sikertelen, feladom: %s"
-
-#: utils/update-alternatives.c:420
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "sikertelen futtatás: %s"
-
-#: utils/update-alternatives.c:503
-#, c-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"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "nem sikerült telepíteni %s-t mint %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "nem tudom törölni %s-t: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "váratlan fájl vége jel itt: %.250s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "%s olvasása sikertelen: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "váratlan fájl vége jel itt: %.250s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, fuzzy, c-format
 msgid "%s corrupt: %s"
 msgstr "belső hiba: %s rossz: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "újsorok tilosak az update-alternatives fájlokban (%s)"
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "%s: hiba %s írásakor: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "kettős %s szolga"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 #, fuzzy
 msgid "slave link"
 msgstr "kettős %s szolga lánc"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "szolga lánc és %s fő lánc azonos"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "kettős %s szolga lánc"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "kettős %s ösvény"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, fuzzy, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5588,232 +5642,268 @@
 "%s választása erre mutat: %s - melyet nem leltem. Eltávolítom a választási "
 "listából."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 #, fuzzy
 msgid "priority"
 msgstr "%s elsőbbség %s"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, fuzzy, c-format
 msgid "priority of %s: %s"
 msgstr "%s elsőbbség %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "%s olvasása sikertelen: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 #, fuzzy
 msgid "master link"
 msgstr "kettős %s szolga lánc"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "nem tudom lezárni %s-t: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, fuzzy, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "Elavult %s szolga lánc átugrása (%s)."
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "%s írása sikertelen: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, fuzzy, c-format
 msgid "  link currently points to %s"
 msgstr " lánc most ide mutat: %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 #, fuzzy
 msgid "  link currently absent"
 msgstr " lánc most hiányzik"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "%s - priority %s"
 msgid "%s - priority %d"
 msgstr "%s - %s elsőbbség"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr " %s szolga: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "A jelenlegi `legjobb' verzió: %s"
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Nincs elérhető verzió."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "Leírás"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 #, fuzzy
 msgid "Priority"
 msgstr "%s elsőbbség %s"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, fuzzy, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr "Üss entert az alap[*]-hoz, vagy a választás számát: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Nem találom a `%s' kiválasztást"
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "váratlan fájl vége jel itt: %.250s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "%s lánc átnevezése erről: %s erre: %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, fuzzy, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "%s szolga lánc név átnevezése innen: %s ide: %s"
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr ""
+
+#: utils/update-alternatives.c:2241
+#, fuzzy, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "figyelem: --update megadva, de %s nem létezik"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr ""
+"%s választása erre mutat: %s - melyet nem leltem. Eltávolítom a választási "
+"listából."
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr ""
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "ismeretlen %s argumentum"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "a --install követelményei: <lánc> <név> <ösvény> <elsőbbség>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "az elsőbbség egész szám kell legyen"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s számára <név> és <ösvény> kell"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s számára <név> kell"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "a --slave csak --install mellett engedélyezett"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "a --slave követelményei: <lánc> <név> <ösvény>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "%s elsődleges és szolga név is"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "%s elsődleges és szolga lánc is"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s 1 argumentumot vár"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "ismeretlen `%s' lehetőség"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -5822,67 +5912,23 @@
 "igénye --display, --config, --set, --install, --remove, --all, --remove-all "
 "vagy --auto"
 
-#: utils/update-alternatives.c:2215
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr ""
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2239
-#, fuzzy, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "figyelem: --update megadva, de %s nem létezik"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
-
-#: utils/update-alternatives.c:2257
-#, fuzzy, c-format
-msgid "it is a slave of %s"
-msgstr " %s szolga: %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "olvasási hiba a szabvány bemeneten"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, fuzzy, c-format
 msgid "no alternatives for %s."
 msgstr "Nincs kiválasztás erre: %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
@@ -5891,71 +5937,111 @@
 "%s-t módosítottad (kézzel vagy egy parancsfájllal).\n"
 "Csak-kézi-frissítésre váltok."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, fuzzy, c-format
 msgid "setting up automatic selection of %s."
 msgstr "%s automata kijelölésének beállítása."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "%s kiválasztása ehhez: %s nincs bejegyezve, nem törlöm"
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 "Nincs program, mely ezt adja: %s.\n"
 "Nincs beállítandó.\n"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "%s kiválasztása ehhez: %s nincs bejegyezve, nem törlöm"
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, fuzzy, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr "Kézi kiválasztás törlése - automata módra váltok"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "%s automata frissítései kikapcsolva, magára hagyom."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 "Az automatikus frissítésekhez való visszatéréshez használd az `update-"
 "alternatives --auto %s'-t"
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "'%s' használata '%s' számára."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~ msgid "it is a slave of %s"
+#~ msgstr " %s szolga: %s"
+
+#, fuzzy
+#~| msgid "cannot stat old name `%s': %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "a régi `%s' név nem található: %s"
+
+#, fuzzy
+#~| msgid "%s: copying %s to %s failed, giving up: %s"
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "%s: %s másolása ide: %s sikertelen, feladom: %s"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "sikertelen futtatás: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "%s jlánc készítése ide: %s nem sikerült: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "nem sikerült telepíteni %s-t mint %s: %s"
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "%s: hiba %s írásakor: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "%s olvasása sikertelen: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "nem tudom lezárni %s-t: %s"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "%s írása sikertelen: %s"
+
+#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "nem tudom átnevezni %s-t erre: %s: %s"
@@ -6200,9 +6286,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "kihagyott tag adat innen: %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "hiba a tar futtatásakor"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "hiba az átmeneti könyvtárnév létrehozásakor"
Binary files dpkg/po/id.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/id.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/id.po /home/vorlon/devel/multiarch/dpkg-debian/po/id.po
--- dpkg/po/id.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/id.po	2012-06-07 10:11:09.426073000 -0700
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.15\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-11-28 20:35+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."
@@ -26,7 +26,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "gagal menulis ke berkas '%s'"
@@ -47,71 +47,77 @@
 msgid "ar member file (%s)"
 msgstr "gagal menata status berkas anggota ar (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "gagal membaca saat menyalin buffer untuk %s"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "gagal menulis saat menyalin buffer untuk %s"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "pembacaan terputus saat menyalin buffer untuk %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "gagal menjalankan perintah tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "gagal menjalankan %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekompresi"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: kompresi"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: salah mengirimkan masukan ke stream gzip"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: ada galat internal saat membaca gzip: '%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: ada galat internal saat menulis gzip"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: salah mengirimkan keluaran ke stream gzip"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: ada galat internal saat membaca gzip"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: ada galat internal saat menulis gzip: '%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: ada galat internal saat menulis gzip: %s"
@@ -126,31 +132,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: ada galat internal saat membaca bzip2: '%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: ada galat internal saat menulis bzip2"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: salah mengirimkan keluaran ke stream bzip2"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: ada galat internal saat membaca bzip2"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: ada galat internal menulis bzip2: '%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "galat tak terduga pada bzip2"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -159,7 +165,7 @@
 "direktori 'updates' berisi berkas '%.250s' yang namanya terlalu panjang \n"
 "(panjang=%d, maks=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -167,98 +173,98 @@
 "direktori 'updates' berisi berkas dengan panjang namanya berbeda \n"
 "(keduanya %d dan %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "tidak dapat memindai direktori 'updates' '%.255s'"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "gagal membuang berkas 'update' gabungan %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "gagal membuat '%.255s'"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "gagal mengisi %.250s dengan padding"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "Gagal mengosongkan %.250s setelah padding"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "Gagal mencoba memulai %.250s setelah padding"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "Gagal membuka berkas pengunci %s untuk ujicoba"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "gagal membuka/membuat berkas kunci(lock) basis data status"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "Anda tidak memiliki izin untuk mengunci basis data status dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "gagal mengunci basis data status dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "operasi yang diminta membutuhkan kewenangan superuser"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "gagal mengakses area status dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "operasi ini membutuhkan akses baca/tulis ke area status dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "gagal membuang berkas 'update' saya: %.250s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "gagal menulis status terbaru dari '%.250s'"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "gagal mengosongkan status terbaru dari '%.250s'"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "gagal memotong untuk status terbaru dari '%.250s'"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "gagal sinkronisasi berkas status terbaru dari '%.250s'"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "gagal menutup status terbaru dari '%.250s'"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "gagal memasang status terbaru dari '%.250s'"
@@ -281,70 +287,72 @@
 msgid "unable to open directory '%s'"
 msgstr "gagal membuka berkas '%s'"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "gagal membuka berkas '%s'"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "gagal sinkronisasi berkas '%s'"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "gagal menutup berkas '%s'"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "gagal menulis rincian tentang '%.50s' ke '%.250s'"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "Gagal membuka '%s' untuk menulis basisdata %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "gagal menata penyangga (buffer) pada berkas basisdata %s"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "gagal menulis rekaman basisdata %s tentang '%.50s' ke '%.250s'"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "gagal memindahkan basisdata %s ke '%.250s'"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "gagal sinkrosinasi berkas basisdata %s ke '%.250s'"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "gagal menutup '%.250s' setelah menulis basisdata %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "gagal membuat nara '%.250s' ke '%.250s' untuk cadangan basisdata %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "gagal memasang '%.250s' sebagai '%.250s' yang berisi basisdata %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -353,7 +361,7 @@
 "%s: kesalahan fatal tak terbaiki; sedang membatalkan:\n"
 "%s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -365,13 +373,13 @@
 "%s: kesalahan fatal tak terbaiki; sedang membatalkan:\n"
 "%s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "kehabisan memory untuk masukan 'cleanup' baru"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -380,32 +388,32 @@
 "%s: ada galat saat membersihkan: \n"
 " %s \n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: terlalu banyak kesalahan berantai saat memperbaiki kesalahan!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "kehabisan memory untuk masukan 'cleanup' baru"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "kehabisan memory untuk masukan 'cleanup' baru dengan banyak argumen"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s: peringatan: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: peringatan: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s: %s: %d: galat internal: %s\n"
@@ -421,96 +429,96 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "'%.*s' tidak diperkenankan untuk %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "rongsokan setelah %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "nama paket (%.250s) tidak sah."
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "ruas 'file details' '%s' kosong"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "ruas 'file details' '%s' tidak diizinkan dalam berkas status"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "terlalu banyak nilai dalam ruas 'file details' '%s' (dibandingkan lainnya)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "terlalu sedikit nilai dalam ruas 'file details' '%s' (dibandingkan lainnya)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "ya/tidak dalam ruas boolean"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "kata dalam ruas 'prioritas'"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "nilai untuk ruas 'status' tidak diizinkan dalam konteks ini"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "kalimat (ingin) pertama dalam ruas 'status'"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "kalimat (galat) kedua dalam ruas 'status'"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "kalimat (status) ketiga dalam ruas `status'"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "Ada galat dalam string 'Version' '%.250s'"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "Ruas 'Revision' atau 'Package-Revision' yang sudah usang digunakan"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "nilai untuk ruas 'config-version' tidak diizinkan dalam konteks ini"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "Ada galat dalam string 'Config-Version' '%.250s'"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "nilai untuk 'conffiles' mengandung baris yang salah bentuk: '%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "nilai untuk 'conffiles' beisi baris yang diawali tanpa-spasi: '%c'"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr ""
 "direktori kosong atau root terdaftar sebagai sebuah berkas konfig (conffile)"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -518,12 +526,12 @@
 "ruas '%s', di tempat yang seharusnya ada nama paket, nama paket hilang atau "
 "salah"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "ruas '%s', nama paket '%.255s': %s tidak sah"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -532,7 +540,7 @@
 "ruas '%s', yang mengacu ke '%.255s': \n"
 "memiliki hubungan versi %c%c yang buruk."
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -541,7 +549,7 @@
 "ruas '%s', yang mengacu ke '%.255s':\n"
 "'%c' sudah usang, gunakan saja '%c=' atau '%c%c'"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -550,11 +558,11 @@
 "ruas '%s', yang mengacu ke '%.255s':\n"
 "nomor versi cocok secara tersirat, saran: gunakan saja '='"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Hanya versi yang tepat yang dapat digunakan untuk 'Provides'"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -563,55 +571,55 @@
 "ruas '%s', yang mengacu ke '%.255s':\n"
 "nilai versi dimulai tanpa alphanumerik, saran: tambahkan sebuah spasi"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "ruas '%s', yang mengacu ke '%.255s': versi berisi '%c'"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "ruas '%s', yang mengacu ke '%.255s': versi tidak diakhiri"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "ruas '%s', yang mengacu ke '%.255s': ada galat dalam versi"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "ruas '%s', salah syntaks setelah mengacu ke paket '%.255s'"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternatif ('|') tidak diizinkan dalam ruas %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "nilai untuk ruas 'triggers-pending' tidak diizinkan dalam konteks ini"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "nama pemicu tertunda '%.255s': %s tidak sah"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "pemicu tertunda '%.255s' ganda"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "nilai untuk ruas 'triggers-awaited' tidak diizinkan dalam konteks ini"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "nama paket dalam pemicu tertunggu '%.255s': %s tidak sah"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "paket pemicu tertunggu '%.250s' ganda"
@@ -668,7 +676,7 @@
 msgid "unable to write to status fd %d"
 msgstr "gagal menulis status fd %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "malloc failed (%ld bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -680,8 +688,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc gagal (%ld bita)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "gagal mengalokasikan memori"
 
@@ -714,199 +722,205 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "gagal menata tanda 'close-on-exec' untuk %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "galat konfigurasi: %s: %d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "gagal membuka berkas konfigurasi '%.255s' untuk dibaca: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "tanda kutip di '%s' tidak klop"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "pilihan '%s' tak dikenal"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "pilihan '%s' butuh suatu nilai"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "pilihan '%s' tidak ada nilainya"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "ada kesalahan membaca berkas konfigurasi '%.255s'"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "ada kesalahan menutup berkas konfigurasi '%.255s'"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "ada galat membuka direktori konfigurasi '%s'"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "pilihan --%s tak dikenal"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "pilihan --%s butuh suatu nilai"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "pilihan --%s tidak ada nilainya"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "pilihan -%c tak dikenal"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "pilihan -%c butuh suatu nilai"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "pilihan -%c tidak ada nilainya"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "pilihan '--%s' sudah usang \n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "aksi -%c (--%s) dan -%c (--%s) bentrok"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "nilai ganda untuk ruas '%s'"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "nama ruas definisi pengguna '%.*s' terlalu singkat"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "nilai ganda untuk ruas definisi pengguna '%.*s'"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Configured-Version untuk paket dengan Status tak sesuai"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "paket berstatus %s, tetapi ada pemicu yang ditunggu"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "paket berstatus tunggu-pemicu tetapi tidak ada pemicu yang ditunggu"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "paket berstatus %s tetapi ada pemicu yang tertunda"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "paket berstatus tunda-pemicu tetapi tidak ada pemicu yang tertunda"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Paket dengan status 'tak-terpasang' memiliki berkas konfig, abaikan saja"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "gagal membuka berkas info paket '%.255s' untuk dibaca"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "gagal menata status berkas info paket '%.255s'"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "gagal melakukan 'mmap' pada berkas info paket '%.255s'"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "gagal menata status berkas info paket '%.255s'"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "gagal menutup setelah membaca: '%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "Ada EOF setelah nama ruas '%.*s'"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "ada baris-baru dalam nama ruas '%.*s'"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "EOF MSDOS (^Z) dalam nama ruas '%.*s'"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "nama ruas '%.*s' harus diikuti oleh titik-dua"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "Ada EOF sebelum nilai ruas '%.*s' (baris-baru terakhir tiada)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "Karakter EOF MSDOS dalam nilai ruas '%.*s' (baris-baru tiada?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "ada baris-baru dalam nama ruas '%.*s'"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "Ada EOF sekitar nilai ruas '%.*s' (baris-baru terakhir tiada)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "ditemukan beberapa baris info paket; hanya satu yang diizinkan"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "gagal menutup setelah membaca: '%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "tidak ada informasi paket dalam '%.255s'"
@@ -931,62 +945,62 @@
 " %.255s"
 msgstr "%s, dalam berkas '%.255s' dekat baris %d:"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "tidak boleh string kosong"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "harus dimulai dengan sebuah alfanumerik"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "aksara '%c' tidak diizinkan (hanya huruf, digit, dan aksara '%s' saja)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<tiada>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "string versi kosong"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "string versi mengandung spasi"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "epoch pada versi bukan suatu angka"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "tidak ada apa-apa setelah titik-dua pada nomor versi"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "nomor versi berisi aksara tidak sah"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "nomor revisi berisi aksara tidak sah"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "%s hilang"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "nilai kosong untuk %s"
@@ -1005,52 +1019,52 @@
 msgid "(no description available)"
 msgstr "(tidak ada keterangan yang tersedia)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "gagal mengabaikan sinyal %s sebelum menjalankan %.250s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "Ada kesalahan saat melepaskan sinyal %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (subproses): %s \n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "'fork' gagal "
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "subproses %s menghasilkan kesalahan status keluaran: %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "gagal menunggu subproses %s"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "subproses %s dihentikan oleh sinyal (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", core dibuat"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "subproses %s gagal dengan kode status tunggu %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "gagal menunggu subproses %s"
@@ -1074,61 +1088,53 @@
 "kesalahan sintaks di pemicu menghalangi pemrosesan berkas '%.250s' di aksara "
 "'%s'%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "gagal membuka/membuat berkas-kunci pemicu '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "dipicu"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "gagal menata status berkas tunda pemicu '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "gagal membuka berkas tunda pemicu '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "gagal membuka/membuat berkas tunda pemicu '%.250s' yang baru"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "ada galat saat membaca berkas tunda pemicu '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "gagal menulis ke berkas tunda pemicu '%.250s' yang baru"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "gagal meutup berkas tunda pemicu '%.250s' yang baru"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "gagal memasang berkas tunda pemicu '%.255s' yang baru"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "nama pemicu kosong tidak diizinkan"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "nama pemicu berisi aksara tidak sah"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1137,17 +1143,17 @@
 "sintaks tidak sah atau tak dikenal di nama pemicu '%.250s' (di tujuan pemicu "
 "untuk paket '%.250s')"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "gagal membuka berkas daftar tujuan pemicu '%.250s' "
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "gagal mengulang berkas tujuan pemicu '%.250s'"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1156,84 +1162,90 @@
 "ada kesalahan berkas tujuan pemicu '%.250s'; nama paket tidak sah '%.250s': "
 "%.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "gagal membuat berkas tujuan pemicu '%.250s' yang baru"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "gagal menulis berkas tujuan pemicu '%.250s' yang baru"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "gagal mengosongkan berkas tujuan pemicu '%.250s' yang baru"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "gagal sinkronisasi berkas tujuan pemicu '%.250s' yang baru"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "gagal menutup berkas tujuan pemicu '%.250s' yang baru"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "gagal memasang berkas tujuan pemicu '%.255s' yang baru"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "tidak dapat membuang '%.250s'"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "gagal membuat berkas tujuan pemicu '%.250s' yang baru"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "gagal menutup berkas tujuan pemicu '%.250s' yang baru"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 "berkas tujuan pemicu ganda untuk nama berkas '%.250s' dan paket '%.250s'"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "gagal membuat berkas pemicu berkas '%.250s' yang baru"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "gagal menulis berkas pemicu berkas '%.250s' yang baru"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "gagal mengosongkan berkas pemicu berkas '%.250s' yang baru"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "gagal sinkronisasi berkas pemicu berkas '%.250s' yang baru"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "gagal menutup berkas pemicu berkas '%.250s' yang baru"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "gagal memasang berkas pemicu berkas baru sebagai '%.250s'"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "gagal membaca berkas pemicu berkas '%.250s'"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "ada galat sintaks dalam berkas pemicu berkas '%.250s'"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1242,7 +1254,7 @@
 "rekam berkas pemicu berisi nama paket tidak sah '%s.250s' (untuk tujuan di "
 "berkas '%.250s): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1251,30 +1263,38 @@
 "berkas ci pemicu '%.250s' berisi sintaks pemicu tidak sah di nama pemicu "
 "'%.250s': %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "gagal membuka berkas ci pemicu: '%.250s'"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "berkas ci pemicu berisi sintaks konfigurasi yang tak dikenal"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "berkas ci pemicu berisi konfigurasi tak dikenal '%.250s'"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "gagal membuat direktori status pemicu: '%.250s'"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "gagal menata kepemilikan direktori status pemicu: '%.250s'"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "nama pemicu kosong tidak diizinkan"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "nama pemicu berisi aksara tidak sah"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1299,7 +1319,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "salah menata string ke dalam variabel varbuf"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "ada kesalahan saat membaca pipe dpkg-deb"
 
@@ -1318,12 +1338,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "ada kesalahan saat menata kepemilikan nara simbolik '%.255s'"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "Ada kesalahan penataan kepemilikan pada '%.255s'"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "Ada kesalahan penataan perizinan pada '%.255s'"
@@ -1379,17 +1399,26 @@
 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:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "gagal menata status '%s'"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Sedang mengganti berkas-berkas dalam paket lama %s ... \n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Diganti oleh berkas-berkas dalam paket terpasang %s ... \n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1398,92 +1427,97 @@
 "mencoba menimpa direktori '%.250s' dalam paket %.250s %.250s dengan non-"
 "direktori"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "mencoba menimpa '%.250s', yang juga ada dalam paket %.250s %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "gagal membuat '%.255s' (saat memproses '%.255s')"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "backend dpkg-deb saat '%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "Ada kesalahan menutup/menulis '%.255s'"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "Ada kesalahan saat membuat pipe '%.255s'"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "Ada kesalahan saat membuat piranti '%.255s'"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "ada kesalahan saat membuat 'hard link' '%.255s'"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "ada kesalahan saat membuat nara simbolik '%.255s'"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "Ada kesalahan saat membuat direktori '%.255s'"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "gagal memindahkan '%.255s' untuk memasang versi yang baru"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "gagal membaca link '%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "gagal membuat nara simbolik cadangan untuk '%.255s'"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "gagal mengubah kepemilikan nara simbolik cadangan untuk '%.255s'"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "gagal membuat nara cadangan untuk '%.255s' sebelum memasang versi baru"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "gagal memasang versi baru dari '%.255s'"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "gagal membuka '%.255s'"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "gagal sinkronisasi '%.255s'"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1492,7 +1526,7 @@
 "mengabaikan masalah ketergantungan dengan %s: \n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1501,7 +1535,7 @@
 "mencoba dekonfigurasi paket-paket sangat penting \n"
 "%s, agar dapat menata %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1510,7 +1544,7 @@
 "dpkg: tidak, %s sangat penting, tidak ada dekonfigurasi \n"
 "untuk menata %s. \n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1519,28 +1553,28 @@
 "dpkg: tidak, gagal memproses %s (--auto-deconfigure mungkin akan membantu):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "penghapusan %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "pemasangan %.255s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: mencoba dekonfigurasi %s, yang akan dikacaukan oleh %s ... \n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: ya, lakukan dekonfigurasi %s (dikacaukan oleh %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1549,11 +1583,11 @@
 "dpkg: memandang %s berisi %s: \n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "abaikan kekacauan, proses dilanjutkan! "
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1562,31 +1596,31 @@
 "memasang %.250s akan merusak %.250s, dan\n"
 "dekonfigurasi tidak diizinkan (--auto-deconfigure mungkin membantu)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "memasang %.250s akan merusak perangkat lunak yang ada"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1595,112 +1629,114 @@
 "dpkg: paket %s perlu dipasang ulang, tetapi akan dibuang sesuai dengan "
 "permintaan Anda. \n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "paket-paket berbenturan - tidak akan memasang %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "abaikan paket yang bentrok, proses dilanjutkan! "
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive perlu sedikitnya satu argumen path"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "perintah 'find' untuk dpkg --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "Gagal membuka deskriptor-berkas pipe 'find'"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "Ada kesalahan saat membaca pipe 'find'"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "Ada kesalahan saat menutup pipe 'find'"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 "perintah 'find' untuk --recursive menghasilkan kesalahan yang tak teratasi: "
 "%i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 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:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s butuh sedikitnya satu argumen berkas arsip paket"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<keluaran standar>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<galat standar>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Memilih paket %s yang sebelumnya tidak dipilih. \n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Abaikan paket yang tak dipilih: %s. \n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versi %.250s dari paket %.250s telah dipasang, dilewati.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "menurunkan versi paket %.250s dari %.250s ke %.250s. "
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "Tidak akan menurunkan versi paket %.250s dari versi %.250s ke %.250s, "
 "dilewati. \n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1709,37 +1745,37 @@
 "gagal membuang versi terbaru dari paket '%.250s' agar dapat memasang ulang "
 "salinan cadangannya"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "gagal mengembalikan versi cadangan dari paket '%.250s'"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "gagal membuang versi cadangan dari paket '%.250s'"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "gagal membuang versi yang baru diinstal dari '%.250s'"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "gagal membuang versi yang baru diurai dari '%.250s'"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "gagal menata status berkas konfig terdistribusi '%.250s' yang baru"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "gagal menata berkas konfig '%.250s' yang telah dipasang"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1750,57 +1786,57 @@
 "Berkas konfigurasi '%s' tidak ada pada sistem. \n"
 "Memasang berkas konfigurasi baru sesuai permintaan. \n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: gagal membuang berkas cadangan lama '%.250s': %s "
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: gagal mengganti nama '%.250s' ke '%.250s': %s "
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: gagal membuang '%.250s': %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: gagal membuang versi terdistribusi '%.250s' yang lama: %s "
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: gagal membuang '%.250s' (sebelum menimpa): %s "
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: gagal membuat nara '%.250s' ke '%.250s: %s "
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Memasang berkas konfigurasi baru %s ... \n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "gagal memasang '%.250s' sebagai '%.250s'"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "tidak ada paket bernama '%s' yang dipasang; tidak dapat dikonfigurasi"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "paket %.250s telah dipasang dan dikonfigurasi"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1809,7 +1845,7 @@
 "paket %.250s belum siap dikonfigurasi\n"
 "  tidak dapat dikonfigurasi (status sekarang '%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1818,11 +1854,11 @@
 "dpkg: masalah ketergantungan mencekal konfigurasi %s: \n"
 " %s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "ada masalah ketergantungan - biarkan tidak dikonfigurasi"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1832,7 +1868,7 @@
 "permintaan: \n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1840,12 +1876,12 @@
 "Paket dalam keadaan tidak konsisten yang parah - \n"
 "Anda harus memasang ulang sebelum melakukan konfigurasi"
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Sedang menata %s (%s) ... \n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1854,7 +1890,7 @@
 "%s: gagal menata status berkas konfigurasi '%s' \n"
 " (= '%s'): %s "
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1863,7 +1899,7 @@
 "%s: berkas konfigurasi '%s' adalah nara sirkular \n"
 " (= '%s') "
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1872,7 +1908,7 @@
 "%s: gagal membaca-baris berkas konfigurasi '%s'\n"
 "  (= '%s'): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1882,35 +1918,35 @@
 "terdegenerasi \n"
 " ('%s' adalah nara simbolik ke '%s') "
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: berkas konfigurasi '%.250s' bukan sebuah berkas normal atau nara "
 "simbolik (= '%s') "
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "hash md5"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: gagal membuka berkas konfigurasi %s untuk di-hash: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Ketik 'exit' bila telah selesai.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1919,12 +1955,12 @@
 "\n"
 "Berkas konfigurasi '%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (sebenarnya '%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1935,7 +1971,7 @@
 " ==> Berkas pada sistem yang dibuat oleh Anda atau suatu skrip.\n"
 " ==> Berkas juga ada dalam paket yang disediakan oleh pengelola paket.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1944,7 +1980,7 @@
 "\n"
 "     Tidak diubah sejak pemasangan. \n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1953,7 +1989,7 @@
 "\n"
 " ==> Telah diubah (oleh Anda atau suatu skrip) sejak pemasangan.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1962,37 +1998,37 @@
 "\n"
 " ==> Telah dibuang (oleh Anda atau suatu skrip) sejak pemasangan.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Distributor paket telah membawa suatu versi terbaru.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Versi dalam paket sama dengan pemasangan terakhir.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Gunakan berkas baru sesuai permintaan.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Gunakan berkas lama sesuai permintaan.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Pertahankan berkas konfigurasi lama sebagai bawaan.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Gunakan berkas konfigurasi baru sebagai bawaan.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2008,158 +2044,160 @@
 "       Z    : jadikan proses ini sebagai 'proses latar' untuk melihat "
 "keadaan\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Tindakan bawaan adalah mempertahankan versi yang ada.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Tindakan bawaan adalah memasang versi yang baru.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[bawaan=T]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[bawaan=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[tiada bawaan]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "ada kesalahan saat menulis ke stderr, ditemukan sebelum prompt 'conffile'"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "ada kesalahan pada stdin di prompt 'conffile'"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "Ada EOF pada stdin di prompt 'conffile'"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s bergantung pada %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s pra-syarat awalnya %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s menganjurkan %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s menyarankan %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s mengacaukan %s "
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s bentrok dengan %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s meningkatkan %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "   %.250s akan dibuang.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "   %.250s akan didekonfigurasi.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "   %.250s akan dipasang, tetapi versi %.250s\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s terpasang, tetapi versi %.250s. \n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "   %.250s telah dibuka, tetapi belum pernah dikonfigurasi.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "   %.250s telah dibuka, tetapi versi %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "   %.250s versi terakhir yang terkonfigurasi adalah %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s adalah %s. \n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "   %.250s menyediakan %.250s tetapi akan dibuang.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "   %.250s menyediakan %.250s tetapi akan didekonfigurasi.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s menyediakan %.250s, tetapi %s. \n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s tidak terpasang. \n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "   %.250s (versi %.250s) akan dipasang.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versi %.250s) sudah ada dan adalah %s. \n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "   %.250s menyediakan %.250s dan akan dipasang.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s menyediakan %.250s dan %s serta sudah ada. \n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "Gunakan --help untuk panduan tentang pencarian paket."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2167,7 +2205,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versi %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2178,8 +2216,8 @@
 "Hak Cipta (C) 2000,2001 Wichert Akkerman.\n"
 "Hak Cipta (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2189,7 +2227,7 @@
 "Ini adalah perangkat lunak bebas; lihat GNU General Public Licence versi 2\n"
 "atau selanjutnya untuk persyaratan penggandaan. TIDAK ADA jaminan. \n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2199,7 +2237,7 @@
 "Penggunaan: %s [<pilihan> ...] <perintah>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2218,7 +2256,7 @@
 "  --truename <berkas>      kembalikan berkas yang dialihkan.\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2249,7 +2287,7 @@
 "  --version                 lihat versi.\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2262,17 +2300,12 @@
 "digunakan.\n"
 "Script preinst/postrm paket harus selalu menentukan --package dan --divert.\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "gagal menata status '%s'"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "Ada galat saat memeriksa '%s'"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2281,129 +2314,129 @@
 "ganti nama yang menimpa '%s' dengan\n"
 "  berkas '%s' berbeda, tidak diizinkan."
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "gagal menulis ke berkas '%s'"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "salin berkas"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "gagal mengganti nama '%s' ke '%s'"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "rename: buang nara '%s' lama yang ganda"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "gagal membuka berkas sumber '%.250s'"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "%s dialihkan secara lokal"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "pengalihan %s secara lokal ke %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "pengalihan %s oleh %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "pengalihan %s ke %s oleh %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "pengalihan sembarang dari %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "pengalihan sembarang dari %s ke %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "gagal membuat berkas baru %s"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "gagal mengosongkan berkas '%s'"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "ada galat saat membuang berkas 'diversions-old' yang lama"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "gagal membuat berkas 'diversions-old' yang baru"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "gagal memasang berkas 'diversions' yang baru"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s butuh sebuah argumen"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "nama berkas \"%s\" tidak mutlak"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "berkas tidak boleh berisi baris-baru"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "gagal mengalihkan direktori"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "gagal mengalihkan berkas '%s' ke dirinya sendiri"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "Tinggalkan '%s' apa adanya\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "'%s' bentrok dengan '%s'"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "Menambah '%s'\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Tidak ada pengalihan '%s', tak ada yang dibuang.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2414,7 +2447,7 @@
 "  saat menghapus '%s'\n"
 "  dalam nama-pengalih '%s'"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2425,16 +2458,16 @@
 "  saat menghapus '%s'\n"
 "  dalam paket '%s'"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "Sedang membuang '%s' \n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "Paket mungkin tidak berisi baris-baru"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "nama-pengalih tidak boleh berisi baris-baru"
 
@@ -2518,8 +2551,8 @@
 "'dpkg --triggers-only'):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s tidak butuh argumen"
@@ -2611,7 +2644,7 @@
 msgid "--compare-versions bad relation"
 msgstr "hubungan buruk --compare-version"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "versi '%s' mengandung salah sintaks: %s"
@@ -2666,12 +2699,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "ada masalah penimpaan karena --force dihidupkan:"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "gagal membuka berkas daftar berkas untuk paket '%.250s'"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2680,68 +2713,68 @@
 "berkas daftar berkas untuk paket '%.250s' hilang; \n"
 "anggap paket tidak memiliki berkas yang sudah terpasang."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "gagal menata status berkas daftar berkas untuk paket '%.250s'"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "daftar berkas untuk paket '%.250s'"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "berkas daftar berkas untuk paket '%.250s' tidak ada baris-baru penutup"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "berkas daftar berkas untuk paket '%.250s' berisi nama berkas kosong"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "ada kesalahan saat menutup berkas daftar berkas untuk paket '%.250s'"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Sedang membaca basis data ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] " %d berkas atau direktori telah terpasang.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "gagal membuat berkas daftar berkas terbaru untuk paket %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "gagal menulis berkas daftar berkas terbaru untuk paket %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "gagal membersihkan berkas terbaru daftar berkas untuk paket %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "gagal sinkronisasi berkas daftar berkas-berkas terbaru untuk paket %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "gagal menutup berkas daftar berkas-berkas terbaru untuk paket %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "gagal memasang berkas daftar berkas-berkas terbaru untuk paket %s"
@@ -2779,7 +2812,9 @@
 msgstr "terpasang"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "galat: PATH tidak disetel."
 
 #: src/help.c:129
@@ -2820,7 +2855,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2832,65 +2867,65 @@
 msgstr "gagal memindahkan root ke '%.250s'"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "Gagal memindahkan direktori ke '%.255s'"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "gagal menata izin eksekusi untuk '%.250s'"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "gagal menata env untuk skrip pengelola paket"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "skrip %s terpasang"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "gagal menata status %s '%.250s'"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "skrip %s baru"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "skrip %s lama"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "gagal menata status %s '%.250s': %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - mencoba skrip dari paket baru saja ... \n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "tidak ada skrip dalam paket versi terbaru - menyerah"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... tampaknya semua BERES.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "gagal secara hati-hati membuang '%.255s'"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2899,7 +2934,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "gagal memeriksa keberadaan '%.250s'"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "gagal membaca direktori 'info'"
 
@@ -2966,7 +3001,7 @@
 "  -Dh|--debug=help                    Tampilkan bantuan saat proses debug.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3095,7 +3130,7 @@
 "Gunakan 'dselect' atau 'aptitude' untuk pengelolaan paket dengan lebih "
 "mudah.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3145,30 +3180,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3177,103 +3216,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "ada masalah ketergantungan - tidak dibuang"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "ada masalah ketergantungan - tidak dibuang"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "gagal menata env untuk skrip pengelola paket"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "ada kesalahan membaca berkas konfigurasi '%.255s'"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3281,7 +3320,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3289,38 +3328,38 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug membutuhkan sebuah argumen oktal"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "nama paket nihil dalam daftar terpisah-koma --ignore-depends '%.250s'"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends memerlukan sebuah nama paket yang sah. '%.250s' tidak; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "integer untuk --%s tidak sah: '%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "ada galat saat menjalankan '%s', kode keluaran: %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "status"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3329,7 +3368,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3337,12 +3376,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "Pilihan force/refuse '%.*s' tak dikenal"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "pilihan force/refuse '--%s' sudah usang \n"
@@ -3365,8 +3404,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "eof tidak diharapkan sebelum akhir baris %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "butuh suatu pilihan aksi"
 
@@ -3530,90 +3569,90 @@
 msgid "passed\n"
 msgstr "dilewati\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "gagal membuat direktori sementara"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "paket %s berisi pasangan Conflicts/Replaces terlampau banyak"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "versi lama paket ini memiliki nama berkas 'info' yang terlalu panjang mulai "
 "dari '%.250s'"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "gagal membuang berkas 'info' '%.250s' yang sudah usang"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "gagal memasang berkas 'info' (tampaknya) baru '%.150s'"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "gagal membuka direktori 'control' sementara"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "paket berisi nama berkas info 'control' yang terlalu panjang (mulai dari "
 "'%.250s)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "info 'control' paket berisi direktori '%.250s'"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "proses rmdir dari info 'control' paket '%.250s' mengatakan ini bukan dir"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "paket %s berisi daftar sebagai berkas 'info'"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "gagal memasang berkas 'info' baru '%.250s' sebagai '%.250s'"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "gagal menghapus berkas info 'control' '%.250s'"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "gagal mengakses arsip"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "gagal membuat direktori sementara"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "panjang informasi 'control'"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Merekam info tentang %s dari %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "arsitektur paket (%s) tidak cocok dengan sistem (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3622,102 +3661,102 @@
 "dpkg: memandang %s berisi %s, masalah pra-ketergantungan:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "Ada masalah pra-ketergantungan - tidak akan memasang %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "mengabaikan masalah pra-ketergantungan! "
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Bersiap-siap mengganti %s %s (dengan %s) ... \n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Sedang membuka paket %s (dari %s) ... \n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "nama berkas konfig (dimulai dengan '%.250s') terlalu panjang (>%d aksara)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "Ada kesalahan saat membaca %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "Ada kesalahan saat menutup %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "Ada kesalahan saat membuka %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Sedang dekonfigurasi %s, agar dapat membuang %s ... \n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Sedang dekonfigurasi %s ... \n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Sedang membuka pengganti %.250s ... \n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "dpkg-deb penguraian ruas isian"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "ada kesalahan saat membaca keluaran tar dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "berkas tar dari sistem berkas terkorupsi - arsip paket terkorupsi"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: kemungkinan 'zap' berakhiran banyak nol"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "gagal menata status berkas '%.250s' yang lama, jadi tidak dibuang: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "gagal menghapus direktori lama '%.250s': %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "berkas konfig '%.250s' lama berupa direktori kosong (dan sekarang sudah "
 "dihapus)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "gagal menata status berkas baru lainnya '%.250s'"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3726,12 +3765,12 @@
 "berkas '%.250s' lama sama dengan beberapa berkas baru! (keduanya '%.250s' "
 "dan '%.250s')"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "gagal secara hati-hati menghapus berkas lama '%.250s': %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Mencatat lenyapnya %s, yang telah diganti seutuhnya.) \n"
@@ -3908,7 +3947,7 @@
 "  -f|--showformat=<format>       Gunakan format lain untuk --show.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3929,6 +3968,10 @@
 "  sintaks ${var:[;width]}. Semua isian akan dirata-kanankan kecuali lebar\n"
 "  ruas isian negatif, yang berarti akan dirata-kirikan.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Gunakan --help untuk panduan tentang pencarian paket."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3988,7 +4031,7 @@
 msgid "Removing %s ...\n"
 msgstr "Sedang membuang %s ... \n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3997,48 +4040,49 @@
 "ketika membuang %.250s, gagal membuang direktori '%.250s': %s - direktori "
 "mungkin suatu titik kait?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "tidak dapat membuang '%.250s'"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "gagal secara hati-hati membuang '%.250s'"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "ketika membuang %.250s, direktori '%.250s' tidak kosong, jadi tidak dibuang."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "tidak dapat membuang '%.250s'"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Sedang memusnahkan berkas konfigurasi untuk %s ... \n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "gagal membuang berkas konfigurasi lama '%.250s'(='%.250s')"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "gagal membaca dir berkas konfigurasi '%.250s' (dari '%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "gagal membuang berkas konfigurasi cadangan lama '%.250s' (dari '%.250s')"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "gagal membuang daftar berkas lama"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "gagal membuang skrip 'postrm' lama"
 
@@ -4081,7 +4125,13 @@
 msgid "read error on standard input"
 msgstr "ada kesalahan membaca masukan standar (stdin)"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "Gunakan --help untuk panduan tentang pencarian paket."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4090,7 +4140,7 @@
 "Hak Cipta (C) 2000, 2001 Wichert Akkerman.\n"
 "Hak Cipta (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4107,7 +4157,7 @@
 "  --list [<pola-global>]    lihat status 'overrides' di basisdata.\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4128,31 +4178,31 @@
 "  --version                lihat versi.\n"
 "\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "lenyapkan / penutup"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "gagal membuka berkas 'statoverride' yang baru"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "Ada galat saat menghapus berkas 'statoverride-old'"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "Ada galat saat membuat berkas 'statoverride-old'"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "Ada galat saat membuat berkas 'statoverride' yang baru"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add butuh empat argumen"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4161,21 +4211,21 @@
 "Sebuah berkas 'override' '%s' sudah ada, tetapi --force dipakai. Jadi, "
 "lanjut terus."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Sebuah berkas 'override' '%s' telah ada. Dibatalkan."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "--update disertakan, tetapi %s tidak ada"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Tidak ada berkas 'override'."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update tidak berguna bersama --remove"
 
@@ -4240,16 +4290,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "banyak berkas 'statoverride' terdaftar untuk berkas '%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Ketik 'dpkg-trigger --help' untuk panduan tentang perkakas ini."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr " Perkakas pemicu paket Debian %s versi %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4260,7 +4310,7 @@
 "         %s [<pilihan> ...] <perintah>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4272,7 +4322,7 @@
 "   --check-supported                Pastikan bahwa dpkg mendukung pemicu.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4294,21 +4344,21 @@
 "  --no-act                    Hanya ujicoba - jangan lakukan apapun.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: direktori data pemicu belum dibuat\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: rekam-data pemicu belum ada\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "butuh satu argumen, nama pemicu"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4318,13 +4368,13 @@
 "dpkg-trigger harus dijalankan dari script pengelola paket (atau dengan "
 "pilihan --by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: nama paket tertunggu '%.250s' tidak sah: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "nama pemicu '%.250s' tidak sah: %.250s"
@@ -4357,38 +4407,39 @@
 msgstr "Sedang memproses pemicu untuk %s ... \n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s butuh tepat satu argumen berkas paket"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "gagal mengakses area status dpkg untuk pembaharuan massal paket yang tersedia"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "pembaharuan massal paket yang tersedia memerlukan akses tulis ke area status "
 "dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Sedang mengganti info paket yang tersedia, dengan %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Sedang memperbaharui info paket yang tersedia, dengan %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "Informasi tentang %d paket telah diperbaharui.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4502,8 +4553,8 @@
 msgid_plural "ignoring %d warnings about the control file(s)\n"
 msgstr[0] "mengabaikan %d peringatan tentang berkas 'control'\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s butuh sebuah argumen <direktori>"
@@ -4537,26 +4588,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: membuat paket '%s' di dalam '%s'.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "gagal membuat berkas tmp (data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control"
 msgid "control member"
 msgstr "control"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "gagal membuang link berkas tmp (data), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4573,20 +4624,20 @@
 msgid "error writing `%s'"
 msgstr "Ada galat saat menulis '%s'"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "antara anggota"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "gagal menulis nama berkas ke pipe tar (data)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<compress> dari tar -cf"
 
@@ -4604,76 +4655,76 @@
 msgid "error reading %s from file %.255s"
 msgstr "ada galat membaca %s dari berkas %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "gagal membaca arsip '%.255s'"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "Gagal melakukan 'fstat' pada arsip"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "arsip tidak mengandung titik pada nomor versinya"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "arsip tidak mengandung baris-baru di headernya"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "berkas '%.250s' terkorupsi - nomor bagian buruk"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "berkas '%.250s' bukan suatu arsip biner debian (coba dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "arsip tidak mengandung titik pada nomor versinya"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "arsip tidak mengandung baris-baru di headernya"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "arsip tidak mengandung titik pada nomor versinya"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "versi arsip %.250s tidak dipahami, gunakan dpkg-deb terbaru"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "abaikan data anggota dari %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "berkas '%.250s' berisi anggota data %.*s yang tak dipahami, menyerah"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "berkas '%.250s' berisi dua anggota 'control', menyerah"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4685,23 +4736,23 @@
 " paket baru debian, versi %s.\n"
 " besar %ld byte: arsip 'control'= %zi byte.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "arsip mengandung panjang 'control' '%s' yang salah bentuk"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "abaikan data anggota dari %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4713,7 +4764,7 @@
 " paket lama debian, versi %s.\n"
 " besar %ld byte: arsip 'control'= %zi, arsip utama= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4722,49 +4773,50 @@
 "dpkg-deb: berkas tampaknya seperti suatu arsip yang telah \n"
 "dpkg-deb:      terkorupsi saat diambil dengan modus ASCII\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "'%.250s' bukan suatu arsip berformat debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "gagal menulis ke pipe dalam penyalinan"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "gagal menutup pipe dalam penyalinan"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "gagal berpindah ke direktori"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "gagal membuat direktori"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "gagal berpindah ke direktori setelah membuatnya"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "gagal berpindah ke direktori"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<dekompresi>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "tempel"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s butuh suatu argumen nama berkas .deb"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4773,96 +4825,96 @@
 "--%s butuh suatu direktori target.\n"
 "Mungkin Anda harus menggunakan dpkg --install ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s hanya butuh satu argumen (nama berkas .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "gagal memindahkan direktori ke `/' untuk membersihkan"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "gagal menata status '%s'"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: '%.255s' tidak berisi komponen 'control' '%.255s'\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "gagal membuka komponen '%.255s' (dalam %.255s) dengan hasil yang tak terduga"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "%d komponen 'control' yang diperlukan hilang"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "gagal memindai direktori '%.255s'"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "gagal melakukan 'stat' pada '%.255s' (dalam '%.255s')"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "gagal membuka '%.255s' (dalam '%.255s')"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "gagal membaca '%.255s' (dalam '%.255s')"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr "  %7ld byte, %5d byte  %c  %-20.127s  %.127s \n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     bukan sebuah berkas biasa         %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(tidak ada berkas 'control' dalam arsip!) \n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "gagal membuka komponen 'control'"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "gagal selama membaca komponen 'control'"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "Ada galat menutup komponen '%s'"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "salah format"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents butuh tepat satu argumen"
 
@@ -4872,7 +4924,19 @@
 msgstr "'Backend' arsip paket Debian %s versi %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4883,6 +4947,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4898,7 +4964,7 @@
 "  --fsys-tarfile <deb>              Keluarkan sistem berkas tar.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4911,11 +4977,27 @@
 "<isian> adalah nama ruas isian dalam berkas 'control' utama.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4939,7 +5021,7 @@
 "tiada.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4953,7 +5035,7 @@
 "Paket-paket yang dibuka dengan 'dpkg-deb --extract' bisa jadi akan salah\n"
 "pasang!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4961,17 +5043,17 @@
 "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:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "integer untuk -%c tidak sah: '%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "tingkat kompresi untuk -%c tidak sah: %ld'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "jenis kompresi '%s' tidak dikenal!"
@@ -4991,7 +5073,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "berkas '%.250s' terkorupsi - baris-baru hilang setelah %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "ada kesalahan saat membaca %.250s"
@@ -5084,48 +5166,54 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "berkas '%.250s' terkorupsi - nomor bagian buruk"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "nama paket"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr "berkas '%.250s' terkorupsi - 'magic' buruk pada akhir header kedua"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "berkas '%.250s' terkorupsi - anggota kedua bukan anggota data"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "berkas '%.250s' terkorupsi - salah nomor bagian untuk ukuran yang termaktub"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "berkas '%.250s' terkorupsi - salah ukuran untuk nomor bagian termaktub"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "gagal menata status berkas bagian '%.250s'"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "berkas '%.250s' terkorupsi - terlalu pendek"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "tidak dapat membuka berkas bagian arsip '%.250s'"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "berkas '%.250s' bukan suatu bagian arsip"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5145,6 +5233,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5167,12 +5256,19 @@
 "    Ukuran berkas bagian (yang digunakan):    %lu byte\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<tak dikenal>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s butuh satu atau lebih argumen berkas bagian"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "berkas '%s' bukan bagian dari arsip\n"
@@ -5206,7 +5302,7 @@
 msgid "split package part"
 msgstr "Menggabungkan paket %s jadi satu dari %d bagian:"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "selesai.\n"
@@ -5258,17 +5354,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Pilihan:\n"
 "   --depotdir <direktori>        Gunakan <direktori>, bukan %s/%s.\n"
@@ -5280,20 +5385,29 @@
 "\n"
 "Status keluaran: 0 = Beres; 1 = -a buka suatu bagian; 2 = ada masalah!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Ketik 'dpkg-split --help' untuk panduan"
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "akhiran berkas dalam %.250s tidak diharapkan"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "ukuran bagian terlampau besar atau tidak positif"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "ukuran bagian harus sekurangnya %d KiB (termasuk header)"
@@ -5404,27 +5518,27 @@
 msgid "Deleted %s.\n"
 msgstr "%s telah dihapus.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "dpkg-deb penguraian ruas isian"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "gagal membuka berkas sumber '%.250s'"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "Gagal menata status berkas sumber"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "berkas sumber '%.250s' bukan suatu berkas biasa"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5432,17 +5546,17 @@
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] "Menggabungkan paket %s jadi satu dari %d bagian:"
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split butuh suatu argumen nama berkas sumber"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split butuh paling banyak satu nama berkas sumber dan awalan tujuan"
 
@@ -5614,125 +5728,90 @@
 "  --version                lihat versi.\n"
 "\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "galat proses 'parse'"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "PERINGATAN"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "gagal menata status %s: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "proses readlink(%s) gagal: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "dua perintah diberikan: --%s dan --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "gagal menambahkan ke %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "pemindaian %s gagal: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "Gagal menjalankan %s: %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "gagal membuat nara simbolik %s ke %s: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "gagal memasang %s sebagai %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "gagal membuang %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "akhir berkas tak terduga saat membaca %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "saat membaca %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "baris tidak diakhiri saat membaca %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s terkorupsi: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "baris-baru dilarang dalam berkas 'update-alternatives' (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "saat menulis %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "nama tiruan"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "tiruan ganda untuk '%s'"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "nara tiruan"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "nara tiruan sama dengan nama utama %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "nara tiruan %s ganda"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "berkas utama"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "path %s ganda"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5741,127 +5820,112 @@
 "%s alternatif (bagian dari grup nara %s) tidak ada. Sedang dihapus dari "
 "daftar alternatif"
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "prioritas"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "berkas tiruan"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "prioritas dari %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "gagal membaca %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "status"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "status tidak sah"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "nara utama"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "gagal menutup %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "mengabaikan nara tiruan usang %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "gagal menulis %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "modus otomatis"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "modus manual"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "   nara saat ini mengacu ke %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "   nara saat ini lenyap"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - prioritas %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  tiruan %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Versi terbaik saat ini adalah '%s'."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Tiada versi yang tersedia."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "Ada %d pilihan untuk alternatif %s (seluruhnya %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Pemilihan"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Path"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Prioritas"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Status"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr "Tekan enter untuk pilihan saat ini [*], atau ketik nomor pilihan: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "tidak mengganti %s dengan suatu nara."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "tidak dapat memasang pilihan %s yang tak dikenal"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -5870,98 +5934,153 @@
 "hindari pembuatan %s karena berkas %s (dari grup link %s) yang berhubungan "
 "tidak ada."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "tidak mengganti %s dengan suatu nara."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Jalankan %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Alternatif %s tidak diubah karena pilihan %s tidak tersedia."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Lewati alternatif %s yang tak dikenal."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "baris terlalu panjang atau tak diakhiri saat membaca %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Hindari baris tidak sah: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "mengganti nara %s dari %s ke %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "mengganti nara tiruan %s dari %s ke %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "nama alternatif (%s) tidak boleh berisi '/' dan spasi."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "nara alternatif tidak mutlak sebagaimana seharusnya: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "path alternatif tidak mutlak sebagaimana seharusnya: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "alternatif %s tidak bisa jadi utama: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "nara alternatif %s telah dikelola oleh %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "path alternatif %s tidak ada"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "alternatif %s tidak dapat menjadi tiruan dari %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "alternatif %s tidak bisa jadi utama: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "nara alternatif %s telah dikelola oleh %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "argumen '%s' tak dikenal"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install perlu <nara> <nama> <path> <prioritas>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<nara> dan <path> tidak boleh sama"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "prioritas harus bilangan bulat"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s butuh <nama> <path>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s butuh <nama>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave hanya bisa bersama --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave perlu <nara> <nama> <path>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "nama %s adalah nama utama dan tiruan sekaligus"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "nara %s adalah nara utama dan tiruan sekaligus"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s butuh sebuah argumen <berkas>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "pilihan '%s' tak dikenal"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -5969,67 +6088,22 @@
 "butuh --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all, atau --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "alternatif %s tidak bisa jadi utama: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "nara alternatif %s telah dikelola oleh %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "nara alternatif tidak mutlak sebagaimana seharusnya: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "path alternatif tidak mutlak sebagaimana seharusnya: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "path alternatif %s tidak ada"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "nama alternatif (%s) tidak boleh berisi '/' dan spasi."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "ini adalah alternatif utama."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "ini adalah tiruan dari %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "alternatif %s tidak dapat menjadi tiruan dari %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "ada galat baca di masukan standar"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "tidak ada alternatif untuk %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s tak jelas statusnya, akan diperbarui dengan pilihan terbaik."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6041,49 +6115,49 @@
 "%s telah diubah (secara manual atau oleh suatu skrip). Berpindah ke "
 "pemutakhiran manual."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "menata pemilihan otomatis dari %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "alternatif %s untuk %s tidak terdaftar, tidak dikonfigurasi."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "tidak ada program yang menyediakan %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Tiada yang dikonfigurasi"
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Hanya ada satu alternatif di grup nara %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "alternatif %s untuk %s tidak terdaftar, tidak menghapusnya."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "sedang menghapus alternatif terpilih secara manual - memindah %s ke modus "
 "otomatis"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "pembaruan %s secara otomatis dimatikan, biarkan apa adanya."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6091,23 +6165,59 @@
 "untuk kembali ke modus pembaruan otomatis, gunakan 'update-alternatives --"
 "auto %s'"
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "menggunakan %s untuk menyediakan %s (%s) di %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr "memaksa pemasangan ulang alternatif %s karena grup nara %s rusak."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "alternatif %s saat ini tidak dikenal, berpindah ke %s untuk grup nara %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "ini adalah alternatif utama."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "ini adalah tiruan dari %s"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "gagal menata status %s: %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "proses readlink(%s) gagal: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "pemindaian %s gagal: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "Gagal menjalankan %s: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "gagal membuat nara simbolik %s ke %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "gagal memasang %s sebagai %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "saat menulis %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "gagal membaca %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "gagal menutup %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "gagal menulis %s: %s"
+
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6352,9 +6462,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "hindari area control dari %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "gagal menjalankan perintah tar"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "gagal membuat direktori sementara"
 
diff -uNr --exclude .git --exclude .bzr dpkg/po/insert-header.sin /home/vorlon/devel/multiarch/dpkg-debian/po/insert-header.sin
--- dpkg/po/insert-header.sin	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/insert-header.sin	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,23 @@
+# Sed script that inserts the file called HEADER before the header entry.
+#
+# At each occurrence of a line starting with "msgid ", we execute the following
+# commands. At the first occurrence, insert the file. At the following
+# occurrences, do nothing. The distinction between the first and the following
+# occurrences is achieved by looking at the hold space.
+/^msgid /{
+x
+# Test if the hold space is empty.
+s/m/m/
+ta
+# Yes it was empty. First occurrence. Read the file.
+r HEADER
+# Output the file's contents by reading the next line. But don't lose the
+# current line while doing this.
+g
+N
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
Binary files dpkg/po/it.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/it.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/it.po /home/vorlon/devel/multiarch/dpkg-debian/po/it.po
--- dpkg/po/it.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/it.po	2012-06-07 10:11:09.426073000 -0700
@@ -24,7 +24,7 @@
 msgstr ""
 "Project-Id-Version: dpkg-1.15.8.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-12-16 22:38+0100\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -40,7 +40,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "impossibile scrivere il file \"%s\""
@@ -61,73 +61,79 @@
 msgid "ar member file (%s)"
 msgstr "esecuzione di fstat sul file ar non riuscita (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "lettura durante la copia del buffer per %s non riuscita"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "scrittura durante la copia del buffer per %s non riuscita"
 
 # (ndt) o lasciare short read?
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "lettura breve durante la copia del buffer per %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "esecuzione di tar non riuscita"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "impossibile eseguire %s (%s)"
 
 # (ndt) comprimere -> decomprimere...
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: decompressione"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compressione"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: errore nel legare l'input allo stream di gzip"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: errore interno di lettura di gzip: \"%s\""
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: errore interno di scrittura di gzip"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: errore nel legare l'output allo stream di gzip"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: errore interno di lettura di gzip"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: errore interno di scrittura di gzip: \"%s\""
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: errore interno di scrittura di gzip: %s"
@@ -142,31 +148,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: errore interno di lettura di bzip2: \"%s\""
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: errore interno di scrittura di bzip2"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: errore nel legare l'output allo stream di bzip2"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: errore interno di lettura di bzip2"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: errore interno di scrittura di bzip2: \"%s\""
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "errore inatteso di bzip2"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -175,7 +181,7 @@
 "la directory updates contiene il file \"%.250s\" il cui nome è troppo lungo "
 "(lungh=%d, max=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -183,100 +189,100 @@
 "la directory updates contiene file con nomi di diversa lunghezza (sia %d che "
 "%d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "impossibile analizzare la directory updates \"%.255s\""
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "rimozione del file di update incorporato %.255s non riuscita"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "impossibile creare \"%.255s\""
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "impossibile completare il riempimento di %.250s"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "impossibile eseguire il flush di %.250s dopo il riempimento"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "impossibile spostarsi all'inizio di %.250s dopo il riempimento"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "impossibile aprire il file di blocco %s per la verifica"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "impossibile aprire/creare il file di blocco per il database di stato"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "permessi insufficienti per bloccare il database di stato di dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "impossibile ottenere il blocco del database di stato di dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "l'operazione richiesta necessita dei privilegi di super-utente"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "impossibile accedere all'area di stato di dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 "l'operazione necessita i permessi di lettura/scrittura all'area di stato di "
 "dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "impossibile rimuovere questo stesso file di update %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "impossibile scrivere lo stato aggiornato di \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "impossibile eseguire flush dello stato aggiornato di \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "impossibile eseguire truncate per lo stato aggiornato di \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "impossibile eseguire fsync per lo stato aggiornato di \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "impossibile chiudere lo stato aggiornato di \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "impossibile installare lo stato aggiornato di \"%.250s\""
@@ -299,76 +305,78 @@
 msgid "unable to open directory '%s'"
 msgstr "impossibile aprire il file \"%s\""
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "impossibile aprire il file \"%s\""
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "impossibile sincronizzare il file \"%s\""
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "impossibile chiudere il file \"%s\""
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "scrittura dei dettagli di \"%.50s\" in \"%.250s\" non riuscita"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "apertura di \"%s\" per la scrittura del database %s non riuscita"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "impossibile impostare la bufferizzazione sul file %s del database"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr ""
 "scrittura del record %s del database, relativo a \"%.50s\" in \"%.250s\", "
 "non riuscita"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "esecuzione di flush del database %s in \"%.250s\" non riuscita"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "esecuzione di fsync del database %s in \"%.250s\" non riuscita"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "chiusura di \"%.250s\" dopo la scrittura del database %s non riuscita"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "creazione del collegamento da \"%.250s\" a \"%.250s\" per il backup del "
 "database %s non riuscita"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 "installazione di \"%.250s\" come \"%.250s\" contenente il database %s non "
 "riuscita"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -377,7 +385,7 @@
 "%s: errore fatale non recuperabile, uscita:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -389,13 +397,13 @@
 "%s: errore fatale non recuperabile, uscita:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "memoria esaurita per la nuova voce di cleanup"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -404,32 +412,32 @@
 "%s: errore durante la pulizia:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: troppi errori correlati durante il ripristino dell'errore.\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "memoria esaurita per la nuova voce di cleanup"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "memoria esaurita per la nuova voce di cleanup con molti argomenti"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s: attenzione: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: attenzione: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: errore interno %s\n"
@@ -445,113 +453,113 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "\"%.*s\" non è consentito per %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "%s è seguito da cose inutili"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "nome del pacchetto non valido (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "il campo dei dettagli del file \"%s\" è vuoto"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr ""
 "il campo dei dettagli del file \"%s\" non è consentito nel file di stato"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "troppi valori nel campo dei dettagli del file \"%s\" (rispetto agli altri)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "troppo pochi valori nel campo dei dettagli del file \"%s\" (rispetto agli "
 "altri)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "yes/no in un campo booleano"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "parola nel campo \"priority\""
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "valore per il campo \"status\" non consentito in questo contesto"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "la prima parola nel campo \"status\""
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "la seconda parola nel campo \"status\""
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "la terza parola nel campo \"status\""
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "errore nella stringa Version \"%.250s\""
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "usati i campi obsoleti \"Revision\" o \"Package-Revision\""
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr ""
 "valore per il campo \"config-version\" non consentito in questo contesto"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "errore nella stringa Config-Version \"%.250s\""
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr ""
 "il valore per \"conffiles\" contiene una riga con un formato errato \"%.*s\""
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 "il valore per \"conffiles\" contiene una riga che inizia con un carattere "
 "\"%c\" diverso da spazio"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "la directory root oppure un nome nullo è indicato come un \"conffile\""
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 "campo \"%s\", manca il nome del pacchetto oppure il valore è indecifrabile"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "campo \"%s\", nome del pacchetto \"%.255s\" non valido: %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -560,7 +568,7 @@
 "campo \"%s\", riferimento a \"%.255s\":\n"
 " la relazione tra le versioni %c%c è errata"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -569,7 +577,7 @@
 "campo \"%s\", riferimento a \"%.255s\":\n"
 " \"%c\" è obsoleto, usare \"%c=\" o \"%c%c\" al suo posto"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -579,11 +587,11 @@
 " corrispondenza implicita esatta sul numero di versione, è consigliato l'uso "
 "di \"=\""
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Solo le versioni esatte possono essere usate per \"Provides\""
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -593,58 +601,58 @@
 " numero di versione iniziante con un carattere non alfanumerico,\n"
 " è consigliato aggiungere uno spazio"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "campo \"%s\", riferimento a \"%.255s\": la versione contiene \"%c\""
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "campo \"%s\", riferimento a \"%.255s\": versione non terminata"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "campo \"%s\", riferimento a \"%.255s\": errore nella versione"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr ""
 "campo \"%s\", errore di sintassi dopo il riferimento al pacchetto \"%.255s\""
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternative (\"|\") non consentite nel campo %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 "valore per il campo \"triggers-pending\" non consentito in questo contesto"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "nome del trigger imminente \"%.255s\" non valido: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "trigger imminente \"%.255s\" duplicato"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr ""
 "valore per il campo \"triggers-awaited\" non consentito in questo contesto"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "nome di pacchetto non valido nel trigger in attesa \"%.255s\": %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "trigger del pacchetto in attesa \"%.250s\" duplicato"
@@ -701,7 +709,7 @@
 msgid "unable to write to status fd %d"
 msgstr "impossibile scrivere sul file di stato %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "malloc failed (%ld bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -713,8 +721,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc non riuscita (%ld byte)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "allocazione della memoria non riuscita"
 
@@ -747,203 +755,209 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "impossibile impostare il flag close-on-exec per %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "errore di configurazione: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr ""
 "apertura del file di configurazione \"%.255s\" per la lettura non riuscita: "
 "%s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "virgolette non bilanciate in \"%s\""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "opzione \"%s\" sconosciuta"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "\"%s\" richiede un valore"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "\"%s\" non accetta alcun valore"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "errore nel leggere il file di configurazione \"%.255s\""
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "errore nel chiudere il file di configurazione \"%.255s\""
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "errore nell'aprire la directory di configurazione \"%s\""
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "opzione --%s sconosciuta"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "l'opzione --%s richiede un valore"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "l'opzione --%s non accetta alcun valore"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "opzione -%c sconosciuta"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "l'opzione -%c richiede un valore"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "l'opzione -%c non accetta alcun valore"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "opzione \"--%s\" obsoleta\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "azioni -%c (--%s) e -%c (--%s) in conflitto"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "valore duplicato per il campo \"%s\""
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "il nome del campo definito dall'utente \"%.*s\" è troppo corto"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "valore duplicato per il campo definito dall'utente \"%.*s\""
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Status inappropriato come valore di Configured-Version del pacchetto"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "lo stato del pacchetto è %s, ma sono attesi dei trigger"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "lo stato del pacchetto è triggers-awaited, ma nessun trigger atteso"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "lo stato del pacchetto è %s, ma dei trigger sono imminenti"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "lo stato del pacchetto è triggers-pending, ma nessun trigger imminente"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "Il pacchetto non installato ha dei file di configurazione, ignorati"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr ""
 "apertura del file di informazioni sui pacchetti \"%.255s\" in lettura non "
 "riuscita"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "impossibile eseguire stat sulle informazioni del pacchetto \"%.255s\""
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "impossibile eseguire mmap sulle informazioni del pacchetto \"%.255s\""
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "impossibile eseguire stat sulle informazioni del pacchetto \"%.255s\""
 
-#: lib/dpkg/parse.c:380
+# (ndt) sembra essere il nome del file
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "chiusura dopo una lettura di \"%.255s\" non riuscita"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF dopo il nome del campo \"%.*s\""
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "newline nel nome del campo \"%.*s\""
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "EOF MSDOS (^Z) nel nome del campo \"%.*s\""
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "il nome del campo \"%.*s\" deve essere seguito dai due punti"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF prima del valore per il campo \"%.*s\" (newline finale mancante)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "EOF MSDOS nel valore del campo \"%.*s\" (newline mancante?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "newline nel nome del campo \"%.*s\""
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF nel valore del campo \"%.*s\" (newline finale mancante)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "trovate molteplici descrizioni del pacchetto, ne è consentita solo una"
 
-# (ndt) sembra essere il nome del file
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "chiusura dopo una lettura di \"%.255s\" non riuscita"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "nessuna informazione sul pacchetto in \"%.255s\""
@@ -972,17 +986,17 @@
 "%s, nel file \"%.255s\" vicino alla riga %d:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "non può essere una stringa vuota"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "deve iniziare con un carattere alfanumerico"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
@@ -990,48 +1004,48 @@
 "\")"
 
 # (ndt) dovrebbe essere relavito alla versione
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<non definita>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "la stringa di versione è vuota"
 
 # (ndt) idee migliori?
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "la stringa di versione presenta degli spazi"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "il valore epoch nella versione non è un numero"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "non è presente nulla dopo i due punti nel numero di versione"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "carattere non valido nel numero di versione"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "carattere non valido nel numero di revisione"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "%s mancante"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "valore vuoto per %s"
@@ -1050,57 +1064,57 @@
 msgid "(no description available)"
 msgstr "(nessuna descrizione disponibile)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "impossibile ignorare il segnale %s prima di eseguire %.250s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "errore nel ripristino del segnale %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (sottoprocesso): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "fork non riuscita"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "il sottoprocesso %s ha restituito lo stato di errore %d"
 
 # (ndt) idee???
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "wait del sotto-processo %s non riuscita"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "il sottoprocesso %s è stato terminato dal segnale (%s)%s"
 
 # (ndt) dovrebbe andare a collegarsi con quella sopra
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", eseguito un core dump"
 
 # (ndt) usare fallito o non riuscito in questo caso non mi 
 # convince del tutto...
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "il sottoprocesso %s è terminato con un codice di wait %d"
 
 # (ndt) idee???
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "wait del sotto-processo %s non riuscita"
@@ -1124,63 +1138,55 @@
 "errore di sintassi nel file dei trigger rinviati \"%.250s\" al carattere \"%s"
 "\"%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "impossibile aprire/creare il file di blocco dei trigger \"%.250s\""
 
 # (ndt) statusstring
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "triggered"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "impossibile eseguire stat sul file dei trigger rinviati \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "impossibile aprire il file dei trigger rinviati \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 "impossibile aprire/creare il nuovo file dei trigger rinviati \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "errore nel leggere il file dei trigger rinviati \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "impossibile scriver il nuovo file dei trigger rinviati \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "impossibile chiudere il nuovo file dei trigger rinviati \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "impossibile installare il nuovo file dei trigger rinviati \"%.255s\""
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "nomi di trigger nulli non sono permessi"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "il nome del trigger contiene caratteri non validi"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1189,20 +1195,20 @@
 "sintassi non valida o sconosciuta nel nome del trigger \"%.250s\" (nel "
 "trigger di interesse per il pacchetto \"%.250s\")"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr ""
 "apertura del file \"%.250s\" con l'elenco dei trigger di interesse non "
 "riuscita"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr ""
 "impossibile tornare all'inizio del file dei trigger di interesse \"%.250s\""
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1211,41 +1217,47 @@
 "errore di sintassi nel file dei trigger di interesse \"%.250s\", non di "
 "pacchetto \"%250s\" non valido: %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "impossibile creare il nuovo file dei trigger di interesse \"%.250s\""
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "impossibile scrivere il nuovo file del trigger di interesse \"%.205s\""
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr ""
 "impossibile eseguire il flush del nuovo file del trigger di interesse "
 "\"%.250s\""
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr ""
 "impossibile sincronizzare il nuovo file del trigger di interesse \"%.250s\""
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "impossibile chiudere il nuovo file del trigger di interesse \"%.250s\""
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr ""
 "impossibile installare il nuovo file del trigger di interesse \"%.250s\""
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "impossibile rimuovere \"%.250s\""
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "impossibile creare il nuovo file dei trigger di interesse \"%.250s\""
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "impossibile chiudere il nuovo file del trigger di interesse \"%.250s\""
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1253,47 +1265,47 @@
 "file del trigger di interesse duplicato per il nome file \"%.250s\" e il "
 "pacchetto \"%.250s\""
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "impossibile creare il nuovo file dei trigger \"%.250s\""
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "impossibile scrivere il nuovo file dei trigger \"%.250s\""
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "impossibile eseguire il flush del nuovo file dei trigger \"%.250s\""
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "impossibile sincronizzare il nuovo file dei trigger \"%.250s\""
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "impossibile chiudere il nuovo file dei trigger \"%.250s\""
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "impossibile installare il nuovo file dei trigger come \"%.250s\""
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "impossibile leggere il file dei trigger \"%.250s\""
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "errore di sintassi nel file dei trigger \"%.250s\""
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1302,7 +1314,7 @@
 "il record nel file dei trigger indica un nome di pacchetto \"%.250s\" non "
 "valido (per l'interesse nel file \"%.250s\"): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1311,32 +1323,40 @@
 "il file dei trigger ci \"%.250s\" contiene una sintassi non valida nel nome "
 "del trigger \"%.250s\": %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "impossibile aprire il file dei trigger ci \"%.250s\""
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "il file dei trigger ci contiene una sintassi sconosciuta"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "il file dei trigger ci contiene una direttiva \"%.250s\" sconosciuta"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "impossibile creare la directory di stato dei trigger \"%.250s\""
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 "impossibile impostare il proprietario della directory di stato dei trigger "
 "\"%.250s\""
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "nomi di trigger nulli non sono permessi"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "il nome del trigger contiene caratteri non validi"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1361,7 +1381,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "errore nel formattare la stringa in una variabile varbuf"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "errore nel leggere dalla pipe dpkg-deb"
 
@@ -1381,12 +1401,12 @@
 msgstr ""
 "errore nell'impostare il proprietario del collegamento simbolico \"%.255s\""
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "errore nell'impostare il proprietario di \"%.255s\""
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "errore nell'impostare i permessi di \"%.255s\""
@@ -1449,17 +1469,26 @@
 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:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "impossibile eseguire stat sul file \"%s\""
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Sostituzione dei file nella versione precedente del pacchetto %s...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Sostituiti dai file nel pacchetto %s installato...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1468,102 +1497,107 @@
 "tentata sovrascrittura della directory \"%.250s\" nel pacchetto %.250s "
 "%.250s con un oggetto non-directory"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "tentata sovrascrittura di \"%.250s\" presente anche nel pacchetto %.250s "
 "%.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "impossibile creare \"%.255s\" (durante l'elaborazione di \"%.255s\")"
 
 # (ndt) oscura...
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "dpkg-deb backend su \"%.255s\""
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "errore nello scrivere/chiudere \"%.255s\""
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "errore nel creare la pipe \"%.255s\""
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "errore nel creare il device \"%.255s\""
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "errore nel creare il collegamento fisico \"%.255s\""
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "errore nel creare il collegamento simbolico \"%.255s\""
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "errore nel creare la directory \"%.255s\""
 
 # (ndt) volutamente tolto 'aside' dalla traduzione
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "impossibile spostare \"%.255s\" per installarne la nuova versione"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "impossibile leggere il collegamento \"%.255s\""
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 "impossibile creare il collegamento simbolico alla copia di backup di \"%.255s"
 "\""
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "impossibile impostare il proprietario del collegamento simbolico alla copia "
 "di backup di \"%.255s\""
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "impossibile creare il collegamento alla copia di backup di \"%.255s\" prima "
 "di installarne la nuova versione"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "impossibile installare la nuova versione di \"%.255s\""
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "impossibile aprire \"%.255s\""
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "impossibile sincronizzare il file \"%.255s\""
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1572,7 +1606,7 @@
 "ignorati i problemi di dipendenze con %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1581,7 +1615,7 @@
 "possibile deconfigurazione del pacchetto\n"
 " essenziale %s per abilitare %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1590,7 +1624,7 @@
 "dpkg: %s è essenziale e non verrà deconfigurato\n"
 " per poter abilitare %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1600,17 +1634,17 @@
 "%s"
 
 # (ndt) queste due pare si aggancino a quelle precedenti
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "la rimozione di %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "l'installazione di %.250s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1618,12 +1652,12 @@
 "dpkg: possibile deconfigurazione di %s che potrebbe essere rovinato a causa "
 "di %s...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: %s viene deconfigurato (rovinato da %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1633,11 +1667,11 @@
 "%s"
 
 # (ndt) mah....
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "danneggiamenti ignorati, è possibile procedere ugualmente."
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1647,31 +1681,31 @@
 " la deconfigurazione non è consentita (--auto-deconfigure potrebbe essere "
 "utile)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "l'installazione di %.250s potrebbe danneggiare il software esistente"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: possibile rimozione di %s al posto di %s...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s non è installato correttamente - le relative dipendenze verranno "
 "ignorate.\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: la rimozione di %s potrebbe causare dei problemi poiché fornisce "
 "%s...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1680,109 +1714,111 @@
 "dpkg: il pacchetto %s richiede di essere reinstallato, ma verrà comunque "
 "rimosso.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 "dpkg: il pacchetto %s richiede di essere reinstallato, non verrà rimosso.\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: il pacchetto %s verrà rimosso al posto di %s.\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "pacchetti in conflitto - %.250s non verrà installato"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "conflitti ignorati, è possibile procedere ugualmente."
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive richiede almeno un percorso come argomento"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "find per dpkg --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "fdopen della pipe di find non riuscita"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "errore nel leggere la pipe di find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "errore nel chiudere la pipe di find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find per --recursive ha restituito l'errore non gestito %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "ricerca completata senza trovare alcun pacchetto (file *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s richiede almeno un archivio di pacchetto come argomento"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<standard output>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<standard error>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Selezionato il pacchetto %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Ignorato il pacchetto non selezionato %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versione %.250s di %.250s già installata, ignorata.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "retrocessione di %.250s dalla versione %.250s alla %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "Il pacchetto %.250s non verrà retrocesso dalla versione %.250s alla %.250s, "
 "ignorato.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1791,41 +1827,41 @@
 "impossibile rimuovere la versione appena installata di \"%.250s\" per "
 "consentire la reinstallazione della copia di backup"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "impossibile ripristinare la copia di backup di \"%.250s\""
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "impossibile rimuovere la copia di backup di \"%.250s\""
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "impossibile rimuovere la versione appena installata di \"%.250s\""
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "impossibile rimuovere la versione appena estratta di \"%.250s\""
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr ""
 "impossibile eseguire stat sul nuovo file di configurazione distribuito "
 "\"%.250s\""
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 "impossibile eseguire stat sul file di configurazione \"%.250s\" attualmente "
 "installato"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1836,61 +1872,61 @@
 "Il file di configurazione \"%s\" non esiste nel sistema.\n"
 "Viene installato il nuovo file.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr ""
 "%s: rimozione della vecchia copia di backup \"%.250s\" non riuscita: %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: rinomina di \"%.250s\" in \"%.250s\" non riuscita: %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: rimozione di \"%.250s\" non riuscita: %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 "%s: rimozione della vecchia versione distribuita \"%.250s\" non riuscita: %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: rimozione di \"%.250s\" (prima di sovrascriverlo) non riuscita: %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: collegamento di \"%.250s\" a \"%.250s\" non riuscito: %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Installazione della nuova versione del file di configurazione %s...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "impossibile installare \"%.250s\" come \"%.250s\""
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr ""
 "nessun pacchetto chiamato \"%s\" installato, impossibile eseguire la "
 "configurazione"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "il pacchetto %.250s è già installato e configurato"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1899,7 +1935,7 @@
 "il pacchetto %.250s non è pronto per la configurazione\n"
 " impossibile configurarlo (stato corrente \"%.250s\")"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1908,11 +1944,11 @@
 "dpkg: problemi con le dipendenze impediscono la configurazione di %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemi con le dipendenze - lasciato non configurato"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1921,7 +1957,7 @@
 "dpkg: %s: problemi con le dipendenze, ma viene configurato ugualmente:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1929,12 +1965,12 @@
 "Il pacchetto si trova in uno stato di inconsistenza critico - è consigliato\n"
 " reinstallarlo prima di tentare la configurazione."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Configurazione di %s (%s)...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1943,7 +1979,7 @@
 "%s: impossibile eseguire stat sul file di configurazione \"%s\"\n"
 " (= \"%s\"): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1952,7 +1988,7 @@
 "%s: il file di configurazione \"%s\" è un collegamento circolare\n"
 " (= \"%s\")"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1961,7 +1997,7 @@
 "%s: impossibile eseguire readlink sul file di configurazione \"%s\"\n"
 " (= \"%s\"): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1970,37 +2006,37 @@
 "%s: il file di configurazione \"%.250s\" indica un nome file rovinato\n"
 " (\"%s\" è un collegamento simbolico a \"%s\")"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: il file di configurazione \"%.250s\" non è un file normale o un "
 "collegamento simbolico (= \"%s\")"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr ""
 "%s: impossibile aprire il file di configurazione %s per calcolarne il codice "
 "hash: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Digitare \"exit\" una volta terminato.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -2009,12 +2045,12 @@
 "\n"
 "File di configurazione \"%s\""
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (realmente \"%s\")"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -2025,7 +2061,7 @@
 " ==> File nel sistema creato dall'utente o da uno script.\n"
 " ==> File anche nel pacchetto fornito dal responsabile del pacchetto.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -2034,7 +2070,7 @@
 "\n"
 "     Non modificato dopo l'installazione.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2043,7 +2079,7 @@
 "\n"
 " ==> Modificato (dall'utente o da uno script) dopo l'installazione.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -2052,42 +2088,42 @@
 "\n"
 " ==> Eliminato (dall'utente o da uno script) dopo l'installazione.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr ""
 " ==> Il distributore del pacchetto ha fornito una versione aggiornata.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr ""
 "     La versione nel pacchetto è la stessa dell'ultima installazione.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Viene usato il nuovo file.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Viene usato il vecchio file.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr ""
 " ==> Viene mantenuto il vecchio file di configurazione come valore "
 "predefinito.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr ""
 " ==> Viene usato il nuovo file di configurazione come valore predefinito.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2102,160 +2138,162 @@
 "      D    : mostra le differenze tra le versioni\n"
 "      Z    : avvia una shell per esaminare la situazione\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " L'azione predefinita consiste nel mantenere la versione attuale.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " L'azione predefinita consiste nell'installare la nuova versione.\n"
 
 # (ndt) penso non ci siano problemi nel tradurre
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[predefinito=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[predefinito=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[nessun predefinito]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "errore di scrittura sullo stderr verificatosi prima del prompt per il file "
 "di configurazione"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "errore di lettura da stdin al prompt per il file di configurazione"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF su stdin al prompt per il file di configurazione"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s dipende da %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s pre-dipende da %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s raccomanda %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s suggerisce %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s danneggia %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s è in conflitto con %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s estende %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s sta per essere rimosso.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s sta per essere deconfigurato.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s è installato, ma la versione è la %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s è stato estratto, ma non è mai stato configurato.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s è stato estratto, ma la versione è la %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  l'ultima versione configurata di %.250s è la %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s è %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, 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:378
+#: src/depcon.c:392
 #, 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:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s fornisce %.250s, ma è %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s non è installato.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versione %.250s) sta per essere installato.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versione %.250s) è presente e %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, 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:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s fornisce %.250s, è presente e %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr ""
 "Usare --help per un aiuto su come eseguire interrogazioni sui pacchetti."
 
@@ -2264,7 +2302,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versione %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2275,8 +2313,8 @@
 "Copyright © 2000, 2001 Wichert Akkerman.\n"
 "Copyright © 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2287,7 +2325,7 @@
 "2\n"
 "o successiva per le condizioni di copia. NON c'è alcuna garanzia.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2297,7 +2335,7 @@
 "Uso: %s [<opzione> ...] <comando>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2316,7 +2354,7 @@
 "  --truename <file>        Ritorna il file diversificato\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2348,7 +2386,7 @@
 "  --version                Mostra la versione\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2363,17 +2401,12 @@
 "Gli script preinst/postrm dovrebbero sempre specificare --package e --"
 "divert.\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "impossibile eseguire stat sul file \"%s\""
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "errore nel controllare \"%s\""
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2382,130 +2415,130 @@
 "la rinomina comprende il soprascrivere \"%s\" con\n"
 "   il file \"%s\", non consentito"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "impossibile scrivere il file \"%s\""
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "copia file"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "impossibile rinominare \"%s\" in \"%s\""
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "rename: rimozione vecchio collegamento duplicato \"%s\""
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "impossibile aprire il file sorgente \"%.250s\""
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "deviazione locale di %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "deviazione locale di %s in %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "deviazione di %s da %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "deviazione di %s in %s da %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "qualsiasi deviazione di %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "qualsiasi deviazione di %s in %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "impossibile creare il nuovo file %s"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "impossibile eseguire il flush del file \"%s\""
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "errore nel rimuovere il vecchio diversions-old"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "errore nel creare il nuovo diversions-old"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "errore nell'installare il nuovo diversions"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s richiede un solo argomento"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "il nome di file \"%s\" non è assoluto"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "il file non dovrebbe contenere newline"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Impossibile divergere le directory"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "Impossibile divergere il file \"%s\" a se stesso"
 
 # (ndt) non mi convince...
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "Viene lasciato \"%s\"\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "\"%s\" è discordante da \"%s\""
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "Viene aggiunto \"%s\"\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Nessuna deviazione \"%s\", nessuna rimossa.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2516,7 +2549,7 @@
 "  nel rimuovere \"%s\"\n"
 "  trovato \"%s\""
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2527,16 +2560,16 @@
 "  nel rimuovere \"%s\"\n"
 "  trovato \"%s\""
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "Rimozione di \"%s\"\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "pacchetto non dovrebbe contenere newline"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "divert-to non dovrebbe contenere newline"
 
@@ -2623,8 +2656,8 @@
 "o \"dpkg --configure --pending\" (oppure \"dpkg --triggers-only\"):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s non accetta alcun argomento"
@@ -2722,7 +2755,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions relazione errata"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "sintassi della versione \"%s\" errata: %s"
@@ -2778,13 +2811,13 @@
 msgid "overriding problem because --force enabled:"
 msgstr "viene ignorato il problema poiché è usata l'opzione --force:"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 "impossibile aprire il file con l'elenco dei file del pacchetto \"%.250s\""
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2793,85 +2826,85 @@
 "file con l'elenco dei file del pacchetto \"%.250s\" mancante, il pacchetto "
 "viene considerato senza alcun file attualmente installato."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr ""
 "impossibile eseguire stat sul file con l'elenco dei file del pacchetto "
 "\"%.250s\""
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "elenco dei file del pacchetto \"%.250s\""
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "al file con l'elenco dei file del pacchetto \"%.250s\" manca un newline "
 "finale"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "il file con l'elenco dei file del pacchetto \"%.250s\" contiene un nome file "
 "vuoto"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 "errore nel chiudere il file con l'elenco dei file del pacchetto \"%.250s\""
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Lettura del database... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "%d file o directory attualmente installato.)\n"
 msgstr[1] "%d file e directory attualmente installati.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 "impossibile creare il file aggiornato con l'elenco dei file del pacchetto %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 "scrittura del file aggiornato con l'elenco dei file del pacchetto %s non "
 "riuscita"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 "esecuzione del flush del file aggiornato con l'elenco dei file del pacchetto "
 "%s non riuscita"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 "sincronizzazione del file aggiornato con l'elenco dei file del pacchetto %s "
 "non riuscita"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 "chiusura del file aggiornato con l'elenco dei file del pacchetto %s non "
 "riuscita"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2918,7 +2951,9 @@
 msgstr "installato"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "errore: variabile PATH non impostata."
 
 #: src/help.c:129
@@ -2962,7 +2997,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2974,65 +3009,65 @@
 msgstr "esecuzione di chroot a \"%.250s\" non riuscita"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "esecuzione di chdir a \"%.255s\" non riuscita"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "impossibile impostare i permessi di esecuzione su \"%.250s\""
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "impossibile eseguire setenv per lo script di maintainer"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "vecchio script di %s"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "impossibile eseguire stat su %s \"%.250s\""
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "nuovo script %s"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "vecchio script di %s"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "impossibile eseguire stat su %s \"%.250s\": %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - viene provato lo script dal nuovo pacchetto...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "non c'è alcuno script nella nuova versione del pacchetto - saltato"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... sembra tutto sia andato correttamente.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "impossibile rimuovere in sicurezza \"%.255s\""
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -3041,7 +3076,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "impossibile verificare l'esistenza di \"%.250s\""
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "impossibile leggere la directory info"
 
@@ -3119,7 +3154,7 @@
 "  -Dh|--debug=help                   Mostra l'aiuto sul debug\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3249,7 +3284,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr "Usare \"dselect\" per un'interfaccia alla gestione dei pacchetti.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3300,30 +3335,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3332,103 +3371,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "problemi con le dipendenze - rimozione non possibile"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "problemi con le dipendenze - rimozione non possibile"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "impossibile eseguire setenv per lo script di maintainer"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "errore nel leggere il file di configurazione \"%.255s\""
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3436,7 +3475,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3444,41 +3483,41 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug richiede un numero in base otto come argomento"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nome di pacchetto nullo nell'elenco separato da virgole \"%.250s\" di --"
 "ignore-depends"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends richiede un nome di pacchetto valido. \"%.250s\" non lo è; "
 "%s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "numero intero per --%s non valido: \"%.250s\""
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "errore nell'eseguire l'hook \"%s\", codice d'uscita %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "stato"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3487,7 +3526,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3495,12 +3534,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opzione force/refuse \"%.*s\" sconosciuta"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "opzione force/refuse \"%s\" obsoleta\n"
@@ -3523,8 +3562,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "eof inatteso prima della fine della riga %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "necessaria un'opzione che indichi un'azione"
 
@@ -3690,98 +3729,98 @@
 msgid "passed\n"
 msgstr "superata\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "impossibile creare una directory temporanea"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "il pacchetto %s ha troppe coppie Conflicts/Replaces"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "la vecchia versione del pacchetto ha un file di configurazione troppo lungo "
 "che inizia per \"%.250s\""
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "impossibile rimuovere il file di informazioni obsoleto \"%.250s\""
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 "impossibile installare il (supposto) nuovo file di informazioni \"%.250s\""
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "impossibile aprire la directory di controllo temporanea"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "il pacchetto contiene un nome troppo lungo per il file con le informazioni "
 "di controllo (inizia per \"%.50s\")"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr ""
 "le informazioni di controllo del pacchetto contenevano la directory \"%.250s"
 "\""
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "la rimozione (rmdir) di \"%.250s\" nelle informazioni di controllo del "
 "pacchetto non indicavano una directory"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "il pacchetto %s conteneva un elenco come file di informazioni"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 "impossibile installare il nuovo file di informazioni \"%.250s\" come \"%.250s"
 "\""
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr ""
 "impossibile eliminare il file con le informazioni di controllo \"%.250s\""
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "impossibile accedere all'archivio"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "impossibile creare una directory temporanea"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "lunghezza informazioni controllo"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Informazioni riguardo %s provenienti da %s registrate.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr ""
 "l'architettura del pacchetto (%s) non corrisponde a quella del sistema (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3790,106 +3829,106 @@
 "dpkg: problemi con le pre-dipendenze di %s contenente %s:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "problema con le pre-dipendenze - %.250s non viene installato"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "vengono ignorati i problemi con le pre-dipendenze."
 
 # (ndt) il secondo è la versione
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Preparativi per sostituire %s v.%s (utilizzando %s)...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Estrazione di %s (da %s)...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "nome del file di configurazione (inizia per \"%.250s\") troppo lungo (>%d "
 "caratteri)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "errore di lettura in %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "errore nel chiudere %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "errore nel cercare di aprire %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Deconfigurazione di %s per poter rimuovere %s...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Deconfigurazione di %s...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Estrazione del sostituto di %.250s...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "estrazione campo dpkg-deb"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "errore nel leggere il file tar creato da dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "ile tar rovinato - l'archivio del pacchetto è danneggiato"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: rimozione di possibili caratteri nulli terminali"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "impossibile eseguire stat del vecchio file \"%.250s\", non viene eliminato: "
 "%s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "impossibile eliminare la vecchia directory \"%.250s\": %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "il vecchio file di configurazione \"%.250s\" era una directory vuota (ora è "
 "stata eliminata)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "impossibile eseguire stat sull'altro file nuovo \"%.250s\""
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3898,12 +3937,12 @@
 "il vecchio file \"%.250s\" è lo stesso di molti nuovi file (sia \"%.250s\" "
 "che \"%.250s\")"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "impossibile rimuovere in sicurezza il vecchio file \"%.250s\": %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Impossibile trovare %s che è stato completamente sostituito.)\n"
@@ -4088,7 +4127,7 @@
 "  -f|--showformat=<formato>        Usa un formato alternativo per --show\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -4114,6 +4153,11 @@
 "  larghezza non abbia valore negativo, nel qual caso l'allineamento sarà a\n"
 "  sinistra.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+"Usare --help per un aiuto su come eseguire interrogazioni sui pacchetti."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4173,7 +4217,7 @@
 msgid "Removing %s ...\n"
 msgstr "Rimozione di %s...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4182,54 +4226,55 @@
 "nel rimuovere %.250s non è stato possibile rimuovere la directory \"%.250s"
 "\": %s - è un punto di mount?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "impossibile rimuovere \"%.250s\""
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "impossibile rimuovere in sicurezza \"%.250s\""
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "nel rimuovere %.250s la directory \"%.250s\" è risultata non vuota e non "
 "viene rimossa."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "impossibile rimuovere \"%.250s\""
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Eliminazione dei file di configurazione di %s...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr ""
 "impossibile rimuovere il vecchio file di configurazione \"%.250s\") (= "
 "\"%.250s\")"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 "impossibile leggere la directory del file di configurazione \"%.250s\" (da "
 "\"%.250s\")"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "impossibile rimuovere la vecchia copia di backup del file di configurazione "
 "\"%.250s\") (di \"%.250s\")"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "impossibile rimuovere il vecchio elenco dei file"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "impossibile rimuovere il vecchio script postrm"
 
@@ -4272,7 +4317,14 @@
 msgid "read error on standard input"
 msgstr "errore di lettura sullo standard input"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+"Usare --help per un aiuto su come eseguire interrogazioni sui pacchetti."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4281,7 +4333,7 @@
 "Copyright © 2000, 2001 Wichert Akkerman.\n"
 "Copyright © 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4297,7 +4349,7 @@
 "  --remove <file>          Rimuove il file dal database\n"
 "  --list [<glob-pattern>]  Elenca gli override nel database\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4317,31 +4369,31 @@
 "  --help                   Mostra questo messaggio di aiuto\n"
 "  --version                Mostra la versione\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "vengono tolti gli / in coda"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "impossibile aprire il nuovo file statoverride"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "errore nel rimuovere statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "errore nel creare il nuovo statoverride-old"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "errore nell'installare il nuovo statoverride"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add richiede quattro argomenti"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4350,21 +4402,21 @@
 "Esiste già un override per \"%s\", ma l'opzione --force è stata specificata, "
 "quindi viene ignorato."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Esiste già un override per \"%s\", uscita."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "fornito --update, ma %s non esiste"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Nessun override presente."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update è inutile per --remove"
 
@@ -4429,16 +4481,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "presenti molteplici statusoverride per il file \"%.250s\""
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Usare \"dpkg-trigger --help\" per l'aiuto riguardo questa utilità."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Utilità per i trigger dei pacchetti Debian %s versione %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4449,7 +4501,7 @@
 "     %s [<opzioni> ...] <comando>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4461,7 +4513,7 @@
 "  --check-supported                Verifica che dpkg supporti i trigger\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4483,21 +4535,21 @@
 "  --no-act                         Esegue solo i test, non modifica nulla\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: la directory dei dati dei trigger non è stata ancora creata\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: i record del trigger non esistono ancora\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "accetta un solo argomento, il nome del trigger"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4507,13 +4559,13 @@
 "dpkg-trigger deve essere invocato da uno script di maintainer (oppure con "
 "un'opzione --by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: nome del pacchetto atteso \"%.250s\" non valido: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "nome del trigger \"%.250s\" non valido: %.250s"
@@ -4546,41 +4598,42 @@
 msgstr "Elaborazione dei trigger per %s...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s richiede un file Packages come unico argomento"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "impossibile accedere all'area di stato di dpkg per l'aggiornamento massivo "
 "delle disponibilità"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "l'aggiornamento massivo delle disponibilità necessita dei permessi di "
 "scrittura sull'area di stato di dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Sostituzione delle informazioni sui pacchetti disponibili usando %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr ""
 "Aggiornamento delle informazioni sui pacchetti disponibili usando %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "Le informazioni riguardo %d pacchetto sono state aggiornate.\n"
 msgstr[1] "Le informazioni riguardo %d pacchetti sono state aggiornate.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4702,8 +4755,8 @@
 msgstr[0] "%d avviso relativo ai file di controllo viene ignorato\n"
 msgstr[1] "%d avvisi relativi ai file di controllo vengono ignorati\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s richiede un argomento <directory>"
@@ -4737,26 +4790,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: generazione del pacchetto \"%s\" in \"%s\".\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "creazione di un file temporaneo non riuscita (dati)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control"
 msgid "control member"
 msgstr "control"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "rimozione del collegamento al file temporaneo %s non riuscita (dati)"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4773,20 +4826,20 @@
 msgid "error writing `%s'"
 msgstr "errore nello scrivere \"%s\""
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "tra i membri"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "scrittura del nome del file sulla pipe di tar non riuscita (dati)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<compress> da tar -cf"
 
@@ -4805,67 +4858,67 @@
 msgid "error reading %s from file %.255s"
 msgstr "errore nel leggere %s dal file %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "lettura dell'archivio \"%.255s\" non riuscita"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "esecuzione di fstat sull'archivio non riuscita"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "il numero di versione dell'archivio non contiene alcun punto (\".\")"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "l'archivio non contiene newline nell'intestazione"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "il file \"%.250s\" è danneggiato - numero di porzione errato"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "il file \"%.250s\" non è un archivio nel formato debian (provare dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "il numero di versione dell'archivio non contiene alcun punto (\".\")"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "l'archivio non contiene newline nell'intestazione"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "il numero di versione dell'archivio non contiene alcun punto (\".\")"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "versione %.250s dell'archivio non comprensibile, installare una versione di "
 "dpkg-deb più recente"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "dati dell'elemento da %s tralasciati"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
@@ -4873,14 +4926,14 @@
 "il file \"%.250s\" contiene un elemento dati incomprensibile %.*s, "
 "operazione annullata"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr ""
 "il file \"%.250s\" contiene due elementi di controllo, operazione annullata"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4892,23 +4945,23 @@
 " nuovo pacchetto debian, versione %s.\n"
 " dimensione %ld byte: archivio di controllo= %zi byte.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "l'archivio ha una lunghezza di controllo \"%s\" mal formattata"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "dati dell'elemento da %s tralasciati"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4920,7 +4973,7 @@
 " vecchio pacchetto debian, versione %s.\n"
 " dimensione %ld byte: archivio di controllo= %zi, archivio principale= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4929,52 +4982,53 @@
 "dpkg-deb: il file sembra essere un archivio danneggiato\n"
 "dpkg-deb:  per essere stato scaricato in modalità ASCII\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "\"%.255s\" non è un archivio in formato debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "scrittura sulla pipe nella copia non riuscita"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "chiusura della pipe nella copia non riuscita"
 
 # (ndt) non riesco a capire dove venga usata
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "dati"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "esecuzione di chdir sulla directory non riuscita"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "creazione di una directory non riuscita"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "esecuzione di chdir sulla directory dopo averla creata non riuscita"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "esecuzione di chdir sulla directory non riuscita"
-
 # (ndt) comprimere -> decomprimere...
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<decompressione>"
 
 # (ndt) boh!?!?
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "paste"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s richiede il nome di un file .deb come argomento"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4983,27 +5037,27 @@
 "--%s richiede come argomento una directory di destinazione.\n"
 "Usare \"dpkg --install\"?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s accetta al massimo due argomenti (un .deb e una directory)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s accetta un solo argomento (un nome di file .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "esecuzione di chdir su \"/\" per la pulizia non riuscita"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "impossibile eseguire stat sul file \"%s\""
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr ""
@@ -5011,72 +5065,72 @@
 
 # (ndt) non mi è molto chiara
 # se fosse: il componente aperto ... ?
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "apertura del componente \"%.255s\" (in %.255s) non riuscita in modo inatteso"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "Manca %d dei componenti di controllo richiesto"
 msgstr[1] "Mancano %d dei componenti di controllo richiesto"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "impossibile analizzare la directory \"%.255s\""
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "impossibile eseguire stat su \"%.255s\" (in \"%.255s\")"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "impossibile aprire \"%.255s\" (in \"%.255s\")"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "lettura di \"%.255s\" (in \"%.255s\") non riuscita"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld byte, %5d righe   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     non un file normale       %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(nessun file \"control\" nell'archivio di controllo)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "impossibile aprire il componente \"control\""
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "lettura del componente \"control\" non riuscita"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "errore nel chiudere il componente \"%s\""
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Errore nel formato"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents accetta esattamente un argomento"
 
@@ -5087,7 +5141,19 @@
 "Debian \"%s\", backend di gestione degli archivi di pacchetti versione %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -5098,6 +5164,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -5113,7 +5181,7 @@
 "  --fsys-tarfile <deb>             Crea un file tar\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -5126,11 +5194,27 @@
 "<cfield> è il nome di un campo nel file \"control\" principale.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5157,7 +5241,7 @@
 "none\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5171,7 +5255,7 @@
 "pacchetti. Pacchetti estratti con \"dpkg-deb --extract\" saranno installati\n"
 "non correttamente.\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5180,17 +5264,17 @@
 "Usare \"dpkg --help\" per l'aiuto sull'installazione e rimozione dei "
 "pacchetti."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "numero intero per -%c non valido: \"%.250s\""
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "livello di compressione per -%c non valido: \"%ld\""
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tipo di compressione \"%s\" sconosciuto."
@@ -5210,7 +5294,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "il file \"%.250s\" è rovinato - manca il newline dopo %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "errore nel leggere %.250s"
@@ -5310,55 +5394,61 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "il file \"%.250s\" è danneggiato - numero di porzione errato"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "nome pacchetto"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "il file \"%.250s\" è danneggiato - codice di controllo errato alla fine "
 "della seconda intestazione"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "il file \"%.250s\" è danneggiato - il secondo componente non è un componente "
 "dati"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "il file \"%.250s\" è danneggiato - numero di porzioni errato per le "
 "dimensioni \"quotate\""
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "il file \"%.250s\" è danneggiato - dimensione errata per il numero di "
 "porzione \"quotato\""
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "impossibile eseguire fstat sulla porzione \"%.250s\""
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "il file \"%.250s\" è danneggiato - troppo corto"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "impossibile aprire la porzione di archivio \"%.250s\""
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "il file \"%.250s\" non è una porzione di archivio"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5378,6 +5468,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5400,12 +5491,19 @@
 "    Dimensione file (porzione usata):  %lu byte\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<sconosciuta>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s richiede uno o più nomi di porzioni come argomenti"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "il file \"%s\" non è una porzione di archivio\n"
@@ -5442,7 +5540,7 @@
 msgid "split package part"
 msgstr "Creazione del pacchetto %s da %d porzione: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "fatto\n"
@@ -5495,17 +5593,26 @@
 "  -d|--discard [<porzione> ...]       Scarta le porzioni non corrispondenti\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Opzioni:\n"
 "  --depotdir <directory>           Usa <directory> al posto di %s/%s\n"
@@ -5517,20 +5624,29 @@
 "\n"
 "Stato di uscita: 0 = OK; 1 = -a non è una porzione; 2 = problemi\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Usare \"dpkg-split --help\" per l'aiuto."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fine del file inattesa in %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "la dimensione della porzione è troppo grande oppure negativa"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -5649,27 +5765,27 @@
 msgid "Deleted %s.\n"
 msgstr "%s eliminato.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "estrazione campo dpkg-deb"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "impossibile aprire il file sorgente \"%.250s\""
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "impossibile eseguire fstat sul file sorgente"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "il file sorgente \"%.250s\" non è un file normale"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5678,17 +5794,17 @@
 msgstr[0] "Creazione del pacchetto %s da %d porzione: "
 msgstr[1] "Creazione del pacchetto %s da %d porzioni: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split richiede un nome di file sorgente come argomento"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "--split accetta al più un nome di file sorgente e un prefisso di destinazione"
@@ -5862,125 +5978,90 @@
 "  --help                   Mostra questo messaggio di aiuto\n"
 "  --version                Mostra la versione\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "errore"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "attenzione"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "impossibile eseguire stat su \"%s\": %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "readlink(%s) non riuscita: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "specificati due comandi: --%s e --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "Impossibile appendere a %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "scansione di %s non riuscita: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "esecuzione di %s non riuscita: %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "impossibile creare %s come collegamento simbolico a %s: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "impossibile installare %s come %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "impossibile rimuovere %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "fine del file inattesa durante il tentativo di leggere %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "durante la lettura di %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "riga non terminata durante il tentativo di leggere %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s danneggiato: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "newline proibite nei file update-alternatives (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "durante la scrittura di %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "nome slave"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "slave %s duplicato"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "collegamento slave"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "collegamento slave identico a quello main %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "collegemanto slave %s duplicato"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "file master"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "percorso %s duplicato"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5989,130 +6070,115 @@
 "l'alternativa %s (parte del gruppo %s) non esiste. Viene rimossa dall'elenco "
 "delle alternative."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "priorità"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "file slave"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "priorità di %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "impossibile leggere %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "stato"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "stato non valido"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "collegamento master"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "impossibile chiudere %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "eliminazione del collegamento slave %s (%s) obsoleto."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "impossibile scrivere %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "modalità automatica"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "modalità manuale"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "  il collegamento attualmente punta a %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "  collegamento attualmente assente"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - priorità %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  slave %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "La versione \"best\" attuale è \"%s\"."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Nessuna versione disponibile."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "È disponibile %d scelta per l'alternativa %s (che fornisce %s)."
 msgstr[1] "Sono disponibili %d scelte per l'alternativa %s (che fornisce %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Selezione"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Percorso"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Priorità"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Stato"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Premere Invio per mantenere il valore predefinito[*] o digitare il numero "
 "della selezione:"
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "%s non viene sostituito con un collegamento."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "impossibile installare la scelta %s sconosciuta"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -6121,99 +6187,157 @@
 "saltata la creazione di %s poiché il file %s associato (del gruppo %s) non "
 "esiste."
 
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "%s non viene sostituito con un collegamento."
+
 # (ndt) non ho idea di cosa vada sostituito...
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Chiama %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Alternativa %s non modificata poiché la scelta %s non è disponibile."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Alternativa %s sconosciuta saltata."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "riga troppo lunga o non terminata durante il tentativo di leggere %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Salta riga non valida: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "rinomina del collegamento %s da %s a %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "rinomina del collegamento slave %s da %s in %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "il nome alternativo (%s) non deve contenere \"/\" e spazi."
+
+# (ndt) accorciata, penso si capisca lo stesso...
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "il collegamento alternativo non è assoluto: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "il percorso alternativo non è assoluto: %s"
+
+# (ndt) non riesco a capire cosa viene sostituito...
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "l'alternativa %s non può essere master: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "il collegamento alternativo %s è già gestito da %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "il percorso alternativo %s non esiste."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "l'alternativa %s non può essere slave di %s: %s"
+
+# (ndt) non riesco a capire cosa viene sostituito...
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "l'alternativa %s non può essere master: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "il collegamento alternativo %s è già gestito da %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "argomento \"%s\" sconosciuto"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install richiede <collegamento> <nome> <percorso> <priorità>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<collegamento> e <percorso> non possono essere uguali"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "la priorità deve essere un numero intero"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s richiede <nome> <percorso>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s richiede <nome>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave consentita solo con --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave richiede <collegamento> <nome> <percorso>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "il nome %s è sia primario che slave"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "il collegamento %s è sia primario che slave"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s richiede un argomento <file>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opzione \"%s\" sconosciuta"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -6221,69 +6345,22 @@
 "richiede --display, --query, --list, --get-selections, --config, --set, --"
 "set-selections, --install, --remove, --all, --remove-all oppure --auto"
 
-# (ndt) non riesco a capire cosa viene sostituito...
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "l'alternativa %s non può essere master: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "il collegamento alternativo %s è già gestito da %s."
-
-# (ndt) accorciata, penso si capisca lo stesso...
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "il collegamento alternativo non è assoluto: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "il percorso alternativo non è assoluto: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "il percorso alternativo %s non esiste."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "il nome alternativo (%s) non deve contenere \"/\" e spazi."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "è un'alternativa master."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "è uno slave di %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "l'alternativa %s non può essere slave di %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<standard input>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "nessuna alternativa per %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s è in attesa, verrà aggiornato tramite una scelta ottimale."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6295,49 +6372,49 @@
 "%s è stato modificato (manualmente o da uno script). Vengono usati i soli "
 "aggiornamenti manuali."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "impostazione selezione automatica di %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "alternativa %s per %s non registrata, non viene impostata."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Non c'è alcun programma che fornisce %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Nulla da configurare."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "È presente una sola alternativa nel gruppo %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "alternativa %s per %s non registrata, non viene rimossa."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "rimozione delle alternative selezionate manualmente - viene attivata la "
 "modalità automatica per %s"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "gli aggiornamenti automatici di %s sono disabilitati, lasciato così."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6345,12 +6422,12 @@
 "per ripristinare gli aggiornamenti automatici usare \"update-alternatives --"
 "auto %s\"."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "viene usato %s per fornire %s (%s) in %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
@@ -6358,12 +6435,48 @@
 "viene forzata l'installazione dell'alternativa %s poiché il gruppo %s è "
 "danneggiato."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "l'alternativa %s attuale non è conosciuta, si passa a %s per il gruppo %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "è un'alternativa master."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "è uno slave di %s"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "impossibile eseguire stat su \"%s\": %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "readlink(%s) non riuscita: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "scansione di %s non riuscita: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "esecuzione di %s non riuscita: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "impossibile creare %s come collegamento simbolico a %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "impossibile installare %s come %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "durante la scrittura di %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "impossibile leggere %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "impossibile chiudere %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "impossibile scrivere %s: %s"
+
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6638,9 +6751,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "area di controllo da %s tralasciata"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "esecuzione di tar non riuscita"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "creazione della directory temporanea non riuscita"
 
Binary files dpkg/po/ja.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/ja.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/ja.po /home/vorlon/devel/multiarch/dpkg-debian/po/ja.po
--- dpkg/po/ja.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/ja.po	2012-06-07 10:11:09.426073000 -0700
@@ -19,7 +19,7 @@
 msgstr ""
 "Project-Id-Version: dpkg git\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-12-16 19:15+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -35,7 +35,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "ファイル '%s' に書き込めません"
@@ -56,71 +56,77 @@
 msgid "ar member file (%s)"
 msgstr "ar メンバファイルの fstat に失敗しました (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "%s のバッファコピーの読み取りに失敗しました"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "%s のバッファコピーの書き込みに失敗しました"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "%s のバッファコピーの読み取りが不十分です"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "tar の実行に失敗しました"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "%s を実行できません (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: 展開"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: 圧縮"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: gzip ストリームへの入力のバインドエラー"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: 内部 gzip 読み取りエラー: '%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: 内部 gzip 書き込みエラー"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: gzip ストリームへの出力のバインドエラー"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: 内部 gzip 読み取りエラー"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: 内部 gzip 書き込みエラー: '%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: 内部 gzip 書き込みエラー: %s"
@@ -135,31 +141,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: 内部 bzip2 読み取りエラー: '%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: 内部 bzip2 書き込みエラー"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: bzip2 ストリームへの出力のバインドエラー"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: 内部 bzip2 読み取りエラー"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: 内部 bzip2 書き込みエラー: '%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "予期せぬ bzip2 エラー"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -168,104 +174,104 @@
 "updates ディレクトリにあるファイル `%.250s' は名前が長すぎます (長さ=%d, 最大"
 "=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr "updates ディレクトリにあるファイル名の長さが異なります (%d と %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "updates ディレクトリ `%.255s' を走査できません"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "統合した更新用ファイル %.255s の削除に失敗しました"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "`%.255s' を作成できません"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "%.250s に文字を補充できません"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "文字の補充後に %.250s をフラッシュできません"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "文字の補充後に %.250s の最初に戻れません"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "テストのためのロックファイル %s をオープンできません"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "ステータスデータベースのロックファイルをオープン/作成できません。"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "あなたには dpkg ステータスデータベースをロックする権限がありません"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "dpkg ステータスデータベースをロックできません"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "要求した操作はスーパーユーザの権限が必要です"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "dpkg ステータスエリアにアクセスできません"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "操作は dpkg ステータスエリアへの読み書きの権限が必要です"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "一時的な更新用ファイル %.255s の削除に失敗しました"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "更新した `%.250s' のステータスを書き込めません"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "更新した `%.250s' のステータスをフラッシュできません"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "更新した `%.250s' のステータスを切り詰められません"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "更新した `%.250s' のステータスを fsync できません"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "更新した `%.250s' のステータスをクローズできません"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "更新した `%.250s' のステータスをインストールできません"
@@ -288,76 +294,78 @@
 msgid "unable to open directory '%s'"
 msgstr "ファイル '%s' をオープンできません"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "ファイル '%s' をオープンできません"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "ファイル'%s' を同期できません"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "ファイル '%s' をクローズできません"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "`%.50s' についての詳細を `%.250s' に書き込めませんでした"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "%2$s データベースに書き込むための '%1$s' をオープンできません"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "%s データベースファイル用のバッファリングを設定できません"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr ""
 "'%2$.50s' についての %1$s データベースレコードを '%3$.250s' に書き込めません"
 "でした"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "%s データベースを '%.250s' へフラッシュできませんでした"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "%s データベースを '%.250s' へ fsync できませんでした"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "%2$s データベースを書き込んだ後、'%1$.250s' のクローズに失敗しました"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "`%1$.250s' を %3$s データベースのバックアップとして `%2$.250s' にリンクするの"
 "に失敗しました"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 "`%1$.250s' を %3$s データベースを含んだ `%2$.250s' としてインストールできませ"
 "んでした"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -366,7 +374,7 @@
 "%s: 復旧不可能な致命的なエラーです。中止します:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -378,13 +386,13 @@
 "%s: 復旧不可能な致命的なエラーです。中止します:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "新しいクリーンアップエントリ用のメモリが不足しています"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -393,33 +401,33 @@
 "%s: クリーンアップ中にエラーが発生しました:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: エラー復旧中にさらに大量のエラーが発生しました!!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "新しいクリーンアップエントリ用のメモリが不足しています"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 "多すぎる引数のために、新しいクリーンアップエントリ用のメモリが不足しています"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s: 警告: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: 警告: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: 内部エラー: %s\n"
@@ -435,98 +443,98 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "`%.*s' は %s 用に許可されていません"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "%s 後のゴミ"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "無効なパッケージ名 (%.250s) です"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "ファイル記述フィールド `%s' が空です"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "ファイル記述フィールド `%s' はステータスファイルでは許可されていません"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "ファイル記述フィールド `%s' の値が (ほかのフィールドに比べて) 多すぎます"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "ファイル記述フィールド `%s' の値が (ほかのフィールドに比べて) 少なすぎます"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "真偽フィールドにおける yes/no"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "`priority' フィールドのワード"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "`status' フィールドの値はこのコンテキストでは許可されていません"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "`status' フィールドの第 1 ワード (要望)"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "`status' フィールドの第 2 ワード (エラー)"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "`status' フィールドの第 3 ワード (状態)"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "バージョン文字列 '%.250s' にエラー"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "古い `Revision' あるいは `Package-Revision' フィールドが使われています"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr ""
 "`config-version' フィールドの値はこのコンテキストでは許可されていません"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "Config-Version文字 '%.250s' にエラー"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "`conffiles' の値に不正な形式を持つ行 `%.*s' があります"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "`conffiles' の値に空白以外の文字 `%c' で始まる行があります"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr ""
 "ルートディレクトリあるいは空のディレクトリが設定ファイルとして指定されていま"
 "す"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -534,12 +542,12 @@
 "`%s' フィールド、パッケージ名が存在しないか、パッケージ名が入ると期待される場"
 "所にゴミがあります"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "`%s' フィールド、無効なパッケージ名 `%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -548,7 +556,7 @@
 "`%2$.255s' の `%1$s' フィールド:\n"
 " バージョン関係 %3$c%4$c は不正です"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -557,7 +565,7 @@
 "`%2$.255s' の `%1$s' フィールド:\n"
 " `%3$c' は時代遅れです。代わりに `%4$c=' または `%5$c%6$c' を使ってください"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -567,11 +575,11 @@
 " バージョン番号が厳密に一致することが明示されていません。代わりに `=' を使う"
 "ことを提案します"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Provides には正確なバージョンのみが使用できます"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -580,57 +588,57 @@
 "`%2$.255s' の `%1$s' フィールド:\n"
 " バージョン値が非英数字で始まっています。空白を加えることを提案します"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "`%2$.255s' の `%1$s' フィールド: バージョンが `%3$c' を含んでいます"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "`%2$.255s' の `%1$s' フィールド: バージョンが完結していません"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "`%2$.255s' を参照する `%1$s' フィールド: バージョンにエラー"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "`%s' フィールド、パッケージ `%.255s' 参照後の構文エラー"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "選択記号 (`|') は %s フィールド内では許可されていません"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 "`triggers-pending' フィールドの値はこのコンテキストでは許可されていません"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "無効な保留トリガ名 `%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "重複する保留トリガ `%.255s'"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr ""
 "`triggers-awaited' フィールドの値はこのコンテキストでは許可されていません"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "待ち受けトリガ `%.255s' に不正なパッケージ名があります: %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "重複する待ち受けトリガパッケージ `%.255s'"
@@ -687,7 +695,7 @@
 msgid "unable to write to status fd %d"
 msgstr "状態ファイル記述子 %d に書き込めません"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "malloc failed (%ld bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -699,8 +707,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc 失敗 (%ld バイト)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "メモリの割り当てに失敗しました"
 
@@ -733,200 +741,206 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "%.250s の close-on-exec フラグを設定できません"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "設定エラー: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "設定ファイル '%.255s' の読み取り用のオープンに失敗しました: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "'%s' の引用符が釣り合いません"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "不明なオプション '%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "'%s' は値が必要です"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "'%s' は値をとりません"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "設定ファイル `%.255s' の読み込みエラー"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "設定ファイル `%.255s' のクローズ時にエラーが発生しました"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "設定ディレクトリ '%s' のオープン時にエラーが発生しました"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "不明なオプション --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s オプションは値が必要です"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s オプションは値をとりません"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "-%c は不明なオプションです"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c オプションは値が必要です"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c オプションは値をとりません"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "時代遅れのオプション '--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "アクション -%c (--%s) と -%c (--%s) が競合します"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "`%s' フィールドの値が重複しています"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "ユーザ定義フィールド名 `%.*s' が短かすぎます"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "ユーザ定義フィールド `%.*s' の値が重複しています"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "不適切なステータスを持つパッケージの Configured-Version"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "パッケージは状態 %s ですが、トリガを待ち受けています"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "パッケージはトリガ待ち受けの状態ですが、待ち受けトリガはありません"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "パッケージは状態 %s ですが、トリガは保留されています"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "パッケージはトリガ保留の状態ですが、保留トリガはありません"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "現在インストールされていないパッケージ (ステータス not-installed) が "
 "conffiles を持っているので、それらの情報を無視します"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "パッケージ情報ファイル `%.255s' 読み取り用のオープンに失敗しました"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "パッケージ情報ファイル `%.255s' の状態を取得できません"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "パッケージ情報ファイル `%.255s' を mmap できません"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "パッケージ情報ファイル `%.255s' の状態を取得できません"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "読み込み後のクローズに失敗しました: `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "フィールド名 `%.*s' の後にEOF"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "フィールド名 `%.*s' に改行"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "フィールド名 `%.*s' に MSDOS の EOF (^Z)"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "フィールド名 `%.*s' の後はコロンでなければなりません"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "フィールド `%.*s' の値の前で EOF (最後の改行がありません)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "フィールド `%.*s' の値に MSDOS EOF 文字 (改行がありません?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "フィールド名 `%.*s' に改行"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "フィールド `%.*s' の値の間に EOF (最後の改行がありません)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "パッケージ情報エントリが複数見つかりました。許されるのは1つのみです"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "読み込み後のクローズに失敗しました: `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "`%.255s' にパッケージ情報がありません"
@@ -955,62 +969,62 @@
 "%s, ファイル '%.255s' の %d 行目付近:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "空の文字ではいけません"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "英数字で始まらなければなりません"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "文字 `%c' は許可されていません (文字、数値と '%s' のみ使用可能です)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<なし>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "バージョン文字が空です"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "バージョン文字列にスペースが埋め込まれています"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "バージョン中の epoch が数値ではありません"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "バージョン番号のコロンの後に何もありません"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "バージョン番号に無効な文字があります"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "リビジョン番号に無効な文字があります"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "%s が見つかりません"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "%s の空の値"
@@ -1029,52 +1043,52 @@
 msgid "(no description available)"
 msgstr "(説明 (description) がありません)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "%2$.250s の実行前にシグナル %1$s を無視できません"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "エラー: 獲得できないシグナル %s : %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (サブプロセス): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "fork 失敗"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "サブプロセス %s はエラー終了ステータス %d を返しました"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "サブプロセス %s の待機に失敗しました"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "サブプロセス %s がシグナル (%s)%s によって強制終了しました"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr "、コアダンプが作成されました"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "サブプロセス %s が wait ステータスコード %d を返して失敗しました"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "サブプロセス %s の待機に失敗しました"
@@ -1095,61 +1109,53 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr "トリガ遅延ファイル `%.250s' の文字 `%s'%s の位置に文法エラーがあります"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "トリガロックファイル `%.250s' をオープンおよび作成できません"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "トリガ済み"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "トリガ遅延ファイル `%.250s' の状態を取得できません"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "トリガ遅延ファイル `%.250s' をオープンできません"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "新しいトリガ遅延ファイル `%.250s' をオープンおよび作成できません"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "トリガ遅延ファイル `%.250s' の読み取り中にエラーが発生しました"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "新しいトリガ遅延ファイル `%.250s' を書き込めません"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "新しいトリガ遅延ファイル `%.250s' をクローズできません"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "新しいトリガ遅延ファイル `%.250s' をインストールできません"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "空のトリガ名は許されていません"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "トリガ名に無効な文字が含まれています"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1158,17 +1164,17 @@
 "トリガ名 `%.250s' に無効または未知の文法があります (パッケージ `%.250s' に関"
 "係するトリガ)"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "リストファイル `%.250s' に関係するトリガをオープンできません"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "ファイル `%.250s' に関係するトリガの巻き戻しに失敗しました"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1177,37 +1183,43 @@
 "ファイル `%.250s' に関係するトリガが文法エラーです; 無効なパッケージ名 `"
 "%.250s': %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "ファイル `%.250s' に関係する新しいトリガを作成できません"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "ファイル `%.250s' に関係する新しいトリガを書き込めません"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "ファイル '%.250s' に関係する新しいトリガのフラッシュができません"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "ファイル '%.250s' に関係する新しいトリガの同期ができません"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "ファイル '%.250s' に関係する新しいトリガのクローズができません"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "ファイル `%.250s' に関係する新しいトリガをインストールできません"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "`%.250s' を削除できません"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "ファイル `%.250s' に関係する新しいトリガを作成できません"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "ファイル '%.250s' に関係する新しいトリガのクローズができません"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1215,47 +1227,47 @@
 "ファイル名 `%.250s' およびパッケージ `%.250s' に関係するファイルトリガが重複"
 "しています"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "新しいファイルトリガファイル `%.250s' を作成できません"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "新しいトリガファイル `%.250s' を書き込めません"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "新しいファイルトリガファイル '%.250s' をフラッシュできません"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "新しいファイルトリガファイル '%.250s' を同期できません"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "新しいファイルトリガファイル `%.250s' をクローズできません"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "新しいファイルトリガファイルを `%.250s' としてインストールできません"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "ファイル `%.250s' のファイルトリガを読み取れません"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "ファイル `%.250s' のファイルトリガに文法エラーがあります"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1264,7 +1276,7 @@
 "ファイルトリガ記録は無効なパッケージ名 `%.250s' について言及しています (ファ"
 "イル `%.250s' に関係): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1273,30 +1285,38 @@
 "ci ファイル `%.250s' のトリガは不正なトリガ文法をトリガ名 `%.250s' に含んでい"
 "ます: %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "ci ファイル `%.250s' のトリガをオープンできません"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "ci ファイルのトリガは未知のディレクティブ文法を含んでいます"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "ci ファイルのトリガは未知のディレクティブ `%.250s' を含んでいます"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "状態ディレクトリ `%.250s' のトリガを作成できません"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "状態ディレクトリ `%.250s' のトリガの所有権を設定できません"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "空のトリガ名は許されていません"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "トリガ名に無効な文字が含まれています"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1321,7 +1341,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "varbuf 変数内のフォーマット文字列にエラーがあります"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "dpkg-deb パイプからの読み込みエラーです"
 
@@ -1341,12 +1361,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "シンボリックリンク `%.255s' の所有者設定中にエラーが発生しました"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "`%.255s' の所有者設定エラーです"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "`%.255s' の許可属性設定エラーです"
@@ -1404,18 +1424,27 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "アーカイブに含まれるオブジェクト `%.255s' が不明な型 0x%x です"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "ファイル '%s' の状態を取得できません"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "古いパッケージ %s 中のファイルを置換しています ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr ""
 "インストールされたパッケージ %s の中のファイルで置き換えられました ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1424,96 +1453,101 @@
 "'%.250s' ディレクトリを上書きしようとしています。パッケージ %.250s %.250s で"
 "はディレクトリではありませんでした"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "'%.250s' を上書きしようとしています。これはパッケージ %.250s %.250s にも存在"
 "します"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "(`%2$.255s' の処理中に) `%1$.255s' の作成に失敗しました"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "`%.255s' 間の dpkg-deb バックエンド"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "`%.255s' のクローズ/書き込み中にエラーが発生しました"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "パイプ `%.255s' の作成中にエラーが発生しました"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "デバイス `%.255s' の作成中にエラーが発生しました"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "ハードリンク `%.255s' の作成中にエラーが発生しました"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "シンボリックリンク `%.255s' の作成中にエラーが発生しました"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "ディレクトリ `%.255s' の作成中にエラーが発生しました"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "新バージョンをインストールするための `%.255s' の退避ができませんでした"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "リンク `%.255s' を読めません"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "`%.255s' のバックアップ用シンボリックリンクを作成できません"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "`%.255s' のバックアップ用シンボリックリンクを chown できません"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "新バージョンのインストール前の `%.255s' のバックアップ用リンクを作成できませ"
 "ん"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "`%.255s' の新しいバージョンをインストールできません"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "'%.255s' をオープンできません"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "ファイル '%.255s' を同期できません"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1522,7 +1556,7 @@
 "%s の依存関係の問題を無視しています:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1531,7 +1565,7 @@
 "%2$s を有効にするため、不可欠パッケージ\n"
 " %1$s の設定削除を考慮しています。"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1540,7 +1574,7 @@
 "dpkg: 失敗。%s は不可欠パッケージです。%s を有効に\n"
 " するために、その設定削除を行いません。\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1549,29 +1583,29 @@
 "dpkg: 失敗。%s を処理できません (--auto-deconfigure を使いましょう):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "%.250s の削除"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "`%.250s' のインストール"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: %2$s によって壊れた %1$s の設定削除を考えています ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr ""
 "dpkg: 問題ありません。(%2$s によって壊れた) %1$s の設定削除をします。\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1580,11 +1614,11 @@
 "dpkg: %s が %s を含んでいることを考慮すると:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "破損を無視しています。かまわずに続行します!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1593,29 +1627,29 @@
 "%.250s のインストールは %.250s を壊す可能性があり、\n"
 " 設定削除は許されていません (--auto-deconfigure が助けになります)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "%.250s のインストールは既存のソフトウェアを壊す可能性があります"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: %2$s を選択するために %1$s の削除を考えています ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s は正しくインストールされていないため、すべての依存関係を無視します。\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: %s は %s を提供するため、削除すると問題があるかもしれません ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1624,112 +1658,114 @@
 "dpkg: パッケージ %s は再インストールが必要ですが、要求に従いともかく削除しま"
 "す。\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: パッケージ %s は再インストールが必要です。削除しません。\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: 問題ありません。%2$s を選択するために %1$s を削除します。\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "パッケージの競合 - %.250s のインストールは行いません"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "競合を無視しています。かまわず続行します!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive は引数として最低 1 つのパスが必要です"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "dpkg --recursive のための find"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "find のパイプの fdopen に失敗しました"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "find のパイプを読み込み中にエラーが発生しました"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "find のパイプのクローズ中にエラーが発生しました"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "--recursive のための find が、処理できないエラー %i を返しました"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 "検索しましたが、パッケージ (*.deb にマッチするファイル) が見つかりませんでし"
 "た"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s は引数として最低 1 つのパッケージアーカイブファイルが必要です"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<標準入力>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<標準出力>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "未選択パッケージ %s を選択しています。\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "未選択パッケージ %s をスキップします。\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr ""
 "%2$.250s のバージョン %1$.250s がすでにインストールされています。スキップしま"
 "す。\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%.250s を %.250s から %.250s にダウングレードしています。"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "%.250s のバージョン %.250s から %.250s へのダウングレードは行いません。スキッ"
 "プします。\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1738,37 +1774,37 @@
 "バックアップ用コピーの再インストールを許可するために、`%.250s' の新たにインス"
 "トールされたバージョンを削除できません"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "バージョン `%.250s' のバックアップを復元できません"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "'%.250s' のバックアップコピーを削除できません"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "`%.250s' の新たにインストールしたバージョンを削除できません"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "`%.250s' の新たに展開したバージョンを削除できません"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "新規配布設定ファイル '%.250s' の状態を取得できません"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "現在インストールされている設定ファイル `%.250s' の状態を取得できません"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1779,57 +1815,57 @@
 "設定ファイル `%s' がシステムに存在しません。\n"
 "あなたの要求に従って、新しい設定ファイルをインストールしています。\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: 古いバックアップ '%.250s' の削除に失敗しました: %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: '%.250s' から '%.250s' に名前を変更できませんでした: %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: '%.250s' の削除に失敗しました: %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: 旧配布バージョン '%.250s' の削除に失敗しました: %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: '%.250s' の削除 (上書き前) に失敗しました: %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: '%.250s' から '%.250s' へのリンクに失敗しました: %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "設定ファイル %s を新規にインストールしています ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "`%.250s' を `%.250s' としてインストールできません"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "パッケージ `%s' はインストールされていないので、設定できません"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "パッケージ %.250s はすでにインストールおよび設定されています"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1838,7 +1874,7 @@
 "パッケージ %.250s は設定の準備ができていません。\n"
 " 設定できません (現在のステータス `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1847,11 +1883,11 @@
 "dpkg: 依存関係の問題により %s の設定ができません:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "依存関係の問題 - 設定を見送ります"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1860,7 +1896,7 @@
 "dpkg: %s: 依存関係の問題、しかし要求どおり設定を行います:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1868,12 +1904,12 @@
 "パッケージが非常に矛盾した状態に陥りました。設定を試みる\n"
 "前に再インストールすべきです。"
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "%s (%s) を設定しています ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1882,7 +1918,7 @@
 "%s: 設定ファイル '%s' の状態を取得できません\n"
 " (= `%s'): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1891,7 +1927,7 @@
 "%s: 設定ファイル '%s' が自分自身へのリンクになっています\n"
 " (= '%s')"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1900,7 +1936,7 @@
 "%s: 設定ファイル '%s' のリンクの読み取りができません\n"
 " (= `%s'): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1909,35 +1945,35 @@
 "%s: 設定ファイル '%.250s' はファイル名の重複を解決します\n"
 " ('%s' は '%s' へのシンボリックリンクです)"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: 設定ファイル '%.250s' がプレーンファイルでもシンボリックリンク (= '%s') "
 "でもありません"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5 ハッシュ"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: ハッシュ用に設定ファイル %s をオープンできません: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "終了したら `exit' と入力してください。\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1946,12 +1982,12 @@
 "\n"
 "設定ファイル `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (実際は `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1962,7 +1998,7 @@
 " ==> あなたかスクリプトによって設定ファイルが作成されています。\n"
 " ==> パッケージメンテナが提供するパッケージにもこのファイルが存在します。\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1971,7 +2007,7 @@
 "\n"
 "     これはインストールされてから変更されていません。\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1981,7 +2017,7 @@
 " ==> これはインストールしてから (あなたかスクリプトによって) 変更されていま"
 "す。\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1991,37 +2027,37 @@
 " ==> これはインストールしてから (あなたかスクリプトによって) 削除されていま"
 "す。\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> パッケージ配布元が更新版を提供しています。\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     パッケージ中のバージョンが前回のインストール時と同じです。\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> 要求したように新規ファイルを使う。\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> 要求したように古いファイルを使う。\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> デフォルトで古い設定ファイルを保持する。\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> デフォルトで新しい設定ファイルを使う。\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2036,161 +2072,163 @@
 "      D     : 両バージョンの差異を表示する\n"
 "      Z     : 状況を調査するためにシェルを開始する\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " デフォルトでは現在使っている自分のバージョンを残します。\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " デフォルトでは新しいバージョンをインストールします。\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[デフォルト=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[デフォルト=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[デフォルトなし]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "標準エラー出力への書き込み中にエラーが発生しました (conffile プロンプト前で検"
 "出)。"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "conffile プロンプトでの標準入力上の読み取りエラーです"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "conffile プロンプトで標準入力上の EOF です"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s は %s に依存 (depends) します"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s は %s に先行依存 (pre-depends) します"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s は %s を推奨 (recommends) します"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s は %s を提案 (suggests) します"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s は %s を壊します"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s は %s と競合 (conflicts) します"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s は %s を強化 (enhances) します"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s は削除されようとしています。\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s は設定が消されようとしています。\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr ""
 "  %.250s がインストールされようとしていますが、バージョンが %.250s です。\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s がインストールされていますが、バージョンが %.250s です。\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s は展開されていますが、設定されていません。\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s は展開されていますが、バージョンが %.250s です。\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s の最新設定済みバージョンは %.250s です。\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s は %s です。\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s は %.250s を提供していますが、削除されようとしています。\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 "  %.250s は %.250s を提供していますが、設定が削除されようとしています。\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %2$.250s を提供 (provides) する %1$.250s が %3$s です。\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s はインストールされていません。\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (バージョン %.250s) がインストールされようとしています。\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (バージョン %.250s) が提供され、%s です。\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %2$.250s を提供する %1$.250s がインストールされようとしています。\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %2$.250s を提供する %1$.250s が提供され、%3$s です。\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "パッケージ照会についてのヘルプには、--help を使用してください。"
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2198,7 +2236,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s バージョン %s。\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2209,8 +2247,8 @@
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 "Copyright (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2221,7 +2259,7 @@
 "ン 2\n"
 "もしくはそれ以降を参照してください。このソフトウェアは無保証です。\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2231,7 +2269,7 @@
 "使い方: %s [<オプション> ...] <コマンド>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2250,7 +2288,7 @@
 "  --truename <ファイル>     退避されたファイルを返す\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2281,7 +2319,7 @@
 "  --version                  バージョン番号を表示\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2295,17 +2333,12 @@
 "パッケージの preinst/postrm スクリプトは --package と --divert を常に指定すべ"
 "きです。\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "ファイル '%s' の状態を取得できません"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "'%s' の確認中にエラーが発生しました"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2314,129 +2347,129 @@
 "名前変更は `%s' を異なるファイル `%s' で上書きすることを伴います。\n"
 "これは許可されていません。"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "ファイル '%s' に書き込めません"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "ファイルコピー"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "'%s' を '%s' に名前変更できません"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "名前変更: 重複する古いリンク '%s' を削除してください"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "ソースファイル `%.250s' をオープンできません"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "%s のローカルな退避 (divert) 先"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "%s から %s へのローカルな退避 (divert)"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "%2$s による %1$s の退避 (divert)"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "%3$s による %1$s から %2$s への退避 (divert)"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "%s のすべての退避"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "%s から %s へのすべての退避"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "新しいファイル %s を作成できません"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "ファイル '%s' をフラッシュできません"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "古い diversions-old の削除中にエラーが発生しました"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "新しい diversions-old の作成中にエラーが発生しました"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "新しい diversions のインストール中にエラーが発生しました"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s は引数が 1 つ必要です"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "ファイル名 \"%s\" は絶対パスではありません"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "ファイルは改行を含んでいてはなりません"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "ディレクトリは退避できません"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "ファイル '%s' をそれ自身に退避することはできません"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "'%s' を残します\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' が `%s' と衝突します"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "'%s' を追加しています\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "退避先 '%s' がないので、何も削除されません。\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2447,7 +2480,7 @@
 "  `%s' の削除中に\n"
 "  `%s' を発見しました"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2458,16 +2491,16 @@
 "  `%s' の削除中に\n"
 "  `%s' を発見しました"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "'%s' を削除しています\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "パッケージは改行を含んではなりません"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "退避先は改行を含んではなりません"
 
@@ -2553,8 +2586,8 @@
 "--triggers-only) の利用で要求できます。\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s は引数をとりません"
@@ -2650,7 +2683,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions の不正な比較"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "バージョン '%s' は不正な構文です: %s"
@@ -2705,12 +2738,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "--force が有効なので、問題を無視します:"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "パッケージ `%.250s' のファイル一覧ファイルをオープンできません"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2719,71 +2752,71 @@
 "パッケージ `%.250s' のファイル一覧ファイルがありません。このパッケージには、"
 "現在インストールされているファイルがないものとします。"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "パッケージ '%.250s' のファイル一覧ファイルの状態を取得できません"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "パッケージ `%.250s' のファイル一覧"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "パッケージ '%.250s' のファイル一覧ファイルに最後の改行がありません"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "パッケージ `%.250s' のファイル一覧ファイルが空のファイル名を含んでいます"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 "パッケージ `%.250s' のファイル一覧ファイルのクローズ中にエラーが発生しました"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(データベースを読み込んでいます ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "現在 %d 個のファイルとディレクトリがインストールされています。)\n"
 msgstr[1] "現在 %d 個のファイルとディレクトリがインストールされています。)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "パッケージ %s 用の更新ファイル一覧ファイルを作成できません"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "パッケージ %s 用の更新ファイル一覧ファイルへの書き込みに失敗しました"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "パッケージ %s 用の更新ファイル一覧ファイルのフラッシュに失敗しました"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "パッケージ %s 用の更新ファイル一覧ファイルの同期に失敗しました"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "パッケージ %s 用の更新ファイル一覧ファイルのクローズに失敗しました"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "パッケージ %s 用の更新ファイル一覧ファイルのインストールに失敗しました"
@@ -2821,7 +2854,9 @@
 msgstr "導入済み"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "PATH が設定されていません。"
 
 #: src/help.c:129
@@ -2863,7 +2898,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2875,65 +2910,65 @@
 msgstr "`%.255s' への chroot に失敗しました"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "`%.255s' ディレクトリへの移動に失敗しました"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "`%.250s' の実行許可を設定できません"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "メンテナスクリプトで setenv できません"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "インストール済みの %s スクリプト"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "%s `%.250s' の状態を取得できません"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "新しい %s スクリプト"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "古い %s スクリプト"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "%s `%.250s' の状態を取得できません: %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - 代わりに新規パッケージからスクリプトを実行してみます ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "このパッケージの新バージョンにはスクリプトがありません。終了します"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... OK のようです。\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "'%.255s' を安全に削除できません"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2942,7 +2977,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "`%.250s' の存在を確認できません"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "情報ディレクトリを読み取れません"
 
@@ -3013,7 +3048,7 @@
 "  -Dh|--debug=help                   デバッグオプションのヘルプ\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3139,7 +3174,7 @@
 "ユーザ向けパッケージ管理ツールである `dselect' または `aptitude' を使いましょ"
 "う。\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3190,30 +3225,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3222,103 +3261,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "依存関係の問題 - 削除しません"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "依存関係の問題 - 削除しません"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "メンテナスクリプトで setenv できません"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "設定ファイル `%.255s' の読み込みエラー"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3326,7 +3365,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3334,40 +3373,40 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug は 8 進数の引数が 1 つ必要です。"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "--ignore-depends の引数 (コンマで区切られたリスト) `%.250s' に空のパッケージ"
 "名"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends は正当なパッケージ名を必要とします。`%.250s' は不正です; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s に対する不正な整数です: `%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "フック '%s' の実行中にエラーが発生しました。終了コード %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "状態"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3376,7 +3415,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3384,12 +3423,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "不明な強制・拒否 (force/refuse) オプション `%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "時代遅れの強制・拒否 (force/refuse) オプション `%s'\n"
@@ -3412,8 +3451,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "%d 行目の行末までに予期しない eof があります"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "アクションを指定するオプションが必要です"
 
@@ -3578,45 +3617,49 @@
 msgid "passed\n"
 msgstr "合格\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "一時ディレクトリを作成できません"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "パッケージ %s の衝突/置換の組み合わせが多すぎます"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "旧バージョンのパッケージに含まれる `%.250s' で始まる情報ファイル名はあまりに"
 "も長すぎます"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "古い情報ファイル `%.250s' を削除できません"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "(おそらく) 新しい情報ファイル `%.250s' をインストールできません"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "一時コントロールディレクトリをオープンできません"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "パッケージに含まれる (`%.50s' で始まる) コントロール情報ファイル名はあまりに"
 "も長すぎます"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "パッケージコントロール情報にディレクトリ `%.250s' が含まれています"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
@@ -3627,46 +3670,42 @@
 # #, c-format
 # msgid "package control info rmdir of `%.250s' didn't say not a dir"
 # msgstr "`%.250s' のパッケージコントロール情報 rmdir がディレクトリではないと言っています"
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "パッケージ %s が一覧を情報ファイルとして含んでいました"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "新規情報ファイル `%.250s' を `%.250s' としてインストールできません"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "コントロール情報ファイル `%.250s' を削除できません"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "アーカイブにアクセスできません"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "一時ディレクトリを作成できません"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "コントロール情報長"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "%s についての情報を %s から登録します。\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "パッケージアーキテクチャ (%s) がシステム (%s) と一致しません"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3675,103 +3714,103 @@
 "dpkg: %s が %s を含むことを考慮すると、先行依存の問題があります:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "先行依存問題 - %.250s をインストールしません"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "先行依存の問題を無視しています!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "%s %s を (%s で) 置換するための準備をしています ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "(%2$s から) %1$s を展開しています...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "(`%.250s' で始まる) 設定ファイル名が長すぎます (> %d 文字) "
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "%.250s で読み取り時にエラーが発生しました"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "%.250s のクローズ時にエラーが発生しました"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "%.250s のオープン時にエラーが発生しました"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr ""
 "%2$s を削除できるようにするために %1$s の設定削除 (deconfigure) を行いま"
 "す ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "%s を設定削除しています ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "%.250s を展開し、置換しています...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "dpkg-deb フィールドの抽出"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "dpkg-deb tar 出力の読み取り時にエラーが発生しました"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 "壊れているファイルシステム上の tar ファイル - パッケージアーカイブが壊れてい"
 "ます"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: 末尾の余計なゼロを取り除きます"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "古いファイル '%.250s' の状態を取得できないので、削除しません: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "古いディレクトリ '%.250s' を削除できません: %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr "古い設定ファイル '%.250s' が空のディレクトリでした (今削除されました)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "その他の新しいファイル `%.250s' の状態を取得できません"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3780,12 +3819,12 @@
 "古いファイル '%.250s' がいくつかの新しいファイルと同一です! ('%.250s' と "
 "'%.250s' の両方)"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "古いファイル '%.250s' を安全に削除できません: %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(%s は完全に置換されているため、消えていることに注意。)\n"
@@ -3968,7 +4007,7 @@
 "  --f|showformat=<フォーマット> --show に別のフォーマットを使う\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3989,6 +4028,10 @@
 "  を挿入することで、含められます。width が負 (左寄せ) ではない場合\n"
 "  を除き、フィールドは右詰めされます。\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "パッケージ照会についてのヘルプには、--help を使用してください。"
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4047,7 +4090,7 @@
 msgid "Removing %s ...\n"
 msgstr "%s を削除しています ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4056,47 +4099,48 @@
 "%.250s の削除中ですが、ディレクトリ '%.250s' を削除できません: %s - ディレク"
 "トリはマウントポイントではありませんか?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "`%.250s' を削除できません"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "'%.255s' を安全に削除できません"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "%.250s の削除中、ディレクトリ '%.250s' が空でないため削除できませんでした。"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "`%.250s' を削除できません"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "%s の設定ファイルを削除しています ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "古い設定ファイル `%.250s' (= `%.250s') を削除できません"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "(`%2$.250s' から) 設定ファイルディレクトリ `%1$.250s' を読めません"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr "(`%2$.250s' の) 古いバックアップファイル `%1$.250s' を削除できません"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "古いファイルリストを削除できません"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "古い postrm スクリプトを削除できません"
 
@@ -4139,7 +4183,13 @@
 msgid "read error on standard input"
 msgstr "標準入力からの読み取り時にエラーが発生しました"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "パッケージ照会についてのヘルプには、--help を使用してください。"
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4148,7 +4198,7 @@
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4166,7 +4216,7 @@
 "る\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4186,31 +4236,31 @@
 "  --help                     このヘルプを表示する\n"
 "  --version                  バージョン番号を表示する\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "末尾の / を取り除いています"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "新しい statoverride ファイルをオープンできません"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "statoverride-old の削除中にエラーが発生しました"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "新しい statoverride-old の作成中にエラーが発生しました"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "新しい statoverride のインストール中にエラーが発生しました"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add は 4 つの引数が必要です"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4219,21 +4269,21 @@
 "すでに存在する '%s' への override ですが、--force が指定されているので無視し"
 "ます。"
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "\"%s\" の override がすでに存在するので、中止します。"
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "--update が指定されましたが、%s は存在しません"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "override が提供されていません。"
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update は --remove には無意味です"
 
@@ -4298,17 +4348,17 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "複数の statoverrides が ファイル '%.250s' に対して提供されています"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
 "このユーティリティについてのヘルプは dpkg-trigger --help で参照してください。"
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debian %s パッケージトリガユーティリティバージョン %s。\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4319,7 +4369,7 @@
 "        %s [<オプション> ...] <コマンド>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4332,7 +4382,7 @@
 "どうかを調べる。\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4354,21 +4404,21 @@
 "  --no-act                         テスト用途。実際には何も変更しない。\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: トリガのデータディレクトリがまだ作成されていません\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: トリガ記録がまだ存在しません\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "引数をひとつ (トリガ名) だけとります"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4378,13 +4428,13 @@
 "dpkg-trigger はメンテナスクリプトから (または --by-package オプションを付け"
 "て) 呼ばれなければなりません"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: 無効な待ち受けパッケージ名 `%.250s': %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "無効なトリガ名 `%.250s': %.250s"
@@ -4417,38 +4467,39 @@
 msgstr "%s のトリガを処理しています ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s は引数に Packages ファイルを 1 つだけ必要とします"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr "利用可能の更新が多すぎるため dpkg ステータスエリアにアクセスできません"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "大部分の利用可能な更新は dpkg ステータスエリアへの書き込みアクセスを必要とし"
 "ます"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "%s を使用して、取得可能なパッケージ情報を更新しています。\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "%s を使用して、取得可能なパッケージ情報を追加しています。\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "%d 個のパッケージ情報が更新されました。\n"
 msgstr[1] "%d 個のパッケージ情報が更新されました。\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4565,8 +4616,8 @@
 msgstr[0] "dpkg-deb: コントロールファイルの %d 個の警告を無視します\n"
 msgstr[1] "dpkg-deb: コントロールファイルの %d 個の警告を無視します\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s は引数として <ディレクトリ> が必要です"
@@ -4598,26 +4649,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: `%2$s' にパッケージ `%1$s' を構築しています。\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "一時ファイルの作成に失敗しました (data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control"
 msgid "control member"
 msgstr "control"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "一時ファイルのアンリンクに失敗しました (data), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4634,20 +4685,20 @@
 msgid "error writing `%s'"
 msgstr "`%s' の書き込みエラーです"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "メンバー間"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "tar パイプへの書き込みに失敗しました (data)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<圧縮> tar -cf からの"
 
@@ -4665,82 +4716,82 @@
 msgid "error reading %s from file %.255s"
 msgstr "ファイル %2$.255s からの %1$s の読み取り中にエラーが発生しました"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "アーカイブ `%.255s' の読み取りに失敗しました"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "アーカイブの状態を取得できませんでした (fstat 失敗)"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "アーカイブのバージョン番号に . がありません"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "アーカイブのヘッダに改行がありません"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "ファイル `%.250s' は壊れています - パート番号が不正です"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "ファイル `%.250s' は debian バイナリアーカイブでありません (dpkg-split を試し"
 "てみてください)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "アーカイブのバージョン番号に . がありません"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "アーカイブのヘッダに改行がありません"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "アーカイブのバージョン番号に . がありません"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "バージョン %.250s のアーカイブは理解不能です。より新しい dpkg-deb を入手して"
 "ください"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "%s からメンバーデータをスキップしました"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
 "ファイル `%.250s' は理解不能なデータメンバー %.*s を含んでいます。終了します"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr ""
 "ファイル `%.250s' は 2 つのコントロールメンバーを含んでいます。終了します"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4752,23 +4803,23 @@
 " 新形式 debian パッケージ、バージョン %s。\n"
 " サイズ %ld バイト: コントロールアーカイブ = %zi バイト。\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "アーカイブは不正なコントロール長 `%s' を含んでいます"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "%s からメンバーデータをスキップしました"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4780,7 +4831,7 @@
 " 旧形式 debian パッケージ, バージョン %s。\n"
 " サイズ %ld バイト: コントロールアーカイブ = %zi、メインアーカイブ = %ld。\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4789,49 +4840,50 @@
 "dpkg-deb: おそらく ASCII モードでダウンロードしたためにアーカイブ\n"
 "dpkg-deb:    ファイルが壊れているようです\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' は debian 形式のアーカイブではありません"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "コピー中にパイプへの書き込みに失敗しました"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "コピー中にパイプのクローズに失敗しました"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "データ"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "以下のディレクトリへの移動に失敗しました"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "ディレクトリの作成に失敗しました"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "ディレクトリ作成後、そのディレクトリに移動できません"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "以下のディレクトリへの移動に失敗しました"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<伸張>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "ペースト"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s は引数として .deb ファイル名が必要です"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4840,99 +4892,99 @@
 "--%s は引数に対象となるディレクトリが必要です。\n"
 "おそらく、dpkg --install を使おうとしたのでしょう。"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s は最大でも 2 つの引数 (.deb とディレクトリ) しかとりません"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s は引数をひとつ (.debファイル名) だけとります"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "クリーンアップのための `/' ディレクトリへの移動に失敗しました"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "ファイル '%s' の状態を取得できません"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr ""
 "dpkg-deb: `%.255s' はコントロールコンポーネント `%.255s' を含んでいません\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "(%2$.255s にある) コンポーネント `%1$.255s' のオープン中に予期しない失敗が起"
 "こりました"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "%d 個の要求された control コンポーネントがありません"
 msgstr[1] "%d 個の要求された control コンポーネントがありません"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "ディレクトリ `%.255s' を走査できません"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "(`%2$.255s' にある) `%1$.255s' の状態を取得できません"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "(`%2$.255s' にある) `%1$.255s' をオープンできません"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "(`%2$.255s' にある) `%1$.255s' の読み取りに失敗しました"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld バイト、%5d 行   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     非プレーンファイル          %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(コントロールアーカイブに `control' ファイルがありません!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "`control' コンポーネントをオープンできません"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "`control' コンポーネントの読み取り中に失敗しました"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "'%s' qkonpo-nentoqnoクローズ中にエラーが発生しました"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "フォーマットエラー"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents は引数を 1 つだけとります"
 
@@ -4942,7 +4994,19 @@
 msgstr "Debian `%s' パッケージアーカイブバックエンドバージョン %s。\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4953,6 +5017,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4969,7 +5035,7 @@
 "る\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4982,11 +5048,27 @@
 " <cfield> は `control' ファイル内のフィールド名。\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5009,7 +5091,7 @@
 "                                 可能な値: gzip, xz, bzip2, lzma, none\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5023,7 +5105,7 @@
 "向けな `dselect' または `aptitude' を使用してください。`dpkg-deb --extract'\n"
 "を使って展開されたパッケージは正しくインストールされません!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5031,17 +5113,17 @@
 "*.deb ファイルの操作についてのヘルプは dpkg-deb --help を参照;\n"
 "パッケージのインストール、削除については dpkg --help を参照。"
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "-%c に対する不正な整数です: '%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "-%c に対する不正な圧縮レベルです: '%ld'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "`%s' は不明な圧縮形式です!"
@@ -5062,7 +5144,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "ファイル `%.250s' は壊れています - %.250s の後の改行がありません"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "%.250s の読み取り中にエラーが発生しました"
@@ -5160,53 +5242,59 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "ファイル `%.250s' は壊れています - パート番号が不正です"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "パッケージ名"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "ファイル `%.250s' は壊れています - 第 2 ヘッダの最後のマジックナンバーが不正"
 "です"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "ファイル `%.250s' は壊れています - 第 2 メンバーがデータメンバーではありませ"
 "ん"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "ファイル `%.250s' は壊れています - パート番号がヘッダのサイズ情報と異なります"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "ファイル `%.250s' は壊れています - サイズがヘッダのパート番号情報と異なります"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "パートファイル `%.250s' の状態を取得できません (fstat 失敗)"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "ファイル `%.250s' は壊れています。短すぎます"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "アーカイブパートファイル `%.250s' をオープンできません"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "ファイル `%.250s' はアーカイブパートではありません"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5226,6 +5314,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5248,12 +5337,19 @@
 "    パートファイルサイズ(portion で使用): %lu バイト\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<不明>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s は 1 つ以上のパートファイルの引数を要求します"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "ファイル `%s' はアーカイブパートでありません\n"
@@ -5288,7 +5384,7 @@
 msgid "split package part"
 msgstr "パッケージ %s を %d パートから一緒に置いています: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "完了\n"
@@ -5341,17 +5437,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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"
 "  --depotdir <ディレクトリ> %s/%s の代わりに <ディレクトリ> を使う\n"
@@ -5363,20 +5468,29 @@
 "\n"
 "終了ステータス: 0 = OK;  1 = -a がひとつのパートでない;  2 = 問題発生!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "ヘルプを参照するには dpkg-split --help とタイプしてください。"
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "%.250s 内で予期しないファイルの終わりです"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "パートサイズが大きすぎるか、正値でありません"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -5488,27 +5602,27 @@
 msgid "Deleted %s.\n"
 msgstr "%s を削除しました。\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "dpkg-deb フィールドの抽出"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "ソースファイル `%.250s' をオープンできません"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "ソースファイルの状態を取得できません (fstat 失敗)"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "ソースファイル `%.250s' がプレーンファイルではありません"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5517,17 +5631,17 @@
 msgstr[0] "パッケージ %s を %d パートから一緒に置いています: "
 msgstr[1] "パッケージ %s を %d パートから一緒に置いています: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split は引数にソースファイル名が必要です"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split は引数としてソースファイル名と分割先プレフィクスが必要です"
 
@@ -5699,125 +5813,90 @@
 "  --help                     このヘルプを表示する\n"
 "  --version                  バージョン番号を表示する\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "エラー"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "警告"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "%s の状態を取得できません: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "リンク読み取り (%s) に失敗しました: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "2 つのコマンドが指定されました: --%s と --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "%s に追加できません: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "%s の走査に失敗しました: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "%s の実行に失敗しました: %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "%s から %s へのシンボリックリンクを作成できません: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "%s を %s としてインストールできません: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "%s を削除できません: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "%s の読み取り試行中に、予期せぬファイルの終わりがあります"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "%s の読み取り中: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "%s の読み取り試行中に完了していない行があります"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s は壊れています: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives ファイル内での改行は禁止されています (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "%s への書き込み中: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "スレーブ名"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "スレーブ %s が重複しています"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "スレーブリンク"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "スレーブリンクがメインリンク %s と同一です"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "スレーブリンク %s が重複しています"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "マスターファイル"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "パス %s が重複しています"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5826,130 +5905,115 @@
 "%s の alternative (リンクグループ %s のパート) が存在しません。alternatives "
 "のリストから削除しています。"
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "優先度"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "スレーブファイル"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "%s の優先度: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "%s を読み取れません: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "状態"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "無効な状態"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "マスターリンク"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "%s をクローズできません: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "時代遅れのスレーブリンク %s を破棄しています (%s)。"
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "%s に書き込みできません: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "自動モード"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "手動モード"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "  リンクは現在 %s を指しています"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "  リンクは現在ありません"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - 優先度 %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  スレーブ %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "現在の '最適' バージョンは '%s' です。"
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "利用可能なバージョンはありません。"
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "alternative %2$s (%3$s を提供) には %1$d 個の選択肢があります。"
 msgstr[1] "alternative %2$s (%3$s を提供) には %1$d 個の選択肢があります。"
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "選択肢"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "パス"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "優先度"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "状態"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "現在の選択 [*] を保持するには Enter、さもなければ選択肢の番号のキーを押してく"
 "ださい: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "%s をリンクで置き換えません。"
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "未知の選択肢 %s をインストールできません"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -5958,99 +6022,156 @@
 "関連する (リンクグループ %3$s の) ファイル %2$s が存在しないので、%1$s の作成"
 "をスキップします。"
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "%s をリンクで置き換えません。"
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "%s を呼び出します。"
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 "選択肢 %2$s が利用できないので、alternative %1$s は変更されませんでした。"
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "未知の alternative %s をスキップします。"
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "%s の読み取り試行中、行が長すぎるか完了していませんでした"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "無効な行をスキップします: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "%s のリンクを %s から %s に名前変更しています。"
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "%s のスレーブリンクを %s から %s に名前変更しています。"
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "alternative 名 (%s) は '/' や空白を含んではなりません。"
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+"alternative リンクが絶対パスであるべきにもかかわらずそうなっていません: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+"alternative パスが絶対パスであるべきにもかかわらずそうなっていません: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "alternative %s はマスターになれません: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "alternative リンク %s はすでに %s によって管理されています。"
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "alternative パス %s が存在しません"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "alternative %s は %s のスレーブにはできません: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "alternative %s はマスターになれません: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "alternative リンク %s はすでに %s によって管理されています。"
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "`%s' は不明な引数です"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install は<リンク> <名前> <パス> <優先度> が必要です"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<リンク> と <パス> は同じではなりません"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "優先度は整数でなければなりません"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s は <名前> <パス> が必要です"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s は <名前> が必要です"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave は --install と一緒のみ許可されています"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave は<リンク> <名前> <パス> が必要です"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "名前 %s がプライマリ/スレーブの両方にあります"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "リンク %s がプライマリ/スレーブの両方にあります"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s は <ファイル> の引数が必要です"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "不明なオプション `%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -6059,69 +6180,22 @@
 "selections、--install、--remove、--all、--remove-all、--auto のいずれかが必要"
 "です"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "alternative %s はマスターになれません: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "alternative リンク %s はすでに %s によって管理されています。"
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-"alternative リンクが絶対パスであるべきにもかかわらずそうなっていません: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-"alternative パスが絶対パスであるべきにもかかわらずそうなっていません: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "alternative パス %s が存在しません"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "alternative 名 (%s) は '/' や空白を含んではなりません。"
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "これはマスター alternative です。"
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "これは %s のスレーブです"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "alternative %s は %s のスレーブにはできません: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<標準入力>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "%s の alternatives がありません。"
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s が宙ぶらりんなため、最適な選択肢で更新されます。"
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6133,60 +6207,60 @@
 "%s が (手動あるいはスクリプトにより) 変更されました。手動更新のみに切り替えて"
 "います。"
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "%s の自動選択を設定しています。"
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "%2$s の alternative %1$s は登録されていません。設定は行いません。"
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "%s を提供するプログラムがありません。"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "設定は行いません。"
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "リンクグループ %s に 1 つの alternative のみがあります: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "%2$s の alternative %1$s は登録されていません。削除は行いません。"
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "手動で選択された alternative を削除しています - %s を自動モードに切り替えてい"
 "ます"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "%s の自動更新は無効になっています。そのままにしておきます。"
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr "自動更新に戻るには、`update-alternatives --auto %s' を使ってください。"
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "%2$s (%3$s) を提供するために %4$s で %1$s を使います。"
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
@@ -6194,13 +6268,49 @@
 "リンクグループ %2$s が壊れているため、alternative %1$s の再インストールを強制"
 "しています。"
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "現在の alternative %1$s が未知なので、リンクグループ %3$s のために %2$s に切"
 "り替えています。"
 
+#~ msgid "it is a master alternative."
+#~ msgstr "これはマスター alternative です。"
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "これは %s のスレーブです"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "%s の状態を取得できません: %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "リンク読み取り (%s) に失敗しました: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "%s の走査に失敗しました: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "%s の実行に失敗しました: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "%s から %s へのシンボリックリンクを作成できません: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "%s を %s としてインストールできません: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "%s への書き込み中: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "%s を読み取れません: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "%s をクローズできません: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "%s に書き込みできません: %s"
+
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6448,9 +6558,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "%s からコントロールエリアをスキップしました"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "tar の実行に失敗しました"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "一時ディレクトリの作成に失敗しました"
 
Binary files dpkg/po/km.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/km.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/km.po /home/vorlon/devel/multiarch/dpkg-debian/po/km.po
--- dpkg/po/km.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/km.po	2012-06-07 10:11:09.426073000 -0700
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: dpkg_po_km\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2006-10-04 09:49+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team:  <en@li.org>\n"
@@ -24,7 +24,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ប្រភព `%.250s'"
@@ -44,71 +44,77 @@
 msgid "ar member file (%s)"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត tmpfile (ទិន្នន័យ)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "បាន​បរាជ័​​យនៅក្នុង buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "បាន​បរាជ័​​យនៅក្នុង buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "ការអាន​ខ្លី​នៅក្នុង ការចម្លង​សតិបណ្ដោះអាសន្ន (%s)"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "បាន​បរាជ័យ​ទៅ exec tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "មិន​អាច​ប្រតិបត្តិ %s"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s ៖ មិន​បង្ហាប់​"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s ៖ បង្ហាប់​"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s ៖ កំហុស​ gzip ខាងក្នុង​ ៖ `%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s ៖ កំហុស​ gzip ខាងក្នុង​ ៖ `%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s ៖ កំហុស​ gzip ខាងក្នុង​ ៖ `%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s ៖ កំហុស​ gzip ខាងក្នុង​ ៖ `%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s ៖ កំហុស​ gzip ខាងក្នុង​ ៖ `%s'"
@@ -123,136 +129,136 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s ៖ កំហុស bzip2 ខាង​ក្នុង ៖ `%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s ៖ កំហុស bzip2 ខាង​ក្នុង ៖ `%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s ៖ កំហុស bzip2 ខាង​ក្នុង ៖ `%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s ៖ កំហុស bzip2 ខាង​ក្នុង ៖ `%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
 "max=%d)"
 msgstr "ថតភាព​ទាន់សម័យ​មានឯកសារ `%.250s' ដែលវាមានឈ្មោះវែងពេក (ប្រវែង=%d, អតិ=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr "ធ្វើ​ឲ្យទាន់សម័​យនូវថត​ដែ​លមានឯកសារ ដែលមានឈ្មោះប្រវែងខុសគ្នា (ទាំង %d និង %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "មិន​អា​ចវិ​ភាគ​រកថតដែលទាន់សម័យ `%.255s'"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "បាន​បរាជ័​យក្នុ​ងការយកឯ​កសារទា​ន់​សម័យ​ដែលបានចូលរួមចេញ %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "មិន​អាច​បង្កើត​ `%.255s'"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "មិនអាចបំពេញ %.250s ដោយចន្លោះ"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "មិន​អាច​បញ្ចូល %.250s បន្ទាប់​ពី​ចន្លោះ"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "មិន​អាច​ស្វែងរក​ដើម្បី​ចាប់ផ្ដើម %.250s បន្ទាប់​ពី​ចន្លោះ"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "មិន​អាច​បើក tmpfile សម្រាប់ vsnprintf"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "មិន​អាច​បើក/បង្កើត​ឯកសារ​ជាប់សោ​មូលដ្ឋាន​ទិន្នន័យ​ស្ថានភាព"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "អ្នក​គ្មាន​សិទ្ធិ​ដើម្បី​ចាក់សោ​មូលដ្ឋាន​ទិន្នន័យ​ស្ថានភាព​របស់ dpkg បាន​ទេ"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "មិន​អាច​ចាក់សោ​មូលដ្ឋាន​ទិន្នន័យ​ស្ថានភាព​របស់ dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "ប្រតិបត្តិការ​​ដែ​លបាន​ស្នើ​ត្រូវការ​សិទ្ធិ​ជា​អ្នក​ប្រើ​ជាន់ខ្ពស់"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "មិន​អាច​ចូលដំណើរកា​រ​​ទៅក្នុង​​​តំបន់ស្ថានភាពរបស់ dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "ប្រតិបត្តិការ​ត្រូវការសិទ្ធិ​អាន​​/សរសេរ​ទៅ​កាន់តំប​ន់ស្ថានភាពរបស់ dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "បានបរាជ័យក្នុងការយកឯកសារទាន់សម័យផ្ទាល់ខ្លួនរបស់ខ្ញុំចេញ %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "មិន​អាច​សរសេរ​ស្ថានភាព​ដែល​បាន​ធ្វើឲ្យ​ទាន់សម័យ​របស់`%.250s'"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "មិន​អាច​បញ្ចូល​ស្ថានភាព​ដែលបាន​ធ្វើ​ឲ្យ​ទាន់សម័យ​របស់ `%.250s'"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "មិនអាចកាត់ឲ្យខ្លីសម្រាប់ស្ថានភាពដែលបានធ្វើឲ្យទាន់សម័យរបស់`%.250s'"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "មិនអាច fsync ស្ថានភាព​ដែលបានធ្វើឲ្យទាន់សម័យនៃ `%.250s' បានឡើ"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "មិនអាចបិទស្ថានភាពដែលបានធ្វើឲ្យទាន់សម័យរបស់ `%.250s'"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "មិនអាចដំឡើងស្ថានភាពដែលបានធ្វើឲ្យទាន់សម័យរបស់`%.250s'"
@@ -273,90 +279,92 @@
 msgid "unable to open directory '%s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ប្រភព `%.250s'"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ប្រភព `%.250s'"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ប្រភព `%.250s'"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "មិន​អាច​បង្ហូរ​ចូល​ក្នុងឯកសារ​ vsnprintf"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "បានបរាជ័យក្នុងការសរសេរសេចក្ដីលម្អិតរបស់ `%.50s' ទៅ `%.250s'"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "បានបរាជ័យក្នុងការបើក `%s' ដើម្បីសរសេរព័ត៌មានរបស់ %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "មិនអាចកំណត់សតិបណ្ដោះអាសន្ននៅលើឯកសារស្ថានភាពបានទេ"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​សរសេរ​កំណត់ត្រា %s អំពី `%.50s' ទៅ `%.250s'"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "បាន​បរាជ័យ​ក្នុងការ​បញ្ចូល​ព័ត៌មាន​របស់ %s ទៅ `%.250s'"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "បានបរាជ័យ​ក្នុងការ fsync ព័ត៌មាន %s ទៅ `%.250s'"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "បានបរាជ័យក្នុងការបិទ `%.250s' បន្ទាប់ពីការសរសេរព័ត៌មានរបស់ %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​តភ្ជាប់ `%.250s' ទៅ `%.250s' សម្រាប់​ព័ត៌មាន​បម្រុង​ទុក​របស់​ព័ត៌មាន %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "បាន​បរាជ័យ​ក្នុងការ​ដំឡើង `%.250s' ជា `%.250s' ដែល​មាន​ព័ត៌មាន​របស់ %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "អស់​សតិ​សម្រាប់​ការ​សម្អាត​ធាតុ​ថ្មី"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -365,35 +373,35 @@
 "%s ៖ កំហុស​ខណៈពេល​សម្អាត ៖\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg ៖ មាន​កំហុស​ខាង​ក្នុង​ជា​ច្រើន កំឡុង​ពេល​សង្គ្រោះ​កំហុស !!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "អស់​សតិ​សម្រាប់​ការ​សម្អាត​ធាតុ​ថ្មី"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "អស់​សតិ​សម្រាប់​ការ​សម្អាត​ធាតុ​ថ្មី​ដែលមាន​អាគុយម៉ង់ជា​ច្រើន"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s ៖ កំហុស​ខណៈពេល​សម្អាត ៖\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr ""
 "%s ៖ កំហុស​ខណៈពេល​សម្អាត ៖\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s ៖%d ៖ កំហុស​ខាង​ក្នុង%s'\n"
@@ -409,106 +417,106 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "`%.*s' មិន​ត្រូវបា​នអនុ​ញ្ញាតសម្រាប់ %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "ឥតបានការ​បន្ទាប់ពី %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "ឈ្មោះ​កញ្ចប់​មិន​ត្រឹមត្រូវ (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "សម្អាត​វាល​លម្អិត​ឯកសារ `%s'"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "វាល​លម្អិត​ឯកសារ `%s' មិន​បាន​អនុញ្ញាត​ក្នុង​ឯកសារ​ស្ថានភាព"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "មាន​តម្លៃ​ច្រើន​ពេក​នៅក្នុង​វាល​លម្អិត​ឯកសារ `%s' (បាន​ប្រៀបធៀប​ទៅនឹងអា​ា​ផ្សេងទៀត)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "មាន​តម្លៃ​មួយ​ចំនួន​នៅ​ក្នុង​វាល​លម្អិត​ឯកសារ `%s' (បាន​ប្រៀបធៀប​នឹងអា​ផ្សេង​ទៀត)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "បាទ ចាស/ទេ នៅក្នុង​វាល​ប៊ូលីន​"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "ពាក្យ​នៅ​​​ក្នុងវាល​ `អាទិភាព'"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "តម្លៃ​សម្រា​ប់វាល `ស្ថានភាព' មិន​បាន​អនុញ្ញាត​នៅ​ក្នុង​បរិបទ​នេះ"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "ទី ១ (ចង់បាន) ពាក្យនៅក្នុងវាល `ស្ថានភាព'"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "ទី ២ (កំហុស) ពាក្យ​នៅ​ក្នុង​វាល `ស្ថានភាព'"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "ទី ៣ (ស្ថានភាព) ពាក្យ​នៅក្នុង​វាល `ស្ថានភាព'"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "កំហុស​នៅ​ក្នុង​ខ្សែ​អក្សរ​កំណែ `%.250s' ៖ %.250s"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "វាល​ដែលហួសសម័យ `ការពិនិត្យ​ឡើងវិញ' ឬ `កញ្ចប់​ពិនិត្យ​ឡើងវិញ' បានប្រើ"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "សម្លៃ​សម្រាប់​វាល `កំណែ​កំណត់​រចនាសម្ព័ន្ធ' មិន​បាន​អនុញ្ញាត​នៅ​ក្នុង​បរិបទ​នេះ"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "កំហុស​នៅ​ក្នុង​ខ្សែអក្សរ​កំណែ​កំណត់​រចនាសម្ព័ន្ធ `%.250s' ៖ %.250s"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "តម្លៃ​សម្រាប់ `conffiles' មាន​បន្ទាត់ malformatted `%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "តម្លៃ​សម្រាប់ `conffiles' មាន​បន្ទាត់​ដែលចាប់ផ្ដើម​ជាមួយ​ `%c' ដែលគ្មាន​ចន្លោះ"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "ថត​មេ ឬ ថតទទេដែលត្រូវបាន​រាយ​ជា​ conffile"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr "វាល `%s' ឈ្មោះ​កញ្ចប់​ដែល​បាត់ ឬ អ្វី​ដែលនៅសល់ ដែល​ឈ្មោះកញ្ចប់​ត្រូវបាន​រំពឹងទុក"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "វាល `%s' ឈ្មោះ​កញ្ចប់​មិន​ត្រឹមត្រូវ `%.255s' ៖ %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -517,7 +525,7 @@
 "វាល `%s' សំអាង​លើ `%.255s' ៖\n"
 " ទំនាក់​ទំនង​កំណែ​មិនល្អ %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -526,7 +534,7 @@
 "វាល `%s' សំអាងលើ `%.255s' ៖\n"
 " `%c' ប្រើលែង​បាន ប្រើ `%c=' or `%c%c' ជំនួស​​​វិញ"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -535,11 +543,11 @@
 "វាល `%s' សំអាងលើ `%.255s' ៖\n"
 " ពិតជាដូចនឹងើ​លេខ​កំណែ​ទាំងស្រុង ផ្ដល់យោបល់​ឲ្យប្រើ `=' ជំនួសវិញ"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "មាន​តែ​កំណែ​ជាក់លាក់​ប៉ុណ្ណោះ​អាច​ត្រូវ​បាន​ប្រើ​សម្រាប់​ការ​ផ្ដល់​ឲ្យ"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -548,58 +556,58 @@
 "វាល `%s' សំអាង​លើ `%.255s' ៖\n"
 " តម្លៃ​កំណែ​ចាប់ផ្ដើម​ដោយ​គ្មាន​អក្សរ​ក្រ​ម​លេខ​ ​ស្នើឲ្យប​ន្ថែមចន្លោះ"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "វាល `%s' សំអាង​លើ `%.255s' ៖ កំណែ​មាន `%c'"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "វាល `%s' សំអាង​លើ `%.255s' ៖ កំណែ​មិន​បាន​បញ្ចប់"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "វាល `%s' សំអាង​លើ `%.255s' ៖ កំហុស​នៅ​ក្នុង​កំណែ ៖ %.255s"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "វាល `%s' កំហុស​វាក្យ​សម្ព័ន្ធ​បន្ទាប់​ពី​យោង​លើ​កញ្ចប់ `%.255s'"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "សញ្ញា (`|') ជំនួស​មិន​បាន​អនុញ្ញាត​នៅ​ក្នុង​វាល %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 #, fuzzy
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "សម្លៃ​សម្រាប់​វាល `កំណែ​កំណត់​រចនាសម្ព័ន្ធ' មិន​បាន​អនុញ្ញាត​នៅ​ក្នុង​បរិបទ​នេះ"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, fuzzy, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "វាល `%s' ឈ្មោះ​កញ្ចប់​មិន​ត្រឹមត្រូវ `%.255s' ៖ %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 #, fuzzy
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "តម្លៃ​សម្រា​ប់វាល `ស្ថានភាព' មិន​បាន​អនុញ្ញាត​នៅ​ក្នុង​បរិបទ​នេះ"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, fuzzy, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "ឈ្មោះ​កញ្ចប់​មិន​ត្រឹមត្រូវ​នៅ​បន្ទាត់ %d ៖ %.250s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, fuzzy, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "រាយ​កញ្ចប់​​ឯកសារ​ `%.250s'"
@@ -656,7 +664,7 @@
 msgid "unable to write to status fd %d"
 msgstr "មិន​អាច​សរសេរ​ស្ថានភាព​ដែល​បាន​ធ្វើឲ្យ​ទាន់សម័យ​របស់`%.250s'"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 msgid "malloc failed (%zu bytes)"
 msgstr "realloc បាន​បរាជ័យ​ (%ld បៃ​)"
@@ -666,8 +674,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc បាន​បរាជ័យ​ (%ld បៃ​)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 #, fuzzy
 msgid "failed to allocate memory"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ថត"
@@ -701,198 +709,204 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "មិនអាចកំណត់​ទង់​បិទនៅពេល​ប្រតិបត្តិ សម្រាប់​ %.250s បានឡើ"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "កំហុស​កំណត់​រចនាសម្ព័ន្ធ ៖ %s ត្រូវការ​តម្លៃ​មួយ"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, fuzzy, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ `%.255s' ដើម្បី​អាន"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "មិន​​ស្គា​ល់​ជម្រើស​ `%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "--%s ជម្រើស​យក​តម្លៃ"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "--%s ជម្រើស​មិន​យក​តម្លៃ"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "កំហុស​អាន​នៅ​ក្នុង​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ `%.255s'"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​បិទ​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ `%.255s'"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "កំហុស​ក្នុង​ការ​បិទ​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ `%.255s'"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "មិន​ស្គាល់​ជម្រើស --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s ជម្រើស​យក​តម្លៃ"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s ជម្រើស​មិន​យក​តម្លៃ"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "មិន​ស្គា​ល់ជម្រើស -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c ជម្រើស​យក​តម្លៃ"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c ជម្រើស​មិន​យក​តម្លៃ"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "ព្រមាន ៖ ជម្រើសលែងប្រើ `--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "សកម្មភាព​ប៉ះទង្គិច​ -%c (--%s) និង​ -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "តម្លៃ​ស្ទួ​នស​ម្រាប់វាល `%s'"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "អ្នក​ប្រើ-ឈ្មោះ​វាល​ដែល​បាន​កំណត់ `%.*s' ខ្លី​ពេក"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "តម្លៃ​ស្ទួន​សម្រាប់​អ្នកប្រើ-វាល​ដែល​បាន​កំណត់ `%.*s'"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "កំណែ​ដែល​បាន​កំណត់​រចនាសម្ព័ន្ធ​សម្រាប់​កញ្ចប់​ដែល​មាន​ស្ថានភាព​មិន​ត្រឹមត្រូវ"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "កញ្ចប់​ដែល​ឋិត​នៅក្នុង​ស្ថានភាព​មិនទាន់​បានដំឡើង មាន conffiles បំភ្លេចពួកវា"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ​ព័ត៌មាន​កញ្ចប់ `%.255s' ដើម្បី​អាន"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ឯកសារ​ព័ត៌មាន​កញ្ចប់ `%.255s' បាន​ទេ"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "មិន​អាច​ផ្គូផ្គង​ឯកសារ​ព័ត៌មាន​កញ្ចប់ `​%.255s' បានទេ"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ឯកសារ​ព័ត៌មាន​កញ្ចប់ `%.255s' បាន​ទេ"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បិទ​បន្ទាប់​ពី​អាន ៖ `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "ចុង​ឯកសា​របន្ទាប់​ពី​ឈ្មោះ `%.*s'"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "បន្ទាត់​ថ្មី​នៅ​ក្នុង​ឈ្មោះ​វាល `%.*s'"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS EOF (^Z) នៅ​ក្នុង​ឈ្មោះ​វាល `%.*s'"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "ឈ្មោះវាល `%.*s' ត្រូវតែបានអមដោយសញ្ញា (:)"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF មុន​តម្លៃ​របស់វាល `%.*s' (បាត់​បន្ទាត់​ថ្មី​ចុងក្រោយ)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "តួអក្សរ MSDOS EOF ក្នុង​តម្លៃ​របស់វាល `%.*s' (បាត់បង់​បន្ទាត់​ថ្មីឬ ?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "បន្ទាត់​ថ្មី​នៅ​ក្នុង​ឈ្មោះ​វាល `%.*s'"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "ចុង​​ឯកសារ​ តម្លៃ​វាល `%.*s' (បាត់បង់​បន្ទាត់​ថ្មីចុង​ក្រោយ​)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "រកឃើញ​ធាតុ​ព័ត៌មាន​កញ្ចប់​ជា​ច្រើន មាន​តែ​មួយ​ប៉ុណ្ណោះ​បាន​អនុញ្ញាត"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បិទ​បន្ទាប់​ពី​អាន ៖ `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "គ្មាន​ព័ត៌មាន​កញ្ចប់​នៅ​ក្នុង `%.255s'"
@@ -911,66 +925,66 @@
 " %.255s"
 msgstr "%s នៅ​ក្នុង​ឯកសារ `%.255s' នៅ​ជិត​បន្ទាត់ %d"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "មិន​អាច​ជា​ខ្សែអក្សរ​ទទេ​"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "ត្រូវ​តែ​ចាប់ផ្ដើម​ដោយ​អក្សរក្រម​លេខ"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "តួអក្សរ​ `%c' មិន​បានអនុញ្ញាត​ (បាន​តែ​អក្សរ​, តួលេខ​ និង​តួអក្សរ​ `%s')"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<គ្មាន>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "ខ្សែ​អក្សរ​កំណែ​គឺ​ទទេ"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "ខ្សែ​អក្សរ​កំណែ​បាន​បង្កប់​ចន្លោះ"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "សម័យ​ក្នុង​កំណែ​មិនមែន​ជា​លេខ"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "គ្មាន​អ្វី​បន្ទាប់​ពី​សញ្ញា (:) នៅ​ក្នុង​លេខ​កំណែ"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "គ្មាន​អ្វី​បន្ទាប់​ពី​សញ្ញា (:) នៅ​ក្នុង​លេខ​កំណែ"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "គ្មាន​អ្វី​បន្ទាប់​ពី​សញ្ញា (:) នៅ​ក្នុង​លេខ​កំណែ"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "បាត់ %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "តម្លៃ​ទទេ​សម្រាប់​ %s"
@@ -989,51 +1003,51 @@
 msgid "(no description available)"
 msgstr "(គ្មាន​សេច​ក្តីពិពណ៌នា)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "មិន​អាច​មិន​អើពើ​សញ្ញា %s មុន​ពេល​រត់​ស្គ្រីប"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "កំហុស​ក្នុង​ការ​មិន​បាន​ចាប់​សញ្ញា %s ៖ %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (ដំណើរ​កា​រ​រង​) ៖ %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "ចម្លង​ខ្លួនឯ​ង​បាន​បរាជ័យ"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "ដំណើរការ​រង %s បានត្រឡប់​កំហុស​ស្ថានភាព​ចេញ %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "រង់ចាំ​ %s បាន​បរាជ័យ​"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "ដំណើរ​ការ​រង %s បាន​ពិឃាត​ដោយ​សញ្ញា (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr "​"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "ដំណើរការរង %s បានបរាជ័យដោយកូដស្ថានភាពរង់ចាំ %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "រង់ចាំ​ %s បាន​បរាជ័យ​"
@@ -1053,197 +1067,203 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, fuzzy, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ប្រភព `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 msgid "triggers area"
 msgstr "មិន​អាច​ដោះសោ %s ៖ %s"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, fuzzy, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ឯកសារ​ថ្មី​ផ្សេង​ទៀត​ទេ `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, fuzzy, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ប្រភព `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, fuzzy, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ depot `%.250s' ថ្មី​បាន​ទេ"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, fuzzy, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "កំហុស​ក្នុង​ការ​អាន %s ពី​ឯកសារ %.255s"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, fuzzy, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ depot `%.250s' ថ្មី​បាន​ទេ"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, fuzzy, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ depot `%.250s' ថ្មី​បាន​ទេ"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, fuzzy, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "មិន​អាច​ដំឡើង​កំណែ​ថ្មី​របស់ `%.255s'"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, fuzzy, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ depot `%.250s' ថ្មី​បាន​ទេ"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, fuzzy, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "មិន​អាច​អាន​ផ្នែក​ឯកសារ `%.250s'"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:419
-#, fuzzy, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "មិន​អាច​ចាប់ផ្ដើម​ឯកសារ​ថ្មី​ផ្សេង​ទៀត​ទេ `%.250s'"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, fuzzy, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ឯកសារ​ថ្មី​ផ្សេង​ទៀត​ទេ `%.250s'"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ឯកសារ​ថ្មី​ផ្សេង​ទៀត​ទេ `%.250s'"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ឯកសារ​ថ្មី​ផ្សេង​ទៀត​ទេ `%.250s'"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
+msgstr "មិន​អាច​ដំឡើង​កំណែ​ថ្មី​របស់ `%.255s'"
+
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "មិន​អាច​យក `%.250s' ចេញ"
+
+#: lib/dpkg/triglib.c:360
+#, fuzzy, c-format
+msgid "unable to create new trigger interest file `%.250s'"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ឯកសារ​ថ្មី​ផ្សេង​ទៀត​ទេ `%.250s'"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:383
 #, fuzzy, c-format
-msgid "unable to install new trigger interest file `%.250s'"
-msgstr "មិន​អាច​ដំឡើង​កំណែ​ថ្មី​របស់ `%.255s'"
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "មិន​អាច​ចាប់ផ្ដើម​ឯកសារ​ថ្មី​ផ្សេង​ទៀត​ទេ `%.250s'"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:456
 #, fuzzy, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr "មិន​អាច​ដំឡើង​ឯកសារ​ព័ត៌មាន​ថ្មី `%.250s' ជា `%.250s' បាន​ទេ"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, fuzzy, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ depot `%.250s' ថ្មី​បាន​ទេ"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, fuzzy, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ depot `%.250s' ថ្មី​បាន​ទេ"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ depot `%.250s' ថ្មី​បាន​ទេ"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ depot `%.250s' ថ្មី​បាន​ទេ"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ depot `%.250s' ថ្មី​បាន​ទេ"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, fuzzy, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "មិន​អាច​ដំឡើង​ឯកសារ​ព័ត៌មាន​ថ្មី `%.250s' ជា `%.250s' បាន​ទេ"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, fuzzy, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "មិន​អាច​អាន​ផ្នែក​ឯកសារ `%.250s'"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, fuzzy, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "កំហុស​អាន​នៅ​ក្នុង​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ `%.255s'"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, fuzzy, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ប្រភព `%.250s'"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, fuzzy, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "មិន​អាច​អាន​ថត depot `%.250s' បាន​ទេ"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, fuzzy, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "មិន​អាច​អាន​ថត depot `%.250s' បាន​ទេ"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, fuzzy, c-format
 msgid "read error in `%.250s'"
@@ -1268,7 +1288,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "កំហុស​ក្នុ​ងការ​អាន​ពី​បំពង់ dpkg-deb"
 
@@ -1287,12 +1307,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​កំណត់​ភាព​ជា​ម្ចាស់​របស់​តំណ​និមិត្ត​សញ្ញា `%.255s'"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​កំណត់​ភាព​ជា​ម្ចាស់​របស់ `%.255s'"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​កំណត់​សិទ្ធិ​របស់ `%.255s'"
@@ -1345,109 +1365,124 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "ប័ណ្ណសារ​​បាន​ផ្ទុក​វត្ថុ `%.255s' នៃ​ប្រភេទ​ដែល​មិន​ស្គាល់ 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat file '%s'"
+msgstr "មិន​អាច​ចាប់​ផ្ដើម​ឈ្មោះ​ចាស់ `%s' ៖ %s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "កំពុង​ជំនួស​ឯកសារ​នៅ​ក្នុង​កញ្ចប់​ចាស់ %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "បាន​ជំនួស​ដោយ​ឯកសារ​នៅ​ក្នុង​កញ្ចប់​ដែល​បាន​ដំឡើង %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
 "nondirectory"
 msgstr "ព្យាយាម​សរសេរជាន់​លើ​ថត `%.250s' នៅ​ក្នុង​កញ្ចប់ %.250s ដែល​គ្មាន​ថត"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "ព្យាយាម​សរសេរជាន់​លើ `%.250s' ដែល​មាន​នៅ​ក្នុង​កញ្ចប់ %.250s ផង​ដែរ"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន `%.255s' (នៅ​ក្នុង `%.255s')"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "កម្មវិធី​​​ខា​ងក្រោ​យ​របស់​ dpkg-deb​ កំឡុង​ពេល​ `%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "កំហុស​ក្នុ​​ងការបិទ/សរសេរ `%.255s'"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត​បំពង់ `%.255s'"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត​ឧបករណ៍ `%.255s'"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត​តំណរឹង `%.255s'"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត​តំណ​និមិត្ត​សញ្ញា `%.255s'"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត​ថត `%.255s'"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "មិន​អាច​ផ្លាស់ទី​ផ្នែក `%.255s' ដើម្បី​ដំឡើង​កំណែ​ថ្មី"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "មិន​អាច​អាន​តំណ `%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "មិន​អាច​បង្កើត​តំណ​និមិត្ត​សញ្ញា​ព័ត៌មាន​បម្រុង​ទុក​សម្រាប់ `%.255s'"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "មិន​អាច chown តំណ​និមិត្ត​សញ្ញា​ព័ត៌មាន​បម្រុង​ទុក​សម្រាប់ `%.255s'"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "មិន​អាច​បង្កើត​តំណ​ព័ត៌មាន​បម្រុងទុក​របស់ `%.255s' មុន​ពេល​ដំឡើង​កំណែ​ថ្មី"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "មិន​អាច​ដំឡើង​កំណែ​ថ្មី​របស់ `%.255s'"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "មិន​អាច​បង្កើត​ `%.255s'"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "មិន​អាច​កំណត់​សតិ​បណ្ដោះ​អាសន្ន `%.255s'"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1456,7 +1491,7 @@
 "dpkg ៖ ការព្រមាន - មិន​អើពើ​បញ្ហា​ភាព​អាស្រ័យ​ដោយ​ការ​យក %s ចេញ ៖\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, fuzzy, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1465,7 +1500,7 @@
 "dpkg ៖ ការព្រមាន - ចាត់ទុក​ការមិនកំណត់​រចនាសម្ព័ន្ធនៃ​កញ្ចប់ %s ចាំបាច់\n"
 " ដើម្បីអនុញ្ញាត​ឲ្យ​យកចេញ​នៃ %s ។\n"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1474,7 +1509,7 @@
 "dpkg ៖ គ្មាន %s គឺចាំបាច់ នឹងមិនកំណត់​រចនា​សម្ព័ន្ធ\n"
 " វា​ដើម្បីអនុញ្ញាត​ឲ្យយកចេញ​នៃ %s ។\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1483,28 +1518,28 @@
 "dpkg ៖ គ្មាន មិនអាច​យក %s ចេញ (--auto-deconfigure នឹងជួយ) ៖\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, fuzzy, c-format
 msgid "removal of %.250s"
 msgstr "អាន​កំហុស​នៅ​ក្នុង %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, fuzzy, c-format
 msgid "installation of %.250s"
 msgstr "មិន​អាច​ដំឡើង​កំណែ​ថ្មី​របស់ `%.255s'"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, fuzzy, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg ៖ ការពិនិត្យ​ការយកចេញ %s នៅក្នុងការពេញចិត្ត​នៃ %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, fuzzy, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg ៖ បាទ នឹង​យក %s ចេញ នៅក្នុង ការពេញចិត្ត​នៃ​ %s ។\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1513,147 +1548,149 @@
 "dpkg ៖ គិតថា​ %s មានចំណុះ​ %s ៖\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 #, fuzzy
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "dpkg ៖ ការ​ព្រមាន - មិន​អើពើ​ការ​ប៉ះទង្គិច ទោះ​ជា​យ៉ាងណាក៏​ដោយ​អាច​ធ្វើ​បន្ត​បាន !\n"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg ៖ ការពិនិត្យ​ការយកចេញ %s នៅក្នុងការពេញចិត្ត​នៃ %s ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s មិន​ត្រូវ​បាន​ដំឡើង​យ៉ាង​ត្រឹមត្រូវ - មិន​អើពើ​ភាព​អាស្រ័យ​មួយ​ចំនួន​នៅ​លើ​វា ។\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg ៖ ប្រហែល​ជាមានបញ្ហា​ក្នុងការ​យក​ %s ចេញ នៅពេល​ដែល​វា​ផ្ដល់​ %s ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "requested.\n"
 msgstr "dpkg ៖ កញ្ចប់ %s ទាមទារ​ឲ្យ​ដំឡើង​ម្ដងទៀត ប៉ុន្តែ វា​នឹង​យកចេញ​ នៅពេល​ដែល​អ្នក​ស្នើ ។\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg ៖ កញ្ចប់ %s ទាមទារ​ការ​ដំឡើ​ងឡើង​វិញ នឹង​មិន​យកចេញ​ទេ ។\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg ៖ បាទ នឹង​យក %s ចេញ នៅក្នុង ការពេញចិត្ត​នៃ​ %s ។\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "ការ​ប៉ះទង្គិច​កញ្ចប់ - មិន​ដំឡើង %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 #, fuzzy
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "dpkg ៖ ការ​ព្រមាន - មិន​អើពើ​ការ​ប៉ះទង្គិច ទោះ​ជា​យ៉ាងណាក៏​ដោយ​អាច​ធ្វើ​បន្ត​បាន !\n"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --រង្វិលជុំ ត្រូវការ​យ៉ាងហោចណាស់​​អាគុយម៉ង់​ផ្លូវ​មួ"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "បានបរាជ័យក្នុងការប្រតិបត្តិរក --រង្វិលជុំ"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "បរាជ័យ​ក្នុងការ​ fdopen បំពង់​របស់​ការរក"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "កំហុស​ក្នុង​ការអាន​បំពង់​របស់​ការ​រក"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "កំហុស​ក្នុង​ការ​បិទ​បំពង់​របស់​ការ​រក"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "រកមើល --រង្វិលជុំ បានត្រឡប់​កំហុស​ដែលមិនបាន​ដោះស្រាយ %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "បានស្វែងរក ប៉ុន្តែរកមិនឃើញកញ្ចប់ (ការផ្គូផ្គងឯកសារ *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s ត្រូវ​ការ​យ៉ាងហោច​ណាស់​អាគុយម៉ង់​ឯកសារ​ប័ណ្ណសារ​កញ្ចប់​មួយ"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "ជ្រើស​កញ្ចប់​ដែល​មិន​បាន​ជ្រើស​ពី​មុន %s ។\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "​រំលង​កញ្ចប់​ដែល​មិន​បាន​ជ្រើស​ %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "កំណែ %.250s នៃ %.250s បានដំឡើងរួចហើយ រំលង ។\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s - ព្រមាន ៖ កំពុងបន្ទាប %.250s ពី %.250s ទៅ %.250s ។\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "នឹង​មិន​បន្ទាប %.250s ពី​កំណែ %.250s ទៅ %.250s រំលង ។\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1662,39 +1699,39 @@
 "មិន​អាច​យក​កំណែ​របស់ `%.250s' ដែល​បាន​ដំឡើង​ថ្មីៗ​ចេញ​បាន​ទេ ដើម្បី​អនុញ្ញាត​ការ​ដំឡើង​ឡើងវិញ​របស់​ច្បាប់​"
 "ចម្លង​ព័ត៌មាន​បម្រុង​ទុក"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "មិន​អាច​ស្ដារ​កំណែ​ព័ត៌មាន​បម្រុង​ទុក​របស់ `%.250s' បាន​ទេ"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "មិន​អាច​ស្ដារ​កំណែ​ព័ត៌មាន​បម្រុង​ទុក​របស់ `%.250s' បាន​ទេ"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "មិន​អាច​យក​កំណែ​របស់ `%.250s' ដែល​បាន​ដំឡើង​ថ្មីៗ​ចេញ​បាន​ទេ"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "មិន​អាច​យក​កំណែ​របស់ `%.250s' ដែល​បាន​ស្រង់​ចេញ​ថ្មីៗ​ចេញ​បា​នទេ"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "មិនអាច​ថ្លែង​ dist conffile ថ្មី `%.250s' បានទេ"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "មិនអាច​ថ្លែង conffile ដែលបាន​ដំឡើង​បច្ចុប្បន្ន `%.250s'"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1705,60 +1742,60 @@
 "ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ `%s' មិនមាន​នៅ​ក្នុង​ប្រព័ន្ធ ។\n"
 "ឥឡូវ​កំពុង​ដំឡើង​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ ដូច​ដែល​អ្នក​​ស្នើ ។\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "dpkg ៖ %s ៖ ព្រមាន - បាន​បរាជ័យ​ក្នុង​ការ​យក​ព័ត៌មាន​បម្រុងទុក​ចាស់​ចេញ `%.250s' ៖ %s\n"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 "dpkg ៖ %s ៖ ព្រមាន - បាន​បរាជ័យ​ក្នុង​ការ​ប្ដូរ​ឈ្មោះ `%.250s' ទៅ​ជា `%.250s' ៖ %s\n"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s ៖ បាន​បរាជ័​យក្នុ​ងការប្រតិបត្តិ gzip %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 "dpkg ៖ %s ៖ ព្រមាន - បាន​បរាជ័យ​ក្នុង​ការ​យក​កំណែ​ចែកចាយ​ចាស់​របស់ `%.250s' ចេញ ៖ %s\n"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 "dpkg ៖ %s ៖ ព្រមាន - បាន​បរាជ័យ​ក្នុង​ការ​យក `%.250s' ចេញ (មុន​ពេល​សរសេរ​ជាន់​លើ) ៖ %s\n"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "dpkg ៖ %s ៖ ព្រមាន - បាន​បរាជ័យ​ក្នុង​ការ​តភ្ជាប់ `%.250s' ទៅ `%.250s' ៖ %s\n"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "កំពុង​ដំឡើង​កំណែ​ថ្មី​របស់​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "មិន​អាច​ដំឡើង​ `%.250s' ជា​ `%.250s' បានទេ"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "គ្មាន​កញ្ចប់​ដែល​មាន​ឈ្មោះ `%s' ត្រូវ​បាន​ដំឡើង​ទេ មិន​អាច​កំណត់​រចនា​សម្ព័ន្ធ"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "កញ្ចប់ %.250s ត្រូវ​បាន​ដំឡើង និង​កំណត់​រចនាសម្ព័ន្ធ​រួច​ហើយ"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1767,7 +1804,7 @@
 "កញ្ចប់ %.250s មិន​ទាន់​រួចរាល់ ដើម្បី​កំណត់​រចនាសម្ព័ន្ធ\n"
 " មិន​អាច​កំណត់​រចនាសម្ព័ន្ធ (ស្ថានភាព​បច្ចុប្បន្ន `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1776,11 +1813,11 @@
 "dpkg ៖ បញ្ហា​ភាព​អាស្រ័យ​ការពារ​ពី​ការ​កំណត់​រចនាសម្ព័ន្ធ​របស់ %s ៖\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "បញ្ហា​ភាព​អាស្រ័យ - មិន​បាន​កំណត់​រចនាសម្ព័ន្ធ"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1789,7 +1826,7 @@
 "dpkg ៖ %s ៖ បញ្ហា​ភាព​អាស្រ័យ ប៉ុន្តែ​ទោះ​​ជាយ៉ាងណាក៏ដោយ កំណត់​រចនាសម្ព័ន្ធ​ដូច​ដែល​អ្ន​ក​ស្នើ ៖\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1797,12 +1834,12 @@
 "កញ្ចប់​ស្ថិត​នៅ​ក្នុង​ស្ថានភាព​មិន​ជាប់លាប់​ដ៏​មិន​ល្អ​បំផុត​មួយ - អ្នក​គួរ​ដំឡើង​វា​ឡើង​វិញ\n"
 " មុន​ពេល​ប៉ុនប៉ង​កំណត់​រចនាសម្ព័ន្ធ ។"
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "កំពុង​រៀបចំ %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, fuzzy, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1811,7 +1848,7 @@
 "dpkg ៖ %s ៖ ព្រមាន - មិន​អា​ចចាប់ផ្ដើម​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ `%s'\n"
 " (= `%s') ៖ %s\n"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, fuzzy, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1820,7 +1857,7 @@
 "dpkg ៖ %s ៖ ព្រមាន - ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ `%s' ជា​តំណ​រាង​ជា​រង្វង់\n"
 " (= `%s')\n"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, fuzzy, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1829,7 +1866,7 @@
 "dpkg ៖ %s ៖ ព្រមាន - មិនអាចអាន​តំណ conffile `%s'\n"
 " (= `%s') ៖ %s\n"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, fuzzy, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1838,34 +1875,34 @@
 "dpkg ៖ %s ៖ ព្រមាន - conffile `%.250s' ដោះស្រាយ​ទៅឈ្មោះ​ឯកសារ​ដែល​ប្រែក្លាយe\n"
 " (`%s' គឺជា symlink ទៅ `%s')\n"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, fuzzy, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "dpkg ៖ %s ៖ ព្រមាន - conffile `%.250s' មិនមែនជា​ឯកសារធម្មតា ឬ symlink (= `%s')\n"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "dpkg ៖ %s ៖ ព្រមាន - មិនអាច​បើក conffile %s សម្រាប់​ភាព​រាយប៉ាយបានឡើយ ៖ %s\n"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "វាយ `exit' នៅ​ពេល​ដែល​អ្នក​បាន​ធ្វើ​រួចរាល់ ។\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1874,12 +1911,12 @@
 "\n"
 "ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (ជា​ការ​ពិត `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1890,7 +1927,7 @@
 " ==> ឯកសារ​លើ​ប្រព័ន្ធ​បាន​បង្កើត​ដោយ​អ្នក ឬ​ដោយ​ស្គ្រីប ។\n"
 " ==> ឯកសារ​នៅ​ក្នុង​កញ្ចប់​ក៏​បាន​ផ្ដល់​ដោយ​អ្នក​ថែទាំ​ផងដែរ ។\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1899,7 +1936,7 @@
 "\n"
 "     មិន​បាន​កែប្រែ តាំងពី​ដំឡើង ។\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1908,7 +1945,7 @@
 "\n"
 " ==> បាន​កែប្រែ (ដោយ​អ្នក ឬ​ដោយ​ស្គ្រីប) តាំង​ពី​ដំឡើង ។\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1917,37 +1954,37 @@
 "\n"
 " ==> បាន​លុប (ដោយ​អ្នក ឬ​ដោយ​ស្គ្រីប) តាំង​ពី​ដំឡើង ។\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> អ្នក​ចែកចាយ​កញ្ចប់​បាន​បញ្ជូន​កំណែ​ដែល​បាន​ធ្វើ​ឲ្យ​ទាន់​មួយ ។\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     កំណែ​នៅ​ក្នុង​កញ្ចប់​គឺ​ដូចគ្នា​នឹង​កំណែ​ដំឡើង​ចុង​ក្រោយ ។\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> ​ប្រើ​ឯកសារ​ថ្មី​ដូច​ដែល​អ្នក​បាន​ស្នើ ។\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> ​ប្រើ​ឯកសារ​ចាស់​បច្ចុប្បន្ន​ដូច​ដែល​អ្នក​បាន​ស្នើ ។\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> រក្សាទុក​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ចាស់​ជា​លំនាំដើម ។\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> ប្រើ​ឯកសារ​កំណត់​រចនា​ស​ម្ព័ន្ធ​ថ្មី​ជា​លំនាំដើម ។\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1962,165 +1999,166 @@
 "      D      ៖ បង្ហាញ​ភា​ពខុ​ស​គ្នារ​វាងកំណែទាំងនោះ\n"
 "      Z      ៖ ផ្ទៃ​ខាង​ក្រោយ វា​ដំណើរការ​ដើម្បី​ពិនិត្យ​មើល​ស្ថានភាព\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " សកម្មភាព​លំនាំដើម​គឺ​ត្រូវ​រក្សា​កំណែ​បច្ចុប្បន្ន​របស់​អ្នក ។\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " សកម្មភាព​លំនាំដើម​គឺ​ត្រូវ​ដំឡើង​កំណែ​ថ្មី ។\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[លំនាំដើម​=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[លំនាំដើម​=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[គ្មាន​លំនាំ​ដើម​]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "់"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "អាន​កំហុស​នៅលើ​ stdin នៅ​ប្រអប់​បញ្ចូល conffile"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF នៅលើ stdin នៅប្រអប់​បញ្ចូល conffile"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, fuzzy, c-format
 msgid "%s depends on %s"
 msgstr "អាស្រ័យ​លើ​"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, fuzzy, c-format
 msgid "%s pre-depends on %s"
 msgstr " ភាពអាស្រ័យ​ជាមុន​នៅលើ "
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, fuzzy, c-format
 msgid "%s recommends %s"
 msgstr " ផ្ដល់អនុសាសន៍ "
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, fuzzy, c-format
 msgid "%s suggests %s"
 msgstr " ផ្ដល់យោបល់ "
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, fuzzy, c-format
 msgid "%s breaks %s"
 msgstr " បំបែក "
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, fuzzy, c-format
 msgid "%s conflicts with %s"
 msgstr " ប៉ះទង្គិច​ជាមួយ​នឹង "
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, fuzzy, c-format
 msgid "%s enhances %s"
 msgstr " បន្ថែម "
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s មិន​ត្រូវ​បាន​យកចេញ​ទេ ។\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s ត្រូវតែបានកំណត់រចនាសម្ព័ន្ធ ។\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s ត្រូវ​តែ​បាន​ដំឡើង ប៉ុន្តែ​គឺ​ជា​កំណែ %.250s ។\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s ត្រូវ​តែ​បាន​ដំឡើង ប៉ុន្តែ​គឺ​ជា​កំណែ %.250s ។\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s ត្រូវ​បាន​ពន្លា ប៉ុន្តែ​មិន​ដែល​ត្រូវ​បាន​កំណត់​រចនាសម្ព័ន្ធ​ទេ ។\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s ត្រូវ​បាន​ពន្លា ប៉ុន្តែ​គឺ​ជា​កំណែ %.250s ។\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s កំណែ​ដែល​បាន​កំណត់​រចនាសម្ព័ន្ធ​ចុង​ក្រោយ​គឺ %.250s ។\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s គឺជា %s ។\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s ផ្ដល់ %.250s ប៉ុន្តែ​ត្រូវតែ​បាន​យក​ចេញ ។\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s ផ្ដល់ %.250s ប៉ុន្តែ​ត្រូវតែ​បាន​កំណត់​រចនាសម្ព័ន្ធ ។\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s ផ្ដល់ %.250s ប៉ុន្តែជា %s ។\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s មិន​ត្រូវ​បាន​ដំឡើង ។\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (កំណែ %.250s) ត្រូវតែ​បាន​ដំឡើង ។\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, fuzzy, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (កំណែ %.250s) គឺជា %s ។\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s ផ្ដល់ %.250s និង​ត្រូវតែ​បាន​ដំឡើង ។\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, fuzzy, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s ផ្ដល់ %.250s និង​គឺជា %s ។\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+msgid "Use --help for help about diverting files."
+msgstr "វាយ dpkg-split --help សម្រាប់​ជា​ជំនួយ ។"
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "ដេបៀន %s កំណែ %s ។\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2135,8 +2173,8 @@
 "រក្សាសិទ្ធិឆ្នាំ ១៩៩៥ ដោយ Ian Jackson ។\n"
 "រក្សាសិទ្ធិឆ្នាំ ២០០០-២០០១ ដោយ Wichert Akkerman ។"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2147,7 +2185,7 @@
 "នេះ​ជា​កម្មវិធី​ឥត​គិត​ថ្លៃ មើល GNU General Public Licence កំណែ ២ ឬ\n"
 "ថ្មី​ជាង​នេះ​ដើម្បី​លក្ខខ័ណ្ឌ​ចម្លង ។ គ្មាន​ការ​ធានា​ទេ ។\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2157,7 +2195,7 @@
 "របៀប​ប្រើ ៖ %s [<ជម្រើស> ...] <ពាក្យបញ្ជា>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2169,7 +2207,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -2210,7 +2248,7 @@
 "នៅ​ពេល​យកចេញ --package ឬ --local និង --divert ត្រូវតែ​ផ្គូផ្គង ប្រសិន​បើ​បាន​បញ្ជាក់ ។\n"
 "ស្គ្រីប​កញ្ចប់ preinst/postrm គួរតែ​បញ្ជា​ជា​និច្ច --package និង --divert ។\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2219,19 +2257,13 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat file '%s'"
-msgstr "មិន​អាច​ចាប់​ផ្ដើម​ឈ្មោះ​ចាស់ `%s' ៖ %s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error checking `%s': %s"
 msgid "error checking '%s'"
 msgstr "កំហុស​ក្នុង​ការ​ពិនិត្យ `%s' ៖ %s"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2240,140 +2272,140 @@
 "ប្ដូរ​ឈ្មោះ​ពាក់ព័ន្ធ​នឹង​ការ​សរសេរ​ជាន់​លើ `%s' ដោយ\n"
 "  ឯកសារ​ផ្សេង `%s' មិន​បាន​អនុញ្ញាត"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ប្រភព `%.250s'"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "cannot stat new name `%s': %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ឈ្មោះ​ថ្មី `%s' ៖ %s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 #| msgid "rename: remove duplicate old link `%s': %s"
 msgid "rename: remove duplicate old link '%s'"
 msgstr "ប្ដូរឈ្មោះ ៖ យក​តំណ​ចាស់​ដែល​ស្ទួន​ចេញ `%s' ៖ %s"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ប្រភព `%.250s'"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 msgid "local diversion of %s"
 msgstr "បាន​បង្វែរ​ជា​មូលដ្ឋាន​ទៅ ៖ %s\n"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 msgid "local diversion of %s to %s"
 msgstr "បាន​បង្វែរ​ជា​មូលដ្ឋាន​ទៅ ៖ %s\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "diversion of %s by %s"
 msgstr "ការ​បង្វែរ​ដោយ %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "បាន​បង្វែរ​ដោយ %s ទៅ ៖ %s\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "any diversion of %s"
 msgstr "ការ​បង្វែរ​ដោយ %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 msgid "any diversion of %s to %s"
 msgstr "បាន​បង្វែរ​ដោយ %s ទៅ ៖ %s\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "cannot open GPL file"
 msgid "cannot create new %s file"
 msgstr "មិន​អាច​បើក​ឯកសារ​ GPL បាន​ឡើយ​"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "មិន​អាច​បង្ហូរ​ចូល​ក្នុងឯកសារ​ vsnprintf"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 #| msgid "remove old diversions-old: %s"
 msgid "error removing old diversions-old"
 msgstr "យក​ការ​បង្វែរ​ចាស់​ចេញ ៖ %s"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត statoverride-old ថ្មី ៖ %s"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "កំហុស​ក្នុង​ការ​ដំឡើង statoverride ថ្មី ៖ %s"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s ត្រូវការ​អាគុយម៉ង់​តែ​មួយ"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "ឈ្មោះ​ឯកសារ \"%s\" មិន​ពេញលេញ"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "ឯកសារ​មិន​អាច​មាន​បន្ទាត់ថ្មី"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "មិន​អាច​បង្វែរ​ថត"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "មិន​អាច​បង្វែរ​ថត"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "ទុកចោល​`%s'"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' ប៉ះអង្គិច​ជា​មួយ `%s'"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "បន្ថែម​ `%s'"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
 msgstr "គ្មាន​ការ​បង្វែរ `%s' គ្មាន​អ្វី​បាន​យក​ចេញ"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2384,7 +2416,7 @@
 "  នៅ​ពេ​លយក `%s' ចេញ\n"
 "  រកឃើញ `%s'"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2395,17 +2427,17 @@
 "  នៅ​ពេលយក `%s' ចេញ\n"
 "  រកឃើញ `%s'"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "យក `%s' ចេញ"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "កញ្ចប់​មិនអាច​មាន​បន្ទាត់​ថ្មី"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "បង្វែរ​មិន​អាច​មាន​បន្ទាត់​ថ្មី"
 
@@ -2481,8 +2513,8 @@
 msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s មិន​ត្រូវការ​អាគុយម៉ង់"
@@ -2571,7 +2603,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--ការ​ប្រៀបធៀប​កំណែ​មាន​ទំនាក់ទំនង​មិន​ល្អ"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "dpkg ៖ កំណែ '%s' មាន​វាក្យសម្ពន្ធ​មិន​ត្រឹមត្រូវ ៖ %s\n"
@@ -2625,12 +2657,12 @@
 "dpkg - ព្រមាន បដិសេធបញ្ហាពីព្រោះ --force បានអនុញ្ញាត ៖\n"
 " "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, fuzzy, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2639,37 +2671,37 @@
 "dpkg ៖ ការ​ព្រមាន​ដ៏ធ្ងន់ធ្ងរ ៖ ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​បាត់ សន្មត់​ថា​កញ្ចប់​"
 "គ្មាន​ឯកសារ​ដែល​បាន​ដំឡើង​ថ្មីៗ ។\n"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "រាយ​កញ្ចប់​​ឯកសារ​ `%.250s'"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, fuzzy, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "កំហុស​ក្នុង​ការ​បិទ​ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(កំពុង​អាន​មូលដ្ឋាន​ទិន្នន័យ​ ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2677,33 +2709,33 @@
 msgstr[0] "%d ឯកសារ និង​ថត​បាន​ដំឡើង​ថ្មីៗ ។)\n"
 msgstr[1] "%d ឯកសារ និង​ថត​បាន​ដំឡើង​ថ្មីៗ ។)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "មិន​អាច​បង្កើត​ឯកសារ​ដែល​បាន​ធ្វើ​ឲ្យ​ទាន់​សម័យ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​សរសេរ​ទៅ​កាន់​ឯកសារ​ដែល​បាន​ធ្វើឲ្យ​ទាន់​សម័យ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្ហូរ​ឯកសារ​ដែល​បាន​ធ្វើឲ្យ​ទាន់​សម័យ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 "បាន​បរាជ័យ​ក្នុង​ការ​ធ្វើ​សមកាលកម្ម​ឯកសារ​ដែល​បាន​ធ្វើឲ្យទាន់​សម័យ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បិទ​ឯកសារ​ដែល​បាន​ធ្វើឲ្យទាន់​សម័យ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំឡើង​ឯកសារ​​ដែល​បាន​ធ្វើឲ្យទាន់​សម័យ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ %s"
@@ -2743,7 +2775,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "dpkg - កំហុស​ ៖ PATH មិន​បាន​កំណត់​ ។\n"
 
 #: src/help.c:129
@@ -2775,7 +2807,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "មិន​អាច​ថ្លែង​ក្នុង vsnprintf"
@@ -2786,66 +2818,66 @@
 msgstr "បាន​បរាជ័យ​ដើម្បី chroot ទៅ `%.250s'"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "បាន​បរាជ័យ​ក្នុង chdir ទៅជា`%.255s'"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "មិន​អាច​កំណត់​សិទ្ធិ​ប្រតិបត្តិ​នៅ​លើ `%.250s'"
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "មិន​អាច​ថ្លែង​ក្នុង vsnprintf"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "ស្គ្រីប %s ចាស់"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "មិន​អាច​ចាប់ផ្ដើម %s `%.250s'"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "ស្គ្រីប %s ថ្មី​"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "ស្គ្រីប %s ចាស់"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "មិន​អាច​ចាប់ផ្ដើម %s `%.250s'"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - សាកល្បង​ស្គ្រីប​ពី​កញ្ចប់​ថ្មី​ជំនួស​វិញ ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "គ្មាន​ស្គ្រីប​នៅ​ក្នុង​កំណែ​ថ្មី​របស់​កញ្ចប់ - បោះបង់"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg ៖ ... វា​មើល​ទៅ​ហាក់បី​ដូចជា​គ្មាន​បញ្ហា ។\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "មិន​អាច​បង្កើត​ `%.255s'"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2854,7 +2886,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "មិន​អាច​ពិនិត្យ​មើល​ភាព​មាន​ស្រាប់​របស់`%.250s'"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "មិន​អាច​អាន​ថត​ព័ត៌មាន"
 
@@ -2919,7 +2951,7 @@
 "  -Dh|--debug=help                 បង្ហាញ​ជំនួយ​អំពី​ការ​បំបាត់​កំហុស ។\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -3037,7 +3069,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr "ប្រើ `dselect' ឬ `aptitude' សម្រាប់​គ្រប់គ្រង​កញ្ចប់​ដែល​អ្នក​ប្រើ​ងាយ​ស្រួល​មើល ។\n"
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3087,30 +3119,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3119,102 +3155,102 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "បញ្ហា​ភាព​អាស្រ័យ - មិន​យក​ចេញ"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "បញ្ហា​ភាព​អាស្រ័យ - មិន​យក​ចេញ"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "មិន​អាច​ថ្លែង​ក្នុង vsnprintf"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "កំហុស​អាន​នៅ​ក្នុង​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ `%.255s'"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3222,7 +3258,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3230,35 +3266,35 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--ការ​បំបាត់​កំហុស​ត្រូវការ​អាគុយម៉ង់គោល ៨"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "គ្មាន​ឈ្មោះ​កញ្ចប់​នៅ​ក្នុង --ignore-depends បញ្ជី​ដែល​បំបែក​ដោយ​សញ្ញាក្បៀស `%.250s'"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends ត្រូវការឈ្មោះកញ្ចប់ត្រឹមត្រូវ ។ `%.250s' មិនមែន %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ចំនួន​គត់​មិន​ត្រឹមត្រូវ​សម្រាប់ --%s: `%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3267,7 +3303,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3275,12 +3311,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ជម្រើស​បង្ខំ/បដិសេធ​ដែល​មិនស្គាល់ `%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "ព្រមាន ៖ ជម្រើស​បង្ខំ/បដិសេធ ដែល​លែង​ប្រើ `%s'\n"
@@ -3303,8 +3339,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "ចុង​ឯកសា​រដែល​មិន​បាន​រំពឹង​ទុក​មុន​ចុង​បន្ទាត់ %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "ត្រូវ​ការ​ជម្រើស​សកម្មភាព​មួយ"
 
@@ -3467,86 +3503,86 @@
 msgid "passed\n"
 msgstr "បានហុច\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ឈ្មោះ​ថត​បណ្ដោះ​អាសន្ន"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr ""
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr "កំណែ​ចាស់​របស់​កញ្ចប់​មាន​ឈ្មោះ​ឯកសារ​ព័ត៌មាន​វែង​ពេក ដោយ​ចាប់ផ្ដើម​ដោយ `%.250s'"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "មិន​អាច​យក​ឯកសារ​ព័ត៌មាន​ដែល​លែង​ប្រើ​ចេញ `%.250s'"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "មិន​អាច​ដំឡើង​ (សន្មតថា​) ឯកសារ​ព័ត៌មាន​ថ្មី​ `%.250s'"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "មិន​អាច​បើក​ថត​វត្ថុ​បញ្ជា temp បាន​ទេ"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr "កញ្ចប់​មាន​ឈ្មោះ​ឯកសារ​ព័ត៌មាន​វែងពេក (ចាប់​ផ្តើម​ `%.50s')"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "ព័ត៌មាន​វត្ថុ​បញ្ជា​កញ្ចប់​មាន​ថត `%.250s'"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "ព័ត៌មាន​វត្ថុបញ្ជា​កញ្ចប់ rmdir របស់ `%.250s' មិនបាន​ចែង​ថាជា​ថត​ទេ"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr "dpkg ៖ ព្រមាន - កញ្ចប់ %s មាន​បញ្ជា​ដូច​ឯកសារ​ព័ត៌មាន"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "មិន​អាច​ដំឡើង​ឯកសារ​ព័ត៌មាន​ថ្មី `%.250s' ជា `%.250s' បាន​ទេ"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "មិន​អាច​លុប​ឯកសារ​ព័ត៌មាន​វត្ថុ​បញ្ជា `%.250s'"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "មិន​អាច​ចូល​ដំណើរការ​ប័ណ្ណសារ"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ឈ្មោះ​ថត​បណ្ដោះ​អាសន្ន"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "ប្រវែង​ព័ត៌មាន​វត្ថុ​បញ្ជា"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "ព័ត៌មានដែលបានកត់ត្រាអំពី %s ពី %s ។\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "ស្ថាបត្យកម្ម​កញ្ចប់ (%s) មិន​ផ្គូផ្គង​នឹង​ប្រព័ន្ធ (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3555,98 +3591,98 @@
 "dpkg ៖ គិត​ថា %s មាន %s បញ្ហា​ភាព​អាស្រ័យ​ជា​មុន ៖\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "បញ្ហា​ភាព​អាស្រ័យ​ជា​មុន - មិន​ដំឡើង %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr "dpkg ៖ ព្រមាន - មិន​អើពើ​បញ្ហា​ភាព​អាស្រ័យ​ជាមុន !\n"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "កំពុង​រៀបចំ​ជំនួស %s %s (ដោយ​ប្រើ %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "កំពុង​ពន្លា %s (ពី %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "ឈ្មោះ conffile (ចាប់ផ្តើម​ `%.250s') គឺ វែង​ (>%d តួអក្សរ)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "អាន​កំហុស​នៅ​ក្នុង %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "កំហុស​ក្នុង​ការ​បិទ %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "កំហុស​ក្នុង​ការ​ព្យាយាម​បើក %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, fuzzy, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "មិន​កំពុង​កំណត់​រចនាសម្ព័ន្ធ %s ដូច្នេះ​យើង​មិន​អាច​យក %s ចេញ​បាន​ទេ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, fuzzy, c-format
 msgid "De-configuring %s ...\n"
 msgstr "កំពុងយក %s ចេញ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "កំពុង​ព​ន្លាការជំនួស %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "កំហុស​ក្នុង​ការ​អាន​លទ្ធផល dpkg-deb tar"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "ឯកសារ tar របស់​ប្រព័ន្ធ​ឯកសារ​ដែល​ខូច - ប័ណ្ណសារ​កញ្ចប់​ដែល​ខូច"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb ៖ zap កំពុង​ទាញ​យក​សូន្យ​ដែល​អាច​ធ្វើ​ទៅ"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, fuzzy, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "dpkg ៖ ព្រមាន - មិន​អាច​ចាប់ផ្ដើម​ឯកសារ​ចាស់ `%.250s' ដូច្នេះ​មិនលុប​វា ៖ %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "dpkg ៖ ព្រមាន - មិនអាចលុបថតចាស់ `%.250s' ៖ %s\n"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, fuzzy, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr "dpkg ៖ ការព្រមាន-  conffile ចាស់ៗ`%.250s' ជាថត​ទំនេ (​ឥឡូវ​បានលុប​វាហើយ​)\n"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ឯកសារ​ថ្មី​ផ្សេង​ទៀត​ទេ `%.250s'"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, fuzzy, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3655,12 +3691,12 @@
 "dpkg ៖ ព្រមាន - ឯកសារ​ចាស់ `%.250s' គឺ​ដូចគ្នា​នឹង​ឯកសារ​ថ្មី​ជា​ច្រើន !  (ទាំង `%.250s' និង `"
 "%.250s')"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "dpkg ៖ ព្រមាន - មិនអាចឲ្យឯកសារចាស់ %s `%%.250s' ៖ %%s\n"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(ចំណាំ​ថា ការ​មិន​បង្ហាញ​របស់ %s ដែល​ត្រូវបាន​ជំនួស​ដោយ​ជោគជ័យ ។)\n"
@@ -3825,7 +3861,7 @@
 "  -f|--showformat=<format>         ប្រើ​ទ្រង់ទ្រាយ​ជំនួស​សម្រាប់ --show ។\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3846,6 +3882,10 @@
 "  ។ វាល​នឹង​ត្រូវបាន​តម្រឹម​ស្ដាំ​លុះត្រាតែ​ទទឹង​អវិជ្ជមាន ដែល\n"
 "  ករណី​តម្រឹម​ឆ្វេង​នឹង​ត្រូវបាន​ប្រើ ។\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, fuzzy, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3904,7 +3944,7 @@
 msgid "Removing %s ...\n"
 msgstr "កំពុងយក %s ចេញ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, fuzzy, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3913,47 +3953,48 @@
 "dpkg - ព្រមាន ៖ ខណៈពេល​យក %.250s ចេញ មិន​អាច​យក​ថត `%.250s' ចេញ​បាន​ទេ ៖ %s - ថត​អាច​"
 "មាន​ចំណុចម៉ោន​មួយ ?\n"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "មិន​អាច​យក `%.250s' ចេញ"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "មិន​អាច​បង្កើត​ `%.255s'"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "dpkg - ព្រមាន ៖ ខណៈពេល​យក %.250s ចេញ ថត `%.250s' មិន​ទទេ ដូច្នេះ​មិនបាន​យកចេញ ។\n"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "មិន​អាច​យក `%.250s' ចេញ"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "កំពុង​លុប​បំបាត់​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​សម្រាប់ %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "មិន​អាច​យក​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ចាស់ `%.250s' (= `%.250s') ចេញ"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "មិន​អាច​អាន​ថត​ឯកសារ​កំណត់​រចនាម្ព័ន្ធ `%.250s' (ពី `%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr "មិន​អាច​យក​ឯកសារ​កំណត់​រចនាម្ព័ន្ធ​បម្រុង​ទុក​ចាស់`%.250s' (នៃ `%.250s') ចេញ​បាន​ទេ"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "មិន​អាច​យក​បញ្ជី​ឯកសារ​ចាស់​ចេញ​បាន​ទេ"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "មិន​អាច​យក​ស្គ្រីប postrm ចាស់​ចេញ​បាន​ទេ"
 
@@ -3996,7 +4037,11 @@
 msgid "read error on standard input"
 msgstr "អាន​កំហុស​អំពី​ការ​បញ្ចូល​ជា​ខ្នាតគំរូ"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4006,7 +4051,7 @@
 "រក្សាសិទ្ធិ​ឆ្នាំ ១៩៩៥ ដោយ Ian Jackson ។\n"
 "រក្សាសិទ្ធិ​ឆ្នាំ ២០០០-២០០២ ដោយ Wichert Akkerman ។"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4017,7 +4062,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -4045,56 +4090,56 @@
 "  --help                   បង្ហាញ​សារ​ជំនួយ​នេះ ។\n"
 "  --version                បង្ហាញ​កំណែ ។\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "ស្នាម​ឆ្នូត​ /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "មិន​អាច​បើ​​​ឯកសារ​ statoverride ថ្មី​បានទេ​ ៖ %s"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "កំហុស​ក្នុង​ការ​យក statoverride-old ៖ %s ចេញ"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត statoverride-old ថ្មី ៖ %s"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "កំហុស​ក្នុង​ការ​ដំឡើង statoverride ថ្មី ៖ %s"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add ត្រូវការ​អាគុយម៉ង់​បួន"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, fuzzy, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr "ប៉ុន្តែ --force បាន​បញ្ជាក់ ដូច្នេះ​អាច​មិន​អើពើ​វា ។"
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, fuzzy, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "ការ​បដិសេធ​សម្រាប់ \"%s\" មាន​រួច​ហើយ"
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, fuzzy, c-format
 msgid "--update given but %s does not exist"
 msgstr "ព្រមាន ៖ --update បាន​ផ្ដល់ ប៉ុន្តែ %s មិន​ទាន់​មាន"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "គ្មាន​ការ​បដិសេធ​លេច​ឡើង ។"
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 #, fuzzy
 msgid "--update is useless for --remove"
 msgstr "ព្រមាន ៖ --update គឺ​គ្មាន​ប្រយោជន៍​សម្រាប់ --remove"
@@ -4166,17 +4211,17 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "ឯកសារ statoverride `%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "វាយ dpkg-split --help សម្រាប់​ជា​ជំនួយ ។"
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "ឧបករណ៍​សួរ​កម្មវិធី​គ្រប់គ្រង​កញ្ចប់ `%s' ដេបៀន\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4186,7 +4231,7 @@
 "របៀប​ប្រើ ៖ %s [<ជម្រើស> ...] <ពាក្យបញ្ជា>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4195,7 +4240,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4209,31 +4254,31 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 #, fuzzy
 msgid "takes one argument, the trigger name"
 msgstr "--%s ត្រូវការ​តែ​អាគុយម៉ង់​តែ​មួយ​ប៉ុណ្ណោះ (ឈ្មោះ​ឯកសារ .deb)"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "វាល `%s' ឈ្មោះ​កញ្ចប់​មិន​ត្រឹមត្រូវ `%.255s' ៖ %s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "វាល `%s' ឈ្មោះ​កញ្ចប់​មិន​ត្រឹមត្រូវ `%.255s' ៖ %s"
@@ -4262,29 +4307,30 @@
 msgstr "កំពុង​លុប​បំបាត់​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​សម្រាប់ %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s ត្រូវការ​អាគុយម៉ង់​ឯកសារ​កញ្ចប់​ជាក់លាក់​មួយ"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr "មិន​អាច​ចូល​ដំណើរការ​ផ្ទៃ​ស្ថានភាព dpkg សម្រាប់​បន្ទុក​​ដែ​លមាន​ការធ្វើឲ្យ​ទាន់សម័យ"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr "បន្ទុក​ដែ​លមាន​ការ​ធ្វើឲ្យ​ទាន់​សម័យ​ត្រូវការ​សិទ្ធិ​ចូល​ដំណើរការ​ទៅ​ផ្ទៃ​ស្ថានភាព​របស់ dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "ជំនួស​ព័ត៌មាន​កញ្ចប់​ដែល​មាន ដោយ​ប្រើ %s ។\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "ធ្វើ​ឲ្យ​ព័ត៌មាន​កញ្ចប់​ដែលមាន​ទាន់​សម័យ ដោយ​ប្រើ %s ។\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4292,7 +4338,7 @@
 msgstr[0] "ព័ត៌មាន​អំពី​កញ្ចប់ %d ត្រូវ​បាន​ធ្វើឲ្យ​ទាន់​សម័យ ។\n"
 msgstr[1] "ព័ត៌មាន​អំពី​កញ្ចប់ %d ត្រូវ​បាន​ធ្វើឲ្យ​ទាន់​សម័យ ។\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4403,8 +4449,8 @@
 msgstr[0] "dpkg-deb ៖ មិន​អើពើ %d ការ​ព្រមាន​អំពី​ឯកសារ​វត្ថុបញ្ជា\n"
 msgstr[1] "dpkg-deb ៖ មិន​អើពើ %d ការ​ព្រមាន​អំពី​ឯកសារ​វត្ថុបញ្ជា\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s ត្រូវការ​អាគុយម៉ង់ <ថត>"
@@ -4436,26 +4482,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb ៖ ការ​ស្ថាបនា​កញ្ចប់ `%s' នៅ​ក្នុង `%s' ។\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត tmpfile (ទិន្នន័យ)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "តំបន់​វត្ថុបញ្ជា​"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "បានបរាជ័យក្នុងការមិនតភ្ជាប់ tmpfile (ទិន្នន័យ) %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4471,20 +4517,20 @@
 msgid "error writing `%s'"
 msgstr "កំហុស​​ក្នុង​ការសរសេរ `%s'"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "រវាង​សមាជិក​"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​សរសេរ​ឈ្មោះ​ឯកសារ​ទៅជា​បំពង់ tar (ទិន្នន័យ)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4502,76 +4548,76 @@
 msgid "error reading %s from file %.255s"
 msgstr "កំហុស​ក្នុង​ការ​អាន %s ពី​ឯកសារ %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​ប័ណ្ណសារ `%.255s'"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "បាន​បរាជ័យ​ទៅ​នឹង​ប័ណ្ណសារ fstat"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "ប័ណ្ណសារ​គ្មាន​សញ្ញា (.) នៅ​ក្នុង​លេខ​កំណែ"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "ប័ណ្ណសារ​គ្មាន​បន្ទាត់​ថ្មី​នៅ​ក្នុង​បឋមកថា"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "ឯកសារ `%.250s' ខូច - លេខ​ផ្នែក​មិនល្អ"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "ឯកសារ `%.250s' មិនមែន​ជា​ប័ណ្ណសារ​គោលពីរ​របស់​ដេបៀន (ព្យាយាម​ការ​បំបែក dpkg ?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "ប័ណ្ណសារ​គ្មាន​សញ្ញា (.) នៅ​ក្នុង​លេខ​កំណែ"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "ប័ណ្ណសារ​គ្មាន​បន្ទាត់​ថ្មី​នៅ​ក្នុង​បឋមកថា"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "ប័ណ្ណសារ​គ្មាន​សញ្ញា (.) នៅ​ក្នុង​លេខ​កំណែ"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "មិន​យល់​កំណែ​ប័ណ្ណសារ %.250s  យក dpkg-deb ថ្មី​ជាង"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "បាន​រំលង​ទិន្នន័យ​សមាជិក​ពី %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "ឯកសារ `%.250s' មាន​សមាជិក​ទិន្នន័យ​ដែល​មិន​យល់ %.*s, បោះបង់"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "ឯកសារ `%.250s' មាន​សមាជិក​វត្ថុ​​បញ្ជា​ពីរ បោះបង់"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4583,23 +4629,23 @@
 " កញ្ចប់ដេបៀនថ្មី កំណែ %s ។\n"
 " ទំហំ %ld បៃ ៖ ប័ណ្ណសារវត្ថុបញ្ជា= %zi bytes ។\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "ប័ណ្ណសារ​​មាន​ប្រវែង​វត្ថុបញ្ជា​ malformatted `%s'"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "បាន​រំលង​ទិន្នន័យ​សមាជិក​ពី %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4611,7 +4657,7 @@
 " កញ្ចប់​ដេបៀន​ចាស់ កំណែ %s ។\n"
 " ទំហំ %ld បៃ ៖ ប័ណ្ណសារ​វត្ថុបញ្ជា= %zi, main archive= %ld ។\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4620,51 +4666,52 @@
 "dpkg-deb ៖ ឯកសារ​មើល​ទៅ អាច​ទុក​វា​ជា​ប័ណ្ណសារ ដែល​ត្រូវ​បាន\n"
 "dpkg-deb:    ធ្វើឲ្យ​ខូច​ដោយ​កំពុង​ទាញយក​ជា​របៀប ASCII\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' មិនមែន​ជា​ប័ណ្ណសារ​ទ្រង់ទ្រាយ​របស់​ដេបៀន"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​សរសេរ​ទៅ​បំពង់​ជា​ការ​ចម្លង"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បិទ​បំពង់ជា​ការ​ចម្លង"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "ទិន្នន័យ"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "បាន​បរាជ័យ chdir ទៅ​ថត"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ថត"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "បាន​បរាជ័យ chdir ទៅ​ថត បន្ទាប់​ពី​បង្កើត​វា"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "បាន​បរាជ័យ chdir ទៅ​ថត"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s ៖ មិន​បង្ហាប់​"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 #, fuzzy
 msgid "paste"
 msgstr "បានហុច\n"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s ត្រូវការ​អាគុយម៉ង់​ឈ្មោះ​ឯកសារ .deb"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4673,37 +4720,37 @@
 "--%s ត្រូវការ​ថត​គោលដៅ​មួយ ។\n"
 "ប្រហែល​ជា​អ្នក​កំពុង​ប្រើ dpkg --install ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s ត្រូវការ​អាគុយម៉ង់​ច្រើន​បំផុត (.deb និង​ថត)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s ត្រូវការ​តែ​អាគុយម៉ង់​តែ​មួយ​ប៉ុណ្ណោះ (ឈ្មោះ​ឯកសារ .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "បាន​បរាជ័យ​ទៅ chdir `/' សម្រាប់​សម្អាត"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
 msgid "control file '%s'"
 msgstr "មិន​អាច​ចាប់​ផ្ដើម​ឈ្មោះ​ចាស់ `%s' ៖ %s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb ៖ `%.255s' គ្មាន​សមាសភាគ​វត្ថុបញ្ជា​ `%.255s'\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr "បើក​សមាសភាគ​`%.255s' (នៅ %.255s)​ បានបរាជ័យ​តាម​វិធី​ដែលមិន​បាន​រំពឹង​ទុក"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, fuzzy, c-format
 #| msgid "One requested control component is missing"
 msgid "%d requested control component is missing"
@@ -4711,59 +4758,59 @@
 msgstr[0] "សមាសភាគ​វត្ថុបញ្ជា​ដែល​បាន​ស្នើ​មួយ​បាន​បាត់"
 msgstr[1] "សមាសភាគ​វត្ថុបញ្ជា​ដែល​បាន​ស្នើ​មួយ​បាន​បាត់"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "មិន​អាច​ស្កេន​ថត `%.255s'"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "មិន​អាច​ចាប់ផ្ដើម `%.255s' (នៅ​ក្នុង `%.255s')"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "មិន​អាច​បើក `%.255s' (នៅ​ក្នុង `%.255s')"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន `%.255s' (នៅ​ក្នុង `%.255s')"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld បៃ %5d បន្ទាត់   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     មិនមែ​នជា​ឯកសារ​អត្ថបទ​ធម្មតា          %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(គ្មាន​ឯកសារ `វត្ថុបញ្ជា' នៅ​ក្នុង​ប័ណ្ណសារ​វត្ថុបញ្ជា !)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "មិន​អាច​បើក​សមាសភាគ `វត្ថុបញ្ជា'"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "បាន​បរាជ័យ​កំឡុង​ពេល​អាន​សមាសភាគ `វត្ថុបញ្ជា'"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "កំហុស​ក្នុង​ការ​បិទ​បំពង់​របស់​ការ​រក"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "កំហុស​ក្នុង​ទ្រង់ទ្រាយ"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents ត្រូវការ​អាគុយម៉ង់​ជាក់លាក់​មួយ"
 
@@ -4773,7 +4820,19 @@
 msgstr "ប័ណ្ណសារ​កញ្ចប់ `%s' របស់​ដេបៀន កំណែ​កម្មវិធី​ខាង​ក្រោយ %s ។\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4784,6 +4843,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4799,7 +4860,7 @@
 "  --fsys-tarfile <deb>             លទ្ធផលប្រព័ន្ធឯកសារ tarfile ។\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4812,11 +4873,12 @@
 "<cfield> គឺជាឈ្មោះរបស់វាលនៅក្នុងឯកសារ `វត្ថុបញ្ជា' មេ ។\n"
 "\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4839,7 +4901,7 @@
 "                                     តម្លៃដែលបានអនុញ្ញាត ៖ gzip, bzip2, គ្មាន ។\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4852,7 +4914,7 @@
 "`dselect' ឬ `aptitude' សម្រាប់​កា​រគ្រប់គ្រង​កញ្ច​ប់ដែល​អ្នក​ប្រើ​ងាយ​ស្រួល​មើល ។  កញ្ចប់\n"
 "មិន​បាន​ពន្លា ដោយ​ប្រើ `dpkg-deb --extract' នឹង​ត្រូវ​បាន​ដំឡើង​មិន​ត្រឹមត្រូវ !\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4860,17 +4922,17 @@
 "វាយ dpkg-deb --help សម្រាប់​ជា​ជំនួយ​អំពី​ការ​គណនា​ឯកសារ *.deb\n"
 "វាយ dpkg --help សម្រាប់​ជា​ជំនួយ​អំពី​ការដំឡើង និង​មិន​ដំឡើង​កញ្ចប់ ។"
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "ចំនួន​គត់​មិន​ត្រឹមត្រូវ​សម្រាប់ --%s: `%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "ចំនួន​គត់​មិន​ត្រឹមត្រូវ​សម្រាប់ --%s: `%.250s'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "មិនស្គាល់​ប្រភេទ​បង្ហាប់ `%s' !"
@@ -4890,7 +4952,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "ឯកសារ `%.250s' ខូច - បាត់​បន្ទាត់​ថ្មី​បន្ទាប់​ពី %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "កំហុស​ក្នុង​ការ​អាន %.250s"
@@ -4978,47 +5040,52 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "ឯកសារ `%.250s' ខូច - លេខ​ផ្នែក​មិនល្អ"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+msgid "package architecture"
+msgstr " (កញ្ចប់ ៖ "
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr "ឯកសារ `%.250s' ខូច - មន្ត​អាគមន​មិនល្អ​នៅចុង​បឋមកថា​ទីពីរ"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "ឯកសារ `%.250s' ខូច - សមាជិក​ទីពីរ​មិនមែន​ជា​សមាជិក​ទិន្នន័យ"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr "ឯកសារ `%.250s' ខូច​ - ខុស​លេខ​នៃ​ទំហំ​ដែល​បានដកស្រង់"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "ឯកសារ `%.250s' ខូច - ខុស​ទំហំ​សម្រាប់លេខ​ផ្នែក​ដែល​បានស្រង់"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "មិន​អាច​ចូល​ទៅ​ឯកសារ​ផ្នែក​របស់ fstat `%.250s'"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "ឯកសារ `%.250s' ខូច - ខ្លីពេក"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ផ្នែក​ប័ណ្ណសារ `%.250s'"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "ឯកសារ `%.250s' មិនមែន​ជា​ផ្នែក​ប័ណ្ណសារ"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5038,6 +5105,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5060,12 +5128,19 @@
 "    ផ្នែកទំហំឯកសារ (ផ្នែកដែលបានប្រើ) ៖  %lu បៃ\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<មិនស្គាល់​>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--info ត្រូវការ​អាគុយម៉ង់​ផ្នែក​ឯកសារ​មួយ ឬ​ច្រើន"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "ឯកសារ `%s' មិនមែន​ជា​ផ្នែក​ប័ណ្ណសារ\n"
@@ -5099,7 +5174,7 @@
 msgid "split package part"
 msgstr "បាត់​កញ្ចប់"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "ធ្វើរួច​\n"
@@ -5151,17 +5226,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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"
 "  --depotdir <directory>           ប្រើ <ថត> ជំនួសឲ្យ %s/%s ។\n"
@@ -5173,20 +5257,29 @@
 "\n"
 "Exit status: 0 = OK;  1 = -a មិនមែនជាផ្នែកមួយទេ  2 = trouble!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "វាយ dpkg-split --help សម្រាប់​ជា​ជំនួយ ។"
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "ចុង​ឯកសារ​ដែល​មិន​រំពឹង​ទុក​នៅ​ក្នុង %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "ផ្នែក​ទំហំ​ធំ​ខ្លាំង​ណាស់ ឬ​មិនមែ​នជា​លេខ​វិជ្ជមាន"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, fuzzy, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "ផ្នែក​ទំហំ​ត្រូវតែ​យ៉ាង​ហោច​ណាស់ %dk (ដើម្បី​អនុញ្ញាត​សម្រាប់​បឋមកថា)"
@@ -5297,42 +5390,42 @@
 msgid "Deleted %s.\n"
 msgstr "បានលុប %s ។\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ប្រភព `%.250s'"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "មិន​អាច​ចូល​ទៅ​ឯកសារ​ប្រភព fstat"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "ឯកសារ​ប្រភព `%.250s' មិនមែន​ជា​ឯកសារ​អត្ថបទ​ធម្មតា"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split ត្រូវការ​អាគុយម៉ង់​ឈ្មោះ​ឯកសារ​ប្រភព"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split ត្រូវការ​បុព្វបទ​ទិសដៅ និង​ឈ្មោះ​ឯកសារ​ប្រភព​យ៉ាង​ហោច​ណាស់​មួយ"
 
@@ -5451,365 +5544,360 @@
 "  --help                   បង្ហាញ​សារ​ជំនួយ​នេះ ។\n"
 "  --version                បង្ហាញ​កំណែ ។\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 #, fuzzy
 #| msgid "parse error"
 msgid "error"
 msgstr "ញែក​កំហុស"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "ការ​ព្រមាន​"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat %s: %s"
-msgstr "មិន​អាច​ចាប់​ផ្ដើម​ឈ្មោះ​ចាស់ `%s' ៖ %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, fuzzy, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "មាន​ពីរ​របៀប​បាន​បញ្ជាក់ ៖ %s និង --%s"
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
 #| msgid "cannot open diversions: %s"
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "មិន​អាច​បើក​ការ​បង្វែរ ៖ %s"
 
-#: utils/update-alternatives.c:395
-#, fuzzy, c-format
-#| msgid "%s: copying %s to %s failed, giving up: %s"
-msgid "scan of %s failed: %s"
-msgstr "%s ៖ ចម្លង %s ទៅ %s បាន​បរាជ័យ បោះបង់ ៖ %s"
-
-#: utils/update-alternatives.c:420
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "មិន​អាច​បង្កើត​តំណ​និមិត្ត​សញ្ញា %s ទៅ %s ៖ %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "មិន​អាច​ដំឡើង %s ជា %s ៖ %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "មិន​អាច​យក %s ៖ %s ចេញ"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "ចុង​ឯកសារ​ដែល​មិន​រំពឹង​នៅ​ក្នុង %s ក្នុង %.255s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "មិន​អាច​អាន %s ៖ %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "ចុង​ឯកសារ​ដែល​មិន​រំពឹង​នៅ​ក្នុង %s ក្នុង %.255s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, fuzzy, c-format
 msgid "%s corrupt: %s"
 msgstr "កំហុស​ខាង​ក្នុង ៖ %s ខូច ៖ %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "បន្ទាត់​ថ្មី​បាន​ហាមឃាត់​ក្នុង​ឯកសារ​ជម្រើស​ធ្វើឲ្យ​ទាន់​សម័យ (%s)"
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "កំហុស​ក្នុង​ការ​សរសេរ stdout ៖ %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "ស្ទួន​កូនចៅ%s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 #, fuzzy
 msgid "slave link"
 msgstr "ស្ទួន​តំណ​កូន​ចៅ %s"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "តំណ​កូនចៅ​ដូច​តំណ​មេ %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "ស្ទួន​តំណ​កូន​ចៅ %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "ស្ទួន​ផ្លូវ %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, fuzzy, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr "ជម្រើសសម្រាប់ %s ចង្អុលទៅ %s - ដែលរកមិនឃើញ ។  យក​ចេញ​ពី​បញ្ជី​របស់​ជម្រើស ។"
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 #, fuzzy
 msgid "priority"
 msgstr "អាទិភាព %s %s"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, fuzzy, c-format
 msgid "priority of %s: %s"
 msgstr "អាទិភាព %s %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "មិន​អាច​អាន %s ៖ %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 #, fuzzy
 msgid "master link"
 msgstr "ស្ទួន​តំណ​កូន​ចៅ %s"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "មិន​អាច​បិទ %s ៖ %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, fuzzy, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "បោះបង់​តំណ​កូន​ចៅ​ដែល​លែង​ប្រើ %s (%s) ។"
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "មិន​អាច​សរសេរ %s ៖ %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, fuzzy, c-format
 msgid "  link currently points to %s"
 msgstr " តំណ​បច្ចុប្បន្ន​ចង្អុល​ទៅ %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 #, fuzzy
 msgid "  link currently absent"
 msgstr " គ្មាន​​តំណ​បច្ចុប្បន្ន"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "%s - priority %s"
 msgid "%s - priority %d"
 msgstr "%s - អាទិភាព %s"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr " កូនចៅ %s ៖ %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "កំណែ `ល្អ​បំផុត' បច្ចុប្បន្ន​គឺ %s ។"
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "គ្មានកំណែ ។"
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "សេចក្តី​ពិពណ៌នា"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 #, fuzzy
 msgid "Priority"
 msgstr "អាទិភាព %s %s"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, fuzzy, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr "សង្កត់​គ្រាប់ចុច បញ្ចូល ដើម្បី​រក្សា​លំនាំដើម[*] ឬ​វាយ​លេខ​ជម្រើស ៖ "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "មិន​អាច​រក​ជម្រើស `%s' ។"
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "ចុង​ឯកសារ​ដែល​មិន​រំពឹង​នៅ​ក្នុង %s ក្នុង %.255s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "ប្ដូរ​ឈ្មោះ​តំណ %s ពី %s ទៅជា %s ។"
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, fuzzy, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "ប្ដូរ​ឈ្មោះ​តំណ​កូនចៅ %s ពី %s ទៅជា %s ។"
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr ""
+
+#: utils/update-alternatives.c:2241
+#, fuzzy, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "ព្រមាន ៖ --update បាន​ផ្ដល់ ប៉ុន្តែ %s មិន​ទាន់​មាន"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "ជម្រើសសម្រាប់ %s ចង្អុលទៅ %s - ដែលរកមិនឃើញ ។  យក​ចេញ​ពី​បញ្ជី​របស់​ជម្រើស ។"
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr ""
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "មិន​ស្គាល់​អាគុយម៉ង់​ `%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install ត្រូវការ <តំណ> <ឈ្មោះ> <ផ្លូវ> <អាទិភាព>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "អាទិភាព​ត្រូវតែ​ជា​ចំនួន​គត់"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s ត្រូវការ <ឈ្មោះ> <ផ្លូវ>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s ត្រូវការ <ឈ្មោះ>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave បាន​អនុញ្ញាត​តែ​ជា​មួយ --install ប៉ុណ្ណោះ"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave ត្រូវការ <តំណ> <ឈ្មោះ> <ផ្លូវ>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "ឈ្មោះ %s គឺ​ទាំង​មេ និង​កូនចៅ"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "តំណ %s គឺ​ទាំង​មេ និង​កូនចៅ"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s ត្រូវការ​អាគុយម៉ង់​តែ​មួយ"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "មិន​​ស្គា​ល់​ជម្រើស​ `%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -5818,67 +5906,23 @@
 "ត្រូវការ --display, --config, --set, --install, --remove, --all, --remove-all "
 "ឬ --auto"
 
-#: utils/update-alternatives.c:2215
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr ""
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2239
-#, fuzzy, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "ព្រមាន ៖ --update បាន​ផ្ដល់ ប៉ុន្តែ %s មិន​ទាន់​មាន"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
-
-#: utils/update-alternatives.c:2257
-#, fuzzy, c-format
-msgid "it is a slave of %s"
-msgstr " កូនចៅ %s ៖ %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "អាន​កំហុស​អំពី​ការ​បញ្ចូល​ជា​ខ្នាតគំរូ"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, fuzzy, c-format
 msgid "no alternatives for %s."
 msgstr "គ្មាន​ជម្រើ​សម្រាប់ %s ។"
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
@@ -5887,69 +5931,109 @@
 "%s ត្រូវ​បាន​ផ្លាស់ប្ដូរ (ដោយ​ដៃ ឬ​ដោយ​ស្គ្រីប) ។\n"
 "ប្ដូរទៅ​ជា​ការ​ធ្វើ​ឲ្យ​ទាន់​សម័យ​ដោយ​ដៃ​តែ​ប៉ុណ្ណោះ ។"
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, fuzzy, c-format
 msgid "setting up automatic selection of %s."
 msgstr "រៀបចំ​ជម្រើស​ស្វ័យប្រវត្តិ​របស់ %s ។"
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "ជម្រើស %s សម្រាប់ %s មិន​បាន​ចុះ​ឈ្មោះ មិន​យក​ចេញ​ទេ"
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 "មាន​តែ​កម្មវិធី​តែ ១ ប៉ុណ្ណោះ​ដែល​ផ្ដល់ %s\n"
 "(%s) ។ គ្មាន​អ្វី​ត្រូវ​កំណត់​រចនាសម្ព័ន្ធ ។\n"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "ជម្រើស %s សម្រាប់ %s មិន​បាន​ចុះ​ឈ្មោះ មិន​យក​ចេញ​ទេ"
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, fuzzy, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr "យក​ជម្រើស​ដែល​បាន​ជ្រើស​ចេញ​ដោយ​ដៃ - ប្ដូរ​ទៅ​ជា​របៀប​ស្វ័យប្រវត្តិ"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "ការ​ធ្វើឲ្យ​ទាន់​សម័យ​ដោយ​ស្វ័យប្រវត្តិ​របស់ %s ត្រូវ​បាន​មិន​អនុញ្ញាត ទុក​វា​ឲ្យ​នៅ​តែឯង ។"
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr "ដើម្បី​ត្រឡ​ប់ទៅ​ការ​ធ្វើ​ឲ្យ​ទាន់​សម័យ​ដោយ​ស្វ័យប្រវត្តិ ប្រើ `ជម្រើស​ធ្វើ​ឲ្យទាន់​សម័យ --auto %s'."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "ការ​ប្រើ `%s' ដើម្បី​ផ្ដល់ `%s' ។"
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~ msgid "it is a slave of %s"
+#~ msgstr " កូនចៅ %s ៖ %s"
+
+#, fuzzy
+#~| msgid "cannot stat old name `%s': %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "មិន​អាច​ចាប់​ផ្ដើម​ឈ្មោះ​ចាស់ `%s' ៖ %s"
+
+#, fuzzy
+#~| msgid "%s: copying %s to %s failed, giving up: %s"
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "%s ៖ ចម្លង %s ទៅ %s បាន​បរាជ័យ បោះបង់ ៖ %s"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "មិន​អាច​បង្កើត​តំណ​និមិត្ត​សញ្ញា %s ទៅ %s ៖ %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "មិន​អាច​ដំឡើង %s ជា %s ៖ %s"
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "កំហុស​ក្នុង​ការ​សរសេរ stdout ៖ %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "មិន​អាច​អាន %s ៖ %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "មិន​អាច​បិទ %s ៖ %s"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "មិន​អាច​សរសេរ %s ៖ %s"
+
+#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "មិន​អាច​ប្ដូរ​ឈ្មោះ %s ទៅ​ជា %s ៖ %s"
@@ -6186,9 +6270,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "បាន​រំលង​ទិន្នន័យ​សមាជិក​ពី %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "បាន​បរាជ័យ​ទៅ exec tar"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ឈ្មោះ​ថត​បណ្ដោះ​អាសន្ន"
Binary files dpkg/po/ko.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/ko.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/ko.po /home/vorlon/devel/multiarch/dpkg-debian/po/ko.po
--- dpkg/po/ko.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/ko.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-09-05 10:11+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -23,7 +23,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "'%s' 파일에 쓸 수 없습니다"
@@ -44,71 +44,77 @@
 msgid "ar member file (%s)"
 msgstr "ar 멤버 파일의 정보를 읽는데 실패했습니다 (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "%s의 버퍼에서 읽는데 실패했습니다"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "%s의 버퍼에 쓰는데 실패했습니다"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "%s의 버퍼에서 다 읽지 못했습니다"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "tar 실행이 실패했습니다"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "%s 프로그램을 실행할 수 없습니다 (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: 압축 풀기"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: 압축"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: 입력을 gzip 스트림에 연결하는데 오류가 발생했습니다"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: 내부 gzip 읽기 오류: '%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: 내부 gzip 쓰기 오류"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: 출력을 gzip 스트림에 연결하는데 오류가 발생했습니다"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: 내부 gzip 읽기 오류"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: 내부 gzip 쓰기 오류: '%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: 내부 gzip 쓰기 오류: %s"
@@ -123,31 +129,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: 내부 bzip2 읽기 오류: '%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: 내부 bzip2 쓰기 오류"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: 출력을 bzip2 스트림에 연결하는데 오류가 발생했습니다"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: 내부 bzip2 읽기 오류"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: 내부 bzip2 쓰기 오류: '%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "예상치 못한 bzip2 오류"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -156,104 +162,104 @@
 "업데이트 디렉터리에 들어 있는 `%.250s' 파일의 이름이 너무 깁니다 (길이=%d, 최"
 "대값=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr "업데이트 디렉터리의 파일의 이름 길이가 서로 다릅니다 (%d 및 %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "업데이트 디렉터리 `%.255s'을(를) 읽을 수 없습니다"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "합병한 업데이트 파일 %.255s을(를) 지우는데 실패했습니다"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "`%.255s'을(를) 만들 수 없습니다"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "채움 문자로 %.250s 파일을 채울 수 없습니다"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "채운 뒤에 %.250s 파일을 플러시할 수 없습니다"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "채운 뒤에 %.250s 파일의 시작으로 이동할 수 없습니다"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "테스트를 위해 %s 잠금 파일을 열 수 없습니다"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "상태 데이터베이스의 잠금 파일의 열기/만들기를 할 수 없습니다"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "dpkg 상태 데이터베이스를 잠글 수 있는 권한이 없습니다"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "dpkg 상태 데이터베이스를 잠글 수 없습니다"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "요청한 작업을 하려면 수퍼유저 권한이 필요합니다"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "dpkg 상태 영역에 접근할 수 없습니다"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "이 작업은 dpkg 상태 영역에 읽기/쓰기 권한이 필요합니다"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "자체 업데이트 파일 %.255s을(를) 지우는데 실패했습니다"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "`%.250s'의 업데이트 상태를 쓸 수 없습니다"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "`%.250s'의 업데이트 상태를 플러시할 수 없습니다"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "`%.250s'의 업데이트 상태를 자를 수 없습니다"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "`%.250s'의 업데이트 상태를 동기화할 수 없습니다"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "`%.250s'의 업데이트 상태를 닫을 수 없습니다"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "`%.250s'의 업데이트 상태를 설치할 수 없습니다"
@@ -276,76 +282,78 @@
 msgid "unable to open directory '%s'"
 msgstr "'%s' 파일을 열 수 없습니다"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "'%s' 파일을 열 수 없습니다"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "'%s' 파일을 동기화할 수 없습니다"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "'%s' 파일을 닫을 수 없습니다"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "`%2$.250s' 파일에 `%1$.50s'에 관한 정보를 쓰는데 실패했습니다"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "%2$s 데이터베이스를 쓰기 위해 `%1$s' 파일을 여는데 실패했습니다"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "%s 데이터베이스 파일에 버퍼링을 설정할 수 없습니다"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr ""
 "'%3$.250s' 파일에 `%2$.50s'에 관한 %1$s 데이터베이스 레코드를 쓰는데 실패했습"
 "니다"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "'%2$.250s' 파일에 %1$s 데이터베이스를 플러시하는데 실패했습니다"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "'%2$.250s' 파일에 %1$s 데이터베이스를 동기화하는데 실패했습니다"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "%2$s 데이터베이스를 쓴 다음에 '%1$.250s' 파일을 닫는데 실패했습니다"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "%3$s 데이터베이스를 백업하기 위해 '%1$.250s' 파일을 '%2$.250s' 파일로 링크하"
 "는데 실패했습니다"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 "%3$s 데이터베이스가 들어 있는 '%1$.250s' 파일을 '%2$.250s' 파일로 설치하는데 "
 "실패했습니다"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -354,7 +362,7 @@
 "%s: 복구 불가능한 치명적 오류, 중지합니다:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -366,13 +374,13 @@
 "%s: 복구 불가능한 치명적 오류, 중지합니다:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "새 클린업 엔트리에 필요한 메모리가 부족합니다"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -381,32 +389,32 @@
 "%s: 정리하는 중에 오류가 발생했습니다:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: 오류를 복구하는 동안에 너무 많은 오류가 발생했습니다!!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "새 클린업 엔트리에 필요한 메모리가 부족합니다"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "인수가 많은 새 클린업 엔트리에 필요한 메모리가 부족합니다"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s: 경고: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: 경고: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: 내부 오류: %s\n"
@@ -422,95 +430,95 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "`%.*s'은(는) %s에 쓸 수 없습니다"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "%s 뒤에 쓰레기 데이터가 있습니다"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "패키지 이름이 잘못되었습니다 (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "파일 상세 필드 `%s'이(가) 비어 있습니다"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "파일 상세 필드 `%s'은(는) 상태 파일에서 쓸 수 없습니다"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "파일 상세 필드 `%s'에 너무 값이 많습니다 (다른 필드에 비해)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "파일 상세 필드 `%s'에 너무 값이 적습니다 (다른 필드에 비해)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "불리언 필드에서는 예/아니오만 가능합니다"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "`priority' 필드에 단어가 있습니다"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "`status' 필드의 값은 이 경우에 쓸 수 없습니다"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "`status' 필드 내에 첫 번째 (요청) 단어가 있습니다"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "`status' 필드 내에 두 번째 (오류) 단어가 있습니다"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "`status' 필드 내에 세 번째 (상태) 단어가 있습니다"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "Version 문자열 '%.250s'에 오류가 발생했습니다"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr ""
 "더 이상 사용하지 않는 `Revision' 이나 `Package-Revision' 필드를 사용했습니다"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "`config-version' 필드 값은 이 경우에 쓸 수 없습니다"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "Config-Version 문자열 `%.250s'에 오류가 있습니다"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "`conffiles'의 값에 잘못된 줄, `%.*s'이(가) 있습니다"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 "`conffiles' 필드의 값에 공백이 아닌 `%c'(으)로 시작하는 줄이 들어 있습니다"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "conffile에 루트 혹은 빈 디렉터리가 들어 있습니다"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -518,12 +526,12 @@
 "`%s' 필드, 패키지 이름이 들어가야 할 곳에 없는 패키지 이름 혹은 쓰레기 문자"
 "가 들어 있습니다."
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "`%s' 필드, 패키지 이름(`%.255s')이 잘못되었습니다: %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -532,7 +540,7 @@
 "`%s' 필드, `%.255s' 참조:\n"
 " 버전 관계(%c%c)가 틀렸습니다"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -541,7 +549,7 @@
 "`%s' 필드, `%.255s' 참조:\n"
 " `%c' 형식은 이제 안 씁니다. 대신에 `%c=' 혹은 `%c%c' 형식을 사용하십시오"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -550,11 +558,11 @@
 "`%s' 필드, `%.255s' 참조:\n"
 " 버전을 정확히 맞추려면 버전만 쓰지 말고 `='을 사용하십시오"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Provides에는 정확한 버전만을 사용할 수 있습니다"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -563,55 +571,55 @@
 "`%s' 필드, `%.255s' 참조:\n"
 " 버전 값이 알파벳이나 숫자로 시작하지 않습니다, 공백을 추가하면 됩니다"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "`%s' 필드, `%.255s' 참조: 버전에 `%c'(이)가 들어 있습니다"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "`%s' 필드, `%.255s' 참조: 버전이 끝나지 않았습니다"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "'%s' 필드, '%.255s' 참조: 버전에 오류가 있습니다"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "`%s' 필드, `%.255s' 패키지 참조 후 구문 오류가 있습니다"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "%s 필드에는 대신할 패키지 표시를 (`|') 쓸 수 없습니다"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "`triggers-pending' 필드 값은 이 경우에 쓸 수 없습니다"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "밀린 트리거 이름(`%.255s')이 잘못되었습니다: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "밀린 트리거 중복 `%.255s'"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "`triggers-awaited' 필드의 값은 이 경우에 쓸 수 없습니다"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "대기 트리거 `%.255s'에서 사용할 수 없는 패키지 이름이 나왔습니다: %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "대기 트리거 중복 `%.255s'"
@@ -668,7 +676,7 @@
 msgid "unable to write to status fd %d"
 msgstr "상태 파일 디스크립터 %d에 쓸 수 없습니다"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "malloc failed (%ld bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -680,8 +688,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc이 실패했습니다 (%ld 바이트)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "메모리를 할당하는데 실패했습니다"
 
@@ -714,198 +722,204 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "%.250s 파일의 \"실행할 때 닫기\" 플래그를 설정할 수 없습니다"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "설정 오류: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "읽기를 위해 '%.255s' 설정 파일을 여는데 실패했습니다: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "'%s'에서 따옴표가 맞지 않습니다"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "알 수 없는 옵션 '%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "'%s' 옵션은 인수가 필요합니다"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "'%s' 옵션은 인수가 없습니다"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "설정 파일 `%.255s'에서 읽기 오류가 발생했습니다"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "설정 파일 `%.255s' 파일을 닫는데 오류가 발생했습니다"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "%s 설정 디렉터리를 닫는데 오류가 발생했습니다"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "알 수 없는 옵션 --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s 옵션은 인수가 필요합니다"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s 옵션은 인수가 없습니다"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "알 수 없는 옵션 -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c 옵션은 인수가 필요합니다"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c 옵션은 인수가 없습니다"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "'--%s' 옵션은 더 이상 사용하지 않습니다\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "-%c(--%s) 명령과 -%c(--%s) 명령은 충돌합니다"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "`%s' 필드의 값이 중복되었습니다"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "사용자 정의 필드 이름 `%.*s'은(는) 너무 짧습니다"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "사용자 정의 필드 `%.*s'의 값이 중복되었습니다"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "적당하지 않은 Status의 패키지에 대한 Configured-Version"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "패키지의 상태가 %s이지만 트리거가 대기하고 있습니다"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "패키지의 상태가 트리거 대기이지만 대기하는 트리거가 하나도 없습니다"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "패키지의 상태가 %s이지만 트리거가 밀려 있습니다"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "패키지의 상태가 트리거 밀림이지만 밀린 트리거가 하나도 없습니다"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "설치되지 않은 상태의 패키지에 설정 파일이 있습니다. 잊어버립니다"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "읽기 작업을 위해 패키지 정보 파일 `%.255s' 파일을 여는데 실패했습니다"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "패키지 정보 파일 `%.255s'의 파일 정보를 읽을 수 없습니다"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "패키지 정보 파일 `%.255s'에 mmap할 수 없습니다"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "패키지 정보 파일 `%.255s'의 파일 정보를 읽을 수 없습니다"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "읽기 후에 닫는데 실패했습니다: `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "필드 이름 `%.*s' 뒤에 파일이 끝났습니다"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "필드 이름 `%.*s'에 줄바꿈 문자가 있습니다"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "필드 이름 `%.*s'에 MSDOS 방식 EOF(^Z)가 있습니다"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "필드 이름 `%.*s' 뒤에는 콜론이 와야 합니다"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "필드 값 `%.*s' 앞에 파일이 끝났습니다 (끝에 줄바꿈 빠짐)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "필드 값 `%.*s'에 MSDOS 방식 EOF 문자가 있습니다 (줄바꿈 빠짐?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "필드 이름 `%.*s'에 줄바꿈 문자가 있습니다"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "필드 값 `%.*s'에 EOF가 있습니다 (끝에 줄바꿈 빠짐)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "패키지 정보 엔트리를 여러 개 발견했습니다. 하나만 쓸 수 있습니다"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "읽기 후에 닫는데 실패했습니다: `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "`%.255s'에 패키지 정보가 없습니다"
@@ -934,62 +948,62 @@
 "%s, '%.255s' 파일 %d번 줄 근처:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "비어있는 문자열이 아닌 것 같습니다"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "알파벳이나 숫자로 시작해야 합니다"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "`%c' 문자는 사용할 수 없습니다(글자, 숫자, 그리고 %s만 쓸 수 있습니다)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<없음>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "버전 문자열이 비어 있습니다"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "버전 문자열 안에 공백이 들어 있습니다"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "버전의 epoch가 숫자가 아닙니다"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "버전 번호에서 콜론 뒤에 아무 것도 없습니다"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "버전 번호에서 쓸 수 없는 문자가 있습니다"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "리비전 번호에서 쓸 수 없는 문자가 있습니다"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "%s 빠졌습니다"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "%s의 값이 비어 있습니다"
@@ -1008,52 +1022,52 @@
 msgid "(no description available)"
 msgstr "(설명 없음)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "%.250s을(를) 실행하기 전 %s 시그널을 무시할 수 없습니다"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "%s 시그널을 잡는데 오류가 발생했습니다: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (하위 프로세스): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "fork가 실패했습니다"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "%s 하위 프로세스가 오류 %d번을 리턴했습니다"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "%s 하위 프로세스를 wait하는데 실패했습니다"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "하위 프로세스 %s이(가) 시그널 (%s)%s에 의해 죽었습니다"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", 메모리 덤프"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "하위 프로세스 %s이(가) 지연 상태 코드 %d을(를) 갖고 실패"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "%s 하위 프로세스를 wait하는데 실패했습니다"
@@ -1074,61 +1088,53 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr "트리거 전환 파일의 (`%.250s') `%s' 문자에 문법 오류가 있습니다%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "트리거 잠금 파일을 (`%.250s') 열거나 만들 수 없습니다"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "트리거"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "트리거가 전환한 파일의 (`%.250s') 정보를 읽을 수 없습니다"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "트리거가 전환한 파일을 (`%.250s') 열 수 없습니다"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "새로 트리거 전환한 파일을 (`%.250s') 열거나 만들 수 없습니다"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "트리거가 전환한 파일을 (`%.250s') 읽는데 오류가 발생했습니다"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "새로 트리거 전환한 파일에 (`%.250s') 쓸 수 없습니다"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "새로 트리거 전환한 파일을 (`%.250s') 닫을 수 없습니다"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "새로 트리거 전환한 파일을 (`%.250s') 설치할 수 없습니다"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "빈 문자열은 트리거 이름으로 사용할 수 없습니다"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "트리거 이름에 쓸 수 없는 문자가 들어 있습니다"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1137,17 +1143,17 @@
 "트리거 이름 `%.250s'에서 문법이 잘못되었거나 알 수 없습니다 (`%.250s' 패키지"
 "의 트리거 관심 파일에서)"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "트리거 관심 목록 파일을 (`%.250s') 열 수 없습니다"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "트리거 관심 파일을 (`%.250s') 되돌리는데 실패했습니다"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1156,37 +1162,43 @@
 "트리거 관심 파일에 (`%.250s') 문법 오류가 있습니다. 잘못된 패키지 이름 (`"
 "%.250s'): %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "새 트리거 관심 파일을 (`%.250s') 만들 수 없습니다"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "새 트리거 관심 파일에 (`%.250s') 쓸 수 없습니다"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "새 트리거 관심 파일을 ('%.250s') 플러시할 수 없습니다"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "새 트리거 관심 파일을 ('%.250s') 동기화할 수 없습니다"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "새 트리거 관심 파일을 (`%.250s') 닫을 수 없습니다"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "새 트리거 관심 파일을 (`%.250s') 설치할 수 없습니다"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "`%.250s'을(를) 지울 수 없습니다"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "새 트리거 관심 파일을 (`%.250s') 만들 수 없습니다"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "새 트리거 관심 파일을 (`%.250s') 닫을 수 없습니다"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1194,47 +1206,47 @@
 "`%.250s' 파일 이름 및 `%.250s' 패키지에 대한 파일 트리거 관심 파일이 중복되었"
 "습니다"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "새 파일 트리거 파일을 (`%.250s') 만들 수 없습니다"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "새 파일 트리거 파일에 (`%.250s') 쓸 수 없습니다"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "새 파일 트리거 파일을 ('%.250s') 플러시할 수 없습니다"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "새 파일 트리거 파일을 ('%.250s') 동기화할 수 없습니다"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "새 파일 트리거 파일을 (`%.250s') 닫을 수 없습니다"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "새 파일 트리거 파일을 (`%.250s') 설치할 수 없습니다"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "새 파일 트리거 파일을 (`%.250s') 읽을 수 없습니다"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "새 파일 트리거 파일에 (`%.250s') 문법 오류가 있습니다"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1243,7 +1255,7 @@
 "파일 트리거 기록의 패키지 이름이 (`%.250s') 잘못되었습니다 (`%.250s' 파일 관"
 "심에서): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1252,30 +1264,38 @@
 "트리거 ci 파일에 (`%.250s') 트리거 문법이 잘못되었습니다 (트리거 이름 `"
 "%.250s'): %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "트리거 ci 파일을 (`%.250s') 열 수 없습니다"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "트리거 ci 파일에 알 수 없는 지시어 문법이 들어 있습니다"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "트리거 ci 파일에 알 수 없는 지시어가 (`%.250s') 들어 있습니다"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "트리거 상태 디렉터리를 (`%.250s') 만들 수 없습니다"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "트리거 상태 디렉터리의 (`%.250s')  소유자를 설정할 수 없습니다"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "빈 문자열은 트리거 이름으로 사용할 수 없습니다"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "트리거 이름에 쓸 수 없는 문자가 들어 있습니다"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1300,7 +1320,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "문자열을 varbuf 변수로 포매팅하는데 오류가 발생했습니다"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "dpkg-deb 파이프에서 읽기 오류가 발생했습니다"
 
@@ -1319,12 +1339,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "`%.255s' 심볼릭 링크의 소유권을 설정하는데 오류가 발생했습니다"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "`%.255s'의 소유권을 설정하는데 오류가 발생했습니다"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "`%.255s'의 권한을 설정하는데 오류가 발생했습니다"
@@ -1381,17 +1401,26 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "아카이브 안의 `%.255s' 오브젝트의 타입이 알 수 없는 0x%x입니다"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "'%s' 파일의 정보를 읽을 수 없습니다"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "과거 패키지 %s의 파일을 대체합니다...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "설치된 패키지 %s의 파일들로 대체합니다...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1400,94 +1429,99 @@
 "디렉터리가 없는 %2$.250s %3$s.250s 패키지의 '%1$.250s' 디렉터리 덮어쓰기를 시"
 "도합니다"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "'%.250s'의 덮어쓰기를 시도합니다. 이 파일은 %.250s %.250s 패키지에도 들어있습"
 "니다"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "`%.255s' 파일을 만들 수 없습니다 (`%.255s' 처리 중)"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "`%.255s' 작업을 하는 동안에 백엔드 dpkg-deb"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "`%.255s'을(를) 닫는데/쓰는데 오류가 발생했습니다"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "`%.255s' 파이프를 만드는데 오류가 발생했습니다"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "`%.255s' 장치를 만드는데 오류가 발생했습니다"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "`%.255s' 하드 링크를 만드는데 오류가 발생했습니다"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "`%.255s' 심볼릭 링크를 만드는데 오류가 발생했습니다"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "`%.255s' 디렉터리를 만드는데 오류가 발생했습니다"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "새 버전을 설치할 때 `%.255s'을(를) 옮겨 놓을 수 없습니다"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "`%.255s' 링크를 읽을 수 없습니다"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "`%.255s'에 대한 백업 심볼릭 링크를 만들 수 없습니다"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "`%.255s'의 백업 심볼릭 링크의 소유자를 바꿀 수 없습니다"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "새 버전을 설치하기 전 `%.255s'의 백업 링크를 만들 수 없습니다"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "`%.255s'의 새 버전을 설치할 수 없습니다"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "'%.255s' 파일을 열 수 없습니다"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "'%.255s' 파일을 동기화할 수 없습니다"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1496,7 +1530,7 @@
 "%s 패키지의 의존성 문제를 무시합니다:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1505,7 +1539,7 @@
 "꼭 필요한 패키지 %s의 설정 해제 고려중\n"
 " (%s 활성화하기 위해)."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1514,7 +1548,7 @@
 "dpkg: 불가, %s 패키지는 꼭 필요하므로 %s 활성화하기 위해 \n"
 "설정 해제하지 않겠음.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1524,17 +1558,17 @@
 "할 수도 있습니다):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "%.250s 삭제"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "`%.255s' 설치"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1542,12 +1576,12 @@
 "dpkg: %2$s 패키지에 의해 망가질 수 있는 %1$s 패키지를 설정을 해제하려 합니"
 "다...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: 네, %s 패키지 설정을 해제합니다. (%s 패키지에 의해 망가졌음.)\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1556,11 +1590,11 @@
 "dpkg: %2$s 패키지가 들어 있는 %1$s 파일 고려:\n"
 "%3$s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "문제 무시, 어쨌든 계속 진행할 수도 있습니다!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1569,31 +1603,31 @@
 "%.250s 설치하시면 %.250s을(를) 망가뜨릴 수 있으며, 설정\n"
 "해제를 할 수도 없습니다(--auto-deconfigure이 도움될 수도 있습니다)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "%.250s 설치하시면 기존 소프트웨어를 망가뜨립니다"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: %s 패키지를 지우고 %s 패키지를 설치하려 합니다...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s은(는) 올바르게 설치되지 않았습니다 - 패키지에 대한 모든 의존관계 무시합니"
 "다.\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: %s 패키지를 지울 때 문제가 있을 수 있습니다. 이 패키지가 %s을(를) 제공"
 "하기 때문입니다 ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1601,110 +1635,112 @@
 msgstr ""
 "dpkg: %s 패키지는 다시 설치해야 합니다. 하지만 어쨌든 요청한 대로 지웁니다.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: %s 패키지는 다시 설치해야 합니다.  지우지 않습니다.\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: 네, %s 패키지는 지우고 %s 패키지를 설치합니다.\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "패키지 충돌 - %.250s 패키지를 설치하지 않습니다"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "충돌 무시, 어쨌든 계속 진행할 수도 있습니다!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive 옵션은 적어도 하나의 경로 인수가 필요합니다"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "dpkg --recursive를 위해 find 실행"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "find의 파이프를 fdopen하는데 실패했습니다"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "find의 파이프를 읽는데 오류가 발생했습니다"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "find의 파이프를 닫는데 오류가 발생했습니다"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 "--recursive를 위한 find 프로그램이 처리할 수 없는 오류(%i)를 리턴했습니다"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "패키지를 찾을 수 없습니다 (*.deb과 일치하는 파일들)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s 옵션은 적어도 하나의 패키지 아카이브 파일 인수가 필요합니다."
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<표준 출력>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<표준 오류>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "전에 선택하지 않은 %s 패키지를 선택합니다.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "선택하지 않은 %s 패키지는 넘어갑니다.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr ""
 "%2$.250s 패키지의 %1$.250s 버전이 이미 설치되어 있습니다. 넘어갑니다.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%.250s 패키지를 %.250s 버전에서 %.250s 버전으로 다운그레이드."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "%.250s 패키지를 %.250s 버전에서 %.250s 버전으로 다운그레이드하지 않습니다.  "
 "건너 뜁니다.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1713,37 +1749,37 @@
 "백업 복사본을 다시 설치하기 위해 `%.250s'의 새로 설치된 버전을 지울 수 없습니"
 "다."
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "`%.250s'의 백업 버전을 복구할 수 없습니다"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "'%.250s'의 백업 복사본을 제거할 수 없습니다"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "`%.250s'의 새로 푼 버전을 지울 수 없습니다"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "`%.250s'의 새로 푼 버전을 지울 수 없습니다"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "새로운 배포 설정 파일, `%.250s' 파일의 정보를 읽을 수 없습니다"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "현재 설치된 설정 파일, `%.250s' 파일의 정보를 읽을 수 없습니다"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1754,58 +1790,58 @@
 "`%s' 설정 파일은 시스템에 없습니다.\n"
 "요청한대로 새로운 설정 파일을 설치합니다.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: 이전 백업 '%.250s' 파일을 지우는데 실패했습니다: %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: '%.250s' 파일을 '%.250s' 파일로 이름 바꾸는데 실패했습니다: %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: '%.250s' 파일을 제거하는데 실패했습니다: %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: 오래된 배포 버전 '%.250s'을(를) 지우는데 실패했습니다: %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: '%.250s' 파일을 제거하는데 실패했습니다 (덮어쓰기 전): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: '%.250s' 파일을 '%.250s'에 연결하는데 실패했습니다: %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "새 버전의 설정 파일 %s 설치하는 중입니다 ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "`%.250s' 파일을 `%.250s' 파일로 설치할 수 없습니다"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr ""
 "`%s'(이)라는 이름의 패키지는 설치되어 있지 않습니다. 설정할 수 없습니다."
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "%.250s 패키지는 이미 설치되어 설정되어 있습니다"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1814,7 +1850,7 @@
 "%.250s 패키지는 설정 준비가 되어 있지 않습니다\n"
 " 설정할 수 없습니다. (현재 상태 : `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1823,11 +1859,11 @@
 "dpkg: 의존성 문제로 %s을(를) 설정할 수 없습니다:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "의존성 문제 - 설정하지 않고 남겨둠"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1836,7 +1872,7 @@
 "dpkg: %s: 의존성 문제, 하지만 요청한 대로 어쨌든 설정합니다:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1844,12 +1880,12 @@
 "패키지가 매우 안 좋은 불일치 상태에 빠져 있습니다 -\n"
 " 설정을 시도하기 전에 패키지를 다시 설치하십시오."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "%s (%s) 설정하는 중입니다 ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1858,7 +1894,7 @@
 "%s: 설정 파일 '%s' 파일의 (= '%s') 정보를 읽을 수\n"
 " 없습니다: %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1867,7 +1903,7 @@
 "%s: 설정 파일 '%s' 파일은 (= '%s') 순환\n"
 " 링크입니다"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1876,7 +1912,7 @@
 "%s: 설정 파일 '%s'에 (= '%s') 대해 readlink할 수\n"
 " 없습니다: %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1885,34 +1921,34 @@
 "%s: 설정 파일 '%.250s'의 파일 이름이 괴상하게 됩니다\n"
 " ('%s'은(는) '%s'에 대한 심볼릭 링크입니다)"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: 설정 파일 '%.250s'은(는) (= '%s') 일반 파일이나 심볼릭 링크가 아닙니다"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: 해쉬를 위한 설정 파일 %s을(를) 열 수 없습니다: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "다 끝나면 `exit'를 입력하십시오.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1921,12 +1957,12 @@
 "\n"
 "설정 파일 `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (실제로는 `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1937,7 +1973,7 @@
 " ==> 시스템에 있는 파일은 수동으로 만들었거나 스크립트가 만들었습니다.\n"
 " ==> 패키지 안에도 관리자가 제공하는 그 파일이 있습니다.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1946,7 +1982,7 @@
 "\n"
 "     설치 후 수정되지 않았습니다.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1955,7 +1991,7 @@
 "\n"
 " ==> 설치 후 수정되었습니다. (수동으로 혹은 스크립트 때문에)\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1964,37 +2000,37 @@
 "\n"
 " ==> 설치 후 지웠습니다. (수동으로 혹은 스크립트 때문에)\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> 패키지 배포자가 업데이트한 버전을 넣었습니다.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     패키지 안에 있는 버전이 지난번 설치한 것과 같습니다.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> 요청한 대로 새로운 파일을 사용합니다.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> 요청한 대로 현재의 기존 파일을 사용합니다.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> 기본값으로 기존 설정 파일을 유지합니다.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> 기본값으로 새로운 설정 파일을 사용합니다.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2009,157 +2045,159 @@
 "       D     : 버전 간의 차이점을 표시합니다\n"
 "       Z     : 프로세스를 백그라운드로 하고 상황을 알아봅니다\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr "기본값으로 현재 버전을 그대로 유지합니다.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr "기본값으로 새로운 버전을 설치합니다.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[기본값=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[기본값=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[기본값 없음]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "표준 오류에 쓰는데 오류, 설정 파일 프롬프트 전에 발생했습니다"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "설정 파일 프롬프트에서 표준입력에 읽기 오류가 발생했습니다"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "설정 파일 프롬프트에서 표준 입력에 파일이 끝났습니다"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s 패키지는 %s 패키지에 의존함"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s 패키지는 %s 패키지에 미리 의존함"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s 패키지는 %s 패키지 설치를 추천함"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s 패키지는 %s 패키지 설치를 제안"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s 패키지는 %s 패키지를 망가뜨림"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s 패키지는 %s 패키지와 충돌함"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s 패키지는 %s 패키지를 개선함"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s 패키지는 지울 예정입니다.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s 패키지는 설정 해제할 예정입니다.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr " %.250s 패키지는 설치할 예정이지만, 버전이 %.250s입니다.\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr " %.250s 패키지는 설치되었지만, 버전이 %.250s입니다.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s 패키지는 풀려있지만, 설정된 적이 없습니다.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s 패키지는 풀려있지만, 버전이 %.250s입니다.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s 패키지의 최근 설정된 버전은 %.250s입니다.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s 패키지는 %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s 패키지는 %.250s을(를) 제공하지만 지울 예정입니다.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s 패키지는 %.250s을(를) 제공하지만 설정 해제할 예정입니다.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s 패키지는 %.250s을(를) 제공하지만 %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s 패키지는 설치하지 않았습니다.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s 패키지(버전 %.250s)를 설치할 예정입니다.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s 패키지(버전 %.250s)가 있고 %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s 패키지는 %.250s을(를) 제공하며 설치할 예정입니다.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s 패키지는 %.250s을(를) 제공하며 %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "쿼리 프로그램에 대한 도움말은 --help 옵션을 사용하십시오."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2167,7 +2205,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "데비안 %s 버전 %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2178,8 +2216,8 @@
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 "Copyright (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2189,7 +2227,7 @@
 "자유 소프트웨어입니다. 복사 조건에 관해서는 GNU General Public License\n"
 "version 2 이후를 보십시오. 어떤 보증도 하지 않습니다.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2199,7 +2237,7 @@
 "사용법: %s [<옵션> ...] <명령>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2218,7 +2256,7 @@
 "  --truename <파일>       전환된 파일을 표시합니다.\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2247,7 +2285,7 @@
 "  --help                  이 도움말 메시지를 표시합니다.\n"
 "  --version               버전을 표시합니다.\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2260,17 +2298,12 @@
 "일치해야 합니다. 패키지의 preinst, postrm 스크립트는 언제나 --package와\n"
 "--divert 옵션을 지정하는 것이 좋습니다.\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "'%s' 파일의 정보를 읽을 수 없습니다"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "'%s' 검사하는데 오류가 발생했습니다"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2279,129 +2312,129 @@
 "rename은 '%s'을(를) 다른 파일 '%s'(으)로 \n"
 "  덮어씌우는 작업이므로 허용하지 않습니다"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "'%s' 파일에 쓸 수 없습니다"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "파일 복사"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "'%s' 파일의 이름을 '%s'(으)로 바꿀 수 없습니다"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "rename: 중복된 예전 링크 '%s' 지웁니다"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "`%.250s' 소스 파일을 열 수 없습니다"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "%s의 로컬 전환"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "%s의 %s(으)로 로컬 전환"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "%s의 전환, %s 패키지"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "%s의 %s(으)로 전환, %s 패키지"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "%s의 모든 전환"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "%s의 %s(으)로 모든 전환"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "새 %s 파일을 만들 수 없습니다"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "'%s' 파일을 플러시할 수 없습니다"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "오래된 diversions-old를 제거하는데 오류가 발생했습니다"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "새로운 statoverride-old를 만드는데 오류가 발생했습니다"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "새로운 statoverride를 설치하는데 오류가 발생했습니다"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s 옵션은 인수를 하나만 받습니다"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "\"%s\" 파일의 이름은 절대적이지 않습니다"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "파일에 줄바꿈이 있으면 안 됩니다"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "디렉터리를 전환할 수는 없습니다"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "'%s' 파일을 해당 파일로 전환할 수는 없습니다"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "'%s'에서 나갑니다\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "'%s'은(는) %s와(과) 충돌합니다"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "'%s' 추가하는 중\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "'%s' 전환 파일이 없으므로 아무것도 안 지웠습니다.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2412,7 +2445,7 @@
 "  '%s' 지우던 도중\n"
 "  '%s' 발견"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2423,16 +2456,16 @@
 "  '%s' 지우는 중\n"
 "  '%s' 발견"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "'%s' 지우는 중\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "패키지에 줄바꿈이 있으면 안 됩니다"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "<전환할파일>에는 줄바꿈이 있으면 안 됩니다"
 
@@ -2515,8 +2548,8 @@
 "수 있습니다. (혹은 dpkg --trigger-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s 옵션은 인수를 받지 않습니다"
@@ -2606,7 +2639,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions 옵션에 관계가 잘못되었습니다"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "버전 '%s'의 형식이 잘못되었습니다: %s"
@@ -2660,12 +2693,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "--force 옵션이 켜져 있으므로 문제를 무시합니다:"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "`%.250s' 패키지에 대한 파일 목록을 열 수 없습니다"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2674,68 +2707,68 @@
 "`%.250s' 패키지의 파일 목록 파일이 없습니다, 패키지에 설치된 파일이 하나도 없"
 "다고 가정합니다."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "'%.250s' 패키지의 파일 목록 파일의 정보를 읽을 수 없습니다"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "`%.250s' 패키지의 파일 목록"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "`%.250s' 패키지의 파일 목록에 빈 파일 이름이 있습니다"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "`%.250s' 패키지의 파일 목록 파일을 닫는데 오류가 발생했습니다."
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(데이터베이스 읽는중 ..."
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "현재 %d개의 파일과 디렉터리가 설치되어 있습니다.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "%s 패키지의 업데이트한 파일 목록 파일을 만들 수 없습니다"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "%s 패키지의 업데이트한 파일 목록 파일을 쓸 수 없습니다"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "%s 패키지의 업데이트한 파일 목록 파일을 플러시할 수 없습니다"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "%s 패키지의 업데이트한 파일 목록 파일을 동기화할 수 없습니다"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "%s 패키지의 업데이트한 파일 목록 파일을 닫을 수 없습니다"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "%s 패키지의 업데이트한 파일 목록 파일을 설치할 수 없습니다"
@@ -2773,7 +2806,9 @@
 msgstr "설치함"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "오류: PATH를 설정하지 않았습니다."
 
 #: src/help.c:129
@@ -2813,7 +2848,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2825,66 +2860,66 @@
 msgstr "`%.250s'(으)로 chroot가 실패했습니다"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "`%.255s' 디렉터리로 이동하는데 실패했습니다"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "`%.250s'에 실행 권한을 설정할 수 없습니다"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "메인테이너 스크립트에서 환경 변수를 설정할 수 없습니다"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "설치한 %s 스크립트"
 
 # FIXME: bad msgid
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "%s `%.250s'의 정보를 읽을 수 없습니다"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "새로운 %s 스크립트"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "과거의 %s 스크립트"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "%s '%.250s'의 정보를 읽을 수 없습니다: %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - 대신에 새 패키지의 스크립트를 시도합니다 ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "패키지 새 버전에 스크립트가 없습니다 - 포기합니다"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... 문제 없는 것처럼 보입니다.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "'%.255s'을(를) 안전하게 제거할 수 없습니다"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2893,7 +2928,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "`%.250s' 파일이 있는 지 여부를 검사할 수 없습니다"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "정보 디렉터리를 읽을 수 없습니다"
 
@@ -2966,7 +3001,7 @@
 "  -Dh|--debug=help                 디버깅에 관한 도움말을 표시합니다.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3090,7 +3125,7 @@
 "사용자 친화적인 패키지 관리를 위해서는 'dselect'나 'aptitude'을 사용하십시"
 "오.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3140,30 +3175,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3172,103 +3211,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "의존성 문제 - 지우지 않습니다"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "의존성 문제 - 지우지 않습니다"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "메인테이너 스크립트에서 환경 변수를 설정할 수 없습니다"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "설정 파일 `%.255s'에서 읽기 오류가 발생했습니다"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3276,7 +3315,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3284,41 +3323,41 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug 옵션에는 8진수 인수가 필요합니다"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "--ignore-depends 옵션의 (쉼표로 구분한) 목록에 (`%.250s') 패키지 이름이 없습"
 "니다"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends 옵션에는 올바른 패키지 이름이 필요합니다. `%.250s' 패키지는 "
 "올바르지 않습니다: %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s 옵션에 숫자가 잘못되었습니다: `%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "훅 프로그램 '%s'의 실행에 오류가 발생했습니다. 종료 코드 %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "상태"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3327,7 +3366,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3335,12 +3374,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "알 수 없는 force/refuse 옵션 `%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "'%s' force/refuse 옵션은 더 이상 사용하지 않습니다\n"
@@ -3364,8 +3403,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "%d번째 줄이 끝나기 전에 예상치 못하게 파일이 끝났습니다"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "명령 옵션이 필요합니다"
 
@@ -3528,91 +3567,91 @@
 msgid "passed\n"
 msgstr "통과\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "임시 디렉터리를 만들 수 없습니다"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "%s 패키지의 충돌/대체 목록이 지나치게 깁니다"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "패키지의 과거 버전에 들어 있는 정보 파일의 이름이 (`%.250s'(으)로 시작) 너무 "
 "깁니다."
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "과거 정보 파일 `%.250s' 파일을 지울 수 없습니다"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "새 (예상) 정보 파일 `%.250s' 파일을 설치할 수 없습니다"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "임시 컨트롤 디렉터리를 열 수 없습니다"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "패키지에 들어 있는 정보 파일의 이름이 (`%.250s'(으)로 시작) 너무 깁니다."
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "패키지 컨트롤 정보에 `%.250s' 디렉터리가 들어 있습니다"
 
 # FIXME: bad msgid -- jargon (NOTADIR)
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "패키지 컨트롤 정보 `%.250s'의 rmdir에서 디렉터리가 아니라는 결과가 나오지 않"
 "았습니다"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "%s 패키지는 정보 파일로 목록이 들어 있습니다"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "새 정보 파일 `%.250s'을(를) `%.250s'(으)로 설치할 수 없습니다"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "컨트롤 정보 파일 `%.250s' 파일을 지울 수 없습니다"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "아카이브에 접근할 수 없습니다"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "임시 디렉터리를 만들 수 없습니다"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "컨트롤 정보 길이"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "%2$s에서 %1$s에 관한 정보를 기록합니다.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "패키지의 아키텍처(%s)는 시스템(%s)과 맞지 않습니다."
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3622,99 +3661,99 @@
 "다:\n"
 "%3$s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "미리 의존 문제 - %.250s 패키지를 설치할 수 없습니다"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "미리 의존 문제를 무시합니다!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "%s %s 패키지를 대체할 준비하는 중입니다 (%s 사용) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "%s 패키지를 푸는 중입니다 (%s에서) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "설정 파일의 이름(`%.250s'(으)로 시작)이 너무 깁니다 (> %d 문자)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "%.250s에서 읽기 오류가 발생했습니다"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "%.250s을(를) 닫기 오류가 발생했습니다"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "%.250s을(를) 열기 시도하는데 오류가 발생했습니다"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "%2$s을(를) 지우기 위해 %1$s을(를) 설정 해제하는 중입니다 ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "%s 패키지를 지우는 중입니다 ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "대체되는 %.250s 패키지를 푸는 중입니다 ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "dpkg-deb 필드 값을 빼 내기"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "dpkg-deb tar 출력을 읽는데 오류가 발생했습니다"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "망가진 파일 시스템 tar 파일 - 망가진 패키지 아카이브"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: 뒤에 나오는 0을 잘라 버립니다"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "오래된 파일 '%.250s'의 정보를 읽을 수 없으므로 지우지 않습니다: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "오래된 디렉터리 '%.250s'을(를) 지울 수 없습니다: %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr "오래된 설정 파일 '%.250s'은(는) 빈 디렉터리였으며 이제 지워졌습니다"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "새로운 파일 `%.250s'의 정보를 읽을 수 없습니다"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3722,12 +3761,12 @@
 msgstr ""
 "오래된 파일 `%.250s'은(는) 새로운 파일과 같습니다! (%.250s와 %.250s 모두)"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "오래된 '%.250s' 파일을 안전하게 지울 수 없습니다: %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
@@ -3908,7 +3947,7 @@
 "  --admindir=<디렉터리>            %s 대신에 <디렉터리> 사용합니다.\n"
 "  -f|--showformat=<형식>           --show에서 다른 형식을 사용합니다.\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3931,6 +3970,10 @@
 "면 \n"
 "  왼쪽으로 정렬합니다.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "쿼리 프로그램에 대한 도움말은 --help 옵션을 사용하십시오."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3989,7 +4032,7 @@
 msgid "Removing %s ...\n"
 msgstr "%s 패키지를 지우는 중입니다 ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3998,49 +4041,50 @@
 "%.250s 패키지를 지우는 데, '%.250s' 디렉터리를 지울 수 없습니다: %s - 디렉터"
 "리가 마운트 포인트입니까?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "`%.250s'을(를) 지울 수 없습니다"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "'%.255s'을(를) 안전하게 지울 수 없습니다"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "%.250s 패키지를 지우는 중, '%.250s' 디렉터리는 비어있지 않아서 지우지 않습니"
 "다."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "`%.250s'을(를) 지울 수 없습니다"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "%s의 설정 파일을 깨끗이 지우는 중입니다 ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "과거의 설정 파일 `%.250s' (= `%.250s') 파일을 지울 수 없습니다"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "설정 파일 디렉터리 `%.250s' 디렉터리를 읽을 수 없습니다 (`%.250s'에서)"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "오래된 백업 설정 파일 `%.250s' 파일을 지울 수 없습니다 (`%.250s'의 백업)"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "오래된 파일 목록을 지울 수 없습니다"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "오래된 postrm 스크립트를 지울 수 없습니다"
 
@@ -4083,7 +4127,13 @@
 msgid "read error on standard input"
 msgstr "표준 입력을 읽는데 오류가 발생했습니다"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "쿼리 프로그램에 대한 도움말은 --help 옵션을 사용하십시오."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4092,7 +4142,7 @@
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4110,7 +4160,7 @@
 "다.\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4130,31 +4180,31 @@
 "  --help                   이 도움말 메시지를 표시합니다.\n"
 "  --version                버전을 표시합니다.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "맨 끝에 있는 /를 지웁니다"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "새 statoverride 파일을 열 수 없습니다"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "statoverride-old를 지우는데 오류가 발생했습니다"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "새 statoverride-old 만드는데 오류가 발생했습니다"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "새 statoverride를 설치하는데 오류가 발생했습니다"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add 옵션은 인수가 4개 필요합니다"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4163,21 +4213,21 @@
 "'%s'을(를) 위한 override가 이미 있지만, --force 옵션을 사용했으므로 무시합니"
 "다."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "\"%s\"을(를) 위한 override가 이미 있음. 중지."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "--update 옵션을 사용했지만 %s이(가) 없습니다"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "override가 없습니다."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--remove 명령에서는 --update 옵션이 무의미합니다"
 
@@ -4242,16 +4292,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "'%.250s' 파일에 대한 statusoverrides 파일이 여러 개 있습니다"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "이 프로그램의 도움말을 보려면 dpkg-trigger --help를 실행하십시오."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "데비안 %s 패키지 트리거 프로그램 버전 %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4262,7 +4312,7 @@
 "        %s [<옵션> ...] <명령>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4275,7 +4325,7 @@
 "                                   검사합니다.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4297,21 +4347,21 @@
 "다.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: 트리거 데이터 디렉터리를 아직 만들지 않았습니다\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: 트리거 기록이 아직 없습니다\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "한 개의 인자를 받습니다 (트리거 이름)"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4321,13 +4371,13 @@
 "dpkg-trigger는 메인테이너 스크립트에서 실행해야 합니다 (아니면 --by-package "
 "옵션을 사용해야 합니다)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: 대기중인 패키지 이름이 (`%.250s') 잘못되었습니다: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "트리거 이름이 ('%.250s') 잘못되었습니다: %.250s"
@@ -4360,36 +4410,37 @@
 msgstr "%s에 대한 트리거를 처리하는 중입니다 ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s 옵션은 정확히 하나의 Packages 파일 인수만을 받습니다"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr "사용 가능 목록을 업데이트하려는데 dpkg 상태 영역에 접근할 수 없습니다"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "사용 가능 목록을 업데이트하려면 dpkg 상태 영역에 쓰기 권한이 있어야 합니다"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "%s을(를) 사용하여 이용가능한 패키지 정보를 대체하는 중입니다.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "%s을(를) 사용하여 이용가능한 패키지 정보를 업데이트하는 중입니다.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "%d개의 패키지에 대한 정보가 업데이트되었습니다.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4504,8 +4555,8 @@
 msgid_plural "ignoring %d warnings about the control file(s)\n"
 msgstr[0] "컨트롤 파일과 관련된 %d개 경고를 무시합니다\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s 옵션은 <디렉터리> 인수가 필요합니다"
@@ -4537,26 +4588,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: `%s' 패키지 빌드하는 중입니다 (`%s'에서).\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "임시 파일을 만드는데 실패했습니다 (데이터)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control"
 msgid "control member"
 msgstr "컨트롤"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "임시 파일을 지우는데 실패했습니다 (데이터), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4573,20 +4624,20 @@
 msgid "error writing `%s'"
 msgstr "`%s' 파일을 쓰는데 오류가 발생했습니다"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "멤버"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "파일 이름을 tar 파이프에 쓰는데 실패했습니다 (데이터)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "tar -cf에서 압축"
 
@@ -4604,81 +4655,81 @@
 msgid "error reading %s from file %.255s"
 msgstr "%2$.255s에서 %1$s 읽기에 오류가 발생했습니다"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "`%.255s' 아카이브를 읽는데 실패했습니다"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "아카이브 파일의 정보를 읽는데 실패했습니다"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "아카이브의 버전 번호에 점이 없습니다"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "아카이브의 헤더에 줄바꿈이 없습니다"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "`%.250s' 파일이 손상되었습니다 - 구성 요소 번호가 잘못되었습니다"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "`%.250s' 파일은 데비안 바이너리 아카이브가 아닙니다 (dpkg-split을 시도해 보십"
 "시오?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "아카이브의 버전 번호에 점이 없습니다"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "아카이브의 헤더에 줄바꿈이 없습니다"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "아카이브의 버전 번호에 점이 없습니다"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "아카이브의 %.250s 버전 형식을 알지 못합니다. 더 최신의 dpkg-deb을 이용하십시"
 "오"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "%s에서 멤버 데이터를 건너 뜁니다"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
 "`%.250s' 파일에 이해할 수 없는 데이터 멤버(%.*s)가 있습니다. 포기합니다"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "`%.250s' 파일에 두 개의 컨트롤 멤버가 있습니다. 포기합니다"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4690,23 +4741,23 @@
 " 새 데비안 패키지, 버전 %s.\n"
 " 크기 %ld바이트: 컨트롤 아카이브= %zi바이트\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "아카이브의 컨트롤 길이 `%s'의 형식이 틀렸습니다"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "%s에서 멤버 데이터를 건너 뜁니다"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4718,7 +4769,7 @@
 " 옛날 데비안 패키지, 버전 %s.\n"
 " 크기 %ld바이트: 컨트롤 아카이브= %zi, 주 아카이브= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4727,49 +4778,50 @@
 "dpkg-deb: 파일이 마치 ASCII 모드로 다운로드하는 과정에서\n"
 "dpkg-deb:    손상된 아카이브로 보입니다\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s'은(는) 데비안 형식의 아카이브가 아닙니다"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "복사할 때 파이프에 쓰는데 실패했습니다"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "복사할 때 파이프를 닫는데 실패했습니다"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "데이터"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "디렉터리로 이동하는데 실패했습니다"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "디렉터리를 만드는데 실패했습니다"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "디렉터리를 만든 다음에 거기로 이동하는데 실패했습니다"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "디렉터리로 이동하는데 실패했습니다"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<압축 풀기>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "붙여넣기"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s 옵션에는 .deb 파일 이름 인수가 필요합니다"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4778,96 +4830,96 @@
 "--%s 옵션에는 대상 디렉터리가 필요합니다.\n"
 "혹시 dpkg --install을 하려고 했던 것 아닙니까?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s 옵션에는 최대 두 개의 인수를 받습니다 (.deb 및 디렉터리)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s 옵션에는 오직 한 개의 인수만 받습니다 (.deb 파일 이름)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "정리를 위해 `/'로 이동하는데 실패했습니다"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "'%s' 파일의 정보를 읽을 수 없습니다"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: `%.255s' 안에 컨트롤 컴포넌트 `%.255s'이(가) 없습니다\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "`%.255s' 컴포넌트를 (%.255s 안에) 여는데 예상치 못한 방법으로 실패했습니다"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "요청한 %d개의 컨트롤 컴포넌트가 없습니다"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "`%.255s' 디렉터리를 읽을 수 없습니다"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "`%.255s' 파일의 정보를 읽을 수 없습니다 (`%.255s'에서)"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "`%.255s' 파일을 열 수 없습니다 (`%.255s'에서)"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "`%.255s' 파일을 읽을 수 없습니다 (`%.255s'에서)"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld바이트, %5d줄      %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     일반 파일이 아닙니다      %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(컨트롤 아카이브에 `control' 파일이 없습니다!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "`control' 컴포넌트를 열 수 없습니다"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "`control' 컴포넌트를 읽는데 실패했습니다"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "'%s' 컴포넌트를 닫는데 오류가 발생했습니다"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "형식에 오류가 있습니다"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents 옵션은 한 개의 인수만 받습니다"
 
@@ -4877,7 +4929,19 @@
 msgstr "데비안 '%s' 패키지 아카이브 백엔드 버전 %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4888,6 +4952,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4902,7 +4968,7 @@
 "  -X|--vextract <deb> <디렉터리>   파일을 뽑아 내고 목록을 표시합니다.\n"
 "  --fsys-tarfile <deb>             파일 시스템 tar 파일을 출력합니다.\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4914,11 +4980,27 @@
 "<파일>은 관리 파일 구성 요소의 이름입니다.\n"
 "<필드>는 `control' 파일에 있는 필드의 이름입니다.\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4944,7 +5026,7 @@
 "none.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4958,7 +5040,7 @@
 "사용하기 편한 'dselect'나 'aptitude' 패키지 관리자를 사용하십시오.\n"
 "'dpkg-deb --extract'로 압축을 푼 패키지는 제대로 설치되지 않습니다!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4966,17 +5048,17 @@
 "*.deb 파일 조작에 관한 도움말을 보려면 dpkg-deb --help를 실행하십시오.\n"
 "패키지 설치와 설치 해제에 관한 도움말을 보려면 dpkg --help를 실행하십시오."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "-%c 옵션에 숫자가 잘못되었습니다: '%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "-%c 옵션에 압축 단계가 잘못되었습니다: %ld"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "알 수 없는 압축 종류 `%s'!"
@@ -4998,7 +5080,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "`%.250s' 파일이 손상되었습니다 - %.250s 다음에 줄바꿈이 없습니다"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "%.250s 파일을 읽는데 오류가 발생했습니다"
@@ -5094,51 +5176,57 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "`%.250s' 파일이 손상되었습니다 - 구성 요소 번호가 잘못되었습니다"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "패키지 이름"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "`%.250s' 파일이 손상되었습니다 - 두 번째 헤더의 끝에 매직이 잘못되었습니다"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "`%.250s' 파일이 손상되었습니다 - 두 번째 멤버가 데이터 멤버가 아닙니다"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "`%.250s' 파일이 손상되었습니다 - 지정한 크기에 대해 구성 요소 개수가 틀렸습니"
 "다"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "`%.250s' 파일이 손상되었습니다 - 지정한 번호의 구성 요소의 크기가 틀렸습니다"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "구성 요소 파일 `%.250s'의 정보를 읽을 수 없습니다"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "`%.250s' 파일이 손상되었습니다 - 너무 짧습니다"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "아카이브 구성 요소 `%.250s' 파일을 열 수 없습니다"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "`%.250s' 파일이 아카이브 구성 요소가 아닙니다"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5158,6 +5246,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5180,12 +5269,19 @@
 "    구성 파일 크기 (사용 공간):     %lu바이트\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<알수없음>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s 옵션에는 한 개 이상의 구성 파일 인수가 필요합니다"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "`%s' 파일은 아카이브 구성 요소가 아닙니다\n"
@@ -5219,7 +5315,7 @@
 msgid "split package part"
 msgstr "%2$d개 구성 요소에서 %1$s 패키지 만들기:"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "완료\n"
@@ -5271,17 +5367,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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"
 "  --depotdir <디렉터리>            %s/%s 대신에 <디렉터리>를 사용합니다.\n"
@@ -5293,20 +5398,29 @@
 "\n"
 "종료상태: 0 = OK. 1 = -a 부분이 아님. 2 = 문제 발생!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "도움말을 보려면 dpkg-split --help를 실행하십시오."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "%.250s 파일에서 예상치 못하게 파일이 끝났습니다"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "구성 요소의 크기가 너무 크거나 0보다 큰 수가 아닙니다"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -5420,27 +5534,27 @@
 msgid "Deleted %s.\n"
 msgstr "%s 지웠습니다.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "dpkg-deb 필드 값을 빼 내기"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "`%.250s' 소스 파일을 열 수 없습니다"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "소스 파일의 정보를 열 수 없습니다"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "`%.250s' 소스 파일이 일반 파일이 아닙니다"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5448,17 +5562,17 @@
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] "%2$d개 구성 요소에서 %1$s 패키지 만들기:"
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split 옵션에는 소스 파일 이름 인수가 필요합니다"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split 옵션에는 소스 파일 이름과 대상 접두어만 쓸 수 있습니다"
 
@@ -5625,125 +5739,90 @@
 "  --help                   이 도움말 메시지를 표시합니다.\n"
 "  --version                버전을 표시합니다.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "오류"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "경고"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "'%s'의 정보를 읽을 수 없습니다 : %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "readlink(%s) 실패: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "두 가지 명령이 지정되었습니다: --%s 및 --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "%s 파일에 붙일 수 없습니다: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "%s 검사가 실패했습니다: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "%s 실행이 실패했습니다: %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "%s을(를) %s에 대한 심볼릭 링크로 만들 수 없습니다: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "%s 파일을 %s 파일로 설치할 수 없습니다: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "%s을(를) 지울 수 없습니다: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "%s 파일을 읽는 중 예상치 못하게 파일이 끝났습니다"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "%s 파일을 읽는 중: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "%s 파일을 읽는 중 줄이 끝났습니다"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s 망가졌습니다: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives 파일(%s)에는 줄바꿈이 금지되어 있습니다."
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "%s 파일에 쓰는 중: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "슬레이브 이름"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "중복된 슬레이브 %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "슬레이브 링크"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "슬레이브 링크가 %s 메인 링크와 같습니다"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "중복된 슬레이브 링크 %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "마스터 파일"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "중복된 경로 %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5752,226 +5831,266 @@
 "%s 대체 항목이 (링크 그룹 %s의 구성 요소) 없습니다. 대체 항목의 목록에서 지웁"
 "니다."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "우선순위"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "슬레이브 파일"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "%s의 우선순위: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "%s을(를) 읽을 수 없습니다: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "상태"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "잘못된 상태"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "마스터 링크"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "%s 닫을 수 없습니다: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "사용 중지한 %s 슬레이브 링크 없애는 중 (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "%s에 쓸 수 없습니다: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "자동 모드"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "수동 모드"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr " 링크가 현재 %s 가리킴"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr " 링크가 현재 없음"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - 우선순위 %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  슬레이브 %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "현재 가장 '좋은' 버전은 '%s'입니다."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "버전 없음."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "대체 항목 %2$s에 대해 (%3$s 제공) %1$d개 선택이 있습니다."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "선택"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "경로"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "우선순위"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "상태"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "기본 사항[*]을 사용하려면 엔터, 다른 것을 사용하려면 번호를 입력하십시오: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "%s 파일을 링크로 바꾸지 않습니다."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "알 수 없는 %s 선택을 설치하지 않습니다"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr "%s 만들기를 건너 뜁니다. 관련 %s 파일이 (링크 그룹 %s 소속) 없습니다."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "%s 파일을 링크로 바꾸지 않습니다."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "%s 호출."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "%s 대체 항목을 바꾸지 않습니다. %s 선택이 없습니다."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "알 수 없는 %s 대체 항목을 건너 뜁니다."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "%s 파일을 읽는 중 줄이 너무 길거나 줄이 끝나지 않았습니다"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "잘못된 줄을 건너 뜁니다: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "%s 링크를 %s에서 %s으(로) 이름을 바꿉니다."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "%s 슬레이브 링크를 %s에서 %s(으)로 이름을 바꿉니다."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "대체 이름(%s)은 '/'나 공백이 들어가면 안 됩니다."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "대체 항목 링크는 절대 경로여야 하지만 아닙니다: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "대체 항목 경로가 절대 경로여야 하지만 아닙니다: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "%s 대체 항목은 마스터가 될 수 없습니다: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "대체 항목 %s 링크는 이미 %s에서 관리합니다."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "대체 항목 경로 %s이(가) 없습니다."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "%s 대체 파일은 %s의 슬레이브가 될 수 없습니다: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "%s 대체 항목은 마스터가 될 수 없습니다: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "대체 항목 %s 링크는 이미 %s에서 관리합니다."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "알 수 없는 인수 '%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install은 <링크> <이름> <경로> <우선순위>가 필요합니다."
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<link>와 <path>는 같을 수 없습니다"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "priority는 정수여야 합니다"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s 옵션은 <이름> <경로>가 필요합니다."
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s 옵션은 <이름>이 필요합니다."
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave는 --install와 함께 사용해야 합니다"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave는 <링크> <이름> <경로>가 필요합니다."
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "%s 이름은 프라이머리와 슬레이브 둘 다입니다"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "%s 링크는 프라이머리와 슬레이브 둘 다입니다"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s 옵션은 <파일> 인수를 받습니다"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "알 수 없는 옵션 '%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -5980,67 +6099,22 @@
 "selections, --install, --remove, --all, --remove-all, --auto  옵션 중 하나가 "
 "필요합니다"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "%s 대체 항목은 마스터가 될 수 없습니다: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "대체 항목 %s 링크는 이미 %s에서 관리합니다."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "대체 항목 링크는 절대 경로여야 하지만 아닙니다: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "대체 항목 경로가 절대 경로여야 하지만 아닙니다: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "대체 항목 경로 %s이(가) 없습니다."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "대체 이름(%s)은 '/'나 공백이 들어가면 안 됩니다."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "마스터 대체 파일입니다."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "%s의 슬레이브입니다"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "%s 대체 파일은 %s의 슬레이브가 될 수 없습니다: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<표준 입력>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "%s의 대체 항목이 없습니다."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s이(가) 아무 것도 가리키지 않습니다. 적당히 선택되어 바뀝니다."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6052,48 +6126,48 @@
 "%s 변경되었습니다 (수동으로 직접, 혹은 스크립트로). 수동 업데이트만 사용하기"
 "로 변경합니다."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "%s의 자동 선택을 설정하는 중입니다."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "%2$s의 대체 항목 %1$s 등록되지 않았으므로 설정하지 않습니다."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "%s 제공하는 프로그램이 없습니다."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "설정할 것이 없습니다."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "%s 링크 그룹에는 한 개 대체 항목만 있습니다: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "%2$s의 대체 항목 %1$s 등록되지 않았으므로 지우지 않습니다."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "수동으로 선택한 대체 항목을 지우는 중 - %s을(를) 자동 모드로 변경합니다"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "%s의 자동 업데이트가 중지되었으므로 가만히 둡니다."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6101,25 +6175,61 @@
 "다시 자동 업데이트를 하려면 `update-alternatives --auto %s' 명령을 사용하십시"
 "오."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "%1$s 사용해서 %4$s에서 %2$s (%3$s) 제공."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 "대체 항목 %s을(를) 강제로 다시 설치합니다. %s 링크 그룹이 망가졌습니다."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "현재 대체 항목 %1$s은(는) 알 수 없습니다. %3$s 링크 그룹의 %2$s(으)로 전환합"
 "니다."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "마스터 대체 파일입니다."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "%s의 슬레이브입니다"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "'%s'의 정보를 읽을 수 없습니다 : %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "readlink(%s) 실패: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "%s 검사가 실패했습니다: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "%s 실행이 실패했습니다: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "%s을(를) %s에 대한 심볼릭 링크로 만들 수 없습니다: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "%s 파일을 %s 파일로 설치할 수 없습니다: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "%s 파일에 쓰는 중: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "%s을(를) 읽을 수 없습니다: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "%s 닫을 수 없습니다: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "%s에 쓸 수 없습니다: %s"
+
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6401,9 +6511,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "%s에서 컨트롤 영역을 건너 뜁니다"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "tar 실행이 실패했습니다"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "임시 디렉터리를 만드는데 실패했습니다"
 
Binary files dpkg/po/ku.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/ku.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/ku.po /home/vorlon/devel/multiarch/dpkg-debian/po/ku.po
--- dpkg/po/ku.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/ku.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2007-04-07 13:50+0100\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"
@@ -23,7 +23,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "%s nayê xebitandin"
@@ -43,71 +43,76 @@
 msgid "ar member file (%s)"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+msgid "failed to seek %s"
+msgstr "%s nayê xebitandin"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "%s nayê xebitandin"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr ""
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr ""
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: çewtiya hundirî ya gzip: `%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: çewtiya hundirî ya gzip: `%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: çewtiya hundirî ya gzip: `%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: çewtiya hundirî ya gzip: `%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: çewtiya hundirî ya gzip: `%s'"
@@ -122,135 +127,135 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: çewtiya hundirî ya bzip2: `%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: çewtiya hundirî ya bzip2: `%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: çewtiya hundirî ya bzip2: `%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: çewtiya hundirî ya bzip2: `%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
 "max=%d)"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "tmpfile bo vsnpritif nayê vekirin"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "nikarî danegeha rewşa dpkg biqifilîne"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr ""
@@ -270,118 +275,120 @@
 msgid "unable to open directory '%s'"
 msgstr "%s nayê xebitandin"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "%s nayê xebitandin"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "%s nayê xebitandin"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "%s nayê xebitandin"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr ""
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr ""
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "%s a `%%.255s' serneket"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "%s a `%%.255s' serneket"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "%s a `%%.255s' serneket"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr ""
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 msgid "out of memory for new error context"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, c-format
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr "hişyarî"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr "hişyarî"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s: çewtiya hundirî ya gzip: `%s'"
@@ -396,185 +403,185 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "navê pakêtê yê nederbasdar (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr ""
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr ""
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error reading %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "di xwendina %.250s de çewtî"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr ""
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "Pelên veavakirina %s bi tevahî tên rakirin ...\n"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr ""
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " bad version relationship %c%c"
 msgstr ""
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " `%c' is obsolete, use `%c=' or `%c%c' instead"
 msgstr ""
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " implicit exact match on version number, suggest using `=' instead"
 msgstr ""
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr ""
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr ""
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr ""
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr ""
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr ""
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr ""
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr ""
@@ -629,7 +636,7 @@
 msgid "unable to write to status fd %d"
 msgstr "Venagere serê vsnprintfê"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 msgid "malloc failed (%zu bytes)"
 msgstr "(tevî %lu bayt)\n"
@@ -639,8 +646,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "(tevî %lu bayt)\n"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 #, fuzzy
 msgid "failed to allocate memory"
 msgstr "afirandina peldankê biserneket"
@@ -674,200 +681,205 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr ""
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr ""
 "\n"
 "Pelê mîhengan ê `%s'"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr ""
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "Pelên veavakirina %s bi tevahî tên rakirin ...\n"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr ""
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr ""
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr ""
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr ""
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr ""
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr ""
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr ""
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr ""
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid " package `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr " pakêta `%.255s'"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr ""
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr ""
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
 #, c-format
-msgid "EOF during value of field `%.*s' (missing final newline)"
+msgid "blank line in value of field '%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:434
-msgid "several package info entries found, only one allowed"
+#: lib/dpkg/parse.c:461
+#, c-format
+msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
+#: lib/dpkg/parse.c:546
+msgid "several package info entries found, only one allowed"
 msgstr ""
 
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr ""
@@ -886,61 +898,61 @@
 " %.255s"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 msgid "must start with an alphanumeric character"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<tune>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 msgid "invalid character in version number"
 msgstr "hejmare versiyonê"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr ""
@@ -959,51 +971,51 @@
 msgid "(no description available)"
 msgstr "(rave ne amade ye)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr ""
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr ""
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr ""
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, fuzzy, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "dpkg: hişyarî - %s rewşa derketina bi çewtiyê %d vegerand\n"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, c-format
 msgid "subprocess %s was interrupted"
 msgstr ""
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "binpêvajoya %s bi sînyala (%s)%s kuşt"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ""
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr ""
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr ""
@@ -1023,197 +1035,203 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 msgid "triggers area"
 msgstr "nikarî danegeha rewşa dpkg biqifilîne"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, fuzzy, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "di xwendina %.250s de çewtî"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, fuzzy, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr ""
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "`%.250s' nayê rakirin"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr ""
+
+#: lib/dpkg/triglib.c:383
 #, fuzzy, c-format
-msgid "unable to install new trigger interest file `%.250s'"
+msgid "unable to close new trigger interest file `%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, fuzzy, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, fuzzy, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, fuzzy, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "afirandina peldankê biserneket"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, fuzzy, c-format
 msgid "read error in `%.250s'"
@@ -1238,7 +1256,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr ""
 
@@ -1257,12 +1275,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr ""
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr ""
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr ""
@@ -1313,109 +1331,123 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr ""
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+msgid "cannot stat file '%s'"
+msgstr "di xwendina %s de çewtî"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr ""
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr ""
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
 "nondirectory"
 msgstr ""
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr ""
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr ""
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr ""
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr ""
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr ""
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr ""
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr ""
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr ""
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr ""
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "afirandina peldankê biserneket"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "afirandina peldankê biserneket"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1424,87 +1456,87 @@
 "dpkg: pirsgirêkên bindestiyê rakirina %s asteng dikin:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
 " package %s, to enable %s."
 msgstr ""
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable %s.\n"
 msgstr ""
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, fuzzy, c-format
 msgid "removal of %.250s"
 msgstr "pelê `%.250s' nayê rakirin"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr ""
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, fuzzy, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: `%s' jî tê veavakirin (`%s' vê dixwaze)\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr ""
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr ""
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1513,143 +1545,145 @@
 "dpkg: %s: pirsgirêkên girêdayîbûnê, lê ser daxwaza te tê rakirin:\n"
 "%s"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr ""
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr ""
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr ""
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr ""
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr ""
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr ""
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr ""
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr ""
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Pakêta %s ku berê nehatiye hilbijartin tê hilbijartin.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Pakêta %s ku nehatiye hilbijartin tê derbaskirin.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Guhartoya %.250s a %.250s sazkirî ye, tê derbaskirin.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s - hişyarî: %.205s ji %.205s tê nizimkirin û dibe %.205s.\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "%.205s ji guhartoya %.205s ber bi %.205s nizm nabe, tê derbaskirin.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
 "of backup copy"
 msgstr ""
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr ""
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "%s a `%%.255s' serneket"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr ""
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr ""
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1657,64 +1691,64 @@
 "Installing new config file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s a `%%.255s' serneket"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s a `%%.255s' serneket"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s a `%%.255s' serneket"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s a `%%.255s' serneket"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "versiyona nû ya pelê mîhengan ê %s tê sazkirin ... \n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr ""
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr ""
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
 " cannot configure (current status `%.250s')"
 msgstr ""
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1723,11 +1757,11 @@
 "dpkg: pirsgirêkên girêdanbûnê ji bo veavakirina %s asteng in:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "pirsgirêkên girêdanbûnê - bê veavakirinê dimîne"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1737,72 +1771,72 @@
 "mîhengkirin:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
 msgstr ""
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "%s (%s) tê veavakirin ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
 " (= '%s'): %s"
 msgstr ""
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
 " (= '%s')"
 msgstr ""
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
 " (= '%s'): %s"
 msgstr ""
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
 " ('%s' is a symlink to '%s')"
 msgstr ""
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "tmpfile bo vsnpritif nayê vekirin"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Dema xelas kir `exit' binivîse\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1811,12 +1845,12 @@
 "\n"
 "Pelê mîhengan ê `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (niha `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1827,7 +1861,7 @@
 " ==> Pelê pergala tê ku ji aliyê tê an skrîptekê hatiye afirandin.\n"
 " ==> Pel di pakêtê ji aliyê kesê miqate tê belavkirin de jî heye.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1836,7 +1870,7 @@
 "\n"
 "     Ji dema sazkirinê ve nehatiye guherandin.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1845,7 +1879,7 @@
 "\n"
 " Ji dema sazkirinê ve (ji aliyê te an skrîpekê) hatiye guherandin.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1854,37 +1888,37 @@
 "\n"
 " ==> Piştî sazkirinê hat jêbirin, ji aliyê te skrîptekê.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Kesê miqate versiyoneke rojanekirî belav kir.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Ferq nav versiyona di pakêtê û versiyona sazkirî ya dawî tune.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Pelê nû tê bikaranî wekî tê xwest.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Pelê aniha yê kevn tê bikaranîn wekî tê xwest.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Pelê config ê kevn wekî standard tê parastin.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Pelê config ê nû wekî standard tê bikaranîn.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1899,157 +1933,157 @@
 "      D : cudahiyên nav guhartoyan nîşan bide\n"
 "      Z : vê pêvajoyê bişîne paş ji bo lêkolînên din\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Çalakiya standard parastina guhartoya aniha ye.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Çalakiya standard sazkirina guhartoya nû ye.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[standard=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[standard=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[standard tune]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr ""
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr ""
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, fuzzy, c-format
 msgid "%s depends on %s"
 msgstr "jê giredayî ye"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, fuzzy, c-format
 msgid "%s pre-depends on %s"
 msgstr "jê pês-girêdayî ye"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, fuzzy, c-format
 msgid "%s recommends %s"
 msgstr "tawsiye dike"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, fuzzy, c-format
 msgid "%s suggests %s"
 msgstr " pêşniyar dike "
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, fuzzy, c-format
 msgid "%s breaks %s"
 msgstr "dişikîne"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, fuzzy, c-format
 msgid "%s conflicts with %s"
 msgstr " di nakokî de ye bi "
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, fuzzy, c-format
 msgid "%s enhances %s"
 msgstr " baştir dike "
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s dê were rakirin.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  sazkirina %.250s pêwist e, lê guhartoya %.250s e.\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s sazkirî ye, lê guhartoya %.250s e.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s hatiye derxistin, lê qet nehatiye veavakirin.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s hatiye derxistin, lê guhartoya %.250s e.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s e. guhartoya dawî ya veavakirî %.250s e.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr ""
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr ""
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr ""
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr ""
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr ""
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr ""
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr ""
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+msgid "Use --help for help about diverting files."
 msgstr ""
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2057,7 +2091,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s guhartoya %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2065,8 +2099,8 @@
 "Copyright (C) 2010 Guillem Jover.\n"
 msgstr ""
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2074,7 +2108,7 @@
 "later for copying conditions. There is NO warranty.\n"
 msgstr ""
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2082,7 +2116,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2094,7 +2128,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2112,7 +2146,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2121,151 +2155,146 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-msgid "cannot stat file '%s'"
-msgstr "di xwendina %s de çewtî"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 msgid "error checking '%s'"
 msgstr "di xwendina %.250s de çewtî"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "%s nayê xebitandin"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "di xwendina %s de çewtî"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr ""
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 msgid "unable to remove copied source file '%s'"
 msgstr "%s nayê xebitandin"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr ""
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 #| msgid "  Version of %s on system is %s.\n"
 msgid "local diversion of %s to %s"
 msgstr "  Guhartoya %s di pergalê de %s e.\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "  Version of %s on system is %s.\n"
 msgid "diversion of %s by %s"
 msgstr "  Guhartoya %s di pergalê de %s e.\n"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 #| msgid "  Version of %s on system is %s.\n"
 msgid "diversion of %s to %s by %s"
 msgstr "  Guhartoya %s di pergalê de %s e.\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "Debian %s version %s.\n"
 msgid "any diversion of %s"
 msgstr "Debian %s guhartoya %s.\n"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 #| msgid "  Version of %s on system is %s.\n"
 msgid "any diversion of %s to %s"
 msgstr "  Guhartoya %s di pergalê de %s e.\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 msgid "cannot create new %s file"
 msgstr "di xwendina %s de çewtî"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "%s nayê xebitandin"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr ""
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr ""
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr ""
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr ""
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr ""
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr ""
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr ""
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "pelê `%.250s' nayê rakirin"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "`%s' tê berdan"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "`%s' tê lêzêdekirin"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr ""
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2273,7 +2302,7 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2281,17 +2310,17 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "`%s' tê rakirin"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr ""
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr ""
 
@@ -2355,8 +2384,8 @@
 msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr ""
@@ -2440,7 +2469,7 @@
 msgid "--compare-versions bad relation"
 msgstr ""
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr ""
@@ -2486,48 +2515,48 @@
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
 "currently installed."
 msgstr ""
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 msgid "reading files list for package '%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Danegeh tê xwendin ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2535,32 +2564,32 @@
 msgstr[0] "%d pel û peldank niha sazkirî ne.)\n"
 msgstr[1] "%d pel û peldank niha sazkirî ne.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2598,7 +2627,7 @@
 msgstr "sazkirî"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr ""
 
 #: src/help.c:129
@@ -2627,7 +2656,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "tmpfile bo vsnpritif nayê vekirin"
@@ -2638,66 +2667,66 @@
 msgstr ""
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr ""
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "tmpfile bo vsnpritif nayê vekirin"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "sazkirî"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr ""
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr ""
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr ""
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr ""
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr ""
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ...\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "afirandina peldankê biserneket"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2706,7 +2735,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "afirandina peldankê biserneket"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "peldanka agahiyê nayê xwendin"
 
@@ -2746,7 +2775,7 @@
 "\n"
 msgstr ""
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -2826,7 +2855,7 @@
 msgstr ""
 "Ji bo rêvebiriya pakêtan a hesantir `dselect' an `aptitude' bi kar bîne.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -2867,30 +2896,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -2899,100 +2932,100 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "pirsgirêkên bindestiyê - nayê rakirin"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "pirsgirêkên bindestiyê - nayê rakirin"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "tmpfile bo vsnpritif nayê vekirin"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 msgid "Output for each configuration file"
 msgstr ""
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3000,7 +3033,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3008,35 +3041,35 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr ""
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3045,7 +3078,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3053,12 +3086,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr ""
@@ -3081,8 +3114,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr ""
 
@@ -3238,196 +3271,196 @@
 msgid "passed\n"
 msgstr ""
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "afirandina peldankê biserneket"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr ""
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr ""
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr ""
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr ""
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "arşîv nayê gihîştin"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "afirandina peldankê biserneket"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 msgid "package control information extraction"
 msgstr ""
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr ""
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr ""
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
 "%s"
 msgstr ""
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr ""
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr ""
 "dpkg: pirsgirêkên bindestiyê rakirina %s asteng dikin:\n"
 "%s"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr ""
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "%s tê derxistin (ji %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr ""
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr ""
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr ""
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr ""
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, fuzzy, c-format
 msgid "De-configuring %s ...\n"
 msgstr "%s tê rakirin ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Yêdeka %.250s tê derxistin ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr ""
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr ""
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "afirandina peldankê biserneket"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
 "'%.250s')"
 msgstr ""
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
@@ -3573,7 +3606,7 @@
 "\n"
 msgstr ""
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3587,6 +3620,10 @@
 "  case left alignment will be used.\n"
 msgstr ""
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3641,55 +3678,56 @@
 msgid "Removing %s ...\n"
 msgstr "%s tê rakirin ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
 "may be a mount point?"
 msgstr ""
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "`%.250s' nayê rakirin"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "dpkg - hişyarî: dema %.250s hat rakirin, peldanka `%.250s' ne vala bû û ji "
 "ber wê nehat rakirin.\n"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "`%.250s' nayê rakirin"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Pelên veavakirina %s bi tevahî tên rakirin ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr ""
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr ""
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr ""
 
@@ -3732,14 +3770,18 @@
 msgid "read error on standard input"
 msgstr ""
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 msgstr ""
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -3750,7 +3792,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -3763,52 +3805,52 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr ""
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr ""
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr ""
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr ""
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr ""
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr ""
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr ""
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr ""
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr ""
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr ""
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr ""
 
@@ -3872,16 +3914,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debian %s guhartoya %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -3889,7 +3931,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -3898,7 +3940,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -3912,30 +3954,30 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr ""
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "navê pakêtê yê nederbasdar (%.250s)"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "navê pakêtê yê nederbasdar (%.250s)"
@@ -3965,35 +4007,35 @@
 
 #: src/update.c:52
 #, c-format
-msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr ""
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr ""
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr ""
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4104,8 +4146,8 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
@@ -4137,24 +4179,24 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: pakêt `%s' di `%s' de tê avakirin.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 msgid "failed to make temporary file (%s)"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control"
 msgid "control member"
 msgstr "kontrol"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 msgid "failed to rewind temporary file (%s)"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
@@ -4169,18 +4211,18 @@
 msgid "error writing `%s'"
 msgstr ""
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 msgid "data member"
 msgstr "hejmare versiyonê"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4198,238 +4240,239 @@
 msgid "error reading %s from file %.255s"
 msgstr ""
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 msgid "archive magic version number"
 msgstr "hejmare versiyonê"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 msgid "archive member header"
 msgstr ""
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, c-format
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr ""
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 msgid "archive information header member"
 msgstr ""
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr ""
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr ""
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, c-format
 msgid "skipped archive member data from %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, c-format
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, c-format
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
 " size %jd bytes: control archive= %jd bytes.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, c-format
 msgid "archive has malformatted control member size '%s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, c-format
 msgid "skipped archive control member data from %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
 " size %jd bytes: control archive= %jd, main archive= %jd.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, 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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "dane"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr ""
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "afirandina peldankê biserneket"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr ""
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr ""
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr ""
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr ""
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr ""
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
 "Perhaps you should be using dpkg --install ?"
 msgstr ""
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr ""
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr ""
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr ""
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 msgid "control file '%s'"
 msgstr "di xwendina %s de çewtî"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr ""
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, c-format
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr ""
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "di xwendina %.250s de çewtî"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Di formatê de çewtî"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr ""
 
@@ -4450,11 +4493,13 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4463,11 +4508,12 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4480,7 +4526,7 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4489,23 +4535,23 @@
 "unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
 msgstr ""
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "navê pakêtê yê nederbasdar (%.250s)"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr ""
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr ""
@@ -4525,7 +4571,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr ""
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "di xwendina %.250s de çewtî"
@@ -4611,53 +4657,59 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr ""
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+msgid "package architecture"
+msgstr " (pakêt: "
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr ""
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr ""
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -4668,12 +4720,19 @@
 "\n"
 msgstr ""
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<nayê zanîn>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr ""
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr ""
@@ -4707,7 +4766,7 @@
 msgid "split package part"
 msgstr "pakêta kêm"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "temam\n"
@@ -4756,28 +4815,36 @@
 "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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr ""
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr ""
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr ""
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -4888,42 +4955,42 @@
 msgid "Deleted %s.\n"
 msgstr "%s hatiye jêbirin.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr ""
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr ""
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr ""
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr ""
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 
@@ -4991,482 +5058,444 @@
 "  --version                show the version.\n"
 msgstr ""
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr ""
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "hişyarî"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-msgid "cannot stat %s: %s"
-msgstr "di xwendina %s de çewtî"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr ""
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "di xwendina %s de çewtî"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:420
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-msgid "failed to execute %s: %s"
+msgid "unable to remove '%s'"
 msgstr "%s nayê xebitandin"
 
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "di xwendina %s de çewtî"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, c-format
 msgid "duplicate slave name %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr ""
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr ""
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
-#, c-format
-msgid "priority of %s: %s"
-msgstr ""
-
 #: utils/update-alternatives.c:1244
 #, c-format
-msgid "unable to read %s: %s"
+msgid "priority of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr ""
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-msgid "cannot write %s: %s"
-msgstr "di xwendina %s de çewtî"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr ""
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr ""
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Debian %s guhartoya %s.\n"
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr ""
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "Rave"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "%s tê derxistin (ji %s) ...\n"
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
 #, c-format
-msgid "unknown argument `%s'"
+msgid "alternative name (%s) must not contain '/' and spaces."
 msgstr ""
 
-#: utils/update-alternatives.c:2063
-msgid "--install needs <link> <name> <path> <priority>"
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
-msgid "<link> and <path> can't be the same"
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
-msgid "priority must be an integer"
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
 #, c-format
-msgid "--%s needs <name> <path>"
+msgid "alternative link %s is already managed by %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2241
 #, c-format
-msgid "--%s needs <name>"
+msgid "alternative path %s doesn't exist."
 msgstr ""
 
-#: utils/update-alternatives.c:2108
-msgid "--slave only allowed with --install"
+#: utils/update-alternatives.c:2254
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
 msgstr ""
 
-#: utils/update-alternatives.c:2110
-msgid "--slave needs <link> <name> <path>"
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2278
 #, c-format
-msgid "name %s is both primary and slave"
+msgid "alternative link %s is already managed by %s (slave of %s)."
 msgstr ""
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2324
 #, c-format
-msgid "link %s is both primary and slave"
+msgid "unknown argument `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2142
-#, c-format
-msgid "--%s needs a <file> argument"
+#: utils/update-alternatives.c:2343
+msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: utils/update-alternatives.c:2168
-#, c-format
-msgid "unknown option `%s'"
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
+msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2173
-msgid ""
-"need --display, --query, --list, --get-selections, --config, --set, --set-"
-"selections, --install, --remove, --all, --remove-all or --auto"
+#: utils/update-alternatives.c:2349
+msgid "priority must be an integer"
 msgstr ""
 
-#: utils/update-alternatives.c:2215
+#: utils/update-alternatives.c:2362
 #, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
+msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
+#: utils/update-alternatives.c:2376
 #, c-format
-msgid "alternative link %s is already managed by %s."
+msgid "--%s needs <name>"
 msgstr ""
 
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
+#: utils/update-alternatives.c:2388
+msgid "--slave only allowed with --install"
 msgstr ""
 
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
+#: utils/update-alternatives.c:2390
+msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2239
+#: utils/update-alternatives.c:2399
 #, c-format
-msgid "alternative path %s doesn't exist."
+msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
+#: utils/update-alternatives.c:2402
 #, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
+msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
+#: utils/update-alternatives.c:2422
+#, c-format
+msgid "--%s needs a <file> argument"
 msgstr ""
 
-#: utils/update-alternatives.c:2257
+#: utils/update-alternatives.c:2448
 #, c-format
-msgid "it is a slave of %s"
+msgid "unknown option `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
+#: utils/update-alternatives.c:2453
+msgid ""
+"need --display, --query, --list, --get-selections, --config, --set, --set-"
+"selections, --install, --remove, --all, --remove-all or --auto"
 msgstr ""
 
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr ""
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
 "updates only."
 msgstr ""
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr ""
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr "  Pakêta %s ya ku %s tîne hê nehatiye veavakirin.\n"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr ""
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "di xwendina %s de çewtî"
+
+#, fuzzy
+#~ msgid "cannot write %s: %s"
+#~ msgstr "di xwendina %s de çewtî"
+
+#, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "%s nayê xebitandin"
 
Binary files dpkg/po/lt.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/lt.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/lt.po /home/vorlon/devel/multiarch/dpkg-debian/po/lt.po
--- dpkg/po/lt.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/lt.po	2012-06-07 10:11:09.426073000 -0700
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2008-08-02 01:08-0400\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -23,7 +23,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "nepavyko užverti %s: %s"
@@ -43,71 +43,77 @@
 msgid "ar member file (%s)"
 msgstr "nepavyko sukurti laikino failo (duomenys)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "klaida vykdant buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "klaida vykdant buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "per mažai duomenų vykdant buffer_copy (%s)"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "nepavyko įvykdyti tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "nepavyksta įvykdyti %s"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: išspaudimas"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: suspaudimas"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: vidinė gzip klaida: `%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: vidinė gzip klaida: `%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: vidinė gzip klaida: `%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: vidinė gzip klaida: `%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: vidinė gzip klaida: `%s'"
@@ -122,31 +128,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: vidinė bzip2 klaida: `%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: vidinė bzip2 klaida: `%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: vidinė bzip2 klaida: `%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: vidinė bzip2 klaida: `%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -155,106 +161,106 @@
 "atnaujinimų aplanke yra failas `%.250s' per ilgu pavadinimu (ilgis=%d, "
 "maksimaliai=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 "atnaujinimų aplanke yra failai su skirtingų ilgių pavadinimais (abu %d ir %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "nepavyksta patikrinti atnaujinimų aplanko `%.255s' turinio"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "nepavyko pašalinti prijungto atnaujinimo failo %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "nepavyko sukurti `%.255s'"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "nepavyko tarpo simboliais užpildyti %.250s"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "po užpildymo nepavyko išvalyti %.250s"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "po užpildymo nepavyko sugrįžti į %.250s pradžią"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "nepavyko atverti laikino failo programai vsnprintf"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "nepavyko sukurti/atverti būsenos duomenų bazės užrakinimo failo"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "jūs neturite teisių dpkg būsenos duomenų bazei užrakinti"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "nepavyksta užrakinti dpkg būsenos duomenų bazės"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "prašomas veiksmas reikalauja administratoriaus privilegijų"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "nepavyksta pasiekti dpkg būsenos vietos"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "operacijai reikalingas priėjimas"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "įvyko klaida šalinant mano paties atnaujinimo failą %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "neįmanoma įrašyti atnaujintos `%.250s' būsenos"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "neįmanoma išvalyti atnaujintos `%.250s' būsenos"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "nepavyko nukirpti `%.250s' atnaujintos būsenos"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "nepavyko įvykdyti fsync su atnaujinta `%.250s' būsena"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "neįmanoma uždaryti atnaujintos `%.250s' būsenos"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "neįmanoma įdiegti atnaujintos `%.250s' būsenos"
@@ -275,90 +281,92 @@
 msgid "unable to open directory '%s'"
 msgstr "nepavyko užverti %s: %s"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "nepavyko užverti %s: %s"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "nepavyko užverti %s: %s"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "neįmanoma išvalyti vsnprintf"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "nepavyko įrašyti `%.50s' aprašymo į `%.250s'"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "nepavyko atverti `%.250s' informacijos apie %s įrašymui"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "nepavyko būsenos failui nustatyti buferizavimo"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "nepavyko įrašyti %s įrašo apie `%.50s' į `%.250s'"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "nepavyko išvalyti informacijos apie %s kuri buvo `%.250s'"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "nepavyko įvykdyti fsync %s su atnaujinta `%.250s' būsena"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "nepavyko uždaryti `%.250s' po %s informacijos įrašymo"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "nepavyko susieti `%.250s' su `%.250s informacijos apie %s išsaugojimui"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "nepavyko įdiegti `%.250s' kaip `%.250s' kuriame yra %s informacija"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "pritrūko atminties vykdant valymą naujam įrašui"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -367,35 +375,35 @@
 "%s: klaida valant:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: too many nested errors during error recovery !!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "pritrūko atminties vykdant valymą naujam įrašui"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "pritrūko atminties vykdant valymą naujam įrašui su daug parametrų"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: klaida valant:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr ""
 "%s: klaida valant:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%d: vidinė `%s' klaida\n"
@@ -411,106 +419,106 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "`%.*s' yra neleidžiamas naudojant %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "šiukšlės už %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "klaidingas paketo pavadinimas (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "tuščias failo detalių laukelis `%s'"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "failo detalių laukelis `%s' neleidžiamas būsenos faile"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "per daug reikšmių failo detalių laukelyje `%s' (palyginus su kitais)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "per mažai reikšmių failo detalių laukelyje `%s' (palyginus su kitais)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "taip/ne boolean laukelyje"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "panaudotas žodis laukelyje `priority'"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "šitame kontekste, `status' laukelyje yra neleidžiama reikšmė"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "pirmas (trūkumas) žodis \"būsena\" lauke"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "antras (klaida) žodis \"būsena\" lauke"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "trečias (būsena) žodis \"būsena\" lauke"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "klaida versijos sekoje `%.250s': %.250s"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "panaudotas pasenęs `Revision' arba `Package-Revision' laukas"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "reišmė `config-version' laukui neleidžiama šiame kontekste"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "klaida Config-Version sekoje `%.250s': %.250s"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "`conffiles' reikšmė turi netaisyklingą eilutę `%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "`conffiles' reikšmėje yra eilutė prasidedanti be tarpo `%c'"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "kaip konfigūracijos failas nurodytas šakninis arba tuščias aplankas"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr "laukelyje `%s', trūksta paketo pavadinimo, arba vietoj jo šiukšlės"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "laukelyje `%s', nekorektiškas paketo pavadinimas `%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -519,7 +527,7 @@
 "laukelyje `%s' , saitas į `%.255s':\n"
 " blogi versijų santykiai %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -528,7 +536,7 @@
 "laukelyje `%s' , saitas į `%.255s':\n"
 " `%c' yra nebenaudojamas, vietoj jo naudokite `%c=' arba `%c%c'"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -537,13 +545,13 @@
 "laukelyje `%s' , saitas į `%.255s':\n"
 " privalomas tam tikras versijos numeris, patariama naudoti `='"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr ""
 "Naudojant `Teikia' (Provides), gali būti naudojami tik tam tikri versijų "
 "numeriai"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -553,58 +561,58 @@
 " versijos reikšmė prasideda ne skaičiumi ar raide, patariama pridėti tarpo "
 "simbolį"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "laukelyje`%s', nuorodoje į `%.255s': versija `%c'"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "laukelyje`%s', nuorodoje į `%.255s': neužbaigta versija"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "laukelyje`%s', nuorodoje į `%.255s': klaida versijoje: %.255s"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "laukelyje `%s', po nuorodos į paketą `%.255s' yra sintaksės klaida"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "laukelyje %s neleistinas alternatyvus (`|')"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 #, fuzzy
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "reišmė `config-version' laukui neleidžiama šiame kontekste"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, fuzzy, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "laukelyje `%s', nekorektiškas paketo pavadinimas `%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 #, fuzzy
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "šitame kontekste, `status' laukelyje yra neleidžiama reikšmė"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, fuzzy, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "nekorektiškas paketo vardas eilutėje %d: %.250s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, fuzzy, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "Paketo „%.250s“ failų sąrašas"
@@ -661,7 +669,7 @@
 msgid "unable to write to status fd %d"
 msgstr "neįmanoma įrašyti atnaujintos `%.250s' būsenos"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "malloc failed (%ld bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -673,8 +681,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "nepavyko perkelti malloc atminties (%ld baitai)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 #, fuzzy
 msgid "failed to allocate memory"
 msgstr "nepavyko sukurti aplanko"
@@ -708,205 +716,211 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "nepavyko %.250s nustatyti uždaryti-įvykdžius žymės"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "konfigūravimo klaida: %s trūksta reikšmės"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, fuzzy, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "nepavyko atverti `%.255s' konfigūracinio failo skaitymui"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "nežinomas --%s parametras"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "parametrui --%s reikalinga reikšmė"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "parametrui --%s nereikalinga reikšmė"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "nuskaitymo klaida konfigūracijos faile  `%.255s'"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "klaida uždarant `%.255s' konfigūracijos failą"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "klaida uždarant `%.255s' konfigūracijos failą"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "nežinomas --%s parametras"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "parametrui --%s reikalinga reikšmė"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "parametrui --%s nereikalinga reikšmė"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "nežinomas parametras -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c pasirinkimui reikalinga reikšmė"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c pasirinkimui reikšmė nereikalinga"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "Įspėjimas: parametras „--%s“ nebenaudotinas\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "konfliktuojantys veiksmai -%c (--%s) ir -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "pasikartojanti `%s' laukelio reikšmė"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "vartotojo nurodytas laukelio pavadinimas `%.*s' - per trumpas"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "pasikartojanti reikšmė vartotojo nurodytame `%.*s' laukelyje"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Sukonfigūruota versija paketui su nepriimtina būsena"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "nepavyko atverti skaitymui paketo informacijos failo `%.255s'"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "nepavyko patikrinti paketo informacijos failo „%.255s“"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, fuzzy, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "neįmanoma mmap paketo info failo `%.255s'"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "nepavyko patikrinti paketo informacijos failo „%.255s“"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "po nuskaitymo nepavyko uždaryti `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "rasta failo pabaigos žymė po laukelio „%.*s“"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "naujos eilutės žymė laukelyje `%.*s'"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS failo pabaigos žymė (^Z) laukelio varde „%.*s“"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "po laukelio pavadinimo `%.*s' būtinai turi būti kablelis"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 "failo pabaigos žymė prieš laukelio `%.*s' reikšmę (trūksta paskutinės naujos "
 "eilutės žymės)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 "MSDOS failo pabaigos žymė laukelio `%.*s' reikšmėje (trūksta naujos eilutės "
 "žymės?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "naujos eilutės žymė laukelyje `%.*s'"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 "failo pabaigos žymė laukelio `%.*s' reikšmėje (trūksta paskutinės naujos "
 "eilutės žymės)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 "rasta keletas informacijos apie paketa įrašų, tačiau leidžiamas tik vienas"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "po nuskaitymo nepavyko uždaryti `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "`%.255s' nėra informacijos apie paketą"
@@ -925,66 +939,66 @@
 " %.255s"
 msgstr "laukelyje `%s', nekorektiškas paketo pavadinimas `%.255s': %s"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "negali būti tuščia eilutė"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "turi prasidėti skaičiumi arba raide"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "simbolis `%c' neleistinas (tik raidės, skaičiai bei simboliai `%s')"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<nėra>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "tuščia versijos eilutė"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "versijos eilutėje yra tarpų"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "laikmetis versijoje yra ne skaičius"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "versijos numeryje po kablelio nieko nėra"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "versijos numeryje po kablelio nieko nėra"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "versijos numeryje po kablelio nieko nėra"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "trūksta %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "%s be reikšmės"
@@ -1003,51 +1017,51 @@
 msgid "(no description available)"
 msgstr "(aprašymas neprieinamas)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "nepavykso ignoruoti signalo %s prieš scenarijaus paleidimą"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr ""
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (vidinis procesas): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "nepavyko suskirstymas"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "vidinis procesas %s nutrūko gražindamas reikšmę %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "%s laukimas nepavyko"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "sub-procesas %s nuslopintas signalo (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", išvesta derinimo informacija"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "sub-procesas %s nepavyko su laukimo būsenos kodu %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "%s laukimas nepavyko"
@@ -1067,199 +1081,205 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, fuzzy, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 msgid "triggers area"
 msgstr "nepavyksta pasiekti dpkg būsenos vietos"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, fuzzy, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "nepavyko patikrinti kito naujo failo „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, fuzzy, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, fuzzy, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "nepavyko patikrinti naujos distributyvo konfigūracijos failo „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, fuzzy, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "klaida skaitant %s iš failo %.255s"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, fuzzy, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "nepavyko patikrinti naujos distributyvo konfigūracijos failo „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, fuzzy, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "nepavyko patikrinti naujos distributyvo konfigūracijos failo „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, fuzzy, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "negaliu įdiegti naujos `%.255s' versijos"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, fuzzy, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "nepavyko atverti paketo „%.250s“ failų sarašo failo"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, fuzzy, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "nepavyko patikrinti kito naujo failo „%.250s“"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:419
-#, fuzzy, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "nepavyko patikrinti kito naujo failo „%.250s“"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, fuzzy, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "nepavyko patikrinti kito naujo failo „%.250s“"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "nepavyko patikrinti kito naujo failo „%.250s“"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "nepavyko patikrinti kito naujo failo „%.250s“"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
+msgstr "negaliu įdiegti naujos `%.255s' versijos"
+
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "nepavyko pašalinti „%.250s“"
+
+#: lib/dpkg/triglib.c:360
+#, fuzzy, c-format
+msgid "unable to create new trigger interest file `%.250s'"
 msgstr "nepavyko patikrinti kito naujo failo „%.250s“"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:383
 #, fuzzy, c-format
-msgid "unable to install new trigger interest file `%.250s'"
-msgstr "negaliu įdiegti naujos `%.255s' versijos"
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "nepavyko patikrinti kito naujo failo „%.250s“"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:456
 #, fuzzy, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 "nepavyko įdiegti naujo informacijos failo „%.250s“ su pavadinimu „%.250s“"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, fuzzy, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "nepavyko patikrinti naujos distributyvo konfigūracijos failo „%.250s“"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, fuzzy, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "nepavyko patikrinti naujos distributyvo konfigūracijos failo „%.250s“"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "nepavyko patikrinti naujos distributyvo konfigūracijos failo „%.250s“"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "nepavyko patikrinti naujos distributyvo konfigūracijos failo „%.250s“"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "nepavyko patikrinti naujos distributyvo konfigūracijos failo „%.250s“"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, fuzzy, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr ""
 "nepavyko įdiegti naujo informacijos failo „%.250s“ su pavadinimu „%.250s“"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, fuzzy, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, fuzzy, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "nuskaitymo klaida konfigūracijos faile  `%.255s'"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, fuzzy, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, fuzzy, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "neįmanoma įrašyti atnaujintos `%.250s' būsenos"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, fuzzy, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "nepavyko pakeisti savininko naujam konfigūracijos failui „%.250s“"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, fuzzy, c-format
 msgid "read error in `%.250s'"
@@ -1284,7 +1304,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "klaida skaitant iš dpkg-deb pipe"
 
@@ -1303,12 +1323,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "klaida nustatant nuorodos savininką `%.255s'"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "klaida nustatant savininką `%.255s'"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "klaida nustatant teises `%.255s'"
@@ -1359,110 +1379,125 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "archyve esantis `%.255s' objektas yra nežinomo 0x%x tipo"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "unable to read %s: %s"
+msgid "cannot stat file '%s'"
+msgstr "nepavyko nuskaityti %s: %s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Keičiami failai iš senojo %s paketo ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Pakeista failais iš įdiegto %s paketo ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
 "nondirectory"
 msgstr "bandoma perrašyti aplanką `%.250s' esantį pakete %.250s su ne aplanku"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "bandoma perrašyti „%.250s“, kuris taip pat yra pakete %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "nepavyko patikrinti naujos distributyvo konfigūracijos failo „%.250s“"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr ""
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "klaida uždarant/rašant `%.255s'"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "klaida kuriant duomenų srautą `%.255s'"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "klaida kuriant įrenginį `%.255s'"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "klaida kuriant tvirtają nuorodą `%.255s'"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "klaida kuriant simbolinę nuorodą `%.255s'"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "klaida kuriant aplanką `%.255s'"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "nepavyksta perkelti atidėto `%.255s' norint įdiegti naują versiją"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "neįmanoma rasti nuorodos `%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "neįmanoma sukurti atsarginės nuorodos į `%.255s' kopijos"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "negaliu pakeisti atsarginės nuorodos kopijos į `%.255s' savininko"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "neįmanoma sukurti nuorodos į `%.255s' kopijos prieš įdiegiant naują versiją"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "negaliu įdiegti naujos `%.255s' versijos"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "nepavyko sukurti `%.255s'"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "nepavyko sukurti `%.255s'"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1471,7 +1506,7 @@
 "dpkg: įspėjimas: ignoruojama %s priklausomybių problema:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, fuzzy, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1480,84 +1515,84 @@
 "dpkg: dėmesio: svarstoma esminio paketo %s\n"
 " dekonfigūracija, kad būtų galima įdiegti %s.\n"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable %s.\n"
 msgstr ""
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr ""
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr ""
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr ""
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 #, fuzzy
 msgid "ignoring breakage, may proceed anyway!"
 msgstr ""
 "dpkg: įspėjimas: konfliktas ignoruojamas, bus tęsiama bet kokiu atveju !\n"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: nuspręsta pašalinti %s keičiant jį į %s ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s paketas įdiegtas nekorektiškai - ignoruoju bet kokias jo priklausomybes.\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: %s pašalinimas gali sukelti problemų, kadangi jis teikia %s ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1566,110 +1601,112 @@
 "dpkg: paketas %s reikalauja įdiegimo iš naujo, tačiau jis bus išmestas kaip "
 "jūs prašėte.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: package %s requires reinstallation, will not remove.\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: taip, pašalinsiu %s vietoj %s.\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "konfliktuojantys paketai - neįdiegsiu %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 #, fuzzy
 msgid "ignoring conflict, may proceed anyway!"
 msgstr ""
 "dpkg: įspėjimas: konfliktas ignoruojamas, bus tęsiama bet kokiu atveju !\n"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive pasirinkimui reikia bent vienos kelio reikšmės"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "nepavyko įvykdyti paieškos pasirinkimui --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "nepavyko atidaryti paieškos srauto"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "klaida skaitant paieškos srautą"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "klaida uždarant paieškos srautą"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "paieška pasirinkimui --recursive įvykdė neapdorojamą klaidą %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 "ieškojau, tačiau neradau nei vieno paketo atitinkančio (*.deb) kriterijų"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s reikia nors vienos paketo archyvo failo reikšmės"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Pažymime anksčiau nepažymėtą paketą %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Praleidžiame nepasirinktą paketą %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versija %.250s paketui %.250s jau įdiegta, todėl praleidžiama.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s: perspėjimas: sendinamas %.250s iš %.250s į %.250s.\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "Nesendinsiu %.250s įš versijos %.250s į %.250s, todėl praleidžiama.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1678,39 +1715,39 @@
 "nepavyko pašalinti naujai įdiegtos `%.250s' versijos, norint sukurti sąlygas "
 "atsarginės kopijos naujam įdiegimui"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "nepavyko atkurti atsarginės `%.250s' versijos"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "nepavyko atkurti atsarginės `%.250s' versijos"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "nepavyksta pašalinti ką tik įdiegtos `%.250s' versijos"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "nepavyksta pašalinti ką tik išpakuotos `%.250s' versijos"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "nepavyko patikrinti naujos distributyvo konfigūracijos failo „%.250s“"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "nepavyko patikrinti naujai įdiegtos konfigūracijos failo „%.250s“"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1721,58 +1758,58 @@
 "Konfigūracijos failas „%s“ sistemoje neegzistuoja.\n"
 "Diegiamas nauja konfigūracijos failas, kaip buvo nurodyta.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "dpkg: %s: įspėjimas: nepavyko pašalinti senos „%.250s“: %s kopijos\n"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "dpkg: %s: įspėjimas: nepavyko pervadinti „%.250s“ į „%.250s“: %s\n"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: nepavyko paleisti '%s %s'"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "dpkg: %s: įspėjimas: nepavyko pašalinti senos „%.250s“: %s kopijos\n"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 "dpkg: %s: įspėjimas: nepavyko pašalinti „%.250s“ (prieš perrašant): %s\n"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "dpkg: %s: įspėjimas: nepavyko susieti „%.250s“ su „%.250s“: %s\n"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Diegiama nauja konfigūracijos failo versija %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "nepavyko įdiegti `%.250s' kaip `%.250s'"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "nėra paketo pavadinimu `%s', negaliu konfigūruoti"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "paketas %.250s jau įdiegtas ir sukonfigūruotas"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1781,7 +1818,7 @@
 "paketas %.250s neparuoštas konfigūravimui\n"
 " negaliu konfigūruoti (dabartinė būsena `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1790,11 +1827,11 @@
 "dpkg: priklausomybių problemos neleidžia konfigūruoti %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "priklausomybių problemos - paliekamas nekonfigūruotas"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1804,7 +1841,7 @@
 "taip nurodyta:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1812,12 +1849,12 @@
 "Paketas yra nevientisoje būsenoje - turėtumėte\n"
 " įdiegti jį pakartotinai prieš bandydami konfigūruoti."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Tvarkomas paketas %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, fuzzy, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1826,7 +1863,7 @@
 "dpkg: %s: įspėjimas: nepavyko patikrinti konfigūracijos failo „%s“\n"
 " (= „%s“): %s\n"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, fuzzy, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1835,7 +1872,7 @@
 "dpkg: %s: įspėjimas: nustatymų failas „%s“ yra ciklinė nuoroda\n"
 " (= „%s“)\n"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, fuzzy, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1844,42 +1881,42 @@
 "dpkg: %s: įspėjimas: nepavyko nuskaityti susieto nustatymų failo „%s“\n"
 "(= „%s“): %s\n"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
 " ('%s' is a symlink to '%s')"
 msgstr ""
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, fuzzy, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "dpkg: %s: įspėjimas: nustatymų failas „%.250s“ nėra teksto failas ar nuoroda "
 "(= „%s“)\n"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "dpkg: %s: įspėjimas: nepavyko atverti nustatymų failo %s maišai: %s\n"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Įveskite `exit' kai baigsite.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1888,12 +1925,12 @@
 "\n"
 "Konfigūracijos failas „%s“"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (iš tiesų „%s“)"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1904,7 +1941,7 @@
 " ==> Jūsų ar scenarijaus sukurtas failas sistemoje.\n"
 " ==> Failas pakete, pateiktas paketo prižiūrėtojo.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1913,7 +1950,7 @@
 "\n"
 "     Nepakeista nuo įdiegimo.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1922,7 +1959,7 @@
 "\n"
 " ==> Pakeista (jūsų ar scenarijaus dėka) nuo įdiegimo.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1931,37 +1968,37 @@
 "\n"
 " ==> Ištrinta (jūsų ar scenarijaus dėka) nuo įdiegimo.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Paketų platintojas pateikė atnaujintą versiją.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Versija esanti pakete yra tokia pat kaip per praeitą diegimą.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Naudojamas naujas failas, kaip nurodyta.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Naudojamas esamas senas failas, kaip nurodyta.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Pagal nutylėjimą paliekamas senas failas.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Pagal nutylėjimą naudojamas naujas failas.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1976,167 +2013,168 @@
 "      D     : parodyti skirtumus tarp versijų\n"
 "      Z     : nuleisti šį procesą, tolesniai situacijos peržiūrai\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Pagal nutylėjima bus palikta dabartinė versija.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Pagal nutylėjimą bus įdiegta nauja versija.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[pagal nutylėjimą=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[pagal nutylėjimą=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[nėra veiksmo pagal nutylėjimą]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "klaida rašant į išvestį, atrasta prieš konfigūracinio failo užklausą"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "klaida nuskaitant įvestį, atrasta prieš konfigūracinio failo užklausą"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr ""
 "failo pabaigos žymė standartinėje įvestyje prieš konfigūracinio failo "
 "užklausą"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s priklauso nuo %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr ""
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s rekomenduoja %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s siūlo %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr ""
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s konfliktuoja su %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s pagerina %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s bus pašalintas.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s bus dekonfigūruotas.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s prašoma įdiegti, tačiau jo versija %.250s.\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s yra įdiegtas, tačiau yra versija %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s yra išpakuotas, tačiau nebuvo konfigūruotas.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s yra išpakuotas, tačiau yra versija %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s paskutinė konfigūruota versija yra %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s yra %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s teikia %.250s tačiau bus pašalintas.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s teikia %.250s tačiau bus dekonfigūruotas.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s teikia %.250s, bet yra %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s yra neįdiegtas.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versija %.250s) bus įdiegtas.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, fuzzy, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versija %.250s) yra %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s teikia %.250s ir bus įdiegtas.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, fuzzy, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s teikia %.250s ir yra %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+msgid "Use --help for help about diverting files."
+msgstr "Norėdami gauti pagalbą įvykdykite dpkg-split --help"
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versija %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2144,8 +2182,8 @@
 "Copyright (C) 2010 Guillem Jover.\n"
 msgstr ""
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2153,7 +2191,7 @@
 "later for copying conditions. There is NO warranty.\n"
 msgstr ""
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2163,7 +2201,7 @@
 "Naudojimas: %s [<parametras> ...] <komanda>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2175,7 +2213,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2193,7 +2231,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2202,158 +2240,152 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "unable to read %s: %s"
-msgid "cannot stat file '%s'"
-msgstr "nepavyko nuskaityti %s: %s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error writing `%s'"
 msgid "error checking '%s'"
 msgstr "klaida `%s' rašyme"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "nepavyko užverti %s: %s"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "unable to write %s: %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "nepavyko rašyti %s: %s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr ""
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 msgid "unable to remove copied source file '%s'"
 msgstr "neįmanoma išvalyti vsnprintf"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr ""
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 #| msgid "  Version of %s on system is %s.\n"
 msgid "local diversion of %s to %s"
 msgstr "  Sistemoje esantičio %s paketo versija yra %s.\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "  Version of %s on system is %s.\n"
 msgid "diversion of %s by %s"
 msgstr "  Sistemoje esantičio %s paketo versija yra %s.\n"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 #| msgid "  Version of %s on system is %s.\n"
 msgid "diversion of %s to %s by %s"
 msgstr "  Sistemoje esantičio %s paketo versija yra %s.\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "Debian %s version %s.\n"
 msgid "any diversion of %s"
 msgstr "Debian %s versija %s.\n"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 #| msgid "  Version of %s on system is %s.\n"
 msgid "any diversion of %s to %s"
 msgstr "  Sistemoje esantičio %s paketo versija yra %s.\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "cannot open GPL file"
 msgid "cannot create new %s file"
 msgstr "nepavyko atverti GPL failo"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "neįmanoma išvalyti vsnprintf"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 msgid "error removing old diversions-old"
 msgstr "nepavyko atverti statoverride failo"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "nepavyko atverti statoverride failo"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "nepavyko atverti statoverride failo"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr ""
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr ""
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr ""
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr ""
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "nepavyko pašalinti failo „%.250s“"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "Paliekamas `%s'"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "Pridedamas `%s'"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr ""
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2361,7 +2393,7 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2369,17 +2401,17 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "Šalinamas „%s“"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr ""
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr ""
 
@@ -2457,8 +2489,8 @@
 msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s parametras nereikalauja nurodyti jokių reikšmių"
@@ -2550,7 +2582,7 @@
 msgid "--compare-versions bad relation"
 msgstr "blogas sąryšis su --compare-versions"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "dpkg: versija '%s' su bloga sintakse: %s\n"
@@ -2606,12 +2638,12 @@
 "dpkg: įspėjimas: problema ignoruojama, nes nurodyta --force:\n"
 " "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "nepavyko atverti paketo „%.250s“ failų sarašo failo"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, fuzzy, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2620,37 +2652,37 @@
 "dpkg: rimtas įspėjimas: failų sąrašo failas paketui „%.250s“ nerastas; "
 "daroma prielaida, kad nėra įdiegtų paketo failų.\n"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "nepavyko atverti paketo „%.250s“ failų sarašo failo"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "Paketo „%.250s“ failų sąrašas"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, fuzzy, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "klaida uždarant paketo `%.250s' failo sąrašo failą"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Skaitoma duomenų bazė ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2658,32 +2690,32 @@
 msgstr[0] "šiuo metu įdiegta %d failų ir aplankų.)\n"
 msgstr[1] "šiuo metu įdiegta %d failų ir aplankų.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "nepavyko sukurti atnaujinto failų sąrašo failo paketui %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "nepavyko įrašyti atnaujintų failų sąrašo paketui %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "nepavyko išvalyti atnaujintų failų sąrašo failo paketui %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "nepavyko sinchronizuoti atnaujinto failų sąrašo failo paketui %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "nepavyko uždaryti atnaujintų failų sąrašo failo paketui %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "nepavyko įdiegti atnaujintų failų sąrašo failo paketui %s"
@@ -2723,7 +2755,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "dpkg - klaida: nenustatytas PATH.\n"
 
 #: src/help.c:129
@@ -2756,7 +2788,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "nepavyko gauti vsnprintf būsenos"
@@ -2767,66 +2799,66 @@
 msgstr "nepavyko pakeisti šakninio aplanko į „%.250s“"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "nepavyko atverti aplanko `%.255s'"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "nepavyko nustatyti vykdymo teisių „%.250s“"
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "nepavyko gauti vsnprintf būsenos"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "senas %s scenarijus"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "nepavyksta patikrinti %s `%.250s'"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "naujas %s scenarijus"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "senas %s scenarijus"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "nepavyksta patikrinti %s `%.250s'"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - bandomas scenarijus iš naujos paketo versijos ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "naujo paketo versijoje nėra scenarijaus - paliekama taip"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... atrodo viskas praėjo GERAI.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "nepavyko sukurti `%.255s'"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2835,7 +2867,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "nepavyko patikrinti ar egzistuoja `%.250s'"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "negaliu perskaityti informacijos aplanko"
 
@@ -2907,7 +2939,7 @@
 "  -Dh|--debug=help                 Rodyti derinimo informaciją.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -3035,7 +3067,7 @@
 "Naudokite `dselect' arba `aptitude' jei norite tvarkyti paketus vartotojui "
 "draugiškoje aplinkoje.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3088,30 +3120,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3120,102 +3156,102 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "priklausomybių problemos - nešalinamas"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "priklausomybių problemos - nešalinamas"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "nepavyko gauti vsnprintf būsenos"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "nuskaitymo klaida konfigūracijos faile  `%.255s'"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3223,7 +3259,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3231,36 +3267,36 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug reikia šešioliktainės reikšmės"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "tuščias paketo vardas --ignore-depends kableliais atskirtame saraše `%.250s'"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends reikia esamo paketo vardo. `%.250s' - netinka; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "reikalingas sveikas skaičius --%s: `%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3269,7 +3305,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3277,12 +3313,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "nežinomas priversti/atsisakyti parametras `%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "Įspėjimas: nebenaudotinas priversti/atsisakyti parametras „%s“\n"
@@ -3305,8 +3341,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "netikėta failo pabaiga prieš %d eilutės pabaigą"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "reikia veiksmo parametro"
 
@@ -3471,93 +3507,93 @@
 msgid "passed\n"
 msgstr "praėjo\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "nepavyko sukurti laikino aplanko vardo"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr ""
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "sena paketo versija turi per daug didelę informacijos failą pradedant "
 "„%.250s“"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "nepavyko pašalinti pasenusio „%.250s“ informacijos failo"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "nepavyko įdiegti informacijos failo „%.250s“ (nors reikėtų)"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "nepavyko atverti laikino valdymo aplanko"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "pakete yra informacijos valdymo failas per ilgu pavadinimu (pradedant "
 "„%.50s“)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "paketo valdymo informacijoje yra aplankas `%.250s'"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "paketo valdymo informacijoje nebuvo parašyta, kad rmdir `%.250s' yra ne "
 "aplankas"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr "dpkg: įspėjimas: %s pakete informacijos failas yra sąrašas"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 "nepavyko įdiegti naujo informacijos failo „%.250s“ su pavadinimu „%.250s“"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "nepavyko pašalinti valdymo informacijos failo „%.250s“"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "negaliu prieiti prie archyvo"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "nepavyko sukurti laikino aplanko vardo"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "valdymo informacijos dydis"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Įrašas apie %s iš %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "paketo architektūra (%s) netinka jūsų sistemai (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3566,115 +3602,115 @@
 "dpkg: dėl %s esančio %s, priklausomybių problema:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "priklausomybių problema - nediegiu %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr "dpkg: įspėjimas: ignoruojama prieš-priklausomybių problema!\n"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Ruošiamasi pakeisti %s %s (naudojant %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Išpakuojamas archyvas %s (iš %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "konfigūracijos failo vardas (pradedant „%.250s“) yra per ilgas (>%d simbolių)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "skaitymo klaida %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "klaida uždarant %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "klaida bandant atidaryti %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr ""
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Dekonfigūruojamas %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Išpakuojamas %.250s pakaitalas...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "klaida skaitant dpkg-deb tar išvestį"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "pažeistas failų sistemos tar failas - pažeistas paketų archyvas"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: naikinamos galimos tarpų sekos"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, fuzzy, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "dpkg: įspėjimas: nepavyko patikrinti seno „%.250s“ failo, todėl jis "
 "netrinamas: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "dpkg: įspėjimas: nepavyko ištrinti seno aplanko „%.250s“: %s\n"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, fuzzy, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "dpkg: įspėjimas: senas nustatymų failas „%.250s“ buvo tuščias aplankas (ir "
 "buvo ištrintas)\n"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "nepavyko patikrinti kito naujo failo „%.250s“"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
 "'%.250s')"
 msgstr ""
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "dpkg: perspėjimas: nepavyko %s seno failo „%%.250s“: %%s\n"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Pažymėtinas %s dingimas, kuris buvo visiškai pakeistas.)\n"
@@ -3845,7 +3881,7 @@
 "  -f|--showformat=<formatas>         naudoti kitą --show parametro formatą.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3869,6 +3905,10 @@
 "neigiama - tuo atveju\n"
 "  bus naudojamas lygiavimas į dešinę pusę.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, fuzzy, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3930,7 +3970,7 @@
 msgid "Removing %s ...\n"
 msgstr "Šalinamas %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, fuzzy, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3939,49 +3979,50 @@
 "dpkg: įspėjimas: šalinant %.250s nepavyko pašalinti aplanko „%.250s“: %s - "
 "aplankas yra montavimo taškas?\n"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "nepavyko pašalinti „%.250s“"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "nepavyko sukurti `%.255s'"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "dpkg: įspėjimas: šalinant %.250s, rastas netuščias aplankas „%.250s“, todėl "
 "aplankas neištrintas.\n"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "nepavyko pašalinti „%.250s“"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Šalinami %s konfigūracijos failai...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "nepavyksta pašalinti seno konfigūracijos failo „%.250s“ (= „%.250s“)"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "nepavyksta atverti konfigūracijos failų aplanko `%.250s' (iš `%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "nepavyko pašalinti senų konfigūracijos failų kopijų`%.250s' (iš `%.250s')"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "nepavyko pašalinti senų failų sąrašo"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "nepavyko pašalinti seno postrm scenarijaus"
 
@@ -4024,14 +4065,18 @@
 msgid "read error on standard input"
 msgstr "skaitymo klaida standartinėje įvestyje"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 msgstr ""
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4042,7 +4087,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4055,56 +4100,56 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr ""
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "nepavyko atverti statoverride failo"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "nepavyko atverti statoverride failo"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "nepavyko atverti statoverride failo"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "nepavyko atverti statoverride failo"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr ""
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr ""
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr ""
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr ""
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr ""
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr ""
 
@@ -4176,17 +4221,17 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Norėdami gauti pagalbą įvykdykite dpkg-split --help"
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debian „%s“ paketų tvarkymo programos užklausų įrankis\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4196,7 +4241,7 @@
 "Naudojimas: %s [<parametras> ...] <komanda>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4205,7 +4250,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4219,31 +4264,31 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 #, fuzzy
 msgid "takes one argument, the trigger name"
 msgstr "--%s priima tik vieną parametrą (.deb failą)"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "laukelyje `%s', nekorektiškas paketo pavadinimas `%.255s': %s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "laukelyje `%s', nekorektiškas paketo pavadinimas `%.255s': %s"
@@ -4272,29 +4317,30 @@
 msgstr "Šalinami %s konfigūracijos failai...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s reikia lygiai vieno paketų failo pavadinimo"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr "atnaujinimo paketui nepavyko pasiekti dpkg būsenos įrašo"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr "atnaujinimo paketui reikalinga rašymo teisė į dpkg būsenos įrašą"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Keičiama prieinama paketų informacija, naudojant %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Atnaujinama prieinamų paketų informacija, naudojant %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4302,7 +4348,7 @@
 msgstr[0] "Atnaujinta informacija apie %d paketų.\n"
 msgstr[1] "Atnaujinta informacija apie %d paketų.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4422,8 +4468,8 @@
 msgstr[0] "dpkg-deb: ignoruojami %d perspėjimai apie valdymo failus\n"
 msgstr[1] "dpkg-deb: ignoruojami %d perspėjimai apie valdymo failus\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
@@ -4455,26 +4501,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: daromas paketas `%s' - `%s'.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "nepavyko sukurti laikino failo (duomenys)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "valdymo sritis"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "nepavyko atsieti laikinos failo (duomenys), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 msgid "failed to rewind temporary file (%s)"
 msgstr "nepavyko sukurti laikino failo (duomenys)"
@@ -4489,20 +4535,20 @@
 msgid "error writing `%s'"
 msgstr "klaida `%s' rašyme"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "tarp dalių"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write to pipe in copy"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "kopijuojant nepavyko įrašyti į srautą"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4520,75 +4566,75 @@
 msgid "error reading %s from file %.255s"
 msgstr "klaida skaitant %s iš failo %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "nepavyko nuskaityti archyvo `%.255s'"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "archyvo versijos numeryje nėra taškų"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "archyvo antraštėje nėra naujos eilutės simbolių"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "failas „%.250s“ sugadintas – blogas leidimo numeris"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "failas „%.250s“ nėra debian dvejetainis archyvas (pabandykite dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "archyvo versijos numeryje nėra taškų"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "archyvo antraštėje nėra naujos eilutės simbolių"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "archyvo versijos numeryje nėra taškų"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "archyvo versija %.250s nesuprantama, įdiekite naujesnį dpkg-deb"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "praleisti narių duomenys iš %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, c-format
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, c-format
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4600,23 +4646,23 @@
 " naujas debian paketas, versija %s.\n"
 " dydis %ld baitai: valdymo archyvas= %zi baitai.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "archyve yra sugadintas valdymo informacijos dydis `%s'"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "praleisti narių duomenys iš %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4628,7 +4674,7 @@
 " senas debian paketas, versija %s.\n"
 " dydis %ld baitai: valdymo archyvas= %zi, pagrindinis archyvas= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4637,51 +4683,52 @@
 "dpkg-deb: failas atrodo kaip archyvas, kuris buvo\n"
 "dpkg-deb:    sugadintas siunčiant ASCII veiksena\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' yra ne debian formato archyvas"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "kopijuojant nepavyko įrašyti į srautą"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "kopijuojant nepavyko uždaryti srauto"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "duomenys"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "nepavyko atverti aplanko"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "nepavyko sukurti aplanko"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "sukūrus aplanką nepavyko jo atverti"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "nepavyko atverti aplanko"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s: išspaudimas"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 #, fuzzy
 msgid "paste"
 msgstr "praėjo\n"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s reikia .deb failo parametro"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4690,96 +4737,96 @@
 "--%s reikia nurodyti įdiegimo aplanką.\n"
 "Gal geriau būtų naudoti dpkg --install ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s priima daugiausiai du parametrus (.deb failą ir aplanką)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s priima tik vieną parametrą (.deb failą)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "nepavyko atverti `/' valymui"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
 msgid "control file '%s'"
 msgstr "nepavyko nuskaityti %s: %s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr ""
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld baitai, %5d eilutės %c %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     ne paprastas %.255s failas\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(valdymo archyve nėra „control“ failo!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "nepavyko atverti `control' komponento"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "nepavyko nuskaityti `control' komponento"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "klaida uždarant paieškos srautą"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Klaida formate"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--control nustatymui reikia tik vieno parametro"
 
@@ -4789,7 +4836,19 @@
 msgstr "Debian `%s' paketo archyvo versija %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4800,6 +4859,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4817,7 +4878,7 @@
 "  --fsys-tarfile <deb> Išvesti failų sistemos tar failą.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4826,11 +4887,12 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4843,7 +4905,7 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4852,23 +4914,23 @@
 "unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
 msgstr ""
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "reikalingas sveikas skaičius --%s: `%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "reikalingas sveikas skaičius --%s: `%.250s'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr ""
@@ -4888,7 +4950,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr ""
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "klaida skaitant %.250s"
@@ -4977,53 +5039,58 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "failas „%.250s“ sugadintas – blogas leidimo numeris"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+msgid "package architecture"
+msgstr ""
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr "failas „%.250s“ sugadintas - klaidinga antrosios antraštės pabaiga"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "failas „%.250s“ sugadintas – antrasis narys nėra duomenų narys"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr "failas „%.250s“ sugadintas - negeras nurodyto dydžio dalių skaičius"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "failas „%.250s“ sugadintas - negeras nurodyto dydžio dalies dydis"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "nepavyko įvykdyti fstat daliniam „%.250s“ failui"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "failas „%.250s“ sugadintas – per trumpas"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr ""
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5034,12 +5101,19 @@
 "\n"
 msgstr ""
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<nežinomas>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--debug reikia šešioliktainės reikšmės"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr ""
@@ -5073,7 +5147,7 @@
 msgid "split package part"
 msgstr "trūkstamas paketas"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "baigta\n"
@@ -5122,28 +5196,36 @@
 "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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Norėdami gauti pagalbą įvykdykite dpkg-split --help"
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "netikėta %.250s failo pabaiga"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr ""
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -5253,42 +5335,42 @@
 msgid "Deleted %s.\n"
 msgstr "Ištrintas %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr ""
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr ""
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr ""
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr ""
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "--split daugiausiai reikia nurodyti išeities failo vardą ir vietos "
@@ -5358,490 +5440,469 @@
 "  --version                show the version.\n"
 msgstr ""
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr ""
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr ""
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "unable to read %s: %s"
-msgid "cannot stat %s: %s"
-msgstr "nepavyko nuskaityti %s: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr ""
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "nepavyko nuskaityti %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:420
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "nepavyko įvykdyti %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "neįmanoma įdiegti %s kaip %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
-msgstr ""
+msgid "unable to remove '%s'"
+msgstr "nepavyko užverti %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "netikėta %.250s failo pabaiga"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "nepavyko nuskaityti %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "netikėta %.250s failo pabaiga"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "nepavyko rašyti %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate path %s"
 msgid "duplicate slave name %s"
 msgstr "pasikartojantis kelias %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr ""
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "pasikartojantis kelias %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr ""
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "nepavyko nuskaityti %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr ""
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "nepavyko užverti %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "nepavyko rašyti %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr ""
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "word in `priority' field"
 msgid "%s - priority %d"
 msgstr "panaudotas žodis laukelyje `priority'"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr "nepavyko užverti %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Debian %s versija %s.\n"
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr ""
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "Aprašymas"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "netikėta %.250s failo pabaiga"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "Išpakuojamas archyvas %s (iš %s) ...\n"
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
 #, c-format
-msgid "unknown argument `%s'"
+msgid "alternative name (%s) must not contain '/' and spaces."
 msgstr ""
 
-#: utils/update-alternatives.c:2063
-msgid "--install needs <link> <name> <path> <priority>"
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
-msgid "<link> and <path> can't be the same"
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
-msgid "priority must be an integer"
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
 #, c-format
-msgid "--%s needs <name> <path>"
+msgid "alternative link %s is already managed by %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2241
 #, c-format
-msgid "--%s needs <name>"
+msgid "alternative path %s doesn't exist."
 msgstr ""
 
-#: utils/update-alternatives.c:2108
-msgid "--slave only allowed with --install"
+#: utils/update-alternatives.c:2254
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
 msgstr ""
 
-#: utils/update-alternatives.c:2110
-msgid "--slave needs <link> <name> <path>"
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2278
 #, c-format
-msgid "name %s is both primary and slave"
+msgid "alternative link %s is already managed by %s (slave of %s)."
 msgstr ""
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2324
 #, c-format
-msgid "link %s is both primary and slave"
+msgid "unknown argument `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2142
-#, fuzzy, c-format
-msgid "--%s needs a <file> argument"
-msgstr "--%s reikia .deb failo parametro"
+#: utils/update-alternatives.c:2343
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr ""
 
-#: utils/update-alternatives.c:2168
-#, c-format
-msgid "unknown option `%s'"
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
+msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2173
-msgid ""
-"need --display, --query, --list, --get-selections, --config, --set, --set-"
-"selections, --install, --remove, --all, --remove-all or --auto"
+#: utils/update-alternatives.c:2349
+msgid "priority must be an integer"
 msgstr ""
 
-#: utils/update-alternatives.c:2215
+#: utils/update-alternatives.c:2362
 #, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
+msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
+#: utils/update-alternatives.c:2376
 #, c-format
-msgid "alternative link %s is already managed by %s."
+msgid "--%s needs <name>"
 msgstr ""
 
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
+#: utils/update-alternatives.c:2388
+msgid "--slave only allowed with --install"
 msgstr ""
 
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
+#: utils/update-alternatives.c:2390
+msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2239
+#: utils/update-alternatives.c:2399
 #, c-format
-msgid "alternative path %s doesn't exist."
+msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
+#: utils/update-alternatives.c:2402
 #, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
+msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
+#: utils/update-alternatives.c:2422
+#, fuzzy, c-format
+msgid "--%s needs a <file> argument"
+msgstr "--%s reikia .deb failo parametro"
 
-#: utils/update-alternatives.c:2257
+#: utils/update-alternatives.c:2448
 #, c-format
-msgid "it is a slave of %s"
+msgid "unknown option `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
+#: utils/update-alternatives.c:2453
+msgid ""
+"need --display, --query, --list, --get-selections, --config, --set, --set-"
+"selections, --install, --remove, --all, --remove-all or --auto"
 msgstr ""
 
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "skaitymo klaida standartinėje įvestyje"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
 "updates only."
 msgstr ""
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr ""
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr ""
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "  %.250s teikia %.250s, bet yra %s.\n"
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~| msgid "unable to read %s: %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "nepavyko nuskaityti %s: %s"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "nepavyko įvykdyti %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "neįmanoma įdiegti %s kaip %s: %s"
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "nepavyko rašyti %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "nepavyko nuskaityti %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "nepavyko užverti %s: %s"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "nepavyko rašyti %s: %s"
+
+#, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "nepavyko užverti %s: %s"
 
@@ -5977,9 +6038,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "praleisti narių duomenys iš %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "nepavyko įvykdyti tar"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "nepavyko sukurti laikino aplanko vardo"
diff -uNr --exclude .git --exclude .bzr dpkg/po/Makefile.in.in /home/vorlon/devel/multiarch/dpkg-debian/po/Makefile.in.in
--- dpkg/po/Makefile.in.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/Makefile.in.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,444 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.18
+GETTEXT_MACRO_VERSION = 0.18
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+SHELL = /bin/sh
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+localedir = @localedir@
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+	@echo "$(MSGFMT) -c -o $@ $<"; \
+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+	@lang=`echo $* | sed -e 's,.*/,,'`; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
+
+
+all: check-macro-version all-@USE_NLS@
+
+all-yes: stamp-po
+all-no:
+
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+check-macro-version:
+	@test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+	       exit 1; \
+	     }
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+	  package_gnu='GNU '; \
+	else \
+	  package_gnu=''; \
+	fi; \
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
+	case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	  '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	  *) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --package-name="$${package_gnu}@PACKAGE@" \
+	      --package-version='@VERSION@' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	esac
+	test ! -f $(DOMAIN).po || { \
+	  if test -f $(srcdir)/$(DOMAIN).pot; then \
+	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+	    else \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	    fi; \
+	  else \
+	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	  fi; \
+	}
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+	$(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) \
+	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	           '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+	           *) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+	         esac; \
+	       }; \
+	else \
+	  $(MAKE) $${lang}.po-create; \
+	fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    $(INSTALL_DATA) $(srcdir)/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  for file in Makevars; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+install-data-no: all
+install-data-yes: all
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
+	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+	    fi; \
+	  done; \
+	done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	  : ; \
+	fi
+installdirs-data-no:
+installdirs-data-yes:
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	    fi; \
+	  done; \
+	done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+uninstall-data-no:
+uninstall-data-yes:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	  done; \
+	done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+	rm -f remove-potcdate.sed
+	rm -f stamp-poT
+	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+	rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+	$(MAKE) update-po
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  dists="$$dists Makevars.template"; \
+	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
+	if test -f $(srcdir)/ChangeLog; then \
+	  dists="$$dists ChangeLog"; \
+	fi; \
+	for i in 0 1 2 3 4 5 6 7 8 9; do \
+	  if test -f $(srcdir)/ChangeLog.$$i; then \
+	    dists="$$dists ChangeLog.$$i"; \
+	  fi; \
+	done; \
+	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+	for file in $$dists; do \
+	  if test -f $$file; then \
+	    cp -p $$file $(distdir) || exit 1; \
+	  else \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+	  fi; \
+	done
+
+update-po: Makefile
+	$(MAKE) $(DOMAIN).pot-update
+	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+	$(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+	exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	cd $(srcdir); \
+	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	       '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	       *) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	     esac; \
+	   }; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "msgmerge for $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+	@:
+
+# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
+# because execution permission bits may not work on the current file system.
+# Use @SHELL@, which is the shell determined by autoconf for the use by its
+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+	cd $(top_builddir) \
+	  && @SHELL@ ./config.status $(subdir)/$@.in po-directories
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Binary files dpkg/po/mr.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/mr.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/mr.po /home/vorlon/devel/multiarch/dpkg-debian/po/mr.po
--- dpkg/po/mr.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/mr.po	2012-06-07 10:11:09.426073000 -0700
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2006-08-17 16:02+0200\n"
 "Last-Translator: Priti Patil <prithisd@gmail.com>\n"
 "Language-Team:  Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -20,7 +20,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "उगम फाइल `%.250s' उघडता येत नाही"
@@ -40,71 +40,77 @@
 msgid "ar member file (%s)"
 msgstr "टीएमपीफाईल (डेटा) बनवता आली नाही"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "बफर_नक्कल (%s) मधे अयशस्वी झाले"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "बफर_नक्कल (%s) मधे अयशस्वी झाले"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "बफर_नक्कल (%s) मधे तोकडे वाचन"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "टार इक्सइसी करता आले नाही"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "%s अमलात आणण्यास असमर्थ आहे"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: डिकाँंप्रेशन"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: काँंप्रेशन"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: आंतरिक जीझिप त्रुटी: `%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: आंतरिक जीझिप त्रुटी: `%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: आंतरिक जीझिप त्रुटी: `%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: आंतरिक जीझिप त्रुटी: `%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: आंतरिक जीझिप त्रुटी: `%s'"
@@ -119,31 +125,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: आंतरिक बीझिप२ त्रुटी: `%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: आंतरिक बीझिप२ त्रुटी: `%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: आंतरिक बीझिप२ त्रुटी: `%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: आंतरिक बीझिप२ त्रुटी: `%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -152,105 +158,105 @@
 "सुधारणा निर्देशिकेत असलेल्या `%.250s' या फाइलचे नाव जास्त लांब आहे (लांबी=%d, "
 "जास्तीतजास्त=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr "सुधारणा निर्देशिकेत असलेल्या फाईलींच्या नावांची लांबी वेगवेगळी आहे (दोन्ही %d व %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "`%.255s' सुधारणा निर्देशिका तपासता येत नाही"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "अंतर्भुत सुधारणा फाईल %.255s काढून टाकता आली नाही"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "`%.255s' ची रचना करता येत नाही"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "%.250s पँडिंगने भरता येत नाही"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "पँडिंगनंतर %.250s एकजीव करता येत नाही"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "पँडिंगनंतर %.250s च्या सुरूवातीला जाता येत नाही"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "व्हीएसएनप्रिंटएफ़ साठी टीएमपीफाईल उघडता येत नाही"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "डीपीकेजी सद्यस्थिती डेटाबेस लोॅकफ़ाईल उघडता/बनवता येत नाही"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "आपणांस डीपीकेजी सद्यस्थिती डेटाबेसला टाळे लावण्याची परवानगी नाही"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "डीपीकेजी सद्यस्थिती डेटाबेसला टाळे लावता येत नाही"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "या संक्रियेसाठी सुपरयुझरचे हक्क आवश्यक आहेत"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "डीपीकेजी दर्जा स्थानात प्रवेश मिळत नाही"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "या संक्रियेसाठी डीपीकेजी दर्जा स्थानाचे वाचन/लेखन हक्क आवश्यक आहेत"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "माझी स्वतःची सुधारणा फाईल %.255s  काढून टाकता आली नाही"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "`%.250s' ची सुधारित स्थिती लिहिता येत नाही"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "`%.250s' ची सुधारित स्थिती एकजीव करता येत नाही"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "`%.250s' च्या सुधारित स्थितीत काटछाट करता येत नाही"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "%.250s' ची सुधारित स्थिती एफसिन्क करता येत नाही"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "%.250s' ची सुधारित स्थिती बंद करता येत नाही"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "%.250s' ची सुधारित स्थिती अधिष्ठापित करता येत नाही"
@@ -271,90 +277,92 @@
 msgid "unable to open directory '%s'"
 msgstr "उगम फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "उगम फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "उगम फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "व्हीएसएनप्रिंटएफ़मधे फ़्लश? करणे जमत नाही"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "`%.50s' to `%.250s' चे तपशील लिहिता आले नाहीत"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "%s माहिती लिहिण्यासाठी `%s' उघडता आले नाही"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "सद्यस्थिती फाइलचे बफरिंग निश्चित करता येत नाही"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "`%.50s' बद्दलची %s माहिती `%.250s' मध्ये लिहिता आली नाही"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "%s माहिती `%.250s' मध्ये एकजीव करता आली नाही"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "%s माहिती `%.250s' मध्ये एफसिन्क करता आली नाही"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "%s माहिती लिहिल्यानंतर `%.250s' बंद करता आली नाही"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "%s च्या बॅक-अपसाठी `%.250s' `%.250s' शी जोडता आले नाही"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "`%.250s' %s माहिती समावलेले `%.250s'म्हणून अधिष्ठापित करता आले नाही"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "वीन क्लीनअप नोंदीकरिता मेमरी अपूरी"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -363,35 +371,35 @@
 "%s: सफाई करताना चूक:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "डीपीकेजी: त्रुटी सुधारणेदरम्यान पुष्कळच नेस्टेड चुका  !!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "वीन क्लीनअप नोंदीकरिता मेमरी अपूरी"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "बहुपर्यायांसहित नवीन क्लीनअप नोंदीकरिता मेमरी अपूरी"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: सफाई करताना चूक:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr ""
 "%s: सफाई करताना चूक:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%d: अंतर्गत त्रुटी `%s'\n"
@@ -406,106 +414,106 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "%s साठी `%.*s' ला अनुमती नाही"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "%s नंतर अडगळ"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "पॅकेजचे नाव अयोग्य (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "फाइलचे विवरण क्षेत्र रिकामे `%s'"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "सद्यस्थितीदर्शक फाइलमधे फाइल विवरण क्षेत्र `%s' ला अनुमती नाही"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "फाइल विवरण क्षेत्र `%s' मधे खुपच अधिक मूल्ये (इतरांच्या तुलनेत)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "फाइल विवरण क्षेत्र `%s' मधे खुपच कमी मूल्ये (इतरांच्या तुलनेत)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "बुलियन क्षेत्रामधे हो/नाही"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr " `अग्रक्रम' क्षेत्रामधे शब्द"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "येथील संदर्भात `सद्यस्थिती' क्षेत्रासाठी मूल्य ठरवण्याची अनुमती नाही"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "`सद्यस्थिती' क्षेत्रातील पहिला (जरुर) शब्द"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "`सद्यस्थिती' क्षेत्रातील दुसरा (चूक) शब्द"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "`सद्यस्थिती' क्षेत्रातील तिसरा (सद्यस्थितीदर्शक) शब्द"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "आवृत्ती श्रृंखला `%.250s': %.250s मधे त्रुटी"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "कालबाह्य `उजळणी' किंवा `पॅकेज-उजळणी' क्षेत्र वापरले"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "येथील संदर्भात `विन्यास-आवृत्ती' क्षेत्रासाठी मूल्य ठरवण्याची अनुमती नाही"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "विन्यास-आवृत्ती श्रृंखला `%.250s': %.250s मधे त्रुटी"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "`विन्यासफाईल' च्या मूल्यामधील ओळ कुरूप आहे `%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "`विन्यासफाईल' च्या मूल्यामध्ये रिक्त जागेने न सुरू होणारी ओळ आहे `%c'"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "विन्यासफाईल म्हणून मूल किंवा रिक्त निर्देशिकेची नोंद केली आहे"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr "`%s' क्षेत्र, पॅकेजचे नाव गायब, किंवा पॅकेजच्या नावाच्या अपेक्षित ठिकाणी कचरा"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "`%s' क्षेत्र, पॅकेजचे नाव अयोग्य `%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -514,7 +522,7 @@
 "`%s' क्षेत्र, संदर्भ `%.255s':\n"
 " आवृत्ती नाते खराब %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -523,76 +531,76 @@
 "`%s' क्षेत्र, संदर्भ `%.255s':\n"
 " `%c' कालबाह्य आहे, त्याएेवजी %c=' किंवा `%c%c' वापरा"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, fuzzy, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " implicit exact match on version number, suggest using `=' instead"
 msgstr "आवृत्ती क्रमांक तंतोतंत जुळल्याचे दिसते, त्याएेवजी `=' चा वापर सुचित"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "प्रोव्हाईड्ससाठी तंतोतंत आवृत्त्याच वापराव्यात"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, fuzzy, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr "आवृत्ती मूल्य अंक-अक्षरांशिवाय सुरू होतेय, रिक्त जागा अंतर्भुत करण्याचे सुचित"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "`%s' क्षेत्र, संदर्भ `%.255s': आवृत्तीत `%c' चा समावेश आहे"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "`%s' क्षेत्र, संदर्भ `%.255s': आवृत्ती अ-रहित"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "`%s' क्षेत्र, संदर्भ `%.255s': आवृत्तीत त्रुटी: %.255s"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "`%s' क्षेत्र, पॅकेज `%.255s' संदर्भात नियमबाह्य लेखन त्रुटी "
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "%s क्षेत्रात (`|') पर्यायांना अनुमती नाही"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 #, fuzzy
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "येथील संदर्भात `विन्यास-आवृत्ती' क्षेत्रासाठी मूल्य ठरवण्याची अनुमती नाही"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, fuzzy, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "`%s' क्षेत्र, पॅकेजचे नाव अयोग्य `%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 #, fuzzy
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "येथील संदर्भात `सद्यस्थिती' क्षेत्रासाठी मूल्य ठरवण्याची अनुमती नाही"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, fuzzy, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "बेकायदेशीर पॅकेजचे नाव %d ओळीवर: %.250s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, fuzzy, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "पॅकेज `%.250s'साठी असलेली फाइलची सुची"
@@ -649,7 +657,7 @@
 msgid "unable to write to status fd %d"
 msgstr "`%.250s' ची सुधारित स्थिती लिहिता येत नाही"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 msgid "malloc failed (%zu bytes)"
 msgstr "रिअललोॅक अयशस्वी (%ld बाइट्स)"
@@ -659,8 +667,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "रिअललोॅक अयशस्वी (%ld बाइट्स)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 #, fuzzy
 msgid "failed to allocate memory"
 msgstr "निर्देशिका बनवता आली नाही"
@@ -694,198 +702,204 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "%.250s साठी क्लोज-ऑन-इअेक्सइसी फ्लॅग निश्चित करणे जमत नाही"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "संरचना त्रुटी: %s चे मूल्य आवश्यक"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, fuzzy, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "संरचना फाईल `%.255s' वाचनासाठी उघडता आली नाही"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "अपरिचीत पर्याय `%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "--%s पर्याय मूल्य धारण करतो"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "--%s पर्याय मूल्य धारण करत नाही"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "`%.255s' संरचना फाईलमधे वाचन त्रुटी"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "`%.255s' संरचना फाईल बंद करताना त्रुटी"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "`%.255s' संरचना फाईल बंद करताना त्रुटी"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "अपरिचित पर्याय --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s पर्याय मूल्य धारण करतो"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s पर्याय मूल्य धारण करत नाही"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "अपरिचित पर्याय -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c पर्याय मूल्य धारण करतो"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c पर्याय मूल्य धारण करत नाही"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "ताकिद: अप्रचलित पर्याय `--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr " परस्परविरुद्ध कृती -%c (--%s) आणि -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "`%s' क्षेत्रासाठी मूल्य पुनरावृत्ती"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "वापरकर्त्याने ठरविलेेले क्षेत्र नाव `%.*s' फारच छोटे"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "वापरकर्त्याने ठरविलेेल्या क्षेत्रात `%.*s' मूल्य पुनरावृत्ती"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "पॅकेजची संरचित आवृत्ती अनुचित स्थितीत"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "अधिष्ठापन न केलेल्या पॅकेजमधे कोॅन्फफाइल आहेत, त्यांच्याकडे दुर्लक्ष"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "पॅकेज इनफो फाईल `%.255s' वाचनासाठी उघडता आली नाही"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "पॅकेज इनफो फाईल `%.255s' स्टॅट करता येत नाही"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "पॅकेज इनफो फाईल `%.255s' एममॅप करता येत नाही"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "पॅकेज इनफो फाईल `%.255s' स्टॅट करता येत नाही"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "वाचनानंतर बंद करता आले नाही: `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "क्षेत्र नाव `%.*s' नंतर इओएफ"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "क्षेत्र नाव `%.*s' मधे न्यूलाइन"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "क्षेत्र नाव `%.*s' मधे एमएसडोॅस इओएफ (^Z)"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "क्षेत्र नाव `%.*s' नंतर कोलन असणे आवश्यक"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "`%.*s' क्षेत्राच्या मूल्यापुर्वी इओएफ (अंतिम न्यूलाइन गायब)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "`%.*s' क्षेत्राच्या मूल्यात एमएसडोॅस इओएफ कॅर (न्यूलाइन गायब?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "क्षेत्र नाव `%.*s' मधे न्यूलाइन"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "`%.*s' क्षेत्राच्या मूल्यादरम्यान इओएफ (अंतिम न्यूलाइन गायब)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "अनेक पॅकेज इनफो नोंदी आढळल्या, फक्त एकालाच अनुमती"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "वाचनानंतर बंद करता आले नाही: `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "`%.255s' मधे पॅकेजची माहिती नाही"
@@ -904,66 +918,66 @@
 " %.255s"
 msgstr "%s, `%.255s' फायलीत  %d ओळीजवळ"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "रिकामी श्रृंखला नसावी"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "अंक-अक्षराने सुरुवात होणे आवश्यक"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "चिन्ह `%c' ला अनुमती नाही (फक्त अक्षरे, अंक व चिन्हे `%s')"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<काही नाही>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "आवृत्ती श्रृंखला रिकामी आहे"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "आवृत्ती श्रृंखलेत वेढलेल्या रिक्त जागा आहेत"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "आवृत्तीतील इपोच हा अंक नाही"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "आवृत्ती अंकात कोलन नंतर काही नाही"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "आवृत्ती अंकात कोलन नंतर काही नाही"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "आवृत्ती अंकात कोलन नंतर काही नाही"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "%s गायब"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "%s साठी रिक्त मूल्य"
@@ -982,51 +996,51 @@
 msgid "(no description available)"
 msgstr "(वर्णन उपलब्ध नाही)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "स्क्रिप्ट रन करण्याआधी सिग्नल %sकडे दुर्लक्ष करण्यास असमर्थ आहे"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "दोष अनकॅचिंग सिग्नल %s: %s \n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (उपप्रक्रिया): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "विशाख अयशस्वी"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "उपप्रक्रिया %s कडुन त्रुटी निर्गम स्थिती %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "%s साठी वाट पहाणे अयशस्वी झाले"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "उपप्रक्रिया %s ला (%s)%s संकेताने नष्ट केले"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", गाभा अडगळीत टाकला"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, fuzzy, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "थांबणे स्थिती कोड %d नुसार उपप्रक्रिया %s अयशस्वी झाली "
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "%s साठी वाट पहाणे अयशस्वी झाले"
@@ -1046,197 +1060,203 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, fuzzy, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "उगम फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 msgid "triggers area"
 msgstr "%s चे टाळे उघडता येत नाही: %s"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, fuzzy, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "दुस~या नविन `%.250s फाइलचे स्टॅट करणे अशक्य"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, fuzzy, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "उगम फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, fuzzy, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "नवीन डेपोॅट फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, fuzzy, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "%.255s फाइल मधुन %s वाचताना त्रुटी"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, fuzzy, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "नवीन डेपोॅट फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, fuzzy, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "नवीन डेपोॅट फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, fuzzy, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "`%.255s'ची नविन आवृत्ती स्थापन करणे अशक्य"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, fuzzy, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "नवीन डेपोॅट फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, fuzzy, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "भाग फाइल `%.250s' वाचता येत नाही"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:419
-#, fuzzy, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "दुस~या नविन `%.250s फाइलचे स्टॅट करणे अशक्य"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, fuzzy, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "दुस~या नविन `%.250s फाइलचे स्टॅट करणे अशक्य"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "दुस~या नविन `%.250s फाइलचे स्टॅट करणे अशक्य"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "दुस~या नविन `%.250s फाइलचे स्टॅट करणे अशक्य"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
+msgstr "`%.255s'ची नविन आवृत्ती स्थापन करणे अशक्य"
+
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "%.250s काढणे अशक्य"
+
+#: lib/dpkg/triglib.c:360
+#, fuzzy, c-format
+msgid "unable to create new trigger interest file `%.250s'"
 msgstr "दुस~या नविन `%.250s फाइलचे स्टॅट करणे अशक्य"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:383
 #, fuzzy, c-format
-msgid "unable to install new trigger interest file `%.250s'"
-msgstr "`%.255s'ची नविन आवृत्ती स्थापन करणे अशक्य"
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "दुस~या नविन `%.250s फाइलचे स्टॅट करणे अशक्य"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:456
 #, fuzzy, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr "नवी माहिती फाइल `%.250s' हिची `%.250s' म्हणून स्थापना करण्यास असमर्थ आहे"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, fuzzy, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "नवीन डेपोॅट फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, fuzzy, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "नवीन डेपोॅट फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "नवीन डेपोॅट फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "नवीन डेपोॅट फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "नवीन डेपोॅट फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, fuzzy, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "नवी माहिती फाइल `%.250s' हिची `%.250s' म्हणून स्थापना करण्यास असमर्थ आहे"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, fuzzy, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "भाग फाइल `%.250s' वाचता येत नाही"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, fuzzy, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "`%.255s' संरचना फाईलमधे वाचन त्रुटी"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, fuzzy, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "उगम फाइल `%.250s' उघडता येत नाही"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, fuzzy, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "डिपोॅट निर्देशिका `%.250s' वाचता येत नाही"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, fuzzy, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "डिपोॅट निर्देशिका `%.250s' वाचता येत नाही"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, fuzzy, c-format
 msgid "read error in `%.250s'"
@@ -1261,7 +1281,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "डिपिकेजी-डेब पाइप मधुन वाचन त्रुटी"
 
@@ -1280,12 +1300,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "`%.255s' सिमलिंकची मालकी निश्चित करताना त्रुटी"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "`%.255s' ची मालकी निश्चित करताना त्रुटी"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "`%.255s' च्या परवानग्या निर्धारीत करताना त्रुटी"
@@ -1340,109 +1360,124 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "आर्काइवमधे 0x%x या अपरिचित प्रकाराचे `%.255s' ओॅब्जेक्ट होते"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat file '%s'"
+msgstr "जुनी नावे `%s': %s स्टॅट करता येत नाहीत"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "%s ... जुन्या पॅकेजमधील फायली बदलल्या जात आहेत \n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "%s ... अधिष्ठापित पॅकेजमधील फायलींनी बदलले \n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
 "nondirectory"
 msgstr "%.250s पॅकेजमधील `%.250s' निर्देशिकेवर नाॅननिर्देशिकेने पुनर्लेखन करण्याच्या प्रयत्नात"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "%.250s पॅकेजमधेही असल्याने, `%.250s' वर पुनर्लेखन करण्याच्या प्रयत्नात"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "`%.255s' (`%.255s' मधील) वाचता आली नाही"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "`%.255s' दरम्यान बॅकएन्ड डिपिकेजी-डेब"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "`%.255s बंद करताना/लिहिताना त्रुटी "
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "`%.255s' पाइप बनवताना त्रुटी"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "`%.255s' उपकरण बनवताना त्रुटी"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "`%.255s' हार्ड साखळी बनवताना त्रुटी"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "`%.255s' प्रतीकात्मक साखळी बनवताना त्रुटी"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "`%.255s' निर्देशिका बनवताना त्रुटी"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "नविन आवृत्ती स्थापन करण्यासाठी `%.255s' बाजूला करण्यास अशक्य"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "`%.255s' साखळी/लिंक वाचण्यास अशक्य"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "`%.255s'चे सिमलिंक बॅकप घेणे अशक्य"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "`%.255s'चे chown सिमलिंक बॅकप घेणे अशक्य"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "नविन आवृत्ती स्थापन करण्याआधी `%.255s'चे सिमलिंक बॅकप घेणे अशक्य"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "`%.255s'ची नविन आवृत्ती स्थापन करणे अशक्य"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "`%.255s' ची रचना करता येत नाही"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "`%.255s' अनबफर करता येत नाही"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1451,7 +1486,7 @@
 "डिपिकेजी: ताकिद - %s काढून टाकून अवलंबुन रहाण्याची समस्या दुर्लक्षित करित आहे:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, fuzzy, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1460,7 +1495,7 @@
 "डिपिकेजी: ताकिद - %s काढुन टकण्यासाठी जरुरी असलेल्या\n"
 " %s पॅकेजची अजुळवणी विचारात घेत आहे.\n"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1468,7 +1503,7 @@
 msgstr ""
 "डिपिकेजी: नाही, %s हे जरूरी आहे, %s काढुन टाकण्यासाठी त्याची अजुळवणी करणे शक्य नाही.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1477,28 +1512,28 @@
 "डिपिकेजी: नाही, %s काढू शकत नाही  (--स्वयंचलीत-अजुळवणी मदत करू शकते):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, fuzzy, c-format
 msgid "removal of %.250s"
 msgstr "%.250sमध्ये वाचनाची समस्या"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, fuzzy, c-format
 msgid "installation of %.250s"
 msgstr "`%.255s'ची नविन आवृत्ती स्थापन करणे अशक्य"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, fuzzy, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "डिपिकेजी: %s च्या मर्जीनुसार %s काढून टाकण्याचा विचार करत आहे ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, fuzzy, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "डिपिकेजी: हो %sच्या मर्जीनुसार %s कढून टाकले जाइल.\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1507,40 +1542,40 @@
 "डिपिकेजी: %s बद्दल ज्याच्यात %s आहे:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 #, fuzzy
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "डिपिकेजी: ताकिद - परस्परविरोधाकडे दुर्लक्ष करित आहे, तरी पुढे जाऊ शकता !\n"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "डिपिकेजी: %s च्या मर्जीनुसार %s काढून टाकण्याचा विचार करत आहे ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s ची बरोबर स्थापना झालेली नाही - त्यावर अवलंबित असलेल्या बाबींकडे दुर्लक्ष करित आहे.\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "डिपिकेजी: %s काढुन टकण्यास समस्या येइल कारण ती %s पुरवते ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1548,108 +1583,110 @@
 msgstr ""
 "डिपिकेजी: पॅकेज %sला पुर्नस्थापनेची जरूरी आहे, पण तुमच्या विनंती नुसार ते काढूनटाकले जाइल\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "डिपिकेजी: पॅकेज %sला पुर्नस्थापनेची जरूरी आहे, ते काढून टाकले जाणार नाही.\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "डिपिकेजी: हो %sच्या मर्जीनुसार %s कढून टाकले जाइल.\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "परस्परविरोधी पॅकेजेस - %.250sची स्थापना होत नाही"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 #, fuzzy
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "डिपिकेजी: ताकिद - परस्परविरोधाकडे दुर्लक्ष करित आहे, तरी पुढे जाऊ शकता !\n"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --रिकर्सीव्ह/पुन्हा: पुन्हा: लागणारी गरज कमीतकमी एक पाथ आरग्युमेन्ट"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "--रिकर्सीव्हला लागणारा शोध अमलात आणण्यास अयशस्वी"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "फाइन्ड्स पाइप एफडीओपन करण्यास अयशस्वी"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "फाइन्ड्स पाइप वाचण्यास दोष येतोय"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "फाइन्ड्स पाइप बंद करण्यास दोष येतोय"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "--पुन्हाः पुन्हाः परत येणारी नादुरुस्त झालेली %i चूक शोधा"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "शोध घेतला, पण पॅकेजेस (फाइल *.deb) सापडले नाही"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s ला कमीतकमी एका पॅकेजच्या अर्काइव्ह फाइलच्या आरग्यूमेंटची गरज आहे"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "अगोदर निवड रद्द झालेल्या %s पॅकेजची निवड होत आहे.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "निवड रद्द झालेल्या %s पॅकेज वगळत आहे.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "%.250s ची %.250s आवृत्ती अगोदर स्थापन केलीली आहे, वगळत आहे.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s - ताकिद : %.250s हे %.250sला  %.250s वरून खाली आणते.\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "%.250s हे %.250sला  %.250s वरून खाली आणणार नाही, वगळत आहे.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1657,39 +1694,39 @@
 msgstr ""
 "पुर्नस्थापना करण्यासाठी `%.250s'ची नवीन स्थापन केलेली आवृत्ती काढुन टाकण्यास असमर्थ आहे"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "`%.250s'च्या बॅकप आवृत्तीची पुनर्रचना करण्यास असमर्थ आहे"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "`%.250s'च्या बॅकप आवृत्तीची पुनर्रचना करण्यास असमर्थ आहे"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "`%.250s'ची नवीन स्थापन केलेली आवृत्ती काढून टाकण्यास असमर्थ आहे"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "`%.250s'ची नवीन वेचलेली /extracted आवृत्ती काढून टाकण्यास असमर्थ आहे"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "नवीन डिस्ट कॉनफाइल `%.250s' स्टॅट होण्यास अयशस्वी"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "चालू स्थापन केलेली `%.250s' कॉनफाइल स्टॅट होण्यास अयशस्वी"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1700,61 +1737,61 @@
 "कॉनफिगरेशन फाइल '%s' सिस्टमवर/संगणकावर अस्तित्वात नाही.\n"
 "तुमच्या विनंतीनुसार नवीन कॉनफिग फाइलची स्थापना होत आहे.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "डिपिकेजी: %s: ताकिद -  `%.250s' हे जुने बॅकप काढून टाकण्यास अयशस्वी: %s\n"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 "डिपिकेजी: %s: ताकिद - `%.250s' चे `%.250s' पुन्हा नामांकन करण्यास अयशस्वी: %s\n"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: जीझिप ची अंमलबजावणी होउ शकली नाही %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 "डिपिकेजी: %s: ताकिद - `जुनी %.250s' डिस्ट्रिब आवृत्ती काढून टाकण्यास अयशस्वी: %s\n"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 "डिपिकेजी: %s: ताकिद - `%.250s' काढून टाकण्यास अयशस्वी (पुन्हा लिहिण्याच्या आधी): %s\n"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr ""
 "डिपिकेजी: %s: ताकिद - %.250s' हि `%.250s' ला लिंक करण्यास अयशस्वी झाली आहे: %s\n"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "%s या कॉनफिग फाइलच्या नवीन आवृत्तीची स्थापना करित आहे....\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "`%.250s' हे `%.250s' म्हणून स्थापना करण्यास असमर्थ आहे"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "`%s' हे नाव नसलेले पॅकेज प्रस्थापित झाले आहे, त्याची जुळवणी शक्य नाही"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "पॅकेज %.250s ची स्थापना आणि जुळवणी आधीच झालेली आहे"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1763,7 +1800,7 @@
 "पॅकेज %.250s हे जुळवणीसाठी तयार नाही\n"
 "जुळवणी शक्य नाही (सध्याची स्थिती `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1772,11 +1809,11 @@
 "डिपिकेजी: यावर अवलंबून असलेल्या समस्यांमुळे %sची जुळवणी करण्यास मज्जाव करते:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "अवलंबून असलेल्या समस्यांमुळे - ज़ुळवणी न करिता सोडून देते"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1785,7 +1822,7 @@
 "डिपिकेजी: %s: अवलंबून असलेल्या समस्यांमुळे, परंतू तुम्ही केलेल्या विनंतीनुसार जुळवणी करित आहे:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1793,12 +1830,12 @@
 "तुमचे पॅकेज अतिशय विसंगत परिस्थितीत आहे - त्याची जुळवणी करण्याच्या प्रयत्नाआधी तुम्ही त्याची "
 "पुर्नस्थापना करा"
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "सेटिंग होत आहे %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, fuzzy, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1807,7 +1844,7 @@
 "डिपिकेजी: %s: ताकिद - `%s' कॉनफिग फाइल स्टॅट होण्यास असमर्थ आहे\n"
 " (= `%s'): %s\n"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, fuzzy, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1816,7 +1853,7 @@
 "डिपिकेजी: %s: ताकिद - कॉनफिग फाइल `%s' हि सर्क्युलर लिंक आहे\n"
 " (= `%s')\n"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, fuzzy, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1825,7 +1862,7 @@
 "डिपिकेजी: %s: ताकिद - `%s' कॉनफाइल रिडलिंक करण्यास असमर्थ आहे\n"
 " (= `%s'): %s\n"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, fuzzy, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1834,35 +1871,35 @@
 "डिपिकेजी: %s: ताकिद -  कॉनफाइल `%.250s' फाइलनावाचे विघटन करण्याचे ठरविते\n"
 " (`%s' हे `%s' ला सिमलिंक आहे)\n"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, fuzzy, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "डिपिकेजी: %s: ताकिद - कॉनफाइल `%.250s' हि साधी फाइल किंवा सिमलिंक नाही (= `"
 "%s')\n"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "डिपिकेजी: %s: ताकिद - कॉनफाइल %s हि हॅशसाठी उघडण्यास असमर्थ आहे: %s\n"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "तुमचे झाल्यावर 'एग्झिट' टाइप करा.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1871,12 +1908,12 @@
 "\n"
 "काॅनफिगरेशन फाइल `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr "(प्रत्यक्ष `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1887,7 +1924,7 @@
 "==> सिस्टमवरील/संगणकावरिल फाइल हि तुम्ही किंवा स्क्रिप्टने बनवलेली आहे.\n"
 "==> पॅकेजमधील फाइल हि पॅकेज मेंटेनरकडून पुरवलेली आहे.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1896,7 +1933,7 @@
 "\n"
 "स्थापना झाल्यापासून बदललेली नाही.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1905,7 +1942,7 @@
 "\n"
 " ==> स्थापना केल्यापासून (तुम्ही अथवा स्क्रिप्टने) बदल केले आहेत.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1914,37 +1951,37 @@
 "\n"
 " ==> स्थापना केल्यापासून (तुम्ही अथवा स्क्रिप्टने) काढून टाकलेले.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> पॅकेज वितकराने अद्ययावत/अपडेट केलेल्या आवृत्ती पाठवल्या आहेत.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     पॅकेजमधील आवृत्ती आणि गेल्यावेळी स्थापन केलेली आवृत्ती या दोन्ही सारख्या आहेत.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> तुम्ही विनंती केल्याप्रमाणे नवीन फाइल वापरत आहे.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> तुम्ही विनंती केल्याप्रमाणे चालू जुनी फाइल वापरत आहे.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> जुनी कॉनफिग फाइल डिफॉल्ट म्हणून ठेवत आहे.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> नवीन कॉनफिग फाइल डिफॉल्ट म्हणून वापरत आहे.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1959,165 +1996,166 @@
 "      डि        : आवृत्तीमधिल फरक दखवा\n"
 "      झेड       : परिस्थिती तपासण्यासाठी ही प्रक्रिया बॅकग्राउंड मध्ये करा\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " तुमची चालू आवृत्ती ठेवणे हि डिफोॅल्ट कृती आहे.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr "नवी आवृत्ती स्थापन करणे हि डिफोॅल्ट कृती आहे.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[डिफोॅल्ट=एन]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[डिफोॅल्ट=वाय]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[डिफोॅल्ट नाही]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "एसटीडीइआरआर लिहिण्यास येणारा दोष हा कॉनफाइल प्रॉम्प्टच्या आधी शोधण्यात आला"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "कॉनफाइल प्रॉम्प्टच्या एसटिडिइनवरचा दोष वाचा"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "कॉनफाइल प्रॉम्प्टच्या एसटिडीइनवरची EOF "
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, fuzzy, c-format
 msgid "%s depends on %s"
 msgstr " च्यावर अवलंबुन "
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, fuzzy, c-format
 msgid "%s pre-depends on %s"
 msgstr "च्यावर आधी/अगोदर अवलंबुन"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, fuzzy, c-format
 msgid "%s recommends %s"
 msgstr "सल्ला देते "
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, fuzzy, c-format
 msgid "%s suggests %s"
 msgstr "सुचवते"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, fuzzy, c-format
 msgid "%s breaks %s"
 msgstr "तुटते"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, fuzzy, c-format
 msgid "%s conflicts with %s"
 msgstr "च्याबरोबर बेबनाव/परस्परविरोध"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, fuzzy, c-format
 msgid "%s enhances %s"
 msgstr "वाढवते"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s काढून टकायला पाहिजे.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s ची अजुळवणी करायला पाहिजे.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s ची स्थापना करायची आहे, पण आवृत्ती %.250s आहे.\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr " %.250s ची स्थापना झाली आहे, पण आवृत्ती %.250s आहे.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s हि अनपॅक झाली आहे, परंतु तीची कधीच उजळणी झाली नव्हती \n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s हि अनपॅक झाली आहे, पण आवृत्ती %.250s आहे.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s ची ताजी/लेटेस्ट आवृत्ती हि %.250s आहे.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s हि %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s हे %.250s पुरवतात पण ती काढून टाकायची आहे.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s हे %.250s पुरवतात पण तीची अजुळवणी करायची आहे.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr " %.250s हे %.250s पुरवतात पण ते %s आहे.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s ची स्थापना झाली नाही.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (आवृत्ती %.250s) ची स्थापना करायची आहे\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, fuzzy, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (आवृत्ती %.250s) हि %s. आहे\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s हे %.250s पुरवतात आणि त्याची स्थापना करायची आहे\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, fuzzy, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s हे %.250s पुरवतात आणि ते %s आहे.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+msgid "Use --help for help about diverting files."
+msgstr "मदतीसाठी डिपिकेजी-तोडा --मदत टाइप करा"
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "डेबियन %s आवृत्ती %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2132,8 +2170,8 @@
 "सर्वाधिकार (C) १९९५ आयन जॅकसन.\n"
 "सर्वाधिकार (C) २०००,२००१ विचर्ट अॅक्केरमन."
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2145,7 +2183,7 @@
 "आवृत्ती २ वा\n"
 "पुढील पहा. याची कोणतीही हमी नाही.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2155,7 +2193,7 @@
 "उप्युक्तता: %s [<पर्याय> ...] <आज्ञा>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2167,7 +2205,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -2208,7 +2246,7 @@
 "पाहिजेत.\n"
 "पॅकेज स्थापनपूर्व/काढल्यानंतर परिभाषेत --पॅकेज व --वळवा निर्धारीत केलेल्या असल्याच पाहिजेत\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2217,159 +2255,153 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat file '%s'"
-msgstr "जुनी नावे `%s': %s स्टॅट करता येत नाहीत"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error checking `%s': %s"
 msgid "error checking '%s'"
 msgstr "`%s': %s तपासताना त्रुटी"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, fuzzy, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr "पुनर्नामांकनात `%s' वर वेगळ्या फाइल `%s' ने पुनर्लेखन सामील आहे, संमती नाही"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "उगम फाइल `%.250s' उघडता येत नाही"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "cannot stat new name `%s': %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "नवी नावे `%s': %s स्टॅट करता येत नाहीत"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 #| msgid "rename: remove duplicate old link `%s': %s"
 msgid "rename: remove duplicate old link '%s'"
 msgstr "पुनर्नामांकन: पुनरावृत्त जुनी साखळी `%s': %s काढून टाका"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "उगम फाइल `%.250s' उघडता येत नाही"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 msgid "local diversion of %s"
 msgstr "स्थानिक वळवत आहे: %s\n"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 msgid "local diversion of %s to %s"
 msgstr "स्थानिक वळवत आहे: %s\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "diversion of %s by %s"
 msgstr "%sने फेराफार/तफावत"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "%sनी वळवले आहे: %s\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "any diversion of %s"
 msgstr "%sने फेराफार/तफावत"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 msgid "any diversion of %s to %s"
 msgstr "%sनी वळवले आहे: %s\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "cannot open GPL file"
 msgid "cannot create new %s file"
 msgstr "जीपीएल फाइल उघडता येत नाही"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "व्हीएसएनप्रिंटएफ़मधे फ़्लश? करणे जमत नाही"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 #| msgid "remove old diversions-old: %s"
 msgid "error removing old diversions-old"
 msgstr "जुने वळण-जुने: %s काढून टाका"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "नवीन स्टॅटअोव्हरराइड-जुनी: %s बनवताना त्रुटी"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "नवीन स्टॅटअोव्हरराइड: %s अधिष्ठापन करताना त्रुटी"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s ला एकच पर्याय आवश्यक"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "फाइलनाव \"%s\" हे निरपेक्ष नाही"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "फाइल मधे न्युलाइनस् नसेल"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "निर्देशिका वळवता येत नाहीत"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "निर्देशिका वळवता येत नाहीत"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "`%s' सोडत आहे"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' चे `%s' शी वितुष्ट"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "`%s' मिळवत आहे"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
 msgstr "`%s' वळण नाही, काहीही काढून टाकले नाही"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2380,7 +2412,7 @@
 "  `%s'\n"
 " काढून टाकताना  `%s' मिळाले"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2391,17 +2423,17 @@
 "  `%s'\n"
 " काढून टाकताना  `%s' मिळाले"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "`%s' काढून टाकत आहे"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "पॅकेज मधे न्युलाइनस् नसेल"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "वळवा-कडे मधे न्युलाइनस् नसेल"
 
@@ -2477,8 +2509,8 @@
 msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s पर्याय घेत नाही"
@@ -2571,7 +2603,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--कंपेअर-वर्जन चुकिचे रिलेशन"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "डिपिकेजी: वर्जन '%s' ची चुकीची सिन्टॅक्स/वाक्यरचना आहे: %s\n"
@@ -2627,12 +2659,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "डिपिकेजी - ताकिद, समस्येवर दुर्लक्ष करित आहे कारण --फोर्स कार्यक्षम करतो:\n"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "`%.250s'पॅकेजची फाइल्सची सुची असलेली फाइल उघडण्यास असमर्थ"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, fuzzy, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2641,37 +2673,37 @@
 "डिपिकेजी: गंभीर ताकिद: पॅकेज `%.250s'साठी फाइल्सची सुची असलेली फाइल हरवली आहे, असे "
 "गृहित धरुया कि पॅकेजमध्ये स्थापन केलेली कोणतीही फाइल नाही.\n"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "`%.250s'पॅकेजची फाइल्सची सुची असलेली फाइल उघडण्यास असमर्थ"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "पॅकेज `%.250s'साठी असलेली फाइलची सुची"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, fuzzy, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "दोषामुळे पॅकेज `%.250s'साठी फाइलची सुची असलेली फाइल बंद होत आहे"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(डेटाबेस वाचत आहे ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2679,32 +2711,32 @@
 msgstr[0] "%d फाइल्स आणि डिरेक्टरीज यांची सध्या स्थापना झालेली आहे.)\n"
 msgstr[1] "%d फाइल्स आणि डिरेक्टरीज यांची सध्या स्थापना झालेली आहे.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "पॅकेज %sच्या अद्ययावत फाइलची सुची असलेली फाइल बनवण्यास असमर्थ आहे"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "पॅकेज %sच्या अद्ययावत फाइलची सुची असलेली फाइल लिहिण्यास अयशस्वी झाले आहे"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "पॅकेज %sच्या अद्ययावत फाइलची सुची असलेली फाइल फ्लश करण्यास अयशस्वी"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "पॅकेज %sच्या अद्ययावत फाइलची सुची असलेली फाइल सिंक करण्यास अयशस्वी"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "पॅकेज %sच्या अद्ययावत फाइलची सुची असलेली फाइल बंद करण्यास अयशस्वी"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "पॅकेज %sच्या अद्ययावत फाइलची सुची असलेली फाइल स्थापन करण्यास अयशस्वी"
@@ -2744,7 +2776,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "डिपिकेजी - दोष: पाथ निश्चित केलेला नाही.\n"
 
 #: src/help.c:129
@@ -2776,7 +2808,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "व्हीएसएनप्रिंटएफ़मधे सुरूवात करणे जमत नाही"
@@ -2787,66 +2819,66 @@
 msgstr "`%.250s'ला  सिएचरूट करण्यास अयशस्वी"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "`%.255s' ला सीएचडीआयआर करता आली नाही"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "`%.250s' वरिल एग्झिक्युट परवानगी सेट करण्यास असमर्थ आहे"
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "व्हीएसएनप्रिंटएफ़मधे सुरूवात करणे जमत नाही"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "जुनी %s स्क्रिप्ट"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "%s `%.250s' स्टॅट करण्यास असमर्थ आहे"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "नविन %s स्क्रिप्ट"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "जुनी %s स्क्रिप्ट"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "%s `%.250s' स्टॅट करण्यास असमर्थ आहे"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "डिपिकेजी: त्याऐवजी नविन पॅकेज मधल्या स्क्रिप्टचा प्रयत्न करते ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "पॅकेजच्या नव्या आवृत्तीमध्ये स्क्रिप्ट नाही आहे - सोडून देत आहे"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "डिपिकेजी: ... ते बरोबर झाल्यासरखे दिसत आहे.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "`%.255s' ची रचना करता येत नाही"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2855,7 +2887,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "%.250s'चे अस्तित्व तपासण्यास असमर्थ"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "माहितीची डिरेक्टरी वाचू शकत नाही"
 
@@ -2920,7 +2952,7 @@
 "  -Dh|--डिबग=हेल्प \t\tदोष/चुक शोधण्याची मदत दाखवते.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -3040,7 +3072,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr "`डिसिलेक्ट' किंवा `अॅप्टिट्युड' युजर-फ्रेन्डली पॅकेज व्यवस्थापनासाठी वापरा.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3092,30 +3124,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3124,102 +3160,102 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "अवलंबुन असलेल्या समस्या - काढून टाकत नाही"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "अवलंबुन असलेल्या समस्या - काढून टाकत नाही"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "व्हीएसएनप्रिंटएफ़मधे सुरूवात करणे जमत नाही"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "`%.255s' संरचना फाईलमधे वाचन त्रुटी"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3227,7 +3263,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3235,35 +3271,35 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--डिबगला ऑक्टल आरग्युमेन्टची/पर्यायाची गरज आहे"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "null/नल पॅकेज नाव --इग्नोर-डिपेन्डस कॉमा-सेपरेटेड `%.250s' सुचीमधिल"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--इग्नॉर-डिपेन्डसला  कायदेशीर पॅकेज नाव आवश्यक आहे. `%.250s' हे नाही; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%sसाठी अयोग्य पूर्णांक : `%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3272,7 +3308,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3280,12 +3316,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr " अज्ञात फोर्स/रिफ्युज पर्याय `%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "ताकिद: अप्रचलित फोर्स/रिफ्युज पर्याय `%.*s'\n"
@@ -3308,8 +3344,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "%d ओळीच्या शेवटाच्या अगोदर अनपेक्षित इओएफ/फाइलचा शेवट"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "क्रियेच्या पर्यायाची आवश्यक्ता आहे"
 
@@ -3473,189 +3509,189 @@
 msgid "passed\n"
 msgstr " मंजूर झाले\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "अस्थायी निर्देशिकानाव बनवता आले नाही"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr ""
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr "जुन्य़ा पॅकेजच्या आवृत्तीत `%.250s'नी सुरुवात होणारे फारच मोठे माहिती फाइलचे नाव आहे"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "अप्रचलित माहिती फाइल `%.250s' काढण्यास अशक्य"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "`%.250s' नविन माहितीच्या फाइलची स्थापना(गृहीत धरलेले) करण्यास अशक्य"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "टेम्प/तात्पुर्ती नियंत्रण डिरेक्टरी उघडण्यास अशक्य "
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr "(`%.50s'नी सुरुवात होणारे) फारच मोठे नियंत्रण माहिती फाइल नाव पॅकेजमध्ये आहे"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "`%.250s' डिरेक्टरी पॅकेजच्या नियंत्रण माहितीमध्ये समाविष्ट आहे"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "पॅकेजची नियंत्रण माहिती `%.250s'ची आरएमडिआयआर/rmdir डिआयआर नाही असे म्हंटले नाही"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr "डिपिकेजी: ताकिद - पॅकेज %sमध्ये माहिती फाइलची सुची समाविष्ट आहे"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "नवी माहिती फाइल `%.250s' हिची `%.250s' म्हणून स्थापना करण्यास असमर्थ आहे"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "नियंत्रण माहिती फाइल `%.250s' काढून टाकण्यास असमर्थ आहे"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "आर्काइव्हमध्ये प्रवेश करणे अशक्य"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "अस्थायी निर्देशिकानाव बनवता आले नाही"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "नियंत्रण माहिती लांबी"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "%s मधुन %sच्या माहितीची नोंद केली.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "(%s) पॅकेज आर्किटेक्चर (%s) प्रणाली बरोबर जुळत नाही"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, fuzzy, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
 "%s"
 msgstr "डिपिकेजी: %s बद्दल ज्यात %s आहे, प्रि-डिपेन्डन्सी समस्या:\n"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "प्रि-डिपेन्डन्सी समस्या - %.250s स्थापना करत नाही"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr "डिपिकेजी: ताकिद - प्रि-डिपेन्डन्सी समस्यांकडे दुर्लक्ष करत आहे !\n"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "%s %s बदली करण्याची तयारी करत आहे (%s उपयोगात आणा) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "%s अनपॅक करत आहे (%s मधुन) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "कॉन्फफाइलचे नाव (`%.250s' पासुन सुरवात) खूप मोठे आहे (>%d अक्षरे)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "%.250sमध्ये वाचनाची समस्या"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "समस्या %.250s बंद करत आहे"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "समस्या %.250s उघडण्याचा प्रयत्न करत आहे"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, fuzzy, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "%sची अजुळवणी करत आहे, जेणे करुन आपण %s काढुन टाकू शकतो...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, fuzzy, c-format
 msgid "De-configuring %s ...\n"
 msgstr "%s काढून टाकत आहे...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "%.250sची अदलाबदली अनपॅक करत आहे ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "डिपिकेजी-डेब टार आउट्पुट/उत्पादन वाचनाची समस्या"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "दुषित फाइलप्रणाली टारफाइल - दुषित आर्काइव्ह पॅकेज"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "डिपिकेजी-डेब: शक्य असलेली मागिल शून्ये झॅप करा/ काढून टाका"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, fuzzy, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "डिपिकेजी: ताकिद - जुनी `%.250s' फाइल स्टॅट करण्यास अशक्य म्हणुन ती डिलिट करत नाही: "
 "%s "
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "डिपिकेजी: ताकिद - जुनी `%.250s' डिरेक्टरी डिलिट करण्यास/काढण्यास अशक्य: %s\n"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, fuzzy, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "डिपिकेजी: ताकिद - जुनी `%.250s' कॉन्फफाइल रिकामी डिरेक्टरी होती (आणि ती आता डिलिट "
 "करण्यात /काढून टाकण्यात आली आहे)\n"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "दुस~या नविन `%.250s फाइलचे स्टॅट करणे अशक्य"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, fuzzy, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3664,12 +3700,12 @@
 "डिपिकेजी: ताकिद - जुनी `%.250s' फाइल ही अनेक नविन फाइलींप्रमाणे आहे!  (दोन्ही "
 "%.250s' आणि `%.250s')"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "डिपिकेजी: ताकिद - जुनी `%%.250s' फाइल %s करण्यास अशक्य : %%s\n"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(नोंद करत आहे %s नाहिसे झाले आहे, ते पुर्णपणे बदलले गेले आहेत.)\n"
@@ -3834,7 +3870,7 @@
 "  --अॅडमिनडिआयआर=<डिरेक्टरी>          %sच्या ऐवजी <डिरेक्टरी> वापरा.\n"
 "  -f|--शोफॉरमॅट=<फॉरमॅट>              --शो साठी दुसरे स्वरुप वापरा.\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3854,6 +3890,10 @@
 "  वापरून पॅकेजमध्ये माहिती समाविष्ट करता येते\n"
 "  फिल्ड/क्षेत्र उजव्या बाजुला असावे जर व्याप्ती ऋण असेल तर डाव्या बाजुला असावे.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, fuzzy, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3915,7 +3955,7 @@
 msgid "Removing %s ...\n"
 msgstr "%s काढून टाकत आहे...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, fuzzy, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3924,48 +3964,49 @@
 "डिपिकेजी - ताकिद: %.250s काढताना, `%.250s'ची डिरेक्टरी काढणे अशक्य: %s s - "
 "डिरेक्टरी कदाचित माऊंट पॉइंट आहे ?\n"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "%.250s काढणे अशक्य"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "`%.255s' ची रचना करता येत नाही"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "डिपिकेजी - ताकिद: %.250s काढताना, डिरेक्टरी `%.250s' रिकामी नाही म्हणुन काढली "
 "नाही.\n"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "%.250s काढणे अशक्य"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "%sसाठी जुळवणी फाइल पर्ज करत आहे...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "जुनी कॉन्फिग फाइल `%.250s' काढणे अशक्य (= `%.250s')"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "कॉन्फिग फाइल डिआयआर `%.250s' हि  (`%.250s'मधून) वाचू शकत नाही"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr "(%.250s'ची) जुनी बॅकप कॉन्फिग फाइल %.250s' काढू शकत नाही"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "जुन्या फाइलची सुची काढू शकत नाही"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "जुने पोस्टआरएम/postrm स्क्रिप्ट काढू शकत नाही"
 
@@ -4008,7 +4049,11 @@
 msgid "read error on standard input"
 msgstr "स्टॅण्डर्ड इनपूटवर दोष वाचा"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4018,7 +4063,7 @@
 "सर्वाधिकार (C) १९९५ आयन जॅकसन.\n"
 "सर्वाधिकार (C) २०००,२००१ विचर्ट अॅक्केरमन."
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4029,7 +4074,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -4058,56 +4103,56 @@
 "  --मदत                   हा मदतीचा संदेश दाखवा.\n"
 "  --आवृत्ती                आवृत्तीची माहिती दाखवा.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "ट्रेलिंग / स्ट्रिप करत आहे"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "नवीन स्टॅटअोव्हरराइड फाइल: %s उघडता येत नाही"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "स्टॅटअोव्हरराइड-जुनी: %s काढून टाकताना त्रुटी"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "नवीन स्टॅटअोव्हरराइड-जुनी: %s बनवताना त्रुटी"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "नवीन स्टॅटअोव्हरराइड: %s अधिष्ठापन करताना त्रुटी"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--मिळवा साठी चार पर्याय आवश्यक"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, fuzzy, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr "पण निर्धारीत केलेली --बळजबरी दुर्लक्षिली जाईल."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, fuzzy, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "\"%s\" साठी अोव्हरराइड आधीच अस्तित्वात आहे, "
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, fuzzy, c-format
 msgid "--update given but %s does not exist"
 msgstr "धोक्याची सूचना: --सुधारा दिलेले आहे पण %s अस्तित्वात नाही"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "अोव्हरराइड अस्तित्वात नाही."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 #, fuzzy
 msgid "--update is useless for --remove"
 msgstr "धोक्याची सूचना: --काढा साठी --सुधारा निरुपयोगी आहे"
@@ -4179,17 +4224,17 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "स्टॅटओवरराइड फाइल `%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "मदतीसाठी डिपिकेजी-तोडा --मदत टाइप करा"
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "डेबिअन `%s' पॅकेज व्यवस्थापन प्रोग्रॅम क्वेरी/शंका साधन\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4199,7 +4244,7 @@
 "उप्युक्तता: %s [<पर्याय> ...] <आज्ञा>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4208,7 +4253,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4222,31 +4267,31 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 #, fuzzy
 msgid "takes one argument, the trigger name"
 msgstr "--%s फक्त एकच पर्याय घेउ शकतो (.डेब फाइलनाव)"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "`%s' क्षेत्र, पॅकेजचे नाव अयोग्य `%.255s': %s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "`%s' क्षेत्र, पॅकेजचे नाव अयोग्य `%.255s': %s"
@@ -4275,33 +4320,34 @@
 msgstr "%sसाठी जुळवणी फाइल पर्ज करत आहे...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%sला नेमका एक पॅकेजेस फाइल आर्ग्युमेन्ट/पर्याय लागतो"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "मोठ्या प्रमाणात उपलब्ध असलेल्या अद्ययावत माहितीसाठी डिपिकेज़ि दर्जाच्या क्षेत्रात प्रवेश करु "
 "शकत नाही"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "मोठ्या प्रमाणात उपलब्ध असलेल्या अद्ययावत महितीसाठी डिपिकेजि दर्जाच्या क्षेत्रात "
 "लिहिण्याची परवानगी लागते"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "उपलब्द्ध असलेली पॅकेजेसची माहिती %s. वापरून बदलत आहे.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "उपलब्द्ध असलेली पॅकेजेसची माहिती %s. वापरून अद्ययावत करता येते.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4309,7 +4355,7 @@
 msgstr[0] "%d पॅकेजेसची माहिती अद्ययावत आहे.\n"
 msgstr[1] "%d पॅकेजेसची माहिती अद्ययावत आहे.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4423,8 +4469,8 @@
 msgstr[1] ""
 "डिपिकेजी-डेब: नियंत्रण फाइल(ली) बद्दलच्या %d धोक्याच्या सूचनांकडे दुर्लक्ष केले जातेय\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s साठी  <निर्देशिका> पर्यायाची गरज आहे"
@@ -4456,26 +4502,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "डिपिकेजी-डेब: `%s' मधे `%s' पॅकेज निर्माण केली जात आहेत\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "टीएमपीफाईल (डेटा) बनवता आली नाही"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "नियंत्रण क्षेत्र"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "टीएमपीफाईल (डेटा), %s अनलिंक करता आली नाही"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4491,20 +4537,20 @@
 msgid "error writing `%s'"
 msgstr "`%s' लिहिताना त्रुटी"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "सदस्यांदरम्यान"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "टार पाइप (डेटा) त फाइलनाम लिहिता आले नाही"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4522,76 +4568,76 @@
 msgid "error reading %s from file %.255s"
 msgstr "%.255s फाइल मधुन %s वाचताना त्रुटी"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "आर्काइव `%.255s' वाचता आले नाही"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "आर्काइव एफस्टॅट करता आले नाही"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "आर्काइव मधील आवृत्ती क्रमांकात बिंदू नाही"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "आर्काइव मधील शिर्षकामधे न्युलाइन नाही"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "फाइल `%.250s' भ्रष्ट आहे - खराब भाग क्रमांक"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "फाइल `%.250s' ही डेबियन बायनरी आर्काइव नाही  (डिपिकेजी-स्प्लिट वापरुन पहा?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "आर्काइव मधील आवृत्ती क्रमांकात बिंदू नाही"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "आर्काइव मधील शिर्षकामधे न्युलाइन नाही"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "आर्काइव मधील आवृत्ती क्रमांकात बिंदू नाही"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "आर्काइव आवृत्ती %.250s समजत नाही, नवीन डिपिकेजी-डेब मिळवा"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "%s मधील सदस्य डेटा सोडून दिला"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "फाइल `%.250s' मधे न समजणारा डेटा सदस्य %.*s आहे, सोडुन देत आहे"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "फाइल `%.250s' मधे दोन नियंत्रण सदस्य आहेत, सोडुन देत आहे"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4603,23 +4649,23 @@
 "नवीन डेबियन पॅकेज, आवृत्ती %s.\n"
 "आकार %ld बाइट्स: नियंत्रण आर्काइव= %zi बाइट्स.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "आर्काइवमधील नियंत्रण लांबी `%s' चे फॉरमॅट चुकीचे आहे"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "%s मधील सदस्य डेटा सोडून दिला"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4631,7 +4677,7 @@
 "जुने डेबियन पॅकेज, आवृत्ती %s.\n"
 "आकार %ld बाइट्स: नियंत्रण आर्काइव= %zi, मुख्य आर्काइव= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, fuzzy, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4640,51 +4686,52 @@
 "डिपिकेजी-डेब: फाइल आर्काइव असल्यासारखी वाटते, जी\n"
 "डिपिकेजी-डेब: आस्की पद्धतीत डाउनलोड झाल्याने भ्रष्ट झाली आहे\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' हे डेबियन फॉरमॅट आर्काइव नाही"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "प्रतिलिपीतील पाइपमधे लेखन करता आले नाही"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "प्रतिलिपीतील पाइप बंद करता आला नाही"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "डेटा"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "निर्देशिकेत सीएचडिआयआर करता आले नाही"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "निर्देशिका बनवता आली नाही"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "निर्देशिका बनवल्यानंतर तिच्यात सीएचडिआयआर करता आले नाही"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "निर्देशिकेत सीएचडिआयआर करता आले नाही"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s: डिकाँंप्रेशन"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 #, fuzzy
 msgid "paste"
 msgstr " मंजूर झाले\n"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s  साठी .डेब फाइलनाव पर्यायाची गरज आहे"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4693,37 +4740,37 @@
 "--%s  साठी लक्ष निर्देशिकेची गरज आहे.\n"
 "कदाचित आपणास डिपिकेजी --इन्स्टाल चा वापर करावा लागेल ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s जास्तित जास्त दोनच पर्याय घेउ शकतो (.डेब आणी निर्देशिका)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s फक्त एकच पर्याय घेउ शकतो (.डेब फाइलनाव)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "साफसफाईसाठी `/' ला सीएचडिआयआर करता आले नाही"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
 msgid "control file '%s'"
 msgstr "जुनी नावे `%s': %s स्टॅट करता येत नाहीत"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "डिपिकेजी-डेब: `%.255s'  मधे कोणताही नियंत्रण घटक नाही `%.255s'\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr "चालू असलेला घटक `%.255s' (%.255s मधील) अनपेक्षित रित्या बंद पडला"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, fuzzy, c-format
 #| msgid "One requested control component is missing"
 msgid "%d requested control component is missing"
@@ -4731,58 +4778,58 @@
 msgstr[0] "मागितलेल्यांपैकी एक नियंत्रण घटक सापडत नाही"
 msgstr[1] "मागितलेल्यांपैकी एक नियंत्रण घटक सापडत नाही"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "`%.255s' निर्देशिका चाळता येत नाही"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "`%.255s' (`%.255s' मधील) स्टॅट करता येत नाही"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "`%.255s' (`%.255s' मधील) उघडता येत नाही"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "`%.255s' (`%.255s' मधील) वाचता आली नाही"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld बाइट्स, %5d ओळी %c %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, fuzzy, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "निव्वळ मजकूर फाइल नाही %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(नियंत्रण आर्काइवमधे `नियंत्रण' फाइल नाही!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "`नियंत्रण' घटक उघडता आला नाही"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "`नियंत्रण' घटक वाचता आला नाही"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "फाइन्ड्स पाइप बंद करण्यास दोष येतोय"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "फॉरमॅट मधे त्रुटी"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--मजकूर फक्त एकच पर्याय घेतो"
 
@@ -4803,6 +4850,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4818,7 +4867,7 @@
 " --एफसिस-टारफाइल टारफाइल फाइलप्रणाली निर्गत करा.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, fuzzy, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4831,11 +4880,12 @@
 " हे मुख्य `नियंत्रण' फाइलमधील क्षेत्राचे नाव आहे.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4858,7 +4908,7 @@
 " अनुमती दिलेली मूल्ये: जीझिप, बीझिप२, काहीनाही.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4873,7 +4923,7 @@
 "एक्सट्रॅक्ट' वापरुन\n"
 " उलगडलेली पॅकेजेस् व्यवस्थित अधिष्ठापित होणार नाहीत !\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4881,17 +4931,17 @@
 "*.डेब फायलींच्या हाताळणीसंबंधी मदतीसाठी डिपिकेजी-डेब --मदत टाइप करा;\n"
 "पॅकेजेस् अधिष्ठापन करणे व काढून टाकणे यासाठी डिपिकेजी --मदत टाइप करा."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "--%sसाठी अयोग्य पूर्णांक : `%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "--%sसाठी अयोग्य पूर्णांक : `%.250s'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "अपरिचीत संकोच प्रकार `%s'!"
@@ -4911,7 +4961,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "फाइल `%.250s' भ्रष्ट आहे - %.250s नंतर न्यूलाइन गायब"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "%.250s वाचताना त्रुटी"
@@ -5000,53 +5050,59 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "फाइल `%.250s' भ्रष्ट आहे - खराब भाग क्रमांक"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+msgid "package architecture"
+msgstr "(पॅकेज: "
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr "फाइल `%.250s' भ्रष्ट आहे - दुसऱ्या शिर्षकाच्या शेवटी जादूटोणा"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "फाइल `%.250s' भ्रष्ट आहे - दुसरा सदस्य हा डेटा सदस्य नाही"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr "फाइल `%.250s' भ्रष्ट आहे - दिलेल्या आकारासाठी भागांची संख्या चुकीची"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "फाइल `%.250s' भ्रष्ट आहे - दिलेल्या भाग क्रमांकासाठी आकार चुकीचा"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "भाग फाइल `%.250s' एफस्टॅट करता येत नाही"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "फाइल `%.250s' भ्रष्ट आहे - फारच लहान"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "आर्काइव भाग फाइल `%.250s' उघडता येत नाही"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "फाइल `%.250s' ही आर्काइव भाग नाही"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5069,12 +5125,19 @@
 " भाग फाइल आकार (वापरलेला भाग): %lu bytes\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<अनोळखी>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--माहिती साठी एक अथवा अनेक भाग फाइल पर्याय आवश्यक आहेत"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "फाइल `%s' ही आर्काइव भाग नाही\n"
@@ -5108,7 +5171,7 @@
 msgid "split package part"
 msgstr "पॅकेज गायब"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "झाले\n"
@@ -5165,12 +5228,11 @@
 "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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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"
 " --डीपीओटीडीआर %s/%s एेवजी वापरा.\n"
@@ -5181,20 +5243,29 @@
 "\n"
 "निर्गम स्थिती: 0 = ठीक; 1 = -a हा भाग नाही; 2 = संकट!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "मदतीसाठी डिपिकेजी-तोडा --मदत टाइप करा"
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "%.250s मधील फाइलचा अनपेक्षित शेवट"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "भाग आकार खुपच मोठा आहे किंवा धन नाही"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, fuzzy, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "भाग आकार कमीतकमी %dk असणे आवश्यक (शिर्षक समाविष्ट होण्यासाठी)"
@@ -5307,42 +5378,42 @@
 "%s.\n"
 " काढून टाकले\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "उगम फाइल `%.250s' उघडता येत नाही"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "उगम फाइल एफस्टॅट करता येत नाही"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "उगम फाइल `%.250s' निव्वळ मजकूर फाइल नाही"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--तोडा साठी उगम फाइलनाव पर्याय देणे गरजेचे"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--तोडा साठी जास्तित जास्त उगम फाइलनाव आणी अंतिमस्थान उपसर्ग देता येतात"
 
@@ -5466,132 +5537,93 @@
 "  --मदत                   हा मदतीचा संदेश दाखवा.\n"
 "  --आवृत्ती                आवृत्तीची माहिती दाखवा.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 #, fuzzy
 #| msgid "parse error"
 msgid "error"
 msgstr "पार्स त्रुटी"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "धोक्याची सुचना"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat %s: %s"
-msgstr "जुनी नावे `%s': %s स्टॅट करता येत नाहीत"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, fuzzy, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "दोन पद्धती निर्धारीत केल्यात: %s आणी --%s"
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
 #| msgid "cannot open diversions: %s"
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "वळवलेले: %s उघडता येत नाही"
 
-#: utils/update-alternatives.c:395
-#, fuzzy, c-format
-#| msgid "%s: copying %s to %s failed, giving up: %s"
-msgid "scan of %s failed: %s"
-msgstr "%s: %s ची %s मधे नक्कल बनवता आली नाही, सोडून देत आहे: %s"
-
-#: utils/update-alternatives.c:420
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "%s एग्झेक करण्यास अयशस्वी"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "%s ला %s ची सिमलिंक करता येत नाही: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "%s हे %s म्हणून अधिष्टापन करता येत नाही: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr " %s काढून टाकता येत नाही: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "%.255s तील %s मधील फाइलचा अनपेक्षित शेवट"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "%s: %s वाचता येत नाही"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "%.255s तील %s मधील फाइलचा अनपेक्षित शेवट"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, fuzzy, c-format
 msgid "%s corrupt: %s"
 msgstr "अंतर्गत त्रुटी: %s भ्रष्ट: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "सुधार-विकल्प फायलींमधे न्यूलाइन्स ना मनाई (%s)"
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "एसटीडीआउट लिहीताना त्रुटी"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "पुनरावृत्त गुलाम %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 #, fuzzy
 msgid "slave link"
 msgstr "पुनरावृत्त गुलाम साखळी %s"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "गुलाम साखळी प्रमुख साखळी %s सारखीच"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "पुनरावृत्त गुलाम साखळी %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "पुनरावृत्त मार्ग %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, fuzzy, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5600,233 +5632,269 @@
 "%s साठीचा विकल्प %s कडे निर्देश करतो - जो सापडला नाही. विकल्पांच्या यादीतून काढून "
 "टाकत आहे."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 #, fuzzy
 msgid "priority"
 msgstr "अग्रक्रम %s %s"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, fuzzy, c-format
 msgid "priority of %s: %s"
 msgstr "अग्रक्रम %s %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "%s: %s वाचता येत नाही"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 #, fuzzy
 msgid "master link"
 msgstr "पुनरावृत्त गुलाम साखळी %s"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "%s: %s बंद करता येत नाही"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, fuzzy, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "कालबाह्य गुलाम साखळी %s (%s) त्यागत आहे."
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "%s: %s लिहिता येत नाही"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, fuzzy, c-format
 msgid "  link currently points to %s"
 msgstr "साखळी सद्ध्या %s कडे निर्देश करते"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 #, fuzzy
 msgid "  link currently absent"
 msgstr "साखळी सद्ध्या अस्तित्वात नाही"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "%s - priority %s"
 msgid "%s - priority %d"
 msgstr "%s - अग्रक्रम %s"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr " गुलाम %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "सद्ध्याची `सर्वात चांगली' आवृत्ती %s आहे."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "आवृत्त्या उपलब्ध नाहीत."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "वर्णन"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 #, fuzzy
 msgid "Priority"
 msgstr "अग्रक्रम %s %s"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, fuzzy, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr "डिफॉल्ट[*] ठेवण्यासाठी एंटर दाबा, किंवा निवड अंक टाइप करा: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "विकल्प `%s' सापडत नाही."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "%.255s तील %s मधील फाइलचा अनपेक्षित शेवट"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "%s साखळीचे %s मधून %s मधे पुनर्नामांकन करत आहे."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, fuzzy, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "गुलाम साखळी %s चे %s मधून %s मधे पुनर्नामांकन करत आहे."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr ""
+
+#: utils/update-alternatives.c:2241
+#, fuzzy, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "धोक्याची सूचना: --सुधारा दिलेले आहे पण %s अस्तित्वात नाही"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr ""
+"%s साठीचा विकल्प %s कडे निर्देश करतो - जो सापडला नाही. विकल्पांच्या यादीतून काढून "
+"टाकत आहे."
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr ""
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "अपरिचीत पर्याय `%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--अधिष्ठापा साठी <साखळी> <नाव> <मार्ग> <अग्रक्रम> आवश्यक"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "अग्रक्रम हा पूर्णांकच असला पाहिजे"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s साठी <नाव> <मार्ग> आवश्यक"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s साठी <नाव> आवश्यक"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--गुलाम ला फक्त --अधिष्ठापा सोबत अनुमती"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--गुलाम साठी <साखळी> <नाव> <मार्ग> आवश्यक"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "नाव %s हे प्राथमिक व गुलाम दोन्ही"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "साखळी %s ही प्राथमिक व गुलाम दोन्ही"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s ला एकच पर्याय आवश्यक"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "अपरिचीत पर्याय `%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -5835,67 +5903,23 @@
 "--दाखवा, --संरचना, --निश्चिती, --अधिष्ठापा, --काढा, --सर्व, --काढा-सर्व, किंवा --"
 "स्वयं गरजेचे"
 
-#: utils/update-alternatives.c:2215
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr ""
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2239
-#, fuzzy, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "धोक्याची सूचना: --सुधारा दिलेले आहे पण %s अस्तित्वात नाही"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
-
-#: utils/update-alternatives.c:2257
-#, fuzzy, c-format
-msgid "it is a slave of %s"
-msgstr " गुलाम %s: %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "स्टॅण्डर्ड इनपूटवर दोष वाचा"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, fuzzy, c-format
 msgid "no alternatives for %s."
 msgstr "%s साठी विकल्प नाही."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
@@ -5904,69 +5928,109 @@
 "%s मधे बदल झाला आहे (तुमच्याकडून किंवा  परिभाषेकडून).\n"
 "फक्त स्वहस्तेच सुधारणा करण्याचे स्विकारत आहे."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, fuzzy, c-format
 msgid "setting up automatic selection of %s."
 msgstr "%s करिता स्वयंचलित निवड संरचित करत आहे."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "%s साठीचा %s विकल्प नोंदणीकृत नाही, काढून टाकत नाही."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 "%s पुरवणारी फक्त १ आज्ञावली आहे\n"
 "(%s). संरचना करण्यास काहीही नाही.\n"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "%s साठीचा %s विकल्प नोंदणीकृत नाही, काढून टाकत नाही."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, fuzzy, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr "तुम्ही स्वतःच निवडलेले विकल्प काढून टाकत आहे - स्वयंचलित पद्धती स्विकारत आहे"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "%s च्या स्वयंचलित सुधारणा असमर्थ केलेल्या आहेत, तसेच सोडत आहे."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr "स्वयंचलित सुधारणांकडे परत जाण्यासाठी `सुधारा-विकल्प --स्वयं %s' वापरा."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "`%s' पुरवण्याकरिता `%s' वापरत आहे."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~ msgid "it is a slave of %s"
+#~ msgstr " गुलाम %s: %s"
+
+#, fuzzy
+#~| msgid "cannot stat old name `%s': %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "जुनी नावे `%s': %s स्टॅट करता येत नाहीत"
+
+#, fuzzy
+#~| msgid "%s: copying %s to %s failed, giving up: %s"
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "%s: %s ची %s मधे नक्कल बनवता आली नाही, सोडून देत आहे: %s"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "%s एग्झेक करण्यास अयशस्वी"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "%s ला %s ची सिमलिंक करता येत नाही: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "%s हे %s म्हणून अधिष्टापन करता येत नाही: %s"
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "एसटीडीआउट लिहीताना त्रुटी"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "%s: %s वाचता येत नाही"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "%s: %s बंद करता येत नाही"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "%s: %s लिहिता येत नाही"
+
+#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "%s चे %s मधे पुनर्नामांकन करता येत नाही: %s"
@@ -6205,9 +6269,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "%s मधील सदस्य डेटा सोडून दिला"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "टार इक्सइसी करता आले नाही"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "अस्थायी निर्देशिकानाव बनवता आले नाही"
Binary files dpkg/po/nb.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/nb.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/nb.po /home/vorlon/devel/multiarch/dpkg-debian/po/nb.po
--- dpkg/po/nb.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/nb.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-09-02 02:38+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -24,7 +24,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "klarte ikke å skrive fila «%s»"
@@ -45,71 +45,77 @@
 msgid "ar member file (%s)"
 msgstr "klarte ikke finne (fstat) ar-medlemsfil (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "klarte ikke lese på mellomlager kopi for %s"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "klarte ikke skrive på mellomlager kopi for %s"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "kort lesing på mellomlager kopi for %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "klarte ikke kjøre «tar»"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "klarte ikke kjøre %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekomprimering"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: komprimering"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: klarte ikke binde inndata til gzip-strøm"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: intern gzip-lesefeil: «%s»"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: intern gzip-skrivefeil"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: klarte ikke binde utdata til gzip-strøm"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: intern gzip-lesefeil"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: intern gzip-skrivefeil: «%s»"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: intern gzip-skrivefeil: %s"
@@ -124,31 +130,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: intern bzip2-lesefeil: «%s»"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: intern bzip2-skrivefeil"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: klarte ikke binde utdata til bzip2-strøm"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: intern bzip2-lesefeil"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: intern bzip2-skrivefeil: «%s»"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "uventet bzip2-feil"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -157,105 +163,105 @@
 "oppdateringskatalogen inneholder fila «%.250s», som har for langt navn "
 "(lengde=%d, maks=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, 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)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "klarte ikke skanne oppdateringskatalogen «%.255s»"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "klarte ikke fjerne den innlagte oppdateringsfila %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "klarte ikke opprette «%.255s»"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "klarte ikke etterfylle %.250s"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "klarte ikke tømme %.250s etter etterfylling"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "klarte ikke søke til starten av %.250s etter etterfylling"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "klarte ikke åpne låsefila %s for testing"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "klarte ikke åpne/opprette låsefila til statusdatabasen"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "du har ikke tillatelse til å låse dpkg-statusdatabasen"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "klarte ikke låse dpkg-statusdatabasen"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "den ønskede handlingen krever superbrukertilgang"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "får ikke tilgang til dpkg-statusområdet"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "operasjonen krever lese- og skrivetilgang til dpkg-statusområdet"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "klarte ikke fjerne min egen oppdateringsfil %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "klarte ikke skrive oppdatert status for «%.250s»"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "klarte ikke tømme oppdatert status for «%.250s»"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "klarte ikke klippe for oppdatert status for «%.250s»"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "klarte ikke synkronisere oppdatert status for «%.250s»"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "klarte ikke lukke oppdatert status for «%.250s»"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "klarte ikke installere oppdatert status for «%.250s»"
@@ -278,72 +284,74 @@
 msgid "unable to open directory '%s'"
 msgstr "klarte ikke åpne fila «%s»"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "klarte ikke åpne fila «%s»"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "klarte ikke synkronisere fila «%s»"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "klarte ikke lukke fila «%s»"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "klarte ikke skrive detaljer om «%.50s» til «%.250s»"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "klarte ikke åpne «%s» for å skrive %s databasen"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "klarte ikke sette mellomlagring på %s databasefile"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "klarte ikke skrive %s databasepost om «%.50s» til «%.250s»"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "klarte ikke tømme %s database til «%.250s»"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "klarte ikke synkronisere (fsync) %s database til «%.250s»"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "klarte ikke lukke «%.250s» etter skriving av %s database"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "klarte ikke lenke «%.250s» til «%.250s» for sikkerhetskopiering av %s "
 "database"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "klarte ikke installere «%.250s» som «%.250s» med %s database"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -352,7 +360,7 @@
 "%s: ugjenopprettelig kritisk feil, avbryter:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -364,13 +372,13 @@
 "%s: ugjenopprettelig kritisk feil, avbryter:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "ikke nok minne til ny oppryddingsoppføring"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -379,33 +387,33 @@
 "%s: feil ved opprydding:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: For mange feil i flere nivåer under feiloppretting\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "ikke nok minne til ny oppryddingsoppføring"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "ikke nok minne til ny oppryddingsoppføring med mange parametre"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: Feil ved behandling av %s (--%s):\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: advarsel: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: intern feil: %s\n"
@@ -421,106 +429,106 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "«%.*s» er ikke tillatt for %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "søppel etter %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "ugyldig pakkenavn (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "tomt fildetaljfelt «%s»"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "fildetaljfeltet «%s» kan ikke brukes i statusfila"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "for mange verdier i fildetaljfeltet «%s» (sammenliknet med andre)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "for få verdier i fildetaljfeltet «%s» (sammenliknet med andre)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "ja/nei i boolsk felt"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "ord i «priority»-felt"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "verdi i «status»-felt kan ikke brukes i denne sammenhengen"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "første ord (ønsker) i «status»-felt"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "andre ord (feil) i «status»-felt"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "tredje ord (status) i «status»-felt"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "feil i Version-tekst «%.250s»"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "foreldet «Revision»- eller «Package-Revision»-felt brukt"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr ""
 "verdien for «config-version»-feltet kan ikke brukes i denne sammenhengen"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "feil i Config-Version-tekst «%.250s»"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "verdien for «conffiles» har en linje med ugyldig format «%.*s»"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "verdien for «conffiles» har en linje som starter uten mellomrom «%c»"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "rot- eller null-katalog er nevnt som oppsettsfil"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, 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"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "«%s»-felt, ugyldig pakkenavn «%.255s»: %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -529,7 +537,7 @@
 "«%s»-felt, referanse til «%.255s»:\n"
 " ugyldig versjonsforhold %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -538,7 +546,7 @@
 "«%s»-felt, referanse til «%.255s»:\n"
 " «%c» er foreldet, bruk «%c=» eller «%c%c» i stedet"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -547,11 +555,11 @@
 "«%s»-felt, referanse til «%.255s»:\n"
 " implisitt nøyaktig treff med versjonsnummer, foreslår «=» i stedet"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Bare nøyaktige versjoner kan brukes i Provides"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -561,57 +569,57 @@
 " versjonsverdien starter med et ikke-alfanumerisk tegn, foreslår å legge til "
 "et mellomrom"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "«%s»-felt, referanse til «%.255s»: versjon inneholder «%c»"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "«%s»-felt, referanse til «%.255s»: versjon ikke avsluttet"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "«%s»-felt, referanse til «%.255s»: feil i versjon"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "«%s»-felt, syntaksfeil etter referanse til pakken «%.255s»"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternativ («|») kan ikke brukes i %s-feltet"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 "verdien for «utløsere-utestående»-feltet er ikke tillatt i denne sammenhengen"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "ugyldig navn for utestående utløser «%.255s»: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "duplikat utestående utløser «%.255s»"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr ""
 "verdien for «triggers-forventet»-feltet er ikke tillatt i denne sammenhengen"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "ugyldig pakkenavn i forventet utløser «%.255s»: %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "duplikat forventet utløserpakke «%.250s»"
@@ -668,7 +676,7 @@
 msgid "unable to write to status fd %d"
 msgstr "klarte ikke skrive til status fd %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "realloc failed (%zu bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -679,8 +687,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "nytildeling mislyktes (%zu byte)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "klarte ikke allokere minne"
 
@@ -713,201 +721,207 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "klarte ikke sette flagget «close-on-exec» for %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "oppsettsfeil: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "klarte ikke åpne oppsettsfila «%.255s» for lesing: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "ubalansert sitattegn i «%s»"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "ukjent valg «%s»"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "«%s» trenger en verdi"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "«%s» skal ikke ha noen verdi"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "lesefeil i oppsettsfila «%.255s»"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "feil ved lukking av oppsettsfila «%.255s»"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "feil ved åpning av oppsettsmappa «%s»"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "ukjent valg --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "valget --%s trenger en parameter"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "valget --%s skal ikke ha noen parameter"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "ukjent valg -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "valget -%c trenger en parameter"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "valget -%c skal ikke ha noen parameter"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "foreldet valg «--%s»\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "handlinger i konflikt -%c (--%s) og -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "verdien for feltet «%s» finnes mer enn én gang"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "det brukerdefinerte feltnavnet «%.*s» er for kort"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "det brukerdefinerte feltet «%.*s» fins mer enn én gang"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Oppsatt versjon for pakke med status som ikke passer"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "pakken har status %s, men har ventende utløsere"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "pakken har status utløsere-ventende, men ingen ventende utløsere"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "pakken har status %s, men har utestående utløsere"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "pakken har status utløsere-utestående, men ingen utestående utløsere"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "En pakke som ikke er installert har oppsettsfiler.De blir ignorert"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "klarte ikke åpne pakkeinfofila «%.255s» for lesing"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "finner ikke pakkeinfofila «%.255s»"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "klarte ikke kjøre «mmap» på pakkeinfofila «%.255s»"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "finner ikke pakkeinfofila «%.255s»"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "klarte ikke lukke etter lesing: «%.255s»"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "slutt på fila etter feltnavn «%.*s»"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "linjeskift i feltnavn «%.*s»"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MS-DOS-slutt på fila (^Z) i feltnavn «%.*s»"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "feltnavnet «%.*s» skal følges av et kolon"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, 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)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, 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?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "linjeskift i feltnavn «%.*s»"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 "slutt på fil i verdien for feltet «%.*s» (mangler avsluttende linjeskift)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "fant flere pakkeinformasjonsoppføringer, kan bare ha en"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "klarte ikke lukke etter lesing: «%.255s»"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "ingen pakkeinformasjon i «%.255s»"
@@ -936,62 +950,62 @@
 "%s, i fila «%.255s» nær linje %d:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "kan ikke være en tom streng"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "må starte med et alfanumerisk tegn"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "tegnet «%c» ikke tillatt (bare bokstaver, siffer og tegnene «%s»)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<ingen>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "versjonsstrengen er tom"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "versjonsstrengen inneholder mellomrom"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "epoken i versjonen er ikke et tall"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "ingenting etter kolonet i versjonsnummeret"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "ugyldig tegn i versjonsnummeret"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "ugyldig tegn i revisjonsnummeret"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "mangler %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "tom verdi for %s"
@@ -1010,52 +1024,52 @@
 msgid "(no description available)"
 msgstr "(ingen beskrivelse tilgjengelig)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "klarte ikke ignorere signalet %s før %.250s ble kjørt"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "feil ved blokkering av signalet %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (underprosess): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "forking mislyktes"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "underprosessen %s returnerte feilstatus %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "klarte ikke vente på underprosessen %s"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "underprosessen %s drept med signal (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ",  lagret minnet"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "underprosessen %s mislyktes med ventestatuskode %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "klarte ikke vente på underprosessen %s"
@@ -1075,61 +1089,53 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr "syntaksfeil i fila «%.250s» for utsattte utløsere ved tegn «%s»%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "klarte ikke åpne/opprette låsefila «%.250s» for utløsere"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "utløst"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "fant ikke fil for utsattte utløsere «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "klarte ikke åpne fila «%.250s» for utsattte utløsere"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "klarte ikke åpne/opprette ny fil «%.250s» for utsattte utløsere"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "feil ved lesing av fila «%.250s» for utsattte utløsere"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "klarte ikke skrive den nye fila «%.250s» for utsattte utløsere"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "klarte ikke lukke den nye fila «%.250s» for utsattte utløsere"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "klarte ikke installere den nye fila «%.255s» for utsattte utløsere"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "tomme utløsernavn er ikke tillatt"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "utløsernavn inneholder ugyldig tegn"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1138,17 +1144,17 @@
 "ugyldig eller ukjent syntaks i utløsernavn «%.250s» (i utløserinteresser for "
 "pakken «%.250s»)"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "klarte ikke åpne fila «%.250s» med liste over utløserinteresser"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "klarte ikke spolle tilbake fila «%.250s» med utløserinteresser"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1157,83 +1163,89 @@
 "syntaksfeil i fila «%.250s» for med utløserinteresser; ugyldig pakkenavn "
 "«%.250s»: %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "klarte ikke opprette den nye fila «%.250s» for utløserinteresser"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "klarte ikke skrive den nye fila «%.250s» for utløserinteresser"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "klarte ikke tømme den nye fila «%.250s» for utløserinteresser"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "klarte ikke synkronisere den nye fila «%.250s» for utløserinteresser"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "klarte ikke lukke den nye fila «%.250s» for utløserinteresser"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "klarte ikke installere den nye fila «%.250s» for utløserinteresser"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "klarte ikke fjerne «%.250s»"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "klarte ikke opprette den nye fila «%.250s» for utløserinteresser"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "klarte ikke lukke den nye fila «%.250s» for utløserinteresser"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr "duplikat utløserinteressefil for filnavn «%.250s» og pakke «%.250s»"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "klarte ikke opprette den nye fila «%.250s» med filutløsere"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "klarte ikke skrive den nye fila «%.250s» med filutløsere"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "klarte ikke tømme den nye fila «%.250s» med filutløsere"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "klarte ikke synkronisere den nye fila «%.250s» med filutløsere"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "klarte ikke lukke den nye fila «%.250s» med filutløsere"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "klarte ikke installere den nye fila «%.250s» med filutløsere"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "klarte ikke lese fila «%.250s» med filutløsere"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "syntaksfeil i fila «%.250s» med filutløsere"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1242,7 +1254,7 @@
 "filutløseroppføring nevner ugyldig pakkenavn «%.250s» (for interesse i fila "
 "«%.250s»): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1251,30 +1263,38 @@
 "ci-utløserfila «%.250s» inneholder ulovlig syntaks i utløsernavn «%.250s»: "
 "%.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "klarte ikke åpne ci-utløserfila «%.250s»"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "ci-utløserfila inneholder ukjent direktivsyntaks"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "ci-utløserfila inneholder ukjent direktiv «%.250s»"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "klarte ikke opprette mappe «%.250s» for utløsertilstand"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "klarte ikke sette eier på mappe «%.250s» for utløsertilstand"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "tomme utløsernavn er ikke tillatt"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "utløsernavn inneholder ugyldig tegn"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1299,7 +1319,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "feil ved formatering av tekst inn i varbuf-variabel"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "feil ved lesing fra dpkg-deb-rør"
 
@@ -1318,12 +1338,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "feil ved setting av eierskap for den symbolske lenken «%.255s»"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "feil ved setting av eierskap for «%.255s»"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "feil ved setting av rettigheter for «%.255s»"
@@ -1383,17 +1403,26 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arkivet inneholdt objektet «%.255s» med ukjent type 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "fant ikke fil «%s»"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Bytter ut filer i den gamle pakken %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, 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:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1402,94 +1431,99 @@
 "prøver å skrive over katalogen «%.250s» i pakken %.250s %.250s med noe annet "
 "enn en katalog"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "prøver å skrive over «%.250s» som også finnes i pakken %.250s %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "klarte ikke opprette «%.255s» (under behandling av «%.255s»)"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "bakgrunnssystem dpkg-deb under «%.255s»"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "feil ved lukking/skriving av «%.255s»"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "feil ved oppretting av rør «%.255s»"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "feil ved oppretting av enhet «%.255s»"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "feil ved oppretting av hard lenke «%.255s»"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "feil ved oppretting av symbolsk lenke «%.255s»"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "feil ved oppretting av katalogen «%.255s»"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, 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:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "klarte ikke lese lenken «%.255s»"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "klarte ikke lage sikringskopi av den symbolske lenken «%.255s»"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "klarte ikke endre eierskap til den symbolske lenken «%.255s»"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, 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"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "klarte ikke installere ny versjon av «%.255s»"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "klarte ikke åpne «%.255s»"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "klarte ikke synkronisere fila «%.255s»"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1498,7 +1532,7 @@
 "ignorerer kravproblem med %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1507,7 +1541,7 @@
 "vurderer fjerning av oppsett for den nødvendige\n"
 " pakken %s, for å kunne aktivere %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1516,7 +1550,7 @@
 "dpkg: Nei, %s er nødvendig. Vil ikke fjerne oppsettet\n"
 " for å kunne aktivere %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1525,28 +1559,28 @@
 "dpkg: Nei, kan ikke fortsette med %s (--auto-deconfigure kan hjelpe):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "fjerning av %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "installering av %.255s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: Vurderer å fjerne oppsett for %s, som blir ødelagt av %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: Ja, fjerner oppsett for %s (ødelagt av %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1555,11 +1589,11 @@
 "dpkg: Knytt til %s, som inneholder %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "ignorerer ødeleggelse, men kan fortsette likevel."
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1568,27 +1602,27 @@
 "installering av %.250s vil ødelegge %.250s, og\n"
 " fjerning av oppsett er ikke tillatt (--auto-deconfigure kan hjelpe)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "installering av %.250s vil ødelegge eksisterende programvare"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1597,108 +1631,110 @@
 "dpkg: Pakken %s krever installasjon på nytt, men blir fjernet likevel, siden "
 "du ønsker det.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "pakker i konflikt - installerer ikke %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "ignorerer konflikt, men kan fortsette likevel."
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive trenger minst én sti-parameter"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "finn for dpkg --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "klarte ikke utføre «fdopen» på find-røret"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "klarte ikke lese find-røret"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "klarte ikke lukke find-røret"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find for --recursive returnerte den uforutsette feilen %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "søkte, men fant ingen pakker (filer med navn *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s trenger minst én pakkearkivfil som parameter"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<standard utdata>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<standard feil>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Velger den tidligere fravalgte pakken %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Hopper over den fravalgte pakken %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, 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:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "nedgraderer %.250s fra %.250s til %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, 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"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1707,37 +1743,37 @@
 "klarte ikke fjerne den nyinstallerte versjonen av «%.250s» for å kunne "
 "installere sikringskopien på nytt"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "klarte ikke gjenopprette sikringskopien av «%.250s»"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "klarte ikke fjerne sikkerhetskopien av «%.250s»"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "klarte ikke fjerne den nyinstallerte versjonen av «%.250s»"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "klarte ikke fjerne den nyutpakkede versjonen av «%.250s»"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "fant ikke den nye distribusjonsoppsettsfila «%.250s»"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "fant ikke den installerte oppsettsfila «%.250s»"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1748,57 +1784,57 @@
 "Oppsettsfila «%s» finnes ikke på systemet.\n"
 "Installerer ny oppsettsfil siden du ønsker det.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: klarte ikke fjerne den gamle sikkerhetskopien «%.250s»: %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: klarte ikke endre navnet på «%.250s» til «%.250s»: %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: klarte ikke fjerne «%.250s»: %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: klarte ikke fjerne den gamle distribuerte versjonen «%.250s»: %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: klarte ikke fjerne «%.250s» (før overskriving): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: klarte ikke lenke «%.250s» til «%.250s»: %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Installerer ny versjon av oppsettsfila %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "klarte ikke installere «%.250s» som «%.250s»"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "ingen pakke med navnet «%s» er installert, kan ikke sette opp"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "pakken %.250s er installert og satt opp fra før"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1807,7 +1843,7 @@
 "pakken %.250s er ikke klar for oppsett\n"
 " kan ikke sette opp (nåværende status «%.250s»)"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1816,11 +1852,11 @@
 "dpkg: Kravproblem hindrer oppsettet av %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "kravproblem - setter ikke opp pakken"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1829,7 +1865,7 @@
 "dpkg: %s: Kravproblem, men setter opp likevel siden du ønsker det:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1837,12 +1873,12 @@
 "Pakken er i en veldig inkonsistent tilstand, og bør\n"
 "installeres på nytt før du setter den opp."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Setter opp %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1851,7 +1887,7 @@
 "%s: fant ikke oppsettsfila «%s»\n"
 " (= «%s»): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1860,7 +1896,7 @@
 "%s: oppsettsfila «%s» er en lenke som peker til seg selv\n"
 " (= «%s»)"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1869,7 +1905,7 @@
 "%s: klarte ikke lese lenken for oppsettsfila «%s»\n"
 " (= «%s»): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1878,34 +1914,34 @@
 "%s: oppsettsfila «%.250s» blir til et degenerert filnavn\n"
 " («%s» er en symbolsk lenke til «%s»)"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: oppsettsfila «%.250s» er ingen vanlig fil eller symbolsk lenke (= «%s»)"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5-nøkkel"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: klarte ikke åpne oppsettsfila %s for nøkkel: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Skriv «exit» når du er ferdig.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1914,12 +1950,12 @@
 "\n"
 "Oppsettsfil «%s»"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (faktisk «%s»)"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1930,7 +1966,7 @@
 " ==> Fila på systemet er opprettet av deg eller et skript.\n"
 " ==> Fila finnes også i pakken fra pakkevedlikeholderen.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1939,7 +1975,7 @@
 "\n"
 "     Ikke endret siden installasjonen.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1948,7 +1984,7 @@
 "\n"
 " ==> Endret (av deg eller av et skript) siden installasjonen.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1957,37 +1993,37 @@
 "\n"
 " ==> Slettet (av deg eller av et skript) siden installasjonen.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Pakkedistributøren har gitt ut en oppdatert versjon.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Versjonen i pakken er den samme som ved siste installasjon.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Bruker den nye fila siden du ønsker det.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Bruker den gamle fila siden du ønsker det.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Tar vare på den gamle oppsettsfila som standard.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Bruker den nye oppsettsfila som standard.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2002,157 +2038,159 @@
 "        D     : Vis forskjellen mellom versjonene\n"
 "        Z     : Send denne prosessen til bakgrunnen for å undersøke nærmere\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Standardhandlingen er å ta vare på den versjonen som er installert.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Standardhandlinga er å installere den nye versjonen.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[standard=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[standard=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[ingen standardhandling]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "feil ved skriving til standardfeil, oppdage før oppsettsfilprompt"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "lesefeil på standard-inn ved oppsettsfilprompt"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "slutt på fil ved standard-inn ved oppsettsfilprompt"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s krever %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s før-krever %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s anbefaler %s "
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s foreslår %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s ødelegger %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s er i konflikt med %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s forbedrer %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s skal fjernes.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  Oppsettet av %.250s skal fjernes.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s er installert, men versjonen er %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, 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:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s er pakket ut, men versjonen er %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s siste oppsatte versjon er %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "%.250s er %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s tilbyr %.250s, men skal fjernes.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s tilbyr %.250s, men oppsettet skal fjernes.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s tilbyr %.250s, men er %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s er ikke installert.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versjon %.250s) vil bli installert.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versjon %.250s) er tilstede og %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s tilbyr %.250s og skal installeres.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s tilbyr %.250s og er tilstede og %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "Bruk --help for hjelp om pakkespørring."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2160,7 +2198,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versjon %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2171,8 +2209,8 @@
 "Opphavsrett (C) 2000,2001 Wichert Akkerman.\n"
 "Opphavsrett (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2182,7 +2220,7 @@
 "Dette er fri programvare. Du finner kopieringsvilkårene i\n"
 "GNU General Public Licence versjon 2 eller nyere. Det finnes INGEN garanti.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2192,7 +2230,7 @@
 "Bruk: %s [<valg> ... ] <kommando>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2211,7 +2249,7 @@
 "  --truename <fil>         vis omdirigert fil.\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2242,7 +2280,7 @@
 "  --version                vis versjonen.\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2254,17 +2292,12 @@
 "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"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "fant ikke fil «%s»"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "feil ved kontroll av «%s»"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2273,129 +2306,129 @@
 "endring av navn innebærer at «%s» overskrives av\n"
 "  annen fil «%s», ikke tillatt"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "klarte ikke å skrive fila «%s»"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "filkopiering"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "klarte ikke endre navn på «%s» til «%s»"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "endre navn: fjern duplikat gammel lenke «%s»"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "klarte ikke åpne kildefila «%.250s»"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "lokal omdirigering av %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "lokal omdirigering av %s til %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "omdirigering av %s med %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "omdirigering av %s til %s med %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "enhver omdirigering av %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "enhver omdirigering av %s til %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "klarte ikke opprette ned %s-fil"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "klarte ikke tømme fila «%s»"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "feil ved fjerning av gammel diversions-old"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "feil ved opprettelse av ny diversions-old"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "feil ved installasjon av nye omdirigeringer"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s krever en enkel parameter"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "filenavn «%s» er ikke absolutt"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "fil kan ikke inneholde linjeskift"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Kan ikke omdirigere kataloger"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "kan ikke omdirigere fil «%s» til seg selv"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "Forlater «%s»\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "«%s» er i konflikt med «%s»"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "Legger til «%s»\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Ingen omdirigering «%s», ingenting fjernet.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2406,7 +2439,7 @@
 "  under sletting av «%s»\n"
 "  ble «%s» funnet"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2417,16 +2450,16 @@
 "  under sletting av «%s»\n"
 "  ble «%s» funnet"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "Fjerner «%s»\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "pakke kan ikke inneholde linjeskift"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "omdirigering kan ikke inneholde linjeskift"
 
@@ -2511,8 +2544,8 @@
 "eller dpkg --configure --pending (eller dpkg --triggers-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s tar ingen parametre"
@@ -2603,7 +2636,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions ugyldig relasjon"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "versjon «%s» har ugyldig syntaks: %s"
@@ -2659,12 +2692,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "overstyrer problemet fordi --force er slått på:"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "klarte ikke åpne fillistefila for pakken «%.250s»"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2673,69 +2706,69 @@
 "fillistefila for pakken «%.250s» mangler. Går ut fra at pakken for "
 "øyeblikket ikke har noen filer installert."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "klarte ikke finne fillistefila for pakken «%.250s»"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "filliste for pakken «%.250s»"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "fillistefila for pakken «%.250s» inneholder et tomt filnavn"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "feil ved lukking av fillistefila for pakken «%.250s»"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Leser database ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "%d fil eller kataloger er for øyeblikket installert.)\n"
 msgstr[1] "%d filer og kataloger er for øyeblikket installerte.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "klarte ikke lage oppdatert fillistefil for pakken %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "klarte ikke skrive til oppdatert fillistefil for pakken %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "klarte ikke tømme oppdatert fillistefil for pakken %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "klarte ikke synkronisere oppdatert fillistefil for pakken %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "klarte ikke lukke oppdatert fillistefil for pakken %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "klarte ikke installere oppdatert fillistefil for pakken %s"
@@ -2773,7 +2806,9 @@
 msgstr "installert"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "feil: PATH er ikke satt."
 
 #: src/help.c:129
@@ -2814,7 +2849,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2826,65 +2861,65 @@
 msgstr "klarte ikke skifte filrot til «%.250s»"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "klarte ikke skifte katalog til «%.255s»"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "klarte ikke sette kjøretillatelse på «%.250s»"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "klarte ikke setenv for vedlikeholderskript"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "installerte %s-skript"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "fant ikke %s «%.250s»"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "nytt %s-skript"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "gammelt %s-skript"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "fant ikke %s «%.250s»: %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - prøver i stedet et skript fra den nye pakken ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "det finnes ingen skript i den nye versjonen av pakken - gir opp"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... det ser ut til at det gikk fint.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "klarte ikke sikkert fjerne «%.255s»"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2893,7 +2928,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "klarte ikke sjekke om «%.250s» finnes"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "klarte ikke lese infokatalogen"
 
@@ -2964,7 +2999,7 @@
 "  -Dh|--debug=help                 vis hjelp om avlusing.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3095,7 +3130,7 @@
 msgstr ""
 "Bruk «dselect» eller «aptitude» for en brukervennlig pakkehåndtering.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3146,30 +3181,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3178,103 +3217,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "kravproblem - fjerner ikke"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "kravproblem - fjerner ikke"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "klarte ikke setenv for vedlikeholderskript"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "lesefeil i oppsettsfila «%.255s»"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3282,7 +3321,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3290,38 +3329,38 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "-- debug krever en oktal parameter"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "tomt pakkenavn i den kommadelte lista til --ignore-depends «%.250s»"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends krever et gyldig pakkenavn. «%.250s» er ikke gyldig; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ugyldig heltall for --%s: «%.250s»"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "feil ved kjøring av hook «%s», avslutningskode %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "status"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3330,7 +3369,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3338,12 +3377,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ukjent tvangs-/avvisningsvalg «%.*s»"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "foreldet tvang/nekt alternativ «%s»\n"
@@ -3366,8 +3405,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "uventet slutt på fil før slutten av linje %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "trenger et handlingsvalg"
 
@@ -3530,88 +3569,88 @@
 msgid "passed\n"
 msgstr "godkjent\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "klarte ikke opprette midlertidig mappe"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "pakke %s har for mange konflikt/erstatt-par"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, 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»"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "klarte ikke fjerne den foreldede informasjonsfila «%.250s»"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "klarte ikke installere den (visstnok) nye informasjonsfila «%.250s»"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "klarte ikke åpne den midlertidige kontrollkatalogen"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "pakken inneholder et altfor langt informasjonsfilnavn (starter med «%.50s»)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "pakkekontrollinformasjonen inneholder katalogen «%.250s»"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "pakkekontrollinformasjon, rmdir av «%.250s» sa ikke «ingen katalog»"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "pakken %s inneholder en liste som informasjonsfil"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "klarte ikke installere ny informasjonsfil «%.250s» som «%.250s»"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "klarte ikke slette kontrollinformasjonsfila «%.250s»"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "får ikke tilgang til arkivet"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "klarte ikke opprette midlertidig mappe"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "kontrollinformasjonslengde"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Tatt vare på informasjon om %s fra %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "pakkearkitekturen (%s) passer ikke til systemet (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3620,99 +3659,99 @@
 "dpkg: Vedrørende %s som inneholder %s, problem med førkrav:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "problem med førkrav - installerer ikke %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "ignorerer problem med førkrav."
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Gjør klar til å bytte ut %s %s (ved bruk av %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Pakker ut %s (fra %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "navnet på oppsettsfila (starter med «%.250s») er for langt (>%d tegn)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "lesefeil i %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "feil ved lukking av %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "feil ved åpning av %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Fjerner oppsettet av %s, slik at %s kan fjernes ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Fjerner oppsettet av %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Pakker ut erstatningen %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "dpkg-deb feltuttrekking"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "feil ved lesing av tar-utdata fra dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "ødelagt filsystem-tarfil - ødelagt pakkearkiv"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: Fjern eventuelle avsluttande nuller"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "fant ikke den gamle fila «%.250s» så den slettes ikke: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "klarte ikke slette den gamle mappa «%.250s»: %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr "den gamle oppsettsfila «%.250s» var en tom mappe (og er nå slettet)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "fant ikke annen ny fil «%.250s»"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3721,12 +3760,12 @@
 "den gamle fila «%.250s» er den samme som flere nye filer! (Både «%.250s» og "
 "«%.250s».)"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "klarte ikke sikkert fjerne den gamle fila «%.250s»: %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Legg merke til at %s er forsvunnet, og fullstendig erstattet.)\n"
@@ -3901,7 +3940,7 @@
 "  --admindir=<katalog>          Bruk <katalog> istedenfor %s\n"
 "  -f|--showformat=<format>      Bruk alternativt format for --show\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3923,6 +3962,10 @@
 "  ${var[;bredde]}. Feltene vil være høyrejusterte, med mindre bredden er \n"
 "negativ. I så fall vil de være venstrejusterte.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Bruk --help for hjelp om pakkespørring."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3981,7 +4024,7 @@
 msgid "Removing %s ...\n"
 msgstr "Fjerner %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3990,50 +4033,51 @@
 "ved fjerning av %.250s kunne ikke mappa «%.250s» fjernes: %s - kan mappa "
 "være et monteringspunkt?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "klarte ikke fjerne «%.250s»"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "klarte ikke sikkert fjerne «%.250s»"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "ved fjerning av %.250s var ikke mappa «%.250s» tom. Den ble derfor ikke "
 "fjernet."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "klarte ikke fjerne «%.250s»"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Renser ut oppsettsfiler for %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "klarte ikke fjerne den gamle oppsettsfila «%.250s» (= «%.250s»)"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "klarte ikke lese oppsettsfilkatalogen «%.250s» (fra «%.250s»)"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "klarte ikke fjerne den gamle sikringskopien av oppsettsfila «%.250s» (fra "
 "«%.250s»)"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "klarte ikke fjerne gammel filliste"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "klarte ikke fjerne gammelt etterfjerningsskript"
 
@@ -4076,7 +4120,13 @@
 msgid "read error on standard input"
 msgstr "lesefeil fra standard-inn"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "Bruk --help for hjelp om pakkespørring."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4085,7 +4135,7 @@
 "Opphavsrett (C) 2000, 2001 Wichert Akkerman.\n"
 "Opphavsrett (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4102,7 +4152,7 @@
 "  --list [<glob-mønster>]  list nåværende overstyringer i databasen.\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4123,31 +4173,31 @@
 "  --version                vis versjonen.\n"
 "\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "fjerner avsluttende /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "klarte ikke åpne ny «statoverride»-fil"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "feil ved sletting av statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "feil ved opprettelse av statoverride-old"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "feil ved installering av ny statoverride"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add krever fire parametre"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4156,21 +4206,21 @@
 "En tilsidesettelse for «%s» finnes allerede, men --force oppgitt så det vil "
 "bli ignorert."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "En tilsidesettelse for «%s» eksisterer allerede, avbryter."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "--update oppgitt men %s eksisterer ikke"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Ingen tilsidesettelse tilstede."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update er meningsløs for --remove"
 
@@ -4235,16 +4285,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "flere statustilsidesettelser tilstede for fila «%.250s»"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Skriv «dpkg-trigger --help» for hjelp om dette programmet."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debian %s pakkeutløserprogram versjon %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4255,7 +4305,7 @@
 "      %s [<alternativ> ... ] <kommando>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4268,7 +4318,7 @@
 "utløsere.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4290,21 +4340,21 @@
 "  --no-act                         Bare test - ikke faktisk endre noe.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: Mappe for utløserdata ikke enda opprettet\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: det finnes enda ikke utløseroppføringer\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "tar bare en parameter, utløsernavnet"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4314,13 +4364,13 @@
 "dpkg-trigger må bli kalt fra et vedlikeholderskript (eller med et --by-"
 "package valg)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: ugyldig ventende pakkenavn «%.255s»: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "ugyldig utløsernavn «%.255s»: %.250s"
@@ -4353,39 +4403,40 @@
 msgstr "Behandler utløsere for %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s trenger akkurat én «Packages»-fil som parameter"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "klarte ikke få tilgang til dpkg-statusområdet for rå "
 "tilgjengelighetsoppdatering"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "rå tilgjengelighetsoppdatering krever skrivetilgang til dpkg-statusområdet"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Bytter ut informasjon om tilgjengelige pakker, ved hjelp av %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Oppdaterer opplysninger om tilgjengelige pakker, ved hjelp av %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "Informasjon om %d pakke ble oppdatert.\n"
 msgstr[1] "Informasjon om %d pakker ble oppdatert.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4499,8 +4550,8 @@
 msgstr[0] "ignorerer %d advarsel om kontrollfilen(e)\n"
 msgstr[1] "ignorerer %d advarsler om kontrollfilen(e)\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s krever en <katalog>-parameter"
@@ -4532,26 +4583,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: Bygger pakken «%s» i «%s».\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "klarte ikke opprette midlertidig fil (data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "kontrollområde"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "klarte ikke fjerne lenke til midlertidig fil (data), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4568,20 +4619,20 @@
 msgid "error writing `%s'"
 msgstr "feil ved skriving av «%s»"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "mellom medlemmer"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "klarte ikke skrive filnavn til tar-rør (data)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<komprimer> fra tar -cf"
 
@@ -4599,77 +4650,77 @@
 msgid "error reading %s from file %.255s"
 msgstr "feil ved lesing av %s fra fil %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "klarte ikke lese arkivet «%.255s»"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "klarte ikke kjøre «fstat» på arkivet"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "arkivet mangler punktum i versjonsnummeret"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "arkivet mangler linjeskift i hovudet"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "fila «%.250s» er ødelagt - ugyldig delnummer"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "fila «%.250s» er ikke et binært Debian-arkiv (prøv dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "arkivet mangler punktum i versjonsnummeret"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "arkivet mangler linjeskift i hovudet"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "arkivet mangler punktum i versjonsnummeret"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 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:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "hoppet over medlemsdata fra %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
 "fila «%.250s» inneholder et datamedlem %.*s som jeg ikke skjønner. Gir opp"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "fila «%.250s» inneholder to kontrollmedlemmer. Gir opp"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4681,23 +4732,23 @@
 " ny Debian-pakke, versjon %s.\n"
 " størrelse %ld byte: kontrollarkiv = %zi byte.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "arkivet har en misformatert kontrollengde «%s»"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "hoppet over medlemsdata fra %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4709,7 +4760,7 @@
 " gammel Debian-pakke, versjon %s.\n"
 " størrelse %ld byte: kontrollarkiv = %zi, hovedarkiv = %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4718,49 +4769,50 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "«%.255s» er ikke et arkiv i Debian-format"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "klarte ikke skrive til røret i «copy»"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "klarte ikke lukke røret i «copy»"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "klarte ikke skifte til katalog"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "klarte ikke opprette katalog"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "klarte ikke skifte til katalogen etter å ha opprettet den"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "klarte ikke skifte til katalog"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<dekomprimer>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "lim inn"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s krever et .deb-filnavn som parameter"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4769,96 +4821,96 @@
 "--%s krever en målkatalog.\n"
 "Kanskje du mente å bruke «dpkg --install»?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s tar bare én parameter (.deb-filnavn)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "klarte ikke skifte til katalogen «/» for å rydde opp"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "fant ikke fil «%s»"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: «%.255s» inneholder ikke kontrollkomponenten «%.255s»\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr "åpning av komponenten «%.255s» (i %.255s) mislyktes på en uventet måte"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "%d etterspurt kontrollkomponent mangler"
 msgstr[1] "%d etterspurte kontrollkomponenter mangler"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "klarte ikke skanne katalogen «%.255s»"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "fant ikke «%.255s» (i «%.255s»)"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "klarte ikke åpne «%.255s» (i «%.255s»)"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "klarte ikke lese «%.255s» (i «%.255s»)"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld byte, %5d linjer   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     ikke en vanlig fil          %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(ingen «control»-fil i kontrollarkivet)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "klarte ikke åpne komponenten «control»"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "feil ved lesing av komponenten «control»"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "klarte ikke lukke «%s» komponent"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Feil i format"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents tar akkurat én parameter"
 
@@ -4868,7 +4920,19 @@
 msgstr "Debian «%s» pakkearkiv-bakgrunnsmotor versjon %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4879,6 +4943,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4894,7 +4960,7 @@
 "  --fsys-tarfile <deb>              Utdata til tar-fil.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4907,11 +4973,27 @@
 "<cfelt> er navnet på et felt i 'control'-fila.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4934,7 +5016,7 @@
 "                             Tillatte typer: gzip, xz, bzip2, lzma, ingen.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4947,7 +5029,7 @@
 "«dselect» eller «aptitude» for brukervennlig pakkehåndtering. Pakker\n"
 "som er pakket ut med «dpkg-deb --extract» vil ikke bli installert riktig.\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4955,17 +5037,17 @@
 "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:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "ugyldig heltall for -%c: «%.250s»"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "ugyldig komprimeringsnivå for -%c: %ld'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ukjent koprimeringstype «%s»!"
@@ -4985,7 +5067,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "fila «%.250s» er ødelagt - mangler linjeskift etter %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "feil ved lesing av %.250s"
@@ -5079,50 +5161,56 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "fila «%.250s» er ødelagt - ugyldig delnummer"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "pakkenavn"
+
+#: dpkg-split/info.c:166
 #, 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"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "fila «%.250s» er ødelagt - det andre medlemmet er ikke et datamedlem"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, 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"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "fila «%.250s» er ødelagt - feil størrelse i forhold til opplysning ene"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "klarte ikke kjøre «fstat» på delfila «%.250s»"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "fila «%.250s» er ødelagt - for kort"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "klarte ikke åpne arkivdelfila «%.250s»"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "fila «%.250s» er ikke en arkivdel"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5142,6 +5230,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5164,12 +5253,19 @@
 "    Delfilstørrelse (brukt del):   %lubyte\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<ukjent>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s tar en eller flere delfilparametre"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "fila «%s» er ingen arkivdel\n"
@@ -5204,7 +5300,7 @@
 msgid "split package part"
 msgstr "Setter sammen pakken %s fra %d del:"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "ferdig\n"
@@ -5256,17 +5352,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Valg:\n"
 "      --depotdir <katalog>      bruk <katalog> i steden for %s/%s.\n"
@@ -5277,20 +5382,29 @@
 "\n"
 "Avslutningstatus: 0 = OK;  1 = -a er ikke en del;  2 = problem!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Skriv «dpkg-split --help» for hjelp."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "uventet slutt på fil i %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "delen er altfor stor eller størrelsen er ikke positiv"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "delstørrelsen må være minst %d KiB (for at hodet skal få plass)"
@@ -5402,27 +5516,27 @@
 msgid "Deleted %s.\n"
 msgstr "Slettet %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "dpkg-deb feltuttrekking"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "klarte ikke åpne kildefila «%.250s»"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "klarte ikke kjøre «fstat» på kildefila"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "kildefila «%.250s» er ikke en vanlig fil"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5431,17 +5545,17 @@
 msgstr[0] "Setter sammen pakken %s fra %d del:"
 msgstr[1] "Setter sammen pakken %s fra %d deler:"
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split krever et kildefilnavn som parameter"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split tar høyst ett kildefilnavn og målprefiks"
 
@@ -5609,125 +5723,90 @@
 "  --version                vis versjonen.\n"
 "\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "feil"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "advarsel"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "fant ikke %s: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "readlink(%s) feilet: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "to kommandoer oppgitt: --%s og --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "klarte ikke legge til i %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "klarte ikke skanne %s: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "klarte ikke kjøre %s: %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "klarte ikke gjøre %s til en symbolsk lenke til %s: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "klarte ikke installere %s som %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "klarte ikke fjerne %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "uventet slutt på fil under lesing av %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "under lesing av %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "linje ikke avsluttet under lesing av %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s korrupt: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "linjeskift forbudt i update-alternatives filer (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "feil ved skriving av %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "slavenavn"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "duplikat slave %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "slavelenke"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "slave-lenke samme som hovedlenke %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "duplikat slavelenke %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "hovedfil"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "duplisert sti %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5736,129 +5815,114 @@
 "alernativ %s (del av lenkegruppa %s) eksisterer ikke. Fjernes fra listen "
 "over alternativ."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "prioritet"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "slavefil"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "prioritet for %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "klarte ikke lese %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "status"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "ugyldig status"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "hovedlenke"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "klarte ikke lukke %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "kasserer foreldet slavelenke %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "klarte ikke skrive %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "auto modus"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "manuell modus"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "  lenke peker for øyeblikket til %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "  lenke er borte for øyeblikket "
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - prioritet %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  slave %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Nåværende «beste» versjon er «%s»."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Ingen versjoner tilgjengelig."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "Det er %d valg for alternativet %s (som tilbyr %s)."
 msgstr[1] "Det er %d valg for alternativet %s (som tilbyr %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Valg"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Sti"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Prioritet"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Status"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Trykk Enter for å beholde det gjeldende valget[*] eller skriv et valgnummer:"
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "bytter ikke ut %s med en lenke."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "kan ikke installere ukjent valg %s"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -5867,98 +5931,153 @@
 "hopp over opprettelse av %s fordi tilhørende fil %s (i lenkegruppa %s) ikke "
 "eksisterer."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "bytter ikke ut %s med en lenke."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Kjør %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Alternative %s uendret fordi valg %s ikke er tilgjengelig."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Hopp over ukjent alternativ %s."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "linje for lang eller ikke avsluttet under lesing av %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Hoppet over ugyldig linje: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "endrer navn på %s lenke fra %s til %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "endrer navn på %s slavelenke fra %s til %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "alternativt navn (%s) kan ikke inneholde «/» og mellomrom."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "alternativ lenke er ikke absolutt slik som den bør være: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "alternativ sti er ikke absolutt slik som den bør være: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "alternativ %s kan ikke være hoved: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "alternativ lenke %s er allerede kontrollert av %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "alternativ sti %s eksisterer ikke."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "alternativ %s kan ikke være slave av %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "alternativ %s kan ikke være hoved: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "alternativ lenke %s er allerede kontrollert av %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "ukjent parameter «%s»"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install trenger <lenke> <navn> <sti> <prioritet>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<lenke> og <sti> kan ikke være like"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "prioritet må være et heltall"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s krever <navn> <sti>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s krever <navn>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave bare tillatt med --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave trenger <lenke> <navn> <sti>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "navn %s er både primær og slave"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "lenke %s er både primær og slave"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s krever en <fil>-parameter"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "ukjent valg «%s»"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -5966,67 +6085,22 @@
 "trenger --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all eller --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "alternativ %s kan ikke være hoved: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "alternativ lenke %s er allerede kontrollert av %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "alternativ lenke er ikke absolutt slik som den bør være: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "alternativ sti er ikke absolutt slik som den bør være: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "alternativ sti %s eksisterer ikke."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "alternativt navn (%s) kan ikke inneholde «/» og mellomrom."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "det er et hovedalternativ."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "det er en slave av %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "alternativ %s kan ikke være slave av %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<standard inndata>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "ingen alternativ for %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s henger, den blir oppdatert med det beste valget."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6038,47 +6112,47 @@
 "%s har blitt endret (manuelt eller av et skript). Bytter over til kun "
 "manuelle oppdateringer."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "setter opp automatisk valg av %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "alternativ %s for %s er ikke registrert, settes ikke."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Det er ingen program som tilbyr %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Ingenting å sette opp."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Det er bare et alternativ i lenkegruppa %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "alternativ %s for %s er ikke registrert, fjernes ikke."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr "fjerner manuelt valgte alternativ - bytter %s til automatisk modus"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "automatiske oppdateringer av %s er slått av, lar den være i fred."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6086,23 +6160,59 @@
 "for å gå tilbake til automatiske oppdateringer bruk «update-alternatives --"
 "auto %s»."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "bruker %s for å tilby %s (%s) in %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 "tvinger reinstallasjon av alternativ %s fordi lenkegruppa %s er ødelagt."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr "gjeldende alternativ %s er ukjent, bytter til %s for lenkegruppa %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "det er et hovedalternativ."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "det er en slave av %s"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "fant ikke %s: %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "readlink(%s) feilet: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "klarte ikke skanne %s: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "klarte ikke kjøre %s: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "klarte ikke gjøre %s til en symbolsk lenke til %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "klarte ikke installere %s som %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "feil ved skriving av %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "klarte ikke lese %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "klarte ikke lukke %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "klarte ikke skrive %s: %s"
+
 #, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6358,9 +6468,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "hoppet over kontrollområde fra %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "klarte ikke kjøre «tar»"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "klarte ikke opprette midlertidig mappe"
 
Binary files dpkg/po/ne.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/ne.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/ne.po /home/vorlon/devel/multiarch/dpkg-debian/po/ne.po
--- dpkg/po/ne.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/ne.po	2012-06-07 10:11:09.426073000 -0700
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: dpkg_po_ne\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2007-08-05 17:41+0545\n"
 "Last-Translator: Nabin Gautam <nabin@mpp.org.np>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -26,7 +26,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "स्रोत फाइल `%.250s' खोल्न अक्षम"
@@ -46,71 +46,77 @@
 msgid "ar member file (%s)"
 msgstr "tmpfile (डेटा) बनाउन असफल"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "बफर प्रतिलिपिमा असफल (%s)"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "बफर प्रतिलिपिमा असफल (%s)"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "बफर प्रतिलिपिमा छोटो पढ्नुहोस् (%s)"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "टार कार्यान्वयन गर्न असफल"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "%s कार्यन्वयन गर्न अक्षम"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: असङ्कुचन"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: सङ्कुचन"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: आन्तरिक gzip त्रुटि: `%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: आन्तरिक gzip त्रुटि: `%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: आन्तरिक gzip त्रुटि: `%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: आन्तरिक gzip त्रुटि: `%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: आन्तरिक gzip त्रुटि: `%s'"
@@ -125,31 +131,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: आन्तरिक bzip2 त्रुटि: `%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: आन्तरिक bzip2 त्रुटि: `%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: आन्तरिक bzip2 त्रुटि: `%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: आन्तरिक bzip2 त्रुटि: `%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -158,105 +164,105 @@
 "अद्यावचिक डाइरेक्टरीले समाहित `%.250s' फाइल गर्दछ जसको नाम धेरै लामो छ (लम्बाई=%d, "
 "उच्चतम=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr "अद्यावधिक डाइरेक्टरीले भिन्न लम्बाई नामहरू (%d र %d दुबै) फाइलहरू समावेश गर्दछ ।"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "अद्यावधिक डाइरेक्टरी `%.255s' स्क्यान गर्न सक्दैन ।"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "समाहित अद्यावधिक फाइल %.255s हटाउन असफल भयो ।"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "`%.255s' सिर्जना गर्न अक्षम"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "गद्दासँग %.250s भोर्न अक्षम"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "गद्दा पछि %.250s फ्लस गर्न अक्षम"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "गद्दा पछि %.250s को सुरू खोज्न अक्षम"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "vsnprintf का लागि tmpfile (अस्थाइ फाइल) खोल्न अक्षम"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "वस्तुस्थिति डेटावेश ताल्चा मारेको फाइल खोल्न/सिर्जना गर्न अक्षम"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "dpkg वस्तुस्थिति डेटावेश ताल्चा लगाउन तपाईँसंग अनुमति छैन"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "dpkg वस्तुस्थिति डेटावेश ताल्चा लगाउन अक्षम"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "अनुरोध गरिएको सञ्चालनलाई सुपर प्रयोगकर्ता विशेषाधिकार चाहिन्छ"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "dpkg स्थिति क्षेत्र पहुँच गर्न अक्षम"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "सञ्चालनलाई dpkg स्थिति क्षेत्रलाई पढ्न/लेख्न पहुँच आवश्यक पर्दछ"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "मेरो आफ्नै अद्यावधिक फाइल %.255s हटाउन असफल"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "`%.250s' को अद्यावधिक गरिएको वस्तुस्थिति लेख्न अक्षम"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "`%.250s' को अद्यावधिक वस्तुस्थिति फ्लस गर्न अक्षम"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "`%.250s'को अद्यावधिक वस्तुस्थितिका लागि काट्न अक्षम"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "`%.250s' को अद्यावधिक गरिएको वस्तुस्थिति fsync गर्न अक्षम"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "`%.250s'को अद्यावधिक वस्तुस्थिति बन्द गर्न अक्षम"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "`%.250s'को अद्यावधिक वस्तुस्थिति स्थापना गर्न अक्षम"
@@ -277,90 +283,92 @@
 msgid "unable to open directory '%s'"
 msgstr "स्रोत फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "स्रोत फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "स्रोत फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "vsnprintf मा फ्लस गर्न अक्षम"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr " `%.50s' मा `%.250s' विवरण लेख्न असफल"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "सूचना %s का लागि लेख्न`%s' खोल्न अक्षम"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "वस्तुस्थिति फाइलमा बफरिङ्ग सेट गर्न अक्षम"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "`%.50s' to `%.250s' बारेमा रेकर्ड  %s लेख्न असफल"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "सूचना `%.250s' मा %s फ्लस गर्न असफल"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "%s सूचना `%.250s' मा fsync गर्न असफल"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "सूचना %s लेखे पछि `%.250s' बन्द गर्न असफल"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "`%.250s' लाई `%.250s' मा जगेडा %s को सूचनाका लागि लिङ्क गर्न असफल"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "सूचना %s समावेश गर्दै `%.250s' रुपमा `%.250s' स्थापना गर्न असफल"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "नयाँ सफा गर्ने प्रविष्टिका लागि स्मृति बाहिर"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -369,35 +377,35 @@
 "%s: सफा गर्दा त्रुटि:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: त्रुटि पुन: प्राप्तिको बेलामा धेरै नेष्टेड त्रुटि!!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "नयाँ सफा गर्ने प्रविष्टिका लागि स्मृति बाहिर"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "धेरै तर्कहरु सँग नयाँ सफा गर्ने प्रविष्टिका लागि स्मृति बाहिर"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: सफा गर्दा त्रुटि:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr ""
 "%s: सफा गर्दा त्रुटि:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%d: आन्तरिक त्रुटि `%s'\n"
@@ -413,106 +421,106 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "`%.*s'  %s का लागि अनुमति प्राप्त छैन"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr " %s पछि रद्दी"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "अवैध प्याकेज नाम (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "रित्तो फाइल विवरण फाँट `%s'"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "फाइल विवरण फाँट `%s' लाई वस्तुस्थिति फाइलमा अनुमति छैन"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "फाइल विवरण फाँटमा धेरै मानहरू `%s' (अन्यसंग दाजेमा)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "फाइल विवरण फाँटमा धेरै थोरै मानहरू `%s' (अन्यसंग दाजेमा)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "बोलेइन फाँटमा हो/होइन"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "`प्राथमिकता' फाँटमा शब्द भित्र"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "`वस्तुस्थिति' का लागि मान फाँट प्रंसगमा अनुमति दिइदैन ।"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "पहिलो (चाहनुहुन्छ) word in `status' फाँट"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "सेकेण्ड (त्रुटि) word in `status' फाँट"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "तेस्रो (वस्तुस्थिति) word in `status' फाँट"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "संस्करण स्ट्रिङ`%.250s': %.250s मा त्रुटि"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "अप्रचलित `Revision' वा `Package-Revision' फाँट प्रयोग"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "`config-version' का लागि मान फाँट यो प्रसंगमा अनुमति दिदैन ।"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "कन्फिग-संस्करण स्टिङ `%.250s': %.250s मा त्रुटि"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "`conffiles' का लागि मानसंग नराम्रो ढाँचाबद्ध गरिएको रेखा `%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "`conffiles' का लागि मानसंग खाली स्थान नभएको`%c' बाट लाइन सुरू छ ।"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "मूल वा शुन्य डाइरेक्टरी कन्फफाइलको रुपमा सूचिबद्ध गरिन्छ ।"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr "`%s' फाँट, हराएको प्याकेज नाम, वा फोहर जहाँ प्याकेज नाम आशा गरियो"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "`%s' फाँट, अवैध प्याकेज नाम `%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -521,7 +529,7 @@
 "`%s' फाँट, लाई निर्देशन`%.255s':\n"
 "खराब संस्करण संम्बन्ध %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -530,7 +538,7 @@
 "`%s' फाँट, लाई निर्देशन`%.255s':\n"
 " `%c' अप्रचलित छ , साट्टोमा `%c=' वा `%c%c' प्रयोग गर्नुहोस्"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -539,11 +547,11 @@
 "`%s' फाँट, लाई निर्देशन `%.255s':\n"
 " सूचित संस्करण नम्बरमा ठ्याकै मिल्यो, साटोमा `=' प्रयोग गर्न सुझाव छ"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "प्रदान गर्दछका लागि मात्र ठ्याकै संस्करणहरू प्रयोग हुन सक्छ"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -552,58 +560,58 @@
 "`%s' फाँट, लाई निर्देशन `%.255s':\n"
 " संस्करण मान अल्फा सङ्ख्यात्मक नहुने देखि सुरू हुन्छ, खाली ठाँउ थप्न सुझाव गरिन्छ ।"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "`%s' फाँट, `%.255s' लाई सन्दर्भ: संस्करण '%c' समाहित गर्दछ"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "`%s' फाँट, `%.255s' लाई सन्दर्भ: समाप्त नभएको संस्करण"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "`%s' फाँट, %.255s' लाई सन्दर्भ: संस्करणमा त्रुटि: %.255s"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "`%s' फाँट, प्याकेज `%.255s' लाई सन्दर्भ पछि वाक्य संरचना त्रुटि"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "फाँट %s मा वैकल्पिकहरू (`|') लाई अनुमति दिदैन"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 #, fuzzy
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "`config-version' का लागि मान फाँट यो प्रसंगमा अनुमति दिदैन ।"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, fuzzy, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "`%s' फाँट, अवैध प्याकेज नाम `%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 #, fuzzy
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "`वस्तुस्थिति' का लागि मान फाँट प्रंसगमा अनुमति दिइदैन ।"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, fuzzy, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "लाइन %d: %.250s मा अवैध प्याकेज नाम"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, fuzzy, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "प्याकेज `%.250s' का लागि फाइलको सूची"
@@ -660,7 +668,7 @@
 msgid "unable to write to status fd %d"
 msgstr "`%.250s' को अद्यावधिक गरिएको वस्तुस्थिति लेख्न अक्षम"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 msgid "malloc failed (%zu bytes)"
 msgstr "रिएलोक असफल (%ld बाइटहरू)"
@@ -670,8 +678,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "रिएलोक असफल (%ld बाइटहरू)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 #, fuzzy
 msgid "failed to allocate memory"
 msgstr "डाइरेक्टरी सिर्जना गर्न असफल"
@@ -705,198 +713,204 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "%.250s का लागि बन्द-मा-कार्यान्वयन सेट गर्न अक्षम"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "कन्फिगरेसन त्रुटि: %s लाई एउटा मान चाहिन्छ"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, fuzzy, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "`%.255s' का लागि पढ्नका लागि कन्फिगरेसन फाइल खोल्न असफल"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "अज्ञात विकल्प `%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "--%s विकल्पले एउटा मान लिन्छ"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "--%s विकल्पले एउटा मान लिदैन"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "कन्फिगरेसन`%.255s' फाइलमा त्रुटि पढ्नुहोस्"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "कन्फिगरेसन फाइल`%.255s' बन्द गर्दा त्रुटि"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "कन्फिगरेसन फाइल`%.255s' बन्द गर्दा त्रुटि"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "अज्ञात विकल्प --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s विकल्पले एउटा मान लिन्छ"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s विकल्पले एउटा मान लिदैन"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "अज्ञात विकल्प -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c ले एउटा मान लिन्छ"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c विकल्पले एउटा मान लिदैन"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "चेतावनी: अप्रचलित विकल्प `--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "द्धन्दात्मक कार्यहरू -%c (--%s) र -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "फाँट`%s' का लागि नक्कल प्रति मान"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "प्रयोग कर्ता-परिभाषित फाँट नाम`%.*s' धेरै छोटो"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "प्रयोगकर्ता-परिभाषित फाँट`%.*s' का लागि नक्कल प्रति मान"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "अनुपयुक्त वस्तुस्थितिसंग प्याकेजका लागि कन्फिगर गरिएको-संस्करण"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "स्थापना बिहिन अवस्थामा रहेको प्याकेजमा कन्फफाइल छ, तिनिहरुलाई बिर्सदैछ"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "प्याकेज सूचना फाइल `%.255s' पढ्नका लागि खोल्न असफल"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "प्याकेज सूचना फाइल `%.255s' तोक्न सकिदैन"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "प्याकेज सूचना फाइल`%.255s' mmap गर्न सकिदैन"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "प्याकेज सूचना फाइल `%.255s' तोक्न सकिदैन"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "पढे पछि बन्द गर्न असफल: `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF पछि फाँट नाम `%.*s'"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "फाँट नाम `%.*s'मा नयाँ लाइन"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr " फाँट नाम`%.*s' मा MSDOS EOF (^Z)"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "फाँट नाम `%.*s' विरामचिन्ह द्धारा साथ दिनु पर्छ"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "फाँटको मान `%.*s' (हराएको अन्तिम नयाँलाइन) पहिले EOF"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "फाँटको मान `%.*s' (हराइरहेको नयाँलाइन ?) मा MSDOS EOF"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "फाँट नाम `%.*s'मा नयाँ लाइन"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "फाँटको मान `%.*s' (अन्तिम नयाँलाइन हराउदै) बेला EOF"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "धेरै प्याकेज सूचना प्रविष्टिहरू फेला पर्यो, मात्र एउटालाई अनुमति थियो ।"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "पढे पछि बन्द गर्न असफल: `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "`%.255s' प्याकेज सूचनाहरू छैन"
@@ -915,66 +929,66 @@
 " %.255s"
 msgstr "%s, फाइल `%.255s'मा नजिकको लाइन %d"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "रित्तो स्ट्रिङ् होइन होला"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "एउटा अल्फान्युमेरिक सँग सुरू गर्नु पर्छ"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "क्यारेक्टर `%c' अनुमति छैन (अक्षर, अङ्कहरू र क्यारेक्टरहरू `%s'लाई मात्र)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<none>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "संस्करण स्ट्रिङ् रित्तो छ"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "संस्करण स्ट्रिङ् सँग सम्मिलित खाली ठाँउहरू छ ।"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "संस्करणमा इपोच नम्बर होइन"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "संस्करण नम्बरमा विराम पछि केहि पनि छैन"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "संस्करण नम्बरमा विराम पछि केहि पनि छैन"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "संस्करण नम्बरमा विराम पछि केहि पनि छैन"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "हराइरहेको %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr " %s का लागि रित्तो मान"
@@ -993,51 +1007,51 @@
 msgid "(no description available)"
 msgstr "(कुनै वर्णन उपलब्ध छैन)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "स्क्रिप्ट चलाउनु पहिले सङ्केत %s वेबास्ता गर्न अक्षम"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "अन-क्याचिङ् त्रुटि %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (उपप्रक्रिया): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "फ्रोक असफल"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "उपप्रक्रियाहरू %s फिर्ता त्रुटि निकास स्थिति %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr " %s का लागि पर्खने असफल भयो"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "उपप्रक्रियाहरू %s संकेतद्धारा मारियो (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", कोर थुप्रियो"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "उपप्रक्रियाहरू %s पर्खने स्थिति कोड %d सँग असफल भयो"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr " %s का लागि पर्खने असफल भयो"
@@ -1057,197 +1071,203 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, fuzzy, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "स्रोत फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 msgid "triggers area"
 msgstr "%s ताल्चा खोल्न अक्षम: %s"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, fuzzy, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "अन्य नयाँ फाइल `%.250s' stat गर्न अक्षम"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, fuzzy, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "स्रोत फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, fuzzy, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "नयाँ डिपोट फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, fuzzy, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "फाइल %.255s बाट %s पढ्दा त्रुटि"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, fuzzy, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "नयाँ डिपोट फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, fuzzy, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "नयाँ डिपोट फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, fuzzy, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "`%.255s' को नयाँ संस्करण स्थापना गर्न अक्षम"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, fuzzy, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "नयाँ डिपोट फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, fuzzy, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "भाग फाइल `%.250s' पढ्दा त्रुटि"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:419
-#, fuzzy, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "अन्य नयाँ फाइल `%.250s' stat गर्न अक्षम"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, fuzzy, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "अन्य नयाँ फाइल `%.250s' stat गर्न अक्षम"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "अन्य नयाँ फाइल `%.250s' stat गर्न अक्षम"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "अन्य नयाँ फाइल `%.250s' stat गर्न अक्षम"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
+msgstr "`%.255s' को नयाँ संस्करण स्थापना गर्न अक्षम"
+
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "`%.250s' हटाउन सक्दैन"
+
+#: lib/dpkg/triglib.c:360
+#, fuzzy, c-format
+msgid "unable to create new trigger interest file `%.250s'"
 msgstr "अन्य नयाँ फाइल `%.250s' stat गर्न अक्षम"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:383
 #, fuzzy, c-format
-msgid "unable to install new trigger interest file `%.250s'"
-msgstr "`%.255s' को नयाँ संस्करण स्थापना गर्न अक्षम"
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "अन्य नयाँ फाइल `%.250s' stat गर्न अक्षम"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:456
 #, fuzzy, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr "नयाँ सूचना फाइल `%.250s' को रुपमा `%.250s' स्थापना गर्न अक्षम"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, fuzzy, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "नयाँ डिपोट फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, fuzzy, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "नयाँ डिपोट फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "नयाँ डिपोट फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "नयाँ डिपोट फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "नयाँ डिपोट फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, fuzzy, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "नयाँ सूचना फाइल `%.250s' को रुपमा `%.250s' स्थापना गर्न अक्षम"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, fuzzy, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "भाग फाइल `%.250s' पढ्दा त्रुटि"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, fuzzy, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "कन्फिगरेसन`%.255s' फाइलमा त्रुटि पढ्नुहोस्"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, fuzzy, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "स्रोत फाइल `%.250s' खोल्न अक्षम"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, fuzzy, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "डिपोट डाइरेक्ट्री `%.250s' पढ्न अक्षम"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, fuzzy, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "डिपोट डाइरेक्ट्री `%.250s' पढ्न अक्षम"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, fuzzy, c-format
 msgid "read error in `%.250s'"
@@ -1272,7 +1292,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "dpkg-deb पाइपबाट पढ्दा त्रुटि"
 
@@ -1291,12 +1311,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "सिमलिङ्क `%.255s'को स्वामित्व सेट गर्दा त्रुटि"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "`%.255s' को स्यामित्व सेट गर्दा त्रुटि"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "`%.255s'को सेटिङ् अनुमति त्रुटि"
@@ -1351,109 +1371,124 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "सङ्ग्रहले अज्ञात प्रकारको वस्तु `%.255s' समावेश गर्यो 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat file '%s'"
+msgstr "पुरानो नाम `%s' तोक्न सकिदैन: %s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "पुरानो संस्करणमा फाइलहरू बदल्दै %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "स्थापना गरिएको प्याकेजमा फाइलहरू द्रारा प्रतिस्थापित गरियो %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
 "nondirectory"
 msgstr "डाइरेक्टरी बिनाको प्याकेज`%.250s'मा डाइरेक्टरी %.250s अधावधिक गर्न प्रयास गर्दै"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "`%.250s'अधावधिक गर्न प्रयास गर्दै, जुन प्याकेज %.250s मा पनि छ"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "`%.255s'लाई (`%.255s'मा ) पढ्न असफल"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "dpkg-deb `%.255s' बेलामा ब्याकइन्ड"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "बन्द गर्दा/लेख्दा `%.255s' त्रुटि"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "पाइप `%.255s' सिर्जना गर्दा त्रुटि"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "यन्त्र `%.255s' सिर्जना गर्दा त्रुटि"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "हार्ड लिङ्क `%.255s' सिर्जना गर्दा त्रुटि"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "प्रतिकात्मक लिङ्क `%.255s' सिर्जना गर्दा त्रुटि"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "डाइरेक्टरी `%.255s' सिर्जना गर्दा त्रुटि"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "नयाँ संस्करण स्थापना गर्न `%.255s' लाई छेउमा सार्न अक्षम"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "लिङ्क`%.255s' पढ्न अक्षम"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "सिमलिङ्क `%.255s' का लागि जगेडा बनाउन अक्षम"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "सिमलिङ्क `%.255s' का लागि जगेडा स्वामित्व परिवर्तन गर्न अक्षम"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "नयाँ संस्करण स्थापना गर्न पहिले जगेडा लिङ्क`%.255s' बनाउन अक्षम"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "`%.255s' को नयाँ संस्करण स्थापना गर्न अक्षम"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "`%.255s' सिर्जना गर्न अक्षम"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "`%.255s' बफर बन्द गर्न अक्षम"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1462,7 +1497,7 @@
 "dpkg: चेतावनी - %s को हटाउने सँग निर्भरता समस्या अवज्ञा गर्दै:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, fuzzy, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1471,7 +1506,7 @@
 "dpkg: चेतावनी - अत्यावश्यक\n"
 " प्याकेज %s को डिकन्फिगरेसन ध्यान दिदै , %sको हटाउने सक्षम पार्न ।\n"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1480,7 +1515,7 @@
 "dpkg: होइन, %s आवश्यक छैन, डिकन्फिगर गरिएको छैन\n"
 "यो हटाउने %s को सक्षम गर्न  क्रममा छ ।\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1489,28 +1524,28 @@
 "dpkg: होइन, %s हटाउन सक्दैन (--स्वत डिकन्फिगरले मद्दत गर्नेछ):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, fuzzy, c-format
 msgid "removal of %.250s"
 msgstr "%.250s मा त्रुटि पढ्नुहोस्"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, fuzzy, c-format
 msgid "installation of %.250s"
 msgstr "`%.255s' को नयाँ संस्करण स्थापना गर्न अक्षम"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, fuzzy, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: %sको पक्षमा %s हटाउन विचार गर्दै ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, fuzzy, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: हो, %s को पक्षमा %s हट्नेछ ।\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1519,39 +1554,39 @@
 "dpkg: %s समावेश गर्दै %s ध्यान दिदै:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 #, fuzzy
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "dpkg: चेतावनी - अवज्ञा विच परस्पर-विरोध, जे भए पनि बढ्न सक्नुहुन्छ !\n"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: %sको पक्षमा %s हटाउन विचार गर्दै ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s राम्रो सँग स्थापना गरिएको छैन - यसमा कुनै निर्भरताहरू अवज्ञा गर्दै ।\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: %s हटाउदा झन्झट हुन सक्छ, यसले यस रुपमा प्रदान गर्दछ %s ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1560,108 +1595,110 @@
 "dpkg: प्याकेज %s लाई पून स्थापना आवश्यक छ, तर जे भए पनि तपाईँको अनुरोध अनुसार हटाउनुछ "
 "।\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: प्याकेज %s लाई पून स्थापना आवश्यक छ, हट्ने छैन\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: हो, %s को पक्षमा %s हट्नेछ ।\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "परस्पर-विरोधी प्याकेजहरू %.250s स्थापना नगर्दै"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 #, fuzzy
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "dpkg: चेतावनी - अवज्ञा विच परस्पर-विरोध, जे भए पनि बढ्न सक्नुहुन्छ !\n"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --कम्तिमा एक मार्ग तर्क पुनरावृती आवश्यक छ"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "पुनरावृतिको लागि कार्यन्वयन गर्न असफल"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "'फेला पार्नुहोस' को पाइप fdopen गर्न असफल"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "'फेला पार्नुहोस' को पाइप पढ्दा त्रुटि"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "'फेला पार्नुहोस' को पाइप बन्द गर्दा त्रुटि"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "पुनरावृतिका लागि 'फेला पार्नुहोस' ले ह्यान्डल नगरिएको त्रुटि %i फिर्ता गर्यो"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "खोजिएको, तर फेला नपारिएको प्याकेजहरू ( *.deb सँग मिल्ने फाइलहरू)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s लाई कम्तिमा एउटा प्याकेज सङ्ग्रह फाइल तर्क आवश्यक छ"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "पहिल्यै चयन हटाएको प्याकेज %s चयन गर्दै \n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "चयन हटाएको प्याकेज %s फड्काउदै\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "संस्करण %.250s of %.250s पहिल्यै स्थापित छ, फड्काउदै\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s - चेतावनी: %.250s बाट %.250s सम्म %.250s स्तरन्युन गर्दैछ ।\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "%.250s बाट संस्करण %.250s सम्म %.250s स्तरन्युन हुने छैन, फड्काउदै ।\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1669,39 +1706,39 @@
 msgstr ""
 "जगेडा प्रतिलिपिको पूनस्थापनालाई अनुमति दिन %.250s'को भर्खरै स्थापित संस्करण हटाउन अक्षम"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "%.250s' को जगेडा संस्करण पूर्वावस्थामा ल्याउन अक्षम"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "%.250s' को जगेडा संस्करण पूर्वावस्थामा ल्याउन अक्षम"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "%.250s' को भर्खरै स्थापित संस्करण हटाउन अक्षम"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "%.250s' को नयाँ झिकिएको संस्करण हटाउन अक्षम"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "नयाँ वितरण कन्फफाइल `%.250s' तोक्न अक्षम"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "हाल स्थापित कन्फफाइल `%.250s' तोक्न अक्षम"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1712,57 +1749,57 @@
 "कन्फिगरेसन फाइल`%s', तपाईँको प्रणालीमा अवस्थित छैन ।\n"
 "तपाईँको अनुरोध अनुसार नयाँ कन्फिगर फाइल स्थापना गर्दै ।\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "dpkg: %s: चेतावनी - पुरानो जगेडा हटाउन असफल `%.250s': %s\n"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "dpkg: %s: चेतावनी - नाम फेर्न असफल`%.250s' to `%.250s': %s\n"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: ले '%s %s' कार्यान्वयन गर्न असफल"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "dpkg: %s: चेतावनी - पुरानो वितरण संस्करण `%.250s' हटाउन असफल: %s\n"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "dpkg: %s: चेतावनी - `%.250s' (अधिलेखन पहिले) हटाउन असफल: %s\n"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "dpkg: %s: चेतावनी - `%.250s' लाई `%.250s'संग लिङ्क गर्न असफल: %s\n"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "कनफिग फाइल %s को नयाँ संस्करण स्थापना गर्दै ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "`%.250s' को रुपमा `%.250s' स्थापना गर्न अक्षम"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "`%s' नाम गरेको कुनै पनि प्याकेज स्थापना गरिएको छैन, कन्फिगर गर्न सकिदैन"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "प्याकेज %.250s पहिल्यै स्थापित र कन्फिगर गरिएको छ"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1771,7 +1808,7 @@
 "प्याकेज %.250s कन्फिगरका लागि तयार छैन\n"
 "कन्फिगर गर्न सकिदैन  (हालको स्थिति `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1780,11 +1817,11 @@
 "dpkg:%s को कन्फिगरेसन निर्भरता समस्याका कारणले रोक्दछ :\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "निर्भरता समस्याहरू - कन्फिगरेसन नगरेको छोड्दै"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1793,7 +1830,7 @@
 "dpkg: %s: निर्भरता समस्याहरू, तर जे भए पनि तपाईँको अनुरोधको रुपमा कन्फिगर गर्दै:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1801,12 +1838,12 @@
 "प्याकेज एकदम खराब अयोग्य स्थितीमा छ - तपाईँले\n"
 "यसलाई कन्फिगरेसन प्रयत्न गर्न पूर्व पून स्थापना गर्नु पर्दछ ।"
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "सेटिङ् गर्दै %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, fuzzy, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1815,7 +1852,7 @@
 "dpkg: %s: चेतावनी - कन्फिग फाइल`%s' तोक्न अक्षम \n"
 " (= `%s'): %s\n"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, fuzzy, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1824,7 +1861,7 @@
 "dpkg: %s: चेतावनी - कन्फिग फाइल `%s' परिपत्र लिङ्क हो \n"
 " (= `%s')\n"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, fuzzy, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1833,7 +1870,7 @@
 "dpkg: %s: चेतावनी - लिङ्क कन्फफाइल`%s' पढ्न असफल \n"
 " (= `%s'): %s\n"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, fuzzy, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1842,34 +1879,34 @@
 "dpkg: %s: चेतावनी - कन्फफाइल `%.250s' ले विकृत फाइलनाम समाधान गर्दछ\n"
 " (`%s'ले`%s'मा सिमलिङ्क हो)\n"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, fuzzy, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "dpkg: %s: चेतावनी - कन्फफाइल `%.250s' एउटा सादा फाइल वा सिमलिङ्क होइन (= `%s')\n"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "dpkg: %s: चेतावनी - ह्यासका लागि कन्फफाइल %s खोल्न अक्षम: %s\n"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "तपाईँले गरिसके पछि 'exit' टाइप गर्नुहोस् ।\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1878,12 +1915,12 @@
 "\n"
 "कन्फिगरेसन फाइल `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (वास्तवमा `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1894,7 +1931,7 @@
 " ==> तपाईँ वा एउटा स्क्रिप्टद्धारा प्रणालीमा फाइल सिर्जना भयो ।\n"
 " ==> प्याकेज मर्मत गर्नेद्वारा प्याकेजमा फाइल पनि प्रदान गर्यो ।\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1903,7 +1940,7 @@
 "\n"
 "     स्थापना देखि परिमार्जन गरिएको छैन ।\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1912,7 +1949,7 @@
 "\n"
 " ==> स्थापना देखि(तपाईँ वा तपाईँको स्क्रिप्टद्धारा) परिमार्जित ।\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1921,37 +1958,37 @@
 "\n"
 " ==> स्थापना देखि (तपाईँ वा स्क्रिप्ट द्धारा) हटाइएको ।\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==>एउटा अद्यावधिक संस्करण प्याकेज वितरकलेग सि गरेकोप ण छ ।\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "    प्याकेजमा संस्करण अन्तिम स्थापना बराबर छ ।\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> तपाईँको अनुरोधको रुपमा नयाँ फाइल प्रयोग गर्दैछ ।\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> तपाईँको अनुरोधको रुपमा हाल पुरानो फाइल प्रयोग गर्दैछ ।\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> पुरानो कन्फिग फाइल पूर्वनिर्धारितको रुपमा राख्दैछ ।\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> नयाँ कन्फिग फाइल पूर्वनिर्धारितको रुपमा प्रयोग गर्दैछ ।\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1966,165 +2003,166 @@
 "      D     : संस्करणहरू बिचको फरकहरू देखाउनुहोस्\n"
 "      Z     : वस्तुस्थिति परिक्षण गर्न सो प्रक्रिया पृष्ठभूमि गर्नुहोस् \n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " तपाईँको हालको संस्करण पूर्वनिर्धारित कार्य राख्नका लागि हो ।\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " पूर्वनिर्धारित कार्य नयाँ संस्करण स्थापना गर्नलाई हो ।\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[पूर्वनिर्धारित=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[पूर्वनिर्धारित=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[पूर्वनिर्धारित छैन]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "stderr लाई लेख्दा त्रुटि, कन्फफाइल प्रोम्ट पहिले पत्ता लगाइयो"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "कन्फफाइल प्रोम्टको stdin मा त्रुटि पढ्नुहोस्"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF को stdin मा कन्फफाइल प्रोम्ट"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s मा निर्भर हुन्छ %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s पहिले नै %s मा निर्भर हुन्छ"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s ले %s लाई सिफारिश गर्दछ"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s ले %s सुझाव दिन्छ"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s ले %s लाई विच्छेद गर्दछ"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s सँग %s द्वन्द्व गर्दछ"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s ले %s बढाउँदछ"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s लाई हटाएको हुनु पर्दछ ।\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s लाई डिकन्फिगर गर्नु पर्छ ।\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s स्थापित हुनु पर्दछ, तर संस्करण %.250s मा ।\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s स्थापना गरिएको छ, तर संस्करण %.250s मा ।\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s खोलिएको छ, तर कहिले पनि कन्फिगर गिरिएन ।\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s खोलिएको छ, तर संस्करण %.250s मा ।\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s अन्तिमा कन्फिगर गरिएको संस्करण %.250s हो ।\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s  %s हो ।\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s ले  %.250s प्रदान गर्दछ तर हटाइएको हुनु पर्दछ ।\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s ले %.250s प्रदान गर्दछ तर डिकन्फिगर गरिएको हुनुपर्दछ ।\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s ले %.250s प्रदान गर्दछ तर %s हो ।\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s स्थापना गरिएको छैन ।\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (संस्करण %.250s) स्थापित हुनु पर्दछ ।\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, fuzzy, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (संस्करण %.250s) %s हो ।\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s ले %.250s प्रदान गर्दछ र स्थापित हुनु पर्दछ ।\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, fuzzy, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s ले %.250s प्रदान गर्दछ र %s हो ।\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+msgid "Use --help for help about diverting files."
+msgstr "मद्दतको लागि dpkg-split --help टाइप गर्नुहोस्"
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "डेबियन %s संस्करण %s \n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2139,8 +2177,8 @@
 "प्रतिलिपि अधिकार (सी) १९९५ इयान ज्याक्सन\n"
 "प्रतिलिपि अधिकार (सी) २०००,२००१ विर्चार्ड आकर्म्यान"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2152,7 +2190,7 @@
 "संस्करण २ वा\n"
 "पछिल्लो हेर्नुहोस् । कुनै पनि वारेन्टी छैन ।\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2162,7 +2200,7 @@
 "उपयोग: %s [<option> ...] <command>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2174,7 +2212,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -2215,7 +2253,7 @@
 "हटाउदा, --प्याकेज वा --स्थानिय र --यदि निर्दिष्ट गरिएमा फेराइ मिल्नु पर्दछ\n"
 "प्याकेज preinst/postrm स्क्रिप्टले सधै --प्याकेज र --फेराइ निर्दिष्ट गर्नु पर्दछ.\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2224,19 +2262,13 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat file '%s'"
-msgstr "पुरानो नाम `%s' तोक्न सकिदैन: %s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error checking `%s': %s"
 msgid "error checking '%s'"
 msgstr "जाँच त्रुटि `%s': %s"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2245,140 +2277,140 @@
 "पुन: नामकरणमा `%s' लाई\n"
 "  फरक फाइल `%s' अधिलेखन समावेश हुन्छ, स्विकार्य छैन"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "स्रोत फाइल `%.250s' खोल्न अक्षम"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "cannot stat new name `%s': %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "नयाँ नाम `%s' तोक्न सकिदैन: %s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 #| msgid "rename: remove duplicate old link `%s': %s"
 msgid "rename: remove duplicate old link '%s'"
 msgstr "पुन: नामकरण गर्नुहोस्: पुरानो नक्कली लिङ्क `%s' हटाउनुहोस्: %s"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "स्रोत फाइल `%.250s' खोल्न अक्षम"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 msgid "local diversion of %s"
 msgstr "स्थानिय रुपमा तिर मोडिएको: %s\n"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 msgid "local diversion of %s to %s"
 msgstr "स्थानिय रुपमा तिर मोडिएको: %s\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "diversion of %s by %s"
 msgstr "%s द्धारा मोड"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "%s द्धारा %s मा फेरिएको\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "any diversion of %s"
 msgstr "%s द्धारा मोड"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 msgid "any diversion of %s to %s"
 msgstr "%s द्धारा %s मा फेरिएको\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "cannot open GPL file"
 msgid "cannot create new %s file"
 msgstr "GPLफाइल खोल्न सकेन"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "vsnprintf मा फ्लस गर्न अक्षम"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 #| msgid "remove old diversions-old: %s"
 msgid "error removing old diversions-old"
 msgstr "पुरानो डाइभर्सन हटाउनुहोस्-पुरानो: %s"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "नयाँ statoverride सिर्जना गर्दा त्रुटि: %s"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "नयाँ statoverride स्थापना त्रुटि: %s"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s लाई एकल तर्क आवश्यक पर्दछ"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "फाइलनाम \"%s\" स्थिर छैन"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "फाइले नयाँरेखा समावेश नगरेको हुन सक्छ"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "डाइरेक्टरी फेर्न सकिदैन"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "डाइरेक्टरी फेर्न सकिदैन"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "छोड्दैछ `%s'"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "with `%s' सँग `%s' द्वन्दहरू "
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "`%s' थप्दा"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
 msgstr " `%s' डाइभर्सन होइन, केहि पनि हटाइएन"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2389,7 +2421,7 @@
 "  divert-to मा\n"
 "  `%s' फेला पर्यो"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2400,17 +2432,17 @@
 "  `%s' बेमेल\n"
 "  फेला पर्यो"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "हटाउदैछ `%s'"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "प्याकेजले नयाँरेखा समावेश नगर्न सक्छ"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "यसमा फेर्नेले नयाँरेखाहरू समावेश नगर्न सक्छ"
 
@@ -2489,8 +2521,8 @@
 msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s ले कुनै तर्कहरू लिदैन"
@@ -2580,7 +2612,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-संस्करणहरू खराब सम्बन्ध"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "dpkg: संस्करण '%s' सँग खराब वाक्य संरचना छ: %s\n"
@@ -2636,12 +2668,12 @@
 "dpkg - चेतावनी, अधिलेखन गर्दा त्रुटि किनभने--force सक्षम:\n"
 " "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल खोल्न अक्षम"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, fuzzy, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2650,37 +2682,37 @@
 "dpkg: गम्भिर चेतावनी: प्याकेज`%.250s'का लगि फाइलको सूची फाइल हराइरहेको छ, मानिएको "
 "प्याकेज सँग हालमा स्थापित फाइलहरू छैन ।\n"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल खोल्न अक्षम"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "प्याकेज `%.250s' का लागि फाइलको सूची"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, fuzzy, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल बन्द गर्दा त्रुटि"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(डेटावेश पढ्दै ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2688,32 +2720,32 @@
 msgstr[0] "%d फाइलहरू र डाइरेक्टरीहरू हालैमा स्थापना भयो ।)\n"
 msgstr[1] "%d फाइलहरू र डाइरेक्टरीहरू हालैमा स्थापना भयो ।)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "प्याकेज %s का लागि अद्यावधिक फाइलको सूची फाइल सिर्जना गर्न अक्षम"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "प्याकेज %s का लागि अद्यावधिक फाइलको सूची फाइलमा लेख्न असफल"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "प्याकेज %s का लागि अद्यावधिक फाइलको सूची फाइल फ्लस गर्न असफल"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "प्याकेज %s का लागि अद्यावधिक सूची फाइल समक्रमण गर्न असफल"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "प्याकेज %s का लागि अद्यावधिक फाइलको सूची फाइल बन्द गर्न असफल"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "प्याकेज %s का लागि अद्यावधिक फाइलको सूची फाइल स्थापना गर्न असफल"
@@ -2753,7 +2785,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "dpkg - त्रुटि: PATH सेट गरेको छैन ।\n"
 
 #: src/help.c:129
@@ -2785,7 +2817,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "vsnprintf मा सुरू गर्न अक्षम"
@@ -2796,66 +2828,66 @@
 msgstr "`%.250s' लाई chroot गर्न असफल"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "`%.255s' मा डाइरेक्टरी परिवर्तन गर्न अक्षम"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "`%.250s' मा कार्यन्वयन अनुमतिहरू सेट गर्न अक्षम"
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "vsnprintf मा सुरू गर्न अक्षम"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "पुरानो %s स्क्रिप्ट"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr " %s `%.250s' लाई stat गर्न अक्षम"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "नयाँ %s स्क्रिप्ट"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "पुरानो %s स्क्रिप्ट"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr " %s `%.250s' लाई stat गर्न अक्षम"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - साट्टोमा नयाँ प्याकेजबाट टाइपिङ्ग स्क्रिप्ट ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "त्यहाँ प्याकेजको नयाँ संस्करणमा स्क्रिप्ट छैन - छोड्दै"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... यो गएको OK जस्तो देखिन्छ ।\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "`%.255s' सिर्जना गर्न अक्षम"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2864,7 +2896,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "`%.250s'को अवस्थिति जाँच गर्न अक्षम"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "सूचना डाइरेक्टरी पढ्न सक्दैन"
 
@@ -2935,7 +2967,7 @@
 "  -Dh|--debug=help                 डिबगिङमा मद्दत देखाउनुहोस् ।\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -3064,7 +3096,7 @@
 "प्रयोगकर्ता-मित्रवत प्याकेज व्यवस्थापनका लागि `dselect' or `aptitude' प्रयोग गर्नुहोस् "
 "।\n"
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3119,30 +3151,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3151,102 +3187,102 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "निर्भरता समस्याहरू - हट्दैन"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "निर्भरता समस्याहरू - हट्दैन"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "vsnprintf मा सुरू गर्न अक्षम"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "कन्फिगरेसन`%.255s' फाइलमा त्रुटि पढ्नुहोस्"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3254,7 +3290,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3262,36 +3298,36 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--डिबगलाई एउटा octal तर्कमा आवश्यक हुन्छ"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "--ignore-depends comma-separated list `%.250s' मा शून्य प्याकेज"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends लाई कानूनी प्याकेज नामको आवश्यकता पर्दछ । `%.250s' होइन; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s का लागि इन्जिटर अवैध: `%.250s'   "
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3300,7 +3336,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3308,12 +3344,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "अज्ञात दवाब/अविस्कार विकल्प `%.*s"
 
-#: src/main.c:511
+#: src/main.c:513
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "चेतावनी: अप्रचलित दवाव/अस्विकार विकल्प `%s'\n"
@@ -3336,8 +3372,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "लाइनको समाप्ती पहिले %d अप्रत्यासित eof"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "एउटा कार्य विकल्प आवश्यक"
 
@@ -3501,86 +3537,86 @@
 msgid "passed\n"
 msgstr "पास गर्यो\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "अस्थायी डाइरेक्टरी नाम बनाउन असफल"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "प्याकेज %s सँग धेरै द्वन्द्व/विस्थापन जोडी छन्"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr " प्याकेजको पुरानो संस्करणसँग `%.250s'सँग सुरुआत अति-लामो सूचना फाइल नाम छ"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "अप्रचलित सूचना फाइल `%.250s हटाउन अक्षम"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "नयाँ सूचना फाइल स्थापन (मानेको) गर्न अक्षम`%.250s'"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "अस्थायी नियन्त्रण डाइरेक्टरी खोल्न अक्षम"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr "प्याकेजले अति धेरै लामो नियन्त्रण सूचना फाइलनाम (सुरू`%.50s') समावेश गर्दछ"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "प्याकेज नियन्त्रण सूचनाले`%.250s' डाइरेक्टरी समाहित गर्दछ"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "rmdir को `%.250s' प्याकेज नियन्त्रण सूचनाले dir होइन भन्दैन"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr "dpkg: चेतावनी - प्याकेज %s ले सूचना फाइलको रुपमा समाहित गर्दछ"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "नयाँ सूचना फाइल `%.250s' को रुपमा `%.250s' स्थापना गर्न अक्षम"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "नियन्त्रण सूचना फाइल `%.250s' हटाउन अक्षम"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "सङ्ग्रहमा पहुँच गर्न सकिदैन"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "अस्थायी डाइरेक्टरी नाम बनाउन असफल"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "नियन्त्रण सूचना लम्बाई"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "%s बाट %s का बारेमा रेर्कड गरिएको सूचना ।\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "प्याकेज बनावट (%s) प्रणाली (%s)संग मेल खादैन"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3589,100 +3625,100 @@
 "dpkg:  %s ध्यानदिदै %s समाहित, पूर्व-निर्भरता समस्या:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "पूर्न-निर्भरता समस्या - अझ %.250s स्थापना गरिदै छैन"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr "dpkg: चेतावनी - पूर्व-निर्भरता समस्या अवज्ञा गर्दैछ !\n"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "प्रतिस्थापन गर्न तयारी %s %s (प्रयोग गर्दै %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "खोल्दै %s (बाट %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "कन्फफाइलको नाम (सुरु `%.250s') धेरै लामो छ (>%d क्यारेक्टरहरू)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "%.250s मा त्रुटि पढ्नुहोस्"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "%.250s बन्द गर्दा त्रुटि"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "%.250s खोल्न प्रयास गर्दा त्रुटि"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, fuzzy, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "%s डि-कन्फीगर गर्नुहोस्, जसले हामिले %s हटाउन सक्छौ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, fuzzy, c-format
 msgid "De-configuring %s ...\n"
 msgstr "हटाउँदैछ %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "प्रतिस्थापन खोल्दै %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "dpkg-deb टार निर्गत पढ्दा त्रुटि"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "दुषित फाइलप्रणाली टारफाइल - दुषित प्याकेज सङ्ग्रह"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: ज्यापले सम्भवत शुन्यहरू ट्रायल गर्दै"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, fuzzy, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "dpkg:चेतावनी - पुरानो फाइल `%.250s' गर्न सकेन त्यसैले यसलाई नमेट्दै: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "dpkg: चेतावनी - पुरानो फाइल `%.250s' मेट्न अक्षम: %s\n"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, fuzzy, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "dpkg: चेतावनी - पुरानो कन्फफाइल `%.250s' एउटा रित्तो डाइरेक्टरी हो (र अहिले कसरि "
 "मेटिदै छ)\n"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "अन्य नयाँ फाइल `%.250s' stat गर्न अक्षम"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, fuzzy, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3691,12 +3727,12 @@
 "dpkg: चेतावनी - पूरानो फाइल `%.250s' विभिन्न नयाँ फाइलसँग समान छ!  (दुवै `%.250s' र "
 "`%.250s')\n"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "dpkg: चेतावनी - पुरानो फाइल %s अक्षम `%%.250s': %%s\n"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "( %s को केहिपनि हराएको छैन, ति सम्पुर्ण रुपमा प्रतिस्थापन गरिएको छ)\n"
@@ -3862,7 +3898,7 @@
 "  -f|--showformat=<format>         देखाउनको-लागि वैकल्पिक ढाँचा प्रयोग गर्नुहोस् ।\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3884,6 +3920,10 @@
 "। \n"
 "\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, fuzzy, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3942,7 +3982,7 @@
 msgid "Removing %s ...\n"
 msgstr "हटाउँदैछ %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, fuzzy, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3951,47 +3991,48 @@
 "dpkg - चेतावनी: %.250s हटाउदा, `%.250s' डाइरेक्टरी हटाउन अक्षम: %s - डाइरेक्टरी "
 "एउटा माउन्ट बिन्दु हुनसक्छ ?\n"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "`%.250s' हटाउन सक्दैन"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "`%.255s' सिर्जना गर्न अक्षम"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "dpkg - चेतावनी: %.250s हटाउदा, डाइरेक्टरी `%.250s' रित्तो छैन त्यसैले हटाउन सकिएन ।\n"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "`%.250s' हटाउन सक्दैन"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr " %s ... का लागि कन्फिगरेसन फाइलहरू पर्जगर्दै\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "पुरानो कन्फिग फाइल `%.250s' (= `%.250s') हटाउन सक्दैन"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "कन्फिग फाइल डाइरेक्टरी `%.250s' (from `%.250s') पढ्न सक्दैन"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr "पुरानो कन्फिग फाइल `%.250s' (of `%.250s') हटाउन सक्दैन"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "पुरानो फाइल सूची हटाउन सक्दैन"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "पुरानो postrm स्क्रिप्ट हटाउन सक्दैन"
 
@@ -4034,7 +4075,11 @@
 msgid "read error on standard input"
 msgstr "मानक आगतमा त्रुटि पढ्नुहोस्"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4044,7 +4089,7 @@
 "प्रतिलिपि अधिकार (सी) १९९५ इयान ज्याक्सन\n"
 "प्रतिलिपि अधिकार (सी) २०००-२००२ विचार्ड अकर्म्यान"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4055,7 +4100,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -4083,56 +4128,56 @@
 "  --help                   मद्दत सन्देश देखाउनुहोस् ।\n"
 "  --version                संस्करण देखाउनुहोस् ।\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "अनावृत ट्रेलिङ"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "नयाँ statoverride फाइल खोल्न असफल: %s"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "पुरानो statoverride हटाउन त्रुटि:%s"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "नयाँ statoverride सिर्जना गर्दा त्रुटि: %s"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "नयाँ statoverride स्थापना त्रुटि: %s"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--आवश्यक चार तर्क थप्नुहोस्"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, fuzzy, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr "तर--निर्दिष्ट बल त्यसै कारणलै उपेक्षा गरिनेछ ।"
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, fuzzy, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "\"%s\"का लागि अधिलेखन पहिले नै अवस्थित छ,"
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, fuzzy, c-format
 msgid "--update given but %s does not exist"
 msgstr "चेतावनी--अद्यावधिक दिइएको छ तर %s अवस्थित छैन"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "अधिलेखन अवस्थित छैन"
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 #, fuzzy
 msgid "--update is useless for --remove"
 msgstr "चेतावनी:--हटाउन--अद्यावधिक उपयोगि छैन"
@@ -4204,17 +4249,17 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "statoverride फाइल `%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "मद्दतको लागि dpkg-split --help टाइप गर्नुहोस्"
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "डेबियन `%s' प्याकेज व्यवस्थापन कार्यक्रम प्रश्न उपकरण\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4224,7 +4269,7 @@
 "उपयोग: %s [<option> ...] <command>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4233,7 +4278,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4247,31 +4292,31 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 #, fuzzy
 msgid "takes one argument, the trigger name"
 msgstr "--%s ले एक मात्र (.deb फाइलनाम) तर्क लिन्छ"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "`%s' फाँट, अवैध प्याकेज नाम `%.255s': %s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "`%s' फाँट, अवैध प्याकेज नाम `%.255s': %s"
@@ -4300,29 +4345,30 @@
 msgstr " %s ... का लागि कन्फिगरेसन फाइलहरू पर्जगर्दै\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s लाई यथार्थमा एउटा प्याकेज फाइल तर्क आवश्यक पर्दछ"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr "bulk उपलब्ध अद्यावधिकका लागि dpkg स्थिति क्षेत्र पहुँच गर्न अक्षम"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr "bulk उपलब्ध अद्यावधिकलाई dpkg स्थिति क्षेत्रमा लेख्य पहुँच आवश्यक पर्दछ"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "%s प्रयोग गर्दै, उपलब्ध प्याकेजका सूचना प्रतिस्थापन गर्दै ।\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "%s प्रयोग गर्दै, उपलब्ध प्याकेज सूचनाहरू अद्यावधिक गर्दै ।\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4330,7 +4376,7 @@
 msgstr[0] "%d प्याकेज(हरू) बारेको सूचना अद्यावधिक गरियो ।\n"
 msgstr[1] "%d प्याकेज(हरू) बारेको सूचना अद्यावधिक गरियो ।\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4443,8 +4489,8 @@
 msgstr[0] "dpkg-deb:  %d ले कन्फफाइल(हरू) का बारेमा चेतावनीहरू अवज्ञा गर्दै\n"
 msgstr[1] "dpkg-deb:  %d ले कन्फफाइल(हरू) का बारेमा चेतावनीहरू अवज्ञा गर्दै\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s लाई <directory> आवश्यक पर्दछ"
@@ -4476,26 +4522,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: प्याकेज `%s' मा `%s बनाउदै ।\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "tmpfile (डेटा) बनाउन असफल"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "नियन्त्रण क्षेत्र"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "tmpfile (डेटा) अनलिङ्क गर्न असफल, %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4511,20 +4557,20 @@
 msgid "error writing `%s'"
 msgstr "लेख्दै गर्दा त्रुटि `%s'"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "सदस्यहरुको बिच"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "पाइप (डेटा) टारलाई फाइलनाम लेख्न असफल"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4542,76 +4588,76 @@
 msgid "error reading %s from file %.255s"
 msgstr "फाइल %.255s बाट %s पढ्दा त्रुटि"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "सङ्ग्रह`%.255s' पढ्न असफल"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "सङ्ग्रह fstat गर्न असफल"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "संस्करण नम्बरमा सङ्ग्रहसंग थोप्ला छैन"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "सङ्ग्रहमा हेडरमा कुनै पनि न्युलाइन छैन"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "फाइल `%.250s' दूषित छ - खराब भाग नम्बर"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "फाइल `%.250s' डेबियन बाइनरि सङ्ग्रह होइन (try dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "संस्करण नम्बरमा सङ्ग्रहसंग थोप्ला छैन"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "सङ्ग्रहमा हेडरमा कुनै पनि न्युलाइन छैन"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "संस्करण नम्बरमा सङ्ग्रहसंग थोप्ला छैन"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "सङ्ग्रह संस्करण %.250s बुझेन, नयाँ dpkg-deb पाउनुहोस्"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "%s बाट सदस्य डेटा फड्कियो"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "फाइल `%.250s' ले नबुझ्ने डेटा सदस्य %.*s समावेश गर्दछ, छोड्दै"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "फाइल `%.250s' ले दुई सदस्यहरू समावेश गर्दछ, छोड्दै"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4623,23 +4669,23 @@
 " नयाँ डेबियन प्याकेज, संस्करण %s.\n"
 " आकार %ld बाइट्स: नियन्त्रण सङ्ग्रह= %zi बाइट्स ।\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "सङ्ग्रहसंग नराम्रो ढाँचाबद्ध नियन्त्रण लम्बाई `%s' छ"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "%s बाट सदस्य डेटा फड्कियो"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4651,7 +4697,7 @@
 " पुरानो डेबियन प्याकेज, संस्करण %s ।\n"
 " आकार %ld बाइट्स: नियन्त्रण सङ्ग्रह= %zi, मुख्य सङ्ग्रह= %ld ।\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4660,51 +4706,52 @@
 "dpkg-deb: फाइल जस्तो देखिन्छ यो सम्भवत एउटा सङ्ग्रह हो जुन\n"
 "dpkg-deb:    ASCII मोडमा डाउनलोड गरिदा दुषित भएको छ\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' डेबियन ढाँचा सङ्ग्रह होइन"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "प्रतिलिपिमा पाइपलाई लेख्न असफल"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "प्रतिलिपिमा पाइप बन्द गर्न असफल"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "डेटा"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "डाइरेक्टरीलाई chdir गर्न असफल"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "डाइरेक्टरी सिर्जना गर्न असफल"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "डाइरेक्टरी सिर्जना गरे पछि डाइरेक्टरीलाई chdir गर्न असफल"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "डाइरेक्टरीलाई chdir गर्न असफल"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s: असङ्कुचन"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 #, fuzzy
 msgid "paste"
 msgstr "पास गर्यो\n"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s लाई .deb फाइलनाम तर्क आवश्यक छ"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4713,37 +4760,37 @@
 "--%s लाई लक्षित डाइरेक्टरी आवश्यक छ ।\n"
 "सम्भवत तपाईँलाई dpkg --स्थापना प्रयोग गर्नु पर्दछ ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s ले बढिमा दुई तर्कहरू (.deb र डाइरेक्टरी) लिन्छ"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s ले एक मात्र (.deb फाइलनाम) तर्क लिन्छ"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr " `/' लाई खाली गर्नका लागि chdir गर्न असफल"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
 msgid "control file '%s'"
 msgstr "पुरानो नाम `%s' तोक्न सकिदैन: %s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: `%.255s' ले नियन्त्रण अवयव `%.255s'समावेश गर्दछ\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr "अवयव`%.255s' (in %.255s)खोल्न अप्रत्यासित रुपले असफल"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, fuzzy, c-format
 #| msgid "One requested control component is missing"
 msgid "%d requested control component is missing"
@@ -4751,59 +4798,59 @@
 msgstr[0] "एउटा अनुरोध गरिएको नियन्त्रण अवयव हराइरहेको छ"
 msgstr[1] "एउटा अनुरोध गरिएको नियन्त्रण अवयव हराइरहेको छ"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "डाइरेक्टरी `%.255s' स्क्यान गर्न सकिदैन"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "`%.255s'लाई (`%.255s'मा) सुरू गर्न सकिदैन"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "`%.255s'लाई (`%.255s'मा) खोल्न सकिदैन"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "`%.255s'लाई (`%.255s'मा ) पढ्न असफल"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     एउटा सादा फाइल होइन          %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "( `control' फाइल नियन्त्रण सङ्ग्रहमा छैन !)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "`control' अवयवहरू खोल्न सकेन"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "`control' को अवयवहरू पढ्नेबेलामा असफल"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "'फेला पार्नुहोस' को पाइप बन्द गर्दा त्रुटि"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "ढाँचामा त्रुटि"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--सामग्रिहरुले यथार्थमा एउटा तर्क लिन्छ"
 
@@ -4813,7 +4860,19 @@
 msgstr "डेबियन `%s' प्याकेज सङ्ग्रह ब्याकइन्ड संस्करण %s ।\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4824,6 +4883,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4839,7 +4900,7 @@
 "  --fsys-tarfile <deb>             निर्गत फाइल प्रणाली टारफाइल ।\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4852,11 +4913,12 @@
 "<cfield> मुख्य `control' फाइलमा फाँटको नाम । \n"
 "\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4881,7 +4943,7 @@
 "।\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4895,7 +4957,7 @@
 "प्रयोग गर्नुहोस् ।\n"
 "`dpkg-deb --extract' प्रयोग गरेर प्याकेजहरू प्याक नगर्दा गलत रुपमा स्थापना हुनेछ !\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4904,17 +4966,17 @@
 "प्याकेजहरुको स्थापना गर्ने र स्थापनाबाट हटाउने बारेमा मद्दत गर्नको लागि dpkg --help "
 "टाइप गर्नुहोस् ।"
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "--%s का लागि इन्जिटर अवैध: `%.250s'   "
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "--%s का लागि इन्जिटर अवैध: `%.250s'   "
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "अज्ञात सङ्कुचन प्रकार `%s'!"
@@ -4934,7 +4996,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "फाइल `%.250s' दूषित छ - %.250s पछि नयाँ लाइन हरटाइरहेछ"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "%.250s पढ्दा त्रुटि"
@@ -5023,47 +5085,52 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "फाइल `%.250s' दूषित छ - खराब भाग नम्बर"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+msgid "package architecture"
+msgstr " (प्याकेज: "
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr "फाइल `%.250s' दूषित छ - दोस्रो हेडरको समाप्तिमा खराब जादू"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "फाइल `%.250s' दूषित छ - दोस्रो सदस्य डेटा सदस्य होइन"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr "फाइल `%.250s' दूषित छ -उद्धरण गरिएको साइजहरुको लागि भागहरुको गलत नम्बर"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "फाइल `%.250s' दूषित छ - उद्धरण गरिएको भाग नम्बरको लागि साइज गलत छ"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "भाग फाइल`%.250s' fstat गर्न अक्षम"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "फाइल `%.250s' दूषित छ - अति छोटो"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "सङ्ग्रह भाग फाइल `%.250s' खोल्न सकिदैन"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "फाइल `%.250s' एउटा सङ्ग्रह भाग होइन"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5083,6 +5150,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5105,12 +5173,19 @@
 "    फाइल साइजको भाग(प्रयोग गरिएको भाग):  %lu बाइटहरू\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<unknown>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--सूचनालाई एउटा वा धेरै भाग फाइल तर्कहरू आवश्यक पर्दछ"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "फाइल `%s' एउटा सङ्ग्रह भाग होइन\n"
@@ -5144,7 +5219,7 @@
 msgid "split package part"
 msgstr "हराइरहेको प्याकेज"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "पूरा भयो\n"
@@ -5196,17 +5271,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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"
 "  --depotdir <directory>           %s/%s को सट्टामा <directory> प्रयोग गर्नुहोस् "
@@ -5220,20 +5304,29 @@
 "\n"
 "वस्तुस्थिति बन्द गर्नुहोस्: 0 = OK;  1 = -a भाग हो;  2 = समस्या !\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "मद्दतको लागि dpkg-split --help टाइप गर्नुहोस्"
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "%.250s मा अनपेक्षित फाइलको समाप्ति"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "भाग साइज टाँढा अति ठूलो छ वा सकारात्मक छैन"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, fuzzy, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "भाग साइज कम्तिमा %dk हुनुपर्छ (हेडरको लागि अनुमति दिन)"
@@ -5344,42 +5437,42 @@
 msgid "Deleted %s.\n"
 msgstr "%s मेटियो ।\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "स्रोत फाइल `%.250s' खोल्न अक्षम"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "स्रोत फाइल स्थिर गर्न अक्षम"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "स्रोत फाइल `%.250s' खाली फाइल होइन"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "विभाजनलाई स्रोत फाइलनाम तर्कको आवश्यक पर्दछ"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--विभाजनले बढीमा स्रोत फाइलनाम र गनतब्य उपसर्ग लिन्छ"
 
@@ -5503,367 +5596,362 @@
 "  --help                   मद्दत सन्देश देखाउनुहोस् ।\n"
 "  --version                संस्करण देखाउनुहोस् ।\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 #, fuzzy
 #| msgid "parse error"
 msgid "error"
 msgstr "त्रुटि पदवर्णन गर्नुहोस्"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "चेतावनी"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat %s: %s"
-msgstr "पुरानो नाम `%s' तोक्न सकिदैन: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, fuzzy, c-format
 #| msgid "two commands specified: %s and --%s"
 msgid "two commands specified: --%s and --%s"
 msgstr "निर्दिष्ट दुइवटा आदेश: %s र --%s"
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
 #| msgid "cannot open diversions: %s"
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "diversions खोल्न असफल: %s"
 
-#: utils/update-alternatives.c:395
-#, fuzzy, c-format
-#| msgid "%s: copying %s to %s failed, giving up: %s"
-msgid "scan of %s failed: %s"
-msgstr "%s: %s मा %s प्रतिलिपि गर्न असफल, छोड्दैछ: %s"
-
-#: utils/update-alternatives.c:420
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "%s कार्यान्वयन गर्न असफल"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "%s मा %s सिमलिङ्क बनाउन अक्षम: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "%s को रूपमा %s स्थापना गर्न अक्षम: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "%s हटाउन अक्षम: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "%.255s मा %s मा फाइलको अप्रत्यासित समाप्ति"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "%s पढ्न अक्षम: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "%.255s मा %s मा फाइलको अप्रत्यासित समाप्ति"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, fuzzy, c-format
 msgid "%s corrupt: %s"
 msgstr "आन्तरिक त्रुटि: %s दुषित: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "अद्यावधिक-वैकल्पिक फाइलहरू (%s) मा नयाँरेखा निषेधित गरिएको छ"
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "stdout लेख्दा त्रुटि: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "नक्कल प्रति स्लेभ %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 #, fuzzy
 msgid "slave link"
 msgstr "नक्कल प्रति स्लेभ लिङ्क %s"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "%s मुख्य लिङ्क जस्तै स्लेभ लिङ्क"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "नक्कल प्रति स्लेभ लिङ्क %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "नक्कल मार्ग %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, fuzzy, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr "%s मा तोक्न %s का लागि विकल्प - जुन फेला परेन । विकल्पको सूचीबाट हटाउदैछ ।"
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 #, fuzzy
 msgid "priority"
 msgstr "प्राथमिकता %s %s"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, fuzzy, c-format
 msgid "priority of %s: %s"
 msgstr "प्राथमिकता %s %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "%s पढ्न अक्षम: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 #, fuzzy
 msgid "invalid status"
 msgstr "अवैध अद्यावधिक मोड"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 #, fuzzy
 msgid "master link"
 msgstr "नक्कल प्रति स्लेभ लिङ्क %s"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "%s बन्द गर्न अक्षम: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, fuzzy, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "छुटेको स्लेभ लिङ्क %s (%s) परित्याग गर्दैछ"
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "%s लेख्न अक्षम: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, fuzzy, c-format
 msgid "  link currently points to %s"
 msgstr "%s मा हालैको बिन्दुमा लिङ्क गर्नुहोस्"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 #, fuzzy
 msgid "  link currently absent"
 msgstr "हालै अनुपस्थित लिङ्क गर्नुहोस्"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "%s - priority %s"
 msgid "%s - priority %d"
 msgstr "%s - प्राथमिकता %s"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr "स्लेभ %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "हालको उपयुक्त संस्करण %s हो ।"
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "संस्करण उपलब्ध छैन"
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "बर्णन"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 #, fuzzy
 msgid "Priority"
 msgstr "प्राथमिकता %s %s"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, fuzzy, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr "पूर्वनिर्धारित [*] राख्न 'प्रविष्ट गर्नुहोस्' थिच्नुहोस्, वा चयन सङ्ख्या टाइप गर्नुहोस्"
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "`%s' विकल्प फेला पार्न सकिदैन ।"
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "%.255s मा %s मा फाइलको अप्रत्यासित समाप्ति"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "%s बाट %s मा %s लिङ्क पुन: नामकरण"
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, fuzzy, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "%s बाट %s मा स्लेभ लिङ्क %s पुन: नामकरण  "
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr ""
+
+#: utils/update-alternatives.c:2241
+#, fuzzy, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "चेतावनी--अद्यावधिक दिइएको छ तर %s अवस्थित छैन"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "%s मा तोक्न %s का लागि विकल्प - जुन फेला परेन । विकल्पको सूचीबाट हटाउदैछ ।"
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr ""
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "अज्ञात तर्क `%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--स्थापनालाई आवश्यक <link> <name> <path> <priority>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "प्राथमिकता इन्टिजर हुनुपर्दछ"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s लाई <name> <path> आवश्यक पर्दछ"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s लाई <name> आवश्यक पर्दछ"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--स्लेभ केबल --स्थापनासँग स्विकृत हुन्छ"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--स्लेभलाई <link> <name> <path> आवश्यक पर्दछ"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr " %s नाम प्राथमिक र स्लेभ दुबै हो"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "%s लिङ्क प्राथमिक र स्लेभ दुबै हो"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s लाई एकल तर्क आवश्यक पर्दछ"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "अज्ञात विकल्प `%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -5872,67 +5960,23 @@
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 
-#: utils/update-alternatives.c:2215
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr ""
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2239
-#, fuzzy, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "चेतावनी--अद्यावधिक दिइएको छ तर %s अवस्थित छैन"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
-
-#: utils/update-alternatives.c:2257
-#, fuzzy, c-format
-msgid "it is a slave of %s"
-msgstr "स्लेभ %s: %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "मानक आगतमा त्रुटि पढ्नुहोस्"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, fuzzy, c-format
 msgid "no alternatives for %s."
 msgstr "%s का लागि विकल्प छैन"
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
@@ -5941,69 +5985,109 @@
 "%s परिवर्तन गरिएको छ (म्यानुअली वा स्क्रिप्टद्वारा)\n"
 "म्यानुअल अद्यावधिकलाई मात्र स्विचिङ"
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, fuzzy, c-format
 msgid "setting up automatic selection of %s."
 msgstr "%s को स्वचालित चयन सेट गर्दैछ"
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "%s का लागि %s विकल्प दर्ता गरिएको छैन, हटाइएको छैन ।"
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 "त्यहाँ %s उपलब्ध गर्ने कार्यक्रम छैन ।\n"
 "कन्फिगर गर्नलाई केही छैन ।\n"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "%s का लागि %s विकल्प दर्ता गरिएको छैन, हटाइएको छैन ।"
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, fuzzy, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr "म्यानुअली चयन गरिएको विकल्प हटाउदैछ - स्वत: मोडमा स्विच गर्दैछ"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr " %s को स्वचालित अद्यावधिक अक्षम पारियो, यसलाई छोड्नुहोस् ।"
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr "स्वचालित अद्यावधिक फर्काउन अद्यावधिक-विकल्पहरू--स्वत %s' प्रयोग गर्नुहोस् ।"
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr " `%s' प्रदान गर्न `%s' प्रयोग गर्दैछ"
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~ msgid "it is a slave of %s"
+#~ msgstr "स्लेभ %s: %s"
+
+#, fuzzy
+#~| msgid "cannot stat old name `%s': %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "पुरानो नाम `%s' तोक्न सकिदैन: %s"
+
+#, fuzzy
+#~| msgid "%s: copying %s to %s failed, giving up: %s"
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "%s: %s मा %s प्रतिलिपि गर्न असफल, छोड्दैछ: %s"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "%s कार्यान्वयन गर्न असफल"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "%s मा %s सिमलिङ्क बनाउन अक्षम: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "%s को रूपमा %s स्थापना गर्न अक्षम: %s"
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "stdout लेख्दा त्रुटि: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "%s पढ्न अक्षम: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "%s बन्द गर्न अक्षम: %s"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "%s लेख्न अक्षम: %s"
+
+#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "%s लाई %s मा पुन: नामकरण गर्न अक्षम: %s"
@@ -6244,9 +6328,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "%s बाट सदस्य डेटा फड्कियो"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "टार कार्यान्वयन गर्न असफल"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "अस्थायी डाइरेक्टरी नाम बनाउन असफल"
Binary files dpkg/po/nl.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/nl.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/nl.po /home/vorlon/devel/multiarch/dpkg-debian/po/nl.po
--- dpkg/po/nl.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/nl.po	2012-06-07 10:11:09.426073000 -0700
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.9.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2007-05-10 16:19+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"
@@ -17,7 +17,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "kan bronbestand `%.250s' niet openen"
@@ -37,71 +37,77 @@
 msgid "ar member file (%s)"
 msgstr "aanmaken tmpfile (data) is mislukt"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "fout in buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "fout in buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "short read in buffer_copy (%s)"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "uitvoeren van tar is mislukt"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "kan %s niet uitvoeren"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: decompressie"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compressie"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: interne gzip fout `%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: interne gzip fout `%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: interne gzip fout `%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: interne gzip fout `%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: interne gzip fout `%s'"
@@ -116,31 +122,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: interne bzip2 fout `%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: interne bzip2 fout `%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: interne bzip2 fout `%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: interne bzip2 fout `%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -149,7 +155,7 @@
 "de map updates bevat een bestand `%.250s' waarvan de naam te lang is (lengte="
 "%d, max=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -157,102 +163,102 @@
 "de map updates bevat bestanden met namen van verschillende lengte (zowel %d "
 "als %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "kan 'updates'-map `%.255s' niet scannen"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "verwijderen van in rekening genomen 'update'-bestand %.255s is mislukt"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "kan `%.255s' niet aanmaken"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "kan %.250s niet opvullen"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "kan %.250s niet doorspoelen na opvulling"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "kan niet naar het begin van %.250s gaan na opvulling"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "kan het tijdelijke bestand voor vsnprintf niet openen"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "kan het statusdatabase vergrendelingsbestand niet openen/aanmaken"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 "u heeft de benodigde rechten niet om dpkg statusdatabase te vergrendelen"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "kan de 'dpkg'-statusdatabase niet vergrendelen"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "deze bewerking kan alleen uitgevoerd worden door de beheerder"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "kan niet binnen bij het statusgebied van dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 "voor deze bewerking zijn lees- en schrijfrechten nodig in het dpkg "
 "statusgebied"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "kan mijn eigen update bestand %.255s niet verwijderen"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "kan de nieuwe status van `%.250s' niet wegschrijven"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "kan de nieuwe status van `%.250s' niet doorspoelen"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "kan niet afkappen voor de nieuwe status van `%.250s'"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "kan nieuwe status van `%.250s' niet synchroniseren"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "kan nieuwe status van `%.250s' niet afsluiten"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "kan nieuwe status van `%.250s' niet installeren"
@@ -273,90 +279,92 @@
 msgid "unable to open directory '%s'"
 msgstr "kan bronbestand `%.250s' niet openen"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "kan bronbestand `%.250s' niet openen"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "kan bronbestand `%.250s' niet openen"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "kan niet doorspoelen in vsnprintf"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "wegschrijven details '%.50s' tot '%.250s' is mislukt"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "kan `%s' niet openen om %s-informatie te schrijven"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "kan geen buffer instellen op het statusbestand"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "het schrijven van een %s-veld over `%.50s' naar `%.250s' is mislukt"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "het doorspoelen van %s informatie naar `%.250s' is mislukt"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "fsync van %s informatie naar `%.250s' is mislukt"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "sluiten van `%.250s' is mislukt van schrijven van %s informatie"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "kan `%.250s' niet naar `%.250s' koppelen om %s informatie te bewaren"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "kan `%.250s' niet als `%.250s' installeren met %s informatie"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "geen geheugen meer voor een nieuwe opschoon-ingang"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -365,35 +373,35 @@
 "%s: fout tijdens opruimen:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: te veel geneste fouten tijdens foutherstel !!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "geen geheugen meer voor een nieuwe opschoon-ingang"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "geen geheugen meer voor een nieuwe opschoon-ingang met veel argumenten"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: fout tijdens opruimen:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr ""
 "%s: fout tijdens opruimen:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%d: interne fout `%s'\n"
@@ -409,99 +417,99 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "`%.*s' is niet toegestaan voor %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "rommel na %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "ongeldige pakketnaam (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "leeg veld voor bestandsdetails `%s'"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "veld voor bestandsdetails `%s' niet toegestaan in statusbestand"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, 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)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, 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)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "yes/no in boolean veld"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "woord in 'prioriteit'-veld"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "waarde voor `status'-veld is niet toegestaan in deze context"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "eerste (want) woord in `status'-veld"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "Tweede (error) woord in `status'-veld"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "derde (status) woord in `status'-veld"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "fout in Version string `%.250s': %.250s"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "verouderde `Revision' of `Package-Revision'-veld gebruikt"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "waarde voor `config-version'-veld niet toegestaan in deze context"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "fout in 'Config-Version'-string `%.250s': %.250s"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "waarde voor `conffiles' heeft een verkeerd opgemaakte regel `%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, 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')"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "hoofd- of null-map wordt genoemd als een conffile"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -509,12 +517,12 @@
 "`%s'-veld, ontbrekende pakketnaam, of rommel waar een pakketnaam werd "
 "verwacht"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "`%s'-veld, ongeldige pakketnaam `%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -523,7 +531,7 @@
 "`%s'-veld, verwijzing naar `%.255s':\n"
 " foute versie-relatie %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -532,7 +540,7 @@
 "`%s'-veld, verwijzing naar `%.255s':\n"
 " `%c' is verouderd, gebruik `%c=' of `%c%c'"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -541,11 +549,11 @@
 "`%s'-veld, verwijzing naar `%.255s':\n"
 " impliciete exacte overeenkomst in versienummer, gebruik `='"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Slechts exacte versies mogen gebruikt worden voor Provides"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -555,58 +563,58 @@
 " versiewaarde begint met een niet-alfanumeriek teken, voeg bijv. een spatie "
 "toe"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "`%s'-veld, verwijzing naar `%.255s': versie bevat `%c'"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "`%s'-veld, verwijzing naar `%.255s': versie niet afgesloten"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "`%s'-veld, verwijzing naar `%.255s': fout in versie: %.255s"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "`%s'-veld, syntaxfout na verwijzing naar pakket `%.255s'"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternatieven (`|') niet toegestaan in '%s'-veld"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 #, fuzzy
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "waarde voor `config-version'-veld niet toegestaan in deze context"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, fuzzy, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "`%s'-veld, ongeldige pakketnaam `%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 #, fuzzy
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "waarde voor `status'-veld is niet toegestaan in deze context"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, fuzzy, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "ongeldige pakketnaam op regel %d: %.250s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, fuzzy, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "bestandenlijst-bestand voor pakket `%.250s'"
@@ -663,7 +671,7 @@
 msgid "unable to write to status fd %d"
 msgstr "kan de nieuwe status van `%.250s' niet wegschrijven"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 msgid "malloc failed (%zu bytes)"
 msgstr "realloc is mislukt (%ld bytes)"
@@ -673,8 +681,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc is mislukt (%ld bytes)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 #, fuzzy
 msgid "failed to allocate memory"
 msgstr "aanmaken map is mislukt"
@@ -708,200 +716,206 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "kan de close-on-exec vlag voor %.250s niet instellen"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "configuratiefout: %s heeft een waarde nodig"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, fuzzy, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "kan configuratie-bestand %.255s niet openen om te lezen"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "onbekende optie '%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "--%s optie verwacht een waarde"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "--%s optie verwacht geen waarde"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "leesfout in configuratiebestand `%.255s'"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "fout bij sluiten van configuratiebestand `%.255s'"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "fout bij sluiten van configuratiebestand `%.255s'"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "onbekende optie --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s optie verwacht een waarde"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s optie verwacht geen waarde"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "onbekende optie -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c verwacht een waarde"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c optie verwacht geen waarde"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "Let op: verouderde optie `--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "tegenstrijdige acties -%c (--%s) en -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "dubbele waarde voor `%s'-veld"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "zelf gedefinieerde veldnaam `%.*s' te kort"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "dubbele waarde voor zelf gedefinieerd veld `%.*s'"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "'Configured-Version' van pakket met ongepaste status"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Pakket in toestand `not-installed' heeft conffiles, deze worden vergeten"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "fout bij openen van pakket-info bestand `%.255s' om te lezen"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "kan informatiebestand niet opvragen uit `%.255s'"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "kan het informatiebestand niet mmappen in `%.255s'"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "kan informatiebestand niet opvragen uit `%.255s'"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "kan niet afsluiten na lezen: `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF na veldnaam `%.*s'"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "nieuwe regel in veldnaam `%.*s'"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS EOF (^Z) in veldnaam `%.*s'"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "veldnaam `%.*s' moet gevolgd worden door een dubbele punt"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 "EOF voor waarde voor veld `%.*s' (ontbrekende afsluitende nieuwe regel)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "MSDOS EOF teken in waarde van veld `%.*s' (ontbrekende nieuwe regel?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "nieuwe regel in veldnaam `%.*s'"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF in waarde van veld `%.*s' (ontbrekende afsluitende nieuwe regel)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "meerdere pakket informatie-ingangen gevonden, slechts een toegestaan"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "kan niet afsluiten na lezen: `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "geen pakketinformatie in `%.255s'"
@@ -920,68 +934,68 @@
 " %.255s"
 msgstr "%s, in bestand `%.255s' bij regel %d"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "mag niet een lege string zijn"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "moet beginnen met een alfanumeriek teken"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, 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)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<geen>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "versiestring is leeg"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "versiestring bevat spaties"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "epoch in versienummer is geen nummer"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "er komt niets na de dubbele punt in het versienummer"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "er komt niets na de dubbele punt in het versienummer"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "er komt niets na de dubbele punt in het versienummer"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "ontbrekende %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "lege waarde voor %s"
@@ -1000,51 +1014,51 @@
 msgid "(no description available)"
 msgstr "(geen beschrijving beschikbaar)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "kan signaal %s niet negeren alvorens het script te starten"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "fout bij ont-afvangen van signaal %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (subproces): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "vork is mislukt"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "subproces %s gaf een foutwaarde %d terug"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "wachten op %s is mislukt"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "subproces %s werd gedood door signaal (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", kern gedumpt"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "subproces %s  is mislukt met wachtstatuscode %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "wachten op %s is mislukt"
@@ -1064,197 +1078,203 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, fuzzy, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "kan bronbestand `%.250s' niet openen"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 msgid "triggers area"
 msgstr "kan %s niet ontgrendelen: %s"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, fuzzy, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "kan op het nieuwe bestand `%.250s' geen stat uitvoeren"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, fuzzy, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "kan bronbestand `%.250s' niet openen"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, fuzzy, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "kan nieuw depotbestand `%.250s' niet openen"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, fuzzy, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "fout bij lezen van %s uit bestand %.255s"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, fuzzy, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "kan nieuw depotbestand `%.250s' niet openen"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, fuzzy, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "kan nieuw depotbestand `%.250s' niet openen"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, fuzzy, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "kan de nieuwe versie van `%.255s' niet installeren"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, fuzzy, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "kan nieuw depotbestand `%.250s' niet openen"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, fuzzy, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "kan deelbestand `%.250s' niet lezen"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:419
-#, fuzzy, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "kan op het nieuwe bestand `%.250s' geen stat uitvoeren"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, fuzzy, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "kan op het nieuwe bestand `%.250s' geen stat uitvoeren"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "kan op het nieuwe bestand `%.250s' geen stat uitvoeren"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "kan op het nieuwe bestand `%.250s' geen stat uitvoeren"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
+msgstr "kan de nieuwe versie van `%.255s' niet installeren"
+
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "kan `%.250s' niet verwijderen"
+
+#: lib/dpkg/triglib.c:360
+#, fuzzy, c-format
+msgid "unable to create new trigger interest file `%.250s'"
 msgstr "kan op het nieuwe bestand `%.250s' geen stat uitvoeren"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:383
 #, fuzzy, c-format
-msgid "unable to install new trigger interest file `%.250s'"
-msgstr "kan de nieuwe versie van `%.255s' niet installeren"
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "kan op het nieuwe bestand `%.250s' geen stat uitvoeren"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:456
 #, fuzzy, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr "kan nieuwe infobestand `%.250s' niet installeren als `%.250s'"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, fuzzy, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "kan nieuw depotbestand `%.250s' niet openen"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, fuzzy, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "kan nieuw depotbestand `%.250s' niet openen"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "kan nieuw depotbestand `%.250s' niet openen"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "kan nieuw depotbestand `%.250s' niet openen"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "kan nieuw depotbestand `%.250s' niet openen"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, fuzzy, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "kan nieuwe infobestand `%.250s' niet installeren als `%.250s'"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, fuzzy, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "kan deelbestand `%.250s' niet lezen"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, fuzzy, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "leesfout in configuratiebestand `%.255s'"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, fuzzy, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "kan bronbestand `%.250s' niet openen"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, fuzzy, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "kan depot map `%.250s' niet lezen"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, fuzzy, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "kan depot map `%.250s' niet lezen"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, fuzzy, c-format
 msgid "read error in `%.250s'"
@@ -1279,7 +1299,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "fout bij het lezen uit de 'dpkg-deb'-pijp"
 
@@ -1299,12 +1319,12 @@
 msgstr ""
 "fout bij het instellen van de eigenaar van de symbolische koppeling `%.255s'"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "fout bij het instellen van de eigenaar van `%.255s'"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "fout bij het instellen van de permissies op `%.255s'"
@@ -1364,17 +1384,27 @@
 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:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat file '%s'"
+msgstr "kan de status van de oude naam '%s' niet opvragen: %s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Overschrijven van de bestanden in het oude pakket %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Vervangen door bestanden in geïnstalleerd pakket %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1383,94 +1413,99 @@
 "poging tot overschrijven van map `%.250s' in pakket %.250s met iets dat geen "
 "map is"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "poging tot overschrijven van `%.250s', wat ook in pakket %.250s zit"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "kan niet `%.255s' niet lezen (in `%.255s')"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "fout in dpkg-deb tijdens `%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "fout bij het sluiten van/schrijven naar `%.255s'"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "fout bij het aanmaken van de pijp `%.255s'"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "fout bij het aanmaken van het apparaatbestand `%.255s'"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "fout bij het maken van de vaste koppeling `%.255s'"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "fout bij het maken van de symbolische koppeling `%.255s'"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "fout bij het maken van de map `%.255s'"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, 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:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "kan koppeling niet lezen uit `%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "kan geen reservekoppeling maken voor `%.255s'"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "kan de eigenaar van de reservekoppeling niet instellen voor `%.255s'"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, 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"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "kan de nieuwe versie van `%.255s' niet installeren"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "kan `%.255s' niet aanmaken"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "kan `%.255s' niet ontbufferen"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1480,7 +1515,7 @@
 "genegeerd:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, fuzzy, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1489,7 +1524,7 @@
 "dpkg: waarschuwing - deconfiguratie van het essentiële\n"
 " pakket %s wordt overwogen teneinde %s te kunnen verwijderen.\n"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1498,7 +1533,7 @@
 "dpkg: nee, %s is essentiëel en wordt dus niet gedeconfigureerd\n"
 " om de verwijdering van %s mogelijk te maken.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1507,28 +1542,28 @@
 "dpkg: nee, %s kan niet verwijderd worden (--auto-deconfigure kan helpen):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, fuzzy, c-format
 msgid "removal of %.250s"
 msgstr "leesfout in %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, fuzzy, c-format
 msgid "installation of %.250s"
 msgstr "kan de nieuwe versie van `%.255s' niet installeren"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, fuzzy, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: verwijdering van %s ten gunste van %s wordt overwogen...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, fuzzy, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: ja, %s wordt verwijderd ten gunste van %s.\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1537,42 +1572,42 @@
 "dpkg: betreffende %s die %s bevat:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 #, fuzzy
 msgid "ignoring breakage, may proceed anyway!"
 msgstr ""
 "dpkg: let op - conflict wordt genegeerd, mogelijk wordt er doorgegaan!\n"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1581,113 +1616,115 @@
 "dpkg: pakket %s behoeft herinstallatie, op uw aanvraag wordt het toch "
 "verwijderd.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "conflicterende pakketten - %.250s wordt niet geïnstalleerd"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 #, fuzzy
 msgid "ignoring conflict, may proceed anyway!"
 msgstr ""
 "dpkg: let op - conflict wordt genegeerd, mogelijk wordt er doorgegaan!\n"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, 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:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "uitvoeren van 'find' voor --recursive is mislukt"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "het toepassen van fdopen op de pijp naar find is mislukt"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "fout bij het lezen van de pijp naar find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "fout bij het sluiten van de pijp naar find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find voor --recursive gaf onafgehandelde fout %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 "er is gekeken, maar er zijn geen pakketten gevonden (bestanden die "
 "overeenkomen met *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Selecteren van voorheen niet geselecteerd pakket %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Overslaan van niet geselecteerd pakket %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, 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:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s - let op: %.250s wordt gedegradeerd van %.250s naar %.250s.\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, 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"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1696,41 +1733,41 @@
 "kan de nieuw geïnstalleerde versie van `%.250s' niet verwijderen om de "
 "reservekopie weer te installeren"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "kan de reservekopie-versie van `%.250s' niet terugzetten"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "kan de reservekopie-versie van `%.250s' niet terugzetten"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "kan de nieuw geïnstalleerde versie van `%.250s' niet verwijderen"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "kan de nieuw geëxtraheerde versie van `%.250s' niet verwijderen"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr ""
 "kan de status van de nieuw gedistribueerde conffile `%.250s' niet opvragen"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 "kan de status van de huidig geïnstalleerde conffile `%.250s' niet opvragen"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1741,67 +1778,67 @@
 "Configuratiebestand `%s' bestaat niet op het systeem.\n"
 "Het nieuwe configuratiebestand wordt geïnstalleerd zoals gevraagd.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr ""
 "dpkg: %s: waarschuwing - kan oude reservekopie `%.250s' niet verwijderen: "
 "%s\n"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 "dpkg: %s: waarschuwing - kan `%.250s' niet hernoemen naar `%.250s': %s\n"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: uitvoeren van '%s %s' is mislukt"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 "dpkg: %s: waarschuwing - kan oude gedistribueerde versie `%.250s' niet "
 "verwijderen: %s\n"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 "dpkg: %s: waarschuwing - kan `%.250s' niet verwijderen (voor overschrijven): "
 "%s\n"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr ""
 "dpkg: %s: waarschuwing - kan `%.250s' niet naar `%.250s' laten verwijzen: "
 "%s\n"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Installeren van nieuwe versie van configuratiebestand %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "kan `%.250s' niet installeren als `%.250s'"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, 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"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "pakket %.250s is reeds geïnstalleerd en geconfigureerd"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1810,7 +1847,7 @@
 "pakket %.250s is niet gereed voor configuratie\n"
 " kan het niet configureren (huidige status `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1819,11 +1856,11 @@
 "dpkg: vereistenproblemen verhinderen de configuratie van %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "vereistenproblemen - blijft ongeconfigureerd"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1833,7 +1870,7 @@
 "gevraagd:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1841,12 +1878,12 @@
 "Pakket is in een zeer inconsistente staat - u zult het opnieuw\n"
 " moeten installeren alvorens het te configureren."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Instellen van %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, fuzzy, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1856,7 +1893,7 @@
 "opvragen\n"
 " (= `%s'): %s\n"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, fuzzy, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1866,7 +1903,7 @@
 "verwijzing\n"
 " (= `%s')\n"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, fuzzy, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1875,7 +1912,7 @@
 "dpkg: %s: waarschuwing - readlink op configuratiebestand `%s' is mislukt\n"
 " (= `%s'): %s\n"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, fuzzy, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1885,37 +1922,37 @@
 "verouderde bestandsnaam\n"
 " (`%s' is een symbolische koppeling naar `%s')\n"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, fuzzy, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "dpkg: %s: waarschuwing - configuratiebestand `%.250s' is niet een gewoon "
 "bestand of symbolische koppeling (= `%s')\n"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr ""
 "dpkg: %s: waarschuwing - kan configuratiebestand %s niet openen voor hash: "
 "%s\n"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Type `exit' als u klaar bent.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1924,12 +1961,12 @@
 "\n"
 "Configuratiebestand `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (in werkelijkheid `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1940,7 +1977,7 @@
 " ==> Bestand op systeem is gemaakt door u of een script.\n"
 " ==> Bestand zit ook in het pakket van de pakketbeheerder.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1949,7 +1986,7 @@
 "\n"
 "    Niet veranderd sinds installatie.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1958,7 +1995,7 @@
 "\n"
 " ==> Veranderd (door u of een script) sinds installatie.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1967,37 +2004,37 @@
 "\n"
 " ==> Verwijderd (door u of een script) sinds installatie.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Pakket-distributeur heeft een bijgewerkte versie gemaakt.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "    Versie in pakket is gelijk aan die van de laatste installatie.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Nieuwe bestand wordt gebruikt, zoals gevraagd.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Huidige, oude bestand wordt gebruikt zoals gevraagd.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Huidig oude configuratiebestand wordt standaard bewaard.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Het nieuwe bestand wordt standaard gebruikt.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2013,165 +2050,166 @@
 "      Z     : stuur dit proces naar de achtergrond om de situatie te "
 "bekijken\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " De standaardactie is om de huidige versie te bewaren.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " De standaardactie is om de nieuwe versie te installeren.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[standaard=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[standaard=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[geen standaard]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "fout bij schrijven naar stderr, ontdekt voor de conffile prompt"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "leesfout op stdin bij conffile prompt"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF op stdin bij conffile prompt"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s is afhankelijk van %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s is voor-afhankelijk van %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s beveelt aan %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s suggereert %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s breekt %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s is in strijd met %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s verbetert %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s wordt verwijderd.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s wordt gedeconfigureerd.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s is geïnstalleerd, maar is versie %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s is uitgepakt, maar is nooit geconfigureerd.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s is uitgepakt, maar is versie %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s laatst geconfigureerde versie is %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s is %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s bevat %.250s maar wordt verwijderd.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s bevat %.250s maar wordt gedeconfigureerd.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s bevat %.250s maar is %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s is niet geïnstalleerd.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versie %.250s) wordt geïnstalleerd.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, fuzzy, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versie %.250s) is %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s bevat %.250s en wordt geïnstalleerd\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, fuzzy, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s bevat %.250s en is %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+msgid "Use --help for help about diverting files."
+msgstr "Type dpkg-split --help voor hulp."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versie  %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2186,8 +2224,8 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2198,7 +2236,7 @@
 "Dit is vrije programmatuur; zie de GNU General Public Licence versie 2\n"
 "of later voor kopiëervoorwaarden.  Er is GEEN garantie.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2208,7 +2246,7 @@
 "Gebruik: %s [<optie> ...] <commando>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2220,7 +2258,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -2267,7 +2305,7 @@
 "Pakket preinst/postrm-scripts dienen altijd --package en--divert op te "
 "geven.\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2276,19 +2314,13 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat file '%s'"
-msgstr "kan de status van de oude naam '%s' niet opvragen: %s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error checking `%s': %s"
 msgid "error checking '%s'"
 msgstr "'%s' wordt op fouten gecontroleerd: %s"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2297,140 +2329,140 @@
 "hernoemen omvat overschrijven van '%s' met\n"
 "  verschillend bestand '%s', niet toegelaten"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "kan bronbestand `%.250s' niet openen"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "cannot stat new name `%s': %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "kan de status van de nieuwe naam %s niet opvragen: %s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 #| msgid "rename: remove duplicate old link `%s': %s"
 msgid "rename: remove duplicate old link '%s'"
 msgstr "hernomen: verwijderen van oude dubbele link '%s': %s"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "kan bronbestand `%.250s' niet openen"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 msgid "local diversion of %s"
 msgstr "lokaal omgeleid naar: %s\n"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 msgid "local diversion of %s to %s"
 msgstr "lokaal omgeleid naar: %s\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "diversion of %s by %s"
 msgstr "verwijzing door %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "omgeleid door %s naar: %s\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "any diversion of %s"
 msgstr "verwijzing door %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 msgid "any diversion of %s to %s"
 msgstr "omgeleid door %s naar: %s\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "cannot open GPL file"
 msgid "cannot create new %s file"
 msgstr "kan GPL-bestand niet openen "
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "kan niet doorspoelen in vsnprintf"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 #| msgid "remove old diversions-old: %s"
 msgid "error removing old diversions-old"
 msgstr "oude diversions-old verwijderen: %s"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "fout bij aanmaken van nieuwe statoverride-old: %s"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "fout bij installeren van nieuwe statoverride: %s"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s heeft een enkel argument nodig"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "bestandsnaam '%s' is niet absoluut"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "bestand mag geen regeleinden bevatten"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Kan geen mappen omleiden"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "Kan geen mappen omleiden"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "'%s' wordt verlaten"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "'%s' conflicteert met '%s'"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "'%s' wordt toegevoegd"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
 msgstr "Er is geen omleiding '%s', geen verwijderd"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2441,7 +2473,7 @@
 "  bij verwijderen van '%s'\n"
 "  '%s' gevonden"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2452,17 +2484,17 @@
 "  bij verwijderen van '%s'\n"
 "  '%s' gevonden"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "%s wordt verwijderd"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "pakketnaam mag geen regeleinden bevatten"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "omleiden-naar mag geen regeleinden bevatten"
 
@@ -2540,8 +2572,8 @@
 msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s verwacht geen argumenten"
@@ -2635,7 +2667,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions foute relatie"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "dpkg: versie '%s' heeft verkeerde syntax: %s\n"
@@ -2693,12 +2725,12 @@
 "dpkg - waarschuwing, probleem wordt geforceerd omdat --force aanstaat:\n"
 " "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "kan bestandenlijst-bestand niet openen voor pakket `%.250s'"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, fuzzy, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2708,39 +2740,39 @@
 "`%.250s' ontbreekt, aangenomen wordt dat het pakket geen bestanden\n"
 "heeft geïnstalleerd.\n"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "kan bestandenlijst-bestand niet openen voor pakket `%.250s'"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "bestandenlijst-bestand voor pakket `%.250s'"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, fuzzy, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "bestandenlijst-bestand voor pakket `%.250s' bevat een lege bestandsnaam"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "bestandenlijst-bestand voor pakket `%.250s' bevat een lege bestandsnaam"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "fout bij sluiten van bestandenlijst-bestand voor pakket `%.250s'"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Database inlezen ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2748,34 +2780,34 @@
 msgstr[0] "%d bestanden en mappen geïnstalleerd.)\n"
 msgstr[1] "%d bestanden en mappen geïnstalleerd.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "kan bijgewerkt bestandenlijst-bestand voor pakket %s niet aanmaken"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, 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"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "kan bijgewerkt bestandenlijst-bestand voor pakket %s niet doorspoelen"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 "kan bijgewerkt bestandenlijst-bestand voor pakket %s niet synchroniseren"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "kan bijgewerkt bestandenlijst-bestand voor pakket %s niet sluiten"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "kan bijgewerkt bestandenlijst-bestand voor pakket %s niet installeren"
@@ -2815,7 +2847,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "dpkg - fout: PATH is niet ingesteld.\n"
 
 #: src/help.c:129
@@ -2847,7 +2879,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "kan geen status opvragen in vsnprintf"
@@ -2858,67 +2890,67 @@
 msgstr "chroot naar `%.250s' is mislukt"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "chdir naar `%.255s' is mislukt"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "kan `%.250s' niet uitvoerbaar maken"
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "kan geen status opvragen in vsnprintf"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "verouderd %s script"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "kan de status van %s `%.250s' niet opvragen"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "nieuw %s script"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "verouderd %s script"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "kan de status van %s `%.250s' niet opvragen"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - script uit het nieuwe pakket wordt geprobeerd ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 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"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... het lijkt er op dat dat goed ging.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "kan `%.255s' niet aanmaken"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2927,7 +2959,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "kan het bestaan van `%.250s' niet verifiëren"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "kan info map niet lezen"
 
@@ -2995,7 +3027,7 @@
 "debug=help                  hulp over debuggen.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -3121,7 +3153,7 @@
 msgstr ""
 "Gebruik `aptitude' of 'dselect' voor gebruikersvriendelijk pakketbeheer.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3174,30 +3206,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3206,102 +3242,102 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "vereistenproblemen - niet verwijderd"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "vereistenproblemen - niet verwijderd"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "kan geen status opvragen in vsnprintf"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "leesfout in configuratiebestand `%.255s'"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3309,7 +3345,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3317,37 +3353,37 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug vereist een octaal argument"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "lege pakketnaam in --ignore-depends lijst `%.250s' (gescheiden door komma's)"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends vereist een toegestane pakketnaam. `%.250s' is dat niet; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ongeldig getal voor --%s: `%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3356,7 +3392,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3364,12 +3400,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "onbekende force/refuse optie `%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "Let op: verouderde forceer/weiger optie `%s'\n"
@@ -3392,8 +3428,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "onverwacht bestandseinde voor einde regel %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "heb een actie-optie nodig"
 
@@ -3557,89 +3593,89 @@
 msgid "passed\n"
 msgstr "correct\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "aanmaken van een tijdelijke bestandsnaam is mislukt"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "pakket %s heeft teveel 'Conflicts/Replaces'-paren"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, 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'"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "kan verouderd infobestand `%.250s' niet verwijderen"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "kan (waarschijnlijk) nieuwe infobestand `%.250s' niet installeren"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "kan tijdelijke besturingsmap niet openen"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, 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')"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "pakket 'control'-infobestand bevat map `%.250s'"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "rmdir van pakket besturingsinfo `%.250s' zei niet dat het geen map is"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr "dpkg: waarschuwing - pakket %s bevat een lijst als infobestand"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "kan nieuwe infobestand `%.250s' niet installeren als `%.250s'"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "kan besturingsinfo-bestand `%.250s' niet verwijderen"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "kan archief niet benaderen"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "aanmaken van een tijdelijke bestandsnaam is mislukt"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "'control'-informatielengte"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Informatie over %s uit %s is opgenomen.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "pakket-architectuur (%s) komt niet overeen met het systeem (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3648,103 +3684,103 @@
 "dpkg: voor-vereistenprobleem met %s dat %s bevat:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "voor-vereistenprobleem - %.250s wordt niet geïnstalleerd"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr "dpkg: waarschuwing - voorafhankelijkheisprobleem wordt genegeerd !\n"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Voorbereiden om %s %s te vervangen (door %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Uitpakken van %s (uit %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, 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)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "leesfout in %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "fout bij sluiten van %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "fout bij openen van %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, fuzzy, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "De-configureren van %s, zodat %s verwijderd kan worden ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, fuzzy, c-format
 msgid "De-configuring %s ...\n"
 msgstr "%s wordt verwijderd ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Uitpakken van vervangende %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "fout bij lezen van dpkg-deb tar uitvoer"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "beschadigd bestandssysteem tarbestand - beschadigd pakketarchief"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: zap mogelijke nakomende nullen"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, fuzzy, c-format
 msgid "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"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "dpkg: waarschuwing - kan de oude map `%.250s' niet verwijderen: %s\n"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, fuzzy, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "dpkg: waarschuwing - oud configuratiebestand `%.250s' was een lege map (en "
 "is nu verwijderd)\n"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "kan op het nieuwe bestand `%.250s' geen stat uitvoeren"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, fuzzy, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3753,12 +3789,12 @@
 "dpkg: waarschuwing - het oude bestand `%.250s' is hetzelfde als "
 "verschillende nieuwe bestanden! ('%.250s' en '%.250s')\n"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "dpkg: waarschuwing - kan oud bestand `%%.250s' niet %s: %%s\n"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Verdwijning van %s is opgemerkt, het is totaal vervangen is.)\n"
@@ -3922,7 +3958,7 @@
 "  --showformat=<formaat> Gebruik alternatief formaat voor --show\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3945,6 +3981,10 @@
 "uitgelijnd\n"
 "  worden.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, fuzzy, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4006,7 +4046,7 @@
 msgid "Removing %s ...\n"
 msgstr "%s wordt verwijderd ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, fuzzy, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4015,49 +4055,50 @@
 "dpkg - waarschuwing: tijdens verwijderen van %.250s kan de map `%.250s' niet "
 "verwijderd worden: %s - is deze map een aanhechtpunt zijn?\n"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "kan `%.250s' niet verwijderen"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "kan `%.255s' niet aanmaken"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "dpkg - waarschuwing: tijdens verwijderen van %.250s, map `%.250s' niet leeg "
 "dus niet verwijderd.\n"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "kan `%.250s' niet verwijderen"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Wissen van configuratiebestanden voor %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "kan oud configuratiebestand `%.250s' niet verwijderen (= `%.250s')"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "kan configuratiemap `%.250s' niet lezen (van `%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "kan oud backup configuratiebestand `%.250s' niet verwijderen (van `%.250s')"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "kan oude bestandenlijst niet verwijderen"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "kan oud postrm script niet verwijderen"
 
@@ -4100,7 +4141,11 @@
 msgid "read error on standard input"
 msgstr "leesfout op standaard invoer"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4110,7 +4155,7 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4121,7 +4166,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -4152,56 +4197,56 @@
 "  --help                      toon deze helpboodschap.\n"
 "  --version                 toon de versie.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "/ op einde wordt weggehaald"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "kan nieuw statoverride-bestand niet openen: %s"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "fout bij verwijderen van statoverride-old: %s"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "fout bij aanmaken van nieuwe statoverride-old: %s"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "fout bij installeren van nieuwe statoverride: %s"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add heeft een vier argumenten nodig"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, fuzzy, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr "maar --force is opgegeven waardoor dit genegeerd wordt."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, fuzzy, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Er bestaat reeds een overstijging '%s'"
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, fuzzy, c-format
 msgid "--update given but %s does not exist"
 msgstr "waarschuwing: --update is opgegeven maar %s bestaat niet"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Geen overstijging aanwezig"
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 #, fuzzy
 msgid "--update is useless for --remove"
 msgstr "waarschuwing: --update is waardeloos voor --remove"
@@ -4273,17 +4318,17 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "statoverride bestand `%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Type dpkg-split --help voor hulp."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debian '%s' pakketbeheer bevragingsprogramma\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4293,7 +4338,7 @@
 "Gebruik: %s [<optie> ...] <commando>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4302,7 +4347,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4316,31 +4361,31 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 #, fuzzy
 msgid "takes one argument, the trigger name"
 msgstr "--%s verwacht slechts een argument (.deb bestandsnaam)"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "`%s'-veld, ongeldige pakketnaam `%.255s': %s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "`%s'-veld, ongeldige pakketnaam `%.255s': %s"
@@ -4369,31 +4414,32 @@
 msgstr "Wissen van configuratiebestanden voor %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s verwacht precies één Packages bestand als argument"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr "kan niet bij de dpkg statusomgeving voor massale update"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "grote bijwerking van de beschikbaarheidsdatabase vereist schrijftoegang tot "
 "de dpkg statusomgeving"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Vervangen van het oude beschikbare pakkettenbestand, met %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Bijwerken van het beschikbare pakkettenbestand, met %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4401,7 +4447,7 @@
 msgstr[0] "Informatie over %d pakket(ten) werd bijgewerkt.\n"
 msgstr[1] "Informatie over %d pakket(ten) werd bijgewerkt.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4521,8 +4567,8 @@
 msgstr[1] ""
 "dpkg-deb: %d waarschuwingen over de besturingsbestand(en) genegeerd\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s heeft een map als argument nodig"
@@ -4554,26 +4600,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: bouwen van pakket `%s' in `%s'.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "aanmaken tmpfile (data) is mislukt"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "controlegebied"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "ontlinken tmpfile (data), %s is mislukt"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4589,20 +4635,20 @@
 msgid "error writing `%s'"
 msgstr "fout bij schrijven naar `%s'"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "tussen leden"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "schrijven va bestandsnaam naar de 'tar'-pijp (data) is mislukt"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4620,77 +4666,77 @@
 msgid "error reading %s from file %.255s"
 msgstr "fout bij lezen van %s uit bestand %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "kan niet lezen uit archief `%.255s'"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "kan archief niet vinden"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "archief heeft geen punt in het versienummer"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "archief heeft geen nieuwe regels in koptekst"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "bestand `%.250s' is beschadigd - foutief deelnummer"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, 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?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "archief heeft geen punt in het versienummer"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "archief heeft geen nieuwe regels in koptekst"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "archief heeft geen punt in het versienummer"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 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:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "lid data van %s overgeslagen"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "bestand `%.250s' bevat onbegrepen datalid %.*s, er wordt opgegeven"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "bestand `%.250s' bevat twee besturingsleden, er wordt opgegeven"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4702,23 +4748,23 @@
 " nieuw debian pakket, versie %s.\n"
 " grootte %ld bytes: besturingsarchief= %zi bytes.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "archief heeft verkeerde 'control'-lengte `%s'"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "lid data van %s overgeslagen"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4730,7 +4776,7 @@
 " verouderd debian pakket, versie %s.\n"
 " grootte %ld bytes: besturingsarchief= %zi, hoofdarchief= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4739,51 +4785,52 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' is geen archief in debian formaat"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "schrijven naar de pijp in copy is mislukt"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "sluiten van de pijp in copy is mislukt"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "chdir naar de map is mislukt"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "aanmaken map is mislukt"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "chdir naar de map na het aanmaken ervan is mislukt"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "chdir naar de map is mislukt"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s: decompressie"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 #, fuzzy
 msgid "paste"
 msgstr "correct\n"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s verwacht een .deb bestandsnaam argument"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4792,37 +4839,37 @@
 "--%s heeft een doelmap nodig.\n"
 "Misschien heeft u 'dpkg --install' nodig?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s verwacht slechts een argument (.deb bestandsnaam)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "chdir naar `/' om op te ruimen is mislukt"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
 msgid "control file '%s'"
 msgstr "kan de status van de oude naam '%s' niet opvragen: %s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: `%.255s' bevat geen besturingsonderdeel `%.255s'\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr "openen van onderdeel `%.255s' (in %.255s) is mislukt onverwachts"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, fuzzy, c-format
 #| msgid "One requested control component is missing"
 msgid "%d requested control component is missing"
@@ -4830,59 +4877,59 @@
 msgstr[0] "ten minste een gevraagd besturingselement ontbreekt"
 msgstr[1] "ten minste een gevraagd besturingselement ontbreekt"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "kan map `%.255s' niet aflezen"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "kan de status van `%.255s' niet opvragen (in `%.255s')"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "kan `%.255s' niet openen (in `%.255s')"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "kan niet `%.255s' niet lezen (in `%.255s')"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bytes, %5d regels  %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     geen gewoon bestand      %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(geen `control'-bestand in besturingsarchief!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "kan onderdeel `control' niet openen"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "fout bij lezen van onderdeel `control'"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "fout bij het sluiten van de pijp naar find"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Formaatfout"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents verwacht precies een argument"
 
@@ -4892,7 +4939,19 @@
 msgstr "Debian '%s' pakketarchiefbackend versie  %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4903,6 +4962,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4918,7 +4979,7 @@
 "  --fsys-tarfile <deb>               voer bestandssysteem tar bestand uit.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4931,11 +4992,12 @@
 "<cveld> is de naam van een veld in het belangrijkste 'control'-bestand.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4958,7 +5020,7 @@
 "                              toegelaten waardes: gzip, bzip2, lzma, geen\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4972,7 +5034,7 @@
 "pakketbeheer. Via 'dpkg-deb --extract' uitgepakte pakketten worden\n"
 "niet juist geïnstalleerd!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4980,17 +5042,17 @@
 "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:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "ongeldig getal voor --%s: `%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "ongeldig getal voor --%s: `%.250s'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "onbekend compressietype '%s'!"
@@ -5010,7 +5072,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "bestand `%.250s' is beschadigd - ontbrekende nieuwe regel na %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "fout bij schrijven %.250s"
@@ -5102,51 +5164,56 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "bestand `%.250s' is beschadigd - foutief deelnummer"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+msgid "package architecture"
+msgstr " (pakket: "
+
+#: dpkg-split/info.c:166
 #, 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"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "bestand `%.250s' is beschadigd - tweede lid is niet een datalid"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, 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"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, 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"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "kan onderdeelbestand `%.250s' niet vinden"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "bestand `%.250s' is beschadigd - te kort"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "kan archiefonderdeel, bestand `%.250s' niet openen"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "bestand `%.250s' is niet een archiefonderdeel"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5166,6 +5233,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5188,12 +5256,19 @@
 "    Bestandsgrootte deel (gebruikte stuk): %lu bytes\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<onbekend>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--info vereist een of meerdere onderdeelbestanden als argumenten"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "bestand `%s' is niet een archiefonderdeel\n"
@@ -5227,7 +5302,7 @@
 msgid "split package part"
 msgstr "ontbrekende pakketnaam"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "klaar\n"
@@ -5280,17 +5355,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Opties:\n"
 "    --depotdir <map>             (standaard is %s/%s)\n"
@@ -5302,20 +5386,29 @@
 "\n"
 "Uitgang-status: 0 = OK;  1 = -a is geen deel;  2 = moeilijkheden!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Type dpkg-split --help voor hulp."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "onverwachts bestandseinde in %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "deel is te groot of niet positief"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, fuzzy, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "deel moet ten minste %dk groot zijn (voor informatie)"
@@ -5426,42 +5519,42 @@
 msgid "Deleted %s.\n"
 msgstr "%s verwijderd.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "kan bronbestand `%.250s' niet openen"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "kan bronbestand niet 'fstat'-en"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "bronbestand `%.250s' is geen gewoon bestand"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split verwacht een bronbestand als argument"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split verwacht hoogstens een bronbestand en doelprefix"
 
@@ -5595,133 +5688,94 @@
 "  --help                      toon deze helpboodschap.\n"
 "  --version                 toon de versie.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 #, fuzzy
 #| msgid "parse error"
 msgid "error"
 msgstr "ontleedfout"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "waarschuwing"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat %s: %s"
-msgstr "kan de status van de oude naam '%s' niet opvragen: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, fuzzy, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "twee modes opgegeven: %s en --%s"
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
 #| msgid "cannot open diversions: %s"
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "kan omleidingen-bestand niet openen: %s"
 
-#: utils/update-alternatives.c:395
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "%s: copying %s to %s failed, giving up: %s"
-msgid "scan of %s failed: %s"
-msgstr "%s: kopiëren van %s naar %s is mislukt, poging wordt opgegeven: %s"
-
-#: utils/update-alternatives.c:420
-#, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "kan %s niet uitvoeren"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "kan van %s geen symbolische koppeling naar %s maken: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "kan %s niet installeren als %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "verwijderen van %s is mislukt: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "onverwacht bestandseinde in %s op %.255s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "kan %s niet lezen: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "onverwacht bestandseinde in %s op %.255s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, fuzzy, c-format
 msgid "%s corrupt: %s"
 msgstr "interne fout: %s is corrupt: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 "regeleinden zijn niet toegelaten in 'update-alternatives'-bestanden (%s)"
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "fout bij schrijven naar stdout: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "dubbele 'slave' %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 #, fuzzy
 msgid "slave link"
 msgstr "dubbele 'slave'-link %s"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "slaaf-link is gelijk aan hoofdlink %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "dubbele 'slave'-link %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "dubbel pad %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, fuzzy, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5730,235 +5784,271 @@
 "Alternatief voor %s verwijst naar %s - wat niet gevonden is, Wordt "
 "verwijderd van lijst van alternatieven."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 #, fuzzy
 msgid "priority"
 msgstr "prioriteit %s %s"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, fuzzy, c-format
 msgid "priority of %s: %s"
 msgstr "prioriteit %s %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "kan %s niet lezen: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 #, fuzzy
 msgid "master link"
 msgstr "dubbele 'slave'-link %s"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "kan %s niet sluiten: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, fuzzy, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "Verouderde slaaf-link %s wordt weggegooid (%s)."
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "kan %s niet verwijderen: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, fuzzy, c-format
 msgid "  link currently points to %s"
 msgstr "link verwijst momenteel naar %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 #, fuzzy
 msgid "  link currently absent"
 msgstr "link is momenteel afwezig"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "%s - priority %s"
 msgid "%s - priority %d"
 msgstr "%s - prioriteit %s"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr "slaaf %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Huidge 'beste' versie is %s."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Geen versies beschikbaar"
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "Omschrijving"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 #, fuzzy
 msgid "Priority"
 msgstr "prioriteit %s %s"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, fuzzy, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "druk enter om de standaardwaarde [*] te behouden, of  geef het "
 "selectienumber in: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Kan geen alternatief '%s' vinden."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "onverwacht bestandseinde in %s op %.255s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "%s-link wordt hernoemt van %s naar %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, fuzzy, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "Slaaf-link %s wordt hernoemt van %s naar %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr ""
+
+#: utils/update-alternatives.c:2241
+#, fuzzy, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "waarschuwing: --update is opgegeven maar %s bestaat niet"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr ""
+"Alternatief voor %s verwijst naar %s - wat niet gevonden is, Wordt "
+"verwijderd van lijst van alternatieven."
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr ""
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "onbekend argument '%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install heeft <link> <name> <path> <priority> nodig"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "prioriteit moet een integer getal zijn"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s heeft <naam> <pad> nodig"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s heeft <naam> nodig"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave is enkel toegelaten met --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave heeft <link> <name> <path> nodig"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "de naam %s is zowel hoofd als slaaf"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "de links %s is zowel hoofd als slaaf"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s heeft een enkel argument nodig"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "onbekende optie '%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -5967,67 +6057,23 @@
 "--display, --config, --set, --install, --remove, --all, --remove-all of --"
 "auto is nodig"
 
-#: utils/update-alternatives.c:2215
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr ""
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2239
-#, fuzzy, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "waarschuwing: --update is opgegeven maar %s bestaat niet"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
-
-#: utils/update-alternatives.c:2257
-#, fuzzy, c-format
-msgid "it is a slave of %s"
-msgstr "slaaf %s: %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "leesfout op standaard invoer"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, fuzzy, c-format
 msgid "no alternatives for %s."
 msgstr "Er zijn geen alternatieven voor %s"
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
@@ -6036,75 +6082,115 @@
 "%s is veranderd (handmatig of door een script).\n"
 "Er wordt omgeschakeld naar enkel handmatige updates."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, fuzzy, c-format
 msgid "setting up automatic selection of %s."
 msgstr "Automatische selectie van %s wordt opgezet."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "Alternatief %s voor %s is niet geregistreerd, wordt niet verwijderd."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 "Er is geen programma dat %s voorziet\n"
 "Er is niets in te stellen.\n"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "Alternatief %s voor %s is niet geregistreerd, wordt niet verwijderd."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, fuzzy, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "Handmatig geselecteerd alternatief wordt verwijderd - wordt omgeschakeld "
 "naar automatische modus"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr ""
 "Automatische opwaarderingen van %s zijn uitgeschakeld, het wordt met rust "
 "gelaten."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 "Om automatische opwaarderingen terug in te schakelen kunt 'update-"
 "alternatives --auto %s' gebruiken."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "'%s' wordt gebruikt om in '%s' te voorzien."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~ msgid "it is a slave of %s"
+#~ msgstr "slaaf %s: %s"
+
+#, fuzzy
+#~| msgid "cannot stat old name `%s': %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "kan de status van de oude naam '%s' niet opvragen: %s"
+
+#, fuzzy
+#~| msgid "%s: copying %s to %s failed, giving up: %s"
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "%s: kopiëren van %s naar %s is mislukt, poging wordt opgegeven: %s"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "kan %s niet uitvoeren"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "kan van %s geen symbolische koppeling naar %s maken: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "kan %s niet installeren als %s: %s"
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "fout bij schrijven naar stdout: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "kan %s niet lezen: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "kan %s niet sluiten: %s"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "kan %s niet verwijderen: %s"
+
+#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "kan %s niet hernoemen naar %s: %s"
@@ -6357,9 +6443,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "lid data van %s overgeslagen"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "uitvoeren van tar is mislukt"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "aanmaken van een tijdelijke bestandsnaam is mislukt"
Binary files dpkg/po/nn.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/nn.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/nn.po /home/vorlon/devel/multiarch/dpkg-debian/po/nn.po
--- dpkg/po/nn.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/nn.po	2012-06-07 10:11:09.426073000 -0700
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: debconf_nn\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2006-02-17 08:52+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -27,7 +27,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
@@ -47,71 +47,77 @@
 msgid "ar member file (%s)"
 msgstr "klarte ikkje oppretta mellombels fil (data)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "mislukkast i buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "mislukkast i buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "kort lesing i buffer_copy (%s)"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "klarte ikkje køyra «tar»"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "klarte ikkje køyra %s"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekomprimering"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: komprimering"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: intern gzip-feil: «%s»"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: intern gzip-feil: «%s»"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: intern gzip-feil: «%s»"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: intern gzip-feil: «%s»"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: intern gzip-feil: «%s»"
@@ -126,31 +132,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: intern bzip2-feil: «%s»"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: intern bzip2-feil: «%s»"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: intern bzip2-feil: «%s»"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: intern bzip2-feil: «%s»"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -159,106 +165,106 @@
 "oppdateringskatalogen inneheld fila «%.250s», som har for langt namn (lengd="
 "%d, maks=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 "oppdateringskatalogen inneheld filer med ulike namnelengder (både %d og %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "klarte ikkje skanna oppdateringskatalogen «%.255s»"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "klarte ikkje fjerna den innlemma oppdateringsfila %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "klarte ikkje oppretta «%.255s»"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "klarte ikkje etterfylla %.250s"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, fuzzy, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "klarte ikkje tømma %.250s etter etterfyllinga"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, fuzzy, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "klarte ikkje søkja til starten av %.250s etter etterfyllinga"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "klarte ikkje opna mellombels fil for vsnprintf"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "klarte ikkje åpna/oppretta låsefila til statusdatabasen"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "du har ikkje løyve til å låsa dpkg-statusdatabasen"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "klarte ikkje låsa dpkg-statusdatabasen"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "den ønskte handlinga krev superbrukartilgang"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "får ikkje tilgang til dpkg-statusområdet"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "operasjonen krev lese- og skrivetilgang til dpkg-statusområdet"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "klarte ikkje fjerna mi eiga oppdateringsfil %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "klarte ikkje skriva oppdatert status for «%.250s»"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "klarte ikkje tømma oppdatert status for «%.250s»"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "klarte ikkje klippa for oppdatert status for «%.250s»"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "klarte ikkje synkronisera oppdatert status for «%.250s»"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "klarte ikkje lukka oppdatert status for «%.250s»"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "klarte ikkje installera oppdatert status for «%.250s»"
@@ -279,91 +285,93 @@
 msgid "unable to open directory '%s'"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "klarte ikkje tømma i vsnprintf"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, fuzzy, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "klarte ikkje skriva %s-post om «%.50s» til «%.250s»"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "klarte ikkje opna «%s» for å skriva %s-informasjon"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "klarte ikkje mellomlagra statusfil"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "klarte ikkje skriva %s-post om «%.50s» til «%.250s»"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "klarte ikkje tømma %s-informasjon til «%.250s»"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "klarte ikkje synkronisera %s-informasjon til «%.250s»"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "klarte ikkje lukka «%.250s» etter skriving av %s-informasjon"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "klarte ikkje lenkja «%.250s» til «%.250s» for sikringskopiering av %s-info"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "klarte ikkje installera «%.250s» som «%.250s» med %s-info"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "ikkje nok minne til ny oppryddingsoppføring"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -372,33 +380,33 @@
 "%s: feil ved opprydding:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: For mange samanfletta feil under feiloppretting\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "ikkje nok minne til ny oppryddingsoppføring"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "ikkje nok minne til ny oppryddingsoppføring med mange parametrar"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: Feil ved behandling av %s (--%s):\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr "feil ved skriving av «%s»"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%d: intern feil «%s»\n"
@@ -414,110 +422,110 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "«%.*s» kan ikkje brukast for %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "rot etter %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "ugyldig pakkenamn (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "tomt fildetaljfelt «%s»"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "fildetaljfeltet «%s» kan ikkje brukast i statusfila"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "for mange verdiar i fildetaljfeltet «%s» (samanlikna med andre)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "for få verdiar i fildetaljfeltet «%s» (samanlikna med andre)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "ja/nei i boolsk felt"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "verdi i «status»-felt kan ikkje brukast i denne samanhengen"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 #, fuzzy
 msgid "first (want) word in `status' field"
 msgstr "tredje ord (status) i «status»-felt"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 #, fuzzy
 msgid "second (error) word in `status' field"
 msgstr "tredje ord (status) i «status»-felt"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "tredje ord (status) i «status»-felt"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "feil i versjonsstreng «%.250s»: %.250s"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "forelda «Revision»- eller «Package-Revision»-felt brukt"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr ""
 "verdien for «config-version»-feltet kan ikkje brukast i denne samanhengen"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "feil i Config-Version-streng «%.250s»: %.250s"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "verdien for «conffiles» har ei linje med ugyldig format «%.*s»"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "verdien for «conffiles» har ei linje som startar utan mellomrom «%c»"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "rot- eller null-katalog er nemnt som oppsettsfil"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 "«%s»-felt, manglande pakkenamn eller rot der det skulle vera eit pakkenamn"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "«%s»-felt, ugyldig pakkenamn «%.255s»: %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -526,7 +534,7 @@
 "«%s»-felt, referanse til «%.255s»:\n"
 " ugyldig versjonsforhold %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -535,7 +543,7 @@
 "«%s»-felt, referanse til «%.255s»:\n"
 " «%c» er forelda, bruk «%c=» eller «%c%c» i staden"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -544,11 +552,11 @@
 "«%s»-felt, referanse til «%.255s»:\n"
 " implisitt nøyaktig treff med versjonsnummer, føreslår «=» i staden"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Berre nøyaktige versjonar kan brukast i Provides"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -558,59 +566,59 @@
 " versjonsverdien startar med eit ikkje-alfanumerisk teikn, føreslår å leggja "
 "til eit mellomrom"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, fuzzy, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "«%s»-felt, referanse til «%.255s»: versjon inneheld «(»"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "«%s»-felt, referanse til «%.255s»: versjon ikkje avslutta"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "«%s»-felt, referanse til «%.255s»: feil i versjon: %.255s"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "«%s»-felt, syntaksfeil etter referanse til pakken «%.255s»"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternativ («|») kan ikkje brukast i %s-feltet"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 #, fuzzy
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 "verdien for «config-version»-feltet kan ikkje brukast i denne samanhengen"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, fuzzy, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "«%s»-felt, ugyldig pakkenamn «%.255s»: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 #, fuzzy
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "verdi i «status»-felt kan ikkje brukast i denne samanhengen"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, fuzzy, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "ugyldig pakkenamn på linje %d: %.250s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, fuzzy, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "filliste for pakken «%.250s»"
@@ -667,7 +675,7 @@
 msgid "unable to write to status fd %d"
 msgstr "klarte ikkje skriva oppdatert status for «%.250s»"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 msgid "malloc failed (%zu bytes)"
 msgstr "nytildeling mislukkast (%ld byte)"
@@ -677,8 +685,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "nytildeling mislukkast (%ld byte)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 #, fuzzy
 msgid "failed to allocate memory"
 msgstr "klarte ikkje oppretta katalog"
@@ -712,203 +720,209 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "klarte ikkje setja flagget «close-on-exec» for %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "oppsettsfeil: %s treng ein parameter"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, fuzzy, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "klarte ikkje opna oppsettsfila «%.255s» for lesing"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "ukjent val --%s"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "valet --%s treng ein parameter"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "valet --%s skal ikkje ha nokon parameter"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "lesefeil i oppsettsfila «%.255s»"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "feil ved lukking av oppsettsfila «%.255s»"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "feil ved lukking av oppsettsfila «%.255s»"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "ukjent val --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "valet --%s treng ein parameter"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "valet --%s skal ikkje ha nokon parameter"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "ukjent val -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "valet -%c treng ein parameter"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "valet -%c skal ikkje ha nokon parameter"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "Åtvaring: Forelda val «%s»\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, fuzzy, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "handlingar i konflikt --%s og --%s"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "verdien for feltet «%s» finst meir enn éin gong"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "det brukardefinerte feltnamnet «%.*s» er for kort"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "det brukardefinerte feltet «%.*s» finst meir enn éin gong"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Oppsett versjon for pakke med status som ikkje passar"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Ein pakke som ikkje er installert har oppsettsfiler. Dei vert ignorerte."
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "klarte ikkje opna pakkeinfofila «%.255s» for lesing"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "finn ikkje pakkeinfofila «%.255s»"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "klarte ikkje køyra «mmap» på pakkeinfofila «%.255s»"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "finn ikkje pakkeinfofila «%.255s»"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "klarte ikkje lukka etter lesing: «%.255s»"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "slutt på fila etter feltnamn «%.*s»"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "linjeskift i feltnamn «%.*s»"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MS-DOS-slutt på fila (^Z) i feltnamn «%.*s»"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "feltnamnet «%.*s» skal følgjast av eit kolon"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 "slutt på fil før verdien til feltet «%.*s» (manglar linjeskift til slutt)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 "MSDOS-teikn for slutt på fil i verdien for feltet «%.*s» (manglar "
 "linjeskift?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "linjeskift i feltnamn «%.*s»"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 "slutt på fil i verdien for feltet «%.*s» (manglar avsluttande linjeskift)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "fann fleire pakkeinformasjonsoppføringar, kan berre ha ei"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "klarte ikkje lukka etter lesing: «%.255s»"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "ingen pakkeinformasjon i «%.255s»"
@@ -927,67 +941,67 @@
 " %.255s"
 msgstr "%s, i fila «%.255s» nær linje %d"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "kan ikkje vera ein tom streng"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "må starta med eit alfanumerisk teikn"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, fuzzy, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "teiknet «%c» kan ikkje brukast - berre bokstavar, siffer og %s kan brukast"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<ingen>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "versjonsstrengen er tom"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "versjonsstrengen inneheld mellomrom"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "epoken i versjonen er ikkje eit tal"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "ingenting etter kolonet i versjonsnummeret"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "ingenting etter kolonet i versjonsnummeret"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "ingenting etter kolonet i versjonsnummeret"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "manglar %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "tom verdi for %s"
@@ -1006,51 +1020,51 @@
 msgid "(no description available)"
 msgstr "(inga skildring tilgjengeleg)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "klarte ikkje ignorera signalet %s før skriptet vart køyrt"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "feil ved blokkering av signalet %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (underprosess): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "gafling mislukkast"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "underprosessen %s returnerte feilstatus %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "venting på %s mislukkast"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "underprosessen %s drepen av signal (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ""
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "underprosessen %s mislukkast med ventestatuskode %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "venting på %s mislukkast"
@@ -1070,197 +1084,203 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, fuzzy, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 msgid "triggers area"
 msgstr "klarte ikkje køyra %s"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, fuzzy, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "klarte ikkje køyra «fstat» på delfila «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, fuzzy, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, fuzzy, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "klarte ikkje opna den nye depotfila «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, fuzzy, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "klarte ikkje lesa %s frå %.255s"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, fuzzy, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "klarte ikkje opna den nye depotfila «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, fuzzy, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "klarte ikkje opna den nye depotfila «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, fuzzy, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "klarte ikkje installera ny versjon av «%.255s»"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, fuzzy, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "klarte ikkje opna den nye depotfila «%.250s»"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, fuzzy, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "klarte ikkje lesa delfila «%.250s»"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:419
-#, fuzzy, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "klarte ikkje køyra «fstat» på delfila «%.250s»"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, fuzzy, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "klarte ikkje køyra «fstat» på delfila «%.250s»"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "klarte ikkje køyra «fstat» på delfila «%.250s»"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "klarte ikkje køyra «fstat» på delfila «%.250s»"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
+msgstr "klarte ikkje installera ny versjon av «%.255s»"
+
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "klarte ikkje fjerna «%.250s»"
+
+#: lib/dpkg/triglib.c:360
+#, fuzzy, c-format
+msgid "unable to create new trigger interest file `%.250s'"
 msgstr "klarte ikkje køyra «fstat» på delfila «%.250s»"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:383
 #, fuzzy, c-format
-msgid "unable to install new trigger interest file `%.250s'"
-msgstr "klarte ikkje installera ny versjon av «%.255s»"
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "klarte ikkje køyra «fstat» på delfila «%.250s»"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:456
 #, fuzzy, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr "klarte ikkje installera ny informasjonsfil «%.250s» som «%.250s»"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, fuzzy, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "klarte ikkje opna den nye depotfila «%.250s»"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, fuzzy, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "klarte ikkje opna den nye depotfila «%.250s»"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "klarte ikkje opna den nye depotfila «%.250s»"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "klarte ikkje opna den nye depotfila «%.250s»"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "klarte ikkje opna den nye depotfila «%.250s»"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, fuzzy, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "klarte ikkje installera ny informasjonsfil «%.250s» som «%.250s»"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, fuzzy, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "klarte ikkje lesa delfila «%.250s»"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, fuzzy, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "lesefeil i oppsettsfila «%.255s»"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, fuzzy, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, fuzzy, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "klarte ikkje lesa depotkatalogen «%.250s»"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, fuzzy, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "klarte ikkje lesa depotkatalogen «%.250s»"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, fuzzy, c-format
 msgid "read error in `%.250s'"
@@ -1285,7 +1305,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "feil ved lesing frå dpkg-deb-røyr"
 
@@ -1304,12 +1324,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "feil ved setjing av eigarskap for den symbolske lenkja «%.255s»"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "feil ved setjing av eigarskap for «%.255s»"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "feil ved setjing av filrettar for «%.255s»"
@@ -1367,17 +1387,26 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arkivet inneheldt objektet «%.255s» med ukjend type 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+msgid "cannot stat file '%s'"
+msgstr "fann ikkje «%.255s» (i «%.255s»)"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Byter ut filer i den gamle pakken %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, 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:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1386,94 +1415,99 @@
 "prøver å skriva over katalogen «%.250s» i pakken %.250s med noko anna enn "
 "ein katalog"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "prøver å skriva over «%.250s», som òg finst i pakken %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "klarte ikkje lesa «%.255s» (i «%.255s»)"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "bakgrunnssystem dpkg-deb under «%.255s»"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "feil ved lukking/skriving av «%.255s»"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "feil ved oppretting av røyr «%.255s»"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "feil ved oppretting av eining «%.255s»"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "feil ved oppretting av hard lenkje «%.255s»"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "feil ved oppretting av symbolsk lenkje «%.255s»"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "feil ved oppretting av katalogen «%.255s»"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, 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:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "klarte ikkje lesa lenkja «%.255s»"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "klarte ikkje laga sikringskopi av den symbolske lenkja «%.255s»"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "klarte ikkje endra eigarskapen til den symbolske lenkja «%.255s»"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, 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:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "klarte ikkje installera ny versjon av «%.255s»"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "klarte ikkje oppretta «%.255s»"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "klarte ikkje lukka mellomlager for «%.255s»"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1482,7 +1516,7 @@
 "dpkg: Åtvaring - ignorerer kravproblem ved fjerning av %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, fuzzy, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1491,7 +1525,7 @@
 "dpkg: Åtvaring - vurderer fjerning av oppsett for den nødvendige\n"
 " pakken %s for å kunna fjerna %s.\n"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1500,7 +1534,7 @@
 "dpkg: Nei, %s er nødvendig. Vil ikkje fjerna oppsettet\n"
 " for å kunna fjerna %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1509,28 +1543,28 @@
 "dpkg: Nei, kan ikkje fjerna %s (--auto-deconfigure kan hjelpa):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, fuzzy, c-format
 msgid "removal of %.250s"
 msgstr "lesefeil i %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, fuzzy, c-format
 msgid "installation of %.250s"
 msgstr "klarte ikkje installera ny versjon av «%.255s»"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, fuzzy, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: Vurderer å fjerna %s til fordel for %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, fuzzy, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: Ja, fjernar %s til fordel for %s.\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1539,39 +1573,39 @@
 "dpkg: Knytt til %s, som inneheld %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 #, fuzzy
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "dpkg: Åtvaring - ignorerer konflikt, men kan halda fram likevel.\n"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1580,109 +1614,111 @@
 "dpkg: Pakken %s krev installasjon på nytt, men vert fjerna likevel, sidan du "
 "ønskjer det.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "pakkar i konflikt - installerer ikkje %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 #, fuzzy
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "dpkg: Åtvaring - ignorerer konflikt, men kan halda fram likevel.\n"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive treng minst éin stigparameter"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "klarte ikkje køyra «find» for --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "klarte ikkje utføra «fdopen» på find-røyret"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "klarte ikkje lesa find-røyret"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "klarte ikkje lukka find-røyret"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find for --recursive returnerte den uforutsette feilen %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "søkte, men fann ingen pakkar (filer med namn *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s treng minst éi pakkearkivfil som parameter"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Tek i bruk pakken %s (tidlegare ikkje i bruk).\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Hoppar over pakken %s. (Ikkje valt)\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, 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:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s - Åtvaring: Nedgraderer %.250s frå %.250s til %.250s.\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "Vil ikkje nedgradera %.250s frå versjon %.250s til %.250s, hoppar over.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1691,39 +1727,39 @@
 "klarte ikkje fjerna den nyinstallerte versjonen av «%.250s» for å kunna "
 "installera sikringskopien på nytt"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "klarte ikkje gjenoppretta sikringskopien av «%.250s»"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "klarte ikkje gjenoppretta sikringskopien av «%.250s»"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, fuzzy, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "klarte ikkje fjerna den nyutpakka versjonen av «%.250s»"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "klarte ikkje fjerna den nyutpakka versjonen av «%.250s»"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "fann ikkje den nye distribusjonsoppsettsfila «%.250s»"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "fann ikkje den installerte oppsettsfila «%.250s»"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1734,63 +1770,63 @@
 "Oppsettsfila «%s» finst ikkje på systemet.\n"
 "Installerer ny oppsettsfil sidan du ønskjer det.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr ""
 "dpkg: %s: Åtvaring - klarte ikkje fjerna den gamle sikringskopien «%.250s»: "
 "%s\n"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 "dpkg: %s: Åtvaring - klarte ikkje endra namnet på «%.250s» til «%.250s»: %s\n"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: Klarte ikkje køyra gzip %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 "dpkg: %s: Åtvaring - klarte ikkje fjerna den tidlegare distribuerte "
 "versjonen «%.250s»: %s\n"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 "dpkg: %s: Åtvaring - klarte ikkje fjerna «%.250s» (før overskriving): %s\n"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "dpkg: %s: Åtvaring - klarte ikkje lenkja «%.250s» til «%.250s»: %s\n"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Installerer ny versjon av oppsettsfila %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "klarte ikkje installera «%.250s» som «%.250s»"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "ingen pakke med namnet «%s» er installert, kan ikkje setja opp"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "pakken %.250s er installert og sett opp frå før"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1799,7 +1835,7 @@
 "pakken %.250s er ikkje klar for oppsett\n"
 " kan ikkje setja opp (noverande status «%.250s»)"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1808,11 +1844,11 @@
 "dpkg: Kravproblem hindrar oppsettet av %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "kravproblem - set ikkje opp pakken"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1821,7 +1857,7 @@
 "dpkg: %s: Kravproblem, men set opp likevel sidan du ønskjer det:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1829,12 +1865,12 @@
 "Pakken er i ein veldig inkonsistent tilstand, og bør\n"
 "installerast på nytt før du set han opp."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Set opp %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, fuzzy, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1843,7 +1879,7 @@
 "dpkg: %s: Åtvaring - fann ikkje oppsettsfila «%s»\n"
 " (= «%s»): %s\n"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, fuzzy, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1853,7 +1889,7 @@
 "sjølv\n"
 " (= «%s»)\n"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, fuzzy, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1862,7 +1898,7 @@
 "dpkg: %s: Åtvaring - klarte ikkje lesa lenkja for oppsettsfila «%s»\n"
 " (= «%s»): %s\n"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, fuzzy, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1871,36 +1907,36 @@
 "dpkg: %s: Åtvaring - oppsettsfila «%.250s» vert til eit degenerert filnamn\n"
 "(«%s» er ei symbolsk lenkje til «%s»)\n"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, fuzzy, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "dpkg: %s: Åtvaring - oppsettsfila «%.250s» er inga vanleg fil eller symbolsk "
 "lenkje (= «%s»)\n"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5-nøkkel"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr ""
 "dpkg: %s: Åtvaring - klarte ikkje opna oppsettsfila %s for nøkkel: %s\n"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Skriv «exit» når du er ferdig.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1909,12 +1945,12 @@
 "\n"
 "Oppsettsfil «%s»"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (faktisk «%s»)"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1925,7 +1961,7 @@
 " ==> Fila på systemet er oppretta av deg eller eit skript.\n"
 " ==> Fila finst òg i pakken frå pakkevedlikehaldaren.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1934,7 +1970,7 @@
 "\n"
 "     Ikkje endra sidan installasjonen.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1943,7 +1979,7 @@
 "\n"
 " ==> Endra (av deg eller av eit skript) sidan installasjonen.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1952,37 +1988,37 @@
 "\n"
 " ==> Endra (av deg eller av eit skript) sidan installasjonen.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Pakkedistributøren har gjeve ut ein oppdatert versjon.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Versjonen i pakken er den same som ved siste installasjon.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Brukar den nye fila sidan du ønskjer det.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Brukar den gamle fila sidan du ønskjer det.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Tek vare på den gamle oppsettsfila som standard.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Brukar den nye oppsettsfila som standard.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1998,165 +2034,166 @@
 "        Z     : Send denne prosessen til bakgrunnen for å undersøkja "
 "nærare.\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Standardhandlinga er å ta vare på den versjonen som er installert.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Standardhandlinga er å installera den nye versjonen.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[standard=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[standard=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[inga standardhandling]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "feil ved skriving til standardfeil, oppdaga før oppsettsfilprompt"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "lesefeil på standard-inn ved oppsettsfilprompt"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "slutt på fil ved standard-inn ved oppsettsfilprompt"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, fuzzy, c-format
 msgid "%s depends on %s"
 msgstr " krev "
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, fuzzy, c-format
 msgid "%s pre-depends on %s"
 msgstr " før-krev "
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, fuzzy, c-format
 msgid "%s recommends %s"
 msgstr " tilrår "
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, fuzzy, c-format
 msgid "%s suggests %s"
 msgstr " føreslår "
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, fuzzy, c-format
 msgid "%s breaks %s"
 msgstr "%s (underprosess): %s\n"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, fuzzy, c-format
 msgid "%s conflicts with %s"
 msgstr " er i konflikt med "
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, fuzzy, c-format
 msgid "%s enhances %s"
 msgstr " forbetrar "
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s vil verta fjerna.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  Oppsettet av %.250s vil verta fjerna.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s er installert, men versjonen er %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, 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:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s er pakka ut, men versjonen er %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s siste oppsette versjon er %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "%.250s er %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s tilbyr %.250s, men skal fjernast.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s tilbyr %.250s, men oppsettet skal fjernast.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s tilbyr %.250s, men er %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s er ikkje installert.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versjon %.250s) vil verta installert.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, fuzzy, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versjon %.250s) er %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s tilbyr %.250s og skal installerast.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, fuzzy, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s tilbyr %.250s og er %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+msgid "Use --help for help about diverting files."
+msgstr "Skriv «dpkg-split --help» for hjelp."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, fuzzy, c-format
 msgid "Debian %s version %s.\n"
 msgstr "' versjon for pakkearkivmotoren "
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2164,8 +2201,8 @@
 "Copyright (C) 2010 Guillem Jover.\n"
 msgstr ""
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2176,7 +2213,7 @@
 "GNU General Public Licence versjon 2 eller nyare. Det finst INGEN garanti.\n"
 "Sjå «dpkg-deb --licence» for detaljar.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2184,7 +2221,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2196,7 +2233,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2214,7 +2251,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2223,152 +2260,147 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-msgid "cannot stat file '%s'"
-msgstr "fann ikkje «%.255s» (i «%.255s»)"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 msgid "error checking '%s'"
 msgstr "feil ved skriving av «%s»"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "fann ikkje «%.255s» (i «%.255s»)"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "verdien for feltet «%s» finst meir enn éin gong"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 msgid "local diversion of %s"
 msgstr "lokalt omdirigert"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 msgid "local diversion of %s to %s"
 msgstr "lokalt omdirigert"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "diversion of %s by %s"
 msgstr "omdirigert med %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "omdirigert av %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "any diversion of %s"
 msgstr "omdirigert med %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 msgid "any diversion of %s to %s"
 msgstr "omdirigert av %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 msgid "cannot create new %s file"
 msgstr "kan ikkje opna GPL-fil"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "klarte ikkje tømma i vsnprintf"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 msgid "error removing old diversions-old"
 msgstr "feil ved oppretting av eining «%.255s»"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "feil ved oppretting av eining «%.255s»"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "feil ved oppretting av eining «%.255s»"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, fuzzy, c-format
 msgid "--%s needs a single argument"
 msgstr "--build krev ein katalogparameter"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, fuzzy, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "finn ikkje oppsettsfila «%.250s»"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr ""
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 #, fuzzy
 msgid "Cannot divert directories"
 msgstr "klarte ikkje lesa infokatalogen"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "klarte ikkje lesa infokatalogen"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 msgid "Leaving '%s'\n"
 msgstr "feil ved skriving av «%s»"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid " is to be removed.\n"
 msgid "No diversion '%s', none removed.\n"
 msgstr " vil bli fjerna.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2376,7 +2408,7 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2384,17 +2416,17 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 msgid "Removing '%s'\n"
 msgstr "Fjernar %s ...\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 #, fuzzy
 msgid "package may not contain newlines"
 msgstr "Pakken «%s» inneheld ingen filer (!)\n"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr ""
 
@@ -2474,8 +2506,8 @@
 msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s tek ingen parametrar"
@@ -2565,7 +2597,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions ugyldig relasjon"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "versjon a har ugyldig syntaks: %s\n"
@@ -2625,12 +2657,12 @@
 "dpkg - Åtvaring, overstyrer problemet fordi --force er slått på:\n"
 " "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "klarte ikkje opna fillistefila for pakken «%.250s»"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, fuzzy, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2639,37 +2671,37 @@
 "dpkg: Alvorleg åtvaring: Fillistefila for pakken «%.250s» manglar. Går ut "
 "frå at pakken ikkje har nokon filer installert.\n"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "klarte ikkje opna fillistefila for pakken «%.250s»"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "filliste for pakken «%.250s»"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, fuzzy, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "feil ved lukking av fillistefila for pakken «%.250s»"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Les database ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2677,32 +2709,32 @@
 msgstr[0] "%d filer og katalogar er installerte.)\n"
 msgstr[1] "%d filer og katalogar er installerte.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "klarte ikkje laga oppdatert fillistefil for pakken %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "klarte ikkje skriva til oppdatert fillistefil for pakken %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "klarte ikkje tømma oppdatert fillistefil for pakken %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "klarte ikkje synkronisera oppdatert fillistefil for pakken %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "klarte ikkje lukka oppdatert fillistefil for pakken %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "klarte ikkje installera oppdatert fillistefil for pakken %s"
@@ -2742,7 +2774,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "dpkg - feil: PATH er ikkje sett.\n"
 
 #: src/help.c:129
@@ -2774,7 +2806,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "klarte ikkje få status i vsnprintf"
@@ -2785,66 +2817,66 @@
 msgstr "klarte ikkje skifta filrot til «%.250s»"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "klarte ikkje skifta katalog til «%.255s»"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "klarte ikkje setja køyreløyve på «%.250s»"
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "klarte ikkje få status i vsnprintf"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "gammalt %s-skript"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "finn ikkje %s «%.250s»"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "nytt %s-skript"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "gammalt %s-skript"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "finn ikkje %s «%.250s»"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - prøver i staden eit skript frå den nye pakken ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "det finst ingen skript i den nye versjonen av pakken - gjev opp"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... det ser ut til at det gjekk fint.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "klarte ikkje oppretta «%.255s»"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2853,7 +2885,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "klarte ikkje sjekka om «%.250s» finst"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "klarte ikkje lesa infokatalogen"
 
@@ -2893,7 +2925,7 @@
 "\n"
 msgstr ""
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -2972,7 +3004,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3027,30 +3059,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3059,102 +3095,102 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "kravproblem - fjernar ikkje"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "kravproblem - fjernar ikkje"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "klarte ikkje få status i vsnprintf"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "lesefeil i oppsettsfila «%.255s»"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3162,7 +3198,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3170,36 +3206,36 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "-- debug krev ein oktal parameter"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "tomt pakkenamn i den kommadelte lista til --ignore-depends «%.250s»"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends krev eit gyldig pakkenamn. «%.250s» er ikkje gyldig; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ugyldig heiltal for --%s: «%.250s»"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3208,7 +3244,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3216,12 +3252,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ukjend tvingings-/avvisingsval «%.*s»"
 
-#: src/main.c:511
+#: src/main.c:513
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "Åtvaring: Forelda val «%s»\n"
@@ -3246,8 +3282,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "uventa slutt på fil før slutten av linje %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "treng eit handlingsval"
 
@@ -3410,88 +3446,88 @@
 msgid "passed\n"
 msgstr "godkjent\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "klarte ikkje laga mellombels katalognamn"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr ""
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "den gamle versjonen av pakken har eit altfor langt filnamn som startar på "
 "«%.250s»"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "klarte ikkje fjerna den forelda informasjonsfila «%.250s»"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "klarte ikkje installera den (visstnok) nye informasjonsfila «%.250s»"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "klarte ikkje opna den mellombelse kontrollkatalogen"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "pakken inneheld eit altfor langt informasjonsfilnamn (startar med «%.50s»)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "pakkekontrollinformasjonen inneheld katalogen «%.250s»"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "pakkekontrollinformasjon, rmdir av «%.250s» sa ikkje «ingen katalog»"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr "dpkg: Åtvaring - pakken %s inneheld ei liste som informasjonsfil"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "klarte ikkje installera ny informasjonsfil «%.250s» som «%.250s»"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "klarte ikkje sletta kontrollinformasjonsfila «%.250s»"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "får ikkje tilgang til arkivet"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "klarte ikkje laga mellombels katalognamn"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 msgid "package control information extraction"
 msgstr "kontrollinformasjonslengd"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Teke vare på informasjon om %s frå %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "pakkearkitekturen (%s) passar ikkje til systemet (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3500,100 +3536,100 @@
 "dpkg: Vedrørande %s som inneheld %s, problem med førkrav:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "problem med førkrav - installerer ikkje %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr "dpkg: Åtvaring - ignorerer problem med førkrav.\n"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Gjer klar til å byta ut %s %s (ved bruk av %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Pakkar ut %s (frå %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "namnet på oppsettsfila (startar med «%.250s») er for langt (>%d teikn)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "lesefeil i %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "feil ved lukking av %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "feil ved opning av %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, fuzzy, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Fjernar oppsettet av %s, slik at %s kan fjernast ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, fuzzy, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Fjernar %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Pakkar ut erstattinga %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "feil ved lesing av tar-utdata frå dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "øydelagd filsystem-tarfil - øydelagt pakkearkiv"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: Fjern eventuelle avsluttande nullar"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, fuzzy, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "dpkg: Åtvaring - klarte ikkje sletta den gamle fila «%.250s»: %s\n"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "dpkg: Åtvaring - klarte ikkje sletta den gamle fila «%.250s»: %s\n"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, fuzzy, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "dpkg: %s: Åtvaring - oppsettsfila «%.250s» er inga vanleg fil eller symbolsk "
 "lenkje (= «%s»)\n"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, fuzzy, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "klarte ikkje køyra «fstat» på delfila «%.250s»"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, fuzzy, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3602,12 +3638,12 @@
 "dpkg: %s: Åtvaring - oppsettsfila «%.250s» er inga vanleg fil eller symbolsk "
 "lenkje (= «%s»)\n"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "dpkg: Åtvaring - klarte ikkje sletta den gamle fila «%.250s»: %s\n"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Legg merke til at %s er forsvunnen, og fullstendig erstatta.)\n"
@@ -3786,7 +3822,7 @@
 "\n"
 msgstr ""
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3800,6 +3836,10 @@
 "  case left alignment will be used.\n"
 msgstr ""
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, fuzzy, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3860,7 +3900,7 @@
 msgid "Removing %s ...\n"
 msgstr "Fjernar %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, fuzzy, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3869,50 +3909,51 @@
 "dpkg - åtvaring: Ved fjerning av %.250s kunne ikkje katalogen «%.250s» "
 "fjernast: %s - katalogen kan vera eit monteringspunkt.\n"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "klarte ikkje fjerna «%.250s»"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "klarte ikkje oppretta %.250s"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "dpkg - åtvaring: Ved fjerning av %.250s var katalogen «%.250s» ikkje tom. "
 "Han vart difor ikkje fjerna.\n"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "klarte ikkje fjerna «%.250s»"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Reinskar ut oppsettsfiler for %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "klarte ikkje fjerna den gamle oppsettsfila «%.250s» (= «%.250s»)"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "klarte ikkje lesa oppsettsfilkatalogen «%.250s» (frå «%.250s»)"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "klarte ikkje fjerna den gamle sikringskopien av oppsettsfila «%.250s» (frå "
 "«%.250s»)"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "klarte ikkje fjerna gammal filliste"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "klarte ikkje fjerna gammalt etterfjerningsskript"
 
@@ -3955,14 +3996,18 @@
 msgid "read error on standard input"
 msgstr "lesefeil frå standard-inn"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 msgstr ""
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -3973,7 +4018,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -3986,57 +4031,57 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr ""
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "klarte ikkje opna «statoverride»-fila"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "feil ved oppretting av eining «%.255s»"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "feil ved oppretting av eining «%.255s»"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "feil ved oppretting av eining «%.255s»"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 #, fuzzy
 msgid "--add needs four arguments"
 msgstr "--build krev ein katalogparameter"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr ""
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr ""
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr ""
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr ""
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr ""
 
@@ -4107,17 +4152,17 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "«statoverride»-fil «%.250s»"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Skriv «dpkg-split --help» for hjelp."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "» pakkehandteringsprogram\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4125,7 +4170,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4134,7 +4179,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4148,31 +4193,31 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 #, fuzzy
 msgid "takes one argument, the trigger name"
 msgstr "--%s tek berre éin parameter (.deb-filnamn)"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "«%s»-felt, ugyldig pakkenamn «%.255s»: %s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "«%s»-felt, ugyldig pakkenamn «%.255s»: %s"
@@ -4201,30 +4246,31 @@
 msgstr "Reinskar ut oppsettsfiler for %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s treng akkurat éi «Packages»-fil som parameter"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "klarte ikkje få tilgang til dpkg-statusområdet for rå tilgjengeoppdatering"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr "rå tilgjengeoppdatering krev skrivetilgang til dpkg-statusområdet"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Byter ut informasjon om tilgjengelege pakkar, ved hjelp av %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Oppdaterer opplysningar om tilgjengelege pakkar, ved hjelp av %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4232,7 +4278,7 @@
 msgstr[0] "Informasjon om %d pakke/pakkar vart oppdatert.\n"
 msgstr[1] "Informasjon om %d pakke/pakkar vart oppdatert.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4349,8 +4395,8 @@
 msgstr[0] "dpkg-deb: Ignorerer %d åtvaringar om kontrollfilene\n"
 msgstr[1] "dpkg-deb: Ignorerer %d åtvaringar om kontrollfilene\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, fuzzy, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--build krev ein katalogparameter"
@@ -4382,25 +4428,25 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: Byggjer pakken «%s» i «%s».\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "klarte ikkje oppretta mellombels fil (data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 msgid "control member"
 msgstr "kontrollområde"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "klarte ikkje fjerna lenkje til mellombels fil (data), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4416,20 +4462,20 @@
 msgid "error writing `%s'"
 msgstr "feil ved skriving av «%s»"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "mellom medlemmer"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "klarte ikkje skriva filnamn til tar-røyr (data)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4447,77 +4493,77 @@
 msgid "error reading %s from file %.255s"
 msgstr "klarte ikkje lesa %s frå %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "klarte ikkje lesa arkivet «%.255s»"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "klarte ikkje køyra «fstat» på arkivet"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "arkivet manglar punktum i versjonsnummeret"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "arkivet manglar linjeskift i hovudet"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "fila «%.250s» er øydelagd - ugyldig delnummer"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "fila «%.250s» er ikkje eit binært Debian-arkiv (prøv dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "arkivet manglar punktum i versjonsnummeret"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "arkivet manglar linjeskift i hovudet"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "arkivet manglar punktum i versjonsnummeret"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 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:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "hoppa over medlemsdata frå %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
 "fila «%.250s» inneheld eit datamedlem %.*s som eg ikkje skjønar. Gjev opp"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "fila «%.250s» inneheld to kontrollmedlemmer. Gjev opp"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4529,22 +4575,22 @@
 " ny Debian-pakke, versjon %s.\n"
 " storleik %ld byte: kontrollarkiv = %zi byte.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 msgid "archive has malformatted control member size '%s'"
 msgstr "arkivet har ei misforma kontrollengd «%s»"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "hoppa over medlemsdata frå %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4556,7 +4602,7 @@
 " gammal Debian-pakke, versjon %s.\n"
 " storleik %ld byte: kontrollarkiv = %zi, hovudarkiv = %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4565,51 +4611,52 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "«%.255s» er ikkje eit arkiv i Debian-format"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "klarte ikkje skriva til røyret i «copy»"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "klarte ikkje lukka røyret i «copy»"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "klarte ikkje skifta til katalog"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "klarte ikkje oppretta katalog"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "klarte ikkje skifta til katalogen etter å ha oppretta han"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "klarte ikkje skifta til katalog"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s: dekomprimering"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 #, fuzzy
 msgid "paste"
 msgstr "godkjent\n"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s krev eit .deb-filnamn som parameter"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4618,37 +4665,37 @@
 "--%s krev ein målkatalog.\n"
 "Kan det henda du meinte å bruka «dpkg --install»?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s tek berre éin parameter (.deb-filnamn)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "klarte ikkje skifta til katalogen «/» for å rydda opp"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 msgid "control file '%s'"
 msgstr "fann ikkje «%.255s» (i «%.255s»)"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: «%.255s» inneheld ikkje kontrollkomponenten «%.255s»\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "opning av komponenten «%.255s» (i %.255s) mislukkast på ein uventa måte"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, fuzzy, c-format
 #| msgid "One requested control component is missing"
 msgid "%d requested control component is missing"
@@ -4656,59 +4703,59 @@
 msgstr[0] "Eitt ønskt kontrollkomponent manglar"
 msgstr[1] "Eitt ønskt kontrollkomponent manglar"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "klarte ikkje skanna katalogen «%.255s»"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "fann ikkje «%.255s» (i «%.255s»)"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "klarte ikkje opna «%.255s» (i «%.255s»)"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "klarte ikkje lesa «%.255s» (i «%.255s»)"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld byte, %5d linjer   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     ikkje ei vanleg fil          %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(inga «control»-fil i kontrollarkivet)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "klarte ikkje opna komponenten «control»"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "feil ved lesing av komponenten «control»"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "klarte ikkje lukka find-røyret"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Feil i format"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents tek akkurat éin parameter"
 
@@ -4729,11 +4776,13 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4742,11 +4791,12 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4759,7 +4809,7 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4768,7 +4818,7 @@
 "unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4776,17 +4826,17 @@
 "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:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "ugyldig heiltal for --%s: «%.250s»"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "ugyldig heiltal for --%s: «%.250s»"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ukjend komprimeringstype «%s»!"
@@ -4806,7 +4856,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "fila «%.250s» er øydelagd - manglar linjeskift etter %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "feil ved lesing av %.250s"
@@ -4896,51 +4946,56 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "fila «%.250s» er øydelagd - ugyldig delnummer"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+msgid "package architecture"
+msgstr " (pakke: "
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "fila «%.250s» er øydelagd - ugyldig magisk nummer til slutt i det andre "
 "hovudet"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "fila «%.250s» er øydelagd - den andre medlemmen er ikkje ein datamedlem"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "fila «%.250s» er øydelagd - feil tal på delar i forhold til opplysningane"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "fila «%.250s» er øydelagd - feil storleik i forhold til opplysningane"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "klarte ikkje køyra «fstat» på delfila «%.250s»"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "fila «%.250s» er øydelagd - for kort"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "klarte ikkje opna arkivdelfila «%.250s»"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "fila «%.250s» er ikkje ein arkivdel"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -4960,6 +5015,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -4982,12 +5038,19 @@
 "    Delfilstorleik (brukt del):    %lu byte\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<ukjend>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--info tek ein eller fleire delfilparametrar"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "fila «%s» er ingen arkivdel\n"
@@ -5020,7 +5083,7 @@
 msgid "split package part"
 msgstr "manglar %s"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "ferdig\n"
@@ -5071,28 +5134,36 @@
 "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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Skriv «dpkg-split --help» for hjelp."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "uventa slutt på fil i %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "delen er altfor stor eller storleiken er ikkje positiv"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, fuzzy, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "delen må minst vera på %dk (for at hovudet skal få plass)"
@@ -5204,42 +5275,42 @@
 msgid "Deleted %s.\n"
 msgstr "Sletta %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "klarte ikkje køyra «fstat» på kjeldefila"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "kjeldefila «%.250s» er inga vanleg fil"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split krev ei kjeldefil som parameter"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split tek høgst eitt kjeldefilnamn og målprefiks"
 
@@ -5307,490 +5378,476 @@
 "  --version                show the version.\n"
 msgstr ""
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 #, fuzzy
 #| msgid "parse error"
 msgid "error"
 msgstr "tolkingsfeil"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "åtvaring"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-msgid "cannot stat %s: %s"
-msgstr "fann ikkje «%.255s» (i «%.255s»)"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr ""
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "klarte ikkje opna avlusingsfil «%s»: %s\n"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:420
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
+msgid "unable to remove '%s'"
 msgstr "klarte ikkje køyra %s"
 
-#: utils/update-alternatives.c:503
-#, fuzzy, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "klarte ikkje laga sikringskopi av den symbolske lenkja «%.255s»"
-
-#: utils/update-alternatives.c:511
-#, fuzzy, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "klarte ikkje installera «%.250s» som «%.250s»"
-
-#: utils/update-alternatives.c:521
-#, fuzzy, c-format
-msgid "unable to remove %s: %s"
-msgstr "klarte ikkje køyra %s"
-
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "uventa slutt på fil i %s i %.255s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "omdirigert av %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "uventa slutt på fil i %s i %.255s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, fuzzy, c-format
 msgid "%s corrupt: %s"
 msgstr "%s: Intern gzip-feil: Skreiv: «%s»"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "feil ved skriving av «%s»"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 msgid "duplicate slave name %s"
 msgstr "verdien for feltet «%s» finst meir enn éin gong"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 #, fuzzy
 msgid "slave link"
 msgstr "verdien for feltet «%s» finst meir enn éin gong"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, fuzzy, c-format
 msgid "duplicate slave link %s"
 msgstr "verdien for feltet «%s» finst meir enn éin gong"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr ""
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1244
-#, fuzzy, c-format
-msgid "unable to read %s: %s"
-msgstr "klarte ikkje køyra %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 #, fuzzy
 msgid "master link"
 msgstr "verdien for feltet «%s» finst meir enn éin gong"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, fuzzy, c-format
-msgid "unable to close %s: %s"
-msgstr "klarte ikkje køyra %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, fuzzy, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "verdien for feltet «%s» finst meir enn éin gong"
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-msgid "cannot write %s: %s"
-msgstr "klarte ikkje køyra %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr ""
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr ""
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr "klarte ikkje køyra %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "' versjon for pakkearkivmotoren "
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 #, fuzzy
 msgid "No versions available."
 msgstr "(inga skildring tilgjengeleg)"
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "Skildring"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "ukjend komprimeringstype «%s»!"
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "uventa slutt på fil i %s i %.255s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "Pakkar ut %s (frå %s) ...\n"
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, fuzzy, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "Pakkar ut %s (frå %s) ...\n"
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr ""
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr ""
+
+#: utils/update-alternatives.c:2254
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr ""
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr ""
+
+#: utils/update-alternatives.c:2324
 #, fuzzy, c-format
 msgid "unknown argument `%s'"
 msgstr "ukjend komprimeringstype «%s»!"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr ""
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, fuzzy, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s krev eit .deb-filnamn som parameter"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, fuzzy, c-format
 msgid "--%s needs <name>"
 msgstr "--%s tek ingen parametrar"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--build krev ein katalogparameter"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, fuzzy, c-format
 msgid "unknown option `%s'"
 msgstr "ukjent val --%s"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
 msgstr ""
 
-#: utils/update-alternatives.c:2215
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr ""
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr ""
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "lesefeil frå standard-inn"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
 "updates only."
 msgstr ""
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr ""
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr "  %.250s tilbyr %.250s, men oppsettet skal fjernast.\n"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr ""
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "%s (underprosess): %s\n"
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "fann ikkje «%.255s» (i «%.255s»)"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "klarte ikkje køyra %s"
+
+#, fuzzy
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "klarte ikkje laga sikringskopi av den symbolske lenkja «%.255s»"
+
+#, fuzzy
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "klarte ikkje installera «%.250s» som «%.250s»"
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "feil ved skriving av «%s»"
+
+#, fuzzy
+#~ msgid "unable to read %s: %s"
+#~ msgstr "klarte ikkje køyra %s"
+
+#, fuzzy
+#~ msgid "unable to close %s: %s"
+#~ msgstr "klarte ikkje køyra %s"
+
+#, fuzzy
+#~ msgid "cannot write %s: %s"
+#~ msgstr "klarte ikkje køyra %s"
+
+#, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "finn ikkje %s «%.250s»"
 
@@ -6030,9 +6087,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "hoppa over medlemsdata frå %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "klarte ikkje køyra «tar»"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "klarte ikkje laga mellombels katalognamn"
Binary files dpkg/po/pa.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/pa.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/pa.po /home/vorlon/devel/multiarch/dpkg-debian/po/pa.po
--- dpkg/po/pa.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/pa.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2006-12-25 08:23+0530\n"
 "Last-Translator: A S Alam <apbrar@gmail.com>\n"
 "Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n"
@@ -24,7 +24,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
@@ -44,71 +44,76 @@
 msgid "ar member file (%s)"
 msgstr "%s ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+msgid "failed to seek %s"
+msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: ਡੀਕਪ੍ਰੈਸ਼ਨ"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr ""
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: ਅੰਦਰੂਨ gzip ਗਲਤੀ: `%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: ਅੰਦਰੂਨ gzip ਗਲਤੀ: `%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: ਅੰਦਰੂਨ gzip ਗਲਤੀ: `%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: ਅੰਦਰੂਨ gzip ਗਲਤੀ: `%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: ਅੰਦਰੂਨ gzip ਗਲਤੀ: `%s'"
@@ -123,133 +128,133 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: ਅੰਦਰੂਨ gzip ਗਲਤੀ: `%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: ਅੰਦਰੂਨ gzip ਗਲਤੀ: `%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: ਅੰਦਰੂਨ gzip ਗਲਤੀ: `%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: ਅੰਦਰੂਨ gzip ਗਲਤੀ: `%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
 "max=%d)"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 msgid "dpkg status database"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr ""
@@ -269,88 +274,90 @@
 msgid "unable to open directory '%s'"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr ""
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr ""
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "%s `%%.255s' ਲਈ ਫੇਲ੍ਹ"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "%s `%%.255s' ਲਈ ਫੇਲ੍ਹ"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr ""
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 msgid "out of memory for new error context"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -359,34 +366,34 @@
 "%s: ਸਾਫ਼ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, c-format
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: ਸਾਫ਼ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr ""
 "%s: ਸਾਫ਼ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s: ਅੰਦਰੂਨ gzip ਗਲਤੀ: `%s'"
@@ -402,185 +409,185 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "  %.250s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।\n"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "%s ਬਾਅਦ ਕੂੜਾ"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "ਗਲਤ ਪੈਕੇਜ ਨਾਂ (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr ""
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr ""
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error closing %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "%.250s ਬੰਦ ਕਰਨ 'ਚ ਗਲਤੀ"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr ""
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "conffiles ਫਾਇਲ ਅਪਵਾਦ ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr ""
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " bad version relationship %c%c"
 msgstr ""
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " `%c' is obsolete, use `%c=' or `%c%c' instead"
 msgstr ""
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " implicit exact match on version number, suggest using `=' instead"
 msgstr ""
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr ""
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr ""
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr ""
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr ""
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr ""
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr ""
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr ""
@@ -636,7 +643,7 @@
 msgid "unable to write to status fd %d"
 msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 msgid "malloc failed (%zu bytes)"
 msgstr "(ਕੁੱਲ %lu ਬਾਈਟ)\n"
@@ -646,8 +653,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "(ਕੁੱਲ %lu ਬਾਈਟ)\n"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 #, fuzzy
 msgid "failed to allocate memory"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
@@ -681,200 +688,205 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr ""
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr ""
 "\n"
 "ਸੰਰਚਨਾ ਫਾਇਲ `%s'"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr ""
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "ਅਣਜਾਣ ਚੋਣ `%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "--%s needs <name>"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "conffiles ਫਾਇਲ ਅਪਵਾਦ ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "ਅਣਜਾਣੀ ਚੋਣ --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "ਅਣਜਾਣੀ ਚੋਣ -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr ""
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "ਅਣਜਾਣੀ ਚੋਣ --%s"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr ""
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "`%s' ਖੇਤਰ ਦਾ ਦੂਹਰਾ ਮੁੱਲ"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr ""
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr ""
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr ""
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid " package `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr " ਪੈਕੇਜ `%.255s'"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr ""
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr ""
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
 #, c-format
-msgid "EOF during value of field `%.*s' (missing final newline)"
+msgid "blank line in value of field '%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:434
-msgid "several package info entries found, only one allowed"
+#: lib/dpkg/parse.c:461
+#, c-format
+msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
+#: lib/dpkg/parse.c:546
+msgid "several package info entries found, only one allowed"
 msgstr ""
 
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr ""
@@ -893,61 +905,61 @@
 " %.255s"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 msgid "must start with an alphanumeric character"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<none>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 msgid "invalid character in version number"
 msgstr "ਵਰਜਨ ਨੰਬਰ"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "%s ਗੁੰਮ ਹੈ"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "%s ਲਈ ਖਾਲੀ ਮੁੱਲ"
@@ -966,50 +978,50 @@
 msgid "(no description available)"
 msgstr "(ਕੋਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀਂ)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, fuzzy, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "`%s' ਜਾਂਚ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr ""
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr ""
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr ""
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "ਸ਼ੈੱਲ ਫੇਲ੍ਹ ਹੋ ਲੈ ਦਿਓ"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, c-format
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr ""
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ""
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr ""
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "ਸ਼ੈੱਲ ਫੇਲ੍ਹ ਹੋ ਲੈ ਦਿਓ"
@@ -1029,197 +1041,203 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, fuzzy, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 msgid "triggers area"
 msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, fuzzy, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, fuzzy, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, fuzzy, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, fuzzy, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "%.250s ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, fuzzy, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, fuzzy, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, fuzzy, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, fuzzy, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, fuzzy, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:419
-#, fuzzy, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, fuzzy, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "`%.250s' ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
+
+#: lib/dpkg/triglib.c:360
 #, fuzzy, c-format
-msgid "unable to install new trigger interest file `%.250s'"
+msgid "unable to create new trigger interest file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:383
+#, fuzzy, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, fuzzy, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, fuzzy, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, fuzzy, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, fuzzy, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, fuzzy, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, fuzzy, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, fuzzy, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, fuzzy, c-format
 msgid "read error in `%.250s'"
@@ -1244,7 +1262,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr ""
 
@@ -1263,12 +1281,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr ""
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr ""
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr ""
@@ -1319,109 +1337,124 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr ""
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "unable to read %s: %s"
+msgid "cannot stat file '%s'"
+msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr ""
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr ""
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
 "nondirectory"
 msgstr ""
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr ""
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr ""
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr ""
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr ""
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr ""
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr ""
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr ""
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr ""
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr ""
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1430,87 +1463,87 @@
 "dpkg: ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਨੇ %s ਨੂੰ ਹਟਾਉਣ ਤੋਂ ਰੋਕਿਆ:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
 " package %s, to enable %s."
 msgstr ""
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable %s.\n"
 msgstr ""
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, fuzzy, c-format
 msgid "removal of %.250s"
 msgstr "%.250s ਪੜ੍ਹਨ 'ਚ ਗਲਤੀ"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr ""
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr ""
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr ""
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr ""
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1519,143 +1552,143 @@
 "ਪੈਕੇਜ %s ਦੀ ਜਾਂਚ ਫੇਲ੍ਹ ਹੋਈ\n"
 "ਪਰ ਤੁਹਾਡੀ ਮੰਗ ਅਨੁਸਾਰ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr ""
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr ""
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr ""
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr ""
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr ""
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr ""
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr ""
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr ""
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
+#: src/archives.c:1367
 #, c-format
-msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1359
+#: src/archives.c:1371
 #, c-format
-msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr ""
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr ""
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
 "of backup copy"
 msgstr ""
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr ""
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr ""
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr ""
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "%s ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1663,147 +1696,147 @@
 "Installing new config file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "ਸੰਰਚਨਾ ਫਾਇਲ %s ਦਾ ਨਵਾਂ ਵਰਜਨ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr ""
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr ""
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr ""
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
 " cannot configure (current status `%.250s')"
 msgstr ""
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
 "%s"
 msgstr ""
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
 "%s"
 msgstr ""
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
 msgstr ""
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "%s (%s) ਸੈੱਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
 " (= '%s'): %s"
 msgstr ""
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
 " (= '%s')"
 msgstr ""
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
 " (= '%s'): %s"
 msgstr ""
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
 " ('%s' is a symlink to '%s')"
 msgstr ""
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr ""
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1812,12 +1845,12 @@
 "\n"
 "ਸੰਰਚਨਾ ਫਾਇਲ `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (ਅਸਲ `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1825,58 +1858,58 @@
 " ==> File also in package provided by package maintainer.\n"
 msgstr ""
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
 "     Not modified since installation.\n"
 msgstr ""
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
 " ==> Modified (by you or by a script) since installation.\n"
 msgstr ""
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
 " ==> Deleted (by you or by a script) since installation.\n"
 msgstr ""
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr ""
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr ""
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr ""
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr ""
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1886,157 +1919,157 @@
 "      Z     : start a shell to examine the situation\n"
 msgstr ""
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਵਰਜਨ ਨੂੰ ਰੱਖਣ ਲਈ ਮੂਲ ਕਾਰਵਾਈ ਹੈ।\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " ਨਵੇਂ ਵਰਜਨ ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਮੂਲ ਕਾਰਵਾਈ ਹੈ।\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[default=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[default=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr ""
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr ""
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr ""
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, fuzzy, c-format
 msgid "%s depends on %s"
 msgstr " ਨਿਰਭਰ ਹੈ "
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, fuzzy, c-format
 msgid "%s pre-depends on %s"
 msgstr " ਪਹਿਲਾਂ ਨਿਰਭਰ ਹੈ "
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, fuzzy, c-format
 msgid "%s recommends %s"
 msgstr " ਸਿਫਾਰਸ਼ੀ "
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, fuzzy, c-format
 msgid "%s suggests %s"
 msgstr " ਸੁਝਾਅ "
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, fuzzy, c-format
 msgid "%s breaks %s"
 msgstr " ਬਰੇਕ "
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, fuzzy, c-format
 msgid "%s conflicts with %s"
 msgstr " ਅਪਵਾਦ ਹੈ "
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr ""
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s ਹਟਾਇਆ ਜਾਵੇਗਾ।\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s ਇੰਸਟਾਲ ਹੈ, ਪਰ ਵਰਜਨ %.250s ਹੈ।\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr ""
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s %s ਹੈ।\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s %.250s ਦਿੰਦਾ ਹੈ, ਪਰ %s ਹੈ।\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (ਵਰਜਨ %.250s) ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਵੇਗਾ।\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, fuzzy, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (ਵਰਜਨ %.250s) %s ਹੈ।\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s %.250s ਦਿੰਦਾ ਹੈ ਅਤੇ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਵੇਗਾ।\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, fuzzy, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s %.250s ਦਿੰਦਾ ਹੈ ਅਤੇ %s ਹੈ\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+msgid "Use --help for help about diverting files."
 msgstr ""
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2044,7 +2077,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "ਡੇਬੀਅਨ %s ਵਰਜਨ %s\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2059,8 +2092,8 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2068,7 +2101,7 @@
 "later for copying conditions. There is NO warranty.\n"
 msgstr ""
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2078,7 +2111,7 @@
 "Usage: %s [<option> ...] <command>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2090,7 +2123,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -2133,7 +2166,7 @@
 "Package preinst/postrm scripts should always specify --package and --"
 "divert.\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2142,157 +2175,151 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "unable to read %s: %s"
-msgid "cannot stat file '%s'"
-msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error checking `%s': %s"
 msgid "error checking '%s'"
 msgstr "`%s' ਜਾਂਚ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "unable to write %s: %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr ""
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 msgid "unable to remove copied source file '%s'"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr ""
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 #| msgid "  Version of %s on system is %s.\n"
 msgid "local diversion of %s to %s"
 msgstr "  %s ਦਾ ਸਿਸਟਮ ਉੱਤੇ %s ਵਰਜਨ ਹੈ।\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "  Version of %s on system is %s.\n"
 msgid "diversion of %s by %s"
 msgstr "  %s ਦਾ ਸਿਸਟਮ ਉੱਤੇ %s ਵਰਜਨ ਹੈ।\n"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 #| msgid "  Version of %s on system is %s.\n"
 msgid "diversion of %s to %s by %s"
 msgstr "  %s ਦਾ ਸਿਸਟਮ ਉੱਤੇ %s ਵਰਜਨ ਹੈ।\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "Debian %s version %s.\n"
 msgid "any diversion of %s"
 msgstr "ਡੇਬੀਅਨ %s ਵਰਜਨ %s\n"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 #| msgid "  Version of %s on system is %s.\n"
 msgid "any diversion of %s to %s"
 msgstr "  %s ਦਾ ਸਿਸਟਮ ਉੱਤੇ %s ਵਰਜਨ ਹੈ।\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "unable to write %s: %s"
 msgid "cannot create new %s file"
 msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr ""
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 #| msgid "error reading conffiles file"
 msgid "error creating new diversions-old"
 msgstr "conffiles ਫਾਇਲ ਅਪਵਾਦ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr ""
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr ""
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "ਫਾਇਲ ਨਾਂ \"%s\" ਪੂਰਾ ਨਹੀਂ ਹੈ"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr ""
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr ""
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "ਫਾਇਲ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "`%s' ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "`%s' ਜੋੜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr ""
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2300,7 +2327,7 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2308,17 +2335,17 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "`%s' ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr ""
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr ""
 
@@ -2382,8 +2409,8 @@
 msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr ""
@@ -2467,7 +2494,7 @@
 msgid "--compare-versions bad relation"
 msgstr ""
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr ""
@@ -2514,48 +2541,48 @@
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
 "currently installed."
 msgstr ""
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 msgid "reading files list for package '%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(ਡਾਟਾਬੇਸ ਪੜ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2563,32 +2590,32 @@
 msgstr[0] "%d ਫਾਇਲਾਂ ਅਤੇ ਡਾਇਰੈਕਟਰੀਆਂ ਇਸ ਸਮੇਂ ਇੰਸਟਾਲ ਹਨ।)\n"
 msgstr[1] "%d ਫਾਇਲਾਂ ਅਤੇ ਡਾਇਰੈਕਟਰੀਆਂ ਇਸ ਸਮੇਂ ਇੰਸਟਾਲ ਹਨ।)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2626,7 +2653,7 @@
 msgstr "ਇੰਸਟਾਲ ਹੋਇਆ"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr ""
 
 #: src/help.c:129
@@ -2655,7 +2682,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 msgid "unable to setenv for subprocesses"
 msgstr ""
 
@@ -2665,65 +2692,65 @@
 msgstr ""
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr ""
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr ""
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "ਪੁਰਾਣੀ %s ਸਕ੍ਰਿਪਟ"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr ""
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "ਨਵੀਂ %s ਸਕ੍ਰਿਪਟ"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "ਪੁਰਾਣੀ %s ਸਕ੍ਰਿਪਟ"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "%s ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr ""
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr ""
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr ""
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2732,7 +2759,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "ਜਾਣਕਾਰੀ ਡਾਇਰੈਕਟਰੀ ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
@@ -2797,7 +2824,7 @@
 "  -Dh|--debug=help                 Show help on debugging.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -2912,7 +2939,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -2953,30 +2980,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -2985,101 +3016,101 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 msgid "Turn all dependency problems into warnings"
 msgstr ""
 "dpkg: ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਨੇ %s ਨੂੰ ਹਟਾਉਣ ਤੋਂ ਰੋਕਿਆ:\n"
 "%s"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 msgid "Turn dependency version problems into warnings"
 msgstr ""
 "dpkg: ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਨੇ %s ਨੂੰ ਹਟਾਉਣ ਤੋਂ ਰੋਕਿਆ:\n"
 "%s"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 msgid "Invocation and status of maintainer scripts"
 msgstr ""
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 msgid "Output for each configuration file"
 msgstr ""
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3087,7 +3118,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3095,35 +3126,35 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr ""
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3132,7 +3163,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3140,12 +3171,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr ""
@@ -3168,8 +3199,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr ""
 
@@ -3327,198 +3358,198 @@
 msgid "passed\n"
 msgstr "ਪਾਸ ਹੋਇਆ\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr ""
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr ""
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr ""
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr "ਪੈਕੇਜ `%s' 'ਚ ਕੋਈ ਫਾਇਲ ਨਹੀਂ ਹੈ (!)\n"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr ""
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "ਕੰਟਰੋਲ ਜਾਣਕਾਰੀ ਲੰਬਾਈ"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr ""
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr ""
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
 "%s"
 msgstr ""
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr ""
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr ""
 "dpkg: ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਨੇ %s ਨੂੰ ਹਟਾਉਣ ਤੋਂ ਰੋਕਿਆ:\n"
 "%s"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr ""
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr ""
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "%.250s ਪੜ੍ਹਨ 'ਚ ਗਲਤੀ"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "%.250s ਬੰਦ ਕਰਨ 'ਚ ਗਲਤੀ"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr ""
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr ""
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, fuzzy, c-format
 msgid "De-configuring %s ...\n"
 msgstr "%s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr ""
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr ""
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr ""
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
 "'%.250s')"
 msgstr ""
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
@@ -3675,7 +3706,7 @@
 "  -f|--showformat=<format>         Use alternative format for --show.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3689,6 +3720,10 @@
 "  case left alignment will be used.\n"
 msgstr ""
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3741,53 +3776,54 @@
 msgid "Removing %s ...\n"
 msgstr "%s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
 "may be a mount point?"
 msgstr ""
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "`%.250s' ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "`%.250s' ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr ""
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr ""
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "ਪੁਰਾਣੀ ਫਾਇਲ ਸੂਚੀ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr ""
 
@@ -3830,7 +3866,11 @@
 msgid "read error on standard input"
 msgstr ""
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -3840,7 +3880,7 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -3851,7 +3891,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -3879,52 +3919,52 @@
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr ""
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr ""
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr ""
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr ""
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr ""
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr ""
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr ""
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr ""
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr ""
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr ""
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr ""
 
@@ -3988,16 +4028,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "ਡੇਬੀਅਨ `%s' ਪੈਕੇਜ ਮੈਨਜੇਮਿੰਟ ਪਰੋਗਰਾਮ ਵਰਜਨ %s ਹੈ।\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4007,7 +4047,7 @@
 "Usage: %s [<option> ...] <command>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4016,7 +4056,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4030,30 +4070,30 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr ""
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "ਗਲਤ ਪੈਕੇਜ ਨਾਂ (%.250s)"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "ਗਲਤ ਪੈਕੇਜ ਨਾਂ (%.250s)"
@@ -4082,36 +4122,36 @@
 msgstr ""
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
-msgstr ""
+#, fuzzy, c-format
+msgid "--%s needs exactly one Packages-file argument"
+msgstr "--%s needs <name>"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr ""
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr ""
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4222,8 +4262,8 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
@@ -4255,24 +4295,24 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 msgid "failed to make temporary file (%s)"
 msgstr "%s ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control"
 msgid "control member"
 msgstr "ਕੰਟਰੋਲ"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "%s ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 msgid "failed to rewind temporary file (%s)"
 msgstr "%s ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
@@ -4287,19 +4327,19 @@
 msgid "error writing `%s'"
 msgstr "`%s' ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "ਮੈਂਬਰਾਂ 'ਚ"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "%s ਬਣਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4317,68 +4357,68 @@
 msgid "error reading %s from file %.255s"
 msgstr ""
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 msgid "archive magic version number"
 msgstr "ਵਰਜਨ ਨੰਬਰ"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 msgid "archive member header"
 msgstr ""
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, c-format
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr ""
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 msgid "archive information header member"
 msgstr ""
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr ""
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr ""
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "control area"
 msgid "skipped archive member data from %s"
 msgstr "ਕੰਟਰੋਲ ਏਰੀਆ"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, c-format
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, c-format
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4390,22 +4430,22 @@
 " ਨਵਾਂ ਡੇਬੀਅਨ ਪੈਕੇਜ, ਵਰਜਨ %s।\n"
 " ਆਕਾਰ %ld ਬਾਈਟ: ਕੰਟਰੋਲ ਅਰਾਚੀਵ: %zi ਬਾਈਟ।\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, c-format
 msgid "archive has malformatted control member size '%s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "control area"
 msgid "skipped archive control member data from %s"
 msgstr "ਕੰਟਰੋਲ ਏਰੀਆ"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4417,154 +4457,155 @@
 " ਨਵਾਂ ਡੇਬੀਅਨ ਪੈਕੇਜ, ਵਰਜਨ %s।\n"
 " ਆਕਾਰ %ld ਬਾਈਟ: ਕੰਟਰੋਲ ਅਰਾਚੀਵ: %zi ਬਾਈਟ।\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, 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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "ਡਾਟਾ"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "ਡਾਇਰੈਕਟਰੀ ਬਦਲਣ ਲਈ ਫੇਲ੍ਹ"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਬਾਅਦ ਇਸ 'ਚ ਜਾਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "ਡਾਇਰੈਕਟਰੀ ਬਦਲਣ ਲਈ ਫੇਲ੍ਹ"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s: ਡੀਕਪ੍ਰੈਸ਼ਨ"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 #, fuzzy
 msgid "paste"
 msgstr "ਪਾਸ ਹੋਇਆ\n"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr ""
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
 "Perhaps you should be using dpkg --install ?"
 msgstr ""
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr ""
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr ""
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr ""
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
 msgid "control file '%s'"
 msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr ""
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     not a plain file          %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr ""
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "%.250s ਬੰਦ ਕਰਨ 'ਚ ਗਲਤੀ"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "ਫਾਰਮੈਟ 'ਚ ਗਲਤੀ"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr ""
 
@@ -4574,7 +4615,19 @@
 msgstr ""
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4585,6 +4638,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4600,7 +4655,7 @@
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4609,11 +4664,12 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4637,7 +4693,7 @@
 "                                     Allowed values: gzip, bzip2, none.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4646,23 +4702,23 @@
 "unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
 msgstr ""
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "ਗਲਤ ਪੈਕੇਜ ਨਾਂ (%.250s)"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr ""
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr ""
@@ -4682,7 +4738,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr ""
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "%.250s ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
@@ -4768,47 +4824,52 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr ""
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+msgid "package architecture"
+msgstr " (ਪੈਕੇਜ: "
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr ""
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr ""
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -4828,6 +4889,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -4850,12 +4912,19 @@
 "    Part file size (used portion):  %lu bytes\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<unknown>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr ""
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr ""
@@ -4887,7 +4956,7 @@
 msgid "split package part"
 msgstr "ਗੁੰਮ ਪੈਕੇਜ"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "ਮੁਕੰਮਲ\n"
@@ -4939,17 +5008,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Options:\n"
 "  --depotdir <directory>           Use <directory> instead of %s/%s.\n"
@@ -4961,20 +5039,29 @@
 "\n"
 "Exit status: 0 = OK;  1 = -a is not a part;  2 = trouble!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr ""
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr ""
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr ""
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -5085,42 +5172,42 @@
 msgid "Deleted %s.\n"
 msgstr "%s ਹਟਾਇਆ।\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr ""
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr ""
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr ""
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr ""
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 
@@ -5246,361 +5333,358 @@
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 #, fuzzy
 #| msgid "parse error"
 msgid "error"
 msgstr "ਪਾਰਸ ਗਲਤੀ"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "unable to read %s: %s"
-msgid "cannot stat %s: %s"
-msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr ""
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:420
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-msgid "failed to execute %s: %s"
-msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, fuzzy, c-format
 msgid "%s corrupt: %s"
 msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ: %s ਨਿਕਾਰਾ: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "ਦੁਹਰਾ ਸਲੇਵ %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr ""
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "ਦੁਹਰਾ ਮਾਰਗ %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr ""
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 #, fuzzy
 msgid "priority"
 msgstr "ਤਰਜੀਹ %s %s"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, fuzzy, c-format
 msgid "priority of %s: %s"
 msgstr "ਤਰਜੀਹ %s %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr ""
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, fuzzy, c-format
 msgid "  link currently points to %s"
 msgstr " ਸਬੰਧ %s ਨੂੰ ਇਸ਼ਾਰਾ ਕਰਦਾ ਹੈ"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 #, fuzzy
 msgid "  link currently absent"
 msgstr " ਸਬੰਧ ਇਸ ਸਮੇਂ ਮੌਜੂਦ ਨਹੀਂ"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "%s - priority %s"
 msgid "%s - priority %d"
 msgstr "%s - ਤਰਜੀਹ %s"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr " ਸਲੇਵ %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "%s ਦਾ ਮੌਜੂਦਾ`best' ਵਰਜਨ ਹੈ।"
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "ਕੋਈ ਵਰਜਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "ਵੇਰਵਾ"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 #, fuzzy
 msgid "Priority"
 msgstr "ਤਰਜੀਹ %s %s"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "%s ਲਈ ਕੋਈ ਬਦਲ ਨਹੀਂ ਹੈ।"
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr ""
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr ""
+
+#: utils/update-alternatives.c:2254
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr ""
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr ""
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "ਲਾਜ਼ਮੀ ਮੁੱਲ `%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install needs <link> <name> <path> <priority>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "ਤਰਜੀਹ ਇੱਕ ਪੂਰਨ ਅੰਕ ਹੀ ਚਾਹੀਦਾ ਹੈ"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s needs <name> <path>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s needs <name>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave only allowed with --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave needs <link> <name> <path>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s needs <name>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "ਅਣਜਾਣ ਚੋਣ `%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -5609,132 +5693,109 @@
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 
-#: utils/update-alternatives.c:2215
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr ""
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr ""
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
-
-#: utils/update-alternatives.c:2257
-#, fuzzy, c-format
-msgid "it is a slave of %s"
-msgstr " ਸਲੇਵ %s: %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr ""
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, fuzzy, c-format
 msgid "no alternatives for %s."
 msgstr "%s ਲਈ ਕੋਈ ਬਦਲ ਨਹੀਂ ਹੈ।"
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
 "updates only."
 msgstr ""
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, fuzzy, c-format
 msgid "setting up automatic selection of %s."
 msgstr "%s ਲਈ ਆਟੋਮੈਟਿਕ ਚੋਣ ਸੈਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr ""
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "%s ਲਈ ਆਟੋਮੈਟਿਕ ਅੱਪਡੇਟ ਆਯੋਗ ਹੈ, ਇਸ ਨੂੰ ਇੱਕਲਾ ਛੱਡਿਆ ਜਾਂਦਾ ਹੈ"
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "  %.250s %s ਹੈ।\n"
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~ msgid "it is a slave of %s"
+#~ msgstr " ਸਲੇਵ %s: %s"
+
+#, fuzzy
+#~| msgid "unable to read %s: %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
Binary files dpkg/po/pl.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/pl.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/pl.po /home/vorlon/devel/multiarch/dpkg-debian/po/pl.po
--- dpkg/po/pl.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/pl.po	2012-06-07 10:11:09.426073000 -0700
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2009-11-14 17:45+0100\n"
 "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10-n-polish@lists.debian.org>\n"
@@ -28,7 +28,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "nie można otworzyć pliku źródłowego \"%.255s\""
@@ -50,71 +50,77 @@
 msgid "ar member file (%s)"
 msgstr "nie można ustalić stanu tymczasowego pliku (sekcja data)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "błąd w buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "błąd w buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "krótki odczyt w buffer_copy (%s)"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "nie można wywołać \"tar\""
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "nie można wykonać %s"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekompresja"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: kompresja"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: wewnętrzny błąd gzip: \"%s\""
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: wewnętrzny błąd gzip: \"%s\""
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: wewnętrzny błąd gzip: \"%s\""
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: wewnętrzny błąd gzip: \"%s\""
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: wewnętrzny błąd gzip: \"%s\""
@@ -129,31 +135,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: wewnętrzny błąd bzip2: \"%s\""
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: wewnętrzny błąd bzip2: \"%s\""
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: wewnętrzny błąd bzip2: \"%s\""
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: wewnętrzny błąd bzip2: \"%s\""
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -162,44 +168,44 @@
 "katalog \"updates\" zawiera plik \"%.250s\" o zbyt długiej nazwie (długość="
 "%d, maksymalnie=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 "katalog \"updates\" zawiera pliki z nazwami o różnej długości (%d oraz %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "nie można przeszukać katalogu \"updates\" %.255s"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "nie można usunąć pliku %.255s z katalogu \"updates\""
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "nie można utworzyć \"%.255s\""
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "nie można wypełnić pliku %.250s"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "nie można opróżnić buforów pliku %.250s po jego wypełnieniu"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "nie można przewinąć na początek pliku %.250s po jego wypełnieniu"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "%s: unable to open conffile %s for hash: %s"
 msgid "unable to open lock file %s for testing"
@@ -207,63 +213,63 @@
 "%s: nie można otworzyć pliku konfiguracyjnego %s dla sprawdzenia sumy "
 "kontrolnej: %s"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "nie można otworzyć/utworzyć pliku blokującego bazę danych stanu dpkg"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "brak praw do zablokowania bazy danych stanu dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "nie można zablokować bazy danych stanu dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "żądana operacja wymaga uprawnień administratora"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "brak dostępu do sekcji stanu dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "operacja wymaga uprawnień zapisu/odczytu sekcji stanu dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "nie można usunąć uaktualnionego pliku %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "nie można zapisać uaktualnionego pliku \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "nie można opróżnić buforów uaktualnionego pliku \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "nie można obciąć uaktualnionego pliku \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "nie można zsynchronizować uaktualnionego pliku \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "nie można zamknąć uaktualnionego pliku \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "nie można zainstalować uaktualnionego pliku \"%.250s\""
@@ -284,74 +290,76 @@
 msgid "unable to open directory '%s'"
 msgstr "nie można otworzyć pliku źródłowego \"%.255s\""
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "nie można otworzyć pliku źródłowego \"%.255s\""
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "nie można otworzyć pliku źródłowego \"%.255s\""
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "nie można ustalić stanu pliku części \"%.250s\""
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "nie można zapisać szczegółów o \"%.50s\" w \"%.250s\""
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "nie można otworzyć \"%.250s\" w celu zapisania informacji %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "nie można ustawić buforowania pliku statusu"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "nie można zapisać rekordu \"%s\" dotyczącego \"%.50s\" w \"%.250s\""
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "nie można opróżnić buforów informacji %s w \"%.250s\""
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "nie można zsynchronizować informacji %s w \"%.250s\""
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "nie można zamknąć \"%.250s\" po zapisaniu informacji %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "nie można utworzyć dowiązania z \"%.250s\" do \"%.250s\", aby przechować "
 "informację %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 "nie można błąd zainstalować \"%.250s\" jako \"%.250s\" o zawartej informacji "
 "%s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -360,7 +368,7 @@
 "%s: nienaprawialny błąd krytyczny, przerywanie:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -372,13 +380,13 @@
 "%s: nienaprawialny błąd krytyczny, przerywanie:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "brak pamięci na nową pozycję dla obsługi czyszczenia środowiska"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -387,33 +395,33 @@
 "%s: błąd podczas czyszczenia środowiska:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: za dużo osadzonych błędów podczas obsługi błędu!!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "brak pamięci na nową pozycję dla obsługi czyszczenia środowiska"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 "brak pamięci na nową pozycję z argumentami dla obsługi czyszczenia środowiska"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s: ostrzeżenie: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: ostrzeżenie: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: wewnętrzny błąd: %s\n"
@@ -429,98 +437,98 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "\"%.*s\" jest niedozwolony dla %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "śmieci po %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "niepoprawna nazwa pakietu (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "puste pole opisu pliku \"%s\""
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "pole opisu pliku \"%s\" jest niedozwolone w pliku statusu"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "za dużo danych w polu opisu pliku \"%s\" (w porównaniu z innymi)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "za mało danych w polu opisu pliku \"%s\" (w porównaniu z innymi)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "yes/no w polu boolean"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "słowo w polu \"priority\""
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "niedozwolona wartość w tym kontekście dla pola \"status\""
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "pierwsze (want) słowo w polu \"status\""
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "drugie (error) słowo w polu \"status\""
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "trzecie (status) słowo w polu \"status\""
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "błąd w polu Version \"%.250s\": %.250s"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr ""
 "użyto niewykorzystywanego już pola \"Revision\" lub \"Package-Revision\""
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "wartość dla pola \"config-version\" jest niedozwolona w tym kontekście"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "błąd w polu Config-Version \"%.250s\": %.250s"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "wartość dla \"conffiles\" ma niepoprawną linię \"%.*s\""
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 "wartość dla \"conffiles\" ma linię rozpoczętą od znaku niebędącego spacją "
 "\"%c\""
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "katalog główny lub pusty jest użyty jako \"conffile\""
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -528,12 +536,12 @@
 "pole \"%s\", brak nazwy pakietu lub śmieci w miejscu, gdzie spodziewano się "
 "nazwy pakietu"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "pole \"%s\", błędna nazwa pakietu \"%.255s\": %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -542,7 +550,7 @@
 "pole \"%s\", w odniesieniu do \"%.255s\":\n"
 " zły numer wersji relacji %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -551,7 +559,7 @@
 "pole \"%s\", w odniesieniu do \"%.255s\":\n"
 " \"%c\" jest już niewykorzystywane, należy użyć w zamian \"%c=\" lub \"%c%c\""
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -561,11 +569,11 @@
 " wykorzystany jest konkretny numer wersji przy porównywaniu, należy użyć w "
 "zamian \"=\""
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "W polu Provides można używać wyłącznie dokładnych wersji"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -575,57 +583,57 @@
 " numer wersji nie rozpoczyna się od znaku alfanumerycznego, należy dodać "
 "spację"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "pole \"%s\", w odniesieniu do \"%.255s\": numer wersji zawiera \"%c\""
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "pole \"%s\", w odniesieniu do \"%.255s\": numer wersji niezakończony"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr ""
 "pole \"%s\", w odniesieniu do \"%.255s\": błąd w numerze wersji: %.255s"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "pole \"%s\", błąd składni po odniesieniu do pakietu \"%.255s\""
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "wybór (\"|\") niedozwolony dla pola %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "wartość w polu \"triggers-pending\" jest niedozwolona w tym kontekście"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "nieprawidłowa nazwa zaplanowanego wyzwalacza \"%.255s\": %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "powielona nazwa zaplanowanego wyzwalacza \"%.255s\""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "wartość w polu \"triggers-awaited\" jest niedozwolona w tym kontekście"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "nieprawidłowa nazwa pakietu w oczekującym wyzwalaczu \"%.255s\": %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "powielony pakiet oczekującego wyzwalacza \"%.255s\""
@@ -682,7 +690,7 @@
 msgid "unable to write to status fd %d"
 msgstr "nie można zapisać statusu do fd %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "malloc failed (%ld bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -694,8 +702,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "nie można wykonać funkcji \"realloc\" (%ld bajtów)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "nie można zaalokować pamięci"
 
@@ -728,206 +736,212 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "nie można ustawić flagi close-on-exec dla \"%.250s\""
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "błąd konfiguracji: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "nie można otworzyć do odczytu pliku konfiguracyjnego \"%.255s\": %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "niesparowane cudzysłowy w \"%s\""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "nieznana opcja \"%s\""
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "opcja \"%s\" wymaga podania wartości"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "opcja \"%s\" nie przyjmuje żadnych wartości"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "błąd odczytu pliku konfiguracyjnego \"%.250s\""
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "błąd przy zamykaniu pliku konfiguracyjnego \"%.250s\""
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "błąd przy otwarciu katalogu konfiguracji \"%s\""
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "nieznana opcja --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "opcja --%s wymaga podania wartości"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "opcja --%s nie przyjmuje żadnych wartości"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "nieznana opcja -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "opcja -%c wymaga podania wartości"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "opcja -%c nie przyjmuje żadnych wartości"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "niewykorzystywana już opcja \"--%s\"\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "konflikt między działaniem -%c (--%s) i -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "powielona wartość pola \"%s\""
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "pole definiowane przez użytkownika ma zbyt krótką nazwę \"%.*s\""
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "powielona wartość pola definiowanego przez użytkownika \"%.*s\""
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Configured-Version dla pakietu z nieprawidłowym statusem"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "pakiet ma status %s, ale są oczekujące wyzwalacze"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "pakiet ma status triggers-awaited, ale brak oczekujących wyzwalaczy"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "pakiet ma status %s, ale są zaplanowane wyzwalacze"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "pakiet ma status triggers-pending, ale brak zaplanowanych wyzwalaczy"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Niezainstalowany pakiet ma pliki konfiguracyjne, informacje o nich zostają "
 "usunięte"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr ""
 "nie można otworzyć do odczytu pliku \"%.255s\" zawierającego informacje o "
 "pakiecie"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr ""
 "nie można wykonać funkcji \"stat\" na pliku informacji o pakiecie \"%.255s\""
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr ""
 "nie można wykonać funkcji \"mmap\" na pliku informacji o pakiecie \"%.255s\""
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr ""
 "nie można wykonać funkcji \"stat\" na pliku informacji o pakiecie \"%.255s\""
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "nie można zamknąć \"%.255s\""
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF po nazwie pola \"%.*s\""
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "koniec linii w nazwie pola \"%.*s\""
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS EOF (^Z) w nazwie pola \"%.*s\""
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "po nazwie pola \"%.*s\" musi wystąpić dwukropek"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF przed wartością pola \"%.*s\" (brak końca linii)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "MSDOS EOF w wartości pola \"%.*s\" (brak końca linii?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "koniec linii w nazwie pola \"%.*s\""
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF w wartości pola \"%.*s\" (brak końca linii)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 "odnaleziono kilka kopii informacji o pakiecie, tylko jedna jest dozwolona"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "nie można zamknąć \"%.255s\""
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "brak informacji o pakiecie w \"%.255s\""
@@ -956,66 +970,66 @@
 "%s, w pliku \"%.255s\" niedaleko linii %d\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "nie można użyć pustego ciągu znaków"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "musi się znaczynać od litery lub cyfry"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "znak \"%c\" jest niedozwolony (można użyć tylko liter, cyfr i \"%s\")"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<brak>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "ciąg znaków dla numeru wersji jest pusty"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "ciąg znaków dla numeru wersji zawiera spacje"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "epoka w numerze wersji nie jest liczbą"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "brak znaków po dwukropku w numerze wersji"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "brak znaków po dwukropku w numerze wersji"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "brak znaków po dwukropku w numerze wersji"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "brakujący %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "brak wartości dla %s"
@@ -1034,51 +1048,51 @@
 msgid "(no description available)"
 msgstr "(brak dostępnego opisu)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "nie można zignorować sygnału %s przed wykonaniem %.250s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "nie można odzyskać sygnału %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (podproces): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "nie można wykonać funkcji \"fork\""
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "podproces %s zwrócił kod błędu %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "błąd funkcji \"wait\" dla %s"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "podproces %s został zabity sygnałem (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", zrzut pamięci"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "podproces %s zgłosił błąd poprzez kod %d funkcji \"wait\""
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "błąd funkcji \"wait\" dla %s"
@@ -1101,63 +1115,55 @@
 msgstr ""
 "błąd składni w pliku wyzwalaczy odłożonych \"%.250s\" na pozycji \"%s\"%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr ""
 "nie można otworzyć/utworzyć pliku blokującego dla wyzwalaczy \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "wyzwalacz pobudzony"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "nie można ustalić stanu pliku wyzwalaczy odłożonych \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "nie można otworzyć pliku wyzwalaczy odłożonych \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 "nie można otworzyć/utworzyć nowego pliku wyzwalaczy odłożonych \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "błąd podczas odczytu pliku wyzwalaczy odłożonych \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "nie można zapisać nowego pliku wyzwalaczy odłożonych \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "nie można zamknąć nowego pliku wyzwalaczy odłożonych \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "nie można zainstalować nowego pliku wyzwalaczy odłożonych \"%.250s\""
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "puste nazwy wyzwalaczy są niedozwolone"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "nazwa wyzwalacza zawiera niepoprawny znak"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1166,20 +1172,20 @@
 "nieprawidłowa lub nieznana składnia nazwy wyzwalacza \"%.250s\" (w warunkach "
 "uruchomienia wyzwalacza dla pakietu \"%.250s\")"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr ""
 "nie udało się otworzyć pliku listy warunków uruchomienia wyzwalacza \"%.250s"
 "\""
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr ""
 "nie udało się przewinąć pliku warunków uruchomienia wyzwalacza \"%.250s\""
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1188,44 +1194,50 @@
 "błąd składni w pliku warunków uruchomienia wyzwalacza \"%.250s\" - "
 "nieprawidłowa nazwa pakietu \"%.250s\": %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr ""
-"nie można utworzyć nowego pliku warunków uruchomienia wyzwalacza \"%.250s\""
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr ""
 "nie można zapisać nowego pliku warunków uruchomienia wyzwalacza \"%.250s\""
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr ""
 "nie można zamknąć nowego pliku warunków uruchomienia wyzwalacza \"%.250s\""
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr ""
 "nie można zamknąć nowego pliku warunków uruchomienia wyzwalacza \"%.250s\""
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr ""
-"nie można zamknąć nowego pliku warunków uruchomienia wyzwalacza \"%.250s\""
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr ""
 "nie można zainstalować nowego pliku warunków uruchomienia wyzwalacza \"%.250s"
 "\""
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "nie można usunąć \"%.250s\""
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr ""
+"nie można utworzyć nowego pliku warunków uruchomienia wyzwalacza \"%.250s\""
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr ""
+"nie można zamknąć nowego pliku warunków uruchomienia wyzwalacza \"%.250s\""
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1233,48 +1245,48 @@
 "powielony warunek uruchomienia wyzwalacza plikowego dla pliku \"%.250s\" i "
 "pakietu \"%.250s\""
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "nie można utworzyć nowego pliku wyzwalaczy plikowych \"%.250s\""
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "nie można zapisać nowego pliku wyzwalaczy plikowych \"%.250s\""
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "nie można zamknąć nowego pliku wyzwalaczy plikowych \"%.250s\""
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "nie można zamknąć nowego pliku wyzwalaczy plikowych \"%.250s\""
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "nie można zamknąć nowego pliku wyzwalaczy plikowych \"%.250s\""
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr ""
 "nie można zainstalować nowego pliku wyzwalaczy plikowych jako \"%.250s\""
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "nie można odczytać pliku wyzwalaczy plikowych \"%.250s\""
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "błąd składni w pliku wyzwalaczy plikowych  \"%.250s\""
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1283,7 +1295,7 @@
 "opis wyzwalacza plikowego zawiera nieprawidłową nazwę pakietu \"%.250s\" (w "
 "warunku uruchomienia dla pliku \"%.250s\"): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1292,32 +1304,40 @@
 "plik informacji kontrolnych triggers \"%.250s\" ma nieprawidłową składnię w "
 "nazwie wyzwalacza \"%.250s\": %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "nie można otworzyć pliku informacji kontrolnych triggers \"%.250s\""
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 "plik informacji kontrolnych triggers zawiera niepoprawną składnię dyrektywy"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 "plik informacji kontrolnych triggers zawiera nieznaną dyrektywę \"%.250s\""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "nie można utworzyć katalogu stanu wyzwalaczy \"%.250s\""
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "nie można zmienić właściciela katalogu stanu wyzwalaczy \"%.250s\""
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "puste nazwy wyzwalaczy są niedozwolone"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "nazwa wyzwalacza zawiera niepoprawny znak"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1342,7 +1362,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "nie można odczytać potoku z \"dpkg-deb\""
 
@@ -1361,12 +1381,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "nie można zmienić właściciela dowiązania symbolicznego \"%.255s\""
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "nie można zmienić właściciela \"%.255s\""
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "nie można zmienić uprawnień \"%.255s\""
@@ -1424,17 +1444,27 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "archiwum zawiera obiekt \"%.255s\" nieznanego typu 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat file '%s'"
+msgstr "nie można ustalić stanu starego pliku \"%s\" : %s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Zastąpienie plików z poprzedniego pakietu %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Zastąpienie przez pliki z instalowanego pakietu %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1443,96 +1473,101 @@
 "próba nadpisania katalogu \"%.250s\" w pakiecie %.250s %.250s przez obiekt "
 "nie będący katalogiem"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "próba nadpisania \"%.250s\", który istnieje także w pakiecie %.250s %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "nie można utworzyć \"%.255s\" (podczas przetwarzania \"%.255s\")"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "uruchomiony dpkg-deb podczas \"%.255s\""
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "nie można zamknąć/zapisać \"%.255s\""
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "nie można utworzyć potoku \"%.255s\""
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "nie można utworzyć urządzenia \"%.255s\""
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "nie można utworzyć dowiązania \"%.255s\""
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "nie można utworzyć dowiązania symbolicznego \"%.255s\""
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "nie można utworzyć katalogu \"%.255s\""
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, 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:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "nie można odczytać dowiązania \"%.255s\""
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "nie można zrobić kopii dowiązania symbolicznego dla \"%.255s\""
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "nie można zmienić właściciela kopii dowiązania symbolicznego dla \"%.255s\""
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, 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:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "nie można zainstalować nowej wersji \"%.255s\""
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "nie można utworzyć \"%.255s\""
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "nie można wykonać funkcji \"setvbuf\" dla \"%.255s\""
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1541,7 +1576,7 @@
 "zignorowanie problemu z zależnościami w %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1550,7 +1585,7 @@
 "rozważanie dekonfiguracji istotnego\n"
 " pakietu %s, aby włączyć %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1559,7 +1594,7 @@
 "dpkg: niestety, %s jest istotnym pakietem, który nie zostanie\n"
 " zdekonfigurowany, aby włączyć %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1569,17 +1604,17 @@
 "może pomóc):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "usuwanie %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "instalowanie %.250s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1587,13 +1622,13 @@
 "dpkg: rozważanie dekonfiguracji %s, którego zależności zostałyby naruszone "
 "przez %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr ""
 "dpkg: tak, %s zostanie zdekonfigurowany (naruszenie zależności przez %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1602,11 +1637,11 @@
 "dpkg: w odniesieniu do %s zawierającego %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "zignorowanie naruszenia zależności, dalsze przetwarzanie!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1615,31 +1650,31 @@
 "instalacja %.250s narusza zależności %.250s, a\n"
 "nie pozwolono na dekonfigurację (--auto-deconfigure może pomóc)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 "instalacja %.250s wprowadzi niespełnione zależności w istniejącym "
 "oprogramowaniu"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: rozważanie usunięcia %s w zamian za %s ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1648,109 +1683,111 @@
 "dpkg: pakiet %s wymaga ponownej instalacji, ale zostanie usunięty według "
 "żądania.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: pakiet %s wymaga ponownej instalacji i nie zostanie usunięty.\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "konflikt pakietów - nie będzie instalowany %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "zignorowanie konfliktu, dalsze przetwarzanie!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, 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:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "nie można wykonać polecenia \"find\" dla --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "nie można utworzyć potoku dla \"find\""
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "nie można odczytać z potoku dla \"find\""
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "nie można zamknąć potoku dla \"find\""
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "wyszukiwanie --recursive zwróciło nieobsługiwany błąd %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "przeszukane, ale nie znaleziono żadnych pakietów (plików *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<standardowe wyjście>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<standardowe wyjście błędów>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Zaznaczenie poprzednio niezaznaczonego pakietu %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Pominięcie niezaznaczonego pakietu %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Wersja %.250s pakietu %.250s jest już zainstalowana.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "zastąpienie %.250s w wersji %.250s wcześniejszą wersją %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "Pakiet %.250s w wersji %.250s nie będzie zastąpiony wcześniejszą wersją "
 "%.250s.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1759,39 +1796,39 @@
 "nie można usunąć zainstalowanej nowej wersji \"%.250s\", aby umożliwić "
 "ponowną instalację kopii zapasowej"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "nie można odtworzyć kopii zapasowej \"%.250s\""
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "nie można odtworzyć kopii zapasowej \"%.250s\""
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "nie można usunąć nowo zainstalowanej wersji \"%.250s\""
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "nie można usunąć zainstalowanej nowej wersji \"%.250s\""
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "nie można ustalić stanu nowego pliku konfiguracyjnego \"%.250s\""
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "nie można ustalić stanu aktualnego pliku konfiguracyjnego \"%.250s\""
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1802,58 +1839,58 @@
 "Plik konfiguracyjny \"%s\" nie istnieje w systemie.\n"
 "Instalowanie nowego pliku konfiguracyjnego według żądania.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: nie można usunąć poprzedniej kopii \"%.250s\": %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: nie można zmienić nazwy \"%.250s\" na \"%.250s\": %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: nie można usunąć \"%.250s\": %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 #| msgid "%s: failed to remove old distrib version '%.250s': %s"
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: nie można usunąć poprzedniej wersji \"%.250s\": %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: nie można usunąć \"%.250s\" (przed nadpisaniem): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: nie można utworzyć dowiązania \"%.250s\" do \"%.250s\": %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Instalowanie nowej wersji pliku konfiguracyjnego %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "nie można zainstalować \"%.250s\" jako \"%.250s\""
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "pakiet \"%s\" nie jest zainstalowany, nie można go skonfigurować"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "pakiet %.250s jest już zainstalowany i skonfigurowany"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1862,7 +1899,7 @@
 "pakiet %.250s nie jest gotowy do skonfigurowania\n"
 " nie można go skonfigurować (bieżący stan \"%.250s\")"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1871,11 +1908,11 @@
 "dpkg: problemy z zależnościami uniemożliwiają skonfigurowanie %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemy z zależnościami - pozostawiony nieskonfigurowany"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1885,7 +1922,7 @@
 "żądania:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1893,12 +1930,12 @@
 "Pakiet jest w złym stanie - powinien zostać przeinstalowany\n"
 " przed próbą jego skonfigurowania."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Konfigurowanie %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1907,7 +1944,7 @@
 "%s: nie można ustalić stanu pliku konfiguracyjnego \"%s\"\n"
 " (= \"%s\"): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1916,7 +1953,7 @@
 "%s: plik konfiguracyjny \"%s\" jest zapętlonym dowiązaniem\n"
 " (= \"%s\")"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1925,7 +1962,7 @@
 "%s: nie można określić dowiązania do pliku konfiguracyjnego \"%s\"\n"
 " (= \"%s\"): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1934,37 +1971,37 @@
 "%s: plik konfiguracyjny \"%.250s\" jest dowiązaniem do błędnego pliku\n"
 " (\"%s\" jest dowiązaniem do \"%s\")"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: plik konfiguracyjny \"%.250s\" nie jest plikiem ani dowiązaniem (= \"%s"
 "\")"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "skrót md5"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr ""
 "%s: nie można otworzyć pliku konfiguracyjnego %s dla sprawdzenia sumy "
 "kontrolnej: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Należy wpisać \"exit\" po zakończeniu pracy.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1973,12 +2010,12 @@
 "\n"
 "Plik konfiguracyjny \"%s\""
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (aktualnie \"%s\")"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1989,7 +2026,7 @@
 " ==> Plik w systemie utworzony przez administratora lub skrypt.\n"
 " ==> Plik w pakiecie dostarczony przez opiekuna pakietu.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1998,7 +2035,7 @@
 "\n"
 "     Nie zmodyfikowany po zainstalowaniu.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2007,7 +2044,7 @@
 "\n"
 " ==> Zmodyfikowany (przez administratora lub skrypt) po zainstalowaniu.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -2016,37 +2053,37 @@
 "\n"
 " ==> Usunięty (przez administratora lub skrypt) po zainstalowaniu.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Twórca pakietu zamieścił zaktualizowaną wersję.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Wersja w pakiecie jest taka sama jak przy ostatniej instalacji.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Wykorzystany zostanie nowy plik według żądania.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Wykorzystany zostanie aktualny plik według żądania.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Domyślnie zostanie zachowany poprzedni plik konfiguracyjny.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Domyślnie zostanie zainstalowany nowy plik konfiguracyjny.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2061,166 +2098,168 @@
 "      D      : pokazanie różnic pomiędzy wersjami pliku\n"
 "      Z      : zatrzymanie tego procesu w celu rozeznania sytuacji\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Domyślnym działaniem jest zachowanie bieżącej wersji.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Domyślnym działaniem jest zainstalowanie nowej wersji.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[domyślnie=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[domyślnie=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[brak domyślnego działania]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "błąd zapisu do stderr wykryty przed ukazaniem się znaku zachęty"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "błąd odczytu ze standardowego wejścia wykryty po znaku zachęty"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF na standardowym wejściu wprowadzony ze znaku zachęty"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s wymaga %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s wymaga wstępnie %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s poleca %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s sugeruje %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s narusza zależności %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s w konflikcie z %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s rozszerza %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s jest przeznaczony do usunięcia.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s jest przeznaczony do zdekonfigurowania.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s jest zainstalowany, ale w wersji %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, 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:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s jest rozpakowany, ale w wersji %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s ma skonfigurowaną wersję %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s jest %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, 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:378
+#: src/depcon.c:392
 #, 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:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s dostarcza %.250s ale jest %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s nie jest zainstalowany.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (wersja %.250s) jest przeznaczony do zainstalowania.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (wersja %.250s) jest obecny i %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, 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:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s dostarcza %.250s i jest obecny oraz %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Type dpkg-trigger --help for help about this utility."
+msgid "Use --help for help about diverting files."
+msgstr "Wpisz dpkg-trigger --help, aby otrzymać pomoc."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s w wersji %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2235,8 +2274,8 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2249,7 +2288,7 @@
 "by dowiedzieć się o warunkach rozpowszechniania.\n"
 "Brak JAKIEJKOLWIEK gwarancji.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2259,7 +2298,7 @@
 "Użycie: %s [<opcja> ...] <polecenie>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2271,7 +2310,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "Usage: %s [<option> ...] <command>\n"
@@ -2343,7 +2382,7 @@
 "podano.\n"
 "Skrypty przed/poinstalacyjne muszą zawsze podawać --package i --divert.\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2352,19 +2391,13 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat file '%s'"
-msgstr "nie można ustalić stanu starego pliku \"%s\" : %s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error checking `%s': %s"
 msgid "error checking '%s'"
 msgstr "błąd sprawdzania \"%s\": %s"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2373,144 +2406,144 @@
 "zmiana nazwy oznacza nadpisanie \"%s\" \n"
 "  innym plikiem \"%s\", co nie jest dozwolone"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "nie można otworzyć pliku źródłowego \"%.255s\""
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "cannot stat new name `%s': %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "nie można ustalić stanu nowego pliku \"%s\" : %s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 #| msgid "rename: remove duplicate old link `%s': %s"
 msgid "rename: remove duplicate old link '%s'"
 msgstr "rename: usuwanie powielonego starego dowiązania \"%s\": %s"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "nie można otworzyć pliku źródłowego \"%.255s\""
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "local diversion of %s"
 msgstr "lokalne ominięcie do: %s\n"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "local diversion of %s to %s"
 msgstr "lokalne ominięcie do: %s\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "diversion of %s by %s"
 msgstr "ominięcie przez %s do: %s\n"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "diversion of %s to %s by %s"
 msgstr "ominięcie przez %s do: %s\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "any diversion of %s"
 msgstr "lokalne ominięcie do: %s\n"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "any diversion of %s to %s"
 msgstr "ominięcie przez %s do: %s\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "cannot open GPL file"
 msgid "cannot create new %s file"
 msgstr "nie można otworzyć pliku GPL"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "nie można ustalić stanu pliku części \"%.250s\""
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 #| msgid "remove old diversions-old: %s"
 msgid "error removing old diversions-old"
 msgstr "usuwanie starego pliku diversions-old: %s"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "błąd tworzenia nowego pliku statoverride-old: %s"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "błąd instalowania nowego pliku statoverride: %s"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s wymaga podania pojedynczego argumentu"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "nazwa pliku \"%s\" nie jest absolutna"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "plik nie może zawierać znaków nowej linii"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Nie można omijać katalogów"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "Nie można omijać katalogów"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "Opuszczanie \"%s\""
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "\"%s\" koliduje z \"%s\""
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "Dodawanie \"%s\""
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
 msgstr "Brak ominięcia \"%s\", nic nie usunięto"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2521,7 +2554,7 @@
 "  podczas usuwania \"%s\"\n"
 "  znaleziono \"%s\""
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2532,17 +2565,17 @@
 "  podczas usuwania \"%s\"\n"
 "  znaleziono \"%s\""
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "Usuwanie \"%s\""
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "pakiet nie może zawierać znaków nowej linii"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "divert-to nie może zawierać znaków nowej linii"
 
@@ -2628,8 +2661,8 @@
 "dpkg --configure --pending (lub dpkg --triggers-only) albo dselect:\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s nie wymaga podawania argumentów"
@@ -2725,7 +2758,7 @@
 msgid "--compare-versions bad relation"
 msgstr "błędna relacja dla --compare-versions"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "wersja \"%s\" ma złą składnię: %s"
@@ -2781,12 +2814,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "problem zignorowany po użyciu opcji --force:"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "nie można otworzyć listy plików pakietu \"%.250s\""
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2795,37 +2828,37 @@
 "brak listy plików pakietu \"%.250s\", przyjęcie że pakiet nie ma "
 "zainstalowanych plików."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "nie można ustalić stanu listy plików pakietu \"%.250s\""
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "lista plików pakietu \"%.250s\""
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "lista plików pakietu \"%.250s\" nie zawiera kończącej pustej linii"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "lista plików pakietu \"%.250s\" zawiera pustą nazwę pliku"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "nie można zamknąć listy plików pakietu \"%.250s\""
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Odczytywanie bazy danych ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2834,32 +2867,32 @@
 msgstr[1] "%d plików i katalogów obecnie zainstalowanych.)\n"
 msgstr[2] "%d plików i katalogów obecnie zainstalowanych.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "nie można utworzyć zaktualizowanej listy plików pakietu %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "nie można zapisać zaktualizowanej listy plików pakietu %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "nie można opróżnić buforów dla zaktualizowanej listy plików pakietu %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "nie można zsynchronizować zaktualizowanej listy plików pakietu %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "nie można zamknąć zaktualizowanej listy plików pakietu %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "nie można zainstalować zaktualizowanej listy plików pakietu %s"
@@ -2898,7 +2931,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "dpkg - błąd: zmienna PATH jest nie ustawiona.\n"
 
 #: src/help.c:129
@@ -2932,7 +2965,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2944,65 +2977,65 @@
 msgstr "nie można zmienić katalogu głównego na \"%.255s\""
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "nie można zmienić katalogu na \"%.255s\""
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "nie można ustawić praw do wykonywania \"%.250s\""
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "błąd ustawiania zmiennych środowiska dla skryptu od opiekuna pakietu"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "zainstalowany skrypt %s"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "nie można ustalić stanu %s \"%.250s\""
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "nowy skrypt %s"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "poprzedni skrypt %s"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "nie można ustalić stanu %s \"%.250s\": %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - próba wywołania skryptu z nowego pakietu ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "brak skryptu w nowej wersji pakietu - zaniechanie wywołania skryptu"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... najprawdopodobniej wywołanie skryptu powiodło się.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "nie można utworzyć \"%.255s\""
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -3011,7 +3044,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "nie można stwierdzić istnienia \"%.250s\""
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "nie można odczytać katalogu informacyjnego"
 
@@ -3080,7 +3113,7 @@
 "  -Dh|--debug=help                  Pomoc na temat debugowania.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -3238,7 +3271,7 @@
 "Proszę użyć \"dselect\" lub \"aptitude\", jeśli potrzebny jest wygodny\n"
 "program do zarządzania pakietami.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3291,30 +3324,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3323,103 +3360,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "problemy z zależnościami - nie będzie usuwany"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "problemy z zależnościami - nie będzie usuwany"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "błąd ustawiania zmiennych środowiska dla skryptu od opiekuna pakietu"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "błąd odczytu pliku konfiguracyjnego \"%.250s\""
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3427,7 +3464,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3435,41 +3472,41 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug wymaga podania argumentu będącego liczbą ósemkową"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "pusta nazwa pakietu dla --ignore-depends w liście rozdzielanej przecinkami "
 "\"%.250s\""
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends wymaga podania poprawnej nazwy pakietu. \"%.250s\" jest "
 "niepoprawny; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "błędna wartość liczbowa dla --%s: \"%.250s\""
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "status"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3478,7 +3515,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3486,12 +3523,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "nieznana opcja force/refuse \"%.*s\""
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "niewykorzystywana już opcja force/refuse \"%s\"\n"
@@ -3514,8 +3551,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "niespodziewany EOF przed końcem linii %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "należy określić działanie"
 
@@ -3680,92 +3717,92 @@
 msgid "passed\n"
 msgstr "powiodło się\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "nie można utworzyć nazwy tymczasowego katalogu"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "pakiet %s ma zbyt wiele par Conflits/Replaces"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "poprzednia wersja pakietu ma plik informacyjny o zbyt długiej nazwie "
 "rozpoczynającej się od \"%.250s\""
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "nie można usunąć nieaktualnego pliku informacyjnego \"%.250s\""
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "nie można zainstalować nowego pliku informacyjnego \"%.250s\""
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "nie można otworzyć tymczasowego katalogu kontrolnego"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "pakiet zawiera plik kontrolny o zbyt długiej nazwie (rozpoczynającej się od "
 "\"%.50s\")"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "archiwum kontrolne pakietu zawiera katalog \"%.250s\""
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "próba usunięcia katalogu \"%.250s\" nie wykazała, że to nie jest katalog"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "pakiet %s zawierał listę plików jako plik informacyjny"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 "nie można zainstalować nowego pliku informacyjnego \"%.250s\" jako \"%.250s\""
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "nie można usunąć pliku kontrolnego \"%.250s\""
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "brak dostępu do archiwum"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "nie można utworzyć nazwy tymczasowego katalogu"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "rozmiar informacji kontrolnej"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Zapisane informacje o %s z %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "architektura pakietu (%s) nie zgadza się z architekturą systemu (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3774,103 +3811,103 @@
 "dpkg: problem ze wstępnymi wymaganiami %s zawierającego %s:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "problem ze wstępnymi wymaganiami - %.250s nie będzie instalowany"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "zignorowanie problemu ze wstępnymi wymaganiami!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Przygotowanie do zastąpienia %s %s (wykorzystując %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Rozpakowanie %s (z %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "nazwa pliku konfiguracyjnego (rozpoczynająca się od \"%.250s\") jest zbyt "
 "długa (>%d znaków)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "nie można odczytać %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "nie można zamknąć %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "nie można otworzyć %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Dekonfigurowanie %s, tak żeby można było usunąć %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Dekonfigurowanie %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Rozpakowanie pakietu zastępującego %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "nie można odczytać potoku z \"dpkg-deb\" zawierającego archiwum tar"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "uszkodzone archiwum tar - uszkodzone archiwum pakietu"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: usunięcie prawdopodobnych zer na końcu"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "nie można ustalić stanu poprzedniego pliku \"%.250s\", plik nie będzie "
 "usuwany: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "nie można usunąć poprzedniego katalogu \"%.250s\": %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "poprzedni plik konfiguracyjny \"%.250s\" był pustym katalogiem  (i właśnie "
 "został usunięty)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "nie można ustalić stanu nowego pliku \"%.250s\""
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3879,12 +3916,12 @@
 "stary plik \"%.250s\" jest taki sam, jak kilka nowych plików! (zarówno "
 "\"%.250s, jak i \"%.250s\")"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "nie można %s poprzedniego pliku \"%.250s\": %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Stwierdzono zniknięcie %s, który został zupełnie zastąpiony.)\n"
@@ -4066,7 +4103,7 @@
 "  -f|--showformat=<format>       Użycie podanego formatu dla --show.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -4088,6 +4125,10 @@
 "  strony, chyba że zmienna szerokość jest ujemna, co spowoduje\n"
 "  przesunięcie do strony lewej.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4147,7 +4188,7 @@
 msgid "Removing %s ...\n"
 msgstr "Usuwanie %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4156,54 +4197,55 @@
 "podczas usuwania %.250s nie można usunąć katalogu \"%.250s\": %s - być może "
 "katalog jest punktem montowania?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "nie można usunąć \"%.250s\""
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "nie można utworzyć \"%.255s\""
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "podczas usuwania %.250s, katalog \"%.250s\" nie był pusty, więc nie został "
 "usunięty."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "nie można usunąć \"%.250s\""
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Czyszczenie z plików konfiguracyjnych dla %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr ""
 "nie można usunąć poprzedniego pliku konfiguracyjnego \"%.250s\" (= \"%.250s"
 "\")"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 "nie można odczytać katalogu starego pliku konfiguracyjnego \"%.250s\" (= "
 "\"%.250s\")"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "nie można usunąć kopii poprzedniego pliku konfiguracyjnego \"%.250s\" (= "
 "\"%.250s\")"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "nie można usunąć poprzedniej listy plików"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "nie można usunąć poprzedniego skryptu postrm"
 
@@ -4246,7 +4288,11 @@
 msgid "read error on standard input"
 msgstr "nie można odczytać standardowego wejścia"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4256,7 +4302,7 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4267,7 +4313,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -4295,56 +4341,56 @@
 "  --help                   wyświetla ten komunikat pomocy.\n"
 "  --version                wyświetla informacje o wersji.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "usuwanie końcowych znaków /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "nie można otworzyć nowego pliku statoverride: %s"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "błąd usuwania statoverride-old: %s"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "błąd tworzenia nowego pliku statoverride-old: %s"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "błąd instalowania nowego pliku statoverride: %s"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add wymaga podania czterech argumentów"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, fuzzy, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr "ale podano --force, więc zostanie zignorowany."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, fuzzy, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Już istnieje nadpisanie dla \"%s\", "
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, fuzzy, c-format
 msgid "--update given but %s does not exist"
 msgstr "ostrzeżenie: podano --update, ale %s nie istnieje"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Brak nadpisania."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 #, fuzzy
 msgid "--update is useless for --remove"
 msgstr "ostrzeżenie: --update jest bezużyteczne w połączeniu z --remove"
@@ -4411,16 +4457,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "wielokrotne określenia statusoverride dla pliku \"%.250s\""
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Wpisz dpkg-trigger --help, aby otrzymać pomoc."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debian `%s', narzędzie użytkowe wyzwalaczy pakietów.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4431,7 +4477,7 @@
 "        %s [<opcje> ...] <polecenie>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4444,7 +4490,7 @@
 "wyzwalacze.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4467,21 +4513,21 @@
 "zmian.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: nie utworzono jeszcze katalogu zawierającego dane wyzwalaczy\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: informacje o wyzwalaczach jeszcze nie istnieją\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "wymaga podania jednego argumentu - nazwy wyzwalacza"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4491,14 +4537,14 @@
 "dpkg-trigger musi być uruchamiany ze skryptów opiekunów pakietów (lub z "
 "opcją --by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr ""
 "dpkg-trigger: nieprawidłowa nazwa pakietu do oczekiwania \"%.250s\": %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "niewłaściwa nazwa wyzwalacza \"%.250s\": %.250s"
@@ -4531,29 +4577,30 @@
 msgstr "Przetwarzanie wyzwalaczy dla %s...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s wymaga podania dokładnie jednej nazwy pliku pakietu"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr "brak dostępu do katalogu administracyjnego dpkg"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr "brak praw zapisu do katalogu administracyjnego dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Zastąpienie informacji o dostępnych pakietach, przy użyciu %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Zaktualizowanie informacji o dostępnych pakietach, przy użyciu %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4562,7 +4609,7 @@
 msgstr[1] "Informacje o %d pakietach zostały zaktualizowane.\n"
 msgstr[2] "Informacje o %d pakietach zostały zaktualizowane.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4683,8 +4730,8 @@
 msgstr[1] "zignorowanie %d ostrzeżeń na temat plików kontrolnych\n"
 msgstr[2] "zignorowanie %d ostrzeżeń na temat plików kontrolnych\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s wymaga <katalogu> jako argumentu"
@@ -4716,26 +4763,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: budowanie pakietu \"%s\" w \"%s\".\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "nie można utworzyć tymczasowego pliku (sekcja data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "obszar kontrolny"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "nie można usunąć tymczasowego pliku (sekcja data), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4752,20 +4799,20 @@
 msgid "error writing `%s'"
 msgstr "błąd zapisu \"%s\""
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "pomiędzy członami"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "nie można wpisać nazwy pliku do potoku do programu tar (sekcja data)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<kompresja> z tar -cf"
 
@@ -4783,79 +4830,79 @@
 msgid "error reading %s from file %.255s"
 msgstr "nie można odczytać %s z pliku %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "nie można odczytać archiwum \"%.255s\""
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "nie można ustalić stanu archiwum"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "archiwum nie zawiera kropki w numerze wersji"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "archiwum nie zawiera znaków nowej linii w nagłówku"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "plik \"%.250s\" jest uszkodzony - zły numer części"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "plik \"%.250s\" nie jest archiwum binarnym Debiana (spróbuj dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "archiwum nie zawiera kropki w numerze wersji"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "archiwum nie zawiera znaków nowej linii w nagłówku"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "archiwum nie zawiera kropki w numerze wersji"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 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:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "pominięto dane członu z %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
 "plik \"%.250s\" zawiera nierozpoznane archiwum z danymi %.*s, przerywanie"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "plik \"%.250s\" zawiera dwa archiwa kontrolne, przerywanie"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4867,23 +4914,23 @@
 " nowy pakiet Debiana, wersja %s.\n"
 " rozmiar %ld bajtów: archiwum kontrolne= %zi bajtów.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "archiwum ma zły format rozmiaru informacji kontrolnej \"%s\""
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "pominięto dane członu z %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4895,7 +4942,7 @@
 " poprzedni pakiet Debiana, wersja %s.\n"
 " rozmiar %ld bajtów: archiwum kontrolne= %zi, archiwum z danymi= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4904,49 +4951,50 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "\"%.255s\" nie jest plikiem archiwum Debiana"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "nie można zapisać potoku dla funkcji \"copy\""
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "nie można zamknąć potoku dla funkcji \"copy\""
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "nie można zmienić katalogu bieżącego"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "nie można utworzyć katalogu"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "nie można zmienić katalogu po jego utworzeniu"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "nie można zmienić katalogu bieżącego"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<dekompresja>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "wklej"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s wymaga podania nazwy pliku .deb"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4955,39 +5003,39 @@
 "--%s wymaga podania katalogu docelowego.\n"
 "Być może należy użyć \"dpkg --install\"?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s wymaga podania jednego argumentu (nazwy pliku .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "nie można zmienić katalogu na \"/\" przy czyszczeniu środowiska"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
 msgid "control file '%s'"
 msgstr "nie można ustalić stanu starego pliku \"%s\" : %s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: \"%.255s\" nie zawiera pliku kontrolnego \"%.255s\"\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "nie można otworzyć pliku informacyjnego \"%.255s\" (w %.255s) z "
 "nieokreślonego powodu"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, fuzzy, c-format
 #| msgid "One requested control component is missing"
 msgid "%d requested control component is missing"
@@ -4996,59 +5044,59 @@
 msgstr[1] "Brak jednego pliku kontrolnego"
 msgstr[2] "Brak jednego pliku kontrolnego"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "nie można przeszukać katalogu \"%.255s\""
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "nie można ustalić stanu \"%.255s\" (w \"%.255s\")"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "nie można otworzyć \"%.255s\" (w \"%.255s\")"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "nie można odczytać \"%.255s\" (w \"%.255s\")"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bajtów, %5d linii   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     nie jest plikiem          %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(brak pliku \"control\" w archiwum kontrolnym!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "nie można otworzyć pliku kontrolnego \"control\""
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "nie można odczytać pliku kontrolnego \"control\""
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "nie można zamknąć potoku dla \"find\""
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Błąd w formacie"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents wymaga podania dokładnie jednego argumentu"
 
@@ -5058,7 +5106,19 @@
 msgstr "Debian \"%s\", program do zarządzania pakietami, wersja %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -5069,6 +5129,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -5084,7 +5146,7 @@
 "  --fsys-tarfile <deb>               Podanie plików archiwum tar.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -5097,11 +5159,12 @@
 "<polekontr> jest nazwą pola głównego pliku \"control\".\n"
 "\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5126,7 +5189,7 @@
 "                           Dozwolone wartości: gzip, bzip2, lzma, none.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5140,7 +5203,7 @@
 "do zarządzania pakietami. Pakiety rozpakowane poleceniem\n"
 "\"dpkg-deb --extract\" nie będą poprawnie zainstalowane!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5148,17 +5211,17 @@
 "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:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "błędna wartość liczbowa dla --%s: \"%.250s\""
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "błędna wartość liczbowa dla --%s: \"%.250s\""
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "nieznany typ kompresji \"%s\"!"
@@ -5178,7 +5241,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "plik \"%.250s\" jest uszkodzony - brakuje znaku nowej linii po %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "błąd odczytu %.250s"
@@ -5274,52 +5337,58 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "plik \"%.250s\" jest uszkodzony - zły numer części"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "nazwa pakietu"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "plik \"%.250s\" jest uszkodzony - zła liczba magiczna na końcu drugiego "
 "nagłówka"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "plik \"%.250s\" jest uszkodzony - drugi człon nie jest członem z danymi"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "plik \"%.250s\" jest uszkodzony - zła ilość części dla wybranego rozmiaru"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "plik \"%.250s\" jest uszkodzony - zły rozmiar dla wybranej ilości części"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "nie można ustalić stanu pliku części \"%.250s\""
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "plik \"%.250s\" jest uszkodzony - zbyt krótki"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "nie można otworzyć pliku części \"%.250s\""
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "plik \"%.250s\" nie jest częścią archiwum"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5339,6 +5408,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5361,13 +5431,20 @@
 "    Rozmiar pliku części (użyta):   %lu bajtów\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<nieznany>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr ""
 "--%s wymaga podania co najmniej jednego argumentu będącego plikiem części"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "plik \"%s\" nie jest częścią archiwum\n"
@@ -5403,7 +5480,7 @@
 msgid "split package part"
 msgstr "Składanie pakietu %s z %d części: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "zrobione\n"
@@ -5456,17 +5533,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Opcje:\n"
 "  --depotdir <katalog>           Użycie <katalogu> zamiast %s/%s.\n"
@@ -5477,20 +5563,29 @@
 "\n"
 "Kod powrotu: 0 = OK;  1 = -a nie jest częścią;  2 = problem!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Wpisz dpkg-split --help, aby otrzymać pomoc."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "niespodziewany koniec pliku dla %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "rozmiar części jest za duży lub jest liczbą ujemną"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "rozmiar części musi mieć co najmniej %dk KiB (aby zmieścić nagłówek)"
@@ -5601,25 +5696,25 @@
 msgid "Deleted %s.\n"
 msgstr "Usunięto %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "nie można otworzyć pliku źródłowego \"%.255s\""
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "nie można ustalić stanu pliku źródłowego"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "plik źródłowy \"%.255s\" nie jest zwykłym plikiem"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d parts: "
 msgid "Splitting package %s into %d part: "
@@ -5628,17 +5723,17 @@
 msgstr[1] "Składanie pakietu %s z %d części: "
 msgstr[2] "Składanie pakietu %s z %d części: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split wymaga podania nazwy pliku źródłowego"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "--split wymaga podania co najwyżej nazwy pliku źródłowego i prefiksu dla "
@@ -5730,134 +5825,95 @@
 "  --help                   wyświetla ten komunikat pomocy.\n"
 "  --version                wyświetla informacje o wersji.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 #, fuzzy
 #| msgid "parse error"
 msgid "error"
 msgstr "błąd parsowania"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "ostrzeżenie"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat %s: %s"
-msgstr "nie można ustalić stanu starego pliku \"%s\" : %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "nieudane readlink(%s): %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, fuzzy, c-format
 #| msgid "two commands specified: %s and --%s"
 msgid "two commands specified: --%s and --%s"
 msgstr "podano dwa polecenia: %s i --%s"
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
 #| msgid "cannot open diversions: %s"
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "nie można otworzyć listy ominiętych plików: %s"
 
-#: utils/update-alternatives.c:395
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "readlink(%s) failed: %s"
-msgid "scan of %s failed: %s"
-msgstr "nieudane readlink(%s): %s"
-
-#: utils/update-alternatives.c:420
-#, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "wywołanie %s nie powiodło się"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "nie można zrobić %s dowiązaniem symbolicznym do %s: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "nie można zainstalować %s jako %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "nie można usunąć %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 #| msgid "unexpected end of file in %s while trying to read %s"
 msgid "unexpected end of file while trying to read %s"
 msgstr "niespodziewany koniec pliku w %s podczas próby odczytu %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "podczas odczytu %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 #| msgid "unexpected end of file in %s while trying to read %s"
 msgid "line not terminated while trying to read %s"
 msgstr "niespodziewany koniec pliku w %s podczas próby odczytu %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s uszkodzone: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "znaki nowej linii są zabronione w plikach update-alternatives (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "podczas zapisu %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "nazwa podrzędna"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "powielona wartość dowiązania symbolicznego %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "dowiązanie podrzędne"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "dowiązanie podrzędne takie samo jak dowiązanie główne %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "powielone dowiązanie podrzędne %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "plik nadrzędny"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "powielona ścieżka %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5866,94 +5922,78 @@
 "alternatywa %s (zawarta w grupie dowiązań %s) nie istnieje. Usuwanie jej z "
 "listy alternatyw."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "priorytet"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "plik podrzędny"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "priorytet %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "nie można odczytać %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "status"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "niepoprawny status"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 #, fuzzy
 msgid "master link"
 msgstr "plik nadrzędny"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "nie można zamknąć %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "odrzucanie przestarzałego dowiązania podrzędnego %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "nie można zapisać %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "tryb auto"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "tryb ręczny"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, fuzzy, c-format
 msgid "  link currently points to %s"
 msgstr " dowiązanie obecnie wskazuje na %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 #, fuzzy
 msgid "  link currently absent"
 msgstr " obecnie brak dowiązania"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "%s - priority %s"
 msgid "%s - priority %d"
 msgstr "%s - priorytet %s"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr " dowiązanie podrzędne %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Obecnie \"najlepszą\" wersją jest %s."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Żadna wersja nie jest dostępna."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, fuzzy, c-format
 #| msgid "There are %s choices for the alternative %s (providing %s)."
 msgid "There is %d choice for the alternative %s (providing %s)."
@@ -5962,39 +6002,39 @@
 msgstr[1] "Jest %s dostępnych alternatyw dla %s (dostarczających %s)."
 msgstr[2] "Jest %s dostępnych alternatyw dla %s (dostarczających %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Wybór"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Ścieżka"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Priorytet"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Status"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Naciśnij Enter, aby pozostawić bieżący wybór[*], albo wpisz wybrany numer:"
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "pominięcie zastąpienia %s dowiązaniem."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -6003,99 +6043,154 @@
 "pominięcie tworzenia %s ponieważ powiązany plik %s (lub grupa dowiązań %s) "
 "nie istnieje."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "pominięcie zastąpienia %s dowiązaniem."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Wywołanie %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Nie zmieniona alternatywa %s ponieważ wybór %s jest niedostępny."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Pominięcie nieznanej alternatywy %s."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 #| msgid "unexpected end of file in %s while trying to read %s"
 msgid "line too long or not terminated while trying to read %s"
 msgstr "niespodziewany koniec pliku w %s podczas próby odczytu %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "zmiana nazwy dowiązania %s z %s na %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "zmiana nazwy dowiązania podrzędnego %s z %s na %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "nazwa alternatywy (%s) nie może zawierać \"/\" i spacji."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "dowiązanie alternatywy nie jest bezwzględne jak jest to wymagane: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "ścieżka alternatywy nie jest bezwzględna jak jest to wymagane: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "alternatywa %s nie może być nadrzędna: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "dowiązanie alternatywy %s jest już zarządzane przez %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "ścieżka alternatywy %s nie istnieje."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "alternatywa %s nie może być podrzędna względem %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "alternatywa %s nie może być nadrzędna: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "dowiązanie alternatywy %s jest już zarządzane przez %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "nieznany argument \"%s\""
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install wymaga podania <dowiązania> <nazwy> <ścieżki> <priorytetu>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<dowiązanie> i <ścieżka> nie mogą być takie same"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "priorytet musi być liczbą"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s wymaga argumentów <nazwa> <ścieżka>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s wymaga <nazwy>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "opcja --slave dopuszczalna tylko z --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave wymaga <dowiązania> <nazwy> <ścieżki>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "nazwa %s jest zarówno główna, jak i podrzędna"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "dowiązanie %s jest zarówno główne, jak i podrzędne"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s wymaga podania argumentu <plik>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "nieznana opcja \"%s\""
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 #, fuzzy
 #| msgid ""
 #| "need --display, --query, --list, --get-selections, --config,--set, --set-"
@@ -6107,63 +6202,18 @@
 "należy podać --display, --query, --list, --get-selections, --config,--set, --"
 "set-selections, --install, --remove, --all, --remove-all lub --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "alternatywa %s nie może być nadrzędna: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "dowiązanie alternatywy %s jest już zarządzane przez %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "dowiązanie alternatywy nie jest bezwzględne jak jest to wymagane: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "ścieżka alternatywy nie jest bezwzględna jak jest to wymagane: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "ścieżka alternatywy %s nie istnieje."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "nazwa alternatywy (%s) nie może zawierać \"/\" i spacji."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "jest alternatywą nadrzędną."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "jest dowiązaniem podrzędnym %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "alternatywa %s nie może być podrzędna względem %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "<standard output>"
 msgid "<standard input>"
 msgstr "<standardowe wyjście>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "brak alternatyw dla %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
@@ -6171,7 +6221,7 @@
 "%s nie jest poprawnym dowiązaniem, zostanie zaktualizowane najlepszym "
 "wyborem."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6183,47 +6233,47 @@
 "%s został zmieniony (ręcznie lub przez skrypt). Przełączanie do trybu "
 "ręcznych aktualizacji."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "ustawianie automatycznego wybierania %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "alternatywa %s dla %s nie jest zarejestrowana, nie będzie usunięta."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Nie znaleziono programu, który dostarcza %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Nie ma nic do skonfigurowania."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Jest tylko jedna alternatywa w grupie dowiązań %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "alternatywa %s dla %s nie jest zarejestrowana, nie będzie usunięta."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr "usuwanie alternatywy wybranej ręcznie - przełączanie %s do trybu auto"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "automatyczne aktualizacje %s są wyłączone, pozostawianie go bez zmian."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6231,23 +6281,67 @@
 "aby powrócić do aktualizacji automatycznych, użyj \"update-alternatives --"
 "auto %s\"."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "użycie %s jako dostarczającego %s (%s) w %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, fuzzy, c-format
 #| msgid "There is only one alternative in link group %s: %s"
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr "Jest tylko jedna alternatywa w grupie dowiązań %s: %s"
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
+#~ msgid "it is a master alternative."
+#~ msgstr "jest alternatywą nadrzędną."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "jest dowiązaniem podrzędnym %s"
+
+#, fuzzy
+#~| msgid "cannot stat old name `%s': %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "nie można ustalić stanu starego pliku \"%s\" : %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "nieudane readlink(%s): %s"
+
+#, fuzzy
+#~| msgid "readlink(%s) failed: %s"
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "nieudane readlink(%s): %s"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "wywołanie %s nie powiodło się"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "nie można zrobić %s dowiązaniem symbolicznym do %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "nie można zainstalować %s jako %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "podczas zapisu %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "nie można odczytać %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "nie można zamknąć %s: %s"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "nie można zapisać %s: %s"
+
 #, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "nie można otworzyć pliku źródłowego \"%.255s\""
@@ -6540,9 +6634,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "pominięto dane członu z %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "nie można wywołać \"tar\""
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "nie można utworzyć nazwy tymczasowego katalogu"
diff -uNr --exclude .git --exclude .bzr dpkg/po/POTFILES.in /home/vorlon/devel/multiarch/dpkg-debian/po/POTFILES.in
--- dpkg/po/POTFILES.in	2011-03-24 16:35:56.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/POTFILES.in	2012-06-07 10:11:09.426073000 -0700
@@ -15,8 +15,8 @@
 lib/dpkg/log.c
 lib/dpkg/md5.c
 lib/dpkg/mlib.c
-lib/dpkg/myopt.c
 lib/dpkg/nfmalloc.c
+lib/dpkg/options.c
 lib/dpkg/parse.c
 lib/dpkg/parsehelp.c
 lib/dpkg/path.c
@@ -33,6 +33,7 @@
 lib/dpkg/tarfn.c
 lib/dpkg/trigdeferred.l
 lib/dpkg/triglib.c
+lib/dpkg/trigname.c
 lib/dpkg/utils.c
 lib/dpkg/varbuf.c
 lib/dpkg/vercmp.c
Binary files dpkg/po/pt_BR.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/pt_BR.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/pt_BR.po /home/vorlon/devel/multiarch/dpkg-debian/po/pt_BR.po
--- dpkg/po/pt_BR.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/pt_BR.po	2012-06-07 10:11:09.426073000 -0700
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2008-11-17 01:55-0200\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -28,7 +28,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "impossível abrir arquivo fonte '%.250s'"
@@ -48,71 +48,77 @@
 msgid "ar member file (%s)"
 msgstr "falhou ao criar tmpfile (data)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "falhou em buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "falhou em buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "leitura curta em buffer_copy (%s)"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "falhou ao executar tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "impossível executar %s"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: descompactação"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compactação"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: erro interno do gzip: '%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: erro interno do gzip: '%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: erro interno do gzip: '%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: erro interno do gzip: '%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: erro interno do gzip: '%s'"
@@ -127,31 +133,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: erro interno do bzip2: '%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: erro interno do bzip2: '%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: erro interno do bzip2: '%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: erro interno do bzip2: '%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -160,7 +166,7 @@
 "diretório de atualizações contém arquivo '%.250s' cujo nome é muito longo "
 "(tamanho=%d, máx=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -168,101 +174,101 @@
 "diretório de atualizações contém arquivos com nomes de tamanho diferentes "
 "(%d e %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "não foi possível vasculhar diretório de atualizações '%.255s'"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "falhou ao remover arquivo de atualização incorporado %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "impossível criar '%.255s'"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "impossível preencher %.250s com enchimento"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "impossível executar \"flush\" %.250s após enchimento"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "impossível executar \"seek\" no começo de %.250s após enchimento"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "impossível abrir tmpfile para vsnprintf"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr ""
 "impossível abrir/criar arquivo de bloqueio do banco de dados de estados"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 "você não tem permissão para bloquear o banco de dados de estados do dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "impossível bloquear banco de dados de estados do dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "a operação solicitada requer privilégios de superusuário"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "impossível acessar área de estado do dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "operação requer acesso de leitura/escrita à área de estado do dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "falhou ao remover meu próprio arquivo de atualização %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "impossível escrever estado atualizado de '%.250s'"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "impossível executar \"flush\" do estado atualizado de '%.250s'"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "impossível truncar o estado atualizado de '%.250s'"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "impossível executar \"fsync\" do estado atualizado de '%.250s'"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "impossível fechar estado atualizado de '%.250s'"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "impossível instalar estado atualizado de '%.250s'"
@@ -283,70 +289,72 @@
 msgid "unable to open directory '%s'"
 msgstr "impossível abrir arquivo fonte '%.250s'"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "impossível abrir arquivo fonte '%.250s'"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "impossível abrir arquivo fonte '%.250s'"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "impossível efetuar \"flush\" em vsnprintf "
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "falhou ao escrever detalhes de '%.50s' para '%.250s'"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "falhou ao abrir '%s' para escrever a informação de %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "impossível definir \"buffering\" no arquivo de estado"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "falhou ao escrever o registro %s sobre '%.50s' para '%.250s'"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "falhou ao executar \"flush\" de informação %s para '%.250s'"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "falhou ao executar \"fsync\" de informação %s para '%.250s'"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "falhou ao fechar '%.250s' após escrever informação %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "falhou ao ligar '%.250s' a '%.250s' para backup de informação de %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "falhou ao instalar '%.250s' como '%.250s' contendo informação de %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -355,7 +363,7 @@
 "%s: erro fatal irrecuperável, abortando:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -367,13 +375,13 @@
 "%s: erro fatal irrecuperável, abortando:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "sem memória para nova entrada de limpeza"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -382,33 +390,33 @@
 "%s: erro enquanto efetuava a limpeza:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: muitos erros aninhados durante a recuperação dos erros !!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "sem memória para nova entrada de limpeza"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "sem memória para nova entrada de limpeza com tantos argumentos"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: erro processando %s (--%s):\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr "erro ao gravar `%s'"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%d: erro interno '%s'\n"
@@ -424,99 +432,99 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "'%.*s' não tem permissão para %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "lixo depois de %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "nome de pacote inválido (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "campo de detalhes de arquivo '%s' vazio"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "campo de detalhes de arquivo '%s' não permitido em arquivo de estado"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "muitos valores no campo de detalhes de arquivo '%s' (comparado a outros)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "poucos valores no campo de detalhes de arquivo '%s' (comparado a outros)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "sim/não em campo booleano"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "palavra no campo 'prioridade'"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "valor para campo 'status' não permitido neste contexto"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "primeira (\"want\") palavra no campo 'status'"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "segunda (\"error\") palavra no campo 'status'"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "terceira (\"status\") palavra no campo 'status'"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "erro na string \"Version\" '%.250s': %.250s"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "campo 'Revision' ou 'Package-Revision' obsoleto foi usado"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "valor para campo 'config-version' não permitido neste contexto"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "erro na string \"Config-Version\" '%.250s': %.250s"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "valor para 'conffiles' tem linha mal formatada '%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "valor para 'conffiles' possui linha começando com '%c' sem espaçamento"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr ""
 "diretório raiz ou nulo é listado como um arquivo de configuração (\"conffile"
 "\")"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -524,12 +532,12 @@
 "campo '%s', nome de pacote faltando, ou lixo no lugar em que se esperava o "
 "nome do pacote"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "campo '%s', nome de pacote inválido '%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -538,7 +546,7 @@
 "campo '%s', referência a '%.255s':\n"
 " relacionamento de versões ruim %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -547,7 +555,7 @@
 "campo '%s', referência a '%.255s':\n"
 " '%c' está obsoleto, em seu lugar use '%c=' ou '%c%c'"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -556,11 +564,11 @@
 "campo '%s', referência a '%.255s':\n"
 " combinação exata implícita com o número da versão, sugere-se usar '='"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Somente versões exatas podem ser usadas para \"Provides\""
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -570,56 +578,56 @@
 " valor da versão começa com caractere não-alfanumérico, sugere-se a adição\n"
 " de um espaço"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "campo '%s', referência a '%.255s': versão contém '%c'"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "campo '%s', referência a '%.255s': versão não terminada"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "campo '%s', referência a '%.255s': erro em versão: %.255s"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "campo '%s', erro de sintaxe após referência a pacote '%.255s'"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternativas ('|') não permitidas no campo %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "valor para campo 'triggers-pending' não permitido neste contexto"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "nome de gatilho pendente ilegal '%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "gatilho pendente duplicado '%.255s'"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "valor para campo 'triggers-awaited' não permitido neste contexto"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "nome de pacote ilegal no gatilho em espera '%.255s': %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "gatilho em espera duplicado no pacote '%.255s'"
@@ -680,7 +688,7 @@
 msgid "unable to write to status fd %d"
 msgstr "impossível escrever estado atualizado de '%.250s'"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "realloc failed (%zu bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -691,8 +699,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc falhou (%zu bytes)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "falhou ao alocar memória"
 
@@ -725,156 +733,156 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "impossível definir a \"flag\" 'close-on-exec' para %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "erro de configuração: %s precisa de um valor"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, fuzzy, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "falhou ao abrir arquivo de configuração '%.255s' para leitura"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "opção desconhecida '%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "opção --%s aceita um valor"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "opção --%s não aceita um valor"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "erro de leitura no arquivo de configuração '%.255s'"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "erro ao fechar arquivo de configuração '%.255s'"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "erro ao fechar arquivo de configuração '%.255s'"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "opção desconhecida --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "opção --%s aceita um valor"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "opção --%s não aceita um valor"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "opção desconhecida -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "opção -%c aceita um valor"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "opção -%c não aceita um valor"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "Aviso: opção obsoleta '--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "ações conflitantes -%c (--%s) e -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "valor duplicado para o campo '%s'"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "nome do campo '%.*s' definido pelo usuário é muito curto"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "valor duplo para campo definido pelo usuário '%.*s'"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "'Configured-Version' para pacote com 'Status' inapropriado"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "pacote possui estado %s mas há gatilhos em espera"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 "pacote possui estado \"triggers-awaited\" mas não há gatilhos em espera"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "pacote possui estado %s mas há gatilhos pendentes"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 "pacote possui estado \"triggers-pending\" mas não há gatilhos pendentes"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Pacote que no estado não-instalado possui arquivos de configuração "
 "(\"conffiles\"), esquecendo-os"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "falhou ao abrir arquivo de informações do pacote '%.255s' para leitura"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr ""
 "não foi possível executar \"stat\" no arquivo de informações do pacote "
 "'%.255s'"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr ""
 "não foi possível executar \"mmap\" no arquivo de informações do pacote "
 "'%.255s'"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
@@ -882,53 +890,59 @@
 "não foi possível executar \"stat\" no arquivo de informações do pacote "
 "'%.255s'"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "falhou ao fechar após ler: '%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF após o campo nome '%.*s'"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "nova linha no campo nome '%.*s'"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "EOF MSDOS (^Z) no campo nome '%.*s'"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "campo de nome '%.*s' precisa ser seguido de vírgula"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF antes do valor do campo '%.*s' (faltando nova linha final)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "caracter EOF MSDOS no valor do campo '%.*s' (nova linha faltando?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "nova linha no campo nome '%.*s'"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF durante o valor do campo '%.*s' (faltando nova linha final)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 "muitas entradas de informação do pacote foram encontradas, somente uma é "
 "permitida"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "falhou ao fechar após ler: '%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "sem informações de pacote em '%.255s'"
@@ -947,67 +961,67 @@
 " %.255s"
 msgstr "aviso, no arquivo '%.255s', próximo à linha %d"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "pode não ser uma string vazia"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "deve começar com um alfanumérico"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "caractere '%c' não permitido (apenas letras, dígitos e caracteres '%s')"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<nenhuma>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "string de versão está vazia"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "string de versão possui espaços embutidos"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "época em versão não é um número"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "nada após vírgula em número de versão"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "nada após vírgula em número de versão"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "nada após vírgula em número de versão"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "%s faltando"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "valor vazio para %s"
@@ -1026,51 +1040,51 @@
 msgid "(no description available)"
 msgstr "(nenhuma descrição disponível)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "impossível ignorar sinal %s antes de executar script"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "erro não pegando sinal %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (sub-processo): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "fork falhou"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "sub-processo %s retornou estado de saída de erro %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "espera por %s falhou"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "sub-processo %s foi morto por sinal (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", gerou um core"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "sub-processo %s falhou com código de estado de espera %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "espera por %s falhou"
@@ -1092,61 +1106,53 @@
 msgstr ""
 "erro de sintaxe no arquivo de gatilhos adiados '%.250s' no caractere '%s'%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "impossível abrir/criar arquivo de bloqueio de gatilhos '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "disparado por gatilho"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "impossível executar \"stat\" no arquivo de gatilhos adiados '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "impossível abrir arquivo de gatilhos adiados '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "impossível abrir/criar novo arquivo de gatilhos adiados '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "erro lendo arquivo de gatilhos adiados '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "impossível escrever novo arquivo de gatilhos adiados '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "impossível fechar novo arquivo de gatilhos adiados '%.250s'"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "impossível instalar novo arquivo de gatilhos adiados '%.250s'"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "nomes de gatilho vazios não são permitidos"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "nome de gatilho contém caracteres inválidos"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1155,17 +1161,17 @@
 "sintaxe inválida ou desconhecida no nome do gatilho '%.250s' (no interesse "
 "do gatilho para o pacote '%.250s')"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "falhou ao abrir arquivo de lista de gatilhos interessados '%.250s'"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "falhou ao retroceder arquivo de gatilhos interessados '%.250s'"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1174,37 +1180,43 @@
 "erro de sintaxe no arquivo de gatilhos interessados '%.250s'; nome de pacote "
 "ilegal '%.250s': %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "impossível criar novo arquivo de gatilhos interessados '%.250s'"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "impossível escrever novo arquivo de gatilhos interessados '%.250s'"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "impossível criar novo arquivo de gatilhos interessados '%.250s'"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "impossível criar novo arquivo de gatilhos interessados '%.250s'"
 
-#: lib/dpkg/triglib.c:442
-#, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "impossível criar novo arquivo de gatilhos interessados '%.250s'"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "impossível instalar novo arquivo de gatilhos interessados '%.250s'"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "não foi possível remover '%.250s'"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "impossível criar novo arquivo de gatilhos interessados '%.250s'"
+
+#: lib/dpkg/triglib.c:383
+#, fuzzy, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "impossível criar novo arquivo de gatilhos interessados '%.250s'"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1212,47 +1224,47 @@
 "arquivo de gatilho interessados duplicado para o arquivo chamado '%.250s' e "
 "pacote '%.250s'"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "impossível criar novo arquivo de gatilhos de arquivo '%.250s'"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "impossível escrever novo arquivo de gatilhos de arquivo '%.250s'"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "impossível criar novo arquivo de gatilhos de arquivo '%.250s'"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "impossível criar novo arquivo de gatilhos de arquivo '%.250s'"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "impossível criar novo arquivo de gatilhos de arquivo '%.250s'"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "impossível instalar novo arquivo de gatilhos de arquivo como '%.250s'"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "impossível ler arquivo de gatilhos de arquivo '%.250s'"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "erro de sintaxe no arquivo de gatilhos de arquivo '%.255s'"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1261,7 +1273,7 @@
 "gatilhos de arquivo registram menções a nomes de pacotes ilegais "
 "'%.250s' (para interesse no arquivo '%.250s'): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1270,32 +1282,40 @@
 "arquivo de gatilhos ci '%.250s' contém sintaxe de gatilho ilegal no nome do "
 "gatilho '%.250s': %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "impossível abrir arquivo de gatilhos ci '%.250s'"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "arquivo de gatilhos ci contém diretiva de sintaxe desconhecida"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "arquivo de gatilhos ci contém diretiva desconhecida '%.250s'"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "impossível criar diretório de estado dos gatilhos '%.250s'"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 "impossível definir o proprietário do diretório de estado dos gatilhos "
 "'%.250s'"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "nomes de gatilho vazios não são permitidos"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "nome de gatilho contém caracteres inválidos"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1320,7 +1340,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "erro lendo do \"pipe\" dpkg-deb"
 
@@ -1339,12 +1359,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "erro estabelecendo posse da ligação simbólica '%.255s'"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "erro estabelecendo posse de '%.255s'"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "erro estabelecendo permissões de '%.255s'"
@@ -1406,17 +1426,27 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arquivo continha objeto '%.255s' de tipo desconhecido 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat file '%s'"
+msgstr "não foi possível executar \"stat\" em nome antigo '%s': %s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Substituindo arquivos no pacote antigo %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Substituídos por arquivos no pacote instalado %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1424,95 +1454,100 @@
 msgstr ""
 "tentando sobrescrever diretório '%.250s' no pacote %.250s com não-diretório"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "tentando sobrescrever '%.250s', que também está no pacote %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "falhou ao ler '%.255s' (em '%.255s')"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "mecanismo dpkg-deb durante '%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "erro fechando/escrevendo '%.255s'"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "erro criando pipe '%.255s'"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, 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:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "erro criando ligação fixa (\"hard link\") '%.255s'"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "erro criando ligação simbólica '%.255s'"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "erro criando diretório '%.255s'"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "impossível mover do caminho '%.255s' para instalar nova versão"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "impossível ler ligação '%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "impossível criar ligação simbólica de backup para '%.255s'"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "impossível executar \"chown\" da ligação simbólica de backup para '%.255s'"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "impossível criar ligação de backup de '%.255s' antes de instalar nova versão"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "impossível instalar nova versão de '%.255s'"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "impossível criar '%.255s'"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "impossível retirar '%.255s' do buffer"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1521,7 +1556,7 @@
 "dpkg: aviso - ignorando problema de dependência com %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, fuzzy, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1530,7 +1565,7 @@
 "dpkg: aviso - considerando desconfiguração do pacote essencial\n"
 " %s, para habilitar %s.\n"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1539,7 +1574,7 @@
 "dpkg: não, %s é essencial, não vou desconfigurá-lo\n"
 " para habilitar %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1548,29 +1583,29 @@
 "dpkg: não, não posso continuar com %s (--auto-deconfigure ajudará):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "remoção de %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "instalação de %.250s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 "dpkg: considerando desconfiguração de %s, que seria quebrado por %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: sim, vou desconfigurar %s (quebrado por %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1579,12 +1614,12 @@
 "dpkg: sobre %s contendo %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 #, fuzzy
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "dpkg: aviso - ignorando quebra, posso continuar de qualquer modo!\n"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1593,27 +1628,27 @@
 "instalando %.250s quebrará %.250s, e\n"
 " a desconfiguração não é permitida (--auto-deconfigure poderá ajudar)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "instalar %.250s quebrará software existente"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1622,108 +1657,110 @@
 "dpkg: pacote %s precisa de reinstalação, mas vou removê-lo assim mesmo como "
 "você pediu.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "pacotes conflitantes - não instalando %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 #, fuzzy
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "dpkg: aviso - ignorando conflito, posso continuar de qualquer modo!\n"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, 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:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "falhou ao executar find para --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "falhou ao executar \"fdopen\" no \"pipe\" do find"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "erro lendo o \"pipe\" do find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "erro fechando o \"pipe\" do find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "procura por --recursive retornou erro não manipulado %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "procurei, mas não achei pacotes (arquivos casando com *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Selecionando pacote previamente não selecionado %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Ignorando pacote não selecionado %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versão %.250s de %.250s já instalada, ignorando.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s - aviso: revertendo %.250s de %.250s para %.250s.\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "Não vou reverter %.250s da versão %.250s para %.250s, ignorando.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1732,28 +1769,28 @@
 "não consigo remover versão recém-instalada de '%.250s' para permitir a "
 "reinstalação da cópia de backup"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "impossível restaurar versão de backup de '%.250s'"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "impossível restaurar versão de backup de '%.250s'"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "impossível remover versão recém-instalada de '%.250s'"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "impossível remover versão recém-extraída de '%.250s'"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
@@ -1761,14 +1798,14 @@
 "impossível executar \"stat\" no novo arquivo de configuração (\"conffile\") "
 "\"dist\" '%.250s'"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 "impossível executar \"stat\" no arquivo de configuração (\"conffile\") "
 "atualmente instalado '%.250s'"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1779,59 +1816,59 @@
 "O arquivo de configuração '%s' não existe no sistema.\n"
 "Instalando novo arquivo de configuração como você pediu.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "dpkg: %s: aviso - falhou ao remover backup antigo '%.250s': %s\n"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "dpkg: %s: aviso - falhou ao renomear '%.250s' para '%.250s': %s\n"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: falhou ao executar '%s %s'"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 "dpkg: %s: aviso - falhou ao remover antiga versão \"distrib\" '%.250s': %s\n"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 "dpkg: %s: aviso - falhou ao remover '%.250s' (antes de sobrescrever): %s\n"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "dpkg: %s: aviso - falhou ao ligar '%.250s' a '%.250s': %s\n"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Instalando nova versão do arquivo de configuração %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "impossível instalar '%.250s' como '%.250s'"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "nenhum pacote chamado '%s' está instalado, não posso configurar"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "pacote %.250s já está instalado e configurado"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1840,7 +1877,7 @@
 "pacote %.250s não está pronto para configuração\n"
 " não posso configurar (estado atual '%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1849,11 +1886,11 @@
 "dpkg: problemas de dependência impedem a configuração de %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependência - deixando desconfigurado"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1863,7 +1900,7 @@
 "pedido:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1871,12 +1908,12 @@
 "O pacote está em um estado de inconsistência muito ruim - você deveria\n"
 " reinstalá-lo antes de tentar uma configuração."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Configurando %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, fuzzy, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1886,7 +1923,7 @@
 "'%s'\n"
 " (= '%s'): %s\n"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, fuzzy, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1895,7 +1932,7 @@
 "dpkg: %s: aviso - arquivo de configuração '%s' é um link circular\n"
 " (= '%s')\n"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, fuzzy, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1905,7 +1942,7 @@
 "configuração (\"conffile\") '%s'\n"
 " (= '%s'): %s\n"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, fuzzy, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1915,37 +1952,37 @@
 "nome de arquivo degenerado\n"
 " ('%s' é uma ligação simbólica para '%s')\n"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, fuzzy, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "dpkg: %s: aviso - arquivo de configuração (\"conffile\") '%.250s' não é um "
 "arquivo simples ou uma ligação simbólica (= '%s')\n"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr ""
 "dpkg: %s: aviso - impossível abrir arquivo de configuração (\"conffile\") %s "
 "para hash: %s\n"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Digite 'exit' quando terminar.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1954,12 +1991,12 @@
 "\n"
 "Arquivo de configuração '%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (na verdade '%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1970,7 +2007,7 @@
 " ==> Arquivo no sistema criado por você ou por um script.\n"
 " ==> Arquivo também no pacote, fornecido pelo mantenedor dele.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1979,7 +2016,7 @@
 "\n"
 "     Não modificado desde a instalação.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1988,7 +2025,7 @@
 "\n"
 " ==> Modificado (por você ou por um script) desde a instalação.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1997,37 +2034,37 @@
 "\n"
 " ==> Excluído (por você ou por um script) desde a instalação.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> O distribuidor do pacote lançou uma versão atualizada.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     A versão no pacote é a mesma que a da última instalação.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Usando novo arquivo como você pediu.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Usando arquivo atual como você pediu.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Mantendo arquivo de configuração antigo como padrão.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Usando novo arquivo de configuração como padrão.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2043,168 +2080,170 @@
 "      Z     : colocar este processo em segundo plano para examinar a "
 "situação\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " A ação padrão é manter sua versão atual.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " A ação padrão é instalar a nova versão.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[padrão=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[padrão=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[sem padrão]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "erro escrevendo para stderr, descoberto antes do prompt do arquivo de "
 "configuração (\"conffile\")"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr ""
 "erro de leitura em stdin no prompt do arquivo de configuração (\"conffile\")"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF em stdin no prompt do arquivo de configuração (\"conffile\")"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s depende de %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s pré-depende de %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s recomenda %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s sugere %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s quebra %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s conflita com %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s melhora %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s está para ser removido.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s está para ser desconfigurado.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s está instalado, mas sua versão é %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s está desempacotado, mas nunca foi configurado.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr " %.250s está desempacotado, mas sua versão é %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  a versão mais recente configurada de %.250s é %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s está %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s fornece %.250s mas está para ser removido.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s fornece %.250s mas está para ser desconfigurado.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s fornece %.250s mas está %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s não está instalado.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versão %.250s) está para ser instalado.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versão %.250s) está presente e %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s fornece %.250s e está para ser instalado.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s fornece %.250s e está presente e %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Type dpkg-trigger --help for help about this utility."
+msgid "Use --help for help about diverting files."
+msgstr "Digite dpkg-trigger --help para ajuda sobre este utilitário."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versão %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2219,8 +2258,8 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2232,7 +2271,7 @@
 "Pública Geral\") versão 2 ou posterior para condições de cópia. Não há\n"
 "NENHUMA garantia.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2242,7 +2281,7 @@
 "Uso: %s [<opção> ...] <comando>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2254,7 +2293,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -2297,7 +2336,7 @@
 "Scripts preinst/postrm dos pacotes deverão sempre especificar --package e\n"
 "--divert.\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2306,19 +2345,13 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat file '%s'"
-msgstr "não foi possível executar \"stat\" em nome antigo '%s': %s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error checking `%s': %s"
 msgid "error checking '%s'"
 msgstr "erro ao checar '%s': %s"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2327,144 +2360,144 @@
 "renomear envolve sobrescrever '%s' com\n"
 "  arquivo diferente '%s', não permitido"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "impossível abrir arquivo fonte '%.250s'"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "cannot stat new name `%s': %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "não foi possível executar \"stat\" em novo nome '%s': %s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 #| msgid "rename: remove duplicate old link `%s': %s"
 msgid "rename: remove duplicate old link '%s'"
 msgstr "renomear: remover ligação antiga duplicada '%s': %s"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "impossível abrir arquivo fonte '%.250s'"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "local diversion of %s"
 msgstr "localmente desviado para: %s\n"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "local diversion of %s to %s"
 msgstr "localmente desviado para: %s\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "diversion of %s by %s"
 msgstr "desvio por %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "diversion of %s to %s by %s"
 msgstr "desviado por %s para: %s\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "any diversion of %s"
 msgstr "desvio por %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "any diversion of %s to %s"
 msgstr "desviado por %s para: %s\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "cannot open GPL file"
 msgid "cannot create new %s file"
 msgstr "não foi possível abrir arquivo GPL"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "impossível efetuar \"flush\" em vsnprintf "
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 #| msgid "remove old diversions-old: %s"
 msgid "error removing old diversions-old"
 msgstr "remover antigo \"diversions-old\": %s"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "erro criando novo \"statoverride-old\": %s"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "erro instalando novo \"statoverride\": %s"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s precisa de um único argumento"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "nome de arquivo \"%s\" não é absoluto"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "arquivo não pode conter novas linhas"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Não foi possível desviar diretórios"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "Não foi possível desviar diretórios"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "Deixando '%s'"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "'%s' conflita com '%s'"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "Adicionado '%s'"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
 msgstr "Nenhum desvio (\"diversion\") '%s', nenhum removido"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2475,7 +2508,7 @@
 "  na remoção de '%s'\n"
 "  encontrado '%s'"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2486,17 +2519,17 @@
 "  na remoção de '%s'\n"
 "  encontrado '%s'"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "Removendo '%s'"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "pacote não pode conter novas linhas"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "desviar-para não pode conter novas linhas"
 
@@ -2579,8 +2612,8 @@
 "usando dselect ou dpkg --configure --pending (ou dpkg --triggers-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s não aceita argumentos"
@@ -2673,7 +2706,7 @@
 msgid "--compare-versions bad relation"
 msgstr "má relação em --compare-versions"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "versão tem má sintaxe: %s\n"
@@ -2730,12 +2763,12 @@
 "dpkg - aviso, ignorando problema porque --force foi habilitado:\n"
 " "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "impossível abrir arquivo com lista de arquivos do pacote '%.250s'"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, fuzzy, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2744,39 +2777,39 @@
 "dpkg: aviso sério: arquivo com lista de arquivos do pacote '%.250s' está "
 "faltando, assumindo que o pacote não tem arquivos instalados atualmente.\n"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "impossível abrir arquivo com lista de arquivos do pacote '%.250s'"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "lista de arquivos do pacote '%.250s'"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, fuzzy, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "erro fechando arquivo com lista de arquivos do pacote '%.250s'"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Lendo banco de dados ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2784,40 +2817,40 @@
 msgstr[0] "%d arquivos e diretórios atualmente instalados).\n"
 msgstr[1] "%d arquivos e diretórios atualmente instalados).\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 "impossível criar arquivo com lista de arquivos atualizados para o pacote %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 "falhou ao escrever no arquivo com lista de arquivos atualizada para o pacote "
 "%s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 "falhou ao executar \"flush\" do arquivo com lista de arquivos atualizada "
 "para o pacote %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 "falhou ao sincronizar arquivo com lista de arquivos atualizada para o pacote "
 "%s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 "falhou ao fechar arquivo com lista de arquivos atualizada para o pacote %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2857,7 +2890,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "dpkg - erro: PATH não está definido.\n"
 
 #: src/help.c:129
@@ -2890,7 +2923,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "impossível executar \"setenv\" para script de mantenedor"
@@ -2901,66 +2934,66 @@
 msgstr "falhou ao executar \"chroot\" para '%.250s'"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "falhou ao mudar para o diretório '%.255s'"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "impossível definir permissões de execução em '%.250s'"
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "impossível executar \"setenv\" para script de mantenedor"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "antigo script %s"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "impossível executar \"stat\" em %s '%.250s'"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "novo script %s"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "antigo script %s"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "impossível executar \"stat\" em %s '%.250s'"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - tentando script do novo pacote em vez disso ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "não há script na nova versão do pacote - desistindo"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... parece que acabou tudo OK.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "impossível criar '%.255s'"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2969,7 +3002,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "impossível verificar a existência de '%.250s'"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "não foi possível ler diretório info"
 
@@ -3043,7 +3076,7 @@
 "  -Dh|--debug=help                  Mostra ajuda sobre depuração.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -3203,7 +3236,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr "Use 'dselect' ou 'aptitude' para gerenciamento amigável de pacotes.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3255,30 +3288,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3287,102 +3324,102 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "problemas de dependência - não removendo"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "problemas de dependência - não removendo"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "impossível executar \"setenv\" para script de mantenedor"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "erro de leitura no arquivo de configuração '%.255s'"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3390,7 +3427,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3398,37 +3435,37 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug requer um argumento octal"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nome de pacote nulo na lista separada por vírgulas em --ignore-depends "
 "'%.250s'"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends requer um nome de pacote válido. '%.250s' não é; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "inteiro inválido para --%s: '%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3437,7 +3474,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3445,12 +3482,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opção de forçar/recusar '%.*s' desconhecida"
 
-#: src/main.c:511
+#: src/main.c:513
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "Aviso: opção forçar/recusar obsoleta '%s'\n"
@@ -3473,8 +3510,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "fim de arquivo inesperado após fim da linha %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "necessário uma opção de ação"
 
@@ -3638,92 +3675,92 @@
 msgid "passed\n"
 msgstr "passou\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "falhou ao criar nome de diretório temporário"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "pacote %s possui muitos pares Conflita/Substitui"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "versão antiga do pacote possui nome de arquivo info demasiadamente longo "
 "iniciando '%.250s'"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "impossível remover arquivo info obsoleto '%.250s'"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "impossível instalar arquivo info (supostamente) novo '%.250s'"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "impossível abrir diretório de controle temporário"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "pacote contém nome de arquivo de controle demasiadamente longo (iniciando "
 "'%.50s')"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "informação de controle do pacote continha diretório '%.250s'"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "remoção do diretório de informação de controle do pacote '%.250s' não disse "
 "que não se tratava de um diretório"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr "dpkg: aviso - pacote %s continha lista como arquivo info"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "impossível instalar novo arquivo info '%.250s' como '%.250s'"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "impossível excluir arquivo de informações de controle '%.250s'"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "impossível acessar arquivo"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "falhou ao criar nome de diretório temporário"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "tamanho da informação de controle"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Informação registrada sobre %s a partir de %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "arquitetura do pacote (%s) não combina com a do sistema (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3732,105 +3769,105 @@
 "dpkg: quanto a %s, contendo %s, problema de pré-dependência:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "problema de pré-dependência - %.250s não será instalado"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr "dpkg: aviso - ignorando problema de pré-dependência!\n"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Preparando para substituir %s %s (usando %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Desempacotando %s (de %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "nome do arquivo de configuração (começando '%.250s') é muito longo (>%d "
 "caracteres)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "erro de leitura em %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "erro fechando %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "erro tentando abrir %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Desconfigurando %s, para permitir a remoção de %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Desconfigurando %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Desempacotando substituto %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "erro lendo a saída do tar do dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 "arquivo tar do sistema de arquivos corrompido - arquivo de pacote corrompido"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: zap possivelmente com zeros no final"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, fuzzy, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "dpkg: aviso - não foi possível executar \"stat\" em arquivo antigo '%.250s' "
 "portanto não excluindo o mesmo: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "dpkg: aviso - impossível excluir diretório antigo '%.250s': %s\n"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, fuzzy, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "dpkg: aviso - arquivo de configuração antigo '%.250s' era um diretório vazio "
 "(e foi excluído)\n"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "impossível executar \"fstat\" em outro arquivo novo '%.250s'"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, fuzzy, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3839,12 +3876,12 @@
 "dpkg: aviso - arquivo antigo '%.250s' é o mesmo que diversos arquivos novos! "
 "(ambos '%.250s' e '%.250s')\n"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "dpkg: aviso - impossível %s arquivo antigo '%%.250s': %%s\n"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
@@ -4013,7 +4050,7 @@
 "  --admindir=<diretório>           Usa <diretório> ao invés de %s.\n"
 "  -f|--showformat=<formato>        Usa formato alternativo para --show.\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -4035,6 +4072,10 @@
 "  direita a menos que o tamanho seja negativo, neste caso o alinhamento à\n"
 "  esquerda será usado.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, fuzzy, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4095,7 +4136,7 @@
 msgid "Removing %s ...\n"
 msgstr "Removendo %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, fuzzy, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4104,53 +4145,54 @@
 "dpkg - aviso: durante a remoção de %.250s, impossível remover diretório "
 "'%.250s': %s - o diretório seria um ponto de montagem?\n"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "não foi possível remover '%.250s'"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "não foi possível criar %.250s"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "dpkg - aviso: durante a remoção de %.250s, diretório '%.250s' não estava "
 "vazio, logo não foi removido.\n"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "não foi possível remover '%.250s'"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Expurgando arquivos de configuração de %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr ""
 "não foi possível remover arquivo de configuração antigo '%.250s' (= '%.250s')"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 "não foi possível ler diretório de arquivo do configuração '%.250s' (de "
 "'%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "não foi possível remover antigo arquivo de configuração de backup "
 "'%.250s' (de '%.250s')"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "não foi possível remover a antiga lista de arquivos"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "não foi possível remover script \"postrm\" antigo"
 
@@ -4193,7 +4235,11 @@
 msgid "read error on standard input"
 msgstr "erro de leitura na entrada padrão"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4203,7 +4249,7 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4214,7 +4260,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -4245,56 +4291,56 @@
 "  --help                   mostra esta mensagem de ajuda.\n"
 "  --version                mostra a versão.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "removendo / do final"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "não foi possível abrir novo arquivo \"statoverride\": %s"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "erro removendo \"statoverride-old\": %s"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "erro criando novo \"statoverride-old\": %s"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "erro instalando novo \"statoverride\": %s"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add precisa de quatro argumentos"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, fuzzy, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr "mas --force especificado portanto será ignorado."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, fuzzy, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Um \"override\" para \"%s\" já existe."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, fuzzy, c-format
 msgid "--update given but %s does not exist"
 msgstr "aviso: --update informado mas %s não existe"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Nenhum \"override\" presente."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 #, fuzzy
 msgid "--update is useless for --remove"
 msgstr "aviso: --update é inútil para --remove"
@@ -4366,16 +4412,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "arquivo \"statoverride\" '%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Digite dpkg-trigger --help para ajuda sobre este utilitário."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Utilitário de gatilho de pacote Debian %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4386,7 +4432,7 @@
 "     %s [<opções> ...] <comando>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4400,7 +4446,7 @@
 "                                   gatilhos.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4422,22 +4468,22 @@
 "  --no-act                         Somente teste - não muda nada.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: diretório de dados de gatilho ainda não criado\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: registros de gatilhos ainda inexistentes\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 #, fuzzy
 msgid "takes one argument, the trigger name"
 msgstr "dpkg-trigger aceita um argumento, o nome do gatilho"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4447,13 +4493,13 @@
 "dpkg-trigger deve ser chamado a partir de um script de mantenedor (ou com "
 "uma opção --by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: nome de pacote em espera ilegal '%.250s': %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "dpkg-trigger: nome de gatilho inválido '%.250s': %.250s"
@@ -4486,33 +4532,34 @@
 msgstr "Processando gatilhos para %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s precisa de exatamente um arquivo Packages como argumento"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "impossível acessar a área de estados do dpkg para uma completa atualização "
 "de disponibilidade"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "atualização completa de disponibilidade requer acesso de escrita à área de "
 "estados do dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Substituindo informações de pacotes disponíveis, usando %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Atualizando informações de pacotes disponíveis, usando %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4520,7 +4567,7 @@
 msgstr[0] "Informações sobre %d pacote(s) foram atualizadas.\n"
 msgstr[1] "Informações sobre %d pacote(s) foram atualizadas.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4649,8 +4696,8 @@
 msgstr[0] "dpkg-deb: ignorando %d avisos sobre o(s) arquivo(s) de controle\n"
 msgstr[1] "dpkg-deb: ignorando %d avisos sobre o(s) arquivo(s) de controle\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s precisa de um argumento <diretório>"
@@ -4683,26 +4730,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: construindo pacote '%s' em '%s'.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "falhou ao criar tmpfile (data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "área de controle"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "falhou ao executar \"unlink\" no tmpfile (dados), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4718,20 +4765,20 @@
 msgid "error writing `%s'"
 msgstr "erro escrevendo '%s'"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "entre membros"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "falhou ao escrever o nome de arquivo para o \"pipe\" tar (dados)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4749,78 +4796,78 @@
 msgid "error reading %s from file %.255s"
 msgstr "erro lendo %s de arquivo %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "falhou ao ler arquivo '%.255s'"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "falhou ao executar \"fstat\" no arquivo"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "arquivo não possui ponto no número de versão"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "arquivo não possui novas linhas no cabeçalho"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "arquivo '%.250s' está corrompido - número parcial ruim"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "arquivo '%.250s' não é um arquivo binário debian (tente dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "arquivo não possui ponto no número de versão"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "arquivo não possui novas linhas no cabeçalho"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "arquivo não possui ponto no número de versão"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "versão do arquivo %.250s não entendida, obtenha um dpkg-deb mais recente"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "pulado dados de membro de %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
 "arquivo '%.250s' contém membros de dados não entendidos %.*s, desistindo"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "arquivo '%.250s' contém dois membros de controle, desistindo"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4832,23 +4879,23 @@
 " novo pacote debian, versão %s.\n"
 " tamanho %ld bytes: arquivo de controle= %zi bytes.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "arquivo possui tamanho de controle mal formatado '%s'"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "pulado dados de membro de %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4860,7 +4907,7 @@
 " antigo pacote debian, versão %s.\n"
 " tamanho %ld bytes: arquivo de controle= %zi, arquivo main= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4869,51 +4916,52 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "'%.255s' não é um formato de arquivo debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "falhou ao escrever para o \"pipe\" na cópia"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "falhou ao fechar o \"pipe\" na cópia"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "dados"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "falhou ao mudar para o diretório"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "falhou ao criar diretório"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "falhou ao mudar para o diretório após criá-lo"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "falhou ao mudar para o diretório"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s: descompactação"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 #, fuzzy
 msgid "paste"
 msgstr "passou\n"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s precisa de um nome de arquivo .deb como argumento"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4922,38 +4970,38 @@
 "--%s precisa de um diretório-alvo.\n"
 "Talvez você devesse usar dpkg --install?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s aceita no máximo dois argumentos (.deb e diretório)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s aceita somente um argumento (nome do arquivo .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "falhou ao mudar para o diretório '/' para limpeza"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
 msgid "control file '%s'"
 msgstr "não foi possível executar \"stat\" em nome antigo '%s': %s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: '%.255s' não contém componente de controle '%.255s'\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "abertura do componente '%.255s' (em %.255s) falhou de maneira não esperada"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, fuzzy, c-format
 #| msgid "One requested control component is missing"
 msgid "%d requested control component is missing"
@@ -4961,59 +5009,59 @@
 msgstr[0] "Um componente de controle requerido está faltando"
 msgstr[1] "Um componente de controle requerido está faltando"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "não foi possível fazer vasculhar o diretório '%.255s'"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "não foi possível executar \"stat\" '%.255s' (em '%.255s')"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "não foi possível abrir '%.255s' (em '%.255s')"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "falhou ao ler '%.255s' (em '%.255s')"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bytes, %5d linhas   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     não é um arquivo simples  %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(nenhum arquivo 'control' no arquivo de controle!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "não foi possível abrir o componente 'control'"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "falhou durante a leitura do componente 'control'"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "erro fechando o \"pipe\" do find"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Erro no formato"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents aceita exatamente um argumento"
 
@@ -5024,7 +5072,19 @@
 "Mecanismo (\"backend\") de repositório de pacotes Debian '%s' versão %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -5035,6 +5095,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -5050,7 +5112,7 @@
 " --fsys-tarfile <deb>              Gera sistema de arquivos \"tarfile\".\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -5062,11 +5124,12 @@
 "<carq> é o nome de um componente de arquivo administrativo.\n"
 "<ccampo> é o nome de um campo no arquivo 'control' principal.\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5091,7 +5154,7 @@
 "                                     bzip2, lzma, none\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5105,7 +5168,7 @@
 "ao usuário. Pacotes desempacotados usando 'dpkg-deb --extract'\n"
 "serão instalados incorretamente!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5113,17 +5176,17 @@
 "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:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "inteiro inválido para --%s: '%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "inteiro inválido para --%s: '%.250s'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tipo de compressão desconhecido '%s'!"
@@ -5143,7 +5206,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "arquivo '%.250s' está corrompido - nova linha faltando após %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "erro lendo %.250s"
@@ -5235,53 +5298,58 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "arquivo '%.250s' está corrompido - número parcial ruim"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+msgid "package architecture"
+msgstr " (pacote: "
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "arquivo '%.250s' está corrompido - \"magic\" ruim no fim do segundo cabeçalho"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "arquivo '%.250s' está corrompido - segundo membro não é um membro de dados"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "arquivo '%.250s' está corrompido - número errado de partes para tamanhos "
 "citados"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "arquivo '%.250s' está corrompido - tamanho errado para o número parcial "
 "citado"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "impossível executar \"fstat\" no arquivo parcial '%.250s'"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "arquivo '%.250s' está corrompido - muito pequeno"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "não é possível abrir arquivo parcial '%.250s'"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "arquivo '%.250s' não é um arquivo parcial"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5301,6 +5369,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5323,12 +5392,19 @@
 "    Tamanho do arquivo parcial (porção usada):  %lu bytes\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<desconhecido>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--info requer um ou mais argumentos de arquivos parciais"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "arquivo '%s' não é um arquivo parcial\n"
@@ -5362,7 +5438,7 @@
 msgid "split package part"
 msgstr "pacote faltando"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "feito\n"
@@ -5414,17 +5490,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Opções:\n"
 "  --depotdir <diretório>           Usa <diretório> ao invés de %s/%s.\n"
@@ -5437,20 +5522,29 @@
 "\n"
 "Estado de saída: 0 = OK;  1 = -a não é uma parte;  2 = problema!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Digite dpkg-split --help para ajuda."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fim de arquivo não esperado em %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "tamanho da parcial é muito grande ou não é positivo"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, fuzzy, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "tamanho da parcial deve ser pelo menos %dk (para permitir cabeçalho)"
@@ -5561,42 +5655,42 @@
 msgid "Deleted %s.\n"
 msgstr "Excluído %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "impossível abrir arquivo fonte '%.250s'"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "impossível executar \"fstat\" no arquivo fonte"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "arquivo fonte '%.250s' não é um arquivo simples"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split necessita de um nome de arquivo fonte como argumento"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "--split aceita no máximo um nome de arquivo fonte e um prefixo de destino"
@@ -5764,132 +5858,93 @@
 
 # FIXME: tentar descobrir o mais rápido possível o melhor significado para parse. - Carlos
 # SUGESTÂO: análise ? -> erro de análise ?
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 #, fuzzy
 #| msgid "parse error"
 msgid "error"
 msgstr "erro de interpretação"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "aviso"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat %s: %s"
-msgstr "não foi possível executar \"stat\" em nome antigo '%s': %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, fuzzy, c-format
 #| msgid "two commands specified: %s and --%s"
 msgid "two commands specified: --%s and --%s"
 msgstr "dois comandos especificados: %s e --%s"
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "não foi possível abrir log `%s' : %s\n"
 
-#: utils/update-alternatives.c:395
-#, fuzzy, c-format
-#| msgid "%s: copying %s to %s failed, giving up: %s"
-msgid "scan of %s failed: %s"
-msgstr "%s: cópia de %s para %s falhou, desistindo: %s"
-
-#: utils/update-alternatives.c:420
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "falhou ao executar %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "impossível fazer com que %s fosse uma ligação simbólica para %s: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "impossível instalar %s como %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "impossível remover %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "fim de arquivo inesperado em %s em %.255s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "desviado por %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "fim de arquivo inesperado em %s em %.255s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, fuzzy, c-format
 msgid "%s corrupt: %s"
 msgstr "erro interno: %s corrompido: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "novas linhas proibidas em arquivos update-alternatives (%s)"
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "erro ao gravar `%s'"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "escravo %s duplicado"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 #, fuzzy
 msgid "slave link"
 msgstr "ligação escrava %s duplicada"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "ligação escrava é a mesma que a ligação principal %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "ligação escrava %s duplicada"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "caminho %s duplicado"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, fuzzy, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5898,235 +5953,271 @@
 "Alternativa para %s aponta para %s - a qual não foi encontrada. Removendo da "
 "lista de alternativas."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 #, fuzzy
 msgid "priority"
 msgstr "prioridade %s %s"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, fuzzy, c-format
 msgid "priority of %s: %s"
 msgstr "prioridade %s %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "impossível ler %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 #, fuzzy
 msgid "invalid status"
 msgstr "modo de atualização inválido"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 #, fuzzy
 msgid "master link"
 msgstr "ligação escrava %s duplicada"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "impossível fechar %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, fuzzy, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "Descartando ligação escrava obsoleta %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "impossível escrever %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, fuzzy, c-format
 msgid "  link currently points to %s"
 msgstr " ligação atualmente aponta para %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 #, fuzzy
 msgid "  link currently absent"
 msgstr " ligação atualmente ausente"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "%s - priority %s"
 msgid "%s - priority %d"
 msgstr "%s - prioridade %s"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr " escravo %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "'Melhor' versão atual é %s."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Nenhuma versão disponível."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "Descrição"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 #, fuzzy
 msgid "Priority"
 msgstr "prioridade %s %s"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, fuzzy, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Pressione enter para manter o padrão[*] ou digite o número da seleção: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Não foi possível encontrar alternativa '%s'."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "fim de arquivo inesperado em %s em %.255s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "Renomeando ligação %s de %s para %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, fuzzy, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "Renomeando ligação escrava %s de %s para %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr ""
+
+#: utils/update-alternatives.c:2241
+#, fuzzy, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "aviso: --update informado mas %s não existe"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr ""
+"Alternativa para %s aponta para %s - a qual não foi encontrada. Removendo da "
+"lista de alternativas."
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr ""
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "argumento desconhecido '%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install precisa de <ligação> <nome> <caminho> <prioridade>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "prioridade deve ser um inteiro"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s precisa de <nome> <caminho>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s precisa de <nome>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave somente permitido com --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave precisa de <ligação> <nome> <caminho>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "nome %s é tanto primário quanto escravo"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "ligação %s é tanto primário quanto escravo"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s precisa de um único argumento"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opção desconhecida '%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -6135,67 +6226,23 @@
 "precisa de --display, --config, --set, --install, --remove, --all, --remove-"
 "all ou --auto"
 
-#: utils/update-alternatives.c:2215
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr ""
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2239
-#, fuzzy, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "aviso: --update informado mas %s não existe"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
-
-#: utils/update-alternatives.c:2257
-#, fuzzy, c-format
-msgid "it is a slave of %s"
-msgstr " escravo %s: %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "erro de leitura na entrada padrão"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, fuzzy, c-format
 msgid "no alternatives for %s."
 msgstr "Nenhuma alternativa para %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
@@ -6204,73 +6251,113 @@
 "%s foi modificado (manualmente ou por um script).\n"
 "Mudando para atualizações manuais somente."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, fuzzy, c-format
 msgid "setting up automatic selection of %s."
 msgstr "Configurando seleção automática de %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "Alternativa %s para %s não registrada, não removendo."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 "Não há programa que forneça %s.\n"
 "Nada a ser configurado.\n"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "Alternativa %s para %s não registrada, não removendo."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, fuzzy, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "Removendo alternativa selecionada manualmente - mudando para modo automático"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr ""
 "Atualizações automáticas de %s estão desabilitadas, deixando-as intocadas."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 "Para retornar para atualizações automáticas utilize 'update-alternatives --"
 "auto %s'."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "Usando '%s' para fornecer '%s'."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~ msgid "it is a slave of %s"
+#~ msgstr " escravo %s: %s"
+
+#, fuzzy
+#~| msgid "cannot stat old name `%s': %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "não foi possível executar \"stat\" em nome antigo '%s': %s"
+
+#, fuzzy
+#~| msgid "%s: copying %s to %s failed, giving up: %s"
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "%s: cópia de %s para %s falhou, desistindo: %s"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "falhou ao executar %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "impossível fazer com que %s fosse uma ligação simbólica para %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "impossível instalar %s como %s: %s"
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "erro ao gravar `%s'"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "impossível ler %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "impossível fechar %s: %s"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "impossível escrever %s: %s"
+
+#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "impossível renomear %s para %s: %s"
@@ -6581,9 +6668,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "pulado dados de membro de %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "falhou ao executar tar"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "falhou ao criar nome de diretório temporário"
Binary files dpkg/po/pt.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/pt.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/pt.po /home/vorlon/devel/multiarch/dpkg-debian/po/pt.po
--- dpkg/po/pt.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/pt.po	2012-06-07 10:11:09.426073000 -0700
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-12-20 03:12+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -23,7 +23,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "não foi possível escrever o ficheiro '%s' "
@@ -44,71 +44,77 @@
 msgid "ar member file (%s)"
 msgstr "falhou ao fazer fstat ao ficheiro membro de ar (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "falhou ao ler em cópia do buffer para %s"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "falhou ao escrever na cópia do buffer para %s"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "leitura curta em cópia de buffer para %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "falhou executar o tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "não foi possível executar %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: descompressão"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compressão"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: erro ao ligar entrada a stream gzip"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: erro interno de leitura de gzip: '%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: erro interno de escrita de gzip"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: erro de ligação da saída a stream gzip"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: erro interno de leitura de gzip"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: erro interno de escrita de gzip: '%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: erro interno de escrita de gzip: %s"
@@ -123,31 +129,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: erro interno de leitura de bzip2: '%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: erro interno de escrita de bzip2"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: erro de ligação de saída para stream bzip2"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: erro interno de leitura de bzip2"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: erro interno de escrita de bzip2: '%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "erro inesperado de bzip2"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -156,7 +162,7 @@
 "actualiza o directório contendo o ficheiro %.250s' cujo nome é demasiado "
 "longo (comprimento=%d, max=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -164,99 +170,99 @@
 "actualiza o directório que contém ficheiros com diferentes comprimentos de "
 "nomes (ambos %d e %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "não pode pesquisar directório de actualizações `%.255s'"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "falhou a remoção do ficheiro de actualização incorporado %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "não foi possível criar `%.255s'"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "não foi possível preencher %.250s com enchimento"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "não foi possível esvaziar %.250s após enchimento"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "não foi possível executar seek para o inicio de %.250s após enchimento"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "não foi bloquear ficheiro %s para teste"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "não foi possível abrir/criar lockfile de status da base de dados"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "não tem permissão para fazer lock à base de dados do status dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "não foi possível fazer lock à base de dados de status do dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "a operação pedida necessita de privilégios de super-utilizador"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "não foi possível aceder à área de status do dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 "a operação necessita de acesso de leitura/escrita na área do estado do dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "falhou a remoção do meu próprio ficheiro de actualização %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "não foi possível escrever o status actualizado de `%.250s'"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "não foi possível esvaziar o status actualizado de `%.250s'"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "não foi possível truncar para o status actualizado de `%.250s'"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "não foi possível fazer fsync ao status actualizado de `%.250s'"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "não foi possível fechar o status actualizado de `%.250s'"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "não foi possível instalar o status actualizado de `%.250s'"
@@ -279,73 +285,75 @@
 msgid "unable to open directory '%s'"
 msgstr "não foi possível abrir o ficheiro '%s'"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "não foi possível abrir o ficheiro '%s'"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "não foi possível fazer sync ao ficheiro '%s'"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "não foi possível fechar o ficheiro '%s'"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "falhou escrever os detalhes de `%.50s' a `%.250s'"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "falhou abrir '%s' para escrita na base de dados %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "não foi possível estabelecer buffer no ficheiro de base de dados %s"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr ""
 "falhou ao escrever o registo %s da base de dados cerca de '%.50s' a '%.250s'"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "falhou esvaziar a base de dados %s para '%.250s'"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "falhou o fsync na base de dados %s para '%.250s'"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "falhou fechar '%.250s' após escrever a base de dados %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "falhou criar link '%.250s' para '%.250s' para backup da base de dados %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr ""
 "falhou a instalação de '%.250s' como '%.250s' contendo a base de dados %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -354,7 +362,7 @@
 "%s: erro fatal irrecuperável, a abortar:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -366,13 +374,13 @@
 "%s: erro fatal irrecuperável, a abortar:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "sem memória para limpeza de nova entrada"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -381,33 +389,33 @@
 "%s: erro enquanto limpava:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: demasiados erros encadeados durante a recuperação de erros !!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "sem memória para limpeza de nova entrada"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "sem memória para nova limpeza de entrada com muitos argumentos"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: erro processando %s (--%s):\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: aviso: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d erro interno: %s\n"
@@ -423,107 +431,107 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "`%.*s' não é permitido para %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "lixo após %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "nome de pacote inválido (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "campo de detalhes de ficheiro vazio `%s'"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "campo `%s' de detalhes de ficheiro não é permitido no ficheiro status"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "demasiados valores no campo de detalhes `%s' do ficheiro (comparado a outros)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "valores a menos no campo `%s' de detalhes de ficheiro (comparado a outros)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "sim/não no campo booleano"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "palavra no campo 'priority'"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "valor para o campo `status' não é permitido neste contexto"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "primeira (want) palavra no campo `status'"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "segunda (error) palavra no campo `status'"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "terceira (status) palavra no campo `status'"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "erro na string Versão '%.250s'"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "utilizados campos obsoletos `Revision' e `Package-Revision'"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "valor para o campo `config-version' não é permitido neste contexto"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "erro na string Config-Version '%.250s'"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "valor para `conffiles' tem uma linha mal formatada `%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "valor para `conffiles' tem uma linha que começa por um não-espaço `%c'"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "raiz ou directório nulo está listado como conffile"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 "campo `%s', falta nome de pacote, ou lixo onde era esperado nome de pacote"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "campo `%s', nome de pacote inválido `%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -532,7 +540,7 @@
 "campo `%s', referência a `%.255s':\n"
 " má relação de versão %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -541,7 +549,7 @@
 "campo `%s', referência a `%255s':\n"
 " `%c' está obsoleto, em vez disso utilize `%c=' ou `%c%c'"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -551,11 +559,11 @@
 " combinação exacta implícita no número de versão, sugere utilizar `=' em vez "
 "disso"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Apenas versões exactas podem ser utilizadas para Provides"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -564,55 +572,55 @@
 "campo `%s', referência a `%.255s':\n"
 " valor de versão começa por não-alfanumérico, sugere adicionar um espaço"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "campo `%s', referência a `%.255s': versão contém `%c'"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "campo `%s', referência a `%.255s': versão não terminada"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "campo '%s', referência a '%.255s': erro na versão"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "campo `%s', erro de sintaxe após referência ao pacote `%.255s'"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternativas (`|') não são permitidas no campo %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "o valor para o campo `triggers-pending' não é permitido neste contexto"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "nome de 'trigger' pendente ilegal `%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "'trigger' duplicado `%.255s' pendente"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "valor para o campo `triggers-awaited' não é permitido neste contexto"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "nome de pacote ilegal no 'trigger' esperado `%.255s': %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "'trigger' esperado duplicado do pacote `%.255s'"
@@ -669,7 +677,7 @@
 msgid "unable to write to status fd %d"
 msgstr "não foi possível escrever o status fd %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "realloc failed (%zu bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -680,8 +688,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc falhou (%zu bytes)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "a alocação de memória falhou"
 
@@ -714,204 +722,210 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "não foi possível activar flag close-on-exec para %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "erro de configuração: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "falhou ao abrir o ficheiro de configuração '%.255s' para leitura: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "aspas não coincidentes em '%s'"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "opção desconhecida '%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "'%s' necessita de um valor"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "'%s' não toma valores"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "erro de leitura no ficheiro de configuração `%.255s'"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "erro ao fechar o ficheiro de configuração `%.255s'"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "erro ao fechar o directório de configuração '%s'"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "opção desconhecida --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "a opção --%s toma um valor"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "a opção --%s não toma valores"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "opção desconhecida -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "a opção -%c toma um valor"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "a opção -%c não toma valores"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "opção obsoleta '--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "acções em conflito -%c (--%s) e -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "valor duplicado para o campo `%s'"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "nome do campo definido pelo utilizador `%.*s' é muito pequeno"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "valor duplicado para campo definido pelo utilizador `%.*s'"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Configured-Version para o pacote com Status inapropriado"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "o pacote tem estado %s mas são esperados 'triggers'"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 "o pacote tem estado 'triggers-awaited' mas não são esperados 'triggers'"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "o pacote tem estado %s mas estão 'triggers' pendentes"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 "o pacote tem estado 'triggers-pending' mas não tem 'triggers' pendentes"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Pacote que tem estado não-instalado tem ficheiros de configuração, a esquecê-"
 "los"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr ""
 "falhou ao abrir ficheiro de informações do pacote `%.255s' para leitura"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "não pode fazer stat ao ficheiro de informação do pacote `%.255s'"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "não pode fazer mmap ao ficheiro de informação do pacote `%.255s'"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "não pode fazer stat ao ficheiro de informação do pacote `%.255s'"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "falhou fechar após ler: `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF após campo do nome `%.*s'"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "newline no campo do nome `%.*s'"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS EOF (^Z) no campo do nome `%.*s'"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "campo do nome `%.*s' tem de ser seguido de dois pontos"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF antes do valor do campo `%.*s' (falta o newline final)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "caractere MSDOS EOF no valor do campo `%.*s' (falta newline?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "newline no campo do nome `%.*s'"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF durante o valor do campo `%.*s' (falta newline final)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 "várias entradas de informação de pacotes encontradas, apenas uma permitida"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "falhou fechar após ler: `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "sem informação de pacotes em `%.255s'"
@@ -940,63 +954,63 @@
 "%s, no ficheiro '%.255s' perto da linha %d:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "não pode ser uma string vazia"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "tem de começar por um alfanumérico"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "o caractere `%c' não é permitido (apenas letras, dígitos e caracteres `%s')"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<nenhum>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "string de versão está vazia"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "string de versão contém espaços"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "era na versão não é um número"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "nada após dois pontos no número de versão"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "caractere inválido no número de versão"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "caractere inválido no número de revisão"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "falta %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "valor vazio para %s"
@@ -1015,52 +1029,52 @@
 msgid "(no description available)"
 msgstr "(sem descrição disponível)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "não foi possível ignorar o sinal %s antes de correr %.250s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "erro soltando-se do sinal %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (subprocesso); %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "falhou fork"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "subprocesso %s retornou erro do status de saída %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "wait para o sub-processo %s falhou"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "subprocesso %s morto pelo sinal (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", core dumped"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "subprocesso %s falhou com o código de status de wait %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "wait para o sub-processo %s falhou"
@@ -1082,63 +1096,55 @@
 msgstr ""
 "erro de sintaxe no ficheiro de 'triggers' adiados `%.250s' no carácter `%s'%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "não foi possível abrir/criar o ficheiro de acesso exclusivo `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "accionado o trigger"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "não foi possível fazer stat ao ficheiro de 'triggers' adiados `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "não foi possível abrir o ficheiro de 'triggers' adiados `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 "não foi possível abrir/criar novo ficheiro de 'triggers' adiados `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "erro ao ler o ficheiro de 'triggers' adiados `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr ""
 "não foi possível escrever o novo ficheiro de 'triggers' adiados `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "não foi possível fechar o novo ficheiro `%.250s' de 'triggers' adiados"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "não foi possível instalar novo ficheiro de 'triggers' adiados `%.250s'"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "não são permitidos 'triggers' com nomes vazios"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "o nome do 'trigger' contém um carácter inválido"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1147,18 +1153,18 @@
 "sintaxe inválida ou desconhecida no nome `%.250s' do 'trigger' (nos "
 "interesses do 'trigger' para o pacote `%.250s')"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr ""
 "falhou a abertura do ficheiro `%.250s' de lista de interesses do 'trigger'"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "falhou o rewind ao ficheiro `%.250s' de interesses do 'trigger'"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1167,44 +1173,50 @@
 "erro de sintaxe do ficheiro de interesse, `%.250s', do 'trigger'; nome `"
 "%.250s': ilegal de pacote: %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr ""
-"não foi possível criar um novo ficheiro `%.250s' de interesse do 'trigger'"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr ""
 "não foi possível escrever o novo ficheiro `%.250s' de interesse do 'trigger'"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr ""
 "não foi possível esvaziar o novo ficheiro '%.250s' de interesse do 'trigger'"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr ""
 "não foi possível fazer sync ao novo ficheiro '%.250s' de interesse do "
 "'trigger'"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
 msgstr ""
-"não foi possível fechar o novo ficheiro '%.250s' de interesse do 'trigger'"
+"não foi possível instalar  o novo ficheiro `%.250s' de interesse do 'trigger'"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
 #, c-format
-msgid "unable to install new trigger interest file `%.250s'"
+msgid "cannot remove `%.250s'"
+msgstr "não pode remover `%.250s'"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
 msgstr ""
-"não foi possível instalar  o novo ficheiro `%.250s' de interesse do 'trigger'"
+"não foi possível criar um novo ficheiro `%.250s' de interesse do 'trigger'"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr ""
+"não foi possível fechar o novo ficheiro '%.250s' de interesse do 'trigger'"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1212,53 +1224,53 @@
 "ficheiro duplicado de interesse de 'trigger' para o ficheiro `%.250s' e "
 "pacote `%.250s'"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr ""
 "não foi possível criar novo ficheiro `%.250s' de 'triggers' de ficheiro"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr ""
 "não foi possível escrever novo ficheiro `%.250s' de 'triggers' de ficheiro"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr ""
 "não foi possível esvaziar o novo ficheiro '%.250s' de 'triggers' de ficheiro"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr ""
 "não foi possível fazer sync o novo ficheiro '%.250s' de 'triggers' de "
 "ficheiro"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "não foi possível fechar o novo ficheiro '%.250s' de 'triggers'"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr ""
 "não foi possível instalar o novo ficheiro `%.250s' de 'triggers' de ficheiro"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "não foi possível ler o ficheiro `%.250s' de 'triggers' de ficheiro"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "erro de sintaxe no ficheiro `%.250s' de 'triggers' de ficheiro"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1267,7 +1279,7 @@
 "registo de ficheiro de 'trigger' menciona o nome de pacote ilegal `"
 "%.250s' (para o interesse no ficheiro `%.250s'): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1276,33 +1288,41 @@
 "o ficheiro `%.250s' de triggers ci contém sintaxe ilegal de trigger no "
 "trigger com o nome `%.250s': %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "não foi possível abrir o ficheiro de triggers ci `%.250s'"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "o ficheiro de triggers ci contém sintaxe com directiva desconhecida"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "o ficheiro de triggers ci contém a directiva `%.250s' desconhecida"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr ""
 "não foi possível criar o directório, `%.250s',  de estado de 'triggers'"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 "não foi possível definir o dono do directório,`%.250s', de estado de "
 "'triggers'"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "não são permitidos 'triggers' com nomes vazios"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "o nome do 'trigger' contém um carácter inválido"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1327,7 +1347,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "erro ao formatar a string para uma variável varbuf"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "erro ao ler do pipe dpkg-deb"
 
@@ -1346,12 +1366,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "erro ao definir dono do link simbólico `%255s'"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "erro ao definir dono de `%255s'"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "erro ao definir permissões de `%.255s'"
@@ -1412,17 +1432,26 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arquivo continha objecto `%.255s' de tipo desconhecido 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "Não pode fazer stat ao ficheiro '%s'"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "A substituir ficheiros no pacote antigo %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Substituído por ficheiros no pacote instalado %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1431,95 +1460,100 @@
 "a tentar sobre-escrever o directório '%.250s' no pacote %.250s %.250s com um "
 "não directório"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "a tentar sobre-escrever '%.250s', que também está no pacote %.250s %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "não conseguiu criar `%.255s' (enquanto processava `%.255s')"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "backend dpkg-deb durante `%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "erro ao fechar/escrever `%.255s'"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "erro ao criar pipe `%.255s'"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "erro ao criar dispositivo `%.255s'"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "erro ao criar hard link `%.255s'"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "erro ao criar link simbólico `%.255s'"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "erro ao criar o directório `%.255s'"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, 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:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "não foi possível ler link `%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, 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:830
+#: src/archives.c:841
 #, 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:835
+#: src/archives.c:846
 #, 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:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, 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:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "não foi possível abrir '%.255s'"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "não foi possível sync ao ficheiro '%.255s'"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1528,7 +1562,7 @@
 "a ignorar problema de dependências com %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1537,7 +1571,7 @@
 "a considerar a desconfiguração do pacote essencial\n"
 "%s, para permitir %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1546,7 +1580,7 @@
 "dpkg: não, %s é essencial, não irá desconfigurar\n"
 " de modo a permitir %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1555,29 +1589,29 @@
 "dpkg: não, não pode proceder com %s (--auto-deconfigure irá ajudar):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "remoção de %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "instalação de %.250s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 "dpkg: a considerar a desconfiguração de %s, que seria estragada por %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: sim, irá desconfigurar %s (estragado por %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1586,11 +1620,11 @@
 "dpkg: acerca de %s contendo %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "a ignorar problema, pode proceder de qualquer modo !"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1599,29 +1633,29 @@
 "instalar %.250s irá estragar %.250s, e\n"
 "não é permitida a desconfiguração (--auto-deconfigure poderá ajudar)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "instalar %.250s irá estragar software existente"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1630,109 +1664,111 @@
 "dpkg: o pacote %s necessita de reinstalação, mas vai ser removido de "
 "qualquer modo conforme você pediu.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: o pacote %s necessita de reinstalação, não irá remover.\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "pacotes em conflito - não irá instalar %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "a ignorar conflito, pode proceder de qualquer modo !"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, 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:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "procura por dpkg --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "falhou fdopen ao pipe de find"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "erro na leitura do pipe de find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "erro ao fechar o pipe de find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, 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:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "procurou, mas não encontrou pacotes (ficheiros coincidindo com *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<saída standard>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<erro standard>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "A seleccionar pacote anteriormente não seleccionado %s\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "A passar à frente do pacote não seleccionado %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, 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:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "a fazer downgrade a %.250s de %.250s para %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "Não irá fazer downgrade de %.250s da versão %.250s para a %.250s, passando à "
 "frente.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1741,39 +1777,39 @@
 "não foi possível remover versão recentemente instalada de `%.250s' para "
 "permitir re-instalação de cópia backup"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "não foi possível restaurar versão de backup de `%.250s'"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "não foi possível remover cópia de backup de '%.250s'"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "não foi possível remover a versão acabada de instalar de `%.250s'"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "não foi possível remover versão de `%.250s' recentemente extraída"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "não foi possível fazer stat do novo conffile distribuído '%.250s'"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 "não é possível fazer stat ao ficheiro de configuração `%.250s' actualmente "
 "instalado"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1784,57 +1820,57 @@
 "Ficheiro de configuração `%s', não existe no sistema.\n"
 "A instalar novo ficheiro de configuração conforme você pediu.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: falhou remover o backup antigo '%.250s': %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: falhou renomear '%.250s' para '%.250s': %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: falhou remover '%.250s': %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: falhou remover a versão antiga distribuída '%.250s': %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: falhou remover '%.250s' (antes de sobre-escrever): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: falhou fazer o link '%.250s' para '%.250s': %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "A instalar nova versão do ficheiro de configuração %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "Não foi possível instalar `%.250s' como `%.250s'"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "não está instalado nenhum pacote chamado `%s', não pode configurar"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "o pacote %.250s já está instalado e configurado"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1843,7 +1879,7 @@
 "o pacote %.250s não está pronto para configuração\n"
 " não pode configurar (status actual `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1852,11 +1888,11 @@
 "dpkg: problemas com dependências impedem a configuração de %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas com dependências - a deixar por configurar"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1866,7 +1902,7 @@
 "pediu:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1874,12 +1910,12 @@
 "O pacote está num mau estado de inconsistência - deve\n"
 " reinstala-lo antes de tentar configura-lo."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "A instalar %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1888,7 +1924,7 @@
 "%s: não foi possível fazer stat ao ficheiro de configuração '%s'\n"
 " (= '%s'): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1897,7 +1933,7 @@
 "%s: ficheiro de configuração '%s' é um link circular\n"
 " (= '%s')"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1906,7 +1942,7 @@
 "%s: não foi possível fazer readlink ao ficheiro de configuração '%s'\n"
 " (= '%s'): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1915,36 +1951,36 @@
 "%s: ficheiro de configuração '%.250s' resolve para ficheiro degenerado\n"
 " ('%s é um link simbólico para '%s')"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: ficheiro de configuração '%.250s' não é um ficheiro de texto ou link "
 "simbólico (= '%s')"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr ""
 "%s: não foi possível abrir o ficheiro de configuração %s para o hash: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Escreva `exit' quando tiver terminado.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1953,12 +1989,12 @@
 "\n"
 "Ficheiro de configuração `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (na verdade `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1969,7 +2005,7 @@
 " ==> Ficheiro no sistema criado por si ou por um script.\n"
 " ==> Ficheiro também no pacote disponibilizado pelo maintainer do pacote.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1978,7 +2014,7 @@
 "\n"
 "     Não foi modificado desde a instalação.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1987,7 +2023,7 @@
 "\n"
 " ==> Modificado (por si ou por um script) desde a instalação.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1996,37 +2032,37 @@
 "\n"
 " ==> Apagado (por si ou por um script) desde a instalação.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> O distribuidor do pacote enviou uma versão actualizada.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "    A versão no pacote é a mesma que a da última instalação.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> A usar o novo ficheiro conforme você pediu.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> A usar o actual ficheiro antigo conforme você pediu.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> A manter o ficheiro de configuração antigo como predefinição.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> A usar o novo ficheiro de configuração como padrão.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2041,159 +2077,161 @@
 "      D     : mostrar diferenças entre as versões\n"
 "      Z     : iniciar uma shell para examinar a situação\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " A acção padrão é manter a sua versão actual.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " A acção padrão é instalar a nova versão.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[padrão=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[padrão=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[sem padrão]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "erro ao escrever para stderr, descoberto antes da prompt do ficheiro de "
 "configuração"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "erro de leitura em stdin na prompt do ficheiro de configuração"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF em stdin na prompt do ficheiro de configuração"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s depende de %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s pre-depende de %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s recomenda %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s sugere %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s danifica %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s em conflito com %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s melhora %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s vai ser removido.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s vai ser desconfigurado.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s está instalado, mas é versão %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr " %.250s está descompactado, mas nunca foi configurado.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s está descompactado, mas é versão %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s a última versão configurada é %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s é %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s disponibiliza %.250s mas vai ser removido.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s disponibiliza %.250s mas vai ser desconfigurado.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s disponibiliza %.250s mas é %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s não está instalado.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versão %.250s) vai ser instalado.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versão %.250s) está presente e %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s disponibiliza %.250s e vai ser instalado.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s disponibiliza %.250s e está presente e %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "Use --help para ajuda sobre consultar pacotes."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2201,7 +2239,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versão %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2212,8 +2250,8 @@
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 "Copyright (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2223,7 +2261,7 @@
 "Isto é software livre; veja a GNU General Public License versão 2 ou\n"
 "posterior para condições de cópia. Não existe NENHUMA garantia.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2233,7 +2271,7 @@
 "Utilização: %s [<opção> ...] <comando>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2251,7 +2289,7 @@
 " --listpackage <ficheiro>  mostrar qual o pacote que desvia o ficheiro.\n"
 " --truename <ficheiro>     retornar o ficheiro desviado.\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2281,7 +2319,7 @@
 "  --version                indicar a versão.\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2295,17 +2333,12 @@
 "Os scripts preinst/postrm dos pacotes devem sempre especificar --package e --"
 "divert.\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "Não pode fazer stat ao ficheiro '%s'"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "erro ao verificar '%s'"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2314,129 +2347,129 @@
 "renomear envolve sobre-escrever `%s' com\n"
 "  um ficheiro diferente `%s', não permitido"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "não foi possível escrever o ficheiro '%s' "
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "cópia de ficheiro"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "Não pode fazer renomear '%s' para '%s'"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "renomear: remover o link antigo duplicado '%s'"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "não foi possível abrir o ficheiro fonte `%.250s'"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "desvio local de %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "desvio local de %s para %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "desvio de %s por %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "desvio de %s para %s por %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "qualquer desvio de %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "qualquer desvio de %s para %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "não pode criar o novo ficheiro %s "
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "não foi possível fazer flush ao ficheiro '%s'"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "erro ao remover o antigo diversions-old"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "erro ao criar o novo diversions-old"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "erro ao instalar novos desvios"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s necessita de um único argumento"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "o nome do ficheiro \"%s\" não é absoluto"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "o ficheiro não pode conter quebras de linha"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Não é possível desviar directórios"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "não é possível desviar o ficheiro '%s' para o próprio"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "A deixar '%s'\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' choca com `%s'"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "A acrescentar '%s'\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Nenhum desvio '%s', nenhum removido.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2447,7 +2480,7 @@
 "  quando a remover `%s'\n"
 "  foi encontrado `%s'"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2458,16 +2491,16 @@
 "  quando a remover `%s'\n"
 "  foi encontrado `%s'"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "A remover '%s'\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "o pacote não pode conter novas linhas"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "o desvio não pode conter novas linhas"
 
@@ -2553,8 +2586,8 @@
 "only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s não leva argumentos"
@@ -2647,7 +2680,7 @@
 msgid "--compare-versions bad relation"
 msgstr "má relação de --compare-versions"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "versão '%s' tem sintaxe errada: %s"
@@ -2703,14 +2736,14 @@
 msgid "overriding problem because --force enabled:"
 msgstr "a ultrapassar problema porque --force está activo: "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 "não foi possível abrir o ficheiro de lista de ficheiros para o pacote `"
 "%.250s'"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2719,83 +2752,83 @@
 "falta ficheiro de lista de ficheiros `%.250s', assumindo que o pacote não "
 "tem actualmente ficheiros instalados."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr ""
 "não foi possível fazer stat ficheiro de lista de ficheiros para o pacote "
 "'%.250s'"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "lista de ficheiros para o pacote `%.250s'"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "falta uma nova linha final no ficheiro de lista de ficheiros para o pacote "
 "'%.250s'"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "o ficheiro de lista de ficheiros para o pacote `%.250s' contém um ficheiro "
 "vazio"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "erro ao fechar o ficheiro de lista de ficheiros para o pacote `%.250s'"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(A ler a base de dados ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "%d ficheiro(s) e directório(s) actualmente instalados.)\n"
 msgstr[1] "%d ficheiros e directórios actualmente instalados.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 "não foi possível criar ficheiro de lista de ficheiros actualizado para o "
 "pacote %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 "falhou escrever para ficheiro de lista de ficheiros actualizados para o "
 "pacote %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 "falhou esvaziar ficheiro de lista de ficheiros actualizados para o pacote %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 "falhou sincronizar ficheiro de lista de ficheiros actualizados para o pacote "
 "%s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 "falhou fechar ficheiro de lista de ficheiros actualizados para o pacote %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2834,7 +2867,9 @@
 msgstr "instalado"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "erro: PATH não está definido."
 
 #: src/help.c:129
@@ -2876,7 +2911,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2888,65 +2923,65 @@
 msgstr "falhou o chroot para `%.250s'"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "o chdir para `%.255s' falhou"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "não foi possível definir permissões de execução em `%.250s'"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "não foi possível fazer setenv para o script do maintainer"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "script %s instalado"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "não foi possível o stat a %s `%.250s'"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "novo script %s"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "script %s antigo"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "não foi possível o stat %s '%.250s': %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - em vez disso a tentar script do novo pacote ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "não existe script na nova versão do pacote - a desistir"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... parece que tudo correu bem.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "não foi remover, em segurança, '%.255s'"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2955,7 +2990,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "não foi possível verificar a existência de `%.250s'"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "não pode ler directório info"
 
@@ -3026,7 +3061,7 @@
 "  -Dh|--debug=help\t\t\tMostrar ajuda sobre debugging.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3155,7 +3190,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr "Para uma gestão amigável de pacotes utilize `dselect' ou `aptitude'.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3204,30 +3239,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3236,103 +3275,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "problemas com dependências - não removido"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "problemas com dependências - não removido"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "não foi possível fazer setenv para o script do maintainer"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "erro de leitura no ficheiro de configuração `%.255s'"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3340,7 +3379,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3348,40 +3387,40 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug necessita de um argumento em octal"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nome de pacote nulo na lista separada por virgulas de --ignore-depends`"
 "%.250s'"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends necessita de um nome de pacote válido.  `%.250s' não o é; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "número inteiro inválido para --%s: `%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "erro ao executar o hook '%s', código de saída %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "estado"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3390,7 +3429,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3398,12 +3437,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opção desconhecida de forçar/recusar `%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "opção forçar/recusar obsoleta '%s'\n"
@@ -3426,8 +3465,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes do fim da linha %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "é necessária uma opção de acção"
 
@@ -3592,91 +3631,91 @@
 msgid "passed\n"
 msgstr "passou\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "não foi possível criar directório temporário"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "o pacote %s tem demasiados pares de Conflicts/Replaces"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "a antiga versão do pacote tem um nome de ficheiro demasiado comprido "
 "começando por `%.250s'"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "não foi possível remover o ficheiro de info obsoleto `%.250s'"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "não foi possível instalar (o suposto) novo ficheiro info `%.250s'"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "não foi possível abrir o directório temporário de controle"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "o pacote contém um ficheiro de info de control com o nome de ficheiro "
 "demasiado comprido (começando por `%.50s')"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "a informação de controle do pacote contém o directório `%.250s'"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "rmdir de info de controle do pacote `%.250s' não disse que não era um dir"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "o pacote %s continha lista como ficheiro info"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "não foi possível instalar o novo ficheiro info `%.250s' como `%.250s'"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr ""
 "não foi possível remover o ficheiro de informações de controle `%.250s'"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "não pode aceder ao arquivo"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "não foi possível criar directório temporário"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "tamanho da informação de controlo"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Foi gravada informação sobre %s desde %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "a arquitectura do pacote (%s) não coincide com a do sistema (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3685,107 +3724,107 @@
 "dpkg: acerca de %s contendo %s, problema de pre-dependência:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "problema de pré-dependência - a não instalar %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "a ignorar problema de pré-dependência!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "A preparar para substituir %s %s (a usar %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "A descompactar %s (desde %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "nome do ficheiro de configuração (começando `%.250s') é demasiado comprido (>"
 "%d caracteres)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "erro de leitura em %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "erro a fechar %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "erro ao tentar abrir %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "A desconfigurar %s, para permitir a remoção de %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "A desconfigurar %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "A descompactar substituto %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "extracção do campo dpkg-deb "
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "erro ao ler a saída do tar de dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 "sistema de ficheiros do ficheiro tar corrompido - arquivo de pacote "
 "corrompido"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: zap possível rasto de zeros"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "não foi possível fazer stat ao ficheiro antigo '%.250s' por isso não será "
 "apagado: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "não foi possível apagar o directório antigo '%.250s': %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "o antigo ficheiro de configuração '%.250s' era um directório vazio (e agora "
 "foi apagado)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "Não foi possível fazer stat a outro novo ficheiro `%.250s'"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3794,12 +3833,12 @@
 "o ficheiro antigo '%.250s' é o mesmo que vários novos ficheiros! (ambos "
 "'%.250s' e '%.250s')"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "não foi possível remover o antigo ficheiro '%.250s' em segurança: %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(A notar o desaparecimento de %s, que foi totalmente substituído.)\n"
@@ -3982,7 +4021,7 @@
 "  -f|--showformat=<formato>        Usar o formato alternativo para --show.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -4005,6 +4044,10 @@
 "esquerda\n"
 "  será utilizado.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Use --help para ajuda sobre consultar pacotes."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4065,7 +4108,7 @@
 msgid "Removing %s ...\n"
 msgstr "A remover %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4074,51 +4117,52 @@
 "ao remover %.250s, não foi possível remover o directório '%.250s': %s - o "
 "directório poderá ser um ponto de montagem?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "não pode remover `%.250s'"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "não foi possível criar, em segurança, '%.250s'"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "ao remover %.250s, o directório '%.250s' não estava vazio, por isso não foi "
 "removido."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "não pode remover `%.250s'"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "A purgar os ficheiros de configuração para %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "não pode remover ficheiro de configuração antigo `%.250s' (= `%.250s')"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 "não pode ler o directório do ficheiro de configuração `%.250s' (de `%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "não pode remover o backup do ficheiro de configuração antigo `%.250s') (de `"
 "%.250s')"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "não foi possível remover a antiga lista de ficheiros"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "não pode remover o script postrm antigo"
 
@@ -4161,7 +4205,13 @@
 msgid "read error on standard input"
 msgstr "erro de leitura na entrada standard"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "Use --help para ajuda sobre consultar pacotes."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4170,7 +4220,7 @@
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4187,7 +4237,7 @@
 "  --list [<padrão-glob>]   listar os actuais overrides na base de dados.\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4211,31 +4261,31 @@
 "  --version                mostrar a versão.\n"
 "\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "a cortar o caminho /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "não pode abrir o ficheiro statoverride"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "erro ao remover statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "erro ao criar novo statoverride-old"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "erro ao instalar novo statoverride"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add necessita de quatro argumentos"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4244,21 +4294,21 @@
 "Já existe um override para '%s', mas --force foi especificado por isso será "
 "ignorado."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Já existe override para \"%s\", abortar."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "--update foi dada mas %s não existe"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Não está presente nenhum 'override'."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update é inútil para --remove"
 
@@ -4323,16 +4373,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "vários statoverrides presentes para o ficheiro '%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Escreva dpkg-trigger --help para ajuda acerca deste utilitário."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debian %s utilitário de trigger de pacotes versão %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4343,7 +4393,7 @@
 "            %s [<opções> ...] <comando>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4356,7 +4406,7 @@
 "'triggers'.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4378,21 +4428,21 @@
 "  --no-act                         Apenas testar - não alterar nada.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: o directório de dados de 'triggers' ainda não foi criado\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: ainda não existem registos de 'trigger'\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "leva um argumento, o nome do 'trigger'"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4402,13 +4452,13 @@
 "dpkg-trigger tem de ser chamado por um script do 'maintainer' (ou com uma "
 "opção --by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: nome `%.250s' ilegal de pacote esperado: %-250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "nome `%.250s' de 'trigger' inválido: %.250s"
@@ -4441,40 +4491,41 @@
 msgstr "A processar 'triggers' para %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s necessita exactamente de um argumento ficheiro Packages"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "não foi possível aceder à area de status do dpkg para uma completa "
 "actualização"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "actualização completa de disponibilidade necessita de acesso de escrita à "
 "área de estado do dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "A substituir a informação de pacotes disponíveis, a utilizar %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "A actualizar a informação de pacotes disponíveis, a utilizar %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "Foi actualizada a informação acerca de %d pacote(s).\n"
 msgstr[1] "Foi actualizada a informação acerca de %d pacote(s).\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4594,8 +4645,8 @@
 msgstr[0] "a ignorar %d aviso acerca do ficheiro control\n"
 msgstr[1] "a ignorar %d avisos acerca do(s) ficheiro(s) de controle.\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necessita de um argumento <directório>"
@@ -4629,26 +4680,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: a construir o pacote `%s' em `%s'.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "falhou criar tmpfile (data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "área de controlo"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "falhou o unlink tmpfile (data), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4665,20 +4716,20 @@
 msgid "error writing `%s'"
 msgstr "erro ao escrever `%s'"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "entre os números"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "falhou escrever o nome do ficheiro para um pipe do tar (data)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<comprimir> de tar -cf"
 
@@ -4696,67 +4747,67 @@
 msgid "error reading %s from file %.255s"
 msgstr "erro ao ler %s do ficheiro %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "falhou ler o arquivo `%.255s'"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "falhou o fstat ao arquivo"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "o arquivo não tem ponto no número de versão"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "o arquivo não tem newlines no cabeçalho"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "o ficheiro `%.250s' está corrompido - número de parte errado"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "o ficheiro `%.250s' não é um arquivo binário debian (tente dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "o arquivo não tem ponto no número de versão"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "o arquivo não tem newlines no cabeçalho"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "o arquivo não tem ponto no número de versão"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "versão do arquivo %.250s não foi compreendida, obtenha um dpkg-deb mais "
 "recente"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "saltou dados de membro de %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
@@ -4764,13 +4815,13 @@
 "o ficheiro `%.250s' contém o membro de dados %.*s não compreendido, a "
 "desistir"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "o ficheiro `%.250s' contém dois membros de controle, a desistir"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4782,23 +4833,23 @@
 " novo pacote debian, versão %s.\n"
 " %ld bytes de tamanho: arquivo de controle= %zi bytes.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "o arquivo tem o tamanho do controlo mal formatado `%s'"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "saltou dados de membro de %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4810,7 +4861,7 @@
 " pacote debian antigo, versão %s,\n"
 " tamanho %ld bytes: arquivo de controle= %zi, arquivo principal= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4819,49 +4870,50 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' não é um arquivo de formato debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 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:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "falhou fechar o pipe na cópia"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "dados"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "falhou o chdir para o directório"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "falhou criar directório"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 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:293
-msgid "failed to chdir to directory"
-msgstr "falhou o chdir para o directório"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<descompressão>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "colar"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s necessita de um ficheiro .deb como argumento"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4870,96 +4922,96 @@
 "--%s necessita de um directório de destino.\n"
 "Talvez você devesse estar a utilizar dpkg --install ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s toma apenas um argumento (ficheiro .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "falhou o chdir para `/' para limpeza"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "Não pode fazer stat ao ficheiro '%s'"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: `%.255s' não contém nenhum componente de controle `%.255s'\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr "abrir o componente `%.255s' (em %.255s) falhou de um modo inesperado"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "%d componente de controle pedido em falta"
 msgstr[1] "%d componentes de controle pedidos em falta"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "não pode pesquisar o directório `%.255s'"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "Não pode fazer stat `%.255s' (em %.255s')"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "não pode abrir `%.255s' (em %.255s')"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "falhou ler `%.255s' (em `%.255s')"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bytes, %5d linhas   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     não é um ficheiro comum   %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(nenhum ficheiro `control' no arquivo de controle!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "não pode abrir o componente `control'"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "falhou durante a leitura do componente `control'"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "erro ao fechar o componente '%s'"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Erro no formato"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents toma exactamente um argumento"
 
@@ -4969,7 +5021,19 @@
 msgstr "Debian `%s'' backend do arquivo de pacote versão %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4980,6 +5044,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4996,7 +5062,7 @@
 "tar.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -5009,11 +5075,27 @@
 "<cfield> é o nome de um campo no ficheiro principal `control'.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5039,7 +5121,7 @@
 "lzma, nenhuma.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5052,7 +5134,7 @@
 "ou `aptitude' para uma gestão de pacotes user-friendly. Pacotes\n"
 "descompactados com `dpkg-deb --extract' serão incorrectamente instalados !\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5060,17 +5142,17 @@
 "Escreva dpkg-deb --help para ajuda sobre manipulação de ficheiros *.deb;\n"
 "Escreva dpkg --help para ajuda sobre instalar e desinstalar pacotes."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "número inteiro inválido para -%c: '%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "nível de compressão inválido para -%c: %ld'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "compressão desconhecida tipo `%s'!"
@@ -5090,7 +5172,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "o ficheiro `%.250s' está corrompido - falta newline após %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "erro ao ler %.250s"
@@ -5189,54 +5271,60 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "o ficheiro `%.250s' está corrompido - número de parte errado"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "nome de pacote "
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "o ficheiro `%.250s está corrompido - magic errado no fim do segundo cabeçalho"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "o ficheiro `%.250s' está corrompido - o segundo membro não é um membro de "
 "dados"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "o ficheiro `%.250s' está corrompido - número errado de partes para os "
 "tamanhos citados"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "o ficheiro `%250s' está corrompido - o tamanho está errado para o número da "
 "parte citado"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "Não foi possível fazer fstat à parte do ficheiro `%.250s'"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "o ficheiro `%.250s' está corrompido - demasiado pequeno"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "não pode abrir ficheiro de parte de arquivo `%.250s'"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "o ficheiro `%250s' não é uma parte de arquivo"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5256,6 +5344,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5278,12 +5367,19 @@
 "    Tam. parte fich.(porção usada): %lu bytes\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<desconhecido>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s necessita de um ou mais argumentos de partes de ficheiro"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "o ficheiro `%s' não é uma parte de arquivo\n"
@@ -5318,7 +5414,7 @@
 msgid "split package part"
 msgstr "A formar o pacote %s com %d parte: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "feito\n"
@@ -5369,17 +5465,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Opções:\n"
 "  --depotdir <directório>          Usar <directório> em vez de %s/%s.\n"
@@ -5391,20 +5496,29 @@
 "\n"
 "Estado de saída: 0 = OK;  1 = -a não é uma parte;  2 = problema!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Escreva dpkg-split --help para ajuda."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fim de ficheiro inesperado em %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "o tamanho da parte ou é muito grande ou não é positivo"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -5516,27 +5630,27 @@
 msgid "Deleted %s.\n"
 msgstr "Apagado %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "extracção do campo dpkg-deb "
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "não foi possível abrir o ficheiro fonte `%.250s'"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "não foi possível fazer fstat ao ficheiro fonte"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "o ficheiro fonte `%.250s' não é um ficheiro simples"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5545,17 +5659,17 @@
 msgstr[0] "A formar o pacote %s com %d parte: "
 msgstr[1] "A formar o pacote %s com %d partes: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split necessita de um argumento de ficheiro fonte"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split leva no máximo um ficheiro fonte e um prefixo de destino"
 
@@ -5729,125 +5843,90 @@
 "  --version                mostrar a versão.\n"
 "\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "erro"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "aviso"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "Não pode fazer stat %s: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "readlink(%s) falhou: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "dois comandos especificados: --%s e --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "não pode acrescentar a %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "scan de %s falhou: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "falhou executar %s: %s"
-
-#: utils/update-alternatives.c:503
-#, c-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"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "não foi possível instalar %s como %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "não foi possível remover %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "fim de ficheiro inesperado ao tentar ler %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "enquanto lia %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "linha não terminada ao tentar ler %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s corrompido: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "newlines proibidas em ficheiros update-alternatives (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "ao escrever %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "nome do escravo"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "slave duplicado %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "ligação ao escravo"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "link slave igual ao link principal %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "'slave link' duplicado %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "ficheiro mestre"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "caminho duplicado %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5856,130 +5935,115 @@
 "alternativa %s (parte do grupo de ligação %s) não existe. A remover da lista "
 "de alternativas."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "prioridade"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "ficheiro escravo"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "prioridade de %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "não foi possível ler %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "estado"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "estado inválido"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "ligação mestre"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "não foi possível fechar %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "a descartar ligação de escravo obsoleto %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "não foi possível escrever %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "modo automático"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "modo manual"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "  o link actualmente aponta para %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "  link actualmente inexistente"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - prioridade %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  escravo %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "A 'melhor' versão actual é %s."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Sem versões disponíveis."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "Há %d escolha para a alternativa %s (disponibiliza %s)."
 msgstr[1] "Existem %d escolhas para a alternativa %s (disponibiliza %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Selecção"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Caminho"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Prioridade"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Estado"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Pressione enter para manter a escolha actual[*], ou digite o número da "
 "selecção: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "não substitui %s por uma ligação."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "não foi possível instalar a opção %s desconhecida"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -5988,98 +6052,153 @@
 "saltar a criação de %s porque o ficheiro associado %s (do grupo de ligação "
 "%s) não existe."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "não substitui %s por uma ligação."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Chamar %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Alternativa %s inalterada porque a escolha %s não está disponível."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Saltar alternativa %s desconhecida."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "linha demasiado comprida ou não terminada ao tentar ler %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Saltar linha inválida: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "a renomear a ligação %s de %s para %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "a renomear a ligação do escravo %s de %s para %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "nome da alternativas (%s) não pode conter '/' nem espaços."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "ligação da alternativa não é absoluta como deveria ser: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "o caminho da alternativa não é absoluto como deveria ser: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "alternativa %s não pode ser mestre: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "ligação de alternativa %s já é gerida por %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "o caminho %s da alternativa não existe."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "a alternativa %s não pode ser escravo de %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "alternativa %s não pode ser mestre: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "ligação de alternativa %s já é gerida por %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "argumento desconhecido `%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necessita de <link> <nome> <caminho> <prioridade>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<ligação> e <caminho> não podem ser o mesmo"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "a prioridade tem de ser um inteiro"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s necessita de <nome> <caminho>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s necessita de <nome>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave apenas é permito com --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necessita de <link> <nome> <caminho>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "o nome %s é primário e slave"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "o link %s é primário e slave"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s necessita de um argumento <ficheiro>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opção desconhecida `%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -6087,67 +6206,22 @@
 "necessita de --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all ou --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "alternativa %s não pode ser mestre: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "ligação de alternativa %s já é gerida por %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "ligação da alternativa não é absoluta como deveria ser: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "o caminho da alternativa não é absoluto como deveria ser: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "o caminho %s da alternativa não existe."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "nome da alternativas (%s) não pode conter '/' nem espaços."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "é uma alternativa mestre."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "é um escravo de %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "a alternativa %s não pode ser escravo de %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<entrada standard>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "nenhuma alternativa para %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s está suspenso, será actualizado com a melhor escolha."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6159,62 +6233,62 @@
 "%s foi alterado (manualmente ou por um script). A mudar para actualizações "
 "manuais apenas."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "a configurar a selecção automática de %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "alternativa %s para %s não registada, a não definir."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Não existe um programa que disponibiliza %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Nada para configurar."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Existe apenas uma alternativa no grupo de ligação %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "alternativa %s para %s não registada, a não remover."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "a remover alternativa seleccionada manualmente - a passar %s para modo "
 "automático"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr ""
 "actualizações automáticas de %s estão desactivadas, a deixar como está."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 "para voltar às actualizações automáticas use `update-alternatives --auto %s'."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "a usar %s para disponibilizar %s (%s) em %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
@@ -6222,13 +6296,49 @@
 "a forçar a reinstalação de alternativa %s porque a ligação de grupo %s está "
 "estragada."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "a alternativa %s actual é desconhecida, a mudar para %s para a ligação de "
 "grupo %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "é uma alternativa mestre."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "é um escravo de %s"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "Não pode fazer stat %s: %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "readlink(%s) falhou: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "scan de %s falhou: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "falhou executar %s: %s"
+
+#~ 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"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "não foi possível instalar %s como %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "ao escrever %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "não foi possível ler %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "não foi possível fechar %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "não foi possível escrever %s: %s"
+
 #, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6500,9 +6610,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "saltou área de controlo de %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "falhou executar o tar"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "falhou a criação de directório temporário"
 
diff -uNr --exclude .git --exclude .bzr dpkg/po/quot.sed /home/vorlon/devel/multiarch/dpkg-debian/po/quot.sed
--- dpkg/po/quot.sed	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/quot.sed	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,6 @@
+s/"\([^"]*\)"/“\1”/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“”/""/g
diff -uNr --exclude .git --exclude .bzr dpkg/po/remove-potcdate.sin /home/vorlon/devel/multiarch/dpkg-debian/po/remove-potcdate.sin
--- dpkg/po/remove-potcdate.sin	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/remove-potcdate.sin	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,19 @@
+# Sed script that remove the POT-Creation-Date line in the header entry
+# from a POT file.
+#
+# The distinction between the first and the following occurrences of the
+# pattern is achieved by looking at the hold space.
+/^"POT-Creation-Date: .*"$/{
+x
+# Test if the hold space is empty.
+s/P/P/
+ta
+# Yes it was empty. First occurrence. Remove the line.
+g
+d
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
Binary files dpkg/po/ro.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/ro.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/ro.po /home/vorlon/devel/multiarch/dpkg-debian/po/ro.po
--- dpkg/po/ro.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/ro.po	2012-06-07 10:11:09.426073000 -0700
@@ -24,7 +24,7 @@
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2011-01-25 13:59+0100\n"
 "Last-Translator: ioan-eugen STAN <stan.ieugen@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -42,7 +42,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "nu se poate scrie fișierul „%s”"
@@ -63,71 +63,77 @@
 msgid "ar member file (%s)"
 msgstr "eșec la „fstat” pentru fișierul membru ar (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "eșec la citirea copiei din memoria tampon pentru %s"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "eșec la scrierea copiei din memoria tampon pentru %s"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "citire scurtă a copiei din memoria tampon pentru %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "eșec la exec tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "nu se poate executa %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: decompresie"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compresie"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: eroare la legarea intrării de fluxul gzip"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: eroare internă gzip la citire: „%s”"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: eroare internă gzip la scriere"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: eroare la legarea ieșirii de fluxul gzip"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: eroare internă gzip la citire"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: eroare internă gzip la scriere: „%s”"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: eroare internă gzip la scriere: %s"
@@ -142,31 +148,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: eroare internă bzip2 de citire: „%s”"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: eroare internă bzip2 de scriere"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: eroare la legarea ieșirii cu fluxul bzip2"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: eroare internă bzip2 de citire"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: eroare internă bzip2 de scriere: „%s”"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "eroare bzip2 neașteptată"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -175,7 +181,7 @@
 "directorul cu actualizări conține fișierul „%.250s” al cărui nume este prea "
 "lung (lungime=%d, max=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -183,32 +189,32 @@
 "directorul cu actualizări conține fișiere cu nume de diferite lungimi (atât "
 "%d cât și %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "nu se poate scana directorul cu actualizări „%.255s”"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "eșec la ștergerea fișierului cu actualizări încorporat %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "nu se poate crea „%.255s”"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "nu se poate completa %.250s cu spații"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "flush imposibil pentru %.250s după completarea cu spații"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "nu se poate căuta începutul lui %.250s după completarea cu spații"
@@ -216,68 +222,68 @@
 # numele funcților și argumentelor acestora rămân cele originale
 # pentru a nu induce în eroare utilizatorul
 # `' devine „” - oricum ` și ' nu sunt pereche
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "nu se poate deschide fișierul de blocare %s pentru testare"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "nu se poate deschide/crea fișierul de blocare a bazei de date"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "nu aveți drepturi de blocare a bazei de date dpkg status"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "nu se poate bloca baza de date dpkg status"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "operația solicitată necesită drepturi de superutilizator"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "nu se poate accesa zona dpkg status"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "operația necesită acces de tip scriere/citire în zona dpkg status"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "eșec la ștergerea propriului fișier cu actualizări %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "nu se poate scrie starea actualizată a lui „%.250s”"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "flush imposibil pentru starea actualizată a lui „%.250s”"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "nu se poate trunchia pentru starea actualizată a lui „%.250s”"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "fsync imposibil pentru starea actualizată a lui „%.250s”"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "nu se poate închide starea actualizată a lui „%.250s”"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "nu se poate instala starea actualizată a lui „%.250s”"
@@ -300,74 +306,76 @@
 msgid "unable to open directory '%s'"
 msgstr "nu se poate deschide fișierul sursă „%s”"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "nu se poate deschide fișierul sursă „%s”"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "eșec la sync pentru fișierul „%s”"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "eșec la închiderea fișierului „%s”"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "eșec la scrierea detaliilor lui „%.50s” în „%.250s”"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "eșec la deschiderea „%s” pentru scrierea bazei de date %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "nu se poate seta memorie tampon pentru fișierul bazei de date %s"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr ""
 "eșec la scrierea înregistrării %s din baza de date, aproximativ „%.50s” până "
 "la „%.250s”"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "eșec la flush pentru baza de date %s în „%.250s”"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "eșec la fsync a bazei de date %s în „%.250s”"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "eșec la închiderea „%.250s” după scrierea bazei de date %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "eșec la link pentru „%.250s” la „%.250s” pentru a face o copie de siguranță "
 "a bazei de date %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "eșec la instalarea lui „%.250s” ca „%.250s” conținând baza de date %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -376,7 +384,7 @@
 "%s: eroare fatală irecuperabilă, se abandonează:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -388,13 +396,13 @@
 "%s: eroare fatală irecuperabilă, se abandonează:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "memorie insuficientă pentru noua intrare de curățire"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -403,33 +411,33 @@
 "%s: eroare în timpul curățării:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: prea multe erori imbricate în timpul revenirii din eroare !!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "memorie insuficientă pentru noua intrare de curățire"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 "memorie insuficientă pentru noua intrare de curățire cu multe argumente"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s: avertisment: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: avertisment: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: eroare internă %s\n"
@@ -445,33 +453,33 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "„%.*s” nepermis pentru %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "gunoi după %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "nume nevalid de pachet (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "câmp „%s” cu detalii fișier gol"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "câmp cu detalii fișier „%s” nepermis în fișierul de stare"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, 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)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
@@ -479,64 +487,64 @@
 
 # yes/no nu poate fi tradus deoarece e vorba de interpretarea valorilor existente în
 # fișerele de configurare(vezi codul sursă indicata)
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "yes/no în câmp logic"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "cuvânt în câmpul „priority”"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "valoare nepermisă pentru câmpul „status” în acest context"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "primul (dorit) cuvânt în câmpul „status”"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "al doilea cuvânt (eroare) în câmpul „status”"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "al treilea cuvânt (stare) în câmpul „status”"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "eroare în șirul Version „%.250s”"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "s-a folosit câmp învechit „Revision” sau „Package-Revision”"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "valoare pentru câmpul „config-version” nepermisă în acest context"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "eroare în șirul Config-Version „%.250s”"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "valoarea pentru „conffiles” are linie malformată „%.*s”"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, 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”"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "director nul sau rădăcină este trecut ca un fișier conffile"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -544,12 +552,12 @@
 "câmpul „%s”, lipsește numele pachetului sau gunoi unde se aștepta numele "
 "pachetului"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "câmpul „%s”, nume nevalid de pachet „%.255s”: %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -558,7 +566,7 @@
 "câmpul „%s”, referință la „%.255s”:\n"
 " relație incorectă cu o versiune %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -567,7 +575,7 @@
 "câmpul „%s”, referitor la „%.255s”:\n"
 " „%c” este învechit, folosiți în schimb „%c=” sau „%c%c”"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -577,11 +585,11 @@
 " potrivire implicită exactă a numărului versiunii, sugerăm folosirea „=” în "
 "loc"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Pentru Provides pot fi utilizate doar versiuni exacte"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -591,55 +599,55 @@
 " valoarea versiunii nu începe cu caracter alfanumeric, sugerăm adăugarea "
 "unui spațiu"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "câmpul „%s”, referință la „%.255s”: versiunea conține „%c”"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "câmpul „%s”, referință la „%.255s”: versiune neterminată"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "câmpul „%s”, referință la „%.255s”: eroare în versiune"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "câmpul „%s”, eroare sintactică după referința la pachetul „%.255s”"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternativele („|”) nu sunt permise în câmpul %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "valoare nepermisă pentru câmpul „triggers-pending” în acest context"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "nume de declanșator în așteptare nevalid: „%.255s”: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "declanșator în așteptare duplicat „%.255s”"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "valoare nepermisă pentru câmpul „triggers-awaited” în acest context"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "nume nelegal de pachet în declanșatorul așteptat „%.255s”: %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "pachet declanșator așteptat duplicat „%.250s”"
@@ -696,7 +704,7 @@
 msgid "unable to write to status fd %d"
 msgstr "nu se poate scrie status fd %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "malloc failed (%ld bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -708,8 +716,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc a eșuat (%ld octeți)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "eșec la alocarea memoriei"
 
@@ -742,207 +750,213 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "nu se poate activa fanionul close-on-exec pentru %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "eroare de configurare: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr ""
 "eșec la deschiderea fișierului de configurare „%.255s” pentru citire: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "ghilimelele nu sunt închise în „%s”"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "opțiune necunoscută „%s”"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "„%s” necesită o valoare"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "„%s” nu ia nici o valoare"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "eroare de citire în fișierul de configurare „%.255s”"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "eroare la închiderea fișierului de configurare „%.255s”"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "eroare la deschiderea directorului de configurare „%s”"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "opțiune necunoscută --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "opțiunea --%s ia o valoare"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "opțiunea --%s nu ia nici o valoare"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "opțiune necunoscută -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "opțiunea -%c ia o valoare"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "opțiunea -%c nu ia nici o valoare"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "opțiune învechită „--%s”\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "acțiuni în conflict -%c (--%s) și -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "valoare duplicată pentru câmpul „%s”"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "numele de câmp definit de utilizator „%.*s” prea scurt"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "valoare duplicată pentru câmpul definit de utilizator „%.*s”"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Configured-Version pentru pachet cu Status inadecvat"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "pachetul are starea %s, dar declanșatorii sunt așteptați"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 "pachetul are starea triggers-awaited, dar nu se așteaptă nici un declanșator"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "pachetul are starea %s, dar declanșatorii sunt în așteptare"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 "pachetul are starea triggers-pending, dar nu există nici un declanșator în "
 "așteptare"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Pachet care în starea not-installed are fișiere conffile, se uită de ele"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "eșec la deschiderea pentru citire a fișierului info „%.255s”"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "stat imposibil pentru fișierul info „%.255s”"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "mmap imposibil pentru fișierul info „%.255s”"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "stat imposibil pentru fișierul info „%.255s”"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "eșec la închidere după citire: „%.255s”"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF după numele câmpului „%.*s”"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "caracter newline în numele câmpului „%.*s”"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS EOF (^Z) în numele câmpului „%.*s”"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "numele câmpului „%.*s” trebuie urmat de caracterul două puncte"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 "EOF înainte de valoarea câmpului „%.*s” (lipsește caracterul newline final)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 "caracter MSDOS EOF în valoarea câmpului „%.*s” (lipsește caracterul newline?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "caracter newline în numele câmpului „%.*s”"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF în valoarea câmpului „%.*s” (lipsește caracterul newline final)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 "au fost găsite câteva intrări de informații pentru pachet, este permisă "
 "numai una"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "eșec la închidere după citire: „%.255s”"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "nici o informație despre pachet în „%.255s”"
@@ -971,66 +985,66 @@
 "%s, în fișierul „%.255s” lângă linia %d:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "nu poate fi fi șir gol"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "trebuie să înceapă cu un alfanumeric"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "caracterul „%c” nu este permis (doar litere, cifre și caracterele „%s”)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<nici unul>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "șirul versiune este gol"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "șirul versiunii conține spații"
 
 # „epoch” este un număr care se poate pune în fața versiunii unui
 # pachet (separat cu două puncte pentru a forța dpkg să considere
 # pachetul ca având o versiune mai mare. ex: 2:1.4.2
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "epoca din versiune nu este număr"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "nimic după două puncte în numărul versiunii"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "caracter nevalid în numărul de versiune"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "caracter nevalid în numărul de revizie"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "lipsește %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "valoare vidă pentru %s"
@@ -1049,53 +1063,53 @@
 msgid "(no description available)"
 msgstr "(nici o descriere disponibilă)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "nu se poate ignora semnalul %s înainte de rularea %.250s"
 
 # „eliberare” este „release” nu „un-catch”, oare ar trebui lăsat netradus?
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "eroare la eliberarea semnalului %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (subproces): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "fork a eșuat"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "subprocesul %s a returnat starea de eroare la ieșire %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "așteptarea după sub-procesul %s a eșuat"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "subproces %s omorât de semnalul (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", s-a aruncat nucleul"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "subprocesul %s a eșuat cu codul stării de așteptare %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "așteptarea după sub-procesul %s a eșuat"
@@ -1118,62 +1132,54 @@
 "eroare de sintaxă în fișierul de declanșatori amânați „%.250s” la caracterul "
 "„%s”%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr ""
 "nu se poate deschide/crea fișierul de blocare pentru declanșatori „%.250s”"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "declanșat"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "stat imposibil pentru fișierul cu declanșatori amânați „%.250s”"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "nu se poate deschide fișierul cu declanșatori amânați „%.250s”"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "nu se poate deschide/crea noul fișier cu declanșatori amânați „%.250s”"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "eroare la citirea fișierului cu declanșatori amânați „%.250s”"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "nu se poate scrie noul fișier cu declanșatori amânați „%.250s”"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "nu se poate închide noul fișier cu declanșatori amânați „%.250s”"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "nu se poate instala noul fișier cu declanșatori amânați „%.250s”"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "nu se permit nume vide de declanșatori"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "numele de declanșator conține un caracter nevalid"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1182,17 +1188,17 @@
 "sintaxă nevalidă sau necunoscută în numele declanșatorului „%.250s” (în "
 "interesele în declanșatori ale pachetului „%.250s”)"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "nu se poate deschide noul fișier cu interese în declanșatori „%.250s”"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "nu se poate reface fișierul cu interese în declanșatori „%.250s”"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1201,39 +1207,45 @@
 "eroare de sintaxă în fișierul cu interese în declanșatori „%.250s”; nume "
 "nelegal de pachet „%.250s”: %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "nu se poate crea un nou fișier cu interese în declanșatori „%.250s”"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "nu se poate scrie un nou fișier cu interese în declanșatori „%.250s”"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr ""
 "flush imposibil pentru noul fișier cu interese în declanșatori „%.250s”"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "sync imposibil pentru noul fișier cu interese în declanșatori „%.250s”"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "nu se poate închide noul fișier cu interese în declanșatori „%.250s”"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr ""
 "nu se poate instala noul fișier al intereselor în declanșatori „%.255s”"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "nu se poate șterge „%.250s”"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "nu se poate crea un nou fișier cu interese în declanșatori „%.250s”"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "nu se poate închide noul fișier cu interese în declanșatori „%.250s”"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1241,47 +1253,47 @@
 "interes în declanșator duplicat pentru numele de fișier „%.250s” și pachetul "
 "„%.250s”"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "nu se poate crea noul fișier de declanșatori fișier „%.250s”"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "nu se poate scrie noul fișier de declanșatori fișier „%.250s”"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "flush imposibil pentru noul fișier cu declanșatori fișier „%.250s”"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "sync imposibil pentru noul fișier cu declanșatori fișier „%.250s”"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "nu se poate închide noul fișier cu declanșatori fișier „%.250s”"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "nu se poate instala noul fișier cu declanșatori fișier „%.250s”"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "nu se poate citi fișierul cu declanșatori fișier „%.250s”"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "eroare de sintaxă în fișierul cu declanșatori fișier „%.255s”"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1290,7 +1302,7 @@
 "înregistrarea declanșatorilor fișier menționează un nume nelegal de pachet "
 "„%.250s” (pentru interes fața de fișierul „%.250s”): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1299,33 +1311,41 @@
 "fișierul cu declanșatori ci „%.250s” conține sintaxă nelegală în numele "
 "declanșatorului „%.250s”: %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "nu se poate deschide fișierul cu declanșatori ci „%.250s”"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 "fișierul cu declanșatori ci conține o sintaxă necunoscută pentru directive"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "fișierul cu declanșatori ci conține o directivă necunoscută „%.250s”"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "nu se poate crea directorul cu stări ale declanșatorilor „%.250s”"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 "nu se poate ajusta apartenența directorului cu stări ale declanșatorilor "
 "„%.250s”"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "nu se permit nume vide de declanșatori"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "numele de declanșator conține un caracter nevalid"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1350,7 +1370,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "eroare la formatarea șirului într-o variabilă „varbuf”"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "eroare la citirea din pipa dpkg-deb"
 
@@ -1369,12 +1389,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "eroare la setarea apartenenței legăturii simbolice „%.255s”"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "eroare la setarea apartenenței pentru „%.255s”"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "eroare la setarea permisiunilor pentru „%.255s”"
@@ -1435,17 +1455,26 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arhiva conține obiectul „%.255s” de tip necunoscut 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "stat imposibil pentru fișierul „%s”"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Se înlocuiesc fișierele din pachetul vechi %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Înlocuite de fișierele din pachetul instalat %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1454,33 +1483,33 @@
 "se încearcă suprascrierea directorului „%.250s” din pachetul %.250s %.250s "
 "cu un non-director"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "se încearcă suprascrierea „%.250s”, care este și în pachetul %.250s %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "eșec la crearea „%.255s” (în timpul procesării „%.255s”)"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "backend dpkg-deb în timpul „%.255s”"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "eroare la închiderea/scrierea „%.255s”"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "eroare la crearea pipei „%.255s”"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "eroare la crearea dispozitivului „%.255s”"
@@ -1488,65 +1517,70 @@
 # hard link este un alt nume pentru un target și spre
 # deosebire de symbolic link, target obligatoriu trebuie
 # să existe
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "eroare la crearea legăturii hard „%.255s”"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "eroare la crearea legăturii simbolice „%.255s”"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "eroare la crearea directorului „%.255s”"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "nu se poate îndepărta „%.255s” pentru instalarea noii versiuni"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "nu se poate citi legătura „%.255s”"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "nu se poate crea legătură simbolică copie de siguranță pentru „%.255s”"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "chown imposibil pentru legătura simbolică copie de siguranță pentru „%.255s”"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "nu se poate face legătură copie de siguranță lui „%.255s” înainte de "
 "instalarea noii versiuni"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "nu se poate instala noua versiune a lui „%.255s”"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "nu se poate deschide '%.255s'"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "sync imposibil pentru fișierul „%.255s”"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1555,7 +1589,7 @@
 "se ignoră problema de dependență cu %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1564,7 +1598,7 @@
 "se consideră deconfigurarea pachetului\n"
 " esențial %s, pentru a permite %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1573,7 +1607,7 @@
 "dpkg: nu, %s este esențial, nu va fi deconfigurat\n"
 " pentru a permite %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1582,17 +1616,17 @@
 "dpkg: nu, nu se poate purcede la %s (--auto-deconfigure va ajuta):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "ștergerea lui %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "instalarea lui „%.255s”"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1600,12 +1634,12 @@
 "dpkg: se ia în considerare deconfigurarea lui %s care ar fi corupt de "
 "%s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: da, se va deconfigura %s (corupt de %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1614,11 +1648,11 @@
 "dpkg: cu privire la %s conținând %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "se ignoră coruperea, se va continua oricum!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1627,28 +1661,28 @@
 "instalarea lui %.250s ar duce la coruperea lui %.250s, iar\n"
 " deconfigurarea nu este permisă (--auto-deconfigure ar putea fi de ajutor)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "instalarea lui %.250s ar duce la coruperea programelor existente"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s nu este corect instalat - ignor orice dependență față de acesta.\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: ar putea apărea probleme la eliminarea %s, deoarece furnizează %s ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1657,108 +1691,110 @@
 "dpkg: pachetul %s necesită reinstalare, dar va fi șters, așa cum ați "
 "solicitat.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: da, %s va fi șters în favoarea lui %s.\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "conflict între pachete - nu se instalează %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "se ignoră conflictul, se va continua oricum!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, 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:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "„find” pentru „dpkg --recursive”"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "eșec la fdopen pentru pipa lui find"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "eroare la citirea pipei lui find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "eroare la închiderea pipei lui find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find pentru --recursive a returnat codul de eroare netratată %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "s-au căutat, dar nu s-au găsit pachete (fișiere de tip *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<standard output>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<standard error>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Se selectează pachetul %s, deselectat anterior.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Se omite pachetul deselectat %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, 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:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "se retrogradează %.250s de la %.250s la %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "Nu se va retrograda %.250s de la versiunea %.250s la versiunea %.250s, se "
 "omite.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1767,37 +1803,37 @@
 "nu se poate șterge versiunea nou-instalată a lui „%.250s” pentru a permite "
 "reinstalarea copiei de siguranță"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "nu se poate restaura versiunea de siguranță a lui „%.250s”"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "nu se poate șterge copia de siguranță a lui „%.250s”"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "nu se poate șterge versiunea nou-instalată a lui „%.250s”"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "nu se poate șterge versiunea nou-extrasă a lui „%.250s”"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "stat imposibil pentru noul fișier conffile „%.250s”"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "stat imposibil pentru actualul fișier conffile instalat „%.250s”"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1808,57 +1844,57 @@
 "Fișierul de configurare „%s”, nu există în sistem.\n"
 "Se instalează noul fișier de configurare, așa cum ați cerut.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: eșec la ștergerea vechii copii de siguranță „%.250s”: %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: eșec la redenumirea lui „%.250s” în „%.250s”: %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: eșec la ștergerea lui „%.250s”: %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: eșec la ștergerea vechii versiuni distribuite „%.250s”: %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: eșec la ștergerea „%.250s” (înainte de suprascriere): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: eșec la legarea lui „%.250s” la „%.250s”: %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Se instalează noua versiune a fișierului de configurare %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "nu se poate instala „%.250s” ca „%.250s”"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "nu este instalat nici un pachet denumit „%s”, nu se poate configura"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "pachetul %.250s este deja instalat și configurat"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1867,7 +1903,7 @@
 "pachetul %.250s nu este pregătit pentru configurare\n"
 " nu se poate configura (starea curentă „%.250s”)"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1876,11 +1912,11 @@
 "dpkg: probleme de dependențe preîntâmpină configurarea lui %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "probleme de dependențe - se lasă neconfigurat"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1890,7 +1926,7 @@
 "cerut:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1898,12 +1934,12 @@
 "Pachetul este într-o stare de inconsistență foarte \n"
 "rea - ar trebui să-l reinstalați înainte de a încerca configurarea."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Se pregătește %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1912,7 +1948,7 @@
 "%s: stat imposibil pentru fișierul de configurare „%s”\n"
 " (= „%s”): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1921,7 +1957,7 @@
 "%s: fișierul de configurare „%s” este o legătură circulară\n"
 " (= „%s”)"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1930,7 +1966,7 @@
 "%s: readlink imposibil pentru fișierul conffile „%s”\n"
 " (= „%s”): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1939,34 +1975,34 @@
 "%s: fișierul conffile „%.250s” arată către un nume de fișier degenerat\n"
 " („%s” este legătură simbolică spre „%s”)"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: fișierul conffile „%.250s” nu este fișier sau legătură simbolică (= „%s”)"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: nu se poate deschide fișierul conffile %s pentru hash: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Tastați „exit” când ați terminat.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1975,12 +2011,12 @@
 "\n"
 "Fișier de configurare „%s”"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (de fapt „%s”)"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1992,7 +2028,7 @@
 " ==> Fișierul este, de asemenea, prezent în pachetul furnizat de "
 "responsabilul pachetului.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -2001,7 +2037,7 @@
 "\n"
 "     Nemodificat de la instalare.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2010,7 +2046,7 @@
 "\n"
 " ==> Modificat (de dumneavoastră sau de un script) de la instalare.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -2019,37 +2055,37 @@
 "\n"
 " ==> Șters (de dumneavoastră sau de un script) de la instalare.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Distribuitorul pachetului a furnizat o versiune actualizată.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Versiunea din pachet este aceiași ca la ultima instalare.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Se folosește noul fișier, așa cum ați cerut.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Se folosește actualul fișier vechi, așa cum ați cerut.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Implicit se păstrează vechiul fișier de configurare.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Implicit se folosește noul fișier de configurare.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2064,159 +2100,161 @@
 "      D     : afișați diferențele dintre versiuni\n"
 "      Z     : deschideți un shell pentru a examina situația\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Acțiunea implicită este păstrarea versiunii curente.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Acțiunea implicită este instalarea noii versiuni.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[implicit=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[implicit=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[nimic implicit]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "eroare la scrierea către stderr, descoperită înainte de promptul despre "
 "fișierul conffile"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "eroare de citire de la stdin la promptul despre fișierul conffile"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF de la stdin la promptul despre fișierul conffile"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s depinde de %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s ante-depinde de %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s recomandă %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s sugerează %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s corupe %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s este în conflict cu %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s îmbunătățește %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s va fi șters.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s va fi deconfigurat.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s este instalat, dar este versiunea %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s este despachetat, dar nu a fost configurat niciodată.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s este despachetat, dar este versiunea %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s ultima versiune configurată este %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s este %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s furnizează %.250s dar va fi șters.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s furnizează %.250s dar va fi deconfigurat.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s furnizează %.250s dar este %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s nu este instalat.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, 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:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (versiunea %.250s) este prezent și %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, 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:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s furnizează %.250s și este prezent și %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "Folosiți --help pentru ajutor despre interogarea pachetelor"
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2224,7 +2262,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versiunea %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2235,8 +2273,8 @@
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 "Copyright (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2247,7 +2285,7 @@
 "versiunea 2 sau\n"
 "ulterioară pentru condițiile de copiere. NU există nici o garanție.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2257,7 +2295,7 @@
 "Utilizare: %s [<opțiune> ...] <comanda>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2277,7 +2315,7 @@
 "  --truename <fișier>        arată fișierul redirectat.\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2309,7 +2347,7 @@
 "  --version                afișează versiunea\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2323,17 +2361,12 @@
 "Scripturile preinst/postrm din pachete ar trebui să specifice\n"
 "întotdeauna --package și --divert.\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "stat imposibil pentru fișierul „%s”"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "eroare la verificarea lui „%s”"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2342,129 +2375,129 @@
 "redenumirea implică suprascrierea lui „%s” cu\n"
 "  un alt fișier „%s”, lucru nepermis"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "nu se poate scrie fișierul „%s”"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "copiere fișier"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "nu se poate redenumi „%s” în „%s”"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "redenumire: șterge vechea legătură duplicată „%s”"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "nu se poate deschide fișierul sursă „%.250s”"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "redirectare locală a lui %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "redirectare locală a lui %s către %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "redirectare a lui %s de către %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "redirectare a lui %s către %s de către %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "orice redirectare a lui %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "orice redirectare a lui %s către %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "nu se poate crea fișierul nou %s"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "eșec la flush pentru fișierul „%s”"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "eroare la ștergerea redirectărilor anterioare"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "eroare la crearea noii redirectări"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "eroare la instalarea noilor diversiuni"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s necesită un singur argument"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "numele de fișier „%s” nu este absolut"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "numele de fișier nu poate conține caractere newline"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Nu se pot redirecta directoare"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "nu se poate redirecta fișierul „%s” către el însuși"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "Se părăsește „%s”\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "„%s” se ciocnește cu „%s”"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "Se adaugă „%s”\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Nu există redirectare „%s”, nu s-a șters nimic.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2475,7 +2508,7 @@
 "  la ștergerea lui „%s”\n"
 "  a fost găsit „%s”"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2486,16 +2519,16 @@
 "  la ștergerea lui „%s”\n"
 "  s-a găsit „%s”"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "Se șterge „%s”\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "pachetul nu poate conține caractere newline"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "redirectare-către nu poate conține caractere newline"
 
@@ -2580,8 +2613,8 @@
 "dselect sau dpkg --configure --pending (sau dpkg --triggers-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s nu ia argumente"
@@ -2678,7 +2711,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions relație nevalidă"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "versiunea %s are sintaxa greșită: %s"
@@ -2733,13 +2766,13 @@
 msgid "overriding problem because --force enabled:"
 msgstr "problemă la forțare datorită activării lui --force: "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 "nu se poate deschide fișierul cu lista fișierelor pentru pachetul „%.250s”"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2748,42 +2781,42 @@
 "fișierul cu lista fișierelor pachetului „%.250s” lipsește, se presupune că "
 "pachetul nu are nici un fișier instalat."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr ""
 "stat imposibil pentru fișierul cu lista fișierelor pentru pachetul „%.250s”"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "lista fișierelor pentru pachetul „%.250s”"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "din fișierul cu lista fișierelor pachetului „%.250s” lipsește caracterul "
 "newline de la final"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, 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 vid"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 "eroare la închiderea fișierului listei cu fișierele pentru pachetul „%.250s”"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Se citește baza de date ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
@@ -2791,39 +2824,39 @@
 msgstr[1] "%d fișiere și directoare actualmente instalate.)\n"
 msgstr[2] "%d de fișiere și directoare actualmente instalate.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 "nu se poate crea fișierul actualizat cu lista fișierelor pentru pachetul %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 "eșec la scrierea fișierului actualizat cu lista fișierelor pentru pachetul %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 "eșec la flush pentru fișierul actualizat cu lista fișierelor pachetului %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 "eșec la sync pentru fișierul actualizat cu lista fișierelor pentru pachetul "
 "%s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 "eșec la închiderea fișierului actualizat cu lista fișierelor pentru pachetul "
 "%s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2863,7 +2896,9 @@
 msgstr "instalat"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "eroare: PATH nu este setat."
 
 #: src/help.c:129
@@ -2906,7 +2941,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2918,65 +2953,65 @@
 msgstr "eșec la chroot în „%.250s”"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "eșec la chdir în „%.255s”"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "nu se pot seta drepturi de execuție pentru „%.250s”"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "setenv imposibil pentru scriptul maintainer"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "script %s instalat"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "stat imposibil pentru %s „%.250s”"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "script %s nou"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "script %s vechi"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "stat imposibil pentru %s „%.250s”: %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - încerc în schimb scriptul din pachetul nou ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "nu există nici un script versiunea nouă a pachetului - se renunță"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... pare să fi fost bine.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "nu se poate șterge în siguranță „%.255s”"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2985,7 +3020,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "nu se poate verifica existența lui „%.250s”"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "nu se poate citi directorul info"
 
@@ -3061,7 +3096,7 @@
 "  -Dh|--debug=help                  Ajutor pentru depanare\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3195,7 +3230,7 @@
 msgstr ""
 "Pentru o interfață mai prietenoasă folosiți „dselect” sau „aptitude”.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3247,30 +3282,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3279,103 +3318,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "probleme de dependență - nu se elimină"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "probleme de dependență - nu se elimină"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "setenv imposibil pentru scriptul maintainer"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "eroare de citire în fișierul de configurare „%.255s”"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3383,7 +3422,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3391,40 +3430,40 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug necesită un argument octal"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "lipsește numele de pachet în lista separată prin virgule „%.250s” de la --"
 "ignore-depends"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends necesită un nume valid de pachet. „%.250s” nu este; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "întreg nevalid pentru --%s: „%.250s”"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "eroare la executarea cârligului „%s”, cod de ieșire %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "stare"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3433,7 +3472,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3441,12 +3480,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opțiune de forțare/refuzare necunoscută „%.*s”"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "opțiune învechită de forțare/refuzare „%s”\n"
@@ -3469,8 +3508,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "eof neașteptat înainte de terminarea liniei %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "este necesară o opțiune de acțiune"
 
@@ -3636,90 +3675,90 @@
 msgid "passed\n"
 msgstr "verificat\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "eșec la crearea directorului temporar"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "pachetul %s are prea multe perechi „Conflicts/Replaces”"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "versiunea veche a pachetului are nume de fișier info prea lung care începe "
 "cu „%.250s”"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "nu se poate șterge fișierul info învechit „%.250s”"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "nu se poate instala (presupusul) fișier info nou „%.250s”"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "nu se poate deschide directorul temp de control"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "pachetul conține un fișier info de control cu un nume prea lung (începe cu "
 "„%.50s”)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "info de control a pachetului conținea directorul „%.250s”"
 
 # Analiza codului arată că traducerea asta este corectă
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "rmdir pentru „%.250s” nu a semnalat că nu este director"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "pachetul %s a conținut listă ca și fișier info"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "nu se poate instala noul fișier info „%.250s” ca „%.250s”"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "nu se poate șterge fișierul cu informații de control „%.250s”"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "nu se poate accesa arhiva"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "eșec la crearea directorului temporar"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "lungimea informației de control"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Informații înregistrate despre %s de la %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "arhitectura pachetului (%s) nu se potrivește cu sistemul (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3728,104 +3767,104 @@
 "dpkg: referitor la %s conținând %s, probleme de ante-dependență:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "problemă de ante-dependență - nu se instalează %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "se ignoră problema de ante-dependență!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Se pregătește înlocuirea lui %s %s (folosind %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Se despachetează %s (din %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, 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)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "eroare de citire în %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "eroare la închiderea lui %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "eroare la încercarea de a deschide %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Se deconfigurează %s, pentru a fi permite ștergerea lui %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Se deconfigurează %s ...\n"
 
 # este vorba despre un nume de pachet( vezi sursa)
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Se dezarhivează pachetul înlocuitor (%.250s) ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "extragerea câmpului de către dpkg-deb"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "eroare la citirea rezultatului tar al lui dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 "sistemul de fișiere al fișierului tar este corupt - arhiva pachetului este "
 "coruptă"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: ștergere a posibilelor zerouri de la sfârșit"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "nu s-a putut accesa fișierul vechi „%.250s” așa că nu se șterge: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "nu se poate șterge directorul vechi „%.250s”: %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "vechiul fișier conffile „%.250s” era un director gol (și a fost șters acum)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "stat imposibil pentru alt fișier nou „%.250s”"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3834,12 +3873,12 @@
 "vechiul fișier „%.250s” este același cu alte câteva fișiere noi! (atât "
 "„%.250s” cât și „%.250s”)"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "nu se poate șterge în siguranță fișierul vechi „%.250s”: „%s”"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Se notează dispariția lui %s, care a fost înlocuit complet.)\n"
@@ -4025,7 +4064,7 @@
 "show\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -4048,6 +4087,10 @@
 "lățimea nu\n"
 "  este negativă. În acel caz se va folosi aliniere la stânga. \n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Folosiți --help pentru ajutor despre interogarea pachetelor"
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4107,7 +4150,7 @@
 msgid "Removing %s ...\n"
 msgstr "Se șterge %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4116,51 +4159,52 @@
 "în timpul ștergerii %.250s, nu s-a putut șterge directorul „%.250s”: %s - "
 "poate directorul este un punct de montare?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "nu se poate șterge „%.250s”"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "nu se poate șterge în siguranță „%.250s”"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "la ștergerea lui %.250s, directorul „%.250s” nu este gol, deci nu a fost "
 "șters."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "nu se poate șterge „%.250s”"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Curăț fișierele de configurare pentru %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "nu se poate șterge vechiul fișier de configurare „%.250s” (= „%.250s”)"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 "nu se poate citi directorul fișierului de configurare „%.250s” (din „%.250s”)"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "nu se poate îndepărta copia de siguranță a vechiului fișier de configurare "
 "„%.250s” (a lui „%.250s”)"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "nu se poate șterge lista fișierelor vechi"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "nu se poate înlătura vechiul script postrm"
 
@@ -4203,7 +4247,13 @@
 msgid "read error on standard input"
 msgstr "eroare de citire de la intrarea standard"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "Folosiți --help pentru ajutor despre interogarea pachetelor"
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4212,7 +4262,7 @@
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4229,7 +4279,7 @@
 "  --list [<model-glob>]    listează înlocuirile din baza de date.\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4251,31 +4301,31 @@
 "  --help                   afișează acest ajutor.\n"
 "  --version                afișează versiunea.\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "se șterge / de la final"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "nu se poate deschide noul fișier statoverride"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "eroare la ștergerea statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "eroare la crearea noului statoverride-old"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "eroare la instalarea noului statoverride"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add necesită patru argumente"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4284,21 +4334,21 @@
 "O înlocuire pentru „%s” există deja, dar s-a specificat --force, deci va fi "
 "ignorată."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Există deja o înlocuire pentru „%s”, se întrerupe."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "s-a dat --update dar %s nu există"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Nu este prezentă nici o înlocuire."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update este inutil pentru --remove"
 
@@ -4363,16 +4413,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "există multiple înlocuiri de stare pentru fișierul „%.250s”"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Tastați dpkg-trigger --help pentru ajutor despre acest utilitar."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debian %s, unealta pentru declanșatori de pachete versiunea %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4383,7 +4433,7 @@
 "           %s [<opțiuni> ...] <comandă>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4396,7 +4446,7 @@
 "                                     pentru declanșatori.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4419,21 +4469,21 @@
 "  --no-act                         Doar testează - nu schimba nimic.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: directorul cu date despre declanșatori nu este creat încă\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: înregistrările declanșatorilor nu există încă\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "acceptă un argument, numele declanșatorului"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4443,13 +4493,13 @@
 "dpkg-trigger trebuie să fie apelat dintr-un script de mentenanță (sau cu o "
 "opțiune --by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: nume nevalid de pachet așteptat „%.250s”: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "nume de declanșator nevalid „%.250s”: %.250s"
@@ -4483,33 +4533,34 @@
 msgstr "Se procesează declanșatorii pentru %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s necesită exact un fișier Packages ca argument"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "nu se poate accesa zona de stare a lui dpkg pentru actualizarea bulk "
 "available"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "actualizarea bulk available necesită acces de scriere la zona de stare a lui "
 "dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Se înlocuiește info cu pachetele disponibile folosind %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Se actualizează info cu pachetele disponibile folosind %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
@@ -4517,7 +4568,7 @@
 msgstr[1] "Informațiile despre %d pachete au fost actualizate.\n"
 msgstr[2] "Informațiile despre %d de pachete au fost actualizate.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4637,8 +4688,8 @@
 msgstr[1] "se ignoră %d avertismente legate de fișierul(ele) de control\n"
 msgstr[2] "se ignoră %d de avertismente legate de fișierul(ele) de control\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necesită un <director> ca argument"
@@ -4671,26 +4722,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: se construiește pachetul „%s” în „%s”.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "eșec la crearea tmpfile (data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control"
 msgid "control member"
 msgstr "control"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "eșec la unlink tmpfile (data), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4707,20 +4758,20 @@
 msgid "error writing `%s'"
 msgstr "eroare la scrierea „%s”"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "între membre"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "eșec la scrierea numelui de fișiere în pipa tar (data)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<comprimare> din tar -cf"
 
@@ -4738,79 +4789,79 @@
 msgid "error reading %s from file %.255s"
 msgstr "eroare la citirea lui %s din fișierul %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "eșec la citirea arhivei „%.255s”"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "eșec la fstat pentru arhivă"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "arhiva nu conține punct în numărul de versiune"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "arhiva nu conține caractere newline în antet"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "fișierul „%.250s” este corupt - număr de volum eronat"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, 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?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "arhiva nu conține punct în numărul de versiune"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "arhiva nu conține caractere newline în antet"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "arhiva nu conține punct în numărul de versiune"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "versiunea de arhivă %.250s neînțeleasă, obțineți un dpkg-deb mai nou"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "s-au omis datele membrului de la %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
 "fișierul „%.250s” conține o componentă de date neînțeleasă %.*s, se renunță"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "fișierul „%.250s” conține două membre control, se renunță"
 
 # aici e ceva ciudat, %z: vezi "info libc printf", %zi bytes, e ce?
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4822,23 +4873,23 @@
 " pachet debian nou, versiunea %s.\n"
 " dimensiune %ld octeți: arhivă de control= %zi octeți.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "arhiva are lungimea control malformată „%s”"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "s-au omis datele membrului de la %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4850,7 +4901,7 @@
 " pachet debian vechi, versiune %s.\n"
 " dimensiune %ld octeți: arhivă de control= %zi, arhiva principală= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4859,49 +4910,50 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "„%.255s” nu este o arhivă în format debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "eșec la scrierea în pipă în copie"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "eșec la închiderea pipei în copie"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "eșec la schimbarea directorului"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "eșec la crearea directorului"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "eșec la schimbarea directorului după crearea lui"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "eșec la schimbarea directorului"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<decomprimare>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "lipește"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s necesită un nume de fișier .deb ca argument"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4910,38 +4962,38 @@
 "--%s necesită un director țintă.\n"
 "Poate ar trebui să folosiți dpkg --install ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s ia doar un argument (numele fișierului .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "eșec la schimbarea directorului în „/” pentru curățare"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "stat imposibil pentru fișierul „%s”"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: „%.255s” nu conține nici o componentă de control „%.255s”\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, 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"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
@@ -4949,59 +5001,59 @@
 msgstr[1] "lipsesc %d componente de control cerute"
 msgstr[2] "lipsesc %d de componente de control cerute"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "nu se poate examina directorul „%.255s”"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "stat imposibil „%.255s” (în „%.255s”)"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "nu se poate deschide „%.255s” (în „%.255s”)"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "eșec la citirea lui „%.255s” (în „%.255s”)"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld octeți, %5d linii   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     nu este fișier simplu     %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(fișierul „control” lipsește din arhiva control!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "nu s-a putut deschide componenta „control”"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "eșec în timpul citirii componentei „control”"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "eroare la închiderea componentei „%s”"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Eroare în format"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents ia exact un argument"
 
@@ -5011,7 +5063,19 @@
 msgstr "Debian „%s”, backend pentru arhiva de pachete versiunea %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -5022,6 +5086,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -5037,7 +5103,7 @@
 "  --fsys-tarfile <deb>             Creează fișier tar cu sistemul de "
 "fișiere.\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -5050,11 +5116,27 @@
 "<cfield> este numele unui câmp în fișierul „control” principal.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5078,7 +5160,7 @@
 "                               Valori permise: gzip, xz, bzip2, lzma, none.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5092,7 +5174,7 @@
 "Pachetele\n"
 "despachetate cu „dpkg-deb --extract” vor fi instalate incorect !\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5101,17 +5183,17 @@
 "Tastați dpkg --help pentru ajutor despre instalarea și dezinstalarea "
 "pachetelor."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "întreg nevalid pentru -%c: „%.250s”"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "nivel de compresie nevalid pentru -%c: %ld”"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tip de compresie necunoscut „%s”!"
@@ -5132,7 +5214,7 @@
 msgstr ""
 "fișierul „%.250s” este corupt - lipsește caracterul newline după %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "eroare la citire %.250s"
@@ -5232,54 +5314,60 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "fișierul „%.250s” este corupt - număr de volum eronat"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "numele pachetului"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "fișierul „%.250s” este corupt - identificator magic greșit la sfârșitul "
 "celui de-al doilea antet"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, 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"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "fișierul „%.250s” este corupt - număr greșit de părți pentru dimensiunile "
 "menționate"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "fișierul „%.250s” este corupt - dimensiunea este greșită pentru numărul "
 "părții menționat"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "fstat imposibil pentru fișierul volum „%.250s”"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "fișierul „%.250s” este corupt - prea scurt"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "nu se poate deschide fișierul parte de arhivă „%.250s”"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "fișierul „%.250s” nu este parte de arhivă"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5299,6 +5387,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5321,12 +5410,19 @@
 "    Dimensiunea fișierului parte (porțiunea folosită): %lu octeți\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<necunoscut>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s necesită unul sau mai multe părți ca argumente"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "fișierul „%s” nu este o parte arhivă\n"
@@ -5362,7 +5458,7 @@
 msgid "split package part"
 msgstr "Se asamblează pachetul %s din %d parte: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "terminat\n"
@@ -5414,17 +5510,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Opțiuni:\n"
 "  --depotdir <director>            Folosește <director> în loc de %s/%s.\n"
@@ -5436,20 +5541,29 @@
 "\n"
 "Codul de ieșire: 0 = OK;  1 = -a nu este o parte;  2 = probleme!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Tastați dpkg-split --help pentru ajutor."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "sfârșit de fișier neașteptat în %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "dimensiunea părții este prea mare sau nu este pozitivă"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -5561,27 +5675,27 @@
 msgid "Deleted %s.\n"
 msgstr "Șters %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "extragerea câmpului de către dpkg-deb"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "nu se poate deschide fișierul sursă „%.250s”"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "fstat imposibil pentru fișierul sursă"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "fișierul sursă „%.250s” nu este un fișier propriu-zis"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5591,17 +5705,17 @@
 msgstr[1] "Se asamblează pachetul %s din %d părți"
 msgstr[2] "Se asamblează pachetul %s din %d de părți"
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split necesită un nume de fișier sursă ca argument"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "--split ia ca argumente cel mult un nume de fișier sursă și un prefix pentru "
@@ -5776,126 +5890,91 @@
 "  --help                   afișează acest ajutor.\n"
 "  --version                afișează versiunea.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "eroare"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "avertisment"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "stat imposibil pentru „%s”: „%s”"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "readlink(%s) a eșuat: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "au fost specificate două comenzi: --%s și --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "nu se poate adăuga la %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "scanarea %s a eșuat: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "eșec la execuția %s: %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "nu se poate face %s o legătură simbolică către %s: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "nu se poate instala %s ca %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "nu se poate șterge %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "sfârșit de fișier neașteptat în timp ce se încerca citirea %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "în timpul citirii %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "linie neterminată în timp ce se încerca citirea %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s corupt: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 "caracterele newline sunt interzise în fișierele update-alternatives (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "în timpul scrierii %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "nume sclav"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "sclavul %s este duplicat"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "legătură sclav"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "legătura sclav este aceiași cu legătura principală %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "legătura sclav %s este duplicată"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "fișier master"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "calea %s este duplicată"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5904,90 +5983,75 @@
 "alternativa %s (parte a grupului de legături %s) nu există. Se șterge din "
 "lista de alternative."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "prioritate"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "fișier sclav"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "prioritatea lui %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "nu se poate citi %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "stare"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "stare nevalidă"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "legătura master"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "nu se poate închide %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "se renunță la legătura-sclav învechită %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "nu se poate scrie %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "mod automat"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "mod manual"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr " legătura indică acum spre %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr " legătura este absentă acum"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - prioritatea %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  sclav %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Cea mai „bună” versiune în prezent este „%s”."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Nici o versiune disponibilă."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
@@ -5995,40 +6059,40 @@
 msgstr[1] "Există %d opțiuni pentru alternativa %s (furnizează %s)."
 msgstr[2] "Există %d de opțiuni pentru alternativa %s (furnizează %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Selecție"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Cale"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Prioritate"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Stare"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Apăsați ENTER pentru a păstra varianta curentă[*], sau introduceți numărul "
 "selecției: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "nu se înlocuiește %s cu o legătură."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "nu se poate instala varianta necunoscută %s"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -6037,98 +6101,153 @@
 "se omite crearea lui %s deoarece fișierul %s asociat (din grupul de legături "
 "%s) nu există."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "nu se înlocuiește %s cu o legătură."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Cheamă %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Alternativa %s neschimbată deoarece opțiunea %s nu este disponibilă."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Omite alternativa necunoscută „%s”."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "linie prea lungă sau neterminată în timp ce se încerca citirea %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Omite linie nevalidă: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "se redenumește legătura %s din %s în %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "se redenumește legătura sclav %s din %s în %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "numele de alternativă (%s) nu poate conține „/” și spații."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "legătura alternativă nu este absolută așa cum ar trebui să fie: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "calea alternativă nu este absolută așa cum ar trebui să fie: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "alternativa %s nu poate fi master: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "legătura alternativă %s este deja administrată de %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "calea alternativă %s nu există."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "alternativa %s nu poate fi sclav pentru %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "alternativa %s nu poate fi master: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "legătura alternativă %s este deja administrată de %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "argument necunoscut „%s”"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necesită <legătură> <nume> <cale> <prioritate>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<legătură> și <cale> nu pot fi la fel"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "prioritatea trebuie să fie un număr întreg"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s necesită <nume> <cale>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s necesită <nume>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave este permis doar cu --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necesită <legătură> <nume> <cale>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "numele %s este atât primar cât și sclav"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "legătura %s este atât primară cât și sclavă"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s necesită un argument <fișier>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opțiune necunoscută „%s”"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -6136,67 +6255,22 @@
 "este nevoie de --display, --query, --list, --get-selections, --config, --"
 "set, --set-selections, --install, --remove, --all, --remove-all sau --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "alternativa %s nu poate fi master: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "legătura alternativă %s este deja administrată de %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "legătura alternativă nu este absolută așa cum ar trebui să fie: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "calea alternativă nu este absolută așa cum ar trebui să fie: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "calea alternativă %s nu există."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "numele de alternativă (%s) nu poate conține „/” și spații."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "este o alternativă master"
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "este un sclav pentru %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "alternativa %s nu poate fi sclav pentru %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<standard input>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "nu există alternative pentru %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s este desfăcută, va fi actualizată cu cea mai bună opțiune."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6208,48 +6282,48 @@
 "%s a fost schimbată (manual sau de un script). Se comută pe actualizare "
 "strict manuală."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "se configurează selecția automată pentru %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "alternativa %s pentru %s nu este înregistrată, nu se configurează."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Nu există nici un program care să furnizeze %s"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Nimic de configurat."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Există o singură alternativă în grupul de legături %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "alternativa %s pentru %s nu este înregistrată, nu se șterge."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr "se șterge alternativa selectată manual - se comută %s pe modul automat"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr ""
 "actualizările automate pentru %s sunt dezactivate, va fi lăsată în pace."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6257,12 +6331,12 @@
 "pentru a reveni la actualizarea automată folosiți „update-alternatives --"
 "auto %s”."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "se folosește „%s” pentru a furniza %s (%s) în %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
@@ -6270,13 +6344,49 @@
 "se forțează reinstalarea alternativei %s pentru că grupul de legături %s "
 "este defect."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "alternativa curentă %s este necunoscută, se comută pe %s pentru grupul de "
 "legături %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "este o alternativă master"
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "este un sclav pentru %s"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "stat imposibil pentru „%s”: „%s”"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "readlink(%s) a eșuat: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "scanarea %s a eșuat: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "eșec la execuția %s: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "nu se poate face %s o legătură simbolică către %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "nu se poate instala %s ca %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "în timpul scrierii %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "nu se poate citi %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "nu se poate închide %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "nu se poate scrie %s: %s"
+
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6581,9 +6691,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "s-a sărit zona de control de la %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "eșec la exec tar"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "eșec la crearea directorului temporar"
 
Binary files dpkg/po/ru.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/ru.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/Rules-quot /home/vorlon/devel/multiarch/dpkg-debian/po/Rules-quot
--- dpkg/po/Rules-quot	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/Rules-quot	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,47 @@
+# Special Makefile rules for English message catalogs with quotation marks.
+
+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
+
+.SUFFIXES: .insert-header .po-update-en
+
+en@quot.po-create:
+	$(MAKE) en@quot.po-update
+en@boldquot.po-create:
+	$(MAKE) en@boldquot.po-update
+
+en@quot.po-update: en@quot.po-update-en
+en@boldquot.po-update: en@boldquot.po-update-en
+
+.insert-header.po-update-en:
+	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	ll=`echo $$lang | sed -e 's/@.*//'`; \
+	LC_ALL=C; export LC_ALL; \
+	cd $(srcdir); \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "creation of $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+en@quot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
+
+en@boldquot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
+
+mostlyclean: mostlyclean-quot
+mostlyclean-quot:
+	rm -f *.insert-header
diff -uNr --exclude .git --exclude .bzr dpkg/po/ru.po /home/vorlon/devel/multiarch/dpkg-debian/po/ru.po
--- dpkg/po/ru.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/ru.po	2012-06-07 10:11:09.426073000 -0700
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.15.8.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-12-16 20:54+0100\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -27,7 +27,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "не удалось записать файл «%s»"
@@ -48,71 +48,77 @@
 msgid "ar member file (%s)"
 msgstr "не удалось выполнить fstat на файла из архива ar (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "не удалось прочитать при копировании в буфер для %s"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "не удалось записать при копировании в буфер для %s"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "прочитан слишком короткий блок данных при копировании в буфер для %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "не удалось запустить tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "не удалось запустить %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: распаковка сжатых данных"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: сжатие данных"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: ошибка подключения к входному потоку gzip"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: внутренняя ошибка gzip при чтении: «%s»"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: внутренняя ошибка gzip при записи"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: ошибка подключения к выходному потоку gzip"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: внутренняя ошибка gzip при чтении"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: внутренняя ошибка gzip при записи: «%s»"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: внутренняя ошибка gzip при записи: %s"
@@ -127,31 +133,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: внутренняя ошибка bzip2 при чтении: «%s»"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: внутренняя ошибка bzip2 при записи"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: ошибка подключения к выходному потоку bzip2"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: внутренняя ошибка bzip2 при чтении"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: внутренняя ошибка bzip2 при записи: «%s»"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "неожидаемая ошибка bzip2"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -160,105 +166,105 @@
 "каталог обновлений содержит файл «%.250s», у которого слишком длинное имя "
 "(%d символов при допустимых %d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 "каталог обновлений содержит файлы с разными длинами имён (как %d, так и %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "не удалось просмотреть каталог обновлений «%.255s»"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "не удалось удалить втянутый файл обновлений %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "не удалось создать «%.255s»"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "не удалось заполнить %.250s символами выравнивания"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "не удалось очистить %.250s после выравнивания"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "не удалось перейти к началу %.250s после выравнивания"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "не удалось открыть файл блокировки %s для тестирования"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "не удалось открыть/создать файл блокировки базы данных состояний"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "у вас нет прав на блокирование базы данных состояний dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "не удалось заблокировать базу данных состояний dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "запрошенная операция требует привилегий суперпользователя"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "не удалось получить доступ к области состояния dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "операция требует прав на чтение области состояния dpkg и запись в неё"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "не удалось удалить собственный файл обновлений %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "не удалось записать обновлённый файл состояния пакета «%.250s»"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "не удалось сбросить буфер обновлённого файла состояния пакета «%.250s»"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "не удалось усечь обновлённый файл состояния пакета «%.250s»"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "не удалось синхронизировать обновлённый файл состояния пакета «%.250s»"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "не удалось закрыть обновлённый файл состояния пакета «%.250s»"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "не удалось установить обновлённый файл состояния пакета «%.250s»"
@@ -281,72 +287,74 @@
 msgid "unable to open directory '%s'"
 msgstr "не удалось открыть файл «%s»"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "не удалось открыть файл «%s»"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "не удалось синхронизировать файл «%s»"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "не удалось закрыть файл «%s»"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "не удалось записать подробности о «%.50s» в «%.250s»"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "не удалось открыть «%s» для записи базы данных %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "не удалось установить буферизацию файла базы данных %s"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "не удалось сохранить запись в базу данных %s о «%.50s» в «%.250s»"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "не удалось сбросить на диск базу данных %s в «%.250s»"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "не удалось синхронизировать базу данных %s в «%.250s»"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "не удалось закрыть «%.250s» после записи в базу данных %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "не удалось создать ссылку «%.250s» на «%.250s» в качестве резервной копии "
 "базы данных %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "не удалось установить «%.250s» как «%.250s» с базой данных %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -355,7 +363,7 @@
 "%s: невосстановимая ошибка, прекращение работы:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -367,13 +375,13 @@
 "%s: невосстановимая ошибка, прекращение работы:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "недостаточно памяти для новой записи очистки"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -382,7 +390,7 @@
 "%s: ошибка при очистке -\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
@@ -390,27 +398,27 @@
 "dpkg: при восстановлении после ошибки обнаружено слишком много наведённых "
 "ошибок!!!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "недостаточно памяти для новой записи очистки"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 "недостаточно памяти для новой записи очистки с большим количеством аргументов"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s: предупреждение: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: предупреждение: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: внутренняя ошибка: %s\n"
@@ -426,96 +434,96 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "«%.*s» не разрешено в %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "требуется только %s, всё остальное следует удалить"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "недопустимое имя пакета (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "пустое значение в поле информации о файле «%s»"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr ""
 "в файле состояний пакетов не может встречаться информационное поле «%s»"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "в информационном поле «%s» слишком много значений (по сравнению с остальными)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "в информационном поле «%s» слишком мало значений (по сравнению с остальными)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "значение «да» или «нет» в логическом поле"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "слово в поле «priority»"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "значение в поле «status» в этом контексте недопустимо"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "первое (желаемое) слово в поле «status»"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "второе (ошибочное) слово в поле «status»"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "третье (состояние) слово в поле «status»"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "ошибка в строке Version «%.250s»"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "используется устаревшее поле «Revision» или «Package-Revision»"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "значение для поля «config-version» в этом контексте недопустимо"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "ошибка в строке Config-Version «%.250s»"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "значение поля «conffiles» содержит недопустимую строку «%.*s»"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "значение поля «conffiles» начинается не с пробела, а с символа «%c»"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "в качестве conffile указан корневой или пустой каталог"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -523,12 +531,12 @@
 "В поле «%s» отсутствует имя пакета или указано что-то, что не может являться "
 "именем пакета"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "В поле «%s» указано недопустимое имя пакета «%.255s»: %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -537,7 +545,7 @@
 "Поле «%s», ссылка на «%.255s»:\n"
 " несуществующее отношение версий %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -546,7 +554,7 @@
 "Поле «%s», ссылка на «%.255s»:\n"
 " форма записи %c устарела, используйте «%c=» или «%c%c»"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -555,11 +563,11 @@
 "Поле «%s», ссылка на «%.255s»:\n"
 " неявная ссылка на номер версии, в таких случаях используйте «=»"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "В поле Provides не может использоваться диапазон версий"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -569,55 +577,55 @@
 " значение версии начинается не с латинской буквы или цифры, рекомендуется "
 "добавить пробел"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "Поле «%s», ссылка на «%.255s»: версия содержит «%c»"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "Поле «%s», ссылка на «%.255s»: название версии не завершено"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "Поле «%s», ссылка на «%.255s»: ошибка в поле версии"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "Поле «%s»: синтаксическая ошибка после ссылки на пакет «%.255s»"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "В поле %s альтернативы («|») недопустимы"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "значение в поле «triggers-pending» в этом контексте недопустимо"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "недопустимое имя триггера рассмотрения «%.255s»: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "повтор триггера рассмотрения «%.255s»"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "значение в поле «triggers-awaited» в этом контексте недопустимо"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "недопустимое имя пакета в ожидающем триггере «%.250s»: %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "повтор ожидающего триггера пакета «%.250s»"
@@ -674,7 +682,7 @@
 msgid "unable to write to status fd %d"
 msgstr "не удалось произвести запись в файловый дескриптор состояния %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "malloc failed (%ld bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -686,8 +694,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "функции realloc не удалось выделить %ld байт(а) памяти"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "не удалось выделить память"
 
@@ -720,209 +728,215 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "не удалось установить флаг close-on-exec файла %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "ошибка в настройках: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "не удалось открыть файл настройки «%.255s» на чтение: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "непарные кавычки в «%s»"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "неизвестный параметр «%s»"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "параметр «%s» должен иметь значение"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "параметр «%s» не принимает значение"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "ошибка чтения файла настройки «%.255s»"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "ошибка при закрытии файла настройки «%.255s»"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "ошибка при открытии каталога настроек «%s»"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "неизвестный параметр --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "параметр --%s должен иметь значение"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "параметр --%s не принимает значение"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "неизвестный параметр -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "параметр -%c должен иметь значение"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "параметр -%c не принимает значение"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "устаревший параметр «--%s»\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "несовместимые действия -%c (--%s) и -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "значение поля «%s» должно встречаться только один раз"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "название пользовательского поля «%.*s» слишком коротко"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr ""
 "значение пользовательского поля «%.*s» должно встречаться только один раз"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Configured-Version пакета с недопустимым значением Status"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "пакет в состоянии %s, но есть триггеры ожидания"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "пакет в состоянии triggers-awaited, но нет триггеров ожидания"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "пакет в состоянии %s, но есть триггеры рассмотрения"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "пакет в состоянии triggers-awaited, но нет триггеров рассмотрения"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Пакет в состоянии not-installed имел файлы настройки, можно не принимать во "
 "внимание"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "не удалось открыть для чтения файл информации о пакете «%.255s»"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "не удалось получить информацию о файле информации о пакете «%.255s»"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "не удалось отобразить файл информации о пакете «%.255s» в память"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "не удалось получить информацию о файле информации о пакете «%.255s»"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "не удалось закрыть файл «%.255s» после чтения"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "после имени поля «%.*s» обнаружен символ конца файла"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "в имени поля «%.*s» обнаружен символ конца строки"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "в имени поля «%.*s» обнаружен символ конца файла MS DOS (^Z)"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "после имени поля «%.*s» должно идти двоеточие"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 "перед значением поля «%.*s» обнаружен символ конца файла (отсутствует символ "
 "конца строки)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 "в значении поля «%.*s» обнаружен символ конца файла MS DOS (возможно, "
 "отсутствует символ конца строки)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "в имени поля «%.*s» обнаружен символ конца строки"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 "в значении поля «%.*s» обнаружен символ конца файла (отсутствует символ "
 "конца строки)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 "обнаружено несколько экземпляров информации о пакете, хотя допускается "
 "только один"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "не удалось закрыть файл «%.255s» после чтения"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "в файле «%.255s» нет информации о пакете"
@@ -951,63 +965,63 @@
 "%s, файл «%.255s» около строки %d:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "не может быть пустой строкой"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "должно начинаться с латинской буквы или цифры"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "символ «%c» недопустим (допустимы латинские буквы, цифры и символы «%s»)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<нет>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "строка версии пуста"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "в строке версии есть пробелы"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "эпоха версии не является числом"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "после двоеточия в номере версии ничего не следует"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "недопустимый символ в номере версии"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "недопустимый символ в номере редакции"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "отсутствует %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "пустое значение там, где ожидается %s"
@@ -1026,52 +1040,52 @@
 msgid "(no description available)"
 msgstr "(описание недоступно)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "не удалось проигнорировать сигнал %s перед запуском %.250s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "не удалось восстановить старый обработчик сигнала %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (подпроцесс): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "ошибка при выполнении системного вызова fork"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "подпроцесс %s возвратил код ошибки %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "ожидание завершения подпроцесса %s завершилось неудачно"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "подпроцесс %s завершён по сигналу (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", создан файл core"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "работа подпроцесса %s завершилась неудачно с кодом состояния %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "ожидание завершения подпроцесса %s завершилось неудачно"
@@ -1093,61 +1107,53 @@
 "синтаксическая ошибка в файле триггеров deferred «%.250s», начиная с символа "
 "«%s»%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "не удалось открыть/создать файл блокировки триггеров «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "с триггером"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "не удалось получить информацию о файле триггеров deferred «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "не удалось открыть файл триггеров deferred «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "не удалось открыть/создать новый файл триггеров deferred «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "ошибка чтения файла триггеров deferred «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "ошибка записи в новый файл триггеров deferred «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "не удалось закрыть новый файл триггеров deferred «%.250s»"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "не удалось установить новый файл триггеров deferred «%.250s»"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "пустые имена триггеров не разрешены"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "имя триггера содержит недопустимый символ"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1156,17 +1162,17 @@
 "неправильный или неизвестный синтаксис в имени триггера «%.250s» (в триггере "
 "interests для пакета «%.250s»)"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "не удалось открыть файл списка триггеров interest «%.250s»"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "не удалось вернуться в начало файла триггера interest «%.250s»"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1175,83 +1181,89 @@
 "ошибка в файле триггера interest «%.250s»; неправильное имя пакета «%.250s»: "
 "%.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "не удалось создать новый файл триггера interest «%.250s»"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "не удалось записать в новый файл триггера interest «%.250s»"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "не удалось сбросить на диск новый файл триггера interest «%.250s»"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "не удалось синхронизировать новый файл триггера interest «%.250s»"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "не удалось закрыть новый файл триггера interest «%.250s»"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "не удалось установить новый файл триггера interest «%.250s»"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "не удалось удалить «%.250s»"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "не удалось создать новый файл триггера interest «%.250s»"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "не удалось закрыть новый файл триггера interest «%.250s»"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr "повтор файла триггера interest для файла «%.250s» и пакета «%.250s»"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "не удалось создать новый файл триггеров «%.250s»"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "не удалось записать в новый файл триггеров «%.250s»"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "не удалось сбросить на диск новый файл триггеров «%.250s»"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "не удалось синхронизировать новый файл триггеров «%.250s»"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "не удалось закрыть новый файл триггеров «%.250s»"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "не удалось установить новый файл триггеров «%.250s»"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "не удалось прочитать файл триггеров «%.250s»"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "синтаксическая ошибка в файле триггеров «%.250s»"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1260,7 +1272,7 @@
 "запись файла триггеров содержит неверное имя пакета «%.250s» (для interest в "
 "файле «%.250s»): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1269,31 +1281,39 @@
 "файл триггеров ci «%.250s» содержит неверный синтаксис в имени триггера "
 "«%.250s»: %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "не удалось открыть файл триггеров ci «%.250s»"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "файл триггеров ci содержит директиву с неизвестным синтаксисом"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "файл триггеров ci содержит неизвестную директиву «%.250s»"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "не удалось создать каталог состояния триггеров «%.250s»"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 "не удалось назначить владельца для каталога состояния триггеров «%.250s»"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "пустые имена триггеров не разрешены"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "имя триггера содержит недопустимый символ"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1318,7 +1338,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "ошибка при форматировании строки в переменную varbuf"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "ошибка чтения данных из канала dpkg-deb"
 
@@ -1337,12 +1357,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "ошибка при установке владельца символьной ссылки «%.255s»"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "ошибка при установке владельца «%.255s»"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "ошибка при установке прав доступа к «%.255s»"
@@ -1400,17 +1420,26 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "архив содержит объект «%.255s» неизвестного типа 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "не удалось выполнить stat для файла «%s»"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Замена файлов в старом пакете %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Заменено файлами из установленного пакета %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1419,96 +1448,101 @@
 "попытка переписать каталог «%.250s» в пакете %.250s %.250s файлом, не "
 "являющимся каталогом"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "попытка перезаписать «%.250s», который уже имеется в пакете %.250s %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "не удалось создать «%.255s» (при обработке «%.255s»)"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "обработка файла «%.255s» процессом dpkg-deb"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "ошибка при закрытии/записи «%.255s»"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "ошибка создания канала «%.255s»"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "ошибка создания устройства «%.255s»"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "ошибка создания жёсткой ссылки «%.255s»"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "ошибка создания символьной ссылки «%.255s»"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "ошибка создания каталога «%.255s»"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 "не удалось переместить в другое место «%.255s», что необходимо для установки "
 "новой версии"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "не удалось прочитать символьную ссылку «%.255s»"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "не удалось создать резервную ссылку на «%.255s»"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "не удалось сменить владельца резервной ссылки на «%.255s»"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "не удалось создать резервную ссылку на «%.255s» перед установкой новой версии"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "не удалось установить новую версию «%.255s»"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "не удалось открыть «%.255s»"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "не удалось синхронизировать файл «%.255s»"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1517,7 +1551,7 @@
 "игнорируются проблемы зависимостей с %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1526,7 +1560,7 @@
 "рассматривается перевод пакета первой\n"
 " необходимости %s в ненастроенное состояние для активации %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1535,7 +1569,7 @@
 "dpkg: нет, пакет %s является пакетом первой необходимости и не будет\n"
 " переведён в ненастроенное состояние для активации %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1544,17 +1578,17 @@
 "dpkg: нет, невозможно продолжить с %s (вам поможет --auto-deconfigure):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "удаление %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "установка %.255s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
@@ -1562,13 +1596,13 @@
 "dpkg: рассматривается перевод %s в ненастроенное состояние,\n"
 " который был бы сломан %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr ""
 "dpkg: да, %s будет переведён в ненастроенное состояние (сломан из-за %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1577,11 +1611,11 @@
 "dpkg: относительно %s, содержащего %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "поломка игнорируется, можно продолжать!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1590,29 +1624,29 @@
 "установка %.250s сломает %.250s, и\n"
 " деконфигурация не разрешена (--auto-deconfigure может помочь)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "установка %.250s сломает имеющееся ПО"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr ""
 "dpkg: чтобы можно было установить пакет %2$s, необходимо удалить %1$s...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s не установлен корректно, все зависимости от него игнорируются.\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: возможны проблемы с удалением %s, поскольку он предоставляет %s...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1621,110 +1655,112 @@
 "dpkg: пакет %s требует переустановки, но по вашему указанию всё равно будет "
 "удалён.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: пакет %s требует переустановки и не будет удалён.\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: %s будет удалён, чтобы можно было установить %s.\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "конфликт пакетов -- %.250s не будет установлен"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "конфликт игнорируется, можно продолжать!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive требует задания хотя бы одного имени каталога"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "поиск для dpkg --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "не удалось открыть дескриптор канала find"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "ошибка чтения из канала find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "ошибка при закрытии канала find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 "при поиске файлов в каталогах программа find вернула неизвестный код ошибки "
 "%i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 "поиск завершён, пакеты (файлы с именами, удовлетворяющими шаблону *.deb) "
 "найти не удалось"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s требует задания хотя бы одного имени файла"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<стандартный вывод>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<стандартный поток ошибок>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Выбор ранее не выбранного пакета %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Пропуск не выбранного пакета %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Версия %.250s пакета %.250s уже установлена, пропускаем пакет.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "снижение версии %.250s с %.250s до %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "Версия %.250s не будет снижена с %.250s до %.250s, пропускаем пакет.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1733,40 +1769,40 @@
 "не удалось удалить новую версию «%.250s», что необходимо для отката к старой "
 "версии"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "невозможно восстановить сохранённую копию старой версии «%.250s»"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "не удалось удалить сохранённую копию «%.250s»"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "невозможно удалить только что установленную версию «%.250s»"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "не удалось установить только что распакованную новую версию «%.250s»"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr ""
 "не удалось получить информацию о новом распространяемом conffile-файле "
 "«%.250s»"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 "не удалось получить информацию об уже установленном conffile-файле «%.250s»"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1777,57 +1813,57 @@
 "Файл настройки «%s» отсутствует.\n"
 "По вашему указанию устанавливается новый файл настройки.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: не удалось удалить резервную копию «%.250s»: %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: не удалось переименовать «%.250s» в «%.250s»: %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: не удалось удалить «%.250s»: %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: не удалось удалить старую распространяемую версию «%.250s»: %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: не удалось удалить «%.250s» (перед перезаписью): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: не удалось создать ссылку «%.250s» на «%.250s»: %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Устанавливается новая версия файла настройки %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "не удалось установить «%.250s» в качестве «%.250s»"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "пакет с именем «%s» не установлен, настройка невозможна"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "пакет %.250s уже установлен и настроен"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1836,7 +1872,7 @@
 "пакет %.250s не готов к настройке\n"
 " настройка невозможна (текущее состояние: «%.250s»)"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1845,11 +1881,11 @@
 "dpkg: зависимости пакетов не позволяют настроить пакет %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "проблемы зависимостей -- оставляем не настроенным"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1859,7 +1895,7 @@
 "настройку:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1867,12 +1903,12 @@
 "Пакет абсолютно неработоспособен -- перед настройкой его\n"
 " следует переустановить."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Настраивается пакет %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1881,7 +1917,7 @@
 "%s: не удалось получить информацию о файле настройки «%s»\n"
 " (= «%s»): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1890,7 +1926,7 @@
 "%s: файл настройки «%s» является циклической ссылкой\n"
 " (= «%s»)"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1899,7 +1935,7 @@
 "%s: не удалось выполнить readlink для conffile-файла «%s»\n"
 " (= «%s»): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1908,35 +1944,35 @@
 "%s: запись о conffile-файле «%.250s» разрешается в вырожденное имя файла\n"
 " («%s» является символьной ссылкой на «%s»)"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: conffile-файл «%.250s» не является обычным файлом или символьной ссылкой "
 "(= «%s»)"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: не удалось открыть conffile-файл %s для хэша: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Когда закончите, наберите «exit».\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1945,12 +1981,12 @@
 "\n"
 "Файл настройки «%s»"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (на самом деле «%s»)"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1961,7 +1997,7 @@
 " ==> Файл, созданный вами или сценарием.\n"
 " ==> Также, файл в пакете, предоставленный сопровождающим пакета.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1970,7 +2006,7 @@
 "\n"
 "     После установки не изменялся.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1979,7 +2015,7 @@
 "\n"
 " ==> Изменён после установки (вами или сценарием).\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1988,37 +2024,37 @@
 "\n"
 " ==> Удалён во время установки (вами или сценарием).\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Автор пакета предоставил обновлённую версию.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Версия в пакете та же, что и при последней установке.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> По вашему указанию используется новый файл.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> По вашему указанию используется старый файл.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> По умолчанию сохраняется старый файл настройки.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> По умолчанию используется новый файл настройки.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2033,158 +2069,160 @@
 "      D    : показать различия между версиями\n"
 "      Z    : запустить оболочку командной строки для проверки ситуации\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " По умолчанию сохраняется текущая версия файла настройки.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " По умолчанию устанавливается новая версия файла.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[по умолчанию N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[по умолчанию Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[значения по умолчанию нет]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "при выводе запроса обнаружена ошибка записи в поток stderr"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "ошибка чтения ответа на запрос из потока stdin"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "В ответе на запрос из потока stdin прочитан символ конца файла"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s зависит от %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s требует предварительной установки %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s рекомендует %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s предлагает %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s ломает %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s конфликтует с %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s расширяет возможности %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  пакет %.250s будет удалён.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s будет деконфигурирован.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr " пакет %.250s будет установлен, но его версия %.250s.\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  пакет %.250s установлен, но его версия %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  пакет %.250s распакован, но не был настроен.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  пакет %.250s распакован, но его версия %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  последняя настроенная версия пакета %.250s -- %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  пакет %.250s %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr " пакет %.250s предоставляет %.250s, но должен быть удалён.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 "  пакет %.250s предоставляет %.250s, но должен быть деконфигурирован.\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  пакет %.250s предоставляет %.250s, но он %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  пакет %.250s не установлен.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  пакет %.250s версии %.250s будет установлен.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (версия %.250s) существует и %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s предоставляет %.250s и будет установлен.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s предоставляет %.250s и и существует и %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "Используйте параметр --help для вывода справки по запросам пакетов."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2192,7 +2230,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s, версия %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2203,8 +2241,8 @@
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 "Copyright (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2215,7 +2253,7 @@
 "Универсальной общественной лицензии GNU версии 2 или более поздней.\n"
 "НИКАКИЕ гарантии не предоставляются.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2225,7 +2263,7 @@
 "Использование: %s [<параметр> ...] <команда>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2244,7 +2282,7 @@
 "  --truename <файл>        вернуть отклонённый файл.\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2275,7 +2313,7 @@
 "  --version                вывести номер версии.\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2289,17 +2327,12 @@
 " совпадать с --divert. В сценариях пакетов preinst/postrm всегда нужно\n"
 "указывать --package и --divert.\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "не удалось выполнить stat для файла «%s»"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "ошибка при проверке «%s»"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2308,129 +2341,129 @@
 "переименование вызовет перезапись «%s»\n"
 "  другим файлом «%s», что не разрешено"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "не удалось записать файл «%s»"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "копия файла"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "не удалось переименовать «%s» в «%s»"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "rename: удаление дублирующей старой ссылки «%s»"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "не удалось открыть исходный файл «%.250s»"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "локальное отклонение %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "локальное отклонение %s в %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "отклонение %s из-за %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "отклонение %s в %s из-за %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "любое отклонение %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "любое отклонение %s в %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "не удалось создать новый файл %s"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "не удалось сбросить на диск файл «%s»"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "удаление старого diversions-old"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "ошибка при создании нового diversions-old"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "ошибка при установке нового diversions"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s нужен один аргумент"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "имя файла «%s» указано не с полным путём"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "файл не может содержать символов новой строки"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Нельзя отклонять каталоги"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "невозможно отклонить файл «%s» в самого себя"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "Оставляется «%s»\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "«%s» расходится с «%s»"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "Добавляется «%s»\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Нет отклонения «%s», ничего не удалено.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2441,7 +2474,7 @@
 "  при удалении «%s»\n"
 "  найдено «%s»"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2452,16 +2485,16 @@
 "  при удалении «%s»\n"
 "  найдено «%s»"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "Удаляется «%s»\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "пакет не может содержать символов новой строки"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "divert-to не может содержать символов новой строки"
 
@@ -2548,8 +2581,8 @@
 "only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "у --%s нет аргументов"
@@ -2647,7 +2680,7 @@
 msgid "--compare-versions bad relation"
 msgstr "в качестве аргумента --compare-versions указано недопустимое отношение"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "версия «%s» имеет неправильный синтаксис: %s"
@@ -2703,12 +2736,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "проблема игнорируется, поскольку задан параметр --force:"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "не удалось открыть список файлов пакета «%.250s»"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2717,38 +2750,38 @@
 "список файлов пакета «%.250s» отсутствует, предполагаем, что на данный "
 "момент у пакета нет установленных файлов."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "не удалось открыть список файлов пакета «%.250s»"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "список файлов пакета «%.250s»"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "в списке файлов пакета «%.250s» отсутствует завершающий символ новой строки"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "список файлов пакета «%.250s» содержит пустое имя файла"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "ошибка при закрытии списка файлов пакета «%.250s»"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Чтение базы данных ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
@@ -2756,32 +2789,32 @@
 msgstr[1] "на данный момент установлено %d файла и каталога.)\n"
 msgstr[2] "на данный момент установлено %d файлов и каталогов.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "не удалось создать обновлённый список файлов пакета %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "не удалось записать обновлённый список файлов пакета %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "не удалось сбросить на диск обновлённый список файлов пакета %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "не удалось синхронизировать обновлённый список файлов пакета %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "не удалось закрыть обновлённый список файлов пакета %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "не удалось установить обновлённый список файлов пакета %s"
@@ -2819,7 +2852,9 @@
 msgstr "установлен"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "ошибка: не задана переменная окружения PATH."
 
 #: src/help.c:129
@@ -2871,7 +2906,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2883,65 +2918,65 @@
 msgstr "не удалось выполнить chroot в «%.250s»"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "не удалось перейти в каталог «%.255s»"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "не удалось сделать файл «%.250s» исполняемым"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "не удалось выполнить setenv для сценария сопровождающего"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "установлен сценарий %s"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "не удалось получить информацию о %s в «%.250s»"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "новый сценарий %s"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "старый сценарий %s"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "не удалось получить информацию о %s в «%.250s»: %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg: попытка использовать сценарий из нового пакета ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "в новой версии пакета нет этого сценария, отказ"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... похоже всё обошлось.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "не удалось безопасно удалить «%.255s»"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2950,7 +2985,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "не удалось проверить существование файла «%.250s»"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "ошибка чтения информационного каталога"
 
@@ -3027,7 +3062,7 @@
 "  -Dh|--debug=help                    Вывести справку по командам отладки\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3166,7 +3201,7 @@
 "Программы «dselect» или «aptitude» предоставляют дружественный интерфейс\n"
 "управления пакетами.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3218,30 +3253,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3250,103 +3289,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "проблемы зависимостей -- не удаляется"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "проблемы зависимостей -- не удаляется"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "не удалось выполнить setenv для сценария сопровождающего"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "ошибка чтения файла настройки «%.255s»"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3354,7 +3393,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3362,41 +3401,41 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "параметр --debug принимает в качестве аргумента восьмеричное число"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "пустое имя пакета в разделённом запятыми списке игнорируемых зависимостей "
 "«%.250s»"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends требует корректного имени пакета. «%.250s» таковым не "
 "является: %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "некорректное целое значение аргумента --%s: «%.250s»"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "ошибка выполнения ловушки «%s», код возврата %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "состояние"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3405,7 +3444,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3413,12 +3452,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "недопустимый параметр игнорирования/обработки проблем «%.*s»"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "устаревший параметр игнорирования/обработки «%s»\n"
@@ -3441,8 +3480,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "неожиданный конец файла, ещё не кончилась строка %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "укажите требуемое действие"
 
@@ -3607,92 +3646,92 @@
 msgid "passed\n"
 msgstr "пройдена\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "не удалось создать временный каталог"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "пакет %s содержит слишком много Conflicts/Replaces пар"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "старая версия пакета содержит информационный файл с очень длинным именем, "
 "начинающимся с «%.250s»"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "не удалось удалить устаревший информационный файл «%.250s»"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 "не удалось установить(предположительно) новый информационный файл «%.250s»"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "не удалось открыть временный каталог управляющей информации"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "пакет содержит очень длинное имя файла управляющей информации (начинается с "
 "«%.50s»)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "управляющая информация пакета содержит каталог «%.250s»"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "rmdir при попытке удалить управляющую информацию пакета «%.250s» не "
 "утверждает, что это не было каталогом"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "пакет %s содержит в качестве информационного файла список"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "не удалось переименовать новый информационный файл «%.250s» в «%.250s»"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "не удалось удалить файл управляющей информации «%.250s»"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "нет доступа к архиву"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "не удалось создать временный каталог"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "длина управляющей информации"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Записана информация о пакете %s из файла %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "архитектура пакета (%s) не соответствует архитектуре системы (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3701,101 +3740,101 @@
 "dpkg: не выполнены обязательные условия установки пакета %s из файла %s:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "не выполнены предварительные условия, пакет %.250s не будет установлен"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "игнорируются предварительные условия установки!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Подготовка к замене пакета %s %s (используется файл %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Распаковывается пакет %s (из файла %s)...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "имя conffile (начинается с «%.250s») слишком длинное (>%d символов)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "ошибка чтения файла %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "ошибка при закрытии файла %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "ошибка при попытке открыть файл %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Деконфигурация %s, чтобы можно было удалить %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Деконфигурация %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Распаковывается замена для пакета %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "извлечение поля с помощью dpkg-deb"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "ошибка чтения архива tar, возвращённого dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "повреждённый архив файловой системы: повреждён файл пакета"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: удаление возможных завершающих нулей"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "не удалось получить информацию о старом файл «%.250s», поэтому не удаляем "
 "его: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "не удалось удалить старый каталог «%.250s»: %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr "старый conffile «%.250s» является пустым каталогом (и был удалён)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "не удалось получить информацию о другом новом файле «%.250s»"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3804,12 +3843,12 @@
 "старый файл «%.250s» такой же как несколько новых файлов! («%.250s» и "
 "«%.250s»)"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "не удалось безопасно удалить старый файл «%.250s»: %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Пакет %s полностью заменён и фактически исчез.)\n"
@@ -3998,7 +4037,7 @@
 "show.\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -4020,6 +4059,10 @@
 "  ${поле[;ширина]}. Поля выравниваются по правому краю, если ширина\n"
 "  неотрицательна и по левому в противном случае.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Используйте параметр --help для вывода справки по запросам пакетов."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4081,7 +4124,7 @@
 msgid "Removing %s ...\n"
 msgstr "Удаляется пакет %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4090,48 +4133,49 @@
 "при удалении пакета %.250s не удалось удалить каталог «%.250s»: %s -- "
 "возможно, он является точкой монтирования файловой системы?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "не удалось удалить «%.250s»"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "не удалось безопасно удалить «%.250s»"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr "при удалении %.250s не пустой каталог «%.250s» не удалён."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "не удалось удалить «%.250s»"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Вычищаются файлы настройки пакета %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "не удалось удалить старый файл настройки «%.250s» (= «%.250s»)"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 "не удалось открыть для чтения каталог файлов настройки «%.250s» (указан в "
 "«%.250s»)"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr "не удалось удалить «%.250s», резервную копию файла настройки «%.250s»"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "не удалось удалить старый список файлов"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "не удалось удалить старый скрипт, выполняемый после удаления"
 
@@ -4174,7 +4218,13 @@
 msgid "read error on standard input"
 msgstr "ошибка чтения стандартного потока ввода"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "Используйте параметр --help для вывода справки по запросам пакетов."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4183,7 +4233,7 @@
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4200,7 +4250,7 @@
 "  --list [<glob-шаблон>]   список имеющихся замещений в базе данных.\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4222,31 +4272,31 @@
 "  --version                вывести номер версии.\n"
 "\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "удаляются конечные /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "не удалось открыть новый файл statoverride"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "ошибка при удалении statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "ошибка при создании нового statoverride-old"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "ошибка при установке нового statoverride"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "для --add требуется четыре параметра"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4255,21 +4305,21 @@
 "Замещение для «%s» уже существует, но указан параметр --force, поэтому "
 "ошибка игнорируется."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Замещение для «%s» уже существует, останов."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "указан --update, но %s не существует"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Нет замещений."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update бесполезен вместе с --remove"
 
@@ -4335,16 +4385,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "для файла «%.250s» есть несколько statusoverides"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Чтобы получить справку, введите dpkg-trigger --help."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Утилита работы с триггерами пакетов Debian %s, версия %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4355,7 +4405,7 @@
 "       %s [<параметры> ...] <команда>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4368,7 +4418,7 @@
 "                                   имеющийся dpkg.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4390,21 +4440,21 @@
 "изменять.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: каталог с данными триггеров ещё не создан\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: записи триггера пока не существуют\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "принимает только один аргумент, имя триггера"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4414,13 +4464,13 @@
 "dpkg-trigger должен вызываться из сценария сопровождающего (или с параметром "
 "--by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: неверное имя ожидаемого пакета «%.250s»: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "неверное имя триггера «%.250s»: %.250s"
@@ -4453,33 +4503,34 @@
 msgstr "Обрабатываются триггеры для %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s может быть только один аргумент (файл Packages)"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "не удалось втянуть информацию о доступных обновлениях, нет доступа к области "
 "состояний dpkg"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "втягивание информации о доступных обновлениях требует доступа к области "
 "состояний dpkg на запись"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Информация о доступных пакетах заменяется содержимым файла %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Информация о доступных пакетах сливается с содержимым файла %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
@@ -4487,7 +4538,7 @@
 msgstr[1] "Обновлена информация о %d пакетах.\n"
 msgstr[2] "Обновлена информация о %d пакетах.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4608,8 +4659,8 @@
 msgstr[1] "проигнорировано %d предупреждения об управляющих файлах\n"
 msgstr[2] "проигнорировано %d предупреждений об управляющих файлах\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s требуется аргумент <каталог>"
@@ -4643,26 +4694,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: сборка пакета «%s» в файл «%s».\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "не удалось создать временный файл (данные)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "область управляющей информации"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "не удалось удалить временный файл (данные) %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4679,20 +4730,20 @@
 msgid "error writing `%s'"
 msgstr "ошибка записи «%s»"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "данные между компонентами"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "не удалось записать имя файла в канал программы tar (данные)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<compress> из tar -cf"
 
@@ -4710,80 +4761,80 @@
 msgid "error reading %s from file %.255s"
 msgstr "не удалось прочитать %s из файла %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "не удалось прочитать архив «%.255s»"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "не удалось получить информацию об архиве"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "в номере версии архива нет точки"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "в заголовке архива нет символов конца строки"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "файл «%.250s» повреждён -- неверный номер части"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "файл «%.250s» не является двоичным архивом debian (возможно, поможет dpkg-"
 "split)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "в номере версии архива нет точки"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "в заголовке архива нет символов конца строки"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "в номере версии архива нет точки"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "архивы версии %.250s не поддерживаются, используйте более новый dpkg-deb"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "пропущены данные компонента файла %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr ""
 "файл «%.250s» содержит не распознаваемый компонент данных %.*s, сдаёмся"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "файл «%.250s» содержит два управляющих компонента, сдаёмся"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4795,24 +4846,24 @@
 " новый пакет Debian, версия %s.\n"
 " размер %ld байт(а): управляющий архив длиной %zi байт(а).\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr ""
 "запись о длине управляющей информации архива «%s» имеет недопустимый формат"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "пропущены данные компонента файла %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4825,7 +4876,7 @@
 " размер %ld байт(а): управляющий архив длиной %zi байт(а),\n"
 "основной архив длиной %ld байт(а).\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4834,49 +4885,50 @@
 "dpkg-deb: файл выглядит так, как будто его загрузили в ASCII\n"
 "dpkg-deb:    режиме и сделали, таким образом, нечитаемым.\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "«%.255s» не является архивом в формате debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "не удалось осуществить запись в канал ввода/вывода при копировании"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "не удалось закрыть канал ввода/вывода при копировании"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "данные"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "не удалось перейти в каталог"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "не удалось создать каталог"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "не удалось после создания каталога перейти в него"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "не удалось перейти в каталог"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<decompress>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "вставка"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s требует указания в качестве аргумента имени файла .deb"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4885,38 +4937,38 @@
 "--%s требует указания каталога назначения.\n"
 "Вероятно, вам следует использовать dpkg --install"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s принимает не более двух аргументов (имя файла .deb и каталог)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s принимает только один аргумент (имя файла .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "не удалось перейти в каталог «/» для очистки"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "не удалось выполнить stat для файла «%s»"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: «%.255s» не содержит управляющего компонента «%.255s»\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "по непонятной причине не удалось открыть компонент «%.255s» (каталог %.255s)"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
@@ -4924,59 +4976,59 @@
 msgstr[1] "отсутствует %d запрашиваемых управляющих компонента"
 msgstr[2] "отсутствует %d запрашиваемых управляющих компонентов"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "не удалось просмотреть каталог «%.255s»"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "не удалось получить информацию о файле «%.255s» (в «%.255s»)"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "не удалось открыть файл «%.255s» (в «%.255s»)"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "ошибка чтения файла «%.255s» (в «%.255s»)"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld байт(а), %5d строк   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     не является обычным файлом %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(в управляющем архиве нет файла «control»!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "не удалось открыть компонент «control»"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "ошибка чтения компонента «control»"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "ошибка при закрытии компонента «%s»"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Неверный формат"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "параметр --contents принимает ровно один аргумент"
 
@@ -4986,7 +5038,19 @@
 msgstr "Программа работы с архивами пакетов Debian «%s», версия %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4997,6 +5061,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -5016,7 +5082,7 @@
 "                                      (файл tar).\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -5029,11 +5095,27 @@
 "<поле> -- название поля в основном управляющем файле.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5059,7 +5141,7 @@
 "                                      lzma, none.\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5073,7 +5155,7 @@
 "«aptitude». Пакеты, распакованные с помощью «dpkg-deb --extract»,\n"
 "будут установлены неправильно!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5082,17 +5164,17 @@
 "Чтобы получить информацию об установке и удалении пакетов, введите dpkg --"
 "help."
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "недопустимое целое для -%c: «%.250s»"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "неправильная степень сжатия для -%c: %ld"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "неизвестный тип сжатия --«%s»!"
@@ -5113,7 +5195,7 @@
 msgstr ""
 "файл «%.250s» повреждён -- отсутствует символ конца строки после %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "ошибка чтения %.250s"
@@ -5209,51 +5291,57 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "файл «%.250s» повреждён -- неверный номер части"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "имя пакета"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "файл «%.250s» повреждён -- недопустимый идентификатор типа в конце второго "
 "заголовка"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "файл «%.250s» повреждён -- второй компонент не является компонентом данных"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "файл «%.250s» повреждён -- неверное число частей при заданном размере части"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "файл «%.250s» повреждён -- неправильный размер указанной части"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "не удалось получить информацию о части архива «%.250s»"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "файл «%.250s» повреждён -- слишком короткий"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "не удалось открыть часть архива «%.250s»"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "файл «%.250s» не является частью архива"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5273,6 +5361,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5296,13 +5385,20 @@
 "      (использовано)                %lu байт\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<неизвестен>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr ""
 "для --%s требуется указать один или более файлов частей в качестве аргументов"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "файл «%s» не является частью архива\n"
@@ -5338,7 +5434,7 @@
 msgid "split package part"
 msgstr "Склейка пакета %s из %d части: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "готово\n"
@@ -5392,17 +5488,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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"
 "  --depotdir <каталог>                использовать <каталог> вместо %s/%s.\n"
@@ -5416,20 +5521,29 @@
 "\n"
 "Коды завершения: 0 = OK;  1 = -a не является частью;  2 = проблема!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Чтобы получить справку, введите dpkg-split --help."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "неожиданный конец файла %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "размер части слишком велик или не положителен"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "размер части должен быть, по крайней мере, %d КиБ (размер заголовка)"
@@ -5540,27 +5654,27 @@
 msgid "Deleted %s.\n"
 msgstr "%s удалён.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "извлечение поля с помощью dpkg-deb"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "не удалось открыть исходный файл «%.250s»"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "не удалось получить информацию об исходном файле"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "исходный файл «%.250s» не является обычным файлом"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5570,17 +5684,17 @@
 msgstr[1] "Склейка пакета %s из %d частей: "
 msgstr[2] "Склейка пакета %s из %d частей: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "действие --split требует указания имени исходного файла"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "действие --split не принимает аргументов, помимо имени исходного файла и "
@@ -5753,125 +5867,90 @@
 "  --version                вывести номер версии.\n"
 "\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "ошибка"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "предупреждение"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "не удалось выполнить stat для «%s»: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "readlink(%s) завершилась неудачно: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "указаны две команды: --%s и --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "не удалось добавить в %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "сканирование %s завершилось неудачно: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "не удалось запустить %s: %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "не удалось создать символьную ссылку %s на %s: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "не удалось установить %s как %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "не удалось удалить %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "неожиданный конец файла при попытке чтения %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "при чтении %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "при попытке чтения %s обнаружена незакрытая строка"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s повреждён: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "символы новой строки запрещены в файлах update-alternatives (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "во время записи %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "подчинённое имя"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "повторение подчинённого %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "подчинённая ссылка"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "совпадение подчинённой ссылки с главной ссылкой %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "повторение подчинённой ссылки %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "мастер файл"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "повторение пути %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5880,90 +5959,75 @@
 "альтернатива %s (часть группы ссылок %s) не существует. Удаляется из списка "
 "альтернатив."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "приоритет"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "подчинённый файл"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "приоритет %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "не удалось прочитать %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "состояние"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "неправильное состояние"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "мастер ссылка"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "не удалось закрыть %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "отбрасывается устаревшая подчинённая ссылка %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "не удалось записать в %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "автоматический режим"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "ручной режим"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "  ссылка сейчас указывает на %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "  ссылка сейчас отсутствует"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s -- приоритет %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  подчинённый %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Текущая «лучшая» версия: «%s»."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Нет доступных версий."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
@@ -5971,40 +6035,40 @@
 msgstr[1] "Есть %d варианта для альтернативы %s (предоставляет %s)."
 msgstr[2] "Есть %d вариантов для альтернативы %s (предоставляет %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Выбор"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Путь"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Приоритет"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Состояние"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Нажмите enter, чтобы сохранить текущий выбор[*], или введите выбранное "
 "число: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "%s на ссылку не заменён."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "не удалось установить неизвестный выбор %s"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -6013,98 +6077,153 @@
 "пропуск создания %s, так как связанный с ней файл %s (из группы ссылок %s) "
 "не существует."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "%s на ссылку не заменён."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Вызов %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Альтернатива %s не изменена, так как вариант %s недоступен."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Пропуск неизвестной альтернативы %s."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "при попытке чтения %s найдена слишком длинная или незакрытая строка"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Пропускается некорректная строка: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "переименовывается ссылка %s из %s в %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "переименовывается подчинённая ссылка %s из %s в %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "альтернативное имя (%s) не должно содержать пробелы и «/»."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "альтернативная ссылка не является абсолютной как должно быть: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "альтернативный путь не является абсолютным как должно быть: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "альтернатива %s не может быть мастером: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "альтернативная ссылка %s уже управляется %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "альтернативный путь %s не существует."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "альтернатива %s не может быть подчинена %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "альтернатива %s не может быть мастером: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "альтернативная ссылка %s уже управляется %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "неизвестный аргумент «%s»"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "для --install требуется указать <ссылку> <имя> <путь> <приоритет>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<ссылка> и <путь> не могут быть одинаковыми"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "приоритет должен быть целым числом"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "для --%s требуется <имя> <путь>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "для --%s требуется <имя>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "команда --slave возможна только вместе с --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "для --slave требуются аргументы <ссылка> <имя> <путь>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "имя %s принадлежит и мастеру и подчинённому"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "ссылка %s принадлежит и мастеру и подчинённому"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s нужен аргумент <файл>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "неизвестный параметр «%s»"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -6112,67 +6231,22 @@
 "требуется --display, --query, --list, --get-selections, --config, --set, --"
 "set-selections, --install, --remove, --all, --remove-all или --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "альтернатива %s не может быть мастером: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "альтернативная ссылка %s уже управляется %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "альтернативная ссылка не является абсолютной как должно быть: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "альтернативный путь не является абсолютным как должно быть: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "альтернативный путь %s не существует."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "альтернативное имя (%s) не должно содержать пробелы и «/»."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "это альтернатива мастер."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "является подчинённой для %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "альтернатива %s не может быть подчинена %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<стандартный ввод>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "нет альтернатив для %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s является повисшей, значение будет заменено лучшим выбором."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6184,49 +6258,49 @@
 "%s была изменена (вручную или сценарием). Переключение на режим только "
 "ручного обновления."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "настройка автоматического выбора %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "альтернатива %s для %s не зарегистрирована, не выбирается."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Нет программы, которая предоставляет %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Настраивать нечего."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Есть только одна альтернатива в группе ссылок %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "альтернатива %s для %s не зарегистрирована, не удаляется."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "удаляется альтернатива, выбранная вручную -- переключение %s в "
 "автоматический режим"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "автоматическое обновление %s выключено, оставлено как есть."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6234,12 +6308,12 @@
 "чтобы вернуться в автоматический режим выполните команду «update-"
 "alternatives --auto %s»."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "используется `%s' для предоставления `%s' (%s) в %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
@@ -6247,13 +6321,49 @@
 "принудительная переустановка альтернативы%s, так как группа ссылок %s "
 "сломана."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "текущая альтернатив%s неизвестна, для группы ссылок %s выполняется "
 "переключение на %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "это альтернатива мастер."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "является подчинённой для %s"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "не удалось выполнить stat для «%s»: %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "readlink(%s) завершилась неудачно: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "сканирование %s завершилось неудачно: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "не удалось запустить %s: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "не удалось создать символьную ссылку %s на %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "не удалось установить %s как %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "во время записи %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "не удалось прочитать %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "не удалось закрыть %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "не удалось записать в %s: %s"
+
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6514,9 +6624,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "пропущена управляющая область из %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "не удалось запустить tar"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "не удалось создать временный каталог"
 
Binary files dpkg/po/sk.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/sk.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/sk.po /home/vorlon/devel/multiarch/dpkg-debian/po/sk.po
--- dpkg/po/sk.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/sk.po	2012-06-07 10:11:09.426073000 -0700
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-12-16 20:37+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -24,7 +24,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "nie je možné zapísať súbor „%s“"
@@ -45,71 +45,77 @@
 msgid "ar member file (%s)"
 msgstr "nie je možné vykonať fstat členského súboru ar (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "zlyhanie čítania pri kopírovaní buffera %s"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "zlyhanie zápisu pri kopírovaní buffera %s"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "krátke čítanie pri kopírovaní buffera %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "zlyhalo spustenie programu tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "nie je možné spustiť %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekompresia"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: kompresia"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: chyba pripojenia vstupu na tok gzip"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: vnútorná chyba čítania gzip: „%s“"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: vnútorná chyba zápisu gzip"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: chyba pripojenia výstupu na tok gzip"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: vnútorná chyba čítania gzip"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: vnútorná chyba zápisu gzip: „%s“"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: vnútorná chyba čítania gzip: %s"
@@ -124,31 +130,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: vnútorná chyba čítania bzip2: „%s“"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: vnútorná chyba zápisu bzip2"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: chyba pripojenia výstupu na tok bzip2"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: vnútorná chyba čítania bzip2"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: vnútorná chyba zápisu bzip2: „%s“"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "neočakávaná chyba bzip2"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -157,7 +163,7 @@
 "adresár s aktualizáciami obsahuje súbor „%.250s“, ktorého názov je príliš "
 "dlhý (dĺžka=%d, max=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -165,98 +171,98 @@
 "adresár s aktualizáciami obsahuje súbory s názvami rozličnej dĺžky (oba %d a "
 "%d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "nie je možné zistiť obsah adresára s aktualizáciami „%.250s“"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "zlyhalo odstránenie pridruženého aktualizačného súboru %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "nedá sa vytvoriť „%.255s“"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "nie je možné naplniť %.250s"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "nie je možné vyprázdniť %.250s"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "po naplnení nie je možné presunúť sa na začiatok %.250s"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "nie je možné otvoriť súbor zámku %s na testovanie"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "nie je možné otvoriť/vytvoriť zamykací súbor stavovej databázy"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "nemáte oprávnenie na uzamknutie stavovej databázy dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "nie je možné uzamknúť stavovú databázu dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "požadovaná operácia vyžaduje oprávnenie superpoužívateľa"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "nie je možné pristúpiť ku stavovej oblasti dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "operácia vyžaduje práva na čítanie/zápis do stavovej oblasti dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "chyba pri odstraňovaní môjho vlastného aktualizačného súboru %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "nie je možné zapísať aktualizovaný stav „%.250s“"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "nie je možné vyprázdniť aktualizovaný stav „%.250s“"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "nie je možné skrátiť aktualizovaný stav „%.250s“"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "nie je možné vykonať funkciu fsync na aktualizovaný stav „%.250s“"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "nie je možné uzavrieť aktualizovaný stav „%.250s“"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "nie je možné inštalovať aktualizovaný stav „%.250s“"
@@ -279,72 +285,74 @@
 msgid "unable to open directory '%s'"
 msgstr "nie je možné otvoriť súbor „%s“"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "nie je možné otvoriť súbor „%s“"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "nie je možné vyprázdniť (sync) súbor „%s“"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "nie je možné zatvoriť súbor „%s“"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "chyba pri zápise podrobností „%.50s“ do „%.250s“"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "zlyhalo otvorenie „%s“ na zápis databázy %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "nie je možné nastaviť buffering databázového súboru %s"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "zlyhal zápis záznamu datanázy %s o „%.50s“ do „%.250s“"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "zlyhalo vyprázdnenie (flush) databázy %s do „%.250s“"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "zlyhalo vyprázdnenie (fsync) databázy %s do „%.250s“"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "chyba pri uzatváraní „%.250s“ po zápise databázy %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "chyba pri vytváraní odkazu „%.250s“ na „%.250s“ kvôli vytvoreniu zálohy "
 "databázy %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "chyba pri inštalácii „%.250s“ ako „%.250s“ obsahujúceho databázu %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -353,7 +361,7 @@
 "%s: kritická chyba, zotavenie nie je možné, prerušuje sa:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -365,13 +373,13 @@
 "%s: kritická chyba, zotavenie nie je možné, prerušuje sa:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "nedostatok pamäte pre novu čistiacu položku"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -380,32 +388,32 @@
 "%s: chyba počas čistenia:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: príliš veľa vnorených chýb počas opravy chyby !!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "nedostatok pamäte pre novu čistiacu položku"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "nedostatok pamäte pre novú čistiacu položku s množstvom argumentov"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s: upozornenie: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: upozornenie: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: vnútorná chyba: %s\n"
@@ -421,107 +429,107 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "„%.*s“ nie je prípustné pre %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "nezmyselné dáta po %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "chybné meno balíka (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "prázdne pole s podrobnosťami súboru „%s“"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "pole s podrobnosťami súboru „%s“ nie je prípustné v stavovom súbore"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "príliš veľa hodnôt v poli s podrobnosťami súboru „%s“ (v porovnaní s "
 "ostatnými)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "príliš málo hodnôt v poli s podrobnosťami súboru „%s“ (v porovnaní ostatnými)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "áno/nie v poli typu boolean"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "slovo v poli priority"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "hodnota pre stavové pole nie je prípustná v tomto kontexte"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "prvé (žiadané) slovo v stavovom poli"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "druhé (chybové) slovo v stavovom poli"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "tretie (stavové) slovo v stavovom poli"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "chyba v reťazci Version „%.250s“"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "použitie zastaralého poľa „Revision“ alebo „Package-Revision“"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "hodnota poľa „config-version“ nie je prípustná v tomto kontexte"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "chyba v reťazci Config-Version „%.250s“"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "hodnota pre „conffiles“ má riadok „%.*s“ v chybnom tvare"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "hodnota pre „conffiles“ nemá riadok začínajúci medzerou „%c“"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "koreňový alebo neuvedený adresár uvedený ako conffile"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr "v poli „%s“ chýba meno balíka alebo obsahuje nezmysly namiesto názvu"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "pole „%s“ obsahuje neplatné meno balíka „%.255s“: %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -530,7 +538,7 @@
 "„pole %s“ odkazujúce na „%.255s“:\n"
 " zlý vzťah verzie %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -539,7 +547,7 @@
 "pole „%s“ odkazujúce na „%.255s“:\n"
 " „%c“ je zastaralé, použité „%c=“ alebo „%c%c“"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -548,11 +556,11 @@
 "pole „%s“ odkazujúce na „%.255s“:\n"
 " implicitná priama zhoda čísla verzie, návrh: použite namiesto toho „=“"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "V poli Provides je možné použiť len presné určenie verzie"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -561,55 +569,55 @@
 "„pole %s“ odkazujúce na „%.255s“:\n"
 " číslo verzie nezačína alfanumerickým znakom. Návrh: pridajte medzeru"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "pole „%s“ odkazujúce na „%.255s“: verzia obsahuje „%c“"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "pole „%s“ odkazujúce na „%.255s“: verzia neukončená"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "pole „%s“ odkazujúce na „%.255s“: chyba vo verzii"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "syntaktická chyba v poli „%s“ po odkaze na balík „%.255s“"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternatíva („|“) nie je prípustná v poli %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "hodnota pre pole „triggers-pending“ nie je prípustná v tomto kontexte"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "neplatný názov čakajúceho spúšťača (triggers-pending) „%.255s“: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "duplicitný čakajúci spúšťač (triggers-pending) „%.255s“"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "hodnota pre pole „triggers-awaited“ nie je prípustná v tomto kontexte"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "nepovolený názov balíka v očakávanom spúšťači „%.255s“: %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr ""
@@ -667,7 +675,7 @@
 msgid "unable to write to status fd %d"
 msgstr "nie je možné zapísať do popisovača stavu fd %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "malloc failed (%ld bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -679,8 +687,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "funkcia realloc zlyhala (%ld bytov)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "nepodarilo sa alokovať pamäť"
 
@@ -713,205 +721,211 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "nie je možné nastaviť príznak close-on-exec na „%.250s“"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "konfiguračná chyba: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "zlyhalo otvorenie konfiguračného súboru „%.255s“ na čítanie: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "nespárované úvodzovky „%s“"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "neznáma voľba „%s“"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "„%s“ vyžaduje uvedenie hodnoty"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "„%s“ neberie hodnotu"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "chyba pri čítaní v konfiguračnom súbore „%.255s“"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "chyba pri uzatváraní konfiguračného súboru „%.255s“"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "chyba pri otváraní konfiguračného súboru „%s“"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "neznáma voľba --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "voľba --%s má priradenú hodnotu"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "voľba --%s nemá priradenú hodnotu"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "neznáma voľba -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "voľba -%c má priradenú hodnotu"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "voľba -%c nemá priradenú hodnotu"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "zastaralá voľba „--%s“\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "odporujúce si operácie -%c (--%s) a -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "duplicitná hodnota poľa „%s“"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "používateľom definované meno poľa „%.*s“ je príliš krátke"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "duplicitná hodnota používateľom definovaného poľa „%.*s“"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Configured-Version pre balík s nezodpovedajúcim Stavom"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "balík je v stave %s, ale očakávajú sa spúšťače (triggers-awaited)"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 "balík je v stave očakávajú sa spúšťače (triggers-awaited), ale neočakávajú "
 "sa žiadne spúšťače"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "balík je v stave %s, ale očakávajú sa spúšťače (triggers-pending)"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 "balík je v stave očakávajú-sa-spúšťače (triggers-pending), ale neočakávajú "
 "sa žiadne spúšťače"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Balíček, ktorý je v stave nenainštalovaný má konfiguračné súbory, zahadzujú "
 "sa"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "zlyhalo otváranie info súboru balíka „%.255s“ na čítanie"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "nie je možné zistiť stav súboru s informáciami o balíku „%.255s“"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "nie je možné vykonať funkciu mmap na info súbor balíka „%.255s“"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "nie je možné zistiť stav súboru s informáciami o balíku „%.255s“"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "zlyhalo uzavretie po načítaní: „%.255s“"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "koniec súboru za poľom „%.*s“"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "nový riadok v poli „%.*s“"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS EOF (^Z) v názve poľa „%.*s“"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "za poľom „%.*s“ musí nasledovať dvojbodka"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF pred hodnotou poľa „%.*s“ (chýbajúci záverečný nový riadok)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "znak MSDOS EOF v hodnote poľa „%.*s“ (chýbajúci nový riadok?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "nový riadok v poli „%.*s“"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 "EOF počas načítania hodnoty poľa „%.*s“ (chýbajúci záverečný nový riadok)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "bolo zistených niekoľko info položiek balíka, prípustná je iba jedna"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "zlyhalo uzavretie po načítaní: „%.255s“"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "žiadne informácie o balíku v „%.255s“"
@@ -940,63 +954,63 @@
 "%s, v súbore „%.255s“ neďaleko riadka %d:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "nesmie byť prázdny reťazec"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "musí začať alfanumerickým znakom"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "znak „%c“ nie je prípustný (prípustné sú len písmená, čísla a znaky „%s“)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<žiadna>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "prázdny reťazec verzie"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "reťazec verzie obsahuje vložené medzery"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "epocha vo verzii nie je číslo"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "za dvojbodkou v čísle verzie nič nenasleduje"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "neplatný znak v čísle verzie"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "neplatný znak v čísle revízie"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "chýba %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "prázdna hodnota %s"
@@ -1015,52 +1029,52 @@
 msgid "(no description available)"
 msgstr "(popis nie je k dispozícii)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "nie je možné ignorovať signál %s pred spustením %.250s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "chyba pri odblokovaní signálu %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (podproces): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "funkcia fork zlyhala"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "podproces %s vrátil chybový kód %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "čakanie na podproces %s zlyhalo"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "podproces %s ukončený signálom (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", bol uložený výpis pamäte"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "podproces %s zlyhal s čakacím stavovým kódom %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "čakanie na podproces %s zlyhalo"
@@ -1081,61 +1095,53 @@
 msgstr ""
 "syntaktická chyba v súbore odložených spúšťačov „%.255s“ na znaku „%s“%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "nie je možné otvoriť/vytvoriť súbor zámku spúšťača „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "spustené"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "nie je možné zistiť stav odloženého súboru spúšťača „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "nie je možné otvoriť odložený súbor spúšťača „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "nie je možné otvoriť/vytvoriť nový odložený súbor spúšťača „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "chyba pri čítaní odloženého súboru spúšťača „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "nie je možné zapísať nový odložený súbor spúšťača „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "nie je možné zatvoriť nový odložený súbor spúšťača „%.250s“"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "nie je možné nainštalovať nový odložený súbor spúšťača „%.250s“"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "prázdne názvy spúšťačov nie sú dovolené"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "názov spúšťača obsahuje neplatný znak"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1144,17 +1150,17 @@
 "neplatná alebo neznáma syntax v názve spúšťača „%.250s“ (v záujmoch spúšťača "
 "balíka „%.250s“)"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "nepodarilo sa otvoriť súbor záujmu spúšťača „%.250s“"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "nepodarilo sa vrátiť na začiatok súboru záujmu spúšťača „%.250s“"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1163,84 +1169,90 @@
 "syntaktická chyba v súbore záujmu spúšťača „%.250s“; neplatný názov balíka "
 "„%.250s“: %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "nepodarilo sa vytvoriť nový súbor záujmu spúšťača „%.250s“"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "nepodarilo sa zapísať nový súbor záujmu spúšťača „%.250s“"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "nepodarilo sa vyprázdniť (flush) nový súbor záujmu spúšťača „%.250s“"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "nepodarilo sa vyprázdniť (sync) nový súbor záujmu spúšťača „%.250s“"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "nepodarilo sa zatvoriť nový súbor záujmu spúšťača „%.250s“"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "nepodarilo sa nainštalovať nový súbor záujmu spúšťača „%.250s“"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "nie je možné odstrániť „%.250s“"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "nepodarilo sa vytvoriť nový súbor záujmu spúšťača „%.250s“"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "nepodarilo sa zatvoriť nový súbor záujmu spúšťača „%.250s“"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 "duplicitný súbor záujmu spúšťača pri názve súboru „%.250s“ a balíka „%.250s“"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "nepodarilo sa vytvoriť nový súbor spúšťača súboru „%.250s“"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "nepodarilo sa zapísať nový súbor spúšťača súboru „%.250s“"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "nepodarilo sa vyprázdniť (flush) nový súbor spúšťača súboru „%.250s“"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "nepodarilo sa vyprázdniť (sync) nový súbor spúšťača súboru „%.250s“"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "nepodarilo sa zatvoriť nový súbor spúšťača súboru „%.250s“"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "nepodarilo sa nainštalovať nový súbor spúšťača súboru „%.250s“"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "nepodarilo sa prečítať nový súbor spúšťača súboru „%.250s“"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "syntaktická chyba v súbore spúšťača súboru „%.250s“"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1249,7 +1261,7 @@
 "záznam spúšťača zmieňuje neplatný názov balíka „%.250s“ (súbor záujmu "
 "spúšťača „%.250s“): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1258,30 +1270,38 @@
 "súbor ci spúšťača „%.250s“ obsahuje neplatnú syntax spúšťača v názve "
 "spúšťača „%.250s“: %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "nepodarilo sa otvoriť súbor ci spúšťača „%.250s“"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "súbor ci spúšťača „%.250s“ obsahuje neplatnú syntax direktívy"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "súbor ci spúšťača obsahuje neznámu direktívu „%.250s“"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "nepodarilo sa vytvoriť adresár stavu spúšťačov „%.250s“"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "nepodarilo sa nastaviť vlastníctvo adresára stavu spúšťačov „%.250s“"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "prázdne názvy spúšťačov nie sú dovolené"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "názov spúšťača obsahuje neplatný znak"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1306,7 +1326,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "chyba pri formátovaní reťazca do premennej varbuf"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "chyba pri čítaní z rúry dpkg-deb"
 
@@ -1325,12 +1345,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "chyba pri nastavovaní vlastníckych práv symbolického odkazu „%.255s“"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "chyba pri nastavovaní vlastníckych práv u „%.255s“"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "chyba pri nastavovaní prístupových práv u „%.255s“"
@@ -1390,17 +1410,26 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "archív obsahoval objekt „%.255s“ neznámeho typu 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "nepodarilo sa vykonať stat() súboru „%s“"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Nahradzujú sa súbory v starom balíku %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, 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:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1408,95 +1437,100 @@
 msgstr ""
 "pokus o prepísanie adresára „%.250s“ v balíku %.250s %.250s neadresárom"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "pokus o prepísanie „%.250s“, ktorý je tiež v balíku %.250s %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "nie je možné vytvoriť „%.255s“ (počas spracovania „%.255s“)"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "backend dpkg-deb počas „%.255s“"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "chyba pri uzatváraní/zápise „%.255s“"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "chyba pri vytváraní rúry „%.255s“"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "chyba pri vytváraní zariadenia „%.255s“"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "chyba pri vytváraní pevného odkazu „%.255s“"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "chyba pri vytváraní symbolického odkazu „%.255s“"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "chyba pri vytváraní adresára „%.255s“"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "nie je možné odsunúť „%.255s“ aby sa dala nainštalovať nová verzia"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "nie je možné prečítať odkaz „%.255s“"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "nie je možné vytvoriť záložný symbolický odkaz na „%.255s“"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, 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 na "
 "„%.255s“"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, 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:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "nie je možné nainštalovať novú verziu „%.255s“"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "nepodarilo sa otvoriť „%.255s“"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "nepodarilo sa vyprázdniť (sync) súbor „%.255s“"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1505,7 +1539,7 @@
 "ignoruje sa problém so závislosťami balíka %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1514,7 +1548,7 @@
 "uvažuje sa o odkonfigurovaní nevyhnutného\n"
 " balíka %s, ktoré umožní %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1523,7 +1557,7 @@
 "dpkg: nie, %s je nevyhnutný, nebude odkonfigurovaný,\n"
 " aby sa umožnil %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1532,28 +1566,28 @@
 "dpkg: nie, nie je možné pokračovať v %s (--auto-deconfigure pomôže):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "odstránení %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "inštalácii %.250s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: uvažuje sa o odstránení %s, ktorý by %s pokazil ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: áno, odkonfiguruje sa %s (pokazený balíkom %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1562,11 +1596,11 @@
 "dpkg: ohľadom %s obsahujúci %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "ignoruje sa pokazenie, je možné pokračovať!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1575,28 +1609,28 @@
 "nainštalovanie %.250s by pokazilo %.250s a\n"
 " odkonfigurovanie nie je povolené (--auto-deconfigure by mohlo pomôcť)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "nainštalovanie %.250s by pokazilo existujúci softvér"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: uvažuje sa o odstránení %s v prospech %s ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s nie je správne nainštalovaný - ignorujú sa všetky závislosti na ňom.\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1605,109 +1639,111 @@
 "dpkg: balík %s vyžaduje reinštaláciu, ale bude odstránený ako ste "
 "požadovali.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 "dpkg: balík %s vyžaduje reinštaláciu, nepokračuje sa v odinštalovaní.\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "konflikt balíkov - nebude sa inštalovať %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "ignoruje sa konflikt, je možné pokračovať!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive vyžaduje aspoň jednu cestu ako argument"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "príkaz find pre dpkg --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "zlyhalo vykonanie funkcie fdopen na rúre príkazu find"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "chyba pri čítaní z rúry príkazu find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "chyba pri uzatváraní rúry príkazu find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "príkaz find pre --recursive vrátil nespracovanú chybu %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 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:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<štand. výstup>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<štand. chybový>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Vyberá sa predtým zrušený balík %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Preskakuje sa zrušený balík %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Verzia %.250s %.250s je uz nainštalovaná, preskakuje sa.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "inštaluje sa staršia verzia %.250s; z %.250s na %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "Nebude sa inštalovať staršia verziu balíka %.250s z verzie %.250s na %.250s, "
 "preskakuje sa.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1717,39 +1753,39 @@
 "umožnila\n"
 "reinštalácie záložnej kópie"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "nie je možné obnoviť záložnú kópiu „%.250s“"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "nie je možné odstrániť záložnú kópiu „%.250s“"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "nie je možné odstrániť novonainštalovanú verziu „%.250s“"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "nie je možné odstrániť novorozbalenú verziu „%.250s“"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr ""
 "nepodarilo sa vykonať stat() nového distribučného konfiguračného súboru "
 "„%.250s“"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "nie je možné zistiť stav aktuálneho konfiguračného súboru „%.250s“"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1760,57 +1796,57 @@
 "Konfiguračný súbor „%s“ v systéme neexistuje.\n"
 "Inštaluje sa nový konfiguračný súbor podľa vašej požiadavky.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: nepodarilo sa odstrániť starú zálohu „%.250s“: %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: nepodarilo sa premenovať „%.250s“ na „%.250s“: %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: nepodarilo sa vykonať „%.250s“: %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: nepodarilo sa odstrániť starú distribuovanú verziu „%.250s“: %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: nepodarilo sa odstrániť odstrániť „%.250s“ (pred prepísaním): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: nepodarilo sa odstrániť vytvoriť odkaz „%.250s“ na „%.250s“: %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Inštaluje sa nová verzia konfiguračného súboru %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "nie je možné inštalovať „%.250s“ ako „%.250s“"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "balík nazvaný „%s“ nie je nainštalovaný, nie je možné ho konfigurovať"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "balík %.250s je už nainštalovaný a nakonfigurovaný"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1819,7 +1855,7 @@
 "balík %.250s nie je pripravený na konfiguráciu\n"
 " nie je možné konfigurovať (súčasný stav „%.250s“)"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1828,11 +1864,11 @@
 "dpkg: problémy so závislosťami zabránili konfigurácii balíka %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "problémy so závislosťami - po necháva sa nenakonfigurované"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1842,7 +1878,7 @@
 "požiadavky:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1850,12 +1886,12 @@
 "Balík je vo veľmi nekonzistentnom stave - mali by ste ho znova\n"
 " nainštalovať pred pokusom o jeho konfiguráciu."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Nastavuje sa balík %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1864,7 +1900,7 @@
 "%s: nie je možné zistiť stav konfiguračného súboru „%s“\n"
 " (= „%s“): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1873,7 +1909,7 @@
 "%s: konfiguračný súbor „%s“ je cyklickým odkazom\n"
 " (= „%s“)"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1882,7 +1918,7 @@
 "%s: nie je možné vykonať funkciu readlink na konfiguračnom súbore „%s“\n"
 " (= „%s“): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1891,34 +1927,34 @@
 "%s: názov konfiguračného súboru „%.250s“ nie je platným názvom\n"
 " („%s“ je symbolický odkaz na „%s“)"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: konfiguračný súbor „%.250s“ nie je súbor ani symbolický odkaz (= „%s“)"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: nie je možné otvoriť konfiguračný súbor %s pre haš: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Po skončení napíšte „exit“.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1927,12 +1963,12 @@
 "\n"
 "Konfiguračný súbor „%s“"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (v skutočnosti „%s“)"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1943,7 +1979,7 @@
 " ==> Súbor v systéme bol vytvorený vami alebo skriptom.\n"
 " ==> Súbor je tiež prítomný v balíku, ktorý poskytuje správca balíka.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1952,7 +1988,7 @@
 "\n"
 "     Nezmenené od doby inštalácie.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1961,7 +1997,7 @@
 "\n"
 " ==> Zmenené (vami alebo skriptom) od doby inštalácie.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1970,37 +2006,37 @@
 "\n"
 " ==> Zmazané (vami alebo skriptom) od doby inštalácie.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Distribútor balíka dodal upravenú verziu.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Verzia v balíku je rovnaká ako posledná nainštalovaná.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Použije sa nový súbor podľa vašej požiadavky.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Použije sa starý súbor podľa vašej požiadavky.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Ponechá sa starý konfiguračný súbor ako predvolený.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Použije sa nový konfiguračný súbor ako predvolený.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2015,160 +2051,162 @@
 "      D     : zobraziť rozdiely medzi verziami\n"
 "      Z     : spustiť shell a preskúmať situáciu\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Predvolenou operáciou je ponechanie vašej aktuálnej verzie.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Predvolenou operáciou je inštalácia novej verzie.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[predvolené=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[predvolené=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[bez predvoľby]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "chyba pri zápise na štandardnom chybovom výstupe, objavene pred otázkou na "
 "konfiguračné súbory"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr ""
 "chyba pri čítaní na štandardnom vstupe pri otázke na konfiguračné súbory"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF na štandardnom vstupe pri otázke na konfiguračné súbory"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s závisí na %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s pred-závisí na %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s odporúča %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s navrhuje %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s kazí %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s je v konflikte s %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s rozširuje %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s sa odstráni.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  zruší sa nastavenie %.250s.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s je nainštalovaný, ale vo verzii %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, 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:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s je rozbalený, ale vo verzii %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s naposledy nastavená verzia je %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s je %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s poskytuje %.250s, ale sa odstráni.\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, 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:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s poskytuje %.250s, ale je %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s nie je nainštalovaný.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (verzia %.250s) sa nainštaluje.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (verzia %.250s) je prítomná a %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, 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:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s poskytuje %.250s a je prítomný a %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "Pomocníka o dopytovaní sa na balíky vyvoláte pomocou --help."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2176,7 +2214,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s verzia %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2187,8 +2225,8 @@
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 "Copyright (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2199,7 +2237,7 @@
 "nájdete v GNU General Public Licence verzie 2 alebo neskoršej.\n"
 "Neposkytuje sa ŽIADNA záruka.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2209,7 +2247,7 @@
 "Použitie: %s [<voľba> ...] <príkaz>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2228,7 +2266,7 @@
 "  --truename <súbor>        vráti odklonený súbor\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2259,7 +2297,7 @@
 "  --version                 zobrazí verziu\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2272,17 +2310,12 @@
 "Predinštalačné a poinštalačné skripty by mali vždy používať --package\n"
 "a --divert.\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "nepodarilo sa vykonať stat() súboru „%s“"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "chyba pri kontrole „%s“"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2291,129 +2324,129 @@
 "premenovanie znamená prepísanie „%s“\n"
 "  súborom „%s“, čo nie je povolené"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "nie je možné zapísať súbor „%s“"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "kopírovanie súboru"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "nepodarilo sa premenovať „%s“ na „%s“"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "premenovanie: odstránenie duplicitného starého odkazu „%s“"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "nie je možné otvoriť zdrojový súbor „%.250s“"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "lokálne odsunutie %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "lokálne odklonenie %s na %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "odklonenie %s balíkom %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "odklonenie %s na %s balíkom %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "ľubovoľné odklonenie %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "ľubovoľné odklonenie %s na %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "nedá sa vytvoriť nový súbor %s"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "nie je možné vyprázdniť (flush) súbor „%s“"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "chyba pri odstraňovaní starého súboru diversions-old"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "chyba pri vytváraní nového súboru diversions-old"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "chyba pri inštalovaní nového súboru diversions"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s vyžaduje jediný parameter"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "názov súboru „%s“ nie je absolútny"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "názov súboru nemôže obsahovať znaky nového riadka"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Adresáre sa nedajú odkloniť"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "nie je možné odkloniť súbor „%s“ na seba samého"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "Opúšťa sa „%s“\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "„%s“ je v kolízii s „%s“"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "Pridáva sa „%s“\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Odklonenie „%s“ neexistuje, takže sa neodstránilo\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2424,7 +2457,7 @@
 "  pri odstraňovaní „%s“\n"
 "  nájdené „%s“"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2435,16 +2468,16 @@
 "  pri odstraňovaní „%s“\n"
 "  nájdené „%s“"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "Odstraňuje sa „%s“\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "názov balíka nemôže obsahovať znaky nového riadka"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "kam-odkloniť nemôže obsahovať znaky nového riadka"
 
@@ -2530,8 +2563,8 @@
 "dselect alebo dpkg --configure --pending (alebo dpkg --triggers-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s nevyžaduje argumenty"
@@ -2625,7 +2658,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions zlá relácia"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "verzia „%s“ má chybnú syntax: %s"
@@ -2682,12 +2715,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "prekonáva sa problém, pretože je nastavené --force: "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "nie je možné otvoriť zoznam súborov balíka „%.250s“"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2696,37 +2729,37 @@
 "zoznam súborov balíka „%.250s“ chýba, predpokladá sa, že balík nemá "
 "nainštalované žiadne súbory."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "nie je možné zistiť stav súboru so zoznam súborov balíka „%.250s“"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "zoznam súborov balíka „%.250s“"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "v zozname súborov balíka „%.250s“ chýba na konci znak nového riadka"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "zoznam súborov balíka „%.250s“ obsahuje prázdny názov súboru"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "chyba pri zatváraní zoznamu súborov balíka „%.250s“"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Číta sa databáza ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
@@ -2734,32 +2767,32 @@
 msgstr[1] "momentálne sú nainštalované %d súbory alebo adresáre.\n"
 msgstr[2] "momentálne je nainštalovaných %d súborov alebo adresárov.\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "nie je možné vytvoriť aktualizovaný zoznam súborov balíka %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "zlyhal zápis aktualizovaného zoznamu súborov balíka %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "zlyhalo vyprázdnenie aktualizovaného zoznamu súborov balíka %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "zlyhala synchronizácia aktualizovaného zoznamu súborov balíka %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "zlyhalo uzavretie aktualizovaného zoznamu súborov balíka %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "zlyhala inštalácia aktualizovaného zoznamu súborov balíka %s"
@@ -2797,7 +2830,9 @@
 msgstr "inštalovaný"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "chyba: premenná PATH nie je nastavená."
 
 #: src/help.c:129
@@ -2840,7 +2875,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2852,65 +2887,65 @@
 msgstr "zlyhalo vykonanie funkcie chroot na „%.255s“"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "nie je možné zmeniť adresár na „%.255s“"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "nie je možné nastaviť práva na spustenie na „%.250s“"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "nie je možné nastaviť premennú prostredia pre skript údržby"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "nainštalovaný skript %s"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "nie je možné zistiť stav %s „%.250s“"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "nový skript %s"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "starý %s skript"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "nie je možné zistiť stav %s „%.250s“: %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - skúša sa radšej skript z nového balíka ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "v novej verzii balíka nie je žiaden skript - ukončuje sa"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... vyzerá to tak, že sa to podarilo.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "nedá sa bezpečne odstrániť „%.255s“"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2919,7 +2954,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "nie je možné skontrolovať existenciu „%.250s“"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "nedá sa prečítať informácia o adresári"
 
@@ -2990,7 +3025,7 @@
 "  -Dh|--debug=help                 zobrazí pomocníka na ladenie.\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3121,7 +3156,7 @@
 "Skúste používateľsky prívetivú správu balíkov pomocou „dselect“ alebo "
 "„aptitude“.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3170,30 +3205,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3202,103 +3241,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "problémy so závislosťami - neodstraňuje sa"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "problémy so závislosťami - neodstraňuje sa"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "nie je možné nastaviť premennú prostredia pre skript údržby"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "chyba pri čítaní v konfiguračnom súbore „%.255s“"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3306,7 +3345,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3314,38 +3353,38 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug vyžaduje osmičkový argument"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "prázdny názov balíka v dvojbodkou oddelenom zozname --ignore-depends „%.250s“"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends vyžaduje platný názov balíka. „%.250s“ nie je; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "neplatné číslo pre --%s: „%.250s“"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "chyba pri vykonávaní funkcie „%s“, chybový kód %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "stav"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3354,7 +3393,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3362,12 +3401,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "neznáma vynucovacia/odmietacia voľba „%.*s“"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "zastaralá vynucovacia/zakazovacia voľba „%s“\n"
@@ -3390,8 +3429,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "nečakaný koniec súboru pred koncom riadka %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "vyžaduje sa zadanie voľby určujúcej operáciu"
 
@@ -3556,89 +3595,89 @@
 msgid "passed\n"
 msgstr "prešiel\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "zlyhalo vytvorenie dočasného adresára"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "balík %s má príliš veľa dvojíc V konflikte s/Nahrádza"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "stará verzia balíka má príliš dlhý názov info súboru, ktorý začína „%.250s“"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "nie je možné odstrániť zastaralý info súbor „%.250s“"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "nie je možné nainštalovať (navrhovaný) nový info súbor „%.250s“"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "nie je možné otvoriť dočasný riadiaci adresár"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "balík obsahuje príliš dlhý názov riadiaceho info súboru (začínajúci „%.50s“)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "riadiaci info balík obsahoval adresár „%.250s“"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "funkcia rmdir u informácií o riadení balíka „%.250s“ nepovedala, že to nie "
 "je adresár"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "balík %s obsahoval zoznam ako info súbor"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "nie je možné nainštalovať nový info súbor „%.250s“ ako „%.250s“"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "nie je možné vymazať riadiaci info súbor „%.250s“"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "nie je možné vstúpiť do archívu"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "zlyhalo vytvorenie dočasného adresára"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "dĺžka riadiacej informácie"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Zaznamenané informácie o %s z %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "architektúra balíka (%s) nezodpovedá systému (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3647,101 +3686,101 @@
 "dpkg: problém s pred-závislosťami v súvislosti s %s, obsahujúcim %s:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "problém s pred-závislosťami - neinštaluje sa %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "ignoruje sa problém s pred-závislosťami!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Pripravuje sa nahradenie %s %s (pomocou %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Rozbaľuje sa %s (z %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "názov konfiguračného súboru (začínajúci „%.250s“) je príliš dlhý (>%d znakov)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "chyba pri čítaní v %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "chyba pri zatváraní %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "chyba pri pokuse otvoriť %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Dekonfiguruje sa %s, aby sa umožnilo odstránenie %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Dekonfiguruje sa %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Rozbaľuje sa náhrada %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "extrakcia poľa dpkg-deb"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "chyba pri čítaní dpkg-deb tar výstupu"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "poškodený systémový tar súbor - poškodený archív balíkov"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: zrušiť možné koncové nuly"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "nedá sa zistiť stav starého súboru „%.250s“, takže sa nebude mazať: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "nedá sa zmazať starý adresár „%.250s“: %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "starý konfiguračný súbor „%.250s“ je prázdny adresár (a teraz bol zmazaný)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "nedá sa zistiť stav ďalšieho nového súboru „%.250s“"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3750,12 +3789,12 @@
 "starý súbor „%.250s“ je rovnaký ako niekoľko nových súborov! („%.250s“ aj "
 "„%.250s“)"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "nedá sa bezpečne odstrániť starý súbor „%.250s“: %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Vyskytlo sa zmiznutie balíka %s, ktorý bol úplne nahradený.)\n"
@@ -3934,7 +3973,7 @@
 "  -f|--showformat=<format>           Použije alternatívny formát pre --show\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3955,6 +3994,10 @@
 "  ${var[;width]}. Polia budú zarovnané doprava, ak bude šírka záporná,\n"
 "  inak bude použité zarovnanie doľava.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Pomocníka o dopytovaní sa na balíky vyvoláte pomocou --help."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4014,7 +4057,7 @@
 msgid "Removing %s ...\n"
 msgstr "Odstraňuje sa %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4023,50 +4066,51 @@
 "počas odstraňovania %.250s, nebolo možné odstrániť adresár „%.250s“: %s - "
 "nie je adresár koreňom pripojeného systému súborov?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "nie je možné odstrániť „%.250s“"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "nedá sa bezpečne odstrániť „%.255s“"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "pri odstraňovaní %.250s, adresár „%.250s“ nebol prázdny a teda nebol "
 "odstránený."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "nie je možné odstrániť „%.250s“"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Odstraňujú sa konfiguračné súbory pre %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "nie je možné odstrániť starý konfiguračný súbor „%.250s“ (= „%.250s“)"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
 "nie je možné prečítať adresár konfiguračného súboru „%.250s“ (z „%.250s“)"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "nie je možné odstrániť starý záložný konfiguračný súbor „%.250s“ (z „%.250s“)"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "nie je možné odstrániť zoznam starých súborov"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "nie je možné odstrániť starý postrm skript"
 
@@ -4109,7 +4153,13 @@
 msgid "read error on standard input"
 msgstr "chyba pri čítaní zo štandardného vstupu"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "Pomocníka o dopytovaní sa na balíky vyvoláte pomocou --help."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4118,7 +4168,7 @@
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4135,7 +4185,7 @@
 "  --list [<glob-vzor>]     vypísať aktuálne prekonania v databáze.\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4156,31 +4206,31 @@
 "  --version                zobrazí verziu\n"
 "\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "odstraňujú sa koncové /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "nedá sa otvoriť nový súbor statoverride"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "chyba pri odstraňovaní súboru statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "chyba pri vytváraní nového súboru statoverride-old"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "chyba pri inštalovaní nového súboru statoverride"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add vyžaduje štyri parametre"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4188,21 +4238,21 @@
 msgstr ""
 "Prekonanie „%s“ už existuje, ale kvôli uvedenému --force bude ignorovaný."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Prekonanie „%s“ už existuje, prerušuje sa."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "bolo zadané --update, ale %s neexistuje"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Neexistuje žiadne prekonanie."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update je nepoužiteľný pri --remove"
 
@@ -4267,16 +4317,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "pre súbor „%.250s“ existujú viaceré súbory statoverride"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Pomocníka k tomuto nástroju zobrazíte napísaním dpkg-trigger --help"
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Nástroj „%s“ spúšťačov balíkov Debianu, verzia %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4287,7 +4337,7 @@
 "       %s [<voľby> ...] <príkaz>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4300,7 +4350,7 @@
 "spúšťače.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4322,21 +4372,21 @@
 "  --no-act                         Iba test - v skutočnosti nič nemeniť.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: púšťa dátový adresár, ktorý zatiaľ nebol vytvorený\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: záznamy spúšťača zatiaľ neexistujú\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "potrebuje jeden parameter, názov spúšťača"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4346,13 +4396,13 @@
 "dpkg-trigger je potrebné volať z údržbového skriptu (alebo voľbou --by-"
 "package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: neplatné meno očakávaného balíka „%.250s“: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "neplatný názov spúšťača „%.250s“: %.250s"
@@ -4385,32 +4435,33 @@
 msgstr "Spracúvajú sa spúšťače %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s potrebuje presne jeden argument ako súbor Packages"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "nie je možné vstúpiť do oblasti stavu dpkg pre celkovú dostupnú aktualizáciu"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "celková dostupná aktualizácia vyžaduje možnosť zápisu do stavovej oblasti "
 "dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Nahradzujú sa informácie o dostupných balíkoch, pomocou %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Aktualizujú sa informácie o dostupných balíkoch, pomocou %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
@@ -4418,7 +4469,7 @@
 msgstr[1] "Informácie o %d balíkoch boli aktualizované.\n"
 msgstr[2] "Informácie o %d balíkoch boli aktualizované.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4531,8 +4582,8 @@
 msgstr[1] "ignorujú sa %d upozornenia o riadiacom súbore(och)\n"
 msgstr[2] "ignoruje sa %d upozornení o riadiacom súbore(och)\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s vyžaduje parameter <adresár>"
@@ -4564,26 +4615,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: zostavuje sa balík „%s“ v „%s“.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "nie je možné vytvoriť dočasný súbor (dáta)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "riadiaca oblasť"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "zlyhalo odpojenie dočasného súboru (dáta), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4600,20 +4651,20 @@
 msgid "error writing `%s'"
 msgstr "chyba pri zápise „%.250s“"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "medzi členmi"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "nie je možné zapísať názov súboru do rúry programu tar (dáta)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<compress> z tar -cf"
 
@@ -4631,76 +4682,76 @@
 msgid "error reading %s from file %.255s"
 msgstr "chyba pri čítaní %s zo súboru %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "nie je možné čítať archív „%.255s“"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "nie je možné vykonať funkciu fstat na archív"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "archív nemá bodku v čísle verzie"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "archív neobsahuje nové riadky v hlavičke"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "súbor „%.250s“ je poškodený - zlé číslo časti"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "súbor „%.250s“ nie je binárnym archívom Debianu (skúste dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "archív nemá bodku v čísle verzie"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "archív neobsahuje nové riadky v hlavičke"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "archív nemá bodku v čísle verzie"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 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:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "preskočené dáta časti z %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "súbor „%.250s“ obsahuje neznáme časti dát %.*s, ukončuje sa"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "súbor „%.250s“ obsahuje dva riadiace členy, ukončuje sa"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4712,23 +4763,23 @@
 " nový debian balík, verzia %s.\n"
 " veľkosť %ld bajtov: riadiaci archív= %zi bajtov.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "archív má zdeformovanú riadiacu dĺžku „%s“"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "preskočené dáta časti z %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4740,7 +4791,7 @@
 " starý debian balík, verzia %s.\n"
 " veľkosť %ld bajtov: riadiaci archív= %zi, hlavný archív= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4749,49 +4800,50 @@
 "dpkg-deb: súbor vyzerá ako archív, ktorý bol poškodený\n"
 "dpkg-deb:    pri jeho sťahovaní v režime ASCII\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "„%.255s“ nemá formát archívu Debianu"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "zlyhal zápis do rúry pri kopírovaní"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "zlyhalo uzatvorenie rúry pri kopírovaní"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "dáta"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "zlyhalo vykonanie chdir do adresára"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "zlyhalo vytvorenie adresára"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "zlyhalo vykonanie chdir do adresára po jeho vytvorení"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "zlyhalo vykonanie chdir do adresára"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<dekompresia>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "vložiť"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s potrebuje názov .deb súboru"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4800,37 +4852,37 @@
 "--%s potrebuje cieľový adresár.\n"
 "Možno by ste mali použiť dpkg --install ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s potrebuje len jeden parameter (názov .deb súboru)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "zlyhalo chdir do „/“ pre vyčistenie"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "nepodarilo sa vykonať stat() súboru „%s“"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: „%.255s“ neobsahuje riadiacu zložku „%.255s“\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr "otvorenie zložky „%.255s“ (v %.255s) zlyhalo neočakávaným spôsobom"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
@@ -4838,59 +4890,59 @@
 msgstr[1] "Chýbajú %d požadované riadiace komponenty"
 msgstr[2] "Chýba %d požadovaných riadiacich komponentov"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "nie je možné skenovať adresár „%.255s“"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "nie je možné zistiť stav „%.255s“ (v „%.255s“)"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "nie je možné otvoriť „%.255s“ (v „%.255s“)"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "nie je možné prečítať „%.255s“ (v „%.255s“)"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bajtov, %5d riadky   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     nie je obyčajný súbor          %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(súbor „control“ chýba v riadiacom archíve!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "nebolo možné otvoriť komponent „control“"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "zlyhanie počas čítania „control“ komponentu"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "chyba pri uzatváraní zložky „%s“"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Chyba vo formáte"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents vyžaduje práve jeden paramater"
 
@@ -4900,7 +4952,19 @@
 msgstr "Debian „%s“ backend pre archív balíkov, verzia %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4911,6 +4975,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4926,7 +4992,7 @@
 "  --fsys-tarfile <deb>              vypíše tar so súbormi\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4939,11 +5005,27 @@
 "<cpoložka> je názov položky v hlavnom súbore „control“.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4967,7 +5049,7 @@
 "none)\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4981,7 +5063,7 @@
 "balíkov. Balíky rozbalené použitím „dpkg-deb --extract“ sa nenainštalujú\n"
 "správne!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4989,17 +5071,17 @@
 "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:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "neplatné celé číslo pre -%c: „%.250s“"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "neplatná úroveň kompresie pre -%c: „%ld“"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "neznámy typ kompresie „%s“!"
@@ -5019,7 +5101,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "súbor „%.250s“ je poškodený - chýbajúci nový riadok za %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "chyba pri čítaní %.250s"
@@ -5113,48 +5195,54 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "súbor „%.250s“ je poškodený - zlé číslo časti"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "názov balíka"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "súbor „%.250s“ je poškodený - chybný magický znak na konci druhej hlavičky"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "súbor „%.250s“ je poškodený - druhý člen nie je súčasťou dát"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr "súbor „%.250s“ je poškodený - chybný počet častí pre uvedené veľkosti"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "súbor „%.250s“ je poškodený - veľkosť je zlá pre uvedené číslo súčasti"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "nie je možné vykonať fstat() časti súboru „%.250s“"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "súbor „%.250s“ je poškodený - príliš krátky"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "nie je možné otvoriť časť archívneho súboru „%.250s“"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "súbor „%.250s“ nie je súčasťou archívu"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5174,6 +5262,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5196,12 +5285,19 @@
 "    Čiast.veľ.súboru (použ. časť):  %lu bajtov\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<neznámy>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s vyžaduje jeden alebo viac parametrov častí súboru"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "súbor „%s“ nie je súčasťou archívu\n"
@@ -5237,7 +5333,7 @@
 msgid "split package part"
 msgstr "Balík %s sa skladá z %d časti: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "dokončené\n"
@@ -5289,17 +5385,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Voľby:\n"
 "  --depotdir <adresár>             použije <adresár> namiesto %s/%s\n"
@@ -5311,20 +5416,29 @@
 "\n"
 "Výstupný stav: 0 = OK;  1 = -a nie je časťou;  2 = problém!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Napíšte dpkg-split --help pre pomocníka."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "neočakávaný koniec súboru v %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "veľkosť časti je buď príliš veľká alebo negatívna"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "veľkosť časti musí byť aspoň %d KiB (kvôli hlavičke)"
@@ -5436,27 +5550,27 @@
 msgid "Deleted %s.\n"
 msgstr "Vymazaný %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "extrakcia poľa dpkg-deb"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "nie je možné otvoriť zdrojový súbor „%.250s“"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "nie je možné vykonať funkciu fstat na zdrojový súbor"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "zdrojový súbor „%.250s“ nie je obyčajný súbor"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5466,17 +5580,17 @@
 msgstr[1] "Balík %s sa skladá z %d častí: "
 msgstr[2] "Balík %s sa skladá z %d častí: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split potrebuje ako argument zdrojový názov súboru"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "--split vyžaduje najviac zdrojový názov súboru a začiatok cieľovej cesty"
@@ -5646,125 +5760,90 @@
 "  --version                zobrazí verziu\n"
 "\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "chyba"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "upozornenie"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "nedá sa vykonať stat() %s: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "readlink(%s) zlyhal: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "zadané dva príkazy: --%s a --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "nedá sa dopisovať do súboru %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "scan() %s zlyhal: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "nie je možné spustiť %s: %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "nedá sa urobiť %s ako symbolická linka na %s: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "nedá sa nainštalovať %s ako %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "nedá sa odstrániť %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "neočakávaný koniec súboru pri pokuse o čítanie %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "počas čítania %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "neukončený riadok pri pokuse o čítanie %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s poškodený: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "nové riadky sú zakázané v súboroch update-alternatives (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "počas zápisu %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "názov závislého"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "duplicitná závislosť %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "závislý odkaz"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "závislý odkaz je totožný s hlavným odkazom %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "duplicitný závislý odkaz %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "súbor primárneho"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "duplicitná cesta %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5773,90 +5852,75 @@
 "alternatíva %s (súčasť skupiny odkazov %s) neexistuje. Odstraňuje sa zo "
 "zoznamu alternatív."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "priorita"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "súbor závislého"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "priorita %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "nedá sa načítať %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "stav"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "neplatný stav"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "hlavný odkaz"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "nedá sa zatvoriť %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "zahadzuje sa zastaralý závislý odkaz %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "nedá sa zapísať %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "automatický režim"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "manuálny režim"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "  odkaz práve ukazuje na %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "  odkaz momentálne chýba"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - priorita %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  vedľajší %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Momentálne je „najlepšia“ verzia „%s“."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Nie sú dostupné žiadne verzie."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
@@ -5864,40 +5928,40 @@
 msgstr[1] "Existujú %d možnosti alternatívy %s (poskytujúcej %s)."
 msgstr[2] "Existuje %d možností alternatívy %s (poskytujúcej %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Výber"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Cesta"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Priorita"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Stav"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Stlačením klávesu Enter ponecháte predvolenú možnosť[*], inak zadajte číslo "
 "výberu: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "nenahrádza sa %s odkazom."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "nemožno nainštalovať neznámu voľbu %s"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -5906,98 +5970,153 @@
 "preskočené vytvorenie %s, pretože príslušný súbor %s (zo skupiny odkazov %s) "
 "neexistuje."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "nenahrádza sa %s odkazom."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Volanie %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Alternatíva %s nezmenená, pretože možnosť %s nie je dostupná."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Preskočiť neznámu alternatívu %s."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "riadok je príliš dlhý alebo nie je ukončený pri pokuse o čítanie %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Preskočiť neplatný riadok: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "odkaz %s sa premenuje z %s na %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "závislý odkaz %s sa premenuje z %s na %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "názov alternatívy (%s) nesmie obsahovať „/“ a medzery."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "odkaz alternatívy nie je absolútny, čo by mal byť: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "cesta alternatívy nie je absolútna, čo by mala byť: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "alternatíva %s nemôže byť primárna: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "odkaz alternatívy %s už spravuje %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "alternatívna cesta %s neexistuje"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "alternatíva %s nemôže byť závislosťou %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "alternatíva %s nemôže byť primárna: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "odkaz alternatívy %s už spravuje %s."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "neznámy parameter „%s“"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install vyžaduje <linku> <názov> <cestu> <prioritu>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<odkaz> a <cesta> sa nemôžu zhodovať"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "priorita musí byť celé číslo"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s vyžaduje <názov> <cestu>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s vyžaduje <názov>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave je povolené iba s --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave vyžaduje <odkaz> <názov> <cestu>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "názov %s je primárny aj závislý"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "odkaz %s je primárny aj závislý"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s vyžaduje parameter <súbor>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "neznáma voľba „%s“"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -6005,67 +6124,22 @@
 "musíte zadať --display, --query, --list, --get-selections, --config, --set, "
 "--set-selections, --install, --remove, --all, --remove-all alebo --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "alternatíva %s nemôže byť primárna: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "odkaz alternatívy %s už spravuje %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "odkaz alternatívy nie je absolútny, čo by mal byť: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "cesta alternatívy nie je absolútna, čo by mala byť: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "alternatívna cesta %s neexistuje"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "názov alternatívy (%s) nesmie obsahovať „/“ a medzery."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "je primárna alternatíva."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "je závislosťou %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "alternatíva %s nemôže byť závislosťou %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<štand. vstup>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "žiadne alternatívy pre %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s visí, bude sa aktualizovaný najlepšou voľbou."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6077,49 +6151,49 @@
 "%s sa zmenil (manuálne alebo skriptom). Prepína sa len na manuálne "
 "aktualizácie."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "nastavuje sa automatický výber %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "alternatíva %s pre %s nie je registrovaná, takže sa nenastavuje."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Neexistuje program poskytujúci %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Niet čo konfigurovať."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "V skupine odkazov existuje iba jedna alternatíva %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "alternatíva %s pre %s nie je registrovaná, takže sa neodstraňuje."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "odstraňuje sa manuálne zvolená alternatíva - prepína sa %s na automatický "
 "režim"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "automatické aktualizácie %s sú zakázané, zmeny sa nevykonajú."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6127,12 +6201,12 @@
 "použitím „update-alternatives --auto %s“ sa vrátite späť na automatické "
 "aktualizácie."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "použije sa %s, ktorý poskytuje %s (%s) v %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
@@ -6140,12 +6214,48 @@
 "vynucuje sa reinštalácia alternatívy %s, pretože skupina odkazov %s je "
 "poškodená."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "aktuálna alternatíva %s je neznáma, prepína sa na %s pre skupinu odkazov %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "je primárna alternatíva."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "je závislosťou %s"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "nedá sa vykonať stat() %s: %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "readlink(%s) zlyhal: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "scan() %s zlyhal: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "nie je možné spustiť %s: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "nedá sa urobiť %s ako symbolická linka na %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "nedá sa nainštalovať %s ako %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "počas zápisu %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "nedá sa načítať %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "nedá sa zatvoriť %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "nedá sa zapísať %s: %s"
+
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6402,9 +6512,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "preskočená riadiaca oblasť z %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "zlyhalo spustenie programu tar"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "zlyhalo vytvorenie dočasného adresára"
 
diff -uNr --exclude .git --exclude .bzr dpkg/po/stamp-po /home/vorlon/devel/multiarch/dpkg-debian/po/stamp-po
--- dpkg/po/stamp-po	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/stamp-po	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1 @@
+timestamp
Binary files dpkg/po/sv.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/sv.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/sv.po /home/vorlon/devel/multiarch/dpkg-debian/po/sv.po
--- dpkg/po/sv.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/sv.po	2012-06-07 10:11:09.426073000 -0700
@@ -1,14 +1,14 @@
 # Swedish translation of dpkg
-# Copyright © 1999-2010 Software in the Public Interest
-# Peter Krefting <peterk@debian.org>, 1999-2010.
+# Copyright © 1999-2011 Software in the Public Interest
 # Daniel Nylander <po@danielnylander.se>, 2006, 2008.
+# Peter Krefting <peterk@debian.org>, 1999-2011, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.15.8.5\n"
+"Project-Id-Version: dpkg 1.16.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
-"PO-Revision-Date: 2010-11-25 10:32+0100\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
+"PO-Revision-Date: 2011-09-11 09:53+0100\n"
 "Last-Translator: Peter Krefting <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "Language: sv\n"
@@ -21,9 +21,10 @@
 #, c-format
 msgid "invalid character '%c' in archive '%.250s' member '%.16s' size"
 msgstr ""
+"ogiltigt tecken \"%c\" i arkivet \"%.250s\" medlemmen \"%.16s\" storlek"
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "kunde inte skriva filen \"%s\""
@@ -39,76 +40,80 @@
 msgstr "kunde inte ta status (fstat) på del av ar-fil (%s)"
 
 #: lib/dpkg/ar.c:130
-#, fuzzy, c-format
-#| msgid "failed to fstat ar member file (%s)"
+#, c-format
 msgid "ar member file (%s)"
-msgstr "kunde inte ta status (fstat) på del av ar-fil (%s)"
+msgstr "ar-medlemsfil (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "misslyckades att läsa i buffrad kopiering för %s"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "misslyckades att skriva i buffrad kopiering för %s"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "för lite data läst i buffrad kopiering för %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, c-format
+msgid "failed to seek %s"
+msgstr "kunde inte söka %s"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "kunde inte köra %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekomprimering"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: komprimering"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: ett fel uppstod då indata skulle kopplas till gzip-ström"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: internt gzip-läsfel: \"%s\""
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: internt gzip-skrivfel"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: ett fel uppstod då utdata skulle kopplas till gzip-ström"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: internt gzip-läsfel"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: internt gzip-skrivfel: \"%s\""
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: internt gzip-skrivfel: %s"
@@ -123,31 +128,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: internt bzip2-läsfel: \"%s\""
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: internt bzip2-skrivfel"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: ett fel uppstod då utdata skulle kopplas till bzip2-ström"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: internt bzip2-läsfel"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: internt bzip2-skrivfel: \"%s\""
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "oväntat bzip2-fel"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -156,193 +161,190 @@
 "uppdateringskatalogen innehåller filen \"%.250s\" vars namn är för långt "
 "(längd=%d, max=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, 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)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "kan inte genomsöka uppdateringskatalogen \"%.255s\""
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "kunde inte ta bort den hanterade uppdateringsfilen \"%.255s\""
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "kunde inte skapa \"%.255s\""
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "kunde inte fylla ut %.250s"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "kunde inte tömma %.250s efter utfyllnad"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "kunde inte söka till början av %.250s efter utfyllnad"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "kunde inte låsa filen %s för test"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "kunde inte öppna/skapa låsfil för statusdatabas"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "du har inte rättigheter att låsa dpkgs statusdatabas"
 
-#: lib/dpkg/dbmodify.c:235
-#, fuzzy
-#| msgid "unable to lock dpkg status database"
+#: lib/dpkg/dbmodify.c:233
 msgid "dpkg status database"
-msgstr "kunde inte låsa dpkgs statusdatabas"
+msgstr "dpkg-statusdatabas"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "efterfrågad operation kräver superanvändarbehörighet"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "kunde inte komma åt dpkgs statusarea"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "operationen kräver läs-/skrivåtkomst till dpkgs statusarea"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "kunde inte ta bort min egen uppdateringsfil %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "kunde inte skriva uppdaterad status för \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "kunde inte tömma uppdaterad status för \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "kunde inte klippa för uppdaterad status för \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "kunde inte synkronisera uppdaterad status för \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "kunde inte stänga uppdaterad status för \"%.250s\""
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "kunde inte installera uppdaterad status för \"%.250s\""
 
 #: lib/dpkg/dir.c:50
-#, fuzzy, c-format
-#| msgid "unable to read filedescriptor flags for %.250s"
+#, c-format
 msgid "unable to get file descriptor for directory '%s'"
-msgstr "kunde inte läsa filidentifierarflaggor för \"%.250s\""
+msgstr "kunde inte få tag i filhandtag för katalogen '%s'"
 
 #: lib/dpkg/dir.c:54
-#, fuzzy, c-format
-#| msgid "unable to sync file '%s'"
+#, c-format
 msgid "unable to sync directory '%s'"
-msgstr "kunde inte ta synkronisera filen \"%s\""
+msgstr "kunde inte synkronisera katalogen \"%s\""
 
 #: lib/dpkg/dir.c:69 lib/dpkg/dir.c:131
-#, fuzzy, c-format
-#| msgid "unable to open file '%s'"
+#, c-format
 msgid "unable to open directory '%s'"
-msgstr "kunde inte öppna filen \"%s\""
+msgstr "kunde inte öppna katalogen \"%s\""
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "kunde inte öppna filen \"%s\""
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
-msgstr "kunde inte ta synkronisera filen \"%s\""
+msgstr "kunde inte synkronisera filen \"%s\""
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "kunde inte stänga filen \"%s\""
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "misslyckades med att skriva detaljer om \"%.50s\" till \"%.250s\""
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "kunde inte öppna \"%s\" för att skriva %s-databas"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "kunde inte ställa in buffring av %s-databasfil"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "kunde inte skriva %s-databaspost om \"%.50s\" till \"%.250s\""
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "kunde inte skriva (flush) %s-databas till \"%.250s\""
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "kunde inte synkronisera %s-databas till \"%.250s\""
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "kunde inte stänga \"%.250s\" efter att ha skrivit %s-databas"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr ""
 "kunde inte länka \"%.250s\" till \"%.250s\" för att säkerhetskopiera %s-"
 "databas"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "kunde inte installera \"%.250s\" som \"%.250s\" med %s-databas"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -351,25 +353,20 @@
 "%s: oåterkalleligt ödesdigert fel, avbryter:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
-#, fuzzy, c-format
-#| msgid ""
-#| "%s: unrecoverable fatal error, aborting:\n"
-#| " %s\n"
+#: lib/dpkg/ehandle.c:100
+#, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
-"%s: oåterkalleligt ödesdigert fel, avbryter:\n"
+"%s: utanför felsammanhang, avbryter:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
-#, fuzzy
-#| msgid "out of memory for new cleanup entry"
+#: lib/dpkg/ehandle.c:120
 msgid "out of memory for new error context"
-msgstr "minnet slut för ny uppstädningspost"
+msgstr "minnet slut för ny felsammanhang"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -378,32 +375,30 @@
 "%s: fel vid upprensning:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
-#, fuzzy, c-format
-#| msgid "dpkg: too many nested errors during error recovery !!\n"
+#: lib/dpkg/ehandle.c:201
+#, c-format
 msgid "%s: too many nested errors during error recovery!!\n"
-msgstr "dpkg: för många nästlade fel vid feluppstädning!!\n"
+msgstr "%s: för många nästlade fel vid feluppstädning!!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "minnet slut för ny uppstädningspost"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "minnet slut för ny uppstädningspost med många parametrar"
 
-#: lib/dpkg/ehandle.c:350
-#, fuzzy, c-format
-#| msgid "%s: warning: %s\n"
+#: lib/dpkg/ehandle.c:352
+#, c-format
 msgid "%s: error: %s\n"
-msgstr "%s: varning: %s\n"
+msgstr "%s: fel: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: varning: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: internt fel: %s\n"
@@ -414,99 +409,98 @@
 msgstr "%s saknas"
 
 #: lib/dpkg/fields.c:49
-#, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
+#, c-format
 msgid "'%.50s' is not allowed for %s"
-msgstr "\"%.*s\" är ej tillåtet för %s"
+msgstr "\"%.50s\" är ej tillåtet för %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "skräp efter %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "ogiltigt paketnamn (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "tomt filinformationfält \"%s\""
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "filinformationsfält \"%s\" ej tillåtet i statusfilen"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "för många värden i fildetaljsfältet \"%s\" (jämfört med andra)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "för få värden i fildetaljsfältet \"%s\" (jämfört med andra)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "yes/no i boolskt fält"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "ord i \"priority\"-fält"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "värde för \"status\"-fältet ej tillåtet i detta sammanhang"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "första ordet (vill) i \"status\"-fältet"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "andra ordet (fel) i \"status\"-fältet"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "tredje ordet (status) i \"status\"-fältet"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "fel i \"Version\"-strängen \"%.250s\""
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "föråldrat \"Revision\"- eller \"Package-Revision\"-fält använt"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "värde för \"config-version\"-fältet ej tillåtet i detta sammanhang"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "fel i Config-Version-sträng \"%.250s\""
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "värde för \"conffiles\" har fel format på raden \"%.*s\""
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, 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\""
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "rot- eller tom katalog listas som konfigurationsfil"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -514,12 +508,12 @@
 "\"%s\"-fältet: saknat paketnamn, eller skräptecken där paketnamnet "
 "förväntades"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "\"%s\"-fältet: ogiltigt paketnamn \"%.255s\": %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -528,7 +522,7 @@
 "\"%s\"-fältet: referens till \"%.255s\":\n"
 " felaktigt versionsberoende %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -537,7 +531,7 @@
 "\"%s\"-fältet: referens till \"%.255s\":\n"
 " \"%c\" är föråldrat, använd \"%c=\" eller \"%c%c\" istället"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -546,11 +540,11 @@
 "\"%s\"-fältet: referens till \"%.255s\":\n"
 " implicit exakt träff på versionsnummer, använd hellre \"=\""
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Enbart exakta versionsnummer kan användas i Provides"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -559,55 +553,55 @@
 "\"%s\"-fältet: referens till \"%.255s\":\n"
 " versionsvärdet börjar med icke-alfanumeriskt tecken, lägg till ett blanksteg"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "\"%s\"-fältet: referens till \"%.255s\": versionen innehåller \"%c\""
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "\"%s\"-fältet: referens till \"%.255s\": versionsnumret ej avslutat"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "\"%s\"-fältet: referens till \"%.255s\": fel i version"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "\"%s\"-fältet: syntaktiskt fel efter referens till paket \"%.255s\""
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "alternativ (\"|\") tillåts inte i %s-fältet"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "värde för \"triggers-pending\"-fältet ej tillåtet i detta sammanhang"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "ogiltigt förestående utlösarnamn \"%.255s\": %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "dubblerad förestående utlösare \"%.255s\""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "värde för \"triggers-awaited\"-fältet ej tillåtet i detta sammanhang"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "ogiltigt paketnamn i väntad utlösare \"%.255s\": %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "dubblerad väntad utlösare för paketet \"%.255s\""
@@ -628,10 +622,9 @@
 msgstr "kunde inte ställa in läge på målfilen \"%.250s\""
 
 #: lib/dpkg/file.c:85
-#, fuzzy, c-format
-#| msgid "unable to unlock %s: %s"
+#, c-format
 msgid "unable to unlock %s"
-msgstr "kunde inte låsa upp %s: %s"
+msgstr "kunde inte låsa upp %s"
 
 #: lib/dpkg/file.c:111
 #, c-format
@@ -639,16 +632,14 @@
 msgstr "kunde inte testa låsstatus för filen \"%s\""
 
 #: lib/dpkg/file.c:146
-#, fuzzy, c-format
-#| msgid "status database area is locked by another process"
+#, c-format
 msgid "%s is locked by another process"
-msgstr "statusdatabasområdet är låst av en annan process"
+msgstr "%s är låst av en annan process"
 
 #: lib/dpkg/file.c:148
-#, fuzzy, c-format
-#| msgid "unable to unlock %s: %s"
+#, c-format
 msgid "unable to lock %s"
-msgstr "kunde inte låsa upp %s: %s"
+msgstr "kunde inte låsa %s"
 
 #: lib/dpkg/log.c:53
 #, c-format
@@ -664,19 +655,18 @@
 msgid "unable to write to status fd %d"
 msgstr "kunde inte skriva till statusfilidentifierare %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
-#, fuzzy, c-format
-#| msgid "realloc failed (%zu bytes)"
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
+#, c-format
 msgid "malloc failed (%zu bytes)"
-msgstr "realloc misslyckades (%zu byte)"
+msgstr "malloc misslyckades (%zu byte)"
 
 #: lib/dpkg/mlib.c:58
 #, c-format
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc misslyckades (%zu byte)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "misslyckades att allokera minne"
 
@@ -709,284 +699,278 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "kunde inte ställa in \"close-on-exec\"-flaggan på \"%.250s\""
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "konfigureringsfel: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "kunde inte öppna konfigurationsfilen \"%.255s\" för läsning: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "obalanserade citattecken i \"%s\""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "okänd flagga \"%s\""
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "\"%s\" tar ett värde"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "\"%s\" tar inget värde"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "fel vid läsning av konfigurationsfil \"%.250s\""
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "fel vid läsning av konfigurationsfil \"%.250s\""
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "fel vid öppning av konfigurationskatalogen \"%s\""
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "okänd flagga --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "flaggan --%s tar ett värde"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "flaggan --%s tar inget värde"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "okänd flagga -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "flaggan -%c tar ett värde"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "flaggan -%c tar inget värde"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "föråldrad flagga \"--%s\"\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "motstridiga åtgärder %c (--%s) och -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "dubblerat värde för \"%s\"-fältet"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "användardefinierat fältnamn \"%.*s\" för kort"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "dubblerat värde för användardefinierat fält \"%.*s\""
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Configured-Version för paket med opassande Status"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "paketet har status %s, men utlösare väntar"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "paketet har status triggers-awaited man inga utlösare väntar"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "paketet har status %s med utlösare är förestående"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "paketet har status triggers-pending men inga utlösare är förstående"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "Paket med status non-installed har konfigurationsfiler, glömmer dem"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "kunde inte öppna paketinformationsfil \"%.255s\" för läsning"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "kan inte ta status på paketinformationsfil \"%.255s\""
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "kan inte minnesmappa paketinformationsfil \"%.255s\""
 
-#: lib/dpkg/parse.c:344
-#, fuzzy, c-format
-#| msgid "can't stat package info file `%.255s'"
+#: lib/dpkg/parse.c:352
+#, c-format
 msgid "reading package info file '%.255s'"
-msgstr "kan inte ta status på paketinformationsfil \"%.255s\""
+msgstr "läser paketinfofilen \"%.255s\""
+
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "kunde inte stänga efter läsning: \"%.255s\""
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "Filslut efter fältnamn \"%.*s\""
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "nyradstecken i fältnamn \"%.*s\""
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS-filslut (^Z) i fältnamn \"%.*s\""
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "fältnamnet \"%.*s\" måste följas av kolon"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "Filslut före värde på fält \"%.*s\" (saknar sista nyradstecknet)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "MSDOS-filslut före värde på fält \"%.*s\" (saknar nyradstecken?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, c-format
+msgid "blank line in value of field '%.*s'"
+msgstr "tomrad i värdet för fältet \"%.*s\""
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "Filslut inuti värde på fält \"%.*s\" (saknar sista nyradstecknet)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "flera paketinformationsposter funna, bara en tillåts"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "kunde inte stänga efter läsning: \"%.255s\""
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "ingen paketinformation i \"%.255s\""
 
 #: lib/dpkg/parsehelp.c:45
-#, fuzzy, c-format
-#| msgid ""
-#| "%s, in file '%.255s' near line %d package '%.255s':\n"
-#| " "
+#, c-format
 msgid ""
 "parsing file '%.255s' near line %d package '%.255s':\n"
 " %.255s"
 msgstr ""
-"%s, i filen \"%.255s\" nära rad %d paket \"%.255s\":\n"
-" "
+"tolkar filen \"%.255s\" nära rad %d paket \"%.255s\":\n"
+" %.255s"
 
 #: lib/dpkg/parsehelp.c:48
-#, fuzzy, c-format
-#| msgid ""
-#| "%s, in file '%.255s' near line %d:\n"
-#| " "
+#, c-format
 msgid ""
 "parsing file '%.255s' near line %d:\n"
 " %.255s"
 msgstr ""
-"%s, i filen \"%.255s\" nära rad %d:\n"
-" "
+"tolkar filen \"%.255s\" nära rad %d:\n"
+" %.255s"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "får ej vara tomma strängen"
 
-#: lib/dpkg/parsehelp.c:129
-#, fuzzy
-#| msgid "must start with an alphanumeric"
+#: lib/dpkg/parsehelp.c:127
 msgid "must start with an alphanumeric character"
 msgstr "måste börja med ett alfanumeriskt tecken"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 "tecknet \"%c\" ej tillåtet (endast tecken, siffror och tecknen \"%s\" "
 "tillåts)"
 
-#: lib/dpkg/parsehelp.c:198
-#, fuzzy
-#| msgid "<none>"
+#: lib/dpkg/parsehelp.c:178
 msgctxt "version"
 msgid "<none>"
 msgstr "<ingen>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "versionssträng ej tom"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "versionssträng har inbäddade blanksteg"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "epoch i versionen är inte ett tal"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "ingenting efter kolon i versionsnumret"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
-msgstr ""
+msgstr "versionsnumret börjar inte med en siffra"
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "felaktigt tecken i versionsnumret"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "felaktigt tecken i revisionsnumret"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "saknat %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "tomt värde för %s"
@@ -1005,52 +989,50 @@
 msgid "(no description available)"
 msgstr "(beskrivning saknas)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "kunde inte ignorera signal %s innan %.250s startas"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "kunde inte stänga av hantering av signalen %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (underprocess): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "förgrening (fork) misslyckades"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
-msgstr "underprocess %s gav felkod %d"
+msgstr "underprocessen %s gav felkod %d"
 
-#: lib/dpkg/subproc.c:127
-#, fuzzy, c-format
-#| msgid "wait for subprocess %s failed"
+#: lib/dpkg/subproc.c:128
+#, c-format
 msgid "subprocess %s was interrupted"
-msgstr "väntan på underporcessen %s misslyckades"
+msgstr "underporcessen %s avbröts"
 
-#: lib/dpkg/subproc.c:129
-#, fuzzy, c-format
-#| msgid "subprocess %s killed by signal (%s)%s"
+#: lib/dpkg/subproc.c:130
+#, c-format
 msgid "subprocess %s was killed by signal (%s)%s"
-msgstr "underprocess %s dödad av signal (%s)%s"
+msgstr "underprocessen %s dödades av signal (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", minnesutskrift skapad"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
-msgstr "underprocess %s misslyckades med statuskod %d"
+msgstr "underprocessen %s misslyckades med statuskod %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "väntan på underporcessen %s misslyckades"
@@ -1070,61 +1052,51 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr "syntaxfel i utlösarfördröjningsfilen \"%.250s\" vid tecknet \"%s\"%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "kunde inte öppna/skapa utlösarlåsfilen \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:140
-#, fuzzy
-#| msgid "triggered"
+#: lib/dpkg/trigdeferred.l:141
 msgid "triggers area"
-msgstr "utlöst"
+msgstr "område för utlösare"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "kunde inte ta status på fil för uppskjutna utlösare, \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "kunde inte ta öppna fil för uppskjutna utlösare, \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "kunde inte öppna/skapa ny fil för uppskjutna utlösare, \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "fel vid läsning av fil för uppskjutna utlösare, \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "kunde inte skriva ny fil för uppskjutna utlösare, \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "kunde inte ta stänga ny fil för uppskjutna utlösare, \"%.250s\""
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "kunde inte installera ny fil för uppskjutna utlösare, \"%.250s\""
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "tomma utlösarnamn är inte tillåtna"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "utlösarnamnet innehåller ogiltigt tecken"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1133,17 +1105,17 @@
 "ogiltig eller okänd syntax i utlösarnamnet \"%.250s\" (i utlösare som visar "
 "intresse för paketet \"%.250s\")"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "kunde inte öppna utlösarintresselistfilen \"%.250s\""
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "kunde inte spola tillbaka utlösarintressefilen \"%.250s\""
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1152,84 +1124,90 @@
 "syntaxfel i utlösarintressefilen \"%.250s\"; ogiltigt paketnamn \"%.250s\": "
 "%.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "kunde inte skapa ny utlösarintressefil \"%.250s\""
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "kunde inte skriva ny utlösarintressefil \"%.250s\""
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "kunde inte tömma (flush) ny utlösarintressefil \"%.250s\""
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "kunde inte synkronisera ny utlösarintressefil \"%.250s\""
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "kunde inte stänga ny utlösarintressefil \"%.250s\""
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "kunde inte installera ny utlösarintressefil \"%.250s\""
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "kan inte ta bort \"%.250s\""
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "kunde inte skapa ny utlösarintressefil \"%.250s\""
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "kunde inte stänga ny utlösarintressefil \"%.250s\""
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 "dubblerad filutlösarintresse för filnamnet \"%.250s\" och paketet \"%.250s\""
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "kunde inte öppna ny filutlösarfil \"%.250s\""
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "kunde inte skriva ny filutlösarfil \"%.250s\""
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "kunde inte tömma (flush) ny filutlösarfil \"%.250s\""
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "kunde inte synkronisera ny filutlösarfil \"%.250s\""
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "kunde inte stänga ny filutlösarfil \"%.250s\""
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "kunde inte installera ny filutlösarfil som \"%.250s\""
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "kunde inte läsa filutlösarfil \"%.250s\""
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "syntaxfel i filutlösarfil \"%.250s\""
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1238,7 +1216,7 @@
 "filutlösarpost anger det ogiltiga paketnamnet \"%.250s\" (för intresse för "
 "filen \"%.250s\"): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1247,30 +1225,38 @@
 "utlösar-ci-filen \"%.250s\" innehåller ogiltig utlösarsyntax i utlösarnamnet "
 "%.250s: %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "kunde inte öppna utlösar-ci-fil \"%.250s\""
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "utlösar-ci-filen innehåller ogiltig syntax för direktiv"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "utlösar-ci-filen innehåller okänt direktiv \"%.250s\""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "kunde inte skapa utlösarstatuskatalogen \"%.250s\""
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "kunde inte sätta ägare för utlösarstatuskatalogen \"%.250s\""
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "tomma utlösarnamn är inte tillåtna"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "utlösarnamnet innehåller ogiltigt tecken"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1295,7 +1281,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "felaktig formateringssträng i varbuf-variablen"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "fel vid läsning från dpkg-deb-rör"
 
@@ -1314,12 +1300,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "fel vid inställning av ägandeskap av symboliska länken \"%.255s\""
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "fel när ägandeskap för \"%.255s\" skulle ställas in"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "fel när behörighet för \"%.255s\" skulle ställas in"
@@ -1381,17 +1367,26 @@
 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:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "kan inte ta status på filen \"%s\""
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Ersätter filer i det gamla paketet %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Ersätta av filer i det installerade paketet %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1400,96 +1395,102 @@
 "försöker skriva över katalogen \"%.250s\" från paketet %.250s %.250s med "
 "icke-katalog"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
 "försöker skriva över \"%.250s\" som också finns i paketet %.250s %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "kunde inte skapa \"%.255s\" (vid hantering av \"%.255s\")"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "bakändan dpkg-deb under \"%.255s\""
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "fel vid stängning/skrivning \"%.255s\""
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "fel vid skapande av röret \"%.255s\""
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "fel vid skapande av enheten \"%.255s\""
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "fel vid skapande av hårda länken \"%.255s\""
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "fel vid skapande av symboliska länken \"%.255s\""
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "fel vid skapande av katalogen \"%.255s\""
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, 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:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "kunde inte läsa länken \"%.255s\""
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+"storleken på den symboliska länken \"%.250s\" har ändrats från %jd till %zd"
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "kunde inte säkerhetskopiera symbolisk länk för \"%.255s\""
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "kunde inte byta ägare på säkerhetskopierad symbolisk länk för \"%.255s\""
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, 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"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "kunde inte installera ny version av \"%.255s\""
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "kunde inte öppna \"%.255s\""
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "kunde inte synkronisera filen \"%.250s\""
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1498,7 +1499,7 @@
 "ignorerar beroendeproblem med %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1507,7 +1508,7 @@
 "funderar på att avkonfigurera det systemkritiska\n"
 " paketet %s för att aktivera %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1516,7 +1517,7 @@
 "dpkg: nej, %s är systemkritiskt, kommer inte att avkonfigurera\n"
 " det för att aktivera %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1525,29 +1526,29 @@
 "dpkg: nej, kan fortsätta med %s (--auto-deconfigure hjälper):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "borttagning av %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "installation av \"%.255s\""
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 "dpkg: funderar på att avkonfigurera %s, vilket skulle förstöras av %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: ja, kommer att avkonfigurera %s (förstörs av %s).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1556,11 +1557,11 @@
 "dpkg: angående %s som innehåller %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "ignorerar förstörelse, kan ändå fortsätta!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1569,28 +1570,28 @@
 "installation av %.250s skulle förstöra %.250s, och\n"
 " avkonfigurering tillåts inte (--auto-deconfigure kanske hjälper)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "installation av %.250s skulle förstöra befintliga program"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1599,107 +1600,107 @@
 "dpkg: paketet %s måste ominstalleras, men tar bort det ändå enligt ditt "
 "önskemål.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "paketkonflikt - installerar inte %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "ignorerar konflikt, kan ändå fortsätta!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive kräver åtminstone ett sökvägsargument"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "find för dpkg --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "kunde inte ansluta fil till finds rör"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "kunde inte läsa från finds rör"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "fel vid stängning av finds rör"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find för --recursive returnerade ohanterat fel %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "sökte, men hittade inga paket (filer som matchar *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<standard ut>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<standard fel>"
 
-#: src/archives.c:1355
+#: src/archives.c:1367
 #, c-format
-msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Väljer tidigare ej valt paket %s.\n"
 
-#: src/archives.c:1359
+#: src/archives.c:1371
 #, c-format
-msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Hoppar över ej valt paket %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Version %.250s av %.250s redan installerat, hoppar över.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "nedgraderar %.250s från %.250s till %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, 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"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1708,37 +1709,37 @@
 "kunde inte ta bort nyss installerad version av \"%.250s\" för att möjliggöra "
 "återinstallation av säkerhetskopia"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "kunde inte återställa säkerhetskopierad version av \"%.250s\""
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "kunde inte ta bort säkerhetskopierad version av \"%.250s\""
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "kunde inte ta bort nyinstallerad version av \"%.250s\""
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "kunde inte ta bort nyss uppackad version av \"%.250s\""
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "kunde inte ta status på ny distribuerad konfigurationsfil \"%.250s\""
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "kunde inte ta status på nu installerad konfigurationsfil \"%.250s\""
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1749,58 +1750,58 @@
 "Konfigurationsfilen \"%s\" existerar inte på ditt system.\n"
 "Installerar ny konfigurationsfil enligt önskemål.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: misslyckades med att ta bort gammal säkerhetskopia \"%.250s\": %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: misslyckades med att namnändra \"%.250s\" till \"%.250s\": %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: misslyckades med att ta bort \"%.250s\": %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 "%s: misslyckades med att ta bort tidigare distribuerad version \"%.250s\": %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: misslyckades med att ta bort \"%.250s\" (före överskrivning): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: misslyckades med att länka \"%.250s\" till \"%.250s\": %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Installerar ny version av konfigurationsfilen %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "kunde inte installera \"%.250s\" som \"%.250s\""
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "inget paket med namnet \"%s\" är installerat, kan inte konfigurera"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "paketet %.250s är redan installerat och konfigurerat"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1809,7 +1810,7 @@
 "paketet %.250s är inte redo för att konfigureras\n"
 " kan inte konfigurera (aktuell status är \"%.250s\")"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1818,11 +1819,11 @@
 "dpkg: beroendeproblem förhindrar konfigurering av %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "beroendeproblem - lämnar okonfigurerad"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1831,7 +1832,7 @@
 "dpkg: %s: beroendeproblem, men konfigurerar ändå enligt önskemål:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1839,12 +1840,12 @@
 "Paketet är i ett väldigt dåligt inkonsistent läge - du bör\n"
 " ominstallera det innan du försöker konfigurera."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Ställer in %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1853,7 +1854,7 @@
 "%s: kunde inte ta status på konfigurationsfilen \"%s\"\n"
 " (= \"%s\"): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1862,7 +1863,7 @@
 "%s: konfigurationsfilen \"%s\" är en cirkulär länk\n"
 " (= \"%s\")"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1871,7 +1872,7 @@
 "%s: kunde inte läsa länken till konfigurationsfilen \"%s\"\n"
 " (= \"%s\"): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1880,35 +1881,35 @@
 "%s: konfigurationsfilen \"%.250s\" blir ett degenererat filnamn\n"
 " (\"%s\" är en symbolisk länk till \"%s\")"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "%s: konfigurationfilen \"%.250s\" är inte en vanlig fil eller symbolisk länk "
 "(= \"%s\")"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: kunde inte öppna konfigurationsfilen %s för hashning: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
-msgstr ""
+msgstr "visualiserare för konfigurationsfilsskillnader"
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Skriv \"exit\" när du är klar.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
-msgstr ""
+msgstr "skal för hantering av konfigurationsfiler"
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1917,12 +1918,12 @@
 "\n"
 "Konfigurationsfil \"%s\""
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (i verkligheten \"%s\")"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1933,7 +1934,7 @@
 " ==> Den fil som nu finns skapades av dig eller ett skript.\n"
 " ==> Paketansvariges version finns även i paketet du installerar.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1942,7 +1943,7 @@
 "\n"
 "     Ej modifierad sedan installationen.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1951,7 +1952,7 @@
 "\n"
 " ==> Modifierad (av dig eller en skriptfil) sedan installationen.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1960,37 +1961,37 @@
 "\n"
 " ==> Borttagen (av dig eller en skriptfil) sedan installationen.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Paketdistributören har uppdaterat konfigurationsfilen.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Versionen i paketet är samma som vid senaste installationen.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Använder ny fil enligt önskemål.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Använder nuvarande gammal fil enligt önskemål.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Behåller gammal konfigurationsfil enligt förval.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Använder ny konfigurationsfil enligt förval.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2005,166 +2006,166 @@
 "      D     : visa skillnaderna mellan versionerna\n"
 "      Z     : starta ett skal för att undersöka situationen\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Förvald åtgärd är att behålla din nuvarande version.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Förvald åtgärd är att installera den nya versionen.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[förval=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[förval=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[inget förval]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 "fel vid skrivning till stderr, upptäcktes innan konfigurationsfilfrågan"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "läsfel på stdin vid konfigurationsfilsfrågan"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "Filslut på stdin vid konfigurationsfilsfrågan"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s är beroende av %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s är i förväg beroende av %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s rekommenderar %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s föreslår %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s förstör %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s är i konflikt med %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s förbättrar %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s kommer att tas bort.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s kommer att avkonfigureras.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s är installerad, men är version %.250s.\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s är uppackad, men har aldrig konfigurerats.\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s är uppackad, men är version %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  senast konfigurerad version av %.250s är %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s är %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, 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:378
+#: src/depcon.c:392
 #, 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:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "%.250s tillhandahåller %.250s men men är %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s är inte installerad.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (version %.250s) kommer att installeras.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (version %.250s) är närvarande och %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, 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:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s tillhandahåller %.250s och är närvarande och %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr "Använd --help för hjälp om att fråga paket."
+#: src/divertcmd.c:50
+msgid "Use --help for help about diverting files."
+msgstr "Använd --help för hjälp om att omdirigera filer."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s version %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2175,8 +2176,8 @@
 "Copyright © 2000,2001 Wichert Akkerman.\n"
 "Copyright © 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2186,7 +2187,7 @@
 "Detta är fri programvara; se GNU General Public License version 2\n"
 "eller senare för kopieringsvillkor. Det finns INGEN garanti.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2196,7 +2197,7 @@
 "Användning: %s [<flagga> ...] <kommando>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2215,7 +2216,7 @@
 "  --truename <fil>         visa den omdirigerade filen.\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2246,7 +2247,7 @@
 "  --version                visa versionsnummer.\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2259,17 +2260,12 @@
 "anges. Skripten preinst/postrm i paket skall alltid ange --package och --"
 "divert.\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "kan inte ta status på filen \"%s\""
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "fel vid kontroll av \"%s\""
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2278,129 +2274,127 @@
 "namnbyte innebär överskrivning av \"%s\" med\n"
 "  annan fil \"%s\", ej tillåtet"
 
-#: src/divertcmd.c:222
-#, fuzzy, c-format
-#| msgid "unable to write file '%s'"
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
+#, c-format
 msgid "unable to create file '%s'"
-msgstr "kunde inte skriva filen \"%s\""
+msgstr "kunde inte skapa filen \"%s\""
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "filkopiering"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "kan inte byta namn på \"%s\" till \"%s\""
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "namnbyte: ta bort duplicerad gammal länk \"%s\""
 
-#: src/divertcmd.c:261
-#, fuzzy, c-format
-#| msgid "unable to open source file `%.250s'"
+#: src/divertcmd.c:262
+#, c-format
 msgid "unable to remove copied source file '%s'"
-msgstr "kunde inte öppna källfil \"%.250s\""
+msgstr "kunde inte ta bort kopierad källfil \"%.250s\""
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "lokal omdirigering av %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "lokal omdirigering av %s till %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "omdirigering av %s av %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "omdirigering av %s till %s av %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "alla omdirigeringar av %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "alla omdirigeringar av %s till %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "kan inte skapa ny version av filen %s"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "kunde inte tömma (flush) filen \"%s\""
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "fel vid borttagning av gammal \"diversions-old\""
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "fel vid skapande av ny \"diversions-old\""
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "fel vid installation av ny \"diversions\""
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s behöver ett ensamt argument"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "filnamnet \"%s\" är inte absolut"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "filnamnet kan inte innehålla nyradstecken"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Kan inte omdirigera kataloger"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "Kan inte omdirigera filen \"%s\" till sig själv"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "Låter \"%s\" vara\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "\"%s\" krockar med \"%s\""
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "Lägger till \"%s\"\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Ingen omdirigering \"%s\", ingen borttagen.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2411,7 +2405,7 @@
 "  vid borttagning av \"%s\"\n"
 "  hittade \"%s\""
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2422,16 +2416,16 @@
 "  vid borttagning av \"%s\"\n"
 "  hittade \"%s\""
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "Tar bort \"%s\"\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "paket kan inte innehålla nyradstecken"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "målet kan inte innehålla nyradstecken"
 
@@ -2513,8 +2507,8 @@
 "dpkg --configure --pending (eller dpkg --triggers-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s tar inget argument"
@@ -2528,8 +2522,6 @@
 "just nu, en del av de problem som följer kan komma på grund av detta.\n"
 
 #: src/enquiry.c:191
-#, fuzzy
-#| msgid "<unknown>"
 msgctxt "section"
 msgid "<unknown>"
 msgstr "<okänd>"
@@ -2607,7 +2599,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions: ogiltig relation"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "versionen \"%s\" har felaktig syntax: %s"
@@ -2622,20 +2614,17 @@
 " %s\n"
 
 #: src/errors.c:68
-#, fuzzy, c-format
-#| msgid ""
-#| "dpkg: failed to allocate memory for new entry in list of failed packages."
+#, c-format
 msgid ""
 "%s: failed to allocate memory for new entry in list of failed packages: %s"
 msgstr ""
-"dpkg: misslyckades med att allokera minne för ny post i listan över "
-"misslyckade paket."
+"%s: misslyckades med att allokera minne för ny post i listan över "
+"misslyckade paket: %s"
 
 #: src/errors.c:79
-#, fuzzy, c-format
-#| msgid "dpkg: too many errors, stopping\n"
+#, c-format
 msgid "%s: too many errors, stopping\n"
-msgstr "dpkg: för många fel, avbryter\n"
+msgstr "%s: för många fel, stannar\n"
 
 #: src/errors.c:87
 msgid "Errors were encountered while processing:\n"
@@ -2660,12 +2649,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "ignorerar problem då --force använts:"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "kunde inte öppna fillistan för paketet \"%.250s\""
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2674,69 +2663,68 @@
 "fillistfilen för paketet \"%.250s\" saknas, antar att paketet inte har några "
 "filer installerade."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "kunde inte ta status på fillistan för paketet \"%.250s\""
 
-#: src/filesdb.c:329
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
+#: src/filesdb.c:330
+#, c-format
 msgid "reading files list for package '%.250s'"
-msgstr "fillista för paketet \"%.250s\""
+msgstr "läser fillista för paketet \"%.250s\""
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "fillistfilen för paketet \"%.250s\" saknar avslutande radbrytning"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "fillistfilen för paketet \"%.250s\" innehåller tomt filnamn"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "fel vid stängning av fillistfilen för paketet \"%.250s\""
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Läser databasen ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "%d fil och katalog installerad.)\n"
 msgstr[1] "%d filer och kataloger installerade.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "kunde inte skapa uppdaterad fillistfil för paketet %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "kunde inte skriva till uppdaterad fillistfil för paketet %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "kunde inte tömma uppdaterad fillistfil för paketet %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "kunde inte synkronisera uppdaterad fillistfil för paketet %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "kunde inte stänga uppdaterad fillistfil för paketet %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "kunde inte installera uppdaterad fillistfil för paketet %s"
@@ -2774,8 +2762,8 @@
 msgstr "installerat"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
-msgstr "fel: PATH är inte satt."
+msgid "PATH is not set."
+msgstr "PATH är inte satt."
 
 #: src/help.c:129
 #, c-format
@@ -2783,44 +2771,37 @@
 msgstr "\"%s\" finns ej i PATH eller är inte exekverbar."
 
 #: src/help.c:138
-#, fuzzy, c-format
-#| msgid "'%s' not found in PATH or not executable."
+#, c-format
 msgid ""
 "%d expected program not found in PATH or not executable.\n"
 "%s"
 msgid_plural ""
 "%d expected programs not found in PATH or not executable.\n"
 "%s"
-msgstr[0] "\"%s\" finns ej i PATH eller är inte exekverbar."
-msgstr[1] "\"%s\" finns ej i PATH eller är inte exekverbar."
+msgstr[0] ""
+"%d förväntat program hittades inte i PATH eller är inte exekverbart.\n"
+"%s"
+msgstr[1] ""
+"%d förväntade program hittades inte i PATH eller är inte exekverbara.\n"
+"%s"
 
 #: src/help.c:141
-#, fuzzy
-#| msgid ""
-#| "%d expected program not found in PATH or not executable.\n"
-#| "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /"
-#| "sbin."
-#| msgid_plural ""
-#| "%d expected programs not found in PATH or not executable.\n"
-#| "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /"
-#| "sbin."
 msgid ""
 "Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /"
 "sbin."
 msgstr ""
-"%d förväntat program hittades inte i PATH eller var inte exekverbart.\n"
 "Obs! roots PATH bör vanligtvis innehålla /usr/local/sbin, /usr/sbin och /"
 "sbin."
 
 #: src/help.c:188
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
+"administrationskatalogen måste vara inuti dpkgs installationsktalog för att "
+"fungera korrekt"
 
-#: src/help.c:190 src/main.c:746
-#, fuzzy
-#| msgid "unable to setenv for maintainer script"
+#: src/help.c:190 src/main.c:747
 msgid "unable to setenv for subprocesses"
-msgstr "kunde inte utföra setenv för utvecklarskript"
+msgstr "kunde inte utföra setenv för underprocesser"
 
 #: src/help.c:192
 #, c-format
@@ -2828,74 +2809,74 @@
 msgstr "kunde inte byta filsystemsrot till \"%.250s\""
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "kunde inte byta katalog till \"%.255s\""
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "kunde inte ställa in körrättigheter på \"%.250s\""
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "kunde inte utföra setenv för utvecklarskript"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "installerade %s-skript"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "kunde inte ta status på %s \"%.250s\""
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "nytt %s-skript"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "gammalt %s-skript"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "kunde inte ta status på %s \"%.250s\": %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - försöker skript från det nya paketet istället ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "det finns inget skript i den nya versionen av paketet - ger upp"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... det verkar ha fungerat.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "kunde inte säkert ta bort \"%.255s\""
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
-msgstr ""
+msgstr "rm-kommando för städning"
 
 #: src/infodb.c:52
 #, c-format
 msgid "unable to check existence of `%.250s'"
 msgstr "kunde inte kontrollera om \"%.250s\" existerar"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "kan inte läsa infokatalog"
 
@@ -2958,7 +2939,7 @@
 "  --force-help                     Visa hjälp för tvingande.\n"
 "  -Dh|--debug=help                 Visa hjälp för felsökning.\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3081,7 +3062,7 @@
 msgstr ""
 "Använd \"dselect\" eller \"aptitude\" för användarvänlig pakethantering.\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3103,57 +3084,61 @@
 
 #: src/main.c:219
 msgid "Set all force options"
-msgstr ""
+msgstr "Aktivera alla tvingande flaggor"
 
 #: src/main.c:221
 msgid "Replace a package with a lower version"
-msgstr ""
+msgstr "Ersätt paket med en lägre version"
 
 #: src/main.c:223
 msgid "Configure any package which may help this one"
-msgstr ""
+msgstr "Konfigurera godtyckligt paket som kan hjälpa detta"
 
 #: src/main.c:225
 msgid "Process incidental packages even when on hold"
-msgstr ""
+msgstr "Hantera oväsentliga paket även när de hålls"
 
 #: src/main.c:227
 msgid "Try to (de)install things even when not root"
-msgstr ""
+msgstr "Försök (av)installera saker även som icke-root"
 
 #: src/main.c:229
 msgid "PATH is missing important programs, problems likely"
-msgstr ""
+msgstr "PATH saknar viktiga program, problem trolliga"
 
 #: src/main.c:231
 msgid "Install a package even if it fails authenticity check"
-msgstr ""
+msgstr "Installera paket även om autentisering misslyckas"
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
-msgstr ""
+msgid "Process even packages with wrong versions"
+msgstr "Hantera även paket med fel versioner"
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
+msgid "Overwrite a file from one package with another"
+msgstr "Skriv över pakets fil med ett annats"
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Skriv över omdirigerad fil med ej omdirigerad"
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
+msgid "Overwrite one package's directory with another's file"
+msgstr "Skriv över ett pakets katalog med ett annats fil"
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
-msgstr ""
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Utför ej säkra I/O-operationer vid uppackning"
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr "Använd alltid nya konfigurationsfiler, fråga ej"
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
-msgstr ""
+msgstr "Använd alltid gamla konfigurationsfiler, fråga ej"
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3161,151 +3146,152 @@
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given"
 msgstr ""
+"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"
+"                         såvida inte flaggorna confold eller confnew\n"
+"                         också angivit"
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
-msgstr ""
+msgstr "Installera alltid saknade konfigurationsfiler"
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
-msgstr ""
+msgstr "Erbjud ersätta konfigurationsfiler som saknar nya versioner"
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
-msgstr ""
+msgstr "Hantera även paket med fel eller saknad arkitektur"
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
-msgstr ""
+msgstr "Installera även om ett annat paket skulle gå sönder"
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
-msgstr ""
+msgstr "Tillåt installera paket som är i konflikt"
 
-#: src/main.c:261
-#, fuzzy
-#| msgid "dependency problems - not removing"
+#: src/main.c:263
 msgid "Turn all dependency problems into warnings"
-msgstr "beroendeproblem - tar inte bort"
+msgstr "Gör alla beroendeproblem till varningar"
 
-#: src/main.c:263
-#, fuzzy
-#| msgid "dependency problems - not removing"
+#: src/main.c:265
 msgid "Turn dependency version problems into warnings"
-msgstr "beroendeproblem - tar inte bort"
+msgstr "Gör versionsberoendeproblem till varningar"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
-msgstr ""
+msgstr "Ta bort paket som kräver installation"
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
-msgstr ""
+msgstr "Ta bort ett systemkritiskt paket"
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
-msgstr ""
+msgstr "Allmänt hjälpsam förloppsinformation"
 
-#: src/main.c:280
-#, fuzzy
-#| msgid "unable to setenv for maintainer script"
+#: src/main.c:282
 msgid "Invocation and status of maintainer scripts"
-msgstr "kunde inte utföra setenv för utvecklarskript"
+msgstr "Anrop och status för utvecklarskript"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
-msgstr ""
+msgstr "Utdata för varje fil som hanteras"
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
-msgstr ""
+msgstr "Massvis med utdata för varje fil som hanteras"
 
-#: src/main.c:283
-#, fuzzy
-#| msgid "read error in configuration file `%.255s'"
+#: src/main.c:285
 msgid "Output for each configuration file"
-msgstr "fel vid läsning av konfigurationsfil \"%.250s\""
+msgstr "Utdata för varje konfigurationsfil"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
-msgstr ""
+msgstr "Massvis med utdata för varje konfigurationsfil"
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
-msgstr ""
+msgstr "Beroenden och konflikter"
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
-msgstr ""
+msgstr "Massvis av beroende-/konfliktutdata"
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
-msgstr ""
+msgstr "Utlösaraktivering och -hantering"
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
-msgstr ""
+msgstr "Massvis med utdata om utlösare"
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
-msgstr ""
+msgstr "Knäppa mängder utdata om utlösare"
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
-msgstr ""
+msgstr "Massvis av pladder om bl.a dpkg/info-katalogen"
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
-msgstr ""
+msgstr "Knäppa mängder pladder"
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
 "\n"
 " Number  Ref. in source   Description\n"
 msgstr ""
+"%s felsökningsval, --debug=<oktalt> eller -D<oktalt>:\n"
+"\n"
+"    Tal   Ref. i källkod    Beskrivning\n"
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
 "Debugging options can be mixed using bitwise-or.\n"
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
+"\n"
+"Felsökningsflaggor kombineras med bitvis eller.\n"
+"Notera att betydelser och värden kan komma att ändras.\n"
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug behöver ett oktalt argument"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "tomt paketnamn i --ignore-depends kommaseparerade lista \"%.250s\""
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends behöver ett giltigt paketnamn. \"%.250s\" är inte det; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ogiltigt heltal för --%s: \"%.250s\""
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "fel vid exekvering av kroken \"%s\", felkod %d"
 
-#: src/main.c:463
-#, fuzzy
-#| msgid "status"
+#: src/main.c:465
 msgid "status logger"
-msgstr "status"
+msgstr "statusloggare"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3313,21 +3299,29 @@
 "  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
 " Forcing things:\n"
 msgstr ""
+"%s tvingande flaggor - bestämmer vad som händer vid fel:\n"
+"  varna men fortsätt: --force-<sak>,<sak>,...\n"
+"  stanna med fel:     --refuse-<sak>,<sak>,... | --no-force-<sak>,<sak>,...\n"
+" Tvinga saker:\n"
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
 "WARNING - use of options marked [!] can seriously damage your installation.\n"
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
+"\n"
+"VARNING - flaggor markerade [!] kan tillfoga stor skada till din "
+"installation.\n"
+"Tvingande flaggor markerade [*] är förvalda.\n"
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "okänd flagga för force/refuse: \"%.*s\""
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "föråldrad tvingande/vägrande flagga \"%s\"\n"
@@ -3350,8 +3344,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "oväntat filslut före slut på rad %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "behöver en åtgärd att utföra"
 
@@ -3482,7 +3476,7 @@
 
 #: src/processarc.c:99
 msgid "split package reassembly"
-msgstr ""
+msgstr "återskapande av delad paketfil"
 
 #: src/processarc.c:108
 msgid "reassembled package file"
@@ -3495,7 +3489,7 @@
 
 #: src/processarc.c:139
 msgid "package signature verification"
-msgstr ""
+msgstr "verifiering av paketsignatur"
 
 #: src/processarc.c:146
 #, c-format
@@ -3516,92 +3510,90 @@
 msgid "passed\n"
 msgstr "lyckades\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "kunde inte skapa temporär katalog"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "paketet %s har för många konflikt/ersätter-par"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, 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\""
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "kunde inte ta bort gammal informationsfil \"%.250s\""
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 "kunde inte installera (vad som antas vara) ny informationsfil \"%.250s\""
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "kunde inte öppna temporär kontrollkatalog"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, 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"
 "\")"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "paketets kontrollinformation innehåller katalogen \"%.250s\""
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, 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\""
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "paketet %s innehåller list som informationsfil"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "kunde inte installera ny informationsfil \"%.250s\" som \"%.250s\""
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "kunde inte ta bort kontrollinformationsfil \"%.250s\""
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "kan inte komma åt arkivet"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "kunde inte skapa temporär katalog"
-
-#: src/processarc.c:411
-#, fuzzy
-#| msgid "control information length"
+#: src/processarc.c:433
 msgid "package control information extraction"
-msgstr "längd på kontrollinformation"
+msgstr "hämtning av paketkontrollinformation"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Lagrade information om %s från %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "paketarkitekturen (%s) matchar inte systemets (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3610,102 +3602,100 @@
 "dpkg: angående %s innehållandes %s, problem med för-beroenden:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "för-beroendeproblem - installerar inte %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "ignorerar för-beroendeproblem!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Förbereder att ersätta %s %s (med %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Packar upp %s (från %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, 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)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "läsfel i %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "fel vid stängning av %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "fel vid öppning av %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Avkonfigurerar %s, så att vi kan ta bort %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Avkonfigurerar %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Packar upp ersättande %.250s ...\n"
 
-#: src/processarc.c:807
-#, fuzzy
-#| msgid "dpkg-deb field extraction"
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
-msgstr "extrahering av dpkg-deb-fält"
+msgstr "extrahering av paketfilsystem"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "kunde inte läsa dpkg-debs tar-utdata"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "trasig filsystemstarfil - trasigt paketarkiv"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: dödar möjliga avslutande nollor"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "kunde inte ta status på gammal fil \"%.250s\" så den tas inte bort: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "kunde inte ta bort gammal katalog \"%.250s\": %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "gammal konfigurationfil \"%.250s\" var en tom katalog (och har nu tagits "
 "bort)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "kunde inte ta status på andra ny fil \"%.250s\""
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3714,12 +3704,12 @@
 "gammal fil \"%.250s\" är samma som ett flertal nya filer! (både \"%.250s\" "
 "och \"%.250s\")"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "kunde inte säkert ta bort gammal fil \"%.250s\": %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Noterar att %s försvunnit, vilken helt har ersatts.)\n"
@@ -3785,10 +3775,9 @@
 msgstr "--search behöver åtminstone ett filnamnsmönsterargument"
 
 #: src/querycmd.c:350
-#, fuzzy, c-format
-#| msgid "No packages found matching %s.\n"
+#, c-format
 msgid "%s: no path found matching pattern %s.\n"
-msgstr "Inga paket matchar %s.\n"
+msgstr "%s: hittade ingen sökväg som motsvarar mönstret %s.\n"
 
 #: src/querycmd.c:393
 #, c-format
@@ -3849,18 +3838,7 @@
 msgstr "Debian \"%s\" pakethanteringsprogram, frågeverktyg version %s.\n"
 
 #: src/querycmd.c:619
-#, fuzzy, c-format
-#| msgid ""
-#| "Commands:\n"
-#| "  -s|--status <package> ...        Display package status details.\n"
-#| "  -p|--print-avail <package> ...   Display available version details.\n"
-#| "  -L|--listfiles <package> ...     List files `owned' by package(s).\n"
-#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
-#| "  -W|--show <pattern> ...          Show information on package(s).\n"
-#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-#| "  -c|--control-path <package> [<file>]\n"
-#| "                                   Print path for package control file.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Commands:\n"
 "  -s|--status <package> ...        Display package status details.\n"
@@ -3878,7 +3856,7 @@
 "  -p|--print-avail <paketnamn> ... Visa detaljer om tillgänglig version.\n"
 "  -L|--listfiles <paketnamn> ...   Visa filer som \"ägs\" av paket.\n"
 "  -l|--list [<mönster> ...]        Visa kortfattad paketlista.\n"
-"  -W|--show <mönster> ...          Visa information om paket.\n"
+"  -W|--show [<mönster> ...]        Visa information om paket.\n"
 "  -S|--search <mönster> ...        Sök paket som äger fil(er).\n"
 "  -c|--control-path <paket> [<fil>]Visa sökväg för paketets styrfil.\n"
 "\n"
@@ -3896,7 +3874,7 @@
 "  -f|--showformat=<format>         Använd alternativt format för --show\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3918,6 +3896,10 @@
 "  ${var[;bredd]}. Fälten kommer att högerjusteras såvida inte bredden anges\n"
 "  negativt, i vilket fall vänsterjustering kommer användas.\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "Använd --help för hjälp om att fråga paket."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3976,7 +3958,7 @@
 msgid "Removing %s ...\n"
 msgstr "Tar bort %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3985,49 +3967,49 @@
 "när %.250s togs bort kunde inte katalogen \"%.250s\" tas bort: %s - "
 "katalogen kan vara en monteringspunkt?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "kan inte ta bort \"%.250s\""
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "kunde inte säkert ta bort \"%.255s\""
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "när %.250s togs bort var inte katalogen \"%.250s\" tom, så den togs inte "
 "bort."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, c-format
+msgid "cannot remove '%.250s'"
+msgstr "kan inte ta bort \"%.250s\""
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Raderar konfigurationsfiler för %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "kan inte ta bort gammal konfigurationsfil \"%.250s\" (= \"%.250s\")"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "kan inte läsa konfigurationsfilskatalog \"%.250s\" (från \"%.250s\")"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "kan inte ta bort gammal kopia av konfigurationsfil \"%.250s\" (av \"%.250s\")"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "kan inte ta bort gammal fillista"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "kunde inte ta bort gammalt postrm-skript"
 
@@ -4070,7 +4052,12 @@
 msgid "read error on standard input"
 msgstr "läsfel på standard in"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+"Använd --help för hjälp om att överstyra \"stat\"-information för filer."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4079,7 +4066,7 @@
 "Copyright © 2000, 2001 Wichert Akkerman.\n"
 "Copyright © 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4096,7 +4083,7 @@
 "  --list [<jokertecken>]   visa befintliga överskrivningar i databasen.\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4118,31 +4105,31 @@
 "  --version                visa versionen.\n"
 "\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "tar bort avslutande /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "kan inte öppna ny statoverride-fil"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "fel vid borttagning av statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "fel vid skapande av ny statoverride-old"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "fel vid installation av ny statoverride"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add behöver fyra argument"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4151,21 +4138,21 @@
 "Det finns redan en överskrivning för \"%s\", men --force angavs, så den "
 "kommer att ignoreras."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Det finns redan en överskrivning för \"%s\", avbryter."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "--update angavs men %s finns inte"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Det finns inga överskrivningar."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update är oanvändbar tillsammans med --remove"
 
@@ -4204,10 +4191,9 @@
 msgstr "kunde inte ta status på tidigare statoverride-fil"
 
 #: src/statdb.c:162
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
+#, c-format
 msgid "reading statoverride file '%.250s'"
-msgstr "statoverride-fil \"%.250s\""
+msgstr "läser statoverride-fil \"%.250s\""
 
 #: src/statdb.c:169
 msgid "statoverride file is missing final newline"
@@ -4230,16 +4216,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "flera statoverride är satta för filen \"%.250s\""
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Skriv dpkg-trigger --help för hjälp om detta verktyg."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debian \"%s\" paketutlösarverktyg version %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4250,7 +4236,7 @@
 "            %s [<flagga> ...] <kommando>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4262,7 +4248,7 @@
 "  --check-supported                Se om den aktiva dpkg stöder utlösare.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4283,37 +4269,31 @@
 "  --no-act                         Bara testa - ändra ingenting på riktigt.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: utlösardatakatalogen har inte skapats ännu\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: utlösarposter finns inte ännu\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "tar bara ett argument, namnet på utlösaren"
 
-#: src/trigcmd.c:211
-#, fuzzy
-#| msgid ""
-#| "dpkg-trigger must be called from a maintainer script (or with a --by-"
-#| "package option)"
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
-"dpkg-trigger måste anropas från ett utvecklarskript (eller med flaggan --by-"
-"package)"
+"måste anropas från ett utvecklarskript (eller med flaggan --by-package)"
 
-#: src/trigcmd.c:216
-#, fuzzy, c-format
-#| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
+#: src/trigcmd.c:215
+#, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
-msgstr "dpkg-trigger: ogiltigt namn \"%.250s\" på paket som väntas på: %.250s"
+msgstr "ogiltigt namn \"%.250s\" på paket som väntas på: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "ogiltigt utlösarnamn \"%.250s\": %.250s"
@@ -4347,39 +4327,39 @@
 
 #: src/update.c:52
 #, c-format
-msgid "--%s needs exactly one Packages file argument"
-msgstr "--%s behöver exakt ett Packages-fil som argument"
+msgid "--%s needs exactly one Packages-file argument"
+msgstr "--%s behöver exakt en Packages-fil som argument"
 
-#: src/update.c:61
+#: src/update.c:62
 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"
 
-#: src/update.c:63
+#: src/update.c:64
 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"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Ersätter information om tillgängliga paket med %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Uppdaterar information om tillgängliga paket med %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "Information om %d paket uppdaterades.\n"
 msgstr[1] "Information om %d paket uppdaterades.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4494,8 +4474,8 @@
 msgstr[0] "ignorerar %d varning om kontrollfilerna\n"
 msgstr[1] "ignorerar %d varningar om kontrollfilerna\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s behöver ett <katalog>-argument"
@@ -4528,62 +4508,53 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: bygger paketet \"%s\" i \"%s\".\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
-#, fuzzy, c-format
-#| msgid "failed to make tmpfile (data)"
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
+#, c-format
 msgid "failed to make temporary file (%s)"
-msgstr "kunde inte skapa temporärfil (datadel)"
+msgstr "kunde inte skapa temporärfil (%s)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
-#, fuzzy
-#| msgid "control area"
 msgid "control member"
-msgstr "kontrollområde"
+msgstr "kontrolldel"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
-#, fuzzy, c-format
-#| msgid "failed to unlink tmpfile (data), %s"
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
+#, c-format
 msgid "failed to unlink temporary file (%s), %s"
-msgstr "kunde inte ta bort temporärfil (datadel), %s"
+msgstr "kunde inte ta bort temporärfil (%s), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
-#, fuzzy, c-format
-#| msgid "failed to rewind tmpfile (data)"
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
+#, c-format
 msgid "failed to rewind temporary file (%s)"
-msgstr "kunde inte gå till början av temporär fil (datadel)"
+msgstr "kunde inte gå till början av temporär fil (%s)"
 
 #: dpkg-deb/build.c:494
-#, fuzzy, c-format
-#| msgid "failed to fstat ar member file (%s)"
+#, c-format
 msgid "failed to stat temporary file (%s)"
-msgstr "kunde inte ta status (fstat) på del av ar-fil (%s)"
+msgstr "kunde inte ta status (stat) på temporär fil (%s)"
 
 #: dpkg-deb/build.c:498
 #, c-format
 msgid "error writing `%s'"
 msgstr "fel vid skrivning av \"%s\""
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
-#, fuzzy
-#| msgid "between members"
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 msgid "data member"
-msgstr "mellan medlemmar"
+msgstr "datadel"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
-#, fuzzy, c-format
-#| msgid "failed to write filename to tar pipe (data)"
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
+#, c-format
 msgid "failed to write filename to tar pipe (%s)"
-msgstr "kunde inte skriva filnamn till tar-rör (datadel)"
+msgstr "kunde inte skriva filnamn till tar-rör (%s)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<komprimerare> från tar -cf"
 
 #: dpkg-deb/extract.c:61 dpkg-deb/extract.c:63
 msgid "shell command to move files"
-msgstr ""
+msgstr "skalkommando för att flytta filer"
 
 #: dpkg-deb/extract.c:70
 #, c-format
@@ -4595,116 +4566,98 @@
 msgid "error reading %s from file %.255s"
 msgstr "fel vid läsning av %s från filen %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "kunde inte läsa arkivet \"%.255s\""
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "kunde inte ta status på arkivet"
 
-#: dpkg-deb/extract.c:130
-#, fuzzy
-#| msgid "archive has no dot in version number"
+#: dpkg-deb/extract.c:131
 msgid "archive magic version number"
-msgstr "arkivet har ingen punkt i versionsnumret"
+msgstr "magiskt versionsnummer för arkiv"
 
-#: dpkg-deb/extract.c:142
-#, fuzzy
-#| msgid "archive has no newlines in header"
+#: dpkg-deb/extract.c:143
 msgid "archive member header"
-msgstr "arkivet har inga nyradstecken i huvudet"
+msgstr "huvud för arkivdel"
 
-#: dpkg-deb/extract.c:147
-#, fuzzy, c-format
-#| msgid "file `%.250s' is corrupt - bad part number"
+#: dpkg-deb/extract.c:148
+#, c-format
 msgid "file '%.250s' is corrupt - bad archive header magic"
-msgstr "filen \"%.250s\" är trasig - felaktigt delnummer"
+msgstr "filen \"%.250s\" är trasig - felaktigt magiskt nummer i arkivhuvud"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "filen \"%.250s\" är inte ett debianbinärarkiv (försök med dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
-#, fuzzy
-#| msgid "archive has no dot in version number"
+#: dpkg-deb/extract.c:159
 msgid "archive information header member"
-msgstr "arkivet har ingen punkt i versionsnumret"
+msgstr "huvud för arkivinformation"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "arkivet har inga nyradstecken i huvudet"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "arkivet har ingen punkt i versionsnumret"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 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:178 dpkg-deb/extract.c:204
-#, fuzzy, c-format
-#| msgid "skipped member data from %s"
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
+#, c-format
 msgid "skipped archive member data from %s"
-msgstr "överhoppad medlemsdata från %s"
+msgstr "hoppade över arkivmedlemsdata från %s"
 
-#: dpkg-deb/extract.c:193
-#, fuzzy, c-format
-#| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
+#: dpkg-deb/extract.c:194
+#, c-format
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
-msgstr "filen \"%.250s\" innehåller okänd datadel %.*s, ger upp"
+msgstr "arkivet \"%.250s\" innehåller okänd datadel %.*s, ger upp"
 
-#: dpkg-deb/extract.c:198
-#, fuzzy, c-format
-#| msgid "file `%.250s' contains two control members, giving up"
+#: dpkg-deb/extract.c:199
+#, c-format
 msgid "archive '%.250s' contains two control members, giving up"
-msgstr "filen \"%.250s\" innehåller två kontrolldelar, ger upp"
+msgstr "arkivet \"%.250s\" innehåller två kontrolldelar, ger upp"
 
-#: dpkg-deb/extract.c:213
-#, fuzzy, c-format
-#| msgid ""
-#| " new debian package, version %s.\n"
-#| " size %ld bytes: control archive= %zi bytes.\n"
+#: dpkg-deb/extract.c:214
+#, c-format
 msgid ""
 " new debian package, version %s.\n"
 " size %jd bytes: control archive= %jd bytes.\n"
 msgstr ""
 " nytt debianpaket, version %s.\n"
-" storlek %ld byte: kontrollarkiv= %zi byte.\n"
+" storlek %jd byte: kontrollarkiv= %jd byte.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
-msgstr ""
+msgstr "storlek på arkivkontrolldel"
 
-#: dpkg-deb/extract.c:234
-#, fuzzy, c-format
-#| msgid "archive has malformatted control length `%s'"
+#: dpkg-deb/extract.c:235
+#, c-format
 msgid "archive has malformatted control member size '%s'"
-msgstr "arkivet har felformaterad kontrollängd \"%s\""
+msgstr "arkivet har felformaterad kontroldellängd \"%s\""
 
-#: dpkg-deb/extract.c:241
-#, fuzzy, c-format
-#| msgid "skipped member data from %s"
+#: dpkg-deb/extract.c:242
+#, c-format
 msgid "skipped archive control member data from %s"
-msgstr "överhoppad medlemsdata från %s"
+msgstr "hoppade över arkivkontrolldeldata från %s"
 
-#: dpkg-deb/extract.c:245
-#, fuzzy, c-format
-#| msgid ""
-#| " old debian package, version %s.\n"
-#| " size %ld bytes: control archive= %zi, main archive= %ld.\n"
+#: dpkg-deb/extract.c:246
+#, c-format
 msgid ""
 " old debian package, version %s.\n"
 " size %jd bytes: control archive= %jd, main archive= %jd.\n"
 msgstr ""
 " gammalt debianpaket, version %s.\n"
-" storlek %ld byte: kontrollarkiv= %zi, huvudarkiv= %ld.\n"
+" storlek %jd byte: kontrollarkiv= %jd, huvudarkiv= %jd.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4713,49 +4666,50 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "\"%.255s\" är inte ett debianarkiv"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "kunde inte skriva till rör i \"kopiera\""
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "kunde inte stänga rör i \"kopiera\""
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "datadel"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "kunde inte byta till katalogen"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "kunde inte skapa katalog"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "kunde inte byta till katalog efter att ha skapat den"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "kunde inte byta till katalogen"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<dekomprimering>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "klistra in"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s behöver ett .deb-filnamn som argument"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4764,98 +4718,96 @@
 "--%s behöver en målkatalog.\n"
 "Kanske är det dpkg --install du vill använda?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s tar bara ett argument (.deb-filnamn)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "kunde inte byta katalog till \"/\" för upprensning"
 
-#: dpkg-deb/info.c:109
-#, fuzzy, c-format
-#| msgid "cannot stat file '%s'"
+#: dpkg-deb/info.c:106
+#, c-format
 msgid "control file '%s'"
-msgstr "kan inte ta status på filen \"%s\""
+msgstr "kontrollfil \"%s\""
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: \"%.255s\" innehåller ingen kontrollkomponent \"%.255s\"\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, 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"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "%d efterfrågad kontrollkomponent saknas"
 msgstr[1] "%d efterfrågade kontrollkomponenter saknas"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "kan inte läsa katalogen \"%.255s\""
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "kan inte ta status på \"%.255s\" (i \"%.255s\")"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "kan inte öppna \"%.255s\" (i \"%.255s\")"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "kunde inte läsa \"%.255s\" (i \"%.255s\")"
 
-#: dpkg-deb/info.c:167
-#, fuzzy, c-format
-#| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
+#: dpkg-deb/info.c:170
+#, c-format
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
-msgstr " %7ld byte,  %5d rader   %c  %-20.127s %.127s\n"
+msgstr " %7jd byte, %5d rader   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     inte en vanlig fil        %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(ingen \"control\"-fil i kontrollarkivet!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "kunde inte öppna kontrollkomponenten"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "fel vid läsning av kontrollkomponenten"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "fel vid stängning av komponenten \"%s\""
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Fel i format"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents tar endast ett argument"
 
@@ -4876,6 +4828,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4888,10 +4842,11 @@
 "  -e|--control <deb> [<katalog>]   Extrahera kontrollinformation.\n"
 "  -x|--extract <deb> <katalog>     Extrahera filer.\n"
 "  -X|--vextract <deb> <katalog>    Extrahera och lista filer.\n"
+"  -R|--raw-extracct <deb> <ktalog> Extrahera kontrollinfo och filer.\n"
 "  --fsys-tarfile <deb>             Skapa filsystemstarfil.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4904,11 +4859,12 @@
 "<kfält> är namnet på ett fält i den huvud-\"control\"-filen.\n"
 "\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4922,6 +4878,7 @@
 msgstr ""
 "Flaggor:\n"
 "  --showformat=<format>            Använd alternativt format för --show.\n"
+"  -v, --verbose                    Aktivera informativ utdata.\n"
 "  -D                               Aktivera felsökningsutdata.\n"
 "  --old, --new                     Välj arkivformat.\n"
 "  --nocheck                        Stäng av kontrollfilstest (skapar\n"
@@ -4932,7 +4889,7 @@
 "none\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4946,7 +4903,7 @@
 "\"dselect\" eller \"aptitude\" för användarvänlig pakethantering.  Paket\n"
 "som packas upp med \"dpkg-deb --extract\" blir inte korrekt installerade!\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4954,17 +4911,17 @@
 "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:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "ogiltigt heltal för --%c: \"%.250s\""
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "ogiltig komprimeringsnivå för --%c: \"%ld\""
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "okänd komprimeringstyp \"%s\"."
@@ -4984,7 +4941,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "filen \"%.250s\" är trasig - nyradstecken saknas efter %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "fel vid läsning av %.250s"
@@ -5034,111 +4991,92 @@
 
 #: dpkg-split/info.c:134 dpkg-split/info.c:135
 msgid "archive total size"
-msgstr ""
+msgstr "totalstorlek för arkiv"
 
 #: dpkg-split/info.c:136 dpkg-split/info.c:137
-#, fuzzy
-#| msgid "part offset"
 msgid "archive part offset"
-msgstr "offset för del"
+msgstr "offset för arkivdel"
 
 #: dpkg-split/info.c:139
-#, fuzzy
-#| msgid "part numbers"
 msgid "archive part numbers"
-msgstr "delnummer"
+msgstr "delnummer för arkiv"
 
 #: dpkg-split/info.c:142
-#, fuzzy, c-format
-#| msgid "file `%.250s' is corrupt - no slash between part numbers"
+#, c-format
 msgid "file '%.250s' is corrupt - no slash between archive part numbers"
-msgstr "filen \"%.250s\" är trasig - inget snedstreck mellan delnummer"
+msgstr "filen \"%.250s\" är trasig - inget snedstreck mellan arkivdelnummer"
 
 #: dpkg-split/info.c:145
-#, fuzzy
-#| msgid "number of parts"
 msgid "number of archive parts"
-msgstr "antal delar"
+msgstr "antal arkivdelar"
 
 #: dpkg-split/info.c:147
-#, fuzzy, c-format
-#| msgid "file '%.250s' is corrupt - bad number of parts"
+#, c-format
 msgid "file '%.250s' is corrupt - bad number of archive parts"
-msgstr "filen \"%.250s\" är trasig - felaktigt antal delar"
+msgstr "filen \"%.250s\" är trasig - felaktigt antal arkivdelar"
 
 #: dpkg-split/info.c:149
-#, fuzzy
-#| msgid "parts number"
 msgid "archive parts number"
-msgstr "delnummer"
+msgstr "delnummer för arkiv"
 
 #: dpkg-split/info.c:151
-#, fuzzy, c-format
-#| msgid "file `%.250s' is corrupt - bad part number"
+#, c-format
 msgid "file '%.250s' is corrupt - bad archive part number"
-msgstr "filen \"%.250s\" är trasig - felaktigt delnummer"
+msgstr "filen \"%.250s\" är trasig - felaktigt arkivdelnummer"
+
+#: dpkg-split/info.c:157
+msgid "package architecture"
+msgstr "paketarkitektur"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:166
 #, 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"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "filen \"%.250s\" är trasig - andra medlemmen är inte datadelen"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr "filen \"%.250s\" är trasig - fel antal delar för angivna storlekar"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "filen \"%.250s\" är trasig - storleken är fel för angivet delnummer"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "kunde inte ta status på delfilen \"%.250s\""
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "filen \"%.250s\" är trasig - för kort"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "kan inte öppna arkivdelen i fil \"%.250s\""
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "filen \"%.250s\" är inte en arkivdel"
 
-#: dpkg-split/info.c:202
-#, fuzzy, c-format
-#| msgid ""
-#| "%s:\n"
-#| "    Part format version:            %s\n"
-#| "    Part of package:                %s\n"
-#| "        ... version:                %s\n"
-#| "        ... MD5 checksum:           %s\n"
-#| "        ... length:                 %lu bytes\n"
-#| "        ... split every:            %lu bytes\n"
-#| "    Part number:                    %d/%d\n"
-#| "    Part length:                    %zi bytes\n"
-#| "    Part offset:                    %lu bytes\n"
-#| "    Part file size (used portion):  %lu bytes\n"
-#| "\n"
+#: dpkg-split/info.c:209
+#, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5152,21 +5090,27 @@
 "    Formatversion för del:          %s\n"
 "    Del av paket:                   %s\n"
 "       ... version:                 %s\n"
+"        ...arloteltir:              %s\n"
 "       ... MD5-kontrollsumma:       %s\n"
-"       ... längd:                   %lu byte\n"
-"       ... dela vid:                %lu byte\n"
+"       ... längd:                   %jd byte\n"
+"       ... dela vid:                %jd byte\n"
 "    Delnummer:                      %d/%d\n"
-"    Dellängd:                       %zi byte\n"
-"    Deloffset:                      %lu byte\n"
-"    Delfilstorlek (använd del):     %lu byte\n"
+"    Dellängd:                       %jd byte\n"
+"    Deloffset:                      %jd byte\n"
+"    Delfilstorlek (använd del):     %jd byte\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<okänd>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s kräver en eller flera delfilsargument"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "filen \"%s\" är inte en del av ett arkiv\n"
@@ -5189,19 +5133,14 @@
 msgstr "kunde inte (åter)öppna indatadelfil \"%.250s\""
 
 #: dpkg-split/join.c:58
-#, fuzzy
-#| msgid "Skipping deselected package %s.\n"
 msgid "skipping split package header"
-msgstr "Hoppar över ej valt paket %s.\n"
+msgstr "hoppar huvud för delat paket"
 
 #: dpkg-split/join.c:59
-#, fuzzy
-#| msgid "Putting package %s together from %d part: "
-#| msgid_plural "Putting package %s together from %d parts: "
 msgid "split package part"
-msgstr "Slår ihop paketet %s från %d del:"
+msgstr "del av delat paket"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "klar\n"
@@ -5259,36 +5198,48 @@
 "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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Flaggor:\n"
 "  --depotdir <katalog>             Använd <katalog> istället för %s/%s.\n"
 "  -S|--partsize <storlek>          I kibyte, för -s (förval är 450).\n"
-"  -o|--output <fil>                För -j (förval är <paket>-<version>.deb)\n"
+"  -o|--output <fil>                Filnamn, för -j (förval är\n"
+"                                     <paket>_<version>_<ark>.deb)\n"
 "  -Q|--npquiet                     Var tyst när -a inte är en del.\n"
 "  --msdos                          Skapa 8.3-filnamn.\n"
 "\n"
-"Felstatus: 0 = OK, 1 = -a är inte en del, 2 = problem!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+"Felstatus:\n"
+"  0 = OK\n"
+"  1 = med --auto, fil är inte en del\n"
+"  2 = problem\n"
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Skriv dpkg-split --help för hjälp."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "oväntat filslut i %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "delstorlek är för stor eller ej positiv"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "delstorleken måste vara minst %d KiB (för att tillåta huvud)"
@@ -5328,7 +5279,7 @@
 
 #: dpkg-split/queue.c:184
 msgid "extracting split part"
-msgstr ""
+msgstr "extraherar delad del"
 
 #: dpkg-split/queue.c:192
 #, c-format
@@ -5359,10 +5310,9 @@
 msgstr "kunde inte ta status på \"%.250s\""
 
 #: dpkg-split/queue.c:243
-#, fuzzy, c-format
-#| msgid " %s (%lu bytes)\n"
+#, c-format
 msgid " %s (%jd bytes)\n"
-msgstr " %s (%lu byte)\n"
+msgstr " %s (%jd byte)\n"
 
 #: dpkg-split/queue.c:245
 #, c-format
@@ -5384,10 +5334,9 @@
 msgstr "delfil \"%.250s\" är inte en vanlig fil"
 
 #: dpkg-split/queue.c:278
-#, fuzzy, c-format
-#| msgid "(total %lu bytes)\n"
+#, c-format
 msgid "(total %jd bytes)\n"
-msgstr "(totalt %lu byte)\n"
+msgstr "(totalt %jd byte)\n"
 
 #: dpkg-split/queue.c:304
 #, c-format
@@ -5399,46 +5348,44 @@
 msgid "Deleted %s.\n"
 msgstr "Tog bort %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
-#, fuzzy
-#| msgid "dpkg-deb field extraction"
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
-msgstr "extrahering av dpkg-deb-fält"
+msgstr "extrahering av paketfältvärde"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "kunde inte öppna källfil \"%.250s\""
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "kunde inte ta status på källfil"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "källfil \"%.250s\" inte en vanlig fil"
 
-#: dpkg-split/split.c:151
-#, fuzzy, c-format
-#| msgid "Putting package %s together from %d part: "
-#| msgid_plural "Putting package %s together from %d parts: "
+#: dpkg-split/split.c:153
+#, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
-msgstr[0] "Slår ihop paketet %s från %d del:"
-msgstr[1] "Slår ihop paketet %s från %d delar:"
+msgstr[0] "Delar paketet %s i %d del: "
+msgstr[1] "Delar paketet %s i %d delar: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
+"Huvudet är för långt, vilket gör delen för lång. Paketnamnet eller\n"
+"versionsnumret måste vara väldigt långt, eller något sådant. Ger upp.\n"
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split kräver ett källfilnamnsargument"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split tar som mest ett källfilnamn och ett destinationsprefix"
 
@@ -5454,51 +5401,7 @@
 "Copyright © 2009-2010 Raphael Hertzog.\n"
 
 #: utils/update-alternatives.c:101
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [<option> ...] <command>\n"
-#| "\n"
-#| "Commands:\n"
-#| "  --install <link> <name> <path> <priority>\n"
-#| "    [--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"
-#| "  --auto <name>            switch the master link <name> to automatic "
-#| "mode.\n"
-#| "  --display <name>         display information about the <name> group.\n"
-#| "  --query <name>           machine parseable version of --display "
-#| "<name>.\n"
-#| "  --list <name>            display all targets of the <name> group.\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 %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"
-#| "  automatic mode.\n"
-#| "\n"
-#| "Options:\n"
-#| "  --altdir <directory>     change the alternatives directory.\n"
-#| "  --admindir <directory>   change the administrative directory.\n"
-#| "  --skip-auto              skip prompt for alternatives correctly "
-#| "configured\n"
-#| "                           in automatic mode (relevant for --config "
-#| "only)\n"
-#| "  --verbose                verbose operation, more output.\n"
-#| "  --quiet                  quiet operation, minimal output.\n"
-#| "  --help                   show this help message.\n"
-#| "  --version                show the version.\n"
+#, c-format
 msgid ""
 "Commands:\n"
 "  --install <link> <name> <path> <priority>\n"
@@ -5520,8 +5423,6 @@
 "  --all                    call --config on all alternatives.\n"
 "\n"
 msgstr ""
-"Användning: %s [<flagga> ...] <kommando>\n"
-"\n"
 "Kommandon:\n"
 "  --install <länk> <namn> <sökväg> <prioritet>\n"
 "    [--slave <länk> <namn> <sökväg>] ...\n"
@@ -5531,34 +5432,13 @@
 "  --auto <namn>            växla huvudlänken <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"
-"                           välja vilken som skall användas.\n"
+"  --get-selections         visar huvudalternativnamn och deras status.\n"
+"  --set-selections         läser alternativstatus från standard in.\n"
+"  --config <namn>          visa alternativ för gruppen <namn> och be\n"
+"                           användaren 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"
 "\n"
-"<länk> är länken som pekar till %s/<namn>.\n"
-"  (t.ex. /usr/bin/pager)\n"
-"<namn> är huvudlänken för länkgruppen.\n"
-"  (t.ex. pager)\n"
-"<sökväg> är platsen för en av de alternativa målfilerna.\n"
-"  (t.ex. /usr/bin/less)\n"
-"<prioritet> är ett heltal; alternativ med högre värde har högre\n"
-"  prioritet i automatiskt läge.\n"
-"\n"
-"Flaggor:\n"
-"  --altdir <katalog>       ändra alternatives-katalogen.\n"
-"  --admindir <katalog>     ändra administrativ katalog.\n"
-"  --skip-auto              hoppa över fråga för korrekt konfigurerade "
-"alternativ\n"
-"                           i automatiskt läge (relevant endast för --"
-"config)\n"
-"  --verbose                informativ funktion, mer utdata.\n"
-"  --quiet                  tyst funktion, minimal utdata.\n"
-"  --help                   visar detta hjälpmeddelande.\n"
-"  --version                visar versionsnummer.\n"
-"  --help                   visa detta hjälpmeddelande.\n"
-"  --version                visa versionsnummer.\n"
 
 #: utils/update-alternatives.c:120
 #, c-format
@@ -5574,18 +5454,17 @@
 "  automatic mode.\n"
 "\n"
 msgstr ""
+"<länk> är länken som pekar till %s/<namn>.\n"
+"  (t.ex. /usr/bin/pager)\n"
+"<namn> är huvudnamnet för länkgruppen.\n"
+"  (t.ex. pager)\n"
+"<sökväg> är platsen för en av de alternativa målfilerna.\n"
+"  (t.ex. /usr/bin/less)\n"
+"<prioritet> är ett heltal; alternativ med högre värde har högre\n"
+"  prioritet i automatiskt läge.\n"
 
 #: utils/update-alternatives.c:131
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  --admindir <directory>   set the directory with the statoverride file.\n"
-#| "  --update                 immediately update file permissions.\n"
-#| "  --force                  force an action even if a sanity check fails.\n"
-#| "  --quiet                  quiet operation, minimal output.\n"
-#| "  --help                   show this help message.\n"
-#| "  --version                show the version.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -5601,134 +5480,100 @@
 "  --version                show the version.\n"
 msgstr ""
 "Flaggor:\n"
-"  --admindir <katalog>     välj katalog för statoverride-filen.\n"
-"  --update                 uppdatera filbehörigheter omedelbart.\n"
-"  --force                  tvinga åtgärd även om säkerhetstester "
-"misslyckas.\n"
-"  --quiet                  tyst körning, minimal utdata.\n"
-"  --help                   visa detta hjälpmeddelande.\n"
-"  --version                visa versionen.\n"
-"\n"
+"  --altdir <katalog>       ändra alternatives-katalogen.\n"
+"  --admindir <katalog>     ändra administrativ katalog.\n"
+"  --log <fil>              ändra loggfil.\n"
+"  --force                  tillåt ersätta filer med alternativ länk.\n"
+"  --skip-auto              hoppa över fråga för korrekt konfigurerade "
+"alternativ\n"
+"                           i automatiskt läge (relevant endast för --"
+"config)\n"
+"  --verbose                informativ funktion, mer utdata.\n"
+"  --quiet                  tyst funktion, minimal utdata.\n"
+"  --help                   visar detta hjälpmeddelande.\n"
+"  --version                visar versionsnummer.\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "fel"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "varning"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "kan inte ta status på %s: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "misslyckades läsa länken (readlink) %s: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "två kommandon angivna: --%s och --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
-msgstr "kunde inte lägga till i %s: %s"
-
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "misslyckades söka i %s: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "kunde inte köra %s: %s"
-
-#: utils/update-alternatives.c:503
-#, c-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"
-
-#: utils/update-alternatives.c:511
+#: utils/update-alternatives.c:387
 #, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "kunde inte installera %s som %s: %s"
+msgid "cannot append to '%s'"
+msgstr "kunde inte lägga till i \"%s\""
 
-#: utils/update-alternatives.c:521
+#: utils/update-alternatives.c:556
 #, c-format
-msgid "unable to remove %s: %s"
-msgstr "kunde inte ta bort %s: %s"
+msgid "unable to remove '%s'"
+msgstr "kunde inte ta bort \"%s\""
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "oväntat filslut när %s försökte läsas"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "vid läsning av %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "rad inte avbslutad när %s försökte läsas"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s trasig: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "nyradstecken tillåts inte i update-alternatives-file (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "vid skrivning av %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "slavnamn"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
-#, fuzzy, c-format
-#| msgid "duplicate slave %s"
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
+#, c-format
 msgid "duplicate slave name %s"
-msgstr "duplicerad slav %s"
+msgstr "duplicerat slavnamn %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "slavlänk"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "slavlänken är samma som huvudlänken %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "duplicerad slavlänk %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "huvudfil"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "duplicerad sökväg %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5737,130 +5582,115 @@
 "alternativet för %s (ingår i länkgruppen %s) finns inte. Tar bort från "
 "listan över alternativ."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "prioritet"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "slavfil"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "prioritet på %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "kunde inte läsa %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "status"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "felaktig status"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "huvudlänk"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "kunde inte stänga %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "kastar bort föråldrad slavlänk %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "kan inte skriva %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "automatiskt läge"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "manuellt läge"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "  länken pekar för närvarande på %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "  länken saknas för närvarande"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - prioritet %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  slav %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "\"Bästa\" version är för närvarande \"%s\"."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Inga versioner tillgängliga."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "Det finns %d val för alternativet %s (som tillhandahåller %s)."
 msgstr[1] "Det finns %d val för alternativet %s (som tillhandahåller %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Val"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Sökväg"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Prioritet"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Status"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Tryck Enter för att behålla standardvärdet[*], eller ange nummer på önskat "
 "val: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "ersätter inte %s med en länk."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "kan inte installera det okända valet %s"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -5869,98 +5699,149 @@
 "hoppar över att skapa %s då den associerade filen %s (från länkgruppen %s) "
 "inte finns."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr "tar inte bort %s eftersom det inte är en symbolisk länk"
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Anropa %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Alternativet %s oändrat eftersom valet %s inte är tillgängligt."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Hoppar över okänt alternativ \"%s\"."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "rad för lång eller inte avslutad när %s försökte läsas"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Hoppar över trasig rad: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "byter namn på länken %s från %s till %s."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "byter namn på slavlänken %s från %s till %s."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "alternativnamnet (%s) får inte innehålla \"/\" eller blanksteg."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "alternativlänken är inte absolut som den borde vara: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "alternativsökvägen är inte absolut som den borde vara: %s"
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "alternativet %s kan inte vara huvudalternativ: det är en slav till %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "alternativlänken %s hanteras redan av %s."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "alternativsökvägen %s finns inte."
+
+#: utils/update-alternatives.c:2254
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr ""
+"alternativet %s kan inte vara en slav till %s: det är huvudalternativet."
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "alternativet %s kan inte vara en slav till %s: det är en slav till %s"
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "alternativlänken %s hanteras redan av %s. (slav till %s)."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "okänt argument \"%s\""
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install behöver <länk> <namn> <sökväg> <prioritet>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<länk> och <sökväg> kan inte vara identiska"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "prioritet måste vara ett heltal"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s behöver <namn> <sökväg>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s behöver <namn>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave tillåts endast tillsammans med --install"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave behöver <länk> <namn> <sökväg>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "namnet %s är både primär och slav"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "länken %s är både primär och slav"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s behöver ett <fil>-argument"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "okänd flagga \"%s\""
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -5968,143 +5849,127 @@
 "behöver --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all eller --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "alternativet %s kan inte vara huvudalternativ: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "alternativlänken %s hanteras redan av %s."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "alternativlänken är inte absolut som den borde vara: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "alternativsökvägen är inte absolut som den borde vara: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "alternativsökvägen %s finns inte."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "alternativnamnet (%s) får inte innehålla \"/\" eller blanksteg."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "det är ett huvudalternativ."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "det är slav till %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "alternativet %s kan inte vara en slav till %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<standard in>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "inga alternativ för %s."
 
-#: utils/update-alternatives.c:2342
-#, fuzzy, c-format
-#| msgid "%s is dangling, it will be updated with best choice."
+#: utils/update-alternatives.c:2530
+#, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
-msgstr "%s är lös, den kommer uppdateras med det bästa alternativet."
+msgstr "%s/%s är lös, den kommer uppdateras med det bästa alternativet."
 
-#: utils/update-alternatives.c:2346
-#, fuzzy, c-format
-#| msgid ""
-#| "%s has been changed (manually or by a script). Switching to manual "
-#| "updates only."
+#: utils/update-alternatives.c:2534
+#, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
 "updates only."
 msgstr ""
-"%s har ändrats (manuellt eller av ett skript). Växlar till enbart manuella "
-"uppdateringar."
+"%s/%s har ändrats (manuellt eller av ett skript). Växlar till enbart "
+"manuella uppdateringar."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "aktiverar automatiskt val av %s."
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "alternativet %s för %s har inte registrerats, ställer inte in."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Det finns inga program som tillhandahåller %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Inget att konfigurera."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Det finns bara ett alternativ i länkgruppen %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "alternativet %s för %s har inte registrerats, tar inte bort."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr "tar bort manuellt valda alternativ - växlar %s till autoläge"
 
-#: utils/update-alternatives.c:2429
-#, fuzzy, c-format
-#| msgid "automatic updates of %s are disabled, leaving it alone."
+#: utils/update-alternatives.c:2617
+#, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
-msgstr "automatiska uppdateringar av %s är inaktiverad, låter den vara."
+msgstr "automatiska uppdateringar av %s/%s är inaktiverad, låter den vara."
 
-#: utils/update-alternatives.c:2431
-#, fuzzy, c-format
-#| msgid "to return to automatic updates use `update-alternatives --auto %s'."
+#: utils/update-alternatives.c:2619
+#, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
-"för att återgå till automatiska uppdateringar, använd \"update-alternatives "
-"--auto %s\"."
+"för att återgå till automatiska uppdateringar, använd \"%s --auto %s\"."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "använder %s för att tillhandahålla %s (%s) i %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr "tvingar ominstallation av alternativet %s då länkgruppen %s är trasig."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "det nuvarande alternativet %s är okänt, växlar till %s för länkgruppen %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "det är ett huvudalternativ."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "det är slav till %s"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "kan inte ta status på %s: %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "misslyckades läsa länken (readlink) %s: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "misslyckades söka i %s: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "kunde inte köra %s: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "kunde inte göra %s till en symbolisk länk till %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "kunde inte installera %s som %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "vid skrivning av %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "kunde inte läsa %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "kunde inte stänga %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "kan inte skriva %s: %s"
+
 #, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6363,9 +6228,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "överhoppat styrområde från %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "kunde inte köra tar"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "kunde inte skapa temporär katalog"
 
Binary files dpkg/po/th.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/th.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/th.po /home/vorlon/devel/multiarch/dpkg-debian/po/th.po
--- dpkg/po/th.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/th.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-12-19 14:28+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -23,7 +23,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "ไม่สามารถเขียนแฟ้ม '%s'"
@@ -44,71 +44,77 @@
 msgid "ar member file (%s)"
 msgstr "ไม่สามารถ fstat แฟ้มสมาชิก ar (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "อ่านไม่สำเร็จขณะสำเนาบัฟเฟอร์สำหรับ %s"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "เขียนไม่สำเร็จขณะสำเนาบัฟเฟอร์สำหรับ %s"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "อ่านข้อมูลไม่หมดขณะสำเนาบัฟเฟอร์สำหรับ %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "เรียกใช้ tar ไม่สำเร็จ"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "ไม่สามารถเรียกทำงาน %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: การแตกแฟ้ม"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: การบีบอัด"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: เกิดข้อผิดพลาดขณะเชื่อมแฟ้มขาเข้าเข้ากับกระแสข้อมูล gzip"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: เกิดข้อผิดพลาดภายในของ gzip เกี่ยวกับการอ่าน: '%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: เกิดข้อผิดพลาดภายในของ gzip เกี่ยวกับการเขียน"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: เกิดข้อผิดพลาดขณะเชื่อมแฟ้มขาออกเข้ากับกระแสข้อมูล gzip"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: เกิดข้อผิดพลาดภายในของ gzip เกี่ยวกับการอ่าน"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: เกิดข้อผิดพลาดภายในของ gzip เกี่ยวกับการเขียน: '%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: เกิดข้อผิดพลาดภายในของ gzip เกี่ยวกับการเขียน: %s"
@@ -123,135 +129,135 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: เกิดข้อผิดพลาดภายในของ bzip2 เกี่ยวกับการอ่าน: '%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: เกิดข้อผิดพลาดภายในของ bzip2 เกี่ยวกับการเขียน"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: เกิดข้อผิดพลาดขณะเชื่อมแฟ้มขาออกเข้ากับกระแสข้อมูล bzip2"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: เกิดข้อผิดพลาดภายในของ bzip2 เกี่ยวกับการอ่าน"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: เกิดข้อผิดพลาดภายในของ bzip2 เกี่ยวกับการเขียน: '%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "เกิดข้อผิดพลาดที่ไม่คาดหมายของ bzip2"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
 "max=%d)"
 msgstr "ไดเรกทอรีปรับข้อมูลมีแฟ้ม `%.250s' ซึ่งชื่อยาวเกินไป (ความยาว=%d, ค่าสูงสุด=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr "ไดเรกทอรีปรับข้อมูลมีแฟ้มซึ่งมีชื่อยาวไม่เท่ากัน (ทั้ง %d และ %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "ไม่สามารถตรวจข้อมูลไดเรกทอรีปรับข้อมูล`%.255s'"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "ไม่สามารถลบแฟ้มปรับข้อมูล %.255s ที่รวมอยู่"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "ไม่สามารถสร้าง `%.255s'"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "ไม่สามารถเติม %.250s ด้วย padding"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "ไม่สามารถ flush %.250s หลังจากเติม padding"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "ไม่สามารถกรอไปยังต้นแฟ้ม %.250s หลังจากเติม padding"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "ไม่สามารถเปิดแฟ้มล็อค %s เพื่อทดสอบ"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "ไม่สามารถเปิด/สร้างแฟ้มล็อคสำหรับฐานข้อมูลสถานะ"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "คุณไม่มีสิทธิ์ล็อคฐานข้อมูลสถานะของ dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "ไม่สามารถล็อคฐานข้อมูลสถานะของ dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "การดำเนินการที่สั่งต้องอาศัยสิทธิ์ผู้ดูแลระบบ"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "ไม่สามารถเข้าใช้พื้นที่สถานะของ dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "การดำเนินการที่สั่งต้องอาศัยสิทธิ์อ่าน/เขียนในพื้นที่สถานะของ dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "ไม่สามารถลบแฟ้มปรับข้อมูล %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "ไม่สามารถเขียนสถานะใหม่ของ `%.250s'"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "ไม่สามารถ flush สถานะใหม่ของ `%.250s'"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "ไม่สามารถตัดท้ายเนื้อหาสถานะใหม่ของ `%.250s'"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "ไม่สามารถ fsync สถานะใหม่ของ `%.250s'"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "ไม่สามารถปิดสถานะใหม่ของ `%.250s'"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "ไม่สามารถติดตั้งสถานะใหม่ของ `%.250s'"
@@ -274,70 +280,72 @@
 msgid "unable to open directory '%s'"
 msgstr "ไม่สามารถเปิดแฟ้ม '%s'"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "ไม่สามารถเปิดแฟ้ม '%s'"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "ไม่สามารถ sync แฟ้ม '%s'"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "ไม่สามารถปิดแฟ้ม '%s'"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "ไม่สามารถเขียนรายละเอียดของ `%.50s' ลงใน `%.250s'"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "ไม่สามารถเปิด '%s' เพื่อเขียนฐานข้อมูล %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "ไม่สามารถกำหนดบัฟเฟอร์สำหรับแฟ้มฐานข้อมูล %s"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "ไม่สามารถเขียนระเบียนฐานข้อมูล %s เกี่ยวกับ '%.50s' ลงใน '%.250s'"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "ไม่สามารถ flush ฐานข้อมูล %s ลงใน '%.250s'"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "ไม่สามารถ fsync ฐานข้อมูล %s ลงใน '%.250s'"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "ไม่สามารถปิด '%.250s' หลังจากเขียนฐานข้อมูล %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "ไม่สามารถโยง '%.250s' ไปยัง '%.250s' สำหรับการสำรองฐานข้อมูล %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "ไม่สามารถติดตั้ง '%.250s' ในชื่อ '%.250s' เพื่อเก็บฐานข้อมูล %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -346,7 +354,7 @@
 "%s: เกิดข้อผิดพลาดที่ไม่สามารถกู้กลับได้ และจะจบการทำงาน:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -358,13 +366,13 @@
 "%s: เกิดข้อผิดพลาดที่ไม่สามารถกู้กลับได้ และจะจบการทำงาน:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "หน่วยความจำไม่พอสำหรับสร้างรายการเก็บกวาด"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -373,32 +381,32 @@
 "%s: เกิดข้อผิดพลาดขณะเก็บกวาด:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: มีข้อผิดพลาดซ้อนกันมากเกินไปขณะพยายามฟื้นคืนจากข้อผิดพลาด !!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "หน่วยความจำไม่พอสำหรับสร้างรายการเก็บกวาด"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "หน่วยความจำไม่พอสำหรับสร้างรายการเก็บกวาดที่มีอาร์กิวเมนต์หลายตัว"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s: คำเตือน: %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: คำเตือน: %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: เกิดข้อผิดพลาดภายใน: %s\n"
@@ -414,104 +422,104 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "`%.*s' มีใน %s ไม่ได้"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "มีขยะหลัง %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "ชื่อแพกเกจใช้ไม่ได้ (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "เขตข้อมูลรายละเอียดแฟ้ม `%s' ว่างเปล่า"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "มีเขตข้อมูลรายละเอียดแฟ้ม `%s' ในแฟ้มสถานะไม่ได้"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "มีข้อมูลจำนวนมากเกินไปในเขตข้อมูลรายละเอียดแฟ้ม `%s' (เมื่อเทียบกับข้อมูลอื่น)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "มีข้อมูลจำนวนน้อยเกินไปในเขตข้อมูลรายละเอียดแฟ้ม `%s' (เมื่อเทียบกับข้อมูลอื่น)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "yes/no ในเขตข้อมูลบูลีน"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "คำในเขตข้อมูล `priority'"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "ใช้ค่าสำหรับเขตข้อมูล `status' ไม่ได้ในบริบทนี้"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "คำแรก (want) ในเขตข้อมูล `status'"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "คำที่สอง (error) ในเขตข้อมูล `status'"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "คำที่สาม (status) ในเขตข้อมูล `status'"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "มีข้อผิดพลาดในสตริง Version '%.250s'"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "มีการใช้เขตข้อมูล `Revision' หรือ `Package-Revision' ซึ่งเลิกใช้แล้ว"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "ใช้ค่าสำหรับเขตข้อมูล `config-version' ไม่ได้ในบริบทนี้"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "มีข้อผิดพลาดในสตริง Config-Version '%.250s'"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "ค่าของ `conffiles' มีบรรทัดที่ผิดรูปแบบ `%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "ค่าของ `conffiles' มีบรรทัดที่ขึ้นต้นด้วยอักขระ `%c' ที่ไม่ใช่ช่องว่าง"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "มีการใช้ไดเรกทอรีรากหรือไดเรกทอรีไม่มีชื่อเป็น conffile"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr "เขตข้อมูล `%s' ขาดชื่อแพกเกจ หรือมีข้อมูลขยะในที่ที่ควรเป็นชื่อแพกเกจ"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "เขตข้อมูล `%s' มีชื่อแพกเกจที่ใช้ไม่ได้ `%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -520,7 +528,7 @@
 "เขตข้อมูล `%s' อ้างอิงไปยัง `%.255s':\n"
 " ความสัมพันธ์สำหรับเลขรุ่น %c%c ใช้ไม่ได้"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -529,7 +537,7 @@
 "เขตข้อมูล `%s' อ้างอิงไปยัง `%.255s':\n"
 " `%c' เลิกใช้แล้ว ใช้ `%c=' หรือ `%c%c' แทน"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -538,11 +546,11 @@
 "เขตข้อมูล `%s' อ้างอิงไปยัง `%.255s':\n"
 " การเทียบเลขรุ่นเท่ากันทุกประการแบบไม่ชัดแจ้ง ขอแนะนำให้ใช้ `=' แทน"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "ใช้เลขรุ่นตายตัวได้เท่านั้นใน Provides"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -551,55 +559,55 @@
 "เขตข้อมูล `%s' อ้างอิงไปยัง `%.255s':\n"
 " ค่าเลขรุ่นขึ้นต้นด้วยอักขระที่ไม่ใช่ตัวอักษรหรือตัวเลข ขอแนะนำให้เพิ่มช่องว่าง"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "เขตข้อมูล `%s' อ้างอิงไปยัง `%.255s': เลขรุ่นมีอักขระ `%c'"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "เขตข้อมูล `%s' อ้างอิงไปยัง `%.255s': เลขรุ่นยังไม่จบ"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "เขตข้อมูล '%s' อ้างอิงไปยัง '%.255s': มีข้อผิดพลาดในเลขรุ่น"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "เขตข้อมูล `%s' มีรูปแบบผิดไวยากรณ์หลังจากการอ้างถึงแพกเกจ `%.255s'"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "ใช้ทางเลือก (`|') ไม่ได้ในเขตข้อมูล %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "ใช้ค่าสำหรับเขตข้อมูล `triggers-pending' ไม่ได้ในบริบทนี้"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "ชื่อการสะกิดที่คั่งค้าง `%.255s' ใช้ไม่ได้: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "การสะกิดที่คั่งค้าง `%.255s' ซ้ำกัน"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "ใช้ค่าสำหรับเขตข้อมูล `triggers-awaited' ไม่ได้ในบริบทนี้"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "ชื่อแพกเกจผิดรูปแบบในการสะกิดที่รอคอย `%.255s': %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "การสะกิดที่รอคอย `%.255s' ซ้ำกัน"
@@ -656,7 +664,7 @@
 msgid "unable to write to status fd %d"
 msgstr "ไม่สามารถเขียนลงใน fd %d สำหรับสถานะ"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "realloc failed (%zu bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -667,8 +675,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc ไม่สำเร็จ (%zu ไบต์)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "จองหน่วยความจำไม่สำเร็จ"
 
@@ -701,198 +709,204 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "ไม่สามารถกำหนดแฟล็ก close-on-exec สำหรับ %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "ข้อผิดพลาดในค่าตั้ง: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "เปิดแฟ้มค่าตั้ง '%.255s' เพื่ออ่านไม่สำเร็จ: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "เครื่องหมายคำพูดเปิด-ปิดไม่สมดุลกันใน '%s'"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "ไม่รู้จักตัวเลือก '%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "'%s' ต้องระบุค่าด้วย"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "'%s' ไม่รับค่า"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "เกิดข้อผิดพลาดขณะอ่านแฟ้มค่าตั้ง `%.255s'"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "เกิดข้อผิดพลาดขณะปิดแฟ้มค่าตั้ง `%.255s'"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "เกิดข้อผิดพลาดขณะเปิดไดเรกทอรีค่าตั้ง '%s'"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "ไม่รู้จักตัวเลือก --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "ตัวเลือก --%s ต้องระบุค่าด้วย"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "ตัวเลือก --%s ไม่รับค่า"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "ไม่รู้จักตัวเลือก -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "ตัวเลือก -%c ต้องระบุค่าด้วย"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "ตัวเลือก -%c ไม่รับค่า"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "ตัวเลือก '--%s' เลิกใช้แล้ว\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "การกระทำขัดแย้งกันระหว่าง -%c (--%s) และ -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "ค่าของเขตข้อมูล `%s' ซ้ำกัน"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "ชื่อเขตข้อมูลกำหนดเอง `%.*s' สั้นเกินไป"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "ค่าของเขตข้อมูลกำหนดเอง `%.*s' ซ้ำกัน"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "มี Configured-Version สำหรับแพกเกจที่มีค่า Status ไม่เหมาะสม"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "แพกเกจอยู่ในสถานะ %s แต่มีการสะกิดที่รอคอยอยู่"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "แพกเกจอยู่ในสถานะ triggers-awaited แต่ไม่มีการสะกิดที่รอคอยอยู่"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "แพกเกจอยู่ในสถานะ %s แต่มีการสะกิดที่คั่งค้างอยู่"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "แพกเกจอยู่ในสถานะ triggers-pending แต่ไม่มีการสะกิดที่คั่งค้างอยู่"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "แพกเกจสถานะ not-installed มี conffile ดังนั้นจะลบข้อมูลทิ้ง"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "ไม่สามารถเปิดแฟ้มข้อมูลแพกเกจ `%.255s' เพื่ออ่าน"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "ไม่สามารถ stat แฟ้มข้อมูลแพกเกจ `%.255s'"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "ไม่สามารถ mmap แฟ้มข้อมูลแพกเกจ `%.255s'"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "ไม่สามารถ stat แฟ้มข้อมูลแพกเกจ `%.255s'"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "ไม่สามารถปิดหลังจากอ่าน: `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "พบ EOF หลังชื่อเขตข้อมูล `%.*s'"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "พบอักขระขึ้นบรรทัดใหม่ในชื่อเขตข้อมูล `%.*s'"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "พบ EOF ของ MSDOS (^Z) ในชื่อเขตข้อมูล `%.*s'"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "ชื่อเขตข้อมูล `%.*s' ต้องตามด้วยทวิภาค (:)"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "พบ EOF ก่อนค่าของเขตข้อมูล `%.*s' (ขาดอักขระขึ้นบรรทัดใหม่ปิดท้าย)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "พบ EOF ของ MSDOS ในค่าของเขตข้อมูล `%.*s' (ขาดอักขระขึ้นบรรทัดใหม่หรือเปล่า?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "พบอักขระขึ้นบรรทัดใหม่ในชื่อเขตข้อมูล `%.*s'"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "พบ EOF ระหว่างกลางค่าของเขตข้อมูล `%.*s' (ขาดอักขระขึ้นบรรทัดใหม่ปิดท้าย)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "พบข้อมูลแพกเกจหลายชุด ซึ่งต้องมีเพียงชุดเดียวเท่านั้น"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "ไม่สามารถปิดหลังจากอ่าน: `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "ไม่มีข้อมูลแพกเกจใน `%.255s'"
@@ -921,62 +935,62 @@
 "%s, ในแฟ้ม '%.255s' บริเวณบรรทัด %d:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "เป็นข้อความว่างเปล่าไม่ได้"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "ต้องขึ้นต้นด้วยอักษรหรือตัวเลข"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "ห้ามใช้อักขระ `%c' (ใช้ตัวอักษร ตัวเลข และอักขระ `%s' ได้เท่านั้น)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<ไม่มี>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "ข้อความเลขรุ่นว่างเปล่า"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "ข้อความเลขรุ่นมีช่องว่างภายใน"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "epoch ในเลขรุ่นไม่ใช่ตัวเลข"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "ไม่มีอะไรต่อท้ายทวิภาคในเลขรุ่น"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "พบอักขระห้ามใช้ในเลขรุ่น"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "พบอักขระห้ามใช้ในเลขฉบับแก้ไข"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "ขาด %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "%s เป็นค่าว่างเปล่า"
@@ -995,52 +1009,52 @@
 msgid "(no description available)"
 msgstr "(ไม่มีคำบรรยาย)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "ไม่สามารถกำหนดให้เพิกเฉยต่อสัญญาณ %s ก่อนเรียกทำงาน %.250s ได้"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "เกิดข้อผิดพลาดขณะเลิกดักสัญญาณ %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (โพรเซสย่อย): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "fork ไม่สำเร็จ"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "โพรเซสย่อย %s จบการทำงานโดยคืนค่าสถานะข้อผิดพลาด %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "คอยโพรเซสย่อย %s ไม่สำเร็จ"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "โพรเซสย่อย %s ถูกฆ่าด้วยสัญญาณ (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", มีการดัมป์หน่วยความจำ"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "โพรเซสย่อย %s ล้มเหลวด้วยรหัสสถานะการคอย %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "คอยโพรเซสย่อย %s ไม่สำเร็จ"
@@ -1060,78 +1074,70 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr "ไวยากรณ์ผิดพลาดในแฟ้มชะลอการสะกิด `%.250s' ที่อักขระ `%s'%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "ไม่สามารถเปิดหรือสร้างแฟ้มล็อคการสะกิด `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "ถูกสะกิดอยู่"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "ไม่สามารถ stat แฟ้มชะลอการสะกิด `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "ไม่สามารถเปิดแฟ้มชะลอการสะกิด `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "ไม่สามารถเปิดหรือสร้างแฟ้มชะลอการสะกิดแฟ้มใหม่ `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "เกิดข้อผิดพลาดขณะอ่านแฟ้มชะลอการสะกิด `%.255s'"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "ไม่สามารถเขียนแฟ้มชะลอการสะกิดแฟ้มใหม่ `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "ไม่สามารถปิดแฟ้มชะลอการสะกิดแฟ้มใหม่ `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "ไม่สามารถติดตั้งแฟ้มชะลอการสะกิดแฟ้มใหม่ `%.250s'"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "ไม่อนุญาตให้ใช้ชื่อการสะกิดที่ว่างเปล่า"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "ชื่อการสะกิดมีอักขระที่ห้ามใช้"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr "ชื่อการสะกิด `%.250s' ผิดรูปแบบ (ในการสะกิดที่สนใจสำหรับแพกเกจ `%.250s')"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "ไม่สามารถเปิดแฟ้มรายชื่อการสะกิดที่สนใจ `%.250s'"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "ไม่สามารถกรอแฟ้มรายชื่อการสะกิดที่สนใจ `%.250s' กลับ"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1140,83 +1146,89 @@
 "ไวยากรณ์ผิดพลาดในแฟ้มรายชื่อการสะกิดที่สนใจ `%.250s'; ชื่อแพกเกจผิดรูปแบบ `%.250s': "
 "%.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "ไม่สามารถสร้างแฟ้มรายชื่อการสะกิดที่สนใจแฟ้มใหม่ `%.250s'"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "ไม่สามารถเขียนแฟ้มรายชื่อการสะกิดที่สนใจแฟ้มใหม่ `%.250s'"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "ไม่สามารถ flush แฟ้มรายชื่อการสะกิดที่สนใจแฟ้มใหม่ '%.250s'"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "ไม่สามารถ sync แฟ้มรายชื่อการสะกิดที่สนใจแฟ้มใหม่ '%.250s'"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "ไม่สามารถปิดแฟ้มรายชื่อการสะกิดที่สนใจแฟ้มใหม่ `%.250s'"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "ไม่สามารถติดตั้งแฟ้มรายชื่อการสะกิดที่สนใจแฟ้มใหม่ `%.250s'"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "ไม่สามารถลบ `%.250s'"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "ไม่สามารถสร้างแฟ้มรายชื่อการสะกิดที่สนใจแฟ้มใหม่ `%.250s'"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "ไม่สามารถปิดแฟ้มรายชื่อการสะกิดที่สนใจแฟ้มใหม่ `%.250s'"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr "มีการสะกิดด้วยแฟ้มซ้ำกันสำหรับชื่อแฟ้ม `%.250s' และแพกเกจ `%.250s'"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "ไม่สามารถสร้างแฟ้มรายชื่อการสะกิดด้วยแฟ้มแฟ้มใหม่ `%.250s'"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "ไม่สามารถเขียนแฟ้มรายชื่อการสะกิดด้วยแฟ้มแฟ้มใหม่ `%.250s'"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "ไม่สามารถ flush แฟ้มรายชื่อการสะกิดด้วยแฟ้มแฟ้มใหม่ '%.250s'"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "ไม่สามารถ sync แฟ้มรายชื่อการสะกิดด้วยแฟ้มแฟ้มใหม่ '%.250s'"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "ไม่สามารถปิดแฟ้มรายชื่อการสะกิดด้วยแฟ้มแฟ้มใหม่ `%.250s'"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "ไม่สามารถติดตั้งแฟ้มรายชื่อการสะกิดด้วยแฟ้มแฟ้มใหม่ `%.250s'"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "ไม่สามารถอ่านแฟ้มรายชื่อการสะกิดด้วยแฟ้ม `%.250s'"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "ไวยากรณ์ผิดพลาดในแฟ้มรายชื่อการสะกิดด้วยแฟ้ม `%.250s'"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1225,7 +1237,7 @@
 "ระเบียนการสะกิดด้วยแฟ้มมีการกล่าวอ้างถึงชื่อแพกเกจที่ใช้ไม่ได้ `%.250s' (ในรายการสนใจแฟ้ม `"
 "%.250s'): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1233,30 +1245,38 @@
 msgstr ""
 "แฟ้มข้อมูลการสะกิด `%.250s' มีไวยากรณ์ของการสะกิดผิดพลาดในชื่อการสะกิด `%.250s': %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "ไม่สามารถเปิดแฟ้มข้อมูลการสะกิด `%.250s'"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "แฟ้มข้อมูลการสะกิดมีคำสั่งผิดไวยากรณ์"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "แฟ้มข้อมูลการสะกิดมีคำสั่ง `%.250s' ที่ไม่รู้จัก"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "ไม่สามารถสร้างไดเรกทอรีสถานะของการสะกิด `%.250s'"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "ไม่สามารถกำหนดเจ้าของให้กับไดเรกทอรีสถานะของการสะกิด `%.250s'"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "ไม่อนุญาตให้ใช้ชื่อการสะกิดที่ว่างเปล่า"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "ชื่อการสะกิดมีอักขระที่ห้ามใช้"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1281,7 +1301,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "เกิดข้อผิดพลาดขณะจัดรูปแบบข้อความลงในตัวแปร varbuf"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "เกิดข้อผิดพลาดขณะอ่านจากไปป์ของ dpkg-deb"
 
@@ -1300,12 +1320,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "เกิดข้อผิดพลาดขณะกำหนดเจ้าของของ symlink `%.255s'"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "เกิดข้อผิดพลาดขณะกำหนดเจ้าของของ `%.255s'"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "เกิดข้อผิดพลาดขณะกำหนดการอนุญาตสิทธิ์ของ `%.255s'"
@@ -1357,17 +1377,26 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "แพกเกจมีออบเจกต์ `%.255s' เป็นชนิด 0x%x ซึ่งไม่รู้จัก"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "ไม่สามารถ stat แฟ้ม '%s'"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "กำลังแทนที่แฟ้มในแพกเกจเก่าของ %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "ถูกแทนที่โดยแฟ้มในแพกเกจติดตั้งใหม่ของ %s ...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1375,92 +1404,97 @@
 msgstr ""
 "กำลังพยายามเขียนทับไดเรกทอรี '%.250s' ในแพกเกจ %.250s %.250s ด้วยสิ่งที่ไม่ใช่ไดเรกทอรี"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "กำลังพยายามเขียนทับ '%.250s' ซึ่งอยู่ในแพกเกจ %.250s %.250s เช่นกัน"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "สร้าง `%.255s' ไม่สำเร็จ (ระหว่างดำเนินการ `%.255s')"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "แบ็กเอนด์ dpkg-deb ระหว่าง `%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "เกิดข้อผิดพลาดขณะปิด/เขียน `%.255s'"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "เกิดข้อผิดพลาดขณะสร้างไปป์ `%.255s'"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "เกิดข้อผิดพลาดขณะสร้างอุปกรณ์ `%.255s'"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "เกิดข้อผิดพลาดขณะสร้าง hard link `%.255s'"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "เกิดข้อผิดพลาดขณะสร้าง symbolic link `%.255s'"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "เกิดข้อผิดพลาดขณะสร้างไดเรกทอรี `%.255s'"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "ไม่สามารถเปลี่ยนชื่อแฟ้ม `%.255s' ชั่วคราวเพื่อติดตั้งรุ่นใหม่ได้"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "ไม่สามารถอ่านลิงก์ `%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "ไม่สามารถสร้าง symlink สำรองสำหรับ `%.255s'"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "ไม่สามารถกำหนดเจ้าของของ symlink สำรองสำหรับ `%.255s'"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "ไม่สามารถสร้างลิงก์สำรองของ `%.255s' ก่อนติดตั้งรุ่นใหม่ได้"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "ไม่สามารถติดตั้งรุ่นใหม่ของ `%.255s'"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "ไม่สามารถเปิด '%.255s'"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "ไม่สามารถ sync แฟ้ม '%.250s'"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1469,7 +1503,7 @@
 "จะละเลยปัญหาความขึ้นต่อกันของแพกเกจในการ%s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1478,7 +1512,7 @@
 "จะพิจารณาถอนคืนค่าตั้งของแพกเกจจำเป็น\n"
 " %s เพื่อให้สามารถ%s"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1487,7 +1521,7 @@
 "dpkg: ไม่ได้ %s เป็นแพกเกจจำเป็น จะไม่ถอนคืนค่าตั้ง\n"
 " เพื่อให้สามารถ%s\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1496,28 +1530,28 @@
 "dpkg: ไม่ได้ ไม่สามารถดำเนินการ%s ต่อ (--auto-deconfigure ช่วยได้):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "ถอดถอน %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "ติดตั้ง %.250s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: จะพิจารณาถอนคืนค่าตั้งของ %s ซึ่งจะมีปัญหาเพราะการ%s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: ได้ จะถอนคืนค่าตั้งของ %s (มีปัญหาเพราะการ%s)\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1526,11 +1560,11 @@
 "dpkg: เกี่ยวกับ %s ซึ่งบรรจุ %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "จะละเลยการพังของแพกเกจ อาจดำเนินการต่อได้!"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1539,170 +1573,172 @@
 "การติดตั้ง %.250s จะทำให้ %.250s พัง และ\n"
 " ไม่ได้อนุญาตให้มีการถอนคืนค่าตั้ง (--auto-deconfigure ช่วยได้)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "การติดตั้ง %.250s จะทำให้ซอฟต์แวร์ที่มีอยู่พังได้"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: จะพิจารณาลบ %s เพื่อใช้ %s แทน ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s ไม่ได้ติดตั้งอย่างถูกต้อง - จะละเลยแพกเกจที่ต้องใช้แพกเกจดังกล่าว\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: อาจมีปัญหาในการถอดถอน %s เพราะแพกเกจดังกล่าวจัดเตรียม %s ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "requested.\n"
 msgstr "dpkg: แพกเกจ %s ต้องติดตั้งซ้ำ แต่จะถอดถอนตามที่คุณสั่ง\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: แพกเกจ %s ต้องติดตั้งซ้ำ จะไม่ถอดถอน\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: ได้ จะถอดถอน %s เพื่อใช้ %s\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "แพกเกจขัดแย้งกัน - จะไม่ติดตั้ง %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "จะละเลยความขัดแย้งระหว่างแพกเกจ อาจดำเนินการต่อได้!"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive ต้องมีอาร์กิวเมนต์เป็นพาธอย่างน้อยหนึ่งพาธ"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "find สำหรับ dpkg --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "fdopen ไปป์ของ find ไม่สำเร็จ"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "เกิดข้อผิดพลาดขณะอ่านไปป์ของ find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "เกิดข้อผิดพลาดขณะปิดไปป์ของ find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find สำหรับ --recursive คืนค่าข้อผิดพลาด %i ซึ่งยังไม่จัดการ"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "ค้นหาแล้ว แต่ไม่พบแพกเกจ (แฟ้มซึ่งตรงกับรูปแบบ *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s ต้องการอาร์กิวเมนต์เป็นแฟ้มแพกเกจอย่างน้อยหนึ่งแฟ้ม"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<เอาต์พุตมาตรฐาน>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<ช่องแสดงข้อผิดพลาดมาตรฐาน>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "กำลังเลือกแพกเกจ %s ที่เดิมไม่ได้เลือก\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "กำลังข้ามแพกเกจ %s ที่ไม่ได้เลือก\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "รุ่น %.250s ของ %.250s ถูกติดตั้งไว้แล้ว ขอข้าม\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "จะปรับรุ่น %.250s ลง จาก %.250s เป็น %.250s"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "จะไม่ปรับรุ่น %.250s ลง จากรุ่น %.250s เป็น %.250s ขอข้าม\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
 "of backup copy"
 msgstr "ไม่สามารถลบรุ่นที่ติดตั้งใหม่ของ `%.250s' เพื่อติดตั้งเนื้อหาที่สำรองไว้ได้"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "ไม่สามารถฟื้นคืนฉบับสำรองของ `%.250s'"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "ไม่สามารถลบฉบับสำรองของ '%.250s'"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "ไม่สามารถลบรุ่นที่ติดตั้งใหม่ของ `%.250s'"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "ไม่สามารถลบรุ่นที่แตกใหม่ของ `%.250s'"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "ไม่สามารถ stat แฟ้มค่าตั้ง '%.250s' ฉบับจัดแจกรุ่นใหม่"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "ไม่สามารถ stat แฟ้มค่าตั้ง `%.250s' ที่ติดตั้งในปัจจุบัน"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1713,57 +1749,57 @@
 "ไม่มีแฟ้มค่าตั้ง `%s' อยู่ในระบบ\n"
 "จะติดตั้งแฟ้มค่าตั้งแฟ้มใหม่ตามที่คุณสั่ง\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: ไม่สามารถลบแฟ้มสำรองเก่า '%.250s': %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: ไม่สามารถเปลี่ยนชื่อ '%.250s' เป็น '%.250s': %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: ไม่สามารถลบ '%.250s': %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: ไม่สามารถลบรุ่นจัดแจกรุ่นเก่า '%.250s': %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: ไม่สามารถลบ '%.250s' (ก่อนเขียนทับ): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: ไม่สามารถเชื่อมโยง '%.250s' ไปที่ '%.250s': %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "กำลังติดตั้งรุ่นใหม่ของแฟ้มค่าตั้ง %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "ไม่สามารถติดตั้ง `%.250s' ในชื่อ `%.250s'"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "ไม่มีแพกเกจชื่อ `%s' ติดตั้งไว้ ไม่สามารถตั้งค่าได้"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "แพกเกจ %.250s ถูกติดตั้งและตั้งค่าเรียบร้อยแล้ว"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1772,7 +1808,7 @@
 "แพกเกจ %.250s ไม่พร้อมสำหรับการตั้งค่า\n"
 " ไม่สามารถตั้งค่าได้ (สถานะปัจจุบัน `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1781,11 +1817,11 @@
 "dpkg: ปัญหาความขึ้นต่อกันระหว่างแพกเกจทำให้ไม่สามารถตั้งค่า %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ - จะทิ้งไว้โดยไม่ตั้งค่า"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1794,7 +1830,7 @@
 "dpkg: %s: มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ แต่จะตั้งค่าตามที่คุณสั่ง:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1802,12 +1838,12 @@
 "แพกเกจอยู่ในสถานะไม่ครบเต็มอย่างย่ำแย่ - คุณควรติดตั้งแพกเกจนี้ซ้ำ\n"
 " ก่อนที่จะพยายามตั้งค่าต่อไป"
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "กำลังตั้งค่า %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1816,7 +1852,7 @@
 "%s: ไม่สามารถ stat แฟ้มค่าตั้ง '%s'\n"
 " (= '%s'): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1825,7 +1861,7 @@
 "%s: แฟ้มค่าตั้ง '%s' เป็นลิงก์วนกลับ\n"
 " (= '%s')"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1834,7 +1870,7 @@
 "%s: ไม่สามารถอ่านลิงก์ของแฟ้มค่าตั้ง '%s'\n"
 " (= '%s'): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1843,33 +1879,33 @@
 "%s: แฟ้มค่าตั้ง '%.250s' ชี้ต่อๆ ไป กลายเป็นชื่อแฟ้มที่เสียหาย\n"
 " ('%s' เป็น symlink ไปยัง '%s')"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr "%s: แฟ้มค่าตั้ง '%.250s' ไม่ใช่แฟ้มธรรมดาหรือ symlink (= '%s')"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s: ไม่สามารถเปิดแฟ้มค่าตั้ง %s สำหรับทำ hash: %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "พิมพ์ `exit' เมื่อเสร็จแล้ว\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1878,12 +1914,12 @@
 "\n"
 "แฟ้มค่าตั้ง `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (ความจริงคือ `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1894,7 +1930,7 @@
 " ==> แฟ้มในระบบซึ่งคุณสร้างเองหรือสร้างโดยสคริปต์\n"
 " ==> แฟ้มซึ่งมากับแพกเกจและจัดเตรียมโดยผู้ดูแลแพกเกจ\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1903,7 +1939,7 @@
 "\n"
 "     ยังไม่มีการแก้ไขนับแต่ติดตั้งมา\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1912,7 +1948,7 @@
 "\n"
 " ==> มีการแก้ไข (โดยคุณหรือโดยสคริปต์) หลังการติดตั้ง\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1921,37 +1957,37 @@
 "\n"
 " ==> ถูกลบ (โดยคุณหรือโดยสคริปต์) หลังการติดตั้ง\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> ผู้จัดแจกแพกเกจได้จัดเตรียมรุ่นใหม่ให้\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     ฉบับในแพกเกจมีเนื้อหาเหมือนกับที่ติดตั้งครั้งล่าสุด\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> จะใช้แฟ้มใหม่ตามที่คุณสั่ง\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> จะใช้แฟ้มเดิมตามที่คุณสั่ง\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> จะใช้แฟ้มค่าตั้งเก่าโดยปริยาย\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> จะใช้แฟ้มค่าตั้งใหม่โดยปริยาย\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1966,157 +2002,159 @@
 "      D     : แสดงความแตกต่างระหว่างทั้งสองฉบับ\n"
 "      Z     : พักโพรเซสนี้ลงไปเบื้องหลังเพื่อตรวจสอบระบบ\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " การกระทำปริยายคือใช้ฉบับเดิมของคุณ\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " การกระทำปริยายคือติดตั้งฉบับใหม่\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[ปริยาย=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[ปริยาย=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[ไม่มีค่าปริยาย]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "เกิดข้อผิดพลาดขณะเขียน stderr พบข้อผิดพลาดนี้ก่อนถามเกี่ยวกับแฟ้มค่าตั้ง"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "เกิดข้อผิดพลาดในการอ่าน stdin ที่คำถามเกี่ยวกับแฟ้มค่าตั้ง"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "พบ EOF จาก stdin ที่คำถามเกี่ยวกับแฟ้มค่าตั้ง"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s ต้องใช้ %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s ต้องใช้ %s ขณะติดตั้ง"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s ควรใช้ร่วมกับ %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s แนะนำ %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s ทำให้ %s พัง"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s ขัดแย้งกับ %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s เพิ่มความสามารถให้กับ %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s จะถูกถอดถอน\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s จะถูกถอนคืนค่าตั้ง\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s จะถูกติดตั้ง แต่ใช้รุ่น %.250s\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s ถูกติดตั้งแล้ว แต่เป็นรุ่น %.250s\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s ถูกแตกแล้ว แต่ยังไม่เคยถูกตั้งค่า\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s ถูกแตกแล้ว แต่เป็นรุ่น %.250s\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s รุ่นสุดท้ายที่ตั้งค่าไว้คือ %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s %s\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s จัดเตรียม %.250s แต่กำลังจะถูกถอดถอน\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s จัดเตรียม %.250s แต่กำลังจะถูกถอนคืนค่าตั้ง\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s จัดเตรียม %.250s แต่%s\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s ไม่ได้ติดตั้งไว้\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (รุ่น %.250s) กำลังจะถูกติดตั้ง\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (รุ่น %.250s) มีอยู่ และ%s\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s จัดเตรียม %.250s และกำลังจะถูกติดตั้ง\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s จัดเตรียม %.250s และมีอยู่ และ%s\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "ใช้ --help เพื่อดูวิธีสอบถามข้อมูลแพกเกจ"
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2124,7 +2162,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "%s ของเดเบียน รุ่น %s\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2135,8 +2173,8 @@
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 "Copyright (C) 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2146,7 +2184,7 @@
 "นี่เป็นซอฟต์แวร์เสรี กรุณาอ่านเงื่อนไขการแจกจ่ายได้จาก GNU General Public License\n"
 "รุ่น 2 หรือใหม่กว่า ซอฟต์แวร์นี้ *ไม่มี* การรับประกันใดๆ\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2156,7 +2194,7 @@
 "วิธีใช้: %s [<ตัวเลือก> ...] <คำสั่ง>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2175,7 +2213,7 @@
 "  --truename <file>        แสดงแฟ้มที่เบนไป\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2204,7 +2242,7 @@
 "  --version                แสดงเลขรุ่น\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2216,17 +2254,12 @@
 "เมื่อจะลบการเบนแฟ้ม ถ้าระบุ --package หรือ --local และ --divert ก็ต้องระบุให้ตรงกันด้วย\n"
 "สคริปต์ preinst/postrm ของแพกเกจควรระบุ --package และ --divert เสมอ\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "ไม่สามารถ stat แฟ้ม '%s'"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "เกิดข้อผิดพลาดขณะตรวจสอบ '%s'"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2235,129 +2268,129 @@
 "การเปลี่ยนชื่อทำให้ต้องเขียนทับ `%s' ด้วย\n"
 "  แฟ้ม `%s' ที่เป็นคนละแฟ้ม ซึ่งไม่อนุญาต"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "ไม่สามารถเขียนแฟ้ม '%s'"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "การสำเนาแฟ้ม"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "ไม่สามารถเปลี่ยนชื่อ '%s' เป็น '%s'"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "rename: ลบลิงก์เดิม '%s' ซึ่งซ้ำกัน"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "ไม่สามารถเปิดแฟ้มต้นฉบับ `%.250s'"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "การเบนแฟ้มเป็นการภายในของ %s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "การเบนแฟ้มเป็นการภายในของ %s ไปยัง %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "การเบนแฟ้ม %s โดย %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "การเบนแฟ้ม %s ไปยัง %s โดย %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "การเบนแฟ้มใดๆ ของ %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "การเบนแฟ้มใดๆ ของ %s ไปยัง %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "ไม่สามารถสร้างแฟ้มใหม่ %s"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "ไม่สามารถ flush แฟ้ม '%s'"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "เกิดข้อผิดพลาดขณะลบ diversions-old ฉบับเดิม"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "เกิดข้อผิดพลาดขณะสร้าง diversions-old ฉบับใหม่"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "เกิดข้อผิดพลาดขณะติดตั้ง diversions ฉบับใหม่"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s ต้องการอาร์กิวเมนต์แค่รายการเดียว"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "ชื่อแฟ้ม \"%s\" ไม่ใช่พาธเต็ม"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "ชื่อแฟ้มห้ามมีอักขระขึ้นบรรทัดใหม่"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "ไม่สามารถเบนไดเรกทอรี"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "ไม่สามารถเบนแฟ้ม '%s' เข้าหาตัวเองได้"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "จะคง '%s' ไว้\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' ชนกับ `%s'"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "กำลังเพิ่ม '%s'\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "ไม่มีการเบน '%s' จึงไม่มีการลบรายการใด\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2368,7 +2401,7 @@
 "  ขณะลบ `%s'\n"
 "  พบ `%s'"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2379,16 +2412,16 @@
 "  ขณะลบ `%s'\n"
 "  พบ `%s'"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "กำลังลบ '%s'\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "ชื่อแพกเกจห้ามมีอักขระขึ้นบรรทัดใหม่"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "divert-to ห้ามมีอักขระขึ้นบรรทัดใหม่"
 
@@ -2469,8 +2502,8 @@
 "โดยใช้ dselect หรือ dpkg --configure --pending (หรือ dpkg --triggers-only):\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s ไม่รับอาร์กิวเมนต์"
@@ -2563,7 +2596,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions พบเครื่องหมายเปรียบเทียบที่ผิด"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "รุ่น '%s' ผิดรูปแบบ: %s"
@@ -2616,80 +2649,80 @@
 msgid "overriding problem because --force enabled:"
 msgstr "จะข้ามปัญหาไปเพราะมีการเปิดตัวเลือก --force:"
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "ไม่สามารถเปิดแฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s'"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
 "currently installed."
 msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s' ขาดหายไป จะถือว่าแพกเกจไม่ได้ติดตั้งแฟ้มใดในระบบ"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "ไม่สามารถ stat แฟ้มรายชื่อแฟ้มของแพกเกจ '%.250s'"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "รายชื่อแฟ้มของแพกเกจ `%.250s'"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ '%.250s' ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s' มีชื่อแฟ้มว่างเปล่า"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "เกิดข้อผิดพลาดขณะปิดแฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s'"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(กำลังอ่านฐานข้อมูล ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "%d แฟ้มและไดเรกทอรีติดตั้งอยู่)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "ไม่สามารถสร้างแฟ้มรายชื่อแฟ้มฉบับใหม่สำหรับแพกเกจ %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "ไม่สามารถเขียนแฟ้มรายชื่อแฟ้มฉบับใหม่สำหรับแพกเกจ %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "ไม่สามารถ flush แฟ้มรายชื่อแฟ้มฉบับใหม่สำหรับแพกเกจ %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "ไม่สามารถ sync แฟ้มรายชื่อแฟ้มฉบับใหม่สำหรับแพกเกจ %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "ไม่สามารถปิดแฟ้มรายชื่อแฟ้มฉบับใหม่สำหรับแพกเกจ %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "ไม่สามารถติดตั้งแฟ้มรายชื่อแฟ้มฉบับใหม่สำหรับแพกเกจ %s"
@@ -2727,7 +2760,9 @@
 msgstr "ติดตั้งอยู่"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "ผิดพลาด: ไม่ได้ตั้งค่า PATH"
 
 #: src/help.c:129
@@ -2767,7 +2802,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2779,65 +2814,65 @@
 msgstr "ไม่สามารถ chroot ไปยัง `%.250s'"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "เปลี่ยนไดเรกทอรีไปยัง `%.255s' ไม่สำเร็จ"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "ไม่สามารถกำหนดสิทธิ์การเรียกทำงานให้กับ `%.250s'"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "ไม่สามารถ setenv สำหรับสคริปต์ผู้ดูแลแพกเกจ"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "สคริปต์ %s ที่ติดตั้งไว้"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "ไม่สามารถ stat %s `%.250s'"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "สคริปต์ %s อันใหม่"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "สคริปต์ %s อันเก่า"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "ไม่สามารถ stat %s '%.250s': %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - จะลองใช้สคริปต์จากแพกเกจใหม่แทน ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "ไม่มีสคริปต์ในแพกเกจรุ่นใหม่ - ขอยกเลิก"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... ทุกอย่างดูจะเรียบร้อยดี\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "ไม่สามารถลบ '%.255s' อย่างปลอดภัยได้"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2846,7 +2881,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "ไม่สามารถตรวจสอบการมีอยู่ของ `%.250s'"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "ไม่สามารถอ่านไดเรกทอรี info"
 
@@ -2912,7 +2947,7 @@
 "  -Dh|--debug=help                 แสดงวิธีใช้ตัวเลือกสำหรับการดีบั๊กทั้งหลาย\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3031,7 +3066,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr "ใช้ `dselect' หรือ `aptitude' หากต้องการการจัดการแพกเกจแบบสะดวกผู้ใช้\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3079,30 +3114,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3111,103 +3150,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "มีปัญหาความขึ้นต่อกันของแพกเกจ - จะไม่ถอดถอน"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "มีปัญหาความขึ้นต่อกันของแพกเกจ - จะไม่ถอดถอน"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "ไม่สามารถ setenv สำหรับสคริปต์ผู้ดูแลแพกเกจ"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "เกิดข้อผิดพลาดขณะอ่านแฟ้มค่าตั้ง `%.255s'"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3215,7 +3254,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3223,37 +3262,37 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug ต้องมีอาร์กิวเมนต์เป็นเลขฐานแปด"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "ชื่อแพกเกจว่างเปล่าในรายการคั่นด้วยจุลภาคของตัวเลือก --ignore-depends `%.250s'"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends ต้องการชื่อแพกเกจที่ถูกต้อง แต่ `%.250s' ไม่ถูกต้อง; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ค่าจำนวนเต็มผิดพลาดสำหรับ --%s: `%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "เกิดข้อผิดพลาดขณะเรียกทำงาน hook '%s' โดยจบการทำงานด้วยรหัส %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "สถานะ"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3262,7 +3301,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3270,12 +3309,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ไม่รู้จักตัวเลือก force/refuse `%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "ตัวเลือก force/refuse '%s' เลิกใช้แล้ว\n"
@@ -3298,8 +3337,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "แฟ้มจบก่อนที่จะจบบรรทัดที่บรรทัด %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "ต้องมีตัวเลือกระบุการกระทำด้วย"
 
@@ -3461,85 +3500,85 @@
 msgid "passed\n"
 msgstr "ผ่าน\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "ไม่สามารถสร้างไดเรกทอรีชั่วคราว"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "แพกเกจ %s มีคู่แพกเกจขัดแย้ง/แทนที่มากเกินไป"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr "แพกเกจรุ่นเก่ามีแฟ้ม info ชื่อยาวเกินไป ซึ่งขึ้นต้นด้วย `%.250s'"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "ไม่สามารถลบแฟ้ม info `%.250s' ที่เลิกใช้แล้ว"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "ไม่สามารถติดตั้งแฟ้ม info `%.250s' (ที่น่าจะเป็น) ฉบับใหม่"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "ไม่สามารถเปิดไดเรกทอรีควบคุมชั่วคราว"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr "แพกเกจมีแฟ้มข้อมูลควบคุมชื่อยาวเกินไป (ขึ้นต้นด้วย `%.250s')"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "ข้อมูลควบคุมของแพกเกจมีไดเรกทอรี `%.250s'"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "การสั่ง rmdir กับ `%.250s' ในข้อมูลควบคุมของแพกเกจ ไม่ได้ตอบว่าไม่ใช่ไดเรกทอรี"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "แพกเกจ %s มีแฟ้ม list เป็นข้อมูลควบคุม"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "ไม่สามารถติดตั้งแฟ้มควบคุมใหม่ `%.250s' เป็น `%.250s'"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "ไม่สามารถลบแฟ้มควบคุม `%.250s'"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "ไม่สามารถเข้าใช้แฟ้มแพกเกจ"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "ไม่สามารถสร้างไดเรกทอรีชั่วคราว"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "ความยาวข้อมูลควบคุม"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "บันทึกข้อมูลเกี่ยวกับ %s จาก %s\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "สถาปัตยกรรมของแพกเกจ (%s) ไม่ตรงกับของระบบ (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3548,111 +3587,111 @@
 "dpkg: เกี่ยวกับ %s ที่บรรจุ %s: มีปัญหาของสิ่งที่ต้องใช้ขณะติดตั้ง:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "มีปัญหาของสิ่งที่ต้องใช้ขณะติดตั้ง - จะไม่ติดตั้ง %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "จะละเลยปัญหาของสิ่งที่ต้องใช้ขณะติดตั้ง!"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "กำลังเตรียมแทนที่ %s %s (ด้วย %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "กำลังแตก %s (จาก %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "ชื่อของแฟ้มค่าตั้ง (ขึ้นต้นด้วย `%.250s') ยาวเกินไป (>%d ตัวอักษร)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "เกิดข้อผิดพลาดขณะอ่าน %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "เกิดข้อผิดพลาดขณะปิด %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "เกิดข้อผิดพลาดขณะพยายามเปิด %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "กำลังถอนคืนค่าตั้งของ %s เพื่อให้สามารถถอดถอน %s ได้ ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "กำลังถอนคืนค่าตั้งของ %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "กำลังแตกแพกเกจแทนที่ %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "การแยกเอาค่าเขตข้อมูลด้วย dpkg-deb"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "เกิดข้อผิดพลาดขณะอ่านผลลัพธ์ของ tar จาก dpkg-deb"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "แฟ้ม tar สำหรับแฟ้มที่จะติดตั้งในระบบแฟ้มเสียหาย - แฟ้มแพกเกจเสียหาย"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: ตัดไบต์ศูนย์ทั้งหลายข้างท้ายที่อาจจะมี"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "ไม่สามารถ stat แฟ้มเก่า '%.250s' จึงจะไม่มีการลบแฟ้มดังกล่าว: %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "ไม่สามารถลบไดเรกทอรีเก่า '%.250s': %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr "แฟ้มค่าตั้งเดิม '%.250s' เป็นไดเรกทอรีว่างเปล่า (และตอนนี้ถูกลบไปแล้ว)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "ไม่สามารถ stat แฟ้มใหม่ `%.250s'"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
 "'%.250s')"
 msgstr "แฟ้มเก่า '%.250s' เป็นแฟ้มเดียวกับแฟ้มใหม่หลายแฟ้ม! (ทั้ง '%.250s' และ '%.250s')"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "ไม่สามารถลบแฟ้มเก่า '%.250s' อย่างปลอดภัยได้: %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(สังเกตการหายไปของ %s ซึ่งถูกแทนที่อย่างสมบูรณ์)\n"
@@ -3829,7 +3868,7 @@
 "  -f|--showformat=<รูปแบบ>          ใช้รูปแบบอื่นสำหรับ --show\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3849,6 +3888,10 @@
 "  การแสดงเขตข้อมูลจะเรียงชิดขวาเสมอ นอกจากจะใช้ความกว้างเป็นลบ จึงจะเรียง\n"
 "  ชิดซ้าย\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "ใช้ --help เพื่อดูวิธีสอบถามข้อมูลแพกเกจ"
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3907,7 +3950,7 @@
 msgid "Removing %s ...\n"
 msgstr "กำลังถอดถอน %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3916,46 +3959,47 @@
 "ขณะถอดถอน %.250s ปรากฏว่าไม่สามารถลบไดเรกทอรี '%.250s': %s - "
 "ไดเรกทอรีอาจเป็นจุดเมานท์หรือไม่?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "ไม่สามารถลบ `%.250s'"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "ไม่สามารถลบ '%.250s' อย่างปลอดภัยได้"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr "ขณะถอดถอน %.250s ปรากฏว่าไดเรกทอรี `%.250s' มีข้อมูลเหลืออยู่ จึงไม่ลบไดเรกทอรีนี้"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "ไม่สามารถลบ `%.250s'"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "กำลังลบแฟ้มค่าตั้งของ %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "ไม่สามารถลบแฟ้มค่าตั้งเก่า `%.250s' (= `%.250s')"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "ไม่สามารถอ่านไดเรกทอรีแฟ้มค่าตั้ง `%.250s' (จาก `%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr "ไม่สามารถลบแฟ้มค่าตั้งสำรองเก่า `%.250s' (ของ `%.250s')"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "ไม่สามารถลบรายชื่อแฟ้มเก่า"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "ไม่สามารถลบสคริปต์ postrm เก่า"
 
@@ -3998,7 +4042,13 @@
 msgid "read error on standard input"
 msgstr "การอ่านข้อมูลผิดพลาดที่อินพุตมาตรฐาน"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "ใช้ --help เพื่อดูวิธีสอบถามข้อมูลแพกเกจ"
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4007,7 +4057,7 @@
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4024,7 +4074,7 @@
 "  --list [<glob-pattern>]  แสดงรายชื่อ override ปัจจุบันในฐานข้อมูล\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4045,31 +4095,31 @@
 "  --version                แสดงเลขรุ่น\n"
 "\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "จะตัด / ที่ท้ายชื่อ"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "ไม่สามารถเปิดแฟ้ม statoverride ฉบับใหม่"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "เกิดข้อผิดพลาดขณะลบ statoverride-old"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "เกิดข้อผิดพลาดขณะสร้าง statoverride-old ฉบับใหม่"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "เกิดข้อผิดพลาดขณะติดตั้ง statoverride ฉบับใหม่"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add ต้องการอาร์กิวเมนต์สี่รายการ"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4077,21 +4127,21 @@
 msgstr ""
 "มีรายการ override สำหรับ '%s' อยู่ก่อนแล้ว แต่มีการระบุ --force ดังนั้นเราจะละเลยข้อสังเกตนี้"
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "มีรายการ override สำหรับ '%s' อยู่ก่อนแล้ว ขอยกเลิก"
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "สั่ง --update แต่ไม่มีแฟ้ม %s อยู่"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "ไม่มีรายการ override อยู่"
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "--update ไม่มีประโยชน์อะไรสำหรับ --remove"
 
@@ -4156,16 +4206,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "มีรายการ statoverride หลายรายการสำหรับ '%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "พิมพ์ dpkg-trigger --help เพื่อดูวิธีใช้โปรแกรมนี้"
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "เครื่องมือสะกิดแพกเกจ %s ของเดเบียน รุ่น %s\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4176,7 +4226,7 @@
 "      %s [<ตัวเลือก> ...] <คำสั่ง>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4188,7 +4238,7 @@
 "  --check-supported                ตรวจสอบว่า dpkg ที่มีอยู่รองรับการสะกิดหรือไม่\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4208,21 +4258,21 @@
 "  --no-act                         แค่ทดสอบเท่านั้น - ไม่ต้องเปลี่ยนแปลงจริง\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: ยังไม่ได้สร้างไดเรกทอรีข้อมูลการสะกิด\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: ยังไม่มีระเบียนการสะกิด\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "รับอาร์กิวเมนต์แค่ตัวเดียว คือชื่อของการสะกิด"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4231,13 +4281,13 @@
 msgstr ""
 "dpkg-trigger ใช้เรียกจากสคริปต์ผู้ดูแลแพกเกจเท่านั้น (หรือโดยใช้ตัวเลือก --by-package)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: ชื่อแพกเกจที่รอคอย `%.255s' ใช้ไม่ได้: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "ชื่อการสะกิด `%.255s' ไม่ถูกต้อง: %.250s"
@@ -4270,35 +4320,36 @@
 msgstr "กำลังประมวลผลการสะกิดสำหรับ %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s ต้องการอาร์กิวเมนต์เป็นชื่อแฟ้ม Packages รายการเดียว"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr "ไม่สามารถเข้าใช้บริเวณเก็บข้อมูลสถานะของ dpkg เพื่อปรับข้อมูลแพกเกจที่มีแบบทั้งชุด"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr "การปรับข้อมูลแพกเกจที่มีแบบทั้งชุดต้องอาศัยสิทธิ์การเขียนในบริเวณเก็บข้อมูลสถานะของ dpkg"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "กำลังแทนที่ข้อมูลแพกเกจที่มี โดยใช้ %s\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "กำลังปรับข้อมูลแพกเกจที่มี โดยใช้ %s\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "ปรับข้อมูลแพกเกจจำนวน %d แพกเกจเรียบร้อยแล้ว\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4408,8 +4459,8 @@
 msgid_plural "ignoring %d warnings about the control file(s)\n"
 msgstr[0] "จะละเลยคำเตือน %d รายการเกี่ยวกับแฟ้มควบคุม\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s ต้องการอาร์กิวเมนต์ <directory>"
@@ -4441,26 +4492,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: กำลังสร้างแพกเกจ `%s' ใน `%s'\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "สร้างแฟ้มชั่วคราว (data) ไม่สำเร็จ"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "ข้อมูลส่วนควบคุม"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "ลบแฟ้มชั่วคราว (data) ไม่สำเร็จ: %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4477,20 +4528,20 @@
 msgid "error writing `%s'"
 msgstr "เกิดข้อผิดพลาดขณะเขียน `%s'"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "รอยต่อสมาชิก"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "เขียนชื่อแฟ้มลงไปป์ไปยัง tar ไม่สำเร็จ (data)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<บีบอัด> จาก tar -cf"
 
@@ -4508,76 +4559,76 @@
 msgid "error reading %s from file %.255s"
 msgstr "เกิดข้อผิดพลาดขณะอ่าน%sจากแฟ้ม %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "อ่านแพกเกจ `%.255s' ไม่สำเร็จ"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "fstat แพกเกจไม่สำเร็จ"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "แพกเกจไม่มีจุดในเลขรุ่น"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "แพกเกจไม่มีอักขระขึ้นบรรทัดใหม่ในข้อมูลส่วนหัว"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "แฟ้ม `%.250s' เสียหาย - หมายเลขส่วนย่อยเป็นค่าที่ใช้ไม่ได้"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "แฟ้ม `%.250s' ไม่ใช่แพกเกจไบนารีของเดเบียน (ลอง dpkg-split ไหม?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "แพกเกจไม่มีจุดในเลขรุ่น"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "แพกเกจไม่มีอักขระขึ้นบรรทัดใหม่ในข้อมูลส่วนหัว"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "แพกเกจไม่มีจุดในเลขรุ่น"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "ไม่เข้าใจรุ่นแพกเกจ %.250s กรุณาใช้ dpkg-deb รุ่นใหม่"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "จะข้ามข้อมูลสมาชิกใน %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "แฟ้ม `%.250s' มีข้อมูลสมาชิก %.*s ที่ไม่เข้าใจ ขอยกเลิก"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "แฟ้ม `%.250s' มีสมาชิกข้อมูลควบคุมสองชุด ขอยกเลิก"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4589,23 +4640,23 @@
 " แพกเกจเดเบียนแบบใหม่, รุ่น %s\n"
 " ขนาด %ld ไบต์: ชุดข้อมูลควบคุม= %zi ไบต์\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "แพกเกจมีความยาวข้อมูลควบคุมผิดรูปแบบ `%s'"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "จะข้ามข้อมูลสมาชิกใน %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4617,7 +4668,7 @@
 " แพกเกจเดเบียนแบบเก่า, รุ่น %s\n"
 " ขนาด %ld ไบต์: ชุดข้อมูลควบคุม= %zi, ชุดข้อมูลหลัก= %ld\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4626,49 +4677,50 @@
 "dpkg-deb: แฟ้มดูเหมือนจะเป็นแพกเกจที่ได้รับความเสียหายขณะดาวน์โหลด\n"
 "dpkg-deb:    ในโหมด ASCII\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' ไม่ใช่แพกเกจในรูปแบบของเดเบียน"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "เขียนลงไปป์ไม่สำเร็จใน copy"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "ปิดไปป์ไม่สำเร็จใน copy"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "เปลี่ยนเข้าไดเรกทอรีไม่สำเร็จ"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "สร้างไดเรกทอรีไม่สำเร็จ"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "เปลี่ยนเข้าไดเรกทอรีหลังจากสร้างแล้วไม่สำเร็จ"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "เปลี่ยนเข้าไดเรกทอรีไม่สำเร็จ"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<คลายบีบอัด>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "แปะ"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s ต้องมีอาร์กิวเมนต์เป็นชื่อแฟ้ม .deb ด้วย"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4677,95 +4729,95 @@
 "--%s ต้องระบุไดเรกทอรีปลายทางด้วย\n"
 "บางที คุณควรใช้ dpkg --install ไหม?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s รับอาร์กิวเมนต์ไม่เกินสองตัว (.deb และไดเรกทอรี)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s รับอาร์กิวเมนต์แค่ตัวเดียว (ชื่อแฟ้ม .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "ไม่สามารถ chdir ไปยัง `/' เพื่อเก็บกวาด"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "ไม่สามารถ stat แฟ้ม '%s'"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: `%.255s' ไม่มีองค์ประกอบส่วนควบคุม `%.255s'\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr "เปิดองค์ประกอบ `%.255s' (ใน %.255s) ไม่สำเร็จ โดยได้ผลลัพธ์ที่ไม่คาดคิด"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "องค์ประกอบส่วนควบคุมขาดหายไป %d รายการ"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "ไม่สามารถตรวจข้อมูลไดเรกทอรี `%.255s'"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "ไม่สามารถ stat `%.255s' (ใน `%.255s')"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "ไม่สามารถเปิด `%.255s' (ใน `%.255s')"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "อ่าน `%.255s' ไม่สำเร็จ (ใน `%.255s')"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld ไบต์, %5d บรรทัด   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     ไม่ใช่แฟ้มปกติ                %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(ไม่มีแฟ้ม `control' ในแฟ้มจัดเก็บของส่วนควบคุม!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "ไม่สามารถเปิดองค์ประกอบ `control'"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "เกิดข้อผิดพลาดขณะอ่านองค์ประกอบ `control'"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "เกิดข้อผิดพลาดขณะปิดองค์ประกอบ '%s'"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "มีข้อผิดพลาดในรูปแบบข้อมูล"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents รับอาร์กิวเมนต์ตัวเดียว"
 
@@ -4775,7 +4827,19 @@
 msgstr "แบ็กเอนด์จัดการแพกเกจ `%s' ของเดเบียน รุ่น %s\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4786,6 +4850,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4801,7 +4867,7 @@
 "  --fsys-tarfile <deb>             แสดงแฟ้ม tar ที่ใช้ติดตั้งแฟ้มในระบบ\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4814,11 +4880,27 @@
 "<cfield> คือชื่อเขตข้อมูลในแฟ้ม `control' หลัก\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4841,7 +4923,7 @@
 "                                     ค่าที่ใช้ได้: gzip, xz, bzip2, lzma, none\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4854,7 +4936,7 @@
 "`dselect' หรือ `aptitude' ถ้าต้องการการจัดการแพกเกจแบบเป็นมิตรกับผู้ใช้\n"
 "แพกเกจที่แตกด้วยคำสั่ง `dpkg-deb --extract' จะติดตั้งไม่ถูกต้อง !\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4862,17 +4944,17 @@
 "พิมพ์ dpkg-deb --help เพื่อดูวิธีจัดการแฟ้ม *.deb;\n"
 "พิมพ์ dpkg --help เพื่อดูวิธีติดตั้งและถอดถอนแพกเกจ"
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "ค่าจำนวนเต็มผิดพลาดสำหรับ -%c: '%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "ค่าระดับการบีบอัดผิดพลาดสำหรับ -%c: %ld"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ไม่รู้จักชนิดของการบีบอัด `%s'!"
@@ -4892,7 +4974,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "แฟ้ม `%.250s' เสียหาย - ขาด newline หลัง %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "เกิดข้อผิดพลาดขณะอ่าน %.250s"
@@ -4984,47 +5066,53 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "แฟ้ม `%.250s' เสียหาย - หมายเลขส่วนย่อยเป็นค่าที่ใช้ไม่ได้"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "ชื่อแพกเกจ"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr "แฟ้ม `%.250s' เสียหาย - ค่ารหัสเอกลักษณ์ที่ข้อมูลส่วนหัวส่วนที่สองไม่ถูกต้อง"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "แฟ้ม `%.250s' เสียหาย - สมาชิกที่สองไม่ใช่สมาชิกที่เป็นข้อมูล"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr "แฟ้ม `%.250s' เสียหาย - จำนวนส่วนย่อยไม่ถูกต้องใน quoted size"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "แฟ้ม `%.250s' เสียหาย - ขนาดไม่ถูกต้องใน quoted part number"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "ไม่สามารถ fstat แฟ้มส่วนย่อย `%.250s'"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "แฟ้ม `%.250s' เสียหาย - สั้นเกินไป"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "ไม่สามารถเปิดแฟ้มส่วนย่อยของแฟ้มจัดเก็บ `%.250s'"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "แฟ้ม `%.250s' ไม่ใช่ส่วนย่อยของแฟ้มจัดเก็บ"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5044,6 +5132,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5066,12 +5155,19 @@
 "    ขนาดของแฟ้มส่วนย่อย (ส่วนที่ใช้):      %lu ไบต์\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<ไม่ทราบ>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s ต้องการอาร์กิวเมนต์ที่เป็นแฟ้มส่วนย่อยตั้งแต่หนึ่งรายการขึ้นไป"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "แฟ้ม `%s' ไม่ใช่ส่วนย่อยของแฟ้มจัดเก็บ\n"
@@ -5105,7 +5201,7 @@
 msgid "split package part"
 msgstr "กำลังประกอบแพกเกจ %s เข้าด้วยกันจากส่วนย่อย %d ส่วน: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "เสร็จ\n"
@@ -5157,17 +5253,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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"
 "  --depotdir <directory>           ใช้ <directory> แทน %s/%s\n"
@@ -5179,20 +5284,29 @@
 "\n"
 "สถานะการจบการทำงาน: 0 = OK;  1 = -a ไม่ใช่ส่วนย่อย;  2 = มีปัญหา!\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "พิมพ์ dpkg-split --help เพื่อดูวิธีใช้"
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "พบจุดจบแฟ้มก่อนกำหนดใน %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "ขนาดของส่วนย่อยใหญ่เกินไป หรือไม่ใช่ค่าบวก"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "ขนาดของส่วนย่อยต้องมีค่าอย่างน้อย %dKiB (เพื่อให้เก็บข้อมูลส่วนหัวได้)"
@@ -5303,27 +5417,27 @@
 msgid "Deleted %s.\n"
 msgstr "ลบ %s แล้ว\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "การแยกเอาค่าเขตข้อมูลด้วย dpkg-deb"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "ไม่สามารถเปิดแฟ้มต้นฉบับ `%.250s'"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "ไม่สามารถ stat แฟ้มต้นฉบับ"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "แฟ้มต้นฉบับ `%.250s' ไม่ใช่แฟ้มปกติ"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5331,17 +5445,17 @@
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] "กำลังประกอบแพกเกจ %s เข้าด้วยกันจากส่วนย่อย %d ส่วน: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split ต้องการอาร์กิวเมนต์ที่เป็นชื่อแฟ้มต้นฉบับ"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "--split รับอาร์กิวเมนต์เป็นชื่อแฟ้มต้นฉบับและชื่อขึ้นต้นของปลายทางอย่างละหนึ่งรายการเท่านั้น"
@@ -5509,350 +5623,355 @@
 "  --version                แสดงเลขรุ่น\n"
 "\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "ข้อผิดพลาด"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "คำเตือน"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "ไม่สามารถ stat %s: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "readlink(%s) ไม่สำเร็จ: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "มีการระบุคำสั่งสองคำสั่ง: --%s และ --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "ไม่สามารถเขียนต่อท้าย %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "ตรวจข้อมูล %s ไม่สำเร็จ: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "ไม่สามารถเรียกทำงาน %s: %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "ไม่สามารถสร้าง %s ให้เป็น symlink ไปยัง %s: %s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "ไม่สามารถติดตั้ง %s เป็น %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "ไม่สามารถลบ %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "พบจุดจบแฟ้มก่อนกำหนดขณะพยายามอ่าน %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "ขณะอ่าน %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "พบบรรทัดที่ไม่ได้ปิดท้ายขณะพยายามอ่าน %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s เสียหาย: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "ห้ามใช้อักขระขึ้นบรรทัดใหม่ในแฟ้มสำหรับ update-alternatives (%s)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "ขณะเขียน %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "ชื่อรายการลูก"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "รายการลูก %s ซ้ำ"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "ลิงก์ลูก"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "ลิงก์ลูกซ้ำกับลิงก์หลัก %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "ลิงก์ลูก %s ซ้ำ"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "แฟ้มหลัก"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "พาธ %s ซ้ำ"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr "ทางเลือก %s (ซึ่งเป็นส่วนหนึ่งของกลุ่มลิงก์ %s) ไม่มีอยู่ จะลบออกจากรายชื่อแฟ้มทางเลือก"
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "ลำดับความสำคัญ"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "แฟ้มลูก"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "ลำดับความสำคัญของ %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "ไม่สามารถอ่าน %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "สถานะ"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "สถานะผิดพลาด"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "ลิงก์หลัก"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "ไม่สามารถปิด %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "จะทิ้งลิงก์ลูกที่เลิกใช้แล้ว %s (%s)"
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "ไม่สามารถเขียน %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "โหมดอัตโนมัติ"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "โหมดสั่งเอง"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "  ลิงก์ขณะนี้ชี้ไปยัง %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "  ลิงก์ขาดหายอยู่"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - ความสำคัญ %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  รายการลูก %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "ทางเลือกที่ 'ดีที่สุด' ในขณะนี้คือ '%s'"
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "ไม่มีทางเลือกอยู่"
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "มีตัวเลือก %d ตัวสำหรับทางเลือก %s (ซึ่งจัดเตรียม %s)"
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "การเลือก"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "พาธ"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "ความสำคัญ"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "สถานะ"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr "กด enter เพื่อคงค่าปัจจุบัน[*] หรือพิมพ์หมายเลขของตัวเลือก: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "จะไม่แทนที่ %s ด้วยลิงก์"
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "ไม่สามารถติดตั้งตัวเลือก %s ที่ไม่รู้จัก"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr "ข้ามการสร้าง %s เพราะแฟ้ม %s (ซึ่งอยู่ในกลุ่มลิงก์ %s) ที่เชื่อมโยงอยู่ไม่มีอยู่"
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "จะไม่แทนที่ %s ด้วยลิงก์"
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "เรียก %s"
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "ทางเลือก %s ไม่มีการเปลี่ยนแปลง เพราะตัวเลือก %s ไม่มีอยู่"
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "ข้ามทางเลือก %s ที่ไม่รู้จัก"
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "พบบรรทัดที่ยาวเกินไปหรือไม่ได้ปิดท้ายขณะพยายามอ่าน %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "ข้ามบรรทัดที่ไม่ถูกต้อง: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "กำลังเปลี่ยนชื่อลิงก์ %s จาก %s เป็น %s"
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "กำลังเปลี่ยนชื่อลิงก์ลูก %s จาก %s เป็น %s"
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "ชื่อทางเลือก (%s) จะมี '/' หรือช่องว่างไม่ได้"
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "ลิงก์ทางเลือกไม่ได้เป็นลิงก์สัมบูรณ์อย่างที่ควรจะเป็น: %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "พาธทางเลือกไม่ได้เป็นพาธสัมบูรณ์อย่างที่ควรจะเป็น: %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "ทางเลือก %s ไม่สามารถเป็นรายการหลัก: %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "ลิงก์ทางเลือก %s ถูกจัดการโดย %s อยู่แล้ว"
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "พาธทางเลือก %s ไม่มีอยู่"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "ทางเลือก %s ไม่สามารถเป็นรายการลูกของ %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "ทางเลือก %s ไม่สามารถเป็นรายการหลัก: %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "ลิงก์ทางเลือก %s ถูกจัดการโดย %s อยู่แล้ว"
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "ไม่รู้จักอาร์กิวเมนต์ `%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install ต้องการ <link> <name> <path> <priority>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<link> กับ <path> จะเหมือนกันไม่ได้"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "ความสำคัญต้องเป็นตัวเลข"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s ต้องการ <name> <path>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s ต้องการ <name>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave ใช้ได้กับ --install เท่านั้น"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave ต้องการ <link> <name> <path>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "ชื่อ %s เป็นทั้งรายการหลักและรายการลูก"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "ลิงก์ %s เป็นทั้งลิงก์หลักและลิงก์ลูก"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s ต้องการอาร์กิวเมนต์ <file>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "ไม่รู้จักตัวเลือก `%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -5860,67 +5979,22 @@
 "ต้องการ --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all หรือ --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "ทางเลือก %s ไม่สามารถเป็นรายการหลัก: %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "ลิงก์ทางเลือก %s ถูกจัดการโดย %s อยู่แล้ว"
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "ลิงก์ทางเลือกไม่ได้เป็นลิงก์สัมบูรณ์อย่างที่ควรจะเป็น: %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "พาธทางเลือกไม่ได้เป็นพาธสัมบูรณ์อย่างที่ควรจะเป็น: %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "พาธทางเลือก %s ไม่มีอยู่"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "ชื่อทางเลือก (%s) จะมี '/' หรือช่องว่างไม่ได้"
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "ทางเลือกนี้เป็นรายการหลักอยู่"
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "ทางเลือกนี้เป็นรายการลูกของ %s อยู่"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "ทางเลือก %s ไม่สามารถเป็นรายการลูกของ %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<อินพุตมาตรฐาน>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "ไม่มีทางเลือกสำหรับ %s"
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "ลิงก์ %s เป็นลิงก์ขาด จะปรับให้เป็นตัวเลือกที่ดีที่สุด"
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -5931,69 +6005,105 @@
 msgstr ""
 "%s ได้ถูกเปลี่ยนแปลง (ด้วยการสั่งเองหรือผ่านสคริปต์) จะเปลี่ยนสู่การปรับข้อมูลแบบสั่งเองเท่านั้น"
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "กำลังกำหนดทางเลือกแบบอัตโนมัติสำหรับ %s"
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "ทางเลือก %s สำหรับ %s ไม่ได้ลงทะเบียนไว้ จะไม่กำหนดค่า"
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "ไม่มีโปรแกรมที่จัดเตรียม %s"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "ไม่มีอะไรจะตั้งค่า"
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "มีทางเลือกเพียงทางเดียวในกลุ่มลิงก์ %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "ทางเลือก %s สำหรับ %s ไม่ได้ลงทะเบียนไว้ จะไม่ลบ"
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr "กำลังลบทางเลือกที่เลือกแบบสั่งเอง - จะเปลี่ยน %s เข้าสู่โหมดอัตโนมัติ"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "การปรับข้อมูลแบบอัตโนมัติของ %s ถูกปิดไว้ จะไม่แตะต้อง"
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 "หากต้องการกลับสู่การปรับข้อมูลแบบอัตโนมัติ ใช้คำสั่ง `update-alternatives --auto %s'"
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "จะใช้ %s เพื่อจัดเตรียม %s (%s) ใน%s"
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr "จะบังคับติดตั้งทางเลือก %s ซ้ำใหม่ เพราะกลุ่มลิงก์ %s เสียอยู่"
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr "ไม่รู้จักทางเลือกปัจจุบัน %s จะเปลี่ยนไปใช้ %s สำหรับกลุ่มลิงก์ %s"
 
+#~ msgid "it is a master alternative."
+#~ msgstr "ทางเลือกนี้เป็นรายการหลักอยู่"
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "ทางเลือกนี้เป็นรายการลูกของ %s อยู่"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "ไม่สามารถ stat %s: %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "readlink(%s) ไม่สำเร็จ: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "ตรวจข้อมูล %s ไม่สำเร็จ: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "ไม่สามารถเรียกทำงาน %s: %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "ไม่สามารถสร้าง %s ให้เป็น symlink ไปยัง %s: %s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "ไม่สามารถติดตั้ง %s เป็น %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "ขณะเขียน %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "ไม่สามารถอ่าน %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "ไม่สามารถปิด %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "ไม่สามารถเขียน %s: %s"
+
 #, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6237,9 +6347,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "จะข้ามพื้นที่ควบคุมใน %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "เรียกใช้ tar ไม่สำเร็จ"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "ไม่สามารถสร้างไดเรกทอรีชั่วคราว"
 
Binary files dpkg/po/tl.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/tl.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/tl.po /home/vorlon/devel/multiarch/dpkg-debian/po/tl.po
--- dpkg/po/tl.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/tl.po	2012-06-07 10:11:09.426073000 -0700
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2006-02-17 08:53+0200\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -23,7 +23,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
@@ -43,71 +43,77 @@
 msgid "ar member file (%s)"
 msgstr "bigo na likhain ang tmpfile (datos)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "bigo sa buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "bigo sa buffer_copy (%s)"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "maiksing pagbasa sa buffer_copy (%s)"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "bigo na i-exec ang tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "hindi ma-execute ang %s"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: decompression"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compression"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: error na internal sa gzip: `%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: error na internal sa gzip: `%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: error na internal sa gzip: `%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: error na internal sa gzip: `%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: error na internal sa gzip: `%s'"
@@ -122,31 +128,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: error na internal sa bzip2: `%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: error na internal sa bzip2: `%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: error na internal sa bzip2: `%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: error na internal sa bzip2: `%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -155,7 +161,7 @@
 "directory ng mga update naglalaman ng talaksan `%.250s' na ang pangalan ay "
 "sobrang haba (haba=%d, max=%d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -163,101 +169,101 @@
 "directory ng mga update naglalaman ng mga talaksan na magkaibang haba na mga "
 "pangalan (parehong %d at %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "hindi ma-scan ang directory ng mga update `%.255s'"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "bigo sa pagtanggal ng naisamang mga talaksang update %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "hindi malikha ang `%.255s'"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "hindi nalamnan ang %.250s ng padding"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, fuzzy, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "hindi nai-flush ang %.250s matapos ang pag-pad"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, fuzzy, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "di makapag-seek sa umpisa ng %.250s matapos mag-pad"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "hindi mabuksan ang tmpfile para sa vsnprintf"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "hindi mabuksan/malikha ang status database lockfile"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "wala kayong pahintulot na ialdaba ang dpkg status database"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "hindi maaldaba ang dpkg status database"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "kailangan ng pribilehiyong superuser ang hiniling na operasyon"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "hindi mabasa ang lugar ng kalagayan ng dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 "kailangan ng operasyon ng pahintulot sa pagbasa/pagsulat sa lugar ng "
 "kalagayang dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "bigo sa pagtanggal ng sariling talaksang apdeyt %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "hindi makapagsulat ng kalagayang inapdeyt ng `%.250s'"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "hindi mai-flush ang kalagayang inapdeyt ng `%.250s'"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "hindi mai-truncate para sa kalagayang inapdeyt ng `%.250s'"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "hindi ma-fsync ang kalagayang inapdeyt ng `%.250s'"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "hindi masarhan ang kalagayang inapdeyt ng `%.250s'"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "hindi ma-luklok ang kalagayang inapdeyt ng `%.250s'"
@@ -278,90 +284,92 @@
 msgid "unable to open directory '%s'"
 msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "hindi maka-flush sa vsnprintf"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, fuzzy, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "bigo sa pagsulat ng %s record tungkol `%.50s' sa `%.250s'"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "bigo sa pagbukas ng `%s' para magsulat ng %s na impormasyon"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "hindi matakda ang pag-buffer sa talaksang kalagayan"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "bigo sa pagsulat ng %s record tungkol `%.50s' sa `%.250s'"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "bigo sa pag-flush ng impormasyon %s sa `%.250s'"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "bigo sa pag-fsync ng %s na impormasyon sa `%.250s'"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "bigo sa pagsara ng `%.250s' matapos magsulat ng impormasyong %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "bigo sa pag-link ng `%.250s' sa `%.250s' para sa backup ng %s info"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "bigo sa pagluklok ng `%.250s' bilang `%.250s' na naglalaman ng %s info"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "nagkulang ng memory para sa bagong entry ng paglinis"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -370,35 +378,35 @@
 "%s: error habang naglilinis:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr ""
 "dpkg: lubos na nested error habang sinubukang magrecover mula sa error !!\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "nagkulang ng memory para sa bagong entry ng paglinis"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 "nagkulang ng memory para sa bagong entry ng paglinis na maraming argumento"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: error sa pagproseso ng %s (--%s):\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr "error sa pagsulat ng `%s'"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%d: internal error `%s'\n"
@@ -414,103 +422,103 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "`%.*s' ay hindi pinapayagan para sa %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "basura matapos ang %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "di tanggap na pangalan ng pakete (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "walang laman ang saklaw ng detalyeng talaksan `%s'"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr ""
 "hindi pinapayagan ang saklaw ng detalye ng talaksan `%s' sa talaksang estado"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "labis ang dami ng halaga sa saklaw ng detalyeng talaksan `%s' (hinambing sa "
 "iba)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 "labis na kakaunti ang halaga sa saklaw ng detalyeng talaksan `%s' (hinambing "
 "sa iba)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "oo/hindi sa saklaw na boolean"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "halaga ng saklaw ng `status' ay hindi pinapayagan sa context na ito"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 #, fuzzy
 msgid "first (want) word in `status' field"
 msgstr "pangatlong salitang (status) sa saklaw na `status'"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 #, fuzzy
 msgid "second (error) word in `status' field"
 msgstr "pangatlong salitang (status) sa saklaw na `status'"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "pangatlong salitang (status) sa saklaw na `status'"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "error sa Version string `%.250s': %.250s"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "laos na saklaw ng `Revision' o `Package-Revision' na ginamit"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr ""
 "halaga ng saklaw na `config-version' ay hindi pinapayagan sa context na ito"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "error sa Config-Version string `%.250s': %.250s"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "halaga ng `conffiles' ay may maling anyong linya `%.*s'"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "halaga ng `conffiles' ay may linyang nag-umpisa ng di-puwang `%c'"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "root o null directory ay nakalista bilang conffile"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
@@ -518,12 +526,12 @@
 "saklaw na `%s', walang pangalan ng pakete, o basura kung saan inaasahan ang "
 "pangalan ng pakete"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "saklaw na `%s', imbalido na pangalan ng pakete `%.255s': %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -532,7 +540,7 @@
 "saklaw na `%s', tumutukoy sa `%.255s':\n"
 " masamang ugnayang bersyon %c%c "
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -541,7 +549,7 @@
 "saklaw na `%s', tumutukoy sa `%.255s':\n"
 " `%c' ay laos na, gamitin `%c=' o `%c%c' sa halip"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -552,11 +560,11 @@
 "gamitin\n"
 " ang `=' sa halip"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Maaring gamitin lamang ang exactong bersyon para sa Provides"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -566,59 +574,59 @@
 " halaga ng bersyon ay nag-umpisa na di-alphanumeric, mungkahing dagdagan ng\n"
 " puwang"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, fuzzy, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "saklaw na `%s', tumutukoy sa `%.255s': naglalaman ang bersyon ng `('"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "saklaw na `%s', tumutukoy sa `%.255s': hindi nagwakas ang bersyon"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "saklaw na `%s', tumutukoy sa `%.255s': error sa bersyon: %.255s"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "saklaw na `%s', syntax error matapos tumukoy sa paketeng `%.255s'"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "di pinapayagan ang mga halili (`|') sa saklaw na %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 #, fuzzy
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 "halaga ng saklaw na `config-version' ay hindi pinapayagan sa context na ito"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, fuzzy, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "saklaw na `%s', imbalido na pangalan ng pakete `%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 #, fuzzy
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "halaga ng saklaw ng `status' ay hindi pinapayagan sa context na ito"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, fuzzy, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "bawal na pangalan ng pakete sa linya %d: %.250s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, fuzzy, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "listahan ng talaksan para sa pakete `%.250s'"
@@ -673,7 +681,7 @@
 msgid "unable to write to status fd %d"
 msgstr "hindi makapagsulat ng kalagayang inapdeyt ng `%.250s'"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 msgid "malloc failed (%zu bytes)"
 msgstr "bigo ang realloc (%ld na byte)"
@@ -683,8 +691,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "bigo ang realloc (%ld na byte)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 #, fuzzy
 msgid "failed to allocate memory"
 msgstr "bigo na likhain ang directory"
@@ -718,201 +726,207 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "hindi matakda ang close-on-exec flag para sa %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "error sa pagkaayos: kailangan ng halaga ang %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, fuzzy, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "bigo sa pagbukas ng talaksang pagkaayos `%.255s' para sa pagbasa"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "di kilalang opsyon --%s"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "--%s opsyon ay tumatanggap ng halaga"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "--%s opsyon ay hindi tumatanggap ng halaga"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "error sa pagbasa ng talaksang pagkaayos `%.255s'"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "error sa pagsara ng talaksang pagkaayos `%.255s'"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "error sa pagsara ng talaksang pagkaayos `%.255s'"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "di kilalang opsyon --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s opsyon ay tumatanggap ng halaga"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s opsyon ay hindi tumatanggap ng halaga"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "di kilalang opsyon -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c opsyon ay tumatanggap ng halaga"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c opsyon ay hindi tumatanggap ng halaga"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "Babala: laos na opsyon `--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, fuzzy, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "magkatunggaling gagawin --%s at --%s"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "nadobleng halaga para sa saklaw na `%s'"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "pinapangalanan ng gumagamit na saklaw `%.*s' ay labis na maiksi"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "dinobleng halaga para sa pinapangalanan ng gumagamit na saklaw `%.*s'"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Configured-Version para sa pakete na may hindi akmang Status"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "Pakete na nasa kalagayang hindi-nakaluklok ay may conffiles, kinalilimutan "
 "sila"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "bigo sa pagbukas ng talaksang info ng pakete `%.255s' para sa pagbasa"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "hindi ma-stat ang talaksang info ng pakete `%.255s'"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "hindi ma-mmap ang talaksang info ng pakete `%.255s'"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "hindi ma-stat ang talaksang info ng pakete `%.255s'"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "bigo sa pagsara matapos ng pagbasa: `%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "EOF matapos ng pangalan ng saklaw `%.*s'"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "newline sa loob ng pangalan ng saklaw `%.*s'"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "MSDOS EOF (^Z) sa loob ng pangalan ng saklaw `%.*s'"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "pangalan ng saklaw `%.*s' ay dapat sundan ng kolon"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "EOF nauna sa halaga ng saklaw `%.*s' (kulang ng kahulihang newline)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "MSDOS EOF char sa halaga ng saklaw `%.*s' (kulang na newline?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "newline sa loob ng pangalan ng saklaw `%.*s'"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "EOF sa halaga ng saklaw `%.*s' (kulang na kahulihang newline)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 "may ilang pinasok na info tungkol sa pakete na nahanap, iisa lamang dapat"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "bigo sa pagsara matapos ng pagbasa: `%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "walang impormasyong pakete sa loob ng `%.255s'"
@@ -931,66 +945,66 @@
 " %.255s"
 msgstr "%s, sa talaksang `%.255s' malapit sa linya %d"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "hindi maaaring walang laman na string"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "kailangang mag-umpisa sa alphanumeric"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, fuzzy, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "di tanggap ang karakter `%c' - mga titik, numero at %s ang tanggap"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<wala>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "walang laman ang string na bersyon"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "naglalaman ng mga puwang ang string na bersyon"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "epoch sa bersyon ay hindi numero"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "walang sumunod sa kolon sa bilang ng bersyon"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "walang sumunod sa kolon sa bilang ng bersyon"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "walang sumunod sa kolon sa bilang ng bersyon"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "kulang na %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "walang halaga para sa %s"
@@ -1009,51 +1023,51 @@
 msgid "(no description available)"
 msgstr "(walang paglalarawan)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "hindi maaring hindi pansinin ang hudyat %s bago patakbuhin ang skripto"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "errro sa pag-un-catch ng hudyat %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (subprocess): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "bigo ang pag-fork"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "nagbalik ang subprocess %s ng error exit status %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "paghintay sa %s ay bigo"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "subprocess %s ay pinatay ng hudyat (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ""
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "subprocess %s ay bigo na may wait status code %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "paghintay sa %s ay bigo"
@@ -1073,197 +1087,203 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, fuzzy, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 msgid "triggers area"
 msgstr "hindi ma-execute ang %s"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, fuzzy, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "hindi ma-fstat ang talaksang bahagi `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, fuzzy, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, fuzzy, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "hindi mabuksan ang bagong talaksang bodega `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, fuzzy, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "bigo sa pagbasa ng %s mula sa %.255s"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, fuzzy, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "hindi mabuksan ang bagong talaksang bodega `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, fuzzy, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "hindi mabuksan ang bagong talaksang bodega `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, fuzzy, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "hindi mailuklok ang bagong bersyon ng `%.255s'"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, fuzzy, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "hindi mabuksan ang bagong talaksang bodega `%.250s'"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, fuzzy, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "hindi mabasa ang talaksang bahagi `%.250s'"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:419
-#, fuzzy, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "hindi ma-fstat ang talaksang bahagi `%.250s'"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, fuzzy, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "hindi ma-fstat ang talaksang bahagi `%.250s'"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "hindi ma-fstat ang talaksang bahagi `%.250s'"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "hindi ma-fstat ang talaksang bahagi `%.250s'"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
+msgstr "hindi mailuklok ang bagong bersyon ng `%.255s'"
+
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "hindi matanggal ang `%.250s'"
+
+#: lib/dpkg/triglib.c:360
+#, fuzzy, c-format
+msgid "unable to create new trigger interest file `%.250s'"
 msgstr "hindi ma-fstat ang talaksang bahagi `%.250s'"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:383
 #, fuzzy, c-format
-msgid "unable to install new trigger interest file `%.250s'"
-msgstr "hindi mailuklok ang bagong bersyon ng `%.255s'"
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "hindi ma-fstat ang talaksang bahagi `%.250s'"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:456
 #, fuzzy, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr "hindi mailuklok ang bagong talaksang info `%.250s' bilang `%.250s'"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, fuzzy, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "hindi mabuksan ang bagong talaksang bodega `%.250s'"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, fuzzy, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "hindi mabuksan ang bagong talaksang bodega `%.250s'"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "hindi mabuksan ang bagong talaksang bodega `%.250s'"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "hindi mabuksan ang bagong talaksang bodega `%.250s'"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "hindi mabuksan ang bagong talaksang bodega `%.250s'"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, fuzzy, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "hindi mailuklok ang bagong talaksang info `%.250s' bilang `%.250s'"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, fuzzy, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "hindi mabasa ang talaksang bahagi `%.250s'"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, fuzzy, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "error sa pagbasa ng talaksang pagkaayos `%.255s'"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, fuzzy, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, fuzzy, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "hindi mabasa ang directory na bodega `%.250s'"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, fuzzy, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "hindi mabasa ang directory na bodega `%.250s'"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, fuzzy, c-format
 msgid "read error in `%.250s'"
@@ -1288,7 +1308,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "error sa pagbasa mula sa dpkg-deb pipe"
 
@@ -1307,12 +1327,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "error sa pagtakda ng pagmamayari ng symlink `%.255s'"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "error sa pagtakda ng pagmamayari ng `%.255s'"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "error sa pagtakda ng pahintulo ng `%.255s'"
@@ -1369,17 +1389,26 @@
 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:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+msgid "cannot stat file '%s'"
+msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Pinapalitan ang talaksan sa lumang paketeng %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, 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:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1388,93 +1417,98 @@
 "sinusubukang patungan ang directory `%.250s' sa paketeng %.250s ng hindi "
 "directory"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "sinusubukang patungan ang `%.250s', na nasa paketeng %.250s din"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "bigo ang pagbasa ng `%.255s' (sa `%.255s')"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "bakend dpkg-deb habang `%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "error sa pagsara/pagsulat `%.255s'"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "error sa paglikha ng pipe `%.255s'"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "error sa paglikha ng device `%.255s'"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "error sa paglikha ng hard link `%.255s'"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "error sa paglikha ng symbolic link `%.255s'"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "error sa paglikha ng directory `%.255s'"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, 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:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "hindi mabasa ang link `%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "hindi makagawa ng backup symlink para sa `%.255s'"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "hindi ma-chown ang backup symlink para sa `%.255s'"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, 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:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "hindi mailuklok ang bagong bersyon ng `%.255s'"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "hindi malikha ang `%.255s'"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "hindi ma-unbuffer ang `%.255s'"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1484,7 +1518,7 @@
 "%s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, fuzzy, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1493,7 +1527,7 @@
 "dpkg: babala - inaayunan na tanggalin ang pagkaayos ng kailangang\n"
 " pakete %s, upang maaaring tanggalin ang %s.\n"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1502,7 +1536,7 @@
 "dpkg: hindi, %s ay kailangan, hindi ito tatanggalan ng pagkaayos\n"
 " nito upang maaaring tanggalin ang %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1512,28 +1546,28 @@
 "deconfigure):\n"
 " %s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, fuzzy, c-format
 msgid "removal of %.250s"
 msgstr "error sa pagbasa sa %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, fuzzy, c-format
 msgid "installation of %.250s"
 msgstr "hindi mailuklok ang bagong bersyon ng `%.255s'"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, fuzzy, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: inaayunan ang pagtanggal ng %s pabor sa %s ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, fuzzy, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: oo, tatanggalin ang %s pabor sa %s.\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1542,45 +1576,45 @@
 "dpkg: tungkol sa %s na naglalaman ng %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 #, fuzzy
 msgid "ignoring breakage, may proceed anyway!"
 msgstr ""
 "dpkg: babala - hindi pinapansin ang tunggalian, maaaring magpatuloy pa "
 "rin !\n"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1589,116 +1623,118 @@
 "dpkg: kinakailangan iluklok muli ang paketeng %s, ngunit tatanggalin na rin "
 "ito gaya ng hiling niyo.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "magkatunggaling mga pakete - hindi iluluklok %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 #, fuzzy
 msgid "ignoring conflict, may proceed anyway!"
 msgstr ""
 "dpkg: babala - hindi pinapansin ang tunggalian, maaaring magpatuloy pa "
 "rin !\n"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, 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:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "bigo sa pag-exec ng find para sa --recursive"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "bigo sa pag-fdopen ng pipe ng find"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "error sa pagbasa ng pipe ng find"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "error sa pagsara ng pipe ng find"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, 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:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "naghanap, ngunit walang nahanap na pakete (talaksang pumares sa *.deb)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Pinipili ang nakaraang hindi piniling pakete %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Linampasan ang hindi piniling pakete %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Bersyon %.250s ng %.250s ay nakaluklok na, linalampasan.\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s - babala: downgrade ng %.250s mula %.250s tungong %.250s.\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
 "Hindi mag-downgrade ng %.250s mula bersyon %.250s tungong %.250s, "
 "lalagpasin.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1707,39 +1743,39 @@
 "hindi matanggal ang bagong-luklok na bersyon ng `%.250s' upang maaaring "
 "iluklok-muli ang kopyang backup"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "hindi maibalik ang bersyong backup ng `%.250s'"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "hindi maibalik ang bersyong backup ng `%.250s'"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "hindi matanggal ang bagong luklok na bersyon ng `%.250s'"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "hindi matanggal ang bagong-binuklat na bersyon ng `%.250s'"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "hindi ma-stat ang bagong dist conffile `%.250s'"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "hindi ma-stat ang kasalukuyang nakaluklok na conffile `%.250s'"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1750,61 +1786,61 @@
 "Ang talaksang pagkaayos `%s' ay wala sa sistema.\n"
 "Iniluluklok ang bagong talaksang pagkaayos tulad ng inyong hiling.\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "dpkg: %s: babala - bigo sa pagtanggal ng lumang backup `%.250s': %s\n"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 "dpkg: %s: babala - bigo sa pagpalit ng pangalan ng `%.250s' sa `%.250s': %s\n"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: bigo sa pag-exec gzip %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 "dpkg: %s: babala - bigo sa pagtanggal ng lumang distrib bersyon ng `%.250s': "
 "%s\n"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 "dpkg: %s: babala - bigo sa pagtanggal ng `%.250s' (bago patungan): %s\n"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "dpkg: %s: babala - bigo sa pag-link ng `%.250s' tungong `%.250s': %s\n"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Iniluluklok ang bagong bersyon ng talaksang pagkaayos %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "hindi maluklok ang `%.250s' bilang `%.250s'"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "walang paketeng nagngapangalang `%s' na nakaluklok, hindi maisaayos"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "nakaluklok at nakaayos na ang paketeng %.250s"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1813,7 +1849,7 @@
 "hindi handa na isaayos ang paketeng %.250s\n"
 " hindi maisaayos (kasalukuyang kalagayan `%.250s')"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1822,11 +1858,11 @@
 "dpkg: problema sa dependensiya ay balakid sa pagsasaayos ng %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "problema sa dependensiya - iniwanang hindi nakaayos"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1836,7 +1872,7 @@
 "niyo:\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1844,12 +1880,12 @@
 "Nasa masamang kalagayan ang pakete - kailangan niyong\n"
 " iluklok-muli ito bago subukang isaayos ito."
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Hinahanda ang %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, fuzzy, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1858,7 +1894,7 @@
 "dpkg: %s: babala - hindi ma-stat ang talaksang pagkaayos `%s'\n"
 " (= `%s'): %s\n"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, fuzzy, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1867,7 +1903,7 @@
 "dpkg: %s: babala - talaksang pagkaayos `%s' ay paikot na link\n"
 " (= `%s')\n"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, fuzzy, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1876,7 +1912,7 @@
 "dpkg: %s: babala - hindi ma-readlink ang conffile `%s'\n"
 " (= `%s'): %s\n"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, fuzzy, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1885,35 +1921,35 @@
 "dpkg: %s: babala - conffile `%.250s' nagresolba sa pangalang talaksan na\n"
 " degenerado (`%s' ay symlink patungo sa `%s')\n"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, fuzzy, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 "dpkg: %s: babala - conffile `%.250s' ay hindi payak na talaksan o symlink\n"
 " (= `%s')\n"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "dpkg: %s: babala - hindi mabuksan ang conffile %s para sa hash: %s\n"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Ipasok ang `exit' kapag tapos na kayo.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1922,12 +1958,12 @@
 "\n"
 "Talaksang pagkaayos `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (ang totoo ay `%s')"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1939,7 +1975,7 @@
 " ==> Talaksan ay nasa loob din ng paketeng bigay ng tagapangalaga ng "
 "pakete.\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1948,7 +1984,7 @@
 "\n"
 "     Hindi binago magmula ng iniluklok ito.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1957,7 +1993,7 @@
 "\n"
 " ==> Binago (ninyo o ng skript) magmula noong iniluklok ito.\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1966,38 +2002,38 @@
 "\n"
 " ==> Binago (ninyo o ng skript) magmula noong iniluklok ito.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Nagpadala ng panibagong bersyon ang nagpamudmod ng pakete.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Bersyon sa loob ng pakete ay pareho sa huling pagkaluklok.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Ginagamit ang bagong talaksan tulad ng inyong hiling.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr ""
 " ==> Ginagamit ang kasalukuyang lumang talaksan tulad ng inyong hiling.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Pinanatiling default ang lumang talaksang pagkaayos.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Gagamitin ang bagong talaksang pagkaayos bilang default.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2013,166 +2049,167 @@
 "      Z    : ilagay sa background ang prosesong ito upang tignan ang "
 "kaayusan\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Ang default na gagawin ay gamitin ang kasalukuyang bersyon.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Ang default na gagawin ay iluklok ang bagong bersyon.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[default=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[default=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[walang default]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "error sa pagsulat sa stderr, natagpuan bago mag-prompt ng conffile"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "error sa pagbasa ng stdin sa prompt ng conffile"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF sa stdin sa prompt ng conffile"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, fuzzy, c-format
 msgid "%s depends on %s"
 msgstr " nagdedepende sa "
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, fuzzy, c-format
 msgid "%s pre-depends on %s"
 msgstr " nag-pre-depende sa "
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, fuzzy, c-format
 msgid "%s recommends %s"
 msgstr " rekomendado ang "
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, fuzzy, c-format
 msgid "%s suggests %s"
 msgstr " mungkahi ang "
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, fuzzy, c-format
 msgid "%s breaks %s"
 msgstr "%s (subprocess): %s\n"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, fuzzy, c-format
 msgid "%s conflicts with %s"
 msgstr " katunggali ang "
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, fuzzy, c-format
 msgid "%s enhances %s"
 msgstr " nagpapabuti sa "
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s ay tatanggalin.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s ay tatanggalin ang pagkaayos.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, 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:319
+#: src/depcon.c:333
 #, 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:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s ay nakabuklat, ngunit ito'y bersyon %.250s.\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  Ang huling bersyon ng pagkaayos ng %.250s ay %.250s.\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s ay %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, 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:378
+#: src/depcon.c:392
 #, 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:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s ay nagbibigay ng %.250s ngunit ito'y %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s ay hindi nakaluklok.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (bersyon %.250s) ay iluluklok.\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, fuzzy, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (bersyon %.250s) ay %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s ay nagbibigay ng %.250s at iluluklok.\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, fuzzy, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s ay nagbibigay ng %.250s at ay %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+msgid "Use --help for help about diverting files."
+msgstr "dpkg-split --help para sa tulong."
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, fuzzy, c-format
 msgid "Debian %s version %s.\n"
 msgstr "' bersyon ng backend ng arkibong pakete"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2180,8 +2217,8 @@
 "Copyright (C) 2010 Guillem Jover.\n"
 msgstr ""
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2193,7 +2230,7 @@
 "mas-bago para sa kundisyon ng pangongopya. Walang waranti.\n"
 "Basahin ang dpkg-deb --licence para sa detalye.\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2201,7 +2238,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2213,7 +2250,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2231,7 +2268,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2240,152 +2277,147 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-msgid "cannot stat file '%s'"
-msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 msgid "error checking '%s'"
 msgstr "error sa pagsulat ng `%s'"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "nadobleng halaga para sa saklaw na `%s'"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 msgid "local diversion of %s"
 msgstr "dibertado na lokal"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 msgid "local diversion of %s to %s"
 msgstr "dibertado na lokal"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "diversion of %s by %s"
 msgstr "dibersyon ng %s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "dibertado ng %s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "diversion by %s"
 msgid "any diversion of %s"
 msgstr "dibersyon ng %s"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 msgid "any diversion of %s to %s"
 msgstr "dibertado ng %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 msgid "cannot create new %s file"
 msgstr "hindi mabuksan ang talaksang GPL "
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "hindi maka-flush sa vsnprintf"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 msgid "error removing old diversions-old"
 msgstr "error sa paglikha ng device `%.255s'"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "error sa paglikha ng device `%.255s'"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "error sa paglikha ng device `%.255s'"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, fuzzy, c-format
 msgid "--%s needs a single argument"
 msgstr "--build ay nangangailangan ng argumentong directory"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, fuzzy, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "conffile `%.250s' ay hindi ma-stat"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr ""
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 #, fuzzy
 msgid "Cannot divert directories"
 msgstr "hindi mabasa ang info directory"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "hindi mabasa ang info directory"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 msgid "Leaving '%s'\n"
 msgstr "error sa pagsulat ng `%s'"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid " is to be removed.\n"
 msgid "No diversion '%s', none removed.\n"
 msgstr " ay tatanggalin.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2393,7 +2425,7 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2401,17 +2433,17 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 msgid "Removing '%s'\n"
 msgstr "Tinatanggal ang %s ...\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 #, fuzzy
 msgid "package may not contain newlines"
 msgstr "Walang laman ang paketeng `%s' (!)\n"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr ""
 
@@ -2490,8 +2522,8 @@
 msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s ay hindi tumatanggap ng mga argumento"
@@ -2586,7 +2618,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions maling ugnayan"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "bersyon ay may maling syntax: %s\n"
@@ -2647,13 +2679,13 @@
 "dpkg - babala, problema sa pag-override dahil --force ay naka-enable:\n"
 " "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 "hindi mabuksan ang talaksan ng listahan ng talaksan para sa paketeng `%.250s'"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, fuzzy, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2663,43 +2695,43 @@
 "paketeng `%.250s' ay nawawala, ipinagpapalagay na ang pakete ay walang mga "
 "talaksan na kasalukuyang nakaluklok.\n"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr ""
 "hindi mabuksan ang talaksan ng listahan ng talaksan para sa paketeng `%.250s'"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "listahan ng talaksan para sa pakete `%.250s'"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, fuzzy, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
 "pangalan na blanko"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 "talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
 "pangalan na blanko"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 "error sa pagsara ng talaksang listahan ng mga talaksan ng pakete `%.250s'"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Binabasa ang database ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2707,32 +2739,32 @@
 msgstr[0] "%d na talaksan at directory ay kasalukuyang nakaluklok.)\n"
 msgstr[1] "%d na talaksan at directory ay kasalukuyang nakaluklok.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "hindi malikha ang pinakabagong listahan ng talaksan ng paketeng %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "bigo sa pagsulat sa pinakabagong listahan ng talaksan ng paketeng %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "bigo sa pag-flush ng pinakabagong listahan ng talaksan ng paketeng %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "bigo sa pag-sync ng pinakabagong listahan ng talaksan ng paketeng %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "bigo sa pagsara ng pinakabagong listahan ng talaksan ng paketeng %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "bigo sa pagluklok ng pinakabagong listahan ng talaksan ng paketeng %s"
@@ -2772,7 +2804,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "dpkg - error: hindi nakatakda ang PATH.\n"
 
 #: src/help.c:129
@@ -2805,7 +2837,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "hindî maka-stat sa vsnprintf"
@@ -2816,67 +2848,67 @@
 msgstr "bigo sa pag-chroot sa `%.250s'"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "bigo sa pag-chdir sa `%.255s'"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "hindi matakda ang pahintulot ng pag-execute sa `%.250s'"
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "hindî maka-stat sa vsnprintf"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "lumang %s skripto"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "hindi ma-stat ang %s `%.250s'"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "bagong %s skripto"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "lumang %s skripto"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "hindi ma-stat ang %s `%.250s'"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr ""
 "dpkg - sinusubukan na lamang ang skripto mula sa bagong pakete sa halip ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "walang skripto sa bagong bersyon ng pakete - sumusuko na"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... mukhang ayos naman ang nangyari.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "hindi malikha ang `%.255s'"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2885,7 +2917,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "hindi matiyak ang pagkakaroon ng `%.250s'"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "hindi mabasa ang info directory"
 
@@ -2925,7 +2957,7 @@
 "\n"
 msgstr ""
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3004,7 +3036,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3057,30 +3089,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3089,102 +3125,102 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "problema sa dependensiya - hindi tatanggalin"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "problema sa dependensiya - hindi tatanggalin"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "hindî maka-stat sa vsnprintf"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "error sa pagbasa ng talaksang pagkaayos `%.255s'"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3192,7 +3228,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3200,39 +3236,39 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug ay nangangailangan ng argumentong octal"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "pangalan ng pakete na null sa --ignore-depends listahang hiwalay-ng-koma `"
 "%.250s'"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends ay nangangailangan ng legal na pangalan ng pakete. `%.250s' "
 "ay hindi: %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "di tanggap na integer para sa --%s: `%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3241,7 +3277,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3249,12 +3285,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "di kilalang opsyon na force/refuse `%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "Babala: laos na opsyon `--%s'\n"
@@ -3279,8 +3315,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "di inaasahang eof bago matapos ang linya %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "kailangan ng opsyon ng gagawin"
 
@@ -3449,90 +3485,90 @@
 msgid "passed\n"
 msgstr "pasado\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "bigo na likhain ang temporary directoryname"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr ""
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 "lumang bersyon ng pakete ay may sobrang-haba na pangalan ng talaksang info \n"
 "nagsisimula `%.250s'"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "hindi matanggal ang laos na talaksang info `%.250s'"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "hindi maluklok (daw) bagong talaksang info `%.250s'"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "hindi mabuksan ang temp control directory"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 "naglalaman ang pakete ng sobrang-haba na pangalan ng talaksang control info\n"
 "(nagsisimula `%.50s')"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "control info ng pakete ay naglaman ng directory `%.250s'"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "control info ng pakete rmdir ng `%.250s' hindi nagsabing hindi ito dir"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr ""
 "dpkg: babala - ang paketeng %s ay naglaman ng listahan bilang talaksang info"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "hindi mailuklok ang bagong talaksang info `%.250s' bilang `%.250s'"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "hindi matanggal ang talaksang control info `%.250s'"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "hindi ma-akses ang arkibo"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "bigo na likhain ang temporary directoryname"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 msgid "package control information extraction"
 msgstr "haba ng impormasyong ctrl"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Tinala ang info tungkol sa %s mula sa %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "arkitektura ng pakete (%s) ay hindi lapat sa sistema (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3541,102 +3577,102 @@
 "dpkg: tungkol sa %s na naglalaman ng %s, problemang pre-dependensiya:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "problemang pre-dependensiya - hindi iluluklok ang %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr "dpkg: babala - hindi pinansin ang problemang pre-dependensiya !\n"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Naghahandang palitan ang %s %s (gamit ang %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Binubuklat ang %s (mula sa %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 "pangalan ng conffile (nagumpisa `%.250s') ay labis ang haba (>%d karakter)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "error sa pagbasa sa %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "error sa pagsara %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "error habang sinubukang buksan ang %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, fuzzy, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr ""
 "Tinatanggalan ng pagkaayos ang %s, upang maaaring tanggalin ang %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, fuzzy, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Tinatanggal ang %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Binubuklat ang papalit sa %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "error sa pagbasa ng dpkg-deb tar output"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "sirang filesystem tarfile - sira ang arkibong pakete"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: i-zap ang posibleng susunod na mga sero"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, fuzzy, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "dpkg: babala - hindi matanggal ang lumang talaksan `%.250s': %s\n"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "dpkg: babala - hindi matanggal ang lumang talaksan `%.250s': %s\n"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, fuzzy, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "dpkg: %s: babala - conffile `%.250s' ay hindi payak na talaksan o symlink\n"
 " (= `%s')\n"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, fuzzy, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "hindi ma-fstat ang talaksang bahagi `%.250s'"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, fuzzy, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3645,12 +3681,12 @@
 "dpkg: %s: babala - conffile `%.250s' ay hindi payak na talaksan o symlink\n"
 " (= `%s')\n"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "dpkg: babala - hindi matanggal ang lumang talaksan `%.250s': %s\n"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Pinupuna ang pagkawala ng %s, na siyang napalitan ng buo.)\n"
@@ -3842,7 +3878,7 @@
 "\n"
 msgstr ""
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3856,6 +3892,10 @@
 "  case left alignment will be used.\n"
 msgstr ""
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, fuzzy, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3920,7 +3960,7 @@
 msgid "Removing %s ...\n"
 msgstr "Tinatanggal ang %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, fuzzy, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3929,17 +3969,12 @@
 "dpkg - babala: habang tinatanggal ang %.250s, hindi matanggal ang directory\n"
 " `%.250s': %s - directory ay maaaring punto ng paglapat ?\n"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "hindi matanggal ang `%.250s'"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "hindi nakabuo %.250s"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
@@ -3947,33 +3982,39 @@
 "%.250s'\n"
 " kaya't hindi ito tinanggal.\n"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "hindi matanggal ang `%.250s'"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Pinupurga ang talaksang pagkaayos ng %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "hindi matanggal ang lumang talaksang pagkaayos `%.250s' (= `%.250s')"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "hindi mabasa ang dir ng talaksang pagkaayos `%.250s' (mula `%.250s')"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 "hindi matanggal ang lumang backup ng talaksang pagkaayos `%.250s' (ng `"
 "%.250s')"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "hindi matanggal ang lumang listahan ng talaksan"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "hindi matanggal ang lumang skriptong postrm"
 
@@ -4016,14 +4057,18 @@
 msgid "read error on standard input"
 msgstr "error sa pagbasa ng standard input"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
 "Copyright (C) 2006-2009 Guillem Jover.\n"
 msgstr ""
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4034,7 +4079,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4047,57 +4092,57 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr ""
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "bigo sa pagbukas ng talaksang statoverride"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "error sa paglikha ng device `%.255s'"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "error sa paglikha ng device `%.255s'"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "error sa paglikha ng device `%.255s'"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 #, fuzzy
 msgid "--add needs four arguments"
 msgstr "--build ay nangangailangan ng argumentong directory"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr ""
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr ""
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr ""
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr ""
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr ""
 
@@ -4168,17 +4213,17 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "talaksang statoverride `%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "dpkg-split --help para sa tulong."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr " kasangkapan sa pagtanong ng programang tagapangasiwa ng mga pakete\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4186,7 +4231,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4195,7 +4240,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4209,32 +4254,32 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr ""
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr ""
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 #, fuzzy
 msgid "takes one argument, the trigger name"
 msgstr ""
 "--%s ay tumatanggap lamang ng isang argumento (pangalan ng talaksang .deb)"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "saklaw na `%s', imbalido na pangalan ng pakete `%.255s': %s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "saklaw na `%s', imbalido na pangalan ng pakete `%.255s': %s"
@@ -4263,35 +4308,36 @@
 msgstr "Pinupurga ang talaksang pagkaayos ng %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s ay nangangailangan ng isang argumentong talaksang Packages"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 "di ma-akses ang dpkg status area para sa maramihang pag-apdeyt ng magagamit"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 "kailangan ng akses sa pagsulat sa dpkg status area ng maramihang pag-apdeyt "
 "ng\n"
 "magagamit"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr ""
 "Pinapalitan ang info tungkol sa magagamit na mga pakete, gamit ang %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr ""
 "Ina-apdeyt ang info tungkol sa magagamit na mga pakete, gamit ang %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4299,7 +4345,7 @@
 msgstr[0] "Impormasyon tungkol sa %d na (mga) pakete ay inapdeyt.\n"
 msgstr[1] "Impormasyon tungkol sa %d na (mga) pakete ay inapdeyt.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4420,8 +4466,8 @@
 msgstr[1] ""
 "dpkg-deb: hindi pinansin %d na babala tungkol sa (mga) talaksang control\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, fuzzy, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--build ay nangangailangan ng argumentong directory"
@@ -4454,25 +4500,25 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: binubuo ang paketeng `%s' sa `%s'.\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "bigo na likhain ang tmpfile (datos)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 msgid "control member"
 msgstr "ctrlarea"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "bigo na i-unlink ang tmpfile (datos), %s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4488,20 +4534,20 @@
 msgid "error writing `%s'"
 msgstr "error sa pagsulat ng `%s'"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "sa gitna ng mga kasapi"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "bigo na isulat ang pangalan ng talaksan sa tar pipe (datos)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4519,66 +4565,66 @@
 msgid "error reading %s from file %.255s"
 msgstr "bigo sa pagbasa ng %s mula sa %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "bigo sa pagbasa ng arkibo `%.255s'"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "bigo na i-fstat ang arkibo"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "walang tuldok sa bilang ng bersyon ng arkibo"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "walang newline sa header ng arkibo"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "sira ang talaksang `%.250s' - masamang bilang ng bahagi"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "hindi arkibong debian binary ang talaksang `%.250s' (subukan ang dpkg-split?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "walang tuldok sa bilang ng bersyon ng arkibo"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "walang newline sa header ng arkibo"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "walang tuldok sa bilang ng bersyon ng arkibo"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 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:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "linaktawan ang datos na kasapi mula sa %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
@@ -4587,14 +4633,14 @@
 "%.*s,\n"
 "sumusuko na"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr ""
 "naglalaman ng dalawang kasaping control ang talaksang `%.250s', sumusuko na"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4606,22 +4652,22 @@
 " bagong paketeng debian, bersyong %s.\n"
 " laki %ld na byte: arkibong control= %zi na byte.\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 msgid "archive has malformatted control member size '%s'"
 msgstr "may maling anyong ctrl len `%s' ang arkibo"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "linaktawan ang datos na kasapi mula sa %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4633,7 +4679,7 @@
 " lumang paketeng debian, bersyong %s.\n"
 " laki %ld na byte: arkibong control= %zi, pangunahing arkibo= %ld.\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4642,51 +4688,52 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' ay hindi arkibong anyong debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "bigo sa pagsulat sa pipe sa copy"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "bigo na isara ang pipe sa copy"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "datos"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "bigo na mag-chdir sa directory"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "bigo na likhain ang directory"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "bigo na mag-chdir sa directory matapos likhain ito"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "bigo na mag-chdir sa directory"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s: decompression"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 #, fuzzy
 msgid "paste"
 msgstr "pasado\n"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s ay nangangailangan ng argumentong pangalan ng talaksang .deb"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4695,40 +4742,40 @@
 "--%s ay nangangailangan ng target directory.\n"
 "Siguro ang kailangan niyong gamitin ay dpkg --install ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr ""
 "--%s ay tumatanggap lamang ng isang argumento (pangalan ng talaksang .deb)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "bigo sa pag-chdir sa `/' upang maglinis"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 msgid "control file '%s'"
 msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: `%.255s' ay hindi naglalaman ng control component `%.255s'\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "pagbukas ng bahaging `%.255s' (ng %.255s) bigo sa hindi inaasahang paraan"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, fuzzy, c-format
 #| msgid "One requested control component is missing"
 msgid "%d requested control component is missing"
@@ -4736,59 +4783,59 @@
 msgstr[0] "May kulang na isang hininging bahaging control"
 msgstr[1] "May kulang na isang hininging bahaging control"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "hindi ma-scan ang directory `%.255s'"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "hindi mabuksan ang `%.255s' (sa `%.255s')"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "bigo ang pagbasa ng `%.255s' (sa `%.255s')"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld na byte, %5d na linya   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     hindi payak na talaksan   %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(walang talaksang `control' sa arkibong control!)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "hindi mabuksan ang bahaging `control'"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "bigo sa pagbasa ng bahaging `control'"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "error sa pagsara ng pipe ng find"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Error sa format"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents ay tumatanggap ng isang argumento lamang"
 
@@ -4809,11 +4856,13 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4822,11 +4871,12 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4839,7 +4889,7 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4848,7 +4898,7 @@
 "unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4856,17 +4906,17 @@
 "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:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "di tanggap na integer para sa --%s: `%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "di tanggap na integer para sa --%s: `%.250s'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "di kilalang uri ng compression `%s'!"
@@ -4886,7 +4936,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "sira ang talaksang `%.250s' - may kulang na newline matapos ang %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "error sa pagbasa ng %.250s"
@@ -4978,53 +5028,58 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "sira ang talaksang `%.250s' - masamang bilang ng bahagi"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+msgid "package architecture"
+msgstr " (pakete: "
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
 "sira ang talaksang `%.250s' - masamang magic sa dulo ng pangalawang header"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
 "sira ang talaksang `%.250s' - pangalawang kasapi ay hindi kasaping datos"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "sira ang talaksang `%.250s' - mali ang bilang ng mga bahagi para sa "
 "nabanggit na laki"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "sira ang talaksang `%.250s' - mali ang laki para sa bilang ng bahaging "
 "nabanggit"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "hindi ma-fstat ang talaksang bahagi `%.250s'"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "sira ang talaksang `%.250s' - masyadong maiksi"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "hindi mabuksan ang arkibo ng bahaging talaksang `%.250s'"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "ang talaksang `%.250s' ay hindi bahagi ng arkibo"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5044,6 +5099,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5066,13 +5122,20 @@
 "  Laki ng bahagi ng talaksan (gamit na bahagi): %lu bytes\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<di kilala>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr ""
 "--info ay nangangailangan ng isa o higit pa na argumentong bahaging talaksan"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "ang talaksang `%s' ay hindi bahaging arkibo\n"
@@ -5105,7 +5168,7 @@
 msgid "split package part"
 msgstr "kulang na %s"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "tapos\n"
@@ -5160,28 +5223,36 @@
 "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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "dpkg-split --help para sa tulong."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "di inaasahang dulo ng talaksan sa %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "laki ng bahagi ay labis ng laki o hindi positibo"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, fuzzy, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "laki ng bahagi ay dapat hindi kumulang sa %dk (kasama na ang header)"
@@ -5294,43 +5365,43 @@
 msgid "Deleted %s.\n"
 msgstr "Tinanggal ang %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "hindi ma-fstat ang pinagmulan na talaksan"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "pinagmulan na talaksan `%.250s' ay hindi payak na talaksan"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr ""
 "--split ay nangangailangan ng argumentong pangalan ng pinagmulan na talaksan"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 "--split ay tumatanggap ng pangalan ng pinagmulan na talaksan at unlaping\n"
@@ -5400,491 +5471,477 @@
 "  --version                show the version.\n"
 msgstr ""
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 #, fuzzy
 #| msgid "parse error"
 msgid "error"
 msgstr "error sa pag-parse"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "babala"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-msgid "cannot stat %s: %s"
-msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr ""
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "hindi mabuksan ang talaan`%s': %s\n"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:420
-#, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "bigo sa pag-exec ng %s"
-
-#: utils/update-alternatives.c:503
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "hindi makagawa ng backup symlink para sa `%.255s'"
-
-#: utils/update-alternatives.c:511
-#, fuzzy, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "hindi maluklok ang `%.250s' bilang `%.250s'"
-
-#: utils/update-alternatives.c:521
-#, fuzzy, c-format
-msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "hindi ma-execute ang %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "di inaasahang dulo ng talaksan sa %s sa %.255s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "dibertado ng %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "di inaasahang dulo ng talaksan sa %s sa %.255s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, fuzzy, c-format
 msgid "%s corrupt: %s"
 msgstr "%s: internal gzip error: pagsulat: `%s'"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "error sa pagsulat ng `%s'"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 msgid "duplicate slave name %s"
 msgstr "nadobleng halaga para sa saklaw na `%s'"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 #, fuzzy
 msgid "slave link"
 msgstr "nadobleng halaga para sa saklaw na `%s'"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, fuzzy, c-format
 msgid "duplicate slave link %s"
 msgstr "nadobleng halaga para sa saklaw na `%s'"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr ""
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1244
-#, fuzzy, c-format
-msgid "unable to read %s: %s"
-msgstr "hindi ma-execute ang %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 #, fuzzy
 msgid "master link"
 msgstr "nadobleng halaga para sa saklaw na `%s'"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, fuzzy, c-format
-msgid "unable to close %s: %s"
-msgstr "hindi ma-execute ang %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, fuzzy, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "nadobleng halaga para sa saklaw na `%s'"
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-msgid "cannot write %s: %s"
-msgstr "hindi ma-execute ang %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr ""
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr ""
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr "hindi ma-execute ang %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "' bersyon ng backend ng arkibong pakete"
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 #, fuzzy
 msgid "No versions available."
 msgstr "(walang paglalarawan)"
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "Paglalarawan"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "di kilalang uri ng compression `%s'!"
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "di inaasahang dulo ng talaksan sa %s sa %.255s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "Binubuklat ang %s (mula sa %s) ...\n"
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, fuzzy, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "Binubuklat ang %s (mula sa %s) ...\n"
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr ""
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr ""
+
+#: utils/update-alternatives.c:2254
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr ""
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr ""
+
+#: utils/update-alternatives.c:2324
 #, fuzzy, c-format
 msgid "unknown argument `%s'"
 msgstr "di kilalang uri ng compression `%s'!"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr ""
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, fuzzy, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s ay nangangailangan ng argumentong pangalan ng talaksang .deb"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, fuzzy, c-format
 msgid "--%s needs <name>"
 msgstr "--%s ay hindi tumatanggap ng mga argumento"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--build ay nangangailangan ng argumentong directory"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, fuzzy, c-format
 msgid "unknown option `%s'"
 msgstr "di kilalang opsyon --%s"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
 msgstr ""
 
-#: utils/update-alternatives.c:2215
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr ""
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr ""
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "error sa pagbasa ng standard input"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
 "updates only."
 msgstr ""
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr ""
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 "  %.250s ay nagbibigay ng %.250s ngunit ito'y tatanggalan ng pagkaayos.\n"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr ""
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "%s (subprocess): %s\n"
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "bigo sa pag-exec ng %s"
+
+#, fuzzy
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "hindi makagawa ng backup symlink para sa `%.255s'"
+
+#, fuzzy
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "hindi maluklok ang `%.250s' bilang `%.250s'"
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "error sa pagsulat ng `%s'"
+
+#, fuzzy
+#~ msgid "unable to read %s: %s"
+#~ msgstr "hindi ma-execute ang %s"
+
+#, fuzzy
+#~ msgid "unable to close %s: %s"
+#~ msgstr "hindi ma-execute ang %s"
+
+#, fuzzy
+#~ msgid "cannot write %s: %s"
+#~ msgstr "hindi ma-execute ang %s"
+
+#, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "hindi ma-stat ang %s `%.250s'"
 
@@ -6145,9 +6202,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "linaktawan ang datos na kasapi mula sa %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "bigo na i-exec ang tar"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "bigo na likhain ang temporary directoryname"
Binary files dpkg/po/vi.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/vi.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/vi.po /home/vorlon/devel/multiarch/dpkg-debian/po/vi.po
--- dpkg/po/vi.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/vi.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.15.8.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2011-04-28 03:22+0200\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -24,7 +24,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "không thể ghi tập tin « %s »"
@@ -45,71 +45,77 @@
 msgid "ar member file (%s)"
 msgstr "lỗi lấy trạng thái về tập tin bộ phận ar (%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "lỗi đọc khi sao chép vùng đệm cho %s"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "lỗi ghi khi sao chép vùng đệm cho %s"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "đọc ngắn khi sao chép vùng đệm cho %s"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "lỗi thực hiện tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "không thể thực hiện %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: giải nén"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s: nén"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s: lỗi đóng kết dữ liệu nhập với luồng nén gzip"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s: lỗi đọc nội bộ của gzip: « %s »"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s: lỗi ghi nội bộ của gzip"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s: lỗi đóng kết dữ liệu xuất với luồng nén gzip"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s: lỗi đọc nội bộ của gzip"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s: lỗi ghi nội bộ của gzip: « %s »"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s: lỗi ghi nội bộ của gzip: %s"
@@ -124,31 +130,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s: lỗi đọc nội bộ của bzip2: « %s »"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s: lỗi ghi nội bộ của bzip2"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s: lỗi đóng kết dữ liệu xuất với luồng nén bzip2"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s: lỗi đọc nội bộ của bzip2"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s: lỗi ghi nội bộ của bzip2: « %s »"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "gặp lỗi bzip2 bất thường"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -157,7 +163,7 @@
 "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/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -165,99 +171,99 @@
 "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/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "không thể quét thư mục cập nhật « %.255s »"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 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/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "không thể tạo « %.255s »"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "không thể làm đầy %.250s bằng các ký tự đệm lót"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "không thể xóa sạch %.250s sau khi đệm lót"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "không thể tìm vị trí tới đầu của %.250s sau khi đệm lót"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "không thể mở tập tin khoá %s để thử"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "không thể mở/tạo tập tin khóa của cơ sở dữ liệu trạng thái"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "không có quyền khóa cơ sở dữ liệu trạng thái của dpkg"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "không thể khóa cơ sở dữ liệu trạng thái của dpkg"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "thao tác đã yêu cầu cần thiết quyền của siêu người dùng (superuser)"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "không thể truy cập vùng trạng thái của dpkg"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "thao tác cần thiết quyền đọc/ghi trong vùng trạng thái của dpkg"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "lỗi gỡ bỏ tập tin cập nhật của mình %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "không thể ghi trạng thái đã cập nhật của « %.250s »"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "không thể xóa sạch trạng thái đã cập nhật của « %.250s »"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "không thể cắt ngắn cho trạng thái đã cập nhật của « %.250s »"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, 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 »"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "không thể đóng trạng thái đã cập nhật của « %.250s »"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "không thể cài đặt trạng thái đã cập nhật của « %.250s »"
@@ -280,70 +286,72 @@
 msgid "unable to open directory '%s'"
 msgstr "không thể mở tập tin « %s »"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "không thể mở tập tin « %s »"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "không thể động bộ hoá tập tin « %s »"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "không thể đóng tập tin « %s »"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "lỗi ghi chi tiết về « %.50s » vào « %.250s »"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "lỗi mở « %s » để ghi cơ sở dữ liệu %s"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "không thể đặt khả năng chuyển hoán đệm trên tập tin cơ sở dữ liệu %s"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "lỗi ghi vào « %.250s » mục ghi cơ sở dữ liệu %s về « %.50s »"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "lỗi chuyển hết cơ sở dữ liệu %s ra « %.250s »"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "lỗi fsync (đồng bộ tập tin) cơ sở dữ liệu %s với « %.250s »"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "lỗi đóng « %.250s » sau khi ghi cơ sở dữ liệu %s"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "lỗi liên kết « %.250s » tới « %.250s » để sao lưu cơ sở dữ liệu %s"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "lỗi cài đặt « %.250s » như là « %.250s » chứa cơ sở dữ liệu %s"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -352,7 +360,7 @@
 "%s: gặp lỗi nghiêm trọng mà không thể phục hồi nên hủy bỏ :\n"
 "%s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -364,13 +372,13 @@
 "%s: gặp lỗi nghiêm trọng mà không thể phục hồi nên hủy bỏ :\n"
 "%s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "không đủ bộ nhớ cho mục dọn dẹp mới"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -379,32 +387,32 @@
 "%s: lỗi khi dọn dẹp:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg: quá nhiều lỗi lồng nhau trong khi phục hồi lỗi.\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "không đủ bộ nhớ cho mục dọn dẹp mới"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "không đủ bộ nhớ cho mục dọn dẹp mới có nhiều đối số"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s: cảnh báo : %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s: cảnh báo : %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d: lỗi nội bộ : %s\n"
@@ -420,116 +428,116 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "không cho phép « %*s » cho %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "rác nằm sau %s"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "tên gói không hợp lệ (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "trường chi tiết tập tin rỗng « %s »"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "không cho phép trường chi tiết tập tin « %s » trong tập tin trạng thái"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 "quá nhiều giá trị trong trường chi tiết tập tin « %s » (so sánh với những "
 "cái khác)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, 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 "
 "khác)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "có/không trong trường hợp lý (đúng/sai)"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "gặp từ trong trường « priority » (ưu tiên)"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 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"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "từ thứ nhất (want [muốn]) trong trường « status » (trạng thái)"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "từ thứ hai (error [lỗi]) trong trường « status » (trạng thái)"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "từ thứ ba (status [trạng thái]) trong trường « status » (trạng thái)"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "lỗi trong chuỗi « Version » (phiên bản) « %.250s »"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 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 "
 "đổi gói) cũ"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 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) "
 "trong ngữ cảnh này"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "lỗi trong chuỗi « Config-Version » (phiên bản cấu hình) « %.250s »"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, 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 »"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, 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 "
 "phải khoảng trắng « %c »"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "thư mục gốc hay rỗng được liệt kê như là một tập tin cấu hình"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr "trường « %s », tên gói bị thiếu, hoặc rác ở nơi chờ đợi tên gói"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "trường « %s », tên gói không hợp lệ « %.255s »: %s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -538,7 +546,7 @@
 "trường « %s », tham chiếu đến « %.255s »:\n"
 " quan hệ phiên bản sai %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -547,7 +555,7 @@
 "trường « %s », tham chiếu đến « %.255s »:\n"
 " « %c » là cũ, dùng « %c= » hay « %c%c » thay thế"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -556,11 +564,11 @@
 "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/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Chỉ dùng được phiên bản chính xác cho Provides (miễn là)"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -569,59 +577,59 @@
 "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/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, 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 »"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "trường « %s », tham chiếu đến « %.255s »: phiên bản chưa được kết thúc"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "trường « %s », tham chiếu đến « %.255s »: gặp lỗi trong phiên bản"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "trường « %s », lỗi cú pháp ở sau tham chiếu đến gói « %.255s »"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "không cho phép điều xen kẽ (« | ») trong trường %s"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 "không cho phép giá trị cho trường « triggers-pending » (bộ gây nên bị hoãn) "
 "trong ngữ cảnh này"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "tên bộ gây nên cấm « %.255s »: %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "bộ gây nên trùng bị hoãn « %.255s »"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr ""
 "không cho phép giá trị cho trường « triggers-awaited » (các bộ gây nên mong "
 "đợi) trong ngữ cảnh này"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "gặp tên gói không hợp lệ trong bộ gây nên mong đợi « %.255s »: %s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "gói bộ gây nên trùng mong đợi « %.255s »"
@@ -678,7 +686,7 @@
 msgid "unable to write to status fd %d"
 msgstr "không thể ghi vào bộ mô tả tập tin (fd) kiểu trạng thái %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "malloc failed (%ld bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -690,8 +698,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc (cấp phát lại) bị lỗi (%ld byte)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "lỗi cấp phát bộ nhớ"
 
@@ -724,208 +732,214 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "không thể đặt cờ close-on-exec (đóng khi thực hiện) cho %.250s"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "lỗi cấu hình: %s:%d: %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "lỗi mở tập tin cấu hình « %.255s » để đọc: %s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "« %s » chứa dấu trích dẫn thừa hay thiếu"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "không rõ tùy chọn « %s »"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "tùy chọn « %s » yêu cầu một giá trị"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "tùy chọn « %s » không chấp nhận giá trị"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "lỗi đọc trong tập tin cấu hình « %.255s »"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "lỗi đóng tập tin cấu hình « %.255s »"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "lỗi mở thư mục cấu hình « %s »"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "tùy chọn không rõ « --%s »"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "tùy chọn « --%s » yêu cầu một giá trị"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "tùy chọn « --%s » không chấp nhận giá trị"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "tùy chọn không rõ « -%c »"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "tùy chọn « -%c » yêu cầu một giá trị"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "tùy chọn « -%c » không chấp nhận giá trị"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "tùy chọn cũ « --%s »\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "hành động xung đột « -%c (--%s) » và « -%c  (--%s) »"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "giá trị nhân đôi cho trường « %s »"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "tên trường do người dùng xác định « %.*s » quá ngắn"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "giá trị nhân đôi cho trường do người dùng xác định « %.*s »"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 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) "
 "không thích hợp"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "gói có trạng thái %s nhưng mong đợi bộ gây nên"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "gói có trạng thái mong đợi bộ gây nên nhưng không mong đợi bộ gây nên"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "gói có trạng thái %s nhưng có bộ gây nên bị hoãn"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "gói có trạng thái bộ gây nên bị hoãn nhưng không có bộ gây nên bị hoãn"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 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à "
 "quên chúng"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "lỗi mở tập tin thông tin gói « %.255s » để đọc"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "không thể lấy các thông tin về tập tin thông tin gói « %.255s »"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "không thể mmap (ánh xạ bộ nhớ) tập tin thông tin gói « %.255s »"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "không thể lấy các thông tin về tập tin thông tin gói « %.255s »"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "lỗi đóng sau khi đọc: « %.255s »"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "gặp kết thúc tập tin sau tên trường « %.*s »"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "dòng mới trong tên trường « %.*s »"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "gặp kết thúc tập tin dạng MSDOS (^Z) trong tên trường « %.*s »"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "tên trường « %.*s » phải có dấu hai chấm theo sau"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, 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 "
 "mới cuối cùng)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, 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 "
 "dòng mới?)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "dòng mới trong tên trường « %.*s »"
+
+#: lib/dpkg/parse.c:461
 #, 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 "
 "cuối cùng)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "tìm thấy vài mục nhập thông tin gói, chỉ cho phép một mục"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "lỗi đóng sau khi đọc: « %.255s »"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "không có thông tin gói trong « %.255s »"
@@ -954,63 +968,63 @@
 "%s, trong tập tin « %.255s » ở gần dòng %d:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "có thể không phải là chuỗi rỗng"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "cần phải bắt đầu với một chữ số"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, 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 »"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<không có>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "chuỗi phiên bản là rỗng"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "chuỗi phiên bản có khoảng trắng nhúng"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "kỷ nguyên trong phiên bản không phải là con số"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "không có gì nằm sau dấu hai chấm trong số thứ tự phiên bản"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "gặp ký tự sai trong số thứ tự phiên bản"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "gặp ký tự sai trong số thứ tự bản sửa đổi"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "thiếu %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "giá trị rỗng cho %s"
@@ -1029,52 +1043,52 @@
 msgid "(no description available)"
 msgstr "(không có mô tả)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "không thể bỏ qua tín hiệu %s trước khi chạy %.250s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "gặp lỗi khi hủy bắt tín hiệu %s: %s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (tiến trình con): %s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "lỗi tạo tiến trình con"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "tiến trình con %s trả lại lỗi, trạng thái thoát %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "lỗi chờ tiến trình phụ %s"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "tiến trình con %s bị diệt bởi tín hiệu (%s)%s"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", lõi bị đổ"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "tiến trình con %s bị lỗi với mã trạng thái chờ %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "lỗi chờ tiến trình phụ %s"
@@ -1096,61 +1110,53 @@
 msgstr ""
 "gặp lỗi cú pháp trong tập tin bộ gây nên trì hoãn « %.250s » ở ký tự `%s'%s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "không thể mở/tạo tập tin khoá bộ gây nên « %.250s »"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "đã gây nên"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "không thể lấy trạng thái về tập tin bộ gây nên trì hoãn « %.250s »"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "không thể mở tập tin bộ gây nên trì hoãn « %.250s »"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "không thể mở/tạo tập tin bộ gây nên trì hoãn mới « %.250s »"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "gặp lỗi khi đọc tập tin bộ gây nên trì hoãn « %.250s »"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "không thể mở tập tin bộ gây nên trì hoãn mới « %.250s »"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "không thể mở tập tin bộ gây nên trì hoãn mới « %.250s »"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "không thể cài đặt tập tin bộ gây nên trì hoãn mới « %.250s »"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "không cho phép tên bộ gây nên rỗng"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "tên bộ gây nên chứa ký tự không hợp lệ"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1159,17 +1165,17 @@
 "gặp cú pháp không hợp lệ hoặc không rõ trong tên bộ gây nên « %.250s "
 "» (trong sự quan tâm bộ gây nên đối với gói « %.250s »"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "lỗi mở tập tin danh sách sự quan tâm bộ gây nên « %.250s »"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "lỗi quay trả lại tập tin danh sách sự quan tâm bộ gây nên « %.250s »"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1178,37 +1184,43 @@
 "gặp lỗi cú pháp trong tập tin sự quan tâm bộ gây nên « %.250s »; tên gói cấm "
 "« %.250s »: %.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "không thể tạo tập tin sự quan tâm bộ gây nên mới « %.250s »"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "không thể viết tập tin sự quan tâm bộ gây nên mới « %.250s »"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "không thể chuyển hết tập tin sự quan tâm bộ gây nên mới « %.250s »"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "không thể động bộ hoá tập tin sự quan tâm bộ gây nên mới « %.250s »"
 
-#: lib/dpkg/triglib.c:442
-#, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "không thể đóng tập tin sự quan tâm bộ gây nên mới « %.250s »"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "không thể cài đặt tập tin sự quan tâm bộ gây nên mới « %.250s »"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "không thể gỡ bỏ « %.250s »"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "không thể tạo tập tin sự quan tâm bộ gây nên mới « %.250s »"
+
+#: lib/dpkg/triglib.c:383
+#, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "không thể đóng tập tin sự quan tâm bộ gây nên mới « %.250s »"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
@@ -1216,47 +1228,47 @@
 "sự quan tâm bộ gây nên tập tin trùng đối với tên tập tin « %.250s » và gói « "
 "%.250s »"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "không thể tạo tập tin bộ gây nên tập tin mới « %.250s »"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "không thể viết tập tin bộ gây nên tập tin mới « %.250s »"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "không thể chuyển hết tập tin bộ gây nên tập tin mới « %.250s »"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "không thể động bộ hoá tập tin bộ gây nên tập tin mới « %.250s »"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "không thể đóng tập tin bộ gây nên tập tin mới « %.250s »"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "không thể cài đặt tập tin bộ gây nên tập tin mới dạng « %.250s »"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "không thể đọc tập tin bộ gây nên tập tin « %.250s »"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "lỗi cú pháp trong tập tin bộ gây nên tập tin « %.250s »"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1265,7 +1277,7 @@
 "mục ghi bộ gây nên tập tin chứa tên gói cấm « %.250s » (đối với sự quan tâm "
 "trong tập tin « %.250s »): %.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1274,31 +1286,39 @@
 "tập tin ci bộ gây nên « %.250s » chứa cú pháp bộ gây nên cấm trong tên bộ "
 "gây nên « %.250s »: %.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "không thể mở tập tin ci bộ gây nên « %.250s »"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "tập tin ci bộ gây nên chứa cú pháp chỉ thị không rõ"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "tập tin ci bộ gây nên chứa chỉ thị không rõ « %.250s »"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "không thể tạo thư mục tình trạng bộ gây nên « %.250s »"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 "không thể đặt quyền sở hữu của thư mục tình trạng bộ gây nên « %.250s »"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "không cho phép tên bộ gây nên rỗng"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "tên bộ gây nên chứa ký tự không hợp lệ"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1323,7 +1343,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "gặp lỗi khi định dạng chuỗi sang biến varbuf"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "gặp lỗi khi đọc từ ống dẫn dpkg-deb"
 
@@ -1343,12 +1363,12 @@
 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:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "gặp lỗi khi đặt quyền sở hữu « %.255s »"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "gặp lỗi khi đặt quyền hạn của « %.255s »"
@@ -1413,17 +1433,26 @@
 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:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "không thể lấy trạng thái về tập tin « %s »"
+
+#: src/archives.c:641
 #, 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:633
+#: src/archives.c:645
 #, 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:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1432,96 +1461,101 @@
 "đang cố ghi đè lên thư mục « %.250s » trong gói %.250s %.250s với điều khác "
 "thư mục"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "đang cố ghi đè lên « %.250s », mà cũng nằm trong gói %.250s %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "không tạo được « %.255s » (trong khi xử lý « %.255s »)"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "hậu phương dpkg-deb trong tiến trình « %.255s »"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "lỗi đóng/ghi « %.255s »"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "lỗi tạo ống dẫn « %.255s »"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "lỗi tạo thiết bị « %.255s »"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "lỗi tạo liên kết cứng « %.255s »"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, 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:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "lỗi tạo thư mục « %.255s »"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, 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:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "không thể đọc liên kết « %.255s »"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, 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:830
+#: src/archives.c:841
 #, 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 "
 "cho « %.255s »"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, 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 "
 "phiên bản mới"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, 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:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "không thể mở « %.255s »"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "không thể động bộ hoá tập tin « %.255s »"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1530,7 +1564,7 @@
 "đang lờ vấn đề quan hệ phụ thuộc về %s:\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
@@ -1539,7 +1573,7 @@
 "coi như hủy cấu hình của gói cốt yếu %s,\n"
 "để hiệu lực %s."
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1548,7 +1582,7 @@
 "dpkg: không, %s là cốt yếu, sẽ không hủy\n"
 "cấu hình nó để hiệu lực %s.\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1558,28 +1592,28 @@
 "hình] sẽ giúp):\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "việc gỡ bỏ %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "việc cài đặt %.250s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: coi như hủy cấu hình %s, mà sẽ bị %s vỡ ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: có, sẽ hủy cấu hình %s (bị %s vỡ).\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1588,11 +1622,11 @@
 "dpkg: về trường hợp %s chứa %s:\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "đang lờ trường hợp vỡ, vẫn có thể tiếp tục lại."
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1601,27 +1635,27 @@
 "cài đặt %.250s nên vỡ %.250s, cũng không cho phép\n"
 "hủy cấu hình (« --auto-deconfigure » [tự động hủy cấu hình] sẽ giúp)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "cài đặt %.250s nên vỡ phần mềm đã có"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, 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:1110
+#: src/archives.c:1122
 #, 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:1139
+#: src/archives.c:1151
 #, 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:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1630,110 +1664,112 @@
 "dpkg: gói %s yêu cầu cài đặt lại, nhưng sẽ vẫn gỡ bỏ nó theo yêu cầu của "
 "bạn.\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, 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:1166
+#: src/archives.c:1178
 #, 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:1178
+#: src/archives.c:1190
 #, 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:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "đang lờ trường hợp xung đột, vẫn có thể tiếp tục lại."
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, 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:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "tìm cho dpkg --recursive (đệ qui)"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "lỗi fdopen ống dẫn của find (tìm)"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "gặp lỗi khi đọc ống dẫn của find (tìm)"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "gặp lỗi khi đóng ống dẫn của find (tìm)"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, 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"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 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:1278
+#: src/archives.c:1290
 #, 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:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<đầu ra tiêu chuẩn>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<đầu lỗi tiêu chuẩn>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "Đang chọn gói đã hủy chọn trước đây %s.\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "Đang bỏ qua gói đã hủy chọn %s.\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, 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:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "đang hạ thấp phiên bản %.250s từ %.250s xuống %.250s."
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, 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ỏ "
 "qua.\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
@@ -1742,39 +1778,39 @@
 "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:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "không thể phục hồi phiên bản sao lưu của « %.250s »"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "không thể gỡ bỏ bản sao lưu của « %.250s »"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "không thể gỡ bỏ phiên bản mới cài đặt của « %.250s »"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "không thể gỡ bỏ phiên bản mới giải phóng của « %.250s »"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "không thể lấy trạng thái vê tập tin cấu hình mới phát hành « %.250s »"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 "không thể lấy trạng thái vê tập tin cấu hình hiện thời được cài đặt « %.250s "
 "»"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1785,57 +1821,57 @@
 "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"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s: lỗi gỡ bỏ bản sao lưu cũ « %.250s »: %s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s: lỗi thay đổi tên « %.250s » thành « %.250s »: %s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s: lỗi gỡ bỏ « %.250s »: %s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s: lỗi gỡ bỏ phiên bản phát hành cũ « %.250s »: %s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s: lỗi gỡ bỏ « %.250s » (trước khi ghi đè): %s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s: lỗi liên kết « %.250s » tới « %.250s »: %s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "Đang cài đặt phiên bản mới của tập tin cấu hình %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "không thể cài đặt « %.250s » như là « %.250s »"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "không có gói tên « %s » được cài đặt nên không thể cấu hình"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "gói %.250s đã được cài đặt và cấu hình"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1844,7 +1880,7 @@
 "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:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1853,11 +1889,11 @@
 "dpkg: vấn đề quan hệ phụ thuộc ngăn cản việc cấu hình %s:\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "vấn đề quan hệ phụ thuộc - để nguyên chưa được cấu hình"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1866,7 +1902,7 @@
 "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:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1874,12 +1910,12 @@
 "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:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "Đang thiết lập %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1888,7 +1924,7 @@
 "%s: không thể lấy trạng thái về tập tin cấu hình « %s »\n"
 " (= '%s'): %s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1897,7 +1933,7 @@
 "%s: tập tin cấu hình « %s » là một liên kết vòng tròn\n"
 " (= '%s')"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1906,7 +1942,7 @@
 "%s: không thể readlink (thêm liên kết lại) tập tin cấu hình « %s »\n"
 " (= '%s'): %s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1915,7 +1951,7 @@
 "%s: 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 »)"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
@@ -1923,30 +1959,30 @@
 "hay liên kết tượng trưng (= '%s')"
 
 # Name: don't translate/Tên: đừng dịch
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr ""
 "%s: không thể mở tập tin cấu hình %s cho hàm tạo một chuỗi duy nhất cho tập "
 "tin (hash): %s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "Gõ « exit » (thoát) một khi hoàn tất.\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1955,12 +1991,12 @@
 "\n"
 "Tập tin cấu hình « %s »"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " (thực sự « %s »)"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1971,7 +2007,7 @@
 " ==> 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"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1980,7 +2016,7 @@
 "\n"
 "     Chưa sửa đổi kể từ lúc cài đặt.\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1989,7 +2025,7 @@
 "\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:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1998,37 +2034,37 @@
 "\n"
 " ==> Đã xoá (bởi bạn hay văn lệnh) kể từ lúc cài đặt.\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> Nhà phân phối gói đã cung cấp một phiên bản đã cập nhật.\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     Phiên bản trong gói là trùng với phiên bản cài đặt cuối cùng.\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> Đang sử dụng tập tin mới như bạn yêu cầu.\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> Đang sử dụng tập tin cũ hiện thời như bạn yêu cầu.\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> Đang giữ tập tin cấu hình cũ làm mặc định.\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> Đang dùng tập tin cấu hình mới làm mặc định.\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -2043,160 +2079,162 @@
 "      D     —  hiển thị sự khác nhau giữa hai phiên bản\n"
 "      Z     —  chạy một trình bao để xem lại trường hợp\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " Hành động mặc định là giữ phiên bản hiện thời.\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " Hành vi mặc định là cài đặt phiên bản mới.\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[mặc định=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[mặc định=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[không có giá trị mặc định]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 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 "
 "tin cấu hình"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "lỗi đọc trên thiết bị nhập chuẩn ở dấu nhắc tập tin cấu hình"
 
-#: src/configure.c:676
+#: src/configure.c:681
 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"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s phụ thuộc vào %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s phụ thuộc sẵn vào %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s khuyên %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s đề nghị %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s ngắt %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s xung đột với %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s tăng cường %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s sẽ bị gỡ bỏ.\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s sẽ bị hủy cấu hình.\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, 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:304
+#: src/depcon.c:314
 #, 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:319
+#: src/depcon.c:333
 #, 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:323
+#: src/depcon.c:337
 #, 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:329
+#: src/depcon.c:343
 #, 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:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s là %s.\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, 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:378
+#: src/depcon.c:392
 #, 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:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s cung cấp %.250s nhưng là %s.\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s không hiện thời được cài đặt.\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, 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:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (phiên bản %.250s) đã có và %s.\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, 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:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s cung cấp %.250s và đã có và %s.\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr ""
 "Hãy sử dụng tuỳ chọn trợ giúp « --help » để tìm trợ giúp về chức năng truy "
 "vấn gói."
@@ -2206,7 +2244,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s phiên bản %s.\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2217,8 +2255,8 @@
 "Tác quyền © năm 2000,2001 của Wichert Akkerman.\n"
 "Tác quyền © năm 2010 Guillem Jover.\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2229,7 +2267,7 @@
 "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"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2239,7 +2277,7 @@
 "Sử dụng: %s [<tùy_chọn> ...] <lệnh>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2258,7 +2296,7 @@
 "  --truename <tệp>        làm trở lại tập tin bị làm trệch đi.\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2290,7 +2328,7 @@
 "  --version                           hiển thị số thứ tự phiên bản.\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2305,17 +2343,12 @@
 "Văn lệnh chạy sau khi cài đặt hoặc gỡ bỏ gói thì cũng phải ghi rõ « --"
 "package » và « --divert ».\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "không thể lấy trạng thái về tập tin « %s »"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "gặp lỗi khi kiểm tra « %s »"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2324,129 +2357,129 @@
 "« rename » cần thiết việc ghi đè « %s »\n"
 "  bằng tập tin khác « %s », không cho phép"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "không thể ghi tập tin « %s »"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "chép tập tin"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "không thể thay đổi tên « %s » thành « %s »"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "rename: gỡ bỏ liên kết cũ nhân đôi « %s »"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "không thể mở tập tin nguồn « %.250s »"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "%s bị làm trệch nội bộ"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "%s bị làm trệch nội bộ tới %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "%s bị %s làm trệch đi"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "%1$s bị %3$s làm trệch tới %2$s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "%s bị làm trệch nào"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "%s bị làm trệch nào tới %s"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "không thể tạo tập tin %s mới"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "không thể chuyển hết tập tin « %s »"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "gặp lỗi khi gỡ bỏ tập tin « diversions-old » cũ"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "gặp lỗi khi tạo tập tin « diversions-old » mới"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "gặp lỗi khi cài đặt sự làm trệch đi mới"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "« --%s » yêu cầu một đối số rlêng lẻ"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "tên tập tin « %s » không phải là tuyệt đối"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "tập tin không thể chứa ký tự dòng mới"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "Không thể chuyển hướng thư mục"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "không thể chuyển hướng tập tin « %s » tới chính nó"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "Đang để lại « %s »\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "« %s » xung đột với « %s »"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "Đang thêm « %s »\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Không có sự làm trệch « %s » nào nên không gỡ bỏ.\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2457,7 +2490,7 @@
 "  khi gỡ bỏ « %s »\n"
 "  tìm thấy « %s »"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2468,16 +2501,16 @@
 "  khi gỡ bỏ « %s »\n"
 "  tìm thấy « %s »"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "Đang gỡ bỏ « %s »\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "« package » (gói) không thể chứa ký tự dòng mới"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 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"
 
@@ -2566,8 +2599,8 @@
 " • dpkg --triggers-only\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "« --%s » không chấp nhận đối số"
@@ -2663,7 +2696,7 @@
 msgid "--compare-versions bad relation"
 msgstr "« --compare-versions » (so sánh phiên bản) có quan hệ sai"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "phiên bản « %s » có cú pháp sai: %s"
@@ -2720,12 +2753,12 @@
 "có quyền cao hơn vấn đề này vì tuỳ chọn « --force » (ép buộc) đã được hiệu "
 "lực: "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "không thể mở tập tin liệt kê nội dung gói « %.250s »"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2734,69 +2767,69 @@
 "thiếu tập tin liệt kê nội dung gói « %.250s », giả sử gói này không có tập "
 "tin hiện thời được cài đặt."
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "không thể lấy trạng thái về tập tin liệt kê nội dung gói « %.250s »"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "nội dung gói « %.250s »"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 "tập tin liệt kê nội dung gói « %.250s » còn thiếu ký tự dòng mới cuối cùng"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "tập tin liệt kê nội dung gói « %.250s » chứa tên tập tin rỗng"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "gặp lỗi khi đóng tập tin liệt kê nội dung gói « %.250s »"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(Đang đọc cơ sở dữ liệu ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "%d tập tin hoặc thư mục hiện thời được cài đặt.)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "không thể tạo tập tin liệt kê nội dung đã cập nhật cho gói %s"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "lỗi ghi vào tập tin liệt kê nội dung đã cập nhật cho gói %s"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "lỗi xóa sạch tập tin liệt kê nội dung đã cập nhật cho gói %s"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "lỗi đồng bộ hoá tập tin liệt kê nội dung đã cập nhật cho gói %s"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "lỗi đóng tập tin liệt kê nội dung đã cập nhật cho gói %s"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "lỗi cài đặt tập tin liệt kê nội dung đã cập nhật cho gói %s"
@@ -2834,7 +2867,9 @@
 msgstr "đã cài đặt"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "lỗi: chưa đặt PATH (đường dẫn đến phần mềm)."
 
 #: src/help.c:129
@@ -2880,7 +2915,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2892,65 +2927,65 @@
 msgstr "lỗi chroot tới « %.250s »"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "lỗi chdir (chuyển đổi thư mục) sang « %.255s »"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "không thể đặt quyền thực hiện cho « %.250s »"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "không thể setenv (đặt môi trường) cho văn lệnh bảo tồn"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "đã cài đặt văn lệnh %s"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "không thể lấy các thông tin về %s « %.250s »"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "văn lệnh %s mới"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "văn lệnh %s cũ"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "không thể lấy trạng thái về %s « %.250s »: %s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg — đang thử văn lệnh từ gói mới để thay thế ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "không có văn lệnh trong phiên bản mới của gói nên chịu thua"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg: ... có vẻ như việc đã làm được.\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "không thể gỡ bỏ bảo mật « %.255s »"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2959,7 +2994,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "không thể kiểm tra sự tồn tại của « %.250s »"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "không thể đọc thư mục thông tin"
 
@@ -3037,7 +3072,7 @@
 "   -Dh|--debug=help                 HIện trợ giúp về việc gỡ lỗi.\n"
 " \n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3180,7 +3215,7 @@
 "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:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3232,30 +3267,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3264,103 +3303,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "gặp vấn đề quan hệ phụ thuộc nên không gỡ bỏ"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "gặp vấn đề quan hệ phụ thuộc nên không gỡ bỏ"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "không thể setenv (đặt môi trường) cho văn lệnh bảo tồn"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "lỗi đọc trong tập tin cấu hình « %.255s »"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3368,7 +3407,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3376,39 +3415,39 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "« --debug » (gỡ lỗi) cần một đối số kiểu bát phân"
 
-#: src/main.c:346
+#: src/main.c:348
 #, 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-"
 "depends » (lờ đi các quan hệ phụ thuộc) « %.250s »"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "« --ignore-depends » cần một tên gói hợp lệ. « %.250s » không phải; %s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "số nguyên không hợp lệ cho « --%s »: « %.250s »"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "gặp lỗi khi thực hiện hàm móc « %s », mã thoát %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "trạng thái"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3417,7 +3456,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3425,12 +3464,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "không rõ tùy chọn ép buộc hoặc từ chối « %.*s »"
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "quá cũ tùy chọn ép buộc hoặc từ chối « %s »\n"
@@ -3454,8 +3493,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "gặp kết thúc tập tin bất thường trước kết thúc dòng %d"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "cần một tùy chọn hành động"
 
@@ -3619,89 +3658,89 @@
 msgid "passed\n"
 msgstr "đã qua\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "không thể tạo thư mục tạm thời"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "gói %s có quá nhiều cặp Xung đột/Thay thế"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, 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 »"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "không thể gỡ bỏ tập tin thông tin cũ « %.250s »"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "không thể cài đặt tập tin thông tin (giả thiết) mới « %.250s »"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "không thể mở thư mục điều khiển tạm thời"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr "gói chứa tên tập tin thông tin điều khiển quá dài (bắt đầu « %.50s »)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "thông tin điều khiển gói chứa thư mục « %.250s »"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 "việc rmdir (gỡ bỏ thư mục) kiểu thông tin điều khiển gói của « %.250s » "
 "không nói « không phải là thư mục »"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "gói %s chứa một danh sách dưới dạng tập tin thông tin"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 "không thể cài đặt tập tin thông tin mới « %.250s » dưới dạng « %.250s »"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "không thể xóa tập tin thông tin điều khiển « %.250s »"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "không thể truy cập kho lưu"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "không thể tạo thư mục tạm thời"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "độ dài thông tin điều khiển"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "Đã ghi lưu thông tin về %s từ %s.\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "kiến trúc gói (%s) không khớp với hệ thống (%s)"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3710,101 +3749,101 @@
 "dpkg: về %s chứa %s, vấn đề quan hệ phụ thuộc sẵn:\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "vấn đề quan hệ phụ thuộc sẵn nên không cài đặt %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "đang lờ vấn đề về quan hệ phụ thuộc sẵn."
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "Đang chuẩn bị thay thế %s %s (bằng %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "Đang mở gói %s (từ %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "tên của tập tin cấu hình (bắt đầu « %.250s ») quá dài (>%d ký tự)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "gặp lỗi đọc trong %.250s"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "gặp lỗi khi đóng %.250s"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "gặp lỗi khi cố mở %.250s"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "Đang huỷ cấu hình %s, để có khả năng gỡ bỏ %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "Đang hủy cấu hình %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "Đang mở gói điều thay thế %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "dpkg-deb lấy trường"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "gặp lỗi khi đọc kết xuất tar của « dpkg-deb »"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "tập tin .tar của hệ thống tập tin bị hỏng — kho lưu gói bị hỏng"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb: sửa các số không đi sau có thể"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 "không thể lấy trạng thái về tập tin cũ « %.250s » nên không xoá bỏ nó : %s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "không thể xoá bỏ thư mục cũ « %.250s »: %s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 "tập tin cấu hình cũ « %.250s » là một thư mục trống (thì đã được xoá bỏ)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 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:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3813,12 +3852,12 @@
 "tập tin cũ « %.250s » là cùng một tập tin với vài tập tin mới (cả hai « "
 "%.250s » và « %.250s »)"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "không thể gỡ bỏ bảo mật tập tin cũ « %.250s »: %s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(Đang ghi lưu sự biến mất của %s, mà đã hoàn toàn được thay thế.)\n"
@@ -4016,7 +4055,7 @@
 "  --showformat=<định_dạng>      Dùng định dạng xen kẽ cho « --show »\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -4040,6 +4079,12 @@
 "  Trường được canh lề phải, nếu độ rộng không âm\n"
 "  (trong trường hợp đó, canh lề trái).\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+"Hãy sử dụng tuỳ chọn trợ giúp « --help » để tìm trợ giúp về chức năng truy "
+"vấn gói."
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -4099,7 +4144,7 @@
 msgid "Removing %s ...\n"
 msgstr "Đang gỡ bỏ %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -4108,48 +4153,49 @@
 "trong khi gỡ bỏ %.250s, không thể gỡ bỏ thư mục « %.250s »:\n"
 "%s — thư mục có thể là một điểm lắp không?"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "không thể gỡ bỏ « %.250s »"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "không thể gỡ bỏ bảo mật « %.250s »"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "trong khi gỡ bỏ %.250s, thư mục « %.250s » không trống nên không được gỡ bỏ."
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "không thể gỡ bỏ « %.250s »"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "Đang tẩy các tập tin cấu hình cho %s ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "không thể gỡ bỏ tập tin cấu hình cũ « %.250s » (= « %.250s »)"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "không thể đọc thư mục tập tin cấu hình « %.250s » (từ « %.250s »)"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, 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 »)"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "không thể gỡ bỏ danh sách các tập tin cũ"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "không thể gỡ bỏ văn lệnh postrm (sau khi gỡ bỏ) cũ"
 
@@ -4192,7 +4238,15 @@
 msgid "read error on standard input"
 msgstr "lỗi đọc trên thiết bị nhập chuẩn"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+"Hãy sử dụng tuỳ chọn trợ giúp « --help » để tìm trợ giúp về chức năng truy "
+"vấn gói."
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4201,7 +4255,7 @@
 "Tác quyền © năm 2000, 2001 của Wichert Akkerman\n"
 "Tác quyền © năm 2006-2009 của Guillem Jover.\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4219,7 +4273,7 @@
 "liệu\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4241,31 +4295,31 @@
 "  --version                hiển thị số thứ tự phiên bản.\n"
 "\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "đang tước các dấu xuyệc / theo sau"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "không thể mở tập tin statoverride mới"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "gặp lỗi khi gỡ bỏ « statoverride-old »"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "gặp lỗi khi tạo « statoverride-old » mới"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "gặp lỗi khi cài đặt « statoverride » mới"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "« --add » yêu cầu 4 đối số"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
@@ -4274,21 +4328,21 @@
 "Đã có một sự ghi đè cho « %s » mà bị bỏ qua vì « --force » (ép buộc) được "
 "xác định."
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "Đã có một sự ghi đè cho « %s » nên hủy bỏ."
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "tùy chọn « --update » (cập nhật) đưa ra nhưng %s không tồn tại"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "Không có sự đè."
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "tùy chọn « --update » (cập nhật) vô ích cho « --remove » (gỡ bỏ)"
 
@@ -4355,16 +4409,16 @@
 msgstr ""
 "có nhiều statusoverride (sự ghi đè lên trạng thái) cho tập tin « %.250s »"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Gõ « dpkg-trigger --help » để xem trợ giúp về tiện ích này."
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Tiện ích gây nên gói %s của Debian, phiên bản %s.\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4375,7 +4429,7 @@
 "       %s [<tùy_chọn> ...] <câu_lệnh>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4388,7 +4442,7 @@
 "không.\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4410,21 +4464,21 @@
 "  --no-act                         Chỉ thử, không phải thật thay đổi gì.\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s: chưa tạo thư mục dữ liệu bộ gây nên\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s: mục ghi bộ gây nên chưa tồn tại\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "chấp nhận 1 đối số, tên bộ gây nên"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4434,13 +4488,13 @@
 "« dpkg-trigger » phải được gọi từ một văn lệnh duy trì (hoặc với tùy chọn « -"
 "by-package »)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger: tên gói mong đợi cấm « %.250s »: %.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "tên bộ gây nên không hợp lệ « %.250s »: %.250s"
@@ -4473,37 +4527,38 @@
 msgstr "Đang xử lý các bộ gây nên đối với %s ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "« --%s » cần chính xác một đối số kiểu tập tin Packages (Gói)"
 
-#: src/update.c:61
+#: src/update.c:62
 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"
 
-#: src/update.c:63
+#: src/update.c:64
 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"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "Đang thay thế thông tin gói sẵn sàng, bằng %s.\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "Đang cập nhật thông tin gói sẵn sàng, bằng %s.\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "Thông tin về %d gói đã được cập nhật.\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4621,8 +4676,8 @@
 msgid_plural "ignoring %d warnings about the control file(s)\n"
 msgstr[0] "đang lờ %d cảnh báo về (các) tập tin điều khiển\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "« --%s » cần một đối số kiểu <thư_mục>"
@@ -4654,26 +4709,26 @@
 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:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "lỗi tạo tập tin tạm thời (dữ liệu)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control"
 msgid "control member"
 msgstr "điều khiển"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %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:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4690,20 +4745,20 @@
 msgid "error writing `%s'"
 msgstr "lỗi ghi « %s »"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "giữa các bộ phạn"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "lỗi ghi tên tập tin tới đường ống dẫn tar (dữ liệu)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<nén> từ tar -cf"
 
@@ -4721,79 +4776,79 @@
 msgid "error reading %s from file %.255s"
 msgstr "gặp lỗi khi đọc %s từ tập tin %.255s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "lỗi đọc kho lưu « %.255s »"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "lỗi fstat kho lưu"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "kho lưu không có dấu chấm trong số thứ tự phiên bản"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "kho lưu không có dòng mới nào trong phần đầu"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "tập tin « %.250s » bị hỏng — số thứ tự phần sai"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 "tập tin « %.250s » không phải là một kho nén nhị phân Debian (thử « dpkg-"
 "split » (chia tách)?)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "kho lưu không có dấu chấm trong số thứ tự phiên bản"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "kho lưu không có dòng mới nào trong phần đầu"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "kho lưu không có dấu chấm trong số thứ tự phiên bản"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 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:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "đã bỏ qua dữ liệu bộ phạn từ %s"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood 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"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.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:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4805,23 +4860,23 @@
 " 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:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "kho lưu có độ dài điều khiển dạng sai « %s »"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "đã bỏ qua dữ liệu bộ phạn từ %s"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4833,7 +4888,7 @@
 " 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:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4842,49 +4897,50 @@
 "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:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "« %.255s » không phải là kho nén định dạng Debian"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 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:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "lỗi đóng ống dẫn trong copy (sao chép)"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "dữ liệu"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "lỗi chdir (chuyển đổi thư mục) sang thư mục"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "lỗi tạo thư mục"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 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:293
-msgid "failed to chdir to directory"
-msgstr "lỗi chdir (chuyển đổi thư mục) sang thư mục"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<giải nén>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "dán"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, 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:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4893,97 +4949,97 @@
 "« --%s » cần một thư mục đích.\n"
 "Có thể cần sử dụng « dpkg --install » ?"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, 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:360
+#: dpkg-deb/extract.c:365
 #, 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)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "lỗi chdir (chuyển đổi thư mục) sang « / » để dọn sạch"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "không thể lấy trạng thái về tập tin « %s »"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb: « %.255s » không chứa thành phần điều khiển nào « %.255s »\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 "việc mở thành phần « %.255s » (trong %.255s) bị lỗi một cách bất thường"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "Còn thiếu %d thành phần điều khiển đã yêu cầu"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "không thể quét thư mục « %.255s »"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "không thể lấy các thông tin về « %.255s » (trong « %.255s »)"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "không thể mở « %.255s » (trong « %.255s »)"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "lỗi đọc « %.255s » (trong « %.255s »)"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld byte, %5d dòng   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     không phải tập tin chuẩn          %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 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"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "không thể mở thành phần « control » (điều khiển)"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "bị lỗi trong khi đọc thành phần « control » (điều khiển)"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "gặp lỗi khi đóng thành phần « %s »"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "Lỗi trong định dạng"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "« --contents » (nội dung) chấp nhận chính xác một đối số"
 
@@ -4993,7 +5049,19 @@
 msgstr "Hậu phương kho lưu gói Debian « %s » phiên bản %s.\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -5004,6 +5072,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -5021,7 +5091,7 @@
 "   --fsys-tarfile <deb>        đưa ra tập tin .tar kiểu hệ thống tập tin.\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -5034,11 +5104,27 @@
 "<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:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -5062,7 +5148,7 @@
 "lzma, none (không có).\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -5076,7 +5162,7 @@
 "một cách thân thiện với người dùng. Ghi chú : gói được giải nén\n"
 "bằng lệnh « dpkg-deb --extract » sẽ được cài đặt sai.\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5085,17 +5171,17 @@
 "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:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "số nguyên không hợp lệ cho -%c: « %.250s »"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "cấp nén không hợp lệ cho -%c: %ld'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "kiểu nén không rõ « %s »."
@@ -5115,7 +5201,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "tập tin « %.250s » bị hỏng — thiếu ký tự dòng mới đằng sau %.250s"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "gặp lỗi khi đọc %.250s"
@@ -5210,50 +5296,56 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "tập tin « %.250s » bị hỏng — số thứ tự phần sai"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "tên gói"
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr "tập tin « %.250s » bị hỏng — ma thuật sai ở cuối phần đầu thứ hai"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, 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"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
 "tập tin « %.250s » bị hỏng — sai số các phần cho các kích cỡ đã xác định"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
 "tập tin « %.250s » bị hỏng — kích cỡ sai cho số thứ tự phần đã xác định"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "không thể fstat tập tin phần « %.250s »"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "tập tin « %.250s » bị hỏng — quá ngắn"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, 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 »"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "tập tin « %.250s » không phải là một phần kho nén"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5273,6 +5365,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5295,12 +5388,19 @@
 "    Kích cỡ tập tin phần (vùng đã dùng):  %lu byte\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<không rõ>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "« --%s » yêu cầu một hay nhiều đối số kiểu tập tin phần"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "tập tin « %s » không phải là phần kho nén\n"
@@ -5334,7 +5434,7 @@
 msgid "split package part"
 msgstr "Đang tập hợp %2$d phần để làm gói %1$s: "
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "hoàn tất\n"
@@ -5388,17 +5488,26 @@
 " \n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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 ""
 "Tùy chọn:\n"
 "   --depotdir <thư_mục>        \tDùng <thư_mục> thay cho %s/%s.\n"
@@ -5413,20 +5522,29 @@
 " \t1\t-a không phải là một phần;\n"
 " \t2\tlỗi nghiêm trọng !\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "Gõ « dpkg-split --help » để xem trợ giúp."
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "gặp kết thúc tập tin bất thường trong %.250s"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "kích cỡ phần quá dài hoặc không phải là số dương"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "kích cỡ phần phải là ít nhất %d KiB (để chứa phần đầu)"
@@ -5539,27 +5657,27 @@
 msgid "Deleted %s.\n"
 msgstr "Đã xóa %s.\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "dpkg-deb lấy trường"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "không thể mở tập tin nguồn « %.250s »"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "không thể fstat tập tin nguồn"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "tập tin nguồn « %.250s » không phải là tập tin chuẩn"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5567,17 +5685,17 @@
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] "Đang tập hợp %2$d phần để làm gói %1$s: "
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "« --split » (chia tách) cần một đối số kiểu tên tập tin nguồn"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 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 "
@@ -5754,126 +5872,91 @@
 "  --version                hiển thị số thứ tự phiên bản.\n"
 "\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "lỗi"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "cảnh báo"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "không thể lấy trạng thái về %s: %s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "readlink(%s) bị lỗi: %s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "hai lệnh đã xác định: --%s và --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "không thể phụ thêm vào %s: %s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "lỗi quét %s: %s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "lỗi thực hiện %s: %s"
-
-#: utils/update-alternatives.c:503
-#, c-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"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "không thể cài đặt %s như là %s: %s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "không thể gỡ bỏ %s: %s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "gặp kết thúc tập tin bất thường trong khi thử đọc %s"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "trong khi đọc %s: %s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "gặp dòng không có chấm dứt trong khi thử đọc %s"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s bị hỏng: %s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-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)"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "trong khi ghi nhớ %s: %s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "tên điều phụ"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "điều phụ trùng %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "liên kết phụ"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "liên kết phụ vẫn trùng với liên kết chính %s"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "liên kết phụ trùng %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "tập tin chủ"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "đường dẫn trùng %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
@@ -5882,128 +5965,113 @@
 "sự xen kẽ %s (phần của nhóm liên kết %s) không tồn tại. Vì thế đang gỡ bỏ nó "
 "khỏi danh sách các sự xen kẽ."
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "ưu tiên"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "tập tin phụ"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "ưu tiên của %s: %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "không thể đọc %s: %s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "trạng thái"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "trạng thái không hợp lệ"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "liên kết chủ"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "không thể đóng %s: %s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "đang hủy liên kết phụ cũ %s (%s)."
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "không thể ghi %s: %s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "chế độ tự động"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "chế độ bằng tay"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr "  liên kết hiện thời chỉ tới %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr "  hiện thời không có liên kết"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s — ưu tiên %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  phụ %s: %s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "Phiên bản « tốt nhất » hiện thời là « %s »."
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "Không có phiên bản sẵn sàng."
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "Có %d sự chọn cho sự xen kẽ %s (đang cung cấp %s)."
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "Lựa chọn"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "Ưu tiên"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "Trạng thái"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 "Bấm phím Enter để giữ lại giá trị mặc định[*], hoặc gõ số thứ tự lựa chọn: "
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "không phải thay thế %s bằng một liên kết."
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "không thể cài đặt sự chọn không rõ %s"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
@@ -6012,98 +6080,153 @@
 "bỏ qua bước tạo %s, vì tập tin liên quan %s (của nhóm liên kết %s) không tồn "
 "tại."
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "không phải thay thế %s bằng một liên kết."
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "Gọi %s."
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "Sự xen kẽ %s chưa thay đổi vì sự chọn %s không sẵn sàng."
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "Bỏ qua sự xen kẽ không rõ %s."
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "gặp dòng quá dài hoặc dòng không có chấm dứt, trong khi thử đọc %s"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "Bỏ qua dòng sai: %s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-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."
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-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."
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "tên xen kẽ (%s) không thể chứa dấu xuyệc « / » hoặc dấu cách."
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "liên kết xen kẽ không phải tuyệt đối như yêu cầu : %s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "đường dẫn xen kẽ không phải tuyệt đối như yêu cầu : %s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "sự xen kẽ %s không thể là chủ : %s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "liên kết xen kẽ %s đã được %s quản lý."
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "đường dẫn xen kẽ %s không tồn tại."
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "sự xen kẽ %s không thể là điều phụ của %s: %s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "sự xen kẽ %s không thể là chủ : %s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "liên kết xen kẽ %s đã được %s quản lý."
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "không rõ đối số « %s »"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "« --install » (cài đặt) yêu cầu <liên_kết> <tên> <đường_dẫn> <ưu_tiên>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<liên_kết> và <đường_dẫn> không thể là trùng nhau"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "« ưu tiên » phải là một số nguyên"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "« --%s » yêu cầu <tên> <đường_dẫn>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "« --%s » yêu cầu <tên>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "cho phép « --slave » (phụ) chỉ với « --install » (cài đặt)"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "« --slave » (phụ) yêu cầu <liên_kết> <tên> <đường_dẫn>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "tên %s là cả hai kiểu chính và phụ"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "liên kết %s là cả hai kiểu chính và phụ"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "« --%s » yêu cầu một đối số <tệp>"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "không rõ tùy chọn « %s »"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -6122,67 +6245,22 @@
 " •--remove-all \tgỡ bỏ tất cả\n"
 " •--auto\t\t\ttự động"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "sự xen kẽ %s không thể là chủ : %s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "liên kết xen kẽ %s đã được %s quản lý."
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "liên kết xen kẽ không phải tuyệt đối như yêu cầu : %s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "đường dẫn xen kẽ không phải tuyệt đối như yêu cầu : %s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "đường dẫn xen kẽ %s không tồn tại."
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "tên xen kẽ (%s) không thể chứa dấu xuyệc « / » hoặc dấu cách."
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "nó là một sự xen kẽ chủ."
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "là một điều phụ của %s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "sự xen kẽ %s không thể là điều phụ của %s: %s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<đầu vào tiêu chuẩn>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "không có sự xen kẽ nào cho %s."
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s vẫn treo, nó sẽ được cập nhật dùng sự chọn tốt nhất sẵn sàng."
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -6194,49 +6272,49 @@
 "%s đã bị thay đổi (bằng tay hoặc bằng văn lệnh) nên chuyển đổi sang chỉ việc "
 "cập nhật bằng tay."
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "đang thiết lập việc tự động chọn %s"
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "sự xen kẽ %s cho %s không được đăng ký nên không lập."
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "Không có chương trình nào cung cấp %s."
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "Không có gì cần cấu hình."
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "Chỉ có một sự xen kẽ trong nhóm liên kết %s: %s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "sự xen kẽ %s cho %s không được đăng ký nên không gỡ bỏ."
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 "đang gỡ bỏ sự xen kẽ được chọn bằng tay — đang chuyển đổi %s sang chế độ tự "
 "động"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%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ì."
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
@@ -6244,23 +6322,59 @@
 "để bật lại khả năng tự động cập nhật, hãy dùng lệnh « update-alternatives --"
 "auto %s »."
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "đang dùng « %s » để cung cấp %s (%s) trong %s."
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr "đang ép buộc cài đặt lại sự xen kẽ %s vì nhóm liên kết %s bị hỏng."
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 "không rõ sự xen kẽ hiện thời %s nên chuyển đổi sang %s cho nhóm liên kết %s."
 
+#~ msgid "it is a master alternative."
+#~ msgstr "nó là một sự xen kẽ chủ."
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "là một điều phụ của %s"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "không thể lấy trạng thái về %s: %s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "readlink(%s) bị lỗi: %s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "lỗi quét %s: %s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "lỗi thực hiện %s: %s"
+
+#~ 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"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "không thể cài đặt %s như là %s: %s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "trong khi ghi nhớ %s: %s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "không thể đọc %s: %s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "không thể đóng %s: %s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "không thể ghi %s: %s"
+
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6559,9 +6673,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "đã bỏ qua vùng điều khiển từ %s"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "lỗi thực hiện tar"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "lỗi tạo thư mục tạm thời"
 
Binary files dpkg/po/zh_CN.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/zh_CN.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/zh_CN.po /home/vorlon/devel/multiarch/dpkg-debian/po/zh_CN.po
--- dpkg/po/zh_CN.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/zh_CN.po	2012-06-07 10:11:09.426073000 -0700
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.15.8.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-12-18 02:26+0100\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -30,7 +30,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr "无法写入文件 %s"
@@ -51,71 +51,77 @@
 msgid "ar member file (%s)"
 msgstr "fstat ar 成员文件失败(%s)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "为 %s 读取缓冲副本失败"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "为 %s 写入缓冲副本失败"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr "为 %s 短暂读取缓冲副本"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "执行 tar 失败"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr "无法运行 %s (%s)"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s：解压缩"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s：压缩"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr "%s：绑定输入到 gzip 流失败"
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s：内部 gzip 读取错误：%s"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s：内部 gzip 写入错误"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr "%s：绑定输出到 gzip 流出错"
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s：内部 gzip 读取错误"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s：内部 gzip 写入错误：%s"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s：内部 gzip 写入错误：%s"
@@ -130,135 +136,135 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s：内部 bzip2 读取错误：%s"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s：内部 bzip2 写入错误"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr "%s：绑定输出到 bzip2 流出错"
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s：内部 bzip2 读取错误"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s：内部 bzip2 写入错误：%s"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr "未预料的 bzip2 错误"
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
 "max=%d)"
 msgstr "更新目录中包含文件 %.250s，其文件名太长(长度为 %d，但最大不能超过 %d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr "更新目录中含有不同长度名称的文件(分别为 %d 和 %d)"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "无法扫描更新目录 %.255s "
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "删除合并的更新文件 %.255s 失败"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "无法创建 %.255s"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "无法填充 %.250s"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "无法在填充后刷新 %.250s"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "无法在填充 %.250s 后找到起始位置"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr "无法打开锁文件 %s 以测试"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "无法打开或建立状态数据库的锁文件"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "您没有为 dpkg 的状态数据库加锁的权限"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "无法为 dpkg 的状态数据库加锁"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "该操作需要超级用户权限"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "无法访问 dpkg 状态区域"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "该操作需要用户对 dpkg 状态目录有读写权限"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "删除我自己的更新文件 %.255s 失败"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "无法写入 %.250s 的更新状态"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "无法刷新 %.250s 的更新状态"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "无法截断 %.250s 的更新状态"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "无法同步 %.250s 的更新状态"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "无法关闭 %.250s 的更新状态文件"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "无法安装 %.250s 的更新状态"
@@ -281,70 +287,72 @@
 msgid "unable to open directory '%s'"
 msgstr "无法打开文件 %s"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr "无法打开文件 %s"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr "无法同步文件 %s"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr "无法关闭文件 %s"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "将 %.50s 详情写入至 %.250s 失败"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "无法打开 %s 以写入 %s 数据库"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "无法为数据库文件 %s 设置缓冲区"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "写入 %s 数据库记录失败(%.50s 到 %.250s)"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "清空 %s 数据库到 %.250s 失败"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "fsync %s 数据库到 %.250s 失败"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "写入 %2$s 数据库后，关闭 %1$.250s 失败"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "建立 %.250s 到 %.250s 的链接时失败(该链接用于备份 %s 数据库)"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "将包含 %3$s 数据库的 %1$.250s 安装为 %2$.250s 时失败"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -353,7 +361,7 @@
 "%s: 无法恢复的致命错误，中止：\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -365,13 +373,13 @@
 "%s: 无法恢复的致命错误，中止：\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "新建清理条目时内存不足"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -380,32 +388,32 @@
 "%s：清理时出错:\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg：在错误恢复过程中发生了太多的嵌套错误！！\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "新建清理条目时内存不足"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "新建清理条目参数太多，内存不足"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 #| msgid "%s: warning: %s\n"
 msgid "%s: error: %s\n"
 msgstr "%s：警告：%s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr "%s：警告：%s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%s:%d：内部错误：%s\n"
@@ -421,105 +429,105 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "%.*s 不被 %s 所允许"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "忽略 %s 后的数据"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "软件包名称无效(%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "文件描述字段 %s 为空"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "状态文件不允许文件描述字段 %s "
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "文件描述字段 %s 中的值太多(和其他的相比)"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "文件描述字段 %s 中的值太少(和其他的相比)"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "布尔型字段的 yes/no"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr " priority 字段中的文字"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "该环境中不允许 status 字段的值"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr " status 字段的第一个词(want)"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr " status 字段的第二个词(error)"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr " status 字段的第三个词(status)"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, c-format
 msgid "error in Version string '%.250s'"
 msgstr "版本字符串 %.250s 中有错误"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "您使用了已经废弃不用的字段 Revision 或者 Package-Revision "
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr " config-version 字段的值在该环境中不被允许"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, c-format
 msgid "error in Config-Version string '%.250s'"
 msgstr "Config-Version 字符串 %.250s 中有错误"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr " conffiles  的值包含了有格式错误的行： %.*s "
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr " conffiles 的值中，有的行是以 %c 开头的，而它不是空格"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "根目录或是空目录也被列为了 conffile"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 "%s\" 字段缺少软件包名，也可能是在本该填写软件包名的地方发现了无意义的数据"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "%s 字段，无效的软件包名 %.255s :%s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -528,7 +536,7 @@
 "%s 字段，于  %.255s :\n"
 " 错误的版本依赖关系 %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -537,7 +545,7 @@
 "%s 字段，于 %.255s :\n"
 "  %c  已被废弃不用，请使用 %c= 或者 %c%c "
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -546,11 +554,11 @@
 "%s 字段，于 %.255s :\n"
 " 未明确要求版本号完全一致，建议使用 = "
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "Provides 中只能指明具体的版本"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -559,55 +567,55 @@
 "%s 字段，于 %.255s :\n"
 " 版本号以一个不是字母的字符开头，建议加一个空格"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "%s 字段，于 %.255s ：版本号含有 %c "
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "%s 字段，于 %.255s ：版本号不应就此终止"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "%s 字段，于 %.255s ：解析版本号时出错"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "%s 字段，在引用软件包 %.255s 后发现语法错误"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "在 %s 字段中不能含有候选项( | )"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr " triggers-pending 字段的值在该环境中不被允许"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "非法的未决触发器名 %.255s ：%s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "重复的未决触发器 %.255s "
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr " triggers-awaited 字段的值在该环境中不被允许"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "在等待触发器 %.255s 中包含非法的软件包名：%s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "重复的等待触发包 %.255s "
@@ -664,7 +672,7 @@
 msgid "unable to write to status fd %d"
 msgstr "无法写入状态 fd %d"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "malloc failed (%ld bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -676,8 +684,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc 失败(%ld 字节)"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "分配内存失败"
 
@@ -710,198 +718,204 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "在 %.250s 时，无法设置 close-on-exec 标志位"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "配置错误：%s:%d：%s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "无法打开配置文件  %.255s 以备读取：%s"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr "%s 中有不平衡引用"
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, c-format
 msgid "unknown option '%s'"
 msgstr "未知选项 %s "
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, c-format
 msgid "'%s' needs a value"
 msgstr "'%s' 选项需要一个值"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, c-format
 msgid "'%s' does not take a value"
 msgstr "'%s' 选项不需要值"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "读取配置文件 %.255s 时出错"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "关闭配置文件 %.255s 时出错"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "打开配置目录 %s 时出错"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "未知选项 -- %s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s 选项需要一个参数"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s 选项不需要参数"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "未知选项 -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c 选项需要一个参数"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c 选项不需要参数"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "废弃的选项 --%s \n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "-%c (--%s) 和 -%c (--%s) 两个操作之间有矛盾"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "有多个值对应于字段 %s "
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "用户自定义的字段名 %.*s 太短"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "有多个值对应于用户自定义的字段 %.*s "
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "软件包有 Configured-Version 的标志，但是它安装状态却与之不符"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "软件包有 %s 状态但触发器在等待"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "软件包有触发器等待状态但没有触发器在等待"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "软件包有 %s 状态但是触发器处于未决状态"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "软件包有触发器未决状态但没有触发器处于未决状态"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "该软件包的状态是尚未安装，但是它却有 conffiles，忽略这些 conffile"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "无法打开软件包的 info 文件 %.255s 进行读取"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "无法获得软件包 info 文件 %.255s 的状态"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "无法 mmap 软件包的 info 文件 %.255s "
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "无法获得软件包 info 文件 %.255s 的状态"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "读取完毕 %.255s 后，无法关闭该文件"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "在字段名 %.*s 后发现 EOF"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "在字段名 %.*s 中发现换行符"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "在字段名 %.*s 中发现 MSDOS EOF (^Z)"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "字段名 %.*s 后必须紧跟冒号"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "在字段 %.*s 的值的前面发现了 EOF(缺少最后结尾的换行符)"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "在字段 %.*s 的值中间发现了 MSDOS EOF 字符(缺少最后结尾的换行符？)"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "在字段名 %.*s 中发现换行符"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "在字段 %.*s 的值中间发现了 EOF 字符(缺少最后结尾的换行符)"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "发现了多个软件包的 info 条目，但只允许一个"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "读取完毕 %.255s 后，无法关闭该文件"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "在 %.255s 中没有软件包的相关信息"
@@ -930,62 +944,62 @@
 "%s，在文件 %.255s 第 %d 行附近:\n"
 " "
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "不应当为空字符串"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "必须以字母开头"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "不允许出现字符 %c  (只能使用字符、数字和 %s)"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<无>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "版本号为空"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "版本号里嵌有空格字符"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "版本中的版次不是数字"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "版本号的冒号后面没有任何东西"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr "版本号后的字符串无效"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr "版本号后的字符串无效"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "找不到 %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "%s 的值为空"
@@ -1004,52 +1018,52 @@
 msgid "(no description available)"
 msgstr "(无可用描述)"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "无法在运行 %2$.250s 之前忽略信号 %1$s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "当恢复处理信号 %s 时出错：%s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s (子进程)：%s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "fork 失败"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "子进程 %s 返回了错误号 %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 #| msgid "wait for subprocess %s failed"
 msgid "subprocess %s was interrupted"
 msgstr "等待子进程 %s 时出错"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "子进程 %s 被信号(%s)%s 终止了"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr "，核心已转储"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "子进程 %s 出错，所获得的等待状态数为 %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr "等待子进程 %s 时出错"
@@ -1069,61 +1083,53 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr "触发推迟文件 %.250s 中有语法错误，在字符 %s %s"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "无法打开/创建触发器锁文件 %.250s"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "已触发"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "无法获取触发推迟文件 %.250s 的信息"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "无法打开触发推迟文件 %.250s"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "无法打开/创建新的触发推迟文件 %.250s"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "读取触发推迟文件 %.250s 时出错"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "无法写入新的触发推迟文件 %.250s"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "无法关闭新的触发推迟文件 %.250s"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "无法安装新的触发推迟文件 %.250s"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "不允许空的触发器名"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "触发器名包含无效字符"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1131,100 +1137,106 @@
 msgstr ""
 "触发器名 %.250s 包含无效或者未知的语法(在对软件包 %.250s 感兴趣的触发器中)"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "无法打开触发关注列表文件 %.250s"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "回到触发关注文件 %.250s 起始位置失败"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr "触发关注文件 %.250s 语法错误；非法的软件包名 %.250s ：%.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "无法创建新的触发关注文件 %.250s"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "无法写入新的触发关注文件 %.250s"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "无法清空新的触发关注文件 %.250s"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "无法同步新的触发关注文件 %.250s"
 
-#: lib/dpkg/triglib.c:442
+#: lib/dpkg/triglib.c:332
 #, c-format
-msgid "unable to close new trigger interest file `%.250s'"
+msgid "unable to install new trigger interest file `%.250s'"
+msgstr "无法安装新的触发关注文件 %.250s"
+
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "无法卸载 %.250s"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
 msgstr "无法创建新的触发关注文件 %.250s"
 
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:383
 #, c-format
-msgid "unable to install new trigger interest file `%.250s'"
-msgstr "无法安装新的触发关注文件 %.250s"
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "无法创建新的触发关注文件 %.250s"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr "文件 %.250s 和软件包 %.250s 有重复的文件触发关注"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "无法创建新的文件触发文件 %.250s"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "无法写入新的文件触发文件 %.250s"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "无法清空新的文件触发文件 %.250s"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "无法同步新的文件触发文件 %.250s"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "无法创建新的文件触发文件 %.250s"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "无法安装新的文件触发文件到 %.250s"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "无法读取文件触发文件 %.250s"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "文件触发文件 %.250s 中有语法错误"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1232,37 +1244,45 @@
 msgstr ""
 "文件触发记录有提到非法的软件包名 %.250s (用于文件 %.250s 的触发关注)：%.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr "触发器配置项文件`%.250s'在触发器名 %.250s 中包含非法触发器语法：%.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "无法打开触发器配置项文件 %.250s"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "触发器配置项文件包含位置指令语法"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "触发器配置项文件包含位置指令 %.250s"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "无法创建触发器状态目录 %.250s"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "无法设置触发器状态目录 %.250s 的所有权"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "不允许空的触发器名"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "触发器名包含无效字符"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1287,7 +1307,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr "将字符串格式化为 varbuf 变量时出错"
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "从 dpkg-deb 的管道读取数据时出错"
 
@@ -1306,12 +1326,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "为符号链接 %.255s 设置属主时出错"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "为 %.255s 设置属主时出错"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "为 %.255s 设置权限位时出错"
@@ -1362,17 +1382,26 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "包文件中含有一个对象 %.255s，无法识别它的类型 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, c-format
+msgid "cannot stat file '%s'"
+msgstr "无法访问文件 %s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "正在替换原软件包中的文件 %s ...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "被已安装的软件包 %s 中的文件替换了...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
@@ -1380,92 +1409,97 @@
 msgstr ""
 "正试图用一个非目录的文件替换目录 %.250s，该目录属于软件包 %.250s %.250s"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "正试图覆盖 %.250s，它同时被包含于软件包 %.250s %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "无法创建 %.255s (处理 %.255s 时)"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "%.255s  时，dpkg-deb 被作为后端"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "关闭/写入 %.255s 出错"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "新建管道 %.255s 时出错"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "新建设备文件 %.255s 时出错"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "新建硬链接 %.255s 时出错"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "新建符号链接 %.255s 时出错"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "新建目录 %.255s 时出错"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "无法将 %.255s 改名，以安装新的版本"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "无法读取符号链接 %.255s "
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "无法为 %.255s 做一个符号链接备份"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "无法更改 %.255s 的符号链接备份的属主"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "无法在安装新的版本前，为 %.255s 做一个符号链接备份"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "无法安装 %.255s 的新版本"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "无法打开 %.255s "
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "无法同步文件 %.255s "
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1474,14 +1508,14 @@
 "忽视 %s 的依赖关系问题：\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
 " package %s, to enable %s."
 msgstr "正在考虑反配置基础软件包 %s，以便启用 %s。"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1490,7 +1524,7 @@
 "dpkg：拒绝，%s 是基础软件包，不能反配置该软件包\n"
 " 启用开启 %s。\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1499,28 +1533,28 @@
 "dpkg：拒绝，不能继续进行 %s (不妨尝试 --auto-deconfigure)：\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "卸载 %.250s"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "安装 %.250s"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg：正在考虑反配置 %s，否则会被 %s 破坏 ...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg：好的，将反配置 %s (被 %s 破坏)。\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1529,11 +1563,11 @@
 "dpkg：关于含有 %2$s 的 %1$s：\n"
 "%3$s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "忽视软件包间的破坏，无论怎样，继续安装！"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1542,27 +1576,27 @@
 "安装 %.250s 将破坏 %.250s，并且\n"
 "不允许反配置(--auto-deconfigure 也许会有帮助)"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "安装 %.250s 将破坏现有软件"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg：为了 %2$s，正考虑卸载 %1$s ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s 没有被正常安装 - 将忽略所有对它的依赖关系。\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg：也许卸载 %s 会有问题，因为它提供了 %s ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1571,143 +1605,145 @@
 "dpkg：尽管软件包 %s 需要重新安装，但还是将遵照您的要求，\n"
 "把它卸载。\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg：软件包 %s 需要重新安装，它不会被卸载。\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg：好的，为了 %2$s 卸载 %1$s。\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "软件包相互冲突 - 将不安装 %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "忽视软件包间的冲突，无论怎样，继续安装！"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --递归执行需要至少一个路径作为参数"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr "启用 --recursive 选项执行 find"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "无法 fdopen find 的管道"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "读取 find 的管道时出错"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "关闭 find 的管道时出错"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "--recursive 选项所调用的 find 返回了一个没有被处理的错误 %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "已搜索包文件，但是没有发现任何软件包(即与 *.deb 匹配的文件)"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s 需要至少一个软件包文件作为参数"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr "<标准输出>"
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr "<标准错误>"
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "选中了曾被取消选择的软件包 %s。\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "忽略了被取消选择的软件包 %s。\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "%1$.250s 的 %2$.250s 版本已经安装，因而将不再安装它。\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "即将把 %.250s 从 %.250s 降级到 %.250s。"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "由于不希望把 %.250s 从 %.250s 降级到 %.250s，因而将不再安装它。\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
 "of backup copy"
 msgstr "无法把新近安装版本的 %.250s 卸载，卸载它能就能重新安装备份复制"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "无法恢复 %.250s 的备份版本"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "无法删除 %.250s 的备份版本"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "无法删除 %.250s 的新近安装的版本"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "无法删除 %.250s 的新近解压的版本"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "无法获取新发布版的 conffile  %.250s"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "无法获取当前已被安装的 conffile  %.250s 的信息"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1718,57 +1754,57 @@
 "系统中并未发现配置 %s。\n"
 "如您所愿，安装了新的配置文件。\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "%s：无法删除以前的备份文件 %.250s ：%s"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "%s：无法将 %.250s 改名为 %.250s ：%s"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s：删除 %.250s 失败：%s"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "%s：无法删除以前的发布版本 %.250s ：%s"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "%s：无法删除 %.250s (在覆盖前)：%s"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "%s：将 %.250s 链接到 %.250s 失败：%s"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "正在安装新版本的配置文件 %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "无法把 %.250s 安装到 %.250s"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "您未曾安装名为 %s 的软件包，因而不能对它进行配置"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "您已经安装并配置了软件包 %.250s"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1777,7 +1813,7 @@
 "现在尚不能配置软件包 %.250s\n"
 " 不能配置(目前状态为 %.250s )"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1786,11 +1822,11 @@
 "dpkg：依赖关系问题使得 %s 的配置工作不能继续：\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "依赖关系问题 - 仍未被配置"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1799,7 +1835,7 @@
 "dpkg：%s：尽管有依赖关系的问题，但不管怎样，还是按照您的要求，继续配置：\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
@@ -1807,12 +1843,12 @@
 "该软件包正处于非常不稳定的状态 - 您最好\n"
 "在配置它之前，先重新安装它。"
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "正在设置 %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1821,7 +1857,7 @@
 "%s：无法获得配置文件 %s 的状态\n"
 " (=  %s )：%s"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1830,7 +1866,7 @@
 "%s：配置文件 %s 是一个循环(最终指向自己)链接\n"
 " (=  %s )"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1839,7 +1875,7 @@
 "%s：无法 readlink conffile  %s \n"
 " (=  %s )：%s"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1848,33 +1884,33 @@
 "%s：无法找到 conffile  %.250s 最终指向的文件\n"
 " ( %s 是一个指向 %s 的符号链接)"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr "%s：警告 - conffile  %.250s 不是普通文件或者符号链接 (=  %s )"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "%s：无法打开 conffile %s 来作哈希处理：%s"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "当您完成操作后，请输入 exit。\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1883,12 +1919,12 @@
 "\n"
 "配置文件 %s "
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr "(实际上是 %s )"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1899,7 +1935,7 @@
 " ==> 系统中的这个文件或者是由您创建的，或者是由脚本建立的。\n"
 " ==> 软件包维护者所提供的软件包中也包含了该文件。\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1908,7 +1944,7 @@
 "\n"
 "     在安装后未曾更动。\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1917,7 +1953,7 @@
 "\n"
 " ==> 在安装后曾被修改(您或者某个脚本修改了它)。\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1926,37 +1962,37 @@
 "\n"
 " ==> 在安装后曾被删除(您或者某个脚本删除了它)。\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> 软件包的提交者同时提供了一个更新了的版本。\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     软件包的版本和上次安装的版本是相同的。\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> 如您所愿，安装了新的配置文件。\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> 如您所愿，保留原来的配置文件不变。\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> 按照默认设置，保留原有的配置文件。\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> 按照默认设置，安装新的配置文件。\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1971,157 +2007,159 @@
 "      D     ：显示两者的区别\n"
 "      Z     ：把当前进程切换到后台，然后查看现在的具体情况\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " 默认的处理方法是保留您当前使用的版本。\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " 默认的处理办法是安装新的版本。\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[默认选项=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[默认选项=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[无默认选项]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "在 conffile 提示输入前写标准错误出错"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "在 conffile 提示输入时读取标准输入出错"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "在 conffile 提示输入时在标准输入读到了 EOF "
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s 依赖于 %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s 预依赖于 %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s 推荐 %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s 建议 %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s 破坏 %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s 冲突于 %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s 增强 %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  即将卸载 %.250s。\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  即将反配置 %.250s。\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  即将安装 %.250s，但安装的版本是 %.250s。\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  已安装 %.250s，但安装的版本是 %.250s。\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  已解包 %.250s，但仍未配置。\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  已解包 %.250s，但它的版本是 %.250s。\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  上次配置 %.250s 时，它的版本是 %.250s。\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s 现在 %s。\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s 提供了 %.250s，但是它即将被删除。\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s 提供了 %.250s，但是它的配置信息将被抹去。\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s 提供了 %.250s，但是它现在 %s。\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s 未安装。\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  即将安装 %.250s (版本为 %.250s)。\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (版本为 %.250s)已存在并且 %s。\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s 提供了 %.250s，它将被安装。\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s 提供了 %.250s 并已存在而且 %s。\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about diverting files."
 msgstr "使用 --help 查看关于查询软件包的帮助。"
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
@@ -2129,7 +2167,7 @@
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s 版本 %s。\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, c-format
 msgid ""
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -2140,8 +2178,8 @@
 "版权所有 (C) 2000,2001 Wichert Akkerman\n"
 "版权所有 (C) 2010 Guillem Jover\n"
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, c-format
 msgid ""
@@ -2151,7 +2189,7 @@
 "此软件是自由软件；要获知复制该软件的条件，请参阅 GNU 公共许可证\n"
 "第二版或其更新的版本。本软件【不】提供任何担保。\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2161,7 +2199,7 @@
 "用法：%s [<选项> ...] <命令>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2180,7 +2218,7 @@
 "  --truename <文件名>      返回被本地修改的原始文件。\n"
 "\n"
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, c-format
 msgid ""
 "Options:\n"
@@ -2209,7 +2247,7 @@
 "  --version                显示版本信息。\n"
 "\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2222,17 +2260,12 @@
 "在删除本地修改项的时候，--package 或 --local 选项和 --divert 选项必须一致。\n"
 "软件包的 preinst 和 postrm 脚本通常应当指定 --package 和 --divert 选项。\n"
 
-#: src/divertcmd.c:149
-#, c-format
-msgid "cannot stat file '%s'"
-msgstr "无法访问文件 %s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, c-format
 msgid "error checking '%s'"
 msgstr "检查 %s 时出错"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2241,129 +2274,129 @@
 "更改  %2$s  文件名会复盖  %1$s，\n"
 "  不允許此操作"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 #| msgid "unable to write file '%s'"
 msgid "unable to create file '%s'"
 msgstr "无法写入文件 %s"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr "文件副本"
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr "无法重命名 %s 为 %s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr "改名：移除重复的旧连接 %s"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "无法打开原始文件 %.250s"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, c-format
 msgid "local diversion of %s"
 msgstr "本地修改至：%s"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr "本地修改 %s 到 %s"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, c-format
 msgid "diversion of %s by %s"
 msgstr "被 %2$s 本地修改的 %1$s"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr "%3$s 导致 %1$s 本地修改至 %2$s"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, c-format
 msgid "any diversion of %s"
 msgstr "任何 %s 的本地修改"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr "任何由 %s 至 %s 的本地修改"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, c-format
 msgid "cannot create new %s file"
 msgstr "无法新建 %s 文件"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr "无法清空文件 %s"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 msgid "error removing old diversions-old"
 msgstr "删除旧的本地修改项备份出错"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 msgid "error creating new diversions-old"
 msgstr "建立新的本地修改项备份出错"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 msgid "error installing new diversions"
 msgstr "安装新的本地修改项出错"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s 需要一个参数"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "文件名  %s  并不是绝对的"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "文件不可以含有换行符"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "不能本地修改目录"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "不能本地修改文件 %s 到其本身"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr "正在离开 %s\n"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "%s  与  %s  冲突"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, c-format
 msgid "Adding '%s'\n"
 msgstr "正在添加 %s\n"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "没有本地修改项 %s，因此没有删除。\n"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2374,7 +2407,7 @@
 "  本地修改目标名不匹配\n"
 "  发现了 %s "
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2385,16 +2418,16 @@
 "  软件包名不匹配\n"
 "  发现了 %s "
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, c-format
 msgid "Removing '%s'\n"
 msgstr "正在删除 %s\n"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "软件包不可以含有换行符"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "divert-to 不可以含有换行符"
 
@@ -2476,8 +2509,8 @@
 "dpkg --configure --pending (或者 dpkg --triggers-only)来请求：\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s 不需要任何参数"
@@ -2567,7 +2600,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions 错误的比较关系"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "版本号 %s 有语法错误：%s"
@@ -2620,12 +2653,12 @@
 msgid "overriding problem because --force enabled:"
 msgstr "由于开启了 --force 选项，以下问题被忽略："
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "无法打开软件包 %.250s 的文件名列表文件"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2634,68 +2667,68 @@
 "无法找到软件包 %.250s 的文件名列表文件，现假定该软件包目前没有任何文件被安装"
 "在系统里。"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "无法取得软件包 %.250s 的文件名列表文件"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "软件包 %.250s 的文件名列表文件"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "软件包 %.250s 的文件名列表文件最后结尾的换行符"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "软件包 %.250s 的文件名列表文件含有空的文件名"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "关闭软件包 %.250s 的文件名列表文件时出错"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "(正在读取数据库 ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "系统当前共安装有 %d 个文件和目录。)\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "无法为软件包 %s 新建更新后的文件名列表文件"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "无法写入更新后的软件包 %s 的文件名列表文件"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "无法刷新更新后的软件包 %s 的文件名列表文件"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "无法同步更新后的软件包 %s 的文件名列表文件"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "无法关闭更新后的软件包 %s 的文件名列表文件"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "无法安装更新后的软件包 %s 的文件名列表文件"
@@ -2733,7 +2766,9 @@
 msgstr "已安装"
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+#, fuzzy
+#| msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "错误：没有设置 PATH 环境变量。"
 
 #: src/help.c:129
@@ -2773,7 +2808,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "unable to setenv for subprocesses"
@@ -2785,65 +2820,65 @@
 msgstr "无法 chroot 到 %.250s 目录"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "chdir 到 %.255s 失败"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "无法设置 %s 的执行权限位"
 
-#: src/help.c:273
+#: src/help.c:276
 msgid "unable to setenv for maintainer script"
 msgstr "无法为维护脚本设置环境变量"
 
-#: src/help.c:297
+#: src/help.c:300
 #, c-format
 msgid "installed %s script"
 msgstr "已安装 %s 脚本"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "无法获取 %s  %.250s 的状态"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "新的 %s 脚本"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "旧的 %s 脚本"
 
-#: src/help.c:413
+#: src/help.c:416
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "无法获取 %s  %.250s 的状态：%s"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - 现在尝试使用新软件包所带的脚本...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "新版本的软件包里没有脚本 - 取消操作"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg：... 看起来它能正确执行。\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "无法安全删除 %.255s "
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2852,7 +2887,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "无法判断 %.250s 是否存在"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "无法读取信息(info)目录"
 
@@ -2918,7 +2953,7 @@
 "  -Dh|--debug=help                 显示有关出错调试的帮助信息。\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3035,7 +3070,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr " dselect 和 aptitude 提供了更为易用的的软件包管理工具。\n"
 
-#: src/main.c:171
+#: src/main.c:170
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3084,30 +3119,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3116,103 +3155,103 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "依赖问题 - 不会执行卸载"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "依赖问题 - 不会执行卸载"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 #| msgid "unable to setenv for maintainer script"
 msgid "Invocation and status of maintainer scripts"
 msgstr "无法为维护脚本设置环境变量"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "读取配置文件 %.255s 时出错"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3220,7 +3259,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3228,37 +3267,37 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug 需要一个八进制的参数"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "在 --ignore-depends 的用逗号相隔的参数列表 %s 中，发现有的软件包名为空"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends 需要一个有效的软件包名。而 %.250s 却不是；%s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s 有一个无效的数字参数： %.250s"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "执行钩子 %s 出错，退出状态书为 %d"
 
-#: src/main.c:463
+#: src/main.c:465
 #, fuzzy
 #| msgid "status"
 msgid "status logger"
 msgstr "状态"
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3267,7 +3306,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3275,12 +3314,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "无法识别的 force/refuse 选项 %.*s "
 
-#: src/main.c:511
+#: src/main.c:513
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "废弃的强制或拒绝选项 %s \n"
@@ -3303,8 +3342,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行还未结束时，发现未预料的 eof"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "需要一个指示操作的选项"
 
@@ -3467,85 +3506,85 @@
 msgid "passed\n"
 msgstr "验证通过\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr "无法创建临时目录"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "软件包 %s 有太多的冲突/替换组合"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr "原先版本的软件包中有一个信息文件的文件名太长，文件名是以 %.250s 开头的"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "无法删除废弃不用的信息文件 %.250s"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "无法安装文件 %.250s，该文件被认定是新的信息文件"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "无法打开临时主控目录"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr "软件包中有一个主控信息文件的文件名太长(该文件名是以 %.250s 开头的)"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "软件包的主控信息含有一个目录 %.250s"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "软件包控制信息，rmdir  %.250s 也没有说这不是一个目录"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr "软件包 %s 把一个列表作为信息文件使用"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "无法把新的信息文件 %.250s 安装到 %.250s"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "无法删除控制信息文件 %.250s"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "无法访问归档文件"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr "无法创建临时目录"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "控制信息的长度"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "从 %2$s 获得的关于 %1$s 的信息。\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "软件包的体系架构(%s)与本机系统的架构(%s)不符"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3554,111 +3593,111 @@
 "dpkg：对于含 %2$s 的文件 %1$s 来说，有预依赖(pre-dependency)方面的问题：\n"
 "%3$s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "预依赖(pre-dependency)问题 - 将不安装%.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr "忽略预依赖(pre-dependency)问题！"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "正预备替换 %s %s (使用 %s) ...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "正在解压缩 %s (从 %s) ...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "conffile 的文件名(其开头是 %.250s )太长(> %d 个字符)"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "读取 %.250s 出错"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "关闭 %.250s 出错"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "试图打开 %.250s 出错"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "正在反配置 %s 以允许删除 %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "正在反配置 %s ...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "正在解压缩将用于更替的包文件 %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package filesystem archive extraction"
 msgstr "dpkg-deb 域释放"
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "无法读取 dpkg-deb 输出的 tar 文件"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "文件系统的 tar 文件已损坏 - 软件包文件已毁损"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb：截去了最后的零数据(zeros)"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "无法获取旧文件 %.250s 的信息，因此不删除它：%s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "无法删除原有的目录 %.250s ：%s"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr "原有 conffile  %.250s 是一个空目录(现在已被删除)"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "无法获取其它新文件 %.250s 的信息"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
 "'%.250s')"
 msgstr "旧文件 %.250s 与多个新文件相同！( %.250s 和 %.250s )"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "无法安全地删除旧的文件 %.250s ：%s"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(注意到 %s 已经不复存在，它已然被完全取代了。)\n"
@@ -3834,7 +3873,7 @@
 "  -f|--showformat=<格式串>         令 --show 使用其它的格式输出。\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3855,6 +3894,10 @@
 "  字段一般是靠右对齐的，除非它的宽度是负数。若其宽度是负数，\n"
 "  那么字段将会靠左对齐。\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr "使用 --help 查看关于查询软件包的帮助。"
+
 #: src/remove.c:88
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3913,53 +3956,54 @@
 msgid "Removing %s ...\n"
 msgstr "正在卸载 %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
 "may be a mount point?"
 msgstr "当卸载 %.250s 时，无法删掉目录 %.250s ：%s - 它会不会是一个挂载点呢？"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "无法卸载 %.250s"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "无法安全地卸载 %.250s"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr "卸载 %.250s 时，目录 %.250s 非空，因而不会删除该目录。"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "无法卸载 %.250s"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "正在清除 %s 的配置文件 ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "无法删除原有的配置文件 %.250s  (= %.250s )"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "无法读取配置文件所在目录 %.250s (从 %.250s )"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr "无法删除旧有的配置文件备份 %.250s (在 %.250s 中提到)"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "无法删除原有的文件列表"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "无法删除原有的 postrm 脚本"
 
@@ -4002,7 +4046,13 @@
 msgid "read error on standard input"
 msgstr "从标准输入读取数据时出错"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+#, fuzzy
+#| msgid "Use --help for help about querying packages."
+msgid "Use --help for help about overriding file stat information."
+msgstr "使用 --help 查看关于查询软件包的帮助。"
+
+#: src/statcmd.c:61
 #, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4011,7 +4061,7 @@
 "版权所有 (C) 2000, 2001 Wichert Akkerman\n"
 "版权所有 (C) 2006-2009 Guillem Jover\n"
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4028,7 +4078,7 @@
 "  --list [<glob 模式>]     列出当前数据库中的 override 条目。\n"
 "\n"
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, c-format
 msgid ""
 "Options:\n"
@@ -4048,52 +4098,52 @@
 "  --help                   显示本帮助信息。\n"
 "  --version                显示版本信息。\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "移除后面的 /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 msgid "cannot open new statoverride file"
 msgstr "无法打开新的 statoverride 文件：%s"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 msgid "error removing statoverride-old"
 msgstr "移除 statoverride-old 时出错：%s"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 msgid "error creating new statoverride-old"
 msgstr "建立新的 statoverride-old 时出错：%s"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 msgid "error installing new statoverride"
 msgstr "安装新的 statoverride 时出错：%s"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add 需要四个参数"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr "--force 已指定，所以先前对 %s 的覆盖设置会被忽略。"
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "%s  的 override 已存在，"
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr "警告：--update 已指定但 %s 不存在"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "override 不存在。"
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 msgid "--update is useless for --remove"
 msgstr "警告：对于 --remove，--update 是无效的"
 
@@ -4158,16 +4208,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "存在多个 statoverride 用于文件  %.250s"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "输入 dpkg-trigger --help 以获取此功能的帮助信息。"
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr " Debian %s 软件包触发器工具 %s 版。\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4178,7 +4228,7 @@
 "      %s [<选项> ...] <命令>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4190,7 +4240,7 @@
 "  --check-supported                检查正在运行的 dpkg 是否支持触发器。\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4210,21 +4260,21 @@
 "  --no-act                         仅测试 - 不真正进行修改。\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s：尚未创建触发器数据目录\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s：触发器记录尚不存在\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 msgid "takes one argument, the trigger name"
 msgstr "只接受一个参数，触发器名"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4232,13 +4282,13 @@
 msgid "must be called from a maintainer script (or with a --by-package option)"
 msgstr "dpkg-trigger 必须从维护者脚本中调用(或者通过 --by-package 选项)"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger：非法的等待软件包名 %.250s :%.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "无效的触发器名 %.250s :%.250s"
@@ -4271,35 +4321,36 @@
 msgstr "正在处理用于 %s 的触发器...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s 只需要一个软件包名作为参数"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr "无法访问 dpkg 的状态区，以进行批量的可用软件包更新"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr "进行批量可用软件包的更新，需要拥有对 dpkg 状态区的写权限"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "正在使用 %s 替换可用软件包的信息。\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "正在使用 %s 更新可用软件包的信息。\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] "共更新了 %d 个软件包的相关信息。\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4407,8 +4458,8 @@
 msgid_plural "ignoring %d warnings about the control file(s)\n"
 msgstr[0] "忽略有关主控文件的 %d 个警告\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s 需要一个 <directory> 参数"
@@ -4440,26 +4491,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb：正在新建软件包 %s，包文件为 %s。\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "新建临时文件(数据)失败"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control"
 msgid "control member"
 msgstr "控制信息"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "unlink 临时文件(数据)失败，%s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4476,20 +4527,20 @@
 msgid "error writing `%s'"
 msgstr "%s 写入错误"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "成员间"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "写入文件名到 tar 的管道(数据)失败"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr "<压缩> 自 tar -cf"
 
@@ -4507,76 +4558,76 @@
 msgid "error reading %s from file %.255s"
 msgstr "无法从文件 %2$s 读取 %1$s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "读取包文件 %.255s 失败"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "fstat 包文件失败"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "包文件的版本号中没有点"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "包文件的文件头中没有换行"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "文件 %.250s 已经损毁 - 分块编号有误"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "文件 %.250s 不是 debian 的二进制包文件(不妨试一下 dpkg-split？)"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "包文件的版本号中没有点"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "包文件的文件头中没有换行"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "包文件的版本号中没有点"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "不能识别包文件的版本 %.250s，请升级 dpkg-deb"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "忽略了 %s 中的成员数据"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "文件 %.250s 含有未知的数据成员 %.*s，取消操作"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "文件 %.250s 含有两个控制成员，取消操作"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4588,23 +4639,23 @@
 " 新格式的 debian 软件包，格式版本 %s。\n"
 " 大小 %ld 字节：主控包=%zi 字节。\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "压缩文件中的控制信息长度  %s  格式有误"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "忽略了 %s 中的成员数据"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4616,7 +4667,7 @@
 " 旧格式的 debian 软件包，格式版本 %s。\n"
 " 大小 %ld 字节：主控包= %zi 字节，数据及程序包= %ld。\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4625,49 +4676,50 @@
 "dpkg-deb：该文件看上去似乎原本是一个包文件，但是由于下载它时\n"
 "dpkg-deb：使用的是 ASCII 模式，从而导致了包文件被损坏\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "%.255s 并非 debian 格式的包文件"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "写入通向复制的管道时出错"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "关闭通向复制的管道时出错"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "数据"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "chdir 到目录失败"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "新建目录失败"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "新建目录后，chdir 到该目录失败"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "chdir 到目录失败"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 msgid "<decompress>"
 msgstr "<解压缩>"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 msgid "paste"
 msgstr "粘贴"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s 需要一个 .deb 文件的文件名作为参数"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4676,95 +4728,95 @@
 "--%s 需要一个目录作为目标目录。\n"
 "或许您应该使用 dpkg --install？"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s 至多能有两个参数(分别是 .deb 文件和目录)"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s 只带一个参数(即 .deb 文件的文件名)"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "进行清理工作时，chdir 到 / 目录失败"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
 msgid "control file '%s'"
 msgstr "无法访问文件 %s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb： %.255s 中没有发现控制组件 %.255s \n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr "打开组件 %.255s (于 %.255s 目录)失败，失败的原因出乎意料"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
 msgstr[0] "%d 个必要的控制组件没有找到"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "无法搜索目录 %.255s "
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "无法获取 %.255s 的信息(于 %.255s 目录)"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "无法打开 %.255s (于 %.255s 目录)"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "读取 %.255s (于 %.255s 目录)失败"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld 字节，%5d 行   %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     不是普通文件          %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "(在主控包中没有发现 control 文件！)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "无法打开 control 组件"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "当读取 control 组件时失败"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr "关闭 %s 组件时出错"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "格式有误"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents 需要且仅需一个参数"
 
@@ -4774,7 +4826,19 @@
 msgstr "Debian %s 软件包后端打包程序 %s 版。\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4785,6 +4849,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4799,7 +4865,7 @@
 "  -X|--vextract <deb> <目录>       解压所有文件并打印其列表。\n"
 "  --fsys-tarfile <deb>             输出文件系统的 tar 文件。\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4812,11 +4878,27 @@
 "<cfield> 是主 control 文件中的属性字段的名字。\n"
 "\n"
 
-#: dpkg-deb/main.c:97
-#, c-format
+#: dpkg-deb/main.c:99
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --showformat=<format>            Use alternative format for --show.\n"
+#| "  -D                               Enable debugging output.\n"
+#| "  --old, --new                     Select archive format.\n"
+#| "  --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 types: gzip, xz, bzip2, "
+#| "lzma, none.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4839,7 +4921,7 @@
 "                                     可用值：gzip、bzip2、lzma、none。\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4853,7 +4935,7 @@
 "通过 dpkg-deb --extract 命令解压的软件包将不\n"
 "会被正确安装！\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4861,17 +4943,17 @@
 "输入 dpkg-deb --help 可获得有关操作 *.deb 文件的帮助；\n"
 "输入 dpkg --help 可获得有关安装和卸载软件包的帮助。"
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "无效的整型参数 -%c：%.250s"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "无效的压缩等级 -%c：%ld "
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "无法识别的压缩类型 %s ！"
@@ -4891,7 +4973,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "文件 %.250s 已经损毁 - 在 %.250s 后没有发现换行符"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "读取 %.250s 时出错"
@@ -4984,47 +5066,53 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "文件 %.250s 已经损毁 - 分块编号有误"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+#, fuzzy
+#| msgid "package name"
+msgid "package architecture"
+msgstr "软件包名："
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr "文件 %.250s 已经损毁 - 在第二个文件头末尾的魔数(magic)有误"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "文件 %.250s 已经损毁 - 第二个成员不是数据成员"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr "文件 %.250s 已经损毁 - 标称大小的分块的数量有误"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "文件 %.250s 已经损毁 - 标称分块编号的长度有误"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "无法 fstat 分块文件 %.250s"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "文件 %.250s 已经损毁 - 文件过小"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "无法打开存档的分块文件 %.250s"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "文件 %.250s 并非一个包文件的分块文件"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5044,6 +5132,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5066,12 +5155,19 @@
 "    分块文件(被使用的部分)的大小：  %lu 字节\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<未知>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--%s 需要一个或多个部分文件作为参数"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "文件 %s  不是一个包文件的分块文件\n"
@@ -5105,7 +5201,7 @@
 msgid "split package part"
 msgstr "从 %2$d 个部分整合软件包 %1$s："
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "好了\n"
@@ -5157,17 +5253,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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"
 "  --depotdir <目录>                使用<目录>而非 %s/%s。\n"
@@ -5179,20 +5284,29 @@
 "\n"
 "返回状态：0 = 一切正常；  1 = -a 不是一个部分；  2 = 出问题了！\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "输入 dpkg-split --help 就可以阅读帮助信息。"
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "在 %.250s 中发现未预期的文件结束符"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "分块文件的大小已远远超长或者不是正数"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "分块文件的大小必须大于 %d KiB (为了容下文件头)"
@@ -5303,27 +5417,27 @@
 msgid "Deleted %s.\n"
 msgstr "已将 %s 删除。\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 #, fuzzy
 #| msgid "dpkg-deb field extraction"
 msgid "package field value extraction"
 msgstr "dpkg-deb 域释放"
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "无法打开原始文件 %.250s"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "无法 fstat 原始文件"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "原始文件 %.250s 不是普通文件"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, fuzzy, c-format
 #| msgid "Putting package %s together from %d part: "
 #| msgid_plural "Putting package %s together from %d parts: "
@@ -5331,17 +5445,17 @@
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] "从 %2$d 个部分整合软件包 %1$s："
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split 需要一个原始文件作为参数"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split 需要至多一个原始文件，以及目标文件的文件名前缀作为参数"
 
@@ -5503,350 +5617,355 @@
 "  --help                   显示本帮助信息。\n"
 "  --version                显示版本信息。\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr "错误"
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 msgid "warning"
 msgstr "警告"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, c-format
-msgid "cannot stat %s: %s"
-msgstr "无法获取 %s 的信息：%s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr "readlink(%s) 失败：%s"
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr "指定了两个命令：--%s 和 --%s"
 
-#: utils/update-alternatives.c:358
-#, c-format
-msgid "cannot append to %s: %s"
+#: utils/update-alternatives.c:387
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "无法追加至 %s：%s"
 
-#: utils/update-alternatives.c:395
-#, c-format
-msgid "scan of %s failed: %s"
-msgstr "扫描 %s 失败：%s"
-
-#: utils/update-alternatives.c:420
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr "执行 %s 失败：%s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "无法创建 %s 为 %s 的符号链接：%s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "无法把 %s 安装为 %s：%s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#: utils/update-alternatives.c:556
+#, fuzzy, c-format
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "无法移除 %s：%s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "在读取 %s 时遇到非预期的文件结束符"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr "当读取 %s 时：%s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "尝试读取 %s 时行未结束"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr "%s 损坏：%s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives 文件(%s)禁止换行符"
 
-#: utils/update-alternatives.c:1103
-#, c-format
-msgid "while writing %s: %s"
-msgstr "当写入 %s 时：%s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr "次要名称"
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "重复的次要 %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr "次要链接"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "次要的链接与主要链接 %s 相同"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "重复的次要链接 %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr "主要文件"
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "重复路径 %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr "候选项 %s(链接组 %s 的一部分)不存在。从候选项列表中移除。"
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr "优先级"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr "次要文件"
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr "%s 的优先级：%s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "无法读取 %s：%s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr "状态"
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr "无效状态"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr "主链接"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "无法关闭 %s：%s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "舍弃废弃的次要链接 %s(%s)。"
 
-#: utils/update-alternatives.c:1324
-#, c-format
-msgid "cannot write %s: %s"
-msgstr "无法写入 %s：%s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr "自动模式"
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr "手动模式"
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr " 链接目前指向 %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr " 链接目前不存在"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr "%s - 优先级 %d"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr "  slave %s：%s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "目前“最佳”的版本为 %s。"
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "无适用版本。"
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "有 %d 个候选项可用于替换 %s (提供 %s)。"
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr "选择"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr "路径"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr "优先级"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr "状态"
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr "要维持当前值[*]请按回车键，或者键入选择的编号："
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr "未将 %s 替换为链接。"
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr "无法安装未知的选择 %s"
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr "跳过创建 %s 因为所关联文件 %s (位于链接组 %s)不存在。"
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, fuzzy, c-format
+#| msgid "not replacing %s with a link."
+msgid "not removing %s since it's not a symlink."
+msgstr "未将 %s 替换为链接。"
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr "调用 %s。"
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr "候选项 %s 未改变，因为选项 %s 不可用。"
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr "跳过位置候选项 %s。"
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "尝试读取 %s 时行过长或没有结束"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr "跳过无效行：%s"
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "正在将链接 %s 的名称从 %s 改成 %s。"
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "正在将次要链接 %s 的名称从 %s 改成 %s。"
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr "替换名称(%s)不可包含 / 和空格。"
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr "替换链接不是绝对链接，它应该是绝对链接：%s"
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr "替换路径不是绝对路径，它应该是绝对路径：%s"
+
+#: utils/update-alternatives.c:2224
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr "候选项 %s 不能是主要项：%s"
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr "替换链接 %s 已经由 %s 来管理了。"
+
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "替代路径 %s 不存在"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+#| msgid "alternative %s can't be slave of %s: %s"
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "替代项 %s 作为 %s 的次要项：%s"
+
+#: utils/update-alternatives.c:2258
+#, fuzzy, c-format
+#| msgid "alternative %s can't be master: %s"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr "候选项 %s 不能是主要项：%s"
+
+#: utils/update-alternatives.c:2278
+#, fuzzy, c-format
+#| msgid "alternative link %s is already managed by %s."
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr "替换链接 %s 已经由 %s 来管理了。"
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "无法识别的参数 %s "
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install 需要 <链接> <名称> <路径> <优先级>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr "<链接> 和 <路径> 不能相同"
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "优先级必须为整数"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s 需要 <名称> <路径>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s 需要 <名称>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave 只能搭配 --install 使用"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave 需要 <链接> <名称> <路径>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "文件名 %s 同时是主要和次要"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "链接 %s 同时是主要和次要"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s 需要一个<文件>参数"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "未知选项  %s "
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
@@ -5854,67 +5973,22 @@
 "需要 --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all 或 --auto"
 
-#: utils/update-alternatives.c:2215
-#, fuzzy, c-format
-#| msgid "alternative %s can't be master: %s"
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "候选项 %s 不能是主要项：%s"
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr "替换链接 %s 已经由 %s 来管理了。"
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr "替换链接不是绝对链接，它应该是绝对链接：%s"
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr "替换路径不是绝对路径，它应该是绝对路径：%s"
-
-#: utils/update-alternatives.c:2239
-#, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "替代路径 %s 不存在"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr "替换名称(%s)不可包含 / 和空格。"
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr "这是一个主候选项。"
-
-#: utils/update-alternatives.c:2257
-#, c-format
-msgid "it is a slave of %s"
-msgstr "这是 %s 的一个次要项"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr "替代项 %s 作为 %s 的次要项：%s"
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr "<标准输入>"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr "无 %s 的候选项。"
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, fuzzy, c-format
 #| msgid "%s is dangling, it will be updated with best choice."
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr "%s 正处于未决状态中，将以最佳选项更新它。"
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 #| msgid ""
 #| "%s has been changed (manually or by a script). Switching to manual "
@@ -5924,68 +5998,104 @@
 "updates only."
 msgstr "%s 已更改(由于手动更改或通过脚本)。切换成仅手动更新。"
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr "正在设置 %s 的自动选择。"
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "%2$s 的候选项 %1$s 没有注册，不予设置。"
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr "没有程序提供 %s。"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr "无需配置。"
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "链接组 %s 中只有一个候选项：%s"
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "%2$s 的候选项 %1$s 没有注册，不予移除。"
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr "正在移除手动选择的替代项 - 切换 %s 到自动模式"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 #| msgid "automatic updates of %s are disabled, leaving it alone."
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "%s 的自动更新功能已禁用，保持现状。"
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 #| msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr "要回复成自动更新请执行 update-alternatives --auto %s。"
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "使用 %s 来提供 %s (%s)，于 %s 中。"
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr "链接组 %2$s 已损坏，故强制重新安装候选项 %1$ss"
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr "当前候选项 %1$s 未知，为链接组 %3$s 切换至 %2$s"
 
+#~ msgid "it is a master alternative."
+#~ msgstr "这是一个主候选项。"
+
+#~ msgid "it is a slave of %s"
+#~ msgstr "这是 %s 的一个次要项"
+
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "无法获取 %s 的信息：%s"
+
+#~ msgid "readlink(%s) failed: %s"
+#~ msgstr "readlink(%s) 失败：%s"
+
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "扫描 %s 失败：%s"
+
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "执行 %s 失败：%s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "无法创建 %s 为 %s 的符号链接：%s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "无法把 %s 安装为 %s：%s"
+
+#~ msgid "while writing %s: %s"
+#~ msgstr "当写入 %s 时：%s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "无法读取 %s：%s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "无法关闭 %s：%s"
+
+#~ msgid "cannot write %s: %s"
+#~ msgstr "无法写入 %s：%s"
+
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -6224,9 +6334,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "忽略了 %s 中的控制区域"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "执行 tar 失败"
-
 #~ msgid "failed to create temporary directory"
 #~ msgstr "创建临时目录失败"
 
Binary files dpkg/po/zh_TW.gmo and /home/vorlon/devel/multiarch/dpkg-debian/po/zh_TW.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/po/zh_TW.po /home/vorlon/devel/multiarch/dpkg-debian/po/zh_TW.po
--- dpkg/po/zh_TW.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/po/zh_TW.po	2012-06-07 10:11:09.426073000 -0700
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2009-01-28 10:31+0800\n"
 "Last-Translator: Tetralet <tetralet@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -24,7 +24,7 @@
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, fuzzy, c-format
 msgid "unable to write file '%s'"
 msgstr "無法開啟來源檔 `%.250s'"
@@ -44,71 +44,77 @@
 msgid "ar member file (%s)"
 msgstr "無法建立臨時檔 (data)"
 
-#: lib/dpkg/buffer.c:194
+#: lib/dpkg/buffer.c:196
 #, fuzzy, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr "buffer_copy (%s) 失敗"
 
-#: lib/dpkg/buffer.c:196
+#: lib/dpkg/buffer.c:212
 #, fuzzy, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr "buffer_copy (%s) 失敗"
 
-#: lib/dpkg/buffer.c:198
+#: lib/dpkg/buffer.c:220
 #, fuzzy, c-format
 msgid "short read on buffer copy for %s"
 msgstr "buffer_copy (%s) 未讀完所有資料"
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:208 src/help.c:584
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:410
-#: src/processarc.c:806 dpkg-deb/build.c:459 dpkg-deb/build.c:533
-#: dpkg-deb/build.c:557 dpkg-deb/extract.c:312 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68
+#: lib/dpkg/buffer.c:288
+#, fuzzy, c-format
+#| msgid "failed to exec tar"
+msgid "failed to seek %s"
+msgstr "無法執行 tar"
+
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, fuzzy, c-format
 msgid "unable to execute %s (%s)"
 msgstr "無法執行 %s"
 
-#: lib/dpkg/compress.c:77
+#: lib/dpkg/compress.c:83
 #, c-format
 msgid "%s: decompression"
 msgstr "%s：解壓縮"
 
-#: lib/dpkg/compress.c:84
+#: lib/dpkg/compress.c:89
 #, c-format
 msgid "%s: compression"
 msgstr "%s：壓縮"
 
-#: lib/dpkg/compress.c:108
+#: lib/dpkg/compress.c:112
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:120
+#: lib/dpkg/compress.c:124
 #, fuzzy, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr "%s：內部 gzip 錯誤：`%s'"
 
-#: lib/dpkg/compress.c:128 lib/dpkg/compress.c:132
+#: lib/dpkg/compress.c:132 lib/dpkg/compress.c:136
 #, fuzzy, c-format
 msgid "%s: internal gzip write error"
 msgstr "%s：內部 gzip 錯誤：`%s'"
 
-#: lib/dpkg/compress.c:148
+#: lib/dpkg/compress.c:150
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:155
+#: lib/dpkg/compress.c:157
 #, fuzzy, c-format
 msgid "%s: internal gzip read error"
 msgstr "%s：內部 gzip 錯誤：`%s'"
 
-#: lib/dpkg/compress.c:165
+#: lib/dpkg/compress.c:167
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr "%s：內部 gzip 錯誤：`%s'"
 
-#: lib/dpkg/compress.c:178
+#: lib/dpkg/compress.c:180
 #, fuzzy, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr "%s：內部 gzip 錯誤：`%s'"
@@ -123,31 +129,31 @@
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr "%s：內部 bzip2 錯誤：`%s'"
 
-#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:296
+#: lib/dpkg/compress.c:240 lib/dpkg/compress.c:244 lib/dpkg/compress.c:294
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error"
 msgstr "%s：內部 bzip2 錯誤：`%s'"
 
-#: lib/dpkg/compress.c:260
+#: lib/dpkg/compress.c:258
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:267
+#: lib/dpkg/compress.c:265
 #, fuzzy, c-format
 msgid "%s: internal bzip2 read error"
 msgstr "%s：內部 bzip2 錯誤：`%s'"
 
-#: lib/dpkg/compress.c:277 lib/dpkg/compress.c:288
+#: lib/dpkg/compress.c:275 lib/dpkg/compress.c:286
 #, fuzzy, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr "%s：內部 bzip2 錯誤：`%s'"
 
-#: lib/dpkg/compress.c:284
+#: lib/dpkg/compress.c:282
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
@@ -155,105 +161,105 @@
 msgstr ""
 "更新目錄中包含了檔案 `%.250s'，但它的名稱太長了（長度為 %d，最大為 %d）"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr "更新目錄中含有不同長度名稱的檔案（分別為 %d 和 %d）"
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr "無法掃描更新目錄 `%.255s'"
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "無法刪除合併後的更新檔 %.255s"
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "無法建立 `%.255s'"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "無法用填料填滿 %.250s"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "在填充後無法刷新 %.250s"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "在填充後無法搜尋到 %.250s 的起始位置"
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, fuzzy, c-format
 #| msgid "unable to open tmpfile for vsnprintf"
 msgid "unable to open lock file %s for testing"
 msgstr "無法替 vsnprintf 開啟臨時檔"
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr "無法開啟/建立狀態資料庫的鎖定檔"
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "您沒有鎖定 dpkg 的狀態資料庫的權限"
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
 msgid "dpkg status database"
 msgstr "無法鎖定 dpkg 的狀態資料庫"
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr "該操作需要超級使用者權限"
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr "無法存取 dpkg 狀態庫"
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr "該操作需要在 dpkg 狀態庫有著讀寫權限"
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "無法刪除自己的更新檔 %.255s"
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr "無法寫入 `%.250s' 的更新狀態"
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr "無法刷新 `%.250s' 的更新狀態"
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr "無法縮減 `%.250s' 的更新狀態"
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr "無法同步 `%.250s' 的更新狀態"
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr "無法關閉 `%.250s' 的更新狀態"
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr "無法安裝 `%.250s' 的更新狀態"
@@ -274,70 +280,72 @@
 msgid "unable to open directory '%s'"
 msgstr "無法開啟來源檔 `%.250s'"
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:201
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, fuzzy, c-format
 msgid "unable to open file '%s'"
 msgstr "無法開啟來源檔 `%.250s'"
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:231 src/divertcmd.c:376
-#: src/statcmd.c:216 dpkg-deb/build.c:594 dpkg-split/join.c:65
-#: dpkg-split/queue.c:187
+#: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
+#: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, fuzzy, c-format
 msgid "unable to sync file '%s'"
 msgstr "無法開啟來源檔 `%.250s'"
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:233 src/divertcmd.c:378
-#: dpkg-deb/build.c:596 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, fuzzy, c-format
 msgid "unable to close file '%s'"
 msgstr "無法在 vsnprintf 裡進行刷新"
 
-#: lib/dpkg/dump.c:397
+#: lib/dpkg/dump.c:396
 #, c-format
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "無法將 `%.50s' 的詳盡資訊寫入 `%.250s'"
 
-#: lib/dpkg/dump.c:424
+#: lib/dpkg/dump.c:423
 #, fuzzy, c-format
 msgid "failed to open '%s' for writing %s database"
 msgstr "無法開啟 `%s' 以寫入 %s 資訊"
 
-#: lib/dpkg/dump.c:427
+#: lib/dpkg/dump.c:426
 #, fuzzy, c-format
 msgid "unable to set buffering on %s database file"
 msgstr "無法在狀態檔上設置緩衝區"
 
-#: lib/dpkg/dump.c:439
+#: lib/dpkg/dump.c:438
 #, fuzzy, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "無法寫入 %s 記錄（由 `%.50s' 至 `%.250s'）"
 
-#: lib/dpkg/dump.c:447
+#: lib/dpkg/dump.c:446
 #, fuzzy, c-format
 msgid "failed to flush %s database to '%.250s'"
 msgstr "無法刷新 %s 資訊至 `%.250s'"
 
-#: lib/dpkg/dump.c:449
+#: lib/dpkg/dump.c:448
 #, fuzzy, c-format
 msgid "failed to fsync %s database to '%.250s'"
 msgstr "無法同步 %s 資訊至 `%.250s'"
 
-#: lib/dpkg/dump.c:452
+#: lib/dpkg/dump.c:451
 #, fuzzy, c-format
 msgid "failed to close '%.250s' after writing %s database"
 msgstr "在寫入 %2$s 資訊之後，無法關閉 `%1$.250s'"
 
-#: lib/dpkg/dump.c:456
+#: lib/dpkg/dump.c:455
 #, fuzzy, c-format
 msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
 msgstr "無法將 `%.250s' 指向 `%.250s' 以做為 %s 的備份之用"
 
-#: lib/dpkg/dump.c:459
+#: lib/dpkg/dump.c:458
 #, fuzzy, c-format
 msgid "failed to install '%.250s' as '%.250s' containing %s database"
 msgstr "無法將 `%.250s' 安裝為 `%.250s' 以包含 %s 資訊"
 
-#: lib/dpkg/ehandle.c:93
+#: lib/dpkg/ehandle.c:94
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
@@ -346,7 +354,7 @@
 "%s：無可挽回的致命錯誤，中止操作：\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:99
+#: lib/dpkg/ehandle.c:100
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: unrecoverable fatal error, aborting:\n"
@@ -358,13 +366,13 @@
 "%s：無可挽回的致命錯誤，中止操作：\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:119
+#: lib/dpkg/ehandle.c:120
 #, fuzzy
 #| msgid "out of memory for new cleanup entry"
 msgid "out of memory for new error context"
 msgstr "新的清理項目導致記憶體不敷使用"
 
-#: lib/dpkg/ehandle.c:182
+#: lib/dpkg/ehandle.c:183
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -373,35 +381,35 @@
 "%s: 在清理時發生錯誤：\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:199
+#: lib/dpkg/ehandle.c:201
 #, fuzzy, c-format
 #| msgid "dpkg: too many nested errors during error recovery !!\n"
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr "dpkg：在錯誤回復過程中又發生了更多的層層錯誤！！\n"
 
-#: lib/dpkg/ehandle.c:266 lib/dpkg/ehandle.c:305
+#: lib/dpkg/ehandle.c:268 lib/dpkg/ehandle.c:307
 msgid "out of memory for new cleanup entry"
 msgstr "新的清理項目導致記憶體不敷使用"
 
-#: lib/dpkg/ehandle.c:289
+#: lib/dpkg/ehandle.c:291
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "新的清理項目的參數太多導致記憶體不敷使用"
 
-#: lib/dpkg/ehandle.c:350
+#: lib/dpkg/ehandle.c:352
 #, fuzzy, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 "%s: 在清理時發生錯誤：\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:391
+#: lib/dpkg/ehandle.c:393
 #, fuzzy, c-format
 msgid "%s: warning: %s\n"
 msgstr ""
 "%s: 在清理時發生錯誤：\n"
 " %s\n"
 
-#: lib/dpkg/ehandle.c:414
+#: lib/dpkg/ehandle.c:416
 #, fuzzy, c-format
 msgid "%s:%s:%d: internal error: %s\n"
 msgstr "%s:%d：內部錯誤 `%s'\n"
@@ -417,106 +425,106 @@
 msgid "'%.50s' is not allowed for %s"
 msgstr "`%.*s' 不可用於 %s"
 
-#: lib/dpkg/fields.c:68
+#: lib/dpkg/fields.c:73
 #, c-format
 msgid "junk after %s"
 msgstr "在 %s 之後有多餘的資料"
 
-#: lib/dpkg/fields.c:82
+#: lib/dpkg/fields.c:87
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr "無效的套件名稱 (%.250s)"
 
-#: lib/dpkg/fields.c:97
+#: lib/dpkg/fields.c:102
 #, c-format
 msgid "empty file details field `%s'"
 msgstr "檔案說明欄位 `%s' 是空的"
 
-#: lib/dpkg/fields.c:100
+#: lib/dpkg/fields.c:105
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr "這個檔案說明欄位 `%s' 不可用於狀態檔"
 
-#: lib/dpkg/fields.c:113
+#: lib/dpkg/fields.c:118
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr "檔案說明欄位 `%s' 裡的值太多（和其他的相比）"
 
-#: lib/dpkg/fields.c:127
+#: lib/dpkg/fields.c:132
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr "檔案說明欄位 `%s' 中的值太少（和其他的相比）"
 
-#: lib/dpkg/fields.c:149
+#: lib/dpkg/fields.c:154
 msgid "yes/no in boolean field"
 msgstr "boolean 欄位的 yes/no"
 
-#: lib/dpkg/fields.c:169
+#: lib/dpkg/fields.c:174
 msgid "word in `priority' field"
 msgstr "`優先等級' 欄位的字串"
 
-#: lib/dpkg/fields.c:181
+#: lib/dpkg/fields.c:186
 msgid "value for `status' field not allowed in this context"
 msgstr "在此不能使用這個 `status' 欄位的值"
 
-#: lib/dpkg/fields.c:186
+#: lib/dpkg/fields.c:191
 msgid "first (want) word in `status' field"
 msgstr "在 `status' 欄位的第一個字 (want)"
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c:194
 msgid "second (error) word in `status' field"
 msgstr "在 `status' 欄位的第二個字 (error)"
 
-#: lib/dpkg/fields.c:192
+#: lib/dpkg/fields.c:197
 msgid "third (status) word in `status' field"
 msgstr "在 `status' 欄位的第三個字 (status)"
 
-#: lib/dpkg/fields.c:202
+#: lib/dpkg/fields.c:207
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
 msgid "error in Version string '%.250s'"
 msgstr "版本字串 `%.250s' 有誤：%.250s"
 
-#: lib/dpkg/fields.c:213
+#: lib/dpkg/fields.c:218
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr "使用了已廢棄的 `Revision' 或 `Package-Revision' 欄位"
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c:235
 msgid "value for `config-version' field not allowed in this context"
 msgstr "在此不能使用這個 `config-version' 欄位的值"
 
-#: lib/dpkg/fields.c:235
+#: lib/dpkg/fields.c:240
 #, fuzzy, c-format
 #| msgid "error in Config-Version string `%.250s': %.250s"
 msgid "error in Config-Version string '%.250s'"
 msgstr "Config-Version 字串 `%.250s' 有誤：%.250s"
 
-#: lib/dpkg/fields.c:262
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr "`conffiles' 的值有行 `%.*s' 的格式錯誤了"
 
-#: lib/dpkg/fields.c:283
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr "`conffiles' 的值有行是以非空白字元 `%c' 開頭"
 
-#: lib/dpkg/fields.c:300
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr "root 或空目錄也被列為 conffile"
 
-#: lib/dpkg/fields.c:361
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr "`%s' 欄位，找不到套件名稱，或是應當為套件名稱的地方是亂碼"
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr "`%s' 欄位，無效的套件名稱 `%.255s'：%s"
 
-#: lib/dpkg/fields.c:402
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -525,7 +533,7 @@
 "`%s' 欄位，參照至 `%.255s'：\n"
 " 不正確的版本相依關係 %c%c"
 
-#: lib/dpkg/fields.c:408
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -534,7 +542,7 @@
 "`%s' 欄位，參照至 `%.255s'：\n"
 " `%c' 已廢棄，請替而使用 `%c=' 或 `%c%c'"
 
-#: lib/dpkg/fields.c:418
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -543,11 +551,11 @@
 "`%s' 欄位，參照至 `%.255s'：\n"
 " 未明確要求版本號完全一致，建議替而使用 `='"
 
-#: lib/dpkg/fields.c:426
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr "在 Provides 中只能指定明確的版本"
 
-#: lib/dpkg/fields.c:430
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
@@ -556,56 +564,56 @@
 "`%s' 欄位，參照至 `%.255s'：\n"
 " 版本號不是以英數字開頭，建議加一個空格"
 
-#: lib/dpkg/fields.c:447 lib/dpkg/fields.c:451
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "`%s' 欄位，參照至 `%.255s'：版本號含有 `%c'"
 
-#: lib/dpkg/fields.c:455
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr "`%s' 欄位，參照至 `%.255s'：版本號未終止"
 
-#: lib/dpkg/fields.c:461
+#: lib/dpkg/fields.c:465
 #, fuzzy, c-format
 #| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr "`%s' 欄位，參照至 `%.255s'：版本號有誤：%.255s"
 
-#: lib/dpkg/fields.c:471
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "`%s' 欄位，在參照至套件 `%.255s' 後的語法有誤"
 
-#: lib/dpkg/fields.c:478
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "在 %s 欄位不可有可替換符號 (`|')"
 
-#: lib/dpkg/fields.c:532
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr "`triggers-pending' 欄位所設定的值不能用在這個地方"
 
-#: lib/dpkg/fields.c:539
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr "不合法的待執行觸發程式名稱 `%.255s': %s"
 
-#: lib/dpkg/fields.c:543
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr "重複的待執行觸發程式 `%.255s'"
 
-#: lib/dpkg/fields.c:557
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr "`triggers-awaited' 欄位所設定的值不能用在這個地方"
 
-#: lib/dpkg/fields.c:564
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr "在正要執行的觸發程式 `%.255s' 裡有不合法的套件名稱：%s"
 
-#: lib/dpkg/fields.c:570
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr "重複的正要執行的觸發程式套件 `%.255s'"
@@ -662,7 +670,7 @@
 msgid "unable to write to status fd %d"
 msgstr "無法寫入 `%.250s' 的更新狀態"
 
-#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:249
+#: lib/dpkg/mlib.c:44 utils/update-alternatives.c:262
 #, fuzzy, c-format
 #| msgid "realloc failed (%zu bytes)"
 msgid "malloc failed (%zu bytes)"
@@ -673,8 +681,8 @@
 msgid "realloc failed (%zu bytes)"
 msgstr "realloc 失敗（%zu 位元組）"
 
-#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:264
-#: utils/update-alternatives.c:305 utils/update-alternatives.c:1056
+#: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr "無法配置記憶體"
 
@@ -707,198 +715,204 @@
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr "無法在 %.250s 上設定 close-on-exec"
 
-#: lib/dpkg/myopt.c:61
+#: lib/dpkg/options.c:63
 #, fuzzy, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr "設定錯誤：需賦予值給 %s"
 
-#: lib/dpkg/myopt.c:73
+#: lib/dpkg/options.c:75
 #, fuzzy, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr "無法開啟設定檔 `%.255s' 以進行讀取"
 
-#: lib/dpkg/myopt.c:100
+#: lib/dpkg/options.c:102
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/myopt.c:115
+#: lib/dpkg/options.c:117
 #, fuzzy, c-format
 msgid "unknown option '%s'"
 msgstr "未知選項 `%s'"
 
-#: lib/dpkg/myopt.c:119
+#: lib/dpkg/options.c:121
 #, fuzzy, c-format
 msgid "'%s' needs a value"
 msgstr "--%s 選項需有一個參數"
 
-#: lib/dpkg/myopt.c:125
+#: lib/dpkg/options.c:127
 #, fuzzy, c-format
 msgid "'%s' does not take a value"
 msgstr "--%s 選項並不需要參數"
 
-#: lib/dpkg/myopt.c:131
+#: lib/dpkg/options.c:133
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr "設定檔 `%.255s' 讀取錯誤"
 
-#: lib/dpkg/myopt.c:132
+#: lib/dpkg/options.c:134
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr "在關閉設定檔 `%.255s' 時發生錯誤"
 
-#: lib/dpkg/myopt.c:168
+#: lib/dpkg/options.c:170
 #, fuzzy, c-format
 msgid "error opening configuration directory '%s'"
 msgstr "在關閉設定檔 `%.255s' 時發生錯誤"
 
-#: lib/dpkg/myopt.c:221
+#: lib/dpkg/options.c:228
 #, c-format
 msgid "unknown option --%s"
 msgstr "未知的選項 --%s"
 
-#: lib/dpkg/myopt.c:225
+#: lib/dpkg/options.c:232
 #, c-format
 msgid "--%s option takes a value"
 msgstr "--%s 選項需有一個參數"
 
-#: lib/dpkg/myopt.c:230
+#: lib/dpkg/options.c:237
 #, c-format
 msgid "--%s option does not take a value"
 msgstr "--%s 選項並不需要參數"
 
-#: lib/dpkg/myopt.c:238
+#: lib/dpkg/options.c:245
 #, c-format
 msgid "unknown option -%c"
 msgstr "未知的選項 -%c"
 
-#: lib/dpkg/myopt.c:243
+#: lib/dpkg/options.c:250
 #, c-format
 msgid "-%c option takes a value"
 msgstr "-%c 選項需有一個參數"
 
-#: lib/dpkg/myopt.c:251
+#: lib/dpkg/options.c:258
 #, c-format
 msgid "-%c option does not take a value"
 msgstr "-%c 選項並不需要參數"
 
-#: lib/dpkg/myopt.c:264
+#: lib/dpkg/options.c:271
 #, fuzzy, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "警告：已廢棄選項 `--%s'\n"
 
-#: lib/dpkg/myopt.c:280
+#: lib/dpkg/options.c:287
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "相互衝突的操作 -%c (--%s) 和 -%c (--%s)"
 
-#: lib/dpkg/parse.c:121
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "有多個值對應至 `%s' 欄位"
 
-#: lib/dpkg/parse.c:133
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "用戶自定的欄位名 `%.*s' 過短"
 
-#: lib/dpkg/parse.c:139
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "有多個值對應至用戶自定的欄位 `%.*s'"
 
-#: lib/dpkg/parse.c:186
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "套件的 Configured-Version 和 Status 的內容不符"
 
-#: lib/dpkg/parse.c:197
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "套件的狀態為 %s 但觸發程式正要執行"
 
-#: lib/dpkg/parse.c:201
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "套件的狀態為 triggers-awaited 但並沒有觸發程式正要執行"
 
-#: lib/dpkg/parse.c:207
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "套件的狀態為 %s 但觸發程式尚待執行"
 
-#: lib/dpkg/parse.c:211
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "套件的狀態為 triggers-pending 但並沒有觸發程式尚待執行"
 
-#: lib/dpkg/parse.c:221
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "該套件的狀態是尚未安裝，但是它卻有 conffile，不去理會它"
 
-#: lib/dpkg/parse.c:328
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "無法開啟套件的 info 檔 `%.255s' 以進行讀取"
 
-#: lib/dpkg/parse.c:333
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "無法取得套件的 info 檔 `%.255s' 的狀態"
 
-#: lib/dpkg/parse.c:339
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "無法 mmap 套件的 info 檔 `%.255s'"
 
-#: lib/dpkg/parse.c:344
+#: lib/dpkg/parse.c:352
 #, fuzzy, c-format
 #| msgid "can't stat package info file `%.255s'"
 msgid "reading package info file '%.255s'"
 msgstr "無法取得套件的 info 檔 `%.255s' 的狀態"
 
-#: lib/dpkg/parse.c:380
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr "在讀取完畢之後無法關閉：`%.255s'"
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "在欄位名稱 `%.*s' 後有 EOF"
 
-#: lib/dpkg/parse.c:383
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "在欄位名稱 `%.*s' 中有換行符號"
 
-#: lib/dpkg/parse.c:386
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "在欄位名稱 `%.*s' 中有 MSDOS EOF (^Z)"
 
-#: lib/dpkg/parse.c:390
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "欄位名稱 `%.*s' 之後必須有個冒號"
 
-#: lib/dpkg/parse.c:399
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "在欄位 `%.*s' 的值的前面有 EOF（少了結尾的換行符號）"
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "在欄位 `%.*s' 的值之中有 MSDOS EOF 字元（少了換行符號？）"
 
-#: lib/dpkg/parse.c:417
+#: lib/dpkg/parse.c:440
+#, fuzzy, c-format
+#| msgid "newline in field name `%.*s'"
+msgid "blank line in value of field '%.*s'"
+msgstr "在欄位名稱 `%.*s' 中有換行符號"
+
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "在欄位 `%.*s' 的值之中有 EOF 字元（少了結尾的換行符號）"
 
-#: lib/dpkg/parse.c:434
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr "找到了多個套件的 info 項目，但只能有一個"
 
-#: lib/dpkg/parse.c:466
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr "在讀取完畢之後無法關閉：`%.255s'"
-
-#: lib/dpkg/parse.c:467
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "在 `%.255s' 中沒有套件的相關資訊"
@@ -917,66 +931,66 @@
 " %.255s"
 msgstr "警告，在檔案 `%.255s' 的第 %d 行附近"
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr "不應該是空字串"
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 #, fuzzy
 #| msgid "must start with an alphanumeric"
 msgid "must start with an alphanumeric character"
 msgstr "必須以英數字開頭"
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr "不可有字元 `%c'（只能用英文字母、數字和字元 `%s'）"
 
-#: lib/dpkg/parsehelp.c:198
+#: lib/dpkg/parsehelp.c:178
 #, fuzzy
 #| msgid "<none>"
 msgctxt "version"
 msgid "<none>"
 msgstr "<無>"
 
-#: lib/dpkg/parsehelp.c:215
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr "版本號是空的"
 
-#: lib/dpkg/parsehelp.c:229
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr "版本號裡嵌有空格字元"
 
-#: lib/dpkg/parsehelp.c:234
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr "版本中的 epoch 不是數字"
 
-#: lib/dpkg/parsehelp.c:235
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr "版本號的冒號後面沒有東西"
 
-#: lib/dpkg/parsehelp.c:268
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:271
+#: lib/dpkg/parsehelp.c:250
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in version number"
 msgstr "版本號的冒號後面沒有東西"
 
-#: lib/dpkg/parsehelp.c:275
+#: lib/dpkg/parsehelp.c:254
 #, fuzzy
 #| msgid "nothing after colon in version number"
 msgid "invalid character in revision number"
 msgstr "版本號的冒號後面沒有東西"
 
-#: lib/dpkg/parsehelp.c:341 lib/dpkg/parsehelp.c:354
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr "找不到 %s"
 
-#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:357
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr "%s 的值是空的"
@@ -995,51 +1009,51 @@
 msgid "(no description available)"
 msgstr "（無相關介紹）"
 
-#: lib/dpkg/subproc.c:54
+#: lib/dpkg/subproc.c:55
 #, fuzzy, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr "無法在執行 script 前，忽略信號 %s"
 
-#: lib/dpkg/subproc.c:67
+#: lib/dpkg/subproc.c:68
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr "錯誤，無法捕捉到的訊號 %s：%s\n"
 
-#: lib/dpkg/subproc.c:77
+#: lib/dpkg/subproc.c:78
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr "%s（子程序）：%s\n"
 
-#: lib/dpkg/subproc.c:88 utils/update-alternatives.c:417
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr "fork 失敗"
 
-#: lib/dpkg/subproc.c:118
+#: lib/dpkg/subproc.c:119
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr "子程序 %s 傳回了錯誤退出狀態 %d"
 
-#: lib/dpkg/subproc.c:127
+#: lib/dpkg/subproc.c:128
 #, fuzzy, c-format
 msgid "subprocess %s was interrupted"
 msgstr "在等待 %s 時失敗"
 
-#: lib/dpkg/subproc.c:129
+#: lib/dpkg/subproc.c:130
 #, fuzzy, c-format
 #| msgid "subprocess %s killed by signal (%s)%s"
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr "子程序 %s 被信號 (%s)%s 終止了"
 
-#: lib/dpkg/subproc.c:131
+#: lib/dpkg/subproc.c:132
 msgid ", core dumped"
 msgstr ", core dumped"
 
-#: lib/dpkg/subproc.c:133
+#: lib/dpkg/subproc.c:134
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr "子程序 %s 失敗，並傳回了 wait 狀態碼 %d"
 
-#: lib/dpkg/subproc.c:150 utils/update-alternatives.c:424
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, fuzzy, c-format
 msgid "wait for subprocess %s failed"
 msgstr "在等待 %s 時失敗"
@@ -1059,61 +1073,53 @@
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr "在觸發程式延遲檔 `%.250s' 裡的字元 `%s'%s 裡的語法有誤"
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr "無法開啟/建立觸發程式鎖定檔 `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 #, fuzzy
 #| msgid "triggered"
 msgid "triggers area"
 msgstr "已觸發"
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr "無法取得觸發程式延遲檔 `%.250s' 的資訊"
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr "無法開啟觸發程式延遲檔 `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr "無法開啟/建立新的觸發程式延遲檔 `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr "在讀取觸發程式延遲檔 `%.250s' 時發生錯誤"
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr "無法寫入新的觸發程式延遲檔 `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr "無法關閉新的觸發程式延遲檔 `%.250s'"
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr "無法安裝新的觸發程式延遲檔 `%.250s'"
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr "觸發程式的名稱不可為空的"
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr "觸發程式的名稱包含了不合法的字元"
-
-#: lib/dpkg/triglib.c:323
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
@@ -1122,17 +1128,17 @@
 "觸發程式的名稱 `%.250s' 使用了不正確或未知的語法（在套件 `%.250s' 的 trigger "
 "interests 裡）"
 
-#: lib/dpkg/triglib.c:363
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr "無法開啟 trigger interest 列表檔 `%.250s'"
 
-#: lib/dpkg/triglib.c:392
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr "無法跳到 trigger interest 檔 `%.250s' 的開頭"
 
-#: lib/dpkg/triglib.c:398
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
@@ -1140,83 +1146,89 @@
 msgstr ""
 "trigger interest 檔 `%.250s' 的語法有誤；不合法的套件名稱 `%.250s'：%.250s"
 
-#: lib/dpkg/triglib.c:419
-#, c-format
-msgid "unable to create new trigger interest file `%.250s'"
-msgstr "無法建立新的 trigger interest 檔 `%.250s'"
-
-#: lib/dpkg/triglib.c:432
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr "無法寫入新的 trigger interest 檔 `%.250s'"
 
-#: lib/dpkg/triglib.c:435
+#: lib/dpkg/triglib.c:321
 #, fuzzy, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr "無法建立新的 trigger interest 檔 `%.250s'"
 
-#: lib/dpkg/triglib.c:438
+#: lib/dpkg/triglib.c:324
 #, fuzzy, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr "無法建立新的 trigger interest 檔 `%.250s'"
 
-#: lib/dpkg/triglib.c:442
-#, fuzzy, c-format
-msgid "unable to close new trigger interest file `%.250s'"
-msgstr "無法建立新的 trigger interest 檔 `%.250s'"
-
-#: lib/dpkg/triglib.c:446
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr "無法安裝新的 trigger interest 檔 `%.250s'"
 
-#: lib/dpkg/triglib.c:511
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
+#: src/remove.c:286 src/remove.c:377
+#, c-format
+msgid "cannot remove `%.250s'"
+msgstr "無法移除 `%.250s'"
+
+#: lib/dpkg/triglib.c:360
+#, c-format
+msgid "unable to create new trigger interest file `%.250s'"
+msgstr "無法建立新的 trigger interest 檔 `%.250s'"
+
+#: lib/dpkg/triglib.c:383
+#, fuzzy, c-format
+msgid "unable to close new trigger interest file `%.250s'"
+msgstr "無法建立新的 trigger interest 檔 `%.250s'"
+
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr "檔案名稱 `%.250s' 和套件 `%.250s' 的 trigger interest 檔重複了"
 
-#: lib/dpkg/triglib.c:534
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr "無法建立新的 file trigger 檔 `%.250s'"
 
-#: lib/dpkg/triglib.c:543
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr "無法寫入新的 file trigger 檔 `%.250s'"
 
-#: lib/dpkg/triglib.c:546
+#: lib/dpkg/triglib.c:496
 #, fuzzy, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr "無法建立新的 file trigger 檔 `%.250s'"
 
-#: lib/dpkg/triglib.c:549
+#: lib/dpkg/triglib.c:499
 #, fuzzy, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr "無法建立新的 file trigger 檔 `%.250s'"
 
-#: lib/dpkg/triglib.c:553
+#: lib/dpkg/triglib.c:503
 #, fuzzy, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr "無法建立新的 file trigger 檔 `%.250s'"
 
-#: lib/dpkg/triglib.c:557
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr "無法將新的 file trigger 檔安裝為 `%.250s'"
 
-#: lib/dpkg/triglib.c:580
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr "無法讀取 file trigger 檔 `%.250s'"
 
-#: lib/dpkg/triglib.c:588
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr "在 file trigger 檔 `%.255s' 裡的語法有誤"
 
-#: lib/dpkg/triglib.c:594
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
@@ -1225,7 +1237,7 @@
 "file trigger 的記錄裡包含了不合法的套件名稱 `%.250s'（在檔案 `%.250s' 的 "
 "interest 裡）：%.250s"
 
-#: lib/dpkg/triglib.c:693
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
@@ -1233,30 +1245,38 @@
 msgstr ""
 "觸發程式 ci 檔 `%.250s' 的觸發程式名稱 `%.250s' 不合於觸發程式的語法：%.250s"
 
-#: lib/dpkg/triglib.c:712
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr "無法開啟觸發程式 ci 檔 `%.250s'"
 
-#: lib/dpkg/triglib.c:727
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr "觸發程式 ci 檔包含了未知的指令語法"
 
-#: lib/dpkg/triglib.c:736
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr "觸發程式 ci 檔包含了未知的指令 `%.250s'"
 
-#: lib/dpkg/triglib.c:800
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr "無法建立觸發程式狀態目錄 `%.250s'"
 
-#: lib/dpkg/triglib.c:803
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr "無法設定觸發程式狀態目錄 `%.250s' 的所有權"
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr "觸發程式的名稱不可為空的"
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr "觸發程式的名稱包含了不合法的字元"
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1281,7 +1301,7 @@
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:179 src/archives.c:200 src/archives.c:715
+#: src/archives.c:179 src/archives.c:200 src/archives.c:724
 msgid "error reading from dpkg-deb pipe"
 msgstr "由 dpkg-deb 的管線讀取資料時發生錯誤"
 
@@ -1300,12 +1320,12 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "在替符號連結 `%.255s' 設定所有權時發生錯誤"
 
-#: src/archives.c:265 src/archives.c:725 src/statcmd.c:162
+#: src/archives.c:265 src/archives.c:734 src/statcmd.c:163
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "在替 `%.255s' 設定所有權時發生錯誤"
 
-#: src/archives.c:267 src/archives.c:727 src/statcmd.c:164
+#: src/archives.c:267 src/archives.c:736 src/statcmd.c:165
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "在替 `%.255s' 設定權限時發生錯誤"
@@ -1357,109 +1377,124 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "套件檔中包含了物件 `%.255s' 有著不明的型態 0x%x"
 
-#: src/archives.c:629
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
+#, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat file '%s'"
+msgstr "無法取得原本名稱 `%s' 的資訊：%s"
+
+#: src/archives.c:641
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "正在替換成原有套件 %s 裡的檔案...\n"
 
-#: src/archives.c:633
+#: src/archives.c:645
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "被替換成已安裝套件 %s 裡的檔案...\n"
 
-#: src/archives.c:641
+#: src/archives.c:654
 #, fuzzy, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
 "nondirectory"
 msgstr "正試圖用套件 %2$.250s 裡一個非目錄的檔案替換目錄 `%1$.250s'"
 
-#: src/archives.c:652
+#: src/archives.c:661
 #, fuzzy, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr "正試圖覆蓋 `%.250s'，它同時也包含於套件 %.250s"
 
-#: src/archives.c:702
+#: src/archives.c:711
 #, fuzzy, c-format
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr "無法讀取 `%.255s'（位於 `%.255s'）"
 
-#: src/archives.c:709
+#: src/archives.c:718
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "在這期間會以 dpkg-deb 進行 `%.255s'"
 
-#: src/archives.c:735 src/archives.c:896 src/archives.c:937
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "在關閉/寫入 `%.255s' 時發生錯誤"
 
-#: src/archives.c:739
+#: src/archives.c:748
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "在建立管線 `%.255s' 時發生錯誤"
 
-#: src/archives.c:744 src/archives.c:749
+#: src/archives.c:753 src/archives.c:758
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "在建立裝置檔 `%.255s' 時發生錯誤"
 
-#: src/archives.c:762
+#: src/archives.c:771
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "在建立實體連結 `%.255s' 時發生錯誤"
 
-#: src/archives.c:768
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "在建立符號連結 `%.255s' 時發生錯誤"
 
-#: src/archives.c:774
+#: src/archives.c:783
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "在建立目錄 `%.255s' 時發生錯誤"
 
-#: src/archives.c:813
+#: src/archives.c:822
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "無法將 `%.255s' 移開以安裝新的版本"
 
-#: src/archives.c:823
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "無法讀取符號連結 `%.255s'"
 
-#: src/archives.c:828
+#: src/archives.c:834 src/configure.c:423
+#, c-format
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgstr ""
+
+#: src/archives.c:839
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "無法替 `%.255s' 做一個符號連結備份"
 
-#: src/archives.c:830
+#: src/archives.c:841
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "無法 chown `%.255s' 的符號連結備份"
 
-#: src/archives.c:835
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "無法在安裝新的版本前，為 `%.255s' 做一個符號連結備份"
 
-#: src/archives.c:851 src/archives.c:945
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "無法安裝 `%.255s' 的新版本"
 
-#: src/archives.c:890 src/archives.c:933
+#: src/archives.c:902 src/archives.c:945
 #, fuzzy, c-format
 msgid "unable to open '%.255s'"
 msgstr "無法建立 `%.255s'"
 
-#: src/archives.c:935
+#: src/archives.c:947
 #, fuzzy, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "無法關閉緩衝 `%.255s'"
 
-#: src/archives.c:988
+#: src/archives.c:1000
 #, fuzzy, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1468,21 +1503,21 @@
 "dpkg：警告 - 忽略 %s 的相依問題：\n"
 "%s"
 
-#: src/archives.c:993
+#: src/archives.c:1005
 #, fuzzy, c-format
 msgid ""
 "considering deconfiguration of essential\n"
 " package %s, to enable %s."
 msgstr "dpkg: 警告 - 正打算清除基本套件 %s 的設定，以啟用 %s。\n"
 
-#: src/archives.c:996
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable %s.\n"
 msgstr "dpkg：不行，%s 是基本套件，不會清除它的設定只為了啟用 %s。\n"
 
-#: src/archives.c:1010
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1491,28 +1526,28 @@
 "dpkg：不行，無法繼續進行 %s（試試 --auto-deconfigure）：\n"
 "%s"
 
-#: src/archives.c:1020
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr "%.250s 的移除作業"
 
-#: src/archives.c:1045
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr "`%.255s' 的安裝作業"
 
-#: src/archives.c:1046
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg：正打算清除 %s 的設定，因為可能會被 %s 弄壞...\n"
 
-#: src/archives.c:1053
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg：好，將清除 %s 的設定（被 %s 弄壞了）。\n"
 
-#: src/archives.c:1057 src/archives.c:1175
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1521,12 +1556,12 @@
 "dpkg：關於 %s 包含了 %s：\n"
 "%s"
 
-#: src/archives.c:1065
+#: src/archives.c:1077
 #, fuzzy
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "dpkg：警告 - 忽略損壞，將強制繼續安裝！\n"
 
-#: src/archives.c:1070
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1535,174 +1570,176 @@
 "安裝 %.250s 將會毀損 %.250s，\n"
 " 且不打算要清除設定（--auto-deconfigure 也許有用）"
 
-#: src/archives.c:1074
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "安裝 %.250s 將會毀損現有的軟體"
 
-#: src/archives.c:1104
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg：為了 %2$s，正打算移除 %1$s ...\n"
 
-#: src/archives.c:1110
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s 未被正確安裝 - 將忽略它所有的相依關係。\n"
 
-#: src/archives.c:1139
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg：也許移除 %s 會出問題，因為它提供了 %s ...\n"
 
-#: src/archives.c:1154
+#: src/archives.c:1166
 #, fuzzy, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "requested.\n"
 msgstr "dpkg：儘管套件 %s 需要重新安裝，但還是應您的要求將其強制移除。\n"
 
-#: src/archives.c:1157
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg：套件 %s 需要重新安裝，將不會被移除。\n"
 
-#: src/archives.c:1166
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg：好的，為了 %2$s 將會移除 %1$s。\n"
 
-#: src/archives.c:1178
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "套件衝突 - 將不安裝 %.250s"
 
-#: src/archives.c:1179
+#: src/archives.c:1191
 #, fuzzy
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "dpkg：警告 - 忽略衝突，將強制繼續安裝！\n"
 
-#: src/archives.c:1223
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive 需要至少一個路徑作為參數"
 
-#: src/archives.c:1233
+#: src/archives.c:1245
 #, fuzzy
 msgid "find for dpkg --recursive"
 msgstr "無法為 --recursive 選項執行 find"
 
-#: src/archives.c:1254
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr "無法 fdopen find 的管線"
 
-#: src/archives.c:1260
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr "在讀取 find 的管線時發生錯誤"
 
-#: src/archives.c:1261
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr "在關閉 find 的管線時發生錯誤"
 
-#: src/archives.c:1264
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "--recursive 選項所呼叫的 find 返回了未被處理的錯誤 %i"
 
-#: src/archives.c:1267
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "已進行搜尋，但是沒有找到任何套件（即符合 *.deb 的檔案）"
 
-#: src/archives.c:1278
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s 需要至少一個套件檔作為參數"
 
-#: src/archives.c:1313 src/divertcmd.c:77 src/divertcmd.c:117
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
-#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:312
-#: src/main.c:491 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
+#: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
+#: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
 #: src/querycmd.c:396 src/querycmd.c:404 src/querycmd.c:448 src/querycmd.c:517
-#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:67
-#: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:441
-#: dpkg-deb/extract.c:216 dpkg-deb/extract.c:249 dpkg-deb/info.c:197
-#: dpkg-deb/info.c:254 dpkg-deb/main.c:60 dpkg-deb/main.c:123
-#: dpkg-split/info.c:248 dpkg-split/main.c:54 dpkg-split/main.c:92
+#: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
+#: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
+#: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
+#: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
 #: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1314 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:173 dpkg-split/queue.c:218
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1355
-#, c-format
-msgid "Selecting previously deselected package %s.\n"
+#: src/archives.c:1367
+#, fuzzy, c-format
+#| msgid "Selecting previously deselected package %s.\n"
+msgid "Selecting previously unselected package %s.\n"
 msgstr "選取了原先未被選取的套件 %s。\n"
 
-#: src/archives.c:1359
-#, c-format
-msgid "Skipping deselected package %s.\n"
+#: src/archives.c:1371
+#, fuzzy, c-format
+#| msgid "Skipping deselected package %s.\n"
+msgid "Skipping unselected package %s.\n"
 msgstr "略過未被選取的套件 %s。\n"
 
-#: src/archives.c:1375
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "已有安裝 %.250s 版的 %.250s，略過。\n"
 
-#: src/archives.c:1385
+#: src/archives.c:1397
 #, fuzzy, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "%s - 警告：即將把 %.250s 從 %.250s 降級到 %.250s。\n"
 
-#: src/archives.c:1390
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "將不會把 %.250s 從 %.250s 降級到 %.250s，略過。\n"
 
-#: src/cleanup.c:87
+#: src/cleanup.c:86
 #, c-format
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
 "of backup copy"
 msgstr "無法移除 `%.250s' 的新安裝版本以便能重新以備份副本安裝"
 
-#: src/cleanup.c:94
+#: src/cleanup.c:93
 #, c-format
 msgid "unable to restore backup version of `%.250s'"
 msgstr "無法回復為 `%.250s' 的備份版本"
 
-#: src/cleanup.c:98
+#: src/cleanup.c:97
 #, fuzzy, c-format
 #| msgid "unable to restore backup version of `%.250s'"
 msgid "unable to remove backup copy of '%.250s'"
 msgstr "無法回復為 `%.250s' 的備份版本"
 
-#: src/cleanup.c:102
+#: src/cleanup.c:101
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
 msgstr "無法移除 `%.250s' 的新安裝版本"
 
-#: src/cleanup.c:109
+#: src/cleanup.c:108
 #, c-format
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr "無法移除 `%.250s' 的新解壓版本"
 
-#: src/configure.c:102
+#: src/configure.c:104
 #, fuzzy, c-format
 #| msgid "unable to stat new dist conffile `%.250s'"
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr "無法取得新發佈的 conffile `%.250s' 的狀態"
 
-#: src/configure.c:112
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "無法取得現已安裝的 conffile `%.250s' 的狀態"
 
-#: src/configure.c:124
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1713,57 +1750,57 @@
 "在系統中找不到設定檔 `%s'。\n"
 "應您的要求，安裝新的設定檔。\n"
 
-#: src/configure.c:166
+#: src/configure.c:168
 #, fuzzy, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr "dpkg：%s：警告 - 無法移除原有的備份檔 `%.250s'：%s\n"
 
-#: src/configure.c:174
+#: src/configure.c:176
 #, fuzzy, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr "dpkg：%s：警告 - 無法將 `%.250s' 改名為 `%.250s'：%s\n"
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr "%s：無法執行 '%s %s'"
 
-#: src/configure.c:186
+#: src/configure.c:188
 #, fuzzy, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr "dpkg：%s：警告 - 無法移除原有的發佈版 `%.250s'：%s\n"
 
-#: src/configure.c:190
+#: src/configure.c:192
 #, fuzzy, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr "dpkg：%s：警告 - 無法移除 `%.250s'（在要進行覆蓋前）：%s\n"
 
-#: src/configure.c:194
+#: src/configure.c:196
 #, fuzzy, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr "dpkg：%s：警告 - 無法將 `%.250s' 指向 `%.250s'：%s\n"
 
-#: src/configure.c:198
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr "正在安裝新版的設定檔 %s ...\n"
 
-#: src/configure.c:204
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "無法將 `%.250s' 安裝為 `%.250s'"
 
-#: src/configure.c:255
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr "未曾安裝名為 `%s' 的套件，無法設定"
 
-#: src/configure.c:258
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr "套件 %.250s 已安裝並設定完成"
 
-#: src/configure.c:261
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
@@ -1772,7 +1809,7 @@
 "套件 %.250s 尚未準備好可進行設定\n"
 " 不能設定（目前的狀態為 `%.250s'）"
 
-#: src/configure.c:292
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
@@ -1781,11 +1818,11 @@
 "dpkg：因相依問題，不能設定 %s：\n"
 "%s"
 
-#: src/configure.c:295
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr "相依問題 - 保留為未設定"
 
-#: src/configure.c:299
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
@@ -1794,18 +1831,18 @@
 "dpkg：%s：相依問題 - 但還是依您要求強制進行設定：\n"
 "%s"
 
-#: src/configure.c:307
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
 msgstr "該套件正處於非常不穩定的狀態 - 您最好在設定它之前，先重新安裝它。"
 
-#: src/configure.c:310
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr "正在設定 %s (%s) ...\n"
 
-#: src/configure.c:393
+#: src/configure.c:396
 #, fuzzy, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
@@ -1814,7 +1851,7 @@
 "dpkg：%s：警告 - 無法取得設定檔 `%s' 的狀態\n"
 " (= `%s')：%s\n"
 
-#: src/configure.c:406
+#: src/configure.c:409
 #, fuzzy, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
@@ -1823,7 +1860,7 @@
 "dpkg：%s：警告 - 設定檔 `%s' 是一個循環連結\n"
 " (= `%s')\n"
 
-#: src/configure.c:415
+#: src/configure.c:418
 #, fuzzy, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
@@ -1832,7 +1869,7 @@
 "dpkg：%s：警告 - 無法 readlink conffile `%s'\n"
 " (= `%s')：%s\n"
 
-#: src/configure.c:437
+#: src/configure.c:444
 #, fuzzy, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
@@ -1841,33 +1878,33 @@
 "dpkg：%s：警告 - conffile `%.250s' 指向了有問題的檔案名稱\n"
 " （`%s' 是一個指向 `%s' 的符號連結）\n"
 
-#: src/configure.c:453
+#: src/configure.c:460
 #, fuzzy, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr "dpkg：%s：警告 - conffile `%.250s' 並非一般的檔案或符號連結 (= `%s')\n"
 
-#: src/configure.c:479
+#: src/configure.c:486
 msgid "md5hash"
 msgstr "md5hash"
 
-#: src/configure.c:485
+#: src/configure.c:492
 #, fuzzy, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr "dpkg：%s：警告 - 無法開啟 conffile %s 以進行雜湊：%s\n"
 
-#: src/configure.c:515 src/configure.c:519
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:536
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr "完成後，請輸入 `exit'。\n"
 
-#: src/configure.c:545 src/configure.c:549
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:595
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
@@ -1876,12 +1913,12 @@
 "\n"
 "設定檔 `%s'"
 
-#: src/configure.c:597
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr " （實際上是 `%s'）"
 
-#: src/configure.c:601
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1892,7 +1929,7 @@
 " ==> 系統中的這個檔案是由您建立或者是由 script 建立的。\n"
 " ==> 套件維護者所提供的套件中也包含了該檔案。\n"
 
-#: src/configure.c:606
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
@@ -1901,7 +1938,7 @@
 "\n"
 "     在安裝後未曾更動。\n"
 
-#: src/configure.c:608
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
@@ -1910,7 +1947,7 @@
 "\n"
 " ==> 在安裝後曾被（您或某個 script）修改過。\n"
 
-#: src/configure.c:609
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
@@ -1919,37 +1956,37 @@
 "\n"
 " ==> 在安裝後被（您或某個 script）刪掉了。\n"
 
-#: src/configure.c:612
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr " ==> 套件的提交者提供了一個更新版本。\n"
 
-#: src/configure.c:613
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr "     套件的版本和上次安裝的版本是相同的。\n"
 
-#: src/configure.c:621
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr " ==> 按照您的要求，使用新的檔案。\n"
 
-#: src/configure.c:625
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr " ==> 按照您的要求，保留原有的舊檔案。\n"
 
-#: src/configure.c:634
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr " ==> 預設上是保留原有的設定檔。\n"
 
-#: src/configure.c:638
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr " ==> 預設上是使用新的設定檔。\n"
 
-#: src/configure.c:645
+#: src/configure.c:652
 #, fuzzy, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1964,165 +2001,167 @@
 "      D     ：顯示兩者有何不同\n"
 "      Z     ：把目前程序切換到背景，再加以研判\n"
 
-#: src/configure.c:652
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr " 預設的動作是保留您目前使用的版本。\n"
 
-#: src/configure.c:654
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr " 預設的動作是安裝新的版本。\n"
 
-#: src/configure.c:661
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr "[預設=N]"
 
-#: src/configure.c:662
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr "[預設=Y]"
 
-#: src/configure.c:663
+#: src/configure.c:668
 msgid "[no default]"
 msgstr "[無預設值]"
 
-#: src/configure.c:666
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr "在 conffile 提示輸入之前，發現寫入 stderr 錯誤"
 
-#: src/configure.c:675
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr "在 conffile 提示輸入時，發現讀取 stdin 錯誤"
 
-#: src/configure.c:676
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr "在 conffile 提示輸入時，由 stdin 中讀到了 EOF"
 
-#: src/depcon.c:173
+#: src/depcon.c:175
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s 相依於 %s"
 
-#: src/depcon.c:176
+#: src/depcon.c:178
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s 預先相依於 %s"
 
-#: src/depcon.c:179
+#: src/depcon.c:181
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s 推薦 %s"
 
-#: src/depcon.c:182
+#: src/depcon.c:184
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s 建議 %s"
 
-#: src/depcon.c:185
+#: src/depcon.c:187
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s 會損毀 %s"
 
-#: src/depcon.c:188
+#: src/depcon.c:190
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s 衝突於 %s"
 
-#: src/depcon.c:191
+#: src/depcon.c:193
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s 加強了 %s"
 
-#: src/depcon.c:286
+#: src/depcon.c:296
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  即將移除 %.250s。\n"
 
-#: src/depcon.c:289
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  即將清除 %.250s 的設定。\n"
 
-#: src/depcon.c:294
+#: src/depcon.c:304
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  即將安裝 %.250s，不過卻是版本 %.250s。\n"
 
-#: src/depcon.c:304
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  已安裝了 %.250s，不過卻是版本 %.250s。\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:333
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  已解開了 %.250s，但是它還沒有被設定過。\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:337
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  已經解開了 %.250s，不過卻是版本 %.250s。\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:343
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  上次設定 %.250s 時，版本為 %.250s。\n"
 
-#: src/depcon.c:339
+#: src/depcon.c:353
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s 現為 %s。\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:388
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s 提供了 %.250s，但卻將被移除。\n"
 
-#: src/depcon.c:378
+#: src/depcon.c:392
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s 提供了 %.250s，但卻將要清除它的設定。\n"
 
-#: src/depcon.c:384
+#: src/depcon.c:401
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s 提供了 %.250s，但是它現為 %s。\n"
 
-#: src/depcon.c:398
+#: src/depcon.c:415
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s 沒有被安裝。\n"
 
-#: src/depcon.c:426
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  即將安裝 %.250s（版本 %.250s）。\n"
 
-#: src/depcon.c:451
+#: src/depcon.c:468
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s（版本 %.250s）已存在且 %s。\n"
 
-#: src/depcon.c:478
+#: src/depcon.c:495
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s 提供了 %.250s，且將會被安裝。\n"
 
-#: src/depcon.c:520
+#: src/depcon.c:537
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s 提供了 %.250s，它已存在且 %s。\n"
 
-#: src/divertcmd.c:50 src/querycmd.c:656 src/statcmd.c:52
-msgid "Use --help for help about querying packages."
-msgstr ""
+#: src/divertcmd.c:50
+#, fuzzy
+#| msgid "Type dpkg-trigger --help for help about this utility."
+msgid "Use --help for help about diverting files."
+msgstr "輸入 dpkg-trigger --help 以取得這個工具的說明。"
 
 #: src/divertcmd.c:66 src/statcmd.c:57 utils/update-alternatives.c:80
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s 版本 %s。\n"
 
-#: src/divertcmd.c:69
+#: src/divertcmd.c:70
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2137,8 +2176,8 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: src/divertcmd.c:74 src/main.c:63 src/querycmd.c:603 src/statcmd.c:64
-#: src/trigcmd.c:57 dpkg-deb/main.c:57 dpkg-split/main.c:51
+#: src/divertcmd.c:75 src/main.c:63 src/querycmd.c:603 src/statcmd.c:65
+#: src/trigcmd.c:55 dpkg-deb/main.c:57 dpkg-split/main.c:51
 #: utils/update-alternatives.c:89
 #, fuzzy, c-format
 msgid ""
@@ -2149,7 +2188,7 @@
 "這是自由軟體﹔要獲知複製該軟體的前提和條件，請參閱 GNU Public Licence\n"
 "第 2 或更新的版本。本軟體【不】提供任何保証。\n"
 
-#: src/divertcmd.c:86 src/main.c:81 src/querycmd.c:615 src/statcmd.c:76
+#: src/divertcmd.c:87 src/main.c:81 src/querycmd.c:615 src/statcmd.c:77
 #: dpkg-deb/main.c:69 dpkg-split/main.c:63 utils/update-alternatives.c:97
 #, c-format
 msgid ""
@@ -2159,7 +2198,7 @@
 "用法：%s [<選項> ...] <命令>\n"
 "\n"
 
-#: src/divertcmd.c:90
+#: src/divertcmd.c:91
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2171,7 +2210,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:99
+#: src/divertcmd.c:100
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -2211,7 +2250,7 @@
 "在移除時，--package 或 --local 及 --divert 必須相符（若有指定的話）。\n"
 "套件的 preinst/postrm scripts 應當要指定 --package 及 --divert。\n"
 
-#: src/divertcmd.c:113
+#: src/divertcmd.c:114
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2220,19 +2259,13 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:149
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat file '%s'"
-msgstr "無法取得原本名稱 `%s' 的資訊：%s"
-
-#: src/divertcmd.c:167
+#: src/divertcmd.c:168
 #, fuzzy, c-format
 #| msgid "error checking `%s': %s"
 msgid "error checking '%s'"
 msgstr "在檢查 `%s' 時發生錯誤：%s"
 
-#: src/divertcmd.c:202
+#: src/divertcmd.c:203
 #, c-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -2241,144 +2274,144 @@
 "若進行更名，將會以另一個檔案 `%2$s'\n"
 "  蓋過 `%1$s'，因而不可進行"
 
-#: src/divertcmd.c:222
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, fuzzy, c-format
 msgid "unable to create file '%s'"
 msgstr "無法開啟來源檔 `%.250s'"
 
-#: src/divertcmd.c:226
+#: src/divertcmd.c:227
 msgid "file copy"
 msgstr ""
 
-#: src/divertcmd.c:238
+#: src/divertcmd.c:239
 #, fuzzy, c-format
 #| msgid "cannot stat new name `%s': %s"
 msgid "cannot rename '%s' to '%s'"
 msgstr "無法取得新名稱 `%s' 的資訊：%s"
 
-#: src/divertcmd.c:251
+#: src/divertcmd.c:252
 #, fuzzy, c-format
 #| msgid "rename: remove duplicate old link `%s': %s"
 msgid "rename: remove duplicate old link '%s'"
 msgstr "更名：移除重複的舊連結 `%s'：%s"
 
-#: src/divertcmd.c:261
+#: src/divertcmd.c:262
 #, fuzzy, c-format
 #| msgid "unable to open source file `%.250s'"
 msgid "unable to remove copied source file '%s'"
 msgstr "無法開啟來源檔 `%.250s'"
 
-#: src/divertcmd.c:283
+#: src/divertcmd.c:284
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "local diversion of %s"
 msgstr "自行抽換，至：%s\n"
 
-#: src/divertcmd.c:285
+#: src/divertcmd.c:286
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "local diversion of %s to %s"
 msgstr "自行抽換，至：%s\n"
 
-#: src/divertcmd.c:289
+#: src/divertcmd.c:290
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "diversion of %s by %s"
 msgstr "由 %s 所抽換，至：%s\n"
 
-#: src/divertcmd.c:292
+#: src/divertcmd.c:293
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "diversion of %s to %s by %s"
 msgstr "由 %s 所抽換，至：%s\n"
 
-#: src/divertcmd.c:308
+#: src/divertcmd.c:309
 #, fuzzy, c-format
 #| msgid "local diversion to: %s\n"
 msgid "any diversion of %s"
 msgstr "自行抽換，至：%s\n"
 
-#: src/divertcmd.c:310
+#: src/divertcmd.c:311
 #, fuzzy, c-format
 #| msgid "diversion by %s to: %s\n"
 msgid "any diversion of %s to %s"
 msgstr "由 %s 所抽換，至：%s\n"
 
-#: src/divertcmd.c:356
+#: src/divertcmd.c:357
 #, fuzzy, c-format
 #| msgid "cannot open GPL file"
 msgid "cannot create new %s file"
 msgstr "無法開啟 GPL 檔"
 
-#: src/divertcmd.c:374 src/statcmd.c:214
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, fuzzy, c-format
 msgid "unable to flush file '%s'"
 msgstr "無法在 vsnprintf 裡進行刷新"
 
-#: src/divertcmd.c:381
+#: src/divertcmd.c:382
 #, fuzzy
 #| msgid "remove old diversions-old: %s"
 msgid "error removing old diversions-old"
 msgstr "移除原本的 diversions-old：%s"
 
-#: src/divertcmd.c:383
+#: src/divertcmd.c:384
 #, fuzzy
 msgid "error creating new diversions-old"
 msgstr "在建立新的 statoverride-old 時發生錯誤：%s"
 
-#: src/divertcmd.c:385
+#: src/divertcmd.c:386
 #, fuzzy
 msgid "error installing new diversions"
 msgstr "在安裝新的 statoverride 時發生錯誤：%s"
 
-#: src/divertcmd.c:405 src/divertcmd.c:502 src/divertcmd.c:609
-#: src/divertcmd.c:629 src/statcmd.c:289
+#: src/divertcmd.c:406 src/divertcmd.c:503 src/divertcmd.c:610
+#: src/divertcmd.c:630 src/statcmd.c:290
 #, c-format
 msgid "--%s needs a single argument"
 msgstr "--%s 需要一個參數"
 
-#: src/divertcmd.c:408 src/divertcmd.c:429
+#: src/divertcmd.c:409 src/divertcmd.c:430
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr "檔名 \"%s\" 不是唯一的"
 
-#: src/divertcmd.c:410 src/statcmd.c:248
+#: src/divertcmd.c:411 src/statcmd.c:249
 msgid "file may not contain newlines"
 msgstr "檔案不該包含換行符號"
 
-#: src/divertcmd.c:417
+#: src/divertcmd.c:418
 msgid "Cannot divert directories"
 msgstr "無法抽換目錄"
 
-#: src/divertcmd.c:432
+#: src/divertcmd.c:433
 #, fuzzy, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr "無法抽換目錄"
 
-#: src/divertcmd.c:452
+#: src/divertcmd.c:453
 #, fuzzy, c-format
 #| msgid "Leaving `%s'"
 msgid "Leaving '%s'\n"
 msgstr "離開 `%s'"
 
-#: src/divertcmd.c:457
+#: src/divertcmd.c:458
 #, c-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' 和 `%s' 相衝突"
 
-#: src/divertcmd.c:480
+#: src/divertcmd.c:481
 #, fuzzy, c-format
 #| msgid "Adding `%s'"
 msgid "Adding '%s'\n"
 msgstr "增加 `%s'"
 
-#: src/divertcmd.c:509
+#: src/divertcmd.c:510
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
 msgstr "無抽換項目 `%s'，無可刪除"
 
-#: src/divertcmd.c:524
+#: src/divertcmd.c:525
 #, c-format
 msgid ""
 "mismatch on divert-to\n"
@@ -2389,7 +2422,7 @@
 "  在移除 `%s' 時\n"
 "  發現 `%s'"
 
-#: src/divertcmd.c:531
+#: src/divertcmd.c:532
 #, c-format
 msgid ""
 "mismatch on package\n"
@@ -2400,17 +2433,17 @@
 "  在移除 `%s' 時\n"
 "  發現 `%s'"
 
-#: src/divertcmd.c:538
+#: src/divertcmd.c:539
 #, fuzzy, c-format
 #| msgid "Removing `%s'"
 msgid "Removing '%s'\n"
 msgstr "正在刪除 `%s'"
 
-#: src/divertcmd.c:656
+#: src/divertcmd.c:657
 msgid "package may not contain newlines"
 msgstr "<套件> 不該包含換行符號"
 
-#: src/divertcmd.c:665
+#: src/divertcmd.c:666
 msgid "divert-to may not contain newlines"
 msgstr "<抽換名稱> 不該包含換行符號"
 
@@ -2489,8 +2522,8 @@
 "來要求執行觸發程式。\n"
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
-#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:200
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:232
+#: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr "--%s 不需任何參數"
@@ -2579,7 +2612,7 @@
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions 比較關係不適切"
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, fuzzy, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "dpkg：版本 '%s' 的語法不正確：%s\n"
@@ -2635,12 +2668,12 @@
 "dpkg - 警告，由於使用了 --force 選項，忽略問題的存在：\n"
 " "
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr "無法開啟套件 `%.250s' 的檔案列表檔"
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, fuzzy, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
@@ -2649,37 +2682,37 @@
 "dpkg：嚴重警告：無法找到套件 `%.250s' 的檔案列表檔，假定該套件目前沒有任何檔"
 "案被安裝在系統裡。\n"
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, fuzzy, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr "無法開啟套件 `%.250s' 的檔案列表檔"
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, fuzzy, c-format
 #| msgid "files list for package `%.250s'"
 msgid "reading files list for package '%.250s'"
 msgstr "套件 `%.250s' 的檔案列表檔"
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, fuzzy, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "套件 `%.250s' 的檔案列表檔含有空的檔案名稱"
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr "套件 `%.250s' 的檔案列表檔含有空的檔案名稱"
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr "在關閉套件 `%.250s' 的檔案列表檔時發生錯誤"
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr "（正在讀取資料庫 ... "
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, fuzzy, c-format
 #| msgid "%d files and directories currently installed.)\n"
 msgid "%d file or directory currently installed.)\n"
@@ -2687,32 +2720,32 @@
 msgstr[0] "系統目前共安裝了 %d 個檔案和目錄。）\n"
 msgstr[1] "系統目前共安裝了 %d 個檔案和目錄。）\n"
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr "無法為套件 %s 建立更新後的檔案列表檔"
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr "無法寫入更新後的套件 %s 的檔案列表檔"
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr "無法刷新更新後的套件 %s 的檔案列表檔"
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr "無法同步更新後的套件 %s 的檔案列表檔"
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr "無法關閉更新後的套件 %s 的檔案列表檔"
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr "無法安裝更新後的套件 %s 的檔案列表檔"
@@ -2751,7 +2784,7 @@
 
 #: src/help.c:107
 #, fuzzy
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr "dpkg - 錯誤：沒有設定 PATH。\n"
 
 #: src/help.c:129
@@ -2783,7 +2816,7 @@
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
-#: src/help.c:190 src/main.c:746
+#: src/help.c:190 src/main.c:747
 #, fuzzy
 msgid "unable to setenv for subprocesses"
 msgstr "無法在 maint script 上進行 setenv"
@@ -2794,66 +2827,66 @@
 msgstr "無法 chroot 至 `%.250s'"
 
 #: src/help.c:194 dpkg-deb/build.c:455 dpkg-deb/build.c:457
-#: dpkg-deb/build.c:531 dpkg-deb/build.c:554
+#: dpkg-deb/build.c:536 dpkg-deb/build.c:558
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "無法 chdir 到 `%.255s'"
 
-#: src/help.c:253
+#: src/help.c:256
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr "無法設定 `%.250s' 的執行權限"
 
-#: src/help.c:273
+#: src/help.c:276
 #, fuzzy
 msgid "unable to setenv for maintainer script"
 msgstr "無法在 maint script 上進行 setenv"
 
-#: src/help.c:297
+#: src/help.c:300
 #, fuzzy, c-format
 msgid "installed %s script"
 msgstr "原先的 %s script"
 
-#: src/help.c:310 src/help.c:379 src/help.c:438
+#: src/help.c:313 src/help.c:382 src/help.c:441
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr "無法取得 %s `%.250s' 的狀態"
 
-#: src/help.c:365 src/help.c:425
+#: src/help.c:368 src/help.c:428
 #, c-format
 msgid "new %s script"
 msgstr "新的 %s script"
 
-#: src/help.c:399
+#: src/help.c:402
 #, c-format
 msgid "old %s script"
 msgstr "原先的 %s script"
 
-#: src/help.c:413
+#: src/help.c:416
 #, fuzzy, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr "無法取得 %s `%.250s' 的狀態"
 
-#: src/help.c:422
+#: src/help.c:425
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr "dpkg - 試著替而使用新套件所附帶的 script ...\n"
 
-#: src/help.c:436
+#: src/help.c:439
 msgid "there is no script in the new version of the package - giving up"
 msgstr "新版本的套件裡並沒有 script - 取消操作"
 
-#: src/help.c:442
+#: src/help.c:445
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr "dpkg：... 看起來它能正確執行。\n"
 
-#: src/help.c:579
+#: src/help.c:616
 #, fuzzy, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr "無法建立 `%.255s'"
 
-#: src/help.c:584 dpkg-deb/info.c:65 dpkg-deb/info.c:67
+#: src/help.c:621 dpkg-deb/info.c:65 dpkg-deb/info.c:67
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2862,7 +2895,7 @@
 msgid "unable to check existence of `%.250s'"
 msgstr "無法判斷 `%.250s' 是否存在"
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr "無法讀取 info 目錄"
 
@@ -2928,7 +2961,7 @@
 "  -Dh|--debug=help                 顯示偵錯模式的說明。\n"
 "\n"
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:79 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, fuzzy, c-format
 msgid ""
@@ -3077,7 +3110,7 @@
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr "使用 `dselect' 或 `aptitude' 等介面親和的套件管理程式。\n"
 
-#: src/main.c:171
+#: src/main.c:170
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -3127,30 +3160,34 @@
 msgstr ""
 
 #: src/main.c:233
-msgid "Overwrite a file from one package with another"
+msgid "Process even packages with wrong versions"
 msgstr ""
 
 #: src/main.c:235
-msgid "Overwrite a diverted file with an undiverted version"
+msgid "Overwrite a file from one package with another"
 msgstr ""
 
 #: src/main.c:237
-msgid "Overwrite one package's directory with another's file"
+msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
 #: src/main.c:239
-msgid "Do not perform safe I/O operations when unpacking"
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
 #: src/main.c:241
-msgid "Always use the new config files, don't prompt"
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
 #: src/main.c:243
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/main.c:245
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 msgid ""
 "Use the default option for new config files if one\n"
 "                         is available, don't prompt. If no default can be "
@@ -3159,102 +3196,102 @@
 "                         confnew options is also given"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:255
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:255
+#: src/main.c:257
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:257
+#: src/main.c:259
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c:261
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c:263
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn all dependency problems into warnings"
 msgstr "相依問題 - 不進行移除"
 
-#: src/main.c:263
+#: src/main.c:265
 #, fuzzy
 #| msgid "dependency problems - not removing"
 msgid "Turn dependency version problems into warnings"
 msgstr "相依問題 - 不進行移除"
 
-#: src/main.c:265
+#: src/main.c:267
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:269
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:279
+#: src/main.c:281
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:280
+#: src/main.c:282
 #, fuzzy
 msgid "Invocation and status of maintainer scripts"
 msgstr "無法在 maint script 上進行 setenv"
 
-#: src/main.c:281
+#: src/main.c:283
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:282
+#: src/main.c:284
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:283
+#: src/main.c:285
 #, fuzzy
 #| msgid "read error in configuration file `%.255s'"
 msgid "Output for each configuration file"
 msgstr "設定檔 `%.255s' 讀取錯誤"
 
-#: src/main.c:284
+#: src/main.c:286
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:287
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:286
+#: src/main.c:288
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c:289
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c:291
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c:292
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c:293
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:304
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3262,7 +3299,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:309
+#: src/main.c:311
 #, c-format
 msgid ""
 "\n"
@@ -3270,35 +3307,35 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:319
 msgid "--debug requires an octal argument"
 msgstr "--debug 需要一個八進制的參數"
 
-#: src/main.c:346
+#: src/main.c:348
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "在 --ignore-depends 的逗號分隔列表 `%s' 中有的套件名稱是空的"
 
-#: src/main.c:352
+#: src/main.c:354
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends 需要一個有效的套件名稱。而 `%.250s' 卻不是﹔%s"
 
-#: src/main.c:369 src/main.c:379 src/main.c:649 dpkg-split/main.c:119
+#: src/main.c:371 src/main.c:381 src/main.c:649 dpkg-split/main.c:124
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s 所指定的數字無效：`%.250s'"
 
-#: src/main.c:436
+#: src/main.c:438
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:463
+#: src/main.c:465
 msgid "status logger"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:480
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3307,7 +3344,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:490
 #, c-format
 msgid ""
 "\n"
@@ -3315,12 +3352,12 @@
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:504
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "未知的 force/refuse 選項 `%.*s'"
 
-#: src/main.c:511
+#: src/main.c:513
 #, fuzzy, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "警告：已廢棄的 force/refuse 選項 `%s' \n"
@@ -3343,8 +3380,8 @@
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行結束之前有預期之外的 eof"
 
-#: src/main.c:719 src/main.c:740 src/querycmd.c:691 src/statcmd.c:377
-#: dpkg-deb/main.c:195 dpkg-split/main.c:159
+#: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "欠缺操作選項"
 
@@ -3506,86 +3543,86 @@
 msgid "passed\n"
 msgstr "通過\n"
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+#, fuzzy
+msgid "unable to create temporary directory"
+msgstr "無法為臨時目錄命名"
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "套件 %s 有太多的 衝突/替換 組合"
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr "原先版本的套件中包含了名稱過長的 info 檔，其開頭為 `%.250s'"
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "無法移除廢棄的 info 檔 `%.250s'"
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "無法安裝（被認定為）新的 info 檔 `%.250s'"
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr "無法開啟暫存的 control 目錄"
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr "套件的 control 資訊中包含了名稱過長的檔案（其開頭為 `%.250s'）"
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "套件的 control 資訊中包含了目錄 `%.250s'"
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "套件 control 資訊 rmdir 了 `%.250s' 但沒有說這不是一個目錄"
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, fuzzy, c-format
 msgid "package %s contained list as info file"
 msgstr "dpkg：警告 - 套件 %s 裡的列表被當作 info 檔使用"
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "無法把新的 info 檔 `%.250s' 安裝為 `%.250s'"
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "無法刪除 control 資訊檔 `%.250s'"
 
-#: src/processarc.c:360
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr "無法存取套件檔"
 
-#: src/processarc.c:377 dpkg-deb/info.c:81
-#, fuzzy
-msgid "unable to create temporary directory"
-msgstr "無法為臨時目錄命名"
-
-#: src/processarc.c:411
+#: src/processarc.c:433
 #, fuzzy
 #| msgid "control information length"
 msgid "package control information extraction"
 msgstr "control 資訊長度"
 
-#: src/processarc.c:438
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr "從 %2$s 獲得關於 %1$s 的 info 記錄。\n"
 
-#: src/processarc.c:446
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "套件的系統平台 (%s) 與本機系統 (%s) 不符"
 
-#: src/processarc.c:497
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -3594,98 +3631,98 @@
 "dpkg：由於 %s 包含了 %s，預先相依問題：\n"
 "%s"
 
-#: src/processarc.c:500
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "預先相依問題 - 將不安裝 %.250s"
 
-#: src/processarc.c:501
+#: src/processarc.c:527
 #, fuzzy
 msgid "ignoring pre-dependency problem!"
 msgstr "dpkg：警告 - 忽視了預先相依問題！\n"
 
-#: src/processarc.c:516
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "正準備替換 %s %s（使用 %s）...\n"
 
-#: src/processarc.c:522
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "正在解開 %s （從 %s）...\n"
 
-#: src/processarc.c:553
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "conffile 的檔案名（開頭是 `%.250s'）過長（> %d 個字元）"
 
-#: src/processarc.c:606
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr "在 %.250s 中發生讀取錯誤"
 
-#: src/processarc.c:608
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr "在關閉 %.250s 時發生錯誤"
 
-#: src/processarc.c:610
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "在試圖開啟 %.250s 時發生錯誤"
 
-#: src/processarc.c:645
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr "正在清除 %s 的設定，為了能移除 %s ...\n"
 
-#: src/processarc.c:648
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr "正在刪除 %s 的設定...\n"
 
-#: src/processarc.c:722
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "正在解開替換的套件檔 %.250s ...\n"
 
-#: src/processarc.c:807
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:821
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr "在讀取 dpkg-deb 輸出的 tar 檔時發生錯誤"
 
-#: src/processarc.c:823
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "檔案系統上的 tar 檔已損壞 - 套件檔已毀損"
 
-#: src/processarc.c:826
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb：截掉了可能會出現在結尾的字元 0"
 
-#: src/processarc.c:885
+#: src/processarc.c:919
 #, fuzzy, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr "dpkg：警告 - 無法取得原有的檔案 `%.250s' 的資訊，所以不會刪除：%s"
 
-#: src/processarc.c:891
+#: src/processarc.c:925
 #, fuzzy, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr "dpkg：警告 - 無法刪除原有的目錄 `%.250s'：%s\n"
 
-#: src/processarc.c:894
+#: src/processarc.c:928
 #, fuzzy, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr "dpkg：警告 - 原本的 conffile `%.250s' 是空目錄（現已刪除）\n"
 
-#: src/processarc.c:941
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "無法取得其它新檔案 `%.250s' 的資訊"
 
-#: src/processarc.c:952
+#: src/processarc.c:986
 #, fuzzy, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
@@ -3693,12 +3730,12 @@
 msgstr ""
 "dpkg：警告 - 舊檔案 `%.250s' 與數個新檔案相同！（`%.250s' 以及 `%.250s'）\n"
 
-#: src/processarc.c:991
+#: src/processarc.c:1025
 #, fuzzy, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr "dpkg：警告 - 無法 %s 原有的檔案 `%%.250s'：%%s\n"
 
-#: src/processarc.c:1172
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "（注意到 %s 已經不復存在，它已被完全取代了。）\n"
@@ -3863,7 +3900,7 @@
 "  -f|--showformat=<格式>           替 --show 指定其它的輸出格式。\n"
 "\n"
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3883,6 +3920,10 @@
 "  的各個欄位。各個欄位會是向右對齊，除非寬度是負的－那在此情況下會採用向左\n"
 "  對齊。\n"
 
+#: src/querycmd.c:656
+msgid "Use --help for help about querying packages."
+msgstr ""
+
 #: src/remove.c:88
 #, fuzzy, c-format
 msgid "ignoring request to remove %.250s which isn't installed."
@@ -3939,7 +3980,7 @@
 msgid "Removing %s ...\n"
 msgstr "正在移除 %s ...\n"
 
-#: src/remove.c:270 src/remove.c:350
+#: src/remove.c:275 src/remove.c:366
 #, fuzzy, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
@@ -3948,47 +3989,48 @@
 "dpkg - 警告：在移除 %.250s 時，無法刪除目錄 `%.250s'：%s - 該目錄會不會是一個"
 "掛載點呢？\n"
 
-#: src/remove.c:281 src/remove.c:361
-#, c-format
-msgid "cannot remove `%.250s'"
-msgstr "無法移除 `%.250s'"
-
-#: src/remove.c:284
+#: src/remove.c:289
 #, fuzzy, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr "無法建立 `%.255s'"
 
-#: src/remove.c:345
+#: src/remove.c:361
 #, fuzzy, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed."
 msgstr ""
 "dpkg - 警告：在移除 %.250s 時，目錄 `%.250s' 不是空的，所以不會將其刪除。\n"
 
-#: src/remove.c:384
+#: src/remove.c:383
+#, fuzzy, c-format
+#| msgid "cannot remove `%.250s'"
+msgid "cannot remove '%.250s'"
+msgstr "無法移除 `%.250s'"
+
+#: src/remove.c:409
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "正在清除 %s 的設定檔 ...\n"
 
-#: src/remove.c:434
+#: src/remove.c:459
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "無法刪除原有的設定檔 `%.250s' (= `%.250s' )"
 
-#: src/remove.c:449
+#: src/remove.c:474
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "無法讀取設定檔目錄 `%.250s'（從 `%.250s'）"
 
-#: src/remove.c:485
+#: src/remove.c:510
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr "無法刪除原有的設定檔備份 `%.250s'（`%.250s' 的）"
 
-#: src/remove.c:540
+#: src/remove.c:568
 msgid "cannot remove old files list"
 msgstr "無法刪除原有的檔案列表"
 
-#: src/remove.c:546
+#: src/remove.c:574
 msgid "can't remove old postrm script"
 msgstr "無法刪除原有的 postrm script"
 
@@ -4031,7 +4073,11 @@
 msgid "read error on standard input"
 msgstr "從標準輸入讀取資料時發生錯誤"
 
-#: src/statcmd.c:60
+#: src/statcmd.c:52
+msgid "Use --help for help about overriding file stat information."
+msgstr ""
+
+#: src/statcmd.c:61
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -4041,7 +4087,7 @@
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: src/statcmd.c:80
+#: src/statcmd.c:81
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4052,7 +4098,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:88
+#: src/statcmd.c:89
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
@@ -4080,56 +4126,56 @@
 "  --help                   顯示這個說明訊息。\n"
 "  --version                顯示版本資訊。\n"
 
-#: src/statcmd.c:115
+#: src/statcmd.c:116
 msgid "stripping trailing /"
 msgstr "除去結尾的 /"
 
-#: src/statcmd.c:206
+#: src/statcmd.c:207
 #, fuzzy
 msgid "cannot open new statoverride file"
 msgstr "無法開啟新的 statoverride 檔：%s"
 
-#: src/statcmd.c:221
+#: src/statcmd.c:222
 #, fuzzy
 msgid "error removing statoverride-old"
 msgstr "在移除 statoverride-old 時發生錯誤：%s"
 
-#: src/statcmd.c:223
+#: src/statcmd.c:224
 #, fuzzy
 msgid "error creating new statoverride-old"
 msgstr "在建立新的 statoverride-old 時發生錯誤：%s"
 
-#: src/statcmd.c:225
+#: src/statcmd.c:226
 #, fuzzy
 msgid "error installing new statoverride"
 msgstr "在安裝新的 statoverride 時發生錯誤：%s"
 
-#: src/statcmd.c:245
+#: src/statcmd.c:246
 msgid "--add needs four arguments"
 msgstr "--add 需要四個參數"
 
-#: src/statcmd.c:255
+#: src/statcmd.c:256
 #, fuzzy, c-format
 msgid ""
 "An override for '%s' already exists, but --force specified so will be "
 "ignored."
 msgstr "但又設定了 --force，所以該選項會被忽略。"
 
-#: src/statcmd.c:259
+#: src/statcmd.c:260
 #, fuzzy, c-format
 msgid "An override for '%s' already exists, aborting."
 msgstr "已設定了 \"%s\" 的強制選項，"
 
-#: src/statcmd.c:271
+#: src/statcmd.c:272
 #, fuzzy, c-format
 msgid "--update given but %s does not exist"
 msgstr "警告：己設定為 --update 但 %s 不存在"
 
-#: src/statcmd.c:295
+#: src/statcmd.c:296
 msgid "No override present."
 msgstr "沒有設定強制選項。"
 
-#: src/statcmd.c:303
+#: src/statcmd.c:304
 #, fuzzy
 msgid "--update is useless for --remove"
 msgstr "警告：在 --remove 時，--update 是無效的"
@@ -4201,16 +4247,16 @@
 msgid "multiple statusoverrides present for file '%.250s'"
 msgstr "statoverride 檔 `%.250s'"
 
-#: src/trigcmd.c:48
+#: src/trigcmd.c:46
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "輸入 dpkg-trigger --help 以取得這個工具的說明。"
 
-#: src/trigcmd.c:53
+#: src/trigcmd.c:51
 #, fuzzy, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr "Debian %s 套件觸發程式工具。\n"
 
-#: src/trigcmd.c:69
+#: src/trigcmd.c:67
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -4221,7 +4267,7 @@
 "      %s [<選項> ...] <命令>\n"
 "\n"
 
-#: src/trigcmd.c:74
+#: src/trigcmd.c:72
 #, c-format
 msgid ""
 "Commands:\n"
@@ -4233,7 +4279,7 @@
 "  --check-supported                檢查正在運作中的 dpkg 是否支援觸發程式。\n"
 "\n"
 
-#: src/trigcmd.c:84
+#: src/trigcmd.c:82
 #, c-format
 msgid ""
 "Options:\n"
@@ -4254,22 +4300,22 @@
 "  --no-act                         僅測試 - 不要真的修改任何東西。\n"
 "\n"
 
-#: src/trigcmd.c:154
+#: src/trigcmd.c:152
 #, c-format
 msgid "%s: triggers data directory not yet created\n"
 msgstr "%s：觸發程式的資料目錄尚未建立\n"
 
-#: src/trigcmd.c:158
+#: src/trigcmd.c:156
 #, c-format
 msgid "%s: trigger records not yet in existence\n"
 msgstr "%s：觸發程式的記錄並未存在\n"
 
-#: src/trigcmd.c:206
+#: src/trigcmd.c:205
 #, fuzzy
 msgid "takes one argument, the trigger name"
 msgstr "dpkg-trigger 只需一個參數，觸發程式的名稱"
 
-#: src/trigcmd.c:211
+#: src/trigcmd.c:210
 #, fuzzy
 #| msgid ""
 #| "dpkg-trigger must be called from a maintainer script (or with a --by-"
@@ -4278,13 +4324,13 @@
 msgstr ""
 "dpkg-trigger 必須由某個維護者的 Script（或搭配 --by-package 選項）所呼叫"
 
-#: src/trigcmd.c:216
+#: src/trigcmd.c:215
 #, fuzzy, c-format
 #| msgid "dpkg-trigger: illegal awaited package name `%.250s': %.250s"
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr "dpkg-trigger：不合法的等待套件名稱 `%.250s'：%.250s"
 
-#: src/trigcmd.c:222
+#: src/trigcmd.c:221
 #, fuzzy, c-format
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "dpkg-trigger：不正確的觸發程式名稱 `%.250s'：%.250s"
@@ -4317,29 +4363,30 @@
 msgstr "正在進行 %s 的觸發程式 ...\n"
 
 #: src/update.c:52
-#, c-format
-msgid "--%s needs exactly one Packages file argument"
+#, fuzzy, c-format
+#| msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr "--%s 需要一個套件名稱作為參數"
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr "無法存取 dpkg 的狀態庫，以進行大量可用套件的更新"
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr "要進行大量可用套件的更新，需有在 dpkg 狀態庫上的寫入權限"
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr "正在取代可用套件資訊，使用 %s。\n"
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr "正在更新可用套件的資訊，使用 %s。\n"
 
-#: src/update.c:100
+#: src/update.c:101
 #, fuzzy, c-format
 #| msgid "Information about %d package(s) was updated.\n"
 msgid "Information about %d package was updated.\n"
@@ -4347,7 +4394,7 @@
 msgstr[0] "共更新了 %d 個套件的相關資訊。\n"
 msgstr[1] "共更新了 %d 個套件的相關資訊。\n"
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4459,8 +4506,8 @@
 msgstr[0] "dpkg-deb：忽略了 %d 個有關 control 資訊檔的警告\n"
 msgstr[1] "dpkg-deb：忽略了 %d 個有關 control 資訊檔的警告\n"
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2149
-#: utils/update-alternatives.c:2156
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s 需有 <目錄名> 參數"
@@ -4492,26 +4539,26 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb：正把套件 `%s' 編譯為 `%s'。\n"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:516
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:521
 #, fuzzy, c-format
 #| msgid "failed to make tmpfile (data)"
 msgid "failed to make temporary file (%s)"
 msgstr "無法建立臨時檔 (data)"
 
-#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:478
+#: dpkg-deb/build.c:467 dpkg-deb/build.c:470 dpkg-deb/build.c:477
 #: dpkg-deb/build.c:485 dpkg-deb/build.c:494 dpkg-deb/build.c:499
 #, fuzzy
 #| msgid "control area"
 msgid "control member"
 msgstr "control 區域"
 
-#: dpkg-deb/build.c:470 dpkg-deb/build.c:519
+#: dpkg-deb/build.c:470 dpkg-deb/build.c:524
 #, fuzzy, c-format
 #| msgid "failed to unlink tmpfile (data), %s"
 msgid "failed to unlink temporary file (%s), %s"
 msgstr "無法刪除臨時檔 (data)，%s"
 
-#: dpkg-deb/build.c:485 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:485 dpkg-deb/build.c:593
 #, fuzzy, c-format
 #| msgid "failed to rewind tmpfile (data)"
 msgid "failed to rewind temporary file (%s)"
@@ -4527,20 +4574,20 @@
 msgid "error writing `%s'"
 msgstr "`%s' 寫入錯誤"
 
-#: dpkg-deb/build.c:516 dpkg-deb/build.c:519 dpkg-deb/build.c:543
-#: dpkg-deb/build.c:568 dpkg-deb/build.c:576 dpkg-deb/build.c:589
+#: dpkg-deb/build.c:521 dpkg-deb/build.c:524 dpkg-deb/build.c:546
+#: dpkg-deb/build.c:572 dpkg-deb/build.c:580 dpkg-deb/build.c:593
 #, fuzzy
 #| msgid "between members"
 msgid "data member"
 msgstr "成員之間"
 
-#: dpkg-deb/build.c:567 dpkg-deb/build.c:576
+#: dpkg-deb/build.c:571 dpkg-deb/build.c:580
 #, fuzzy, c-format
 #| msgid "failed to write filename to tar pipe (data)"
 msgid "failed to write filename to tar pipe (%s)"
 msgstr "無法寫入檔案名稱到 tar 的管線 (data)"
 
-#: dpkg-deb/build.c:580
+#: dpkg-deb/build.c:584
 msgid "<compress> from tar -cf"
 msgstr ""
 
@@ -4558,76 +4605,76 @@
 msgid "error reading %s from file %.255s"
 msgstr "無法從檔案 %2$.255s 讀取 %1$s"
 
-#: dpkg-deb/extract.c:124
+#: dpkg-deb/extract.c:125
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "無法讀取套件檔 `%.255s'"
 
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:127
 msgid "failed to fstat archive"
 msgstr "無法 fstat 套件檔"
 
-#: dpkg-deb/extract.c:130
+#: dpkg-deb/extract.c:131
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive magic version number"
 msgstr "套件檔的版本編號中沒有點號"
 
-#: dpkg-deb/extract.c:142
+#: dpkg-deb/extract.c:143
 #, fuzzy
 #| msgid "archive has no newlines in header"
 msgid "archive member header"
 msgstr "套件檔的檔案標頭中沒有換行符號"
 
-#: dpkg-deb/extract.c:147
+#: dpkg-deb/extract.c:148
 #, fuzzy, c-format
 #| msgid "file `%.250s' is corrupt - bad part number"
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "檔案 `%.250s' 已經損毀 - 分割號碼不符"
 
-#: dpkg-deb/extract.c:154
+#: dpkg-deb/extract.c:155
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "檔案 `%.250s' 不是 debian 的二進制套件檔（試試 dpkg-split？）"
 
-#: dpkg-deb/extract.c:158
+#: dpkg-deb/extract.c:159
 #, fuzzy
 #| msgid "archive has no dot in version number"
 msgid "archive information header member"
 msgstr "套件檔的版本編號中沒有點號"
 
-#: dpkg-deb/extract.c:161
+#: dpkg-deb/extract.c:162
 msgid "archive has no newlines in header"
 msgstr "套件檔的檔案標頭中沒有換行符號"
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:165
 msgid "archive has no dot in version number"
 msgstr "套件檔的版本編號中沒有點號"
 
-#: dpkg-deb/extract.c:167
+#: dpkg-deb/extract.c:168
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "無法識別套件檔的版本 %.250s，請升級 dpkg-deb"
 
-#: dpkg-deb/extract.c:178 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:205
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive member data from %s"
 msgstr "忽略了 %s 中的成員資料"
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:194
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgid "archive '%.250s' contains not understood data member %.*s, giving up"
 msgstr "檔案 `%.250s' 含有未知的成員資料 %.*s，取消操作"
 
-#: dpkg-deb/extract.c:198
+#: dpkg-deb/extract.c:199
 #, fuzzy, c-format
 #| msgid "file `%.250s' contains two control members, giving up"
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr "檔案 `%.250s' 含有兩個 control 成員，取消操作"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:214
 #, fuzzy, c-format
 #| msgid ""
 #| " new debian package, version %s.\n"
@@ -4639,23 +4686,23 @@
 " 新式 debian 套件，版本 %s。\n"
 " 大小為 %ld bytes：control 套件檔=%zi bytes。\n"
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:232
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:234
+#: dpkg-deb/extract.c:235
 #, fuzzy, c-format
 #| msgid "archive has malformatted control length `%s'"
 msgid "archive has malformatted control member size '%s'"
 msgstr "套件檔中的 control 資訊長度 `%s' 不合規格"
 
-#: dpkg-deb/extract.c:241
+#: dpkg-deb/extract.c:242
 #, fuzzy, c-format
 #| msgid "skipped member data from %s"
 msgid "skipped archive control member data from %s"
 msgstr "忽略了 %s 中的成員資料"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:246
 #, fuzzy, c-format
 #| msgid ""
 #| " old debian package, version %s.\n"
@@ -4667,7 +4714,7 @@
 " 舊式 debian 套件，版本 %s。\n"
 " 大小為 %ld bytes：control 套件檔= %zi bytes，主要套件檔= %ld。\n"
 
-#: dpkg-deb/extract.c:254
+#: dpkg-deb/extract.c:255
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -4676,51 +4723,52 @@
 "dpkg-deb：這個檔案看起來應該是個套件檔，但可能因為在下載時使用了\n"
 "dpkg-deb：   ASCII 模式而損壞了\n"
 
-#: dpkg-deb/extract.c:258
+#: dpkg-deb/extract.c:259
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' 並非 debian 格式的套件檔"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to write to pipe in copy"
 msgstr "在複製時無法寫入管線"
 
-#: dpkg-deb/extract.c:267
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "在複製時無法關閉管線"
 
-#: dpkg-deb/extract.c:279
+#: dpkg-deb/extract.c:284
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:307
+msgid "failed to chdir to directory"
+msgstr "無法 chdir 到目錄"
+
+#: dpkg-deb/extract.c:310
 msgid "failed to create directory"
 msgstr "無法建立目錄"
 
-#: dpkg-deb/extract.c:291
+#: dpkg-deb/extract.c:312
 msgid "failed to chdir to directory after creating it"
 msgstr "在建立目錄後，無法 chdir 到該目錄"
 
-#: dpkg-deb/extract.c:293
-msgid "failed to chdir to directory"
-msgstr "無法 chdir 到目錄"
-
-#: dpkg-deb/extract.c:318
+#: dpkg-deb/extract.c:323
 #, fuzzy
 msgid "<decompress>"
 msgstr "%s：解壓縮"
 
-#: dpkg-deb/extract.c:320
+#: dpkg-deb/extract.c:325
 #, fuzzy
 msgid "paste"
 msgstr "通過\n"
 
-#: dpkg-deb/extract.c:337 dpkg-deb/extract.c:358 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s 需要一個 .deb 檔案名稱作為參數"
 
-#: dpkg-deb/extract.c:342
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4729,37 +4777,37 @@
 "--%s 需要一個目的地目錄。\n"
 "或許您應該使用 dpkg --install？"
 
-#: dpkg-deb/extract.c:345
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s 至多可有兩個參數（.deb 和目錄）"
 
-#: dpkg-deb/extract.c:360
+#: dpkg-deb/extract.c:365
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s 只需一個參數（.deb 檔案名稱）"
 
-#: dpkg-deb/info.c:58
+#: dpkg-deb/info.c:63
 msgid "failed to chdir to `/' for cleanup"
 msgstr "無法 chdir 到 `/' 以進行清理"
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:106
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
 msgid "control file '%s'"
 msgstr "無法取得原本名稱 `%s' 的資訊：%s"
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr "dpkg-deb：`%.255s' 中沒有控制元件 `%.255s'\n"
 
-#: dpkg-deb/info.c:117
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr "在開啟元件 `%.255s'（位於 %.255s）時以意想不到的方式失敗了"
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:121
 #, fuzzy, c-format
 #| msgid "One requested control component is missing"
 msgid "%d requested control component is missing"
@@ -4767,59 +4815,59 @@
 msgstr[0] "找不到某個必要的控制元件"
 msgstr[1] "找不到某個必要的控制元件"
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr "無法掃瞄目錄 `%.255s'"
 
-#: dpkg-deb/info.c:146
+#: dpkg-deb/info.c:148
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr "無法取得 `%.255s' 的狀態（位於 `%.255s'）"
 
-#: dpkg-deb/info.c:149
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr "無法開啟 `%.255s'（位於 `%.255s'）"
 
-#: dpkg-deb/info.c:164 dpkg-deb/info.c:179 dpkg-deb/info.c:193
+#: dpkg-deb/info.c:167 dpkg-deb/info.c:185 dpkg-deb/info.c:199
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr "無法讀取 `%.255s'（位於 `%.255s'）"
 
-#: dpkg-deb/info.c:167
+#: dpkg-deb/info.c:170
 #, fuzzy, c-format
 #| msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr " %7ld bytes，%5d 行      %c  %-20.127s %.127s\n"
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:174
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr "     並非一般檔案              %.255s\n"
 
-#: dpkg-deb/info.c:180
+#: dpkg-deb/info.c:186
 msgid "(no `control' file in control archive!)\n"
 msgstr "（在 control 套件檔中沒有 `control' 檔！)\n"
 
-#: dpkg-deb/info.c:211
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr "無法開啟 `control' 元件"
 
-#: dpkg-deb/info.c:250
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr "在讀取 `control' 元件時失敗"
 
-#: dpkg-deb/info.c:252
+#: dpkg-deb/info.c:263
 #, fuzzy, c-format
 msgid "error closing the '%s' component"
 msgstr "在關閉 find 的管線時發生錯誤"
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:278
 msgid "Error in format"
 msgstr "格式錯誤"
 
-#: dpkg-deb/info.c:313
+#: dpkg-deb/info.c:328
 msgid "--contents takes exactly one argument"
 msgstr "--contents 只需要一個參數"
 
@@ -4829,7 +4877,19 @@
 msgstr "Debian `%s' 套件檔的後端，版本 %s。\n"
 
 #: dpkg-deb/main.c:73
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
+#| "  -c|--contents <deb>              List contents.\n"
+#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
+#| "  -W|--show <deb>                  Show information on package(s)\n"
+#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
+#| "  -e|--control <deb> [<directory>] Extract control info.\n"
+#| "  -x|--extract <deb> <directory>   Extract files.\n"
+#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -4840,6 +4900,8 @@
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
@@ -4855,7 +4917,7 @@
 "  --fsys-tarfile <deb>             輸出檔案系統的 tar 檔。\n"
 "\n"
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4868,11 +4930,12 @@
 "<cfield> 是主要 `control' 檔中的一個欄位的名稱。\n"
 "\n"
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4895,7 +4958,7 @@
 "                                   可使用的選項：gzip、bzip2、lzma、none。\n"
 "\n"
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4908,7 +4971,7 @@
 "等較人性化的套件管理程式。用 `dpkg-deb --extract' 來解開套件並不是正確\n"
 "的安裝方式！\n"
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -4916,17 +4979,17 @@
 "輸入 dpkg-deb --help 以取得如何操作 *.deb 檔的說明﹔\n"
 "輸入 dpkg --help 以取得如何安裝和移除套件的說明。"
 
-#: dpkg-deb/main.c:145
+#: dpkg-deb/main.c:148
 #, fuzzy, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr "--%s 所指定的數字無效：`%.250s'"
 
-#: dpkg-deb/main.c:148
+#: dpkg-deb/main.c:151
 #, fuzzy, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr "--%s 所指定的數字無效：`%.250s'"
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "未知的壓縮類型 `%s'！"
@@ -4946,7 +5009,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr "檔案 `%.250s' 已損毀 - 在 %.250s 後沒有換行符號"
 
-#: dpkg-split/info.c:89 dpkg-split/main.c:109
+#: dpkg-split/info.c:89 dpkg-split/main.c:114
 #, c-format
 msgid "error reading %.250s"
 msgstr "在讀取 %.250s 時發生錯誤"
@@ -5033,47 +5096,51 @@
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr "檔案 `%.250s' 已經損毀 - 分割號碼不符"
 
-#: dpkg-split/info.c:159
+#: dpkg-split/info.c:157
+msgid "package architecture"
+msgstr ""
+
+#: dpkg-split/info.c:166
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr "檔案 `%.250s' 已經損毀 - 在第二個標頭檔末尾的識別碼不正確"
 
-#: dpkg-split/info.c:161
+#: dpkg-split/info.c:168
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr "檔案 `%.250s' 已經損毀 - 第二個成員不是資料成員"
 
-#: dpkg-split/info.c:167
+#: dpkg-split/info.c:174
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr "檔案 `%.250s' 已經損毀 - 分割號碼和所宣稱的大小不相符"
 
-#: dpkg-split/info.c:171
+#: dpkg-split/info.c:178
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
 msgstr "檔案 `%.250s' 已經損毀 - 大小和所宣稱的分割號碼不相符"
 
-#: dpkg-split/info.c:177
+#: dpkg-split/info.c:184
 #, c-format
 msgid "unable to fstat part file `%.250s'"
 msgstr "無法 fstat 分割檔 `%.250s'"
 
-#: dpkg-split/info.c:182
+#: dpkg-split/info.c:189
 #, c-format
 msgid "file `%.250s' is corrupt - too short"
 msgstr "檔案 `%.250s' 已經損毀 - 檔案過小"
 
-#: dpkg-split/info.c:195 dpkg-split/info.c:240
+#: dpkg-split/info.c:202 dpkg-split/info.c:249
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "無法開啟套件檔的分割檔 `%.250s'"
 
-#: dpkg-split/info.c:197
+#: dpkg-split/info.c:204
 #, c-format
 msgid "file `%.250s' is not an archive part"
 msgstr "檔案 `%.250s' 並非某個套件檔的分割檔"
 
-#: dpkg-split/info.c:202
+#: dpkg-split/info.c:209
 #, fuzzy, c-format
 #| msgid ""
 #| "%s:\n"
@@ -5093,6 +5160,7 @@
 "    Part format version:            %s\n"
 "    Part of package:                %s\n"
 "        ... version:                %s\n"
+"        ... architecture:           %s\n"
 "        ... MD5 checksum:           %s\n"
 "        ... length:                 %jd bytes\n"
 "        ... split every:            %jd bytes\n"
@@ -5115,12 +5183,19 @@
 "    分割檔（會用到的部分）的大小：  %lu bytes\n"
 "\n"
 
-#: dpkg-split/info.c:235 dpkg-split/join.c:105
+#: dpkg-split/info.c:225
+#, fuzzy
+#| msgid "<unknown>"
+msgctxt "architecture"
+msgid "<unknown>"
+msgstr "<未知>"
+
+#: dpkg-split/info.c:244 dpkg-split/join.c:105
 #, fuzzy, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr "--info 需要一個或多個分割檔的檔案名稱作為參數"
 
-#: dpkg-split/info.c:246
+#: dpkg-split/info.c:255
 #, c-format
 msgid "file `%s' is not an archive part\n"
 msgstr "檔案 `%s' 並不是套件檔的分割檔\n"
@@ -5154,7 +5229,7 @@
 msgid "split package part"
 msgstr "找不到套件"
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:235
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr "完成\n"
@@ -5206,17 +5281,26 @@
 "\n"
 
 #: dpkg-split/main.c:82
-#, c-format
+#, fuzzy, c-format
+#| 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"
+#| "  -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"
 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>               Filename, for -j (default is\n"
+"                                     <package>_<version>_<arch>.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"
 "  --depotdir <目錄>                使用 <目錄> 來取代 %s/%s。\n"
@@ -5227,20 +5311,29 @@
 "\n"
 "離開狀態：0 = OK； 1 = 未指定 -a；2 = 發生錯誤！\n"
 
-#: dpkg-split/main.c:98
+#: dpkg-split/main.c:92
+#, c-format
+msgid ""
+"Exit status:\n"
+"  0 = ok\n"
+"  1 = with --auto, file is not a part\n"
+"  2 = trouble\n"
+msgstr ""
+
+#: dpkg-split/main.c:103
 msgid "Type dpkg-split --help for help."
 msgstr "輸入 dpkg-split --help 以取得說明。"
 
-#: dpkg-split/main.c:110
+#: dpkg-split/main.c:115
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "在 %.250s 中有預期之外的檔案結束符號"
 
-#: dpkg-split/main.c:121
+#: dpkg-split/main.c:126
 msgid "part size is far too large or is not positive"
 msgstr "分割檔的大小已遠遠過長或非正數"
 
-#: dpkg-split/main.c:125
+#: dpkg-split/main.c:130
 #, fuzzy, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr "分割檔的大小至少必須大於 %dk（為了容下標頭資訊）"
@@ -5351,42 +5444,42 @@
 msgid "Deleted %s.\n"
 msgstr "已刪除 %s。\n"
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr "無法開啟來源檔 `%.250s'"
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr "無法 fstat 來源檔"
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr "來源檔 `%.250s' 並非一般檔案"
 
-#: dpkg-split/split.c:151
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:192
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:247
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr "--split 需要一個來源檔作為參數"
 
-#: dpkg-split/split.c:250
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr "--split 最多需要一個來源檔和目的路徑前綴做為參數"
 
@@ -5545,366 +5638,361 @@
 "  --help                   顯示這個說明訊息。\n"
 "  --version                顯示版本資訊。\n"
 
-#: utils/update-alternatives.c:150
+#: utils/update-alternatives.c:150 utils/update-alternatives.c:163
 msgid "error"
 msgstr ""
 
-#: utils/update-alternatives.c:180
+#: utils/update-alternatives.c:193
 #, fuzzy
 msgid "warning"
 msgstr "中止操作"
 
-#: utils/update-alternatives.c:280 utils/update-alternatives.c:647
-#: utils/update-alternatives.c:1171 utils/update-alternatives.c:1234
-#: utils/update-alternatives.c:1388 utils/update-alternatives.c:1632
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
-msgid "cannot stat %s: %s"
-msgstr "無法取得原本名稱 `%s' 的資訊：%s"
-
-#: utils/update-alternatives.c:291
-#, c-format
-msgid "readlink(%s) failed: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:327
+#: utils/update-alternatives.c:356
 #, fuzzy, c-format
 #| msgid "two commands specified: %s and --%s"
 msgid "two commands specified: --%s and --%s"
 msgstr "指定了兩個指令：%s 以及 --%s"
 
-#: utils/update-alternatives.c:358
+#: utils/update-alternatives.c:387
 #, fuzzy, c-format
 #| msgid "cannot open diversions: %s"
-msgid "cannot append to %s: %s"
+msgid "cannot append to '%s'"
 msgstr "無法開啟抽換項目：%s"
 
-#: utils/update-alternatives.c:395
-#, fuzzy, c-format
-#| msgid "%s: copying %s to %s failed, giving up: %s"
-msgid "scan of %s failed: %s"
-msgstr "%s：在將 %s 複製至 %s 時發生錯誤，取消操作：%s"
-
-#: utils/update-alternatives.c:420
+#: utils/update-alternatives.c:556
 #, fuzzy, c-format
-#| msgid "failed to exec %s"
-msgid "failed to execute %s: %s"
-msgstr "無法執行 %s"
-
-#: utils/update-alternatives.c:503
-#, c-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "無法讓 %s 成為指向 %s 的符號連結：%s"
-
-#: utils/update-alternatives.c:511
-#, c-format
-msgid "unable to install %s as %s: %s"
-msgstr "無法將 %s 安裝為 %s：%s"
-
-#: utils/update-alternatives.c:521
-#, c-format
-msgid "unable to remove %s: %s"
+#| msgid "unable to remove %s: %s"
+msgid "unable to remove '%s'"
 msgstr "無法移除 %s：%s"
 
-#: utils/update-alternatives.c:1060
+#: utils/update-alternatives.c:1111
 #, fuzzy, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr "在 %2$.255s 中的 %1$s 有預期之外的檔案結束符號"
 
-#: utils/update-alternatives.c:1062 utils/update-alternatives.c:1904
+#: utils/update-alternatives.c:1113
 #, fuzzy, c-format
 msgid "while reading %s: %s"
 msgstr "無法讀取 %s：%s"
 
-#: utils/update-alternatives.c:1068
+#: utils/update-alternatives.c:1119
 #, fuzzy, c-format
 msgid "line not terminated while trying to read %s"
 msgstr "在 %2$.255s 中的 %1$s 有預期之外的檔案結束符號"
 
-#: utils/update-alternatives.c:1086
+#: utils/update-alternatives.c:1137
 #, fuzzy, c-format
 msgid "%s corrupt: %s"
 msgstr "內部錯誤：%s 損毀：%s"
 
-#: utils/update-alternatives.c:1099
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "在 update-alternatives 檔 (%s) 裡不可有換行符號"
 
-#: utils/update-alternatives.c:1103
-#, fuzzy, c-format
-msgid "while writing %s: %s"
-msgstr "在寫入 stdout 時發生錯誤：%s"
-
-#: utils/update-alternatives.c:1112
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1120 utils/update-alternatives.c:2125
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, fuzzy, c-format
 #| msgid "duplicate slave %s"
 msgid "duplicate slave name %s"
 msgstr "重複的次要 %s"
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1174
 #, fuzzy
 msgid "slave link"
 msgstr "重複的次要連結 %s"
 
-#: utils/update-alternatives.c:1127
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr "次要連結與主要連結 %s 相同"
 
-#: utils/update-alternatives.c:1134 utils/update-alternatives.c:2132
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr "重複的次要連結 %s"
 
-#: utils/update-alternatives.c:1153
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1162
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr "重複的路徑 %s"
 
-#: utils/update-alternatives.c:1176
+#: utils/update-alternatives.c:1226
 #, fuzzy, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr "%s 的替換項目指向了 %s - 但卻找不到。將其從替換項目列表中移除。"
 
-#: utils/update-alternatives.c:1179 utils/update-alternatives.c:1190
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 #, fuzzy
 msgid "priority"
 msgstr "優先權 %s %s"
 
-#: utils/update-alternatives.c:1182 utils/update-alternatives.c:1199
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1194
+#: utils/update-alternatives.c:1244
 #, fuzzy, c-format
 msgid "priority of %s: %s"
 msgstr "優先權 %s %s"
 
-#: utils/update-alternatives.c:1244
-#, c-format
-msgid "unable to read %s: %s"
-msgstr "無法讀取 %s：%s"
-
-#: utils/update-alternatives.c:1248
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1250
+#: utils/update-alternatives.c:1299
 #, fuzzy
 msgid "invalid status"
 msgstr "無效的更新模式"
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c:1304
 #, fuzzy
 msgid "master link"
 msgstr "重複的次要連結 %s"
 
-#: utils/update-alternatives.c:1265 utils/update-alternatives.c:1355
-#, c-format
-msgid "unable to close %s: %s"
-msgstr "無法關閉 %s：%s"
-
-#: utils/update-alternatives.c:1299
+#: utils/update-alternatives.c:1348
 #, fuzzy, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "捨棄已廢棄的次要連結 %s (%s)。"
 
-#: utils/update-alternatives.c:1324
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot write %s: %s"
-msgstr "無法寫入 %s：%s"
-
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1516
-#: utils/update-alternatives.c:2450
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1449 utils/update-alternatives.c:1525
-#: utils/update-alternatives.c:2451
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1452
+#: utils/update-alternatives.c:1505
 #, fuzzy, c-format
 msgid "  link currently points to %s"
 msgstr " 目前的連結是指向 %s"
 
-#: utils/update-alternatives.c:1455
+#: utils/update-alternatives.c:1508
 #, fuzzy
 msgid "  link currently absent"
 msgstr " 連結目前失效"
 
-#: utils/update-alternatives.c:1459
+#: utils/update-alternatives.c:1512
 #, fuzzy, c-format
 #| msgid "%s - priority %s"
 msgid "%s - priority %d"
 msgstr "%s - 優先權 %s"
 
-#: utils/update-alternatives.c:1462
+#: utils/update-alternatives.c:1515
 #, fuzzy, c-format
 msgid "  slave %s: %s"
 msgstr " 次要 %s：%s"
 
-#: utils/update-alternatives.c:1469
+#: utils/update-alternatives.c:1522
 #, fuzzy, c-format
 msgid "Current 'best' version is '%s'."
 msgstr "目前 `最佳' 的版本為 %s。"
 
-#: utils/update-alternatives.c:1471
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr "沒有可用的版本。"
 
-#: utils/update-alternatives.c:1500
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1507
+#: utils/update-alternatives.c:1560
 #, fuzzy
 msgid "Selection"
 msgstr "簡介"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 #, fuzzy
 msgid "Priority"
 msgstr "優先權 %s %s"
 
-#: utils/update-alternatives.c:1508
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1529
+#: utils/update-alternatives.c:1582
 #, fuzzy, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr "請按下 [enter] 使用預設值[*]，或輸入選擇號碼："
 
-#: utils/update-alternatives.c:1646
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1659
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1677
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1874 utils/update-alternatives.c:1880
+#: utils/update-alternatives.c:1790
+#, c-format
+msgid "not removing %s since it's not a symlink."
+msgstr ""
+
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1884
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1888
+#: utils/update-alternatives.c:2055
 #, fuzzy, c-format
 msgid "Skip unknown alternative %s."
 msgstr "找不到可替換程式 `%s'。"
 
-#: utils/update-alternatives.c:1910
+#: utils/update-alternatives.c:2077
 #, fuzzy, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr "在 %2$.255s 中的 %1$s 有預期之外的檔案結束符號"
 
-#: utils/update-alternatives.c:1923 utils/update-alternatives.c:1936
-#: utils/update-alternatives.c:1946
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1965
+#: utils/update-alternatives.c:2132
 #, fuzzy, c-format
 msgid "renaming %s link from %s to %s."
 msgstr "正在將 %s 連結由 %s 更名為 %s。"
 
-#: utils/update-alternatives.c:1996
+#: utils/update-alternatives.c:2173
 #, fuzzy, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "正在將 %s 次要連結由 %s 更名為 %s。"
 
-#: utils/update-alternatives.c:2044
+#: utils/update-alternatives.c:2189
+#, c-format
+msgid "alternative name (%s) must not contain '/' and spaces."
+msgstr ""
+
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2224
+#, c-format
+msgid "alternative %s can't be master: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
+#, c-format
+msgid "alternative link %s is already managed by %s."
+msgstr ""
+
+#: utils/update-alternatives.c:2241
+#, fuzzy, c-format
+msgid "alternative path %s doesn't exist."
+msgstr "警告：己設定為 --update 但 %s 不存在"
+
+#: utils/update-alternatives.c:2254
+#, fuzzy, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
+msgstr "%s 的替換項目指向了 %s - 但卻找不到。將其從替換項目列表中移除。"
+
+#: utils/update-alternatives.c:2258
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
+msgstr ""
+
+#: utils/update-alternatives.c:2278
+#, c-format
+msgid "alternative link %s is already managed by %s (slave of %s)."
+msgstr ""
+
+#: utils/update-alternatives.c:2324
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "未知參數 `%s'"
 
-#: utils/update-alternatives.c:2063
+#: utils/update-alternatives.c:2343
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install 要有 <連結> <名稱> <檔案路徑> <優先權>"
 
-#: utils/update-alternatives.c:2066 utils/update-alternatives.c:2117
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2069
+#: utils/update-alternatives.c:2349
 msgid "priority must be an integer"
 msgstr "優先權必須為整數"
 
-#: utils/update-alternatives.c:2082
+#: utils/update-alternatives.c:2362
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s 要有 <名稱> <檔案路徑>"
 
-#: utils/update-alternatives.c:2096
+#: utils/update-alternatives.c:2376
 #, c-format
 msgid "--%s needs <name>"
 msgstr "--%s 要有 <名稱>"
 
-#: utils/update-alternatives.c:2108
+#: utils/update-alternatives.c:2388
 msgid "--slave only allowed with --install"
 msgstr "--slave 只能搭配 --install 使用"
 
-#: utils/update-alternatives.c:2110
+#: utils/update-alternatives.c:2390
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave 要有 <連結> <名稱> <檔案路徑>"
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2399
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr "名稱 %s 同時是主要及次要"
 
-#: utils/update-alternatives.c:2122
+#: utils/update-alternatives.c:2402
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr "連結 %s 同時是主要及次要"
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2422
 #, fuzzy, c-format
 msgid "--%s needs a <file> argument"
 msgstr "--%s 需要一個參數"
 
-#: utils/update-alternatives.c:2168
+#: utils/update-alternatives.c:2448
 #, c-format
 msgid "unknown option `%s'"
 msgstr "未知選項 `%s'"
 
-#: utils/update-alternatives.c:2173
+#: utils/update-alternatives.c:2453
 #, fuzzy
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
@@ -5913,67 +6001,23 @@
 "要有 --display, --config, --set, --install, --remove, --all, --remove-all 或 "
 "--auto"
 
-#: utils/update-alternatives.c:2215
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2226 utils/update-alternatives.c:2267
-#, c-format
-msgid "alternative link %s is already managed by %s."
-msgstr ""
-
-#: utils/update-alternatives.c:2231 utils/update-alternatives.c:2273
-#, c-format
-msgid "alternative link is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2235 utils/update-alternatives.c:2277
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2239
-#, fuzzy, c-format
-msgid "alternative path %s doesn't exist."
-msgstr "警告：己設定為 --update 但 %s 不存在"
-
-#: utils/update-alternatives.c:2243 utils/update-alternatives.c:2281
-#, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
-msgstr ""
-
-#: utils/update-alternatives.c:2255
-msgid "it is a master alternative."
-msgstr ""
-
-#: utils/update-alternatives.c:2257
-#, fuzzy, c-format
-msgid "it is a slave of %s"
-msgstr " 次要 %s：%s"
-
-#: utils/update-alternatives.c:2259
-#, c-format
-msgid "alternative %s can't be slave of %s: %s"
-msgstr ""
-
-#: utils/update-alternatives.c:2306
+#: utils/update-alternatives.c:2490
 #, fuzzy
 #| msgid "read error on standard input"
 msgid "<standard input>"
 msgstr "從標準輸入讀取資料時發生錯誤"
 
-#: utils/update-alternatives.c:2315 utils/update-alternatives.c:2318
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, fuzzy, c-format
 msgid "no alternatives for %s."
 msgstr "沒有 %s 的替換檔。"
 
-#: utils/update-alternatives.c:2342
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c:2534
 #, fuzzy, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
@@ -5982,69 +6026,109 @@
 "%s 已有更動（手動或被某個 script 修改）。\n"
 "切換成僅能手動更新。"
 
-#: utils/update-alternatives.c:2354
+#: utils/update-alternatives.c:2542
 #, fuzzy, c-format
 msgid "setting up automatic selection of %s."
 msgstr "正在設定 %s 的自動選擇。"
 
-#: utils/update-alternatives.c:2363
+#: utils/update-alternatives.c:2551
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr "%2$s 的替換項目 %1$s 沒有註冊，無法移除。"
 
-#: utils/update-alternatives.c:2369 utils/update-alternatives.c:2375
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, fuzzy, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 "沒有程式有提供 %s。\n"
 "毋需任何設定。\n"
 
-#: utils/update-alternatives.c:2377 utils/update-alternatives.c:2387
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2396
+#: utils/update-alternatives.c:2584
 #, fuzzy, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "%2$s 的替換項目 %1$s 沒有註冊，無法移除。"
 
-#: utils/update-alternatives.c:2404
+#: utils/update-alternatives.c:2592
 #, fuzzy, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr "正在移除由手動所選擇的替代指令 - 切換為自動模式"
 
-#: utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2617
 #, fuzzy, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr "%s 的自動更新已被停用，不做變更。"
 
-#: utils/update-alternatives.c:2431
+#: utils/update-alternatives.c:2619
 #, fuzzy, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr "若要回復成自動更新，請執行 `update-alternatives --auto %s'。"
 
-#: utils/update-alternatives.c:2448
+#: utils/update-alternatives.c:2636
 #, fuzzy, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "以 '%s' 提供 '%s'。"
 
-#: utils/update-alternatives.c:2456
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""
 
 #, fuzzy
+#~ msgid "it is a slave of %s"
+#~ msgstr " 次要 %s：%s"
+
+#, fuzzy
+#~| msgid "cannot stat old name `%s': %s"
+#~ msgid "cannot stat %s: %s"
+#~ msgstr "無法取得原本名稱 `%s' 的資訊：%s"
+
+#, fuzzy
+#~| msgid "%s: copying %s to %s failed, giving up: %s"
+#~ msgid "scan of %s failed: %s"
+#~ msgstr "%s：在將 %s 複製至 %s 時發生錯誤，取消操作：%s"
+
+#, fuzzy
+#~| msgid "failed to exec %s"
+#~ msgid "failed to execute %s: %s"
+#~ msgstr "無法執行 %s"
+
+#~ msgid "unable to make %s a symlink to %s: %s"
+#~ msgstr "無法讓 %s 成為指向 %s 的符號連結：%s"
+
+#~ msgid "unable to install %s as %s: %s"
+#~ msgstr "無法將 %s 安裝為 %s：%s"
+
+#, fuzzy
+#~ msgid "while writing %s: %s"
+#~ msgstr "在寫入 stdout 時發生錯誤：%s"
+
+#~ msgid "unable to read %s: %s"
+#~ msgstr "無法讀取 %s：%s"
+
+#~ msgid "unable to close %s: %s"
+#~ msgstr "無法關閉 %s：%s"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot write %s: %s"
+#~ msgstr "無法寫入 %s：%s"
+
+#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "無法將 %s 更名為 %s：%s"
@@ -6319,9 +6403,6 @@
 #~ msgid "skipped control area from %s"
 #~ msgstr "忽略了 %s 中的成員資料"
 
-#~ msgid "failed to exec tar"
-#~ msgstr "無法執行 tar"
-
 #, fuzzy
 #~ msgid "failed to create temporary directory"
 #~ msgstr "無法為臨時目錄命名"
diff -uNr --exclude .git --exclude .bzr dpkg/README /home/vorlon/devel/multiarch/dpkg-debian/README
--- dpkg/README	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/README	2012-06-07 10:11:09.426073000 -0700
@@ -1,5 +1,112 @@
-This is dpkg, Debian's package maintenance system.
+dpkg - Debian's package maintenance system
 
-The primary interface for the dpkg suite is the `dselect' program;
+The primary interface for the dpkg suite is the ‘dselect’ program;
 a more low-level and less user-friendly interface is available in
-the form of the `dpkg' command.
+the form of the ‘dpkg’ command.
+
+
+Releases
+--------
+
+The current legacy, stable and development releases can be found at:
+
+  <http://ftp.debian.org/debian/pool/main/d/dpkg/>
+
+For older releases check:
+
+  <http://snapshot.debian.org/package/dpkg/>
+
+
+Mailing List
+------------
+
+The subscription interface and web archives can be found at:
+
+  <http://lists.debian.org/debian-dpkg/>
+
+The mailing list address is:
+
+  debian-dpkg@lists.debian.org
+
+
+Source Repository
+-----------------
+
+  <http://anonscm.debian.org/gitweb/?p=dpkg/dpkg.git>
+  <git://anonscm.debian.org/dpkg/dpkg.git>
+
+
+Building from git source
+------------------------
+
+To prepare the source tree before starting the build process, some software
+needs to be installed, additional software might provide optional features.
+
+The minimum software required to build dpkg is:
+
+  C89 compiler with few C99 extensions (see doc/coding-style.txt)
+  GNU make
+  GNU autoconf >= 2.60
+  GNU automake >= 1.8
+  GNU gettext  >= 0.18
+  pkg-config
+  flex
+  perl
+
+To run the test suite («make check»):
+
+  TimeDate perl module
+  IO-String perl module
+
+To enable optional functionality or programs, this software might be needed:
+
+  zlib (used instead of the command-line tool)
+  liblzma (from the xz project; used instead of the command-line tool)
+  libbzip2 (from the bzip2 project; used instead of the command-line tool)
+  libselinux (needed for SELinux support)
+  curses compatible library (needed for dselect)
+
+To enable translated or additional («make doc») documentation this
+software will be needed:
+
+  po4a >= 0.36.4
+  pod2man
+  doxygen
+  dot
+
+To enable code coverage («./configure --enable-coverage; make coverage»)
+this software is needed:
+
+  lcov (from the Linux Test Project)
+  Devel-Cover perl module
+
+
+After installing the needed software, and running the following command on
+the git tree:
+
+  $ autoreconf -f -i
+
+the source should be equivalent to the distributed tar source.
+
+
+Building from tar source
+------------------------
+
+The instructions to build the distributed source are included in the
+INSTALL file.
+
+The following configure options might be of interest to disable specific
+programs:
+
+  --without-dselect
+  --without-start-stop-daemon
+  --without-update-alternatives
+  --without-install-info
+
+And the following to disable modifications to the build flags:
+
+  --disable-compiler-warnings
+  --disable-compiler-optimisations
+  --disable-linker-optimisations
+
+To see all available configuration options please run «./configure --help».
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/changelog/debian.pl /home/vorlon/devel/multiarch/dpkg-debian/scripts/changelog/debian.pl
--- dpkg/scripts/changelog/debian.pl	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/changelog/debian.pl	2012-06-07 10:11:09.426073000 -0700
@@ -133,10 +133,10 @@
 
 if ($file eq '-') {
     $changes->parse(\*STDIN, _g("<standard input>"))
-	or error(_g('fatal error occured while parsing input'));
+	or error(_g('fatal error occurred while parsing input'));
 } else {
     $changes->load($file)
-	or error(_g('fatal error occured while parsing %s'), $file);
+	or error(_g('fatal error occurred while parsing %s'), $file);
 }
 
 eval qq{
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/changelog/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/scripts/changelog/.gitignore
--- dpkg/scripts/changelog/.gitignore	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/changelog/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-debian
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/BuildFlags.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/BuildFlags.pm
--- dpkg/scripts/Dpkg/BuildFlags.pm	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/BuildFlags.pm	2012-06-07 10:11:09.426073000 -0700
@@ -1,4 +1,4 @@
-# Copyright © 2010 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2010-2011 Raphaël Hertzog <hertzog@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 use strict;
 use warnings;
 
-our $VERSION = "1.00";
+our $VERSION = "1.01";
 
 use Dpkg::Gettext;
 use Dpkg::BuildOptions;
@@ -84,6 +84,7 @@
 	FFLAGS   => 'vendor',
 	LDFLAGS  => 'vendor',
     };
+    # The Debian vendor hook will add hardening build flags
     run_vendor_hook("update-buildflags", $self);
 }
 
@@ -106,13 +107,16 @@
 
 sub load_user_config {
     my ($self) = @_;
-    my $confdir = $ENV{'XDG_CONFIG_HOME'} || $ENV{"HOME"} . "/.config";
-    $self->update_from_conffile("$confdir/dpkg/buildflags.conf", "user");
+    my $confdir = $ENV{'XDG_CONFIG_HOME'};
+    $confdir ||= $ENV{'HOME'} . "/.config" if defined $ENV{'HOME'};
+    if (defined $confdir) {
+        $self->update_from_conffile("$confdir/dpkg/buildflags.conf", "user");
+    }
 }
 
 =item $bf->load_environment_config()
 
-Update flags based on directives stored in the environment. See
+Update flags based on user directives stored in the environment. See
 dpkg-buildflags(1) for details.
 
 =cut
@@ -124,18 +128,56 @@
 	if (exists $ENV{$envvar}) {
 	    $self->set($flag, $ENV{$envvar}, "env");
 	}
+	$envvar = "DEB_" . $flag . "_STRIP";
+	if (exists $ENV{$envvar}) {
+	    $self->strip($flag, $ENV{$envvar}, "env");
+	}
 	$envvar = "DEB_" . $flag . "_APPEND";
 	if (exists $ENV{$envvar}) {
 	    $self->append($flag, $ENV{$envvar}, "env");
 	}
+	$envvar = "DEB_" . $flag . "_PREPEND";
+	if (exists $ENV{$envvar}) {
+	    $self->prepend($flag, $ENV{$envvar}, "env");
+	}
+    }
+}
+
+=item $bf->load_maintainer_config()
+
+Update flags based on maintainer directives stored in the environment. See
+dpkg-buildflags(1) for details.
+
+=cut
+
+sub load_maintainer_config {
+    my ($self) = @_;
+    foreach my $flag (keys %{$self->{flags}}) {
+	my $envvar = "DEB_" . $flag . "_MAINT_SET";
+	if (exists $ENV{$envvar}) {
+	    $self->set($flag, $ENV{$envvar}, undef);
+	}
+	$envvar = "DEB_" . $flag . "_MAINT_STRIP";
+	if (exists $ENV{$envvar}) {
+	    $self->strip($flag, $ENV{$envvar}, undef);
+	}
+	$envvar = "DEB_" . $flag . "_MAINT_APPEND";
+	if (exists $ENV{$envvar}) {
+	    $self->append($flag, $ENV{$envvar}, undef);
+	}
+	$envvar = "DEB_" . $flag . "_MAINT_PREPEND";
+	if (exists $ENV{$envvar}) {
+	    $self->prepend($flag, $ENV{$envvar}, undef);
+	}
     }
 }
 
+
 =item $bf->load_config()
 
-Call successively load_system_config(), load_user_config() and
-load_environment_config() to update the default build flags
-defined by the vendor.
+Call successively load_system_config(), load_user_config(),
+load_environment_config() and load_maintainer_config() to update the
+default build flags defined by the vendor.
 
 =cut
 
@@ -144,24 +186,44 @@
     $self->load_system_config();
     $self->load_user_config();
     $self->load_environment_config();
+    $self->load_maintainer_config();
 }
 
 =item $bf->set($flag, $value, $source)
 
-Update the build flag $flag with value $value and record its origin as $source.
+Update the build flag $flag with value $value and record its origin as
+$source (if defined).
 
 =cut
 
 sub set {
     my ($self, $flag, $value, $src) = @_;
     $self->{flags}->{$flag} = $value;
-    $self->{origin}->{$flag} = $src;
+    $self->{origin}->{$flag} = $src if defined $src;
+}
+
+=item $bf->strip($flag, $value, $source)
+
+Update the build flag $flag by stripping the flags listed in $value and
+record its origin as $source (if defined).
+
+=cut
+
+sub strip {
+    my ($self, $flag, $value, $src) = @_;
+    foreach my $tostrip (split(/\s+/, $value)) {
+	next unless length $tostrip;
+	$self->{flags}->{$flag} =~ s/(^|\s+)\Q$tostrip\E(\s+|$)/ /g;
+    }
+    $self->{flags}->{$flag} =~ s/^\s+//g;
+    $self->{flags}->{$flag} =~ s/\s+$//g;
+    $self->{origin}->{$flag} = $src if defined $src;
 }
 
 =item $bf->append($flag, $value, $source)
 
 Append the options listed in $value to the current value of the flag $flag.
-Record its origin as $source.
+Record its origin as $source (if defined).
 
 =cut
 
@@ -172,9 +234,27 @@
     } else {
         $self->{flags}->{$flag} = $value;
     }
-    $self->{origin}->{$flag} = $src;
+    $self->{origin}->{$flag} = $src if defined $src;
+}
+
+=item $bf->prepend($flag, $value, $source)
+
+Prepend the options listed in $value to the current value of the flag $flag.
+Record its origin as $source (if defined).
+
+=cut
+
+sub prepend {
+    my ($self, $flag, $value, $src) = @_;
+    if (length($self->{flags}->{$flag})) {
+        $self->{flags}->{$flag} = "$value " . $self->{flags}->{$flag};
+    } else {
+        $self->{flags}->{$flag} = $value;
+    }
+    $self->{origin}->{$flag} = $src if defined $src;
 }
 
+
 =item $bf->update_from_conffile($file, $source)
 
 Update the current build flags based on the configuration directives
@@ -192,7 +272,7 @@
         chomp;
         next if /^\s*#/; # Skip comments
         next if /^\s*$/; # Skip empty lines
-        if (/^(append|set)\s+(\S+)\s+(\S.*\S)\s*$/i) {
+        if (/^(append|prepend|set|strip)\s+(\S+)\s+(\S.*\S)\s*$/i) {
             my ($op, $flag, $value) = ($1, $2, $3);
             unless (exists $self->{flags}->{$flag}) {
                 warning(_g("line %d of %s mentions unknown flag %s"), $., $file, $flag);
@@ -200,8 +280,12 @@
             }
             if (lc($op) eq "set") {
                 $self->set($flag, $value, $src);
+            } elsif (lc($op) eq "strip") {
+                $self->strip($flag, $value, $src);
             } elsif (lc($op) eq "append") {
                 $self->append($flag, $value, $src);
+            } elsif (lc($op) eq "prepend") {
+                $self->prepend($flag, $value, $src);
             }
         } else {
             warning(_g("line %d of %s is invalid, it has been ignored."), $., $file);
@@ -258,6 +342,16 @@
 
 =back
 
+=head1 CHANGES
+
+=head2 Version 1.01
+
+New method: $bf->prepend() very similar to append(). Implement support of
+the prepend operation everywhere.
+
+New method: $bf->load_maintainer_config() that update the build flags
+based on the package maintainer directives.
+
 =head1 AUTHOR
 
 Raphaël Hertzog <hertzog@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/BuildOptions.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/BuildOptions.pm
--- dpkg/scripts/Dpkg/BuildOptions.pm	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/BuildOptions.pm	2012-06-07 10:11:09.426073000 -0700
@@ -19,7 +19,7 @@
 use strict;
 use warnings;
 
-our $VERSION = "1.00";
+our $VERSION = "1.01";
 
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
@@ -33,16 +33,18 @@
 =head1 DESCRIPTION
 
 The Dpkg::BuildOptions object can be used to manipulate options stored
-in the DEB_BUILD_OPTIONS environment variable.
+in environment variables like DEB_BUILD_OPTIONS and
+DEB_BUILD_MAINT_OPTIONS.
 
 =head1 FUNCTIONS
 
 =over 4
 
-=item my $bo = Dpkg::BuildOptions->new()
+=item my $bo = Dpkg::BuildOptions->new(%opts)
 
 Create a new Dpkg::BuildOptions object. It will be initialized based
-on the value of the DEB_BUILD_OPTIONS environment variable.
+on the value of the environment variable named $opts{'envvar'} (or
+DEB_BUILD_OPTIONS if that option is not set).
 
 =cut
 
@@ -53,9 +55,10 @@
     my $self = {
         options => {},
 	source => {},
+	envvar => $opts{'envvar'} // "DEB_BUILD_OPTIONS",
     };
     bless $self, $class;
-    $self->merge($ENV{DEB_BUILD_OPTIONS}, "DEB_BUILD_OPTIONS");
+    $self->merge($ENV{$self->{'envvar'}}, $self->{'envvar'});
     return $self;
 }
 
@@ -169,14 +172,14 @@
 =item $bo->export([$var])
 
 Export the build options to the given environment variable. If omitted,
-DEB_BUILD_OPTIONS is assumed. The value set to the variable is also
-returned.
+the environment variable defined at creation time is assumed. The value
+set to the variable is also returned.
 
 =cut
 
 sub export {
     my ($self, $var) = @_;
-    $var = "DEB_BUILD_OPTIONS" unless defined $var;
+    $var = $self->{'envvar'} unless defined $var;
     my $content = $self->output();
     $ENV{$var} = $content;
     return $content;
@@ -184,6 +187,13 @@
 
 =back
 
+=head1 CHANGES
+
+=head2 Version 1.01
+
+Enable to use another environment variable instead of DEB_BUILD_OPTIONS.
+Thus add support for the "envvar" option at creation time.
+
 =head1 AUTHOR
 
 Raphaël Hertzog <hertzog@debian.org>
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Changelog.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Changelog.pm
--- dpkg/scripts/Dpkg/Changelog.pm	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Changelog.pm	2012-06-07 10:11:09.426073000 -0700
@@ -97,7 +97,7 @@
 
 =item $c->reset_parse_errors()
 
-Can be used to delete all information about errors ocurred during
+Can be used to delete all information about errors occurred during
 previous L<parse> runs.
 
 =cut
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Compression.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Compression.pm
--- dpkg/scripts/Dpkg/Compression.pm	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Compression.pm	2012-06-07 10:11:09.426073000 -0700
@@ -18,7 +18,7 @@
 use strict;
 use warnings;
 
-our $VERSION = "1.00";
+our $VERSION = "1.01";
 
 use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
@@ -54,26 +54,30 @@
 	"file_ext" => "gz",
 	"comp_prog" => [ "gzip", "--no-name", "--rsyncable" ],
 	"decomp_prog" => [ "gunzip" ],
+	"default_level" => 9,
     },
     "bzip2" => {
 	"file_ext" => "bz2",
 	"comp_prog" => [ "bzip2" ],
 	"decomp_prog" => [ "bunzip2" ],
+	"default_level" => 9,
     },
     "lzma" => {
 	"file_ext" => "lzma",
 	"comp_prog" => [ 'xz', '--format=lzma' ],
 	"decomp_prog" => [ 'unxz', '--format=lzma' ],
+	"default_level" => 6,
     },
     "xz" => {
 	"file_ext" => "xz",
 	"comp_prog" => [ "xz" ],
 	"decomp_prog" => [ "unxz" ],
+	"default_level" => 6,
     },
 };
 
 our $default_compression = "gzip";
-our $default_compression_level = 9;
+our $default_compression_level = undef;
 
 =item $compression_re_file_ext
 
@@ -117,6 +121,7 @@
 Returns the requested property of the compression method. Returns undef if
 either the property or the compression method doesn't exist. Valid
 properties currently include "file_ext" for the file extension,
+"default_level" for the default compression level,
 "comp_prog" for the name of the compression program and "decomp_prog" for
 the name of the decompression program.
 
@@ -173,25 +178,29 @@
 =item my $level = compression_get_default_level()
 
 Return the default compression level used when compressing data. It's "9"
-unless C<compression_set_default_level> has been used to change it.
+for "gzip" and "bzip2", "6" for "xz" and "lzma", unless
+C<compression_set_default_level> has been used to change it.
 
 =item compression_set_default_level($level)
 
-Change the default compression level. Errors out if the
+Change the default compression level. Passing undef as the level will
+reset it to the compressor specific default, otherwise errors out if the
 level is not valid (see C<compression_is_valid_level>).
-either a number between 1 and 9 or "fast"
-or "best".
 
 =cut
 
 sub compression_get_default_level {
-    return $default_compression_level;
+    if (defined $default_compression_level) {
+        return $default_compression_level;
+    } else {
+        return compression_get_property($default_compression, "default_level");
+    }
 }
 
 sub compression_set_default_level {
     my ($level) = @_;
     error(_g("%s is not a compression level"), $level)
-            unless compression_is_valid_level($level);
+            unless !defined($level) or compression_is_valid_level($level);
     $default_compression_level = $level;
 }
 
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Control/Info.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Control/Info.pm
--- dpkg/scripts/Dpkg/Control/Info.pm	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Control/Info.pm	2012-06-07 10:11:09.426073000 -0700
@@ -107,8 +107,12 @@
         last if not $cdata->parse($fh, $desc);
 	push @{$self->{packages}}, $cdata;
 	unless (exists $cdata->{Package}) {
-	    syntaxerr($desc, _g("block lacks a package field"));
+	    syntaxerr($desc, _g("block lacks the '%s' field"), "Package");
 	}
+	unless (exists $cdata->{Architecture}) {
+	    syntaxerr($desc, _g("block lacks the '%s' field"), "Architecture");
+	}
+
     }
 }
 
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Control/Types.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Control/Types.pm
--- dpkg/scripts/Dpkg/Control/Types.pm	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Control/Types.pm	2012-06-07 10:11:09.426073000 -0700
@@ -38,8 +38,8 @@
     CTRL_UNKNOWN => 0,
     CTRL_INFO_SRC => 1,      # First control block in debian/control
     CTRL_INFO_PKG => 2,      # Subsequent control blocks in debian/control
-    CTRL_INDEX_SRC => 4,     # Entry in APT's Packages files
-    CTRL_INDEX_PKG => 8,     # Entry in APT's Sources files
+    CTRL_INDEX_SRC => 4,     # Entry in repository's Packages files
+    CTRL_INDEX_PKG => 8,     # Entry in repository's Sources files
     CTRL_PKG_SRC => 16,      # .dsc file of source package
     CTRL_PKG_DEB => 32,      # DEBIAN/control in binary packages
     CTRL_FILE_CHANGES => 64, # .changes file
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Control.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Control.pm
--- dpkg/scripts/Dpkg/Control.pm	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Control.pm	2012-06-07 10:11:09.426073000 -0700
@@ -66,12 +66,12 @@
 
 =item CTRL_INDEX_SRC
 
-Corresponds to an entry in a Sources file of an APT source package
+Corresponds to an entry in a Sources file of a source package
 repository.
 
 =item CTRL_INDEX_PKG
 
-Corresponds to an entry in a Packages file of an APT binary package
+Corresponds to an entry in a Packages file of a binary package
 repository.
 
 =item CTRL_PKG_SRC
@@ -153,9 +153,9 @@
         } elsif ($t == CTRL_CHANGELOG) {
             $$self->{'name'} = _g("parsed version of changelog");
         } elsif ($t == CTRL_INDEX_SRC) {
-            $$self->{'name'} = sprintf(_g("entry of APT's %s file"), "Sources");
+            $$self->{'name'} = sprintf(_g("entry in repository's %s file"), "Sources");
         } elsif ($t == CTRL_INDEX_PKG) {
-            $$self->{'name'} = sprintf(_g("entry of APT's %s file"), "Packages");
+            $$self->{'name'} = sprintf(_g("entry in repository's %s file"), "Packages");
         } elsif ($t == CTRL_PKG_SRC) {
             $$self->{'name'} = sprintf(_g("%s file"), ".dsc");
         } elsif ($t == CTRL_PKG_DEB) {
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Deps.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Deps.pm
--- dpkg/scripts/Dpkg/Deps.pm	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Deps.pm	2012-06-07 10:11:09.426073000 -0700
@@ -125,29 +125,6 @@
     return 1;
 }
 
-# Dpkg::Deps::_arch_qualifier_allows_implication($p, $q)
-#
-# Returns true if the arch qualifier $p and $q are compatible with the
-# implication $p -> $q, false otherwise. $p/$q can be
-# undef/"any"/"native" or an architecture string.
-
-sub _arch_qualifier_allows_implication {
-    my ($p, $q) = @_;
-    if (defined $p and $p eq "any") {
-	return 1 if defined $q and $q eq "any";
-	return 0;
-    } elsif (defined $p and $p eq "native") {
-	return 1 if defined $q and ($q eq "any" or $q eq "native");
-	return 0;
-    } elsif (defined $p) {
-	return 1 if defined $q and ($p eq $q or $q eq "any");
-	return 0;
-    } else {
-	return 0 if defined $q and $q ne "any" and $q ne "native";
-	return 1;
-    }
-}
-
 =item deps_eval_implication($rel_p, $v_p, $rel_q, $v_q)
 
 ($rel_p, $v_p) and ($rel_q, $v_q) express two dependencies as (relation,
@@ -256,8 +233,9 @@
 
 =item host_arch (defaults to the current architecture)
 
-Define the host architecture. By default it uses
-Dpkg::Arch::get_host_arch() to identify the proper architecture.
+Define the host architecture. Needed only if the reduce_arch option is
+set to 1. By default it uses Dpkg::Arch::get_host_arch() to identify
+the proper architecture.
 
 =item reduce_arch (defaults to 0)
 
@@ -291,8 +269,7 @@
     foreach my $dep_and (split(/\s*,\s*/m, $dep_line)) {
         my @or_list = ();
         foreach my $dep_or (split(/\s*\|\s*/m, $dep_and)) {
-	    my $dep_simple = Dpkg::Deps::Simple->new($dep_or, host_arch =>
-	                                             $options{host_arch});
+	    my $dep_simple = Dpkg::Deps::Simple->new($dep_or);
 	    if (not defined $dep_simple->{package}) {
 		warning(_g("can't parse dependency %s"), $dep_or);
 		return undef;
@@ -496,11 +473,6 @@
 array ref. It can contain an exclusion list, in that case each
 architecture is prefixed with an exclamation mark.
 
-=item archqual
-
-The arch qualifier of the dependency (can be undef if there's none).
-In the dependency "python:any (>= 2.6)", the arch qualifier is "any".
-
 =back
 
 =head3 Methods
@@ -532,12 +504,11 @@
 use base qw(Dpkg::Interface::Storable);
 
 sub new {
-    my ($this, $arg, %opts) = @_;
+    my ($this, $arg) = @_;
     my $class = ref($this) || $this;
     my $self = {};
     bless $self, $class;
     $self->reset();
-    $self->{host_arch} = $opts{host_arch} || Dpkg::Arch::get_host_arch();
     $self->parse_string($arg) if defined($arg);
     return $self;
 }
@@ -548,7 +519,6 @@
     $self->{'relation'} = undef;
     $self->{'version'} = undef;
     $self->{'arches'} = undef;
-    $self->{'archqual'} = undef;
 }
 
 sub parse {
@@ -564,10 +534,6 @@
             /^\s*                           # skip leading whitespace
               ([a-zA-Z0-9][a-zA-Z0-9+.-]*)  # package name
               (?:                           # start of optional part
-                :                           # colon for architecture
-                (any)                       # architecture name
-              )?                            # end of optional part
-              (?:                           # start of optional part
                 \s* \(                      # open parenthesis for version part
                 \s* (<<|<=|=|>=|>>|<|>)     # relation part
                 \s* (.*?)                   # do not attempt to parse version
@@ -581,22 +547,18 @@
 	      \s*$			    # trailing spaces at end
             /x;
     $self->{package} = $1;
-    $self->{archqual} = $2 if defined($2);
-    $self->{relation} = version_normalize_relation($3) if defined($3);
-    if (defined($4)) {
-        $self->{version} = Dpkg::Version->new($4);
+    $self->{relation} = version_normalize_relation($2) if defined($2);
+    if (defined($3)) {
+        $self->{version} = Dpkg::Version->new($3);
     }
-    if (defined($5)) {
-	$self->{arches} = [ split(/\s+/, $5) ];
+    if (defined($4)) {
+	$self->{arches} = [ split(/\s+/, $4) ];
     }
 }
 
 sub output {
     my ($self, $fh) = @_;
     my $res = $self->{package};
-    if (defined($self->{archqual})) {
-	$res .= ":" . $self->{archqual};
-    }
     if (defined($self->{relation})) {
 	$res .= " (" . $self->{relation} . " " . $self->{version} .  ")";
     }
@@ -622,11 +584,6 @@
 	# o, otherwise we can't conclude anything.
 	return undef unless Dpkg::Deps::_arch_is_superset($self->{arches}, $o->{arches});
 
-	# The arch qualifier must not forbid an implication
-	return undef unless
-	    Dpkg::Deps::_arch_qualifier_allows_implication($self->{archqual},
-	                                                   $o->{archqual});
-
 	# If o has no version clause, then our dependency is stronger
 	return 1 if not defined $o->{relation};
 	# If o has a version clause, we must also have one, otherwise there
@@ -735,7 +692,31 @@
 sub get_evaluation {
     my ($self, $facts) = @_;
     return undef if not defined $self->{package};
-    return $facts->_evaluate_simple_dep($self);
+    my ($check, $param) = $facts->check_package($self->{package});
+    if ($check) {
+	if (defined $self->{relation}) {
+	    if (ref($param)) {
+		# Provided packages
+		# XXX: Once support for versioned provides is in place,
+		# this part must be adapted
+		return 0;
+	    } else {
+		if (defined($param)) {
+		    if (version_compare_relation($param, $self->{relation},
+						 $self->{version})) {
+			return 1;
+		    } else {
+			return 0;
+		    }
+		} else {
+		    return undef;
+		}
+	    }
+	} else {
+	    return 1;
+	}
+    }
+    return 0;
 }
 
 sub simplify_deps {
@@ -1137,11 +1118,11 @@
 
 WHILELOOP:
     while (@{$self->{list}}) {
-	my $dep = shift @{$self->{list}};
-	foreach my $odep (@new) {
+	my $odep = shift @{$self->{list}};
+	foreach my $dep (@new) {
 	    next WHILELOOP if $dep->merge_union($odep);
 	}
-	push @new, $dep;
+	push @new, $odep;
     }
     $self->{list} = [ @new ];
 }
@@ -1164,8 +1145,6 @@
 use strict;
 use warnings;
 
-use Dpkg::Version;
-
 sub new {
     my $this = shift;
     my $class = ref($this) || $this;
@@ -1174,28 +1153,17 @@
     return $self;
 }
 
-=item $facts->add_installed_package($package, $version, $arch, $multiarch)
+=item $facts->add_installed_package($package, $version)
 
-Records that the given version of the package is installed. If
-$version/$arch is undefined we know that the package is installed but we
-don't know which version/architecture it is. $multiarch is the Multi-Arch
-field of the package. If $multiarch is undef, it will be equivalent to
-"Multi-Arch: no".
-
-Note that $multiarch is only used if $arch is provided.
+Records that the given version of the package is installed. If $version is
+undefined we know that the package is installed but we don't know which
+version it is.
 
 =cut
 
 sub add_installed_package {
-    my ($self, $pkg, $ver, $arch, $multiarch) = @_;
-    my $p = {
-	"package" => $pkg,
-	"version" => $ver,
-	"architecture" => $arch,
-	"multi-arch" => $multiarch || "no",
-    };
-    $self->{pkg}{"$pkg:$arch"} = $p if defined $arch;
-    push @{$self->{pkg}{$pkg}}, $p;
+    my ($self, $pkg, $ver) = @_;
+    $self->{pkg}{$pkg} = $ver;
 }
 
 =item $facts->add_provided_package($virtual, $relation, $version, $by)
@@ -1221,10 +1189,6 @@
 reference containing the list of packages that provide it (each package is
 listed as [ $provider, $relation, $version ]).
 
-This function is obsolete and should not be used. Dpkg::Deps::KnownFacts
-is only meant to be filled with data and then passed to Dpkg::Deps
-methods where appropriate, but it should not be directly queried.
-
 =back
 
 =cut
@@ -1232,7 +1196,7 @@
 sub check_package {
     my ($self, $pkg) = @_;
     if (exists $self->{pkg}{$pkg}) {
-	return (1, $self->{pkg}{$pkg}[0]{version});
+	return (1, $self->{pkg}{$pkg});
     }
     if (exists $self->{virtualpkg}{$pkg}) {
 	return (1, $self->{virtualpkg}{$pkg});
@@ -1240,64 +1204,6 @@
     return (0, undef);
 }
 
-## The functions below are private to Dpkg::Deps
-
-sub _find_package {
-    my ($self, $dep, $lackinfos) = @_;
-    my ($pkg, $archqual) = ($dep->{package}, $dep->{archqual});
-    return undef if not exists $self->{pkg}{$pkg};
-    my $host_arch = $dep->{host_arch};
-    foreach my $p (@{$self->{pkg}{$pkg}}) {
-	my $a = $p->{"architecture"};
-	my $ma = $p->{"multi-arch"};
-	if (not defined $a) {
-	    $$lackinfos = 1;
-	    next;
-	}
-	return $p if $ma eq "foreign";
-	if (not defined $archqual) {
-	    return $p if $a eq $host_arch or $a eq "all";
-	} elsif ($archqual eq "any") {
-	    return $p if $ma eq "allowed";
-	    return $p if $a eq $host_arch or $a eq "all";
-	}
-    }
-    return undef;
-}
-
-sub _find_virtual_packages {
-    my ($self, $pkg) = @_;
-    return () if not exists $self->{virtualpkg}{$pkg};
-    return @{$self->{virtualpkg}{$pkg}};
-}
-
-
-sub _evaluate_simple_dep {
-    my ($self, $dep) = @_;
-    my ($lackinfos, $pkg) = (0, $dep->{package});
-    my $p = $self->_find_package($dep, \$lackinfos);
-    if ($p) {
-	if (defined $dep->{relation}) {
-	    if (defined $p->{version}) {
-		return 1 if version_compare_relation($p->{version},
-		                           $dep->{relation}, $dep->{version});
-	    } else {
-		$lackinfos = 1;
-	    }
-	} else {
-	    return 1;
-	}
-    }
-    foreach my $virtpkg ($self->_find_virtual_packages($pkg)) {
-	# XXX: Adapt when versioned provides are allowed
-	next if defined $virtpkg->[1];
-	next if defined $dep->{relation}; # Provides don't satisfy versioned deps
-	return 1;
-    }
-    return undef if $lackinfos;
-    return 0;
-}
-
 =head1 CHANGES
 
 =head2 Version 1.01
@@ -1306,15 +1212,6 @@
 
 =item * Add new $dep->reset() method that all dependency objects support.
 
-=item * Dpkg::Deps::Simple now recognizes the arch qualifier "any" and
-stores it in the "archqual" property when present.
-
-=item * Dpkg::Deps::KnownFacts->add_installed_package() now accepts 2
-supplementary parameters ($arch and $multiarch).
-
-=item * Dpkg::Deps::KnownFacts->check_package() is obsolete, it should
-not have been part of the public API.
-
 =back
 
 =cut
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/ErrorHandling.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/ErrorHandling.pm
--- dpkg/scripts/Dpkg/ErrorHandling.pm	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/ErrorHandling.pm	2012-06-07 10:11:09.426073000 -0700
@@ -109,7 +109,9 @@
 }
 
 sub syntaxerr {
-    my ($file, $msg) = @_;
+    my ($file, $msg) = (shift, shift);
+
+    $msg = sprintf($msg, @_) if (@_);
     error(_g("syntax error in %s at line %d: %s"), $file, $., $msg);
 }
 
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Path.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Path.pm
--- dpkg/scripts/Dpkg/Path.pm	2011-03-09 14:40:51.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Path.pm	2012-06-07 10:11:09.426073000 -0700
@@ -24,12 +24,14 @@
 use base qw(Exporter);
 use File::Spec;
 use Cwd qw(realpath);
+
+use Dpkg::Arch qw(get_host_arch debarch_to_debtriplet);
 use Dpkg::IPC;
 
 our @EXPORT_OK = qw(get_pkg_root_dir relative_to_pkg_root
 		    guess_pkg_root_dir check_files_are_the_same
 		    resolve_symlink canonpath find_command
-		    get_control_path);
+		    get_control_path find_build_file);
 
 =encoding utf8
 
@@ -241,8 +243,49 @@
     return split(/\n/, $control_file);
 }
 
+=item my $file = find_build_file($basename)
+
+Selects the right variant of the given file: the arch-specific variant
+("$basename.$arch") has priority over the OS-specific variant
+("$basename.$os") which has priority over the default variant
+("$basename"). If none of the files exists, then it returns undef.
+
+=item my @files = find_build_file($basename)
+
+Return the available variants of the given file. Returns an empty
+list if none of the files exists.
+
+=cut
+
+sub find_build_file($) {
+    my $base = shift;
+    my $host_arch = get_host_arch();
+    my ($abi, $host_os, $cpu) = debarch_to_debtriplet($host_arch);
+    my @files;
+    foreach my $f ("$base.$host_arch", "$base.$host_os", "$base") {
+        push @files, $f if -f $f;
+    }
+    return @files if wantarray;
+    return $files[0] if scalar @files;
+    return undef;
+}
+
 =back
 
+=head1 CHANGES
+
+=head2 Version 1.03
+
+New function: find_build_file()
+
+=head2 Version 1.02
+
+New function: get_control_path()
+
+=head2 Version 1.01
+
+New function: find_command()
+
 =head1 AUTHOR
 
 Raphaël Hertzog <hertzog@debian.org>.
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Shlibs/SymbolFile.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Shlibs/SymbolFile.pm
--- dpkg/scripts/Dpkg/Shlibs/SymbolFile.pm	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Shlibs/SymbolFile.pm	2012-06-07 10:11:09.426073000 -0700
@@ -236,8 +236,8 @@
 	    }
 	    $dir =~ s{[^/]+$}{}; # Strip filename
 	    $self->load("$dir$filename", $seen, $obj_ref, $new_base_symbol);
-	} elsif (/^#/) {
-	    # Skip possible comments
+	} elsif (/^#|^$/) {
+	    # Skip possible comments and empty lines
 	} elsif (/^\|\s*(.*)$/) {
 	    # Alternative dependency template
 	    push @{$self->{objects}{$$obj_ref}{deps}}, "$1";
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Source/Package/V1.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Source/Package/V1.pm
--- dpkg/scripts/Dpkg/Source/Package/V1.pm	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Source/Package/V1.pm	2012-06-07 10:11:09.426073000 -0700
@@ -44,11 +44,12 @@
     # Don't call $self->SUPER::init_options() on purpose, V1.0 has no
     # ignore by default
     if ($self->{'options'}{'diff_ignore_regexp'}) {
-	$self->{'options'}{'diff_ignore_regexp'} .= '|(?:^|/)debian/source/local-options$';
+	$self->{'options'}{'diff_ignore_regexp'} .= '|(?:^|/)debian/source/local-.*$';
     } else {
-	$self->{'options'}{'diff_ignore_regexp'} = '(?:^|/)debian/source/local-options$';
+	$self->{'options'}{'diff_ignore_regexp'} = '(?:^|/)debian/source/local-.*$';
     }
-    push @{$self->{'options'}{'tar_ignore'}}, "debian/source/local-options";
+    push @{$self->{'options'}{'tar_ignore'}}, "debian/source/local-options",
+         "debian/source/local-patch-header";
     $self->{'options'}{'sourcestyle'} ||= 'X';
     $self->{'options'}{'skip_debianization'} ||= 0;
     $self->{'options'}{'abort_on_upstream_changes'} ||= 0;
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Source/Package/V2.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Source/Package/V2.pm
--- dpkg/scripts/Dpkg/Source/Package/V2.pm	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Source/Package/V2.pm	2012-06-07 10:11:09.426073000 -0700
@@ -1,4 +1,4 @@
-# Copyright © 2008 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2008-2011 Raphaël Hertzog <hertzog@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,6 +30,9 @@
 use Dpkg::Source::Patch;
 use Dpkg::Exit;
 use Dpkg::Source::Functions qw(erasedir is_binary fs_time);
+use Dpkg::Vendor qw(run_vendor_hook);
+use Dpkg::Control;
+use Dpkg::Changelog::Parse;
 
 use POSIX;
 use File::Basename;
@@ -37,6 +40,7 @@
 use File::Path;
 use File::Spec;
 use File::Find;
+use File::Copy;
 
 our $CURRENT_MINOR_VERSION = "0";
 
@@ -59,8 +63,8 @@
         unless exists $self->{'options'}{'skip_debianization'};
     $self->{'options'}{'create_empty_orig'} = 0
         unless exists $self->{'options'}{'create_empty_orig'};
-    $self->{'options'}{'abort_on_upstream_changes'} = 0
-        unless exists $self->{'options'}{'abort_on_upstream_changes'};
+    $self->{'options'}{'auto_commit'} = 0
+        unless exists $self->{'options'}{'auto_commit'};
 }
 
 sub parse_cmdline_option {
@@ -90,7 +94,10 @@
         $self->{'options'}{'create_empty_orig'} = 1;
         return 1;
     } elsif ($opt =~ /^--abort-on-upstream-changes$/) {
-        $self->{'options'}{'abort_on_upstream_changes'} = 1;
+        $self->{'options'}{'auto_commit'} = 0;
+        return 1;
+    } elsif ($opt =~ /^--auto-commit$/) {
+        $self->{'options'}{'auto_commit'} = 1;
         return 1;
     }
     return 0;
@@ -208,6 +215,7 @@
     return unless scalar(@patches);
     my $applied = File::Spec->catfile($dir, "debian", "patches", ".dpkg-source-applied");
     open(APPLIED, '>', $applied) || syserr(_g("cannot write %s"), $applied);
+    print APPLIED "# During $opts{'usage'}\n";
     my $timestamp = fs_time($applied);
     foreach my $patch ($self->get_patches($dir, %opts)) {
         my $path = File::Spec->catfile($dir, "debian", "patches", $patch);
@@ -238,12 +246,22 @@
     unlink($applied);
 }
 
+sub upstream_tarball_template {
+    my ($self) = @_;
+    my $ext = "{" . join(",",
+        sort map {
+            compression_get_property($_, "file_ext")
+        } compression_get_list()) . "}";
+    return "../" . $self->get_basename() . ".orig.tar.$ext";
+}
+
 sub can_build {
     my ($self, $dir) = @_;
     return 1 if $self->find_original_tarballs(include_supplementary => 0);
     return 1 if $self->{'options'}{'create_empty_orig'} and
                 $self->find_original_tarballs(include_main => 0);
-    return (0, _g("no orig.tar file found"));
+    return (0, sprintf(_g("no upstream tarball found at %s"),
+                       $self->upstream_tarball_template()));
 }
 
 sub before_build {
@@ -253,13 +271,24 @@
 
 sub after_build {
     my ($self, $dir) = @_;
-    $self->unapply_patches($dir) if $self->{'options'}{'unapply_patches'};
+    my $applied = File::Spec->catfile($dir, "debian", "patches", ".dpkg-source-applied");
+    my $reason = "";
+    if (-e $applied) {
+        open(APPLIED, "<", $applied) || syserr(_g("cannot read %s"), $applied);
+        $reason = <APPLIED>;
+        close(APPLIED);
+    }
+    if ($reason =~ /^# During preparation/ or
+        $self->{'options'}{'unapply_patches'}) {
+        $self->unapply_patches($dir);
+    }
 }
 
 sub prepare_build {
     my ($self, $dir) = @_;
     $self->{'diff_options'} = {
-        diff_ignore_regexp => $self->{'options'}{'diff_ignore_regexp'},
+        diff_ignore_regexp => $self->{'options'}{'diff_ignore_regexp'} .
+                              '|(^|/)debian/patches/.dpkg-source-applied$',
         include_removal => $self->{'options'}{'include_removal'},
         include_timestamp => $self->{'options'}{'include_timestamp'},
         use_dev_null => 1,
@@ -282,28 +311,15 @@
     my ($self, $dir) = @_;
     my $applied = File::Spec->catfile($dir, "debian", "patches", ".dpkg-source-applied");
     unless (-e $applied) {
-        warning(_g("patches have not been applied, applying them now (use --no-preparation to override)"));
+        info(_g("patches are not applied, applying them now"));
         $self->apply_patches($dir, usage => 'preparation');
     }
 }
 
-sub do_build {
-    my ($self, $dir) = @_;
+sub generate_patch {
+    my ($self, $dir, %opts) = @_;
     my ($dirname, $updir) = fileparse($dir);
-    my @argv = @{$self->{'options'}{'ARGV'}};
-    if (scalar(@argv)) {
-        usageerr(_g("-b takes only one parameter with format `%s'"),
-                 $self->{'fields'}{'Format'});
-    }
-    $self->prepare_build($dir);
-
-    my $include_binaries = $self->{'options'}{'include_binaries'};
-    my @tar_ignore = map { "--exclude=$_" } @{$self->{'options'}{'tar_ignore'}};
-
-    my $sourcepackage = $self->{'fields'}{'Source'};
-    my $basenamerev = $self->get_basename(1);
-    my $basename = $self->get_basename();
-    my $basedirname = $basename;
+    my $basedirname = $self->get_basename();
     $basedirname =~ s/_/-/;
 
     # Identify original tarballs
@@ -325,10 +341,13 @@
         }
     }
 
-    error(_g("no orig.tar file found")) unless $tarfile;
+    error(_g("no upstream tarball found at %s"),
+          $self->upstream_tarball_template()) unless $tarfile;
 
-    info(_g("building %s using existing %s"),
-	 $sourcepackage, "@origtarballs");
+    if ($opts{'usage'} eq "build") {
+        info(_g("building %s using existing %s"),
+             $self->{'fields'}{'Source'}, "@origtarballs");
+    }
 
     # Unpack a second copy for comparison
     my $tmp = tempdir("$dirname.orig.XXXXXX", DIR => $updir);
@@ -351,7 +370,53 @@
     subprocerr(_g("copy of the debian directory")) if $?;
 
     # Apply all patches except the last automatic one
-    $self->apply_patches($tmp, skip_auto => 1, usage => 'build');
+    $opts{'skip_auto'} //= 0;
+    $self->apply_patches($tmp, skip_auto => $opts{'skip_auto'}, usage => 'build');
+
+    # Create a patch
+    my ($difffh, $tmpdiff) = tempfile($self->get_basename(1) . ".diff.XXXXXX",
+                                      DIR => File::Spec->tmpdir(), UNLINK => 0);
+    push @Dpkg::Exit::handlers, sub { unlink($tmpdiff) };
+    my $diff = Dpkg::Source::Patch->new(filename => $tmpdiff,
+                                        compression => "none");
+    $diff->create();
+    $diff->set_header($self->get_patch_header($dir));
+    $diff->add_diff_directory($tmp, $dir, basedirname => $basedirname,
+            %{$self->{'diff_options'}},
+            handle_binary_func => $opts{'handle_binary'},
+            order_from => $opts{'order_from'});
+    error(_g("unrepresentable changes to source")) if not $diff->finish();
+
+    if (-s $tmpdiff) {
+        info(_g("local changes detected, the modified files are:"));
+        my $analysis = $diff->analyze($dir, verbose => 0);
+        foreach my $fn (sort keys %{$analysis->{'filepatched'}}) {
+            print " $fn\n";
+        }
+    }
+
+    # Remove the temporary directory
+    erasedir($tmp);
+    pop @Dpkg::Exit::handlers;
+    pop @Dpkg::Exit::handlers;
+
+    return $tmpdiff;
+}
+
+sub do_build {
+    my ($self, $dir) = @_;
+    my @argv = @{$self->{'options'}{'ARGV'}};
+    if (scalar(@argv)) {
+        usageerr(_g("-b takes only one parameter with format `%s'"),
+                 $self->{'fields'}{'Format'});
+    }
+    $self->prepare_build($dir);
+
+    my $include_binaries = $self->{'options'}{'include_binaries'};
+    my @tar_ignore = map { "--exclude=$_" } @{$self->{'options'}{'tar_ignore'}};
+
+    my $sourcepackage = $self->{'fields'}{'Source'};
+    my $basenamerev = $self->get_basename(1);
 
     # Prepare handling of binary files
     my %auth_bin_files;
@@ -406,9 +471,15 @@
         # tarball due to ignores.
         my %exclude;
         my $reldir = File::Spec->abs2rel($File::Find::dir, $dir);
-        foreach my $fn (glob($tar_ignore_glob)) {
-            $exclude{$fn} = 1;
-        }
+        my $cwd = getcwd();
+        # Apply the pattern both from the top dir and from the inspected dir
+        chdir($dir) || syserr(_g("unable to chdir to `%s'"), $dir);
+        $exclude{$_} = 1 foreach glob($tar_ignore_glob);
+        chdir($cwd) || syserr(_g("unable to chdir to `%s'"), $cwd);
+        chdir($File::Find::dir) ||
+            syserr(_g("unable to chdir to `%s'"), $File::Find::dir);
+        $exclude{$_} = 1 foreach glob($tar_ignore_glob);
+        chdir($cwd) || syserr(_g("unable to chdir to `%s'"), $cwd);
         my @result;
         foreach my $fn (@_) {
             unless (exists $exclude{$fn} or exists $exclude{"$reldir/$fn"}) {
@@ -429,46 +500,28 @@
     # Create a patch
     my $autopatch = File::Spec->catfile($dir, "debian", "patches",
                                         $self->get_autopatch_name());
-    my ($difffh, $tmpdiff) = tempfile("$basenamerev.diff.XXXXXX",
-                                      DIR => $updir, UNLINK => 0);
-    push @Dpkg::Exit::handlers, sub { unlink($tmpdiff) };
-    my $diff = Dpkg::Source::Patch->new(filename => $tmpdiff,
-                                        compression => "none");
-    $diff->create();
-    $diff->set_header($self->get_patch_header($dir, $autopatch));
-    $diff->add_diff_directory($tmp, $dir, basedirname => $basedirname,
-            %{$self->{'diff_options'}}, handle_binary_func => $handle_binary,
-            order_from => $autopatch);
-    error(_g("unrepresentable changes to source")) if not $diff->finish();
-    # The previous auto-patch must be removed, it has not been used and it
-    # will be recreated if it's still needed
-    if (-e $autopatch) {
-        unlink($autopatch) || syserr(_g("cannot remove %s"), $autopatch);
+    my $tmpdiff = $self->generate_patch($dir, order_from => $autopatch,
+                                        handle_binary => $handle_binary,
+                                        skip_auto => $self->{'options'}{'auto_commit'},
+                                        usage => 'build');
+    unless (-z $tmpdiff or $self->{'options'}{'auto_commit'}) {
+        info(_g("you can integrate the local changes with %s"),
+             "dpkg-source --commit");
+        error(_g("aborting due to unexpected upstream changes, see %s"),
+              $tmpdiff);
     }
+    push @Dpkg::Exit::handlers, sub { unlink($tmpdiff) };
+
     # Install the diff as the new autopatch
-    if (not -s $tmpdiff) {
-        unlink($tmpdiff) || syserr(_g("cannot remove %s"), $tmpdiff);
-    } else {
+    if ($self->{'options'}{'auto_commit'}) {
         mkpath(File::Spec->catdir($dir, "debian", "patches"));
-        info(_g("local changes stored in %s, the modified files are:"), $autopatch);
-        my $analysis = $diff->analyze($dir, verbose => 0);
-        foreach my $fn (sort keys %{$analysis->{'filepatched'}}) {
-            print " $fn\n";
-        }
-        rename($tmpdiff, $autopatch) ||
-                syserr(_g("cannot rename %s to %s"), $tmpdiff, $autopatch);
-        chmod(0666 & ~ umask(), $autopatch) ||
-                syserr(_g("unable to change permission of `%s'"), $autopatch);
-    }
-    $self->register_autopatch($dir);
-    if (-e $autopatch and $self->{'options'}{'abort_on_upstream_changes'}) {
-        error(_g("aborting due to --abort-on-upstream-changes"));
+        $autopatch = $self->register_patch($dir, $tmpdiff,
+                                           $self->get_autopatch_name());
+        info(_g("local changes have been recorded in a new patch: %s"),
+             $autopatch) if -e $autopatch;
+        rmdir(File::Spec->catdir($dir, "debian", "patches")); # No check on purpose
     }
-    rmdir(File::Spec->catdir($dir, "debian", "patches")); # No check on purpose
-    pop @Dpkg::Exit::handlers;
-
-    # Remove the temporary directory
-    erasedir($tmp);
+    unlink($tmpdiff) || syserr(_g("cannot remove %s"), $tmpdiff);
     pop @Dpkg::Exit::handlers;
 
     # Update debian/source/include-binaries if needed
@@ -486,7 +539,7 @@
     # Create the debian.tar
     my $debianfile = "$basenamerev.debian.tar." . $self->{'options'}{'comp_ext'};
     info(_g("building %s in %s"), $sourcepackage, $debianfile);
-    $tar = Dpkg::Source::Archive->new(filename => $debianfile);
+    my $tar = Dpkg::Source::Archive->new(filename => $debianfile);
     $tar->create(options => \@tar_ignore, 'chdir' => $dir);
     $tar->add_directory("debian");
     foreach my $binary (@binary_files) {
@@ -498,8 +551,11 @@
 }
 
 sub get_patch_header {
-    my ($self, $dir, $previous) = @_;
-    my $ph = File::Spec->catfile($dir, "debian", "source", "patch-header");
+    my ($self, $dir) = @_;
+    my $ph = File::Spec->catfile($dir, "debian", "source", "local-patch-header");
+    unless (-f $ph) {
+        $ph = File::Spec->catfile($dir, "debian", "source", "patch-header");
+    }
     my $text;
     if (-f $ph) {
         open(PH, "<", $ph) || syserr(_g("cannot read %s"), $ph);
@@ -507,22 +563,94 @@
         close(PH);
         return $text;
     }
-    return "Description: Undocumented upstream changes
- This patch has been created by dpkg-source during the package build
- but it might have accumulated changes from several uploads. Please
- check the changelog to (hopefully) learn more on those changes.\n\n";
+    my $ch_info = changelog_parse(offset => 0, count => 1,
+        file => File::Spec->catfile($dir, "debian", "changelog"));
+    return '' if not defined $ch_info;
+    my $header = Dpkg::Control->new(type => CTRL_UNKNOWN);
+    $header->{'Description'} = "<short summary of the patch>\n";
+    $header->{'Description'} .=
+"TODO: Put a short summary on the line above and replace this paragraph
+with a longer explanation of this change. Complete the meta-information
+with other relevant fields (see below for details). To make it easier, the
+information below has been extracted from the changelog. Adjust it or drop
+it.\n";
+    $header->{'Description'} .= $ch_info->{'Changes'} . "\n";
+    $header->{'Author'} = $ch_info->{'Maintainer'};
+    $text = "$header";
+    run_vendor_hook("extend-patch-header", \$text, $ch_info);
+    $text .= "\n---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>\n\n";
+    return $text;
+}
+
+sub register_patch {
+    my ($self, $dir, $patch_file, $patch_name) = @_;
+    my $patch = File::Spec->catfile($dir, "debian", "patches", $patch_name);
+    if (-s $patch_file) {
+        copy($patch_file, $patch) ||
+            syserr(_g("failed to copy %s to %s"), $patch_file, $patch);
+        chmod(0666 & ~ umask(), $patch) ||
+                syserr(_g("unable to change permission of `%s'"), $patch);
+        my $applied = File::Spec->catfile($dir, "debian", "patches", ".dpkg-source-applied");
+        open(APPLIED, '>>', $applied) || syserr(_g("cannot write %s"), $applied);
+        print APPLIED "$patch\n";
+        close(APPLIED) || syserr(_g("cannot close %s"), $applied);
+    } elsif (-e $patch) {
+        unlink($patch) || syserr(_g("cannot remove %s"), $patch);
+    }
+    return $patch;
 }
 
-sub register_autopatch {
+sub commit {
     my ($self, $dir) = @_;
-    my $autopatch = File::Spec->catfile($dir, "debian", "patches",
-                                        $self->get_autopatch_name());
-    if (-e $autopatch) {
-        my $applied = File::Spec->catfile($dir, "debian", "patches", ".dpkg-source-applied");
-        open(APPLIED, '>>', $applied) || syserr(_g("cannot write %s"), $applied);
-        print APPLIED ($self->get_autopatch_name() . "\n");
-        close(APPLIED);
+    my ($patch_name, $tmpdiff) = @{$self->{'options'}{'ARGV'}};
+
+    sub bad_patch_name {
+        my ($dir, $patch_name) = @_;
+        return 1 if not defined($patch_name);
+        return 1 if not length($patch_name);
+        my $patch = File::Spec->catfile($dir, "debian", "patches", $patch_name);
+        if (-e $patch) {
+            warning(_g("cannot register changes in %s, this patch already exists"), $patch);
+            return 1;
+        }
+        return 0;
+    }
+
+    $self->prepare_build($dir);
+
+    unless ($tmpdiff && -e $tmpdiff) {
+        $tmpdiff = $self->generate_patch($dir, usage => "commit");
+    }
+    push @Dpkg::Exit::handlers, sub { unlink($tmpdiff) };
+    unless (-s $tmpdiff) {
+        unlink($tmpdiff) || syserr(_g("cannot remove %s"), $tmpdiff);
+        info(_g("there are no local changes to record"));
+        return;
     }
+    while (bad_patch_name($dir, $patch_name)) {
+        # Ask the patch name interactively
+        print STDOUT _g("Enter the desired patch name: ");
+        chomp($patch_name = <STDIN>);
+        $patch_name =~ s/\s+/-/g;
+        $patch_name =~ s/\///g;
+    }
+    mkpath(File::Spec->catdir($dir, "debian", "patches"));
+    my $patch = $self->register_patch($dir, $tmpdiff, $patch_name);
+    system("sensible-editor", $patch);
+    unlink($tmpdiff) || syserr(_g("cannot remove %s"), $tmpdiff);
+    pop @Dpkg::Exit::handlers;
+    info(_g("local changes have been recorded in a new patch: %s"), $patch);
 }
 
 # vim:et:sw=4:ts=8
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Source/Package/V3/native.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Source/Package/V3/native.pm
--- dpkg/scripts/Dpkg/Source/Package/V3/native.pm	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Source/Package/V3/native.pm	2012-06-07 10:11:09.426073000 -0700
@@ -26,6 +26,7 @@
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
 use Dpkg::Compression;
+use Dpkg::Exit;
 use Dpkg::Source::Archive;
 use Dpkg::Source::Functions qw(erasedir);
 
@@ -84,6 +85,7 @@
 
     my ($ntfh, $newtar) = tempfile("$tarname.new.XXXXXX",
                                    DIR => getcwd(), UNLINK => 0);
+    push @Dpkg::Exit::handlers, sub { unlink($newtar) };
 
     my ($dirname, $dirbase) = fileparse($dir);
     my $tar = Dpkg::Source::Archive->new(filename => $newtar,
@@ -95,6 +97,7 @@
     rename($newtar, $tarname) ||
         syserr(_g("unable to rename `%s' (newly created) to `%s'"),
                $newtar, $tarname);
+    pop @Dpkg::Exit::handlers;
     chmod(0666 &~ umask(), $tarname) ||
         syserr(_g("unable to change permission of `%s'"), $tarname);
 
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Source/Package/V3/quilt.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Source/Package/V3/quilt.pm
--- dpkg/scripts/Dpkg/Source/Package/V3/quilt.pm	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Source/Package/V3/quilt.pm	2012-06-07 10:11:09.426073000 -0700
@@ -1,4 +1,4 @@
-# Copyright © 2008-2009 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2008-2011 Raphaël Hertzog <hertzog@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,14 +29,13 @@
 use Dpkg::Source::Patch;
 use Dpkg::Source::Functions qw(erasedir fs_time);
 use Dpkg::IPC;
-use Dpkg::Vendor qw(get_current_vendor run_vendor_hook);
-use Dpkg::Control;
-use Dpkg::Changelog::Parse;
+use Dpkg::Vendor qw(get_current_vendor);
 
 use POSIX;
 use File::Basename;
 use File::Spec;
 use File::Path;
+use File::Copy;
 
 our $CURRENT_MINOR_VERSION = "0";
 
@@ -55,6 +54,8 @@
     return 1 if $self->SUPER::parse_cmdline_option($opt);
     if ($opt =~ /^--single-debian-patch$/) {
         $self->{'options'}{'single-debian-patch'} = 1;
+        # For backwards compatibility.
+        $self->{'options'}{'auto_commit'} = 1;
         return 1;
     } elsif ($opt =~ /^--allow-version-of-quilt-db=(.*)$/) {
         push @{$self->{'options'}{'allow-version-of-quilt-db'}}, $1;
@@ -217,6 +218,15 @@
     }
     return unless scalar(@$patches);
 
+    if ($opts{'usage'} eq "preparation") {
+        # We're applying the patches in --before-build, remember to unapply
+        # them afterwards in --after-build
+        my $pc_unapply = File::Spec->catfile($dir, ".pc", ".dpkg-source-unapply");
+        open(UNAPPLY, ">", $pc_unapply) ||
+            syserr(_g("cannot write %s"), $pc_unapply);
+        close(UNAPPLY);
+    }
+
     # Apply patches
     my $pc_applied = File::Spec->catfile($dir, ".pc", "applied-patches");
     my @applied = $self->read_patch_list($pc_applied);
@@ -292,6 +302,15 @@
     $self->SUPER::do_build($dir);
 }
 
+sub after_build {
+    my ($self, $dir) = @_;
+    my $pc_unapply = File::Spec->catfile($dir, ".pc", ".dpkg-source-unapply");
+    if (-e $pc_unapply or $self->{'options'}{'unapply_patches'}) {
+        unlink($pc_unapply);
+        $self->unapply_patches($dir);
+    }
+}
+
 sub check_patches_applied {
     my ($self, $dir) = @_;
     my $pc_applied = File::Spec->catfile($dir, ".pc", "applied-patches");
@@ -307,16 +326,15 @@
                                               $to_apply[0]);
         my $patch_obj = Dpkg::Source::Patch->new(filename => $first_patch);
         if ($patch_obj->check_apply($dir)) {
-            warning(_g("patches have not been applied, applying them now " .
-                       "(use --no-preparation to override)"));
+            info(_g("patches are not applied, applying them now"));
             $self->apply_patches($dir, usage => 'preparation', verbose => 1,
                                  patches => \@to_apply);
         }
     }
 }
 
-sub register_autopatch {
-    my ($self, $dir) = @_;
+sub register_patch {
+    my ($self, $dir, $tmpdiff, $patch_name) = @_;
 
     sub add_line {
         my ($file, $line) = @_;
@@ -335,81 +353,47 @@
         close(FILE);
     }
 
-    my $auto_patch = $self->get_autopatch_name();
     my @patches = $self->get_patches($dir);
-    my $has_patch = (grep { $_ eq $auto_patch } @patches) ? 1 : 0;
+    my $has_patch = (grep { $_ eq $patch_name } @patches) ? 1 : 0;
     my $series = $self->get_series_file($dir);
     $series ||= File::Spec->catfile($dir, "debian", "patches", "series");
     my $applied = File::Spec->catfile($dir, ".pc", "applied-patches");
-    my $patch = File::Spec->catfile($dir, "debian", "patches", $auto_patch);
+    my $patch = File::Spec->catfile($dir, "debian", "patches", $patch_name);
+
+    if (-s $tmpdiff) {
+        copy($tmpdiff, $patch) ||
+            syserr(_g("failed to copy %s to %s"), $tmpdiff, $patch);
+        chmod(0666 & ~ umask(), $patch) ||
+            syserr(_g("unable to change permission of `%s'"), $patch);
+    } elsif (-e $patch) {
+        unlink($patch) || syserr(_g("cannot remove %s"), $patch);
+    }
 
     if (-e $patch) {
         $self->create_quilt_db($dir);
-        # Add auto_patch to series file
+        # Add patch to series file
         if (not $has_patch) {
-            add_line($series, $auto_patch);
-            add_line($applied, $auto_patch);
+            add_line($series, $patch_name);
+            add_line($applied, $patch_name);
         }
         # Ensure quilt meta-data are created and in sync with some trickery:
         # reverse-apply the patch, drop .pc/$patch, re-apply it
         # with the correct options to recreate the backup files
         my $patch_obj = Dpkg::Source::Patch->new(filename => $patch);
         $patch_obj->apply($dir, add_options => ['-R', '-E'], verbose => 0);
-        erasedir(File::Spec->catdir($dir, ".pc", $auto_patch));
-        $self->apply_quilt_patch($dir, $auto_patch);
+        erasedir(File::Spec->catdir($dir, ".pc", $patch_name));
+        $self->apply_quilt_patch($dir, $patch_name);
     } else {
         # Remove auto_patch from series
         if ($has_patch) {
-            drop_line($series, $auto_patch);
-            drop_line($applied, $auto_patch);
-            erasedir(File::Spec->catdir($dir, ".pc", $auto_patch));
+            drop_line($series, $patch_name);
+            drop_line($applied, $patch_name);
+            erasedir(File::Spec->catdir($dir, ".pc", $patch_name));
         }
         # Clean up empty series
-        unlink($series) if not -s $series;
+        unlink($series) if -z $series;
     }
-}
-
-sub get_patch_header {
-    my ($self, $dir, $previous) = @_;
-    my $ph = File::Spec->catfile($dir, "debian", "source", "patch-header");
-    my $text;
-    if (-f $ph) {
-        open(PH, "<", $ph) || syserr(_g("cannot read %s"), $ph);
-        $text = join("", <PH>);
-        close(PH);
-        return $text;
-    }
-    my $ch_info = changelog_parse(offset => 0, count => 1,
-        file => File::Spec->catfile($dir, "debian", "changelog"));
-    return '' if not defined $ch_info;
-    return $self->SUPER::get_patch_header($dir, $previous)
-        if $self->{'options'}{'single-debian-patch'};
-    my $header = Dpkg::Control->new(type => CTRL_UNKNOWN);
-    $header->{'Description'} = "Upstream changes introduced in version " .
-                               $ch_info->{'Version'} . "\n";
-    $header->{'Description'} .=
-"This patch has been created by dpkg-source during the package build.
-Here's the last changelog entry, hopefully it gives details on why
-those changes were made:\n";
-    $header->{'Description'} .= $ch_info->{'Changes'} . "\n";
-    $header->{'Description'} .=
-"\nThe person named in the Author field signed this changelog entry.\n";
-    $header->{'Author'} = $ch_info->{'Maintainer'};
-    $text = "$header";
-    run_vendor_hook("extend-patch-header", \$text, $ch_info);
-    $text .= "\n---
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>\n\n";
-    return $text;
+    return $patch;
 }
 
 # vim:et:sw=4:ts=8
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Source/Package.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Source/Package.pm
--- dpkg/scripts/Dpkg/Source/Package.pm	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Source/Package.pm	2012-06-07 10:11:09.426073000 -0700
@@ -1,4 +1,4 @@
-# Copyright © 2008 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2008-2011 Raphaël Hertzog <hertzog@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,10 +15,27 @@
 
 package Dpkg::Source::Package;
 
+=encoding utf8
+
+=head1 NAME
+
+Dpkg::Source::Package - manipulate Debian source packages
+
+=head1 DESCRIPTION
+
+This module provides an object that can manipulate Debian source
+packages. While it supports both the extraction and the creation
+of source packages, the only API that is officially supported
+is the one that supports the extraction of the source package.
+
+=head1 FUNCTIONS
+
+=cut
+
 use strict;
 use warnings;
 
-our $VERSION = "0.01";
+our $VERSION = "1.0";
 
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
@@ -44,8 +61,6 @@
 (?:^|/)\..*\.sw.$|
 # Ignore baz-style junk files or directories
 (?:^|/),,.*(?:$|/.*$)|
-# local-options must not be exported in the resulting source package
-(?:^|/)debian/source/local-options$|
 # File-names that should be ignored (never directories)
 (?:^|/)(?:DEADJOE|\.arch-inventory|\.(?:bzr|cvs|hg|git)ignore)$|
 # File or directory names that should be ignored
@@ -93,6 +108,41 @@
 {arch}
 );
 
+=over 4
+
+=item $p = Dpkg::Source::Package->new(filename => $dscfile, options => {})
+
+Creates a new object corresponding to the source package described
+by the file $dscfile.
+
+The options hash supports the following options:
+
+=over 8
+
+=item skip_debianization
+
+If set to 1, do not apply Debian changes on the extracted source package.
+
+=item skip_patches
+
+If set to 1, do not apply Debian-specific patches. This options is
+specific for source packages using format "2.0" and "3.0 (quilt)".
+
+=item require_valid_signature
+
+If set to 1, the check_signature() method will be stricter and will error
+out if the signature can't be verified.
+
+=item copy_orig_tarballs
+
+If set to 1, the extraction will copy the upstream tarballs next the
+target directory. This is useful if you want to be able to rebuild the
+source package after its extraction.
+
+=back
+
+=cut
+
 # Object methods
 sub new {
     my ($this, %args) = @_;
@@ -118,13 +168,15 @@
     # Use full ignore list by default
     # note: this function is not called by V1 packages
     $self->{'options'}{'diff_ignore_regexp'} ||= $diff_ignore_default_regexp;
+    $self->{'options'}{'diff_ignore_regexp'} .= '|(?:^|/)debian/source/local-.*$';
     if (defined $self->{'options'}{'tar_ignore'}) {
         $self->{'options'}{'tar_ignore'} = [ @tar_ignore_default_pattern ]
             unless @{$self->{'options'}{'tar_ignore'}};
     } else {
         $self->{'options'}{'tar_ignore'} = [ @tar_ignore_default_pattern ];
     }
-    push @{$self->{'options'}{'tar_ignore'}}, "debian/source/local-options";
+    push @{$self->{'options'}{'tar_ignore'}}, "debian/source/local-options",
+         "debian/source/local-patch-header";
     # Skip debianization while specific to some formats has an impact
     # on code common to all formats
     $self->{'options'}{'skip_debianization'} ||= 0;
@@ -189,16 +241,37 @@
     }
 }
 
+=item $p->get_filename()
+
+Returns the filename of the DSC file.
+
+=cut
+
 sub get_filename {
     my ($self) = @_;
     return $self->{'basedir'} . $self->{'filename'};
 }
 
+=item $p->get_files()
+
+Returns the list of files referenced by the source package. The filenames
+usually do not have any path information.
+
+=cut
+
 sub get_files {
     my ($self) = @_;
     return $self->{'checksums'}->get_files();
 }
 
+=item $p->check_checksums()
+
+Verify the checksums embedded in the DSC file. It requires the presence of
+the other files constituting the source package. If any inconsistency is
+discovered, it immediately errors out.
+
+=cut
+
 sub check_checksums {
     my ($self) = @_;
     my $checksums = $self->{'checksums'};
@@ -243,11 +316,28 @@
     return @tar;
 }
 
+=item $bool = $p->is_signed()
+
+Returns 1 if the DSC files contains an embedded OpenPGP signature.
+Otherwise returns 0.
+
+=cut
+
 sub is_signed {
     my $self = shift;
     return $self->{'is_signed'};
 }
 
+=item $p->check_signature()
+
+Implement the same OpenPGP signature check that dpkg-source does.
+In case of problems, it prints a warning or errors out.
+
+If the object has been created with the "require_valid_signature" option,
+then any problem will result in a fatal error.
+
+=cut
+
 sub check_signature {
     my ($self) = @_;
     my $dsc = $self->get_filename();
@@ -307,6 +397,13 @@
     return 0;
 }
 
+=item $p->extract($targetdir)
+
+Extracts the source package in the target directory $targetdir. Beware
+that if $targetdir already exists, it will be erased.
+
+=cut
+
 sub extract {
     my $self = shift;
     my $newdirectory = $_[0];
@@ -415,6 +512,12 @@
 					    use_files_for_md5 => 1);
 }
 
+sub commit {
+    my ($self, $dir) = @_;
+    info(_g("'%s' is not supported by the source format '%s'"),
+         "dpkg-source --commit", $self->{'fields'}{'Format'});
+}
+
 sub write_dsc {
     my ($self, %opts) = @_;
     my $fields = $self->{'fields'};
@@ -450,5 +553,13 @@
     close(DSC);
 }
 
+=back
+
+=head1 AUTHOR
+
+Raphaël Hertzog, E<lt>hertzog@debian.orgE<gt>
+
+=cut
+
 # vim: set et sw=4 ts=8
 1;
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Vendor/Debian.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Vendor/Debian.pm
--- dpkg/scripts/Dpkg/Vendor/Debian.pm	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Vendor/Debian.pm	2012-06-07 10:11:09.426073000 -0700
@@ -1,4 +1,8 @@
-# Copyright © 2009 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2009-2011 Raphaël Hertzog <hertzog@debian.org>
+#
+# Hardening build flags handling derived from work of:
+# Copyright © 2009-2011 Kees Cook <kees@debian.org>
+# Copyright © 2007-2008 Canonical, Ltd.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,8 +25,13 @@
 our $VERSION = "0.01";
 
 use base qw(Dpkg::Vendor::Default);
+
+use Dpkg::Gettext;
+use Dpkg::ErrorHandling;
 use Dpkg::Control::Types;
 use Dpkg::Vendor::Ubuntu;
+use Dpkg::BuildOptions;
+use Dpkg::Arch qw(get_host_arch debarch_to_debtriplet);
 
 =encoding utf8
 
@@ -62,9 +71,88 @@
 	foreach my $bug (@$b) {
 	    $$textref .= "Bug-Ubuntu: https://bugs.launchpad.net/bugs/$bug\n";
 	}
+    } elsif ($hook eq "update-buildflags") {
+	$self->add_hardening_flags(@params);
     } else {
         return $self->SUPER::run_hook($hook, @params);
     }
 }
 
+sub add_hardening_flags {
+    my ($self, $flags) = @_;
+    my $arch = get_host_arch();
+    my ($abi, $os, $cpu) = debarch_to_debtriplet($arch);
+
+    # Decide what's enabled
+    my %use_feature = (
+	"pie" => 0,
+	"stackprotector" => 1,
+	"fortify" => 1,
+	"format" => 1,
+	"relro" => 1,
+	"bindnow" => 0
+    );
+    my $opts = Dpkg::BuildOptions->new(envvar => "DEB_BUILD_MAINT_OPTIONS");
+    foreach my $feature (split(",", $opts->get("hardening") // "")) {
+	$feature = lc($feature);
+	if ($feature =~ s/^([+-])//) {
+	    my $value = ($1 eq "+") ? 1 : 0;
+	    if ($feature eq "all") {
+		$use_feature{$_} = $value foreach keys %use_feature;
+	    } else {
+		if (exists $use_feature{$feature}) {
+		    $use_feature{$feature} = $value;
+		} else {
+		    warning(_g("unknown hardening feature: %s"), $feature);
+		}
+	    }
+	} else {
+	    warning(_g("incorrect value in hardening option of " .
+	               "DEB_BUILD_MAINT_OPTIONS: %s"), $feature);
+	}
+    }
+
+    # PIE
+    if ($use_feature{"pie"} and
+	$os =~ /^(linux|knetbsd|hurd)$/ and
+	$cpu !~ /^(hppa|m68k|mips|mipsel|avr32)$/) {
+	# Only on linux/knetbsd/hurd (see #430455 and #586215)
+	# Disabled on hppa, m68k (#451192), mips/mipsel (#532821), avr32
+	# (#574716)
+	$flags->append("CFLAGS", "-fPIE");
+	$flags->append("CXXFLAGS", "-fPIE");
+	$flags->append("LDFLAGS", "-fPIE -pie");
+    }
+    # Stack protector
+    if ($use_feature{"stackprotector"} and
+	$cpu !~ /^(ia64|alpha|mips|mipsel|hppa)$/ and $arch ne "arm") {
+	# Stack protector disabled on ia64, alpha, mips, mipsel, hppa.
+	#   "warning: -fstack-protector not supported for this target"
+	# Stack protector disabled on arm (ok on armel).
+	#   compiler supports it incorrectly (leads to SEGV)
+	$flags->append("CFLAGS", "-fstack-protector --param=ssp-buffer-size=4");
+	$flags->append("CXXFLAGS", "-fstack-protector --param=ssp-buffer-size=4");
+    }
+    # Fortify
+    if ($use_feature{"fortify"}) {
+	$flags->append("CPPFLAGS", "-D_FORTIFY_SOURCE=2");
+    }
+    # Format
+    if ($use_feature{"format"}) {
+	$flags->append("CFLAGS", "-Wformat -Wformat-security -Werror=format-security");
+	$flags->append("CXXFLAGS", "-Wformat -Wformat-security -Werror=format-security");
+    }
+    # Relro
+    if ($use_feature{"relro"} and $cpu !~ /^(ia64|hppa|avr32)$/) {
+	$flags->append("LDFLAGS", "-Wl,-z,relro");
+    } else {
+	# Disable full relro if relro is not enabled.
+	$use_feature{"bindnow"} = 0;
+    }
+    # Bindnow
+    if ($use_feature{"bindnow"}) {
+	$flags->append("LDFLAGS", "-Wl,-z,now");
+    }
+}
+
 1;
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Vendor/Ubuntu.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Vendor/Ubuntu.pm
--- dpkg/scripts/Dpkg/Vendor/Ubuntu.pm	2011-03-09 14:40:51.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Vendor/Ubuntu.pm	2012-06-07 10:11:09.426073000 -0700
@@ -94,6 +94,7 @@
 
     } elsif ($hook eq "update-buildflags") {
 	my $flags = shift @params;
+
 	if (debarch_eq(get_host_arch(), 'ppc64')) {
 	    for my $flag (qw(CFLAGS CXXFLAGS FFLAGS)) {
 		$flags->set($flag, '-g -O3', 'vendor');
@@ -102,6 +103,9 @@
 	# Per https://wiki.ubuntu.com/DistCompilerFlags
 	$flags->set('LDFLAGS', '-Wl,-Bsymbolic-functions', 'vendor');
 
+	# Run the Debian hook to add hardening flags
+	$self->SUPER::run_hook($hook, $flags);
+
 	# Allow control of hardening-wrapper via dpkg-buildpackage DEB_BUILD_OPTIONS
 	my $build_opts = Dpkg::BuildOptions->new();
 	my $hardening;
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Dpkg/Vendor.pm /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Vendor.pm
--- dpkg/scripts/Dpkg/Vendor.pm	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Dpkg/Vendor.pm	2012-06-07 10:11:09.426073000 -0700
@@ -18,7 +18,7 @@
 use strict;
 use warnings;
 
-our $VERSION = "0.01";
+our $VERSION = "1.00";
 
 use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/dpkg-buildflags.pl /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-buildflags.pl
--- dpkg/scripts/dpkg-buildflags.pl	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-buildflags.pl	2012-06-07 10:11:09.426073000 -0700
@@ -2,7 +2,7 @@
 #
 # dpkg-buildflags
 #
-# Copyright © 2010 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2010-2011 Raphaël Hertzog <hertzog@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
     printf _g("Debian %s version %s.\n"), $progname, $version;
 
     printf _g("
-Copyright (C) 2010 Raphael Hertzog <hertzog\@debian.org>.");
+Copyright (C) 2010-2011 Raphael Hertzog <hertzog\@debian.org>.");
 
     printf _g("
 This is free software; see the GNU General Public License version 2 or
@@ -48,8 +48,11 @@
   --origin <flag>    output the origin of the flag to stdout:
                      value is one of vendor, system, user, env.
   --list             output a list of the flags supported by the current vendor.
-  --export=(sh|make) output commands to be executed in shell or make that export
-                     all the compilation flags as environment variables.
+  --export=(sh|make|configure)
+                     output something convenient to import the
+                     compilation flags in a shell script, in make,
+                     or on a ./configure command line.
+  --dump             output all compilation flags with their values
   --help             show this help message.
   --version          show the version.
 "), $progname;
@@ -65,11 +68,15 @@
         $action = $1;
         $param = shift(@ARGV);
 	usageerr(_g("%s needs a parameter"), $_) unless defined $param;
-    } elsif (m/^--export(?:=(sh|make))?$/) {
+    } elsif (m/^--export(?:=(sh|make|configure))?$/) {
         usageerr(_g("two commands specified: --%s and --%s"), "export", $action)
             if defined($action);
         my $type = $1 || "sh";
         $action = "export-$type";
+    } elsif (m/^--dump$/) {
+        usageerr(_g("two commands specified: --%s and --%s"), "dump", $action)
+            if defined($action);
+        $action = "dump";
     } elsif (m/^--list$/) {
         usageerr(_g("two commands specified: --%s and --%s"), "list", $action)
             if defined($action);
@@ -85,7 +92,7 @@
     }
 }
 
-usageerr(_g("need an action option")) unless defined($action);
+$action = "dump" unless defined($action);
 
 my $build_flags = Dpkg::BuildFlags->new();
 
@@ -119,9 +126,17 @@
 	} elsif ($export_type eq "make") {
 	    $value =~ s/\$/\$\$/g;
 	    print "export $flag := $value\n";
+	} elsif ($export_type eq "configure") {
+	    print "$flag=\"$value\" ";
 	}
     }
     exit(0);
+} elsif ($action eq "dump") {
+    foreach my $flag ($build_flags->list()) {
+	my $value = $build_flags->get($flag);
+	print "$flag=$value\n";
+    }
+    exit(0);
 }
 
 exit(1);
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/dpkg-buildpackage.pl /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-buildpackage.pl
--- dpkg/scripts/dpkg-buildpackage.pl	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-buildpackage.pl	2012-06-07 10:11:09.426073000 -0700
@@ -25,7 +25,6 @@
 use Dpkg;
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
-use Dpkg::BuildFlags;
 use Dpkg::BuildOptions;
 use Dpkg::Compression;
 use Dpkg::Version;
@@ -294,14 +293,6 @@
     $build_opts->export();
 }
 
-my $build_flags = Dpkg::BuildFlags->new();
-$build_flags->load_config();
-foreach my $flag ($build_flags->list()) {
-    $ENV{$flag} = $build_flags->get($flag);
-    printf(_g("%s: export %s from dpkg-buildflags (origin: %s): %s\n"),
-	   $progname, $flag, $build_flags->get_origin($flag), $ENV{$flag});
-}
-
 my $cwd = cwd();
 my $dir = basename($cwd);
 
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/dpkg-checkbuilddeps.pl /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-checkbuilddeps.pl
--- dpkg/scripts/dpkg-checkbuilddeps.pl	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-checkbuilddeps.pl	2012-06-07 10:11:09.426073000 -0700
@@ -123,10 +123,7 @@
 	
 		my ($package) = /^Package: (.*)$/m;
 		my ($version) = /^Version: (.*)$/m;
-		my ($arch) = /^Architecture: (.*)$/m;
-		my ($multiarch) = /^Multi-Arch: (.*)$/m;
-		$facts->add_installed_package($package, $version, $arch,
-		                              $multiarch);
+		$facts->add_installed_package($package, $version);
 	
 		if (/^Provides: (.*)$/m) {
 			my $provides = deps_parse($1, reduce_arch => 1, union => 1);
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/dpkg-gencontrol.pl /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-gencontrol.pl
--- dpkg/scripts/dpkg-gencontrol.pl	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-gencontrol.pl	2012-06-07 10:11:09.426073000 -0700
@@ -221,8 +221,7 @@
 # initialized.
 
 my $facts = Dpkg::Deps::KnownFacts->new();
-$facts->add_installed_package($fields->{'Package'}, $fields->{'Version'},
-                              $fields->{'Architecture'}, $fields->{'Multi-Arch'});
+$facts->add_installed_package($fields->{'Package'}, $fields->{'Version'});
 if (exists $pkg->{"Provides"}) {
     my $provides = deps_parse($substvars->substvars($pkg->{"Provides"}, no_warn => 1),
                               reduce_arch => 1, union => 1);
@@ -302,7 +301,8 @@
     if (!$c) {
         chdir("$packagebuilddir") ||
             syserr(_g("chdir for du to \`%s'"), $packagebuilddir);
-        exec("du", "-k", "-s", ".") or syserr(_g("unable to execute %s"), "du");
+        exec("du", "-k", "-s", "--apparent-size", ".") or
+            syserr(_g("unable to execute %s"), "du");
     }
     my $duo = '';
     while (<DU>) {
@@ -375,7 +375,7 @@
 $fields->output($fh_output);
 
 if (!$stdout) {
-    close($fh_output);
+    close($fh_output) || syserr(_g("cannot close %s"), "$cf.new");
     rename("$cf.new", "$cf") ||
         syserr(_g("cannot install output control file \`%s'"), $cf);
 }
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/dpkg-gensymbols.pl /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-gensymbols.pl
--- dpkg/scripts/dpkg-gensymbols.pl	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-gensymbols.pl	2012-06-07 10:11:09.426073000 -0700
@@ -287,7 +287,9 @@
     $md5_after->addfile($after);
     # Output diffs between symbols files if any
     if ($md5_before->hexdigest() ne $md5_after->hexdigest()) {
-	if (defined($ref_symfile->{file})) {
+	if (not defined($output)) {
+	    warning(_g("the generated symbols file is empty"));
+	} elsif (defined($ref_symfile->{file})) {
 	    warning(_g("%s doesn't match completely %s"),
 		    $output, $ref_symfile->{file});
 	} else {
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/dpkg-maintscript-helper.sh /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-maintscript-helper.sh
--- dpkg/scripts/dpkg-maintscript-helper.sh	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-maintscript-helper.sh	2012-06-07 10:11:09.426073000 -0700
@@ -234,22 +234,16 @@
 
 usage() {
 	cat <<END
-Syntax: $0 <command> <parameters> -- <maintainer script parameters>
-
-Commands and parameters:
+Usage: $PROGNAME <command> <parameter>... -- <maintainer-script-parameter>...
 
+Commands:
   supports <command>
-	Returns 0 (success) if the given command is supported, 1
-	otherwise.
-
+	Returns 0 (success) if the given command is supported, 1 otherwise.
   rm_conffile <conffile> [<last-version> [<package>]]
-	Remove obsolete conffile.
-	Must be called in preinst, postinst and postrm.
-
+	Remove obsolete conffile. Must be called in preinst, postinst and
+	postrm.
   mv_conffile <old-conf> <new-conf> [<last-version> [<package>]]
-	Rename a conffile.
-	Must be called in preinst, postinst and postrm.
-
+	Rename a conffile. Must be called in preinst, postinst and postrm.
   help
 	Display this usage information.
 END
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/dpkg-mergechangelogs.pl /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-mergechangelogs.pl
--- dpkg/scripts/dpkg-mergechangelogs.pl	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-mergechangelogs.pl	2012-06-07 10:11:09.426073000 -0700
@@ -128,7 +128,7 @@
 if (defined($out_file) and $out_file ne "-") {
     open(OUT, ">", $out_file) || syserr(_g("cannot write %s"), $out_file);
     print OUT ((blessed $_) ? "$_" : "$_\n") foreach @result;
-    close(OUT);
+    close(OUT) || syserr(_g("cannot write %s"), $out_file);
 } else {
     print ((blessed $_) ? "$_" : "$_\n") foreach @result;
 }
@@ -286,5 +286,5 @@
     push @b, $b if defined $b;
     @a = @{$a} if ref($a) eq "ARRAY";
     @b = @{$b} if ref($b) eq "ARRAY";
-    return ("<<<<<<", @a, "======", @b, ">>>>>>");
+    return ("<<<<<<<", @a, "=======", @b, ">>>>>>>");
 }
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/dpkg-parsechangelog.pl /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-parsechangelog.pl
--- dpkg/scripts/dpkg-parsechangelog.pl	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-parsechangelog.pl	2012-06-07 10:11:09.426073000 -0700
@@ -114,7 +114,7 @@
     }
 }
 
-@ARGV && usageerr(_g("%s takes no non-option arguments"), $progname);
+@ARGV && usageerr(_g("takes no non-option arguments"));
 
 my $count = 0;
 my @fields = changelog_parse(%options);
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/dpkg-scanpackages.pl /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-scanpackages.pl
--- dpkg/scripts/dpkg-scanpackages.pl	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-scanpackages.pl	2012-06-07 10:11:09.426073000 -0700
@@ -155,7 +155,7 @@
 usage() and exit 1 if not $result;
 
 if (not @ARGV >= 1 && @ARGV <= 3) {
-    usageerr(_g("1 to 3 args expected"));
+    usageerr(_g("one to three arguments expected"));
 }
 
 my $type = defined($options{type}) ? $options{type} : 'deb';
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/dpkg-scansources.pl /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-scansources.pl
--- dpkg/scripts/dpkg-scansources.pl	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-scansources.pl	2012-06-07 10:11:09.426073000 -0700
@@ -299,7 +299,7 @@
     my (@out);
 
     GetOptions(@Option_spec) or usage;
-    @ARGV >= 1 && @ARGV <= 3 or usageerr(_g("1 to 3 args expected\n"));
+    @ARGV >= 1 && @ARGV <= 3 or usageerr(_g("one to three arguments expected"));
 
     push @ARGV, undef		if @ARGV < 2;
     push @ARGV, ''		if @ARGV < 3;
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/dpkg-shlibdeps.pl /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-shlibdeps.pl
--- dpkg/scripts/dpkg-shlibdeps.pl	2011-03-09 14:40:51.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-shlibdeps.pl	2012-06-07 10:11:09.426073000 -0700
@@ -520,7 +520,7 @@
 
 # Replace old file by new one
 if (!$stdout) {
-    close($fh);
+    close($fh) || syserr(_g("cannot close %s"), "$varlistfile.new");
     rename("$varlistfile.new",$varlistfile) ||
 	syserr(_g("install new varlist file \`%s'"), $varlistfile);
 }
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/dpkg-source.pl /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-source.pl
--- dpkg/scripts/dpkg-source.pl	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-source.pl	2012-06-07 10:11:09.426073000 -0700
@@ -11,7 +11,7 @@
 # Copyright © 2005 Brendan O'Dea <bod@debian.org>
 # Copyright © 2006-2008 Frank Lichtenheld <djpig@debian.org>
 # Copyright © 2006-2009 Guillem Jover <guillem@debian.org>
-# Copyright © 2008-2010 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2008-2011 Raphaël Hertzog <hertzog@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -45,6 +45,8 @@
 use Dpkg::Source::Package;
 use Dpkg::Vendor qw(run_vendor_hook);
 
+use Cwd;
+use File::Basename;
 use File::Spec;
 
 textdomain("dpkg-dev");
@@ -85,6 +87,8 @@
         setopmode('-x');
     } elsif (m/^--(before|after)-build$/) {
         setopmode($_);
+    } elsif (m/^--commit$/) {
+        setopmode($_);
     } elsif (m/^--print-format$/) {
 	setopmode('--print-format');
 	report_options(info_fh => \*STDERR); # Avoid clutter on STDOUT
@@ -95,15 +99,23 @@
 
 my $dir;
 if (defined($options{'opmode'}) &&
-    $options{'opmode'} =~ /^(-b|--print-format|--before-build|--after-build)$/) {
+    $options{'opmode'} =~ /^(-b|--print-format|--(before|after)-build|--commit)$/) {
     if (not scalar(@ARGV)) {
-	usageerr(_g("%s needs a directory"), $options{'opmode'});
+	usageerr(_g("%s needs a directory"), $options{'opmode'})
+	    unless $1 eq "--commit";
+	$dir = ".";
+    } else {
+	$dir = File::Spec->catdir(shift(@ARGV));
     }
-    $dir = File::Spec->catdir(shift(@ARGV));
     stat($dir) || syserr(_g("cannot stat directory %s"), $dir);
     if (not -d $dir) {
 	error(_g("directory argument %s is not a directory"), $dir);
     }
+    if ($dir eq ".") {
+	# . is never correct, adjust automatically
+	$dir = basename(cwd());
+	chdir("..") || syserr(_g("unable to chdir to `%s'"), "..");
+    }
     # --format options are not allowed, they would take precedence
     # over real command line options, debian/source/format should be used
     # instead
@@ -199,10 +211,10 @@
 }
 
 unless (defined($options{'opmode'})) {
-    usageerr(_g("need a command (-x, -b, --before-build, --after-build, --print-format)"));
+    usageerr(_g("need a command (-x, -b, --before-build, --after-build, --print-format, --commit)"));
 }
 
-if ($options{'opmode'} =~ /^(-b|--print-format|--(before|after)-build)$/) {
+if ($options{'opmode'} =~ /^(-b|--print-format|--(before|after)-build|--commit)$/) {
 
     $options{'ARGV'} = \@ARGV;
 
@@ -223,6 +235,8 @@
 
     # Scan control info of source package
     my $src_fields = $control->get_source();
+    error(_g("%s doesn't contain any information about the source package"),
+          $controlfile) unless defined $src_fields;
     my $src_sect = $src_fields->{'Section'} || "unknown";
     my $src_prio = $src_fields->{'Priority'} || "unknown";
     foreach $_ (keys %{$src_fields}) {
@@ -254,9 +268,7 @@
 	my $prio = $pkg->{'Priority'} || $src_prio;
 	my $type = $pkg->{'Package-Type'} ||
 	        $pkg->get_custom_field('Package-Type') || 'deb';
-	my $arch = $pkg->{'Architecture'};
-	$arch =~ s/\s+/,/g;
-	push @pkglist, sprintf("%s %s %s %s %s", $p, $type, $sect, $prio, $arch);
+	push @pkglist, sprintf("%s %s %s %s", $p, $type, $sect, $prio);
 	push(@binarypackages,$p);
 	foreach $_ (keys %{$pkg}) {
 	    my $v = $pkg->{$_};
@@ -285,6 +297,9 @@
             }
 	}
     }
+    unless (scalar(@pkglist)) {
+	error(_g("%s doesn't list any binary package"), $controlfile);
+    }
     if (grep($_ eq 'any', @sourcearch)) {
         # If we encounter one 'any' then the other arches become insignificant
         # except for 'all' that must also be kept
@@ -295,11 +310,7 @@
         }
     }
     $fields->{'Architecture'} = join(' ', @sourcearch);
-    $fields->{'Package-List'} = sprintf("\n%s source %s %s %s", $sourcepackage,
-                                        $src_sect, $src_prio,
-                                        join(',', @sourcearch));
-    $fields->{'Package-List'} .= "\n" . join("\n", sort @pkglist);
-    delete $fields->{'Package-List'};
+    $fields->{'Package-List'} = "\n" . join("\n", sort @pkglist);
 
     # Scan fields of dpkg-parsechangelog
     foreach $_ (keys %{$changelog}) {
@@ -357,6 +368,9 @@
     } elsif ($options{'opmode'} eq "--after-build") {
 	$srcpkg->after_build($dir);
 	exit(0);
+    } elsif ($options{'opmode'} eq "--commit") {
+	$srcpkg->commit($dir);
+	exit(0);
     }
 
     # Verify pre-requisites are met
@@ -460,7 +474,9 @@
                            extract source package.
   -b <dir>                 build source package.
   --print-format <dir>     print the source format that would be
-                           used to build the source package.")
+                           used to build the source package.
+  --commit [<dir> [<patch-name>]]
+                           store upstream changes in a new patch.")
     . "\n\n" . _g(
 "Build options:
   -c<controlfile>          get control info from this file.
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/dpkg-vendor.pl /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-vendor.pl
--- dpkg/scripts/dpkg-vendor.pl	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/dpkg-vendor.pl	2012-06-07 10:11:09.426073000 -0700
@@ -61,11 +61,13 @@
     $_ = shift(@ARGV);
     if (m/^--vendor$/) {
         $vendor = shift(@ARGV);
+        usageerr(_g("%s needs a parameter"), $_) unless defined $vendor;
     } elsif (m/^--(is|derives-from|query)$/) {
         usageerr(_g("two commands specified: --%s and --%s"), $1, $action)
             if defined($action);
         $action = $1;
         $param = shift(@ARGV);
+        usageerr(_g("%s needs a parameter"), $_) unless defined $param;
     } elsif (m/^-(h|-help)$/) {
         usage();
         exit 0;
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/scripts/.gitignore
--- dpkg/scripts/.gitignore	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1,20 +0,0 @@
-dpkg-architecture
-dpkg-buildflags
-dpkg-buildpackage
-dpkg-checkbuilddeps
-dpkg-distaddfile
-dpkg-genchanges
-dpkg-gencontrol
-dpkg-gensymbols
-dpkg-maintscript-helper
-dpkg-mergechangelogs
-dpkg-name
-dpkg-parsechangelog
-dpkg-scanpackages
-dpkg-scansources
-dpkg-shlibdeps
-dpkg-source
-dpkg-statoverride
-dpkg-vendor
-t.tmp
-cover_db
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Makefile.am /home/vorlon/devel/multiarch/dpkg-debian/scripts/Makefile.am
--- dpkg/scripts/Makefile.am	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Makefile.am	2012-06-07 10:11:09.426073000 -0700
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = po
+SUBDIRS = mk po
 
 bin_SCRIPTS = \
 	dpkg-architecture \
@@ -160,7 +160,9 @@
 endif
 
 coverage: check
-	$(PERL_COVER) -silent -outputdir $(top_builddir)/doc/coverage/scripts
+	$(PERL_COVER) -silent \
+	  -ignore_re '^t/.*\.t' \
+	  -outputdir $(top_builddir)/doc/coverage/scripts
 
 coverage-clean:
 	rm -rf cover_db
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/Makefile.in /home/vorlon/devel/multiarch/dpkg-debian/scripts/Makefile.in
--- dpkg/scripts/Makefile.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/Makefile.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,1054 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# vim:set syn=automake:
+
+# Variables to be defined:
+#
+#  TEST_VERBOSE - set to 0 or 1 to control test suite verbosity
+#  TEST_ENV_VARS - environment variables to be set for the test suite
+#  TEST_COVERAGE - set to the perl module in charge of getting test coverage
+#  test_tmpdir - test suite temporary directory
+#  test_cases - list of test case files
+#  test_data - list of test data files
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(nobase_dist_perllib_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/Makecheck.am
+subdir = scripts
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
+	$(top_srcdir)/m4/dpkg-build.m4 \
+	$(top_srcdir)/m4/dpkg-compiler.m4 \
+	$(top_srcdir)/m4/dpkg-coverage.m4 \
+	$(top_srcdir)/m4/dpkg-funcs.m4 $(top_srcdir)/m4/dpkg-libs.m4 \
+	$(top_srcdir)/m4/dpkg-linker.m4 $(top_srcdir)/m4/dpkg-progs.m4 \
+	$(top_srcdir)/m4/dpkg-types.m4 \
+	$(top_srcdir)/m4/dpkg-unicode.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(changelogdir)" \
+	"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(perllibdir)"
+SCRIPTS = $(bin_SCRIPTS) $(changelog_SCRIPTS)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+man3dir = $(mandir)/man3
+NROFF = nroff
+MANS = $(man3_MANS)
+DATA = $(nobase_dist_perllib_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BZ2_LIBS = @BZ2_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCOV = @GCOV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LCOV = @LCOV@
+LCOV_GENHTML = @LCOV_GENHTML@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_COVER = @PERL_COVER@
+PERL_COVERAGE = @PERL_COVERAGE@
+PERL_LIBDIR = @PERL_LIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PO4A = @PO4A@
+POD2MAN = @POD2MAN@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_PO4A = @USE_PO4A@
+USE_UNICODE = @USE_UNICODE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+admindir = @admindir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = mk po
+bin_SCRIPTS = \
+	dpkg-architecture \
+	dpkg-buildflags \
+	dpkg-buildpackage \
+	dpkg-checkbuilddeps \
+	dpkg-distaddfile \
+	dpkg-genchanges \
+	dpkg-gencontrol \
+	dpkg-gensymbols \
+	dpkg-maintscript-helper \
+	dpkg-mergechangelogs \
+	dpkg-name \
+	dpkg-parsechangelog \
+	dpkg-scanpackages \
+	dpkg-scansources \
+	dpkg-shlibdeps \
+	dpkg-source \
+	dpkg-vendor
+
+changelogdir = $(pkglibdir)/parsechangelog
+changelog_SCRIPTS = \
+	changelog/debian
+
+EXTRA_DIST = \
+	dpkg-architecture.pl \
+	dpkg-buildflags.pl \
+	dpkg-buildpackage.pl \
+	dpkg-checkbuilddeps.pl \
+	dpkg-distaddfile.pl \
+	dpkg-genchanges.pl \
+	dpkg-gencontrol.pl \
+	dpkg-gensymbols.pl \
+	dpkg-maintscript-helper.sh \
+	dpkg-mergechangelogs.pl \
+	dpkg-name.pl \
+	dpkg-parsechangelog.pl \
+	dpkg-scanpackages.pl \
+	dpkg-scansources.pl \
+	dpkg-shlibdeps.pl \
+	dpkg-source.pl \
+	dpkg-vendor.pl \
+	changelog/debian.pl \
+	$(test_cases) \
+	$(test_data)
+
+CLEANFILES = \
+	$(bin_SCRIPTS) $(changelog_SCRIPTS)
+
+perllibdir = $(PERL_LIBDIR)
+nobase_dist_perllib_DATA = \
+	Dpkg/Arch.pm \
+	Dpkg/BuildFlags.pm \
+	Dpkg/BuildOptions.pm \
+	Dpkg/Changelog.pm \
+	Dpkg/Changelog/Debian.pm \
+	Dpkg/Changelog/Entry.pm \
+	Dpkg/Changelog/Entry/Debian.pm \
+	Dpkg/Changelog/Parse.pm \
+	Dpkg/Checksums.pm \
+	Dpkg/Compression.pm \
+	Dpkg/Compression/FileHandle.pm \
+	Dpkg/Compression/Process.pm \
+	Dpkg/Conf.pm \
+	Dpkg/Control.pm \
+	Dpkg/Control/Changelog.pm \
+	Dpkg/Control/Fields.pm \
+	Dpkg/Control/Info.pm \
+	Dpkg/Control/Hash.pm \
+	Dpkg/Control/Types.pm \
+	Dpkg/Deps.pm \
+	Dpkg/ErrorHandling.pm \
+	Dpkg/Exit.pm \
+	Dpkg/Gettext.pm \
+	Dpkg/Index.pm \
+	Dpkg/Interface/Storable.pm \
+	Dpkg/IPC.pm \
+	Dpkg/Path.pm \
+	Dpkg/Shlibs.pm \
+	Dpkg/Shlibs/Objdump.pm \
+	Dpkg/Shlibs/Symbol.pm \
+	Dpkg/Shlibs/SymbolFile.pm \
+	Dpkg/Shlibs/Cppfilt.pm \
+	Dpkg/Source/Archive.pm \
+	Dpkg/Source/Functions.pm \
+	Dpkg/Source/Package.pm \
+	Dpkg/Source/Package/V1.pm \
+	Dpkg/Source/Package/V2.pm \
+	Dpkg/Source/Package/V3/bzr.pm \
+	Dpkg/Source/Package/V3/custom.pm \
+	Dpkg/Source/Package/V3/native.pm \
+	Dpkg/Source/Package/V3/git.pm \
+	Dpkg/Source/Package/V3/quilt.pm \
+	Dpkg/Source/Patch.pm \
+	Dpkg/Substvars.pm \
+	Dpkg/Vars.pm \
+	Dpkg/Vendor.pm \
+	Dpkg/Vendor/Debian.pm \
+	Dpkg/Vendor/Default.pm \
+	Dpkg/Vendor/Ubuntu.pm \
+	Dpkg/Version.pm \
+	Dpkg.pm
+
+
+# Keep it even if empty to have man3dir correctly set
+man3_MANS = 
+do_perl_subst = $(AM_V_GEN) \
+		sed -e "s:^\#![:space:]*/usr/bin/perl:\#!$(PERL):" \
+		    -e "s:\$$dpkglibdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$dpkglibdir=\"$(pkglibdir)\":" \
+		    -e "s:\$$pkgdatadir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$pkgdatadir=\"$(pkgdatadir)\":" \
+		    -e "s:\$$admindir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$admindir=\"$(admindir)\":" \
+		    -e "s:\$$version[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:\$$version=\"$(PACKAGE_VERSION)\":"
+
+do_shell_subst = $(AM_V_GEN) \
+		 sed -e "s:^version[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:version=\"$(PACKAGE_VERSION)\":"
+
+TEST_VERBOSE = 0
+TEST_ENV_VARS = \
+	DPKG_DATADIR=$(srcdir)/.. \
+	DPKG_ORIGINS_DIR=$(srcdir)/t/origins
+
+TEST_COVERAGE = $(PERL_COVERAGE)
+test_tmpdir = t.tmp
+test_cases = \
+	t/000_pod.t \
+	t/100_Dpkg_Version.t \
+	t/190_Dpkg_Shlibs_Cppfilt.t \
+	t/200_Dpkg_Shlibs.t \
+	t/300_Dpkg_BuildOptions.t \
+	t/400_Dpkg_Deps.t \
+	t/500_Dpkg_Path.t \
+	t/600_Dpkg_Changelog.t \
+	t/600_Dpkg_Changelog_Ubuntu.t \
+	t/700_Dpkg_Control.t \
+	t/750_Dpkg_Substvars.t \
+	t/800_Dpkg_IPC.t \
+	t/850_Dpkg_Compression.t \
+	t/910_merge_changelogs.t
+
+check_DATA = \
+	$(test_tmpdir)/200_Dpkg_Shlibs/objdump.basictags-amd64 \
+	$(test_tmpdir)/200_Dpkg_Shlibs/objdump.basictags-i386 \
+	$(test_tmpdir)/200_Dpkg_Shlibs/objdump.patterns
+
+test_data = \
+	t/200_Dpkg_Shlibs/symbols.fake-1 \
+	t/200_Dpkg_Shlibs/symbols.fake-2 \
+	t/200_Dpkg_Shlibs/symbols.fake-3 \
+	t/200_Dpkg_Shlibs/symbols.include-1 \
+	t/200_Dpkg_Shlibs/symbols.include-2 \
+	t/200_Dpkg_Shlibs/symbols.include-3 \
+	t/200_Dpkg_Shlibs/basictags.symbols \
+	t/200_Dpkg_Shlibs/basictags.c \
+	t/200_Dpkg_Shlibs/patterns.symbols \
+	t/200_Dpkg_Shlibs/patterns.cpp \
+	t/200_Dpkg_Shlibs/patterns.map \
+	t/200_Dpkg_Shlibs/ld.so.conf \
+	t/200_Dpkg_Shlibs/ld.so.conf_2 \
+	t/200_Dpkg_Shlibs/ld.so.conf.d/normal.conf \
+	t/200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf \
+	t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf \
+	t/200_Dpkg_Shlibs/objdump.glib-ia64 \
+	t/200_Dpkg_Shlibs/objdump.libc6-2.3 \
+	t/200_Dpkg_Shlibs/objdump.libc6-2.6 \
+	t/200_Dpkg_Shlibs/objdump.dbd-pg \
+	t/200_Dpkg_Shlibs/objdump.ls \
+	t/600_Dpkg_Changelog/countme \
+	t/600_Dpkg_Changelog/fields \
+	t/600_Dpkg_Changelog/misplaced-tz \
+	t/600_Dpkg_Changelog/regressions \
+	t/600_Dpkg_Changelog/shadow \
+	t/700_Dpkg_Control/control-1 \
+	t/750_Dpkg_Substvars/substvars1 \
+	t/910_merge_changelogs/ch-old \
+	t/910_merge_changelogs/ch-a \
+	t/910_merge_changelogs/ch-b \
+	t/910_merge_changelogs/ch-merged \
+	t/910_merge_changelogs/ch-merged-basic \
+	t/910_merge_changelogs/ch-merged-pr \
+	t/910_merge_changelogs/ch-merged-pr-basic \
+	t/origins/debian \
+	t/origins/default \
+	t/origins/ubuntu
+
+objdump_lib_name = lib`basename $@`.so
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makecheck.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign scripts/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binSCRIPTS: $(bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+install-changelogSCRIPTS: $(changelog_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(changelogdir)" || $(MKDIR_P) "$(DESTDIR)$(changelogdir)"
+	@list='$(changelog_SCRIPTS)'; test -n "$(changelogdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(changelogdir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(changelogdir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-changelogSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(changelog_SCRIPTS)'; test -n "$(changelogdir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(changelogdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(changelogdir)" && rm -f $$files
+install-man3: $(man3_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
+	@list='$(man3_MANS)'; test -n "$(man3dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man3dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man3dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man3:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man3_MANS)'; test -n "$(man3dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man3dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man3dir)" && rm -f $$files; }
+install-nobase_dist_perllibDATA: $(nobase_dist_perllib_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(perllibdir)" || $(MKDIR_P) "$(DESTDIR)$(perllibdir)"
+	@list='$(nobase_dist_perllib_DATA)'; test -n "$(perllibdir)" || list=; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo "$(MKDIR_P) '$(DESTDIR)$(perllibdir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(perllibdir)/$$dir"; }; \
+	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(perllibdir)/$$dir'"; \
+	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(perllibdir)/$$dir" || exit $$?; }; \
+	done
+
+uninstall-nobase_dist_perllibDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_dist_perllib_DATA)'; test -n "$(perllibdir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(perllibdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(perllibdir)" && rm -f $$files
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@list='$(MANS)'; if test -n "$$list"; then \
+	  list=`for p in $$list; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+	  if test -n "$$list" && \
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+	    exit 1; \
+	  else :; fi; \
+	else :; fi
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_DATA)
+	$(MAKE) $(AM_MAKEFLAGS) check-local
+check: check-recursive
+all-am: Makefile $(SCRIPTS) $(MANS) $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(changelogdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(perllibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-local mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-changelogSCRIPTS install-data-local \
+	install-man install-nobase_dist_perllibDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-binSCRIPTS
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man: install-man3
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-binSCRIPTS uninstall-changelogSCRIPTS \
+	uninstall-local uninstall-man \
+	uninstall-nobase_dist_perllibDATA
+
+uninstall-man: uninstall-man3
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
+	ctags-recursive install-am install-data-am install-strip \
+	tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am check-local clean clean-generic \
+	clean-local ctags ctags-recursive distclean distclean-generic \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binSCRIPTS install-changelogSCRIPTS \
+	install-data install-data-am install-data-hook \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-man3 \
+	install-nobase_dist_perllibDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-binSCRIPTS uninstall-changelogSCRIPTS \
+	uninstall-local uninstall-man uninstall-man3 \
+	uninstall-nobase_dist_perllibDATA
+
+
+%: %.pl Makefile
+	@test -d `dirname $@` || $(mkdir_p) `dirname $@`
+	$(do_perl_subst) <$< >$@
+	$(AM_V_at) chmod +x $@
+
+%: %.sh Makefile
+	@test -d `dirname $@` || $(mkdir_p) `dirname $@`
+	$(do_shell_subst) <$< >$@
+	$(AM_V_at) chmod +x $@
+
+install-data-local:
+# Install manual pages for perl modules manually as make can't deal
+# properly with filenames containing colons
+# Remove empty manual pages (perl modules not documented)
+@BUILD_POD_DOC_TRUE@	$(mkdir_p) $(DESTDIR)$(man3dir)
+@BUILD_POD_DOC_TRUE@	for module in $(nobase_dist_perllib_DATA); do \
+@BUILD_POD_DOC_TRUE@	    name=`echo $$module | sed -e 's|/|::|g' -e 's/\.pm$$//'`; \
+@BUILD_POD_DOC_TRUE@	    pod2man --utf8 --center=libdpkg-perl --release=$(VERSION) \
+@BUILD_POD_DOC_TRUE@		--name="$$name"	--section=3 $(srcdir)/$$module \
+@BUILD_POD_DOC_TRUE@		>$(DESTDIR)$(man3dir)/$$name.3; \
+@BUILD_POD_DOC_TRUE@	    test -s $(DESTDIR)$(man3dir)/$$name.3 || \
+@BUILD_POD_DOC_TRUE@		rm -f $(DESTDIR)$(man3dir)/$$name.3; \
+@BUILD_POD_DOC_TRUE@	done
+
+# Ideally we'd use 'sed -i', but unfortunately that's not portable.
+install-data-hook:
+	cp -p $(DESTDIR)$(perllibdir)/Dpkg.pm \
+	      $(DESTDIR)$(perllibdir)/Dpkg.pm.tmp
+	$(do_perl_subst) <$(DESTDIR)$(perllibdir)/Dpkg.pm.tmp \
+	                 >$(DESTDIR)$(perllibdir)/Dpkg.pm
+	rm $(DESTDIR)$(perllibdir)/Dpkg.pm.tmp
+
+uninstall-local:
+@BUILD_POD_DOC_TRUE@	for module in $(nobase_dist_perllib_DATA); do \
+@BUILD_POD_DOC_TRUE@	    rm -f $(DESTDIR)$(man3dir)/`echo $$module | sed -e 's|/|::|g' -e 's/\.pm$$/.3/'`; \
+@BUILD_POD_DOC_TRUE@	done
+
+coverage: check
+	$(PERL_COVER) -silent \
+	  -ignore_re '^t/.*\.t' \
+	  -outputdir $(top_builddir)/doc/coverage/scripts
+
+coverage-clean:
+	rm -rf cover_db
+$(test_tmpdir)/200_Dpkg_Shlibs/objdump.basictags-amd64 $(test_tmpdir)/200_Dpkg_Shlibs/objdump.basictags-i386: $(srcdir)/t/200_Dpkg_Shlibs/basictags.c
+	$(mkdir_p) $(test_tmpdir)/200_Dpkg_Shlibs
+	$(CC) $(CFLAGS) -shared -fPIC -Wl,-soname -Wl,libbasictags.so.1 $< \
+	  $(if $(findstring amd64,$@),-DAMD64,) -o $(objdump_lib_name)
+	objdump -w -f -p -T -R $(objdump_lib_name) | \
+	  sed "s/$(objdump_lib_name)/libbasictags.so.1/g" > $@
+	rm -f $(objdump_lib_name)
+
+$(test_tmpdir)/200_Dpkg_Shlibs/objdump.patterns: $(srcdir)/t/200_Dpkg_Shlibs/patterns.cpp $(srcdir)/t/200_Dpkg_Shlibs/patterns.map
+	$(mkdir_p) $(test_tmpdir)/200_Dpkg_Shlibs
+	$(CXX) $(CXXFLAGS) -shared -fPIC -Wl,-soname -Wl,libpatterns.so.1 \
+	    -Wl,--version-script=$(srcdir)/t/200_Dpkg_Shlibs/patterns.map $< \
+	    -o $(objdump_lib_name)
+	objdump -w -f -p -T -R $(objdump_lib_name) | \
+	  sed "s/$(objdump_lib_name)/libpatterns.so.1/g" > $@
+	rm -f $(objdump_lib_name)
+
+check-clean:
+	rm -fr $(test_tmpdir)
+
+check-local: $(test_data) $(test_cases)
+	$(mkdir_p) $(test_tmpdir)
+	PATH="$(top_builddir)/src:$(top_builddir)/scripts:$(top_builddir)/utils:$(PATH)" \
+	  LC_ALL=C \
+	  $(TEST_ENV_VARS) \
+	  srcdir=$(srcdir) builddir=$(builddir) \
+	  PERL5LIB=$(top_srcdir)/scripts PERL_DL_NONLAZY=1 \
+	  PERL5OPT=$(TEST_COVERAGE) \
+	  $(PERL) -I$(top_srcdir)/scripts \
+	    -MExtUtils::Command::MM -e "test_harness($(TEST_VERBOSE), '.')" \
+	    $(addprefix $(srcdir)/,$(test_cases))
+
+clean-local: check-clean coverage-clean
+	rm -fr man
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/mk/architecture.mk /home/vorlon/devel/multiarch/dpkg-debian/scripts/mk/architecture.mk
--- dpkg/scripts/mk/architecture.mk	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/mk/architecture.mk	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,25 @@
+# This Makefile snippet defines all the DEB_HOST_* / DEB_BUILD_* variables
+# that dpkg-architecture can return. Existing values of those variables
+# are preserved as per policy.
+
+dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1)))
+
+DEB_HOST_ARCH ?= $(call dpkg_late_eval,DEB_HOST_ARCH,dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS ?= $(call dpkg_late_eval,DEB_HOST_ARCH_OS,dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_ARCH_CPU ?= $(call dpkg_late_eval,DEB_HOST_ARCH_CPU,dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_BITS ?= $(call dpkg_late_eval,DEB_HOST_ARCH_BITS,dpkg-architecture -qDEB_HOST_ARCH_BITS)
+DEB_HOST_ARCH_ENDIAN ?= $(call dpkg_late_eval,DEB_HOST_ARCH_ENDIAN,dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
+DEB_HOST_GNU_CPU ?= $(call dpkg_late_eval,DEB_HOST_GNU_CPU,dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_GNU_SYSTEM ?= $(call dpkg_late_eval,DEB_HOST_GNU_SYSTEM,dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_TYPE ?= $(call dpkg_late_eval,DEB_HOST_GNU_TYPE,dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(call dpkg_late_eval,DEB_HOST_MULTIARCH,dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+DEB_BUILD_ARCH ?= $(call dpkg_late_eval,DEB_BUILD_ARCH,dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_OS ?= $(call dpkg_late_eval,DEB_BUILD_ARCH_OS,dpkg-architecture -qDEB_BUILD_ARCH_OS)
+DEB_BUILD_ARCH_CPU ?= $(call dpkg_late_eval,DEB_BUILD_ARCH_CPU,dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_BITS ?= $(call dpkg_late_eval,DEB_BUILD_ARCH_BITS,dpkg-architecture -qDEB_BUILD_ARCH_BITS)
+DEB_BUILD_ARCH_ENDIAN ?= $(call dpkg_late_eval,DEB_BUILD_ARCH_ENDIAN,dpkg-architecture -qDEB_BUILD_ARCH_ENDIAN)
+DEB_BUILD_GNU_CPU ?= $(call dpkg_late_eval,DEB_BUILD_GNU_CPU,dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_GNU_SYSTEM ?= $(call dpkg_late_eval,DEB_BUILD_GNU_SYSTEM,dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_TYPE ?= $(call dpkg_late_eval,DEB_BUILD_GNU_TYPE,dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_MULTIARCH ?= $(call dpkg_late_eval,DEB_BUILD_MULTIARCH,dpkg-architecture -qDEB_BUILD_MULTIARCH)
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/mk/buildflags.mk /home/vorlon/devel/multiarch/dpkg-debian/scripts/mk/buildflags.mk
--- dpkg/scripts/mk/buildflags.mk	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/mk/buildflags.mk	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,37 @@
+# This Makefile snippet defines the following variables:
+#
+# CFLAGS: flags for the C compiler
+# CPPFLAGS: flags for the C preprocessor
+# CXXFLAGS: flags for the C++ compiler
+# FFLAGS: flags for the Fortran compiler
+# LDFLAGS: flags for the linker
+#
+# You can also export them in the environment by setting
+# DPKG_EXPORT_BUILDFLAGS to a non-empty value.
+#
+# This list is kept in sync with the default set of flags returned
+# by dpkg-buildflags.
+
+dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1)))
+
+DPKG_BUILDFLAGS_LIST = CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS
+
+define dpkg_buildflags_export_envvar
+ifdef $(1)
+DPKG_BUILDFLAGS_EXPORT_ENVVAR += $(1)="$(value $(1))"
+endif
+endef
+
+$(eval $(call dpkg_buildflags_export_envvar,DEB_BUILD_MAINT_OPTIONS))
+$(foreach flag,$(DPKG_BUILDFLAGS_LIST),\
+  $(foreach operation,SET STRIP APPEND PREPEND,\
+    $(eval $(call dpkg_buildflags_export_envvar,DEB_$(flag)_MAINT_$(operation)))))
+
+dpkg_buildflags_setvar = $(1) = $(call dpkg_late_eval,$(1),$(DPKG_BUILDFLAGS_EXPORT_ENVVAR) dpkg-buildflags --get $(1))
+
+$(foreach flag,$(DPKG_BUILDFLAGS_LIST),\
+  $(eval $(call dpkg_buildflags_setvar,$(flag))))
+
+ifdef DPKG_EXPORT_BUILDFLAGS
+  export $(DPKG_BUILDFLAGS_LIST)
+endif
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/mk/default.mk /home/vorlon/devel/multiarch/dpkg-debian/scripts/mk/default.mk
--- dpkg/scripts/mk/default.mk	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/mk/default.mk	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,8 @@
+# Include all the Makefiles that define variables that can be useful
+# within debian/rules
+
+dpkg_datadir = .
+include $(dpkg_datadir)/architecture.mk
+include $(dpkg_datadir)/buildflags.mk
+include $(dpkg_datadir)/pkg-info.mk
+include $(dpkg_datadir)/vendor.mk
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/mk/Makefile.am /home/vorlon/devel/multiarch/dpkg-debian/scripts/mk/Makefile.am
--- dpkg/scripts/mk/Makefile.am	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/mk/Makefile.am	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,17 @@
+## Process this file with automake to produce Makefile.in
+
+dist_pkgdata_DATA = \
+	architecture.mk \
+	buildflags.mk \
+	default.mk \
+	pkg-info.mk \
+	vendor.mk
+
+do_path_subst = $(AM_V_GEN) \
+                sed -e "s:dpkg_datadir[[:space:]]*=[[:space:]]*[^[:space:]]*:dpkg_datadir = $(pkgdatadir):"
+
+install-data-hook:
+	cp -p $(DESTDIR)$(pkgdatadir)/default.mk $(DESTDIR)$(pkgdatadir)/default.mk.tmp
+	$(do_path_subst) <$(DESTDIR)$(pkgdatadir)/default.mk.tmp \
+			 >$(DESTDIR)$(pkgdatadir)/default.mk
+	rm $(DESTDIR)$(pkgdatadir)/default.mk.tmp
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/mk/Makefile.in /home/vorlon/devel/multiarch/dpkg-debian/scripts/mk/Makefile.in
--- dpkg/scripts/mk/Makefile.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/mk/Makefile.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,457 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = scripts/mk
+DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
+	$(top_srcdir)/m4/dpkg-build.m4 \
+	$(top_srcdir)/m4/dpkg-compiler.m4 \
+	$(top_srcdir)/m4/dpkg-coverage.m4 \
+	$(top_srcdir)/m4/dpkg-funcs.m4 $(top_srcdir)/m4/dpkg-libs.m4 \
+	$(top_srcdir)/m4/dpkg-linker.m4 $(top_srcdir)/m4/dpkg-progs.m4 \
+	$(top_srcdir)/m4/dpkg-types.m4 \
+	$(top_srcdir)/m4/dpkg-unicode.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(dist_pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BZ2_LIBS = @BZ2_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCOV = @GCOV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LCOV = @LCOV@
+LCOV_GENHTML = @LCOV_GENHTML@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_COVER = @PERL_COVER@
+PERL_COVERAGE = @PERL_COVERAGE@
+PERL_LIBDIR = @PERL_LIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PO4A = @PO4A@
+POD2MAN = @POD2MAN@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_PO4A = @USE_PO4A@
+USE_UNICODE = @USE_UNICODE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+admindir = @admindir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+dist_pkgdata_DATA = \
+	architecture.mk \
+	buildflags.mk \
+	default.mk \
+	pkg-info.mk \
+	vendor.mk
+
+do_path_subst = $(AM_V_GEN) \
+                sed -e "s:dpkg_datadir[[:space:]]*=[[:space:]]*[^[:space:]]*:dpkg_datadir = $(pkgdatadir):"
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/mk/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign scripts/mk/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
+	done
+
+uninstall-dist_pkgdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_pkgdataDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_pkgdataDATA
+
+.MAKE: install-am install-data-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-hook install-dist_pkgdataDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_pkgdataDATA
+
+
+install-data-hook:
+	cp -p $(DESTDIR)$(pkgdatadir)/default.mk $(DESTDIR)$(pkgdatadir)/default.mk.tmp
+	$(do_path_subst) <$(DESTDIR)$(pkgdatadir)/default.mk.tmp \
+			 >$(DESTDIR)$(pkgdatadir)/default.mk
+	rm $(DESTDIR)$(pkgdatadir)/default.mk.tmp
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/mk/pkg-info.mk /home/vorlon/devel/multiarch/dpkg-debian/scripts/mk/pkg-info.mk
--- dpkg/scripts/mk/pkg-info.mk	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/mk/pkg-info.mk	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,17 @@
+# Makefile snippet defining the following variables:
+#
+# DEB_SOURCE: the source package name
+# DEB_VERSION: the full version of the package (epoch + upstream vers. + revision)
+# DEB_VERSION_EPOCH_UPSTREAM: the package's version without the Debian revision
+# DEB_VERSION_UPSTREAM_REVISION: the package's version without the Debian epoch
+# DEB_VERSION_UPSTREAM: the package's upstream version
+# DEB_DISTRIBUTION: the distribution(s) listed in the current entry of debian/changelog
+
+dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1)))
+
+DEB_SOURCE = $(call dpkg_late_eval,DEB_SOURCE,awk '/^Source: / { print $$2 }' debian/control)
+DEB_VERSION = $(call dpkg_late_eval,DEB_VERSION,dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
+DEB_VERSION_EPOCH_UPSTREAM = $(call dpkg_late_eval,DEB_VERSION_EPOCH_UPSTREAM,echo '$(DEB_VERSION)' | sed -e 's/-[^-]*$$//')
+DEB_VERSION_UPSTREAM_REVISION = $(call dpkg_late_eval,DEB_VERSION_UPSTREAM_REVISION,echo '$(DEB_VERSION)' | sed -e 's/^[0-9]*://')
+DEB_VERSION_UPSTREAM = $(call dpkg_late_eval,DEB_VERSION_UPSTREAM,echo '$(DEB_VERSION_EPOCH_UPSTREAM)' | sed -e 's/^[0-9]*://')
+DEB_DISTRIBUTION = $(call dpkg_late_eval,DEB_DISTRIBUTION,dpkg-parsechangelog | sed -n -e 's/^Distribution: //p')
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/mk/vendor.mk /home/vorlon/devel/multiarch/dpkg-debian/scripts/mk/vendor.mk
--- dpkg/scripts/mk/vendor.mk	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/mk/vendor.mk	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,18 @@
+# Makefile snippet defining the following vendor-related variables:
+#
+# DEB_VENDOR: output of dpkg-vendor --query Vendor
+# DEB_PARENT_VENDOR: output of dpkg-vendor --query Parent (can be empty)
+#
+# The snippet also defines a macro "dpkg_vendor_derives_from" that you can
+# use to verify if the current vendor derives from another vendor with a
+# simple test like this one:
+# ifeq ($(call dpkg_vendor_derives_from ubuntu),yes)
+#   ...
+# endif
+
+dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1)))
+
+DEB_VENDOR = $(call dpkg_late_eval,DEB_VENDOR,dpkg-vendor --query Vendor)
+DEB_PARENT_VENDOR = $(call dpkg_late_eval,DEB_PARENT_VENDOR,dpkg-vendor --query Parent)
+
+dpkg_vendor_derives_from = dpkg-vendor --derives-from $(1) && echo yes || echo no
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/boldquot.sed /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/boldquot.sed
--- dpkg/scripts/po/boldquot.sed	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/boldquot.sed	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,10 @@
+s/"\([^"]*\)"/“\1”/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“”/""/g
+s/“/“[1m/g
+s/”/[0m”/g
+s/‘/‘[1m/g
+s/’/[0m’/g
Binary files dpkg/scripts/po/ca.gmo and /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/ca.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/ca.po /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/ca.po
--- dpkg/scripts/po/ca.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/ca.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.15.8.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-10-24 18:10+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -18,13 +18,13 @@
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #: scripts/dpkg-architecture.pl:36 scripts/dpkg-buildflags.pl:31
-#: scripts/dpkg-buildpackage.pl:38 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
 #: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:96
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
 #: scripts/dpkg-mergechangelogs.pl:53 scripts/dpkg-name.pl:46
 #: scripts/dpkg-parsechangelog.pl:31 scripts/dpkg-scanpackages.pl:60
 #: scripts/dpkg-scansources.pl:78 scripts/dpkg-shlibdeps.pl:533
-#: scripts/dpkg-source.pl:433 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:455 scripts/changelog/debian.pl:34
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versió %s.\n"
@@ -40,10 +40,10 @@
 "Copyright © 2004-2005 Scott James Remnant <scott@netsplit.com>."
 
 #: scripts/dpkg-architecture.pl:42 scripts/dpkg-buildflags.pl:36
-#: scripts/dpkg-buildpackage.pl:45 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
 #: scripts/dpkg-genchanges.pl:102 scripts/dpkg-gencontrol.pl:62
 #: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
-#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:440
+#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:462
 #: scripts/changelog/debian.pl:39
 msgid ""
 "\n"
@@ -77,7 +77,7 @@
 "  --version          show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:84
+#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:91
 #: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:194
 #: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
 #: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:119
@@ -120,9 +120,13 @@
 msgstr "%s no és un nom de variable gestionat"
 
 #: scripts/dpkg-buildflags.pl:33
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
 msgid ""
 "\n"
-"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+"Copyright (C) 2010-2011 Raphael Hertzog <hertzog@debian.org>."
 msgstr ""
 "\n"
 "Copyright © 2010 Raphael Hertzog <hertzog@debian.org>."
@@ -138,29 +142,27 @@
 "                     value is one of vendor, system, user, env.\n"
 "  --list             output a list of the flags supported by the current "
 "vendor.\n"
-"  --export=(sh|make) output commands to be executed in shell or make that "
-"export\n"
-"                     all the compilation flags as environment variables.\n"
+"  --export=(sh|make|configure)\n"
+"                     output something convenient to import the\n"
+"                     compilation flags in a shell script, in make,\n"
+"                     or on a ./configure command line.\n"
+"  --dump             output all compilation flags with their values\n"
 "  --help             show this help message.\n"
 "  --version          show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-buildflags.pl:63 scripts/dpkg-buildflags.pl:69
-#: scripts/dpkg-buildflags.pl:74
+#: scripts/dpkg-buildflags.pl:66 scripts/dpkg-buildflags.pl:72
+#: scripts/dpkg-buildflags.pl:77 scripts/dpkg-buildflags.pl:81
 #, perl-format
 msgid "two commands specified: --%s and --%s"
 msgstr "s'ha especificat dos ordres: --%s i --%s"
 
-#: scripts/dpkg-buildflags.pl:67
+#: scripts/dpkg-buildflags.pl:70
 #, perl-format
 msgid "%s needs a parameter"
 msgstr "%s requereix un paràmetre"
 
-#: scripts/dpkg-buildflags.pl:88
-msgid "need an action option"
-msgstr "es requereix una opció d'acció"
-
-#: scripts/dpkg-buildpackage.pl:40
+#: scripts/dpkg-buildpackage.pl:39
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -172,7 +174,7 @@
 "Copyright © 2000 Wichert Akkerman.\n"
 "Copyright © 2007 Frank Lichtenheld"
 
-#: scripts/dpkg-buildpackage.pl:52
+#: scripts/dpkg-buildpackage.pl:51
 #, perl-format
 msgid ""
 "\n"
@@ -228,89 +230,84 @@
 "      --version  show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:201 scripts/dpkg-buildpackage.pl:207
-#: scripts/dpkg-buildpackage.pl:213 scripts/dpkg-buildpackage.pl:219
-#: scripts/dpkg-buildpackage.pl:224 scripts/dpkg-genchanges.pl:143
+#: scripts/dpkg-buildpackage.pl:200 scripts/dpkg-buildpackage.pl:206
+#: scripts/dpkg-buildpackage.pl:212 scripts/dpkg-buildpackage.pl:218
+#: scripts/dpkg-buildpackage.pl:223 scripts/dpkg-genchanges.pl:143
 #: scripts/dpkg-genchanges.pl:146 scripts/dpkg-genchanges.pl:150
 #: scripts/dpkg-genchanges.pl:154
 #, perl-format
 msgid "cannot combine %s and %s"
 msgstr "no es pot combinar %s amb %s"
 
-#: scripts/dpkg-buildpackage.pl:237 scripts/dpkg-source.pl:187
+#: scripts/dpkg-buildpackage.pl:236 scripts/dpkg-source.pl:202
 msgid "-E and -W are deprecated, they are without effect"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:241
+#: scripts/dpkg-buildpackage.pl:240
 #, perl-format
 msgid "unknown option or argument %s"
 msgstr "l'opció o argument %s és desconeguda"
 
-#: scripts/dpkg-buildpackage.pl:251
+#: scripts/dpkg-buildpackage.pl:250
 msgid "using a gain-root-command while being root"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:257
+#: scripts/dpkg-buildpackage.pl:256
 msgid ""
 "fakeroot not found, either install the fakeroot\n"
 "package, specify a command with the -r option, or run this as root"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:261
+#: scripts/dpkg-buildpackage.pl:260
 #, perl-format
 msgid "gain-root-commmand '%s' not found"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:280
+#: scripts/dpkg-buildpackage.pl:279
 msgid "unknown sign command, assuming pgp style interface"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:283
+#: scripts/dpkg-buildpackage.pl:282
 msgid "PGP support is deprecated (see README.feature-removal-schedule)"
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl:301
-#, perl-format
-msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
-msgstr "%s: s'està exportant %s de dpkg-buildflags (origen: %s): %s\n"
-
-#: scripts/dpkg-buildpackage.pl:310
 msgid "source package"
 msgstr "paquet font"
 
-#: scripts/dpkg-buildpackage.pl:311
+#: scripts/dpkg-buildpackage.pl:302
 msgid "source version"
 msgstr "versió del font"
 
-#: scripts/dpkg-buildpackage.pl:321
+#: scripts/dpkg-buildpackage.pl:312
 msgid "source changed by"
 msgstr "font canviat per"
 
-#: scripts/dpkg-buildpackage.pl:339
+#: scripts/dpkg-buildpackage.pl:330
 msgid "host architecture"
 msgstr "arquitectura de l'amfitrió"
 
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:343
 msgid "debian/rules is not executable: fixing that."
 msgstr "debian/rules no és executable: s'està corregint això."
 
-#: scripts/dpkg-buildpackage.pl:371
+#: scripts/dpkg-buildpackage.pl:362
 msgid "Build dependencies/conflicts unsatisfied; aborting."
 msgstr "Dependències/conflictes de construcció no satisfetes; s'està avortant."
 
-#: scripts/dpkg-buildpackage.pl:372
+#: scripts/dpkg-buildpackage.pl:363
 msgid "(Use -d flag to override.)"
 msgstr "(Empreu el senyalador -d flag per a ometre-ho.)"
 
-#: scripts/dpkg-buildpackage.pl:375
+#: scripts/dpkg-buildpackage.pl:366
 msgid "This is currently a non-fatal warning with -S, but"
 msgstr "Açò és actualment només un avís amb -S, però"
 
-#: scripts/dpkg-buildpackage.pl:376
+#: scripts/dpkg-buildpackage.pl:367
 msgid "will probably become fatal in the future."
 msgstr "probablement serà fatal en el futur."
 
-#: scripts/dpkg-buildpackage.pl:398
+#: scripts/dpkg-buildpackage.pl:389
 msgid ""
 "it is a bad idea to generate a source package without cleaning up first, it "
 "might contain undesired files."
@@ -318,56 +315,56 @@
 "no és bona idea generar un paquet font sense netejar-lo primer, podria "
 "contenir fitxers no desitjats."
 
-#: scripts/dpkg-buildpackage.pl:411
+#: scripts/dpkg-buildpackage.pl:402
 msgid "Press the return key to start signing process\n"
 msgstr "Premeu la tecla de retorn per a començar el procés de signat\n"
 
-#: scripts/dpkg-buildpackage.pl:418
+#: scripts/dpkg-buildpackage.pl:409
 msgid "Failed to sign .dsc and .changes file"
 msgstr "No s'ha pogut signar els fitxers .dsc i .changes"
 
-#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:437
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:424 scripts/dpkg-buildpackage.pl:428
+#: scripts/dpkg-buildpackage.pl:441
 msgid "write changes file"
 msgstr "escriu un fitxer de canvis"
 
-#: scripts/dpkg-buildpackage.pl:449
+#: scripts/dpkg-buildpackage.pl:440
 msgid "dpkg-genchanges"
 msgstr "dpkg-genchanges"
 
-#: scripts/dpkg-buildpackage.pl:458
+#: scripts/dpkg-buildpackage.pl:449
 msgid "source only upload: Debian-native package"
 msgstr "pujada de només font: paquet nadiu de Debian"
 
-#: scripts/dpkg-buildpackage.pl:460
+#: scripts/dpkg-buildpackage.pl:451
 msgid "source only, diff-only upload (original source NOT included)"
 msgstr "pujada de només font, només diff (NO s'inclou el codi font original)"
 
-#: scripts/dpkg-buildpackage.pl:462
+#: scripts/dpkg-buildpackage.pl:453
 msgid "source only upload (original source is included)"
 msgstr "pujada de només font (s'inclou el codi font original)"
 
-#: scripts/dpkg-buildpackage.pl:465 scripts/dpkg-buildpackage.pl:473
+#: scripts/dpkg-buildpackage.pl:456 scripts/dpkg-buildpackage.pl:464
 msgid "full upload (original source is included)"
 msgstr "pujada sencera (s'inclou el codi font original)"
 
-#: scripts/dpkg-buildpackage.pl:467
+#: scripts/dpkg-buildpackage.pl:458
 msgid "binary only upload (no source included)"
 msgstr "pujada de només binaris (no s'inclou el codi font)"
 
-#: scripts/dpkg-buildpackage.pl:469
+#: scripts/dpkg-buildpackage.pl:460
 msgid "full upload; Debian-native package (full source is included)"
 msgstr "pujada sencera; paquet nadiu de Debian (s'inclou el codi font sencer)"
 
-#: scripts/dpkg-buildpackage.pl:471
+#: scripts/dpkg-buildpackage.pl:462
 msgid "binary and diff upload (original source NOT included)"
 msgstr "pujada de binaris i diff (NO s'inclou el codi font original)"
 
-#: scripts/dpkg-buildpackage.pl:478
+#: scripts/dpkg-buildpackage.pl:469
 msgid "Failed to sign .changes file"
 msgstr "No s'ha pogut signar el fitxer .changes"
 
-#: scripts/dpkg-buildpackage.pl:497
+#: scripts/dpkg-buildpackage.pl:488
 #, perl-format
 msgid "unable to determine %s"
 msgstr "no es pot determinar %s"
@@ -406,7 +403,7 @@
 msgid "%s: Build conflicts: "
 msgstr "%s: Conflictes de construcció: "
 
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:236
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:253
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "s'ha produït un error en analitzar %s"
@@ -445,29 +442,29 @@
 msgid "filename, section and priority may contain no whitespace"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:334
 msgid "open new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:345
 msgid "copy old entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:349
 #, fuzzy
 msgid "read old files list file"
 msgstr "no es pot eliminar la llista de fitxers antiga"
 
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:359
 msgid "write new entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:360
 #, fuzzy
 msgid "close new files list file"
 msgstr "no es pot tancar el fitxer d'activadors de fitxer nou «%.250s»"
 
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:361
 #, fuzzy
 msgid "install new files list file"
 msgstr ""
@@ -598,7 +595,7 @@
 msgid "missing Priority for source files"
 msgstr "manca informació per al camp d'eixida %s"
 
-#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:327
+#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:346
 #: scripts/Dpkg/Vendor.pm:71
 #, perl-format
 msgid "%s is empty"
@@ -625,13 +622,13 @@
 msgid "write original source message"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:426
+#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:532
 #, fuzzy, perl-format
 msgid "missing information for critical output field %s"
 msgstr "manca informació per al camp d'eixida %s"
 
 #: scripts/dpkg-genchanges.pl:499 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:431
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:537
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "manca informació per al camp d'eixida %s"
@@ -738,34 +735,42 @@
 msgid "chdir for du to `%s'"
 msgstr "«chdir» per a du a «%s»"
 
-#: scripts/dpkg-gencontrol.pl:304 scripts/dpkg-shlibdeps.pl:843
+#: scripts/dpkg-gencontrol.pl:305 scripts/dpkg-shlibdeps.pl:843
 #: scripts/Dpkg/IPC.pm:271 scripts/Dpkg/Shlibs/Cppfilt.pm:50
 #, fuzzy, perl-format
 #| msgid "unable to execute c++filt"
 msgid "unable to execute %s"
 msgstr "no es pot executar el c++filt"
 
-#: scripts/dpkg-gencontrol.pl:311
+#: scripts/dpkg-gencontrol.pl:312
 #, perl-format
 msgid "du in `%s'"
 msgstr "du en «%s»"
 
-#: scripts/dpkg-gencontrol.pl:313
+#: scripts/dpkg-gencontrol.pl:314
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:346
+#: scripts/dpkg-gencontrol.pl:347
 #, fuzzy
 msgid "close old files list file"
 msgstr "no es pot eliminar la llista de fitxers antiga"
 
-#: scripts/dpkg-gencontrol.pl:368
+#: scripts/dpkg-gencontrol.pl:369
 #, fuzzy, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "no s'ha pogut obrir el nou fitxer de statoverride"
 
-#: scripts/dpkg-gencontrol.pl:379
+#: scripts/dpkg-gencontrol.pl:378 scripts/dpkg-shlibdeps.pl:523
+#: scripts/Dpkg/Interface/Storable.pm:91
+#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
+#: scripts/Dpkg/Source/Package/V2.pm:607
+#, perl-format
+msgid "cannot close %s"
+msgstr "no es pot tancar %s"
+
+#: scripts/dpkg-gencontrol.pl:380
 #, fuzzy, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "fitxer de control binari %s"
@@ -854,11 +859,15 @@
 msgstr ""
 
 #: scripts/dpkg-gensymbols.pl:291
+msgid "the generated symbols file is empty"
+msgstr ""
+
+#: scripts/dpkg-gensymbols.pl:293
 #, perl-format
 msgid "%s doesn't match completely %s"
 msgstr "%s no concorda completament amb %s"
 
-#: scripts/dpkg-gensymbols.pl:294
+#: scripts/dpkg-gensymbols.pl:296
 #, perl-format
 msgid "no debian/symbols file used as basis for generating %s"
 msgstr ""
@@ -894,19 +903,20 @@
 "  --help                   mostra aquest missatge d'ajuda.\n"
 "  --version                mostra la versió.\n"
 
-#: scripts/dpkg-mergechangelogs.pl:129
+#: scripts/dpkg-mergechangelogs.pl:129 scripts/dpkg-mergechangelogs.pl:131
 #: scripts/Dpkg/Compression/FileHandle.pm:385
 #: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
 #: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Functions.pm:78
-#: scripts/Dpkg/Source/Package.pm:347 scripts/Dpkg/Source/Package.pm:444
-#: scripts/Dpkg/Source/Package/V2.pm:210 scripts/Dpkg/Source/Package/V2.pm:477
-#: scripts/Dpkg/Source/Package/V2.pm:522
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:224
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:323
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:333
+#: scripts/Dpkg/Source/Package.pm:447 scripts/Dpkg/Source/Package.pm:550
+#: scripts/Dpkg/Source/Package/V2.pm:217 scripts/Dpkg/Source/Package/V2.pm:530
+#: scripts/Dpkg/Source/Package/V2.pm:605
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:226
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:234
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:341
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:351
 #, perl-format
 msgid "cannot write %s"
 msgstr "no es pot escriure %s"
@@ -940,7 +950,7 @@
 #: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:138 scripts/Dpkg/Arch.pm:157
 #: scripts/Dpkg/Arch.pm:176 scripts/Dpkg/Changelog/Parse.pm:142
 #: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:138
+#: scripts/Dpkg/Source/Package.pm:193
 #, perl-format
 msgid "cannot open %s"
 msgstr "no es pot obrir %s"
@@ -1051,8 +1061,9 @@
 msgstr ""
 
 #: scripts/dpkg-parsechangelog.pl:117
-#, perl-format
-msgid "%s takes no non-option arguments"
+#, fuzzy
+#| msgid "%s takes no non-option arguments"
+msgid "takes no non-option arguments"
 msgstr "%s no accepta cap argument que no siguen opcions"
 
 #: scripts/dpkg-scanpackages.pl:66
@@ -1088,8 +1099,8 @@
 msgid "Unconditional maintainer override for %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:158
-msgid "1 to 3 args expected"
+#: scripts/dpkg-scanpackages.pl:158 scripts/dpkg-scansources.pl:302
+msgid "one to three arguments expected"
 msgstr ""
 
 #: scripts/dpkg-scanpackages.pl:175
@@ -1234,10 +1245,6 @@
 msgid "no binary packages specified in %s"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:302
-msgid "1 to 3 args expected\n"
-msgstr ""
-
 #: scripts/dpkg-shlibdeps.pl:93
 #, fuzzy, perl-format
 msgid "administrative directory '%s' does not exist"
@@ -1434,123 +1441,150 @@
 msgid "unknown output from dpkg --search: '%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:100
+#: scripts/dpkg-source.pl:104
 #, fuzzy, perl-format
 msgid "%s needs a directory"
 msgstr "--%s necessita un <directori> com a paràmetre"
 
-#: scripts/dpkg-source.pl:103
+#: scripts/dpkg-source.pl:110
 #, perl-format
 msgid "cannot stat directory %s"
 msgstr "no es pot fer «stat» sobre el fitxer %s"
 
-#: scripts/dpkg-source.pl:105
+#: scripts/dpkg-source.pl:112
 #, fuzzy, perl-format
 msgid "directory argument %s is not a directory"
 msgstr "el directori de control no és un directori"
 
-#: scripts/dpkg-source.pl:123
+#: scripts/dpkg-source.pl:117 scripts/Dpkg/Source/Package/V2.pm:476
+#: scripts/Dpkg/Source/Package/V2.pm:478 scripts/Dpkg/Source/Package/V2.pm:480
+#: scripts/Dpkg/Source/Package/V2.pm:482
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
+#: scripts/Dpkg/Source/Package/V3/git.pm:104
+#: scripts/Dpkg/Source/Package/V3/git.pm:143
+#: scripts/Dpkg/Source/Package/V3/git.pm:155
+#: scripts/Dpkg/Source/Package/V3/git.pm:174
+#, fuzzy, perl-format
+msgid "unable to chdir to `%s'"
+msgstr "s'ha produït un error en canviar al directori «%.255s»"
+
+#: scripts/dpkg-source.pl:135
 #, fuzzy, perl-format
 msgid "using options from %s: %s"
 msgstr "S'està canviant el nom de l'enllaç %s de %s a %s."
 
-#: scripts/dpkg-source.pl:138 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:150 scripts/Dpkg/Compression.pm:173
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "%s no es una compressió implementada"
 
-#: scripts/dpkg-source.pl:144 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:156 scripts/Dpkg/Compression.pm:202
 #: scripts/Dpkg/Compression/Process.pm:86
 #, perl-format
 msgid "%s is not a compression level"
 msgstr "%s no és un nivell de compressió"
 
-#: scripts/dpkg-source.pl:199
-msgid "need a command (-x, -b, --before-build, --after-build, --print-format)"
+#: scripts/dpkg-source.pl:214
+msgid ""
+"need a command (-x, -b, --before-build, --after-build, --print-format, --"
+"commit)"
+msgstr ""
+
+#: scripts/dpkg-source.pl:238
+#, perl-format
+msgid "%s doesn't contain any information about the source package"
 msgstr ""
 
-#: scripts/dpkg-source.pl:268
+#: scripts/dpkg-source.pl:283
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "«%s» no és una cadena d'arquitectura vàlida"
 
-#: scripts/dpkg-source.pl:271
+#: scripts/dpkg-source.pl:286
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 
-#: scripts/dpkg-source.pl:324 scripts/Dpkg/BuildFlags.pm:190
+#: scripts/dpkg-source.pl:301
+#, fuzzy, perl-format
+msgid "%s doesn't list any binary package"
+msgstr "El paquet «%s» no conté cap fitxer (!)\n"
+
+#: scripts/dpkg-source.pl:343 scripts/Dpkg/BuildFlags.pm:270
 #: scripts/Dpkg/Compression/FileHandle.pm:401
 #: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:122
-#: scripts/Dpkg/Source/Package/V2.pm:360 scripts/Dpkg/Source/Package/V2.pm:505
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:276
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:330
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:377
+#: scripts/Dpkg/Source/Package/V2.pm:277 scripts/Dpkg/Source/Package/V2.pm:425
+#: scripts/Dpkg/Source/Package/V2.pm:561
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:112
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:286
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:348
 #, perl-format
 msgid "cannot read %s"
 msgstr "no es pot llegir %s"
 
-#: scripts/dpkg-source.pl:331
+#: scripts/dpkg-source.pl:350
 #, perl-format
 msgid "no source format specified in %s, see dpkg-source(1)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:356
+#: scripts/dpkg-source.pl:378
 #, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:359
+#: scripts/dpkg-source.pl:381
 #, perl-format
 msgid "using source format `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:366 scripts/Dpkg/Source/Package/V1.pm:300
-#: scripts/Dpkg/Source/Package/V1.pm:345 scripts/Dpkg/Source/Package/V2.pm:488
+#: scripts/dpkg-source.pl:388 scripts/Dpkg/Source/Package/V1.pm:301
+#: scripts/Dpkg/Source/Package/V1.pm:346 scripts/Dpkg/Source/Package/V2.pm:541
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
-#: scripts/Dpkg/Source/Package/V3/native.pm:83
+#: scripts/Dpkg/Source/Package/V3/native.pm:84
 #, perl-format
 msgid "building %s in %s"
 msgstr "s'està construint %s a %s"
 
-#: scripts/dpkg-source.pl:377
+#: scripts/dpkg-source.pl:399
 msgid "-x needs at least one argument, the .dsc"
 msgstr "--x necessita almenys un argument, el .dsc"
 
-#: scripts/dpkg-source.pl:380
+#: scripts/dpkg-source.pl:402
 msgid "-x takes no more than two arguments"
 msgstr "-x no accepta més de dos arguments"
 
-#: scripts/dpkg-source.pl:384
+#: scripts/dpkg-source.pl:406
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr "- necessita el fitxer .dsc com a primer argument, no un directori"
 
-#: scripts/dpkg-source.pl:400
+#: scripts/dpkg-source.pl:422
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "la destinació del desempaquetament existeix: %s"
 
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:432
 #, perl-format
 msgid "%s doesn't contain a valid OpenPGP signature"
 msgstr ""
 
-#: scripts/dpkg-source.pl:412
+#: scripts/dpkg-source.pl:434
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "s'està extraient el paquet font sense signar (%s)"
 
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:441
 #, perl-format
 msgid "extracting %s in %s"
 msgstr "s'està extraient %s des de %s"
 
-#: scripts/dpkg-source.pl:427
+#: scripts/dpkg-source.pl:449
 msgid "only one of -x, -b or --print-format allowed, and only once"
 msgstr ""
 
-#: scripts/dpkg-source.pl:435
+#: scripts/dpkg-source.pl:457
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson\n"
@@ -1562,7 +1596,7 @@
 "Copyright © 1997 Klee Dienes\n"
 "Copyright © 2008 Raphael Hertzog"
 
-#: scripts/dpkg-source.pl:448
+#: scripts/dpkg-source.pl:470
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -1572,10 +1606,12 @@
 "                           extract source package.\n"
 "  -b <dir>                 build source package.\n"
 "  --print-format <dir>     print the source format that would be\n"
-"                           used to build the source package."
+"                           used to build the source package.\n"
+"  --commit [<dir> [<patch-name>]]\n"
+"                           store upstream changes in a new patch."
 msgstr ""
 
-#: scripts/dpkg-source.pl:457
+#: scripts/dpkg-source.pl:481
 #, perl-format
 msgid ""
 "Build options:\n"
@@ -1597,7 +1633,7 @@
 "                             supported are: '1'-'9', 'best', 'fast')"
 msgstr ""
 
-#: scripts/dpkg-source.pl:475
+#: scripts/dpkg-source.pl:499
 msgid ""
 "Extract options:\n"
 "  --no-copy                don't copy .orig tarballs\n"
@@ -1607,7 +1643,7 @@
 "signature"
 msgstr ""
 
-#: scripts/dpkg-source.pl:480
+#: scripts/dpkg-source.pl:504
 msgid ""
 "General options:\n"
 "  -h, --help               show this help message.\n"
@@ -1617,7 +1653,7 @@
 "  -h, --help               mostra aquest missatge d'ajuda.\n"
 "      --version            mostra la versió."
 
-#: scripts/dpkg-source.pl:484
+#: scripts/dpkg-source.pl:508
 msgid ""
 "More options are available but they depend on the source package format.\n"
 "See dpkg-source(1) for more info."
@@ -1677,12 +1713,12 @@
 msgstr "<entrada estàndard>"
 
 #: scripts/changelog/debian.pl:136
-msgid "fatal error occured while parsing input"
+msgid "fatal error occurred while parsing input"
 msgstr "s'ha produït un error fatal en analitzar l'entrada"
 
 #: scripts/changelog/debian.pl:139
 #, perl-format
-msgid "fatal error occured while parsing %s"
+msgid "fatal error occurred while parsing %s"
 msgstr "s'ha produït un error fatal en analitzar %s"
 
 #: scripts/Dpkg/Arch.pm:86
@@ -1697,17 +1733,17 @@
 "Unknown gcc system type %s, falling back to default (native compilation)"
 msgstr ""
 
-#: scripts/Dpkg/BuildFlags.pm:198
+#: scripts/Dpkg/BuildFlags.pm:278
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
 msgstr ""
 
-#: scripts/Dpkg/BuildFlags.pm:207
+#: scripts/Dpkg/BuildFlags.pm:291
 #, fuzzy, perl-format
 msgid "line %d of %s is invalid, it has been ignored."
 msgstr "  %.250s està desempaquetat, però no ha estat configurat.\n"
 
-#: scripts/Dpkg/BuildOptions.pm:91
+#: scripts/Dpkg/BuildOptions.pm:94
 #, perl-format
 msgid "invalid flag in %s: %s"
 msgstr "senyalador invàlid a %s: %s"
@@ -1962,9 +1998,10 @@
 msgstr ""
 
 #: scripts/Dpkg/Control.pm:156 scripts/Dpkg/Control.pm:158
-#, perl-format
-msgid "entry of APT's %s file"
-msgstr ""
+#, fuzzy, perl-format
+#| msgid "entry in dpkg's status file"
+msgid "entry in repository's %s file"
+msgstr "entrada al fitxer d'estat del dpkg"
 
 #: scripts/Dpkg/Control.pm:160 scripts/Dpkg/Control.pm:164
 #, perl-format
@@ -1996,8 +2033,9 @@
 msgid "first block lacks a source field"
 msgstr ""
 
-#: scripts/Dpkg/Control/Info.pm:110
-msgid "block lacks a package field"
+#: scripts/Dpkg/Control/Info.pm:110 scripts/Dpkg/Control/Info.pm:113
+#, perl-format
+msgid "block lacks the '%s' field"
 msgstr ""
 
 #: scripts/Dpkg/Control/Hash.pm:172
@@ -2072,17 +2110,11 @@
 msgid "%s failed with unknown exit code %d"
 msgstr "el subprocés %s ha fallat amb codi d'estat en espera %d"
 
-#: scripts/Dpkg/ErrorHandling.pm:113
+#: scripts/Dpkg/ErrorHandling.pm:115
 #, fuzzy, perl-format
 msgid "syntax error in %s at line %d: %s"
 msgstr "error de sintaxi al fitxer de statoverride"
 
-#: scripts/Dpkg/Interface/Storable.pm:91
-#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
-#, perl-format
-msgid "cannot close %s"
-msgstr "no es pot tancar %s"
-
 #: scripts/Dpkg/IPC.pm:211 scripts/Dpkg/IPC.pm:217 scripts/Dpkg/IPC.pm:223
 #, perl-format
 msgid "pipe for %s"
@@ -2176,8 +2208,8 @@
 msgid "cannot create directory %s"
 msgstr "no es pot crear el directori %s"
 
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:231
-#: scripts/Dpkg/Source/Package/V2.pm:192
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:307
+#: scripts/Dpkg/Source/Package/V2.pm:199
 #, perl-format
 msgid "cannot opendir %s"
 msgstr "no es pot obrir el directori %s"
@@ -2212,7 +2244,7 @@
 msgid "cannot read timestamp from %s"
 msgstr "no es pot crear el directori %s"
 
-#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:378
+#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:443
 msgid "binary file contents changed"
 msgstr "ha canviat el contingut d'un fitxer binari"
 
@@ -2284,7 +2316,7 @@
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:377
+#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:442
 #, perl-format
 msgid "cannot represent change to %s: %s"
 msgstr "no es pot representar el canvi a %s: %s"
@@ -2330,7 +2362,7 @@
 msgstr ""
 
 #: scripts/Dpkg/Source/Patch.pm:410
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:127
 #, perl-format
 msgid "%s contains an insecure path: %s"
 msgstr ""
@@ -2394,7 +2426,7 @@
 msgid "nonexistent"
 msgstr "no existent"
 
-#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:358
+#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:458
 #, fuzzy, perl-format
 msgid "cannot stat %s"
 msgstr "no es pot fer «stat» sobre «%s»: %s"
@@ -2428,331 +2460,347 @@
 msgid "named socket"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:133
+#: scripts/Dpkg/Source/Package.pm:188
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:153
+#: scripts/Dpkg/Source/Package.pm:208
 #, fuzzy, perl-format
 msgid "missing critical source control field %s"
 msgstr "fitxer de control font %s"
 
-#: scripts/Dpkg/Source/Package.pm:181
+#: scripts/Dpkg/Source/Package.pm:236
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:185
+#: scripts/Dpkg/Source/Package.pm:240
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:212
+#: scripts/Dpkg/Source/Package.pm:288
 msgid "source and version are required to compute the source basename"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:278 scripts/Dpkg/Source/Package.pm:280
+#: scripts/Dpkg/Source/Package.pm:371 scripts/Dpkg/Source/Package.pm:373
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "no s'ha pogut verificar la signatura de %s"
 
-#: scripts/Dpkg/Source/Package.pm:287 scripts/Dpkg/Source/Package.pm:289
+#: scripts/Dpkg/Source/Package.pm:380 scripts/Dpkg/Source/Package.pm:382
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr ""
 "no s'ha pogut verificar la signatura de %s perquè gpg no està instal·lat"
 
-#: scripts/Dpkg/Source/Package.pm:298
+#: scripts/Dpkg/Source/Package.pm:391
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr "%s no és una opció vàlida per a %s"
 
-#: scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Package.pm:460
 #, fuzzy, perl-format
 msgid "%s does not exist"
 msgstr "s'ha donat --update però %s no existeix"
 
-#: scripts/Dpkg/Source/Package.pm:364
+#: scripts/Dpkg/Source/Package.pm:464
 #, fuzzy, perl-format
 msgid "cannot make %s executable"
 msgstr "no es pot moure «%s» a un fitxer existent"
 
-#: scripts/Dpkg/Source/Package.pm:366
+#: scripts/Dpkg/Source/Package.pm:466
 #, fuzzy, perl-format
 msgid "%s is not a plain file"
 msgstr " %s (no és un fitxer normal)\n"
 
-#: scripts/Dpkg/Source/Package/V1.pm:61
+#: scripts/Dpkg/Source/Package.pm:517
+#, fuzzy, perl-format
+#| msgid "%s is not a supported compression"
+msgid "'%s' is not supported by the source format '%s'"
+msgstr "%s no es una compressió implementada"
+
+#: scripts/Dpkg/Source/Package/V1.pm:62
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:83
+#: scripts/Dpkg/Source/Package/V1.pm:84
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:95
-#: scripts/Dpkg/Source/Package/V3/native.pm:50
+#: scripts/Dpkg/Source/Package/V1.pm:96
+#: scripts/Dpkg/Source/Package/V3/native.pm:51
 msgid "multiple tarfiles in v1.0 source package"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:100 scripts/Dpkg/Source/Package/V2.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:101 scripts/Dpkg/Source/Package/V2.pm:129
 #, perl-format
 msgid "unrecognized file for a %s source package: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:105
-#: scripts/Dpkg/Source/Package/V3/native.pm:57
+#: scripts/Dpkg/Source/Package/V1.pm:106
+#: scripts/Dpkg/Source/Package/V3/native.pm:58
 msgid "no tarfile in Files field"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:108
+#: scripts/Dpkg/Source/Package/V1.pm:109
 msgid "native package with .orig.tar"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:121
+#: scripts/Dpkg/Source/Package/V1.pm:122
 #, fuzzy, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr "no es pot canviar el nom de %s a %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:125 scripts/Dpkg/Source/Package/V2.pm:134
-#: scripts/Dpkg/Source/Package/V2.pm:146 scripts/Dpkg/Source/Package/V2.pm:159
+#: scripts/Dpkg/Source/Package/V1.pm:126 scripts/Dpkg/Source/Package/V2.pm:141
+#: scripts/Dpkg/Source/Package/V2.pm:153 scripts/Dpkg/Source/Package/V2.pm:166
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:190
-#: scripts/Dpkg/Source/Package/V3/native.pm:60
+#: scripts/Dpkg/Source/Package/V3/native.pm:61
 #, perl-format
 msgid "unpacking %s"
 msgstr "s'està desempaquetant %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:132
+#: scripts/Dpkg/Source/Package/V1.pm:133
 #, fuzzy
 msgid "unable to keep orig directory (already exists)"
 msgstr "no es pot obrir el directori de control temporal"
 
-#: scripts/Dpkg/Source/Package/V1.pm:139
+#: scripts/Dpkg/Source/Package/V1.pm:140
 #, fuzzy, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr "no es pot suprimir la versió acabada d'extraure de «%.250s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:145
+#: scripts/Dpkg/Source/Package/V1.pm:146
 #, fuzzy, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr "no es pot canviar el nom de %s a %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:152 scripts/Dpkg/Source/Package/V2.pm:214
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:171
+#: scripts/Dpkg/Source/Package/V1.pm:153 scripts/Dpkg/Source/Package/V2.pm:222
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:172
 #, perl-format
 msgid "applying %s"
 msgstr "s'està aplicant %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:157
+#: scripts/Dpkg/Source/Package/V1.pm:158
 #, perl-format
 msgid "upstream files that have been modified: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:167
+#: scripts/Dpkg/Source/Package/V1.pm:168
 msgid "only supports gzip compression"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:178
+#: scripts/Dpkg/Source/Package/V1.pm:179
 msgid ""
 "-b takes at most a directory and an orig source argument (with v1.0 source "
 "package)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:184
+#: scripts/Dpkg/Source/Package/V1.pm:185
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:200
 #, fuzzy, perl-format
 msgid "packed orig `%s' exists but is not a plain file"
 msgstr "el fitxer part «%.250s» no és un fitxer normal"
 
-#: scripts/Dpkg/Source/Package/V1.pm:211
+#: scripts/Dpkg/Source/Package/V1.pm:212
 #, perl-format
 msgid "cannot stat orig argument %s"
 msgstr "no es pot fer «stat» sobre l'argument original %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:217
+#: scripts/Dpkg/Source/Package/V1.pm:218
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
 "orig.tar.<ext>)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:225
+#: scripts/Dpkg/Source/Package/V1.pm:226
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
 "orig/)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:230
+#: scripts/Dpkg/Source/Package/V1.pm:231
 #, fuzzy, perl-format
 msgid "orig argument %s is not a plain file or directory"
 msgstr "el conffile «%s» no és un fitxer normal"
 
-#: scripts/Dpkg/Source/Package/V1.pm:236
+#: scripts/Dpkg/Source/Package/V1.pm:237
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s"
 "%s wants something"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:249
+#: scripts/Dpkg/Source/Package/V1.pm:250
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:255
 #, fuzzy, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr "no es pot fer «stat» sobre el fitxer nou «%.250s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:264
 #, perl-format
 msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:273
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:281
+#: scripts/Dpkg/Source/Package/V1.pm:282
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:293
+#: scripts/Dpkg/Source/Package/V1.pm:294
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
 "override"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:297
+#: scripts/Dpkg/Source/Package/V1.pm:298
 #, fuzzy, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr "no es pot comprovar l'existència de «%.250s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:312 scripts/Dpkg/Source/Package/V1.pm:374
-#: scripts/Dpkg/Source/Package/V3/native.pm:96
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V1.pm:375
+#: scripts/Dpkg/Source/Package/V3/native.pm:98
 #, fuzzy, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr "no es pot canviar el nom de %s a %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:315 scripts/Dpkg/Source/Package/V1.pm:377
-#: scripts/Dpkg/Source/Package/V2.pm:461
-#: scripts/Dpkg/Source/Package/V3/native.pm:99
+#: scripts/Dpkg/Source/Package/V1.pm:316 scripts/Dpkg/Source/Package/V1.pm:378
+#: scripts/Dpkg/Source/Package/V2.pm:603
+#: scripts/Dpkg/Source/Package/V3/native.pm:102
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:367
 #, fuzzy, perl-format
 msgid "unable to change permission of `%s'"
 msgstr "no es poden establir els permisos d'execució en «%.250s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:317 scripts/Dpkg/Source/Package/V2.pm:330
+#: scripts/Dpkg/Source/Package/V1.pm:318 scripts/Dpkg/Source/Package/V2.pm:348
 #, perl-format
 msgid "building %s using existing %s"
 msgstr "s'està construint %s emprant %s existent"
 
-#: scripts/Dpkg/Source/Package/V1.pm:326
+#: scripts/Dpkg/Source/Package/V1.pm:327
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
 "sP to override"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:334
+#: scripts/Dpkg/Source/Package/V1.pm:335
 #, fuzzy, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr "no es pot comprovar l'existència de «%.250s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:365
+#: scripts/Dpkg/Source/Package/V1.pm:366
 #, perl-format
 msgid "the diff modifies the following upstream files: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:367
+#: scripts/Dpkg/Source/Package/V1.pm:368
 msgid ""
 "use the '3.0 (quilt)' format to have separate and documented changes to "
 "upstream files, see dpkg-source(1)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:369 scripts/Dpkg/Source/Package/V2.pm:465
+#: scripts/Dpkg/Source/Package/V1.pm:370
 msgid "aborting due to --abort-on-upstream-changes"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:387
+#: scripts/Dpkg/Source/Package/V1.pm:388
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr "%s: hi ha canvis no representables al font"
 
-#: scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V2.pm:119
 #, fuzzy, perl-format
 msgid "duplicate files in %s source package: %s.*"
 msgstr "S'està reemplaçant fitxers del paquet antic %s …\n"
 
-#: scripts/Dpkg/Source/Package/V2.pm:128
+#: scripts/Dpkg/Source/Package/V2.pm:135
 msgid "missing orig.tar or debian.tar file in v2.0 source package"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:148
+#: scripts/Dpkg/Source/Package/V2.pm:155
 #, perl-format
 msgid "required removal of `%s' installed by original tarball"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:232
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:245
+#: scripts/Dpkg/Source/Package/V2.pm:240
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
 #, perl-format
 msgid "unapplying %s"
 msgstr "s'està desaplicant %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:246 scripts/Dpkg/Source/Package/V2.pm:328
-msgid "no orig.tar file found"
-msgstr "no s'ha trobat el fitxer orig.tar"
-
-#: scripts/Dpkg/Source/Package/V2.pm:285
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:310
-msgid ""
-"patches have not been applied, applying them now (use --no-preparation to "
-"override)"
+#: scripts/Dpkg/Source/Package/V2.pm:263 scripts/Dpkg/Source/Package/V2.pm:344
+#, perl-format
+msgid "no upstream tarball found at %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:295
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
-#: scripts/Dpkg/Source/Package/V3/native.pm:75
-#, perl-format
-msgid "-b takes only one parameter with format `%s'"
+#: scripts/Dpkg/Source/Package/V2.pm:314
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:329
+msgid "patches are not applied, applying them now"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:315
+#: scripts/Dpkg/Source/Package/V2.pm:331
 #, fuzzy, perl-format
 msgid "several orig.tar files found (%s and %s) but only one is allowed"
 msgstr ""
 "s'han trobat diverses entrades d'informació de paquets, només se'n permet una"
 
-#: scripts/Dpkg/Source/Package/V2.pm:351
+#: scripts/Dpkg/Source/Package/V2.pm:370
 #, fuzzy
 msgid "copy of the debian directory"
 msgstr "no es pot llegir el directori «info»"
 
-#: scripts/Dpkg/Source/Package/V2.pm:379
+#: scripts/Dpkg/Source/Package/V2.pm:388
+msgid "unrepresentable changes to source"
+msgstr "hi ha canvis no representables al font"
+
+#: scripts/Dpkg/Source/Package/V2.pm:391
+#, fuzzy
+#| msgid "local changes stored in %s, the modified files are:"
+msgid "local changes detected, the modified files are:"
+msgstr "els canvis locals s'emmagatzemen a %s, els fitxers modificats són:"
+
+#: scripts/Dpkg/Source/Package/V2.pm:410
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
+#: scripts/Dpkg/Source/Package/V3/native.pm:76
+#, perl-format
+msgid "-b takes only one parameter with format `%s'"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V2.pm:444
 #, perl-format
 msgid ""
 "add %s in debian/source/include-binaries if you want to store the modified "
 "binary in the debian tarball"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:393
+#: scripts/Dpkg/Source/Package/V2.pm:458
 #, fuzzy, perl-format
 msgid "unwanted binary file: %s"
 msgstr "fitxer de control binari %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:422
+#: scripts/Dpkg/Source/Package/V2.pm:493
 #, perl-format
 msgid ""
 "detected %d unwanted binary file (add it in debian/source/include-binaries "
@@ -2763,30 +2811,54 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:442
-msgid "unrepresentable changes to source"
-msgstr "hi ha canvis no representables al font"
+#: scripts/Dpkg/Source/Package/V2.pm:508
+#, perl-format
+msgid "you can integrate the local changes with %s"
+msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:446 scripts/Dpkg/Source/Package/V2.pm:450
+#: scripts/Dpkg/Source/Package/V2.pm:510
 #, perl-format
-msgid "cannot remove %s"
-msgstr "no es pot suprimir %s"
+msgid "aborting due to unexpected upstream changes, see %s"
+msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:453
+#: scripts/Dpkg/Source/Package/V2.pm:520 scripts/Dpkg/Source/Package/V2.pm:653
 #, perl-format
-msgid "local changes stored in %s, the modified files are:"
-msgstr "els canvis locals s'emmagatzemen a %s, els fitxers modificats són:"
+msgid "local changes have been recorded in a new patch: %s"
+msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:459
+#: scripts/Dpkg/Source/Package/V2.pm:524 scripts/Dpkg/Source/Package/V2.pm:609
+#: scripts/Dpkg/Source/Package/V2.pm:637 scripts/Dpkg/Source/Package/V2.pm:651
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:369
 #, perl-format
-msgid "cannot rename %s to %s"
-msgstr "no es pot canviar el nom de %s a %s"
+msgid "cannot remove %s"
+msgstr "no es pot suprimir %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:481
+#: scripts/Dpkg/Source/Package/V2.pm:534
 #, perl-format
 msgid "adding %s to %s"
 msgstr "s'està afegint %s a %s"
 
+#: scripts/Dpkg/Source/Package/V2.pm:601
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:365
+#, fuzzy, perl-format
+msgid "failed to copy %s to %s"
+msgstr "no es pot canviar el nom de %s a %s"
+
+#: scripts/Dpkg/Source/Package/V2.pm:624
+#, perl-format
+msgid "cannot register changes in %s, this patch already exists"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V2.pm:638
+#, fuzzy
+#| msgid "unrepresentable changes to source"
+msgid "there are no local changes to record"
+msgstr "hi ha canvis no representables al font"
+
+#: scripts/Dpkg/Source/Package/V2.pm:643
+msgid "Enter the desired patch name: "
+msgstr ""
+
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:52
 msgid ""
 "This source package can only be manipulated using bzr, which is not in the "
@@ -2814,18 +2886,6 @@
 msgid "doesn't contain a bzr repository"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
-#: scripts/Dpkg/Source/Package/V3/git.pm:104
-#: scripts/Dpkg/Source/Package/V3/git.pm:143
-#: scripts/Dpkg/Source/Package/V3/git.pm:155
-#: scripts/Dpkg/Source/Package/V3/git.pm:174
-#, fuzzy, perl-format
-msgid "unable to chdir to `%s'"
-msgstr "s'ha produït un error en canviar al directori «%.255s»"
-
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:127
 msgid "bzr status exited nonzero"
 msgstr ""
@@ -2857,7 +2917,7 @@
 msgid "--target-format option is missing"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/native.pm:53
+#: scripts/Dpkg/Source/Package/V3/native.pm:54
 #, perl-format
 msgid "unrecognized file for a native source package: %s"
 msgstr ""
@@ -2925,35 +2985,35 @@
 msgid "setting up shallow clone"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:72
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:73
 #, perl-format
 msgid "%s should be a directory or non-existing"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:78
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:79
 #, perl-format
 msgid "%s should be a file or non-existing"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:119
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:120
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
 "source might fail when applying patches."
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:137
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:138
 #, perl-format
 msgid "cannot mkdir %s"
 msgstr "no es pot fer «mkdir %s»"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:212
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "no es pot crear l'enllaç simbòlic %s"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:284
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:287
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:294
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:297
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr ""
@@ -2993,6 +3053,16 @@
 msgid "source package has two conflicting values - %s and %s"
 msgstr ""
 
+#: scripts/Dpkg/Vendor/Debian.pm:106
+#, fuzzy, perl-format
+msgid "unknown hardening feature: %s"
+msgstr "l'argument «%s» és desconegut"
+
+#: scripts/Dpkg/Vendor/Debian.pm:110
+#, perl-format
+msgid "incorrect value in hardening option of DEB_BUILD_MAINT_OPTIONS: %s"
+msgstr ""
+
 #: scripts/Dpkg/Vendor/Ubuntu.pm:61 scripts/Dpkg/Vendor/Ubuntu.pm:63
 msgid ""
 "Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu "
@@ -3005,11 +3075,11 @@
 "Maintainer field"
 msgstr ""
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:119
+#: scripts/Dpkg/Vendor/Ubuntu.pm:123
 msgid "'hardening' flag found but 'hardening-wrapper' not installed"
 msgstr ""
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:138
+#: scripts/Dpkg/Vendor/Ubuntu.pm:142
 #, perl-format
 msgid "overriding %s in environment: %s"
 msgstr ""
@@ -3019,22 +3089,41 @@
 msgid "%s is not a valid version"
 msgstr "%s no és una opció vàlida per a %s"
 
-#: scripts/Dpkg/Version.pm:368
+#: scripts/Dpkg/Version.pm:371
 #, fuzzy
 msgid "version number cannot be empty"
 msgstr "la cadena de versió està buida"
 
-#: scripts/Dpkg/Version.pm:373
+#: scripts/Dpkg/Version.pm:376
+#, fuzzy
+msgid "version number does not start with digit"
+msgstr "la cadena de versió està buida"
+
+#: scripts/Dpkg/Version.pm:381
 #, fuzzy, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr "el nom de l'activador conté un caràcter invàlid"
 
-#: scripts/Dpkg/Version.pm:379
+#: scripts/Dpkg/Version.pm:386
 #, fuzzy, perl-format
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr "l'època en la versió no és un número"
 
 #, fuzzy
+#~| msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
+#~ msgid "%s: dpkg-buildflags (origin: %s): %s = %s\n"
+#~ msgstr "%s: s'està exportant %s de dpkg-buildflags (origen: %s): %s\n"
+
+#~ msgid "need an action option"
+#~ msgstr "es requereix una opció d'acció"
+
+#~ msgid "no orig.tar file found"
+#~ msgstr "no s'ha trobat el fitxer orig.tar"
+
+#~ msgid "cannot rename %s to %s"
+#~ msgstr "no es pot canviar el nom de %s a %s"
+
+#, fuzzy
 #~ msgid "cannot exec dpkg"
 #~ msgstr "no es pot suprimir %s"
 
Binary files dpkg/scripts/po/de.gmo and /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/de.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/de.po /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/de.po
--- dpkg/scripts/po/de.po	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/de.po	2012-06-07 10:11:09.426073000 -0700
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: dpkg-scripts\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-03 10:15+0000\n"
-"PO-Revision-Date: 2011-05-15 10:57+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
+"PO-Revision-Date: 2011-09-10 19:11+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -17,13 +17,13 @@
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: scripts/dpkg-architecture.pl:36 scripts/dpkg-buildflags.pl:31
-#: scripts/dpkg-buildpackage.pl:38 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
 #: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:96
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
 #: scripts/dpkg-mergechangelogs.pl:53 scripts/dpkg-name.pl:46
 #: scripts/dpkg-parsechangelog.pl:31 scripts/dpkg-scanpackages.pl:60
 #: scripts/dpkg-scansources.pl:78 scripts/dpkg-shlibdeps.pl:533
-#: scripts/dpkg-source.pl:433 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:455 scripts/changelog/debian.pl:34
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s Version %s.\n"
@@ -39,10 +39,10 @@
 "Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>."
 
 #: scripts/dpkg-architecture.pl:42 scripts/dpkg-buildflags.pl:36
-#: scripts/dpkg-buildpackage.pl:45 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
 #: scripts/dpkg-genchanges.pl:102 scripts/dpkg-gencontrol.pl:62
 #: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
-#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:440
+#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:462
 #: scripts/changelog/debian.pl:39
 msgid ""
 "\n"
@@ -97,7 +97,7 @@
 "  --help             diese Hilfemeldung anzeigen.\n"
 "  --version          die Version anzeigen.\n"
 
-#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:84
+#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:91
 #: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:194
 #: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
 #: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:119
@@ -144,10 +144,10 @@
 #: scripts/dpkg-buildflags.pl:33
 msgid ""
 "\n"
-"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+"Copyright (C) 2010-2011 Raphael Hertzog <hertzog@debian.org>."
 msgstr ""
 "\n"
-"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+"Copyright (C) 2010-2011 Raphael Hertzog <hertzog@debian.org>."
 
 #: scripts/dpkg-buildflags.pl:44
 #, perl-format
@@ -160,9 +160,11 @@
 "                     value is one of vendor, system, user, env.\n"
 "  --list             output a list of the flags supported by the current "
 "vendor.\n"
-"  --export=(sh|make) output commands to be executed in shell or make that "
-"export\n"
-"                     all the compilation flags as environment variables.\n"
+"  --export=(sh|make|configure)\n"
+"                     output something convenient to import the\n"
+"                     compilation flags in a shell script, in make,\n"
+"                     or on a ./configure command line.\n"
+"  --dump             output all compilation flags with their values\n"
 "  --help             show this help message.\n"
 "  --version          show the version.\n"
 msgstr ""
@@ -174,29 +176,26 @@
 "                      mögliche Werte: vendor, system, user, env\n"
 "  --list              eine Liste der vom aktuellen Lieferanten (Vendor)\n"
 "                      unterstützen Schalter ausgeben\n"
-"  --export=(sh|make)  Ausgabe der in shell oder make auszuführenden "
-"Befehle,\n"
-"                      die alle Kompilierschalter als Umgebungsvariablen\n"
-"                      ausgeben\n"
+"  --export=(sh|make|configure)\n"
+"                      etwas praktisches ausgeben, um die Kompilierschalter\n"
+"                      in einem Shell-Skript, in Make oder auf der\n"
+"                      Kommandozeile für ./configure zu importieren\n"
+"  --dump              alle Kompilierschalter mit ihren Werten ausgeben\n"
 "  --help              diese Hilfemeldung anzeigen\n"
 "  --version           die Version anzeigen\n"
 
-#: scripts/dpkg-buildflags.pl:63 scripts/dpkg-buildflags.pl:69
-#: scripts/dpkg-buildflags.pl:74
+#: scripts/dpkg-buildflags.pl:66 scripts/dpkg-buildflags.pl:72
+#: scripts/dpkg-buildflags.pl:77 scripts/dpkg-buildflags.pl:81
 #, perl-format
 msgid "two commands specified: --%s and --%s"
 msgstr "zwei Befehle angegeben: --%s und --%s"
 
-#: scripts/dpkg-buildflags.pl:67
+#: scripts/dpkg-buildflags.pl:70
 #, perl-format
 msgid "%s needs a parameter"
 msgstr "%s benötigt einen Parameter"
 
-#: scripts/dpkg-buildflags.pl:88
-msgid "need an action option"
-msgstr "eine Aktions-Option wird benötigt"
-
-#: scripts/dpkg-buildpackage.pl:40
+#: scripts/dpkg-buildpackage.pl:39
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -208,7 +207,7 @@
 "Copyright (C) 2000 Wichert Akkerman.\n"
 "Copyright (C) 2007 Frank Lichtenheld."
 
-#: scripts/dpkg-buildpackage.pl:52
+#: scripts/dpkg-buildpackage.pl:51
 #, perl-format
 msgid ""
 "\n"
@@ -321,29 +320,29 @@
 "  -h, --help     diese Hilfemeldung anzeigen.\n"
 "      --version  die Version anzeigen.\n"
 
-#: scripts/dpkg-buildpackage.pl:201 scripts/dpkg-buildpackage.pl:207
-#: scripts/dpkg-buildpackage.pl:213 scripts/dpkg-buildpackage.pl:219
-#: scripts/dpkg-buildpackage.pl:224 scripts/dpkg-genchanges.pl:143
+#: scripts/dpkg-buildpackage.pl:200 scripts/dpkg-buildpackage.pl:206
+#: scripts/dpkg-buildpackage.pl:212 scripts/dpkg-buildpackage.pl:218
+#: scripts/dpkg-buildpackage.pl:223 scripts/dpkg-genchanges.pl:143
 #: scripts/dpkg-genchanges.pl:146 scripts/dpkg-genchanges.pl:150
 #: scripts/dpkg-genchanges.pl:154
 #, perl-format
 msgid "cannot combine %s and %s"
 msgstr "%s und %s können nicht kombiniert werden"
 
-#: scripts/dpkg-buildpackage.pl:237 scripts/dpkg-source.pl:187
+#: scripts/dpkg-buildpackage.pl:236 scripts/dpkg-source.pl:202
 msgid "-E and -W are deprecated, they are without effect"
 msgstr "-E und -W sind veraltet, sie haben keine Wirkung"
 
-#: scripts/dpkg-buildpackage.pl:241
+#: scripts/dpkg-buildpackage.pl:240
 #, perl-format
 msgid "unknown option or argument %s"
 msgstr "unbekannte Option oder Argument %s"
 
-#: scripts/dpkg-buildpackage.pl:251
+#: scripts/dpkg-buildpackage.pl:250
 msgid "using a gain-root-command while being root"
 msgstr "Verwendung eines root-werde-Befehls, obwohl bereits root"
 
-#: scripts/dpkg-buildpackage.pl:257
+#: scripts/dpkg-buildpackage.pl:256
 msgid ""
 "fakeroot not found, either install the fakeroot\n"
 "package, specify a command with the -r option, or run this as root"
@@ -351,62 +350,57 @@
 "Fakeroot nicht gefunden; installieren Sie entweder das Fakeroot-Paket,\n"
 "geben Sie einen Befehl mit der Option -r an oder führen Sie dies als root aus"
 
-#: scripts/dpkg-buildpackage.pl:261
+#: scripts/dpkg-buildpackage.pl:260
 #, perl-format
 msgid "gain-root-commmand '%s' not found"
 msgstr "root-werde-Befehl »%s« nicht gefunden"
 
-#: scripts/dpkg-buildpackage.pl:280
+#: scripts/dpkg-buildpackage.pl:279
 msgid "unknown sign command, assuming pgp style interface"
 msgstr "unbekannter Signier-Befehl, PGP-artige Schnittstelle wird vermutet"
 
-#: scripts/dpkg-buildpackage.pl:283
+#: scripts/dpkg-buildpackage.pl:282
 msgid "PGP support is deprecated (see README.feature-removal-schedule)"
 msgstr ""
 "PGP-Unterstützung ist veraltet (lesen Sie README.feature-removal-schedule)"
 
 #: scripts/dpkg-buildpackage.pl:301
-#, perl-format
-msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
-msgstr "%s: exportieren von %s aus dpkg-buildflags (Quelle: %s): %s\n"
-
-#: scripts/dpkg-buildpackage.pl:310
 msgid "source package"
 msgstr "Quellpaket"
 
-#: scripts/dpkg-buildpackage.pl:311
+#: scripts/dpkg-buildpackage.pl:302
 msgid "source version"
 msgstr "Quellversion"
 
-#: scripts/dpkg-buildpackage.pl:321
+#: scripts/dpkg-buildpackage.pl:312
 msgid "source changed by"
 msgstr "Quellen geändert durch"
 
-#: scripts/dpkg-buildpackage.pl:339
+#: scripts/dpkg-buildpackage.pl:330
 msgid "host architecture"
 msgstr "Host-Architektur"
 
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:343
 msgid "debian/rules is not executable: fixing that."
 msgstr "debian/rules ist nicht ausführbar: wird korrigiert"
 
-#: scripts/dpkg-buildpackage.pl:371
+#: scripts/dpkg-buildpackage.pl:362
 msgid "Build dependencies/conflicts unsatisfied; aborting."
 msgstr "Bauabhängigkeiten/-konflikte nicht erfüllt; Abbruch"
 
-#: scripts/dpkg-buildpackage.pl:372
+#: scripts/dpkg-buildpackage.pl:363
 msgid "(Use -d flag to override.)"
 msgstr "(Verwenden Sie -d, um sich darüber hinwegzusetzen.)"
 
-#: scripts/dpkg-buildpackage.pl:375
+#: scripts/dpkg-buildpackage.pl:366
 msgid "This is currently a non-fatal warning with -S, but"
 msgstr "Dies ist eine mit -S nicht fatale Warnung, allerdings"
 
-#: scripts/dpkg-buildpackage.pl:376
+#: scripts/dpkg-buildpackage.pl:367
 msgid "will probably become fatal in the future."
 msgstr "wird sie wahrscheinlich in der Zukunft fatal werden."
 
-#: scripts/dpkg-buildpackage.pl:398
+#: scripts/dpkg-buildpackage.pl:389
 msgid ""
 "it is a bad idea to generate a source package without cleaning up first, it "
 "might contain undesired files."
@@ -414,56 +408,56 @@
 "Es ist keine gute Idee, ein Quellpaket zu erstellen, ohne vorher "
 "aufzuräumen; es könnte nicht gewünschte Dateien enthalten."
 
-#: scripts/dpkg-buildpackage.pl:411
+#: scripts/dpkg-buildpackage.pl:402
 msgid "Press the return key to start signing process\n"
 msgstr "Drücken Sie die Eingabetaste, um den Signierprozess zu starten\n"
 
-#: scripts/dpkg-buildpackage.pl:418
+#: scripts/dpkg-buildpackage.pl:409
 msgid "Failed to sign .dsc and .changes file"
 msgstr ".dsc- und .changes-Datei konnte nicht signiert werden"
 
-#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:437
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:424 scripts/dpkg-buildpackage.pl:428
+#: scripts/dpkg-buildpackage.pl:441
 msgid "write changes file"
 msgstr "schreiben der changes-Datei"
 
-#: scripts/dpkg-buildpackage.pl:449
+#: scripts/dpkg-buildpackage.pl:440
 msgid "dpkg-genchanges"
 msgstr "dpkg-genchanges"
 
-#: scripts/dpkg-buildpackage.pl:458
+#: scripts/dpkg-buildpackage.pl:449
 msgid "source only upload: Debian-native package"
 msgstr "Nur Quellen hochzuladen: Debian-native-Paket"
 
-#: scripts/dpkg-buildpackage.pl:460
+#: scripts/dpkg-buildpackage.pl:451
 msgid "source only, diff-only upload (original source NOT included)"
 msgstr "Nur Quellen, nur Diff hochzuladen (Originalquellen NICHT enthalten)"
 
-#: scripts/dpkg-buildpackage.pl:462
+#: scripts/dpkg-buildpackage.pl:453
 msgid "source only upload (original source is included)"
 msgstr "Nur Quellen hochzuladen (Originalquellen enthalten)"
 
-#: scripts/dpkg-buildpackage.pl:465 scripts/dpkg-buildpackage.pl:473
+#: scripts/dpkg-buildpackage.pl:456 scripts/dpkg-buildpackage.pl:464
 msgid "full upload (original source is included)"
 msgstr "Alles hochzuladen (Originalquellen enthalten)"
 
-#: scripts/dpkg-buildpackage.pl:467
+#: scripts/dpkg-buildpackage.pl:458
 msgid "binary only upload (no source included)"
 msgstr "Binärpaket(e) hochzuladen (keine Quellen enthalten)"
 
-#: scripts/dpkg-buildpackage.pl:469
+#: scripts/dpkg-buildpackage.pl:460
 msgid "full upload; Debian-native package (full source is included)"
 msgstr "Alles hochzuladen; Debian-native-Paket (komplette Quellen enthalten)"
 
-#: scripts/dpkg-buildpackage.pl:471
+#: scripts/dpkg-buildpackage.pl:462
 msgid "binary and diff upload (original source NOT included)"
 msgstr "Binärpakete(e) und Diff hochzuladen (Originalquellen NICHT enthalten)"
 
-#: scripts/dpkg-buildpackage.pl:478
+#: scripts/dpkg-buildpackage.pl:469
 msgid "Failed to sign .changes file"
 msgstr "Signieren der .changes-Datei fehlgeschlagen"
 
-#: scripts/dpkg-buildpackage.pl:497
+#: scripts/dpkg-buildpackage.pl:488
 #, perl-format
 msgid "unable to determine %s"
 msgstr "%s kann nicht bestimmt werden"
@@ -515,7 +509,7 @@
 msgid "%s: Build conflicts: "
 msgstr "%s: Baukonflikte: "
 
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:236
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:253
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "Fehler beim Parsen von %s"
@@ -553,27 +547,27 @@
 msgid "filename, section and priority may contain no whitespace"
 msgstr "Dateiname, Bereich und Priorität dürfen keine Leerzeichen enthalten"
 
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:334
 msgid "open new files list file"
 msgstr "neue Dateienliste-Datei öffnen"
 
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:345
 msgid "copy old entry to new files list file"
 msgstr "alten Eintrag in neue Dateienlist-Datei kopieren"
 
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:349
 msgid "read old files list file"
 msgstr "alte Dateienliste-Datei lesen"
 
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:359
 msgid "write new entry to new files list file"
 msgstr "neuen Eintrag in neue Dateienliste-Datei schreiben"
 
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:360
 msgid "close new files list file"
 msgstr "neue Dateienliste-Datei schließen"
 
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:361
 msgid "install new files list file"
 msgstr "neue Dateienliste-Datei installieren"
 
@@ -733,7 +727,7 @@
 msgid "missing Priority for source files"
 msgstr "fehlende Priorität für Quelldateien"
 
-#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:327
+#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:346
 #: scripts/Dpkg/Vendor.pm:71
 #, perl-format
 msgid "%s is empty"
@@ -759,13 +753,13 @@
 msgid "write original source message"
 msgstr "ursprüngliche Quell-Nachricht schreiben"
 
-#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:428
+#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:532
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "fehlende Informationen für kritisches Ausgabefeld %s"
 
 #: scripts/dpkg-genchanges.pl:499 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:433
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:537
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "fehlende Informationen für Ausgabefeld %s"
@@ -898,32 +892,40 @@
 msgid "chdir for du to `%s'"
 msgstr "chdir nach »%s« für du"
 
-#: scripts/dpkg-gencontrol.pl:304 scripts/dpkg-shlibdeps.pl:843
+#: scripts/dpkg-gencontrol.pl:305 scripts/dpkg-shlibdeps.pl:843
 #: scripts/Dpkg/IPC.pm:271 scripts/Dpkg/Shlibs/Cppfilt.pm:50
 #, perl-format
 msgid "unable to execute %s"
 msgstr "%s konnte nicht ausgeführt werden"
 
-#: scripts/dpkg-gencontrol.pl:311
+#: scripts/dpkg-gencontrol.pl:312
 #, perl-format
 msgid "du in `%s'"
 msgstr "du in »%s«"
 
-#: scripts/dpkg-gencontrol.pl:313
+#: scripts/dpkg-gencontrol.pl:314
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr "du lieferte unerwartete Ausgabe »%s«"
 
-#: scripts/dpkg-gencontrol.pl:346
+#: scripts/dpkg-gencontrol.pl:347
 msgid "close old files list file"
 msgstr "schließen der alten Dateienliste-Datei"
 
-#: scripts/dpkg-gencontrol.pl:368
+#: scripts/dpkg-gencontrol.pl:369
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "neue Ausgabe-Steuerdatei »%s« kann nicht geöffnet werden"
 
-#: scripts/dpkg-gencontrol.pl:379
+#: scripts/dpkg-gencontrol.pl:378 scripts/dpkg-shlibdeps.pl:523
+#: scripts/Dpkg/Interface/Storable.pm:91
+#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
+#: scripts/Dpkg/Source/Package/V2.pm:607
+#, perl-format
+msgid "cannot close %s"
+msgstr "%s kann nicht geschlossen werden"
+
+#: scripts/dpkg-gencontrol.pl:380
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "Ausgabe-Steurdatei »%s« kann nicht installiert werden"
@@ -1045,11 +1047,15 @@
 msgstr "einige Symbole oder Muster sind aus der Symboldatei verschwunden: %s"
 
 #: scripts/dpkg-gensymbols.pl:291
+msgid "the generated symbols file is empty"
+msgstr "die erstellte Symboldatei ist leer"
+
+#: scripts/dpkg-gensymbols.pl:293
 #, perl-format
 msgid "%s doesn't match completely %s"
 msgstr "%s passt nicht komplett zu %s"
 
-#: scripts/dpkg-gensymbols.pl:294
+#: scripts/dpkg-gensymbols.pl:296
 #, perl-format
 msgid "no debian/symbols file used as basis for generating %s"
 msgstr "keine debian/symbols-Datei als Basis zur Erzeugung von %s verwendet"
@@ -1086,19 +1092,20 @@
 "  -h, --help               diese Hilfemeldung anzeigen.\n"
 "      --version            die Version anzeigen.\n"
 
-#: scripts/dpkg-mergechangelogs.pl:129
+#: scripts/dpkg-mergechangelogs.pl:129 scripts/dpkg-mergechangelogs.pl:131
 #: scripts/Dpkg/Compression/FileHandle.pm:385
 #: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
 #: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Functions.pm:78
-#: scripts/Dpkg/Source/Package.pm:349 scripts/Dpkg/Source/Package.pm:446
-#: scripts/Dpkg/Source/Package/V2.pm:210 scripts/Dpkg/Source/Package/V2.pm:477
-#: scripts/Dpkg/Source/Package/V2.pm:522
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:224
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:323
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:333
+#: scripts/Dpkg/Source/Package.pm:447 scripts/Dpkg/Source/Package.pm:550
+#: scripts/Dpkg/Source/Package/V2.pm:217 scripts/Dpkg/Source/Package/V2.pm:530
+#: scripts/Dpkg/Source/Package/V2.pm:605
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:226
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:234
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:341
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:351
 #, perl-format
 msgid "cannot write %s"
 msgstr "%s kann nicht geschrieben werden"
@@ -1147,7 +1154,7 @@
 #: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:138 scripts/Dpkg/Arch.pm:157
 #: scripts/Dpkg/Arch.pm:176 scripts/Dpkg/Changelog/Parse.pm:142
 #: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:140
+#: scripts/Dpkg/Source/Package.pm:193
 #, perl-format
 msgid "cannot open %s"
 msgstr "%s kann nicht geöffnet werden"
@@ -1288,9 +1295,8 @@
 "    --all                     alle Änderungen hinzufügen\n"
 
 #: scripts/dpkg-parsechangelog.pl:117
-#, perl-format
-msgid "%s takes no non-option arguments"
-msgstr "%s akzeptiert kein nicht-Options-Argument"
+msgid "takes no non-option arguments"
+msgstr "akzeptiert kein nicht-Options-Argument"
 
 #: scripts/dpkg-scanpackages.pl:66
 #, perl-format
@@ -1342,9 +1348,9 @@
 msgid "Unconditional maintainer override for %s"
 msgstr "Bedingungslose Übersteuerung (»override«) des Betreuers für %s"
 
-#: scripts/dpkg-scanpackages.pl:158
-msgid "1 to 3 args expected"
-msgstr "1 bis 3 Argumente erwartet"
+#: scripts/dpkg-scanpackages.pl:158 scripts/dpkg-scansources.pl:302
+msgid "one to three arguments expected"
+msgstr "ein bis drei Argumente erwartet"
 
 #: scripts/dpkg-scanpackages.pl:175
 #, perl-format
@@ -1503,10 +1509,6 @@
 msgid "no binary packages specified in %s"
 msgstr "keine Binärpakete in %s angegeben"
 
-#: scripts/dpkg-scansources.pl:302
-msgid "1 to 3 args expected\n"
-msgstr "1 bis 3 Argumente erwartet\n"
-
 #: scripts/dpkg-shlibdeps.pl:93
 #, perl-format
 msgid "administrative directory '%s' does not exist"
@@ -1754,126 +1756,153 @@
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "unbekannte Ausgabe von »dpkg --search«: »%s«"
 
-#: scripts/dpkg-source.pl:100
+#: scripts/dpkg-source.pl:104
 #, perl-format
 msgid "%s needs a directory"
 msgstr "%s benötigt ein Verzeichnis"
 
-#: scripts/dpkg-source.pl:103
+#: scripts/dpkg-source.pl:110
 #, perl-format
 msgid "cannot stat directory %s"
 msgstr "Verzeichnis %s kann nicht mit stat abgefragt werden"
 
-#: scripts/dpkg-source.pl:105
+#: scripts/dpkg-source.pl:112
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr "Verzeichnis-Argument %s ist kein Verzeichnis"
 
-#: scripts/dpkg-source.pl:123
+#: scripts/dpkg-source.pl:117 scripts/Dpkg/Source/Package/V2.pm:476
+#: scripts/Dpkg/Source/Package/V2.pm:478 scripts/Dpkg/Source/Package/V2.pm:480
+#: scripts/Dpkg/Source/Package/V2.pm:482
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
+#: scripts/Dpkg/Source/Package/V3/git.pm:104
+#: scripts/Dpkg/Source/Package/V3/git.pm:143
+#: scripts/Dpkg/Source/Package/V3/git.pm:155
+#: scripts/Dpkg/Source/Package/V3/git.pm:174
+#, perl-format
+msgid "unable to chdir to `%s'"
+msgstr "Wechsel in Verzeichnis »%s« nicht möglich"
+
+#: scripts/dpkg-source.pl:135
 #, perl-format
 msgid "using options from %s: %s"
 msgstr "Optionen aus %s werden verwendet: %s"
 
-#: scripts/dpkg-source.pl:138 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:150 scripts/Dpkg/Compression.pm:173
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "%s ist keine unterstützte Kompression"
 
-#: scripts/dpkg-source.pl:144 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:156 scripts/Dpkg/Compression.pm:202
 #: scripts/Dpkg/Compression/Process.pm:86
 #, perl-format
 msgid "%s is not a compression level"
 msgstr "%s ist keine Komprimierungsstufe"
 
-#: scripts/dpkg-source.pl:199
-msgid "need a command (-x, -b, --before-build, --after-build, --print-format)"
+#: scripts/dpkg-source.pl:214
+msgid ""
+"need a command (-x, -b, --before-build, --after-build, --print-format, --"
+"commit)"
 msgstr ""
 "ein Befehl wird benötigt (-x, -b, --before-build, --after-build, --print-"
-"format)"
+"format, --commit)"
+
+#: scripts/dpkg-source.pl:238
+#, perl-format
+msgid "%s doesn't contain any information about the source package"
+msgstr "%s enthält keine Informationen über das Quellpaket"
 
-#: scripts/dpkg-source.pl:268
+#: scripts/dpkg-source.pl:283
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "»%s« ist keine gültige Architektur-Zeichenkette"
 
-#: scripts/dpkg-source.pl:271
+#: scripts/dpkg-source.pl:286
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 "Architektur %s ist nur alleine erlaubt (Liste für Paket %s lautet »%s«)"
 
-#: scripts/dpkg-source.pl:324 scripts/Dpkg/BuildFlags.pm:190
+#: scripts/dpkg-source.pl:301
+#, perl-format
+msgid "%s doesn't list any binary package"
+msgstr "%s listet kein binäres Paket auf"
+
+#: scripts/dpkg-source.pl:343 scripts/Dpkg/BuildFlags.pm:270
 #: scripts/Dpkg/Compression/FileHandle.pm:401
 #: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:122
-#: scripts/Dpkg/Source/Package/V2.pm:360 scripts/Dpkg/Source/Package/V2.pm:505
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:276
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:330
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:377
+#: scripts/Dpkg/Source/Package/V2.pm:277 scripts/Dpkg/Source/Package/V2.pm:425
+#: scripts/Dpkg/Source/Package/V2.pm:561
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:112
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:286
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:348
 #, perl-format
 msgid "cannot read %s"
 msgstr "%s kann nicht gelesen werden"
 
-#: scripts/dpkg-source.pl:331
+#: scripts/dpkg-source.pl:350
 #, perl-format
 msgid "no source format specified in %s, see dpkg-source(1)"
 msgstr "kein Quellformat in %s angegeben, lesen Sie dpkg-source(1)"
 
-#: scripts/dpkg-source.pl:356
+#: scripts/dpkg-source.pl:378
 #, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr "unmöglich, mit Quellformat »%s« zu bauen: %s"
 
-#: scripts/dpkg-source.pl:359
+#: scripts/dpkg-source.pl:381
 #, perl-format
 msgid "using source format `%s'"
 msgstr "Quellformat »%s« wird verwendet"
 
-#: scripts/dpkg-source.pl:366 scripts/Dpkg/Source/Package/V1.pm:300
-#: scripts/Dpkg/Source/Package/V1.pm:345 scripts/Dpkg/Source/Package/V2.pm:488
+#: scripts/dpkg-source.pl:388 scripts/Dpkg/Source/Package/V1.pm:301
+#: scripts/Dpkg/Source/Package/V1.pm:346 scripts/Dpkg/Source/Package/V2.pm:541
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
-#: scripts/Dpkg/Source/Package/V3/native.pm:83
+#: scripts/Dpkg/Source/Package/V3/native.pm:84
 #, perl-format
 msgid "building %s in %s"
 msgstr "%s wird in %s gebaut"
 
-#: scripts/dpkg-source.pl:377
+#: scripts/dpkg-source.pl:399
 msgid "-x needs at least one argument, the .dsc"
 msgstr "-x benötigt mindestens ein Argument, die .dsc"
 
-#: scripts/dpkg-source.pl:380
+#: scripts/dpkg-source.pl:402
 msgid "-x takes no more than two arguments"
 msgstr "-x akzeptiert nicht mehr als zwei Argumente"
 
-#: scripts/dpkg-source.pl:384
+#: scripts/dpkg-source.pl:406
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr "-x benötigt die .dsc-Datei als erstes Argument, kein Verzeichnis"
 
-#: scripts/dpkg-source.pl:400
+#: scripts/dpkg-source.pl:422
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "Entpackziel existiert: %s"
 
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:432
 #, perl-format
 msgid "%s doesn't contain a valid OpenPGP signature"
 msgstr "%s enthält keine gültige OpenPGP-Signatur"
 
-#: scripts/dpkg-source.pl:412
+#: scripts/dpkg-source.pl:434
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "unsigniertes Quellpaket wird extrahiert (%s)"
 
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:441
 #, perl-format
 msgid "extracting %s in %s"
 msgstr "%s wird nach %s extrahiert"
 
-#: scripts/dpkg-source.pl:427
+#: scripts/dpkg-source.pl:449
 msgid "only one of -x, -b or --print-format allowed, and only once"
 msgstr "nur entweder -x, -b oder --print-format erlaubt, und nur einmal"
 
-#: scripts/dpkg-source.pl:435
+#: scripts/dpkg-source.pl:457
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson\n"
@@ -1885,7 +1914,7 @@
 "Copyright (C) 1997 Klee Dienes.\n"
 "Copyright (C) 2008 Raphael Hertzog."
 
-#: scripts/dpkg-source.pl:448
+#: scripts/dpkg-source.pl:470
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -1895,7 +1924,9 @@
 "                           extract source package.\n"
 "  -b <dir>                 build source package.\n"
 "  --print-format <dir>     print the source format that would be\n"
-"                           used to build the source package."
+"                           used to build the source package.\n"
+"  --commit [<dir> [<patch-name>]]\n"
+"                           store upstream changes in a new patch."
 msgstr ""
 "Aufruf: %s [<Option> ...] <Befehl>\n"
 "\n"
@@ -1904,9 +1935,12 @@
 "                           Quellpaket extrahieren.\n"
 "  -b <Verz>                Quellpaket bauen.\n"
 "  --print-format <Verz>    das Quellformat ausgeben, das zum Bau des\n"
-"                           Quellpakets verwandt würde."
+"                           Quellpakets verwandt würde.\n"
+"  --commit [<Verz> [<Patch-Name>]]\n"
+"                           Änderungen der Originalautoren in einem neuen\n"
+"                           Patch speichern."
 
-#: scripts/dpkg-source.pl:457
+#: scripts/dpkg-source.pl:481
 #, perl-format
 msgid ""
 "Build options:\n"
@@ -1950,7 +1984,7 @@
 "                             »%d«, unterstützt werden: »1«-»9«, »best«, "
 "»fast«)"
 
-#: scripts/dpkg-source.pl:475
+#: scripts/dpkg-source.pl:499
 msgid ""
 "Extract options:\n"
 "  --no-copy                don't copy .orig tarballs\n"
@@ -1967,7 +2001,7 @@
 "                           abbrechen, falls das Paket keine gültige\n"
 "                           Signatur hat."
 
-#: scripts/dpkg-source.pl:480
+#: scripts/dpkg-source.pl:504
 msgid ""
 "General options:\n"
 "  -h, --help               show this help message.\n"
@@ -1977,7 +2011,7 @@
 "  -h, --help               diese Hilfemeldung anzeigen.\n"
 "      --version            die Version anzeigen."
 
-#: scripts/dpkg-source.pl:484
+#: scripts/dpkg-source.pl:508
 msgid ""
 "More options are available but they depend on the source package format.\n"
 "See dpkg-source(1) for more info."
@@ -2066,12 +2100,12 @@
 msgstr "<Standardeingabe>"
 
 #: scripts/changelog/debian.pl:136
-msgid "fatal error occured while parsing input"
+msgid "fatal error occurred while parsing input"
 msgstr "Fataler Fehler beim Auswerten der Eingabe"
 
 #: scripts/changelog/debian.pl:139
 #, perl-format
-msgid "fatal error occured while parsing %s"
+msgid "fatal error occurred while parsing %s"
 msgstr "Fataler Fehler beim Auswerten von %s"
 
 #: scripts/Dpkg/Arch.pm:86
@@ -2090,17 +2124,17 @@
 "Unbekannter gcc-Systemtyp %s, zurück auf Standardeinstellung (native "
 "Übersetzung)"
 
-#: scripts/Dpkg/BuildFlags.pm:198
+#: scripts/Dpkg/BuildFlags.pm:278
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
 msgstr "Zeile %d von %s erwähnt unbekannten Schalter %s"
 
-#: scripts/Dpkg/BuildFlags.pm:207
+#: scripts/Dpkg/BuildFlags.pm:291
 #, perl-format
 msgid "line %d of %s is invalid, it has been ignored."
 msgstr "Zeile %d von %s ist ungültig, sie wurde ignoriert."
 
-#: scripts/Dpkg/BuildOptions.pm:91
+#: scripts/Dpkg/BuildOptions.pm:94
 #, perl-format
 msgid "invalid flag in %s: %s"
 msgstr "ungültiger Schalter in %s: %s"
@@ -2361,8 +2395,8 @@
 
 #: scripts/Dpkg/Control.pm:156 scripts/Dpkg/Control.pm:158
 #, perl-format
-msgid "entry of APT's %s file"
-msgstr "Eintrag von APTs %s-Datei"
+msgid "entry in repository's %s file"
+msgstr "Eintrag in Datei %s des Depots"
 
 #: scripts/Dpkg/Control.pm:160 scripts/Dpkg/Control.pm:164
 #, perl-format
@@ -2394,9 +2428,10 @@
 msgid "first block lacks a source field"
 msgstr "im ersten Block fehlt ein Feld »source«"
 
-#: scripts/Dpkg/Control/Info.pm:110
-msgid "block lacks a package field"
-msgstr "im Block fehlt ein Feld »package«"
+#: scripts/Dpkg/Control/Info.pm:110 scripts/Dpkg/Control/Info.pm:113
+#, perl-format
+msgid "block lacks the '%s' field"
+msgstr "im Block fehlt das Feld »%s«"
 
 #: scripts/Dpkg/Control/Hash.pm:172
 #, perl-format
@@ -2470,17 +2505,11 @@
 msgid "%s failed with unknown exit code %d"
 msgstr "%s fehlgeschlagen mit unbekanntem Exit-Code %d"
 
-#: scripts/Dpkg/ErrorHandling.pm:113
+#: scripts/Dpkg/ErrorHandling.pm:115
 #, perl-format
 msgid "syntax error in %s at line %d: %s"
 msgstr "Syntaxfehler in %s in Zeile %d: %s"
 
-#: scripts/Dpkg/Interface/Storable.pm:91
-#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
-#, perl-format
-msgid "cannot close %s"
-msgstr "%s kann nicht geschlossen werden"
-
 #: scripts/Dpkg/IPC.pm:211 scripts/Dpkg/IPC.pm:217 scripts/Dpkg/IPC.pm:223
 #, perl-format
 msgid "pipe for %s"
@@ -2512,8 +2541,8 @@
 #, perl-format
 msgid "%s didn't complete in %d second"
 msgid_plural "%s didn't complete in %d seconds"
-msgstr[0] "%s war nicht innerhalb von %d Sekunden beendet"
-msgstr[1] "%s waren nicht innerhalb von %d Sekunden beendet"
+msgstr[0] "%s war nicht innerhalb von %d Sekunde beendet"
+msgstr[1] "%s war nicht innerhalb von %d Sekunden beendet"
 
 #: scripts/Dpkg/Shlibs/Objdump.pm:222
 #, perl-format
@@ -2578,8 +2607,8 @@
 msgid "cannot create directory %s"
 msgstr "Verzeichnis %s kann nicht angelegt werden"
 
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:233
-#: scripts/Dpkg/Source/Package/V2.pm:192
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:307
+#: scripts/Dpkg/Source/Package/V2.pm:199
 #, perl-format
 msgid "cannot opendir %s"
 msgstr "Verzeichnis %s kann nicht geöffnet werden"
@@ -2614,7 +2643,7 @@
 msgid "cannot read timestamp from %s"
 msgstr "Zeitstempel für %s kann nicht gelesen werden"
 
-#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:378
+#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:443
 msgid "binary file contents changed"
 msgstr "Inhalt der Binärdatei hat sich geändert"
 
@@ -2688,7 +2717,7 @@
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr "besonderer Modus %04o von »%s« wird im Diff nicht dargestellt werden"
 
-#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:377
+#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:442
 #, perl-format
 msgid "cannot represent change to %s: %s"
 msgstr "Änderung in %s kann nicht dargestellt werden: %s"
@@ -2734,7 +2763,7 @@
 msgstr "keine der Dateinamen in ---/+++ ist im Diff »%s« (Zeile %d) gültig"
 
 #: scripts/Dpkg/Source/Patch.pm:410
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:127
 #, perl-format
 msgid "%s contains an insecure path: %s"
 msgstr "%s enthält einen unsicheren Pfad: %s"
@@ -2799,7 +2828,7 @@
 msgid "nonexistent"
 msgstr "nicht existent"
 
-#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:458
 #, perl-format
 msgid "cannot stat %s"
 msgstr "%s kann nicht mit stat abgefragt werden"
@@ -2833,136 +2862,141 @@
 msgid "named socket"
 msgstr "benannter Socket"
 
-#: scripts/Dpkg/Source/Package.pm:135
+#: scripts/Dpkg/Source/Package.pm:188
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr "%s ist nicht der Name einer Datei"
 
-#: scripts/Dpkg/Source/Package.pm:155
+#: scripts/Dpkg/Source/Package.pm:208
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "kritisches Quellsteuerfeld %s fehlt"
 
-#: scripts/Dpkg/Source/Package.pm:183
+#: scripts/Dpkg/Source/Package.pm:236
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
 msgstr ""
 "Quellpaketformat »%s« wird nicht unterstützt (Perlmodul %s wird benötigt)"
 
-#: scripts/Dpkg/Source/Package.pm:187
+#: scripts/Dpkg/Source/Package.pm:240
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr "ungültiges Formatfeld »%s«"
 
-#: scripts/Dpkg/Source/Package.pm:214
+#: scripts/Dpkg/Source/Package.pm:288
 msgid "source and version are required to compute the source basename"
 msgstr ""
 "Quelle und Version werden benötigt, um den »basename« der Quelle zu ermitteln"
 
-#: scripts/Dpkg/Source/Package.pm:280 scripts/Dpkg/Source/Package.pm:282
+#: scripts/Dpkg/Source/Package.pm:371 scripts/Dpkg/Source/Package.pm:373
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "Fehler beim Überprüfen der Signatur von %s"
 
-#: scripts/Dpkg/Source/Package.pm:289 scripts/Dpkg/Source/Package.pm:291
+#: scripts/Dpkg/Source/Package.pm:380 scripts/Dpkg/Source/Package.pm:382
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr ""
 "Signatur von %s konnte nicht überprüft werden, da Gpg nicht installiert ist"
 
-#: scripts/Dpkg/Source/Package.pm:300
+#: scripts/Dpkg/Source/Package.pm:391
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr "%s ist keine gültige Option für %s"
 
-#: scripts/Dpkg/Source/Package.pm:362
+#: scripts/Dpkg/Source/Package.pm:460
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s existiert nicht"
 
-#: scripts/Dpkg/Source/Package.pm:366
+#: scripts/Dpkg/Source/Package.pm:464
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "Programm %s kann nicht ausführbar gemacht werden"
 
-#: scripts/Dpkg/Source/Package.pm:368
+#: scripts/Dpkg/Source/Package.pm:466
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "%s ist keine gewöhnliche Datei"
 
-#: scripts/Dpkg/Source/Package/V1.pm:61
+#: scripts/Dpkg/Source/Package.pm:517
+#, perl-format
+msgid "'%s' is not supported by the source format '%s'"
+msgstr "»%s« wird vom Quellformat »%s« nicht unterstützt"
+
+#: scripts/Dpkg/Source/Package/V1.pm:62
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr "Option -s%s überschreibt vorhergehende Option -s%s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:83
+#: scripts/Dpkg/Source/Package/V1.pm:84
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr "Quellbearbeitungsstil -s%s mit -x nicht erlaubt"
 
-#: scripts/Dpkg/Source/Package/V1.pm:95
-#: scripts/Dpkg/Source/Package/V3/native.pm:50
+#: scripts/Dpkg/Source/Package/V1.pm:96
+#: scripts/Dpkg/Source/Package/V3/native.pm:51
 msgid "multiple tarfiles in v1.0 source package"
 msgstr "mehrere Tardateien in v1.0-Quellpaket"
 
-#: scripts/Dpkg/Source/Package/V1.pm:100 scripts/Dpkg/Source/Package/V2.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:101 scripts/Dpkg/Source/Package/V2.pm:129
 #, perl-format
 msgid "unrecognized file for a %s source package: %s"
 msgstr "unerkannte Datei für ein %s-Quellpaket: %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:105
-#: scripts/Dpkg/Source/Package/V3/native.pm:57
+#: scripts/Dpkg/Source/Package/V1.pm:106
+#: scripts/Dpkg/Source/Package/V3/native.pm:58
 msgid "no tarfile in Files field"
 msgstr "keine Tardatei im Feld Files"
 
-#: scripts/Dpkg/Source/Package/V1.pm:108
+#: scripts/Dpkg/Source/Package/V1.pm:109
 msgid "native package with .orig.tar"
 msgstr "natives Paket mit .orig.tar"
 
-#: scripts/Dpkg/Source/Package/V1.pm:121
+#: scripts/Dpkg/Source/Package/V1.pm:122
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr "»%s« kann nicht in »%s« umbenannt werden"
 
-#: scripts/Dpkg/Source/Package/V1.pm:125 scripts/Dpkg/Source/Package/V2.pm:134
-#: scripts/Dpkg/Source/Package/V2.pm:146 scripts/Dpkg/Source/Package/V2.pm:159
+#: scripts/Dpkg/Source/Package/V1.pm:126 scripts/Dpkg/Source/Package/V2.pm:141
+#: scripts/Dpkg/Source/Package/V2.pm:153 scripts/Dpkg/Source/Package/V2.pm:166
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:190
-#: scripts/Dpkg/Source/Package/V3/native.pm:60
+#: scripts/Dpkg/Source/Package/V3/native.pm:61
 #, perl-format
 msgid "unpacking %s"
 msgstr "%s wird entpackt"
 
-#: scripts/Dpkg/Source/Package/V1.pm:132
+#: scripts/Dpkg/Source/Package/V1.pm:133
 msgid "unable to keep orig directory (already exists)"
 msgstr "Originalverzeichnis kann nicht beibehalten werden (existiert bereits)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:139
+#: scripts/Dpkg/Source/Package/V1.pm:140
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr "Fehler beim Umbenennen des frisch extrahierten %s in %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:145
+#: scripts/Dpkg/Source/Package/V1.pm:146
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr "Fehler beim Umbenennen des gesicherten %s in %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:152 scripts/Dpkg/Source/Package/V2.pm:214
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:171
+#: scripts/Dpkg/Source/Package/V1.pm:153 scripts/Dpkg/Source/Package/V2.pm:222
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:172
 #, perl-format
 msgid "applying %s"
 msgstr "%s wird angewandt"
 
-#: scripts/Dpkg/Source/Package/V1.pm:157
+#: scripts/Dpkg/Source/Package/V1.pm:158
 #, perl-format
 msgid "upstream files that have been modified: %s"
 msgstr "Dateien der Originalautoren, die verändert wurden: %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:167
+#: scripts/Dpkg/Source/Package/V1.pm:168
 msgid "only supports gzip compression"
 msgstr "nur Gzip-Komprimierung wird unterstützt"
 
-#: scripts/Dpkg/Source/Package/V1.pm:178
+#: scripts/Dpkg/Source/Package/V1.pm:179
 msgid ""
 "-b takes at most a directory and an orig source argument (with v1.0 source "
 "package)"
@@ -2970,22 +3004,22 @@
 "höchstens ein Verzeichnis und eine Originalquelle wird bei -b als Argument "
 "akzeptiert (mit v1.0-Quellpaket)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:184
+#: scripts/Dpkg/Source/Package/V1.pm:185
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr "Bearbeitungsstil der Quellen -s%s mit -b nicht erlaubt"
 
-#: scripts/Dpkg/Source/Package/V1.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:200
 #, perl-format
 msgid "packed orig `%s' exists but is not a plain file"
 msgstr "gepackte orig. »%s« existiert, ist aber keine gewöhnliche Datei"
 
-#: scripts/Dpkg/Source/Package/V1.pm:211
+#: scripts/Dpkg/Source/Package/V1.pm:212
 #, perl-format
 msgid "cannot stat orig argument %s"
 msgstr "Originalargument %s kann nicht mit stat abgefragt werden"
 
-#: scripts/Dpkg/Source/Package/V1.pm:217
+#: scripts/Dpkg/Source/Package/V1.pm:218
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -2994,7 +3028,7 @@
 "Orig.-Argument ist ungepackt, aber bei Quellenhandhabungsstil -s%s wird ein "
 "gepacktes Argument verlangt (.orig.tar.<endung>)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:225
+#: scripts/Dpkg/Source/Package/V1.pm:226
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -3003,12 +3037,12 @@
 "Orig. Argument ist gepackt, aber bei Quellenhandhabungsstil -s%s wird ein "
 "ungepacktes Argument verlangt (.orig/)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:230
+#: scripts/Dpkg/Source/Package/V1.pm:231
 #, perl-format
 msgid "orig argument %s is not a plain file or directory"
 msgstr "Orig. Argument %s ist keine gewöhnliche Datei oder Verzeichnis"
 
-#: scripts/Dpkg/Source/Package/V1.pm:236
+#: scripts/Dpkg/Source/Package/V1.pm:237
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s"
@@ -3017,29 +3051,29 @@
 "Orig. Argument ist leer (bedeutet kein Orig., kein Diff), aber bei "
 "Quellenhandhabungsstil -s%s wird etwas verlangt"
 
-#: scripts/Dpkg/Source/Package/V1.pm:249
+#: scripts/Dpkg/Source/Package/V1.pm:250
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr "entpacktes Orig. »%s« existiert, ist aber kein Verzeichnis"
 
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:255
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr ""
 "unmöglich, das vermeintlich ausgepackte Original »%s« mit stat abzufragen"
 
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:264
 #, perl-format
 msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
 msgstr "Quellverzeichnis »%s« lautet nicht <Quellpaket>-<UpstreamVersion> »%s«"
 
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:273
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ""
 ".orig-Verzeichnisname %s ist nicht <Paket>-<Ursprungsversion> (%s erwünscht)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:281
+#: scripts/Dpkg/Source/Package/V1.pm:282
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
@@ -3047,7 +3081,7 @@
 ".orig.tar-Name %s lautet nicht <Paket>_<UpstreamVersion>.orig.tar (%s "
 "erwünscht)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:293
+#: scripts/Dpkg/Source/Package/V1.pm:294
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
@@ -3056,30 +3090,31 @@
 "Tardatei »%s« existiert bereits, wird nicht überschrieben, Abbruch; "
 "verwenden Sie -sU oder -sR zum Erzwingen"
 
-#: scripts/Dpkg/Source/Package/V1.pm:297
+#: scripts/Dpkg/Source/Package/V1.pm:298
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr "Existenz von »%s« kann nicht überprüft werden"
 
-#: scripts/Dpkg/Source/Package/V1.pm:312 scripts/Dpkg/Source/Package/V1.pm:374
-#: scripts/Dpkg/Source/Package/V3/native.pm:96
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V1.pm:375
+#: scripts/Dpkg/Source/Package/V3/native.pm:98
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr "»%s« (neu angelegt) konnte nicht in »%s« umbenannt werden"
 
-#: scripts/Dpkg/Source/Package/V1.pm:315 scripts/Dpkg/Source/Package/V1.pm:377
-#: scripts/Dpkg/Source/Package/V2.pm:461
-#: scripts/Dpkg/Source/Package/V3/native.pm:99
+#: scripts/Dpkg/Source/Package/V1.pm:316 scripts/Dpkg/Source/Package/V1.pm:378
+#: scripts/Dpkg/Source/Package/V2.pm:603
+#: scripts/Dpkg/Source/Package/V3/native.pm:102
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:367
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr "Berechtigung von »%s« kann nicht geändert werden"
 
-#: scripts/Dpkg/Source/Package/V1.pm:317 scripts/Dpkg/Source/Package/V2.pm:330
+#: scripts/Dpkg/Source/Package/V1.pm:318 scripts/Dpkg/Source/Package/V2.pm:348
 #, perl-format
 msgid "building %s using existing %s"
 msgstr "%s wird unter Benutzung des existierenden %s gebaut"
 
-#: scripts/Dpkg/Source/Package/V1.pm:326
+#: scripts/Dpkg/Source/Package/V1.pm:327
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
@@ -3088,18 +3123,18 @@
 "Originalverzeichnis »%s« existiert bereits, wird nicht überschrieben, "
 "Abbruch; verwenden Sie -sA, -sK oder -sP zum Erzwingen."
 
-#: scripts/Dpkg/Source/Package/V1.pm:334
+#: scripts/Dpkg/Source/Package/V1.pm:335
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr "Existenz des Originalverzeichnisses »%s« kann nicht überprüft werden"
 
-#: scripts/Dpkg/Source/Package/V1.pm:365
+#: scripts/Dpkg/Source/Package/V1.pm:366
 #, perl-format
 msgid "the diff modifies the following upstream files: %s"
 msgstr ""
 "durch den Diff werden die folgenden Dateien der Originalautoren verändert: %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:367
+#: scripts/Dpkg/Source/Package/V1.pm:368
 msgid ""
 "use the '3.0 (quilt)' format to have separate and documented changes to "
 "upstream files, see dpkg-source(1)"
@@ -3108,66 +3143,71 @@
 "Änderungen an den Dateien der Originalautoren zu erhalten, siehe dpkg-source"
 "(1)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:369 scripts/Dpkg/Source/Package/V2.pm:465
+#: scripts/Dpkg/Source/Package/V1.pm:370
 msgid "aborting due to --abort-on-upstream-changes"
 msgstr "Abbruch aufgrund von --abort-on-upstream-changes"
 
-#: scripts/Dpkg/Source/Package/V1.pm:387
+#: scripts/Dpkg/Source/Package/V1.pm:388
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr "%s: nicht darstellbare Änderungen an den Quellen"
 
-#: scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V2.pm:119
 #, perl-format
 msgid "duplicate files in %s source package: %s.*"
 msgstr "doppelte Dateien in Quellpaket %s: %s.*"
 
-#: scripts/Dpkg/Source/Package/V2.pm:128
+#: scripts/Dpkg/Source/Package/V2.pm:135
 msgid "missing orig.tar or debian.tar file in v2.0 source package"
 msgstr "fehlende orig.tar- oder debian.tar-Datei in v2.0-Quellpaket"
 
-#: scripts/Dpkg/Source/Package/V2.pm:148
+#: scripts/Dpkg/Source/Package/V2.pm:155
 #, perl-format
 msgid "required removal of `%s' installed by original tarball"
 msgstr "erforderliche Entfernung von »%s«, installiert durch Original-Tarball"
 
-#: scripts/Dpkg/Source/Package/V2.pm:232
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:245
+#: scripts/Dpkg/Source/Package/V2.pm:240
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
 #, perl-format
 msgid "unapplying %s"
 msgstr "Patch %s wird entfernt"
 
-#: scripts/Dpkg/Source/Package/V2.pm:246 scripts/Dpkg/Source/Package/V2.pm:328
-msgid "no orig.tar file found"
-msgstr "keine orig.tar-Datei gefunden"
-
-#: scripts/Dpkg/Source/Package/V2.pm:285
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:310
-msgid ""
-"patches have not been applied, applying them now (use --no-preparation to "
-"override)"
-msgstr ""
-"Patches noch nicht angewandt, werden jetzt angewendet (verwenden Sie --no-"
-"preparation zum Aufheben)"
-
-#: scripts/Dpkg/Source/Package/V2.pm:295
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
-#: scripts/Dpkg/Source/Package/V3/native.pm:75
+#: scripts/Dpkg/Source/Package/V2.pm:263 scripts/Dpkg/Source/Package/V2.pm:344
 #, perl-format
-msgid "-b takes only one parameter with format `%s'"
-msgstr "-b akzeptiert nur einen Parameter mit dem Format »%s«"
+msgid "no upstream tarball found at %s"
+msgstr "unter %s wurde kein Tarball der Originalautoren gefunden"
+
+#: scripts/Dpkg/Source/Package/V2.pm:314
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:329
+msgid "patches are not applied, applying them now"
+msgstr "Patches sind nicht angewandt, werden jetzt angewendet"
 
-#: scripts/Dpkg/Source/Package/V2.pm:315
+#: scripts/Dpkg/Source/Package/V2.pm:331
 #, perl-format
 msgid "several orig.tar files found (%s and %s) but only one is allowed"
 msgstr ""
 "mehrere orig.tar-Dateien gefunden (%s und %s), aber nur eine ist erlaubt"
 
-#: scripts/Dpkg/Source/Package/V2.pm:351
+#: scripts/Dpkg/Source/Package/V2.pm:370
 msgid "copy of the debian directory"
 msgstr "Kopie des debian-Verzeichnisses"
 
-#: scripts/Dpkg/Source/Package/V2.pm:379
+#: scripts/Dpkg/Source/Package/V2.pm:388
+msgid "unrepresentable changes to source"
+msgstr "nicht darstellbare Änderungen an den Quellen"
+
+#: scripts/Dpkg/Source/Package/V2.pm:391
+msgid "local changes detected, the modified files are:"
+msgstr "lokale Änderungen erkannt, die veränderten Dateien sind:"
+
+#: scripts/Dpkg/Source/Package/V2.pm:410
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
+#: scripts/Dpkg/Source/Package/V3/native.pm:76
+#, perl-format
+msgid "-b takes only one parameter with format `%s'"
+msgstr "-b akzeptiert nur einen Parameter mit dem Format »%s«"
+
+#: scripts/Dpkg/Source/Package/V2.pm:444
 #, perl-format
 msgid ""
 "add %s in debian/source/include-binaries if you want to store the modified "
@@ -3176,12 +3216,12 @@
 "fügen Sie %s zu debian/source/include-binaries hinzu, falls Sie das "
 "veränderte Programm im Debian-Tarball speichern möchten."
 
-#: scripts/Dpkg/Source/Package/V2.pm:393
+#: scripts/Dpkg/Source/Package/V2.pm:458
 #, perl-format
 msgid "unwanted binary file: %s"
 msgstr "unerwünschte Binärdatei: %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:422
+#: scripts/Dpkg/Source/Package/V2.pm:493
 #, perl-format
 msgid ""
 "detected %d unwanted binary file (add it in debian/source/include-binaries "
@@ -3196,30 +3236,54 @@
 "erkannte %d unerwünschte Binärdateien (fügen Sie sie zu debian/source/"
 "include-binaries hinzu, um ihre Aufnahme zu erlauben)."
 
-#: scripts/Dpkg/Source/Package/V2.pm:442
-msgid "unrepresentable changes to source"
-msgstr "nicht darstellbare Änderungen an den Quellen"
+#: scripts/Dpkg/Source/Package/V2.pm:508
+#, perl-format
+msgid "you can integrate the local changes with %s"
+msgstr "Sie können die lokalen Änderungen mit %s integrieren"
 
-#: scripts/Dpkg/Source/Package/V2.pm:446 scripts/Dpkg/Source/Package/V2.pm:450
+#: scripts/Dpkg/Source/Package/V2.pm:510
 #, perl-format
-msgid "cannot remove %s"
-msgstr "%s kann nicht entfernt werden"
+msgid "aborting due to unexpected upstream changes, see %s"
+msgstr ""
+"Abbruch aufgrund unerwarteter Änderungen in den Originalquellen, siehe %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:453
+#: scripts/Dpkg/Source/Package/V2.pm:520 scripts/Dpkg/Source/Package/V2.pm:653
 #, perl-format
-msgid "local changes stored in %s, the modified files are:"
-msgstr "lokale Änderungen in %s gespeichert, die veränderten Dateien sind:"
+msgid "local changes have been recorded in a new patch: %s"
+msgstr "lokale Änderungen wurden in einem neuen Patch aufgezeichnet: %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:459
+#: scripts/Dpkg/Source/Package/V2.pm:524 scripts/Dpkg/Source/Package/V2.pm:609
+#: scripts/Dpkg/Source/Package/V2.pm:637 scripts/Dpkg/Source/Package/V2.pm:651
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:369
 #, perl-format
-msgid "cannot rename %s to %s"
-msgstr "%s kann nicht in %s umbenannt werden"
+msgid "cannot remove %s"
+msgstr "%s kann nicht entfernt werden"
 
-#: scripts/Dpkg/Source/Package/V2.pm:481
+#: scripts/Dpkg/Source/Package/V2.pm:534
 #, perl-format
 msgid "adding %s to %s"
 msgstr "%s wird zu %s hinzugefügt"
 
+#: scripts/Dpkg/Source/Package/V2.pm:601
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:365
+#, perl-format
+msgid "failed to copy %s to %s"
+msgstr "Fehler beim Kopieren von %s nach %s"
+
+#: scripts/Dpkg/Source/Package/V2.pm:624
+#, perl-format
+msgid "cannot register changes in %s, this patch already exists"
+msgstr ""
+"Änderungen in %s können nicht registriert werden, Patch existiert bereits"
+
+#: scripts/Dpkg/Source/Package/V2.pm:638
+msgid "there are no local changes to record"
+msgstr "es gibt keine aufzuzeichnenden lokalen Änderungen"
+
+#: scripts/Dpkg/Source/Package/V2.pm:643
+msgid "Enter the desired patch name: "
+msgstr "Bitte geben Sie den gewünschten Namen für den Patch ein: "
+
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:52
 msgid ""
 "This source package can only be manipulated using bzr, which is not in the "
@@ -3251,18 +3315,6 @@
 msgid "doesn't contain a bzr repository"
 msgstr "kein bzr-Depot enthalten"
 
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
-#: scripts/Dpkg/Source/Package/V3/git.pm:104
-#: scripts/Dpkg/Source/Package/V3/git.pm:143
-#: scripts/Dpkg/Source/Package/V3/git.pm:155
-#: scripts/Dpkg/Source/Package/V3/git.pm:174
-#, perl-format
-msgid "unable to chdir to `%s'"
-msgstr "Wechsel in Verzeichnis »%s« nicht möglich"
-
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:127
 msgid "bzr status exited nonzero"
 msgstr "bzr mit nicht-Null-Status beendet"
@@ -3295,7 +3347,7 @@
 msgid "--target-format option is missing"
 msgstr "Option --target-format fehlt"
 
-#: scripts/Dpkg/Source/Package/V3/native.pm:53
+#: scripts/Dpkg/Source/Package/V3/native.pm:54
 #, perl-format
 msgid "unrecognized file for a native source package: %s"
 msgstr "unerkannte Datei für natives Quellpaket: %s"
@@ -3367,17 +3419,17 @@
 msgid "setting up shallow clone"
 msgstr "ein seichter Klon wird eingerichtet"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:72
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:73
 #, perl-format
 msgid "%s should be a directory or non-existing"
 msgstr "%s sollte ein Verzeichnis sein oder nicht existieren"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:78
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:79
 #, perl-format
 msgid "%s should be a file or non-existing"
 msgstr "%s sollte eine Datei sein oder nicht existieren"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:119
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:120
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
@@ -3386,18 +3438,18 @@
 "die Seriendatei (%s) enthält nicht unterstützte Optionen (»%s«, Zeile %s), "
 "dpkg-source könnte beim Anwenden der Patches scheitern."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:137
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:138
 #, perl-format
 msgid "cannot mkdir %s"
 msgstr "Verzeichnis %s kann nicht angelegt werden"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:212
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "Symlink %s kann nicht angelegt werden"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:284
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:287
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:294
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:297
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr "nicht unterstützte Version der Quilt-Metadaten: %s"
@@ -3437,6 +3489,17 @@
 msgid "source package has two conflicting values - %s and %s"
 msgstr "Zwei widersprüchliche Werte für Quellpaket - %s und %s"
 
+#: scripts/Dpkg/Vendor/Debian.pm:106
+#, perl-format
+msgid "unknown hardening feature: %s"
+msgstr "unbekannte Härtungsfunktionalität: %s"
+
+#: scripts/Dpkg/Vendor/Debian.pm:110
+#, perl-format
+msgid "incorrect value in hardening option of DEB_BUILD_MAINT_OPTIONS: %s"
+msgstr ""
+"ungültiger Wert in den Härtungsoptionen von DEB_BUILD_MAINT_OPTIONS: %s"
+
 #: scripts/Dpkg/Vendor/Ubuntu.pm:61 scripts/Dpkg/Vendor/Ubuntu.pm:63
 msgid ""
 "Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu "
@@ -3453,12 +3516,12 @@
 "Versionsnummer lässt Ubuntu-Änderungen vermuten, aber es gibt kein Feld XSBC-"
 "Original-Maintainer"
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:119
+#: scripts/Dpkg/Vendor/Ubuntu.pm:123
 msgid "'hardening' flag found but 'hardening-wrapper' not installed"
 msgstr ""
 "Schalter »hardening« gefunden, aber »hardening-wrapper« nicht installiert"
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:138
+#: scripts/Dpkg/Vendor/Ubuntu.pm:142
 #, perl-format
 msgid "overriding %s in environment: %s"
 msgstr "%s in Umgebung wird überschrieben: %s"
@@ -3486,6 +3549,24 @@
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: »%s«"
 
+#~ msgid "%s: dpkg-buildflags (origin: %s): %s = %s\n"
+#~ msgstr "%s: dpkg-buildflags (Quelle: %s): %s = %s\n"
+
+#~ msgid "1 to 3 args expected\n"
+#~ msgstr "1 bis 3 Argumente erwartet\n"
+
+#~ msgid "cannot rename %s to %s"
+#~ msgstr "%s kann nicht in %s umbenannt werden"
+
+#~ msgid "no orig.tar file found"
+#~ msgstr "keine orig.tar-Datei gefunden"
+
+#~ msgid "need an action option"
+#~ msgstr "eine Aktions-Option wird benötigt"
+
+#~ msgid "entry of APT's %s file"
+#~ msgstr "Eintrag von APTs %s-Datei"
+
 #~ msgid "exec %s"
 #~ msgstr "ausführen von %s"
 
@@ -3600,9 +3681,6 @@
 #~ msgid "some symbols disappeared in the symbols file: %s"
 #~ msgstr "einige Symbole sind aus der Symboldatei verschwunden: %s"
 
-#~ msgid "invalid flag in DEB_BUILD_OPTIONS: %s"
-#~ msgstr "ungültiger Schalter in DEB_BUILD_OPTIONS: %s"
-
 #~ msgid "fork for %s"
 #~ msgstr "Fork für %s"
 
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/dpkg-dev.pot /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/dpkg-dev.pot
--- dpkg/scripts/po/dpkg-dev.pot	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/dpkg-dev.pot	2012-06-07 10:11:09.426073000 -0700
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.16.0\n"
+"Project-Id-Version: dpkg 1.16.1.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,13 +19,13 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: scripts/dpkg-architecture.pl:36 scripts/dpkg-buildflags.pl:31
-#: scripts/dpkg-buildpackage.pl:38 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
 #: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:96
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
 #: scripts/dpkg-mergechangelogs.pl:53 scripts/dpkg-name.pl:46
 #: scripts/dpkg-parsechangelog.pl:31 scripts/dpkg-scanpackages.pl:60
 #: scripts/dpkg-scansources.pl:78 scripts/dpkg-shlibdeps.pl:533
-#: scripts/dpkg-source.pl:433 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:455 scripts/changelog/debian.pl:34
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr ""
@@ -38,10 +38,10 @@
 msgstr ""
 
 #: scripts/dpkg-architecture.pl:42 scripts/dpkg-buildflags.pl:36
-#: scripts/dpkg-buildpackage.pl:45 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
 #: scripts/dpkg-genchanges.pl:102 scripts/dpkg-gencontrol.pl:62
 #: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
-#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:440
+#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:462
 #: scripts/changelog/debian.pl:39
 msgid ""
 "\n"
@@ -72,7 +72,7 @@
 "  --version          show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:84
+#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:91
 #: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:194
 #: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
 #: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:119
@@ -115,7 +115,7 @@
 #: scripts/dpkg-buildflags.pl:33
 msgid ""
 "\n"
-"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+"Copyright (C) 2010-2011 Raphael Hertzog <hertzog@debian.org>."
 msgstr ""
 
 #: scripts/dpkg-buildflags.pl:44
@@ -129,29 +129,27 @@
 "                     value is one of vendor, system, user, env.\n"
 "  --list             output a list of the flags supported by the current "
 "vendor.\n"
-"  --export=(sh|make) output commands to be executed in shell or make that "
-"export\n"
-"                     all the compilation flags as environment variables.\n"
+"  --export=(sh|make|configure)\n"
+"                     output something convenient to import the\n"
+"                     compilation flags in a shell script, in make,\n"
+"                     or on a ./configure command line.\n"
+"  --dump             output all compilation flags with their values\n"
 "  --help             show this help message.\n"
 "  --version          show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-buildflags.pl:63 scripts/dpkg-buildflags.pl:69
-#: scripts/dpkg-buildflags.pl:74
+#: scripts/dpkg-buildflags.pl:66 scripts/dpkg-buildflags.pl:72
+#: scripts/dpkg-buildflags.pl:77 scripts/dpkg-buildflags.pl:81
 #, perl-format
 msgid "two commands specified: --%s and --%s"
 msgstr ""
 
-#: scripts/dpkg-buildflags.pl:67
+#: scripts/dpkg-buildflags.pl:70
 #, perl-format
 msgid "%s needs a parameter"
 msgstr ""
 
-#: scripts/dpkg-buildflags.pl:88
-msgid "need an action option"
-msgstr ""
-
-#: scripts/dpkg-buildpackage.pl:40
+#: scripts/dpkg-buildpackage.pl:39
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -159,7 +157,7 @@
 "Copyright (C) 2007 Frank Lichtenheld"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:52
+#: scripts/dpkg-buildpackage.pl:51
 #, perl-format
 msgid ""
 "\n"
@@ -215,144 +213,139 @@
 "      --version  show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:201 scripts/dpkg-buildpackage.pl:207
-#: scripts/dpkg-buildpackage.pl:213 scripts/dpkg-buildpackage.pl:219
-#: scripts/dpkg-buildpackage.pl:224 scripts/dpkg-genchanges.pl:143
+#: scripts/dpkg-buildpackage.pl:200 scripts/dpkg-buildpackage.pl:206
+#: scripts/dpkg-buildpackage.pl:212 scripts/dpkg-buildpackage.pl:218
+#: scripts/dpkg-buildpackage.pl:223 scripts/dpkg-genchanges.pl:143
 #: scripts/dpkg-genchanges.pl:146 scripts/dpkg-genchanges.pl:150
 #: scripts/dpkg-genchanges.pl:154
 #, perl-format
 msgid "cannot combine %s and %s"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:237 scripts/dpkg-source.pl:187
+#: scripts/dpkg-buildpackage.pl:236 scripts/dpkg-source.pl:202
 msgid "-E and -W are deprecated, they are without effect"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:241
+#: scripts/dpkg-buildpackage.pl:240
 #, perl-format
 msgid "unknown option or argument %s"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:251
+#: scripts/dpkg-buildpackage.pl:250
 msgid "using a gain-root-command while being root"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:257
+#: scripts/dpkg-buildpackage.pl:256
 msgid ""
 "fakeroot not found, either install the fakeroot\n"
 "package, specify a command with the -r option, or run this as root"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:261
+#: scripts/dpkg-buildpackage.pl:260
 #, perl-format
 msgid "gain-root-commmand '%s' not found"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:280
+#: scripts/dpkg-buildpackage.pl:279
 msgid "unknown sign command, assuming pgp style interface"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:283
+#: scripts/dpkg-buildpackage.pl:282
 msgid "PGP support is deprecated (see README.feature-removal-schedule)"
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl:301
-#, perl-format
-msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
-msgstr ""
-
-#: scripts/dpkg-buildpackage.pl:310
 msgid "source package"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:311
+#: scripts/dpkg-buildpackage.pl:302
 msgid "source version"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:321
+#: scripts/dpkg-buildpackage.pl:312
 msgid "source changed by"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:339
+#: scripts/dpkg-buildpackage.pl:330
 msgid "host architecture"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:343
 msgid "debian/rules is not executable: fixing that."
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:371
+#: scripts/dpkg-buildpackage.pl:362
 msgid "Build dependencies/conflicts unsatisfied; aborting."
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:372
+#: scripts/dpkg-buildpackage.pl:363
 msgid "(Use -d flag to override.)"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:375
+#: scripts/dpkg-buildpackage.pl:366
 msgid "This is currently a non-fatal warning with -S, but"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:376
+#: scripts/dpkg-buildpackage.pl:367
 msgid "will probably become fatal in the future."
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:398
+#: scripts/dpkg-buildpackage.pl:389
 msgid ""
 "it is a bad idea to generate a source package without cleaning up first, it "
 "might contain undesired files."
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:411
+#: scripts/dpkg-buildpackage.pl:402
 msgid "Press the return key to start signing process\n"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:418
+#: scripts/dpkg-buildpackage.pl:409
 msgid "Failed to sign .dsc and .changes file"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:437
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:424 scripts/dpkg-buildpackage.pl:428
+#: scripts/dpkg-buildpackage.pl:441
 msgid "write changes file"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:449
+#: scripts/dpkg-buildpackage.pl:440
 msgid "dpkg-genchanges"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:458
+#: scripts/dpkg-buildpackage.pl:449
 msgid "source only upload: Debian-native package"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:460
+#: scripts/dpkg-buildpackage.pl:451
 msgid "source only, diff-only upload (original source NOT included)"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:462
+#: scripts/dpkg-buildpackage.pl:453
 msgid "source only upload (original source is included)"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:465 scripts/dpkg-buildpackage.pl:473
+#: scripts/dpkg-buildpackage.pl:456 scripts/dpkg-buildpackage.pl:464
 msgid "full upload (original source is included)"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:467
+#: scripts/dpkg-buildpackage.pl:458
 msgid "binary only upload (no source included)"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:469
+#: scripts/dpkg-buildpackage.pl:460
 msgid "full upload; Debian-native package (full source is included)"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:471
+#: scripts/dpkg-buildpackage.pl:462
 msgid "binary and diff upload (original source NOT included)"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:478
+#: scripts/dpkg-buildpackage.pl:469
 msgid "Failed to sign .changes file"
 msgstr ""
 
-#: scripts/dpkg-buildpackage.pl:497
+#: scripts/dpkg-buildpackage.pl:488
 #, perl-format
 msgid "unable to determine %s"
 msgstr ""
@@ -391,7 +384,7 @@
 msgid "%s: Build conflicts: "
 msgstr ""
 
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:236
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:253
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr ""
@@ -421,27 +414,27 @@
 msgid "filename, section and priority may contain no whitespace"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:334
 msgid "open new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:345
 msgid "copy old entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:349
 msgid "read old files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:359
 msgid "write new entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:360
 msgid "close new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:361
 msgid "install new files list file"
 msgstr ""
 
@@ -560,7 +553,7 @@
 msgid "missing Priority for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:327
+#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:346
 #: scripts/Dpkg/Vendor.pm:71
 #, perl-format
 msgid "%s is empty"
@@ -586,13 +579,13 @@
 msgid "write original source message"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:426
+#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:532
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr ""
 
 #: scripts/dpkg-genchanges.pl:499 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:431
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:537
 #, perl-format
 msgid "missing information for output field %s"
 msgstr ""
@@ -696,32 +689,40 @@
 msgid "chdir for du to `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:304 scripts/dpkg-shlibdeps.pl:843
+#: scripts/dpkg-gencontrol.pl:305 scripts/dpkg-shlibdeps.pl:843
 #: scripts/Dpkg/IPC.pm:271 scripts/Dpkg/Shlibs/Cppfilt.pm:50
 #, perl-format
 msgid "unable to execute %s"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:311
+#: scripts/dpkg-gencontrol.pl:312
 #, perl-format
 msgid "du in `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:313
+#: scripts/dpkg-gencontrol.pl:314
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:346
+#: scripts/dpkg-gencontrol.pl:347
 msgid "close old files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:368
+#: scripts/dpkg-gencontrol.pl:369
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:379
+#: scripts/dpkg-gencontrol.pl:378 scripts/dpkg-shlibdeps.pl:523
+#: scripts/Dpkg/Interface/Storable.pm:91
+#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
+#: scripts/Dpkg/Source/Package/V2.pm:607
+#, perl-format
+msgid "cannot close %s"
+msgstr ""
+
+#: scripts/dpkg-gencontrol.pl:380
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr ""
@@ -808,11 +809,15 @@
 msgstr ""
 
 #: scripts/dpkg-gensymbols.pl:291
+msgid "the generated symbols file is empty"
+msgstr ""
+
+#: scripts/dpkg-gensymbols.pl:293
 #, perl-format
 msgid "%s doesn't match completely %s"
 msgstr ""
 
-#: scripts/dpkg-gensymbols.pl:294
+#: scripts/dpkg-gensymbols.pl:296
 #, perl-format
 msgid "no debian/symbols file used as basis for generating %s"
 msgstr ""
@@ -839,19 +844,20 @@
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-mergechangelogs.pl:129
+#: scripts/dpkg-mergechangelogs.pl:129 scripts/dpkg-mergechangelogs.pl:131
 #: scripts/Dpkg/Compression/FileHandle.pm:385
 #: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
 #: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Functions.pm:78
-#: scripts/Dpkg/Source/Package.pm:347 scripts/Dpkg/Source/Package.pm:444
-#: scripts/Dpkg/Source/Package/V2.pm:210 scripts/Dpkg/Source/Package/V2.pm:477
-#: scripts/Dpkg/Source/Package/V2.pm:522
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:224
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:323
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:333
+#: scripts/Dpkg/Source/Package.pm:447 scripts/Dpkg/Source/Package.pm:550
+#: scripts/Dpkg/Source/Package/V2.pm:217 scripts/Dpkg/Source/Package/V2.pm:530
+#: scripts/Dpkg/Source/Package/V2.pm:605
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:226
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:234
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:341
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:351
 #, perl-format
 msgid "cannot write %s"
 msgstr ""
@@ -885,7 +891,7 @@
 #: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:138 scripts/Dpkg/Arch.pm:157
 #: scripts/Dpkg/Arch.pm:176 scripts/Dpkg/Changelog/Parse.pm:142
 #: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:138
+#: scripts/Dpkg/Source/Package.pm:193
 #, perl-format
 msgid "cannot open %s"
 msgstr ""
@@ -993,8 +999,7 @@
 msgstr ""
 
 #: scripts/dpkg-parsechangelog.pl:117
-#, perl-format
-msgid "%s takes no non-option arguments"
+msgid "takes no non-option arguments"
 msgstr ""
 
 #: scripts/dpkg-scanpackages.pl:66
@@ -1030,8 +1035,8 @@
 msgid "Unconditional maintainer override for %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:158
-msgid "1 to 3 args expected"
+#: scripts/dpkg-scanpackages.pl:158 scripts/dpkg-scansources.pl:302
+msgid "one to three arguments expected"
 msgstr ""
 
 #: scripts/dpkg-scanpackages.pl:175
@@ -1174,10 +1179,6 @@
 msgid "no binary packages specified in %s"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:302
-msgid "1 to 3 args expected\n"
-msgstr ""
-
 #: scripts/dpkg-shlibdeps.pl:93
 #, perl-format
 msgid "administrative directory '%s' does not exist"
@@ -1364,123 +1365,150 @@
 msgid "unknown output from dpkg --search: '%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:100
+#: scripts/dpkg-source.pl:104
 #, perl-format
 msgid "%s needs a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:103
+#: scripts/dpkg-source.pl:110
 #, perl-format
 msgid "cannot stat directory %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:105
+#: scripts/dpkg-source.pl:112
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:123
+#: scripts/dpkg-source.pl:117 scripts/Dpkg/Source/Package/V2.pm:476
+#: scripts/Dpkg/Source/Package/V2.pm:478 scripts/Dpkg/Source/Package/V2.pm:480
+#: scripts/Dpkg/Source/Package/V2.pm:482
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
+#: scripts/Dpkg/Source/Package/V3/git.pm:104
+#: scripts/Dpkg/Source/Package/V3/git.pm:143
+#: scripts/Dpkg/Source/Package/V3/git.pm:155
+#: scripts/Dpkg/Source/Package/V3/git.pm:174
+#, perl-format
+msgid "unable to chdir to `%s'"
+msgstr ""
+
+#: scripts/dpkg-source.pl:135
 #, perl-format
 msgid "using options from %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:138 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:150 scripts/Dpkg/Compression.pm:173
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr ""
 
-#: scripts/dpkg-source.pl:144 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:156 scripts/Dpkg/Compression.pm:202
 #: scripts/Dpkg/Compression/Process.pm:86
 #, perl-format
 msgid "%s is not a compression level"
 msgstr ""
 
-#: scripts/dpkg-source.pl:199
-msgid "need a command (-x, -b, --before-build, --after-build, --print-format)"
+#: scripts/dpkg-source.pl:214
+msgid ""
+"need a command (-x, -b, --before-build, --after-build, --print-format, --"
+"commit)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:268
+#: scripts/dpkg-source.pl:238
+#, perl-format
+msgid "%s doesn't contain any information about the source package"
+msgstr ""
+
+#: scripts/dpkg-source.pl:283
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr ""
 
-#: scripts/dpkg-source.pl:271
+#: scripts/dpkg-source.pl:286
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 
-#: scripts/dpkg-source.pl:324 scripts/Dpkg/BuildFlags.pm:190
+#: scripts/dpkg-source.pl:301
+#, perl-format
+msgid "%s doesn't list any binary package"
+msgstr ""
+
+#: scripts/dpkg-source.pl:343 scripts/Dpkg/BuildFlags.pm:270
 #: scripts/Dpkg/Compression/FileHandle.pm:401
 #: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:122
-#: scripts/Dpkg/Source/Package/V2.pm:360 scripts/Dpkg/Source/Package/V2.pm:505
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:276
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:330
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:377
+#: scripts/Dpkg/Source/Package/V2.pm:277 scripts/Dpkg/Source/Package/V2.pm:425
+#: scripts/Dpkg/Source/Package/V2.pm:561
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:112
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:286
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:348
 #, perl-format
 msgid "cannot read %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:331
+#: scripts/dpkg-source.pl:350
 #, perl-format
 msgid "no source format specified in %s, see dpkg-source(1)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:356
+#: scripts/dpkg-source.pl:378
 #, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:359
+#: scripts/dpkg-source.pl:381
 #, perl-format
 msgid "using source format `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:366 scripts/Dpkg/Source/Package/V1.pm:300
-#: scripts/Dpkg/Source/Package/V1.pm:345 scripts/Dpkg/Source/Package/V2.pm:488
+#: scripts/dpkg-source.pl:388 scripts/Dpkg/Source/Package/V1.pm:301
+#: scripts/Dpkg/Source/Package/V1.pm:346 scripts/Dpkg/Source/Package/V2.pm:541
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
-#: scripts/Dpkg/Source/Package/V3/native.pm:83
+#: scripts/Dpkg/Source/Package/V3/native.pm:84
 #, perl-format
 msgid "building %s in %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:377
+#: scripts/dpkg-source.pl:399
 msgid "-x needs at least one argument, the .dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:380
+#: scripts/dpkg-source.pl:402
 msgid "-x takes no more than two arguments"
 msgstr ""
 
-#: scripts/dpkg-source.pl:384
+#: scripts/dpkg-source.pl:406
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:400
+#: scripts/dpkg-source.pl:422
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:432
 #, perl-format
 msgid "%s doesn't contain a valid OpenPGP signature"
 msgstr ""
 
-#: scripts/dpkg-source.pl:412
+#: scripts/dpkg-source.pl:434
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:441
 #, perl-format
 msgid "extracting %s in %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:427
+#: scripts/dpkg-source.pl:449
 msgid "only one of -x, -b or --print-format allowed, and only once"
 msgstr ""
 
-#: scripts/dpkg-source.pl:435
+#: scripts/dpkg-source.pl:457
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson\n"
@@ -1488,7 +1516,7 @@
 "Copyright (C) 2008 Raphael Hertzog"
 msgstr ""
 
-#: scripts/dpkg-source.pl:448
+#: scripts/dpkg-source.pl:470
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -1498,10 +1526,12 @@
 "                           extract source package.\n"
 "  -b <dir>                 build source package.\n"
 "  --print-format <dir>     print the source format that would be\n"
-"                           used to build the source package."
+"                           used to build the source package.\n"
+"  --commit [<dir> [<patch-name>]]\n"
+"                           store upstream changes in a new patch."
 msgstr ""
 
-#: scripts/dpkg-source.pl:457
+#: scripts/dpkg-source.pl:481
 #, perl-format
 msgid ""
 "Build options:\n"
@@ -1523,7 +1553,7 @@
 "                             supported are: '1'-'9', 'best', 'fast')"
 msgstr ""
 
-#: scripts/dpkg-source.pl:475
+#: scripts/dpkg-source.pl:499
 msgid ""
 "Extract options:\n"
 "  --no-copy                don't copy .orig tarballs\n"
@@ -1533,14 +1563,14 @@
 "signature"
 msgstr ""
 
-#: scripts/dpkg-source.pl:480
+#: scripts/dpkg-source.pl:504
 msgid ""
 "General options:\n"
 "  -h, --help               show this help message.\n"
 "      --version            show the version."
 msgstr ""
 
-#: scripts/dpkg-source.pl:484
+#: scripts/dpkg-source.pl:508
 msgid ""
 "More options are available but they depend on the source package format.\n"
 "See dpkg-source(1) for more info."
@@ -1597,12 +1627,12 @@
 msgstr ""
 
 #: scripts/changelog/debian.pl:136
-msgid "fatal error occured while parsing input"
+msgid "fatal error occurred while parsing input"
 msgstr ""
 
 #: scripts/changelog/debian.pl:139
 #, perl-format
-msgid "fatal error occured while parsing %s"
+msgid "fatal error occurred while parsing %s"
 msgstr ""
 
 #: scripts/Dpkg/Arch.pm:86
@@ -1617,17 +1647,17 @@
 "Unknown gcc system type %s, falling back to default (native compilation)"
 msgstr ""
 
-#: scripts/Dpkg/BuildFlags.pm:198
+#: scripts/Dpkg/BuildFlags.pm:278
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
 msgstr ""
 
-#: scripts/Dpkg/BuildFlags.pm:207
+#: scripts/Dpkg/BuildFlags.pm:291
 #, perl-format
 msgid "line %d of %s is invalid, it has been ignored."
 msgstr ""
 
-#: scripts/Dpkg/BuildOptions.pm:91
+#: scripts/Dpkg/BuildOptions.pm:94
 #, perl-format
 msgid "invalid flag in %s: %s"
 msgstr ""
@@ -1881,7 +1911,7 @@
 
 #: scripts/Dpkg/Control.pm:156 scripts/Dpkg/Control.pm:158
 #, perl-format
-msgid "entry of APT's %s file"
+msgid "entry in repository's %s file"
 msgstr ""
 
 #: scripts/Dpkg/Control.pm:160 scripts/Dpkg/Control.pm:164
@@ -1914,8 +1944,9 @@
 msgid "first block lacks a source field"
 msgstr ""
 
-#: scripts/Dpkg/Control/Info.pm:110
-msgid "block lacks a package field"
+#: scripts/Dpkg/Control/Info.pm:110 scripts/Dpkg/Control/Info.pm:113
+#, perl-format
+msgid "block lacks the '%s' field"
 msgstr ""
 
 #: scripts/Dpkg/Control/Hash.pm:172
@@ -1989,17 +2020,11 @@
 msgid "%s failed with unknown exit code %d"
 msgstr ""
 
-#: scripts/Dpkg/ErrorHandling.pm:113
+#: scripts/Dpkg/ErrorHandling.pm:115
 #, perl-format
 msgid "syntax error in %s at line %d: %s"
 msgstr ""
 
-#: scripts/Dpkg/Interface/Storable.pm:91
-#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
-#, perl-format
-msgid "cannot close %s"
-msgstr ""
-
 #: scripts/Dpkg/IPC.pm:211 scripts/Dpkg/IPC.pm:217 scripts/Dpkg/IPC.pm:223
 #, perl-format
 msgid "pipe for %s"
@@ -2091,8 +2116,8 @@
 msgid "cannot create directory %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:231
-#: scripts/Dpkg/Source/Package/V2.pm:192
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:307
+#: scripts/Dpkg/Source/Package/V2.pm:199
 #, perl-format
 msgid "cannot opendir %s"
 msgstr ""
@@ -2127,7 +2152,7 @@
 msgid "cannot read timestamp from %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:378
+#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:443
 msgid "binary file contents changed"
 msgstr ""
 
@@ -2199,7 +2224,7 @@
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:377
+#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:442
 #, perl-format
 msgid "cannot represent change to %s: %s"
 msgstr ""
@@ -2245,7 +2270,7 @@
 msgstr ""
 
 #: scripts/Dpkg/Source/Patch.pm:410
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:127
 #, perl-format
 msgid "%s contains an insecure path: %s"
 msgstr ""
@@ -2309,7 +2334,7 @@
 msgid "nonexistent"
 msgstr ""
 
-#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:358
+#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:458
 #, perl-format
 msgid "cannot stat %s"
 msgstr ""
@@ -2343,327 +2368,340 @@
 msgid "named socket"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:133
+#: scripts/Dpkg/Source/Package.pm:188
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:153
+#: scripts/Dpkg/Source/Package.pm:208
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:181
+#: scripts/Dpkg/Source/Package.pm:236
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:185
+#: scripts/Dpkg/Source/Package.pm:240
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:212
+#: scripts/Dpkg/Source/Package.pm:288
 msgid "source and version are required to compute the source basename"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:278 scripts/Dpkg/Source/Package.pm:280
+#: scripts/Dpkg/Source/Package.pm:371 scripts/Dpkg/Source/Package.pm:373
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:287 scripts/Dpkg/Source/Package.pm:289
+#: scripts/Dpkg/Source/Package.pm:380 scripts/Dpkg/Source/Package.pm:382
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:298
+#: scripts/Dpkg/Source/Package.pm:391
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Package.pm:460
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:364
+#: scripts/Dpkg/Source/Package.pm:464
 #, perl-format
 msgid "cannot make %s executable"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm:366
+#: scripts/Dpkg/Source/Package.pm:466
 #, perl-format
 msgid "%s is not a plain file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:61
+#: scripts/Dpkg/Source/Package.pm:517
+#, perl-format
+msgid "'%s' is not supported by the source format '%s'"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V1.pm:62
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:83
+#: scripts/Dpkg/Source/Package/V1.pm:84
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:95
-#: scripts/Dpkg/Source/Package/V3/native.pm:50
+#: scripts/Dpkg/Source/Package/V1.pm:96
+#: scripts/Dpkg/Source/Package/V3/native.pm:51
 msgid "multiple tarfiles in v1.0 source package"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:100 scripts/Dpkg/Source/Package/V2.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:101 scripts/Dpkg/Source/Package/V2.pm:129
 #, perl-format
 msgid "unrecognized file for a %s source package: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:105
-#: scripts/Dpkg/Source/Package/V3/native.pm:57
+#: scripts/Dpkg/Source/Package/V1.pm:106
+#: scripts/Dpkg/Source/Package/V3/native.pm:58
 msgid "no tarfile in Files field"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:108
+#: scripts/Dpkg/Source/Package/V1.pm:109
 msgid "native package with .orig.tar"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:121
+#: scripts/Dpkg/Source/Package/V1.pm:122
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:125 scripts/Dpkg/Source/Package/V2.pm:134
-#: scripts/Dpkg/Source/Package/V2.pm:146 scripts/Dpkg/Source/Package/V2.pm:159
+#: scripts/Dpkg/Source/Package/V1.pm:126 scripts/Dpkg/Source/Package/V2.pm:141
+#: scripts/Dpkg/Source/Package/V2.pm:153 scripts/Dpkg/Source/Package/V2.pm:166
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:190
-#: scripts/Dpkg/Source/Package/V3/native.pm:60
+#: scripts/Dpkg/Source/Package/V3/native.pm:61
 #, perl-format
 msgid "unpacking %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:132
+#: scripts/Dpkg/Source/Package/V1.pm:133
 msgid "unable to keep orig directory (already exists)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:139
+#: scripts/Dpkg/Source/Package/V1.pm:140
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:145
+#: scripts/Dpkg/Source/Package/V1.pm:146
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:152 scripts/Dpkg/Source/Package/V2.pm:214
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:171
+#: scripts/Dpkg/Source/Package/V1.pm:153 scripts/Dpkg/Source/Package/V2.pm:222
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:172
 #, perl-format
 msgid "applying %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:157
+#: scripts/Dpkg/Source/Package/V1.pm:158
 #, perl-format
 msgid "upstream files that have been modified: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:167
+#: scripts/Dpkg/Source/Package/V1.pm:168
 msgid "only supports gzip compression"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:178
+#: scripts/Dpkg/Source/Package/V1.pm:179
 msgid ""
 "-b takes at most a directory and an orig source argument (with v1.0 source "
 "package)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:184
+#: scripts/Dpkg/Source/Package/V1.pm:185
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:200
 #, perl-format
 msgid "packed orig `%s' exists but is not a plain file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:211
+#: scripts/Dpkg/Source/Package/V1.pm:212
 #, perl-format
 msgid "cannot stat orig argument %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:217
+#: scripts/Dpkg/Source/Package/V1.pm:218
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
 "orig.tar.<ext>)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:225
+#: scripts/Dpkg/Source/Package/V1.pm:226
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
 "orig/)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:230
+#: scripts/Dpkg/Source/Package/V1.pm:231
 #, perl-format
 msgid "orig argument %s is not a plain file or directory"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:236
+#: scripts/Dpkg/Source/Package/V1.pm:237
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s"
 "%s wants something"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:249
+#: scripts/Dpkg/Source/Package/V1.pm:250
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:255
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:264
 #, perl-format
 msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:273
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:281
+#: scripts/Dpkg/Source/Package/V1.pm:282
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:293
+#: scripts/Dpkg/Source/Package/V1.pm:294
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
 "override"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:297
+#: scripts/Dpkg/Source/Package/V1.pm:298
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:312 scripts/Dpkg/Source/Package/V1.pm:374
-#: scripts/Dpkg/Source/Package/V3/native.pm:96
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V1.pm:375
+#: scripts/Dpkg/Source/Package/V3/native.pm:98
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:315 scripts/Dpkg/Source/Package/V1.pm:377
-#: scripts/Dpkg/Source/Package/V2.pm:461
-#: scripts/Dpkg/Source/Package/V3/native.pm:99
+#: scripts/Dpkg/Source/Package/V1.pm:316 scripts/Dpkg/Source/Package/V1.pm:378
+#: scripts/Dpkg/Source/Package/V2.pm:603
+#: scripts/Dpkg/Source/Package/V3/native.pm:102
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:367
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:317 scripts/Dpkg/Source/Package/V2.pm:330
+#: scripts/Dpkg/Source/Package/V1.pm:318 scripts/Dpkg/Source/Package/V2.pm:348
 #, perl-format
 msgid "building %s using existing %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:326
+#: scripts/Dpkg/Source/Package/V1.pm:327
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
 "sP to override"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:334
+#: scripts/Dpkg/Source/Package/V1.pm:335
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:365
+#: scripts/Dpkg/Source/Package/V1.pm:366
 #, perl-format
 msgid "the diff modifies the following upstream files: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:367
+#: scripts/Dpkg/Source/Package/V1.pm:368
 msgid ""
 "use the '3.0 (quilt)' format to have separate and documented changes to "
 "upstream files, see dpkg-source(1)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:369 scripts/Dpkg/Source/Package/V2.pm:465
+#: scripts/Dpkg/Source/Package/V1.pm:370
 msgid "aborting due to --abort-on-upstream-changes"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:387
+#: scripts/Dpkg/Source/Package/V1.pm:388
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V2.pm:119
 #, perl-format
 msgid "duplicate files in %s source package: %s.*"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:128
+#: scripts/Dpkg/Source/Package/V2.pm:135
 msgid "missing orig.tar or debian.tar file in v2.0 source package"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:148
+#: scripts/Dpkg/Source/Package/V2.pm:155
 #, perl-format
 msgid "required removal of `%s' installed by original tarball"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:232
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:245
+#: scripts/Dpkg/Source/Package/V2.pm:240
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
 #, perl-format
 msgid "unapplying %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:246 scripts/Dpkg/Source/Package/V2.pm:328
-msgid "no orig.tar file found"
-msgstr ""
-
-#: scripts/Dpkg/Source/Package/V2.pm:285
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:310
-msgid ""
-"patches have not been applied, applying them now (use --no-preparation to "
-"override)"
+#: scripts/Dpkg/Source/Package/V2.pm:263 scripts/Dpkg/Source/Package/V2.pm:344
+#, perl-format
+msgid "no upstream tarball found at %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:295
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
-#: scripts/Dpkg/Source/Package/V3/native.pm:75
-#, perl-format
-msgid "-b takes only one parameter with format `%s'"
+#: scripts/Dpkg/Source/Package/V2.pm:314
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:329
+msgid "patches are not applied, applying them now"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:315
+#: scripts/Dpkg/Source/Package/V2.pm:331
 #, perl-format
 msgid "several orig.tar files found (%s and %s) but only one is allowed"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:351
+#: scripts/Dpkg/Source/Package/V2.pm:370
 msgid "copy of the debian directory"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:379
+#: scripts/Dpkg/Source/Package/V2.pm:388
+msgid "unrepresentable changes to source"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V2.pm:391
+msgid "local changes detected, the modified files are:"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V2.pm:410
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
+#: scripts/Dpkg/Source/Package/V3/native.pm:76
+#, perl-format
+msgid "-b takes only one parameter with format `%s'"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V2.pm:444
 #, perl-format
 msgid ""
 "add %s in debian/source/include-binaries if you want to store the modified "
 "binary in the debian tarball"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:393
+#: scripts/Dpkg/Source/Package/V2.pm:458
 #, perl-format
 msgid "unwanted binary file: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:422
+#: scripts/Dpkg/Source/Package/V2.pm:493
 #, perl-format
 msgid ""
 "detected %d unwanted binary file (add it in debian/source/include-binaries "
@@ -2674,30 +2712,52 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:442
-msgid "unrepresentable changes to source"
+#: scripts/Dpkg/Source/Package/V2.pm:508
+#, perl-format
+msgid "you can integrate the local changes with %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:446 scripts/Dpkg/Source/Package/V2.pm:450
+#: scripts/Dpkg/Source/Package/V2.pm:510
 #, perl-format
-msgid "cannot remove %s"
+msgid "aborting due to unexpected upstream changes, see %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:453
+#: scripts/Dpkg/Source/Package/V2.pm:520 scripts/Dpkg/Source/Package/V2.pm:653
 #, perl-format
-msgid "local changes stored in %s, the modified files are:"
+msgid "local changes have been recorded in a new patch: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:459
+#: scripts/Dpkg/Source/Package/V2.pm:524 scripts/Dpkg/Source/Package/V2.pm:609
+#: scripts/Dpkg/Source/Package/V2.pm:637 scripts/Dpkg/Source/Package/V2.pm:651
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:369
 #, perl-format
-msgid "cannot rename %s to %s"
+msgid "cannot remove %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:481
+#: scripts/Dpkg/Source/Package/V2.pm:534
 #, perl-format
 msgid "adding %s to %s"
 msgstr ""
 
+#: scripts/Dpkg/Source/Package/V2.pm:601
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:365
+#, perl-format
+msgid "failed to copy %s to %s"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V2.pm:624
+#, perl-format
+msgid "cannot register changes in %s, this patch already exists"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V2.pm:638
+msgid "there are no local changes to record"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V2.pm:643
+msgid "Enter the desired patch name: "
+msgstr ""
+
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:52
 msgid ""
 "This source package can only be manipulated using bzr, which is not in the "
@@ -2725,18 +2785,6 @@
 msgid "doesn't contain a bzr repository"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
-#: scripts/Dpkg/Source/Package/V3/git.pm:104
-#: scripts/Dpkg/Source/Package/V3/git.pm:143
-#: scripts/Dpkg/Source/Package/V3/git.pm:155
-#: scripts/Dpkg/Source/Package/V3/git.pm:174
-#, perl-format
-msgid "unable to chdir to `%s'"
-msgstr ""
-
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:127
 msgid "bzr status exited nonzero"
 msgstr ""
@@ -2768,7 +2816,7 @@
 msgid "--target-format option is missing"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/native.pm:53
+#: scripts/Dpkg/Source/Package/V3/native.pm:54
 #, perl-format
 msgid "unrecognized file for a native source package: %s"
 msgstr ""
@@ -2836,35 +2884,35 @@
 msgid "setting up shallow clone"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:72
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:73
 #, perl-format
 msgid "%s should be a directory or non-existing"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:78
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:79
 #, perl-format
 msgid "%s should be a file or non-existing"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:119
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:120
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
 "source might fail when applying patches."
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:137
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:138
 #, perl-format
 msgid "cannot mkdir %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:212
 #, perl-format
 msgid "can't create symlink %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:284
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:287
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:294
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:297
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr ""
@@ -2904,6 +2952,16 @@
 msgid "source package has two conflicting values - %s and %s"
 msgstr ""
 
+#: scripts/Dpkg/Vendor/Debian.pm:106
+#, perl-format
+msgid "unknown hardening feature: %s"
+msgstr ""
+
+#: scripts/Dpkg/Vendor/Debian.pm:110
+#, perl-format
+msgid "incorrect value in hardening option of DEB_BUILD_MAINT_OPTIONS: %s"
+msgstr ""
+
 #: scripts/Dpkg/Vendor/Ubuntu.pm:61 scripts/Dpkg/Vendor/Ubuntu.pm:63
 msgid ""
 "Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu "
@@ -2916,11 +2974,11 @@
 "Maintainer field"
 msgstr ""
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:119
+#: scripts/Dpkg/Vendor/Ubuntu.pm:123
 msgid "'hardening' flag found but 'hardening-wrapper' not installed"
 msgstr ""
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:138
+#: scripts/Dpkg/Vendor/Ubuntu.pm:142
 #, perl-format
 msgid "overriding %s in environment: %s"
 msgstr ""
@@ -2930,16 +2988,20 @@
 msgid "%s is not a valid version"
 msgstr ""
 
-#: scripts/Dpkg/Version.pm:368
+#: scripts/Dpkg/Version.pm:371
 msgid "version number cannot be empty"
 msgstr ""
 
-#: scripts/Dpkg/Version.pm:373
+#: scripts/Dpkg/Version.pm:376
+msgid "version number does not start with digit"
+msgstr ""
+
+#: scripts/Dpkg/Version.pm:381
 #, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Version.pm:379
+#: scripts/Dpkg/Version.pm:386
 #, perl-format
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr ""
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/en@boldquot.header /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/en@boldquot.header
--- dpkg/scripts/po/en@boldquot.header	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/en@boldquot.header	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,25 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/en@quot.header /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/en@quot.header
--- dpkg/scripts/po/en@quot.header	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/en@quot.header	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,22 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
Binary files dpkg/scripts/po/es.gmo and /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/es.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/es.po /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/es.po
--- dpkg/scripts/po/es.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/es.po	2012-06-07 10:11:09.426073000 -0700
@@ -31,7 +31,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.18.8.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-12-20 03:17+0100\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -69,13 +69,13 @@
 "X-POFile-SpellExtra: sgpg unset sd\n"
 
 #: scripts/dpkg-architecture.pl:36 scripts/dpkg-buildflags.pl:31
-#: scripts/dpkg-buildpackage.pl:38 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
 #: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:96
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
 #: scripts/dpkg-mergechangelogs.pl:53 scripts/dpkg-name.pl:46
 #: scripts/dpkg-parsechangelog.pl:31 scripts/dpkg-scanpackages.pl:60
 #: scripts/dpkg-scansources.pl:78 scripts/dpkg-shlibdeps.pl:533
-#: scripts/dpkg-source.pl:433 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:455 scripts/changelog/debian.pl:34
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versión %s.\n"
@@ -91,10 +91,10 @@
 "Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>."
 
 #: scripts/dpkg-architecture.pl:42 scripts/dpkg-buildflags.pl:36
-#: scripts/dpkg-buildpackage.pl:45 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
 #: scripts/dpkg-genchanges.pl:102 scripts/dpkg-gencontrol.pl:62
 #: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
-#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:440
+#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:462
 #: scripts/changelog/debian.pl:39
 msgid ""
 "\n"
@@ -151,7 +151,7 @@
 "  --help                   Muestra este mensaje de ayuda.\n"
 "  --version                Muestra la versión.\n"
 
-#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:84
+#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:91
 #: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:194
 #: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
 #: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:119
@@ -201,15 +201,33 @@
 msgstr "%s no es un nombre de variable aceptado"
 
 #: scripts/dpkg-buildflags.pl:33
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
 msgid ""
 "\n"
-"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+"Copyright (C) 2010-2011 Raphael Hertzog <hertzog@debian.org>."
 msgstr ""
 "\n"
 "Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
 
 #: scripts/dpkg-buildflags.pl:44
-#, perl-format
+#, fuzzy, perl-format
+#| msgid ""
+#| "Usage: %s [<action>]\n"
+#| "\n"
+#| "Actions:\n"
+#| "  --get <flag>       output the requested flag to stdout.\n"
+#| "  --origin <flag>    output the origin of the flag to stdout:\n"
+#| "                     value is one of vendor, system, user, env.\n"
+#| "  --list             output a list of the flags supported by the current "
+#| "vendor.\n"
+#| "  --export=(sh|make) output commands to be executed in shell or make that "
+#| "export\n"
+#| "                     all the compilation flags as environment variables.\n"
+#| "  --help             show this help message.\n"
+#| "  --version          show the version.\n"
 msgid ""
 "Usage: %s [<action>]\n"
 "\n"
@@ -219,9 +237,11 @@
 "                     value is one of vendor, system, user, env.\n"
 "  --list             output a list of the flags supported by the current "
 "vendor.\n"
-"  --export=(sh|make) output commands to be executed in shell or make that "
-"export\n"
-"                     all the compilation flags as environment variables.\n"
+"  --export=(sh|make|configure)\n"
+"                     output something convenient to import the\n"
+"                     compilation flags in a shell script, in make,\n"
+"                     or on a ./configure command line.\n"
+"  --dump             output all compilation flags with their values\n"
 "  --help             show this help message.\n"
 "  --version          show the version.\n"
 msgstr ""
@@ -238,22 +258,18 @@
 "  --help           Muestra este mensaje de ayuda.\n"
 "  --version        Muestra la versión.\n"
 
-#: scripts/dpkg-buildflags.pl:63 scripts/dpkg-buildflags.pl:69
-#: scripts/dpkg-buildflags.pl:74
+#: scripts/dpkg-buildflags.pl:66 scripts/dpkg-buildflags.pl:72
+#: scripts/dpkg-buildflags.pl:77 scripts/dpkg-buildflags.pl:81
 #, perl-format
 msgid "two commands specified: --%s and --%s"
 msgstr "se han definido dos órdenes: «--%s» y «--%s»"
 
-#: scripts/dpkg-buildflags.pl:67
+#: scripts/dpkg-buildflags.pl:70
 #, perl-format
 msgid "%s needs a parameter"
 msgstr "%s requiere un parámetro"
 
-#: scripts/dpkg-buildflags.pl:88
-msgid "need an action option"
-msgstr "requiere una opción de acción"
-
-#: scripts/dpkg-buildpackage.pl:40
+#: scripts/dpkg-buildpackage.pl:39
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -265,7 +281,7 @@
 "Copyright (C) 2000 Wichert Akkerman\n"
 "Copyright (C) 2007 Frank Lichtenheld"
 
-#: scripts/dpkg-buildpackage.pl:52
+#: scripts/dpkg-buildpackage.pl:51
 #, perl-format
 msgid ""
 "\n"
@@ -382,31 +398,31 @@
 "  -h, --help     Muestra este mensaje de ayuda.\n"
 "      --version  Muestra la versión.\n"
 
-#: scripts/dpkg-buildpackage.pl:201 scripts/dpkg-buildpackage.pl:207
-#: scripts/dpkg-buildpackage.pl:213 scripts/dpkg-buildpackage.pl:219
-#: scripts/dpkg-buildpackage.pl:224 scripts/dpkg-genchanges.pl:143
+#: scripts/dpkg-buildpackage.pl:200 scripts/dpkg-buildpackage.pl:206
+#: scripts/dpkg-buildpackage.pl:212 scripts/dpkg-buildpackage.pl:218
+#: scripts/dpkg-buildpackage.pl:223 scripts/dpkg-genchanges.pl:143
 #: scripts/dpkg-genchanges.pl:146 scripts/dpkg-genchanges.pl:150
 #: scripts/dpkg-genchanges.pl:154
 #, perl-format
 msgid "cannot combine %s and %s"
 msgstr "no se puede combinar «%s» con «%s»"
 
-#: scripts/dpkg-buildpackage.pl:237 scripts/dpkg-source.pl:187
+#: scripts/dpkg-buildpackage.pl:236 scripts/dpkg-source.pl:202
 msgid "-E and -W are deprecated, they are without effect"
 msgstr "«-E» y «-W» están obsoletas y no tienen efecto"
 
-#: scripts/dpkg-buildpackage.pl:241
+#: scripts/dpkg-buildpackage.pl:240
 #, perl-format
 msgid "unknown option or argument %s"
 msgstr "el argumento u opción «%s» es desconocido"
 
-#: scripts/dpkg-buildpackage.pl:251
+#: scripts/dpkg-buildpackage.pl:250
 msgid "using a gain-root-command while being root"
 msgstr ""
 "está usando una orden para convertirse en administrador («gain-root-"
 "command»), a pesar de que ya es el administrador"
 
-#: scripts/dpkg-buildpackage.pl:257
+#: scripts/dpkg-buildpackage.pl:256
 msgid ""
 "fakeroot not found, either install the fakeroot\n"
 "package, specify a command with the -r option, or run this as root"
@@ -414,65 +430,60 @@
 "no se ha encontrado fakeroot; puede instalar el paquete fakeroot,\n"
 "definir una orden con la opción «-r», o ejecutar esto como administrador"
 
-#: scripts/dpkg-buildpackage.pl:261
+#: scripts/dpkg-buildpackage.pl:260
 #, perl-format
 msgid "gain-root-commmand '%s' not found"
 msgstr "no se ha encontrado la orden «%s» para convertirse en administrador"
 
-#: scripts/dpkg-buildpackage.pl:280
+#: scripts/dpkg-buildpackage.pl:279
 msgid "unknown sign command, assuming pgp style interface"
 msgstr "la orden de firma es desconocida, adoptando un estilo de interfaz pgp"
 
-#: scripts/dpkg-buildpackage.pl:283
+#: scripts/dpkg-buildpackage.pl:282
 msgid "PGP support is deprecated (see README.feature-removal-schedule)"
 msgstr ""
 "La compatibilidad con PGP está obsoleta (consulte «README.feature-removal-"
 "schedule»)"
 
 #: scripts/dpkg-buildpackage.pl:301
-#, perl-format
-msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
-msgstr "%s: exportar «%s» de dpkg-buildflags (origen: «%s»): «%s»\n"
-
-#: scripts/dpkg-buildpackage.pl:310
 msgid "source package"
 msgstr "paquete fuente"
 
-#: scripts/dpkg-buildpackage.pl:311
+#: scripts/dpkg-buildpackage.pl:302
 msgid "source version"
 msgstr "versión de las fuentes"
 
-#: scripts/dpkg-buildpackage.pl:321
+#: scripts/dpkg-buildpackage.pl:312
 msgid "source changed by"
 msgstr "fuentes modificadas por"
 
-#: scripts/dpkg-buildpackage.pl:339
+#: scripts/dpkg-buildpackage.pl:330
 msgid "host architecture"
 msgstr "arquitectura del sistema"
 
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:343
 msgid "debian/rules is not executable: fixing that."
 msgstr "«debian/rules» no es un fichero ejecutable: reparando."
 
-#: scripts/dpkg-buildpackage.pl:371
+#: scripts/dpkg-buildpackage.pl:362
 msgid "Build dependencies/conflicts unsatisfied; aborting."
 msgstr ""
 "Las dependencias y conflictos de construcción no están satisfechas, "
 "cancelando."
 
-#: scripts/dpkg-buildpackage.pl:372
+#: scripts/dpkg-buildpackage.pl:363
 msgid "(Use -d flag to override.)"
 msgstr "(Use la opción «-d» para anularlo.)"
 
-#: scripts/dpkg-buildpackage.pl:375
+#: scripts/dpkg-buildpackage.pl:366
 msgid "This is currently a non-fatal warning with -S, but"
 msgstr "Actualmente, este es un aviso no fatal con «-S», pero"
 
-#: scripts/dpkg-buildpackage.pl:376
+#: scripts/dpkg-buildpackage.pl:367
 msgid "will probably become fatal in the future."
 msgstr "probablemente sea fatal en el futuro."
 
-#: scripts/dpkg-buildpackage.pl:398
+#: scripts/dpkg-buildpackage.pl:389
 msgid ""
 "it is a bad idea to generate a source package without cleaning up first, it "
 "might contain undesired files."
@@ -480,59 +491,59 @@
 "Es una mala idea generar un paquete fuente sin antes limpiar, ya que puede "
 "contener ficheros no deseados."
 
-#: scripts/dpkg-buildpackage.pl:411
+#: scripts/dpkg-buildpackage.pl:402
 msgid "Press the return key to start signing process\n"
 msgstr "Pulse la tecla Intro para iniciar el proceso de firmado\n"
 
-#: scripts/dpkg-buildpackage.pl:418
+#: scripts/dpkg-buildpackage.pl:409
 msgid "Failed to sign .dsc and .changes file"
 msgstr "Se ha detectado un fallo al firmar los ficheros «.dsc» y «.changes»"
 
-#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:437
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:424 scripts/dpkg-buildpackage.pl:428
+#: scripts/dpkg-buildpackage.pl:441
 msgid "write changes file"
 msgstr "escribir el fichero de cambios «changes»"
 
-#: scripts/dpkg-buildpackage.pl:449
+#: scripts/dpkg-buildpackage.pl:440
 msgid "dpkg-genchanges"
 msgstr "dpkg-genchanges"
 
-#: scripts/dpkg-buildpackage.pl:458
+#: scripts/dpkg-buildpackage.pl:449
 msgid "source only upload: Debian-native package"
 msgstr "subida sólo de fuentes: paquetes nativos de Debian"
 
-#: scripts/dpkg-buildpackage.pl:460
+#: scripts/dpkg-buildpackage.pl:451
 msgid "source only, diff-only upload (original source NOT included)"
 msgstr ""
 "sólo fuentes, subida sólo de las diferencias, («diff», NO se incluye la "
 "fuente originales)"
 
-#: scripts/dpkg-buildpackage.pl:462
+#: scripts/dpkg-buildpackage.pl:453
 msgid "source only upload (original source is included)"
 msgstr "subida sólo de fuentes (se incluye la fuente original)"
 
-#: scripts/dpkg-buildpackage.pl:465 scripts/dpkg-buildpackage.pl:473
+#: scripts/dpkg-buildpackage.pl:456 scripts/dpkg-buildpackage.pl:464
 msgid "full upload (original source is included)"
 msgstr "subida completa (se incluye la fuente original)"
 
-#: scripts/dpkg-buildpackage.pl:467
+#: scripts/dpkg-buildpackage.pl:458
 msgid "binary only upload (no source included)"
 msgstr "subida sólo de binarios (no se incluye ninguna fuente)"
 
-#: scripts/dpkg-buildpackage.pl:469
+#: scripts/dpkg-buildpackage.pl:460
 msgid "full upload; Debian-native package (full source is included)"
 msgstr ""
 "subida completa; paquete nativo de Debian (se incluye la fuente completa)"
 
-#: scripts/dpkg-buildpackage.pl:471
+#: scripts/dpkg-buildpackage.pl:462
 msgid "binary and diff upload (original source NOT included)"
 msgstr "subida de binarios y diferencias (NO se incluye la fuente original)"
 
-#: scripts/dpkg-buildpackage.pl:478
+#: scripts/dpkg-buildpackage.pl:469
 msgid "Failed to sign .changes file"
 msgstr "Se ha detectado un fallo al firmar el fichero «.changes»"
 
-#: scripts/dpkg-buildpackage.pl:497
+#: scripts/dpkg-buildpackage.pl:488
 #, perl-format
 msgid "unable to determine %s"
 msgstr "no se pudo determinar «%s»"
@@ -583,7 +594,7 @@
 msgid "%s: Build conflicts: "
 msgstr "%s: Conflictos de construcción: "
 
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:236
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:253
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "se ha detectado un fallo al analizar «%s»"
@@ -624,29 +635,29 @@
 "El nombre de fichero, sección y prioridad no pueden contener espacios en "
 "blanco"
 
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:334
 msgid "open new files list file"
 msgstr "abrir el nuevo fichero «files» de lista de ficheros"
 
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:345
 msgid "copy old entry to new files list file"
 msgstr ""
 "copiar la entrada antigua al nuevo fichero «files» de la lista de ficheros"
 
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:349
 msgid "read old files list file"
 msgstr "leer el antiguo fichero «files» de la lista de ficheros"
 
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:359
 msgid "write new entry to new files list file"
 msgstr ""
 "escribir la entrada nueva al nuevo fichero «files» de la lista de ficheros"
 
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:360
 msgid "close new files list file"
 msgstr "cerrar el nuevo fichero «files» de la lista de ficheros"
 
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:361
 msgid "install new files list file"
 msgstr "instalar el nuevo fichero «files» de la lista de ficheros"
 
@@ -821,7 +832,7 @@
 msgid "missing Priority for source files"
 msgstr "falta el campo «Priority» para los ficheros de fuentes"
 
-#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:327
+#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:346
 #: scripts/Dpkg/Vendor.pm:71
 #, perl-format
 msgid "%s is empty"
@@ -847,13 +858,13 @@
 msgid "write original source message"
 msgstr "escribir el mensaje de la fuente original"
 
-#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:426
+#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:532
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "falta información en el campo de salida crítico «%s»"
 
 #: scripts/dpkg-genchanges.pl:499 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:431
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:537
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "falta información en el campo de salida «%s»"
@@ -990,33 +1001,41 @@
 msgid "chdir for du to `%s'"
 msgstr "chdir para du a «%s»"
 
-#: scripts/dpkg-gencontrol.pl:304 scripts/dpkg-shlibdeps.pl:843
+#: scripts/dpkg-gencontrol.pl:305 scripts/dpkg-shlibdeps.pl:843
 #: scripts/Dpkg/IPC.pm:271 scripts/Dpkg/Shlibs/Cppfilt.pm:50
 #, fuzzy, perl-format
 #| msgid "unable to execute c++filt"
 msgid "unable to execute %s"
 msgstr "no se pudo ejecutar «c++filt»"
 
-#: scripts/dpkg-gencontrol.pl:311
+#: scripts/dpkg-gencontrol.pl:312
 #, perl-format
 msgid "du in `%s'"
 msgstr "du en «%s»"
 
-#: scripts/dpkg-gencontrol.pl:313
+#: scripts/dpkg-gencontrol.pl:314
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr "du devolvió una salida no esperada «%s»"
 
-#: scripts/dpkg-gencontrol.pl:346
+#: scripts/dpkg-gencontrol.pl:347
 msgid "close old files list file"
 msgstr "cerrar el antiguo fichero de la lista de ficheros"
 
-#: scripts/dpkg-gencontrol.pl:368
+#: scripts/dpkg-gencontrol.pl:369
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "no se ha podido abrir el fichero de control de salida nuevo «%s»"
 
-#: scripts/dpkg-gencontrol.pl:379
+#: scripts/dpkg-gencontrol.pl:378 scripts/dpkg-shlibdeps.pl:523
+#: scripts/Dpkg/Interface/Storable.pm:91
+#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
+#: scripts/Dpkg/Source/Package/V2.pm:607
+#, perl-format
+msgid "cannot close %s"
+msgstr "no se puede cerrar «%s»"
+
+#: scripts/dpkg-gencontrol.pl:380
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "no se ha podido instalar el fichero de control de salida «%s»"
@@ -1143,11 +1162,15 @@
 "han desaparecido algunos símbolos o patrones en el fichero «symbols»: «%s»"
 
 #: scripts/dpkg-gensymbols.pl:291
+msgid "the generated symbols file is empty"
+msgstr ""
+
+#: scripts/dpkg-gensymbols.pl:293
 #, perl-format
 msgid "%s doesn't match completely %s"
 msgstr "«%s» no encaja totalmente con «%s»"
 
-#: scripts/dpkg-gensymbols.pl:294
+#: scripts/dpkg-gensymbols.pl:296
 #, perl-format
 msgid "no debian/symbols file used as basis for generating %s"
 msgstr ""
@@ -1184,19 +1207,20 @@
 "  --help, -h¿, -?          Muestra este mensaje de ayuda.\n"
 "  --version                Muestra la versión.\n"
 
-#: scripts/dpkg-mergechangelogs.pl:129
+#: scripts/dpkg-mergechangelogs.pl:129 scripts/dpkg-mergechangelogs.pl:131
 #: scripts/Dpkg/Compression/FileHandle.pm:385
 #: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
 #: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Functions.pm:78
-#: scripts/Dpkg/Source/Package.pm:347 scripts/Dpkg/Source/Package.pm:444
-#: scripts/Dpkg/Source/Package/V2.pm:210 scripts/Dpkg/Source/Package/V2.pm:477
-#: scripts/Dpkg/Source/Package/V2.pm:522
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:224
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:323
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:333
+#: scripts/Dpkg/Source/Package.pm:447 scripts/Dpkg/Source/Package.pm:550
+#: scripts/Dpkg/Source/Package/V2.pm:217 scripts/Dpkg/Source/Package/V2.pm:530
+#: scripts/Dpkg/Source/Package/V2.pm:605
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:226
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:234
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:341
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:351
 #, perl-format
 msgid "cannot write %s"
 msgstr "no se pudo escribir «%s»"
@@ -1246,7 +1270,7 @@
 #: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:138 scripts/Dpkg/Arch.pm:157
 #: scripts/Dpkg/Arch.pm:176 scripts/Dpkg/Changelog/Parse.pm:142
 #: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:138
+#: scripts/Dpkg/Source/Package.pm:193
 #, perl-format
 msgid "cannot open %s"
 msgstr "no se puede abrir «%s»"
@@ -1392,8 +1416,9 @@
 "    --all                       Incluye todos los cambios.\n"
 
 #: scripts/dpkg-parsechangelog.pl:117
-#, perl-format
-msgid "%s takes no non-option arguments"
+#, fuzzy
+#| msgid "%s takes no non-option arguments"
+msgid "takes no non-option arguments"
 msgstr "%s no acepta argumentos que no sean una opción"
 
 #: scripts/dpkg-scanpackages.pl:66
@@ -1445,8 +1470,10 @@
 msgid "Unconditional maintainer override for %s"
 msgstr "Sustitución («override») incondicional del encargado para %s"
 
-#: scripts/dpkg-scanpackages.pl:158
-msgid "1 to 3 args expected"
+#: scripts/dpkg-scanpackages.pl:158 scripts/dpkg-scansources.pl:302
+#, fuzzy
+#| msgid "1 to 3 args expected"
+msgid "one to three arguments expected"
 msgstr "Se esperan de uno a tres argumentos"
 
 #: scripts/dpkg-scanpackages.pl:175
@@ -1620,10 +1647,6 @@
 msgid "no binary packages specified in %s"
 msgstr "no se han definido paquetes binarios en %s"
 
-#: scripts/dpkg-scansources.pl:302
-msgid "1 to 3 args expected\n"
-msgstr "Se esperan de uno a tres argumentos\n"
-
 #: scripts/dpkg-shlibdeps.pl:93
 #, perl-format
 msgid "administrative directory '%s' does not exist"
@@ -1880,130 +1903,161 @@
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "la salida de «dpkg --search» es desconocida: «%s»"
 
-#: scripts/dpkg-source.pl:100
+#: scripts/dpkg-source.pl:104
 #, perl-format
 msgid "%s needs a directory"
 msgstr "%s requiere un directorio"
 
-#: scripts/dpkg-source.pl:103
+#: scripts/dpkg-source.pl:110
 #, perl-format
 msgid "cannot stat directory %s"
 msgstr "no se pudo obtener el estado («stat») del directorio «%s»"
 
-#: scripts/dpkg-source.pl:105
+#: scripts/dpkg-source.pl:112
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr "el argumento de directorio «%s» no es un directorio"
 
-#: scripts/dpkg-source.pl:123
+#: scripts/dpkg-source.pl:117 scripts/Dpkg/Source/Package/V2.pm:476
+#: scripts/Dpkg/Source/Package/V2.pm:478 scripts/Dpkg/Source/Package/V2.pm:480
+#: scripts/Dpkg/Source/Package/V2.pm:482
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
+#: scripts/Dpkg/Source/Package/V3/git.pm:104
+#: scripts/Dpkg/Source/Package/V3/git.pm:143
+#: scripts/Dpkg/Source/Package/V3/git.pm:155
+#: scripts/Dpkg/Source/Package/V3/git.pm:174
+#, perl-format
+msgid "unable to chdir to `%s'"
+msgstr "no se puede ejecutar chdir a «%s»"
+
+#: scripts/dpkg-source.pl:135
 #, perl-format
 msgid "using options from %s: %s"
 msgstr "usando opciones de %s: %s"
 
-#: scripts/dpkg-source.pl:138 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:150 scripts/Dpkg/Compression.pm:173
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "%s no es una compresión compatible"
 
-#: scripts/dpkg-source.pl:144 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:156 scripts/Dpkg/Compression.pm:202
 #: scripts/Dpkg/Compression/Process.pm:86
 #, perl-format
 msgid "%s is not a compression level"
 msgstr "%s no es un nivel de compresión"
 
-#: scripts/dpkg-source.pl:199
-msgid "need a command (-x, -b, --before-build, --after-build, --print-format)"
+#: scripts/dpkg-source.pl:214
+#, fuzzy
+#| msgid ""
+#| "need a command (-x, -b, --before-build, --after-build, --print-format)"
+msgid ""
+"need a command (-x, -b, --before-build, --after-build, --print-format, --"
+"commit)"
 msgstr ""
 "se requiere una orden (-x, -b, --before-build, --after-build, --print-format)"
 
-#: scripts/dpkg-source.pl:268
+#: scripts/dpkg-source.pl:238
+#, perl-format
+msgid "%s doesn't contain any information about the source package"
+msgstr ""
+
+#: scripts/dpkg-source.pl:283
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "«%s» no es una cadena de arquitectura legal"
 
-#: scripts/dpkg-source.pl:271
+#: scripts/dpkg-source.pl:286
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 "sólo se permite la arquitectura %s cuando ninguna otra aparece (la lista del "
 "paquete %s es «%s»)."
 
-#: scripts/dpkg-source.pl:324 scripts/Dpkg/BuildFlags.pm:190
+#: scripts/dpkg-source.pl:301
+#, fuzzy, perl-format
+#| msgid "diff `%s' doesn't contain any patch"
+msgid "%s doesn't list any binary package"
+msgstr "el diff «%s» no contiene ningún parche"
+
+#: scripts/dpkg-source.pl:343 scripts/Dpkg/BuildFlags.pm:270
 #: scripts/Dpkg/Compression/FileHandle.pm:401
 #: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:122
-#: scripts/Dpkg/Source/Package/V2.pm:360 scripts/Dpkg/Source/Package/V2.pm:505
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:276
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:330
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:377
+#: scripts/Dpkg/Source/Package/V2.pm:277 scripts/Dpkg/Source/Package/V2.pm:425
+#: scripts/Dpkg/Source/Package/V2.pm:561
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:112
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:286
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:348
 #, perl-format
 msgid "cannot read %s"
 msgstr "no se puede leer %s"
 
-#: scripts/dpkg-source.pl:331
+#: scripts/dpkg-source.pl:350
 #, perl-format
 msgid "no source format specified in %s, see dpkg-source(1)"
 msgstr ""
 "no se ha definido un formato de fuentes en «%s», consulte dpkg-source(1)"
 
-#: scripts/dpkg-source.pl:356
+#: scripts/dpkg-source.pl:378
 #, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr "no se puede construir con el formato de fuente «%s»: %s"
 
-#: scripts/dpkg-source.pl:359
+#: scripts/dpkg-source.pl:381
 #, perl-format
 msgid "using source format `%s'"
 msgstr "usando el formato de fuente «%s»"
 
-#: scripts/dpkg-source.pl:366 scripts/Dpkg/Source/Package/V1.pm:300
-#: scripts/Dpkg/Source/Package/V1.pm:345 scripts/Dpkg/Source/Package/V2.pm:488
+#: scripts/dpkg-source.pl:388 scripts/Dpkg/Source/Package/V1.pm:301
+#: scripts/Dpkg/Source/Package/V1.pm:346 scripts/Dpkg/Source/Package/V2.pm:541
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
-#: scripts/Dpkg/Source/Package/V3/native.pm:83
+#: scripts/Dpkg/Source/Package/V3/native.pm:84
 #, perl-format
 msgid "building %s in %s"
 msgstr "construyendo %s en %s"
 
-#: scripts/dpkg-source.pl:377
+#: scripts/dpkg-source.pl:399
 msgid "-x needs at least one argument, the .dsc"
 msgstr "«-x» requiere al menos un argumento, el fichero «.dsc»"
 
-#: scripts/dpkg-source.pl:380
+#: scripts/dpkg-source.pl:402
 msgid "-x takes no more than two arguments"
 msgstr "«-x» no acepta más de dos argumentos"
 
-#: scripts/dpkg-source.pl:384
+#: scripts/dpkg-source.pl:406
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr ""
 "«-x» requiere el fichero «.dsc» como el primer argumento, no un directorio"
 
-#: scripts/dpkg-source.pl:400
+#: scripts/dpkg-source.pl:422
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "el destino de los datos desempaquetados ya existe: %s"
 
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:432
 #, perl-format
 msgid "%s doesn't contain a valid OpenPGP signature"
 msgstr "%s no contiene una firma OpenPGP válida"
 
-#: scripts/dpkg-source.pl:412
+#: scripts/dpkg-source.pl:434
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "extrayendo el paquete fuente sin firmar (%s)"
 
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:441
 #, perl-format
 msgid "extracting %s in %s"
 msgstr "extrayendo %s en %s"
 
-#: scripts/dpkg-source.pl:427
+#: scripts/dpkg-source.pl:449
 msgid "only one of -x, -b or --print-format allowed, and only once"
 msgstr ""
 "sólo se permite uno de entre «-x», «-b» o «--print-format» a la vez, y sólo "
 "puede aparecer una vez"
 
-#: scripts/dpkg-source.pl:435
+#: scripts/dpkg-source.pl:457
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson\n"
@@ -2015,8 +2069,17 @@
 "Copyright (C) 1997 Klee Dienes\n"
 "Copyright (C) 2008 Raphael Hertzog"
 
-#: scripts/dpkg-source.pl:448
-#, perl-format
+#: scripts/dpkg-source.pl:470
+#, fuzzy, perl-format
+#| msgid ""
+#| "Usage: %s [<option> ...] <command>\n"
+#| "\n"
+#| "Commands:\n"
+#| "  -x <filename>.dsc [<output-dir>]\n"
+#| "                           extract source package.\n"
+#| "  -b <dir>                 build source package.\n"
+#| "  --print-format <dir>     print the source format that would be\n"
+#| "                           used to build the source package."
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -2025,7 +2088,9 @@
 "                           extract source package.\n"
 "  -b <dir>                 build source package.\n"
 "  --print-format <dir>     print the source format that would be\n"
-"                           used to build the source package."
+"                           used to build the source package.\n"
+"  --commit [<dir> [<patch-name>]]\n"
+"                           store upstream changes in a new patch."
 msgstr ""
 "Uso: %s [<opción> ...] <orden>\n"
 "\n"
@@ -2036,7 +2101,7 @@
 "  --print-format <dir>     Muestra el formato de fuente a usar\n"
 "                           para construir el paquete fuente."
 
-#: scripts/dpkg-source.pl:457
+#: scripts/dpkg-source.pl:481
 #, perl-format
 msgid ""
 "Build options:\n"
@@ -2078,7 +2143,7 @@
 "  -z<nivel>                Nivel de compresión a usar (por omisión, '%d',\n"
 "                             aceptados: '1'-'9', 'best', 'fast')"
 
-#: scripts/dpkg-source.pl:475
+#: scripts/dpkg-source.pl:499
 msgid ""
 "Extract options:\n"
 "  --no-copy                don't copy .orig tarballs\n"
@@ -2093,7 +2158,7 @@
 "                           antes de desempaquetar\n"
 "  --require-valid-signature Cancela si el paquete no tiene una firma válida."
 
-#: scripts/dpkg-source.pl:480
+#: scripts/dpkg-source.pl:504
 msgid ""
 "General options:\n"
 "  -h, --help               show this help message.\n"
@@ -2103,7 +2168,7 @@
 "  -h, --help               Muestra este mensaje de ayuda.\n"
 "      --version            Muestra la versión."
 
-#: scripts/dpkg-source.pl:484
+#: scripts/dpkg-source.pl:508
 msgid ""
 "More options are available but they depend on the source package format.\n"
 "See dpkg-source(1) for more info."
@@ -2193,12 +2258,12 @@
 msgstr "<entrada estándar>"
 
 #: scripts/changelog/debian.pl:136
-msgid "fatal error occured while parsing input"
+msgid "fatal error occurred while parsing input"
 msgstr "se ha detectado un error fatal al analizar la entrada"
 
 #: scripts/changelog/debian.pl:139
 #, perl-format
-msgid "fatal error occured while parsing %s"
+msgid "fatal error occurred while parsing %s"
 msgstr "se ha detectado un error fatal al analizar %s"
 
 #: scripts/Dpkg/Arch.pm:86
@@ -2217,17 +2282,17 @@
 "El tipo de sistema gcc %s es desconocido, usando el predefinido (compilación "
 "nativa)"
 
-#: scripts/Dpkg/BuildFlags.pm:198
+#: scripts/Dpkg/BuildFlags.pm:278
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
 msgstr "la línea %d en %s menciona una opción desconocida %s"
 
-#: scripts/Dpkg/BuildFlags.pm:207
+#: scripts/Dpkg/BuildFlags.pm:291
 #, perl-format
 msgid "line %d of %s is invalid, it has been ignored."
 msgstr "la línea %d de %s es inválida, se ha ignorado"
 
-#: scripts/Dpkg/BuildOptions.pm:91
+#: scripts/Dpkg/BuildOptions.pm:94
 #, perl-format
 msgid "invalid flag in %s: %s"
 msgstr "se ha detectado una opción inválida en %s: %s"
@@ -2494,9 +2559,10 @@
 msgstr "versión analizada del registro de cambios"
 
 #: scripts/Dpkg/Control.pm:156 scripts/Dpkg/Control.pm:158
-#, perl-format
-msgid "entry of APT's %s file"
-msgstr "entrada del fichero de APT «%s»"
+#, fuzzy, perl-format
+#| msgid "entry in dpkg's status file"
+msgid "entry in repository's %s file"
+msgstr "entrada en el fichero de estado «status» de dpkg "
 
 #: scripts/Dpkg/Control.pm:160 scripts/Dpkg/Control.pm:164
 #, perl-format
@@ -2529,8 +2595,10 @@
 msgid "first block lacks a source field"
 msgstr "falta un campo de fuente en el primer bloque"
 
-#: scripts/Dpkg/Control/Info.pm:110
-msgid "block lacks a package field"
+#: scripts/Dpkg/Control/Info.pm:110 scripts/Dpkg/Control/Info.pm:113
+#, fuzzy, perl-format
+#| msgid "block lacks a package field"
+msgid "block lacks the '%s' field"
 msgstr "falta un campo de paquete en el bloque"
 
 #: scripts/Dpkg/Control/Hash.pm:172
@@ -2609,17 +2677,11 @@
 msgid "%s failed with unknown exit code %d"
 msgstr "%s falló con el código de salida desconocido %d"
 
-#: scripts/Dpkg/ErrorHandling.pm:113
+#: scripts/Dpkg/ErrorHandling.pm:115
 #, perl-format
 msgid "syntax error in %s at line %d: %s"
 msgstr "se ha encontrado un error de sintaxis en %s en la línea %d: %s"
 
-#: scripts/Dpkg/Interface/Storable.pm:91
-#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
-#, perl-format
-msgid "cannot close %s"
-msgstr "no se puede cerrar «%s»"
-
 #: scripts/Dpkg/IPC.pm:211 scripts/Dpkg/IPC.pm:217 scripts/Dpkg/IPC.pm:223
 #, perl-format
 msgid "pipe for %s"
@@ -2717,8 +2779,8 @@
 msgid "cannot create directory %s"
 msgstr "no se puede crear el directorio «%s»"
 
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:231
-#: scripts/Dpkg/Source/Package/V2.pm:192
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:307
+#: scripts/Dpkg/Source/Package/V2.pm:199
 #, perl-format
 msgid "cannot opendir %s"
 msgstr "no se puede abrir el directorio «%s»"
@@ -2756,7 +2818,7 @@
 msgid "cannot read timestamp from %s"
 msgstr "no se puede cambiar la marca de tiempo de «%s»"
 
-#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:378
+#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:443
 msgid "binary file contents changed"
 msgstr "el contenido del fichero binario ha cambiado"
 
@@ -2830,7 +2892,7 @@
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr "el modo especial «%04o» de «%s» no se representará en el diff"
 
-#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:377
+#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:442
 #, perl-format
 msgid "cannot represent change to %s: %s"
 msgstr "no se puede representar el cambio de %s: %s"
@@ -2879,7 +2941,7 @@
 "ninguno de los ficheros en «---/+++» son relativos en el diff «%s» (línea %d)"
 
 #: scripts/Dpkg/Source/Patch.pm:410
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:127
 #, perl-format
 msgid "%s contains an insecure path: %s"
 msgstr "%s contiene una ruta no segura: «%s»"
@@ -2948,7 +3010,7 @@
 msgid "nonexistent"
 msgstr "inexistente"
 
-#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:358
+#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:458
 #, perl-format
 msgid "cannot stat %s"
 msgstr "no se puede obtener el estado (stat) de «%s»"
@@ -2982,17 +3044,17 @@
 msgid "named socket"
 msgstr "socket de Unix nombrado"
 
-#: scripts/Dpkg/Source/Package.pm:133
+#: scripts/Dpkg/Source/Package.pm:188
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr "«%s» no es el nombre de un fichero"
 
-#: scripts/Dpkg/Source/Package.pm:153
+#: scripts/Dpkg/Source/Package.pm:208
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "falta el campo crítico de control de las fuentes «%s»"
 
-#: scripts/Dpkg/Source/Package.pm:181
+#: scripts/Dpkg/Source/Package.pm:236
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
@@ -3000,120 +3062,126 @@
 "el formato de paquete fuente «%s» no es compatible (se requiere el módulo de "
 "de Perl %s)"
 
-#: scripts/Dpkg/Source/Package.pm:185
+#: scripts/Dpkg/Source/Package.pm:240
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr "se ha detectado un campo «Format» inválido «%s»"
 
-#: scripts/Dpkg/Source/Package.pm:212
+#: scripts/Dpkg/Source/Package.pm:288
 msgid "source and version are required to compute the source basename"
 msgstr ""
 "se requieren la fuente y la versión para completar el nombre base de la "
 "fuente"
 
-#: scripts/Dpkg/Source/Package.pm:278 scripts/Dpkg/Source/Package.pm:280
+#: scripts/Dpkg/Source/Package.pm:371 scripts/Dpkg/Source/Package.pm:373
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "se ha detectado un fallo al verificar la firma de %s"
 
-#: scripts/Dpkg/Source/Package.pm:287 scripts/Dpkg/Source/Package.pm:289
+#: scripts/Dpkg/Source/Package.pm:380 scripts/Dpkg/Source/Package.pm:382
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr "no se pudo verificar la firma de %s ya que gpg no está instalado"
 
-#: scripts/Dpkg/Source/Package.pm:298
+#: scripts/Dpkg/Source/Package.pm:391
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr "«%s» no es una opción válida para %s"
 
-#: scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Package.pm:460
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s no existe"
 
-#: scripts/Dpkg/Source/Package.pm:364
+#: scripts/Dpkg/Source/Package.pm:464
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "no se puede dar permisos de ejecución a «%s»"
 
-#: scripts/Dpkg/Source/Package.pm:366
+#: scripts/Dpkg/Source/Package.pm:466
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "«%s» no es un fichero simple"
 
-#: scripts/Dpkg/Source/Package/V1.pm:61
+#: scripts/Dpkg/Source/Package.pm:517
+#, fuzzy, perl-format
+#| msgid "can't build with source format '%s': %s"
+msgid "'%s' is not supported by the source format '%s'"
+msgstr "no se puede construir con el formato de fuente «%s»: %s"
+
+#: scripts/Dpkg/Source/Package/V1.pm:62
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr "la opción «-s%s» invalida la opción «-s%s» anterior"
 
-#: scripts/Dpkg/Source/Package/V1.pm:83
+#: scripts/Dpkg/Source/Package/V1.pm:84
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr "el tipo de manipulación de fuentes «-s%s» no se permite con «-x»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:95
-#: scripts/Dpkg/Source/Package/V3/native.pm:50
+#: scripts/Dpkg/Source/Package/V1.pm:96
+#: scripts/Dpkg/Source/Package/V3/native.pm:51
 msgid "multiple tarfiles in v1.0 source package"
 msgstr "varios archivos tar en un paquete fuente versión 1.0"
 
-#: scripts/Dpkg/Source/Package/V1.pm:100 scripts/Dpkg/Source/Package/V2.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:101 scripts/Dpkg/Source/Package/V2.pm:129
 #, perl-format
 msgid "unrecognized file for a %s source package: %s"
 msgstr "fichero no reconocido de un paquete fuente %s: %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:105
-#: scripts/Dpkg/Source/Package/V3/native.pm:57
+#: scripts/Dpkg/Source/Package/V1.pm:106
+#: scripts/Dpkg/Source/Package/V3/native.pm:58
 msgid "no tarfile in Files field"
 msgstr "no existe ningún fichero tar en el campo «Files»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:108
+#: scripts/Dpkg/Source/Package/V1.pm:109
 msgid "native package with .orig.tar"
 msgstr "paquete nativo con «.orig.tar»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:121
+#: scripts/Dpkg/Source/Package/V1.pm:122
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr "no se pudo renombrar «%s» a «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:125 scripts/Dpkg/Source/Package/V2.pm:134
-#: scripts/Dpkg/Source/Package/V2.pm:146 scripts/Dpkg/Source/Package/V2.pm:159
+#: scripts/Dpkg/Source/Package/V1.pm:126 scripts/Dpkg/Source/Package/V2.pm:141
+#: scripts/Dpkg/Source/Package/V2.pm:153 scripts/Dpkg/Source/Package/V2.pm:166
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:190
-#: scripts/Dpkg/Source/Package/V3/native.pm:60
+#: scripts/Dpkg/Source/Package/V3/native.pm:61
 #, perl-format
 msgid "unpacking %s"
 msgstr "desempaquetando %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:132
+#: scripts/Dpkg/Source/Package/V1.pm:133
 msgid "unable to keep orig directory (already exists)"
 msgstr "no se pudo conservar el directorio «orig» (ya existe)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:139
+#: scripts/Dpkg/Source/Package/V1.pm:140
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr ""
 "se ha detectado un fallo al renombrar el recién extraído «%s» como «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:145
+#: scripts/Dpkg/Source/Package/V1.pm:146
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr "se ha detectado un fallo al renombrar «%s», guardado, a «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:152 scripts/Dpkg/Source/Package/V2.pm:214
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:171
+#: scripts/Dpkg/Source/Package/V1.pm:153 scripts/Dpkg/Source/Package/V2.pm:222
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:172
 #, perl-format
 msgid "applying %s"
 msgstr "aplicando «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:157
+#: scripts/Dpkg/Source/Package/V1.pm:158
 #, perl-format
 msgid "upstream files that have been modified: %s"
 msgstr "ficheros de la fuente original que se han modificado: %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:167
+#: scripts/Dpkg/Source/Package/V1.pm:168
 msgid "only supports gzip compression"
 msgstr "sólo acepta la compresión gzip"
 
-#: scripts/Dpkg/Source/Package/V1.pm:178
+#: scripts/Dpkg/Source/Package/V1.pm:179
 msgid ""
 "-b takes at most a directory and an orig source argument (with v1.0 source "
 "package)"
@@ -3121,23 +3189,23 @@
 "«-b» acepta como máximo un directorio y un argumento de fuentes «orig» (con "
 "la versión 1.0 de formato de paquete fuente)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:184
+#: scripts/Dpkg/Source/Package/V1.pm:185
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr "el tipo de manipulación de fuentes «-s%s» no se permite con «-b»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:200
 #, perl-format
 msgid "packed orig `%s' exists but is not a plain file"
 msgstr "ya existe un «orig» «%s» desempaquetado, pero no es un fichero simple"
 
-#: scripts/Dpkg/Source/Package/V1.pm:211
+#: scripts/Dpkg/Source/Package/V1.pm:212
 #, perl-format
 msgid "cannot stat orig argument %s"
 msgstr ""
 "no se puede definir el estado («stat») del fichero argumento «orig» de %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:217
+#: scripts/Dpkg/Source/Package/V1.pm:218
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -3146,7 +3214,7 @@
 "el argumento «orig» está desempaquetado, pero el tipo de manipulación de "
 "fuentes «-s%s» invoca uno empaquetado («.orig.tar.<ext>»)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:225
+#: scripts/Dpkg/Source/Package/V1.pm:226
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -3155,12 +3223,12 @@
 "el argumento «orig» esta empaquetado, pero el tipo de manipulación de "
 "fuentes «-s%s» invoca uno desempaquetado («.orig/»)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:230
+#: scripts/Dpkg/Source/Package/V1.pm:231
 #, perl-format
 msgid "orig argument %s is not a plain file or directory"
 msgstr "el argumento «orig» %s no es un fichero simple o directorio"
 
-#: scripts/Dpkg/Source/Package/V1.pm:236
+#: scripts/Dpkg/Source/Package/V1.pm:237
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s"
@@ -3169,31 +3237,31 @@
 "el argumento «orig» está vacío (esto es, sin «orig» ni diff) pero el tipo de "
 "manipulación de fuentes «-s%s» requiere algo"
 
-#: scripts/Dpkg/Source/Package/V1.pm:249
+#: scripts/Dpkg/Source/Package/V1.pm:250
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr "el «orig» desempaquetado «%s» existe, pero no es un directorio"
 
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:255
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr "no se pudo obtener el estado («stat») del fichero «orig» putativo «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:264
 #, perl-format
 msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
 msgstr ""
 "el directorio de fuentes «%s» no es <paquete-fuente>-<versión-desarrollador-"
 "original> «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:273
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ""
 "el nombre del directorio «.orig» %s no es <paquete>-<versión-desarrollador-"
 "original> (se ha requerido %s)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:281
+#: scripts/Dpkg/Source/Package/V1.pm:282
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
@@ -3201,7 +3269,7 @@
 "el nombre de «.orig.tar» %s no es <paquete>_<versión-desarollador-original>."
 "orig.tar (se ha requerido %s)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:293
+#: scripts/Dpkg/Source/Package/V1.pm:294
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
@@ -3210,30 +3278,31 @@
 "el archivo tar «%s» ya existe, no se va a sobreescribir, cancelando; use «-"
 "sU» «-sR» para invalidar este comportamiento"
 
-#: scripts/Dpkg/Source/Package/V1.pm:297
+#: scripts/Dpkg/Source/Package/V1.pm:298
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr "no se pudo comprobar la existencia de «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:312 scripts/Dpkg/Source/Package/V1.pm:374
-#: scripts/Dpkg/Source/Package/V3/native.pm:96
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V1.pm:375
+#: scripts/Dpkg/Source/Package/V3/native.pm:98
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr "no se pudo renombrar «%s» (recién creado) como «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:315 scripts/Dpkg/Source/Package/V1.pm:377
-#: scripts/Dpkg/Source/Package/V2.pm:461
-#: scripts/Dpkg/Source/Package/V3/native.pm:99
+#: scripts/Dpkg/Source/Package/V1.pm:316 scripts/Dpkg/Source/Package/V1.pm:378
+#: scripts/Dpkg/Source/Package/V2.pm:603
+#: scripts/Dpkg/Source/Package/V3/native.pm:102
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:367
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr "no se han podido cambiar los permisos de «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:317 scripts/Dpkg/Source/Package/V2.pm:330
+#: scripts/Dpkg/Source/Package/V1.pm:318 scripts/Dpkg/Source/Package/V2.pm:348
 #, perl-format
 msgid "building %s using existing %s"
 msgstr "construyendo «%s» usando «%s», que está presente en el sistema"
 
-#: scripts/Dpkg/Source/Package/V1.pm:326
+#: scripts/Dpkg/Source/Package/V1.pm:327
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
@@ -3242,18 +3311,18 @@
 "el directorio «orig» «%s» ya existe, no se va a sobreescribir, cancelando; "
 "use «-sA», «-sK» o «-sP» para invalidar este comportamiento"
 
-#: scripts/Dpkg/Source/Package/V1.pm:334
+#: scripts/Dpkg/Source/Package/V1.pm:335
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr "no se pudo comprobar la existencia del directorio «orig» «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:365
+#: scripts/Dpkg/Source/Package/V1.pm:366
 #, perl-format
 msgid "the diff modifies the following upstream files: %s"
 msgstr ""
 "el diff modifica los siguientes ficheros del desarrollador original: %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:367
+#: scripts/Dpkg/Source/Package/V1.pm:368
 msgid ""
 "use the '3.0 (quilt)' format to have separate and documented changes to "
 "upstream files, see dpkg-source(1)"
@@ -3261,71 +3330,85 @@
 "use el formato «3.0 (quilt)» para que los cambios a los ficheros originales "
 "ocurran por separado y de forma documentada, consulte dpkg-source(1)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:369 scripts/Dpkg/Source/Package/V2.pm:465
+#: scripts/Dpkg/Source/Package/V1.pm:370
 msgid "aborting due to --abort-on-upstream-changes"
 msgstr ""
 "cancelando debido a «--abort-on-upstream-changes» (cambios en la fuente "
 "original)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:387
+#: scripts/Dpkg/Source/Package/V1.pm:388
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr "%s: cambios irrepresentables en las fuentes"
 
-#: scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V2.pm:119
 #, perl-format
 msgid "duplicate files in %s source package: %s.*"
 msgstr "se han detectado ficheros duplicados en el paquete fuente %s: %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:128
+#: scripts/Dpkg/Source/Package/V2.pm:135
 msgid "missing orig.tar or debian.tar file in v2.0 source package"
 msgstr ""
 "falta un fichero «orig.tar» o «debian.tar» en el paquete fuente versión 2.0"
 
-#: scripts/Dpkg/Source/Package/V2.pm:148
+#: scripts/Dpkg/Source/Package/V2.pm:155
 #, perl-format
 msgid "required removal of `%s' installed by original tarball"
 msgstr ""
 "se requiere la eliminación de «%s», instalado por el archivo taroriginal"
 
-#: scripts/Dpkg/Source/Package/V2.pm:232
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:245
+#: scripts/Dpkg/Source/Package/V2.pm:240
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
 #, perl-format
 msgid "unapplying %s"
 msgstr "no se va a aplicar «%s»"
 
-#: scripts/Dpkg/Source/Package/V2.pm:246 scripts/Dpkg/Source/Package/V2.pm:328
-msgid "no orig.tar file found"
-msgstr "no se ha encontrado ningún fichero «orig.tar»"
+#: scripts/Dpkg/Source/Package/V2.pm:263 scripts/Dpkg/Source/Package/V2.pm:344
+#, perl-format
+msgid "no upstream tarball found at %s"
+msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:285
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:310
-msgid ""
-"patches have not been applied, applying them now (use --no-preparation to "
-"override)"
+#: scripts/Dpkg/Source/Package/V2.pm:314
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:329
+#, fuzzy
+#| msgid ""
+#| "patches have not been applied, applying them now (use --no-preparation to "
+#| "override)"
+msgid "patches are not applied, applying them now"
 msgstr ""
 "no se han aplicado los parches, aplicándolos en este momento (use «--no-"
 "preparation» para evitar este comportamiento)"
 
-#: scripts/Dpkg/Source/Package/V2.pm:295
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
-#: scripts/Dpkg/Source/Package/V3/native.pm:75
-#, perl-format
-msgid "-b takes only one parameter with format `%s'"
-msgstr "«-b» sólo toma un parámetro con formato «%s»"
-
-#: scripts/Dpkg/Source/Package/V2.pm:315
+#: scripts/Dpkg/Source/Package/V2.pm:331
 #, perl-format
 msgid "several orig.tar files found (%s and %s) but only one is allowed"
 msgstr ""
 "se han encontrado varios fichero «orig.tar» (%s y %s), pero sólo se acepta "
 "uno"
 
-#: scripts/Dpkg/Source/Package/V2.pm:351
+#: scripts/Dpkg/Source/Package/V2.pm:370
 msgid "copy of the debian directory"
 msgstr "copia del directorio «debian»"
 
-#: scripts/Dpkg/Source/Package/V2.pm:379
+#: scripts/Dpkg/Source/Package/V2.pm:388
+msgid "unrepresentable changes to source"
+msgstr "no se pueden representar los cambios hechos a las fuentes"
+
+#: scripts/Dpkg/Source/Package/V2.pm:391
+#, fuzzy
+#| msgid "local changes stored in %s, the modified files are:"
+msgid "local changes detected, the modified files are:"
+msgstr ""
+"se han guardado los cambios locales en «%s», los ficheros modificados son:"
+
+#: scripts/Dpkg/Source/Package/V2.pm:410
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
+#: scripts/Dpkg/Source/Package/V3/native.pm:76
+#, perl-format
+msgid "-b takes only one parameter with format `%s'"
+msgstr "«-b» sólo toma un parámetro con formato «%s»"
+
+#: scripts/Dpkg/Source/Package/V2.pm:444
 #, perl-format
 msgid ""
 "add %s in debian/source/include-binaries if you want to store the modified "
@@ -3334,12 +3417,12 @@
 "añada «%s» en «debian/source/include-binaries» si desea guardar el binario "
 "modificado en el archivo tar de Debian"
 
-#: scripts/Dpkg/Source/Package/V2.pm:393
+#: scripts/Dpkg/Source/Package/V2.pm:458
 #, perl-format
 msgid "unwanted binary file: %s"
 msgstr "fichero binario no deseado: %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:422
+#: scripts/Dpkg/Source/Package/V2.pm:493
 #, perl-format
 msgid ""
 "detected %d unwanted binary file (add it in debian/source/include-binaries "
@@ -3354,31 +3437,58 @@
 "se han detectado %d ficheros binarios (añada estos en «debian/source/include-"
 "binaries» para permitir su inclusión)"
 
-#: scripts/Dpkg/Source/Package/V2.pm:442
-msgid "unrepresentable changes to source"
-msgstr "no se pueden representar los cambios hechos a las fuentes"
-
-#: scripts/Dpkg/Source/Package/V2.pm:446 scripts/Dpkg/Source/Package/V2.pm:450
+#: scripts/Dpkg/Source/Package/V2.pm:508
 #, perl-format
-msgid "cannot remove %s"
-msgstr "no se ha podido eliminar «%s»"
+msgid "you can integrate the local changes with %s"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V2.pm:510
+#, fuzzy, perl-format
+#| msgid "aborting due to --abort-on-upstream-changes"
+msgid "aborting due to unexpected upstream changes, see %s"
+msgstr ""
+"cancelando debido a «--abort-on-upstream-changes» (cambios en la fuente "
+"original)"
 
-#: scripts/Dpkg/Source/Package/V2.pm:453
+#: scripts/Dpkg/Source/Package/V2.pm:520 scripts/Dpkg/Source/Package/V2.pm:653
 #, perl-format
-msgid "local changes stored in %s, the modified files are:"
+msgid "local changes have been recorded in a new patch: %s"
 msgstr ""
-"se han guardado los cambios locales en «%s», los ficheros modificados son:"
 
-#: scripts/Dpkg/Source/Package/V2.pm:459
+#: scripts/Dpkg/Source/Package/V2.pm:524 scripts/Dpkg/Source/Package/V2.pm:609
+#: scripts/Dpkg/Source/Package/V2.pm:637 scripts/Dpkg/Source/Package/V2.pm:651
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:369
 #, perl-format
-msgid "cannot rename %s to %s"
-msgstr "no se puede renombrar «%s» a «%s»"
+msgid "cannot remove %s"
+msgstr "no se ha podido eliminar «%s»"
 
-#: scripts/Dpkg/Source/Package/V2.pm:481
+#: scripts/Dpkg/Source/Package/V2.pm:534
 #, perl-format
 msgid "adding %s to %s"
 msgstr "añadiendo «%s» a «%s»"
 
+#: scripts/Dpkg/Source/Package/V2.pm:601
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:365
+#, fuzzy, perl-format
+#| msgid "failed to rename saved %s to %s"
+msgid "failed to copy %s to %s"
+msgstr "se ha detectado un fallo al renombrar «%s», guardado, a «%s»"
+
+#: scripts/Dpkg/Source/Package/V2.pm:624
+#, perl-format
+msgid "cannot register changes in %s, this patch already exists"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V2.pm:638
+#, fuzzy
+#| msgid "unrepresentable changes to source"
+msgid "there are no local changes to record"
+msgstr "no se pueden representar los cambios hechos a las fuentes"
+
+#: scripts/Dpkg/Source/Package/V2.pm:643
+msgid "Enter the desired patch name: "
+msgstr ""
+
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:52
 msgid ""
 "This source package can only be manipulated using bzr, which is not in the "
@@ -3410,18 +3520,6 @@
 msgid "doesn't contain a bzr repository"
 msgstr "no contiene un repositorio bzr"
 
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
-#: scripts/Dpkg/Source/Package/V3/git.pm:104
-#: scripts/Dpkg/Source/Package/V3/git.pm:143
-#: scripts/Dpkg/Source/Package/V3/git.pm:155
-#: scripts/Dpkg/Source/Package/V3/git.pm:174
-#, perl-format
-msgid "unable to chdir to `%s'"
-msgstr "no se puede ejecutar chdir a «%s»"
-
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:127
 msgid "bzr status exited nonzero"
 msgstr "bzr cerró con un estado distinto de cero"
@@ -3455,7 +3553,7 @@
 msgid "--target-format option is missing"
 msgstr "Se ha detectado la falta de la opción «--target-format»"
 
-#: scripts/Dpkg/Source/Package/V3/native.pm:53
+#: scripts/Dpkg/Source/Package/V3/native.pm:54
 #, perl-format
 msgid "unrecognized file for a native source package: %s"
 msgstr "fichero no reconocido para un paquete fuente nativo: %s"
@@ -3529,17 +3627,17 @@
 msgid "setting up shallow clone"
 msgstr "configurando un clon superficial («shallow»)"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:72
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:73
 #, perl-format
 msgid "%s should be a directory or non-existing"
 msgstr "%s debería ser un directorio, o no existir"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:78
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:79
 #, perl-format
 msgid "%s should be a file or non-existing"
 msgstr "%s debería ser un fichero, o no existir"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:119
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:120
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
@@ -3548,18 +3646,18 @@
 "El fichero «series» (%s) contiene opciones incompatibles («%s», línea %s), "
 "puede que dpkg-source falle al aplicar parches."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:137
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:138
 #, perl-format
 msgid "cannot mkdir %s"
 msgstr "no se puede crear el directorio «%s»"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:212
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "no se puede crear el enlace simbólico «%s»"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:284
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:287
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:294
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:297
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr "la versión de los metadatos de quilt es incompatible: %s"
@@ -3603,6 +3701,17 @@
 msgid "source package has two conflicting values - %s and %s"
 msgstr "el paquete fuente tiene dos valores en conflicto: «%s» y «%s»"
 
+#: scripts/Dpkg/Vendor/Debian.pm:106
+#, fuzzy, perl-format
+#| msgid "unknown key-value %s"
+msgid "unknown hardening feature: %s"
+msgstr "el valor de clave %s es desconocida"
+
+#: scripts/Dpkg/Vendor/Debian.pm:110
+#, perl-format
+msgid "incorrect value in hardening option of DEB_BUILD_MAINT_OPTIONS: %s"
+msgstr ""
+
 #: scripts/Dpkg/Vendor/Ubuntu.pm:61 scripts/Dpkg/Vendor/Ubuntu.pm:63
 msgid ""
 "Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu "
@@ -3619,13 +3728,13 @@
 "El número de versión sugiere cambios para Ubuntu, pero no hay ningún campo "
 "«XSBC-Original-Maintainer»"
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:119
+#: scripts/Dpkg/Vendor/Ubuntu.pm:123
 msgid "'hardening' flag found but 'hardening-wrapper' not installed"
 msgstr ""
 "se ha encontrado la opción «hardening», pero hardening-wrapper no está "
 "instalado"
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:138
+#: scripts/Dpkg/Vendor/Ubuntu.pm:142
 #, perl-format
 msgid "overriding %s in environment: %s"
 msgstr "sustituyendo «%s» en el entorno: «%s»"
@@ -3635,20 +3744,46 @@
 msgid "%s is not a valid version"
 msgstr "%s no es una versión válida"
 
-#: scripts/Dpkg/Version.pm:368
+#: scripts/Dpkg/Version.pm:371
 msgid "version number cannot be empty"
 msgstr "el número de versión no puede estar vacío"
 
-#: scripts/Dpkg/Version.pm:373
+#: scripts/Dpkg/Version.pm:376
+#, fuzzy
+#| msgid "version number cannot be empty"
+msgid "version number does not start with digit"
+msgstr "el número de versión no puede estar vacío"
+
+#: scripts/Dpkg/Version.pm:381
 #, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr "el número de versión contiene el carácter ilegal «%s»"
 
-#: scripts/Dpkg/Version.pm:379
+#: scripts/Dpkg/Version.pm:386
 #, perl-format
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr "la sección «epoch» del número de versión no es un número: «%s»"
 
+#, fuzzy
+#~| msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
+#~ msgid "%s: dpkg-buildflags (origin: %s): %s = %s\n"
+#~ msgstr "%s: exportar «%s» de dpkg-buildflags (origen: «%s»): «%s»\n"
+
+#~ msgid "1 to 3 args expected\n"
+#~ msgstr "Se esperan de uno a tres argumentos\n"
+
+#~ msgid "need an action option"
+#~ msgstr "requiere una opción de acción"
+
+#~ msgid "entry of APT's %s file"
+#~ msgstr "entrada del fichero de APT «%s»"
+
+#~ msgid "no orig.tar file found"
+#~ msgstr "no se ha encontrado ningún fichero «orig.tar»"
+
+#~ msgid "cannot rename %s to %s"
+#~ msgstr "no se puede renombrar «%s» a «%s»"
+
 #~ msgid "exec %s"
 #~ msgstr "ejecutar %s"
 
Binary files dpkg/scripts/po/fr.gmo and /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/fr.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/fr.po /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/fr.po
--- dpkg/scripts/po/fr.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/fr.po	2012-06-07 10:11:09.426073000 -0700
@@ -4,13 +4,13 @@
 #
 # Translators:
 # Frédéric Bothamy <frederic.bothamy@free.fr>, 2005-2007.
-# Christian Perrier <bubulle@debian.org>, 2008, 2009, 2010.
+# Christian Perrier <bubulle@debian.org>, 2008, 2009, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
-"PO-Revision-Date: 2010-09-10 18:02+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
+"PO-Revision-Date: 2011-07-18 19:41+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -18,16 +18,16 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.2\n"
 
 #: scripts/dpkg-architecture.pl:36 scripts/dpkg-buildflags.pl:31
-#: scripts/dpkg-buildpackage.pl:38 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
 #: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:96
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
 #: scripts/dpkg-mergechangelogs.pl:53 scripts/dpkg-name.pl:46
 #: scripts/dpkg-parsechangelog.pl:31 scripts/dpkg-scanpackages.pl:60
 #: scripts/dpkg-scansources.pl:78 scripts/dpkg-shlibdeps.pl:533
-#: scripts/dpkg-source.pl:433 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:455 scripts/changelog/debian.pl:34
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s version %s.\n"
@@ -43,10 +43,10 @@
 "Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>."
 
 #: scripts/dpkg-architecture.pl:42 scripts/dpkg-buildflags.pl:36
-#: scripts/dpkg-buildpackage.pl:45 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
 #: scripts/dpkg-genchanges.pl:102 scripts/dpkg-gencontrol.pl:62
 #: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
-#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:440
+#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:462
 #: scripts/changelog/debian.pl:39
 msgid ""
 "\n"
@@ -105,7 +105,7 @@
 "  --help             afficher ce message d'aide.\n"
 "  --version          afficher la version.\n"
 
-#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:84
+#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:91
 #: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:194
 #: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
 #: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:119
@@ -152,15 +152,33 @@
 msgstr "%s n'est pas le nom d'une variable reconnue"
 
 #: scripts/dpkg-buildflags.pl:33
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
 msgid ""
 "\n"
-"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+"Copyright (C) 2010-2011 Raphael Hertzog <hertzog@debian.org>."
 msgstr ""
 "\n"
 "Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
 
 #: scripts/dpkg-buildflags.pl:44
-#, perl-format
+#, fuzzy, perl-format
+#| msgid ""
+#| "Usage: %s [<action>]\n"
+#| "\n"
+#| "Actions:\n"
+#| "  --get <flag>       output the requested flag to stdout.\n"
+#| "  --origin <flag>    output the origin of the flag to stdout:\n"
+#| "                     value is one of vendor, system, user, env.\n"
+#| "  --list             output a list of the flags supported by the current "
+#| "vendor.\n"
+#| "  --export=(sh|make) output commands to be executed in shell or make that "
+#| "export\n"
+#| "                     all the compilation flags as environment variables.\n"
+#| "  --help             show this help message.\n"
+#| "  --version          show the version.\n"
 msgid ""
 "Usage: %s [<action>]\n"
 "\n"
@@ -170,9 +188,11 @@
 "                     value is one of vendor, system, user, env.\n"
 "  --list             output a list of the flags supported by the current "
 "vendor.\n"
-"  --export=(sh|make) output commands to be executed in shell or make that "
-"export\n"
-"                     all the compilation flags as environment variables.\n"
+"  --export=(sh|make|configure)\n"
+"                     output something convenient to import the\n"
+"                     compilation flags in a shell script, in make,\n"
+"                     or on a ./configure command line.\n"
+"  --dump             output all compilation flags with their values\n"
 "  --help             show this help message.\n"
 "  --version          show the version.\n"
 msgstr ""
@@ -190,22 +210,18 @@
 "  --help             affiche ce message d'aide.\n"
 "  --version          affiche la version.\n"
 
-#: scripts/dpkg-buildflags.pl:63 scripts/dpkg-buildflags.pl:69
-#: scripts/dpkg-buildflags.pl:74
+#: scripts/dpkg-buildflags.pl:66 scripts/dpkg-buildflags.pl:72
+#: scripts/dpkg-buildflags.pl:77 scripts/dpkg-buildflags.pl:81
 #, perl-format
 msgid "two commands specified: --%s and --%s"
 msgstr "deux commandes indiquées : --%s et --%s"
 
-#: scripts/dpkg-buildflags.pl:67
+#: scripts/dpkg-buildflags.pl:70
 #, perl-format
 msgid "%s needs a parameter"
 msgstr "paramètre nécessaire pour %s"
 
-#: scripts/dpkg-buildflags.pl:88
-msgid "need an action option"
-msgstr "option d'action indispensable"
-
-#: scripts/dpkg-buildpackage.pl:40
+#: scripts/dpkg-buildpackage.pl:39
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -217,7 +233,7 @@
 "Copyright (C) 2000 Wichert Akkerman.\n"
 "Copyright (C) 2007 Frank Lichtenheld."
 
-#: scripts/dpkg-buildpackage.pl:52
+#: scripts/dpkg-buildpackage.pl:51
 #, perl-format
 msgid ""
 "\n"
@@ -339,31 +355,31 @@
 "  -h, --help     afficher ce message d'aide.\n"
 "      --version  afficher la version.\n"
 
-#: scripts/dpkg-buildpackage.pl:201 scripts/dpkg-buildpackage.pl:207
-#: scripts/dpkg-buildpackage.pl:213 scripts/dpkg-buildpackage.pl:219
-#: scripts/dpkg-buildpackage.pl:224 scripts/dpkg-genchanges.pl:143
+#: scripts/dpkg-buildpackage.pl:200 scripts/dpkg-buildpackage.pl:206
+#: scripts/dpkg-buildpackage.pl:212 scripts/dpkg-buildpackage.pl:218
+#: scripts/dpkg-buildpackage.pl:223 scripts/dpkg-genchanges.pl:143
 #: scripts/dpkg-genchanges.pl:146 scripts/dpkg-genchanges.pl:150
 #: scripts/dpkg-genchanges.pl:154
 #, perl-format
 msgid "cannot combine %s and %s"
 msgstr "impossible de combiner %s et %s"
 
-#: scripts/dpkg-buildpackage.pl:237 scripts/dpkg-source.pl:187
+#: scripts/dpkg-buildpackage.pl:236 scripts/dpkg-source.pl:202
 msgid "-E and -W are deprecated, they are without effect"
 msgstr "La gestion de -E et -W est obsolète (ces paramètres sont sans effet)"
 
-#: scripts/dpkg-buildpackage.pl:241
+#: scripts/dpkg-buildpackage.pl:240
 #, perl-format
 msgid "unknown option or argument %s"
 msgstr "option ou paramètre inconnu %s"
 
-#: scripts/dpkg-buildpackage.pl:251
+#: scripts/dpkg-buildpackage.pl:250
 msgid "using a gain-root-command while being root"
 msgstr ""
 "utilisation d'une commande pour obtenir les privilèges administrateur en "
 "tant qu'administrateur"
 
-#: scripts/dpkg-buildpackage.pl:257
+#: scripts/dpkg-buildpackage.pl:256
 msgid ""
 "fakeroot not found, either install the fakeroot\n"
 "package, specify a command with the -r option, or run this as root"
@@ -372,63 +388,58 @@
 "soit indiquer une commande avec l'option -r ou exécuter cette\n"
 "commande en tant qu'administrateur"
 
-#: scripts/dpkg-buildpackage.pl:261
+#: scripts/dpkg-buildpackage.pl:260
 #, perl-format
 msgid "gain-root-commmand '%s' not found"
 msgstr "commande pour obtenir les privilèges administrateur « %s » non trouvée"
 
-#: scripts/dpkg-buildpackage.pl:280
+#: scripts/dpkg-buildpackage.pl:279
 msgid "unknown sign command, assuming pgp style interface"
 msgstr "commande de signature inconnue, suppose une interface de style pgp"
 
-#: scripts/dpkg-buildpackage.pl:283
+#: scripts/dpkg-buildpackage.pl:282
 msgid "PGP support is deprecated (see README.feature-removal-schedule)"
 msgstr ""
 "La gestion de PGP est obsolète (voir le fichier README.feature-removal-"
 "schedule)."
 
 #: scripts/dpkg-buildpackage.pl:301
-#, perl-format
-msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
-msgstr "%s: export de %s depuis dpkg-buildflags (origine : %s): %s\n"
-
-#: scripts/dpkg-buildpackage.pl:310
 msgid "source package"
 msgstr "paquet source"
 
-#: scripts/dpkg-buildpackage.pl:311
+#: scripts/dpkg-buildpackage.pl:302
 msgid "source version"
 msgstr "version source"
 
-#: scripts/dpkg-buildpackage.pl:321
+#: scripts/dpkg-buildpackage.pl:312
 msgid "source changed by"
 msgstr "source changé par"
 
-#: scripts/dpkg-buildpackage.pl:339
+#: scripts/dpkg-buildpackage.pl:330
 msgid "host architecture"
 msgstr "architecture hôte"
 
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:343
 msgid "debian/rules is not executable: fixing that."
 msgstr "debian/rules n'est pas exécutable: corrigé."
 
-#: scripts/dpkg-buildpackage.pl:371
+#: scripts/dpkg-buildpackage.pl:362
 msgid "Build dependencies/conflicts unsatisfied; aborting."
 msgstr "Dépendances de construction et conflits non satisfaits ; échec."
 
-#: scripts/dpkg-buildpackage.pl:372
+#: scripts/dpkg-buildpackage.pl:363
 msgid "(Use -d flag to override.)"
 msgstr "(Utilisez l'option -d pour forcer.)"
 
-#: scripts/dpkg-buildpackage.pl:375
+#: scripts/dpkg-buildpackage.pl:366
 msgid "This is currently a non-fatal warning with -S, but"
 msgstr "Ceci est actuellement un avertissement sans conséquence avec -S, mais"
 
-#: scripts/dpkg-buildpackage.pl:376
+#: scripts/dpkg-buildpackage.pl:367
 msgid "will probably become fatal in the future."
 msgstr "deviendra fatal dans le futur."
 
-#: scripts/dpkg-buildpackage.pl:398
+#: scripts/dpkg-buildpackage.pl:389
 msgid ""
 "it is a bad idea to generate a source package without cleaning up first, it "
 "might contain undesired files."
@@ -436,60 +447,60 @@
 "Il est déconseillé de créer un paquet source sans le nettoyer préalablement. "
 "Il peut contenir des fichiers non souhaités."
 
-#: scripts/dpkg-buildpackage.pl:411
+#: scripts/dpkg-buildpackage.pl:402
 msgid "Press the return key to start signing process\n"
 msgstr "Appuyez sur Entrée pour commencer le processus de signature\n"
 
-#: scripts/dpkg-buildpackage.pl:418
+#: scripts/dpkg-buildpackage.pl:409
 msgid "Failed to sign .dsc and .changes file"
 msgstr "Échec de signature des fichiers .dsc et .changes"
 
-#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:437
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:424 scripts/dpkg-buildpackage.pl:428
+#: scripts/dpkg-buildpackage.pl:441
 msgid "write changes file"
 msgstr "écriture du fichier changes"
 
-#: scripts/dpkg-buildpackage.pl:449
+#: scripts/dpkg-buildpackage.pl:440
 msgid "dpkg-genchanges"
 msgstr "dpkg-genchanges"
 
-#: scripts/dpkg-buildpackage.pl:458
+#: scripts/dpkg-buildpackage.pl:449
 msgid "source only upload: Debian-native package"
 msgstr "envoi de source uniquement : paquet Debian natif"
 
-#: scripts/dpkg-buildpackage.pl:460
+#: scripts/dpkg-buildpackage.pl:451
 msgid "source only, diff-only upload (original source NOT included)"
 msgstr ""
 "source uniquement, envoi du fichier de différences uniquement (aucune "
 "inclusion du code source d'origine)"
 
-#: scripts/dpkg-buildpackage.pl:462
+#: scripts/dpkg-buildpackage.pl:453
 msgid "source only upload (original source is included)"
 msgstr "envoi du source seulement (inclusion du code source d'origine)"
 
-#: scripts/dpkg-buildpackage.pl:465 scripts/dpkg-buildpackage.pl:473
+#: scripts/dpkg-buildpackage.pl:456 scripts/dpkg-buildpackage.pl:464
 msgid "full upload (original source is included)"
 msgstr "envoi complet (inclusion du code source d'origine)"
 
-#: scripts/dpkg-buildpackage.pl:467
+#: scripts/dpkg-buildpackage.pl:458
 msgid "binary only upload (no source included)"
 msgstr "envoi d'un binaire seulement (aucune inclusion de code source)"
 
-#: scripts/dpkg-buildpackage.pl:469
+#: scripts/dpkg-buildpackage.pl:460
 msgid "full upload; Debian-native package (full source is included)"
 msgstr "envoi complet ; paquet Debian natif (inclusion du code source complet)"
 
-#: scripts/dpkg-buildpackage.pl:471
+#: scripts/dpkg-buildpackage.pl:462
 msgid "binary and diff upload (original source NOT included)"
 msgstr ""
 "envoi d'un binaire et du fichier de différences (aucune inclusion du code "
 "source d'origine)"
 
-#: scripts/dpkg-buildpackage.pl:478
+#: scripts/dpkg-buildpackage.pl:469
 msgid "Failed to sign .changes file"
 msgstr "Échec de signature du fichier .changes"
 
-#: scripts/dpkg-buildpackage.pl:497
+#: scripts/dpkg-buildpackage.pl:488
 #, perl-format
 msgid "unable to determine %s"
 msgstr "impossible de déterminer %s"
@@ -541,7 +552,7 @@
 msgid "%s: Build conflicts: "
 msgstr "%s : conflits de construction du paquet : "
 
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:236
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:253
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "erreur rencontrée lors de l'analyse de %s"
@@ -580,29 +591,29 @@
 msgid "filename, section and priority may contain no whitespace"
 msgstr "fichier, section et priorité ne peuvent contenir d'espace"
 
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:334
 msgid "open new files list file"
 msgstr "ouverture du nouveau fichier de liste des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:345
 msgid "copy old entry to new files list file"
 msgstr ""
 "copie de l'ancienne entrée dans le nouveau fichier de liste des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:349
 msgid "read old files list file"
 msgstr "lecture du nouveau fichier de liste des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:359
 msgid "write new entry to new files list file"
 msgstr ""
 "écriture de la nouvelle entrée dans le nouveau fichier de liste des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:360
 msgid "close new files list file"
 msgstr "fermeture du nouveau fichier de liste des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:361
 msgid "install new files list file"
 msgstr "installation du nouveau fichier de liste des fichiers"
 
@@ -784,7 +795,7 @@
 msgid "missing Priority for source files"
 msgstr "il manque la priorité des fichiers source"
 
-#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:327
+#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:346
 #: scripts/Dpkg/Vendor.pm:71
 #, perl-format
 msgid "%s is empty"
@@ -810,13 +821,13 @@
 msgid "write original source message"
 msgstr "écriture du message source original"
 
-#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:426
+#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:532
 #, 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:499 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:431
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:537
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "information manquante pour le champ de sortie %s"
@@ -953,33 +964,40 @@
 msgid "chdir for du to `%s'"
 msgstr "chdir pour du vers %s"
 
-#: scripts/dpkg-gencontrol.pl:304 scripts/dpkg-shlibdeps.pl:843
+#: scripts/dpkg-gencontrol.pl:305 scripts/dpkg-shlibdeps.pl:843
 #: scripts/Dpkg/IPC.pm:271 scripts/Dpkg/Shlibs/Cppfilt.pm:50
-#, fuzzy, perl-format
-#| msgid "unable to execute c++filt"
+#, perl-format
 msgid "unable to execute %s"
-msgstr "impossible d'exécuter c++filt"
+msgstr "impossible d'exécuter %s"
 
-#: scripts/dpkg-gencontrol.pl:311
+#: scripts/dpkg-gencontrol.pl:312
 #, perl-format
 msgid "du in `%s'"
 msgstr "du dans %s"
 
-#: scripts/dpkg-gencontrol.pl:313
+#: scripts/dpkg-gencontrol.pl:314
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr "résultat inattendu de du %s"
 
-#: scripts/dpkg-gencontrol.pl:346
+#: scripts/dpkg-gencontrol.pl:347
 msgid "close old files list file"
 msgstr "fermeture de l'ancien fichier de liste des fichiers"
 
-#: scripts/dpkg-gencontrol.pl:368
+#: scripts/dpkg-gencontrol.pl:369
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "impossible d'ouvrir le nouveau fichier de contrôle en sortie %s"
 
-#: scripts/dpkg-gencontrol.pl:379
+#: scripts/dpkg-gencontrol.pl:378 scripts/dpkg-shlibdeps.pl:523
+#: scripts/Dpkg/Interface/Storable.pm:91
+#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
+#: scripts/Dpkg/Source/Package/V2.pm:607
+#, perl-format
+msgid "cannot close %s"
+msgstr "impossible de fermer %s"
+
+#: scripts/dpkg-gencontrol.pl:380
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "impossible d'installer le nouveau fichier de contrôle en sortie %s"
@@ -1112,14 +1130,18 @@
 #: scripts/dpkg-gensymbols.pl:270
 #, perl-format
 msgid "some symbols or patterns disappeared in the symbols file: %s"
-msgstr "certains symboles out motifs ont disparu du fichier des symboles : %s"
+msgstr "certains symboles ou motifs ont disparu du fichier des symboles : %s"
 
 #: scripts/dpkg-gensymbols.pl:291
+msgid "the generated symbols file is empty"
+msgstr "le fichier des symboles généré est vide"
+
+#: scripts/dpkg-gensymbols.pl:293
 #, perl-format
 msgid "%s doesn't match completely %s"
 msgstr "%s ne correspond pas complètement à %s"
 
-#: scripts/dpkg-gensymbols.pl:294
+#: scripts/dpkg-gensymbols.pl:296
 #, perl-format
 msgid "no debian/symbols file used as basis for generating %s"
 msgstr "pas de fichier debian/symbols utilisé comme base pour générer %s"
@@ -1158,19 +1180,20 @@
 "  -h, --help, -?           afficher ce message d'aide.\n"
 "      --version            afficher la version.\n"
 
-#: scripts/dpkg-mergechangelogs.pl:129
+#: scripts/dpkg-mergechangelogs.pl:129 scripts/dpkg-mergechangelogs.pl:131
 #: scripts/Dpkg/Compression/FileHandle.pm:385
 #: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
 #: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Functions.pm:78
-#: scripts/Dpkg/Source/Package.pm:347 scripts/Dpkg/Source/Package.pm:444
-#: scripts/Dpkg/Source/Package/V2.pm:210 scripts/Dpkg/Source/Package/V2.pm:477
-#: scripts/Dpkg/Source/Package/V2.pm:522
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:224
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:323
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:333
+#: scripts/Dpkg/Source/Package.pm:447 scripts/Dpkg/Source/Package.pm:550
+#: scripts/Dpkg/Source/Package/V2.pm:217 scripts/Dpkg/Source/Package/V2.pm:530
+#: scripts/Dpkg/Source/Package/V2.pm:605
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:226
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:234
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:341
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:351
 #, perl-format
 msgid "cannot write %s"
 msgstr "impossible d'écrire %s"
@@ -1221,7 +1244,7 @@
 #: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:138 scripts/Dpkg/Arch.pm:157
 #: scripts/Dpkg/Arch.pm:176 scripts/Dpkg/Changelog/Parse.pm:142
 #: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:138
+#: scripts/Dpkg/Source/Package.pm:193
 #, perl-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
@@ -1367,8 +1390,9 @@
 "    --all                       inclure toutes les modifications\n"
 
 #: scripts/dpkg-parsechangelog.pl:117
-#, perl-format
-msgid "%s takes no non-option arguments"
+#, fuzzy
+#| msgid "%s takes no non-option arguments"
+msgid "takes no non-option arguments"
 msgstr "%s ne prend pas de paramètre sans option"
 
 #: scripts/dpkg-scanpackages.pl:66
@@ -1421,8 +1445,10 @@
 msgid "Unconditional maintainer override for %s"
 msgstr "Annulation inconditionnelle du responsable pour %s"
 
-#: scripts/dpkg-scanpackages.pl:158
-msgid "1 to 3 args expected"
+#: scripts/dpkg-scanpackages.pl:158 scripts/dpkg-scansources.pl:302
+#, fuzzy
+#| msgid "1 to 3 args expected"
+msgid "one to three arguments expected"
 msgstr "de 1 à 3 paramètres attendus"
 
 #: scripts/dpkg-scanpackages.pl:175
@@ -1586,10 +1612,6 @@
 msgid "no binary packages specified in %s"
 msgstr "pas de paquet binaire indiqué dans %s"
 
-#: scripts/dpkg-scansources.pl:302
-msgid "1 to 3 args expected\n"
-msgstr "de 1 à 3 paramètres attendus\n"
-
 #: scripts/dpkg-shlibdeps.pl:93
 #, perl-format
 msgid "administrative directory '%s' does not exist"
@@ -1608,6 +1630,8 @@
 #, perl-format
 msgid "couldn't find library %s needed by %s (ELF format: '%s'; RPATH: '%s')."
 msgstr ""
+"impossible de trouver la bibliothèque %s utilisée par %s (format "
+"ELF : « %s »; RPATH : « %s »)"
 
 #: scripts/dpkg-shlibdeps.pl:262
 #, perl-format
@@ -1667,21 +1691,12 @@
 "nécessité (il n'utilise aucun de ses symboles)."
 
 #: scripts/dpkg-shlibdeps.pl:431
-#, fuzzy
-#| msgid ""
-#| "couldn't find library %s needed by %s (ELF format: '%s'; RPATH: '%s').\n"
-#| "Note: libraries are not searched in other binary packages that do not "
-#| "have any shlibs or symbols file.\n"
-#| "To help dpkg-shlibdeps find private libraries, you might need to set "
-#| "LD_LIBRARY_PATH."
 msgid ""
 "Note: libraries are not searched in other binary packages that do not have "
 "any shlibs or symbols file.\n"
 "To help dpkg-shlibdeps find private libraries, you might need to set "
 "LD_LIBRARY_PATH."
 msgstr ""
-"impossible de trouver la bibliothèque %s demandée par %s (format "
-"ELF : « %s », RPATH : « %s »).\n"
 "Note : les bibliothèques ne sont pas recherchées dans d'autres paquets "
 "binaires qui n'ont pas de fichier shlibs ou de fichier de symboles.\n"
 "Pour aider dpkg-shlibdeps à trouver des bibliothèques privées, vous devriez "
@@ -1690,8 +1705,8 @@
 #: scripts/dpkg-shlibdeps.pl:434
 msgid "Cannot continue due to the error above."
 msgid_plural "Cannot continue due to the errors listed above."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Impossible de continuer à causer de l'erreur ci-dessus."
+msgstr[1] "Impossible de continuer à cause des erreurs ci-dessus."
 
 #: scripts/dpkg-shlibdeps.pl:445
 #, perl-format
@@ -1845,127 +1860,158 @@
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "résultat de dpkg --search inconnu : %s"
 
-#: scripts/dpkg-source.pl:100
+#: scripts/dpkg-source.pl:104
 #, perl-format
 msgid "%s needs a directory"
 msgstr "répertoire nécessaire pour %s"
 
-#: scripts/dpkg-source.pl:103
+#: scripts/dpkg-source.pl:110
 #, perl-format
 msgid "cannot stat directory %s"
 msgstr "« stat » du répertoire %s impossible"
 
-#: scripts/dpkg-source.pl:105
+#: scripts/dpkg-source.pl:112
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr "paramètre répertoire %s n'est pas un répertoire"
 
-#: scripts/dpkg-source.pl:123
+#: scripts/dpkg-source.pl:117 scripts/Dpkg/Source/Package/V2.pm:476
+#: scripts/Dpkg/Source/Package/V2.pm:478 scripts/Dpkg/Source/Package/V2.pm:480
+#: scripts/Dpkg/Source/Package/V2.pm:482
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
+#: scripts/Dpkg/Source/Package/V3/git.pm:104
+#: scripts/Dpkg/Source/Package/V3/git.pm:143
+#: scripts/Dpkg/Source/Package/V3/git.pm:155
+#: scripts/Dpkg/Source/Package/V3/git.pm:174
+#, perl-format
+msgid "unable to chdir to `%s'"
+msgstr "impossible de changer de répertoire vers « %s »"
+
+#: scripts/dpkg-source.pl:135
 #, perl-format
 msgid "using options from %s: %s"
 msgstr "utilisation des options depuis %s : %s"
 
-#: scripts/dpkg-source.pl:138 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:150 scripts/Dpkg/Compression.pm:173
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "%s n'est pas une compression gérée"
 
-#: scripts/dpkg-source.pl:144 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:156 scripts/Dpkg/Compression.pm:202
 #: scripts/Dpkg/Compression/Process.pm:86
 #, perl-format
 msgid "%s is not a compression level"
 msgstr "%s n'est pas un niveau de compression"
 
-#: scripts/dpkg-source.pl:199
-msgid "need a command (-x, -b, --before-build, --after-build, --print-format)"
+#: scripts/dpkg-source.pl:214
+#, fuzzy
+#| msgid ""
+#| "need a command (-x, -b, --before-build, --after-build, --print-format)"
+msgid ""
+"need a command (-x, -b, --before-build, --after-build, --print-format, --"
+"commit)"
 msgstr ""
 "a besoin d'une commande (-x, -b, --before-build, --after-build, --print-"
 "format)"
 
-#: scripts/dpkg-source.pl:268
+#: scripts/dpkg-source.pl:238
+#, perl-format
+msgid "%s doesn't contain any information about the source package"
+msgstr ""
+
+#: scripts/dpkg-source.pl:283
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "%s n'est pas une architecture autorisée"
 
-#: scripts/dpkg-source.pl:271
+#: scripts/dpkg-source.pl:286
 #, 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:324 scripts/Dpkg/BuildFlags.pm:190
+#: scripts/dpkg-source.pl:301
+#, fuzzy, perl-format
+#| msgid "diff `%s' doesn't contain any patch"
+msgid "%s doesn't list any binary package"
+msgstr "le fichier de différences %s ne contient pas de changement"
+
+#: scripts/dpkg-source.pl:343 scripts/Dpkg/BuildFlags.pm:270
 #: scripts/Dpkg/Compression/FileHandle.pm:401
 #: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:122
-#: scripts/Dpkg/Source/Package/V2.pm:360 scripts/Dpkg/Source/Package/V2.pm:505
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:276
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:330
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:377
+#: scripts/Dpkg/Source/Package/V2.pm:277 scripts/Dpkg/Source/Package/V2.pm:425
+#: scripts/Dpkg/Source/Package/V2.pm:561
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:112
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:286
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:348
 #, perl-format
 msgid "cannot read %s"
 msgstr "impossible de lire %s"
 
-#: scripts/dpkg-source.pl:331
+#: scripts/dpkg-source.pl:350
 #, perl-format
 msgid "no source format specified in %s, see dpkg-source(1)"
 msgstr "aucun format source indiqué dans %s, voir dpkg-source(1)"
 
-#: scripts/dpkg-source.pl:356
+#: scripts/dpkg-source.pl:378
 #, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr "impossible de construire avec le format source « %s » : %s"
 
-#: scripts/dpkg-source.pl:359
+#: scripts/dpkg-source.pl:381
 #, perl-format
 msgid "using source format `%s'"
 msgstr "utilisation du format source « %s »"
 
-#: scripts/dpkg-source.pl:366 scripts/Dpkg/Source/Package/V1.pm:300
-#: scripts/Dpkg/Source/Package/V1.pm:345 scripts/Dpkg/Source/Package/V2.pm:488
+#: scripts/dpkg-source.pl:388 scripts/Dpkg/Source/Package/V1.pm:301
+#: scripts/Dpkg/Source/Package/V1.pm:346 scripts/Dpkg/Source/Package/V2.pm:541
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
-#: scripts/Dpkg/Source/Package/V3/native.pm:83
+#: scripts/Dpkg/Source/Package/V3/native.pm:84
 #, perl-format
 msgid "building %s in %s"
 msgstr "construction de %s dans %s"
 
-#: scripts/dpkg-source.pl:377
+#: scripts/dpkg-source.pl:399
 msgid "-x needs at least one argument, the .dsc"
 msgstr "-x demande au moins un paramètre, le fichier .dsc"
 
-#: scripts/dpkg-source.pl:380
+#: scripts/dpkg-source.pl:402
 msgid "-x takes no more than two arguments"
 msgstr "-x ne prend pas plus de deux paramètres"
 
-#: scripts/dpkg-source.pl:384
+#: scripts/dpkg-source.pl:406
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr "-x demande le fichier .dsc comme premier paramètre, pas un répertoire"
 
-#: scripts/dpkg-source.pl:400
+#: scripts/dpkg-source.pl:422
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "cible non compressée existe : %s"
 
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:432
 #, perl-format
 msgid "%s doesn't contain a valid OpenPGP signature"
 msgstr "%s ne contient pas de signature OpenPGP valable"
 
-#: scripts/dpkg-source.pl:412
+#: scripts/dpkg-source.pl:434
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "extraction d'un paquet source non signé (%s)"
 
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:441
 #, perl-format
 msgid "extracting %s in %s"
 msgstr "extraction de %s dans %s"
 
-#: scripts/dpkg-source.pl:427
+#: scripts/dpkg-source.pl:449
 msgid "only one of -x, -b or --print-format allowed, and only once"
 msgstr ""
 "une seule option -x, -b ou --print-format est autorisée, et une seule fois"
 
-#: scripts/dpkg-source.pl:435
+#: scripts/dpkg-source.pl:457
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson\n"
@@ -1977,8 +2023,17 @@
 "Copyright (C) 1997 Klee Dienes\n"
 "Copyright (C) 2008 Raphael Hertzog"
 
-#: scripts/dpkg-source.pl:448
-#, perl-format
+#: scripts/dpkg-source.pl:470
+#, fuzzy, perl-format
+#| msgid ""
+#| "Usage: %s [<option> ...] <command>\n"
+#| "\n"
+#| "Commands:\n"
+#| "  -x <filename>.dsc [<output-dir>]\n"
+#| "                           extract source package.\n"
+#| "  -b <dir>                 build source package.\n"
+#| "  --print-format <dir>     print the source format that would be\n"
+#| "                           used to build the source package."
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -1987,7 +2042,9 @@
 "                           extract source package.\n"
 "  -b <dir>                 build source package.\n"
 "  --print-format <dir>     print the source format that would be\n"
-"                           used to build the source package."
+"                           used to build the source package.\n"
+"  --commit [<dir> [<patch-name>]]\n"
+"                           store upstream changes in a new patch."
 msgstr ""
 "Syntaxe : %s [<option> ...] <commande>\n"
 "\n"
@@ -1999,7 +2056,7 @@
 "<dir>     afficher le format source qui serait\n"
 "                           utilisé pour construire le paquet source."
 
-#: scripts/dpkg-source.pl:457
+#: scripts/dpkg-source.pl:481
 #, perl-format
 msgid ""
 "Build options:\n"
@@ -2045,7 +2102,7 @@
 "                             les valeurs gérées sont : « 1 » - « 9 », "
 "« best », « fast »)"
 
-#: scripts/dpkg-source.pl:475
+#: scripts/dpkg-source.pl:499
 msgid ""
 "Extract options:\n"
 "  --no-copy                don't copy .orig tarballs\n"
@@ -2061,7 +2118,7 @@
 " ---require-valid-signature  imposer que le paquet comporte une\n"
 "                             signature valable."
 
-#: scripts/dpkg-source.pl:480
+#: scripts/dpkg-source.pl:504
 msgid ""
 "General options:\n"
 "  -h, --help               show this help message.\n"
@@ -2071,7 +2128,7 @@
 "  -h, --help                 afficher ce message d'aide.\n"
 "      --version              afficher la version."
 
-#: scripts/dpkg-source.pl:484
+#: scripts/dpkg-source.pl:508
 msgid ""
 "More options are available but they depend on the source package format.\n"
 "See dpkg-source(1) for more info."
@@ -2165,12 +2222,12 @@
 msgstr "<entrée standard>"
 
 #: scripts/changelog/debian.pl:136
-msgid "fatal error occured while parsing input"
+msgid "fatal error occurred while parsing input"
 msgstr "erreur fatale rencontrée lors de l'analyse des données"
 
 #: scripts/changelog/debian.pl:139
 #, perl-format
-msgid "fatal error occured while parsing %s"
+msgid "fatal error occurred while parsing %s"
 msgstr "erreur fatale rencontrée lors de l'analyse de %s"
 
 #: scripts/Dpkg/Arch.pm:86
@@ -2188,17 +2245,17 @@
 msgstr ""
 "type de gcc %s inconnu, retour au système par défaut (compilation native)"
 
-#: scripts/Dpkg/BuildFlags.pm:198
+#: scripts/Dpkg/BuildFlags.pm:278
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
 msgstr "La ligne %d de %s comprend un drapeau %s inconnu"
 
-#: scripts/Dpkg/BuildFlags.pm:207
+#: scripts/Dpkg/BuildFlags.pm:291
 #, perl-format
 msgid "line %d of %s is invalid, it has been ignored."
 msgstr "la ligne %d de %s n'est pas valable et a été ignorée."
 
-#: scripts/Dpkg/BuildOptions.pm:91
+#: scripts/Dpkg/BuildOptions.pm:94
 #, perl-format
 msgid "invalid flag in %s: %s"
 msgstr "drapeau non valable dans %s : %s"
@@ -2466,9 +2523,10 @@
 msgstr "version analysée de changelog"
 
 #: scripts/Dpkg/Control.pm:156 scripts/Dpkg/Control.pm:158
-#, perl-format
-msgid "entry of APT's %s file"
-msgstr "entrée du fichier %s d'APT"
+#, fuzzy, perl-format
+#| msgid "entry in dpkg's status file"
+msgid "entry in repository's %s file"
+msgstr "entrée dans le fichier d'état de dpkg"
 
 #: scripts/Dpkg/Control.pm:160 scripts/Dpkg/Control.pm:164
 #, perl-format
@@ -2500,8 +2558,10 @@
 msgid "first block lacks a source field"
 msgstr "le premier bloc ne comporte pas de champ source"
 
-#: scripts/Dpkg/Control/Info.pm:110
-msgid "block lacks a package field"
+#: scripts/Dpkg/Control/Info.pm:110 scripts/Dpkg/Control/Info.pm:113
+#, fuzzy, perl-format
+#| msgid "block lacks a package field"
+msgid "block lacks the '%s' field"
 msgstr "le bloc ne comporte pas de champ de paquet"
 
 #: scripts/Dpkg/Control/Hash.pm:172
@@ -2576,17 +2636,11 @@
 msgid "%s failed with unknown exit code %d"
 msgstr "%s a échoué avec une erreur de sortie de type inconnu %d"
 
-#: scripts/Dpkg/ErrorHandling.pm:113
+#: scripts/Dpkg/ErrorHandling.pm:115
 #, perl-format
 msgid "syntax error in %s at line %d: %s"
 msgstr "erreur de syntaxe dans %s à la ligne %d : %s"
 
-#: scripts/Dpkg/Interface/Storable.pm:91
-#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
-#, perl-format
-msgid "cannot close %s"
-msgstr "impossible de fermer %s"
-
 #: scripts/Dpkg/IPC.pm:211 scripts/Dpkg/IPC.pm:217 scripts/Dpkg/IPC.pm:223
 #, perl-format
 msgid "pipe for %s"
@@ -2683,8 +2737,8 @@
 msgid "cannot create directory %s"
 msgstr "impossible de créer le répertoire %s"
 
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:231
-#: scripts/Dpkg/Source/Package/V2.pm:192
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:307
+#: scripts/Dpkg/Source/Package/V2.pm:199
 #, perl-format
 msgid "cannot opendir %s"
 msgstr "impossible d'ouvrir le répertoire %s"
@@ -2715,12 +2769,11 @@
 msgstr "impossible de modifier la date de %s"
 
 #: scripts/Dpkg/Source/Functions.pm:85
-#, fuzzy, perl-format
-#| msgid "cannot change timestamp for %s"
+#, perl-format
 msgid "cannot read timestamp from %s"
-msgstr "impossible de modifier la date de %s"
+msgstr "impossible de lire la date de %s"
 
-#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:378
+#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:443
 msgid "binary file contents changed"
 msgstr "contenu d'un fichier binaire modifié"
 
@@ -2800,7 +2853,7 @@
 "le mode spécial %04o de « %s » ne sera pas représenté dans le fichier de "
 "différences"
 
-#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:377
+#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:442
 #, perl-format
 msgid "cannot represent change to %s: %s"
 msgstr "impossible d'identifier les changements de %s : %s"
@@ -2841,15 +2894,14 @@
 msgstr "ligne après --- n'est pas comme attendu dans diff %s (ligne %d)"
 
 #: scripts/Dpkg/Source/Patch.pm:402
-#, fuzzy, perl-format
-#| msgid "none of the filenames in ---/+++ are relative in diff `%s' (line %d)"
+#, perl-format
 msgid "none of the filenames in ---/+++ are valid in diff '%s' (line %d)"
 msgstr ""
-"aucun des fichiers indiqués par « ---/+++ » n'est relatif dans le fichier de "
+"aucun des fichiers indiqués par « ---/+++ » n'est valable dans le fichier de "
 "différences « %s » (ligne %d)"
 
 #: scripts/Dpkg/Source/Patch.pm:410
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:127
 #, perl-format
 msgid "%s contains an insecure path: %s"
 msgstr "%s contient un chemin d'accès non sûr : %s"
@@ -2918,7 +2970,7 @@
 msgid "nonexistent"
 msgstr "inexistant"
 
-#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:358
+#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:458
 #, perl-format
 msgid "cannot stat %s"
 msgstr "stat de %s impossible"
@@ -2952,17 +3004,17 @@
 msgid "named socket"
 msgstr "« socket » nommé"
 
-#: scripts/Dpkg/Source/Package.pm:133
+#: scripts/Dpkg/Source/Package.pm:188
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr "%s n'est pas un nom de fichier"
 
-#: scripts/Dpkg/Source/Package.pm:153
+#: scripts/Dpkg/Source/Package.pm:208
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "un champ de contrôle vital manque, %s"
 
-#: scripts/Dpkg/Source/Package.pm:181
+#: scripts/Dpkg/Source/Package.pm:236
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
@@ -2970,119 +3022,125 @@
 "le format de paquet source « %s » n'est pas géré (le module Perl %s est "
 "requis)"
 
-#: scripts/Dpkg/Source/Package.pm:185
+#: scripts/Dpkg/Source/Package.pm:240
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr "champ Format « %s » non valable"
 
-#: scripts/Dpkg/Source/Package.pm:212
+#: scripts/Dpkg/Source/Package.pm:288
 msgid "source and version are required to compute the source basename"
 msgstr ""
 "la source et la version sont indispensables pour calculer le nom de base de "
 "la source"
 
-#: scripts/Dpkg/Source/Package.pm:278 scripts/Dpkg/Source/Package.pm:280
+#: scripts/Dpkg/Source/Package.pm:371 scripts/Dpkg/Source/Package.pm:373
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "impossible de vérifier la signature sur %s"
 
-#: scripts/Dpkg/Source/Package.pm:287 scripts/Dpkg/Source/Package.pm:289
+#: scripts/Dpkg/Source/Package.pm:380 scripts/Dpkg/Source/Package.pm:382
 #, 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/Package.pm:298
+#: scripts/Dpkg/Source/Package.pm:391
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr "%s n'est pas une option valable pour %s"
 
-#: scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Package.pm:460
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s n'existe pas"
 
-#: scripts/Dpkg/Source/Package.pm:364
+#: scripts/Dpkg/Source/Package.pm:464
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "impossible de rendre %s exécutable"
 
-#: scripts/Dpkg/Source/Package.pm:366
+#: scripts/Dpkg/Source/Package.pm:466
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "%s n'est pas un fichier normal"
 
-#: scripts/Dpkg/Source/Package/V1.pm:61
+#: scripts/Dpkg/Source/Package.pm:517
+#, fuzzy, perl-format
+#| msgid "can't build with source format '%s': %s"
+msgid "'%s' is not supported by the source format '%s'"
+msgstr "impossible de construire avec le format source « %s » : %s"
+
+#: scripts/Dpkg/Source/Package/V1.pm:62
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr "l'option -s%s annule une précédente option -s%s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:83
+#: scripts/Dpkg/Source/Package/V1.pm:84
 #, 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/Package/V1.pm:95
-#: scripts/Dpkg/Source/Package/V3/native.pm:50
+#: scripts/Dpkg/Source/Package/V1.pm:96
+#: scripts/Dpkg/Source/Package/V3/native.pm:51
 msgid "multiple tarfiles in v1.0 source package"
 msgstr "plusieurs fichiers tar dans un paquet source v1.0"
 
-#: scripts/Dpkg/Source/Package/V1.pm:100 scripts/Dpkg/Source/Package/V2.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:101 scripts/Dpkg/Source/Package/V2.pm:129
 #, perl-format
 msgid "unrecognized file for a %s source package: %s"
 msgstr "type de fichier non reconnu pour un fichier source %s : %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:105
-#: scripts/Dpkg/Source/Package/V3/native.pm:57
+#: scripts/Dpkg/Source/Package/V1.pm:106
+#: scripts/Dpkg/Source/Package/V3/native.pm:58
 msgid "no tarfile in Files field"
 msgstr "pas de fichier tar dans le champ Files"
 
-#: scripts/Dpkg/Source/Package/V1.pm:108
+#: scripts/Dpkg/Source/Package/V1.pm:109
 msgid "native package with .orig.tar"
 msgstr "paquet natif avec .orig.tar"
 
-#: scripts/Dpkg/Source/Package/V1.pm:121
+#: scripts/Dpkg/Source/Package/V1.pm:122
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr "impossible de modifier %s en %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:125 scripts/Dpkg/Source/Package/V2.pm:134
-#: scripts/Dpkg/Source/Package/V2.pm:146 scripts/Dpkg/Source/Package/V2.pm:159
+#: scripts/Dpkg/Source/Package/V1.pm:126 scripts/Dpkg/Source/Package/V2.pm:141
+#: scripts/Dpkg/Source/Package/V2.pm:153 scripts/Dpkg/Source/Package/V2.pm:166
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:190
-#: scripts/Dpkg/Source/Package/V3/native.pm:60
+#: scripts/Dpkg/Source/Package/V3/native.pm:61
 #, perl-format
 msgid "unpacking %s"
 msgstr "extraction de %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:132
+#: scripts/Dpkg/Source/Package/V1.pm:133
 msgid "unable to keep orig directory (already exists)"
 msgstr "impossible de garder répertoire orig, il existe déjà"
 
-#: scripts/Dpkg/Source/Package/V1.pm:139
+#: scripts/Dpkg/Source/Package/V1.pm:140
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr "impossible de modifier le fichier extrait %s en %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:145
+#: scripts/Dpkg/Source/Package/V1.pm:146
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr "impossible de modifier le fichier sauvegardé %s en %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:152 scripts/Dpkg/Source/Package/V2.pm:214
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:171
+#: scripts/Dpkg/Source/Package/V1.pm:153 scripts/Dpkg/Source/Package/V2.pm:222
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:172
 #, perl-format
 msgid "applying %s"
 msgstr "mise en place de %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:157
+#: scripts/Dpkg/Source/Package/V1.pm:158
 #, perl-format
 msgid "upstream files that have been modified: %s"
 msgstr "fichiers amont modifiés : %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:167
+#: scripts/Dpkg/Source/Package/V1.pm:168
 msgid "only supports gzip compression"
 msgstr "ne gère que la compression gzip"
 
-#: scripts/Dpkg/Source/Package/V1.pm:178
+#: scripts/Dpkg/Source/Package/V1.pm:179
 msgid ""
 "-b takes at most a directory and an orig source argument (with v1.0 source "
 "package)"
@@ -3090,23 +3148,23 @@
 "il faut au plus un paramètre répertoire et un paramètre source d'origine "
 "avec -b (pour les paquets source v1.0)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:184
+#: scripts/Dpkg/Source/Package/V1.pm:185
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr "gestion des sources avec -s%s non autorisée avec -b"
 
-#: scripts/Dpkg/Source/Package/V1.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:200
 #, perl-format
 msgid "packed orig `%s' exists but is not a plain file"
 msgstr ""
 "le fichier original compressé %s existe mais ce n'est pas un simple fichier"
 
-#: scripts/Dpkg/Source/Package/V1.pm:211
+#: scripts/Dpkg/Source/Package/V1.pm:212
 #, perl-format
 msgid "cannot stat orig argument %s"
 msgstr "« stat » du paramètre origine %s impossible"
 
-#: scripts/Dpkg/Source/Package/V1.pm:217
+#: scripts/Dpkg/Source/Package/V1.pm:218
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -3115,7 +3173,7 @@
 "le paramètre source n'est pas compressé mais l'option -s%s demande des "
 "sources compressées (.orig.tar.<ext>)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:225
+#: scripts/Dpkg/Source/Package/V1.pm:226
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -3124,12 +3182,12 @@
 "le paramètre source est compressé mais l'option -s%s demande des sources non "
 "compressées (.orig/)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:230
+#: scripts/Dpkg/Source/Package/V1.pm:231
 #, perl-format
 msgid "orig argument %s is not a plain file or directory"
 msgstr "le paramètre source %s n'est pas un fichier ou un répertoire"
 
-#: scripts/Dpkg/Source/Package/V1.pm:236
+#: scripts/Dpkg/Source/Package/V1.pm:237
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s"
@@ -3138,34 +3196,34 @@
 "le paramètre source est vide (pas d'orig, pas de diff) mais l'option -s%s "
 "veut quelque chose."
 
-#: scripts/Dpkg/Source/Package/V1.pm:249
+#: scripts/Dpkg/Source/Package/V1.pm:250
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr ""
 "Le fichier original non compressé %s existe mais ce n'est pas un répertoire"
 
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:255
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr "stat impossible du supposé orig non compressé %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:264
 #, 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/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:273
 #, 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/Package/V1.pm:281
+#: scripts/Dpkg/Source/Package/V1.pm:282
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
 msgstr ".orig.tar %s n'est pas <paquet>_<version_amont>.orig.tar (%s demandé)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:293
+#: scripts/Dpkg/Source/Package/V1.pm:294
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
@@ -3174,30 +3232,31 @@
 "le fichier tar %s existe déjà, pas de modification, abandon ; utiliser -sU "
 "ou -sR pour forcer."
 
-#: scripts/Dpkg/Source/Package/V1.pm:297
+#: scripts/Dpkg/Source/Package/V1.pm:298
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr "impossible de vérifier l'existence de %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:312 scripts/Dpkg/Source/Package/V1.pm:374
-#: scripts/Dpkg/Source/Package/V3/native.pm:96
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V1.pm:375
+#: scripts/Dpkg/Source/Package/V3/native.pm:98
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr "impossible de modifier %s (nouvellement créé) en %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:315 scripts/Dpkg/Source/Package/V1.pm:377
-#: scripts/Dpkg/Source/Package/V2.pm:461
-#: scripts/Dpkg/Source/Package/V3/native.pm:99
+#: scripts/Dpkg/Source/Package/V1.pm:316 scripts/Dpkg/Source/Package/V1.pm:378
+#: scripts/Dpkg/Source/Package/V2.pm:603
+#: scripts/Dpkg/Source/Package/V3/native.pm:102
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:367
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr "impossible de modifier les permissions de %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:317 scripts/Dpkg/Source/Package/V2.pm:330
+#: scripts/Dpkg/Source/Package/V1.pm:318 scripts/Dpkg/Source/Package/V2.pm:348
 #, perl-format
 msgid "building %s using existing %s"
 msgstr "construction de %s à partir de %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:326
+#: scripts/Dpkg/Source/Package/V1.pm:327
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
@@ -3206,17 +3265,17 @@
 "le répertoire orig %s existe déjà, pas de modification, abandon ; utiliser -"
 "sA, -sK ou -sP pour forcer."
 
-#: scripts/Dpkg/Source/Package/V1.pm:334
+#: scripts/Dpkg/Source/Package/V1.pm:335
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr "impossible de vérifier l'existence du répertoire orig %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:365
+#: scripts/Dpkg/Source/Package/V1.pm:366
 #, perl-format
 msgid "the diff modifies the following upstream files: %s"
 msgstr "le fichier de différences modifie les fichiers amont suivants : %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:367
+#: scripts/Dpkg/Source/Package/V1.pm:368
 msgid ""
 "use the '3.0 (quilt)' format to have separate and documented changes to "
 "upstream files, see dpkg-source(1)"
@@ -3224,68 +3283,82 @@
 "choisissez le format « 3.0 (quilt) » pour utiliser des modifications "
 "séparées et documentées dans les sources amont, voir dpkg-source(1)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:369 scripts/Dpkg/Source/Package/V2.pm:465
+#: scripts/Dpkg/Source/Package/V1.pm:370
 msgid "aborting due to --abort-on-upstream-changes"
 msgstr "abandon suite à --abort-on-upstream-changes"
 
-#: scripts/Dpkg/Source/Package/V1.pm:387
+#: scripts/Dpkg/Source/Package/V1.pm:388
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr "%s : modifications non représentables des sources"
 
-#: scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V2.pm:119
 #, perl-format
 msgid "duplicate files in %s source package: %s.*"
 msgstr "fichiers mentionnés deux fois dans le paquet source %s : %s.*"
 
-#: scripts/Dpkg/Source/Package/V2.pm:128
+#: scripts/Dpkg/Source/Package/V2.pm:135
 msgid "missing orig.tar or debian.tar file in v2.0 source package"
 msgstr "fichier orig.tar ou debian.tar manquant dans un paquet source v2.0"
 
-#: scripts/Dpkg/Source/Package/V2.pm:148
+#: scripts/Dpkg/Source/Package/V2.pm:155
 #, perl-format
 msgid "required removal of `%s' installed by original tarball"
 msgstr ""
 "suppression indispensable de « %s » installé par l'archive tar originale"
 
-#: scripts/Dpkg/Source/Package/V2.pm:232
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:245
+#: scripts/Dpkg/Source/Package/V2.pm:240
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
 #, perl-format
 msgid "unapplying %s"
 msgstr "retrait de %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:246 scripts/Dpkg/Source/Package/V2.pm:328
-msgid "no orig.tar file found"
-msgstr "pas de fichier orig.tar trouvé"
+#: scripts/Dpkg/Source/Package/V2.pm:263 scripts/Dpkg/Source/Package/V2.pm:344
+#, perl-format
+msgid "no upstream tarball found at %s"
+msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:285
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:310
-msgid ""
-"patches have not been applied, applying them now (use --no-preparation to "
-"override)"
+#: scripts/Dpkg/Source/Package/V2.pm:314
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:329
+#, fuzzy
+#| msgid ""
+#| "patches have not been applied, applying them now (use --no-preparation to "
+#| "override)"
+msgid "patches are not applied, applying them now"
 msgstr ""
 "les correctifs n'ont pas été appliqués, ils vont l'être maintenant (utilisez "
 "--no-preparation pour sauter cette étape)"
 
-#: scripts/Dpkg/Source/Package/V2.pm:295
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
-#: scripts/Dpkg/Source/Package/V3/native.pm:75
-#, perl-format
-msgid "-b takes only one parameter with format `%s'"
-msgstr "-b n'utilise qu'un paramètre avec le format « %s »"
-
-#: scripts/Dpkg/Source/Package/V2.pm:315
+#: scripts/Dpkg/Source/Package/V2.pm:331
 #, perl-format
 msgid "several orig.tar files found (%s and %s) but only one is allowed"
 msgstr ""
 "plusieurs fichiers orig.tar ont été trouvés (%s et %s) alors qu'un seul "
 "n'est autorisé"
 
-#: scripts/Dpkg/Source/Package/V2.pm:351
+#: scripts/Dpkg/Source/Package/V2.pm:370
 msgid "copy of the debian directory"
 msgstr "copie du répertoire debian"
 
-#: scripts/Dpkg/Source/Package/V2.pm:379
+#: scripts/Dpkg/Source/Package/V2.pm:388
+msgid "unrepresentable changes to source"
+msgstr "modifications non représentables des sources"
+
+#: scripts/Dpkg/Source/Package/V2.pm:391
+#, fuzzy
+#| msgid "local changes stored in %s, the modified files are:"
+msgid "local changes detected, the modified files are:"
+msgstr ""
+"modifications locales enregistrées dans %s, les fichiers modifiés sont :"
+
+#: scripts/Dpkg/Source/Package/V2.pm:410
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
+#: scripts/Dpkg/Source/Package/V3/native.pm:76
+#, perl-format
+msgid "-b takes only one parameter with format `%s'"
+msgstr "-b n'utilise qu'un paramètre avec le format « %s »"
+
+#: scripts/Dpkg/Source/Package/V2.pm:444
 #, perl-format
 msgid ""
 "add %s in debian/source/include-binaries if you want to store the modified "
@@ -3294,12 +3367,12 @@
 "Ajoutez %s dans debian/source/include-binaries si vous souhaitez conserver "
 "le binaire modifié dans le ficher tar debian"
 
-#: scripts/Dpkg/Source/Package/V2.pm:393
+#: scripts/Dpkg/Source/Package/V2.pm:458
 #, perl-format
 msgid "unwanted binary file: %s"
 msgstr "fichier binaire non souhaité : %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:422
+#: scripts/Dpkg/Source/Package/V2.pm:493
 #, perl-format
 msgid ""
 "detected %d unwanted binary file (add it in debian/source/include-binaries "
@@ -3315,31 +3388,59 @@
 "les ajouter dans debian/source/include-binaries pour autoriser leur "
 "inclusion)."
 
-#: scripts/Dpkg/Source/Package/V2.pm:442
-msgid "unrepresentable changes to source"
-msgstr "modifications non représentables des sources"
-
-#: scripts/Dpkg/Source/Package/V2.pm:446 scripts/Dpkg/Source/Package/V2.pm:450
+#: scripts/Dpkg/Source/Package/V2.pm:508
 #, perl-format
-msgid "cannot remove %s"
-msgstr "impossible de supprimer %s"
+msgid "you can integrate the local changes with %s"
+msgstr "vous pouvez intégrer les modifications locales dans %s"
+
+#: scripts/Dpkg/Source/Package/V2.pm:510
+#, fuzzy, perl-format
+#| msgid "aborting due to --abort-on-upstream-changes"
+msgid "aborting due to unexpected upstream changes, see %s"
+msgstr "abandon suite à --abort-on-upstream-changes"
 
-#: scripts/Dpkg/Source/Package/V2.pm:453
+#: scripts/Dpkg/Source/Package/V2.pm:520 scripts/Dpkg/Source/Package/V2.pm:653
 #, perl-format
-msgid "local changes stored in %s, the modified files are:"
+msgid "local changes have been recorded in a new patch: %s"
 msgstr ""
-"modifications locales enregistrées dans %s, les fichiers modifiés sont :"
+"les modifications locales ont été enregistrées dans un nouveau patch: %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:459
+#: scripts/Dpkg/Source/Package/V2.pm:524 scripts/Dpkg/Source/Package/V2.pm:609
+#: scripts/Dpkg/Source/Package/V2.pm:637 scripts/Dpkg/Source/Package/V2.pm:651
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:369
 #, perl-format
-msgid "cannot rename %s to %s"
-msgstr "impossible de renommer %s en %s"
+msgid "cannot remove %s"
+msgstr "impossible de supprimer %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:481
+#: scripts/Dpkg/Source/Package/V2.pm:534
 #, perl-format
 msgid "adding %s to %s"
 msgstr "ajout de %s à %s"
 
+#: scripts/Dpkg/Source/Package/V2.pm:601
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:365
+#, fuzzy, perl-format
+#| msgid "failed to rename saved %s to %s"
+msgid "failed to copy %s to %s"
+msgstr "impossible de modifier le fichier sauvegardé %s en %s"
+
+#: scripts/Dpkg/Source/Package/V2.pm:624
+#, perl-format
+msgid "cannot register changes in %s, this patch already exists"
+msgstr ""
+"impossible d'enregistrer les changements dans %s, le fichier de différence "
+"existe déjà "
+
+#: scripts/Dpkg/Source/Package/V2.pm:638
+#, fuzzy
+#| msgid "unrepresentable changes to source"
+msgid "there are no local changes to record"
+msgstr "modifications non représentables des sources"
+
+#: scripts/Dpkg/Source/Package/V2.pm:643
+msgid "Enter the desired patch name: "
+msgstr "Saisissez le nom du fichier de différence : "
+
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:52
 msgid ""
 "This source package can only be manipulated using bzr, which is not in the "
@@ -3371,18 +3472,6 @@
 msgid "doesn't contain a bzr repository"
 msgstr "ne contient pas de dépôt bzr"
 
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
-#: scripts/Dpkg/Source/Package/V3/git.pm:104
-#: scripts/Dpkg/Source/Package/V3/git.pm:143
-#: scripts/Dpkg/Source/Package/V3/git.pm:155
-#: scripts/Dpkg/Source/Package/V3/git.pm:174
-#, perl-format
-msgid "unable to chdir to `%s'"
-msgstr "impossible de changer de répertoire vers « %s »"
-
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:127
 msgid "bzr status exited nonzero"
 msgstr "état de sortie non nul pour bzr"
@@ -3418,7 +3507,7 @@
 msgid "--target-format option is missing"
 msgstr "L'option --target-format est absente"
 
-#: scripts/Dpkg/Source/Package/V3/native.pm:53
+#: scripts/Dpkg/Source/Package/V3/native.pm:54
 #, perl-format
 msgid "unrecognized file for a native source package: %s"
 msgstr "fichier non reconnu pour un paquet source natif : %s"
@@ -3492,17 +3581,17 @@
 msgid "setting up shallow clone"
 msgstr "configuration du clone superficiel"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:72
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:73
 #, perl-format
 msgid "%s should be a directory or non-existing"
 msgstr "%s devrait être un répertoire ou ne pas exister"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:78
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:79
 #, perl-format
 msgid "%s should be a file or non-existing"
 msgstr "%s devrait être un fichier ou ne pas exister"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:119
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:120
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
@@ -3511,18 +3600,18 @@
 "le fichier « series » (%s) contient des options non gérées (« %s », ligne "
 "%s), dpkg-source pourrait échouer dans l'application des correctifs."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:137
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:138
 #, perl-format
 msgid "cannot mkdir %s"
 msgstr "impossible de créer le répertoire %s"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:212
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "impossible de lire le lien symbolique %s"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:284
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:287
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:294
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:297
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr "version inconnue des métadonnées de quilt : %s"
@@ -3565,6 +3654,17 @@
 msgid "source package has two conflicting values - %s and %s"
 msgstr "le paquet source a deux valeurs en conflit : %s et %s"
 
+#: scripts/Dpkg/Vendor/Debian.pm:106
+#, fuzzy, perl-format
+#| msgid "unknown key-value %s"
+msgid "unknown hardening feature: %s"
+msgstr "clé clé-valeur inconnue %s"
+
+#: scripts/Dpkg/Vendor/Debian.pm:110
+#, perl-format
+msgid "incorrect value in hardening option of DEB_BUILD_MAINT_OPTIONS: %s"
+msgstr ""
+
 #: scripts/Dpkg/Vendor/Ubuntu.pm:61 scripts/Dpkg/Vendor/Ubuntu.pm:63
 msgid ""
 "Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu "
@@ -3581,11 +3681,11 @@
 "Le numéro de version indique des modifications Ubuntu mais il n'existe pas "
 "de champ « XSBC-Original-Maintainer: »"
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:119
+#: scripts/Dpkg/Vendor/Ubuntu.pm:123
 msgid "'hardening' flag found but 'hardening-wrapper' not installed"
 msgstr "drapeau « hardening » mais « hardening-wrapper » n'est pas installé"
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:138
+#: scripts/Dpkg/Vendor/Ubuntu.pm:142
 #, perl-format
 msgid "overriding %s in environment: %s"
 msgstr "remplacement de %s dans l'environnement : %s"
@@ -3595,21 +3695,47 @@
 msgid "%s is not a valid version"
 msgstr "%s n'est pas une version valable"
 
-#: scripts/Dpkg/Version.pm:368
+#: scripts/Dpkg/Version.pm:371
 msgid "version number cannot be empty"
 msgstr "le numéro de version ne peut pas être vide"
 
-#: scripts/Dpkg/Version.pm:373
+#: scripts/Dpkg/Version.pm:376
+#, fuzzy
+#| msgid "version number cannot be empty"
+msgid "version number does not start with digit"
+msgstr "le numéro de version ne peut pas être vide"
+
+#: scripts/Dpkg/Version.pm:381
 #, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr "le numéro de version contient un caractère « %s » non autorisé"
 
-#: scripts/Dpkg/Version.pm:379
+#: scripts/Dpkg/Version.pm:386
 #, perl-format
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr ""
 "la partie d'ère (« epoch ») du numéro de version n'est pas un nombre : « %s »"
 
+#, fuzzy
+#~| msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
+#~ msgid "%s: dpkg-buildflags (origin: %s): %s = %s\n"
+#~ msgstr "%s: export de %s depuis dpkg-buildflags (origine : %s): %s\n"
+
+#~ msgid "1 to 3 args expected\n"
+#~ msgstr "de 1 à 3 paramètres attendus\n"
+
+#~ msgid "need an action option"
+#~ msgstr "option d'action indispensable"
+
+#~ msgid "entry of APT's %s file"
+#~ msgstr "entrée du fichier %s d'APT"
+
+#~ msgid "no orig.tar file found"
+#~ msgstr "pas de fichier orig.tar trouvé"
+
+#~ msgid "cannot rename %s to %s"
+#~ msgstr "impossible de renommer %s en %s"
+
 #~ msgid "exec %s"
 #~ msgstr "exec %s"
 
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/.gitignore
--- dpkg/scripts/po/.gitignore	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1,9 +0,0 @@
-*.gmo
-*.sin
-*.sed
-*.header
-Makefile.in.in
-Makevars.template
-POTFILES
-Rules-quot
-stamp-po
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/insert-header.sin /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/insert-header.sin
--- dpkg/scripts/po/insert-header.sin	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/insert-header.sin	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,23 @@
+# Sed script that inserts the file called HEADER before the header entry.
+#
+# At each occurrence of a line starting with "msgid ", we execute the following
+# commands. At the first occurrence, insert the file. At the following
+# occurrences, do nothing. The distinction between the first and the following
+# occurrences is achieved by looking at the hold space.
+/^msgid /{
+x
+# Test if the hold space is empty.
+s/m/m/
+ta
+# Yes it was empty. First occurrence. Read the file.
+r HEADER
+# Output the file's contents by reading the next line. But don't lose the
+# current line while doing this.
+g
+N
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/Makefile.in.in /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/Makefile.in.in
--- dpkg/scripts/po/Makefile.in.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/Makefile.in.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,444 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.18
+GETTEXT_MACRO_VERSION = 0.18
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+SHELL = /bin/sh
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+localedir = @localedir@
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+	@echo "$(MSGFMT) -c -o $@ $<"; \
+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+	@lang=`echo $* | sed -e 's,.*/,,'`; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
+
+
+all: check-macro-version all-@USE_NLS@
+
+all-yes: stamp-po
+all-no:
+
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+check-macro-version:
+	@test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+	       exit 1; \
+	     }
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+	  package_gnu='GNU '; \
+	else \
+	  package_gnu=''; \
+	fi; \
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
+	case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	  '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	  *) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --package-name="$${package_gnu}@PACKAGE@" \
+	      --package-version='@VERSION@' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	esac
+	test ! -f $(DOMAIN).po || { \
+	  if test -f $(srcdir)/$(DOMAIN).pot; then \
+	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+	    else \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	    fi; \
+	  else \
+	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	  fi; \
+	}
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+	$(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) \
+	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	           '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+	           *) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+	         esac; \
+	       }; \
+	else \
+	  $(MAKE) $${lang}.po-create; \
+	fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    $(INSTALL_DATA) $(srcdir)/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  for file in Makevars; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+install-data-no: all
+install-data-yes: all
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
+	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+	    fi; \
+	  done; \
+	done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	  : ; \
+	fi
+installdirs-data-no:
+installdirs-data-yes:
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	    fi; \
+	  done; \
+	done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+uninstall-data-no:
+uninstall-data-yes:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	  done; \
+	done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+	rm -f remove-potcdate.sed
+	rm -f stamp-poT
+	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+	rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+	$(MAKE) update-po
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  dists="$$dists Makevars.template"; \
+	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
+	if test -f $(srcdir)/ChangeLog; then \
+	  dists="$$dists ChangeLog"; \
+	fi; \
+	for i in 0 1 2 3 4 5 6 7 8 9; do \
+	  if test -f $(srcdir)/ChangeLog.$$i; then \
+	    dists="$$dists ChangeLog.$$i"; \
+	  fi; \
+	done; \
+	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+	for file in $$dists; do \
+	  if test -f $$file; then \
+	    cp -p $$file $(distdir) || exit 1; \
+	  else \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+	  fi; \
+	done
+
+update-po: Makefile
+	$(MAKE) $(DOMAIN).pot-update
+	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+	$(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+	exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	cd $(srcdir); \
+	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	       '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	       *) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	     esac; \
+	   }; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "msgmerge for $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+	@:
+
+# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
+# because execution permission bits may not work on the current file system.
+# Use @SHELL@, which is the shell determined by autoconf for the use by its
+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+	cd $(top_builddir) \
+	  && @SHELL@ ./config.status $(subdir)/$@.in po-directories
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Binary files dpkg/scripts/po/pl.gmo and /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/pl.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/pl.po /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/pl.po
--- dpkg/scripts/po/pl.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/pl.po	2012-06-07 10:11:09.426073000 -0700
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-01-03 16:42+0100\n"
 "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -20,13 +20,13 @@
 "|| n%100>=20) ? 1 : 2;\n"
 
 #: scripts/dpkg-architecture.pl:36 scripts/dpkg-buildflags.pl:31
-#: scripts/dpkg-buildpackage.pl:38 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
 #: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:96
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
 #: scripts/dpkg-mergechangelogs.pl:53 scripts/dpkg-name.pl:46
 #: scripts/dpkg-parsechangelog.pl:31 scripts/dpkg-scanpackages.pl:60
 #: scripts/dpkg-scansources.pl:78 scripts/dpkg-shlibdeps.pl:533
-#: scripts/dpkg-source.pl:433 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:455 scripts/changelog/debian.pl:34
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s w wersji %s.\n"
@@ -42,10 +42,10 @@
 "Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>."
 
 #: scripts/dpkg-architecture.pl:42 scripts/dpkg-buildflags.pl:36
-#: scripts/dpkg-buildpackage.pl:45 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
 #: scripts/dpkg-genchanges.pl:102 scripts/dpkg-gencontrol.pl:62
 #: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
-#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:440
+#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:462
 #: scripts/changelog/debian.pl:39
 msgid ""
 "\n"
@@ -99,7 +99,7 @@
 "  --help             wyświetla ten komunikat pomocy.\n"
 "  --version          wyświetla informacje o wersji programu.\n"
 
-#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:84
+#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:91
 #: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:194
 #: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
 #: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:119
@@ -145,7 +145,7 @@
 #, fuzzy
 msgid ""
 "\n"
-"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+"Copyright (C) 2010-2011 Raphael Hertzog <hertzog@debian.org>."
 msgstr ""
 "\n"
 "Copyright (C) 2007 Raphael Hertzog.\n"
@@ -161,29 +161,27 @@
 "                     value is one of vendor, system, user, env.\n"
 "  --list             output a list of the flags supported by the current "
 "vendor.\n"
-"  --export=(sh|make) output commands to be executed in shell or make that "
-"export\n"
-"                     all the compilation flags as environment variables.\n"
+"  --export=(sh|make|configure)\n"
+"                     output something convenient to import the\n"
+"                     compilation flags in a shell script, in make,\n"
+"                     or on a ./configure command line.\n"
+"  --dump             output all compilation flags with their values\n"
 "  --help             show this help message.\n"
 "  --version          show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-buildflags.pl:63 scripts/dpkg-buildflags.pl:69
-#: scripts/dpkg-buildflags.pl:74
+#: scripts/dpkg-buildflags.pl:66 scripts/dpkg-buildflags.pl:72
+#: scripts/dpkg-buildflags.pl:77 scripts/dpkg-buildflags.pl:81
 #, fuzzy, perl-format
 msgid "two commands specified: --%s and --%s"
 msgstr "podano więcej niż jeden plik (%s i %s)"
 
-#: scripts/dpkg-buildflags.pl:67
+#: scripts/dpkg-buildflags.pl:70
 #, fuzzy, perl-format
 msgid "%s needs a parameter"
 msgstr "-b wymaga podania katalogu"
 
-#: scripts/dpkg-buildflags.pl:88
-msgid "need an action option"
-msgstr ""
-
-#: scripts/dpkg-buildpackage.pl:40
+#: scripts/dpkg-buildpackage.pl:39
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -195,7 +193,7 @@
 "Copyright (C) 2000 Wichert Akkerman\n"
 "Copyright (C) 2007 Frank Lichtenheld"
 
-#: scripts/dpkg-buildpackage.pl:52
+#: scripts/dpkg-buildpackage.pl:51
 #, fuzzy, perl-format
 msgid ""
 "\n"
@@ -297,29 +295,29 @@
 "  -h, --help     wyświetla ten komunikat pomocy.\n"
 "      --version  wyświetla informacje o wersji programu.\n"
 
-#: scripts/dpkg-buildpackage.pl:201 scripts/dpkg-buildpackage.pl:207
-#: scripts/dpkg-buildpackage.pl:213 scripts/dpkg-buildpackage.pl:219
-#: scripts/dpkg-buildpackage.pl:224 scripts/dpkg-genchanges.pl:143
+#: scripts/dpkg-buildpackage.pl:200 scripts/dpkg-buildpackage.pl:206
+#: scripts/dpkg-buildpackage.pl:212 scripts/dpkg-buildpackage.pl:218
+#: scripts/dpkg-buildpackage.pl:223 scripts/dpkg-genchanges.pl:143
 #: scripts/dpkg-genchanges.pl:146 scripts/dpkg-genchanges.pl:150
 #: scripts/dpkg-genchanges.pl:154
 #, perl-format
 msgid "cannot combine %s and %s"
 msgstr "nie można łączyć %s i %s"
 
-#: scripts/dpkg-buildpackage.pl:237 scripts/dpkg-source.pl:187
+#: scripts/dpkg-buildpackage.pl:236 scripts/dpkg-source.pl:202
 msgid "-E and -W are deprecated, they are without effect"
 msgstr "-E i -W są przestarzałe, nie mają żadnego efektu"
 
-#: scripts/dpkg-buildpackage.pl:241
+#: scripts/dpkg-buildpackage.pl:240
 #, perl-format
 msgid "unknown option or argument %s"
 msgstr "niepoprawna opcja lub argument %s"
 
-#: scripts/dpkg-buildpackage.pl:251
+#: scripts/dpkg-buildpackage.pl:250
 msgid "using a gain-root-command while being root"
 msgstr "używanie polecenia-uzysk-praw-admin podczas bycia administratorem"
 
-#: scripts/dpkg-buildpackage.pl:257
+#: scripts/dpkg-buildpackage.pl:256
 msgid ""
 "fakeroot not found, either install the fakeroot\n"
 "package, specify a command with the -r option, or run this as root"
@@ -327,62 +325,57 @@
 "nie znaleziono fakeroot, proszę zainstalować pakiet fakeroot lub\n"
 "podać polecenie w opcji -r, lub uruchomić ten program jako root"
 
-#: scripts/dpkg-buildpackage.pl:261
+#: scripts/dpkg-buildpackage.pl:260
 #, perl-format
 msgid "gain-root-commmand '%s' not found"
 msgstr "nie znaleziono polecenia-uzysk-praw-admin \"%s\""
 
-#: scripts/dpkg-buildpackage.pl:280
+#: scripts/dpkg-buildpackage.pl:279
 msgid "unknown sign command, assuming pgp style interface"
 msgstr "nieznane polecenie podpisywania, przyjmowanie interfejsu w stylu pgp"
 
-#: scripts/dpkg-buildpackage.pl:283
+#: scripts/dpkg-buildpackage.pl:282
 msgid "PGP support is deprecated (see README.feature-removal-schedule)"
 msgstr ""
 "Wsparcie dla PGP jest przestarzałe (patrz README.feature-removal-schedule)"
 
 #: scripts/dpkg-buildpackage.pl:301
-#, perl-format
-msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
-msgstr ""
-
-#: scripts/dpkg-buildpackage.pl:310
 msgid "source package"
 msgstr "pakiet źródłowy"
 
-#: scripts/dpkg-buildpackage.pl:311
+#: scripts/dpkg-buildpackage.pl:302
 msgid "source version"
 msgstr "wersja pakietu źródłowego"
 
-#: scripts/dpkg-buildpackage.pl:321
+#: scripts/dpkg-buildpackage.pl:312
 msgid "source changed by"
 msgstr "źródła zmienione przez"
 
-#: scripts/dpkg-buildpackage.pl:339
+#: scripts/dpkg-buildpackage.pl:330
 msgid "host architecture"
 msgstr "architektura gościa"
 
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:343
 msgid "debian/rules is not executable: fixing that."
 msgstr "debian/rules nie jest plikiem wykonywalnym: naprawianie."
 
-#: scripts/dpkg-buildpackage.pl:371
+#: scripts/dpkg-buildpackage.pl:362
 msgid "Build dependencies/conflicts unsatisfied; aborting."
 msgstr "Niespełnione zależności/konflikty czasu budowania; przerywanie."
 
-#: scripts/dpkg-buildpackage.pl:372
+#: scripts/dpkg-buildpackage.pl:363
 msgid "(Use -d flag to override.)"
 msgstr "(Użyj opcji -d, aby to obejść)."
 
-#: scripts/dpkg-buildpackage.pl:375
+#: scripts/dpkg-buildpackage.pl:366
 msgid "This is currently a non-fatal warning with -S, but"
 msgstr "Obecnie jest to tylko ostrzeżenie generowane, gdy użyje się -S,"
 
-#: scripts/dpkg-buildpackage.pl:376
+#: scripts/dpkg-buildpackage.pl:367
 msgid "will probably become fatal in the future."
 msgstr "jednak w przyszłości zostanie przekształcone w błąd krytyczny."
 
-#: scripts/dpkg-buildpackage.pl:398
+#: scripts/dpkg-buildpackage.pl:389
 msgid ""
 "it is a bad idea to generate a source package without cleaning up first, it "
 "might contain undesired files."
@@ -390,56 +383,56 @@
 "generowanie pakietu źródłowego bez wcześniejszego czyszczenia jest złym "
 "pomysłem, może on zawierać niepotrzebne pliki."
 
-#: scripts/dpkg-buildpackage.pl:411
+#: scripts/dpkg-buildpackage.pl:402
 msgid "Press the return key to start signing process\n"
 msgstr "Naciśnij <enter>, by rozpocząć proces podpisywania\n"
 
-#: scripts/dpkg-buildpackage.pl:418
+#: scripts/dpkg-buildpackage.pl:409
 msgid "Failed to sign .dsc and .changes file"
 msgstr "Błąd podpisywania plików .dsc i .changes"
 
-#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:437
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:424 scripts/dpkg-buildpackage.pl:428
+#: scripts/dpkg-buildpackage.pl:441
 msgid "write changes file"
 msgstr "zapisywanie pliku zmian"
 
-#: scripts/dpkg-buildpackage.pl:449
+#: scripts/dpkg-buildpackage.pl:440
 msgid "dpkg-genchanges"
 msgstr "dpkg-genchanges"
 
-#: scripts/dpkg-buildpackage.pl:458
+#: scripts/dpkg-buildpackage.pl:449
 msgid "source only upload: Debian-native package"
 msgstr "wydanie tylko źródeł: natywny pakiet Debiana"
 
-#: scripts/dpkg-buildpackage.pl:460
+#: scripts/dpkg-buildpackage.pl:451
 msgid "source only, diff-only upload (original source NOT included)"
 msgstr "wydanie tylko źródeł i różnic (oryginalne źródła NIE dołączone)"
 
-#: scripts/dpkg-buildpackage.pl:462
+#: scripts/dpkg-buildpackage.pl:453
 msgid "source only upload (original source is included)"
 msgstr "wydanie tylko źródeł (oryginalne źródła dołączone)"
 
-#: scripts/dpkg-buildpackage.pl:465 scripts/dpkg-buildpackage.pl:473
+#: scripts/dpkg-buildpackage.pl:456 scripts/dpkg-buildpackage.pl:464
 msgid "full upload (original source is included)"
 msgstr "pełne wydanie (oryginalne źródła dołączone)"
 
-#: scripts/dpkg-buildpackage.pl:467
+#: scripts/dpkg-buildpackage.pl:458
 msgid "binary only upload (no source included)"
 msgstr "wydanie tylko binarne (bez żadnych źródeł)"
 
-#: scripts/dpkg-buildpackage.pl:469
+#: scripts/dpkg-buildpackage.pl:460
 msgid "full upload; Debian-native package (full source is included)"
 msgstr "pełne wydanie; natywny pakiet Debiana (pełne źródła dołączone)"
 
-#: scripts/dpkg-buildpackage.pl:471
+#: scripts/dpkg-buildpackage.pl:462
 msgid "binary and diff upload (original source NOT included)"
 msgstr "wydanie binarne i pliku różnic (oryginalne źródła NIE dołączone)"
 
-#: scripts/dpkg-buildpackage.pl:478
+#: scripts/dpkg-buildpackage.pl:469
 msgid "Failed to sign .changes file"
 msgstr "Błąd podpisywania pliku .changes."
 
-#: scripts/dpkg-buildpackage.pl:497
+#: scripts/dpkg-buildpackage.pl:488
 #, perl-format
 msgid "unable to determine %s"
 msgstr "nie można określić %s"
@@ -492,7 +485,7 @@
 msgid "%s: Build conflicts: "
 msgstr "%s: Konfliktu budowania pakietu:"
 
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:236
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:253
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "wystąpił błąd podczas przetwarzania %s"
@@ -531,27 +524,27 @@
 msgid "filename, section and priority may contain no whitespace"
 msgstr "nazwa pliku, sekcja i priorytet nie mogą zawierać białych znaków"
 
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:334
 msgid "open new files list file"
 msgstr "otwieranie nowego pliku z listą plików"
 
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:345
 msgid "copy old entry to new files list file"
 msgstr "kopiowanie starego pliku do nowego pliku z listą plików"
 
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:349
 msgid "read old files list file"
 msgstr "czytanie starego pliku z listą plików"
 
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:359
 msgid "write new entry to new files list file"
 msgstr "zapisywanie nowego wpisu do nowego pliku z listą plików"
 
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:360
 msgid "close new files list file"
 msgstr "zamykanie nowego pliku z listą plików"
 
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:361
 msgid "install new files list file"
 msgstr "instalowanie nowego pliku z listą plików"
 
@@ -712,7 +705,7 @@
 msgid "missing Priority for source files"
 msgstr "brak pola Priority plików źródłowych"
 
-#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:327
+#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:346
 #: scripts/Dpkg/Vendor.pm:71
 #, fuzzy, perl-format
 msgid "%s is empty"
@@ -738,13 +731,13 @@
 msgid "write original source message"
 msgstr "wypisywanie oryginalnego komunikatu źródłowego"
 
-#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:426
+#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:532
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "brak informacji o krytycznym polu wyjściowym %s"
 
 #: scripts/dpkg-genchanges.pl:499 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:431
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:537
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "brak informacji o polu wyjściowym %s"
@@ -877,32 +870,40 @@
 msgid "chdir for du to `%s'"
 msgstr "zmiana katalogu dla du na \"%s\""
 
-#: scripts/dpkg-gencontrol.pl:304 scripts/dpkg-shlibdeps.pl:843
+#: scripts/dpkg-gencontrol.pl:305 scripts/dpkg-shlibdeps.pl:843
 #: scripts/Dpkg/IPC.pm:271 scripts/Dpkg/Shlibs/Cppfilt.pm:50
 #, fuzzy, perl-format
 msgid "unable to execute %s"
 msgstr "nie można otworzyć cputable"
 
-#: scripts/dpkg-gencontrol.pl:311
+#: scripts/dpkg-gencontrol.pl:312
 #, perl-format
 msgid "du in `%s'"
 msgstr "du na \"%s\""
 
-#: scripts/dpkg-gencontrol.pl:313
+#: scripts/dpkg-gencontrol.pl:314
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr "du wypisało dziwny komunikat  \"%s\""
 
-#: scripts/dpkg-gencontrol.pl:346
+#: scripts/dpkg-gencontrol.pl:347
 msgid "close old files list file"
 msgstr "zamykanie starego pliku z listą plików"
 
-#: scripts/dpkg-gencontrol.pl:368
+#: scripts/dpkg-gencontrol.pl:369
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "nie można otworzyć nowego pliku kontrolnego \"%s\""
 
-#: scripts/dpkg-gencontrol.pl:379
+#: scripts/dpkg-gencontrol.pl:378 scripts/dpkg-shlibdeps.pl:523
+#: scripts/Dpkg/Interface/Storable.pm:91
+#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
+#: scripts/Dpkg/Source/Package/V2.pm:607
+#, perl-format
+msgid "cannot close %s"
+msgstr "nie można zamknąć %s"
+
+#: scripts/dpkg-gencontrol.pl:380
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "nie można zainstalować wyjściowego pliku kontrolnego \"%s\""
@@ -1017,11 +1018,15 @@
 msgstr "pewne symbole zniknęły z pliku symboli: %s"
 
 #: scripts/dpkg-gensymbols.pl:291
+msgid "the generated symbols file is empty"
+msgstr ""
+
+#: scripts/dpkg-gensymbols.pl:293
 #, perl-format
 msgid "%s doesn't match completely %s"
 msgstr "%s całkowicie nie pasuje do %s"
 
-#: scripts/dpkg-gensymbols.pl:294
+#: scripts/dpkg-gensymbols.pl:296
 #, perl-format
 msgid "no debian/symbols file used as basis for generating %s"
 msgstr "do generowania %s nie użyto żadnego pliku debian/symbols"
@@ -1063,19 +1068,20 @@
 "  --help       wyświetla ten komunikat pomocy.\n"
 "  --version    wyświetla informacje o wersji programu.\n"
 
-#: scripts/dpkg-mergechangelogs.pl:129
+#: scripts/dpkg-mergechangelogs.pl:129 scripts/dpkg-mergechangelogs.pl:131
 #: scripts/Dpkg/Compression/FileHandle.pm:385
 #: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
 #: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Functions.pm:78
-#: scripts/Dpkg/Source/Package.pm:347 scripts/Dpkg/Source/Package.pm:444
-#: scripts/Dpkg/Source/Package/V2.pm:210 scripts/Dpkg/Source/Package/V2.pm:477
-#: scripts/Dpkg/Source/Package/V2.pm:522
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:224
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:323
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:333
+#: scripts/Dpkg/Source/Package.pm:447 scripts/Dpkg/Source/Package.pm:550
+#: scripts/Dpkg/Source/Package/V2.pm:217 scripts/Dpkg/Source/Package/V2.pm:530
+#: scripts/Dpkg/Source/Package/V2.pm:605
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:226
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:234
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:341
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:351
 #, perl-format
 msgid "cannot write %s"
 msgstr "nie można zapisać %s"
@@ -1122,7 +1128,7 @@
 #: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:138 scripts/Dpkg/Arch.pm:157
 #: scripts/Dpkg/Arch.pm:176 scripts/Dpkg/Changelog/Parse.pm:142
 #: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:138
+#: scripts/Dpkg/Source/Package.pm:193
 #, perl-format
 msgid "cannot open %s"
 msgstr "nie można otworzyć %s"
@@ -1265,8 +1271,9 @@
 "    --all                       włącza wszystkie zmiany\n"
 
 #: scripts/dpkg-parsechangelog.pl:117
-#, perl-format
-msgid "%s takes no non-option arguments"
+#, fuzzy
+#| msgid "%s takes no non-option arguments"
+msgid "takes no non-option arguments"
 msgstr "%s wymaga niepodawania argumentu nie będącego opcją"
 
 #: scripts/dpkg-scanpackages.pl:66
@@ -1315,8 +1322,10 @@
 msgid "Unconditional maintainer override for %s"
 msgstr "Bezwarunkowe nadpisanie opiekuna dla %s"
 
-#: scripts/dpkg-scanpackages.pl:158
-msgid "1 to 3 args expected"
+#: scripts/dpkg-scanpackages.pl:158 scripts/dpkg-scansources.pl:302
+#, fuzzy
+#| msgid "1 to 3 args expected"
+msgid "one to three arguments expected"
 msgstr "Oczekiwano od 1 do 3 argumentów"
 
 #: scripts/dpkg-scanpackages.pl:175
@@ -1480,10 +1489,6 @@
 msgid "no binary packages specified in %s"
 msgstr "nie podano żadnych pakietów binarnych w %s"
 
-#: scripts/dpkg-scansources.pl:302
-msgid "1 to 3 args expected\n"
-msgstr "Oczekiwano od 1 do 3 argumentów\n"
-
 #: scripts/dpkg-shlibdeps.pl:93
 #, perl-format
 msgid "administrative directory '%s' does not exist"
@@ -1738,125 +1743,153 @@
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "nierozpoznane wyjście z dpkg --search: \"%s\""
 
-#: scripts/dpkg-source.pl:100
+#: scripts/dpkg-source.pl:104
 #, fuzzy, perl-format
 msgid "%s needs a directory"
 msgstr "-b wymaga podania katalogu"
 
-#: scripts/dpkg-source.pl:103
+#: scripts/dpkg-source.pl:110
 #, perl-format
 msgid "cannot stat directory %s"
 msgstr "nie można ustalić stanu katalogu %s"
 
-#: scripts/dpkg-source.pl:105
+#: scripts/dpkg-source.pl:112
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr "argument %s nie jest katalogiem"
 
-#: scripts/dpkg-source.pl:123
+#: scripts/dpkg-source.pl:117 scripts/Dpkg/Source/Package/V2.pm:476
+#: scripts/Dpkg/Source/Package/V2.pm:478 scripts/Dpkg/Source/Package/V2.pm:480
+#: scripts/Dpkg/Source/Package/V2.pm:482
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
+#: scripts/Dpkg/Source/Package/V3/git.pm:104
+#: scripts/Dpkg/Source/Package/V3/git.pm:143
+#: scripts/Dpkg/Source/Package/V3/git.pm:155
+#: scripts/Dpkg/Source/Package/V3/git.pm:174
+#, perl-format
+msgid "unable to chdir to `%s'"
+msgstr "nie można zmienić katalogu na \"%s\""
+
+#: scripts/dpkg-source.pl:135
 #, fuzzy, perl-format
 msgid "using options from %s: %s"
 msgstr "błąd czytania z %s:"
 
-#: scripts/dpkg-source.pl:138 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:150 scripts/Dpkg/Compression.pm:173
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "%s nie jest obsługiwanym typem kompresji"
 
-#: scripts/dpkg-source.pl:144 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:156 scripts/Dpkg/Compression.pm:202
 #: scripts/Dpkg/Compression/Process.pm:86
 #, perl-format
 msgid "%s is not a compression level"
 msgstr " %s nie jest poziomem kompresji"
 
-#: scripts/dpkg-source.pl:199
-msgid "need a command (-x, -b, --before-build, --after-build, --print-format)"
+#: scripts/dpkg-source.pl:214
+msgid ""
+"need a command (-x, -b, --before-build, --after-build, --print-format, --"
+"commit)"
+msgstr ""
+
+#: scripts/dpkg-source.pl:238
+#, perl-format
+msgid "%s doesn't contain any information about the source package"
 msgstr ""
 
-#: scripts/dpkg-source.pl:268
+#: scripts/dpkg-source.pl:283
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "\"%s\" nie jest poprawną specyfikacją architektury"
 
-#: scripts/dpkg-source.pl:271
+#: scripts/dpkg-source.pl:286
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 "architektura %s dopuszczalna tylko sama (listą dla pakietu %s jest \"%s\")"
 
-#: scripts/dpkg-source.pl:324 scripts/Dpkg/BuildFlags.pm:190
+#: scripts/dpkg-source.pl:301
+#, fuzzy, perl-format
+#| msgid "diff `%s' doesn't contain any patch"
+msgid "%s doesn't list any binary package"
+msgstr "diff \"%s\" nie zawiera żadnej łatki"
+
+#: scripts/dpkg-source.pl:343 scripts/Dpkg/BuildFlags.pm:270
 #: scripts/Dpkg/Compression/FileHandle.pm:401
 #: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:122
-#: scripts/Dpkg/Source/Package/V2.pm:360 scripts/Dpkg/Source/Package/V2.pm:505
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:276
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:330
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:377
+#: scripts/Dpkg/Source/Package/V2.pm:277 scripts/Dpkg/Source/Package/V2.pm:425
+#: scripts/Dpkg/Source/Package/V2.pm:561
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:112
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:286
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:348
 #, perl-format
 msgid "cannot read %s"
 msgstr "nie można odczytać %s"
 
-#: scripts/dpkg-source.pl:331
+#: scripts/dpkg-source.pl:350
 #, perl-format
 msgid "no source format specified in %s, see dpkg-source(1)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:356
+#: scripts/dpkg-source.pl:378
 #, fuzzy, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr "używania formatu źródeł \"%s\""
 
-#: scripts/dpkg-source.pl:359
+#: scripts/dpkg-source.pl:381
 #, perl-format
 msgid "using source format `%s'"
 msgstr "używania formatu źródeł \"%s\""
 
-#: scripts/dpkg-source.pl:366 scripts/Dpkg/Source/Package/V1.pm:300
-#: scripts/Dpkg/Source/Package/V1.pm:345 scripts/Dpkg/Source/Package/V2.pm:488
+#: scripts/dpkg-source.pl:388 scripts/Dpkg/Source/Package/V1.pm:301
+#: scripts/Dpkg/Source/Package/V1.pm:346 scripts/Dpkg/Source/Package/V2.pm:541
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
-#: scripts/Dpkg/Source/Package/V3/native.pm:83
+#: scripts/Dpkg/Source/Package/V3/native.pm:84
 #, perl-format
 msgid "building %s in %s"
 msgstr "budowanie %s w %s"
 
-#: scripts/dpkg-source.pl:377
+#: scripts/dpkg-source.pl:399
 msgid "-x needs at least one argument, the .dsc"
 msgstr "-x wymaga co najmniej jednego argumentu, .dsc"
 
-#: scripts/dpkg-source.pl:380
+#: scripts/dpkg-source.pl:402
 msgid "-x takes no more than two arguments"
 msgstr "-x pobiera nie więcej niż dwa argumenty"
 
-#: scripts/dpkg-source.pl:384
+#: scripts/dpkg-source.pl:406
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr "-x wymaga pliku .dsc, a nie katalogu, jako pierwszego argumentu"
 
-#: scripts/dpkg-source.pl:400
+#: scripts/dpkg-source.pl:422
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "cel rozpakowania istnieje: %s"
 
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:432
 #, perl-format
 msgid "%s doesn't contain a valid OpenPGP signature"
 msgstr "%s nie zawiera ważnego podpisu OpenPGP"
 
-#: scripts/dpkg-source.pl:412
+#: scripts/dpkg-source.pl:434
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "wydobywanie niepodpisanych pakietów źródłowych (%s)"
 
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:441
 #, perl-format
 msgid "extracting %s in %s"
 msgstr "rozpakowywanie %s w %s"
 
-#: scripts/dpkg-source.pl:427
+#: scripts/dpkg-source.pl:449
 #, fuzzy
 msgid "only one of -x, -b or --print-format allowed, and only once"
 msgstr "dozwolona tylko jedna z opcji -x lub -b, i tylko raz"
 
-#: scripts/dpkg-source.pl:435
+#: scripts/dpkg-source.pl:457
 #, fuzzy
 msgid ""
 "\n"
@@ -1868,7 +1901,7 @@
 "Copyright (C) 1996 Ian Jackson and Klee Dienes.\n"
 "Copyright (C) 2008 Raphael Hertzog"
 
-#: scripts/dpkg-source.pl:448
+#: scripts/dpkg-source.pl:470
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -1878,10 +1911,12 @@
 "                           extract source package.\n"
 "  -b <dir>                 build source package.\n"
 "  --print-format <dir>     print the source format that would be\n"
-"                           used to build the source package."
+"                           used to build the source package.\n"
+"  --commit [<dir> [<patch-name>]]\n"
+"                           store upstream changes in a new patch."
 msgstr ""
 
-#: scripts/dpkg-source.pl:457
+#: scripts/dpkg-source.pl:481
 #, fuzzy, perl-format
 msgid ""
 "Build options:\n"
@@ -1942,7 +1977,7 @@
 "Dostępne są także inne opcje, ale zależą one od formatu pakietu źródłowego.\n"
 "Więcej informacji można znaleźć w dpkg-source(1).\n"
 
-#: scripts/dpkg-source.pl:475
+#: scripts/dpkg-source.pl:499
 msgid ""
 "Extract options:\n"
 "  --no-copy                don't copy .orig tarballs\n"
@@ -1952,7 +1987,7 @@
 "signature"
 msgstr ""
 
-#: scripts/dpkg-source.pl:480
+#: scripts/dpkg-source.pl:504
 #, fuzzy
 msgid ""
 "General options:\n"
@@ -1967,7 +2002,7 @@
 "  --help       wyświetla ten komunikat pomocy.\n"
 "  --version    wyświetla informacje o wersji programu.\n"
 
-#: scripts/dpkg-source.pl:484
+#: scripts/dpkg-source.pl:508
 msgid ""
 "More options are available but they depend on the source package format.\n"
 "See dpkg-source(1) for more info."
@@ -2056,12 +2091,12 @@
 msgstr "standardowe wejście"
 
 #: scripts/changelog/debian.pl:136
-msgid "fatal error occured while parsing input"
+msgid "fatal error occurred while parsing input"
 msgstr "wystąpił fatalny błąd podczas przetwarzania wejścia"
 
 #: scripts/changelog/debian.pl:139
 #, perl-format
-msgid "fatal error occured while parsing %s"
+msgid "fatal error occurred while parsing %s"
 msgstr "wystąpił fatalny błąd podczas przetwarzania %s"
 
 #: scripts/Dpkg/Arch.pm:86
@@ -2078,17 +2113,17 @@
 "Unknown gcc system type %s, falling back to default (native compilation)"
 msgstr "Nieznany typ systemu gcc %s, używanie domyślnego (kompilacja natywna)"
 
-#: scripts/Dpkg/BuildFlags.pm:198
+#: scripts/Dpkg/BuildFlags.pm:278
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
 msgstr ""
 
-#: scripts/Dpkg/BuildFlags.pm:207
+#: scripts/Dpkg/BuildFlags.pm:291
 #, perl-format
 msgid "line %d of %s is invalid, it has been ignored."
 msgstr ""
 
-#: scripts/Dpkg/BuildOptions.pm:91
+#: scripts/Dpkg/BuildOptions.pm:94
 #, fuzzy, perl-format
 msgid "invalid flag in %s: %s"
 msgstr "niepoprawne pole w %s: %s"
@@ -2352,7 +2387,7 @@
 
 #: scripts/Dpkg/Control.pm:156 scripts/Dpkg/Control.pm:158
 #, perl-format
-msgid "entry of APT's %s file"
+msgid "entry in repository's %s file"
 msgstr ""
 
 #: scripts/Dpkg/Control.pm:160 scripts/Dpkg/Control.pm:164
@@ -2385,8 +2420,10 @@
 msgid "first block lacks a source field"
 msgstr "pierwszy blok nie zawiera pola Source"
 
-#: scripts/Dpkg/Control/Info.pm:110
-msgid "block lacks a package field"
+#: scripts/Dpkg/Control/Info.pm:110 scripts/Dpkg/Control/Info.pm:113
+#, fuzzy, perl-format
+#| msgid "block lacks a package field"
+msgid "block lacks the '%s' field"
 msgstr "blok nie zawiera pola Package"
 
 #: scripts/Dpkg/Control/Hash.pm:172
@@ -2460,17 +2497,11 @@
 msgid "%s failed with unknown exit code %d"
 msgstr "%s zwrócił nieznany kod błędu %d"
 
-#: scripts/Dpkg/ErrorHandling.pm:113
+#: scripts/Dpkg/ErrorHandling.pm:115
 #, perl-format
 msgid "syntax error in %s at line %d: %s"
 msgstr "błąd składni w %s w linii %d: %s"
 
-#: scripts/Dpkg/Interface/Storable.pm:91
-#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
-#, perl-format
-msgid "cannot close %s"
-msgstr "nie można zamknąć %s"
-
 #: scripts/Dpkg/IPC.pm:211 scripts/Dpkg/IPC.pm:217 scripts/Dpkg/IPC.pm:223
 #, perl-format
 msgid "pipe for %s"
@@ -2564,8 +2595,8 @@
 msgid "cannot create directory %s"
 msgstr "nie można utworzyć katalogu %s"
 
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:231
-#: scripts/Dpkg/Source/Package/V2.pm:192
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:307
+#: scripts/Dpkg/Source/Package/V2.pm:199
 #, perl-format
 msgid "cannot opendir %s"
 msgstr "nie można otworzyć katalogu %s"
@@ -2601,7 +2632,7 @@
 msgid "cannot read timestamp from %s"
 msgstr "nie można zmienić czasu modyfikacji dla %s"
 
-#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:378
+#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:443
 msgid "binary file contents changed"
 msgstr "zawartość pliku binarnego zmieniła się"
 
@@ -2678,7 +2709,7 @@
 msgstr ""
 "specjalne prawa dostępu %04o pliku \"%s\" nie będą dołączone do pliku różnic"
 
-#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:377
+#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:442
 #, perl-format
 msgid "cannot represent change to %s: %s"
 msgstr "niereprezentowalne zmiany w %s: %s"
@@ -2727,7 +2758,7 @@
 "%d)"
 
 #: scripts/Dpkg/Source/Patch.pm:410
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:127
 #, perl-format
 msgid "%s contains an insecure path: %s"
 msgstr ""
@@ -2793,7 +2824,7 @@
 msgid "nonexistent"
 msgstr "nieistniejące"
 
-#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:358
+#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:458
 #, perl-format
 msgid "cannot stat %s"
 msgstr "nie można ustalić stanu %s"
@@ -2827,17 +2858,17 @@
 msgid "named socket"
 msgstr "nazwane gniazdo"
 
-#: scripts/Dpkg/Source/Package.pm:133
+#: scripts/Dpkg/Source/Package.pm:188
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr "%s nie jest nazwą pliku"
 
-#: scripts/Dpkg/Source/Package.pm:153
+#: scripts/Dpkg/Source/Package.pm:208
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "brak krytycznego źródłowego pola kontrolnego %s "
 
-#: scripts/Dpkg/Source/Package.pm:181
+#: scripts/Dpkg/Source/Package.pm:236
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
@@ -2845,117 +2876,122 @@
 "format \"%s\" pakietu źródłowego nie jest obsługiwany (wymagany moduł Perla "
 "%s)"
 
-#: scripts/Dpkg/Source/Package.pm:185
+#: scripts/Dpkg/Source/Package.pm:240
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr "niepoprawne pole Format \"%s\""
 
-#: scripts/Dpkg/Source/Package.pm:212
+#: scripts/Dpkg/Source/Package.pm:288
 msgid "source and version are required to compute the source basename"
 msgstr "źródło i wersja są wymagane do określenia nazwy bazowej źródeł"
 
-#: scripts/Dpkg/Source/Package.pm:278 scripts/Dpkg/Source/Package.pm:280
+#: scripts/Dpkg/Source/Package.pm:371 scripts/Dpkg/Source/Package.pm:373
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "błąd weryfikowania sygnatury w %s"
 
-#: scripts/Dpkg/Source/Package.pm:287 scripts/Dpkg/Source/Package.pm:289
+#: scripts/Dpkg/Source/Package.pm:380 scripts/Dpkg/Source/Package.pm:382
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr "nie można zweryfikować sygnatury w %s, ponieważ nie zainstalowano gpg"
 
-#: scripts/Dpkg/Source/Package.pm:298
+#: scripts/Dpkg/Source/Package.pm:391
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr "%s nie jest prawidłową opcją dla %s"
 
-#: scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Package.pm:460
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s nie istnieje"
 
-#: scripts/Dpkg/Source/Package.pm:364
+#: scripts/Dpkg/Source/Package.pm:464
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "nie można uczynić %s plikiem wykonywalnym"
 
-#: scripts/Dpkg/Source/Package.pm:366
+#: scripts/Dpkg/Source/Package.pm:466
 #, perl-format
 msgid "%s is not a plain file"
 msgstr " %s nie jest zwykłym plikiem"
 
-#: scripts/Dpkg/Source/Package/V1.pm:61
+#: scripts/Dpkg/Source/Package.pm:517
+#, fuzzy, perl-format
+msgid "'%s' is not supported by the source format '%s'"
+msgstr "używania formatu źródeł \"%s\""
+
+#: scripts/Dpkg/Source/Package/V1.pm:62
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr "opcja -s%s nadpisuje wcześniejszą opcję -s%s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:83
+#: scripts/Dpkg/Source/Package/V1.pm:84
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr "opcja przetwarzania źródeł -s%s nie jest dopuszczalna z -x"
 
-#: scripts/Dpkg/Source/Package/V1.pm:95
-#: scripts/Dpkg/Source/Package/V3/native.pm:50
+#: scripts/Dpkg/Source/Package/V1.pm:96
+#: scripts/Dpkg/Source/Package/V3/native.pm:51
 msgid "multiple tarfiles in v1.0 source package"
 msgstr "wiele archiwów tar w pakiecie źródłowym wersji 1.0"
 
-#: scripts/Dpkg/Source/Package/V1.pm:100 scripts/Dpkg/Source/Package/V2.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:101 scripts/Dpkg/Source/Package/V2.pm:129
 #, perl-format
 msgid "unrecognized file for a %s source package: %s"
 msgstr "nierozpoznany plik w pakiecie źródłowym %s: %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:105
-#: scripts/Dpkg/Source/Package/V3/native.pm:57
+#: scripts/Dpkg/Source/Package/V1.pm:106
+#: scripts/Dpkg/Source/Package/V3/native.pm:58
 msgid "no tarfile in Files field"
 msgstr "pole Files nie zawiera nazwy archiwum tar"
 
-#: scripts/Dpkg/Source/Package/V1.pm:108
+#: scripts/Dpkg/Source/Package/V1.pm:109
 msgid "native package with .orig.tar"
 msgstr "pakiet natywny z rozszerzeniem .orig.tar"
 
-#: scripts/Dpkg/Source/Package/V1.pm:121
+#: scripts/Dpkg/Source/Package/V1.pm:122
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr "nie można zmienić nazwy \"%s\" na \"%s\""
 
-#: scripts/Dpkg/Source/Package/V1.pm:125 scripts/Dpkg/Source/Package/V2.pm:134
-#: scripts/Dpkg/Source/Package/V2.pm:146 scripts/Dpkg/Source/Package/V2.pm:159
+#: scripts/Dpkg/Source/Package/V1.pm:126 scripts/Dpkg/Source/Package/V2.pm:141
+#: scripts/Dpkg/Source/Package/V2.pm:153 scripts/Dpkg/Source/Package/V2.pm:166
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:190
-#: scripts/Dpkg/Source/Package/V3/native.pm:60
+#: scripts/Dpkg/Source/Package/V3/native.pm:61
 #, perl-format
 msgid "unpacking %s"
 msgstr "rozpakowywanie %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:132
+#: scripts/Dpkg/Source/Package/V1.pm:133
 msgid "unable to keep orig directory (already exists)"
 msgstr "nie można zachować oryginalnego katalogu (już istnieje)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:139
+#: scripts/Dpkg/Source/Package/V1.pm:140
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr "nie można zmienić nowo wypakowanego %s na %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:145
+#: scripts/Dpkg/Source/Package/V1.pm:146
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr "nie można zmienić nazwy zachowanego %s na %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:152 scripts/Dpkg/Source/Package/V2.pm:214
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:171
+#: scripts/Dpkg/Source/Package/V1.pm:153 scripts/Dpkg/Source/Package/V2.pm:222
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:172
 #, perl-format
 msgid "applying %s"
 msgstr "aplikowanie %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:157
+#: scripts/Dpkg/Source/Package/V1.pm:158
 #, perl-format
 msgid "upstream files that have been modified: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:167
+#: scripts/Dpkg/Source/Package/V1.pm:168
 msgid "only supports gzip compression"
 msgstr "obsługuje tylko kompresję gzip"
 
-#: scripts/Dpkg/Source/Package/V1.pm:178
+#: scripts/Dpkg/Source/Package/V1.pm:179
 msgid ""
 "-b takes at most a directory and an orig source argument (with v1.0 source "
 "package)"
@@ -2963,22 +2999,22 @@
 "-b pobiera co najwyżej dwa argumenty: katalog i oryginalne źródła (z wersją "
 "1.0 pakietu źródłowego)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:184
+#: scripts/Dpkg/Source/Package/V1.pm:185
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr "nie można łączyć -s%s, odnoszącej się do obsługi źródeł, z -b"
 
-#: scripts/Dpkg/Source/Package/V1.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:200
 #, perl-format
 msgid "packed orig `%s' exists but is not a plain file"
 msgstr "spakowany oryg. \"%s\" istnieje, ale nie jest zwykłym plikiem"
 
-#: scripts/Dpkg/Source/Package/V1.pm:211
+#: scripts/Dpkg/Source/Package/V1.pm:212
 #, perl-format
 msgid "cannot stat orig argument %s"
 msgstr "nie można ustalić stanu dla argumentu orig %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:217
+#: scripts/Dpkg/Source/Package/V1.pm:218
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -2987,7 +3023,7 @@
 "argument orig jest niespakowany, ale opcja przetwarzania źródeł -s%s "
 "oczekuje spakowanego (.orig.tar.<rozszerzenie>)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:225
+#: scripts/Dpkg/Source/Package/V1.pm:226
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -2996,12 +3032,12 @@
 "argument orig jest spakowany, ale opcja przetwarzania źródeł -s%s oczekuje "
 "niespakowanego (.orig/)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:230
+#: scripts/Dpkg/Source/Package/V1.pm:231
 #, perl-format
 msgid "orig argument %s is not a plain file or directory"
 msgstr "argument oryg %s nie jest zwykłym plikiem ani katalogiem"
 
-#: scripts/Dpkg/Source/Package/V1.pm:236
+#: scripts/Dpkg/Source/Package/V1.pm:237
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s"
@@ -3010,29 +3046,29 @@
 "argument orig jest pusty (brak orig i różnic), ale opcja przetwarzania "
 "źródeł -s%s oczekuje jakiegoś"
 
-#: scripts/Dpkg/Source/Package/V1.pm:249
+#: scripts/Dpkg/Source/Package/V1.pm:250
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr "rozpakowany oryg. \"%s\" istnieje, ale nie jest katalogiem"
 
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:255
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr "nie można ustalić stanu domniemanego rozpakowanego oryginalnego \"%s\""
 
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:264
 #, perl-format
 msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
 msgstr "katalog źródłowy \"%s\" nie jest w postaci <pakiet_źródłowy> \"%s\""
 
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:273
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ""
 "nazwa katalogu .orig %s nie jest w postaci <pakiet>-<wersja_główna> "
 "(oczekiwano %s)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:281
+#: scripts/Dpkg/Source/Package/V1.pm:282
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
@@ -3040,7 +3076,7 @@
 "nazwa pliku .orig.tar %s nie jest w postaci <pakiet>-<wersja_główna>.orig."
 "tar. (oczekiwano %s)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:293
+#: scripts/Dpkg/Source/Package/V1.pm:294
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
@@ -3049,30 +3085,31 @@
 "archiwum tar \"%s\" już istnieje, nie będzie nadpisany, poddawanie się , "
 "użyj -sU lub -sR, aby nadpisać"
 
-#: scripts/Dpkg/Source/Package/V1.pm:297
+#: scripts/Dpkg/Source/Package/V1.pm:298
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr "nie można sprawdzić istnienia \"%s\""
 
-#: scripts/Dpkg/Source/Package/V1.pm:312 scripts/Dpkg/Source/Package/V1.pm:374
-#: scripts/Dpkg/Source/Package/V3/native.pm:96
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V1.pm:375
+#: scripts/Dpkg/Source/Package/V3/native.pm:98
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr "nie można zmienić nazwy (nowo utworzonego) \"%s\" na \"%s\""
 
-#: scripts/Dpkg/Source/Package/V1.pm:315 scripts/Dpkg/Source/Package/V1.pm:377
-#: scripts/Dpkg/Source/Package/V2.pm:461
-#: scripts/Dpkg/Source/Package/V3/native.pm:99
+#: scripts/Dpkg/Source/Package/V1.pm:316 scripts/Dpkg/Source/Package/V1.pm:378
+#: scripts/Dpkg/Source/Package/V2.pm:603
+#: scripts/Dpkg/Source/Package/V3/native.pm:102
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:367
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr "nie można zmienić praw dostępu \"%s\""
 
-#: scripts/Dpkg/Source/Package/V1.pm:317 scripts/Dpkg/Source/Package/V2.pm:330
+#: scripts/Dpkg/Source/Package/V1.pm:318 scripts/Dpkg/Source/Package/V2.pm:348
 #, perl-format
 msgid "building %s using existing %s"
 msgstr "budowanie %s, używając istniejącego %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:326
+#: scripts/Dpkg/Source/Package/V1.pm:327
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
@@ -3081,84 +3118,97 @@
 "oryg. katalog \"%s\" już istnieje, nie będzie nadpisany, poddawanie się; "
 "użyj -sA, -sK lub -sP, aby nadpisać"
 
-#: scripts/Dpkg/Source/Package/V1.pm:334
+#: scripts/Dpkg/Source/Package/V1.pm:335
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr "nie można sprawdzić istnienia katalogu orig \"%s\""
 
-#: scripts/Dpkg/Source/Package/V1.pm:365
+#: scripts/Dpkg/Source/Package/V1.pm:366
 #, perl-format
 msgid "the diff modifies the following upstream files: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:367
+#: scripts/Dpkg/Source/Package/V1.pm:368
 msgid ""
 "use the '3.0 (quilt)' format to have separate and documented changes to "
 "upstream files, see dpkg-source(1)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:369 scripts/Dpkg/Source/Package/V2.pm:465
+#: scripts/Dpkg/Source/Package/V1.pm:370
 msgid "aborting due to --abort-on-upstream-changes"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:387
+#: scripts/Dpkg/Source/Package/V1.pm:388
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr "%s: niereprezentowalne zmiany w źródle"
 
-#: scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V2.pm:119
 #, perl-format
 msgid "duplicate files in %s source package: %s.*"
 msgstr "zduplikowane pliki w pakiecie źródłowym %s: %s.*"
 
-#: scripts/Dpkg/Source/Package/V2.pm:128
+#: scripts/Dpkg/Source/Package/V2.pm:135
 msgid "missing orig.tar or debian.tar file in v2.0 source package"
 msgstr ""
 "brakujący plik orig.tar lib debian.tar dla wersji 2.0 pakietu źródłowego"
 
-#: scripts/Dpkg/Source/Package/V2.pm:148
+#: scripts/Dpkg/Source/Package/V2.pm:155
 #, perl-format
 msgid "required removal of `%s' installed by original tarball"
 msgstr ""
 "wymagane usunięcie \"%s\" zainstalowanego przez oryginalne archiwum tar"
 
-#: scripts/Dpkg/Source/Package/V2.pm:232
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:245
+#: scripts/Dpkg/Source/Package/V2.pm:240
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
 #, fuzzy, perl-format
 #| msgid "applying %s"
 msgid "unapplying %s"
 msgstr "aplikowanie %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:246 scripts/Dpkg/Source/Package/V2.pm:328
-msgid "no orig.tar file found"
-msgstr "nie znaleziono pliku orig.tar"
+#: scripts/Dpkg/Source/Package/V2.pm:263 scripts/Dpkg/Source/Package/V2.pm:344
+#, perl-format
+msgid "no upstream tarball found at %s"
+msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:285
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:310
-msgid ""
-"patches have not been applied, applying them now (use --no-preparation to "
-"override)"
+#: scripts/Dpkg/Source/Package/V2.pm:314
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:329
+#, fuzzy
+#| msgid ""
+#| "patches have not been applied, applying them now (use --no-preparation to "
+#| "override)"
+msgid "patches are not applied, applying them now"
 msgstr ""
 "nie zostały nałożone łatki, nakładanie ich teraz (proszę użyć --no-"
 "preparation aby to pominąć)"
 
-#: scripts/Dpkg/Source/Package/V2.pm:295
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
-#: scripts/Dpkg/Source/Package/V3/native.pm:75
-#, perl-format
-msgid "-b takes only one parameter with format `%s'"
-msgstr "-b przyjmuje tylko jeden parametr w formacie \"%s\""
-
-#: scripts/Dpkg/Source/Package/V2.pm:315
+#: scripts/Dpkg/Source/Package/V2.pm:331
 #, perl-format
 msgid "several orig.tar files found (%s and %s) but only one is allowed"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:351
+#: scripts/Dpkg/Source/Package/V2.pm:370
 msgid "copy of the debian directory"
 msgstr "kopia katalogu debian"
 
-#: scripts/Dpkg/Source/Package/V2.pm:379
+#: scripts/Dpkg/Source/Package/V2.pm:388
+msgid "unrepresentable changes to source"
+msgstr "niereprezentowalne zmiany w źródle"
+
+#: scripts/Dpkg/Source/Package/V2.pm:391
+#, fuzzy
+#| msgid "local changes stored in %s, the modified files are:"
+msgid "local changes detected, the modified files are:"
+msgstr "lokalne zmiany zachowane w %s, zmodyfikowane pliki to:"
+
+#: scripts/Dpkg/Source/Package/V2.pm:410
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
+#: scripts/Dpkg/Source/Package/V3/native.pm:76
+#, perl-format
+msgid "-b takes only one parameter with format `%s'"
+msgstr "-b przyjmuje tylko jeden parametr w formacie \"%s\""
+
+#: scripts/Dpkg/Source/Package/V2.pm:444
 #, perl-format
 msgid ""
 "add %s in debian/source/include-binaries if you want to store the modified "
@@ -3167,12 +3217,12 @@
 "proszę dodać %s w debian/source/include-binaries jeśli zmodyfikowane binaria "
 "mają się znaleźć w wynikowym archiwum Debiana"
 
-#: scripts/Dpkg/Source/Package/V2.pm:393
+#: scripts/Dpkg/Source/Package/V2.pm:458
 #, perl-format
 msgid "unwanted binary file: %s"
 msgstr "niechciany plik binarny: %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:422
+#: scripts/Dpkg/Source/Package/V2.pm:493
 #, fuzzy, perl-format
 #| msgid ""
 #| "detected %d unwanted binary file(s) (add them in debian/source/include-"
@@ -3193,30 +3243,55 @@
 "wykryto %d niechciany(ch) plik(ów) binarny(ch) (należy je wymienić w debian/"
 "source/include-binaries aby umożliwić ich włączenie)."
 
-#: scripts/Dpkg/Source/Package/V2.pm:442
-msgid "unrepresentable changes to source"
-msgstr "niereprezentowalne zmiany w źródle"
+#: scripts/Dpkg/Source/Package/V2.pm:508
+#, perl-format
+msgid "you can integrate the local changes with %s"
+msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:446 scripts/Dpkg/Source/Package/V2.pm:450
+#: scripts/Dpkg/Source/Package/V2.pm:510
 #, perl-format
-msgid "cannot remove %s"
-msgstr "nie można usunąć %s"
+msgid "aborting due to unexpected upstream changes, see %s"
+msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:453
+#: scripts/Dpkg/Source/Package/V2.pm:520 scripts/Dpkg/Source/Package/V2.pm:653
 #, perl-format
-msgid "local changes stored in %s, the modified files are:"
-msgstr "lokalne zmiany zachowane w %s, zmodyfikowane pliki to:"
+msgid "local changes have been recorded in a new patch: %s"
+msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:459
+#: scripts/Dpkg/Source/Package/V2.pm:524 scripts/Dpkg/Source/Package/V2.pm:609
+#: scripts/Dpkg/Source/Package/V2.pm:637 scripts/Dpkg/Source/Package/V2.pm:651
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:369
 #, perl-format
-msgid "cannot rename %s to %s"
-msgstr "nie można przemianować %s na %s"
+msgid "cannot remove %s"
+msgstr "nie można usunąć %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:481
+#: scripts/Dpkg/Source/Package/V2.pm:534
 #, perl-format
 msgid "adding %s to %s"
 msgstr "dodawanie %s do %s"
 
+#: scripts/Dpkg/Source/Package/V2.pm:601
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:365
+#, fuzzy, perl-format
+#| msgid "failed to rename saved %s to %s"
+msgid "failed to copy %s to %s"
+msgstr "nie można zmienić nazwy zachowanego %s na %s"
+
+#: scripts/Dpkg/Source/Package/V2.pm:624
+#, perl-format
+msgid "cannot register changes in %s, this patch already exists"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V2.pm:638
+#, fuzzy
+#| msgid "unrepresentable changes to source"
+msgid "there are no local changes to record"
+msgstr "niereprezentowalne zmiany w źródle"
+
+#: scripts/Dpkg/Source/Package/V2.pm:643
+msgid "Enter the desired patch name: "
+msgstr ""
+
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:52
 msgid ""
 "This source package can only be manipulated using bzr, which is not in the "
@@ -3248,18 +3323,6 @@
 msgid "doesn't contain a bzr repository"
 msgstr "nie zawiera repozytorium git"
 
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
-#: scripts/Dpkg/Source/Package/V3/git.pm:104
-#: scripts/Dpkg/Source/Package/V3/git.pm:143
-#: scripts/Dpkg/Source/Package/V3/git.pm:155
-#: scripts/Dpkg/Source/Package/V3/git.pm:174
-#, perl-format
-msgid "unable to chdir to `%s'"
-msgstr "nie można zmienić katalogu na \"%s\""
-
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:127
 msgid "bzr status exited nonzero"
 msgstr "bzr status zwrócił niezerowy kod błędu"
@@ -3292,7 +3355,7 @@
 msgid "--target-format option is missing"
 msgstr "nie podano opcji --target-format"
 
-#: scripts/Dpkg/Source/Package/V3/native.pm:53
+#: scripts/Dpkg/Source/Package/V3/native.pm:54
 #, perl-format
 msgid "unrecognized file for a native source package: %s"
 msgstr "nierozpoznany plik dla natywnego pakietu źródłowego: %s"
@@ -3369,17 +3432,17 @@
 msgid "setting up shallow clone"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:72
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:73
 #, perl-format
 msgid "%s should be a directory or non-existing"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:78
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:79
 #, perl-format
 msgid "%s should be a file or non-existing"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:119
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:120
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
@@ -3388,18 +3451,18 @@
 "plik wydania (%s) zawiera nieobsługiwane opcje (\"%s\", linia %s), dpkg-"
 "source może zawieść przy nakładaniu łatek."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:137
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:138
 #, fuzzy, perl-format
 msgid "cannot mkdir %s"
 msgstr "nie można otworzyć katalogu %s"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:212
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "nie można utworzyć linku symbolicznego \"%s\""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:284
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:287
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:294
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:297
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr ""
@@ -3440,6 +3503,16 @@
 msgid "source package has two conflicting values - %s and %s"
 msgstr "pakiet źródłowy ma dwie wartości będące w konflikcie ze sobą - %s i %s"
 
+#: scripts/Dpkg/Vendor/Debian.pm:106
+#, fuzzy, perl-format
+msgid "unknown hardening feature: %s"
+msgstr "nieznane klucz-wartość %s - kopiowanie do XS-%s"
+
+#: scripts/Dpkg/Vendor/Debian.pm:110
+#, perl-format
+msgid "incorrect value in hardening option of DEB_BUILD_MAINT_OPTIONS: %s"
+msgstr ""
+
 #: scripts/Dpkg/Vendor/Ubuntu.pm:61 scripts/Dpkg/Vendor/Ubuntu.pm:63
 msgid ""
 "Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu "
@@ -3455,11 +3528,11 @@
 msgstr ""
 "Numer wersji sugeruje zmiany z Ubuntu, ale brak pola XSBC-Original-Maintainer"
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:119
+#: scripts/Dpkg/Vendor/Ubuntu.pm:123
 msgid "'hardening' flag found but 'hardening-wrapper' not installed"
 msgstr ""
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:138
+#: scripts/Dpkg/Vendor/Ubuntu.pm:142
 #, fuzzy, perl-format
 #| msgid "%s: use %s from environment: %s\n"
 msgid "overriding %s in environment: %s"
@@ -3470,20 +3543,33 @@
 msgid "%s is not a valid version"
 msgstr "%s nie jest prawidłową opcją dla %s"
 
-#: scripts/Dpkg/Version.pm:368
+#: scripts/Dpkg/Version.pm:371
 msgid "version number cannot be empty"
 msgstr ""
 
-#: scripts/Dpkg/Version.pm:373
+#: scripts/Dpkg/Version.pm:376
+msgid "version number does not start with digit"
+msgstr ""
+
+#: scripts/Dpkg/Version.pm:381
 #, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr "numer wersji zawiera niepoprawny znak \"%s\""
 
-#: scripts/Dpkg/Version.pm:379
+#: scripts/Dpkg/Version.pm:386
 #, perl-format
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr ""
 
+#~ msgid "1 to 3 args expected\n"
+#~ msgstr "Oczekiwano od 1 do 3 argumentów\n"
+
+#~ msgid "no orig.tar file found"
+#~ msgstr "nie znaleziono pliku orig.tar"
+
+#~ msgid "cannot rename %s to %s"
+#~ msgstr "nie można przemianować %s na %s"
+
 #~ msgid "exec %s"
 #~ msgstr "uruchamianie %s"
 
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/quot.sed /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/quot.sed
--- dpkg/scripts/po/quot.sed	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/quot.sed	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,6 @@
+s/"\([^"]*\)"/“\1”/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“”/""/g
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/remove-potcdate.sin /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/remove-potcdate.sin
--- dpkg/scripts/po/remove-potcdate.sin	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/remove-potcdate.sin	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,19 @@
+# Sed script that remove the POT-Creation-Date line in the header entry
+# from a POT file.
+#
+# The distinction between the first and the following occurrences of the
+# pattern is achieved by looking at the hold space.
+/^"POT-Creation-Date: .*"$/{
+x
+# Test if the hold space is empty.
+s/P/P/
+ta
+# Yes it was empty. First occurrence. Remove the line.
+g
+d
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
Binary files dpkg/scripts/po/ru.gmo and /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/ru.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/Rules-quot /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/Rules-quot
--- dpkg/scripts/po/Rules-quot	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/Rules-quot	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,47 @@
+# Special Makefile rules for English message catalogs with quotation marks.
+
+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
+
+.SUFFIXES: .insert-header .po-update-en
+
+en@quot.po-create:
+	$(MAKE) en@quot.po-update
+en@boldquot.po-create:
+	$(MAKE) en@boldquot.po-update
+
+en@quot.po-update: en@quot.po-update-en
+en@boldquot.po-update: en@boldquot.po-update-en
+
+.insert-header.po-update-en:
+	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	ll=`echo $$lang | sed -e 's/@.*//'`; \
+	LC_ALL=C; export LC_ALL; \
+	cd $(srcdir); \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "creation of $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+en@quot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
+
+en@boldquot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
+
+mostlyclean: mostlyclean-quot
+mostlyclean-quot:
+	rm -f *.insert-header
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/ru.po /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/ru.po
--- dpkg/scripts/po/ru.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/ru.po	2012-06-07 10:11:09.426073000 -0700
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dpkg 1.15.8.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
 "PO-Revision-Date: 2010-09-01 22:22+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -20,13 +20,13 @@
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: scripts/dpkg-architecture.pl:36 scripts/dpkg-buildflags.pl:31
-#: scripts/dpkg-buildpackage.pl:38 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
 #: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:96
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
 #: scripts/dpkg-mergechangelogs.pl:53 scripts/dpkg-name.pl:46
 #: scripts/dpkg-parsechangelog.pl:31 scripts/dpkg-scanpackages.pl:60
 #: scripts/dpkg-scansources.pl:78 scripts/dpkg-shlibdeps.pl:533
-#: scripts/dpkg-source.pl:433 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:455 scripts/changelog/debian.pl:34
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s, версия %s.\n"
@@ -42,10 +42,10 @@
 "Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>."
 
 #: scripts/dpkg-architecture.pl:42 scripts/dpkg-buildflags.pl:36
-#: scripts/dpkg-buildpackage.pl:45 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
 #: scripts/dpkg-genchanges.pl:102 scripts/dpkg-gencontrol.pl:62
 #: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
-#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:440
+#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:462
 #: scripts/changelog/debian.pl:39
 msgid ""
 "\n"
@@ -100,7 +100,7 @@
 "  --help             показать это сообщение.\n"
 "  --version          показать версию.\n"
 
-#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:84
+#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:91
 #: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:194
 #: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
 #: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:119
@@ -145,15 +145,33 @@
 msgstr "%s не является поддерживаемым именем переменной"
 
 #: scripts/dpkg-buildflags.pl:33
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
 msgid ""
 "\n"
-"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+"Copyright (C) 2010-2011 Raphael Hertzog <hertzog@debian.org>."
 msgstr ""
 "\n"
 "Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
 
 #: scripts/dpkg-buildflags.pl:44
-#, perl-format
+#, fuzzy, perl-format
+#| msgid ""
+#| "Usage: %s [<action>]\n"
+#| "\n"
+#| "Actions:\n"
+#| "  --get <flag>       output the requested flag to stdout.\n"
+#| "  --origin <flag>    output the origin of the flag to stdout:\n"
+#| "                     value is one of vendor, system, user, env.\n"
+#| "  --list             output a list of the flags supported by the current "
+#| "vendor.\n"
+#| "  --export=(sh|make) output commands to be executed in shell or make that "
+#| "export\n"
+#| "                     all the compilation flags as environment variables.\n"
+#| "  --help             show this help message.\n"
+#| "  --version          show the version.\n"
 msgid ""
 "Usage: %s [<action>]\n"
 "\n"
@@ -163,9 +181,11 @@
 "                     value is one of vendor, system, user, env.\n"
 "  --list             output a list of the flags supported by the current "
 "vendor.\n"
-"  --export=(sh|make) output commands to be executed in shell or make that "
-"export\n"
-"                     all the compilation flags as environment variables.\n"
+"  --export=(sh|make|configure)\n"
+"                     output something convenient to import the\n"
+"                     compilation flags in a shell script, in make,\n"
+"                     or on a ./configure command line.\n"
+"  --dump             output all compilation flags with their values\n"
 "  --help             show this help message.\n"
 "  --version          show the version.\n"
 msgstr ""
@@ -182,22 +202,18 @@
 "  --help           показать это сообщение.\n"
 "  --version        показать версию.\n"
 
-#: scripts/dpkg-buildflags.pl:63 scripts/dpkg-buildflags.pl:69
-#: scripts/dpkg-buildflags.pl:74
+#: scripts/dpkg-buildflags.pl:66 scripts/dpkg-buildflags.pl:72
+#: scripts/dpkg-buildflags.pl:77 scripts/dpkg-buildflags.pl:81
 #, perl-format
 msgid "two commands specified: --%s and --%s"
 msgstr "указаны две команды: --%s и --%s"
 
-#: scripts/dpkg-buildflags.pl:67
+#: scripts/dpkg-buildflags.pl:70
 #, perl-format
 msgid "%s needs a parameter"
 msgstr "для %s требуется параметр"
 
-#: scripts/dpkg-buildflags.pl:88
-msgid "need an action option"
-msgstr "необходим параметр действия"
-
-#: scripts/dpkg-buildpackage.pl:40
+#: scripts/dpkg-buildpackage.pl:39
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -209,7 +225,7 @@
 "Copyright (C) 2000 Wichert Akkerman\n"
 "Copyright (C) 2007 Frank Lichtenheld"
 
-#: scripts/dpkg-buildpackage.pl:52
+#: scripts/dpkg-buildpackage.pl:51
 #, perl-format
 msgid ""
 "\n"
@@ -325,29 +341,29 @@
 "  -h, --help     показать это сообщение.\n"
 "      --version  показать версию.\n"
 
-#: scripts/dpkg-buildpackage.pl:201 scripts/dpkg-buildpackage.pl:207
-#: scripts/dpkg-buildpackage.pl:213 scripts/dpkg-buildpackage.pl:219
-#: scripts/dpkg-buildpackage.pl:224 scripts/dpkg-genchanges.pl:143
+#: scripts/dpkg-buildpackage.pl:200 scripts/dpkg-buildpackage.pl:206
+#: scripts/dpkg-buildpackage.pl:212 scripts/dpkg-buildpackage.pl:218
+#: scripts/dpkg-buildpackage.pl:223 scripts/dpkg-genchanges.pl:143
 #: scripts/dpkg-genchanges.pl:146 scripts/dpkg-genchanges.pl:150
 #: scripts/dpkg-genchanges.pl:154
 #, perl-format
 msgid "cannot combine %s and %s"
 msgstr "не удалось объединить %s и %s"
 
-#: scripts/dpkg-buildpackage.pl:237 scripts/dpkg-source.pl:187
+#: scripts/dpkg-buildpackage.pl:236 scripts/dpkg-source.pl:202
 msgid "-E and -W are deprecated, they are without effect"
 msgstr "-E и -W устарели, они ничего не изменят"
 
-#: scripts/dpkg-buildpackage.pl:241
+#: scripts/dpkg-buildpackage.pl:240
 #, perl-format
 msgid "unknown option or argument %s"
 msgstr "неизвестный параметр или аргумент %s"
 
-#: scripts/dpkg-buildpackage.pl:251
+#: scripts/dpkg-buildpackage.pl:250
 msgid "using a gain-root-command while being root"
 msgstr "используется команда получения прав root, но уже есть права root"
 
-#: scripts/dpkg-buildpackage.pl:257
+#: scripts/dpkg-buildpackage.pl:256
 msgid ""
 "fakeroot not found, either install the fakeroot\n"
 "package, specify a command with the -r option, or run this as root"
@@ -355,62 +371,57 @@
 "fakeroot не найдена, установите пакет fakeroot и\n"
 "запускайте команду с параметром -r, или запускайте её от root"
 
-#: scripts/dpkg-buildpackage.pl:261
+#: scripts/dpkg-buildpackage.pl:260
 #, perl-format
 msgid "gain-root-commmand '%s' not found"
 msgstr "команда-получения-root «%s» не найдена"
 
-#: scripts/dpkg-buildpackage.pl:280
+#: scripts/dpkg-buildpackage.pl:279
 msgid "unknown sign command, assuming pgp style interface"
 msgstr "неизвестная команда подписывания, используется интерфейс как у pgp"
 
-#: scripts/dpkg-buildpackage.pl:283
+#: scripts/dpkg-buildpackage.pl:282
 msgid "PGP support is deprecated (see README.feature-removal-schedule)"
 msgstr ""
 "Поддержка PGP будет исключена (смотрите README.feature-removal-schedule)"
 
 #: scripts/dpkg-buildpackage.pl:301
-#, perl-format
-msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
-msgstr "%s: экспорт %s из dpkg-buildflags (происхождение: %s): %s\n"
-
-#: scripts/dpkg-buildpackage.pl:310
 msgid "source package"
 msgstr "пакет исходных текстов"
 
-#: scripts/dpkg-buildpackage.pl:311
+#: scripts/dpkg-buildpackage.pl:302
 msgid "source version"
 msgstr "версия исходных текстов"
 
-#: scripts/dpkg-buildpackage.pl:321
+#: scripts/dpkg-buildpackage.pl:312
 msgid "source changed by"
 msgstr "исходные тексты изменены"
 
-#: scripts/dpkg-buildpackage.pl:339
+#: scripts/dpkg-buildpackage.pl:330
 msgid "host architecture"
 msgstr "архитектура узла"
 
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:343
 msgid "debian/rules is not executable: fixing that."
 msgstr "debian/rules не является исполняемым: исправляется."
 
-#: scripts/dpkg-buildpackage.pl:371
+#: scripts/dpkg-buildpackage.pl:362
 msgid "Build dependencies/conflicts unsatisfied; aborting."
 msgstr "Неудовлетворительные зависимости/конфликты при сборке, останов."
 
-#: scripts/dpkg-buildpackage.pl:372
+#: scripts/dpkg-buildpackage.pl:363
 msgid "(Use -d flag to override.)"
 msgstr "(Используйте параметр -d, чтобы продолжить сборку.)"
 
-#: scripts/dpkg-buildpackage.pl:375
+#: scripts/dpkg-buildpackage.pl:366
 msgid "This is currently a non-fatal warning with -S, but"
 msgstr "В данный момент с -S это только предупреждение, но,"
 
-#: scripts/dpkg-buildpackage.pl:376
+#: scripts/dpkg-buildpackage.pl:367
 msgid "will probably become fatal in the future."
 msgstr "вероятно, станет останавливающей ошибкой в будущем."
 
-#: scripts/dpkg-buildpackage.pl:398
+#: scripts/dpkg-buildpackage.pl:389
 msgid ""
 "it is a bad idea to generate a source package without cleaning up first, it "
 "might contain undesired files."
@@ -418,63 +429,63 @@
 "не очень хорошая мысль генерировать пакет исходного кода без предварительной "
 "очистки; могут добавиться нежелательные файлы."
 
-#: scripts/dpkg-buildpackage.pl:411
+#: scripts/dpkg-buildpackage.pl:402
 msgid "Press the return key to start signing process\n"
 msgstr "Нажмите любую клавишу для запуска процесс подписывания\n"
 
-#: scripts/dpkg-buildpackage.pl:418
+#: scripts/dpkg-buildpackage.pl:409
 msgid "Failed to sign .dsc and .changes file"
 msgstr "Отказ при подписывании файлов .dsc и .changes"
 
-#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:437
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:424 scripts/dpkg-buildpackage.pl:428
+#: scripts/dpkg-buildpackage.pl:441
 msgid "write changes file"
 msgstr "запись файла изменений"
 
-#: scripts/dpkg-buildpackage.pl:449
+#: scripts/dpkg-buildpackage.pl:440
 msgid "dpkg-genchanges"
 msgstr "dpkg-genchanges"
 
-#: scripts/dpkg-buildpackage.pl:458
+#: scripts/dpkg-buildpackage.pl:449
 msgid "source only upload: Debian-native package"
 msgstr "закачка только пакетов исходного кода: родной пакет Debian"
 
-#: scripts/dpkg-buildpackage.pl:460
+#: scripts/dpkg-buildpackage.pl:451
 msgid "source only, diff-only upload (original source NOT included)"
 msgstr ""
 "закачка только пакета исходного кода и diff (пакет оригинального исходного "
 "кода НЕ включён)"
 
-#: scripts/dpkg-buildpackage.pl:462
+#: scripts/dpkg-buildpackage.pl:453
 msgid "source only upload (original source is included)"
 msgstr ""
 "закачка только пакета исходного кода и diff (с пакетом оригинального "
 "исходного кода)"
 
-#: scripts/dpkg-buildpackage.pl:465 scripts/dpkg-buildpackage.pl:473
+#: scripts/dpkg-buildpackage.pl:456 scripts/dpkg-buildpackage.pl:464
 msgid "full upload (original source is included)"
 msgstr "закачка всего (с пакетом оригинального исходного кода)"
 
-#: scripts/dpkg-buildpackage.pl:467
+#: scripts/dpkg-buildpackage.pl:458
 msgid "binary only upload (no source included)"
 msgstr "закачка только двоичных пакетов (без пакетов исходного кода)"
 
-#: scripts/dpkg-buildpackage.pl:469
+#: scripts/dpkg-buildpackage.pl:460
 msgid "full upload; Debian-native package (full source is included)"
 msgstr ""
 "закачка всего; родной пакет Debian (включены все пакеты исходного кода)"
 
-#: scripts/dpkg-buildpackage.pl:471
+#: scripts/dpkg-buildpackage.pl:462
 msgid "binary and diff upload (original source NOT included)"
 msgstr ""
 "закачка только двоичных пакетов и diff (без пакетов оригинального исходного "
 "кода)"
 
-#: scripts/dpkg-buildpackage.pl:478
+#: scripts/dpkg-buildpackage.pl:469
 msgid "Failed to sign .changes file"
 msgstr "Отказ при подписывании файла .changes"
 
-#: scripts/dpkg-buildpackage.pl:497
+#: scripts/dpkg-buildpackage.pl:488
 #, perl-format
 msgid "unable to determine %s"
 msgstr "невозможно определить %s"
@@ -524,7 +535,7 @@
 msgid "%s: Build conflicts: "
 msgstr "%s: Сборочные конфликты: "
 
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:236
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:253
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "ошибка при анализе %s"
@@ -562,27 +573,27 @@
 msgid "filename, section and priority may contain no whitespace"
 msgstr "имя файла, секция и приоритет не могут содержать пробельных символов"
 
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:334
 msgid "open new files list file"
 msgstr "открытие нового файла со списком файлов"
 
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:345
 msgid "copy old entry to new files list file"
 msgstr "копирование старой записи в новый файл со списком файлов"
 
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:349
 msgid "read old files list file"
 msgstr "чтение старого файла со списком файлов"
 
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:359
 msgid "write new entry to new files list file"
 msgstr "запись новой записи в новый файл со списком файлов"
 
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:360
 msgid "close new files list file"
 msgstr "закрытие нового файла со списком файлов"
 
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:361
 msgid "install new files list file"
 msgstr "установка нового файла с списком файлов"
 
@@ -742,7 +753,7 @@
 msgid "missing Priority for source files"
 msgstr "отсутствует Priority для файлов с исходным кодом"
 
-#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:327
+#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:346
 #: scripts/Dpkg/Vendor.pm:71
 #, perl-format
 msgid "%s is empty"
@@ -768,13 +779,13 @@
 msgid "write original source message"
 msgstr "запись оригинального исходного сообщения"
 
-#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:426
+#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:532
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "отсутствует информация о критическом поле вывода %s"
 
 #: scripts/dpkg-genchanges.pl:499 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:431
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:537
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "отсутствует информация о поле вывода %s"
@@ -909,33 +920,41 @@
 msgid "chdir for du to `%s'"
 msgstr "вызов chdir для du в «%s»"
 
-#: scripts/dpkg-gencontrol.pl:304 scripts/dpkg-shlibdeps.pl:843
+#: scripts/dpkg-gencontrol.pl:305 scripts/dpkg-shlibdeps.pl:843
 #: scripts/Dpkg/IPC.pm:271 scripts/Dpkg/Shlibs/Cppfilt.pm:50
 #, fuzzy, perl-format
 #| msgid "unable to execute c++filt"
 msgid "unable to execute %s"
 msgstr "невозможно выполнить c++filt"
 
-#: scripts/dpkg-gencontrol.pl:311
+#: scripts/dpkg-gencontrol.pl:312
 #, perl-format
 msgid "du in `%s'"
 msgstr "вызов du в «%s»"
 
-#: scripts/dpkg-gencontrol.pl:313
+#: scripts/dpkg-gencontrol.pl:314
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr "du выдала неожиданные данные «%s»"
 
-#: scripts/dpkg-gencontrol.pl:346
+#: scripts/dpkg-gencontrol.pl:347
 msgid "close old files list file"
 msgstr "закрытие старого файла с списком файлов"
 
-#: scripts/dpkg-gencontrol.pl:368
+#: scripts/dpkg-gencontrol.pl:369
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "не удалось открыть новый выходной управляющий файл %s"
 
-#: scripts/dpkg-gencontrol.pl:379
+#: scripts/dpkg-gencontrol.pl:378 scripts/dpkg-shlibdeps.pl:523
+#: scripts/Dpkg/Interface/Storable.pm:91
+#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
+#: scripts/Dpkg/Source/Package/V2.pm:607
+#, perl-format
+msgid "cannot close %s"
+msgstr "не удалось закрыть %s"
+
+#: scripts/dpkg-gencontrol.pl:380
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "не удалось установить новый выходной управляющий файл «%s»"
@@ -1058,11 +1077,15 @@
 msgstr "некоторые символы или шаблоны исчезли из файла symbols: %s"
 
 #: scripts/dpkg-gensymbols.pl:291
+msgid "the generated symbols file is empty"
+msgstr ""
+
+#: scripts/dpkg-gensymbols.pl:293
 #, perl-format
 msgid "%s doesn't match completely %s"
 msgstr "%s совпадает не полностью с %s"
 
-#: scripts/dpkg-gensymbols.pl:294
+#: scripts/dpkg-gensymbols.pl:296
 #, perl-format
 msgid "no debian/symbols file used as basis for generating %s"
 msgstr "файл debian/symbols не используется в качестве основы для генерации %s"
@@ -1099,19 +1122,20 @@
 "  -h, --help -?            показать это сообщение.\n"
 "      --version            показать версию.\n"
 
-#: scripts/dpkg-mergechangelogs.pl:129
+#: scripts/dpkg-mergechangelogs.pl:129 scripts/dpkg-mergechangelogs.pl:131
 #: scripts/Dpkg/Compression/FileHandle.pm:385
 #: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
 #: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Functions.pm:78
-#: scripts/Dpkg/Source/Package.pm:347 scripts/Dpkg/Source/Package.pm:444
-#: scripts/Dpkg/Source/Package/V2.pm:210 scripts/Dpkg/Source/Package/V2.pm:477
-#: scripts/Dpkg/Source/Package/V2.pm:522
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:224
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:323
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:333
+#: scripts/Dpkg/Source/Package.pm:447 scripts/Dpkg/Source/Package.pm:550
+#: scripts/Dpkg/Source/Package/V2.pm:217 scripts/Dpkg/Source/Package/V2.pm:530
+#: scripts/Dpkg/Source/Package/V2.pm:605
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:226
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:234
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:341
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:351
 #, perl-format
 msgid "cannot write %s"
 msgstr "не удалось записать %s"
@@ -1160,7 +1184,7 @@
 #: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:138 scripts/Dpkg/Arch.pm:157
 #: scripts/Dpkg/Arch.pm:176 scripts/Dpkg/Changelog/Parse.pm:142
 #: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:138
+#: scripts/Dpkg/Source/Package.pm:193
 #, perl-format
 msgid "cannot open %s"
 msgstr "не удалось открыть %s"
@@ -1299,8 +1323,9 @@
 "    --all                  включить все изменения\n"
 
 #: scripts/dpkg-parsechangelog.pl:117
-#, perl-format
-msgid "%s takes no non-option arguments"
+#, fuzzy
+#| msgid "%s takes no non-option arguments"
+msgid "takes no non-option arguments"
 msgstr "%s не принимает необязательные параметры"
 
 #: scripts/dpkg-scanpackages.pl:66
@@ -1353,8 +1378,10 @@
 msgid "Unconditional maintainer override for %s"
 msgstr "Безусловное переназначение сопровождающего для %s"
 
-#: scripts/dpkg-scanpackages.pl:158
-msgid "1 to 3 args expected"
+#: scripts/dpkg-scanpackages.pl:158 scripts/dpkg-scansources.pl:302
+#, fuzzy
+#| msgid "1 to 3 args expected"
+msgid "one to three arguments expected"
 msgstr "ожидается от 1 до 3 аргументов"
 
 #: scripts/dpkg-scanpackages.pl:175
@@ -1517,10 +1544,6 @@
 msgid "no binary packages specified in %s"
 msgstr "не задано двоичное поле в %s"
 
-#: scripts/dpkg-scansources.pl:302
-msgid "1 to 3 args expected\n"
-msgstr "ожидается от 1 до 3 аргументов\n"
-
 #: scripts/dpkg-shlibdeps.pl:93
 #, perl-format
 msgid "administrative directory '%s' does not exist"
@@ -1773,126 +1796,157 @@
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "неизвестный вывод от dpkg --search: «%s»"
 
-#: scripts/dpkg-source.pl:100
+#: scripts/dpkg-source.pl:104
 #, perl-format
 msgid "%s needs a directory"
 msgstr "для %s требуется каталог"
 
-#: scripts/dpkg-source.pl:103
+#: scripts/dpkg-source.pl:110
 #, perl-format
 msgid "cannot stat directory %s"
 msgstr "не удалось выполнить функцию stat для каталога %s"
 
-#: scripts/dpkg-source.pl:105
+#: scripts/dpkg-source.pl:112
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr "значение параметра каталога %s не является каталогом"
 
-#: scripts/dpkg-source.pl:123
+#: scripts/dpkg-source.pl:117 scripts/Dpkg/Source/Package/V2.pm:476
+#: scripts/Dpkg/Source/Package/V2.pm:478 scripts/Dpkg/Source/Package/V2.pm:480
+#: scripts/Dpkg/Source/Package/V2.pm:482
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
+#: scripts/Dpkg/Source/Package/V3/git.pm:104
+#: scripts/Dpkg/Source/Package/V3/git.pm:143
+#: scripts/Dpkg/Source/Package/V3/git.pm:155
+#: scripts/Dpkg/Source/Package/V3/git.pm:174
+#, perl-format
+msgid "unable to chdir to `%s'"
+msgstr "невозможно выполнить chdir в «%s»"
+
+#: scripts/dpkg-source.pl:135
 #, perl-format
 msgid "using options from %s: %s"
 msgstr "используются параметры из %s: %s"
 
-#: scripts/dpkg-source.pl:138 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:150 scripts/Dpkg/Compression.pm:173
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "неподдерживаемый метод сжатия %s"
 
-#: scripts/dpkg-source.pl:144 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:156 scripts/Dpkg/Compression.pm:202
 #: scripts/Dpkg/Compression/Process.pm:86
 #, perl-format
 msgid "%s is not a compression level"
 msgstr "%s не является степенью сжатия"
 
-#: scripts/dpkg-source.pl:199
-msgid "need a command (-x, -b, --before-build, --after-build, --print-format)"
+#: scripts/dpkg-source.pl:214
+#, fuzzy
+#| msgid ""
+#| "need a command (-x, -b, --before-build, --after-build, --print-format)"
+msgid ""
+"need a command (-x, -b, --before-build, --after-build, --print-format, --"
+"commit)"
 msgstr ""
 "необходима команда (-x, -b, --before-build, --after-build, --print-format)"
 
-#: scripts/dpkg-source.pl:268
+#: scripts/dpkg-source.pl:238
+#, perl-format
+msgid "%s doesn't contain any information about the source package"
+msgstr ""
+
+#: scripts/dpkg-source.pl:283
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "«%s» не является разрешённой строкой архитектуры"
 
-#: scripts/dpkg-source.pl:271
+#: scripts/dpkg-source.pl:286
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 "архитектура %s должна быть только из указанных в пакете (список для пакета "
 "%s: «%s»)"
 
-#: scripts/dpkg-source.pl:324 scripts/Dpkg/BuildFlags.pm:190
+#: scripts/dpkg-source.pl:301
+#, fuzzy, perl-format
+#| msgid "diff `%s' doesn't contain any patch"
+msgid "%s doesn't list any binary package"
+msgstr "diff «%s» не содержит заплатки"
+
+#: scripts/dpkg-source.pl:343 scripts/Dpkg/BuildFlags.pm:270
 #: scripts/Dpkg/Compression/FileHandle.pm:401
 #: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:122
-#: scripts/Dpkg/Source/Package/V2.pm:360 scripts/Dpkg/Source/Package/V2.pm:505
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:276
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:330
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:377
+#: scripts/Dpkg/Source/Package/V2.pm:277 scripts/Dpkg/Source/Package/V2.pm:425
+#: scripts/Dpkg/Source/Package/V2.pm:561
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:112
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:286
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:348
 #, perl-format
 msgid "cannot read %s"
 msgstr "не удалось прочитать %s"
 
-#: scripts/dpkg-source.pl:331
+#: scripts/dpkg-source.pl:350
 #, perl-format
 msgid "no source format specified in %s, see dpkg-source(1)"
 msgstr "не задан формат исходников в %s, см. dpkg-source(1)"
 
-#: scripts/dpkg-source.pl:356
+#: scripts/dpkg-source.pl:378
 #, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr "невозможно собрать с форматом исходника «%s»: %s"
 
-#: scripts/dpkg-source.pl:359
+#: scripts/dpkg-source.pl:381
 #, perl-format
 msgid "using source format `%s'"
 msgstr "используется формат исходника «%s»"
 
-#: scripts/dpkg-source.pl:366 scripts/Dpkg/Source/Package/V1.pm:300
-#: scripts/Dpkg/Source/Package/V1.pm:345 scripts/Dpkg/Source/Package/V2.pm:488
+#: scripts/dpkg-source.pl:388 scripts/Dpkg/Source/Package/V1.pm:301
+#: scripts/Dpkg/Source/Package/V1.pm:346 scripts/Dpkg/Source/Package/V2.pm:541
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
-#: scripts/Dpkg/Source/Package/V3/native.pm:83
+#: scripts/Dpkg/Source/Package/V3/native.pm:84
 #, perl-format
 msgid "building %s in %s"
 msgstr "сборка %s в %s"
 
-#: scripts/dpkg-source.pl:377
+#: scripts/dpkg-source.pl:399
 msgid "-x needs at least one argument, the .dsc"
 msgstr "-x требует указания хотя бы одного значения .dsc"
 
-#: scripts/dpkg-source.pl:380
+#: scripts/dpkg-source.pl:402
 msgid "-x takes no more than two arguments"
 msgstr "-x может иметь не более двух значений"
 
-#: scripts/dpkg-source.pl:384
+#: scripts/dpkg-source.pl:406
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr "-x принимает .dsc файл первым значением, а не каталог"
 
-#: scripts/dpkg-source.pl:400
+#: scripts/dpkg-source.pl:422
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "цель распаковки существует: %s"
 
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:432
 #, perl-format
 msgid "%s doesn't contain a valid OpenPGP signature"
 msgstr "%s не содержит корректной подписи OpenPGP"
 
-#: scripts/dpkg-source.pl:412
+#: scripts/dpkg-source.pl:434
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "распаковка неподписанного пакета с исходным кодом (%s)"
 
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:441
 #, perl-format
 msgid "extracting %s in %s"
 msgstr "извлечение %s в %s"
 
-#: scripts/dpkg-source.pl:427
+#: scripts/dpkg-source.pl:449
 msgid "only one of -x, -b or --print-format allowed, and only once"
 msgstr "разрешено что-то одно: -x, -b или --print-format и только один раз"
 
-#: scripts/dpkg-source.pl:435
+#: scripts/dpkg-source.pl:457
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson\n"
@@ -1904,8 +1958,17 @@
 "Copyright (C) 1997 Klee Dienes\n"
 "Copyright (C) 2008 Raphael Hertzog"
 
-#: scripts/dpkg-source.pl:448
-#, perl-format
+#: scripts/dpkg-source.pl:470
+#, fuzzy, perl-format
+#| msgid ""
+#| "Usage: %s [<option> ...] <command>\n"
+#| "\n"
+#| "Commands:\n"
+#| "  -x <filename>.dsc [<output-dir>]\n"
+#| "                           extract source package.\n"
+#| "  -b <dir>                 build source package.\n"
+#| "  --print-format <dir>     print the source format that would be\n"
+#| "                           used to build the source package."
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -1914,7 +1977,9 @@
 "                           extract source package.\n"
 "  -b <dir>                 build source package.\n"
 "  --print-format <dir>     print the source format that would be\n"
-"                           used to build the source package."
+"                           used to build the source package.\n"
+"  --commit [<dir> [<patch-name>]]\n"
+"                           store upstream changes in a new patch."
 msgstr ""
 "Использование: %s [<параметр> ...] <команда>\n"
 "\n"
@@ -1925,7 +1990,7 @@
 "  --print-format <кат>     вывести формат исходника, который\n"
 "                           использовался бы для сборки пакета исходного кода."
 
-#: scripts/dpkg-source.pl:457
+#: scripts/dpkg-source.pl:481
 #, perl-format
 msgid ""
 "Build options:\n"
@@ -1965,7 +2030,7 @@
 "  -z<степень>              степень сжатия (по умолчанию: %d,\n"
 "                             поддерживаются: 1-9, best, fast)"
 
-#: scripts/dpkg-source.pl:475
+#: scripts/dpkg-source.pl:499
 msgid ""
 "Extract options:\n"
 "  --no-copy                don't copy .orig tarballs\n"
@@ -1980,7 +2045,7 @@
 "                              перед распаковкой\n"
 "  --require-valid-signature   прерваться, если нет корректной подписи"
 
-#: scripts/dpkg-source.pl:480
+#: scripts/dpkg-source.pl:504
 msgid ""
 "General options:\n"
 "  -h, --help               show this help message.\n"
@@ -1990,7 +2055,7 @@
 "  -h, --help               показать это сообщение.\n"
 "      --version            показать версию."
 
-#: scripts/dpkg-source.pl:484
+#: scripts/dpkg-source.pl:508
 msgid ""
 "More options are available but they depend on the source package format.\n"
 "See dpkg-source(1) for more info."
@@ -2077,12 +2142,12 @@
 msgstr "<стандартный ввод>"
 
 #: scripts/changelog/debian.pl:136
-msgid "fatal error occured while parsing input"
+msgid "fatal error occurred while parsing input"
 msgstr "неустранимая ошибка при анализе входных данных"
 
 #: scripts/changelog/debian.pl:139
 #, perl-format
-msgid "fatal error occured while parsing %s"
+msgid "fatal error occurred while parsing %s"
 msgstr "неустранимая ошибка при анализе %s"
 
 #: scripts/Dpkg/Arch.pm:86
@@ -2101,17 +2166,17 @@
 "Неизвестный gcc тип системы %s, переход к использованию значения по "
 "умолчанию (родная компиляция)"
 
-#: scripts/Dpkg/BuildFlags.pm:198
+#: scripts/Dpkg/BuildFlags.pm:278
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
 msgstr "в строке %d из %s упомянут неизвестный флаг %s"
 
-#: scripts/Dpkg/BuildFlags.pm:207
+#: scripts/Dpkg/BuildFlags.pm:291
 #, perl-format
 msgid "line %d of %s is invalid, it has been ignored."
 msgstr "неправильная строка %d из %s, она будет проигнорирована."
 
-#: scripts/Dpkg/BuildOptions.pm:91
+#: scripts/Dpkg/BuildOptions.pm:94
 #, perl-format
 msgid "invalid flag in %s: %s"
 msgstr "неправильный флаг в %s: %s"
@@ -2370,9 +2435,10 @@
 msgstr "получена версия changelog"
 
 #: scripts/Dpkg/Control.pm:156 scripts/Dpkg/Control.pm:158
-#, perl-format
-msgid "entry of APT's %s file"
-msgstr "элемент APT файла %s"
+#, fuzzy, perl-format
+#| msgid "entry in dpkg's status file"
+msgid "entry in repository's %s file"
+msgstr "элемент в файле состояния dpkg"
 
 #: scripts/Dpkg/Control.pm:160 scripts/Dpkg/Control.pm:164
 #, perl-format
@@ -2404,8 +2470,10 @@
 msgid "first block lacks a source field"
 msgstr "в первом блоке отсутствует поле исходника"
 
-#: scripts/Dpkg/Control/Info.pm:110
-msgid "block lacks a package field"
+#: scripts/Dpkg/Control/Info.pm:110 scripts/Dpkg/Control/Info.pm:113
+#, fuzzy, perl-format
+#| msgid "block lacks a package field"
+msgid "block lacks the '%s' field"
 msgstr "в блоке отсутствует поле пакета"
 
 #: scripts/Dpkg/Control/Hash.pm:172
@@ -2479,17 +2547,11 @@
 msgid "%s failed with unknown exit code %d"
 msgstr "%s завершился неудачно с неизвестным кодом выхода %d"
 
-#: scripts/Dpkg/ErrorHandling.pm:113
+#: scripts/Dpkg/ErrorHandling.pm:115
 #, perl-format
 msgid "syntax error in %s at line %d: %s"
 msgstr "синтаксическая ошибка в %s в строке %d: %s"
 
-#: scripts/Dpkg/Interface/Storable.pm:91
-#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
-#, perl-format
-msgid "cannot close %s"
-msgstr "не удалось закрыть %s"
-
 #: scripts/Dpkg/IPC.pm:211 scripts/Dpkg/IPC.pm:217 scripts/Dpkg/IPC.pm:223
 #, perl-format
 msgid "pipe for %s"
@@ -2585,8 +2647,8 @@
 msgid "cannot create directory %s"
 msgstr "не удалось создать каталог %s"
 
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:231
-#: scripts/Dpkg/Source/Package/V2.pm:192
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:307
+#: scripts/Dpkg/Source/Package/V2.pm:199
 #, perl-format
 msgid "cannot opendir %s"
 msgstr "не удалось выполнить opendir %s"
@@ -2622,7 +2684,7 @@
 msgid "cannot read timestamp from %s"
 msgstr "не удалось изменить метку времени для %s"
 
-#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:378
+#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:443
 msgid "binary file contents changed"
 msgstr "содержимое двоичного файла изменено"
 
@@ -2696,7 +2758,7 @@
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr "специальные права %04o для «%s» не будут включёны в diff"
 
-#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:377
+#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:442
 #, perl-format
 msgid "cannot represent change to %s: %s"
 msgstr "не удалось представить изменение %s: %s"
@@ -2743,7 +2805,7 @@
 msgstr "ни один из имён файлов в ---/+++ не связаны с diff «%s» (строка %d)"
 
 #: scripts/Dpkg/Source/Patch.pm:410
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:127
 #, perl-format
 msgid "%s contains an insecure path: %s"
 msgstr "%s содержит небезопасный путь: %s"
@@ -2808,7 +2870,7 @@
 msgid "nonexistent"
 msgstr "несуществующий"
 
-#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:358
+#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:458
 #, perl-format
 msgid "cannot stat %s"
 msgstr "не удалось выполнить функцию stat %s"
@@ -2842,17 +2904,17 @@
 msgid "named socket"
 msgstr "именованный сокет"
 
-#: scripts/Dpkg/Source/Package.pm:133
+#: scripts/Dpkg/Source/Package.pm:188
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr "%s не является именем файла"
 
-#: scripts/Dpkg/Source/Package.pm:153
+#: scripts/Dpkg/Source/Package.pm:208
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "отсутствует критическое управляющее поле исходников %s"
 
-#: scripts/Dpkg/Source/Package.pm:181
+#: scripts/Dpkg/Source/Package.pm:236
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
@@ -2860,117 +2922,123 @@
 "формат пакета с исходным кодом «%s» не поддерживается (требуется Perl модуль "
 "%s)"
 
-#: scripts/Dpkg/Source/Package.pm:185
+#: scripts/Dpkg/Source/Package.pm:240
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr "неправильное поле Format «%s»"
 
-#: scripts/Dpkg/Source/Package.pm:212
+#: scripts/Dpkg/Source/Package.pm:288
 msgid "source and version are required to compute the source basename"
 msgstr "для определения базового имени исходника требуется исходник и версия"
 
-#: scripts/Dpkg/Source/Package.pm:278 scripts/Dpkg/Source/Package.pm:280
+#: scripts/Dpkg/Source/Package.pm:371 scripts/Dpkg/Source/Package.pm:373
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "проверка подписи для %s завершилась неудачно"
 
-#: scripts/Dpkg/Source/Package.pm:287 scripts/Dpkg/Source/Package.pm:289
+#: scripts/Dpkg/Source/Package.pm:380 scripts/Dpkg/Source/Package.pm:382
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr "невозможно проверить подпись для %s, так как gpg не установлена"
 
-#: scripts/Dpkg/Source/Package.pm:298
+#: scripts/Dpkg/Source/Package.pm:391
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr "%s не является допустимым параметром для %s"
 
-#: scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Package.pm:460
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s не существует"
 
-#: scripts/Dpkg/Source/Package.pm:364
+#: scripts/Dpkg/Source/Package.pm:464
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "не удалось сделать %s исполняемым"
 
-#: scripts/Dpkg/Source/Package.pm:366
+#: scripts/Dpkg/Source/Package.pm:466
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "%s не является простым файлом"
 
-#: scripts/Dpkg/Source/Package/V1.pm:61
+#: scripts/Dpkg/Source/Package.pm:517
+#, fuzzy, perl-format
+#| msgid "can't build with source format '%s': %s"
+msgid "'%s' is not supported by the source format '%s'"
+msgstr "невозможно собрать с форматом исходника «%s»: %s"
+
+#: scripts/Dpkg/Source/Package/V1.pm:62
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr "параметр -s%s заменит ранее указанный параметр -s%s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:83
+#: scripts/Dpkg/Source/Package/V1.pm:84
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr "указывать обработчик исходников -s%s не разрешено вместе с -x"
 
-#: scripts/Dpkg/Source/Package/V1.pm:95
-#: scripts/Dpkg/Source/Package/V3/native.pm:50
+#: scripts/Dpkg/Source/Package/V1.pm:96
+#: scripts/Dpkg/Source/Package/V3/native.pm:51
 msgid "multiple tarfiles in v1.0 source package"
 msgstr "несколько tar-файлов в пакете с исходным кодом версии v1.0"
 
-#: scripts/Dpkg/Source/Package/V1.pm:100 scripts/Dpkg/Source/Package/V2.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:101 scripts/Dpkg/Source/Package/V2.pm:129
 #, perl-format
 msgid "unrecognized file for a %s source package: %s"
 msgstr "нераспознанный файл в пакете с исходным кодом %s: %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:105
-#: scripts/Dpkg/Source/Package/V3/native.pm:57
+#: scripts/Dpkg/Source/Package/V1.pm:106
+#: scripts/Dpkg/Source/Package/V3/native.pm:58
 msgid "no tarfile in Files field"
 msgstr "нет tar-файла в поле Files"
 
-#: scripts/Dpkg/Source/Package/V1.pm:108
+#: scripts/Dpkg/Source/Package/V1.pm:109
 msgid "native package with .orig.tar"
 msgstr "родной пакет с .orig.tar"
 
-#: scripts/Dpkg/Source/Package/V1.pm:121
+#: scripts/Dpkg/Source/Package/V1.pm:122
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr "невозможно переименовать «%s» в «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:125 scripts/Dpkg/Source/Package/V2.pm:134
-#: scripts/Dpkg/Source/Package/V2.pm:146 scripts/Dpkg/Source/Package/V2.pm:159
+#: scripts/Dpkg/Source/Package/V1.pm:126 scripts/Dpkg/Source/Package/V2.pm:141
+#: scripts/Dpkg/Source/Package/V2.pm:153 scripts/Dpkg/Source/Package/V2.pm:166
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:190
-#: scripts/Dpkg/Source/Package/V3/native.pm:60
+#: scripts/Dpkg/Source/Package/V3/native.pm:61
 #, perl-format
 msgid "unpacking %s"
 msgstr "распаковывается %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:132
+#: scripts/Dpkg/Source/Package/V1.pm:133
 msgid "unable to keep orig directory (already exists)"
 msgstr "невозможно сохранить orig каталог (уже существует)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:139
+#: scripts/Dpkg/Source/Package/V1.pm:140
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr "отказ при переименовании только что извлечённого %s в %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:145
+#: scripts/Dpkg/Source/Package/V1.pm:146
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr "отказ при переименовании сохранённого %s в %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:152 scripts/Dpkg/Source/Package/V2.pm:214
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:171
+#: scripts/Dpkg/Source/Package/V1.pm:153 scripts/Dpkg/Source/Package/V2.pm:222
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:172
 #, perl-format
 msgid "applying %s"
 msgstr "накладывается %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:157
+#: scripts/Dpkg/Source/Package/V1.pm:158
 #, perl-format
 msgid "upstream files that have been modified: %s"
 msgstr "авторские файлы были изменены: %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:167
+#: scripts/Dpkg/Source/Package/V1.pm:168
 msgid "only supports gzip compression"
 msgstr "поддерживается только метод сжатия gzip"
 
-#: scripts/Dpkg/Source/Package/V1.pm:178
+#: scripts/Dpkg/Source/Package/V1.pm:179
 msgid ""
 "-b takes at most a directory and an orig source argument (with v1.0 source "
 "package)"
@@ -2978,22 +3046,22 @@
 "значением параметра -b является только каталог и orig исходник (для "
 "исходника пакета v1.0)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:184
+#: scripts/Dpkg/Source/Package/V1.pm:185
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr "тип работы с исходниками -s%s нельзя указывать вместе с -b"
 
-#: scripts/Dpkg/Source/Package/V1.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:200
 #, perl-format
 msgid "packed orig `%s' exists but is not a plain file"
 msgstr "упакованный orig «%s» существует, но не является простым файлом"
 
-#: scripts/Dpkg/Source/Package/V1.pm:211
+#: scripts/Dpkg/Source/Package/V1.pm:212
 #, perl-format
 msgid "cannot stat orig argument %s"
 msgstr "не удалось выполнить функцию stat для orig параметра %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:217
+#: scripts/Dpkg/Source/Package/V1.pm:218
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -3002,7 +3070,7 @@
 "orig параметр распакован, но вызываются методы -s%s как для упакованных "
 "исходников (.orig.tar.<расш>)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:225
+#: scripts/Dpkg/Source/Package/V1.pm:226
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -3011,12 +3079,12 @@
 "orig параметр упакован, но вызываются методы -s%s как для распакованных "
 "исходников (.orig/)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:230
+#: scripts/Dpkg/Source/Package/V1.pm:231
 #, perl-format
 msgid "orig argument %s is not a plain file or directory"
 msgstr "orig параметр %s не является обычным файлом или каталогом"
 
-#: scripts/Dpkg/Source/Package/V1.pm:236
+#: scripts/Dpkg/Source/Package/V1.pm:237
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s"
@@ -3025,32 +3093,32 @@
 "orig параметр пуст (то есть не orig и не diff), но указана команда что-то "
 "сделать -s%s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:249
+#: scripts/Dpkg/Source/Package/V1.pm:250
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr "существует распакованный orig «%s», но не является каталогом"
 
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:255
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr ""
 "невозможно выполнить функцию stat для предполагаемого распакованного orig "
 "«%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:264
 #, perl-format
 msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
 msgstr ""
 "каталог исходников «%s» не в виде <пакет исходников>-<оригинальная версия> "
 "«%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:273
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ""
 "имя каталога .orig %s не в виде <пакет>-<оригинальная версия> (требуется %s)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:281
+#: scripts/Dpkg/Source/Package/V1.pm:282
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
@@ -3058,7 +3126,7 @@
 "имя .orig.tar %s не в виде <пакет>_<оригинальная версия>.orig.tar (требуется "
 "%s)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:293
+#: scripts/Dpkg/Source/Package/V1.pm:294
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
@@ -3067,30 +3135,31 @@
 "tar-файл «%s» уже существует, не перезаписывается, останов; используйте -sU "
 "или -sR для перезаписи"
 
-#: scripts/Dpkg/Source/Package/V1.pm:297
+#: scripts/Dpkg/Source/Package/V1.pm:298
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr "невозможно проверить существование «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:312 scripts/Dpkg/Source/Package/V1.pm:374
-#: scripts/Dpkg/Source/Package/V3/native.pm:96
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V1.pm:375
+#: scripts/Dpkg/Source/Package/V3/native.pm:98
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr "невозможно переименовать «%s» (недавно созданный) в «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:315 scripts/Dpkg/Source/Package/V1.pm:377
-#: scripts/Dpkg/Source/Package/V2.pm:461
-#: scripts/Dpkg/Source/Package/V3/native.pm:99
+#: scripts/Dpkg/Source/Package/V1.pm:316 scripts/Dpkg/Source/Package/V1.pm:378
+#: scripts/Dpkg/Source/Package/V2.pm:603
+#: scripts/Dpkg/Source/Package/V3/native.pm:102
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:367
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr "невозможно изменить права «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:317 scripts/Dpkg/Source/Package/V2.pm:330
+#: scripts/Dpkg/Source/Package/V1.pm:318 scripts/Dpkg/Source/Package/V2.pm:348
 #, perl-format
 msgid "building %s using existing %s"
 msgstr "сборка %s с использованием существующего %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:326
+#: scripts/Dpkg/Source/Package/V1.pm:327
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
@@ -3099,17 +3168,17 @@
 "каталог orig «%s» уже существует, не перезаписан, останов; используйте -sA, -"
 "sK или -sP для перезаписи"
 
-#: scripts/Dpkg/Source/Package/V1.pm:334
+#: scripts/Dpkg/Source/Package/V1.pm:335
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr "невозможно проверить существование orig каталога «%s»"
 
-#: scripts/Dpkg/Source/Package/V1.pm:365
+#: scripts/Dpkg/Source/Package/V1.pm:366
 #, perl-format
 msgid "the diff modifies the following upstream files: %s"
 msgstr "diff изменяет следующие авторские файлы: %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:367
+#: scripts/Dpkg/Source/Package/V1.pm:368
 msgid ""
 "use the '3.0 (quilt)' format to have separate and documented changes to "
 "upstream files, see dpkg-source(1)"
@@ -3117,67 +3186,80 @@
 "используется формат «3.0 (quilt)» для разделения и описания изменений "
 "авторских файлов, см dpkg-source(1)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:369 scripts/Dpkg/Source/Package/V2.pm:465
+#: scripts/Dpkg/Source/Package/V1.pm:370
 msgid "aborting due to --abort-on-upstream-changes"
 msgstr "прерывание работы из-за --abort-on-upstream-changes"
 
-#: scripts/Dpkg/Source/Package/V1.pm:387
+#: scripts/Dpkg/Source/Package/V1.pm:388
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr "%s: нехарактерные изменения в исходнике"
 
-#: scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V2.pm:119
 #, perl-format
 msgid "duplicate files in %s source package: %s.*"
 msgstr "повторение файла в пакете с исходным кодом %s: %s.*"
 
-#: scripts/Dpkg/Source/Package/V2.pm:128
+#: scripts/Dpkg/Source/Package/V2.pm:135
 msgid "missing orig.tar or debian.tar file in v2.0 source package"
 msgstr ""
 "отсутствует файл orig.tar или debian.tar в пакете с исходным кодом версии "
 "v2.0"
 
-#: scripts/Dpkg/Source/Package/V2.pm:148
+#: scripts/Dpkg/Source/Package/V2.pm:155
 #, perl-format
 msgid "required removal of `%s' installed by original tarball"
 msgstr "требуется удаление «%s», установленного из оригинального tarball"
 
-#: scripts/Dpkg/Source/Package/V2.pm:232
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:245
+#: scripts/Dpkg/Source/Package/V2.pm:240
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
 #, perl-format
 msgid "unapplying %s"
 msgstr "отмена наложений на %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:246 scripts/Dpkg/Source/Package/V2.pm:328
-msgid "no orig.tar file found"
-msgstr "файл orig.tar не найден"
+#: scripts/Dpkg/Source/Package/V2.pm:263 scripts/Dpkg/Source/Package/V2.pm:344
+#, perl-format
+msgid "no upstream tarball found at %s"
+msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:285
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:310
-msgid ""
-"patches have not been applied, applying them now (use --no-preparation to "
-"override)"
+#: scripts/Dpkg/Source/Package/V2.pm:314
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:329
+#, fuzzy
+#| msgid ""
+#| "patches have not been applied, applying them now (use --no-preparation to "
+#| "override)"
+msgid "patches are not applied, applying them now"
 msgstr ""
 "заплаты не были наложены, делаем это сейчас (используйте --no-preparation, "
 "чтобы не выполнять этого)"
 
-#: scripts/Dpkg/Source/Package/V2.pm:295
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
-#: scripts/Dpkg/Source/Package/V3/native.pm:75
-#, perl-format
-msgid "-b takes only one parameter with format `%s'"
-msgstr "значением параметра -b является только один аргумент в формате «%s»"
-
-#: scripts/Dpkg/Source/Package/V2.pm:315
+#: scripts/Dpkg/Source/Package/V2.pm:331
 #, perl-format
 msgid "several orig.tar files found (%s and %s) but only one is allowed"
 msgstr "найдено несколько файлов orig.tar (%s и %s), но может быть только один"
 
-#: scripts/Dpkg/Source/Package/V2.pm:351
+#: scripts/Dpkg/Source/Package/V2.pm:370
 msgid "copy of the debian directory"
 msgstr "копирование каталога debian"
 
-#: scripts/Dpkg/Source/Package/V2.pm:379
+#: scripts/Dpkg/Source/Package/V2.pm:388
+msgid "unrepresentable changes to source"
+msgstr "нехарактерные изменения в исходнике"
+
+#: scripts/Dpkg/Source/Package/V2.pm:391
+#, fuzzy
+#| msgid "local changes stored in %s, the modified files are:"
+msgid "local changes detected, the modified files are:"
+msgstr "локальные изменения сохранены в %s, изменённые файлы:"
+
+#: scripts/Dpkg/Source/Package/V2.pm:410
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
+#: scripts/Dpkg/Source/Package/V3/native.pm:76
+#, perl-format
+msgid "-b takes only one parameter with format `%s'"
+msgstr "значением параметра -b является только один аргумент в формате «%s»"
+
+#: scripts/Dpkg/Source/Package/V2.pm:444
 #, perl-format
 msgid ""
 "add %s in debian/source/include-binaries if you want to store the modified "
@@ -3186,12 +3268,12 @@
 "добавьте %s в debian/source/include-binaries, если хотите хранить изменённый "
 "двоичный файл в debian tarball"
 
-#: scripts/Dpkg/Source/Package/V2.pm:393
+#: scripts/Dpkg/Source/Package/V2.pm:458
 #, perl-format
 msgid "unwanted binary file: %s"
 msgstr "нежелательный двоичный файл: %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:422
+#: scripts/Dpkg/Source/Package/V2.pm:493
 #, perl-format
 msgid ""
 "detected %d unwanted binary file (add it in debian/source/include-binaries "
@@ -3209,30 +3291,56 @@
 "обнаружено %d нежелательных двоичных файлов (чтобы разрешить включение, "
 "добавьте их в debian/source/include-binaries)."
 
-#: scripts/Dpkg/Source/Package/V2.pm:442
-msgid "unrepresentable changes to source"
-msgstr "нехарактерные изменения в исходнике"
-
-#: scripts/Dpkg/Source/Package/V2.pm:446 scripts/Dpkg/Source/Package/V2.pm:450
+#: scripts/Dpkg/Source/Package/V2.pm:508
 #, perl-format
-msgid "cannot remove %s"
-msgstr "не удалось удалить %s"
+msgid "you can integrate the local changes with %s"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V2.pm:510
+#, fuzzy, perl-format
+#| msgid "aborting due to --abort-on-upstream-changes"
+msgid "aborting due to unexpected upstream changes, see %s"
+msgstr "прерывание работы из-за --abort-on-upstream-changes"
 
-#: scripts/Dpkg/Source/Package/V2.pm:453
+#: scripts/Dpkg/Source/Package/V2.pm:520 scripts/Dpkg/Source/Package/V2.pm:653
 #, perl-format
-msgid "local changes stored in %s, the modified files are:"
-msgstr "локальные изменения сохранены в %s, изменённые файлы:"
+msgid "local changes have been recorded in a new patch: %s"
+msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm:459
+#: scripts/Dpkg/Source/Package/V2.pm:524 scripts/Dpkg/Source/Package/V2.pm:609
+#: scripts/Dpkg/Source/Package/V2.pm:637 scripts/Dpkg/Source/Package/V2.pm:651
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:369
 #, perl-format
-msgid "cannot rename %s to %s"
-msgstr "не удалось переименовать %s в %s"
+msgid "cannot remove %s"
+msgstr "не удалось удалить %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:481
+#: scripts/Dpkg/Source/Package/V2.pm:534
 #, perl-format
 msgid "adding %s to %s"
 msgstr "добавляется %s в %s"
 
+#: scripts/Dpkg/Source/Package/V2.pm:601
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:365
+#, fuzzy, perl-format
+#| msgid "failed to rename saved %s to %s"
+msgid "failed to copy %s to %s"
+msgstr "отказ при переименовании сохранённого %s в %s"
+
+#: scripts/Dpkg/Source/Package/V2.pm:624
+#, perl-format
+msgid "cannot register changes in %s, this patch already exists"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V2.pm:638
+#, fuzzy
+#| msgid "unrepresentable changes to source"
+msgid "there are no local changes to record"
+msgstr "нехарактерные изменения в исходнике"
+
+#: scripts/Dpkg/Source/Package/V2.pm:643
+msgid "Enter the desired patch name: "
+msgstr ""
+
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:52
 msgid ""
 "This source package can only be manipulated using bzr, which is not in the "
@@ -3263,18 +3371,6 @@
 msgid "doesn't contain a bzr repository"
 msgstr "не содержит репозитория bzr"
 
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
-#: scripts/Dpkg/Source/Package/V3/git.pm:104
-#: scripts/Dpkg/Source/Package/V3/git.pm:143
-#: scripts/Dpkg/Source/Package/V3/git.pm:155
-#: scripts/Dpkg/Source/Package/V3/git.pm:174
-#, perl-format
-msgid "unable to chdir to `%s'"
-msgstr "невозможно выполнить chdir в «%s»"
-
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:127
 msgid "bzr status exited nonzero"
 msgstr "команда bzr status завершилась с ненулевым кодом выхода"
@@ -3310,7 +3406,7 @@
 msgid "--target-format option is missing"
 msgstr "отсутствует параметр --target-format"
 
-#: scripts/Dpkg/Source/Package/V3/native.pm:53
+#: scripts/Dpkg/Source/Package/V3/native.pm:54
 #, perl-format
 msgid "unrecognized file for a native source package: %s"
 msgstr "нераспознанный файл для родного пакета с исходным кодом: %s"
@@ -3382,17 +3478,17 @@
 msgid "setting up shallow clone"
 msgstr "настройка поверхностного клона"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:72
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:73
 #, perl-format
 msgid "%s should be a directory or non-existing"
 msgstr "%s должен быть каталогом или не существовать"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:78
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:79
 #, perl-format
 msgid "%s should be a file or non-existing"
 msgstr "%s должен быть файлом или не существовать"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:119
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:120
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
@@ -3401,18 +3497,18 @@
 "файл series (%s) содержит неподдерживаемые параметры («%s», строка %s), у "
 "dpkg-source может не получиться наложить заплатки."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:137
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:138
 #, perl-format
 msgid "cannot mkdir %s"
 msgstr "не удалось выполнить mkdir %s"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:212
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "не удалось создать символьную ссылку %s"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:284
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:287
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:294
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:297
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr "неподдерживаемая версия метаданных quilt: %s"
@@ -3452,6 +3548,17 @@
 msgid "source package has two conflicting values - %s and %s"
 msgstr "пакет с исходным кодом содержит два конфликтующих значения: %s и %s"
 
+#: scripts/Dpkg/Vendor/Debian.pm:106
+#, fuzzy, perl-format
+#| msgid "unknown key-value %s"
+msgid "unknown hardening feature: %s"
+msgstr "неизвестный ключ-значение %s"
+
+#: scripts/Dpkg/Vendor/Debian.pm:110
+#, perl-format
+msgid "incorrect value in hardening option of DEB_BUILD_MAINT_OPTIONS: %s"
+msgstr ""
+
 #: scripts/Dpkg/Vendor/Ubuntu.pm:61 scripts/Dpkg/Vendor/Ubuntu.pm:63
 msgid ""
 "Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu "
@@ -3468,11 +3575,11 @@
 "Номер Version предполагает изменения Ubuntu, но нет поля XSBC-Original-"
 "Maintainer"
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:119
+#: scripts/Dpkg/Vendor/Ubuntu.pm:123
 msgid "'hardening' flag found but 'hardening-wrapper' not installed"
 msgstr "найден флаг «hardening», но «hardening-wrapper» не установлен"
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:138
+#: scripts/Dpkg/Vendor/Ubuntu.pm:142
 #, perl-format
 msgid "overriding %s in environment: %s"
 msgstr "в окружении заменяется %s: %s"
@@ -3482,20 +3589,46 @@
 msgid "%s is not a valid version"
 msgstr "%s не является допустимой версией"
 
-#: scripts/Dpkg/Version.pm:368
+#: scripts/Dpkg/Version.pm:371
 msgid "version number cannot be empty"
 msgstr "номер версии не может быть пустым"
 
-#: scripts/Dpkg/Version.pm:373
+#: scripts/Dpkg/Version.pm:376
+#, fuzzy
+#| msgid "version number cannot be empty"
+msgid "version number does not start with digit"
+msgstr "номер версии не может быть пустым"
+
+#: scripts/Dpkg/Version.pm:381
 #, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr "номер версии содержит недопустимый символ «%s»"
 
-#: scripts/Dpkg/Version.pm:379
+#: scripts/Dpkg/Version.pm:386
 #, perl-format
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr "часть эпохи в номере версии не является числом: «%s»"
 
+#, fuzzy
+#~| msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
+#~ msgid "%s: dpkg-buildflags (origin: %s): %s = %s\n"
+#~ msgstr "%s: экспорт %s из dpkg-buildflags (происхождение: %s): %s\n"
+
+#~ msgid "1 to 3 args expected\n"
+#~ msgstr "ожидается от 1 до 3 аргументов\n"
+
+#~ msgid "need an action option"
+#~ msgstr "необходим параметр действия"
+
+#~ msgid "entry of APT's %s file"
+#~ msgstr "элемент APT файла %s"
+
+#~ msgid "no orig.tar file found"
+#~ msgstr "файл orig.tar не найден"
+
+#~ msgid "cannot rename %s to %s"
+#~ msgstr "не удалось переименовать %s в %s"
+
 #~ msgid "exec %s"
 #~ msgstr "вызов exec для %s"
 
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/stamp-po /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/stamp-po
--- dpkg/scripts/po/stamp-po	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/stamp-po	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1 @@
+timestamp
Binary files dpkg/scripts/po/sv.gmo and /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/sv.gmo differ
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/po/sv.po /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/sv.po
--- dpkg/scripts/po/sv.po	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/po/sv.po	2012-06-07 10:11:09.426073000 -0700
@@ -1,30 +1,30 @@
 # Swedish translation of dpkg
-# Copyright © 2007-2010 Software in the Public Interest
+# Copyright © 2007-2011 Software in the Public Interest
 # This file is distributed under the same license as the dpkg package.
-# Peter Krefting <peterk@debian.org>, 2007-2010.
+# Peter Krefting <peterk@debian.org>, 2007-2011, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.15.8\n"
+"Project-Id-Version: dpkg 1.16.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-04-02 00:59+0200\n"
-"PO-Revision-Date: 2010-08-31 20:33+0100\n"
+"POT-Creation-Date: 2011-11-25 11:21+0100\n"
+"PO-Revision-Date: 2011-09-11 09:54+0100\n"
 "Last-Translator: Peter Krefting <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/dpkg-architecture.pl:36 scripts/dpkg-buildflags.pl:31
-#: scripts/dpkg-buildpackage.pl:38 scripts/dpkg-checkbuilddeps.pl:36
+#: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
 #: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:96
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
 #: scripts/dpkg-mergechangelogs.pl:53 scripts/dpkg-name.pl:46
 #: scripts/dpkg-parsechangelog.pl:31 scripts/dpkg-scanpackages.pl:60
 #: scripts/dpkg-scansources.pl:78 scripts/dpkg-shlibdeps.pl:533
-#: scripts/dpkg-source.pl:433 scripts/changelog/debian.pl:34
+#: scripts/dpkg-source.pl:455 scripts/changelog/debian.pl:34
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s version %s.\n"
@@ -40,10 +40,10 @@
 "Copyright © 2004-2005 Scott James Remnant <scott@netsplit.com>."
 
 #: scripts/dpkg-architecture.pl:42 scripts/dpkg-buildflags.pl:36
-#: scripts/dpkg-buildpackage.pl:45 scripts/dpkg-distaddfile.pl:38
+#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:38
 #: scripts/dpkg-genchanges.pl:102 scripts/dpkg-gencontrol.pl:62
 #: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
-#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:440
+#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:462
 #: scripts/changelog/debian.pl:39
 msgid ""
 "\n"
@@ -97,7 +97,7 @@
 "  --help             visa detta hjälpmeddelande.\n"
 "  --version          visa versionsnummer.\n"
 
-#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:84
+#: scripts/dpkg-architecture.pl:120 scripts/dpkg-buildflags.pl:91
 #: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:194
 #: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
 #: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:119
@@ -142,10 +142,10 @@
 #: scripts/dpkg-buildflags.pl:33
 msgid ""
 "\n"
-"Copyright (C) 2010 Raphael Hertzog <hertzog@debian.org>."
+"Copyright (C) 2010-2011 Raphael Hertzog <hertzog@debian.org>."
 msgstr ""
 "\n"
-"Copyright © 2010 Raphael Hertzog <hertzog@debian.org>."
+"Copyright © 2010-2011 Raphael Hertzog <hertzog@debian.org>."
 
 #: scripts/dpkg-buildflags.pl:44
 #, perl-format
@@ -158,9 +158,11 @@
 "                     value is one of vendor, system, user, env.\n"
 "  --list             output a list of the flags supported by the current "
 "vendor.\n"
-"  --export=(sh|make) output commands to be executed in shell or make that "
-"export\n"
-"                     all the compilation flags as environment variables.\n"
+"  --export=(sh|make|configure)\n"
+"                     output something convenient to import the\n"
+"                     compilation flags in a shell script, in make,\n"
+"                     or on a ./configure command line.\n"
+"  --dump             output all compilation flags with their values\n"
 "  --help             show this help message.\n"
 "  --version          show the version.\n"
 msgstr ""
@@ -172,28 +174,26 @@
 "                     värdet är ett av vendor, system, user, env.\n"
 "  --list             skriv ut lista med flaggor som stöds av aktuell "
 "leverantör.\n"
-"  --export=(sh|make) skriv ut kommandon att exekvera i skal eller make som\n"
-"                     exporterar alla kompileringsflaggor som "
-"miljövariabler.\n"
-"  --help            visa detta hjälpmeddelande.\n"
-"  --version         visa versionsnummer.\n"
+"  --export=(sh|make|configure)\n"
+"                     skriv ut något som kan användas för att importera\n"
+"                     kompileringsflaggor i ett skalskript, i make,\n"
+"                     eller på en ./configure-kommandorad\n"
+"  --dump             skriv ut alla kompileringsflaggor och deras värden.\n"
+"  --help             visa detta hjälpmeddelande.\n"
+"  --version          visa versionsnummer.\n"
 
-#: scripts/dpkg-buildflags.pl:63 scripts/dpkg-buildflags.pl:69
-#: scripts/dpkg-buildflags.pl:74
+#: scripts/dpkg-buildflags.pl:66 scripts/dpkg-buildflags.pl:72
+#: scripts/dpkg-buildflags.pl:77 scripts/dpkg-buildflags.pl:81
 #, perl-format
 msgid "two commands specified: --%s and --%s"
 msgstr "två kommandon angavs: --%s och --%s"
 
-#: scripts/dpkg-buildflags.pl:67
+#: scripts/dpkg-buildflags.pl:70
 #, perl-format
 msgid "%s needs a parameter"
 msgstr "%s behöver en parameter"
 
-#: scripts/dpkg-buildflags.pl:88
-msgid "need an action option"
-msgstr "åtgärd krävs"
-
-#: scripts/dpkg-buildpackage.pl:40
+#: scripts/dpkg-buildpackage.pl:39
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -205,7 +205,7 @@
 "Copyright © 2000 Wichert Akkerman.\n"
 "Copyright © 2007 Frank Lichtenheld."
 
-#: scripts/dpkg-buildpackage.pl:52
+#: scripts/dpkg-buildpackage.pl:51
 #, perl-format
 msgid ""
 "\n"
@@ -315,29 +315,29 @@
 "  -h, --help     visa detta hjälpmeddelande.\n"
 "      --version  visa versionsnummer.\n"
 
-#: scripts/dpkg-buildpackage.pl:201 scripts/dpkg-buildpackage.pl:207
-#: scripts/dpkg-buildpackage.pl:213 scripts/dpkg-buildpackage.pl:219
-#: scripts/dpkg-buildpackage.pl:224 scripts/dpkg-genchanges.pl:143
+#: scripts/dpkg-buildpackage.pl:200 scripts/dpkg-buildpackage.pl:206
+#: scripts/dpkg-buildpackage.pl:212 scripts/dpkg-buildpackage.pl:218
+#: scripts/dpkg-buildpackage.pl:223 scripts/dpkg-genchanges.pl:143
 #: scripts/dpkg-genchanges.pl:146 scripts/dpkg-genchanges.pl:150
 #: scripts/dpkg-genchanges.pl:154
 #, perl-format
 msgid "cannot combine %s and %s"
 msgstr "kan inte kombinera %s och %s"
 
-#: scripts/dpkg-buildpackage.pl:237 scripts/dpkg-source.pl:187
+#: scripts/dpkg-buildpackage.pl:236 scripts/dpkg-source.pl:202
 msgid "-E and -W are deprecated, they are without effect"
 msgstr "-E och -W rekommenderas ej, de har ingen effekt"
 
-#: scripts/dpkg-buildpackage.pl:241
+#: scripts/dpkg-buildpackage.pl:240
 #, perl-format
 msgid "unknown option or argument %s"
 msgstr "okänd flagga eller argument %s"
 
-#: scripts/dpkg-buildpackage.pl:251
+#: scripts/dpkg-buildpackage.pl:250
 msgid "using a gain-root-command while being root"
 msgstr "använder ett gain-root-command fast jag redan är root"
 
-#: scripts/dpkg-buildpackage.pl:257
+#: scripts/dpkg-buildpackage.pl:256
 msgid ""
 "fakeroot not found, either install the fakeroot\n"
 "package, specify a command with the -r option, or run this as root"
@@ -345,61 +345,56 @@
 "fakeroot hittades inte, du kan installera paketet fakeroot,\n"
 "ange ett kommando med flaggan -r, eller köra som root"
 
-#: scripts/dpkg-buildpackage.pl:261
+#: scripts/dpkg-buildpackage.pl:260
 #, perl-format
 msgid "gain-root-commmand '%s' not found"
 msgstr "få-root-kommandot \"%s\" hittades inte"
 
-#: scripts/dpkg-buildpackage.pl:280
+#: scripts/dpkg-buildpackage.pl:279
 msgid "unknown sign command, assuming pgp style interface"
 msgstr "okänt signeringskommando, antar pgp-gränssnittstyp"
 
-#: scripts/dpkg-buildpackage.pl:283
+#: scripts/dpkg-buildpackage.pl:282
 msgid "PGP support is deprecated (see README.feature-removal-schedule)"
 msgstr "PGP-stödet undanbes (se README.feature-removal-schedule)"
 
 #: scripts/dpkg-buildpackage.pl:301
-#, perl-format
-msgid "%s: export %s from dpkg-buildflags (origin: %s): %s\n"
-msgstr "%s: exportera %s från dpkg-buildflags (källa: %s): %s\n"
-
-#: scripts/dpkg-buildpackage.pl:310
 msgid "source package"
 msgstr "källkodspaket"
 
-#: scripts/dpkg-buildpackage.pl:311
+#: scripts/dpkg-buildpackage.pl:302
 msgid "source version"
 msgstr "källkodsversion"
 
-#: scripts/dpkg-buildpackage.pl:321
+#: scripts/dpkg-buildpackage.pl:312
 msgid "source changed by"
 msgstr "källkod ändrad av"
 
-#: scripts/dpkg-buildpackage.pl:339
+#: scripts/dpkg-buildpackage.pl:330
 msgid "host architecture"
 msgstr "värdarkitektur"
 
-#: scripts/dpkg-buildpackage.pl:352
+#: scripts/dpkg-buildpackage.pl:343
 msgid "debian/rules is not executable: fixing that."
 msgstr "debian/rules är inte exekverbar: rättar."
 
-#: scripts/dpkg-buildpackage.pl:371
+#: scripts/dpkg-buildpackage.pl:362
 msgid "Build dependencies/conflicts unsatisfied; aborting."
 msgstr "Byggberoenden/-konflikter ej uppfyllda; avbryter."
 
-#: scripts/dpkg-buildpackage.pl:372
+#: scripts/dpkg-buildpackage.pl:363
 msgid "(Use -d flag to override.)"
 msgstr "(Använd flaggan -d för att överstyra.)"
 
-#: scripts/dpkg-buildpackage.pl:375
+#: scripts/dpkg-buildpackage.pl:366
 msgid "This is currently a non-fatal warning with -S, but"
 msgstr "Detta är för närvarande en icke-ödesdiger varning med -S, men"
 
-#: scripts/dpkg-buildpackage.pl:376
+#: scripts/dpkg-buildpackage.pl:367
 msgid "will probably become fatal in the future."
 msgstr "den kommer troligen att bli ödesdiger i framtiden."
 
-#: scripts/dpkg-buildpackage.pl:398
+#: scripts/dpkg-buildpackage.pl:389
 msgid ""
 "it is a bad idea to generate a source package without cleaning up first, it "
 "might contain undesired files."
@@ -407,57 +402,57 @@
 "det är inte någon bra idé att generera ett källkodspaket utan att först "
 "städa upp det, det kan innehålla oönskade filer."
 
-#: scripts/dpkg-buildpackage.pl:411
+#: scripts/dpkg-buildpackage.pl:402
 msgid "Press the return key to start signing process\n"
 msgstr "Tryck på Enter för att inleda signeringsproceduren\n"
 
-#: scripts/dpkg-buildpackage.pl:418
+#: scripts/dpkg-buildpackage.pl:409
 msgid "Failed to sign .dsc and .changes file"
 msgstr "Misslyckades att signera .dsc- och .changes-filerna"
 
-#: scripts/dpkg-buildpackage.pl:433 scripts/dpkg-buildpackage.pl:437
-#: scripts/dpkg-buildpackage.pl:450
+#: scripts/dpkg-buildpackage.pl:424 scripts/dpkg-buildpackage.pl:428
+#: scripts/dpkg-buildpackage.pl:441
 msgid "write changes file"
 msgstr "skriv ändringsfil"
 
-#: scripts/dpkg-buildpackage.pl:449
+#: scripts/dpkg-buildpackage.pl:440
 msgid "dpkg-genchanges"
 msgstr "dpkg-genchanges"
 
-#: scripts/dpkg-buildpackage.pl:458
+#: scripts/dpkg-buildpackage.pl:449
 msgid "source only upload: Debian-native package"
 msgstr "insändning med endast källkod: Debianeget paket"
 
-#: scripts/dpkg-buildpackage.pl:460
+#: scripts/dpkg-buildpackage.pl:451
 msgid "source only, diff-only upload (original source NOT included)"
 msgstr ""
 "insändning enbart med källkod, enbart med diff (originalkällkod tas EJ med)"
 
-#: scripts/dpkg-buildpackage.pl:462
+#: scripts/dpkg-buildpackage.pl:453
 msgid "source only upload (original source is included)"
 msgstr "insändning enbart med källkod (originalkällkod tas med)"
 
-#: scripts/dpkg-buildpackage.pl:465 scripts/dpkg-buildpackage.pl:473
+#: scripts/dpkg-buildpackage.pl:456 scripts/dpkg-buildpackage.pl:464
 msgid "full upload (original source is included)"
 msgstr "komplett insändning (originalkällkod tas med)"
 
-#: scripts/dpkg-buildpackage.pl:467
+#: scripts/dpkg-buildpackage.pl:458
 msgid "binary only upload (no source included)"
 msgstr "endast binär insändning (ingen källkod tas med)"
 
-#: scripts/dpkg-buildpackage.pl:469
+#: scripts/dpkg-buildpackage.pl:460
 msgid "full upload; Debian-native package (full source is included)"
 msgstr "komplett insändnig; Debianeget paket (komplett källkod tas med)"
 
-#: scripts/dpkg-buildpackage.pl:471
+#: scripts/dpkg-buildpackage.pl:462
 msgid "binary and diff upload (original source NOT included)"
 msgstr "binär- och diffinsändning (originalkällkod tas EJ med)"
 
-#: scripts/dpkg-buildpackage.pl:478
+#: scripts/dpkg-buildpackage.pl:469
 msgid "Failed to sign .changes file"
 msgstr "Misslyckades att signera .changes-fil"
 
-#: scripts/dpkg-buildpackage.pl:497
+#: scripts/dpkg-buildpackage.pl:488
 #, perl-format
 msgid "unable to determine %s"
 msgstr "kan inte bestämma %s"
@@ -507,7 +502,7 @@
 msgid "%s: Build conflicts: "
 msgstr "%s: Byggkonflikter: "
 
-#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:236
+#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:253
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "fel vid tolkning av %s"
@@ -545,27 +540,27 @@
 msgid "filename, section and priority may contain no whitespace"
 msgstr "filnamn, sektion och prioritet kan inte innehålla blanktecken"
 
-#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:333
+#: scripts/dpkg-distaddfile.pl:79 scripts/dpkg-gencontrol.pl:334
 msgid "open new files list file"
 msgstr "öppnar ny fillistfil"
 
-#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:344
+#: scripts/dpkg-distaddfile.pl:84 scripts/dpkg-gencontrol.pl:345
 msgid "copy old entry to new files list file"
 msgstr "kopiera gammal post till ny fillistfil"
 
-#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:348
+#: scripts/dpkg-distaddfile.pl:87 scripts/dpkg-gencontrol.pl:349
 msgid "read old files list file"
 msgstr "läs gammal fillistfil"
 
-#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:358
+#: scripts/dpkg-distaddfile.pl:90 scripts/dpkg-gencontrol.pl:359
 msgid "write new entry to new files list file"
 msgstr "skriv ny post i ny fillistfil"
 
-#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:359
+#: scripts/dpkg-distaddfile.pl:91 scripts/dpkg-gencontrol.pl:360
 msgid "close new files list file"
 msgstr "stäng ny fillistfil"
 
-#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:360
+#: scripts/dpkg-distaddfile.pl:93 scripts/dpkg-gencontrol.pl:361
 msgid "install new files list file"
 msgstr "installerar ny fillistfil"
 
@@ -717,7 +712,7 @@
 msgid "missing Priority for source files"
 msgstr "\"Priority\" saknas för källfiler"
 
-#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:327
+#: scripts/dpkg-genchanges.pl:398 scripts/dpkg-source.pl:346
 #: scripts/Dpkg/Vendor.pm:71
 #, perl-format
 msgid "%s is empty"
@@ -743,13 +738,13 @@
 msgid "write original source message"
 msgstr "skriver meddelande om originalkällkod"
 
-#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:426
+#: scripts/dpkg-genchanges.pl:494 scripts/Dpkg/Source/Package.pm:532
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "saknar information för kritiskt utdatafält %s"
 
 #: scripts/dpkg-genchanges.pl:499 scripts/dpkg-gencontrol.pl:272
-#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:431
+#: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:537
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "saknar information för utdatafält %s"
@@ -879,33 +874,40 @@
 msgid "chdir for du to `%s'"
 msgstr "chdir för du till \"%s\""
 
-#: scripts/dpkg-gencontrol.pl:304 scripts/dpkg-shlibdeps.pl:843
+#: scripts/dpkg-gencontrol.pl:305 scripts/dpkg-shlibdeps.pl:843
 #: scripts/Dpkg/IPC.pm:271 scripts/Dpkg/Shlibs/Cppfilt.pm:50
-#, fuzzy, perl-format
-#| msgid "unable to execute c++filt"
+#, perl-format
 msgid "unable to execute %s"
-msgstr "kan inte exekvera c++filt"
+msgstr "kan inte exekvera %s"
 
-#: scripts/dpkg-gencontrol.pl:311
+#: scripts/dpkg-gencontrol.pl:312
 #, perl-format
 msgid "du in `%s'"
 msgstr "du i \"%s\""
 
-#: scripts/dpkg-gencontrol.pl:313
+#: scripts/dpkg-gencontrol.pl:314
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr "du gav oväntade utdata \"%s\""
 
-#: scripts/dpkg-gencontrol.pl:346
+#: scripts/dpkg-gencontrol.pl:347
 msgid "close old files list file"
 msgstr "stänger gammal fillistfil"
 
-#: scripts/dpkg-gencontrol.pl:368
+#: scripts/dpkg-gencontrol.pl:369
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "kan inte skapa ny utdatastyrfil \"%s\""
 
-#: scripts/dpkg-gencontrol.pl:379
+#: scripts/dpkg-gencontrol.pl:378 scripts/dpkg-shlibdeps.pl:523
+#: scripts/Dpkg/Interface/Storable.pm:91
+#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
+#: scripts/Dpkg/Source/Package/V2.pm:607
+#, perl-format
+msgid "cannot close %s"
+msgstr "kan inte stänga %s"
+
+#: scripts/dpkg-gencontrol.pl:380
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "kan inte installera utdatastyrfil \"%s\""
@@ -1018,11 +1020,15 @@
 msgstr "några symboler eller mönster försvann ur symbolfilen: %s"
 
 #: scripts/dpkg-gensymbols.pl:291
+msgid "the generated symbols file is empty"
+msgstr "den genererade \"symbols\"-filen är tom"
+
+#: scripts/dpkg-gensymbols.pl:293
 #, perl-format
 msgid "%s doesn't match completely %s"
 msgstr "%s stämmer inte helt överens med %s"
 
-#: scripts/dpkg-gensymbols.pl:294
+#: scripts/dpkg-gensymbols.pl:296
 #, perl-format
 msgid "no debian/symbols file used as basis for generating %s"
 msgstr "använde ingen debian/symbols-fil som grund för att generera %s"
@@ -1058,19 +1064,20 @@
 "  --help, -h, -?           visa detta hjälpmeddelande.\n"
 "  --version                visa versionsnummer.\n"
 
-#: scripts/dpkg-mergechangelogs.pl:129
+#: scripts/dpkg-mergechangelogs.pl:129 scripts/dpkg-mergechangelogs.pl:131
 #: scripts/Dpkg/Compression/FileHandle.pm:385
 #: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
 #: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Functions.pm:78
-#: scripts/Dpkg/Source/Package.pm:347 scripts/Dpkg/Source/Package.pm:444
-#: scripts/Dpkg/Source/Package/V2.pm:210 scripts/Dpkg/Source/Package/V2.pm:477
-#: scripts/Dpkg/Source/Package/V2.pm:522
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:141
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:150
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:224
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:323
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:333
+#: scripts/Dpkg/Source/Package.pm:447 scripts/Dpkg/Source/Package.pm:550
+#: scripts/Dpkg/Source/Package/V2.pm:217 scripts/Dpkg/Source/Package/V2.pm:530
+#: scripts/Dpkg/Source/Package/V2.pm:605
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:142
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:151
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:157
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:226
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:234
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:341
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:351
 #, perl-format
 msgid "cannot write %s"
 msgstr "kan inte skriva %s"
@@ -1116,7 +1123,7 @@
 #: scripts/dpkg-name.pl:96 scripts/Dpkg/Arch.pm:138 scripts/Dpkg/Arch.pm:157
 #: scripts/Dpkg/Arch.pm:176 scripts/Dpkg/Changelog/Parse.pm:142
 #: scripts/Dpkg/IPC.pm:247 scripts/Dpkg/Shlibs.pm:78
-#: scripts/Dpkg/Source/Package.pm:138
+#: scripts/Dpkg/Source/Package.pm:193
 #, perl-format
 msgid "cannot open %s"
 msgstr "kan inte öppna %s"
@@ -1255,9 +1262,8 @@
 "    --all                       ta med alla ändringar\n"
 
 #: scripts/dpkg-parsechangelog.pl:117
-#, perl-format
-msgid "%s takes no non-option arguments"
-msgstr "%s tar inga argument som inte är flaggor"
+msgid "takes no non-option arguments"
+msgstr "tar inga argument som inte är flaggor"
 
 #: scripts/dpkg-scanpackages.pl:66
 #, perl-format
@@ -1307,9 +1313,9 @@
 msgid "Unconditional maintainer override for %s"
 msgstr "Ovillkorlig överstyrning från paketansvariga för %s"
 
-#: scripts/dpkg-scanpackages.pl:158
-msgid "1 to 3 args expected"
-msgstr "1 till 3 argument förväntades"
+#: scripts/dpkg-scanpackages.pl:158 scripts/dpkg-scansources.pl:302
+msgid "one to three arguments expected"
+msgstr "ett till tre argument förväntades"
 
 #: scripts/dpkg-scanpackages.pl:175
 #, perl-format
@@ -1469,10 +1475,6 @@
 msgid "no binary packages specified in %s"
 msgstr "inget binärpaket angivet i %s"
 
-#: scripts/dpkg-scansources.pl:302
-msgid "1 to 3 args expected\n"
-msgstr "1 till 3 argument förväntades\n"
-
 #: scripts/dpkg-shlibdeps.pl:93
 #, perl-format
 msgid "administrative directory '%s' does not exist"
@@ -1491,6 +1493,8 @@
 #, perl-format
 msgid "couldn't find library %s needed by %s (ELF format: '%s'; RPATH: '%s')."
 msgstr ""
+"hittade inte biblioteket %s som behövs av %s (ELF-format. \"%s\"; RPATH: \"%s"
+"\")."
 
 #: scripts/dpkg-shlibdeps.pl:262
 #, perl-format
@@ -1547,21 +1551,12 @@
 "(de använder inga av dess symboler)."
 
 #: scripts/dpkg-shlibdeps.pl:431
-#, fuzzy
-#| msgid ""
-#| "couldn't find library %s needed by %s (ELF format: '%s'; RPATH: '%s').\n"
-#| "Note: libraries are not searched in other binary packages that do not "
-#| "have any shlibs or symbols file.\n"
-#| "To help dpkg-shlibdeps find private libraries, you might need to set "
-#| "LD_LIBRARY_PATH."
 msgid ""
 "Note: libraries are not searched in other binary packages that do not have "
 "any shlibs or symbols file.\n"
 "To help dpkg-shlibdeps find private libraries, you might need to set "
 "LD_LIBRARY_PATH."
 msgstr ""
-"hittade inte biblioteket %s som behövs för %s (ELF-format: \"%s\"; RPATH: "
-"\"%s\").\n"
 "Observera: andra binärpaket som inte har shlibs- eller symbols-filer söks "
 "inte genom efter bibliotek.\n"
 "För att hjälpa dpkg-shlibdeps att hitta privata bibliotek måste du kanske "
@@ -1570,8 +1565,8 @@
 #: scripts/dpkg-shlibdeps.pl:434
 msgid "Cannot continue due to the error above."
 msgid_plural "Cannot continue due to the errors listed above."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Kan inte fortsätta på grund av ovanstående fel."
+msgstr[1] "Kan inte fortsätta på grund av ovanstående fel."
 
 #: scripts/dpkg-shlibdeps.pl:445
 #, perl-format
@@ -1716,124 +1711,152 @@
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "okända utdata från dpkg --search: \"%s\""
 
-#: scripts/dpkg-source.pl:100
+#: scripts/dpkg-source.pl:104
 #, perl-format
 msgid "%s needs a directory"
 msgstr "%s behöver en katalog"
 
-#: scripts/dpkg-source.pl:103
+#: scripts/dpkg-source.pl:110
 #, perl-format
 msgid "cannot stat directory %s"
 msgstr "kan inte ta status på katalogen %s"
 
-#: scripts/dpkg-source.pl:105
+#: scripts/dpkg-source.pl:112
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr "katalogargumentet %s är inte en katalog"
 
-#: scripts/dpkg-source.pl:123
+#: scripts/dpkg-source.pl:117 scripts/Dpkg/Source/Package/V2.pm:476
+#: scripts/Dpkg/Source/Package/V2.pm:478 scripts/Dpkg/Source/Package/V2.pm:480
+#: scripts/Dpkg/Source/Package/V2.pm:482
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
+#: scripts/Dpkg/Source/Package/V3/git.pm:104
+#: scripts/Dpkg/Source/Package/V3/git.pm:143
+#: scripts/Dpkg/Source/Package/V3/git.pm:155
+#: scripts/Dpkg/Source/Package/V3/git.pm:174
+#, perl-format
+msgid "unable to chdir to `%s'"
+msgstr "kan inte byta katalog till \"%s\""
+
+#: scripts/dpkg-source.pl:135
 #, perl-format
 msgid "using options from %s: %s"
 msgstr "använder flaggor från %s: %s"
 
-#: scripts/dpkg-source.pl:138 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:150 scripts/Dpkg/Compression.pm:173
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "%s är inte en komprimering som stöds"
 
-#: scripts/dpkg-source.pl:144 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:156 scripts/Dpkg/Compression.pm:202
 #: scripts/Dpkg/Compression/Process.pm:86
 #, perl-format
 msgid "%s is not a compression level"
 msgstr "%s är inte en komprimeringsnivå"
 
-#: scripts/dpkg-source.pl:199
-msgid "need a command (-x, -b, --before-build, --after-build, --print-format)"
+#: scripts/dpkg-source.pl:214
+msgid ""
+"need a command (-x, -b, --before-build, --after-build, --print-format, --"
+"commit)"
 msgstr ""
-"behöver ett kommando (-x, -b, --before-build, --after-build, --print-format)"
+"behöver ett kommando (-x, -b, --before-build, --after-build, --print-format, "
+"--commit)"
+
+#: scripts/dpkg-source.pl:238
+#, perl-format
+msgid "%s doesn't contain any information about the source package"
+msgstr "%s innehåller inte någon information om källkodspaketet"
 
-#: scripts/dpkg-source.pl:268
+#: scripts/dpkg-source.pl:283
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "\"%s\" är inte en giltig arkitektursträng"
 
-#: scripts/dpkg-source.pl:271
+#: scripts/dpkg-source.pl:286
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr "arkitektur %s tillåts inte ensamt (listan för paketet %s är \"%s\")"
 
-#: scripts/dpkg-source.pl:324 scripts/Dpkg/BuildFlags.pm:190
+#: scripts/dpkg-source.pl:301
+#, perl-format
+msgid "%s doesn't list any binary package"
+msgstr "%s räknar inte upp några binärpaket"
+
+#: scripts/dpkg-source.pl:343 scripts/Dpkg/BuildFlags.pm:270
 #: scripts/Dpkg/Compression/FileHandle.pm:401
 #: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:122
-#: scripts/Dpkg/Source/Package/V2.pm:360 scripts/Dpkg/Source/Package/V2.pm:505
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:111
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:276
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:330
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:377
+#: scripts/Dpkg/Source/Package/V2.pm:277 scripts/Dpkg/Source/Package/V2.pm:425
+#: scripts/Dpkg/Source/Package/V2.pm:561
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:112
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:286
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:348
 #, perl-format
 msgid "cannot read %s"
 msgstr "kan inte läsa %s"
 
-#: scripts/dpkg-source.pl:331
+#: scripts/dpkg-source.pl:350
 #, perl-format
 msgid "no source format specified in %s, see dpkg-source(1)"
 msgstr "källkodsformat ej angivet i %s, se dpkg-source(1)"
 
-#: scripts/dpkg-source.pl:356
+#: scripts/dpkg-source.pl:378
 #, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr "kan inte bygga med källkodsformatet \"%s\": %s"
 
-#: scripts/dpkg-source.pl:359
+#: scripts/dpkg-source.pl:381
 #, perl-format
 msgid "using source format `%s'"
 msgstr "använder källkodsformatet \"%s\""
 
-#: scripts/dpkg-source.pl:366 scripts/Dpkg/Source/Package/V1.pm:300
-#: scripts/Dpkg/Source/Package/V1.pm:345 scripts/Dpkg/Source/Package/V2.pm:488
+#: scripts/dpkg-source.pl:388 scripts/Dpkg/Source/Package/V1.pm:301
+#: scripts/Dpkg/Source/Package/V1.pm:346 scripts/Dpkg/Source/Package/V2.pm:541
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
-#: scripts/Dpkg/Source/Package/V3/native.pm:83
+#: scripts/Dpkg/Source/Package/V3/native.pm:84
 #, perl-format
 msgid "building %s in %s"
 msgstr "bygger %s i %s"
 
-#: scripts/dpkg-source.pl:377
+#: scripts/dpkg-source.pl:399
 msgid "-x needs at least one argument, the .dsc"
 msgstr "-x behöver åtminstone ett argument, .dsc-filen"
 
-#: scripts/dpkg-source.pl:380
+#: scripts/dpkg-source.pl:402
 msgid "-x takes no more than two arguments"
 msgstr "-x tar maximalt två argument"
 
-#: scripts/dpkg-source.pl:384
+#: scripts/dpkg-source.pl:406
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr "-x måste ha .dsc-filen som första argument, inte en katalog"
 
-#: scripts/dpkg-source.pl:400
+#: scripts/dpkg-source.pl:422
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "mål för uppackning finns redan: %s"
 
-#: scripts/dpkg-source.pl:410
+#: scripts/dpkg-source.pl:432
 #, perl-format
 msgid "%s doesn't contain a valid OpenPGP signature"
 msgstr "%s innehåller inte en giltig OpenPGP-signatur"
 
-#: scripts/dpkg-source.pl:412
+#: scripts/dpkg-source.pl:434
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "extraherar osignerat källkodspaket (%s)"
 
-#: scripts/dpkg-source.pl:419
+#: scripts/dpkg-source.pl:441
 #, perl-format
 msgid "extracting %s in %s"
 msgstr "extraherar %s i %s"
 
-#: scripts/dpkg-source.pl:427
+#: scripts/dpkg-source.pl:449
 msgid "only one of -x, -b or --print-format allowed, and only once"
 msgstr "endast en av -x, -b och --print-format tillåts, och endast en gång"
 
-#: scripts/dpkg-source.pl:435
+#: scripts/dpkg-source.pl:457
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson\n"
@@ -1845,7 +1868,7 @@
 "Copyright © 1997 Klee Dienes\n"
 "Copyright © 2008 Raphael Hertzog"
 
-#: scripts/dpkg-source.pl:448
+#: scripts/dpkg-source.pl:470
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -1855,7 +1878,9 @@
 "                           extract source package.\n"
 "  -b <dir>                 build source package.\n"
 "  --print-format <dir>     print the source format that would be\n"
-"                           used to build the source package."
+"                           used to build the source package.\n"
+"  --commit [<dir> [<patch-name>]]\n"
+"                           store upstream changes in a new patch."
 msgstr ""
 "Användning: %s [<flagga> ...] <kommando>\n"
 "\n"
@@ -1864,9 +1889,11 @@
 "                           extrahera källkodspaket.\n"
 "  -b <kat>                 bygg källkodspaket.\n"
 "  --print-format <kat>     visa källkodsformatet som skulle användas\n"
-"                           för att bygga källkodspaketet."
+"                           för att bygga källkodspaketet.\n"
+"  --commit [<kat> [<patch-namn>]]\n"
+"                           spara uppströmsändringar som en ny patch."
 
-#: scripts/dpkg-source.pl:457
+#: scripts/dpkg-source.pl:481
 #, perl-format
 msgid ""
 "Build options:\n"
@@ -1909,7 +1936,7 @@
 "                           \"%d\", värden som stöds är: \"1\"-\"9\", \"best"
 "\", \"fast\")"
 
-#: scripts/dpkg-source.pl:475
+#: scripts/dpkg-source.pl:499
 msgid ""
 "Extract options:\n"
 "  --no-copy                don't copy .orig tarballs\n"
@@ -1924,7 +1951,7 @@
 "uppackning\n"
 "  --require-valid-signature avbryt om paketet saknar giltig signatur"
 
-#: scripts/dpkg-source.pl:480
+#: scripts/dpkg-source.pl:504
 msgid ""
 "General options:\n"
 "  -h, --help               show this help message.\n"
@@ -1934,7 +1961,7 @@
 "  -h, --help               visa detta hjälpmeddelande.\n"
 "      --version            visa versionsnummer."
 
-#: scripts/dpkg-source.pl:484
+#: scripts/dpkg-source.pl:508
 msgid ""
 "More options are available but they depend on the source package format.\n"
 "See dpkg-source(1) for more info."
@@ -2020,12 +2047,12 @@
 msgstr "<standard in>"
 
 #: scripts/changelog/debian.pl:136
-msgid "fatal error occured while parsing input"
+msgid "fatal error occurred while parsing input"
 msgstr "ödesdigert fel vid tolkning av indata"
 
 #: scripts/changelog/debian.pl:139
 #, perl-format
-msgid "fatal error occured while parsing %s"
+msgid "fatal error occurred while parsing %s"
 msgstr "ödesdigert fel vid tolkning av %s"
 
 #: scripts/Dpkg/Arch.pm:86
@@ -2043,17 +2070,17 @@
 msgstr ""
 "Okänd gcc-systemtyp %s, faller tillbaka på standard (lokal kompilering)"
 
-#: scripts/Dpkg/BuildFlags.pm:198
+#: scripts/Dpkg/BuildFlags.pm:278
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
 msgstr "rad %d i %s anger okänd flagga %s"
 
-#: scripts/Dpkg/BuildFlags.pm:207
+#: scripts/Dpkg/BuildFlags.pm:291
 #, perl-format
 msgid "line %d of %s is invalid, it has been ignored."
 msgstr "rad %d i %s är ogiltig och har ignorerats."
 
-#: scripts/Dpkg/BuildOptions.pm:91
+#: scripts/Dpkg/BuildOptions.pm:94
 #, perl-format
 msgid "invalid flag in %s: %s"
 msgstr "felaktig flagga i %s: %s"
@@ -2311,8 +2338,8 @@
 
 #: scripts/Dpkg/Control.pm:156 scripts/Dpkg/Control.pm:158
 #, perl-format
-msgid "entry of APT's %s file"
-msgstr "post i APT-filen %s"
+msgid "entry in repository's %s file"
+msgstr "post i arkivets fil %s"
 
 #: scripts/Dpkg/Control.pm:160 scripts/Dpkg/Control.pm:164
 #, perl-format
@@ -2344,9 +2371,10 @@
 msgid "first block lacks a source field"
 msgstr "första blocket saknar source-fält"
 
-#: scripts/Dpkg/Control/Info.pm:110
-msgid "block lacks a package field"
-msgstr "blocket saknar package-fält"
+#: scripts/Dpkg/Control/Info.pm:110 scripts/Dpkg/Control/Info.pm:113
+#, perl-format
+msgid "block lacks the '%s' field"
+msgstr "blocket saknar fältet \"%s\""
 
 #: scripts/Dpkg/Control/Hash.pm:172
 #, perl-format
@@ -2419,17 +2447,11 @@
 msgid "%s failed with unknown exit code %d"
 msgstr "%s misslyckades med okänd felkod %d"
 
-#: scripts/Dpkg/ErrorHandling.pm:113
+#: scripts/Dpkg/ErrorHandling.pm:115
 #, perl-format
 msgid "syntax error in %s at line %d: %s"
 msgstr "syntaxfel i %s på rad %d: %s"
 
-#: scripts/Dpkg/Interface/Storable.pm:91
-#: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
-#, perl-format
-msgid "cannot close %s"
-msgstr "kan inte stänga %s"
-
 #: scripts/Dpkg/IPC.pm:211 scripts/Dpkg/IPC.pm:217 scripts/Dpkg/IPC.pm:223
 #, perl-format
 msgid "pipe for %s"
@@ -2523,8 +2545,8 @@
 msgid "cannot create directory %s"
 msgstr "kan inte skapa katalogen %s"
 
-#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:231
-#: scripts/Dpkg/Source/Package/V2.pm:192
+#: scripts/Dpkg/Source/Archive.pm:145 scripts/Dpkg/Source/Package.pm:307
+#: scripts/Dpkg/Source/Package/V2.pm:199
 #, perl-format
 msgid "cannot opendir %s"
 msgstr "kan inte öppna katalog %s"
@@ -2555,12 +2577,11 @@
 msgstr "kan inte ändra tidsstämpel på %s"
 
 #: scripts/Dpkg/Source/Functions.pm:85
-#, fuzzy, perl-format
-#| msgid "cannot change timestamp for %s"
+#, perl-format
 msgid "cannot read timestamp from %s"
-msgstr "kan inte ändra tidsstämpel på %s"
+msgstr "kan inte läsa tidsstämpel från %s"
 
-#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:378
+#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:443
 msgid "binary file contents changed"
 msgstr "innehåll i binär fil ändrat"
 
@@ -2635,7 +2656,7 @@
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr "specialläget %04o på \"%s\" kommer inte representeras i diffen"
 
-#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:377
+#: scripts/Dpkg/Source/Patch.pm:300 scripts/Dpkg/Source/Package/V2.pm:442
 #, perl-format
 msgid "cannot represent change to %s: %s"
 msgstr "kan inte representera ändringen för %s: %s"
@@ -2676,13 +2697,12 @@
 msgstr "raden efter --- är inte som förväntad i diffen \"%s\" (rad %d)"
 
 #: scripts/Dpkg/Source/Patch.pm:402
-#, fuzzy, perl-format
-#| msgid "none of the filenames in ---/+++ are relative in diff `%s' (line %d)"
+#, perl-format
 msgid "none of the filenames in ---/+++ are valid in diff '%s' (line %d)"
-msgstr "inget av filnamnen i ---/+++ är relativa i diffen \"%s\" (rad %d)"
+msgstr "inget av filnamnen i ---/+++ är giltiga i diffen \"%s\" (rad %d)"
 
 #: scripts/Dpkg/Source/Patch.pm:410
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:126
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:127
 #, perl-format
 msgid "%s contains an insecure path: %s"
 msgstr "%s innehåller en osäker sökväg: %s"
@@ -2746,7 +2766,7 @@
 msgid "nonexistent"
 msgstr "saknas"
 
-#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:358
+#: scripts/Dpkg/Source/Patch.pm:596 scripts/Dpkg/Source/Package.pm:458
 #, perl-format
 msgid "cannot stat %s"
 msgstr "kan inte ta status på %s"
@@ -2780,133 +2800,138 @@
 msgid "named socket"
 msgstr "namngivet uttag"
 
-#: scripts/Dpkg/Source/Package.pm:133
+#: scripts/Dpkg/Source/Package.pm:188
 #, perl-format
 msgid "%s is not the name of a file"
 msgstr "%s är inte namnet på en fil"
 
-#: scripts/Dpkg/Source/Package.pm:153
+#: scripts/Dpkg/Source/Package.pm:208
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "saknar kritiska källkodsstyrfältet %s"
 
-#: scripts/Dpkg/Source/Package.pm:181
+#: scripts/Dpkg/Source/Package.pm:236
 #, perl-format
 msgid ""
 "source package format `%s' is not supported (Perl module %s is required)"
 msgstr "källkodsformatet \"%s\" stöds inte (Perlmodulen %s krävs)"
 
-#: scripts/Dpkg/Source/Package.pm:185
+#: scripts/Dpkg/Source/Package.pm:240
 #, perl-format
 msgid "invalid Format field `%s'"
 msgstr "ogiltigt Format-fält \"%s\""
 
-#: scripts/Dpkg/Source/Package.pm:212
+#: scripts/Dpkg/Source/Package.pm:288
 msgid "source and version are required to compute the source basename"
 msgstr "källkod och version behövs för att beräkna basnamn för källkod"
 
-#: scripts/Dpkg/Source/Package.pm:278 scripts/Dpkg/Source/Package.pm:280
+#: scripts/Dpkg/Source/Package.pm:371 scripts/Dpkg/Source/Package.pm:373
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "misslyckades verifiera signaturen på %s"
 
-#: scripts/Dpkg/Source/Package.pm:287 scripts/Dpkg/Source/Package.pm:289
+#: scripts/Dpkg/Source/Package.pm:380 scripts/Dpkg/Source/Package.pm:382
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr "kunde inte verifiera signaturen på %s eftersom gpg inte installerats"
 
-#: scripts/Dpkg/Source/Package.pm:298
+#: scripts/Dpkg/Source/Package.pm:391
 #, perl-format
 msgid "%s is not a valid option for %s"
 msgstr "%s är inte en giltig flagga för %s"
 
-#: scripts/Dpkg/Source/Package.pm:360
+#: scripts/Dpkg/Source/Package.pm:460
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s finns inte"
 
-#: scripts/Dpkg/Source/Package.pm:364
+#: scripts/Dpkg/Source/Package.pm:464
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "kan inte göra %s exekverbar"
 
-#: scripts/Dpkg/Source/Package.pm:366
+#: scripts/Dpkg/Source/Package.pm:466
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "%s är inte en vanlig fil"
 
-#: scripts/Dpkg/Source/Package/V1.pm:61
+#: scripts/Dpkg/Source/Package.pm:517
+#, perl-format
+msgid "'%s' is not supported by the source format '%s'"
+msgstr "\"%s\" stöds inte av källkodsformatet \"%s\""
+
+#: scripts/Dpkg/Source/Package/V1.pm:62
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr "flaggan -s%s ersätter tidigare flagga -s%s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:83
+#: scripts/Dpkg/Source/Package/V1.pm:84
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr "källkodshanteringstyp -s%s tillåts inte med -x"
 
-#: scripts/Dpkg/Source/Package/V1.pm:95
-#: scripts/Dpkg/Source/Package/V3/native.pm:50
+#: scripts/Dpkg/Source/Package/V1.pm:96
+#: scripts/Dpkg/Source/Package/V3/native.pm:51
 msgid "multiple tarfiles in v1.0 source package"
 msgstr "flera tarfiler i v1.0-källkodspaket"
 
-#: scripts/Dpkg/Source/Package/V1.pm:100 scripts/Dpkg/Source/Package/V2.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:101 scripts/Dpkg/Source/Package/V2.pm:129
 #, perl-format
 msgid "unrecognized file for a %s source package: %s"
 msgstr "okänd fil för ett %s-källkodspaket: %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:105
-#: scripts/Dpkg/Source/Package/V3/native.pm:57
+#: scripts/Dpkg/Source/Package/V1.pm:106
+#: scripts/Dpkg/Source/Package/V3/native.pm:58
 msgid "no tarfile in Files field"
 msgstr "ej tarfil i Files-fältet"
 
-#: scripts/Dpkg/Source/Package/V1.pm:108
+#: scripts/Dpkg/Source/Package/V1.pm:109
 msgid "native package with .orig.tar"
 msgstr "Debianspecifikt paket med .orig.tar"
 
-#: scripts/Dpkg/Source/Package/V1.pm:121
+#: scripts/Dpkg/Source/Package/V1.pm:122
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr "kan inte byta namn på \"%s\" till \"%s\""
 
-#: scripts/Dpkg/Source/Package/V1.pm:125 scripts/Dpkg/Source/Package/V2.pm:134
-#: scripts/Dpkg/Source/Package/V2.pm:146 scripts/Dpkg/Source/Package/V2.pm:159
+#: scripts/Dpkg/Source/Package/V1.pm:126 scripts/Dpkg/Source/Package/V2.pm:141
+#: scripts/Dpkg/Source/Package/V2.pm:153 scripts/Dpkg/Source/Package/V2.pm:166
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:190
-#: scripts/Dpkg/Source/Package/V3/native.pm:60
+#: scripts/Dpkg/Source/Package/V3/native.pm:61
 #, perl-format
 msgid "unpacking %s"
 msgstr "packar upp %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:132
+#: scripts/Dpkg/Source/Package/V1.pm:133
 msgid "unable to keep orig directory (already exists)"
 msgstr "kan inte behålla originalkatalog (finns redan)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:139
+#: scripts/Dpkg/Source/Package/V1.pm:140
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr "misslyckades att ta bort %s, som just extraherats, till %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:145
+#: scripts/Dpkg/Source/Package/V1.pm:146
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr "misslyckades att byta namn på sparad %s till %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:152 scripts/Dpkg/Source/Package/V2.pm:214
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:171
+#: scripts/Dpkg/Source/Package/V1.pm:153 scripts/Dpkg/Source/Package/V2.pm:222
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:172
 #, perl-format
 msgid "applying %s"
 msgstr "tillämpar %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:157
+#: scripts/Dpkg/Source/Package/V1.pm:158
 #, perl-format
 msgid "upstream files that have been modified: %s"
 msgstr "uppströmsfiler som har ändrats: %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:167
+#: scripts/Dpkg/Source/Package/V1.pm:168
 msgid "only supports gzip compression"
 msgstr "stöder endast gzip-komprimering"
 
-#: scripts/Dpkg/Source/Package/V1.pm:178
+#: scripts/Dpkg/Source/Package/V1.pm:179
 msgid ""
 "-b takes at most a directory and an orig source argument (with v1.0 source "
 "package)"
@@ -2914,22 +2939,22 @@
 "-b tar som mest en katalog och en originalkällkod som argument (med v1.0-"
 "källkodspaket)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:184
+#: scripts/Dpkg/Source/Package/V1.pm:185
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr "källkodshanteringstyp -s%s tillåts inte med -b"
 
-#: scripts/Dpkg/Source/Package/V1.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:200
 #, perl-format
 msgid "packed orig `%s' exists but is not a plain file"
 msgstr "packad orig \"%s\" finns men är inte en vanlig fil"
 
-#: scripts/Dpkg/Source/Package/V1.pm:211
+#: scripts/Dpkg/Source/Package/V1.pm:212
 #, perl-format
 msgid "cannot stat orig argument %s"
 msgstr "kunde inte ta status på originalargumentet %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:217
+#: scripts/Dpkg/Source/Package/V1.pm:218
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -2938,7 +2963,7 @@
 "originalargument har packats upp men källkodshanteringstypen -s%s ber om en "
 "packad (.orig.tar.<ändelse>)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:225
+#: scripts/Dpkg/Source/Package/V1.pm:226
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -2947,12 +2972,12 @@
 "originalargument har packats men källkodshanteringstypen -s%s ber om en "
 "uppackad (orig/)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:230
+#: scripts/Dpkg/Source/Package/V1.pm:231
 #, perl-format
 msgid "orig argument %s is not a plain file or directory"
 msgstr "orig-parametern %s är inte en vanlig fil eller katalog"
 
-#: scripts/Dpkg/Source/Package/V1.pm:236
+#: scripts/Dpkg/Source/Package/V1.pm:237
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s"
@@ -2961,35 +2986,35 @@
 "originalargument är tomt (betyder ingen orig, ingen diff) men "
 "källkodshanteringstypen -s%s ber om något"
 
-#: scripts/Dpkg/Source/Package/V1.pm:249
+#: scripts/Dpkg/Source/Package/V1.pm:250
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr "uppackad orig \"%s\" finns men är inte en katalog"
 
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:255
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr "kan inte ta status på förmodad uppackad orig \"%s\""
 
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:264
 #, perl-format
 msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
 msgstr ""
 "källkodskatalog \"%s\" är inte <källkodspaket>-<uppströmsversion> \"%s\""
 
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:273
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ".orig-katalognamnet %s är inte <paket>-<uppströmsversion> (önskade %s)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:281
+#: scripts/Dpkg/Source/Package/V1.pm:282
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
 msgstr ""
 ".orig.tar-namnet %s är inte <paket>_<uppströmsversion>.orig.tar (önskade %s)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:293
+#: scripts/Dpkg/Source/Package/V1.pm:294
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
@@ -2998,30 +3023,31 @@
 "tarfilen \"%s\" finns redan, skriver inte över, ger upp, använd -sU eller -"
 "sR för att överstyra"
 
-#: scripts/Dpkg/Source/Package/V1.pm:297
+#: scripts/Dpkg/Source/Package/V1.pm:298
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr "kunde inte se om \"%s\" existerar"
 
-#: scripts/Dpkg/Source/Package/V1.pm:312 scripts/Dpkg/Source/Package/V1.pm:374
-#: scripts/Dpkg/Source/Package/V3/native.pm:96
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V1.pm:375
+#: scripts/Dpkg/Source/Package/V3/native.pm:98
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr "kunde inte byta namn på \"%s\" (precis skapad) till \"%s\""
 
-#: scripts/Dpkg/Source/Package/V1.pm:315 scripts/Dpkg/Source/Package/V1.pm:377
-#: scripts/Dpkg/Source/Package/V2.pm:461
-#: scripts/Dpkg/Source/Package/V3/native.pm:99
+#: scripts/Dpkg/Source/Package/V1.pm:316 scripts/Dpkg/Source/Package/V1.pm:378
+#: scripts/Dpkg/Source/Package/V2.pm:603
+#: scripts/Dpkg/Source/Package/V3/native.pm:102
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:367
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr "kunde inte ändra beroenden på \"%s\""
 
-#: scripts/Dpkg/Source/Package/V1.pm:317 scripts/Dpkg/Source/Package/V2.pm:330
+#: scripts/Dpkg/Source/Package/V1.pm:318 scripts/Dpkg/Source/Package/V2.pm:348
 #, perl-format
 msgid "building %s using existing %s"
 msgstr "bygger %s med befintlig %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:326
+#: scripts/Dpkg/Source/Package/V1.pm:327
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
@@ -3030,17 +3056,17 @@
 "originalkatalog \"%s\" finns redan, skriver inte över, ger upp; använd -sA, -"
 "sK eller -sP för att överstyra"
 
-#: scripts/Dpkg/Source/Package/V1.pm:334
+#: scripts/Dpkg/Source/Package/V1.pm:335
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr "kan inte se om existerande originalkatalog \"%s\" finns"
 
-#: scripts/Dpkg/Source/Package/V1.pm:365
+#: scripts/Dpkg/Source/Package/V1.pm:366
 #, perl-format
 msgid "the diff modifies the following upstream files: %s"
 msgstr "diffen modifierar följande uppströmsfiler: %s"
 
-#: scripts/Dpkg/Source/Package/V1.pm:367
+#: scripts/Dpkg/Source/Package/V1.pm:368
 msgid ""
 "use the '3.0 (quilt)' format to have separate and documented changes to "
 "upstream files, see dpkg-source(1)"
@@ -3048,65 +3074,70 @@
 "använd formatet \"3.0 (quilt)\" för att ha separata och dokumenterade "
 "ändringar på uppströmsfiler, se dpkg-source(1)"
 
-#: scripts/Dpkg/Source/Package/V1.pm:369 scripts/Dpkg/Source/Package/V2.pm:465
+#: scripts/Dpkg/Source/Package/V1.pm:370
 msgid "aborting due to --abort-on-upstream-changes"
 msgstr "avbryter på grund av --abort-on-upstream-changes"
 
-#: scripts/Dpkg/Source/Package/V1.pm:387
+#: scripts/Dpkg/Source/Package/V1.pm:388
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr "%s: ändring i källkod kan inte representeras"
 
-#: scripts/Dpkg/Source/Package/V2.pm:112
+#: scripts/Dpkg/Source/Package/V2.pm:119
 #, perl-format
 msgid "duplicate files in %s source package: %s.*"
 msgstr "dubblerade filer i %s-källkodspaket: %s.*"
 
-#: scripts/Dpkg/Source/Package/V2.pm:128
+#: scripts/Dpkg/Source/Package/V2.pm:135
 msgid "missing orig.tar or debian.tar file in v2.0 source package"
 msgstr "saknad orig.tar- eller debian.tar-fil för v2.0-källkodspaket"
 
-#: scripts/Dpkg/Source/Package/V2.pm:148
+#: scripts/Dpkg/Source/Package/V2.pm:155
 #, perl-format
 msgid "required removal of `%s' installed by original tarball"
 msgstr "nödvändig borttagning av \"%s\" installerad av originaltarboll"
 
-#: scripts/Dpkg/Source/Package/V2.pm:232
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:245
+#: scripts/Dpkg/Source/Package/V2.pm:240
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:255
 #, perl-format
 msgid "unapplying %s"
 msgstr "tar bort tillämpning av %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:246 scripts/Dpkg/Source/Package/V2.pm:328
-msgid "no orig.tar file found"
-msgstr "ingen orig.tar-fil hittades"
-
-#: scripts/Dpkg/Source/Package/V2.pm:285
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:310
-msgid ""
-"patches have not been applied, applying them now (use --no-preparation to "
-"override)"
-msgstr ""
-"patcharna har inte tillämpats, tillämpar dem nu (använd -no-preparation för "
-"att överstyra)"
-
-#: scripts/Dpkg/Source/Package/V2.pm:295
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
-#: scripts/Dpkg/Source/Package/V3/native.pm:75
+#: scripts/Dpkg/Source/Package/V2.pm:263 scripts/Dpkg/Source/Package/V2.pm:344
 #, perl-format
-msgid "-b takes only one parameter with format `%s'"
-msgstr "-b tar bara en parameter för formatet \"%s\""
+msgid "no upstream tarball found at %s"
+msgstr "hittade ingen uppströms-tarboll på %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:315
+#: scripts/Dpkg/Source/Package/V2.pm:314
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:329
+msgid "patches are not applied, applying them now"
+msgstr "patcharna har inte tillämpats, tillämpar dem nu"
+
+#: scripts/Dpkg/Source/Package/V2.pm:331
 #, perl-format
 msgid "several orig.tar files found (%s and %s) but only one is allowed"
 msgstr "flera orig.tar-filer hittades (%s och %s) men endast en tillåts"
 
-#: scripts/Dpkg/Source/Package/V2.pm:351
+#: scripts/Dpkg/Source/Package/V2.pm:370
 msgid "copy of the debian directory"
 msgstr "kopia av debian-katalogen"
 
-#: scripts/Dpkg/Source/Package/V2.pm:379
+#: scripts/Dpkg/Source/Package/V2.pm:388
+msgid "unrepresentable changes to source"
+msgstr "ändring i källkod kan inte representeras"
+
+#: scripts/Dpkg/Source/Package/V2.pm:391
+msgid "local changes detected, the modified files are:"
+msgstr "lokala ändringar upptäcktes, de ändrade filerna är:"
+
+#: scripts/Dpkg/Source/Package/V2.pm:410
+#: scripts/Dpkg/Source/Package/V3/bzr.pm:97
+#: scripts/Dpkg/Source/Package/V3/native.pm:76
+#, perl-format
+msgid "-b takes only one parameter with format `%s'"
+msgstr "-b tar bara en parameter för formatet \"%s\""
+
+#: scripts/Dpkg/Source/Package/V2.pm:444
 #, perl-format
 msgid ""
 "add %s in debian/source/include-binaries if you want to store the modified "
@@ -3115,12 +3146,12 @@
 "lägg till %s i debian/source/include-binaries om du vill spara den "
 "modifierade binären i debian-tarbollen"
 
-#: scripts/Dpkg/Source/Package/V2.pm:393
+#: scripts/Dpkg/Source/Package/V2.pm:458
 #, perl-format
 msgid "unwanted binary file: %s"
 msgstr "oönskad binärfil: %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:422
+#: scripts/Dpkg/Source/Package/V2.pm:493
 #, perl-format
 msgid ""
 "detected %d unwanted binary file (add it in debian/source/include-binaries "
@@ -3135,30 +3166,52 @@
 "upptäckte %d oönskade binärfiler (lägg till dem i debian/source/include-"
 "binaries för att tillåta att de tas med)"
 
-#: scripts/Dpkg/Source/Package/V2.pm:442
-msgid "unrepresentable changes to source"
-msgstr "ändring i källkod kan inte representeras"
+#: scripts/Dpkg/Source/Package/V2.pm:508
+#, perl-format
+msgid "you can integrate the local changes with %s"
+msgstr "du kan integrera de lokala ändringarna med %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:446 scripts/Dpkg/Source/Package/V2.pm:450
+#: scripts/Dpkg/Source/Package/V2.pm:510
 #, perl-format
-msgid "cannot remove %s"
-msgstr "kan inte ta bort %s"
+msgid "aborting due to unexpected upstream changes, see %s"
+msgstr "avbryter på grund av oväntade uppströmsändringar, se %s-changes"
 
-#: scripts/Dpkg/Source/Package/V2.pm:453
+#: scripts/Dpkg/Source/Package/V2.pm:520 scripts/Dpkg/Source/Package/V2.pm:653
 #, perl-format
-msgid "local changes stored in %s, the modified files are:"
-msgstr "lokala ändringar sparade i %s, de ändrade filerna är:"
+msgid "local changes have been recorded in a new patch: %s"
+msgstr "lokala ändringar har skrivits till en ny patch: %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:459
+#: scripts/Dpkg/Source/Package/V2.pm:524 scripts/Dpkg/Source/Package/V2.pm:609
+#: scripts/Dpkg/Source/Package/V2.pm:637 scripts/Dpkg/Source/Package/V2.pm:651
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:369
 #, perl-format
-msgid "cannot rename %s to %s"
-msgstr "kan inte byta namn på %s till %s"
+msgid "cannot remove %s"
+msgstr "kan inte ta bort %s"
 
-#: scripts/Dpkg/Source/Package/V2.pm:481
+#: scripts/Dpkg/Source/Package/V2.pm:534
 #, perl-format
 msgid "adding %s to %s"
 msgstr "lägger %s till %s"
 
+#: scripts/Dpkg/Source/Package/V2.pm:601
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:365
+#, perl-format
+msgid "failed to copy %s to %s"
+msgstr "misslyckades att kopiera %s till %s"
+
+#: scripts/Dpkg/Source/Package/V2.pm:624
+#, perl-format
+msgid "cannot register changes in %s, this patch already exists"
+msgstr "kan inte registrera ändringar i %s, patchen finns redan"
+
+#: scripts/Dpkg/Source/Package/V2.pm:638
+msgid "there are no local changes to record"
+msgstr "det finns inte några lokala ändringar att spara"
+
+#: scripts/Dpkg/Source/Package/V2.pm:643
+msgid "Enter the desired patch name: "
+msgstr "Ange önskat patchnamn: "
+
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:52
 msgid ""
 "This source package can only be manipulated using bzr, which is not in the "
@@ -3189,18 +3242,6 @@
 msgid "doesn't contain a bzr repository"
 msgstr "innehåller inte ett bzr-arkiv"
 
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:111
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:134
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:198
-#: scripts/Dpkg/Source/Package/V3/bzr.pm:204
-#: scripts/Dpkg/Source/Package/V3/git.pm:104
-#: scripts/Dpkg/Source/Package/V3/git.pm:143
-#: scripts/Dpkg/Source/Package/V3/git.pm:155
-#: scripts/Dpkg/Source/Package/V3/git.pm:174
-#, perl-format
-msgid "unable to chdir to `%s'"
-msgstr "kan inte byta katalog till \"%s\""
-
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:127
 msgid "bzr status exited nonzero"
 msgstr "bzr status avslutade med en annan status än noll"
@@ -3232,7 +3273,7 @@
 msgid "--target-format option is missing"
 msgstr "flaggan --target-format saknas"
 
-#: scripts/Dpkg/Source/Package/V3/native.pm:53
+#: scripts/Dpkg/Source/Package/V3/native.pm:54
 #, perl-format
 msgid "unrecognized file for a native source package: %s"
 msgstr "okänd fil i ett Debianeget källkodspaket: %s"
@@ -3303,17 +3344,17 @@
 msgid "setting up shallow clone"
 msgstr "ställer in grund klon"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:72
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:73
 #, perl-format
 msgid "%s should be a directory or non-existing"
 msgstr "%s borde vara en katalog eller inte finnas"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:78
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:79
 #, perl-format
 msgid "%s should be a file or non-existing"
 msgstr "%s borde vara en fil eller inte finnas"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:119
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:120
 #, perl-format
 msgid ""
 "the series file (%s) contains unsupported options ('%s', line %s), dpkg-"
@@ -3322,18 +3363,18 @@
 "series-filen (%s) innehåller flaggor som inte stöds (\"%s\", rad %s), dpkg-"
 "source kanske kommer att misslyckas med att tillämpa patchar."
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:137
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:138
 #, perl-format
 msgid "cannot mkdir %s"
 msgstr "kan inte skapa katalog %s"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:211
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:212
 #, perl-format
 msgid "can't create symlink %s"
 msgstr "kan inte skapa den symboliska länken %s"
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:284
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:287
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:294
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:297
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr "versionen av quilt-metadata stöds inte: %s"
@@ -3373,6 +3414,16 @@
 msgid "source package has two conflicting values - %s and %s"
 msgstr "källkodspaketet har två emotsägande värden - %s och %s"
 
+#: scripts/Dpkg/Vendor/Debian.pm:106
+#, perl-format
+msgid "unknown hardening feature: %s"
+msgstr "okänd härdningsfunktion: %s"
+
+#: scripts/Dpkg/Vendor/Debian.pm:110
+#, perl-format
+msgid "incorrect value in hardening option of DEB_BUILD_MAINT_OPTIONS: %s"
+msgstr "felaktigt värde i härdningsflaggan i DEB_BUILD_MAINT_OPTIONS: %s"
+
 #: scripts/Dpkg/Vendor/Ubuntu.pm:61 scripts/Dpkg/Vendor/Ubuntu.pm:63
 msgid ""
 "Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu "
@@ -3389,13 +3440,13 @@
 "Versionsnumret indikerar Ubuntuändringar, men fältet XSBC-Original-"
 "Maintainer saknas"
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:119
+#: scripts/Dpkg/Vendor/Ubuntu.pm:123
 msgid "'hardening' flag found but 'hardening-wrapper' not installed"
 msgstr ""
 "\"hardening\"-flaggan hittades men \"hardening-wrapper\" har inte "
 "installerats"
 
-#: scripts/Dpkg/Vendor/Ubuntu.pm:138
+#: scripts/Dpkg/Vendor/Ubuntu.pm:142
 #, perl-format
 msgid "overriding %s in environment: %s"
 msgstr "överstyr %s i miljön: %s"
@@ -3405,20 +3456,42 @@
 msgid "%s is not a valid version"
 msgstr "%s är inte en giltig version"
 
-#: scripts/Dpkg/Version.pm:368
+#: scripts/Dpkg/Version.pm:371
 msgid "version number cannot be empty"
 msgstr "versionsnumret kan inte vara tomt"
 
-#: scripts/Dpkg/Version.pm:373
+#: scripts/Dpkg/Version.pm:376
+msgid "version number does not start with digit"
+msgstr "versionsnumret börjar inte med en siffra"
+
+#: scripts/Dpkg/Version.pm:381
 #, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr "versionsnummer innehåller ogiltigt tecken \"%s\""
 
-#: scripts/Dpkg/Version.pm:379
+#: scripts/Dpkg/Version.pm:386
 #, perl-format
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr "epokdelen av versionsnumret är inte ett tal: \"%s\""
 
+#~ msgid "%s: dpkg-buildflags (origin: %s): %s = %s\n"
+#~ msgstr "%s: dpkg-buildflags (källa: %s): %s = %s\n"
+
+#~ msgid "1 to 3 args expected\n"
+#~ msgstr "1 till 3 argument förväntades\n"
+
+#~ msgid "need an action option"
+#~ msgstr "åtgärd krävs"
+
+#~ msgid "entry of APT's %s file"
+#~ msgstr "post i APT-filen %s"
+
+#~ msgid "no orig.tar file found"
+#~ msgstr "ingen orig.tar-fil hittades"
+
+#~ msgid "cannot rename %s to %s"
+#~ msgstr "kan inte byta namn på %s till %s"
+
 #~ msgid "exec %s"
 #~ msgstr "exekverar %s"
 
@@ -3743,9 +3816,6 @@
 #~ msgid "unrecognised file type - `%s'"
 #~ msgstr "okänd filtyp - \"%s\""
 
-#~ msgid "multiple upstream tarballs in %s format dsc"
-#~ msgstr "flera uppströms-tarbollar i dsc på %s-format"
-
 #~ msgid "debian.tar in %s format dsc"
 #~ msgstr "debian.tar i dsc på %s-format"
 
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/t/190_Dpkg_Shlibs_Cppfilt.t /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/190_Dpkg_Shlibs_Cppfilt.t
--- dpkg/scripts/t/190_Dpkg_Shlibs_Cppfilt.t	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/190_Dpkg_Shlibs_Cppfilt.t	2012-06-07 10:11:09.426073000 -0700
@@ -34,7 +34,7 @@
     'non-demanglable string' );
 
 # Mass C++ demangling. Checking if c++filt does not hang and cppfilt_demangle()
-# immediatelly provides a correct answer to the caller (i.e. no buffering).
+# immediately provides a correct answer to the caller (i.e. no buffering).
 my @mangledtext = split(/\n+/s, <<'END');
 0000000000000000      DF *UND*  0000000000000000  GCC_3.0     _Unwind_SetIP
 0000000000000000      DF *UND*  0000000000000000  GLIBC_2.2.5 __towlower_l
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/t/200_Dpkg_Shlibs.t /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/200_Dpkg_Shlibs.t
--- dpkg/scripts/t/200_Dpkg_Shlibs.t	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/200_Dpkg_Shlibs.t	2012-06-07 10:11:09.426073000 -0700
@@ -430,7 +430,7 @@
 is ( $sym->{minver}, '1', "specific SYMVER_1 symbol" );
 
 $sym = $sym_file->lookup_symbol('_ZN3NSB6Symver14symver_method1Ev@SYMVER_1', 'libpatterns.so.1');
-is ( $sym->{minver}, '1.method1', "specific symbol prefered over pattern" );
+is ( $sym->{minver}, '1.method1', "specific symbol preferred over pattern" );
 
 $sym = $sym_file->lookup_symbol('_ZN3NSB6Symver14symver_method2Ev@SYMVER_1', 'libpatterns.so.1');
 is ( $sym->{minver}, '1.method2', "c++ alias pattern preferred over generic pattern" );
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/t/300_Dpkg_BuildOptions.t /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/300_Dpkg_BuildOptions.t
--- dpkg/scripts/t/300_Dpkg_BuildOptions.t	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/300_Dpkg_BuildOptions.t	2012-06-07 10:11:09.426073000 -0700
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-use Test::More tests => 22;
+use Test::More tests => 24;
 use Dpkg::ErrorHandling;
 
 use strict;
@@ -66,3 +66,7 @@
 $dbo = Dpkg::BuildOptions->new();
 $dbo->set("noopt", 1);
 is($dbo->output(), "foobar noopt", "output");
+
+$dbo = Dpkg::BuildOptions->new(envvar => "OTHER_VARIABLE");
+is($dbo->get("parallel"), 5, "import from other variable, check parallel");
+ok($dbo->has("noopt"), "import from other variable, check noopt");
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/t/400_Dpkg_Deps.t /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/400_Dpkg_Deps.t
--- dpkg/scripts/t/400_Dpkg_Deps.t	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/400_Dpkg_Deps.t	2012-06-07 10:11:09.426073000 -0700
@@ -13,12 +13,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-use Test::More tests => 19;
+use Test::More tests => 18;
 
 use strict;
 use warnings;
 
-use Dpkg::Arch qw(get_host_arch);
 use_ok('Dpkg::Deps');
 
 my $field_multiline = " , , libgtk2.0-common (= 2.10.13-1)  , libatk1.0-0 (>=
@@ -42,14 +41,6 @@
 is($dep_or1->implies($dep_or2), 1, "Implication between OR 1/2");
 is($dep_or2->implies($dep_or1), undef, "Implication between OR 2/2");
 
-my $dep_ma_any = deps_parse("libcairo2:any");
-my $dep_ma_native = deps_parse("libcairo2");
-#my $dep_ma_native2 = deps_parse("libcairo2:native");
-is($dep_ma_native->implies($dep_ma_any), 1, "foo -> foo:any");
-#is($dep_ma_native2->implies($dep_ma_any), 1, "foo:native -> foo:any");
-is($dep_ma_any->implies($dep_ma_native), undef, "foo:any !-> foo");
-#is($dep_ma_any->implies($dep_ma_native2), undef, "foo:any !-> foo:native");
-
 my $field_arch = "libc6 (>= 2.5) [!alpha !hurd-i386], libc6.1 [alpha], libc0.1 [hurd-i386]";
 my $dep_i386 = deps_parse($field_arch, reduce_arch => 1, host_arch => 'i386');
 my $dep_alpha = deps_parse($field_arch, reduce_arch => 1, host_arch => 'alpha');
@@ -60,21 +51,14 @@
 
 
 my $facts = Dpkg::Deps::KnownFacts->new();
-$facts->add_installed_package("mypackage", "1.3.4-1", get_host_arch(), "no");
-$facts->add_installed_package("mypackage2", "1.3.4-1", "somearch", "no");
-$facts->add_installed_package("pkg-ma-foreign", "1.3.4-1", "somearch", "foreign");
-$facts->add_installed_package("pkg-ma-foreign2", "1.3.4-1", get_host_arch(), "foreign");
-$facts->add_installed_package("pkg-ma-allowed", "1.3.4-1", "somearch", "allowed");
-$facts->add_installed_package("pkg-ma-allowed2", "1.3.4-1", "somearch", "allowed");
-$facts->add_installed_package("pkg-ma-allowed3", "1.3.4-1", get_host_arch(), "allowed");
+$facts->add_installed_package("mypackage", "1.3.4-1");
 $facts->add_provided_package("myvirtual", undef, undef, "mypackage");
 
 my $field_duplicate = "libc6 (>= 2.3), libc6 (>= 2.6-1), mypackage (>=
-1.3), myvirtual | something, python (>= 2.5), mypackage2, pkg-ma-foreign,
-pkg-ma-foreign2, pkg-ma-allowed:any, pkg-ma-allowed2, pkg-ma-allowed3";
+1.3), myvirtual | something, python (>= 2.5)";
 my $dep_dup = deps_parse($field_duplicate);
 $dep_dup->simplify_deps($facts, $dep_opposite);
-is($dep_dup->output(), "libc6 (>= 2.6-1), mypackage2, pkg-ma-allowed2", "Simplify deps");
+is($dep_dup->output(), "libc6 (>= 2.6-1)", "Simplify deps");
 
 my $field_dup_union = "libc6 (>> 2.3), libc6 (>= 2.6-1), fake (<< 2.0),
 fake(>> 3.0), fake (= 2.5), python (<< 2.5), python (= 2.4)";
@@ -82,6 +66,10 @@
 $dep_dup_union->simplify_deps($facts);
 is($dep_dup_union->output(), "libc6 (>> 2.3), fake (<< 2.0), fake (>> 3.0), fake (= 2.5), python (<< 2.5)", "Simplify union deps");
 
+$dep_dup_union = deps_parse("sipsak (<= 0.9.6-2.1), sipsak (<= 0.9.6-2.2)", union => 1);
+$dep_dup_union->simplify_deps($facts);
+is($dep_dup_union->output(), "sipsak (<= 0.9.6-2.2)", "Simplify union deps 2");
+
 my $dep_red = deps_parse("abc | xyz, two, abc");
 $dep_red->simplify_deps($facts, $dep_opposite);
 is($dep_red->output(), "abc, two", "Simplification respect order");
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/t/600_Dpkg_Changelog/shadow /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/600_Dpkg_Changelog/shadow
--- dpkg/scripts/t/600_Dpkg_Changelog/shadow	2009-07-29 09:36:30.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/600_Dpkg_Changelog/shadow	2012-06-07 10:11:09.426073000 -0700
@@ -1058,7 +1058,7 @@
 shadow (20000902-10) unstable; urgency=low
 
   * We hates the automake.  We hates it forever.  closes: #139293
-  * stupid ommision: logoutd still in postinst.  closes: #139422
+  * stupid omission: logoutd still in postinst.  closes: #139422
   * make login.defs a bit clearer. closes: #138809
 
  -- Karl Ramm <kcr@debian.org>  Fri, 22 Mar 2002 12:09:07 -0500
@@ -1382,7 +1382,7 @@
 
 shadow (19990827-8) unstable; urgency=low
 
-  * src/login.c: fixed loggin of username on succesful login (was using
+  * src/login.c: fixed loggin of username on successful login (was using
     the normal username, when it should have used pam_user),
     closes: #47819
   * src/login.c: check for hushed login and pass PAM_SILENT if true,
@@ -1400,11 +1400,11 @@
   * {passwd,login}.pam.d: added blurb about how to use the pam_cracklib
     module, and also changed it to use pam_unix and not pam_pwdb (gah!
     how did that happen?), closes: #46983
-  * README.debian: changes to reflect new PAM usage aswell as removing
+  * README.debian: changes to reflect new PAM usage as well as removing
     references to obsolete config files, closes: #46595
   * passwd.expire.cron: example script that informs users by email when
     their accounts are about to expire, closes: #41393
-  * lastlogin.c: added -h option and usage aswell as long option support,
+  * lastlogin.c: added -h option and usage as well as long option support,
     closes: #45804
   * shadow now only has 3 wishlist bugs and nothing else
 
@@ -1413,7 +1413,7 @@
 shadow (19990827-6) unstable; urgency=low
 
   * debian/shells: new file, needed to include /bin/sash, closes: #45826
-  * useradd.8,groupadd.8: added note about the prefered use of adduser
+  * useradd.8,groupadd.8: added note about the preferred use of adduser
     and addgroup when conforming to Debian policy (taken from notes in
     adduser's man pages), closes: #22821
   * dialups.5: new man page that documents /etc/{dialups,d_passwd},
@@ -1434,7 +1434,7 @@
   * {login,su}.1: added description of a subsystem login, closes: #31987
   * src/chowndir.c: fixed recursive chown's on usermod, also changed it
     to use lchown and lstat since we actually want that, closes: #46405
-  * su.1: removed reference to suauth aswell as added "-c" to the SYNOPSIS,
+  * su.1: removed reference to suauth as well as added "-c" to the SYNOPSIS,
     closes: #45685
   * login.1: added options to the SYNOPSIS and documented OPTIONS,
     closes: #28763
@@ -1463,7 +1463,7 @@
     check passwords when the user is trying to get back to their default
     group, closes: #22244
   * Closed some other bugs that were either not really bugs, or they weren't
-    reproducable.
+    reproducible.
   * debian/login.pam.d: moved around the pam_motd and pam_mail modules to
     order them the same as old login would have done
 
@@ -1559,12 +1559,12 @@
     - More "Fixed" bugs getting closed...CLOSED AT LAST, closes: #17593
       closes: #20057, #12689
   * Switched to a new build setup (dbs)
-  * Split makes into seperate files to make it a little cleaner
+  * Split makes into separate files to make it a little cleaner
   * FHS compliance changes (usr/{doc,man} to usr/share/{doc,man})
   * debian/tar.c: removed
   * su: su is now going to be provided by shadow's login package and
     removed from shellutils (the shellutils maintainer agreed to this)
-    in preperation for future PAM support. Added conflicts with older
+    in preparation for future PAM support. Added conflicts with older
     version of shellutils that does provide the su binary.
   * debian/control.in: removed the secure-su package since login now
     contains su and all of it's components
@@ -1575,7 +1575,7 @@
   * Enabled PAM. Support now for su, passwd, chfn, chsh. I am working on the
     support in login.
   * expiry: Changed to be installed as sgid shadow instead of suid root
-    since it doesn't need root priviledges. Also added man page expiry(1) based
+    since it doesn't need root privileges. Also added man page expiry(1) based
     on the comments found in expiry.c.
   * Removed bashism's in control scripts. Now lintian clean (smells fresh too)
   * chage.c: Keep chage from locking when not running as root, since it just
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/t/700_Dpkg_Control/control-1 /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/700_Dpkg_Control/control-1
--- dpkg/scripts/t/700_Dpkg_Control/control-1	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/700_Dpkg_Control/control-1	2012-06-07 10:11:09.426073000 -0700
@@ -12,13 +12,16 @@
      
 # First package
 Package: mypackage1
+Architecture: any
 Depends: libc6
 
 # Second package
 Package: mypackage2
+Architecture: all
 Depends: hello
 
 Package: mypackage3
+Architecture: all
 Depends:hello
 Description:   short one
  long one
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/t/700_Dpkg_Control.t /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/700_Dpkg_Control.t
--- dpkg/scripts/t/700_Dpkg_Control.t	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/700_Dpkg_Control.t	2012-06-07 10:11:09.426073000 -0700
@@ -41,12 +41,15 @@
 Empty-Field: 
 
 Package: mypackage1
+Architecture: any
 Depends: libc6
 
 Package: mypackage2
+Architecture: all
 Depends: hello
 
 Package: mypackage3
+Architecture: all
 Depends: hello
 Description: short one
  long one
@@ -80,5 +83,6 @@
 
 is(${$io->string_ref()},
 'Package: mypackage2
+Architecture: all
 Depends: hello
 ', "Dump of second binary package of $datadir/control-1");
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/t/850_Dpkg_Compression.t /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/850_Dpkg_Compression.t
--- dpkg/scripts/t/850_Dpkg_Compression.t	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/850_Dpkg_Compression.t	2012-06-07 10:11:09.426073000 -0700
@@ -13,11 +13,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-use Test::More tests => 9;
+use Test::More tests => 13;
 
 use strict;
 use warnings;
 
+use_ok('Dpkg::Compression');
 use_ok('Dpkg::Compression::FileHandle');
 
 my $tmpdir = "t.tmp/850_Dpkg_Compression";
@@ -84,6 +85,15 @@
     is_deeply(\@lines, \@read, "$filename correctly read (IO::Handle methods)");
 }
 
+# Test changing the default compression levels
+my $old_level = compression_get_default_level();
+compression_set_default_level(1);
+is(compression_get_default_level(), 1, "change default compression level");
+compression_set_default_level(5);
+is(compression_get_default_level(), 5, "change default compression level");
+compression_set_default_level(undef);
+is(compression_get_default_level(), $old_level, "reset default compression level");
+
 # Test write on uncompressed file
 test_write("$tmpdir/myfile", \&check_uncompressed);
 
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/t/910_merge_changelogs/ch-merged /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/910_merge_changelogs/ch-merged
--- dpkg/scripts/t/910_merge_changelogs/ch-merged	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/910_merge_changelogs/ch-merged	2012-06-07 10:11:09.426073000 -0700
@@ -47,20 +47,20 @@
 test (1.1-1+conflict2) unstable; urgency=low
 
   * This entry has a conflict on the next line.
-<<<<<<
+<<<<<<<
   * I'm in changelog A.
-======
+=======
   * I'm in changelog B.
->>>>>>
+>>>>>>>
   * This line is the same in all 3 versions.
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:07:40 +0200
 
-<<<<<<
+<<<<<<<
 test (1.1-1+conflict1) experimental; urgency=low
-======
+=======
 test (1.1-1+conflict1) unstable; urgency=high
->>>>>>
+>>>>>>>
 
   * This entry has conflicts on the header line: A wants distribution
     experimental (instead of unstable) and B wants urgency=high (instead
@@ -68,11 +68,11 @@
   * But it also has a conflict on the trailer line. A changed the
     timestamp to 18:05:00 and B to 18:06:00.
 
-<<<<<<
+<<<<<<<
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:05:00 +0200
-======
+=======
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:06:00 +0200
->>>>>>
+>>>>>>>
 
 test (1.1-1+change2) unstable; urgency=low
 
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/t/910_merge_changelogs/ch-merged-basic /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/910_merge_changelogs/ch-merged-basic
--- dpkg/scripts/t/910_merge_changelogs/ch-merged-basic	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/910_merge_changelogs/ch-merged-basic	2012-06-07 10:11:09.426073000 -0700
@@ -30,7 +30,7 @@
 
 test (1.2-1) unstable; urgency=low
 
-<<<<<<
+<<<<<<<
   * This entry should not have conflicts with Algorithm::Merge installed.
   * Changelog B should a have supplementary line above this one.
   * Pi is 3.14 is true for all changelogs.
@@ -43,7 +43,7 @@
   * This line should be shared but the next one is dropped in B only.
   * If I'm here it's because the changelog is not B (I should not appear
     in the resulting changelog).
-======
+=======
   * This entry should not have conflicts with Algorithm::Merge installed.
   * I'm the added line mentionned below (B-only).
   * Changelog B should a have supplementary line above this one.
@@ -54,29 +54,29 @@
     - Yet I'm hacking on dpkg
     - What does that mean about me?
   * This line should be shared but the next one is dropped in B only.
->>>>>>
+>>>>>>>
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:09:07 +0200
 
 test (1.1-1+conflict2) unstable; urgency=low
 
-<<<<<<
+<<<<<<<
   * This entry has a conflict on the next line.
   * I'm in changelog A.
   * This line is the same in all 3 versions.
-======
+=======
   * This entry has a conflict on the next line.
   * I'm in changelog B.
   * This line is the same in all 3 versions.
->>>>>>
+>>>>>>>
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:07:40 +0200
 
-<<<<<<
+<<<<<<<
 test (1.1-1+conflict1) experimental; urgency=low
-======
+=======
 test (1.1-1+conflict1) unstable; urgency=high
->>>>>>
+>>>>>>>
 
   * This entry has conflicts on the header line: A wants distribution
     experimental (instead of unstable) and B wants urgency=high (instead
@@ -84,11 +84,11 @@
   * But it also has a conflict on the trailer line. A changed the
     timestamp to 18:05:00 and B to 18:06:00.
 
-<<<<<<
+<<<<<<<
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:05:00 +0200
-======
+=======
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:06:00 +0200
->>>>>>
+>>>>>>>
 
 test (1.1-1+change2) unstable; urgency=low
 
@@ -101,17 +101,17 @@
 
 test (1.1-1+change1) unstable; urgency=high
 
-<<<<<<
+<<<<<<<
   * This entry is everywhere but the last line is different in B. The
     merged version should have what's in B. Furthermore the urgency in
     A is set to high, it should also be picked up.
   * I'm not in changelog B.
-======
+=======
   * This entry is everywhere but the last line is different in B. The
     merged version should have what's in B. Furthermore the urgency in
     A is set to high, it should also be picked up.
   * I'm definitely in changelog B.
->>>>>>
+>>>>>>>
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 17:50:58 +0200
 
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/t/910_merge_changelogs/ch-merged-pr /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/910_merge_changelogs/ch-merged-pr
--- dpkg/scripts/t/910_merge_changelogs/ch-merged-pr	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/910_merge_changelogs/ch-merged-pr	2012-06-07 10:11:09.426073000 -0700
@@ -1,8 +1,8 @@
-<<<<<<
+<<<<<<<
 test (2.0-1) unstable; urgency=low
-======
+=======
 test (2.0-1~exp3) unstable; urgency=low
->>>>>>
+>>>>>>>
 
   * Version B with 2.0-1~exp3 contains only up to line 3 while version A
     with 2.0-1 contains the 5 lines. The resulting version should have the
@@ -40,20 +40,20 @@
 test (1.1-1+conflict2) unstable; urgency=low
 
   * This entry has a conflict on the next line.
-<<<<<<
+<<<<<<<
   * I'm in changelog A.
-======
+=======
   * I'm in changelog B.
->>>>>>
+>>>>>>>
   * This line is the same in all 3 versions.
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:07:40 +0200
 
-<<<<<<
+<<<<<<<
 test (1.1-1+conflict1) experimental; urgency=low
-======
+=======
 test (1.1-1+conflict1) unstable; urgency=high
->>>>>>
+>>>>>>>
 
   * This entry has conflicts on the header line: A wants distribution
     experimental (instead of unstable) and B wants urgency=high (instead
@@ -61,11 +61,11 @@
   * But it also has a conflict on the trailer line. A changed the
     timestamp to 18:05:00 and B to 18:06:00.
 
-<<<<<<
+<<<<<<<
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:05:00 +0200
-======
+=======
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:06:00 +0200
->>>>>>
+>>>>>>>
 
 test (1.1-1+change2) unstable; urgency=low
 
diff -uNr --exclude .git --exclude .bzr dpkg/scripts/t/910_merge_changelogs/ch-merged-pr-basic /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/910_merge_changelogs/ch-merged-pr-basic
--- dpkg/scripts/t/910_merge_changelogs/ch-merged-pr-basic	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/scripts/t/910_merge_changelogs/ch-merged-pr-basic	2012-06-07 10:11:09.426073000 -0700
@@ -1,10 +1,10 @@
-<<<<<<
+<<<<<<<
 test (2.0-1) unstable; urgency=low
-======
+=======
 test (2.0-1~exp3) unstable; urgency=low
->>>>>>
+>>>>>>>
 
-<<<<<<
+<<<<<<<
   * Version B with 2.0-1~exp3 contains only up to line 3 while version A
     with 2.0-1 contains the 5 lines. The resulting version should have the
     5 lines without conflict with Algorithm::Merge and a conflict without.
@@ -13,14 +13,14 @@
   * Line 3.
   * Line 4.
   * Line 5.
-======
+=======
   * Version B with 2.0-1~exp3 contains only up to line 3 while version A
     with 2.0-1 contains the 5 lines. The resulting version should have the
     5 lines without conflict with Algorithm::Merge and a conflict without.
   * Line 1.
   * Line 2.
   * Line 3.
->>>>>>
+>>>>>>>
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:23:09 +0200
 
@@ -32,7 +32,7 @@
 
 test (1.2-1) unstable; urgency=low
 
-<<<<<<
+<<<<<<<
   * This entry should not have conflicts with Algorithm::Merge installed.
   * Changelog B should a have supplementary line above this one.
   * Pi is 3.14 is true for all changelogs.
@@ -45,7 +45,7 @@
   * This line should be shared but the next one is dropped in B only.
   * If I'm here it's because the changelog is not B (I should not appear
     in the resulting changelog).
-======
+=======
   * This entry should not have conflicts with Algorithm::Merge installed.
   * I'm the added line mentionned below (B-only).
   * Changelog B should a have supplementary line above this one.
@@ -56,29 +56,29 @@
     - Yet I'm hacking on dpkg
     - What does that mean about me?
   * This line should be shared but the next one is dropped in B only.
->>>>>>
+>>>>>>>
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:09:07 +0200
 
 test (1.1-1+conflict2) unstable; urgency=low
 
-<<<<<<
+<<<<<<<
   * This entry has a conflict on the next line.
   * I'm in changelog A.
   * This line is the same in all 3 versions.
-======
+=======
   * This entry has a conflict on the next line.
   * I'm in changelog B.
   * This line is the same in all 3 versions.
->>>>>>
+>>>>>>>
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:07:40 +0200
 
-<<<<<<
+<<<<<<<
 test (1.1-1+conflict1) experimental; urgency=low
-======
+=======
 test (1.1-1+conflict1) unstable; urgency=high
->>>>>>
+>>>>>>>
 
   * This entry has conflicts on the header line: A wants distribution
     experimental (instead of unstable) and B wants urgency=high (instead
@@ -86,11 +86,11 @@
   * But it also has a conflict on the trailer line. A changed the
     timestamp to 18:05:00 and B to 18:06:00.
 
-<<<<<<
+<<<<<<<
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:05:00 +0200
-======
+=======
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:06:00 +0200
->>>>>>
+>>>>>>>
 
 test (1.1-1+change2) unstable; urgency=low
 
@@ -103,17 +103,17 @@
 
 test (1.1-1+change1) unstable; urgency=high
 
-<<<<<<
+<<<<<<<
   * This entry is everywhere but the last line is different in B. The
     merged version should have what's in B. Furthermore the urgency in
     A is set to high, it should also be picked up.
   * I'm not in changelog B.
-======
+=======
   * This entry is everywhere but the last line is different in B. The
     merged version should have what's in B. Furthermore the urgency in
     A is set to high, it should also be picked up.
   * I'm definitely in changelog B.
->>>>>>
+>>>>>>>
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 17:50:58 +0200
 
diff -uNr --exclude .git --exclude .bzr dpkg/src/archives.c /home/vorlon/devel/multiarch/dpkg-debian/src/archives.c
--- dpkg/src/archives.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/archives.c	2012-06-07 10:11:09.426073000 -0700
@@ -5,8 +5,6 @@
  * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
  * Copyright © 2000 Wichert Akkerman <wakkerma@debian.org>
  * Copyright © 2007-2011 Guillem Jover <guillem@debian.org>
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +33,6 @@
 #include <string.h>
 #include <time.h>
 #include <fcntl.h>
-#include <limits.h>
 #include <unistd.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -54,7 +51,7 @@
 #include <dpkg/command.h>
 #include <dpkg/file.h>
 #include <dpkg/tarfn.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 #include <dpkg/triglib.h>
 
 #ifdef WITH_SELINUX
@@ -65,7 +62,6 @@
 #include "main.h"
 #include "archives.h"
 #include "filters.h"
-#include "infodb.h"
 
 static inline void
 fd_writeback_init(int fd)
@@ -118,19 +114,18 @@
                  struct pkginfo *pkgbeinginstalled)
 {
   struct filepackages_iterator *iter;
-  struct pkginfo *thirdpkg;
-  struct pkgset *divpkgset;
+  struct pkginfo *divpkg, *thirdpkg;
 
   debug(dbg_eachfiledetail,"filesavespackage file `%s' package %s",
-        file->namenode->name, pkg_describe(pkgtobesaved, pdo_foreign));
+        file->namenode->name,pkgtobesaved->name);
 
   /* If the file is a contended one and it's overridden by either
    * the package we're considering disappearing or the package
    * we're installing then they're not actually the same file, so
    * we can't disappear the package - it is saved by this file. */
   if (file->namenode->divert && file->namenode->divert->useinstead) {
-    divpkgset = file->namenode->divert->pkgset;
-    if (divpkgset == pkgtobesaved->set || divpkgset == pkgbeinginstalled->set) {
+    divpkg= file->namenode->divert->pkg;
+    if (divpkg == pkgtobesaved || divpkg == pkgbeinginstalled) {
       debug(dbg_eachfiledetail,"filesavespackage ... diverted -- save!");
       return true;
     }
@@ -145,7 +140,7 @@
   iter = filepackages_iter_new(file->namenode);
   while ((thirdpkg = filepackages_iter_next(iter))) {
     debug(dbg_eachfiledetail, "filesavespackage ... also in %s",
-          pkg_describe(thirdpkg, pdo_foreign));
+          thirdpkg->name);
 
     /* Is this not the package being installed or the one being
      * checked for disappearance? */
@@ -196,9 +191,9 @@
   if (ti->type == tar_filetype_file) {
     char fnamebuf[256];
 
-    fd_null_copy(tc->backendpipe, ti->size,
-                 _("skipped unpacking file '%.255s' (replaced or excluded?)"),
-                 path_quote_filename(fnamebuf, ti->name, 256));
+    fd_skip(tc->backendpipe, ti->size,
+            _("skipped unpacking file '%.255s' (replaced or excluded?)"),
+            path_quote_filename(fnamebuf, ti->name, 256));
     r = ti->size % TARBLKSZ;
     if (r > 0)
       if (fd_read(tc->backendpipe, databuf, TARBLKSZ - r) < 0)
@@ -220,23 +215,14 @@
 {
   struct dependency *dep;
 
-  debug(dbg_depcon,"does_replace new=%s old=%s (%s)",
-        pkg_describe(newpigp, pdo_foreign |
-                     ((newpifp == &newpigp->available) ? pdo_avail : 0)),
-        pkg_describe(oldpigp, pdo_foreign |
-                     ((oldpifp == &oldpigp->available) ? pdo_avail : 0)),
-        versiondescribe(&oldpifp->version, vdew_always));
+  debug(dbg_depcon,"does_replace new=%s old=%s (%s)",newpigp->name,
+        oldpigp->name, versiondescribe(&oldpifp->version, vdew_always));
   for (dep= newpifp->depends; dep; dep= dep->next) {
-    if (dep->type != dep_replaces || dep->list->ed != oldpigp->set)
-      continue;
+    if (dep->type != dep_replaces || dep->list->ed != oldpigp) continue;
     debug(dbg_depcondetail,"does_replace ... found old, version %s",
           versiondescribe(&dep->list->version,vdew_always));
     if (!versionsatisfied(oldpifp, dep->list))
       continue;
-    /* The test below can only trigger if dep_replaces can have
-     * an arch qualifier != any */
-    if (!archsatisfied(oldpifp, dep->list))
-      continue;
     debug(dbg_depcon,"does_replace ... yes");
     return true;
   }
@@ -440,59 +426,6 @@
   return true;
 }
 
-static void
-ensure_same_file(struct pkginfo *pkg,
-                 const char *fn_old, int fd_old, struct stat *stab,
-                 const char *fn_new, int fd_new, struct tar_entry *ti)
-{
-  char old_md5[MD5HASHLEN + 1], new_md5[MD5HASHLEN + 1];
-  char linktarget[_POSIX_SYMLINK_MAX + 1];
-  ssize_t sz;
-  const char *err = _("'%s' is different from the same file on the system");
-
-  debug(dbg_eachfiledetail, "tarobject ensure same than on system");
-  switch (ti->type) {
-  case tar_filetype_dir:
-    /* Nothing to check for a new directory */
-    break;
-  case tar_filetype_symlink:
-    /* Symlinks to existing dirs have already been dealt with, remains
-     * only real symlinks where we can compare the target */
-    if (!S_ISLNK(stab->st_mode))
-      ohshit(err, ti->name);
-    sz = readlink(fn_old, linktarget, sizeof(linktarget) - 1);
-    if (sz < 0)
-      ohshite(_("unable to read link `%.255s'"), fn_old);
-    linktarget[sz] = '\0';
-    if (strcmp(linktarget, ti->linkname))
-      ohshit(err, ti->name);
-    break;
-  case tar_filetype_chardev:
-    if (!S_ISCHR(stab->st_mode) || stab->st_rdev != ti->dev)
-      ohshit(err, ti->name);
-    break;
-  case tar_filetype_blockdev:
-    if (!S_ISBLK(stab->st_mode) || stab->st_rdev != ti->dev)
-      ohshit(err, ti->name);
-    break;
-  case tar_filetype_fifo:
-    if (!S_ISFIFO(stab->st_mode))
-      ohshit(err, ti->name);
-    break;
-  case tar_filetype_file:
-  case tar_filetype_hardlink:
-    if (!S_ISREG(stab->st_mode) || ti->size != stab->st_size)
-      ohshit(err, ti->name);
-    md5hash(pkg, new_md5, fn_new, fd_new);
-    md5hash(pkg, old_md5, fn_old, fd_old);
-    if (strcmp(old_md5, new_md5))
-      ohshit(err, ti->name);
-    break;
-  default:
-    break; /* No checks for unknown types */
-  }
-}
-
 int
 tarobject(void *ctx, struct tar_entry *ti)
 {
@@ -504,16 +437,14 @@
 
   struct conffile *conff;
   struct tarcontext *tc = ctx;
-  bool existingdir, keepexisting, ensuresamefile, ensuresameconff;
-  char prevnewhash[MD5HASHLEN + 1] = "";
+  bool existingdir, keepexisting;
   int statr;
   ssize_t r;
   struct stat stab, stabtmp;
   char databuf[TARBLKSZ];
   struct file_stat *st;
   struct fileinlist *nifd, **oldnifd;
-  struct pkginfo *otherpkg;
-  struct pkgset *divpkgset;
+  struct pkginfo *divpkg, *otherpkg;
 
   ensureobstackinit();
 
@@ -537,14 +468,14 @@
         ? nifd->namenode->divert->useinstead->name : "<none>");
 
   if (nifd->namenode->divert && nifd->namenode->divert->camefrom) {
-    divpkgset = nifd->namenode->divert->pkgset;
+    divpkg= nifd->namenode->divert->pkg;
 
-    if (divpkgset) {
+    if (divpkg) {
       forcibleerr(fc_overwritediverted,
                   _("trying to overwrite `%.250s', which is the "
                     "diverted version of `%.250s' (package: %.100s)"),
                   nifd->namenode->name, nifd->namenode->divert->camefrom->name,
-                  divpkgset->name);
+                  divpkg->name);
     } else {
       forcibleerr(fc_overwritediverted,
                   _("trying to overwrite `%.250s', which is the "
@@ -632,8 +563,6 @@
   }
 
   keepexisting = false;
-  ensuresamefile = false;
-  ensuresameconff = false;
   if (!existingdir) {
     struct filepackages_iterator *iter;
 
@@ -641,38 +570,28 @@
     while ((otherpkg = filepackages_iter_next(iter))) {
       if (otherpkg == tc->pkg)
         continue;
-      debug(dbg_eachfile, "tarobject ... found in %s",
-            pkg_describe(otherpkg, pdo_foreign));
-
-      /* Multi-Arch: same packages can share files. Overwriting is allowed
-       * when they are not in sync, otherwise the file content must match
-       * the installed file.
-       */
-      if (otherpkg->set == tc->pkg->set &&
-          otherpkg->installed.multiarch == multiarch_same &&
-          tc->pkg->available.multiarch == multiarch_same) {
-        if (tc->pkg_in_sync && (nifd->namenode->flags & fnnf_new_conff))
-          ensuresameconff = true;
-        else if (tc->pkg_in_sync)
-          ensuresamefile = true;
-        debug(dbg_eachfiledetail, "tarobject shared with %s %s (insync=%d)",
-              pkg_describe(otherpkg, pdo_always),
-              versiondescribe(&otherpkg->installed.version, vdew_nonambig),
-              tc->pkg_in_sync);
-        continue;
-      }
+      debug(dbg_eachfile, "tarobject ... found in %s", otherpkg->name);
 
       if (nifd->namenode->divert && nifd->namenode->divert->useinstead) {
         /* Right, so we may be diverting this file. This makes the conflict
          * OK iff one of us is the diverting package (we don't need to
          * check for both being the diverting package, obviously). */
-        divpkgset = nifd->namenode->divert->pkgset;
-        debug(dbg_eachfile, "tarobject ... diverted, divpkgset=%s",
-              divpkgset ? divpkgset->name : "<none>");
-        if (otherpkg->set == divpkgset || tc->pkg->set == divpkgset)
+        divpkg = nifd->namenode->divert->pkg;
+        debug(dbg_eachfile, "tarobject ... diverted, divpkg=%s",
+              divpkg ? divpkg->name : "<none>");
+        if (otherpkg == divpkg || tc->pkg == divpkg)
           continue;
       }
 
+      /* If the new object is a directory and the previous object does
+       * not exist assume it's also a directory and skip further checks.
+       * XXX: Ideally with more information about the installed files we
+       * could perform more clever checks. */
+      if (statr != 0 && ti->type == tar_filetype_dir) {
+        debug(dbg_eachfile, "tarobject ... assuming shared directory");
+        continue;
+      }
+
       /* Nope? Hmm, file conflict, perhaps. Check Replaces. */
       switch (otherpkg->clientdata->replacingfilesandsaid) {
       case 2:
@@ -700,12 +619,15 @@
              conff = conff->next) {
           if (!conff->obsolete)
             continue;
-          if (stat(conff->name, &stabtmp))
+          if (stat(conff->name, &stabtmp)) {
             if (errno == ENOENT || errno == ENOTDIR || errno == ELOOP)
               continue;
-            if (stabtmp.st_dev == stab.st_dev &&
-                stabtmp.st_ino == stab.st_ino)
-              break;
+            else
+              ohshite(_("cannot stat file '%s'"), conff->name);
+          }
+          if (stabtmp.st_dev == stab.st_dev &&
+              stabtmp.st_ino == stab.st_ino)
+            break;
         }
         if (conff) {
           debug(dbg_eachfiledetail, "tarobject other's obsolete conffile");
@@ -716,36 +638,31 @@
 
       if (does_replace(tc->pkg, &tc->pkg->available,
                        otherpkg, &otherpkg->installed)) {
-        printf(_("Replacing files in old package %s ...\n"),
-               pkg_describe(otherpkg, pdo_foreign));
+        printf(_("Replacing files in old package %s ...\n"),otherpkg->name);
         otherpkg->clientdata->replacingfilesandsaid = 1;
       } else if (does_replace(otherpkg, &otherpkg->installed,
                               tc->pkg, &tc->pkg->available)) {
         printf(_("Replaced by files in installed package %s ...\n"),
-               pkg_describe(otherpkg, pdo_foreign));
+               otherpkg->name);
         otherpkg->clientdata->replacingfilesandsaid = 2;
         nifd->namenode->flags &= ~fnnf_new_inarchive;
         keepexisting = true;
       } else {
+        /* At this point we are replacing something without a Replaces. */
         if (!statr && S_ISDIR(stab.st_mode)) {
           forcibleerr(fc_overwritedir,
                       _("trying to overwrite directory '%.250s' "
                         "in package %.250s %.250s with nondirectory"),
-                      nifd->namenode->name, pkg_describe(otherpkg, pdo_foreign),
+                      nifd->namenode->name, otherpkg->name,
                       versiondescribe(&otherpkg->installed.version,
                                       vdew_nonambig));
         } else {
-          /* At this point we are replacing something without a Replaces.
-           * If the new object is a directory and the previous object does
-           * not exist assume it's also a directory and don't complain. */
-          if (!(statr && ti->type == tar_filetype_dir))
-            forcibleerr(fc_overwrite,
-                        _("trying to overwrite '%.250s', "
-                          "which is also in package %.250s %.250s"),
-                        nifd->namenode->name,
-                        pkg_describe(otherpkg, pdo_foreign),
-                        versiondescribe(&otherpkg->installed.version,
-                                        vdew_nonambig));
+          forcibleerr(fc_overwrite,
+                      _("trying to overwrite '%.250s', "
+                        "which is also in package %.250s %.250s"),
+                      nifd->namenode->name, otherpkg->name,
+                      versiondescribe(&otherpkg->installed.version,
+                                      vdew_nonambig));
         }
       }
     }
@@ -771,28 +688,13 @@
 
   /* Now, at this stage we want to make sure neither of .dpkg-new and
    * .dpkg-tmp are hanging around. */
-  ensure_pathname_nonexisting(fnametmpvb.buf);
-  if (ensuresameconff) {
-    /* Compute the hash of the (former) .dpkg-new before we install
-     * our own version in place of it. Also make a temporary backup in
-     * case the new version differs and we have to roll-back. */
-    md5hash(tc->pkg, prevnewhash, fnamenewvb.buf, -1);
-    if (strcmp(prevnewhash, NONEXISTENTFLAG) && strcmp(prevnewhash, "-")) {
-      debug(dbg_conffdetail, "former %s backupped", fnamenewvb.buf);
-      if (link(fnamenewvb.buf, fnametmpvb.buf))
-        ohshite(_("error creating hard link `%.255s'"), fnametmpvb.buf);
-    }
-  }
   ensure_pathname_nonexisting(fnamenewvb.buf);
+  ensure_pathname_nonexisting(fnametmpvb.buf);
 
   /* Now we start to do things that we need to be able to undo
    * if something goes wrong. Watch out for the CLEANUP comments to
    * keep an eye on what's installed on the disk at each point. */
-  if (ensuresameconff)
-    push_cleanup(cu_installsharedconf, ~ehflag_normaltidy, NULL, 0, 1,
-                 (void *)nifd);
-  else
-    push_cleanup(cu_installnew, ~ehflag_normaltidy, NULL, 0, 1, (void *)nifd);
+  push_cleanup(cu_installnew, ~ehflag_normaltidy, NULL, 0, 1, (void *)nifd);
 
   /*
    * CLEANUP: Now we either have the old file on the disk, or not, in
@@ -804,7 +706,7 @@
   case tar_filetype_file:
     /* We create the file with mode 0 to make sure nobody can do anything with
      * it until we apply the proper mode, which might be a statoverride. */
-    fd = open(fnamenewvb.buf, (O_CREAT|O_EXCL|O_RDWR), 0);
+    fd= open(fnamenewvb.buf, (O_CREAT|O_EXCL|O_WRONLY), 0);
     if (fd < 0)
       ohshite(_("unable to create `%.255s' (while processing `%.255s')"),
               fnamenewvb.buf, ti->name);
@@ -821,14 +723,6 @@
       if (fd_read(tc->backendpipe, databuf, TARBLKSZ - r) < 0)
         ohshite(_("error reading from dpkg-deb pipe"));
 
-    if (ensuresamefile && !statr) {
-      /* We do the check here before we tell the filesystem that we won't
-       * access the file content */
-      if (lseek(fd, SEEK_SET, 0))
-        ohshite(_("failed to rewind temporary file (%s)"), fnamenewvb.buf);
-      ensure_same_file(tc->pkg, fnamevb.buf, -1, &stab, fnamenewvb.buf, fd, ti);
-    }
-
     fd_writeback_init(fd);
 
     if (nifd->namenode->statoverride)
@@ -870,7 +764,7 @@
     varbuf_add_char(&hardlinkfn, '/');
     linknode = findnamenode(ti->linkname, 0);
     varbuf_add_str(&hardlinkfn, namenodetouse(linknode, tc->pkg)->name);
-    if (linknode->flags & fnnf_deferred_rename)
+    if (linknode->flags & (fnnf_deferred_rename|fnnf_new_conff))
       varbuf_add_str(&hardlinkfn, DPKGNEWEXT);
     varbuf_end_str(&hardlinkfn);
     if (link(hardlinkfn.buf,fnamenewvb.buf))
@@ -893,9 +787,6 @@
     internerr("unknown tar type '%d', but already checked", ti->type);
   }
 
-  if (ensuresamefile && !statr && ti->type != tar_filetype_file)
-    ensure_same_file(tc->pkg, fnamevb.buf, -1, &stab, fnamenewvb.buf, -1, ti);
-
   tarobject_set_perms(ti, fnamenewvb.buf, st);
   tarobject_set_mtime(ti, fnamenewvb.buf);
   tarobject_set_se_context(fnamevb.buf, fnamenewvb.buf, st->mode);
@@ -912,44 +803,8 @@
   /* First, check to see if it's a conffile. If so we don't install
    * it now - we leave it in .dpkg-new for --configure to take care of. */
   if (nifd->namenode->flags & fnnf_new_conff) {
-    struct pkginfo *pkg;
-
     debug(dbg_conffdetail,"tarobject conffile extracted");
     nifd->namenode->flags |= fnnf_elide_other_lists;
-
-    if (ensuresameconff) {
-      for (pkg = &tc->pkg->set->pkg; pkg; pkg = pkg->arch_next) {
-        if (pkg->status <= stat_configfiles || pkg == tc->pkg)
-          continue;
-        for (conff = pkg->installed.conffiles; conff; conff = conff->next) {
-          debug(dbg_conffdetail, "looking for conffile %s, has %s",
-                nifd->namenode->name, conff->name);
-          if (strcmp(conff->name, nifd->namenode->name) == 0)
-            break;
-        }
-        if (conff) {
-          char disthash[MD5HASHLEN + 1];
-          const char *refhash;
-
-          /* The hash in the Conffiles is only meaningful if the package
-           * configuration has been at least tried, otherwise we make the
-           * assumption that the hash of the .dpkg-new file that was there
-           * when we started is the one of the unpacked package */
-          refhash = (pkg->status > stat_unpacked) ? conff->hash : prevnewhash;
-          md5hash(pkg, disthash, fnamenewvb.buf, -1);
-          debug(dbg_conffdetail, "ensuresameconf in %s(%s): %s vs %s",
-                pkg_describe(pkg, pdo_always), statusinfos[pkg->status].name,
-                refhash, disthash);
-          if (strcmp(disthash, refhash))
-            ohshit(_("conffile '%s' is not in sync with other instances "
-                     "of the same package"), ti->name);
-        }
-      }
-      /* If we did not fail here, we don't need the backup of the already
-       * unpacked conffile anymore */
-      ensure_pathname_nonexisting(fnametmpvb.buf);
-    }
-
     return 0;
   }
 
@@ -975,7 +830,9 @@
       r = readlink(fnamevb.buf, symlinkfn.buf, symlinkfn.size);
       if (r < 0)
         ohshite(_("unable to read link `%.255s'"), ti->name);
-      assert(r == stab.st_size);
+      else if (r != stab.st_size)
+        ohshit(_("symbolic link '%.250s' size has changed from %jd to %zd"),
+               fnamevb.buf, stab.st_size, r);
       varbuf_trunc(&symlinkfn, r);
       varbuf_end_str(&symlinkfn);
       if (symlink(symlinkfn.buf,fnametmpvb.buf))
@@ -996,7 +853,8 @@
    * in .dpkg-new.
    */
 
-  if (ti->type == tar_filetype_file || ti->type == tar_filetype_symlink) {
+  if (ti->type == tar_filetype_file || ti->type == tar_filetype_hardlink ||
+      ti->type == tar_filetype_symlink) {
     nifd->namenode->flags |= fnnf_deferred_rename;
 
     debug(dbg_eachfiledetail, "tarobject done and installation deferred");
@@ -1145,12 +1003,11 @@
     if (pkg->installed.essential) {
       if (fc_removeessential) {
         warning(_("considering deconfiguration of essential\n"
-                  " package %s, to enable %s."),
-                pkg_describe(pkg, pdo_foreign), action);
+                  " package %s, to enable %s."), pkg->name, action);
       } else {
         fprintf(stderr, _("dpkg: no, %s is essential, will not deconfigure\n"
                           " it in order to enable %s.\n"),
-                pkg_describe(pkg, pdo_foreign), action);
+                pkg->name, action);
         return 0;
       }
     }
@@ -1172,7 +1029,7 @@
                           struct pkginfo *fixbyrm,
                           const char *why) {
   char action[512];
-  sprintf(action, _("removal of %.250s"), pkg_describe(fixbyrm, pdo_foreign));
+  sprintf(action, _("removal of %.250s"), fixbyrm->name);
   return try_deconfigure_can(force_depends, pdep->up->up, pdep,
                              action, fixbyrm, why);
 }
@@ -1197,22 +1054,20 @@
     ensure_package_clientdata(fixbydeconf);
     assert(fixbydeconf->clientdata->istobe == itb_normal);
 
-    sprintf(action, _("installation of %.250s"),
-            pkg_describe(pkg, pdo_foreign));
+    sprintf(action, _("installation of %.250s"), pkg->name);
     fprintf(stderr, _("dpkg: considering deconfiguration of %s,"
                       " which would be broken by %s ...\n"),
-            pkg_describe(fixbydeconf, pdo_foreign), action);
+            fixbydeconf->name, action);
 
     ok= try_deconfigure_can(force_breaks, fixbydeconf, dep->list,
                             action, NULL, why.buf);
     if (ok == 1) {
       fprintf(stderr, _("dpkg: yes, will deconfigure %s (broken by %s).\n"),
-              pkg_describe(fixbydeconf, pdo_foreign),
-              pkg_describe(pkg, pdo_foreign));
+              fixbydeconf->name, pkg->name);
     }
   } else {
     fprintf(stderr, _("dpkg: regarding %s containing %s:\n%s"),
-            pfilename, pkg_describe(pkg, pdo_foreign), why.buf);
+            pfilename, pkg->name, why.buf);
     ok= 0;
   }
   varbuf_destroy(&why);
@@ -1226,11 +1081,10 @@
   if (fixbydeconf && !f_autodeconf) {
     ohshit(_("installing %.250s would break %.250s, and\n"
              " deconfiguration is not permitted (--auto-deconfigure might help)"),
-           pkg_describe(pkg, pdo_foreign),
-           pkg_describe(fixbydeconf, pdo_foreign));
+           pkg->name, fixbydeconf->name);
   } else {
     ohshit(_("installing %.250s would break existing software"),
-           pkg_describe(pkg, pdo_foreign));
+           pkg->name);
   }
 }
 
@@ -1260,17 +1114,16 @@
       assert(fixbyrm->clientdata->istobe == itb_normal || fixbyrm->clientdata->istobe == itb_deconfigure);
       fixbyrm->clientdata->istobe= itb_remove;
       fprintf(stderr, _("dpkg: considering removing %s in favour of %s ...\n"),
-              pkg_describe(fixbyrm, pdo_foreign),
-              pkg_describe(pkg, pdo_foreign));
+              fixbyrm->name, pkg->name);
       if (!(fixbyrm->status == stat_installed ||
             fixbyrm->status == stat_triggerspending ||
             fixbyrm->status == stat_triggersawaited)) {
         fprintf(stderr,
                 _("%s is not properly installed - ignoring any dependencies on it.\n"),
-                pkg_describe(fixbyrm, pdo_foreign));
+                fixbyrm->name);
         pdep = NULL;
       } else {
-        for (pdep = fixbyrm->set->depended.installed;
+        for (pdep= fixbyrm->installed.depended;
              pdep;
              pdep = pdep->rev_next) {
           if (pdep->up->type != dep_depends && pdep->up->type != dep_predepends)
@@ -1287,7 +1140,7 @@
                providecheck;
                providecheck= providecheck->next) {
             if (providecheck->type != dep_provides) continue;
-            for (pdep = providecheck->list->ed->depended.installed;
+            for (pdep= providecheck->list->ed->installed.depended;
                  pdep;
                  pdep = pdep->rev_next) {
               if (pdep->up->type != dep_depends && pdep->up->type != dep_predepends)
@@ -1297,8 +1150,7 @@
               varbuf_end_str(&removalwhy);
               fprintf(stderr, _("dpkg"
                       ": may have trouble removing %s, as it provides %s ...\n"),
-                      pkg_describe(fixbyrm, pdo_foreign),
-                      providecheck->list->ed->name);
+                      fixbyrm->name, providecheck->list->ed->name);
               if (!try_remove_can(pdep,fixbyrm,removalwhy.buf))
                 goto break_from_both_loops_at_once;
             }
@@ -1312,11 +1164,10 @@
       if (!pdep && (fixbyrm->eflag & eflag_reinstreq)) {
         if (fc_removereinstreq) {
           fprintf(stderr, _("dpkg: package %s requires reinstallation, but will"
-                  " remove anyway as you requested.\n"),
-                  pkg_describe(fixbyrm, pdo_foreign));
+                  " remove anyway as you requested.\n"), fixbyrm->name);
         } else {
           fprintf(stderr, _("dpkg: package %s requires reinstallation, "
-                  "will not remove.\n"), pkg_describe(fixbyrm, pdo_foreign));
+                  "will not remove.\n"), fixbyrm->name);
           pdep= &flagdeppossi;
         }
       }
@@ -1325,8 +1176,7 @@
         push_conflictor(pkg, fixbyrm);
         varbuf_destroy(&conflictwhy); varbuf_destroy(&removalwhy);
         fprintf(stderr, _("dpkg: yes, will remove %s in favour of %s.\n"),
-                pkg_describe(fixbyrm, pdo_foreign),
-                pkg_describe(pkg, pdo_foreign));
+                fixbyrm->name, pkg->name);
         return;
       }
       /* Put it back. */
@@ -1335,10 +1185,9 @@
   }
   varbuf_end_str(&conflictwhy);
   fprintf(stderr, _("dpkg: regarding %s containing %s:\n%s"),
-          pfilename, pkg_describe(pkg, pdo_foreign), conflictwhy.buf);
+          pfilename, pkg->name, conflictwhy.buf);
   if (!force_conflicts(dep->list))
-    ohshit(_("conflicting packages - not installing %.250s"),
-           pkg_describe(pkg, pdo_foreign));
+    ohshit(_("conflicting packages - not installing %.250s"),pkg->name);
   warning(_("ignoring conflict, may proceed anyway!"));
   varbuf_destroy(&conflictwhy);
 
@@ -1362,17 +1211,14 @@
   const char *volatile thisarg;
   const char *const *volatile argp;
   jmp_buf ejbuf;
-  enum modstatdb_rw msdb_status;
 
   trigproc_install_hooks();
 
-  msdb_status = f_noact ?                          msdbrw_readonly :
-                (cipaction->arg_int == act_avail ? msdbrw_readonly :
-                 fc_nonroot ?                      msdbrw_write :
-                                                   msdbrw_needsuperuser) |
-                msdbrw_available_write;
-  msdb_status = modstatdb_open(msdb_status);
-  pkg_infodb_init(msdb_status);
+  modstatdb_open(f_noact ?                          msdbrw_readonly :
+                 (cipaction->arg_int == act_avail ? msdbrw_readonly :
+                  fc_nonroot ?                      msdbrw_write :
+                                                    msdbrw_needsuperuser) |
+                 msdbrw_available_write);
 
   checkpath();
   log_message("startup archives %s", cipaction->olong);
@@ -1518,13 +1364,11 @@
 
   if (pkg->want != want_install && pkg->want != want_hold) {
     if (f_alsoselect) {
-      printf(_("Selecting previously unselected package %s.\n"),
-             pkg_describe(pkg, pdo_foreign));
+      printf(_("Selecting previously unselected package %s.\n"), pkg->name);
       pkg->want = want_install;
       return true;
     } else {
-      printf(_("Skipping unselected package %s.\n"),
-             pkg_describe(pkg, pdo_foreign));
+      printf(_("Skipping unselected package %s.\n"), pkg->name);
       return false;
     }
   }
@@ -1543,22 +1387,20 @@
       fprintf(stderr, _("Version %.250s of %.250s already installed, "
                         "skipping.\n"),
               versiondescribe(&pkg->installed.version, vdew_nonambig),
-              pkg_describe(pkg, pdo_foreign));
+              pkg->name);
       return false;
     } else {
       return true;
     }
   } else {
     if (fc_downgrade) {
-      warning(_("downgrading %.250s from %.250s to %.250s."),
-              pkg_describe(pkg, pdo_foreign),
+      warning(_("downgrading %.250s from %.250s to %.250s."), pkg->name,
               versiondescribe(&pkg->installed.version, vdew_nonambig),
               versiondescribe(&pkg->available.version, vdew_nonambig));
       return true;
     } else {
       fprintf(stderr, _("Will not downgrade %.250s from version %.250s "
-                        "to %.250s, skipping.\n"),
-              pkg_describe(pkg, pdo_foreign),
+                        "to %.250s, skipping.\n"), pkg->name,
               versiondescribe(&pkg->installed.version, vdew_nonambig),
               versiondescribe(&pkg->available.version, vdew_nonambig));
       return false;
diff -uNr --exclude .git --exclude .bzr dpkg/src/archives.h /home/vorlon/devel/multiarch/dpkg-debian/src/archives.h
--- dpkg/src/archives.h	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/archives.h	2012-06-07 10:11:09.426073000 -0700
@@ -29,7 +29,6 @@
   int backendpipe;
   struct pkginfo *pkg;
   struct fileinlist **newfilesp;
-  bool pkg_in_sync; /* Are all Multi-arch: same instances synchronized? */
 };
 
 struct pkg_deconf_list {
@@ -52,7 +51,6 @@
 void cu_backendpipe(int argc, void **argv);
 
 void cu_installnew(int argc, void **argv);
-void cu_installsharedconf(int argc, void **argv);
 
 void cu_prermupgrade(int argc, void **argv);
 void cu_prerminfavour(int argc, void **argv);
diff -uNr --exclude .git --exclude .bzr dpkg/src/cleanup.c /home/vorlon/devel/multiarch/dpkg-debian/src/cleanup.c
--- dpkg/src/cleanup.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/cleanup.c	2012-06-07 10:11:09.426073000 -0700
@@ -37,7 +37,7 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "filesdb.h"
 #include "main.h"
@@ -110,37 +110,6 @@
   cleanup_pkg_failed--; cleanup_conflictor_failed--;
 }
 
-void
-cu_installsharedconf(int argc, void **argv) {
-  struct fileinlist *nifd = (struct fileinlist*)argv[0];
-  struct filenamenode *namenode;
-  struct stat stab;
-
-  cleanup_pkg_failed++; cleanup_conflictor_failed++;
-
-  namenode = nifd->namenode;
-  debug(dbg_eachfile, "cu_installsharedconf `%s' flags=%o", namenode->name,
-        namenode->flags);
-
-  setupfnamevbs(namenode->name);
-
-  if ((namenode->flags & fnnf_new_conff) && !lstat(fnametmpvb.buf, &stab)) {
-    /* OK, <foo>.dpkg-tmp exists. Restore it to <foo>.dpkg-new as it was a
-     * previously unpacked (but not configured) configuration file. */
-    if (secure_remove(fnamenewvb.buf) && errno != ENOENT && errno != ENOTDIR)
-      ohshite(_("unable to remove newly-installed version of `%.250s' to allow"
-              " reinstallation of backup copy"), fnamenewvb.buf);
-    /* Either we can do an atomic restore, or we've made room: */
-    if (rename(fnametmpvb.buf, fnamenewvb.buf))
-      ohshite(_("unable to restore backup version of `%.250s'"),
-              fnamenewvb.buf);
-  } else {
-    debug(dbg_eachfiledetail,"cu_installsharedconf not restoring");
-  }
-
-  cleanup_pkg_failed--; cleanup_conflictor_failed--;
-}
-
 void cu_prermupgrade(int argc, void **argv) {
   struct pkginfo *pkg= (struct pkginfo*)argv[0];
 
@@ -175,17 +144,16 @@
 
   if (conflictor) {
     maintainer_script_postinst(deconf, "abort-deconfigure",
-                               "in-favour", pkg_describe(infavour, pdo_foreign),
+                               "in-favour", infavour->name,
                                versiondescribe(&infavour->available.version,
                                                vdew_nonambig),
-                               "removing",
-                               pkg_describe(conflictor, pdo_foreign),
+                               "removing", conflictor->name,
                                versiondescribe(&conflictor->installed.version,
                                                vdew_nonambig),
                                NULL);
   } else {
     maintainer_script_postinst(deconf, "abort-deconfigure",
-                               "in-favour", pkg_describe(infavour, pdo_foreign),
+                               "in-favour", infavour->name,
                                versiondescribe(&infavour->available.version,
                                                vdew_nonambig),
                                NULL);
@@ -200,7 +168,7 @@
 
   if (cleanup_conflictor_failed++) return;
   maintainer_script_postinst(conflictor, "abort-remove",
-                             "in-favour", pkg_describe(infavour, pdo_foreign),
+                             "in-favour", infavour->name,
                              versiondescribe(&infavour->available.version,
                                              vdew_nonambig),
                              NULL);
@@ -219,7 +187,7 @@
                         "abort-install", NULL);
   pkg->status= stat_notinstalled;
   pkg->eflag &= ~eflag_reinstreq;
-  pkgbin_blank(&pkg->installed, true);
+  pkgbin_blank(&pkg->installed);
   modstatdb_note(pkg);
   cleanup_pkg_failed--;
 }
diff -uNr --exclude .git --exclude .bzr dpkg/src/configure.c /home/vorlon/devel/multiarch/dpkg-debian/src/configure.c
--- dpkg/src/configure.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/configure.c	2012-06-07 10:11:09.426073000 -0700
@@ -4,8 +4,6 @@
  *
  * Copyright © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
  * Copyright © 1999, 2002 Wichert Akkerman <wichert@deephackmode.org>
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,6 +45,7 @@
 #include <dpkg/string.h>
 #include <dpkg/buffer.h>
 #include <dpkg/file.h>
+#include <dpkg/path.h>
 #include <dpkg/subproc.h>
 #include <dpkg/command.h>
 #include <dpkg/triglib.h>
@@ -60,6 +59,7 @@
 	{ cfo_keep,		cfo_prompt_keep },	/* User edited. */
 };
 
+static void md5hash(struct pkginfo *pkg, char *hashbuf, const char *fn);
 static void showdiff(const char *old, const char *new);
 static enum conffopt promptconfaction(struct pkginfo *pkg, const char *cfgfile,
                                       const char *realold, const char *realnew,
@@ -86,7 +86,7 @@
 		conff->hash = EMPTY_HASH;
 		return;
 	}
-	md5hash(pkg, currenthash, cdr.buf, -1);
+	md5hash(pkg, currenthash, cdr.buf);
 
 	varbuf_reset(&cdr2);
 	varbuf_add_str(&cdr2, cdr.buf);
@@ -104,7 +104,7 @@
 		ohshite(_("unable to stat new distributed conffile '%.250s'"),
 		        cdr2.buf);
 	}
-	md5hash(pkg, newdisthash, cdr2.buf, -1);
+	md5hash(pkg, newdisthash, cdr2.buf);
 
 	/* Copy the permissions from the installed version to the new
 	 * distributed version. */
@@ -166,8 +166,7 @@
 		strcpy(cdr2rest, DPKGOLDEXT);
 		if (unlink(cdr2.buf) && errno != ENOENT)
 			warning(_("%s: failed to remove old backup '%.250s': %s"),
-			        pkg_describe(pkg, pdo_foreign), cdr2.buf,
-			        strerror(errno));
+			        pkg->name, cdr2.buf, strerror(errno));
 
 		varbuf_add_str(&cdr, DPKGDISTEXT);
 		varbuf_end_str(&cdr);
@@ -175,32 +174,27 @@
 		trig_file_activate(usenode, pkg);
 		if (rename(cdr2.buf, cdr.buf))
 			warning(_("%s: failed to rename '%.250s' to '%.250s': %s"),
-			        pkg_describe(pkg, pdo_foreign), cdr2.buf,
-			        cdr.buf, strerror(errno));
+			        pkg->name, cdr2.buf, cdr.buf, strerror(errno));
 		break;
 	case cfo_keep:
 		strcpy(cdr2rest, DPKGNEWEXT);
 		if (unlink(cdr2.buf))
 			warning(_("%s: failed to remove '%.250s': %s"),
-			        pkg_describe(pkg, pdo_foreign), cdr2.buf,
-			        strerror(errno));
+			        pkg->name, cdr2.buf, strerror(errno));
 		break;
 	case cfo_install | cfof_backup:
 		strcpy(cdr2rest, DPKGDISTEXT);
 		if (unlink(cdr2.buf) && errno != ENOENT)
 			warning(_("%s: failed to remove old distributed version '%.250s': %s"),
-			        pkg_describe(pkg, pdo_foreign), cdr2.buf,
-			        strerror(errno));
+			        pkg->name, cdr2.buf, strerror(errno));
 		strcpy(cdr2rest, DPKGOLDEXT);
 		if (unlink(cdr2.buf) && errno != ENOENT)
 			warning(_("%s: failed to remove '%.250s' (before overwrite): %s"),
-			        pkg_describe(pkg, pdo_foreign), cdr2.buf,
-			        strerror(errno));
+			        pkg->name, cdr2.buf, strerror(errno));
 		if (!(what & cfof_userrmd))
 			if (link(cdr.buf, cdr2.buf))
 				warning(_("%s: failed to link '%.250s' to '%.250s': %s"),
-				        pkg_describe(pkg, pdo_foreign), cdr.buf,
-				        cdr2.buf, strerror(errno));
+				        pkg->name, cdr.buf, cdr2.buf, strerror(errno));
 		/* Fall through. */
 	case cfo_install:
 		printf(_("Installing new version of config file %s ...\n"),
@@ -257,42 +251,18 @@
 {
 	struct varbuf aemsgs = VARBUF_INIT;
 	struct conffile *conff;
-	struct pkginfo *otherpkg;
 	int ok;
 
 	if (pkg->status == stat_notinstalled)
 		ohshit(_("no package named `%s' is installed, cannot configure"),
-		       pkg_describe(pkg, pdo_foreign));
+		       pkg->name);
 	if (pkg->status == stat_installed)
 		ohshit(_("package %.250s is already installed and configured"),
-		       pkg_describe(pkg, pdo_foreign));
+		       pkg->name);
 	if (pkg->status != stat_unpacked && pkg->status != stat_halfconfigured)
 		ohshit(_("package %.250s is not ready for configuration\n"
 		         " cannot configure (current status `%.250s')"),
-		       pkg_describe(pkg, pdo_foreign),
-		       statusinfos[pkg->status].name);
-
-	for (otherpkg = &pkg->set->pkg; otherpkg; otherpkg = otherpkg->arch_next) {
-		if (otherpkg == pkg || otherpkg->status < stat_halfinstalled)
-			continue;
-		if(versioncompare(&pkg->installed.version,
-		                  &otherpkg->installed.version))
-			ohshit(_("%s %s cannot be configured because %s "
-			         "is in a different version (%s)"),
-			       pkg_describe(pkg, pdo_always),
-			       versiondescribe(&pkg->installed.version,
-			                       vdew_nonambig),
-			       pkg_describe(otherpkg, pdo_always),
-			       versiondescribe(&otherpkg->installed.version,
-			                       vdew_nonambig));
-		if (otherpkg->status < stat_unpacked)
-			ohshit(_("%s cannot be configured because %s "
-			         "is not ready for configuration "
-			         "(current status '%s')"),
-			       pkg_describe(pkg, pdo_always),
-			       pkg_describe(otherpkg, pdo_always),
-			       statusinfos[otherpkg->status].name);
-	}
+		       pkg->name, statusinfos[pkg->status].name);
 
 	if (dependtry > 1)
 		if (findbreakcycle(pkg))
@@ -322,14 +292,14 @@
 		varbuf_end_str(&aemsgs);
 		fprintf(stderr,
 		        _("dpkg: dependency problems prevent configuration of %s:\n%s"),
-		        pkg_describe(pkg, pdo_foreign), aemsgs.buf);
+		        pkg->name, aemsgs.buf);
 		varbuf_destroy(&aemsgs);
 		ohshit(_("dependency problems - leaving unconfigured"));
 	} else if (aemsgs.used) {
 		varbuf_end_str(&aemsgs);
 		fprintf(stderr,
 		        _("dpkg: %s: dependency problems, but configuring anyway as you requested:\n%s"),
-		        pkg_describe(pkg, pdo_foreign), aemsgs.buf);
+		        pkg->name, aemsgs.buf);
 	}
 	varbuf_destroy(&aemsgs);
 	sincenothing = 0;
@@ -339,7 +309,7 @@
 		            _("Package is in a very bad inconsistent state - you should\n"
 		              " reinstall it before attempting configuration."));
 
-	printf(_("Setting up %s (%s) ...\n"), pkg_describe(pkg, pdo_foreign),
+	printf(_("Setting up %s (%s) ...\n"), pkg->name,
 	       versiondescribe(&pkg->installed.version, vdew_nonambig));
 	log_action("configure", pkg);
 
@@ -386,6 +356,7 @@
 	                           NULL);
 
 	pkg->eflag = eflag_ok;
+	pkg->trigpend_head = NULL;
 	post_postinst_tasks(pkg, stat_installed);
 }
 
@@ -405,7 +376,7 @@
 {
 	static struct varbuf target = VARBUF_INIT;
 	struct stat stab;
-	int r;
+	ssize_t r;
 	int loopprotect;
 
 	varbuf_reset(result);
@@ -424,8 +395,7 @@
 			if (errno != ENOENT)
 				warning(_("%s: unable to stat config file '%s'\n"
 				          " (= '%s'): %s"),
-				        pkg_describe(pkg, pdo_foreign), in,
-				        result->buf, strerror(errno));
+				        pkg->name, in, result->buf, strerror(errno));
 			debug(dbg_conffdetail, "conffderef nonexistent");
 			return 0;
 		} else if (S_ISREG(stab.st_mode)) {
@@ -437,9 +407,7 @@
 			      loopprotect);
 			if (loopprotect++ >= 25) {
 				warning(_("%s: config file '%s' is a circular link\n"
-				          " (= '%s')"),
-				        pkg_describe(pkg, pdo_foreign), in,
-				        result->buf);
+				          " (= '%s')"), pkg->name, in, result->buf);
 				return -1;
 			}
 
@@ -449,16 +417,19 @@
 			if (r < 0) {
 				warning(_("%s: unable to readlink conffile '%s'\n"
 				          " (= '%s'): %s"),
-				        pkg_describe(pkg, pdo_foreign), in,
-				        result->buf, strerror(errno));
+				        pkg->name, in, result->buf, strerror(errno));
+				return -1;
+			} else if (r != stab.st_size) {
+				warning(_("symbolic link '%.250s' size has "
+				          "changed from %jd to %zd"),
+				        result->buf, stab.st_size, r);
 				return -1;
 			}
-			assert(r == stab.st_size); /* XXX: debug */
 			varbuf_trunc(&target, r);
 			varbuf_end_str(&target);
 
 			debug(dbg_conffdetail,
-			      "conffderef readlink gave %d, '%s'",
+			      "conffderef readlink gave %zd, '%s'",
 			      r, target.buf);
 
 			if (target.buf[0] == '/') {
@@ -472,8 +443,8 @@
 				if (r < 0) {
 					warning(_("%s: conffile '%.250s' resolves to degenerate filename\n"
 					          " ('%s' is a symlink to '%s')"),
-					        pkg_describe(pkg, pdo_foreign),
-					        in, result->buf, target.buf);
+					        pkg->name, in, result->buf,
+					        target.buf);
 					return -1;
 				}
 				if (result->buf[r] == '/')
@@ -487,7 +458,7 @@
 			varbuf_end_str(result);
 		} else {
 			warning(_("%s: conffile '%.250s' is not a plain file or symlink (= '%s')"),
-			        pkg_describe(pkg, pdo_foreign), in, result->buf);
+			        pkg->name, in, result->buf);
 			return -1;
 		}
 	}
@@ -502,29 +473,24 @@
  * @param[in] pkg The package to act on.
  * @param[out] hashbuf The buffer to store the generated hash.
  * @param[in] fn The filename.
- * @param[in] fd A file descriptor ready to use, or -1.
  */
-void
-md5hash(struct pkginfo *pkg, char *hashbuf, const char *fn, int fd)
+static void
+md5hash(struct pkginfo *pkg, char *hashbuf, const char *fn)
 {
-	bool close_fd = false;
+	static int fd;
 
-	if (fd < 0) {
-		fd = open(fn, O_RDONLY);
-		close_fd = true;
-	}
+	fd = open(fn, O_RDONLY);
 
 	if (fd >= 0) {
 		push_cleanup(cu_closefd, ehflag_bombout, NULL, 0, 1, &fd);
 		fd_md5(fd, hashbuf, -1, _("md5hash"));
 		pop_cleanup(ehflag_normaltidy); /* fd = open(cdr.buf) */
-		if (close_fd && close(fd))
-			ohshite(_("error closing %.250s"), fn);
+		close(fd);
 	} else if (errno == ENOENT) {
 		strcpy(hashbuf, NONEXISTENTFLAG);
 	} else {
-		warning(_("%s: unable to open %s for hash: %s"),
-		        pkg_describe(pkg, pdo_foreign), fn, strerror(errno));
+		warning(_("%s: unable to open conffile %s for hash: %s"),
+		        pkg->name, fn, strerror(errno));
 		strcpy(hashbuf, "-");
 	}
 }
@@ -694,9 +660,7 @@
 		else if (what & cfof_install)
 			fprintf(stderr, _(" The default action is to install the new version.\n"));
 
-		s = strrchr(cfgfile, '/');
-		if (!s || !*++s)
-			s = cfgfile;
+		s = path_basename(cfgfile);
 		fprintf(stderr, "*** %s (Y/I/N/O/D/Z) %s ? ",
 		        s,
 		        (what & cfof_keep) ? _("[default=N]") :
diff -uNr --exclude .git --exclude .bzr dpkg/src/depcon.c /home/vorlon/devel/multiarch/dpkg-debian/src/depcon.c
--- dpkg/src/depcon.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/depcon.c	2012-06-07 10:11:09.426073000 -0700
@@ -3,8 +3,6 @@
  * depcon.c - dependency and conflict checking
  *
  * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +32,7 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 
+#include "filesdb.h"
 #include "infodb.h"
 #include "main.h"
 
@@ -76,7 +75,7 @@
    * able to do something straight away when findbreakcycle returns. */
   sofar= thislink;
   for (sol = sofar; !(sol != sofar && sol->pkg == dependedon); sol = sol->prev) {
-    if (!pkg_infodb_has_file(sol->pkg, &sol->pkg->installed, POSTINSTFILE))
+    if (!pkg_infodb_has_file(sol->pkg, POSTINSTFILE))
       break;
   }
 
@@ -85,7 +84,7 @@
   sol->possi->cyclebreak = true;
 
   debug(dbg_depcon, "cycle broken at %s -> %s",
-        pkg_describe(sol->possi->up->up, pdo_foreign), sol->possi->ed->name);
+        sol->possi->up->up->name, sol->possi->ed->name);
 
   return true;
 }
@@ -102,7 +101,7 @@
   struct cyclesofarlink thislink, *sol;
   struct dependency *dep;
   struct deppossi *possi, *providelink;
-  struct pkginfo *provider, *pkg_pos;
+  struct pkginfo *provider;
 
   if (pkg->clientdata->color == black)
     return false;
@@ -113,11 +112,11 @@
 
     for (sol = sofar; sol; sol = sol->prev) {
       varbuf_add_str(&str_pkgs, " <- ");
-      varbuf_pkg(&str_pkgs, sol->pkg, pdo_foreign);
+      varbuf_add_str(&str_pkgs, sol->pkg->name);
     }
     varbuf_end_str(&str_pkgs);
-    debug(dbg_depcondetail, "findbreakcyclerecursive %s %s",
-          pkg_describe(pkg, pdo_foreign), str_pkgs.buf);
+    debug(dbg_depcondetail, "findbreakcyclerecursive %s %s", pkg->name,
+          str_pkgs.buf);
     varbuf_destroy(&str_pkgs);
   }
   thislink.pkg= pkg;
@@ -129,12 +128,10 @@
       /* Don't find the same cycles again. */
       if (possi->cyclebreak) continue;
       thislink.possi= possi;
-      pkg_pos = NULL;
-      while ((pkg_pos = deppossi_get_pkg(possi, wpb_installed, pkg_pos)))
-        if (foundcyclebroken(&thislink, sofar, pkg_pos, possi))
-          return true;
+      if (foundcyclebroken(&thislink, sofar, possi->ed,possi))
+        return true;
       /* Right, now we try all the providers ... */
-      for (providelink = possi->ed->depended.installed;
+      for (providelink= possi->ed->installed.depended;
            providelink;
            providelink = providelink->rev_next) {
         if (providelink->up->type != dep_provides) continue;
@@ -160,7 +157,8 @@
 
   /* Clear the visited flag of all packages before we traverse them. */
   iter = pkg_db_iter_new();
-  while ((tpkg = pkg_db_iter_next_pkg(iter))) {
+  while ((tpkg = pkg_db_iter_next(iter))) {
+    ensure_package_clientdata(tpkg);
     tpkg->clientdata->color = white;
   }
   pkg_db_iter_free(iter);
@@ -201,7 +199,7 @@
   varbufdependency(&depstr, dep);
   varbuf_end_str(&depstr);
 
-  varbuf_printf(addto, fmt, pkg_describe(dep->up, pdo_foreign), depstr.buf);
+  varbuf_printf(addto, fmt, dep->up->name, depstr.buf);
   varbuf_destroy(&depstr);
 }
 
@@ -235,7 +233,6 @@
 {
   struct deppossi *possi;
   struct deppossi *provider;
-  struct pkginfo *pkg_pos;
   int nconflicts;
 
   /* Use this buffer so that when internationalisation comes along we
@@ -294,90 +291,79 @@
      * can return ‘false’. */
 
     for (possi= dep->list; possi; possi= possi->next) {
-      pkg_pos = NULL;
-      while ((pkg_pos = deppossi_get_pkg(possi, wpb_by_status, pkg_pos))) {
-        switch (pkg_pos->clientdata->istobe) {
-        case itb_remove:
-          sprintf(linebuf, _("  %.250s is to be removed.\n"),
-                  pkg_describe(pkg_pos, pdo_foreign));
-          break;
-        case itb_deconfigure:
-          sprintf(linebuf, _("  %.250s is to be deconfigured.\n"),
-                  pkg_describe(pkg_pos, pdo_foreign));
-          break;
-        case itb_installnew:
-          if (versionsatisfied(&pkg_pos->available, possi))
+      switch (possi->ed->clientdata->istobe) {
+      case itb_remove:
+        sprintf(linebuf,_("  %.250s is to be removed.\n"),possi->ed->name);
+        break;
+      case itb_deconfigure:
+        sprintf(linebuf,_("  %.250s is to be deconfigured.\n"),possi->ed->name);
+        break;
+      case itb_installnew:
+        if (versionsatisfied(&possi->ed->available, possi))
+          return true;
+        sprintf(linebuf,_("  %.250s is to be installed, but is version %.250s.\n"),
+                possi->ed->name,
+                versiondescribe(&possi->ed->available.version,vdew_nonambig));
+        break;
+      case itb_normal: case itb_preinstall:
+        switch (possi->ed->status) {
+        case stat_installed:
+        case stat_triggerspending:
+          if (versionsatisfied(&possi->ed->installed, possi))
             return true;
-          sprintf(linebuf, _("  %.250s is to be installed, but is version "
-                             "%.250s.\n"),
-                  pkg_describe(pkg_pos, pdo_foreign | pdo_avail),
-                  versiondescribe(&pkg_pos->available.version, vdew_nonambig));
+          sprintf(linebuf,_("  %.250s is installed, but is version %.250s.\n"),
+                  possi->ed->name,
+                  versiondescribe(&possi->ed->installed.version,vdew_nonambig));
           break;
-        case itb_normal: case itb_preinstall:
-          switch (pkg_pos->status) {
-          case stat_installed:
-          case stat_triggerspending:
-            if (versionsatisfied(&pkg_pos->installed, possi))
+        case stat_notinstalled:
+          /* Don't say anything about this yet - it might be a virtual package.
+           * Later on, if nothing has put anything in linebuf, we know that it
+           * isn't and issue a diagnostic then. */
+          *linebuf = '\0';
+          break;
+        case stat_triggersawaited:
+            if (canfixbytrigaw && versionsatisfied(&possi->ed->installed, possi))
+              *canfixbytrigaw = possi->ed;
+            /* Fall through to have a chance to return OK due to
+             * allowunconfigd and to fill the explanation */
+        case stat_unpacked:
+        case stat_halfconfigured:
+          if (allowunconfigd) {
+            if (!informativeversion(&possi->ed->configversion)) {
+              sprintf(linebuf, _("  %.250s is unpacked, but has never been configured.\n"),
+                      possi->ed->name);
+              break;
+            } else if (!versionsatisfied(&possi->ed->installed, possi)) {
+              sprintf(linebuf, _("  %.250s is unpacked, but is version %.250s.\n"),
+                      possi->ed->name,
+                      versiondescribe(&possi->ed->installed.version, vdew_nonambig));
+              break;
+            } else if (!versionsatisfied3(&possi->ed->configversion,
+                                          &possi->version,possi->verrel)) {
+              sprintf(linebuf, _("  %.250s latest configured version is %.250s.\n"),
+                      possi->ed->name,
+                      versiondescribe(&possi->ed->configversion,vdew_nonambig));
+              break;
+            } else {
               return true;
-            sprintf(linebuf, _("  %.250s is installed, but is version "
-                               "%.250s.\n"), pkg_describe(pkg_pos, pdo_foreign),
-                    versiondescribe(&pkg_pos->installed.version, vdew_nonambig));
-            break;
-          case stat_notinstalled:
-            /* Don't say anything about this yet - it might be a virtual package.
-             * Later on, if nothing has put anything in linebuf, we know that it
-             * isn't and issue a diagnostic then. */
-            *linebuf = '\0';
-            break;
-          case stat_triggersawaited:
-              if (canfixbytrigaw && versionsatisfied(&pkg_pos->installed, possi))
-                *canfixbytrigaw = pkg_pos;
-              /* Fall through to have a chance to return OK due to
-               * allowunconfigd and to fill the explanation */
-          case stat_unpacked:
-          case stat_halfconfigured:
-            if (allowunconfigd) {
-              if (!informativeversion(&pkg_pos->configversion)) {
-                sprintf(linebuf, _("  %.250s is unpacked, but has never been "
-                                   "configured.\n"),
-                        pkg_describe(pkg_pos, pdo_foreign));
-                break;
-              } else if (!versionsatisfied(&pkg_pos->installed, possi)) {
-                sprintf(linebuf, _("  %.250s is unpacked, but is version "
-                                   "%.250s.\n"),
-                        pkg_describe(pkg_pos, pdo_foreign),
-                        versiondescribe(&pkg_pos->installed.version,
-                                        vdew_nonambig));
-                break;
-              } else if (!versionsatisfied3(&pkg_pos->configversion,
-                                            &possi->version, possi->verrel)) {
-                sprintf(linebuf, _("  %.250s latest configured version is "
-                                   "%.250s.\n"),
-                        pkg_describe(pkg_pos, pdo_foreign),
-                        versiondescribe(&pkg_pos->configversion, vdew_nonambig));
-                break;
-              } else {
-                return true;
-              }
             }
-            /* Fall through. */
-          default:
-            sprintf(linebuf, _("  %.250s is %s.\n"),
-                    pkg_describe(pkg_pos, pdo_foreign),
-                    gettext(statusstrings[pkg_pos->status]));
-            break;
           }
-          break;
+          /* Fall through. */
         default:
-          internerr("unknown istobe depended '%d'", pkg_pos->clientdata->istobe);
+          sprintf(linebuf, _("  %.250s is %s.\n"),
+                  possi->ed->name, gettext(statusstrings[possi->ed->status]));
+          break;
         }
-        varbuf_add_str(whynot, linebuf);
+        break;
+      default:
+        internerr("unknown istobe depended '%d'", possi->ed->clientdata->istobe);
       }
+      varbuf_add_str(whynot, linebuf);
 
       /* If there was no version specified we try looking for Providers. */
       if (possi->verrel == dvr_none) {
         /* See if the package we're about to install Provides it. */
-        for (provider = possi->ed->depended.available;
+        for (provider= possi->ed->available.depended;
              provider;
              provider = provider->rev_next) {
           if (provider->up->type != dep_provides) continue;
@@ -386,7 +372,7 @@
         }
 
         /* Now look at the packages already on the system. */
-        for (provider = possi->ed->depended.installed;
+        for (provider= possi->ed->installed.depended;
              provider;
              provider = provider->rev_next) {
           if (provider->up->type != dep_provides) continue;
@@ -399,16 +385,12 @@
              * information above. */
             continue;
           case itb_remove:
-            sprintf(linebuf, _("  %.250s provides %.250s but is to be "
-                               "removed.\n"),
-                    pkg_describe(provider->up->up, pdo_foreign),
-                    possi->ed->name);
+            sprintf(linebuf, _("  %.250s provides %.250s but is to be removed.\n"),
+                    provider->up->up->name, possi->ed->name);
             break;
           case itb_deconfigure:
-            sprintf(linebuf, _("  %.250s provides %.250s but is to be "
-                               "deconfigured.\n"),
-                    pkg_describe(provider->up->up, pdo_foreign),
-                    possi->ed->name);
+            sprintf(linebuf, _("  %.250s provides %.250s but is to be deconfigured.\n"),
+                    provider->up->up->name, possi->ed->name);
             break;
           case itb_normal: case itb_preinstall:
             if (provider->up->up->status == stat_installed ||
@@ -417,8 +399,7 @@
             if (provider->up->up->status == stat_triggersawaited)
               *canfixbytrigaw = provider->up->up;
             sprintf(linebuf, _("  %.250s provides %.250s but is %s.\n"),
-                    pkg_describe(provider->up->up, pdo_foreign),
-                    possi->ed->name,
+                    provider->up->up->name, possi->ed->name,
                     gettext(statusstrings[provider->up->up->status]));
             break;
           default:
@@ -448,78 +429,71 @@
     possi= dep->list;
     nconflicts= 0;
 
-    if (possi->ed != possi->up->up->set) {
+    if (possi->ed != possi->up->up) {
       /* If the package conflicts with or breaks itself it must mean
        * other packages which provide the same virtual name. We
        * therefore don't look at the real package and go on to the
        * virtual ones. */
 
-      pkg_pos = NULL;
-      while ((pkg_pos = deppossi_get_pkg(possi, wpb_by_status, pkg_pos))) {
-        switch (pkg_pos->clientdata->istobe) {
-        case itb_remove:
+      switch (possi->ed->clientdata->istobe) {
+      case itb_remove:
+        break;
+      case itb_installnew:
+        if (!versionsatisfied(&possi->ed->available, possi)) break;
+        sprintf(linebuf, _("  %.250s (version %.250s) is to be installed.\n"),
+                possi->ed->name,
+                versiondescribe(&possi->ed->available.version,vdew_nonambig));
+        varbuf_add_str(whynot, linebuf);
+        if (!canfixbyremove)
+          return false;
+        nconflicts++;
+        *canfixbyremove= possi->ed;
+        break;
+      case itb_deconfigure:
+        if (dep->type == dep_breaks)
+          break; /* Already deconfiguring this. */
+        /* Fall through. */
+      case itb_normal: case itb_preinstall:
+        switch (possi->ed->status) {
+        case stat_notinstalled: case stat_configfiles:
           break;
-        case itb_installnew:
-          if (!versionsatisfied(&pkg_pos->available, possi))
-            break;
-          sprintf(linebuf, _("  %.250s (version %.250s) is to be installed.\n"),
-                  pkg_describe(pkg_pos, pdo_foreign | pdo_avail),
-                  versiondescribe(&pkg_pos->available.version, vdew_nonambig));
+        case stat_halfinstalled: case stat_unpacked:
+        case stat_halfconfigured:
+          if (dep->type == dep_breaks)
+            break; /* No problem. */
+        case stat_installed:
+        case stat_triggerspending:
+        case stat_triggersawaited:
+          if (!versionsatisfied(&possi->ed->installed, possi)) break;
+          sprintf(linebuf, _("  %.250s (version %.250s) is present and %s.\n"),
+                  possi->ed->name,
+                  versiondescribe(&possi->ed->installed.version,vdew_nonambig),
+                  gettext(statusstrings[possi->ed->status]));
           varbuf_add_str(whynot, linebuf);
           if (!canfixbyremove)
             return false;
           nconflicts++;
-          *canfixbyremove = pkg_pos;
-          break;
-        case itb_deconfigure:
-          if (dep->type == dep_breaks)
-            break; /* Already deconfiguring this. */
-          /* Fall through. */
-        case itb_normal:
-        case itb_preinstall:
-          switch (pkg_pos->status) {
-          case stat_notinstalled:
-          case stat_configfiles:
-            break;
-          case stat_halfinstalled:
-          case stat_unpacked:
-          case stat_halfconfigured:
-            if (dep->type == dep_breaks)
-              break; /* No problem. */
-          case stat_installed:
-          case stat_triggerspending:
-          case stat_triggersawaited:
-            if (!versionsatisfied(&pkg_pos->installed, possi))
-              break;
-            sprintf(linebuf, _("  %.250s (version %.250s) is present and %s.\n"),
-                    pkg_describe(pkg_pos, pdo_foreign),
-                    versiondescribe(&pkg_pos->installed.version, vdew_nonambig),
-                    gettext(statusstrings[pkg_pos->status]));
-            varbuf_add_str(whynot, linebuf);
-            if (!canfixbyremove)
-              return false;
-            nconflicts++;
-            *canfixbyremove = pkg_pos;
-          }
-          break;
-        default:
-          internerr("unknown istobe conflict '%d'", pkg_pos->clientdata->istobe);
+          *canfixbyremove= possi->ed;
         }
+        break;
+      default:
+        internerr("unknown istobe conflict '%d'",
+                  possi->ed->clientdata->istobe);
       }
     }
 
     /* If there was no version specified we try looking for Providers. */
     if (possi->verrel == dvr_none) {
       /* See if the package we're about to install Provides it. */
-      for (provider = possi->ed->depended.available;
+      for (provider= possi->ed->available.depended;
            provider;
            provider = provider->rev_next) {
         if (provider->up->type != dep_provides) continue;
         if (provider->up->up->clientdata->istobe != itb_installnew) continue;
-        if (provider->up->up->set == dep->up->set)
+        if (provider->up->up == dep->up)
           continue; /* Conflicts and provides the same. */
         sprintf(linebuf, _("  %.250s provides %.250s and is to be installed.\n"),
-                pkg_describe(provider->up->up, pdo_foreign), possi->ed->name);
+                provider->up->up->name, possi->ed->name);
         varbuf_add_str(whynot, linebuf);
         /* We can't remove the one we're about to install: */
         if (canfixbyremove)
@@ -528,12 +502,12 @@
       }
 
       /* Now look at the packages already on the system. */
-      for (provider = possi->ed->depended.installed;
+      for (provider= possi->ed->installed.depended;
            provider;
            provider = provider->rev_next) {
         if (provider->up->type != dep_provides) continue;
 
-        if (provider->up->up->set == dep->up->set)
+        if (provider->up->up == dep->up)
           continue; /* Conflicts and provides the same. */
 
         switch (provider->up->up->clientdata->istobe) {
@@ -561,7 +535,7 @@
           case stat_triggersawaited:
             sprintf(linebuf,
                     _("  %.250s provides %.250s and is present and %s.\n"),
-                    pkg_describe(provider->up->up, pdo_foreign), possi->ed->name,
+                    provider->up->up->name, possi->ed->name,
                     gettext(statusstrings[provider->up->up->status]));
             varbuf_add_str(whynot, linebuf);
             if (!canfixbyremove)
@@ -586,37 +560,3 @@
 
   } /* if (dependency) {...} else {...} */
 }
-
-struct pkginfo *
-deppossi_get_pkg(struct deppossi *possi, enum which_pkgbin wpb,
-                 struct pkginfo *startpkg)
-{
-  struct pkginfo *next;
-  struct pkgbin *pkgbin;
-
-  next = startpkg ? startpkg->arch_next : &possi->ed->pkg;
-
-  while (next) {
-    switch (wpb) {
-    case wpb_installed:
-      pkgbin = &next->installed;
-      break;
-    case wpb_available:
-      pkgbin = &next->available;
-      break;
-    case wpb_by_status:
-      if (next->clientdata->istobe == itb_installnew)
-        pkgbin = &next->available;
-      else
-        pkgbin = &next->installed;
-      break;
-    default:
-      internerr("bad value (%d) for wpb param in deppossi_get_pkg()", wpb);
-    }
-    if (archsatisfied(pkgbin, possi))
-      return next;
-    next = next->arch_next;
-  }
-
-  return NULL;
-}
diff -uNr --exclude .git --exclude .bzr dpkg/src/divertcmd.c /home/vorlon/devel/multiarch/dpkg-debian/src/divertcmd.c
--- dpkg/src/divertcmd.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/divertcmd.c	2012-06-07 10:11:09.426073000 -0700
@@ -4,8 +4,6 @@
  * Copyright © 1995 Ian Jackson
  * Copyright © 2000, 2001 Wichert Akkerman
  * Copyright © 2010 Guillem Jover <guillem@debian.org>
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,18 +38,16 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/arch.h>
 #include <dpkg/file.h>
 #include <dpkg/glob.h>
 #include <dpkg/buffer.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "filesdb.h"
-#include "infodb.h"
 
 
-const char thisname[] = "dpkg-divert";
-const char printforhelp[] = N_("Use --help for help about querying packages.");
+static const char printforhelp[] = N_(
+"Use --help for help about diverting files.");
 
 static const char *admindir;
 
@@ -67,7 +63,8 @@
 static void
 printversion(const struct cmdinfo *cip, const char *value)
 {
-	printf(_("Debian %s version %s.\n"), thisname, DPKG_VERSION_ARCH);
+	printf(_("Debian %s version %s.\n"), dpkg_get_progname(),
+	       DPKG_VERSION_ARCH);
 
 	printf(_(
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -88,7 +85,7 @@
 {
 	printf(_(
 "Usage: %s [<option> ...] <command>\n"
-"\n"), thisname);
+"\n"), dpkg_get_progname());
 
 	printf(_(
 "Commands:\n"
@@ -270,10 +267,10 @@
 static const char *
 diversion_pkg_name(struct diversion *d)
 {
-	if (d->pkgset == NULL)
+	if (d->pkg == NULL)
 		return ":";
 	else
-		return d->pkgset->name;
+		return d->pkg->name;
 }
 
 static const char *
@@ -335,10 +332,10 @@
 		name_to = d->useinstead->name;
 	}
 
-	if (d->pkgset == NULL)
+	if (d->pkg == NULL)
 		pkgname = NULL;
 	else
-		pkgname = d->pkgset->name;
+		pkgname = d->pkg->name;
 
 	return varbuf_diversion(&str, pkgname, name_from, name_to);
 }
@@ -400,7 +397,7 @@
 	struct file file_from, file_to;
 	struct diversion *contest, *altname;
 	struct filenamenode *fnn_from, *fnn_to;
-	struct pkgset *pkgset;
+	struct pkginfo *pkg;
 
 	opt_pkgname_match_any = false;
 
@@ -441,9 +438,9 @@
 
 	/* Handle package name. */
 	if (opt_pkgname == NULL)
-		pkgset = NULL;
+		pkg = NULL;
 	else
-		pkgset = pkg_db_find_set(opt_pkgname);
+		pkg = pkg_db_find(opt_pkgname);
 
 	/* Check we are not stomping over an existing diversion. */
 	if (fnn_from->divert || fnn_to->divert) {
@@ -451,7 +448,7 @@
 		    strcmp(fnn_to->divert->camefrom->name, filename) == 0 &&
 		    fnn_from->divert && fnn_from->divert->useinstead &&
 		    strcmp(fnn_from->divert->useinstead->name, opt_divertto) == 0 &&
-		    fnn_from->divert->pkgset == pkgset) {
+		    fnn_from->divert->pkg == pkg) {
 			if (opt_verbose > 0)
 				printf(_("Leaving '%s'\n"),
 				       diversion_describe(fnn_from->divert));
@@ -472,12 +469,12 @@
 	altname->camefrom = fnn_from;
 	altname->camefrom->divert = contest;
 	altname->useinstead = NULL;
-	altname->pkgset = pkgset;
+	altname->pkg = pkg;
 
 	contest->useinstead = fnn_to;
 	contest->useinstead->divert = altname;
 	contest->camefrom = NULL;
-	contest->pkgset = pkgset;
+	contest->pkg = pkg;
 
 	/* Update database and file system if needed. */
 	if (opt_verbose > 0)
@@ -500,8 +497,7 @@
 	struct filenamenode *namenode;
 	struct diversion *contest, *altname;
 	struct file file_from, file_to;
-	struct pkgset *pkgset;
-	const char *arch = getenv("DPKG_MAINTSCRIPT_ARCH");
+	struct pkginfo *pkg;
 
 	if (!filename || argv[1])
 		badusage(_("--%s needs a single argument"), cipaction->olong);
@@ -517,9 +513,9 @@
 	}
 
 	if (opt_pkgname == NULL)
-		pkgset = NULL;
+		pkg = NULL;
 	else
-		pkgset = pkg_db_find_set(opt_pkgname);
+		pkg = pkg_db_find(opt_pkgname);
 
 	contest = namenode->divert;
 	altname = contest->useinstead->divert;
@@ -532,44 +528,13 @@
 		       diversion_current(filename),
 		       diversion_describe(contest));
 
-	if (!opt_pkgname_match_any && pkgset != contest->pkgset)
+	if (!opt_pkgname_match_any && pkg != contest->pkg)
 		ohshit(_("mismatch on package\n"
 		         "  when removing `%s'\n"
 		         "  found `%s'"),
 		       diversion_current(filename),
 		       diversion_describe(contest));
 
-	/* Ignore removal request if the diverted file is still owned
-	 * by another package in the same set */
-	if (pkgset && arch) {
-		struct pkginfo *pkg;
-		struct filepackages_iterator *iter;
-		bool ignore_remove = false;
-		struct dpkg_arch *darch = dpkg_arch_find(arch);
-
-		for (pkg = &pkgset->pkg; pkg; pkg = pkg->arch_next) {
-			ensure_packagefiles_available(pkg);
-		}
-
-		iter = filepackages_iter_new(namenode);
-		while ((pkg = filepackages_iter_next(iter))) {
-			if (pkg->set == pkgset && pkg->installed.arch != darch) {
-				ignore_remove = true;
-				break;
-			}
-		}
-		filepackages_iter_free(iter);
-
-		if (ignore_remove) {
-			if (opt_verbose > 0)
-				printf(_("Ignoring removal request of '%s' "
-				         "because diverted file is still "
-				         "owned by the package set.\n"),
-				       diversion_describe(contest));
-			exit(0);
-		}
-	}
-
 	if (opt_verbose > 0)
 		printf(_("Removing '%s'\n"), diversion_describe(contest));
 
@@ -670,12 +635,12 @@
 	if (namenode == NULL)
 		return 0;
 
-	if (namenode->divert->pkgset == NULL)
+	if (namenode->divert->pkg == NULL)
 		/* Indicate package is local using something not in package
 		 * namespace. */
 		printf("LOCAL\n");
 	else
-		printf("%s\n", namenode->divert->pkgset->name);
+		printf("%s\n", namenode->divert->pkg->name);
 
 	return 0;
 }
@@ -728,14 +693,14 @@
 {
 	const char *env_pkgname;
 	int ret;
-	enum modstatdb_rw msdb_status;
 
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
+	dpkg_set_progname("dpkg-divert");
 	standard_startup();
-	myopt(&argv, cmdinfos);
+	myopt(&argv, cmdinfos, printforhelp);
 
 	admindir = dpkg_db_set_dir(admindir);
 
@@ -748,14 +713,11 @@
 
 	setvbuf(stdout, NULL, _IONBF, 0);
 
-	msdb_status = modstatdb_open(msdbrw_readonly);
-	pkg_infodb_init(msdb_status);
 	filesdbinit();
 	ensure_diversions();
 
 	ret = cipaction->action(argv);
 
-	modstatdb_shutdown();
 	standard_shutdown();
 
 	return ret;
diff -uNr --exclude .git --exclude .bzr dpkg/src/divertdb.c /home/vorlon/devel/multiarch/dpkg-debian/src/divertdb.c
--- dpkg/src/divertdb.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/divertdb.c	2012-06-07 10:11:09.426073000 -0700
@@ -105,9 +105,8 @@
 		oicontest->camefrom = NULL;
 
 		fgets_must(linebuf, sizeof(linebuf), file, diversionsname);
-		oicontest->pkgset = strcmp(linebuf, ":") ?
-		                    pkg_db_find_set(linebuf) : NULL;
-		oialtname->pkgset = oicontest->pkgset;
+		oicontest->pkg = oialtname->pkg = strcmp(linebuf, ":") ?
+		                                  pkg_db_find(linebuf) : NULL;
 
 		if (oialtname->camefrom->divert ||
 		    oicontest->useinstead->divert)
diff -uNr --exclude .git --exclude .bzr dpkg/src/enquiry.c /home/vorlon/devel/multiarch/dpkg-debian/src/enquiry.c
--- dpkg/src/enquiry.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/enquiry.c	2012-06-07 10:11:09.426073000 -0700
@@ -3,8 +3,6 @@
  * enquiry.c - status enquiry and listing options
  *
  * Copyright © 1995,1996 Ian Jackson <ian@chiark.greenend.org.uk>
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,12 +39,10 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/arch.h>
 #include <dpkg/pkg-show.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "filesdb.h"
-#include "infodb.h"
 #include "main.h"
 
 struct badstatinfo {
@@ -122,13 +118,13 @@
   const char *pdesc;
 
   maxl= 57;
-  l= strlen(pkg->set->name);
+  l= strlen(pkg->name);
   if (l>20) maxl -= (l-20);
 
   pdesc = pkg_summary(pkg, &l);
   l = min(l, maxl);
 
-  printf(" %-20s %.*s\n", pkg_describe(pkg, pdo_foreign), l, pdesc);
+  printf(" %-20s %.*s\n",pkg->name,l,pdesc);
 }
 
 int
@@ -136,13 +132,11 @@
 {
   const struct badstatinfo *bsi;
   bool head_running = false;
-  enum modstatdb_rw msdb_status;
 
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  msdb_status = modstatdb_open(msdbrw_readonly);
-  pkg_infodb_init(msdb_status);
+  modstatdb_open(msdbrw_readonly);
 
   for (bsi= badstatinfos; bsi->yesno; bsi++) {
     struct pkgiterator *it;
@@ -150,7 +144,7 @@
     bool head = false;
 
     it = pkg_db_iter_new();
-    while ((pkg = pkg_db_iter_next_pkg(it))) {
+    while ((pkg = pkg_db_iter_next(it))) {
       if (!bsi->yesno(pkg,bsi)) continue;
       if (!head_running) {
         if (modstatdb_is_locked())
@@ -209,22 +203,20 @@
   struct sectionentry *sectionentries, *se, **sep;
   struct pkgiterator *it;
   struct pkginfo *pkg;
-  const char *thissect, *pkgname;
+  const char *thissect;
   char buf[20];
   int width;
-  enum modstatdb_rw msdb_status;
 
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  msdb_status = modstatdb_open(msdbrw_readonly);
-  pkg_infodb_init(msdb_status);
+  modstatdb_open(msdbrw_readonly);
 
   totalcount= 0;
   sectionentries = NULL;
   sects= 0;
   it = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next_pkg(it))) {
+  while ((pkg = pkg_db_iter_next(it))) {
     if (!yettobeunpacked(pkg, &thissect)) continue;
     for (se= sectionentries; se && strcasecmp(thissect,se->name); se= se->next);
     if (!se) {
@@ -247,7 +239,7 @@
 
   if (totalcount <= 12) {
     it = pkg_db_iter_new();
-    while ((pkg = pkg_db_iter_next_pkg(it))) {
+    while ((pkg = pkg_db_iter_next(it))) {
       if (!yettobeunpacked(pkg, NULL))
         continue;
       describebriefly(pkg);
@@ -260,14 +252,12 @@
       width= 70-strlen(se->name)-strlen(buf);
       while (width > 59) { putchar(' '); width--; }
       it = pkg_db_iter_new();
-      while ((pkg = pkg_db_iter_next_pkg(it))) {
+      while ((pkg = pkg_db_iter_next(it))) {
         if (!yettobeunpacked(pkg,&thissect)) continue;
         if (strcasecmp(thissect,se->name)) continue;
-        pkgname = pkg_describe(pkg, pdo_foreign);
-        width -= strlen(pkgname);
-        width--;
+        width -= strlen(pkg->name); width--;
         if (width < 4) { printf(" ..."); break; }
-        printf(" %s", pkgname);
+        printf(" %s",pkg->name);
       }
       pkg_db_iter_free(it);
       putchar('\n');
@@ -297,15 +287,13 @@
                        const char *feature_name)
 {
   struct pkginfo *pkg;
-  enum modstatdb_rw msdb_status;
 
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  msdb_status = modstatdb_open(msdbrw_readonly);
-  pkg_infodb_init(msdb_status);
+  modstatdb_open(msdbrw_readonly);
 
-  pkg = pkg_db_find_pkg("dpkg", NULL);
+  pkg = pkg_db_find("dpkg");
   switch (pkg->status) {
   case stat_installed:
   case stat_triggerspending:
@@ -358,15 +346,6 @@
                                 _("multiple Conflicts and Replaces"));
 }
 
-int
-assertmultiarch(const char *const *argv)
-{
-  /* FIXME: update with dpkg version introducing actual multiarch support. */
-  struct versionrevision version = { 0, "1.16.1", NULL };
-
-  return assert_version_support(argv, &version, _("multi-arch"));
-}
-
 /**
  * Print a single package which:
  *  (a) is the target of one or more relevant predependencies.
@@ -389,19 +368,17 @@
   struct pkginfo *pkg = NULL, *startpkg, *trypkg;
   struct dependency *dep;
   struct deppossi *possi, *provider;
-  enum modstatdb_rw msdb_status;
 
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  msdb_status = modstatdb_open(msdbrw_readonly | msdbrw_available_readonly);
-  pkg_infodb_init(msdb_status);
+  modstatdb_open(msdbrw_readonly | msdbrw_available_readonly);
   /* We use clientdata->istobe to detect loops. */
   clear_istobes();
 
   dep = NULL;
   it = pkg_db_iter_new();
-  while (!dep && (pkg = pkg_db_iter_next_pkg(it))) {
+  while (!dep && (pkg = pkg_db_iter_next(it))) {
     /* Ignore packages user doesn't want. */
     if (pkg->want != want_install)
       continue;
@@ -435,28 +412,19 @@
     for (possi = dep->list, pkg = NULL;
          !pkg && possi;
          possi=possi->next) {
-      trypkg = NULL;
-      while (!pkg && (trypkg = deppossi_get_pkg(possi, wpb_available, trypkg))) {
-        if (trypkg->files && versionsatisfied(&trypkg->available, possi) &&
-            trypkg->clientdata->istobe == itb_normal) {
-          pkg = trypkg;
-          break;
-        }
-        if (possi->verrel != dvr_none)
+      trypkg= possi->ed;
+      if (trypkg->files && versionsatisfied(&trypkg->available,possi)) {
+        if (trypkg->clientdata->istobe == itb_normal) { pkg= trypkg; break; }
+      }
+      if (possi->verrel != dvr_none) continue;
+      for (provider=possi->ed->available.depended;
+           !pkg && provider;
+           provider=provider->next) {
+        if (provider->up->type != dep_provides) continue;
+        trypkg= provider->up->up;
+        if (!trypkg->files)
           continue;
-        for (provider = possi->ed->depended.available;
-             !pkg && provider;
-             provider=provider->next) {
-          if (provider->up->type != dep_provides)
-            continue;
-          trypkg = provider->up->up;
-          if (!trypkg->files)
-            continue;
-          if (trypkg->clientdata->istobe == itb_normal) {
-            pkg = trypkg;
-            break;
-          }
-        }
+        if (trypkg->clientdata->istobe == itb_normal) { pkg= trypkg; break; }
       }
     }
     if (!pkg) {
@@ -465,8 +433,7 @@
       varbuf_end_str(&vb);
       fprintf(stderr, _("dpkg: cannot see how to satisfy pre-dependency:\n %s\n"),vb.buf);
       ohshit(_("cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"),
-             pkg_describe(dep->up, pdo_foreign | pdo_avail),
-             pkg_describe(startpkg, pdo_foreign | pdo_avail));
+             dep->up->name,startpkg->name);
     }
     pkg->clientdata->istobe= itb_preinstall;
     for (dep= pkg->available.depends; dep; dep= dep->next) {
@@ -492,7 +459,7 @@
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  printf("%s\n", dpkg_arch_get_native()->name);
+  printf("%s\n", native_arch);
 
   m_output(stdout, _("<standard output>"));
 
@@ -508,28 +475,6 @@
 }
 
 int
-print_foreign_archs(const char *const *argv)
-{
-  struct dpkg_arch *arch;
-  const char *space = "";
-
-  if (*argv)
-    badusage(_("--%s takes no arguments"), cipaction->olong);
-
-  for (arch = dpkg_arch_get_list(); arch; arch = arch->next) {
-    if (arch->type != arch_foreign)
-      continue;
-    printf("%s%s", space, arch->name);
-    space = " ";
-  }
-  printf("\n");
-
-  m_output(stdout, _("<standard output>"));
-
-  return 0;
-}
-
-int
 cmpversions(const char *const *argv)
 {
   struct relationinfo {
@@ -566,8 +511,8 @@
   };
 
   const struct relationinfo *rip;
-  const char *emsg;
   struct versionrevision a, b;
+  struct dpkg_error err;
   int r;
 
   if (!argv[0] || !argv[1] || !argv[2] || argv[3])
@@ -579,16 +524,24 @@
   if (!rip->string) badusage(_("--compare-versions bad relation"));
 
   if (*argv[0] && strcmp(argv[0],"<unknown>")) {
-    emsg= parseversion(&a,argv[0]);
-    if (emsg)
-      ohshit(_("version '%s' has bad syntax: %s"), argv[0], emsg);
+    if (parseversion(&a, argv[0], &err) < 0) {
+      if (err.type == DPKG_MSG_WARN)
+        warning(_("version '%s' has bad syntax: %s"), argv[0], err.str);
+      else
+        ohshit(_("version '%s' has bad syntax: %s"), argv[0], err.str);
+      dpkg_error_destroy(&err);
+    }
   } else {
     blankversion(&a);
   }
   if (*argv[2] && strcmp(argv[2],"<unknown>")) {
-    emsg= parseversion(&b,argv[2]);
-    if (emsg)
-      ohshit(_("version '%s' has bad syntax: %s"), argv[2], emsg);
+    if (parseversion(&b, argv[2], &err) < 0) {
+      if (err.type == DPKG_MSG_WARN)
+        warning(_("version '%s' has bad syntax: %s"), argv[2], err.str);
+      else
+        ohshit(_("version '%s' has bad syntax: %s"), argv[2], err.str);
+      dpkg_error_destroy(&err);
+    }
   } else {
     blankversion(&b);
   }
diff -uNr --exclude .git --exclude .bzr dpkg/src/errors.c /home/vorlon/devel/multiarch/dpkg-debian/src/errors.c
--- dpkg/src/errors.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/errors.c	2012-06-07 10:11:09.426073000 -0700
@@ -37,7 +37,7 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "main.h"
 
@@ -47,7 +47,7 @@
 
 struct error_report {
   struct error_report *next;
-  char *what;
+  const char *what;
 };
 
 static struct error_report *reports = NULL;
@@ -58,7 +58,7 @@
   struct error_report *nr;
 
   fprintf(stderr, _("%s: error processing %s (--%s):\n %s\n"),
-          thisname, arg, cipaction->olong, emsg);
+          dpkg_get_progname(), arg, cipaction->olong, emsg);
 
   statusfd_send("status: %s : %s : %s", arg, "error", emsg);
 
@@ -66,34 +66,29 @@
   if (!nr) {
     fprintf(stderr,
             _("%s: failed to allocate memory for new entry in list of failed packages: %s"),
-            thisname, strerror(errno));
+            dpkg_get_progname(), strerror(errno));
     abort_processing = true;
     nr= &emergency;
   }
-  nr->what = m_strdup(arg);
+  nr->what= arg;
   nr->next = NULL;
   *lastreport= nr;
   lastreport= &nr->next;
 
   if (nerrs++ < errabort) return;
-  fprintf(stderr, _("%s: too many errors, stopping\n"), thisname);
+  fprintf(stderr, _("%s: too many errors, stopping\n"), dpkg_get_progname());
   abort_processing = true;
 }
 
 int
 reportbroken_retexitstatus(int ret)
 {
-  struct error_report *next;
   if (reports) {
     fputs(_("Errors were encountered while processing:\n"),stderr);
     while (reports) {
       fprintf(stderr," %s\n",reports->what);
-      next = reports->next;
-      free(reports->what);
-      free(reports);
-      reports = next;
+      reports= reports->next;
     }
-    lastreport = &reports;
   }
   if (abort_processing) {
     fputs(_("Processing was halted because there were too many errors.\n"),stderr);
@@ -108,11 +103,11 @@
     return false;
   if (fc_hold) {
     fprintf(stderr, _("Package %s was on hold, processing it anyway as you requested\n"),
-            pkg_describe(pkg, pdo_foreign));
+            pkg->name);
     return false;
   }
   printf(_("Package %s is on hold, not touching it.  Use --force-hold to override.\n"),
-         pkg_describe(pkg, pdo_foreign));
+         pkg->name);
   return true;
 }
 
diff -uNr --exclude .git --exclude .bzr dpkg/src/filesdb.c /home/vorlon/devel/multiarch/dpkg-debian/src/filesdb.c
--- dpkg/src/filesdb.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/filesdb.c	2012-06-07 10:11:09.426073000 -0700
@@ -49,7 +49,6 @@
 #include <dpkg/progress.h>
 
 #include "filesdb.h"
-#include "infodb.h"
 #include "main.h"
 
 /*** Package control information database directory routines. ***/
@@ -77,17 +76,14 @@
 }
 
 const char *
-pkgadminfile(struct pkginfo *pkg, struct pkgbin *pkgbin, const char *filetype)
+pkgadminfile(struct pkginfo *pkg, const char *filetype)
 {
   static struct varbuf vb;
 
   varbuf_reset(&vb);
   varbuf_add_str(&vb, infodir);
-  varbuf_add_str(&vb, pkg->set->name);
-  if (pkgbin->multiarch == multiarch_same && pkg_infodb_format() >= 1) {
-    varbuf_add_char(&vb, ':');
-    varbuf_add_str(&vb, pkgbin->arch->name);
-  }
+  varbuf_add_char(&vb, '/');
+  varbuf_add_str(&vb, pkg->name);
   varbuf_add_char(&vb, '.');
   varbuf_add_str(&vb, filetype);
   varbuf_end_str(&vb);
@@ -300,7 +296,7 @@
     return;
   }
 
-  filelistfile = pkgadminfile(pkg, &pkg->installed, LISTFILE);
+  filelistfile= pkgadminfile(pkg,LISTFILE);
 
   onerr_abort++;
 
@@ -308,14 +304,12 @@
 
   if (fd==-1) {
     if (errno != ENOENT)
-      ohshite(_("unable to open files list file for package `%.250s'"),
-              pkg_describe(pkg, pdo_foreign));
+      ohshite(_("unable to open files list file for package `%.250s'"),pkg->name);
     onerr_abort--;
     if (pkg->status != stat_configfiles) {
       if (saidread == 1) putc('\n',stderr);
       warning(_("files list file for package `%.250s' missing, assuming "
-                "package has no files currently installed."),
-              pkg_describe(pkg, pdo_foreign));
+                "package has no files currently installed."), pkg->name);
     }
     pkg->clientdata->files = NULL;
     pkg->clientdata->fileslistvalid = true;
@@ -326,30 +320,28 @@
 
    if(fstat(fd, &stat_buf))
      ohshite(_("unable to stat files list file for package '%.250s'"),
-             pkg_describe(pkg, pdo_foreign));
+             pkg->name);
 
    if (stat_buf.st_size) {
      loaded_list = nfmalloc(stat_buf.st_size);
      loaded_list_end = loaded_list + stat_buf.st_size;
 
     if (fd_read(fd, loaded_list, stat_buf.st_size) < 0)
-      ohshite(_("reading files list for package '%.250s'"),
-              pkg_describe(pkg, pdo_foreign));
+      ohshite(_("reading files list for package '%.250s'"), pkg->name);
 
     lendp= &pkg->clientdata->files;
     thisline = loaded_list;
     while (thisline < loaded_list_end) {
       if (!(ptr = memchr(thisline, '\n', loaded_list_end - thisline)))
         ohshit(_("files list file for package '%.250s' is missing final newline"),
-               pkg_describe(pkg, pdo_foreign));
+               pkg->name);
       /* Where to start next time around. */
       nextline = ptr + 1;
       /* Strip trailing ‘/’. */
       if (ptr > thisline && ptr[-1] == '/') ptr--;
       /* Add the file to the list. */
       if (ptr == thisline)
-        ohshit(_("files list file for package `%.250s' contains empty filename"),
-               pkg_describe(pkg, pdo_foreign));
+        ohshit(_("files list file for package `%.250s' contains empty filename"),pkg->name);
       *ptr = '\0';
       lendp = pkg_files_add_file(pkg, thisline, fnn_nocopy, lendp);
       thisline = nextline;
@@ -357,8 +349,7 @@
   }
   pop_cleanup(ehflag_normaltidy); /* fd = open() */
   if (close(fd))
-    ohshite(_("error closing files list file for package `%.250s'"),
-            pkg_describe(pkg, pdo_foreign));
+    ohshite(_("error closing files list file for package `%.250s'"),pkg->name);
 
   onerr_abort--;
 
@@ -405,7 +396,7 @@
 
     pkg->clientdata->listfile_phys_offs = -1;
 
-    listfile = pkgadminfile(pkg, &pkg->installed, LISTFILE);
+    listfile = pkgadminfile(pkg, LISTFILE);
 
     fd = open(listfile, O_RDONLY);
     if (fd < 0)
@@ -441,7 +432,7 @@
     const char *listfile;
     int fd;
 
-    listfile = pkgadminfile(pkg, &pkg->installed, LISTFILE);
+    listfile = pkgadminfile(pkg, LISTFILE);
 
     fd = open(listfile, O_RDONLY | O_NONBLOCK);
     if (fd != -1) {
@@ -465,7 +456,7 @@
 
   if (allpackagesdone) return;
   if (saidread<2) {
-    int max = pkg_db_count_pkg();
+    int max = pkg_db_count();
 
     saidread=1;
     progress_init(&progress, _("(Reading database ... "), max);
@@ -506,14 +497,14 @@
  * has any flag bits set in mask.
  */
 void
-write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin,
-                      struct fileinlist *list, enum fnnflags mask)
+write_filelist_except(struct pkginfo *pkg, struct fileinlist *list,
+                      enum fnnflags mask)
 {
   static struct varbuf newvb;
   const char *listfile;
   FILE *file;
 
-  listfile = pkgadminfile(pkg, pkgbin, LISTFILE);
+  listfile = pkgadminfile(pkg, LISTFILE);
 
   varbuf_reset(&newvb);
   varbuf_add_str(&newvb, listfile);
@@ -522,8 +513,7 @@
 
   file= fopen(newvb.buf,"w+");
   if (!file)
-    ohshite(_("unable to create updated files list file for package %s"),
-            pkg_describe(pkg, pdo_foreign));
+    ohshite(_("unable to create updated files list file for package %s"),pkg->name);
   push_cleanup(cu_closestream, ehflag_bombout, NULL, 0, 1, (void *)file);
   while (list) {
     if (!(mask && (list->namenode->flags & mask))) {
@@ -533,21 +523,16 @@
     list= list->next;
   }
   if (ferror(file))
-    ohshite(_("failed to write to updated files list file for package %s"),
-            pkg_describe(pkg, pdo_foreign));
+    ohshite(_("failed to write to updated files list file for package %s"),pkg->name);
   if (fflush(file))
-    ohshite(_("failed to flush updated files list file for package %s"),
-            pkg_describe(pkg, pdo_foreign));
+    ohshite(_("failed to flush updated files list file for package %s"),pkg->name);
   if (fsync(fileno(file)))
-    ohshite(_("failed to sync updated files list file for package %s"),
-            pkg_describe(pkg, pdo_foreign));
+    ohshite(_("failed to sync updated files list file for package %s"),pkg->name);
   pop_cleanup(ehflag_normaltidy); /* file = fopen() */
   if (fclose(file))
-    ohshite(_("failed to close updated files list file for package %s"),
-            pkg_describe(pkg, pdo_foreign));
+    ohshite(_("failed to close updated files list file for package %s"),pkg->name);
   if (rename(newvb.buf, listfile))
-    ohshite(_("failed to install updated files list file for package %s"),
-            pkg_describe(pkg, pdo_foreign));
+    ohshite(_("failed to install updated files list file for package %s"),pkg->name);
 
   dir_sync_path(pkgadmindir());
 
diff -uNr --exclude .git --exclude .bzr dpkg/src/filesdb.h /home/vorlon/devel/multiarch/dpkg-debian/src/filesdb.h
--- dpkg/src/filesdb.h	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/filesdb.h	2012-06-07 10:11:09.426073000 -0700
@@ -40,7 +40,7 @@
  * When we read files contained info about a particular package we set the
  * ‘files’ member of the clientdata struct to the appropriate thing. When
  * not yet set the files pointer is made to point to ‘fileslist_uninited’
- * (this is available only internally, withing filesdb.c - the published
+ * (this is available only internally, within filesdb.c - the published
  * interface is ensure_*_available).
  */
 
@@ -126,15 +126,14 @@
 struct diversion {
   struct filenamenode *useinstead;
   struct filenamenode *camefrom;
-  struct pkgset *pkgset;
+  struct pkginfo *pkg;
 
   /* The ‘contested’ halves are in this list for easy cleanup. */
   struct diversion *next;
 };
 
 const char *pkgadmindir(void);
-const char *pkgadminfile(struct pkginfo *pkg, struct pkgbin *pkgbin,
-                         const char *filetype);
+const char *pkgadminfile(struct pkginfo *pkg, const char *filetype);
 
 struct filepackages_iterator;
 struct filepackages_iterator *filepackages_iter_new(struct filenamenode *fnn);
@@ -164,8 +163,8 @@
 void ensure_allinstfiles_available_quiet(void);
 void note_must_reread_files_inpackage(struct pkginfo *pkg);
 struct filenamenode *findnamenode(const char *filename, enum fnnflags flags);
-void write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin,
-                           struct fileinlist *list, enum fnnflags mask);
+void write_filelist_except(struct pkginfo *pkg, struct fileinlist *list,
+                           enum fnnflags mask);
 
 struct reversefilelistiter { struct fileinlist *todo; };
 
diff -uNr --exclude .git --exclude .bzr dpkg/src/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/src/.gitignore
--- dpkg/src/.gitignore	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1,6 +0,0 @@
-dpkg
-dpkg-divert
-dpkg-query
-dpkg-statoverride
-dpkg-trigger
-t.tmp
diff -uNr --exclude .git --exclude .bzr dpkg/src/help.c /home/vorlon/devel/multiarch/dpkg-debian/src/help.c
--- dpkg/src/help.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/help.c	2012-06-07 10:11:09.426073000 -0700
@@ -64,17 +64,17 @@
   }
 
   debug(dbg_eachfile,"namenodetouse namenode=`%s' pkg=%s",
-        namenode->name, pkg_describe(pkg, pdo_foreign));
+        namenode->name,pkg->name);
 
   r=
-    (namenode->divert->useinstead && namenode->divert->pkgset != pkg->set)
+    (namenode->divert->useinstead && namenode->divert->pkg != pkg)
       ? namenode->divert->useinstead : namenode;
 
   debug(dbg_eachfile,
         "namenodetouse ... useinstead=%s camefrom=%s pkg=%s return %s",
         namenode->divert->useinstead ? namenode->divert->useinstead->name : "<none>",
         namenode->divert->camefrom ? namenode->divert->camefrom->name : "<none>",
-        namenode->divert->pkgset ? namenode->divert->pkgset->name : "<none>",
+        namenode->divert->pkg ? namenode->divert->pkg->name : "<none>",
         r->name);
 
   return r;
@@ -104,7 +104,7 @@
 
   path_list = getenv("PATH");
   if (!path_list)
-    ohshit(_("error: PATH is not set."));
+    ohshit(_("PATH is not set."));
 
   for (prog = prog_list; *prog; prog++) {
     struct stat stab;
@@ -152,22 +152,11 @@
   return false;
 }
 
-static bool
-ignore_depends_possi(struct deppossi *possi)
-{
-  struct pkginfo *pkg = NULL;
-  while ((pkg = deppossi_get_pkg(possi, wpb_installed, pkg))) {
-    if (ignore_depends(pkg))
-      return true;
-  }
-  return false;
-}
-
 bool
 force_depends(struct deppossi *possi)
 {
   return fc_depends ||
-         ignore_depends_possi(possi) ||
+         ignore_depends(possi->ed) ||
          ignore_depends(possi->up->up);
 }
 
@@ -175,7 +164,7 @@
 force_breaks(struct deppossi *possi)
 {
   return fc_breaks ||
-         ignore_depends_possi(possi) ||
+         ignore_depends(possi->ed) ||
          ignore_depends(possi->up->up);
 }
 
@@ -225,8 +214,11 @@
 void
 post_postinst_tasks(struct pkginfo *pkg, enum pkgstatus new_status)
 {
-  pkg->trigpend_head = NULL;
-  pkg->status = pkg->trigaw.head ? stat_triggersawaited : new_status;
+  if (new_status < stat_triggersawaited)
+    pkg->status = new_status;
+  else
+    pkg->status = pkg->trigaw.head ? stat_triggersawaited :
+                  pkg->trigpend_head ? stat_triggerspending : stat_installed;
 
   post_postinst_tasks_core(pkg);
 }
@@ -277,8 +269,8 @@
 
   pid = subproc_fork();
   if (pid == 0) {
-    if (setenv("DPKG_MAINTSCRIPT_PACKAGE", pkg->set->name, 1) ||
-        setenv("DPKG_MAINTSCRIPT_ARCH", pif->arch->name, 1) ||
+    if (setenv("DPKG_MAINTSCRIPT_PACKAGE", pkg->name, 1) ||
+        setenv("DPKG_MAINTSCRIPT_ARCH", pif->arch, 1) ||
         setenv("DPKG_MAINTSCRIPT_NAME", cmd->argv[0], 1) ||
         setenv("DPKG_RUNNING_VERSION", PACKAGE_VERSION, 1))
       ohshite(_("unable to setenv for maintainer script"));
@@ -304,7 +296,7 @@
   struct stat stab;
   char buf[100];
 
-  scriptpath = pkgadminfile(pkg, &pkg->installed, scriptname);
+  scriptpath= pkgadminfile(pkg,scriptname);
   sprintf(buf, _("installed %s script"), desc);
 
   command_init(&cmd, scriptpath, buf);
@@ -406,7 +398,7 @@
   struct stat stab;
   char buf[100];
 
-  oldscriptpath = pkgadminfile(pkg, &pkg->installed, scriptname);
+  oldscriptpath= pkgadminfile(pkg,scriptname);
   sprintf(buf, _("old %s script"), desc);
 
   command_init(&cmd, oldscriptpath, buf);
@@ -463,7 +455,7 @@
   struct pkginfo *pkg;
 
   it = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next_pkg(it)) != NULL) {
+  while ((pkg = pkg_db_iter_next(it)) != NULL) {
     ensure_package_clientdata(pkg);
     pkg->clientdata->istobe= itb_normal;
     pkg->clientdata->replacingfilesandsaid= 0;
@@ -482,13 +474,13 @@
   size_t namelen;
 
   debug(dbg_veryverbose, "dir_has_conffiles '%s' (from %s)", file->name,
-        pkg_describe(pkg, pdo_foreign));
+	pkg->name);
   namelen = strlen(file->name);
   for (conff= pkg->installed.conffiles; conff; conff= conff->next) {
       if (strncmp(file->name, conff->name, namelen) == 0 &&
           conff->name[namelen] == '/') {
 	debug(dbg_veryverbose, "directory %s has conffile %s from %s",
-	      file->name, conff->name, pkg_describe(pkg, pdo_foreign));
+	      file->name, conff->name, pkg->name);
 	return true;
       }
   }
@@ -507,12 +499,12 @@
   struct pkginfo *other_pkg;
 
   debug(dbg_veryverbose, "dir_is_used_by_others '%s' (except %s)", file->name,
-        pkg ? pkg_describe(pkg, pdo_foreign) : "<none>");
+        pkg ? pkg->name : "<none>");
 
   iter = filepackages_iter_new(file);
   while ((other_pkg = filepackages_iter_next(iter))) {
     debug(dbg_veryverbose, "dir_is_used_by_others considering %s ...",
-          pkg_describe(other_pkg, pdo_foreign));
+          other_pkg->name);
     if (other_pkg == pkg)
       continue;
 
@@ -536,7 +528,7 @@
   size_t namelen;
 
   debug(dbg_veryverbose, "dir_is_used_by_pkg '%s' (by %s)",
-        file->name, pkg ? pkg_describe(pkg, pdo_foreign) : "<none>");
+        file->name, pkg ? pkg->name : "<none>");
 
   namelen = strlen(file->name);
 
@@ -633,10 +625,8 @@
 }
 
 void log_action(const char *action, struct pkginfo *pkg) {
-  const char *pkgname = pkg_describe(pkg, pdo_foreign);
-
-  log_message("%s %s %s %s", action, pkgname,
+  log_message("%s %s %s %s", action, pkg->name,
 	      versiondescribe(&pkg->installed.version, vdew_nonambig),
 	      versiondescribe(&pkg->available.version, vdew_nonambig));
-  statusfd_send("processing: %s: %s", action, pkgname);
+  statusfd_send("processing: %s: %s", action, pkg->name);
 }
diff -uNr --exclude .git --exclude .bzr dpkg/src/infodb.c /home/vorlon/devel/multiarch/dpkg-debian/src/infodb.c
--- dpkg/src/infodb.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/infodb.c	2012-06-07 10:11:09.426073000 -0700
@@ -25,263 +25,25 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <assert.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <dirent.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/dir.h>
-#include <dpkg/fdio.h>
 #include <dpkg/debug.h>
-#include <dpkg/varbuf.h>
 
 #include "filesdb.h"
 #include "infodb.h"
 
-/* Forward declarations of static functions */
-static void pkg_infodb_upgrade_to_multiarch(void);
-
-/* Global variables */
-static int db_format = -1;
-static char *db_format_file;
-static char *db_format_file_new;
-
-static bool
-pkg_infodb_parse_format_file(const char *file, bool fail_on_error)
-{
-	int fd;
-
-	fd = open(file, O_RDONLY);
-	if (fd < 0 && errno == ENOENT) {
-		return false;
-	} else if (fd < 0) {
-		ohshite(_("error trying to open %.250s"), file);
-	} else {
-		char format[16], *endptr = NULL;
-		ssize_t size;
-		int format_value;
-
-		size = fd_read(fd, format, sizeof(format) - 1);
-		if (size < 0) {
-			ohshite(_("error while reading %s"), file);
-		} else if (size == 0) {
-			if (fail_on_error)
-				ohshit(_("%s is empty"), file);
-			else
-				return false;
-		}
-		format[size] = '\0';
-		format_value = strtol(format, &endptr, 10);
-		if (endptr == format || (*endptr != '\0' && *endptr != '\n'))
-			if (fail_on_error)
-				ohshit(_("%s is corrupted, it should contain a "
-				         "database format version (an integer)"),
-				       file);
-			else
-				return false;
-		db_format = format_value;
-		close(fd);
-	}
-	return true;
-}
-
-void
-pkg_infodb_init(const enum modstatdb_rw flags)
-{
-	bool found = false;
-
-	if (db_format_file)
-		free(db_format_file);
-	db_format_file = dpkg_db_get_path(INFODIR "format");
-	if (db_format_file_new)
-		free(db_format_file_new);
-	db_format_file_new = dpkg_db_get_path(INFODIR "format-new");
-
-	found = pkg_infodb_parse_format_file(db_format_file_new, false);
-	if (!found && !pkg_infodb_parse_format_file(db_format_file, true))
-		db_format = 0; /* Lack of file means old format */
-
-	/* Upgrade the DB if we have write rights and:
-	 * - if format-new exists (previous upgrade has not been completed)
-	 * - or if current format is not the latest one */
-	if (flags >= msdbrw_write && (found || db_format < 1))
-		pkg_infodb_upgrade_to_multiarch();
-}
-
-int
-pkg_infodb_format(void)
-{
-	assert(db_format >= 0); /* Ensure pkg_infodb_init() has been called */
-	return db_format;
-}
-
-struct match_node {
-	struct match_node *next;
-	char *old;
-	char *new;
-};
-
-static struct match_node *match_head = NULL;
-
-static struct match_node *
-match_node_new(const char *old, const char *new, struct match_node *next)
-{
-	struct match_node *node;
-
-	node = m_malloc(sizeof(*node));
-	node->next = next;
-	node->old = m_strdup(old);
-	node->new = m_strdup(new);
-
-	return node;
-}
-
-static void
-match_node_free(struct match_node *node)
-{
-	free(node->old);
-	free(node->new);
-	free(node);
-}
-
-static void
-pkg_infodb_setup_multiarch_path(const char *filename, const char *filetype)
-{
-	static struct varbuf pkgname;
-	const char *name, *dot;
-	struct pkginfo *pkg;
-	struct pkgset *set;
-
-	dot = strrchr(filename, '.');
-	name = strrchr(filename, '/');
-	if (name == NULL)
-		name = filename;
-	else
-		name++;
-
-	varbuf_reset(&pkgname);
-	varbuf_add_buf(&pkgname, name, dot - name);
-	varbuf_end_str(&pkgname);
-
-	if (strchr(pkgname.buf, ':'))
-		return; /* Skip files already converted */
-
-	set = pkg_db_find_set(pkgname.buf);
-	pkg = &set->pkg;
-	while (pkg) {
-		if (pkg->status != stat_notinstalled)
-			break;
-		pkg = pkg->arch_next;
-	}
-	if (!pkg) {
-		warning(_("Info file %s not associated to any package"), filename);
-		return;
-	}
-	if (pkg->installed.multiarch == multiarch_same) {
-		/* We found one to ugprade */
-		struct varbuf new = VARBUF_INIT;
-		struct stat st;
-
-		varbuf_add_str(&new, pkgadmindir());
-		varbuf_pkg(&new, pkg, pdo_always);
-		varbuf_add_char(&new, '.');
-		varbuf_add_str(&new, filetype);
-		varbuf_end_str(&new);
-		if (stat(new.buf, &st) && errno == ENOENT) {
-			if (link(filename, new.buf))
-				ohshite(_("error creating hard link `%.255s'"),
-				        new.buf);
-		}
-		match_head = match_node_new(filename, new.buf, match_head);
-		varbuf_destroy(&new);
-	}
-}
-
-static void
-pkg_infodb_record_new_format(int version)
-{
-	int fd, size;
-	char format[16];
-	ssize_t written;
-
-	size = snprintf(format, sizeof(format), "%d", version);
-	fd = open(db_format_file_new, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-	if (fd < 1)
-		ohshite(_("unable to open/create '%s'"), db_format_file_new);
-	written = fd_write(fd, format, size);
-	if (written < 0)
-		ohshite(_("error while writing '%s'"), db_format_file_new);
-	if (fsync(fd))
-		ohshite(_("unable to sync file '%s'"), db_format_file_new);
-	if (close(fd))
-		ohshite(_("unable to close file '%s'"), db_format_file_new);
-	dir_sync_path_parent(db_format_file_new);
-	db_format = version;
-}
-
-static void
-pkg_infodb_commit_new_format(void)
-{
-	if (rename(db_format_file_new, db_format_file))
-		ohshite(_("cannot rename '%s' to '%s'"), db_format_file_new,
-		        db_format_file);
-	dir_sync_path_parent(db_format_file);
-}
-
-static void
-cu_abort_db_upgrade(int argc, void **argv)
-{
-	struct match_node *next;
-	struct stat st;
-
-	/* Restore the old files if needed and drop the newly created files */
-	while (match_head) {
-		next = match_head->next;
-		if (stat(match_head->old, &st) && errno == ENOENT)
-			if (link(match_head->new, match_head->old))
-				ohshite(_("error creating hard link `%.255s'"),
-				        match_head->old);
-		if (unlink(match_head->new))
-			ohshite(_("cannot remove `%.250s'"), match_head->new);
-		match_node_free(match_head);
-		match_head = next;
-	}
-	if (unlink(db_format_file_new) && errno != ENOENT)
-		ohshite(_("cannot remove `%.250s'"), db_format_file_new);
-}
-
-static void
-pkg_infodb_upgrade_to_multiarch(void)
-{
-	struct match_node *next;
-
-	push_cleanup(cu_abort_db_upgrade, ehflag_bombout, NULL, 0, 0);
-	pkg_infodb_foreach(NULL, NULL, pkg_infodb_setup_multiarch_path);
-	pkg_infodb_record_new_format(1);
-	while (match_head) {
-		next = match_head->next;
-		if (unlink(match_head->old))
-			ohshite(_("cannot remove `%.250s'"), match_head->old);
-		match_node_free(match_head);
-		match_head = next;
-	}
-	pkg_infodb_commit_new_format();
-	pop_cleanup(ehflag_normaltidy);
-}
-
 bool
-pkg_infodb_has_file(struct pkginfo *pkg, struct pkgbin *pkgbin,
-                    const char *name)
+pkg_infodb_has_file(struct pkginfo *pkg, const char *name)
 {
 	const char *filename;
 	struct stat stab;
 
-	filename = pkgadminfile(pkg, pkgbin, name);
+	filename = pkgadminfile(pkg, name);
 	if (lstat(filename, &stab) == 0)
 		return true;
 	else if (errno == ENOENT)
@@ -291,26 +53,15 @@
 }
 
 void
-pkg_infodb_foreach(struct pkginfo *pkg, struct pkgbin *pkgbin,
-                   pkg_infodb_file_func *func)
+pkg_infodb_foreach(struct pkginfo *pkg, pkg_infodb_file_func *func)
 {
 	DIR *db_dir;
 	struct dirent *db_de;
 	struct varbuf db_path = VARBUF_INIT;
-	struct varbuf pkgname = VARBUF_INIT;
 	size_t db_path_len;
 
-	if (pkg) {
-		varbuf_add_str(&pkgname, pkg->set->name);
-		if (pkgbin->multiarch == multiarch_same &&
-		    pkg_infodb_format() >= 1) {
-			varbuf_add_char(&pkgname, ':');
-			varbuf_add_str(&pkgname, pkgbin->arch->name);
-		}
-		varbuf_end_str(&pkgname);
-	}
-
 	varbuf_add_str(&db_path, pkgadmindir());
+	varbuf_add_char(&db_path, '/');
 	db_path_len = db_path.used;
 	varbuf_add_char(&db_path, '\0');
 
@@ -334,14 +85,12 @@
 		if (dot == NULL)
 			continue;
 
-		/* Ignore files from other packages if pkg is supplied. */
-		if (pkg) {
-			if (pkgname.used != (size_t)(dot - db_de->d_name) ||
-		            strncmp(db_de->d_name, pkgname.buf, pkgname.used))
-				continue;
-			debug(dbg_stupidlyverbose,
-			      "infodb foreach file this pkg");
-		}
+		/* Ignore files from other packages. */
+		if (strlen(pkg->name) != (size_t)(dot - db_de->d_name) ||
+		    strncmp(db_de->d_name, pkg->name, dot - db_de->d_name))
+			continue;
+
+		debug(dbg_stupidlyverbose, "infodb foreach file this pkg");
 
 		/* Skip past the full stop. */
 		filetype = dot + 1;
@@ -356,5 +105,4 @@
 	pop_cleanup(ehflag_normaltidy); /* closedir */
 
 	varbuf_destroy(&db_path);
-	varbuf_destroy(&pkgname);
 }
diff -uNr --exclude .git --exclude .bzr dpkg/src/infodb.h /home/vorlon/devel/multiarch/dpkg-debian/src/infodb.h
--- dpkg/src/infodb.h	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/infodb.h	2012-06-07 10:11:09.426073000 -0700
@@ -25,14 +25,10 @@
 
 #include <dpkg/dpkg-db.h>
 
-void pkg_infodb_init(const enum modstatdb_rw flags);
-int pkg_infodb_format(void);
-bool pkg_infodb_has_file(struct pkginfo *pkg, struct pkgbin *pkgbin,
-                         const char *name);
+bool pkg_infodb_has_file(struct pkginfo *pkg, const char *name);
 
 typedef void pkg_infodb_file_func(const char *filename, const char *filetype);
 
-void pkg_infodb_foreach(struct pkginfo *pkg, struct pkgbin *pkgbin,
-                        pkg_infodb_file_func *func);
+void pkg_infodb_foreach(struct pkginfo *pkg, pkg_infodb_file_func *func);
 
 #endif /* DPKG_INFODB_H */
diff -uNr --exclude .git --exclude .bzr dpkg/src/main.c /home/vorlon/devel/multiarch/dpkg-debian/src/main.c
--- dpkg/src/main.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/main.c	2012-06-07 10:11:09.426073000 -0700
@@ -46,11 +46,9 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/arch.h>
 #include <dpkg/subproc.h>
 #include <dpkg/command.h>
-#include <dpkg/myopt.h>
-#include <dpkg/pkg-spec.h>
+#include <dpkg/options.h>
 
 #include "main.h"
 #include "filesdb.h"
@@ -123,8 +121,7 @@
 
   printf(_(
 "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
-"  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep |\n"
-"  --assert-multi-arch.\n"
+"  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep.\n"
 "\n"));
 
   printf(_(
@@ -168,8 +165,8 @@
   exit(0);
 }
 
-const char thisname[]= "dpkg";
-const char printforhelp[]= N_(
+const char native_arch[] = ARCHITECTURE;
+static const char printforhelp[] = N_(
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
 "Type dpkg -Dhelp for a list of dpkg debug flag values;\n"
@@ -340,8 +337,6 @@
 static void ignoredepends(const struct cmdinfo *cip, const char *value) {
   char *copy, *p;
   const char *pnerr;
-  struct pkginfo *pkg;
-  struct pkg_spec ps = PKG_SPEC_INIT(psf_def_native | psf_no_check | psf_patterns);
 
   copy= m_malloc(strlen(value)+2);
   strcpy(copy,value);
@@ -355,18 +350,14 @@
   }
   p= copy;
   while (*p) {
-    pkg_spec_parse(&ps, p);
-    pnerr = pkg_spec_is_illegal(&ps);
+    pnerr = pkg_name_is_illegal(p, NULL);
     if (pnerr) ohshite(_("--ignore-depends requires a legal package name. "
                        "`%.250s' is not; %s"), p, pnerr);
 
-    pkg_spec_iter_start(&ps);
-    while ((pkg = pkg_spec_iter_next_pkg(&ps)))
-      pkg_list_prepend(&ignoredependss, pkg);
+    pkg_list_prepend(&ignoredependss, pkg_db_find(p));
 
     p+= strlen(p)+1;
   }
-  pkg_spec_reset(&ps);
 
   free(copy);
 }
@@ -479,22 +470,6 @@
   }
 }
 
-static void
-set_foreign_arch(const struct cmdinfo *cip, const char *value)
-{
-  struct dpkg_arch *arch;
-
-  arch = dpkg_arch_find(value);
-  if (arch->type == arch_unknown || arch->type == arch_foreign)
-    arch->type = arch_foreign;
-  else if (arch->type == arch_illegal)
-    warning(_("ignoring option --%s=%s: %s"), cip->olong, value,
-            dpkg_arch_name_is_illegal(value));
-  else
-    warning(_("ignoring option --%s=%s: %s"), cip->olong, value,
-            _("this architecture cannot be foreign"));
-}
-
 static void setforce(const struct cmdinfo *cip, const char *value) {
   const char *comma;
   size_t l;
@@ -578,10 +553,8 @@
   ACTION( "assert-working-epoch",            0,  act_assertepoch,          assertepoch     ),
   ACTION( "assert-long-filenames",           0,  act_assertlongfilenames,  assertlongfilenames ),
   ACTION( "assert-multi-conrep",             0,  act_assertmulticonrep,    assertmulticonrep ),
-  ACTION( "assert-multi-arch",               0,  act_assertmultiarch,      assertmultiarch ),
   ACTION( "print-architecture",              0,  act_printarch,            printarch   ),
   ACTION( "print-installation-architecture", 0,  act_printinstarch,        printinstarch  ),
-  ACTION( "print-foreign-architectures",     0,  act_foreignarchs,         print_foreign_archs ),
   ACTION( "predep-package",                  0,  act_predeppackage,        predeppackage   ),
   ACTION( "compare-versions",                0,  act_cmpversions,          cmpversions     ),
 /*
@@ -592,7 +565,6 @@
   { "post-invoke",       0,   1, NULL,          NULL,      set_invoke_hook, 0, &post_invoke_hooks_tail },
   { "path-exclude",      0,   1, NULL,          NULL,      setfilter,     0 },
   { "path-include",      0,   1, NULL,          NULL,      setfilter,     1 },
-  { "foreign-architecture", 0, 1, NULL,         NULL,      set_foreign_arch, 0 },
   { "status-logger",     0,   1, NULL,          NULL,      set_invoke_hook, 0, &status_loggers_tail },
   { "status-fd",         0,   1, NULL,          NULL,      setpipe, 0 },
   { "log",               0,   1, NULL,          &log_file, NULL,    0 },
@@ -743,7 +715,7 @@
         newargs[i] = m_strdup(newargs[i]);
 
     setaction(NULL, NULL);
-    myopt((const char *const**)&newargs,cmdinfos);
+    myopt((const char *const **)&newargs, cmdinfos, printforhelp);
     if (!cipaction) badusage(_("need an action option"));
 
     ret |= cipaction->action(newargs);
@@ -761,9 +733,10 @@
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
 
+  dpkg_set_progname("dpkg");
   standard_startup();
   loadcfgfile(DPKG, cmdinfos);
-  myopt(&argv, cmdinfos);
+  myopt(&argv, cmdinfos, printforhelp);
 
   if (!cipaction) badusage(_("need an action option"));
 
diff -uNr --exclude .git --exclude .bzr dpkg/src/main.h /home/vorlon/devel/multiarch/dpkg-debian/src/main.h
--- dpkg/src/main.h	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/main.h	2012-06-07 10:11:09.426073000 -0700
@@ -80,13 +80,11 @@
 
 	act_printarch,
 	act_printinstarch,
-	act_foreignarchs,
 
 	act_assertpredep,
 	act_assertepoch,
 	act_assertlongfilenames,
 	act_assertmulticonrep,
-	act_assertmultiarch,
 
 	act_audit,
 	act_unpackchk,
@@ -141,6 +139,7 @@
 extern int errabort;
 extern const char *instdir;
 extern struct pkg_list *ignoredependss;
+extern const char native_arch[];
 
 struct invoke_hook {
 	struct invoke_hook *next;
@@ -168,11 +167,9 @@
 int assertpredep(const char *const *argv);
 int assertlongfilenames(const char *const *argv);
 int assertmulticonrep(const char *const *argv);
-int assertmultiarch(const char *const *argv);
 int predeppackage(const char *const *argv);
 int printarch(const char *const *argv);
 int printinstarch(const char *const *argv);
-int print_foreign_archs(const char *const *argv);
 int cmpversions(const char *const *argv);
 
 /* from select.c */
@@ -183,7 +180,6 @@
 
 /* from packages.c, remove.c and configure.c */
 
-void md5hash(struct pkginfo *pkg, char *hashbuf, const char *fn, int fd);
 void add_to_queue(struct pkginfo *pkg);
 void process_queue(void);
 int packages(const char *const *argv);
@@ -271,19 +267,11 @@
 
 /* from depcon.c */
 
-enum which_pkgbin {
-  wpb_installed,
-  wpb_available,
-  wpb_by_status,
-};
-
 bool depisok(struct dependency *dep, struct varbuf *whynot,
              struct pkginfo **fixbyrm, struct pkginfo **fixbytrigaw,
              bool allowunconfigd);
 struct cyclesofarlink;
 bool findbreakcycle(struct pkginfo *pkg);
 void describedepcon(struct varbuf *addto, struct dependency *dep);
-struct pkginfo *deppossi_get_pkg(struct deppossi *possi, enum which_pkgbin wpb,
-                                 struct pkginfo *startpkg);
 
 #endif /* MAIN_H */
diff -uNr --exclude .git --exclude .bzr dpkg/src/Makefile.am /home/vorlon/devel/multiarch/dpkg-debian/src/Makefile.am
--- dpkg/src/Makefile.am	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/Makefile.am	2012-06-07 10:11:09.426073000 -0700
@@ -52,7 +52,6 @@
 
 dpkg_divert_SOURCES = \
 	filesdb.c filesdb.h \
-	infodb.c infodb.h \
 	divertdb.c \
 	divertcmd.c
 
@@ -64,7 +63,6 @@
 
 dpkg_statoverride_SOURCES = \
 	filesdb.c filesdb.h \
-	infodb.c infodb.h \
 	statdb.c \
 	statcmd.c
 
diff -uNr --exclude .git --exclude .bzr dpkg/src/Makefile.in /home/vorlon/devel/multiarch/dpkg-debian/src/Makefile.in
--- dpkg/src/Makefile.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/Makefile.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,704 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# vim:set syn=automake:
+
+# Variables to be defined:
+#
+#  TEST_VERBOSE - set to 0 or 1 to control test suite verbosity
+#  TEST_ENV_VARS - environment variables to be set for the test suite
+#  TEST_COVERAGE - set to the perl module in charge of getting test coverage
+#  test_tmpdir - test suite temporary directory
+#  test_cases - list of test case files
+#  test_data - list of test data files
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = dpkg$(EXEEXT) dpkg-divert$(EXEEXT) dpkg-query$(EXEEXT) \
+	dpkg-statoverride$(EXEEXT) dpkg-trigger$(EXEEXT)
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/Makecheck.am
+subdir = src
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
+	$(top_srcdir)/m4/dpkg-build.m4 \
+	$(top_srcdir)/m4/dpkg-compiler.m4 \
+	$(top_srcdir)/m4/dpkg-coverage.m4 \
+	$(top_srcdir)/m4/dpkg-funcs.m4 $(top_srcdir)/m4/dpkg-libs.m4 \
+	$(top_srcdir)/m4/dpkg-linker.m4 $(top_srcdir)/m4/dpkg-progs.m4 \
+	$(top_srcdir)/m4/dpkg-types.m4 \
+	$(top_srcdir)/m4/dpkg-unicode.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_dpkg_OBJECTS = archives.$(OBJEXT) cleanup.$(OBJEXT) \
+	configure.$(OBJEXT) depcon.$(OBJEXT) enquiry.$(OBJEXT) \
+	errors.$(OBJEXT) filesdb.$(OBJEXT) filters.$(OBJEXT) \
+	infodb.$(OBJEXT) divertdb.$(OBJEXT) statdb.$(OBJEXT) \
+	help.$(OBJEXT) main.$(OBJEXT) packages.$(OBJEXT) \
+	processarc.$(OBJEXT) remove.$(OBJEXT) select.$(OBJEXT) \
+	trigproc.$(OBJEXT) update.$(OBJEXT)
+dpkg_OBJECTS = $(am_dpkg_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = ../lib/dpkg/libdpkg.a ../lib/compat/libcompat.a \
+	$(am__DEPENDENCIES_1)
+dpkg_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+am_dpkg_divert_OBJECTS = filesdb.$(OBJEXT) divertdb.$(OBJEXT) \
+	divertcmd.$(OBJEXT)
+dpkg_divert_OBJECTS = $(am_dpkg_divert_OBJECTS)
+dpkg_divert_LDADD = $(LDADD)
+dpkg_divert_DEPENDENCIES = ../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a $(am__DEPENDENCIES_1)
+am_dpkg_query_OBJECTS = filesdb.$(OBJEXT) infodb.$(OBJEXT) \
+	divertdb.$(OBJEXT) querycmd.$(OBJEXT)
+dpkg_query_OBJECTS = $(am_dpkg_query_OBJECTS)
+dpkg_query_LDADD = $(LDADD)
+dpkg_query_DEPENDENCIES = ../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a $(am__DEPENDENCIES_1)
+am_dpkg_statoverride_OBJECTS = filesdb.$(OBJEXT) statdb.$(OBJEXT) \
+	statcmd.$(OBJEXT)
+dpkg_statoverride_OBJECTS = $(am_dpkg_statoverride_OBJECTS)
+dpkg_statoverride_LDADD = $(LDADD)
+dpkg_statoverride_DEPENDENCIES = ../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a $(am__DEPENDENCIES_1)
+am_dpkg_trigger_OBJECTS = trigcmd.$(OBJEXT)
+dpkg_trigger_OBJECTS = $(am_dpkg_trigger_OBJECTS)
+dpkg_trigger_LDADD = $(LDADD)
+dpkg_trigger_DEPENDENCIES = ../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = 
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(dpkg_SOURCES) $(dpkg_divert_SOURCES) $(dpkg_query_SOURCES) \
+	$(dpkg_statoverride_SOURCES) $(dpkg_trigger_SOURCES)
+DIST_SOURCES = $(dpkg_SOURCES) $(dpkg_divert_SOURCES) \
+	$(dpkg_query_SOURCES) $(dpkg_statoverride_SOURCES) \
+	$(dpkg_trigger_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BZ2_LIBS = @BZ2_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCOV = @GCOV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LCOV = @LCOV@
+LCOV_GENHTML = @LCOV_GENHTML@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_COVER = @PERL_COVER@
+PERL_COVERAGE = @PERL_COVERAGE@
+PERL_LIBDIR = @PERL_LIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PO4A = @PO4A@
+POD2MAN = @POD2MAN@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_PO4A = @USE_PO4A@
+USE_UNICODE = @USE_UNICODE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+admindir = @admindir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+pkgconfdir = $(sysconfdir)/@PACKAGE@
+AM_CPPFLAGS = \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DADMINDIR=\"$(admindir)\" \
+	-idirafter $(top_srcdir)/lib/compat \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/lib
+
+LDADD = \
+	../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a \
+	$(LIBINTL)
+
+EXTRA_DIST = \
+	$(test_cases)
+
+dpkg_SOURCES = \
+	archives.c archives.h \
+	cleanup.c \
+	configure.c \
+	depcon.c \
+	enquiry.c \
+	errors.c \
+	filesdb.c filesdb.h \
+	filters.c filters.h \
+	infodb.c infodb.h \
+	divertdb.c \
+	statdb.c \
+	help.c \
+	main.c main.h \
+	packages.c \
+	processarc.c \
+	remove.c \
+	select.c \
+	trigproc.c \
+	update.c
+
+dpkg_LDADD = \
+	$(LDADD) \
+	$(SELINUX_LIBS)
+
+dpkg_divert_SOURCES = \
+	filesdb.c filesdb.h \
+	divertdb.c \
+	divertcmd.c
+
+dpkg_query_SOURCES = \
+	filesdb.c filesdb.h \
+	infodb.c infodb.h \
+	divertdb.c \
+	querycmd.c
+
+dpkg_statoverride_SOURCES = \
+	filesdb.c filesdb.h \
+	statdb.c \
+	statcmd.c
+
+dpkg_trigger_SOURCES = \
+	trigcmd.c
+
+TEST_VERBOSE = 0
+test_tmpdir = t.tmp
+test_cases = \
+	t/100_dpkg_divert.t
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makecheck.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+dpkg$(EXEEXT): $(dpkg_OBJECTS) $(dpkg_DEPENDENCIES) 
+	@rm -f dpkg$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(dpkg_OBJECTS) $(dpkg_LDADD) $(LIBS)
+dpkg-divert$(EXEEXT): $(dpkg_divert_OBJECTS) $(dpkg_divert_DEPENDENCIES) 
+	@rm -f dpkg-divert$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(dpkg_divert_OBJECTS) $(dpkg_divert_LDADD) $(LIBS)
+dpkg-query$(EXEEXT): $(dpkg_query_OBJECTS) $(dpkg_query_DEPENDENCIES) 
+	@rm -f dpkg-query$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(dpkg_query_OBJECTS) $(dpkg_query_LDADD) $(LIBS)
+dpkg-statoverride$(EXEEXT): $(dpkg_statoverride_OBJECTS) $(dpkg_statoverride_DEPENDENCIES) 
+	@rm -f dpkg-statoverride$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(dpkg_statoverride_OBJECTS) $(dpkg_statoverride_LDADD) $(LIBS)
+dpkg-trigger$(EXEEXT): $(dpkg_trigger_OBJECTS) $(dpkg_trigger_DEPENDENCIES) 
+	@rm -f dpkg-trigger$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(dpkg_trigger_OBJECTS) $(dpkg_trigger_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/archives.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cleanup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configure.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/depcon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/divertcmd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/divertdb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enquiry.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errors.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filesdb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filters.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/help.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infodb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packages.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/processarc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/querycmd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remove.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statcmd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statdb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trigcmd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trigproc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/update.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) check-local
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
+	clean-binPROGRAMS clean-generic clean-local ctags distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS
+
+
+install-data-local:
+	$(mkdir_p) $(DESTDIR)$(pkgconfdir)/dpkg.cfg.d
+	$(mkdir_p) $(DESTDIR)$(admindir)/info
+	$(mkdir_p) $(DESTDIR)$(admindir)/updates
+
+check-clean:
+	rm -fr $(test_tmpdir)
+
+check-local: $(test_data) $(test_cases)
+	$(mkdir_p) $(test_tmpdir)
+	PATH="$(top_builddir)/src:$(top_builddir)/scripts:$(top_builddir)/utils:$(PATH)" \
+	  LC_ALL=C \
+	  $(TEST_ENV_VARS) \
+	  srcdir=$(srcdir) builddir=$(builddir) \
+	  PERL5LIB=$(top_srcdir)/scripts PERL_DL_NONLAZY=1 \
+	  PERL5OPT=$(TEST_COVERAGE) \
+	  $(PERL) -I$(top_srcdir)/scripts \
+	    -MExtUtils::Command::MM -e "test_harness($(TEST_VERBOSE), '.')" \
+	    $(addprefix $(srcdir)/,$(test_cases))
+
+clean-local: check-clean
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude .git --exclude .bzr dpkg/src/packages.c /home/vorlon/devel/multiarch/dpkg-debian/src/packages.c
--- dpkg/src/packages.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/packages.c	2012-06-07 10:11:09.426073000 -0700
@@ -3,8 +3,6 @@
  * packages.c - common to actions that process packages
  *
  * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,11 +38,9 @@
 #include <dpkg/dpkg-db.h>
 #include <dpkg/pkg-list.h>
 #include <dpkg/pkg-queue.h>
-#include <dpkg/pkg-spec.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "filesdb.h"
-#include "infodb.h"
 #include "main.h"
 
 static struct pkginfo *progress_bytrigproc;
@@ -65,7 +61,7 @@
   struct pkginfo *pkg;
 
   it = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next_pkg(it)) != NULL) {
+  while ((pkg = pkg_db_iter_next(it)) != NULL) {
     switch (cipaction->arg_int) {
     case act_configure:
       if (!(pkg->status == stat_unpacked ||
@@ -104,44 +100,31 @@
 enqueue_specified(const char *const *argv)
 {
   const char *thisarg;
-  struct pkg_spec pkgspec = PKG_SPEC_INIT(psf_def_native | psf_patterns |
-                                          psf_skip_not_installed);
 
   while ((thisarg = *argv++) != NULL) {
     struct pkginfo *pkg;
-    int count = 0;
 
-    pkg_spec_parse(&pkgspec, thisarg);
-
-    pkg_spec_iter_start(&pkgspec);
-    while ((pkg = pkg_spec_iter_next_pkg(&pkgspec))) {
-      add_to_queue(pkg);
-      count++;
-    }
-    if (!count) {
-      size_t l = strlen(thisarg);
-      const char *extension = thisarg + l - sizeof(DEBEXT) + 1;
+    pkg = pkg_db_find(thisarg);
+    if (pkg->status == stat_notinstalled) {
+      size_t l = strlen(pkg->name);
+      const char *extension = pkg->name + l - sizeof(DEBEXT) + 1;
 
       if (l >= sizeof(DEBEXT) && strcmp(extension, DEBEXT) == 0)
         badusage(_("you must specify packages by their own names,"
                    " not by quoting the names of the files they come in"));
-      warning(_("there's no installed package matching %s"), thisarg);
     }
+    add_to_queue(pkg);
   }
-  pkg_spec_reset(&pkgspec);
 }
 
 int
 packages(const char *const *argv)
 {
-  enum modstatdb_rw msdb_status;
-
   trigproc_install_hooks();
 
-  msdb_status = modstatdb_open(f_noact ?    msdbrw_readonly :
-                               fc_nonroot ? msdbrw_write :
-                                            msdbrw_needsuperuser);
-  pkg_infodb_init(msdb_status);
+  modstatdb_open(f_noact ?    msdbrw_readonly :
+                 fc_nonroot ? msdbrw_write :
+                              msdbrw_needsuperuser);
   checkpath();
   log_message("startup packages %s", cipaction->olong);
 
@@ -170,7 +153,6 @@
 void process_queue(void) {
   struct pkg_list *rundown;
   struct pkginfo *volatile pkg;
-  char *pkgname;
   volatile enum action action_todo;
   jmp_buf ejbuf;
   enum istobes istobe= itb_normal;
@@ -195,12 +177,12 @@
       case act_triggers:
       case act_configure: case act_remove: case act_purge:
         printf(_("Package %s listed more than once, only processing once.\n"),
-               pkg_describe(rundown->pkg, pdo_foreign));
+               rundown->pkg->name);
         break;
       case act_install:
         printf(_("More than one copy of package %s has been unpacked\n"
                " in this run !  Only configuring it once.\n"),
-               pkg_describe(rundown->pkg, pdo_foreign));
+               rundown->pkg->name);
         break;
       default:
         internerr("unknown action '%d'", cipaction->arg_int);
@@ -231,7 +213,6 @@
     }
 
     assert(pkg->status <= stat_installed);
-    pkgname = m_strdup(pkg_describe(pkg, pdo_foreign));
 
     if (setjmp(ejbuf)) {
       /* Give up on it from the point of view of other packages, i.e. reset
@@ -239,19 +220,18 @@
       pkg->clientdata->istobe= itb_normal;
 
       pop_error_context(ehflag_bombout);
-      free(pkgname);
       if (abort_processing)
         return;
       continue;
     }
-    push_error_context_jump(&ejbuf, print_error_perpackage, pkgname);
+    push_error_context_jump(&ejbuf, print_error_perpackage, pkg->name);
 
     switch (action_todo) {
     case act_triggers:
       if (!pkg->trigpend_head)
         ohshit(_("package %.250s is not ready for trigger processing\n"
                  " (current status `%.250s' with no pending triggers)"),
-               pkg_describe(pkg, pdo_foreign), statusinfos[pkg->status].name);
+               pkg->name, statusinfos[pkg->status].name);
       /* Fall through. */
     case act_install:
       /* Don't try to configure pkgs that we've just disappeared. */
@@ -275,7 +255,6 @@
     m_output(stderr, _("<standard error>"));
 
     pop_error_context(ehflag_normaltidy);
-    free(pkgname);
   }
   assert(!queue.length);
 }
@@ -337,7 +316,7 @@
  */
 static enum found_status
 deppossi_ok_found(struct pkginfo *possdependee, struct pkginfo *requiredby,
-                  struct pkginfo *removing, struct pkgset *providing,
+                  struct pkginfo *removing, struct pkginfo *providing,
                   struct pkginfo **fixbytrig,
                   bool *matched, struct deppossi *checkversion,
                   int *interestingwarnings, struct varbuf *oemsgs)
@@ -353,13 +332,15 @@
     if (providing) {
       varbuf_printf(oemsgs,
                     _("  Package %s which provides %s is to be removed.\n"),
-                    pkg_describe(possdependee, pdo_foreign), providing->name);
+                    possdependee->name, providing->name);
     } else {
       varbuf_printf(oemsgs, _("  Package %s is to be removed.\n"),
-                    pkg_describe(possdependee, pdo_foreign));
+                    possdependee->name);
     }
 
     *matched = true;
+    if (fc_depends)
+      thisf = (dependtry >= 4) ? found_forced : found_defer;
     debug(dbg_depcondetail,"      removing possdependee, returning %d",thisf);
     return thisf;
   }
@@ -371,7 +352,7 @@
   case stat_installed:
     if (checkversion && !versionsatisfied(&possdependee->installed,checkversion)) {
       varbuf_printf(oemsgs, _("  Version of %s on system is %s.\n"),
-                    pkg_describe(possdependee, pdo_foreign),
+                    possdependee->name,
                     versiondescribe(&possdependee->installed.version,
                                     vdew_nonambig));
       assert(checkversion->verrel != dvr_none);
@@ -393,11 +374,11 @@
         if (providing) {
           varbuf_printf(oemsgs,
                         _("  Package %s which provides %s awaits trigger processing.\n"),
-                        pkg_describe(possdependee, pdo_foreign), providing->name);
+                        possdependee->name, providing->name);
         } else {
           varbuf_printf(oemsgs,
                         _("  Package %s awaits trigger processing.\n"),
-                        pkg_describe(possdependee, pdo_foreign));
+                        possdependee->name);
         }
         debug(dbg_depcondetail, "      triggers-awaited, no fixbytrig");
         goto unsuitable;
@@ -415,7 +396,7 @@
       *fixbytrig = possdependee->trigaw.head->pend;
       debug(dbg_depcondetail,
             "      triggers-awaited, fixbytrig '%s', defer",
-            pkg_describe(*fixbytrig, pdo_foreign));
+            (*fixbytrig)->name);
       return found_defer;
     }
     if (possdependee->clientdata &&
@@ -427,8 +408,7 @@
                !(possdependee->status == stat_halfconfigured)) {
       fprintf(stderr,
               _("dpkg: also configuring `%s' (required by `%s')\n"),
-              pkg_describe(possdependee, pdo_foreign),
-              pkg_describe(requiredby, pdo_foreign));
+              possdependee->name, requiredby->name);
       add_to_queue(possdependee);
       sincenothing = 0;
       return found_defer;
@@ -436,10 +416,10 @@
       if (providing) {
         varbuf_printf(oemsgs,
                       _("  Package %s which provides %s is not configured yet.\n"),
-                      pkg_describe(possdependee, pdo_foreign), providing->name);
+                      possdependee->name, providing->name);
       } else {
         varbuf_printf(oemsgs, _("  Package %s is not configured yet.\n"),
-                      pkg_describe(possdependee, pdo_foreign));
+                      possdependee->name);
       }
 
       debug(dbg_depcondetail, "      not configured/able");
@@ -450,10 +430,10 @@
     if (providing) {
       varbuf_printf(oemsgs,
                     _("  Package %s which provides %s is not installed.\n"),
-                    pkg_describe(possdependee, pdo_foreign), providing->name);
+                    possdependee->name, providing->name);
     } else {
       varbuf_printf(oemsgs, _("  Package %s is not installed.\n"),
-                    pkg_describe(possdependee, pdo_foreign));
+                    possdependee->name);
     }
 
     debug(dbg_depcondetail, "      not installed");
@@ -461,6 +441,9 @@
   }
 
 unsuitable:
+  if (fc_depends)
+    thisf = (dependtry >= 4) ? found_forced : found_defer;
+
   debug(dbg_depcondetail, "        returning %d", thisf);
   (*interestingwarnings)++;
 
@@ -470,41 +453,34 @@
 static void
 breaks_check_one(struct varbuf *aemsgs, enum dep_check *ok,
                  struct deppossi *breaks, struct pkginfo *broken,
-                 struct pkginfo *breaker, struct pkgset *virtbroken)
+                 struct pkginfo *breaker, struct pkginfo *virtbroken)
 {
   struct varbuf depmsg = VARBUF_INIT;
 
   debug(dbg_depcondetail, "      checking breaker %s virtbroken %s",
-        pkg_describe(breaker, pdo_foreign),
-        virtbroken ? virtbroken->name : "<none>");
+        breaker->name, virtbroken ? virtbroken->name : "<none>");
 
   if (breaker->status == stat_notinstalled ||
       breaker->status == stat_configfiles) return;
   if (broken == breaker) return;
   if (!versionsatisfied(&broken->installed, breaks)) return;
-  /* The test below can only trigger if dep_breaks start having arch
-   * qualifier different from "any" */
-  if (!archsatisfied(&broken->installed, breaks))
-    return;
   if (ignore_depends(breaker)) return;
-  if (virtbroken && ignore_depends(&virtbroken->pkg)) return;
+  if (virtbroken && ignore_depends(virtbroken)) return;
 
   varbufdependency(&depmsg, breaks->up);
   varbuf_end_str(&depmsg);
-  varbuf_printf(aemsgs, _(" %s (%s) breaks %s and is %s.\n"),
-                pkg_describe(breaker, pdo_foreign),
+  varbuf_printf(aemsgs, _(" %s (%s) breaks %s and is %s.\n"), breaker->name,
                 versiondescribe(&breaker->installed.version, vdew_nonambig),
                 depmsg.buf, gettext(statusstrings[breaker->status]));
   varbuf_destroy(&depmsg);
 
   if (virtbroken) {
-    varbuf_printf(aemsgs, _("  %s (%s) provides %s.\n"),
-                  pkg_describe(broken, pdo_foreign),
+    varbuf_printf(aemsgs, _("  %s (%s) provides %s.\n"), broken->name,
                   versiondescribe(&broken->installed.version, vdew_nonambig),
                   virtbroken->name);
   } else if (breaks->verrel != dvr_none) {
     varbuf_printf(aemsgs, _("  Version of %s to be configured is %s.\n"),
-                  pkg_describe(broken, pdo_foreign),
+                  broken->name,
                   versiondescribe(&broken->installed.version, vdew_nonambig));
     if (fc_dependsversion) return;
   }
@@ -514,12 +490,12 @@
 
 static void
 breaks_check_target(struct varbuf *aemsgs, enum dep_check *ok,
-                    struct pkginfo *broken, struct pkgset *target,
-                    struct pkgset *virtbroken)
+                    struct pkginfo *broken, struct pkginfo *target,
+                    struct pkginfo *virtbroken)
 {
   struct deppossi *possi;
 
-  for (possi = target->depended.installed; possi; possi = possi->rev_next) {
+  for (possi = target->installed.depended; possi; possi = possi->rev_next) {
     if (possi->up->type != dep_breaks) continue;
     if (virtbroken && possi->verrel != dvr_none) continue;
     breaks_check_one(aemsgs, ok, possi, broken, possi->up->up, virtbroken);
@@ -530,16 +506,16 @@
 breakses_ok(struct pkginfo *pkg, struct varbuf *aemsgs)
 {
   struct dependency *dep;
-  struct pkgset *virtbroken;
+  struct pkginfo *virtbroken;
   enum dep_check ok = dep_check_ok;
 
   debug(dbg_depcon, "    checking Breaks");
 
-  breaks_check_target(aemsgs, &ok, pkg, pkg->set, NULL);
+  breaks_check_target(aemsgs, &ok, pkg, pkg, NULL);
 
   for (dep= pkg->installed.depends; dep; dep= dep->next) {
     if (dep->type != dep_provides) continue;
-    virtbroken = dep->list->ed;
+    virtbroken= dep->list->ed;
     debug(dbg_depcondetail, "     checking virtbroken %s", virtbroken->name);
     breaks_check_target(aemsgs, &ok, pkg, virtbroken, virtbroken);
   }
@@ -562,13 +538,12 @@
   struct varbuf oemsgs = VARBUF_INIT;
   struct dependency *dep;
   struct deppossi *possi, *provider;
-  struct pkginfo *possfixbytrig, *canfixbytrig, *pkg_pos;
+  struct pkginfo *possfixbytrig, *canfixbytrig;
 
   interestingwarnings= 0;
   ok = dep_check_ok;
   debug(dbg_depcon,"checking dependencies of %s (- %s)",
-        pkg_describe(pkg, pdo_foreign),
-        removing ? pkg_describe(removing, pdo_foreign) : "<none>");
+        pkg->name, removing ? removing->name : "<none>");
 
   anycannotfixbytrig = false;
   canfixbytrig = NULL;
@@ -586,25 +561,19 @@
         found = found_ok;
         break;
       }
-      pkg_pos = NULL;
-      while (found != found_ok &&
-             (pkg_pos = deppossi_get_pkg(possi, wpb_installed, pkg_pos))) {
-        thisf = deppossi_ok_found(pkg_pos, pkg, removing, NULL,
-                                  &possfixbytrig, &matched, possi,
-                                  &interestingwarnings, &oemsgs);
-        if (thisf > found)
-          found = thisf;
-      }
+      thisf = deppossi_ok_found(possi->ed, pkg, removing, NULL,
+                                &possfixbytrig,
+                               &matched,possi,&interestingwarnings,&oemsgs);
+      if (thisf > found) found= thisf;
       if (found != found_ok && possi->verrel == dvr_none) {
-        for (provider = possi->ed->depended.installed;
+        for (provider = possi->ed->installed.depended;
              found != found_ok && provider;
              provider = provider->rev_next) {
           if (provider->up->type != dep_provides)
             continue;
           debug(dbg_depcondetail, "     checking provider %s",
-                pkg_describe(provider->up->up, pdo_foreign));
-          thisf = deppossi_ok_found(provider->up->up, pkg, removing,
-                                    possi->ed,
+                provider->up->up->name);
+          thisf = deppossi_ok_found(provider->up->up, pkg, removing, possi->ed,
                                     &possfixbytrig, &matched, NULL,
                                     &interestingwarnings, &oemsgs);
           if (thisf > found)
@@ -612,17 +581,10 @@
         }
       }
       debug(dbg_depcondetail,"    found %d",found);
-    }
-    if (fc_depends) {
-      thisf = (dependtry >= 4) ? found_forced : found_defer;
-      if (thisf > found) {
-        found = thisf;
-        debug(dbg_depcondetail, "  rescued by force-depends, found %d", found);
-      }
+      if (thisf > found) found= thisf;
     }
     debug(dbg_depcondetail, "  found %d matched %d possfixbytrig %s",
-          found, matched,
-          possfixbytrig ? pkg_describe(possfixbytrig, pdo_foreign) : "-");
+          found, matched, possfixbytrig ? possfixbytrig->name : "-");
     if (removing && !matched) continue;
     switch (found) {
     case found_none:
@@ -630,7 +592,7 @@
       ok = dep_check_halt;
     case found_forced:
       varbuf_add_str(aemsgs, " ");
-      varbuf_pkg(aemsgs, pkg, pdo_foreign);
+      varbuf_add_str(aemsgs, pkg->name);
       varbuf_add_str(aemsgs, _(" depends on "));
       varbufdependency(aemsgs, dep);
       if (interestingwarnings) {
diff -uNr --exclude .git --exclude .bzr dpkg/src/processarc.c /home/vorlon/devel/multiarch/dpkg-debian/src/processarc.c
--- dpkg/src/processarc.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/processarc.c	2012-06-07 10:11:09.426073000 -0700
@@ -4,8 +4,6 @@
  *
  * Copyright © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
  * Copyright © 2006-2011 Guillem Jover <guillem@debian.org>
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,9 +47,8 @@
 #include <dpkg/subproc.h>
 #include <dpkg/dir.h>
 #include <dpkg/tarfn.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 #include <dpkg/triglib.h>
-#include <dpkg/arch.h>
 
 #include "filesdb.h"
 #include "infodb.h"
@@ -157,6 +154,45 @@
   }
 }
 
+static char *
+get_control_dir(char *cidir)
+{
+  if (f_noact) {
+    char *tmpdir;
+
+    tmpdir = mkdtemp(path_make_temp_template("dpkg"));
+    if (tmpdir == NULL)
+      ohshite(_("unable to create temporary directory"));
+
+    cidir = m_realloc(cidir, strlen(tmpdir) + MAXCONTROLFILENAME + 10);
+
+    strcpy(cidir, tmpdir);
+
+    free(tmpdir);
+  } else {
+    const char *admindir;
+
+    admindir = dpkg_db_get_dir();
+
+    /* The admindir length is always constant on a dpkg execution run. */
+    if (cidir == NULL)
+      cidir = m_malloc(strlen(admindir) + sizeof(CONTROLDIRTMP) +
+                       MAXCONTROLFILENAME + 10);
+
+    /* We want it to be on the same filesystem so that we can
+     * use rename(2) to install the postinst &c. */
+    strcpy(cidir, admindir);
+    strcat(cidir, "/" CONTROLDIRTMP);
+
+    /* Make sure the control information directory is empty. */
+    ensure_pathname_nonexisting(cidir);
+  }
+
+  strcat(cidir, "/");
+
+  return cidir;
+}
+
 #define MAXCONFLICTORS 20
 
 static struct pkginfo *conflictor[MAXCONFLICTORS];
@@ -166,8 +202,7 @@
 push_conflictor(struct pkginfo *pkg, struct pkginfo *pkg_fixbyrm)
 {
   if (cflict_index >= MAXCONFLICTORS)
-    ohshit(_("package %s has too many Conflicts/Replaces pairs"),
-           pkg_describe(pkg, pdo_foreign));
+    ohshit(_("package %s has too many Conflicts/Replaces pairs"), pkg->name);
 
   conflictor[cflict_index++] = pkg_fixbyrm;
 }
@@ -220,15 +255,6 @@
 }
 
 static void
-pkg_infodb_remove_file(const char *filename, const char *filetype)
-{
-  if (unlink(filename))
-    ohshite(_("unable to delete control info file `%.250s'"), filename);
-
-  debug(dbg_scripts, "removal_bulk info unlinked %s", filename);
-}
-
-static void
 pkg_infodb_update(struct pkginfo *pkg, char *cidir, char *cidirrest)
 {
   struct match_node *match_node;
@@ -241,7 +267,7 @@
     match_node_free(match_node);
   }
 
-  pkg_infodb_foreach(pkg, &pkg->available, pkg_infodb_update_file);
+  pkg_infodb_foreach(pkg, pkg_infodb_update_file);
 
   while ((match_node = match_head)) {
     strcpy(cidirrest, match_node->filetype);
@@ -297,13 +323,12 @@
       continue;
     }
     if (strcmp(de->d_name, LISTFILE) == 0) {
-      warning(_("package %s contained list as info file"),
-              pkg_describe(pkg, pdo_foreign));
+      warning(_("package %s contained list as info file"), pkg->name);
       continue;
     }
 
     /* Right, install it */
-    newinfofilename = pkgadminfile(pkg, &pkg->available, de->d_name);
+    newinfofilename = pkgadminfile(pkg,de->d_name);
     if (rename(cidir, newinfofilename))
       ohshite(_("unable to install new info file `%.250s' as `%.250s'"),
               cidir, newinfofilename);
@@ -314,18 +339,18 @@
   }
   pop_cleanup(ehflag_normaltidy); /* closedir */
 
-  if (pkg->installed.multiarch != pkg->available.multiarch &&
-      (pkg->installed.multiarch == multiarch_same ||
-       pkg->available.multiarch == multiarch_same)) {
-    /* Both packages do not use the same layout for info files, get rid of
-     * the files using the old layout */
-    debug(dbg_scripts, "remove info files using the previous layout");
-    pkg_infodb_foreach(pkg, &pkg->installed, pkg_infodb_remove_file);
-  }
-
   dir_sync_path(pkgadmindir());
 }
 
+static void
+pkg_infodb_remove_file(const char *filename, const char *filetype)
+{
+  if (unlink(filename))
+    ohshite(_("unable to delete control info file `%.250s'"), filename);
+
+  debug(dbg_scripts, "removal_bulk info unlinked %s", filename);
+}
+
 static enum parsedbflags
 parsedb_force_flags(void)
 {
@@ -361,7 +386,7 @@
   int r, i;
   pid_t pid;
   struct pkgiterator *it;
-  struct pkginfo *pkg, *otherpkg;
+  struct pkginfo *pkg, *otherpkg, *divpkg;
   char *cidirrest, *p;
   char conffilenamebuf[MAXCONFFILENAME];
   char *psize;
@@ -395,40 +420,11 @@
   if (!f_nodebsig)
     deb_verify(filename);
 
-  if (f_noact) {
-    char *tmpdir;
-
-    tmpdir = mkdtemp(path_make_temp_template("dpkg"));
-    if (!tmpdir)
-      ohshite(_("unable to create temporary directory"));
-
-    cidir = m_realloc(cidir, strlen(tmpdir) + MAXCONTROLFILENAME + 10);
-    strcpy(cidir, tmpdir);
-    strcat(cidir,"/");
-
-    cidirrest = cidir + strlen(cidir);
-
-    free(tmpdir);
-  } else {
-    const char *admindir = dpkg_db_get_dir();
-
-    /* We want it to be on the same filesystem so that we can
-     * use rename(2) to install the postinst &c. */
-    if (!cidir)
-      cidir = m_malloc(strlen(admindir) + sizeof(CONTROLDIRTMP) +
-                       MAXCONTROLFILENAME + 10);
-    strcpy(cidir,admindir);
-    strcat(cidir, "/" CONTROLDIRTMP);
-
-    cidirrest = cidir + strlen(cidir);
-
-    assert(*cidir && cidirrest[-1] == '/');
-    cidirrest[-1] = '\0';
-    ensure_pathname_nonexisting(cidir);
-    cidirrest[-1] = '/';
-  }
-
+  /* Get the control information directory. */
+  cidir = get_control_dir(cidir);
+  cidirrest = cidir + strlen(cidir);
   push_cleanup(cu_cidir, ~0, NULL, 0, 2, (void *)cidir, (void *)cidirrest);
+
   pid = subproc_fork();
   if (pid == 0) {
     cidirrest[-1] = '\0';
@@ -461,18 +457,16 @@
   pkg->files->size = psize;
 
   if (cipaction->arg_int == act_avail) {
-    printf(_("Recorded info about %s from %s.\n"),
-           pkg_describe(pkg, pdo_foreign | pdo_avail), pfilename);
+    printf(_("Recorded info about %s from %s.\n"),pkg->name,pfilename);
     pop_cleanup(ehflag_normaltidy);
     return;
   }
 
-  if (pkg->available.arch->type != arch_all &&
-      pkg->available.arch->type != arch_native &&
-      pkg->available.arch->type != arch_foreign)
+  if (strcmp(pkg->available.arch, "all") &&
+      strcmp(pkg->available.arch, native_arch))
     forcibleerr(fc_architecture,
                 _("package architecture (%s) does not match system (%s)"),
-                pkg->available.arch->name, dpkg_arch_get_native()->name);
+                pkg->available.arch, native_arch);
 
   for (deconpil= deconfigure;
        deconpil;
@@ -492,34 +486,6 @@
    * that we need. */
   pkg->clientdata->istobe= itb_installnew;
 
-  for (otherpkg = &pkg->set->pkg; otherpkg; otherpkg = otherpkg->arch_next) {
-    if (otherpkg == pkg || otherpkg->status < stat_halfinstalled)
-      continue;
-    /* Look for other instances of the same package that can't coexist */
-    if (otherpkg->installed.multiarch != multiarch_same ||
-        pkg->available.multiarch != multiarch_same)
-      ohshit(_("%s %s (Multi-Arch: %s) is not co-installable with %s "
-               "%s (Multi-Arch: %s) which is currently installed"),
-             pkg_describe(pkg, pdo_always),
-             versiondescribe(&pkg->available.version, vdew_nonambig),
-             multiarchinfos[pkg->available.multiarch].name,
-             pkg_describe(otherpkg, pdo_always),
-             versiondescribe(&otherpkg->installed.version, vdew_nonambig),
-             multiarchinfos[otherpkg->installed.multiarch].name);
-    /* Deconfigure them if they are not in sync */
-    if (versioncompare(&pkg->available.version, &otherpkg->installed.version) &&
-        otherpkg->status > stat_halfconfigured) {
-      struct pkg_deconf_list *newdeconf;
-      ensure_package_clientdata(otherpkg);
-      otherpkg->clientdata->istobe = itb_deconfigure;
-      newdeconf = m_malloc(sizeof(struct pkg_deconf_list));
-      newdeconf->next = deconfigure;
-      newdeconf->pkg = otherpkg;
-      newdeconf->pkg_removal = NULL;
-      deconfigure = newdeconf;
-    }
-  }
-
   for (dsearch= pkg->available.depends; dsearch; dsearch= dsearch->next) {
     switch (dsearch->type) {
     case dep_conflicts:
@@ -532,7 +498,7 @@
       break;
     case dep_provides:
       /* Look for things that conflict with what we provide. */
-      for (psearch = dsearch->list->ed->depended.installed;
+      for (psearch = dsearch->list->ed->installed.depended;
            psearch;
            psearch = psearch->rev_next) {
         if (psearch->up->type != dep_conflicts)
@@ -555,18 +521,16 @@
         } else {
           varbuf_end_str(&depprobwhy);
           fprintf(stderr, _("dpkg: regarding %s containing %s, pre-dependency problem:\n%s"),
-                  pfilename, pkg_describe(pkg, pdo_foreign | pdo_avail),
-                  depprobwhy.buf);
+                  pfilename, pkg->name, depprobwhy.buf);
           if (!force_depends(dsearch->list))
-            ohshit(_("pre-dependency problem - not installing %.250s"),
-                   pkg_describe(pkg, pdo_foreign | pdo_avail));
+            ohshit(_("pre-dependency problem - not installing %.250s"),pkg->name);
           warning(_("ignoring pre-dependency problem!"));
         }
       }
     }
   }
   /* Look for things that conflict with us. */
-  for (psearch = pkg->set->depended.installed; psearch; psearch = psearch->rev_next) {
+  for (psearch = pkg->installed.depended; psearch; psearch = psearch->rev_next) {
     if (psearch->up->type != dep_conflicts) continue;
     check_conflict(psearch->up, pkg, pfilename);
   }
@@ -577,13 +541,12 @@
 
   if (pkg->status != stat_notinstalled && pkg->status != stat_configfiles) {
     printf(_("Preparing to replace %s %s (using %s) ...\n"),
-           pkg_describe(pkg, pdo_foreign),
+           pkg->name,
            versiondescribe(&pkg->installed.version,vdew_nonambig),
            pfilename);
     log_action("upgrade", pkg);
   } else {
-    printf(_("Unpacking %s (from %s) ...\n"),
-           pkg_describe(pkg, pdo_foreign | pdo_avail), pfilename);
+    printf(_("Unpacking %s (from %s) ...\n"),pkg->name,pfilename);
     log_action("install", pkg);
   }
 
@@ -639,18 +602,17 @@
       while ((otherpkg = filepackages_iter_next(iter))) {
         debug(dbg_conffdetail,
               "process_archive conffile `%s' in package %s - conff ?",
-              newconff->namenode->name, pkg_describe(otherpkg, pdo_foreign));
+              newconff->namenode->name, otherpkg->name);
         for (searchconff = otherpkg->installed.conffiles;
              searchconff && strcmp(newconff->namenode->name, searchconff->name);
              searchconff = searchconff->next)
           debug(dbg_conffdetail,
                 "process_archive conffile `%s' in package %s - conff ? not `%s'",
-                newconff->namenode->name, pkg_describe(otherpkg, pdo_foreign),
-                searchconff->name);
+                newconff->namenode->name, otherpkg->name, searchconff->name);
         if (searchconff) {
           debug(dbg_conff,
                 "process_archive conffile `%s' package=%s %s hash=%s",
-                newconff->namenode->name, pkg_describe(otherpkg, pdo_foreign),
+                newconff->namenode->name, otherpkg->name,
                 otherpkg == pkg ? "same" : "different!",
                 searchconff->hash);
           if (otherpkg == pkg)
@@ -696,8 +658,14 @@
     pkg->status= stat_halfconfigured;
     modstatdb_note(pkg);
     push_cleanup(cu_prermupgrade, ~ehflag_normaltidy, NULL, 0, 1, (void *)pkg);
-    maintainer_script_alternative(pkg, PRERMFILE, "pre-removal", cidir, cidirrest,
-                                  "upgrade", "failed-upgrade");
+    if (versioncompare(&pkg->available.version,
+                       &pkg->installed.version) >= 0) /* Upgrade or reinstall */
+      maintainer_script_alternative(pkg, PRERMFILE, "pre-removal", cidir, cidirrest,
+                                    "upgrade", "failed-upgrade");
+    else /* Downgrade => no fallback */
+      maintainer_script_installed(pkg, PRERMFILE, "pre-removal", "upgrade",
+                                  versiondescribe(&pkg->available.version,
+                                                  vdew_nonambig), NULL);
     pkg->status= stat_unpacked;
     oldversionstatus= stat_unpacked;
     modstatdb_note(pkg);
@@ -708,11 +676,9 @@
 
     if (removing)
       printf(_("De-configuring %s, to allow removal of %s ...\n"),
-             pkg_describe(deconpil->pkg, pdo_foreign),
-             pkg_describe(removing, pdo_foreign));
+             deconpil->pkg->name, removing->name);
     else
-      printf(_("De-configuring %s ...\n"),
-             pkg_describe(deconpil->pkg, pdo_foreign));
+      printf(_("De-configuring %s ...\n"), deconpil->pkg->name);
 
     trig_activate_packageprocessing(deconpil->pkg);
     deconpil->pkg->status= stat_halfconfigured;
@@ -727,19 +693,16 @@
 
     if (removing) {
       maintainer_script_installed(deconpil->pkg, PRERMFILE, "pre-removal",
-                                  "deconfigure", "in-favour",
-                                  pkg_describe(pkg, pdo_foreign | pdo_avail),
+                                  "deconfigure", "in-favour", pkg->name,
                                   versiondescribe(&pkg->available.version,
                                                   vdew_nonambig),
-                                  "removing",
-                                  pkg_describe(removing, pdo_foreign),
+                                  "removing", removing->name,
                                   versiondescribe(&removing->installed.version,
                                                   vdew_nonambig),
                                   NULL);
     } else {
       maintainer_script_installed(deconpil->pkg, PRERMFILE, "pre-removal",
-                                  "deconfigure", "in-favour",
-                                  pkg_describe(pkg, pdo_foreign | pdo_avail),
+                                  "deconfigure", "in-favour", pkg->name,
                                   versiondescribe(&pkg->available.version,
                                                   vdew_nonambig),
                                   NULL);
@@ -757,8 +720,7 @@
     push_cleanup(cu_prerminfavour, ~ehflag_normaltidy, NULL, 0,
                  2,(void*)conflictor[i],(void*)pkg);
     maintainer_script_installed(conflictor[i], PRERMFILE, "pre-removal",
-                                "remove", "in-favour",
-                                pkg_describe(pkg, pdo_foreign | pdo_avail),
+                                "remove", "in-favour", pkg->name,
                                 versiondescribe(&pkg->available.version,
                                                 vdew_nonambig),
                                 NULL);
@@ -790,8 +752,7 @@
                           "upgrade", versiondescribe(&pkg->installed.version,
                                                      vdew_nonambig),
                           NULL);
-    printf(_("Unpacking replacement %.250s ...\n"),
-           pkg_describe(pkg, pdo_foreign));
+    printf(_("Unpacking replacement %.250s ...\n"),pkg->name);
   }
 
   /*
@@ -886,18 +847,6 @@
   push_cleanup(cu_fileslist, ~0, NULL, 0, 0);
   tc.pkg= pkg;
   tc.backendpipe= p1[0];
-  /* Verify if all instances of a Multi-Arch: same package are going to be
-   * synchronized, if yes the extraction is going to ensure consistency of
-   * shared files */
-  tc.pkg_in_sync = true;
-  for (otherpkg = &pkg->set->pkg; otherpkg; otherpkg = otherpkg->arch_next) {
-    if (otherpkg->status <= stat_configfiles || otherpkg == pkg)
-      continue;
-    if (versioncompare(&pkg->available.version, &otherpkg->installed.version)) {
-      tc.pkg_in_sync = false;
-      break;
-    }
-  }
 
   r = tar_extractor(&tc, &tf);
   if (r) {
@@ -907,7 +856,7 @@
       ohshit(_("corrupted filesystem tarfile - corrupted package archive"));
     }
   }
-  fd_null_copy(p1[0], -1, _("dpkg-deb: zap possible trailing zeros"));
+  fd_skip(p1[0], -1, _("dpkg-deb: zap possible trailing zeros"));
   close(p1[0]);
   p1[0] = -1;
   subproc_wait_check(pid, BACKEND " --fsys-tarfile", PROCPIPE);
@@ -1082,13 +1031,13 @@
 
   /* OK, now we can write the updated files-in-this package list,
    * since we've done away (hopefully) with all the old junk. */
-  write_filelist_except(pkg, &pkg->available, newfileslist, 0);
+  write_filelist_except(pkg,newfileslist,0);
 
   /* Trigger interests may have changed.
    * Firstly we go through the old list of interests deleting them.
    * Then we go through the new list adding them. */
   strcpy(cidirrest, TRIGGERSCIFILE);
-  trig_parse_ci(pkgadminfile(pkg, &pkg->installed, TRIGGERSCIFILE),
+  trig_parse_ci(pkgadminfile(pkg, TRIGGERSCIFILE),
                 trig_cicb_interest_delete, NULL, pkg);
   trig_parse_ci(cidir, trig_cicb_interest_add, NULL, pkg);
   trig_file_interests_save();
@@ -1138,8 +1087,6 @@
       else
         blankversion(&newpossi->version);
       newpossi->cyclebreak = false;
-      newpossi->arch = possi->arch;
-      newpossi->arch_is_implicit = possi->arch_is_implicit;
       *newpossilastp= newpossi;
       newpossilastp= &newpossi->next;
     }
@@ -1154,9 +1101,11 @@
    * structure pointer for this package into the right field. */
   copy_dependency_links(pkg,&pkg->installed.depends,newdeplist,0);
 
-  /* We copy the text fields. */
+  /* The ‘depended’ pointer in the structure doesn't represent anything
+   * that is actually specified by this package - it's there so we
+   * can find out what other packages refer to this one. So,
+   * we don't copy it. We go straight on to copy the text fields. */
   pkg->installed.essential= pkg->available.essential;
-  pkg->installed.multiarch = pkg->available.multiarch;
   pkg->installed.description= pkg->available.description;
   pkg->installed.maintainer= pkg->available.maintainer;
   pkg->installed.source= pkg->available.source;
@@ -1193,15 +1142,14 @@
    * Conffiles are ignored (the new package had better do something
    * with them!). */
   it = pkg_db_iter_new();
-  while ((otherpkg = pkg_db_iter_next_pkg(it)) != NULL) {
+  while ((otherpkg = pkg_db_iter_next(it)) != NULL) {
     ensure_package_clientdata(otherpkg);
     if (otherpkg == pkg ||
         otherpkg->status == stat_notinstalled ||
         otherpkg->status == stat_configfiles ||
 	otherpkg->clientdata->istobe == itb_remove ||
         !otherpkg->clientdata->files) continue;
-    debug(dbg_veryverbose, "process_archive checking disappearance %s",
-          pkg_describe(otherpkg, pdo_foreign));
+    debug(dbg_veryverbose, "process_archive checking disappearance %s",otherpkg->name);
     assert(otherpkg->clientdata->istobe == itb_normal ||
            otherpkg->clientdata->istobe == itb_deconfigure);
     for (cfile= otherpkg->clientdata->files;
@@ -1219,7 +1167,7 @@
     /* So dependency things will give right answers ... */
     otherpkg->clientdata->istobe= itb_remove;
     debug(dbg_veryverbose, "process_archive disappear checking dependencies");
-    for (pdep = otherpkg->set->depended.installed;
+    for (pdep= otherpkg->installed.depended;
          pdep;
          pdep = pdep->rev_next) {
       if (pdep->up->type != dep_depends && pdep->up->type != dep_predepends &&
@@ -1236,7 +1184,7 @@
            providecheck;
            providecheck= providecheck->next) {
         if (providecheck->type != dep_provides) continue;
-        for (pdep = providecheck->list->ed->depended.installed;
+        for (pdep= providecheck->list->ed->installed.depended;
              pdep;
              pdep = pdep->rev_next) {
           if (pdep->up->type != dep_depends && pdep->up->type != dep_predepends &&
@@ -1256,25 +1204,23 @@
     if (pdep) continue;
 
     printf(_("(Noting disappearance of %s, which has been completely replaced.)\n"),
-           pkg_describe(otherpkg, pdo_foreign));
+           otherpkg->name);
     log_action("disappear", otherpkg);
-    debug(dbg_general, "process_archive disappearing %s",
-          pkg_describe(otherpkg, pdo_foreign));
+    debug(dbg_general, "process_archive disappearing %s",otherpkg->name);
     /* No, we're disappearing it. This is the wrong time to go and
      * run maintainer scripts and things, as we can't back out. But
      * what can we do ?  It has to be run this late. */
     trig_activate_packageprocessing(otherpkg);
     maintainer_script_installed(otherpkg, POSTRMFILE,
                                 "post-removal script (for disappearance)",
-                                "disappear",
-                                pkg_describe(pkg, pdo_foreign | pdo_avail),
+                                "disappear", pkg->name,
                                 versiondescribe(&pkg->available.version,
                                                 vdew_nonambig),
                                 NULL);
 
     /* OK, now we delete all the stuff in the ‘info’ directory .. */
     debug(dbg_general, "process_archive disappear cleaning info directory");
-    pkg_infodb_foreach(otherpkg, &otherpkg->installed, pkg_infodb_remove_file);
+    pkg_infodb_foreach(otherpkg, pkg_infodb_remove_file);
     dir_sync_path(pkgadmindir());
 
     otherpkg->status= stat_notinstalled;
@@ -1282,7 +1228,7 @@
     otherpkg->eflag = eflag_ok;
 
     blankversion(&otherpkg->configversion);
-    pkgbin_blank(&otherpkg->installed, true);
+    pkgbin_blank(&otherpkg->installed);
 
     otherpkg->clientdata->fileslistvalid = false;
 
@@ -1300,12 +1246,11 @@
    * have claimed ‘ownership’ of all its files. */
   for (cfile= newfileslist; cfile; cfile= cfile->next) {
     struct filepackages_iterator *iter;
-    struct pkgset *divpkgset;
 
     if (!(cfile->namenode->flags & fnnf_elide_other_lists)) continue;
     if (cfile->namenode->divert && cfile->namenode->divert->useinstead) {
-      divpkgset = cfile->namenode->divert->pkgset;
-      if (divpkgset == pkg->set) {
+      divpkg= cfile->namenode->divert->pkg;
+      if (divpkg == pkg) {
         debug(dbg_eachfile,
               "process_archive not overwriting any `%s' (overriding, `%s')",
               cfile->namenode->name, cfile->namenode->divert->useinstead->name);
@@ -1313,39 +1258,32 @@
       } else {
         debug(dbg_eachfile,
               "process_archive looking for overwriting `%s' (overridden by %s)",
-              cfile->namenode->name, divpkgset ? divpkgset->name : "<local>");
+              cfile->namenode->name, divpkg ? divpkg->name : "<local>");
       }
     } else {
-      divpkgset = NULL;
+      divpkg = NULL;
       debug(dbg_eachfile, "process_archive looking for overwriting `%s'",
             cfile->namenode->name);
     }
     iter = filepackages_iter_new(cfile->namenode);
     while ((otherpkg = filepackages_iter_next(iter))) {
-      debug(dbg_eachfiledetail, "process_archive ... found in %s",
-            pkg_describe(otherpkg, pdo_foreign));
+      debug(dbg_eachfiledetail, "process_archive ... found in %s", otherpkg->name);
       /* If !fileslistvalid then it's one of the disappeared packages above
        * and we don't bother with it here, clearly. */
       if (otherpkg == pkg || !otherpkg->clientdata->fileslistvalid)
         continue;
-      if (otherpkg->set == divpkgset) {
+      if (otherpkg == divpkg) {
         debug(dbg_eachfiledetail, "process_archive ... diverted, skipping");
         continue;
       }
-      /* Multi-Arch: same packages can share files */
-      if (otherpkg->set == pkg->set &&
-          otherpkg->installed.multiarch == multiarch_same &&
-          pkg->installed.multiarch == multiarch_same)
-        continue;
 
       /* Found one. We delete remove the list entry for this file,
        * (and any others in the same package) and then mark the package
        * as requiring a reread. */
-      write_filelist_except(otherpkg, &otherpkg->installed,
-                            otherpkg->clientdata->files, fnnf_elide_other_lists);
+      write_filelist_except(otherpkg, otherpkg->clientdata->files,
+                            fnnf_elide_other_lists);
       ensure_package_clientdata(otherpkg);
-      debug(dbg_veryverbose, "process_archive overwrote from %s",
-            pkg_describe(otherpkg, pdo_foreign));
+      debug(dbg_veryverbose, "process_archive overwrote from %s", otherpkg->name);
     }
     filepackages_iter_free(iter);
   }
diff -uNr --exclude .git --exclude .bzr dpkg/src/querycmd.c /home/vorlon/devel/multiarch/dpkg-debian/src/querycmd.c
--- dpkg/src/querycmd.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/querycmd.c	2012-06-07 10:11:09.426073000 -0700
@@ -5,8 +5,6 @@
  * Copyright © 1995,1996 Ian Jackson <ian@chiark.greenend.org.uk>
  * Copyright © 2000,2001 Wichert Akkerman <wakkerma@debian.org>
  * Copyright © 2006-2011 Guillem Jover <guillem@debian.org>
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,15 +45,14 @@
 #include <dpkg/pkg-array.h>
 #include <dpkg/pkg-format.h>
 #include <dpkg/pkg-show.h>
-#include <dpkg/pkg-spec.h>
 #include <dpkg/path.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "filesdb.h"
 #include "infodb.h"
 #include "main.h"
 
-static const char* showformat		= "${PackageSpec}\t${Version}\n";
+static const char* showformat		= "${Package}\t${Version}\n";
 
 static int getwidth(void) {
   int fd;
@@ -105,7 +102,7 @@
     for (i = 0; i < array->n_pkgs; i++) {
       int plen, vlen, dlen;
 
-      plen = strlen(pkg_describe(array->pkgs[i], pdo_foreign));
+      plen = strlen(array->pkgs[i]->name);
       vlen = strlen(versiondescribe(&array->pkgs[i]->installed.version,
                                     vdew_nonambig));
       pkg_summary(array->pkgs[i], &dlen);
@@ -193,7 +190,7 @@
          "uihrp"[pkg->want],
          "ncHUFWti"[pkg->status],
          " R"[pkg->eflag],
-         pkg_describe(pkg, pdo_foreign),
+         pkg->name,
          versiondescribe(&pkg->installed.version, vdew_nonambig),
          l, pdesc);
 }
@@ -206,13 +203,11 @@
   int i;
   int failures = 0;
   struct list_format fmt;
-  enum modstatdb_rw msdb_status;
 
   if (!*argv)
-    msdb_status = modstatdb_open(msdbrw_readonly);
+    modstatdb_open(msdbrw_readonly);
   else
-    msdb_status = modstatdb_open(msdbrw_readonly | msdbrw_available_readonly);
-  pkg_infodb_init(msdb_status);
+    modstatdb_open(msdbrw_readonly | msdbrw_available_readonly);
 
   pkg_array_init_from_db(&array);
   pkg_array_sort(&array, pkg_sorter_by_name);
@@ -228,22 +223,15 @@
     }
   } else {
     int argc, ip, *found;
-    struct pkg_spec *ps;
 
     for (argc = 0; argv[argc]; argc++);
     found = m_malloc(sizeof(int) * argc);
     memset(found, 0, sizeof(int) * argc);
-    ps = m_malloc(sizeof(*ps) * argc);
-    memset(ps, 0, sizeof(*ps) * argc);
 
-    for (ip = 0; ip < argc; ip++) {
-      ps[ip].flags = psf_def_native | psf_patterns;
-      pkg_spec_parse(&ps[ip], argv[ip]);
-    }
     for (i = 0; i < array.n_pkgs; i++) {
       pkg = array.pkgs[i];
       for (ip = 0; ip < argc; ip++) {
-        if (pkg_spec_match_pkg(&ps[ip], pkg, &pkg->installed)) {
+        if (!fnmatch(argv[ip], pkg->name, 0)) {
           list1package(pkg, &fmt, &array);
           found[ip]++;
           break;
@@ -258,10 +246,7 @@
         fprintf(stderr, _("No packages found matching %s.\n"), argv[ip]);
         failures++;
       }
-      pkg_spec_reset(&ps[ip]);
     }
-    free(found);
-    free(ps);
   }
 
   m_output(stdout, _("<standard output>"));
@@ -284,11 +269,11 @@
     const char *name_to = namenode->divert->useinstead ?
                           namenode->divert->useinstead->name : namenode->name;
 
-    if (namenode->divert->pkgset) {
+    if (namenode->divert->pkg) {
       printf(_("diversion by %s from: %s\n"),
-             namenode->divert->pkgset->name, name_from);
+             namenode->divert->pkg->name, name_from);
       printf(_("diversion by %s to: %s\n"),
-             namenode->divert->pkgset->name, name_to);
+             namenode->divert->pkg->name, name_to);
     } else {
       printf(_("local diversion from: %s\n"), name_from);
       printf(_("local diversion to: %s\n"), name_to);
@@ -300,7 +285,7 @@
   while ((pkg_owner = filepackages_iter_next(iter))) {
     if (found)
       fputs(", ", stdout);
-    fputs(pkg_describe(pkg_owner, pdo_foreign), stdout);
+    fputs(pkg_owner->name, stdout);
     found++;
   }
   filepackages_iter_free(iter);
@@ -319,13 +304,11 @@
   int failures = 0;
   struct varbuf path = VARBUF_INIT;
   static struct varbuf vb;
-  enum modstatdb_rw msdb_status;
 
   if (!*argv)
     badusage(_("--search needs at least one file name pattern argument"));
 
-  msdb_status = modstatdb_open(msdbrw_readonly);
-  pkg_infodb_init(msdb_status);
+  modstatdb_open(msdbrw_readonly);
   ensure_allinstfiles_available_quiet();
   ensure_diversions();
 
@@ -364,8 +347,8 @@
       iterfileend(it);
     }
     if (!found) {
-      fprintf(stderr, _("%s: no path found matching pattern %s.\n"), thisname,
-              thisarg);
+      fprintf(stderr, _("%s: no path found matching pattern %s.\n"),
+              dpkg_get_progname(), thisarg);
       failures++;
       m_output(stderr, _("<standard error>"));
     } else {
@@ -387,20 +370,17 @@
   struct pkginfo *pkg;
   struct filenamenode *namenode;
   int failures = 0;
-  enum modstatdb_rw msdb_status;
-  struct pkg_spec pkgspec = PKG_SPEC_INIT(psf_def_native);
 
   if (!*argv)
     badusage(_("--%s needs at least one package name argument"), cipaction->olong);
 
   if (cipaction->arg_int == act_printavail)
-    msdb_status = modstatdb_open(msdbrw_readonly | msdbrw_available_readonly);
+    modstatdb_open(msdbrw_readonly | msdbrw_available_readonly);
   else
-    msdb_status = modstatdb_open(msdbrw_readonly);
-  pkg_infodb_init(msdb_status);
+    modstatdb_open(msdbrw_readonly);
 
   while ((thisarg = *argv++) != NULL) {
-    pkg = pkg_spec_find_pkg(&pkgspec, thisarg);
+    pkg = pkg_db_find(thisarg);
 
     switch (cipaction->arg_int) {
     case act_status:
@@ -410,8 +390,7 @@
           !pkg->files &&
           pkg->want == want_unknown &&
           !pkg_is_informative(pkg, &pkg->installed)) {
-        fprintf(stderr, _("Package `%s' is not installed and no info is "
-                          "available.\n"), pkg_describe(pkg, pdo_foreign));
+        fprintf(stderr,_("Package `%s' is not installed and no info is available.\n"),pkg->name);
         failures++;
       } else {
         writerecord(stdout, _("<standard output>"), pkg, &pkg->installed);
@@ -419,8 +398,7 @@
       break;
     case act_printavail:
       if (!pkg_is_informative(pkg, &pkg->available)) {
-        fprintf(stderr, _("Package `%s' is not available.\n"),
-                pkg_describe(pkg, pdo_foreign));
+        fprintf(stderr,_("Package `%s' is not available.\n"),pkg->name);
         failures++;
       } else {
         writerecord(stdout, _("<standard output>"), pkg, &pkg->available);
@@ -429,8 +407,7 @@
     case act_listfiles:
       switch (pkg->status) {
       case stat_notinstalled:
-        fprintf(stderr, _("Package `%s' is not installed.\n"),
-                pkg_describe(pkg, pdo_foreign));
+        fprintf(stderr,_("Package `%s' is not installed.\n"),pkg->name);
         failures++;
         break;
       default:
@@ -438,22 +415,21 @@
         ensure_diversions();
         file= pkg->clientdata->files;
         if (!file) {
-          printf(_("Package `%s' does not contain any files (!)\n"),
-                 pkg_describe(pkg, pdo_foreign));
+          printf(_("Package `%s' does not contain any files (!)\n"),pkg->name);
         } else {
           while (file) {
             namenode= file->namenode;
             puts(namenode->name);
             if (namenode->divert && !namenode->divert->camefrom) {
-              if (!namenode->divert->pkgset)
+              if (!namenode->divert->pkg)
 		printf(_("locally diverted to: %s\n"),
 		       namenode->divert->useinstead->name);
-              else if (pkg->set == namenode->divert->pkgset)
+              else if (pkg == namenode->divert->pkg)
 		printf(_("package diverts others to: %s\n"),
 		       namenode->divert->useinstead->name);
               else
 		printf(_("diverted by %s to: %s\n"),
-		       namenode->divert->pkgset->name,
+		       namenode->divert->pkg->name,
 		       namenode->divert->useinstead->name);
             }
             file= file->next;
@@ -490,7 +466,6 @@
   struct pkg_format_node *fmt = pkg_format_parse(showformat);
   int i;
   int failures = 0;
-  enum modstatdb_rw msdb_status;
 
   if (!fmt) {
     failures++;
@@ -498,10 +473,9 @@
   }
 
   if (!*argv)
-    msdb_status = modstatdb_open(msdbrw_readonly);
+    modstatdb_open(msdbrw_readonly);
   else
-    msdb_status = modstatdb_open(msdbrw_readonly | msdbrw_available_readonly);
-  pkg_infodb_init(msdb_status);
+    modstatdb_open(msdbrw_readonly | msdbrw_available_readonly);
 
   pkg_array_init_from_db(&array);
   pkg_array_sort(&array, pkg_sorter_by_name);
@@ -514,22 +488,15 @@
     }
   } else {
     int argc, ip, *found;
-    struct pkg_spec *ps;
 
     for (argc = 0; argv[argc]; argc++);
     found = m_malloc(sizeof(int) * argc);
     memset(found, 0, sizeof(int) * argc);
-    ps = m_malloc(sizeof(*ps) * argc);
-    memset(ps, 0, sizeof(*ps) * argc);
 
-    for (ip = 0; ip < argc; ip++) {
-      ps[ip].flags = psf_def_native | psf_patterns;
-      pkg_spec_parse(&ps[ip], argv[ip]);
-    }
     for (i = 0; i < array.n_pkgs; i++) {
       pkg = array.pkgs[i];
       for (ip = 0; ip < argc; ip++) {
-        if (pkg_spec_match_pkg(&ps[ip], pkg, &pkg->installed)) {
+        if (!fnmatch(argv[ip], pkg->name, 0)) {
           pkg_format_show(fmt, pkg, &pkg->installed);
           found[ip]++;
           break;
@@ -544,10 +511,7 @@
         fprintf(stderr, _("No packages found matching %s.\n"), argv[ip]);
         failures++;
       }
-      pkg_spec_reset(&ps[ip]);
     }
-    free(found);
-    free(ps);
   }
 
   m_output(stdout, _("<standard output>"));
@@ -580,7 +544,7 @@
   const char *control_path;
   struct stat st;
 
-  control_path = pkgadminfile(pkg, &pkg->installed, control_file);
+  control_path = pkgadminfile(pkg, control_file);
   if (stat(control_path, &st) < 0)
     return;
   if (!S_ISREG(st.st_mode))
@@ -595,8 +559,6 @@
   struct pkginfo *pkg;
   const char *pkg_name;
   const char *control_file;
-  enum modstatdb_rw msdb_status;
-  struct pkg_spec pkgspec = PKG_SPEC_INIT(psf_def_native);
 
   pkg_name = *argv++;
   if (!pkg_name)
@@ -616,19 +578,16 @@
         badusage(_("control file contains %c"), *c);
   }
 
-  msdb_status = modstatdb_open(msdbrw_readonly);
-  pkg_infodb_init(msdb_status);
-
-  pkg = pkg_spec_find_pkg(&pkgspec, pkg_name);
+  modstatdb_open(msdbrw_readonly);
 
+  pkg = pkg_db_find(pkg_name);
   if (pkg->status == stat_notinstalled)
-    ohshit(_("Package `%s' is not installed.\n"),
-           pkg_describe(pkg, pdo_foreign));
+    ohshit(_("Package `%s' is not installed.\n"), pkg->name);
 
   if (control_file)
     control_path_file(pkg, control_file);
   else
-    pkg_infodb_foreach(pkg, &pkg->installed, pkg_infodb_print_filename);
+    pkg_infodb_foreach(pkg, pkg_infodb_print_filename);
 
   modstatdb_shutdown();
 
@@ -693,8 +652,8 @@
   exit(0);
 }
 
-const char thisname[]= "dpkg-query";
-const char printforhelp[]= N_("Use --help for help about querying packages.");
+static const char printforhelp[] = N_(
+"Use --help for help about querying packages.");
 
 static const char *admindir;
 
@@ -724,8 +683,9 @@
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
 
+  dpkg_set_progname("dpkg-query");
   standard_startup();
-  myopt(&argv, cmdinfos);
+  myopt(&argv, cmdinfos, printforhelp);
 
   admindir = dpkg_db_set_dir(admindir);
 
diff -uNr --exclude .git --exclude .bzr dpkg/src/remove.c /home/vorlon/devel/multiarch/dpkg-debian/src/remove.c
--- dpkg/src/remove.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/remove.c	2012-06-07 10:11:09.426073000 -0700
@@ -37,7 +37,7 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/dir.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 #include <dpkg/triglib.h>
 
 #include "infodb.h"
@@ -48,24 +48,22 @@
  * pkgdepcheck may be a virtual pkg.
  */
 static void checkforremoval(struct pkginfo *pkgtoremove,
-                            struct pkgset *pkgdepcheck,
+                            struct pkginfo *pkgdepcheck,
                             int *rokp, struct varbuf *raemsgs) {
   struct deppossi *possi;
   struct pkginfo *depender;
   int before, ok;
 
-  for (possi = pkgdepcheck->depended.installed; possi; possi = possi->rev_next) {
+  for (possi = pkgdepcheck->installed.depended; possi; possi = possi->rev_next) {
     if (possi->up->type != dep_depends && possi->up->type != dep_predepends) continue;
     depender= possi->up->up;
-    debug(dbg_depcon, "checking depending package `%s'",
-          pkg_describe(depender, pdo_foreign));
+    debug(dbg_depcon,"checking depending package `%s'",depender->name);
     if (!(depender->status == stat_installed ||
           depender->status == stat_triggerspending ||
           depender->status == stat_triggersawaited))
       continue;
     if (ignore_depends(depender)) {
-      debug(dbg_depcon, "ignoring depending package '%s'",
-            pkg_describe(depender, pdo_foreign));
+      debug(dbg_depcon, "ignoring depending package '%s'", depender->name);
       continue;
     }
     if (dependtry > 1) { if (findbreakcycle(pkgtoremove)) sincenothing= 0; }
@@ -84,12 +82,11 @@
   int rok;
   struct dependency *dep;
 
-  debug(dbg_general, "deferred_remove package %s",
-        pkg_describe(pkg, pdo_foreign));
+  debug(dbg_general,"deferred_remove package %s",pkg->name);
 
   if (pkg->status == stat_notinstalled) {
     warning(_("ignoring request to remove %.250s which isn't installed."),
-            pkg_describe(pkg, pdo_foreign));
+            pkg->name);
     pkg->clientdata->istobe= itb_normal;
     return;
   } else if (!f_pending &&
@@ -97,7 +94,7 @@
              cipaction->arg_int != act_purge) {
     warning(_("ignoring request to remove %.250s, only the config\n"
               " files of which are on the system. Use --purge to remove them too."),
-            pkg_describe(pkg, pdo_foreign));
+            pkg->name);
     pkg->clientdata->istobe= itb_normal;
     return;
   }
@@ -110,14 +107,13 @@
     pkg->want = (cipaction->arg_int == act_purge) ? want_purge : want_deinstall;
   if (!f_noact) modstatdb_note(pkg);
 
-  debug(dbg_general, "checking dependencies for remove `%s'",
-        pkg_describe(pkg, pdo_foreign));
+  debug(dbg_general,"checking dependencies for remove `%s'",pkg->name);
   rok= 2;
-  checkforremoval(pkg, pkg->set, &rok, &raemsgs);
+  checkforremoval(pkg,pkg,&rok,&raemsgs);
   for (dep= pkg->installed.depends; dep; dep= dep->next) {
     if (dep->type != dep_provides) continue;
     debug(dbg_depcon,"checking virtual package `%s'",dep->list->ed->name);
-    checkforremoval(pkg, dep->list->ed, &rok, &raemsgs);
+    checkforremoval(pkg,dep->list->ed,&rok,&raemsgs);
   }
 
   if (rok == 1) {
@@ -130,13 +126,13 @@
     varbuf_end_str(&raemsgs);
     fprintf(stderr,
             _("dpkg: dependency problems prevent removal of %s:\n%s"),
-            pkg_describe(pkg, pdo_foreign), raemsgs.buf);
+            pkg->name, raemsgs.buf);
     ohshit(_("dependency problems - not removing"));
   } else if (raemsgs.used) {
     varbuf_end_str(&raemsgs);
     fprintf(stderr,
             _("dpkg: %s: dependency problems, but removing anyway as you requested:\n%s"),
-            pkg_describe(pkg, pdo_foreign), raemsgs.buf);
+            pkg->name, raemsgs.buf);
   }
   varbuf_destroy(&raemsgs);
   sincenothing= 0;
@@ -150,7 +146,7 @@
   filesdbinit();
 
   if (f_noact) {
-    printf(_("Would remove or purge %s ...\n"), pkg_describe(pkg, pdo_foreign));
+    printf(_("Would remove or purge %s ...\n"),pkg->name);
     pkg->status= stat_notinstalled;
     pkg->clientdata->istobe= itb_normal;
     return;
@@ -158,7 +154,7 @@
 
   oldconffsetflags(pkg->installed.conffiles);
 
-  printf(_("Removing %s ...\n"), pkg_describe(pkg, pdo_foreign));
+  printf(_("Removing %s ...\n"),pkg->name);
   log_action("remove", pkg);
   trig_activate_packageprocessing(pkg);
   if (pkg->status >= stat_halfconfigured) {
@@ -222,51 +218,22 @@
     leftover = NULL;
     while ((namenode= reversefilelist_next(&rlistit))) {
       struct filenamenode *usenode;
-      bool is_dir;
 
       debug(dbg_eachfile, "removal_bulk `%s' flags=%o",
             namenode->name, namenode->flags);
-
-      usenode = namenodetouse(namenode, pkg);
-      varbuf_reset(&fnvb);
-      varbuf_add_str(&fnvb, instdir);
-      varbuf_add_str(&fnvb, usenode->name);
-      varbuf_end_str(&fnvb);
-      before = fnvb.used;
-
-      is_dir = (!stat(fnvb.buf, &stab) && S_ISDIR(stab.st_mode));
-
-      /* Multi-arch: same can share files that we don't want to remove.
-       * We just want to forget about them. It also holds true for shared
-       * conffiles. */
-      if (pkg->installed.multiarch == multiarch_same && !is_dir) {
-        struct filepackages_iterator *iter;
-        struct pkginfo *otherpkg;
-        bool shared = false;
-
-        iter = filepackages_iter_new(namenode);
-        while ((otherpkg = filepackages_iter_next(iter))) {
-          if (otherpkg == pkg || otherpkg->set != pkg->set)
-            continue;
-          debug(dbg_eachfiledetail, "file shared with %s, skipping",
-                pkg_describe(otherpkg, pdo_always));
-          shared = true;
-          break;
-        }
-        filepackages_iter_free(iter);
-        if (shared)
-          continue;
-      }
-
-      /* Non-shared conffiles are kept */
       if (namenode->flags & fnnf_old_conff) {
         push_leftover(&leftover,namenode);
         continue;
       }
 
+      usenode = namenodetouse(namenode, pkg);
       trig_file_activate(usenode, pkg);
 
-      varbuf_trunc(&fnvb, before);
+      varbuf_reset(&fnvb);
+      varbuf_add_str(&fnvb, instdir);
+      varbuf_add_str(&fnvb, usenode->name);
+      before= fnvb.used;
+
       varbuf_add_str(&fnvb, DPKGTEMPEXT);
       varbuf_end_str(&fnvb);
       debug(dbg_eachfiledetail, "removal_bulk cleaning temp `%s'", fnvb.buf);
@@ -281,7 +248,7 @@
 
       varbuf_trunc(&fnvb, before);
       varbuf_end_str(&fnvb);
-      if (is_dir) {
+      if (!stat(fnvb.buf,&stab) && S_ISDIR(stab.st_mode)) {
         debug(dbg_eachfiledetail, "removal_bulk is a directory");
         /* Only delete a directory or a link to one if we're the only
          * package which uses it. Other files should only be listed
@@ -307,7 +274,7 @@
       } else if (errno == EBUSY || errno == EPERM) {
         warning(_("while removing %.250s, unable to remove directory '%.250s': "
                   "%s - directory may be a mount point?"),
-                pkg_describe(pkg, pdo_foreign), namenode->name, strerror(errno));
+                pkg->name, namenode->name, strerror(errno));
         push_leftover(&leftover,namenode);
         continue;
       } else if (errno == EINVAL && strcmp(usenode->name, "/.") == 0) {
@@ -321,16 +288,16 @@
       if (secure_unlink(fnvb.buf))
         ohshite(_("unable to securely remove '%.250s'"), fnvb.buf);
     }
-    write_filelist_except(pkg, &pkg->installed, leftover, 0);
+    write_filelist_except(pkg,leftover,0);
     maintainer_script_installed(pkg, POSTRMFILE, "post-removal",
                                 "remove", NULL);
 
-    trig_parse_ci(pkgadminfile(pkg, &pkg->installed, TRIGGERSCIFILE),
+    trig_parse_ci(pkgadminfile(pkg, TRIGGERSCIFILE),
                   trig_cicb_interest_delete, NULL, pkg);
     trig_file_interests_save();
 
     debug(dbg_general, "removal_bulk cleaning info directory");
-    pkg_infodb_foreach(pkg, &pkg->installed, removal_bulk_remove_file);
+    pkg_infodb_foreach(pkg, removal_bulk_remove_file);
     dir_sync_path(pkgadmindir());
 
     pkg->status= stat_configfiles;
@@ -392,13 +359,13 @@
     if (!rmdir(fnvb.buf) || errno == ENOENT || errno == ELOOP) continue;
     if (errno == ENOTEMPTY || errno == EEXIST) {
       warning(_("while removing %.250s, directory '%.250s' not empty so not removed."),
-              pkg_describe(pkg, pdo_foreign), namenode->name);
+              pkg->name, namenode->name);
       push_leftover(&leftover,namenode);
       continue;
     } else if (errno == EBUSY || errno == EPERM) {
       warning(_("while removing %.250s, unable to remove directory '%.250s': "
                 "%s - directory may be a mount point?"),
-              pkg_describe(pkg, pdo_foreign), namenode->name, strerror(errno));
+              pkg->name, namenode->name, strerror(errno));
       push_leftover(&leftover,namenode);
       continue;
     } else if (errno == EINVAL && strcmp(usenode->name, "/.") == 0) {
@@ -421,7 +388,7 @@
     push_leftover(&leftover,namenode);
     continue;
   }
-  write_filelist_except(pkg, &pkg->installed, leftover, 0);
+  write_filelist_except(pkg,leftover,0);
 
   modstatdb_note(pkg);
   push_checkpoint(~ehflag_bombout, ehflag_normaltidy);
@@ -439,8 +406,7 @@
   char *p;
   const char *const *ext;
 
-    printf(_("Purging configuration files for %s ...\n"),
-           pkg_describe(pkg, pdo_foreign));
+    printf(_("Purging configuration files for %s ...\n"),pkg->name);
     log_action("purge", pkg);
     trig_activate_packageprocessing(pkg);
 
@@ -465,7 +431,7 @@
       } else if (searchfile->namenode->divert &&
                  (searchfile->namenode->divert->camefrom ||
                   (searchfile->namenode->divert->useinstead &&
-                   searchfile->namenode->divert->pkgset != pkg->set))) {
+                   searchfile->namenode->divert->pkg != pkg))) {
         debug(dbg_conff, "removal_bulk conffile '%s' ignored due to diversion",
               conff->name);
         *lconffp= conff->next;
@@ -548,8 +514,7 @@
     }
 
     /* Remove the conffiles from the file list file. */
-    write_filelist_except(pkg, &pkg->installed, pkg->clientdata->files,
-                          fnnf_old_conff);
+    write_filelist_except(pkg, pkg->clientdata->files, fnnf_old_conff);
 
     pkg->installed.conffiles = NULL;
     modstatdb_note(pkg);
@@ -566,13 +531,13 @@
 void removal_bulk(struct pkginfo *pkg) {
   bool foundpostrm;
 
-  debug(dbg_general, "removal_bulk package %s", pkg_describe(pkg, pdo_foreign));
+  debug(dbg_general,"removal_bulk package %s",pkg->name);
 
   if (pkg->status == stat_halfinstalled || pkg->status == stat_unpacked) {
     removal_bulk_remove_files(pkg);
   }
 
-  foundpostrm = pkg_infodb_has_file(pkg, &pkg->installed, POSTRMFILE);
+  foundpostrm = pkg_infodb_has_file(pkg, POSTRMFILE);
 
   debug(dbg_general, "removal_bulk purging? foundpostrm=%d",foundpostrm);
 
@@ -596,13 +561,13 @@
     /* Retry empty directories, and warn on any leftovers that aren't. */
     removal_bulk_remove_leftover_dirs(pkg);
 
-    filename = pkgadminfile(pkg, &pkg->installed, LISTFILE);
+    filename = pkgadminfile(pkg, LISTFILE);
     debug(dbg_general, "removal_bulk purge done, removing list `%s'",
           filename);
     if (unlink(filename) && errno != ENOENT)
       ohshite(_("cannot remove old files list"));
 
-    filename = pkgadminfile(pkg, &pkg->installed, POSTRMFILE);
+    filename = pkgadminfile(pkg, POSTRMFILE);
     debug(dbg_general, "removal_bulk purge done, removing postrm `%s'",
           filename);
     if (unlink(filename) && errno != ENOENT)
@@ -613,7 +578,7 @@
 
     /* This will mess up reverse links, but if we follow them
      * we won't go back because pkg->status is stat_notinstalled. */
-    pkgbin_blank(&pkg->installed, true);
+    pkgbin_blank(&pkg->installed);
   }
 
   pkg->eflag = eflag_ok;
diff -uNr --exclude .git --exclude .bzr dpkg/src/select.c /home/vorlon/devel/multiarch/dpkg-debian/src/select.c
--- dpkg/src/select.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/select.c	2012-06-07 10:11:09.426073000 -0700
@@ -3,8 +3,6 @@
  * select.c - by-hand (rather than dselect-based) package selection
  *
  * Copyright © 1995,1996 Ian Jackson <ian@chiark.greenend.org.uk>
- * Copyright © 2011 Linaro Limited
- * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,25 +31,17 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/pkg-array.h>
-#include <dpkg/pkg-spec.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "filesdb.h"
-#include "infodb.h"
 #include "main.h"
 
 static void getsel1package(struct pkginfo *pkg) {
   int l;
-  const char *pkgname;
 
   if (pkg->want == want_unknown) return;
-  pkgname = pkg_describe(pkg, pdo_foreign);
-  l = strlen(pkgname);
-  l >>= 3;
-  l = 6 - l;
-  if (l < 1)
-    l = 1;
-  printf("%s%.*s%s\n", pkgname, l, "\t\t\t\t\t\t", wantinfos[pkg->want].name);
+  l= strlen(pkg->name); l >>= 3; l= 6-l; if (l<1) l=1;
+  printf("%s%.*s%s\n",pkg->name,l,"\t\t\t\t\t\t",wantinfos[pkg->want].name);
 }
 
 int
@@ -61,11 +51,8 @@
   struct pkginfo *pkg;
   const char *thisarg;
   int i, found;
-  enum modstatdb_rw msdb_status;
-  struct pkg_spec pkgspec = PKG_SPEC_INIT(psf_def_native | psf_patterns);
 
-  msdb_status = modstatdb_open(msdbrw_readonly);
-  pkg_infodb_init(msdb_status);
+  modstatdb_open(msdbrw_readonly);
 
   pkg_array_init_from_db(&array);
   pkg_array_sort(&array, pkg_sorter_by_name);
@@ -79,17 +66,14 @@
   } else {
     while ((thisarg= *argv++)) {
       found= 0;
-      pkg_spec_parse(&pkgspec, thisarg);
       for (i = 0; i < array.n_pkgs; i++) {
         pkg = array.pkgs[i];
-        if (!pkg_spec_match_pkg(&pkgspec, pkg, &pkg->installed))
-          continue;
+        if (fnmatch(thisarg,pkg->name,0)) continue;
         getsel1package(pkg); found++;
       }
       if (!found)
         fprintf(stderr,_("No packages found matching %s.\n"),thisarg);
     }
-    pkg_spec_reset(&pkgspec);
   }
 
   m_output(stdout, _("<standard output>"));
@@ -109,14 +93,11 @@
   int c, lno;
   struct varbuf namevb = VARBUF_INIT;
   struct varbuf selvb = VARBUF_INIT;
-  enum modstatdb_rw msdb_status;
-  struct pkg_spec pkgspec = PKG_SPEC_INIT(psf_def_native | psf_no_check);
 
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  msdb_status = modstatdb_open(msdbrw_write | msdbrw_available_readonly);
-  pkg_infodb_init(msdb_status);
+  modstatdb_open(msdbrw_write | msdbrw_available_readonly);
 
   lno= 1;
   for (;;) {
@@ -154,20 +135,18 @@
       if (!isspace(c))
         ohshit(_("unexpected data after package and selection at line %d"),lno);
     }
-    pkg_spec_parse(&pkgspec, namevb.buf);
-    e = pkg_spec_is_illegal(&pkgspec);
+    e = pkg_name_is_illegal(namevb.buf, NULL);
     if (e) ohshit(_("illegal package name at line %d: %.250s"),lno,e);
 
     nv = namevalue_find_by_name(wantinfos, selvb.buf);
     if (nv == NULL)
       ohshit(_("unknown wanted status at line %d: %.250s"), lno, selvb.buf);
-    pkg = pkg_spec_find_pkg(&pkgspec, namevb.buf);
+    pkg = pkg_db_find(namevb.buf);
     pkg->want = nv->value;
     if (c == EOF) break;
     lno++;
   }
   if (ferror(stdin)) ohshite(_("read error on standard input"));
-  pkg_spec_reset(&pkgspec);
   modstatdb_shutdown();
   varbuf_destroy(&namevb);
   varbuf_destroy(&selvb);
@@ -180,16 +159,14 @@
 {
   struct pkgiterator *it;
   struct pkginfo *pkg;
-  enum modstatdb_rw msdb_status;
 
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  msdb_status = modstatdb_open(msdbrw_write);
-  pkg_infodb_init(msdb_status);
+  modstatdb_open(msdbrw_write);
 
   it = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next_pkg(it))) {
+  while ((pkg = pkg_db_iter_next(it))) {
     if (!pkg->installed.essential)
       pkg->want = want_deinstall;
   }
diff -uNr --exclude .git --exclude .bzr dpkg/src/statcmd.c /home/vorlon/devel/multiarch/dpkg-debian/src/statcmd.c
--- dpkg/src/statcmd.c	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/statcmd.c	2012-06-07 10:11:09.426073000 -0700
@@ -43,18 +43,19 @@
 #include <dpkg/path.h>
 #include <dpkg/dir.h>
 #include <dpkg/glob.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "main.h"
 #include "filesdb.h"
 
-const char thisname[] = "dpkg-statoverride";
-const char printforhelp[] = N_("Use --help for help about querying packages.");
+static const char printforhelp[] = N_(
+"Use --help for help about overriding file stat information.");
 
 static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *cip, const char *value)
 {
-	printf(_("Debian %s version %s.\n"), thisname, DPKG_VERSION_ARCH);
+	printf(_("Debian %s version %s.\n"), dpkg_get_progname(),
+	       DPKG_VERSION_ARCH);
 
 	printf(_(
 "Copyright (C) 2000, 2001 Wichert Akkerman.\n"
@@ -74,7 +75,7 @@
 {
 	printf(_(
 "Usage: %s [<option> ...] <command>\n"
-"\n"), thisname);
+"\n"), dpkg_get_progname());
 
 	printf(_(
 "Commands:\n"
@@ -368,8 +369,9 @@
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
+	dpkg_set_progname("dpkg-statoverride");
 	standard_startup();
-	myopt(&argv, cmdinfos);
+	myopt(&argv, cmdinfos, printforhelp);
 
 	admindir = dpkg_db_set_dir(admindir);
 
diff -uNr --exclude .git --exclude .bzr dpkg/src/t/100_dpkg_divert.t /home/vorlon/devel/multiarch/dpkg-debian/src/t/100_dpkg_divert.t
--- dpkg/src/t/100_dpkg_divert.t	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/t/100_dpkg_divert.t	2012-06-07 10:11:09.426073000 -0700
@@ -36,8 +36,7 @@
 plan tests => 235;
 
 sub cleanup {
-    system("rm -rf $tmpdir && mkdir -p $testdir");
-    system("mkdir -p $admindir/updates && touch $admindir/status");
+    system("rm -rf $tmpdir && mkdir -p $testdir && mkdir -p $admindir");
 }
 
 sub install_diversions {
@@ -486,7 +485,7 @@
 note("Corrupted divertions db handling");
 
 SKIP: {
-    skip "running under fakeroot", 3, if (defined($ENV{FAKEROOTKEY}));
+    skip "running as root or similar", 3, if (defined($ENV{FAKEROOTKEY}) or $> == 0);
 
     # An inexistent diversions db file should not be considered a failure,
     # but a failure to open it should be.
@@ -515,7 +514,7 @@
 cleanup();
 
 SKIP: {
-    skip "running under fakeroot", 10, if (defined($ENV{FAKEROOTKEY}));
+    skip "running as root or similar", 10, if (defined($ENV{FAKEROOTKEY}) or $> == 0);
 
     note("R/O directory");
 
@@ -549,7 +548,7 @@
 install_diversions('');
 
 SKIP: {
-    skip "running under fakeroot", 4, if (defined($ENV{FAKEROOTKEY}));
+    skip "running as root or similar", 4, if (defined($ENV{FAKEROOTKEY}) or $> == 0);
 
     system("chmod 500 $admindir");
     call_divert(["$testdir/foo"], expect_failure => 1, expect_stderr_like => qr/create.*new/);
diff -uNr --exclude .git --exclude .bzr dpkg/src/trigcmd.c /home/vorlon/devel/multiarch/dpkg-debian/src/trigcmd.c
--- dpkg/src/trigcmd.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/trigcmd.c	2012-06-07 10:11:09.426073000 -0700
@@ -38,21 +38,18 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 #include <dpkg/trigdeferred.h>
 #include <dpkg/triglib.h>
-#include <dpkg/pkg-spec.h>
 
-const char thisname[] = "dpkg-trigger";
-
-const char printforhelp[] = N_(
+static const char printforhelp[] = N_(
 "Type dpkg-trigger --help for help about this utility.");
 
 static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *ci, const char *value)
 {
 	printf(_("Debian %s package trigger utility version %s.\n"),
-	       thisname, DPKG_VERSION_ARCH);
+	       dpkg_get_progname(), DPKG_VERSION_ARCH);
 
 	printf(_(
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -69,7 +66,7 @@
 	printf(_(
 "Usage: %s [<options> ...] <trigger-name>\n"
 "       %s [<options> ...] <command>\n"
-"\n"), thisname, thisname);
+"\n"), dpkg_get_progname(), dpkg_get_progname());
 
 	printf(_(
 "Commands:\n"
@@ -153,11 +150,11 @@
 	switch (uf) {
 	case tdus_error_no_dir:
 		fprintf(stderr, _("%s: triggers data directory not yet created\n"),
-		        thisname);
+		        dpkg_get_progname());
 		exit(1);
 	case tdus_error_no_deferred:
 		fprintf(stderr, _("%s: trigger records not yet in existence\n"),
-		        thisname);
+		        dpkg_get_progname());
 		exit(1);
 	case tdus_ok:
 	case tdus_error_empty_deferred:
@@ -184,14 +181,14 @@
 	int uf;
 	const char *badname;
 	enum trigdef_updateflags tduf;
-	struct pkg_spec pkgspec = PKG_SPEC_INIT(psf_def_native | psf_no_check);
 
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
+	dpkg_set_progname("dpkg-trigger");
 	standard_startup();
-	myopt(&argv, cmdinfos);
+	myopt(&argv, cmdinfos, printforhelp);
 
 	admindir = dpkg_db_set_dir(admindir);
 
@@ -208,25 +205,15 @@
 		badusage(_("takes one argument, the trigger name"));
 
 	if (!bypackage) {
-		struct varbuf vb = VARBUF_INIT;
-		const char *pkg, *arch;
-		pkg = getenv("DPKG_MAINTSCRIPT_PACKAGE");
-		if (!pkg)
+		bypackage = getenv("DPKG_MAINTSCRIPT_PACKAGE");
+		if (!bypackage)
 			ohshit(_("must be called from a maintainer script"
 			         " (or with a --by-package option)"));
-		varbuf_add_str(&vb, pkg);
-		arch = getenv("DPKG_MAINTSCRIPT_ARCH");
-		if (arch)
-			varbuf_printf(&vb, ":%s", arch);
-		bypackage = varbuf_detach(&vb);
-	}
-	if (strcmp(bypackage, "-")) {
-		pkg_spec_parse(&pkgspec, bypackage);
-		badname = pkg_spec_is_illegal(&pkgspec);
-		if (badname)
-			ohshit(_("illegal awaited package name '%.250s': %.250s"),
-			       bypackage, badname);
 	}
+	if (strcmp(bypackage, "-") &&
+	    (badname = pkg_name_is_illegal(bypackage, NULL)))
+		ohshit(_("illegal awaited package name '%.250s': %.250s"),
+		       bypackage, badname);
 
 	activate = argv[0];
 	badname = trig_name_is_illegal(activate);
diff -uNr --exclude .git --exclude .bzr dpkg/src/trigproc.c /home/vorlon/devel/multiarch/dpkg-debian/src/trigproc.c
--- dpkg/src/trigproc.c	2011-07-25 23:22:55.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/trigproc.c	2012-06-07 10:11:09.426073000 -0700
@@ -96,15 +96,13 @@
 	if (pend->clientdata->trigprocdeferred)
 		return;
 	pend->clientdata->trigprocdeferred = pkg_queue_push(&deferred, pend);
-	debug(dbg_triggers, "trigproc_enqueue_deferred pend=%s",
-	      pkg_describe(pend, pdo_foreign));
+	debug(dbg_triggers, "trigproc_enqueue_deferred pend=%s", pend->name);
 }
 
 void
 trigproc_run_deferred(void)
 {
 	jmp_buf ejbuf;
-	char *pkgname;
 
 	debug(dbg_triggers, "trigproc_run_deferred");
 	while (!pkg_queue_is_empty(&deferred)) {
@@ -114,20 +112,17 @@
 		if (!pkg)
 			continue;
 
-		pkgname = m_strdup(pkg_describe(pkg, pdo_foreign));
 		if (setjmp(ejbuf)) {
 			pop_error_context(ehflag_bombout);
-			free(pkgname);
 			continue;
 		}
 		push_error_context_jump(&ejbuf, print_error_perpackage,
-		                        pkgname);
+		                        pkg->name);
 
 		pkg->clientdata->trigprocdeferred = NULL;
 		trigproc(pkg);
 
 		pop_error_context(ehflag_normaltidy);
-		free(pkgname);
 	}
 }
 
@@ -138,9 +133,9 @@
 trig_activate_packageprocessing(struct pkginfo *pkg)
 {
 	debug(dbg_triggersdetail, "trigproc_activate_packageprocessing pkg=%s",
-	      pkg_describe(pkg, pdo_foreign));
+	      pkg->name);
 
-	trig_parse_ci(pkgadminfile(pkg, &pkg->installed, TRIGGERSCIFILE), NULL,
+	trig_parse_ci(pkgadminfile(pkg, TRIGGERSCIFILE), NULL,
 	              trig_cicb_statuschange_activate, pkg);
 }
 
@@ -181,15 +176,14 @@
 	struct pkginfo *pkg, *giveup;
 	const char *sep;
 
-	debug(dbg_triggers, "check_triggers_cycle pnow=%s",
-	      pkg_describe(processing_now, pdo_foreign));
+	debug(dbg_triggers, "check_triggers_cycle pnow=%s", processing_now->name);
 
 	tcn = nfmalloc(sizeof(*tcn));
 	tcn->pkgs = NULL;
 	tcn->then_processed = processing_now;
 
 	it = pkg_db_iter_new();
-	while ((pkg = pkg_db_iter_next_pkg(it))) {
+	while ((pkg = pkg_db_iter_next(it))) {
 		if (!pkg->trigpend_head)
 			continue;
 		tcpp = nfmalloc(sizeof(*tcpp));
@@ -201,7 +195,7 @@
 	pkg_db_iter_free(it);
 	if (!hare) {
 		debug(dbg_triggersdetail, "check_triggers_cycle pnow=%s first",
-		      pkg_describe(processing_now, pdo_foreign));
+		      processing_now->name);
 		tcn->next = NULL;
 		hare = tortoise = tcn;
 		return NULL;
@@ -221,18 +215,15 @@
 	for (tortoise_pkg = tortoise->pkgs;
 	     tortoise_pkg;
 	     tortoise_pkg = tortoise_pkg->next) {
-		const char *pnow_name, *tortoise_name;
-		pnow_name = pkg_describe(processing_now, pdo_foreign);
-		tortoise_name = pkg_describe(tortoise_pkg->pkg, pdo_foreign);
 		debug(dbg_triggersdetail, "check_triggers_cycle pnow=%s tortoise=%s",
-		      pnow_name, tortoise_name);
+		      processing_now->name, tortoise_pkg->pkg->name);
 		for (tortoise_trig = tortoise_pkg->then_trigs;
 		     tortoise_trig;
 		     tortoise_trig = tortoise_trig->next) {
 			debug(dbg_triggersdetail,
 			      "check_triggers_cycle pnow=%s tortoise=%s"
-			      " tortoisetrig=%s", pnow_name, tortoise_name,
-			      tortoise_trig->name);
+			      " tortoisetrig=%s", processing_now->name,
+			      tortoise_pkg->pkg->name, tortoise_trig->name);
 			/* hare is now so we can just look up in the actual
 			 * data. */
 			for (hare_trig = tortoise_pkg->pkg->trigpend_head;
@@ -241,7 +232,7 @@
 				debug(dbg_triggersstupid,
 				      "check_triggers_cycle pnow=%s tortoise=%s"
 				      " tortoisetrig=%s haretrig=%s",
-				      pnow_name, tortoise_name,
+				      processing_now->name, tortoise_pkg->pkg->name,
 				      tortoise_trig->name, hare_trig->name);
 				if (!strcmp(hare_trig->name, tortoise_trig->name))
 					goto found_in_hare;
@@ -249,7 +240,7 @@
 			/* Not found in hare, yay! */
 			debug(dbg_triggersdetail,
 			      "check_triggers_cycle pnow=%s tortoise=%s OK",
-			      pnow_name, tortoise_name);
+			      processing_now->name, tortoise_pkg->pkg->name);
 			return NULL;
 			found_in_hare:;
 		}
@@ -258,11 +249,10 @@
 	 * progress. */
 	fprintf(stderr, _("%s: cycle found while processing triggers:\n chain of"
 	        " packages whose triggers are or may be responsible:\n"),
-	        thisname);
+	        dpkg_get_progname());
 	sep = "  ";
 	for (tcn = tortoise; tcn; tcn = tcn->next) {
-		fprintf(stderr, "%s%s", sep,
-		        pkg_describe(tcn->then_processed, pdo_foreign));
+		fprintf(stderr, "%s%s", sep, tcn->then_processed->name);
 		sep = " -> ";
 	}
 	fprintf(stderr, _("\n" " packages' pending triggers which are"
@@ -270,8 +260,7 @@
 	for (tortoise_pkg = tortoise->pkgs;
 	     tortoise_pkg;
 	     tortoise_pkg = tortoise_pkg->next) {
-		fprintf(stderr, "  %s",
-		        pkg_describe(tortoise_pkg->pkg, pdo_foreign));
+		fprintf(stderr, "  %s", tortoise_pkg->pkg->name);
 		sep = ": ";
 		for (tortoise_trig = tortoise_pkg->then_trigs;
 		     tortoise_trig;
@@ -284,14 +273,12 @@
 	/* We give up on the _earliest_ package involved. */
 	giveup = tortoise->pkgs->pkg;
 	debug(dbg_triggers, "check_triggers_cycle pnow=%s giveup=%p",
-	      pkg_describe(processing_now, pdo_foreign),
-	      pkg_describe(giveup, pdo_foreign));
+	      processing_now->name, giveup->name);
 	assert(giveup->status == stat_triggersawaited ||
 	       giveup->status == stat_triggerspending);
 	giveup->status = stat_halfconfigured;
 	modstatdb_note(giveup);
-	print_error_perpackage(_("triggers looping, abandoned"),
-	                       pkg_describe(giveup, pdo_foreign));
+	print_error_perpackage(_("triggers looping, abandoned"), giveup->name);
 
 	return giveup;
 }
@@ -308,7 +295,7 @@
 	struct trigpend *tp;
 	struct pkginfo *gaveup;
 
-	debug(dbg_triggers, "trigproc %s", pkg_describe(pkg, pdo_foreign));
+	debug(dbg_triggers, "trigproc %s", pkg->name);
 
 	if (pkg->clientdata->trigprocdeferred)
 		pkg->clientdata->trigprocdeferred->pkg = NULL;
@@ -322,8 +309,7 @@
 		if (gaveup == pkg)
 			return;
 
-		printf(_("Processing triggers for %s ...\n"),
-		       pkg_describe(pkg, pdo_foreign));
+		printf(_("Processing triggers for %s ...\n"), pkg->name);
 		log_action("trigproc", pkg);
 
 		varbuf_reset(&namesarg);
@@ -359,24 +345,26 @@
 /*========== Transitional global activation. ==========*/
 
 static void
-transitional_interest_callback_ro(const char *trig, void *user)
+transitional_interest_callback_ro(const char *trig, void *user,
+                                  enum trig_options opts)
 {
 	struct pkginfo *pend = user;
 
 	debug(dbg_triggersdetail,
 	      "trig_transitional_interest_callback trig=%s pend=%s",
-	      trig, pkg_describe(pend, pdo_foreign));
+	      trig, pend->name);
 	if (pend->status >= stat_triggersawaited)
 		trig_note_pend(pend, nfstrsave(trig));
 }
 
 static void
-transitional_interest_callback(const char *trig, void *user)
+transitional_interest_callback(const char *trig, void *user,
+                               enum trig_options opts)
 {
 	struct pkginfo *pend = user;
 
-	trig_cicb_interest_add(trig, pend);
-	transitional_interest_callback_ro(trig, user);
+	trig_cicb_interest_add(trig, pend, opts);
+	transitional_interest_callback_ro(trig, user, opts);
 }
 
 /*
@@ -391,17 +379,25 @@
 	struct pkginfo *pkg;
 
 	it = pkg_db_iter_new();
-	while ((pkg = pkg_db_iter_next_pkg(it))) {
+	while ((pkg = pkg_db_iter_next(it))) {
 		if (pkg->status <= stat_halfinstalled)
 			continue;
 		debug(dbg_triggersdetail, "trig_transitional_activate %s %s",
-		      pkg_describe(pkg, pdo_foreign),
-		      statusinfos[pkg->status].name);
+		      pkg->name, statusinfos[pkg->status].name);
 		pkg->trigpend_head = NULL;
-		trig_parse_ci(pkgadminfile(pkg, &pkg->installed, TRIGGERSCIFILE),
+		trig_parse_ci(pkgadminfile(pkg, TRIGGERSCIFILE),
 		              cstatus >= msdbrw_write ?
 		              transitional_interest_callback :
 		              transitional_interest_callback_ro, NULL, pkg);
+		/* Ensure we're not creating incoherent data that can't
+		 * be written down. This should never happen in theory but
+		 * can happen if you restore an old status file that is
+		 * not in sync with the infodb files. */
+		if (pkg->status < stat_triggersawaited)
+			continue;
+		pkg->status = pkg->trigaw.head ? stat_triggersawaited :
+		              pkg->trigpend_head ? stat_triggerspending :
+		              stat_installed;
 	}
 	pkg_db_iter_free(it);
 
diff -uNr --exclude .git --exclude .bzr dpkg/src/update.c /home/vorlon/devel/multiarch/dpkg-debian/src/update.c
--- dpkg/src/update.c	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/src/update.c	2012-06-07 10:11:09.426073000 -0700
@@ -30,7 +30,7 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "main.h"
 
@@ -49,7 +49,8 @@
     break;
   case act_avreplace: case act_avmerge:
     if (!sourcefile || argv[1])
-      badusage(_("--%s needs exactly one Packages file argument"),cipaction->olong);
+      badusage(_("--%s needs exactly one Packages-file argument"),
+               cipaction->olong);
     break;
   default:
     internerr("unknown action '%d'", cipaction->arg_int);
diff -uNr --exclude .git --exclude .bzr dpkg/TODO /home/vorlon/devel/multiarch/dpkg-debian/TODO
--- dpkg/TODO	2011-03-01 14:31:03.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/TODO	2012-06-07 10:11:09.426073000 -0700
@@ -63,13 +63,10 @@
  * Man pages:
    - Add example to dpkg-scanfoo manpages?
    - Merge synopsis lines in dpkg-triggers.
-   - Check all '<>' use bold instead.
    - Check all command vs action.
    - Check usage of '|' instead of ', '.
    - Check position of short option before long option.
-   - Use [option...] instead of [options] and friends?
    - Fix dpkg man page, refs to dpkg-deb and dpkg-split, etc.
-   - Fix «commandline» vs «command line».
    - Fix «.  ».
 
  * L10n:
@@ -168,7 +165,7 @@
  * understand Replaces in dselect
  * diversions list as control archive entry
  * single maintainer script, and new package getting there first
- * local conffiles, aswell as local files that dpkg should check before
+ * local conffiles, as well as local files that dpkg should check before
    overwriting
  * hooks
  * dselect per-half focus and keybindings improvements.
diff -uNr --exclude .git --exclude .bzr dpkg/utils/.gitignore /home/vorlon/devel/multiarch/dpkg-debian/utils/.gitignore
--- dpkg/utils/.gitignore	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/utils/.gitignore	1969-12-31 16:00:00.000000000 -0800
@@ -1,4 +0,0 @@
-start-stop-daemon
-update-alternatives
-dpkg-install-info
-t.tmp
diff -uNr --exclude .git --exclude .bzr dpkg/utils/Makefile.in /home/vorlon/devel/multiarch/dpkg-debian/utils/Makefile.in
--- dpkg/utils/Makefile.in	1969-12-31 16:00:00.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/utils/Makefile.in	2012-06-07 10:11:09.426073000 -0700
@@ -0,0 +1,688 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# vim:set syn=automake:
+
+# Variables to be defined:
+#
+#  TEST_VERBOSE - set to 0 or 1 to control test suite verbosity
+#  TEST_ENV_VARS - environment variables to be set for the test suite
+#  TEST_COVERAGE - set to the perl module in charge of getting test coverage
+#  test_tmpdir - test suite temporary directory
+#  test_cases - list of test case files
+#  test_data - list of test data files
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = $(am__EXEEXT_1)
+@WITH_UPDATE_ALTERNATIVES_TRUE@am__append_1 = update-alternatives
+sbin_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
+@WITH_START_STOP_DAEMON_TRUE@am__append_2 = start-stop-daemon
+@WITH_INSTALL_INFO_TRUE@am__append_3 = dpkg-install-info
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/Makecheck.am
+subdir = utils
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
+	$(top_srcdir)/m4/dpkg-build.m4 \
+	$(top_srcdir)/m4/dpkg-compiler.m4 \
+	$(top_srcdir)/m4/dpkg-coverage.m4 \
+	$(top_srcdir)/m4/dpkg-funcs.m4 $(top_srcdir)/m4/dpkg-libs.m4 \
+	$(top_srcdir)/m4/dpkg-linker.m4 $(top_srcdir)/m4/dpkg-progs.m4 \
+	$(top_srcdir)/m4/dpkg-types.m4 \
+	$(top_srcdir)/m4/dpkg-unicode.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+@WITH_UPDATE_ALTERNATIVES_TRUE@am__EXEEXT_1 =  \
+@WITH_UPDATE_ALTERNATIVES_TRUE@	update-alternatives$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
+@WITH_START_STOP_DAEMON_TRUE@am__EXEEXT_2 =  \
+@WITH_START_STOP_DAEMON_TRUE@	start-stop-daemon$(EXEEXT)
+@WITH_INSTALL_INFO_TRUE@am__EXEEXT_3 = dpkg-install-info$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
+am__dpkg_install_info_SOURCES_DIST = install-info.c
+@WITH_INSTALL_INFO_TRUE@am_dpkg_install_info_OBJECTS =  \
+@WITH_INSTALL_INFO_TRUE@	install-info.$(OBJEXT)
+dpkg_install_info_OBJECTS = $(am_dpkg_install_info_OBJECTS)
+@WITH_INSTALL_INFO_TRUE@dpkg_install_info_DEPENDENCIES =  \
+@WITH_INSTALL_INFO_TRUE@	../lib/compat/libcompat.a
+am__start_stop_daemon_SOURCES_DIST = start-stop-daemon.c
+@WITH_START_STOP_DAEMON_TRUE@am_start_stop_daemon_OBJECTS =  \
+@WITH_START_STOP_DAEMON_TRUE@	start-stop-daemon.$(OBJEXT)
+start_stop_daemon_OBJECTS = $(am_start_stop_daemon_OBJECTS)
+am__DEPENDENCIES_1 =
+@WITH_START_STOP_DAEMON_TRUE@start_stop_daemon_DEPENDENCIES =  \
+@WITH_START_STOP_DAEMON_TRUE@	../lib/compat/libcompat.a \
+@WITH_START_STOP_DAEMON_TRUE@	$(am__DEPENDENCIES_1)
+am_update_alternatives_OBJECTS = update-alternatives.$(OBJEXT)
+update_alternatives_OBJECTS = $(am_update_alternatives_OBJECTS)
+update_alternatives_DEPENDENCIES = ../lib/compat/libcompat.a \
+	$(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = 
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(dpkg_install_info_SOURCES) $(start_stop_daemon_SOURCES) \
+	$(update_alternatives_SOURCES)
+DIST_SOURCES = $(am__dpkg_install_info_SOURCES_DIST) \
+	$(am__start_stop_daemon_SOURCES_DIST) \
+	$(update_alternatives_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+transform = s/dpkg-install-info/install-info/; $(program_transform_name)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BZ2_LIBS = @BZ2_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCOV = @GCOV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LCOV = @LCOV@
+LCOV_GENHTML = @LCOV_GENHTML@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL_COVER = @PERL_COVER@
+PERL_COVERAGE = @PERL_COVERAGE@
+PERL_LIBDIR = @PERL_LIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PO4A = @PO4A@
+POD2MAN = @POD2MAN@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SELINUX_LIBS = @SELINUX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSD_LIBS = @SSD_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_PO4A = @USE_PO4A@
+USE_UNICODE = @USE_UNICODE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+admindir = @admindir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-DADMINDIR=\"$(admindir)\" \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DLOGDIR=\"$(logdir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-idirafter $(top_srcdir)/lib/compat \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/lib
+
+EXTRA_DIST = \
+	README.alternatives \
+	$(test_cases)
+
+update_alternatives_SOURCES = \
+	update-alternatives.c
+
+update_alternatives_LDADD = \
+	../lib/compat/libcompat.a \
+	$(LIBINTL) \
+	$(UA_LIBS)
+
+@WITH_START_STOP_DAEMON_TRUE@start_stop_daemon_SOURCES = \
+@WITH_START_STOP_DAEMON_TRUE@	start-stop-daemon.c
+
+@WITH_START_STOP_DAEMON_TRUE@start_stop_daemon_LDADD = \
+@WITH_START_STOP_DAEMON_TRUE@	../lib/compat/libcompat.a \
+@WITH_START_STOP_DAEMON_TRUE@	$(SSD_LIBS)
+
+
+# Automake has its own install-info rule, gah
+@WITH_INSTALL_INFO_TRUE@dpkg_install_info_SOURCES = install-info.c
+@WITH_INSTALL_INFO_TRUE@dpkg_install_info_LDADD = \
+@WITH_INSTALL_INFO_TRUE@	../lib/compat/libcompat.a
+
+TEST_VERBOSE = 0
+TEST_ENV_VARS = DPKG_DATADIR=$(top_srcdir)
+test_tmpdir = t.tmp
+test_cases = \
+	t/100_update_alternatives.t
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makecheck.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign utils/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign utils/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
+	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-sbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+
+clean-sbinPROGRAMS:
+	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
+dpkg-install-info$(EXEEXT): $(dpkg_install_info_OBJECTS) $(dpkg_install_info_DEPENDENCIES) 
+	@rm -f dpkg-install-info$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(dpkg_install_info_OBJECTS) $(dpkg_install_info_LDADD) $(LIBS)
+start-stop-daemon$(EXEEXT): $(start_stop_daemon_OBJECTS) $(start_stop_daemon_DEPENDENCIES) 
+	@rm -f start-stop-daemon$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(start_stop_daemon_OBJECTS) $(start_stop_daemon_LDADD) $(LIBS)
+update-alternatives$(EXEEXT): $(update_alternatives_OBJECTS) $(update_alternatives_DEPENDENCIES) 
+	@rm -f update-alternatives$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(update_alternatives_OBJECTS) $(update_alternatives_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install-info.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/start-stop-daemon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/update-alternatives.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) check-local
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-local \
+	clean-sbinPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-local \
+	uninstall-sbinPROGRAMS
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
+	clean-binPROGRAMS clean-generic clean-local clean-sbinPROGRAMS \
+	ctags distclean distclean-compile distclean-generic \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-local uninstall-sbinPROGRAMS
+
+
+install-data-local:
+@WITH_UPDATE_ALTERNATIVES_TRUE@	$(mkdir_p) $(DESTDIR)$(sysconfdir)/alternatives
+@WITH_UPDATE_ALTERNATIVES_TRUE@	$(mkdir_p) $(DESTDIR)$(admindir)/alternatives
+@WITH_UPDATE_ALTERNATIVES_TRUE@	$(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/alternatives/README
+
+uninstall-local:
+	rm -f $(DESTDIR)$(sysconfdir)/alternatives/README
+@WITH_INSTALL_INFO_TRUE@	rm -f $(DESTDIR)$(sbindir)/install-info
+
+check-clean:
+	rm -fr $(test_tmpdir)
+
+check-local: $(test_data) $(test_cases)
+	$(mkdir_p) $(test_tmpdir)
+	PATH="$(top_builddir)/src:$(top_builddir)/scripts:$(top_builddir)/utils:$(PATH)" \
+	  LC_ALL=C \
+	  $(TEST_ENV_VARS) \
+	  srcdir=$(srcdir) builddir=$(builddir) \
+	  PERL5LIB=$(top_srcdir)/scripts PERL_DL_NONLAZY=1 \
+	  PERL5OPT=$(TEST_COVERAGE) \
+	  $(PERL) -I$(top_srcdir)/scripts \
+	    -MExtUtils::Command::MM -e "test_harness($(TEST_VERBOSE), '.')" \
+	    $(addprefix $(srcdir)/,$(test_cases))
+
+clean-local: check-clean
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude .git --exclude .bzr dpkg/utils/start-stop-daemon.c /home/vorlon/devel/multiarch/dpkg-debian/utils/start-stop-daemon.c
--- dpkg/utils/start-stop-daemon.c	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/utils/start-stop-daemon.c	2012-06-07 10:11:09.426073000 -0700
@@ -12,7 +12,7 @@
  * Domain.
  *
  * Changes by Ben Collins <bcollins@debian.org>, added --chuid, --background
- * and --make-pidfile options, placed in public domain aswell.
+ * and --make-pidfile options, placed in public domain as well.
  *
  * Port to OpenBSD by Sontri Tomo Huynh <huynh.29@osu.edu>
  *                 and Andreas Schuldei <andreas@schuldei.org>
@@ -116,7 +116,7 @@
 #endif
 
 #if defined(OSLinux)
-/* This comes from TASK_COMM_LEN defined in Linux's include/linux/sched.h. */
+/* This comes from TASK_COMM_LEN defined in Linux' include/linux/sched.h. */
 #define PROCESS_NAME_SIZE 15
 #elif defined(OSsunos)
 #define PROCESS_NAME_SIZE 15
@@ -416,7 +416,7 @@
 "  -a|--startas <pathname>       program to start (default is <executable>)\n"
 "  -r|--chroot <directory>       chroot to <directory> before starting\n"
 "  -d|--chdir <directory>        change to <directory> (default is /)\n"
-"  -N|--nicelevel <incr>         add incr to the process's nice level\n"
+"  -N|--nicelevel <incr>         add incr to the process' nice level\n"
 "  -P|--procsched <policy[:prio]>\n"
 "                                use <policy> with <prio> for the kernel\n"
 "                                  process scheduler (default prio is 0)\n"
@@ -1058,7 +1058,7 @@
 	struct proc_stat *ps;
 
 	ps = get_proc_stat(pid, PSTAT_OWNER_UID);
-	return ps && proc_stat_owner_uid(ps) == uid;
+	return ps && (uid_t)proc_stat_owner_uid(ps) == uid;
 }
 #elif defined(OShpux)
 static bool
@@ -1166,7 +1166,7 @@
 	end_argv_0_p = strchr(*pid_argv_p, ' ');
 	if (end_argv_0_p == NULL)
 		/* There seems to be no space, so we have the command
-		 * allready in its desired form. */
+		 * already in its desired form. */
 		start_argv_0_p = *pid_argv_p;
 	else {
 		/* Tests indicate that this never happens, since
@@ -1297,33 +1297,47 @@
 	return 0;
 }
 
-static void
+static enum status_code
 do_procinit(void)
 {
 	if (!procset)
 		init_procset();
 
 	proc_stat_list_for_each(procset, check_proc_stat);
+
+	if (found)
+		return status_ok;
+	else
+		return status_dead;
 }
 #elif defined(OShpux)
-static void
+static enum status_code
 do_procinit(void)
 {
 	struct pst_status pst[10];
 	int i, count;
 	int idx = 0;
+	enum status_code prog_status = status_dead;
 
 	while ((count = pstat_getproc(pst, sizeof(pst[0]), 10, idx)) > 0) {
-		for (i = 0; i < count; i++)
-			pid_check(pst[i].pst_pid);
+		enum status_code pid_status;
+
+		for (i = 0; i < count; i++) {
+			pid_status = pid_check(pst[i].pst_pid);
+			if (pid_status < prog_status)
+				prog_status = pid_status;
+		}
 		idx = pst[count - 1].pst_idx + 1;
 	}
+
+	return prog_status;
 }
 #elif defined(HAVE_KVM_H)
-static void
+static enum status_code
 do_procinit(void)
 {
 	/* Nothing to do. */
+	return status_unknown;
 }
 #endif
 
@@ -1592,6 +1606,7 @@
 		struct group *gr = getgrnam(changegroup);
 		if (!gr)
 			fatal("group '%s' not found", changegroup);
+		changegroup = gr->gr_name;
 		runas_gid = gr->gr_gid;
 	}
 	if (changeuser) {
@@ -1604,6 +1619,7 @@
 			pw = getpwnam(changeuser);
 		if (!pw)
 			fatal("user '%s' not found", changeuser);
+		changeuser = pw->pw_name;
 		runas_uid = pw->pw_uid;
 		if (changegroup == NULL) {
 			/* Pass the default group of this user. */
diff -uNr --exclude .git --exclude .bzr dpkg/utils/t/100_update_alternatives.t /home/vorlon/devel/multiarch/dpkg-debian/utils/t/100_update_alternatives.t
--- dpkg/utils/t/100_update_alternatives.t	2010-12-23 19:47:09.000000000 -0800
+++ /home/vorlon/devel/multiarch/dpkg-debian/utils/t/100_update_alternatives.t	2012-06-07 10:11:09.426073000 -0700
@@ -80,8 +80,8 @@
     },
 );
 my $nb_slaves = 4;
-plan tests => (4 * ($nb_slaves + 1) + 2) * 25 # number of check_choices
-		+ 69;			      # rest
+plan tests => (4 * ($nb_slaves + 1) + 2) * 26 # number of check_choices
+               + 106;                         # rest
 
 sub cleanup {
     system("rm -rf $tmpdir && mkdir -p $admindir && mkdir -p $altdir");
@@ -119,20 +119,26 @@
 sub remove_choice {
     my ($id, %opts) = @_;
     my $alt = $choices[$id];
-    my @params = ("--remove", $main_name, $alt->{path});
+    my @params;
+    push @params, @{$opts{params}} if exists $opts{params};
+    push @params, "--remove", $main_name, $alt->{path};
     call_ua(\@params, %opts);
 }
 
 sub remove_all_choices {
     my (%opts) = @_;
-    my @params = ("--remove-all", $main_name);
+    my @params;
+    push @params, @{$opts{params}} if exists $opts{params};
+    push @params, "--remove-all", $main_name;
     call_ua(\@params, %opts);
 }
 
 sub set_choice {
     my ($id, %opts) = @_;
     my $alt = $choices[$id];
-    my @params = ("--set", $main_name, $alt->{path});
+    my @params;
+    push @params, @{$opts{params}} if exists $opts{params};
+    push @params, "--set", $main_name, $alt->{path};
     call_ua(\@params, %opts);
 }
 
@@ -148,7 +154,9 @@
     $input .= "\n";
     $opts{from_string} = \$input;
     $opts{to_string} = \$output;
-    my @params = ("--config", $main_name);
+    my @params;
+    push @params, @{$opts{params}} if exists $opts{params};
+    push @params, "--config", $main_name;
     call_ua(\@params, %opts);
 }
 
@@ -354,7 +362,15 @@
 install_choice(0);
 check_choice(0, "auto", "rename lost file");
 check_no_link($old_slave, "rename lost file");
+# update of alternative with many slaves not currently installed
+# and the link of the renamed slave exists while it should not
+set_choice(1);
+symlink("/bin/cat", "$bindir/generic-slave-bis");
 $choices[0]{"slaves"}[0]{"link"} = "$bindir/slave2";
+install_choice(0, test_id => "update with non-installed slaves");
+check_no_link("$bindir/generic-slave-bis",
+              "drop renamed symlink that should not be installed");
+
 # test install with empty admin file (#457863)
 cleanup();
 system("touch $admindir/generic-test");
@@ -385,6 +401,11 @@
 call_ua(["--install", "$bindir/testmaster", "testmaster", "/bin/date", "10",
 	 "--slave", "$bindir/generic-test", "testslave", "/bin/true" ],
 	expect_failure => 1, to_file => "/dev/null", error_to_file => "/dev/null");
+# try to reuse slave link in another slave alternative of another choice of
+# the same main alternative
+call_ua(["--install", $main_link, $main_name, "/bin/date", "10",
+	 "--slave", "$bindir/slave1", "testslave", "/bin/true" ],
+	expect_failure => 1, to_file => "/dev/null", error_to_file => "/dev/null");
 # lack of absolute filenames in links or file path, non-existing path,
 call_ua(["--install", "../testmaster", "testmaster", "/bin/date", "10"],
         expect_failure => 1, to_file => "/dev/null", error_to_file => "/dev/null");
@@ -413,7 +434,7 @@
 $old_slave = $choices[0]{"slaves"}[0]{"link"};
 $choices[0]{"slaves"}[0]{"path"} = "$bindir/doesntexist";
 $choices[0]{"slaves"}[0]{"link"} = "$bindir/baddir/slave2";
-# test rename of slave link that existed but that doesnt anymore
+# test rename of slave link that existed but that doesn't anymore
 # and link is moved into non-existing dir at the same time
 install_choice(0);
 check_choice(0, "auto", "optional renamed slave2 in non-existing dir");
@@ -439,3 +460,44 @@
 ok(-f "$bindir/slave1", "removal keeps real files installed as slave links");
 install_choice(0, params => ["--force"]);
 check_choice(0, "auto", "install --force replaces files with links");
+
+# test management of pre-existing files #2
+cleanup();
+system("touch $main_link $bindir/slave2");
+install_choice(0);
+install_choice(1);
+ok(!-l $main_link, "inactive install preserves files that should be links");
+ok(!-l "$bindir/slave2", "inactive install preserves files that should be slave links");
+ok(-f $main_link, "inactive install keeps real file installed as master link");
+ok(-f "$bindir/slave2", "inactive install keeps real files installed as slave links");
+set_choice(1);
+ok(!-l $main_link, "manual switching preserves files that should be links");
+ok(!-l "$bindir/slave2", "manual switching preserves files that should be slave links");
+ok(-f $main_link, "manual switching keeps real file installed as master link");
+ok(-f "$bindir/slave2", "manual switching keeps real files installed as slave links");
+remove_choice(1);
+ok(!-l $main_link, "auto switching preserves files that should be links");
+ok(!-l "$bindir/slave2", "auto switching preserves files that should be slave links");
+ok(-f $main_link, "auto switching keeps real file installed as master link");
+ok(-f "$bindir/slave2", "auto switching keeps real files installed as slave links");
+remove_all_choices(params => ["--force"]);
+ok(!-e "$bindir/slave2", "forced removeall drops real files installed as slave links");
+
+# test management of pre-existing files #3
+cleanup();
+system("touch $main_link $bindir/slave2");
+install_choice(0);
+install_choice(1);
+remove_choice(0);
+ok(!-l $main_link, "removal + switching preserves files that should be links");
+ok(!-l "$bindir/slave2", "removal + switching preserves files that should be slave links");
+ok(-f $main_link, "removal + switching keeps real file installed as master link");
+ok(-f "$bindir/slave2", "removal + switching keeps real files installed as slave links");
+install_choice(0);
+ok(!-l $main_link, "install + switching preserves files that should be links");
+ok(!-l "$bindir/slave2", "install + switching preserves files that should be slave links");
+ok(-f $main_link, "install + switching keeps real file installed as master link");
+ok(-f "$bindir/slave2", "install + switching keeps real files installed as slave links");
+set_choice(1, params => ["--force"]);
+ok(!-e "$bindir/slave2", "forced switching w/o slave drops real files installed as slave links");
+check_choice(1, "manual", "set --force replaces files with links");
diff -uNr --exclude .git --exclude .bzr dpkg/utils/update-alternatives.c /home/vorlon/devel/multiarch/dpkg-debian/utils/update-alternatives.c
--- dpkg/utils/update-alternatives.c	2011-06-15 14:02:05.000000000 -0700
+++ /home/vorlon/devel/multiarch/dpkg-debian/utils/update-alternatives.c	2012-06-07 10:11:09.426073000 -0700
@@ -280,34 +280,50 @@
 }
 
 static char *
-xreadlink(const char *linkname, bool error_out)
+areadlink(const char *linkname)
 {
 	struct stat st;
 	char *buf;
 	ssize_t size;
 
 	/* Allocate required memory to store the value of the symlink */
-	if (lstat(linkname, &st)) {
-		if (!error_out)
-			return NULL;
-		syserr(_("cannot stat file '%s'"), linkname);
+	if (lstat(linkname, &st))
+		return NULL;
+
+	if (!S_ISLNK(st.st_mode)) {
+		errno = EINVAL;
+		return NULL;
 	}
+
 	buf = xmalloc(st.st_size + 1);
 
 	/* Read it and terminate the string properly */
 	size = readlink(linkname, buf, st.st_size);
 	if (size == -1) {
-		if (!error_out) {
-			free(buf);
-			return NULL;
-		}
-		syserr(_("unable to read link `%.255s'"), linkname);
+		int saved_errno = errno;
+
+		free(buf);
+		errno = saved_errno;
+
+		return NULL;
 	}
 	buf[size] = '\0';
 
 	return buf;
 }
 
+static char *
+xreadlink(const char *linkname)
+{
+	char *buf;
+
+	buf = areadlink(linkname);
+	if (buf == NULL)
+		syserr(_("unable to read link `%.255s'"), linkname);
+
+	return buf;
+}
+
 static int DPKG_ATTR_VPRINTF(2)
 xvasprintf(char **strp, const char *fmt, va_list args)
 {
@@ -399,7 +415,7 @@
 }
 
 static int
-get_all_alternatives(struct dirent ***table)
+altdb_get_namelist(struct dirent ***table)
 {
 	int count;
 
@@ -410,6 +426,14 @@
 	return count;
 }
 
+static void
+altdb_free_namelist(struct dirent **table, int n)
+{
+	while (n--)
+		free(table[n]);
+	free(table);
+}
+
 static int
 spawn(const char *prog, const char *args[])
 {
@@ -480,13 +504,12 @@
 	struct dirent **table;
 	int i, count;
 
-	count = get_all_alternatives(&table);
+	count = altdb_get_namelist(&table);
 	for (i = 0; i < count; i++) {
 		subcall(prog_path, "--config", table[i]->d_name, NULL);
 		printf("\n");
-		free(table[i]);
 	}
-	free(table);
+	altdb_free_namelist(table, count);
 }
 
 static bool
@@ -696,6 +719,7 @@
 
 	struct commit_operation *commit_ops;
 
+	int ref_count;
 	bool modified;
 };
 
@@ -728,10 +752,23 @@
 	alt->choices = NULL;
 	alt->commit_ops = NULL;
 	alt->modified = false;
+	alt->ref_count = 1;
 
 	return alt;
 }
 
+static inline void
+alternative_ref(struct alternative *a)
+{
+	a->ref_count++;
+}
+
+static inline bool
+alternative_unref(struct alternative *a)
+{
+	return --a->ref_count == 0;
+}
+
 static void
 alternative_choices_free(struct alternative *a)
 {
@@ -779,6 +816,9 @@
 static void
 alternative_free(struct alternative *alt)
 {
+	if (!alternative_unref(alt))
+		return;
+
 	alternative_reset(alt);
 	free(alt->master_name);
 	free(alt);
@@ -1414,7 +1454,7 @@
 		return NULL;
 
 	xasprintf(&curlink, "%s/%s", altdir, a->master_name);
-	file = xreadlink(curlink, true);
+	file = xreadlink(curlink);
 	free(curlink);
 
 	return file;
@@ -1623,13 +1663,74 @@
 	alternative_commit_operations_free(a);
 }
 
+enum alternative_path_status {
+	ALT_PATH_SYMLINK,
+	ALT_PATH_MISSING,
+	ALT_PATH_OTHER,
+};
+
+static enum alternative_path_status
+alternative_path_classify(const char *linkname)
+{
+	struct stat st;
+
+	errno = 0;
+	if (lstat(linkname, &st) == -1) {
+		if (errno != ENOENT)
+			syserr(_("cannot stat file '%s'"), linkname);
+		return ALT_PATH_MISSING;
+	} else if (S_ISLNK(st.st_mode)) {
+		return ALT_PATH_SYMLINK;
+	} else {
+		return ALT_PATH_OTHER;
+	}
+}
+
+static bool
+alternative_can_replace_path(const char *linkname)
+{
+	if (opt_force)
+		return true;
+
+	if (alternative_path_classify(linkname) == ALT_PATH_OTHER)
+		return false;
+	else
+		return true;
+}
+
+static bool
+alternative_path_needs_update(const char *linkname, const char *filename)
+{
+	char *linktarget;
+	bool update;
+
+	if (opt_force)
+		return true;
+
+	switch (alternative_path_classify(linkname)) {
+	case ALT_PATH_SYMLINK:
+		linktarget = xreadlink(linkname);
+		if (strcmp(linktarget, filename) == 0)
+			update = false;
+		else
+			update = true;
+		free(linktarget);
+
+		return update;
+	case ALT_PATH_OTHER:
+		warning(_("not replacing %s with a link."), linkname);
+		return false;
+	case ALT_PATH_MISSING:
+	default:
+		return true;
+	}
+}
+
 static void
 alternative_prepare_install_single(struct alternative *a, const char *name,
 				   const char *linkname, const char *file)
 {
 	char *fntmp, *fn;
-	struct stat st;
-	bool create_link;
 
 	/* Create link in /etc/alternatives. */
 	xasprintf(&fntmp, "%s/%s" DPKG_TMP_EXT, altdir, name);
@@ -1639,23 +1740,13 @@
 	alternative_add_commit_op(a, opcode_mv, fntmp, fn);
 	free(fntmp);
 
-	errno = 0;
-	if (lstat(linkname, &st) == -1) {
-		if (errno != ENOENT)
-			syserr(_("cannot stat file '%s'"), linkname);
-		create_link = true;
-	} else {
-		create_link = S_ISLNK(st.st_mode);
-	}
-	if (create_link || opt_force) {
+	if (alternative_path_needs_update(linkname, fn)) {
 		/* Create alternative link. */
 		xasprintf(&fntmp, "%s" DPKG_TMP_EXT, linkname);
 		checked_rm(fntmp);
 		checked_symlink(fn, fntmp);
 		alternative_add_commit_op(a, opcode_mv, fntmp, linkname);
 		free(fntmp);
-	} else {
-		warning(_("not replacing %s with a link."), linkname);
 	}
 	free(fn);
 }
@@ -1693,7 +1784,11 @@
 
 		/* Drop unused slave. */
 		xasprintf(&fn, "%s/%s", altdir, sl->name);
-		alternative_add_commit_op(a, opcode_rm, sl->link, NULL);
+		if (alternative_can_replace_path(sl->link))
+			alternative_add_commit_op(a, opcode_rm, sl->link, NULL);
+		else
+			warning(_("not removing %s since it's not a symlink."),
+			        sl->link);
 		alternative_add_commit_op(a, opcode_rm, fn, NULL);
 		free(fn);
 	}
@@ -1702,11 +1797,10 @@
 static void
 alternative_remove(struct alternative *a)
 {
-	struct stat st;
 	struct slave_link *sl;
 
 	checked_rm_args("%s" DPKG_TMP_EXT, a->master_link);
-	if (lstat(a->master_link, &st) == 0 && S_ISLNK(st.st_mode))
+	if (alternative_can_replace_path(a->master_link))
 		checked_rm(a->master_link);
 
 	checked_rm_args("%s/%s" DPKG_TMP_EXT, altdir, a->master_name);
@@ -1714,7 +1808,7 @@
 
 	for (sl = a->slaves; sl; sl = sl->next) {
 		checked_rm_args("%s" DPKG_TMP_EXT, sl->link);
-		if (lstat(sl->link, &st) == 0 && S_ISLNK(st.st_mode))
+		if (alternative_can_replace_path(sl->link))
 			checked_rm(sl->link);
 
 		checked_rm_args("%s/%s" DPKG_TMP_EXT, altdir, sl->name);
@@ -1730,13 +1824,12 @@
 	char *altlnk, *wanted, *current;
 	struct fileset *fs;
 	struct slave_link *sl;
-	struct stat st;
 
 	if (!alternative_has_current_link(a))
 		return true;
 
 	/* Check master link */
-	altlnk = xreadlink(a->master_link, false);
+	altlnk = areadlink(a->master_link);
 	if (!altlnk)
 		return true;
 	xasprintf(&wanted, "%s/%s", altdir, a->master_name);
@@ -1763,7 +1856,7 @@
 			char *sl_altlnk, *sl_current;
 
 			/* Verify link -> /etc/alternatives/foo */
-			sl_altlnk = xreadlink(sl->link, false);
+			sl_altlnk = areadlink(sl->link);
 			if (!sl_altlnk)
 				return true;
 			xasprintf(&wanted, "%s/%s", altdir, sl->name);
@@ -1774,7 +1867,7 @@
 			}
 			free(sl_altlnk);
 			/* Verify /etc/alternatives/foo -> file */
-			sl_current = xreadlink(wanted, false);
+			sl_current = areadlink(wanted);
 			free(wanted);
 			if (!sl_current)
 				return true;
@@ -1787,10 +1880,10 @@
 			char *sl_altlnk;
 
 			/* Slave link must not exist. */
-			if (lstat(sl->link, &st) == 0)
+			if (alternative_path_classify(sl->link) != ALT_PATH_MISSING)
 				return true;
 			xasprintf(&sl_altlnk, "%s/%s", altdir, sl->name);
-			if (lstat(sl_altlnk, &st) == 0) {
+			if (alternative_path_classify(sl_altlnk) != ALT_PATH_MISSING) {
 				free(sl_altlnk);
 				return true;
 			}
@@ -1846,6 +1939,68 @@
 	}
 }
 
+static void
+alternative_map_load_names(struct alternative_map *alt_map_obj)
+{
+	struct dirent **table;
+	int i, count;
+
+	count = altdb_get_namelist(&table);
+	for (i = 0; i < count; i++) {
+		struct alternative *a_new = alternative_new(table[i]->d_name);
+
+		if (!alternative_load(a_new, true)) {
+			alternative_free(a_new);
+			continue;
+		}
+		alternative_map_add(alt_map_obj, a_new->master_name, a_new);
+	}
+	altdb_free_namelist(table, count);
+}
+
+static void
+alternative_map_load_tree(struct alternative_map *alt_map_links,
+                          struct alternative_map *alt_map_parent)
+{
+	struct dirent **table;
+	int i, count;
+
+	count = altdb_get_namelist(&table);
+	for (i = 0; i < count; i++) {
+		struct slave_link *sl;
+		struct alternative *a_new = alternative_new(table[i]->d_name);
+
+		if (!alternative_load(a_new, true)) {
+			alternative_free(a_new);
+			continue;
+		}
+		alternative_map_add(alt_map_links, a_new->master_link, a_new);
+		alternative_ref(a_new);
+		alternative_map_add(alt_map_parent, a_new->master_name, a_new);
+		for (sl = a_new->slaves; sl; sl = sl->next) {
+			alternative_ref(a_new);
+			alternative_map_add(alt_map_links, sl->link, a_new);
+			alternative_ref(a_new);
+			alternative_map_add(alt_map_parent, sl->name, a_new);
+		}
+	}
+	altdb_free_namelist(table, count);
+}
+
+static void
+alternative_map_free(struct alternative_map *am)
+{
+	struct alternative_map *am_next;
+
+	while (am) {
+		am_next = am->next;
+		if (am->item)
+			alternative_free(am->item);
+		free(am);
+		am = am_next;
+	}
+}
+
 static const char *
 get_argv_string(int argc, char **argv)
 {
@@ -1972,7 +2127,7 @@
 	struct slave_link *sl;
 	struct stat st;
 
-	bool is_link = (lstat(a->master_link, &st) == 0 && S_ISLNK(st.st_mode));
+	bool is_link = (alternative_path_classify(a->master_link) == ALT_PATH_SYMLINK);
 	if (is_link && strcmp(a->master_link, b->master_link) != 0) {
 		info(_("renaming %s link from %s to %s."), b->master_name,
 		     a->master_link, b->master_link);
@@ -1999,12 +2154,22 @@
 			char *lnk;
 
 			xasprintf(&lnk, "%s/%s", altdir, sl->name);
-			new_file = xreadlink(lnk, false);
+			new_file = areadlink(lnk);
 			free(lnk);
 		}
-		if (strcmp(old, new) != 0 && lstat(old, &st) == 0 &&
-		    S_ISLNK(st.st_mode)) {
-			if (stat(new_file, &st) == 0) {
+		if (strcmp(old, new) != 0 &&
+		    alternative_path_classify(old) == ALT_PATH_SYMLINK) {
+			bool rename_link = false;
+
+			if (new_file) {
+				errno = 0;
+				if (stat(new_file, &st) == -1 && errno != ENOENT)
+					syserr(_("cannot stat file '%s'"),
+					       new_file);
+				rename_link = (errno == 0);
+			}
+
+			if (rename_link) {
 				info(_("renaming %s slave link from %s to %s."),
 				     sl->name, old, new);
 				checked_mv(old, new);
@@ -2017,6 +2182,112 @@
 	}
 }
 
+static void
+alternative_check_args(const char *name, const char *linkname, const char *file)
+{
+	if (strpbrk(name, "/ \t"))
+		error(_("alternative name (%s) must not contain '/' "
+		        "and spaces."), name);
+
+	if (linkname[0] != '/')
+		error(_("alternative link is not absolute as it should be: %s"),
+		      linkname);
+
+	if (!file || file[0] != '/')
+		error(_("alternative path is not absolute as it should be: %s"),
+		      file);
+}
+
+/**
+ * Check the alternative installation arguments.
+ *
+ * That the caller doesn't mix links between alternatives, doesn't mix
+ * alternatives between slave/master, and that the various parameters
+ * are fine.
+ */
+static void
+alternative_check_install_args(struct alternative *inst_alt,
+                               struct fileset *fileset)
+{
+	struct alternative_map *alt_map_links, *alt_map_parent;
+	struct alternative *found;
+	struct slave_link *sl;
+	struct stat st;
+
+	/* Load information about all alternatives to check for mistakes. */
+	alt_map_links = alternative_map_new(NULL, NULL);
+	alt_map_parent = alternative_map_new(NULL, NULL);
+	alternative_map_load_tree(alt_map_links, alt_map_parent);
+
+	found = alternative_map_find(alt_map_parent, inst_alt->master_name);
+	if (found && strcmp(found->master_name, inst_alt->master_name) != 0) {
+		error(_("alternative %s can't be master: it is a slave of %s"),
+		      inst_alt->master_name, found->master_name);
+	}
+
+	found = alternative_map_find(alt_map_links, inst_alt->master_link);
+	if (found && strcmp(found->master_name, inst_alt->master_name) != 0) {
+		found = alternative_map_find(alt_map_parent,
+		                             found->master_name);
+		error(_("alternative link %s is already managed by %s."),
+		      inst_alt->master_link, found->master_name);
+	}
+
+	alternative_check_args(inst_alt->master_name, inst_alt->master_link,
+	                       fileset->master_file);
+
+	if (stat(fileset->master_file, &st) == -1) {
+		if (errno == ENOENT)
+			error(_("alternative path %s doesn't exist."),
+			      fileset->master_file);
+		else
+			syserr(_("cannot stat file '%s'"), fileset->master_file);
+	}
+
+	for (sl = inst_alt->slaves; sl; sl = sl->next) {
+		const char *file = fileset_get_slave(fileset, sl->name);
+
+		found = alternative_map_find(alt_map_parent, sl->name);
+		if (found &&
+		    strcmp(found->master_name, inst_alt->master_name) != 0) {
+			if (strcmp(found->master_name, sl->name) == 0)
+				error(_("alternative %s can't be slave of %s: "
+				        "it is a master alternative."),
+				      sl->name, inst_alt->master_name);
+			else
+				error(_("alternative %s can't be slave of %s: "
+				        "it is a slave of %s"),
+				      sl->name, inst_alt->master_name,
+				      found->master_name);
+		}
+
+		found = alternative_map_find(alt_map_links, sl->link);
+		if (found &&
+		    strcmp(found->master_name, inst_alt->master_name) != 0) {
+			error(_("alternative link %s is already "
+			        "managed by %s."), sl->link,
+			      found->master_name);
+		}
+		if (found) {
+			struct slave_link *sl2;
+
+			for (sl2 = found->slaves; sl2; sl2 = sl2->next)
+				if (strcmp(sl2->link, sl->link) == 0)
+					break;
+			if (sl2 && strcmp(sl2->name, sl->name) != 0)
+				error(_("alternative link %s is already "
+				        "managed by %s (slave of %s)."),
+				      sl->link, sl2->name,
+				      found->master_name);
+		}
+
+		alternative_check_args(sl->name, sl->link, file);
+	}
+
+	alternative_map_free(alt_map_links);
+	alternative_map_free(alt_map_parent);
+}
+
 /*
  * Main program
  */
@@ -2034,11 +2305,8 @@
 	struct fileset *fileset = NULL;
 	/* Path of alternative we are offering. */
 	char *path = NULL, *current_choice = NULL;
-	/* Alternatives maps for checks */
-	struct alternative_map *alt_map_obj, *alt_map_links, *alt_map_parent;
-	struct dirent **table;
 	const char *new_choice = NULL;
-	int i = 0, count;
+	int i = 0;
 
 	setlocale(LC_ALL, "");
 	bindtextdomain("dpkg", LOCALEDIR);
@@ -2186,122 +2454,20 @@
 		           "--config, --set, --set-selections, --install, "
 		           "--remove, --all, --remove-all or --auto"));
 
-	/* Load infos about all alternatives to be able to check for mistakes. */
-	alt_map_obj = alternative_map_new(NULL, NULL);
-	alt_map_links = alternative_map_new(NULL, NULL);
-	alt_map_parent = alternative_map_new(NULL, NULL);
-	count = get_all_alternatives(&table);
-	for (i = 0; i < count; i++) {
-		struct slave_link *sl;
-		struct alternative *a_new = alternative_new(table[i]->d_name);
-
-		if (!alternative_load(a_new, true)) {
-			alternative_free(a_new);
-			free(table[i]);
-			continue;
-		}
-		alternative_map_add(alt_map_obj, a_new->master_name, a_new);
-		alternative_map_add(alt_map_links, a_new->master_link, a_new);
-		alternative_map_add(alt_map_parent, a_new->master_name, a_new);
-		for (sl = a_new->slaves; sl; sl = sl->next) {
-			alternative_map_add(alt_map_links, sl->link, a_new);
-			alternative_map_add(alt_map_parent, sl->name, a_new);
-		}
-
-		free(table[i]);
-	}
-	free(table);
-
-	/* Check that caller don't mix links between alternatives and don't mix
-	 * alternatives between slave/master, and that the various parameters
-	 * are fine. */
-	if (strcmp(action, "install") == 0) {
-		struct alternative *found;
-		struct stat st;
-		struct slave_link *sl;
-
-		found = alternative_map_find(alt_map_parent,
-		                             inst_alt->master_name);
-		if (found && strcmp(found->master_name,
-		                    inst_alt->master_name) != 0) {
-			error(_("alternative %s can't be master: "
-			        "it is a slave of %s"),
-			      inst_alt->master_name, found->master_name);
-		}
-
-		found = alternative_map_find(alt_map_links,
-		                             inst_alt->master_link);
-		if (found && strcmp(found->master_name,
-		                    inst_alt->master_name) != 0) {
-			found = alternative_map_find(alt_map_parent,
-			                             found->master_name);
-			error(_("alternative link %s is already managed by %s."),
-			      inst_alt->master_link, found->master_name);
-		}
-
-		if (inst_alt->master_link[0] != '/')
-			error(_("alternative link is not absolute as it "
-			        "should be: %s"), inst_alt->master_link);
-
-		if (fileset->master_file[0] != '/')
-			error(_("alternative path is not absolute as it "
-			        "should be: %s"), fileset->master_file);
-
-		if (stat(fileset->master_file, &st) == -1 && errno == ENOENT)
-			error(_("alternative path %s doesn't exist."),
-			      fileset->master_file);
-
-		if (strpbrk(inst_alt->master_name, "/ \t"))
-			error(_("alternative name (%s) must not contain '/' "
-			        "and spaces."), inst_alt->master_name);
-
-		for (sl = inst_alt->slaves; sl; sl = sl->next) {
-			const char *file = fileset_get_slave(fileset, sl->name);
-
-			found = alternative_map_find(alt_map_parent, sl->name);
-			if (found && strcmp(found->master_name,
-			                    inst_alt->master_name) != 0) {
-				char *msg;
-
-				if (strcmp(found->master_name, sl->name) == 0)
-					msg = _("it is a master alternative.");
-				else
-					xasprintf(&msg, _("it is a slave of %s"),
-					          found->master_name);
-				error(_("alternative %s can't be slave of "
-				        "%s: %s"), sl->name,
-				      inst_alt->master_name, msg);
-			}
-
-			found = alternative_map_find(alt_map_links, sl->link);
-			if (found && strcmp(found->master_name,
-			                    inst_alt->master_name) != 0) {
-				error(_("alternative link %s is already "
-				        "managed by %s."), sl->link,
-				      found->master_name);
-			}
-
-			if (sl->link[0] != '/')
-				error(_("alternative link is not absolute as "
-				        "it should be: %s"), sl->link);
-
-			if (!file || file[0] != '/')
-				error(_("alternative path is not absolute as "
-				        "it should be: %s"), file);
-
-			if (strpbrk(sl->name, "/ \t"))
-				error(_("alternative name (%s) must not contain '/' "
-				        "and spaces."), sl->name);
-		}
-	}
+	if (strcmp(action, "install") == 0)
+		alternative_check_install_args(inst_alt, fileset);
 
 	/* Handle actions. */
 	if (strcmp(action, "all") == 0) {
 		config_all();
 		exit(0);
 	} else if (strcmp(action, "get-selections") == 0) {
+		struct alternative_map *alt_map_obj;
 		struct alternative_map *am;
 
+		alt_map_obj = alternative_map_new(NULL, NULL);
+		alternative_map_load_names(alt_map_obj);
+
 		for (am = alt_map_obj; am && am->item; am = am->next) {
 			char *current;
 
@@ -2312,10 +2478,17 @@
 			free(current);
 		}
 
+		alternative_map_free(alt_map_obj);
+
 		exit(0);
 	} else if (strcmp(action, "set-selections") == 0) {
+		struct alternative_map *alt_map_obj;
+
 		log_msg("run with %s", get_argv_string(argc, argv));
+		alt_map_obj = alternative_map_new(NULL, NULL);
+		alternative_map_load_names(alt_map_obj);
 		alternative_set_selections(alt_map_obj, stdin, _("<standard input>"));
+		alternative_map_free(alt_map_obj);
 		exit(0);
 	}
 
@@ -2349,8 +2522,11 @@
 		if (!alternative_has_choice(a, current_choice)) {
 			struct stat st;
 
-			if (stat(current_choice, &st) == -1 &&
-			    errno == ENOENT) {
+			errno = 0;
+			if (stat(current_choice, &st) == -1 && errno != ENOENT)
+				syserr(_("cannot stat file '%s'"), current_choice);
+
+			if (errno == ENOENT) {
 				warning(_("%s/%s is dangling, it will be updated "
 				          "with best choice."), altdir, a->master_name);
 				alternative_set_status(a, ALT_ST_AUTO);
